The big db4 project

4 files changed, 61 insertions, 5 deletions

diff --git a/sys-libs/nss-db/ChangeLog b/sys-libs/nss-db/ChangeLog
index 25b880b338f7..9f0db429746e 100644
--- a/sys-libs/nss-db/ChangeLog
+++ b/sys-libs/nss-db/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-libs/nss-db
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/nss-db/ChangeLog,v 1.3 2003/02/12 09:20:42 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/nss-db/ChangeLog,v 1.4 2003/06/27 10:12:45 pauldv Exp $
+
+  27 Jun 2003; Paul de Vrieze <pauldv@gentoo.org> nss-db-2.2-r1.ebuild,
+  files/db3.patch:
+  This does not work with glibc-2.3.x, so block it in the dependencies. Also
+  patch the configure script to use the db3 lib
 
 *nss-db-2.2-r1 (1 Feb 2002)
 
diff --git a/sys-libs/nss-db/Manifest b/sys-libs/nss-db/Manifest
index b7fa638a1244..203bc9c87083 100644
--- a/sys-libs/nss-db/Manifest
+++ b/sys-libs/nss-db/Manifest
@@ -1,3 +1,4 @@
-MD5 6fb478d1ebf609c4baeaff95f66a4576 nss-db-2.2-r1.ebuild 995
-MD5 391f29067edd9c5be279b5341066ee20 ChangeLog 746
+MD5 6172fe85df85cb8ac5c0e503391ba756 ChangeLog 963
+MD5 cba066f22c356031d9942347d306eb36 nss-db-2.2-r1.ebuild 1100
+MD5 03cdab663eb8542cea7c07707d596740 files/db3.patch 1174
 MD5 ca50c2850faf4fa26fcf5dd10838aab9 files/digest-nss-db-2.2-r1 62
diff --git a/sys-libs/nss-db/files/db3.patch b/sys-libs/nss-db/files/db3.patch
new file mode 100644
index 000000000000..2da6ecbd5550
--- /dev/null
+++ b/sys-libs/nss-db/files/db3.patch
@@ -0,0 +1,43 @@
+diff -u nss_db-2.2.orig/configure.in nss_db-2.2/configure.in
+--- nss_db-2.2.orig/configure.in	2003-06-27 11:41:13.000000000 +0200
++++ nss_db-2.2/configure.in	2003-06-27 11:44:30.000000000 +0200
+@@ -43,22 +43,28 @@
+ AC_CHECK_HEADER(db.h,, AC_MSG_ERROR([
+ *** Could not find Berkeley DB headers.]))
+ 
+-AC_CHECK_LIB(db, db_version,, AC_MSG_ERROR([
++
++AC_CHECK_LIB(db-3, db_version,, 
++  AC_CHECK_LIB(db, db_version,,AC_MSG_ERROR([
+ *** Could not find Berkeley DB library.]))
++)
+ 
+ AC_CACHE_CHECK([Berkeley DB version], nss_db_cv_db_version,
+   [AC_TRY_CPP(
+     [
+-#    include <db.h>
+-#    ifndef DB_VERSION_STRING
+-#     error "Unknown"
+-#    endif
+-#    if DB_VERSION_MAJOR < 2
+-#     error "Too old"
+-#    endif
+-#    if DB_VERSION_MAJOR == 2 && DB_VERSION_MINOR < 4
+-#     error "Too old"
+-#    endif
++    include <db.h>
++    ifndef DB_VERSION_STRING
++     error "Unknown"
++    endif
++    if DB_VERSION_MAJOR < 2
++     error "Too old"
++    endif
++    if DB_VERSION_MAJOR == 2 && DB_VERSION_MINOR < 4
++     error "Too old"
++    endif
++    if DB_VERSION_MAJOR >= 4
++     error "Too new"
++    endif
+     ],
+     nss_db_cv_db_version="ok",
+     nss_db_cv_db_version="not ok")
diff --git a/sys-libs/nss-db/nss-db-2.2-r1.ebuild b/sys-libs/nss-db/nss-db-2.2-r1.ebuild
index 28052801d5bd..fd11311c0bc2 100644
--- a/sys-libs/nss-db/nss-db-2.2-r1.ebuild
+++ b/sys-libs/nss-db/nss-db-2.2-r1.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/nss-db/nss-db-2.2-r1.ebuild,v 1.12 2003/06/22 05:10:31 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/nss-db/nss-db-2.2-r1.ebuild,v 1.13 2003/06/27 10:12:45 pauldv Exp $
 
 inherit libtool || die
 
@@ -12,11 +12,18 @@ HOMEPAGE="http://www.gnu.org"
 #now db needs to move to the base install, that's ok.
 LICENSE="GPL-2 LGPL-2"
 DEPEND=">=sys-libs/db-3.2.3-r1
-        sys-devel/gettext"
+        sys-devel/gettext
+	!>=sys-libs/glibc-2.3"
 KEYWORDS="x86 -ppc"
 SLOT="0"
 RDEPEND=">=sys-libs/db-3.2.3-r1"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	patch -p1 <${FILESDIR}/db3.patch
+	autoconf
+}
 
 src_compile() {