New version for GNOME 2.24. Mostly bug fixes, plugins' API now has a gtk-doc documentation, uses gio/gvfs.

Package-Manager: portage-2.2_rc12/cvs/Linux 2.6.24-gentoo-r8-mactel x86_64
RepoMan-Options: --force

5 files changed, 122 insertions, 3 deletions

diff --git a/media-gfx/eog/ChangeLog b/media-gfx/eog/ChangeLog
index 649d1836ffdb..916eb71422c9 100644
--- a/media-gfx/eog/ChangeLog
+++ b/media-gfx/eog/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-gfx/eog
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/eog/ChangeLog,v 1.213 2008/10/18 22:48:00 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/eog/ChangeLog,v 1.214 2008/10/19 18:57:26 eva Exp $
+
+*eog-2.24.0 (19 Oct 2008)
+
+  19 Oct 2008; Gilles Dartiguelongue <eva@gentoo.org>
+  +files/eog-2.24.0-unrecognized-chunks.patch, +eog-2.24.0.ebuild,
+  metadata.xml:
+  New version for GNOME 2.24. Mostly bug fixes, plugins' API now has a
+  gtk-doc documentation, uses gio/gvfs.
 
   18 Oct 2008; Brent Baude <ranger@gentoo.org> eog-2.22.3-r1.ebuild:
   Marking eog-2.22.3-r1 ppc stable for bug 236971
diff --git a/media-gfx/eog/Manifest b/media-gfx/eog/Manifest
index 2f2c76f7a741..1dc59b7b970b 100644
--- a/media-gfx/eog/Manifest
+++ b/media-gfx/eog/Manifest
@@ -1,12 +1,25 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX eog-2.22.3-unrecognized-chunks.patch 647 RMD160 2599ad1e0ff582feadb923991c19d1cf3522da5b SHA1 dbdb26a163931b4b512610a2a9d239fbbc8c9bbe SHA256 3d68ad99e33c5ec820667615135948ca421cd83ed5d48caa57b81fea7a27211f
+AUX eog-2.24.0-unrecognized-chunks.patch 659 RMD160 ecdbcacb43cdb31ebe868eac30d9f5d89e7579cc SHA1 471eb920a117e374e397e07005c5689faf99e240 SHA256 ba7c2e9c4da137a9d482578e73f6758e093c3b3661da4df0f70aa00a2fb18ca8
 DIST eog-2.20.2.tar.bz2 1656601 RMD160 0c3bd4f85a76910e5c892b27ec02645de990e2fa SHA1 eca46e393cd02bf5156c30a6f64a9341e0a3bcca SHA256 4b18634547cb5cd712a9550f6adb789d1ef49b27406ad60208b6f6bdd6730f62
 DIST eog-2.20.4.tar.bz2 1666532 RMD160 dc7ea74ae89beb3369795a3c8c91538f2b9c679d SHA1 d129f2ac01cc7b8d70c880d4b277d70c3d236e19 SHA256 46678eb6767cb1bcb31a0d2d9af31653c91d7a8d698ec5637655ab9229eb811a
 DIST eog-2.22.2.tar.bz2 1899431 RMD160 1620a97937f521d978a4549b200e815a61bacaa4 SHA1 b9091c25b31fea262c9557d1148f5e6d4af08f9e SHA256 3c6552d2d55317241a6cab9d294c91bed084a957cca84c4b76b059a298ea66fb
 DIST eog-2.22.3.tar.bz2 1894695 RMD160 36f6620c17d4e56addcaee93563721368d9c29eb SHA1 4edc6eefddaad78a0e266eb800aa1d926abf56de SHA256 183656d9ae0347eded7ba02c992e281f7e139ec82a0ee854c6ee387548391dd2
+DIST eog-2.24.0.tar.bz2 2142455 RMD160 b05a46d96980c758dcd814c48af116e70135b811 SHA1 a36bcd101e19046f8b04b4f87dfa6a468c385b92 SHA256 e3452d33e299e7f3d9a869adfb846bfaf9f0eafb701306643cc4771bf812930f
 EBUILD eog-2.20.2.ebuild 1396 RMD160 0fb4f35a4d02c0b05bce115c5447547bc6f82efe SHA1 e10629ae31f30ab3d80f179eba5b7e6e0eb23e93 SHA256 94355e254486e0035fe255fce210565d104520d4ac326df1483a6569dd1f148c
 EBUILD eog-2.20.4.ebuild 1448 RMD160 364cdb348d3d7205f27affea42848b28ba9d360b SHA1 cecd1e421706762ea05db10bb3f05ecdb85ad2d4 SHA256 f12ff43992c9de5b4ea3b7d6115b5234dc8e978005e7590db214bcb8e5446225
 EBUILD eog-2.22.2.ebuild 1442 RMD160 49c0ec1a7c8216cba25630760c5903df71721672 SHA1 6517669e53db894e734432fb464a449223c9b414 SHA256 68a19133c4e839ca729e3c35e96844e5273d1040dfe9a53b3b5eea49af23a531
 EBUILD eog-2.22.3-r1.ebuild 1833 RMD160 2196f618f2415f9ff307b1c7168e7857cd3c3b81 SHA1 5b0e5048db891676d6125ac34c0a8bc8895db4fd SHA256 0abc8c944ad6024d84569fbb7d72c9888dd6726e3772865da9dbcdec979f63c9
 EBUILD eog-2.22.3-r2.ebuild 1978 RMD160 33304c7e86f672a1738b8dbf2fb1e054ea49d9c9 SHA1 630b7cc9901070cc98994d70b21d10ffb25f7963 SHA256 30b52cd16974751c1a2b0205ae001ef6ab759f037fbacba4aece8a93dc7e139d
