| 1 |
commit: e776e88cc3a24b002b350b06772622be452081f7 |
| 2 |
Author: Sergey Popov <pinkbyte <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Aug 2 09:22:04 2017 +0000 |
| 4 |
Commit: Sergey Popov <pinkbyte <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Aug 2 09:22:04 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e776e88c |
| 7 |
|
| 8 |
net-p2p/retroshare: make gnome-base/libgnome-keyring dependency optional, fix autologin |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.6, Repoman-2.3.1 |
| 11 |
|
| 12 |
net-p2p/retroshare/metadata.xml | 1 + |
| 13 |
net-p2p/retroshare/retroshare-0.6.2.ebuild | 6 +++--- |
| 14 |
net-p2p/retroshare/retroshare-0.6.9999.ebuild | 6 +++--- |
| 15 |
3 files changed, 7 insertions(+), 6 deletions(-) |
| 16 |
|
| 17 |
diff --git a/net-p2p/retroshare/metadata.xml b/net-p2p/retroshare/metadata.xml |
| 18 |
index ccf103c0b98..b92e67f3011 100644 |
| 19 |
--- a/net-p2p/retroshare/metadata.xml |
| 20 |
+++ b/net-p2p/retroshare/metadata.xml |
| 21 |
@@ -17,6 +17,7 @@ |
| 22 |
<use> |
| 23 |
<flag name="cli">Enables the CLI version of RetroShare</flag> |
| 24 |
<flag name="feedreader">Enables the Feedreader plugin</flag> |
| 25 |
+ <flag name="gnome-keyring">Enables potentially insecure autologin capability via Gnome Keyring</flag> |
| 26 |
<flag name="gui">Enables the GUI version of RetroShare</flag> |
| 27 |
<flag name="voip">Enables VOIP plugin</flag> |
| 28 |
</use> |
| 29 |
|
| 30 |
diff --git a/net-p2p/retroshare/retroshare-0.6.2.ebuild b/net-p2p/retroshare/retroshare-0.6.2.ebuild |
| 31 |
index 9bbc687a0fb..86ae46473b4 100644 |
| 32 |
--- a/net-p2p/retroshare/retroshare-0.6.2.ebuild |
| 33 |
+++ b/net-p2p/retroshare/retroshare-0.6.2.ebuild |
| 34 |
@@ -14,7 +14,7 @@ LICENSE="GPL-2 GPL-3 Apache-2.0 LGPL-2.1" |
| 35 |
SLOT="0" |
| 36 |
KEYWORDS="amd64 x86" |
| 37 |
|
| 38 |
-IUSE="cli feedreader +gui voip" |
| 39 |
+IUSE="cli feedreader gnome-keyring +gui voip" |
| 40 |
REQUIRED_USE=" |
| 41 |
|| ( cli gui ) |
| 42 |
feedreader? ( gui ) |
| 43 |
@@ -30,10 +30,10 @@ RDEPEND=" |
| 44 |
dev-qt/qtprintsupport:5 |
| 45 |
dev-qt/qtscript:5 |
| 46 |
dev-qt/qtxml:5 |
| 47 |
- gnome-base/libgnome-keyring |
| 48 |
net-libs/libmicrohttpd |
| 49 |
net-libs/libupnp:0 |
| 50 |
sys-libs/zlib |
| 51 |
+ gnome-keyring? ( gnome-base/libgnome-keyring ) |
| 52 |
feedreader? ( |
| 53 |
dev-libs/libxml2 |
| 54 |
dev-libs/libxslt |
| 55 |
@@ -87,7 +87,7 @@ src_prepare() { |
| 56 |
src_configure() { |
| 57 |
for dir in ${rs_src_dirs} ; do |
| 58 |
pushd "${S}/${dir}" >/dev/null || die |
| 59 |
- eqmake5 |
| 60 |
+ eqmake5 $(use gnome-keyring && echo CONFIG+=rs_autologin) |
| 61 |
popd >/dev/null || die |
| 62 |
done |
| 63 |
} |
| 64 |
|
| 65 |
diff --git a/net-p2p/retroshare/retroshare-0.6.9999.ebuild b/net-p2p/retroshare/retroshare-0.6.9999.ebuild |
| 66 |
index e5cfb2b92f6..15d6a116d95 100644 |
| 67 |
--- a/net-p2p/retroshare/retroshare-0.6.9999.ebuild |
| 68 |
+++ b/net-p2p/retroshare/retroshare-0.6.9999.ebuild |
| 69 |
@@ -14,7 +14,7 @@ LICENSE="GPL-2 GPL-3 Apache-2.0 LGPL-2.1" |
| 70 |
SLOT="0" |
| 71 |
KEYWORDS="" |
| 72 |
|
| 73 |
-IUSE="cli feedreader +gui voip" |
| 74 |
+IUSE="cli feedreader gnome-keyring +gui voip" |
| 75 |
REQUIRED_USE=" |
| 76 |
|| ( cli gui ) |
| 77 |
feedreader? ( gui ) |
| 78 |
@@ -30,10 +30,10 @@ RDEPEND=" |
| 79 |
dev-qt/qtprintsupport:5 |
| 80 |
dev-qt/qtscript:5 |
| 81 |
dev-qt/qtxml:5 |
| 82 |
- gnome-base/libgnome-keyring |
| 83 |
net-libs/libmicrohttpd |
| 84 |
net-libs/libupnp:0 |
| 85 |
sys-libs/zlib |
| 86 |
+ gnome-keyring? ( gnome-base/libgnome-keyring ) |
| 87 |
feedreader? ( |
| 88 |
dev-libs/libxml2 |
| 89 |
dev-libs/libxslt |
| 90 |
@@ -84,7 +84,7 @@ src_prepare() { |
| 91 |
src_configure() { |
| 92 |
for dir in ${rs_src_dirs} ; do |
| 93 |
pushd "${S}/${dir}" >/dev/null || die |
| 94 |
- eqmake5 |
| 95 |
+ eqmake5 $(use gnome-keyring && echo CONFIG+=rs_autologin) |
| 96 |
popd >/dev/null || die |
| 97 |
done |
| 98 |
} |
Archives