3 files changed, 66 insertions, 65 deletions
diff --git a/gnome-base/dconf/ChangeLog b/gnome-base/dconf/ChangeLog
index 02f5e1e1ba4b..d61c42380694 100644
--- a/gnome-base/dconf/ChangeLog
+++ b/gnome-base/dconf/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-base/dconf
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/dconf/ChangeLog,v 1.32 2012/04/02 03:30:49 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/dconf/ChangeLog,v 1.33 2012/05/01 19:39:01 pacho Exp $
+
+*dconf-0.12.1 (01 May 2012)
+
+  01 May 2012; Pacho Ramos <pacho@gentoo.org> +dconf-0.12.1.ebuild,
+  -dconf-0.8.0.ebuild:
+  Version bump, remove old.
 
   02 Apr 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
   -files/dconf-0.11.5-automagic-vala.patch, dconf-0.12.0.ebuild:
diff --git a/gnome-base/dconf/dconf-0.12.1.ebuild b/gnome-base/dconf/dconf-0.12.1.ebuild
new file mode 100644
index 000000000000..2b904a457240
--- /dev/null
+++ b/gnome-base/dconf/dconf-0.12.1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/dconf/dconf-0.12.1.ebuild,v 1.1 2012/05/01 19:39:01 pacho Exp $
+
+EAPI="4"
+GCONF_DEBUG="no"
+
+inherit 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 ~x86-fbsd"
+IUSE="doc +X"
+
+RDEPEND=">=dev-libs/glib-2.31.18:2
+	sys-apps/dbus
+	X? ( >=dev-libs/libxml2-2.7.7:2
+		x11-libs/gtk+:3 )"
+DEPEND="${RDEPEND}
+	doc? ( >=dev-util/gtk-doc-1.15 )"
+# eautoreconf requires gtk-doc-am
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		--disable-schemas-compile
+		$(use_enable X editor)
+		VALAC=$(type -P valac-0.16)" # harmless even if valac-0.16 not found
+}
+
+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
+}
diff --git a/gnome-base/dconf/dconf-0.8.0.ebuild b/gnome-base/dconf/dconf-0.8.0.ebuild
deleted file mode 100644
index 9d4ca94b29b6..000000000000
--- a/gnome-base/dconf/dconf-0.8.0.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# 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.8.0.ebuild,v 1.9 2011/11/16 17:10:54 darkside Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-
-inherit autotools eutils gnome2 bash-completion
-
-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 ~amd64-linux ~x86-linux"
-IUSE="doc vala +X"
-
-RDEPEND=">=dev-libs/glib-2.27.3:2
-	sys-apps/dbus
-	X? ( >=dev-libs/libxml2-2.7.7
-		x11-libs/gtk+:3 )"
-DEPEND="${RDEPEND}
-	dev-util/gtk-doc-am
-	doc? ( >=dev-util/gtk-doc-1.15 )
-	vala? ( >=dev-lang/vala-0.11.7:0.12 )"
-# eautoreconf requires gtk-doc-am
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		$(use_enable vala)
-		$(use_enable X editor)
-		VALAC=$(type -p valac-0.12)"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Fix vala automagic support, upstream bug #634171
-	epatch "${FILESDIR}/${PN}-0.8.0-automagic-vala.patch"
-
-	mkdir -p m4 || die
-	eautoreconf
-}
-
-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
-}