Fix configuration script to work with versioned db4

4 files changed, 30 insertions, 6 deletions

diff --git a/net-www/apache/ChangeLog b/net-www/apache/ChangeLog
index 3426b954132d..e72af4e0cdf5 100644
--- a/net-www/apache/ChangeLog
+++ b/net-www/apache/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-www/apache
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/ChangeLog,v 1.54 2003/06/17 16:57:40 woodchip Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/ChangeLog,v 1.55 2003/06/22 18:35:46 pauldv Exp $
+
+  22 Jun 2003; Paul de Vrieze <pauldv@gentoo.org> apache-1.3.27-r4.ebuild:
+  Fix the compilation with versioned symbols in db
 
   17 Jun 2003; Donny Davies <woodchip@gentoo.org> apache-2.0.46.ebuild:
   Close #13191; GNU deprecated the -1 shortcuts (/me shakes head).
diff --git a/net-www/apache/Manifest b/net-www/apache/Manifest
index d29f5a0bcd5c..9f1cb97baffc 100644
--- a/net-www/apache/Manifest
+++ b/net-www/apache/Manifest
@@ -1,8 +1,8 @@
-MD5 ab1e866cb477525347ceb1ea3fb2905d ChangeLog 10996
+MD5 d36cac1d1af7967fd89bc0c335ce211a ChangeLog 11121
 MD5 21612edc47a4856367e269687587cb28 apache-1.3.27-r1.ebuild 7684
 MD5 293d43996b56379dd46d9bda26776f96 apache-1.3.27-r2.ebuild 8156
 MD5 e4c89cfcf1223c75beeacec2e0746c29 apache-1.3.27-r3.ebuild 7684
-MD5 5d479711c8cb50f187cab034b226cdbb apache-1.3.27-r4.ebuild 8180
+MD5 74188cec9ad14af8d885555ed62d95e8 apache-1.3.27-r4.ebuild 8266
 MD5 c93896f4268e681a335c92a01f22eddd apache-1.3.27.ebuild 8540
 MD5 db01dbe8b200d4abfb604b8af8c648cf apache-2.0.43-r1.ebuild 9296
 MD5 043a7cbb495f4c01245aa1447fcc7acf apache-2.0.44.ebuild 9269
@@ -10,7 +10,6 @@ MD5 8df3983c53028854b58c32b4a3338a31 apache-2.0.45.ebuild 10329
 MD5 91587791c6e5edaec632673b366ecb4f apache-2.0.46.ebuild 10479
 MD5 f2c60b199c12729b25716ed451a24e38 files/apache-2.0.44-gentoo.diff 4895
 MD5 9dc40e1918a2d30a578ebf1653f7182c files/apache-2.0.45-gentoo.diff 5448
-MD5 c8c70224d0f41de7f02387f13911e539 files/apache-2.0.46-gentoo.diff 3963
 MD5 97c7a2efed7a3fd05614167426c495d9 files/apache-builtin-mods 2465
 MD5 df1290566bb25603dbe5a649daec5185 files/apache.confd 1012
 MD5 de4bb52edc581b44224e7006846aff43 files/apache.rc6 1021
@@ -26,10 +25,12 @@ MD5 21c6ed7e53ea9fc80f4634cbf37b2bc6 files/digest-apache-1.3.27-r4 303
 MD5 92bd3cfcb69c493fd69fa92a4e96102c files/digest-apache-2.0.43-r1 137
 MD5 61c95a857c02f476eb289a56cdaa3e01 files/digest-apache-2.0.44 65
 MD5 7142976d3aababdfc272c5ed2cbbd049 files/digest-apache-2.0.45 2595
-MD5 b1b73cd67ed116ce0f9c973eeff9fbdf files/digest-apache-2.0.46 65
 MD5 df54361aa8754197cf3bafe99d32c7ec files/robots.txt 340
 MD5 d3626a1e31a675c60d066c111d552adf files/suexec.pam 59
 MD5 161245c7aa1eb785db53b34d6a10be43 files/suexec_pam_gentoo.patch 2149
+MD5 c8c70224d0f41de7f02387f13911e539 files/apache-2.0.46-gentoo.diff 3963
+MD5 b1b73cd67ed116ce0f9c973eeff9fbdf files/digest-apache-2.0.46 65
+MD5 3f87dcb9d5abca78bc68a3825f331087 files/apache-1.3.27_db4_gentoo.patch 812
 MD5 14aebf386646fe7ab2623dad993a32fa files/2.0.40/40_mod_ssl.conf 3420
 MD5 8ce666f3b8ad3ed00c081dc29e19fe90 files/2.0.40/41_mod_ssl.default-vhost.conf 8039
 MD5 819ee444395cf42ccc8009529a94af37 files/2.0.40/45_mod_dav.conf 583
diff --git a/net-www/apache/apache-1.3.27-r4.ebuild b/net-www/apache/apache-1.3.27-r4.ebuild
index c9dbf2bd5a79..21127688e7e2 100644
--- a/net-www/apache/apache-1.3.27-r4.ebuild
+++ b/net-www/apache/apache-1.3.27-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-1.3.27-r4.ebuild,v 1.5 2003/03/26 09:56:41 lordvan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-1.3.27-r4.ebuild,v 1.6 2003/06/22 18:35:46 pauldv Exp $
 
 IUSE="ipv6 pam"
 
@@ -57,6 +57,9 @@ src_unpack() {
 	if use pam; then
 		patch -p1 <${FILESDIR}/suexec_pam_gentoo.patch || die
 	fi
+
+	# Detect db4 correctly
+	patch -p1 <${FILESDIR}/apache-1.3.27_db4_gentoo.patch || die
 }
 
 src_compile() {
diff --git a/net-www/apache/files/apache-1.3.27_db4_gentoo.patch b/net-www/apache/files/apache-1.3.27_db4_gentoo.patch
new file mode 100644
index 000000000000..e84a6fcb93c0
--- /dev/null
+++ b/net-www/apache/files/apache-1.3.27_db4_gentoo.patch
@@ -0,0 +1,17 @@
+diff -ur apache_1.3.27.orig/src/modules/standard/mod_auth_db.module apache_1.3.27/src/modules/standard/mod_auth_db.module
+--- apache_1.3.27.orig/src/modules/standard/mod_auth_db.module	2001-10-16 11:12:02.000000000 +0200
++++ apache_1.3.27/src/modules/standard/mod_auth_db.module	2003-06-22 20:22:02.000000000 +0200
+@@ -2,7 +2,12 @@
+ ConfigStart
+     DB_VERSION=''
+     DB_LIB=''
+-    if ./helpers/TestCompile func db_create; then
++    if ./helpers/TestCompile func db_create_4000; then
++	DB_VERSION='Berkeley-DB/4.x'
++    elif ./helpers/TestCompile lib db-4 db_create_4000; then
++	DB_VERSION='Berkeley-DB/4.x'
++	DB_LIB='-ldb-4'
++    elif ./helpers/TestCompile func db_create; then
+         DB_VERSION='Berkeley-DB/3.x'
+     elif ./helpers/TestCompile lib db db_create; then
+         DB_VERSION='Berkeley-DB/3.x'