[gentoo-commits] repo/gentoo:master commit in: dev-java/osgi-compendium/

[Miroslav Šulc]

commit:     04fd34cac63463f99f4fbede1fdb7ebf1bbf9667
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sat May  1 17:54:00 2021 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sat May  1 17:54:00 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04fd34ca

dev-java/osgi-compendium: eapi7 + java 1.8 + newer servlet api

Closes: https://bugs.gentoo.org/786759
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 ...dium-4.3.1.ebuild => osgi-compendium-4.3.1-r1.ebuild} | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/dev-java/osgi-compendium/osgi-compendium-4.3.1.ebuild b/dev-java/osgi-compendium/osgi-compendium-4.3.1-r1.ebuild
similarity index 79%
rename from dev-java/osgi-compendium/osgi-compendium-4.3.1.ebuild
rename to dev-java/osgi-compendium/osgi-compendium-4.3.1-r1.ebuild
index 058539ddac1..8dcb4b18f10 100644
--- a/dev-java/osgi-compendium/osgi-compendium-4.3.1.ebuild
+++ b/dev-java/osgi-compendium/osgi-compendium-4.3.1-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=7
 
 JAVA_PKG_IUSE="doc source"
 
@@ -18,14 +18,15 @@ KEYWORDS="amd64 ~ppc64 x86"
 CDEPEND="dev-java/glassfish-persistence:0
 	dev-java/osgi-core-api:0
 	dev-java/osgi-foundation:0
-	dev-java/tomcat-servlet-api:3.0"
+	dev-java/tomcat-servlet-api:4.0"
 
 DEPEND="${CDEPEND}
-	>=virtual/jdk-1.5
-	app-arch/unzip"
+	>=virtual/jdk-1.8:*"
 
 RDEPEND="${CDEPEND}
-	>=virtual/jre-1.5"
+	>=virtual/jre-1.8:*"
+
+BDEPEND="app-arch/unzip"
 
 JAVA_SRC_DIR="OSGI-OPT/src"
 
@@ -36,6 +37,7 @@ JAVA_GENTOO_CLASSPATH="
 	tomcat-servlet-api-3.0
 "
 
-java_prepare() {
+src_prepare() {
+	default
 	rm -r org || die
 }