[gentoo-commits] proj/gnome:master commit in: media-gfx/eog/, media-gfx/eog/files/

["Gilles Dartiguelongue" <eva@gentoo.org>]

commit:     40ad79dd5e1e37abe4099e4fa1b2ae5612f51618
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 28 12:33:58 2012 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Oct 28 12:36:08 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=40ad79dd

media-gfx/eog: 3.6.0-r1 → 3.6.1

exif USE flag is useless without jpeg support as demonstrated by
dependencies. Enhance ebuild with REQUIRED_IUSE to reflect this.

---
 .../eog/{eog-3.6.0-r1.ebuild => eog-3.6.1.ebuild}  |   17 ++++--------
 media-gfx/eog/eog-9999.ebuild                      |    9 +++---
 media-gfx/eog/files/eog-3.6.0-eog.desktop.patch    |   28 --------------------
 3 files changed, 11 insertions(+), 43 deletions(-)

diff --git a/media-gfx/eog/eog-3.6.0-r1.ebuild b/media-gfx/eog/eog-3.6.1.ebuild
similarity index 86%
rename from media-gfx/eog/eog-3.6.0-r1.ebuild
rename to media-gfx/eog/eog-3.6.1.ebuild
index 0a25ad3..2271efe 100644
--- a/media-gfx/eog/eog-3.6.0-r1.ebuild
+++ b/media-gfx/eog/eog-3.6.1.ebuild
@@ -6,7 +6,7 @@ EAPI="4"
 GCONF_DEBUG="yes"
 GNOME2_LA_PUNT="yes"
 
-inherit eutils gnome2
+inherit gnome2
 if [[ ${PV} = 9999 ]]; then
 	inherit gnome2-live
 fi
@@ -24,6 +24,8 @@ else
 	KEYWORDS="~amd64 ~x86 ~x86-fbsd"
 fi
 
+REQUIRED_USE="exif? ( jpeg )"
+
 RDEPEND=">=x11-libs/gtk+-3.3.6:3[introspection,X]
 	>=dev-libs/glib-2.31.0:2
 	>=dev-libs/libxml2-2:2
@@ -36,9 +38,7 @@ RDEPEND=">=x11-libs/gtk+-3.3.6:3[introspection,X]
 	x11-libs/gdk-pixbuf:2[jpeg?,tiff?]
 	x11-libs/libX11
 
-	exif? (
-		>=media-libs/libexif-0.6.14
-		virtual/jpeg:0 )
+	exif? ( >=media-libs/libexif-0.6.14 )
 	introspection? ( >=dev-libs/gobject-introspection-0.9.3 )
 	jpeg? ( virtual/jpeg:0 )
 	lcms? ( media-libs/lcms:2 )
@@ -56,7 +56,7 @@ if [[ ${PV} = 9999 ]]; then
 		doc? ( >=dev-util/gtk-doc-1.10 )"
 fi
 
-pkg_setup() {
+src_configure() {
 	G2CONF="${G2CONF}
 		$(use_enable introspection)
 		$(use_with jpeg libjpeg)
@@ -67,10 +67,5 @@ pkg_setup() {
 		--disable-schemas-compile"
 	[[ ${PV} != 9999 ]] && G2CONF="${G2CONF} ITSTOOL=$(type -P true)"
 	DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README THANKS TODO"
-}
-
-src_prepare() {
-	# https://bugzilla.gnome.org/show_bug.cgi?id=685923
-	epatch "${FILESDIR}/${PN}-3.6.0-eog.desktop.patch"
-	gnome2_src_prepare
+	gnome2_src_configure
 }

diff --git a/media-gfx/eog/eog-9999.ebuild b/media-gfx/eog/eog-9999.ebuild
index d79aef2..2271efe 100644
--- a/media-gfx/eog/eog-9999.ebuild
+++ b/media-gfx/eog/eog-9999.ebuild
@@ -24,6 +24,8 @@ else
 	KEYWORDS="~amd64 ~x86 ~x86-fbsd"
 fi
 
+REQUIRED_USE="exif? ( jpeg )"
+
 RDEPEND=">=x11-libs/gtk+-3.3.6:3[introspection,X]
 	>=dev-libs/glib-2.31.0:2
 	>=dev-libs/libxml2-2:2
@@ -36,9 +38,7 @@ RDEPEND=">=x11-libs/gtk+-3.3.6:3[introspection,X]
 	x11-libs/gdk-pixbuf:2[jpeg?,tiff?]
 	x11-libs/libX11
 
-	exif? (
-		>=media-libs/libexif-0.6.14
-		virtual/jpeg:0 )
+	exif? ( >=media-libs/libexif-0.6.14 )
 	introspection? ( >=dev-libs/gobject-introspection-0.9.3 )
 	jpeg? ( virtual/jpeg:0 )
 	lcms? ( media-libs/lcms:2 )
@@ -56,7 +56,7 @@ if [[ ${PV} = 9999 ]]; then
 		doc? ( >=dev-util/gtk-doc-1.10 )"
 fi
 
-pkg_setup() {
+src_configure() {
 	G2CONF="${G2CONF}
 		$(use_enable introspection)
 		$(use_with jpeg libjpeg)
@@ -67,4 +67,5 @@ pkg_setup() {
 		--disable-schemas-compile"
 	[[ ${PV} != 9999 ]] && G2CONF="${G2CONF} ITSTOOL=$(type -P true)"
 	DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README THANKS TODO"
+	gnome2_src_configure
 }

diff --git a/media-gfx/eog/files/eog-3.6.0-eog.desktop.patch b/media-gfx/eog/files/eog-3.6.0-eog.desktop.patch
deleted file mode 100644
index 0f5f7de..0000000
--- a/media-gfx/eog/files/eog-3.6.0-eog.desktop.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 165b5e18d66bb60d2cc8ff909c2fca5ff7650c14 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Wed, 10 Oct 2012 19:16:26 -0400
-Subject: [PATCH] Add 2DGraphics category to .desktop file
-
-Required to pass validation with desktop-file-utils 0.20
-
-https://bugzilla.gnome.org/show_bug.cgi?id=685923
----
- data/eog.desktop.in.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/data/eog.desktop.in.in b/data/eog.desktop.in.in
-index 5bf0ad4..672ee81 100644
---- a/data/eog.desktop.in.in
-+++ b/data/eog.desktop.in.in
-@@ -7,7 +7,7 @@ Icon=eog
- StartupNotify=true
- Terminal=false
- Type=Application
--Categories=GNOME;GTK;Graphics;RasterGraphics;Viewer;
-+Categories=GNOME;GTK;Graphics;2DGraphics;RasterGraphics;Viewer;
- X-GNOME-Bugzilla-Bugzilla=GNOME
- X-GNOME-Bugzilla-Product=EOG
- X-GNOME-Bugzilla-Component=general
--- 
-1.7.12
-