13 files changed, 0 insertions, 598 deletions
diff --git a/sys-libs/db/Manifest b/sys-libs/db/Manifest
index 151a2c5ecbe5..6bf257a06eb3 100644
--- a/sys-libs/db/Manifest
+++ b/sys-libs/db/Manifest
@@ -11,7 +11,6 @@ DIST db-4.8.30.tar.gz 22887305 SHA256 e0491a07cdb21fb9aa82773bbbedaeb7639cbd0e7f
 DIST db-5.1.29.tar.gz 32188074 SHA256 a943cb4920e62df71de1069ddca486d408f6d7a09ddbbb5637afe7a229389182 SHA512 b3487161cc09dd0aee6117d685d0bc0a58854cf5e96f9e778969a51d3a61b66f8e007b76e584e4ef73f84e07d4418b89c2f6697e34c1ad4072609b11b7b4c5b0 WHIRLPOOL c2c5e335a8ed85f9dd947eb8225148c9633d21f5e17d321a6938b50d4bf061e735563cdbefb8c8aa457923ef80e778f95ad80aba4a92a381432ecf52c2a25353
 DIST db-5.3.28.tar.gz 35090431 SHA256 e0a992d740709892e81f9d93f06daf305cf73fb81b545afe72478043172c3628 SHA512 e91bbe550fc147a8be7e69ade86fdb7066453814971b2b0223f7d17712bd029a8eff5b2b6b238042ff6ec1ffa6879d44cb95c5645a922fee305c26c3eeaee090 WHIRLPOOL ad9042c4509ece1cae42ade4734f69d59a9ec946a85bd486063a7e8f9fa1ae3f925b71f0475fef05a27d33f695ef82ffd06fbaadbd7dc5bfaa77a8caacf9d1dc
 DIST db-6.0.35.tar.gz 36532251 SHA256 24421affa8ae436fe427ae4f5f2d1634da83d3d55a5ad6354a98eeedb825de55 SHA512 002db1553def44efa715095b04b2bac2de7450cdc7142586d1d8b5d8ce79ee5e98f824b3bd276cd586ca932dc51ed35a9ffbed95b2b9847264f262cfa092479d WHIRLPOOL ebbbe7dd0969a36d06c8cc5618a0f61334396b38671b9b1c2523e3d1d3ba687903242acd23999be3efec45e1ea6b9c7f0f9f5acbb54d8d1dc48bba51d196c487
-DIST db-6.1.26.tar.gz 37495772 SHA256 dd1417af5443f326ee3998e40986c3c60e2a7cfb5bfa25177ef7cadb2afb13a6 SHA512 2590ee3d9e30e6eaeb350edbc2fa7400582c0b520177fe0a3a57a966573268e18ad10b1dc6dee3fb1be9c93ac6f96f848c120793eaf873562464edd125cff4d4 WHIRLPOOL 9aad6c2ec058d332185c630904dca766ca9f9c017c8f6216a4363f007fced3b7cf1b91d76134fa676780f6f8e37966bdea75845deb5cb2dff8f4b432e8068f5f
 DIST db-6.1.29.tar.gz 37521943 SHA256 b3c18180e4160d97dd197ba1d37c19f6ea2ec91d31bbfaf8972d99ba097af17d SHA512 ced40e357acd1214f8b5800ddcf084c65c0ab77ca045a4504ac1a4c864035bd50aa8993cd1232174ff81071a36806314807330aa53dcb18de548c886c2a99e73 WHIRLPOOL cf18bd00ff203c5b2ccb39fe87ad307fc9e1cdf45a1db96753c50eaf555b571b3ab77dc52b32c09122956505f366dbdbdcdff094486d7ded21512a3cb873aa42
 DIST db-6.2.23.tar.gz 44305964 SHA256 47612c8991aa9ac2f6be721267c8d3cdccf5ac83105df8e50809daea24e95dc7 SHA512 0aac380673ff4f97a2a6230f135f8151b8d2896a12710f708cd983b5fb95075b55fc2c67af577365e8ec7a32e43357a4f3118e37713d00b227f05eb11b1d12f5 WHIRLPOOL 8a0537da75a5d0d4e0f335a9b27c3767ccab75d0a0f8b2b8b6ccb7483c2f6da02c55b1c14fcda9bdc5bc57fedad6a3c2b81e5d04775cba6d3b42ddcf8266a86e
 DIST db.1.85.tar.gz 270953 SHA256 4220d4ddeb77fb57ba2f37c1aa105d561d3ef85a6fb89c79c3edd735d0e193c6 SHA512 03bf3a2b0947efdca4e38719542e96378b5eeb57da64d5030dd23ab710773c1826f1c867032d0bea658b7fdd8272db253e97bbc490d198b9437025ffdf9e880e WHIRLPOOL 802346b9fc133f6c9316e987352e8bd8e12792b30b0eae9b4e2b3629c9bc8385ab12244dead428bb824945aab383cd4801de3fc705667797bdf6159066ed1352
