Revision bumps to support new Java system.

Package-Manager: portage-2.1.1_pre2-r4

10 files changed, 415 insertions, 5 deletions

diff --git a/sys-libs/db/ChangeLog b/sys-libs/db/ChangeLog
index 11c7831cbed4..7623486787c1 100644
--- a/sys-libs/db/ChangeLog
+++ b/sys-libs/db/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for sys-libs/db
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/ChangeLog,v 1.163 2006/06/12 08:37:37 pauldv Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/ChangeLog,v 1.164 2006/07/25 21:14:14 nichoj Exp $
+
+*db-4.3.29-r2 (25 Jul 2006)
+*db-4.2.52_p4-r2 (25 Jul 2006)
+
+  25 Jul 2006; Joshua Nichols <nichoj@gentoo.org>
+  +files/db-4.2-jni-check-prefix-first.patch,
+  +files/db-4.2-listen-to-java-options.patch,
+  +files/db-4.3-jni-check-prefix-first.patch,
+  +files/db-4.3-listen-to-java-options.patch, +db-4.2.52_p4-r2.ebuild,
+  +db-4.3.29-r2.ebuild:
+  Revision bumps to support new Java system.
 
   12 Jun 2006; Paul de Vrieze <pauldv@gentoo.org> db-4.3.29.ebuild:
   This upstream tarball has also changed.
diff --git a/sys-libs/db/Manifest b/sys-libs/db/Manifest
index a6b99923b333..d12a269c132f 100644
--- a/sys-libs/db/Manifest
+++ b/sys-libs/db/Manifest
@@ -38,10 +38,18 @@ AUX db-4.2-jarlocation.patch 599 RMD160 48129c1ab4114baf7ab82fe50e809f251192df97
 MD5 3c47ce6ed92e948fbde232c1e3571f16 files/db-4.2-jarlocation.patch 599
 RMD160 48129c1ab4114baf7ab82fe50e809f251192df97 files/db-4.2-jarlocation.patch 599
 SHA256 74376f1b3e53750f2d777479a9c4e46614ce8e3c4e9583a10c5555dee4abc773 files/db-4.2-jarlocation.patch 599
+AUX db-4.2-jni-check-prefix-first.patch 1172 RMD160 abade6697c7892344b414a72661b3d9266781504 SHA1 69deb374497c93468d5646f4fbdbdc259fdcfe31 SHA256 609eb9d59954effdd229df7622627c639c6a784e8da8131297321a54e808fbe1
+MD5 e86084b8ecbe8c6272923fd3def07c52 files/db-4.2-jni-check-prefix-first.patch 1172
+RMD160 abade6697c7892344b414a72661b3d9266781504 files/db-4.2-jni-check-prefix-first.patch 1172
+SHA256 609eb9d59954effdd229df7622627c639c6a784e8da8131297321a54e808fbe1 files/db-4.2-jni-check-prefix-first.patch 1172
 AUX db-4.2-libtool.patch 665 RMD160 004acdb6758103b65d105713cb9d83baddb09cc3 SHA1 b727c5de38dbacda37f255b754621ed1723be58e SHA256 d8584986fd711c736b453fbab9488a0cd535b908035e77554d53e84d316129f4
 MD5 4f68188f3bc051f50a85c5b72bab85c7 files/db-4.2-libtool.patch 665
 RMD160 004acdb6758103b65d105713cb9d83baddb09cc3 files/db-4.2-libtool.patch 665
 SHA256 d8584986fd711c736b453fbab9488a0cd535b908035e77554d53e84d316129f4 files/db-4.2-libtool.patch 665
