Cleanup. Add x-ogg; #7245

12 files changed, 54 insertions, 1312 deletions

diff --git a/net-www/apache/ChangeLog b/net-www/apache/ChangeLog
index deccd83cf356..7e1850415978 100644
--- a/net-www/apache/ChangeLog
+++ b/net-www/apache/ChangeLog
@@ -4,8 +4,8 @@
 *apache-2.0.40-r1 (04 Sept 2002)
 
   04 Sept 2002; Nicholas Jones <carpaski@gentoo.org> :
-	Made it path compliant. Fixed the modules files. Fixed the init.d and
-	conf.d files. Still needs default configs and more tuning.
+  Made it path compliant. Fixed the modules files. Fixed the init.d and
+  conf.d files. Still needs default configs and more tuning.
 
 *apache-2.0.40 (15 Aug 2002)
 
@@ -14,6 +14,9 @@
 
 *apache-1.3.26-r4 (3 Jul 2002)
 
+  14 Sep 2002; Donny Davies <woodchip@gentoo.org> mime_type_fix :
+  Add x-ogg; #7245.  Cleanup.
+
   14 Aug 2002; Pieter Van den Abeele <pvdabeel@gentoo.org> :
   Added ppc keyword
 
@@ -24,7 +27,6 @@
   Added KEYWORDS.
 
   3 Jul 2002; Brandon Low <lostlogic@gentoo.org> apache-1.3.26-r4.ebuild:
-
   Just .keep some directories we make so that they will be handled more 
   sanely in unmerge and clean operations.
 
@@ -42,9 +44,8 @@
   Added KEYWORDS.
 
   22 Jun 2002; Nicholas Jones <carpaski@gentoo.org> :
-
-  o Bugfix... Configs weren't actually changed properly.
-    Moved sed on DATA_DIR after configs were coppied from ${FILESDIR} 
+  Bugfix... Configs weren't actually changed properly.
+  Moved sed on DATA_DIR after configs were coppied from ${FILESDIR} 
 
 *apache-1.3.26-r1 (20 Jun 2002)
 
@@ -52,17 +53,15 @@
   Added KEYWORDS.
 
   20 Jun 2002; Nicholas Jones <carpaski@gentoo.org> :
+  Another attempt at fixing the LDAP user issue. Change the user check.
+  Also added in checks to make sure that DATA_DIR is set.
 
-  o Another attempt at fixing the LDAP user issue. Change the user check.
-    Also added in checks to make sure that DATA_DIR is set.
-
-  o Turn 'install-quiet' back on.	
+  Turn 'install-quiet' back on.	
 
 *apache-1.3.26 (19 Jun 2002)
 
   19 Jun 2002; Nicholas Jones <carpaski@gentoo.org> :
-	
-  o The real exploit fix. Also patched a mdk patch so that it applied.
+  The real exploit fix. Also patched a mdk patch so that it applied.
 
 *apache-1.3.24-r6 (18 Jun 2002)
 
@@ -70,13 +69,10 @@
   Added KEYWORDS.
 
   18 Jun 2002; Nicholas Jones <carpaski@gentoo.org> :
-
-  o ADDED PATCH FOR PROXY-HTTP1.1-CHUNKS EXPLOIT
-
-  o Fixed bug #2313 -- Better checks for group/user
-
-  o Fixed bug #3533 -- User can setup user/group and the homedir
-                       of the apache user will be the data directory
+  ADDED PATCH FOR PROXY-HTTP1.1-CHUNKS EXPLOIT
+  Fixed bug #2313 -- Better checks for group/user
+  Fixed bug #3533 -- User can setup user/group and the homedir
+                     of the apache user will be the data directory
 
 *apache-1.3.24-r2 (4 May 2002)
 
@@ -84,66 +80,59 @@
   Added KEYWORDS.
 
   4 May 2002; Donny Davies <woodchip@gentoo.org> :
-
   Added LICENSE, SLOT, $Headers.
 
   26 Apr 2002; Donny Davies <woodchip@gentoo.org> :
-
-  o Made the user/group id's 81 in pkg_setup after thusly adding them to
-    Gentoo's baselayout.  No need to upgrade folks; cosmetic-only fix.
+  Made the user/group id's 81 in pkg_setup after thusly adding them to
+  Gentoo's baselayout.  No need to upgrade folks; cosmetic-only fix.
 
   10 Apr 2002; Donny Davies <woodchip@gentoo.org> apache-1.3.24-r1.ebuild,
   files/conf/commonapache.conf :
-
-  o Corrected the apache user's home directory (/var/www -> /home/httpd).
-  o Corrected the icons directory (/var/www/icons -> /home/httpd/icons).
-  o Ripped the php mime types from the commonapache.conf file.  I moved
-    them to the php package, as an addon config snippet.
-    (/etc/apache/conf/mod_php.conf)
+  Corrected the apache user's home directory (/var/www -> /home/httpd).
+  Corrected the icons directory (/var/www/icons -> /home/httpd/icons).
+  Ripped the php mime types from the commonapache.conf file.  I moved
+  them to the php package, as an addon config snippet.
+  (/etc/apache/conf/mod_php.conf)
 
 *apache-1.3.24-r1 (9 Apr 2002)
 
   9 Apr 2002; Donny Davies <woodchip@gentoo.org> apache-1.3.24-r1.ebuild :
-
-  o data is now in /home/httpd/{htdocs,icons,cgi-bin} (new standard location for Gentoo)
-  o server now runs as user/group apache
-  o mod_ssl was split into a separate package
-  o link with the mm library; provides modules with shared memory pools (EAPI_MM=SYSTEM)
-  o link with the system expat library
-  o all modules are now built using SHARED_CHAIN (smaller mod sizes)
-  o several patches from debian/mandrake are included.  the most interesting one is the
-    mandrake serverroot patch which makes configuring and organizing apache easier.
-  o the EAPI patch is now unconditionally included.  previously you only got it if you
-    had ssl in your USE variable.
-  o provide an easy way to tune up the HARD_SERVER_LIMIT
-  o created a build-time config file for the modules distributed with apache.  now you
-    can finely tune your own modules selection, and have your choices preserved across
-    upgrades.  a gentoo-only feature ;)
-  o suexec is now fixed and restricted to user/group apache.
-  o added some support scripts (from mandrake).  two of these allow easy addition and
-    removal of third-party modules into your apache.conf.  this should make writing
-    ebuilds for extra mods easier.  see net-www/mod_* for examples.
-  o the config files are now in /etc/apache/conf, conveniently organized into
-    separate directories for addon-modules and vhosts.  this simplifies things for
-    everybody and especially for those with complicated/large sites.
+  data is now in /home/httpd/{htdocs,icons,cgi-bin} (new standard location for Gentoo)
+  server now runs as user/group apache
+  mod_ssl was split into a separate package
+  link with the mm library; provides modules with shared memory pools (EAPI_MM=SYSTEM)
+  link with the system expat library
+  all modules are now built using SHARED_CHAIN (smaller mod sizes)
+  several patches from debian/mandrake are included.  the most interesting one is the
+  mandrake serverroot patch which makes configuring and organizing apache easier.
+  the EAPI patch is now unconditionally included.  previously you only got it if you
+  had ssl in your USE variable.
+  provide an easy way to tune up the HARD_SERVER_LIMIT
+  created a build-time config file for the modules distributed with apache.  now you
+  can finely tune your own modules selection, and have your choices preserved across
+  upgrades.  a gentoo-only feature ;)
+  suexec is now fixed and restricted to user/group apache.
+  added some support scripts (from mandrake).  two of these allow easy addition and
+  removal of third-party modules into your apache.conf.  this should make writing
+  ebuilds for extra mods easier.  see net-www/mod_* for examples.
+  the config files are now in /etc/apache/conf, conveniently organized into
+  separate directories for addon-modules and vhosts.  this simplifies things for
+  everybody and especially for those with complicated/large sites.
 
 *apache-1.3.24 (27 Mar 2002)
 
   27 Mar 2002; Donny Davies <woodchip@gentoo.org> apache-1.3.24.ebuild :
-
   Bump up to apache-1.3.24, mod_ssl-2.8.8; fixes some security issues. This port is
   being re-written, will be ready soon.
 
 *apache-1.3.23 (4 Feb 2002)
 
   4 Feb 2002; Donny Davies <woodchip@gentoo.org> apache-1.3.23.ebuild :
-
   Bump apache to 1.3.23, mod_ssl to 2.8.6-1.3.23.
 
 *apache-1.3.22-r6 (1 Feb 2002)
 
-  1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
-  
+  1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :  
   Added initial ChangeLog which should be updated whenever the package is
   updated in any way. This changelog is targetted to users. This means that the
   comments should well explained and written in clean English. The details about
