Version bump. No changes for us compared to 2.28.0, but the libpng sedding had to be changed, so this revision makes that to not be missed later on as that would cause a libpng versioning handling regressions when unnoticed.

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

3 files changed, 18 insertions, 22 deletions

diff --git a/x11-libs/gdk-pixbuf/ChangeLog b/x11-libs/gdk-pixbuf/ChangeLog
index 52188d3a8a55..05ab6e8cc6c5 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-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gdk-pixbuf/ChangeLog,v 1.83 2013/04/15 22:50:10 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gdk-pixbuf/ChangeLog,v 1.84 2013/04/21 19:09:39 leio Exp $
+
+*gdk-pixbuf-2.28.1 (21 Apr 2013)
+
+  21 Apr 2013; Mart Raudsepp <leio@gentoo.org> -gdk-pixbuf-2.28.0.ebuild,
+  +gdk-pixbuf-2.28.1.ebuild:
+  Version bump. No changes for us compared to 2.28.0, but the libpng sedding
+  had to be changed, so this revision makes that to not be missed later on as
+  that would cause a libpng versioning handling regressions when unnoticed.
 
   15 Apr 2013; Samuli Suominen <ssuominen@gentoo.org> gdk-pixbuf-2.28.0.ebuild,
   +files/gdk-pixbuf-2.28.0-string_h.patch:
diff --git a/x11-libs/gdk-pixbuf/Manifest b/x11-libs/gdk-pixbuf/Manifest
index 9adb28e67e66..001f30b94ebf 100644
--- a/x11-libs/gdk-pixbuf/Manifest
+++ b/x11-libs/gdk-pixbuf/Manifest
@@ -1,26 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX gdk-pixbuf-2.24.1-xbm-overflow.patch 1534 SHA256 97d2dcde3312ec2ad15f26a91cb3af9538db8218acccef69e32fa888802e007e SHA512 39c80fc9fc2c16e99db44292b52dd8272abd4b58b2c0d736280e12d2fc5f7c57d959194b976676d79fafcf1a6c43af5ee2fa6d3999ffe72533f61e6846aee89b WHIRLPOOL 994c3f4420184a077ea999c95e2f9355f9842ff3bb651fe1b5ccdbc3a34aa330c751163fb3850c38199ed79db3ae7e0fba97ed8bd9c7ceb26ba335c13b19035b
 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.0.tar.xz 1191004 SHA256 561e37695bfb1b07549588b3fca2e6f05b2320eee75b13748bb7dc5e1257d347 SHA512 735780e99778f17e20ad806f6e48a892aa5492b47e1ba034c38f8b8535553833c4a186e405a0705c1c24fecb8c03dce9a014023f434a96ebb9c33f4b2bb44c5c WHIRLPOOL 2d70eaa4ac485e51c8c047821e68161a4f29afdbf2d97b3c720400197f33f0bb90cb402731996e507249b456130cff7871287e0905af0bad1256cfa4ba156431
+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
 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.0.ebuild 2663 SHA256 515cac0b0cb7cdfa9f1e8cfbe8138a336c3d6669c541fd15a7fb2d93a19a497c SHA512 09d2e7eb0ac351736d06c2d2c99759237bef2172a8d77473575d08a3e67e68612b07153475ed07ff8c5cc774f0b9f360ab4b80b59fd5cd4f731db25a9b2811c2 WHIRLPOOL 5b5bec195969238ec7ba4b92b05d186e1f8e420c271a4022434c8d3d42563696223f7e431782d14671978d17a66f0f174019a273a5bca02c74f6b808ba6ce6e7
