gentoo resync : 25.08.2018

16 files changed, 253 insertions, 193 deletions

diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz
index dbde59f3bba6..4e7608b4f6bf 100644
--- a/net-p2p/Manifest.gz
+++ b/net-p2p/Manifest.gz
diff --git a/net-p2p/classified-ads/Manifest b/net-p2p/classified-ads/Manifest
index 93b431376d79..35b02ec4bd4f 100644
--- a/net-p2p/classified-ads/Manifest
+++ b/net-p2p/classified-ads/Manifest
@@ -1,8 +1,11 @@
 AUX classified-ads-0.12-unit-tests.patch 2200 BLAKE2B 7d8205798aab3bbc04c7b3feada407e347e74887a2ec7bba5fd230345c805d6ffc8110a4f378a4c782049d9d205aa957698eb5421134fb0049c28db42ee490ab SHA512 ffcb49fac566ca410f1b49092f6a799f08bedbb4288b58aa0b702e9456a6aa7d0d0739a0893c7e6072cc2d1bff36e681e43a7c5993bd0e834e9dd8e5545af3dc
 DIST classified-ads-0.11.tar.gz 2528877 BLAKE2B a2e9bfe2acdf9e95cd6e7246ca50525fdfbaf8b11b8fac41faa7c8fe01db7a4cf1055a69b4cf9168bbce7e7e25438b44d57a50669c3c406015df357c20e9106d SHA512 29e1af0eac079201354364959af8dc606f4d7595fe4e8013212c4e5b30622d095e2beaeeadce350974ef32680329664ad37aae575c103fa052345acf0a49ed04
 DIST classified-ads-0.12.tar.gz 2639300 BLAKE2B 09822a4908e3a34fbd00af60effa53c437e1e32cb1821c0041ca0cb87f4deb74ba79603c5d5aa5fe37384f2bc32f2ccd2979711c2de1e2864361904e62e2de26 SHA512 cbcd3f40cd9003b840b1305361f93c901b073c653f610e46154e8ff1db92167ce77aafe5179168d7403fed7b22fab60cadfc8c1fc95ebe37a4f7ffc616b66929
+DIST classified-ads-0.13.tar.gz 2656104 BLAKE2B d02f723d7371abc2a8c0a6bfde300c8a4f16e5fcc43a17c5d8b8cce4ab21371df82b734e5813ebded6672e8448b7e8ee19c68836926dcc7af1824bfa173de0ef SHA512 7b6114705ac5867223e4e74c13aad47a4a38c24cd5e062e50dd7c0a5829ff011151a93562b1a5ab37f04fe3d6a93258e9ca4845748bbb02db882818284fe4a3a
 DIST classified-ads-graphics-0.11.tar.gz 340476 BLAKE2B c9bac95f0e620a671959f0eb8c719cd70be5c9340ccb3bc3baa7eae669b5201d3127880b9006a4031e09be09e72754c8ec07824b3581e3af691c3944d5b32d21 SHA512 c59f65f37a8e4dddb753dbcdec835e946d9de021c5273319b3cd95ef1c3343715ce4b87d76b2d96264acc791a6cced32967521c74978131bd76fbcfc37bb344d
 DIST classified-ads-graphics-0.12.tar.gz 340476 BLAKE2B c9bac95f0e620a671959f0eb8c719cd70be5c9340ccb3bc3baa7eae669b5201d3127880b9006a4031e09be09e72754c8ec07824b3581e3af691c3944d5b32d21 SHA512 c59f65f37a8e4dddb753dbcdec835e946d9de021c5273319b3cd95ef1c3343715ce4b87d76b2d96264acc791a6cced32967521c74978131bd76fbcfc37bb344d
+DIST classified-ads-graphics-0.13.tar.gz 340476 BLAKE2B c9bac95f0e620a671959f0eb8c719cd70be5c9340ccb3bc3baa7eae669b5201d3127880b9006a4031e09be09e72754c8ec07824b3581e3af691c3944d5b32d21 SHA512 c59f65f37a8e4dddb753dbcdec835e946d9de021c5273319b3cd95ef1c3343715ce4b87d76b2d96264acc791a6cced32967521c74978131bd76fbcfc37bb344d
 EBUILD classified-ads-0.11.ebuild 1735 BLAKE2B 24ae015cd8d3e808269bb7b162b4078e2d3848ff7cb8b0a0eae8769c0c11ac62e89ad30d1c3c7b8aa5892983605ddd9028291ff19baaba1649dfbd784be26443 SHA512 86392db458ae8b0341e08e50753b59db1c8cbb3313481e110ed9da4a4818e8cdced4fba2cf08448c842786dfb156ce34d7a58b594955f896d829969f5f9f78b7
 EBUILD classified-ads-0.12.ebuild 1931 BLAKE2B 54589943a591f3f42906e62d8a98792e386dcfde98d6c02573c9d1cd01ca6a6375e2dbaaf198430014d7984013e1b493334261e632f60e7200f4d4efb19a1966 SHA512 4635643f7d607adba051a270137abe0bc71b48d582ae6df1071e86edc8d6f046ce62afd13d03583ed3c8cd51bf8b6e6fce1fef7003d06328a0a2604d154a8193
