old

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

5 files changed, 15 insertions, 202 deletions

diff --git a/net-proxy/ziproxy/ChangeLog b/net-proxy/ziproxy/ChangeLog
index 2838dd659744..7bfc62b7366a 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.29 2011/08/09 11:15:13 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/ziproxy/ChangeLog,v 1.30 2011/10/01 15:24:14 ssuominen Exp $
+
+  01 Oct 2011; Samuli Suominen <ssuominen@gentoo.org> -ziproxy-2.7.2.ebuild,
+  -files/ziproxy-2.7.2-libpng14.patch, -ziproxy-3.1.1.ebuild:
+  old
 
   09 Aug 2011; Samuli Suominen <ssuominen@gentoo.org> ziproxy-3.1.3.ebuild,
   +files/ziproxy-3.1.3-libpng15.patch:
diff --git a/net-proxy/ziproxy/Manifest b/net-proxy/ziproxy/Manifest
index 34b22740e8e7..9eac70c5a6ec 100644
--- a/net-proxy/ziproxy/Manifest
+++ b/net-proxy/ziproxy/Manifest
@@ -1,22 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
-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
-DIST ziproxy-3.1.1.tar.bz2 260604 RMD160 bd1693a2644008c1b7519aa905a16ccacfae3808 SHA1 c75058fcee5f8bc1cea035d1868ae40e53514393 SHA256 8066037eb7a82dc140286ac0e58c81d36da8bc1c76f2699cd0c44f8a631f93b2
 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 1895 RMD160 3f83baef6ec6ae683d944cb2be0d0120b02d6b41 SHA1 1678f0e271af3665f1a98cf8ed6fd4164ff102c7 SHA256 427845c701c6c68768e316f3fe41c42bce67264dbe6b903af1f1a1d576f373d3
-MISC ChangeLog 5137 RMD160 fdea1fdd005476fc783ff88a3a200c21ab6928f6 SHA1 6faffb00607493a4d166a5a04b777a6b3c1ec61b SHA256 a4c121cbfb6fec7fdf3d132908fe5bd85fe06a003072d5ea77264836896bf5d8
+MISC ChangeLog 5283 RMD160 ca96f5ab2d459adf10f5b35226b00763a2b7f8bd SHA1 5daf8a9c2e03a092d40006043d6461efee8a9a56 SHA256 f24984abe11457b29908af2215a529c4025c43db2eafa52c92275b12c1f6d1a4
 MISC metadata.xml 534 RMD160 00f3e51718dbf971a2a828f9e465e3bedb0ee93e SHA1 7f1144f73a3502d77737e553424a421d986d57a9 SHA256 a07a0f1fef6f615ca4dd7d66321ef8e733faea0068218fcab034085d42236b68
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk5BFroACgkQXkR9YqOcLPFN8QD/R1J8GoukeBJWPtorCMDEBefN
-YPp6hQcZLr2Sy4vZWJkA/0JjSbAK5R/syEZteMyAKvvo9WXqEfMStQq5QqoSPlGf
-=6dn8
+iQEcBAEBAgAGBQJOhzDEAAoJEEdUh39IaPFNK/YH/RMz94bBjWrxw/7aLD5hcxrk
+htFBIQyeJGjMVMZiWYXMVS/gwYJfFAaKsax6HGyazV6YdvckBQrkU8JgzjuvhDC/
+dk3yV7txiJp0ABHMXTAyijKWmO+AmMSngEl2dQDry+K2yII+fNmQGe7pliusEptZ
+wcRbgiMtMi+JsSc56/pUlN+Jj2/rxJ4Nvptrz+jlzhKiNdFX+IjivIsBczilMaUr
+9r1iXGp+I2Tv3WL2vDzLF9k7jL4cJ1o53Uz3Ab2s7C/zd/23nzYvms2pOF9hQU/O
+MbUOPb10niDMFkbBCg1dGxHp0fLAsBOQPzOHuREb202aqVG9WI74bfCXXo9u5Lk=
+=NmEV
 -----END PGP SIGNATURE-----
