dev-java/qdox: eapi7, min java to 1.8

Closes: https://bugs.gentoo.org/745804 Package-Manager: Portage-3.0.8, Repoman-3.0.1 Signed-off-by: Miroslav Šulc <[email protected]>
hanetzer · Oct 2, 2020 · 459d6f5 · 459d6f5
1 parent e3412f5
commit 459d6f5
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 10 deletions.
diff --git a/dev-java/qdox/qdox-1.12.1-r1.ebuild → dev-java/qdox/qdox-1.12.1-r2.ebuild b/dev-java/qdox/qdox-1.12.1-r1.ebuild → dev-java/qdox/qdox-1.12.1-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=7
 
 JAVA_PKG_IUSE="doc source test"
 
@@ -19,19 +19,23 @@ S="${WORKDIR}/${PN}-${PN}-${PV}"
 
 CDEPEND="dev-java/ant-core:0"
 
-DEPEND=">=virtual/jdk-1.4
+DEPEND=">=virtual/jdk-1.8
  app-arch/unzip:0
  dev-java/byaccj:0
  >=dev-java/jflex-1.6.1:0
  dev-java/jmock:1.0
  test? ( dev-java/junit:0 )
  ${CDEPEND}"
 
-RDEPEND=">=virtual/jre-1.4
+RDEPEND=">=virtual/jre-1.8
  ${CDEPEND}"
 
-java_prepare() {
- epatch "${FILESDIR}"/jflex-1.6.1.patch
+PATCHES=(
+ "${FILESDIR}/jflex-1.6.1.patch"
+)
+
+src_prepare() {
+ default
 
  if ! use test ; then
  rm src/java/com/thoughtworks/qdox/tools/QDoxTester.java

diff --git a/dev-java/qdox/qdox-1.6.3-r1.ebuild → dev-java/qdox/qdox-1.6.3-r2.ebuild b/dev-java/qdox/qdox-1.6.3-r1.ebuild → dev-java/qdox/qdox-1.6.3-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 JAVA_PKG_IUSE="doc source"
 
@@ -16,10 +16,10 @@ SLOT="1.6"
 LICENSE="Apache-2.0"
 
 DEPEND="
- >=virtual/jdk-1.6"
+ >=virtual/jdk-1.8"
 
 RDEPEND="
- >=virtual/jre-1.6"
+ >=virtual/jre-1.8"
 
 S="${WORKDIR}"