Remove old version. Mark ver 20050712 stable on x86. Version bump.

(Portage version: 2.0.51.22-r3)

6 files changed, 31 insertions, 26 deletions

diff --git a/net-proxy/adzapper/ChangeLog b/net-proxy/adzapper/ChangeLog
index faeadad6a72b..cedd00995064 100644
--- a/net-proxy/adzapper/ChangeLog
+++ b/net-proxy/adzapper/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-proxy/adzapper
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/adzapper/ChangeLog,v 1.12 2005/09/16 04:58:47 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/adzapper/ChangeLog,v 1.13 2005/12/01 21:15:40 mrness Exp $
+
+*adzapper-20051024 (01 Dec 2005)
+
+  01 Dec 2005; Alin Nastac <mrness@gentoo.org> -adzapper-20050316.ebuild,
+  adzapper-20050712.ebuild, +adzapper-20051024.ebuild:
+  Remove old version. Mark ver 20050712 stable on x86. Version bump.
 
   15 Sep 2005; Aron Griffis <agriffis@gentoo.org> adzapper-20050524.ebuild:
   Mark 20050524 stable on alpha
diff --git a/net-proxy/adzapper/Manifest b/net-proxy/adzapper/Manifest
index 2993521675b3..e2462d56f013 100644
--- a/net-proxy/adzapper/Manifest
+++ b/net-proxy/adzapper/Manifest
@@ -1,8 +1,8 @@
-MD5 865192a4aa5233381a3358f03460b9be metadata.xml 368
-MD5 1f74de1e6af943ed241edd5d1ff74725 adzapper-20050316.ebuild 1507
-MD5 dc582ca698469735dd3c9b19b7ad9fa9 ChangeLog 4844
-MD5 b70efc71db74844f4b8401df9aa1ebf3 adzapper-20050712.ebuild 1513
 MD5 712929f243acd3b6d1b177322cc9de11 adzapper-20050524.ebuild 1510
-MD5 2d648a6b3987ab877735484f8fa35b59 files/digest-adzapper-20050316 65
-MD5 bcee19293ff3560bd88eeb754c3bd5bc files/digest-adzapper-20050712 65
+MD5 861f21eb6d128c06598647b03302e115 adzapper-20051024.ebuild 1522
+MD5 dc582ca698469735dd3c9b19b7ad9fa9 ChangeLog 4844
+MD5 c9ec6d9d780b47b37969a359f6ce6fad adzapper-20050712.ebuild 1512
+MD5 865192a4aa5233381a3358f03460b9be metadata.xml 368
 MD5 238922a3c9c8c8a2e886fbcb1eb40328 files/digest-adzapper-20050524 65
+MD5 bcee19293ff3560bd88eeb754c3bd5bc files/digest-adzapper-20050712 65
+MD5 ee182a99cce3d170734ee05dabf9df70 files/digest-adzapper-20051024 65
diff --git a/net-proxy/adzapper/adzapper-20050712.ebuild b/net-proxy/adzapper/adzapper-20050712.ebuild
index 497f7a11461f..f513abb06477 100644
--- a/net-proxy/adzapper/adzapper-20050712.ebuild
+++ b/net-proxy/adzapper/adzapper-20050712.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/adzapper/adzapper-20050712.ebuild,v 1.1 2005/07/30 07:28:22 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/adzapper/adzapper-20050712.ebuild,v 1.2 2005/12/01 21:15:40 mrness Exp $
 
 MY_P=${P/zapper/zap}
 
@@ -10,7 +10,7 @@ SRC_URI="http://adzapper.sourceforge.net/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc x86"
 IUSE=""
 
 RDEPEND="net-proxy/squid"
diff --git a/net-proxy/adzapper/adzapper-20050316.ebuild b/net-proxy/adzapper/adzapper-20051024.ebuild
index 546282b19c24..022105e7ca17 100644
--- a/net-proxy/adzapper/adzapper-20050316.ebuild
+++ b/net-proxy/adzapper/adzapper-20051024.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/adzapper/adzapper-20050316.ebuild,v 1.5 2005/06/19 20:16:56 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/adzapper/adzapper-20051024.ebuild,v 1.1 2005/12/01 21:15:40 mrness Exp $
 
 MY_P=${P/zapper/zap}
 
@@ -10,48 +10,47 @@ SRC_URI="http://adzapper.sourceforge.net/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 ppc sparc x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
 IUSE=""
 
-RDEPEND="net-proxy/squid"
+DEPEND=""
+RDEPEND="dev-lang/perl
+	net-proxy/squid"
 
 S="${WORKDIR}/adzap"
 
 src_unpack() {
 	unpack ${A}
 
-	SCRPATH="/etc/adzapper/squid_redirect"
-
-	cd ${S}/scripts || die "Error no scripts dir."
+	cd "${S}/scripts" || die "Scripts directory not found"
 
 	# update the zapper path in various scripts
-	for src in wrapzap update-zapper*; do
-		mv $src $src.orig || die
-		sed -e "s|^zapper=.*|zapper=${SCRPATH}|" \
+	local f SCRPATH="/etc/adzapper/squid_redirect"
+	for f in wrapzap update-zapper*; do
+		sed -i -e "s|^zapper=.*|zapper=${SCRPATH}|" \
 			-e "s|^ZAPPER=.*|ZAPPER=\"${SCRPATH}\"|" \
 			-e "s|^pidfile=.*|pidfile=/var/run/squid.pid|" \
 			-e "s|^PIDFILE=.*|PIDFILE=\"/var/run/squid.pid\"|" \
 			-e "s|^RESTARTCMD=.*|RESTARTCMD=\"/etc/init.d/squid restart\"|" \
-			$src.orig > $src || die "sed updating failed."
-			rm $src.orig
+				$f || die "sed updating failed."
 	done
 }
 
 src_install() {
-	cd ${S}/scripts
+	cd "${S}/scripts"
 	exeinto /etc/adzapper
 	doexe wrapzap zapchain squid_redirect
 
 	insinto /etc/adzapper
 	doins update-zapper*
 
-	cd ${S}/zaps
+	cd "${S}/zaps"
 	insinto /var/www/localhost/htdocs/zap
 	doins *
 }
 
 pkg_postinst() {
-	einfo "To enable adzapper add the following lines to squid.conf:"
-	einfo "redirect_program /etc/adzapper/wrapzap"
-	einfo "redirect_children 10"
+	einfo "To enable adzapper, add the following lines to /etc/squid/squid.conf:"
+	einfo "    redirect_program /etc/adzapper/wrapzap"
+	einfo "    redirect_children 10"
 }
diff --git a/net-proxy/adzapper/files/digest-adzapper-20050316 b/net-proxy/adzapper/files/digest-adzapper-20050316
deleted file mode 100644
index e617475e9192..000000000000
--- a/net-proxy/adzapper/files/digest-adzapper-20050316
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c5e85d7664b873deea48f8ad16a5f68e adzap-20050316.tar.gz 49003
diff --git a/net-proxy/adzapper/files/digest-adzapper-20051024 b/net-proxy/adzapper/files/digest-adzapper-20051024
new file mode 100644
index 000000000000..02861f175ad7
--- /dev/null
+++ b/net-proxy/adzapper/files/digest-adzapper-20051024
@@ -0,0 +1 @@
+MD5 3e3e5e2bb7752be5c3c5c36d0eca41f0 adzap-20051024.tar.gz 51811