gentoo auto-resync : 14:05:2023 - 16:01:32

6 files changed, 1 insertions, 526 deletions

diff --git a/net-p2p/retroshare/Manifest b/net-p2p/retroshare/Manifest
index c0e527b7a686..0e2981d80998 100644
--- a/net-p2p/retroshare/Manifest
+++ b/net-p2p/retroshare/Manifest
@@ -1,9 +1,4 @@
-AUX retroshare-0.6.5-qt-5.15.patch 2927 BLAKE2B a6e24b46af2df2592b482492b3c53049c4d089f8e4c4f6dd1d3a262945284353b1fde488c141bbae335851108887d2bda6c2e37aa91410885b1448dcfb300e4b SHA512 1b5c2debf192b9801a95d6640c079c7c3d2535cd59ca10f712e8123b1b35781cb7c0ef3fc2ff876c5582bbdb1b1c8efe7ffc666f4cfa365c1c429dd67a83ea37
 AUX retroshare-0.6.6-fix-cxx17-compilation.patch 1753 BLAKE2B aeba3e200eaf78867220227b766d2e396322d93e14afa885ba8ac5d8d5c88b9806a1fc90a00b2e7a364cdfcfa04776da9974293a394fc4d946ca30716daf931c SHA512 09f146aaaa9570eb4b01a9b325acbf6648d88ddde222128f709ecc89038ce5d8c9fba046abdf36547b4ee7e653bf058a3a51f775a78e71b760e0e513d43005e6
-DIST retroshare-0.6.5.tar.gz 29377995 BLAKE2B 3a8909227080702e42e59b42301e873d4ece806e014a959080a3ae9df7d11564a6e6d915087a9ddd6d5c66d1e5c43895fa24dea8c0042fdce391c384a54182ee SHA512 a65fefb6baff42a81880a401c9005f73ac8180a247dd992a350f9bf5bac366ee6e809bf93cbbc31e80646156147a1d434306dadfbed1f69879ab61cfae3fddeb
 DIST retroshare-0.6.6.tar.gz 24140207 BLAKE2B 1328f2d36f6bc2d1123dd915698f2778e771e36089d8fd8d9ec44d1a8bfa0f56c625b73f62811936e4cee5dd1eca797f9fdf16fdb8defd66706294abc4dde419 SHA512 23ed7c633426caa910a5ae6f04cfd33c523ecaedae1e4044981706420622aadd67ba2772ffd17c9cc1c6193fad508837a31fdcfabe2aab309b8b4302335ede4d
-EBUILD retroshare-0.6.5-r2.ebuild 4114 BLAKE2B dbc08ddaf55fe725e61f03f85458d334b73e5d641a050d418b63b1b5368d6447b4cd3a6ca45f75a7d8cdffd089814adc62e24243507d72a9438ff2afff1f9784 SHA512 4dfb1b8cb8e941a593e806136823602974b1f9fd8a3fdfd4541ed4253404d9a679fb7f75bba5072e0f8302d75d57de5d3240d98145eaae59b026c04eec4b8e39
-EBUILD retroshare-0.6.5-r3.ebuild 3734 BLAKE2B f085af9005a35f126d45ad579cff0b907301ee6d3ed1280e4668c51a0db170e681cd2cc246d0306842c01e19dc1548407f38a4139c48498a28262bbabbb365df SHA512 cc3d8766f874e35365995ed5758d2711db05590ee76cf65f6ce2807ad4de611e45adec9c9fa486e60d55974fb3691c66f24b4889abcf0b059256968f5a3b39ad
 EBUILD retroshare-0.6.6-r1.ebuild 3523 BLAKE2B 0ecb30cbc477fab14d582c3d372e0a9bbffcfcd24d2d7bc36f8cfcbcdac77887819856da556ccdda4aa3eeebfc601dfded94eb381f37fe33b049e717e6129cb9 SHA512 8c44bbb8b53fa10f796efc6abdc520e7edde2a70125d6f46b900b77e52061f2a3af4d8a08cb9f38719f24796f75ff5260de1a7a9e372d2888f9331a07792670b
