From f3f72d0d5f1ae9ee74acaa63ccb7a247468e73bf Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Sat, 5 Oct 2024 04:27:10 +0100
Subject: gentoo auto-resync : 05:10:2024 - 04:27:09

---
 net-vpn/Manifest.gz                         | Bin 8071 -> 8074 bytes
 net-vpn/i2p/Manifest                        |   1 -
 net-vpn/i2p/files/fix-junit-classpath.patch | 112 ----------------------------
 3 files changed, 113 deletions(-)
 delete mode 100644 net-vpn/i2p/files/fix-junit-classpath.patch

(limited to 'net-vpn')

diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index fb193bd38bf9..e23f745eaf92 100644
Binary files a/net-vpn/Manifest.gz and b/net-vpn/Manifest.gz differ
diff --git a/net-vpn/i2p/Manifest b/net-vpn/i2p/Manifest
index 43304a594f9d..cad30ea9cbcc 100644
--- a/net-vpn/i2p/Manifest
+++ b/net-vpn/i2p/Manifest
@@ -1,5 +1,4 @@
 AUX 2.6.0-force-gentoo-classpath.patch 14044 BLAKE2B 6d62bad667cb816d0341458545a3339bccbb510d9c82fd3d59921ccacd7101d163273cf1f84b1e27e92e0b4abead50778209b540572fe37dec101b6d2feeed07 SHA512 1b670bc5fd0ad25c6b0d11d857d1a8f59e84aea86551af525852c5f396162b7444988653aff1c2ff43210ae40fa615ee0bd00f6648458e7bf53059f1b61976fb
-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_2.6.0.tar.bz2 33486530 BLAKE2B c9a39f4700c590a4e9e6ba621f24d1b6b181e6e69433493259bd59113231c2023c506419298ae6ed158808c0a45bed91038ab92c96147973ec947a787f91f56c SHA512 fdabd15084d0f66474d70e4786951be31e7a0fb4bf8094cd1a442beebd3c81d5f00d88ddc4b79b79d1494e2ad469c2b8028279e1259cd80a6ba68b6265d1be2e
diff --git a/net-vpn/i2p/files/fix-junit-classpath.patch b/net-vpn/i2p/files/fix-junit-classpath.patch
deleted file mode 100644
index 15a87e2681f6..000000000000
--- a/net-vpn/i2p/files/fix-junit-classpath.patch
+++ /dev/null
@@ -1,112 +0,0 @@
---- 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>
---- 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">
---- 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">
---- 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/">
---- 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">
-- 
cgit v1.2.3