Version bump, remove old.

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

5 files changed, 96 insertions, 50 deletions

diff --git a/gnome-base/dconf/ChangeLog b/gnome-base/dconf/ChangeLog
index 8991cac86386..f563211a68f2 100644
--- a/gnome-base/dconf/ChangeLog
+++ b/gnome-base/dconf/ChangeLog
@@ -1,6 +1,12 @@
 # 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.10 2011/07/17 20:52:22 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/dconf/ChangeLog,v 1.11 2011/07/27 16:53:11 pacho Exp $
+
+*dconf-0.8.0 (27 Jul 2011)
+
+  27 Jul 2011; Pacho Ramos <pacho@gentoo.org> -dconf-0.5.1-r1.ebuild,
+  +dconf-0.8.0.ebuild, +files/dconf-0.8.0-automagic-vala.patch:
+  Version bump, remove old.
 
   17 Jul 2011; Markus Meier <maekke@gentoo.org> dconf-0.5.1-r2.ebuild:
   arm stable, bug #369909
diff --git a/gnome-base/dconf/Manifest b/gnome-base/dconf/Manifest
index 6e468c6f4633..ba551d5bd24b 100644
--- a/gnome-base/dconf/Manifest
+++ b/gnome-base/dconf/Manifest
@@ -2,16 +2,18 @@
 Hash: SHA1
 
 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.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.5.1-r1.ebuild 1155 RMD160 8528727bbfe2adabdcb0f7533da34cd556f67901 SHA1 5949594fad7c79c44ea267e4446a80594ac54d41 SHA256 28f0440e3194e78c7396ded0669674ede84282a12c2bb2e860c3166fa1817046
 EBUILD dconf-0.5.1-r2.ebuild 1343 RMD160 30141678fb8cc2772fe5164ee164a189fa6bf90a SHA1 7f1932bdd9e7cae03f44950dee7a98dad3d40341 SHA256 b81b11cce9afddbd0a7c1c0f08e68998de07dd1a15c4847193559cdc4cf7f395
-MISC ChangeLog 1653 RMD160 49def97e1414d86fc18a4e7ec9417ffd0276ac40 SHA1 a955ba11f5f88b57c9146c994d7061cd229b0bf6 SHA256 a537148ce2998b3193700388873cae0929de2a546614aedc70bcc99b3b1dea0f
+EBUILD dconf-0.8.0.ebuild 1621 RMD160 9be51ff507b7ddc38ccd4e6f80beb004bce50d06 SHA1 c1b5fb246230668d4d106ea57f605a28eadca0f1 SHA256 8d9c363d6da054d2806b96347df426c85b686beb8b29e5bf74aa999a1733d9ac
+MISC ChangeLog 1843 RMD160 24e0b80b10c18bfc253df1ea0d5d6e769dd7fae4 SHA1 6f562efee55ea3d506efc7a248d66a351303e928 SHA256 c621eb81c49d46e43d8484d92e5449d9b9c803bf4c5660323a72077ca3deb511
 MISC metadata.xml 341 RMD160 df0c0ae4bf46e29f58e30a7f488e63440c546925 SHA1 4d3b43a8591fad55039f035ad0a212199df30ba0 SHA256 bbef81a438e4fbde33b5c22062c0bba33aa21143dca5a59725f3998350227a93
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk4jS6sACgkQkKaRLQcq0GJRlQCfSPEsS1o+8CWaFRVX0dyBBBJE
-QuYAn1XHqNxgo2k05bP/AAXRHgaeNRez
-=cn53
+iEYEARECAAYFAk4wQn0ACgkQCaWpQKGI+9RU+wCfWUOM4T0Hl0NzwpbyiVz4Dj4f
+8swAnA8/9QmOHqOacQclE6v8plkptGdC
+=UZI6
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/dconf/dconf-0.5.1-r1.ebuild b/gnome-base/dconf/dconf-0.5.1-r1.ebuild
deleted file mode 100644
index 6b5cc0910b7f..000000000000
--- a/gnome-base/dconf/dconf-0.5.1-r1.ebuild
+++ /dev/null
@@ -1,44 +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.5.1-r1.ebuild,v 1.5 2011/02/06 11:50:50 armin76 Exp $
-
-EAPI=3
-GCONF_DEBUG="no"
-
-inherit autotools eutils gnome2
-
-DESCRIPTION="Simple low-level configuration system"
-HOMEPAGE="http://live.gnome.org/dconf"
-SRC_URI="${SRC_URI} mirror://gentoo/introspection.m4.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
-IUSE="doc +introspection vala"
-
-RDEPEND=">=dev-libs/glib-2.25.16
-	>=dev-libs/libgee-0.5.1
-	>=dev-libs/libxml2-2.7.7
-	x11-libs/gtk+:2
-	introspection? ( >=dev-libs/gobject-introspection-0.9.3 )
-	vala? ( >=dev-lang/vala-0.9.5:0.10 )"
-DEPEND="${RDEPEND}
-	doc? ( >=dev-util/gtk-doc-1.15 )"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		$(use_enable introspection)
-		$(use_enable vala)
-		VALAC=$(type -p valac-0.10)"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Fix vala automagic support, upstream bug #634171
-	epatch "${FILESDIR}/${P}-automagic-vala.patch"
-
-	mv "${WORKDIR}"/introspection.m4 . || die
-	mkdir -p m4 || die
-	AT_M4DIR="." eautoreconf
-}
diff --git a/gnome-base/dconf/dconf-0.8.0.ebuild b/gnome-base/dconf/dconf-0.8.0.ebuild
new file mode 100644
index 000000000000..4ad9b3212c70
--- /dev/null
+++ b/gnome-base/dconf/dconf-0.8.0.ebuild
@@ -0,0 +1,63 @@
+# 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.1 2011/07/27 16:53:11 pacho 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"
+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}
+	doc? ( >=dev-util/gtk-doc-1.15 )
+	vala? ( >=dev-lang/vala-0.11.7:0.12 )"
+
+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
+	AT_M4DIR="." eautoreconf
+	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
+}
diff --git a/gnome-base/dconf/files/dconf-0.8.0-automagic-vala.patch b/gnome-base/dconf/files/dconf-0.8.0-automagic-vala.patch
new file mode 100644
index 000000000000..9f680a05c499
--- /dev/null
+++ b/gnome-base/dconf/files/dconf-0.8.0-automagic-vala.patch
@@ -0,0 +1,19 @@
+--- 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
+ AC_PROG_CC
+-AM_PROG_VALAC([0.11.7])
++
++AC_ARG_ENABLE(vala,
++		AC_HELP_STRING([--disable-vala],
++				[Disable vala support]))
++AM_CONDITIONAL(ENABLE_VALA, test "x$enable_vala" != "xno")
++
++if test "x$enable_vala" != "xno"; then
++	AM_PROG_VALAC([0.11.7])
++fi
+ 
+ # Use GSettings
+ GLIB_GSETTINGS