gentoo resync : 18.11.2018

16 files changed, 113 insertions, 284 deletions

diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz
index 811c5541308d..52a6c21eaca5 100644
--- a/net-p2p/Manifest.gz
+++ b/net-p2p/Manifest.gz
diff --git a/net-p2p/airdcpp-webclient/Manifest b/net-p2p/airdcpp-webclient/Manifest
index 192f6b907b75..eb480f8426b8 100644
--- a/net-p2p/airdcpp-webclient/Manifest
+++ b/net-p2p/airdcpp-webclient/Manifest
@@ -1,7 +1,7 @@
 AUX airdcppd.confd 198 BLAKE2B 7d3fbce6527a7f1971f544a37215fa73ed1f19bc5f6c4c3ef90c28b170b84ecd3a82da77b582b69ef442a9a455752192ba4b6b33aeb9a43587c0209fdf380342 SHA512 025ec93c208173771fe697574c9161b9af8d740eab0b1290c8d3857961dc3635339bdb9c18b97fdde6fa7dc8924f4453b9c609ca57e61f1cad9ff47683fb613e
 AUX airdcppd.initd 584 BLAKE2B 6e19d6088b26153527fa51e3789c3968647af3f7a2b1fbe2b355587b14eef94b8800a78565ce3bd54f0474542496bfd9f80566c36fcf6f1e51f55c48aa0654ee SHA512 f6de7a576eaef662e73dd488acd956371891278a6fa6c912be864c630a22435541deaca9055c6d7912bf483de228db2cd0bd9c9666a1a436de55112561783721
-DIST airdcpp-webclient-2.2.1.tar.gz 845507 BLAKE2B 5d97fe5d25957d870cc5480153acb746ac20bc398e637ccf25a98e42cc905fb445bbc47c211174552e0ee23d1affb0a9265d8499389373bf6622b14428300bd5 SHA512 97c5b32e590b2fc735fe4978c1a173272c55f84fe97212f7cd1e8bd4a279553c1d992573185781aeceafbbe6bb51303ddb2cd164c748fa798993a661f3abfb81
 DIST airdcpp-webclient-2.3.0.tar.gz 880508 BLAKE2B 426c0582ffad734cae2f66826aa04b2db791a110abc79629f4e3b71a69db354b56d213feae6d807f3b7a3f2906aac00fc50c49eaf3dc7d8e09783f59c99ef4e5 SHA512 b1f47c8f500aa684a8cabcff916b6a1e41230d949a35d57c80f13734f6f88f8c3a31d99f64cc1f6e316d26710da894670f130baf78fec5ecf3a70a70f0d7417a
-EBUILD airdcpp-webclient-2.2.1.ebuild 1431 BLAKE2B 5a4ec19c01fd32862d96a415cfabd10576b4ae435a33d8788ba2a8ec1dc02e0e30f517a76c36d2392840ae239d7aa3ff9571b7625208c13e2d81c5741469284f SHA512 40fd30c487e3ac0eb2cc80ed3fc40bdda23adb9be229499a47b4abb12e2cff73fd95ab1cc2e920ae8f867d6f3b55cbd441ecee3396bd465b0dbfc0678ad1e902
+DIST airdcpp-webclient-2.4.0.tar.gz 899040 BLAKE2B a498624fb273ecc756c6d1ce9fc6ebc4b44e0e6788ae41208a308d9e204a4657503e9123c7ed41c9a5d1ffca6a1eda54a3fdddb609244cea54b41605927281d9 SHA512 6598fd6bebae65381dd97763da4a69ce32e4d3f5cb16e5cbd66bd29d973e36c3a616138c84426c462cfd275b39b8d4bd4c0162de9dba3c02b603735ad842a3a7
 EBUILD airdcpp-webclient-2.3.0.ebuild 1442 BLAKE2B 1d7971f1b9f677e1bae2909b052054bb176da4583bcc36fafe0f5c38e98bc10d0f6138704209c3ec5106250dba44252e062215e73c39b72738417ba27781e9db SHA512 595e0d80ee5bd7551e25b729c17f6c19194b63618b49580239d0527ad0e69e7cee1671d074d3118728b186a5ccd3b31d1866bda72a1de73da54ab9016e0a85b8
+EBUILD airdcpp-webclient-2.4.0.ebuild 1439 BLAKE2B 39eb81610030ca0ca4158842ec9c42fdd745924a4daf8b4967d477e021d8560e2cae400343b0f4ccff1eabc343eb2e1e6977b43a11774f1efb1a6e8a00155a96 SHA512 21193dd5317f7185151090f2559e0d8bd0b6b6950be16b3ad60648706bec5c0c4c4f552baa217ccbbf4e42f6cc4d31f7ef5aa6ff15fdee93fc20556b47d29b1e
 MISC metadata.xml 804 BLAKE2B 4d7003fed4a4fcf24fcf30ecf7d5e2c8970f4c76e6b37444721d09da8413a1d1aeb3a2d4c22174f02bfb7fff7b38e35f23c85a9070625a3eaf63bf0f68fc20e7 SHA512 1408ae27ba8cce6f6f6d53a5fade6d4bf2ce0587cd0b829c3426d88257e83dcd6c69ba5e3cb143d7ac7a31ad7a59e7324a6faf489162f88b62932b4bf8129268
diff --git a/net-p2p/airdcpp-webclient/airdcpp-webclient-2.2.1.ebuild b/net-p2p/airdcpp-webclient/airdcpp-webclient-2.4.0.ebuild
index fd8f46fe630b..0a48a02f89a5 100644
--- a/net-p2p/airdcpp-webclient/airdcpp-webclient-2.2.1.ebuild
+++ b/net-p2p/airdcpp-webclient/airdcpp-webclient-2.4.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} pypy{,3} )
+PYTHON_COMPAT=( pypy{,3} python{2_7,3_{4,5,6,7}} )
 
 inherit cmake-utils python-any-r1 user
 
@@ -19,8 +19,8 @@ RDEPEND="
 	app-arch/bzip2
 	dev-cpp/websocketpp
 	dev-libs/boost:=
-	dev-libs/geoip
 	dev-libs/leveldb:=
+	dev-libs/libmaxminddb:=
 	dev-libs/openssl:0=[-bindist]
 	net-libs/miniupnpc:=
 	sys-libs/zlib:=
diff --git a/net-p2p/go-ipfs-bin/Manifest b/net-p2p/go-ipfs-bin/Manifest
index 9646412a452d..2c1de5a18c70 100644
--- a/net-p2p/go-ipfs-bin/Manifest
+++ b/net-p2p/go-ipfs-bin/Manifest
@@ -1,19 +1,19 @@
 AUX ipfs.confd 30 BLAKE2B 7ecaa40f2a4097690f9d8091da5891e0bbfb0f298bed4a59769c8d0ef978a2471865a01177950da5869b61f3b8c124f43eab97daf297c06efecdc25785a5846d SHA512 c55afeb3efe381d18258ddf00f58325b77156375cf223fb2daa049df056efe22e9139cce0f81dc4c73759dad5097af5f3201414beb5950bd894df9ae8c7c4ed1
 AUX ipfs.init 464 BLAKE2B f5927ab792427a87c330772fca4adc177ae84899be5c6b856f763d6e71d1cbdf1d151bf6eea46ff13ba5ce5996a55468a4749d37c1e8306c4d07f897f17430a1 SHA512 6616a0114039a7c178ee9788c748e4abf143a875df2a9d6d823249d7adef2024cd3f537cf45a624e76751792e8c24b1d42b0dd536686b14d6f53f59ca53ca1f4
 AUX ipfs.service 245 BLAKE2B b2d528a82a79d1e7fd5cfedac1a4db2412e7e02c87c3e5e902b0bd1a9259fd4156328b8c289df42a898a64a396d83ef93f24743d042b4fe24a2d97f8f0c5235e SHA512 58e21b8c7a7c0af0b05ee936fcd7e8e61903755f1c124a4d59758bb094d520d3dafb9b5b8b92d2a4b414367fbdaf2ec0025c05cbc796d0ee26f2916d12dde472
