gentoo resync : 29.12.2022

2 files changed, 17 insertions, 31 deletions

diff --git a/net-vpn/i2p/Manifest b/net-vpn/i2p/Manifest
index 24e9f89cf5f7..2126bcfb6a7a 100644
--- a/net-vpn/i2p/Manifest
+++ b/net-vpn/i2p/Manifest
@@ -1,7 +1,7 @@
 AUX i2p.init 391 BLAKE2B e62a23021db61ba93adaf1ff9c2f0bb9372cee3921544c9ca498f3472dc64c700a0fb78d2fed9dafc0fa98c97670f67266a2e0f8c594c7c1352d15e1b23d7586 SHA512 12c69b2c5918a23219d84f2c1ded286ced6f78564241372bead318ddcb77876e90c800735f7ed6e92c03f69dfeb990ec43e40efd1e9ee32888b404d1e2e9643a
 AUX i2p.service 253 BLAKE2B 2647a1920083fedf88b351b084d3a4d177393065da3dc7aecbeb09e1afc3373116f972c40db4500f76fe1a983ac24503d9a95ee08917ff7625946e4928449512 SHA512 59639b4f78637e5b03ed67b7e08d21bc873c844b474df3ed9101b34934a4c22aef46db1b66cbdc9aad2438ee84f130230c368a78b5bb1017843f016bba6c30e5
-DIST i2psource_0.9.50.tar.bz2 32409456 BLAKE2B 0c45b48ae6e1957b6c5d828757c70489d260fe15276559e5c366c68c10274b9020b2978bf0674a8628638f41b1e269af0c4d35c20c1f0cee419857c0c803dd82 SHA512 2d6b1d3ed4d32af36d0d3b257dca6fad981e3fa0cd3e45b8227e76e57de092c11ff7c239e879739d330ae809bcf6c71640de32de0c52c54ef8597f0c0e1467ec
 DIST i2psource_1.6.1.tar.bz2 33043548 BLAKE2B dd7394ec596b016e76e9d74ee06c5db12bce50a859b0bd1194b0d3dd30cb1c2b9116abf3fdf9847c0b89b71a2a2b553f999fd29901567ddd5e4462c43d25c866 SHA512 c7c26ce10e159bc1f46b55ad2ef9773f24cb647d2ac01ff6acbb08c7020cb488fd1aeb9bb2d50122d2e87e0606f8fe46d2cc4360fa5df62bb1e9af0ce5e9a52a
-EBUILD i2p-0.9.50.ebuild 4799 BLAKE2B 895096a59bffbff9345f8c8250ad92b5bbe30c58c515bf8be1f2380c1acf2cbd718a51d57a6406e217af969fe1838a7c51f6f517a09cf2c25d717551b92b0306 SHA512 e76c98981e9e17046d30ba626a01a30ed2e5be9335bea79417baac0a618a5c0b70b9e8c6696be30a0f88f38414e36ddfc112dc796a11ed6ccb48850eb34221c5
+DIST i2psource_1.7.0.tar.bz2 33300522 BLAKE2B dcb83477f6d066b707632f8db44bc811558b0bc52368ce992aaf14d0d21acc1fb9bce1dfa8171fca8cf3819765f0b7993ae4a2566a6f65786cca84c02ea4336a SHA512 a27c448246538f152355ecfdf781e39bf9e57b5d0f7ea139ce06d800ce3eed7fa4e375210e6545da2a75245b45282bc8d8e7453d96729f940c34daa75bdc588f
 EBUILD i2p-1.6.1.ebuild 4460 BLAKE2B 787d90534c98d4fb6b399151a71bff687d623080f4b102112c1a86471c2e682f8f182b924237207b5cadc92633bc65ddba9bd261ebff02239d46469606002657 SHA512 18463baab09b5b06bf6077df16c70efd1b67731cb6f7a6e11b9d6be3ff574a3190405528476e23709d7cdc7f372025e1d2109a7be242ce527efffb71ad61feda
