[gentoo-commits] repo/gentoo:master commit in: net-p2p/freenet/

[Thomas Sachau]

commit:     34b09c77fda8aa68599ff63bba6b0a86435da394
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sun Mar  8 09:57:10 2020 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sun Mar  8 09:58:13 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34b09c77

net-p2p/freenet: Drop old versions, fixes bug 711212

Package-Manager: Portage-2.3.83, Repoman-2.3.20
Signed-off-by: Thomas Sachau <tommy <AT> gentoo.org>

 net-p2p/freenet/Manifest                   |   2 -
 net-p2p/freenet/freenet-0.7.5_p1480.ebuild | 158 ---------------------------
 net-p2p/freenet/freenet-0.7.5_p1483.ebuild | 165 -----------------------------
 3 files changed, 325 deletions(-)

diff --git a/net-p2p/freenet/Manifest b/net-p2p/freenet/Manifest
index db9be6a33f1..16605747907 100644
--- a/net-p2p/freenet/Manifest
+++ b/net-p2p/freenet/Manifest
@@ -1,5 +1,3 @@
-DIST freenet-0.7.5_p1480.zip 5099654 BLAKE2B cdbe32e90f61f664c0aff8dea81a68a46ced7ba5aef3068243d99a1b189597dfc4126c6e83c0fd4de547d6d076939c601ed3d3f8ec4fa6d4a5dd5d6ef5322069 SHA512 8e6c11014554cba0591f5f98a6af22660643a2d62c46fb003ec16d1dd3643178300081bef78083d87608c012f232f46f71fdd201d031248bf28e91899f71547e
-DIST freenet-0.7.5_p1483.zip 5548445 BLAKE2B 275e9d86d5d2aff94c227d774ce8853a0aeefb8963d6365f684e5e9b07ee4ba3779908d35e0b2ca92fc980c4199a1d29be73cce476c9e3d2f237734e4f9a35e7 SHA512 6c959c0ece7faaa07cd3c228cd2de7c15063ccd30f91b45b180d4d79e0060c5c156470d03eb421418ccd207931f9737e1a63b8be639b348cb0d15dacca89e4cc
 DIST freenet-0.7.5_p1484.zip 5584092 BLAKE2B d5be70eae9ae40134d8aed92e649a50ea5c967b13c84bb327b1429a2b709caf9a37443a5ca3e54df520a775ab4705cd7656d7060b9c29c7af1d894936991f2ee SHA512 126e794972c65e9caaca2baa3724f199e1ad432c92351826222be54ee184ca4076fe1b13394914f60b5449731763e00ccb097639092b4c724e5bca1bb10f5ac2
 DIST freenet-ant-1.7.1.jar 1327167 BLAKE2B 408ec04ef6be58490bc6be200bd2ae1946aa4e22a9e01c9ef00351316f7ec0e23b055ed0907c16eaf5a60d153d3b96e4c447884df752e13d16520b3360581895 SHA512 2c84378d995fed0630169fffab020bde89c3edb7b3bc1e14e2251ed71be684dc2520fdeed8bae382de362984e25a31dcd59326ef8735f8066166c1e8d98ca408
 DIST seednodes-0.7.5_p1480.zip 24935 BLAKE2B 2a297cb7e429a3db06882b703241d420fd7225192afd500f2ff5a3521b1a53c4d62fc2d5b4c0a6ed4d62fa3cd4da64a42da04459dea81701d98faf36b4642eb8 SHA512 cde40562156627818e3384cb8ca29ac02cc52eb9e02c3b0627d7786b4b7deace79b3a840f61c551a25f4d771190558fb277b3f63a71994c30c7b28a2c2f85497

