From c55cb30b59b2f26fdeae357ede666e28ef23a324 Mon Sep 17 00:00:00 2001
From: geos_one <geos_one@6952d904-891a-0410-993b-d76249ca496b>
Date: Sat, 30 Aug 2008 10:49:07 +0000
Subject: [PATCH] delete old

git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/linamh@482 6952d904-891a-0410-993b-d76249ca496b
---
 eclass/apache-2.eclass                      | 584 --------------------
 www-servers/apache/ChangeLog                |  45 --
 www-servers/apache/Manifest                 |  10 -
 www-servers/apache/apache-2.2.8-r102.ebuild | 178 ------
 www-servers/apache/apache-2.2.8-r103.ebuild | 178 ------
 www-servers/apache/apache-2.2.9-r100.ebuild | 110 ----
 www-servers/apache/metadata.xml             |   5 -
 7 files changed, 1110 deletions(-)
 delete mode 100644 eclass/apache-2.eclass
 delete mode 100644 www-servers/apache/ChangeLog
 delete mode 100644 www-servers/apache/Manifest
 delete mode 100644 www-servers/apache/apache-2.2.8-r102.ebuild
 delete mode 100644 www-servers/apache/apache-2.2.8-r103.ebuild
 delete mode 100644 www-servers/apache/apache-2.2.9-r100.ebuild
 delete mode 100644 www-servers/apache/metadata.xml

