From a978c074e4272bb901fbe4a10de0a7b2af574f17 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Tue, 4 May 2021 22:28:33 +0100
Subject: gentoo resync : 04.05.2021

---
 dev-java/osgi-foundation/Manifest                  |  2 +-
 .../osgi-foundation-1.2.0-r1.ebuild                | 27 ---------------------
 .../osgi-foundation-1.2.0-r2.ebuild                | 28 ++++++++++++++++++++++
 3 files changed, 29 insertions(+), 28 deletions(-)
 delete mode 100644 dev-java/osgi-foundation/osgi-foundation-1.2.0-r1.ebuild
 create mode 100644 dev-java/osgi-foundation/osgi-foundation-1.2.0-r2.ebuild

(limited to 'dev-java/osgi-foundation')

diff --git a/dev-java/osgi-foundation/Manifest b/dev-java/osgi-foundation/Manifest
index f8b5c84d94ad..19a882c335e4 100644
--- a/dev-java/osgi-foundation/Manifest
+++ b/dev-java/osgi-foundation/Manifest
@@ -1,4 +1,4 @@
 AUX osgi-foundation-1.2.0-build.xml 9886 BLAKE2B aacff8e000b02c742ee7e5d03d2c057b6baf56bce9cc1b9cd0031c39550e9ef07bcf85a7d89dd265cc523d638063e425b1553f146b5ce6af107440b1e0d61d43 SHA512 5f106bd612a65033e35beb4fb635d07199e10b69e692db5949424ecf7a8baf2bd6af0f35898bd465334356333d82d5c4941ef6ce7ce16c3939f425f4e58c6fcc
 DIST osgi-foundation-1.2.0.tar.xz 45176 BLAKE2B 4b5432dfaad9134f402b5f448a8d7ba5f626a7b160bbc953914352a28f745725da851b6c5f2122f820b52f2fd8ad463c2df5c8ae3e2b46ef8bb9d56d89d90f1b SHA512 6523dd6b4cd8205aa3359fae4640ff6b17a1944aec6bf23acf0d6e4eb33839a9b9049e8df0c55a4f35013b40b1df2391a53ed68df682a317c35dca504e9b996b
-EBUILD osgi-foundation-1.2.0-r1.ebuild 638 BLAKE2B ee50d921757639f377331bc2fe39b08d4580bd2aafe556088576b2924a8f825418974f9ae2052e747300627fad3cc0c544d6cc4bc1eb79ede9dbe2a781d13f53 SHA512 c1c038eebe4686d90d2745bdfb23d813d1c4fe4f20b1cc4497ecb1e66f85baaadf99f33d2bb8fb8776bc1656245861d83b30f1f19ab2a9bda693ad3808a6a766
+EBUILD osgi-foundation-1.2.0-r2.ebuild 648 BLAKE2B 326fe5d303ae073c1e8d516d2d22feabe378dbba63e759d95c3b78ff5c89803b5b53bdbc14b5cc94593347737d35f4ea6579f9da6c6f49e123b4c96c80f14d44 SHA512 046823fb6b8e21a0ed26ddd8361b6c7fe0af4617608fcb11c01e39204f01ace3783d2c5bd205ad779c8d50d464202650b908520894f37c463a7e16f1e2afb6a3
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/osgi-foundation/osgi-foundation-1.2.0-r1.ebuild b/dev-java/osgi-foundation/osgi-foundation-1.2.0-r1.ebuild
deleted file mode 100644
index ee652a6205c6..000000000000
--- a/dev-java/osgi-foundation/osgi-foundation-1.2.0-r1.ebuild
+++ /dev/null
@@ -1,27 +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-ant-2
-
-DESCRIPTION="OSGi R4 Foundation EE by Apache Felix"
-HOMEPAGE="http://felix.apache.org/"
-SRC_URI="https://dev.gentoo.org/~tomwij/files/dist/${P}.tar.xz"
-
-LICENSE="Apache-2.0 OSGi-Specification-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
-
-DEPEND=">=virtual/jdk-1.5"
-RDEPEND=">=virtual/jre-1.5"
-
-java_prepare() {
-	cp "${FILESDIR}"/${P}-build.xml "${S}"/build.xml || die
-}
-
-src_install() {
-	java-pkg_newjar target/org.osgi.foundation-${PV}.jar org.osgi.foundation.jar
-}
diff --git a/dev-java/osgi-foundation/osgi-foundation-1.2.0-r2.ebuild b/dev-java/osgi-foundation/osgi-foundation-1.2.0-r2.ebuild
new file mode 100644
index 000000000000..3e37ca69434e
--- /dev/null
+++ b/dev-java/osgi-foundation/osgi-foundation-1.2.0-r2.ebuild
@@ -0,0 +1,28 @@
+# 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-ant-2
+
+DESCRIPTION="OSGi R4 Foundation EE by Apache Felix"
+HOMEPAGE="http://felix.apache.org/"
+SRC_URI="https://dev.gentoo.org/~tomwij/files/dist/${P}.tar.xz"
+
+LICENSE="Apache-2.0 OSGi-Specification-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~ppc64 x86"
+
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+
+src_prepare() {
+	default
+	cp "${FILESDIR}"/${P}-build.xml "${S}"/build.xml || die
+}
+
+src_install() {
+	java-pkg_newjar target/org.osgi.foundation-${PV}.jar org.osgi.foundation.jar
+}
-- 
cgit v1.2.3