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

4 files changed, 39 insertions, 81 deletions

diff --git a/gnome-base/dconf/Manifest b/gnome-base/dconf/Manifest
index ddbcb91c..f9b4079b 100644
--- a/gnome-base/dconf/Manifest
+++ b/gnome-base/dconf/Manifest
@@ -1,4 +1,3 @@
-AUX dconf-0.11.5-automagic-vala.patch 818 RMD160 821830de29202bff95142c345cd680a26bf22fa5 SHA1 7b0620ba0075d36b724ef7d787d6161e02e324c0 SHA256 3f1f97118cb5eafd6ccd301c9d28cc92a9fcde65126490042c26c0c622cfad90
-DIST dconf-0.11.7.tar.xz 201792 RMD160 6f7b9c6f9dc39821ea1680735a19a1e7b89dbb12 SHA1 1901ce09f5c6cb4de3daae1d858bc69a20e9f154 SHA256 ea0edb75157d8976c9256ee0d82faa37bf146c4d85c4c29ef0f8bcfbcdb35641
-EBUILD dconf-0.11.7.ebuild 1950 RMD160 2162155af3ef27651e539203e333b6183d0da3f6 SHA1 15de9265d8f1454874aeffd7722c3cb38fe21220 SHA256 b053068d286a53595aba7467bd718cdc1d3c2d5fbe81c9d83901cf95282ad383
-EBUILD dconf-9999.ebuild 2397 RMD160 4fb5ef0edf643cccdd9d8e9d0224383ef1fc9a6e SHA1 cfa00fdaea52aa0e75ffc3c759a62e615df45201 SHA256 a240d0bfa3a9892a61a029eb3357e0f9f6d25afabfe2a4f2592918e0c3b60944
+DIST dconf-0.12.0.tar.xz 201540 RMD160 690dc052185ccb44508a8d82722eee2aca06d1d4 SHA1 56739a206084d3ad195392247a03e55fa3f4ff2d SHA256 9c020e2ff0adb19ff9bc3d73ce15388fb42c52b12ed751bdb59ce53a660461af
+EBUILD dconf-0.12.0.ebuild 1927 RMD160 608a2ba9757eb0a5161c69ecb977578575d528fe SHA1 d5640f73bc1cd67bf17693d4043946d3dc0f62b6 SHA256 1ada7516052795b77fc61835595e9cc2fc63749134458ae97fdd2ef8b5fabb8c
+EBUILD dconf-9999.ebuild 1927 RMD160 608a2ba9757eb0a5161c69ecb977578575d528fe SHA1 d5640f73bc1cd67bf17693d4043946d3dc0f62b6 SHA256 1ada7516052795b77fc61835595e9cc2fc63749134458ae97fdd2ef8b5fabb8c
diff --git a/gnome-base/dconf/dconf-0.11.7.ebuild b/gnome-base/dconf/dconf-0.12.0.ebuild
index 313c2d56..e58a8bd4 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 8b7f9a47..e58a8bd4 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 cda55cb5..00000000
--- 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
-