diff --git a/net-proxy/ziproxy/files/ziproxy-2.7.2-libpng14.patch b/net-proxy/ziproxy/files/ziproxy-2.7.2-libpng14.patch
deleted file mode 100644
index a3256a21f35b..000000000000
--- a/net-proxy/ziproxy/files/ziproxy-2.7.2-libpng14.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- ziproxy-2.7.2.orig/configure.in
-+++ ziproxy-2.7.2/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
deleted file mode 100644
index 7ab6eea55004..000000000000
--- a/net-proxy/ziproxy/ziproxy-2.7.2.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# 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-2.7.2.ebuild,v 1.3 2011/02/26 22:11:49 signals Exp $
-
-EAPI="2"
-
-inherit autotools eutils
-
-DESCRIPTION="A forwarding, non-caching, compressing web proxy server"
-HOMEPAGE="http://ziproxy.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="jpeg2k xinetd linguas_ru"
-
-DEPEND="media-libs/giflib
-	media-libs/libpng
-	virtual/jpeg
-	sys-libs/zlib
-	jpeg2k? ( media-libs/jasper )"
-RDEPEND="${DEPEND}
-	xinetd? ( virtual/inetd )"
-
-pkg_setup() {
-	enewgroup ziproxy
-	enewuser ziproxy -1 -1 -1 ziproxy
-}
-
-src_prepare() {
-	# fix sample config file
-	sed -i -e "s:/var/ziproxy/:/var/lib/ziproxy/:g" \
-		-e "s:%j-%Y.log:/var/log/ziproxy/%j-%Y.log:g" \
-		etc/ziproxy/ziproxy.conf
-
-	# fix sample xinetd config
-	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() {
-	local myconf="--with-cfgfile=/etc/ziproxy/ziproxy.conf"
-	use jpeg2k && myconf="${myconf} --with-jasper"  # use_with doesn't work
-	econf ${myconf} || die "econf failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	dodir /usr/sbin
-	mv -f "${D}usr/bin/ziproxy" "${D}usr/sbin/ziproxy"
-
-	dobin src/tools/ziproxy_genhtml_stats.sh
-
-	newinitd "${FILESDIR}/${PN}.initd" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-
-	dodoc ChangeLog CREDITS README README.tools
-	use linguas_ru && dodoc README.ru README.tools.ru
-	if use jpeg2k; then
-		dodoc JPEG2000.txt
-		use linguas_ru && dodoc JPEG2000.ru.txt
-	fi
-
-	insinto /etc
-	doins -r etc/ziproxy
-
-	insinto /var/lib/ziproxy/error
-	doins var/ziproxy/error/*.html
-
-	if use xinetd; then
-		insinto /etc/xinetd.d
-		doins etc/xinetd.d/ziproxy
-	fi
-
-	diropts -m0750 -o ziproxy -g ziproxy
-	keepdir /var/log/ziproxy
-}
diff --git a/net-proxy/ziproxy/ziproxy-3.1.1.ebuild b/net-proxy/ziproxy/ziproxy-3.1.1.ebuild
deleted file mode 100644
index a2af8be01511..000000000000
--- a/net-proxy/ziproxy/ziproxy-3.1.1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# 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.1.ebuild,v 1.2 2011/02/26 22:11:49 signals Exp $
-
-EAPI=2
-inherit autotools eutils
-
-DESCRIPTION="A forwarding, non-caching, compressing web proxy server"
-HOMEPAGE="http://ziproxy.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="jpeg2k xinetd"
-
-DEPEND="media-libs/giflib
-	media-libs/libpng
-	virtual/jpeg
-	sys-libs/zlib
-	jpeg2k? ( media-libs/jasper )"
-RDEPEND="${DEPEND}
-	xinetd? ( virtual/inetd )"
-
-pkg_setup() {
-	enewgroup ziproxy
-	enewuser ziproxy -1 -1 -1 ziproxy
-}
-
-src_prepare() {
-	# fix sample config file
-	sed -i \
-		-e "s:/var/ziproxy/:/var/lib/ziproxy/:g" \
-		-e "s:%j-%Y.log:/var/log/ziproxy/%j-%Y.log:g" \
-		etc/ziproxy/ziproxy.conf || die
-
-	# fix sample xinetd config
-	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 || die
-
-	AT_M4DIR="config" eautoreconf
-}
-
-src_configure() {
-	local myconf
-	use jpeg2k && myconf="--with-jasper"  # use_with doesn't work
-
-	econf \
-		--with-cfgfile=/etc/ziproxy/ziproxy.conf \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	dodir /usr/sbin
-	mv -vf "${D}"usr/{,s}bin/ziproxy || die
-
-	dobin src/tools/ziproxy_genhtml_stats.sh || die
-
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-
-	dodoc ChangeLog CREDITS README README.tools
-	use jpeg2k && dodoc JPEG2000.txt
-
-	insinto /etc
-	doins -r etc/ziproxy || die
-
-	insinto /var/lib/ziproxy/error
-	doins var/ziproxy/error/*.html || die
-
-	if use xinetd; then
-		insinto /etc/xinetd.d
-		doins etc/xinetd.d/ziproxy || die
-	fi
-
-	diropts -m0750 -o ziproxy -g ziproxy
-	keepdir /var/log/ziproxy
-}