amd64; version bump

Package-Manager: portage-2.1.1-r2

5 files changed, 93 insertions, 17 deletions

diff --git a/net-proxy/adzapper/ChangeLog b/net-proxy/adzapper/ChangeLog
index 21252724c709..44c2cb31693c 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.34 2006/11/17 14:15:06 gustavoz Exp $
+# 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 $
+
+*adzapper-20061217 (17 Jan 2007)
+
+  17 Jan 2007; Alin Năstac <mrness@gentoo.org> adzapper-20060909.ebuild,
+  +adzapper-20061217.ebuild:
+  Stable on amd64. Version bump.
 
   17 Nov 2006; Gustavo Zacarias <gustavoz@gentoo.org>
   adzapper-20060909.ebuild:
diff --git a/net-proxy/adzapper/Manifest b/net-proxy/adzapper/Manifest
index 3b3125f09b44..0addb158be21 100644
--- a/net-proxy/adzapper/Manifest
+++ b/net-proxy/adzapper/Manifest
@@ -4,6 +4,7 @@ Hash: SHA1
 DIST adzap-20060203.tar.gz 52728 RMD160 3536ee82d4c76a4a4ab9c07a5865db2a4bbb7240 SHA1 e07969281065c12dae1e69d6a8344187c8890caa SHA256 b812264db684d5a72f552a99b2e69ea09f5030758d9639c648b78611fd3c0a25
 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
 EBUILD adzapper-20060203.ebuild 1522 RMD160 e54b2a9a74da51ac04b3d5c311f726005c8ac77d SHA1 e44929962cfec239cf988b66b5b2c6631c03a5e3 SHA256 76e50146bc085b90649467b2d4dd828834db8b4e23ecd0975f04421988bee2e0
 MD5 2f8a8ebaabb090eb9659a67b931800de adzapper-20060203.ebuild 1522
 RMD160 e54b2a9a74da51ac04b3d5c311f726005c8ac77d adzapper-20060203.ebuild 1522
@@ -12,14 +13,18 @@ EBUILD adzapper-20060424.ebuild 1517 RMD160 ed809c2b7a977b6f68717691958976ceb06b
 MD5 8066b68f6ae8593362eace2a7e77926a adzapper-20060424.ebuild 1517
 RMD160 ed809c2b7a977b6f68717691958976ceb06b94e1 adzapper-20060424.ebuild 1517
 SHA256 64cf5f7a6554ee98cc6c6b9803e32dcb14a8b18d005951c896eb1242b4abc4db adzapper-20060424.ebuild 1517
-EBUILD adzapper-20060909.ebuild 1742 RMD160 a26658abfb3950023b49a46361bc4ac0b3abb567 SHA1 5278630b1fba165ed621a6e2cbcdea2d3b31aa94 SHA256 79cc25de3a32377f173d5f9a006b9e8c67722c8dbcd2ed55c87f3ea5139a0102
-MD5 6c4b34b0c573e4de4ecf66dfd4d7aae6 adzapper-20060909.ebuild 1742
-RMD160 a26658abfb3950023b49a46361bc4ac0b3abb567 adzapper-20060909.ebuild 1742
-SHA256 79cc25de3a32377f173d5f9a006b9e8c67722c8dbcd2ed55c87f3ea5139a0102 adzapper-20060909.ebuild 1742
-MISC ChangeLog 7473 RMD160 b7852930e7b61258b52c9c10feef8edeb14b1634 SHA1 847c3e5d59ae83707d0c01c82bf503996242d5f2 SHA256 563c914e5354aee4c671513cbcdab82ecbfb52827dd21ed6b7222c488485316d
-MD5 1ff9419b05dba25c9bf7da1966711a9a ChangeLog 7473
-RMD160 b7852930e7b61258b52c9c10feef8edeb14b1634 ChangeLog 7473
-SHA256 563c914e5354aee4c671513cbcdab82ecbfb52827dd21ed6b7222c488485316d ChangeLog 7473
+EBUILD adzapper-20060909.ebuild 1739 RMD160 cbb205e12c77bf843b5d622a8acb6c10e5d48bae SHA1 a37fb56ead56aadc6a8f4e4ea770375b0e9e65f5 SHA256 2d14915e6c9ee6b38d0e7d3c2bf1e34532c11cac65d7a5a19ad5e42229168232
+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
 MISC metadata.xml 279 RMD160 709b7617dd193fb1af6f8dc706f72223a0f838dc SHA1 e0208f01ac6493c23c2bd75416f0d2ae8c0473bf SHA256 56f4b53d553e31b70095de70341ab48f0aa0145793d8933d0b454f910939282d
 MD5 fae29d14dc1747ee9d3a07900bdd3990 metadata.xml 279
 RMD160 709b7617dd193fb1af6f8dc706f72223a0f838dc metadata.xml 279
