Allow use of alternate jpeg implementation. Re-drop hppa keyword, clean up old revisions.

Package-Manager: portage-2.2.0_alpha3/cvs/Linux x86_64

6 files changed, 26 insertions, 164 deletions

diff --git a/media-gfx/eog/ChangeLog b/media-gfx/eog/ChangeLog
index 2fd4bc0ba907..9702e9ab94b7 100644
--- a/media-gfx/eog/ChangeLog
+++ b/media-gfx/eog/ChangeLog
@@ -1,6 +1,11 @@
 # 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.272 2010/11/02 02:22:50 ford_prefect Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/eog/ChangeLog,v 1.273 2010/11/08 22:58:08 eva Exp $
+
+  08 Nov 2010; Gilles Dartiguelongue <eva@gentoo.org> -eog-2.26.3.ebuild,
+  -eog-2.28.2.ebuild, eog-2.30.2.ebuild, eog-2.32.0.ebuild:
+  Allow use of alternate jpeg implementation. Re-drop hppa keyword, clean up
+  old revisions.
 
   02 Nov 2010; Arun Raghavan <ford_prefect@gentoo.org> eog-2.32.0.ebuild:
   Fix gnome-desktop slot (2)
diff --git a/media-gfx/eog/Manifest b/media-gfx/eog/Manifest
index abff4d4ed781..6bf8c7a01c5b 100644
--- a/media-gfx/eog/Manifest
+++ b/media-gfx/eog/Manifest
@@ -1,10 +1,16 @@
-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
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST eog-2.30.2.tar.bz2 2789170 RMD160 56a1d683493e183a86094783a4114dd714fb1666 SHA1 f2b0f00f9908c2fbbb1088de7263100aa3435b48 SHA256 0f508cbc1727181122410f921f54d6c1464d0b98d544a04bd7d021d43d2ab91b
 DIST eog-2.32.0.tar.bz2 2806263 RMD160 64d80b6da608799df32eec6e8061beb6ec3de49b SHA1 c11d3ac5622dd2f64bd1656cabea41fe19cc9dfd SHA256 70a4eb753acf445ba3f07bf59d1ccad679b1c40a73c56f02c4df5165e336c2da
