gentoo resync : 28.04.2018

25 files changed, 202 insertions, 409 deletions

diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz
index 26ba613af1dc..4f5cc9ad03c2 100644
--- a/net-p2p/Manifest.gz
+++ b/net-p2p/Manifest.gz
diff --git a/net-p2p/cpuminer-opt/Manifest b/net-p2p/cpuminer-opt/Manifest
index ff6618c4d370..37cd8758550f 100644
--- a/net-p2p/cpuminer-opt/Manifest
+++ b/net-p2p/cpuminer-opt/Manifest
@@ -6,6 +6,7 @@ DIST cpuminer-opt-3.8.6.tar.gz 1701535 BLAKE2B ed51168879e6ca6ada67f13b7325b36c8
 DIST cpuminer-opt-3.8.7.1.tar.gz 1707776 BLAKE2B 134c25fab106db6fad601010f8f91a82e42bc03b94e633ffd3db3ef3d4eb05f2561e1249c06f3505a03abbb95976ebfcbcbad225166bc2208a123df15859036a SHA512 74cd569718cf8402cb25a4be4e9d94a897a697e02c7c9f6422313c3a3026f3d12a8eea9669b3a253fdfb471311bf49f8209f35efacb84fd3151e4ac8acda2ed7
 DIST cpuminer-opt-3.8.7.2.tar.gz 1707968 BLAKE2B 2358286014b631fea94f49de5ccb61477c0b388c650a87734ee684781ddc0f0cbdbb539affce6c12da8a4ca91a132f8ca9a4ba923c971d0ddca8e712276899ec SHA512 857a91a1061d9d4921af94743faee03031e8f2e92ba2e1d885dbd1060b19d6b93d28e9f54d10e59930eb0c8ebdb19db9888aca9ce0a05e7fbbb659d3ae3e25b5
 DIST cpuminer-opt-3.8.7.tar.gz 1707993 BLAKE2B c1a3156c02a3adf80b75fd6766c3bb7d20755813f90b2669ff6d462990ef2b80a97218b0a30fb559c8c2b3902bdc194e01f463351778f6fbd2a8a08c44da3e81 SHA512 c2aee02586712591d609748e5dbf90d5e28050fa4611915e216a6fef79fdb7ea2e0c31b844457fd505f2cc6892268dbcaebe3ed6b00f2efe9734c8d19ba8096a
+DIST cpuminer-opt-3.8.8.tar.gz 1708920 BLAKE2B 7f05890a0598737d070429617952aa4fc782c960f724a627938855336503d03c198902d63eb9d1563aece56ab354d339a2d8dbc91c7162c83ddaffc8a3de8cd2 SHA512 24f1521660b1d2974328674bfd63ca34628ac005e7f6de111a6b82a588f4f4d8e809d78e374ad9e97910b73c0af961e1c4a1c07c4d494bb200be4697fa143acc
 EBUILD cpuminer-opt-3.8.4.1.ebuild 1002 BLAKE2B 33f93d5f53ddd1f52e0dca9e3afbc7c61e54c74618ad6e8d65b106c95240f3e108ae1f4b8aa47c3994309791caaac7623099a9cc6e6bf3b3b949db84a73d20ed SHA512 fdd3205d085d5f45b65becdf5157cbd9817e9aba9f8436e78bab45baaa77287a6e9a563fd959d7559d6794747ec24204ee566db22dda3f18e75b5ec8db51d0bf
 EBUILD cpuminer-opt-3.8.5.ebuild 1002 BLAKE2B 33f93d5f53ddd1f52e0dca9e3afbc7c61e54c74618ad6e8d65b106c95240f3e108ae1f4b8aa47c3994309791caaac7623099a9cc6e6bf3b3b949db84a73d20ed SHA512 fdd3205d085d5f45b65becdf5157cbd9817e9aba9f8436e78bab45baaa77287a6e9a563fd959d7559d6794747ec24204ee566db22dda3f18e75b5ec8db51d0bf
 EBUILD cpuminer-opt-3.8.6.1.ebuild 1002 BLAKE2B 33f93d5f53ddd1f52e0dca9e3afbc7c61e54c74618ad6e8d65b106c95240f3e108ae1f4b8aa47c3994309791caaac7623099a9cc6e6bf3b3b949db84a73d20ed SHA512 fdd3205d085d5f45b65becdf5157cbd9817e9aba9f8436e78bab45baaa77287a6e9a563fd959d7559d6794747ec24204ee566db22dda3f18e75b5ec8db51d0bf
@@ -13,5 +14,6 @@ EBUILD cpuminer-opt-3.8.6.ebuild 1002 BLAKE2B 33f93d5f53ddd1f52e0dca9e3afbc7c61e
 EBUILD cpuminer-opt-3.8.7.1.ebuild 1002 BLAKE2B 33f93d5f53ddd1f52e0dca9e3afbc7c61e54c74618ad6e8d65b106c95240f3e108ae1f4b8aa47c3994309791caaac7623099a9cc6e6bf3b3b949db84a73d20ed SHA512 fdd3205d085d5f45b65becdf5157cbd9817e9aba9f8436e78bab45baaa77287a6e9a563fd959d7559d6794747ec24204ee566db22dda3f18e75b5ec8db51d0bf
 EBUILD cpuminer-opt-3.8.7.2.ebuild 1002 BLAKE2B 33f93d5f53ddd1f52e0dca9e3afbc7c61e54c74618ad6e8d65b106c95240f3e108ae1f4b8aa47c3994309791caaac7623099a9cc6e6bf3b3b949db84a73d20ed SHA512 fdd3205d085d5f45b65becdf5157cbd9817e9aba9f8436e78bab45baaa77287a6e9a563fd959d7559d6794747ec24204ee566db22dda3f18e75b5ec8db51d0bf
 EBUILD cpuminer-opt-3.8.7.ebuild 1002 BLAKE2B 33f93d5f53ddd1f52e0dca9e3afbc7c61e54c74618ad6e8d65b106c95240f3e108ae1f4b8aa47c3994309791caaac7623099a9cc6e6bf3b3b949db84a73d20ed SHA512 fdd3205d085d5f45b65becdf5157cbd9817e9aba9f8436e78bab45baaa77287a6e9a563fd959d7559d6794747ec24204ee566db22dda3f18e75b5ec8db51d0bf
+EBUILD cpuminer-opt-3.8.8.ebuild 1002 BLAKE2B 33f93d5f53ddd1f52e0dca9e3afbc7c61e54c74618ad6e8d65b106c95240f3e108ae1f4b8aa47c3994309791caaac7623099a9cc6e6bf3b3b949db84a73d20ed SHA512 fdd3205d085d5f45b65becdf5157cbd9817e9aba9f8436e78bab45baaa77287a6e9a563fd959d7559d6794747ec24204ee566db22dda3f18e75b5ec8db51d0bf
 EBUILD cpuminer-opt-9999.ebuild 1002 BLAKE2B 33f93d5f53ddd1f52e0dca9e3afbc7c61e54c74618ad6e8d65b106c95240f3e108ae1f4b8aa47c3994309791caaac7623099a9cc6e6bf3b3b949db84a73d20ed SHA512 fdd3205d085d5f45b65becdf5157cbd9817e9aba9f8436e78bab45baaa77287a6e9a563fd959d7559d6794747ec24204ee566db22dda3f18e75b5ec8db51d0bf
 MISC metadata.xml 333 BLAKE2B f7851fe0d55d729c75e3934fa32ab578c57d3dfc4a1634cc8dcca655f0d4ab1a6bb56d0b9c347dedb6cedf3d5a5a7a1bb9662856733970b1cc8db288c26be4a2 SHA512 770d39605bb1afa7d7643b4fc8f295e449f90175ae0d31c8a5023bfc9ba233c9e80ebf1dfbf81c4b86af8dc1d66bc336a4464748f162119b35fcb695cd54e656
