From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 82874138334 for ; Fri, 15 Mar 2019 10:53:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 82D9EE0929; Fri, 15 Mar 2019 10:53:47 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 559FDE0946 for ; Fri, 15 Mar 2019 10:53:47 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9ACD9335D10 for ; Fri, 15 Mar 2019 10:53:45 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A273F559 for ; Fri, 15 Mar 2019 10:53:43 +0000 (UTC) From: "Marek Szuba" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Marek Szuba" Message-ID: <1552647215.b67a7186692191fbee1b164af49fa66f04f3a785.marecki@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-p2p/syncthing/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-p2p/syncthing/syncthing-1.0.1.ebuild X-VCS-Directories: net-p2p/syncthing/ X-VCS-Committer: marecki X-VCS-Committer-Name: Marek Szuba X-VCS-Revision: b67a7186692191fbee1b164af49fa66f04f3a785 X-VCS-Branch: master Date: Fri, 15 Mar 2019 10:53:43 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: c0a1367c-879a-4cdf-8714-ea788b523878 X-Archives-Hash: 82d6d1773c6e764936b907879bdd6ac4 commit: b67a7186692191fbee1b164af49fa66f04f3a785 Author: Marek Szuba gentoo org> AuthorDate: Fri Mar 15 10:46:54 2019 +0000 Commit: Marek Szuba gentoo org> CommitDate: Fri Mar 15 10:53:35 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b67a7186 net-p2p/syncthing: reset xdg environment Turns out go uses $XDG_CACHE_HOME to decide where to put the build cache. Make sure it, and to be on the safe side the rest of XDG environment as well, is reset before building Syncthing. We do not inherit xdg.eclass for this purpose because it introduces several dependencies we do not actually need. Closes: https://bugs.gentoo.org/679280 Signed-off-by: Marek Szuba gentoo.org> Package-Manager: Portage-2.3.62, Repoman-2.3.11 net-p2p/syncthing/syncthing-1.0.1.ebuild | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/net-p2p/syncthing/syncthing-1.0.1.ebuild b/net-p2p/syncthing/syncthing-1.0.1.ebuild index e49e912c31e..6a2795b2434 100644 --- a/net-p2p/syncthing/syncthing-1.0.1.ebuild +++ b/net-p2p/syncthing/syncthing-1.0.1.ebuild @@ -5,7 +5,7 @@ EAPI=7 EGO_PN="github.com/${PN}/${PN}" -inherit golang-vcs-snapshot systemd user +inherit golang-vcs-snapshot systemd user xdg-utils DESCRIPTION="Open Source Continuous File Synchronization" HOMEPAGE="https://syncthing.net" @@ -35,6 +35,9 @@ pkg_setup() { } src_prepare() { + # Bug #679280 + xdg_environment_reset + default sed -i \ 's|^ExecStart=.*|ExecStart=/usr/libexec/syncthing/strelaysrv|' \