Stable on amd64. Version bump.

Package-Manager: portage-2.1.2.3

5 files changed, 89 insertions, 21 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/Manifest b/net-proxy/adzapper/Manifest
index 0addb158be21..51d0d2704824 100644
--- a/net-proxy/adzapper/Manifest
+++ b/net-proxy/adzapper/Manifest
@@ -5,6 +5,7 @@ DIST adzap-20060203.tar.gz 52728 RMD160 3536ee82d4c76a4a4ab9c07a5865db2a4bbb7240
 DIST adzap-20060424.tar.gz 53278 RMD160 7ecf0bfc24460800cd4a10af0ffce9c2524bc62e SHA1 da2dfc27b5d1b31a202ec52a492b0a2d057c0789 SHA256 2d2a16713c8fdd4ae770c08973c8741a488c5448b36c9c9538f79eeda68ebb1a
 DIST adzap-20060909.tar.gz 53472 RMD160 53ed865cc45815674338cec4fe36261318925620 SHA1 ae1cd419b07b2e72aa890b7792d8a8d954f3519f SHA256 933445060f19394c7e5a50876812aaf5c9147f58f2ff38081df740820de086b1
 DIST adzap-20061217.tar.gz 53622 RMD160 58ba3cf7e1736f96f9ea62f1fbd2e1f7c8f8d26d SHA1 722b1fa2fc9f067f80dc70337e1f2c7b511f798c SHA256 f7a27effa8724b50ae9bd3ea87dd35ebea212d3ea512fa7af9651e3c6b3d3e2d
+DIST adzap-20070317.tar.gz 53803 RMD160 2960f75cc979e971a08e79d67b1593c4ac23b63b SHA1 12c0bf7dc09a7cc3c644f660850f750b3f5e32be SHA256 4fa6d15af8a74778f41775218916bc1fd681235c0d19481f87fecfc6606013e9
 EBUILD adzapper-20060203.ebuild 1522 RMD160 e54b2a9a74da51ac04b3d5c311f726005c8ac77d SHA1 e44929962cfec239cf988b66b5b2c6631c03a5e3 SHA256 76e50146bc085b90649467b2d4dd828834db8b4e23ecd0975f04421988bee2e0
 MD5 2f8a8ebaabb090eb9659a67b931800de adzapper-20060203.ebuild 1522
 RMD160 e54b2a9a74da51ac04b3d5c311f726005c8ac77d adzapper-20060203.ebuild 1522
@@ -17,14 +18,18 @@ EBUILD adzapper-20060909.ebuild 1739 RMD160 cbb205e12c77bf843b5d622a8acb6c10e5d4
 MD5 97c632df2e9ed178bc437024c9719ea7 adzapper-20060909.ebuild 1739
 RMD160 cbb205e12c77bf843b5d622a8acb6c10e5d48bae adzapper-20060909.ebuild 1739
 SHA256 2d14915e6c9ee6b38d0e7d3c2bf1e34532c11cac65d7a5a19ad5e42229168232 adzapper-20060909.ebuild 1739
