Version bump for Gnome 3.6. Clean up old revision. USE=introspection is now global.

(Portage version: 2.2.0_alpha149/cvs/Linux x86_64, signed Manifest commit with key C6085806)

3 files changed, 28 insertions, 24 deletions

diff --git a/media-gfx/eog/ChangeLog b/media-gfx/eog/ChangeLog
index 22a4193a02c6..c2c20b676555 100644
--- a/media-gfx/eog/ChangeLog
+++ b/media-gfx/eog/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-gfx/eog
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/eog/ChangeLog,v 1.295 2012/10/27 08:33:28 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/eog/ChangeLog,v 1.296 2012/12/26 21:50:23 eva Exp $
+
+*eog-3.6.2 (26 Dec 2012)
+
+  26 Dec 2012; Gilles Dartiguelongue <eva@gentoo.org> -eog-3.4.3.ebuild,
+  +eog-3.6.2.ebuild, metadata.xml:
+  Version bump for Gnome 3.6. Clean up old revision. USE=introspection is now
+  global.
 
   27 Oct 2012; Alexandre Rostovtsev <tetromino@gentoo.org> eog-2.32.1.ebuild,
   +files/eog-2.32.1-gmodule.patch:
diff --git a/media-gfx/eog/eog-3.4.3.ebuild b/media-gfx/eog/eog-3.6.2.ebuild
index 311cf025df0e..595f65c8cf4e 100644
--- a/media-gfx/eog/eog-3.4.3.ebuild
+++ b/media-gfx/eog/eog-3.6.2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/eog/eog-3.4.3.ebuild,v 1.3 2012/10/11 14:12:19 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/eog/eog-3.6.2.ebuild,v 1.1 2012/12/26 21:50:23 eva Exp $
 
-EAPI="4"
+EAPI="5"
 GCONF_DEBUG="yes"
 GNOME2_LA_PUNT="yes"
 
@@ -16,11 +16,14 @@ SLOT="1"
 IUSE="+exif +introspection +jpeg lcms +svg tiff xmp"
 KEYWORDS="~amd64 ~x86 ~x86-fbsd"
 
-RDEPEND=">=x11-libs/gtk+-3.3.6:3[introspection,X]
-	>=dev-libs/glib-2.31.0:2
+REQUIRED_USE="exif? ( jpeg )"
+
+RDEPEND="
+	>=x11-libs/gtk+-3.3.6:3[introspection,X]
+	>=dev-libs/glib-2.31:2
 	>=dev-libs/libxml2-2:2
-	>=dev-libs/libpeas-0.7.4[gtk]
-	>=gnome-base/gnome-desktop-2.91.2:3
+	>=dev-libs/libpeas-0.7.4:=[gtk]
+	>=gnome-base/gnome-desktop-2.91.2:3=
 	>=gnome-base/gsettings-desktop-schemas-2.91.92
 	>=x11-themes/gnome-icon-theme-2.19.1
 	>=x11-misc/shared-mime-info-0.20
@@ -28,23 +31,21 @@ 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 )
-	svg? ( >=gnome-base/librsvg-2.26:2 )
-	xmp? ( media-libs/exempi:2 )"
-
+	svg? ( >=gnome-base/librsvg-2.36.2:2 )
+	xmp? ( media-libs/exempi:2 )
+"
 DEPEND="${RDEPEND}
-	dev-util/gtk-doc-am
-	app-text/gnome-doc-utils
-	sys-devel/gettext
+	>=dev-util/gtk-doc-am-1.10
 	>=dev-util/intltool-0.40
-	virtual/pkgconfig"
+	sys-devel/gettext
+	virtual/pkgconfig
+"
 
-pkg_setup() {
+src_configure() {
 	G2CONF="${G2CONF}
 		$(use_enable introspection)
 		$(use_with jpeg libjpeg)
@@ -52,7 +53,7 @@ pkg_setup() {
 		$(use_with lcms cms)
 		$(use_with xmp)
 		$(use_with svg librsvg)
-		--disable-scrollkeeper
-		--disable-schemas-compile"
+		ITSTOOL=$(type -P true)"
 	DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README THANKS TODO"
+	gnome2_src_configure
 }
diff --git a/media-gfx/eog/metadata.xml b/media-gfx/eog/metadata.xml
index b77c0b94d8c4..c303968e7ba8 100644
--- a/media-gfx/eog/metadata.xml
+++ b/media-gfx/eog/metadata.xml
@@ -7,8 +7,4 @@
 		Desktop environment. With it, you can view single image files, as well 
 		as large image collections.
 	</longdescription>
-	<use>
-    	<flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg>
-			for introspection</flag>
-  	</use>
 </pkgmetadata>