old

(Portage version: 2.2.0_alpha59/cvs/Linux x86_64)

4 files changed, 5 insertions, 191 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/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
-}