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

[Ole Reifschneider]

commit:     dbe51cb4311c9ec6c2819369bd130b832dd51c40
Author:     Ole Reifschneider <tranquility <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 26 23:29:02 2016 +0000
Commit:     Ole Reifschneider <tranquility <AT> gentoo <DOT> org>
CommitDate: Sat Mar 26 23:29:02 2016 +0000
URL:        https://gitweb.gentoo.org/proj/gnome.git/commit/?id=dbe51cb4

media-gfx/eog: Bump version to 3.20.0

Package-Manager: portage-2.2.28
Manifest-Sign-Key: 0xE9E568677E8B4D42

 .../eog/{eog-9999.ebuild => eog-3.20.0.ebuild}     | 34 ++++++----------------
 media-gfx/eog/eog-9999.ebuild                      | 11 +++----
 2 files changed, 15 insertions(+), 30 deletions(-)

diff --git a/media-gfx/eog/eog-9999.ebuild b/media-gfx/eog/eog-3.20.0.ebuild
similarity index 63%
copy from media-gfx/eog/eog-9999.ebuild
copy to media-gfx/eog/eog-3.20.0.ebuild
index 7eb343b..409fa22 100644
--- a/media-gfx/eog/eog-9999.ebuild
+++ b/media-gfx/eog/eog-3.20.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -7,9 +7,6 @@ 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="https://wiki.gnome.org/Apps/EyeOfGnome"
@@ -17,28 +14,23 @@ HOMEPAGE="https://wiki.gnome.org/Apps/EyeOfGnome"
 LICENSE="GPL-2+"
 SLOT="1"
 IUSE="+exif +introspection +jpeg lcms +svg tiff xmp"
-if [[ ${PV} = 9999 ]]; then
-	IUSE="${IUSE} doc"
-	KEYWORDS=""
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-fi
-
 REQUIRED_USE="exif? ( jpeg )"
 
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+
 RDEPEND="
-	>=dev-libs/glib-2.38:2
+	>=dev-libs/glib-2.42.0:2[dbus]
 	>=dev-libs/libpeas-0.7.4:=[gtk]
 	>=gnome-base/gnome-desktop-2.91.2:3=
 	>=gnome-base/gsettings-desktop-schemas-2.91.92
-	>=x11-libs/gtk+-3.14:3[introspection,X]
+	>=x11-libs/gtk+-3.19.3:3[introspection,X]
 	>=x11-misc/shared-mime-info-0.20
 
-	x11-libs/gdk-pixbuf:2[jpeg?,tiff?]
+	>=x11-libs/gdk-pixbuf-2.30.0:2[jpeg?,tiff?]
 	x11-libs/libX11
 
 	exif? ( >=media-libs/libexif-0.6.14 )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.3 )
+	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 )
@@ -47,19 +39,12 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	>=dev-util/gtk-doc-am-1.16
 	>=dev-util/intltool-0.50.1
+	dev-util/itstool
 	sys-devel/gettext
 	virtual/pkgconfig
 "
 
-if [[ ${PV} = 9999 ]]; then
-	DEPEND="${DEPEND}
-		app-text/yelp-tools
-		doc? ( >=dev-util/gtk-doc-1.16 )"
-fi
-
 src_configure() {
-	local myconf=""
-	[[ ${PV} != 9999 ]] && myconf="ITSTOOL=$(type -P true)"
 	DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README THANKS TODO"
 	gnome2_src_configure \
 		$(use_enable introspection) \
@@ -67,6 +52,5 @@ src_configure() {
 		$(use_with exif libexif) \
 		$(use_with lcms cms) \
 		$(use_with xmp) \
-		$(use_with svg librsvg) \
-		${myconf}
+		$(use_with svg librsvg)
 }

diff --git a/media-gfx/eog/eog-9999.ebuild b/media-gfx/eog/eog-9999.ebuild
index 7eb343b..1166191 100644
--- a/media-gfx/eog/eog-9999.ebuild
+++ b/media-gfx/eog/eog-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -27,18 +27,18 @@ fi
 REQUIRED_USE="exif? ( jpeg )"
 
 RDEPEND="
-	>=dev-libs/glib-2.38:2
+	>=dev-libs/glib-2.42.0:2[dbus]
 	>=dev-libs/libpeas-0.7.4:=[gtk]
 	>=gnome-base/gnome-desktop-2.91.2:3=
 	>=gnome-base/gsettings-desktop-schemas-2.91.92
-	>=x11-libs/gtk+-3.14:3[introspection,X]
+	>=x11-libs/gtk+-3.19.3:3[introspection,X]
 	>=x11-misc/shared-mime-info-0.20
 
-	x11-libs/gdk-pixbuf:2[jpeg?,tiff?]
+	>=x11-libs/gdk-pixbuf-2.30.0:2[jpeg?,tiff?]
 	x11-libs/libX11
 
 	exif? ( >=media-libs/libexif-0.6.14 )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.3 )
+	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 )
@@ -47,6 +47,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	>=dev-util/gtk-doc-am-1.16
 	>=dev-util/intltool-0.50.1
+	dev-util/itstool
 	sys-devel/gettext
 	virtual/pkgconfig
 "