[gentoo-commits] proj/gnome:master commit in: gnome-base/dconf/, gnome-base/dconf/files/

[Alexandre Restovtsev]

commit:     f5e99a16062991fab7dc44324347120e40fc568e
Author:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 29 19:49:00 2011 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Sat Oct 29 19:49:00 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=f5e99a16

gnome-base/dconf: moved 0.10.0 to gx86 + sync with gx86 changes

Sync with the following gx86 changes:
bash-completion migration
new keywords
gtk-doc-am dependency
duplicate eautoreconf
kill running dconf-service processes in pkg_postinst

---
 gnome-base/dconf/dconf-0.10.0.ebuild               |   81 --------------------
 gnome-base/dconf/dconf-9999.ebuild                 |   30 +++++---
 ...vala.patch => dconf-0.8.0-automagic-vala.patch} |    8 +-
 3 files changed, 23 insertions(+), 96 deletions(-)

diff --git a/gnome-base/dconf/dconf-0.10.0.ebuild b/gnome-base/dconf/dconf-0.10.0.ebuild
deleted file mode 100644
index 66809c7..0000000
--- a/gnome-base/dconf/dconf-0.10.0.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-GCONF_DEBUG="no"
-
-inherit autotools eutils gnome2 bash-completion
-if [[ ${PV} = 9999 ]]; then
-	inherit gnome2-live
-fi
-
-DESCRIPTION="Simple low-level configuration system"
-HOMEPAGE="http://live.gnome.org/dconf"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="doc vala +X"
-if [[ ${PV} = 9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64 ~arm ~sparc ~x86"
-fi
-
-COMMON_DEPEND=">=dev-libs/glib-2.29.90:2
-	sys-apps/dbus
-	X? (
-		>=dev-libs/libxml2-2.7.7:2
-		x11-libs/gtk+:3 )"
-# vala:0.14 due to an automagic version-check #ifdef (commit a15d9621)
-DEPEND="${COMMON_DEPEND}
-	doc? ( >=dev-util/gtk-doc-1.15 )
-	vala? ( dev-lang/vala:0.14 )"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-schemas-compile
-		$(use_enable vala)
-		$(use_enable X editor)
-		VALAC=$(type -p valac-0.14)"
-}
-
-src_prepare() {
-	if [[ ${PV} = 9999 ]]; then
-		# XXX: gtk-doc.make should be in top_srcdir -- file a bug for this
-		# Let's only do this in the live version to avoid gtkdocize in releases
-		sed -e 's:^include gtk-doc.make:include $(top_srcdir)/gtk-doc.make:' \
-			-i docs/Makefile.am || die "Fixing gtk-doc.make failed"
-	fi
-
-	# Fix vala automagic support, upstream bug #634171
-	epatch "${FILESDIR}/${PN}-automagic-vala.patch"
-
-	if [[ ${PV} != 9999 ]]; then
-		mkdir -p m4 || die
-		AT_M4DIR="." eautoreconf
-		eautoreconf
-	fi
-	gnome2_src_prepare
-}
-
-src_install() {
-	gnome2_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
-	echo 'CONFIG_PROTECT_MASK="/etc/dconf"' >> 51dconf
-	echo 'GSETTINGS_BACKEND="dconf"' >> 51dconf
-	doenvd 51dconf
-
-	# Remove bash-completion file installed by build system
-	rm -rv "${ED}/etc/bash_completion.d/" || die
-	use bash-completion && \
-		dobashcompletion "${S}/bin/dconf-bash-completion.sh" ${PN}
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	use bash-completion && bash-completion_pkg_postinst
-}

diff --git a/gnome-base/dconf/dconf-9999.ebuild b/gnome-base/dconf/dconf-9999.ebuild
index 66809c7..05945f9 100644
--- a/gnome-base/dconf/dconf-9999.ebuild
+++ b/gnome-base/dconf/dconf-9999.ebuild
@@ -5,7 +5,7 @@
 EAPI="4"
 GCONF_DEBUG="no"
 
-inherit autotools eutils gnome2 bash-completion
+inherit autotools eutils gnome2 bash-completion-r1
 if [[ ${PV} = 9999 ]]; then
 	inherit gnome2-live
 fi
@@ -19,18 +19,19 @@ IUSE="doc vala +X"
 if [[ ${PV} = 9999 ]]; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~arm ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
 fi
 
-COMMON_DEPEND=">=dev-libs/glib-2.29.90:2
+RDEPEND=">=dev-libs/glib-2.29.90:2
 	sys-apps/dbus
-	X? (
-		>=dev-libs/libxml2-2.7.7:2
+	X? ( >=dev-libs/libxml2-2.7.7:2
 		x11-libs/gtk+:3 )"
 # vala:0.14 due to an automagic version-check #ifdef (commit a15d9621)
-DEPEND="${COMMON_DEPEND}
+DEPEND="${RDEPEND}
+	dev-util/gtk-doc-am
 	doc? ( >=dev-util/gtk-doc-1.15 )
 	vala? ( dev-lang/vala:0.14 )"
+# eautoreconf requires gtk-doc-am
 
 pkg_setup() {
 	G2CONF="${G2CONF}
@@ -49,13 +50,13 @@ src_prepare() {
 	fi
 
 	# Fix vala automagic support, upstream bug #634171
-	epatch "${FILESDIR}/${PN}-automagic-vala.patch"
+	epatch "${FILESDIR}/${PN}-0.8.0-automagic-vala.patch"
 
 	if [[ ${PV} != 9999 ]]; then
 		mkdir -p m4 || die
-		AT_M4DIR="." eautoreconf
 		eautoreconf
 	fi
+
 	gnome2_src_prepare
 }
 
@@ -71,11 +72,18 @@ src_install() {
 
 	# Remove bash-completion file installed by build system
 	rm -rv "${ED}/etc/bash_completion.d/" || die
-	use bash-completion && \
-		dobashcompletion "${S}/bin/dconf-bash-completion.sh" ${PN}
+	newbashcomp "${S}/bin/dconf-bash-completion.sh" ${PN}
 }
 
 pkg_postinst() {
 	gnome2_pkg_postinst
-	use bash-completion && bash-completion_pkg_postinst
+	# Kill existing dconf-service processes as recommended by upstream due to
+	# possible changes in the dconf private dbus API.
+	# dconf-service will be dbus-activated on next use.
+	pids=$(pgrep -x dconf-service)
+	if [[ $? == 0 ]]; then
+		ebegin "Stopping dconf-service; it will automatically restart on demand"
+		kill ${pids}
+		eend $?
+	fi
 }

diff --git a/gnome-base/dconf/files/dconf-automagic-vala.patch b/gnome-base/dconf/files/dconf-0.8.0-automagic-vala.patch
similarity index 67%
rename from gnome-base/dconf/files/dconf-automagic-vala.patch
rename to gnome-base/dconf/files/dconf-0.8.0-automagic-vala.patch
index 11e1616..9f680a0 100644
--- a/gnome-base/dconf/files/dconf-automagic-vala.patch
+++ b/gnome-base/dconf/files/dconf-0.8.0-automagic-vala.patch
@@ -1,5 +1,5 @@
---- configure.ac
-+++ configure.ac
+--- configure.ac.orig	2010-11-06 16:24:36.000000000 +0100
++++ configure.ac	2010-11-06 16:24:19.000000000 +0100
 @@ -12,7 +12,15 @@
  
  # Check for programs
@@ -15,5 +15,5 @@
 +	AM_PROG_VALAC([0.11.7])
 +fi
  
- # Gtk-doc support
- GTK_DOC_CHECK([1.15])
+ # Use GSettings
+ GLIB_GSETTINGS