From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id F12B8158020 for ; Sun, 25 Dec 2022 22:18:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C9DA6E09BD; Sun, 25 Dec 2022 22:16:21 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8FFF4E09B7 for ; Sun, 25 Dec 2022 22:16:21 +0000 (UTC) From: David Seifert To: gentoo-dev@lists.gentoo.org Cc: David Seifert Subject: [gentoo-dev] [PATCH 11/41] java-osgi.eclass: drop EAPI 5, 6 support Date: Sun, 25 Dec 2022 23:15:22 +0100 Message-Id: <20221225221552.8023-11-soap@gentoo.org> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20221225221552.8023-1-soap@gentoo.org> References: <20221225221552.8023-1-soap@gentoo.org> Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-dev@lists.gentoo.org Reply-to: gentoo-dev@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Archives-Salt: 53109931-f95c-4b2f-8b20-8ba9aec2f902 X-Archives-Hash: 299c17cca805b5266b086adcba08a18d Signed-off-by: David Seifert --- 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 -# @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