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

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

commit:     cd3fd7948670a105472a038cde0bd3030da6e964
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 13 10:56:25 2013 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Oct 13 11:15:23 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=cd3fd794

media-gfx/eog: 3.8.2 → 3.10.0

---
 .../eog/{eog-9999.ebuild => eog-3.10.0.ebuild}     | 39 +++++++---------------
 media-gfx/eog/eog-9999.ebuild                      | 27 +++++++--------
 2 files changed, 26 insertions(+), 40 deletions(-)

diff --git a/media-gfx/eog/eog-9999.ebuild b/media-gfx/eog/eog-3.10.0.ebuild
similarity index 61%
copy from media-gfx/eog/eog-9999.ebuild
copy to media-gfx/eog/eog-3.10.0.ebuild
index 6c79a2d..0aedac6 100644
--- a/media-gfx/eog/eog-9999.ebuild
+++ b/media-gfx/eog/eog-3.10.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -7,27 +7,19 @@ GCONF_DEBUG="yes"
 GNOME2_LA_PUNT="yes"
 
 inherit gnome2
-if [[ ${PV} = 9999 ]]; then
-	inherit gnome2-live
-fi
 
 DESCRIPTION="The Eye of GNOME image viewer"
-HOMEPAGE="http://www.gnome.org/projects/eog/"
+HOMEPAGE="http://projects.gnome.org/eog/"
 
 LICENSE="GPL-2+"
 SLOT="1"
 IUSE="+exif +introspection +jpeg lcms +svg tiff xmp"
-if [[ ${PV} = 9999 ]]; then
-	IUSE="${IUSE} doc"
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-fi
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 
 REQUIRED_USE="exif? ( jpeg )"
 
 RDEPEND="
-	>=x11-libs/gtk+-3.3.6:3[introspection,X]
+	>=x11-libs/gtk+-3.7.8:3[introspection,X]
 	>=dev-libs/glib-2.31:2
 	>=dev-libs/libxml2-2:2
 	>=dev-libs/libpeas-0.7.4:=[gtk]
@@ -53,21 +45,14 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 "
 
-if [[ ${PV} = 9999 ]]; then
-	DEPEND="${DEPEND}
-		app-text/yelp-tools
-		doc? ( >=dev-util/gtk-doc-1.10 )"
-fi
-
 src_configure() {
-	G2CONF="${G2CONF}
-		$(use_enable introspection)
-		$(use_with jpeg libjpeg)
-		$(use_with exif libexif)
-		$(use_with lcms cms)
-		$(use_with xmp)
-		$(use_with svg librsvg)"
-	[[ ${PV} != 9999 ]] && G2CONF="${G2CONF} ITSTOOL=$(type -P true)"
 	DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README THANKS TODO"
-	gnome2_src_configure
+	gnome2_src_configure \
+		$(use_enable introspection) \
+		$(use_with jpeg libjpeg) \
+		$(use_with exif libexif) \
+		$(use_with lcms cms) \
+		$(use_with xmp) \
+		$(use_with svg librsvg) \
+		ITSTOOL=$(type -P true)
 }

diff --git a/media-gfx/eog/eog-9999.ebuild b/media-gfx/eog/eog-9999.ebuild
index 6c79a2d..28ee50c 100644
--- a/media-gfx/eog/eog-9999.ebuild
+++ b/media-gfx/eog/eog-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -12,7 +12,7 @@ if [[ ${PV} = 9999 ]]; then
 fi
 
 DESCRIPTION="The Eye of GNOME image viewer"
-HOMEPAGE="http://www.gnome.org/projects/eog/"
+HOMEPAGE="http://projects.gnome.org/eog/"
 
 LICENSE="GPL-2+"
 SLOT="1"
@@ -21,13 +21,13 @@ if [[ ${PV} = 9999 ]]; then
 	IUSE="${IUSE} doc"
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 fi
 
 REQUIRED_USE="exif? ( jpeg )"
 
 RDEPEND="
-	>=x11-libs/gtk+-3.3.6:3[introspection,X]
+	>=x11-libs/gtk+-3.7.8:3[introspection,X]
 	>=dev-libs/glib-2.31:2
 	>=dev-libs/libxml2-2:2
 	>=dev-libs/libpeas-0.7.4:=[gtk]
@@ -60,14 +60,15 @@ if [[ ${PV} = 9999 ]]; then
 fi
 
 src_configure() {
-	G2CONF="${G2CONF}
-		$(use_enable introspection)
-		$(use_with jpeg libjpeg)
-		$(use_with exif libexif)
-		$(use_with lcms cms)
-		$(use_with xmp)
-		$(use_with svg librsvg)"
-	[[ ${PV} != 9999 ]] && G2CONF="${G2CONF} ITSTOOL=$(type -P true)"
+	local myconf=""
+	[[ ${PV} != 9999 ]] && myconf="ITSTOOL=$(type -P true)"
 	DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README THANKS TODO"
-	gnome2_src_configure
+	gnome2_src_configure \
+		$(use_enable introspection) \
+		$(use_with jpeg libjpeg) \
+		$(use_with exif libexif) \
+		$(use_with lcms cms) \
+		$(use_with xmp) \
+		$(use_with svg librsvg) \
+		${myconf}
 }