* [gentoo-dev] [PATCH 11/41] java-osgi.eclass: drop EAPI 5, 6 support
@ 2022-12-25 22:15 99% ` David Seifert
0 siblings, 0 replies; 1+ results
From: David Seifert @ 2022-12-25 22:15 UTC (permalink / raw
To: gentoo-dev; +Cc: David Seifert
Signed-off-by: David Seifert <soap@gentoo.org>
---
eclass/java-osgi.eclass | 15 ++++++---------
1 file changed, 6 insertions(+), 9 deletions(-)
diff --git a/eclass/java-osgi.eclass b/eclass/java-osgi.eclass
index 2043cbfb2d8..7019fab7b20 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 "${@}"
--
2.39.0
^ permalink raw reply related [relevance 99%]
Results 1-1 of 1 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2022-12-25 22:15 [gentoo-dev] [PATCH 01/41] ada.eclass: drop EAPI 6 support David Seifert
2022-12-25 22:15 99% ` [gentoo-dev] [PATCH 11/41] java-osgi.eclass: drop EAPI 5, " David Seifert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox