Enable optional vala support.

Package-Manager: portage-2.2.0_alpha125/cvs/Linux x86_64

4 files changed, 26 insertions, 20 deletions

diff --git a/gnome-base/librsvg/ChangeLog b/gnome-base/librsvg/ChangeLog
index c87d957dd919..7ab64db78694 100644
--- a/gnome-base/librsvg/ChangeLog
+++ b/gnome-base/librsvg/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-base/librsvg
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/librsvg/ChangeLog,v 1.280 2012/09/10 16:23:24 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/librsvg/ChangeLog,v 1.281 2012/09/12 20:47:55 tetromino Exp $
+
+  12 Sep 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  librsvg-2.36.3.ebuild, metadata.xml:
+  Enable optional vala support.
 
   10 Sep 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
   librsvg-2.36.3.ebuild:
diff --git a/gnome-base/librsvg/Manifest b/gnome-base/librsvg/Manifest
index 4d8381b47454..646666fcb04d 100644
--- a/gnome-base/librsvg/Manifest
+++ b/gnome-base/librsvg/Manifest
@@ -15,17 +15,17 @@ EBUILD librsvg-2.34.1-r1.ebuild 2521 SHA256 509cd7d03cea076e2bc4aed148871d7afa39
 EBUILD librsvg-2.34.2.ebuild 3044 SHA256 4cb45b2caa8311db8fabe26404d8d0bc85a787de3d15b499ca53de3e468adaea SHA512 ccd97346d5ab607fd51eb1e4d185509b05303f5982ced8681de6112a009d7df15d9decc5ec3ddada4a31a0be649549e529f3e60a192219dfcd4bd31db19f592a WHIRLPOOL 0f3a3f4df9c766a7cc987d35a5d1cc162b9f4c388080c10b4066b059fda7dd02c5a6985319f012b25626484cfc0f1721014daa0b0a29425ffcfea87d5ba6adcc
 EBUILD librsvg-2.36.0.ebuild 2779 SHA256 688b37b7582ffb783ec0884a41ed869dd5b0e399b9201e5a743103e0eecff25e SHA512 49d776f1e26f3105ad6779fb160d8e946f0a7da486e4eb68b0ad1b42b38d010bed8f119dd2f14d613b33bd3b97b175e67df2b4c3edbb01a02162b6dc80e48e3d WHIRLPOOL 77aa81e7a0d2e5d7e9e66efa8398e6bb4b6cb28d06aa6c0c9b69c8cad67108ccd9b4f3677a437c278b233179440aea2a55cf413ce3166075720cc2e4da707919
 EBUILD librsvg-2.36.1.ebuild 2817 SHA256 1ee34cba05a698126e7abbf5e6ad0ec2684a6b1fb58a4dd0694801429b3e5d6c SHA512 337dbeb76ba31f07ed3369d766a329702ed8be276c0d7bae3ac599a5235a1a692f0bb38fe5e452098cda72987347cf302717810bf6b4642bb66a9edf0206c9f0 WHIRLPOOL 8b01c971386ee2b656d4b6d8dccc79b25b77934f5c0f006ebc0fae7a7679786a378929342f9652bd52bc12dd4c7d1b9c0b3f3e8b04a3b0aa65ae53487da400ba