+AUX db-4.2-listen-to-java-options.patch 312 RMD160 444f99b1026f071ddf29cecc3885530fb1951048 SHA1 2798ac945ffc902b5805a73f1bf44606804b19b4 SHA256 407f9a9d601137cf40824165ac9f2861c450f90dbf263db929d8d2637e67a851
+MD5 dee31940ff0add80a3001ddd5da89965 files/db-4.2-listen-to-java-options.patch 312
+RMD160 444f99b1026f071ddf29cecc3885530fb1951048 files/db-4.2-listen-to-java-options.patch 312
+SHA256 407f9a9d601137cf40824165ac9f2861c450f90dbf263db929d8d2637e67a851 files/db-4.2-listen-to-java-options.patch 312
 AUX db-4.2.52_p2-TXN.patch 2328 RMD160 b9c69694734d3ddaecac08d8d977e30867f0f9b6 SHA1 76ebec23c737d9aebd7e64ca89f4842f2101dac1 SHA256 acce757ff83adf10853095714a7087047b3f5b6ab1af479baea45fd69a05a681
 MD5 70bd9e597859c7bf6f624e495d50ad91 files/db-4.2.52_p2-TXN.patch 2328
 RMD160 b9c69694734d3ddaecac08d8d977e30867f0f9b6 files/db-4.2.52_p2-TXN.patch 2328
@@ -50,10 +58,18 @@ AUX db-4.3-jarlocation.patch 599 RMD160 9ba292ef122e167b42ed3c1ee81b388fdb1d74fe
 MD5 b1df069d8d9a974fe864e681dc165cfc files/db-4.3-jarlocation.patch 599
 RMD160 9ba292ef122e167b42ed3c1ee81b388fdb1d74fe files/db-4.3-jarlocation.patch 599
 SHA256 1d0cf92e6e897f40330431c0d299f7c3312d519452a8d1b59fcdf42f8d2ec943 files/db-4.3-jarlocation.patch 599
+AUX db-4.3-jni-check-prefix-first.patch 1172 RMD160 abade6697c7892344b414a72661b3d9266781504 SHA1 69deb374497c93468d5646f4fbdbdc259fdcfe31 SHA256 609eb9d59954effdd229df7622627c639c6a784e8da8131297321a54e808fbe1
+MD5 e86084b8ecbe8c6272923fd3def07c52 files/db-4.3-jni-check-prefix-first.patch 1172
+RMD160 abade6697c7892344b414a72661b3d9266781504 files/db-4.3-jni-check-prefix-first.patch 1172
+SHA256 609eb9d59954effdd229df7622627c639c6a784e8da8131297321a54e808fbe1 files/db-4.3-jni-check-prefix-first.patch 1172
 AUX db-4.3-libtool.patch 2161 RMD160 1da5fa5d59d60f74429b29c6eebcd52ac22b7d87 SHA1 8f277b3c8c14a5818226576ee17c800136513085 SHA256 2ec92f53f9ae5431acfbe4fdaddc5406730b98f3bf372d58f0ad69c69fa16df4
 MD5 fee87f3b3eb96ac9a15f44aa5ff1c08c files/db-4.3-libtool.patch 2161
 RMD160 1da5fa5d59d60f74429b29c6eebcd52ac22b7d87 files/db-4.3-libtool.patch 2161
 SHA256 2ec92f53f9ae5431acfbe4fdaddc5406730b98f3bf372d58f0ad69c69fa16df4 files/db-4.3-libtool.patch 2161
+AUX db-4.3-listen-to-java-options.patch 312 RMD160 444f99b1026f071ddf29cecc3885530fb1951048 SHA1 2798ac945ffc902b5805a73f1bf44606804b19b4 SHA256 407f9a9d601137cf40824165ac9f2861c450f90dbf263db929d8d2637e67a851
+MD5 dee31940ff0add80a3001ddd5da89965 files/db-4.3-listen-to-java-options.patch 312
+RMD160 444f99b1026f071ddf29cecc3885530fb1951048 files/db-4.3-listen-to-java-options.patch 312
+SHA256 407f9a9d601137cf40824165ac9f2861c450f90dbf263db929d8d2637e67a851 files/db-4.3-listen-to-java-options.patch 312
 AUX db-4.3.27-fix-dep-link.patch 1179 RMD160 c7c5d28f6e7083bffbab29e43cb57d800eceba6e SHA1 aa4826051e4b7fc7ff289a5febbe93b60b7d311a SHA256 fc5c59311dadd11dde7ba6b6e975069a52e1ded76fcebe1b76927b79899fe425
 MD5 72688c24d0217c7e214b816417d8ef97 files/db-4.3.27-fix-dep-link.patch 1179
 RMD160 c7c5d28f6e7083bffbab29e43cb57d800eceba6e files/db-4.3.27-fix-dep-link.patch 1179
