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 103C31581FB for ; Tue, 27 Aug 2024 15:20:03 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 37098E2AA3; Tue, 27 Aug 2024 15:16:29 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 F21F3E2AA0 for ; Tue, 27 Aug 2024 15:16:28 +0000 (UTC) From: David Seifert To: gentoo-dev@lists.gentoo.org Cc: David Seifert Subject: [gentoo-dev] [PATCH 14/50] java-utils-2.eclass: drop support for EAPI 6 Date: Tue, 27 Aug 2024 17:14:59 +0200 Message-ID: <20240827151553.210835-14-soap@gentoo.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240827151553.210835-1-soap@gentoo.org> References: <20240827151553.210835-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: 1c129b82-3ec1-4aac-a001-da5331bf1074 X-Archives-Hash: b143816c2e0f719feb7122ae78a2add5 Signed-off-by: David Seifert --- eclass/java-utils-2.eclass | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/eclass/java-utils-2.eclass b/eclass/java-utils-2.eclass index 9c657cc4c1f9..1b4f4f138706 100644 --- a/eclass/java-utils-2.eclass +++ b/eclass/java-utils-2.eclass @@ -6,7 +6,7 @@ # java@gentoo.org # @AUTHOR: # Thomas Matthijs , Karl Trygve Kalleberg -# @SUPPORTED_EAPIS: 6 7 8 +# @SUPPORTED_EAPIS: 7 8 # @BLURB: Base eclass for Java packages # @DESCRIPTION: # This eclass provides functionality which is used by java-pkg-2.eclass, @@ -18,17 +18,13 @@ # Ant-based packages. case ${EAPI} in - 6|7|8) ;; + 7|8) ;; *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; esac if [[ -z ${_JAVA_UTILS_2_ECLASS} ]] ; then _JAVA_UTILS_2_ECLASS=1 -# EAPI 7 has version functions built-in. Use eapi7-ver for all earlier EAPIs. -# Keep versionator inheritance in case consumers are using it implicitly. -[[ ${EAPI} == 6 ]] && inherit eapi7-ver eqawarn multilib versionator - # Make sure we use java-config-2 export WANT_JAVA_CONFIG="2" @@ -296,12 +292,12 @@ java-pkg_doexamples() { ( # dont want to pollute calling env insinto "${dest}" doins -r ${1}/* - ) || die "Installing examples failed" + ) else ( # dont want to pollute calling env insinto "${dest}" doins -r "$@" - ) || die "Installing examples failed" + ) fi # Let's make a symlink to the directory we have everything else under @@ -426,7 +422,7 @@ java-pkg_dojar() { ( insinto "${JAVA_PKG_JARDEST}" doins "${jar}" - ) || die "failed to install ${jar}" + ) java-pkg_append_ JAVA_PKG_CLASSPATH "${EPREFIX}${JAVA_PKG_JARDEST}/${jar_basename}" debug-print "installed ${jar} to ${ED}${JAVA_PKG_JARDEST}" # make a symlink to the original jar if it's symlink @@ -574,7 +570,7 @@ java-pkg_doso() { insinto "${JAVA_PKG_LIBDEST}" insopts -m0755 doins "${lib}" - ) || die "failed to install ${lib}" + ) java-pkg_append_ JAVA_PKG_LIBRARY "${JAVA_PKG_LIBDEST}" debug-print "Installing ${lib} to ${JAVA_PKG_LIBDEST}" # otherwise make a symlink to the symlink's origin @@ -806,7 +802,7 @@ java-pkg_dosrc() { ( insinto "${JAVA_PKG_SOURCESPATH}" doins ${zip_path} - ) || die "Failed to install source" + ) JAVA_SOURCES="${JAVA_PKG_SOURCESPATH}/${zip_name}" @@ -1975,8 +1971,9 @@ etestng() { # src_prepare Searches for bundled jars # Don't call directly, but via java-pkg-2_src_prepare! java-utils-2_src_prepare() { + # have default_src_prepare starting from EAPI 9, see https://bugs.gentoo.org/780585 case ${EAPI} in - [678]) eapply_user ;; + [78]) eapply_user ;; *) default_src_prepare ;; esac -- 2.46.0