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 B6AB3138334 for ; Sun, 8 Sep 2019 16:51:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DC66EE097E; Sun, 8 Sep 2019 16:51:39 +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 C5FDEE097E for ; Sun, 8 Sep 2019 16:51:39 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 9244834AE97 for ; Sun, 8 Sep 2019 16:51:38 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 91D4B744 for ; Sun, 8 Sep 2019 16:51:36 +0000 (UTC) From: "Mart Raudsepp" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mart Raudsepp" Message-ID: <1567961472.06e2701ad6a511383d000b62f9faa2328800762b.leio@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: gnome-base/dconf/ X-VCS-Repository: repo/gentoo X-VCS-Files: gnome-base/dconf/dconf-0.32.0-r1.ebuild gnome-base/dconf/dconf-0.32.0.ebuild X-VCS-Directories: gnome-base/dconf/ X-VCS-Committer: leio X-VCS-Committer-Name: Mart Raudsepp X-VCS-Revision: 06e2701ad6a511383d000b62f9faa2328800762b X-VCS-Branch: master Date: Sun, 8 Sep 2019 16:51:36 +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: d197ad34-7b5e-4a24-b93b-9ce5e52218ec X-Archives-Hash: 16c361dafc8168cbbb5b96f8fc1a9fa1 commit: 06e2701ad6a511383d000b62f9faa2328800762b Author: Mart Raudsepp gentoo org> AuthorDate: Sun Sep 8 16:49:41 2019 +0000 Commit: Mart Raudsepp gentoo org> CommitDate: Sun Sep 8 16:51:12 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06e2701a 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 gentoo.org> .../dconf/{dconf-0.32.0.ebuild => dconf-0.32.0-r1.ebuild} | 14 ++++++++++++++ 1 file changed, 14 insertions(+) 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 2175d3f9748..8e9d9a0257d 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 }