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

["Thomas Sachau" <tommy@gentoo.org>]

commit:     76e833eff476480f296c1b40ba8ab32a5e34696e
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sun Jan  7 14:59:13 2018 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sun Jan  7 14:59:37 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76e833ef

net-p2p/freenet: Version bump, drop old

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 net-p2p/freenet/Manifest                                |  4 ++--
 ...0.7.5_p1475-r2.ebuild => freenet-0.7.5_p1480.ebuild} | 17 +++++++----------
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/net-p2p/freenet/Manifest b/net-p2p/freenet/Manifest
index 85d613d42f2..f79179c5265 100644
--- a/net-p2p/freenet/Manifest
+++ b/net-p2p/freenet/Manifest
@@ -1,5 +1,5 @@
-DIST freenet-0.7.5_p1475.zip 5009537 BLAKE2B 48fe233c4da4b4a4d115986f827cbc4deb8e533afc217d3e0facb3765ab6b3e067e390847b05c3dbc9852693cdda2090fa957a0aaea75a4c71a583183c46c8d9 SHA512 96376600fb3ff6d2bd6ede426fd05c684b51a0f2ace1f83696b0f63b2e2acd9359d41558a11d954e54031e88a62afe854f6cab7d852756dff76851f075249369
 DIST freenet-0.7.5_p1478.zip 5082260 BLAKE2B 4f08b5eff361b0666647f67152fb9709d35ca6c5996a0ac1e899de16510d2f25afb89c8af150a4f9d0785da25ff5db2e80fc2e851e0c42c763b72952d456bde1 SHA512 4147ef68e9c61a7d90c378cd9a3896933c4b931c31caf95107d1e188b4bf51d187381200d262fc1adaf939be7b0ea0eec9f795a09c897c1d20765325ac5faf03
+DIST freenet-0.7.5_p1480.zip 5099654 BLAKE2B cdbe32e90f61f664c0aff8dea81a68a46ced7ba5aef3068243d99a1b189597dfc4126c6e83c0fd4de547d6d076939c601ed3d3f8ec4fa6d4a5dd5d6ef5322069 SHA512 8e6c11014554cba0591f5f98a6af22660643a2d62c46fb003ec16d1dd3643178300081bef78083d87608c012f232f46f71fdd201d031248bf28e91899f71547e
 DIST freenet-ant-1.7.1.jar 1327167 BLAKE2B 408ec04ef6be58490bc6be200bd2ae1946aa4e22a9e01c9ef00351316f7ec0e23b055ed0907c16eaf5a60d153d3b96e4c447884df752e13d16520b3360581895 SHA512 2c84378d995fed0630169fffab020bde89c3edb7b3bc1e14e2251ed71be684dc2520fdeed8bae382de362984e25a31dcd59326ef8735f8066166c1e8d98ca408
-DIST seednodes-20150812.fref.bz2 11631 BLAKE2B 0aac88c5553a3709393e2d290fcd4eea63ede1738e7ca77ccd4575b8aa0c9f2dcbaea4d149ffd93798374bbb807e0cb8fa5ab070d10a4d6f09a9a419b7c67414 SHA512 3aa2ef00ca058b313032243f03f0f82a4e70f455bbe3dee48f9ce438415711f4415172946a3f958e14a699df69d9d0fa88173ce482c0b3d503da0829418b1d3d
+DIST seednodes-0.7.5_p1480.zip 24935 BLAKE2B 2a297cb7e429a3db06882b703241d420fd7225192afd500f2ff5a3521b1a53c4d62fc2d5b4c0a6ed4d62fa3cd4da64a42da04459dea81701d98faf36b4642eb8 SHA512 cde40562156627818e3384cb8ca29ac02cc52eb9e02c3b0627d7786b4b7deace79b3a840f61c551a25f4d771190558fb277b3f63a71994c30c7b28a2c2f85497
 DIST seednodes-20160521.fref.bz2 13751 BLAKE2B f464eb99fcefd690867246b1a77175230ac1cc9e037f3dc465d56ad70d293df78f990cfd75e6be64c26d77f2bc7bfa0bbdedd9d1720a4afa658ed3c381139eb1 SHA512 3530ac6bf9de886930bb403c2d2ec27102d5dc6904582ee69987e369dbfaf7170aadbc02b95836ff43fef2531fb06087a494b426662cd5529c87316590fd2686

diff --git a/net-p2p/freenet/freenet-0.7.5_p1475-r2.ebuild b/net-p2p/freenet/freenet-0.7.5_p1480.ebuild
similarity index 92%
rename from net-p2p/freenet/freenet-0.7.5_p1475-r2.ebuild
rename to net-p2p/freenet/freenet-0.7.5_p1480.ebuild
index 46fb1bb9cdc..908e1b0cf92 100644
--- a/net-p2p/freenet/freenet-0.7.5_p1475-r2.ebuild
+++ b/net-p2p/freenet/freenet-0.7.5_p1480.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-DATE=20150812
+DATE=20160521
 JAVA_PKG_IUSE="doc source"
 
 inherit eutils java-pkg-2 java-ant-2 multilib systemd user
@@ -12,7 +12,7 @@ DESCRIPTION="An encrypted network without censorship"
 HOMEPAGE="https://freenetproject.org/"
 SRC_URI="
 	https://github.com/${PN}/fred/archive/build0${PV#*p}.zip -> ${P}.zip
-	mirror://gentoo/seednodes-${DATE}.fref.bz2
+	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"
@@ -63,7 +63,7 @@ RESTRICT="test" # they're broken in the last release.
 
 MY_PATCHES=(
 	"${FILESDIR}"/0.7.5_p1321-ext.patch
-	"${FILESDIR}/${PV}-remove-git.patch"
+	"${FILESDIR}/"0.7.5_p1475-remove-git.patch
 )
 
 pkg_setup() {
@@ -79,13 +79,11 @@ pkg_setup() {
 }
 
 src_unpack() {
-	unpack ${P}.zip seednodes-${DATE}.fref.bz2
-
-	# See 603362.
-	# mv "${WORKDIR}"/freenet-fred-* "${S}" || die
+	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
 
@@ -134,8 +132,7 @@ src_install() {
 	insinto /etc
 	doins freenet-wrapper.conf
 	insinto /var/freenet
-	doins run.sh
-	newins "${WORKDIR}"/seednodes-${DATE}.fref seednodes.fref
+	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