Use libpng.pc instead of versioned pkg-config file to generate Requires.private: libpng instead of versioned one. This will avoid some problems with libpng14 to libpng15 upgrade.

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

3 files changed, 100 insertions, 7 deletions

diff --git a/x11-libs/gdk-pixbuf/ChangeLog b/x11-libs/gdk-pixbuf/ChangeLog
index 57ce5ef3aa11..b523ce48529c 100644
--- a/x11-libs/gdk-pixbuf/ChangeLog
+++ b/x11-libs/gdk-pixbuf/ChangeLog
@@ -1,6 +1,14 @@
 # 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.31 2011/08/28 19:13:45 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gdk-pixbuf/ChangeLog,v 1.32 2011/09/15 19:40:37 ssuominen Exp $
+
+*gdk-pixbuf-2.24.0-r1 (15 Sep 2011)
+
+  15 Sep 2011; Samuli Suominen <ssuominen@gentoo.org>
+  +gdk-pixbuf-2.24.0-r1.ebuild:
+  Use libpng.pc instead of versioned pkg-config file to generate
+  Requires.private: libpng instead of versioned one. This will avoid some
+  problems with libpng14 to libpng15 upgrade.
 
 *gdk-pixbuf-2.24.0 (28 Aug 2011)
 
diff --git a/x11-libs/gdk-pixbuf/Manifest b/x11-libs/gdk-pixbuf/Manifest
index 0d81b515d993..2f718ed4aab8 100644
--- a/x11-libs/gdk-pixbuf/Manifest
+++ b/x11-libs/gdk-pixbuf/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 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
@@ -9,13 +9,14 @@ DIST gdk-pixbuf-2.23.5.tar.xz 1171372 RMD160 d873ee2c547f883368b8589a066e916d713
 DIST gdk-pixbuf-2.24.0.tar.xz 1176324 RMD160 38e9896dd9a1ed6bf207509cd635828cebe674b8 SHA1 6a78751630a54fdef9a6a3928322c98e6c1ef60c SHA256 67c11d3aa40441c1cea42c365bf2d6a9a9dd52fae2d359a707ad5e8abb4d28a7
 EBUILD gdk-pixbuf-2.22.1-r2.ebuild 2642 RMD160 cae459c3793b1270af70f0e2a491a4e237f3ffc3 SHA1 28e2ab7bee17a18300d08ab1db911ec696eca32c SHA256 273636c806f4ffc693c31bc4b07612d36a877508aeaf4a796fa012e16aa8c899
 EBUILD gdk-pixbuf-2.23.5.ebuild 2475 RMD160 c6e78b22c154c73a5861210119a5ef6d94ec3de4 SHA1 f3c75c186f937e4f1d87f1c3a9725b705ed013e8 SHA256 f968e786f933c1206f16428d5c58db0298e9629915c6a640866c106344b7b599
+EBUILD gdk-pixbuf-2.24.0-r1.ebuild 2643 RMD160 a0ebf6f5d47fd52a667c6c3696433884613fbea3 SHA1 7ce4ea9d45dd4412b8c2d3814314bd856c0ff62c SHA256 71f18454eeba51d58a7497a0c215d37f4fdf603aeebd72462d80f61e9a9c405d
 EBUILD gdk-pixbuf-2.24.0.ebuild 2445 RMD160 a02d4f42c212ad1b47b91e01496bc62fbc76f291 SHA1 c7c4cb814c0c09065c5b2a6dc0c7e7cd9a5497d1 SHA256 58f2edcd7586f92411b32c5a67a150a589b607477b75b0e22f1408fcc7958027
-MISC ChangeLog 4564 RMD160 e57ac0e540a889931fb1f59f06aef3ec99eb01cf SHA1 239328d4cd1967cb0457676c3181cb4a1a79a96e SHA256 afed98e5d36af61c9778b659b8da019efc53842eb3d7beb2b83d0eee147c00ee
+MISC ChangeLog 4877 RMD160 8f658e860ae516d283e0970575e8b42ba66d3d44 SHA1 9582a0d958a3ad9a47000b5495667ca8788ee66b SHA256 7a61045d31c333c1d8d56034ffdb21f50c8bb573edd54c865b4627d76b8b5d00
 MISC metadata.xml 285 RMD160 829826c3a3edd13d82bf87a4e6c1c08719f1549f SHA1 03e8b2cfc1956cfea91e8cedfa2451e68b2bf8e5 SHA256 8400998fc578bc9661b57a27ed3226941e4f75ef5bf7d9f929ed9de2d97ba8b0
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk5ak3AACgkQCaWpQKGI+9S/NACdGekVcUQ+7v8998A+Q/Vx/gtd
-TJwAniXDKlaoW2rf4ETSa4VorUNMUKJX
-=Aoow
+iF4EAREIAAYFAk5yVO0ACgkQXkR9YqOcLPHu2QD/bN4LE4wK1XGQOy4XLDTbcDhN
+t/0H6JGdv9YUzDN4tScBAKgBQ/c/0XXkdo/kgpFXoNVX9um51xANGfDAXna8JLA7
+=u2Wl
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.24.0-r1.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.24.0-r1.ebuild
new file mode 100644
index 000000000000..2c6817626351
--- /dev/null
+++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.24.0-r1.ebuild
@@ -0,0 +1,84 @@
+# 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.24.0-r1.ebuild,v 1.1 2011/09/15 19:40:37 ssuominen Exp $
+
+EAPI="4"
+
+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 ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+X debug doc +introspection jpeg jpeg2k tiff test"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.27.2:2
+	>=media-libs/libpng-1.4: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 )"
+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, upstream bug #657569
+	epatch "${FILESDIR}"/${PN}-2.21.4-fix-automagic-x11.patch
+
+	# This will avoid polluting the pkg-config file with versioned libpng,
+	# which is causing problems with libpng14 -> libpng15 upgrade
+	sed -i -e 's:libpng15:libpng libpng15:' configure.ac || die
+
+	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
+	dodoc AUTHORS NEWS* README*
+
+	# New library, remove .la files
+	find "${D}" -name '*.la' -exec rm -f '{}' + || die
+}
+
+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
+}