Fix vala automagic support, upstream bug #634171

Package-Manager: portage-2.1.9.24/cvs/Linux x86_64

6 files changed, 79 insertions, 36 deletions

diff --git a/gnome-base/dconf/ChangeLog b/gnome-base/dconf/ChangeLog
index a723b82ba2ef..8fc74055bad0 100644
--- a/gnome-base/dconf/ChangeLog
+++ b/gnome-base/dconf/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-base/dconf
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/dconf/ChangeLog,v 1.1 2010/10/17 19:32:47 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/dconf/ChangeLog,v 1.2 2010/11/06 15:53:06 pacho Exp $
+
+*dconf-0.5.1-r1 (06 Nov 2010)
+
+  06 Nov 2010; Pacho Ramos <pacho@gentoo.org> -dconf-0.5.1.ebuild,
+  +dconf-0.5.1-r1.ebuild, +files/dconf-0.5.1-automagic-vala.patch:
+  Fix vala automagic support, upstream bug #634171
 
 *dconf-0.5.1 (17 Oct 2010)
 
diff --git a/gnome-base/dconf/Manifest b/gnome-base/dconf/Manifest
index 55e3e4e47192..dafb6a7da8a6 100644
--- a/gnome-base/dconf/Manifest
+++ b/gnome-base/dconf/Manifest
@@ -1,14 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX dconf-0.5.1-automagic-vala.patch 467 RMD160 037cb0f3525c0cb609bcd4f994d71a786050cc34 SHA1 943a487f12e9c561495d9b706364eaf257324021 SHA256 4b6a7a82ace37a53add28c487d40c2ee6578e2f5ec29bfd1ea5ed8ff6097e6a4
 DIST dconf-0.5.1.tar.bz2 251287 RMD160 ebc02b010a44d78ac48dc1c4426cc723430b3016 SHA1 4e1dab1f744aad0bff1896ac6f288ad6a9dfece8 SHA256 0083d70e1b5e540d8d4b3f04fa5d17dff4c574136682fe3bdd9b5ecc196ec4f6