diff --git a/sys-libs/db/db-4.8.30-r1.ebuild b/sys-libs/db/db-4.8.30-r1.ebuild
deleted file mode 100644
index a4cbcf537d55..000000000000
--- a/sys-libs/db/db-4.8.30-r1.ebuild
+++ /dev/null
@@ -1,185 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit eutils db flag-o-matic java-pkg-opt-2 autotools multilib multilib-minimal
-
-#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/technetwork/database/database-technologies/berkeleydb/overview/index.html"
-SRC_URI="http://download.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="Sleepycat"
-SLOT="4.8"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="doc java cxx tcl test"
-
-# the entire testsuite needs the TCL functionality
-DEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0[${MULTILIB_USEDEP}] )
-	test? ( >=dev-lang/tcl-8.5.15-r1:0[${MULTILIB_USEDEP}] )
-	java? ( >=virtual/jdk-1.5 )
-	>=sys-devel/binutils-2.16.1"
-RDEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0[${MULTILIB_USEDEP}] )
-	java? ( >=virtual/jre-1.5 )
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20140508-r2
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-	)"
-
-src_unpack() {
-	unpack "${MY_P}".tar.gz
-}
-
-src_prepare() {
-	cd "${WORKDIR}"/"${MY_P}" || die
-	for (( i=1 ; i<=${PATCHNO} ; i++ ))
-	do
-		epatch "${DISTDIR}"/patch."${MY_PV}"."${i}"
-	done
-	epatch "${FILESDIR}"/${PN}-4.8-libtool.patch
-	epatch "${FILESDIR}"/${PN}-4.8.24-java-manifest-location.patch
-	epatch "${FILESDIR}"/${PN}-4.8.30-rename-atomic-compare-exchange.patch
-
-	# use the includes from the prefix
-	epatch "${FILESDIR}"/${PN}-4.6-jni-check-prefix-first.patch
-	epatch "${FILESDIR}"/${PN}-4.3-listen-to-java-options.patch
-
-	sed -e "/^DB_RELEASE_DATE=/s/%B %e, %Y/%Y-%m-%d/" -i dist/RELEASE \
-		|| die
-
-	# Include the SLOT for Java JAR files
-	# This supersedes the unused jarlocation patches.
-	sed -r -i \
-		-e '/jarfile=.*\.jar$/s,(.jar$),-$(LIBVERSION)\1,g' \
-		"${S}"/../dist/Makefile.in || die
-
-	cd "${S}"/../dist || die
-	rm -f aclocal/libtool.m4
-	sed -i \
-		-e '/AC_PROG_LIBTOOL$/aLT_OUTPUT' \
-		configure.ac || die
-	sed -i \
-		-e '/^AC_PATH_TOOL/s/ sh, none/ bash, none/' \
-		aclocal/programs.m4 || die
-	AT_M4DIR="aclocal aclocal_java" eautoreconf
-	# Upstream sucks - they do autoconf and THEN replace the version variables.
-	. ./RELEASE
-	sed -i \
-		-e "s/__EDIT_DB_VERSION_MAJOR__/$DB_VERSION_MAJOR/g" \
-		-e "s/__EDIT_DB_VERSION_MINOR__/$DB_VERSION_MINOR/g" \
-		-e "s/__EDIT_DB_VERSION_PATCH__/$DB_VERSION_PATCH/g" \
-		-e "s/__EDIT_DB_VERSION_STRING__/$DB_VERSION_STRING/g" \
-		-e "s/__EDIT_DB_VERSION_UNIQUE_NAME__/$DB_VERSION_UNIQUE_NAME/g" \
-		-e "s/__EDIT_DB_VERSION__/$DB_VERSION/g" configure || die
-}
-
-src_configure() {
-	# 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
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local myconf=()
-
-	# compilation with -O0 fails on amd64, see bug #171231
-	if [[ ${ABI} == amd64 ]]; then
-		local CFLAGS=${CFLAGS} CXXFLAGS=${CXXFLAGS}
-		replace-flags -O0 -O2
-		is-flagq -O[s123] || append-flags -O2
-	fi
-
-	# use `set` here since the java opts will contain whitespace
-	if multilib_is_native_abi && use java ; then
-		myconf+=(
-			--with-java-prefix="${JAVA_HOME}"
-			--with-javac-flags="$(java-pkg_javac-args)"
-		)
-	fi
-
-	# Bug #270851: test needs TCL support
-	if use tcl || use test ; then
-		myconf+=(
-			--enable-tcl
-			--with-tcl=/usr/$(get_libdir)
-		)
-	else
-		myconf+=(--disable-tcl )
-	fi
-
-	ECONF_SOURCE="${S}"/../dist \
-	STRIP="true" \
-	econf \
-		--enable-compat185 \
-		--enable-o_direct \
-		--without-uniquename \
-		$([[ ${ABI} == arm ]] && echo --with-mutex=ARM/gcc-assembly) \
-		$([[ ${ABI} == amd64 ]] && echo --with-mutex=x86/gcc-assembly) \
-		$(use_enable cxx) \
-		$(use_enable cxx stl) \
-		$(multilib_native_use_enable java) \
-		"${myconf[@]}" \
-		$(use_enable test)
-}
-
-multilib_src_test() {
-	multilib_is_native_abi || return
-
-	S=${BUILD_DIR} db_src_test
-}
-
-multilib_src_install() {
-	emake install DESTDIR="${D}"
-
-	db_src_install_headerslot
-
-	db_src_install_usrlibcleanup
-
-	if multilib_is_native_abi && 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
-}
-
-multilib_src_install_all() {
-	db_src_install_usrbinslot
-
-	db_src_install_doc
-
-	dodir /usr/sbin
-	# This file is not always built, and no longer exists as of db-4.8
-	if [[ -f "${D}"/usr/bin/berkeley_db_svc ]] ; then
-		mv "${D}"/usr/bin/berkeley_db_svc \
-			"${D}"/usr/sbin/berkeley_db"${SLOT/./}"_svc || die
-	fi
-}
-
-pkg_postinst() {
-	multilib_foreach_abi db_fix_so
-}
-
-pkg_postrm() {
-	multilib_foreach_abi db_fix_so
-}
diff --git a/sys-libs/db/db-6.1.26.ebuild b/sys-libs/db/db-6.1.26.ebuild
deleted file mode 100644
index 7203cfbe5957..000000000000
--- a/sys-libs/db/db-6.1.26.ebuild
+++ /dev/null
@@ -1,231 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils db flag-o-matic java-pkg-opt-2 autotools multilib multilib-minimal versionator toolchain-funcs
-
-#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_BASE="${WORKDIR}/${MY_P}"
-S="${S_BASE}/build_unix"
-DESCRIPTION="Oracle Berkeley DB"
-HOMEPAGE="http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/overview/index.html"
-SRC_URI="http://download.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="AGPL-3"
-SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="doc java cxx tcl test"
-
-REQUIRED_USE="test? ( tcl )"
-
-# the entire testsuite needs the TCL functionality
-DEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )
-	test? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )
-	java? ( >=virtual/jdk-1.5 )
-	>=sys-devel/binutils-2.16.1"
-RDEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )
-	java? ( >=virtual/jre-1.5 )"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/db$(get_version_component_range 1-2)/db.h
-)
-
-src_prepare() {
-	cd "${WORKDIR}"/"${MY_P}"
-	for (( i=1 ; i<=${PATCHNO} ; i++ ))
-	do
-		epatch "${DISTDIR}"/patch."${MY_PV}"."${i}"
-	done
-
-	# bug #510506
-	epatch "${FILESDIR}"/${PN}-4.8.24-java-manifest-location.patch
-
-	# use the includes from the prefix
-	epatch "${FILESDIR}"/${PN}-4.6-jni-check-prefix-first.patch
-	epatch "${FILESDIR}"/${PN}-4.3-listen-to-java-options.patch
-
-	# sqlite configure call has an extra leading ..
-	# upstreamed:5.2.36, missing in 5.3.x/6.x
-	# still needs to be patched in 6.0.20
-	epatch "${FILESDIR}"/${PN}-6.1.19-sqlite-configure-path.patch
-
-	# The upstream testsuite copies .lib and the binaries for each parallel test
-	# core, ~300MB each. This patch uses links instead, saves a lot of space.
-	epatch "${FILESDIR}"/${PN}-6.0.20-test-link.patch
-
-	# Upstream release script grabs the dates when the script was run, so lets
-	# end-run them to keep the date the same.
-	export REAL_DB_RELEASE_DATE="$(awk \
-		'/^DB_VERSION_STRING=/{ gsub(".*\\(|\\).*","",$0); print $0; }' \
-		"${S_BASE}"/dist/configure)"
-	sed -r -i \
-		-e "/^DB_RELEASE_DATE=/s~=.*~='${REAL_DB_RELEASE_DATE}'~g" \
-		"${S_BASE}"/dist/RELEASE || die
-
-	# Include the SLOT for Java JAR files
-	# This supersedes the unused jarlocation patches.
-	sed -r -i \
-		-e '/jarfile=.*\.jar$/s,(.jar$),-$(LIBVERSION)\1,g' \
-		"${S_BASE}"/dist/Makefile.in || die
-
-	cd "${S_BASE}"/dist || die
-	rm -f aclocal/libtool.m4
-	sed -i \
-		-e '/AC_PROG_LIBTOOL$/aLT_OUTPUT' \
-		configure.ac || die
-	sed -i \
-		-e '/^AC_PATH_TOOL/s/ sh, none/ bash, none/' \
-		aclocal/programs.m4 || die
-	AT_M4DIR="aclocal aclocal_java" eautoreconf
-	# Upstream sucks - they do autoconf and THEN replace the version variables.
-	. ./RELEASE
-	for v in \
-		DB_VERSION_{FAMILY,LETTER,RELEASE,MAJOR,MINOR} \
-		DB_VERSION_{PATCH,FULL,UNIQUE_NAME,STRING,FULL_STRING} \
-		DB_VERSION \
-		DB_RELEASE_DATE ; do
-		local ev="__EDIT_${v}__"
-		sed -i -e "s/${ev}/${!v}/g" configure || die
-	done
-}
-
-multilib_src_configure() {
-	local myconf=()
-
-	tc-ld-disable-gold #470634
-
-	# compilation with -O0 fails on amd64, see bug #171231
-	if [[ ${ABI} == amd64 ]]; then
-		local CFLAGS=${CFLAGS} CXXFLAGS=${CXXFLAGS}
-		replace-flags -O0 -O2
-		is-flagq -O[s123] || append-flags -O2
-	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
-
-	# use `set` here since the java opts will contain whitespace
-	if multilib_is_native_abi && use java ; then
-		myconf+=(
-			--with-java-prefix="${JAVA_HOME}"
-			--with-javac-flags="$(java-pkg_javac-args)"
-		)
-	fi
-
-	# Bug #270851: test needs TCL support
-	if use tcl || use test ; then
-		myconf+=(
-			--enable-tcl
-			--with-tcl=/usr/$(get_libdir)
-		)
-	else
-		myconf+=(--disable-tcl )
-	fi
-
-	# sql_compat will cause a collision with sqlite3
-	# --enable-sql_compat
-	ECONF_SOURCE="${S_BASE}"/dist \
-	STRIP="true" \
-	econf \
-		--enable-compat185 \
-		--enable-dbm \
-		--enable-o_direct \
-		--without-uniquename \
-		--enable-sql \
-		--enable-sql_codegen \
-		--disable-sql_compat \
-		$([[ ${ABI} == arm ]] && echo --with-mutex=ARM/gcc-assembly) \
-		$([[ ${ABI} == amd64 ]] && echo --with-mutex=x86/gcc-assembly) \
-		$(use_enable cxx) \
-		$(use_enable cxx stl) \
-		$(multilib_native_use_enable java) \
-		"${myconf[@]}" \
-		$(use_enable test)
-}
-
-multilib_src_install() {
-	emake install DESTDIR="${D}"
-
-	db_src_install_headerslot
-
-	db_src_install_usrlibcleanup
-
-	if multilib_is_native_abi && 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
-}
-
-multilib_src_install_all() {
-	db_src_install_usrbinslot
-
-	db_src_install_doc
-
-	dodir /usr/sbin
-	# This file is not always built, and no longer exists as of db-4.8
-	if [[ -f "${D}"/usr/bin/berkeley_db_svc ]] ; then
-		mv "${D}"/usr/bin/berkeley_db_svc \
-			"${D}"/usr/sbin/berkeley_db"${SLOT/./}"_svc || die
-	fi
-}
-
-pkg_postinst() {
-	multilib_foreach_abi db_fix_so
-}
-
-pkg_postrm() {
-	multilib_foreach_abi db_fix_so
-}
-
-src_test() {
-	# db_repsite is impossible to build, as upstream strips those sources.
-	# db_repsite is used directly in the setup_site_prog,
-	# setup_site_prog is called from open_site_prog
-	# which is called only from tests in the multi_repmgr group.
-	#sed -ri \
-	#	-e '/set subs/s,multi_repmgr,,g' \
-	#	"${S_BASE}/test/testparams.tcl"
-	sed -ri \
-		-e '/multi_repmgr/d' \
-		"${S_BASE}/test/tcl/test.tcl" || die
-
-	# This is the only failure in 5.2.28 so far, and looks like a false positive.
-	# Repmgr018 (btree): Test of repmgr stats.
-	#     Repmgr018.a: Start a master.
-	#     Repmgr018.b: Start a client.
-	#     Repmgr018.c: Run some transactions at master.
-	#         Rep_test: btree 20 key/data pairs starting at 0
-	#         Rep_test.a: put/get loop
-	# FAIL:07:05:59 (00:00:00) perm_no_failed_stat: expected 0, got 1
-	sed -ri \
-		-e '/set parms.*repmgr018/d' \
-		-e 's/repmgr018//g' \
-		"${S_BASE}/test/tcl/test.tcl" || die
-
-	multilib-minimal_src_test
-}
-
-multilib_src_test() {
-	multilib_is_native_abi || return
-
-	S=${BUILD_DIR} db_src_test
-}
diff --git a/sys-libs/db/files/db-3.2.9-jarlocation.patch b/sys-libs/db/files/db-3.2.9-jarlocation.patch
deleted file mode 100644
index 0654e2ef48e8..000000000000
--- a/sys-libs/db/files/db-3.2.9-jarlocation.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur db-3.2.9.old/dist/Makefile.in db-3.2.9/dist/Makefile.in
---- db-3.2.9.old/dist/Makefile.in	2003-10-18 02:21:18.000000000 -0700
-+++ db-3.2.9/dist/Makefile.in	2003-10-18 02:22:14.000000000 -0700
-@@ -72,7 +72,7 @@
- JAVA_DBDIR=	$(JAVA_SRCDIR)/$(JAVA_DBREL)
- JAVA_EXDIR=	$(JAVA_SRCDIR)/com/sleepycat/examples
- 
--libj_jarfile=	db.jar
-+libj_jarfile=	db-$(SOVERSION).jar
- libjso_base=	libdb_java
- libjso=		$(libjso_base)-$(SOVERSION).@SOSUFFIX@
- libjso_target=	$(libjso_base)-$(SOVERSION).la
diff --git a/sys-libs/db/files/db-3.2.9-java15.patch b/sys-libs/db/files/db-3.2.9-java15.patch
deleted file mode 100644
index 5482831e317a..000000000000
--- a/sys-libs/db/files/db-3.2.9-java15.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- db-3.2.9/java/src/com/sleepycat/db/DbEnv.java.orig	2005-03-10 18:30:19.705147736 +0000
-+++ db-3.2.9/java/src/com/sleepycat/db/DbEnv.java	2005-03-10 18:03:07.930215232 +0000
-@@ -78,9 +78,9 @@
-     //
-     /*package*/ void _notify_dbs()
-     {
--        Enumeration enum = dblist_.elements();
--        while (enum.hasMoreElements()) {
--            Db db = (Db)enum.nextElement();
-+        Enumeration en = dblist_.elements();
-+        while (en.hasMoreElements()) {
-+            Db db = (Db)en.nextElement();
-             db._notify_dbenv_close();
-         }
-         dblist_.removeAllElements();
diff --git a/sys-libs/db/files/db-4.0.14-jarlocation.patch b/sys-libs/db/files/db-4.0.14-jarlocation.patch
deleted file mode 100644
index 667a32b20d3a..000000000000
--- a/sys-libs/db/files/db-4.0.14-jarlocation.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -ur db-4.0.14.old/dist/Makefile.in db-4.0.14/dist/Makefile.in
---- db-4.0.14.old/dist/Makefile.in	2003-10-18 02:24:50.000000000 -0700
-+++ db-4.0.14/dist/Makefile.in	2003-10-18 02:25:18.000000000 -0700
-@@ -105,8 +105,8 @@
- JAVA_DBDIR=	$(JAVA_SRCDIR)/$(JAVA_DBREL)
- JAVA_EXDIR=	$(JAVA_SRCDIR)/$(JAVA_EXREL)
- 
--libj_jarfile=	db.jar
--libj_exjarfile=	dbexamples.jar
-+libj_jarfile=	db-$(SOVERSION).jar
-+libj_exjarfile=	dbexamples-$(SOVERSION).jar
- libjso_base=	libdb_java
- libjso=		$(libjso_base)-$(SOVERSION).@SOSUFFIX@
- libjso_static=	$(libjso_base)-$(SOVERSION).a
diff --git a/sys-libs/db/files/db-4.2-jarlocation.patch b/sys-libs/db/files/db-4.2-jarlocation.patch
deleted file mode 100644
index 600f48a3a6d6..000000000000
--- a/sys-libs/db/files/db-4.2-jarlocation.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-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.2.jar
-+libj_exjarfile=	dbexamples-4.2.jar
-+rpc_jarfile=	dbsvc-4.2.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.3-jarlocation.patch b/sys-libs/db/files/db-4.3-jarlocation.patch
deleted file mode 100644
index 17a342a7fca3..000000000000
--- a/sys-libs/db/files/db-4.3-jarlocation.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-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.3.jar
-+libj_exjarfile=	dbexamples-4.3.jar
-+rpc_jarfile=	dbsvc-4.3.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.4-jarlocation.patch b/sys-libs/db/files/db-4.4-jarlocation.patch
deleted file mode 100644
index 2d4bd4e46032..000000000000
--- a/sys-libs/db/files/db-4.4-jarlocation.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-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.5.jar
-+libj_exjarfile=	dbexamples-4.5.jar
-+rpc_jarfile=	dbsvc-4.5.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.5-jarlocation.patch b/sys-libs/db/files/db-4.5-jarlocation.patch
deleted file mode 100644
index c0d689f43691..000000000000
--- a/sys-libs/db/files/db-4.5-jarlocation.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-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-jarlocation.patch b/sys-libs/db/files/db-4.6-jarlocation.patch
deleted file mode 100644
index c0d689f43691..000000000000
--- a/sys-libs/db/files/db-4.6-jarlocation.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-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-5.0.21-enable-dbm-autoconf.patch b/sys-libs/db/files/db-5.0.21-enable-dbm-autoconf.patch
deleted file mode 100644
index 5405206fc516..000000000000
--- a/sys-libs/db/files/db-5.0.21-enable-dbm-autoconf.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-The autoconf from upstream never built DBM even if you wanted it, because
-enable_build_dbm was never true with --enable-dbm. The only time you actually
-got it before was when you had selected the testsuite.
-
-Fixed up that, and the entire reversed logic, and just throw away the useless
-db_cv_build_dbm variable entirely.
-
-Correct logic is:
-if(--enable-dbm || --enable-test) { 
-	Build DBM
-}
-
-Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
-
-diff -Nuar db-5.0.21.orig//dist/aclocal/options.m4 db-5.0.21//dist/aclocal/options.m4
---- db-5.0.21.orig//dist/aclocal/options.m4	2010-03-30 10:36:10.000000000 -0700
-+++ db-5.0.21//dist/aclocal/options.m4	2010-05-13 13:49:23.889947877 -0700
-@@ -274,15 +274,11 @@
- AC_MSG_RESULT($db_cv_test)
- 
- AC_MSG_CHECKING(if --enable-dbm option specified)
--AC_ARG_ENABLE(build_dbm,
-+AC_ARG_ENABLE(dbm,
- 	[AC_HELP_STRING([--enable-dbm],
- 			[Configure to enable the historic dbm interface.])],
--	[db_cv_build_dbm="$enable_dbm"], enableval="$db_cv_test")
--db_cv_build_dbm="$enableval"
--case "$enableval" in
-- no) AC_MSG_RESULT(yes);;
--yes) AC_MSG_RESULT(no);;
--esac
-+	[db_cv_dbm="$enable_dbm"], [db_cv_dbm="$db_cv_test"])
-+AC_MSG_RESULT($db_cv_dbm)
- 
- AC_MSG_CHECKING(if --enable-dtrace option specified)
- AC_ARG_ENABLE(dtrace,
-diff -Nuar db-5.0.21.orig//dist/configure.ac db-5.0.21//dist/configure.ac
---- db-5.0.21.orig//dist/configure.ac	2010-05-13 13:41:26.415822427 -0700
-+++ db-5.0.21//dist/configure.ac	2010-05-13 13:48:59.185822961 -0700
-@@ -973,7 +973,8 @@
- fi
- 
- # The DBM API can be disabled.
--if test "$db_cv_build_dbm" = "yes"; then
-+
-+if test "$db_cv_dbm" = "yes"; then
- 	AC_DEFINE(HAVE_DBM)
- 	AH_TEMPLATE(HAVE_DBM, [Define to 1 if building the DBM API.])
- 	ADDITIONAL_OBJS="$ADDITIONAL_OBJS dbm${o} hsearch${o}"
diff --git a/sys-libs/db/files/db-6.0.19-sqlite-configure-path.patch b/sys-libs/db/files/db-6.0.19-sqlite-configure-path.patch
deleted file mode 100644
index 78a2ba3ea8aa..000000000000
--- a/sys-libs/db/files/db-6.0.19-sqlite-configure-path.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- db-6.0.19/dist/aclocal/sql.m4
-+++ db-6.0.19/dist/aclocal/sql.m4
-@@ -96,7 +96,7 @@
- if test "$db_cv_build_cryptography" = "yes"; then
- 	CPPFLAGS="$CPPFLAGS -DSQLITE_HAS_CODEC=1"
- fi
--(cd sql && eval "\$SHELL ../$sqlite_dir/configure --disable-option-checking $ac_sub_configure_args CPPFLAGS=\"-I.. $CPPFLAGS\" --enable-amalgamation=$db_cv_sql_amalgamation --enable-readline=$with_readline " && cat build_config.h >> config.h) || exit 1
-+(cd sql && eval "\$SHELL $sqlite_dir/configure --disable-option-checking $ac_sub_configure_args CPPFLAGS=\"-I.. $CPPFLAGS\" --enable-amalgamation=$db_cv_sql_amalgamation --enable-readline=$with_readline " && cat build_config.h >> config.h) || exit 1
- CPPFLAGS="$orig_CPPFLAGS"
- 
- # Configure JDBC if --enable-jdbc