Fix building with libpng14.

Package-Manager: portage-2.2_rc65/cvs/Linux x86_64

4 files changed, 39 insertions, 7 deletions

diff --git a/net-proxy/ziproxy/ChangeLog b/net-proxy/ziproxy/ChangeLog
index 780c8ee08efb..554cc300b5c1 100644
--- a/net-proxy/ziproxy/ChangeLog
+++ b/net-proxy/ziproxy/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-proxy/ziproxy
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/ziproxy/ChangeLog,v 1.23 2009/12/17 14:12:24 sbriesen Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/ziproxy/ChangeLog,v 1.24 2010/03/08 20:06:17 ssuominen Exp $
+
+  08 Mar 2010; Samuli Suominen <ssuominen@gentoo.org> ziproxy-2.7.2.ebuild,
+  +files/ziproxy-2.7.2-libpng14.patch:
+  Fix building with libpng14.
 
 *ziproxy-2.7.2 (17 Dec 2009)
 
diff --git a/net-proxy/ziproxy/Manifest b/net-proxy/ziproxy/Manifest
index 0c2cc9be2370..de9c583ccae4 100644
--- a/net-proxy/ziproxy/Manifest
+++ b/net-proxy/ziproxy/Manifest
@@ -1,3 +1,4 @@
+AUX ziproxy-2.7.2-libpng14.patch 880 RMD160 0799b0d30748cde9477d3e8ba1da5275148114be SHA1 c2f552ae1720694912307441d2ca0ed55e23f203 SHA256 90a543a715f55651b096e7eb8ab0cc224737092c34d28f78f78981e20b72f781
 AUX ziproxy.confd 650 RMD160 1cbd1e13f3276399b89c94c0323fb8fa05c9c6af SHA1 12e7b4bf054e89de93c548be5c7fe000632c63b9 SHA256 dad7db324941944a35c87d4e061a004f5d9638ea24f139bc9bad80a51e0e8d78
 AUX ziproxy.initd 706 RMD160 b52b5b8f80bc402ff801723c4d9fb79f37935033 SHA1 66b467840480c94a7b551f4a92d1b2ab4752b199 SHA256 f143de97458b3373ba7b177fc19109ba8730354240e9ab5b3f5fe6192103d099
 DIST ziproxy-2.7.0.tar.bz2 239929 RMD160 02aa4b1e750cf299728e1a4ced54180b3c5b5d46 SHA1 5692c4e3356c898eec788a78ceb66b5d35dbdef0 SHA256 cd3e7cf6d4ca1faaf82867024486c72091968b9b9bd9ca41dac76fd76ad00d7a
@@ -5,6 +6,6 @@ DIST ziproxy-2.7.1.tar.bz2 258178 RMD160 125527ac3bb2f218cf16e4b91af5ada720cf6fc
 DIST ziproxy-2.7.2.tar.bz2 258257 RMD160 60f04f5e482e034b5613f44ec1ba129f8c16e79b SHA1 1e2383d62234961c9acf6a12a0d6f7fa59182f7a SHA256 697e589343d2f7a145182511cdbc46c52e9e30a4f420e82f18e6549ced7b129a
 EBUILD ziproxy-2.7.0.ebuild 1848 RMD160 5e85f64a4b94963c9f43b5c7e7787c1b686a141b SHA1 3d8d417d1629170c7d9b79b016d101ab8b1607f2 SHA256 25d3fce71ca79def4c4a40790ba158b7ff82cb33c34d794c594f7225a1f3878f
 EBUILD ziproxy-2.7.1.ebuild 1853 RMD160 4106b6c10d2a18b16d92c9b228d7a6dc2df8468a SHA1 6a8148adb7a8f919e0fea0b498c843b2c5500fc6 SHA256 4d6d8f901215d61152cdde954992913d094a94dab67280aebfe5857428431ea4