diff --git a/net-p2p/cpuminer-opt/cpuminer-opt-3.8.8.ebuild b/net-p2p/cpuminer-opt/cpuminer-opt-3.8.8.ebuild
new file mode 100644
index 000000000000..a1f4a660f6b9
--- /dev/null
+++ b/net-p2p/cpuminer-opt/cpuminer-opt-3.8.8.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools flag-o-matic systemd
+
+DESCRIPTION="Optimized multi algo CPU miner"
+HOMEPAGE="https://github.com/JayDDee/cpuminer-opt"
+IUSE="cpu_flags_x86_sse2 curl libressl"
+LICENSE="GPL-2"
+SLOT="0"
+REQUIRED_USE="cpu_flags_x86_sse2"
+DEPEND="
+	dev-libs/gmp:0
+	dev-libs/jansson
+	curl? ( >=net-misc/curl-7.15[ssl] )
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+"
+RDEPEND="${DEPEND}"
+if [[ ${PV} == "9999" ]] ; then
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/JayDDee/${PN}.git"
+	inherit git-r3
+else
+	KEYWORDS="~amd64"
+	SRC_URI="https://github.com/JayDDee/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	append-ldflags -Wl,-z,noexecstack
+	econf --with-crypto $(use_with curl)
+}
+
+src_install() {
+	default
+	systemd_dounit "${FILESDIR}"/${PN}.service
+	insinto "/etc/${PN}"
+	doins cpuminer-conf.json
+}
diff --git a/net-p2p/ktorrent/Manifest b/net-p2p/ktorrent/Manifest
index c4cf91af6695..e342dcd5ff1b 100644
--- a/net-p2p/ktorrent/Manifest
+++ b/net-p2p/ktorrent/Manifest
@@ -1,4 +1,5 @@
+AUX ktorrent-5.1.0-cmake-3.11.patch 412 BLAKE2B 4ee01320022113b981ff1a314f8ed73895e0606615a5b91967bc04e72a328554f2345952f8bfd5bb09ff08991657b662f7db6d5a778316fd5ea5f4da1c8aeb1f SHA512 d3c3020407aabf8166ff08a1cce16a20693f273de5a1da5a2c6c21f5359a32799247153ca5d9e22fba45790ffd56b86e53465e2d3d9b0ce986fd896d5eedd63e
 AUX ktorrent-5.1.0-qt-5.11.patch 1530 BLAKE2B ee30623e4d7316a31edcab06c4e1c862db0fd9a4d3a98ab966f4cfd113ee4b68ebfe2d9d256e38fa056048f2d5fe1884d5fdb6e457dfe5c17bd9762bcc1c6f8f SHA512 a89df9e7b624a759664f757a1b60e4ea4ef3f5aee25781bd35d67005f72350c379fccc1edbec1ca9770339781d9c88506d3d16f980da85d3ce773c753729fc7e
 DIST ktorrent-5.1.0.tar.xz 2046916 BLAKE2B 865004b84d649774420e2bd0087c416c5de4df40dfe5800ec539049001d93f66925025780987060ad09e1ba2a20045bd6d92c9202c98c28ec68d87758a88af74 SHA512 7bfe3a04a2b0f62d68b41c946af34e9f6ead6aa4ff7818a9c0ce2e83629d311e9e9be5fb1689065ce2601c43bd576b27d8c6946b845d4cdf5fa6362d53e8dd25
-EBUILD ktorrent-5.1.0.ebuild 3020 BLAKE2B a5af7267e6c92781b9e34ba6d5a72d35f9d971381b6640a55e95af55a87ab45590e4610e0d4613f733ff41ff8539c11f447b241ce6ec27af0607f52aecb336c0 SHA512 37051d8e87840f9bbc66a2e99168796059a0e8a2f4acfb0eeb1e7bf53d94dcd02b6159c9e5f223a17e9b806c2c5ee220f4edb80e767b43e16a0780edee959372
+EBUILD ktorrent-5.1.0.ebuild 3066 BLAKE2B afa0b164599cdb37394ae6460f140c4d731a88c0953503779c459cd6848fa2481bb0f5b430cd9ea0e5eb47e4fcd00b697255b86880fe1208fc528fbb0807112a SHA512 625f7977ab1bb4623b791fa193ff6d0826d3bbc6352586e1cd53b7a52d1c2a4f01402770a2964ba6b386e49a5590ffaf113ba20d9eae86fba87000f491491e92
 MISC metadata.xml 1341 BLAKE2B 91b9b58b6df009f42960708b09f926b3bdf6849ebffd8d46114c28c7f2df2c0972a8b5460333ac6758f138729a7c689f6a61d4a58494bc44af2e364d1dbc3e05 SHA512 dfff24b08dba8615c983c1360fe10efcb60744651d5484a8bd1a7a731697b9dd4a10126b8d66276f96a8524352b1e4ba99b28b773d292362b3f7506a45da5a80
diff --git a/net-p2p/ktorrent/files/ktorrent-5.1.0-cmake-3.11.patch b/net-p2p/ktorrent/files/ktorrent-5.1.0-cmake-3.11.patch
new file mode 100644
index 000000000000..c0b9167636a8
--- /dev/null
+++ b/net-p2p/ktorrent/files/ktorrent-5.1.0-cmake-3.11.patch
@@ -0,0 +1,13 @@
+https://docs.freebsd.org/cgi/getmsg.cgi?fetch=4423635+0+/usr/local/www/mailindex/archive/2018/svn-ports-all/20180415.svn-ports-all
+
+--- ktorrent-5.1.0/ktorrent/dialogs/torrentcreatordlg.h
++++ ktorrent-5.1.0/ktorrent/dialogs/torrentcreatordlg.h
+@@ -23,6 +23,8 @@
+ #define KT_TORRENTCREATORDLG_HH
+ 
+ #include <QDialog>
++#include <QTimer>
++
+ #include "ui_torrentcreatordlg.h"
+ #include <torrent/torrentcreator.h>
+ 
diff --git a/net-p2p/ktorrent/ktorrent-5.1.0.ebuild b/net-p2p/ktorrent/ktorrent-5.1.0.ebuild
index ef67d30802dc..567c2e977b4f 100644
--- a/net-p2p/ktorrent/ktorrent-5.1.0.ebuild
+++ b/net-p2p/ktorrent/ktorrent-5.1.0.ebuild
@@ -78,7 +78,10 @@ RDEPEND="${COMMON_DEPEND}
 	!net-p2p/ktorrent:4
 "
 
-PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" )
+PATCHES=(
+	"${FILESDIR}/${P}-qt-5.11.patch"
+	"${FILESDIR}/${P}-cmake-3.11.patch" #650808
+)
 
 src_configure() {
 	local mycmakeargs=(
diff --git a/net-p2p/pybitmessage/Manifest b/net-p2p/pybitmessage/Manifest
index fba612242f6f..c7452d6e9c79 100644
--- a/net-p2p/pybitmessage/Manifest
+++ b/net-p2p/pybitmessage/Manifest
@@ -1,5 +1,5 @@
 DIST pybitmessage-0.4.2.tar.gz 547565 BLAKE2B 8cb7bc0407601f06c5d0040fa03372e95c34e21aed79021001f7067b3340c60a08f7ab7d2c6578e78e1f7bf09a5adc5805252a27cf8e1bda27de6d1495382e35 SHA512 5e783243db4f507ec221092f6da18d25bb15a8c83f28aab7c1796a063d2608c0115c9d636cc73b66a09264a4ff69dda9ba373eff81640b1dd9595100dcdc4917
-DIST pybitmessage-0.6.3.2.tar.gz 1118048 BLAKE2B 56245d2b6126fd0b325f20a829d4aa3d89d74fed48863ba236c74b33b074be5c88fd7d70bd08a9b4a1499aaf7e414f55c2f5ca93dca5769eaaf90c2082bc0cac SHA512 57bdbf10417973b4414f1a184b375a2dd6db1a07a6bc5596b5d256589eeae3c7343692be0f0aa681244c550d2b2d91773d9383d97c56eb48562d8099908c0261
+DIST pybitmessage-0.6.3.2_p20180326.tar.gz 1102343 BLAKE2B 55d1458858c1431f341feae10b151590bf8dc577d5a52e5ddfbb629853373339f80d0fb9a855cc82deb50ee952d7a356c0140b67ed1d28108a5c8f19d3b97305 SHA512 836dc5a2fbea96bd46bd50e6462ccb118f22591e9d838af80f05bcce3efa8434942b112725a0b5b161d9c0a544520931e56cfc01c33ea4d231bdc02c112c5894
 EBUILD pybitmessage-0.4.2.ebuild 1491 BLAKE2B bd2a91e4a9142decd90587706e12319806e7ac3d25ed239cf0ad3bef70288b8e8383f5b0c247239778d7cd9e5f3ae56ba41beb32d19a82fa817b7473ab117f63 SHA512 158c5280052bcc4d359f96232e712c85167b088253b08c623c1453e8e8d261edcea09c4c8ae0f9fc72ffeaee63ec8084c6391b1989e6f293adf1bfe98f5fc1cf
-EBUILD pybitmessage-0.6.3.2-r1.ebuild 1759 BLAKE2B 0c680a6eaaeef311ffef8a3f68fa6df8726a3a4a246b253ebc6b63a1a3ea9d587816bfe7e2ef2e05b185e50b6db7266936d5eabbd2fa40c5c20cafa16f7fcc7e SHA512 c62fcf822d94af2bb55978f2b95cb8187779995feab59d34db1c4bbe10605dbf840de9c8c10646f79288f4152d200d7b945873367e09e741cbde043227efe033
-MISC metadata.xml 1125 BLAKE2B 91ce6c7afd6e759f0f7d5a049653cf970f7cf28d5061e9ccc9866dbf88c5a60cb3e518564ceb01551a830c419cdf47f905a4a744a73205725f50d966d022fe54 SHA512 04950f304ca8c087baa7dc370ff08da07bae555481798848d2ddddda33de318be83fc6a648428ff72419af857dd9bd1bdf0b43866b40e149f33dd834e9c7d9cb
+EBUILD pybitmessage-0.6.3.2_p20180326.ebuild 1704 BLAKE2B 108f5cccbf216bf7c11a2592f47f331de3f9c501ac09eb4c4bf9017104597fed2ef50f422a577d49f104b6d876ea656435ef040e871ba614855f8b1bba80ad0e SHA512 4034cd2ef003a2b18fd0c25c9819df63a2a2052d85f4d5e3e9aa726689481fed38be7796bcfdf1f57f00b52aedbb2416f1b6065522df5c43b289991a1b9e26ec
+MISC metadata.xml 1156 BLAKE2B 9b20373355740d63c1d8e9d2d0b1c569d2d8944a7a477b871a3bc9ec741321fb71670ab9dde1753348369c91e9c2ca17a05d6830ce8ffa9288599e595d06f654 SHA512 0a5d180118567c9d120584a03ed920f2f73931653f714ad7d68ea38cc427e8e443e7a518cc5039f61dcfea9d0c13f889c82124d2009f51bc13e96381bce77c0d
diff --git a/net-p2p/pybitmessage/metadata.xml b/net-p2p/pybitmessage/metadata.xml
index 72a9c8187385..2f7203b304e8 100644
--- a/net-p2p/pybitmessage/metadata.xml
+++ b/net-p2p/pybitmessage/metadata.xml
@@ -1,29 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
-  <longdescription lang="en">
-    Bitmessage is a P2P communications protocol used to send encrypted
-    messages to another person or to many subscribers. It is
-    decentralized and trustless, meaning that you need-not inherently
-    trust any entities like root certificate authorities. It uses
-    strong authentication which means that the sender of a message
-    cannot be spoofed, and it aims to hide "non-content" data, like
-    the sender and receiver of messages, from passive eavesdroppers
-    like those running warrantless wiretapping programs.
-  </longdescription>
-  <upstream>
-    <bugs-to>
-      https://github.com/Bitmessage/PyBitmessage/issues
-    </bugs-to>
-    <doc lang="en">
-      https://bitmessage.org/wiki/PyBitmessage_Help
-    </doc>
-    <remote-id type="github">Bitmessage/PyBitmessage</remote-id>
-  </upstream>
-  <use>
-    <flag name="opencl">
-      Uses <pkg>dev-python/pyopencl</pkg> for GPU acceleration.
-    </flag>
-  </use>
+	<!-- maintainer-needed -->
+	<longdescription lang="en">
+		Bitmessage is a P2P communications protocol used to send encrypted
+		messages to another person or to many subscribers. It is
+		decentralized and trustless, meaning that you need-not inherently
+		trust any entities like root certificate authorities. It uses
+		strong authentication which means that the sender of a message
+		cannot be spoofed, and it aims to hide "non-content" data, like
+		the sender and receiver of messages, from passive eavesdroppers
+		like those running warrantless wiretapping programs.
+	</longdescription>
+	<upstream>
+		<bugs-to>
+		https://github.com/Bitmessage/PyBitmessage/issues
+		</bugs-to>
+		<doc lang="en">
+		https://bitmessage.org/wiki/PyBitmessage_Help
+		</doc>
+		<remote-id type="github">Bitmessage/PyBitmessage</remote-id>
+	</upstream>
+	<use>
+		<flag name="opencl">Enable <pkg>dev-python/pyopencl</pkg> for GPU acceleration</flag>
+		<flag name="qrcode">Enable <pkg>dev-python/qrcode</pkg> for QR code support</flag>
+	</use>
 </pkgmetadata>
diff --git a/net-p2p/pybitmessage/pybitmessage-0.6.3.2-r1.ebuild b/net-p2p/pybitmessage/pybitmessage-0.6.3.2-r1.ebuild
deleted file mode 100644
index 68a4ee0e45d9..000000000000
--- a/net-p2p/pybitmessage/pybitmessage-0.6.3.2-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-# See https://github.com/Bitmessage/PyBitmessage/pull/952 for
-# why ipv6 is needed at the moment.
-PYTHON_REQ_USE="ipv6,sqlite"
-
-inherit distutils-r1 gnome2-utils
-
-MY_PN="PyBitmessage"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="P2P communications protocol"
-HOMEPAGE="https://bitmessage.org/"
-SRC_URI="https://github.com/Bitmessage/${MY_PN}/archive/${PV}.tar.gz
-	-> ${P}.tar.gz"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="libressl ncurses opencl sound"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}"
-
-# Some of these can be determined from src/depends.py.
-# The sound deps were found in src/bitmessageqt/__init__.py.
-# And src/openclpow.py imports numpy directly, so throw that in too.
-#
-# All of the dependencies that are behind USE flags are detected
-# and enabled automagically, so maybe it would be better if we
-# required them unconditionally?
-RDEPEND="${DEPEND}
-	dev-python/msgpack[${PYTHON_USEDEP}]
-	!libressl? ( dev-libs/openssl:0[-bindist] )
-	libressl? ( dev-libs/libressl )
-	ncurses? ( dev-python/pythondialog[${PYTHON_USEDEP}] )
-	opencl? (
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pyopencl[${PYTHON_USEDEP}]
-	)
-	sound? ( || (
-		media-sound/gst123
-		media-sound/alsa-utils
-		media-sound/mpg123
-	) )"
-
-S="${WORKDIR}/${MY_P}"
-
-python_prepare_all() {
-	# allow useage of renamed msgpack
-	sed -i '/msgpack-python/d' setup.py || die
-	distutils-r1_python_prepare_all
-}
-
-src_install () {
-	distutils-r1_src_install
-	dodoc README.md
-
-	# The man page is not installed because it's basically empty.
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/net-p2p/pybitmessage/pybitmessage-0.6.3.2_p20180326.ebuild b/net-p2p/pybitmessage/pybitmessage-0.6.3.2_p20180326.ebuild
new file mode 100644
index 000000000000..b06261624b06
--- /dev/null
+++ b/net-p2p/pybitmessage/pybitmessage-0.6.3.2_p20180326.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite"
+
+COMMIT=b210fd84d1053d3a57a888ecc8444f580d4b0651
+inherit distutils-r1 gnome2-utils
+
+MY_PN="PyBitmessage"
+
+DESCRIPTION="Reference client for Bitmessage: a P2P communications protocol"
+HOMEPAGE="https://bitmessage.org"
+SRC_URI="https://github.com/g1itch/${MY_PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug libnotify libressl ncurses opencl qrcode sound"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}"
+
+RDEPEND="${DEPEND}
+	|| (
+		dev-python/msgpack[${PYTHON_USEDEP}]
+		dev-python/u-msgpack[${PYTHON_USEDEP}]
+	)
+	dev-python/PyQt5[${PYTHON_USEDEP}]
+	dev-python/QtPy[gui,pyqt5,${PYTHON_USEDEP}]
+	debug? ( dev-python/python-prctl[${PYTHON_USEDEP}] )
+	libnotify? (
+		dev-python/pygobject[${PYTHON_USEDEP}]
+		dev-python/notify2[${PYTHON_USEDEP}]
+		x11-themes/hicolor-icon-theme
+	)
+	!libressl? ( dev-libs/openssl:0[-bindist] )
+	libressl? ( dev-libs/libressl )
+	ncurses? ( dev-python/pythondialog[${PYTHON_USEDEP}] )
+	opencl? (
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pyopencl[${PYTHON_USEDEP}]
+	)
+	qrcode? ( dev-python/qrcode[${PYTHON_USEDEP}] )
+	sound? ( || (
+		dev-python/gst-python:1.0[${PYTHON_USEDEP}]
+		media-sound/gst123
+		media-libs/gst-plugins-base:1.0
+		media-sound/mpg123
+		media-sound/alsa-utils
+	) )
+"
+
+S="${WORKDIR}"/${MY_PN}-${COMMIT}
+
+src_install () {
+	distutils-r1_src_install
+	einstalldocs
+	# The man page is not installed because it's basically empty.
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/net-p2p/qbittorrent/Manifest b/net-p2p/qbittorrent/Manifest
index 2ecbed72094a..f5af23d8889a 100644
--- a/net-p2p/qbittorrent/Manifest
+++ b/net-p2p/qbittorrent/Manifest
@@ -1,13 +1,5 @@
-AUX qbittorrent-3.3.16-cmake.patch 2025 BLAKE2B 926cd32b8e0b2f0c7833ca6d972a8cffe49cc1926fb2383dedd428e7cddc344b57aa9a0af2ae85ba141e4522fdb2391055857d17cf58b81e84c052825c5b9032 SHA512 a9c8fb1c45eb69942230a9ae509a8911f169a8801151fc8ca068d77eaa0f2bf78f19a2f4595a65c4b6b7a4390233b25c7e024f4f9a4b503f687193c6f494c34c
-AUX qbittorrent-4.0.1-nowebui.patch 854 BLAKE2B f605f99919c1eb4412f640e867dd12556d7419ef282ecd4e891d6c6668d457f8c06748ae5d6cfbf9f4b0228d1273ec08299a750052c3f2674d6b84707bdbe093 SHA512 c77fb1f23663d44fea334cf74debe5970b10d42c38874914fb2d743bd4aeb7bc6e8a4edb5fb4d6bb73abec4898e81322b263de21532fb2287cd91240afadf7b8
 AUX qbittorrent-4.0.4-werror.patch 1073 BLAKE2B c7bab1a78362f41a8a2a26fd853c81206a95f03d52f009ef19bd912921cb05ac0ac3aad9b52d06165539ff819dab98a26d230c40a2d567695d0fc59029dfa894 SHA512 908336510379d927df4e7830ae1038d23cf1000c38f2a367303d5e908224e615289b5e95cee85b87a582a16037940c1cad016ae9e902a2e5d42a0d4e4b58ad03
-DIST qbittorrent-3.3.16.tar.xz 2961420 BLAKE2B 3704e6575b1a321e04b0b9c1feee9acaf2e0ab5e0815c2cbb496265c8407c5b27111265e929ea3a516cba20acacc3b954579b5904de3411ae81726f2461dfbe0 SHA512 518ddbf8e657b3549800b5587924a8a34826895183f199b79aac72de81e6b5c009cb3b8d4fbb19151da0d96c21eb1c2f05d6ed061608cc8f589ec6fe62ce8117
-DIST qbittorrent-4.0.1.tar.xz 4256588 BLAKE2B 579e850c34c62f515807a3fb2619740442c275e9de74cd7338a9e2d72340c78a2b7f484a3ee911094cbb3b551d61a927be454466637eac2d2355e84ebec0dbd4 SHA512 76eae32ebe82953e3164a8a292132a33ccc93f5a33ce7e1ce3253f4697939b73d21e1823bada7d3b1fe7401538a7f407ebeb86c281a34e261aec0aa02d7bef80
-DIST qbittorrent-4.0.3.tar.xz 4274292 BLAKE2B c6f6a87d26f01db318ac021a8ab9f8d1ada2f7cb0d2819dfbd41e57ddbcda8a077161c78bcf8210e3571572872c13aa2255973e842c07b6b538d94ac2501c841 SHA512 d439e5428ff43ec9317bfa70b365a912a33fa12eeaad72c6916514e7b04509bf3d2e35ef9c07a36e42e7fc80f4e019f6a299fd2f93df9ec10af4a95257096ecd
 DIST qbittorrent-4.0.4.tar.xz 4279752 BLAKE2B 6385040d1179814e3290fb1c7b2d1e0b5782144663d12a067c43a2d8a47d0f0cfc0633c69f183db70eab2591ef100f39b07ea2d5e3cbca3a4d149ccb70e4d838 SHA512 ead0a306242d883673e13f9e6dc5ad83d4624c3d7ffb586aff78c03f7685e89b6a6c8640fff6a1b251565892178d37f4a64d45d0ce18935a212ca39302a28969
-EBUILD qbittorrent-3.3.16.ebuild 1427 BLAKE2B 710e1375e511e52b1da0f8466a03b311b510b722b6452fb80525517e6858fbda6f535097a5d1d26fb93c5f74f5de59f8733a10a19fe835c09f2a0f0dd779631d SHA512 c658f61dc584c05ef36b7e13c115448acbb9cdf048c4a3406e2647209eaa97ee3dd0c7a71e4407b7413b9635f72766c17d9f89a3df7ae7d9c468b7107fb313bc
-EBUILD qbittorrent-4.0.1.ebuild 1353 BLAKE2B aed8773456f37a72bcbb071d66b8ee308056c7404b8b93e48f05d537fe568a8e8da49279fa15e11684b26a24ab0ddc9def215d4749347759508dac0451bc1a45 SHA512 58c97dbef3ec0faed7c60e1e120ffe0ace7a2aaed2ba4682a44b7ba5c69d50cb17961044823df46a75dab825344883a4e0624d5c05446aa5d83a2c3115e5659e
-EBUILD qbittorrent-4.0.3-r1.ebuild 1451 BLAKE2B 1340fc6dffb5c05b05f0774cfa0b0693097a956f4acfef5a44b03fd5c741f41f1151b50d871f681b407922e42ec59e9d3e31b6a26a4954a48df34abe48cb877f SHA512 b0699e2f3ee7894a535a3e3da78c4032e40f7e64a34d99b5ac285db1f1fdca976c6e715bf1878a50ca5cbb7fc723e2a102fa9e77fe0466b2c3c683b08000b5e2
-EBUILD qbittorrent-4.0.4.ebuild 1364 BLAKE2B ee21562083f3c8f44342caecd4d20e6cd0371d4be6f9dfd1e3e8b6962e8a8a39328eb3f2d4abab745791afb2d36b7e36452692f39a62e0433100840522804680 SHA512 08ee86525118858548fb54b56a9d1373a79e8f05518a2ac4c06b1d7ce31061cd2d8c24b33853cb61cc9ca7d22980505ecd5583be2d94e9422d147745e7e7c11d
+EBUILD qbittorrent-4.0.4.ebuild 1362 BLAKE2B 075ce19a51f7b1e2c88ae7d02147cb9eecc6dc07dee37f67293b96ff888c72bc7a3ccd38cf0a15264e5fbc9c6fb73f7c66423d4312d4d68e7ca46351b0b20e89 SHA512 b3695c5cd4e4a15211f51237e835c6c1a75b44a61a4b1aa5811f5854d3182b00869061de266bd5ad149fa38d66919150c6919770dd3b65c66d39215be9e4e724
 EBUILD qbittorrent-9999.ebuild 1364 BLAKE2B ee21562083f3c8f44342caecd4d20e6cd0371d4be6f9dfd1e3e8b6962e8a8a39328eb3f2d4abab745791afb2d36b7e36452692f39a62e0433100840522804680 SHA512 08ee86525118858548fb54b56a9d1373a79e8f05518a2ac4c06b1d7ce31061cd2d8c24b33853cb61cc9ca7d22980505ecd5583be2d94e9422d147745e7e7c11d
 MISC metadata.xml 563 BLAKE2B 9d0793b4c9a7b7022c837f0f671895908c647616e1609625273a3f15dbf4bfcd384ffbfe610639235b378068aa08bfa6cd493e051a239d4ead65c4f2d3a2f672 SHA512 23f8dfd139eed877c504f7661e98168c561385930afe5b910bb60040d01b33820f25b8a9f6048001fae462bddc2199532ebd05fefe4937639f4c68e906d59462
diff --git a/net-p2p/qbittorrent/files/qbittorrent-3.3.16-cmake.patch b/net-p2p/qbittorrent/files/qbittorrent-3.3.16-cmake.patch
deleted file mode 100644
index 9f5b82b218ea..000000000000
--- a/net-p2p/qbittorrent/files/qbittorrent-3.3.16-cmake.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 0ad52903890fe680307b46f4051bdd91d8aaffd5 Mon Sep 17 00:00:00 2001
-From: Eugene Shalygin <eugene.shalygin@gmail.com>
-Date: Sat, 7 Oct 2017 21:48:52 +0200
-Subject: [PATCH] cmake: do not use Qt5Widgets when locating
- QtSingleApplication. Closes #7551.
-
-This fixes cmake builds with GUI disabled and system
-QtSingleApplication. We rely on Qt5::Core instead of Qt5::Widgets.
----
- cmake/Modules/FindQtSingleApplication.cmake | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/cmake/Modules/FindQtSingleApplication.cmake b/cmake/Modules/FindQtSingleApplication.cmake
-index eb56607e94..9b526c9839 100644
---- a/cmake/Modules/FindQtSingleApplication.cmake
-+++ b/cmake/Modules/FindQtSingleApplication.cmake
-@@ -30,9 +30,9 @@ IF(QT4_FOUND)
-         NAMES ${QTSINGLEAPPLICATION_NAMES}
-         PATHS ${QT_LIBRARY_DIR}
-     )
--ELSEIF(Qt5Widgets_FOUND)
-+ELSEIF(Qt5Core_FOUND)
-     message(STATUS "Looking for Qt5 single application library")
--    FOREACH(TOP_INCLUDE_PATH in ${Qt5Widgets_INCLUDE_DIRS} ${FRAMEWORK_INCLUDE_DIR})
-+    FOREACH(TOP_INCLUDE_PATH in ${Qt5Core_INCLUDE_DIRS} ${FRAMEWORK_INCLUDE_DIR})
-         FIND_PATH(QTSINGLEAPPLICATION_INCLUDE_DIR QtSingleApplication ${TOP_INCLUDE_PATH}/QtSolutions)
- 
-         IF(QTSINGLEAPPLICATION_INCLUDE_DIR)
-@@ -43,12 +43,12 @@ ELSEIF(Qt5Widgets_FOUND)
-     SET(QTSINGLEAPPLICATION_NAMES ${QTSINGLEAPPLICATION_NAMES}
-         Qt5Solutions_SingleApplication-2.6 libQt5Solutions_SingleApplication-2.6
-         QtSolutions_SingleApplication-2.6 libQtSolutions_SingleApplication-2.6)
--    GET_TARGET_PROPERTY(QT5_WIDGETSLIBRARY Qt5::Widgets LOCATION)
--    GET_FILENAME_COMPONENT(QT5_WIDGETSLIBRARYPATH ${QT5_WIDGETSLIBRARY} PATH)
-+    GET_TARGET_PROPERTY(_QT5_CORELIBRARY Qt5::Core LOCATION)
-+    GET_FILENAME_COMPONENT(_QT5_CORELIBRARYPATH ${_QT5_CORELIBRARY} PATH)
- 
-     FIND_LIBRARY(QTSINGLEAPPLICATION_LIBRARY
-         NAMES ${QTSINGLEAPPLICATION_NAMES}
--        PATHS ${QT5_WIDGETSLIBRARYPATH}
-+        PATHS ${_QT5_CORELIBRARYPATH}
-     )
- ENDIF()
- 
diff --git a/net-p2p/qbittorrent/files/qbittorrent-4.0.1-nowebui.patch b/net-p2p/qbittorrent/files/qbittorrent-4.0.1-nowebui.patch
deleted file mode 100644
index 2a7f5dbb47c5..000000000000
--- a/net-p2p/qbittorrent/files/qbittorrent-4.0.1-nowebui.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From af898e9117b475230e793fa4fd75274145ecf25d Mon Sep 17 00:00:00 2001
-From: Heiko Becker <heirecka@exherbo.org>
-Date: Wed, 22 Nov 2017 21:29:20 +0100
-Subject: [PATCH] Fix build with --disable-webui
-
-"app/application.cpp:108:7: error: class 'Application' does not have
-any field named 'm_webui'"
----
- src/app/application.cpp | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/app/application.cpp b/src/app/application.cpp
-index 3b0d4d78de..b3221efa88 100644
---- a/src/app/application.cpp
-+++ b/src/app/application.cpp
-@@ -105,7 +105,9 @@ Application::Application(const QString &id, int &argc, char **argv)
-     , m_running(false)
-     , m_shutdownAct(ShutdownDialogAction::Exit)
-     , m_commandLineArgs(parseCommandLine(this->arguments()))
-+#ifndef DISABLE_WEBUI
-     , m_webui(nullptr)
-+#endif
- {
-     qRegisterMetaType<Log::Msg>("Log::Msg");
- 
diff --git a/net-p2p/qbittorrent/qbittorrent-3.3.16.ebuild b/net-p2p/qbittorrent/qbittorrent-3.3.16.ebuild
deleted file mode 100644
index 6511503962b7..000000000000
--- a/net-p2p/qbittorrent/qbittorrent-3.3.16.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils xdg-utils
-
-DESCRIPTION="BitTorrent client in C++ and Qt"
-HOMEPAGE="https://www.qbittorrent.org/"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/${PN}/qBittorrent.git"
-else
-	MY_P=${P/_}
-	SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~ppc64 x86"
-	S=${WORKDIR}/${MY_P}
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+dbus debug webui +X"
-REQUIRED_USE="dbus? ( X )"
-
-RDEPEND="
-	>=dev-libs/boost-1.62.0-r1:=
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtnetwork:5[ssl]
-	>=dev-qt/qtsingleapplication-2.6.1_p20130904-r1[qt5,X?]
-	dev-qt/qtxml:5
-	>=net-libs/libtorrent-rasterbar-1.0.6
-	sys-libs/zlib
-	dbus? ( dev-qt/qtdbus:5 )
-	X? (
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-	)"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS Changelog CONTRIBUTING.md README.md TODO )
-
-PATCHES=( "${FILESDIR}/${P}-cmake.patch" )
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# bug 641010
-	sed -i -e "s/-Werror //" cmake/Modules/MacroQbtCompilerSettings.cmake || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DSYSTEM_QTSINGLEAPPLICATION=ON
-		-DDBUS=$(usex dbus)
-		-DGUI=$(usex X)
-		-DWEBUI=$(usex webui)
-	)
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/net-p2p/qbittorrent/qbittorrent-4.0.1.ebuild b/net-p2p/qbittorrent/qbittorrent-4.0.1.ebuild
deleted file mode 100644
index a1573cc1deb3..000000000000
--- a/net-p2p/qbittorrent/qbittorrent-4.0.1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils gnome2-utils xdg-utils
-
-DESCRIPTION="BitTorrent client in C++ and Qt"
-HOMEPAGE="https://www.qbittorrent.org/"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/${PN}/qBittorrent.git"
-else
-	MY_P=${P/_}
-	SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
-	S=${WORKDIR}/${MY_P}
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+dbus debug webui +X"
-REQUIRED_USE="dbus? ( X )"
-
-RDEPEND="
-	>=dev-libs/boost-1.62.0-r1:=
-	dev-qt/qtcore:5
-	dev-qt/qtnetwork:5[ssl]
-	>=dev-qt/qtsingleapplication-2.6.1_p20130904-r1[qt5,X?]
-	dev-qt/qtxml:5
-	>=net-libs/libtorrent-rasterbar-1.0.6
-	sys-libs/zlib
-	dbus? ( dev-qt/qtdbus:5 )
-	X? (
-		dev-qt/qtgui:5
-		dev-qt/qtsvg:5
-		dev-qt/qtwidgets:5
-	)"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS Changelog CONTRIBUTING.md README.md TODO )
-
-PATCHES=( "${FILESDIR}/${P}-nowebui.patch" )
-
-src_configure() {
-	local mycmakeargs=(
-		-DSYSTEM_QTSINGLEAPPLICATION=ON
-		-DDBUS=$(usex dbus)
-		-DGUI=$(usex X)
-		-DWEBUI=$(usex webui)
-	)
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/net-p2p/qbittorrent/qbittorrent-4.0.3-r1.ebuild b/net-p2p/qbittorrent/qbittorrent-4.0.3-r1.ebuild
deleted file mode 100644
index edf719c91133..000000000000
--- a/net-p2p/qbittorrent/qbittorrent-4.0.3-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils gnome2-utils xdg-utils
-
-DESCRIPTION="BitTorrent client in C++ and Qt"
-HOMEPAGE="https://www.qbittorrent.org/"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/${PN}/qBittorrent.git"
-else
-	MY_P=${P/_}
-	SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
-	S=${WORKDIR}/${MY_P}
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+dbus debug webui +X"
-REQUIRED_USE="dbus? ( X )"
-
-RDEPEND="
-	>=dev-libs/boost-1.62.0-r1:=
-	dev-qt/qtcore:5
-	dev-qt/qtnetwork:5[ssl]
-	>=dev-qt/qtsingleapplication-2.6.1_p20130904-r1[qt5(+),X?]
-	dev-qt/qtxml:5
-	>=net-libs/libtorrent-rasterbar-1.0.6:0=
-	sys-libs/zlib
-	dbus? ( dev-qt/qtdbus:5 )
-	X? (
-		dev-qt/qtgui:5
-		dev-qt/qtsvg:5
-		dev-qt/qtwidgets:5
-	)"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS Changelog CONTRIBUTING.md README.md TODO )
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# bug 641382
-	sed -i -e "s/-Werror  //" cmake/Modules/MacroQbtCompilerSettings.cmake || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DSYSTEM_QTSINGLEAPPLICATION=ON
-		-DDBUS=$(usex dbus)
-		-DGUI=$(usex X)
-		-DWEBUI=$(usex webui)
-	)
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/net-p2p/qbittorrent/qbittorrent-4.0.4.ebuild b/net-p2p/qbittorrent/qbittorrent-4.0.4.ebuild
index 1f76cf096f6e..5dd7f3076599 100644
--- a/net-p2p/qbittorrent/qbittorrent-4.0.4.ebuild
+++ b/net-p2p/qbittorrent/qbittorrent-4.0.4.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]]; then
 else
 	MY_P=${P/_}
 	SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~ppc64 x86"
 	S=${WORKDIR}/${MY_P}
 fi
 
