Version bump.

(Portage version: 2.0.51.18)

8 files changed, 154 insertions, 6 deletions

diff --git a/dev-libs/apr-util/ChangeLog b/dev-libs/apr-util/ChangeLog
index e6d982905ee5..d89382b35643 100644
--- a/dev-libs/apr-util/ChangeLog
+++ b/dev-libs/apr-util/ChangeLog
@@ -1,6 +1,11 @@
 # 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.12 2005/02/28 22:10:30 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr-util/ChangeLog,v 1.13 2005/03/02 23:24:31 beu Exp $
+
+*apr-util-0.9.6 (02 Mar 2005)
+
+  02 Mar 2005; Elfyn McBratney <beu@gentoo.org> +apr-util-0.9.6.ebuild:
+  Version bump.
 
   28 Feb 2005; Jeremy Huddleston <eradicator@gentoo.org>
   apr-util-0.9.5.ebuild:
diff --git a/dev-libs/apr-util/Manifest b/dev-libs/apr-util/Manifest
index 2e6debb04fb8..da36fdf1f3c0 100644
--- a/dev-libs/apr-util/Manifest
+++ b/dev-libs/apr-util/Manifest
@@ -1,4 +1,6 @@
+MD5 0d18f0fe5d603b41b988373892caf195 metadata.xml 226
 MD5 9a89602e65f1d5a81c07d5a0f49a7a4d ChangeLog 1498
+MD5 24a2b494203d53b9e024363a0f134c6b apr-util-0.9.6.ebuild 1696
 MD5 6df6e4959fdf35fb3971563790602b94 apr-util-0.9.5.ebuild 1696
-MD5 0d18f0fe5d603b41b988373892caf195 metadata.xml 226
 MD5 4e443d47db271d53344974fe62da6692 files/digest-apr-util-0.9.5 66
+MD5 467e8ba98a938b691d27ec9971dbfe12 files/digest-apr-util-0.9.6 66
diff --git a/dev-libs/apr-util/apr-util-0.9.6.ebuild b/dev-libs/apr-util/apr-util-0.9.6.ebuild
new file mode 100644
index 000000000000..ddde2cf37218
--- /dev/null
+++ b/dev-libs/apr-util/apr-util-0.9.6.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.6.ebuild,v 1.1 2005/03/02 23:24:31 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 ~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_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.6 b/dev-libs/apr-util/files/digest-apr-util-0.9.6
new file mode 100644
index 000000000000..906aebbf651a
--- /dev/null
+++ b/dev-libs/apr-util/files/digest-apr-util-0.9.6
@@ -0,0 +1 @@
+MD5 a3a2671368e47b7efcb381e991451a9f apr-util-0.9.6.tar.gz 724680
diff --git a/dev-libs/apr/ChangeLog b/dev-libs/apr/ChangeLog
index 8f9471336ef6..8132398f66cd 100644
--- a/dev-libs/apr/ChangeLog
+++ b/dev-libs/apr/ChangeLog
@@ -1,6 +1,11 @@
 # 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.17 2005/02/28 21:54:57 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr/ChangeLog,v 1.18 2005/03/02 23:26:57 beu Exp $
+
+*apr-0.9.6 (02 Mar 2005)
+
+  02 Mar 2005; Elfyn McBratney <beu@gentoo.org> +apr-0.9.6.ebuild:
+  Version bump.
 
   28 Feb 2005; Jeremy Huddleston <eradicator@gentoo.org> apr-0.9.5.ebuild:
   Killed einstall usage.  Back to using econf to fix multilib problems.
diff --git a/dev-libs/apr/Manifest b/dev-libs/apr/Manifest
index eb578c88819c..a7c93b4eb3a6 100644
--- a/dev-libs/apr/Manifest
+++ b/dev-libs/apr/Manifest
@@ -1,8 +1,10 @@
+MD5 0d18f0fe5d603b41b988373892caf195 metadata.xml 226
 MD5 33ae3bbbf4acb74d2ae47f32466040a6 ChangeLog 2014
-MD5 1966d0523cefe9c3609d6c6b50bfd77e apr-0.9.2.ebuild 1382
-MD5 c1afc349a8efdcb3d3d1b8788aa2108e apr-0.9.4.ebuild 897
 MD5 8fe47d867b814b5b370b0ee7e0555e1e apr-0.9.5.ebuild 2185
-MD5 0d18f0fe5d603b41b988373892caf195 metadata.xml 226
+MD5 c1afc349a8efdcb3d3d1b8788aa2108e apr-0.9.4.ebuild 897
+MD5 ef266ca193d232aa4702e501347b2952 apr-0.9.6.ebuild 2180
+MD5 1966d0523cefe9c3609d6c6b50bfd77e apr-0.9.2.ebuild 1382
 MD5 88cfa3669212fe49d07ffc1d0be3db98 files/digest-apr-0.9.2 139
+MD5 2b9c5f7ab799254e5738997732c9be8c files/digest-apr-0.9.6 62
 MD5 322c68a2024ba4c63bc10a5e97bd79c5 files/digest-apr-0.9.4 128
 MD5 a90539853bca24e2f0e77192d41e5a01 files/digest-apr-0.9.5 62
diff --git a/dev-libs/apr/apr-0.9.6.ebuild b/dev-libs/apr/apr-0.9.6.ebuild
new file mode 100644
index 000000000000..26ab941e467c
--- /dev/null
+++ b/dev-libs/apr/apr-0.9.6.ebuild
@@ -0,0 +1,74 @@
+# 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.ebuild,v 1.1 2005/03/02 23:26:57 beu Exp $
+
+inherit flag-o-matic
+
+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 ~sparc ~x86"
+IUSE="ipv6"
+RESTRICT="test"
+
+DEPEND=""
+
+# this function shall maybe go into flag-o-matic.eclass
+lfs-flags() {
+	echo -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
+}
+
+# returns true, if LFS is supported (and supposed to be bugfree ;) by current system
+supports-lfs() {
+	# for some reason (I do not know who wrote this) we do not want LFS on glibc-2.2
+	# maybe it's broken then
+
+	has_version '>=sys-libs/glibc-2.3*' && return 0
+	has_version '=sys-libs/glibc-2.2*'  && return 1
+	return 0
+}
+
+set_filter_flags() {
+	CFLAGS="${CFLAGS/  / }"
+
+	supports-lfs && append-lfs-flags || filter-lfs-flags
+}
+
+src_compile() {
+	set_filter_flags
+
+	myconf="--datadir=/usr/share/apr-0"
+
+	myconf="${myconf} $(use_enable ipv6)"
+	myconf="${myconf} --enable-threads"
+	myconf="${myconf} --enable-nonportable-atomics"
+
+	econf ${myconf} || die
+	emake || die
+}
+
+src_install() {
+	set_filter_flags
+
+	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
+
+	# fix apr-config to reflect LFS
+	supports-lfs && \
+		sed -i -e "s:CPPFLAGS=\"\\(.*\\)\":CPPFLAGS=\"\\1 `lfs-flags`\":" ${D}/usr/bin/apr-config
+
+	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.6 b/dev-libs/apr/files/digest-apr-0.9.6
new file mode 100644
index 000000000000..06838c2f0f27
--- /dev/null
+++ b/dev-libs/apr/files/digest-apr-0.9.6
@@ -0,0 +1 @@
+MD5 b7e4c52cccb421b42a41b0bed5a9f9bc apr-0.9.6.tar.gz 1025231