sys-libs/db: drop USE=java

Flag was last-rited a while ago.

Closes: https://bugs.gentoo.org/713866
Closes: https://bugs.gentoo.org/615408
Signed-off-by: Sam James <sam@gentoo.org>

12 files changed, 39 insertions, 373 deletions

diff --git a/sys-libs/db/db-18.1.32-r1.ebuild b/sys-libs/db/db-18.1.32-r1.ebuild
index 76b018c57445..463c37170918 100644
--- a/sys-libs/db/db-18.1.32-r1.ebuild
+++ b/sys-libs/db/db-18.1.32-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit db flag-o-matic java-pkg-opt-2 autotools multilib multilib-minimal eapi7-ver toolchain-funcs
+inherit db flag-o-matic autotools multilib multilib-minimal eapi7-ver toolchain-funcs
 
 #Number of official patches
 #PATCHNO=`echo ${PV}|sed -e "s,\(.*_p\)\([0-9]*\),\2,"`
@@ -31,30 +31,21 @@ done
 LICENSE="AGPL-3"
 SLOT="$(ver_cut 1-2)"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="doc java cxx tcl test"
+IUSE="doc 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.8 )
 	>=sys-devel/binutils-2.16.1"
-RDEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )
-	java? ( >=virtual/jre-1.8 )"
+RDEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )"
 
 MULTILIB_WRAPPED_HEADERS=(
 	/usr/include/db$(ver_cut 1-2)/db.h
 )
 
 PATCHES=(
-	# bug #510506
-	"${FILESDIR}"/${PN}-4.8.24-java-manifest-location.patch
-
-	# use the includes from the prefix
-	"${FILESDIR}"/${PN}-6.2.32-jni-check-prefix-first.patch
-	"${FILESDIR}"/${PN}-4.2-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
@@ -83,12 +74,6 @@ src_prepare() {
 		-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 \
@@ -97,7 +82,7 @@ src_prepare() {
 	sed -i \
 		-e '/^AC_PATH_TOOL/s/ sh, none/ bash, none/' \
 		aclocal/programs.m4 || die
-	AT_M4DIR="aclocal aclocal_java" eautoreconf
+	AT_M4DIR="aclocal" eautoreconf
 	# Upstream sucks - they do autoconf and THEN replace the version variables.
 	. ./RELEASE
 	for v in \
@@ -131,11 +116,11 @@ multilib_src_configure() {
 		--disable-sql
 		--disable-sql_codegen
 		--disable-sql_compat
+		--disable-java
 		$([[ ${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)
 		$(use_enable test)
 	)
 
@@ -152,14 +137,6 @@ multilib_src_configure() {
 	# mumbo jumbo.
 	append-ldflags -Wl,--default-symver
 
-	# 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
 		myeconfargs+=(
@@ -181,12 +158,6 @@ multilib_src_install() {
 	db_src_install_headerslot
 
 	db_src_install_usrlibcleanup
-
-	if multilib_is_native_abi && use java; then
-		java-pkg_regso "${ED%/}"/usr/"$(get_libdir)"/libdb_java*.so
-		java-pkg_dojar "${ED%/}"/usr/"$(get_libdir)"/*.jar
-		rm -f "${ED%/}"/usr/"$(get_libdir)"/*.jar
-	fi
 }
 
 multilib_src_install_all() {
diff --git a/sys-libs/db/db-18.1.40-r1.ebuild b/sys-libs/db/db-18.1.40-r1.ebuild
index 407d361673f7..ce83bceb3309 100644
--- a/sys-libs/db/db-18.1.40-r1.ebuild
+++ b/sys-libs/db/db-18.1.40-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit db flag-o-matic java-pkg-opt-2 autotools multilib multilib-minimal eapi7-ver toolchain-funcs
+inherit db flag-o-matic autotools multilib multilib-minimal eapi7-ver toolchain-funcs
 
 #Number of official patches
 #PATCHNO=`echo ${PV}|sed -e "s,\(.*_p\)\([0-9]*\),\2,"`
@@ -32,30 +32,21 @@ LICENSE="AGPL-3"
 SLOT="$(ver_cut 1-2)"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
-IUSE="doc java cxx tcl test"
+IUSE="doc 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.8 )
 	>=sys-devel/binutils-2.16.1"
-RDEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )
-	java? ( >=virtual/jre-1.8 )"
+RDEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )"
 
 MULTILIB_WRAPPED_HEADERS=(
 	/usr/include/db$(ver_cut 1-2)/db.h
 )
 
 PATCHES=(
-	# bug #510506
-	"${FILESDIR}"/${PN}-4.8.24-java-manifest-location.patch
-
-	# use the includes from the prefix
-	"${FILESDIR}"/${PN}-6.2.32-jni-check-prefix-first.patch
-	"${FILESDIR}"/${PN}-4.2-listen-to-java-options.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.
 	"${FILESDIR}"/${PN}-18.1.25-test-link.patch
@@ -81,12 +72,6 @@ src_prepare() {
 		-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 \
@@ -95,7 +80,7 @@ src_prepare() {
 	sed -i \
 		-e '/^AC_PATH_TOOL/s/ sh, none/ bash, none/' \
 		aclocal/programs.m4 || die
-	AT_M4DIR="aclocal aclocal_java" eautoreconf
+	AT_M4DIR="aclocal" eautoreconf
 	# Upstream sucks - they do autoconf and THEN replace the version variables.
 	. ./RELEASE
 	for v in \
@@ -129,11 +114,11 @@ multilib_src_configure() {
 		--disable-sql
 		--disable-sql_codegen
 		--disable-sql_compat
+		--disable-java
 		$([[ ${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)
 		$(use_enable test)
 	)
 
@@ -150,14 +135,6 @@ multilib_src_configure() {
 	# mumbo jumbo.
 	append-ldflags -Wl,--default-symver
 
-	# 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
 		myeconfargs+=(
@@ -179,12 +156,6 @@ multilib_src_install() {
 	db_src_install_headerslot
 
 	db_src_install_usrlibcleanup
-
-	if multilib_is_native_abi && use java; then
-		java-pkg_regso "${ED%/}"/usr/"$(get_libdir)"/libdb_java*.so
-		java-pkg_dojar "${ED%/}"/usr/"$(get_libdir)"/*.jar
-		rm -f "${ED%/}"/usr/"$(get_libdir)"/*.jar
-	fi
 }
 
 multilib_src_install_all() {
diff --git a/sys-libs/db/db-4.8.30-r6.ebuild b/sys-libs/db/db-4.8.30-r6.ebuild
index 3bc178287279..57cf68428074 100644
--- a/sys-libs/db/db-4.8.30-r6.ebuild
+++ b/sys-libs/db/db-4.8.30-r6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools db flag-o-matic java-pkg-opt-2 multilib multilib-minimal toolchain-funcs
+inherit autotools db flag-o-matic multilib multilib-minimal toolchain-funcs
 
 #Number of official patches
 #PATCHNO=`echo ${PV}|sed -e "s,\(.*_p\)\([0-9]*\),\2,"`
@@ -30,25 +30,18 @@ done
 LICENSE="Sleepycat"
 SLOT="$(ver_cut 1-2)"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
-IUSE="doc java cxx tcl test"
+IUSE="doc 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.8 )"
-RDEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )
-	java? ( >=virtual/jre-1.8 )"
+	test? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )"
+RDEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-4.8-libtool.patch
-	"${FILESDIR}"/${PN}-4.8.24-java-manifest-location.patch
 	"${FILESDIR}"/${PN}-4.8.30-rename-atomic-compare-exchange.patch
-
-	# use the includes from the prefix
-	"${FILESDIR}"/${PN}-4.6-jni-check-prefix-first.patch
-	"${FILESDIR}"/${PN}-4.2-listen-to-java-options.patch
 )
 
 src_prepare() {
@@ -63,12 +56,6 @@ src_prepare() {
 	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 \
-		-e '/jarfile=.*\.jar$/s,(.jar$),-$(LIBVERSION)\1,g' \
-		-i dist/Makefile.in || die
-
 	cd dist || die
 	rm aclocal/libtool.m4 || die
 	sed \
@@ -78,7 +65,7 @@ src_prepare() {
 		-e '/^AC_PATH_TOOL/s/ sh, none/ bash, none/' \
 		-i aclocal/programs.m4 || die
 
-	AT_M4DIR="aclocal aclocal_java" eautoreconf
+	AT_M4DIR="aclocal" eautoreconf
 
 	# Upstream sucks - they do autoconf and THEN replace the version variables.
 	. ./RELEASE
@@ -98,10 +85,10 @@ multilib_src_configure() {
 		--enable-o_direct
 		--without-uniquename
 		--disable-static
+		--disable-java
 		$([[ ${ABI} == amd64 ]] && echo --with-mutex=x86/gcc-assembly)
 		$(use_enable cxx)
 		$(use_enable cxx stl)
-		$(multilib_native_use_enable java)
 		$(use_enable test)
 	)
 
@@ -118,14 +105,6 @@ multilib_src_configure() {
 	# mumbo jumbo.
 	append-ldflags -Wl,--default-symver
 
-	# 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+=(
@@ -161,12 +140,6 @@ multilib_src_install() {
 	db_src_install_headerslot
 
 	db_src_install_usrlibcleanup
-
-	if multilib_is_native_abi && use java; then
-		java-pkg_regso "${ED}"/usr/"$(get_libdir)"/libdb_java*.so
-		java-pkg_dojar "${ED}"/usr/"$(get_libdir)"/*.jar
-		rm -f "${ED}"/usr/"$(get_libdir)"/*.jar
-	fi
 }
 
 multilib_src_install_all() {
diff --git a/sys-libs/db/db-5.3.28-r8.ebuild b/sys-libs/db/db-5.3.28-r8.ebuild
index 91d4a786cf4c..44cdf166b590 100644
--- a/sys-libs/db/db-5.3.28-r8.ebuild
+++ b/sys-libs/db/db-5.3.28-r8.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit autotools db flag-o-matic java-pkg-opt-2 multilib multilib-minimal toolchain-funcs
+inherit autotools db flag-o-matic multilib multilib-minimal toolchain-funcs
 
 #Number of official patches
 #PATCHNO=`echo ${PV}|sed -e "s,\(.*_p\)\([0-9]*\),\2,"`
@@ -30,29 +30,20 @@ done
 LICENSE="Sleepycat"
 SLOT="$(ver_cut 1-2)"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="doc java cxx tcl test"
+IUSE="doc 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.7 )"
-RDEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )
-	java? ( >=virtual/jre-1.7 )"
+	test? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )"
+RDEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )"
 
 MULTILIB_WRAPPED_HEADERS=(
 	/usr/include/db${SLOT}/db.h
 )
 
 PATCHES=(
-	# bug #510506
-	"${FILESDIR}"/${PN}-4.8.24-java-manifest-location.patch
-
-	# use the includes from the prefix
-	"${FILESDIR}"/${PN}-4.6-jni-check-prefix-first.patch
-	"${FILESDIR}"/${PN}-4.2-listen-to-java-options.patch
-
 	# sqlite configure call has an extra leading ..
 	# upstreamed:5.2.36, missing in 5.3.x
 	"${FILESDIR}"/${PN}-5.2.28-sqlite-configure-path.patch
@@ -83,12 +74,6 @@ src_prepare() {
 		-e "/^DB_RELEASE_DATE=/s~=.*~='${REAL_DB_RELEASE_DATE}'~g" \
 		-i dist/RELEASE || die
 
-	# Include the SLOT for Java JAR files
-	# This supersedes the unused jarlocation patches.
-	sed -r \
-		-e '/jarfile=.*\.jar$/s,(.jar$),-$(LIBVERSION)\1,g' \
-		-i dist/Makefile.in || die
-
 	cd dist || die
 	rm aclocal/libtool.m4 || die
 	sed \
@@ -98,7 +83,7 @@ src_prepare() {
 		-e '/^AC_PATH_TOOL/s/ sh, none/ bash, none/' \
 		-i aclocal/programs.m4 || die
 
-	AT_M4DIR="aclocal aclocal_java" eautoreconf
+	AT_M4DIR="aclocal" eautoreconf
 
 	# Upstream sucks - they do autoconf and THEN replace the version variables.
 	. ./RELEASE
@@ -133,10 +118,10 @@ multilib_src_configure() {
 		--disable-sql_codegen
 		--disable-sql_compat
 		--disable-static
+		--disable-java
 		$([[ ${ABI} == amd64 ]] && echo --with-mutex=x86/gcc-assembly)
 		$(use_enable cxx)
 		$(use_enable cxx stl)
-		$(multilib_native_use_enable java)
 		$(use_enable test)
 	)
 
@@ -153,13 +138,6 @@ multilib_src_configure() {
 	# mumbo jumbo.
 	append-ldflags -Wl,--default-symver
 
-	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+=(
@@ -189,12 +167,6 @@ multilib_src_install() {
 	db_src_install_headerslot
 
 	db_src_install_usrlibcleanup
-
-	if multilib_is_native_abi && use java; then
-		java-pkg_regso "${ED}"/usr/"$(get_libdir)"/libdb_java*.so
-		java-pkg_dojar "${ED}"/usr/"$(get_libdir)"/*.jar
-		rm -f "${ED}"/usr/"$(get_libdir)"/*.jar
-	fi
 }
 
 multilib_src_install_all() {
diff --git a/sys-libs/db/db-6.0.35-r4.ebuild b/sys-libs/db/db-6.0.35-r4.ebuild
index 261cbcd2b8c0..046278265fb0 100644
--- a/sys-libs/db/db-6.0.35-r4.ebuild
+++ b/sys-libs/db/db-6.0.35-r4.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit autotools db flag-o-matic java-pkg-opt-2 multilib multilib-minimal toolchain-funcs
+inherit autotools db flag-o-matic multilib multilib-minimal toolchain-funcs
 
 #Number of official patches
 #PATCHNO=`echo ${PV}|sed -e "s,\(.*_p\)\([0-9]*\),\2,"`
@@ -30,29 +30,20 @@ done
 LICENSE="AGPL-3"
 SLOT="$(ver_cut 1-2)"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="doc java cxx tcl test"
+IUSE="doc 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.7:* )"
-RDEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )
-	java? ( >=virtual/jre-1.7:* )"
+	test? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )"
+RDEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )"
 
 MULTILIB_WRAPPED_HEADERS=(
 	/usr/include/db${SLOT}/db.h
 )
 
 PATCHES=(
-	# bug #510506
-	"${FILESDIR}"/${PN}-4.8.24-java-manifest-location.patch
-
-	# use the includes from the prefix
-	"${FILESDIR}"/${PN}-4.6-jni-check-prefix-first.patch
-	"${FILESDIR}"/${PN}-4.2-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
@@ -81,12 +72,6 @@ src_prepare() {
 		-e "/^DB_RELEASE_DATE=/s~=.*~='${REAL_DB_RELEASE_DATE}'~g" \
 		-i dist/RELEASE || die
 
-	# Include the SLOT for Java JAR files
-	# This supersedes the unused jarlocation patches.
-	sed -r \
-		-e '/jarfile=.*\.jar$/s,(.jar$),-$(LIBVERSION)\1,g' \
-		-i dist/Makefile.in || die
-
 	cd dist || die
 	rm aclocal/libtool.m4 || die
 	sed \
@@ -96,7 +81,7 @@ src_prepare() {
 		-e '/^AC_PATH_TOOL/s/ sh, none/ bash, none/' \
 		-i aclocal/programs.m4 || die
 
-	AT_M4DIR="aclocal aclocal_java" eautoreconf
+	AT_M4DIR="aclocal" eautoreconf
 
 	# Upstream sucks - they do autoconf and THEN replace the version variables.
 	. ./RELEASE
@@ -127,10 +112,10 @@ multilib_src_configure() {
 		--disable-sql_codegen
 		--disable-sql_compat
 		--disable-static
+		--disable-java
 		$([[ ${ABI} == amd64 ]] && echo --with-mutex=x86/gcc-assembly)
 		$(use_enable cxx)
 		$(use_enable cxx stl)
-		$(multilib_native_use_enable java)
 		$(use_enable test)
 	)
 
@@ -147,14 +132,6 @@ multilib_src_configure() {
 	# mumbo jumbo.
 	append-ldflags -Wl,--default-symver
 
-	# 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+=(
@@ -188,12 +165,6 @@ multilib_src_install() {
 	db_src_install_headerslot
 
 	db_src_install_usrlibcleanup
-
-	if multilib_is_native_abi && use java; then
-		java-pkg_regso "${ED}"/usr/"$(get_libdir)"/libdb_java*.so
-		java-pkg_dojar "${ED}"/usr/"$(get_libdir)"/*.jar
-		rm -f "${ED}"/usr/"$(get_libdir)"/*.jar
-	fi
 }
 
 multilib_src_install_all() {
diff --git a/sys-libs/db/db-6.1.38-r1.ebuild b/sys-libs/db/db-6.1.38-r1.ebuild
index 74fb45257401..861f881a6b02 100644
--- a/sys-libs/db/db-6.1.38-r1.ebuild
+++ b/sys-libs/db/db-6.1.38-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit db flag-o-matic java-pkg-opt-2 autotools multilib multilib-minimal eapi7-ver toolchain-funcs
+inherit db flag-o-matic autotools multilib multilib-minimal eapi7-ver versionator toolchain-funcs
 
 #Number of official patches
 #PATCHNO=`echo ${PV}|sed -e "s,\(.*_p\)\([0-9]*\),\2,"`
@@ -30,30 +30,21 @@ done
 LICENSE="AGPL-3"
 SLOT="$(get_version_component_range 1-2)"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="doc java cxx tcl test"
+IUSE="doc 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.8 )
 	>=sys-devel/binutils-2.16.1"
-RDEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )
-	java? ( >=virtual/jre-1.8 )"
+RDEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )"
 
 MULTILIB_WRAPPED_HEADERS=(
 	/usr/include/db$(ver_cut 1-2)/db.h
 )
 
 PATCHES=(
-	# bug #510506
-	"${FILESDIR}"/${PN}-4.8.24-java-manifest-location.patch
-
-	# use the includes from the prefix
-	"${FILESDIR}"/${PN}-6.2-jni-check-prefix-first.patch
-	"${FILESDIR}"/${PN}-4.2-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
@@ -82,12 +73,6 @@ src_prepare() {
 		-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 \
@@ -96,7 +81,7 @@ src_prepare() {
 	sed -i \
 		-e '/^AC_PATH_TOOL/s/ sh, none/ bash, none/' \
 		aclocal/programs.m4 || die
-	AT_M4DIR="aclocal aclocal_java" eautoreconf
+	AT_M4DIR="aclocal" eautoreconf
 	# Upstream sucks - they do autoconf and THEN replace the version variables.
 	. ./RELEASE
 	for v in \
@@ -129,11 +114,11 @@ multilib_src_configure() {
 		--disable-sql_codegen
 		--disable-sql_compat
 		--disable-static
+		--disable-java
 		$([[ ${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)
 		$(use_enable test)
 	)
 
@@ -150,14 +135,6 @@ multilib_src_configure() {
 	# mumbo jumbo.
 	append-ldflags -Wl,--default-symver
 
-	# use `set` here since the java opts will contain whitespace
-	if multilib_is_native_abi && use java ; then
-		myeconfargs+=(
-			--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
 		myeconfargs+=(
@@ -179,12 +156,6 @@ multilib_src_install() {
 	db_src_install_headerslot
 
 	db_src_install_usrlibcleanup
-
-	if multilib_is_native_abi && use java; then
-		java-pkg_regso "${ED%/}"/usr/"$(get_libdir)"/libdb_java*.so
-		java-pkg_dojar "${ED%/}"/usr/"$(get_libdir)"/*.jar
-		rm -f "${ED%/}"/usr/"$(get_libdir)"/*.jar
-	fi
 }
 
 multilib_src_install_all() {
diff --git a/sys-libs/db/db-6.2.38-r1.ebuild b/sys-libs/db/db-6.2.38-r1.ebuild
index 786041b37bd1..69957a34e851 100644
--- a/sys-libs/db/db-6.2.38-r1.ebuild
+++ b/sys-libs/db/db-6.2.38-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit db flag-o-matic java-pkg-opt-2 autotools multilib multilib-minimal eapi7-ver toolchain-funcs
+inherit db flag-o-matic autotools multilib multilib-minimal versionator eapi7-ver toolchain-funcs
 
 #Number of official patches
 #PATCHNO=`echo ${PV}|sed -e "s,\(.*_p\)\([0-9]*\),\2,"`
@@ -30,31 +30,22 @@ done
 LICENSE="AGPL-3"
 SLOT="$(get_version_component_range 1-2)"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc java cxx tcl test"
+IUSE="doc 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.8 )
 	kernel_linux? ( >=sys-devel/binutils-2.16.1 )
 	kernel_SunOS? ( >=sys-devel/binutils-2.16.1 )"
-RDEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )
-	java? ( >=virtual/jre-1.8 )"
+RDEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )"
 
 MULTILIB_WRAPPED_HEADERS=(
 	/usr/include/db$(ver_cut 1-2)/db.h
 )
 
 PATCHES=(
-	# bug #510506
-	"${FILESDIR}"/${PN}-4.8.24-java-manifest-location.patch
-
-	# use the includes from the prefix
-	"${FILESDIR}"/${PN}-6.2.32-jni-check-prefix-first.patch
-	"${FILESDIR}"/${PN}-4.2-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
@@ -83,12 +74,6 @@ src_prepare() {
 		-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 \
@@ -97,7 +82,7 @@ src_prepare() {
 	sed -i \
 		-e '/^AC_PATH_TOOL/s/ sh, none/ bash, none/' \
 		aclocal/programs.m4 || die
-	AT_M4DIR="aclocal aclocal_java" eautoreconf
+	AT_M4DIR="aclocal" eautoreconf
 	# Upstream sucks - they do autoconf and THEN replace the version variables.
 	. ./RELEASE
 	for v in \
@@ -130,11 +115,11 @@ multilib_src_configure() {
 		--disable-sql_codegen
 		--disable-sql_compat
 		--disable-static
+		--disable-java
 		$([[ ${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)
 		$(use_enable test)
 	)
 
@@ -153,14 +138,6 @@ multilib_src_configure() {
 		append-ldflags -Wl,--default-symver
 	fi
 
-	# use `set` here since the java opts will contain whitespace
-	if multilib_is_native_abi && use java ; then
-		myeconfargs+=(
-			--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
 		myeconfargs+=(
@@ -182,12 +159,6 @@ multilib_src_install() {
 	db_src_install_headerslot
 
 	db_src_install_usrlibcleanup
-
-	if multilib_is_native_abi && use java; then
-		java-pkg_regso "${ED%/}"/usr/"$(get_libdir)"/libdb_java*.so
-		java-pkg_dojar "${ED%/}"/usr/"$(get_libdir)"/*.jar
-		rm -f "${ED%/}"/usr/"$(get_libdir)"/*.jar
-	fi
 }
 
 multilib_src_install_all() {
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
deleted file mode 100644
index f1f701de1261..000000000000
--- a/sys-libs/db/files/db-4.2-listen-to-java-options.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/dist/configure.ac
-+++ b/dist/configure.ac
-@@ -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.6-jni-check-prefix-first.patch b/sys-libs/db/files/db-4.6-jni-check-prefix-first.patch
deleted file mode 100644
index a0b2800d1286..000000000000
--- a/sys-libs/db/files/db-4.6-jni-check-prefix-first.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- a/dist/aclocal_java/ac_jni_include_dirs.m4
-+++ b/dist/aclocal_java/ac_jni_include_dirs.m4
-@@ -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.8.24-java-manifest-location.patch b/sys-libs/db/files/db-4.8.24-java-manifest-location.patch
deleted file mode 100644
index 9cebadc52064..000000000000
--- a/sys-libs/db/files/db-4.8.24-java-manifest-location.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nuar db-4.8.24.orig/dist/Makefile.in db-4.8.24/dist/Makefile.in
---- db-4.8.24.orig/dist/Makefile.in	2009-09-19 23:39:45.286001896 +0000
-+++ db-4.8.24/dist/Makefile.in	2009-09-19 23:41:13.079326882 +0000
-@@ -830,7 +830,7 @@
- 	$(JAVA) -classpath $(JAVA_CLASSTOP) \
- 	    com.sleepycat.persist.model.ClassEnhancer $(JAVA_CLASSTOP)
- 	cd $(JAVA_CLASSTOP) && \
--	     $(JAR) cfm ../$(libj_jarfile) ../$(JAVA_MANIFEST) ./com/sleepycat
-+	     $(JAR) cfm ../$(libj_jarfile) $(JAVA_MANIFEST) ./com/sleepycat
- 
- $(libj_exjarfile): $(libj_jarfile) $(JAVA_EXSRCS)
- 	@test -d $(JAVA_EXCLASSTOP) || \
diff --git a/sys-libs/db/files/db-6.2-jni-check-prefix-first.patch b/sys-libs/db/files/db-6.2-jni-check-prefix-first.patch
deleted file mode 100644
index 963b01380c23..000000000000
--- a/sys-libs/db/files/db-6.2-jni-check-prefix-first.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- db-6.2.23/dist/aclocal_java/ac_jni_include_dirs.m4
-+++ db-6.2.23/dist/aclocal_java/ac_jni_include_dirs.m4
-@@ -43,18 +43,23 @@
- *)	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:/[[^/]]*$::'`
--			if test -d "$_JTOPDIR/include"; then
--				_JINC="$_JTOPDIR/include"
--			else
--				_JINC="$_JTOPDIR/Headers"
--			fi;;
--	*)		_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:/[[^/]]*$::'`
-+				if test -d "$_JTOPDIR/include"; then
-+					_JINC="$_JTOPDIR/include"
-+				else
-+					_JINC="$_JTOPDIR/Headers"
-+				fi;;
-+		*)		_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-6.2.32-jni-check-prefix-first.patch b/sys-libs/db/files/db-6.2.32-jni-check-prefix-first.patch
deleted file mode 100644
index 0a320d7f9336..000000000000
--- a/sys-libs/db/files/db-6.2.32-jni-check-prefix-first.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- db-6.2.32/dist/aclocal_java/ac_jni_include_dirs.m4
-+++ db-6.2.32/dist/aclocal_java/ac_jni_include_dirs.m4
-@@ -43,21 +43,26 @@
- *)	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:/[[^/]]*$::'`
--			if test -d "$_JTOPDIR/include"; then
--				_JINC="$_JTOPDIR/include"
--			else
--				_JINC="`$_JTOPDIR/Commands/java_home`/include"
--			fi;;
--	*)		if test ! -r "$_JTOPDIR/include/jni.h"; then
--				_JTOPDIR=`echo "$_JTOPDIR" | sed -e 's:/[[^/]]*$::'`
--			fi
--			_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:/[[^/]]*$::'`
-+				if test -d "$_JTOPDIR/include"; then
-+					_JINC="$_JTOPDIR/include"
-+				else
-+					_JINC="`$_JTOPDIR/Commands/java_home`/include"
-+				fi;;
-+		*)		if test ! -r "$_JTOPDIR/include/jni.h"; then
-+					_JTOPDIR=`echo "$_JTOPDIR" | sed -e 's:/[[^/]]*$::'`
-+				fi
-+				_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.