Use alternatives so vala.m4 always exists and is the latest slot available.

Package-Manager: portage-2.2.0_alpha27/cvs/Linux x86_64
RepoMan-Options: --force

4 files changed, 82 insertions, 5 deletions

diff --git a/dev-lang/vala/ChangeLog b/dev-lang/vala/ChangeLog
index f74671b00a7a..6126aaa16548 100644
--- a/dev-lang/vala/ChangeLog
+++ b/dev-lang/vala/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lang/vala
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/vala/ChangeLog,v 1.50 2011/03/16 21:33:44 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/vala/ChangeLog,v 1.51 2011/03/17 23:06:57 eva Exp $
+
+*vala-0.10.4-r1 (17 Mar 2011)
+
+  17 Mar 2011; Gilles Dartiguelongue <eva@gentoo.org> +vala-0.10.4-r1.ebuild,
+  vala-0.11.7.ebuild:
+  Use alternatives so vala.m4 always exists and is the latest slot available.
 
 *vala-0.11.7 (16 Mar 2011)
 
diff --git a/dev-lang/vala/Manifest b/dev-lang/vala/Manifest
index 33fae66c1b04..a57071646fc2 100644
--- a/dev-lang/vala/Manifest
+++ b/dev-lang/vala/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST vala-0.10.3.tar.bz2 2415741 RMD160 aac150b4d46a911a54c899d5934a715adf9fc6a4 SHA1 c01f907d722d3e3cb95fbd823f8bc7923daeaee9 SHA256 338b9869ad5c585b58540ffc9b576cbe44709864da2582c7ebc7a5d817004974
 DIST vala-0.10.4.tar.bz2 2418192 RMD160 854ecfad5e846075810c2342da7a8da532be5d42 SHA1 d490149292d49f25008e1a774ece55e7cc639b73 SHA256 4d23bd8b904ec59537ed5bcf44064104ccc41d639a3386cbc62d91f6bf0301c4
 DIST vala-0.11.6.tar.bz2 2860563 RMD160 033d0ade53cdb2565320a6991e4a16734b968102 SHA1 3f070ecfb500c8c7174abae52a518c5be26e40f7 SHA256 4c5b715d47b3426e670c7a9c5d6050e3a436819aba6902d71c16f2267c8d187b
@@ -5,10 +8,18 @@ DIST vala-0.11.7.tar.bz2 2845070 RMD160 29af2723d205d888e155195b4f876b711a4e7c56
 DIST vala-0.8.1.tar.bz2 2122657 RMD160 36bc26062f67bf57f7ff0362979c211643950778 SHA1 1194011eba6f6d1ba6a4daee26fbc39cd69087c5 SHA256 d805853ac87234ec0942e536e3381609eb9da596e32928996103b4342737ea85
 DIST vala-0.9.3.tar.bz2 2395639 RMD160 110f419b04daeb6429a7c0caee9e04840e96608c SHA1 b38f93393a415cfc929be41247a549e0cb26ef0a SHA256 6e343df80b8919486599f863d00f26b1be8ae1952422f91784d6542bed3afa98
 EBUILD vala-0.10.3.ebuild 821 RMD160 f9e6e3d5fd263b5f292d609207dc3f68f834d185 SHA1 01f9aaf36ab2a42e8723779b1a8d10bff66a2161 SHA256 611c678448380720ef0e6bc0bf1bbbdf271d9a8a09526bf9d14b3e051d6d2139
+EBUILD vala-0.10.4-r1.ebuild 1307 RMD160 673be32b1202b5415f9ced7a27c7d668f2243b2d SHA1 36906aa7f9823043d8463d4581660004e55c21bf SHA256 27e894192c508cc6d398704c22e7b20d9ad7b3ad6b607248381922d6172e510f
 EBUILD vala-0.10.4.ebuild 829 RMD160 0973c4acdc46708bdb78f43f120a7d19b10e83a6 SHA1 88bd8d43868902ec207360bd2ad90fa9a6f77be5 SHA256 e8463f09cc8d60950efec1042b1f162956b3e0e167c16aa7b40b86960f7ba1a5
 EBUILD vala-0.11.6.ebuild 1057 RMD160 6624afa9f8c7121d44e187001001b9f039138370 SHA1 039cc8a21cace6804dfe339a22fd1f38e27742f4 SHA256 21f4bb6d6b666258e4489e66f4aef9ec4120581f57c384920d6b4df01d96b7f4
