gentoo auto-resync : 18:07:2023 - 19:01:44

8 files changed, 57 insertions, 198 deletions

diff --git a/net-vpn/i2p/Manifest b/net-vpn/i2p/Manifest
index 9b9d110808fc..a5aeaa1f5329 100644
--- a/net-vpn/i2p/Manifest
+++ b/net-vpn/i2p/Manifest
@@ -1,12 +1,8 @@
-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 fix-junit-classpath.patch 6760 BLAKE2B 90791a87b8b726deff7bbda41db657e8f091ce3aa599d3e12453c63c674cdd4123c770cc13454909494d751fe56352e3fc90cd87c12f940e95f1351c62e56741 SHA512 f5355d8361dc8ad0fcce65ef936c4927004d22a71c6ce8ee425ba46a70d251d185d67c73d461c8dcbaa71613f8e22aa40866a38f1ffc0004ee148259745614df
 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 7124 BLAKE2B 7c448a471a9a98f45f2eb83bdb5558e99d322aec2e75807b2ab7c6a3f71acd304c89b89690aa88962bb9bfff97bdbf3376a775abce5cce44a0428e91b0691639 SHA512 0d2a8f1c779bec8e96f03bd34412b8c9d7d71972a1840bbb59cc0b458475243e1fd23ea2f83207bf97c940238361ca8badcfb9e7b354b9574e5042d89a817880
-EBUILD i2p-2.2.1.ebuild 8093 BLAKE2B e01b71f8689a29b774fe731cff764d78139265d86a67474b20c91fa84a4528a75f57d1d13df66fba85846d7b7a90eacfec00683ccae1cbbb87891f0777f91b17 SHA512 66b1719d5cbee96efc85ce597864d6ed61b283819b0a3905dba57187051fd22ca5c069908356d9bff2fbd046803c3630349f19f3b12ea7b2c57630c878140853
-MISC metadata.xml 832 BLAKE2B ecda42c25627405f84f1df24fecf9b117c2dd15c44166eaea65df6924dce67e562a0ba7af83508fe7512d5ee75b23620e59ab7376701178f0cef6c47d42b751f SHA512 effe4661ecc390b6b76984192fcd4124cb29302e5ff4c545447b08ca5fc07ae63efa57d3082487940c64ade864d9c76a55f1bd1a05217808fb733a3a18cb553d
+DIST i2psource_2.3.0.tar.bz2 33379569 BLAKE2B 56002ad57725216730c6a92eed4c4eb569bfe03e4fcbd811577610f8adf212e9db56e6761f5873933d101e513093b61e296871a122a2e2042945c1fe906bc372 SHA512 dc38174683e2388c0e766db71526e98252fc38c52255bd4529684862edfa05ba25204df97cf09a6084f9833507a0d4ea96e112d1138d9c97d2dd582ef98f9301
+EBUILD i2p-2.2.1.ebuild 8087 BLAKE2B a6bdc2e38098d986e38001f2aac783354883de0fca208b5c482dc0155f18d2aca46de9c5c7bad7af16505cd5a9f6607faa0fc6b63ccd22fe63ca96290436ee59 SHA512 548e267aecd0770a5a74f4d2230d2ec1b86e8ac1d3aad7d11ce70c42039bae6284df3c6cad6fb0c44f297608ede7dad8883eae0e8ca39e0bd3d14d6bf659aaa8
+EBUILD i2p-2.3.0.ebuild 8085 BLAKE2B e7de3c44eb6f555104a5b62b44b16eb234b858231a96a2602f74712e03e6feb5a6583c0b1122c18217dc990c466f3905c6989d055a8db7f38b3be84eaee5a5a6 SHA512 d6caf06ec8b74e0dae6bb441a2a284cc53249e4d40f9816d8037f66a80993ed4fb6e87a0eab80ebedc2fe612f3d33199bb2fc4914353312ca71aa40120b09bb0
+MISC metadata.xml 743 BLAKE2B 020f7bd72231ce0cb37929330c1f73be6cd91e5d13f86202c6d5da5b2ced53e2b3df172dcf63fb37ae2028019376422ffa7fc8ad94f206f0996984294f353503 SHA512 c1cd68d0fe33ca5b738973fedf764141d490430afa968b325b4a2bc853e6206c0c1683724ff5e4829ac97482b40490cfb3b14b03711149a84baa1e6ecc27dbee
diff --git a/net-vpn/i2p/files/1.7.0-i2p.init b/net-vpn/i2p/files/1.7.0-i2p.init
deleted file mode 100644
index d59899b899e9..000000000000
--- a/net-vpn/i2p/files/1.7.0-i2p.init
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	need net
-}
-
-readonly WRAPPER_CONF="/usr/share/i2p/wrapper.config"
-
-command=wrapper
-command_args="$WRAPPER_CONF wrapper.syslog.ident=i2p"
-command_background=true
-command_progress=true
-command_user=i2p
-pidfile=/var/run/i2p.pid
-retry='SIGTERM/20 SIGKILL/20'
diff --git a/net-vpn/i2p/files/1.7.0-i2p.service b/net-vpn/i2p/files/1.7.0-i2p.service
deleted file mode 100644
index 87c218075a1c..000000000000
--- a/net-vpn/i2p/files/1.7.0-i2p.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Invisible Internet Project
-After=network.target
-
-[Service]
-User=i2p
-ExecStart=/usr/bin/wrapper /usr/share/i2p/wrapper.config wrapper.syslog.ident=i2p wrapper.logfile=/var/lib/i2p/.i2p/wrapper.log
-
-[Install]
-WantedBy=multi-user.target
diff --git a/net-vpn/i2p/files/2.2.1-fix-junit-classpath.patch b/net-vpn/i2p/files/fix-junit-classpath.patch
index 95211bf9cad0..15a87e2681f6 100644
--- a/net-vpn/i2p/files/2.2.1-fix-junit-classpath.patch
+++ b/net-vpn/i2p/files/fix-junit-classpath.patch
@@ -1,5 +1,3 @@
-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 @@
@@ -11,8 +9,6 @@ index b8d8b24a9..cfcf2d5a1 100644
                  <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 @@
