Fix g/bsd compatibility, bug 95468.

(Portage version: 2.0.51.22-r1)

3 files changed, 25 insertions, 12 deletions

diff --git a/dev-libs/apr-util/ChangeLog b/dev-libs/apr-util/ChangeLog
index a76cbf4db273..2a6beccd4839 100644
--- a/dev-libs/apr-util/ChangeLog
+++ b/dev-libs/apr-util/ChangeLog
@@ -1,6 +1,10 @@
 # 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.20 2005/05/10 23:54:36 beu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr-util/ChangeLog,v 1.21 2005/06/11 22:07:58 kloeri Exp $
+
+  11 Jun 2005; Bryan Østergaard <kloeri@gentoo.org>
+  apr-util-0.9.6-r2.ebuild, apr-util-1.1.2.ebuild:
+  Fix g/bsd compatibility, bug 95468.
 
 *apr-util-0.9.6-r2 (10 May 2005)
 *apr-util-0.9.5-r1 (10 May 2005)
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
index 6afc427b580d..e23b6fe11a3c 100644
--- a/dev-libs/apr-util/apr-util-0.9.6-r2.ebuild
+++ b/dev-libs/apr-util/apr-util-0.9.6-r2.ebuild
@@ -1,6 +1,6 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr-util/apr-util-0.9.6-r2.ebuild,v 1.2 2005/06/11 22:07:59 kloeri Exp $
 
 inherit eutils
 
@@ -36,13 +36,17 @@ src_compile() {
 
 	if use berkdb; then
 		if has_version '=sys-libs/db-4.2*'; then
-			myconf="${myconf} --with-dbm=db42 --with-berkely-db=/usr"
+			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-berkely-db=/usr"
+			myconf="${myconf} --with-dbm=db4
+			--with-berkeley-db=/usr/include/db4:/usr/$(get_libdir)"
 		elif has_version '=sys-libs/db-3*'; then
-			myconf="${myconf} --with-dbm=db3 --with-berkely-db=/usr"
+			myconf="${myconf} --with-dbm=db3
+			--with-berkeley-db=/usr/include/db3:/usr/$(get_libdir)"
 		elif has_version '=sys-libs/db-2'; then
-			myconf="${myconf} --with-dbm=db2 --with-berkely-db=/usr"
+			myconf="${myconf} --with-dbm=db2
+			--with-berkely-db=/usr/include/db2:/usr/$(get_libdir)"
 		fi
 	fi
 
@@ -65,5 +69,5 @@ src_install() {
 	dodoc CHANGES NOTICE
 
 	# Will install as portage user when using userpriv. Fixing
-	chown -R root:root ${D}/usr/include/apr-0/
+	chown -R root:0 ${D}/usr/include/apr-0/
 }
diff --git a/dev-libs/apr-util/apr-util-1.1.2.ebuild b/dev-libs/apr-util/apr-util-1.1.2.ebuild
index a52f45f75964..88ccf93f10e6 100644
--- a/dev-libs/apr-util/apr-util-1.1.2.ebuild
+++ b/dev-libs/apr-util/apr-util-1.1.2.ebuild
@@ -1,7 +1,8 @@
 # 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-1.1.2.ebuild,v 1.2 2005/04/24 08:41:30 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr-util/apr-util-1.1.2.ebuild,v 1.3 2005/06/11 22:07:59 kloeri Exp $
 
+inherit multilib
 
 DESCRIPTION="Apache Portable Runtime Library"
 HOMEPAGE="http://apr.apache.org/"
@@ -29,13 +30,17 @@ src_compile() {
 
 	if use berkdb; then
 		if has_version '=sys-libs/db-4.2*'; then
-			myconf="${myconf} --with-dbm=db42 --with-berkely-db=/usr"
+			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-berkely-db=/usr"
+			myconf="${myconf} --with-dbm=db4
+			--with-berkeley-db=/usr/include/db4:/usr/$(get_libdir)"
 		elif has_version '=sys-libs/db-3*'; then
-			myconf="${myconf} --with-dbm=db3 --with-berkely-db=/usr"
+			myconf="${myconf} --with-dbm=db3
+			--with-berkeley-db=/usr/include/db3:/usr/$(get_libdir)"
 		elif has_version '=sys-libs/db-2'; then
-			myconf="${myconf} --with-dbm=db2 --with-berkely-db=/usr"
+			myconf="${myconf} --with-dbm=db2
+			--with-berkely-db=/usr/include/db2:/usr/$(get_libdir)"
 		fi
 	fi