Normalize ebuilds, remove Apache dependancy.

5 files changed, 17 insertions, 43 deletions

diff --git a/net-www/adzapper/ChangeLog b/net-www/adzapper/ChangeLog
index 9385bea46f51..ac92121525bc 100644
--- a/net-www/adzapper/ChangeLog
+++ b/net-www/adzapper/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-www/adzapper
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/net-www/adzapper/ChangeLog,v 1.11 2004/01/19 21:33:07 blkdeath Exp $
+
+  19 Jan 2004; Stewart Honsberger <blkdeath@gentoo.org>
+  adzapper-20031105.ebuild, adzapper-20040104.ebuild, metadata.xml:
+  Normalize ebuilds, remove Apache dependancy
 
 *adzapper-20040104 (19 Jan 2004)
 
diff --git a/net-www/adzapper/Manifest b/net-www/adzapper/Manifest
index c18223f15923..62b0e762fe02 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 a382e38bb1c1b19e6e0804844dd69226 adzapper-20040104.ebuild 1700
-MD5 fa2221e88c69906ed326435eb062e807 adzapper-20031105.ebuild 1696
-MD5 aff0b2c80b22ce10f6c93d42d71daf37 ChangeLog 1652
+MD5 63bd6e87942a25d48bd5365edd8246c0 metadata.xml 268
+MD5 2448a90c26165cc34293a72e1cc745e0 adzapper-20040104.ebuild 1456
+MD5 a06877f8e2220b4e153619cee7422abf ChangeLog 1823
+MD5 8e32dd1e687e3bae0393fe38dd2ea97f adzapper-20031105.ebuild 1456
 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 b9087d2424bc..cc6b2a6bd3de 100644
--- a/net-www/adzapper/adzapper-20031105.ebuild
+++ b/net-www/adzapper/adzapper-20031105.ebuild
@@ -1,8 +1,6 @@
 # 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.2 2004/01/19 21:17:14 blkdeath Exp $
-
-inherit webapp-apache
+# $Header: /var/cvsroot/gentoo-x86/net-www/adzapper/adzapper-20031105.ebuild,v 1.3 2004/01/19 21:33:07 blkdeath Exp $
 
 DESCRIPTION="redirector for squid that intercepts advertising, page counters and some web bugs"
 HOMEPAGE="http://adzapper.sourceforge.net/"
@@ -19,14 +17,6 @@ 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}
 
@@ -48,11 +38,6 @@ src_unpack() {
 }
 
 src_install() {
-	webapp-mkdirs
-
-	local DocumentRoot=${HTTPD_ROOT}
-	local destdir=${DocumentRoot}/
-
 	cd ${S}/scripts
 	exeinto /etc/adzapper
 	doexe wrapzap zapchain squid_redirect
diff --git a/net-www/adzapper/adzapper-20040104.ebuild b/net-www/adzapper/adzapper-20040104.ebuild
index cb481dc5fdf7..50b1f521a722 100644
--- a/net-www/adzapper/adzapper-20040104.ebuild
+++ b/net-www/adzapper/adzapper-20040104.ebuild
@@ -1,8 +1,6 @@
 # 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-20040104.ebuild,v 1.1 2004/01/19 21:17:14 blkdeath Exp $
-
-inherit webapp-apache
+# $Header: /var/cvsroot/gentoo-x86/net-www/adzapper/adzapper-20040104.ebuild,v 1.2 2004/01/19 21:33:07 blkdeath Exp $
 
 DESCRIPTION="redirector for squid that intercepts advertising, page counters and some web bugs"
 HOMEPAGE="http://adzapper.sourceforge.net/"
@@ -13,20 +11,12 @@ 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=""
 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}
 
@@ -48,11 +38,6 @@ src_unpack() {
 }
 
 src_install() {
-	webapp-mkdirs
-
-	local DocumentRoot=${HTTPD_ROOT}
-	local destdir=${DocumentRoot}/
-
 	cd ${S}/scripts
 	exeinto /etc/adzapper
 	doexe wrapzap zapchain squid_redirect
diff --git a/net-www/adzapper/metadata.xml b/net-www/adzapper/metadata.xml
index 13bc126c7d91..8c2d9d6d7f2c 100644
--- a/net-www/adzapper/metadata.xml
+++ b/net-www/adzapper/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>web-apps</herd>
-<maintainer>
-<email>web-apps@gentoo.org</email>
-<name>Gentoo Web Application Packages Maintainers</name>
-</maintainer>
+  <herd>no-herd</herd>
+  <maintainer>
+    <email>blkdeath@gentoo.org</email>
+    <name>Stewart Honsberger</name>
+  </maintainer>
 </pkgmetadata>