Delete older ebuilds.

5 files changed, 14 insertions, 277 deletions

diff --git a/dev-libs/apr/Manifest b/dev-libs/apr/Manifest
index b103839b8546..8439ed6424c2 100644
--- a/dev-libs/apr/Manifest
+++ b/dev-libs/apr/Manifest
@@ -1,21 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX apr_ring_volatile.patch 582 RMD160 d448f9dba0b69dff00101ee2cc05654e05577639 SHA1 7bec45ffb00e6807d6ff0c282ad48d952e502a68 SHA256 6a30739ea4188f947ea80b071ff100b9a069d6228168b34f978f24ab51fd266c
 AUX config.layout.patch 818 RMD160 dada232c8b85e6c3c62fbc6caa1d05f36164dc27 SHA1 3822a0ec508165dd189e1b750bdf4e7778b6c21e SHA256 eeacaf654f23084e842bff02b97c083a8da5b5c056fd086166ba2d250edf3181
-DIST apr-1.3.9.tar.bz2 927657 RMD160 e90943275289113771b623c827ab3fb3c18064d8 SHA1 fb19ec11a15db03dcb9211f31012b079a522d1f0 SHA256 5705a393f48ce8652e2b9143668ed208d34e7ce702b28dd497353561a6ed2ce2
-DIST apr-1.4.2.tar.bz2 766793 RMD160 20d4ae082d490432710aad1c4f689e6032a6c921 SHA1 b3ed66c2e7f67c50ae33b5cd85e9f46a93c6e4f8 SHA256 2017ca700694d09d2b0b21dd7c4d195e43a48735aac88526160c6195ee8f5391
 DIST apr-1.4.4.tar.bz2 759604 RMD160 3715774150253d024d79fcf3295f39f822229b85 SHA1 d05cd65ec169c06174ca7c8978179289777f8dae SHA256 15372afeb6bba4091c4662600dad8bc51e5e4ff15ce308fac286df8735eb544d
