Version bump thanks to Elias Probst and Florian Steinel (bug #277909).

Package-Manager: portage-2.2.0_alpha120/cvs/Linux x86_64

3 files changed, 73 insertions, 13 deletions

diff --git a/net-proxy/adzapper/ChangeLog b/net-proxy/adzapper/ChangeLog
index 5046e9e1b67e..d386a54cab0e 100644
--- a/net-proxy/adzapper/ChangeLog
+++ b/net-proxy/adzapper/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-proxy/adzapper
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/adzapper/ChangeLog,v 1.59 2009/04/20 20:19:49 maekke Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/adzapper/ChangeLog,v 1.60 2012/08/01 19:36:05 jer Exp $
+
+*adzapper-20110915 (01 Aug 2012)
+
+  01 Aug 2012; Jeroen Roovers <jer@gentoo.org> +adzapper-20110915.ebuild:
+  Version bump thanks to Elias Probst and Florian Steinel (bug #277909).
 
   20 Apr 2009; Markus Meier <maekke@gentoo.org> adzapper-20080508:
   amd64 stable, bug #257531
diff --git a/net-proxy/adzapper/Manifest b/net-proxy/adzapper/Manifest
index 0460e07d1b96..ab5ea14e4ab4 100644
--- a/net-proxy/adzapper/Manifest
+++ b/net-proxy/adzapper/Manifest
@@ -1,16 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-DIST adzap-20071120.tar.gz 56267 RMD160 7a7f84e4ac4a02d3b48c49bbad0a7f7bee2433f3 SHA1 7cdfeed277c91814a797fc094826dfc10bac6cbb SHA256 6a2983fe13007ad0f732719f135871382411ed1718aa4c3873bedf65f3f2f145
-DIST adzap-20080508.tar.gz 57061 RMD160 2ed46689d44db601daaebd72c1fdf29069f00f91 SHA1 ea58a23a1db4d1913b44a97cf10fe61b3af48d06 SHA256 293e52fc237e32ac46f3dc4906e67103eb54b3809032793d71a7a1d83d56d00b
-EBUILD adzapper-20071120.ebuild 1519 RMD160 69768f852f61f9320e22b1db09f70384cab38c18 SHA1 3e2322ed202a833f5dae706f096442bde8eafdf7 SHA256 8ef73bcc63c90ba2417cac944b9254fbaf20be98afa4e8744fbe1569183660dc
-EBUILD adzapper-20080508.ebuild 1501 RMD160 a2f4f7b766e053b03d0aa378e8fdbcada6ff52fb SHA1 de71c18c715261ac178667564fa5bdedbc473b21 SHA256 5f450ea1e04c50c8254b3c08073033203640bf1ccd04c4464879ea443c304761
-MISC ChangeLog 10522 RMD160 7a78c68c30ecc9cd37d1b42b36c4db386ec0b968 SHA1 e4ce4bc200f3f54247c7609da210d5c0e1bdf13b SHA256 25297466e642d4e2f5b5122b7354338f2c0c078881b8c08e4f4c301846876b3b
-MISC metadata.xml 279 RMD160 709b7617dd193fb1af6f8dc706f72223a0f838dc SHA1 e0208f01ac6493c23c2bd75416f0d2ae8c0473bf SHA256 56f4b53d553e31b70095de70341ab48f0aa0145793d8933d0b454f910939282d
+DIST adzap-20071120.tar.gz 56267 SHA256 6a2983fe13007ad0f732719f135871382411ed1718aa4c3873bedf65f3f2f145
+DIST adzap-20080508.tar.gz 57061 SHA256 293e52fc237e32ac46f3dc4906e67103eb54b3809032793d71a7a1d83d56d00b
+DIST adzap-20110915.tar.gz 128132 SHA256 30a66419b4e77631d303ca5ba76ad3a64fabbed1cdab01bee02f0d790431ce7a SHA512 8b3566fc708b3db3b8eaa0306f90c75a82ac001cfdc3bc925fc649481420532ddc017f1b5139fce36733d3a38b2a7a31b39872b522ba4f49c098177496d64416 WHIRLPOOL 02d4360bec08fffcf3e0719d0fdd76c6cd02c52094193ed31e5d98c25a34da2e732fd87c7c0811beaad25979074b831210454370cabbdbdb7c5868fb41966d9e
+EBUILD adzapper-20071120.ebuild 1519 SHA256 8ef73bcc63c90ba2417cac944b9254fbaf20be98afa4e8744fbe1569183660dc SHA512 6f0af32b6c80fa3a4dab0d1cc17aba55e61b4b97c445de8567f6a3b8f5faee6b63f4d42016c6fc87da1ef579f0176f1d6481ce42455f6fb58f965beedeaf9bb6 WHIRLPOOL 5de2033eb714b39d1d666ec0418c8e1e83cd82154d0949aff3eaff73f7eef19e70ad798d177255590ec2024726971909140184493d0fee0519c0086ef9bf78d2
+EBUILD adzapper-20080508.ebuild 1501 SHA256 5f450ea1e04c50c8254b3c08073033203640bf1ccd04c4464879ea443c304761 SHA512 6a7ae3c1cee137d0d82c4f5248917fe13e6638cb4ed548052bf4b95393b81b5e8470e8e0033ff0e516e6085f0b33db29946ccd320044ee9727aef5c6ebf464c4 WHIRLPOOL 8ebd828c3c0f5f83d4a3ff4436ae8f7a7f0476b726c07d517bfcdefc54a71c4b7b8d6eb3566d33b6e576479da337331828e8467941736eea59b2f82157e61ed2
+EBUILD adzapper-20110915.ebuild 1503 SHA256 309740dd4d647dbafa1c409f77f3e620114a1aa0eee68d1a5a86c0e01fa4596a SHA512 dcc63999d6de0041a87e93184a7171b36fcaa9a0db195bfe49cec782e4017fcddc58de02b1862caa3027fd8b572bcfe7fbe279295c2bd4d6517467d4789c2e02 WHIRLPOOL 32fd1d592772d379a3ef9742d399dcfb91f9c231edd597dc7c48e90c31fb659b925fe14f782a8f0a1ab6ad1230f7a3822bdba215cfb7e87193054b32f643f401
+MISC ChangeLog 10701 SHA256 8c01abe2e615f78030bf650902f24e67b4b7fd3daaad747aea1018bbddeb975a SHA512 41b1bd45eabc50fd373d017fa1b32247c6979c39685541ef0dbb951a40506ee53a92f7194f0a309d427574215c40c98eb5cd6492a59c1ae4e0007aafc7eef4a0 WHIRLPOOL 3fb0ca829542735920bdf05fa726b5798b625f9edf047acea6227db7a4cc741d0428776208b6cab982269a5bd916cf5333500fd98a97caebb5c6369145330615
+MISC metadata.xml 279 SHA256 56f4b53d553e31b70095de70341ab48f0aa0145793d8933d0b454f910939282d SHA512 b63783bd821d43341a21ad87ae746e1512484f1e0a0f721a1effa4f6666078d1ffe3be478eed06f9df58ba35cc2aeee15217f6777d5fee8796ae90759e404af7 WHIRLPOOL bdf3bd9a2bd012a9aa134cc103f1ef3a1cc5a78041f9976cb12c184ff6944a6548985e0632b5f683d1ea5e4dcbbea6081dc2fadfa903eb35961b6c9049df5c96
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.10 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAkns2QIACgkQkKaRLQcq0GLEVQCglg4/7Jd/J40cegC9gjiHySHI
-8v4AoIqzBFXBLFX19YQ0wVSkMj0EGl0c
-=lQg/
+iEYEAREIAAYFAlAZhSsACgkQVWmRsqeSphM2BQCfX9NgmAlp1PTytco8SYMg/Jzz
+znYAnR3mFcrVIgwbqnPCPPDQ74Ymr84e
+=dqhd
 -----END PGP SIGNATURE-----
diff --git a/net-proxy/adzapper/adzapper-20110915.ebuild b/net-proxy/adzapper/adzapper-20110915.ebuild
new file mode 100644
index 000000000000..6b83238dfdd7
--- /dev/null
+++ b/net-proxy/adzapper/adzapper-20110915.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/adzapper/adzapper-20110915.ebuild,v 1.1 2012/08/01 19:36:05 jer Exp $
+
+EAPI=4
+
+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"
+
+S="${WORKDIR}"/${P/per/}
+
+src_prepare() {
+	# update the zapper path in various scripts
+	local SCRPATH="/etc/adzapper/squid_redirect"
+	sed -i scripts/wrapzap scripts/update-zapper* \
+		-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\"|" \
+		|| die "sed updating failed."
+}
+
+src_install() {
+	exeinto /etc/adzapper
+	doexe \
+		scripts/wrapzap \
+		scripts/zapchain \
+		adblock-plus/adblockplus2adzapper.py
+	newexe scripts/squid_redirect{-nodata,}
+
+	insinto /etc/adzapper
+	doins scripts/update-zapper*
+
+	insinto /var/www/localhost/htdocs/zap
+	doins zaps/*
+}
+
+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"
+}