removed my APACHE fix

4 files changed, 4 insertions, 58 deletions

diff --git a/dev-perl/AxKit/AxKit-1.5.2-r1.ebuild b/dev-perl/AxKit/AxKit-1.5.2-r1.ebuild
index a61dc05d529c..f8e9f64830c7 100644
--- a/dev-perl/AxKit/AxKit-1.5.2-r1.ebuild
+++ b/dev-perl/AxKit/AxKit-1.5.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/AxKit/AxKit-1.5.2-r1.ebuild,v 1.13 2002/12/15 10:44:12 bjb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/AxKit/AxKit-1.5.2-r1.ebuild,v 1.14 2002/12/17 21:46:30 vapier Exp $
 
 inherit perl-module
 
@@ -25,9 +25,6 @@ newdepend ">=dev-perl/libapreq-0.31 \
 	>=dev-perl/libapreq-1.0 \
 	>=dev-perl/XML-Sablot-0.50"
 
-APACHE_ROOT="`grep '^DocumentRoot' /etc/apache/conf/apache.conf | cut -d\  -f2`"
-[ -z "${APACHE_ROOT}" ] && APACHE_ROOT="/home/httpd/htdocs"
-
 src_unpack() {
 	unpack ${A}
 	cd ${S}
@@ -40,7 +37,7 @@ src_install() {
 
 	diropts -o nobody -g nogroup
 	dodir /var/cache/axkit
-	dodir ${APACHE_ROOT}/xslt
+	dodir /home/httpd/htdocs/xslt
 	insinto /etc/apache
 	doins ${FILESDIR}/httpd.axkit
 }
diff --git a/dev-perl/AxKit/AxKit-1.6-r1.ebuild b/dev-perl/AxKit/AxKit-1.6-r1.ebuild
index 0906850487da..0358b1e39b07 100644
--- a/dev-perl/AxKit/AxKit-1.6-r1.ebuild
+++ b/dev-perl/AxKit/AxKit-1.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/AxKit/AxKit-1.6-r1.ebuild,v 1.3 2002/12/09 04:21:05 manson Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/AxKit/AxKit-1.6-r1.ebuild,v 1.4 2002/12/17 21:46:30 vapier Exp $
 
 inherit perl-module
 
@@ -26,9 +26,6 @@ newdepend ">=dev-perl/libapreq-0.31 \
 	>=dev-perl/XML-Sablot-0.50 \
 	>=dev-perl/Digest-MD5-2.09"
 
-APACHE_ROOT="`grep '^DocumentRoot' /etc/apache/conf/apache.conf | cut -d\  -f2`"
-[ -z "${APACHE_ROOT}" ] && APACHE_ROOT="/home/httpd/htdocs"
-
 src_unpack() {
 	unpack ${A}
 	cd ${S}
@@ -41,7 +38,7 @@ src_install() {
 
 	diropts -o nobody -g nogroup
 	dodir /var/cache/axkit
-	dodir ${APACHE_ROOT}/xslt
+	dodir /home/httpd/htdocs/xslt
 	insinto /etc/apache
 	doins ${FILESDIR}/httpd.axkit
 }
diff --git a/dev-perl/AxKit/AxKit-1.6.ebuild b/dev-perl/AxKit/AxKit-1.6.ebuild
deleted file mode 100644
index 7e8cf3cbee02..000000000000
--- a/dev-perl/AxKit/AxKit-1.6.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/AxKit/AxKit-1.6.ebuild,v 1.8 2002/12/09 04:21:05 manson Exp $
-
-inherit perl-module
-
-S=${WORKDIR}/${P}
-DESCRIPTION="The Apache AxKit Perl Module"
-SRC_URI="http://axkit.org/download/${P}.tar.gz"
-HOMEPAGE="http://axkit.org/"
-
-SLOT="0"
-LICENSE="Artistic | GPL-2"
-KEYWORDS="x86 alpha sparc  ~ppc"
-
-newdepend ">=dev-perl/libapreq-0.31 \
-	>=dev-perl/Compress-Zlib-1.10 \
-	>=dev-perl/Error-0.13 \
-	>=dev-perl/HTTP-GHTTP-1.06 \
-	>=dev-perl/Storable-1.0.7 \
-	>=dev-perl/XML-XPath-1.04 \
-	>=dev-perl/XML-XPath-1.04 \
-	>=dev-perl/XML-LibXML-1.31 \
-	>=dev-perl/XML-LibXSLT-1.31 \
-	>=dev-perl/libapreq-1.0 \
-	>=dev-perl/XML-Sablot-0.50 \
-	>=dev-perl/Digest-MD5-2.09"
-
-APACHE_ROOT="`grep '^DocumentRoot' /etc/apache/conf/apache.conf | cut -d\  -f2`"
-[ -z "${APACHE_ROOT}" ] && APACHE_ROOT="/home/httpd/htdocs"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	cp Makefile.PL Makefile.PL.orig
-	sed -e "s:0\.31_03:0.31:" Makefile.PL.orig > Makefile.PL
-}
-
-src_install() {
-	perl-module_src_install
-
-	diropts -o nobody -g nogroup
-	dodir /var/cache/axkit
-	dodir ${APACHE_ROOT}/xslt
-	insinto /etc/apache
-	doins ${FILESDIR}/httpd.axkit
-}
diff --git a/dev-perl/AxKit/files/digest-AxKit-1.6 b/dev-perl/AxKit/files/digest-AxKit-1.6
deleted file mode 100644
index 901cd9e32277..000000000000
--- a/dev-perl/AxKit/files/digest-AxKit-1.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e03e0a50bcfc41aec1714512a404b019 AxKit-1.6.tar.gz 278788