-EBUILD librsvg-2.36.3.ebuild 3029 SHA256 640886f2925b6a8dd245db2a415b6efe4adfe936d27e0cb5ea5e651043f56ae6 SHA512 fb38f189e71b48fb3fcd367b5c5eaa162c3840e0177667a889f167c1a1a78a042a4d8d9fe5436b6657694e3f322e1b674e7bd7381a70945c3befc715796ade8f WHIRLPOOL 293f1ab94739de47f9a228a08fa291754deaa65c06c1a5f1fc4db90a67e33e66fda54a9c44b7c04761dba9598a172e7ec691cfbd42723f22b23ef2bb72a8ed54
-MISC ChangeLog 36694 SHA256 8aa51acb0f979e8ec01b3293678af08444feb5927053e94b3c86e2572cb2e5ab SHA512 ea0041030cb29c26b4539998fd969d4de6b0c71700bafa6c4a92a84c3bce76325f8f4972f66e8b4f1176a2d553c7257a3a7ee322f72fc0462566a74016fa707a WHIRLPOOL aec00429b8b59f7e73b26849cf1ed4bb665a9e6660da1af46d8f37e1aef3900f490d1aca3922c447f6448287418995612d046799bf33138d49e8204b97c8cd8c
-MISC metadata.xml 376 SHA256 7c75a35d70b6bbca589e1fb1c23d01f6475a62569751351b5bb1eaf6741f804a SHA512 8c43278a90c5fe7bf0d297c6b7425585be030b8cf14439df53748b327e77e1f56725dd70c2774da1c54f9c4cd254ca82bb1047252b5d84d9fdd9ee18cd2014bd WHIRLPOOL 71a663e6cf7e625d4350664018d9231ba79bec0c1f03080706d412ff8864f438887bea4102f317667fb3c6ffa7f0db556583c1fc2a44564507975a19c11b3ae2
+EBUILD librsvg-2.36.3.ebuild 2972 SHA256 1f4133eafff530f4ba54da938e2658f16a23e523ebd3b113de5724ae942c2cc0 SHA512 7dadf9368877d5f2edbb70bdce4a65ac62a850b24be4ef187b173cd863dc54df2aaa0409ea408316aa1147d59e5f8e2f8b94000a5171cec136d13925bd6edc41 WHIRLPOOL ff21548eeb1d664590102d7d1f12c643a2ab4864b62c90e9154ac50c0de5656a9a9c6fa78551cfd8ec50fb349ca9d93a8ade01e1fac3fbe8fb1e9ec964b3dbb6
+MISC ChangeLog 36825 SHA256 7e65f78826f78c93a43c846cff157f84732bead6bd84393ea133192bc1f38c63 SHA512 6fc9d8bdd9b19139315b492b7e827e9d9d28c249ff2ee7d7ed0ebb80cead53296019095e09062d98c9788b7b53c11a2beeefc5307105da050222ac00abbb79ae WHIRLPOOL a240ff29aa6706021340f17ecc7324a8f5fa13ff5f9fa898e9f2f153fe3f65f352f03ef25a4d6c01734f64e5e31d1d4cd4562ce3e211050780479d06fcc400ee
+MISC metadata.xml 447 SHA256 ff3436ece57e6eed34bad2974122d6e1ffc4819b87db79898f70cc3de5ee73d9 SHA512 aee3a4f0eb08afd1824dd6db66ff71f6acdfbc45c6d6ea09e8ef3856954b91c54693d240b18f812a70d8498261f31e84eee1ff3d3f4b62452d8dfa4d3b0b454e WHIRLPOOL 243ba27d148faf672a858d0530e1dd201c3ce3f8d747c0731308bda48b1629c7c7acaccb9c8357fb363a4120f0da4b9d1bfd88a19c9607bc6de01385867cfe3a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQThQCAAoJEJ0WA1zPCt1hsbMH/2UJ8Nbm6/f980YOO1jHzgaB
-hFzWC4+ssugu3qrvSOlKv0Wn5Ui7NFH+CuBu9ENzLMfBxK2l8phqkKxDk1E5SOZd
-y48hld4itzSlECUboXNOWdPSIMeD5wugsVSc5VDDPHwVzQJPFDjQlwaWD8K15sb4
-TwYG29VqKIUo83wns9UckIKQFu5G/F7/NQtsE/7EBqPo6KnBxfL+9hZDvXNbeWSf
-U5lwW32NVNJUPrWTDJaNldUgoSZaR8RiOik1P951sVJU69wFOwu8oc/scf/R3ucV
-E8+WTkg6YEm52CzgyukZcpcoLjWLH3powL6sjySdDZqo0SBW1VZcEJzasXxIddM=
-=5Ohf
+iQEcBAEBCAAGBQJQUPUBAAoJEJ0WA1zPCt1h4NMH/3VKil85jvMvUnrSIFOzgLpz
+eMDjHy/EVo9HXaz/yPfuyEINEpWoVEVaUNIK4xSqTm04fjO0ijs/8cGMNl2Q7cI9
+gJTFnn2hsOp+ynTgPTU532TbjJ0VLAsbjlp+9y2uX7SBXKCiWd27yruANMp3nhIU
+eICjAOcyKaxqagcfmopWDOLmkfvST62o5Y+Fqlb2u1ayaluoYqMuk11d46XdLEVl
+YTjGDTH2t05krz7Jo+xwfEftqSWgEeO1hUbiQTbRsveIUSBn3Ncx+3mql2+E9iMy
+MzMHcGn0e/XFV4Yhzy0jNiPcUs6OPrmO+53uIXHAlGjN18Tfy8EwPgPpjY5plos=
+=fnNB
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/librsvg/librsvg-2.36.3.ebuild b/gnome-base/librsvg/librsvg-2.36.3.ebuild
index 5684c8407680..dd8fde360fda 100644
--- a/gnome-base/librsvg/librsvg-2.36.3.ebuild
+++ b/gnome-base/librsvg/librsvg-2.36.3.ebuild
@@ -1,22 +1,23 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/librsvg/librsvg-2.36.3.ebuild,v 1.2 2012/09/10 16:23:24 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/librsvg/librsvg-2.36.3.ebuild,v 1.3 2012/09/12 20:47:55 tetromino Exp $
 
 EAPI="4"
 GNOME2_LA_PUNT="yes"
 GCONF_DEBUG="no"