-EBUILD ziproxy-2.7.2.ebuild 1971 RMD160 634ee17ce47288622cd3744e92bfc9f6fe1a345c SHA1 ef6979c1f7b348c7f5f2dde1a9ab140b5116394e SHA256 51775df141f5b5afebf83c825d7a4d756b7890a10a9792da7d7c15c76f809213
-MISC ChangeLog 4244 RMD160 305576c7484229521542caf56cc4c7b82c954ffe SHA1 44b61860ea022f260ccf53aca12c31195897c5d4 SHA256 41f588dc30abb63110810ca97713474dd2f7cb74428d6449370235f854ca6a25
+EBUILD ziproxy-2.7.2.ebuild 2057 RMD160 7f7ec10da7e91072ab7957c6725346027ebbae80 SHA1 386fb548d90b9f23067999ac4d9b72a86fab37a6 SHA256 033865079938e7e76f099607095113fef2b738fb3b38059e274eadb2defda555
+MISC ChangeLog 4391 RMD160 351e820cfddaec5debea803dfdf7a830d11d347a SHA1 e3e9a8d2ece049df02271581910d65cce63e8d5c SHA256 0839b5765b46db32fbee0b7832cfe8dec9e7e20fedc8aee2fa5780743dfc7b18
 MISC metadata.xml 534 RMD160 00f3e51718dbf971a2a828f9e465e3bedb0ee93e SHA1 7f1144f73a3502d77737e553424a421d986d57a9 SHA256 a07a0f1fef6f615ca4dd7d66321ef8e733faea0068218fcab034085d42236b68
diff --git a/net-proxy/ziproxy/files/ziproxy-2.7.2-libpng14.patch b/net-proxy/ziproxy/files/ziproxy-2.7.2-libpng14.patch
new file mode 100644
index 000000000000..b5bc7ff42d7b
--- /dev/null
+++ b/net-proxy/ziproxy/files/ziproxy-2.7.2-libpng14.patch
@@ -0,0 +1,23 @@
+--- configure.in
++++ configure.in
+@@ -24,7 +24,7 @@
+ AC_CHECK_LIB(jpeg, jpeg_start_decompress,, AC_MSG_ERROR([libjpeg not found.]))
+ 
+ USE_LIB(png)
+-AC_CHECK_LIB(png, png_check_sig,, AC_MSG_ERROR([libpng not found.]), -lz -lm)
++AC_CHECK_LIB(png, png_sig_cmp,, AC_MSG_ERROR([libpng not found.]), -lz -lm)
+ 
+ USE_LIB(pthread)
+ AC_CHECK_LIB(pthread, pthread_create,, AC_MSG_ERROR([libpthread not found.]), -lpthread)
+diff -ur ziproxy-2.7.2.orig/src/image.c ziproxy-2.7.2/src/image.c
+--- ziproxy-2.7.2.orig/src/image.c	2009-09-28 18:07:39.000000000 +0300
++++ ziproxy-2.7.2/src/image.c	2010-03-08 22:12:55.000000000 +0200
+@@ -457,7 +457,7 @@
+ 				color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
+ 	{
+ 		grayscale=1;	
+-        if(bit_depth < 8) png_set_gray_1_2_4_to_8(png_ptr);
++        if(bit_depth < 8) png_set_expand_gray_1_2_4_to_8(png_ptr);
+ 	}else grayscale=0;
+ 	
+ 	if (bit_depth == 16)
diff --git a/net-proxy/ziproxy/ziproxy-2.7.2.ebuild b/net-proxy/ziproxy/ziproxy-2.7.2.ebuild
index 533110a221e8..5f6597f1185e 100644
--- a/net-proxy/ziproxy/ziproxy-2.7.2.ebuild
+++ b/net-proxy/ziproxy/ziproxy-2.7.2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/ziproxy/ziproxy-2.7.2.ebuild,v 1.1 2009/12/17 14:12:24 sbriesen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/ziproxy/ziproxy-2.7.2.ebuild,v 1.2 2010/03/08 20:06:17 ssuominen Exp $
 
 EAPI="2"
 
-inherit eutils
+inherit autotools eutils
 
 DESCRIPTION="A forwarding, non-caching, compressing web proxy server"
 HOMEPAGE="http://ziproxy.sourceforge.net/"
@@ -38,6 +38,10 @@ src_prepare() {
 	sed -i -e "s:/usr/bin/:/usr/sbin/:g" \
 		-e "s:\(.*port.*\):\1\n\ttype\t\t\t= UNLISTED:g" \
 		-e "s:root:ziproxy:g" etc/xinetd.d/ziproxy
+
+	epatch "${FILESDIR}"/${P}-libpng14.patch
+
+	AT_M4DIR="config" eautoreconf
 }
 
 src_configure() {