From 325100e482dd9873e72576aa27f55821271f45c2 Mon Sep 17 00:00:00 2001
From: Oliver Freyermuth <o.freyermuth@googlemail.com>
Date: Mon, 16 Dec 2024 19:05:03 +0100
Subject: [PATCH] sci-physics/voms-clients: unkeyword 3.3.2 for ~x86

Also, improve ebuild syntax

Signed-off-by: Oliver Freyermuth <o.freyermuth@googlemail.com>
---
 sci-physics/voms-clients/metadata.xml           |  4 ++++
 .../voms-clients/voms-clients-3.3.2.ebuild      | 17 +++++++++--------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/sci-physics/voms-clients/metadata.xml b/sci-physics/voms-clients/metadata.xml
index ed156bd..5ce3b7a 100644
--- a/sci-physics/voms-clients/metadata.xml
+++ b/sci-physics/voms-clients/metadata.xml
@@ -5,4 +5,8 @@
     <email>o.freyermuth@googlemail.com</email>
     <name>Oliver Freyermuth</name>
   </maintainer>
+  <upstream>
+    <bugs-to>https://github.com/italiangrid/voms-clients/issues</bugs-to>
+    <remote-id type="github">italiangrid/voms-clients</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/sci-physics/voms-clients/voms-clients-3.3.2.ebuild b/sci-physics/voms-clients/voms-clients-3.3.2.ebuild
index 71a0016..13710f7 100644
--- a/sci-physics/voms-clients/voms-clients-3.3.2.ebuild
+++ b/sci-physics/voms-clients/voms-clients-3.3.2.ebuild
@@ -10,10 +10,11 @@ MY_PV=$(ver_rs 3 '-')
 DESCRIPTION="Command-line clients for Virtual Organization Membership Service (VOMS)"
 HOMEPAGE="https://italiangrid.github.io/voms/"
 SRC_URI="https://github.com/italiangrid/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64"
 IUSE="doc"
 
 DEPEND=">=virtual/jdk-1.8:*
@@ -24,8 +25,6 @@ RDEPEND="${DEPEND}
 	sci-physics/egi-igtf
 	sci-physics/wlcg-voms"
 
-S="${WORKDIR}/${PN}-${MY_PV}"
-
 # Even though some of this stuff will not be used at runtime, it is all
 # required in order to satisfy the maven build system.
 # To get this list, easiest is to run with RESTRICT="network-sandbox", remove --offline below, and parse the build log,
@@ -586,18 +585,18 @@ EMAVEN_VENDOR=(
 	"https://repo.maven.apache.org/maven2 org/codehaus/plexus/plexus-utils/3.0.8/plexus-utils-3.0.8.jar"
 )
 
-__set_vendor_uri() {
+set_vendor_uri() {
 	local lib
 	for lib in "${EMAVEN_VENDOR[@]}"; do
 		SRC_URI+=" ${lib%% *}/${lib##* }"
 	done
 }
 
-__set_vendor_uri
-unset -f __set_vendor_uri
+set_vendor_uri
+unset -f set_vendor_uri
 
 src_prepare() {
-	sed -e 's:</settings>:<localRepository>'${T}/m2'</localRepository></settings>:g' < \
+	sed -e 's:</settings>:<localRepository>'"${T}"/m2'</localRepository></settings>:g' < \
 		"${EPREFIX}/usr/share/$(readlink "${EPREFIX}/usr/bin/mvn" |
 		sed 's:mvn:maven-bin:')/conf/settings.xml" > "${S}"/settings.xml || \
 			die "failed to create settings.xml"
@@ -631,7 +630,9 @@ src_install() {
 	java-pkg_newjar "${T}"/m2/org/bouncycastle/bcpkix-jdk15on/1.58/bcpkix-jdk15on-1.58.jar bcpkix.jar
 	java-pkg_newjar "${T}"/m2/org/bouncycastle/bcprov-jdk15on/1.58/bcprov-jdk15on-1.58.jar bcprov.jar
 	for tool in init info destroy; do
-		java-pkg_dolauncher voms-proxy-${tool}3 --main org.italiangrid.voms.clients.VomsProxy${tool^} --java_args="-XX:+UseSerialGC -Xmx16m"
+		java-pkg_dolauncher voms-proxy-${tool}3 \
+			--main org.italiangrid.voms.clients.VomsProxy${tool^} \
+			--java_args="-XX:+UseSerialGC -Xmx16m"
 		#sed -i	-e "s/voms-proxy-${tool}/voms-proxy-${tool}3/g" \
 		#	-e "s/VOMS-PROXY-${tool^^}/VOMS-PROXY-${tool^^}3/g" man/voms-proxy-${tool}.1 \
 		#	man/voms-proxy-${tool}.1