gentoo Easter resync : 12.04.2020

2 files changed, 10 insertions, 13 deletions

diff --git a/net-vpn/i2p/Manifest b/net-vpn/i2p/Manifest
index e31ad06deac8..06e7c711611b 100644
--- a/net-vpn/i2p/Manifest
+++ b/net-vpn/i2p/Manifest
@@ -1,7 +1,7 @@
 AUX i2p.init 394 BLAKE2B 477566594bb2da98e65faf0a54be434d2684b23903f1762db674b9c21e7a1647566441b1974594194ff0e43187869af7c8487062183d9250cba01e4faba20bc1 SHA512 c748ebc130b4d5d0860eaf511f3e844b3c3b1291bcc9fc42ea3d3622b8be4f782c1153645f4d4f8e3374649390c533e3264d24afde0b72fd5bdae88e7da6c754
 AUX i2p.service 253 BLAKE2B 2647a1920083fedf88b351b084d3a4d177393065da3dc7aecbeb09e1afc3373116f972c40db4500f76fe1a983ac24503d9a95ee08917ff7625946e4928449512 SHA512 59639b4f78637e5b03ed67b7e08d21bc873c844b474df3ed9101b34934a4c22aef46db1b66cbdc9aad2438ee84f130230c368a78b5bb1017843f016bba6c30e5
-DIST i2psource_0.9.42.tar.bz2 31523717 BLAKE2B 7f110f282a91fa0de700bfaee95968bb534f6f2c7d097c2d70fc9e6bda3ac583762b6b974b38b5947b15a77f91a8d595c957b35838456280236cd88c25d3d47b SHA512 bf8d83c1b1607f5ecf16d33d16cc760eb982d65ef0f89ebd5c61208a38a23f08f465e04889b8ef1d05df4d02a095d85a80077a5b10253d96023f056d01efacef
 DIST i2psource_0.9.44.tar.bz2 32016076 BLAKE2B 5803935cdebd18af48c4f00232cbbae02979c5ccebb68a4bddeb9cf60b6d02b734b72075ac7f9a57713f48cfd2bc0d14598e35df4ff7cdd590be57c68f5737b4 SHA512 a98129dde7d467e77ee37d16f9add3a0a4e602da84e1133c1b4b787133f185ad834cb1c52857e54946e424bd73a56200e48d6cd96856c87c748f53ca26af922e
-EBUILD i2p-0.9.42.ebuild 6225 BLAKE2B 1191fc6452dab8b179e7a9573fbc014b3f718cf0392113c4d507675198b3102159e0c8b840834ec737430770d7e1c86aa9e01707848436f3fe27e04b1f555bfa SHA512 8b4830fba40964931dce526061db07afc573a8861d69e8f6e16ae28b251eedf500c0216ae37b12572aced63e4771f76f329818e4ecb11853fa5b65ef9ba734ae
+DIST i2psource_0.9.45.tar.bz2 31921025 BLAKE2B 2d37777f77784ff93de4d7442eddf46b9a541902412bf5fb24cf96baba73851cc17d01649a7b4b41a710ccde5690036a890b8f84de00f4c615ed2e23da8fa510 SHA512 d4cf354f0a807d132fae75d4bad3e2e788e1ed03d6f625feb0f1369bb2c9e1a6e2758645acf2017c61dbc47d75e6d834b87455adbead1077f206025686548ae9
 EBUILD i2p-0.9.44-r2.ebuild 6141 BLAKE2B f976651689de16ad75c84d1e649df8569a0b84d12996d196facb220152102165d5a693e8214b500f59237e9385129d2fa47f18b5140e755236ae948e9aa2adf4 SHA512 247a2b2fae9736529e9e4c1424a924da9e1dec822c4a7d7d742a77331730cb5e5b42541ce4a7a0590d0c04049171b96e37cc48b4a547958560500ee2f7683152
+EBUILD i2p-0.9.45.ebuild 6141 BLAKE2B f976651689de16ad75c84d1e649df8569a0b84d12996d196facb220152102165d5a693e8214b500f59237e9385129d2fa47f18b5140e755236ae948e9aa2adf4 SHA512 247a2b2fae9736529e9e4c1424a924da9e1dec822c4a7d7d742a77331730cb5e5b42541ce4a7a0590d0c04049171b96e37cc48b4a547958560500ee2f7683152
 MISC metadata.xml 709 BLAKE2B b429dbd7d8c4c6d7e9f829d77fc30f8bb0147d3a4e252874d5f1f905a45e7b46f380ea7d25f5a52d871545fff4891a80756bc227d61e101c2bcf17f6e72584bb SHA512 e5e3dd0ec86672394b94e5d740c21a014e42c7d3be502a1bac15f809b39fea25e00493cd70f441752e65da253424945e2fb5c7a86c9b31898f4a17d2ad19bafe
diff --git a/net-vpn/i2p/i2p-0.9.42.ebuild b/net-vpn/i2p/i2p-0.9.45.ebuild
index 01cba74bdfbe..8949446a2663 100644
--- a/net-vpn/i2p/i2p-0.9.42.ebuild
+++ b/net-vpn/i2p/i2p-0.9.45.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -55,6 +55,13 @@ 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
 
@@ -105,13 +112,6 @@ src_prepare() {
 		echo "wrapper.java.additional.$((i++))=-D$prop" >> installer/resources/wrapper.config ||
 			die "unable to apply gentoo config"
 	done
-
-	if use test; then
-		# no *streaming as requiring >dev-java/mockito-1.9.5
-		sed -e "/junit\.test.*streaming/d" \
-			-i build.xml ||
-			die "unable to remove ministreaming tests"
-	fi
 }
 
 src_test() {
@@ -161,9 +161,6 @@ src_install() {
 
 	# setup user
 	keepdir /var/lib/i2p
-	keepdir /var/lib/i2p/app
-	keepdir /var/lib/i2p/router
-	keepdir /var/lib/i2p/config
 	fowners i2p:i2p /var/lib/i2p
 }