Fix building with libpng15 wrt #378475 by Diego Elio Pettenò

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

4 files changed, 47 insertions, 12 deletions

diff --git a/net-proxy/ziproxy/ChangeLog b/net-proxy/ziproxy/ChangeLog
index 5ed6edd60953..2838dd659744 100644
--- a/net-proxy/ziproxy/ChangeLog
+++ b/net-proxy/ziproxy/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-proxy/ziproxy
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/ziproxy/ChangeLog,v 1.28 2011/02/26 22:11:49 signals Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/ziproxy/ChangeLog,v 1.29 2011/08/09 11:15:13 ssuominen Exp $
+
+  09 Aug 2011; Samuli Suominen <ssuominen@gentoo.org> ziproxy-3.1.3.ebuild,
+  +files/ziproxy-3.1.3-libpng15.patch:
+  Fix building with libpng15 wrt #378475 by Diego Elio Pettenò
 
   26 Feb 2011; Kevin McCarthy <signals@gentoo.org> ziproxy-2.7.2.ebuild,
   ziproxy-3.1.1.ebuild, ziproxy-3.1.3.ebuild:
diff --git a/net-proxy/ziproxy/Manifest b/net-proxy/ziproxy/Manifest
index e923bc399def..34b22740e8e7 100644
--- a/net-proxy/ziproxy/Manifest
+++ b/net-proxy/ziproxy/Manifest
@@ -1,4 +1,8 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX ziproxy-2.7.2-libpng14.patch 913 RMD160 9a6669a06ee285be933a045bc49ecb49b447477a SHA1 a944826da99677e6e96701ab27953e36c34642bd SHA256 052c58d39daac4043d5e8d762770613c7d51f626d1163295c2ea255091b59793
+AUX ziproxy-3.1.3-libpng15.patch 454 RMD160 e9dd18a4168a557e6854180c030ea8f2c59ae442 SHA1 1323ea2216b848dcc2e52fa8f6c3422516b7f64c SHA256 c3dac3a0384efa1c5704cb06c24bcda06a5d6ee67f498440abe935aeb24184d0
 AUX ziproxy.confd 650 RMD160 1cbd1e13f3276399b89c94c0323fb8fa05c9c6af SHA1 12e7b4bf054e89de93c548be5c7fe000632c63b9 SHA256 dad7db324941944a35c87d4e061a004f5d9638ea24f139bc9bad80a51e0e8d78
 AUX ziproxy.initd 706 RMD160 b52b5b8f80bc402ff801723c4d9fb79f37935033 SHA1 66b467840480c94a7b551f4a92d1b2ab4752b199 SHA256 f143de97458b3373ba7b177fc19109ba8730354240e9ab5b3f5fe6192103d099
 DIST ziproxy-2.7.2.tar.bz2 258257 RMD160 60f04f5e482e034b5613f44ec1ba129f8c16e79b SHA1 1e2383d62234961c9acf6a12a0d6f7fa59182f7a SHA256 697e589343d2f7a145182511cdbc46c52e9e30a4f420e82f18e6549ced7b129a
@@ -6,6 +10,13 @@ DIST ziproxy-3.1.1.tar.bz2 260604 RMD160 bd1693a2644008c1b7519aa905a16ccacfae380
 DIST ziproxy-3.1.3.tar.bz2 261227 RMD160 3541c0e2adbf6ca3fed7b953c7d18f3747db956f SHA1 3fb107e7de6be7e184475bffb5ba1a199349c147 SHA256 d5cbb42de327c66c76b6332cb06ca294df8c5130481500c6e93788951211b7a2
 EBUILD ziproxy-2.7.2.ebuild 2052 RMD160 c0090bdf9ac6d923a855c9d795dcaa25770d93aa SHA1 ca5f0c194f5e51526e44be5edbf84f8a4b78d1a5 SHA256 f8d81ce75265b521d7898fda261e534a90d147920a2f408cf558bf6ef7921edc
 EBUILD ziproxy-3.1.1.ebuild 1885 RMD160 255dc1a51715d387d499c36b0cfe48c8c51ea318 SHA1 2e6de54c88f0a7c327c49d55ed146ec543da7615 SHA256 a7333760442e802863f8ff2c58736ee28ed0bd11b9331bb3b5ab49527b14d038
