Version bump

Package-Manager: portage-2.1_pre6

9 files changed, 155 insertions, 5 deletions

diff --git a/dev-libs/apr-util/ChangeLog b/dev-libs/apr-util/ChangeLog
index 7e0c38588489..d747ea3f48f2 100644
--- a/dev-libs/apr-util/ChangeLog
+++ b/dev-libs/apr-util/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/apr-util
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr-util/ChangeLog,v 1.47 2006/04/16 21:16:06 vericgar Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr-util/ChangeLog,v 1.48 2006/04/16 22:04:38 vericgar Exp $
+
+*apr-util-0.9.12 (16 Apr 2006)
+
+  16 Apr 2006; Michael Stewart <vericgar@gentoo.org>
+  +apr-util-0.9.12.ebuild:
+  Version bump
 
 *apr-util-1.2.7 (16 Apr 2006)
 
diff --git a/dev-libs/apr-util/Manifest b/dev-libs/apr-util/Manifest
index 2b155d0e3db4..60912386f743 100644
--- a/dev-libs/apr-util/Manifest
+++ b/dev-libs/apr-util/Manifest
@@ -1,6 +1,9 @@
 MD5 10d6ac01c283f4592fcc25071f0ac46b ChangeLog 6040
 RMD160 cddb4320a55455b13900e4c5409b531550b0747e ChangeLog 6040
 SHA256 f6c4911ccf1118b256b727497157f46a8e855ed24c3aedbd7afc6e1a5b8199db ChangeLog 6040
+MD5 37a85923a8af5b2431838d776145e704 apr-util-0.9.12.ebuild 1855
+RMD160 3721968c9e78273b76852b8dce7349c6010ba3e0 apr-util-0.9.12.ebuild 1855
+SHA256 390cdf8c20f8c21213e0d00c78908096607d6ada45481554f1eab89f73455a63 apr-util-0.9.12.ebuild 1855
 MD5 069b36180a4df1925f6d6b7ab8eed362 apr-util-0.9.6-r2.ebuild 2036
 RMD160 4566d2c311956c728e35d3bcfb23b185f5291806 apr-util-0.9.6-r2.ebuild 2036
 SHA256 fb55f6582b5a49157cb3ec7cf0e33273f78f895d761c5d632ec510d35b0c52ee apr-util-0.9.6-r2.ebuild 2036
@@ -19,6 +22,9 @@ SHA256 cfee60a258354674478a29cfc6697b88ac3f73acda5a7f1514427339afe58961 apr-util
 MD5 5c39070c5a30db4f82b9373cadee4c45 files/apr-util-0.9.x-161086:161087.patch 4671
 RMD160 e43a94b8320f6069dae600ffc4c0bf9c2e1fcbc7 files/apr-util-0.9.x-161086:161087.patch 4671
 SHA256 4967c04070d5a58ba206a11cbf2ba913da1052ad654a05a0af59228900c52e53 files/apr-util-0.9.x-161086:161087.patch 4671
+MD5 537f6952f094fa8eeaa7a554c6eedb6d files/digest-apr-util-0.9.12 247
+RMD160 b240c0c4d2dcb011148569f97f233d826c76876b files/digest-apr-util-0.9.12 247
+SHA256 310612e3557e9aae1db8944765517b28b1a3a354a966a4349664ac51021bc89a files/digest-apr-util-0.9.12 247
 MD5 467e8ba98a938b691d27ec9971dbfe12 files/digest-apr-util-0.9.6-r2 66
 RMD160 3d559313b8cfac5fbecda3e9f36e62647af5bc50 files/digest-apr-util-0.9.6-r2 66
 SHA256 57a6415ba2347c7c5701709d8290dc6410e568d9b3241d11b02f161cc8dd5713 files/digest-apr-util-0.9.6-r2 66
