Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sys-libs/db/ChangeLog10
-rw-r--r--sys-libs/db/Manifest36
-rw-r--r--sys-libs/db/db-3.2.9-r10.ebuild4
-rw-r--r--sys-libs/db/db-4.6.18.ebuild145
-rw-r--r--sys-libs/db/files/db-4.6-jarlocation.patch16
-rw-r--r--sys-libs/db/files/db-4.6-jni-check-prefix-first.patch30
-rw-r--r--sys-libs/db/files/db-4.6-libtool.patch47
-rw-r--r--sys-libs/db/files/digest-db-4.6.183
8 files changed, 280 insertions, 11 deletions
diff --git a/sys-libs/db/ChangeLog b/sys-libs/db/ChangeLog
index 71f21f0738dc..bf9e27d475f4 100644
--- a/sys-libs/db/ChangeLog
+++ b/sys-libs/db/ChangeLog
@@ -1,6 +1,14 @@
# ChangeLog for sys-libs/db
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/ChangeLog,v 1.221 2007/08/09 03:02:42 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/ChangeLog,v 1.222 2007/08/15 12:17:11 caleb Exp $
+
+*db-4.6.18 (15 Aug 2007)
+
+ 15 Aug 2007; Caleb Tennis <caleb@gentoo.org>
+ +files/db-4.6-jarlocation.patch,
+ +files/db-4.6-jni-check-prefix-first.patch, +files/db-4.6-libtool.patch,
+ +db-4.6.18.ebuild:
+ Next major revision of db. package.mask'd for now for further testing
09 Aug 2007; Jeroen Roovers <jer@gentoo.org> db-4.5.20_p2.ebuild:
Stable for HPPA (bug #178750).
diff --git a/sys-libs/db/Manifest b/sys-libs/db/Manifest
index d4bea9e5106f..c5c3cea7db83 100644
--- a/sys-libs/db/Manifest
+++ b/sys-libs/db/Manifest
@@ -78,6 +78,18 @@ AUX db-4.5-libtool.patch 1817 RMD160 989536933036b8ea7d4bf55420c49ebad76d703b SH
MD5 01f6ce9181e5e748014b1dc5e747e3bd files/db-4.5-libtool.patch 1817
RMD160 989536933036b8ea7d4bf55420c49ebad76d703b files/db-4.5-libtool.patch 1817
SHA256 7b47ab059b5e9a775e024f6f2562eea136e870a32748675664e5a5315b871b21 files/db-4.5-libtool.patch 1817
+AUX db-4.6-jarlocation.patch 599 RMD160 0981160a48833f126fa10e30eea2a394206895e4 SHA1 d8e8d01decbde204967927d6f60c522532fa4fb7 SHA256 c48eb518efd9ae1a7a9a6990b90c5748ba5682aaac7d20b48e82c6bc03fc698f
+MD5 6835dc7cf78fd7126ade8458f237eab0 files/db-4.6-jarlocation.patch 599
+RMD160 0981160a48833f126fa10e30eea2a394206895e4 files/db-4.6-jarlocation.patch 599
+SHA256 c48eb518efd9ae1a7a9a6990b90c5748ba5682aaac7d20b48e82c6bc03fc698f files/db-4.6-jarlocation.patch 599
+AUX db-4.6-jni-check-prefix-first.patch 1172 RMD160 5fe466cce625157517a8e703c3e0ed64c5bc80a0 SHA1 817caf11b2855e3da40a1c4bb5f65af54f12f97b SHA256 bc32845c7da201a4ce7af280a8e734e3fa0267a44657aecb52877f67e29c5c3e
+MD5 25ab46b1e216940d048cc7bdeb8ee7f9 files/db-4.6-jni-check-prefix-first.patch 1172
+RMD160 5fe466cce625157517a8e703c3e0ed64c5bc80a0 files/db-4.6-jni-check-prefix-first.patch 1172
+SHA256 bc32845c7da201a4ce7af280a8e734e3fa0267a44657aecb52877f67e29c5c3e files/db-4.6-jni-check-prefix-first.patch 1172
+AUX db-4.6-libtool.patch 1817 RMD160 989536933036b8ea7d4bf55420c49ebad76d703b SHA1 830fc6ecaf948dc1276ee0a539668d6f2e9c9a15 SHA256 7b47ab059b5e9a775e024f6f2562eea136e870a32748675664e5a5315b871b21
+MD5 01f6ce9181e5e748014b1dc5e747e3bd files/db-4.6-libtool.patch 1817
+RMD160 989536933036b8ea7d4bf55420c49ebad76d703b files/db-4.6-libtool.patch 1817
+SHA256 7b47ab059b5e9a775e024f6f2562eea136e870a32748675664e5a5315b871b21 files/db-4.6-libtool.patch 1817
AUX patch.3.2.9.1 2139 RMD160 a018e1e91102c972279ec017e1d87d6d87f99a56 SHA1 34108ae9ce03c40c4d1016e9e54690d5d8fc4135 SHA256 6d89a42ee0be9e47b3e8a42981c65266a556de84bc6281edcf0f977f52547798
MD5 9cf113248f29b1e319ae73b266df4986 files/patch.3.2.9.1 2139
RMD160 a018e1e91102c972279ec017e1d87d6d87f99a56 files/patch.3.2.9.1 2139
@@ -93,6 +105,7 @@ DIST db-4.2.52.tar.gz 4073147 RMD160 d9095bce12b519695f3d1ff708dc0d1babd7a4b2 SH
DIST db-4.3.29.tar.gz 6103264 RMD160 fac910828a74087124e9cc3cad99c6a6dc88c14b SHA1 7ddac51fcbd5945aed154be2ee1fe166b3acd628 SHA256 db3e762d819f9a31bc4ebf5ecada53e9787aeb26fc92fa6064b2ba57df806af4
DIST db-4.4.20.tar.gz 8112163 RMD160 1e62a7583c8064f1e8533e188db4644d6d047f66 SHA1 1931c0774c3e2fc45741ba9b7c4187a12801184c SHA256 56442966cf51a6eb81272f4ab4cec929dcb695a5081b187215afdc7cf7629a57
DIST db-4.5.20.tar.gz 9281894 RMD160 5fc492efcddce6f446c5977128f5526f73763e01 SHA1 0e5a6c152c5d7089899481d9de689d1f7e77bde1 SHA256 f52cd5cea899823dd200d56556f70b33c55e48a33bb7b65ee128968dc10ca82d
+DIST db-4.6.18.tar.gz 12017762 RMD160 ea6e6e7d06ab546ce6cbca2091f02566849eaff8 SHA1 26c127ddd814da97e7492959ffacdd1897f73645 SHA256 5fc03231ce2d1ac68480fce9821e91d85f132104dc1e16ab7edb6476b2353ef3
DIST db.1.85.patch 55584 RMD160 e4433e45e13764b8d0cdf948909f6f5b8f9ed7ff SHA1 cb2079ecb3df5035ad27b80b42052fc689a408a6 SHA256 6df42acf6d7bec774b1bdc1629abadf7b006d622e2bbcf638aed7985eacdd48e
DIST db.1.85.tar.gz 270953 RMD160 594253b7e80323cddc92cd7c89934217d403f58b SHA1 ccb057b07761d1b2b34626e748c7392c749d5e6d SHA256 4220d4ddeb77fb57ba2f37c1aa105d561d3ef85a6fb89c79c3edd735d0e193c6
DIST patch.4.2.52.1 988 RMD160 1ff7d93c4e6223b793ed3038070a4f0957dac44e SHA1 fdbe677eb4314309e855c35359a493284ddc1936 SHA256 98b7580916459ee931b9c7e06dcb9da980732672fe0811714933f366ad97dfa5
@@ -117,10 +130,10 @@ EBUILD db-1.85-r3.ebuild 1210 RMD160 78f28bf46f4adde0df02f9ebe7e4dfbbebb293e9 SH
MD5 23051304aff15d3991c617f97daa67b4 db-1.85-r3.ebuild 1210
RMD160 78f28bf46f4adde0df02f9ebe7e4dfbbebb293e9 db-1.85-r3.ebuild 1210
SHA256 ab969a566111ab49c561bfa9a8f2fdfa3e7c4d13a4b942d821eaf10a5c40b1a0 db-1.85-r3.ebuild 1210
-EBUILD db-3.2.9-r10.ebuild 4397 RMD160 0c29bdf71c0ad727fb1f6f7995a2b8a7968b6ad6 SHA1 d302fbae0da6f6cfceed124bc5f4148c76ff5ba3 SHA256 aabedcdd5c60aeeb550f5b9350f06913420278a64baeb213534dfa2bb2f600bf
-MD5 d75d623bab433c9f056cdd49a99f15c0 db-3.2.9-r10.ebuild 4397
-RMD160 0c29bdf71c0ad727fb1f6f7995a2b8a7968b6ad6 db-3.2.9-r10.ebuild 4397
-SHA256 aabedcdd5c60aeeb550f5b9350f06913420278a64baeb213534dfa2bb2f600bf db-3.2.9-r10.ebuild 4397
+EBUILD db-3.2.9-r10.ebuild 4393 RMD160 388f43d74bef9a314c2419588838aed3ea9b0d73 SHA1 89cdce4b3b41f482011afe9c3473cc4bfe0fb0d0 SHA256 f38bba3f3f0da5c318653325902a76c1fc589038af0cf2dddb98451bcc14174a
+MD5 3709f0a14d7cb7a67acbeb259442d5d2 db-3.2.9-r10.ebuild 4393
+RMD160 388f43d74bef9a314c2419588838aed3ea9b0d73 db-3.2.9-r10.ebuild 4393
+SHA256 f38bba3f3f0da5c318653325902a76c1fc589038af0cf2dddb98451bcc14174a db-3.2.9-r10.ebuild 4393
EBUILD db-3.2.9-r11.ebuild 4651 RMD160 addca15e4e83c3316b5c53ec76c71ac05975d50b SHA1 9b940eb1ed4a9318f60e16c9de8eaad39fc33674 SHA256 b774c2b1de9b5f8ed7540acb5550a09d41d8a10752db7a9345b4ec1c7551c316
MD5 a51a594e33e974f6936397106a65269e db-3.2.9-r11.ebuild 4651
RMD160 addca15e4e83c3316b5c53ec76c71ac05975d50b db-3.2.9-r11.ebuild 4651
@@ -145,10 +158,14 @@ EBUILD db-4.5.20_p2.ebuild 3922 RMD160 6e7f916ae31ef682cc7831944a43f368787eb076
MD5 bb69c7e4d3db6301e311150a67fd932d db-4.5.20_p2.ebuild 3922
RMD160 6e7f916ae31ef682cc7831944a43f368787eb076 db-4.5.20_p2.ebuild 3922
SHA256 0ca7d4e9266cc78d0ed7d8cdfd26c0313b17327831f36d14c7ed383d1f4c29c1 db-4.5.20_p2.ebuild 3922
-MISC ChangeLog 33653 RMD160 3c44fd8448688153f69dd9554b8028be2e38dffc SHA1 5bd3ca883cd6f4a0e3e2bf42df84f9e6c0c507f7 SHA256 eaa608079a21d0df4744fd240df7dea15cfe93dec87bddfa3f6eab1e3c163232
-MD5 5892b89872fe2cb955b5406496988a75 ChangeLog 33653
-RMD160 3c44fd8448688153f69dd9554b8028be2e38dffc ChangeLog 33653
-SHA256 eaa608079a21d0df4744fd240df7dea15cfe93dec87bddfa3f6eab1e3c163232 ChangeLog 33653
+EBUILD db-4.6.18.ebuild 3936 RMD160 ae97305f0257400afc9466a0536874cc0d113c55 SHA1 eaa9bb68f4461e534ccad5efd629e959f517b47b SHA256 14e8a6327a24d09211390d774dd2acc378da763f38a256ff46f3c79bf03b5573
+MD5 a06a6db7931d2683d66a495682288706 db-4.6.18.ebuild 3936
+RMD160 ae97305f0257400afc9466a0536874cc0d113c55 db-4.6.18.ebuild 3936
+SHA256 14e8a6327a24d09211390d774dd2acc378da763f38a256ff46f3c79bf03b5573 db-4.6.18.ebuild 3936
+MISC ChangeLog 33933 RMD160 b2258301bc4d64a9f1c7bdf8bfcba7d60a2981a3 SHA1 708fb81658400cca8310f28cc69692f77d6726c4 SHA256 a8cef42d41d38f03eb81e7c5164de4655b9d113ce3c05ef7407b3b9663351c26
+MD5 b4aa91a238b562b6a61498e1454ac0d0 ChangeLog 33933
+RMD160 b2258301bc4d64a9f1c7bdf8bfcba7d60a2981a3 ChangeLog 33933
+SHA256 a8cef42d41d38f03eb81e7c5164de4655b9d113ce3c05ef7407b3b9663351c26 ChangeLog 33933
MISC metadata.xml 1651 RMD160 cbdc138b8fd0fab28ec59db03fca18f2e0e74818 SHA1 e70ae3f07e5559a43dd85fad3270b7f7f185b996 SHA256 895bfb43a1bd60170937b4523f396d5772a3914384a95105345ac1f24c606550
MD5 71519f9e67010bd7b9d8aff6b19b8c15 metadata.xml 1651
RMD160 cbdc138b8fd0fab28ec59db03fca18f2e0e74818 metadata.xml 1651
@@ -183,3 +200,6 @@ SHA256 89d05ae9bab49834d288f501461c96997e33d978943a3696d99def09da715642 files/di
MD5 a76ca07587a5bc7b469982d415b2abe9 files/digest-db-4.5.20_p2 663
RMD160 31cf782d573c5ae7a204fab82bd10e8ccf6a140a files/digest-db-4.5.20_p2 663
SHA256 cbec0b3c04af33d3c45800e6e7541405b086000a94b3faa0d376a0efe5f15892 files/digest-db-4.5.20_p2 663
+MD5 d9133b0aa9bca226730658d53133dbc7 files/digest-db-4.6.18 235
+RMD160 3cb4787372673bbe4b4120b446bccb7b4a168dff files/digest-db-4.6.18 235
+SHA256 60db9f2400298a156b12c5769da4d2c6e05d6322a4f167745f677363e9c5b063 files/digest-db-4.6.18 235
diff --git a/sys-libs/db/db-3.2.9-r10.ebuild b/sys-libs/db/db-3.2.9-r10.ebuild
index 2f5252482089..dfaf99a1cc6f 100644
--- a/sys-libs/db/db-3.2.9-r10.ebuild
+++ b/sys-libs/db/db-3.2.9-r10.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-3.2.9-r10.ebuild,v 1.27 2007/07/15 02:08:20 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-3.2.9-r10.ebuild,v 1.28 2007/08/15 12:17:11 caleb Exp $
inherit gnuconfig libtool eutils db java-pkg
diff --git a/sys-libs/db/db-4.6.18.ebuild b/sys-libs/db/db-4.6.18.ebuild
new file mode 100644
index 000000000000..08600fa18a04
--- /dev/null
+++ b/sys-libs/db/db-4.6.18.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.6.18.ebuild,v 1.1 2007/08/15 12:17:11 caleb Exp $
+
+inherit eutils db flag-o-matic java-pkg-opt-2
+
+#Number of official patches
+#PATCHNO=`echo ${PV}|sed -e "s,\(.*_p\)\([0-9]*\),\2,"`
+PATCHNO=${PV/*.*.*_p}
+if [[ ${PATCHNO} == "${PV}" ]] ; then
+ MY_PV=${PV}
+ MY_P=${P}
+ PATCHNO=0
+else
+ MY_PV=${PV/_p${PATCHNO}}
+ MY_P=${PN}-${MY_PV}
+fi
+
+S="${WORKDIR}/${MY_P}/build_unix"
+DESCRIPTION="Oracle Berkeley DB"
+HOMEPAGE="http://www.oracle.com/technology/software/products/berkeley-db/index.html"
+SRC_URI="http://download-west.oracle.com/berkeley-db/${MY_P}.tar.gz"
+for (( i=1 ; i<=${PATCHNO} ; i++ )) ; do
+ export SRC_URI="${SRC_URI} http://www.oracle.com/technology/products/berkeley-db/db/update/${MY_PV}/patch.${MY_PV}.${i}"
+done
+
+LICENSE="OracleDB"
+SLOT="4.6"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE="tcl java doc nocxx bootstrap"
+
+DEPEND="tcl? ( >=dev-lang/tcl-8.4 )
+ java? ( >=virtual/jdk-1.4 )
+ >=sys-devel/binutils-2.16.1"
+RDEPEND="tcl? ( dev-lang/tcl )
+ java? ( >=virtual/jre-1.4 )"
+
+src_unpack() {
+ unpack "${MY_P}".tar.gz
+ cd "${WORKDIR}"/"${MY_P}"
+ for (( i=1 ; i<=${PATCHNO} ; i++ ))
+ do
+ epatch "${DISTDIR}"/patch."${MY_PV}"."${i}"
+ done
+ epatch "${FILESDIR}"/"${PN}"-"${SLOT}"-libtool.patch
+
+ # use the includes from the prefix
+ epatch "${FILESDIR}"/"${PN}"-"${SLOT}"-jni-check-prefix-first.patch
+ epatch "${FILESDIR}"/"${PN}"-4.3-listen-to-java-options.patch
+
+ sed -i \
+ -e "s,\(ac_compiler\|\${MAKEFILE_CC}\|\${MAKEFILE_CXX}\|\$CC\)\( *--version\),\1 -dumpversion,g" \
+ "${S}"/../dist/configure
+}
+
+src_compile() {
+ # compilation with -O0 fails on amd64, see bug #171231
+ if use amd64; then
+ replace-flags -O0 -O2
+ is-flag -O[s123] || append-flags -O2
+ fi
+
+ local myconf=""
+
+ use amd64 && myconf="${myconf} --with-mutex=x86/gcc-assembly"
+
+ use bootstrap \
+ && myconf="${myconf} --disable-cxx" \
+ || myconf="${myconf} $(use_enable !nocxx cxx)"
+
+ use tcl \
+ && myconf="${myconf} --enable-tcl --with-tcl=/usr/$(get_libdir)" \
+ || myconf="${myconf} --disable-tcl"
+
+ myconf="${myconf} $(use_enable java)"
+ if use java; then
+ myconf="${myconf} --with-java-prefix=${JAVA_HOME}"
+ # Can't get this working any other way, since it returns spaces, and
+ # bash doesn't seem to want to pass correctly in any way i try
+ local javaconf="-with-javac-flags=$(java-pkg_javac-args)"
+ fi
+
+ [[ -n ${CBUILD} ]] && myconf="${myconf} --build=${CBUILD}"
+
+ # the entire testsuite needs the TCL functionality
+ if use tcl && has test $FEATURES ; then
+ myconf="${myconf} --enable-test"
+ else
+ myconf="${myconf} --disable-test"
+ fi
+
+ # Add linker versions to the symbols. Easier to do, and safer than header file
+ # mumbo jumbo.
+ if use userland_GNU; then
+ append-ldflags -Wl,--default-symver
+ fi
+
+ cd ${S} && ECONF_SOURCE="${S}"/../dist econf \
+ --prefix=/usr \
+ --mandir=/usr/share/man \
+ --infodir=/usr/share/info \
+ --datadir=/usr/share \
+ --sysconfdir=/etc \
+ --localstatedir=/var/lib \
+ --libdir=/usr/"$(get_libdir)" \
+ --enable-compat185 \
+ --without-uniquename \
+ --enable-rpc \
+ --host="${CHOST}" \
+ ${myconf} "${javaconf}" || die "configure failed"
+
+ sed -e "s,\(^STRIP *=\).*,\1\"none\"," Makefile > Makefile.cpy \
+ && mv Makefile.cpy Makefile
+
+ emake -j1 || die "make failed"
+}
+
+src_install() {
+ einstall libdir="${D}/usr/$(get_libdir)" STRIP="none" || die
+
+ db_src_install_usrbinslot
+
+ db_src_install_headerslot
+
+ db_src_install_doc
+
+ db_src_install_usrlibcleanup
+
+ dodir /usr/sbin
+ mv "${D}"/usr/bin/berkeley_db_svc "${D}"/usr/sbin/berkeley_db46_svc
+
+ if use java; then
+ java-pkg_regso "${D}"/usr/"$(get_libdir)"/libdb_java*.so
+ java-pkg_dojar "${D}"/usr/"$(get_libdir)"/*.jar
+ rm -f "${D}"/usr/"$(get_libdir)"/*.jar
+ fi
+}
+
+pkg_postinst() {
+ db_fix_so
+}
+
+pkg_postrm() {
+ db_fix_so
+}
diff --git a/sys-libs/db/files/db-4.6-jarlocation.patch b/sys-libs/db/files/db-4.6-jarlocation.patch
new file mode 100644
index 000000000000..c0d689f43691
--- /dev/null
+++ b/sys-libs/db/files/db-4.6-jarlocation.patch
@@ -0,0 +1,16 @@
+diff -ur db-4.1.25.old/dist/Makefile.in db-4.1.25/dist/Makefile.in
+--- db-4.1.25.old/dist/Makefile.in 2003-10-18 02:15:45.000000000 -0700
++++ db-4.1.25/dist/Makefile.in 2003-10-18 02:13:47.000000000 -0700
+@@ -107,9 +107,9 @@
+ JAVA_EXDIR= $(JAVA_SRCDIR)/$(JAVA_EXREL)
+ JAVA_RPCDIR= $(srcdir)/rpc_server/java
+
+-libj_jarfile= db.jar
+-libj_exjarfile= dbexamples.jar
+-rpc_jarfile= dbsvc.jar
++libj_jarfile= db-4.4.jar
++libj_exjarfile= dbexamples-4.4.jar
++rpc_jarfile= dbsvc-4.4.jar
+ libjso_base= libdb_java
+ libjso= $(libjso_base)-$(SOVERSION).@JMODSUFFIX@
+ libjso_static= $(libjso_base)-$(SOVERSION).a
diff --git a/sys-libs/db/files/db-4.6-jni-check-prefix-first.patch b/sys-libs/db/files/db-4.6-jni-check-prefix-first.patch
new file mode 100644
index 000000000000..63735e62469f
--- /dev/null
+++ b/sys-libs/db/files/db-4.6-jni-check-prefix-first.patch
@@ -0,0 +1,30 @@
+--- dist/aclocal_java/ac_jni_include_dirs.m4 2003-10-06 20:41:38.000000000 +0200
++++ dist/aclocal_java/ac_jni_include_dirs.m4 2005-09-23 21:31:26.000000000 +0200
+@@ -43,14 +43,19 @@
+ *) AC_MSG_ERROR([$_ACJNI_JAVAC is not an absolute path name]);;
+ esac
+
+-_ACJNI_FOLLOW_SYMLINKS("$_ACJNI_JAVAC")
+-_JTOPDIR=`echo "$_ACJNI_FOLLOWED" | sed -e 's://*:/:g' -e 's:/[[^/]]*$::'`
+-case "$host_os" in
+- darwin*) _JTOPDIR=`echo "$_JTOPDIR" | sed -e 's:/[[^/]]*$::'`
+- _JINC="$_JTOPDIR/Headers";;
+- *) _JINC="$_JTOPDIR/include";;
+-esac
+-
++# If JAVAPREFIX is defined, look there first
++if test -r "$JAVAPREFIX/include/jni.h"; then
++ _JTOPDIR="$JAVAPREFIX"
++ _JINC="$JAVAPREFIX/include"
++else
++ _ACJNI_FOLLOW_SYMLINKS("$_ACJNI_JAVAC")
++ _JTOPDIR=`echo "$_ACJNI_FOLLOWED" | sed -e 's://*:/:g' -e 's:/[[^/]]*$::'`
++ case "$host_os" in
++ darwin*) _JTOPDIR=`echo "$_JTOPDIR" | sed -e 's:/[[^/]]*$::'`
++ _JINC="$_JTOPDIR/Headers";;
++ *) _JINC="$_JTOPDIR/include";;
++ esac
++fi
+ # If we find jni.h in /usr/include, then it's not a java-only tree, so
+ # don't add /usr/include or subdirectories to the list of includes.
+ # An extra -I/usr/include can foul things up with newer gcc's.
diff --git a/sys-libs/db/files/db-4.6-libtool.patch b/sys-libs/db/files/db-4.6-libtool.patch
new file mode 100644
index 000000000000..3d86b88f86b3
--- /dev/null
+++ b/sys-libs/db/files/db-4.6-libtool.patch
@@ -0,0 +1,47 @@
+--- dist/configure.orig 2006-01-31 10:23:58.000000000 +0100
++++ dist/configure 2006-01-31 10:26:43.000000000 +0100
+@@ -5765,7 +5765,7 @@
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ # I'd rather use --version here, but apparently some GNU lds only accept -v.
+-case `$LD -v 2>&1 </dev/null` in
++case `"$LD" -v 2>&1 </dev/null` in
+ *GNU* | *'with BFD'*)
+ lt_cv_prog_gnu_ld=yes
+ ;;
+@@ -8753,7 +8753,7 @@
+ whole_archive_flag_spec=
+ fi
+ supports_anon_versioning=no
+- case `$LD -v 2>/dev/null` in
++ case `"$LD" -v 2>/dev/null` in
+ *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
+ *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
+ *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
+@@ -11855,7 +11855,7 @@
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ # I'd rather use --version here, but apparently some GNU lds only accept -v.
+-case `$LD -v 2>&1 </dev/null` in
++case `"$LD" -v 2>&1 </dev/null` in
+ *GNU* | *'with BFD'*)
+ lt_cv_prog_gnu_ld=yes
+ ;;
+@@ -15842,7 +15842,7 @@
+ whole_archive_flag_spec_F77=
+ fi
+ supports_anon_versioning=no
+- case `$LD -v 2>/dev/null` in
++ case `"$LD" -v 2>/dev/null` in
+ *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
+ *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
+ *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
+@@ -18300,7 +18300,7 @@
+ whole_archive_flag_spec_GCJ=
+ fi
+ supports_anon_versioning=no
+- case `$LD -v 2>/dev/null` in
++ case `"$LD" -v 2>/dev/null` in
+ *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
+ *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
+ *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
diff --git a/sys-libs/db/files/digest-db-4.6.18 b/sys-libs/db/files/digest-db-4.6.18
new file mode 100644
index 000000000000..546b0c4fcc5c
--- /dev/null
+++ b/sys-libs/db/files/digest-db-4.6.18
@@ -0,0 +1,3 @@
+MD5 95768bd92fd48951a427fbab37b9088f db-4.6.18.tar.gz 12017762
+RMD160 ea6e6e7d06ab546ce6cbca2091f02566849eaff8 db-4.6.18.tar.gz 12017762
+SHA256 5fc03231ce2d1ac68480fce9821e91d85f132104dc1e16ab7edb6476b2353ef3 db-4.6.18.tar.gz 12017762