From: Sergey Popov <pinkbyte@gentoo.org>
Date: Wed, 2 Aug 2017 09:22:04 +0000 (+0300)
Subject: net-p2p/retroshare: make gnome-base/libgnome-keyring dependency optional, fix autologin
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e776e88cc3a24b002b350b06772622be452081f7;p=gentoo.git

net-p2p/retroshare: make gnome-base/libgnome-keyring dependency optional, fix autologin

Package-Manager: Portage-2.3.6, Repoman-2.3.1
---

diff --git a/net-p2p/retroshare/metadata.xml b/net-p2p/retroshare/metadata.xml
index ccf103c0b98b..b92e67f30115 100644
--- a/net-p2p/retroshare/metadata.xml
+++ b/net-p2p/retroshare/metadata.xml
@@ -17,6 +17,7 @@
 	<use>
 		<flag name="cli">Enables the CLI version of RetroShare</flag>
 		<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="voip">Enables VOIP plugin</flag>
 	</use>
diff --git a/net-p2p/retroshare/retroshare-0.6.2.ebuild b/net-p2p/retroshare/retroshare-0.6.2.ebuild
index 9bbc687a0fbb..86ae46473b4a 100644
--- a/net-p2p/retroshare/retroshare-0.6.2.ebuild
+++ b/net-p2p/retroshare/retroshare-0.6.2.ebuild
@@ -14,7 +14,7 @@ LICENSE="GPL-2 GPL-3 Apache-2.0 LGPL-2.1"
 SLOT="0"
 KEYWORDS="amd64 x86"
 
-IUSE="cli feedreader +gui voip"
+IUSE="cli feedreader gnome-keyring +gui voip"
 REQUIRED_USE="
 	|| ( cli gui )
 	feedreader? ( gui )
@@ -30,10 +30,10 @@ RDEPEND="
 	dev-qt/qtprintsupport:5
 	dev-qt/qtscript:5
 	dev-qt/qtxml:5
-	gnome-base/libgnome-keyring
 	net-libs/libmicrohttpd
 	net-libs/libupnp:0
 	sys-libs/zlib
+	gnome-keyring? ( gnome-base/libgnome-keyring )
 	feedreader? (
 		dev-libs/libxml2
 		dev-libs/libxslt
@@ -87,7 +87,7 @@ src_prepare() {
 src_configure() {
 	for dir in ${rs_src_dirs} ; do
 		pushd "${S}/${dir}" >/dev/null || die
-		eqmake5
+		eqmake5 $(use gnome-keyring && echo CONFIG+=rs_autologin)
 		popd >/dev/null || die
 	done
 }
diff --git a/net-p2p/retroshare/retroshare-0.6.9999.ebuild b/net-p2p/retroshare/retroshare-0.6.9999.ebuild
index e5cfb2b92f65..15d6a116d95e 100644
--- a/net-p2p/retroshare/retroshare-0.6.9999.ebuild
+++ b/net-p2p/retroshare/retroshare-0.6.9999.ebuild
@@ -14,7 +14,7 @@ LICENSE="GPL-2 GPL-3 Apache-2.0 LGPL-2.1"
 SLOT="0"
 KEYWORDS=""
 
-IUSE="cli feedreader +gui voip"
+IUSE="cli feedreader gnome-keyring +gui voip"
 REQUIRED_USE="
 	|| ( cli gui )
 	feedreader? ( gui )
@@ -30,10 +30,10 @@ RDEPEND="
 	dev-qt/qtprintsupport:5
 	dev-qt/qtscript:5
 	dev-qt/qtxml:5
-	gnome-base/libgnome-keyring
 	net-libs/libmicrohttpd
 	net-libs/libupnp:0
 	sys-libs/zlib
+	gnome-keyring? ( gnome-base/libgnome-keyring )
 	feedreader? (
 		dev-libs/libxml2
 		dev-libs/libxslt
@@ -84,7 +84,7 @@ src_prepare() {
 src_configure() {
 	for dir in ${rs_src_dirs} ; do
 		pushd "${S}/${dir}" >/dev/null || die
-		eqmake5
+		eqmake5 $(use gnome-keyring && echo CONFIG+=rs_autologin)
 		popd >/dev/null || die
 	done
 }