Bump to 2.23.5, from gnome overlay for GNOME 3, remove old

Package-Manager: portage-2.2.0_alpha39_p14/cvs/Linux x86_64

4 files changed, 49 insertions, 107 deletions

diff --git a/x11-libs/gdk-pixbuf/ChangeLog b/x11-libs/gdk-pixbuf/ChangeLog
index 6c14d5e7ae9e..ff1c3b65969c 100644
--- a/x11-libs/gdk-pixbuf/ChangeLog
+++ b/x11-libs/gdk-pixbuf/ChangeLog
@@ -1,6 +1,13 @@
 # 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.28 2011/07/11 00:06:54 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gdk-pixbuf/ChangeLog,v 1.29 2011/08/16 22:28:13 nirbheek Exp $
+
+*gdk-pixbuf-2.23.5 (16 Aug 2011)
+
+  16 Aug 2011; Nirbheek Chauhan <nirbheek@gentoo.org>
+  -gdk-pixbuf-2.22.1.ebuild, -gdk-pixbuf-2.22.1-r1.ebuild,
+  +gdk-pixbuf-2.23.5.ebuild:
+  Bump to 2.23.5, from gnome overlay for GNOME 3, remove old
 
   11 Jul 2011; Matt Turner <mattst88@gentoo.org> gdk-pixbuf-2.22.1-r2.ebuild:
   Added ~mips, bug 364693
diff --git a/x11-libs/gdk-pixbuf/Manifest b/x11-libs/gdk-pixbuf/Manifest
index 43713f2336d4..518c68dfca22 100644
--- a/x11-libs/gdk-pixbuf/Manifest
+++ b/x11-libs/gdk-pixbuf/Manifest
@@ -1,9 +1,29 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+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-CVE-2011-2485.patch 2230 RMD160 5250b2c5404691d988edd586514566edcba67744 SHA1 5147710cd7d6670c47d6bf785f85de1a6c62ce87 SHA256 10f7e6ef2c4ab8a3dd744ad2711963202b2a7e63fe3baea3d9c3401b84644c47
 AUX gdk-pixbuf-2.22.1-fix-libpng15.patch 2000 RMD160 807024ae02a5c4a4f1df588a9a93b482f255f243 SHA1 4e8235e2cd36364f1fadaba49b6fb4ba02472de2 SHA256 57010dd154e31f669651f8916521c1b251920aec84c7da0d328a70cc8105fb07
 DIST gdk-pixbuf-2.22.1.tar.bz2 1543273 RMD160 d05d6642e147281b7dc1dd21657595333f13f6f1 SHA1 b452208963ddd84f7280865695b50255fcafaa2e SHA256 6ce87eda24af9362307b2593c154d0b660f4e26d0abf2e71d46d0ddd55fd953d
-EBUILD gdk-pixbuf-2.22.1-r1.ebuild 2530 RMD160 333351d98a68ed7ebbad40610a1931863d804a2a SHA1 2588d37ff74ca2e671d53edacbb30dccd4532696 SHA256 f931168cccc0fb1c536f9638c591f9b8cdf286abc6b11e1bfb0184e638c311ba
+DIST gdk-pixbuf-2.23.5.tar.xz 1171372 RMD160 d873ee2c547f883368b8589a066e916d713e46c3 SHA1 8fca3db7165bce01f0f14b85367736d4cc8d00e8 SHA256 7a6c3550426f38f6b0eeeb49295654d9e706ce8f1786a4d0932f9d2c0d0bc500
 EBUILD gdk-pixbuf-2.22.1-r2.ebuild 2642 RMD160 cae459c3793b1270af70f0e2a491a4e237f3ffc3 SHA1 28e2ab7bee17a18300d08ab1db911ec696eca32c SHA256 273636c806f4ffc693c31bc4b07612d36a877508aeaf4a796fa012e16aa8c899
