fix #274246; remove old ebuild

(Portage version: 2.2_rc40/cvs/Linux i686)

5 files changed, 8 insertions, 223 deletions

diff --git a/dev-libs/apr/ChangeLog b/dev-libs/apr/ChangeLog
index 4a2e3b847d6f..035ddf9b05f5 100644
--- a/dev-libs/apr/ChangeLog
+++ b/dev-libs/apr/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/apr
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr/ChangeLog,v 1.144 2009/08/24 14:51:54 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr/ChangeLog,v 1.145 2009/09/20 08:53:34 hollow Exp $
+
+  20 Sep 2009; Benedikt Böhm <hollow@gentoo.org> -apr-1.3.5.ebuild,
+  -apr-1.3.6.ebuild, -apr-1.3.7.ebuild, apr-1.3.8.ebuild:
+  fix #274246; remove old ebuild
 
   24 Aug 2009; Brent Baude <ranger@gentoo.org> apr-1.3.8.ebuild:
   Marking apr-1.3.8 ppc64 for bug 280514
diff --git a/dev-libs/apr/apr-1.3.5.ebuild b/dev-libs/apr/apr-1.3.5.ebuild
deleted file mode 100644
index 95e4d6eba583..000000000000
--- a/dev-libs/apr/apr-1.3.5.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr/apr-1.3.5.ebuild,v 1.8 2009/06/21 14:12:24 ranger 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.gz"
-
-LICENSE="Apache-2.0"
-SLOT="1"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
-IUSE="debug doc +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 debug; then
-		myconf+=" --enable-maintainer-mode --enable-pool-debug=all"
-	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 || 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
-
-	if use doc; then
-		dohtml 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.3.6.ebuild b/dev-libs/apr/apr-1.3.6.ebuild
deleted file mode 100644
index bdbd97c75230..000000000000
--- a/dev-libs/apr/apr-1.3.6.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr/apr-1.3.6.ebuild,v 1.1 2009/07/07 18:27:17 arfrever 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.gz"
-
-LICENSE="Apache-2.0"
-SLOT="1"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-IUSE="debug doc +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 debug; then
-		myconf+=" --enable-maintainer-mode --enable-pool-debug=all"
-	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 || 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
-
-	if use doc; then
-		dohtml 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.3.7.ebuild b/dev-libs/apr/apr-1.3.7.ebuild
deleted file mode 100644
index 4ffce639cec7..000000000000
--- a/dev-libs/apr/apr-1.3.7.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr/apr-1.3.7.ebuild,v 1.1 2009/07/24 22:10:18 arfrever 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.gz"
-
-LICENSE="Apache-2.0"
-SLOT="1"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-IUSE="debug doc +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 debug; then
-		myconf+=" --enable-maintainer-mode --enable-pool-debug=all"
-	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 || 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
-
-	if use doc; then
-		dohtml 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.3.8.ebuild b/dev-libs/apr/apr-1.3.8.ebuild
index 26deb996a29a..2e8b2001e9cb 100644
--- a/dev-libs/apr/apr-1.3.8.ebuild
+++ b/dev-libs/apr/apr-1.3.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr/apr-1.3.8.ebuild,v 1.12 2009/08/24 14:51:54 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr/apr-1.3.8.ebuild,v 1.13 2009/09/20 08:53:34 hollow Exp $
 
 EAPI="2"
 
@@ -59,10 +59,10 @@ src_configure() {
 }
 
 src_compile() {
-	emake || die "emake failed"
+	emake -j1 || die "emake failed"
 
 	if use doc; then
-		emake dox || die "emake dox failed"
+		emake -j1 dox || die "emake dox failed"
 	fi
 }