-EBUILD eog-2.26.3.ebuild 1830 RMD160 daace378b42a7119af364a4014d3dd86ba2caaf1 SHA1 9eed0edb0b558bc5877c84fa62fa74be2b94c32a SHA256 3242525ae47a7c8a8a301ab15a5eee9feb9ac5167140b77381186ca01867499c
-EBUILD eog-2.28.2.ebuild 1966 RMD160 09deb3df0aef3e85debccaa9d1d2bbd4be0062e7 SHA1 02ba14e3511c8bbaac30df1c91cdb76fa124c5db SHA256 1e9ee4a6eb6054fd397a01ee7ce8dfd3fd39937f34058e17c35fc8bd78b6aa1a
-EBUILD eog-2.30.2.ebuild 1473 RMD160 eb7cd4764f2af44e4cb3d8a31f1e906a79fa7455 SHA1 f0747df68461ca7c7234e463e461780fb0f3be6b SHA256 af31d12573d9c2dd2b45c988170a94eec9261f8a479fcbcda697b855310007ae
-EBUILD eog-2.32.0.ebuild 1700 RMD160 6d1f78f3d03d64a820a995f683a9bd249a974f5a SHA1 6f6392ad601d5d0c19ce294699d97bca236eb337 SHA256 c368a7ac42b2c3a19f63538de3dc2972cfd4645c4d0918a7069f3bbe58e7e5dd
-MISC ChangeLog 32460 RMD160 7e06e44327f2e6f863e3bf5cb6a91d23f43181a7 SHA1 451d5638a21f5470b85aa021aeb7d6f465c3d754 SHA256 5b7314e8ebe0dfe4955f389ab2037fed7fa951f19981f333071506937fde7b30
+EBUILD eog-2.30.2.ebuild 1467 RMD160 eb653e47ba0cb018b98dfd07674d9edae2a8e696 SHA1 ae755535b9a24e23ac4fdeb8bb90a0058947a4b5 SHA256 7100c795645c5cf4342e41b4c014271994a4b0c90decc427c6eced1c076bc405
+EBUILD eog-2.32.0.ebuild 1671 RMD160 704092a96c792485fb9b9a4a416c9e1d9de4e0d1 SHA1 e5b5e42a0e5de47b3e41aafa0fcc888a8e872b92 SHA256 2c74b34b888b8724cea64f1f3eece29902c6e2a8a8501a81b2364c1429298e23
+MISC ChangeLog 32680 RMD160 5fd8d83bae5580293c20708dd3d42a16a3166231 SHA1 9e8b40b86ea58f1df40acb989e3f0ae421ad534c SHA256 59e34d4aefb1b15e46353fcab639f73beddc87823982001942f71cdcf343d280
 MISC metadata.xml 377 RMD160 72d273853415be617a9d9041a8e976471f5d5d0e SHA1 31212db654340d26addb59e4f5ecdeeaa08e4d06 SHA256 d51779b821ec7ef34d3c040683f4373de52797e453cf90e490343eee3230367f
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAkzYjpwACgkQ1fmVwcYIWAadDACg0hTRtq0JenN9PVLiYMPoG4jd
+pJIAnj4TylPfuCxkl1E4Mv/i0nJMPgdG
+=Bvdo
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/eog/eog-2.26.3.ebuild b/media-gfx/eog/eog-2.26.3.ebuild
deleted file mode 100644
index 39f4691fb7ec..000000000000
--- a/media-gfx/eog/eog-2.26.3.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# 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.26.3.ebuild,v 1.10 2010/07/20 02:22:42 jer Exp $
-
-EAPI="2"
-
-inherit gnome2
-
-DESCRIPTION="The Eye of GNOME image viewer"
-HOMEPAGE="http://www.gnome.org/projects/eog/"
-
-LICENSE="GPL-2"
-SLOT="1"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="dbus doc exif lcms python xmp"
-
-RDEPEND=">=x11-libs/gtk+-2.13.1
-	>=dev-libs/glib-2.15.3
-	>=dev-libs/libxml2-2
-	>=gnome-base/gconf-2.5.90
-	>=gnome-base/gnome-desktop-2.25.1
-	>=media-libs/libart_lgpl-2.3.16
-	>=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.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.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)
-		$(use_with lcms cms)
-		$(use_enable python)
-		$(use_with xmp)
-		--enable-libtool-lock
-		--disable-dependency-tracking
-		--disable-scrollkeeper
-		--disable-schemas-install"
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	if ! has_version 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 ! has_version 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.28.2.ebuild b/media-gfx/eog/eog-2.28.2.ebuild
deleted file mode 100644
index dae61b6e64f8..000000000000
--- a/media-gfx/eog/eog-2.28.2.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# 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.28.2.ebuild,v 1.6 2010/08/18 22:18:05 maekke Exp $
-
-EAPI="2"
-
-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 ia64 ~ppc ~ppc64 sparc x86 ~x86-fbsd"
-IUSE="dbus doc exif lcms python xmp"
-
-RDEPEND=">=x11-libs/gtk+-2.15.2
-	>=dev-libs/glib-2.15.3
-	>=dev-libs/libxml2-2
-	>=gnome-base/gconf-2.5.90
-	>=gnome-base/gnome-desktop-2.25.1
-	>=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.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.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)
-		$(use_with lcms cms)
-		$(use_enable python)
-		$(use_with xmp)
-		--enable-libtool-lock
-		--disable-dependency-tracking
-		--disable-scrollkeeper
-		--disable-schemas-install"
-}
-
-src_install() {
-	gnome2_src_install
-	# Installed for plugins, but they're dlopen()-ed
-	find "${D}" -name "*.la" -delete || die "remove of la files failed"
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	if ! has_version 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 ! has_version 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.30.2.ebuild b/media-gfx/eog/eog-2.30.2.ebuild
index 150445a03f5d..de30a80f7622 100644
--- a/media-gfx/eog/eog-2.30.2.ebuild
+++ b/media-gfx/eog/eog-2.30.2.ebuild
@@ -1,6 +1,6 @@
 # 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.2.ebuild,v 1.8 2010/10/17 15:35:39 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/eog/eog-2.30.2.ebuild,v 1.9 2010/11/08 22:58:08 eva Exp $
 
 EAPI=2
 
@@ -25,8 +25,8 @@ RDEPEND=">=x11-libs/gtk+-2.17.5
 	dbus? ( >=dev-libs/dbus-glib-0.71 )
 	exif? (
 		>=media-libs/libexif-0.6.14
-		media-libs/jpeg )
-	jpeg? ( media-libs/jpeg
+		virtual/jpeg:0 )
+	jpeg? ( virtual/jpeg:0
 			x11-libs/gtk+[jpeg] )
 	lcms? ( =media-libs/lcms-1* )
 	python? (
diff --git a/media-gfx/eog/eog-2.32.0.ebuild b/media-gfx/eog/eog-2.32.0.ebuild
index d5aa693b1234..9c7a1d9a5ec9 100644
--- a/media-gfx/eog/eog-2.32.0.ebuild
+++ b/media-gfx/eog/eog-2.32.0.ebuild
@@ -1,6 +1,6 @@
 # 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.32.0.ebuild,v 1.2 2010/11/02 02:22:50 ford_prefect Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/eog/eog-2.32.0.ebuild,v 1.3 2010/11/08 22:58:08 eva Exp $
 
 EAPI="3"
 GCONF_DEBUG="yes"
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.gnome.org/projects/eog/"
 
 LICENSE="GPL-2"
 SLOT="1"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="dbus doc exif jpeg lcms python svg tiff xmp"
 
 RDEPEND=">=x11-libs/gtk+-2.18:2[jpeg?,tiff?]
@@ -28,8 +28,8 @@ RDEPEND=">=x11-libs/gtk+-2.18:2[jpeg?,tiff?]
 	dbus? ( >=dev-libs/dbus-glib-0.71 )
 	exif? (
 		>=media-libs/libexif-0.6.14
-		>=media-libs/jpeg-8:0 )
-	jpeg? ( >=media-libs/jpeg-8:0 )
+		virtual/jpeg:0 )
+	jpeg? ( virtual/jpeg:0 )
 	lcms? ( =media-libs/lcms-1* )
 	python? (
 		>=dev-python/pygobject-2.15.1