Version bumps in preperation for db-4.4. src_test support added, warning it can take 6 hours!

Package-Manager: portage-2.1_pre2

8 files changed, 439 insertions, 40 deletions

diff --git a/sys-libs/db/ChangeLog b/sys-libs/db/ChangeLog
index 0c32818ccb39..25f7dc9214d7 100644
--- a/sys-libs/db/ChangeLog
+++ b/sys-libs/db/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sys-libs/db
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/ChangeLog,v 1.145 2005/12/13 22:21:46 ferdy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/ChangeLog,v 1.146 2005/12/26 06:58:17 robbat2 Exp $
+
+*db-4.3.29 (26 Dec 2005)
+*db-4.2.52_p4 (26 Dec 2005)
+*db-4.1.25_p2 (26 Dec 2005)
+
+  26 Dec 2005; Robin H. Johnson <robbat2@gentoo.org> +db-4.1.25_p2.ebuild,
+  +db-4.2.52_p4.ebuild, +db-4.3.29.ebuild:
+  Version bumps in preperation for db-4.4. src_test support added, warning it
+  can take 6 hours!
 
   13 Dec 2005; Fernando J. Pereda <ferdy@gentoo.org> db-4.2.52_p2-r1.ebuild:
   stable on alpha
diff --git a/sys-libs/db/Manifest b/sys-libs/db/Manifest
index 09e8671581a0..ad98d621e1e5 100644
--- a/sys-libs/db/Manifest
+++ b/sys-libs/db/Manifest
@@ -1,56 +1,52 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 2bf969112dc6e1918a57d420d90be038 ChangeLog 22854
+MD5 15e26e1303761aa1b814d1d46f930d74 db-1.85-r1.ebuild 1435
 MD5 a0435de0fd1dacc747f315502eda91bc db-1.85-r2.ebuild 1467
-MD5 b3cb97191214b2260603ee79ee1cc8e0 db-4.0.14-r3.ebuild 2480
-MD5 2b53b92447c5f06991103d07b2443168 db-4.1.25_p1-r4.ebuild 2706
+MD5 f63d1e3bb30c46a75c47bd3460a1703a db-1.85-r3.ebuild 1221
 MD5 73ccb0c04661223f8a54651fa23d1a5c db-3.2.9-r10.ebuild 4299
-MD5 74f280853789512d578b7cb488c28733 db-4.3.27.ebuild 2917
-MD5 15e26e1303761aa1b814d1d46f930d74 db-1.85-r1.ebuild 1435
+MD5 3095611cc9de038f5dab190381574a17 db-3.2.9-r7.ebuild 4416
 MD5 6f9b8f054235426e239efa7ad5269ab3 db-4.0.14-r2.ebuild 2227
-MD5 fa0e2188b8f14d47bc85775d74115c76 db-4.2.52_p2.ebuild 2958
+MD5 b3cb97191214b2260603ee79ee1cc8e0 db-4.0.14-r3.ebuild 2480
 MD5 08193a44b9ff7ab8193fd7874bca288e db-4.1.25_p1-r3.ebuild 2550
-MD5 f63d1e3bb30c46a75c47bd3460a1703a db-1.85-r3.ebuild 1221
-MD5 3095611cc9de038f5dab190381574a17 db-3.2.9-r7.ebuild 4416
-MD5 1c490c034443f2905f855abf0722fff5 db-4.2.52_p2-r1.ebuild 2991
-MD5 16046e0755a39eb0b6496485f30d8668 ChangeLog 22553
-MD5 e1753ef0eb3e9614fadff321ecd1b082 metadata.xml 1460
+MD5 2b53b92447c5f06991103d07b2443168 db-4.1.25_p1-r4.ebuild 2706
+MD5 83fbf471223264544d8ebcfc85f2a5af db-4.1.25_p2.ebuild 2901
 MD5 3316d306f09820f7daaeed2a6b179eef db-4.2.52_p1.ebuild 2836
+MD5 1c490c034443f2905f855abf0722fff5 db-4.2.52_p2-r1.ebuild 2991
+MD5 fa0e2188b8f14d47bc85775d74115c76 db-4.2.52_p2.ebuild 2958
+MD5 93c0e9560cbe7ec76601c58d044d862a db-4.2.52_p4.ebuild 3190
+MD5 74f280853789512d578b7cb488c28733 db-4.3.27.ebuild 2917
+MD5 8c77d6ee368cc8a9a215062609541af7 db-4.3.29.ebuild 3092
+MD5 86aca9a49a082dc56e4103ec8112f344 files/db-1.85-gentoo-paths.patch 684
+MD5 194200b3295b95b46b4564980af27f1f files/db-3.2.9-fix-dep-link.patch 1005
 MD5 6eb8be5f7803acaa5bcfd4ed5ffabf83 files/db-3.2.9-jarlocation.patch 492
