From e748ba9741f6540f4675c23e3e37b73e822c13a4 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Mon, 31 May 2021 20:59:14 +0100
Subject: gentoo resync : 31.05.2021

---
 dev-java/osgi-enterprise-api/Manifest              |  2 +-
 .../osgi-enterprise-api-5.0.0-r1.ebuild            | 38 ++++++++++++++++++
 .../osgi-enterprise-api-5.0.0.ebuild               | 45 ----------------------
 3 files changed, 39 insertions(+), 46 deletions(-)
 create mode 100644 dev-java/osgi-enterprise-api/osgi-enterprise-api-5.0.0-r1.ebuild
 delete mode 100644 dev-java/osgi-enterprise-api/osgi-enterprise-api-5.0.0.ebuild

(limited to 'dev-java/osgi-enterprise-api')

diff --git a/dev-java/osgi-enterprise-api/Manifest b/dev-java/osgi-enterprise-api/Manifest
index 67365f2899bc..e4bf979eaa99 100644
--- a/dev-java/osgi-enterprise-api/Manifest
+++ b/dev-java/osgi-enterprise-api/Manifest
@@ -1,3 +1,3 @@
 DIST osgi.enterprise-5.0.0.jar 479506 BLAKE2B 2bd53b50e469388d132a6d3ebd78d4040093f8c1d79299fd87412853d959f7559f04287567eeea47635fe287a3e9d3812ac9303a5d39ec35135ab3c58bd0b010 SHA512 0404c05afd8cb3ef8b826b0f08deeb03b0027ca99e091953d39ef69674809c5b899e0f2c8efb685df5fce070c2aafcf813e470fbb538d4ec3b480a8060351144
-EBUILD osgi-enterprise-api-5.0.0.ebuild 1049 BLAKE2B ed9e90dffd1612cd2015b29d96eee846edb4ede516c12beedd2083bc98e4a1c7c847126fc52b28ad8ba2a32a3c67975ef726d5b4382f847897fea61e91836acf SHA512 1631e3fd424c3ab264b0c7921eea60ff53ea8b0ae2f1dd908b6ad513671e81945093089a5c3a18da5bc1fa558affd7fbf38e959bd19ec5ac1f3b7a80897db3e6
+EBUILD osgi-enterprise-api-5.0.0-r1.ebuild 803 BLAKE2B 0ded27b699ab17eebbe01552ed223cce38c4b9c1071b3ed1bc616ec5e5468e3bd1ea36d8b0480d6d2c62453d2cd782d095fcfae8f90f4fb31a753064f6b6930f SHA512 a7c650c8c10eec854cdc3cd3e083a4060d1388b466d0f2d5161daad88c5ff75ef1af8302c08e017af6d93debeb926a44ebb1e122fe33e2aa9726c5d44ff5be03
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/osgi-enterprise-api/osgi-enterprise-api-5.0.0-r1.ebuild b/dev-java/osgi-enterprise-api/osgi-enterprise-api-5.0.0-r1.ebuild
new file mode 100644
index 000000000000..6150e0d2c5f0
--- /dev/null
+++ b/dev-java/osgi-enterprise-api/osgi-enterprise-api-5.0.0-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="OSGi Enterprise Release 5 Companion Code"
+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"
+
+CDEPEND="dev-java/glassfish-persistence:0
+	dev-java/osgi-core-api:0
+	java-virtuals/servlet-api:2.5"
+
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.8:*"
+
+DEPEND="${CDEPEND}
+	>=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"
+
+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
deleted file mode 100644
index 54d3162af6cd..000000000000
--- a/dev-java/osgi-enterprise-api/osgi-enterprise-api-5.0.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-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"
-
-LICENSE="Apache-2.0 OSGi-Specification-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
-
-RESTRICT="bindist fetch"
-
-CDEPEND="dev-java/glassfish-persistence:0
-	dev-java/osgi-core-api:0
-	java-virtuals/servlet-api:2.5"
-
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.5"
-
-DEPEND="${CDEPEND}
-	>=virtual/jdk-1.5
-	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() {
-	rm -r org || die
-}
-- 
cgit v1.2.3