diff --git a/eclass/apache-2.eclass b/eclass/apache-2.eclass
deleted file mode 100644
index 26cf28d5..00000000
--- a/eclass/apache-2.eclass
+++ /dev/null
@@ -1,584 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/apache-2.eclass,v 1.11 2008/03/23 13:03:53 hollow Exp $
-
-# @ECLASS: apache-2.eclass
-# @MAINTAINER:
-# apache-devs@gentoo.org
-# @BLURB: Provides a common set of functions for apache-2.x ebuilds
-# @DESCRIPTION:
-# This eclass handles apache-2.x ebuild functions such as LoadModule generation
-# and inter-module dependency checking.
-
-inherit autotools confutils eutils flag-o-matic multilib
-
-# ==============================================================================
-# INTERNAL VARIABLES
-# ==============================================================================
-
-# @ECLASS-VARIABLE: GENTOO_PATCHNAME
-# @DESCRIPTION:
-# This internal variable contains the prefix for the patch tarball
-GENTOO_PATCHNAME="gentoo-${PF}"
-
-# @ECLASS-VARIABLE: GENTOO_PATCHDIR
-# @DESCRIPTION:
-# This internal variable contains the working directory where patches and config
-# files are located
-GENTOO_PATCHDIR="${WORKDIR}/${GENTOO_PATCHNAME}"
-
-# @VARIABLE: GENTOO_DEVELOPER
-# @DESCRIPTION:
-# This variable needs to be set in the ebuild and contains the name of the
-# gentoo developer who created the patch tarball
-
-# @VARIABLE: GENTOO_PATCHSTAMP
-# @DESCRIPTION:
-# This variable needs to be set in the ebuild and contains the date the patch
-# tarball was created at in YYYYMMDD format
-
-SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2
-	http://dev.gentoo.org/~${GENTOO_DEVELOPER}/dist/apache/${GENTOO_PATCHNAME}-${GENTOO_PATCHSTAMP}.tar.bz2
-	http://ftp.mars.arge.at/pub/${GENTOO_PATCHNAME}-${GENTOO_PATCHSTAMP}.tar.bz2"
-
-# @VARIABLE: IUSE_MPMS_FORK
-# @DESCRIPTION:
-# This variable needs to be set in the ebuild and contains a list of forking
-# (i.e.  non-threaded) MPMs
-
-# @VARIABLE: IUSE_MPMS_THREAD
-# @DESCRIPTION:
-# This variable needs to be set in the ebuild and contains a list of threaded
-# MPMs
-
-# @VARIABLE: IUSE_MODULES
-# @DESCRIPTION:
-# This variable needs to be set in the ebuild and contains a list of available
-# built-in modules
-
-IUSE_MPMS="${IUSE_MPMS_FORK} ${IUSE_MPMS_THREAD}"
-IUSE="${IUSE} debug doc mozldap ldap selinux ssl static suexec threads"
-
-for module in ${IUSE_MODULES} ; do
-	IUSE="${IUSE} apache2_modules_${module}"
-done
-
-for mpm in ${IUSE_MPMS} ; do
-	IUSE="${IUSE} apache2_mpms_${mpm}"
-done
-
-DEPEND="dev-lang/perl
-	=dev-libs/apr-1*
-	=dev-libs/apr-util-1*
-	dev-libs/libpcre
-	ldap? ( =net-nds/openldap-2* )
-	mozldap? ( =dev-libs/mozldap-6* )
-	selinux? ( sec-policy/selinux-apache )
-	ssl? ( >=dev-libs/openssl-0.9.8f )
-	!=www-servers/apache-1*"
-RDEPEND="${DEPEND}"
-PDEPEND="~app-admin/apache-tools-${PV}"
-
-S="${WORKDIR}/httpd-${PV}"
-
-# ==============================================================================
-# INTERNAL FUNCTIONS
-# ==============================================================================
-
-# @ECLASS-VARIABLE: MY_MPM
-# @DESCRIPTION:
-# This internal variable contains the selected MPM after a call to setup_mpm()
-
-# @FUNCTION: setup_mpm
-# @DESCRIPTION:
-# This internal function makes sure that only one of APACHE2_MPMS was selected
-# or a default based on USE=threads is selected if APACHE2_MPMS is empty
-setup_mpm() {
-	MY_MPM=""
-	for x in ${IUSE_MPMS} ; do
-		if use apache2_mpms_${x} ; then
-			if [[ -z "${MY_MPM}" ]] ; then
-				MY_MPM=${x}
-				elog
-				elog "Selected MPM: ${MY_MPM}"
-				elog
-			else
-				eerror "You have selected more then one mpm USE-flag."
-				eerror "Only one MPM is supported."
-				die "more then one mpm was specified"
-			fi
-		fi
-	done
-
-	if [[ -z "${MY_MPM}" ]] ; then
-		if use threads ; then
-			MY_MPM=worker
-			elog
-			elog "Selected default threaded MPM: ${MY_MPM}"
-			elog
-		else
-			MY_MPM=prefork
-			elog
-			elog "Selected default MPM: ${MY_MPM}"
-			elog
-		fi
-	fi
-
-	if has ${MY_MPM} ${IUSE_MPMS_THREAD} && ! use threads ; then
-		eerror "You have selected a threaded MPM but USE=threads is disabled"
-		die "invalid use flag combination"
-	fi
-
-	if has ${MY_MPM} ${IUSE_MPMS_FORK} && use threads ; then
-		eerror "You have selected a non-threaded MPM but USE=threads is enabled"
-		die "invalid use flag combination"
-	fi
-}
-
-# @VARIABLE: MODULE_CRITICAL
-# @DESCRIPTION:
-# This variable needs to be set in the ebuild and contains a space-separated
-# list of modules critical for the default apache. A user may still
-# disable these modules for custom minimal installation at their own risk.
-
-# @FUNCTION: check_module_critical
-# @DESCRIPTION:
-# This internal function warns the user about modules critical for the default
-# apache configuration.
-check_module_critical() {
-	local unsupported=0
-
-	for m in ${MODULE_CRITICAL} ; do
-		if ! has ${m} ${MY_MODS} ; then
-			ewarn "Module '${m}' is required in the default apache configuration."
-			unsupported=1
-		fi
-	done
-
-	if [[ ${unsupported} -ne 0 ]] ; then
-		ewarn
-		ewarn "You have disabled one or more required modules"
-		ewarn "for the default apache configuration."
-		ewarn "Although this is not an error, please be"
-		ewarn "aware that this setup is UNSUPPORTED."
-		ewarn
-		ebeep 10
-	fi
-}
-
-# @VARIABLE: MODULE_DEPENDS
-# @DESCRIPTION:
-# This variable needs to be set in the ebuild and contains a space-separated
-# list of dependency tokens each with a module and the module it depends on
-# separated by a colon
-
-# @FUNCTION: check_module_depends
-# @DESCRIPTION:
-# This internal function makes sure that all inter-module dependencies are
-# satisfied with the current module selection
-check_module_depends() {
-	local err=0
-
-	for m in ${MY_MODS} ; do
-		for dep in ${MODULE_DEPENDS} ; do
-			if [[ "${m}" == "${dep%:*}" ]] ; then
-				if ! use apache2_modules_${dep#*:} ; then
-					eerror "Module '${m}' depends on '${dep#*:}'"
-					err=1
-				fi
-			fi
-		done
-	done
-
-	if [[ ${err} -ne 0 ]] ; then
-		die "invalid use flag combination"
-	fi
-}
-
-# @ECLASS-VARIABLE: MY_CONF
-# @DESCRIPTION:
-# This internal variable contains the econf options for the current module
-# selection after a call to setup_modules()
-
-# @ECLASS-VARIABLE: MY_MODS
-# @DESCRIPTION:
-# This internal variable contains a sorted, space separated list of currently
-# selected modules after a call to setup_modules()
-
-# @FUNCTION: setup_modules
-# @DESCRIPTION:
-# This internal function selects all built-in modules based on USE flags and
-# APACHE2_MODULES USE_EXPAND flags
-setup_modules() {
-	local mod_type=
-
-	if use static ; then
-		mod_type="static"
-	else
-		mod_type="shared"
-	fi
-
-	MY_CONF="--enable-so=static"
-
-	if use ldap && use mozldap ; then
-                eerror "you cant activate ldap & mozldap at the same time "
-                eerror "plz deactivate \"www-servers/apache -ldap mozldap\" one in"
-                eerror "\"etc/portage/package.use\" ;p"
-                die "ldap and mozldap USE conflict"
-        fi
-	
-	if use ldap ; then
-		confutils_use_depend_built_with_all ldap dev-libs/apr-util ldap
-		MY_CONF="${MY_CONF} --enable-authnz_ldap=${mod_type} --enable-ldap=${mod_type}"
-		MY_MODS="${MY_MODS} ldap authnz_ldap"
-	else
-		MY_CONF="${MY_CONF} --disable-authnz_ldap --disable-ldap"
-	fi
-
-	if use mozldap ; then
-		confutils_use_depend_built_with_all mozldap dev-libs/apr-util mozldap
-		MY_CONF="${MY_CONF} --enable-authnz_ldap=${mod_type} --enable-ldap=${mod_type}"
-		MY_MODS="${MY_MODS} ldap authnz_ldap"
-	else
-		MY_CONF="${MY_CONF} --disable-authnz_ldap --disable-ldap"
-	fi
-
-	if use ssl ; then
-		MY_CONF="${MY_CONF} --with-ssl=/usr --enable-ssl=${mod_type}"
-		MY_MODS="${MY_MODS} ssl"
-	else
-		MY_CONF="${MY_CONF} --without-ssl --disable-ssl"
-	fi
-
-	if use threads || has ${MY_MPM} ${IUSE_MPMS_THREAD} ; then
-		MY_CONF="${MY_CONF} --enable-cgid=${mod_type}"
-		MY_MODS="${MY_MODS} cgid"
-	else
-		MY_CONF="${MY_CONF} --enable-cgi=${mod_type}"
-		MY_MODS="${MY_MODS} cgi"
-	fi
-
-	if use suexec ; then
-		elog "You can manipulate several configure options of suexec"
-		elog "through the following environment variables:"
-		elog
-		elog " SUEXEC_SAFEPATH: Default PATH for suexec (default: /usr/local/bin:/usr/bin:/bin)"
-		elog "  SUEXEC_LOGFILE: Path to the suexec logfile (default: /var/log/apache2/suexec_log)"
-		elog "   SUEXEC_CALLER: Name of the user Apache is running as (default: apache)"
-		elog "  SUEXEC_DOCROOT: Directory in which suexec will run scripts (default: /var/www)"
-		elog "   SUEXEC_MINUID: Minimum UID, which is allowed to run scripts via suexec (default: 1000)"
-		elog "   SUEXEC_MINGID: Minimum GID, which is allowed to run scripts via suexec (default: 100)"
-		elog "  SUEXEC_USERDIR: User subdirectories (like /home/user/html) (default: public_html)"
-		elog "    SUEXEC_UMASK: Umask for the suexec process (default: 077)"
-		elog
-
-		MY_CONF="${MY_CONF} --with-suexec-safepath=${SUEXEC_SAFEPATH:-/usr/local/bin:/usr/bin:/bin}"
-		MY_CONF="${MY_CONF} --with-suexec-logfile=${SUEXEC_LOGFILE:-/var/log/apache2/suexec_log}"
-		MY_CONF="${MY_CONF} --with-suexec-bin=/usr/sbin/suexec"
-		MY_CONF="${MY_CONF} --with-suexec-userdir=${SUEXEC_USERDIR:-public_html}"
-		MY_CONF="${MY_CONF} --with-suexec-caller=${SUEXEC_CALLER:-apache}"
-		MY_CONF="${MY_CONF} --with-suexec-docroot=${SUEXEC_DOCROOT:-/var/www}"
-		MY_CONF="${MY_CONF} --with-suexec-uidmin=${SUEXEC_MINUID:-1000}"
-		MY_CONF="${MY_CONF} --with-suexec-gidmin=${SUEXEC_MINGID:-100}"
-		MY_CONF="${MY_CONF} --with-suexec-umask=${SUEXEC_UMASK:-077}"
-		MY_CONF="${MY_CONF} --enable-suexec=${mod_type}"
-		MY_MODS="${MY_MODS} suexec"
-	else
-		MY_CONF="${MY_CONF} --disable-suexec"
-	fi
-
-	for x in ${IUSE_MODULES} ; do
-		if use apache2_modules_${x} ; then
-			MY_CONF="${MY_CONF} --enable-${x}=${mod_type}"
-			MY_MODS="${MY_MODS} ${x}"
-		else
-			MY_CONF="${MY_CONF} --disable-${x}"
-		fi
-	done
-
-	# sort and uniquify MY_MODS
-	MY_MODS=$(echo ${MY_MODS} | tr ' ' '\n' | sort -u)
-	check_module_depends
-	check_module_critical
-}
-
-# @VARIABLE: MODULE_DEFINES
-# @DESCRIPTION:
-# This variable needs to be set in the ebuild and contains a space-separated
-# list of tokens each mapping a module to a runtime define which can be
-# specified in APACHE2_OPTS in /etc/conf.d/apache2 to enable this particular
-# module.
-
-# @FUNCTION: generate_load_module
-# @DESCRIPTION:
-# This internal function generates the LoadModule lines for httpd.conf based on
-# the current module selection and MODULE_DEFINES
-generate_load_module() {
-	local endit=0 mod_lines= mod_dir="${D}/usr/$(get_libdir)/apache2/modules"
-
-	if use static; then
-		sed -i -e "/%%LOAD_MODULE%%/d" \
-			"${GENTOO_PATCHDIR}"/conf/httpd.conf
-		return
-	fi
-
-	for m in ${MY_MODS} ; do
-		if [[ -e "${mod_dir}/mod_${m}.so" ]] ; then
-			for def in ${MODULE_DEFINES} ; do
-				if [[ "${m}" == "${def%:*}" ]] ; then
-					mod_lines="${mod_lines}\n<IfDefine ${def#*:}>"
-					endit=1
-				fi
-			done
-
-			mod_lines="${mod_lines}\nLoadModule ${m}_module modules/mod_${m}.so"
-
-			if [[ ${endit} -ne 0 ]] ; then
-				mod_lines="${mod_lines}\n</IfDefine>"
-				endit=0
-			fi
-		fi
-	done
-
-	sed -i -e "s:%%LOAD_MODULE%%:${mod_lines}:" \
-		"${GENTOO_PATCHDIR}"/conf/httpd.conf
-}
-
-# @FUNCTION: check_upgrade
-# @DESCRIPTION:
-# This internal function checks if the previous configuration file for built-in
-# modules exists in ROOT and prevents upgrade in this case. Users are supposed
-# to convert this file to the new APACHE2_MODULES USE_EXPAND variable and remove
-# it afterwards.
-check_upgrade() {
-	if [[ -e "${ROOT}"etc/apache2/apache2-builtin-mods ]]; then
-		eerror "The previous configuration file for built-in modules"
-		eerror "(${ROOT}etc/apache2/apache2-builtin-mods) exists on your"
-		eerror "system."
-		eerror
-		eerror "Please read http://www.gentoo.org/doc/en/apache-upgrading.xml"
-		eerror "for detailed information how to convert this file to the new"
-		eerror "APACHE2_MODULES USE_EXPAND variable."
-		eerror
-		die "upgrade not possible with existing ${ROOT}etc/apache2/apache2-builtin-mods"
-	fi
-}
-
-# ==============================================================================
-# EXPORTED FUNCTIONS
-# ==============================================================================
-
-# @FUNCTION: apache-2_pkg_setup
-# @DESCRIPTION:
-# This function selects built-in modules, the MPM and other configure options,
-# creates the apache user and group and informs about CONFIG_SYSVIPC being
-# needed (we don't depend on kernel sources and therefore cannot check).
-apache-2_pkg_setup() {
-	check_upgrade
-
-	# setup apache user and group
-	enewgroup apache 81
-	enewuser apache 81 -1 /var/www apache
-
-	setup_mpm
-	setup_modules
-
-	if use debug; then
-		MY_CONF="${MY_CONF} --enable-maintainer-mode --enable-exception-hook"
-	fi
-
-	elog "Please note that you need SysV IPC support in your kernel."
-	elog "Make sure CONFIG_SYSVIPC=y is set."
-	elog
-}
-
-# @FUNCTION: apache-2_src_unpack
-# @DESCRIPTION:
-# This function applies patches, configures a custom file-system layout and
-# rebuilds the configure scripts.
-apache-2_src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Use correct multilib libdir in gentoo patches
-	sed -i -e "s:/usr/lib:/usr/$(get_libdir):g" \
-		"${GENTOO_PATCHDIR}"/{conf/httpd.conf,init/*,patches/config.layout} \
-		|| die "libdir sed failed"
-
-	epatch "${GENTOO_PATCHDIR}"/patches/*.patch
-
-	# setup the filesystem layout config
-	cat "${GENTOO_PATCHDIR}"/patches/config.layout >> "${S}"/config.layout || \
-		die "Failed preparing config.layout!"
-	sed -i -e "s:version:${PF}:g" "${S}"/config.layout
-
-	# apache2.8 instead of httpd.8 (bug #194828)
-	mv docs/man/{httpd,apache2}.8
-	sed -i -e 's/httpd\.8/apache2.8/g' Makefile.in
-
-	# patched-in MPMs need the build environment rebuilt
-	sed -i -e '/sinclude/d' configure.in
-	AT_GNUCONF_UPDATE=yes AT_M4DIR=build eautoreconf
-}
-
-# @FUNCTION: apache-2_src_compile
-# @DESCRIPTION:
-# This function adds compiler flags and runs econf and emake based on MY_MPM and
-# MY_CONF
-apache-2_src_compile() {
-	# Instead of filtering --as-needed (bug #128505), append --no-as-needed
-	# Thanks to Harald van Dijk
-	append-ldflags -Wl,--no-as-needed
-
-	# peruser MPM debugging with -X is nearly impossible
-	if has peruser ${IUSE_MPMS} && use apache2_mpms_peruser ; then
-		use debug && append-flags -DMPM_PERUSER_DEBUG
-	fi
-
-	# econf overwrites the stuff from config.layout, so we have to put them into
-	# our myconf line too
-	econf \
-		--includedir=/usr/include/apache2 \
-		--libexecdir=/usr/$(get_libdir)/apache2/modules \
-		--datadir=/var/www/localhost \
-		--sysconfdir=/etc/apache2 \
-		--localstatedir=/var \
-		--with-mpm=${MY_MPM} \
-		--with-perl=/usr/bin/perl \
-		--with-apr=/usr \
-		--with-apr-util=/usr \
-		--with-pcre=/usr \
-		--with-z=/usr \
-		--with-port=80 \
-		--with-program-name=apache2 \
-		--enable-layout=Gentoo \
-		${MY_CONF} || die "econf failed!"
-
-	sed -i -e 's:apache2\.conf:httpd.conf:' include/ap_config_auto.h
-
-	emake || die "emake failed"
-}
-
-# @FUNCTION: apache-2_src_install
-# @DESCRIPTION:
-# This function runs `emake install' and generates, installs and adapts the gentoo
-# specific configuration files found in the tarball
-apache-2_src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-
-	# install our configuration files
-	keepdir /etc/apache2/vhosts.d
-	keepdir /etc/apache2/modules.d
-
-	generate_load_module
-	insinto /etc/apache2
-	doins -r "${GENTOO_PATCHDIR}"/conf/*
-	doins docs/conf/magic
-
-	insinto /etc/logrotate.d
-	newins "${GENTOO_PATCHDIR}"/scripts/apache2-logrotate apache2
-
-	# generate a sane default APACHE2_OPTS
-	APACHE2_OPTS="-D DEFAULT_VHOST -D INFO -D LANGUAGE"
-	use doc && APACHE2_OPTS="${APACHE2_OPTS} -D MANUAL"
-	use ssl && APACHE2_OPTS="${APACHE2_OPTS} -D SSL -D SSL_DEFAULT_VHOST"
-	use suexec && APACHE2_OPTS="${APACHE2_OPTS} -D SUEXEC"
-
-	sed -i -e "s:APACHE2_OPTS=\".*\":APACHE2_OPTS=\"${APACHE2_OPTS}\":" \
-		"${GENTOO_PATCHDIR}"/init/apache2.confd || die "sed failed"
-
-	newconfd "${GENTOO_PATCHDIR}"/init/apache2.confd apache2
-	newinitd "${GENTOO_PATCHDIR}"/init/apache2.initd apache2
-
-	# link apache2ctl to the init script
-	dosym /etc/init.d/apache2 /usr/sbin/apache2ctl
-
-	# provide legacy symlink for apxs, bug 177697
-	dosym /usr/sbin/apxs /usr/sbin/apxs2
-
-	# install some thirdparty scripts
-	exeinto /usr/sbin
-	use ssl && doexe "${GENTOO_PATCHDIR}"/scripts/gentestcrt.sh
-
-	# install some documentation
-	dodoc ABOUT_APACHE CHANGES LAYOUT README README.platforms VERSIONING
-	dodoc "${GENTOO_PATCHDIR}"/docs/*
-
-	# drop in a convenient link to the manual
-	if use doc ; then
-		sed -i -e "s:VERSION:${PVR}:" "${D}/etc/apache2/modules.d/00_apache_manual.conf"
-	else
-		rm -f "${D}/etc/apache2/modules.d/00_apache_manual.conf"
-		rm -Rf "${D}/usr/share/doc/${PF}/manual"
-	fi
-
-	# the default webroot gets stored in /usr/share/${PF}/webroot
-	ebegin "Installing default webroot to /usr/share/${PF}/webroot"
-	dodir /usr/share/${PF}
-	mv -f "${D}/var/www/localhost" "${D}/usr/share/${PF}/webroot"
-	eend $?
-
-	# set some sane permissions for suexec
-	if use suexec ; then
-		fowners 0:apache /usr/sbin/suexec
-		fperms 4710 /usr/sbin/suexec
-		# provide legacy symlink for suexec, bug 177697
-		dosym /usr/sbin/suexec /usr/sbin/suexec2
-	fi
-
-	# empty dirs
-	for i in /var/lib/dav /var/log/apache2 /var/cache/apache2 ; do
-		keepdir ${i}
-		fowners apache:apache ${i}
-		fperms 0755 ${i}
-	done
-
-	# we need /etc/apache2/ssl if USE=ssl
-	use ssl && keepdir /etc/apache2/ssl
-}
-
-# @FUNCTION: apache-2_pkg_postinst
-# @DESCRIPTION:
-# This function creates test certificates if SSL is enabled and installs the
-# default webroot to /var/www/localhost if it does not exist. We do this here
-# because the default webroot is a copy of the files that exist elsewhere and we
-# don't want them to be managed/removed by portage when apache is upgraded.
-apache-2_pkg_postinst() {
-	einfo
-
-	if use ssl && [[ ! -e "${ROOT}/etc/apache2/ssl/server.crt" ]] ; then
-		cd "${ROOT}"/etc/apache2/ssl
-		einfo "Generating self-signed test certificate in ${ROOT}etc/apache2/ssl ..."
-		yes "" 2>/dev/null | \
-			"${ROOT}"/usr/sbin/gentestcrt.sh >/dev/null 2>&1 || \
-			die "gentestcrt.sh failed"
-		einfo
-	fi
-
-	if [[ -e "${ROOT}/var/www/localhost" ]] ; then
-		elog "The default webroot has not been installed into"
-		elog "${ROOT}var/www/localhost because the directory already exists"
-		elog "and we do not want to overwrite any files you have put there."
-		elog
-		elog "If you would like to install the latest webroot, please run"
-		elog "emerge --config =${PF}"
-		elog
-	else
-		einfo "Installing default webroot to ${ROOT}var/www/localhost"
-		mkdir -p "${ROOT}"/var/www/localhost
-		cp -R "${ROOT}"/usr/share/${PF}/webroot/* "${ROOT}"/var/www/localhost/
-		einfo
-	fi
-}
-
-# @FUNCTION: apache-2_pkg_config
-# @DESCRIPTION:
-# This function installs -- and overwrites -- the default webroot to
-# /var/www/localhost
-apache-2_pkg_config() {
-	einfo "Installing default webroot to ${ROOT}var/www/localhost"
-	mkdir -p "${ROOT}"/var/www/localhost
-	cp -R "${ROOT}"/usr/share/${PF}/webroot/* "${ROOT}"/var/www/localhost/
-}
-
-EXPORT_FUNCTIONS pkg_setup src_unpack src_compile src_install pkg_postinst pkg_config
diff --git a/www-servers/apache/ChangeLog b/www-servers/apache/ChangeLog
deleted file mode 100644
index 368ed564..00000000
--- a/www-servers/apache/ChangeLog
+++ /dev/null
@@ -1,45 +0,0 @@
-# ChangeLog for www-servers/apache
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-  16 Jun 2008; Mario Fetka <mario-fetka@gmx.at> +apache-2.2.9-r100.ebuild:
-  Bump
-
-  11 Jun 2008; Mario Fetka <mario-fetka@gmx.at>
-  -files/apache-2.2.6-r102.patch, -apache-2.2.6-r99.ebuild,
-  -apache-2.2.6-r102.ebuild, -apache-2.2.6-r103.ebuild,
-  -apache-2.2.6-r107.ebuild, -apache-2.2.8.ebuild,
-  -apache-2.2.8-r100.ebuild:
-  Delete relicts
-
-  11 Jun 2008; Mario Fetka <mario-fetka@gmx.at> +apache-2.2.8-r103.ebuild:
-  Bump to r3
-
-  28 Mar 2008; Mario Fetka <mario-fetka@gmx.at> +apache-2.2.8.ebuild,
-  +apache-2.2.8-r102.ebuild:
-  Bump
-
-  19 Jan 2008; Mario Fetka <mario-fetka@gmx.at> apache-2.2.8-r100.ebuild:
-  correct typo
-
-  19 Jan 2008; Mario Fetka <mario-fetka@gmx.at> +apache-2.2.8-r100.ebuild:
-  bump
-
-  16 Jan 2008; Mario Fetka <mario-fetka@gmx.at> apache-2.2.6-r107.ebuild:
-  correct IUSE mozldap
-
-  13 Jan 2008; Mario Fetka <mario-fetka@gmx.at> +apache-2.2.6-r107.ebuild:
-  Bump mozpatch to new apache build system
-
-  11 Nov 2007; Mario Fetka <mario-fetka@gmx.at>
-  files/apache-2.2.6-r102.patch, +apache-2.2.6-r103.ebuild:
-  bump
-
-  21 Oct 2007; Mario Fetka <mario-fetka@gmx.at>
-  +files/apache-2.2.6-r102.patch, +apache-2.2.6-r102.ebuild:
-  update to latest apache
-
-  05 Oct 2007; Mario Fetka <mario-fetka@gmx.at> ++, ++, +metadata.xml,
-  -apache-2.2.6-r2.ebuild:
-  add mozldap support
-
diff --git a/www-servers/apache/Manifest b/www-servers/apache/Manifest
deleted file mode 100644
index e9f652c8..00000000
--- a/www-servers/apache/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-DIST gentoo-apache-2.2.8-r102-20080322.tar.bz2 60079 RMD160 18b26ce4133af24ed2c325db9e22a119b097a057 SHA1 6c4adfbb495b05d21373817a118eac6c8ff45c18 SHA256 4148cc6af2c6bd4a82149b8edebae38460ccf6d80426d9ee6dda0051f2324a9a
-DIST gentoo-apache-2.2.8-r103-20080601.tar.bz2 60597 RMD160 7fbf5a9cece5ff12994115c063dd5842616b8233 SHA1 a6fa2e6443b1131074486543aef3d163cece6413 SHA256 9742fc37174cf08401f05f56e9feae6d05bbef0731018aa183630be2ae4c9f37
-DIST gentoo-apache-2.2.9-r100-20080615.tar.bz2 60202 RMD160 a6a715bcf9ff5ebf8d8339ec8fb8b5230a008224 SHA1 042cd7a947f85023fdbd5b52f65878a04dcb4df6 SHA256 3add1a6966c73bc19935f73bc1bcb52cba506634f09abf457c5903a0c9f12991
-DIST httpd-2.2.8.tar.bz2 4799055 RMD160 0736ea9617bafaa1c8cd34ce4fc1c7a659afea57 SHA1 5074904435d3d942ce2dc96c44b07294b8eaca77 SHA256 2ad8d0db1e478838ba88a0ddaf538c7150027d937b017739fdcb3fabb96ebd39
-DIST httpd-2.2.9.tar.bz2 4943462 RMD160 8fd62ae78271aa0ded6ba2f5bfeea8c63b79060a SHA1 71715d81e7a5ace4499803df7369c78b85251083 SHA256 d76599fbcf8b3bcff2779f880fb10e4a2bc4af60f64232083c06863e40850b61
-EBUILD apache-2.2.8-r102.ebuild 5230 RMD160 d8a79cbc1253739795e1216aedf7b5561bcc00ae SHA1 1bd7106850df504cca69cb1afaf087ccae02b22e SHA256 45617eac919d7a72bf4a507fe411d67593cd8dd66a52cfa864123222449191f2
-EBUILD apache-2.2.8-r103.ebuild 5245 RMD160 bc51c57f335f04f2c871120be499a4034510273b SHA1 ba66a1ac206062bd4a3a4d565835c442adf435ae SHA256 eb98e1b0492e66b8c5ed171b8ca03ff6f3a2eaa7270af36499d8d7826532d2b2
-EBUILD apache-2.2.9-r100.ebuild 2758 RMD160 7c26ca1d95d32d95ae5837d07e6f43233d11659d SHA1 cdc1d83a6cb6effa9a262b61bd20694e43a5426a SHA256 f8059cf3e03879f00e4a6eb9101bf8647a3d3bff7256041670e52220bb000172
-MISC ChangeLog 1423 RMD160 298e8cd46302b7f3093e3ff6d7467bb5954a3537 SHA1 be9688e2140543bd1e1d6d0b5494ba7daf5210bc SHA256 38892dc7266de4610dd852166bb3425d7f59f512785e59f2082558bf4e23dded
-MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
diff --git a/www-servers/apache/apache-2.2.8-r102.ebuild b/www-servers/apache/apache-2.2.8-r102.ebuild
deleted file mode 100644
index 4d33b9f8..00000000
--- a/www-servers/apache/apache-2.2.8-r102.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.2.8-r2.ebuild,v 1.1 2008/03/22 15:45:21 hollow Exp $
-
-# latest gentoo apache files
-GENTOO_PATCHSTAMP="20080322"
-GENTOO_DEVELOPER="hollow"
-
-# IUSE/USE_EXPAND magic
-IUSE_MPMS_FORK="itk peruser prefork"
-IUSE_MPMS_THREAD="event worker"
-
-IUSE_MODULES="actions alias asis auth_basic auth_digest authn_alias authn_anon
-authn_dbd authn_dbm authn_default authn_file authz_dbm authz_default
-authz_groupfile authz_host authz_owner authz_user autoindex cache cern_meta
-charset_lite dav dav_fs dav_lock dbd deflate dir disk_cache dumpio env expires
-ext_filter file_cache filter headers ident imagemap include info log_config
-log_forensic logio mem_cache mime mime_magic negotiation proxy proxy_ajp
-proxy_balancer proxy_connect proxy_ftp proxy_http rewrite setenvif speling
-status unique_id userdir usertrack version vhost_alias"
-
-# inter-module dependencies
-# TODO: this may still be incomplete
-MODULE_DEPENDS="
-	dav_fs:dav
-	dav_lock:dav
-	deflate:filter
-	disk_cache:cache
-	ext_filter:filter
-	file_cache:cache
-	log_forensic:log_config
-	logio:log_config
-	mem_cache:cache
-	mime_magic:mime
-	proxy_ajp:proxy
-	proxy_balancer:proxy
-	proxy_connect:proxy
-	proxy_ftp:proxy
-	proxy_http:proxy
-	usertrack:unique_id
-"
-
-# module<->define mappings
-MODULE_DEFINES="
-	auth_digest:AUTH_DIGEST
-	authnz_ldap:AUTHNZ_LDAP
-	cache:CACHE
-	dav:DAV
-	dav_fs:DAV
-	dav_lock:DAV
-	disk_cache:CACHE
-	file_cache:CACHE
-	info:INFO
-	ldap:LDAP
-	mem_cache:CACHE
-	proxy:PROXY
-	proxy_ajp:PROXY
-	proxy_balancer:PROXY
-	proxy_connect:PROXY
-	proxy_ftp:PROXY
-	proxy_http:PROXY
-	ssl:SSL
-	status:STATUS
-	suexec:SUEXEC
-	userdir:USERDIR
-"
-
-# critical modules for the default config
-MODULE_CRITICAL="
-	authz_host
-	dir
-	mime
-"
-
-inherit apache-2
-
-DESCRIPTION="The Apache Web Server."
-HOMEPAGE="http://httpd.apache.org/"
-
-# some helper scripts are apache-1.1, thus both are here
-LICENSE="Apache-2.0 Apache-1.1"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="sni"
-
-DEPEND="${DEPEND}
-	apache2_modules_deflate? ( sys-libs/zlib )"
-
-RDEPEND="${RDEPEND}
-	apache2_modules_mime? ( app-misc/mime-types )"
-
-src_unpack() {
-	if ! use sni ; then
-		EPATCH_EXCLUDE="04_all_mod_ssl_tls_sni.patch"
-	fi
-
-	apache-2_src_unpack
-}
-
-pkg_postinst() {
-	apache-2_pkg_postinst
-
-	# previous installations of apache-2.2 installed the upstream configuration
-	# files, which shouldn't even have been installed!
-	if has_version '>=www-servers/apache-2.2.4' ; then
-		if [[ -f "${ROOT}"etc/apache2/apache2.conf ]] ; then
-			rm -f "${ROOT}"/etc/apache2/apache2.conf >/dev/null 2>&1
-		fi
-
-		for i in extra original ; do
-			if [[ -d "${ROOT}"/etc/apache2/${i} ]] ; then
-				rm -rf "${ROOT}"/etc/apache2/${i} >/dev/null 2>&1
-			fi
-		done
-	fi
-
-	# note regarding IfDefine changes
-	if has_version '<www-servers/apache-2.2.6-r1' ; then
-		elog
-		elog "When upgrading from versions 2.2.6 or earlier, please be aware"
-		elog "that the define for mod_authnz_ldap has changed from AUTH_LDAP"
-		elog "to AUTHNZ_LDAP. Additionally mod_auth_digest needs to be enabled"
-		elog "with AUTH_DIGEST now."
-		elog
-	fi
-
-	# note the changes regarding DEFAULT_VHOST and SSL_DEFAULT_VHOST
-	if has_version '<www-servers/apache-2.2.4-r7' ; then
-		elog
-		elog "Listen directives have been moved into the default virtual host"
-		elog "configuation. At least DEFAULT_VHOST has been enabled for you"
-		elog "(depending on your USE-flags.)"
-		elog
-		elog "If you disable DEFAULT_VHOST or SSL_DEFAULT_VHOST, there will"
-		elog "be no listening sockets available."
-		elog
-	fi
-
-	# note the user of the config changes
-	if has_version '<www-servers/apache-2.2.4-r5' ; then
-		elog
-		elog "Please make sure that you update your /etc directory."
-		elog "Between the versions, we had to changes some config files"
-		elog "and move some stuff out of the main httpd.conf file to a seperate"
-		elog "modules.d entry."
-		elog
-		elog "Thus please update your /etc directory either via etc-update,"
-		elog "dispatch-conf or conf-update !"
-		elog
-	fi
-
-	# check for dual/upgrade install
-	if has_version '<www-servers/apache-2.2.0' ; then
-		elog
-		elog "When upgrading from versions below 2.2.0 to this version, you"
-		elog "need to rebuild all your modules. Please do so for your modules"
-		elog "to continue working correctly."
-		elog
-		elog "Also note that some configuration directives have been"
-		elog "split into their own files under ${ROOT}etc/apache2/modules.d/"
-		elog "and that some modules, foremost the authentication related ones,"
-		elog "have been renamed."
-		elog
-		elog "Some examples:"
-		elog "  - USERDIR is now configureable in ${ROOT}etc/apache2/modules.d/00_mod_userdir.conf."
-		elog
-		elog "For more information on what you may need to change, please"
-		elog "see the overview of changes at:"
-		elog "http://httpd.apache.org/docs/2.2/new_features_2_2.html"
-		elog "and the upgrading guide at:"
-		elog "http://httpd.apache.org/docs/2.2/upgrading.html"
-		elog
-	fi
-
-	# cleanup the vim backup files, placed in /etc/apache2 by the last
-	# patchtarball (gentoo-apache-2.2.4-r7-20070615)
-	rm -f "${ROOT}etc/apache2/modules.d/*.conf~"
-}
diff --git a/www-servers/apache/apache-2.2.8-r103.ebuild b/www-servers/apache/apache-2.2.8-r103.ebuild
deleted file mode 100644
index 28a33123..00000000
--- a/www-servers/apache/apache-2.2.8-r103.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.2.8-r3.ebuild,v 1.8 2008/06/07 14:04:00 aballier Exp $
-
-# latest gentoo apache files
-GENTOO_PATCHSTAMP="20080601"
-GENTOO_DEVELOPER="hollow"
-
-# IUSE/USE_EXPAND magic
-IUSE_MPMS_FORK="itk peruser prefork"
-IUSE_MPMS_THREAD="event worker"
-
-IUSE_MODULES="actions alias asis auth_basic auth_digest authn_alias authn_anon
-authn_dbd authn_dbm authn_default authn_file authz_dbm authz_default
-authz_groupfile authz_host authz_owner authz_user autoindex cache cern_meta
-charset_lite dav dav_fs dav_lock dbd deflate dir disk_cache dumpio env expires
-ext_filter file_cache filter headers ident imagemap include info log_config
-log_forensic logio mem_cache mime mime_magic negotiation proxy proxy_ajp
-proxy_balancer proxy_connect proxy_ftp proxy_http rewrite setenvif speling
-status substitute unique_id userdir usertrack version vhost_alias"
-
-# inter-module dependencies
-# TODO: this may still be incomplete
-MODULE_DEPENDS="
-	dav_fs:dav
-	dav_lock:dav
-	deflate:filter
-	disk_cache:cache
-	ext_filter:filter
-	file_cache:cache
-	log_forensic:log_config
-	logio:log_config
-	mem_cache:cache
-	mime_magic:mime
-	proxy_ajp:proxy
-	proxy_balancer:proxy
-	proxy_connect:proxy
-	proxy_ftp:proxy
-	proxy_http:proxy
-	substitute:filter
-"
-
-# module<->define mappings
-MODULE_DEFINES="
-	auth_digest:AUTH_DIGEST
-	authnz_ldap:AUTHNZ_LDAP
-	cache:CACHE
-	dav:DAV
-	dav_fs:DAV
-	dav_lock:DAV
-	disk_cache:CACHE
-	file_cache:CACHE
-	info:INFO
-	ldap:LDAP
-	mem_cache:CACHE
-	proxy:PROXY
-	proxy_ajp:PROXY
-	proxy_balancer:PROXY
-	proxy_connect:PROXY
-	proxy_ftp:PROXY
-	proxy_http:PROXY
-	ssl:SSL
-	status:STATUS
-	suexec:SUEXEC
-	userdir:USERDIR
-"
-
-# critical modules for the default config
-MODULE_CRITICAL="
-	authz_host
-	dir
-	mime
-"
-
-inherit apache-2
-
-DESCRIPTION="The Apache Web Server."
-HOMEPAGE="http://httpd.apache.org/"
-
-# some helper scripts are apache-1.1, thus both are here
-LICENSE="Apache-2.0 Apache-1.1"
-SLOT="2"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc ~sparc-fbsd x86 ~x86-fbsd"
-IUSE="sni"
-
-DEPEND="${DEPEND}
-	apache2_modules_deflate? ( sys-libs/zlib )"
-
-RDEPEND="${RDEPEND}
-	apache2_modules_mime? ( app-misc/mime-types )"
-
-src_unpack() {
-	if ! use sni ; then
-		EPATCH_EXCLUDE="04_all_mod_ssl_tls_sni.patch"
-	fi
-
-	apache-2_src_unpack
-}
-
-pkg_postinst() {
-	apache-2_pkg_postinst
-
-	# previous installations of apache-2.2 installed the upstream configuration
-	# files, which shouldn't even have been installed!
-	if has_version '>=www-servers/apache-2.2.4' ; then
-		if [[ -f "${ROOT}"etc/apache2/apache2.conf ]] ; then
-			rm -f "${ROOT}"/etc/apache2/apache2.conf >/dev/null 2>&1
-		fi
-
-		for i in extra original ; do
-			if [[ -d "${ROOT}"/etc/apache2/${i} ]] ; then
-				rm -rf "${ROOT}"/etc/apache2/${i} >/dev/null 2>&1
-			fi
-		done
-	fi
-
-	# note regarding IfDefine changes
-	if has_version '<www-servers/apache-2.2.6-r1' ; then
-		elog
-		elog "When upgrading from versions 2.2.6 or earlier, please be aware"
-		elog "that the define for mod_authnz_ldap has changed from AUTH_LDAP"
-		elog "to AUTHNZ_LDAP. Additionally mod_auth_digest needs to be enabled"
-		elog "with AUTH_DIGEST now."
-		elog
-	fi
-
-	# note the changes regarding DEFAULT_VHOST and SSL_DEFAULT_VHOST
-	if has_version '<www-servers/apache-2.2.4-r7' ; then
-		elog
-		elog "Listen directives have been moved into the default virtual host"
-		elog "configuation. At least DEFAULT_VHOST has been enabled for you"
-		elog "(depending on your USE-flags.)"
-		elog
-		elog "If you disable DEFAULT_VHOST or SSL_DEFAULT_VHOST, there will"
-		elog "be no listening sockets available."
-		elog
-	fi
-
-	# note the user of the config changes
-	if has_version '<www-servers/apache-2.2.4-r5' ; then
-		elog
-		elog "Please make sure that you update your /etc directory."
-		elog "Between the versions, we had to changes some config files"
-		elog "and move some stuff out of the main httpd.conf file to a seperate"
-		elog "modules.d entry."
-		elog
-		elog "Thus please update your /etc directory either via etc-update,"
-		elog "dispatch-conf or conf-update !"
-		elog
-	fi
-
-	# check for dual/upgrade install
-	if has_version '<www-servers/apache-2.2.0' ; then
-		elog
-		elog "When upgrading from versions below 2.2.0 to this version, you"
-		elog "need to rebuild all your modules. Please do so for your modules"
-		elog "to continue working correctly."
-		elog
-		elog "Also note that some configuration directives have been"
-		elog "split into their own files under ${ROOT}etc/apache2/modules.d/"
-		elog "and that some modules, foremost the authentication related ones,"
-		elog "have been renamed."
-		elog
-		elog "Some examples:"
-		elog "  - USERDIR is now configureable in ${ROOT}etc/apache2/modules.d/00_mod_userdir.conf."
-		elog
-		elog "For more information on what you may need to change, please"
-		elog "see the overview of changes at:"
-		elog "http://httpd.apache.org/docs/2.2/new_features_2_2.html"
-		elog "and the upgrading guide at:"
-		elog "http://httpd.apache.org/docs/2.2/upgrading.html"
-		elog
-	fi
-
-	# cleanup the vim backup files, placed in /etc/apache2 by the last
-	# patchtarball (gentoo-apache-2.2.4-r7-20070615)
-	rm -f "${ROOT}etc/apache2/modules.d/*.conf~"
-}
diff --git a/www-servers/apache/apache-2.2.9-r100.ebuild b/www-servers/apache/apache-2.2.9-r100.ebuild
deleted file mode 100644
index 17404c6f..00000000
--- a/www-servers/apache/apache-2.2.9-r100.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.2.9.ebuild,v 1.5 2008/06/16 07:21:15 opfer Exp $
-
-# latest gentoo apache files
-GENTOO_PATCHSTAMP="20080615"
-GENTOO_DEVELOPER="hollow"
-
-# IUSE/USE_EXPAND magic
-IUSE_MPMS_FORK="itk peruser prefork"
-IUSE_MPMS_THREAD="event worker"
-
-IUSE_MODULES="actions alias asis auth_basic auth_digest authn_alias authn_anon
-authn_dbd authn_dbm authn_default authn_file authz_dbm authz_default
-authz_groupfile authz_host authz_owner authz_user autoindex cache cern_meta
-charset_lite dav dav_fs dav_lock dbd deflate dir disk_cache dumpio env expires
-ext_filter file_cache filter headers ident imagemap include info log_config
-log_forensic logio mem_cache mime mime_magic negotiation proxy proxy_ajp
-proxy_balancer proxy_connect proxy_ftp proxy_http rewrite setenvif speling
-status substitute unique_id userdir usertrack version vhost_alias"
-
-# inter-module dependencies
-# TODO: this may still be incomplete
-MODULE_DEPENDS="
-	dav_fs:dav
-	dav_lock:dav
-	deflate:filter
-	disk_cache:cache
-	ext_filter:filter
-	file_cache:cache
-	log_forensic:log_config
-	logio:log_config
-	mem_cache:cache
-	mime_magic:mime
-	proxy_ajp:proxy
-	proxy_balancer:proxy
-	proxy_connect:proxy
-	proxy_ftp:proxy
-	proxy_http:proxy
-	substitute:filter
-"
-
-# module<->define mappings
-MODULE_DEFINES="
-	auth_digest:AUTH_DIGEST
-	authnz_ldap:AUTHNZ_LDAP
-	cache:CACHE
-	dav:DAV
-	dav_fs:DAV
-	dav_lock:DAV
-	disk_cache:CACHE
-	file_cache:CACHE
-	info:INFO
-	ldap:LDAP
-	mem_cache:CACHE
-	proxy:PROXY
-	proxy_ajp:PROXY
-	proxy_balancer:PROXY
-	proxy_connect:PROXY
-	proxy_ftp:PROXY
-	proxy_http:PROXY
-	ssl:SSL
-	status:STATUS
-	suexec:SUEXEC
-	userdir:USERDIR
-"
-
-# critical modules for the default config
-MODULE_CRITICAL="
-	authz_host
-	dir
-	mime
-"
-
-inherit apache-2
-
-DESCRIPTION="The Apache Web Server."
-HOMEPAGE="http://httpd.apache.org/"
-
-# some helper scripts are Apache-1.1, thus both are here
-LICENSE="Apache-2.0 Apache-1.1"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd x86 ~x86-fbsd"
-IUSE="sni"
-
-DEPEND="${DEPEND}
-	apache2_modules_deflate? ( sys-libs/zlib )"
-
-RDEPEND="${RDEPEND}
-	apache2_modules_mime? ( app-misc/mime-types )"
-
-src_unpack() {
-	if ! use sni ; then
-		EPATCH_EXCLUDE="04_all_mod_ssl_tls_sni.patch"
-	fi
-
-	apache-2_src_unpack
-}
-
-pkg_preinst() {
-	# note regarding IfDefine changes
-	if has_version "<${CATEGORY}/${PN}-2.2.6-r1"; then
-		elog
-		elog "When upgrading from versions 2.2.6 or earlier, please be aware"
-		elog "that the define for mod_authnz_ldap has changed from AUTH_LDAP"
-		elog "to AUTHNZ_LDAP. Additionally mod_auth_digest needs to be enabled"
-		elog "with AUTH_DIGEST now."
-		elog
-	fi
-}
diff --git a/www-servers/apache/metadata.xml b/www-servers/apache/metadata.xml
deleted file mode 100644
index 7e328698..00000000
--- a/www-servers/apache/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>maintainer-wanted</herd>
-</pkgmetadata>