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

(Portage version: 2.2.0_alpha27/cvs/Linux x86_64, RepoMan options: --force)

3 files changed, 69 insertions, 3 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/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"
+}