-EBUILD adzapper-20061217.ebuild 1742 RMD160 d5cd6e1c23535c98a07b0a01fdd107f8b684520d SHA1 5fa10b3020829fa44724590ff926939366709247 SHA256 66aa02a593981972e317d0368211c5cf01d2ca8ef940bf9ed870567f0f055fa7
-MD5 fce73c1ecc842cf2ed00bfe997c40b3b adzapper-20061217.ebuild 1742
-RMD160 d5cd6e1c23535c98a07b0a01fdd107f8b684520d adzapper-20061217.ebuild 1742
-SHA256 66aa02a593981972e317d0368211c5cf01d2ca8ef940bf9ed870567f0f055fa7 adzapper-20061217.ebuild 1742
-MISC ChangeLog 7642 RMD160 b61744a62a68e7b71187c4a55dadeb1da014cba5 SHA1 399990ee3d3df309a878f5be138c7c4e2eaa6a33 SHA256 0a0c1d39559b1e492611fc49335f67c3c5eca6194d895ce1e71ad84694e32afc
-MD5 55ffae181ab955847b2eefc9167019b3 ChangeLog 7642
-RMD160 b61744a62a68e7b71187c4a55dadeb1da014cba5 ChangeLog 7642
-SHA256 0a0c1d39559b1e492611fc49335f67c3c5eca6194d895ce1e71ad84694e32afc ChangeLog 7642
+EBUILD adzapper-20061217.ebuild 1523 RMD160 314ec4c9dd5070fec46a10334bb0b819e818b094 SHA1 80cfc14b6518fb1c70688c20d5f151ed1c889928 SHA256 4a12acc2507f8b4878d541037e1800e37ba3df077e3cf2e6ce9441d09ea355d9
+MD5 88377a18c158386f21dbceabd58705f7 adzapper-20061217.ebuild 1523
+RMD160 314ec4c9dd5070fec46a10334bb0b819e818b094 adzapper-20061217.ebuild 1523
+SHA256 4a12acc2507f8b4878d541037e1800e37ba3df077e3cf2e6ce9441d09ea355d9 adzapper-20061217.ebuild 1523
+EBUILD adzapper-20070317.ebuild 1524 RMD160 d447d579c19f09cfcb9b7349c5c5b6ef7a6818fb SHA1 169af700d0f9e02ca1d0f090950cb79d463d9781 SHA256 ab298e28ed2c55032aa68954dc9d66b865bbb1aa08c6209d9e5a93ef3de83642
+MD5 1844e491a3b53d5a1d2f8d60a1f77278 adzapper-20070317.ebuild 1524
+RMD160 d447d579c19f09cfcb9b7349c5c5b6ef7a6818fb adzapper-20070317.ebuild 1524
+SHA256 ab298e28ed2c55032aa68954dc9d66b865bbb1aa08c6209d9e5a93ef3de83642 adzapper-20070317.ebuild 1524
+MISC ChangeLog 7813 RMD160 7f188744d59e280e6611f2245137bd1b38aef50c SHA1 efe4b3486e57ed00bd3cc564c194bd7c269ada78 SHA256 e4059aac21d674da1e957baeeee37c80c875e5f7d49d5177ba4f7c55477d8d59
+MD5 2faba050a162d1b1701b220dd4f1dea7 ChangeLog 7813
+RMD160 7f188744d59e280e6611f2245137bd1b38aef50c ChangeLog 7813
+SHA256 e4059aac21d674da1e957baeeee37c80c875e5f7d49d5177ba4f7c55477d8d59 ChangeLog 7813
 MISC metadata.xml 279 RMD160 709b7617dd193fb1af6f8dc706f72223a0f838dc SHA1 e0208f01ac6493c23c2bd75416f0d2ae8c0473bf SHA256 56f4b53d553e31b70095de70341ab48f0aa0145793d8933d0b454f910939282d
 MD5 fae29d14dc1747ee9d3a07900bdd3990 metadata.xml 279
 RMD160 709b7617dd193fb1af6f8dc706f72223a0f838dc metadata.xml 279
@@ -41,10 +46,13 @@ SHA256 ee60a7d7ccfdbf65802141c3c7c5124d6047f11e455d780a446b73a3288b6124 files/di
 MD5 10f2b7fc8597a3af4e5fb22291e3b70c files/digest-adzapper-20061217 241
 RMD160 860db5f64ae967bf403dfdd2c7f77e0e09911637 files/digest-adzapper-20061217 241
 SHA256 586e1d534438b3eab7afeadb45276be6fd15c4982724dfbb4bd0db6d4952d09c files/digest-adzapper-20061217 241
+MD5 a21121f7ca4ed3fb5ed41803bf45c8f3 files/digest-adzapper-20070317 241
+RMD160 a77739dd72b6b814225d9440aca69983923f6ba6 files/digest-adzapper-20070317 241
+SHA256 9eeac9f1c084350b092f98fff56f80f5e5dcbf4e038a4986c2b6b16b84670500 files/digest-adzapper-20070317 241
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.1 (GNU/Linux)
+Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFFrnBzJnxX6mF440QRArw0AKC5uuUq4khdo8bUeHAf+p6XJ5YcWQCeMBBP
-IDxAD4IFRvvhy/7u4+3NFME=
-=2gr4
+iD8DBQFGHI1pJnxX6mF440QRAoMjAJ4ukNceBWDS1OqkEs+IyVGef/2+uQCdGet0
+cwVwCtcDvHZuWCelsfXVErE=
+=mTZY
 -----END PGP SIGNATURE-----
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