gentoo auto-resync : 20:05:2023 - 16:18:45

3 files changed, 26 insertions, 30 deletions

diff --git a/net-libs/nativebiginteger/Manifest b/net-libs/nativebiginteger/Manifest
index df31e444f1e6..bc43daa0c598 100644
--- a/net-libs/nativebiginteger/Manifest
+++ b/net-libs/nativebiginteger/Manifest
@@ -1,5 +1,5 @@
 DIST i2psource_1.6.1.tar.bz2 33043548 BLAKE2B dd7394ec596b016e76e9d74ee06c5db12bce50a859b0bd1194b0d3dd30cb1c2b9116abf3fdf9847c0b89b71a2a2b553f999fd29901567ddd5e4462c43d25c866 SHA512 c7c26ce10e159bc1f46b55ad2ef9773f24cb647d2ac01ff6acbb08c7020cb488fd1aeb9bb2d50122d2e87e0606f8fe46d2cc4360fa5df62bb1e9af0ce5e9a52a
-DIST i2psource_1.7.0.tar.bz2 33300522 BLAKE2B dcb83477f6d066b707632f8db44bc811558b0bc52368ce992aaf14d0d21acc1fb9bce1dfa8171fca8cf3819765f0b7993ae4a2566a6f65786cca84c02ea4336a SHA512 a27c448246538f152355ecfdf781e39bf9e57b5d0f7ea139ce06d800ce3eed7fa4e375210e6545da2a75245b45282bc8d8e7453d96729f940c34daa75bdc588f
-EBUILD nativebiginteger-1.6.1.ebuild 1596 BLAKE2B 69828be2350938ec06717c982681d4d99da36961a25943b69dde4afe8b8b06c5a7e47f752f89eee38fd20ff04d951a7ffb319fb268df613d71fb3d80d95fabcc SHA512 1d926ce7ba2253d2bca168740611635731b3fd66e99badf0f65547e96b8c12bd59aa0c646d90f20aed2824167289215fc95c27c24445b825d6cd68add3c50416
-EBUILD nativebiginteger-1.7.0.ebuild 1604 BLAKE2B 3c10352dc60521e303fd3fe27b48c9d3c67bbadb1ed444ad9a289b7f7bedb5945df08b0a822dcba2121fd8d2106c6ee9ceec5e16c47bacd564062b83198db60e SHA512 015cfb0dd0b3fbd15d185a5d68b9d64df6beb6b848837ac6fdd11068c12eb20c532cddb88b174cde83432514728e7c9986d3c4074ff2c327a0ecc3729fcdf182
+DIST i2psource_2.1.0.tar.bz2 32817295 BLAKE2B d37463522143c02e04c96d58578312b536ab5e2842e5647dbe5ba3d5c139329c447f16de7e326ef48ef4c6b3c11631e23300b5327cc31d9da5288240f86c926f SHA512 e8639c2b2869d3c7856b598d4cd3505458ed5cab5dce3570cafdaec3ccd77dbaec35787cccc6782acc75adb423b7baaab724ac3c98e5b91b41cf4c76f3614355
+EBUILD nativebiginteger-1.6.1.ebuild 1550 BLAKE2B ad743caba9b4c19637ddfbd9949658b47f20f289f26baa09cf42f44d67a6e8eba73fb319773bf76ea17ca0c402994bee2273b465e952d6a830624819a30d8530 SHA512 e4e9e39d611d2cd14f7b1b9246b2c3e6c2909fd413c25d2f67d49c313a78fae7994a4388a5cde9887489db3b16fe3325d109a446d0c55cd2dcdef3da177cdb43
+EBUILD nativebiginteger-2.1.0.ebuild 1565 BLAKE2B 7eff967b1dbec9491572c261374432e5204c6ade96410069de5e10cd1f55fb73c41336d343d78e98a71d2ed4bdabbda7c5b6246a6bc82d120bfee9e51fa31642 SHA512 dd70845dd6c3decd9d8b4d7f2f829ee69ec3ec982b15650c7ddcc6de89bd7e67fd282f086109822d1b10c8eb14f768ae28c5beb6552300ea9083299915cf98cb
 MISC metadata.xml 479 BLAKE2B 80b27521b677083a9c64fe4774e24d572341f26135a5dfcd9f5a53f7f784a01b494def960cf9de3354458cc265378283901a9686ffb1c9afadccf20bcc2d6e58 SHA512 98569e6b4e008289ea71b9fab9624a6ead5ac5765dab6bfa8c735802d3b981632c3fa54e4f72db78d35afac9e2b6caedb05ae28b905d6e6881fa7f844363f8e2
