5 files changed, 15 insertions, 47 deletions
diff --git a/dev-java/jackcess/Manifest b/dev-java/jackcess/Manifest
index ab3e2780f877..95b315a20989 100644
--- a/dev-java/jackcess/Manifest
+++ b/dev-java/jackcess/Manifest
@@ -1,2 +1 @@
-DIST jackcess-1.2.14.3-sources.jar 541095 BLAKE2B 60700a7ebb87f371a28d7cfcc588fbd61e28e4744e96a214e0923cd32c1b8e265b87d98048b277e8d9e5f1e582f17dc0962550ec8e5e7ede7adb83d0c417f25a SHA512 a0ccc39187ee94f550760d5640b736cf54d7523bad4eed715166608e18b30acad82a8db2d78f4c9da381c04876571c3d9fdb0418ee2585568c5da18b000f3b1b
 DIST jackcess-4.0.0-sources.tar.gz 12140889 BLAKE2B 44bdd0ba74e9e462364506e563b2e5db8a6581686a0b1ab7d9995d2dfce164593eb533986ac666a7f79180478a8a16ccc8ef57a7af08045cb671a3a5269f84a6 SHA512 514ecf235943183e0b3813550adf801cc4ab1734137ae0b131f5e3dca9f774f2a866bec397ccc8d37d65e9c3f0c4c995baee091480eb8e2bb91e85894c2a27e6
diff --git a/dev-java/jackcess/jackcess-1.2.14.3.ebuild b/dev-java/jackcess/jackcess-1.2.14.3.ebuild
deleted file mode 100644
index 4aabf0363336..000000000000
--- a/dev-java/jackcess/jackcess-1.2.14.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Pure Java library for reading from and writing to MS Access databases"
-HOMEPAGE="https://sourceforge.net/projects/jackcess/"
-SRC_URI="mirror://sourceforge/${PN}/${P}-sources.jar"
-
-LICENSE="Apache-2.0"
-SLOT="1"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-
-CP_DEPEND=">=dev-java/commons-lang-2.6:2.1
-	>=dev-java/commons-logging-1.1.3:0
-	>=dev-java/log4j-1.2.7:0"
-
-DEPEND=">=virtual/jdk-1.7
-	app-arch/unzip
-	${CP_DEPEND}"
-
-RDEPEND=">=virtual/jre-1.7
-	${CP_DEPEND}"
-
-src_compile() {
-	java-pkg-simple_src_compile
-	java-pkg_addres "${PN}.jar" .
-}
diff --git a/dev-java/json-simple/json-simple-1.1-r1.ebuild b/dev-java/json-simple/json-simple-1.1-r2.ebuild
index a91c4fbc828d..d73b7b55ba0c 100644
--- a/dev-java/json-simple/json-simple-1.1-r1.ebuild
+++ b/dev-java/json-simple/json-simple-1.1-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 JAVA_PKG_IUSE="source doc"
 
@@ -17,8 +17,8 @@ LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="amd64 ppc64 x86"
 
-DEPEND=">=virtual/jdk-1.6"
-RDEPEND=">=virtual/jre-1.6"
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
 
 S="${WORKDIR}/${PN}-${MY_P}"
 
diff --git a/dev-java/miglayout/miglayout-4.0.ebuild b/dev-java/miglayout/miglayout-4.0-r1.ebuild
index 83297335bfb2..d451c751b91f 100644
--- a/dev-java/miglayout/miglayout-4.0.ebuild
+++ b/dev-java/miglayout/miglayout-4.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -20,11 +20,11 @@ COMMON_DEPEND="swt? ( dev-java/swt:3.7 )"
 BDEPEND="app-arch/unzip"
 RDEPEND="
 	${COMMON_DEPEND}
-	>=virtual/jre-1.5
+	>=virtual/jre-1.8:*
 "
 DEPEND="
 	${COMMON_DEPEND}
-	>=virtual/jdk-1.5
+	>=virtual/jdk-1.8:*
 "
 
 S="${WORKDIR}"
diff --git a/dev-java/resin-servlet-api/resin-servlet-api-3.0.25.ebuild b/dev-java/resin-servlet-api/resin-servlet-api-3.0.25-r1.ebuild
index 9f6176116360..aacd27267893 100644
--- a/dev-java/resin-servlet-api/resin-servlet-api-3.0.25.ebuild
+++ b/dev-java/resin-servlet-api/resin-servlet-api-3.0.25-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,22 +15,23 @@ SRC_URI="http://www.caucho.com/download/resin-${PV}-src.zip
 LICENSE="GPL-2+"
 SLOT="2.4"
 KEYWORDS="amd64 ppc64 x86"
-IUSE=""
 
-RDEPEND=">=virtual/jre-1.4:*"
-DEPEND=">=virtual/jdk-1.4
-	app-arch/unzip"
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+BDEPEND="app-arch/unzip"
 
 S="${WORKDIR}/resin-${PV}"
 
 EANT_BUILD_TARGET="jsdk"
 EANT_DOC_TARGET=""
 
+PATCHES=(
+	"${WORKDIR}/${PV}/resin-${PV}-build.xml.patch"
+)
+
 src_prepare() {
 	default
-
 	mkdir lib || die
-	eapply "${WORKDIR}/${PV}/resin-${PV}-build.xml.patch"
 }
 
 src_install() {