+VALA_MIN_API_VERSION="0.18"
+VALA_USE_DEPEND="vapigen"
 
-inherit autotools eutils gnome2 multilib
+inherit autotools eutils gnome2 multilib vala
 
 DESCRIPTION="Scalable Vector Graphics (SVG) rendering library"
 HOMEPAGE="http://librsvg.sourceforge.net/"
-SRC_URI="${SRC_URI} mirror://gentoo/introspection.m4.bz2"
 
 LICENSE="LGPL-2"
 SLOT="2"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc +gtk +introspection tools" # vala
-#REQUIRED_USE="vala? ( introspection )"
+IUSE="doc +gtk +introspection tools vala"
+REQUIRED_USE="vala? ( introspection )"
 
 RDEPEND=">=dev-libs/glib-2.24:2
 	>=x11-libs/cairo-1.2
@@ -34,8 +35,8 @@ DEPEND="${RDEPEND}
 	dev-libs/vala-common
 	>=dev-util/gtk-doc-am-1.13
 
-	doc? ( >=dev-util/gtk-doc-1.13 )"
-#	vala? ( >=dev-lang/vala-0.17.1.26:0.18[vapigen] )"
+	doc? ( >=dev-util/gtk-doc-1.13 )
+	vala? ( $(vala_depend) )"
 # >=gtk-doc-am-1.13, gobject-introspection-common, vala-common needed by eautoreconf
 
 pkg_setup() {
@@ -44,9 +45,8 @@ pkg_setup() {
 		$(use_enable tools)
 		$(use_enable gtk gtk-theme)
 		$(use_enable introspection)
+		$(use_enable vala)
 		--enable-pixbuf-loader"
-		# TODO: Add vala support once vala.eclass is committed
-		#$(use_enable vala)
 	if use gtk && use tools; then
 		G2CONF="${G2CONF} --enable-rsvg-view"
 	else
@@ -61,6 +61,7 @@ pkg_setup() {
 src_prepare() {
 	# Make rsvg-view non-automagic
 	epatch "${FILESDIR}/${PN}-2.36.0-rsvg-view-automagic.patch"
+	use vala && vala_src_prepare
 
 	eautoreconf
 	gnome2_src_prepare
diff --git a/gnome-base/librsvg/metadata.xml b/gnome-base/librsvg/metadata.xml
index 9d83ffc773ce..3f9c04a39d1c 100644
--- a/gnome-base/librsvg/metadata.xml
+++ b/gnome-base/librsvg/metadata.xml
@@ -7,5 +7,6 @@
 	<flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg> for
 	introspection</flag>
 	<flag name="tools">Build miscellaneous tools</flag>
+	<flag name="vala">Enable bindings for <pkg>dev-lang/vala</pkg></flag>
 </use>
 </pkgmetadata>