diff --git a/net-p2p/retroshare/Manifest b/net-p2p/retroshare/Manifest
index f1756e37d969..679adca73d1c 100644
--- a/net-p2p/retroshare/Manifest
+++ b/net-p2p/retroshare/Manifest
@@ -1,7 +1,7 @@
 AUX retroshare-0.6.3-fix-comment.patch 820 BLAKE2B 361dc83fbe46550ca7b9b6f7c5d0a21bf99b958575aa1e50f9492c790a9f46e52402ba47515a3a3e90c14b7d229dc7d13f3397336aa2b7f67c0147aab3dd67ef SHA512 d27e7a655a0848a1e5feb11778df8e3b1a6a1a6fdde09848d78cb4550842e7b9a581491c7040ce1642773db6b0429f67ff3069c6fc6d6938c20d97e91af5c6bb
-DIST retroshare-0.6.2.tar.gz 18523943 BLAKE2B 92be204bcc028685651af9d5eecbde655a37c649e5e2423fb4114b00d392cd9f15292bcba5b8f5069c30b1d7ccb177b31842105595e8fb29ac8970404f9040d8 SHA512 7b935321f436d72948c5c0286ef5e0236bd52d1b25f00980a3b3644ae4acbde043063279f90f6bc0356363bceda484aba57e160f34f013dde120b4f6969ef6c7
 DIST retroshare-0.6.3.tar.gz 19699359 BLAKE2B 5a7a77b5ab43d44928e08fd1edc3bd6baa8b42f5c1e68fb079d3c60786c1068914a4f7a4b32fe4b683e7b990fac1bd09e5af66a09a3e9b7013e5b51b3c69ae8c SHA512 ee699ddc71aba3d20498d46e8183953b948896709d1469a5d5374b7c9b7955e460326b1ea3fe6f87e7235c5d2d5e8f042161410a0990b2dd2a44b42551fb5757
