Fixing compilation of apr-util-0.9.12 against >=sys-libs/db-4.4 (#169507, thanks to Michael Edenfield <kutulu at kutulu.org> for pointing at the UPSTREAM patch).

(Portage version: 2.1.2.1)

4 files changed, 202 insertions, 1 deletions

diff --git a/dev-libs/apr-util/ChangeLog b/dev-libs/apr-util/ChangeLog
index a750f17c8a86..88bb1d940de2 100644
--- a/dev-libs/apr-util/ChangeLog
+++ b/dev-libs/apr-util/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-libs/apr-util
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr-util/ChangeLog,v 1.71 2007/02/11 14:25:44 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr-util/ChangeLog,v 1.72 2007/03/07 09:11:14 phreak Exp $
+
+*apr-util-0.9.12-r1 (07 Mar 2007)
+
+  07 Mar 2007; Christian Heim <phreak@gentoo.org>
+  +files/apr-util-0.9.12-db-4.5.patch, +apr-util-0.9.12-r1.ebuild:
+  Fixing compilation of apr-util-0.9.12 against >=sys-libs/db-4.4 (#169507,
+  thanks to Michael Edenfield <kutulu at kutulu.org> for pointing at the
+  UPSTREAM patch).
 
   11 Feb 2007; Fabian Groffen <grobian@gentoo.org> apr-util-0.9.12.ebuild,
   apr-util-0.9.13.ebuild, apr-util-1.2.8.ebuild:
diff --git a/dev-libs/apr-util/apr-util-0.9.12-r1.ebuild b/dev-libs/apr-util/apr-util-0.9.12-r1.ebuild
new file mode 100644
index 000000000000..e0cd9ae3dad7
--- /dev/null
+++ b/dev-libs/apr-util/apr-util-0.9.12-r1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2007 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-r1.ebuild,v 1.1 2007/03/07 09:11:14 phreak Exp $
+
+inherit autotools eutils flag-o-matic libtool db-use
+
+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 ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE="berkdb gdbm ldap"
+RESTRICT="test"
+
+DEPEND="dev-libs/expat
+	~dev-libs/apr-${PV}
+	berkdb? ( =sys-libs/db-4* )
+	gdbm? ( sys-libs/gdbm )
+	ldap? ( =net-nds/openldap-2* )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}" 
+
+	epatch "${FILESDIR}"/${P}-linking.patch
+	epatch "${FILESDIR}"/${P}-db-4.5.patch
+	eautoreconf
+}
+
+
+src_compile() {
+	local myconf=""
+
+	use ldap && myconf="${myconf} --with-ldap"
+	myconf="${myconf} $(use_with gdbm)"
+
+	if use berkdb; then
+		dbver="$(db_findver sys-libs/db)" || die "Unable to find db version"
+		dbver="$(db_ver_to_slot "$dbver")"
+		dbver="${dbver/\./}"
+		myconf="${myconf} --with-dbm=db${dbver}
+		--with-berkeley-db=$(db_includedir):/usr/$(get_libdir)"
+	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/
+
+	# This file is only used on AIX systems, which gentoo is not,
+	# and causes collisions between the SLOTs, so kill it
+	rm "${D}"/usr/$(get_libdir)/aprutil.exp
+
+}
diff --git a/dev-libs/apr-util/files/apr-util-0.9.12-db-4.5.patch b/dev-libs/apr-util/files/apr-util-0.9.12-db-4.5.patch
new file mode 100644
index 000000000000..09e60b22640a
--- /dev/null
+++ b/dev-libs/apr-util/files/apr-util-0.9.12-db-4.5.patch
@@ -0,0 +1,115 @@
+--- apr/apr-util/trunk/build/dbm.m4	2006/02/09 04:13:19	376178
++++ apr/apr-util/trunk/build/dbm.m4	2006/11/08 20:45:12	472635
+@@ -464,7 +464,25 @@
+     apu_db_version=4
+   fi
+ ])
+-
++dnl
++dnl APU_CHECK_DB45: is DB4.5 present?
++dnl
++dnl if present: sets apu_db_header, apu_db_lib, and apu_db_version
++dnl
++AC_DEFUN([APU_CHECK_DB45], [
++  places=$1
++  if test -z "$places"; then
++    places="std /usr/local/BerkeleyDB.4.5 /boot/home/config"
++  fi
++  APU_CHECK_BERKELEY_DB("4", "5", "-1",
++    "$places",
++    "db45/db.h db4/db.h db.h",
++    "db-4.5 db4-4.5 db45 db4 db"
++  )
++  if test "$apu_have_db" = "1"; then
++    apu_db_version=4
++  fi
++])
+ 
+ AC_DEFUN([APU_CHECK_DB], [
+   requested=$1
+@@ -531,6 +549,12 @@
+       AC_MSG_ERROR(Berkeley db4 not found)
+     fi
+     ;;
++  db45)
++    APU_CHECK_DB44("$check_places")
++    if test "$apu_db_version" != "4"; then
++      AC_MSG_ERROR(Berkeley db4 not found)
++    fi
++    ;;
+   default)
+     APU_CHECK_DB_ALL("$check_places")
+     ;;
+@@ -543,23 +567,26 @@
+ AC_DEFUN([APU_CHECK_DB_ALL], [
+   all_places=$1
+  
+-  APU_CHECK_DB44("$all_places")
++  APU_CHECK_DB45("$all_places")
+   if test "$apu_db_version" != "4"; then
+-    APU_CHECK_DB43("$all_places")
++    APU_CHECK_DB44("$all_places")
+     if test "$apu_db_version" != "4"; then
+-      APU_CHECK_DB42("$all_places")
++      APU_CHECK_DB43("$all_places")
+       if test "$apu_db_version" != "4"; then
+-        APU_CHECK_DB41("$all_places")
++        APU_CHECK_DB42("$all_places")
+         if test "$apu_db_version" != "4"; then
+-          APU_CHECK_DB4("$all_places")
++          APU_CHECK_DB41("$all_places")
+           if test "$apu_db_version" != "4"; then
+-            APU_CHECK_DB3("$all_places")
+-            if test "$apu_db_version" != "3"; then
+-              APU_CHECK_DB2("$all_places")
+-              if test "$apu_db_version" != "2"; then
+-                APU_CHECK_DB1("$all_places")
+-                if test "$apu_db_version" != "1"; then
+-                  APU_CHECK_DB185("$all_places")
++            APU_CHECK_DB4("$all_places")
++            if test "$apu_db_version" != "4"; then
++              APU_CHECK_DB3("$all_places")
++              if test "$apu_db_version" != "3"; then
++                APU_CHECK_DB2("$all_places")
++                if test "$apu_db_version" != "2"; then
++                  APU_CHECK_DB1("$all_places")
++                  if test "$apu_db_version" != "1"; then
++                    APU_CHECK_DB185("$all_places")
++                  fi
+                 fi
+               fi
+             fi
+@@ -596,11 +623,11 @@
+ 
+   AC_ARG_WITH(dbm, [
+     --with-dbm=DBM          choose the DBM type to use.
+-      DBM={sdbm,gdbm,ndbm,db,db1,db185,db2,db3,db4,db41,db42,db43,db44}
++      DBM={sdbm,gdbm,ndbm,db,db1,db185,db2,db3,db4,db41,db42,db43,db44,db45}
+   ], [
+     if test "$withval" = "yes"; then
+       AC_MSG_ERROR([--with-dbm needs to specify a DBM type to use.
+-        One of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43, db44])
++        One of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43, db44, db45])
+     fi
+     requested="$withval"
+   ], [
+@@ -786,6 +813,10 @@
+       apu_use_db=1
+       apu_default_dbm=db4
+       ;;
++    db45)
++      apu_use_db=1
++      apu_default_dbm=db4
++      ;;
+     default)
+       dnl ### use more sophisticated DBMs for the default?
+       apu_default_dbm="sdbm (default)"
+@@ -793,7 +824,7 @@
+       ;;
+     *)
+       AC_MSG_ERROR([--with-dbm=$look_for is an unknown DBM type.
+-        Use one of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43, db44])
++        Use one of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43, db44 db45])
+       ;;
+   esac
+ 
diff --git a/dev-libs/apr-util/files/digest-apr-util-0.9.12-r1 b/dev-libs/apr-util/files/digest-apr-util-0.9.12-r1
new file mode 100644
index 000000000000..c3958886c8de
--- /dev/null
+++ b/dev-libs/apr-util/files/digest-apr-util-0.9.12-r1
@@ -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