Version bump, remove old

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

4 files changed, 23 insertions, 48 deletions

diff --git a/media-gfx/eog/ChangeLog b/media-gfx/eog/ChangeLog
index 10b378b24614..bd70f9bac2f5 100644
--- a/media-gfx/eog/ChangeLog
+++ b/media-gfx/eog/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-gfx/eog
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/eog/ChangeLog,v 1.260 2010/06/21 11:48:28 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/eog/ChangeLog,v 1.261 2010/06/22 14:06:19 pacho Exp $
+
+*eog-2.30.2 (22 Jun 2010)
+
+  22 Jun 2010; Pacho Ramos <pacho@gentoo.org> -eog-2.30.1.ebuild,
+  -files/eog-2.30.1-libjpeg-configure.patch, +eog-2.30.2.ebuild:
+  Version bump including patch we were already applying to fix configure and
+  translation updates. Remove old.
 
   21 Jun 2010; Samuli Suominen <ssuominen@gentoo.org> eog-2.30.1.ebuild:
   Restrict media-libs/lcms depend to old version.
diff --git a/media-gfx/eog/Manifest b/media-gfx/eog/Manifest
index a4890670b75f..67646c3dc634 100644
--- a/media-gfx/eog/Manifest
+++ b/media-gfx/eog/Manifest
@@ -1,9 +1,18 @@
-AUX eog-2.30.1-libjpeg-configure.patch 1002 RMD160 0a4b73a2a0128cb61287e9c8896b018925a453c8 SHA1 812433d6b10b144b1b1478267bd89477dd8f4eb8 SHA256 cbb362baaf0681772f3a2d3aac27fcd4787ebf82342d1e03e5d24dc250d0cb19
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST eog-2.26.3.tar.bz2 2446417 RMD160 53710759e71a304789eaaeeddefa56ac80af8494 SHA1 dce3dc99d3df80bcfad1401bd6efdcd7dfc88e30 SHA256 67889e7598263146d835bce277df0dd67b6c5a14ad963790ce09ced55897effe
 DIST eog-2.28.2.tar.bz2 2675876 RMD160 d7ff35ade45770b77c66e99f9190147244fe6b02 SHA1 26eda3778adf9e836f18d1b45f4cfd5bb9fd2674 SHA256 9d7ec3f8a94f5fdc051d9ee5dc5f4f8e46d83b44d9b0a40d68beaaa738a91a08
-DIST eog-2.30.1.tar.bz2 2691413 RMD160 f0728289d3f142634133c00fa15dbaa3c40a6213 SHA1 ffc003975ad1c39fca5de1a1c1bb15027bc244af SHA256 d245d96d791c88197dda1f667c196cb4134f9ce88596e696d5fbcddb6747ecf6
+DIST eog-2.30.2.tar.bz2 2789170 RMD160 56a1d683493e183a86094783a4114dd714fb1666 SHA1 f2b0f00f9908c2fbbb1088de7263100aa3435b48 SHA256 0f508cbc1727181122410f921f54d6c1464d0b98d544a04bd7d021d43d2ab91b
 EBUILD eog-2.26.3.ebuild 1834 RMD160 a509792e78bc8622f624c45e5039f17b1ec23d11 SHA1 1884756beac92607d01063d3b51421abeaaf6071 SHA256 408d7791e8095c0f02e13b13d9396bb3c01432cfd40e8c461e749a17711f38ae
 EBUILD eog-2.28.2.ebuild 1976 RMD160 dc07c809cad14da607a2645ed5ecfdc11a743660 SHA1 c12a8d590383eb11789721737fbd095fd222d2a3 SHA256 ad7d66ed8e5daeb40b089ffbb67f0de43c28e10300d662d783f1ca98524d0451