-DIST go-ipfs-bin-0.4.14.bash 20856 BLAKE2B 60370fabf7dee1f157c242fef5709b486428db4dde24388fca1a21655b44e9cbd07a523af05c66f70e8a7ac43a40cb4a439faaae856bfe52c74853e7539b4f3e SHA512 17568f42a0980734e57a6c22bab4bac149719ab4d586a5a477f4b11610c2c982c1b5c395b9244c73aa95c82bd40688b8368960bfc0fd5db2e6139660d38e6c9a
 DIST go-ipfs-bin-0.4.15.bash 20856 BLAKE2B 60370fabf7dee1f157c242fef5709b486428db4dde24388fca1a21655b44e9cbd07a523af05c66f70e8a7ac43a40cb4a439faaae856bfe52c74853e7539b4f3e SHA512 17568f42a0980734e57a6c22bab4bac149719ab4d586a5a477f4b11610c2c982c1b5c395b9244c73aa95c82bd40688b8368960bfc0fd5db2e6139660d38e6c9a
 DIST go-ipfs-bin-0.4.17.bash 20856 BLAKE2B 60370fabf7dee1f157c242fef5709b486428db4dde24388fca1a21655b44e9cbd07a523af05c66f70e8a7ac43a40cb4a439faaae856bfe52c74853e7539b4f3e SHA512 17568f42a0980734e57a6c22bab4bac149719ab4d586a5a477f4b11610c2c982c1b5c395b9244c73aa95c82bd40688b8368960bfc0fd5db2e6139660d38e6c9a
-DIST go-ipfs_v0.4.14_linux-386.tar.gz 8199245 BLAKE2B 950daceb417126203b803e512a41c004118990a981ead1f4dcc09185994be17d2c0899627f0a3cbb99e20a1e003d704e9bee6ce405dfd992a1871f3cdbc324b7 SHA512 bb2f88f6409adbe79a543bdde8d758a7e0f043b044aac42886fe9f2a973cf3477ef333df52103673aa93dfddc71946cad99021df813a9425f42599ee1ce70270
-DIST go-ipfs_v0.4.14_linux-amd64.tar.gz 10218138 BLAKE2B 10269581a8325172e5a5cebd64a760289864850703e62dc7e29a330d946d51b0b3ce2631a19fe9c7ea32f2eebb2b34a2bdb2682ac86a78bcf87a012d97bf5585 SHA512 71269aca8350e67a70faf7c16d2d7f9885d2e46a5af7cd737d888369d4a231e06ac8b4bebac43eda54c39b8cf345c80fbbc15fd227f0923f8381b3b0720fccb8
-DIST go-ipfs_v0.4.14_linux-arm.tar.gz 8136810 BLAKE2B 4fc6b52fec544cdd0c33ca31dd520821bbba2f8fab2b90994cd092de7ea7a132db4acdad80c2929df11b2e0d36d040efdd1708db5b1c3f05b89dadf60974544e SHA512 d87b5072aab2e3c00c8028f69042dea53523ba43eae01257b6fd25b9f5dc43aa09474368496da40bd62f99f63cc53c9786ce6babae08016d86ec8030c8c06b27
+DIST go-ipfs-bin-0.4.18.bash 20753 BLAKE2B c34d29a48cf249b7a646a8a7b6015b9c4a4a5d8656187ec5984b0dfb741a8ca7b2f2d0a10bc0288aa862679c6d52145936b46497936565ba7cdb2ba847fda5b8 SHA512 acd3bdb689964aa5e15965bfea3cd1267f54a2014c05f49f4e536902cbdab3e22038f4f5db5ecc273c147135b265fcb82a41db22bfc3fd8f6ddc8ae43fd053ea
 DIST go-ipfs_v0.4.15_linux-386.tar.gz 8189548 BLAKE2B 6f82260f92b55d863189ad6f0cdeff4972df863953d132cbb11623e06c33b154e650e9fd0bd03d4a3f8477cce22447603a0207f0afc6eed074fcf7d05ead01af SHA512 11b4f11da0754819456dc7b5d149d72670582cd3e9c90b518546024356857c49a9a97ebebf1bc495e48e4bde96884e58f979a51fc57993bdff0509bccc6fad31
 DIST go-ipfs_v0.4.15_linux-amd64.tar.gz 10209630 BLAKE2B ce6fec2968765ac54f1376f0e8f9f3728338b06104a4b841b7993b5955f889e62e0bcf4e79fe6e180ef2e6cb4e9b07745935aaea74d7d6a050b7484e6d6ba9be SHA512 d77790c5c58f49229989b0e08fa537bc084bf9e2953479e307557e96924f96b913f00c4a7a76c687f2db63f098a18a575f34d88a3f226e7933039e8d8910dd10
 DIST go-ipfs_v0.4.15_linux-arm.tar.gz 8124892 BLAKE2B 8f3ab08f83ca7c4067a230fc0557393f107a08d1df069fd2029393cc1320d5cf678316e988472696aeceadea2d4f04e8c0bb85526284627c1d9e5f0acb2cc3e7 SHA512 4e98fda84d0f8c1e118150771b03a238cec96631d8ea798bf5c494f60711f1d272abe0830edfafb9f7fa6e246c59f30fe7896f231217f1b5aa2bdb6ccd3a94a5
 DIST go-ipfs_v0.4.17_linux-386.tar.gz 8625346 BLAKE2B e72b51a25eb0c18958f434483d28c45b43120ec9e583184cad8ac57c9470d685c568d9e166899d355200f89a0fe9fb3b05f9ce4c00c8c03bb928b0714b5d67c8 SHA512 031ee1624499ba9fd72efef780b1a04dee9a69dccc41190cebefcf5c271f676829fc220281db24d75a9159cd52fbbe3c85855911a5925efa23db85d2daefb500
 DIST go-ipfs_v0.4.17_linux-amd64.tar.gz 10726868 BLAKE2B bde05330dec16a9d40cf6ab0a872a2b2640e9d6811bc70b0a77a2149c36f0f9ddca927dcf66a7264b71b9a39ca49ab4e698ddaa7683b4b4ce871e207032ba9f5 SHA512 1d0b1b14b544c81ed6ecf4b5481e9b186d11d29afe1c63ad49abcc54346ec98ba28f7cfd712b5947a988ea7b810c71178ee79aadc87f3a946ecbfd5dcfd00b17
 DIST go-ipfs_v0.4.17_linux-arm.tar.gz 8541559 BLAKE2B a0633f414a2b8e6bfd1679442653cdcecaa1f3e5072ed9ca3afb64dd0183155077af71723a282285f2d70b7ac256d4e2e27515175453f16cd900ee01dcfb7440 SHA512 586b40575a18933eccd3a5af81efac8c0b6ea941bb5cef9e5bfc95ce56134863934c0e2fde29aa24944791c4842f0055ef43d1aab64b339649033801e4739cb6
