pngcrush use bundled libpng 1.4, because it doesn't compile against

libpng 1.5.

Package-Manager: portage-2.1.10.23/cvs/Linux x86_64

diff --git a/media-gfx/pngcrush/ChangeLog b/media-gfx/pngcrush/ChangeLog
index 1aefa07d5440bd57234844a600b33e03c87f31f4..72c2239871fb303f020cf3f143744cafefc42e13 100644 (file)
--- a/media-gfx/pngcrush/ChangeLog
+++ b/media-gfx/pngcrush/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/pngcrush
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/pngcrush/ChangeLog,v 1.62 2011/09/18 08:41:31 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/pngcrush/ChangeLog,v 1.63 2011/10/08 19:12:43 hanno Exp $
+
+*pngcrush-1.7.17-r1 (08 Oct 2011)
+
+  08 Oct 2011; Hanno Boeck <hanno@gentoo.org> +pngcrush-1.7.17-r1.ebuild:
+  Switch to bundled libpng as long as it doesn't compile against libpng 1.5.
 
   18 Sep 2011; Samuli Suominen <ssuominen@gentoo.org> pngcrush-1.7.17.ebuild:
   Error out in pkg_setup() with media-libs/libpng >= 1.5.

diff --git a/media-gfx/pngcrush/Manifest b/media-gfx/pngcrush/Manifest
index 97358641a57da81006d622e282a1f8e64d2c09d6..321229f983df239030a1f43c26e5ad2a9525ce71 100644 (file)
--- a/media-gfx/pngcrush/Manifest
+++ b/media-gfx/pngcrush/Manifest
@@ -5,15 +5,27 @@ AUX Makefile 266 RMD160 e0de84c3254288cc52266e6f05656758f5102c62 SHA1 af142ea41b
 DIST pngcrush-1.7.10-nolib.tar.xz 47200 RMD160 4866713d78f4de340e0171fc914574c1bcf8e81f SHA1 abd0b1a97f7536011d317626cfb90d5e178fb85b SHA256 2563e1682b423784cbc990f0755c4e4536fde7b15b9eee30c1c4080c5ba51158
 DIST pngcrush-1.7.16-nolib.tar.xz 47844 RMD160 cd30700be19472592e98fb5667d787bf94d8c250 SHA1 4a52c6cd445761481b3770d62127459b502708de SHA256 81f3ac0764b668edf7dff8d02914645b3fb0e9c8938905105e0129bf95c7e14f
 DIST pngcrush-1.7.17-nolib.tar.xz 48204 RMD160 b6513eb006ad30ff2d74440d0eefb5bcec11d617 SHA1 a865192b348fe958b3a2a4f4348566fc710e5e65 SHA256 4266c1db944fcf6766df0f9db1a3913d8859037bef0b0b9259c98bc800e50652
+DIST pngcrush-1.7.17.tar.xz 347036 RMD160 ea2e1ce5f2f44be2901ec8de478ba3542460472b SHA1 e820a36c66cd5377c6459b438b88bde6bf80c9d5 SHA256 37454dd6382417fc8fdc5223aa80fa7dc064b63307481f3fa6eca2ea713c4397
 EBUILD pngcrush-1.7.10.ebuild 803 RMD160 0007dfc6c49d244785c8dc81f4b100d5db124b81 SHA1 30f14c3f3e2348ec4a34bf18372d55371629bfb8 SHA256 87a1b2741302acc0ee46caa9651744b709c47dd466eab8a29211a4518c2844a4
 EBUILD pngcrush-1.7.16.ebuild 787 RMD160 aeeb9a54965c5785d806b3454087e5f512113d4c SHA1 8203970b42c337a1e8a72488a7644b33d5ab55bc SHA256 05090381613c546e0284ec3d54a33b985453d4f87d881e1e37f13907073c5bbd
+EBUILD pngcrush-1.7.17-r1.ebuild 813 RMD160 df16d90eccf6440947edf7f7e86fb1118ac01dfb SHA1 7fb79e9ce19338f19b7be917b67c1c8b7d562c0d SHA256 ec96bedb94fdedf4c969b311115df073f6545c7e13472be19f41d89fb16d1923
 EBUILD pngcrush-1.7.17.ebuild 960 RMD160 09a488841aebe1fee0807adefa3ecc612f8b8f80 SHA1 8cce14b81da9bf420e296b6ffe9b1c17ab640294 SHA256 f30b43ba7c7a40da384e319e176427fb37c9ce0aade5ab6752112a659ae1fecf
