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

["Alexandre Restovtsev" <tetromino@gmail.com>]

commit:     8a2ed13c8e2224817a58f3353d5b8a664f52c5b2
Author:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Mon Apr  2 03:25:03 2012 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Mon Apr  2 03:28:54 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=8a2ed13c

gnome-base/dconf: moved to gx86 + simplify valac-0.16 fix

---
 gnome-base/dconf/dconf-0.12.0.ebuild |   76 ----------------------------------
 gnome-base/dconf/dconf-9999.ebuild   |   11 +----
 2 files changed, 3 insertions(+), 84 deletions(-)

diff --git a/gnome-base/dconf/dconf-0.12.0.ebuild b/gnome-base/dconf/dconf-0.12.0.ebuild
deleted file mode 100644
index e58a8bd..0000000
--- a/gnome-base/dconf/dconf-0.12.0.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# 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.6 2012/01/18 20:33:49 maekke Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-
-inherit eutils gnome2 bash-completion-r1
-if [[ ${PV} = 9999 ]]; then
-	inherit gnome2-live
-fi
-
-DESCRIPTION="Simple low-level configuration system"
-HOMEPAGE="http://live.gnome.org/dconf"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="doc +X"
-if [[ ${PV} = 9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-fi
-
-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 )"
-
-if [[ ${PV} = 9999 ]]; then
-	DEPEND="${DEPEND}
-		dev-util/gtk-doc-am
-		>=dev-lang/vala-0.15.1:0.16 )"
-fi
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-schemas-compile
-		VALAC=$(type -p false)
-		$(use_enable X editor)"
-
-	if [[ ${PV} = 9999 ]]; then
-		G2CONF="${G2CONF}
-			VALAC=$(type -p valac-0.16)"
-	fi
-}
-
-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-9999.ebuild b/gnome-base/dconf/dconf-9999.ebuild
index e58a8bd..cfc3ffe 100644
--- a/gnome-base/dconf/dconf-9999.ebuild
+++ b/gnome-base/dconf/dconf-9999.ebuild
@@ -5,7 +5,7 @@
 EAPI="4"
 GCONF_DEBUG="no"
 
-inherit eutils gnome2 bash-completion-r1
+inherit gnome2 bash-completion-r1
 if [[ ${PV} = 9999 ]]; then
 	inherit gnome2-live
 fi
@@ -38,13 +38,8 @@ fi
 pkg_setup() {
 	G2CONF="${G2CONF}
 		--disable-schemas-compile
-		VALAC=$(type -p false)
-		$(use_enable X editor)"
-
-	if [[ ${PV} = 9999 ]]; then
-		G2CONF="${G2CONF}
-			VALAC=$(type -p valac-0.16)"
-	fi
+		$(use_enable X editor)
+		VALAC=$(type -P valac-0.16)" # harmless even if valac-0.16 not found
 }
 
 src_install() {