-EBUILD retroshare-0.6.2.ebuild 3606 BLAKE2B 71fb5f596d4b829fb79a9237389dcce7e568e17c5a91f4531b69890aab13186ce4563b84426d2514f01cc1bea4848d190dd0be9bf9cbaddcd60226d573ba051f SHA512 cc7b3a218a362d36ea8b4aae6978cbd2c9394924dda1d172feccc3445cf7e73245e38dccd00213d5f67645c07fbf37a4ecf1b1dca24c5d93e5b3050272d5a28b
-EBUILD retroshare-0.6.3.ebuild 3926 BLAKE2B 7033c08985a35a7ae8a7750ea67ec07d5ad57579336abc37ee03959a9e518ba62e957d026437ace0251746636073960fc67a00e0b0aefc523864138f6060fa4e SHA512 5f0007f05015f26000614da3ede681db96ab800651a425ee2f11706d02dfa6d546651f268b0db1fe764317aba392a4770f38f50e15eb6e420eb911fd088dfc72
+DIST retroshare-0.6.4.tar.gz 20018361 BLAKE2B 63a32ee3a22f4df8b9f6cff149be2c9a9cf18ac895456c808885d510b261f683bf57141b8beb4a0206f7e61eb5c88ce505440956ccdf963ad6ad7f7a73679fb3 SHA512 7fcca6479b73cb4d70532fe46bb4cf24332d523b14a198a0e81689d0e00b62ca300d167be5ac282200e97f5fd9dc6b6c3a2c992ab1daa25846db1a404bf616f8
+EBUILD retroshare-0.6.3-r1.ebuild 3946 BLAKE2B e4078aa47a2553aa113eacb37aac1772db81c5560423af5abcebd847925853fc6a69faba386711a38a96aaf9e9b728afffc453c2cdc9232c9289a426ea424096 SHA512 3c24cd55ddab91ead27966d354320460f7789cb91970d8d0e1628c7e232ee46420aeb1a86334625c6d3a2d4fe83e56cdfad47f1706141ae1d58531edf353697f
+EBUILD retroshare-0.6.4.ebuild 3764 BLAKE2B c83c72a6ed62fb842bd615110b2798a1f6b4bb969c528e01361317dadd60c4f16f0f5d97adca5b636a4b685aa058ab0895124859e59314f8a7f674270c0c8442 SHA512 11244e1503df26aa8a0dbc52a16535389c32dd5147efd1f359d2ad249e34b57580d36d68040f9684f17081fab47c6d10231f91910bbe576bb5351a2166a477ae
 EBUILD retroshare-0.6.9999.ebuild 3677 BLAKE2B 367bd726db6e098306faa452eefb243b687b315cabd826569b5b4c06da77feb467522df5320a43ef857d9b5ec010d307f083932e43d2d5287706fd9c29782a17 SHA512 4d194c1dc3e0b9000448fa1297d23d873406ec64ed5a30c8571155bf9fd74d815ef115b4df2274e64b12e3b891ae082ae1fb6500accb85bf2e351b1a8557e407