-MD5 4f68188f3bc051f50a85c5b72bab85c7 files/db-4.2-libtool.patch 665
-MD5 2bb2a5dbe8d16f858d177e1193639b70 files/db-4.1.25_p1-jarlocation.patch 626
-MD5 44c6041ae9527bfa8a4ff4cec7cf4a9a files/digest-db-3.2.9-r10 61
-MD5 fee87f3b3eb96ac9a15f44aa5ff1c08c files/db-4.3-libtool.patch 2161
-MD5 0101200dac8a9299fc1578081ac72b71 files/db-4.0.14-jarlocation.patch 565
+MD5 fa494e61698001c02f2b6a192acfaf99 files/db-3.2.9-java15.patch 598
 MD5 eb9b0f2c1d8440c6c49fc1d916c2dc0e files/db-4.0.14-fix-dep-link.patch 1119
-MD5 44c6041ae9527bfa8a4ff4cec7cf4a9a files/digest-db-3.2.9-r7 61
-MD5 f029f70f531ca67c16b62573d61de49e files/digest-db-4.1.25_p1-r3 118
-MD5 f029f70f531ca67c16b62573d61de49e files/digest-db-4.1.25_p1-r4 118
+MD5 0101200dac8a9299fc1578081ac72b71 files/db-4.0.14-jarlocation.patch 565
+MD5 395933484399c22681916b0e86db3258 files/db-4.1.25-java.patch 721
+MD5 75ba5de97737693cfdfe85908b5adfbd files/db-4.1.25-uclibc.patch 731
+MD5 2bb2a5dbe8d16f858d177e1193639b70 files/db-4.1.25_p1-jarlocation.patch 626
+MD5 3c47ce6ed92e948fbde232c1e3571f16 files/db-4.2-jarlocation.patch 599
+MD5 4f68188f3bc051f50a85c5b72bab85c7 files/db-4.2-libtool.patch 665
+MD5 70bd9e597859c7bf6f624e495d50ad91 files/db-4.2.52_p2-TXN.patch 2328
 MD5 b1df069d8d9a974fe864e681dc165cfc files/db-4.3-jarlocation.patch 599
+MD5 fee87f3b3eb96ac9a15f44aa5ff1c08c files/db-4.3-libtool.patch 2161
+MD5 72688c24d0217c7e214b816417d8ef97 files/db-4.3.27-fix-dep-link.patch 1179
+MD5 ecd81fa9868ec49c61306444144d44a9 files/db.1.85.patch 55584
 MD5 3057fcc117c33a02bd4c092586a58e49 files/digest-db-1.85-r1 59
 MD5 69bde9765bf0a2d6c55a253eb0e53190 files/digest-db-1.85-r2 120
 MD5 8e6bb983290a04b011ca888f80a3a0e2 files/digest-db-1.85-r3 125
-MD5 86aca9a49a082dc56e4103ec8112f344 files/db-1.85-gentoo-paths.patch 684
-MD5 72688c24d0217c7e214b816417d8ef97 files/db-4.3.27-fix-dep-link.patch 1179
+MD5 44c6041ae9527bfa8a4ff4cec7cf4a9a files/digest-db-3.2.9-r10 61
+MD5 44c6041ae9527bfa8a4ff4cec7cf4a9a files/digest-db-3.2.9-r7 61
 MD5 068fc523df1ee6f36b5de8516ab7739f files/digest-db-4.0.14-r2 62
 MD5 068fc523df1ee6f36b5de8516ab7739f files/digest-db-4.0.14-r3 62
-MD5 194200b3295b95b46b4564980af27f1f files/db-3.2.9-fix-dep-link.patch 1005
-MD5 e54996f4a19633179add94a051ebf900 files/digest-db-4.3.27 62
-MD5 fa494e61698001c02f2b6a192acfaf99 files/db-3.2.9-java15.patch 598
-MD5 75ba5de97737693cfdfe85908b5adfbd files/db-4.1.25-uclibc.patch 731
-MD5 ecd81fa9868ec49c61306444144d44a9 files/db.1.85.patch 55584
+MD5 f029f70f531ca67c16b62573d61de49e files/digest-db-4.1.25_p1-r3 118
+MD5 f029f70f531ca67c16b62573d61de49e files/digest-db-4.1.25_p1-r4 118
+MD5 0160bc21ad356ac2fbcf176f5d43ec17 files/digest-db-4.1.25_p2 176
 MD5 35fa694f3db327e4fb015728aca6a082 files/digest-db-4.2.52_p1 118
 MD5 68a677d9846ad3fc623f173581ff9aa5 files/digest-db-4.2.52_p2 175
