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

(Portage version: 2.2.0_alpha39_p14/cvs/Linux x86_64)

3 files changed, 26 insertions, 104 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/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() {