Drop useless support for vala code regeneration.

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

3 files changed, 10 insertions, 52 deletions

diff --git a/gnome-base/dconf/ChangeLog b/gnome-base/dconf/ChangeLog
index b09aa845a713..02f5e1e1ba4b 100644
--- a/gnome-base/dconf/ChangeLog
+++ b/gnome-base/dconf/ChangeLog
@@ -1,6 +1,10 @@
 # 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.31 2012/03/28 01:02:47 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/dconf/ChangeLog,v 1.32 2012/04/02 03:30:49 tetromino Exp $
+
+  02 Apr 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -files/dconf-0.11.5-automagic-vala.patch, dconf-0.12.0.ebuild:
+  Drop useless support for vala code regeneration.
 
 *dconf-0.12.0 (28 Mar 2012)
 
diff --git a/gnome-base/dconf/dconf-0.12.0.ebuild b/gnome-base/dconf/dconf-0.12.0.ebuild
index d7c2efc601a3..9a54eb3786cc 100644
--- a/gnome-base/dconf/dconf-0.12.0.ebuild
+++ b/gnome-base/dconf/dconf-0.12.0.ebuild
@@ -1,11 +1,11 @@
 # 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.1 2012/03/28 01:02:47 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/dconf/dconf-0.12.0.ebuild,v 1.2 2012/04/02 03:30:49 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
 
-inherit autotools eutils gnome2 bash-completion-r1
+inherit gnome2 bash-completion-r1
 
 DESCRIPTION="Simple low-level configuration system"
 HOMEPAGE="http://live.gnome.org/dconf"
@@ -13,34 +13,21 @@ 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"
 
 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 )"
+	doc? ( >=dev-util/gtk-doc-1.15 )"
 # eautoreconf requires gtk-doc-am
 
 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"
-
-	mkdir -p m4 || die
-	eautoreconf
-
-	gnome2_src_prepare
+		VALAC=$(type -P valac-0.16)" # harmless even if valac-0.16 not found
 }
 
 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 cda55cb5e863..000000000000
--- 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
-