pngcrush: unbundle zlib

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

diff --git a/media-gfx/pngcrush/ChangeLog b/media-gfx/pngcrush/ChangeLog
index 8e9afcfedf8c04275e882c449bd1146c5cbd7afd..bcdea981e1a5c67f56504f349f23b9c4bc928374 100644 (file)
--- a/media-gfx/pngcrush/ChangeLog
+++ b/media-gfx/pngcrush/ChangeLog
@@ -1,6 +1,12 @@
 # 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.65 2011/10/08 19:54:35 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/pngcrush/ChangeLog,v 1.66 2011/10/08 20:18:49 hanno Exp $
+
+*pngcrush-1.7.17-r2 (08 Oct 2011)
+
+  08 Oct 2011; Hanno Boeck <hanno@gentoo.org> +pngcrush-1.7.17-r2.ebuild,
+  +files/pngcrush-1.7.17-unbundle-zlib.diff:
+  Unbundle zlib, let libpng be bundled.
 
   08 Oct 2011; Samuli Suominen <ssuominen@gentoo.org> -pngcrush-1.7.10.ebuild,
   -pngcrush-1.7.16.ebuild, -pngcrush-1.7.17.ebuild, -files/Makefile:

diff --git a/media-gfx/pngcrush/Manifest b/media-gfx/pngcrush/Manifest
index 1cf07e78aafc5effe39d467ccde489497abf0b86..3541c29cc107334a362b0e6bfc5397180770c93b 100644 (file)
--- a/media-gfx/pngcrush/Manifest
+++ b/media-gfx/pngcrush/Manifest
@@ -1,18 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
+AUX pngcrush-1.7.17-unbundle-zlib.diff 807 RMD160 d4674038dc7fa1434ad3250db810c21140a940bd SHA1 4212fb356ea8c690e61f3db28b6dc87cf25fb8dc SHA256 844007cc1ca8ae205af5828df579e0739bfd9536167342432d479dc58ef11f3b
 DIST pngcrush-1.7.17.tar.xz 347036 RMD160 ea2e1ce5f2f44be2901ec8de478ba3542460472b SHA1 e820a36c66cd5377c6459b438b88bde6bf80c9d5 SHA256 37454dd6382417fc8fdc5223aa80fa7dc064b63307481f3fa6eca2ea713c4397
 EBUILD pngcrush-1.7.17-r1.ebuild 810 RMD160 4fbfe303cf4ce07605e5a497974f384de0f25856 SHA1 07780970e565d56cf9a7f4473b70519c5354faff SHA256 29cd39228193a888224a1b537cf5e17218e1b2bd36e8bae26f7fd86ac3512c60
-MISC ChangeLog 8392 RMD160 20f8a541fc3959031e7dea19cd9e9f89f598041c SHA1 0273c861b91ba780fd96783b883282abeb74a982 SHA256 ca9bca3ab898ec5c8cc265449e39b49c57e9ebd85ff298a8230fa02208a50817
+EBUILD pngcrush-1.7.17-r2.ebuild 875 RMD160 13ec659baeb87c14b2a48cae7b2905665326bd25 SHA1 2f37f33524aee276cd96e18117e3e94fe946b76c SHA256 1416c74ae4d154018cb6b5a25751e839b96ba5a4e0eb82176ac1b52a41162c4f
+MISC ChangeLog 8583 RMD160 5b754647ac0afa1effad8210778af63e6568f737 SHA1 9ec75882cea039a0507835ff8dbcd8a3b6517d3f SHA256 b894464d7228211ec4561eb80a5b2d9c881f6cc57ee98580743b87aecb7b9697
 MISC metadata.xml 250 RMD160 9b209d29905483028ae3bfe5ac853ce2eb7bb999 SHA1 7870f001797ffb84203b59b3f0d21f97b5d5106b SHA256 6978f4d84e651d6c2bcda7e03af55bdadadc56bd3a9ab04740fdf58a77d26f90
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJOkKqYAAoJEEdUh39IaPFNMLwH/jbLYxXIzXfTu7brsxvn3gq8
-gpun+t5mKHxtBHbpdVBMBY6MNVaibQ3ruDPzIaVYw9xNUNxZVAPlkE7sjucBvdLJ
-XiJfF//u8mXff295vYyzXZrRsmKmhK1RmZrbQsNOklfFl8d7dw4YSPp22XWmWNky
-M3YZ6kRKHhz0l2pGTmEkCUL6R9lzdsR4RzT5wPWcjydDMDIvWPYY/qw8rTVXUAnM
-08VELtUSLF0Hw58OncHIo4eMaV7DA9VkA6nM7dmYkt7TqXoTdrDIIIJJDr3xD5Ho
-hcY7bt0RfMLM/aqFvDDImZZUbVcYm6q4CiEiMzpSnI2LqXiAAVCXBvowSqQicNQ=
-=qkYx
+iQIcBAEBCAAGBQJOkLAnAAoJEKWIAHK7tR5CxVwP/AzQh+EbEeQ64lLWyz/ZjZqd
+PBQ3KAYNUJYMgJsh2DVQ0Xzh0lKxt3GQPg56SUTkarr5OHjRAfSamAysbn1PXRN1
+6YtH/zfsVJ41sMBzOR/Ydrli3K1QfbiqwMY+IOxbE+Un+4OYGQRgcgYn4Bbnoare
+h+tXu8Lem5u8VCwvzM+uwLMMpFaG7Ajbd8+crOcZb3Cm7GlTRSgAV8Yociikfubw
+w+V4DBjZ1cRkyv/cbruCBQQHDNjS37diD/HeCgSgocA1vHW+//KWUq+xuLP1qHNH
+GdQMMrQFlwvlgoaYkclhtjc2rypdbKCAqrctDgwXX1TqqVbMNtfzK1Qv/jlLPOyV
+M2iBp1tp8/4zkfKK310/eA7xtC4scvQ/xCIPmWRaq6CSca5rXe/XBu2IHzqocYmF
+lcNQpNF3nnNXSXisOc546nqz5M3NaXrIu6Ftg+8DnQY4jCNUaOFOw2m5L5gdcaj7
+qsUlbiWGIp4ETOYpk8/9Tho1iDSvVql0OtDB0TJ1E7hg2L9kksbY7vgC8Sf6H0sM
+YgtDsCAHSUBlU2kFpPBkt5AGWjeP/w00nhPfW2zvUYV5bL1MP7aMdn6UYYeozqiN
+M3FCrIKfz7KP8WIcwL7NOQBZnddvgKGMHQh8bjKd1zpU+sRRZluNiocSQS9KEwRe
+iZ8veMrOV7THrTUb87Hq
+=SCFH
 -----END PGP SIGNATURE-----

diff --git a/media-gfx/pngcrush/files/pngcrush-1.7.17-unbundle-zlib.diff b/media-gfx/pngcrush/files/pngcrush-1.7.17-unbundle-zlib.diff
new file mode 100644 (file)
index 0000000..bde167c
--- /dev/null
+++ b/media-gfx/pngcrush/files/pngcrush-1.7.17-unbundle-zlib.diff
@@ -0,0 +1,23 @@
+--- pngcrush-1.7.17/Makefile   2010-02-26 05:16:56.000000000 +0100
++++ pngcrush-1.7.17-1/Makefile 2011-10-08 22:09:24.514781541 +0200
+@@ -30,15 +30,15 @@
+ 
+ PNGCRUSH  = pngcrush
+ 
+-LIBS = -lm
++LIBS = -lm -lz
+ #LIBS = -L${ZLIB} -lz -lm
+ #LIBS = ${ZLIB}/libz.a -lm
+ 
+ # uncomment these 4 lines only if you are NOT using an external copy of zlib:
+-ZHDR = zlib.h
+-ZOBJS  = adler32$(O) compress$(O) crc32$(O) deflate$(O) \
+-       infback$(O) inffast$(O) inflate$(O) inftrees$(O) \
+-       trees$(O) uncompr$(O) zutil$(O)
++#ZHDR = zlib.h
++#ZOBJS  = adler32$(O) compress$(O) crc32$(O) deflate$(O) \
++#      infback$(O) inffast$(O) inflate$(O) inftrees$(O) \
++#      trees$(O) uncompr$(O) zutil$(O)
+ 
+ OBJS  = pngcrush$(O) png$(O) pngerror$(O) pngget$(O) pngmem$(O) \
+       pngpread$(O) pngread$(O) pngrio$(O) pngrtran$(O) pngrutil$(O) \

diff --git a/media-gfx/pngcrush/pngcrush-1.7.17-r2.ebuild b/media-gfx/pngcrush/pngcrush-1.7.17-r2.ebuild
new file mode 100644 (file)
index 0000000..19e4f9f
--- /dev/null
+++ b/media-gfx/pngcrush/pngcrush-1.7.17-r2.ebuild
@@ -0,0 +1,37 @@
+# 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-r2.ebuild,v 1.1 2011/10/08 20:18:49 hanno Exp $
+
+EAPI=4
+inherit toolchain-funcs eutils
+
+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=""
+
+# media-libs/libpng
+RDEPEND="sys-libs/zlib"
+DEPEND="${RDEPEND}
+       app-arch/xz-utils"
+
+src_prepare() {
+       epatch "${FILESDIR}/${P}-unbundle-zlib.diff"
+}
+
+src_compile() {
+       emake \
+               CC="$(tc-getCC)" \
+               LD="$(tc-getCC)" \
+               CFLAGS="${CFLAGS} -Wall -Wshadow" \
+               LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+       dobin ${PN}
+       dohtml ChangeLog.html
+}