-MISC metadata.xml 1209 BLAKE2B ad7c60a83b221f6519a90a2a075be1fa80c5d70d930ec0733ac517fe50704544acbf0eaa1939a92bf041356af74f1716017d427164c5b1c31f735ad667a17a2b SHA512 5cc0be6c279660138cfd37d25ab01cf680e4519556334102d927bd6a034c652bc81465bb35f17dfba76f0d9bce4c5a6a63362b54b2fc66b4c357ca8728b80797
+MISC metadata.xml 1438 BLAKE2B 2ff0a717f2636ca3514e259dd5db03cf80659636852aa0b0ac160249a8314cae98cfd49a576c4afd82bdc0bfc69bad7152c6b3dd0a817fe9f78bc003b538bf51 SHA512 25d01bf264c4bea00ae077cc24766857e0e5a70a1b805482956e5fc03720edbfbf0a4915fd64cb758fe6a0679212325d0d8d66b101c8a4ec31a0ffe6b4f9e489
diff --git a/net-p2p/retroshare/metadata.xml b/net-p2p/retroshare/metadata.xml
index b92e67f30115..d634614148a0 100644
--- a/net-p2p/retroshare/metadata.xml
+++ b/net-p2p/retroshare/metadata.xml
@@ -2,6 +2,14 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
+		<email>gio@eigenlab.org</email>
+		<name>Gioacchino Mazzurco</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<maintainer type="person">
 		<email>pinkbyte@gentoo.org</email>
 		<name>Sergey Popov</name>
 	</maintainer>
