Stable on x86. Version bump (#121743).

(Portage version: 2.0.54)

5 files changed, 71 insertions, 6 deletions

diff --git a/net-proxy/adzapper/ChangeLog b/net-proxy/adzapper/ChangeLog
index c09b7570d48a..2a7e4401a623 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.16 2005/12/24 15:38:11 hansmi Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/adzapper/ChangeLog,v 1.17 2006/02/06 18:59:19 mrness Exp $
+
+*adzapper-20060203 (06 Feb 2006)
+
+  06 Feb 2006; Alin Nastac <mrness@gentoo.org> adzapper-20051024.ebuild,
+  +adzapper-20060203.ebuild:
+  Stable on x86. Version bump (#121743).
 
   24 Dec 2005; Michael Hanselmann <hansmi@gentoo.org>
   adzapper-20050712.ebuild:
diff --git a/net-proxy/adzapper/Manifest b/net-proxy/adzapper/Manifest
index fbe892cc5d9a..d541f96939fd 100644
--- a/net-proxy/adzapper/Manifest
+++ b/net-proxy/adzapper/Manifest
@@ -1,8 +1,10 @@
 MD5 183739eb2583b05b17d0ad7e0e938c83 ChangeLog 5367
 MD5 712929f243acd3b6d1b177322cc9de11 adzapper-20050524.ebuild 1510
 MD5 29cf2e168144064ba2815013b617959d adzapper-20050712.ebuild 1515
-MD5 11a69a354551ce05416c2eb92135aa57 adzapper-20051024.ebuild 1522
+MD5 c43702bdb000af92037caac55d2a06e1 adzapper-20051024.ebuild 1521
+MD5 11a69a354551ce05416c2eb92135aa57 adzapper-20060203.ebuild 1522
 MD5 238922a3c9c8c8a2e886fbcb1eb40328 files/digest-adzapper-20050524 65
 MD5 bcee19293ff3560bd88eeb754c3bd5bc files/digest-adzapper-20050712 65
 MD5 ee182a99cce3d170734ee05dabf9df70 files/digest-adzapper-20051024 65
+MD5 342d3000ea838cbd63451c90148cf202 files/digest-adzapper-20060203 65
 MD5 fae29d14dc1747ee9d3a07900bdd3990 metadata.xml 279
diff --git a/net-proxy/adzapper/adzapper-20051024.ebuild b/net-proxy/adzapper/adzapper-20051024.ebuild
index 022105e7ca17..49f637b53910 100644
--- a/net-proxy/adzapper/adzapper-20051024.ebuild
+++ b/net-proxy/adzapper/adzapper-20051024.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# 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-20051024.ebuild,v 1.1 2005/12/01 21:15:40 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/adzapper/adzapper-20051024.ebuild,v 1.2 2006/02/06 18:59:19 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=""
 
 DEPEND=""
diff --git a/net-proxy/adzapper/adzapper-20060203.ebuild b/net-proxy/adzapper/adzapper-20060203.ebuild
new file mode 100644
index 000000000000..817e4cb36464
--- /dev/null
+++ b/net-proxy/adzapper/adzapper-20060203.ebuild
@@ -0,0 +1,56 @@
+# 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-20060203.ebuild,v 1.1 2006/02/06 18:59:19 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 ~ppc ~sparc ~x86"
+IUSE=""
+
+DEPEND=""
+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
new file mode 100644
index 000000000000..ed8defdea56a
--- /dev/null
+++ b/net-proxy/adzapper/files/digest-adzapper-20060203
@@ -0,0 +1 @@
+MD5 54462c091e4e9345eaeafe24818ed1dc adzap-20060203.tar.gz 52728