-MISC ChangeLog 12482 SHA256 1ef4cd8ff43616eeadea45dc677c5090420d0fcbdd6099bd2d3aa06a299dcfa1 SHA512 05a92b38548f2b71e13132b3244471d8ee1acd508c425dfdba74f1f9a0a5b5aaa1f3c4c9944597e862eaeaac2c40a0b0bba784b53485f87099752ea9c675abeb WHIRLPOOL 030d2804baccbdaf0cdef02acc1bf129ea43e35ad6902cf9e6d8caf6b97d061ddde60db0a4124b86722c3a5d86e7d049fa19bce893e92ca21d6d8079be24f2dc
+EBUILD gdk-pixbuf-2.28.1.ebuild 2914 SHA256 9c09e581505448da93b88c7941d31ffbf3f493e15ea9c1f8387ecd3b983b7a80 SHA512 ca408933aaefdff8cc8c41eec82fae23967a9eec2f2389c80eccff82329c6b8d9f8c8cf4c460eda92738a4160774146f5753fff12fc964a8c121feb985d1580d WHIRLPOOL 235469975beab4d04f9fed97c0d812ee1b00e6bbba56b9513b17be2de16da60abdaa75a428aa63d8fb7bafd83bbf4469e6ed31f08e8de00b35f62dc7e389a74d
+MISC ChangeLog 12846 SHA256 ad99417229d7bbea1dc2f4d4f7f0ae82d7f6ef92bcb7d6c3fee62c6227f6f475 SHA512 94830b02ea7609ad2d6d5316c7cf8262a15eee9c022947861e5f6159e8b5d946b449f855cc931f4fe25385de20ad2a65a5bbe4c2ebb650575e509728a0b18d64 WHIRLPOOL b8bdb4ffd111a625e2ab15ed2461184eafc2c7fa106d73c16623158704e700e605f6d1efec5c049fac1cb56504a7ef1adedd528bb1dbf22149af10117b00ecb4
 MISC metadata.xml 160 SHA256 4d793ecb79b17794248102d8409d16bc27b1022c72038bd2d1241e129693d5f2 SHA512 677650c05f31fc27035e12f3f5e4b095715dfe12d2d3483f800bfbc6e986a98dbb1997cd52ad7a177b5c120c9b87fe5a2452a4f0f9852ac9a58262e0c5d576c9 WHIRLPOOL 070602fb27fee6a25035c9e93f5c2422270a5781fd11dac318d3f5c32cf9e49163abf7999729df230d3e181b6a1362982744e1f0ac016bf59a3458ae23abbb83
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iQEcBAEBCAAGBQJRbIQCAAoJEEdUh39IaPFNeckH+gMeDS2wLCLeZl+kX4jO5lNv
-DGB5PCmt2L5BCDZX2JMmGlUgL7ZBaPIRPGkdL9kw5YtP8stR/3UCV2QQkHmujRZ+
-k1+zzBzWLzfeGCMghbZoZGGvLWkYiwf7COZcvfEUl16TLuEQsqcPtC+nOEz1Cs1z
-M3kNSlnpcC2KJs+JHszseOXVh7JSZlsdSlJwO0v9f6M4c44jw7vZzt3zy9zarnCM
-/y5rk8qwnvQWTLNQKzscj0E3VeRnPW+fTjEu9qoaswalJJE2/DSlUyh/rGBItWfM
-YouK6gJleUg72fx2ZlUiWNqf0Y20JnFO+6hctSlJBU+qvhg9OWJ0ikqmGzP6E2k=
-=V3Cp
------END PGP SIGNATURE-----
diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.28.0.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.28.1.ebuild
index 5fc7c267fa23..dc44c74c713d 100644
--- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.28.0.ebuild
+++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.28.1.ebuild
@@ -1,6 +1,6 @@
 # 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.28.0.ebuild,v 1.2 2013/04/15 22:50:10 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gdk-pixbuf/gdk-pixbuf-2.28.1.ebuild,v 1.1 2013/04/21 19:09:39 leio Exp $
 
 EAPI="5"
 inherit eutils gnome.org multilib libtool
@@ -33,12 +33,14 @@ RDEPEND="${COMMON_DEPEND}
 	!<x11-libs/gtk+-2.90.4:3"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-string_h.patch #466034
+	epatch "${FILESDIR}"/${PN}-2.28.0-string_h.patch #466034
 	# This will avoid polluting the pkg-config file with versioned libpng,
 	# which is causing problems with libpng14 -> libpng15 upgrade
 	# See upstream bug #667068
-	sed -e 's:libpng15:libpng libpng15:' \
-		-i configure || die
+	# 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
 }