Use either vala-0.14, or vala-0.18

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

3 files changed, 35 insertions, 19 deletions

diff --git a/x11-misc/colord/ChangeLog b/x11-misc/colord/ChangeLog
index 23e1dfef3472..3218f212c9e1 100644
--- a/x11-misc/colord/ChangeLog
+++ b/x11-misc/colord/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-misc/colord
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/colord/ChangeLog,v 1.33 2012/08/10 19:01:58 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/colord/ChangeLog,v 1.34 2012/09/08 02:23:08 nirbheek Exp $
+
+  08 Sep 2012; Nirbheek Chauhan <nirbheek@gentoo.org> colord-0.1.22.ebuild:
+  Use either vala-0.14, or vala-0.18
 
 *colord-0.1.22 (10 Aug 2012)
 
@@ -160,4 +163,3 @@
   14 Aug 2011; Nirbheek Chauhan <nirbheek@gentoo.org> +colord-0.1.11.ebuild,
   +files/colord-0.1.11-fix-automagic-vala.patch, +metadata.xml:
   Add colord from the gnome overlay for GNOME 3
-
diff --git a/x11-misc/colord/Manifest b/x11-misc/colord/Manifest
index 4b2f20e715c5..072c646b9360 100644
--- a/x11-misc/colord/Manifest
+++ b/x11-misc/colord/Manifest
@@ -9,17 +9,23 @@ DIST colord-0.1.22.tar.xz 546956 SHA256 f7c49d8c35a602454b068d66c63a7956dc221175
 EBUILD colord-0.1.18.ebuild 2472 SHA256 7b6f75c0eb8f34891d0b85949e2e286ce0ad378a87596035a87c99ea7aa1d66d SHA512 03b113ce76849193a602d32317bd560a89dc01a8619f759e678ab74bad7beadec1cb3c7a48a232c6707d419b44daf70712dbcd115be6b16e09bf46ea0cfa45f6 WHIRLPOOL 460cc2d71f862e8b7b9b1b4601323ba877c535a770cc6f9f6682b97d4eeccf0c126b30cbf2bcb566545f371708241e8c7a089f2e60fce21c176b4a29e1f72d32
 EBUILD colord-0.1.21-r1.ebuild 2835 SHA256 1ea3e485afd32b2283b106627105699c788d9d4cf928a27b45b1713e0a4ab715 SHA512 ef0ff01f7fa305095370c6cce40aef7cfab3a63166d177a808dbc92a65604905eec213f995a2d9f7075e9c538c44f3b371d7192062fde2c4f326b44f12702c95 WHIRLPOOL 32c6a29f5a82f7e7561fc58f35c4a9409b64a3fa3566e14ba56655eb5c83e8c35c00e27c2cb6af34dc3c99f4b3015196e9507375a7ac984298c67790bafc24da
 EBUILD colord-0.1.21.ebuild 2704 SHA256 9298260b912faa92eab686924da49d86a7668438ddb1d5eee69ec7a98a5b584d SHA512 a0e9a048d00ad56c693991782dd717d9b240a8c6f83ed1ce92a470e9439e600751cc92b479a12187afc271fd9acb27c8e24c7711e111f8ed56551c634c007683 WHIRLPOOL ffe82cdb69cded540a60eb9822cbc1c2ef73bf6b17e1dbc69dc3184d76b8022ec8a7c38ac1270a7b8e2f6c6c77b261756c456ddb2d5a1902dd27a7d618d357f2
