Version bump, drop old

Package-Manager: portage-2.1.12.2/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

4 files changed, 55 insertions, 89 deletions

diff --git a/x11-libs/gdk-pixbuf/ChangeLog b/x11-libs/gdk-pixbuf/ChangeLog
index 05ab6e8cc6c5..e8e8a3ea83df 100644
--- a/x11-libs/gdk-pixbuf/ChangeLog
+++ b/x11-libs/gdk-pixbuf/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/gdk-pixbuf
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gdk-pixbuf/ChangeLog,v 1.84 2013/04/21 19:09:39 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gdk-pixbuf/ChangeLog,v 1.85 2013/06/09 11:11:43 pacho Exp $
+
+*gdk-pixbuf-2.28.2 (09 Jun 2013)
+
+  09 Jun 2013; Pacho Ramos <pacho@gentoo.org> +gdk-pixbuf-2.28.2.ebuild,
+  -files/gdk-pixbuf-2.24.1-xbm-overflow.patch, -gdk-pixbuf-2.24.1-r1.ebuild:
+  Version bump, drop old
 
 *gdk-pixbuf-2.28.1 (21 Apr 2013)
 
diff --git a/x11-libs/gdk-pixbuf/Manifest b/x11-libs/gdk-pixbuf/Manifest
index 001f30b94ebf..c18e8aa213c3 100644
--- a/x11-libs/gdk-pixbuf/Manifest
+++ b/x11-libs/gdk-pixbuf/Manifest
@@ -1,12 +1,21 @@
-AUX gdk-pixbuf-2.24.1-xbm-overflow.patch 1534 SHA256 97d2dcde3312ec2ad15f26a91cb3af9538db8218acccef69e32fa888802e007e SHA512 39c80fc9fc2c16e99db44292b52dd8272abd4b58b2c0d736280e12d2fc5f7c57d959194b976676d79fafcf1a6c43af5ee2fa6d3999ffe72533f61e6846aee89b WHIRLPOOL 994c3f4420184a077ea999c95e2f9355f9842ff3bb651fe1b5ccdbc3a34aa330c751163fb3850c38199ed79db3ae7e0fba97ed8bd9c7ceb26ba335c13b19035b
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX gdk-pixbuf-2.28.0-string_h.patch 748 SHA256 3077d260fe15c0b9888ca31e47461d35ca6d7d33350f7b5721dc06d88a7dc2a6 SHA512 54e7248076cdb1d446b5bb5ee09474461c775a0e51372602f10b0096f5c4779f01c739c75461d2c134565dacc03a38f298486ce814df8318410c8ab77ca5a8a7 WHIRLPOOL be4193a8e83733c031629d3a67e690b740180c9ac20eaac424119a3381a558c2b233524c599536276fe97b541f2d9d824dafa1642099b246a87df5deea497083
-DIST gdk-pixbuf-2.24.1.tar.xz 1177036 SHA256 da7a3f00db360913716368e19e336402755cafa93769f3cfa28a969303e4bee1 SHA512 93f86369fb050f4e564163bf516d9a4769b3b0f011416c891be9811520835d4fea007641b27939aa2eaa6d38f07ab53cc5635a20f9befd94824924ae38abac19 WHIRLPOOL 1254c823afc85b7ae02d1adb3b98775b89d7482070447d75419bd7886b1be11867f8b21668684dc7ce912ba48816a4b85d7d24bf65b6f1cde92ff83c6e5a7961
 DIST gdk-pixbuf-2.26.4.tar.xz 1181640 SHA256 a91458645f078debf204fef8bb06b30f356fcb5d48f65395132a5dba2b3510be SHA512 a85d9fb8a206b6986abc8bc8caa079f5ddbd1c83226f80896439a06a7644d27fa1e9d80cc0a34ba82ce0877cdfaeaee8bc2548b016d25d314bcbbab44091ef76 WHIRLPOOL f452673a3d4b9e894d7e92a24ecca9c4551353d38c242ad7ddcde812ce55dd56b68d80b297957c3f3cd7a649837cd47412995b842082ae5abec81a02ec486b07
 DIST gdk-pixbuf-2.26.5.tar.xz 1181336 SHA256 77696fd163bca95a130a1883dbd78d0ae4d782de2fc85a9a38556d13681f5c84 SHA512 2988dd550aac92c2633c5443c712be8e3c06d852190251d6436ef2457c43ccce48ef795f7b187ef975b643a0bc4fc407f8b539fd627dc05a69d7ee4b210244ee WHIRLPOOL 2a05fb5501a72fcb4acb502c542509a845406b1905e7750097de2c555dc5222b903bb7f1d4e953fdf19e4d6dd1b7acae6f6bceadcd26687d3b628f8c4cc654da
 DIST gdk-pixbuf-2.28.1.tar.xz 1191084 SHA256 bea0b743fdb5c3c8e23210f73623ec5f18f9ead2522942897fe739d80b50c2bb SHA512 5829d5eaca69fe8e813f5a668cb807d26dd7fc61a32e4d8a4beae638cb01d8f89f90ca554520ac4a43a530d7d03bd2e96da2d616b80effca264d385b97fee502 WHIRLPOOL 86b66300f0361d73e62e57a6998ca1751aa7a85b4703696672b6374b4c261a1b8f1745b5efd268b12831726fd830ab5056ab04fdf04b291f0f9db7a0487ce70d
-EBUILD gdk-pixbuf-2.24.1-r1.ebuild 2819 SHA256 6679884e054e73b5961ea9d00ef00ba1f332042de7dba28f1041ce236f150058 SHA512 2b00ea9b735e123cc3713122b72f705a6dcfd00f76de48222e45301ab7c3b199d7fa1cc9e8927c23e4f2f6d81b6a63145a2d1bd5e56314bc49fdd0f112d76dc1 WHIRLPOOL 2d61b8cdd56591791e8b9c1e3237f7a81b50d49016dc55ceebf77030c1d0cdb947cf992f1bae90125a8747b08c33243ebd2c7306e9afe76b69fd4fdfafc81b49
+DIST gdk-pixbuf-2.28.2.tar.xz 1192936 SHA256 183113c2eb2232963e88864a6a54fd963dbfeb1a3679fb0d3456f9e0b79e4617 SHA512 2082e6f44aa8e986586da8f5797b7e9aae23c60021c5183ed6e1e2e99cef338ec1b20cf2baef19a337ac557eb585399377e92534d2f90222a68943b914d86656 WHIRLPOOL 7060b0b591d47b1eec43b01a29cde5903ee78f458a4623a66d66d6b0d83f32d08ae2c5aa9da9dfc328990168c477a879b501c34d6f24b3d93f38cd7cdb4b8a66
 EBUILD gdk-pixbuf-2.26.4.ebuild 2726 SHA256 92bd3d457c198bcaf6ec39b50bde8c4dcc39068b45576db114b8179ada3ffd31 SHA512 978f942e59477f7b79eacaf255f316fc3492000cd4626d2692d993fc1351f32b60ceb1628ec99b1cc6b86481b129a57546cb4be13372bb7be563693ea49cfecf WHIRLPOOL 777237cd8eda4dc8a9e58898d1d9ab78e22c7b9d76e59201f368681e603ca7f2b7351392cf22cb23d4ea7e2dc562c9df77b5d1897640325f03651b99f9d0c0b3
 EBUILD gdk-pixbuf-2.26.5.ebuild 2645 SHA256 fd6fe64eccbea2c3c05fc33480c1215a3ce4059dab817da1337628100d38dc87 SHA512 3019182523321f698bb0480734993954afcc2df4edfb272fb203bfce98bde949c83e8f16ac90253950dd1ec1db216d7bbeceb1ee9345abddd1c3015f8ac78a6c WHIRLPOOL 484db42afc5e3c8f0d9d80dfc704aa7a8bddfa80d39270bdcdbfe745066c0e60834673956f42dd6dd0f1e1e64a61f1e97d2fcc552ccbebc9baa73516698239b3
 EBUILD gdk-pixbuf-2.28.1.ebuild 2914 SHA256 9c09e581505448da93b88c7941d31ffbf3f493e15ea9c1f8387ecd3b983b7a80 SHA512 ca408933aaefdff8cc8c41eec82fae23967a9eec2f2389c80eccff82329c6b8d9f8c8cf4c460eda92738a4160774146f5753fff12fc964a8c121feb985d1580d WHIRLPOOL 235469975beab4d04f9fed97c0d812ee1b00e6bbba56b9513b17be2de16da60abdaa75a428aa63d8fb7bafd83bbf4469e6ed31f08e8de00b35f62dc7e389a74d
