Gentoo Archives: gentoo-commits

From: Nirbheek Chauhan <nirbheek@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/gnome:master commit in: gnome-base/dconf/
Date: Fri, 29 Apr 2011 19:12:18
Message-Id: 8140c6dfa5791910a318f02d5ff190be8b4f689d.nirbheek@gentoo
1 commit: 8140c6dfa5791910a318f02d5ff190be8b4f689d
2 Author: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
3 AuthorDate: Fri Apr 29 19:10:46 2011 +0000
4 Commit: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
5 CommitDate: Fri Apr 29 19:10:46 2011 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=8140c6df
7
8 gnome-base/dconf: add CONFIG_PROTECT_MASK for /etc/dconf
9
10 ---
11 .../{dconf-0.7.3.ebuild => dconf-0.7.3-r1.ebuild} | 3 ++-
12 gnome-base/dconf/dconf-9999.ebuild | 3 ++-
13 2 files changed, 4 insertions(+), 2 deletions(-)
14
15 diff --git a/gnome-base/dconf/dconf-0.7.3.ebuild b/gnome-base/dconf/dconf-0.7.3-r1.ebuild
16 similarity index 93%
17 rename from gnome-base/dconf/dconf-0.7.3.ebuild
18 rename to gnome-base/dconf/dconf-0.7.3-r1.ebuild
19 index 31a22b6..4e865c3 100644
20 --- a/gnome-base/dconf/dconf-0.7.3.ebuild
21 +++ b/gnome-base/dconf/dconf-0.7.3-r1.ebuild
22 @@ -56,9 +56,10 @@ src_prepare() {
23 src_install() {
24 gnome2_src_install
25
26 - # GSettings backend may be one of: memory, gconf, dcon
27 + # GSettings backend may be one of: memory, gconf, dconf
28 # Only dconf is really considered functional by upstream
29 # must have it enabled over gconf if both are installed
30 + echo 'CONFIG_PROTECT_MASK="/etc/dconf"' >> 51dconf
31 echo 'GSETTINGS_BACKEND="dconf"' >> 51dconf
32 doenvd 51dconf || die "doenvd failed"
33 }
34
35 diff --git a/gnome-base/dconf/dconf-9999.ebuild b/gnome-base/dconf/dconf-9999.ebuild
36 index 31a22b6..4e865c3 100644
37 --- a/gnome-base/dconf/dconf-9999.ebuild
38 +++ b/gnome-base/dconf/dconf-9999.ebuild
39 @@ -56,9 +56,10 @@ src_prepare() {
40 src_install() {
41 gnome2_src_install
42
43 - # GSettings backend may be one of: memory, gconf, dcon
44 + # GSettings backend may be one of: memory, gconf, dconf
45 # Only dconf is really considered functional by upstream
46 # must have it enabled over gconf if both are installed
47 + echo 'CONFIG_PROTECT_MASK="/etc/dconf"' >> 51dconf
48 echo 'GSETTINGS_BACKEND="dconf"' >> 51dconf
49 doenvd 51dconf || die "doenvd failed"
50 }