-EBUILD retroshare-0.6.6.ebuild 3481 BLAKE2B 4888c2ac8c7733dba086f0616d3a6e6421daeeadf2ed30c16043dc88a06fbb66e2812740c0ff3ddaa2f376858d2cef81580b6ea14245d4cafeb83d5a61ebd42e SHA512 50d1083dbd9fcd0e2333193473903b828e7b04341da6655bcefc8b249ab591f016731de2ef0ac61aa5e95b13532017d62505df2931ba31453a43657f8e9d05ad
-MISC metadata.xml 1936 BLAKE2B 09abd24c20a06e479e8212558b70a8c08b737df830d68242f07e88fb1f070de620eeb8bf0a047317f9661b8af9d213720041f25dd06f8f01ac6454eca3f4bb9b SHA512 f4365576e75eb0de36b4c1bff1e73fd87f8cbb1d0d6ecf6ae64081d9cca3c534c7ba577b1209aac287699f25d852cca8e316a4ed0f91b852527f27f9b0b80b57
+MISC metadata.xml 1571 BLAKE2B 15ce97e32933f85fb2793ed58786251cb78bb8f2a5107a043ccd3daf1c6251fe07fa2223020375cbc6779a3e425808de594868c167ff4475dbb46342e2f3e783 SHA512 62f7213684786ddbac51fe90a5d3269cf493df6df89c801bbfe0ab856d001ff5b37fecf62818c07483c9fe4eb6eb0ded180c2e661efde7aceee93980a7dc8cbe
diff --git a/net-p2p/retroshare/files/retroshare-0.6.5-qt-5.15.patch b/net-p2p/retroshare/files/retroshare-0.6.5-qt-5.15.patch
deleted file mode 100644
index 21147a6391b0..000000000000
--- a/net-p2p/retroshare/files/retroshare-0.6.5-qt-5.15.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From bbaad838572b5fba6109bc7d3b5c55c2c68e6cdc Mon Sep 17 00:00:00 2001
-From: Phenom <retrosharephenom@gmail.com>
-Date: Mon, 1 Jun 2020 13:44:43 +0200
-Subject: [PATCH] Fix build with Qt 5.15+
-
----
- retroshare-gui/src/gui/elastic/elnode.h        |  8 +++++---
- .../src/gui/gxs/GxsCommentTreeWidget.cpp       | 16 +++++++++-------
- retroshare-gui/src/gui/gxs/GxsIdDetails.cpp    | 18 ++++++++++--------
- 3 files changed, 24 insertions(+), 18 deletions(-)
-
-diff --git a/retroshare-gui/src/gui/elastic/elnode.h b/retroshare-gui/src/gui/elastic/elnode.h
-index 1e0edd1a87..33043ddab3 100644
---- a/retroshare-gui/src/gui/elastic/elnode.h
-+++ b/retroshare-gui/src/gui/elastic/elnode.h
-@@ -26,6 +26,10 @@
- #ifndef ELNODE_H
- #define ELNODE_H
- 
-+#include "graphwidget.h"
-+
-+#include <retroshare/rstypes.h>
-+
- #include <QApplication>
- #if QT_VERSION >= 0x040600
- #include <QGraphicsObject>
-@@ -36,9 +40,7 @@
- #include <QGraphicsItem>
- #endif
- #include <QList>
--
--#include <retroshare/rstypes.h>
--#include "graphwidget.h"
-+#include <QPainterPath>
- 
- class Edge;
- QT_BEGIN_NAMESPACE
---- a/retroshare-gui/src/gui/gxs/GxsCommentTreeWidget.cpp
-+++ b/retroshare-gui/src/gui/gxs/GxsCommentTreeWidget.cpp
-@@ -18,6 +18,12 @@
-  *                                                                             *
-  *******************************************************************************/
- 
-+#include "GxsCommentTreeWidget.h"
-+
-+#include "gui/common/RSElidedItemDelegate.h"
-+#include "gui/gxs/GxsCreateCommentDialog.h"
-+#include "gui/gxs/GxsIdTreeWidgetItem.h"
-+
- #include <QAbstractTextDocumentLayout>
- #include <QApplication>
- #include <QClipboard>
-@@ -25,13 +31,9 @@
- #include <QMenu>
- #include <QMimeData>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QTextDocument>
- 
--#include "gui/common/RSElidedItemDelegate.h"
--#include "gui/gxs/GxsCommentTreeWidget.h"
--#include "gui/gxs/GxsCreateCommentDialog.h"
--#include "gui/gxs/GxsIdTreeWidgetItem.h"
--
- #include <iostream>
- 
- #define PCITEM_COLUMN_COMMENT		0
-diff --git a/retroshare-gui/src/gui/gxs/GxsIdDetails.cpp b/retroshare-gui/src/gui/gxs/GxsIdDetails.cpp
---- a/retroshare-gui/src/gui/gxs/GxsIdDetails.cpp
-+++ b/retroshare-gui/src/gui/gxs/GxsIdDetails.cpp
-@@ -18,19 +18,21 @@
-  *                                                                             *
-  *******************************************************************************/
- 
--#include <QApplication>
--#include <QThread>
--#include <QTimerEvent>
--#include <QMutexLocker>
-+#include "GxsIdDetails.h"
- 
--#include <math.h>
--#include "GxsIdDetails.h"
- #include "retroshare-gui/RsAutoUpdatePage.h"
- 
- #include <retroshare/rspeers.h>
- 
--#include <iostream>
-+#include <QApplication>
-+#include <QMutexLocker>
- #include <QPainter>
-+#include <QPainterPath>
-+#include <QThread>
-+#include <QTimerEvent>
-+
-+#include <iostream>
-+#include <cmath>
- 
- /* Images for tag icons */
- #define IMAGE_LOADING     ":/images/folder-draft.png"
diff --git a/net-p2p/retroshare/metadata.xml b/net-p2p/retroshare/metadata.xml
index 56985f7e44a7..7f0b4e9f7e6d 100644
--- a/net-p2p/retroshare/metadata.xml
+++ b/net-p2p/retroshare/metadata.xml
@@ -20,15 +20,11 @@
 	<use>
 		<flag name="autologin">Enables potentially insecure autologin capability via <pkg>app-crypt/libsecret</pkg></flag>
 		<flag name="cli">Enables terminal login support for retroshare-service</flag>