-EBUILD eog-2.30.1.ebuild 1653 RMD160 9e575bb3aa2ad391d377d4d2c4263cd0caf3a421 SHA1 3f46f5105d92b28ab6c496aaf0437d96af444740 SHA256 8f83178fa0a158737e0573857ba09d6a075b2c4e5646914376c4ac5b93cbf2be
-MISC ChangeLog 30984 RMD160 56d2e30450681e8433fab44b4079a98544b96dc6 SHA1 698ee41f8d1aad5ed5667c3aa82122382f078233 SHA256 0d919239e54eebcd15570ec5842e6d268fae9aa9f6c9e6cb6e4156ce002d8154
+EBUILD eog-2.30.2.ebuild 1485 RMD160 0c13407b8d4f1ad94cd3ca0693591e613b2fd77e SHA1 682ab68286be1f011d542808ab8de6d2855f94e4 SHA256 8f8effcc42096a7bce5f1b73bce6a1f9ee83f800c5b99cdd31b7e44269f96907
+MISC ChangeLog 31251 RMD160 e44d133952dac7521a751baa272b5d97a7d5fb0c SHA1 e57b9697fd54aab694140cd7424266f26712447f SHA256 84929c7ce8e74bcdacb7aca0e3d57889d16b5c76953dabb0c3569eab72f6f71a
 MISC metadata.xml 377 RMD160 72d273853415be617a9d9041a8e976471f5d5d0e SHA1 31212db654340d26addb59e4f5ecdeeaa08e4d06 SHA256 d51779b821ec7ef34d3c040683f4373de52797e453cf90e490343eee3230367f
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iEYEARECAAYFAkwgw2EACgkQCaWpQKGI+9QBgACfX6lyX5sWCuqGv6z/wiTfEIHk
+4y8AoITPu1LEE5N+Nmc1lJogQ3z8hrH2
+=mqel
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/eog/eog-2.30.1.ebuild b/media-gfx/eog/eog-2.30.2.ebuild
index cb460a58761e..0d503ddccfda 100644
--- a/media-gfx/eog/eog-2.30.1.ebuild
+++ b/media-gfx/eog/eog-2.30.2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/eog/eog-2.30.1.ebuild,v 1.2 2010/06/21 11:48:28 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/eog/eog-2.30.2.ebuild,v 1.1 2010/06/22 14:06:19 pacho Exp $
 
 EAPI=2
 
-inherit eutils gnome2 autotools
+inherit gnome2
 
 DESCRIPTION="The Eye of GNOME image viewer"
 HOMEPAGE="http://www.gnome.org/projects/eog/"
@@ -56,12 +56,3 @@ pkg_setup() {
 		--disable-scrollkeeper
 		--disable-schemas-install"
 }
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Fix build without libjpeg, bug #319157
-	epatch "${FILESDIR}/${P}-libjpeg-configure.patch"
-
-	eautoreconf
-}
diff --git a/media-gfx/eog/files/eog-2.30.1-libjpeg-configure.patch b/media-gfx/eog/files/eog-2.30.1-libjpeg-configure.patch
deleted file mode 100644
index 97ab0c5d2674..000000000000
--- a/media-gfx/eog/files/eog-2.30.1-libjpeg-configure.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From d44efad798c313288f4b136b08e88ad580880673 Mon Sep 17 00:00:00 2001
-From: Claudio Saavedra <csaavedra@igalia.com>
-Date: Tue, 15 Jun 2010 15:47:18 +0000
-Subject: Fix build without libjpeg
-
-AM_CONDITIONAL calls should be called always, otherwise configure
-gets confused.
-
-Fixes bug #621616.
----
-diff --git a/configure.ac b/configure.ac
-index 3631dd7..8f1e713 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -227,7 +227,6 @@ int main(int c, char**v) { return 0; }
- 			   have_libjpeg_80=yes],
- 		          [AC_MSG_RESULT(no)
- 		           have_libjpeg_80=no])
--        AM_CONDITIONAL(HAVE_LIBJPEG_80, test "x$have_libjpeg_80" = xyes)
- 
-       else
-           AC_MSG_WARN(*** JPEG loader will not be built (JPEG header file not found) ***)
-@@ -243,6 +242,7 @@ int main(int c, char**v) { return 0; }
-   fi
- AC_SUBST(LIBJPEG)
- AM_CONDITIONAL(ENABLE_JPEG, test x$have_jpeg = xyes)
-+AM_CONDITIONAL(HAVE_LIBJPEG_80, test "x$have_libjpeg_80" = xyes)
- 
- # ****************
- # D-Bus activation
---
-cgit v0.8.3.1