New version for GNOME 2.26. Drop libgnome and libglade dependencies. Clean up old revisions.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

7 files changed, 43 insertions, 196 deletions

diff --git a/media-gfx/eog/ChangeLog b/media-gfx/eog/ChangeLog
index c4abb51c0fbe..395b292ffb6b 100644
--- a/media-gfx/eog/ChangeLog
+++ b/media-gfx/eog/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-gfx/eog
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/eog/ChangeLog,v 1.241 2009/04/27 14:25:27 jer Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/eog/ChangeLog,v 1.242 2009/05/10 19:09:34 eva Exp $
+
+*eog-2.26.1 (10 May 2009)
+
+  10 May 2009; Gilles Dartiguelongue <eva@gentoo.org> -eog-2.20.2.ebuild,
+  -eog-2.22.3-r1.ebuild, -eog-2.22.3-r3.ebuild,
+  -files/eog-2.22.3-CVE-2008-5987.patch,
+  -files/eog-2.22.3-unrecognized-chunks.patch, +eog-2.26.1.ebuild:
+  New version for GNOME 2.26. Drop libgnome and libglade dependencies.
+  Clean up old revisions.
 
   27 Apr 2009; Jeroen Roovers <jer@gentoo.org> eog-2.24.3.1:
   Stable for HPPA (bug #260063).
diff --git a/media-gfx/eog/Manifest b/media-gfx/eog/Manifest
index 66e0e490deea..211302988292 100644
--- a/media-gfx/eog/Manifest
+++ b/media-gfx/eog/Manifest
@@ -1,12 +1,17 @@
-AUX eog-2.22.3-CVE-2008-5987.patch 320 RMD160 d87d41b0220c860ed532ab734e3f148fc246e2c1 SHA1 4dcc4e941b4f8fcc5bf4992739a93df5345263e4 SHA256 5606ba07f426392b32bb21758c528088eea8ca20b07ea2eb1fdc3730e19afac2
-AUX eog-2.22.3-unrecognized-chunks.patch 647 RMD160 2599ad1e0ff582feadb923991c19d1cf3522da5b SHA1 dbdb26a163931b4b512610a2a9d239fbbc8c9bbe SHA256 3d68ad99e33c5ec820667615135948ca421cd83ed5d48caa57b81fea7a27211f
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX eog-2.24.3.1-noexif-doc.patch 10082 RMD160 1575e2808ebfbec36bf9e5c1df85558119e4d2ae SHA1 b2209039027c9093d258aa53ffe07d52366e6458 SHA256 0bd4201ed79c10aa966eb64a2b3aa9cb282c5995116b42491671a54fb9e5c360
-DIST eog-2.20.2.tar.bz2 1656601 RMD160 0c3bd4f85a76910e5c892b27ec02645de990e2fa SHA1 eca46e393cd02bf5156c30a6f64a9341e0a3bcca SHA256 4b18634547cb5cd712a9550f6adb789d1ef49b27406ad60208b6f6bdd6730f62
-DIST eog-2.22.3.tar.bz2 1894695 RMD160 36f6620c17d4e56addcaee93563721368d9c29eb SHA1 4edc6eefddaad78a0e266eb800aa1d926abf56de SHA256 183656d9ae0347eded7ba02c992e281f7e139ec82a0ee854c6ee387548391dd2
 DIST eog-2.24.3.1.tar.bz2 2253386 RMD160 dd35387630d6ebc89b1bb776c8128be35210f58f SHA1 b5415acbfe99d7ea31f5d12106f4b1817043a320 SHA256 727d3a25acf9f77f2d444c31a09924f545ccb5d2a6fd5d52e43383bc188496b3
-EBUILD eog-2.20.2.ebuild 1396 RMD160 0fb4f35a4d02c0b05bce115c5447547bc6f82efe SHA1 e10629ae31f30ab3d80f179eba5b7e6e0eb23e93 SHA256 94355e254486e0035fe255fce210565d104520d4ac326df1483a6569dd1f148c
-EBUILD eog-2.22.3-r1.ebuild 1832 RMD160 50c9ad3a714b2854e220c7f935cf73a0f0120fc3 SHA1 e703cb52a429ffce4cf28a6042acc6090ebd51b0 SHA256 f8e125f3d336047791d575820dbb02090d1894662e38d61a88c0e7c88b120036
-EBUILD eog-2.22.3-r3.ebuild 2059 RMD160 6e483b4070e778da627c312e2bc4fb294b35d198 SHA1 c80b5d76f2bf53414a2fe605a2098eb1501a7e01 SHA256 2b57e7a09efbf34f0cf151d6190cd1647f3da07afc08c9157fc088e6e71213a6
+DIST eog-2.26.1.tar.bz2 2415358 RMD160 eb006a42f6380fec68f3fd9c2d3c068fc5d6dd54 SHA1 5e75fe05d7f85d0c982b8f5faf9ad616cb36e568 SHA256 91b50a2958d5319e5908c3c0095c613278a9a25ee9904e5cba847f84917d4778
 EBUILD eog-2.24.3.1.ebuild 2208 RMD160 97b1f584022347f94e8f9d6958d178e6b1934aaa SHA1 6f12f0a4b2f2cae6eb8457ecf8f1df807da9d66c SHA256 badd24cdbc93669f16fc87d6434da84e5116f80f8a635f2cc27491fc122226e2
-MISC ChangeLog 28208 RMD160 aa17b7f7623dcd4f109b531821cf7047a00f2b74 SHA1 9b8ef95d4fd79c3f60c26066c0ea1d0fcdb5003e SHA256 86b14ef9888b3186b52700255026949dbabe98e3288f1fa667c362831a3e9a71
+EBUILD eog-2.26.1.ebuild 1792 RMD160 63761eea01e482a23c2e35f9c5beadb468ed6403 SHA1 0a352a1e5f9664277da9b6ced8473ea336cbe264 SHA256 aef2819c11d5944392f1b67884d5c8c98f7e0e412aaeef4c70ebca86250036fb
+MISC ChangeLog 28563 RMD160 4f1c9cbff5fa73e7f838845923c7e7e4f551e1ef SHA1 7041dd168f1d5d7376443f896f2914255915163d SHA256 d27ab815634625c3bb975db8d8a5fed803be186b4adeae680d4964cbf34e993c
 MISC metadata.xml 445 RMD160 676e0107e6e5962adb7a4406619b6aec5282e57f SHA1 9b9302bb9ce1f1ee050edbe97a4ac3d3dd085dd5 SHA256 21f71745f7c902860be8bae40a732deb6d3255187d3bd9cb78d9c851813666f9
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEUEARECAAYFAkoHJnQACgkQ1fmVwcYIWAYAtQCWIIQc5zn6Qmqs7H88/cov23xG
+IQCfdwAmIvFDLV8JwoE7rBhntQZ9oIc=
+=Vw0E
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/eog/eog-2.20.2.ebuild b/media-gfx/eog/eog-2.20.2.ebuild
deleted file mode 100644
index 63bee9f865c4..000000000000
--- a/media-gfx/eog/eog-2.20.2.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/eog/eog-2.20.2.ebuild,v 1.11 2008/10/06 21:18:39 eva Exp $
-
-inherit gnome2
-
-DESCRIPTION="The Eye of GNOME image viewer"
-HOMEPAGE="http://www.gnome.org/projects/eog/"
-
-LICENSE="GPL-2"
-SLOT="1"
-KEYWORDS="arm"
-IUSE="dbus jpeg lcms python"
-
-# FIXME: add exempi to the tree ?
-
-RDEPEND=">=x11-libs/gtk+-2.11.6
-	>=dev-libs/glib-2.12
-	>=gnome-base/gnome-vfs-2.10
-	>=gnome-base/libgnomeui-2.10
-	>=gnome-base/libglade-2.3.6
-	>=gnome-base/gconf-2.5.90
-	>=media-libs/libart_lgpl-2.3.16
-	>=gnome-base/gnome-desktop-2.10
-	>=x11-themes/gnome-icon-theme-2.19.1
-	>=x11-misc/shared-mime-info-0.20
-	dbus? ( >=dev-libs/dbus-glib-0.71 )
-	jpeg? (
-		>=media-libs/libexif-0.6.14
-		media-libs/jpeg )
-	lcms? ( media-libs/lcms )
-	python? (
-		>=dev-lang/python-2.3
-		>=dev-python/pygobject-2.11.5
-		>=dev-python/pygtk-2.9.7
-		>=dev-python/gnome-python-2.18.2
-	)"
-
-DEPEND="${RDEPEND}
-	app-text/scrollkeeper
-	app-text/gnome-doc-utils
-	>=gnome-base/gnome-common-2.12.0
-	>=dev-util/intltool-0.35
-	>=dev-util/pkgconfig-0.17"
-
-DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README THANKS TODO"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		$(use_with jpeg libjpeg)
-		$(use_with jpeg libexif)
-		$(use_with dbus dbus-glib-1)
-		$(use_with lcms cms)
-		$(use_with python)
-		--disable-xmp"
-}
diff --git a/media-gfx/eog/eog-2.22.3-r3.ebuild b/media-gfx/eog/eog-2.22.3-r3.ebuild
deleted file mode 100644
index 2b7116e89c45..000000000000
--- a/media-gfx/eog/eog-2.22.3-r3.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/eog/eog-2.22.3-r3.ebuild,v 1.6 2009/03/18 19:08:20 ranger Exp $
-
-inherit eutils gnome2
-
-DESCRIPTION="The Eye of GNOME image viewer"
-HOMEPAGE="http://www.gnome.org/projects/eog/"
-
-LICENSE="GPL-2"
-SLOT="1"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="dbus exif lcms python"
-
-# FIXME: add exempi to the tree ?
-
-RDEPEND=">=x11-libs/gtk+-2.11.6
-	>=dev-libs/glib-2.15.3
-	>=gnome-base/gnome-vfs-2.10
-	>=gnome-base/libgnomeui-2.10
-	>=gnome-base/libglade-2.3.6
-	>=gnome-base/gconf-2.5.90
-	>=media-libs/libart_lgpl-2.3.16
-	>=gnome-base/gnome-desktop-2.10
-	>=x11-themes/gnome-icon-theme-2.19.1
-	>=x11-misc/shared-mime-info-0.20
-	dbus? ( >=dev-libs/dbus-glib-0.71 )
-	exif? (
-		>=media-libs/libexif-0.6.14
-		media-libs/jpeg )
-	lcms? ( media-libs/lcms )
-	python? (
-		>=dev-lang/python-2.3
-		>=dev-python/pygobject-2.11.5
-		>=dev-python/pygtk-2.9.7
-		>=dev-python/gnome-python-2.18.2
-	)"
-DEPEND="${RDEPEND}
-	app-text/gnome-doc-utils
-	sys-devel/gettext
-	>=dev-util/intltool-0.35
-	>=dev-util/pkgconfig-0.17"
-
-DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README THANKS TODO"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		$(use_with exif libjpeg)
-		$(use_with exif libexif)
-		$(use_with dbus dbus-glib-1)
-		$(use_with lcms cms)
-		$(use_enable python)
-		--without-xmp
-		--disable-scrollkeeper"
-}
-
-src_unpack() {
-	gnome2_src_unpack
-
-	# Don't fail on unrecognized chunks, bug #237835
-	epatch "${FILESDIR}/${P}-unrecognized-chunks.patch"
-
-	# Sanitize python paths. bug #257002
-	epatch "${FILESDIR}"/${P}-CVE-2008-5987.patch
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	if ! built_with_use =x11-libs/gtk+-2* jpeg; then
-		ewarn "For JPEG file support to work, x11-libs/gtk+ must be rebuilt"
-		ewarn "with the 'jpeg' USE flag enabled."
-	fi
-
-	if ! built_with_use =x11-libs/gtk+-2* tiff; then
-		ewarn "For TIFF file support to work, x11-libs/gtk+ must be rebuilt"
-		ewarn "with the 'tiff' USE flag enabled."
-	fi
-}
diff --git a/media-gfx/eog/eog-2.22.3-r1.ebuild b/media-gfx/eog/eog-2.26.1.ebuild
index 1b2dfbbc50a3..d52366c78a35 100644
--- a/media-gfx/eog/eog-2.22.3-r1.ebuild
+++ b/media-gfx/eog/eog-2.26.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/eog/eog-2.22.3-r1.ebuild,v 1.7 2008/11/13 19:24:17 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/eog/eog-2.26.1.ebuild,v 1.1 2009/05/10 19:09:34 eva Exp $
 
 inherit eutils gnome2
 
