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

[Miroslav Šulc]

commit:     feb21d032294b66f1f8210335bd166fd7bb498b7
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Fri May 28 17:11:29 2021 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sat May 29 08:46:31 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=feb21d03

dev-java/osgi-enterprise-api: SRC_URI, min java 1.8

Bug: https://bugs.gentoo.org/786762
Closes: https://bugs.gentoo.org/785043
Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/21025
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 ....ebuild => osgi-enterprise-api-5.0.0-r1.ebuild} | 23 ++++++++--------------
 .../osgi-enterprise-api-5.0.0.ebuild               |  2 +-
 2 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/dev-java/osgi-enterprise-api/osgi-enterprise-api-5.0.0.ebuild b/dev-java/osgi-enterprise-api/osgi-enterprise-api-5.0.0-r1.ebuild
similarity index 57%
copy from dev-java/osgi-enterprise-api/osgi-enterprise-api-5.0.0.ebuild
copy to dev-java/osgi-enterprise-api/osgi-enterprise-api-5.0.0-r1.ebuild
index 54d3162af6c..6150e0d2c5f 100644
--- a/dev-java/osgi-enterprise-api/osgi-enterprise-api-5.0.0.ebuild
+++ b/dev-java/osgi-enterprise-api/osgi-enterprise-api-5.0.0-r1.ebuild
@@ -1,45 +1,38 @@
-# 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"
 
 inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="OSGi Enterprise Release 5 Companion Code"
-SRC_URI="http://www.osgi.org/download/r5/osgi.enterprise-${PV}.jar"
 HOMEPAGE="http://www.osgi.org/Main/HomePage"
+SRC_URI="https://docs.osgi.org/download/r5/osgi.enterprise-${PV}.jar"
 
 LICENSE="Apache-2.0 OSGi-Specification-2.0"
 SLOT="0"
 KEYWORDS="amd64 ~ppc64 x86"
 
-RESTRICT="bindist fetch"
+RESTRICT="bindist"
 
 CDEPEND="dev-java/glassfish-persistence:0
 	dev-java/osgi-core-api:0
 	java-virtuals/servlet-api:2.5"
 
 RDEPEND="${CDEPEND}
-	>=virtual/jre-1.5"
+	>=virtual/jre-1.8:*"
 
 DEPEND="${CDEPEND}
-	>=virtual/jdk-1.5
+	>=virtual/jdk-1.8:*
 	app-arch/unzip"
 
 JAVA_SRC_DIR="OSGI-OPT/src"
 
 JAVA_GENTOO_CLASSPATH="glassfish-persistence,osgi-core-api,servlet-api-2.5"
 
-pkg_nofetch() {
-	einfo "Please download osgi.enterprise-${PV}.jar from"
-	einfo "  http://www.osgi.org/Download/Release5"
-	einfo "which you can find listed as"
-	einfo "  OSGi Enterprise Release 5 Companion Code"
-	einfo "after accepting the license."
-}
-
-java_prepare() {
+src_prepare() {
+	default
 	rm -r org || die
 }

diff --git a/dev-java/osgi-enterprise-api/osgi-enterprise-api-5.0.0.ebuild b/dev-java/osgi-enterprise-api/osgi-enterprise-api-5.0.0.ebuild
index 54d3162af6c..72b81f3f95a 100644
--- a/dev-java/osgi-enterprise-api/osgi-enterprise-api-5.0.0.ebuild
+++ b/dev-java/osgi-enterprise-api/osgi-enterprise-api-5.0.0.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="5"