-MD5 70bd9e597859c7bf6f624e495d50ad91 files/db-4.2.52_p2-TXN.patch 2328
-MD5 395933484399c22681916b0e86db3258 files/db-4.1.25-java.patch 721
+MD5 68a677d9846ad3fc623f173581ff9aa5 files/digest-db-4.2.52_p2-r1 175
+MD5 9bc51ba73d3e42acaaa1aa70dea4eb18 files/digest-db-4.2.52_p4 289
+MD5 e54996f4a19633179add94a051ebf900 files/digest-db-4.3.27 62
+MD5 1ef24208f7a41603e6958e15c6278278 files/digest-db-4.3.29 62
 MD5 9cf113248f29b1e319ae73b266df4986 files/patch.3.2.9.1 2139
 MD5 f8edd1cf6535cd62f9b8ff81e0474273 files/patch.3.2.9.2 495
-MD5 3c47ce6ed92e948fbde232c1e3571f16 files/db-4.2-jarlocation.patch 599
-MD5 68a677d9846ad3fc623f173581ff9aa5 files/digest-db-4.2.52_p2-r1 175
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDn0mNViELBEf1JB0RAjuPAJ9CkrdJkC3B2/UX/F8voAZDbNC/WQCfd9JK
-IoIcjYcyyzBTEZ7lBiLFLfU=
-=XBMU
------END PGP SIGNATURE-----
+MD5 e1753ef0eb3e9614fadff321ecd1b082 metadata.xml 1460
diff --git a/sys-libs/db/db-4.1.25_p2.ebuild b/sys-libs/db/db-4.1.25_p2.ebuild
new file mode 100644
index 000000000000..d7436eb8b1e2
--- /dev/null
+++ b/sys-libs/db/db-4.1.25_p2.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.1.25_p2.ebuild,v 1.1 2005/12/26 06:58:18 robbat2 Exp $
+
+inherit eutils gnuconfig db
+
+#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="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.1"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="bootstrap doc java nocxx tcltk uclibc"
+
+DEPEND="tcltk? ( dev-lang/tcl )
+	java? ( virtual/jdk )"
+RDEPEND="tcltk? ( dev-lang/tcl )
+	java? ( virtual/jre )"
+
+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}-4.1.25_p1-jarlocation.patch
+
+	epatch ${FILESDIR}/${PN}-4.0.14-fix-dep-link.patch
+	epatch ${FILESDIR}/${PN}-4.1.25-uclibc.patch
+	epatch ${FILESDIR}/${PN}-4.1.25-java.patch
+
+	gnuconfig_update "${S}/../dist"
+}
+
+src_compile() {
+	addwrite /proc/self/maps
+
+	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 && [[ -n ${JAVAC} ]] ; then
+		export PATH=`dirname ${JAVAC}`:${PATH}
+		export JAVAC=`basename ${JAVAC}`
+	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} || die "configure failed"
+
+	emake -j1 || die "make failed"
+}
+
+src_install() {
+
+	einstall libdir="${D}/usr/$(get_libdir)" || 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_db41_svc
+
+	use uclibc && rm -f ${D}/usr/include/db*/*cxx*
+}
+
+pkg_postinst () {
+	db_fix_so
+}
+
+pkg_postrm () {
+	db_fix_so
+}
diff --git a/sys-libs/db/db-4.2.52_p4.ebuild b/sys-libs/db/db-4.2.52_p4.ebuild
new file mode 100644
index 000000000000..bad5a09c2766
--- /dev/null
+++ b/sys-libs/db/db-4.2.52_p4.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2005 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.ebuild,v 1.1 2005/12/26 06:58:18 robbat2 Exp $
+
+inherit eutils gnuconfig db
+
+#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="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.2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="tcltk java doc nocxx bootstrap"
+
+DEPEND="tcltk? ( >=dev-lang/tcl-8.4 )
+	java? ( virtual/jdk )"
+RDEPEND="tcltk? ( dev-lang/tcl )
+	java? ( virtual/jre )"
+
+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}-jarlocation.patch
+	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
+
+	gnuconfig_update "${S}/../dist"
+
+	sed -i -e "s,\(ac_compiler\|\${MAKEFILE_CC}\|\${MAKEFILE_CXX}\|\$CC\)\( *--version\),\1 -dumpversion,g" ${S}/../dist/configure
+}
+
+src_compile() {
+	addwrite /proc/self/maps
+
+	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 && [[ -n ${JAVAC} ]] ; then
+		export PATH=`dirname ${JAVAC}`:${PATH}
+		export JAVAC=`basename ${JAVAC}`
+	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} || die "configure failed"
+
+	emake -j1 || die "make failed"
+}
+
+src_install() {
+
+	einstall libdir="${D}/usr/$(get_libdir)" || 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
+		mkdir -p ${D}/usr/share/db
+		cat <<EOF >${D}/usr/share/db/package.env
+DESCRIPTION=The java bindings for berkeley db version ${MY_PV}
+CLASSPATH=:/usr/lib/db-${SLOT}.jar
+EOF
+	fi
+}
+
+pkg_postinst () {
+	db_fix_so
+}
+
+pkg_postrm () {
+	db_fix_so
+}
diff --git a/sys-libs/db/db-4.3.29.ebuild b/sys-libs/db/db-4.3.29.ebuild
new file mode 100644
index 000000000000..acb1d013292e
--- /dev/null
+++ b/sys-libs/db/db-4.3.29.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2005 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.ebuild,v 1.1 2005/12/26 06:58:18 robbat2 Exp $
+
+inherit eutils gnuconfig db
+
+#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="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"
+IUSE="tcltk java doc nocxx bootstrap"
+
+DEPEND="tcltk? ( >=dev-lang/tcl-8.4 )
+	java? ( virtual/jdk )"
+RDEPEND="tcltk? ( dev-lang/tcl )
+	java? ( virtual/jre )"
+
+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}-jarlocation.patch
+	epatch ${FILESDIR}/${PN}-${SLOT}-libtool.patch
+
+	epatch ${FILESDIR}/${PN}-4.3.27-fix-dep-link.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() {
+	addwrite /proc/self/maps
+
+	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 && [[ -n ${JAVAC} ]] ; then
+		export PATH=`dirname ${JAVAC}`:${PATH}
+		export JAVAC=`basename ${JAVAC}`
+	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 \
+		--without-uniquename \
+		--enable-rpc \
+		--host=${CHOST} \
+		${myconf} || die "configure failed"
+
+	emake -j1 || die "make failed"
+}
+
+src_install() {
+	einstall libdir="${D}/usr/$(get_libdir)" || 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
+		mkdir -p ${D}/usr/share/db
+		cat <<EOF >${D}/usr/share/db/package.env
+DESCRIPTION=The java bindings for berkeley db version ${MY_PV}
+CLASSPATH=:/usr/lib/db-${SLOT}.jar
+EOF
+	fi
+}
+
+pkg_postinst () {
+	db_fix_so
+}
+
+pkg_postrm () {
+	db_fix_so
+}
diff --git a/sys-libs/db/files/digest-db-4.1.25_p2 b/sys-libs/db/files/digest-db-4.1.25_p2
new file mode 100644
index 000000000000..7bf1edec48ba
--- /dev/null
+++ b/sys-libs/db/files/digest-db-4.1.25_p2
@@ -0,0 +1,3 @@
+MD5 df71961002b552c0e72c6e4e358f27e1 db-4.1.25.tar.gz 3080234
+MD5 1e073d12cd89f9345e281ca07368f74b patch.4.1.25.1 610
+MD5 5eedc6818783b4b89317d89d2babb6f7 patch.4.1.25.2 18100
diff --git a/sys-libs/db/files/digest-db-4.2.52_p4 b/sys-libs/db/files/digest-db-4.2.52_p4
new file mode 100644
index 000000000000..df472d1f6649
--- /dev/null
+++ b/sys-libs/db/files/digest-db-4.2.52_p4
@@ -0,0 +1,5 @@
+MD5 cbc77517c9278cdb47613ce8cb55779f db-4.2.52.tar.gz 4073147
+MD5 1227f5f9ff43d48b5b1759e113a1c2d7 patch.4.2.52.1 988
+MD5 3da7efd8d29919a9113e2f6f5166f5b7 patch.4.2.52.2 1433
+MD5 0bf9ebbe852652bed433e522928d40ec patch.4.2.52.3 8672
+MD5 9cfeff4dce0c11372c0b04b134f8faef patch.4.2.52.4 1311
diff --git a/sys-libs/db/files/digest-db-4.3.29 b/sys-libs/db/files/digest-db-4.3.29
new file mode 100644
index 000000000000..2cad95e717ac
--- /dev/null
+++ b/sys-libs/db/files/digest-db-4.3.29
@@ -0,0 +1 @@
+MD5 13585a20ce32f113b8e8cdb57f52e3bb db-4.3.29.tar.gz 6103264