Rev bumps to pick up on the LFS-removal from apr.

(Portage version: 2.0.51.21-r1)

6 files changed, 147 insertions, 7 deletions

diff --git a/dev-libs/apr-util/ChangeLog b/dev-libs/apr-util/ChangeLog
index 570900ec902a..a76cbf4db273 100644
--- a/dev-libs/apr-util/ChangeLog
+++ b/dev-libs/apr-util/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/apr-util
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr-util/ChangeLog,v 1.19 2005/05/10 19:17:13 psi29a Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr-util/ChangeLog,v 1.20 2005/05/10 23:54:36 beu Exp $
+
+*apr-util-0.9.6-r2 (10 May 2005)
+*apr-util-0.9.5-r1 (10 May 2005)
+
+  10 May 2005; Elfyn McBratney <beu@gentoo.org> +apr-util-0.9.5-r1.ebuild,
+  +apr-util-0.9.6-r2.ebuild:
+  Rev bumps to pick up on the LFS-removal from apr.
 
   10 May 2005; Bret Curtis <psi29a@gentoo.org> apr-util-0.9.5.ebuild:
   marked for testing, ~mips
diff --git a/dev-libs/apr-util/Manifest b/dev-libs/apr-util/Manifest
index ea79281dd3fa..1d974d77cd24 100644
--- a/dev-libs/apr-util/Manifest
+++ b/dev-libs/apr-util/Manifest
@@ -1,11 +1,15 @@
-MD5 9159abff9c58384c6d5d13383ed8a4b6 ChangeLog 2545
-MD5 002e4671e4dafc862750892ded6c64db apr-util-0.9.5.ebuild 1706
+MD5 002e4671e4dafc862750892ded6c64db apr-util-0.9.5-r1.ebuild 1706
+MD5 f4894c8cd7794f0ae4f6db0af036d5e3 apr-util-0.9.6-r2.ebuild 1871
 MD5 4c63d013eac0fe64a546df77bdeb8dd3 apr-util-0.9.6.ebuild 1692
-MD5 784bf6413219de4d892796ca68f27517 apr-util-1.1.2.ebuild 1731
 MD5 0d18f0fe5d603b41b988373892caf195 metadata.xml 226
+MD5 9159abff9c58384c6d5d13383ed8a4b6 ChangeLog 2545
 MD5 f4894c8cd7794f0ae4f6db0af036d5e3 apr-util-0.9.6-r1.ebuild 1871
-MD5 4e443d47db271d53344974fe62da6692 files/digest-apr-util-0.9.5 66
+MD5 002e4671e4dafc862750892ded6c64db apr-util-0.9.5.ebuild 1706
+MD5 784bf6413219de4d892796ca68f27517 apr-util-1.1.2.ebuild 1731
+MD5 467e8ba98a938b691d27ec9971dbfe12 files/digest-apr-util-0.9.6-r1 66
+MD5 5c39070c5a30db4f82b9373cadee4c45 files/apr-util-0.9.x-161086:161087.patch 4671
+MD5 467e8ba98a938b691d27ec9971dbfe12 files/digest-apr-util-0.9.6-r2 66
+MD5 4e443d47db271d53344974fe62da6692 files/digest-apr-util-0.9.5-r1 66
 MD5 467e8ba98a938b691d27ec9971dbfe12 files/digest-apr-util-0.9.6 66
 MD5 c46881efc10b92ab7b6189cdc9070929 files/digest-apr-util-1.1.2 66
