gentoo resync : 07.01.2018

5 files changed, 16 insertions, 19 deletions

diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz
index b90c50d58a32..0281df6959a1 100644
--- a/net-p2p/Manifest.gz
+++ b/net-p2p/Manifest.gz
diff --git a/net-p2p/freenet/Manifest b/net-p2p/freenet/Manifest
index 5f6963b94545..472f4fc7c86c 100644
--- a/net-p2p/freenet/Manifest
+++ b/net-p2p/freenet/Manifest
@@ -4,12 +4,12 @@ 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_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
-EBUILD freenet-0.7.5_p1475-r2.ebuild 4298 BLAKE2B c0fe5de0fbffbb6ead79e94638d6f0e47104920da7109d5c292187a9f9c6e58a997c877169236df2fe34786df6a628283a0de77f4be4f4895a8cc5f4665345f1 SHA512 4710455e7f12a37f54b367b843f1758450a8e84a266771eb7288f183e347ecfc7424c8dfd0a40f3af0fd2cc0d27a53ebdf43553a7cc84eaeb4898190990d5233
 EBUILD freenet-0.7.5_p1478-r1.ebuild 4240 BLAKE2B b42422f22a2d862f259347306781b4023b7cb7add0b10294288eea3ca8a95b86e1a5d0d05a125c87530e1c06f943d7571aae9686d30a197e6845357623e4980c SHA512 3329c581704206df82e1a823947a4f64b6a3f347acc3908376e3055ba0bb684e64e70bf521788297def4918a759502e6220df3bfaa4e526dca837544903fad1a
 EBUILD freenet-0.7.5_p1478.ebuild 4240 BLAKE2B b42422f22a2d862f259347306781b4023b7cb7add0b10294288eea3ca8a95b86e1a5d0d05a125c87530e1c06f943d7571aae9686d30a197e6845357623e4980c SHA512 3329c581704206df82e1a823947a4f64b6a3f347acc3908376e3055ba0bb684e64e70bf521788297def4918a759502e6220df3bfaa4e526dca837544903fad1a
+EBUILD freenet-0.7.5_p1480.ebuild 4298 BLAKE2B 2f01470434fbc26103814728c6a0614227e1fd39a3a5fba273eec0970da749a08056e81805b2346280154adfa9cfe81891c3c6dea9e5734db14aa8cc25d73c9b SHA512 353064278dc061132a7d48037ae74fa53d129f40d79372e8f5cbf5ad4d91401d1d8062ea16d7710317a06988637efdfca4ad1b79c341b8a75a7a4ae1d790bd12
 MISC metadata.xml 333 BLAKE2B a43991a83e4f80ef55bf5e3858670d45bddfb5a1168a638124642260dc4c498430a6f5892a47d68af14fe3b63968d71561b92b1b31507d04770269d352843e21 SHA512 73b9b7fc476aba6342a92820a2a4d200735370173f10fd93521daa89c711d9152006dbb00aa1f513558cf0fb7e33ca97f7442ddce4a7bcc58c8a3ec8a08403c8
diff --git a/net-p2p/freenet/freenet-0.7.5_p1475-r2.ebuild b/net-p2p/freenet/freenet-0.7.5_p1480.ebuild
index 46fb1bb9cdc3..908e1b0cf928 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
diff --git a/net-p2p/go-ipfs-bin/Manifest b/net-p2p/go-ipfs-bin/Manifest
index cb6dfa8f906d..9f0fc191d9c4 100644
--- a/net-p2p/go-ipfs-bin/Manifest
+++ b/net-p2p/go-ipfs-bin/Manifest
@@ -4,7 +4,8 @@ DIST go-ipfs_v0.4.12_linux-386.tar.gz 10093462 BLAKE2B 2cb0197f84badab6f21c505ac
 DIST go-ipfs_v0.4.12_linux-amd64.tar.gz 12640731 BLAKE2B 85468f3703c0b4b703642a7f7c1fc2282bfe4ce7541bda80d7ac0bf7facd23552354c72d7f96fb0c63fa04c1fae6c07eef617785464562b51828f47779eb0c4e SHA512 6fef8d9cb0660cb4ecb9cb0148a5a9ee69d2d5ddbf903961e8097d4c2e45af468885fa2060f378b9abf826da7e0cc0fa375639f25c11fe623ea43949907e06dd
 DIST go-ipfs_v0.4.13_linux-386.tar.gz 10092376 BLAKE2B 244d964402162d6de667e8c8b51a8a05f230916dc6048b5fd9b71b9776f26e775791eb80c3e02c7c6e730bf77fa6828cc7067e6070877e716d7e63439f481e36 SHA512 4d0c54e094a0566be8dec1dae5f99264dcf039d92a6f757b6e95b98b1d60f35d6a226a130b02ff2be74875f8d6e283e8535666a011b6c940b91f0fe0c03b8d24
 DIST go-ipfs_v0.4.13_linux-amd64.tar.gz 12635297 BLAKE2B 984dc455668fc9c5cd3b301978b0639f1c2dcb22e6091d351d6ff021aca427ae06801ab814eb497ce6b597f8fcdbcdd7f8764334220ae1dcacda4ce2d9a314ae SHA512 b1c8a8ed5f9857f421dd1dc082492a39dc517b6306184762b3161af0c81f22d9e17720a4a459e94f369a6c0664da37f0516b1cea07ca742d9dd4305537e416b2
