summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGilles Dartiguelongue <eva@gentoo.org>2011-02-14 23:05:11 +0000
committerGilles Dartiguelongue <eva@gentoo.org>2011-02-14 23:05:11 +0000
commit207847bd09e7795ff6fae12f9fd7becf301ab296 (patch)
tree41d6b533dddd6444dcdb9ff8bc76a95455b5778f /media-gfx/eog
parentppc stable wrt #344827, #354237 (diff)
downloadgentoo-2-207847bd09e7795ff6fae12f9fd7becf301ab296.tar.gz
gentoo-2-207847bd09e7795ff6fae12f9fd7becf301ab296.tar.bz2
gentoo-2-207847bd09e7795ff6fae12f9fd7becf301ab296.zip
Fix dependencies on gdk-pixbuf/gtk, bug #354279.
(Portage version: 2.2.0_alpha23/cvs/Linux x86_64, RepoMan options: --force)
Diffstat (limited to 'media-gfx/eog')
-rw-r--r--media-gfx/eog/ChangeLog8
-rw-r--r--media-gfx/eog/eog-2.30.2.ebuild15
-rw-r--r--media-gfx/eog/eog-2.32.1.ebuild11
3 files changed, 20 insertions, 14 deletions
diff --git a/media-gfx/eog/ChangeLog b/media-gfx/eog/ChangeLog
index e67986c55fa4..77563d54fdad 100644
--- a/media-gfx/eog/ChangeLog
+++ b/media-gfx/eog/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-gfx/eog
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/eog/ChangeLog,v 1.274 2010/11/28 23:00:08 pacho Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/eog/ChangeLog,v 1.275 2011/02/14 23:05:11 eva Exp $
+
+ 14 Feb 2011; Gilles Dartiguelongue <eva@gentoo.org> eog-2.30.2.ebuild,
+ eog-2.32.1.ebuild:
+ Fix dependencies on gdk-pixbuf/gtk, bug #354279.
*eog-2.32.1 (28 Nov 2010)
diff --git a/media-gfx/eog/eog-2.30.2.ebuild b/media-gfx/eog/eog-2.30.2.ebuild
index de30a80f7622..fab1d04f510b 100644
--- a/media-gfx/eog/eog-2.30.2.ebuild
+++ b/media-gfx/eog/eog-2.30.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/eog/eog-2.30.2.ebuild,v 1.9 2010/11/08 22:58:08 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/eog/eog-2.30.2.ebuild,v 1.10 2011/02/14 23:05:11 eva Exp $
EAPI=2
@@ -14,8 +14,8 @@ SLOT="1"
KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~x86-fbsd"
IUSE="dbus doc exif jpeg lcms python tiff xmp"
-RDEPEND=">=x11-libs/gtk+-2.17.5
- >=dev-libs/glib-2.15.3
+RDEPEND=">=x11-libs/gtk+-2.17.5:2
+ >=dev-libs/glib-2.15.3:2
>=dev-libs/libxml2-2
>=gnome-base/gconf-2.5.90
>=gnome-base/gnome-desktop-2.25.1
@@ -27,13 +27,13 @@ RDEPEND=">=x11-libs/gtk+-2.17.5
>=media-libs/libexif-0.6.14
virtual/jpeg:0 )
jpeg? ( virtual/jpeg:0
- x11-libs/gtk+[jpeg] )
+ || ( x11-libs/gdk-pixbuf:2[jpeg] x11-libs/gtk+:2[jpeg] ) )
lcms? ( =media-libs/lcms-1* )
python? (
>=dev-lang/python-2.3
>=dev-python/pygobject-2.15.1
>=dev-python/pygtk-2.13 )
- tiff? ( >=x11-libs/gtk+-2.15.1[tiff] )
+ tiff? ( || ( x11-libs/gdk-pixbuf:2[tiff] >=x11-libs/gtk+-2.15.1:2[tiff] ) )
xmp? ( >=media-libs/exempi-2 )"
DEPEND="${RDEPEND}
@@ -43,9 +43,8 @@ DEPEND="${RDEPEND}
>=dev-util/pkgconfig-0.17
doc? ( >=dev-util/gtk-doc-1.10 )"
-DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README THANKS TODO"
-
pkg_setup() {
+ DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README THANKS TODO"
G2CONF="${G2CONF}
$(use_with jpeg libjpeg)
$(use_with exif libexif)
diff --git a/media-gfx/eog/eog-2.32.1.ebuild b/media-gfx/eog/eog-2.32.1.ebuild
index 0e2d5e1a58f1..f9b32b545426 100644
--- a/media-gfx/eog/eog-2.32.1.ebuild
+++ b/media-gfx/eog/eog-2.32.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/eog/eog-2.32.1.ebuild,v 1.1 2010/11/28 23:00:08 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/eog/eog-2.32.1.ebuild,v 1.2 2011/02/14 23:05:11 eva Exp $
EAPI="3"
GCONF_DEBUG="yes"
@@ -16,8 +16,11 @@ SLOT="1"
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
IUSE="dbus doc exif jpeg lcms python svg tiff xmp"
-RDEPEND=">=x11-libs/gtk+-2.18:2[jpeg?,tiff?]
- >=dev-libs/glib-2.25.9
+RDEPEND=">=x11-libs/gtk+-2.18:2
+ || (
+ x11-libs/gtk+:2[jpeg?,tiff?]
+ x11-libs/gdk-pixbuf:2[jpeg?,tiff?] )
+ >=dev-libs/glib-2.25.9:2
>=dev-libs/libxml2-2
>=gnome-base/gconf-2.31.1
>=gnome-base/gnome-desktop-2.25.1:2