-EBUILD vala-0.11.7.ebuild 1064 RMD160 c803e3cb6da260c5dde65628aaf5e0699915a507 SHA1 508e1bbb967d21d7f7dbd668b11cf4722657416d SHA256 a96655213dea522d92c5b06179f95f9113174a2f4533db57351924d65fb6413a
+EBUILD vala-0.11.7.ebuild 1304 RMD160 20a2c01cd5e85a80c5b0a77d5ac8e6cf9afd21cd SHA1 b2cc88322460a7a598765a7d9e66de782b0d9740 SHA256 943543d4fb993367e72a0a31154fa5cc2469f22a08399234591c514716d51e2b
 EBUILD vala-0.8.1.ebuild 922 RMD160 4439fbde22668632523914436c3178abf5754886 SHA1 bf29a74160351dbf63d75eef13960850e5bcc2f0 SHA256 b1e456bb0704644d37ae5709d157fbf5c45893ffe760e4634404e749921249f7
 EBUILD vala-0.9.3.ebuild 921 RMD160 31c6f2f103cebb84729bd8c4d2f9c3f14e25dea8 SHA1 36a4af69a7aaac5c57020eb01373f66e76c01ccd SHA256 cfa883ce9a65ee0a859823e3de1f282743a258990ac7e639fc7c837caa99fd4c
-MISC ChangeLog 8229 RMD160 80de20d1316d553da66963baacd730131a0157ab SHA1 a7f5ba1e393738c99894cfc3a8888d575824a4cf SHA256 171cacf6669167b0756b253ae47b8496fa0b4fc00bae1866b47d996817430012
+MISC ChangeLog 8434 RMD160 ca617b75872bc0c57a61408530e7252dfc6cea1b SHA1 8bda5827508961200689cb68507d631a8a0d49f2 SHA256 cb683f3aa4daedc2681a8ed90ba815569420399954de0159335259fb85168bb7
 MISC metadata.xml 246 RMD160 0908bdc9d087812644613d8cd68b9324b5546b91 SHA1 409735e3e1557c563b5e8005228c1f0c34a52611 SHA256 98f5590ad1f7d7d67baf30bb9c20e3e664b9fa811feb66daafc073351873449f
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk2ClBcACgkQ1fmVwcYIWAakLwCeNuen/CIAASA4vw/nEJgojcyd
+xpIAn07zmJIhq8Vvh67pcZiT/eL0+OOd
+=H7XJ
+-----END PGP SIGNATURE-----
diff --git a/dev-lang/vala/vala-0.10.4-r1.ebuild b/dev-lang/vala/vala-0.10.4-r1.ebuild
new file mode 100644
index 000000000000..701868ff2c99
--- /dev/null
+++ b/dev-lang/vala/vala-0.10.4-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/vala/vala-0.10.4-r1.ebuild,v 1.1 2011/03/17 23:06:57 eva Exp $
+
+EAPI="3"
+GCONF_DEBUG="no"
+
+inherit alternatives gnome2
+
+DESCRIPTION="Vala - Compiler for the GObject type system"
+HOMEPAGE="http://live.gnome.org/Vala"
+
+LICENSE="LGPL-2.1"
+SLOT="0.10"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
+IUSE="test +vapigen"
+
+RDEPEND=">=dev-libs/glib-2.14:2"
+DEPEND="${RDEPEND}
+	sys-devel/flex
+	|| ( sys-devel/bison dev-util/byacc dev-util/yacc )
+	dev-util/pkgconfig
+	dev-libs/libxslt
+	test? (
+		>=dev-libs/glib-2.26:2
+		dev-libs/dbus-glib )"
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		--disable-unversioned
+		$(use_enable vapigen)"
+	DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README"
+}
+
+src_install() {
+	gnome2_src_install
+	mv "${ED}"/usr/share/aclocal/vala.m4 \
+		"${ED}"/usr/share/aclocal/vala-${SLOT/./-}.m4 || die "failed to move vala m4 macro"
+	find "${ED}" -name "*.la" -delete || die "la file removal failed"
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	alternatives_auto_makesym /usr/share/aclocal/vala.m4 "vala-0-[0-9][0-9].m4"
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+	alternatives_auto_makesym /usr/share/aclocal/vala.m4 "vala-0-[0-9][0-9].m4"
+}
diff --git a/dev-lang/vala/vala-0.11.7.ebuild b/dev-lang/vala/vala-0.11.7.ebuild
index 29331b88e404..a9295fbdcd1e 100644
--- a/dev-lang/vala/vala-0.11.7.ebuild
+++ b/dev-lang/vala/vala-0.11.7.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/vala/vala-0.11.7.ebuild,v 1.1 2011/03/16 21:33:44 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/vala/vala-0.11.7.ebuild,v 1.2 2011/03/17 23:06:57 eva Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
 
-inherit gnome2
+inherit alternatives gnome2
 
 DESCRIPTION="Vala - Compiler for the GObject type system"
 HOMEPAGE="http://live.gnome.org/Vala"
@@ -38,3 +38,13 @@ src_install() {
 		"${ED}"/usr/share/aclocal/vala-${SLOT/./-}.m4 || die "failed to move vala m4 macro"
 	find "${ED}" -name "*.la" -delete || die "la file removal failed"
 }
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	alternatives_auto_makesym /usr/share/aclocal/vala.m4 "vala-0-[0-9][0-9].m4"
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+	alternatives_auto_makesym /usr/share/aclocal/vala.m4 "vala-0-[0-9][0-9].m4"
+}