@@ -9,21 +9,18 @@ HOMEPAGE="http://www.gnome.org/projects/eog/"
 
 LICENSE="GPL-2"
 SLOT="1"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="dbus exif lcms python"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="dbus doc exif lcms python xmp"
 
-# FIXME: add exempi to the tree ?
-
-RDEPEND=">=x11-libs/gtk+-2.11.6
+RDEPEND=">=x11-libs/gtk+-2.13.1
 	>=dev-libs/glib-2.15.3
-	>=gnome-base/gnome-vfs-2.10
-	>=gnome-base/libgnomeui-2.10
-	>=gnome-base/libglade-2.3.6
+	>=dev-libs/libxml2-2
 	>=gnome-base/gconf-2.5.90
+	>=gnome-base/gnome-desktop-2.25.1
 	>=media-libs/libart_lgpl-2.3.16
-	>=gnome-base/gnome-desktop-2.10
 	>=x11-themes/gnome-icon-theme-2.19.1
 	>=x11-misc/shared-mime-info-0.20
+
 	dbus? ( >=dev-libs/dbus-glib-0.71 )
 	exif? (
 		>=media-libs/libexif-0.6.14
@@ -31,15 +28,16 @@ RDEPEND=">=x11-libs/gtk+-2.11.6
 	lcms? ( media-libs/lcms )
 	python? (
 		>=dev-lang/python-2.3
-		>=dev-python/pygobject-2.11.5
-		>=dev-python/pygtk-2.9.7
-		>=dev-python/gnome-python-2.18.2
-	)"
+		>=dev-python/pygobject-2.15.1
+		>=dev-python/pygtk-2.13 )
+	xmp? ( >=media-libs/exempi-2 )"
+
 DEPEND="${RDEPEND}
 	app-text/gnome-doc-utils
 	sys-devel/gettext
