Stable on amd64. Version bump.

(Portage version: 2.1.2.3)

4 files changed, 69 insertions, 9 deletions

diff --git a/net-proxy/adzapper/ChangeLog b/net-proxy/adzapper/ChangeLog
index 44c2cb31693c..7534ec4221ab 100644
--- a/net-proxy/adzapper/ChangeLog
+++ b/net-proxy/adzapper/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-proxy/adzapper
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/adzapper/ChangeLog,v 1.35 2007/01/17 18:52:28 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/adzapper/ChangeLog,v 1.36 2007/04/11 07:25:22 mrness Exp $
+
+*adzapper-20070317 (11 Apr 2007)
+
+  11 Apr 2007; Alin Năstac <mrness@gentoo.org> adzapper-20061217.ebuild,
+  +adzapper-20070317.ebuild:
+  Stable on amd64. Version bump.
 
 *adzapper-20061217 (17 Jan 2007)
 
diff --git a/net-proxy/adzapper/adzapper-20061217.ebuild b/net-proxy/adzapper/adzapper-20061217.ebuild
index e237149f8779..00deded4f418 100644
--- a/net-proxy/adzapper/adzapper-20061217.ebuild
+++ b/net-proxy/adzapper/adzapper-20061217.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/adzapper/adzapper-20061217.ebuild,v 1.1 2007/01/17 18:52:28 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/adzapper/adzapper-20061217.ebuild,v 1.2 2007/04/11 07:25:22 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 ~hppa ~ppc ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~hppa ~ppc ~sparc ~x86"
 IUSE=""
 
 RDEPEND="dev-lang/perl
@@ -50,10 +50,6 @@ src_install() {
 
 pkg_postinst() {
 	einfo "To enable adzapper, add the following lines to /etc/squid/squid.conf:"
-	einfo " - for squid ver 2.5"
-	einfo "    ${HILITE}redirect_program /etc/adzapper/wrapzap${NORMAL}"
-	einfo "    ${HILITE}redirect_children 10${NORMAL}"
-	einfo " - for squid ver 2.6"
-	einfo "    ${HILITE}url_rewrite_program /etc/adzapper/wrapzap${NORMAL}"
-	einfo "    ${HILITE}url_rewrite_children 10${NORMAL}"
+	einfo "    url_rewrite_program /etc/adzapper/wrapzap"
+	einfo "    url_rewrite_children 10"
 }
diff --git a/net-proxy/adzapper/adzapper-20070317.ebuild b/net-proxy/adzapper/adzapper-20070317.ebuild
new file mode 100644
index 000000000000..b90d9730ce11
--- /dev/null
+++ b/net-proxy/adzapper/adzapper-20070317.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/adzapper/adzapper-20070317.ebuild,v 1.1 2007/04/11 07:25:22 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 "    url_rewrite_program /etc/adzapper/wrapzap"
+	einfo "    url_rewrite_children 10"
+}
diff --git a/net-proxy/adzapper/files/digest-adzapper-20070317 b/net-proxy/adzapper/files/digest-adzapper-20070317
new file mode 100644
index 000000000000..11e9d2ceaba6
--- /dev/null
+++ b/net-proxy/adzapper/files/digest-adzapper-20070317
@@ -0,0 +1,3 @@
+MD5 15c5dc9c67c0c157ebd4e076d996412a adzap-20070317.tar.gz 53803
+RMD160 2960f75cc979e971a08e79d67b1593c4ac23b63b adzap-20070317.tar.gz 53803
+SHA256 4fa6d15af8a74778f41775218916bc1fd681235c0d19481f87fecfc6606013e9 adzap-20070317.tar.gz 53803