+DIST go-ipfs_v0.4.13_linux-arm.tar.gz 9925178 BLAKE2B 735534b278838a9ea25a6d379ffa6834c2710c61901870924f60fd6849b6320271dc5af263e58140096f3dff1d0d50a8f1835364889cd4e1b3a16383ec2b5599 SHA512 2152c4d132ab753c50fc8c5f3726066d5f0d490db02f2dc344c2414cd3ea93daa88f75d38e92a33aa036fa49ac97e615320a690d7680f6a3c86604a6cd0f00cb
 EBUILD go-ipfs-bin-0.4.11.ebuild 654 BLAKE2B fa493a38a4ee96df8ce107ed0983b364a8f7dd187a88312c43376b280d5f5a77dfcacebc41b4f511f81bc40f1165a42b84bca3dde17b6326051a6de4bf0d115a SHA512 98ab288e3142f445de02e967608468c59979c9e437d52090059f0e08586aae5ab12ba178e999b67e56e71b4fd636f53c784925076f0916bdb04bdfa531cce650
 EBUILD go-ipfs-bin-0.4.12.ebuild 654 BLAKE2B fa493a38a4ee96df8ce107ed0983b364a8f7dd187a88312c43376b280d5f5a77dfcacebc41b4f511f81bc40f1165a42b84bca3dde17b6326051a6de4bf0d115a SHA512 98ab288e3142f445de02e967608468c59979c9e437d52090059f0e08586aae5ab12ba178e999b67e56e71b4fd636f53c784925076f0916bdb04bdfa531cce650
-EBUILD go-ipfs-bin-0.4.13.ebuild 654 BLAKE2B fa493a38a4ee96df8ce107ed0983b364a8f7dd187a88312c43376b280d5f5a77dfcacebc41b4f511f81bc40f1165a42b84bca3dde17b6326051a6de4bf0d115a SHA512 98ab288e3142f445de02e967608468c59979c9e437d52090059f0e08586aae5ab12ba178e999b67e56e71b4fd636f53c784925076f0916bdb04bdfa531cce650
+EBUILD go-ipfs-bin-0.4.13.ebuild 633 BLAKE2B 659a70b31522bd778aa31b41dd96226062b1dc9e05c8a5066450b7e2f43a5146255a161c52cbdac7e8d710899995da3b09930a2bf9434689355186f1c27f1010 SHA512 26d66ff0966654eb1259f97da7511725e64799e31a38a4b2c5b9cd984de974c3a2f596ee507d5666cb91f887f859b6ba9d63f09b8e7d8dab663042f139344904
 MISC metadata.xml 606 BLAKE2B a6db8a5d8f57434206cbe3a8d69a3734381fdc2f13c2dd17596f2dd69fce52deca63717920ef0ff8f861451465f4702f967dbe1790916898000c7eeb858604a3 SHA512 3c0ae2eeeb423edc50a5961f9e9f040b33c0a343e77b47dafc1699eea65708df2365944338da691a637ea79680976dfc91346e6572c42cae94a429c0902c8065
diff --git a/net-p2p/go-ipfs-bin/go-ipfs-bin-0.4.13.ebuild b/net-p2p/go-ipfs-bin/go-ipfs-bin-0.4.13.ebuild
index 8e07ed6fc878..142d353d7e07 100644
--- a/net-p2p/go-ipfs-bin/go-ipfs-bin-0.4.13.ebuild
+++ b/net-p2p/go-ipfs-bin/go-ipfs-bin-0.4.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,13 +6,12 @@ EAPI=6
 DESCRIPTION="go-ipfs is the main implementation of IPFS."
 HOMEPAGE="https://ipfs.io/"
 SRC_URI="amd64? ( https://dist.ipfs.io/go-ipfs/v${PV}/go-ipfs_v${PV}_linux-amd64.tar.gz )
-	x86? ( https://dist.ipfs.io/go-ipfs/v${PV}/go-ipfs_v${PV}_linux-386.tar.gz )"
-# Also available arches:
-#	arm? ( https://dist.ipfs.io/go-ipfs/v${PV}/go-ipfs_v${PV}_linux-arm.tar.gz )
+	x86? ( https://dist.ipfs.io/go-ipfs/v${PV}/go-ipfs_v${PV}_linux-386.tar.gz )
+	arm? ( https://dist.ipfs.io/go-ipfs/v${PV}/go-ipfs_v${PV}_linux-arm.tar.gz )"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="-* ~x86 ~amd64"
+KEYWORDS="-* ~amd64 ~arm ~x86"
 IUSE="+fuse"
 
 RDEPEND="fuse? ( sys-fs/fuse )"