-EBUILD dconf-0.5.1.ebuild 710 RMD160 26ee4bd49aa3570c5ac69c4f7d4632271448f567 SHA1 c6d4ec6010019fde89271bb8bc5f4c84a357687d SHA256 df96bc3eb54c74a927c0aabc467da6d88bfb54f6ab9199443ec6c7a15966625a
-MISC ChangeLog 408 RMD160 5d2d6d573c0d4012f7d9abba86f23ba047ce9df1 SHA1 699a641c0f3d81205980c23ce6bfc0f5d1904fcf SHA256 ded44864913187c58a64103a9d636806e29ef5aaf80aed044f2ca8ff42c0c543
-MISC metadata.xml 274 RMD160 4a3e5603446a099b3e704fccbc8ccbd78a2660a1 SHA1 4215e0c0bb615596928a5a5fd7ec06b588d2b4b3 SHA256 d0e640b1d069f6546748707f63dc6c709546026b09ab863b26c77c041185002e
+DIST introspection.m4.bz2 1181 RMD160 3648afa820c2ee7e240083076e1452285d043084 SHA1 e5188cc387d0d17feb77684feff7ff163779912f SHA256 69a2a57b12179159420825d1d44c74108014b0864c4d63500265639cfa9151ae
+EBUILD dconf-0.5.1-r1.ebuild 1112 RMD160 02b37094d3bc842ccb7bad2f7ec5ffde9da495a5 SHA1 d5834c7e11588f02ff69075f8196a3669093b702 SHA256 16e3f2d9350612e323a3c935163578257e1f133fa2cc47db2daf5912295a1a95
+MISC ChangeLog 625 RMD160 f811613313672d07dab991983cab8ae66f943409 SHA1 ebaf59ce42d39bd0ccaa18d3d7613f274e26f85b SHA256 f56e8a4b2ec1303fcf43dbde0b00eb3166f12a99fa4504b6afc75a0bdb7617c6
+MISC metadata.xml 341 RMD160 df0c0ae4bf46e29f58e30a7f488e63440c546925 SHA1 4d3b43a8591fad55039f035ad0a212199df30ba0 SHA256 bbef81a438e4fbde33b5c22062c0bba33aa21143dca5a59725f3998350227a93
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAky7T2QACgkQCaWpQKGI+9TqUACfeYaX/8uwYurRObYNHRP3g3hE
-uIUAnR3ZjEYSbsD2VJpb+vUasSISC/tY
-=uBVc
+iEYEARECAAYFAkzVeegACgkQCaWpQKGI+9S6nACcD4XxEyJZ2Rmo9CCq+1IN9r7R
+ql0An37gBuSFCdhkhl0pGVsCCbTIJ/GJ
+=Nm+u
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/dconf/dconf-0.5.1-r1.ebuild b/gnome-base/dconf/dconf-0.5.1-r1.ebuild
new file mode 100644
index 000000000000..a398ef41ee9e
--- /dev/null
+++ b/gnome-base/dconf/dconf-0.5.1-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/dconf/dconf-0.5.1-r1.ebuild,v 1.1 2010/11/06 15:53:06 pacho Exp $
+
+EAPI=3
+GCONF_DEBUG="no"
+
+inherit autotools eutils gnome2
+
+DESCRIPTION="Simple low-level configuration system"
+HOMEPAGE="http://live.gnome.org/dconf"
+SRC_URI="${SRC_URI} mirror://gentoo/introspection.m4.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc +introspection vala"
+
+RDEPEND=">=dev-libs/glib-2.25.16
+	>=dev-libs/libgee-0.5.1
+	>=dev-libs/libxml2-2.7.7
+	x11-libs/gtk+:2
+	introspection? ( >=dev-libs/gobject-introspection-0.9.3 )
+	vala? ( >=dev-lang/vala-0.9.5:0.10 )"
+DEPEND="${RDEPEND}
+	doc? ( >=dev-util/gtk-doc-1.15 )"
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		$(use_enable introspection)
+		$(use_enable vala)
+		VALAC=$(type -p valac-0.10)"
+}
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# Fix vala automagic support, upstream bug #634171
+	epatch "${FILESDIR}/${P}-automagic-vala.patch"
+
+	mv "${WORKDIR}"/introspection.m4 . || die
+	mkdir -p m4 || die
+	AT_M4DIR="." eautoreconf
+}
diff --git a/gnome-base/dconf/dconf-0.5.1.ebuild b/gnome-base/dconf/dconf-0.5.1.ebuild
deleted file mode 100644
index 568da0a2820a..000000000000
--- a/gnome-base/dconf/dconf-0.5.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/dconf/dconf-0.5.1.ebuild,v 1.1 2010/10/17 19:32:47 pacho Exp $
-
-EAPI=3
-GCONF_DEBUG="no"
-
-inherit gnome2
-
-DESCRIPTION="Simple low-level configuration system"
-HOMEPAGE="http://live.gnome.org/dconf"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc +introspection"
-
-RDEPEND=">=dev-libs/glib-2.25.16
-	>=dev-libs/libgee-0.5.1
-	>=dev-libs/libxml2-2.7.7
-	x11-libs/gtk+:2
-	introspection? ( >=dev-libs/gobject-introspection-0.9.3 )"
-DEPEND="${RDEPEND}
-	doc? ( >=dev-util/gtk-doc-1.15 )"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		$(use_enable introspection)"
-}
diff --git a/gnome-base/dconf/files/dconf-0.5.1-automagic-vala.patch b/gnome-base/dconf/files/dconf-0.5.1-automagic-vala.patch
new file mode 100644
index 000000000000..dcdef5578e9d
--- /dev/null
+++ b/gnome-base/dconf/files/dconf-0.5.1-automagic-vala.patch
@@ -0,0 +1,19 @@
+--- configure.ac.orig	2010-11-06 16:24:36.000000000 +0100
++++ configure.ac	2010-11-06 16:24:19.000000000 +0100
+@@ -12,7 +12,15 @@
+ 
+ # Check for programs
+ AC_PROG_CC
+-AM_PROG_VALAC([0.9.5])
++
++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.9.5])
++fi
+ 
+ # Introspection
+ GOBJECT_INTROSPECTION_CHECK([0.9.5])
diff --git a/gnome-base/dconf/metadata.xml b/gnome-base/dconf/metadata.xml
index 492a4f76bce6..a81b60978a0c 100644
--- a/gnome-base/dconf/metadata.xml
+++ b/gnome-base/dconf/metadata.xml
@@ -6,5 +6,6 @@
 	<flag name="introspection">Use
 		<pkg>dev-libs/gobject-introspection</pkg> for
 		introspection</flag>
+	<flag name="vala">Add support for <pkg>dev-lang/vala</pkg></flag>
 </use>
 </pkgmetadata>