Fix python and xmp switches to econf (bug #231988)

Correct jpeg USE flag to be exif and throw a warning if x11-libs/gtk+ is
built without JPEG/TIFF support (bug #230337)
Package-Manager: portage-2.2_rc2/cvs/Linux 2.6.26 i686

3 files changed, 79 insertions, 12 deletions

diff --git a/media-gfx/eog/ChangeLog b/media-gfx/eog/ChangeLog
index 795fcb4b6f14..b7ac27d0be89 100644
--- a/media-gfx/eog/ChangeLog
+++ b/media-gfx/eog/ChangeLog
@@ -1,6 +1,13 @@
 # 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.199 2008/07/02 21:38:08 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/eog/ChangeLog,v 1.200 2008/07/23 20:28:28 ford_prefect Exp $
+
+*eog-2.22.3-r1 (23 Jul 2008)
+
+  23 Jul 2008; Arun Raghavan <ford_prefect@gentoo.org> +eog-2.22.3-r1.ebuild:
+  Fix python and xmp switches to econf (bug #231988)
+  Correct jpeg USE flag to be exif and throw a warning if x11-libs/gtk+ is
+  built without JPEG/TIFF support (bug #230337)
 
 *eog-2.22.3 (02 Jul 2008)
 
diff --git a/media-gfx/eog/Manifest b/media-gfx/eog/Manifest
index 223d83a99332..be5253cbc1a5 100644
--- a/media-gfx/eog/Manifest
+++ b/media-gfx/eog/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 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.0.tar.bz2 1895093 RMD160 045dc4989fbee15ab009a08a35a1d06e56b8dbfe SHA1 792eec19f3b2b363d48fdae312b4f52edece5218 SHA256 8cf92ba3e96d23a3668adb4ea2d09088db3dd7aa8987b9938ad4e98698d49422
@@ -12,13 +9,7 @@ EBUILD eog-2.20.4.ebuild 1448 RMD160 b633e9ecefdd3cab848b61a798d163534a889a0b SH
 EBUILD eog-2.22.0.ebuild 1444 RMD160 2fc28914d7ea8a7abd8d0176b2ee37dab73f2b5d SHA1 55bfccf8cff710dd4eea8d3ebe0cb60ad5d8fa79 SHA256 2f0010de60f5bf980a5fc24afb4218f02f00353e345a5680f989b62a11a57b8b
 EBUILD eog-2.22.1.ebuild 1444 RMD160 48cb15352877be14dbf8d98789e6833e7fe7c789 SHA1 9f8c114c1e474e3cddcac8d8c8f9ad30bc811ade SHA256 cb8ca29244beb2749e0b42716dc42ba882abc17a0abe791350f24d9a9fb0cde0
 EBUILD eog-2.22.2.ebuild 1444 RMD160 df8204c8698ec7f575b330ae1d79d6fc8fb8e686 SHA1 dc99656d520deabff161354e8c937282f8f15ea8 SHA256 4bbe586fc10c4ba0f34ee3ec691ae87407801783fc69f26e219beb6bc86b61a9
+EBUILD eog-2.22.3-r1.ebuild 1846 RMD160 10783c1a32783e999fe538550e536cf893abcef0 SHA1 4cd5f81523a394cad4d0fa20b61bab1ccbd27c29 SHA256 f7d58a5a66c03673e7870d4f73ad2dbc117c87185e3bdfdbcd419ba8b9c95c09
 EBUILD eog-2.22.3.ebuild 1444 RMD160 581ab4ffa66ed60f49e718533b6c1bb4c4a4096b SHA1 6c0e08c0f0eb474f7fb3792f93fe2bdf0ffe3969 SHA256 4dffd421fcb44087270276f2d794d60aec5cbdc71df44072673924bc599ab89b
-MISC ChangeLog 22479 RMD160 3d615194161ee37332eebecde964a385d7f7be07 SHA1 abaadb1c3c2979c146d1fa7ffbcb21a7d59fee1f SHA256 91cb203c6bb70b8695e1763adee4ab3a964b40425a7c2d7ae229da16e5a79ede
+MISC ChangeLog 22773 RMD160 ad3d7ab78ce71f5dd7a3c381847fd8f5a35388b3 SHA1 f3ab5df9d0a2976339078f2e9dc232965e8ccbd7 SHA256 e3672fadc792f977da238e73d073d75e5f3acd5f593ede379c89d252e469e730
 MISC metadata.xml 377 RMD160 72d273853415be617a9d9041a8e976471f5d5d0e SHA1 31212db654340d26addb59e4f5ecdeeaa08e4d06 SHA256 d51779b821ec7ef34d3c040683f4373de52797e453cf90e490343eee3230367f
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkhr9UUACgkQ1fmVwcYIWAYyIwCfQy6rTeE+yctIT5E61A2+olwU
-5KwAoLp3bFMaSZW6gReiOpLTKOJARBfJ
-=xWto
------END PGP SIGNATURE-----
diff --git a/media-gfx/eog/eog-2.22.3-r1.ebuild b/media-gfx/eog/eog-2.22.3-r1.ebuild
new file mode 100644
index 000000000000..5cfd47911040
--- /dev/null
+++ b/media-gfx/eog/eog-2.22.3-r1.ebuild
@@ -0,0 +1,69 @@
+# 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.22.3-r1.ebuild,v 1.1 2008/07/23 20:28:28 ford_prefect 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"
+}
+
+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
+}