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 ccf103c0b98bd3129821c08a7c3f0e00439e014f..b92e67f30115ba8aac24440cc27ed404d68bc042 100644 (file)
--- 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 9bbc687a0fbb8547898f4f5a7576d6010df565a9..86ae46473b4a8685d78d342098fcbe25041b9bee 100644 (file)
--- 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 e5cfb2b92f6517a91ea30d725188dd433bbcf5d4..15d6a116d95e91faef1683816b6a1251bc9ff35f 100644 (file)
--- 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
 }