gentoo resync : 28.04.2021

4 files changed, 3 insertions, 342 deletions

diff --git a/net-p2p/freenet/Manifest b/net-p2p/freenet/Manifest
index a07f86e92080..a31c50f61374 100644
--- a/net-p2p/freenet/Manifest
+++ b/net-p2p/freenet/Manifest
@@ -6,12 +6,8 @@ AUX freenet 474 BLAKE2B f50fbfaaaf6a919ac15b078a627eb1b2fbc9e6b6c83e4229ae4032e6
 AUX freenet-0.7.5_p1474-wrapper.conf 949 BLAKE2B 6832683015aff6db0ad2b4116a6b8aea2ca23c1ac38da72ae71ac3a339a2efe69a7bab37911035d82a15d6ff725fb8d481deae42bd1bbaf0ad62119194674354 SHA512 a6d30afc502176a6e0bab480368553c1df50add8fe18b65cede38be752c989125999cbb8bedfd68641623fd4498e19610c16d02fcf9d951da450a9612301cdeb
 AUX freenet.service 271 BLAKE2B 7d47ad525f4bb13e07c50a0bdf19f1ef234d5219e82f426254c316abc4517180c22267a245ca022edf68e615a2865fe0dd08f694ee5ee2ced8c5391b3c5e33ad SHA512 2f3d4ec0ba05eff328e8176cbe130176a82a1bb432599de44ab78ca27e9c96e0eafe0871f12b0165247f941a2e929635a6abe6cd61351b1305c0d0e8cff83d2b
 AUX run.sh-20090501 16217 BLAKE2B 249254104ca2d0a20131a5d6b36a07b14fe6407d1915d75ecf98a617de6e532def710975ff1b2e0b580f7148099cd7f6915d8adc0b15e1f67af4fc4713e0e5af SHA512 ba97f1e370ffb7c9ea109b7d529430581a588d8d7e121ec09865e9e8932f2901477f7f43e7d0b95c7c95c2c42db05870e5d811528f91f78b48b68a539c804e67
-DIST freenet-0.7.5_p1484.zip 5584092 BLAKE2B d5be70eae9ae40134d8aed92e649a50ea5c967b13c84bb327b1429a2b709caf9a37443a5ca3e54df520a775ab4705cd7656d7060b9c29c7af1d894936991f2ee SHA512 126e794972c65e9caaca2baa3724f199e1ad432c92351826222be54ee184ca4076fe1b13394914f60b5449731763e00ccb097639092b4c724e5bca1bb10f5ac2
-DIST freenet-0.7.5_p1486.zip 7804344 BLAKE2B cb04c2be678b2ed7e656781d4aa1b34f16f7dfa7c80d757de4cd6b1269d6e5768b1fae3b39f891a5b13f6e089c8c66606f2ffebbbccfbd70627e5b9fe5b776a1 SHA512 e390c079313f3d2d89577331c1346e9b25a3008fe9a9766f6c281b232fa185af037d6e47ac66d0f1732e46de37797220a51e7e93f010b79300a81888a359bfec
 DIST freenet-0.7.5_p1488.zip 7815529 BLAKE2B a63de0b365abe7fd3a7bdde735127c56d0bf220036932db93392893c21e8714cffa27b76357b9e429e5a915975030470035549c8010e3828bb503eaab5911c62 SHA512 5232d4d18bcf8775832aabee7392d0434cecb07114190ed9cd9bbab08fd693a1ac07f3ffad0835e4c5e3696961a234906cbee79c425e50cd29021b8bb77ef733
 DIST freenet-ant-1.7.1.jar 1327167 BLAKE2B 408ec04ef6be58490bc6be200bd2ae1946aa4e22a9e01c9ef00351316f7ec0e23b055ed0907c16eaf5a60d153d3b96e4c447884df752e13d16520b3360581895 SHA512 2c84378d995fed0630169fffab020bde89c3edb7b3bc1e14e2251ed71be684dc2520fdeed8bae382de362984e25a31dcd59326ef8735f8066166c1e8d98ca408
 DIST seednodes-0.7.5_p1480.zip 24935 BLAKE2B 2a297cb7e429a3db06882b703241d420fd7225192afd500f2ff5a3521b1a53c4d62fc2d5b4c0a6ed4d62fa3cd4da64a42da04459dea81701d98faf36b4642eb8 SHA512 cde40562156627818e3384cb8ca29ac02cc52eb9e02c3b0627d7786b4b7deace79b3a840f61c551a25f4d771190558fb277b3f63a71994c30c7b28a2c2f85497