+EBUILD classified-ads-0.13.ebuild 1713 BLAKE2B 18c48b2bed0a0d6cd304ce4ddef80f40f33861670eb539cd3d13406cb5a7e44d017bcd30d00626ac322e5a12e211961b4d7a120425afb2e5d8373f55378169ab SHA512 7af80fbaf8a530fd63b623d5974bf911cd74d97578950b707090c126efce84ca40f881dd534ddde85133e1d33ce75bb952ea090c62db9d36b3f0dc3b4eebcba8
 MISC metadata.xml 1779 BLAKE2B 3d4309e69e73ff9b36329f1d9b486f9dc7b0c1077c953e4e08294760fc5b03c28709b373b94e68d742ed3f3e0b9da40cb2d6aa0295165f33c6f492d7ed0cee5d SHA512 1211585a2baa83604cbfb4e4c4fbd2d30d95359bd9d7246a831c238254c2b57433c974307ac8188f73175c5110e80ac89eaa137a67c0613e5550338d70864b78
diff --git a/net-p2p/classified-ads/classified-ads-0.13.ebuild b/net-p2p/classified-ads/classified-ads-0.13.ebuild
new file mode 100644
index 000000000000..ecb91cfc86f0
--- /dev/null
+++ b/net-p2p/classified-ads/classified-ads-0.13.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit qmake-utils virtualx
+
+DESCRIPTION="Program for displaying classified advertisement items"
+HOMEPAGE="http://katiska.org/classified-ads/"
+SRC_URI="https://github.com/operatornormal/classified-ads/archive/${PV}.tar.gz
+	-> classified-ads-${PV}.tar.gz
+	https://github.com/operatornormal/classified-ads/blob/graphics/preprocessed.tar.gz?raw=true
+	-> classified-ads-graphics-${PV}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="doc test"
+
+RDEPEND="app-arch/bzip2
+	dev-lang/tcl:=
+	dev-lang/tk:=
+	dev-libs/openssl:0
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtmultimedia:5[widgets]
+	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtprintsupport:5
+	dev-qt/qtsql:5[sqlite]
+	dev-qt/qtwidgets:5
+	media-libs/opus
+	net-libs/libnatpmp
+	net-libs/miniupnpc
+	sys-apps/file
+	sys-libs/zlib
+	virtual/libintl"
+
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	doc? ( app-doc/doxygen[dot] )
+	test? ( dev-libs/libgcrypt:0
+		dev-qt/qttest:5
+		sys-devel/gdb:0 )"
+
+src_prepare() {
+	# preprocessed graphics are unpacked into wrong directory
+	# so lets move them into correct location:
+	mv ../ui/* ui/ || die
+	# possible patches
+	eapply_user
+}
+
+src_configure() {
+	eqmake5
+	if use test; then
+		cd testca || die
+		eqmake5
+	fi
+}
+
+src_compile() {
+	emake
+	if use doc; then
+		pushd doc > /dev/null || die
+		doxygen || die
+		popd > /dev/null || die
+	fi
+	if use test; then
+		emake -C testca
+	fi
+}
+
+src_test() {
+	# testca will return 0 if all unit tests pass
+	virtx ./testca/testca
+}
+
+src_install() {
+	docompress -x /usr/share/doc/
+	emake install INSTALL_ROOT="${D}" DESTDIR="${D}"
+	use doc && dodoc -r doc/doxygen.generated/html/.
+}
diff --git a/net-p2p/qbittorrent/Manifest b/net-p2p/qbittorrent/Manifest
index 299f46bea295..8ed365e8aeef 100644
--- a/net-p2p/qbittorrent/Manifest
+++ b/net-p2p/qbittorrent/Manifest
@@ -1,7 +1,9 @@
 AUX qbittorrent-4.0.4-werror.patch 1073 BLAKE2B c7bab1a78362f41a8a2a26fd853c81206a95f03d52f009ef19bd912921cb05ac0ac3aad9b52d06165539ff819dab98a26d230c40a2d567695d0fc59029dfa894 SHA512 908336510379d927df4e7830ae1038d23cf1000c38f2a367303d5e908224e615289b5e95cee85b87a582a16037940c1cad016ae9e902a2e5d42a0d4e4b58ad03
 DIST qbittorrent-4.0.4.tar.xz 4279752 BLAKE2B 6385040d1179814e3290fb1c7b2d1e0b5782144663d12a067c43a2d8a47d0f0cfc0633c69f183db70eab2591ef100f39b07ea2d5e3cbca3a4d149ccb70e4d838 SHA512 ead0a306242d883673e13f9e6dc5ad83d4624c3d7ffb586aff78c03f7685e89b6a6c8640fff6a1b251565892178d37f4a64d45d0ce18935a212ca39302a28969
 DIST qbittorrent-4.1.1.tar.gz 7464014 BLAKE2B be005fbecd1d2c9ee977fbdc6782bbad9708e3c2c6d46deb5831ae4e7457954cb95ae87850b759e81e87e345ca682acfcd23684b7704c437c4261ebb5bb46f5d SHA512 700c084b97556ba85276b42e46f77d5f7896052ce02ba052cd4b3e6967c8a848c27bcf63a289bf8276b38841bb9a80b9ec16335c3feb30dce0851170f54d101e
-EBUILD qbittorrent-4.0.4.ebuild 1362 BLAKE2B 075ce19a51f7b1e2c88ae7d02147cb9eecc6dc07dee37f67293b96ff888c72bc7a3ccd38cf0a15264e5fbc9c6fb73f7c66423d4312d4d68e7ca46351b0b20e89 SHA512 b3695c5cd4e4a15211f51237e835c6c1a75b44a61a4b1aa5811f5854d3182b00869061de266bd5ad149fa38d66919150c6919770dd3b65c66d39215be9e4e724
-EBUILD qbittorrent-4.1.1.ebuild 1425 BLAKE2B 9ae1167d4559172a81256aedc125ea4020d07ef944633eb8d570ac6cf2e7dcd91a4b4094b70b2228bfa7010077c4c7b28401c412fcdd58cf8945370b71f70aa2 SHA512 d6f99855e4667dacbc705dece1cf557af4fb7961f92bc5f2b2a7849d30b2979daffa5b63c19d4951e8dffbcc54734c44a028dbe525639a9aaed0b4387a232f3a
-EBUILD qbittorrent-9999.ebuild 1442 BLAKE2B ff626b63a01a1213b463780dade1f0a2657c209f62fd56049d320c9734708f599f462a4fd79e8d6917e6a40fb46daded7b2723d0f4f082f4a4113d2932afe947 SHA512 c2590b871d873a2a47893983b758783098984edaa12065951e60004ae389352e4ca0722cea26e937c8d4913c132a41491db48e53f1c3b712332e12b5d04f3f64
+DIST qbittorrent-4.1.2.tar.gz 7697135 BLAKE2B 13e9456fd43395d597156519bdd665db898d462761dc5fe5f92e40994e8d0e214b0a1f9d8d327d44f8deb287c646c7013c17099bca193d85d1a3b2d851ada976 SHA512 25293378693cec875d1b52ea5aca8087a0d31021e6fbb4bd31f05c6979e36a5dc03983f2007a067942e1e119878b94a9e2b9622f324c7592f6630dcfe008b757
+EBUILD qbittorrent-4.0.4.ebuild 1395 BLAKE2B 4a3bf46c8610ec68be4e24322fa1b22069114c6a464187eca877b297cd45e4f2fcf481435f1462c21653a397958033534f333dac9ffca0cac4682cf38ca44c04 SHA512 9f4237f30c38b69ae8271017277c0f8504815a92508d9b3a79bc8bfb0946d15b9d4195837d599a00330a1fe4525d5269ae746a058822b5314d144b2ac3ac83ad
+EBUILD qbittorrent-4.1.1.ebuild 1412 BLAKE2B eb656b35b1bcb058350edc16f8da149f9d0b9a7d37c17774ac6af8a89e0e1812f630df648e653ee167ff3b5a45ee400917381810c235aea58a01007e05ae1c4c SHA512 0a4f96ad100320217ba09d49c9816ff754b03d5916b492dda4aca93e28b7a07b602f1f536e71991f1e7a9189627ba46aad0e46233859dd3134a5e34a3e942ec6
+EBUILD qbittorrent-4.1.2.ebuild 1527 BLAKE2B 8029aa9e510f3ae444d6deb6a071a70ed27f2ee996f1b750b56ef3891570656dd662b935e7100456ea6ff8f4439d55fe96ffb82e7d4ecda16a7828b6deab5a5c SHA512 7603ac17904c1d53c9ff4793804c0073a84266b70a54102ac18d4f02d9dc1b11628566a327f74972308e5e159167465ef0197f6c03b8d83d42508a49bac0a9c1
+EBUILD qbittorrent-9999.ebuild 1610 BLAKE2B b32315bd3911c88cd7787a8ee9d9a44a03d3f968454bf46332fb926f3a1169a45e9216097163f13f43e436cd9f8749da829afdad03217308d51736d1010b64ca SHA512 25cfaa17098bb3519f002302348f3ee13df4861cd98b187ea91bb3d4792e2a62fd242439aa63f7bcf0ea5f7627b1733b1b9bfce77fe2df90d4bf67dfc65d396f
 MISC metadata.xml 452 BLAKE2B 80b94ef467eaad04be0f17b8d15d1af20a2d09f27825a2c315445fb82c33bbcb35ca5c81e40b7ff21a0496b03f030a2d30b92fd2b39caafce47b7295d4daf98d SHA512 bce9d619f6c591237e412393678d54db4fe55fbd3ab52d191860bc97c7245e199c9630c8b76ea885fe195b486231b65906dc099361ccff59fe0adca08059c85e
diff --git a/net-p2p/qbittorrent/qbittorrent-4.0.4.ebuild b/net-p2p/qbittorrent/qbittorrent-4.0.4.ebuild
index 5dd7f3076599..0abafb22f1e4 100644
--- a/net-p2p/qbittorrent/qbittorrent-4.0.4.ebuild
+++ b/net-p2p/qbittorrent/qbittorrent-4.0.4.ebuild
@@ -6,7 +6,8 @@ EAPI=6
 inherit cmake-utils gnome2-utils xdg-utils
 
 DESCRIPTION="BitTorrent client in C++ and Qt"
-HOMEPAGE="https://www.qbittorrent.org/"
+HOMEPAGE="https://www.qbittorrent.org
+	  https://github.com/qbittorrent"
 
 if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
diff --git a/net-p2p/qbittorrent/qbittorrent-4.1.1.ebuild b/net-p2p/qbittorrent/qbittorrent-4.1.1.ebuild
index 8634804e8d26..23e5a7994733 100644
--- a/net-p2p/qbittorrent/qbittorrent-4.1.1.ebuild
+++ b/net-p2p/qbittorrent/qbittorrent-4.1.1.ebuild
@@ -6,8 +6,8 @@ EAPI=6
 inherit cmake-utils gnome2-utils xdg-utils
 
 DESCRIPTION="BitTorrent client in C++ and Qt"
-HOMEPAGE="https://www.qbittorrent.org/
-	  https://github.com/qbittorrent/qBittorrent"
+HOMEPAGE="https://www.qbittorrent.org
+	  https://github.com/qbittorrent"
 
 if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
diff --git a/net-p2p/qbittorrent/qbittorrent-4.1.2.ebuild b/net-p2p/qbittorrent/qbittorrent-4.1.2.ebuild
new file mode 100644
index 000000000000..dba40dca433b
--- /dev/null
+++ b/net-p2p/qbittorrent/qbittorrent-4.1.2.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit desktop gnome2-utils xdg-utils
+
+DESCRIPTION="BitTorrent client in C++ and Qt"
+HOMEPAGE="https://www.qbittorrent.org
+	  https://github.com/qbittorrent"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/${PN}/qBittorrent.git"
+else
+	SRC_URI="https://github.com/qbittorrent/qBittorrent/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+	S="${WORKDIR}/qBittorrent-release-${PV}"
+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-libs/geoip
+		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_configure() {
+	econf --with-qtsingleapplication=system \
+	$(use_enable dbus qt-dbus) \
+	$(use_enable debug) \
+	$(use_enable webui) \
+	$(use_enable X gui)
+}
+
+src_install() {
+	emake STRIP="/bin/false" INSTALL_ROOT="${D}" install
+	domenu dist/unix/qbittorrent.desktop
+	einstalldocs
+}
+
+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-9999.ebuild b/net-p2p/qbittorrent/qbittorrent-9999.ebuild
index 6453f2dac227..cc5d592f00f4 100644
--- a/net-p2p/qbittorrent/qbittorrent-9999.ebuild
+++ b/net-p2p/qbittorrent/qbittorrent-9999.ebuild
@@ -3,19 +3,19 @@
 
 EAPI=6
 
-inherit cmake-utils gnome2-utils xdg-utils
+inherit gnome2-utils xdg-utils
 
 DESCRIPTION="BitTorrent client in C++ and Qt"
-HOMEPAGE="https://www.qbittorrent.org/"
+HOMEPAGE="https://www.qbittorrent.org
+	  https://github.com/qbittorrent"
 
 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"
+	SRC_URI="https://github.com/qbittorrent/qBittorrent/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
-	S=${WORKDIR}/${MY_P}
+	S="${WORKDIR}/qBittorrent-release-${PV}"
 fi
 
 LICENSE="GPL-2"
@@ -33,6 +33,7 @@ RDEPEND="
 	sys-libs/zlib
 	dbus? ( dev-qt/qtdbus:5 )
 	X? (
+		dev-libs/geoip
 		dev-qt/qtgui:5
 		dev-qt/qtsvg:5
 		dev-qt/qtwidgets:5
@@ -47,13 +48,16 @@ DOCS=( AUTHORS Changelog CONTRIBUTING.md README.md TODO )
 # may be changed again.
 
 src_configure() {
-	local mycmakeargs=(
-		-DSYSTEM_QTSINGLEAPPLICATION=ON
-		-DDBUS=$(usex dbus)
-		-DGUI=$(usex X)
-		-DWEBUI=$(usex webui)
-	)
-	cmake-utils_src_configure
+	econf --with-qtsingleapplication=system \
+	$(use_enable dbus qt-dbus) \
+	$(use_enable debug) \
+	$(use_enable webui) \
+	$(use_enable X gui)
+}
+
+src_install() {
+	emake STRIP="/bin/false" INSTALL_ROOT="${D}" install
+	einstalldocs
 }
 
 pkg_postinst() {
diff --git a/net-p2p/retroshare/Manifest b/net-p2p/retroshare/Manifest
index 86f6652df61b..9aa39d81f465 100644
--- a/net-p2p/retroshare/Manifest
+++ b/net-p2p/retroshare/Manifest
@@ -1,7 +1,8 @@
 AUX retroshare-0.6.3-fix-comment.patch 820 BLAKE2B 361dc83fbe46550ca7b9b6f7c5d0a21bf99b958575aa1e50f9492c790a9f46e52402ba47515a3a3e90c14b7d229dc7d13f3397336aa2b7f67c0147aab3dd67ef SHA512 d27e7a655a0848a1e5feb11778df8e3b1a6a1a6fdde09848d78cb4550842e7b9a581491c7040ce1642773db6b0429f67ff3069c6fc6d6938c20d97e91af5c6bb
+AUX retroshare-0.6.4-qt-5.11.patch 2365 BLAKE2B 34745015cae77990a71005a07be39522d292baf504ea609966b839cd945890cfda644766363f74927307d076e6cfca96b5a4be3b992a723b7672b9e9a1c67d71 SHA512 c3f2a4bcd65ffeb57a17761bb045daa20a19d545b746d8bb8d8c0d61c36be9690f3a05103d55e2390b29ec15d978d24461bae9433b1c92d14bfc8aaa8a2896cb
 DIST retroshare-0.6.3.tar.gz 19699359 BLAKE2B 5a7a77b5ab43d44928e08fd1edc3bd6baa8b42f5c1e68fb079d3c60786c1068914a4f7a4b32fe4b683e7b990fac1bd09e5af66a09a3e9b7013e5b51b3c69ae8c SHA512 ee699ddc71aba3d20498d46e8183953b948896709d1469a5d5374b7c9b7955e460326b1ea3fe6f87e7235c5d2d5e8f042161410a0990b2dd2a44b42551fb5757
 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 3272 BLAKE2B 6aced4f87258dd105c3661ad2c3a861ec703ee7a6ff98fd575fb17dd94923b069b8ca16c6a6446d6dff69a3f01241ef9e90d768ac9163d103df34130a220087f SHA512 11056a6d98eed45a7716c848ac3eb812bfd7cedeb246a43cd08ff73dd220b5af3be120c91959d716c1e4f64f4eb40914ce628e9f5bb0e5d6e59eebbd36129708
+EBUILD retroshare-0.6.4.ebuild 3785 BLAKE2B 8eb703df2a8624cea038e45876f3526e20bbcaf4a724f756bd024b8a020b50ce6b7bc3100256e6b3a11c8511dae1f3091c111f64d4e9b72cb4b8e62c0ed3b5fd SHA512 f8eab241d4b19ca5539825ca5a748aac8fb1b6fa0008e5f72923a5701edebcf334cc5aa0b882512500c34ef701f6a76d0cd0c3202d786d1a0c9ae0bf7432c6d3
+EBUILD retroshare-0.6.9999.ebuild 3273 BLAKE2B 3a99b1f80024dacc10165cf0329f6f2f1f17021dc5223c436c817622c7d224ee8d9f312493c563c3df9e14d9a54420393751a26f44a35a11cc01f63e9b4568c4 SHA512 a4951090b3c66f0cc2ed67ac59784c9cfb20e0a0af155831386224b8878603551fa03f7f21258c0ed64fcdbb1d61b227165b6879f7474348cf8d1adf663127d9
 MISC metadata.xml 1684 BLAKE2B 8308ce1d3e2a433b79b01dcfdca2ab79b614cc48158fa43c8163e27f4d1d978ea831d54c5408ff3f3c4a3d71b55d0e5d3043058165461389c35e6cf76cac9cb2 SHA512 ba50aff77c086400bb4cdb631be9a634aada2b81832ac2895b74149448da431040604dc88fec9ad5d9e9bce39f2bb5b82565056937e3236124b8a42b1ab2ea6d
diff --git a/net-p2p/retroshare/files/retroshare-0.6.4-qt-5.11.patch b/net-p2p/retroshare/files/retroshare-0.6.4-qt-5.11.patch
new file mode 100644
index 000000000000..892cc89aff9a
--- /dev/null
+++ b/net-p2p/retroshare/files/retroshare-0.6.4-qt-5.11.patch
@@ -0,0 +1,63 @@
+From 428b331d8efede1e2f39f2fc49216c675d081030 Mon Sep 17 00:00:00 2001
+From: sehraf <sehraf42@gmail.com>
+Date: Fri, 25 May 2018 23:12:35 +0200
+Subject: [PATCH] fix for Qt 5.11
+
+Quote from Arch mailing list:
+- there's been a huge header cleanup in Qt modules. Expect build failures for applications that rely on transitive includes instead of declaring all required headers. Those need to be fixed upstream by explicitely adding the missing includes.
+---
+ retroshare-gui/src/gui/Posted/PostedItem.cpp        | 1 +
+ retroshare-gui/src/gui/chat/ChatTabWidget.cpp       | 2 ++
+ retroshare-gui/src/gui/feeds/GxsChannelPostItem.cpp | 1 +
+ retroshare-gui/src/gui/feeds/GxsForumMsgItem.cpp    | 1 +
+ 4 files changed, 5 insertions(+)
+
+diff --git a/retroshare-gui/src/gui/Posted/PostedItem.cpp b/retroshare-gui/src/gui/Posted/PostedItem.cpp
+index 7d70b3e157..8fc1cc6869 100644
+--- a/retroshare-gui/src/gui/Posted/PostedItem.cpp
++++ b/retroshare-gui/src/gui/Posted/PostedItem.cpp
+@@ -22,6 +22,7 @@
+  */
+ 
+ #include <QDateTime>
++#include <QStyle>
+ 
+ #include "rshare.h"
+ #include "PostedItem.h"
+diff --git a/retroshare-gui/src/gui/chat/ChatTabWidget.cpp b/retroshare-gui/src/gui/chat/ChatTabWidget.cpp
+index a965bbb323..6dd9c27576 100644
+--- a/retroshare-gui/src/gui/chat/ChatTabWidget.cpp
++++ b/retroshare-gui/src/gui/chat/ChatTabWidget.cpp
+@@ -20,6 +20,8 @@
+  *  Boston, MA  02110-1301, USA.

+  ****************************************************************/

+ 

++#include <QTabBar>

++

+ #include "ChatTabWidget.h"

+ #include "ui_ChatTabWidget.h"

+ #include "ChatDialog.h"

+diff --git a/retroshare-gui/src/gui/feeds/GxsChannelPostItem.cpp b/retroshare-gui/src/gui/feeds/GxsChannelPostItem.cpp
+index d154408b73..72317640c7 100644
+--- a/retroshare-gui/src/gui/feeds/GxsChannelPostItem.cpp
++++ b/retroshare-gui/src/gui/feeds/GxsChannelPostItem.cpp
+@@ -23,6 +23,7 @@
+ 
+ #include <QTimer>
+ #include <QFileInfo>
++#include <QStyle>
+ 
+ #include "rshare.h"
+ #include "GxsChannelPostItem.h"
+diff --git a/retroshare-gui/src/gui/feeds/GxsForumMsgItem.cpp b/retroshare-gui/src/gui/feeds/GxsForumMsgItem.cpp
+index 97ac9dd75a..e9773aba9c 100644
+--- a/retroshare-gui/src/gui/feeds/GxsForumMsgItem.cpp
++++ b/retroshare-gui/src/gui/feeds/GxsForumMsgItem.cpp
+@@ -23,6 +23,7 @@
+ 
+ #include <QTimer>
+ #include <QFileInfo>
++#include <QStyle>
+ 
+ #include "rshare.h"
+ #include "GxsForumMsgItem.h"
diff --git a/net-p2p/retroshare/retroshare-0.6.4.ebuild b/net-p2p/retroshare/retroshare-0.6.4.ebuild
index 89ef994223cd..68915e3eb57f 100644
--- a/net-p2p/retroshare/retroshare-0.6.4.ebuild
+++ b/net-p2p/retroshare/retroshare-0.6.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit eutils gnome2-utils qmake-utils versionator
+inherit desktop gnome2-utils qmake-utils versionator
 
 DESCRIPTION="P2P private sharing application"
 HOMEPAGE="http://retroshare.net"
@@ -59,7 +59,11 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/RetroShare-${PV}"
 
+PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" )
+
 src_prepare() {
+	default
+
 	local dir
 
 	sed -i \
@@ -81,8 +85,6 @@ src_prepare() {
 
 	# Avoid openpgpsdk false dependency on qtgui
 	sed -i '2iQT -= gui' openpgpsdk/src/openpgpsdk.pro || die
-
-	eapply_user
 }
 
 src_configure() {
@@ -142,7 +144,6 @@ pkg_preinst() {
 			break
 		fi
 	done
-	gnome2_icon_savelist
 }
 
 pkg_postinst() {
diff --git a/net-p2p/retroshare/retroshare-0.6.9999.ebuild b/net-p2p/retroshare/retroshare-0.6.9999.ebuild
index 0db2373b5c22..a7718e73f904 100644
--- a/net-p2p/retroshare/retroshare-0.6.9999.ebuild
+++ b/net-p2p/retroshare/retroshare-0.6.9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 EGIT_REPO_URI="https://github.com/RetroShare/RetroShare.git"
-inherit eutils git-r3 gnome2-utils qmake-utils versionator
+inherit desktop git-r3 gnome2-utils qmake-utils versionator
 
 DESCRIPTION="P2P private sharing application"
 HOMEPAGE="http://retroshare.net"
diff --git a/net-p2p/transmission/Manifest b/net-p2p/transmission/Manifest
index 949a7c6c1530..38a4370e2dcb 100644
--- a/net-p2p/transmission/Manifest
+++ b/net-p2p/transmission/Manifest
@@ -3,9 +3,7 @@ AUX transmission-2.93-libressl.patch 353 BLAKE2B 62d7875b9cb96bba9d03da8a109545c
 AUX transmission-daemon.confd.4 735 BLAKE2B bc4c06dcf4a12282d36d446537ae8d3a461a9bb84f93b54f7d13be1c430209647bae89054b60f5d8dd434049140f74c1cb4ad04064d03b37ad88a851c28c07fa SHA512 47e78c85857eefb9be6c25d1e789cfb2a276d5816ba911ba1511e764469b2d9998edafe44247aff784113ca28926748bc5fb2b879280b780fd69ffb1e4e40736
 AUX transmission-daemon.initd.10 1707 BLAKE2B 57857fa0b628f0c49ebaf13544b366bf9db39c70f31556a21262556ad89657a7f13c84e19f882839e4bc10f2b8afef96aa51f833478e38f215499244ca8b388b SHA512 30d9fe7d06ca3c92ff436e9bbe84729a5b343b52965f8d1d3d43f14f5fa25881dbc9676c5d3d916cff552aad5872ed41c2930e9ce3a5f7c958dbeec0d1ab1ac4
 AUX transmission-daemon.service.conf 69 BLAKE2B 6e38a28f54366850ae794896f2954c3af77afead303197c49970873fa604d6b375e71122de8d3645f9fcc8abed4f696ac257bd59ba87ebdc5cdd5839d32c0a7b SHA512 3dc02be596296fc1efbf1bc690be3953709af00c230f55db4d067ff592d87e1a465faa4067bc15d65a8a27fed2cf07d108abb2ed45fc76b47b0642ce2e182946
-DIST transmission-2.93.tar.xz 3363868 BLAKE2B 786a8daec548d96b05d90c238cc7b67d402dc0d828860bb1a79b8059c687de309288be17fd12fd51abeafa28d9630fd19be9513c76cbf091f81ce9a181596042 SHA512 7565893f67fc10f1b683814fa4d365d841ec833bc8dfdab731432fe68f1a38daeb4c9100653763f16bfb4336fba11c9b0b9730a9817e17a140704a7c4aa5c087
 DIST transmission-2.94.tar.xz 3365952 BLAKE2B d0215a2c595dd3ebb2ed5c94cc3d380c78f62b98388557620534b88b9e2304bb6ac91960395541267f82d70800c4860d0e58125bca33dd158da992d19b4c0def SHA512 ee411743940f2897aa0bbc351ce79f11d860075d2e9e399d60301eae8cfc453e20426ef553fc62ee43019a07c052d512f5d7972cc4411fb57b1312c2c1558da7
-EBUILD transmission-2.93.ebuild 4375 BLAKE2B dd60b643985afdb20cb782f229011535b1c6dd98554e1b28b32dc805ca6b4ffd25485d10ca3dcd0eaa7b0a498d40edbd5c5533965def675e3c7b93193a38acb6 SHA512 5afb734ad2ee190605e6d7204b59afd556cbfd50e3a8c5308d916f2d40fbaf81301c53f5e664ffc0db7bf701d37bb6e01d9b73027de527f1fe036b0638926e91
 EBUILD transmission-2.94.ebuild 4327 BLAKE2B e8c81c7d4d55e0bfd0ff3f33d2996829684cedcbe91e9c04587f135b5075a9102608d3489cc6780aa81fe585b57c5dafba8687af7b8d9806b244a0d0efa412a3 SHA512 443e6d83af1bfcef2c9b382efaba710c408a0a2c4c79a89dc08b3232178d3a6efb39b3bc0318c2d81e59c795d3c69cbfe367c3fa05ac13ab928020339c7d90f0
 EBUILD transmission-9999.ebuild 3726 BLAKE2B ed8e5e8ddc738eddfbcd5d562f31f8ff62a7833fcbfac05ef8a9b0c157ec579eb8ad8ec471527371221f14dd00094ec4f5f429a831154a5d2cbc80425c4f2a64 SHA512 af09f34bd910244bea541f350fc8df64229cf1df57332a80d6b109190630b37ccebf835a85aff6f3803d12c00d25dee24ecee93bedd02d6f9a54a118c0fea4cf
 MISC metadata.xml 602 BLAKE2B 05300c81bd2c4df76aaaf8381a788016777e259075aa6a3bf9da239b4832dac1281f718f0fd79ece7d5c238440e07d1aabe15b7da40f34674ac30bbd356d0c6b SHA512 0047a936eda032a4521707ea50dcde06dce3837993e70d43a5b033183ba58633ae46e2d2e56de98a56f3480b30e596c7fbae82fd1e2ee9cbebc7983d9551617d
diff --git a/net-p2p/transmission/transmission-2.93.ebuild b/net-p2p/transmission/transmission-2.93.ebuild
deleted file mode 100644
index 3630df860353..000000000000
--- a/net-p2p/transmission/transmission-2.93.ebuild
+++ /dev/null
@@ -1,164 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools flag-o-matic gnome2-utils qmake-utils systemd user xdg-utils
-
-DESCRIPTION="A Fast, Easy and Free BitTorrent client"
-HOMEPAGE="http://www.transmissionbt.com/"
-SRC_URI="https://github.com/transmission/transmission-releases/raw/master/${P}.tar.xz"
-
-# web/LICENSE is always GPL-2 whereas COPYING allows either GPL-2 or GPL-3 for the rest
-# transmission in licenses/ is for mentioning OpenSSL linking exception
-# MIT is in several libtransmission/ headers
-LICENSE="|| ( GPL-2 GPL-3 Transmission-OpenSSL-exception ) GPL-2 MIT"
-SLOT=0
-IUSE="ayatana gtk libressl lightweight systemd qt5 xfs"
-KEYWORDS="amd64 ~arm ~arm64 ~mips ppc ppc64 x86 ~x86-fbsd ~amd64-linux"
-
-RDEPEND=">=dev-libs/libevent-2.0.10:=
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	net-libs/libnatpmp
-	>=net-libs/miniupnpc-1.7:=
-	>=net-misc/curl-7.16.3[ssl]
-	sys-libs/zlib:=
-	gtk? (
-		>=dev-libs/dbus-glib-0.100
-		>=dev-libs/glib-2.32:2
-		>=x11-libs/gtk+-3.4:3
-		ayatana? ( >=dev-libs/libappindicator-0.4.90:3 )
-		)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtdbus:5
-		dev-qt/qtgui:5
-		dev-qt/qtnetwork:5
-		dev-qt/qtwidgets:5
-		)
-	systemd? ( >=sys-apps/systemd-209:= )"
-DEPEND="${RDEPEND}
-	>=dev-libs/glib-2.32
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/os-headers
-	virtual/pkgconfig
-	qt5? ( dev-qt/linguist-tools:5 )
-	xfs? ( sys-fs/xfsprogs )"
-
-REQUIRED_USE="ayatana? ( gtk )"
-
-DOCS=( AUTHORS NEWS qt/README.txt )
-
-PATCHES=(
-	"${FILESDIR}"/libsystemd.patch
-	"${FILESDIR}"/transmission-2.93-libressl.patch
-)
-
-src_prepare() {
-	sed -i -e '/CFLAGS/s:-ggdb3::' configure.ac || die
-
-	# Trick to avoid automagic dependency
-	if ! use ayatana ; then
-		sed -i -e '/^LIBAPPINDICATOR_MINIMUM/s:=.*:=9999:' configure.ac || die
-	fi
-
-	# http://trac.transmissionbt.com/ticket/4324
-	sed -i -e 's|noinst\(_PROGRAMS = $(TESTS)\)|check\1|' libtransmission/Makefile.am || die
-
-	# Prevent m4_copy error when running aclocal
-	# m4_copy: won't overwrite defined macro: glib_DEFUN
-	rm m4/glib-gettext.m4 || die
-
-	default
-	eautoreconf
-}
-
-src_configure() {
-	export ac_cv_header_xfs_xfs_h=$(usex xfs)
-
-	# https://bugs.gentoo.org/577528
-	append-lfs-flags
-
-	econf \
-		--enable-external-natpmp \
-		$(use_enable lightweight) \
-		$(use_with systemd systemd-daemon) \
-		$(use_with gtk)
-
-	if use qt5; then
-		pushd qt >/dev/null || die
-		eqmake5 qtr.pro
-		popd >/dev/null || die
-	fi
-}
-
-src_compile() {
-	emake
-
-	if use qt5; then
-		emake -C qt
-		$(qt5_get_bindir)/lrelease qt/translations/*.ts || die
-	fi
-}
-
-src_install() {
-	default
-
-	rm "${ED%/}"/usr/share/transmission/web/LICENSE || die
-
-	newinitd "${FILESDIR}"/transmission-daemon.initd.10 transmission-daemon
-	newconfd "${FILESDIR}"/transmission-daemon.confd.4 transmission-daemon
-	systemd_dounit daemon/transmission-daemon.service
-	systemd_install_serviced "${FILESDIR}"/transmission-daemon.service.conf
-
-	if use qt5; then
-		pushd qt >/dev/null || die
-		emake INSTALL_ROOT="${ED%/}"/usr install
-
-		domenu transmission-qt.desktop
-
-		local res
-		for res in 16 22 24 32 48 64 72 96 128 192 256; do
-			doicon -s ${res} icons/hicolor/${res}x${res}/transmission-qt.png
-		done
-		doicon -s scalable icons/hicolor/scalable/transmission-qt.svg
-
-		insinto /usr/share/qt5/translations
-		doins translations/*.qm
-		popd >/dev/null || die
-	fi
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-
-	enewgroup transmission
-	enewuser transmission -1 -1 /var/lib/transmission transmission
-
-	if [[ ! -e "${EROOT%/}"/var/lib/transmission ]]; then
-		mkdir -p "${EROOT%/}"/var/lib/transmission || die
-		chown transmission:transmission "${EROOT%/}"/var/lib/transmission || die
-	fi
-
-	elog "If you use transmission-daemon, please, set 'rpc-username' and"
-	elog "'rpc-password' (in plain text, transmission-daemon will hash it on"
-	elog "start) in settings.json file located at /var/lib/transmission/config or"
-	elog "any other appropriate config directory."
-	elog
-	elog "Since µTP is enabled by default, transmission needs large kernel buffers for"
-	elog "the UDP socket. You can append following lines into /etc/sysctl.conf:"
-	elog " net.core.rmem_max = 4194304"
-	elog " net.core.wmem_max = 1048576"
-	elog "and run sysctl -p"
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
diff --git a/net-p2p/vuze/Manifest b/net-p2p/vuze/Manifest
index cc612c3d2852..39ff84d91530 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 4000 BLAKE2B 5ce11619ce22b732bd1f7c0f38c5d48f72cce4bce2092ccc93bc261b6888b40d24cf0bd1e2a120549c2adddd9576226faa9049105a0b81df188eb49f3d094593 SHA512 bffeac4eaab07b89d9e80cdfa3483cd0d3027f4fc53d5e70177c6e07cecc06f64a606fc8daf06fa2dfbeba84e96fc4ecbd82666203bc939347e021e0931da706
-EBUILD vuze-5.7.2.0-r1.ebuild 4257 BLAKE2B 38b0baa9d5fd286ecb459af75ddebb69cc85228a09d54f43e92d092e76cdb6d5b793904f9f9039a19e7657b63ec2abffd2b4b1f170114a40c99f9da7f1ec291e SHA512 f6c4916e4b1329b34ceceeaf18669b822aed2467eac3ed976919e9e66ce89008c6b4a76a9d6691c2d12d09d2b9bbf3e69427ca58fa73ac4c7caa8089b242d01f
+EBUILD vuze-5.7.2.0-r1.ebuild 4257 BLAKE2B f14281f700b2d17703e5208b1bcf205f7b64845255d18e71712743d1b372e1cb8d12739f1aee43be1a4ac6fe4819633219e8157a8bd8341c379dfa65b339c775 SHA512 59c1127fe0a2f30ea62441f4350870b519ad24fc66c60354e66d92850cb7b1093f7033126a45dc19f73f59dc89024af6c1b9c181328cff92ee307188a8b2c5d9
 EBUILD vuze-5.7.2.0.ebuild 4193 BLAKE2B c1845f9c926717ea470ab39122771498a1d49d0cd9bc5fe406f8c9aa20f99a1b02489c4ef490855743646c184b819c4a767e4fc2b0912caac99cb337f18d5054 SHA512 57542781decd415deaf345fc00977d9502def7faac9685273b2d9df8e55a3233f15efc861183ac85af2bf9d9febad5c99bcac3137d6cf15f96c1083b0cd5044c
 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 3d3b52b21305..c76d294bb89d 100644
--- a/net-p2p/vuze/vuze-5.7.2.0-r1.ebuild
+++ b/net-p2p/vuze/vuze-5.7.2.0-r1.ebuild
@@ -93,7 +93,7 @@ EANT_GENTOO_CLASSPATH="swt-3.8,json-simple,log4j,commons-cli-1 commons-lang-2.1"
 src_compile() {
 	local mem
 	use amd64 && mem="320"
-	use x86   && mem="192"
+	use x86   && mem="256"
 	use ppc   && mem="192"
 	use ppc64 && mem="256"
 	use sparc && mem="320"