3 files changed, 90 insertions, 7 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/Manifest b/gnome-base/dconf/Manifest
index 94d693e1b7ea..4dc715761917 100644
--- a/gnome-base/dconf/Manifest
+++ b/gnome-base/dconf/Manifest
@@ -1,19 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX dconf-0.5.1-automagic-vala.patch 467 RMD160 037cb0f3525c0cb609bcd4f994d71a786050cc34 SHA1 943a487f12e9c561495d9b706364eaf257324021 SHA256 4b6a7a82ace37a53add28c487d40c2ee6578e2f5ec29bfd1ea5ed8ff6097e6a4
 AUX dconf-0.8.0-automagic-vala.patch 447 RMD160 45148e5b71a40df1ee6fed6cc0589043e52b277b SHA1 a89b5f4078167d66d1995e49b58f880c3de0bc17 SHA256 bc69097fcac2c3aaf45d4d0d0d4ae0930f575d163cfb8279fdc0881a96990c92
+DIST dconf-0.10.0.tar.xz 172752 RMD160 94e9b5518a55c3523b24977b0de2d5cd41501576 SHA1 89f4ed93d7e9a8763f95793832999a3a4f157b6d SHA256 9f744ccfb3da20163a4bb27916c960f6bf56048b3ec1112862c85414fc064ee2
 DIST dconf-0.5.1.tar.bz2 251287 RMD160 ebc02b010a44d78ac48dc1c4426cc723430b3016 SHA1 4e1dab1f744aad0bff1896ac6f288ad6a9dfece8 SHA256 0083d70e1b5e540d8d4b3f04fa5d17dff4c574136682fe3bdd9b5ecc196ec4f6
 DIST dconf-0.8.0.tar.xz 167500 RMD160 7d33d1769b3dc3359cdd4d32e7c8d68b71ce8804 SHA1 ca1d734ab8324230ad9881e23740274582d755e5 SHA256 05111e973c365696759dd1b37e3f5acc877eff24dd2e4036d742aac5da5dda3b
 DIST introspection.m4.bz2 1181 RMD160 3648afa820c2ee7e240083076e1452285d043084 SHA1 e5188cc387d0d17feb77684feff7ff163779912f SHA256 69a2a57b12179159420825d1d44c74108014b0864c4d63500265639cfa9151ae
+EBUILD dconf-0.10.0.ebuild 1950 RMD160 04272801b8653d3c680dbb37cf5ec180ed5d9798 SHA1 babeb2fd1286f5e21bea57b56f3b63a19e92b571 SHA256 d22a149c35597ba4a2c8bb8087603b16b7972e42c1c55f36de8ef5225d532850
 EBUILD dconf-0.5.1-r2.ebuild 1343 RMD160 14a1c19027bd6ec046b5a82f7b0cd6e58366c692 SHA1 6c9e5a7cde1697f9069441ce3e246298b2025a74 SHA256 6186f25bdaa4b82bca408b00f1cf4bccc43af7e75d1ff466ba639af2ec351cc9
 EBUILD dconf-0.8.0.ebuild 1591 RMD160 378c5fbd192432d2dec63d4df4e12609566cd996 SHA1 157b547046513430688f0047a0d5f9105b47dd23 SHA256 212a12f3fc0237dffee40c1a76026d8ff0760fb61cd88a9c6e304bd7bdd3b3c4
-MISC ChangeLog 2803 RMD160 daddf6cb69e471f82611aea09dc97b94b993a907 SHA1 3b735fd5039149f95de94206cfba66fb68618976 SHA256 6b58f6adb72571bee578b1e516627a496e596127d5f3f2cab8c058770fea5ca5
+MISC ChangeLog 3174 RMD160 be41da7af4661a2481c6e04c12d0445824243fcb SHA1 bf09351254cfc2940a51d9110a69de9e0d610f54 SHA256 accea0663a512342aeb63c29dc27d45aaf150f0400b222475ed788499ab2e809
 MISC metadata.xml 341 RMD160 df0c0ae4bf46e29f58e30a7f488e63440c546925 SHA1 4d3b43a8591fad55039f035ad0a212199df30ba0 SHA256 bbef81a438e4fbde33b5c22062c0bba33aa21143dca5a59725f3998350227a93
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk6rCTEACgkQkKaRLQcq0GJraQCaAnCfOEbO123fuJw2RTzUQ3ab
-/1sAn0oSZn9yeLG1ZESD6jEDoOCWzmtE
-=RD4C
+iF4EAREIAAYFAk6rTYYACgkQdjK8w9WeBnCuUQD+LLyRRS+Tvm0ZGC2gMq7VlsbJ
+6WH2/lo1pfZbYx+7vBIA/j98MNwrXSg8IvA9J32POyerr/PN0MoFefFrhZgs7D9z
+=6esG
 -----END PGP SIGNATURE-----
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
+}