diff --git a/net-www/apache/apache-1.3.24-r2.ebuild b/net-www/apache/apache-1.3.24-r2.ebuild
deleted file mode 100644
index 2e49f8885d4d..000000000000
--- a/net-www/apache/apache-1.3.24-r2.ebuild
+++ /dev/null
@@ -1,222 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-1.3.24-r2.ebuild,v 1.6 2002/08/16 03:01:01 murphy Exp $
-
-mod_ssl_ver=2.8.8-${PV}
-HARD_SERVER_LIMIT=512
-
-S=${WORKDIR}/apache_${PV}
-DESCRIPTION="The Apache Web Server"
-HOMEPAGE="http://www.apache.org http://www.modssl.org"
-KEYWORDS="x86 sparc sparc64"
-SRC_URI="http://httpd.apache.org/dist/httpd/apache_${PV}.tar.gz
-	ftp://ftp.modssl.org/source/mod_ssl-${mod_ssl_ver}.tar.gz"
-# The mod_ssl archive is only for providing the EAPI patch in here.
-# You should install the net-www/mod_ssl package for the actual DSO.
-
-RDEPEND="virtual/glibc
-	=sys-libs/db-1*
-	=sys-libs/db-3*
-	>=dev-libs/mm-1.1.3
-	>=sys-libs/gdbm-1.8
-	>=dev-libs/expat-1.95.2"
-DEPEND="${RDEPEND} sys-devel/perl"
-LICENSE="Apache-1.1"
-SLOT="1"
-
-pkg_setup() {
-	# these are in baselayout now; it will not hurt to leave them here though..
-	if ! grep -q ^apache: /etc/group ; then
-		groupadd -g 81 apache || die "problem adding group apache"
-	fi
-
-	if ! grep -q ^apache: /etc/passwd ; then
-		useradd -u 81 -g apache -s /bin/false -d /home/httpd -c "apache" apache
-		assert "problem adding user apache"
-	fi
-
-	select_modules_config || \
-	die "couldn't find apache-builtin-mods config file"
-}
-
-src_unpack() {
-	local myssl
-	unpack ${A} ; cd ${S}
-
-	# some nice patches..
-	patch -p1 < ${FILESDIR}/${PV}/mdk/apache_1.3.11-apxs.patch || die m1
-	patch -p1 < ${FILESDIR}/${PV}/mdk/apache_1.3.22-srvroot.patch || die m2
-	patch -p1 < ${FILESDIR}/${PV}/mdk/apache-1.3.14-mkstemp.patch || die m3
-	patch -p0 < ${FILESDIR}/${PV}/mdk/apache-1.3.20.manpage.patch || die m4
-	patch -p1 < ${FILESDIR}/${PV}/deb/apxs_wrong_prefix || die d1
-	patch -p1 < ${FILESDIR}/${PV}/deb/custom_response_segfaults || die d2
-	patch -p1 < ${FILESDIR}/${PV}/deb/mime_type_fix || die d3
-	patch -p1 < ${FILESDIR}/${PV}/deb/regex_must_conform_to_posix_for_LFS_to_work || die d4
-	patch -p1 < ${FILESDIR}/${PV}/deb/suexec_combined || die d5
-	patch -p1 < ${FILESDIR}/${PV}/deb/suexec_of_death || die d6
-	patch -p1 < ${FILESDIR}/${PV}/deb/usr_bin_perl_owns_you || die d7
-
-	# yet another perl path fix..
-	cp htdocs/manual/search/manual-index.cgi \
-		htdocs/manual/search/manual-index.cgi.orig
-	sed -e "s:/usr/local/bin/perl5:/usr/bin/perl:" \
-		htdocs/manual/search/manual-index.cgi.orig \
-		> htdocs/manual/search/manual-index.cgi
-	rm -f htdocs/manual/search/manual-index.cgi.orig
-
-	# setup eapi..
-	myssl=${S}/../mod_ssl-${mod_ssl_ver}
-	cp ${myssl}/pkg.eapi/*.h src/include
-	cp ${myssl}/pkg.eapi/*.c src/ap
-	patch -p0 < ${myssl}/pkg.eapi/eapi.patch || die eapi
-
-	# set a reasonable MM_CORE_PATH location..
-	mv src/include/httpd.h src/include/httpd.h.orig
-	sed -e 's:logs/mm:/var/cache/apache-mm/mm:' \
-		src/include/httpd.h.orig > src/include/httpd.h
-
-	# fix this silly script so it finds a db lib..
-	mv src/helpers/find-dbm-lib src/helpers/find-dbm-lib.orig
-	cp ${FILESDIR}/find-dbm-lib src/helpers
-}
-
-src_compile() {
-	local myconf mycflags
-	mycflags="${CFLAGS}"
-	unset CFLAGS ; unset CXXFLAGS
-
-	#-DBUFFERED_LOGS
-	OPTIM="${mycflags} -DHARD_SERVER_LIMIT=${HARD_SERVER_LIMIT} \
-		-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" \
-	LIBS="-lgdbm -lpthread" \
-	EAPI_MM=SYSTEM \
-	./configure \
-		--prefix=/usr \
-		--exec-prefix=/usr \
-		--bindir=/usr/bin \
-		--sbindir=/usr/sbin \
-		--libexecdir=/usr/lib/apache \
-		--mandir=/usr/share/man \
-		--sysconfdir=/etc/apache/conf \
-		--datadir=/home/httpd \
-		--iconsdir=/home/httpd/icons \
-		--htdocsdir=/home/httpd/htdocs \
-		--manualdir=/usr/share/doc/${PF}/manual \
-		--cgidir=/home/httpd/cgi-bin \
-		--includedir=/usr/include/apache \
-		--localstatedir=/var \
-		--runtimedir=/var/run \
-		--logfiledir=/var/log/apache \
-		--proxycachedir=/var/cache/apache \
-		--serverroot=/etc/apache \
-		\
-		--target=apache \
-		--server-uid=apache \
-		--server-gid=apache \
-		--enable-rule=EAPI \
-		--enable-rule=SHARED_CHAIN \
-		--with-perl=/usr/bin/perl \
-		\
-		${MY_BUILTINS} \
-		\
-		--enable-suexec \
-		--suexec-uidmin=1000 \
-		--suexec-gidmin=100 \
-		--suexec-caller=apache \
-		--suexec-userdir=public_html \
-		--suexec-docroot=/home/httpd/htdocs \
-		--suexec-safepath="/bin:/usr/bin" \
-		--suexec-logfile=/var/log/apache/suexec_log \
-		\
-		${myconf} || die "bad ./configure"
-
-	emake || die "compile problem"
-}
-
-src_install() {
-	local myfile
-	make install-quiet root=${D} || die
-	dodoc ABOUT_APACHE Announcement INSTALL* LICENSE* README* WARNING*
-
-	fowners root.apache /usr/sbin/suexec
-	fperms 4710 /usr/sbin/suexec
-	#fowners apache.apache /home/httpd
-	#fowners apache.apache /home/httpd/htdocs
-
-	# nice support scripts..    # apachefixconf
-	for myfile in apacheaddmod apachedelmod \
-		apachelogserverstatus apachesplitlogfile
-	do
-		exeinto /usr/sbin
-		doexe ${FILESDIR}/$myfile
-	done
-
-	# setup links in /etc/apache..
-	cd ${D}/etc/apache
-	ln -sf ../../usr/lib/apache modules
-	# apxs needs this to pickup the right lib for install..
-	ln -sf ../../usr/lib lib
-	ln -sf ../../var/log/apache logs
-	ln -sf ../../usr/lib/apache-extramodules extramodules
-
-	# drop in a convenient link to the manual
-	dosym /usr/share/doc/${PF}/manual /home/httpd/htdocs/manual
-
-	# deprecated config files, empty dirs..
-	rm -f ${D}/etc/apache/conf/access.conf*
-	rm -f ${D}/etc/apache/conf/srm.conf*
-	rm -rf ${D}/var
-
-	# now the config files..
-	insinto /etc/apache/conf
-	doins ${FILESDIR}/conf/commonapache.conf
-	doins ${FILESDIR}/conf/apache.conf
-	insinto /etc/apache/conf/vhosts
-	doins ${FILESDIR}/conf/VirtualHomePages.conf
-	doins ${FILESDIR}/conf/DynamicVhosts.conf
-	doins ${FILESDIR}/conf/Vhosts.conf
-
-	exeinto /etc/init.d ; newexe ${FILESDIR}/apache.rc6 apache
-	insinto /etc/conf.d ; newins ${FILESDIR}/apache.confd apache
-	insinto /etc/apache ; doins ${FILESDIR}/apache-builtin-mods
-}
-
-pkg_postinst() {
-	# empty dirs..
-	install -d -o apache -g apache ${ROOT}/var/cache/apache
-	install -d -o apache -g apache -m1333 ${ROOT}/var/cache/apache-mm
-	install -d -o root -g root -m0755 ${ROOT}/usr/lib/apache-extramodules
-	install -d -o root -g root -m0755 ${ROOT}/etc/apache/conf/addon-modules
-	install -d -o root -g root -m0755 ${ROOT}/var/log/apache
-}
-
-parse_modules_config() {
-	local filename=$1
-	local name=""
-	local dso=""
-	local disable=""
-	[ -f ${filename} ] || return 1
-	einfo ">>> using ${filename} for builtins..."
-	for i in `cat $filename | sed "s/^#.*//"` ; do
-		if [ $i == "-" ] ; then
-			disable="true"
-		elif [ -z "$name" ] && [ ! -z "`echo $i | grep "mod_"`" ] ; then
-			name=`echo $i | sed "s/mod_//"`
-		elif [ "$disable" ] && ( [ $i == "static" ] || [ $i == "shared" ] ) ; then
-			MY_BUILTINS="${MY_BUILTINS} --disable-module=$name"
-			name="" ; disable=""
-		elif [ $i == "static" ] ; then
-			MY_BUILTINS="${MY_BUILTINS} --enable-module=$name --disable-shared=$name"
-			name="" ; disable=""
-		elif [ $i == "shared" ] ; then
-			MY_BUILTINS="${MY_BUILTINS} --enable-module=$name --enable-shared=$name"
-			name="" ; disable=""
-		fi
-	done
-}
-
-select_modules_config() {
-	parse_modules_config /etc/apache/apache-builtin-mods || \
-	parse_modules_config ${FILESDIR}/apache-builtin-mods || \
-	return 1
-}
diff --git a/net-www/apache/apache-1.3.24-r6.ebuild b/net-www/apache/apache-1.3.24-r6.ebuild
deleted file mode 100644
index 941115b8f4c5..000000000000
--- a/net-www/apache/apache-1.3.24-r6.ebuild
+++ /dev/null
@@ -1,256 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-1.3.24-r6.ebuild,v 1.4 2002/08/16 03:01:01 murphy Exp $
-
-mod_ssl_ver=2.8.8-${PV}
-HARD_SERVER_LIMIT=512
-
-S=${WORKDIR}/apache_${PV}
-DESCRIPTION="The Apache Web Server"
-HOMEPAGE="http://www.apache.org http://www.modssl.org"
-KEYWORDS="x86 sparc sparc64"
-SRC_URI="http://httpd.apache.org/dist/httpd/apache_${PV}.tar.gz
-	ftp://ftp.modssl.org/source/mod_ssl-${mod_ssl_ver}.tar.gz"
-# The mod_ssl archive is only for providing the EAPI patch in here.
-# You should install the net-www/mod_ssl package for the actual DSO.
-
-RDEPEND="virtual/glibc
-	=sys-libs/db-1*
-	=sys-libs/db-3*
-	>=dev-libs/mm-1.1.3
-	>=sys-libs/gdbm-1.8
-	>=dev-libs/expat-1.95.2"
-DEPEND="${RDEPEND} sys-devel/perl"
-LICENSE="Apache-1.1"
-SLOT="1"
-
-pkg_setup() {
-	# these are in baselayout now; it will not hurt to leave them here though..
-
-	if ! groupmod apache; then
-		groupadd -g 81 apache || die "problem adding group apache"
-	fi
-
-	if ! id apache; then
-		useradd -u 81 -g apache -s /bin/false -d /home/httpd -c "apache" apache
-		assert "problem adding user apache"
-	fi
-
-	select_modules_config || \
-	die "couldn't find apache-builtin-mods config file"
-}
-
-src_unpack() {
-	local myssl
-	unpack ${A} ; cd ${S}
-
-	# For Chunking Exploit
-	cd src
-	bzcat ${FILESDIR}/${PV}/proxy_http1.1_chunking.patch.bz2 | patch -p0 || die "Patch: proxy httpd1.1 chunking"
-	cd ..
-
-	# some nice patches..
-	patch -p1 < ${FILESDIR}/${PV}/mdk/apache_1.3.11-apxs.patch || die m1
-	patch -p1 < ${FILESDIR}/${PV}/mdk/apache_1.3.22-srvroot.patch || die m2
-	patch -p1 < ${FILESDIR}/${PV}/mdk/apache-1.3.14-mkstemp.patch || die m3
-	patch -p0 < ${FILESDIR}/${PV}/mdk/apache-1.3.20.manpage.patch || die m4
-	patch -p1 < ${FILESDIR}/${PV}/deb/apxs_wrong_prefix || die d1
-	patch -p1 < ${FILESDIR}/${PV}/deb/custom_response_segfaults || die d2
-	patch -p1 < ${FILESDIR}/${PV}/deb/mime_type_fix || die d3
-	patch -p1 < ${FILESDIR}/${PV}/deb/regex_must_conform_to_posix_for_LFS_to_work || die d4
-	patch -p1 < ${FILESDIR}/${PV}/deb/suexec_combined || die d5
-	patch -p1 < ${FILESDIR}/${PV}/deb/suexec_of_death || die d6
-	patch -p1 < ${FILESDIR}/${PV}/deb/usr_bin_perl_owns_you || die d7
-
-	# yet another perl path fix..
-	cp htdocs/manual/search/manual-index.cgi \
-		htdocs/manual/search/manual-index.cgi.orig
-	sed -e "s:/usr/local/bin/perl5:/usr/bin/perl:" \
-		htdocs/manual/search/manual-index.cgi.orig \
-		> htdocs/manual/search/manual-index.cgi
-	rm -f htdocs/manual/search/manual-index.cgi.orig
-
-	# setup eapi...
-	#
-	# ALSO: patch the eapi patch for the
-	# proxy-httpd1.1-chunk patch         -- NJ 2002 Jun 18 (pre1)
-	#
-	myssl=${S}/../mod_ssl-${mod_ssl_ver}
-	cp ${myssl}/pkg.eapi/*.h src/include
-	cp ${myssl}/pkg.eapi/*.c src/ap
-	patch -p0 < ${FILESDIR}/${PV}/eapi_proxy_httpd1.1_chunk_fix.patch || die "Patch: eapi patch-fix"
-	patch -p0 < ${myssl}/pkg.eapi/eapi.patch || die eapi
-
-	# set a reasonable MM_CORE_PATH location..
-	mv src/include/httpd.h src/include/httpd.h.orig
-	sed -e 's:logs/mm:/var/cache/apache-mm/mm:' \
-		src/include/httpd.h.orig > src/include/httpd.h
-
-	# fix this silly script so it finds a db lib..
-	mv src/helpers/find-dbm-lib src/helpers/find-dbm-lib.orig
-	cp ${FILESDIR}/find-dbm-lib src/helpers
-}
-
-src_compile() {
-	local myconf mycflags
-	mycflags="${CFLAGS}"
-	unset CFLAGS ; unset CXXFLAGS
-
-	# Allow users to move the default data directory by setting the
-	# home directory of the 'apache' user elsewhere.
-	DATA_DIR=`grep apache /etc/passwd | cut -d: -f6`
-	einfo "Using $DATA_DIR as the default data directory."
-
-	if [ "$DATA_DIR" != "/home/httpd" ]; then
-		einfo "Updating data_dir path."
-		for FILE in `grep -lr /home/httpd ${WORKDIR}`; do
-			cp ${FILE} ${FILE}.orig
-			sed "s:/home/httpd:$DATA_DIR:g" < ${FILE}.orig > ${FILE}
-		done
-	fi
-
-	#-DBUFFERED_LOGS
-	OPTIM="${mycflags} -DHARD_SERVER_LIMIT=${HARD_SERVER_LIMIT} \
-		-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" \
-	LIBS="-lgdbm -lpthread" \
-	EAPI_MM=SYSTEM \
-	./configure \
-		--prefix=/usr \
-		--exec-prefix=/usr \
-		--bindir=/usr/bin \
-		--sbindir=/usr/sbin \
-		--libexecdir=/usr/lib/apache \
-		--mandir=/usr/share/man \
-		--sysconfdir=/etc/apache/conf \
-		--datadir=${DATA_DIR} \
-		--iconsdir=${DATA_DIR}/icons \
-		--htdocsdir=${DATA_DIR}/htdocs \
-		--manualdir=/usr/share/doc/${PF}/manual \
-		--cgidir=${DATA_DIR}/cgi-bin \
-		--includedir=/usr/include/apache \
-		--localstatedir=/var \
-		--runtimedir=/var/run \
-		--logfiledir=/var/log/apache \
-		--proxycachedir=/var/cache/apache \
-		--serverroot=/etc/apache \
-		\
-		--target=apache \
-		--server-uid=apache \
-		--server-gid=apache \
-		--enable-rule=EAPI \
-		--enable-rule=SHARED_CHAIN \
-		--with-perl=/usr/bin/perl \
-		\
-		${MY_BUILTINS} \
-		\
-		--enable-suexec \
-		--suexec-uidmin=1000 \
-		--suexec-gidmin=100 \
-		--suexec-caller=apache \
-		--suexec-userdir=public_html \
-		--suexec-docroot=${DATA_DIR}/htdocs \
-		--suexec-safepath="/bin:/usr/bin" \
-		--suexec-logfile=/var/log/apache/suexec_log \
-		\
-		${myconf} || die "bad ./configure"
-
-	emake || die "compile problem"
-}
-
-src_install() {
-
-	local myfile
-#	make install-quiet root=${D} || die
-	make install root=${D} || die
-	dodoc ABOUT_APACHE Announcement INSTALL* LICENSE* README* WARNING*
-
-
-	# Allow users to move the default data directory by setting the
-	# home directory of the 'apache' user elsewhere.
-	DATA_DIR=`grep apache /etc/passwd | cut -d: -f6`
-
-	fowners root.apache /usr/sbin/suexec
-	fperms 4710 /usr/sbin/suexec
-	#fowners apache.apache ${DATA_DIR}
-	#fowners apache.apache ${DATA_DIR}/htdocs
-
-	# nice support scripts..    # apachefixconf
-	for myfile in apacheaddmod apachedelmod \
-		apachelogserverstatus apachesplitlogfile
-	do
-		exeinto /usr/sbin
-		doexe ${FILESDIR}/$myfile
-	done
-
-	# setup links in /etc/apache..
-	cd ${D}/etc/apache
-	ln -sf ../../usr/lib/apache modules
-	# apxs needs this to pickup the right lib for install..
-	ln -sf ../../usr/lib lib
-	ln -sf ../../var/log/apache logs
-	ln -sf ../../usr/lib/apache-extramodules extramodules
-
-	# drop in a convenient link to the manual
-	dosym /usr/share/doc/${PF}/manual ${DATA_DIR}/htdocs/manual
-
-	# deprecated config files, empty dirs..
-	rm -f ${D}/etc/apache/conf/access.conf*
-	rm -f ${D}/etc/apache/conf/srm.conf*
-
-	# We can't delete this if users specify /var/httpd for datadir
-	#	rm -rf ${D}/var
-
-	# now the config files..
-	insinto /etc/apache/conf
-	doins ${FILESDIR}/conf/commonapache.conf
-	doins ${FILESDIR}/conf/apache.conf
-			
-	insinto /etc/apache/conf/vhosts
-	doins ${FILESDIR}/conf/VirtualHomePages.conf
-	doins ${FILESDIR}/conf/DynamicVhosts.conf
-	doins ${FILESDIR}/conf/Vhosts.conf
-
-	exeinto /etc/init.d ; newexe ${FILESDIR}/apache.rc6 apache
-	insinto /etc/conf.d ; newins ${FILESDIR}/apache.confd apache
-	insinto /etc/apache ; doins ${FILESDIR}/apache-builtin-mods
-}
-
-pkg_postinst() {
-	# empty dirs..
-	install -d -o apache -g apache ${ROOT}/var/cache/apache
-	install -d -o apache -g apache -m1333 ${ROOT}/var/cache/apache-mm
-	install -d -o root -g root -m0755 ${ROOT}/usr/lib/apache-extramodules
-	install -d -o root -g root -m0755 ${ROOT}/etc/apache/conf/addon-modules
-	install -d -o root -g root -m0755 ${ROOT}/var/log/apache
-}
-
-parse_modules_config() {
-	local filename=$1
-	local name=""
-	local dso=""
-	local disable=""
-	[ -f ${filename} ] || return 1
-	einfo ">>> using ${filename} for builtins..."
-	for i in `cat $filename | sed "s/^#.*//"` ; do
-		if [ $i == "-" ] ; then
-			disable="true"
-		elif [ -z "$name" ] && [ ! -z "`echo $i | grep "mod_"`" ] ; then
-			name=`echo $i | sed "s/mod_//"`
-		elif [ "$disable" ] && ( [ $i == "static" ] || [ $i == "shared" ] ) ; then
-			MY_BUILTINS="${MY_BUILTINS} --disable-module=$name"
-			name="" ; disable=""
-		elif [ $i == "static" ] ; then
-			MY_BUILTINS="${MY_BUILTINS} --enable-module=$name --disable-shared=$name"
-			name="" ; disable=""
-		elif [ $i == "shared" ] ; then
-			MY_BUILTINS="${MY_BUILTINS} --enable-module=$name --enable-shared=$name"
-			name="" ; disable=""
-		fi
-	done
-}
-
-select_modules_config() {
-	parse_modules_config /etc/apache/apache-builtin-mods || \
-	parse_modules_config ${FILESDIR}/apache-builtin-mods || \
-	return 1
-}
diff --git a/net-www/apache/apache-1.3.26-r1.ebuild b/net-www/apache/apache-1.3.26-r1.ebuild
deleted file mode 100644
index 1479dceb3e72..000000000000
--- a/net-www/apache/apache-1.3.26-r1.ebuild
+++ /dev/null
@@ -1,256 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-1.3.26-r1.ebuild,v 1.4 2002/08/16 03:01:01 murphy Exp $
-
-mod_ssl_ver=2.8.9-${PV}
-HARD_SERVER_LIMIT=512
-
-S=${WORKDIR}/apache_${PV}
-DESCRIPTION="The Apache Web Server"
-HOMEPAGE="http://www.apache.org http://www.modssl.org"
-KEYWORDS="x86 sparc sparc64"
-SRC_URI="http://httpd.apache.org/dist/httpd/apache_${PV}.tar.gz
-	ftp://ftp.modssl.org/source/mod_ssl-${mod_ssl_ver}.tar.gz"
-# The mod_ssl archive is only for providing the EAPI patch in here.
-# You should install the net-www/mod_ssl package for the actual DSO.
-
-RDEPEND="virtual/glibc
-	=sys-libs/db-1*
-	=sys-libs/db-3*
-	>=dev-libs/mm-1.1.3
-	>=sys-libs/gdbm-1.8
-	>=dev-libs/expat-1.95.2"
-DEPEND="${RDEPEND} sys-devel/perl"
-LICENSE="Apache-1.1"
-SLOT="1"
-
-pkg_setup() {
-	# these are in baselayout now; it will not hurt to leave them here though..
-
-	if ! groupmod apache; then
-		groupadd -g 81 apache || die "problem adding group apache"
-	fi
-
-	# usermod returns 2 on user-exists-but-no-flags-given
-	usermod apache &>/dev/null
-	if [ $? != 2 ]; then
-		useradd -u 81 -g apache -s /bin/false -d /home/httpd -c "apache" apache
-		assert "problem adding user apache"
-	fi
-
-	select_modules_config || \
-	die "couldn't find apache-builtin-mods config file"
-}
-
-src_unpack() {
-	local myssl
-	unpack ${A} ; cd ${S}
-
-	# some nice patches..
-	patch -p1 < ${FILESDIR}/${PV}/mdk/apache_1.3.11-apxs.patch || die m1
-	patch -p1 < ${FILESDIR}/${PV}/mdk/apache_1.3.22-srvroot.patch || die m2
-	patch -p1 < ${FILESDIR}/${PV}/mdk/apache-1.3.14-mkstemp.patch || die m3
-	patch -p0 < ${FILESDIR}/${PV}/mdk/apache-1.3.20.manpage.patch || die m4
-	patch -p1 < ${FILESDIR}/${PV}/deb/apxs_wrong_prefix || die d1
-	patch -p1 < ${FILESDIR}/${PV}/deb/custom_response_segfaults || die d2
-	patch -p1 < ${FILESDIR}/${PV}/deb/mime_type_fix || die d3
-	patch -p1 < ${FILESDIR}/${PV}/deb/regex_must_conform_to_posix_for_LFS_to_work || die d4
-	patch -p1 < ${FILESDIR}/${PV}/deb/suexec_combined || die d5
-	patch -p1 < ${FILESDIR}/${PV}/deb/suexec_of_death || die d6
-	patch -p1 < ${FILESDIR}/${PV}/deb/usr_bin_perl_owns_you || die d7
-
-	# yet another perl path fix..
-	cp htdocs/manual/search/manual-index.cgi \
-		htdocs/manual/search/manual-index.cgi.orig
-	sed -e "s:/usr/local/bin/perl5:/usr/bin/perl:" \
-		htdocs/manual/search/manual-index.cgi.orig \
-		> htdocs/manual/search/manual-index.cgi
-	rm -f htdocs/manual/search/manual-index.cgi.orig
-
-	# setup eapi...
-	myssl=${S}/../mod_ssl-${mod_ssl_ver}
-	cp ${myssl}/pkg.eapi/*.h src/include
-	cp ${myssl}/pkg.eapi/*.c src/ap
-	patch -p0 < ${myssl}/pkg.eapi/eapi.patch || die eapi
-
-	# set a reasonable MM_CORE_PATH location..
-	mv src/include/httpd.h src/include/httpd.h.orig
-	sed -e 's:logs/mm:/var/cache/apache-mm/mm:' \
-		src/include/httpd.h.orig > src/include/httpd.h
-
-	# fix this silly script so it finds a db lib..
-	mv src/helpers/find-dbm-lib src/helpers/find-dbm-lib.orig
-	cp ${FILESDIR}/find-dbm-lib src/helpers
-}
-
-src_compile() {
-	local myconf mycflags
-	mycflags="${CFLAGS}"
-	unset CFLAGS ; unset CXXFLAGS
-
-	# Allow users to move the default data directory by setting the
-	# home directory of the 'apache' user elsewhere.
-	DATA_DIR=`grep apache /etc/passwd | cut -d: -f6`
-
-	if [ -z "$DATA_DIR" ]; then
-		eerror "DATA_DIR is null! Using defaults."
-		DATA_DIR="/home/httpd"
-	elif [ "$DATA_DIR" != "/home/httpd" ]; then
-		einfo "Updating data_dir path."
-		for FILE in `grep -lr /home/httpd ${WORKDIR}`; do
-			cp ${FILE} ${FILE}.orig
-			sed "s:/home/httpd:$DATA_DIR:g" < ${FILE}.orig > ${FILE}
-		done
-	fi
-
-	einfo "Using $DATA_DIR as the default data directory."
-
-	#-DBUFFERED_LOGS
-	OPTIM="${mycflags} -DHARD_SERVER_LIMIT=${HARD_SERVER_LIMIT} \
-		-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" \
-	LIBS="-lgdbm -lpthread" \
-	EAPI_MM=SYSTEM \
-	./configure \
-		--prefix=/usr \
-		--exec-prefix=/usr \
-		--bindir=/usr/bin \
-		--sbindir=/usr/sbin \
-		--libexecdir=/usr/lib/apache \
-		--mandir=/usr/share/man \
-		--sysconfdir=/etc/apache/conf \
-		--datadir=${DATA_DIR} \
-		--iconsdir=${DATA_DIR}/icons \
-		--htdocsdir=${DATA_DIR}/htdocs \
-		--manualdir=/usr/share/doc/${PF}/manual \
-		--cgidir=${DATA_DIR}/cgi-bin \
-		--includedir=/usr/include/apache \
-		--localstatedir=/var \
-		--runtimedir=/var/run \
-		--logfiledir=/var/log/apache \
-		--proxycachedir=/var/cache/apache \
-		--serverroot=/etc/apache \
-		\
-		--target=apache \
-		--server-uid=apache \
-		--server-gid=apache \
-		--enable-rule=EAPI \
-		--enable-rule=SHARED_CHAIN \
-		--with-perl=/usr/bin/perl \
-		\
-		${MY_BUILTINS} \
-		\
-		--enable-suexec \
-		--suexec-uidmin=1000 \
-		--suexec-gidmin=100 \
-		--suexec-caller=apache \
-		--suexec-userdir=public_html \
-		--suexec-docroot=${DATA_DIR}/htdocs \
-		--suexec-safepath="/bin:/usr/bin" \
-		--suexec-logfile=/var/log/apache/suexec_log \
-		\
-		${myconf} || die "bad ./configure"
-
-	emake || die "compile problem"
-}
-
-src_install() {
-
-	local myfile
-	make install-quiet root=${D} || die
-	dodoc ABOUT_APACHE Announcement INSTALL* LICENSE* README* WARNING*
-
-
-	# Allow users to move the default data directory by setting the
-	# home directory of the 'apache' user elsewhere.
-	DATA_DIR=`grep apache /etc/passwd | cut -d: -f6`
-
-	if [ -z "$DATA_DIR" ]; then
-		eerror "DATA_DIR is null! Using defaults."
-		DATA_DIR="/home/httpd"
-	fi
-
-	fowners root.apache /usr/sbin/suexec
-	fperms 4710 /usr/sbin/suexec
-	#fowners apache.apache ${DATA_DIR}
-	#fowners apache.apache ${DATA_DIR}/htdocs
-
-	# nice support scripts..    # apachefixconf
-	for myfile in apacheaddmod apachedelmod \
-		apachelogserverstatus apachesplitlogfile
-	do
-		exeinto /usr/sbin
-		doexe ${FILESDIR}/$myfile
-	done
-
-	# setup links in /etc/apache..
-	cd ${D}/etc/apache
-	ln -sf ../../usr/lib/apache modules
-	# apxs needs this to pickup the right lib for install..
-	ln -sf ../../usr/lib lib
-	ln -sf ../../var/log/apache logs
-	ln -sf ../../usr/lib/apache-extramodules extramodules
-
-	# drop in a convenient link to the manual
-	dosym /usr/share/doc/${PF}/manual ${DATA_DIR}/htdocs/manual
-
-	# deprecated config files, empty dirs..
-	rm -f ${D}/etc/apache/conf/access.conf*
-	rm -f ${D}/etc/apache/conf/srm.conf*
-
-	# We can't delete this if users specify /var/httpd for datadir
-	#	rm -rf ${D}/var
-
-	# now the config files..
-	insinto /etc/apache/conf
-	doins ${FILESDIR}/conf/commonapache.conf
-	doins ${FILESDIR}/conf/apache.conf
-			
-	insinto /etc/apache/conf/vhosts
-	doins ${FILESDIR}/conf/VirtualHomePages.conf
-	doins ${FILESDIR}/conf/DynamicVhosts.conf
-	doins ${FILESDIR}/conf/Vhosts.conf
-
-	exeinto /etc/init.d ; newexe ${FILESDIR}/apache.rc6 apache
-	insinto /etc/conf.d ; newins ${FILESDIR}/apache.confd apache
-	insinto /etc/apache ; doins ${FILESDIR}/apache-builtin-mods
-}
-
-pkg_postinst() {
-	# empty dirs..
-	install -d -o apache -g apache ${ROOT}/var/cache/apache
-	install -d -o apache -g apache -m1333 ${ROOT}/var/cache/apache-mm
-	install -d -o root -g root -m0755 ${ROOT}/usr/lib/apache-extramodules
-	install -d -o root -g root -m0755 ${ROOT}/etc/apache/conf/addon-modules
-	install -d -o root -g root -m0755 ${ROOT}/var/log/apache
-}
-
-parse_modules_config() {
-	local filename=$1
-	local name=""
-	local dso=""
-	local disable=""
-	[ -f ${filename} ] || return 1
-	einfo ">>> using ${filename} for builtins..."
-	for i in `cat $filename | sed "s/^#.*//"` ; do
-		if [ $i == "-" ] ; then
-			disable="true"
-		elif [ -z "$name" ] && [ ! -z "`echo $i | grep "mod_"`" ] ; then
-			name=`echo $i | sed "s/mod_//"`
-		elif [ "$disable" ] && ( [ $i == "static" ] || [ $i == "shared" ] ) ; then
-			MY_BUILTINS="${MY_BUILTINS} --disable-module=$name"
-			name="" ; disable=""
-		elif [ $i == "static" ] ; then
-			MY_BUILTINS="${MY_BUILTINS} --enable-module=$name --disable-shared=$name"
-			name="" ; disable=""
-		elif [ $i == "shared" ] ; then
-			MY_BUILTINS="${MY_BUILTINS} --enable-module=$name --enable-shared=$name"
-			name="" ; disable=""
-		fi
-	done
-}
-
-select_modules_config() {
-	parse_modules_config /etc/apache/apache-builtin-mods || \
-	parse_modules_config ${FILESDIR}/apache-builtin-mods || \
-	return 1
-}
diff --git a/net-www/apache/apache-1.3.26-r2.ebuild b/net-www/apache/apache-1.3.26-r2.ebuild
deleted file mode 100644
index e1698953e602..000000000000
--- a/net-www/apache/apache-1.3.26-r2.ebuild
+++ /dev/null
@@ -1,264 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-1.3.26-r2.ebuild,v 1.3 2002/08/16 03:01:01 murphy Exp $
-
-mod_ssl_ver=2.8.9-${PV}
-HARD_SERVER_LIMIT=512
-
-S=${WORKDIR}/apache_${PV}
-DESCRIPTION="The Apache Web Server"
-HOMEPAGE="http://www.apache.org http://www.modssl.org"
-KEYWORDS="x86 sparc sparc64"
-SRC_URI="http://httpd.apache.org/dist/httpd/apache_${PV}.tar.gz
-	ftp://ftp.modssl.org/source/mod_ssl-${mod_ssl_ver}.tar.gz"
-# The mod_ssl archive is only for providing the EAPI patch in here.
-# You should install the net-www/mod_ssl package for the actual DSO.
-
-RDEPEND="virtual/glibc
-	=sys-libs/db-1*
-	=sys-libs/db-3*
-	>=dev-libs/mm-1.1.3
-	>=sys-libs/gdbm-1.8
-	>=dev-libs/expat-1.95.2"
-DEPEND="${RDEPEND} sys-devel/perl"
-LICENSE="Apache-1.1"
-SLOT="1"
-
-pkg_setup() {
-	# these are in baselayout now; it will not hurt to leave them here though..
-
-	if ! groupmod apache; then
-		groupadd -g 81 apache || die "problem adding group apache"
-	fi
-
-	# usermod returns 2 on user-exists-but-no-flags-given
-	usermod apache &>/dev/null
-	if [ $? != 2 ]; then
-		useradd -u 81 -g apache -s /bin/false -d /home/httpd -c "apache" apache
-		assert "problem adding user apache"
-	fi
-
-	select_modules_config || \
-	die "couldn't find apache-builtin-mods config file"
-}
-
-src_unpack() {
-	local myssl
-	unpack ${A} ; cd ${S}
-
-	# some nice patches..
-	patch -p1 < ${FILESDIR}/${PV}/mdk/apache_1.3.11-apxs.patch || die m1
-	patch -p1 < ${FILESDIR}/${PV}/mdk/apache_1.3.22-srvroot.patch || die m2
-	patch -p1 < ${FILESDIR}/${PV}/mdk/apache-1.3.14-mkstemp.patch || die m3
-	patch -p0 < ${FILESDIR}/${PV}/mdk/apache-1.3.20.manpage.patch || die m4
-	patch -p1 < ${FILESDIR}/${PV}/deb/apxs_wrong_prefix || die d1
-	patch -p1 < ${FILESDIR}/${PV}/deb/custom_response_segfaults || die d2
-	patch -p1 < ${FILESDIR}/${PV}/deb/mime_type_fix || die d3
-	patch -p1 < ${FILESDIR}/${PV}/deb/regex_must_conform_to_posix_for_LFS_to_work || die d4
-	patch -p1 < ${FILESDIR}/${PV}/deb/suexec_combined || die d5
-	patch -p1 < ${FILESDIR}/${PV}/deb/suexec_of_death || die d6
-	patch -p1 < ${FILESDIR}/${PV}/deb/usr_bin_perl_owns_you || die d7
-
-	# yet another perl path fix..
-	cp htdocs/manual/search/manual-index.cgi \
-		htdocs/manual/search/manual-index.cgi.orig
-	sed -e "s:/usr/local/bin/perl5:/usr/bin/perl:" \
-		htdocs/manual/search/manual-index.cgi.orig \
-		> htdocs/manual/search/manual-index.cgi
-	rm -f htdocs/manual/search/manual-index.cgi.orig
-
-	# setup eapi...
-	myssl=${S}/../mod_ssl-${mod_ssl_ver}
-	cp ${myssl}/pkg.eapi/*.h src/include
-	cp ${myssl}/pkg.eapi/*.c src/ap
-	patch -p0 < ${myssl}/pkg.eapi/eapi.patch || die eapi
-
-	# set a reasonable MM_CORE_PATH location..
-	mv src/include/httpd.h src/include/httpd.h.orig
-	sed -e 's:logs/mm:/var/cache/apache-mm/mm:' \
-		src/include/httpd.h.orig > src/include/httpd.h
-
-	# fix this silly script so it finds a db lib..
-	mv src/helpers/find-dbm-lib src/helpers/find-dbm-lib.orig
-	cp ${FILESDIR}/find-dbm-lib src/helpers
-}
-
-src_compile() {
-	local myconf mycflags
-	mycflags="${CFLAGS}"
-	unset CFLAGS ; unset CXXFLAGS
-
-	# Allow users to move the default data directory by setting the
-	# home directory of the 'apache' user elsewhere.
-	DATA_DIR=`grep apache /etc/passwd | cut -d: -f6`
-
-	if [ -z "$DATA_DIR" ]; then
-		eerror "DATA_DIR is null! Using defaults."
-		eerror "You probably want to check /etc/passwd"
-		DATA_DIR="/home/httpd"
-	fi
-
-	einfo "Using $DATA_DIR as the default data directory."
-
-	#-DBUFFERED_LOGS
-	OPTIM="${mycflags} -DHARD_SERVER_LIMIT=${HARD_SERVER_LIMIT} \
-		-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" \
-	LIBS="-lgdbm -lpthread" \
-	EAPI_MM=SYSTEM \
-	./configure \
-		--prefix=/usr \
-		--exec-prefix=/usr \
-		--bindir=/usr/bin \
-		--sbindir=/usr/sbin \
-		--libexecdir=/usr/lib/apache \
-		--mandir=/usr/share/man \
-		--sysconfdir=/etc/apache/conf \
-		--datadir=${DATA_DIR} \
-		--iconsdir=${DATA_DIR}/icons \
-		--htdocsdir=${DATA_DIR}/htdocs \
-		--manualdir=/usr/share/doc/${PF}/manual \
-		--cgidir=${DATA_DIR}/cgi-bin \
-		--includedir=/usr/include/apache \
-		--localstatedir=/var \
-		--runtimedir=/var/run \
-		--logfiledir=/var/log/apache \
-		--proxycachedir=/var/cache/apache \
-		--serverroot=/etc/apache \
-		\
-		--target=apache \
-		--server-uid=apache \
-		--server-gid=apache \
-		--enable-rule=EAPI \
-		--enable-rule=SHARED_CHAIN \
-		--with-perl=/usr/bin/perl \
-		\
-		${MY_BUILTINS} \
-		\
-		--enable-suexec \
-		--suexec-uidmin=1000 \
-		--suexec-gidmin=100 \
-		--suexec-caller=apache \
-		--suexec-userdir=public_html \
-		--suexec-docroot=${DATA_DIR}/htdocs \
-		--suexec-safepath="/bin:/usr/bin" \
-		--suexec-logfile=/var/log/apache/suexec_log \
-		\
-		${myconf} || die "bad ./configure"
-
-	emake || die "compile problem"
-}
-
-src_install() {
-	# Allow users to move the default data directory by setting the
-	# home directory of the 'apache' user elsewhere.
-	DATA_DIR=`grep apache /etc/passwd | cut -d: -f6`
-
-	if [ -z "$DATA_DIR" ]; then
-		eerror "DATA_DIR is null! Using defaults."
-		eerror "You probably want to check /etc/passwd"
-		DATA_DIR="/home/httpd"
-	fi
-
-	local myfile
-	make install-quiet root=${D} || die
-	dodoc ABOUT_APACHE Announcement INSTALL* LICENSE* README* WARNING*
-
-	fowners root.apache /usr/sbin/suexec
-	fperms 4710 /usr/sbin/suexec
-	#fowners apache.apache ${DATA_DIR}
-	#fowners apache.apache ${DATA_DIR}/htdocs
-
-	# nice support scripts..    # apachefixconf
-	for myfile in apacheaddmod apachedelmod \
-		apachelogserverstatus apachesplitlogfile
-	do
-		exeinto /usr/sbin
-		doexe ${FILESDIR}/$myfile
-	done
-
-	# setup links in /etc/apache..
-	cd ${D}/etc/apache
-	ln -sf ../../usr/lib/apache modules
-	# apxs needs this to pickup the right lib for install..
-	ln -sf ../../usr/lib lib
-	ln -sf ../../var/log/apache logs
-	ln -sf ../../usr/lib/apache-extramodules extramodules
-
-	# drop in a convenient link to the manual
-	dosym /usr/share/doc/${PF}/manual ${DATA_DIR}/htdocs/manual
-
-	# deprecated config files, empty dirs..
-	rm -f ${D}/etc/apache/conf/access.conf*
-	rm -f ${D}/etc/apache/conf/srm.conf*
-
-	# We can't delete this if users specify /var/httpd for datadir
-	#	rm -rf ${D}/var
-
-	# now the config files..
-	insinto /etc/apache/conf
-	doins ${FILESDIR}/conf/commonapache.conf
-	doins ${FILESDIR}/conf/apache.conf
-			
-	insinto /etc/apache/conf/vhosts
-	doins ${FILESDIR}/conf/VirtualHomePages.conf
-	doins ${FILESDIR}/conf/DynamicVhosts.conf
-	doins ${FILESDIR}/conf/Vhosts.conf
-
-	exeinto /etc/init.d ; newexe ${FILESDIR}/apache.rc6 apache
-	insinto /etc/conf.d ; newins ${FILESDIR}/apache.confd apache
-	insinto /etc/apache ; doins ${FILESDIR}/apache-builtin-mods
-
-	if [ "$DATA_DIR" != "/home/httpd" ]; then
-		einfo "Updating data_dir path."
-		echo grep -lr /home/httpd ${D}
-		grep -lr /home/httpd ${D}
-		sleep 30s
-		for FILE in `grep -lr /home/httpd ${D}`; do
-			echo "Running sed on: ${FILE}"
-			cp ${FILE} ${FILE}.orig
-			echo sed "s:/home/httpd:$DATA_DIR:g"
-			sed "s:/home/httpd:$DATA_DIR:g" < ${FILE}.orig > ${FILE}
-			rm ${FILE}.orig
-		done
-	fi
-}
-
-pkg_postinst() {
-	# empty dirs..
-	install -d -o apache -g apache ${ROOT}/var/cache/apache
-	install -d -o apache -g apache -m1333 ${ROOT}/var/cache/apache-mm
-	install -d -o root -g root -m0755 ${ROOT}/usr/lib/apache-extramodules
-	install -d -o root -g root -m0755 ${ROOT}/etc/apache/conf/addon-modules
-	install -d -o root -g root -m0755 ${ROOT}/var/log/apache
-}
-
-parse_modules_config() {
-	local filename=$1
-	local name=""
-	local dso=""
-	local disable=""
-	[ -f ${filename} ] || return 1
-	einfo ">>> using ${filename} for builtins..."
-	for i in `cat $filename | sed "s/^#.*//"` ; do
-		if [ $i == "-" ] ; then
-			disable="true"
-		elif [ -z "$name" ] && [ ! -z "`echo $i | grep "mod_"`" ] ; then
-			name=`echo $i | sed "s/mod_//"`
-		elif [ "$disable" ] && ( [ $i == "static" ] || [ $i == "shared" ] ) ; then
-			MY_BUILTINS="${MY_BUILTINS} --disable-module=$name"
-			name="" ; disable=""
-		elif [ $i == "static" ] ; then
-			MY_BUILTINS="${MY_BUILTINS} --enable-module=$name --disable-shared=$name"
-			name="" ; disable=""
-		elif [ $i == "shared" ] ; then
-			MY_BUILTINS="${MY_BUILTINS} --enable-module=$name --enable-shared=$name"
-			name="" ; disable=""
-		fi
-	done
-}
-
-select_modules_config() {
-	parse_modules_config /etc/apache/apache-builtin-mods || \
-	parse_modules_config ${FILESDIR}/apache-builtin-mods || \
-	return 1
-}
diff --git a/net-www/apache/apache-1.3.26.ebuild b/net-www/apache/apache-1.3.26.ebuild
deleted file mode 100644
index d7a60435a6d2..000000000000
--- a/net-www/apache/apache-1.3.26.ebuild
+++ /dev/null
@@ -1,246 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# /space/gentoo/cvsroot/gentoo-x86/net-www/apache/apache-1.3.24-r6.ebuild,v 1.2 2002/06/19 05:16:21 seemant Exp
-
-mod_ssl_ver=2.8.9-${PV}
-HARD_SERVER_LIMIT=512
-
-S=${WORKDIR}/apache_${PV}
-DESCRIPTION="The Apache Web Server"
-HOMEPAGE="http://www.apache.org http://www.modssl.org"
-KEYWORDS="x86 sparc sparc64"
-SRC_URI="http://httpd.apache.org/dist/httpd/apache_${PV}.tar.gz
-	ftp://ftp.modssl.org/source/mod_ssl-${mod_ssl_ver}.tar.gz"
-# The mod_ssl archive is only for providing the EAPI patch in here.
-# You should install the net-www/mod_ssl package for the actual DSO.
-
-RDEPEND="virtual/glibc
-	=sys-libs/db-1*
-	=sys-libs/db-3*
-	>=dev-libs/mm-1.1.3
-	>=sys-libs/gdbm-1.8
-	>=dev-libs/expat-1.95.2"
-DEPEND="${RDEPEND} sys-devel/perl"
-LICENSE="Apache-1.1"
-SLOT="1"
-
-pkg_setup() {
-	# these are in baselayout now; it will not hurt to leave them here though..
-
-	if ! groupmod apache; then
-		groupadd -g 81 apache || die "problem adding group apache"
-	fi
-
-	if ! id apache; then
-		useradd -u 81 -g apache -s /bin/false -d /home/httpd -c "apache" apache
-		assert "problem adding user apache"
-	fi
-
-	select_modules_config || \
-	die "couldn't find apache-builtin-mods config file"
-}
-
-src_unpack() {
-	local myssl
-	unpack ${A} ; cd ${S}
-
-	# some nice patches..
-	patch -p1 < ${FILESDIR}/${PV}/mdk/apache_1.3.11-apxs.patch || die m1
-	patch -p1 < ${FILESDIR}/${PV}/mdk/apache_1.3.22-srvroot.patch || die m2
-	patch -p1 < ${FILESDIR}/${PV}/mdk/apache-1.3.14-mkstemp.patch || die m3
-	patch -p0 < ${FILESDIR}/${PV}/mdk/apache-1.3.20.manpage.patch || die m4
-	patch -p1 < ${FILESDIR}/${PV}/deb/apxs_wrong_prefix || die d1
-	patch -p1 < ${FILESDIR}/${PV}/deb/custom_response_segfaults || die d2
-	patch -p1 < ${FILESDIR}/${PV}/deb/mime_type_fix || die d3
-	patch -p1 < ${FILESDIR}/${PV}/deb/regex_must_conform_to_posix_for_LFS_to_work || die d4
-	patch -p1 < ${FILESDIR}/${PV}/deb/suexec_combined || die d5
-	patch -p1 < ${FILESDIR}/${PV}/deb/suexec_of_death || die d6
-	patch -p1 < ${FILESDIR}/${PV}/deb/usr_bin_perl_owns_you || die d7
-
-	# yet another perl path fix..
-	cp htdocs/manual/search/manual-index.cgi \
-		htdocs/manual/search/manual-index.cgi.orig
-	sed -e "s:/usr/local/bin/perl5:/usr/bin/perl:" \
-		htdocs/manual/search/manual-index.cgi.orig \
-		> htdocs/manual/search/manual-index.cgi
-	rm -f htdocs/manual/search/manual-index.cgi.orig
-
-	# setup eapi...
-	myssl=${S}/../mod_ssl-${mod_ssl_ver}
-	cp ${myssl}/pkg.eapi/*.h src/include
-	cp ${myssl}/pkg.eapi/*.c src/ap
-	patch -p0 < ${myssl}/pkg.eapi/eapi.patch || die eapi
-
-	# set a reasonable MM_CORE_PATH location..
-	mv src/include/httpd.h src/include/httpd.h.orig
-	sed -e 's:logs/mm:/var/cache/apache-mm/mm:' \
-		src/include/httpd.h.orig > src/include/httpd.h
-
-	# fix this silly script so it finds a db lib..
-	mv src/helpers/find-dbm-lib src/helpers/find-dbm-lib.orig
-	cp ${FILESDIR}/find-dbm-lib src/helpers
-}
-
-src_compile() {
-	local myconf mycflags
-	mycflags="${CFLAGS}"
-	unset CFLAGS ; unset CXXFLAGS
-
-	# Allow users to move the default data directory by setting the
-	# home directory of the 'apache' user elsewhere.
-	DATA_DIR=`grep apache /etc/passwd | cut -d: -f6`
-	einfo "Using $DATA_DIR as the default data directory."
-
-	if [ "$DATA_DIR" != "/home/httpd" ]; then
-		einfo "Updating data_dir path."
-		for FILE in `grep -lr /home/httpd ${WORKDIR}`; do
-			cp ${FILE} ${FILE}.orig
-			sed "s:/home/httpd:$DATA_DIR:g" < ${FILE}.orig > ${FILE}
-		done
-	fi
-
-	#-DBUFFERED_LOGS
-	OPTIM="${mycflags} -DHARD_SERVER_LIMIT=${HARD_SERVER_LIMIT} \
-		-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" \
-	LIBS="-lgdbm -lpthread" \
-	EAPI_MM=SYSTEM \
-	./configure \
-		--prefix=/usr \
-		--exec-prefix=/usr \
-		--bindir=/usr/bin \
-		--sbindir=/usr/sbin \
-		--libexecdir=/usr/lib/apache \
-		--mandir=/usr/share/man \
-		--sysconfdir=/etc/apache/conf \
-		--datadir=${DATA_DIR} \
-		--iconsdir=${DATA_DIR}/icons \
-		--htdocsdir=${DATA_DIR}/htdocs \
-		--manualdir=/usr/share/doc/${PF}/manual \
-		--cgidir=${DATA_DIR}/cgi-bin \
-		--includedir=/usr/include/apache \
-		--localstatedir=/var \
-		--runtimedir=/var/run \
-		--logfiledir=/var/log/apache \
-		--proxycachedir=/var/cache/apache \
-		--serverroot=/etc/apache \
-		\
-		--target=apache \
-		--server-uid=apache \
-		--server-gid=apache \
-		--enable-rule=EAPI \
-		--enable-rule=SHARED_CHAIN \
-		--with-perl=/usr/bin/perl \
-		\
-		${MY_BUILTINS} \
-		\
-		--enable-suexec \
-		--suexec-uidmin=1000 \
-		--suexec-gidmin=100 \
-		--suexec-caller=apache \
-		--suexec-userdir=public_html \
-		--suexec-docroot=${DATA_DIR}/htdocs \
-		--suexec-safepath="/bin:/usr/bin" \
-		--suexec-logfile=/var/log/apache/suexec_log \
-		\
-		${myconf} || die "bad ./configure"
-
-	emake || die "compile problem"
-}
-
-src_install() {
-
-	local myfile
-#	make install-quiet root=${D} || die
-	make install root=${D} || die
-	dodoc ABOUT_APACHE Announcement INSTALL* LICENSE* README* WARNING*
-
-
-	# Allow users to move the default data directory by setting the
-	# home directory of the 'apache' user elsewhere.
-	DATA_DIR=`grep apache /etc/passwd | cut -d: -f6`
-
-	fowners root.apache /usr/sbin/suexec
-	fperms 4710 /usr/sbin/suexec
-	#fowners apache.apache ${DATA_DIR}
-	#fowners apache.apache ${DATA_DIR}/htdocs
-
-	# nice support scripts..    # apachefixconf
-	for myfile in apacheaddmod apachedelmod \
-		apachelogserverstatus apachesplitlogfile
-	do
-		exeinto /usr/sbin
-		doexe ${FILESDIR}/$myfile
-	done
-
-	# setup links in /etc/apache..
-	cd ${D}/etc/apache
-	ln -sf ../../usr/lib/apache modules
-	# apxs needs this to pickup the right lib for install..
-	ln -sf ../../usr/lib lib
-	ln -sf ../../var/log/apache logs
-	ln -sf ../../usr/lib/apache-extramodules extramodules
-
-	# drop in a convenient link to the manual
-	dosym /usr/share/doc/${PF}/manual ${DATA_DIR}/htdocs/manual
-
-	# deprecated config files, empty dirs..
-	rm -f ${D}/etc/apache/conf/access.conf*
-	rm -f ${D}/etc/apache/conf/srm.conf*
-
-	# We can't delete this if users specify /var/httpd for datadir
-	#	rm -rf ${D}/var
-
-	# now the config files..
-	insinto /etc/apache/conf
-	doins ${FILESDIR}/conf/commonapache.conf
-	doins ${FILESDIR}/conf/apache.conf
-			
-	insinto /etc/apache/conf/vhosts
-	doins ${FILESDIR}/conf/VirtualHomePages.conf
-	doins ${FILESDIR}/conf/DynamicVhosts.conf
-	doins ${FILESDIR}/conf/Vhosts.conf
-
-	exeinto /etc/init.d ; newexe ${FILESDIR}/apache.rc6 apache
-	insinto /etc/conf.d ; newins ${FILESDIR}/apache.confd apache
-	insinto /etc/apache ; doins ${FILESDIR}/apache-builtin-mods
-}
-
-pkg_postinst() {
-	# empty dirs..
-	install -d -o apache -g apache ${ROOT}/var/cache/apache
-	install -d -o apache -g apache -m1333 ${ROOT}/var/cache/apache-mm
-	install -d -o root -g root -m0755 ${ROOT}/usr/lib/apache-extramodules
-	install -d -o root -g root -m0755 ${ROOT}/etc/apache/conf/addon-modules
-	install -d -o root -g root -m0755 ${ROOT}/var/log/apache
-}
-
-parse_modules_config() {
-	local filename=$1
-	local name=""
-	local dso=""
-	local disable=""
-	[ -f ${filename} ] || return 1
-	einfo ">>> using ${filename} for builtins..."
-	for i in `cat $filename | sed "s/^#.*//"` ; do
-		if [ $i == "-" ] ; then
-			disable="true"
-		elif [ -z "$name" ] && [ ! -z "`echo $i | grep "mod_"`" ] ; then
-			name=`echo $i | sed "s/mod_//"`
-		elif [ "$disable" ] && ( [ $i == "static" ] || [ $i == "shared" ] ) ; then
-			MY_BUILTINS="${MY_BUILTINS} --disable-module=$name"
-			name="" ; disable=""
-		elif [ $i == "static" ] ; then
-			MY_BUILTINS="${MY_BUILTINS} --enable-module=$name --disable-shared=$name"
-			name="" ; disable=""
-		elif [ $i == "shared" ] ; then
-			MY_BUILTINS="${MY_BUILTINS} --enable-module=$name --enable-shared=$name"
-			name="" ; disable=""
-		fi
-	done
-}
-
-select_modules_config() {
-	parse_modules_config /etc/apache/apache-builtin-mods || \
-	parse_modules_config ${FILESDIR}/apache-builtin-mods || \
-	return 1
-}
diff --git a/net-www/apache/files/1.3.26/deb/mime_type_fix b/net-www/apache/files/1.3.26/deb/mime_type_fix
index a81557c49ab6..aec94dc1fedf 100644
--- a/net-www/apache/files/1.3.26/deb/mime_type_fix
+++ b/net-www/apache/files/1.3.26/deb/mime_type_fix
@@ -1,6 +1,7 @@
---- apache-1.3.6.orig/conf/mime.types
-+++ apache-1.3.6/conf/mime.types
-@@ -154,14 +154,12 @@
+diff -uNr apache_1.3.26.orig/conf/mime.types apache_1.3.26/conf/mime.types
+--- apache_1.3.26.orig/conf/mime.types	Sun Apr 14 12:43:08 2002
++++ apache_1.3.26/conf/mime.types	Fri Sep 13 19:54:00 2002
+@@ -285,19 +285,18 @@
  application/x-bcpio		bcpio
  application/x-cdlink		vcd
  application/x-chess-pgn		pgn
