commit:     fe972ed0fd20b6c4313cd502c7a112302df5e810
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Wed Oct 30 17:26:29 2024 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Thu Oct 31 08:17:17 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe972ed0

net-p2p/freenet: drop 0.7.5_p1497-r1

Closes: https://bugs.gentoo.org/918618
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: 
https://github.com/gentoo/gentoo/pull/39160/commits/d21f319fd67b44dd16220b6aa4ac038032e7e8fa
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 net-p2p/freenet/Manifest                           |   5 -
 .../freenet-0.7.5_p1497-ignore-failing-tests.patch |  37 ----
 net-p2p/freenet/freenet-0.7.5_p1497-r1.ebuild      | 229 ---------------------
 3 files changed, 271 deletions(-)

diff --git a/net-p2p/freenet/Manifest b/net-p2p/freenet/Manifest
index 4f5bbef2692e..1e47162dde9c 100644
--- a/net-p2p/freenet/Manifest
+++ b/net-p2p/freenet/Manifest
@@ -1,8 +1,3 @@
-DIST freenet-ant-1.7.1.jar 1327167 BLAKE2B 
408ec04ef6be58490bc6be200bd2ae1946aa4e22a9e01c9ef00351316f7ec0e23b055ed0907c16eaf5a60d153d3b96e4c447884df752e13d16520b3360581895
 SHA512 
2c84378d995fed0630169fffab020bde89c3edb7b3bc1e14e2251ed71be684dc2520fdeed8bae382de362984e25a31dcd59326ef8735f8066166c1e8d98ca408
-DIST freenet-build01497-source.tar.bz2 6387097 BLAKE2B 
1476793b1084bef4c596648f0d83b808da80e5d0ccddaede5c2b41264f70919dc73e7b2a020437da88bc5b6266a3866398d9a1204cf8ebef9d17b5d9a0a697c4
 SHA512 
f9c15ebbd7e04b241de767851254169b4d1f94b66afa910784eb9bf6a22db43d0786bd7323f92fde48b59b0c4f73a75ec64646dcc47e5aa908108fb7fb0712fa
-DIST freenet-build01497-source.tar.bz2.sig 566 BLAKE2B 
fb1d3169942d4a1fd50aadd03011cc8907c5f5784ddfa1a20ecf0956bb8b1e0e2fbd58d93d904edb93c1781bca39a8043e56f6e73a9da927dece905ce4c570e7
 SHA512 
0453a6bb146531bbcdd7c1e249d3d82731400985fad5d38277cb8687fa01fd8b43e7d3164c7c22d2e8605f6e03e125bc767ffcde51b880acedbcdd45f1009ffb
 DIST freenet-build01498-source.tar.bz2 6349168 BLAKE2B 
e42b3b7a89a5b4051ac38512d6beb06ce21d661e9cdb7ae1e2e0f800cea4cac0885281efb589e29800e4fd15578b223dd42c2bfbfe3b0deabd774073eef0a4e8
 SHA512 
6202e6f066c85ae704cb1f5db8b971cfec39dc902b166d5204be87848f9ff338bf964cd694702c6a3bfd08c23533a3658914998cf384ddec367b77c09c6eb808
 DIST freenet-build01498-source.tar.bz2.sig 566 BLAKE2B 
5c7fef3e5272be6ba4d75d5ca62cebe6bf2ebbc3086ad840e26c52b908bc9b7a2d0e3a77e20fbc3774d7a73bc63c710e3e44e681cf675931aa1bd1373c198c7c
 SHA512 
008a13bde022d4db0b8daf2318c91255fc46bb374c884767b29370e4f0e595c7a9ca787a81197bcb2191c9b4f217f8f7ab7a1a9f5f91d51ac06a2a6505aa367e
-DIST freenet-java21.patch 1305 BLAKE2B 
bdffc231afdea89deb171017e7018f09b1b2413f0b7a78da7dfbf0c06dfe96540574d9aa6828cc4b050b8844856870c3d3d002879d9ebef89e0d13bd68b818de
 SHA512 
e6114ad7a1c8993cfefb648789093f089f64b6636fdf53542d96f3ab935a080705aa8e57152d8447c49f1167d756b22b2971e51d0e21e502a8071858a9d404dd
-DIST pebble-3.1.6.jar 318370 BLAKE2B 
c3ea059ebc960764cf32a2390773926f1c4e8b0be3aaee7739adfc9529a30dfd0dab3cec0c7519be991d43eed87025db9b64f230cca0622eba16e0e64371243d
 SHA512 