diff --git a/net-libs/nativebiginteger/nativebiginteger-1.6.1.ebuild b/net-libs/nativebiginteger/nativebiginteger-1.6.1.ebuild
index 7832660291bb..2a18973b1659 100644
--- a/net-libs/nativebiginteger/nativebiginteger-1.6.1.ebuild
+++ b/net-libs/nativebiginteger/nativebiginteger-1.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2018-2022 Gentoo Authors
+# Copyright 2018-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -23,10 +23,6 @@ RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/i2p-${PV}/core"
 
-PATCHES=(
-	"${FILESDIR}/${P}-asmfix.patch"
-)
-
 src_compile() {
 	local compile_lib
 	compile_lib() {
diff --git a/net-libs/nativebiginteger/nativebiginteger-1.7.0.ebuild b/net-libs/nativebiginteger/nativebiginteger-2.1.0.ebuild
index e378a42d990f..ac10184a706c 100644
--- a/net-libs/nativebiginteger/nativebiginteger-1.7.0.ebuild
+++ b/net-libs/nativebiginteger/nativebiginteger-2.1.0.ebuild
@@ -1,7 +1,9 @@
-# Copyright 2018-2022 Gentoo Authors
+# Copyright 2018-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
+
+JAVA_PKG_IUSE="test"
 
 inherit java-pkg-2 toolchain-funcs
 
@@ -12,20 +14,21 @@ SRC_URI="https://files.i2p-projekt.de/${PV}/i2psource_${PV}.tar.bz2"
 LICENSE="public-domain"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 DEPEND="
 	dev-libs/gmp:0=
-	virtual/jdk:1.8
+	>=virtual/jdk-1.8:*
+"
+RDEPEND="
+	>=virtual/jre-1.8:*
 "
-RDEPEND="${DEPEND}"
 
-S="${WORKDIR}/i2p-${PV}/core"
+S="${WORKDIR}/i2p-${PV}"
 
-PATCHES=(
-	"${FILESDIR}/${P}-asmfix.patch"
-)
+src_prepare() {
+	java-pkg-2_src_prepare
+	java-pkg_clean
+}
 
 src_compile() {
 	local compile_lib
@@ -39,33 +42,30 @@ src_compile() {
 			"${file}" -o "lib${name}.so"
 	}
 
-	cd "${S}/c/jbigi/jbigi" || die "unable to cd to jbigi"
+	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}/c/jcpuid" || die "unable to cd to jcpuid"
+		cd "${S}/core/c/jcpuid" || die "unable to cd to jcpuid"
 		compile_lib jcpuid src/jcpuid.c -Iinclude ||
 			die "unable to build jcpuid"
 	fi
-
-	if use test; then
-		cd "${S}/java/src" || die "unable to cd to java/src"
-		ejavac -encoding UTF-8 net/i2p/util/NativeBigInteger.java ||
-			die "unable to build tests"
-	fi
 }
 
 src_test() {
-	cd "${S}/java/src" || die "unable to cd to java/src"
-	"$(java-config -J)" -Djava.library.path="${S}/c/jbigi/jbigi" net/i2p/util/NativeBigInteger ||
+	cd core/java/src || die "unable to cd to java/src"
+
+	ejavac -encoding UTF-8 net/i2p/util/NativeBigInteger.java ||
+		die "unable to build tests"
+	"$(java-config -J)" -Djava.library.path="${S}/core/c/jbigi/jbigi" net/i2p/util/NativeBigInteger ||
 		die "unable to pass tests"
 }
 
 src_install() {
-	dolib.so c/jbigi/jbigi/libjbigi.so
+	java-pkg_doso core/c/jbigi/jbigi/libjbigi.so
 
 	if use amd64 || use x86; then
-		dolib.so c/jcpuid/libjcpuid.so
+		java-pkg_doso core/c/jcpuid/libjcpuid.so
 	fi
 }