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

(Portage version: 2.2.0_alpha3/cvs/Linux x86_64)

5 files changed, 13 insertions, 157 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/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