commit: 7a12b4267f782cf9adb94dc4640440080cba1f83
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 12 15:00:17 2014 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sat Apr 12 15:14:30 2014 +0000
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=7a12b426
media-gfx/eog: 3.10.2 → 3.12.0
---
.../eog/{eog-9999.ebuild => eog-3.12.0.ebuild} | 30 +++++-----------------
media-gfx/eog/eog-9999.ebuild | 10 ++++----
2 files changed, 12 insertions(+), 28 deletions(-)
diff --git a/media-gfx/eog/eog-9999.ebuild b/media-gfx/eog/eog-3.12.0.ebuild
similarity index 68%
copy from media-gfx/eog/eog-9999.ebuild
copy to media-gfx/eog/eog-3.12.0.ebuild
index 28ee50c..343951f 100644
--- a/media-gfx/eog/eog-9999.ebuild
+++ b/media-gfx/eog/eog-3.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -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="http://projects.gnome.org/eog/";
@@ -17,18 +14,13 @@ 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="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-fi
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
REQUIRED_USE="exif? ( jpeg )"
RDEPEND="
- >=x11-libs/gtk+-3.7.8:3[introspection,X]
- >=dev-libs/glib-2.31:2
+ >=x11-libs/gtk+-3.10.6:3[introspection,X]
+ >=dev-libs/glib-2.38:2
>=dev-libs/libxml2-2:2
>=dev-libs/libpeas-0.7.4:=[gtk]
>=gnome-base/gnome-desktop-2.91.2:3=
@@ -47,21 +39,13 @@ RDEPEND="
xmp? ( media-libs/exempi:2 )
"
DEPEND="${RDEPEND}
- >=dev-util/gtk-doc-am-1.10
- >=dev-util/intltool-0.40
+ >=dev-util/gtk-doc-am-1.16
+ >=dev-util/intltool-0.50.1
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() {
- local myconf=""
- [[ ${PV} != 9999 ]] && myconf="ITSTOOL=$(type -P true)"
DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README THANKS TODO"
gnome2_src_configure \
$(use_enable introspection) \
@@ -70,5 +54,5 @@ src_configure() {
$(use_with lcms cms) \
$(use_with xmp) \
$(use_with svg librsvg) \
- ${myconf}
+ ITSTOOL=$(type -P true)
}
diff --git a/media-gfx/eog/eog-9999.ebuild b/media-gfx/eog/eog-9999.ebuild
index 28ee50c..502174a 100644
--- a/media-gfx/eog/eog-9999.ebuild
+++ b/media-gfx/eog/eog-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -27,8 +27,8 @@ fi
REQUIRED_USE="exif? ( jpeg )"
RDEPEND="
- >=x11-libs/gtk+-3.7.8:3[introspection,X]
- >=dev-libs/glib-2.31:2
+ >=x11-libs/gtk+-3.10.6:3[introspection,X]
+ >=dev-libs/glib-2.38:2
>=dev-libs/libxml2-2:2
>=dev-libs/libpeas-0.7.4:=[gtk]
>=gnome-base/gnome-desktop-2.91.2:3=
@@ -47,8 +47,8 @@ RDEPEND="
xmp? ( media-libs/exempi:2 )
"
DEPEND="${RDEPEND}
- >=dev-util/gtk-doc-am-1.10
- >=dev-util/intltool-0.40
+ >=dev-util/gtk-doc-am-1.16
+ >=dev-util/intltool-0.50.1
sys-devel/gettext
virtual/pkgconfig
"