abbf9f8d5c7e23cb658970f670e4e78e62d12433a6683506f14c9c0334257d0d93089d83348691b033704e661f7c1954859e9630e1d94a461a5acf7f336f88dd
 DIST seednodes-0.7.5_p1480.tar.gz 12364 BLAKE2B 
edb4e2a5c7424b51f0afb8234c7e486d56fe92e9201ab7ed7658366f070225f8def1b5412a31367e434ab4afae393caa16e7bdd7307f1d870607105fd5076638
 SHA512 
a2662a29f5721cd1523eb68b8787b074baec990327207b9ff444c91e644738a610e5216064aef00c62d6aca8ba66b2035a3175f63d45c1e0e8efc816b2a38660

diff --git 
a/net-p2p/freenet/files/freenet-0.7.5_p1497-ignore-failing-tests.patch 
b/net-p2p/freenet/files/freenet-0.7.5_p1497-ignore-failing-tests.patch
deleted file mode 100644
index 452ed82aa782..000000000000
--- a/net-p2p/freenet/files/freenet-0.7.5_p1497-ignore-failing-tests.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-# 1) testGetStringOverridden(freenet.l10n.BaseL10nTest)
-# org.junit.ComparisonFailure: expected:<[O]verridden> but was:<[Not 
o]verridden>
-#         at org.junit.Assert.assertEquals(Assert.java:117)
-#         at org.junit.Assert.assertEquals(Assert.java:146)
-#         at 
freenet.l10n.BaseL10nTest.testGetStringOverridden(BaseL10nTest.java:188)
-# 2) testStrings(freenet.l10n.BaseL10nTest)
-# java.lang.AssertionError: Error in test.unmatchedCloseSubstitution for 
ENGLISH: Starts with /
-#         at org.junit.Assert.fail(Assert.java:89)
-#         at freenet.l10n.BaseL10nTest.testStrings(BaseL10nTest.java:245)
---- a/test/freenet/l10n/BaseL10nTest.java
-+++ b/test/freenet/l10n/BaseL10nTest.java
-@@ -6,6 +6,7 @@ import java.io.File;
- import java.util.Iterator;
- 
- import org.junit.Test;
-+import org.junit.Ignore;
- 
- import freenet.l10n.BaseL10n.LANGUAGE;
- import freenet.support.HTMLNode;
-@@ -181,7 +182,7 @@ public class BaseL10nTest {
-         assertEquals("Sane", value);
-     }
- 
--    @Test
-+    @Test @Ignore
-     public void testGetStringOverridden() {
-         BaseL10n l10n = createTestL10n(LANGUAGE.ENGLISH);
-         String value = l10n.getString("test.override");
-@@ -230,7 +231,7 @@ public class BaseL10nTest {
-         assertEquals("test.nonexistent", value);
-     }
-     
--    @Test
-+    @Test @Ignore
-     public void testStrings() throws Exception {
-         for (LANGUAGE lang : LANGUAGE.values()) {
-             BaseL10n l10n = createL10n(lang);

diff --git a/net-p2p/freenet/freenet-0.7.5_p1497-r1.ebuild 
b/net-p2p/freenet/freenet-0.7.5_p1497-r1.ebuild
deleted file mode 100644
index 09b3d57a5fd1..000000000000
--- a/net-p2p/freenet/freenet-0.7.5_p1497-r1.ebuild
+++ /dev/null
@@ -1,229 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple systemd verify-sig
-
-DESCRIPTION="An encrypted network without censorship"
-HOMEPAGE="https://freenetproject.org/";
-# Currently we bundle a binary version of pebble, see bug #905005
-PEV="3.1.6"
-SRC_URI="https://github.com/hyphanet/fred/releases/download/build0${PV#*p}/freenet-build0${PV#*p}-source.tar.bz2
-       https://github.com/hyphanet/seedrefs/archive/build01480.tar.gz -> 
seednodes-0.7.5_p1480.tar.gz
-       https://github.com/hyphanet/fred/commit/49e1a69445.patch -> 
freenet-java21.patch
-       
https://repo1.maven.org/maven2/io/pebbletemplates/pebble/${PEV}/pebble-${PEV}.jar
-       mirror://gentoo/freenet-ant-1.7.1.jar
-       verify-sig? (
-               
https://github.com/hyphanet/fred/releases/download/build0${PV#*p}/freenet-build0${PV#*p}-source.tar.bz2.sig
-       )"
-S="${WORKDIR}/freenet-build0${PV#*p}"
-
-# 'SPDX-License-Identifier: BSD-3-Clause'
-# needed for pebble is 'BSD' in Gentoo.
-LICENSE="GPL-2+ GPL-2 MIT BSD-2 BSD Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="+nss"
-
-CP_DEPEND="
-       dev-java/bcprov:0
-       dev-java/commons-compress:0
-       dev-java/commons-io:1
-       dev-java/fec:0
-       dev-java/freenet-ext:29
-       dev-java/jbitcollider-core:0
-       dev-java/jna:4
-       dev-java/lzma:0
-       dev-java/lzmajio:0
-       dev-java/mersennetwister:0
-       dev-java/java-service-wrapper:0
-       dev-java/unbescape:0
-"
-
-DEPEND="
-       >=virtual/jdk-1.8:*
-       ${CP_DEPEND}
-       test? (
-               dev-java/hamcrest:0
-               dev-java/mockito:0
-               dev-java/objenesis:0
-               net-libs/NativeThread:0
-       )
-"
-RDEPEND="
-       acct-user/freenet
-       acct-group/freenet
-       >=virtual/jre-1.8:*
-       ${CP_DEPEND}
-       nss? ( dev-libs/nss )
-"
-BDEPEND="
-       app-arch/unzip
-       verify-sig? ( sec-keys/openpgp-keys-freenet )
-"
-PDEPEND="net-libs/NativeThread:0"
-
-DOCS=(
-       AUTHORS
-       CONTRIBUTING.md
-       NEWS.md
-       README.md
-       SECURITY.md
-)
-
-PATCHES=(
-       "${FILESDIR}/freenet-0.7.5_p1497-ignore-failing-tests.patch"
-       "${DISTDIR}/freenet-java21.patch"
-)
-
-JAVA_CLASSPATH_EXTRA="java-service-wrapper"
-# pebble packaging resistant
-JAVA_GENTOO_CLASSPATH_EXTRA="${DISTDIR}/pebble-${PEV}.jar"
-JAVA_RESOURCE_DIRS="res"
-JAVA_SRC_DIR="src"
-JAVA_TEST_GENTOO_CLASSPATH="
-       hamcrest
-       junit-4
-       mockito
-       objenesis
-"
-# Yes, both variables point to the same directory
-# https://github.com/hyphanet/fred/blob/build01497/build.gradle#L169-L173
-JAVA_TEST_RESOURCE_DIRS="test"
-JAVA_TEST_SRC_DIR="test"
-
-VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/freenetproject.org.asc"
-src_unpack() {
-       if use verify-sig; then
-               verify-sig_verify_detached \
-                       "${DISTDIR}"/freenet-build0${PV#*p}-source.tar.bz2 \
-                       "${DISTDIR}"/freenet-build0${PV#*p}-source.tar.bz2.sig
-       fi
-       unpack freenet-build0${PV#*p}-source.tar.bz2
-       unpack seednodes-0.7.5_p1480.tar.gz
-}
-
-src_prepare() {
-       default
-       java-pkg-2_src_prepare
-
-       # Could not get resource : freenet/l10n/freenet.l10n.pt-PT.properties
-       # https://github.com/hyphanet/fred/pull/500
-       mv src/freenet/l10n/freenet.l10n.pt{_,-}PT.properties || die
-
-       # java-pkg-simple wants resources in JAVA_RESOURCE_DIRS
-       mkdir res || die
-       pushd src  > /dev/null || die
-               find -type f \
-                       ! -name '*.java' \
-                       ! -name 'package.html' \
-                       ! -path '*/simulator/readme.txt' \
-                       | xargs cp --parent -t ../res || die
-       popd > /dev/null || die
-
-       mkdir "${JAVA_RESOURCE_DIRS}/META-INF" || die
-       cat > "${JAVA_RESOURCE_DIRS}/META-INF/MANIFEST.MF" <<- EOF || die
-               Add-opens: java.base/java.lang java.base/java.util 
java.base/java.io
-       EOF
-
-       cat "${WORKDIR}"/seedrefs-build01480/* > "${S}"/seednodes.fref
-       cp "${FILESDIR}"/freenet-0.7.5_p1497-wrapper.conf freenet-wrapper.conf 
|| die
-       cp "${FILESDIR}"/run.sh-20090501 run.sh || die
-
-       sed -i -e "s:=/usr/lib:=/usr/$(get_libdir):g" \
-               freenet-wrapper.conf || die "sed failed"
-
-       echo "wrapper.java.classpath.1=/usr/share/freenet/lib/freenet.jar" >> 
freenet-wrapper.conf || die
-       if use nss; then
-               echo "wrapper.java.additional.11=-Dfreenet.jce.use.NSS=true" >> 
freenet-wrapper.conf || die
-       fi
-}
-
-src_compile() {
-       java-pkg-simple_src_compile
-
-       # Moved here because of using JAVA_GENTOO_CLASSPATH which is populated 
by java-pkg_gen-cp.
-       local i=2 pkg jars jar
-       local ifs_original=${IFS}
-       IFS=","
-       for pkg in ${JAVA_GENTOO_CLASSPATH} ; do
-               jars="$(java-pkg_getjars ${pkg})"
-               for jar in ${jars} ; do
-                       echo "wrapper.java.classpath.$((i++))=${jar}" >> 
freenet-wrapper.conf || die
-               done
-       done
-       IFS=${ifs_original}
-       echo "wrapper.java.classpath.$((i++))=/usr/share/freenet/lib/ant.jar" 
>> freenet-wrapper.conf || die
-       echo 
"wrapper.java.library.path.2=/usr/$(get_libdir)/java-service-wrapper" >> 
freenet-wrapper.conf || die
-       echo "wrapper.java.library.path.3=/usr/$(get_libdir)/jna-4" >> 
freenet-wrapper.conf || die
-
-       cp "${DISTDIR}"/freenet-ant-1.7.1.jar lib/ant.jar || die
-}
-
-src_test() {
-       JAVA_TEST_EXTRA_ARGS=(
-               -Djava.library.path="${EPREFIX}/usr/$(get_libdir)/jna-4/"
-               -Djna.nosys=false
-               -Dnetworkaddress.cache.negative.ttl=0
-               -Dnetworkaddress.cache.ttl=0
-               # 
https://github.com/hyphanet/fred/blob/build01497/build.gradle#L194-L196
-               # "test.l10npath_main" reads from the JAR file.
-               -Dtest.l10npath_test="freenet/l10n/"
-               -Dtest.l10npath_main="freenet/l10n/"
-       )
-       local vm_version="$(java-config -g PROVIDES_VERSION)"
-       if ver_test "${vm_version}" -ge 17; then
-               JAVA_TEST_EXTRA_ARGS+=(
-                       --add-opens=java.base/java.io=ALL-UNNAMED
-                       --add-opens=java.base/java.lang=ALL-UNNAMED
-                       --add-opens=java.base/java.util=ALL-UNNAMED
-               )
-       fi
-
-       pushd test > /dev/null || die
-               local JAVA_TEST_RUN_ONLY=$(find * \
-                       -type f  -name "*Test.java" \
-                       )
-               JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}"
-               JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}"
-       popd > /dev/null || die
-       java-pkg-simple_src_test
-}
-
-src_install() {
-       java-pkg-simple_src_install
-
-       java-pkg_newjar "${DISTDIR}"/freenet-ant-1.7.1.jar ant.jar
-
-       doinitd "${FILESDIR}"/freenet
-
-       systemd_dounit "${FILESDIR}"/freenet.service
-
-       insinto /etc
-       doins freenet-wrapper.conf
-       insinto /var/freenet
-       doins run.sh seednodes.fref
-       fperms +x /var/freenet/run.sh
-}
-
-pkg_postinst() {
-       elog " "
-       elog "1. Start freenet with rc-service freenet start."
-       elog "2. Open localhost:8888 in your browser for the web interface."
-       #workaround for previously existing freenet user
-       [[ $(stat --format="%U" /var/freenet) == "freenet" ]] || chown \
-               freenet:freenet /var/freenet
-}
-
-pkg_postrm() {
-       if ! [[ -e /usr/share/freenet/lib/freenet.jar ]] ; then
-               elog " "
-               elog "If you dont want to use freenet any more"
-               elog "and dont want to keep your identity/other stuff"
-               elog "remember to do 'rm -rf /var/freenet' to remove everything"
-       fi
-}

Reply via email to