diff --git a/dev-libs/apr-util/apr-util-0.9.12.ebuild b/dev-libs/apr-util/apr-util-0.9.12.ebuild
new file mode 100644
index 000000000000..d0a984f34730
--- /dev/null
+++ b/dev-libs/apr-util/apr-util-0.9.12.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2006 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.12.ebuild,v 1.1 2006/04/16 22:04:38 vericgar 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 ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="berkdb gdbm ldap"
+RESTRICT="test"
+
+DEPEND="dev-libs/expat
+	~dev-libs/apr-0.9.7
+	berkdb? ( =sys-libs/db-4* )
+	gdbm? ( sys-libs/gdbm )
+	ldap? ( =net-nds/openldap-2* )"
+
+src_compile() {
+
+	local myconf=""
+
+	use ldap && myconf="${myconf} --with-ldap"
+	myconf="${myconf} $(use_with gdbm)"
+
+	if use berkdb; then
+		if has_version '=sys-libs/db-4.3*'; then
+			myconf="${myconf} --with-dbm=db43
+			--with-berkeley-db=/usr/include/db4.3:/usr/$(get_libdir)"
+		elif has_version '=sys-libs/db-4.2*'; then
+			myconf="${myconf} --with-dbm=db42
+			--with-berkeley-db=/usr/include/db4.2:/usr/$(get_libdir)"
+		elif has_version '=sys-libs/db-4*'; then
+			myconf="${myconf} --with-dbm=db4
+			--with-berkeley-db=/usr/include/db4:/usr/$(get_libdir)"
+		fi
+	else
+		myconf="${myconf} --without-berkeley-db"
+	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:0 ${D}/usr/include/apr-0/
+}
diff --git a/dev-libs/apr-util/files/digest-apr-util-0.9.12 b/dev-libs/apr-util/files/digest-apr-util-0.9.12
new file mode 100644
index 000000000000..c3958886c8de
--- /dev/null
+++ b/dev-libs/apr-util/files/digest-apr-util-0.9.12
@@ -0,0 +1,3 @@
+MD5 8e9cc71a1303b67b3278fbeab9799f2e apr-util-0.9.12.tar.gz 592364
+RMD160 a4554def22f29f56aab34cacddc7fa65c412f446 apr-util-0.9.12.tar.gz 592364
+SHA256 5768fcc4d38fa6f811b0a89e2ef450d0f52688ff9263e548819adb096fbfc9c3 apr-util-0.9.12.tar.gz 592364
diff --git a/dev-libs/apr/ChangeLog b/dev-libs/apr/ChangeLog
index 1efca47d6b23..faf5a97a99a0 100644
--- a/dev-libs/apr/ChangeLog
+++ b/dev-libs/apr/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/apr
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr/ChangeLog,v 1.53 2006/04/16 21:14:43 vericgar Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr/ChangeLog,v 1.54 2006/04/16 22:03:00 vericgar Exp $
+
+*apr-0.9.12 (16 Apr 2006)
+
+  16 Apr 2006; Michael Stewart <vericgar@gentoo.org> +apr-0.9.12.ebuild:
+  Version bump
 
 *apr-1.2.7 (16 Apr 2006)
 
diff --git a/dev-libs/apr/Manifest b/dev-libs/apr/Manifest
index b6940a59e51f..b177ed0a2719 100644
--- a/dev-libs/apr/Manifest
+++ b/dev-libs/apr/Manifest
@@ -1,6 +1,9 @@
 MD5 09c1704f8f73ef4ff99cb008c149dfd3 ChangeLog 6605
 RMD160 1ab8f8f24631dc012c925d841859aea247481b9b ChangeLog 6605
 SHA256 ca479af85ed4eba22d0e06d3ab85d105e2934bb2db5e02a61449a21f6dbdfaeb ChangeLog 6605
+MD5 bbf2da094a23e10ab7b2113fb7d04161 apr-0.9.12.ebuild 1748
+RMD160 e34579ad29326888c7af53a4c3325a594add46dc apr-0.9.12.ebuild 1748
+SHA256 46ac9838aac4d93155fbbcbd739d2574d14501a901b552223402bc9c2f34739c apr-0.9.12.ebuild 1748
 MD5 2fc416814f4a3443b28fc548cf8d86dc apr-0.9.6-r3.ebuild 1534
 RMD160 7c2e849526b2de3e59606a0939adee47db1a3f11 apr-0.9.6-r3.ebuild 1534
 SHA256 0795ed7fb1daed9fa97160ce1d117ce43ec063d48b06f1a6b56ab28a0497db08 apr-0.9.6-r3.ebuild 1534
@@ -16,15 +19,18 @@ SHA256 78fec1ac5f97362ce8c08d747713dd71f3c6b0a0a417f0fa2c713ad015ec1f48 apr-1.2.
 MD5 f4b942356b611c32324e6b2dd50fd6fe apr-1.2.7.ebuild 1095
 RMD160 2c7455f68e13e6373f429c491a42b291a75d6ab0 apr-1.2.7.ebuild 1095
 SHA256 9426d4a9c362bd72159f5dc35716ed4ca7c84b82ec2cb348b80934e88d14f2b3 apr-1.2.7.ebuild 1095