diff --git a/net-p2p/retroshare/retroshare-0.6.3.ebuild b/net-p2p/retroshare/retroshare-0.6.3-r1.ebuild
index 8e7f93647e41..faf5d585b2cd 100644
--- a/net-p2p/retroshare/retroshare-0.6.3.ebuild
+++ b/net-p2p/retroshare/retroshare-0.6.3-r1.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
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/RetroShare/RetroShare/archive/v${PV}.tar.gz -> ${P}.
 # pegmarkdown can also be used with MIT
 LICENSE="GPL-2 GPL-3 Apache-2.0 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 IUSE="cli feedreader gnome-keyring +gui voip"
 REQUIRED_USE="
@@ -50,6 +50,7 @@ RDEPEND="
 	voip? (
 		media-libs/opencv[-qt4(-)]
 		media-libs/speex
+		media-libs/speexdsp
 		virtual/ffmpeg[encode]
 	)"
 DEPEND="${RDEPEND}
diff --git a/net-p2p/retroshare/retroshare-0.6.2.ebuild b/net-p2p/retroshare/retroshare-0.6.4.ebuild
index 86ae46473b4a..89ef994223cd 100644
--- a/net-p2p/retroshare/retroshare-0.6.2.ebuild
+++ b/net-p2p/retroshare/retroshare-0.6.4.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
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/RetroShare/RetroShare/archive/v${PV}.tar.gz -> ${P}.
 # pegmarkdown can also be used with MIT
 LICENSE="GPL-2 GPL-3 Apache-2.0 LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 
 IUSE="cli feedreader gnome-keyring +gui voip"
 REQUIRED_USE="
@@ -50,6 +50,7 @@ RDEPEND="
 	voip? (
 		media-libs/opencv[-qt4(-)]
 		media-libs/speex
+		media-libs/speexdsp
 		virtual/ffmpeg[encode]
 	)"
 DEPEND="${RDEPEND}
@@ -79,7 +80,7 @@ src_prepare() {
 		retroshare-nogui/src/retroshare-nogui.pro || die 'sed on retroshare-gui/src/retroshare-gui.pro failed'
 
 	# Avoid openpgpsdk false dependency on qtgui
-	sed -i '2iQT -= gui' openpgpsdk/src/openpgpsdk.pro
+	sed -i '2iQT -= gui' openpgpsdk/src/openpgpsdk.pro || die
 
 	eapply_user
 }