@@ -137,6 +153,10 @@ EBUILD db-4.2.52_p2.ebuild 2939 RMD160 871a91d3957543d20a3df0bab121a0f1fe94a9b0
 MD5 fbc30c4e8aaba33d2ad4c48a8190a14d db-4.2.52_p2.ebuild 2939
 RMD160 871a91d3957543d20a3df0bab121a0f1fe94a9b0 db-4.2.52_p2.ebuild 2939
 SHA256 63c3a13ef96584b6e4267bf6f85ec77710d0cf3001dc58ace3f71540f4549da1 db-4.2.52_p2.ebuild 2939
+EBUILD db-4.2.52_p4-r2.ebuild 3414 RMD160 140b690b58bca943ef5ebbc6f7609e8be68db367 SHA1 14073ec09ba071b938f5d7c0e4967bbfeb5c0ee7 SHA256 02f1658ebe08ead2e30557aeb5c94b52d09d72f390758fef1b9f74a9cd5148b1
+MD5 febeb3a34213d1b3cdb6aee159e47420 db-4.2.52_p4-r2.ebuild 3414
+RMD160 140b690b58bca943ef5ebbc6f7609e8be68db367 db-4.2.52_p4-r2.ebuild 3414
+SHA256 02f1658ebe08ead2e30557aeb5c94b52d09d72f390758fef1b9f74a9cd5148b1 db-4.2.52_p4-r2.ebuild 3414
 EBUILD db-4.2.52_p4.ebuild 3204 RMD160 e4a42b9617c2ba9e8b5fbcbf230fc873b28838f1 SHA1 a3979f0edf3b0688a08cfd60dd226cb19ad1e406 SHA256 436113852fc6fe4334389c903a20618ee3b72364c076836df0015d7947565021
 MD5 61c450caff07cb3d1af8000e85aea300 db-4.2.52_p4.ebuild 3204
 RMD160 e4a42b9617c2ba9e8b5fbcbf230fc873b28838f1 db-4.2.52_p4.ebuild 3204
@@ -145,6 +165,10 @@ EBUILD db-4.3.27.ebuild 2939 RMD160 0683c7face86283a18c31f4105b73424dd1ef10e SHA
 MD5 1c363b98875b5678e066d570e40c98a5 db-4.3.27.ebuild 2939
 RMD160 0683c7face86283a18c31f4105b73424dd1ef10e db-4.3.27.ebuild 2939
 SHA256 b71673d010d42252b367995e036d50fea1e556f758e4aed013fcb40e981532d8 db-4.3.27.ebuild 2939
+EBUILD db-4.3.29-r2.ebuild 3583 RMD160 7786d5bd1e7732025ad173f098c91b8f3dd5137d SHA1 2f7b9e2f84b4d7f6c4b9de71d460f984e152b368 SHA256 402f24514db223388ebc5ce4e5bf258e8e7eec9e2fe9ab31c333b51fc290c0a2
+MD5 c7a7b6c96b666c17a61b5a74fca19b34 db-4.3.29-r2.ebuild 3583
+RMD160 7786d5bd1e7732025ad173f098c91b8f3dd5137d db-4.3.29-r2.ebuild 3583
+SHA256 402f24514db223388ebc5ce4e5bf258e8e7eec9e2fe9ab31c333b51fc290c0a2 db-4.3.29-r2.ebuild 3583
 EBUILD db-4.3.29.ebuild 3374 RMD160 1bca0b20493317725d11b87db21fea36c40b80f9 SHA1 a2d840b9d369a97950cc01c827b11e1be73ac57b SHA256 9d7be0a07918739fa4b9c17289c4523ef434bd653379682264f7fc933e8fb83c
 MD5 12b0ee2bce33751b427bfb0e4049b1fa db-4.3.29.ebuild 3374
 RMD160 1bca0b20493317725d11b87db21fea36c40b80f9 db-4.3.29.ebuild 3374
@@ -153,10 +177,10 @@ EBUILD db-4.4.20_p2.ebuild 3285 RMD160 0f35956a22cbaa6ffb6581aa3512d4da92594219
 MD5 a0736c0d3d5f613122958eade29d82c3 db-4.4.20_p2.ebuild 3285
 RMD160 0f35956a22cbaa6ffb6581aa3512d4da92594219 db-4.4.20_p2.ebuild 3285
 SHA256 d7dc58e0301da5b832e31937d335c11fdf672f3c81abf53c0a7c535dd873cd85 db-4.4.20_p2.ebuild 3285
