remove oldies; x86; version bump

(Portage version: 2.0.51.22-r2)

8 files changed, 22 insertions, 74 deletions

diff --git a/net-proxy/adzapper/ChangeLog b/net-proxy/adzapper/ChangeLog
index 16ceb468d263..72e377eed983 100644
--- a/net-proxy/adzapper/ChangeLog
+++ b/net-proxy/adzapper/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-proxy/adzapper
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/adzapper/ChangeLog,v 1.7 2005/06/19 20:16:56 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/adzapper/ChangeLog,v 1.8 2005/07/30 07:28:22 mrness Exp $
+
+*adzapper-20050712 (30 Jul 2005)
+
+  30 Jul 2005; Alin Nastac <mrness@gentoo.org> -adzapper-20040408.ebuild,
+  -adzapper-20050106.ebuild, adzapper-20050524.ebuild,
+  +adzapper-20050712.ebuild:
+  Remove obsolete versions. Mark stable on x86. Version bump.
 
   19 Jun 2005; Jason Wever <weeve@gentoo.org> adzapper-20050316.ebuild:
   Stable on SPARC.
diff --git a/net-proxy/adzapper/Manifest b/net-proxy/adzapper/Manifest
index 67955c3ac353..6e123ba5d285 100644
--- a/net-proxy/adzapper/Manifest
+++ b/net-proxy/adzapper/Manifest
@@ -1,10 +1,8 @@
-MD5 a9e0c11e94212644009a59930b0efffb ChangeLog 4176
-MD5 401d6b80a466c0b6896910485242328b adzapper-20040408.ebuild 1464
-MD5 3eab3dc89efc128fdf797eb3d3c05a52 adzapper-20050106.ebuild 1512
+MD5 c734dcfa6cae81ce951268bbfdd6847d adzapper-20050524.ebuild 1512
 MD5 1f74de1e6af943ed241edd5d1ff74725 adzapper-20050316.ebuild 1507
+MD5 a9e0c11e94212644009a59930b0efffb ChangeLog 4176
+MD5 7a2e1b647d0f7f17dfb3c044da507b01 adzapper-20050712.ebuild 1513
 MD5 865192a4aa5233381a3358f03460b9be metadata.xml 368
-MD5 7a2e1b647d0f7f17dfb3c044da507b01 adzapper-20050524.ebuild 1513
-MD5 d1666b04a8c2b141f1a5875a0eea33f0 files/digest-adzapper-20040408 65
-MD5 e7d816cf4877320a48ec63fb3b3b7d6c files/digest-adzapper-20050106 65
 MD5 2d648a6b3987ab877735484f8fa35b59 files/digest-adzapper-20050316 65
 MD5 238922a3c9c8c8a2e886fbcb1eb40328 files/digest-adzapper-20050524 65
+MD5 bcee19293ff3560bd88eeb754c3bd5bc files/digest-adzapper-20050712 65
diff --git a/net-proxy/adzapper/adzapper-20040408.ebuild b/net-proxy/adzapper/adzapper-20040408.ebuild
deleted file mode 100644
index 79cec0e663da..000000000000
--- a/net-proxy/adzapper/adzapper-20040408.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/adzapper/adzapper-20040408.ebuild,v 1.1 2005/04/22 19:15:11 mrness Exp $
-
-DESCRIPTION="Redirector for squid that intercepts advertising, page counters and some web bugs"
-HOMEPAGE="http://adzapper.sourceforge.net/"
-
-MY_P=${P/zapper/zap}
-S="${WORKDIR}/adzap"
-
-SRC_URI="http://adzapper.sourceforge.net/${MY_P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="x86 ppc sparc alpha"
-IUSE=""
-
-DEPEND=""
-RDEPEND="net-proxy/squid"
-
-src_unpack() {
-	unpack ${A}
-
-	SCRPATH="/etc/adzapper/squid_redirect"
-
-	cd ${S}/scripts || die
-
-	# update the zapper path in various scripts
-	for src in wrapzap update-zapper*; do
-		mv $src $src.orig || die
-		sed -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\"|" \
-			$src.orig > $src || die
-			rm $src.orig
-	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 squid.conf:"
-	einfo "redirect_program /etc/adzapper/wrapzap"
-	einfo "redirect_children 10"
-}
diff --git a/net-proxy/adzapper/adzapper-20050524.ebuild b/net-proxy/adzapper/adzapper-20050524.ebuild
index 98ac1b67650d..fe6870ba171a 100644
--- a/net-proxy/adzapper/adzapper-20050524.ebuild
+++ b/net-proxy/adzapper/adzapper-20050524.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/adzapper/adzapper-20050524.ebuild,v 1.1 2005/06/04 14:09:45 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/adzapper/adzapper-20050524.ebuild,v 1.2 2005/07/30 07:28: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 ~ppc ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc x86"
 IUSE=""
 
 RDEPEND="net-proxy/squid"
diff --git a/net-proxy/adzapper/adzapper-20050106.ebuild b/net-proxy/adzapper/adzapper-20050712.ebuild
index 19d82c6eee6f..497f7a11461f 100644
--- a/net-proxy/adzapper/adzapper-20050106.ebuild
+++ b/net-proxy/adzapper/adzapper-20050712.ebuild
@@ -1,21 +1,22 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/adzapper/adzapper-20050106.ebuild,v 1.1 2005/04/22 19:15:11 mrness Exp $
-
-DESCRIPTION="Redirector for squid that intercepts advertising, page counters and some web bugs"
-HOMEPAGE="http://adzapper.sourceforge.net/"
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/adzapper/adzapper-20050712.ebuild,v 1.1 2005/07/30 07:28:22 mrness Exp $
 
 MY_P=${P/zapper/zap}
-S="${WORKDIR}/adzap"
 
+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="~x86 ~ppc ~sparc ~alpha ~amd64"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
 IUSE=""
 
 RDEPEND="net-proxy/squid"
 
+S="${WORKDIR}/adzap"
+
 src_unpack() {
 	unpack ${A}
 
diff --git a/net-proxy/adzapper/files/digest-adzapper-20040408 b/net-proxy/adzapper/files/digest-adzapper-20040408
deleted file mode 100644
index e1a1adc5b9d6..000000000000
--- a/net-proxy/adzapper/files/digest-adzapper-20040408
+++ /dev/null
@@ -1 +0,0 @@
-MD5 fcc54ff2d318f0f192e23bc11b3aa894 adzap-20040408.tar.gz 38693
diff --git a/net-proxy/adzapper/files/digest-adzapper-20050106 b/net-proxy/adzapper/files/digest-adzapper-20050106
deleted file mode 100644
index 3b9e345dd730..000000000000
--- a/net-proxy/adzapper/files/digest-adzapper-20050106
+++ /dev/null
@@ -1 +0,0 @@
-MD5 df586dc6839a9b6b3783cd000be3abf6 adzap-20050106.tar.gz 48058
diff --git a/net-proxy/adzapper/files/digest-adzapper-20050712 b/net-proxy/adzapper/files/digest-adzapper-20050712
new file mode 100644
index 000000000000..24f57740f867
--- /dev/null
+++ b/net-proxy/adzapper/files/digest-adzapper-20050712
@@ -0,0 +1 @@
+MD5 1ad89a63f058fd1c73815424c0ed8661 adzap-20050712.tar.gz 51049