-EBUILD gdk-pixbuf-2.22.1.ebuild 2452 RMD160 d1ae36ca91ddd74785a221ca82762c297fe47291 SHA1 56648d1c712c347d0cffe1c56cd3e77c8dc34bca SHA256 39899b1e7be05b4697b84f25d617e2ba203bf5b1cac153cdfe6ee7df95e8e5d6
-MISC ChangeLog 4047 RMD160 6039e71ef5c929e1c78df9f805c539154f2d5cca SHA1 a893ba02eae524baea797a47374ececc154d1e4a SHA256 858f79a63c18e32daeefd9c676cec6bee450187daa3e223c547586d1164ec5c2
+EBUILD gdk-pixbuf-2.23.5.ebuild 2465 RMD160 a3751571ed18c1f3af647bbf107dc15cd722b3aa SHA1 f3ba479872e3ec98eb3290a0f5839e9956c4108c SHA256 5cc2f4b058057fcce0ad1f70868819734390ccec20d721d179661080bf7baa74
+MISC ChangeLog 4285 RMD160 4d75c3c35d5329490a6078dae39273c030047c9d SHA1 2e3bcae8513ccb24fde034833aa716cbfbffbdfd SHA256 90d4dea9bb10d9662fa8975b29ffd365f34f4a127f6b70a35cbdfbcad1a138ab
 MISC metadata.xml 285 RMD160 829826c3a3edd13d82bf87a4e6c1c08719f1549f SHA1 03e8b2cfc1956cfea91e8cedfa2451e68b2bf8e5 SHA256 8400998fc578bc9661b57a27ed3226941e4f75ef5bf7d9f929ed9de2d97ba8b0
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBAgAGBQJOSu8CAAoJEO/kOhxWD91kZcUP/2htOE8hUzIAdBvCYl+aGSdW
+FgQ13jM+u+wl10iyJ9qUp685d04dkCPDlimGBb9AMFmnMc1T0eZ7QVpDUtrfXJto
++Q++aayBFlNDwLZOLV1gRaqc3eeeS/ugKU3O9fb/qVE1Cpsu8p3Frj1/PogaaJn5
+pZyRkPgye0C5wgF1BAA4xgvwOP99TYByX2GlpBNlqCSZ35xEb6jVBZxmy8jxxR+x
+s8OmsGhNnTc1UnX8Ga/LEEQkCcWRQNeN6TSWwsvUtxtzMzWKZ5I+qysdGgVtzjWZ
+viZY9QYzwGmdI0XapdPWP1twN+71YQ1zXoCaYaPNRuyCkLkt/73hoz9tbptVKIig
+jvIRKNbX6zpzNrgz5AgHNQfKrmGYT1x1PARe8sv7M5SuSvdgEuZwBuxsYEoAXmrX
+lBL9mG9ojHWqSOZ/98g+Q4ugtrZ+FotG8ALh44ukhrMRObx5x4D1N4JYu0pmA2Ca
+lJQr/8uKebi600GmbBc+XkJ+WacW7JAg8BDZKctV2p/NviYhlAljY7dk6Eg2heC9
+jpqwWNvJY1w/Wvw3ibOEDi/4fnR4r8xw/hRj86QUE/5mhfnGz9XdoV2tGr8fb8GI
+GxXNCMe/i3zM6AFZwOiA/nix81AgGrIVCHdePYSqkZsixY1o2z/gJ3XQlB3xnnvA
+VXBr4NPantX5gn1RMtgn
+=wR9H
+-----END PGP SIGNATURE-----
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
deleted file mode 100644
index edd7cafd889e..000000000000
--- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.22.1-r1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# 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.9 2011/07/06 23:31:42 halcy0n 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 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 svg tiff test"
-
-# librsvg blocker is for the new pixbuf loader API, you lose icons otherwise
-RDEPEND="
-	>=dev-libs/glib-2.25.15
-	>=media-libs/libpng-1.2.44: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 )"
-# Needed as reported in bug #363715
-PDEPEND="svg? ( gnome-base/librsvg )"
-
-src_prepare() {
-	# Only build against libX11 if the user wants to do so
-	epatch "${FILESDIR}"/${PN}-2.21.4-fix-automagic-x11.patch
-
-	# Fix libpng-1.5 compatibility, bug 354557 — taken from upstream
-	epatch "${FILESDIR}/${P}-fix-libpng15.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
-
-	dodoc AUTHORS NEWS* README* || die
-
-	find "${ED}" -name '*.la' -exec rm -f {} +
-}
-
-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.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.23.5.ebuild
index 0b3a1b597aa8..0fca1c19591e 100644
--- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.22.1.ebuild
+++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.23.5.ebuild
@@ -1,8 +1,8 @@
 # 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.ebuild,v 1.9 2011/04/15 13:13:29 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gdk-pixbuf/gdk-pixbuf-2.23.5.ebuild,v 1.1 2011/08/16 22:28:13 nirbheek Exp $
 
-EAPI="3"
+EAPI="4"
 
 inherit gnome.org multilib libtool autotools
 
@@ -11,37 +11,35 @@ 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"
+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.15
-	>=media-libs/libpng-1.2.44:0
+COMMON_DEPEND="
+	>=dev-libs/glib-2.27.2
+	>=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}
+	X? ( x11-libs/libX11 )"
+DEPEND="${COMMON_DEPEND}
 	>=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 )"
+# librsvg blocker is for the new pixbuf loader API, you lose icons otherwise
+RDEPEND="${COMMON_DEPEND}
+	!<gnome-base/gail-1000
+	!<gnome-base/librsvg-2.31.0
+	!<x11-libs/gtk+-2.21.3:2
+	!<x11-libs/gtk+-2.90.4:3"
 
 src_prepare() {
 	# Only build against libX11 if the user wants to do so
 	epatch "${FILESDIR}"/${PN}-2.21.4-fix-automagic-x11.patch
 
-	# Fix libpng-1.5 compatibility, bug 354557 — taken from upstream
-	epatch "${FILESDIR}/${P}-fix-libpng15.patch"
-
 	elibtoolize
 	eautoreconf
 }
@@ -64,11 +62,12 @@ src_configure() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die
+	emake DESTDIR="${D}" install || die "Installation failed"
 
-	dodoc AUTHORS NEWS* README* || die
+	dodoc AUTHORS NEWS* README* || die "dodoc failed"
 
-	find "${ED}" -name '*.la' -exec rm -f {} +
+	# New library, remove .la files
+	find "${D}" -name '*.la' -exec rm -f '{}' + || die
 }
 
 pkg_postinst() {