-EBUILD freenet-0.7.5_p1484.ebuild 4782 BLAKE2B e69759a971aa1ea227b3cdca41e6d6c47fb1b4412906d48547ea57327f902147fbf6414d0662aef8c1094a0f6e7c64eac99df084809afd31dbc2d6d42c1767d4 SHA512 ae3599b00b246c9691cbf81d7df92c41c687d44b596b30d7188d8f298dd1548332883bc44ad684a2e3026f131ec7d9c01b9a477a608d23f0c3b933dfa6d0ff0a
-EBUILD freenet-0.7.5_p1486.ebuild 4768 BLAKE2B 76c84d0a24bc9c13f9887f3a9f9ea4a7e1f39dc544e4c08fd031001b1740992484ad46c500b392ec7f01e32c7c179e0b8d26a4e6bdec25ae9fb8d4493e2c145b SHA512 2fd06deeef1955d65566fbcdc01f29fc73589eb477388e1debfc94baa87376534216f1dd4cf2c81ce38f478a4713eacd70083dbe29e50500a50e45f89a54e71d
-EBUILD freenet-0.7.5_p1488.ebuild 4864 BLAKE2B cba4ead7924ea4f45b6aea06180b79f12902f2f17074592134e881803506d836bc918fafc761885dd82287495a801e3d53d880ae1e2d973ceb1fbf14efd99e1d SHA512 23078224a5b5329d52d6b47545b8a43daed490bed288858b3c4176334c9eada91c3506a19ffc3ed595d61b5fc984f246eedb6f6090028d3a8099677cbc3c4514
+EBUILD freenet-0.7.5_p1488.ebuild 4855 BLAKE2B 12f63a68db156d103f0d2e430181a334ea2cc3ee5d01bb96a9cc6eb60384034e56de49e13bc6eba10a7f2d3193e511ec1b932aaa91f2968da9703a18e3c86aae SHA512 22b76e2e092b303d4188dc906111d7c78fdda5621467888bdf7b628f6d38a3ccf127ad7645857968737fefe01ee34fed2aa24370b4c0b5db542ac9b1e250fe00
 MISC metadata.xml 430 BLAKE2B 330d7821440f7a30d4eeb6c8586cf4de79358d9387d99cd6a3f8fc240d91fa78155dcca40ad3998bb158322c463166de729bd350bf132bb84222287df2d374fc SHA512 54fdbe9930d42e885eed81f57adcec04155e63aa6b4cd538d75094a4016405e9155b717bce464ad40ce16a3aa1c4e6b020913c5900eaed8d7f6f8e5de98e7a64
diff --git a/net-p2p/freenet/freenet-0.7.5_p1484.ebuild b/net-p2p/freenet/freenet-0.7.5_p1484.ebuild
deleted file mode 100644
index 5c39af96e3c3..000000000000
--- a/net-p2p/freenet/freenet-0.7.5_p1484.ebuild
+++ /dev/null
@@ -1,168 +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="+nss 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
-	nss? ( dev-libs/nss )"
-
-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
-	if use nss; then
-		echo "wrapper.java.additional.5=-Dfreenet.jce.use.NSS=true" >> freenet-wrapper.conf || die
-	fi
-	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
-}
diff --git a/net-p2p/freenet/freenet-0.7.5_p1486.ebuild b/net-p2p/freenet/freenet-0.7.5_p1486.ebuild
deleted file mode 100644
index acc6f106e14a..000000000000
--- a/net-p2p/freenet/freenet-0.7.5_p1486.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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="+nss 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
-	nss? ( dev-libs/nss )"
-
-DEPEND="
-	app-arch/unzip
-	>=virtual/jdk-1.8
-	${CDEPEND}
-	test? (
-		dev-java/junit:0
-		dev-java/ant-junit:0
-	)
-	dev-java/ant-core:0"
-
-RDEPEND="
-	>=virtual/jre-1.8
-	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
-	if use nss; then
-		echo "wrapper.java.additional.5=-Dfreenet.jce.use.NSS=true" >> freenet-wrapper.conf || die
-	fi
-	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
-}
diff --git a/net-p2p/freenet/freenet-0.7.5_p1488.ebuild b/net-p2p/freenet/freenet-0.7.5_p1488.ebuild
index d025b7dc6548..19ab5d4372bf 100644
--- a/net-p2p/freenet/freenet-0.7.5_p1488.ebuild
+++ b/net-p2p/freenet/freenet-0.7.5_p1488.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 JAVA_PKG_IUSE="doc source"
 
-inherit eutils java-pkg-2 java-ant-2 multilib systemd
+inherit epatch java-pkg-2 java-ant-2 systemd
 
 DESCRIPTION="An encrypted network without censorship"
 HOMEPAGE="https://freenetproject.org/"