-MISC ChangeLog 24401 RMD160 e30e56517037e4c58d515367731cf519d099b3b2 SHA1 3bb7297a8729d75c36b93d45caccc6616decda70 SHA256 1505b443402312921b46ee95a02562605077c25140c98153957ca93d30325083
-MISC metadata.xml 377 RMD160 72d273853415be617a9d9041a8e976471f5d5d0e SHA1 31212db654340d26addb59e4f5ecdeeaa08e4d06 SHA256 d51779b821ec7ef34d3c040683f4373de52797e453cf90e490343eee3230367f
+EBUILD eog-2.24.0.ebuild 1962 RMD160 27f29d43b240c6079a96443e3e09757844d2a00f SHA1 cb3adfe2afae7a3c8d1b1c38bee8be2440102232 SHA256 270bb952738f014721d05affcac54cf96bade7fa9e09fa5de936e83e83aa9d4d
+MISC ChangeLog 24674 RMD160 fbe24a25bda700f806acfe51113ea12a92e3c9b8 SHA1 d77960371e5009bd00b604e2bba140f294599c22 SHA256 f3ce604a7c682aece87234db03acf9f1aef1c660442ecac255f5f47c4df48f7f
+MISC metadata.xml 445 RMD160 676e0107e6e5962adb7a4406619b6aec5282e57f SHA1 9b9302bb9ce1f1ee050edbe97a4ac3d3dd085dd5 SHA256 21f71745f7c902860be8bae40a732deb6d3255187d3bd9cb78d9c851813666f9
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkj7gyAACgkQ1fmVwcYIWAaFqgCgu9PAu/wjOjQjFQiO6XllW7ZC
+JrIAnjw5OiGJdKdYIPlqWGU+0wKlq8g+
+=8+wr
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/eog/eog-2.24.0.ebuild b/media-gfx/eog/eog-2.24.0.ebuild
new file mode 100644
index 000000000000..b2cf6ed5cc7d
--- /dev/null
+++ b/media-gfx/eog/eog-2.24.0.ebuild
@@ -0,0 +1,76 @@
+# 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.24.0.ebuild,v 1.1 2008/10/19 18:57:26 eva Exp $
+
+inherit eutils gnome2
+
+DESCRIPTION="The Eye of GNOME image viewer"
+HOMEPAGE="http://www.gnome.org/projects/eog/"
+
+LICENSE="GPL-2"
+SLOT="1"
+KEYWORDS="~amd64 ~x86"
+IUSE="dbus doc exif lcms python xmp"
+
+RDEPEND=">=x11-libs/gtk+-2.13.1
+	>=dev-libs/glib-2.15.3
+	>=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 )
+	xmp? ( >=media-libs/exempi-2 )"
+
+DEPEND="${RDEPEND}
+	app-text/gnome-doc-utils
+	sys-devel/gettext
+	>=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"
+
+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)
+		$(use_with xmp)
+		--disable-scrollkeeper
+		--disable-schemas-install"
+}
+
+src_unpack() {
+	gnome2_src_unpack
+
+	# Don't fail on unrecognized chunks, bug #237835
+	epatch "${FILESDIR}/${P}-unrecognized-chunks.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/files/eog-2.24.0-unrecognized-chunks.patch b/media-gfx/eog/files/eog-2.24.0-unrecognized-chunks.patch
new file mode 100644
index 000000000000..56df1f913145
--- /dev/null
+++ b/media-gfx/eog/files/eog-2.24.0-unrecognized-chunks.patch
@@ -0,0 +1,19 @@
+---
+	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-jpg.c
+====================================================================
+--- trunk/src/eog-metadata-reader-jpg.c	2008/09/30 11:58:28	4810
++++ trunk/src/eog-metadata-reader-jpg.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;
+ 			}
diff --git a/media-gfx/eog/metadata.xml b/media-gfx/eog/metadata.xml
index e17e20c0a3e7..749d07071daf 100644
--- a/media-gfx/eog/metadata.xml
+++ b/media-gfx/eog/metadata.xml
@@ -2,6 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>gnome</herd>
+<use>
+	<flag name='xmp'>Adds support for XMP metadata</flag>
+</use>
 <longdescription lang="en">
 The Eye of GNOME image viewer is the official image viewer for the GNOME Desktop environment.
 With it, you can view single image files, as well as large image collections.