6 files changed, 117 insertions, 19 deletions
diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz
index b528606e2df0..d8f73d85f40c 100644
--- a/net-p2p/Manifest.gz
+++ b/net-p2p/Manifest.gz
diff --git a/net-p2p/qbittorrent/Manifest b/net-p2p/qbittorrent/Manifest
index 719beb7b7f90..0946b433bde8 100644
--- a/net-p2p/qbittorrent/Manifest
+++ b/net-p2p/qbittorrent/Manifest
@@ -1,6 +1,8 @@
 DIST qbittorrent-4.1.4.tar.gz 7718217 BLAKE2B 46fc3ad230a74cc2f05bdfe5f53b6b39e0dcd99afff941614345ef1d85492f647080a6111c403f30746b24d1b03e1a6fd196015c7646dc5ab5c73027a8c8c5b8 SHA512 2621a9b6a19609bafd2d99336e5dc4c5f4aef9e5ab6ecebd9c622c759cdcea2a18999c08a70ac32d88fbd65c310749ea2254562152c1d3886285aa7c5c86bf68
 DIST qbittorrent-4.1.5.tar.gz 7719557 BLAKE2B d849227443843684d16ba93e65a64b2d637f1ce41c2f5c3a1ee46db74c7497d0d3cb6b627bfee79ce2e4f2b99ee252287b584542cd47003a1055a43bf0f63cfc SHA512 e090ecc9343ff94874a6d54d487a672dcd44a943da4e2d625b5f7db849c861173c12c870f4d7f0843a60fdffd1fbbd74d05d48223bd3ebf32b7a1ef478c95dec
+DIST qbittorrent-4.1.6.tar.gz 7780676 BLAKE2B fe2572bece5a014d821cf905a13a45f71c63eda661b338a90517a23d257d83f556c1ad1bd064cc2840e9731886d7afaafa36ea50f8c3fe8ff05fc3ec3a12c478 SHA512 14c337257a71a7a6f850bbbbe3effe6f34c299fe71486c1a71160f54ccc7377a5c8e742ca2fd85cf198b2a603fdfee50bdb19b33a10899f86f8499468ca8a735
 EBUILD qbittorrent-4.1.4-r1.ebuild 1520 BLAKE2B 82ff5d353ba5d1d7ee43276bc012051f12b29b6cf60b5c90b248e1e1d3c6d7c56eb30cff6e540e8cc5a953fb4dd74fb8bfa529272cf374b076ce154bc4664a1b SHA512 97ac862854c1cb5a89d311a2b3e1cb4b38544bfe9b4cc1da6f41c3b5ec0a09b50fa07ad359e2b371a6af14fc2b9e0462e621af2b88d61dd77886e6cbf81e2838
 EBUILD qbittorrent-4.1.5-r1.ebuild 1520 BLAKE2B 82ff5d353ba5d1d7ee43276bc012051f12b29b6cf60b5c90b248e1e1d3c6d7c56eb30cff6e540e8cc5a953fb4dd74fb8bfa529272cf374b076ce154bc4664a1b SHA512 97ac862854c1cb5a89d311a2b3e1cb4b38544bfe9b4cc1da6f41c3b5ec0a09b50fa07ad359e2b371a6af14fc2b9e0462e621af2b88d61dd77886e6cbf81e2838
+EBUILD qbittorrent-4.1.6.ebuild 1476 BLAKE2B 17de90559b1830bd74b745589e7fdd9f3b6eb9de191ab0e6083bbafe66143549117ab94bc5dd0fd587c17a3e34f7b7775121c622ec4333e9ec648a41d6cd37fd SHA512 bffb41425575c458fd7db4eba7ec071dbad620cb65c84aab7a18b4b9670587eee33139b12e9a370875857b6f806531ad24ee32b740538e6e94b055ccfc185acd
 EBUILD qbittorrent-9999.ebuild 1476 BLAKE2B 17de90559b1830bd74b745589e7fdd9f3b6eb9de191ab0e6083bbafe66143549117ab94bc5dd0fd587c17a3e34f7b7775121c622ec4333e9ec648a41d6cd37fd SHA512 bffb41425575c458fd7db4eba7ec071dbad620cb65c84aab7a18b4b9670587eee33139b12e9a370875857b6f806531ad24ee32b740538e6e94b055ccfc185acd
 MISC metadata.xml 452 BLAKE2B 80b94ef467eaad04be0f17b8d15d1af20a2d09f27825a2c315445fb82c33bbcb35ca5c81e40b7ff21a0496b03f030a2d30b92fd2b39caafce47b7295d4daf98d SHA512 bce9d619f6c591237e412393678d54db4fe55fbd3ab52d191860bc97c7245e199c9630c8b76ea885fe195b486231b65906dc099361ccff59fe0adca08059c85e