-EBUILD colord-0.1.22.ebuild 2761 SHA256 af1a0fd086c2178435f0daed851986942bd3ac60331ac28a60c6b7cdb16ee34c SHA512 82d8ba99a2a8daa8f412c13d94b211a5730ee912995aeee5d1c3b85aa6d72e60b958c17370fb79a5eb541fa143fc9057f366e5a6dd893b5a1d28cd2a7b0c968c WHIRLPOOL 8841e263f53612e222dfe60a611980bae0dfca17eac9bdef079757bf2cda6606b087894ac500a6567d388e87da7b4315c2c2aac591f814039e80fe706ff85f43
-MISC ChangeLog 6532 SHA256 afc57b5e1e63c49cd84f632952374292c34e5753780944c19c76877bdd186dcb SHA512 d86d56d8c4cda00c69bf7ed31957e1a026048fdd0859223257b5f9f8d27c7e77927507e835a3d00db56035615e3c8131fd7b14a0b1cb2bcde5678cd0f8113c12 WHIRLPOOL 353be3d86a7958966484fabf6304f29b689a30959c08a44cf53fe5f124c55eed3dae5517c1c942681bc8672433f125b2782e56aa610fbe8d28f1133f15ec0123
+EBUILD colord-0.1.22.ebuild 2963 SHA256 16cdf0da6033269025222fcd7f5caa4771bf6f8ab48aefd8e0a41a4072c3307c SHA512 9bb81fc334e07b0b3c9f631a6d1aa81d291501393b155638ecc9eb17dbfb1177293157465ed2e31d386afa271c4f5fba1300f62764bca24734c3285e13d39307 WHIRLPOOL 353a5fc26a44d6ab310162116ba55ecb2b26382e5c51c0c15ad2452c1f204691e9f15a5990ac63363a9da168d20d6585d3ec252c8d6fcd4a5955bc94b8a9101c
+MISC ChangeLog 6644 SHA256 f9d4a28b7df893acf6761e47d1d173fb63ca8ae099285197ed03fa99a7a39242 SHA512 dca271189737e600afc6ca637aafe7eece97cf4cc2ccab9f964f6de1eec2ed6ff31f4b01a85f4ddf29a121ea2bfbafed2b8b956be7eea6812d9fd1e678171e0e WHIRLPOOL 97a7eceef4628661dd114e05decdb64f017b401b64e3ea6f3a592309bf6dc219e9160d01a5c51536d10252e3f34710827954d767558c7ce3fcbf332db868fb56
 MISC metadata.xml 456 SHA256 bcf7e3df668c81ee82c603534a9411acf46e1295168999d85039d62b2d3cae42 SHA512 699ed34821bcb9ab041f6e7669f858e1cef6d2142ea30633dd4320ba14687210e8178a3572269812c53ae25573919b7ecdab608a30fd453b572e05184a816d0d WHIRLPOOL 550363c19dfc7d250a3d9b774b854c32260930ec8bd16927b2db32d7c5aa7663c31dd689f7073fac6f21f14f3253646b190e263e64a9ffe84c3647fa05b24ab0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQJVqtAAoJEJ0WA1zPCt1hIcgH/3nThKsqsoSyMVjgvSbE+HpI
