Revert "gentoo auto-resync : 14:06:2023 - 15:13:45"

This reverts commit b9e8f3cc44aed3b6da71c7510c6287bf7bbbc66b.

1 files changed, 0 insertions, 122 deletions

diff --git a/net-vpn/i2p/files/2.2.1-fix-junit-classpath.patch b/net-vpn/i2p/files/2.2.1-fix-junit-classpath.patch
deleted file mode 100644
index 95211bf9cad0..000000000000
--- a/net-vpn/i2p/files/2.2.1-fix-junit-classpath.patch
+++ /dev/null
@@ -1,122 +0,0 @@
-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 @@
-     <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>
-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 @@
-         <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">
-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 @@
-         <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">
-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 @@
-         <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/">
-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 @@
-         <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">