PDEPEND on gnome-base/librsvg as reported in bug #363715 by Cedric. Remove old.

Package-Manager: portage-2.1.9.50/cvs/Linux x86_64

4 files changed, 14 insertions, 89 deletions

diff --git a/x11-libs/gdk-pixbuf/ChangeLog b/x11-libs/gdk-pixbuf/ChangeLog
index bb9e2ded687d..8e9b7317def0 100644
--- a/x11-libs/gdk-pixbuf/ChangeLog
+++ b/x11-libs/gdk-pixbuf/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/gdk-pixbuf
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gdk-pixbuf/ChangeLog,v 1.14 2011/04/29 00:55:21 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gdk-pixbuf/ChangeLog,v 1.15 2011/06/05 12:25:59 pacho Exp $
+
+  05 Jun 2011; Pacho Ramos <pacho@gentoo.org> -gdk-pixbuf-2.22.0.ebuild,
+  gdk-pixbuf-2.22.1-r1.ebuild:
+  PDEPEND on gnome-base/librsvg as reported in bug #363715 by Cedric. Remove
+  old.
 
   29 Apr 2011; Jeroen Roovers <jer@gentoo.org> gdk-pixbuf-2.22.1-r1.ebuild:
   Marked ~hppa (bug #364693).
diff --git a/x11-libs/gdk-pixbuf/Manifest b/x11-libs/gdk-pixbuf/Manifest
index abff21b3ef1f..c095d10112c9 100644
--- a/x11-libs/gdk-pixbuf/Manifest
+++ b/x11-libs/gdk-pixbuf/Manifest
@@ -3,17 +3,15 @@ Hash: SHA1
 
 AUX gdk-pixbuf-2.21.4-fix-automagic-x11.patch 715 RMD160 efeaa25e97e7620018ae3ca5b62d74ff6e0fd0d1 SHA1 d67d28548ce340034f5afb0ca07b699fd1a0619e SHA256 e977da6d4731a0164b7346a790dfabb95a951f9986fa623abd171bce79f63bcb
 AUX gdk-pixbuf-2.22.1-fix-libpng15.patch 2000 RMD160 807024ae02a5c4a4f1df588a9a93b482f255f243 SHA1 4e8235e2cd36364f1fadaba49b6fb4ba02472de2 SHA256 57010dd154e31f669651f8916521c1b251920aec84c7da0d328a70cc8105fb07
-DIST gdk-pixbuf-2.22.0.tar.bz2 1538400 RMD160 6089a4f48588d8252ff8ea06db7f395d1d3a43f0 SHA1 80c25eaa08b22ebab24b98e88883ff615240d7cf SHA256 b8ff6a308f037af6b501246ad8779a951ca92af975efc2e97c354ea6702667cf
 DIST gdk-pixbuf-2.22.1.tar.bz2 1543273 RMD160 d05d6642e147281b7dc1dd21657595333f13f6f1 SHA1 b452208963ddd84f7280865695b50255fcafaa2e SHA256 6ce87eda24af9362307b2593c154d0b660f4e26d0abf2e71d46d0ddd55fd953d
-EBUILD gdk-pixbuf-2.22.0.ebuild 2427 RMD160 12f041036235d4b620c03f4259b1651a464837c1 SHA1 5e3d46ef6f24da64df56dfd3f22c10f7a6fa4feb SHA256 d8010de3b205c10c2c4617cd049722dfdcb650033f93f543da798ae193a6769f
-EBUILD gdk-pixbuf-2.22.1-r1.ebuild 2453 RMD160 d3a928755663ce52a27395345b530520d78a280a SHA1 711411844a0145665fb35433210dce61cfff63cf SHA256 82db973f380eb93dcdf83f0081f15b26d71628166b8d46fc26a7cb3887f49a5c
+EBUILD gdk-pixbuf-2.22.1-r1.ebuild 2520 RMD160 d0761d657c2641f8713e38ed1da7a65d806dd803 SHA1 87bf12a2abb27285f685668ed9942ee76d34d969 SHA256 7478420008247a3def20610e62340782e8ecded0e9210dc7d65c51c8cbf8658e
 EBUILD gdk-pixbuf-2.22.1.ebuild 2452 RMD160 d1ae36ca91ddd74785a221ca82762c297fe47291 SHA1 56648d1c712c347d0cffe1c56cd3e77c8dc34bca SHA256 39899b1e7be05b4697b84f25d617e2ba203bf5b1cac153cdfe6ee7df95e8e5d6
-MISC ChangeLog 2165 RMD160 b1fafe0e18de33eb23dab1e31673eec9d13b5982 SHA1 ec4dafecb4ea174f7bcdca45fd1624ea97535210 SHA256 1f914f58efbcc99d493ca50251244fa487062b85d90011459235ee9b118a26b6
+MISC ChangeLog 2356 RMD160 a7548859edc7ed6ff3f6e452e50fac798a4052e4 SHA1 895909bcd4211d7a66f635c1f33aae7580058e16 SHA256 0bb723d317ad351fb08db0d70e8eef5e3676752d6595046ee5935642c6ffa9cb
 MISC metadata.xml 285 RMD160 829826c3a3edd13d82bf87a4e6c1c08719f1549f SHA1 03e8b2cfc1956cfea91e8cedfa2451e68b2bf8e5 SHA256 8400998fc578bc9661b57a27ed3226941e4f75ef5bf7d9f929ed9de2d97ba8b0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk26DH8ACgkQVWmRsqeSphONSQCfY7tQrCO4s1YpeBxBBR4AntEK
-bnAAniFpC7L2TOSunnyDeK3DRAAiSO12
-=Iuti
+iEYEARECAAYFAk3rdd0ACgkQCaWpQKGI+9RgcACfSgAyIlu0ziHJmOoc/fo9FaQY
+1zYAnRHcJW3p5ZGhamkJCsOechffr3tc
+=HU3A
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.22.0.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.22.0.ebuild
deleted file mode 100644
index 8ad5f41783c0..000000000000
--- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.22.0.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gdk-pixbuf/gdk-pixbuf-2.22.0.ebuild,v 1.3 2010/11/07 19:11:27 anarchy Exp $
-
-EAPI="3"
-
-inherit gnome.org multilib libtool autotools
-
-DESCRIPTION="Image loading library for GTK+"
-HOMEPAGE="http://www.gtk.org/"
-
-LICENSE="LGPL-2"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="+X debug doc +introspection jpeg jpeg2k tiff test"
-
-# librsvg blocker is for the new pixbuf loader API, you lose icons otherwise
-RDEPEND="
-	>=dev-libs/glib-2.25.9
-	>=media-libs/libpng-1.2.43-r2:0
-	introspection? ( >=dev-libs/gobject-introspection-0.9.3 )
-	jpeg? ( virtual/jpeg )
-	jpeg2k? ( media-libs/jasper )
-	tiff? ( >=media-libs/tiff-3.9.2 )
-	X? ( x11-libs/libX11 )
-	!<gnome-base/gail-1000
-	!<gnome-base/librsvg-2.31.0
-	!<x11-libs/gtk+-2.21.3:2
-	!<x11-libs/gtk+-2.90.4:3"
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.9
-	>=sys-devel/gettext-0.17
-	>=dev-util/gtk-doc-am-1.11
-	doc? (
-		>=dev-util/gtk-doc-1.11
-		~app-text/docbook-xml-dtd-4.1.2 )"
-
-src_prepare() {
-	# Only build against libX11 if the user wants to do so
-	epatch "${FILESDIR}"/${PN}-2.21.4-fix-automagic-x11.patch
-
-	elibtoolize
-	eautoreconf
-}
-
-src_configure() {
-	# png always on to display icons (foser)
-	local myconf="
-		$(use_enable doc gtk-doc)
-		$(use_with jpeg libjpeg)
-		$(use_with jpeg2k libjasper)
-		$(use_with tiff libtiff)
-		$(use_enable introspection)
-		$(use_with X x11)
-		--with-libpng"
-
-	# Passing --disable-debug is not recommended for production use
-	use debug && myconf="${myconf} --enable-debug=yes"
-
-	econf ${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "Installation failed"
-
-	dodoc AUTHORS NEWS* README* || die "dodoc failed"
-
-	# New library, remove .la files
-	rm -vf "${D}"/usr/lib*/gdk-pixbuf-2.0/*/loaders/*.la
-}
-
-pkg_postinst() {
-	gdk-pixbuf-query-loaders > "${EROOT}usr/$(get_libdir)/gdk-pixbuf-2.0/2.10.0/loaders.cache"
-
-	if [ -e "${EROOT}"usr/lib/gtk-2.0/2.*/loaders ]; then
-		elog "You need to rebuild ebuilds that installed into" "${EROOT}"usr/lib/gtk-2.0/2.*/loaders
-		elog "to do that you can use qfile from portage-utils:"
-		elog "emerge -va1 \$(qfile -qC ${EPREFIX}/usr/lib/gtk-2.0/2.*/loaders)"
-	fi
-}
diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.22.1-r1.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.22.1-r1.ebuild
index 5ce1985f39a9..844f36f1ff19 100644
--- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.22.1-r1.ebuild
+++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.22.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gdk-pixbuf/gdk-pixbuf-2.22.1-r1.ebuild,v 1.2 2011/04/29 00:55:21 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gdk-pixbuf/gdk-pixbuf-2.22.1-r1.ebuild,v 1.3 2011/06/05 12:25:59 pacho Exp $
 
 EAPI="3"
 
@@ -34,6 +34,8 @@ DEPEND="${RDEPEND}
 	doc? (
 		>=dev-util/gtk-doc-1.11
 		~app-text/docbook-xml-dtd-4.1.2 )"
+# Needed as reported in bug #363715
+PDEPEND="gnome-base/librsvg"
 
 src_prepare() {
 	# Only build against libX11 if the user wants to do so