-tuh7hGlhe8Gb/5skRMe4UvXjgfg0aXqyxDBdPAIQb5yTDkggmLrY+gK/fjfv3Sib
-t2E4/TWI8G4nSN9H6WXaMdNN+fwK//lPzfN1rx9Yb+cSz74tpGvzvpu3H89wj0lg
-manfLxBinvS7K8HEDXcfxkWMfInXoK/6zuEDoOPosox4+K0g3IhdUSSreAcpVyLC
-0b+spKNRyXk7NKwi2c9Vb35Q6Z2uZYsXR2Z2lctKiu+zoFoevmoZZ0KIbTjd/8ph
-4Ym0vBuJPHyfi+ST7+2QSJifcWP8hOOzvw33315/53Yg8mCVLc0tEWc0w1lxKq0=
-=GUQu
+iQIcBAEBCAAGBQJQSqwMAAoJEO/kOhxWD91khAQQAIFTcQ6PEd6akjOWRm+B+GDa
+7GLffFmLvDMdsfULIV8nS6E6XMpLfY6QriUJ+kyoHoQsqzkQ4VpT3A7ZdyZ4UeF3
+QRR7yrZvStFaEtB8+nhpW1upwuQRLuWfPnWJ/VmryoQwTsdrIPkeWLecfYbWAAIR
+UNhtj0+KdkW7iz8hoiLoOD1h5HzOiSC7ZxpsLfJgWCHxO9ga8F4m0/wgUyaR1W3+
+Su5Cbu4lHm5zFSmvfudY8sc9ciRQsCIz9k8dRhEv9kSl+A6gmkhBzsVDUIQcYpKY
+LvgeBHLlfshVa3CPXTUYvbYlj7JMcxx3zNANTL+yKmUdbvBY0kZI0rB9S9o7w3q2
+dTlxjyVswNOTbgvjilAjQSn5nWR1H3TNTakv7Exj3UNrt7O6JSVtlHYD8PSMopjd
+aQf9M4+g5jnkTjn7JKPxSmk/wQngcS077Q0haMoonBhIH04BFfnjw8PkDxMIkL37
+s41wfeYxqvrikowcx3LPJAJA2aVQYwKom0auyN/w1Xc2vGJDvATmaIVJL0sw2+zr
+wnXtxSBnGNNFqtoRy7Qwhx2sJYGFjNFfGrDxtYHtzXo8qC/y49B8J4ndGXp93ID8
+9eXLhq0dF1CKd973vZxGv5r0iJz7yK9tV+Baluv6cUTUSqi0MirLbxMHbqlEaUUP
+cQ683n6j9cvBndLN8Xh4
+=IpII
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/colord/colord-0.1.22.ebuild b/x11-misc/colord/colord-0.1.22.ebuild
index d03064cd92dc..0c32096973ab 100644
--- a/x11-misc/colord/colord-0.1.22.ebuild
+++ b/x11-misc/colord/colord-0.1.22.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/colord/colord-0.1.22.ebuild,v 1.1 2012/08/10 19:01:58 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/colord/colord-0.1.22.ebuild,v 1.2 2012/09/08 02:23:08 nirbheek Exp $
 
 EAPI="4"
 
@@ -16,6 +16,9 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd"
 IUSE="doc examples +gusb +introspection scanner +udev vala"
 REQUIRED_USE="vala? ( introspection )"
 
+VALA_DEP="|| (
+	dev-lang/vala:0.18[vapigen]
+	>=dev-lang/vala-0.13.4:0.14[vapigen] )"
 COMMON_DEPEND="
 	dev-db/sqlite:3
 	>=dev-libs/glib-2.28.0:2
@@ -24,8 +27,7 @@ COMMON_DEPEND="
 	gusb? ( >=dev-libs/libgusb-0.1.1 )
 	introspection? ( >=dev-libs/gobject-introspection-0.9.8 )
 	scanner? ( media-gfx/sane-backends )
-	udev? ( || ( sys-fs/udev[gudev] sys-fs/udev[extras] ) )
-"
+	udev? ( || ( sys-fs/udev[gudev] sys-fs/udev[extras] ) )"
 RDEPEND="${COMMON_DEPEND}
 	media-gfx/shared-color-profiles"
 DEPEND="${COMMON_DEPEND}
@@ -35,10 +37,8 @@ DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig
 	doc? (
 		app-text/docbook-xml-dtd:4.1.2
-		>=dev-util/gtk-doc-1.9
-	)
-	vala? ( dev-lang/vala:0.14[vapigen] )
-"
+		>=dev-util/gtk-doc-1.9 )
+	vala? ( ${VALA_DEP} )"
 
 # FIXME: needs pre-installed dbus service files
 RESTRICT="test"
@@ -58,6 +58,13 @@ src_prepare() {
 }
 
 src_configure() {
+	local vapigen
+	if has_version "dev-lang/vala:0.18"; then
+		vapigen="VAPIGEN=$(type -P vapigen-0.18)"
+	else
+		vapigen="VAPIGEN=$(type -P vapigen-0.14)"
+	fi
+
 	# Reverse tools require gusb
 	econf \
 		--disable-examples \
@@ -74,7 +81,8 @@ src_configure() {
 		$(use_enable udev gudev) \
 		$(use_enable vala) \
 		"$(systemd_with_unitdir)" \
-		VAPIGEN=$(type -P vapigen-0.14)
+		${vapigen}
+
 	# parallel make fails in doc/api
 	use doc && MAKEOPTS="${MAKEOPTS} -j1"
 }