replace 20060414 with version 20060424 and mark it stable on x86 - the old tarball had a cvs conflict file in it, the rest being exactly the same as the "new" version

Package-Manager: portage-2.1

3 files changed, 26 insertions, 65 deletions

diff --git a/net-proxy/adzapper/Manifest b/net-proxy/adzapper/Manifest
index 244bd3db7fba..736c5142939d 100644
--- a/net-proxy/adzapper/Manifest
+++ b/net-proxy/adzapper/Manifest
@@ -1,16 +1,34 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 edc63f384176a1345946f82677e6e018 ChangeLog 6798
+DIST adzap-20060203.tar.gz 52728 RMD160 3536ee82d4c76a4a4ab9c07a5865db2a4bbb7240 SHA1 e07969281065c12dae1e69d6a8344187c8890caa SHA256 b812264db684d5a72f552a99b2e69ea09f5030758d9639c648b78611fd3c0a25
+DIST adzap-20060424.tar.gz 53278 RMD160 7ecf0bfc24460800cd4a10af0ffce9c2524bc62e SHA1 da2dfc27b5d1b31a202ec52a492b0a2d057c0789 SHA256 2d2a16713c8fdd4ae770c08973c8741a488c5448b36c9c9538f79eeda68ebb1a
+EBUILD adzapper-20060203.ebuild 1522 RMD160 e54b2a9a74da51ac04b3d5c311f726005c8ac77d SHA1 e44929962cfec239cf988b66b5b2c6631c03a5e3 SHA256 76e50146bc085b90649467b2d4dd828834db8b4e23ecd0975f04421988bee2e0
 MD5 2f8a8ebaabb090eb9659a67b931800de adzapper-20060203.ebuild 1522
-MD5 0542a0f3ebd90f273acb8bfb85e45f74 adzapper-20060414.ebuild 1528
-MD5 342d3000ea838cbd63451c90148cf202 files/digest-adzapper-20060203 65
-MD5 394dc5e5d8eb907cc69f29211483270c files/digest-adzapper-20060414 65
+RMD160 e54b2a9a74da51ac04b3d5c311f726005c8ac77d adzapper-20060203.ebuild 1522
+SHA256 76e50146bc085b90649467b2d4dd828834db8b4e23ecd0975f04421988bee2e0 adzapper-20060203.ebuild 1522
+EBUILD adzapper-20060424.ebuild 1517 RMD160 680be1b2aaeea3b979a02907b848db5fae18b945 SHA1 0d75e9e756b3d915f1198d96f80b019c6a871f74 SHA256 0db1a24682c4a58900852ca8aab9fc050bf41cede522d36d8ecfeb70c6ff6af9
+MD5 a1c0b8c5951adf2b013f570029afc1ee adzapper-20060424.ebuild 1517
+RMD160 680be1b2aaeea3b979a02907b848db5fae18b945 adzapper-20060424.ebuild 1517
+SHA256 0db1a24682c4a58900852ca8aab9fc050bf41cede522d36d8ecfeb70c6ff6af9 adzapper-20060424.ebuild 1517
+MISC ChangeLog 6953 RMD160 7b7657192507972e9dfb34ff61dd32c0c5ba38de SHA1 20809e8bfa8d1b2ba77152d497b83f41d1b297f2 SHA256 f7fb1f58c4faea52da432db1990f05e3bd78aa8479a22bf5da5f208158744605
+MD5 acc1a803af793f749c32bd471c698c0f ChangeLog 6953
+RMD160 7b7657192507972e9dfb34ff61dd32c0c5ba38de ChangeLog 6953
+SHA256 f7fb1f58c4faea52da432db1990f05e3bd78aa8479a22bf5da5f208158744605 ChangeLog 6953
+MISC metadata.xml 279 RMD160 709b7617dd193fb1af6f8dc706f72223a0f838dc SHA1 e0208f01ac6493c23c2bd75416f0d2ae8c0473bf SHA256 56f4b53d553e31b70095de70341ab48f0aa0145793d8933d0b454f910939282d
 MD5 fae29d14dc1747ee9d3a07900bdd3990 metadata.xml 279
+RMD160 709b7617dd193fb1af6f8dc706f72223a0f838dc metadata.xml 279
+SHA256 56f4b53d553e31b70095de70341ab48f0aa0145793d8933d0b454f910939282d metadata.xml 279
+MD5 b2155147da18a102db9f4908ce7b2e04 files/digest-adzapper-20060203 241
+RMD160 3e4121a2aa96dcc9d182a4ac5328b1218b4bcac3 files/digest-adzapper-20060203 241
+SHA256 24beef3948f46792dc4a9ae282abf84e76babcc3e18ecc6f9eee24a1285a06b0 files/digest-adzapper-20060203 241
+MD5 4a42e10efede836b4252add6a085974e files/digest-adzapper-20060424 241
+RMD160 e4371c1917374105bb79dea96be73dcf00ce16a2 files/digest-adzapper-20060424 241
+SHA256 6f1e4aee9a5f6681e08960b7881e462def6c6a29bf9bc73c9e7be2fd5ba1ff25 files/digest-adzapper-20060424 241
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
+Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEP1L1jG8pv1lIUX4RAimhAJsFhJ+FmI9KtOk6XwhbDXQHburpqwCdGdyr
-RAXmY+MtOYZ5M8B8bNPXMbY=
-=YNyc
+iD8DBQFElXPxjG8pv1lIUX4RAhmCAKCA1gVsn7GPKmnR72NbpsF9bI+jywCgso1x
+F+du44+FRgkw5hLuwsFczHI=
+=tutD
 -----END PGP SIGNATURE-----
diff --git a/net-proxy/adzapper/adzapper-20060414.ebuild b/net-proxy/adzapper/adzapper-20060414.ebuild
deleted file mode 100644
index 29dc703d98b5..000000000000
--- a/net-proxy/adzapper/adzapper-20060414.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# 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-20060414.ebuild,v 1.1 2006/04/14 07:44:40 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=""
-
-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-20060414 b/net-proxy/adzapper/files/digest-adzapper-20060414
deleted file mode 100644
index ec2a05f1a861..000000000000
--- a/net-proxy/adzapper/files/digest-adzapper-20060414
+++ /dev/null
@@ -1 +0,0 @@
-MD5 fb37024393b3e8f8485e7b6e019343c8 adzap-20060414.tar.gz 99457