Version bump, remove old.

Package-Manager: portage-2.1.10.57/cvs/Linux x86_64

4 files changed, 74 insertions, 73 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/Manifest b/gnome-base/dconf/Manifest
index 47d8ac9bed77..51de4153aacb 100644
--- a/gnome-base/dconf/Manifest
+++ b/gnome-base/dconf/Manifest
@@ -1,19 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 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.12.0.tar.xz 201540 RMD160 690dc052185ccb44508a8d82722eee2aca06d1d4 SHA1 56739a206084d3ad195392247a03e55fa3f4ff2d SHA256 9c020e2ff0adb19ff9bc3d73ce15388fb42c52b12ed751bdb59ce53a660461af
-DIST dconf-0.8.0.tar.xz 167500 RMD160 7d33d1769b3dc3359cdd4d32e7c8d68b71ce8804 SHA1 ca1d734ab8324230ad9881e23740274582d755e5 SHA256 05111e973c365696759dd1b37e3f5acc877eff24dd2e4036d742aac5da5dda3b
+DIST dconf-0.12.1.tar.xz 202112 RMD160 e9b0a54230e76e68470958d1ea115d9f3b99cda7 SHA1 1bdbf53b2e699fe58f69fa7a42164351e8560e05 SHA256 3cd32b78d88ed7be90dace5d45e2cf8a6abdb253d43dbfa5ef52103b329dc214
 EBUILD dconf-0.10.0.ebuild 2004 RMD160 cbfd11f8f4dd57182c64f6964208da407cf6ac02 SHA1 091e2808be516bf10ff994cd760fb5c2d3122e1f SHA256 08bbd51a225013b4ee7ef9e5d24f958af0e8f227e4543b2ab69b79272b443b8c
 EBUILD dconf-0.12.0.ebuild 1708 RMD160 27fbb8522a00c65854d2ed5a78b9755cd933ccd4 SHA1 f8af7c15ead5307ceb1f2d071d91ee76d7975c4a SHA256 68df92c5126cd42de81e5ec181b6926b548ba24e2cd6286d7c8997edbaef5932
-EBUILD dconf-0.8.0.ebuild 1668 RMD160 20d36efe433e504a34906ff229008c784307034c SHA1 7a091a36ebe84889417d648ded9ac422680cb19e SHA256 4998fa190dacacd626854f10827ca455305f3a881e03b6f95784cb75f91b9c26
-MISC ChangeLog 4849 RMD160 a2e002f92697ab960200347312e920c9e768eaed SHA1 e652facd5c70ee82db17bfef3f006a9b506c90d4 SHA256 b8f0ca7635c651adb8d168c8b26d237e33578446681889e1f0735338f96e74af
+EBUILD dconf-0.12.1.ebuild 1704 RMD160 54e23a776bd1deda4aa71b2cda9fea6bb250ef51 SHA1 585a22a412cea76bd9608053d90f28f10e7c093b SHA256 d15aadc85befb2cd0ef276c676d9d8ffb79abf871b6f2a5d3337e7061d0260d5
+MISC ChangeLog 4994 RMD160 9d4fe52904f81792afca4c72ebdcebd1da9ffc76 SHA1 28c2c87d2c36ecb95b9a45fb62aef65638af975b SHA256 16f918c569c7a6ba5cefdfd8c0bc258b67a07e318b6c8cee9fe8a2a13af03658
 MISC metadata.xml 238 RMD160 3848b75a2e5e71c7cd896d67de1a75dd848e24fb SHA1 b0e3699538cee2e4a3c41220df592b384bcb14de SHA256 8daa00a1369395a38e520196a3c008f19cfa1a545c81b7347ff97c2bbd9f0c10
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk95HXwACgkQdjK8w9WeBnAC6gEAo4T5tWydJ3WUq1bdl84co/1Z
-zhTBPhaw33APKiRcX60BAK2K1HVrF85E55OJSR8nohe8XSkTOd51nUtr4HkfZNiM
-=6uW+
+iEYEARECAAYFAk+gO9sACgkQCaWpQKGI+9RyggCgg4rn+8VOmNMXqtWH0mm31Kd8
+5MgAnAuTDm5h0r6Wtf5mF8UmEUd6RySA
+=xofl
 -----END PGP SIGNATURE-----
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
-}