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

(Portage version: 2.1.6.13/cvs/Linux x86_64)

3 files changed, 13 insertions, 93 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/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}