summaryrefslogtreecommitdiff
path: root/dev-java/osgi-compendium
diff options
context:
space:
mode:
Diffstat (limited to 'dev-java/osgi-compendium')
-rw-r--r--dev-java/osgi-compendium/Manifest2
-rw-r--r--dev-java/osgi-compendium/osgi-compendium-4.3.1-r2.ebuild (renamed from dev-java/osgi-compendium/osgi-compendium-4.3.1.ebuild)18
2 files changed, 11 insertions, 9 deletions
diff --git a/dev-java/osgi-compendium/Manifest b/dev-java/osgi-compendium/Manifest
index 7dc05e509d59..09319ed62caf 100644
--- a/dev-java/osgi-compendium/Manifest
+++ b/dev-java/osgi-compendium/Manifest
@@ -1,3 +1,3 @@
DIST osgi.cmpn-4.3.1.jar 741615 BLAKE2B 6f6058c07fd7744f0369d05cdf607b4d4fe51bbdf567c6a6c951413b0627eb1dbb6e56f65641a8472198d0aedca378da4715c26ebe05aa4e7ef80adb1020175f SHA512 803e929b4b7cfee13a3ffa2c60ad03775afd8409c972bf26e3f79abc590466c2d885bdc339d9af2a3e8fda9cdf082d23a298362ac37935b0ede0719dee27e9f9
-EBUILD osgi-compendium-4.3.1.ebuild 841 BLAKE2B 8e4ac270b156bd54e69922653f8da7921244657e069a028bd005e8087522ac41b180e14f7cc20244d1d5aea8ba0f61b659e9f5c71ccd31f1671dce3dc11e5757 SHA512 20dbe33a8c648312bec5474dcd571400f545b98c197df0936ba7d5a0896f8faaa1b2756cdfe96df2c55f8630c99b31731e231b64e870f30e6fa7cb6d3d1b5d51
+EBUILD osgi-compendium-4.3.1-r2.ebuild 861 BLAKE2B a9954368f03bf3dcea5f246da5b91e0214df99b0858846eda4ad12ba0e8ba9bd5479a0ac36b9576efccb425a0f39a40ae2f83e803c0cd0aefef5777a05c11464 SHA512 b79540fd36ad6bfda11966dfceda4e162579921f0b4e9785ada2fc0ea13e243c7bac2f48b1d9e1448e830ed65db2991a392c06358a0d08552f69e8b48c9b0c38
MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/osgi-compendium/osgi-compendium-4.3.1.ebuild b/dev-java/osgi-compendium/osgi-compendium-4.3.1-r2.ebuild
index 058539ddac15..f2cd70ced9b0 100644
--- a/dev-java/osgi-compendium/osgi-compendium-4.3.1.ebuild
+++ b/dev-java/osgi-compendium/osgi-compendium-4.3.1-r2.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"
@@ -33,9 +34,10 @@ JAVA_GENTOO_CLASSPATH="
osgi-core-api
osgi-foundation
glassfish-persistence
- tomcat-servlet-api-3.0
+ tomcat-servlet-api-4.0
"
-java_prepare() {
+src_prepare() {
+ default
rm -r org || die
}