media-gfx/eog: moved to gx86

    * Sync live ebuild with gx86 changes.
    * USE=introspection is now global.

4 files changed, 12 insertions, 96 deletions

diff --git a/media-gfx/eog/Manifest b/media-gfx/eog/Manifest
deleted file mode 100644
index a1c67dec..00000000
--- a/media-gfx/eog/Manifest
+++ /dev/null
@@ -1,11 +0,0 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
-DIST eog-3.6.2.tar.xz 3615284 SHA256 5879f26a11fa7cd2fa4038e5c51d31e4959456be4fba570dcde89ed0d966ffda SHA512 9c0474f07f6ff3478c3f8c84ad941a0d5633c19690958d4598eb38e08853b88989aa1a9a7f9af6a5ce24df2a424f59d024b3bd76c383d3c85739f6c84feb9e88 WHIRLPOOL 7c4a9d43db2f929779af575e37645ba926b8e932470f5593d3cf2d566811520b576008a1dd602b6e8ffedede99c2b2440738a15f3dded599a4dfc4ed21c7c04f
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iEYEAREKAAYFAlCurZMACgkQ1fmVwcYIWAaqfQCfbCmvpjldri1JBrIpUvH562xl
-UwsAoLYqrdjANuCQjRjslITpzdzTV98n
-=6cxL
------END PGP SIGNATURE-----
diff --git a/media-gfx/eog/eog-3.6.2.ebuild b/media-gfx/eog/eog-3.6.2.ebuild
deleted file mode 100644
index 2271efe9..00000000
--- a/media-gfx/eog/eog-3.6.2.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-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/"
-
-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
-
-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
-	>=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
-
-	x11-libs/gdk-pixbuf:2[jpeg?,tiff?]
-	x11-libs/libX11
-
-	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.36.2:2 )
-	xmp? ( media-libs/exempi:2 )"
-DEPEND="${RDEPEND}
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.40
-	sys-devel/gettext
-	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)
-		--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/eog-9999.ebuild b/media-gfx/eog/eog-9999.ebuild
index 2271efe9..6c79a2d1 100644
--- a/media-gfx/eog/eog-9999.ebuild
+++ b/media-gfx/eog/eog-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI="5"
 GCONF_DEBUG="yes"
 GNOME2_LA_PUNT="yes"
 
@@ -26,11 +26,12 @@ fi
 
 REQUIRED_USE="exif? ( jpeg )"
 
-RDEPEND=">=x11-libs/gtk+-3.3.6:3[introspection,X]
-	>=dev-libs/glib-2.31.0:2
+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
@@ -43,12 +44,14 @@ RDEPEND=">=x11-libs/gtk+-3.3.6:3[introspection,X]
 	jpeg? ( virtual/jpeg:0 )
 	lcms? ( media-libs/lcms:2 )
 	svg? ( >=gnome-base/librsvg-2.36.2:2 )
-	xmp? ( media-libs/exempi:2 )"
+	xmp? ( media-libs/exempi:2 )
+"
 DEPEND="${RDEPEND}
-	dev-util/gtk-doc-am
+	>=dev-util/gtk-doc-am-1.10
 	>=dev-util/intltool-0.40
 	sys-devel/gettext
-	virtual/pkgconfig"
+	virtual/pkgconfig
+"
 
 if [[ ${PV} = 9999 ]]; then
 	DEPEND="${DEPEND}
@@ -63,8 +66,7 @@ src_configure() {
 		$(use_with exif libexif)
 		$(use_with lcms cms)
 		$(use_with xmp)
-		$(use_with svg librsvg)
-		--disable-schemas-compile"
+		$(use_with svg librsvg)"
 	[[ ${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/metadata.xml b/media-gfx/eog/metadata.xml
index 216da8a1..c53de9a4 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>