-MISC ChangeLog 7741 RMD160 f327fbdb266cbac55aaf94f12c608722ce00f038 SHA1 b95ccdb4a0e3bbfb916626ac887b87d03d0f82f3 SHA256 6a626cc27b00a6eab6579a55e42c43e155f5257384209db32ebeece0d5d3c96c
+MISC ChangeLog 7924 RMD160 148fc35106f86f3cac995dfa8ea04ce58fd27f3e SHA1 f9d6e908a73b3854ada689bb84d74da6b26210d1 SHA256 a05fed80b929eeb82dc68fde904c8fe778b9ae409dae9fb7343197bac8a98abb
 MISC metadata.xml 250 RMD160 9b209d29905483028ae3bfe5ac853ce2eb7bb999 SHA1 7870f001797ffb84203b59b3f0d21f97b5d5106b SHA256 6978f4d84e651d6c2bcda7e03af55bdadadc56bd3a9ab04740fdf58a77d26f90
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk51rvgACgkQXkR9YqOcLPFWqgEAiVbtUrH1BapBIDJYPNFregHB
-GkidelrKnDsSnOR1GRcBAIPuszITRKRm9ob+tLSFrxskACZp2m80k3fto1LdrTHe
-=Mttb
+iQIcBAEBCAAGBQJOkKCpAAoJEKWIAHK7tR5C5WgP/20Tf4pPCX0139dXZKms05Xt
+6swGX3gAW7w6EUZHM/tyD1c4kG7f6g0X7ZbjGMe0FLPxf6dBKv8N6jUNLJ+qU0is
+JoDq2TAb5HFDVmTR9gaJwdVjVJT/odtRE7MszWWaHBaFV+i8N7U9fyvKewDijJhK
+5m4dkXDu92AnolYbjEbO3SvQDRi/gUVJXIW95Gn2eSqwnu+OnmIHx1zcKezAFbkb
+ScVPB0yft6rks4KXQ6IX2KSE87CslxzylgbFv7JNKNn3aOr2bZrRF7+4fAPKYU7z
+l7q9y2a2zHd8cWbEIXagshpXNzLoL475NDVv8fUNMCVeA92+OypoRS0jo1ni1Sut
+srjOEjOK+vcyIs92kRMmXyWBhecNlkku2q5s5HRR+3OJPzT72Stq10tYNcdGou0c
+96ZXYdDKVqh/srW2c1Y4UnIE57o585LJWRg5D52TYLgbpZ0Y+EvCkM/f0Cbugn2a
+myyxGT1w4WHLfVEGH4bpmYGrp2YcOYS0XPY/scJTWFkS1wkIKg7IKNsCApxjg38M
+rygs6Jj3pWA/JlJCKjn5VF9QRKEdzBKcSd3uuCDL6MJilHK+9a6Fboy6ZoQkU6if
+OoduaZt6B0k3skk/vH3R4IfyGnWUIKwXEw42AlGisYKXJHVvrPNkgVS0YjEEbwdx
+L85bYdDB7jJpAtVsP5kM
+=IB0m
 -----END PGP SIGNATURE-----

diff --git a/media-gfx/pngcrush/pngcrush-1.7.17-r1.ebuild b/media-gfx/pngcrush/pngcrush-1.7.17-r1.ebuild
new file mode 100644 (file)
index 0000000..9c90271
--- /dev/null
+++ b/media-gfx/pngcrush/pngcrush-1.7.17-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/pngcrush/pngcrush-1.7.17-r1.ebuild,v 1.1 2011/10/08 19:12:43 hanno Exp $
+
+EAPI=4
+inherit toolchain-funcs
+
+DESCRIPTION="Portable Network Graphics (PNG) optimizing utility"
+HOMEPAGE="http://pmt.sourceforge.net/pngcrush/"
+SRC_URI="mirror://sourceforge/pmt/${P}.tar.xz"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE=""
+
+RDEPEND=">=media-libs/libpng-1.4
+       sys-libs/zlib"
+DEPEND="${RDEPEND}
+       app-arch/xz-utils"
+
+S=${WORKDIR}/${P}
+
+src_compile() {
+       emake CC="$(tc-getCC)" \
+               CFLAGS="${CFLAGS}" \
+               LDFLAGS="${LDFLAGS}" \
+               || die "emake failed"
+}
+
+src_install() {
+       dobin ${PN}
+       dohtml ChangeLog.html
+}