replace 20060414 with version 20060424 and mark it stable on x86 - the old tarball had a cvs conflict file in it, the rest being exactly the same as the "new" version

(Portage version: 2.1)

4 files changed, 67 insertions, 1 deletions

diff --git a/net-proxy/adzapper/ChangeLog b/net-proxy/adzapper/ChangeLog
index 8b4b9acb80e6..3095b6a67ea0 100644
--- a/net-proxy/adzapper/ChangeLog
+++ b/net-proxy/adzapper/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-proxy/adzapper
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/adzapper/ChangeLog,v 1.28 2006/04/14 07:44:40 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/adzapper/ChangeLog,v 1.29 2006/06/18 15:38:42 mrness Exp $
+
+*adzapper-20060424 (18 Jun 2006)
+
+  18 Jun 2006; Alin Nastac <mrness@gentoo.org> -adzapper-20060414.ebuild,
+  +adzapper-20060424.ebuild:
+  Stable on x86.
 
 *adzapper-20060414 (14 Apr 2006)
 
diff --git a/net-proxy/adzapper/adzapper-20060424.ebuild b/net-proxy/adzapper/adzapper-20060424.ebuild
new file mode 100644
index 000000000000..e03f847845e1
--- /dev/null
+++ b/net-proxy/adzapper/adzapper-20060424.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/adzapper/adzapper-20060424.ebuild,v 1.1 2006/06/18 15:38:42 mrness Exp $
+
+MY_P=${P/zapper/zap}
+
+DESCRIPTION="Redirector for squid that intercepts advertising, page counters and some web bugs"
+HOMEPAGE="http://adzapper.sourceforge.net/"
+SRC_URI="http://adzapper.sourceforge.net/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc x86"
+IUSE=""
+
+RDEPEND="dev-lang/perl
+	net-proxy/squid"
+
+S="${WORKDIR}/adzap"
+
+src_unpack() {
+	unpack ${A}
+
+	cd "${S}/scripts" || die "Scripts directory not found"
+
+	# update the zapper path in various scripts
+	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\"|" \
+				$f || die "sed updating failed."
+	done
+}
+
+src_install() {
+	cd "${S}/scripts"
+	exeinto /etc/adzapper
+	doexe wrapzap zapchain squid_redirect
+
+	insinto /etc/adzapper
+	doins update-zapper*
+
+	cd "${S}/zaps"
+	insinto /var/www/localhost/htdocs/zap
+	doins *
+}
+
+pkg_postinst() {
+	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-20060203 b/net-proxy/adzapper/files/digest-adzapper-20060203
index ed8defdea56a..ef11b9bb787e 100644
--- a/net-proxy/adzapper/files/digest-adzapper-20060203
+++ b/net-proxy/adzapper/files/digest-adzapper-20060203
@@ -1 +1,3 @@
 MD5 54462c091e4e9345eaeafe24818ed1dc adzap-20060203.tar.gz 52728
+RMD160 3536ee82d4c76a4a4ab9c07a5865db2a4bbb7240 adzap-20060203.tar.gz 52728
+SHA256 b812264db684d5a72f552a99b2e69ea09f5030758d9639c648b78611fd3c0a25 adzap-20060203.tar.gz 52728
diff --git a/net-proxy/adzapper/files/digest-adzapper-20060424 b/net-proxy/adzapper/files/digest-adzapper-20060424
new file mode 100644
index 000000000000..1a8d7afd6754
--- /dev/null
+++ b/net-proxy/adzapper/files/digest-adzapper-20060424
@@ -0,0 +1,3 @@
+MD5 f580f0183a19d9c3abf861548efd4500 adzap-20060424.tar.gz 53278
+RMD160 7ecf0bfc24460800cd4a10af0ffce9c2524bc62e adzap-20060424.tar.gz 53278
+SHA256 2d2a16713c8fdd4ae770c08973c8741a488c5448b36c9c9538f79eeda68ebb1a adzap-20060424.tar.gz 53278