From: Mart Raudsepp <leio@gentoo.org>
Date: Sun, 8 Sep 2019 16:49:41 +0000 (+0300)
Subject: gnome-base/dconf: add back env.d to not break conf if gconf present
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=06e2701ad6a511383d000b62f9faa2328800762b;p=gentoo.git

gnome-base/dconf: add back env.d to not break conf if gconf present

Needed for the CONFIG_PROTECT_MASK at least, but also still
for GSETTINGS_BACKEND setting, because gnome-base/gconf sets it
to gconf in /etc/env.d/50gconf, thus until gconf still sets it,
we have to set it in dconf too to override it in the higher
numbered env.d entry.

Package-Manager: Portage-2.3.69, Repoman-2.3.12
Signed-off-by: Mart Raudsepp <leio@gentoo.org>
---

diff --git a/gnome-base/dconf/dconf-0.32.0.ebuild b/gnome-base/dconf/dconf-0.32.0-r1.ebuild
similarity index 77%
rename from gnome-base/dconf/dconf-0.32.0.ebuild
rename to gnome-base/dconf/dconf-0.32.0-r1.ebuild
index 2175d3f9748d..8e9d9a0257d7 100644
--- a/gnome-base/dconf/dconf-0.32.0.ebuild
+++ b/gnome-base/dconf/dconf-0.32.0-r1.ebuild
@@ -42,6 +42,20 @@ src_configure() {
 	meson_src_configure
 }
 
+src_install() {
+	meson_src_install
+
+	# GSettings backend may be one of: memory, gconf, dconf
+	# Only dconf is really considered functional by upstream
+	# must have it enabled over gconf if both are installed
+	# This snippet can't be removed until gconf package is
+	# ensured to not install a /etc/env.d/50gconf and then
+	# still consider the CONFIG_PROTECT_MASK bit.
+	echo 'CONFIG_PROTECT_MASK="/etc/dconf"' >> 51dconf
+	echo 'GSETTINGS_BACKEND="dconf"' >> 51dconf
+	doenvd 51dconf
+}
+
 src_test() {
 	virtx meson_src_test
 }