diff --git a/net-p2p/qbittorrent/qbittorrent-4.1.6.ebuild b/net-p2p/qbittorrent/qbittorrent-4.1.6.ebuild
new file mode 100644
index 000000000000..30188ae78c36
--- /dev/null
+++ b/net-p2p/qbittorrent/qbittorrent-4.1.6.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit 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.1*: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
+	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/retroshare/Manifest b/net-p2p/retroshare/Manifest
index aef517074bb1..2ccbb88830b8 100644
--- a/net-p2p/retroshare/Manifest
+++ b/net-p2p/retroshare/Manifest
@@ -2,7 +2,8 @@ AUX retroshare-0.6.3-fix-comment.patch 820 BLAKE2B 361dc83fbe46550ca7b9b6f7c5d0a
 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
+DIST retroshare-0.6.5.tar.gz 29377995 BLAKE2B 3a8909227080702e42e59b42301e873d4ece806e014a959080a3ae9df7d11564a6e6d915087a9ddd6d5c66d1e5c43895fa24dea8c0042fdce391c384a54182ee SHA512 a65fefb6baff42a81880a401c9005f73ac8180a247dd992a350f9bf5bac366ee6e809bf93cbbc31e80646156147a1d434306dadfbed1f69879ab61cfae3fddeb
 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 1576 BLAKE2B 6eb7fa6965ac5c785bbdb8fa700374ec8723ac79a604f882c557cd53972f753f4a4f30712bf49becdd9d49cdd6d8753b900372c60a69d11ba8af042d836a0a5c SHA512 01013d392930b00c7e3958e9e05a0bdaa45524879676cf7c407399cf0adb404dcef83a8ba465dfc536409eb1fd7d6e28f2423e58cc5b2d1cfbcd032ae45a0b75
+EBUILD retroshare-0.6.5.ebuild 3924 BLAKE2B 899639f2a428d41f80a155c5d8641522377c07692eaccec0cb972616b3ee73966fc7ab97b7774f19e296b8a60f968b4bd64a4634f8fdae251a15633c00c47c63 SHA512 127a61c608f7e4bc2fadd301d0fcfe06cfedd462ce1db1b919f2ebc0ff141321e20bc0035e3316a74101864a40fb486ba379ab31549025f06091314d53c96c0c
+MISC metadata.xml 1758 BLAKE2B 7c3cea20af17ad1ba4c5a9923929ada21f986706bc2cc7b43512e272d01e10cb8cbbfa8556159402c9b6aa8165e0b8ff0befea34fa0186115b9af254a35be88f SHA512 b4f152eca444ff069446dbf78b40cf128ff36f6a01689d160b6399c631439489847585dcef3d7ee9afd8e72b5fd88ee8daaf0fd49df45efbc102ae85554efdae
diff --git a/net-p2p/retroshare/metadata.xml b/net-p2p/retroshare/metadata.xml
index 1e20d558f6ee..6f3c32a1f56b 100644
--- a/net-p2p/retroshare/metadata.xml
+++ b/net-p2p/retroshare/metadata.xml
@@ -23,10 +23,12 @@
 		<flag name="feedreader">Enables the Feedreader plugin</flag>
 		<flag name="gnome-keyring">Enables potentially insecure autologin capability via Gnome Keyring</flag>
 		<flag name="gui">Enables the GUI version of RetroShare</flag>
-		<flag name="settings-api">Enables settings control via API</flag>
+		<flag name="jsonapi">Enables the new RetroShare JSON API</flag>
+		<flag name="service">Enables the new RetroShare service controllable only through JSON API</flag>
 		<flag name="sqlcipher">Enables GXS database encryption via SQLCipher</flag>
 		<flag name="voip">Enables VOIP plugin</flag>
 		<flag name="webui">Enables Web interface and API support</flag>
+		<flag name="xapian">Enables GXS content indexing and search through Xapian</flag>
 	</use>
 	<upstream>
 		<bugs-to>https://github.com/RetroShare/RetroShare/issues</bugs-to>
