Version bump. Remove oldest ebuild.

6 files changed, 35 insertions, 13 deletions

diff --git a/net-www/adzapper/ChangeLog b/net-www/adzapper/ChangeLog
index 77af39afd2d2..9385bea46f51 100644
--- a/net-www/adzapper/ChangeLog
+++ b/net-www/adzapper/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-www/adzapper
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/adzapper/ChangeLog,v 1.9 2003/12/24 20:28:05 mholzer Exp $
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/adzapper/ChangeLog,v 1.10 2004/01/19 21:17:14 blkdeath Exp $
+
+*adzapper-20040104 (19 Jan 2004)
+
+  19 Jan 2004; Stewart Honsberger <blkdeath@gentoo.org>
+  adzapper-20030111.ebuild, adzapper-20031105.ebuild,
+  adzapper-20040104.ebuild:
+  Version bump, removed oldest ebuild.
 
 *adzapper-20031105 (24 Dec 2003)
 
diff --git a/net-www/adzapper/Manifest b/net-www/adzapper/Manifest
index af6b5445ad85..c18223f15923 100644
--- a/net-www/adzapper/Manifest
+++ b/net-www/adzapper/Manifest
@@ -1,9 +1,9 @@
 MD5 057ea62ca5b27e6c19a63eabc0bcdff7 adzapper-20030525.ebuild 1464
 MD5 d62f06478bb9fcdc9a5e7326d3971fd3 adzapper-20030611.ebuild 1461
 MD5 c339473e0ff43da76eb2f2607c441921 metadata.xml 280
-MD5 453dde5cbafd83ec66a9c94294f9ab2d adzapper-20040104.ebuild 1699
-MD5 99169b55e8ad26a0dcb4d39320526299 adzapper-20031105.ebuild 1695
-MD5 cd580771cef231f4eee9b5d3d4391332 ChangeLog 1650
+MD5 a382e38bb1c1b19e6e0804844dd69226 adzapper-20040104.ebuild 1700
+MD5 fa2221e88c69906ed326435eb062e807 adzapper-20031105.ebuild 1696
+MD5 aff0b2c80b22ce10f6c93d42d71daf37 ChangeLog 1652
 MD5 7e44cc6b5c8fc3c862ed5266e1dff0fc files/digest-adzapper-20030525 65
 MD5 d33f6e6caebc18dadd48b320241f322b files/digest-adzapper-20030611 65
 MD5 1914b03f251e64b75dd1afcfcc62f872 files/digest-adzapper-20031105 65
diff --git a/net-www/adzapper/adzapper-20031105.ebuild b/net-www/adzapper/adzapper-20031105.ebuild
index c29aaeed43e3..b9087d2424bc 100644
--- a/net-www/adzapper/adzapper-20031105.ebuild
+++ b/net-www/adzapper/adzapper-20031105.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/adzapper/adzapper-20031105.ebuild,v 1.1 2003/12/24 20:28:05 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/adzapper/adzapper-20031105.ebuild,v 1.2 2004/01/19 21:17:14 blkdeath Exp $
 
 inherit webapp-apache
 
@@ -13,7 +13,7 @@ S="${WORKDIR}/adzap"
 SRC_URI="http://adzapper.sourceforge.net/${MY_P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha"
+KEYWORDS="x86 ppc sparc alpha"
 IUSE=""
 
 DEPEND=""
diff --git a/net-www/adzapper/adzapper-20030111.ebuild b/net-www/adzapper/adzapper-20040104.ebuild
index c30195bdc412..cb481dc5fdf7 100644
--- a/net-www/adzapper/adzapper-20030111.ebuild
+++ b/net-www/adzapper/adzapper-20040104.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/adzapper/adzapper-20030111.ebuild,v 1.2 2003/02/13 15:30:51 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/adzapper/adzapper-20040104.ebuild,v 1.1 2004/01/19 21:17:14 blkdeath Exp $
+
+inherit webapp-apache
 
 DESCRIPTION="redirector for squid that intercepts advertising, page counters and some web bugs"
 HOMEPAGE="http://adzapper.sourceforge.net/"
@@ -11,12 +13,20 @@ S="${WORKDIR}/adzap"
 SRC_URI="http://adzapper.sourceforge.net/${MY_P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha"
 IUSE=""
 
 DEPEND=""
 RDEPEND="net-www/squid"
 
+webapp-detect || NO_WEBSERVER=1
+
+
+pkg_setup() {
+	webapp-pkg_setup "${NO_WEBSERVER}"
+	einfo "Installing into ${ROOT}${HTTPD_ROOT}."
+}
+
 src_unpack() {
 	unpack ${A}
 
@@ -38,6 +48,11 @@ src_unpack() {
 }
 
 src_install() {
+	webapp-mkdirs
+
+	local DocumentRoot=${HTTPD_ROOT}
+	local destdir=${DocumentRoot}/
+
 	cd ${S}/scripts
 	exeinto /etc/adzapper
 	doexe wrapzap zapchain squid_redirect
@@ -46,7 +61,7 @@ src_install() {
 	doins update-zapper*
 
 	cd ${S}/zaps
-	insinto /home/httpd/htdocs/zaps
+	insinto ${destdir}/zap
 	doins *
 }
 
diff --git a/net-www/adzapper/files/digest-adzapper-20030111 b/net-www/adzapper/files/digest-adzapper-20030111
deleted file mode 100644
index f8df652a75ae..000000000000
--- a/net-www/adzapper/files/digest-adzapper-20030111
+++ /dev/null
@@ -1 +0,0 @@
-MD5 831b48e8d605a9e7cdd7a4da5bd2ac8b adzap-20030111.tar.gz 31718
diff --git a/net-www/adzapper/files/digest-adzapper-20040104 b/net-www/adzapper/files/digest-adzapper-20040104
new file mode 100644
index 000000000000..42f2cecc7ed3
--- /dev/null
+++ b/net-www/adzapper/files/digest-adzapper-20040104
@@ -0,0 +1 @@
+MD5 a10a76952fc9856c2dc75279d0c19cb4 adzap-20040104.tar.gz 38368