+EBUILD i2p-1.7.0.ebuild 4310 BLAKE2B 9fea6d6616647951eec0b18826a6132475f3bf1111106de9bce970989c4ae5e323e4b8519d27b2c65c70a213f6597e628801d3ed812cbd8c338a3ee7116fcf84 SHA512 c8c9ea75c7230d61f3883fa252fc51e1018c6ad30f3814b06bdb2ce4c6a9a2452e640dd62a8e6403100a14e4024f711ac904645ba3d18fae1795bd821f60984a
 MISC metadata.xml 740 BLAKE2B 06a3a1b273cd25dacdedfb1e9dbb1a1ef5c32cf44bb76101ba521ac3b387533c10e111b76182a04e55d50a9bdf7e03f15101db768a63d03c02190c5aebe1f4ac SHA512 b598a77193edf843a205f4fdf22e779b978e26d1b3fcec9adc19e78783bbda15d53c66a55ef0b14fe3c25601f167e5f5f299fa0472ef3620dc46fd47c97ff909
diff --git a/net-vpn/i2p/i2p-0.9.50.ebuild b/net-vpn/i2p/i2p-1.7.0.ebuild
index 3468bcd0dd19..edc82ec59148 100644
--- a/net-vpn/i2p/i2p-0.9.50.ebuild
+++ b/net-vpn/i2p/i2p-1.7.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,40 +7,42 @@ inherit java-pkg-2 java-ant-2 systemd
 
 DESCRIPTION="A privacy-centric, anonymous network"
 HOMEPAGE="https://geti2p.net"
-SRC_URI="https://download.i2p2.de/releases/${PV}/i2psource_${PV}.tar.bz2"
+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 ~x86"
+KEYWORDS="~amd64 ~arm ~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
-	dev-java/tomcat-servlet-api:4.0
-"
+CP_DEPEND="dev-java/java-service-wrapper:0"
 
 DEPEND="${CP_DEPEND}
-	dev-java/eclipse-ecj:*
+	|| (
+		virtual/jdk:1.8
+		virtual/jdk:11
+	)
 	nls? ( >=sys-devel/gettext-0.19 )
-	virtual/jdk:1.8
 	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:0
+		dev-java/mockito:4
 	)
 "
 
 RDEPEND="${CP_DEPEND}
 	acct-user/i2p
 	acct-group/i2p
-	virtual/jre:1.8
 	net-libs/nativebiginteger:0
+	|| (
+		virtual/jre:1.8
+		virtual/jre:11
+	)
 "
 
 EANT_BUILD_TARGET="pkg"
@@ -49,13 +51,6 @@ EANT_TEST_TARGET="junit.test"
 JAVA_ANT_ENCODING="UTF-8"
 
 src_prepare() {
-	if use test; then
-		# no *streaming as requiring >dev-java/mockito-1.9.5
-		sed -e "/streaming.*junit\.test/d" \
-			-i build.xml ||
-			die "unable to remove ministreaming tests"
-	fi
-
 	# as early as possible to allow generic patches to be applied
 	default
 
@@ -109,18 +104,9 @@ src_prepare() {
 }
 
 src_test() {
-	# store built version of jars, overwritten by testing
-	mv "${S}/pkg-temp/lib/"{i2p,router}.jar "${T}" ||
-		die "unable to save jars before tests"
-
 	# generate test classpath
-	local classpath
-	classpath="$(java-pkg_getjars --build-only junit-4,hamcrest-core-1.3,hamcrest-library-1.3,mockito)"
+	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
-
-	# redo work undone by testing
-	mv "${T}/"{i2p,router}.jar "${S}/pkg-temp/lib/" ||
-		die "unable to restore jars after tests"
 }
 
 src_install() {
@@ -128,7 +114,7 @@ src_install() {
 	cd "${S}/pkg-temp" || die
 
 	# we remove system installed jar and install the others
-	rm lib/{javax.servlet,wrapper}.jar || \
+	rm lib/wrapper.jar || \
 		die "unable to remove locally built jar already found in system"
 	java-pkg_dojar lib/*.jar