-	>=dev-util/intltool-0.35
-	>=dev-util/pkgconfig-0.17"
+	>=dev-util/intltool-0.40
+	>=dev-util/pkgconfig-0.17
+	doc? ( >=dev-util/gtk-doc-1.10 )"
 
 DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README THANKS TODO"
 
@@ -47,11 +45,12 @@ pkg_setup() {
 	G2CONF="${G2CONF}
 		$(use_with exif libjpeg)
 		$(use_with exif libexif)
-		$(use_with dbus dbus-glib-1)
+		$(use_with dbus)
 		$(use_with lcms cms)
 		$(use_enable python)
-		--without-xmp
-		--disable-scrollkeeper"
+		$(use_with xmp)
+		--disable-scrollkeeper
+		--disable-schemas-install"
 }
 
 pkg_postinst() {
diff --git a/media-gfx/eog/files/eog-2.22.3-CVE-2008-5987.patch b/media-gfx/eog/files/eog-2.22.3-CVE-2008-5987.patch
deleted file mode 100644
index 8de379384b36..000000000000
--- a/media-gfx/eog/files/eog-2.22.3-CVE-2008-5987.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/src/eog-python-module.c
-+++ b/src/eog-python-module.c
-@@ -388,6 +388,9 @@
- 
- 	PySys_SetArgv (1, argv);
- 
-+	/* Sanitize sys.path */
-+	PyRun_SimpleString("import sys; sys.path = filter(None, sys.path)");
-+
- 	if (!check_pygtk2 ()) {
- 		/* Warning message already printed in check_pygtk2 */
- 		goto python_init_error;
diff --git a/media-gfx/eog/files/eog-2.22.3-unrecognized-chunks.patch b/media-gfx/eog/files/eog-2.22.3-unrecognized-chunks.patch
deleted file mode 100644
index 21229b62f765..000000000000
--- a/media-gfx/eog/files/eog-2.22.3-unrecognized-chunks.patch
+++ /dev/null
@@ -1,19 +0,0 @@
----
-	2008-09-30  Felix Riemann  <friemann@svn.gnome.org>
-	
-	* src/eog-metadata-reader-jpg.c: (eog_metadata_reader_jpg_consume):
-	Don't overwrite the last read chunk when skipping over unrecognized
-	APP1 chunks. Avoids memory corruption and subsequent segfaults.
-
-Index: trunk/src/eog-metadata-reader.c
-====================================================================
---- trunk/src/eog-metadata-reader.c	2008/09/30 11:58:28	4810
-+++ trunk/src/eog-metadata-reader.c	2008/09/30 13:49:31	4811
-@@ -321,6 +321,7 @@
- 			case EJA_OTHER:
- 			default:
- 				/* skip unknown data */
-+				chunk = NULL;
- 				priv->state = EMR_SKIP_BYTES;
- 				break;
- 			}