+MD5 b57608f31fa2af09b38d76820aa79ea1 files/digest-apr-0.9.12 235
+RMD160 3febf6c27a02388ccc7b2cf8b37f55b2006ffad6 files/digest-apr-0.9.12 235
+SHA256 9ec8cac33dfcf931b83ae7a71c104a6e0844bbb0a9af30e0fbabbe0934474be1 files/digest-apr-0.9.12 235
 MD5 2b9c5f7ab799254e5738997732c9be8c files/digest-apr-0.9.6-r3 62
 RMD160 c93df8a84d86a2c31c744ca0c9c5293f5a207515 files/digest-apr-0.9.6-r3 62
 SHA256 f97cc8492692b5879bf12d8c6eeac60f002ad64be889ee0ebdce755e365fd5c2 files/digest-apr-0.9.6-r3 62
 MD5 2b9c5f7ab799254e5738997732c9be8c files/digest-apr-0.9.6-r4 62
 RMD160 c93df8a84d86a2c31c744ca0c9c5293f5a207515 files/digest-apr-0.9.6-r4 62
 SHA256 f97cc8492692b5879bf12d8c6eeac60f002ad64be889ee0ebdce755e365fd5c2 files/digest-apr-0.9.6-r4 62
-MD5 7445fa25c23b6a6c375133876ebed18b files/digest-apr-0.9.7 62
-RMD160 9bbfc09235db6c1c632fe03fb15c2dd03d7c8d86 files/digest-apr-0.9.7 62
-SHA256 4b5e9b75f16afb281d2894811af5eed7bec8e042429dcd9484f3bb4b177a3acb files/digest-apr-0.9.7 62
+MD5 51c36bd8aa68296e90099e1a3e868fd3 files/digest-apr-0.9.7 232
+RMD160 f7f9335e7b968ea15f87212684155982c0d9e9e0 files/digest-apr-0.9.7 232
+SHA256 d496f84ad2f9918fa3296c638bfd36b02d81e31a73e4b887901a2078de262c21 files/digest-apr-0.9.7 232
 MD5 235ee98ffaa0c6df524ab27e0d862290 files/digest-apr-1.2.2 232
 RMD160 6920410c7abecdc6e6cf9f0b89266d987e13949f files/digest-apr-1.2.2 232
 SHA256 0470c016cff11975573657a5dfbad7f8c3e902e6841d39de4f349dcb61b95e8d files/digest-apr-1.2.2 232
diff --git a/dev-libs/apr/apr-0.9.12.ebuild b/dev-libs/apr/apr-0.9.12.ebuild
new file mode 100644
index 000000000000..d999c7e1cea5
--- /dev/null
+++ b/dev-libs/apr/apr-0.9.12.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2006 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.1 2006/04/16 22:03:00 vericgar 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 ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="ipv6 urandom"
+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"
+	if use urandom; then
+		einfo "Using /dev/urandom as random device"
+		myconf="${myconf} --with-devrandom=/dev/urandom"
+	else
+		einfo "Using /dev/random as random device"
+		myconf="${myconf} --with-devrandom=/dev/random"
+	fi
+
+	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.12 b/dev-libs/apr/files/digest-apr-0.9.12
new file mode 100644
index 000000000000..ab6bc4c13a70
--- /dev/null
+++ b/dev-libs/apr/files/digest-apr-0.9.12
@@ -0,0 +1,3 @@
+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.7 b/dev-libs/apr/files/digest-apr-0.9.7
index c25885a33882..3ec4c9a9e565 100644
--- a/dev-libs/apr/files/digest-apr-0.9.7
+++ b/dev-libs/apr/files/digest-apr-0.9.7
@@ -1 +1,3 @@
 MD5 061772cac0d8acf8e3ee402eb57944c9 apr-0.9.7.tar.gz 1045136
+RMD160 d2978d3f3d505885e0782b2b2b40fa1ccc2e9e7a apr-0.9.7.tar.gz 1045136
+SHA256 9d102909d840b2e2960a8175408e6d6a6e28a35112bd1190a22d346b0b66b2ba apr-0.9.7.tar.gz 1045136