-EBUILD go-ipfs-bin-0.4.14.ebuild 795 BLAKE2B f095381ec82d12277234f86342b3171e4cc6a15034293ea147a383f077b90d252f4952e0e9e9f33058aba7ea3dc7289177d4f14ebd0a8e93c14383c72ff4cc57 SHA512 afb45caddf2511d8afff6d774fd82d10ac9dd829316a9e26cb7e8e7c0a5890cc3dd751a2eccb6b2cd8bd3de2bbf02a0dfe2919664ee0364960f023d78540032a
+DIST go-ipfs_v0.4.18_linux-386.tar.gz 11128726 BLAKE2B 2f1289bb0aa93d0d03585bb90f577f91c8db922ba7905aab90c6e6b7804b7fab5c52b861aa0cdd927de8ea0b6e20f22f1c42c390628cd2e660fbaecd55b04d24 SHA512 7fff0da87827dcef7c84f959f4cfdc0b5e43e82c636b77fd600d4f62d7b78b8f1660ea346caa5eaf2d791ab275f41c0f83d606e4b36f29f3284a1851a82fbce5
+DIST go-ipfs_v0.4.18_linux-amd64.tar.gz 13791729 BLAKE2B 777d20792d089216010574798245e0eac0a5ec46549aef3ec4162c289d1d4fec1b381d8fba39ad2a57d88fcbeee5cdd1bd8509fa8883dd946fb452c4266f95de SHA512 ef5b44a0aaed604890c83322ca02228061204085b87b20dd173edfe6b6631fc7a54724d2e00202488c86886992a0d409f43e09f022cdf8b1138f8419cf7614b0
+DIST go-ipfs_v0.4.18_linux-arm.tar.gz 10933477 BLAKE2B b846926b33c78a6d089717689993c6a9c9b6ae03b32f184c2a74ecc1a9c290e7b29a9e35f2e7691e504e86c6f6229d86bbf956d90d939decb91a22fe04f74504 SHA512 c60cf427109c9c08a73a8270fe9d2792932894cfd68c1a90ec159733d121c5c12647e4b8ab2ed24865c9a4b7f8cb94db9dbe47667e48b5525b39f0c3a0acf085
 EBUILD go-ipfs-bin-0.4.15-r1.ebuild 1287 BLAKE2B 3666b649191a0a28df535b602c5b72f710c3e4bbbd6d86a87d6a7738f8f6340c5b339734c8f302601621709b1b3a8a140dbe4d8caa1183ec2261d5091f6e8af7 SHA512 e14ef66905312d4492ad994ba3d51d3e133a9545bfd96ccf04e1086298230324f4677e456f968739dc4dd359269a975cc3267c520a7c8d1bfeeae272fdfd3078
 EBUILD go-ipfs-bin-0.4.17.ebuild 1287 BLAKE2B 3666b649191a0a28df535b602c5b72f710c3e4bbbd6d86a87d6a7738f8f6340c5b339734c8f302601621709b1b3a8a140dbe4d8caa1183ec2261d5091f6e8af7 SHA512 e14ef66905312d4492ad994ba3d51d3e133a9545bfd96ccf04e1086298230324f4677e456f968739dc4dd359269a975cc3267c520a7c8d1bfeeae272fdfd3078
-MISC metadata.xml 606 BLAKE2B a6db8a5d8f57434206cbe3a8d69a3734381fdc2f13c2dd17596f2dd69fce52deca63717920ef0ff8f861451465f4702f967dbe1790916898000c7eeb858604a3 SHA512 3c0ae2eeeb423edc50a5961f9e9f040b33c0a343e77b47dafc1699eea65708df2365944338da691a637ea79680976dfc91346e6572c42cae94a429c0902c8065
+EBUILD go-ipfs-bin-0.4.18.ebuild 1284 BLAKE2B 03fee910022a804913d3adb50beaa93cae9d14d12a73157c125561bd0b42b6ecd8c40391b517e9bb2233513ead6903781cb8733c4d2b524f82399dd159afbc2d SHA512 14291ab9b9bacb9b9ce40e943ac3be80a69bdfa8d59bfcd2bd5ee2902c07acc28351f582105b358aea7134b4edb61c346225c771906110394509fc111cb45956
+MISC metadata.xml 514 BLAKE2B fb8cdd1bd3a7e9f4ee567d126e9a2e78c1a7e3237a13f831f0edd775d1ff5ebaab94d2bdfbd764fb32bc52d4fdd65a21e37af369efd6e2a9f932bbe2fa113256 SHA512 46e23df18c12c87434db22e3a22ebc9a9df8650b6a8235f655ee6e4657e706fd86dc468462a485483eb9ea440f38d40e262a3537cceb41eb1e68110651ba5d00
diff --git a/net-p2p/go-ipfs-bin/go-ipfs-bin-0.4.14.ebuild b/net-p2p/go-ipfs-bin/go-ipfs-bin-0.4.18.ebuild
index 6fd9494bd066..f2e16b7beee3 100644
--- a/net-p2p/go-ipfs-bin/go-ipfs-bin-0.4.14.ebuild
+++ b/net-p2p/go-ipfs-bin/go-ipfs-bin-0.4.18.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit bash-completion-r1
+inherit bash-completion-r1 systemd user
 
 DESCRIPTION="Main implementation of IPFS"
 HOMEPAGE="https://ipfs.io/"
@@ -16,9 +16,8 @@ SRC_URI="amd64? ( https://dist.ipfs.io/go-ipfs/v${PV}/go-ipfs_v${PV}_linux-amd64
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~arm ~x86"
-IUSE="+fuse"
 
-RDEPEND="fuse? ( sys-fs/fuse )"
+RDEPEND="sys-fs/fuse"
 S="${WORKDIR}/go-ipfs"
 
 QA_PREBUILT="/usr/bin/ipfs"
@@ -26,5 +25,23 @@ QA_PREBUILT="/usr/bin/ipfs"
 src_install() {
 	dobin ipfs
 
+	systemd_dounit "${FILESDIR}/ipfs.service"
+	newinitd "${FILESDIR}/ipfs.init" ipfs
+	newconfd "${FILESDIR}/ipfs.confd" ipfs
+
 	newbashcomp "${DISTDIR}/${P}.bash" "ipfs"
+	keepdir /var/log/ipfs
+}
+
+pkg_preinst() {
+	enewgroup ipfs
+	enewuser ipfs "" "" /var/lib/ipfs ipfs
+
+	fowners -R ipfs:ipfs /var/log/ipfs
+}
+
+pkg_postinst() {
+	elog 'To be able to use the ipfs service you will need to create the ipfs repository'
+	elog '(eg: su -s /bin/sh -c "ipfs init -e" ipfs)'
+	elog 'or change IPFS_PATH of /etc/conf.d/ipfs with another with proper permissions.'
 }
diff --git a/net-p2p/go-ipfs-bin/metadata.xml b/net-p2p/go-ipfs-bin/metadata.xml
index d5913933e4c9..463ccefc2c0d 100644
--- a/net-p2p/go-ipfs-bin/metadata.xml
+++ b/net-p2p/go-ipfs-bin/metadata.xml
@@ -9,9 +9,6 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
-	<use>
-		<flag name="fuse">Enable runtime support for <pkg>sys-fs/fuse</pkg></flag>
-	</use>
 	<longdescription lang="en">
 	IPFS is a decentralized torrent-like networking system with transparent
 	file adding/downloading.
