CFLAGS fix, and fix a java/db4 detection problem

6 files changed, 23 insertions, 15 deletions

diff --git a/sys-libs/db/ChangeLog b/sys-libs/db/ChangeLog
index 68b1a8791a17..02892ed0d7d5 100644
--- a/sys-libs/db/ChangeLog
+++ b/sys-libs/db/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-libs/db
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/ChangeLog,v 1.32 2003/06/07 12:21:22 pauldv Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/ChangeLog,v 1.33 2003/06/22 19:13:11 pauldv Exp $
+
+  22 Jun 2003; Paul de Vrieze <pauldv@gentoo.org> db-3.2.9-r5.ebuild,
+  db-4.0.14.ebuild, db-4.1.24.ebuild, db-4.1.25.ebuild:
+  Fix java compilation problem
+
+  19 Jun 2003; Paul de Vrieze <pauldv@gentoo.org> db-3.2.9-r5.ebuild:
+  Make db-3.2.9-r5 respect CFLAGS, by hacking the configure script (#22415)
 
   07 Jun 2003; Paul de Vrieze <pauldv@gentoo.org> db-3.2.9-r5.ebuild,
   db-4.0.14.ebuild, db-4.1.24.ebuild, db-4.1.25.ebuild:
diff --git a/sys-libs/db/Manifest b/sys-libs/db/Manifest
index efbe7476f94f..9097739be59a 100644
--- a/sys-libs/db/Manifest
+++ b/sys-libs/db/Manifest
@@ -1,14 +1,15 @@
-MD5 8051114e84e907b83a4e81153820a70d ChangeLog 5788
+MD5 354ecff94fe2084d159a7b7741824ec3 ChangeLog 6093
 MD5 f5688fefc8d29c29aa1ae2833131eaa3 db-1.85-r1.ebuild 1412
 MD5 5f58370f7996039a42c4805b7739715b db-3.2.3h-r4.ebuild 2456
 MD5 7bbdb8e7c9f500b78b934c556a7f5eeb db-3.2.9-r1.ebuild 2585
 MD5 a037a9713737ca0f498c85f7e0e1dbd6 db-3.2.9-r2.ebuild 3222
-MD5 43180b4a9107024fe21850f4e889dfb1 db-3.2.9-r5.ebuild 4213
 MD5 bb23c5ae6636a708085812b7832e2c60 db-3.2.9.ebuild 2465
 MD5 0dcedfa3f8fa0c10ac06b6f27217e45d db-3.3.11.ebuild 2408
-MD5 f8148481d7d233ff3ad676650c3ca536 db-4.0.14.ebuild 2330
-MD5 c92ac1df2bc8086e782db1e64e10c4ac db-4.1.24.ebuild 2179
-MD5 e89a6ac4b54d614dcf089b94b7a1d8d5 db-4.1.25.ebuild 2180
+MD5 61f2082a30c37fef5b86e3d56ee4ccdb db-4.1.25.ebuild 2178
+MD5 eeb0568580606db66529addc14e7bef5 db-4.1.24.ebuild 2177
+MD5 ebe5dd61105ec270bc9a4da07f3f720a db-4.0.14.ebuild 2328
+MD5 cb0b279b7b645ca4d0e997fefb56ebac db-3.2.9-r5.ebuild 4267
+MD5 1260aeee2785bda43e81a36b6cb247be files/digest-db-4.1.25 62
 MD5 194200b3295b95b46b4564980af27f1f files/db-3.2.9-fix-dep-link.patch 1005
 MD5 ecd81fa9868ec49c61306444144d44a9 files/db.1.85.patch 55584
 MD5 3057fcc117c33a02bd4c092586a58e49 files/digest-db-1.85-r1 59
@@ -16,10 +17,9 @@ MD5 355b01acef6125096cee653bdf4c32fc files/digest-db-3.2.3h-r4 62
 MD5 44c6041ae9527bfa8a4ff4cec7cf4a9a files/digest-db-3.2.9 61
 MD5 44c6041ae9527bfa8a4ff4cec7cf4a9a files/digest-db-3.2.9-r1 61
 MD5 44c6041ae9527bfa8a4ff4cec7cf4a9a files/digest-db-3.2.9-r2 61
-MD5 44c6041ae9527bfa8a4ff4cec7cf4a9a files/digest-db-3.2.9-r5 61
 MD5 214b855f6996d3dca754f6606beff672 files/digest-db-3.3.11 62
 MD5 068fc523df1ee6f36b5de8516ab7739f files/digest-db-4.0.14 62
 MD5 c42106477e8a2d626da71270d1e56609 files/digest-db-4.1.24 62
-MD5 1260aeee2785bda43e81a36b6cb247be files/digest-db-4.1.25 62
 MD5 9cf113248f29b1e319ae73b266df4986 files/patch.3.2.9.1 2139
 MD5 f8edd1cf6535cd62f9b8ff81e0474273 files/patch.3.2.9.2 495
+MD5 44c6041ae9527bfa8a4ff4cec7cf4a9a files/digest-db-3.2.9-r5 61
diff --git a/sys-libs/db/db-3.2.9-r5.ebuild b/sys-libs/db/db-3.2.9-r5.ebuild
index 63b230b54534..e9b40d9ba6f6 100644
--- a/sys-libs/db/db-3.2.9-r5.ebuild
+++ b/sys-libs/db/db-3.2.9-r5.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/sys-libs/db/db-3.2.9-r5.ebuild,v 1.9 2003/06/22 05:10:30 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-3.2.9-r5.ebuild,v 1.10 2003/06/22 19:13:11 pauldv Exp $
 
 IUSE=""
 
@@ -55,6 +55,7 @@ src_unpack() {
 	rm -f ltversion.sh
 	# remove config.guess else we have problems with gcc-3.2
 	rm -f config.guess
+	sed -i "s,\(-D_GNU_SOURCE\),\1 ${CFLAGS}," configure
 }
 
 src_compile() {
diff --git a/sys-libs/db/db-4.0.14.ebuild b/sys-libs/db/db-4.0.14.ebuild
index 59037cf26698..b1265bb77648 100644
--- a/sys-libs/db/db-4.0.14.ebuild
+++ b/sys-libs/db/db-4.0.14.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/sys-libs/db/db-4.0.14.ebuild,v 1.24 2003/06/22 05:59:59 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.0.14.ebuild,v 1.25 2003/06/22 19:13:11 pauldv Exp $
 
 IUSE="tcltk java"
 
@@ -28,8 +28,8 @@ src_compile() {
 		|| myconf="${myconf} --disable-tcl"
 	
 	if [ -n "${JAVAC}" ]; then
-		export JAVAC=`basename ${JAVAC}`
 		export PATH=`dirname ${JAVAC}`:${PATH}
+		export JAVAC=`basename ${JAVAC}`
 	fi
 	
 	../dist/configure \
diff --git a/sys-libs/db/db-4.1.24.ebuild b/sys-libs/db/db-4.1.24.ebuild
index f3547147cdc8..d6e482143c7d 100644
--- a/sys-libs/db/db-4.1.24.ebuild
+++ b/sys-libs/db/db-4.1.24.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/sys-libs/db/db-4.1.24.ebuild,v 1.18 2003/06/22 05:59:59 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.1.24.ebuild,v 1.19 2003/06/22 19:13:11 pauldv Exp $
 
 IUSE="tcltk java"
 
@@ -28,8 +28,8 @@ src_compile() {
 		|| myconf="${myconf} --disable-tcl"
 	
 	if [ -n "${JAVAC}" ]; then
-		export JAVAC=`basename ${JAVAC}`
 		export PATH=`dirname ${JAVAC}`:${PATH}
+		export JAVAC=`basename ${JAVAC}`
 	fi
 	
 	../dist/configure \
diff --git a/sys-libs/db/db-4.1.25.ebuild b/sys-libs/db/db-4.1.25.ebuild
index 9fc903e61ae9..82b1d3c18438 100644
--- a/sys-libs/db/db-4.1.25.ebuild
+++ b/sys-libs/db/db-4.1.25.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/sys-libs/db/db-4.1.25.ebuild,v 1.6 2003/06/22 05:59:59 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.1.25.ebuild,v 1.7 2003/06/22 19:13:11 pauldv Exp $
 
 IUSE="tcltk java"
 
@@ -28,8 +28,8 @@ src_compile() {
 		|| myconf="${myconf} --disable-tcl"
 	
 	if [ -n "${JAVAC}" ]; then
-		export JAVAC=`basename ${JAVAC}`
 		export PATH=`dirname ${JAVAC}`:${PATH}
+		export JAVAC=`basename ${JAVAC}`
 	fi
 	
 	../dist/configure \