@@ -33,10 +38,13 @@ SHA256 6f1e4aee9a5f6681e08960b7881e462def6c6a29bf9bc73c9e7be2fd5ba1ff25 files/di
 MD5 22c8fd658965b221a4100ea97749e5d7 files/digest-adzapper-20060909 241
 RMD160 057017ee3c7924736b1bf870d66731537e28f305 files/digest-adzapper-20060909 241
 SHA256 ee60a7d7ccfdbf65802141c3c7c5124d6047f11e455d780a446b73a3288b6124 files/digest-adzapper-20060909 241
+MD5 10f2b7fc8597a3af4e5fb22291e3b70c files/digest-adzapper-20061217 241
+RMD160 860db5f64ae967bf403dfdd2c7f77e0e09911637 files/digest-adzapper-20061217 241
+SHA256 586e1d534438b3eab7afeadb45276be6fd15c4982724dfbb4bd0db6d4952d09c files/digest-adzapper-20061217 241
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5-ecc0.1.6 (GNU/Linux)
+Version: GnuPG v2.0.1 (GNU/Linux)
 
-iD8DBQFFXcPxKRy60XGEcJIRAuGvAKCGio3LmaD6fXqsk1a1DX0WyfiqAQCffApl
-4ohAzJpVnUwkHNr0+itRpZk=
-=9Iw+
+iD8DBQFFrnBzJnxX6mF440QRArw0AKC5uuUq4khdo8bUeHAf+p6XJ5YcWQCeMBBP
+IDxAD4IFRvvhy/7u4+3NFME=
+=2gr4
 -----END PGP SIGNATURE-----
diff --git a/net-proxy/adzapper/adzapper-20060909.ebuild b/net-proxy/adzapper/adzapper-20060909.ebuild
index d04a27401a74..6f3e9bf99e89 100644
--- a/net-proxy/adzapper/adzapper-20060909.ebuild
+++ b/net-proxy/adzapper/adzapper-20060909.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# 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-20060909.ebuild,v 1.4 2006/11/17 14:15:06 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/adzapper/adzapper-20060909.ebuild,v 1.5 2007/01/17 18:52:28 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
diff --git a/net-proxy/adzapper/adzapper-20061217.ebuild b/net-proxy/adzapper/adzapper-20061217.ebuild
new file mode 100644
index 000000000000..e237149f8779
--- /dev/null
+++ b/net-proxy/adzapper/adzapper-20061217.ebuild
@@ -0,0 +1,59 @@
+# 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 $
+
+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 " - 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}"
+}
diff --git a/net-proxy/adzapper/files/digest-adzapper-20061217 b/net-proxy/adzapper/files/digest-adzapper-20061217
new file mode 100644
index 000000000000..4836818b68db
--- /dev/null
+++ b/net-proxy/adzapper/files/digest-adzapper-20061217
@@ -0,0 +1,3 @@
+MD5 540efd85f5094ea90526401f7c5a76f2 adzap-20061217.tar.gz 53622
+RMD160 58ba3cf7e1736f96f9ea62f1fbd2e1f7c8f8d26d adzap-20061217.tar.gz 53622
+SHA256 f7a27effa8724b50ae9bd3ea87dd35ebea212d3ea512fa7af9651e3c6b3d3e2d adzap-20061217.tar.gz 53622