-MISC ChangeLog 25230 RMD160 0c9a55b3f1b1339ffafb5245a589f0038360979c SHA1 e07511f634024b4ca9f38bdd98def99789bca9b4 SHA256 efc20a2f8ab549f8d4898375806bd96ec527dc4522c89c6906e0995491232bd4
-MD5 4c8a9ced19e3d11cc7b1b9811926b1c7 ChangeLog 25230
-RMD160 0c9a55b3f1b1339ffafb5245a589f0038360979c ChangeLog 25230
-SHA256 efc20a2f8ab549f8d4898375806bd96ec527dc4522c89c6906e0995491232bd4 ChangeLog 25230
+MISC ChangeLog 25619 RMD160 5d32b3e0f2734dbeecb7b1d9e8fc8c9f82598774 SHA1 c826d3b5b48ea5adfe9454ae5f198319bb388a54 SHA256 3e8977d4a13d66a44d33375c64f6431212736d909e3bcf2c92c991a3eb375b37
+MD5 c8655d7ee2950ca9a08b63cd2c57aa65 ChangeLog 25619
+RMD160 5d32b3e0f2734dbeecb7b1d9e8fc8c9f82598774 ChangeLog 25619
+SHA256 3e8977d4a13d66a44d33375c64f6431212736d909e3bcf2c92c991a3eb375b37 ChangeLog 25619
 MISC metadata.xml 1460 RMD160 6f73dd6370c976b947d939633aa6f67d078e4fc7 SHA1 a29a6ed2d9dfbe3b686a9281a1909d9fc7bd61e9 SHA256 ad820b0fe2d8ec2aac1eb181f2e3e2769392e1ae6c5f6afb7e1603bdd0bb7405
 MD5 e1753ef0eb3e9614fadff321ecd1b082 metadata.xml 1460
 RMD160 6f73dd6370c976b947d939633aa6f67d078e4fc7 metadata.xml 1460
@@ -197,12 +221,18 @@ SHA256 e739ff2c7b811c40acda804c2c55022361bee9d70697ea5212ffadd0652c1aa6 files/di
 MD5 5b26ebc13339ba6b36378cca8d1731de files/digest-db-4.2.52_p4 1097
 RMD160 1facf4365533cb9dc8ddaccfa856936af15a37c4 files/digest-db-4.2.52_p4 1097
 SHA256 b43c4fbd39191f19fc0313e24ed0640fbbfbb3c8ef1b310dfebb81ef6960d7e8 files/digest-db-4.2.52_p4 1097
+MD5 5b26ebc13339ba6b36378cca8d1731de files/digest-db-4.2.52_p4-r2 1097
+RMD160 1facf4365533cb9dc8ddaccfa856936af15a37c4 files/digest-db-4.2.52_p4-r2 1097
+SHA256 b43c4fbd39191f19fc0313e24ed0640fbbfbb3c8ef1b310dfebb81ef6960d7e8 files/digest-db-4.2.52_p4-r2 1097
 MD5 4ef4bc60989648f119a73c599713205a files/digest-db-4.3.27 232
 RMD160 d71ae7f43c1d3f28f334f211eb5ddbad2a8867ec files/digest-db-4.3.27 232
 SHA256 637d690af4a29579e25629be75bcbdd2ab4588753dce8d893aa5cee845a95b5b files/digest-db-4.3.27 232
 MD5 123d0f2ed8e43cfb592a0c5cdaf0df0b files/digest-db-4.3.29 232
 RMD160 7ae63d1ada88313b08eca576ddd037342f123cfa files/digest-db-4.3.29 232
 SHA256 43f814e2ff2cd9d7ca6f40f336a9eacefb8b3d2d0aa3fdd5046369a07aa00251 files/digest-db-4.3.29 232
