| 1 |
Signed-off-by: David Seifert <soap@g.o> |
| 2 |
--- |
| 3 |
eclass/java-osgi.eclass | 15 ++++++--------- |
| 4 |
1 file changed, 6 insertions(+), 9 deletions(-) |
| 5 |
|
| 6 |
diff --git a/eclass/java-osgi.eclass b/eclass/java-osgi.eclass |
| 7 |
index 2043cbfb2d8..7019fab7b20 100644 |
| 8 |
--- a/eclass/java-osgi.eclass |
| 9 |
+++ b/eclass/java-osgi.eclass |
| 10 |
@@ -1,4 +1,4 @@ |
| 11 |
-# Copyright 2007-2021 Gentoo Authors |
| 12 |
+# Copyright 2007-2022 Gentoo Authors |
| 13 |
# Distributed under the terms of the GNU General Public License v2 |
| 14 |
|
| 15 |
# @ECLASS: java-osgi.eclass |
| 16 |
@@ -6,7 +6,7 @@ |
| 17 |
# java@g.o |
| 18 |
# @AUTHOR: |
| 19 |
# Java maintainers <java@g.o> |
| 20 |
-# @SUPPORTED_EAPIS: 5 6 7 8 |
| 21 |
+# @SUPPORTED_EAPIS: 7 8 |
| 22 |
# @PROVIDES: java-utils-2 |
| 23 |
# @BLURB: Java OSGi eclass |
| 24 |
# @DESCRIPTION: |
| 25 |
@@ -15,8 +15,8 @@ |
| 26 |
# in their manifests. Currently this is used only by Eclipse-3.3 - later we |
| 27 |
# could extend this so that Gentoo Java system would be fully OSGi compliant. |
| 28 |
|
| 29 |
-case ${EAPI:-0} in |
| 30 |
- [5678]) ;; |
| 31 |
+case ${EAPI} in |
| 32 |
+ 7|8) ;; |
| 33 |
*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; |
| 34 |
esac |
| 35 |
|
| 36 |
@@ -28,12 +28,9 @@ inherit java-utils-2 |
| 37 |
# @ECLASS_VARIABLE: _OSGI_T |
| 38 |
# @INTERNAL |
| 39 |
# @DESCRIPTION: |
| 40 |
-# We define _OSGI_T so that it does not contain a slash at the end. |
| 41 |
-# According to Paludis guys, there is currently a proposal for EAPIs that |
| 42 |
-# would require all variables to end with a slash. |
| 43 |
-_OSGI_T="${T/%\//}" |
| 44 |
+_OSGI_T="${T}" |
| 45 |
|
| 46 |
-# must get Diego to commit something like this to portability.eclass |
| 47 |
+# TODO add to portability.eclass |
| 48 |
_canonicalise() { |
| 49 |
if type -p realpath > /dev/null; then |
| 50 |
realpath "${@}" |
| 51 |
-- |
| 52 |
2.39.0 |
Archives