-		<flag name="control-socket">Enables API via Unix socket support</flag>
-		<flag name="gnome-keyring">Enables potentially insecure autologin capability via <pkg>gnome-base/gnome-keyring</pkg></flag>
 		<flag name="jsonapi">Enables the new RetroShare JSON API</flag>
 		<flag name="libupnp">Enables UPnP port forwarding via <pkg>net-libs/libupnp</pkg></flag>
 		<flag name="miniupnp">Enables UPnP port forwarding via <pkg>net-libs/miniupnpc</pkg></flag>
 		<flag name="service">Enables the new RetroShare service</flag>
 		<flag name="sqlcipher">Enables GXS database encryption via SQLCipher</flag>
-		<flag name="webui">Enables Web interface and API support</flag>
-		<flag name="xapian">Enables GXS content indexing and search via <pkg>dev-libs/xapian</pkg></flag>
 	</use>
 	<upstream>
 		<bugs-to>https://github.com/RetroShare/RetroShare/issues</bugs-to>
diff --git a/net-p2p/retroshare/retroshare-0.6.5-r2.ebuild b/net-p2p/retroshare/retroshare-0.6.5-r2.ebuild
deleted file mode 100644
index e4579943fbac..000000000000
--- a/net-p2p/retroshare/retroshare-0.6.5-r2.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop edos2unix qmake-utils xdg-utils
-
-DESCRIPTION="P2P private sharing application"
-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-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="cli control-socket gnome-keyring +gui +jsonapi service +sqlcipher webui +xapian"
-
-REQUIRED_USE="
-	|| ( cli gui service )
-	service? ( jsonapi )"
-
-RDEPEND="
-	app-arch/bzip2
-	dev-libs/openssl:0=
-	>=dev-libs/rapidjson-1.1.0
-	net-libs/miniupnpc:=
-	sys-libs/zlib
-	control-socket? ( dev-qt/qtnetwork:5 )
-	gnome-keyring? ( app-crypt/libsecret )
-	gui? (
-		dev-qt/qtcore:5
-		dev-qt/qtmultimedia:5
-		dev-qt/qtnetwork:5
-		dev-qt/qtprintsupport:5
-		dev-qt/qtscript:5
-		dev-qt/qtxml:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtx11extras:5
-		x11-libs/libX11
-		x11-libs/libXScrnSaver
-	)
-	service? ( dev-qt/qtcore:5 )
-	sqlcipher? ( dev-db/sqlcipher )
-	!sqlcipher? ( dev-db/sqlite:3 )
-	webui? ( net-libs/libmicrohttpd )
-	xapian? ( dev-libs/xapian )"
-
-DEPEND="${RDEPEND}
-	dev-qt/qtcore:5
-	gui? ( dev-qt/designer:5 )"
-
-BDEPEND="dev-util/cmake
-	virtual/pkgconfig
-	jsonapi? (
-		|| (
-			>=app-doc/doxygen-1.8.17
-			<app-doc/doxygen-1.8.16
-		)
-	)"
-
-PATCHES=( "${FILESDIR}/${P}-qt-5.15.patch" )
-
-S="${WORKDIR}"/RetroShare
-
-src_prepare() {
-	# CRLF endings break patch...
-	edos2unix retroshare-gui/src/gui/elastic/elnode.h
-	default
-}
-
-src_configure() {
-	local qConfigs=()
-
-	qConfigs+=( $(usex cli '' 'no_')retroshare_nogui )
-	qConfigs+=( $(usex control-socket '' 'no_')libresapilocalserver )
-	qConfigs+=( $(usex gnome-keyring '' 'no_')rs_autologin )
-	qConfigs+=( $(usex gui '' 'no_')retroshare_gui )
-	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}" \
-		RS_UPNP_LIB=miniupnpc
-}
-
-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"
-	}
-
-	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
-
-	use webui && doins -r libresapi/src/webui
-
-	dodoc README.md
-	make_desktop_entry retroshare
-
-	for i in 24 48 64 128 ; do
-		doicon -s ${i} "data/${i}x${i}/apps/retroshare.png"
-	done
-}
-
-pkg_pretend() {
-	if ! use sqlcipher; then
-		ewarn "You have disabled GXS database encryption, ${PN} will use SQLite"
-		ewarn "instead of SQLCipher for GXS databases."
-		ewarn "Builds using SQLite and builds using SQLCipher have incompatible"
-		ewarn "database format, so you will need to manually delete GXS"
-		ewarn "database (loosing all your GXS data and identities) when you"
-		ewarn "toggle sqlcipher USE flag."
-	fi
-}
-
-pkg_preinst() {
-	local ver
-	for ver in ${REPLACING_VERSIONS}; do
-		if ver_test ${ver} -lt 0.5.9999; then
-			ewarn "You are upgrading from Retroshare 0.5.* to ${PV}"
-			ewarn "Version 0.6.* is backward-incompatible with 0.5 branch"
-			ewarn "and clients with 0.6.* can not connect to clients that have 0.5.*"
-			ewarn "It's recommended to drop all your configuration and either"
-			ewarn "generate a new certificate or import existing from a backup"
-			break
-		fi
-		if ver_test ${ver} -ge 0.6.0 && ver_test ${ver} -lt 0.6.4; then
-			elog "Main executable has been renamed upstream from RetroShare06 to retroshare"
-			break
-		fi
-	done
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/net-p2p/retroshare/retroshare-0.6.5-r3.ebuild b/net-p2p/retroshare/retroshare-0.6.5-r3.ebuild
deleted file mode 100644
index 4a653396a8f0..000000000000
--- a/net-p2p/retroshare/retroshare-0.6.5-r3.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop edos2unix qmake-utils xdg-utils
-
-DESCRIPTION="P2P private sharing application"
-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"
-
-LICENSE="AGPL-3 Apache-2.0 CC-BY-SA-4.0 GPL-2 GPL-3 LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="autologin +gui +jsonapi +service +sqlcipher"
-
-REQUIRED_USE="
-	|| ( gui service )
-	service? ( jsonapi )"
-
-RDEPEND="
-	app-arch/bzip2
-	dev-libs/openssl:0=
-	>=dev-libs/rapidjson-1.1.0
-	net-libs/miniupnpc:=
-	sys-libs/zlib
-	autologin? ( app-crypt/libsecret )
-	gui? (
-		dev-qt/qtcore:5
-		dev-qt/qtmultimedia:5
-		dev-qt/qtnetwork:5
-		dev-qt/qtprintsupport:5
-		dev-qt/qtscript:5
-		dev-qt/qtxml:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtx11extras:5
-		x11-libs/libX11
-		x11-libs/libXScrnSaver
-	)
-	service? ( dev-qt/qtcore:5 )
-	sqlcipher? ( dev-db/sqlcipher )
-	!sqlcipher? ( dev-db/sqlite:3 )"
-
-DEPEND="${RDEPEND}
-	dev-qt/qtcore:5
-	gui? ( dev-qt/designer:5 )"
-
-BDEPEND="dev-util/cmake
-	virtual/pkgconfig
-	jsonapi? ( app-doc/doxygen )"
-
-PATCHES=( "${FILESDIR}/${P}-qt-5.15.patch" )
-
-S="${WORKDIR}"/RetroShare
-
-src_prepare() {
-	# CRLF endings break patch...
-	edos2unix retroshare-gui/src/gui/elastic/elnode.h
-	default
-}
-
-src_configure() {
-	local qConfigs=()
-
-	qConfigs+=( $(usex autologin '' 'no_')rs_autologin )
-	qConfigs+=( $(usex gui '' 'no_')retroshare_gui )
-	qConfigs+=( $(usex jsonapi '' 'no_')rs_jsonapi )
-	qConfigs+=( $(usex service '' 'no_')retroshare_service )
-	qConfigs+=( $(usex sqlcipher '' 'no_')sqlcipher )
-	qConfigs+=( no_retroshare_nogui )
-	qConfigs+=( no_libresapi )
-	qConfigs+=( no_libresapi_settings )
-	qConfigs+=( no_libresapilocalserver )
-	qConfigs+=( no_libresapihttpserver )
-
-	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}" \
-		RS_UPNP_LIB=miniupnpc
-}
-
-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"
-	}
-
-	emake
-}
-
-src_install() {
-	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
-
-	dodoc README.md
-	make_desktop_entry retroshare
-
-	for i in 24 48 64 128 ; do
-		doicon -s ${i} "data/${i}x${i}/apps/retroshare.png"
-	done
-}
-
-pkg_pretend() {
-	if ! use sqlcipher; then
-		ewarn "You have disabled GXS database encryption, ${PN} will use SQLite"
-		ewarn "instead of SQLCipher for GXS databases."
-		ewarn "Builds using SQLite and builds using SQLCipher have incompatible"
-		ewarn "database format, so you will need to manually delete GXS"
-		ewarn "database (loosing all your GXS data and identities) when you"
-		ewarn "toggle sqlcipher USE flag."
-	fi
-}
-
-pkg_preinst() {
-	local ver
-	for ver in ${REPLACING_VERSIONS}; do
-		if ver_test ${ver} -lt 0.5.9999; then
-			ewarn "You are upgrading from Retroshare 0.5.* to ${PV}"
-			ewarn "Version 0.6.* is backward-incompatible with 0.5 branch"
-			ewarn "and clients with 0.6.* can not connect to clients that have 0.5.*"
-			ewarn "It's recommended to drop all your configuration and either"
-			ewarn "generate a new certificate or import existing from a backup"
-			break
-		fi
-		if ver_test ${ver} -ge 0.6.0 && ver_test ${ver} -lt 0.6.4; then
-			elog "Main executable has been renamed upstream from RetroShare06 to retroshare"
-			break
-		fi
-	done
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/net-p2p/retroshare/retroshare-0.6.6.ebuild b/net-p2p/retroshare/retroshare-0.6.6.ebuild
deleted file mode 100644
index d331568ada6f..000000000000
--- a/net-p2p/retroshare/retroshare-0.6.6.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop qmake-utils xdg
-
-DESCRIPTION="P2P private sharing application"
-HOMEPAGE="https://retroshare.cc"
-SRC_URI="http://download.opensuse.org/repositories/network:/retroshare/Debian_Testing/retroshare-common_${PV}.orig.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/RetroShare"
-
-LICENSE="AGPL-3 Apache-2.0 CC-BY-SA-4.0 GPL-2 GPL-3 LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="autologin cli +gui +jsonapi libupnp +miniupnp +service +sqlcipher"
-
-REQUIRED_USE="
-	|| ( gui service )
-	?? ( libupnp miniupnp )
-	service? ( || ( cli jsonapi ) )"
-
-RDEPEND="
-	app-arch/bzip2
-	dev-libs/openssl:0=
-	>=dev-libs/rapidjson-1.1.0
-	sys-libs/zlib
-	autologin? ( app-crypt/libsecret )
-	gui? (
-		dev-qt/qtcore:5
-		dev-qt/qtmultimedia:5
-		dev-qt/qtnetwork:5
-		dev-qt/qtprintsupport:5
-		dev-qt/qtscript:5
-		dev-qt/qtxml:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtx11extras:5
-		x11-libs/libX11
-		x11-libs/libXScrnSaver
-	)
-	libupnp? ( net-libs/libupnp:= )
-	miniupnp? ( net-libs/miniupnpc:= )
-	service? ( dev-qt/qtcore:5 )
-	sqlcipher? ( dev-db/sqlcipher )
-	!sqlcipher? ( dev-db/sqlite:3 )"
-
-DEPEND="${RDEPEND}
-	dev-qt/qtcore:5
-	gui? ( dev-qt/designer:5 )"
-
-BDEPEND="dev-util/cmake
-	virtual/pkgconfig
-	jsonapi? ( app-doc/doxygen )"
-
-PATCHES=( "${FILESDIR}/${P}-fix-cxx17-compilation.patch" )
-
-src_configure() {
-	local qconfigs=(
-		$(usex cli '' 'no_')rs_service_terminal_login
-		$(usex autologin '' 'no_')rs_autologin
-		$(usex gui '' 'no_')retroshare_gui
-		$(usex jsonapi '' 'no_')rs_jsonapi
-		$(usex service '' 'no_')retroshare_service
-		$(usex sqlcipher '' 'no_')sqlcipher
-	)
-
-	local qupnplibs="none"
-	use miniupnp && qupnplibs="miniupnpc"
-	use libupnp && qupnplibs="upnp ixml"
-
-	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}" \
-		RS_UPNP_LIB="${qupnplibs}"
-}
-
-src_install() {
-	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
-
-	dodoc README.asciidoc
-
-	if use gui; then
-		make_desktop_entry retroshare
-
-		for i in 24 48 64 128 ; do
-			doicon -s ${i} "data/${i}x${i}/apps/retroshare.png"
-		done
-	fi
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-
-	if ! use sqlcipher && ! has_version "net-p2p/retroshare[-sqlcipher]"; then
-		ewarn "You have disabled GXS database encryption, ${PN} will use SQLite"
-		ewarn "instead of SQLCipher for GXS databases."
-		ewarn "Builds using SQLite and builds using SQLCipher have incompatible"
-		ewarn "database format, so you will need to manually delete GXS"
-		ewarn "database (loosing all your GXS data and identities) when you"
-		ewarn "toggle sqlcipher USE flag."
-	fi
-
-	if [[ ${REPLACING_VERSIONS} ]]; then
-		if ver_test ${REPLACING_VERSIONS} -lt 0.6; then
-			ewarn "You are upgrading from Retroshare 0.5.* to ${PV}"
-			ewarn "Version 0.6.* is backward-incompatible with 0.5 branch"
-			ewarn "and clients with 0.6.* can not connect to clients that have 0.5.*"
-			ewarn "It's recommended to drop all your configuration and either"
-			ewarn "generate a new certificate or import existing from a backup"
-			break
-		fi
-		if ver_test ${REPLACING_VERSIONS} -ge 0.6.0 && ver_test ${REPLACING_VERSIONS} -lt 0.6.4; then
-			elog "Main executable has been renamed upstream from RetroShare06 to retroshare"
-			break
-		fi
-	fi
-}