Fix pngcrush to use system libpng

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

diff --git a/media-gfx/pngcrush/ChangeLog b/media-gfx/pngcrush/ChangeLog
index b0c49e7a68260346b9f9bba51f07569d96c361d2..5386246e5bd670d7dde8f32fa90fc62d36d279a9 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.68 2011/10/10 21:07:42 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/pngcrush/ChangeLog,v 1.69 2011/10/14 11:27:04 ssuominen Exp $
+
+*pngcrush-1.7.18 (14 Oct 2011)
+
+  14 Oct 2011; Samuli Suominen <ssuominen@gentoo.org> +pngcrush-1.7.18.ebuild:
+  Version bump and switch to using system libpng wrt #356127 by Glenn
+  Randers-Pehrson (upstream)
 
   10 Oct 2011; Samuli Suominen <ssuominen@gentoo.org>
   -pngcrush-1.7.17-r1.ebuild:

diff --git a/media-gfx/pngcrush/Manifest b/media-gfx/pngcrush/Manifest
index 215f80a144cc483c8c62b283066ee0d1ca08a381..937368701d1f66c406cb011962317e60d4e63868 100644 (file)
--- a/media-gfx/pngcrush/Manifest
+++ b/media-gfx/pngcrush/Manifest
@@ -3,17 +3,19 @@ Hash: SHA1
 
 AUX pngcrush-1.7.17-unbundle-zlib.diff 701 RMD160 92cb67d70e50dd51669bdc2fb58dcf7732fbd0ad SHA1 5ba52877fc02458f3d02f1b0f67f66eb1bdf841f SHA256 901a206500fa0e6452f08c5947dee7dadb0fb773e9a24fd460453957a625bcf5
 DIST pngcrush-1.7.17.tar.xz 347036 RMD160 ea2e1ce5f2f44be2901ec8de478ba3542460472b SHA1 e820a36c66cd5377c6459b438b88bde6bf80c9d5 SHA256 37454dd6382417fc8fdc5223aa80fa7dc064b63307481f3fa6eca2ea713c4397
+DIST pngcrush-1.7.18-nolib.tar.xz 47584 RMD160 b01f5e00ad512621388a81f7dba829bcad8244ad SHA1 1c729d6da013f3a6d739465583e4557f8b3c459c SHA256 65d996af9e4aaac50ddef419dd67ed29059c662ba2f66716321cb0a36b8c0bf6
 EBUILD pngcrush-1.7.17-r2.ebuild 879 RMD160 ca5505713c848e1ea5f9163c9c72198b94c93e4f SHA1 11250017bc8ebac65f07561ade7e01e9a1e155aa SHA256 8e8c7a4df8f9ac4c36b6c2fdf994177405a19aa3d908f8d043468e74271b550e
-MISC ChangeLog 8765 RMD160 bbd7640aab3331f1fbe64555176ad2d45082041f SHA1 8c8f00a659604151a1ddeb6430d72a2d1fc2968e SHA256 71fafa2fd2b5db7f2c21a89186f430103a3fe6a3da16e48d31cb6c5080ea75b1
+EBUILD pngcrush-1.7.18.ebuild 843 RMD160 001d9f508941e292abc67c7d283e1dcc8b82c41c SHA1 3fd51d12866f19df7c6050c2687a9d3fa68f20eb SHA256 c2a4c223bd433e573f1cd7f3771fc711a565dbcb780cb68d098c10ea0eb18009
+MISC ChangeLog 8976 RMD160 0a148cdde6d44bd9a516f12c913860c42da6bf68 SHA1 03620a6bd5b7f03d965df450385a94b1f10a6981 SHA256 07e9218325bda5ba7ec4a483f03e04895823e77860c9ab894148158be612d09c
 MISC metadata.xml 161 RMD160 60f70b15d67f0e6aafc59833b2f0a30e30b51765 SHA1 1c35398222ef7ed670c31965e42cca77fe4b1da6 SHA256 e8daadc5e27e3ef1148993b5b48d96e93bc36d798a1f416693f7f8c84be427e1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJOk16xAAoJEEdUh39IaPFN9EYH/3sEEbGYyMjFAVAxSwdq09LK
-JkP61A4dJkiSS+xowINLRV/6Obg2qALbQKMqGXRsvvvaYn9Ln/z5d+yoGPHHAWSy
-L9uBYs1NKOosa9HB+2epQmx8iFeQmslqRnAUQesVbyhXr4sX6GfacyZ6r3fc3M5R
-QAsQ7JBnFWBD1qF2sGuOnEnO1Ul2aRqDxnJMjuyE5e+E+z2DHkeMe3dw38BWi1j4
-sVE1kDhMDTMob381SUdU2Hb6DFbrDvJVoYvf42nFHbRiY7TI3xqAa0gF1aEkJo4v
-p39r6iOmRwOZb1jD9lEPHZWX7bk8zT6FLztc09jaNB0iBo2vMqA3GFuWE8W2rMo=
-=f5gI
+iQEcBAEBAgAGBQJOmByJAAoJEEdUh39IaPFNcwEH/363c5ads87B9hztJNVu68ck
+8k0tl3uwXqS6phc6LVViSEfVvqZ6oJb1uW7ArUNjZYUZAAD4TvbdVZOXaBdBkwTT
+SD6TVYNjjlQuQHjSQAIgGKAO6c5mdvvtMX7hiKibzF87m0O4KHbKdCd07Yr0rxgM
+4EeIlVoao3z+tsH7qQUbFeXbf0iUEqGdh5Z+xCx4XpkLoj+sqL+ug7dMmcp8/UAI
+mLse7kcy2X8+WudVA6QGVBjpr//Rjb7r5XJ50IhN9R06p52uVL6EpbkiaktYOK0z
+ac5r/PEG5rG5ozRh6UsUzQvyL357zvDf2+ut1tFfdemuL7Btw2aAnS1MaD8NIUM=
+=txj9
 -----END PGP SIGNATURE-----

diff --git a/media-gfx/pngcrush/pngcrush-1.7.18.ebuild b/media-gfx/pngcrush/pngcrush-1.7.18.ebuild
new file mode 100644 (file)
index 0000000..61f0c21
--- /dev/null
+++ b/media-gfx/pngcrush/pngcrush-1.7.18.ebuild
@@ -0,0 +1,38 @@
+# 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.18.ebuild,v 1.1 2011/10/14 11:27:04 ssuominen Exp $
+
+EAPI=4
+
+MY_P=${P}-nolib
+
+inherit toolchain-funcs
+
+DESCRIPTION="Portable Network Graphics (PNG) optimizing utility"
+HOMEPAGE="http://pmt.sourceforge.net/pngcrush/"
+SRC_URI="mirror://sourceforge/pmt/${MY_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}/${MY_P}
+
+src_compile() {
+       emake \
+               CC="$(tc-getCC)" \
+               LD="$(tc-getCC)" \
+               CFLAGS="${CFLAGS} -Wall" \
+               LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+       dobin ${PN}
+       dohtml ChangeLog.html
+}