-MD5 5c39070c5a30db4f82b9373cadee4c45 files/apr-util-0.9.x-161086:161087.patch 4671
-MD5 467e8ba98a938b691d27ec9971dbfe12 files/digest-apr-util-0.9.6-r1 66
+MD5 4e443d47db271d53344974fe62da6692 files/digest-apr-util-0.9.5 66
diff --git a/dev-libs/apr-util/apr-util-0.9.5-r1.ebuild b/dev-libs/apr-util/apr-util-0.9.5-r1.ebuild
new file mode 100644
index 000000000000..cade6c52c0b4
--- /dev/null
+++ b/dev-libs/apr-util/apr-util-0.9.5-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr-util/apr-util-0.9.5-r1.ebuild,v 1.1 2005/05/10 23:54:36 beu Exp $
+
+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 ~mips"
+IUSE="berkdb gdbm ldap"
+
+DEPEND="dev-libs/expat
+	~dev-libs/apr-0.9.5
+	berkdb? ( sys-libs/db )
+	gdbm? ( sys-libs/gdbm )
+	ldap? ( =net-nds/openldap-2* )"
+
+src_compile() {
+	local myconf=""
+	if use ldap; then
+		myconf="${myconf} --with-ldap"
+	fi
+
+	if use berkdb; then
+		if has_version '=sys-libs/db-4.2*'; then
+			myconf="${myconf} --with-dbm=db42 --with-berkely-db=/usr"
+		elif has_version '=sys-libs/db-4*'; then
+			myconf="${myconf} --with-dbm=db4 --with-berkely-db=/usr"
+		elif has_version '=sys-libs/db-3*'; then
+			myconf="${myconf} --with-dbm=db3 --with-berkely-db=/usr"
+		elif has_version '=sys-libs/db-2'; then
+			myconf="${myconf} --with-dbm=db2 --with-berkely-db=/usr"
+		fi
+	fi
+
+	econf \
+		--datadir=/usr/share/apr-util-0 \
+		--with-apr=/usr \
+		--with-expat=/usr \
+		$myconf || die
+
+	emake || die
+}
+
+src_install() {
+	make DESTDIR="${D}" installbuilddir=/usr/share/apr-util-0/build install || die
+
+	#bogus values pointing at /var/tmp/portage
+	sed -i -e 's:APU_SOURCE_DIR=.*:APU_SOURCE_DIR=:g' ${D}/usr/bin/apu-config
+	sed -i -e 's:APU_BUILD_DIR=.*:APU_BUILD_DIR=/usr/share/apr-util-0/build:g' ${D}/usr/bin/apu-config
+
+	dodoc CHANGES NOTICE
+
+	# Will install as portage user when using userpriv. Fixing
+	chown -R root:root ${D}/usr/include/apr-0/
+}
diff --git a/dev-libs/apr-util/apr-util-0.9.6-r2.ebuild b/dev-libs/apr-util/apr-util-0.9.6-r2.ebuild
new file mode 100644
index 000000000000..6afc427b580d
--- /dev/null
+++ b/dev-libs/apr-util/apr-util-0.9.6-r2.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr-util/apr-util-0.9.6-r2.ebuild,v 1.1 2005/05/10 23:54:36 beu Exp $
+
+inherit eutils
+
+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="berkdb gdbm ldap"
+
+DEPEND="dev-libs/expat
+	~dev-libs/apr-0.9.6
+	berkdb? ( sys-libs/db )
+	gdbm? ( sys-libs/gdbm )
+	ldap? ( =net-nds/openldap-2* )"
+
+src_unpack() {
+	unpack ${A} || die "unpack"
+
+	cd ${S} || die
+
+	epatch "${FILESDIR}/apr-util-0.9.x-161086:161087.patch" \
+		|| die "patching failed"
+}
+
+src_compile() {
+	local myconf=""
+	if use ldap; then
+		myconf="${myconf} --with-ldap"
+	fi
+
+	if use berkdb; then
+		if has_version '=sys-libs/db-4.2*'; then
+			myconf="${myconf} --with-dbm=db42 --with-berkely-db=/usr"
+		elif has_version '=sys-libs/db-4*'; then
+			myconf="${myconf} --with-dbm=db4 --with-berkely-db=/usr"
+		elif has_version '=sys-libs/db-3*'; then
+			myconf="${myconf} --with-dbm=db3 --with-berkely-db=/usr"
+		elif has_version '=sys-libs/db-2'; then
+			myconf="${myconf} --with-dbm=db2 --with-berkely-db=/usr"
+		fi
+	fi
+
+	econf \
+		--datadir=/usr/share/apr-util-0 \
+		--with-apr=/usr \
+		--with-expat=/usr \
+		$myconf || die
+
+	emake || die
+}
+
+src_install() {
+	make DESTDIR="${D}" installbuilddir=/usr/share/apr-util-0/build install || die
+
+	#bogus values pointing at /var/tmp/portage
+	sed -i -e 's:APU_SOURCE_DIR=.*:APU_SOURCE_DIR=:g' ${D}/usr/bin/apu-config
+	sed -i -e 's:APU_BUILD_DIR=.*:APU_BUILD_DIR=/usr/share/apr-util-0/build:g' ${D}/usr/bin/apu-config
+
+	dodoc CHANGES NOTICE
+
+	# Will install as portage user when using userpriv. Fixing
+	chown -R root:root ${D}/usr/include/apr-0/
+}
diff --git a/dev-libs/apr-util/files/digest-apr-util-0.9.5-r1 b/dev-libs/apr-util/files/digest-apr-util-0.9.5-r1
new file mode 100644
index 000000000000..e08bbb75fde8
--- /dev/null
+++ b/dev-libs/apr-util/files/digest-apr-util-0.9.5-r1
@@ -0,0 +1 @@
+MD5 5d9effcdd7c1b84d5af4a29be29936b9 apr-util-0.9.5.tar.gz 720534
diff --git a/dev-libs/apr-util/files/digest-apr-util-0.9.6-r2 b/dev-libs/apr-util/files/digest-apr-util-0.9.6-r2
new file mode 100644
index 000000000000..906aebbf651a
--- /dev/null
+++ b/dev-libs/apr-util/files/digest-apr-util-0.9.6-r2
@@ -0,0 +1 @@
+MD5 a3a2671368e47b7efcb381e991451a9f apr-util-0.9.6.tar.gz 724680