@@ -39,8 +35,6 @@ index 72944b25c..cef8a091f 100644
              </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 @@
@@ -68,8 +62,6 @@ index ecfa0ebfd..395bc5aeb 100644
              </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 @@
@@ -96,8 +88,6 @@ index 8b36ce5f0..305ddd6ee 100644
              </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 @@
diff --git a/net-vpn/i2p/i2p-1.7.0-r1.ebuild b/net-vpn/i2p/i2p-1.7.0-r1.ebuild
deleted file mode 100644
index 16802953f72a..000000000000
--- a/net-vpn/i2p/i2p-1.7.0-r1.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit java-pkg-2 java-ant-2 systemd
-
-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"
-
-# Until the deps reach other arches
-KEYWORDS="amd64 ~arm ~arm64 ~x86"
-IUSE="nls test"
-RESTRICT="!test? ( test )"
-
-# dev-java/ant-core is automatically added due to java-ant-2.eclass
-CP_DEPEND="dev-java/java-service-wrapper:0"
-
-DEPEND="${CP_DEPEND}
-	|| (
-		virtual/jdk:1.8
-		virtual/jdk:11
-	)
-	nls? ( >=sys-devel/gettext-0.19 )
-	test? (
-		dev-java/ant-junit4:0
-		dev-java/hamcrest-core:1.3
-		dev-java/hamcrest-library:1.3
-		dev-java/junit:4
-		dev-java/mockito:4
-	)
-"
-
-RDEPEND="${CP_DEPEND}
-	acct-user/i2p
-	acct-group/i2p
-	net-libs/nativebiginteger:0
-	|| (
-		virtual/jre:1.8
-		virtual/jre:11
-	)
-"
-
-EANT_BUILD_TARGET="pkg"
-# no scala as depending on antlib.xml not installed by dev-lang/scala
-EANT_TEST_TARGET="junit.test"
-JAVA_ANT_ENCODING="UTF-8"
-
-src_prepare() {
-	# as early as possible to allow generic patches to be applied
-	default
-
-	java-ant_rewrite-classpath
-
-	java-pkg-2_src_prepare
-
-	# We're on GNU/Linux, we don't need .exe files
-	echo "noExe=true" > override.properties || die
-	if ! use nls; then
-		echo "require.gettext=false" >> override.properties || die
-	fi
-
-	# avoid auto starting browser
-	sed -i "s|clientApp.4.startOnLoad=true|clientApp.4.startOnLoad=false|" \
-		installer/resources/clients.config || die
-
-	# generate wrapper classpath, keeping the default to be replaced later
-	local classpath="wrapper.java.classpath.1=${EPREFIX}/usr/share/i2p/lib/*\n"
-	classpath+="wrapper.java.classpath.2=$(java-pkg_getjars java-service-wrapper)\n"
-
-	# add generated classpath, hardcode system VM, setting system's conf
-	sed -e "s|\(wrapper\.java\.classpath\.1\)=.*|${classpath}|" \
-		-e "s|\(wrapper\.java\.command\)=.*|\1=/etc/java-config-2/current-system-vm/bin/java|" \
-		-e "s|\(wrapper\.java\.library\.path\.1\)=.*|\1=/usr/$(get_libdir)/java-service-wrapper|" \
-		-e "s|\(wrapper\.java\.library\.path\)\.2=.*|\1.2=${EPREFIX}/usr/share/i2p/lib\n\1.3=/usr/$(get_libdir)|" \
-		-e "s|\(wrapper\.java\.additional\.1=-DloggerFilenameOverride\)=.*|\1=${EPREFIX}/var/log/i2p/router-@|" \
-		-e "s|\(wrapper\.logfile\)=.*|\1=${EPREFIX}/var/log/i2p/wrapper|" \
-		-e "/wrapper\.java\.additional\.2\(\.stripquote\|\)/d" \
-		-i installer/resources/wrapper.config ||
-		die "unable to apply gentoo config"
-	local prop i=2
-	for prop in \
-		"i2p.dir.base=${EPREFIX}/usr/share/i2p" \
-		"i2p.dir.app=${EPREFIX}/var/lib/i2p/app" \
-		"i2p.dir.config=${EPREFIX}/var/lib/i2p/config" \
-		"i2p.dir.router=${EPREFIX}/var/lib/i2p/router" \
-		"i2p.dir.log=${EPREFIX}/var/log/i2p" \
-		"i2p.dir.pid=${EPREFIX}/tmp" \
-		"i2p.dir.temp=${EPREFIX}/tmp"
-	do
-		echo "wrapper.java.additional.$((i++))=-D$prop" >> installer/resources/wrapper.config ||
-			die "unable to apply gentoo config"
-	done
-}
-
-src_test() {
-	# generate test classpath
-	local classpath="$(java-pkg_getjars --build-only junit-4,hamcrest-core-1.3,hamcrest-library-1.3,mockito-4)"
-	EANT_TEST_EXTRA_ARGS="-Djavac.classpath=${classpath}" java-pkg-2_src_test
-}
-
-src_install() {
-	# cd into pkg-temp.
-	cd "${S}/pkg-temp" || die
-
-	# we remove system installed jar and install the others
-	rm lib/wrapper.jar || \
-		die "unable to remove locally built jar already found in system"
-	java-pkg_dojar lib/*.jar
-
-	# create own launcher
-	java-pkg_dolauncher eepget --main net.i2p.util.EepGet --jar i2p.jar
-
-	# Install main files and basic documentation
-	insinto "/usr/share/i2p"
-	doins blocklist.txt hosts.txt *.config
-	dodoc history.txt INSTALL-headless.txt LICENSE.txt
-	doman man/*
-
-	# Install other directories
-	doins -r certificates docs eepsite geoip scripts
-	java-pkg_dowar webapps/*.war
-
-	# Install daemon files
-	newinitd "${FILESDIR}/${PV}-i2p.init" i2p
-	systemd_dounit "${FILESDIR}/${PV}-i2p.service"
-
-	# setup log
-	keepdir /var/log/i2p
-	fowners i2p:i2p /var/log/i2p
-
-	# setup user
-	keepdir /var/lib/i2p
-	fowners i2p:i2p /var/lib/i2p
-}
diff --git a/net-vpn/i2p/i2p-2.2.1.ebuild b/net-vpn/i2p/i2p-2.2.1.ebuild
index 0f1e8acd17e0..8e0ab430ab6b 100644
--- a/net-vpn/i2p/i2p-2.2.1.ebuild
+++ b/net-vpn/i2p/i2p-2.2.1.ebuild
@@ -60,7 +60,7 @@ RDEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}/${PV}-fix-junit-classpath.patch"
+	"${FILESDIR}/fix-junit-classpath.patch"
 )
 
 EANT_BUILD_TARGET="preppkg-base"
diff --git a/net-vpn/i2p/i2p-2.1.0-r2.ebuild b/net-vpn/i2p/i2p-2.3.0.ebuild
index b83e479db886..a52e83d76476 100644
--- a/net-vpn/i2p/i2p-2.1.0-r2.ebuild
+++ b/net-vpn/i2p/i2p-2.3.0.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 JAVA_PKG_IUSE="test"
 
-inherit java-pkg-2 java-ant-2 systemd
+inherit java-pkg-2 java-ant-2 systemd toolchain-funcs
 
 DESCRIPTION="A privacy-centric, anonymous network"
 HOMEPAGE="https://geti2p.net"
@@ -14,7 +14,7 @@ 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"
+KEYWORDS="~amd64 ~arm ~arm64 ~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
@@ -38,11 +38,11 @@ CP_DEPEND="
 	dev-java/minidns-core:1
 	dev-java/zxing-core:3
 	dev-java/zxing-javase:3
-	>=net-libs/nativebiginteger-2.1.0:0
 	sys-devel/gettext:0[java]
-	>=www-servers/tomcat-9.0.73:9
+	www-servers/tomcat:9
 "
 DEPEND="
+	dev-libs/gmp:0=
 	${CP_DEPEND}
 	>=virtual/jdk-1.8:*
 	test? (
@@ -59,6 +59,10 @@ RDEPEND="
 	>=virtual/jre-1.8:*
 "
 
+PATCHES=(
+	"${FILESDIR}/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"
@@ -74,7 +78,7 @@ 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 ]]
+		[[ "`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."
@@ -87,6 +91,7 @@ pkg_pretend() {
 }
 
 src_prepare() {
+	default # apply PATCHES
 	java-pkg-2_src_prepare
 
 	# add our classpath
@@ -132,7 +137,7 @@ src_prepare() {
 	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 ||
+			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'
@@ -170,6 +175,8 @@ src_prepare() {
 }
 
 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 ||
@@ -180,11 +187,41 @@ src_configure() {
 		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
 }
@@ -195,13 +232,18 @@ src_install() {
 	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'
-	# remove merged packages
 	java-pkg_dojar lib/*.jar
-	insinto "/usr/share/i2p"
+	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
-	java-pkg_dowar webapps/*.war
 
 	# install daemons
 	newinitd "${FILESDIR}/i2p.init" i2p
diff --git a/net-vpn/i2p/metadata.xml b/net-vpn/i2p/metadata.xml
index 4897b7bf0281..fa444480afee 100644
--- a/net-vpn/i2p/metadata.xml
+++ b/net-vpn/i2p/metadata.xml
@@ -14,9 +14,6 @@
 		<name>Proxy Maintainers</name>
 	</maintainer>
 	<longdescription>I2P is an anonymous network, exposing a simple layer that applications can use to anonymously and securely send messages to each other.</longdescription>
-	<use>
-		<flag name="nls">Adds Native Language Support using GNU gettext.</flag>
-	</use>
 	<upstream>
 		<remote-id type="github">i2p/i2p.i2p</remote-id>
 	</upstream>