diff --git a/net-p2p/freenet/freenet-0.7.5_p1480.ebuild b/net-p2p/freenet/freenet-0.7.5_p1480.ebuild
deleted file mode 100644
index 908e1b0cf92..00000000000
--- a/net-p2p/freenet/freenet-0.7.5_p1480.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DATE=20160521
-JAVA_PKG_IUSE="doc source"
-
-inherit eutils java-pkg-2 java-ant-2 multilib systemd user
-
-DESCRIPTION="An encrypted network without censorship"
-HOMEPAGE="https://freenetproject.org/"
-SRC_URI="
-	https://github.com/${PN}/fred/archive/build0${PV#*p}.zip -> ${P}.zip
-	https://github.com/${PN}/seedrefs/archive/build0${PV#*p}.zip -> seednodes-${PV}.zip
-	mirror://gentoo/freenet-ant-1.7.1.jar"
-
-LICENSE="GPL-2+ GPL-2 MIT BSD-2 Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-CDEPEND="dev-java/bcprov:1.54
-	dev-java/commons-compress:0
-	dev-java/fec:0
-	dev-java/java-service-wrapper:0
-	dev-java/jbitcollider-core:0
-	dev-java/lzma:0
-	dev-java/lzmajio:0
-	dev-java/mersennetwister:0"
-
-DEPEND="
-	app-arch/unzip
-	>=virtual/jdk-1.7
-	${CDEPEND}
-	test? (
-		dev-java/junit:0
-		dev-java/ant-junit:0
-	)
-	dev-java/ant-core:0"
-
-RDEPEND="
-	>=virtual/jre-1.7
-	net-libs/nativebiginteger:0
-	${CDEPEND}"
-
-PDEPEND="net-libs/NativeThread:0"
-
-JAVA_PKG_BSFIX_NAME+=" build-clean.xml"
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-JAVA_ANT_CLASSPATH_TAGS+=" javadoc"
-JAVA_ANT_ENCODING="utf8"
-
-EANT_BUILD_TARGET="package"
-EANT_TEST_TARGET="unit"
-EANT_BUILD_XML="build-clean.xml"
-EANT_GENTOO_CLASSPATH="bcprov-1.54,commons-compress,fec,java-service-wrapper,jbitcollider-core,lzma,lzmajio,mersennetwister"
-EANT_EXTRA_ARGS="-Dsuppress.gjs=true -Dlib.contrib.present=true -Dlib.bouncycastle.present=true -Dlib.junit.present=true -Dtest.skip=true"
-
-S="${WORKDIR}/fred-build0${PV#*p}"
-
-RESTRICT="test" # they're broken in the last release.
-
-MY_PATCHES=(
-	"${FILESDIR}"/0.7.5_p1321-ext.patch
-	"${FILESDIR}/"0.7.5_p1475-remove-git.patch
-)
-
-pkg_setup() {
-	has_version dev-java/icedtea[cacao] && {
-		ewarn "dev-java/icedtea was built with cacao USE flag."
-		ewarn "freenet may compile with it, but it will refuse to run."
-		ewarn "Please remerge dev-java/icedtea without cacao USE flag,"
-		ewarn "if you plan to use it for running freenet."
-	}
-	java-pkg-2_pkg_setup
-	enewgroup freenet
-	enewuser freenet -1 -1 /var/freenet freenet
-}
-
-src_unpack() {
-	unpack ${P}.zip seednodes-${PV}.zip
-}
-
-java_prepare() {
-	cat "${WORKDIR}"/seedrefs-build0${PV#*p}/* > "${S}"/seednodes.fref
-	cp "${FILESDIR}"/freenet-0.7.5_p1474-wrapper.conf freenet-wrapper.conf || die
-	cp "${FILESDIR}"/run.sh-20090501 run.sh || die
-
-	epatch "${MY_PATCHES[@]}"
-
-	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
-
-	local i=2 pkg jars jar
-	local ifs_original=${IFS}
-	IFS=","
-	for pkg in ${EANT_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
-
-	cp "${DISTDIR}"/freenet-ant-1.7.1.jar lib/ant.jar || die
-}
-
-EANT_TEST_EXTRA_ARGS="-Dtest.skip=false"
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_dojar dist/freenet.jar
-	java-pkg_newjar "${DISTDIR}"/freenet-ant-1.7.1.jar ant.jar
-
-	if has_version =sys-apps/baselayout-2*; then
-		doinitd "${FILESDIR}"/freenet
-	else
-		newinitd "${FILESDIR}"/freenet.old freenet
-	fi
-
-	systemd_dounit "${FILESDIR}"/freenet.service
-
-	dodoc AUTHORS
-	newdoc README.md README
-	insinto /etc
-	doins freenet-wrapper.conf
-	insinto /var/freenet
-	doins run.sh seednodes.fref
-	fperms +x /var/freenet/run.sh
-	dosym java-service-wrapper/libwrapper.so /usr/$(get_libdir)/libwrapper.so
-	use doc && java-pkg_dojavadoc javadoc
-	use source && java-pkg_dosrc src
-}
-
-pkg_postinst() {
-	elog " "
-	elog "1. Start freenet with /etc/init.d/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
-}

diff --git a/net-p2p/freenet/freenet-0.7.5_p1483.ebuild b/net-p2p/freenet/freenet-0.7.5_p1483.ebuild
deleted file mode 100644
index 104ad58ab19..00000000000
--- a/net-p2p/freenet/freenet-0.7.5_p1483.ebuild
+++ /dev/null
@@ -1,165 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DATE=20160521
-JAVA_PKG_IUSE="doc source"
-
-inherit eutils java-pkg-2 java-ant-2 multilib systemd user
-
-DESCRIPTION="An encrypted network without censorship"
-HOMEPAGE="https://freenetproject.org/"
-#	https://github.com/${PN}/seedrefs/archive/build0${PV#*p}.zip -> seednodes-${PV}.zip
-SRC_URI="
-	https://github.com/${PN}/fred/archive/build0${PV#*p}.zip -> ${P}.zip
-	https://github.com/${PN}/seedrefs/archive/build01480.zip -> seednodes-0.7.5_p1480.zip
-	mirror://gentoo/freenet-ant-1.7.1.jar"
-
-LICENSE="GPL-2+ GPL-2 MIT BSD-2 Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-CDEPEND="dev-java/bcprov:1.54
-	dev-java/commons-compress:0
-	dev-java/fec:0
-	dev-java/java-service-wrapper:0
-	dev-java/jbitcollider-core:0
-	dev-java/jna:0
-	dev-java/lzma:0
-	dev-java/lzmajio:0
-	dev-java/mersennetwister:0"
-
-DEPEND="
-	app-arch/unzip
-	>=virtual/jdk-1.7
-	${CDEPEND}
-	test? (
-		dev-java/junit:0
-		dev-java/ant-junit:0
-	)
-	dev-java/ant-core:0"
-
-RDEPEND="
-	>=virtual/jre-1.7
-	net-libs/nativebiginteger:0
-	${CDEPEND}"
-
-PDEPEND="net-libs/NativeThread:0"
-
-JAVA_PKG_BSFIX_NAME+=" build-clean.xml"
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-JAVA_ANT_CLASSPATH_TAGS+=" javadoc"
-JAVA_ANT_ENCODING="utf8"
-
-EANT_BUILD_TARGET="package"
-EANT_TEST_TARGET="unit"
-EANT_BUILD_XML="build-clean.xml"
-EANT_GENTOO_CLASSPATH="bcprov-1.54,commons-compress,fec,java-service-wrapper,jbitcollider-core,jna,lzma,lzmajio,mersennetwister"
-EANT_EXTRA_ARGS="-Dsuppress.gjs=true -Dlib.contrib.present=true -Dlib.bouncycastle.present=true -Dlib.junit.present=true -Dtest.skip=true"
-
-S="${WORKDIR}/fred-build0${PV#*p}"
-
-RESTRICT="test" # they're broken in the last release.
-
-MY_PATCHES=(
-	"${FILESDIR}"/0.7.5_p1483-ext.patch
-	"${FILESDIR}/"0.7.5_p1475-remove-git.patch
-)
-
-pkg_setup() {
-	has_version dev-java/icedtea[cacao] && {
-		ewarn "dev-java/icedtea was built with cacao USE flag."
-		ewarn "freenet may compile with it, but it will refuse to run."
-		ewarn "Please remerge dev-java/icedtea without cacao USE flag,"
-		ewarn "if you plan to use it for running freenet."
-	}
-	java-pkg-2_pkg_setup
-	enewgroup freenet
-	enewuser freenet -1 -1 /var/freenet freenet
-}
-
-src_unpack() {
-#	unpack ${P}.zip seednodes-${PV}.zip
-	unpack ${P}.zip seednodes-0.7.5_p1480.zip
-}
-
-src_prepare() {
-#	cat "${WORKDIR}"/seedrefs-build0${PV#*p}/* > "${S}"/seednodes.fref
-	cat "${WORKDIR}"/seedrefs-build01480/* > "${S}"/seednodes.fref
-	cp "${FILESDIR}"/freenet-0.7.5_p1474-wrapper.conf freenet-wrapper.conf || die
-	cp "${FILESDIR}"/run.sh-20090501 run.sh || die
-	cp "${FILESDIR}"/build-clean.xml build-clean.xml || die
-	cp "${FILESDIR}"/build.properties build.properties || die
-
-	epatch "${MY_PATCHES[@]}"
-
-	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
-
-	local i=2 pkg jars jar
-	local ifs_original=${IFS}
-	IFS=","
-	for pkg in ${EANT_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
-
-	cp "${DISTDIR}"/freenet-ant-1.7.1.jar lib/ant.jar || die
-	eapply_user
-}
-
-EANT_TEST_EXTRA_ARGS="-Dtest.skip=false"
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_dojar dist/freenet.jar
-	java-pkg_newjar "${DISTDIR}"/freenet-ant-1.7.1.jar ant.jar
-
-	if has_version =sys-apps/baselayout-2*; then
-		doinitd "${FILESDIR}"/freenet
-	else
-		newinitd "${FILESDIR}"/freenet.old freenet
-	fi
-
-	systemd_dounit "${FILESDIR}"/freenet.service
-
-	dodoc AUTHORS
-	newdoc README.md README
-	insinto /etc
-	doins freenet-wrapper.conf
-	insinto /var/freenet
-	doins run.sh seednodes.fref
-	fperms +x /var/freenet/run.sh
-	dosym java-service-wrapper/libwrapper.so /usr/$(get_libdir)/libwrapper.so
-	use doc && java-pkg_dojavadoc javadoc
-	use source && java-pkg_dosrc src
-}
-
-pkg_postinst() {
-	elog " "
-	elog "1. Start freenet with /etc/init.d/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
-}