-MISC ChangeLog 12846 SHA256 ad99417229d7bbea1dc2f4d4f7f0ae82d7f6ef92bcb7d6c3fee62c6227f6f475 SHA512 94830b02ea7609ad2d6d5316c7cf8262a15eee9c022947861e5f6159e8b5d946b449f855cc931f4fe25385de20ad2a65a5bbe4c2ebb650575e509728a0b18d64 WHIRLPOOL b8bdb4ffd111a625e2ab15ed2461184eafc2c7fa106d73c16623158704e700e605f6d1efec5c049fac1cb56504a7ef1adedd528bb1dbf22149af10117b00ecb4
+EBUILD gdk-pixbuf-2.28.2.ebuild 2916 SHA256 5d94816aa52f1dd43d59bfe3760cac8d49c851ebf6c29f04c874a8084edad53a SHA512 d7c3d2bd55a1d517e9328d20ba7a89216c08ae645f853f1ec518c3dc80a77f55017ee04306ded3918eb1bd0d300cd0bc65a7de4be4993b8156cd05cce22a1659 WHIRLPOOL 09d961d793a93dc5cab15bb723ca36e066788c0b961819da9d6dce237f2c5eab88337acb158a52b722c949654079acaf3b52dba11d6476c7232ca7c9e15d6a85
+MISC ChangeLog 13057 SHA256 19ae3d38e978bbac4afe87b8c03ecdcf7f7f8d135661026090292fa3bf77ce09 SHA512 931e920ada4cb762d1187164e4f8fc8fceb925946e974fcb76519b8f8bbc787316e3e7a6e3bf0a1216728339524058840ad057574f66d605b3a2b1191c5b86ad WHIRLPOOL 7a2d6982a0bcb66cc05c84fa8dbf6de569401b1c901700d036ed59e6caa6c4a79d26f0be6b4b051effefe3860a9b1374f7a16005094302bbd283cf5881c8a052
 MISC metadata.xml 160 SHA256 4d793ecb79b17794248102d8409d16bc27b1022c72038bd2d1241e129693d5f2 SHA512 677650c05f31fc27035e12f3f5e4b095715dfe12d2d3483f800bfbc6e986a98dbb1997cd52ad7a177b5c120c9b87fe5a2452a4f0f9852ac9a58262e0c5d576c9 WHIRLPOOL 070602fb27fee6a25035c9e93f5c2422270a5781fd11dac318d3f5c32cf9e49163abf7999729df230d3e181b6a1362982744e1f0ac016bf59a3458ae23abbb83
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREIAAYFAlG0YvAACgkQCaWpQKGI+9SljwCfefgR3gxtTxliHLQefi84jeHH
+yIYAn0GjfbRrBeInDPaGhP2mASOPkXsG
+=vNW8
+-----END PGP SIGNATURE-----
diff --git a/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.24.1-xbm-overflow.patch b/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.24.1-xbm-overflow.patch
deleted file mode 100644
index 66b15f70ce63..000000000000
--- a/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.24.1-xbm-overflow.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 4f0f465f991cd454d03189497f923eb40c170c22 Mon Sep 17 00:00:00 2001
-From: Matthias Clasen <mclasen@redhat.com>
-Date: Sat, 14 Apr 2012 14:21:09 -0400
-Subject: [PATCH] Avoid an integer overflow in the xbm loader
-
-At the same time, reject some silly input, such as negative
-width or height.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=672811
----
- gdk-pixbuf/io-xbm.c |   12 ++++++++++--
- 1 files changed, 10 insertions(+), 2 deletions(-)
-
-diff --git a/gdk-pixbuf/io-xbm.c b/gdk-pixbuf/io-xbm.c
-index 46653b9..4f3e1e8 100644
---- a/gdk-pixbuf/io-xbm.c
-+++ b/gdk-pixbuf/io-xbm.c
-@@ -183,10 +183,16 @@ read_bitmap_file_data (FILE    *fstream,
- 				type++;
- 			}
- 
--			if (!strcmp ("width", type))
-+			if (!strcmp ("width", type)) {
-+                                if (value <= 0)
-+                                        RETURN (FALSE);
- 				ww = (unsigned int) value;
--			if (!strcmp ("height", type))
-+                        }
-+			if (!strcmp ("height", type)) {
-+                                if (value <= 0)
-+                                        RETURN (FALSE);
- 				hh = (unsigned int) value;
-+                        }
- 			if (!strcmp ("hot", type)) {
- 				if (type-- == name_and_type
- 				    || type-- == name_and_type)
-@@ -231,6 +237,8 @@ read_bitmap_file_data (FILE    *fstream,
- 		bytes_per_line = (ww+7)/8 + padding;
- 
- 		size = bytes_per_line * hh;
-+                if (size / bytes_per_line != hh) /* overflow */
-+                        RETURN (FALSE);
- 		bits = g_malloc (size);
- 
- 		if (version10p) {
--- 
-1.7.8.5
-
diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.24.1-r1.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.28.2.ebuild
index 1f786837e68d..9a327c1ffe35 100644
--- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.24.1-r1.ebuild
+++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.28.2.ebuild
@@ -1,70 +1,67 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 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.1-r1.ebuild,v 1.12 2012/11/10 05:54:13 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gdk-pixbuf/gdk-pixbuf-2.28.2.ebuild,v 1.1 2013/06/09 11:11:43 pacho Exp $
 
-EAPI="4"
-
-inherit eutils gnome.org multilib libtool autotools
+EAPI="5"
+inherit gnome.org multilib libtool
 
 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"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+X debug +introspection jpeg jpeg2k tiff test"
 
 COMMON_DEPEND="
-	>=dev-libs/glib-2.27.2:2
-	>=media-libs/libpng-1.4:0
+	>=dev-libs/glib-2.34.0: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:0 )
-	X? ( x11-libs/libX11 )"
+	jpeg? ( virtual/jpeg:= )
+	jpeg2k? ( media-libs/jasper:= )
+	tiff? ( >=media-libs/tiff-3.9.2:0= )
+	X? ( x11-libs/libX11 )
+"
 DEPEND="${COMMON_DEPEND}
 	>=dev-util/gtk-doc-am-1.11
 	>=sys-devel/gettext-0.17
-	virtual/pkgconfig"
+	virtual/pkgconfig
+"
 # 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"
+	!<x11-libs/gtk+-2.90.4:3
+"
 
 src_prepare() {
 	# This will avoid polluting the pkg-config file with versioned libpng,
 	# which is causing problems with libpng14 -> libpng15 upgrade
 	# See upstream bug #667068
-	sed -i -e 's:libpng15:libpng libpng15:' configure.ac || die
-	# Backport from 2.26.1, fixes xbm loader overflow
-	epatch "${FILESDIR}/${P}-xbm-overflow.patch"
-	eautoreconf
+	# First check that the pattern is present, to catch upstream changes on bumps,
+	# because sed doesn't return failure code if it doesn't do any replacements
+	grep -q  'l in libpng16' configure || die "libpng check order has changed upstream"
+	sed -e 's:l in libpng16:l in libpng libpng16:' -i configure || die
+	default
+	elibtoolize # for Darwin modules, bug #????
 }
 
 src_configure() {
-	# png always on to display icons (foser)
-	local myconf="
-		$(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}
+	# png always on to display icons
+	econf \
+		$(usex debug --enable-debug=yes "") \
+		$(use_with jpeg libjpeg) \
+		$(use_with jpeg2k libjasper) \
+		$(use_with tiff libtiff) \
+		$(use_enable introspection) \
+		$(use_with X x11) \
+		--with-libpng
 }
 
 src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS NEWS* README*
-
-	# New library, remove .la files
-	find "${D}" -name '*.la' -exec rm -f '{}' + || die
+	default
+	prune_libtool_files --modules
 }
 
 pkg_postinst() {
@@ -81,6 +78,8 @@ pkg_postinst() {
 	fi
 	rm "${tmp_file}"
 
+	# FIXME: use subslots to get rebuilds when really needed
+	# Every major version bump???
 	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:"