@@ -106,22 +107,22 @@ src_install() {
 	local i
 	local extension_dir="/usr/$(get_libdir)/${PN}/extensions6/"
 
-	use cli && dobin retroshare-nogui/src/RetroShare06-nogui
-	use gui && dobin retroshare-gui/src/RetroShare06
+	use cli && dobin retroshare-nogui/src/retroshare-nogui
+	use gui && dobin retroshare-gui/src/retroshare
 
 	exeinto "${extension_dir}"
 	use feedreader && doexe plugins/FeedReader/*.so*
 	use voip && doexe plugins/VOIP/*.so*
 
-	insinto /usr/share/RetroShare06
+	insinto /usr/share/retroshare
 	doins libbitdht/src/bitdht/bdboot.txt
 
 	doins -r libresapi/src/webui
 
 	dodoc README.md
-	make_desktop_entry RetroShare06
+	make_desktop_entry retroshare
 	for i in 24 48 64 128 ; do
-		doicon -s ${i} "data/${i}x${i}/apps/retroshare06.png"
+		doicon -s ${i} "data/${i}x${i}/apps/retroshare.png"
 	done
 }
 
@@ -136,6 +137,10 @@ pkg_preinst() {
 			elog "generate a new certificate or import existing from a backup"
 			break
 		fi
+		if version_is_at_least 0.6.0 ${ver}; then
+			elog "Main executable was renamed upstream from RetroShare06 to retroshare"
+			break
+		fi
 	done
 	gnome2_icon_savelist
 }
diff --git a/net-p2p/vuze-coreplugins/Manifest b/net-p2p/vuze-coreplugins/Manifest
index 39d1037a32bf..c49d05332119 100644
--- a/net-p2p/vuze-coreplugins/Manifest
+++ b/net-p2p/vuze-coreplugins/Manifest
@@ -7,5 +7,5 @@ DIST azupdater_1.9.2.zip 26390 BLAKE2B 9c146beee646cd4a31a1014286d4a2bdbe791b584
 DIST azupnpav_0.4.6.zip 247837 BLAKE2B 1c4060515b963bc1edab9a8f5195232aec268eabc67830c94ace69868726e89ff697647c1f00056cb551c53b517c672990dcb7693f025f8f4a6c6cf77dde0b4c SHA512 eee392cf82aae37b2689ce086fb00727728064552ca31bbf228d3d76407c15f92d30527b979dfc555dbf3a1ead65d991c55d8c517c0f5c93d5a3890b88bfa6b1
 DIST azupnpav_0.5.6.zip 264588 BLAKE2B dafaaa89dc9978e06e40bb56e4a76523c2c5e66f0e01beaa0af1b216f2f23348850c93d2f4e85ee2c9458b3d932dc44598a1d72f9c0149964e0533b30395dc59 SHA512 f780e708db51eb4e02ee1dedd445aa72f8a52dc6711d473b93339a2db9492654f93d44cde8456bb7db457b3bca88e15132ce0bc5221247ccb34672ae58bca172
 EBUILD vuze-coreplugins-4.8.1.2.ebuild 1978 BLAKE2B dc7a4e6e4032b9bdc95a25e57b5013dc71c8f2c6bd3f13d8e111d096821cba74d4ebccc5a9f3e9a6cc60ecd974732168a8df033ea84047b56c0287ff58582ada SHA512 e3190df7d088dc28a7c935249596798f3a519920f3adea77827bffab9755d6b71569a93d27356faaf8abdf7190c646f7b5983d5c23b57abaea589204e86f552d
-EBUILD vuze-coreplugins-5.7.2.0.ebuild 1473 BLAKE2B 9e3b63d72b1037c9bfd9c4a5b93410668baa1bee3ef074e3f824a8641462581d87acfc538644e2e8ad3b06f51e3928f7b9fa61f037c4f9a555b3ac97334ecd2f SHA512 b78e9456858625da582313277a04f0c92cf426df8538f3a70deed1fcf340ce99b99d6a11f37a7f6248f15923b46a8ec2b8cb5e9e664307ac0cc4e471f9129a4a
+EBUILD vuze-coreplugins-5.7.2.0.ebuild 1472 BLAKE2B 3fc1ae53a45d4bf1ed544d3c665f82baa8b29e7df2655f3a87dc482d62456b85d67f827a646a11cb76ff48081027f421000a4a95853e079020b6376e92306eaa SHA512 9b5d40aff53fa5f820e7e08c4c069ee5274577a6e5a23fc175702d0b4f7a2b440899ef21bc91fb4ff4ed11690999cf11f6e9db4c92ff1c8ca76d54f85b9395f3
 MISC metadata.xml 313 BLAKE2B fc77cc23994c00f76b282bfb170062f085fb1c83ced23e4a38d141acb5e2c4d259988541a0538de48dfe7e943132d4446467df8745b1e171ecdf3ece1f2e0eff SHA512 f77617dfe493bf5cc08c1db751bb8eed8275938f57c9fbe19584adf19bdaa4481c9bf3ece012859641f0e811ae2ce4ce058899a6c3075defc738c25e21b300d1
diff --git a/net-p2p/vuze-coreplugins/vuze-coreplugins-5.7.2.0.ebuild b/net-p2p/vuze-coreplugins/vuze-coreplugins-5.7.2.0.ebuild
index c31a7da4913c..922c8ba1f7c9 100644
--- a/net-p2p/vuze-coreplugins/vuze-coreplugins-5.7.2.0.ebuild
+++ b/net-p2p/vuze-coreplugins/vuze-coreplugins-5.7.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -26,7 +26,7 @@ SRC_URI="
 LICENSE="GPL-2 BSD"
 
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND="~net-p2p/vuze-${PV}"
diff --git a/net-p2p/vuze/Manifest b/net-p2p/vuze/Manifest
index 8a985b6d88ab..527df07e0699 100644
--- a/net-p2p/vuze/Manifest
+++ b/net-p2p/vuze/Manifest
@@ -14,6 +14,6 @@ DIST Vuze_4812_source.zip 9530217 BLAKE2B af55951a9d8b86a03483e6e9ebc6f63cd7a730
 DIST Vuze_5720_source.zip 10709515 BLAKE2B e2824c3486cbf942ba644563cf8a0b47d99f42cdba6c0fe2d93e47c5717f1331df632a4a100b6679f3f456697f70837202e84bf2fa89c362186353af98a36173 SHA512 073af0c68219884aaf1b860fcc04cf75edaf662f1e82fe6c49f615b928b00d1a50d25f348c6bf5a922fa1c5a53c7bce5f75b7a0c065602675bcb6d80c1c92edf
 DIST vuze-4.5.0.2-gentoo-patches.tar.bz2 3143 BLAKE2B 4acaf56539798102e498c2678c8f3239ecc141909738dd1a84fca5cb38516fb363da6ff87d65b08fe04b550d8aafc9f33fa2d404b70f5e34a3129a43080794b5 SHA512 aacaeb404d9b7dbb40d89b04f9ad26caf447202b1fcb63d532f5e01dc611152adbc38804563f1a35227a080b2eadec0e2e42d0baa163d1d5489eec65cd28f83d
 EBUILD vuze-4.8.1.2-r1.ebuild 4009 BLAKE2B cf4c682b9aa7523e63d5d652b963bacbc3592bee5e8787d8d8d7e0090e9683b8f23c4f8757a5a495d7a581cd61f9e7843eea4325ca20ec347989d50988e96246 SHA512 b161e31d14594bd795bb02a6b0a83b09e6ca6db10b8e8078f8422c202575d8fe3d03c2e111ada4fcb806062e71f7acde163c31c63e8f0c29fd8221223edd6a26
-EBUILD vuze-5.7.2.0-r1.ebuild 4259 BLAKE2B 569c106b89514154a1e43162fde108d1a7f876c7219bd02017cd4369f09441292991ff24f1f14267dd10a694107154ccee65b0fe2bd7c6e7270b2fa5674ae7c4 SHA512 f78617b46e0574e3749b97fda9535f0eb119bea0b88ba948c1435dd854c0a862cd12843466e90c6ef7eeede23f8668967c89b81b69b6a03fe324ccd254d17b63
+EBUILD vuze-5.7.2.0-r1.ebuild 4267 BLAKE2B 6767490e9bbf56cc3ca96dce08ede344ff37fd659a45fe5818c86dc9e15fd7f0f9ef29e8d941959145bb3d541df8c857f0279df2b65c140402ebbb8c724ccaba SHA512 a33bd7723ca5076f9372992cb49fd75e1d80183f4c71a599c160140f299a0b02217e88b25d840c62984e47a43466aa1830666b83cd4111069f232cfeef3a06d0
 EBUILD vuze-5.7.2.0.ebuild 4202 BLAKE2B 566b413c98b31d0e6af8e825e7512dedee93aa895fe65e82b96b9807843d38db49ccb7b6fc038768eec1278bb164107308f6ebc37910811e7e8003d5c5555274 SHA512 30018294bf0a93e9970c031ea21ff5923324cf61938a993a0bac7b3f149e67ea519f4a38d99b6e821566fbc5a0f2caafa1600352d4454a9efbccf91ca18a96e0
 MISC metadata.xml 313 BLAKE2B fc77cc23994c00f76b282bfb170062f085fb1c83ced23e4a38d141acb5e2c4d259988541a0538de48dfe7e943132d4446467df8745b1e171ecdf3ece1f2e0eff SHA512 f77617dfe493bf5cc08c1db751bb8eed8275938f57c9fbe19584adf19bdaa4481c9bf3ece012859641f0e811ae2ce4ce058899a6c3075defc738c25e21b300d1
diff --git a/net-p2p/vuze/vuze-5.7.2.0-r1.ebuild b/net-p2p/vuze/vuze-5.7.2.0-r1.ebuild
index 2a2c3367864a..814c09731fed 100644
--- a/net-p2p/vuze/vuze-5.7.2.0-r1.ebuild
+++ b/net-p2p/vuze/vuze-5.7.2.0-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/azureus/${PN}/${MY_SRC}/${MY_SRC}_source.zip"
 LICENSE="GPL-2 BSD"
 
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc64 ~x86"
 
 # bundles parts of http://www.programmers-friend.org/
 # bundles bcprov - 1.37 required but not in the tree
@@ -51,7 +51,9 @@ src_unpack() {
 	cp "${FILESDIR}"/build.xml "${S}" || die "failed to copy build.xml"
 }
 
-java_prepare() {
+src_prepare() {
+	default
+
 	# upstream likes randomly changing a subset of files to CRLF every release
 	edos2unix $(find "${S}" -type f -name "*.java")