@@ -15,3 +16,9 @@
  application/x-hdf		hdf
  application/x-javascript	js
  application/x-koan		skp skd skt skm
+ application/x-latex		latex
+ application/x-netcdf		nc cdf
++application/x-ogg		ogg
+ application/x-sh		sh
+ application/x-shar		shar
+ application/x-shockwave-flash	swf
diff --git a/net-www/apache/files/digest-apache-1.3.24-r2 b/net-www/apache/files/digest-apache-1.3.24-r2
deleted file mode 100644
index 770251a0ba76..000000000000
--- a/net-www/apache/files/digest-apache-1.3.24-r2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 ebea6588c3954731fcc318d29bc82409 apache_1.3.24.tar.gz 2232504
-MD5 a48e8b5878f221694983747e60973662 mod_ssl-2.8.8-1.3.24.tar.gz 752322
diff --git a/net-www/apache/files/digest-apache-1.3.24-r6 b/net-www/apache/files/digest-apache-1.3.24-r6
deleted file mode 100644
index 770251a0ba76..000000000000
--- a/net-www/apache/files/digest-apache-1.3.24-r6
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 ebea6588c3954731fcc318d29bc82409 apache_1.3.24.tar.gz 2232504
-MD5 a48e8b5878f221694983747e60973662 mod_ssl-2.8.8-1.3.24.tar.gz 752322
diff --git a/net-www/apache/files/digest-apache-1.3.26 b/net-www/apache/files/digest-apache-1.3.26
deleted file mode 100644
index 432745645e77..000000000000
--- a/net-www/apache/files/digest-apache-1.3.26
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 52e9b875597a208fca9d393e710087b6 apache_1.3.26.tar.gz 2303147
-MD5 aad438a4eaeeee29ae74483f7afe9db0 mod_ssl-2.8.9-1.3.26.tar.gz 752613
diff --git a/net-www/apache/files/digest-apache-1.3.26-r1 b/net-www/apache/files/digest-apache-1.3.26-r1
deleted file mode 100644
index 432745645e77..000000000000
--- a/net-www/apache/files/digest-apache-1.3.26-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 52e9b875597a208fca9d393e710087b6 apache_1.3.26.tar.gz 2303147
-MD5 aad438a4eaeeee29ae74483f7afe9db0 mod_ssl-2.8.9-1.3.26.tar.gz 752613
diff --git a/net-www/apache/files/digest-apache-1.3.26-r2 b/net-www/apache/files/digest-apache-1.3.26-r2
deleted file mode 100644
index 432745645e77..000000000000
--- a/net-www/apache/files/digest-apache-1.3.26-r2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 52e9b875597a208fca9d393e710087b6 apache_1.3.26.tar.gz 2303147
-MD5 aad438a4eaeeee29ae74483f7afe9db0 mod_ssl-2.8.9-1.3.26.tar.gz 752613