Rev bumps that remove LFS support from APR.

Package-Manager: portage-2.0.51.21-r1

6 files changed, 132 insertions, 10 deletions

diff --git a/dev-libs/apr/ChangeLog b/dev-libs/apr/ChangeLog
index 040271487b04..76d400f7f6c2 100644
--- a/dev-libs/apr/ChangeLog
+++ b/dev-libs/apr/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for dev-libs/apr
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr/ChangeLog,v 1.27 2005/04/10 21:35:44 trapni Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr/ChangeLog,v 1.28 2005/05/09 14:44:25 beu Exp $
+
+*apr-0.9.6-r3 (09 May 2005)
+*apr-0.9.5-r3 (09 May 2005)
+
+  09 May 2005; Elfyn McBratney <beu@gentoo.org> +apr-0.9.5-r3.ebuild,
+  +apr-0.9.6-r3.ebuild:
+  Rev bumps that remove LFS support from APR (has caused too many issues for
+  mid-release introduction). The Apache tool-stack (net-www/apache,
+  devs-libs/apr (this package) and dev-libs/apr-util) will need to be rebuilt
+  once emerging this update.
 
 *apr-1.1.1 (10 Apr 2005)
 
diff --git a/dev-libs/apr/Manifest b/dev-libs/apr/Manifest
index 1e44dc725010..e7203a8ef299 100644
--- a/dev-libs/apr/Manifest
+++ b/dev-libs/apr/Manifest
@@ -1,16 +1,30 @@
-MD5 33b24a7e72e6070367745a8f900b92a2 ChangeLog 3360
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 c1088729bb4739443814df9b343d34d5 apr-0.9.6-r3.ebuild 1531
+MD5 0d18f0fe5d603b41b988373892caf195 metadata.xml 226
+MD5 5fc2ae7d29f5e743817535ed28b2de2d apr-0.9.6-r2.ebuild 2344
+MD5 6f7741bc16050cd42dcfbd1e7eab2baf ChangeLog 3761
 MD5 068e4d83429849cbae32d8194086efb2 apr-0.9.6.ebuild 2176
+MD5 c949c5d1ead25fc80f948329f8f33372 apr-0.9.5-r3.ebuild 1531
 MD5 099d69afb7c9798380d1432561aacdc7 apr-1.1.1.ebuild 2001
-MD5 19f34b3d8f4335951410787ed733718e apr-0.9.5.ebuild 2180
-MD5 0d18f0fe5d603b41b988373892caf195 metadata.xml 226
+MD5 2e4a61ffb43df4b4f63ac0317a3660a9 apr-0.9.5-r2.ebuild 2344
 MD5 86a4c96972b87a34fd0b2159e9f336cf apr-0.9.5-r1.ebuild 2237
 MD5 aadbec5bc76c5f1060218e1625157190 apr-0.9.6-r1.ebuild 2237
-MD5 2e4a61ffb43df4b4f63ac0317a3660a9 apr-0.9.5-r2.ebuild 2344
-MD5 5fc2ae7d29f5e743817535ed28b2de2d apr-0.9.6-r2.ebuild 2344
-MD5 2b9c5f7ab799254e5738997732c9be8c files/digest-apr-0.9.6 62
-MD5 7a3bbbaa94fd0f5b9f33afc40db8f618 files/digest-apr-1.1.1 62
+MD5 19f34b3d8f4335951410787ed733718e apr-0.9.5.ebuild 2180
+MD5 a90539853bca24e2f0e77192d41e5a01 files/digest-apr-0.9.5-r2 62
+MD5 2b9c5f7ab799254e5738997732c9be8c files/digest-apr-0.9.6-r2 62
 MD5 a90539853bca24e2f0e77192d41e5a01 files/digest-apr-0.9.5 62
 MD5 a90539853bca24e2f0e77192d41e5a01 files/digest-apr-0.9.5-r1 62
+MD5 a90539853bca24e2f0e77192d41e5a01 files/digest-apr-0.9.5-r3 62
 MD5 2b9c5f7ab799254e5738997732c9be8c files/digest-apr-0.9.6-r1 62
-MD5 a90539853bca24e2f0e77192d41e5a01 files/digest-apr-0.9.5-r2 62
-MD5 2b9c5f7ab799254e5738997732c9be8c files/digest-apr-0.9.6-r2 62
+MD5 2b9c5f7ab799254e5738997732c9be8c files/digest-apr-0.9.6 62
+MD5 7a3bbbaa94fd0f5b9f33afc40db8f618 files/digest-apr-1.1.1 62
+MD5 2b9c5f7ab799254e5738997732c9be8c files/digest-apr-0.9.6-r3 62
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCf3dmjUHll2nfF60RAoc5AJ4yLuRDaXECxjq2zU4AFxxKkdFNIACguoNf
+F7CIcUmgn85wBcDk0uGbtzs=
+=aVXN
+-----END PGP SIGNATURE-----
diff --git a/dev-libs/apr/apr-0.9.5-r3.ebuild b/dev-libs/apr/apr-0.9.5-r3.ebuild
new file mode 100644
index 000000000000..47d94fb2a697
--- /dev/null
+++ b/dev-libs/apr/apr-0.9.5-r3.ebuild
@@ -0,0 +1,48 @@
+# 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.5-r3.ebuild,v 1.1 2005/05/09 14:44:25 beu 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 ~ppc ~ppc64 ~s390 ~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-r3.ebuild b/dev-libs/apr/apr-0.9.6-r3.ebuild
new file mode 100644
index 000000000000..80d0c48dccdc
--- /dev/null
+++ b/dev-libs/apr/apr-0.9.6-r3.ebuild
@@ -0,0 +1,48 @@
+# 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.1 2005/05/09 14:44:25 beu 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 ~ppc ~ppc64 ~s390 ~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/files/digest-apr-0.9.5-r3 b/dev-libs/apr/files/digest-apr-0.9.5-r3
new file mode 100644
index 000000000000..8e1b6255ac36
--- /dev/null
+++ b/dev-libs/apr/files/digest-apr-0.9.5-r3
@@ -0,0 +1 @@
+MD5 f764a8f23c9ae58ca4726f2716a100e7 apr-0.9.5.tar.gz 1021307
diff --git a/dev-libs/apr/files/digest-apr-0.9.6-r3 b/dev-libs/apr/files/digest-apr-0.9.6-r3
new file mode 100644
index 000000000000..06838c2f0f27
--- /dev/null
+++ b/dev-libs/apr/files/digest-apr-0.9.6-r3
@@ -0,0 +1 @@
+MD5 b7e4c52cccb421b42a41b0bed5a9f9bc apr-0.9.6.tar.gz 1025231