diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2022-12-27 20:10:49 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2022-12-27 20:10:49 +0000 |
| commit | e44b9cf3e5b67eaf723e4a335faf39c87167abd3 (patch) | |
| tree | 3e6660b30910e7eb33586a99c4e892b52380bad6 /eclass/java-osgi.eclass | |
| parent | 4429be000a778f363162554d59d903a725283d7d (diff) | |
gentoo auto-resync : 27:12:2022 - 20:10:49
Diffstat (limited to 'eclass/java-osgi.eclass')
| -rw-r--r-- | eclass/java-osgi.eclass | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/eclass/java-osgi.eclass b/eclass/java-osgi.eclass index 2043cbfb2d89..7019fab7b203 100644 --- a/eclass/java-osgi.eclass +++ b/eclass/java-osgi.eclass @@ -1,4 +1,4 @@ -# Copyright 2007-2021 Gentoo Authors +# Copyright 2007-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: java-osgi.eclass @@ -6,7 +6,7 @@ # java@gentoo.org # @AUTHOR: # Java maintainers <java@gentoo.org> -# @SUPPORTED_EAPIS: 5 6 7 8 +# @SUPPORTED_EAPIS: 7 8 # @PROVIDES: java-utils-2 # @BLURB: Java OSGi eclass # @DESCRIPTION: @@ -15,8 +15,8 @@ # in their manifests. Currently this is used only by Eclipse-3.3 - later we # could extend this so that Gentoo Java system would be fully OSGi compliant. -case ${EAPI:-0} in - [5678]) ;; +case ${EAPI} in + 7|8) ;; *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; esac @@ -28,12 +28,9 @@ inherit java-utils-2 # @ECLASS_VARIABLE: _OSGI_T # @INTERNAL # @DESCRIPTION: -# We define _OSGI_T so that it does not contain a slash at the end. -# According to Paludis guys, there is currently a proposal for EAPIs that -# would require all variables to end with a slash. -_OSGI_T="${T/%\//}" +_OSGI_T="${T}" -# must get Diego to commit something like this to portability.eclass +# TODO add to portability.eclass _canonicalise() { if type -p realpath > /dev/null; then realpath "${@}" |