diff --git a/net-p2p/mldonkey/Manifest b/net-p2p/mldonkey/Manifest
index d4ea71d48427..8e923475d1d5 100644
--- a/net-p2p/mldonkey/Manifest
+++ b/net-p2p/mldonkey/Manifest
@@ -5,6 +5,6 @@ AUX ocaml4.patch 547 BLAKE2B e2cb8eb12121beb5cc81ba34dcf8ddd78f2ab9826d4c6cdc028
 DIST mldonkey-3.1.5.tar.bz2 2847382 BLAKE2B 60df6ffba295d0a230f1ca2d143e21529387fb453529cd89e84911b72248c0fec15261b7d3ed54be2c8d1de84bf4e8faaebcfa2019960af845493fb2385e46c8 SHA512 96e75acf91d7ecc41490f898e06d284da27404c7e567f173936d8113885a3b4b6bc93341358f92a30d3f699eef681d97ce56414a37bb02a535ad2da4d4ad13a3
 DIST mldonkey-3.1.6.tar.bz2 2886916 BLAKE2B f92c7195c67e3a9186cb9e691114dc2c1b967dab93a7c280a6fe25c2f3a18d97e849f738d0f4669f0e967c3b717ed0329f40d95c07be13a46fb5a96fc49ff716 SHA512 d0c7256c7c43934bc132183cfe0c8d85c61a874e295b86ba989f43fd4d9f3672bdf18439a9fefce52c30a6a8df08a5a464dcc21d4bf199d1b502fa344683081a
 EBUILD mldonkey-3.1.5-r1.ebuild 4371 BLAKE2B 100cdafa4f0bf3b596897cd24c2929bb5896f36d4f39e3677800756069ffbe75600bef3412d0c5eb45fbf43f020052ad1dbacc6a2f0355cf2503b1e2d3b8c54c SHA512 b92133710918c8091a089f9526b7b35cd1423f931a207148f720316b81c4ddc5cf270f67af19067d88f9edf09ed86ec56d726f50651c6e98765343e3c1cb81d8
-EBUILD mldonkey-3.1.6-r1.ebuild 4471 BLAKE2B d6fac7c3bf3fed0020eb0e59bd4c973fe07bb0c08eed4033e8b31694ee40f9c115599a9e833d5508adf8aff382589f174aff84997a8c237c7ff19b06008d25a6 SHA512 5944f7e7ade244149784ace9151c9861b61064d1f6d647b27b09260b95cad3a93f345705ad20f826c2848ab0cf4ec6c002070acb2096770d4e7b8c6f9332b25d
+EBUILD mldonkey-3.1.6-r1.ebuild 4475 BLAKE2B 1875dc0fbbf7d985b14b4ab41df8a8f3961b16abdbf6f26a52f658098fc173fe85ee4425171017fe872b8abace3f4d716033bce872cfbcb166e4d2c3fe505044 SHA512 b261107398575c7c59669d2c5d6e78023b9c69a168058574d48120d628723b7dc78da4deebf550d914a6021c50dee8f010cec491fb065f0aef47757750d5bc2f
 EBUILD mldonkey-3.1.6.ebuild 4345 BLAKE2B 685b146a75be2e8bfbb27edd62d6d2c958fcda315c18b4a5e48226c07d4b9d090f5c5bb29153030a860fa6fdfa106404253092c9e9fff16df1ca67bc6dabd2ca SHA512 04d17200855654cb29cd7ccd60efc2d4af85b1951efb324e625e7edd2c9585d413d9bc8f467aab124ce37fd07be87fe8c18c6677dd0947251f2fa57ff5cc407a
 MISC metadata.xml 793 BLAKE2B 61001afe516cb624a0ab15b3e2326df537da1eef78c4aa30b983999591a862d71916db4e3198f02782ff2d485341f586a49bc0d20d52c75027950f0e50bb20f8 SHA512 faff7076c4e3f4c6e0972ee0f0ff1a667dc44dd5bce6444b76723c6c3c151633c2598bf2ba3fd12ba64232a7de6d56f46bb1da014b26db7b544cd4cabff2b4e8