+MD5 123d0f2ed8e43cfb592a0c5cdaf0df0b files/digest-db-4.3.29-r2 232
+RMD160 7ae63d1ada88313b08eca576ddd037342f123cfa files/digest-db-4.3.29-r2 232
+SHA256 43f814e2ff2cd9d7ca6f40f336a9eacefb8b3d2d0aa3fdd5046369a07aa00251 files/digest-db-4.3.29-r2 232
 MD5 c36ac17ff6e664f9a8f5bd2fe3534dd5 files/digest-db-4.4.20_p2 660
 RMD160 fa3804c13649e3d5d0bc42c5a7822764be74a674 files/digest-db-4.4.20_p2 660
 SHA256 dcce09c08cdfddd585acc3b07685a92d1f78dad6ce7936b85728cf782b4c2096 files/digest-db-4.4.20_p2 660
diff --git a/sys-libs/db/db-4.2.52_p4-r2.ebuild b/sys-libs/db/db-4.2.52_p4-r2.ebuild
new file mode 100644
index 000000000000..f3559c63d682
--- /dev/null
+++ b/sys-libs/db/db-4.2.52_p4-r2.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.2.52_p4-r2.ebuild,v 1.1 2006/07/25 21:14:14 nichoj Exp $
+
+inherit eutils gnuconfig db 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="Berkeley DB"
+HOMEPAGE="http://www.sleepycat.com/"
+SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
+for (( i=1 ; i<=$PATCHNO ; i++ )) ; do
+	export SRC_URI="${SRC_URI} http://www.sleepycat.com/update/${MY_PV}/patch.${MY_PV}.${i}"
+done
+
+LICENSE="DB"
+SLOT="4.2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="tcltk java doc nocxx bootstrap"
+
+DEPEND="tcltk? ( >=dev-lang/tcl-8.4 )
+	java? ( >=virtual/jdk-1.4 )"
+RDEPEND="tcltk? ( 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
+	epatch ${FILESDIR}/${PN}-4.0.14-fix-dep-link.patch
+	epatch ${FILESDIR}/${PN}-4.2.52_p2-TXN.patch
+
+	# use the includes from the prefix
+	epatch ${FILESDIR}/${PN}-${SLOT}-jni-check-prefix-first.patch
+	epatch ${FILESDIR}/${PN}-${SLOT}-listen-to-java-options.patch
+
+	gnuconfig_update "${S}/../dist"
+
+	sed -i -e "s,\(ac_compiler\|\${MAKEFILE_CC}\|\${MAKEFILE_CXX}\|\$CC\)\( *--version\),\1 -dumpversion,g" ${S}/../dist/configure
+}
+
+src_compile() {
+	local myconf=""
+
+	use amd64 && myconf="${myconf} --with-mutex=x86/gcc-assembly"
+
+	use bootstrap \
+		&& myconf="${myconf} --disable-cxx" \
+		|| myconf="${myconf} $(use_enable !nocxx cxx)"
+
+	use tcltk \
+		&& 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 tcltk && has test $FEATURES; then
+		myconf="${myconf} --enable-test"
+	else
+		myconf="${myconf} --disable-test"
+	fi
+
+	../dist/configure \
+		--prefix=/usr \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		--datadir=/usr/share \
+		--sysconfdir=/etc \
+		--localstatedir=/var/lib \
+		--libdir=/usr/$(get_libdir) \
+		--enable-compat185 \
+		--with-uniquename \
+		--enable-rpc \
+		--host=${CHOST} \
+		${myconf} "${javaconf}" || die "configure failed"
+
+	emake -j1 || die "make failed"
+}
+
+src_install() {
+
+	einstall libdir="${D}/usr/$(get_libdir)" strip="${D}/bin/strip" || 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_db42_svc
+
+	if use java; then
+		java-pkg_regso ${D}/usr/lib/libdb_java*.so
+		java-pkg_dojar ${D}/usr/lib/*.jar
+		rm ${D}/usr/lib/*.jar
+	fi
+}
+
+pkg_postinst () {
+	db_fix_so
+}
+
+pkg_postrm () {
+	db_fix_so
+}
diff --git a/sys-libs/db/db-4.3.29-r2.ebuild b/sys-libs/db/db-4.3.29-r2.ebuild
new file mode 100644
index 000000000000..c50caba30e19
--- /dev/null
+++ b/sys-libs/db/db-4.3.29-r2.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.3.29-r2.ebuild,v 1.1 2006/07/25 21:14:14 nichoj Exp $
+
+inherit eutils gnuconfig 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="Berkeley DB"
+HOMEPAGE="http://www.sleepycat.com/"
+SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
+#SRC_URI="ftp://ftp.sleepycat.com/releases/${MY_P}.tar.gz"
+for (( i=1 ; i<=$PATCHNO ; i++ )) ; do
+	export SRC_URI="${SRC_URI} http://www.sleepycat.com/update/${MY_PV}/patch.${MY_PV}.${i}"
+done
+
+LICENSE="DB"
+SLOT="4.3"
+KEYWORDS="~amd64 ~ia64 ~m68k ~ppc ~sparc ~x86 ~x86-fbsd"
+IUSE="tcltk java doc nocxx bootstrap"
+
+DEPEND="tcltk? ( >=dev-lang/tcl-8.4 )
+	java? ( >=virtual/jdk-1.4 )
+	>=sys-devel/binutils-2.16.1"
+RDEPEND="tcltk? ( 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
+
+	epatch ${FILESDIR}/${PN}-4.3.27-fix-dep-link.patch
+
+	# use the includes from the prefix
+	epatch ${FILESDIR}/${PN}-${SLOT}-jni-check-prefix-first.patch
+	epatch ${FILESDIR}/${PN}-${SLOT}-listen-to-java-options.patch
+
+	gnuconfig_update "${S}/../dist"
+
+	sed -i -e "s,\(ac_compiler\|\${MAKEFILE_CC}\|\${MAKEFILE_CXX}\|\$CC\)\( *--version\),\1 -dumpversion,g" ${S}/../dist/configure
+}
+
+src_compile() {
+	local myconf=""
+
+	use amd64 && myconf="${myconf} --with-mutex=x86/gcc-assembly"
+
+	use bootstrap \
+		&& myconf="${myconf} --disable-cxx" \
+		|| myconf="${myconf} $(use_enable !nocxx cxx)"
+
+	use tcltk \
+		&& 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 tcltk && 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
+
+	../dist/configure \
+		--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"
+
+	emake -j1 || die "make failed"
+}
+
+src_install() {
+	einstall libdir="${D}/usr/$(get_libdir)" strip="${D}/bin/strip" || 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_db43_svc
+
+	if use java; then
+		java-pkg_regso ${D}/usr/lib/libdb_java*.so
+		java-pkg_dojar ${D}/usr/lib/*.jar
+		rm ${D}/usr/lib/*.jar
+	fi
+}
+
+pkg_postinst() {
+	db_fix_so
+}
+
+pkg_postrm() {
+	db_fix_so
+}
diff --git a/sys-libs/db/files/db-4.2-jni-check-prefix-first.patch b/sys-libs/db/files/db-4.2-jni-check-prefix-first.patch
new file mode 100644
index 000000000000..17f80e1bcfef
--- /dev/null
+++ b/sys-libs/db/files/db-4.2-jni-check-prefix-first.patch
@@ -0,0 +1,30 @@
+--- dist/aclocal_java/ac_jni_include_dirs.ac	2003-10-06 20:41:38.000000000 +0200
++++ dist/aclocal_java/ac_jni_include_dirs.ac	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.2-listen-to-java-options.patch b/sys-libs/db/files/db-4.2-listen-to-java-options.patch
new file mode 100644
index 000000000000..8ddb46b70261
--- /dev/null
+++ b/sys-libs/db/files/db-4.2-listen-to-java-options.patch
@@ -0,0 +1,10 @@
+--- dist/configure.ac	2005-09-23 21:01:26.000000000 +0200
++++ dist/configure.ac	2005-09-23 20:59:20.000000000 +0200
+@@ -385,6 +385,7 @@
+         # A classpath that includes . is needed to check for Java
+ 	CLASSPATH=".:$CLASSPATH"
+ 	export CLASSPATH
++	AC_JAVA_OPTIONS
+ 	AC_PROG_JAVAC
+ 	AC_PROG_JAR
+ 	AC_PROG_JAVA
diff --git a/sys-libs/db/files/db-4.3-jni-check-prefix-first.patch b/sys-libs/db/files/db-4.3-jni-check-prefix-first.patch
new file mode 100644
index 000000000000..17f80e1bcfef
--- /dev/null
+++ b/sys-libs/db/files/db-4.3-jni-check-prefix-first.patch
@@ -0,0 +1,30 @@
+--- dist/aclocal_java/ac_jni_include_dirs.ac	2003-10-06 20:41:38.000000000 +0200
++++ dist/aclocal_java/ac_jni_include_dirs.ac	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.3-listen-to-java-options.patch b/sys-libs/db/files/db-4.3-listen-to-java-options.patch
new file mode 100644
index 000000000000..8ddb46b70261
--- /dev/null
+++ b/sys-libs/db/files/db-4.3-listen-to-java-options.patch
@@ -0,0 +1,10 @@
+--- dist/configure.ac	2005-09-23 21:01:26.000000000 +0200
++++ dist/configure.ac	2005-09-23 20:59:20.000000000 +0200
+@@ -385,6 +385,7 @@
+         # A classpath that includes . is needed to check for Java
+ 	CLASSPATH=".:$CLASSPATH"
+ 	export CLASSPATH
++	AC_JAVA_OPTIONS
+ 	AC_PROG_JAVAC
+ 	AC_PROG_JAR
+ 	AC_PROG_JAVA
diff --git a/sys-libs/db/files/digest-db-4.2.52_p4-r2 b/sys-libs/db/files/digest-db-4.2.52_p4-r2
new file mode 100644
index 000000000000..58f9581b01fb
--- /dev/null
+++ b/sys-libs/db/files/digest-db-4.2.52_p4-r2
@@ -0,0 +1,15 @@
+MD5 cbc77517c9278cdb47613ce8cb55779f db-4.2.52.tar.gz 4073147
+RMD160 d9095bce12b519695f3d1ff708dc0d1babd7a4b2 db-4.2.52.tar.gz 4073147
+SHA256 72f581d8b91da900434629886d1d1c6ea8b9d2a9329368c3b875e7cd556b6a0e db-4.2.52.tar.gz 4073147
+MD5 1227f5f9ff43d48b5b1759e113a1c2d7 patch.4.2.52.1 988
+RMD160 1ff7d93c4e6223b793ed3038070a4f0957dac44e patch.4.2.52.1 988
+SHA256 98b7580916459ee931b9c7e06dcb9da980732672fe0811714933f366ad97dfa5 patch.4.2.52.1 988
+MD5 3da7efd8d29919a9113e2f6f5166f5b7 patch.4.2.52.2 1433
+RMD160 880cd32f5bd1430463da0f4169e1d6e4a2b96b81 patch.4.2.52.2 1433
+SHA256 c9b132bcc8f1c12e03baaf47abd3801f2adf24ffbd56f35a27617fec12654f32 patch.4.2.52.2 1433
+MD5 0bf9ebbe852652bed433e522928d40ec patch.4.2.52.3 8672
+RMD160 443b5cb93346482166f407c8fb9522035d151f02 patch.4.2.52.3 8672
+SHA256 ca5245d2e1c7a40df5ec57cbabee8bf0106292c69a37eb0ca275d1aa59061907 patch.4.2.52.3 8672
+MD5 9cfeff4dce0c11372c0b04b134f8faef patch.4.2.52.4 1311
+RMD160 d6154a5e1203348d37e2f537300582fc06fc9def patch.4.2.52.4 1311
+SHA256 c15c82071c02ce1a10024c572e2e9fd72006089007141a01fdd37b889411b973 patch.4.2.52.4 1311
diff --git a/sys-libs/db/files/digest-db-4.3.29-r2 b/sys-libs/db/files/digest-db-4.3.29-r2
new file mode 100644
index 000000000000..8b53cf06bcf3
--- /dev/null
+++ b/sys-libs/db/files/digest-db-4.3.29-r2
@@ -0,0 +1,3 @@
+MD5 13585a20ce32f113b8e8cdb57f52e3bb db-4.3.29.tar.gz 6103264
+RMD160 fac910828a74087124e9cc3cad99c6a6dc88c14b db-4.3.29.tar.gz 6103264
+SHA256 db3e762d819f9a31bc4ebf5ecada53e9787aeb26fc92fa6064b2ba57df806af4 db-4.3.29.tar.gz 6103264