[gentoo-commits] proj/gnome:master commit in: gnome-base/dconf/

["Gilles Dartiguelongue" <eva@gentoo.org>]

commit:     21702d2e4f838a7393aa091558cf1a0678ed9eb2
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Fri Apr  8 08:15:42 2011 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Fri Apr  8 10:51:45 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=21702d2e

gnome-base/dconf: QAed

	* Moved gtk editor dependencies behind X use flag.
	* Split phases properly
	* Add slot notation for glib
	* Install env file for GSettings

(Portage version: 2.2.0_alpha29/git/Linux x86_64, RepoMan options: --force, signed Manifest commit with key C6085806)

---
 gnome-base/dconf/dconf-0.7.3.ebuild |   31 ++++++++++++++++++++-----------
 gnome-base/dconf/dconf-9999.ebuild  |   31 ++++++++++++++++++++-----------
 2 files changed, 40 insertions(+), 22 deletions(-)

diff --git a/gnome-base/dconf/dconf-0.7.3.ebuild b/gnome-base/dconf/dconf-0.7.3.ebuild
index 460ca3e..bd594f7 100644
--- a/gnome-base/dconf/dconf-0.7.3.ebuild
+++ b/gnome-base/dconf/dconf-0.7.3.ebuild
@@ -12,8 +12,7 @@ HOMEPAGE="http://live.gnome.org/dconf"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-#IUSE="doc vala"
-IUSE="doc"
+IUSE="doc +X"
 if [[ ${PV} = 9999 ]]; then
 	inherit gnome2-live
 	KEYWORDS=""
@@ -21,23 +20,23 @@ else
 	KEYWORDS="~amd64 ~arm ~sparc ~x86"
 fi
 
-COMMON_DEPEND=">=dev-libs/glib-2.27.2
-	>=dev-libs/libgee-0.5.1
-	>=dev-libs/libxml2-2.7.7
+COMMON_DEPEND=">=dev-libs/glib-2.27.2:2
 	sys-apps/dbus
-	x11-libs/gtk+:3"
+	X? (
+		>=dev-libs/libxml2-2.7.7:2
+		x11-libs/gtk+:3 )"
 DEPEND="${COMMON_DEPEND}
 	>=dev-lang/vala-0.11.7:0.12
 	doc? ( >=dev-util/gtk-doc-1.15 )"
-#vala? ( >=dev-lang/vala-0.9.5:0.10 )
-RDEPEND="${COMMON_DEPEND}
-	!dev-lang/vala:0"
 
-src_prepare() {
+pkg_setup() {
 	G2CONF="${G2CONF}
-		VALAC=$(type -p valac-0.12)"
+		VALAC=$(type -p valac-0.12)
+		$(use_enable X editor)"
 		#$(use_enable vala)
+}
 
+src_prepare() {
 	if [[ ${PV} = 9999 ]]; then
 		# XXX: gtk-doc.make should be in top_srcdir -- file a bug for this
 		# Let's only do this in the live version to avoid gtkdocize in releases
@@ -51,3 +50,13 @@ src_prepare() {
 
 	gnome2_src_prepare
 }
+
+src_install() {
+	gnome2_src_install
+
+	# GSettings backend may be one of: memory, gconf, dcon
+	# Only dconf is really considered functional by upstream
+	# must have it enabled over gconf if both are installed
+	echo 'GSETTINGS_BACKEND="dconf"' >> 51dconf
+	doenvd 51dconf || die "doenvd failed"
+}

diff --git a/gnome-base/dconf/dconf-9999.ebuild b/gnome-base/dconf/dconf-9999.ebuild
index a2b564b..fe3ca24 100644
--- a/gnome-base/dconf/dconf-9999.ebuild
+++ b/gnome-base/dconf/dconf-9999.ebuild
@@ -12,8 +12,7 @@ HOMEPAGE="http://live.gnome.org/dconf"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-#IUSE="doc vala"
-IUSE="doc"
+IUSE="doc +X"
 if [[ ${PV} = 9999 ]]; then
 	inherit gnome2-live
 	KEYWORDS=""
@@ -21,23 +20,23 @@ else
 	KEYWORDS="~amd64 ~arm ~sparc ~x86"
 fi
 
-COMMON_DEPEND=">=dev-libs/glib-2.27.2
-	>=dev-libs/libgee-0.5.1
-	>=dev-libs/libxml2-2.7.7
+COMMON_DEPEND=">=dev-libs/glib-2.27.2:2
 	sys-apps/dbus
-	x11-libs/gtk+:3"
+	X? (
+		>=dev-libs/libxml2-2.7.7:2
+		x11-libs/gtk+:3 )"
 DEPEND="${COMMON_DEPEND}
 	>=dev-lang/vala-0.11.7:0.12
 	doc? ( >=dev-util/gtk-doc-1.15 )"
-RDEPEND="${COMMON_DEPEND}
-	!dev-lang/vala:0"
-#vala? ( >=dev-lang/vala-0.9.5:0.10 )
 
-src_prepare() {
+pkg_setup() {
 	G2CONF="${G2CONF}
-		VALAC=$(type -p valac-0.12)"
+		VALAC=$(type -p valac-0.12)
+		$(use_enable X editor)"
 		#$(use_enable vala)
+}
 
+src_prepare() {
 	if [[ ${PV} = 9999 ]]; then
 		# XXX: gtk-doc.make should be in top_srcdir -- file a bug for this
 		# Let's only do this in the live version to avoid gtkdocize in releases
@@ -51,3 +50,13 @@ src_prepare() {
 
 	gnome2_src_prepare
 }
+
+src_install() {
+	gnome2_src_install
+
+	# GSettings backend may be one of: memory, gconf, dcon
+	# Only dconf is really considered functional by upstream
+	# must have it enabled over gconf if both are installed
+	echo 'GSETTINGS_BACKEND="dconf"' >> 51dconf
+	doenvd 51gsettings-dconf || die "doenvd failed"
+}