-EBUILD ziproxy-3.1.3.ebuild 1889 RMD160 9624de420cb155008436dbccf84979aa8e8b0095 SHA1 96dce7f18678b6190aa391e15d0205ec52dc4dbe SHA256 10b31bd19d9e84d73a75440f9284cb1914182279b879184a8bd1d9ed69fa63b2
-MISC ChangeLog 4955 RMD160 43c31bcef4d3f44accea1f6f7fd23347614043de SHA1 a17d322488950c1c30edc6702d355ee7df859480 SHA256 3cf607a2b97387e85a6299585391eee5ee6f260037f785a119bdb340b0a75ee1
+EBUILD ziproxy-3.1.3.ebuild 1895 RMD160 3f83baef6ec6ae683d944cb2be0d0120b02d6b41 SHA1 1678f0e271af3665f1a98cf8ed6fd4164ff102c7 SHA256 427845c701c6c68768e316f3fe41c42bce67264dbe6b903af1f1a1d576f373d3
+MISC ChangeLog 5137 RMD160 fdea1fdd005476fc783ff88a3a200c21ab6928f6 SHA1 6faffb00607493a4d166a5a04b777a6b3c1ec61b SHA256 a4c121cbfb6fec7fdf3d132908fe5bd85fe06a003072d5ea77264836896bf5d8
 MISC metadata.xml 534 RMD160 00f3e51718dbf971a2a828f9e465e3bedb0ee93e SHA1 7f1144f73a3502d77737e553424a421d986d57a9 SHA256 a07a0f1fef6f615ca4dd7d66321ef8e733faea0068218fcab034085d42236b68
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iF4EAREIAAYFAk5BFroACgkQXkR9YqOcLPFN8QD/R1J8GoukeBJWPtorCMDEBefN
+YPp6hQcZLr2Sy4vZWJkA/0JjSbAK5R/syEZteMyAKvvo9WXqEfMStQq5QqoSPlGf
+=6dn8
+-----END PGP SIGNATURE-----
diff --git a/net-proxy/ziproxy/files/ziproxy-3.1.3-libpng15.patch b/net-proxy/ziproxy/files/ziproxy-3.1.3-libpng15.patch
new file mode 100644
index 000000000000..148a513e6f7d
--- /dev/null
+++ b/net-proxy/ziproxy/files/ziproxy-3.1.3-libpng15.patch
@@ -0,0 +1,20 @@
+--- src/image.c
++++ src/image.c
+@@ -17,6 +17,8 @@
+ #include <stdlib.h>
+ #include <assert.h>
+ 
++#include <zlib.h>
++
+ #include <gif_lib.h>
+ 
+ #include <jpeglib.h>
+@@ -515,7 +517,7 @@
+ 	bmp = new_raw_bitmap();
+ 	*out = bmp;
+ 
+-	png_set_read_fn (png_ptr, (voidp) &desc, mem_to_png);
++	png_set_read_fn (png_ptr, (png_voidp) &desc, mem_to_png);
+ 	
+ 	png_read_info (png_ptr,info_ptr);
+ 	png_get_IHDR (png_ptr, info_ptr, &width_png_uint_32, &height_png_uint_32,
diff --git a/net-proxy/ziproxy/ziproxy-3.1.3.ebuild b/net-proxy/ziproxy/ziproxy-3.1.3.ebuild
index 58a36db14888..14300f2dd5ca 100644
--- a/net-proxy/ziproxy/ziproxy-3.1.3.ebuild
+++ b/net-proxy/ziproxy/ziproxy-3.1.3.ebuild
@@ -1,9 +1,8 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/ziproxy/ziproxy-3.1.3.ebuild,v 1.2 2011/02/26 22:11:49 signals Exp $
-
-EAPI="2"
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/ziproxy/ziproxy-3.1.3.ebuild,v 1.3 2011/08/09 11:15:13 ssuominen Exp $
 
+EAPI=4
 inherit autotools eutils
 
 DESCRIPTION="A forwarding, non-caching, compressing web proxy server"
@@ -20,7 +19,6 @@ DEPEND="media-libs/giflib
 	virtual/jpeg
 	sys-libs/zlib
 	jpeg2k? ( media-libs/jasper )"
-
 RDEPEND="${DEPEND}
 	xinetd? ( virtual/inetd )"
 
@@ -30,6 +28,8 @@ pkg_setup() {
 }
 
 src_prepare() {
+	epatch "${FILESDIR}"/${P}-libpng15.patch
+
 	# fix sample config file
 	sed -i \
 		-e "s:/var/ziproxy/:/var/lib/ziproxy/:g" \
@@ -56,12 +56,12 @@ src_configure() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die
+	emake DESTDIR="${D}" install
 
 	dodir /usr/sbin
 	mv -vf "${D}"usr/{,s}bin/ziproxy || die
 
-	dobin src/tools/ziproxy_genhtml_stats.sh || die
+	dobin src/tools/ziproxy_genhtml_stats.sh
 
 	newinitd "${FILESDIR}"/${PN}.initd ${PN}
 	newconfd "${FILESDIR}"/${PN}.confd ${PN}
@@ -70,14 +70,14 @@ src_install() {
 	use jpeg2k && dodoc JPEG2000.txt
 
 	insinto /etc
-	doins -r etc/ziproxy || die
+	doins -r etc/ziproxy
 
 	insinto /var/lib/ziproxy/error
-	doins var/ziproxy/error/*.html || die
+	doins var/ziproxy/error/*.html
 
 	if use xinetd; then
 		insinto /etc/xinetd.d
-		doins etc/xinetd.d/ziproxy || die
+		doins etc/xinetd.d/ziproxy
 	fi
 
 	diropts -m0750 -o ziproxy -g ziproxy