gentoo auto-resync : 14:06:2023 - 15:13:45

16 files changed, 411 insertions, 102 deletions

diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index 2e0f33ce4de3..2c55e36078d2 100644
--- a/net-vpn/Manifest.gz
+++ b/net-vpn/Manifest.gz
diff --git a/net-vpn/i2p/Manifest b/net-vpn/i2p/Manifest
index ae5e0721d35f..27299c722bab 100644
--- a/net-vpn/i2p/Manifest
+++ b/net-vpn/i2p/Manifest
@@ -1,9 +1,12 @@
 AUX 1.7.0-i2p.init 391 BLAKE2B e62a23021db61ba93adaf1ff9c2f0bb9372cee3921544c9ca498f3472dc64c700a0fb78d2fed9dafc0fa98c97670f67266a2e0f8c594c7c1352d15e1b23d7586 SHA512 12c69b2c5918a23219d84f2c1ded286ced6f78564241372bead318ddcb77876e90c800735f7ed6e92c03f69dfeb990ec43e40efd1e9ee32888b404d1e2e9643a
 AUX 1.7.0-i2p.service 253 BLAKE2B 2647a1920083fedf88b351b084d3a4d177393065da3dc7aecbeb09e1afc3373116f972c40db4500f76fe1a983ac24503d9a95ee08917ff7625946e4928449512 SHA512 59639b4f78637e5b03ed67b7e08d21bc873c844b474df3ed9101b34934a4c22aef46db1b66cbdc9aad2438ee84f130230c368a78b5bb1017843f016bba6c30e5
+AUX 2.2.1-fix-junit-classpath.patch 7277 BLAKE2B 073189daf745f401b6642194e304b7b10181444e9ec074f2c3195755e29ee8a010d0ee888639b820e8130e42d68826c3d9edc07240de0f6481829c1c46747e32 SHA512 b19822631f4d47879bd309fb0801accac47c5d4da2bb6ddf6e5fae18e2a97dd23f8dc625c983495a281b7369859666bca099b2585e17ab6b0abae1add7a200e1
 AUX i2p.init 278 BLAKE2B 2e26e9d25e21494d2f6a221a3c332f1afe475513096eb7c51a0fbc4cacc8e9bd418f98d622cb054f55d7b7c4941054be8b6314f9b19c249e9ad0e77893980ca6 SHA512 1edb33cd0df28de95e02b1015e86cbc44c867a8df1260abb0565bc232c2cccc2625d36fdefa4a050ea3215d938c1ff0521a591a0bc2b27d57ca6be621795cd52
 AUX i2p.service 172 BLAKE2B 8523af82e33d7a8f5b37138f8d28c7adb4c08607b84813f35b42f11064c0ec2768bf443eca32bd7b281ed084d6b820b23977c55a1cd5b8ad058ab18117b83f90 SHA512 c87574c968f4142b3dbe556dab86438765dc8b9b23475dca8c7e268d2963e5dffcd9175bb749b2d42c3fc7fe75d9175158f56cb78f0fa4faa7d6029fdf4b8e6c
 DIST i2psource_1.7.0.tar.bz2 33300522 BLAKE2B dcb83477f6d066b707632f8db44bc811558b0bc52368ce992aaf14d0d21acc1fb9bce1dfa8171fca8cf3819765f0b7993ae4a2566a6f65786cca84c02ea4336a SHA512 a27c448246538f152355ecfdf781e39bf9e57b5d0f7ea139ce06d800ce3eed7fa4e375210e6545da2a75245b45282bc8d8e7453d96729f940c34daa75bdc588f
 DIST i2psource_2.1.0.tar.bz2 32817295 BLAKE2B d37463522143c02e04c96d58578312b536ab5e2842e5647dbe5ba3d5c139329c447f16de7e326ef48ef4c6b3c11631e23300b5327cc31d9da5288240f86c926f SHA512 e8639c2b2869d3c7856b598d4cd3505458ed5cab5dce3570cafdaec3ccd77dbaec35787cccc6782acc75adb423b7baaab724ac3c98e5b91b41cf4c76f3614355
+DIST i2psource_2.2.1.tar.bz2 33349391 BLAKE2B 45c681fd64c638e78033efbc025f8ddd0200dd79da45d7af539f7553d792f03b9978a62dac0f4763c4589939e1b220efb13d1e4dca03c143cf3b2de31af818a9 SHA512 98ea0b86fcf879b5e4e415d106c446be73441aa03c91f3b9ac02589a332cafad1bf899d381b5986fb78efc550deceedd2da5514c46fbb70f5928d85a76be5ced
 EBUILD i2p-1.7.0-r1.ebuild 4212 BLAKE2B 7cf5f94c8d1a9814f69cce175ce49b6f63575b9e90e6c404bec07be1f4476713db635561b355aab314a71cfe7e02ae1615902f6ad22984d238037c234146644f SHA512 a3c609a3c37e6430daed918d215536d1ec9ddd4c12f1191a26184503fee3b8dd88b2db700be6870414a4d775dc548d0c8bc0d579a595a9b079e57f1142dd712a
-EBUILD i2p-2.1.0-r2.ebuild 7138 BLAKE2B 90153ea24b8ee7aea9c1c8242fc4fff477f2c9bddd287c0af39a9f1c04a614a545b8d91794180764286274fb0516206ae81f4e76a712151181116799879b373a SHA512 40baca6878e714d28740abc489647e70a6b2912a80169e1c549847c72bf6cc86a4bf4a0ba917eee079eff04bd658483d003939d8c70dd61617c8f01f0bd17cde
+EBUILD i2p-2.1.0-r2.ebuild 7124 BLAKE2B 7c448a471a9a98f45f2eb83bdb5558e99d322aec2e75807b2ab7c6a3f71acd304c89b89690aa88962bb9bfff97bdbf3376a775abce5cce44a0428e91b0691639 SHA512 0d2a8f1c779bec8e96f03bd34412b8c9d7d71972a1840bbb59cc0b458475243e1fd23ea2f83207bf97c940238361ca8badcfb9e7b354b9574e5042d89a817880
+EBUILD i2p-2.2.1.ebuild 8094 BLAKE2B ab618974b21d822b889bb8be8b08758e4c328e4d246e23cace61735de305adb14d6948ad2775bfccfa4b2a3b34ef4d915e1d17da9c85cdc3080cac26dfbe7e7d SHA512 118d22467e2beeaad511060c922170e1ecb6cde2c65cd8a47e45d47839390fc2c0802c72f32fda4f90b9e8d408bb6b50f30526bef68b75b14314950a9913d8db
 MISC metadata.xml 832 BLAKE2B ecda42c25627405f84f1df24fecf9b117c2dd15c44166eaea65df6924dce67e562a0ba7af83508fe7512d5ee75b23620e59ab7376701178f0cef6c47d42b751f SHA512 effe4661ecc390b6b76984192fcd4124cb29302e5ff4c545447b08ca5fc07ae63efa57d3082487940c64ade864d9c76a55f1bd1a05217808fb733a3a18cb553d
