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

["Nirbheek Chauhan" <nirbheek@gentoo.org>]

commit:     1b31ea2f0c44345d6a9e257cfb9afabf711ed21a
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 30 18:59:26 2012 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Fri Mar 30 19:01:51 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=1b31ea2f

gnome-base/dconf: bump, and fix vala stuff

---
 .../{dconf-0.11.7.ebuild => dconf-0.12.0.ebuild}   |   42 +++++++++++---------
 gnome-base/dconf/dconf-9999.ebuild                 |   38 ++++++------------
 .../dconf/files/dconf-0.11.5-automagic-vala.patch  |   33 ---------------
 3 files changed, 36 insertions(+), 77 deletions(-)

diff --git a/gnome-base/dconf/dconf-0.11.7.ebuild b/gnome-base/dconf/dconf-0.12.0.ebuild
similarity index 72%
rename from gnome-base/dconf/dconf-0.11.7.ebuild
rename to gnome-base/dconf/dconf-0.12.0.ebuild
index 313c2d5..e58a8bd 100644
--- a/gnome-base/dconf/dconf-0.11.7.ebuild
+++ b/gnome-base/dconf/dconf-0.12.0.ebuild
@@ -5,42 +5,46 @@
 EAPI="4"
 GCONF_DEBUG="no"
 
-inherit autotools eutils gnome2 bash-completion-r1
+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"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="doc vala +X"
+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}
-	dev-util/gtk-doc-am
-	doc? ( >=dev-util/gtk-doc-1.15 )
-	vala? ( >=dev-lang/vala-0.15.1:0.16 )"
-# eautoreconf requires gtk-doc-am
+	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
-		$(use_enable vala)
-		$(use_enable X editor)
-		VALAC=$(type -p valac-0.16)"
-}
-
-src_prepare() {
-	# Fix vala automagic support, upstream bug #634171
-	epatch "${FILESDIR}/${PN}-0.11.5-automagic-vala.patch"
+		VALAC=$(type -p false)
+		$(use_enable X editor)"
 
-	mkdir -p m4 || die
-	eautoreconf
-
-	gnome2_src_prepare
+	if [[ ${PV} = 9999 ]]; then
+		G2CONF="${G2CONF}
+			VALAC=$(type -p valac-0.16)"
+	fi
 }
 
 src_install() {

diff --git a/gnome-base/dconf/dconf-9999.ebuild b/gnome-base/dconf/dconf-9999.ebuild
index 8b7f9a4..e58a8bd 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 autotools eutils gnome2 bash-completion-r1
+inherit eutils gnome2 bash-completion-r1
 if [[ ${PV} = 9999 ]]; then
 	inherit gnome2-live
 fi
@@ -15,48 +15,36 @@ 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
-IUSE="doc vala +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}
-	dev-util/gtk-doc-am
-	doc? ( >=dev-util/gtk-doc-1.15 )
-	vala? ( >=dev-lang/vala-0.15.1:0.16 )"
-# eautoreconf requires gtk-doc-am
+	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
-		$(use_enable vala)
-		$(use_enable X editor)
-		VALAC=$(type -p valac-0.16)"
-}
+		VALAC=$(type -p false)
+		$(use_enable X editor)"
 
-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
-		sed -e 's:^include gtk-doc.make:include $(top_srcdir)/gtk-doc.make:' \
-			-i docs/Makefile.am || die "Fixing gtk-doc.make failed"
+		G2CONF="${G2CONF}
+			VALAC=$(type -p valac-0.16)"
 	fi
-
-	# Fix vala automagic support, upstream bug #634171
-	epatch "${FILESDIR}/${PN}-0.11.5-automagic-vala.patch"
-
-	if [[ ${PV} != 9999 ]]; then
-		mkdir -p m4 || die
-		eautoreconf
-	fi
-
-	gnome2_src_prepare
 }
 
 src_install() {

diff --git a/gnome-base/dconf/files/dconf-0.11.5-automagic-vala.patch b/gnome-base/dconf/files/dconf-0.11.5-automagic-vala.patch
deleted file mode 100644
index cda55cb..0000000
--- a/gnome-base/dconf/files/dconf-0.11.5-automagic-vala.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 09f3a2a4b6d997b5fd9b42add27de465dd529d43 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Sun, 26 Feb 2012 18:15:50 -0500
-Subject: [PATCH] Make vala dependency non-automagic
-
----
- configure.ac |   10 +++++++++-
- 1 files changed, 9 insertions(+), 1 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 2e21d48..40cfe36 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -13,7 +13,15 @@ AM_SILENT_RULES([yes])
- 
- # Check for programs
- AC_PROG_CC
--AM_PROG_VALAC([0.15.1])
-+
-+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.15.1])
-+fi
- 
- # Use GSettings
- GLIB_GSETTINGS
--- 
-1.7.8.4
-