Bump to 0.10.0 from the overlay. Update to bash-completion-r1 and kill existing dconf-service processes in pkg_postinst following upstream recommendation.

(Portage version: 2.2.0_alpha71/cvs/Linux x86_64)

2 files changed, 82 insertions, 1 deletions

diff --git a/gnome-base/dconf/ChangeLog b/gnome-base/dconf/ChangeLog
index 6e739c00bd21..37adfb262f52 100644
--- a/gnome-base/dconf/ChangeLog
+++ b/gnome-base/dconf/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for gnome-base/dconf
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/dconf/ChangeLog,v 1.19 2011/10/28 19:56:20 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/dconf/ChangeLog,v 1.20 2011/10/29 00:49:04 tetromino Exp $
+
+*dconf-0.10.0 (29 Oct 2011)
+
+  29 Oct 2011; Alexandre Rostovtsev <tetromino@gentoo.org>
+  +dconf-0.10.0.ebuild:
+  Bump to 0.10.0 from the overlay. Update to bash-completion-r1 and kill
+  existing dconf-service processes in pkg_postinst following upstream
+  recommendation.
+  Notable changes: support for maybe types, dconf-editor and commandline tool
+  improvements.
 
   28 Oct 2011; Markus Meier <maekke@gentoo.org> dconf-0.8.0.ebuild:
   arm stable, bug #385699
diff --git a/gnome-base/dconf/dconf-0.10.0.ebuild b/gnome-base/dconf/dconf-0.10.0.ebuild
new file mode 100644
index 000000000000..693cca0f0c08
--- /dev/null
+++ b/gnome-base/dconf/dconf-0.10.0.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/dconf/dconf-0.10.0.ebuild,v 1.1 2011/10/29 00:49:04 tetromino Exp $
+
+EAPI="4"
+GCONF_DEBUG="no"
+
+inherit autotools eutils gnome2 bash-completion-r1
+
+DESCRIPTION="Simple low-level configuration system"
+HOMEPAGE="http://live.gnome.org/dconf"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
+IUSE="doc vala +X"
+
+RDEPEND=">=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="${RDEPEND}
+	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() {
+	# Fix vala automagic support, upstream bug #634171
+	epatch "${FILESDIR}/${PN}-0.8.0-automagic-vala.patch"
+
+	mkdir -p m4 || die
+	eautoreconf
+
+	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
+	newbashcomp "${S}/bin/dconf-bash-completion.sh" ${PN}
+}
+
+pkg_postinst() {
+	gnome2_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
+}