-EBUILD apr-1.3.9.ebuild 1879 RMD160 c2cf42299838497fc55aa3d31a26fb0d382543a9 SHA1 44fd7b97f2b94cc312e19314ea7c263fa35e8814 SHA256 3682a05d20cce1c1d9dc8d83d118df13d0c7cf7ce24d5b62542418ebb0a90eaf
-EBUILD apr-1.4.2-r1.ebuild 2189 RMD160 443818ec29e7575b53e8fa181b28e28f7cdf78e3 SHA1 2eb3046337fa4a418c7a706575d8aa7be3844b3d SHA256 917590aa5783602c7707be6c89709fbe59ee703f229fd887f72af394b553f5fc
-EBUILD apr-1.4.2.ebuild 1954 RMD160 d392b90d5491aab9414d9c07079f499d8545d8e6 SHA1 e0b6becb65ddca5c5cab15681623e337239c5ce2 SHA256 84d4b47320e18495c5756ae08ca5b43f023fb50f989f58da86b5302690e13412
 EBUILD apr-1.4.4.ebuild 2170 RMD160 1cb5428493b3ec066d4964b29001cd57a2987aaa SHA1 6402cf8e08df62d68a9b85a12ef68e96dad5ed4d SHA256 4cbb2bb0b4139c8e938a497411f61fcb4001b1abe021198f4e62aa8a16bfcaef
 MISC ChangeLog 20763 RMD160 42291fdfc393147ef9323b99305ab8d268ff4ad9 SHA1 e0cebbbea9d067f24b552d2cb3c7373a9cfcd91a SHA256 48d45e6616e83297e9d6c65bf6473458132133fde4d4687a5d04ecaf7865d81b
 MISC metadata.xml 453 RMD160 44be42dfd9fe4c26f5655b4a8b78446ae1c073e7 SHA1 d7378602457f126b8448744b2f965853b4a17188 SHA256 c089c114bb8c838899abeb5c1f1c19a495039b30e106363c14e5de83b7e9a1f4
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk3O2GkACgkQuQc30/atMkAY8wCeN2LEGx8Fti+ANSKmDb7t/p1K
-yrsAnjuT2xcjksZR5nsxiaJdZb1upnTz
-=ceu8
+iQIcBAEBAgAGBQJNzuyiAAoJEE70JXb4HvNVBakP/2REfneA4Keid7P0rCdGWJfI
+/QLdbP77KZdpMv3WAJ6h7c6B75PZ5/+YqjWeaRuNMNKJsSzHUp/4A2YMVXjNU9av
+Pkmg1xO9uZ7Wwt9cia81IPU+fB6OJ6L7KDOX9AfbyFLO9hQF9v7MxSZuIuMeRVIb
+SWb+WgM06dNpGpqRO6XjTFXr+YAYjLAqiwLFlIBMCA+DrPd4YSwKJ907f2M9KC4c
+dn8S7nBxKTsK3Xhl2HCkmlZbDTbjmzAyMRtbBcNvgQ3zbGbC3XnAoKCUEBrgAeK5
+R/YBeXgky22V/CVD97i/afAwHcZdhn1zYgyVOUe8XNhqNdPCxCE5fEF51DUqgmb1
+3CkOn7UxZ2u9RgZhVkwh5/PjDjsqxoIyKb6juY3IC6UfsbJaeJOzRFQUxmwS8zMz
+3lrZ4Q45r+S4ZhuoZz/jWqNhEElXdiP7LfrKawKguiHilTZVCGCUTA+UVWkvwwf0
+HHwqCnGt5BANW/z1A23Gp3hMva3uibO5RJVo4D6UxQiUmHHZDJZlrTnmtDRMiWXT
+ZEq+354/upXuDkU7i7UZz/96Dxq7aYH3jM85z3I9MVBzzsWB3ZienXScDrT9Pgea
+uo0/bhvz5fsLGo8/NlUIl1seA8tplMKPWjvf1BG2WHxgsgrJBokDx7gJ1xgz3QS7
+3KT5GbC0oQwYB5puqDuH
+=xpfR
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/apr/apr-1.3.9.ebuild b/dev-libs/apr/apr-1.3.9.ebuild
deleted file mode 100644
index cbee7e73c841..000000000000
--- a/dev-libs/apr/apr-1.3.9.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr/apr-1.3.9.ebuild,v 1.9 2010/03/07 11:56:25 hollow Exp $
-
-EAPI="2"
-
-inherit autotools eutils libtool multilib
-
-DESCRIPTION="Apache Portable Runtime Library"
-HOMEPAGE="http://apr.apache.org/"
-SRC_URI="mirror://apache/apr/${P}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="1"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="doc older-kernels-compatibility +urandom"
-RESTRICT="test"
-
-DEPEND="doc? ( app-doc/doxygen )"
-RDEPEND=""
-
-src_prepare() {
-	AT_M4DIR="build" eautoreconf
-	elibtoolize
-
-	epatch "${FILESDIR}/config.layout.patch"
-}
-
-src_configure() {
-	local myconf
-
-	if use older-kernels-compatibility; then
-		local apr_cv_accept4 apr_cv_dup3 apr_cv_epoll_create1 apr_cv_sock_cloexec
-		export apr_cv_accept4="no"
-		export apr_cv_dup3="no"
-		export apr_cv_epoll_create1="no"
-		export apr_cv_sock_cloexec="no"
-	fi
-
-	if use urandom; then
-		myconf+=" --with-devrandom=/dev/urandom"
-	else
-		myconf+=" --with-devrandom=/dev/random"
-	fi
-
-	econf --enable-layout=gentoo \
-		--enable-nonportable-atomics \
-		--enable-threads \
-		${myconf}
-
-	# 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 -f libtool
-}
-
-src_compile() {
-	emake -j1 || die "emake failed"
-
-	if use doc; then
-		emake -j1 dox || die "emake dox failed"
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	dodoc CHANGES NOTICE
-
-	if use doc; then
-		dohtml -r docs/dox/html/* || die "dohtml failed"
-	fi
-
-	# This file is only used on AIX systems, which Gentoo is not,
-	# and causes collisions between the SLOTs, so remove it.
-	rm -f "${D}usr/$(get_libdir)/apr.exp"
-}
diff --git a/dev-libs/apr/apr-1.4.2-r1.ebuild b/dev-libs/apr/apr-1.4.2-r1.ebuild
deleted file mode 100644
index 3a5a46eef3da..000000000000
--- a/dev-libs/apr/apr-1.4.2-r1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr/apr-1.4.2-r1.ebuild,v 1.1 2011/02/18 17:02:48 hollow Exp $
-
-EAPI="2"
-
-inherit autotools eutils libtool multilib
-
-DESCRIPTION="Apache Portable Runtime Library"
-HOMEPAGE="http://apr.apache.org/"
-SRC_URI="mirror://apache/apr/${P}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="1"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="doc older-kernels-compatibility +urandom +uuid elibc_FreeBSD"
-RESTRICT="test"
-
-RDEPEND="
-	uuid? (
-		!elibc_FreeBSD? (
-			|| ( >=sys-apps/util-linux-2.16 <sys-libs/e2fsprogs-libs-1.41.8 )
-		)
-	)
-"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
-
-src_prepare() {
-	# Ensure that system libtool is used.
-	sed -e 's:${installbuilddir}/libtool:/usr/bin/libtool:' -i apr-config.in || die "sed failed"
-	sed -e 's:@LIBTOOL@:$(SHELL) /usr/bin/libtool:' -i build/apr_rules.mk.in || die "sed failed"
-
-	AT_M4DIR="build" eautoreconf
-	elibtoolize
-
-	epatch "${FILESDIR}/config.layout.patch"
-	epatch "${FILESDIR}/apr_ring_volatile.patch"
-}
-
-src_configure() {
-	local myconf
-
-	if use older-kernels-compatibility; then
-		local apr_cv_accept4 apr_cv_dup3 apr_cv_epoll_create1 apr_cv_sock_cloexec
-		export apr_cv_accept4="no"
-		export apr_cv_dup3="no"
-		export apr_cv_epoll_create1="no"
-		export apr_cv_sock_cloexec="no"
-	fi
-
-	use uuid || export apr_cv_osuuid=no
-
-	if use urandom; then
-		myconf+=" --with-devrandom=/dev/urandom"
-	else
-		myconf+=" --with-devrandom=/dev/random"
-	fi
-
-	CONFIG_SHELL=/bin/bash \
-	econf --enable-layout=gentoo \
-		--enable-nonportable-atomics \
-		--enable-threads \
-		${myconf}
-
-	rm -f libtool
-}
-
-src_compile() {
-	emake -j1 || die "emake failed"
-
-	if use doc; then
-		emake dox || die "emake dox failed"
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	dodoc CHANGES NOTICE README
-
-	if use doc; then
-		dohtml -r docs/dox/html/* || die "dohtml failed"
-	fi
-
-	# This file is only used on AIX systems, which Gentoo is not,
-	# and causes collisions between the SLOTs, so remove it.
-	rm -f "${D}usr/$(get_libdir)/apr.exp"
-}
diff --git a/dev-libs/apr/apr-1.4.2.ebuild b/dev-libs/apr/apr-1.4.2.ebuild
deleted file mode 100644
index 26c2528cb420..000000000000
--- a/dev-libs/apr/apr-1.4.2.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr/apr-1.4.2.ebuild,v 1.12 2010/09/19 09:01:59 hollow Exp $
-
-EAPI="2"
-
-inherit autotools eutils libtool multilib
-
-DESCRIPTION="Apache Portable Runtime Library"
-HOMEPAGE="http://apr.apache.org/"
-SRC_URI="mirror://apache/apr/${P}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="1"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="doc older-kernels-compatibility +urandom"
-RESTRICT="test"
-
-DEPEND="doc? ( app-doc/doxygen )"
-RDEPEND=""
-
-src_prepare() {
-	# Ensure that system libtool is used.
-	sed -e 's:${installbuilddir}/libtool:/usr/bin/libtool:' -i apr-config.in || die "sed failed"
-	sed -e 's:@LIBTOOL@:$(SHELL) /usr/bin/libtool:' -i build/apr_rules.mk.in || die "sed failed"
-
-	AT_M4DIR="build" eautoreconf
-	elibtoolize
-
-	epatch "${FILESDIR}/config.layout.patch"
-}
-
-src_configure() {
-	local myconf
-
-	if use older-kernels-compatibility; then
-		local apr_cv_accept4 apr_cv_dup3 apr_cv_epoll_create1 apr_cv_sock_cloexec
-		export apr_cv_accept4="no"
-		export apr_cv_dup3="no"
-		export apr_cv_epoll_create1="no"
-		export apr_cv_sock_cloexec="no"
-	fi
-
-	if use urandom; then
-		myconf+=" --with-devrandom=/dev/urandom"
-	else
-		myconf+=" --with-devrandom=/dev/random"
-	fi
-
-	CONFIG_SHELL=/bin/bash \
-	econf --enable-layout=gentoo \
-		--enable-nonportable-atomics \
-		--enable-threads \
-		${myconf}
-
-	rm -f libtool
-}
-
-src_compile() {
-	emake -j1 || die "emake failed"
-
-	if use doc; then
-		emake dox || die "emake dox failed"
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	dodoc CHANGES NOTICE README
-
-	if use doc; then
-		dohtml -r docs/dox/html/* || die "dohtml failed"
-	fi
-
-	# This file is only used on AIX systems, which Gentoo is not,
-	# and causes collisions between the SLOTs, so remove it.
-	rm -f "${D}usr/$(get_libdir)/apr.exp"
-}
diff --git a/dev-libs/apr/files/apr_ring_volatile.patch b/dev-libs/apr/files/apr_ring_volatile.patch
deleted file mode 100644
index 85e3c47ed5be..000000000000
--- a/dev-libs/apr/files/apr_ring_volatile.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -crB apr-1.4.2-orig/include/apr_ring.h apr-1.4.2/include/apr_ring.h
-*** apr-1.4.2-orig/include/apr_ring.h	2011-02-16 14:00:19.326000089 +0300
---- apr-1.4.2/include/apr_ring.h	2011-02-16 14:02:42.378000091 +0300
-***************
-*** 90,97 ****
-   */
-  #define APR_RING_HEAD(head, elem)					\
-      struct head {							\
-! 	struct elem *next;						\
-! 	struct elem *prev;						\
-      }
-  
-  /**
---- 90,97 ----
-   */
-  #define APR_RING_HEAD(head, elem)					\
-      struct head {							\
-! 	struct elem * volatile next;					\
-! 	struct elem * volatile prev;					\
-      }
-  
-  /**