Cleanup.

(Portage version: 2.1.2-r4)

18 files changed, 11 insertions, 535 deletions

diff --git a/dev-libs/apr/ChangeLog b/dev-libs/apr/ChangeLog
index e4d5ca202e60..011a1cae4e79 100644
--- a/dev-libs/apr/ChangeLog
+++ b/dev-libs/apr/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/apr
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr/ChangeLog,v 1.75 2007/01/21 15:27:39 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr/ChangeLog,v 1.76 2007/01/28 20:11:11 chtekk Exp $
+
+  28 Jan 2007; Luca Longinotti <chtekk@gentoo.org> metadata.xml,
+  -apr-0.9.6-r3.ebuild, -apr-0.9.6-r4.ebuild, -apr-0.9.7.ebuild,
+  -apr-1.2.2.ebuild, -apr-1.2.7.ebuild, -apr-1.2.7-r1.ebuild,
+  -apr-1.2.7-r2.ebuild, -apr-1.2.7-r3.ebuild:
+  Remove redundant versions.
 
 *apr-1.2.8 (21 Jan 2007)
 
diff --git a/dev-libs/apr/apr-0.9.6-r3.ebuild b/dev-libs/apr/apr-0.9.6-r3.ebuild
deleted file mode 100644
index 6fb9359fc11f..000000000000
--- a/dev-libs/apr/apr-0.9.6-r3.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr/apr-0.9.6-r3.ebuild,v 1.12 2005/10/21 14:13:55 ka0ttic Exp $
-
-inherit flag-o-matic libtool
-
-DESCRIPTION="Apache Portable Runtime Library"
-HOMEPAGE="http://apr.apache.org/"
-SRC_URI="mirror://apache/apr/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86"
-IUSE="ipv6"
-RESTRICT="test"
-
-DEPEND=""
-
-src_compile() {
-	elibtoolize || die "elibtoolize failed"
-
-	myconf="--datadir=/usr/share/apr-0"
-
-	myconf="${myconf} $(use_enable ipv6)"
-	myconf="${myconf} --enable-threads"
-	myconf="${myconf} --enable-nonportable-atomics"
-	myconf="${myconf} --with-devrandom=/dev/random"
-
-	econf ${myconf} || die
-	emake || die
-}
-
-src_install() {
-	make DESTDIR="${D}" installbuilddir=/usr/share/apr-0/build install || die
-
-	# bogus values pointing at /var/tmp/portage
-	sed -i -e 's:APR_SOURCE_DIR=.*:APR_SOURCE_DIR=/usr/share/apr-0:g' ${D}/usr/bin/apr-config
-	sed -i -e 's:APR_BUILD_DIR=.*:APR_BUILD_DIR=/usr/share/apr-0/build:g' ${D}/usr/bin/apr-config
-
-	sed -i -e 's:apr_builddir=.*:apr_builddir=/usr/share/apr-0/build:g' ${D}/usr/share/apr-0/build/apr_rules.mk
-	sed -i -e 's:apr_builders=.*:apr_builders=/usr/share/apr-0/build:g' ${D}/usr/share/apr-0/build/apr_rules.mk
-
-	cp -p build/*.awk ${D}/usr/share/apr-0/build
-	cp -p build/*.sh ${D}/usr/share/apr-0/build
-	cp -p build/*.pl ${D}/usr/share/apr-0/build
-
-	dodoc CHANGES LICENSE NOTICE
-}
diff --git a/dev-libs/apr/apr-0.9.6-r4.ebuild b/dev-libs/apr/apr-0.9.6-r4.ebuild
deleted file mode 100644
index 0756f676ed6d..000000000000
--- a/dev-libs/apr/apr-0.9.6-r4.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr/apr-0.9.6-r4.ebuild,v 1.3 2005/10/10 20:57:00 kugelfang Exp $
-
-inherit flag-o-matic libtool
-
-DESCRIPTION="Apache Portable Runtime Library"
-HOMEPAGE="http://apr.apache.org/"
-SRC_URI="mirror://apache/apr/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="ipv6 urandom"
-RESTRICT="test"
-
-DEPEND=""
-
-src_compile() {
-	elibtoolize || die "elibtoolize failed"
-
-	myconf="--datadir=/usr/share/apr-0"
-
-	myconf="${myconf} $(use_enable ipv6)"
-	myconf="${myconf} --enable-threads"
-	myconf="${myconf} --enable-nonportable-atomics"
-	if use urandom; then
-		einfo "Using /dev/urandom as random device"
-		myconf="${myconf} --with-devrandom=/dev/urandom"
-	else
-		einfo "Using /dev/random as random device"
-		myconf="${myconf} --with-devrandom=/dev/random"
-	fi
-
-	econf ${myconf} || die
-	emake || die
-}
-
-src_install() {
-	make DESTDIR="${D}" installbuilddir=/usr/share/apr-0/build install || die
-
-	# bogus values pointing at /var/tmp/portage
-	sed -i -e 's:APR_SOURCE_DIR=.*:APR_SOURCE_DIR=/usr/share/apr-0:g' ${D}/usr/bin/apr-config
-	sed -i -e 's:APR_BUILD_DIR=.*:APR_BUILD_DIR=/usr/share/apr-0/build:g' ${D}/usr/bin/apr-config
-
-	sed -i -e 's:apr_builddir=.*:apr_builddir=/usr/share/apr-0/build:g' ${D}/usr/share/apr-0/build/apr_rules.mk
-	sed -i -e 's:apr_builders=.*:apr_builders=/usr/share/apr-0/build:g' ${D}/usr/share/apr-0/build/apr_rules.mk
-
-	cp -p build/*.awk ${D}/usr/share/apr-0/build
-	cp -p build/*.sh ${D}/usr/share/apr-0/build
-	cp -p build/*.pl ${D}/usr/share/apr-0/build
-
-	dodoc CHANGES LICENSE NOTICE
-}
diff --git a/dev-libs/apr/apr-0.9.7.ebuild b/dev-libs/apr/apr-0.9.7.ebuild
deleted file mode 100644
index 3b6539e01e2b..000000000000
--- a/dev-libs/apr/apr-0.9.7.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr/apr-0.9.7.ebuild,v 1.11 2006/05/18 18:14:40 vericgar Exp $
-
-inherit flag-o-matic libtool
-
-DESCRIPTION="Apache Portable Runtime Library"
-HOMEPAGE="http://apr.apache.org/"
-SRC_URI="mirror://apache/apr/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ~ppc-macos ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="ipv6 urandom"
-RESTRICT="test"
-
-DEPEND=""
-
-src_compile() {
-
-	filter-ldflags -Wl,--as-needed --as-needed
-
-	elibtoolize || die "elibtoolize failed"
-
-	myconf="--datadir=/usr/share/apr-0"
-
-	myconf="${myconf} $(use_enable ipv6)"
-	myconf="${myconf} --enable-threads"
-	myconf="${myconf} --enable-nonportable-atomics"
-	if use urandom; then
-		einfo "Using /dev/urandom as random device"
-		myconf="${myconf} --with-devrandom=/dev/urandom"
-	else
-		einfo "Using /dev/random as random device"
-		myconf="${myconf} --with-devrandom=/dev/random"
-	fi
-
-	econf ${myconf} || die
-	emake || die
-}
-
-src_install() {
-	make DESTDIR="${D}" installbuilddir=/usr/share/apr-0/build install || die
-
-	# bogus values pointing at /var/tmp/portage
-	sed -i -e 's:APR_SOURCE_DIR=.*:APR_SOURCE_DIR=/usr/share/apr-0:g' ${D}/usr/bin/apr-config
-	sed -i -e 's:APR_BUILD_DIR=.*:APR_BUILD_DIR=/usr/share/apr-0/build:g' ${D}/usr/bin/apr-config
-
-	sed -i -e 's:apr_builddir=.*:apr_builddir=/usr/share/apr-0/build:g' ${D}/usr/share/apr-0/build/apr_rules.mk
-	sed -i -e 's:apr_builders=.*:apr_builders=/usr/share/apr-0/build:g' ${D}/usr/share/apr-0/build/apr_rules.mk
-
-	cp -p build/*.awk ${D}/usr/share/apr-0/build
-	cp -p build/*.sh ${D}/usr/share/apr-0/build
-	cp -p build/*.pl ${D}/usr/share/apr-0/build
-
-	dodoc CHANGES LICENSE NOTICE
-}
diff --git a/dev-libs/apr/apr-1.2.2.ebuild b/dev-libs/apr/apr-1.2.2.ebuild
deleted file mode 100644
index 2d27850b1c2d..000000000000
--- a/dev-libs/apr/apr-1.2.2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr/apr-1.2.2.ebuild,v 1.3 2006/04/19 00:55:06 vericgar Exp $
-
-inherit libtool
-
-DESCRIPTION="Apache Portable Runtime Library"
-HOMEPAGE="http://apr.apache.org/"
-SRC_URI="mirror://apache/apr/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="1"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="ipv6 urandom"
-RESTRICT="test"
-
-DEPEND=""
-
-src_compile() {
-	elibtoolize || die "elibtoolize failed"
-
-	myconf="--datadir=/usr/share/apr-1"
-
-	myconf="${myconf} $(use_enable ipv6)"
-	myconf="${myconf} --enable-threads"
-	myconf="${myconf} --enable-nonportable-atomics"
-	if use urandom; then
-		einfo "Using /dev/urandom as random device"
-		myconf="${myconf} --with-devrandom=/dev/urandom"
-	else
-		einfo "Using /dev/random as random device"
-		myconf="${myconf} --with-devrandom=/dev/random"
-	fi
-
-	econf ${myconf} || die "Configure failed"
-	emake || die "Make failed"
-}
-
-src_install() {
-
-	make DESTDIR="${D}" install || die "make install failed"
-
-	dodoc CHANGES NOTICE LICENSE
-}
diff --git a/dev-libs/apr/apr-1.2.7-r1.ebuild b/dev-libs/apr/apr-1.2.7-r1.ebuild
deleted file mode 100644
index 26aed1dd28ea..000000000000
--- a/dev-libs/apr/apr-1.2.7-r1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr/apr-1.2.7-r1.ebuild,v 1.3 2007/01/08 23:35:43 phreak Exp $
-
-inherit autotools
-
-WANT_AUTOCONF="2.5"
-
-DESCRIPTION="Apache Portable Runtime Library"
-HOMEPAGE="http://apr.apache.org/"
-SRC_URI="mirror://apache/apr/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="1"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="ipv6 urandom"
-RESTRICT="test"
-
-DEPEND=""
-
-src_compile() {
-
-	# for some reason not all the .m4 files that are referenced in 
-	# configure.in exist, so we remove all references and include every
-	# .m4 file in build using aclocal via eautoreconf
-	# See bug 135463
-	sed -i -e '/sinclude/d' configure.in
-	AT_M4DIR="build" eautoreconf
-
-	myconf="--datadir=/usr/share/apr-1"
-
-	myconf="${myconf} $(use_enable ipv6)"
-	myconf="${myconf} --enable-threads"
-	myconf="${myconf} --enable-nonportable-atomics"
-	if use urandom; then
-		einfo "Using /dev/urandom as random device"
-		myconf="${myconf} --with-devrandom=/dev/urandom"
-	else
-		einfo "Using /dev/random as random device"
-		myconf="${myconf} --with-devrandom=/dev/random"
-	fi
-
-	# We pre-load the cache with the correct answer!  This avoids
-	# it violating the sandbox.  This may have to be changed for
-	# non-Linux systems or if sem_open changes on Linux.  This
-	# hack is built around documentation in /usr/include/semaphore.h
-	# and the glibc (pthread) source
-	# See bugs 24215 and 133573
-	echo 'ac_cv_func_sem_open=${ac_cv_func_sem_open=no}' >> ${S}/config.cache
-
-	econf ${myconf} || die "Configure failed"
-
-	# Make sure we use the system libtool
-	sed -i 's,$(apr_builddir)/libtool,/usr/bin/libtool,' build/apr_rules.mk
-	sed -i 's,${installbuilddir}/libtool,/usr/bin/libtool,' apr-1-config
-	rm libtool
-
-	emake || die "Make failed"
-}
-
-src_install() {
-
-	make DESTDIR="${D}" install || die "make install failed"
-
-	dodoc CHANGES NOTICE LICENSE
-}
-
-pkg_postinst() {
-	ewarn "We are now using the system's libtool rather then bundling"
-	ewarn "our own. You will need to rebuild Apache and possibly other"
-	ewarn "software if you get a message similiar to the following:"
-	ewarn
-	ewarn "   /usr/share/apr-1/build-1/libtool: No such file or directory"
-	ewarn
-}
diff --git a/dev-libs/apr/apr-1.2.7-r2.ebuild b/dev-libs/apr/apr-1.2.7-r2.ebuild
deleted file mode 100644
index 0c5cae28ca6b..000000000000
--- a/dev-libs/apr/apr-1.2.7-r2.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr/apr-1.2.7-r2.ebuild,v 1.2 2007/01/08 23:35:43 phreak Exp $
-
-inherit autotools
-
-WANT_AUTOCONF="2.5"
-
-DESCRIPTION="Apache Portable Runtime Library"
-HOMEPAGE="http://apr.apache.org/"
-SRC_URI="mirror://apache/apr/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="1"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="ipv6 urandom debug"
-RESTRICT="test"
-
-DEPEND=""
-
-src_compile() {
-
-	# for some reason not all the .m4 files that are referenced in 
-	# configure.in exist, so we remove all references and include every
-	# .m4 file in build using aclocal via eautoreconf
-	# See bug 135463
-	sed -i -e '/sinclude/d' configure.in
-	AT_M4DIR="build" eautoreconf
-
-	myconf="--datadir=/usr/share/apr-1"
-
-	# For now we always enable ipv6. Testing has shown that is still works
-	# correctly in ipv4 systems, and currently, the ipv4-only support
-	# is broken in apr. (ipv6 is enabled by default)
-	#myconf="${myconf} $(use_enable ipv6)"
-
-	myconf="${myconf} --enable-threads"
-	myconf="${myconf} --enable-nonportable-atomics"
-	if use urandom; then
-		einfo "Using /dev/urandom as random device"
-		myconf="${myconf} --with-devrandom=/dev/urandom"
-	else
-		einfo "Using /dev/random as random device"
-		myconf="${myconf} --with-devrandom=/dev/random"
-	fi
-
-	useq debug && myconf="${myconf} --enable-maintainer-mode"
-
-	# We pre-load the cache with the correct answer!  This avoids
-	# it violating the sandbox.  This may have to be changed for
-	# non-Linux systems or if sem_open changes on Linux.  This
-	# hack is built around documentation in /usr/include/semaphore.h
-	# and the glibc (pthread) source
-	# See bugs 24215 and 133573
-	echo 'ac_cv_func_sem_open=${ac_cv_func_sem_open=no}' >> ${S}/config.cache
-
-	econf ${myconf} || die "Configure failed"
-
-	# Make sure we use the system libtool
-	sed -i 's,$(apr_builddir)/libtool,/usr/bin/libtool,' build/apr_rules.mk
-	sed -i 's,${installbuilddir}/libtool,/usr/bin/libtool,' apr-1-config
-	rm libtool
-
-	emake || die "Make failed"
-}
-
-src_install() {
-
-	make DESTDIR="${D}" install || die "make install failed"
-
-	dodoc CHANGES NOTICE LICENSE
-}
-
-pkg_postinst() {
-	ewarn "We are now using the system's libtool rather then bundling"
-	ewarn "our own. You will need to rebuild Apache and possibly other"
-	ewarn "software if you get a message similiar to the following:"
-	ewarn
-	ewarn "   /usr/share/apr-1/build-1/libtool: No such file or directory"
-	ewarn
-}
diff --git a/dev-libs/apr/apr-1.2.7-r3.ebuild b/dev-libs/apr/apr-1.2.7-r3.ebuild
deleted file mode 100644
index 0a21d694cfec..000000000000
--- a/dev-libs/apr/apr-1.2.7-r3.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr/apr-1.2.7-r3.ebuild,v 1.5 2007/01/08 23:35:43 phreak Exp $
-
-inherit autotools
-
-WANT_AUTOCONF="2.5"
-
-DESCRIPTION="Apache Portable Runtime Library"
-HOMEPAGE="http://apr.apache.org/"
-SRC_URI="mirror://apache/apr/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="1"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-IUSE="ipv6 urandom debug"
-RESTRICT="test"
-
-DEPEND=""
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# for some reason not all the .m4 files that are referenced in 
-	# configure.in exist, so we remove all references and include every
-	# .m4 file in build using aclocal via eautoreconf
-	# See bug 135463
-	sed -i -e '/sinclude/d' configure.in
-	AT_M4DIR="build" eautoreconf
-
-	epatch ${FILESDIR}/config.layout.patch
-
-}
-
-src_compile() {
-
-
-	myconf="--enable-layout=gentoo"
-
-	# For now we always enable ipv6. Testing has shown that is still works
-	# correctly in ipv4 systems, and currently, the ipv4-only support
-	# is broken in apr. (ipv6 is enabled by default)
-	#myconf="${myconf} $(use_enable ipv6)"
-
-	myconf="${myconf} --enable-threads"
-	myconf="${myconf} --enable-nonportable-atomics"
-	if use urandom; then
-		einfo "Using /dev/urandom as random device"
-		myconf="${myconf} --with-devrandom=/dev/urandom"
-	else
-		einfo "Using /dev/random as random device"
-		myconf="${myconf} --with-devrandom=/dev/random"
-	fi
-
-	useq debug && myconf="${myconf} --enable-maintainer-mode"
-
-	# We pre-load the cache with the correct answer!  This avoids
-	# it violating the sandbox.  This may have to be changed for
-	# non-Linux systems or if sem_open changes on Linux.  This
-	# hack is built around documentation in /usr/include/semaphore.h
-	# and the glibc (pthread) source
-	# See bugs 24215 and 133573
-	echo 'ac_cv_func_sem_open=${ac_cv_func_sem_open=no}' >> ${S}/config.cache
-
-	econf ${myconf} || die "Configure failed"
-
-	# Make sure we use the system libtool
-	sed -i 's,$(apr_builddir)/libtool,/usr/bin/libtool,' build/apr_rules.mk
-	sed -i 's,${installbuilddir}/libtool,/usr/bin/libtool,' apr-1-config
-	rm libtool
-
-	emake || die "Make failed"
-}
-
-src_install() {
-
-	make DESTDIR="${D}" install || die "make install failed"
-
-	# This file is only used on AIX systems, which gentoo is not,
-	# and causes collisions between the SLOTs, so kill it
-	rm ${D}/usr/$(get_libdir)/apr.exp
-
-	dodoc CHANGES NOTICE LICENSE
-}
-
-pkg_postinst() {
-	ewarn "We are now using the system's libtool rather then bundling"
-	ewarn "our own. You will need to rebuild Apache and possibly other"
-	ewarn "software if you get a message similiar to the following:"
-	ewarn
-	ewarn "   /usr/share/apr-1/build-1/libtool: No such file or directory"
-	ewarn
-}
diff --git a/dev-libs/apr/apr-1.2.7.ebuild b/dev-libs/apr/apr-1.2.7.ebuild
deleted file mode 100644
index 6fdb6aa1d8ba..000000000000
--- a/dev-libs/apr/apr-1.2.7.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr/apr-1.2.7.ebuild,v 1.6 2006/06/06 16:12:51 vericgar Exp $
-
-inherit flag-o-matic libtool
-
-DESCRIPTION="Apache Portable Runtime Library"
-HOMEPAGE="http://apr.apache.org/"
-SRC_URI="mirror://apache/apr/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="1"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="ipv6 urandom"
-RESTRICT="test"
-
-DEPEND=""
-
-src_compile() {
-
-	elibtoolize || die "elibtoolize failed"
-
-	myconf="--datadir=/usr/share/apr-1"
-
-	myconf="${myconf} $(use_enable ipv6)"
-	myconf="${myconf} --enable-threads"
-	myconf="${myconf} --enable-nonportable-atomics"
-	if use urandom; then
-		einfo "Using /dev/urandom as random device"
-		myconf="${myconf} --with-devrandom=/dev/urandom"
-	else
-		einfo "Using /dev/random as random device"
-		myconf="${myconf} --with-devrandom=/dev/random"
-	fi
-
-	# We pre-load the cache with the correct answer!  This avoids
-	# it violating the sandbox.  This may have to be changed for
-	# non-Linux systems or if sem_open changes on Linux.  This
-	# hack is built around documentation in /usr/include/semaphore.h
-	# and the glibc (pthread) source
-	# See bugs 24215 and 133573
-	echo 'ac_cv_func_sem_open=${ac_cv_func_sem_open=no}' >> ${S}/config.cache
-
-	econf ${myconf} || die "Configure failed"
-	emake || die "Make failed"
-}
-
-src_install() {
-
-	make DESTDIR="${D}" install || die "make install failed"
-
-	dodoc CHANGES NOTICE LICENSE
-}
diff --git a/dev-libs/apr/files/digest-apr-0.9.6-r3 b/dev-libs/apr/files/digest-apr-0.9.6-r3
deleted file mode 100644
index 809c77ef1b72..000000000000
--- a/dev-libs/apr/files/digest-apr-0.9.6-r3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 b7e4c52cccb421b42a41b0bed5a9f9bc apr-0.9.6.tar.gz 1025231
-RMD160 5ae7ddf3976b9c3a03db2f3df6b5eda96c142b76 apr-0.9.6.tar.gz 1025231
-SHA256 df9cdac4e99fd8a5f666a7cfd9e9097666d5a80e34f3e1431e8f0f185e413fe5 apr-0.9.6.tar.gz 1025231
diff --git a/dev-libs/apr/files/digest-apr-0.9.6-r4 b/dev-libs/apr/files/digest-apr-0.9.6-r4
deleted file mode 100644
index 809c77ef1b72..000000000000
--- a/dev-libs/apr/files/digest-apr-0.9.6-r4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 b7e4c52cccb421b42a41b0bed5a9f9bc apr-0.9.6.tar.gz 1025231
-RMD160 5ae7ddf3976b9c3a03db2f3df6b5eda96c142b76 apr-0.9.6.tar.gz 1025231
-SHA256 df9cdac4e99fd8a5f666a7cfd9e9097666d5a80e34f3e1431e8f0f185e413fe5 apr-0.9.6.tar.gz 1025231
diff --git a/dev-libs/apr/files/digest-apr-0.9.7 b/dev-libs/apr/files/digest-apr-0.9.7
deleted file mode 100644
index 3ec4c9a9e565..000000000000
--- a/dev-libs/apr/files/digest-apr-0.9.7
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 061772cac0d8acf8e3ee402eb57944c9 apr-0.9.7.tar.gz 1045136
-RMD160 d2978d3f3d505885e0782b2b2b40fa1ccc2e9e7a apr-0.9.7.tar.gz 1045136
-SHA256 9d102909d840b2e2960a8175408e6d6a6e28a35112bd1190a22d346b0b66b2ba apr-0.9.7.tar.gz 1045136
diff --git a/dev-libs/apr/files/digest-apr-1.2.2 b/dev-libs/apr/files/digest-apr-1.2.2
deleted file mode 100644
index f4858e970324..000000000000
--- a/dev-libs/apr/files/digest-apr-1.2.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 f96e3b04ccf86ed28a0734d7efc5bb65 apr-1.2.2.tar.gz 1096029
-RMD160 13a4edd59fb93596c8cae4549d38a0022a5c6758 apr-1.2.2.tar.gz 1096029
-SHA256 23826f62b305efef3f6c6e7e6b8ddad05ec48a2f36410ff508b3fc4714a33dfc apr-1.2.2.tar.gz 1096029
diff --git a/dev-libs/apr/files/digest-apr-1.2.7 b/dev-libs/apr/files/digest-apr-1.2.7
deleted file mode 100644
index 13dfeb0ca3cd..000000000000
--- a/dev-libs/apr/files/digest-apr-1.2.7
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 aea926cbe588f844ad9e317157d60175 apr-1.2.7.tar.gz 1102370
-RMD160 9dfeb562b376c32261b8a263887a05515c4afbe2 apr-1.2.7.tar.gz 1102370
-SHA256 4bde26d8168216f00e0f652e34e20e527dab38edca6a7c0d85aea542bf0fc5fa apr-1.2.7.tar.gz 1102370
diff --git a/dev-libs/apr/files/digest-apr-1.2.7-r1 b/dev-libs/apr/files/digest-apr-1.2.7-r1
deleted file mode 100644
index 13dfeb0ca3cd..000000000000
--- a/dev-libs/apr/files/digest-apr-1.2.7-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 aea926cbe588f844ad9e317157d60175 apr-1.2.7.tar.gz 1102370
-RMD160 9dfeb562b376c32261b8a263887a05515c4afbe2 apr-1.2.7.tar.gz 1102370
-SHA256 4bde26d8168216f00e0f652e34e20e527dab38edca6a7c0d85aea542bf0fc5fa apr-1.2.7.tar.gz 1102370
diff --git a/dev-libs/apr/files/digest-apr-1.2.7-r2 b/dev-libs/apr/files/digest-apr-1.2.7-r2
deleted file mode 100644
index 13dfeb0ca3cd..000000000000
--- a/dev-libs/apr/files/digest-apr-1.2.7-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 aea926cbe588f844ad9e317157d60175 apr-1.2.7.tar.gz 1102370
-RMD160 9dfeb562b376c32261b8a263887a05515c4afbe2 apr-1.2.7.tar.gz 1102370
-SHA256 4bde26d8168216f00e0f652e34e20e527dab38edca6a7c0d85aea542bf0fc5fa apr-1.2.7.tar.gz 1102370
diff --git a/dev-libs/apr/files/digest-apr-1.2.7-r3 b/dev-libs/apr/files/digest-apr-1.2.7-r3
deleted file mode 100644
index 13dfeb0ca3cd..000000000000
--- a/dev-libs/apr/files/digest-apr-1.2.7-r3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 aea926cbe588f844ad9e317157d60175 apr-1.2.7.tar.gz 1102370
-RMD160 9dfeb562b376c32261b8a263887a05515c4afbe2 apr-1.2.7.tar.gz 1102370
-SHA256 4bde26d8168216f00e0f652e34e20e527dab38edca6a7c0d85aea542bf0fc5fa apr-1.2.7.tar.gz 1102370
diff --git a/dev-libs/apr/metadata.xml b/dev-libs/apr/metadata.xml
index ff5b6490402e..a1f5ceff2352 100644
--- a/dev-libs/apr/metadata.xml
+++ b/dev-libs/apr/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>apache</herd>
-<maintainer>
-  <email>apache-bugs@gentoo.org</email>
-</maintainer>
+	<herd>apache</herd>
+	<maintainer>
+		<email>apache-bugs@gentoo.org</email>
+	</maintainer>
 </pkgmetadata>