| 1 |
commit: b67a7186692191fbee1b164af49fa66f04f3a785 |
| 2 |
Author: Marek Szuba <marecki <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Mar 15 10:46:54 2019 +0000 |
| 4 |
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Mar 15 10:53:35 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b67a7186 |
| 7 |
|
| 8 |
net-p2p/syncthing: reset xdg environment |
| 9 |
|
| 10 |
Turns out go uses $XDG_CACHE_HOME to decide where to put the build |
| 11 |
cache. Make sure it, and to be on the safe side the rest of XDG |
| 12 |
environment as well, is reset before building Syncthing. |
| 13 |
|
| 14 |
We do not inherit xdg.eclass for this purpose because it introduces |
| 15 |
several dependencies we do not actually need. |
| 16 |
|
| 17 |
Closes: https://bugs.gentoo.org/679280 |
| 18 |
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org> |
| 19 |
Package-Manager: Portage-2.3.62, Repoman-2.3.11 |
| 20 |
|
| 21 |
net-p2p/syncthing/syncthing-1.0.1.ebuild | 5 ++++- |
| 22 |
1 file changed, 4 insertions(+), 1 deletion(-) |
| 23 |
|
| 24 |
diff --git a/net-p2p/syncthing/syncthing-1.0.1.ebuild b/net-p2p/syncthing/syncthing-1.0.1.ebuild |
| 25 |
index e49e912c31e..6a2795b2434 100644 |
| 26 |
--- a/net-p2p/syncthing/syncthing-1.0.1.ebuild |
| 27 |
+++ b/net-p2p/syncthing/syncthing-1.0.1.ebuild |
| 28 |
@@ -5,7 +5,7 @@ EAPI=7 |
| 29 |
|
| 30 |
EGO_PN="github.com/${PN}/${PN}" |
| 31 |
|
| 32 |
-inherit golang-vcs-snapshot systemd user |
| 33 |
+inherit golang-vcs-snapshot systemd user xdg-utils |
| 34 |
|
| 35 |
DESCRIPTION="Open Source Continuous File Synchronization" |
| 36 |
HOMEPAGE="https://syncthing.net" |
| 37 |
@@ -35,6 +35,9 @@ pkg_setup() { |
| 38 |
} |
| 39 |
|
| 40 |
src_prepare() { |
| 41 |
+ # Bug #679280 |
| 42 |
+ xdg_environment_reset |
| 43 |
+ |
| 44 |
default |
| 45 |
sed -i \ |
| 46 |
's|^ExecStart=.*|ExecStart=/usr/libexec/syncthing/strelaysrv|' \ |
Archives