commit: e665cef457fa32eec57a5593185e70a8e1c78e1a
Author: Valérian Rousset <tharvik <AT> users <DOT> noreply <DOT> github
<DOT> com>
AuthorDate: Thu Jul 13 20:42:51 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jul 18 16:31:08 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e665cef4
net-vpn/i2p: rename junit patch
Signed-off-by: Valérian Rousset <tharvik <AT> users.noreply.github.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
...2.1-fix-junit-classpath.patch => fix-junit-classpath.patch} | 10 ----------
net-vpn/i2p/i2p-2.2.1.ebuild | 2 +-
2 files changed, 1 insertion(+), 11 deletions(-)
diff --git a/net-vpn/i2p/files/2.2.1-fix-junit-classpath.patch
b/net-vpn/i2p/files/fix-junit-classpath.patch
similarity index 92%
rename from net-vpn/i2p/files/2.2.1-fix-junit-classpath.patch
rename to net-vpn/i2p/files/fix-junit-classpath.patch
index 95211bf9cad0..15a87e2681f6 100644
--- a/net-vpn/i2p/files/2.2.1-fix-junit-classpath.patch
+++ b/net-vpn/i2p/files/fix-junit-classpath.patch
@@ -1,5 +1,3 @@
-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 @@
@@ -11,8 +9,6 @@ index b8d8b24a9..cfcf2d5a1 100644
<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 @@
@@ -39,8 +35,6 @@ index 72944b25c..cef8a091f 100644
</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 @@
@@ -68,8 +62,6 @@ index ecfa0ebfd..395bc5aeb 100644
</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 @@
@@ -96,8 +88,6 @@ index 8b36ce5f0..305ddd6ee 100644
</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 @@
diff --git a/net-vpn/i2p/i2p-2.2.1.ebuild b/net-vpn/i2p/i2p-2.2.1.ebuild
index 0f1e8acd17e0..8e0ab430ab6b 100644
--- a/net-vpn/i2p/i2p-2.2.1.ebuild
+++ b/net-vpn/i2p/i2p-2.2.1.ebuild
@@ -60,7 +60,7 @@ RDEPEND="
"
PATCHES=(
- "${FILESDIR}/${PV}-fix-junit-classpath.patch"
+ "${FILESDIR}/fix-junit-classpath.patch"
)
EANT_BUILD_TARGET="preppkg-base"