diff --git a/net-p2p/retroshare/retroshare-0.6.9999.ebuild b/net-p2p/retroshare/retroshare-0.6.5.ebuild
index a7718e73f904..0a7090d16613 100644
--- a/net-p2p/retroshare/retroshare-0.6.9999.ebuild
+++ b/net-p2p/retroshare/retroshare-0.6.5.ebuild
@@ -1,23 +1,24 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-EGIT_REPO_URI="https://github.com/RetroShare/RetroShare.git"
-inherit desktop git-r3 gnome2-utils qmake-utils versionator
+inherit desktop qmake-utils xdg-utils
 
 DESCRIPTION="P2P private sharing application"
-HOMEPAGE="http://retroshare.net"
+HOMEPAGE="https://retroshare.cc"
+SRC_URI="https://github.com/RetroShare/RetroShare/releases/download/v${PV}/RetroShare-v${PV}-source-with-submodules.tar.gz -> ${P}.tar.gz"
 
 # pegmarkdown can also be used with MIT
-LICENSE="AGPL-3 GPL-2 GPL-3 Apache-2.0 LGPL-2.1"
+LICENSE="AGPL-3 GPL-2 GPL-3 Apache-2.0 LGPL-3"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86"
+
+IUSE="cli control-socket gnome-keyring +gui +jsonapi service +sqlcipher webui +xapian"
 
-IUSE="cli control-socket gnome-keyring +gui settings-api +sqlcipher +webui"
 REQUIRED_USE="
-	|| ( cli gui )
-	settings-api? ( || ( control-socket webui ) )"
+	|| ( cli gui service )
+	service? ( jsonapi )"
 
 RDEPEND="
 	app-arch/bzip2
@@ -40,16 +41,26 @@ RDEPEND="
 		x11-libs/libX11
 		x11-libs/libXScrnSaver
 	)
-	settings-api? ( dev-qt/qtcore:5 )
+	service? ( dev-qt/qtcore:5 )
 	sqlcipher? ( dev-db/sqlcipher )
 	!sqlcipher? ( dev-db/sqlite:3 )
-	webui? ( net-libs/libmicrohttpd )"
+	webui? ( net-libs/libmicrohttpd )
+	xapian? ( dev-libs/xapian )"
 
 DEPEND="${RDEPEND}
 	gui? ( dev-qt/designer:5 )
+	jsonapi? (
+		app-doc/doxygen
+		dev-util/cmake
+	)
 	dev-qt/qtcore:5
 	virtual/pkgconfig
 "
+src_unpack() {
+	default
+
+	mv RetroShare ${P}
+}
 
 src_configure() {
 	local qConfigs=()
@@ -58,16 +69,30 @@ src_configure() {
 	qConfigs+=( $(usex control-socket '' 'no_')libresapilocalserver )
 	qConfigs+=( $(usex gnome-keyring '' 'no_')rs_autologin )
 	qConfigs+=( $(usex gui '' 'no_')retroshare_gui )
-	qConfigs+=( $(usex settings-api '' 'no_')libresapi_settings )
+	qConfigs+=( $(usex jsonapi '' 'no_')rs_jsonapi )
+	qConfigs+=( $(usex service '' 'no_')retroshare_service )
 	qConfigs+=( $(usex sqlcipher '' 'no_')sqlcipher )
 	qConfigs+=( $(usex webui '' 'no_')libresapihttpserver )
+	qConfigs+=( $(usex xapian '' 'no_')rs_deep_search )
+
+	eqmake5 CONFIG+="${qConfigs[*]}" \
+		RS_MAJOR_VERSION=$(ver_cut 1) RS_MINOR_VERSION=$(ver_cut 2) \
+		RS_MINI_VERSION=$(ver_cut 3) RS_EXTRA_VERSION="-gentoo-${PR}"
+}
+
+src_compile() {
+	use jsonapi && {
+		nonfatal emake ||
+			elog "Due to a bug in RetroShare-v0.6.5 build system when JSON API is enabled, failure at first emake is normal"
+	}
 
-	eqmake5 CONFIG+="${qConfigs[*]}"
+	emake
 }
 
 src_install() {
 	use cli && dobin retroshare-nogui/src/retroshare-nogui
 	use gui && dobin retroshare-gui/src/retroshare
+	use service && dobin retroshare-service/src/retroshare-service
 
 	insinto /usr/share/retroshare
 	doins libbitdht/src/bitdht/bdboot.txt
@@ -112,9 +137,9 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }