remove apr-0 wrt #203578

(Portage version: 2.1.4)

6 files changed, 6 insertions, 170 deletions

diff --git a/dev-libs/apr/ChangeLog b/dev-libs/apr/ChangeLog
index 5a552416fd15..bd676b1e42a8 100644
--- a/dev-libs/apr/ChangeLog
+++ b/dev-libs/apr/ChangeLog
@@ -1,6 +1,10 @@
 # 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.100 2007/12/15 14:24:41 hollow Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr/ChangeLog,v 1.101 2008/01/28 23:53:34 hollow Exp $
+
+  28 Jan 2008; Benedikt Böhm <hollow@gentoo.org>
+  -files/apr-0.9.12-linking.patch, -apr-0.9.12.ebuild, -apr-0.9.13.ebuild:
+  remove apr-0 wrt #203578
 
 *apr-1.2.12 (15 Dec 2007)
 
diff --git a/dev-libs/apr/apr-0.9.12.ebuild b/dev-libs/apr/apr-0.9.12.ebuild
deleted file mode 100644
index 4048acb79fba..000000000000
--- a/dev-libs/apr/apr-0.9.12.ebuild
+++ /dev/null
@@ -1,76 +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-0.9.12.ebuild,v 1.17 2007/03/03 22:29:34 genone Exp $
-
-inherit eutils 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 ~sparc-fbsd x86 ~x86-fbsd"
-IUSE="ipv6 urandom"
-RESTRICT="test"
-
-DEPEND=""
-
-src_unpack() {
-
-	unpack ${A} || die
-	cd ${S} || die
-
-	epatch ${FILESDIR}/apr-0.9.12-linking.patch
-	elibtoolize || die "elibtoolize failed"
-
-}
-
-src_compile() {
-
-	myconf="--datadir=/usr/share/apr-0"
-
-	myconf="${myconf} $(use_enable ipv6)"
-	myconf="${myconf} --enable-threads"
-	myconf="${myconf} --enable-nonportable-atomics"
-	if use urandom; then
-		elog "Using /dev/urandom as random device"
-		myconf="${myconf} --with-devrandom=/dev/urandom"
-	else
-		elog "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
-	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
-
-	# 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
-
-}
diff --git a/dev-libs/apr/apr-0.9.13.ebuild b/dev-libs/apr/apr-0.9.13.ebuild
deleted file mode 100644
index 4cb6953946ab..000000000000
--- a/dev-libs/apr/apr-0.9.13.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr/apr-0.9.13.ebuild,v 1.4 2007/03/03 22:29:34 genone Exp $
-
-inherit eutils 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 ~sparc-fbsd ~x86 ~x86-fbsd"
-IUSE="ipv6 urandom"
-RESTRICT="test"
-
-DEPEND=""
-RDEPEND=""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/apr-0.9.12-linking.patch
-	elibtoolize || die "elibtoolize failed"
-
-}
-
-src_compile() {
-	myconf="--datadir=/usr/share/apr-0"
-
-	myconf="${myconf} $(use_enable ipv6)"
-	myconf="${myconf} --enable-threads"
-	myconf="${myconf} --enable-nonportable-atomics"
-	if use urandom; then
-		elog "Using /dev/urandom as random device"
-		myconf="${myconf} --with-devrandom=/dev/urandom"
-	else
-		elog "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 "econf failed!"
-	emake || die "emake failed!"
-}
-
-src_install() {
-	make DESTDIR="${D}" installbuilddir=/usr/share/apr-0/build install || die "make install failed!"
-
-	# 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
-
-	# 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
-}
diff --git a/dev-libs/apr/files/apr-0.9.12-linking.patch b/dev-libs/apr/files/apr-0.9.12-linking.patch
deleted file mode 100644
index 257ddde1c6dc..000000000000
--- a/dev-libs/apr/files/apr-0.9.12-linking.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: apr-0.9.12/Makefile.in
-===================================================================
---- apr-0.9.12.orig/Makefile.in
-+++ apr-0.9.12/Makefile.in
-@@ -12,6 +12,7 @@ APR_MAJOR_VERSION=@APR_MAJOR_VERSION@
- INCDIR=./include
- INCDIR1=../include
- INCLUDES=-I$(INCDIR) -I$(INCDIR1)
-+ALL_LIBS=@EXTRA_LIBS@
- 
- #
- # Macros for target determination
diff --git a/dev-libs/apr/files/digest-apr-0.9.12 b/dev-libs/apr/files/digest-apr-0.9.12
deleted file mode 100644
index ab6bc4c13a70..000000000000
--- a/dev-libs/apr/files/digest-apr-0.9.12
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 8a87cc3cb44877e090e1e8f7ff95cfa4 apr-0.9.12.tar.gz 1048890
-RMD160 a6604478b3d09c860bc27a21859248dfd5f6b259 apr-0.9.12.tar.gz 1048890
-SHA256 a4e9eaa1c5cbac1bb82fb08b6414cf077555353423e8fc5ae93145c33a607dc2 apr-0.9.12.tar.gz 1048890
diff --git a/dev-libs/apr/files/digest-apr-0.9.13 b/dev-libs/apr/files/digest-apr-0.9.13
deleted file mode 100644
index 95ddccf8f2df..000000000000
--- a/dev-libs/apr/files/digest-apr-0.9.13
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 233894af598d8347fd68cf836e7dee91 apr-0.9.13.tar.gz 1051795
-RMD160 0183645d0065eb8b3eca0602820318ab3c89a179 apr-0.9.13.tar.gz 1051795
-SHA256 64bb493b634c442db4f18deac37a07deb8d37c994a2507f8eba756f926a26204 apr-0.9.13.tar.gz 1051795