Version bump for gnome-3.6; dconf-editor finally added search. Update license.

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

4 files changed, 33 insertions, 15 deletions

diff --git a/gnome-base/dconf/ChangeLog b/gnome-base/dconf/ChangeLog
index d61c42380694..3d96e4ff72cc 100644
--- a/gnome-base/dconf/ChangeLog
+++ b/gnome-base/dconf/ChangeLog
@@ -1,6 +1,13 @@
 # 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.33 2012/05/01 19:39:01 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/dconf/ChangeLog,v 1.34 2012/09/27 22:59:19 tetromino Exp $
+
+*dconf-0.14.0 (27 Sep 2012)
+
+  27 Sep 2012; Alexandre Rostovtsev <tetromino@gentoo.org> dconf-0.10.0.ebuild,
+  -dconf-0.12.0.ebuild, dconf-0.12.1.ebuild, +dconf-0.14.0.ebuild:
+  Version bump for gnome-3.6; dconf-editor finally added search. Update
+  license.
 
 *dconf-0.12.1 (01 May 2012)
 
diff --git a/gnome-base/dconf/dconf-0.10.0.ebuild b/gnome-base/dconf/dconf-0.10.0.ebuild
index baaddfecb97c..a45ead860a32 100644
--- a/gnome-base/dconf/dconf-0.10.0.ebuild
+++ b/gnome-base/dconf/dconf-0.10.0.ebuild
@@ -1,6 +1,6 @@
 # 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.10.0.ebuild,v 1.9 2012/03/25 16:14:19 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/dconf/dconf-0.10.0.ebuild,v 1.10 2012/09/27 22:59:19 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -10,7 +10,7 @@ inherit autotools eutils gnome2 bash-completion-r1
 DESCRIPTION="Simple low-level configuration system"
 HOMEPAGE="http://live.gnome.org/dconf"
 
-LICENSE="LGPL-2.1"
+LICENSE="LGPL-2.1+"
 SLOT="0"
 KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sh sparc x86 ~x86-fbsd"
 IUSE="doc vala +X"
@@ -22,6 +22,7 @@ RDEPEND=">=dev-libs/glib-2.29.90:2
 # vala:0.14 due to an automagic version-check #ifdef (commit a15d9621)
 DEPEND="${RDEPEND}
 	dev-util/gtk-doc-am
+	virtual/pkgconfig
 	doc? ( >=dev-util/gtk-doc-1.15 )
 	vala? ( dev-lang/vala:0.14 )"
 # eautoreconf requires gtk-doc-am
diff --git a/gnome-base/dconf/dconf-0.12.1.ebuild b/gnome-base/dconf/dconf-0.12.1.ebuild
index 2b904a457240..77c8dd74938c 100644
--- a/gnome-base/dconf/dconf-0.12.1.ebuild
+++ b/gnome-base/dconf/dconf-0.12.1.ebuild
@@ -1,6 +1,6 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/dconf/dconf-0.12.1.ebuild,v 1.2 2012/09/27 22:59:19 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -10,7 +10,7 @@ inherit gnome2 bash-completion-r1
 DESCRIPTION="Simple low-level configuration system"
 HOMEPAGE="http://live.gnome.org/dconf"
 
-LICENSE="LGPL-2.1"
+LICENSE="LGPL-2.1+"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="doc +X"
@@ -20,6 +20,7 @@ RDEPEND=">=dev-libs/glib-2.31.18:2
 	X? ( >=dev-libs/libxml2-2.7.7:2
 		x11-libs/gtk+:3 )"
 DEPEND="${RDEPEND}
+	virtual/pkgconfig
 	doc? ( >=dev-util/gtk-doc-1.15 )"
 # eautoreconf requires gtk-doc-am
 
diff --git a/gnome-base/dconf/dconf-0.12.0.ebuild b/gnome-base/dconf/dconf-0.14.0.ebuild
index 9a54eb3786cc..23142ae8a3dc 100644
--- a/gnome-base/dconf/dconf-0.12.0.ebuild
+++ b/gnome-base/dconf/dconf-0.14.0.ebuild
@@ -1,33 +1,42 @@
 # 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.0.ebuild,v 1.2 2012/04/02 03:30:49 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/dconf/dconf-0.14.0.ebuild,v 1.1 2012/09/27 22:59:19 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
 
-inherit gnome2 bash-completion-r1
+inherit gnome2 bash-completion-r1 virtualx
 
 DESCRIPTION="Simple low-level configuration system"
 HOMEPAGE="http://live.gnome.org/dconf"
 
-LICENSE="LGPL-2.1"
+LICENSE="LGPL-2.1+"
 SLOT="0"
+# TODO: coverage ?
+IUSE="doc test +X"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="doc +X"
 
-RDEPEND=">=dev-libs/glib-2.31.18:2
+RDEPEND=">=dev-libs/glib-2.33.3:2
 	sys-apps/dbus
 	X? ( >=dev-libs/libxml2-2.7.7:2
 		x11-libs/gtk+:3 )"
 DEPEND="${RDEPEND}
+	dev-libs/libxslt
+	sys-devel/gettext
+	>=dev-util/intltool-0.50
+	virtual/pkgconfig
 	doc? ( >=dev-util/gtk-doc-1.15 )"
-# eautoreconf requires gtk-doc-am
 
 pkg_setup() {
 	G2CONF="${G2CONF}
 		--disable-schemas-compile
+		--disable-gcov
 		$(use_enable X editor)
-		VALAC=$(type -P valac-0.16)" # harmless even if valac-0.16 not found
+		VALAC=$(type -P valac-0.18)" # harmless even if valac-0.18 not found
+}
+
+src_test() {
+	Xemake check
 }
 
 src_install() {
@@ -40,9 +49,9 @@ src_install() {
 	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}
+	# Install bash-completion file properly to the system
+	rm -rv "${ED}usr/share/bash-completion" || die
+	dobashcomp "${S}/bin/completion/dconf"
 }
 
 pkg_postinst() {