commit: 3345f0d177a6ec38ec96c87bbe0c73bd70b8bd70
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun May 10 14:22:46 2015 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun May 10 15:16:23 2015 +0000
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=3345f0d1
media-gfx/eog: 3.14.4 → 3.16.1
.../eog/{eog-9999.ebuild => eog-3.16.1.ebuild} | 25 ++++------------------
media-gfx/eog/eog-9999.ebuild | 7 +++---
2 files changed, 7 insertions(+), 25 deletions(-)
diff --git a/media-gfx/eog/eog-9999.ebuild b/media-gfx/eog/eog-3.16.1.ebuild
similarity index 73%
copy from media-gfx/eog/eog-9999.ebuild
copy to media-gfx/eog/eog-3.16.1.ebuild
index 40ddca7..b11121b 100644
--- a/media-gfx/eog/eog-9999.ebuild
+++ b/media-gfx/eog/eog-3.16.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 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="https://wiki.gnome.org/Apps/EyeOfGnome";
@@ -17,22 +14,16 @@ 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
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
REQUIRED_USE="exif? ( jpeg )"
RDEPEND="
- >=x11-libs/gtk+-3.14: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=
>=gnome-base/gsettings-desktop-schemas-2.91.92
+ >=x11-libs/gtk+-3.14:3[introspection,X]
>=x11-misc/shared-mime-info-0.20
x11-libs/gdk-pixbuf:2[jpeg?,tiff?]
@@ -52,15 +43,7 @@ DEPEND="${RDEPEND}
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) \
@@ -69,5 +52,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 40ddca7..3cfeac4 100644
--- a/media-gfx/eog/eog-9999.ebuild
+++ b/media-gfx/eog/eog-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -27,12 +27,11 @@ fi
REQUIRED_USE="exif? ( jpeg )"
RDEPEND="
- >=x11-libs/gtk+-3.14: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=
>=gnome-base/gsettings-desktop-schemas-2.91.92
+ >=x11-libs/gtk+-3.14:3[introspection,X]
>=x11-misc/shared-mime-info-0.20
x11-libs/gdk-pixbuf:2[jpeg?,tiff?]
@@ -55,7 +54,7 @@ DEPEND="${RDEPEND}
if [[ ${PV} = 9999 ]]; then
DEPEND="${DEPEND}
app-text/yelp-tools
- doc? ( >=dev-util/gtk-doc-1.10 )"
+ doc? ( >=dev-util/gtk-doc-1.16 )"
fi
src_configure() {
