Version bump and ~ppc keyword addition (#285878).

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

4 files changed, 20 insertions, 102 deletions

diff --git a/net-proxy/ziproxy/ChangeLog b/net-proxy/ziproxy/ChangeLog
index 2c20583b57e0..850048403aef 100644
--- a/net-proxy/ziproxy/ChangeLog
+++ b/net-proxy/ziproxy/ChangeLog
@@ -1,6 +1,12 @@
 # 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.21 2009/05/09 09:02:57 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/ziproxy/ChangeLog,v 1.22 2009/09/22 15:51:58 mrness Exp $
+
+*ziproxy-2.7.1 (22 Sep 2009)
+
+  22 Sep 2009; Alin Năstac <mrness@gentoo.org> -ziproxy-2.5.2.ebuild,
+  -ziproxy-2.6.9_beta.ebuild, +ziproxy-2.7.1.ebuild:
+  Version bump and ~ppc keyword addition (#285878).
 
 *ziproxy-2.7.0 (09 May 2009)
 
diff --git a/net-proxy/ziproxy/Manifest b/net-proxy/ziproxy/Manifest
index 738b386c5a37..6268856bebc5 100644
--- a/net-proxy/ziproxy/Manifest
+++ b/net-proxy/ziproxy/Manifest
@@ -3,18 +3,16 @@ Hash: SHA1
 
 AUX ziproxy.confd 650 RMD160 1cbd1e13f3276399b89c94c0323fb8fa05c9c6af SHA1 12e7b4bf054e89de93c548be5c7fe000632c63b9 SHA256 dad7db324941944a35c87d4e061a004f5d9638ea24f139bc9bad80a51e0e8d78
 AUX ziproxy.initd 706 RMD160 b52b5b8f80bc402ff801723c4d9fb79f37935033 SHA1 66b467840480c94a7b551f4a92d1b2ab4752b199 SHA256 f143de97458b3373ba7b177fc19109ba8730354240e9ab5b3f5fe6192103d099
-DIST ziproxy-2.5.2.tar.bz2 243994 RMD160 e72330d58e9b7c0120c44f4697b04d83f1fccf66 SHA1 86bf957ce77397b5047cd1eaa2783e82f3746302 SHA256 6651c41713ea7044804d4c8cccdbf22a5b0eda79d499938be4b67a335f606853
-DIST ziproxy-2.6.9_BETA.tar.bz2 249358 RMD160 4c7028ed04892dbef202dacf8da708489c7f6f18 SHA1 3e02a49d97e6311badc30c303c4ed995c2d7ad89 SHA256 30baea941f9c760d617bfea9247086d18de7e2546212f70e67707d53ea25cb74
 DIST ziproxy-2.7.0.tar.bz2 239929 RMD160 02aa4b1e750cf299728e1a4ced54180b3c5b5d46 SHA1 5692c4e3356c898eec788a78ceb66b5d35dbdef0 SHA256 cd3e7cf6d4ca1faaf82867024486c72091968b9b9bd9ca41dac76fd76ad00d7a
-EBUILD ziproxy-2.5.2.ebuild 1942 RMD160 156e99392f754a2f0dc5ca23cbc727b0605e8c03 SHA1 dd5f15e4205340af029eac39b0131ba27a0f5996 SHA256 496b531e71d9ff5409dc67c19e9054c21c91bcdfb4a37c7cadf02d6bf1d931e7
-EBUILD ziproxy-2.6.9_beta.ebuild 1924 RMD160 a1d3b7969ed68ee28f365bbd041a17ce8c376411 SHA1 d8ac99306134b164a4a5d49e918d3aa45e7b8ffa SHA256 9676c7e0174f480feb43635549ec9af7d7855f1c4268b912264e2d5b3c9f4883
+DIST ziproxy-2.7.1.tar.bz2 258178 RMD160 125527ac3bb2f218cf16e4b91af5ada720cf6fc7 SHA1 af717f0539187ba4941d9048a7296ff4b0ec1ab7 SHA256 04d39ec8751e61afa5fec16ae9e13b61ff105ef22ea825e184142014393f1eb9
 EBUILD ziproxy-2.7.0.ebuild 1848 RMD160 5e85f64a4b94963c9f43b5c7e7787c1b686a141b SHA1 3d8d417d1629170c7d9b79b016d101ab8b1607f2 SHA256 25d3fce71ca79def4c4a40790ba158b7ff82cb33c34d794c594f7225a1f3878f
-MISC ChangeLog 3859 RMD160 7bb4ec5607e2043410714d4bb41c858eb6981704 SHA1 893816e9a2463e9fce06a35f7e5a1a40c88a6236 SHA256 91b0b680b167eb151a50795209fc3cc1235d11aacef5b7334958a0dba4afc733
+EBUILD ziproxy-2.7.1.ebuild 1853 RMD160 4106b6c10d2a18b16d92c9b228d7a6dc2df8468a SHA1 6a8148adb7a8f919e0fea0b498c843b2c5500fc6 SHA256 4d6d8f901215d61152cdde954992913d094a94dab67280aebfe5857428431ea4
+MISC ChangeLog 4066 RMD160 f9285947ded4052bac20807dda890ad31c7adb31 SHA1 edd3cd96605aaf3abbe1be422408fbe4987c8948 SHA256 362dca2b1477570ece0996eadf59a03ae59ae4af1bea28e17208921d0573f582
 MISC metadata.xml 513 RMD160 b107d66a1ba20b230598d2602f851dfbb8ba455b SHA1 586129e96f59e881bc2297180771b2dd9e664ff0 SHA256 07e6b452bd4451e9bdc7269eb44d61efe0945afbcd9757ce7ae707021e0335bc
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.10 (GNU/Linux)
+Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkoFZJUACgkQts85UDFmaOXx7gCcCk0zi9TbFvZzjGKuHuvQoKRK
-/SUAn3GuxwocU/Yi3rl4f7PZIB8LB53m
-=YSm7
+iEYEARECAAYFAkq48rMACgkQ9A5kJBGSrsvYIQCdFfeLpR/MDoMg1+92yiF4mFGi
+xS4AmgJOyQRbPTqEXOBnv1LegHks7t3N
+=pwsZ
 -----END PGP SIGNATURE-----
diff --git a/net-proxy/ziproxy/ziproxy-2.5.2.ebuild b/net-proxy/ziproxy/ziproxy-2.5.2.ebuild
deleted file mode 100644
index f354c95a27db..000000000000
--- a/net-proxy/ziproxy/ziproxy-2.5.2.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/ziproxy/ziproxy-2.5.2.ebuild,v 1.1 2008/07/08 19:07:08 mrness Exp $
-
-WANT_AUTOCONF="latest"
-WANT_AUTOMAKE="latest"
-
-inherit 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 ~sparc ~x86"
-IUSE="jpeg2k xinetd"
-
-DEPEND="media-libs/giflib
-	media-libs/libpng
-	media-libs/jpeg
-	sys-libs/zlib
-	jpeg2k? ( media-libs/jasper )"
-RDEPEND="${DEPEND}
-	xinetd? ( virtual/inetd )"
-
-pkg_setup() {
-	enewgroup ziproxy
-	enewuser ziproxy -1 -1 -1 ziproxy
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# fix sample config file
-	sed -i -e "s:/var/ziproxy/:/var/lib/ziproxy/: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
-}
-
-src_compile() {
-	local myconf="--with-cfgfile=/etc/ziproxy/ziproxy.conf"  # --enable-testprogs
-	use jpeg2k && myconf="${myconf} --with-jasper"  # use_with doesn't work
-	econf ${myconf} || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	dodir /usr/sbin
-	mv -f "${D}usr/bin/ziproxy" "${D}usr/sbin/ziproxy"
-
-	newbin stats.awk ${PN}_stats.awk
-	dobin src/tools/ziproxy_genhtml_stats.sh
-
-	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
-
-	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-2.6.9_beta.ebuild b/net-proxy/ziproxy/ziproxy-2.7.1.ebuild
index 960cbd00e56f..406fc7869c75 100644
--- a/net-proxy/ziproxy/ziproxy-2.6.9_beta.ebuild
+++ b/net-proxy/ziproxy/ziproxy-2.7.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/ziproxy/ziproxy-2.6.9_beta.ebuild,v 1.1 2009/03/06 19:37:17 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/ziproxy/ziproxy-2.7.1.ebuild,v 1.1 2009/09/22 15:51:58 mrness Exp $
 
 EAPI="2"
 
@@ -8,11 +8,11 @@ inherit eutils
 
 DESCRIPTION="A forwarding, non-caching, compressing web proxy server"
 HOMEPAGE="http://ziproxy.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P/beta/BETA}.tar.bz2"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE="jpeg2k xinetd"
 
 DEPEND="media-libs/giflib
@@ -23,19 +23,15 @@ DEPEND="media-libs/giflib
 RDEPEND="${DEPEND}
 	xinetd? ( virtual/inetd )"
 
-S="${WORKDIR}/${P/beta/BETA}"
-
 pkg_setup() {
 	enewgroup ziproxy
 	enewuser ziproxy -1 -1 -1 ziproxy
 }
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
+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
@@ -45,7 +41,7 @@ src_unpack() {
 }
 
 src_configure() {
-	local myconf="--with-cfgfile=/etc/ziproxy/ziproxy.conf"  # --enable-testprogs
+	local myconf="--with-cfgfile=/etc/ziproxy/ziproxy.conf"
 	use jpeg2k && myconf="${myconf} --with-jasper"  # use_with doesn't work
 	econf ${myconf} || die "econf failed"
 }
@@ -56,7 +52,6 @@ src_install() {
 	dodir /usr/sbin
 	mv -f "${D}usr/bin/ziproxy" "${D}usr/sbin/ziproxy"
 
-	newbin stats.awk ${PN}_stats.awk
 	dobin src/tools/ziproxy_genhtml_stats.sh
 
 	newinitd "${FILESDIR}/${PN}.initd" ${PN}