[gentoo-dev] [PATCH v2 1/2] xdg-utils.eclass: reset XDG_STATE_HOME

[gentoo-dev] [PATCH v2 1/2] xdg-utils.eclass: reset XDG_STATE_HOME

[Sam James]

XDG_STATE_HOME is defined in the basedir spec just like XDG_DATA_HOME and
XDG_CONFIG_HOME, so we should cover it.

We have to set in eclass because we still have < EAPI 7 ebuilds in tree
(no ENV_UNSET).

Closes: https://bugs.gentoo.org/873802
Signed-off-by: Sam James <sam@gentoo.org>
---
 eclass/xdg-utils.eclass | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/eclass/xdg-utils.eclass b/eclass/xdg-utils.eclass
index ae2b71cd2495..9a58add23d36 100644
--- a/eclass/xdg-utils.eclass
+++ b/eclass/xdg-utils.eclass
@@ -1,4 +1,4 @@
-# Copyright 2004-2021 Gentoo Authors
+# Copyright 2004-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: xdg-utils.eclass
@@ -42,9 +42,10 @@ xdg_environment_reset() {
 	export XDG_DATA_HOME="${HOME}/.local/share"
 	export XDG_CONFIG_HOME="${HOME}/.config"
 	export XDG_CACHE_HOME="${HOME}/.cache"
+	export XDG_STATE_HOME="${HOME}/.local/state"
 	export XDG_RUNTIME_DIR="${T}/run"
 	mkdir -p "${XDG_DATA_HOME}" "${XDG_CONFIG_HOME}" "${XDG_CACHE_HOME}" \
-		"${XDG_RUNTIME_DIR}" || die
+		"${XDG_STATE_HOME}" "${XDG_RUNTIME_DIR}" || die
 	# This directory needs to be owned by the user, and chmod 0700
 	# https://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html
 	chmod 0700 "${XDG_RUNTIME_DIR}" || die
-- 
2.37.3

[gentoo-dev] [PATCH v2 2/2] profiles: add XDG_STATE_DIR to ENV_UNSET

[Sam James]

XDG_STATE_HOME is defined in the basedir spec just like XDG_DATA_HOME and
XDG_CONFIG_HOME, so we should cover it.

Closes: https://bugs.gentoo.org/873802
Signed-off-by: Sam James <sam@gentoo.org>
---
 profiles/base/make.defaults     | 2 +-
 profiles/embedded/make.defaults | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults
index 2c288d12d103..39d5dd1cf8aa 100644
--- a/profiles/base/make.defaults
+++ b/profiles/base/make.defaults
@@ -43,7 +43,7 @@ CONFIG_PROTECT_MASK="/etc/env.d /etc/gconf"
 # GOBIN needs to be cleaned as random values in GOBIN can affect the
 # building of some packages:
 # https://archives.gentoo.org/gentoo-dev/message/163010f83ae7819d80c0cfdf797cbfe0
-ENV_UNSET="DBUS_SESSION_BUS_ADDRESS DISPLAY CARGO_HOME XAUTHORITY XDG_CACHE_HOME XDG_CONFIG_HOME XDG_DATA_HOME XDG_RUNTIME_DIR PERL_MM_OPT PERL5LIB PERL5OPT PERL_MB_OPT PERL_CORE PERLPREFIX GOBIN GOPATH"
+ENV_UNSET="DBUS_SESSION_BUS_ADDRESS DISPLAY CARGO_HOME XAUTHORITY XDG_CACHE_HOME XDG_CONFIG_HOME XDG_DATA_HOME XDG_STATE_HOME XDG_RUNTIME_DIR PERL_MM_OPT PERL5LIB PERL5OPT PERL_MB_OPT PERL_CORE PERLPREFIX GOBIN GOPATH"
 
 # Variables that are set exclusively by the profile
 # and not by user configuration files.
diff --git a/profiles/embedded/make.defaults b/profiles/embedded/make.defaults
index 20d5960e9cc8..050826ef6951 100644
--- a/profiles/embedded/make.defaults
+++ b/profiles/embedded/make.defaults
@@ -70,7 +70,7 @@ CONFIG_PROTECT_MASK="/etc/env.d /etc/gconf"
 # GOBIN needs to be cleaned as random values in GOBIN can affect the
 # building of some packages:
 # https://archives.gentoo.org/gentoo-dev/message/163010f83ae7819d80c0cfdf797cbfe0
-ENV_UNSET="DBUS_SESSION_BUS_ADDRESS DISPLAY CARGO_HOME XAUTHORITY XDG_CACHE_HOME XDG_CONFIG_HOME XDG_DATA_HOME XDG_RUNTIME_DIR PERL_MM_OPT PERL5LIB PERL5OPT PERL_MB_OPT PERL_CORE PERLPREFIX GOBIN GOPATH"
+ENV_UNSET="DBUS_SESSION_BUS_ADDRESS DISPLAY CARGO_HOME XAUTHORITY XDG_CACHE_HOME XDG_CONFIG_HOME XDG_DATA_HOME XDG_STATE_HOME XDG_RUNTIME_DIR PERL_MM_OPT PERL5LIB PERL5OPT PERL_MB_OPT PERL_CORE PERLPREFIX GOBIN GOPATH"
 
 # Tiziano Müller <dev-zero@gentoo.org> (2010-01-24)
 # We usually don't want python to (re)write .py[co] files during phase runs
-- 
2.37.3