diff --git a/net-vpn/i2p/files/2.2.1-fix-junit-classpath.patch b/net-vpn/i2p/files/2.2.1-fix-junit-classpath.patch
new file mode 100644
index 000000000000..95211bf9cad0
--- /dev/null
+++ b/net-vpn/i2p/files/2.2.1-fix-junit-classpath.patch
@@ -0,0 +1,122 @@
+diff --git a/apps/i2ptunnel/java/build.xml b/apps/i2ptunnel/java/build.xml
+index b8d8b24a9..cfcf2d5a1 100644
+--- a/apps/i2ptunnel/java/build.xml
++++ b/apps/i2ptunnel/java/build.xml
+@@ -465,7 +465,7 @@
+     <target name="test" depends="clean, compileTest">
+         <junit printsummary="on" fork="yes">
+             <classpath>
+-                <pathelement path="${classpath}" />
++                <pathelement path="${gentoo.classpath}" />
+                 <pathelement location="./build/obj" />
+                 <pathelement location="../../../core/java/build/i2p.jar" />
+             </classpath>
+diff --git a/apps/ministreaming/java/build.xml b/apps/ministreaming/java/build.xml
+index 72944b25c..cef8a091f 100644
+--- a/apps/ministreaming/java/build.xml
++++ b/apps/ministreaming/java/build.xml
+@@ -310,22 +310,12 @@
+         <junit printsummary="withOutAndErr" fork="yes" showoutput="yes" >
+             <sysproperty key="net.sourceforge.cobertura.datafile" file="./cobertura.ser" />
+             <classpath>
+-                <pathelement path="${javac.classpath}" />
+-                <pathelement location="${hamcrest.home}/hamcrest-core.jar" />
+-                <pathelement location="${hamcrest.home}/hamcrest-library.jar" />
+-                <pathelement location="${hamcrest.home}/hamcrest-integration.jar" />
+-                <pathelement location="${hamcrest.home}/hamcrest-all.jar" />
+-                <pathelement location="${mockito.home}/byte-buddy.jar" />
+-                <pathelement location="${mockito.home}/objenesis.jar" />
+-                <pathelement location="${mockito.home}/mockito-core.jar" />
+-                <pathelement location="${junit.home}/junit4.jar" />
++                <pathelement path="${gentoo.classpath}" />
+                 <pathelement location="./build/obj_cobertura" />
+                 <pathelement location="./build/obj" />
+                 <pathelement location="../../../core/java/build/i2ptest.jar" />
+                 <pathelement location="../../../core/java/build/i2p.jar" />
+                 <pathelement location="../../build/jbigi.jar" />
+-                <pathelement location="${with.clover}" />
+-                <pathelement location="${with.cobertura}" />
+             </classpath>
+             <batchtest todir="../../../reports/ministreaming/junit/">
+                 <fileset dir="./test/junit">
+diff --git a/apps/streaming/java/build.xml b/apps/streaming/java/build.xml
+index ecfa0ebfd..395bc5aeb 100644
+--- a/apps/streaming/java/build.xml
++++ b/apps/streaming/java/build.xml
+@@ -126,23 +126,13 @@
+         <junit printsummary="withOutAndErr" fork="yes" showoutput="yes" >
+             <sysproperty key="net.sourceforge.cobertura.datafile" file="./cobertura.ser" />
+             <classpath>
+-                <pathelement path="${javac.classpath}" />
+-                <pathelement location="${hamcrest.home}/hamcrest-core.jar" />
+-                <pathelement location="${hamcrest.home}/hamcrest-library.jar" />
+-                <pathelement location="${hamcrest.home}/hamcrest-integration.jar" />
+-                <pathelement location="${hamcrest.home}/hamcrest-all.jar" />
+-                <pathelement location="${mockito.home}/byte-buddy.jar" />
+-                <pathelement location="${mockito.home}/objenesis.jar" />
+-                <pathelement location="${mockito.home}/mockito-core.jar" />
+-                <pathelement location="${junit.home}/junit4.jar" />
++                <pathelement path="${gentoo.classpath}" />
+                 <pathelement location="./build/obj_cobertura" />
+                 <pathelement location="./build/obj" />
+                 <pathelement location="../../../core/java/build/i2ptest.jar" />
+                 <pathelement location="../../../core/java/build/i2p.jar" />
+                 <pathelement location="../../ministreaming/java/build/mstreaming.jar" />
+                 <pathelement location="../../build/jbigi.jar" />
+-                <pathelement location="${with.clover}" />
+-                <pathelement location="${with.cobertura}" />
+             </classpath>
+             <batchtest todir="../../../reports/streaming/junit/">
+                 <fileset dir="./test/junit">
+diff --git a/core/java/build.xml b/core/java/build.xml
+index 8b36ce5f0..305ddd6ee 100644
+--- a/core/java/build.xml
++++ b/core/java/build.xml
+@@ -469,22 +469,12 @@
+         <junit printsummary="withOutAndErr" fork="yes" maxmemory="384m" showoutput="yes" >
+             <sysproperty key="net.sourceforge.cobertura.datafile" file="./cobertura.ser" />
+             <classpath>
++                <pathelement path="${gentoo.classpath}" />
+                 <pathelement location="../../installer/resources/" />
+-                <pathelement path="${javac.classpath.mod}" />
+-                <pathelement location="${hamcrest.home}/hamcrest-core.jar" />
+-                <pathelement location="${hamcrest.home}/hamcrest-library.jar" />
+-                <pathelement location="${hamcrest.home}/hamcrest-integration.jar" />
+-                <pathelement location="${hamcrest.home}/hamcrest-all.jar" />
+-                <pathelement location="${mockito.home}/byte-buddy.jar" />
+-                <pathelement location="${mockito.home}/objenesis.jar" />
+-                <pathelement location="${mockito.home}/mockito-core.jar" />
+-                <pathelement location="${junit.home}/junit4.jar" />
+                 <pathelement location="./build/obj_cobertura" />
+                 <pathelement location="./build/obj" />
+                 <pathelement location="./test/resources" />
+                 <pathelement location="../../build/jbigi.jar" />
+-                <pathelement location="${with.clover}" />
+-                <pathelement location="${with.cobertura}" />
+             </classpath>
+             <batchtest todir="../../reports/core/junit/">
+                 <fileset dir="./test/junit/">
+diff --git a/router/java/build.xml b/router/java/build.xml
+index 4b0cedf2b..0385926ac 100644
+--- a/router/java/build.xml
++++ b/router/java/build.xml
+@@ -419,18 +419,11 @@
+         <junit printsummary="withOutAndErr" fork="yes" showoutput="yes" >
+             <sysproperty key="net.sourceforge.cobertura.datafile" file="./cobertura.ser" />
+             <classpath>
+-                <pathelement path="${javac.classpath}" />
+-                <pathelement location="${hamcrest.home}/hamcrest-core.jar" />
+-                <pathelement location="${hamcrest.home}/hamcrest-library.jar" />
+-                <pathelement location="${hamcrest.home}/hamcrest-integration.jar" />
+-                <pathelement location="${hamcrest.home}/hamcrest-all.jar" />
+-                <pathelement location="${junit.home}/junit4.jar" />
++                <pathelement path="${gentoo.classpath}" />
+                 <pathelement location="./build/obj_cobertura" />
+                 <pathelement location="./build/obj" />
+                 <pathelement location="../../core/java/build/i2ptest.jar" />
+                 <pathelement location="../../build/jbigi.jar" />
+-                <pathelement location="${with.clover}" />
+-                <pathelement location="${with.cobertura}" />
+             </classpath>
+             <batchtest todir="../../reports/router/junit/">
+                 <fileset dir="./test/junit">
diff --git a/net-vpn/i2p/i2p-2.1.0-r2.ebuild b/net-vpn/i2p/i2p-2.1.0-r2.ebuild
index 2883493999e5..b83e479db886 100644
--- a/net-vpn/i2p/i2p-2.1.0-r2.ebuild
+++ b/net-vpn/i2p/i2p-2.1.0-r2.ebuild
@@ -73,8 +73,8 @@ DOCS=( README.md history.txt )
 
 pkg_pretend() {
 	# see https://bugs.gentoo.org/831290
-	if [[ "`java-config --show-active-vm`" = openjdk*-8 ]] &&
-	   [[ "`java-config --query MERGE_VM --package=ant-core`" != openjdk*-8 ]]
+	if [[ "`java-config --show-active-vm`" = *-8 ]] &&
+	   [[ "`java-config --query MERGE_VM --package=ant-core`" != *-8 ]]
 	then
 		eerror "dev-java/ant-core was emerged with a newer version of the JDK."
 		eerror "It will fail to build with virtual/jdk:1.8 due to #831290."
diff --git a/net-vpn/i2p/i2p-2.2.1.ebuild b/net-vpn/i2p/i2p-2.2.1.ebuild
new file mode 100644
index 000000000000..e665690f55bf
--- /dev/null
+++ b/net-vpn/i2p/i2p-2.2.1.ebuild
@@ -0,0 +1,266 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="test"
+
+inherit java-pkg-2 java-ant-2 systemd toolchain-funcs
+
+DESCRIPTION="A privacy-centric, anonymous network"
+HOMEPAGE="https://geti2p.net"
+SRC_URI="https://files.i2p-projekt.de/${PV}/i2psource_${PV}.tar.bz2"
+
+LICENSE="Apache-2.0 Artistic BSD CC-BY-2.5 CC-BY-3.0 CC-BY-SA-3.0 EPL-1.0 GPL-2 GPL-3 LGPL-2.1 LGPL-3 MIT public-domain WTFPL-2"
+SLOT="0"
+
+KEYWORDS="~amd64 ~x86"
+LANGS=(
+	ar az bg ca cs da de el en es es-AR et fa fi fr gl he hi hr hu id it ja ko ku mg nb nl nn pl pt pt-BR ro ru sk sl sq
+	sr sv tk tr uk vi zh zh-TW
+)
+IUSE="${LANGS[@]/#/l10n_}"
+
+CP_DEPEND="
+	dev-java/bcprov:0
+	dev-java/hashcash:1
+	dev-java/httpcomponents-client:4
+	dev-java/identicon:1
+	dev-java/java-getopt:1
+	dev-java/java-service-wrapper:0
+	dev-java/jbcrypt:0
+	dev-java/json-simple:2.3
+	dev-java/json-smart:1
+	dev-java/jsonrpc2-base:1
+	dev-java/jsonrpc2-server:1
+	dev-java/jstl:0
+	dev-java/jstl-api:0
+	dev-java/minidns-core:1
+	dev-java/zxing-core:3
+	dev-java/zxing-javase:3
+	sys-devel/gettext:0[java]
+	>=www-servers/tomcat-9.0.73:9
+"
+DEPEND="
+	dev-libs/gmp:0=
+	${CP_DEPEND}
+	>=virtual/jdk-1.8:*
+	test? (
+		dev-java/ant-junit4:0
+		dev-java/hamcrest:0
+		dev-java/junit:4
+		dev-java/mockito:4
+	)
+"
+RDEPEND="
+	${CP_DEPEND}
+	acct-user/i2p
+	acct-group/i2p
+	>=virtual/jre-1.8:*
+"
+
+PATCHES=(
+	"${FILESDIR}/${PV}-fix-junit-classpath.patch"
+)
+
+EANT_BUILD_TARGET="preppkg-base"
+# no scala as depending on antlib.xml not installed by dev-lang/scala
+EANT_TEST_TARGET="junit.test"
+JAVA_ANT_ENCODING="UTF-8"
+JAVA_ANT_CLASSPATH_TAGS="javac java"
+# built locally
+EANT_GENTOO_CLASSPATH_EXTRA="${S}/core/java/build/i2p.jar"
+EANT_GENTOO_CLASSPATH_EXTRA+=":${S}/router/java/build/router.jar"
+EANT_GENTOO_CLASSPATH_EXTRA+=":${S}/apps/ministreaming/java/build/mstreaming.jar"
+
+DOCS=( README.md history.txt )
+
+pkg_pretend() {
+	# see https://bugs.gentoo.org/831290
+	if [[ "`java-config --show-active-vm`" = *-8 ]] &&
+	   [[ "`java-config --query MERGE_VM --package=ant-core`" != *-8 ]]
+	then
+		eerror "dev-java/ant-core was emerged with a newer version of the JDK."
+		eerror "It will fail to build with virtual/jdk:1.8 due to #831290."
+		eerror "Please switch to a newer JDK"
+		eerror "  eselect java-vm set system ..."
+		eerror "Or remerge dev-java/ant-core with virtual/jdk:1.8"
+		eerror "  emerge dev-java/ant-core"
+		die 'bad JDK for ant-core'
+	fi
+}
+
+src_prepare() {
+	default # apply PATCHES
+	java-pkg-2_src_prepare
+
+	# add our classpath
+	for f in `find -name build.xml`
+	do
+		java-ant_rewrite-classpath "$f"
+	done
+
+	# remove most bundled
+	# apps/addressbook/java/src/net/metanotion too much code drift
+	# apps/i2psnark/java/src/org/klomp/snark too much code drift
+	# apps/jrobin need rrd4j ebuild
+	# apps/routerconsole/java/src/{com,edu} too much code drift
+	# {core,router}/java/src/com/southernstorm/noise use internal symbols
+	# core/java/src/freenet too much code drift
+	# core/java/src/gnu/crypto too much code drift
+	# router/java/src/com/maxmind changed interface
+	# router/java/src/org/cybergarage unable to find version 3
+	# router/java/src/org/freenetproject too big to pull
+	# router/java/src/org/xlattice changed interface
+	java-pkg_clean ! \
+		-path "./apps/jetty/jetty-distribution-*" # need to package jetty
+	( cat >> override.properties || die 'set unbundled properties' ) <<- EOF
+		require.gettext=true
+		with-libgetopt-java=true
+		with-libjakarta-taglibs-standard-java=true
+		with-libjson-simple-java=true
+		with-libtomcat9-java=true
+		with-gettext-base=true
+		# with-geoip-database=true need std geoip use
+		# with-libjetty9-java=true needs a jetty ebuild
+	EOF
+
+	# bcprov
+	rm -r core/java/src/net/i2p/crypto/elgamal || die 'unbundle bcprov'
+	sed -e 's,net\.i2p\.crypto\.elgamal\.impl,org.bouncycastle.jce.provider,' \
+		-e 's,net\.i2p\.crypto\.elgamal\.spec,org.bouncycastle.jce.spec,' \
+		-i core/java/src/net/i2p/crypto/{provider/I2PProvider,CryptoConstants}.java ||
+		die 'redirect imports of bcprov'
+	# getopt, gettext
+	rm -r core/java/src/gnu/{getopt,gettext} || die 'unbundle GNU code'
+	# httpcomponents-client
+	rm -r core/java/src/net/i2p/apache || die 'unbundle httpcomponents-client'
+	sed -e 's,net\.i2p\.apache,org.apache,' \
+		-i core/java/src/net/i2p/util/{Addresses,I2PSSLSocketFactory}.java \
+		   apps/i2pcontrol/java/net/i2p/i2pcontrol/HostCheckHandler.java ||
+		die 'redirect imports of httpcomponents-client'
+	# identicon, zxing
+	rm -r apps/imagegen/{identicon,zxing} || die 'unbundle identicon & zxing'
+	sed -e '/LICENSE-Identicon.txt/d' -i build.xml &&
+	sed -E '/dir="[^"]*(identicon|zxing)/d' -i apps/imagegen{/imagegen,}/build.xml &&
+	sed -E '/(todir="build\/WEB-INF\/classes"|<\/copy>)/d' -i apps/imagegen/imagegen/build.xml ||
+		die 'do not depend on unbundled'
+	# hashcash
+	rm core/java/src/com/nettgryppa/security/HashCash.java ||
+		die 'unbundle hashcash'
+	# jbcrypt, jsonrpc2-*
+	rm -r apps/i2pcontrol/java/{com,org} || die 'unbundle jbcrypt & jsonrpc2-*'
+	# jstl*
+	sed -E '/"apps\/susidns\/src\/lib\/(jstl|standard).jar"/d' -i build.xml ||
+		die 'unbundle jstl*'
+	# minidns-core, json-simple
+	rm -r core/java/src/org || die 'unbundle minidns-core & json-simple'
+
+	# keep only enabled locales
+	local lang
+	for lang in ${LANGS[@]}
+	do
+		if ! use "l10n_${lang}"
+		then
+			find -regextype egrep \
+					-regex ".*[_\\./]${lang/-/_}.(html|po|1)" \
+				-delete || die "unbundling ${lang} translations"
+		fi
+	done
+
+	# fix some locale names
+	find -name '*_in.*' -exec rename --no-overwrite _in. _id. {} \; &&
+	find -name '*_iw.*' -exec rename --no-overwrite _iw. _he. {} \; ||
+		die 'fix some locale names'
+}
+
+src_configure() {
+	java-ant-2_src_configure
+
+	# deamon shouldn't start GUI
+	sed -i 's|\(clientApp.4.startOnLoad\)=true|\1=false|' \
+		installer/resources/clients.config ||
+		die 'avoid auto starting browser'
+
+	# yep, that's us
+	echo "build.built-by=Gentoo" >> override.properties ||
+		die 'bragging failed'
+}
+
+src_compile() {
+	java-pkg-2_src_compile
+
+	local compile_lib
+	compile_lib() {
+		local name="${1}"
+		local file="${2}"
+		shift 2
+
+		"$(tc-getCC)" "${@}" ${CFLAGS} $(java-pkg_get-jni-cflags) \
+			${LDFLAGS} -shared -fPIC "-Wl,-soname,lib${name}.so" \
+			"${file}" -o "lib${name}.so"
+	}
+
+	cd "${S}/core/c/jbigi/jbigi" || die "unable to cd to jbigi"
+	compile_lib jbigi src/jbigi.c -Iinclude -lgmp ||
+		die "unable to build jbigi"
+
+	if use amd64 || use x86; then
+		cd "${S}/core/c/jcpuid" || die "unable to cd to jcpuid"
+		compile_lib jcpuid src/jcpuid.c -Iinclude ||
+			die "unable to build jcpuid"
+	fi
+}
+
+src_test() {
+	# avoid rebuilding
+	sed -e '/<delete dir=".\/build" \/>/d' -i core/java/build.xml ||
+		die 'avoid building twice'
+
+	# halt on error
+	find -name build.xml \
+		 -execdir sed -e 's/<junit /\0haltonerror="yes" /' -i {} + ||
+		 die 'ensure test failures propagate'
+
+	EANT_GENTOO_CLASSPATH+=",hamcrest,junit-4,mockito-4"
+	java-pkg-2_src_test
+}
+
+src_install() {
+	# install basic documentation
+	einstalldocs
+	doman installer/resources/man/eepget.*
+
+	# install main files
+	java-pkg_doso core/c/jbigi/jbigi/libjbigi.so
+	if use amd64 || use x86; then
+		java-pkg_doso core/c/jcpuid/libjcpuid.so
+	fi
+	cd "${S}/pkg-temp" || die 'unable to change dir to built artifacts'
+	java-pkg_dojar lib/*.jar
+	java-pkg_dowar webapps/*.war
+
+	# install shared
+	insinto /usr/share/i2p
+	doins blocklist.txt hosts.txt {clients,i2p*}.config
+	doins -r certificates docs eepsite geoip scripts
+
+	# install daemons
+	newinitd "${FILESDIR}/i2p.init" i2p
+	systemd_dounit "${FILESDIR}/i2p.service"
+
+	# setup dirs
+	keepdir /var/log/i2p /var/lib/i2p
+	fowners i2p:i2p /var/lib/i2p /var/log/i2p
+
+	# create own launchers
+	java-pkg_dolauncher i2prouter --main net.i2p.router.Router --jar i2p.jar \
+		--pwd "${EPREFIX}/usr/share/i2p" \
+		--java_args "\
+			-Di2p.dir.app=${EPREFIX}/var/lib/i2p/app \
+			-Di2p.dir.config=${EPREFIX}/var/lib/i2p/config \
+			-Di2p.dir.router=${EPREFIX}/var/lib/i2p/router \
+			-Di2p.dir.log=${EPREFIX}/var/log/i2p \
+			-DloggerFilenameOverride=${EPREFIX}/var/log/i2p/router-@"
+	java-pkg_dolauncher eepget --main net.i2p.util.EepGet --jar i2p.jar
+}
diff --git a/net-vpn/i2pd/Manifest b/net-vpn/i2pd/Manifest
index 7dc8f55b17cd..d00be1aeef5a 100644
--- a/net-vpn/i2pd/Manifest
+++ b/net-vpn/i2pd/Manifest
@@ -3,11 +3,9 @@ AUX i2pd-2.38.0-r1.logrotate 294 BLAKE2B 183e9d0a88a3ff4b1116d4f8475862ed110cf2b
 AUX i2pd-2.38.0.service 906 BLAKE2B 583c1856ceada5e60b7f595452afbe3e254616185d641e63f7931ccc972a52123745f72f1fffaf122be6fd3d4dadb311d58f4d639e0d2ba2187bde21f5340d2d SHA512 233722990f5e9934558b05a0aee5e0ef6af9bcd0b5f9c38cb9d1e61ffa37a4d80f403047dc15ec706bc03185d2e1ca27015210b6757a71786ad0bb4b75662981
 AUX i2pd-2.39.0.initd 1437 BLAKE2B 6f4e7b585e2acbabdb58999387954cac0ac5edd8bc7c3cec686f3ecb6e3b7b04a13c1de57ba081da7dee4c35b72bc65f2a1ac3c4dccf3a57c22b24eba248664f SHA512 58f28b38a39e3e7a1bf378e17dad1c0879c641d6c479db887f33e2689dde29f4f2fa1b9d3dc9a6ab03eb35d2e834b5691de2bc7d9c97c9a8523ebea1e9cd637e
 AUX i2pd-2.6.0-r3.confd 322 BLAKE2B 1abce31d300785fe0f42eb0c15bc26f723e99bfe4f3d21ef4d83620c064838d0e27f89f287a97404276490b848bd1372a40b915d4830b7755d801c4bda551099 SHA512 083f4c860d7556bd14f2765b098743c25f996ef16de3982430ff27ac7711051738d48709654441099ea8c755b6d9a6e25b52286f7e8c928d3f39f1207a9517a9
-DIST i2pd-2.43.0.tar.gz 638031 BLAKE2B 5e954fb62198a229fc8de9ca48655a67e8e9a0eabfa7f31dcaaaf42149239565968f16825eb25b202b6a5754938ce82d28cd2631e085dfa358bcd27ced089bd5 SHA512 7247850cd47cccc540346b4a1becc6dba5f40bcb333cd722e9fc59fd8b0beddee700376829d29add05cea6b84bb34303ed37e01914a1a41cf8cd94fe5c826e4a
 DIST i2pd-2.44.0.tar.gz 648523 BLAKE2B f9b29da82c943d070c09ed3ee78ceb7759c015da8a2da19c24cbf2d9841c7869920cbafd6212ada2e285b8b263d1a719220ba9dabb20807ccb78d2576383d167 SHA512 8760fb8a501ee75ede0ec29d3e9f39efec3bc91490810b39ac4879dbc073239e779e179c0f44bc43ba31fa0b786fd652d8b6feda415731e8fc3f4c0781400e1e
 DIST i2pd-2.46.1.tar.gz 644777 BLAKE2B 4973f595a162adb5d26d5c47f5b290476147e7159c6409648a501377a52823d49581f36d620502beaf741086df9f52d543dd1b173690d2ed24b327c53037ced5 SHA512 31fc39cd506775ed1e16ec0ab7dd21cf2a54575ccf797c3edb34b59733ee5d9eeaa34efd86e088040a7ccdb2e13917630e5a6aa4cbe3906786200b42ce763fa9
 DIST i2pd-2.47.0.tar.gz 650284 BLAKE2B 93ba2c43b75384cba009a48f77d8e4677c3603993a94c8843cdec8db41770bf0da41e9e09e8a7defbcdefbb56eb5ea3f069bc512fd612a30806246197c0412fe SHA512 f469115b8c0a2d4e803b09e1a0c670779912915b93822d2a04df7b71e32ec566695f6270c2c6bf615545a7fb474ce1dda2e935e88336d7614829176643e6bbf8
-EBUILD i2pd-2.43.0.ebuild 1968 BLAKE2B 4a0b013b4c63e6d3f9ea56dcd36480f4059439efe29dadb9719352631d798b6ba8157ce4b2fa7e8d8478bbe1f365d576b97ad6eb5bf0b346127f110cdbba8dc7 SHA512 47226ba7afee07f10cc069930c58f80e686351bd7858d2f5d2e8e7f7ef9489eb9ce53250d7857f754fda9701683e48d7af870d51151f8db0eb7d7bef74984322
 EBUILD i2pd-2.44.0.ebuild 1969 BLAKE2B b951608f377f72c7425cf63904823d55445b3c1cb8820083852be59cb6cb6d4b1b0e9d7ff283ec3b741a8911feabbc9a219297f6e75ccbfb4f37808a418a456c SHA512 0e3a09e091140c086a64b9a91f178b342d7aa934dadbe0b7516f5d6ba53966841f42cc3cd1fd7bc960e5d8f196d6c39873fcc22019ea581db924eb0f5e3a05b4
 EBUILD i2pd-2.46.1.ebuild 1968 BLAKE2B 61c9f54682583b7009490642b4321dde59402e3647590c33dff7cbf048f2dd0ceb5360894138a540a7fbb01e82ebe33de8b3db21f14b3a9d102e810fa5f12a72 SHA512 c34ce08e21d4451cd7dcb6a219e0fb6d47193981a03f28ebfd90667b63331091e93aa8a93e9599486827d38d273db76c74e539c478c6e4c3c5ba12b04c147e51
 EBUILD i2pd-2.47.0.ebuild 1969 BLAKE2B 711d650a39ea12cc586c0599edd8d71aad035cd57978be1b6b9bcc73fff62028a334c17893da24888334b8f2ae5bf59fc5ce0ebb6e98f2700f43d579ea1ac651 SHA512 dbac6b8d1abf5626957304666a0cb2849f7b6e027e2bdb4442959677b5a0c93d4b5f40e5a8ab4d118c4e2d40637179023c98d22a05af55bf33addfe23ae76f48
diff --git a/net-vpn/i2pd/i2pd-2.43.0.ebuild b/net-vpn/i2pd/i2pd-2.43.0.ebuild
deleted file mode 100644
index 034085adece1..000000000000
--- a/net-vpn/i2pd/i2pd-2.43.0.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake toolchain-funcs systemd
-
-DESCRIPTION="A C++ daemon for accessing the I2P anonymous network"
-HOMEPAGE="https://github.com/PurpleI2P/i2pd"
-SRC_URI="https://github.com/PurpleI2P/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="cpu_flags_x86_aes cpu_flags_x86_avx i2p-hardening +upnp"
-
-RDEPEND="
-	acct-user/i2pd
-	acct-group/i2pd
-	dev-libs/boost:=
-	dev-libs/openssl:0=[-bindist(-)]
-	sys-libs/zlib
-	upnp? ( net-libs/miniupnpc:= )"
-DEPEND="${RDEPEND}"
-
-CMAKE_USE_DIR="${WORKDIR}/${P}/build"
-
-DOCS=( ../README.md ../contrib/i2pd.conf ../contrib/tunnels.conf )
-
-pkg_pretend() {
-	if use i2p-hardening && ! tc-is-gcc; then
-		die "i2p-hardening requires gcc"
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_AESNI=$(usex cpu_flags_x86_aes ON OFF)
-		-DWITH_HARDENING=$(usex i2p-hardening ON OFF)
-		-DWITH_STATIC=OFF
-		-DWITH_UPNP=$(usex upnp ON OFF)
-		-DWITH_LIBRARY=ON
-		-DWITH_BINARY=ON
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	# config
-	insinto /etc/i2pd
-	doins contrib/i2pd.conf
-	doins contrib/tunnels.conf
-
-	# working directory
-	insinto /var/lib/i2pd
-	doins -r contrib/certificates
-
-	# add /var/lib/i2pd/certificates to CONFIG_PROTECT
-	doenvd "${FILESDIR}/99i2pd"
-
-	# openrc and systemd daemon routines
-	newconfd "${FILESDIR}/i2pd-2.6.0-r3.confd" i2pd
-	newinitd "${FILESDIR}/i2pd-2.39.0.initd" i2pd
-	systemd_newunit "${FILESDIR}/i2pd-2.38.0.service" i2pd.service
-
-	# logrotate
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/i2pd-2.38.0-r1.logrotate" i2pd
-}
-
-pkg_postinst() {
-	if [[ -f ${EROOT}/etc/i2pd/subscriptions.txt ]]; then
-		ewarn
-		ewarn "Configuration of the subscriptions has been moved from"
-		ewarn "subscriptions.txt to i2pd.conf. We recommend updating"
-		ewarn "i2pd.conf accordingly and deleting subscriptions.txt."
-	fi
-}
diff --git a/net-vpn/openvpn/Manifest b/net-vpn/openvpn/Manifest
index f8226eb63a81..5f98fdfb77b2 100644
--- a/net-vpn/openvpn/Manifest
+++ b/net-vpn/openvpn/Manifest
@@ -8,9 +8,9 @@ DIST openvpn-2.5.2.tar.xz 1134644 BLAKE2B 59aa0c540894de4cfb37ad4c3139eb69a35d31
 DIST openvpn-2.5.6.tar.xz 1150352 BLAKE2B 509821eca9d40c5579700e05e560b906ddee5abb0c51a9a210e2e998cdd9606f734d43d3bec8c473cc4f0aaa1e265e7f05202aa606247ebde8844c0243165fac SHA512 f0f0600df013431af804ace70ea86ac064917acdeaad3759b5d5eaa4a8dc3738d6da6df4c16bbb23443e3493487541cb8b10b89f9f0b40a17caa6e6fc46e0adb
 DIST openvpn-2.5.7.tar.xz 1150476 BLAKE2B e8d24a8be8ff97072ef3b76dbec15cd6e7097ebe99f680d759f213cb5643d7b4a29664d2a96e6efe1d6ee858a6d6b3f23c6d12cf74f202fbe8cc48642f18dba6 SHA512 9a3234b479f5bab12b8c3af7691f175f8cd32f2929dd27efc16e96e14dbb8e07421e623869ad5ffc2d7e65f2266817d1583723033f3646b9913b10ec6d014b44
 DIST openvpn-2.6.4.tar.gz 1861178 BLAKE2B 584fc3950732d6a1db417811f6e330a154537207f6c9543ab03b1c1a886a98a0aee7d1649055a9f7944555ae8865602be15fd8e23b67258917f1adebde050099 SHA512 903ac41691c26e8e4ad65c9b6fb5e75db2caf2e4079d3c4cb61a44e51be9991508f53a1dd8b4b863b4ac86088ad1a705d22131df1e25612560c9f4276d8190ec
-EBUILD openvpn-2.5.2-r3.ebuild 5067 BLAKE2B 7ca61e5a61c752370ed98582b50c5fb7f6b74b00e6e74b1236fda5d07dba7ff986a70ebedb0af74ae1544c97140edeb4b838ca59f855daad0ff3a71e943dc338 SHA512 a0748e06e3daad0c9a4fa83301e62ecc4f711644bb060f3e1184e7a70a34776483e87a4543c4f00383a659e1661f286d41fbf0a5eb11362b050149aef4ecb9a2
-EBUILD openvpn-2.5.6-r1.ebuild 5010 BLAKE2B 12650affa79d9cab2c51ebab3e6f9a74bc89e14ec363f51af18af0efd4d63a60da7919c76c679e8e837b9c525fa85c19e41b4cbb1444d3ce197594d78f7843cb SHA512 101cb66f087b34680898c55c6f9a8bfc060fea0e534d930ab6c85f33dab0b5c03322ed5d20dd86c1fc38f613b8c68155bdef70c7f79b0475d198ee5f71a64965
-EBUILD openvpn-2.5.7-r1.ebuild 4951 BLAKE2B 2f4b65fd00e43cedb745be8b0132720df9977dcaa306834e9de81d2cf3bb6f5e3fa6c2b5ed597a9499b9ab2b1fd56e581518e00faf6b1ab03dd7222ba3aa11a5 SHA512 08036e5db1a464d315bc884e9593204c1e680afc3fe101b935601b1ed2fc6991deb17eb27bc020a5c0b154555541c8f45b9d7a7f195655fa183194e76a4f7b43
-EBUILD openvpn-2.6.4.ebuild 4937 BLAKE2B 124e5af932fcdf7683a9cfbd2b2752dfe4901463a18da9cd5efaac2bb135ad6d4b71d71bcdac258dd1b6aca98ec8be906a0c2c8c7114167e751d60c3a3a6f91b SHA512 0bd564408ae320bc5638405f232daa95624e9a412b3e3142e37d34e23dca8a405016507f6cacf1de59bc3a3a7495496805866f85c9e724fef197c6596d5273d0
-EBUILD openvpn-9999.ebuild 5023 BLAKE2B 1bc4b1b06f4b077560265722add77ced9965d1a5339ae24c68e9d803e0e39a22dcaaf1a78e5dce4118296d6902c1d6ef5811e735215794e5cfb944054698cded SHA512 9fc346966a2525685af88963c425c1faaf703fa0e9442dd4360629cf65901df813a6d583ef049894d9ea55835c3f6a482f24f0d16afae300f9081674fc45a4d0
+EBUILD openvpn-2.5.2-r3.ebuild 5061 BLAKE2B 2360507c2122fbb9e8fadd37d8dba9efd9e8b7bb8b03385c4f13e4172ffec07479478fd21451b554f7e4ec304805bff1187d8134007711bb40d9e540c44f982c SHA512 a7c13d05db126a9ab9466b206514dc0381f53bc15aeb020f6c3768c3451b1accbe6d23d2dbfc0d070fb3a377499fb29450d276ba186715f2f461be746e44a9cd
+EBUILD openvpn-2.5.6-r1.ebuild 5004 BLAKE2B 69bdc6ad056408d5e57ea4ad991540f518bcf0afe583b08dbd8f43bf8cf4cf964759b802efc34115f6af8c3960e82526b8f37206df4f03fa7c2bda9ecb8f2f6e SHA512 3012e209740649c7a346b2dfdfc0e976eff88184f653285d6cbd8c45a5fb9a7529d0244440ff3713979d99873c6289dfebe8bf0b0eb57325ff8b67609063dd38
+EBUILD openvpn-2.5.7-r1.ebuild 4945 BLAKE2B efbc503ac6610db5609d1a4681ddd6a3abfe25a72e9a76135d680c28780bf2d674e46bb5b0d8f8bbe9749d1c8b4a0e7a1f439de1c54afbae241591f0da9fba47 SHA512 ee098b58891457411986f9de6ffadcaba30db4dbdf6d72721412a4528e72e8db8f1bfc62a7b1ff45f855610ca8e85a28dd1b6f9858f2dd48677c976697d29d7d
+EBUILD openvpn-2.6.4.ebuild 4949 BLAKE2B 7808a789cb1923b5ecd714acc439c543b3ddfcd292852b32f72cad92f74e84bacf82086a9e42c9c4ee392dd0c1931af612bca59b3377c80fa0d84b53561c95e7 SHA512 3ccf63f9238415e6481e099d9673e93ab293a4a63ac1c6fd89fda5418e540af6c063193121b1287b8f48d3c4c9956971c6899cce37bb4a276db51ae025916e04
+EBUILD openvpn-9999.ebuild 5017 BLAKE2B a589a0adb258030d76e62a1e208cf6d773d2f6c7bd2781b1db1f090a49a0826984fd737a0beaca4b06d8946d38ec462fb3d4b59e28cdd3670d50f736a7105c75 SHA512 27074f3ce34a47a2dc847e5db2e0353fc679d87cba2c63b7a244e25c370f8881f3365ab8c71e8a6afad4730661ed1b2de869e1bc9f54e6cd3b3d6edcf46e7687
 MISC metadata.xml 1216 BLAKE2B c776b53a6590657d9c38f4d27da052d558b3fa706a944d07ff29de7fa6745e1e474a6110056dbe8c19fd03373644347054f8b7b4f2dd9d7171f3bc25ca21fe4f SHA512 1a62049e24f92d5519b1eaefa1649df23a515165e41b87e399170d1e2e140174fee5e8887f7e8589e68301093d1c2b6f76f6868db302ad7de2da911f0df3bb6d
diff --git a/net-vpn/openvpn/openvpn-2.5.2-r3.ebuild b/net-vpn/openvpn/openvpn-2.5.2-r3.ebuild
index de73a33181b3..d2ee032e43ee 100644
--- a/net-vpn/openvpn/openvpn-2.5.2-r3.ebuild
+++ b/net-vpn/openvpn/openvpn-2.5.2-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://build.openvpn.net/downloads/releases/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="GPL-2"
diff --git a/net-vpn/openvpn/openvpn-2.5.6-r1.ebuild b/net-vpn/openvpn/openvpn-2.5.6-r1.ebuild
index 3942cd63a328..526d3ea82657 100644
--- a/net-vpn/openvpn/openvpn-2.5.6-r1.ebuild
+++ b/net-vpn/openvpn/openvpn-2.5.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://build.openvpn.net/downloads/releases/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="GPL-2"
diff --git a/net-vpn/openvpn/openvpn-2.5.7-r1.ebuild b/net-vpn/openvpn/openvpn-2.5.7-r1.ebuild
index 54dbaa5b93e0..f199793df070 100644
--- a/net-vpn/openvpn/openvpn-2.5.7-r1.ebuild
+++ b/net-vpn/openvpn/openvpn-2.5.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://build.openvpn.net/downloads/releases/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="GPL-2"
diff --git a/net-vpn/openvpn/openvpn-2.6.4.ebuild b/net-vpn/openvpn/openvpn-2.6.4.ebuild
index d66acb952bf3..91dab5b17769 100644
--- a/net-vpn/openvpn/openvpn-2.6.4.ebuild
+++ b/net-vpn/openvpn/openvpn-2.6.4.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://build.openvpn.net/downloads/releases/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~loong ~riscv"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/net-vpn/openvpn/openvpn-9999.ebuild b/net-vpn/openvpn/openvpn-9999.ebuild
index 6dc536051832..884ae8c35a63 100644
--- a/net-vpn/openvpn/openvpn-9999.ebuild
+++ b/net-vpn/openvpn/openvpn-9999.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://build.openvpn.net/downloads/releases/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="GPL-2"
diff --git a/net-vpn/ovpn-dco/Manifest b/net-vpn/ovpn-dco/Manifest
index c9242cad7073..aa7bc6019b65 100644
--- a/net-vpn/ovpn-dco/Manifest
+++ b/net-vpn/ovpn-dco/Manifest
@@ -1,4 +1,4 @@
 DIST ovpn-dco-0.2.20230426.tar.gz 70341 BLAKE2B 95d468212a161f13659185d7e96b11afac63a8dd40aaf42a41463927a7f75b1d1ab2388bab5749c0127a07a8bf5d4a5a97626c0d782595f3d0561be4063d931c SHA512 929333fd0668008be77b57b3a0955c260770d91402e02d93a460569b8b17763ebe23eb6159bfefe04fa16fad2672d6a6c76e2f3c2e6b864593bef59ef3cfa29f
-EBUILD ovpn-dco-0.2.20230426.ebuild 1169 BLAKE2B 5c4153b0e951fc2ac4ddcc17cc972f0e637dc88889798d8ee7f1f72b037f5a4804b16a7bc7d7878c60d68af1770ccfa8143271e8b24ec0b5d660759b212a9afe SHA512 e0ecb616f5a785a2bca3407338021abd6796475000506dd98a3a74182f8f314ef6390371e255d75a18da39de57a6b834a41554a74f3abcfbb973fbd9449974c0
-EBUILD ovpn-dco-9999.ebuild 1255 BLAKE2B d47da2277a9391219c283952aa44b6046de3c7d6c26cd339ce61dd14ed1711b702a0445bfcf9f68c5bb728db9d46559a1c48561e8e412ecfafc8fba64916cf50 SHA512 d8fe66c1ef5353cb5078dc81f49445b8ed9a79553c7410cdcf93ea81efba244af6be0473aaeeb159e7e5394d4f269ba96fb77656ba63ae95384624bba5b010ef
+EBUILD ovpn-dco-0.2.20230426.ebuild 1181 BLAKE2B ecd613e57f0fe11af4b10e4fc7c14e1bd72afc7644a604caaf0b2e2a3ec0e76faa0a5576f41967bf9b021f0a1dd2d79f0e3093034bdb3c4133f7bd9a36999335 SHA512 28821df9b74b399fc70ad743fcace8e0b6b28b906cadf033efb91b3e564a0f6815fa6603a84389592029e57d338f32ca000d8df7d416dcdaa6a4365fd5449494
+EBUILD ovpn-dco-9999.ebuild 1249 BLAKE2B d129cbed8ee245cd9b924d573952c5c6782e68202c1611bdeba2a0ae58feb50e57f7a175236c61711e202b4a2fc9dc53f46200afb4bcdde6b93f67aa86b5d041 SHA512 db6f7e7eaf805ec563b97bc778c9a0a23cacb7efae0f2b054e3d405dfe6b76c8c849fc7748a83b970d1f2d09958372ba81b9f50f0487adb652911e1c444cbdf6
 MISC metadata.xml 686 BLAKE2B c667b8740abf00a436a4043878ded6a9420298f21c38af2aef9d6336075df4c56ec3f99fdd71c6d53f2c66947f838af154f3f84258782c623f81b389b6289458 SHA512 d500104d1853b953cc3433e7185db707da162a5322f8e0433ead46211f95aea0a809f30a08d340c942b4844d5f1310873ea6d018112712eb2f3e6a2c59228dae
diff --git a/net-vpn/ovpn-dco/ovpn-dco-0.2.20230426.ebuild b/net-vpn/ovpn-dco/ovpn-dco-0.2.20230426.ebuild
index fb761cca9d7c..052a831943fb 100644
--- a/net-vpn/ovpn-dco/ovpn-dco-0.2.20230426.ebuild
+++ b/net-vpn/ovpn-dco/ovpn-dco-0.2.20230426.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/OpenVPN/ovpn-dco"
 
 if [[ ${PV} != 9999 ]]; then
 	SRC_URI="https://github.com/OpenVPN/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~loong ~riscv"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86"
 else
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/OpenVPN/${PN}.git"
diff --git a/net-vpn/ovpn-dco/ovpn-dco-9999.ebuild b/net-vpn/ovpn-dco/ovpn-dco-9999.ebuild
index 7d1f148dcd20..074eb2f33488 100644
--- a/net-vpn/ovpn-dco/ovpn-dco-9999.ebuild
+++ b/net-vpn/ovpn-dco/ovpn-dco-9999.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/OpenVPN/ovpn-dco"
 
 if [[ ${PV} != 9999 ]]; then
 	SRC_URI="https://github.com/OpenVPN/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 else
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/OpenVPN/${PN}.git"