diff --git a/net-p2p/mldonkey/mldonkey-3.1.6-r1.ebuild b/net-p2p/mldonkey/mldonkey-3.1.6-r1.ebuild
index ed193856078a..242b41314223 100644
--- a/net-p2p/mldonkey/mldonkey-3.1.6-r1.ebuild
+++ b/net-p2p/mldonkey/mldonkey-3.1.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/ygrek/mldonkey/releases/download/release-$(replace_a
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 
 RDEPEND="dev-lang/perl
 	dev-ml/camlp4:=
diff --git a/net-p2p/retroshare/Manifest b/net-p2p/retroshare/Manifest
index b7acfcf6f9a0..aef517074bb1 100644
--- a/net-p2p/retroshare/Manifest
+++ b/net-p2p/retroshare/Manifest
@@ -5,4 +5,4 @@ DIST retroshare-0.6.4.tar.gz 20018361 BLAKE2B 63a32ee3a22f4df8b9f6cff149be2c9a9c
 EBUILD retroshare-0.6.3-r1.ebuild 3946 BLAKE2B e4078aa47a2553aa113eacb37aac1772db81c5560423af5abcebd847925853fc6a69faba386711a38a96aaf9e9b728afffc453c2cdc9232c9289a426ea424096 SHA512 3c24cd55ddab91ead27966d354320460f7789cb91970d8d0e1628c7e232ee46420aeb1a86334625c6d3a2d4fe83e56cdfad47f1706141ae1d58531edf353697f
 EBUILD retroshare-0.6.4.ebuild 3783 BLAKE2B a764907fa347a3362a7fa60ba8664a4211d09fbfb641768175e7f72ff572400e77dd274c435a5a0b22d1beefb727e6fc3dfef43218a82c0b93c98005ba34eb34 SHA512 5ef95f47d3186f4031c294e153da6001d978530bb376fcc393048abeaf717b2303c4467de27307e5ce7ca5b2d19da39d12cc3c60223cc68b9b7ec4be6847c09b
 EBUILD retroshare-0.6.9999.ebuild 3273 BLAKE2B 3a99b1f80024dacc10165cf0329f6f2f1f17021dc5223c436c817622c7d224ee8d9f312493c563c3df9e14d9a54420393751a26f44a35a11cc01f63e9b4568c4 SHA512 a4951090b3c66f0cc2ed67ac59784c9cfb20e0a0af155831386224b8878603551fa03f7f21258c0ed64fcdbb1d61b227165b6879f7474348cf8d1adf663127d9
-MISC metadata.xml 1684 BLAKE2B 8308ce1d3e2a433b79b01dcfdca2ab79b614cc48158fa43c8163e27f4d1d978ea831d54c5408ff3f3c4a3d71b55d0e5d3043058165461389c35e6cf76cac9cb2 SHA512 ba50aff77c086400bb4cdb631be9a634aada2b81832ac2895b74149448da431040604dc88fec9ad5d9e9bce39f2bb5b82565056937e3236124b8a42b1ab2ea6d
+MISC metadata.xml 1576 BLAKE2B 6eb7fa6965ac5c785bbdb8fa700374ec8723ac79a604f882c557cd53972f753f4a4f30712bf49becdd9d49cdd6d8753b900372c60a69d11ba8af042d836a0a5c SHA512 01013d392930b00c7e3958e9e05a0bdaa45524879676cf7c407399cf0adb404dcef83a8ba465dfc536409eb1fd7d6e28f2423e58cc5b2d1cfbcd032ae45a0b75
diff --git a/net-p2p/retroshare/metadata.xml b/net-p2p/retroshare/metadata.xml
index 6f5d194f45d1..1e20d558f6ee 100644
--- a/net-p2p/retroshare/metadata.xml
+++ b/net-p2p/retroshare/metadata.xml
@@ -9,10 +9,6 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>pinkbyte@gentoo.org</email>
-		<name>Sergey Popov</name>
-	</maintainer>
 	<longdescription lang="en">
 		RetroShare is a Free and Open Source cross-platform, Friend-2-Friend
 		secure decentralised communication platform.
diff --git a/net-p2p/syncthing/Manifest b/net-p2p/syncthing/Manifest
index 80185d1da7e2..b32afa06f6c5 100644
--- a/net-p2p/syncthing/Manifest
+++ b/net-p2p/syncthing/Manifest
@@ -5,13 +5,9 @@ AUX syncthing.confd 549 BLAKE2B f05ec8f3478566b285f26b57a0d4c4793a5b2577a9a994b3
 AUX syncthing.initd 1195 BLAKE2B d3724b2ac5c2a746b8a9a1477bfb01b08e7d8136de89586546d48d72e6c45a63cda0b7825ee1d39157c7a3ceed167289a2086d3075bd41f0823b981d3d0f1863 SHA512 2e327a0f09523da2e746ec559c82ddb5667d98aff0c967b9d2d27c678163f80bdb0b19487ce7b7f1664c52754c92e5f6a5f78496a8b3cb1f450e2159ba68c1ae
 AUX syncthing.logrotate 101 BLAKE2B af499a6979e5c61cc4791932e247fe7f25baffbbf690907a2e2b8c2954da72154a885759589249c541f36b2740980f3fcd3e99db0d3f6d5a1bacee8c1574f9bc SHA512 73a5f7062b48ab4c7b343b43367b1999f8e133eadb624bd5e3e147ae41f135ded6acb4c617db2d385311441c9a52c288333791308c36762cb5273a853cce5a67
 DIST syncthing-0.14.38.tar.gz 8246629 BLAKE2B 93c01750fedd57cc07bffa14fe65d98fc1cf48b43eaf965fc3ff9546a24acada411a89a19b47e2f5b5e7508e57646d0560559c35bb3c378b7c04e3db14b7ffaa SHA512 be5f7527d63e8db427705c34b26d783d9abd7cb5727d3dcf08ee62b1ace5454b7dfed4f030ec53e847a34f560cf349460f68c859a1008c5105aef65ef42c5cc5
-DIST syncthing-0.14.46.tar.gz 10200015 BLAKE2B 679b82af8ee5dad769ef01b77d0d3545d953ec2f2889faa129c433863094f431bf3e44a633109d944cbcaba6486a8b51257557eddfc20a2fb3f0cd8a77861b96 SHA512 ebf8491d1ac1dda90df35b8a9dafb808a9171d4a8083f0f24ac1c9b3aa8d2baac6cef61c5cd897a88c3fb93b114d79a31a341168859f091ed2cdef529321178c
-DIST syncthing-0.14.47.tar.gz 10278343 BLAKE2B 8aace6ae059af3317a4f1aabfc06ff21140168428fa5a808dbb3aacbb27fdbfbe56ff910124b5b4c5b54637d444178ddc31492a59ec0bbd7fa4012a2e59ce997 SHA512 16718528fd4c618ea0e0eab1971405870d72ac60d391c27a06313a6ce9b9d023301eac052cfc00aab51e2b1f7c65800becfb822c5bca2d467fcb267b77ba55a9
-DIST syncthing-0.14.49.tar.gz 10952008 BLAKE2B a5c5b59720585a6a444d4c0a25c22639263330c1a1987471149773b257a3a0975428c3d63885f567fefbeb7cdf690f0a7ac3296448a2ca070d8ce53e3d657879 SHA512 7a9974e0d45582c5f184165456ea8fcaca0f7ba07a01b9f8eb2de1e1f0410ca36dc978ddde9c725a2b9d08bae8286fc2ce67595a0e510cbfe22fde9cdd9fc694
 DIST syncthing-0.14.51.tar.gz 10970620 BLAKE2B ba41debaddf217069b47901d0c43f163ff0ae3ca4aadb8689401195cfc9f11a3ed641d2d96a590821adac62d12d0ff83df26a4a336ca09476d755b8230a63c87 SHA512 d670b1df341c8da95d38170e03b40deb19dfcdf0c0df9b4630c74b4fcc979bd9a863c0ca0510e28739bac14b1aad51ce40abe695765186acad78ea0d7eb3a20c
+DIST syncthing-0.14.52.tar.gz 10583112 BLAKE2B cceaf0aba9dff96df0551d7aab855cb716be3d252fd677b82e20560f0a2e9eabf513ca7c7acdf4f1a3b4d3d8f6409692df7d2e92b86b1be1753bdd8913e06952 SHA512 cff48ea1d1286c8b1fe971b00423ad64ef10c9b0555f0cae6e008efc07a21698d54d402fe1a0ac3161c0b5180e5ca0099a0a302fd7e7c5da0f227bdb7e2853ce
 EBUILD syncthing-0.14.38.ebuild 3604 BLAKE2B 60ab7ee9417858f5732a894a19786e66aa875d68d2ae699dba844f0efd8c0db9addd91f88b21c3e54930fc55a14d3545ea65af1c2ed43b26fa1158bfe918f6a8 SHA512 7188b18639c97775e1aad68f8a8aa1e41e95e10855f491bee61aa5898599b34d7cc0c23ea7c585d2a30dcbf1e4f16a7b08b9a5f1fa55064b6e36bb7f35cb73be
-EBUILD syncthing-0.14.46.ebuild 3607 BLAKE2B 505dd788fd96503f0952acf33ae38d1343e781573bb987110bc5ec16112b4c6735ff132e72b67123d970b843448f4498853e3e8362d7530049efa51b6888ba35 SHA512 bf28b811f3e126914f60ea9632449fee4db627db7a7054d80d949d47732a1981015bd40c46a198d3904cf5003e463acac6ebc697b6af3d9691aec67f9e6842b7
-EBUILD syncthing-0.14.47.ebuild 3607 BLAKE2B 505dd788fd96503f0952acf33ae38d1343e781573bb987110bc5ec16112b4c6735ff132e72b67123d970b843448f4498853e3e8362d7530049efa51b6888ba35 SHA512 bf28b811f3e126914f60ea9632449fee4db627db7a7054d80d949d47732a1981015bd40c46a198d3904cf5003e463acac6ebc697b6af3d9691aec67f9e6842b7
-EBUILD syncthing-0.14.49.ebuild 3607 BLAKE2B 505dd788fd96503f0952acf33ae38d1343e781573bb987110bc5ec16112b4c6735ff132e72b67123d970b843448f4498853e3e8362d7530049efa51b6888ba35 SHA512 bf28b811f3e126914f60ea9632449fee4db627db7a7054d80d949d47732a1981015bd40c46a198d3904cf5003e463acac6ebc697b6af3d9691aec67f9e6842b7
 EBUILD syncthing-0.14.51.ebuild 3525 BLAKE2B 9a8bff37b22ba1fa7f90b457f3ddbae39252f188b52bb91d2ecafb8208be83af8e1ffc88e250180793e8126520c9e187602037374d0d76b02a5d9edab8be04dc SHA512 354fd1e41dc6ebd675d162f64ba3054f3ed1eca71343bec1f3ec23e80b1f575b3188d6e5bd574fd14e9a92ecbbbbc70c4c4deca791ad89a1122ccaa434c0ac3e
+EBUILD syncthing-0.14.52.ebuild 3522 BLAKE2B 147e0a0ac6572ddcbfe372a79d86f74d8e184c87648e1acb50dac7bb12f0ef13be919c013736c2ccb3a95afded9c17ea650e05f2f1b47d5cb1be02f1e00cf771 SHA512 2282152e12df0879d06287f711226d302ed9fddee4b81a89e593c12e038a622f845392bd468a04beb0d844e4b6740c5b7c73a0595f17a3db4a679d1a0c2c50cb
 MISC metadata.xml 869 BLAKE2B e59a433fd94dda05e06eca9017cf4f35aa4d9897adcc76d5dc503d5ae90e90bf5c23b859c4b7abe9af86cd7f327dad99a7a1a095015330a105debeb1a428052c SHA512 f58ce3a33241a316a81ba94318cd8fa1ea8a9954cd3721ae6f78f96df08b38a6ee5ea214483dc92aa4301a2252bc712a65c196da4c871962d76d17d5ba2b7238
diff --git a/net-p2p/syncthing/syncthing-0.14.46.ebuild b/net-p2p/syncthing/syncthing-0.14.46.ebuild
deleted file mode 100644
index 00190a582b6b..000000000000
--- a/net-p2p/syncthing/syncthing-0.14.46.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_PN="github.com/${PN}/${PN}"
-
-inherit golang-vcs-snapshot systemd user versionator
-
-DESCRIPTION="Open Source Continuous File Synchronization"
-HOMEPAGE="https://syncthing.net"
-SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="selinux tools"
-
-RDEPEND="selinux? ( sec-policy/selinux-syncthing )"
-
-DOCS=( README.md AUTHORS CONTRIBUTING.md )
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
-
-	if use tools ; then
-		# separate user for the relay server
-		enewgroup strelaysrv
-		enewuser strelaysrv -1 -1 /var/lib/strelaysrv strelaysrv
-		# and his home folder
-		keepdir /var/lib/strelaysrv
-		fowners strelaysrv:strelaysrv /var/lib/strelaysrv
-	fi
-}
-
-src_prepare() {
-	default
-	sed -i \
-		's|^ExecStart=.*|ExecStart=/usr/libexec/syncthing/strelaysrv|' \
-		src/${EGO_PN}/cmd/strelaysrv/etc/linux-systemd/strelaysrv.service \
-		|| die
-}
-
-src_compile() {
-	export GOPATH="${S}:$(get_golibdir_gopath)"
-	cd src/${EGO_PN} || die
-	go run build.go -version "v${PV}" -no-upgrade install \
-		$(usex tools "all" "") || die "build failed"
-}
-
-src_test() {
-	cd src/${EGO_PN} || die
-	go run build.go test || die "test failed"
-}
-
-src_install() {
-	pushd src/${EGO_PN} >& /dev/null || die
-	doman man/*.[157]
-	einstalldocs
-
-	dobin bin/syncthing
-	if use tools ; then
-		exeinto /usr/libexec/syncthing
-		local exe
-		for exe in bin/* ; do
-			[[ "${exe}" == "bin/syncthing" ]] || doexe "${exe}"
-		done
-	fi
-	popd >& /dev/null || die
-
-	# openrc and systemd service files
-	systemd_dounit src/${EGO_PN}/etc/linux-systemd/system/${PN}{@,-resume}.service
-	systemd_douserunit src/${EGO_PN}/etc/linux-systemd/user/${PN}.service
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-	newinitd "${FILESDIR}/${PN}.initd" ${PN}
-
-	keepdir /var/{lib,log}/${PN}
-	fowners ${PN}:${PN} /var/{lib,log}/${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}.logrotate" ${PN}
-
-	if use tools ; then
-		# openrc and systemd service files
-		systemd_dounit src/${EGO_PN}/cmd/strelaysrv/etc/linux-systemd/strelaysrv.service
-		newconfd "${FILESDIR}/strelaysrv.confd" strelaysrv
-		newinitd "${FILESDIR}/strelaysrv.initd" strelaysrv
-
-		insinto /etc/logrotate.d
-		newins "${FILESDIR}/strelaysrv.logrotate" strelaysrv
-	fi
-}
-
-pkg_postinst() {
-	local v
-	for v in ${REPLACING_VERSIONS}; do
-		if [[ $(get_version_component_range 2) -gt \
-				$(get_version_component_range 2 ${v}) ]]; then
-			ewarn "Version ${PV} is not protocol-compatible with version" \
-				"0.$(($(get_version_component_range 2) - 1)).x or lower."
-			ewarn "Make sure all your devices are running at least version" \
-				"0.$(get_version_component_range 2).0."
-		fi
-		ewarn "Syncthing OpenRC init script now uses the upstream default of"
-		ewarn ""
-		ewarn "  /var/lib/${PN}/.config/${PN}"
-		ewarn ""
-		ewarn "as its configuration directory. Please set SYNCTHING_HOMEDIR"
-		ewarn "to /var/lib/${PN} in /etc/conf.d/${PN} if you wish to continue"
-		ewarn "using the old Gentoo default. Systemd users are not affected."
-	done
-
-	# check if user syncthing-relaysrv exists
-	# if yes, warn that it has been moved to strelaysrv
-	if [[ -n "$(egetent passwd syncthing-relaysrv 2>/dev/null)" ]]; then
-		ewarn
-		ewarn "The user and group for the relay server have been changed"
-		ewarn "from syncthing-relaysrv to strelaysrv"
-		ewarn "The old user and group are not deleted automatically. Delete them by running:"
-		ewarn "    userdel -r syncthing-relaysrv"
-		ewarn "    groupdel syncthing-relaysrv"
-	fi
-}
diff --git a/net-p2p/syncthing/syncthing-0.14.47.ebuild b/net-p2p/syncthing/syncthing-0.14.47.ebuild
deleted file mode 100644
index 00190a582b6b..000000000000
--- a/net-p2p/syncthing/syncthing-0.14.47.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_PN="github.com/${PN}/${PN}"
-
-inherit golang-vcs-snapshot systemd user versionator
-
-DESCRIPTION="Open Source Continuous File Synchronization"
-HOMEPAGE="https://syncthing.net"
-SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="selinux tools"
-
-RDEPEND="selinux? ( sec-policy/selinux-syncthing )"
-
-DOCS=( README.md AUTHORS CONTRIBUTING.md )
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
-
-	if use tools ; then
-		# separate user for the relay server
-		enewgroup strelaysrv
-		enewuser strelaysrv -1 -1 /var/lib/strelaysrv strelaysrv
-		# and his home folder
-		keepdir /var/lib/strelaysrv
-		fowners strelaysrv:strelaysrv /var/lib/strelaysrv
-	fi
-}
-
-src_prepare() {
-	default
-	sed -i \
-		's|^ExecStart=.*|ExecStart=/usr/libexec/syncthing/strelaysrv|' \
-		src/${EGO_PN}/cmd/strelaysrv/etc/linux-systemd/strelaysrv.service \
-		|| die
-}
-
-src_compile() {
-	export GOPATH="${S}:$(get_golibdir_gopath)"
-	cd src/${EGO_PN} || die
-	go run build.go -version "v${PV}" -no-upgrade install \
-		$(usex tools "all" "") || die "build failed"
-}
-
-src_test() {
-	cd src/${EGO_PN} || die
-	go run build.go test || die "test failed"
-}
-
-src_install() {
-	pushd src/${EGO_PN} >& /dev/null || die
-	doman man/*.[157]
-	einstalldocs
-
-	dobin bin/syncthing
-	if use tools ; then
-		exeinto /usr/libexec/syncthing
-		local exe
-		for exe in bin/* ; do
-			[[ "${exe}" == "bin/syncthing" ]] || doexe "${exe}"
-		done
-	fi
-	popd >& /dev/null || die
-
-	# openrc and systemd service files
-	systemd_dounit src/${EGO_PN}/etc/linux-systemd/system/${PN}{@,-resume}.service
-	systemd_douserunit src/${EGO_PN}/etc/linux-systemd/user/${PN}.service
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-	newinitd "${FILESDIR}/${PN}.initd" ${PN}
-
-	keepdir /var/{lib,log}/${PN}
-	fowners ${PN}:${PN} /var/{lib,log}/${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}.logrotate" ${PN}
-
-	if use tools ; then
-		# openrc and systemd service files
-		systemd_dounit src/${EGO_PN}/cmd/strelaysrv/etc/linux-systemd/strelaysrv.service
-		newconfd "${FILESDIR}/strelaysrv.confd" strelaysrv
-		newinitd "${FILESDIR}/strelaysrv.initd" strelaysrv
-
-		insinto /etc/logrotate.d
-		newins "${FILESDIR}/strelaysrv.logrotate" strelaysrv
-	fi
-}
-
-pkg_postinst() {
-	local v
-	for v in ${REPLACING_VERSIONS}; do
-		if [[ $(get_version_component_range 2) -gt \
-				$(get_version_component_range 2 ${v}) ]]; then
-			ewarn "Version ${PV} is not protocol-compatible with version" \
-				"0.$(($(get_version_component_range 2) - 1)).x or lower."
-			ewarn "Make sure all your devices are running at least version" \
-				"0.$(get_version_component_range 2).0."
-		fi
-		ewarn "Syncthing OpenRC init script now uses the upstream default of"
-		ewarn ""
-		ewarn "  /var/lib/${PN}/.config/${PN}"
-		ewarn ""
-		ewarn "as its configuration directory. Please set SYNCTHING_HOMEDIR"
-		ewarn "to /var/lib/${PN} in /etc/conf.d/${PN} if you wish to continue"
-		ewarn "using the old Gentoo default. Systemd users are not affected."
-	done
-
-	# check if user syncthing-relaysrv exists
-	# if yes, warn that it has been moved to strelaysrv
-	if [[ -n "$(egetent passwd syncthing-relaysrv 2>/dev/null)" ]]; then
-		ewarn
-		ewarn "The user and group for the relay server have been changed"
-		ewarn "from syncthing-relaysrv to strelaysrv"
-		ewarn "The old user and group are not deleted automatically. Delete them by running:"
-		ewarn "    userdel -r syncthing-relaysrv"
-		ewarn "    groupdel syncthing-relaysrv"
-	fi
-}
diff --git a/net-p2p/syncthing/syncthing-0.14.49.ebuild b/net-p2p/syncthing/syncthing-0.14.52.ebuild
index 00190a582b6b..a8db5e0eac6b 100644
--- a/net-p2p/syncthing/syncthing-0.14.49.ebuild
+++ b/net-p2p/syncthing/syncthing-0.14.52.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 EGO_PN="github.com/${PN}/${PN}"
 
-inherit golang-vcs-snapshot systemd user versionator
+inherit golang-vcs-snapshot systemd user eapi7-ver
 
 DESCRIPTION="Open Source Continuous File Synchronization"
 HOMEPAGE="https://syncthing.net"
@@ -94,12 +94,12 @@ src_install() {
 pkg_postinst() {
 	local v
 	for v in ${REPLACING_VERSIONS}; do
-		if [[ $(get_version_component_range 2) -gt \
-				$(get_version_component_range 2 ${v}) ]]; then
+		if [[ $(ver_cut 2) -gt \
+				$(ver_cut 2 ${v}) ]]; then
 			ewarn "Version ${PV} is not protocol-compatible with version" \
-				"0.$(($(get_version_component_range 2) - 1)).x or lower."
+				"0.$(($(ver_cut 2) - 1)).x or lower."
 			ewarn "Make sure all your devices are running at least version" \
-				"0.$(get_version_component_range 2).0."
+				"0.$(ver_cut 2).0."
 		fi
 		ewarn "Syncthing OpenRC init script now uses the upstream default of"
 		ewarn ""
diff --git a/net-p2p/xmr-stak/Manifest b/net-p2p/xmr-stak/Manifest
index 03502c3c7e32..a4e0c3fa5eb9 100644
--- a/net-p2p/xmr-stak/Manifest
+++ b/net-p2p/xmr-stak/Manifest
@@ -8,6 +8,7 @@ DIST xmr-stak-2.4.7.tar.gz 340026 BLAKE2B c6f898201ee744dea4aebf9bb3541efa7e5b78
 DIST xmr-stak-2.5.0.tar.gz 356770 BLAKE2B faf4fe59b8038e3bdac8941a6bac8939e1244d258ea704df346252bb2b3dc9b82dc5cd3f57afda208253ddfa2be12256ff2d473729403f30c96aabc4ba9c0073 SHA512 11b59e4c11a75c9fdc500f835ce91584d71c128df1efe5170b4cf787897f729a38c4738bb20de52a78dd5d3506e31bb048f8b801cc73a6fefcc045ae0d94ee3d
 DIST xmr-stak-2.5.1.tar.gz 357295 BLAKE2B cbb91144f56abb3bb21d9b56d0e530847081698a90260e9e01f055138ff61a62e939e7546f359ac48afd3fb1d6b1bd7c10dc46c7ae628df02ec6d7a14e73f6dd SHA512 3899476430b50cf697588bce9b8b821c1cb6a5c4c24f0fa31c36030246a8092f6e3f959b8c0548fe26967d49cd0943843a53e49bf7420710382120292f1f2d2e
 DIST xmr-stak-2.5.2.tar.gz 357306 BLAKE2B 333011250d2df3a699ec00066b1f2e45182b33b74178579756fb29b553d1d8b5abc171241f9586ef80c2c34ada40fd350046b998a7ac3c6a905b78f5e00facb0 SHA512 d9c1e851588d7e995c11cd02873a49612f862550635afe311a654fb3e0f80c80dec15a99b83e33a6d090d6e32d87f29746291e06effa05df4fc9f2f78c0a6a9c
+DIST xmr-stak-2.6.0.tar.gz 358899 BLAKE2B adf581dc13c680066e6aa6ff7b4e6f98e07fa5a336e8676f8aca34017359c294289d4ef28b8c9e92a183b71a00c30e693b4d602ef8e1fde888ca217f343d5cfe SHA512 aba471ba7867909815b2c0cb7366949e42a888999686dd3ff69243b6a567793bc0e08e1f8e892c711842ace4a764e2d577393ba9ea4de4c3de1e80cf31d3e70c
 EBUILD xmr-stak-2.4.3-r1.ebuild 1831 BLAKE2B 9d7c8bdb772dc55ad83bd1a96f248058d4873495415f8cbeadee1f3e994a0a7f30d33faa3411cfc5fb760ba429e13ec3767a361e3f9f439d356ccab1a6761f5c SHA512 7bb651dcaa3bc5392b4f5e3b2c06dcf74c012c0feab69bf1a8622eaeea3da555500b4757a432b88eab6b23e4ee1fcc736092cfc01a74bc7f7da4ab35cb093afc
 EBUILD xmr-stak-2.4.4.ebuild 1831 BLAKE2B 9d7c8bdb772dc55ad83bd1a96f248058d4873495415f8cbeadee1f3e994a0a7f30d33faa3411cfc5fb760ba429e13ec3767a361e3f9f439d356ccab1a6761f5c SHA512 7bb651dcaa3bc5392b4f5e3b2c06dcf74c012c0feab69bf1a8622eaeea3da555500b4757a432b88eab6b23e4ee1fcc736092cfc01a74bc7f7da4ab35cb093afc
 EBUILD xmr-stak-2.4.5-r1.ebuild 1890 BLAKE2B 8f1d2eb1b7bcb7fbdfd7a255723142b00814f549d86cb5c3396d413b1988ef60b212505494acf4e6189d684a183aeed4be6c9d56b3195717cc289b1edd24ba5f SHA512 dacc7a7fceddf6d18af7aa924e91a90e128027acec4d05a1975a35d950a774f5f06b35f380cedf08ad02c44d436907cc7d5147315e298e2af017c53eaef2de35
@@ -17,5 +18,6 @@ EBUILD xmr-stak-2.4.7.ebuild 1890 BLAKE2B 8f1d2eb1b7bcb7fbdfd7a255723142b00814f5
 EBUILD xmr-stak-2.5.0.ebuild 1887 BLAKE2B c8762738f4a5bb50a7c7583709340177a8417e98edab569d8768a92a861ae6980fc6f95e2bd553a728af8178c0d3e6347cab4196bcbaace8b546b99743cdf3c3 SHA512 67d55d31c95d2e7ce96f1618f246aed70dce2ae16f956cc6e1e0440e4d32e0abd13fe7acb414326be3ec202029029d5f1b05ecc8b89685d8ec986bf85cfc630e
 EBUILD xmr-stak-2.5.1.ebuild 1887 BLAKE2B c8762738f4a5bb50a7c7583709340177a8417e98edab569d8768a92a861ae6980fc6f95e2bd553a728af8178c0d3e6347cab4196bcbaace8b546b99743cdf3c3 SHA512 67d55d31c95d2e7ce96f1618f246aed70dce2ae16f956cc6e1e0440e4d32e0abd13fe7acb414326be3ec202029029d5f1b05ecc8b89685d8ec986bf85cfc630e
 EBUILD xmr-stak-2.5.2.ebuild 1887 BLAKE2B c8762738f4a5bb50a7c7583709340177a8417e98edab569d8768a92a861ae6980fc6f95e2bd553a728af8178c0d3e6347cab4196bcbaace8b546b99743cdf3c3 SHA512 67d55d31c95d2e7ce96f1618f246aed70dce2ae16f956cc6e1e0440e4d32e0abd13fe7acb414326be3ec202029029d5f1b05ecc8b89685d8ec986bf85cfc630e
+EBUILD xmr-stak-2.6.0.ebuild 1887 BLAKE2B c8762738f4a5bb50a7c7583709340177a8417e98edab569d8768a92a861ae6980fc6f95e2bd553a728af8178c0d3e6347cab4196bcbaace8b546b99743cdf3c3 SHA512 67d55d31c95d2e7ce96f1618f246aed70dce2ae16f956cc6e1e0440e4d32e0abd13fe7acb414326be3ec202029029d5f1b05ecc8b89685d8ec986bf85cfc630e
 EBUILD xmr-stak-9999.ebuild 1890 BLAKE2B 8f1d2eb1b7bcb7fbdfd7a255723142b00814f549d86cb5c3396d413b1988ef60b212505494acf4e6189d684a183aeed4be6c9d56b3195717cc289b1edd24ba5f SHA512 dacc7a7fceddf6d18af7aa924e91a90e128027acec4d05a1975a35d950a774f5f06b35f380cedf08ad02c44d436907cc7d5147315e298e2af017c53eaef2de35
 MISC metadata.xml 655 BLAKE2B b80afc4405c0f0338c31463311fa46276f911ba47a0816173f0df698d847d48a35dcc8123fe249bb06ed967d268480809a6f4781beb0175bf37f38f463736a6f SHA512 c37afc09cdaaace2b64c153907fc0124a41aee2045bc8615257f454fe14187cac802b4249f36922a2d2206dd8ff0c00163418cc921dc8bccb9515cd8c3dd5ebb
diff --git a/net-p2p/xmr-stak/xmr-stak-2.6.0.ebuild b/net-p2p/xmr-stak/xmr-stak-2.6.0.ebuild
new file mode 100644
index 000000000000..59442f8065c5
--- /dev/null
+++ b/net-p2p/xmr-stak/xmr-stak-2.6.0.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils systemd
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/fireice-uk/xmr-stak.git"
+	EGIT_BRANCH="dev"
+	inherit git-r3
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/fireice-uk/xmr-stak/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Unified all-in-one Monero miner"
+HOMEPAGE="https://github.com/fireice-uk/xmr-stak"
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="cuda devfee hwloc opencl ssl webserver"
+
+DEPEND="cuda? ( dev-util/nvidia-cuda-toolkit )
+	hwloc? ( sys-apps/hwloc )
+	opencl? ( virtual/opencl )
+	ssl? ( dev-libs/openssl:0= )
+	webserver? ( net-libs/libmicrohttpd )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	cmake-utils_src_prepare
+	if ! use devfee; then
+		sed -i -e 's!fDevDonationLevel = .*;!fDevDonationLevel = 0.0;!' xmrstak/donate-level.hpp || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCUDA_ENABLE=$(usex cuda)
+		-DHWLOC_ENABLE=$(usex hwloc)
+		-DMICROHTTPD_ENABLE=$(usex webserver)
+		-DOpenCL_ENABLE=$(usex opencl)
+		-DOpenSSL_ENABLE=$(usex ssl)
+		-DLIBRARY_OUTPUT_PATH=$(get_libdir)
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	systemd_newunit "${FILESDIR}"/${PN}-2.3.0.service ${PN}.service
+	doinitd "${FILESDIR}"/${PN}
+	dodir /etc/xmr-stak
+}
+
+pkg_postinst() {
+	if [ ! -e "${ROOT}etc/xmr-stak/main.config" ]; then
+		ewarn "To use xmr-stack:"
+		if use cuda || use opencl; then
+			ewarn "As root or as a user that is a member of the 'video' group,"
+		fi
+		ewarn "run:"
+		ewarn "/usr/bin/xmr-stak --cpu /etc/xmr-stak/cpu.config --amd /etc/xmr-stak/amd.config --nvidia /etc/xmr-stak/nvidia.config -c /etc/xmr-stak/main.config -C /etc/xmr-stak/pools.txt"
+		ewarn "xmr-stak can now be terminated and 'systemctl start xmr-stak' or '/etc/init.d/xmr-stak start' can be used."
+	fi
+}