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).

Package-Manager: portage-2.1.2.1

5 files changed, 227 insertions, 5 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/Manifest b/dev-libs/apr-util/Manifest
index 54efa4fa9203..eaf2df50ce85 100644
--- a/dev-libs/apr-util/Manifest
+++ b/dev-libs/apr-util/Manifest
@@ -1,3 +1,10 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX apr-util-0.9.12-db-4.5.patch 3700 RMD160 bf230d5e84cb1ed09645f37ce73e803c5ac0c7ff SHA1 e03eef45265ecd0510d6e15118403bd2ef956b32 SHA256 e77d59dfe8289d3ad6e96d12651534e6634c629b91723c43583b7171308f99d3
+MD5 e04ae5a7ef56703daed38416e3e75a64 files/apr-util-0.9.12-db-4.5.patch 3700
+RMD160 bf230d5e84cb1ed09645f37ce73e803c5ac0c7ff files/apr-util-0.9.12-db-4.5.patch 3700
+SHA256 e77d59dfe8289d3ad6e96d12651534e6634c629b91723c43583b7171308f99d3 files/apr-util-0.9.12-db-4.5.patch 3700
 AUX apr-util-0.9.12-linking.patch 552 RMD160 b989add276da33dc37d94b443b34f006033321e8 SHA1 e24be832134302352472f49515450db1082d2e81 SHA256 57c40f62214094ab36b5e940e07bfbee5555ad6a08ab63947fd7f8e5c5875472
 MD5 5dc0176e66c29e58c1c49e52a3292e87 files/apr-util-0.9.12-linking.patch 552
 RMD160 b989add276da33dc37d94b443b34f006033321e8 files/apr-util-0.9.12-linking.patch 552
@@ -5,6 +12,10 @@ SHA256 57c40f62214094ab36b5e940e07bfbee5555ad6a08ab63947fd7f8e5c5875472 files/ap
 DIST apr-util-0.9.12.tar.gz 592364 RMD160 a4554def22f29f56aab34cacddc7fa65c412f446 SHA1 402969874b301d11252acd6eaf0bb01aad3e2908 SHA256 5768fcc4d38fa6f811b0a89e2ef450d0f52688ff9263e548819adb096fbfc9c3
 DIST apr-util-0.9.13.tar.gz 593575 RMD160 34d6e517de6cb64e0b1aef45a99ee64f9ceba130 SHA1 079384f68d4efce2e74a3033adaae6bfc2bc3bad SHA256 8c5a2c9e0434a391360bbf3573a403a3f4f326d1b562f64276cbd4f92066da7f
 DIST apr-util-1.2.8.tar.gz 646379 RMD160 00b10ef0aab26f3ea5d374e2400c1dba566a9020 SHA1 49260d98b863756974bd83cd28bc39338d4f3a82 SHA256 6527cb0b3dd619acfca668412e84e52860dfd862054246ca903822d5ea824de6
+EBUILD apr-util-0.9.12-r1.ebuild 2007 RMD160 0000f62dae2cb0eecaed293a5e4a4b47ad5b8bdc SHA1 0ec9969c1606938936f40de70116be9551b2ce43 SHA256 dfba1c437c44cdc5f129cbf285b7004d82c30eb708d102a4057a55a21572a5c3
+MD5 0bc955cecb77c4b75b79ed2686ebb79b apr-util-0.9.12-r1.ebuild 2007
+RMD160 0000f62dae2cb0eecaed293a5e4a4b47ad5b8bdc apr-util-0.9.12-r1.ebuild 2007
+SHA256 dfba1c437c44cdc5f129cbf285b7004d82c30eb708d102a4057a55a21572a5c3 apr-util-0.9.12-r1.ebuild 2007
 EBUILD apr-util-0.9.12.ebuild 1981 RMD160 f8061b4fddeed4353b1eabc3ba78e454e4242591 SHA1 df898c90235b53f788c0b003f0f1abd7f397fa9a SHA256 7d49dbc3f06d894124688771a9a05ae16ed0d2b57a8d4ff4625eceaa794e65f8
 MD5 f8b63a33d21be99d441962fbd622c64f apr-util-0.9.12.ebuild 1981
 RMD160 f8061b4fddeed4353b1eabc3ba78e454e4242591 apr-util-0.9.12.ebuild 1981
