Remove Apache1.

(Portage version: 2.1.2.7)

12 files changed, 9 insertions, 282 deletions

diff --git a/www-apache/mod_perl/ChangeLog b/www-apache/mod_perl/ChangeLog
index fce9edc98a0c..ed6a0cd9d27d 100644
--- a/www-apache/mod_perl/ChangeLog
+++ b/www-apache/mod_perl/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-apache/mod_perl
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_perl/ChangeLog,v 1.51 2007/04/10 11:47:57 ian Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_perl/ChangeLog,v 1.52 2007/06/13 12:49:28 chtekk Exp $
+
+  13 Jun 2007; Luca Longinotti <chtekk@gentoo.org>
+  -files/1.29/75_mod_perl.conf, -files/1.30/75_mod_perl.conf,
+  -files/2.0.2/75_mod_perl.conf, -files/2.0.2/apache2-mod_perl-startup.pl,
+  -files/75_mod_perl.conf, -files/apache2-mod_perl-startup.pl, metadata.xml,
+  -mod_perl-1.27-r4.ebuild, -mod_perl-1.30.ebuild:
+  Remove Apache1. Cleanup filesdir. Update metadata.
 
   10 Apr 2007; Christian Hartmann <ian@gentoo.org> mod_perl-1.27-r4.ebuild,
   -mod_perl-1.29.ebuild, -mod_perl-2.0.2.ebuild, -mod_perl-2.0.3.ebuild:
diff --git a/www-apache/mod_perl/files/1.29/75_mod_perl.conf b/www-apache/mod_perl/files/1.29/75_mod_perl.conf
deleted file mode 100644
index edf5a11b5c1f..000000000000
--- a/www-apache/mod_perl/files/1.29/75_mod_perl.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-<IfDefine PERL>
-  <IfModule !mod_perl.c>
-    LoadModule perl_module modules/libperl.so
-  </IfModule>
-</IfDefine>
-
diff --git a/www-apache/mod_perl/files/1.30/75_mod_perl.conf b/www-apache/mod_perl/files/1.30/75_mod_perl.conf
deleted file mode 100644
index edf5a11b5c1f..000000000000
--- a/www-apache/mod_perl/files/1.30/75_mod_perl.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-<IfDefine PERL>
-  <IfModule !mod_perl.c>
-    LoadModule perl_module modules/libperl.so
-  </IfModule>
-</IfDefine>
-
diff --git a/www-apache/mod_perl/files/2.0.2/75_mod_perl.conf b/www-apache/mod_perl/files/2.0.2/75_mod_perl.conf
deleted file mode 100644
index 96455b51e209..000000000000
--- a/www-apache/mod_perl/files/2.0.2/75_mod_perl.conf
+++ /dev/null
@@ -1,56 +0,0 @@
-<IfDefine PERL>
-  <IfModule !mod_perl.c>
-    LoadModule perl_module    modules/mod_perl.so
-  </IfModule>
-</IfDefine>
-
-<IfModule mod_perl.c>
-	#PerlTrace all
-	PerlRequire "/etc/apache2/modules.d/apache2-mod_perl-startup.pl"
-
-	#Provide two aliases to the same cgi-bin directory,
-	#to see the effects of the 2 different mod_perl modes
-	#for Apache2::Registry Mode
-	Alias /perl/ /var/www/localhost/perl/
-	#for Apache2::Perlrun Mode
-	Alias /cgi-perl/ /var/www/localhost/perl/
-
-	<IfModule mod_access.c>
-	<Location /perl-status>
-        	SetHandler perl-script
-		PerlResponseHandler Apache2::Status
-        	Order deny,allow
-        	Deny from all
-        	Allow from 127.0.0.1
-	</Location>
-	</IfModule>
-
-    <Directory /home/*/public_html/perl>
-        SetHandler perl-script
-        PerlResponseHandler ModPerl::PerlRun
-        Options -Indexes ExecCGI
-		PerlOptions +ParseHeaders
-    </Directory>
-
-    PerlModule ModPerl::Registry
-    #set Apache::Registry Mode for /perl Alias
-    # To set subdirectories to use perl set the following 
-    # and comment the orignial:
-    # <Location ~ "^/perl/.*\.pl$">
-    <Location  "^/perl/*.pl>
-        SetHandler perl-script
-        PerlResponseHandler ModPerl::Registry
-        Options -Indexes ExecCGI
-        PerlSendHeader On
-    </Location>
-
-    #set Apache::PerlRun Mode for /cgi-perl Alias
-    <Location /cgi-perl/*.pl>
-        SetHandler perl-script
-        PerlResponseHandler ModPerl::PerlRun
-        Options -Indexes ExecCGI
-        PerlSendHeader On
-    </Location>
-
-</ifModule>
-
diff --git a/www-apache/mod_perl/files/2.0.2/apache2-mod_perl-startup.pl b/www-apache/mod_perl/files/2.0.2/apache2-mod_perl-startup.pl
deleted file mode 100644
index afc048ac125b..000000000000
--- a/www-apache/mod_perl/files/2.0.2/apache2-mod_perl-startup.pl
+++ /dev/null
@@ -1,24 +0,0 @@
-use lib qw(/home/httpd/perl);
-
-# enable if the mod_perl 1.0 compatibility is needed
-#use Apache2::compat ();
-
-use ModPerl::Util (); #for CORE::GLOBAL::exit
-
-use Apache2::RequestRec ();
-use Apache2::RequestIO ();
-use Apache2::RequestUtil ();
-
-use Apache2::ServerRec ();
-use Apache2::ServerUtil ();
-use Apache2::Connection ();
-use Apache2::Log ();
-
-use APR::Table ();
-
-use ModPerl::Registry ();
-
-use Apache2::Const -compile => ':common';
-use APR::Const -compile => ':common';
-
-1;
diff --git a/www-apache/mod_perl/files/75_mod_perl.conf b/www-apache/mod_perl/files/75_mod_perl.conf
deleted file mode 100644
index 4933e9af9fef..000000000000
--- a/www-apache/mod_perl/files/75_mod_perl.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-<IfDefine PERL>
-  <IfModule !mod_perl.c>
-    LoadModule perl_module    extramodules/mod_perl.so
-  </IfModule>
-</IfDefine>
-
-<IfModule mod_perl.c>
-  #PerlTrace all
-  PerlRequire "/etc/apache2/conf/modules.d/apache2-mod_perl-startup.pl"
-</ifModule>
-
diff --git a/www-apache/mod_perl/files/apache2-mod_perl-startup.pl b/www-apache/mod_perl/files/apache2-mod_perl-startup.pl
deleted file mode 100644
index 73740597c108..000000000000
--- a/www-apache/mod_perl/files/apache2-mod_perl-startup.pl
+++ /dev/null
@@ -1,26 +0,0 @@
-use Apache2 ();
-
-use lib qw(/home/httpd/perl);
-
-# enable if the mod_perl 1.0 compatibility is needed
-# #use Apache::compat ();
-
-use ModPerl::Util (); #for CORE::GLOBAL::exit
-
-use Apache::RequestRec ();
-use Apache::RequestIO ();
-use Apache::RequestUtil ();
-
-use Apache::Server ();
-use Apache::ServerUtil ();
-use Apache::Connection ();
-use Apache::Log ();
-
-use APR::Table ();
-
-use ModPerl::Registry ();
-
-use Apache::Const -compile => ':common';
-use APR::Const -compile => ':common';
-
-1;
diff --git a/www-apache/mod_perl/files/digest-mod_perl-1.27-r4 b/www-apache/mod_perl/files/digest-mod_perl-1.27-r4
deleted file mode 100644
index 45d22455fa21..000000000000
--- a/www-apache/mod_perl/files/digest-mod_perl-1.27-r4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 bd07f4f1065eb0d0a8d8004219357d8c mod_perl-1.27.tar.gz 372525
-RMD160 a727844f7e6805422f4aa4adad3302adbe4b197a mod_perl-1.27.tar.gz 372525
-SHA256 6d13271432ece5a29ac184fb1430b682d822d6f491774f4af1d65df034781507 mod_perl-1.27.tar.gz 372525
diff --git a/www-apache/mod_perl/files/digest-mod_perl-1.30 b/www-apache/mod_perl/files/digest-mod_perl-1.30
deleted file mode 100644
index db5fcc7e80bb..000000000000
--- a/www-apache/mod_perl/files/digest-mod_perl-1.30
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 bfd6f6cff1ab1cc3dbb58a236701d169 mod_perl-1.30.tar.gz 389029
-RMD160 f71613f2fc386e56e49c165123e8d2226f37e7fc mod_perl-1.30.tar.gz 389029
-SHA256 af6e1380a9197750b2d443f02a7a0dba3586c3fc0c8269beaafef09159184a08 mod_perl-1.30.tar.gz 389029
diff --git a/www-apache/mod_perl/metadata.xml b/www-apache/mod_perl/metadata.xml
index 86672fe64c10..c673c6d1bd39 100644
--- a/www-apache/mod_perl/metadata.xml
+++ b/www-apache/mod_perl/metadata.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<herd>apache</herd>
 	<herd>perl</herd>
 	<maintainer>
 		<email>perl@gentoo.org</email>
 		<description>Primary Maintainer</description>
 	</maintainer>
-	<longdescription></longdescription>
 </pkgmetadata>
diff --git a/www-apache/mod_perl/mod_perl-1.27-r4.ebuild b/www-apache/mod_perl/mod_perl-1.27-r4.ebuild
deleted file mode 100644
index a4b8a1298789..000000000000
--- a/www-apache/mod_perl/mod_perl-1.27-r4.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_perl/mod_perl-1.27-r4.ebuild,v 1.4 2007/04/10 11:47:57 ian Exp $
-
-inherit eutils
-
-DESCRIPTION="A Perl Module for Apache"
-SRC_URI="http://perl.apache.org/dist/${P}.tar.gz"
-HOMEPAGE="http://perl.apache.org"
-
-SLOT="0"
-LICENSE="Apache-1.1 as-is"
-KEYWORDS="~mips"
-
-DEPEND="dev-lang/perl dev-perl/libwww-perl =net-www/apache-1*"
-
-IUSE=""
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	for f in "apaci/mod_perl.config.sh" "apaci/libperl.module"
-	do
-		echo "tail -1 fix in ${f}"
-		sed -i -e "s/tail -1/tail -n1/" ${f}
-	done
-}
-
-src_compile() {
-	perl Makefile.PL USE_APXS=1 \
-		INSTALLDIRS=vendor \
-		WITH_APXS=/usr/sbin/apxs EVERYTHING=1
-
-	cp Makefile Makefile.orig
-	sed -e "s:apxs_install doc_install:doc_install:" Makefile.orig > Makefile
-	emake || die
-}
-
-src_install () {
-	eval `perl '-V:installvendorarch'`
-	eval `perl '-V:installvendorlib'`
-
-	make \
-		PREFIX=${D}/usr	\
-		INSTALLVENDORARCH=${D}/${installvendorarch}	\
-		INSTALLVENDORLIB=${D}/${installvendorlib}	\
-		INSTALLVENDORMAN1DIR=${D}/usr/share/man/man1	\
-		INSTALLVENDORMAN3DIR=${D}/usr/share/man/man3	\
-		pure_vendor_install || die
-
-	dodoc Changes CREDITS MANIFEST README SUPPORT ToDo
-	dohtml -r ./
-
-	cd apaci
-	exeinto /usr/lib/apache-extramodules
-	doexe libperl.so
-}
-
-pkg_postinst() {
-	einfo
-	einfo "Execute emerge --config =${PF}"
-	einfo "to have your apache.conf auto-updated for use with this module."
-	einfo "You should then edit your /etc/conf.d/apache file to suit."
-	einfo
-}
-
-pkg_config() {
-	${ROOT}/usr/sbin/apacheaddmod \
-		${ROOT}/etc/apache/conf/apache.conf \
-		extramodules/libperl.so mod_perl.c perl_module \
-		define=PERL
-	:;
-}
diff --git a/www-apache/mod_perl/mod_perl-1.30.ebuild b/www-apache/mod_perl/mod_perl-1.30.ebuild
deleted file mode 100644
index f74d6015fab5..000000000000
--- a/www-apache/mod_perl/mod_perl-1.30.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_perl/mod_perl-1.30.ebuild,v 1.8 2007/04/10 11:13:35 yoswink Exp $
-
-inherit eutils apache-module
-
-DESCRIPTION="A Perl Module for Apache"
-SRC_URI="http://perl.apache.org/dist/${P}.tar.gz"
-HOMEPAGE="http://perl.apache.org"
-
-SLOT="0"
-LICENSE="Apache-1.1 as-is"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
-
-DEPEND="dev-lang/perl dev-perl/libwww-perl"
-RDEPEND="${DEPEND}"
-
-APACHE1_MOD_DEFINE="PERL"
-APACHE1_MOD_CONF="${PV}/75_mod_perl"
-APACHE1_MOD_FILE="${S}/apaci/libperl.so"
-
-IUSE=""
-
-need_apache1
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	for f in "apaci/mod_perl.config.sh" "apaci/libperl.module"
-	do
-		echo "tail -1 fix in ${f}"
-		sed -i -e "s/tail -1/tail -n1/" ${f}
-	done
-}
-
-src_compile() {
-	perl Makefile.PL USE_APXS=1 \
-		INSTALLDIRS=vendor \
-		WITH_APXS=${APXS1} EVERYTHING=1 PERL_DEBUG=1
-
-	cp Makefile Makefile.orig
-	sed -e "s:apxs_install doc_install:doc_install:" Makefile.orig > Makefile
-	emake -j1 || die
-}
-
-src_install () {
-	eval `perl '-V:installvendorarch'`
-	eval `perl '-V:installvendorlib'`
-
-	make \
-		PREFIX=${D}/usr	\
-		INSTALLVENDORARCH=${D}/${installvendorarch}	\
-		INSTALLVENDORLIB=${D}/${installvendorlib}	\
-		INSTALLVENDORMAN1DIR=${D}/usr/share/man/man1	\
-		INSTALLVENDORMAN3DIR=${D}/usr/share/man/man3	\
-		pure_vendor_install || die
-
-	dodoc Changes CREDITS MANIFEST README SUPPORT
-	dohtml -r ./
-	# The following kludge is from the perl-module eclass to correct
-	# the packlist file. packlist is used by other apps to determine
-	# where to find parts of mod-perl
-	for FILE in `find ${D} -type f -name "*.html" -o -name ".packlist"`; do
-		sed -i -e "s:${D}:/:g" ${FILE}
-	done
-
-	apache-module_src_install
-
-	fperms 600 ${APACHE1_MODULES_CONFDIR}/$(basename ${APACHE1_MOD_CONF}).conf
-}