@@ -17,10 +28,10 @@ EBUILD apr-util-1.2.8.ebuild 1868 RMD160 0a2845c7293b7e8a937645236d60badffad7020
 MD5 51bb66b6c92b93cc1d2004ba6b14bf77 apr-util-1.2.8.ebuild 1868
 RMD160 0a2845c7293b7e8a937645236d60badffad70200 apr-util-1.2.8.ebuild 1868
 SHA256 c781f5f97513abd704d03591d836b2e0a181d7c49e33d627a32f8e2e065d9d66 apr-util-1.2.8.ebuild 1868
-MISC ChangeLog 9144 RMD160 2dabd439a5d722c99d613c16534f23c105562059 SHA1 40125df80bc26ad5d0a63f70b19e167213471ac8 SHA256 de05646f433e3662011ff0ffd33b4908bf2f9acf97009bfb409b690b177a1703
-MD5 478bc5bcec4df305e36eaf72a73e9c8e ChangeLog 9144
-RMD160 2dabd439a5d722c99d613c16534f23c105562059 ChangeLog 9144
-SHA256 de05646f433e3662011ff0ffd33b4908bf2f9acf97009bfb409b690b177a1703 ChangeLog 9144
+MISC ChangeLog 9464 RMD160 423479dccfff7df8f879a8445dd9d43cc2abce40 SHA1 3571c17d492ab9b3b0d117f4849d0c6f5a99582d SHA256 e8973065e41961cef1e8d673a6e4619d8e4ce133239b113b8720f01fd29e6f13
+MD5 fbdbfba82557cc94d1b2649a58e2d844 ChangeLog 9464
+RMD160 423479dccfff7df8f879a8445dd9d43cc2abce40 ChangeLog 9464
+SHA256 e8973065e41961cef1e8d673a6e4619d8e4ce133239b113b8720f01fd29e6f13 ChangeLog 9464
 MISC metadata.xml 229 RMD160 bb816bd761846ad578f8c1521a1f1ec6297410f4 SHA1 92fdbcb6a85ece96506733ad67a5e4e74a58a529 SHA256 8e1aafc5385805d45759406a60df79f0ce88aa1df1a58d44b596405d64c9226d
 MD5 17bfbf436c6d4afc4dea019597d048d1 metadata.xml 229
 RMD160 bb816bd761846ad578f8c1521a1f1ec6297410f4 metadata.xml 229
@@ -28,9 +39,19 @@ SHA256 8e1aafc5385805d45759406a60df79f0ce88aa1df1a58d44b596405d64c9226d metadata
 MD5 537f6952f094fa8eeaa7a554c6eedb6d files/digest-apr-util-0.9.12 247
 RMD160 b240c0c4d2dcb011148569f97f233d826c76876b files/digest-apr-util-0.9.12 247
 SHA256 c4de35e77ddfa5d48a08e9f231f723f01e67c5c560b2198595ccae73fddd1f9a files/digest-apr-util-0.9.12 247
+MD5 537f6952f094fa8eeaa7a554c6eedb6d files/digest-apr-util-0.9.12-r1 247
+RMD160 b240c0c4d2dcb011148569f97f233d826c76876b files/digest-apr-util-0.9.12-r1 247
+SHA256 c4de35e77ddfa5d48a08e9f231f723f01e67c5c560b2198595ccae73fddd1f9a files/digest-apr-util-0.9.12-r1 247
 MD5 b002adcdf387f1aa2c49afa574bb2653 files/digest-apr-util-0.9.13 247
 RMD160 aad7d0578eb8fe17ce81a374078f7e0ba2b42fad files/digest-apr-util-0.9.13 247
 SHA256 a33f63c70f5b71847671b5a22784c8429fb622e41bcb40d5e5d966f370a7fcad files/digest-apr-util-0.9.13 247
 MD5 72b58a37804e3e28ebe6755cb367d47f files/digest-apr-util-1.2.8 244
 RMD160 9d846b289ae538c833cb49e77403a7bd03329af8 files/digest-apr-util-1.2.8 244
 SHA256 a7c1a1dbe44c46c939a97e41af609777b572f8b6e389622588b65cfd710c4649 files/digest-apr-util-1.2.8 244
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.2 (GNU/Linux)
+
+iD8DBQFF7oHByuNVb5qfaOYRAiDWAJ9Y/wOiFEbKfaTeFwNDWIvQ9CHuYwCeK7oj
+VBHNtcnJyQrQ06WvGG5eMuQ=
+=I7DM
+-----END PGP SIGNATURE-----
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