diff options
| author |   Alexandre Rostovtsev <tetromino@gentoo.org> | 2012-08-23 15:25:46 +0000 |
|---|---|---|
| committer | Alexandre Rostovtsev <tetromino@gentoo.org> | 2012-08-23 15:25:46 +0000 |
| commit | 3b0001a81d0180c4ad7e20b6c28bb5b511413ec3 (patch) | |
| tree | a1f7c6d3da89d5b65b50b10514de4a9628edc164 /dev-lang | |
| parent | Bump to 0.7.2, bug 431982. Thanks to Nikoli (diff) | |
| download | gentoo-2-3b0001a81d0180c4ad7e20b6c28bb5b511413ec3.tar.gz gentoo-2-3b0001a81d0180c4ad7e20b6c28bb5b511413ec3.tar.bz2 gentoo-2-3b0001a81d0180c4ad7e20b6c28bb5b511413ec3.zip | |
Fix file collision with vala-common (bug #432456, thanks to Travis Hansen).
(Portage version: 2.2.0_alpha121/cvs/Linux x86_64)
Diffstat (limited to 'dev-lang')
| -rw-r--r-- | dev-lang/vala/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-lang/vala/vala-0.10.4-r2.ebuild | 8 | ||||
| -rw-r--r-- | dev-lang/vala/vala-0.12.1-r1.ebuild | 5 |
3 files changed, 15 insertions, 4 deletions
diff --git a/dev-lang/vala/ChangeLog b/dev-lang/vala/ChangeLog index 800ce8e59a9e..178198a87c3a 100644 --- a/dev-lang/vala/ChangeLog +++ b/dev-lang/vala/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-lang/vala # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/vala/ChangeLog,v 1.114 2012/08/20 18:39:57 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/vala/ChangeLog,v 1.115 2012/08/23 15:25:46 tetromino Exp $ + + 23 Aug 2012; Alexandre Rostovtsev <tetromino@gentoo.org> + vala-0.10.4-r2.ebuild, vala-0.12.1-r1.ebuild: + Fix file collision with vala-common (bug #432456, thanks to Travis Hansen). *vala-0.17.5 (20 Aug 2012) *vala-0.16.1-r2 (20 Aug 2012) diff --git a/dev-lang/vala/vala-0.10.4-r2.ebuild b/dev-lang/vala/vala-0.10.4-r2.ebuild index c57c3b997ad1..f7a7cb432cd7 100644 --- a/dev-lang/vala/vala-0.10.4-r2.ebuild +++ b/dev-lang/vala/vala-0.10.4-r2.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/dev-lang/vala/vala-0.10.4-r2.ebuild,v 1.1 2012/08/20 18:39:57 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/vala/vala-0.10.4-r2.ebuild,v 1.2 2012/08/23 15:25:46 tetromino Exp $ EAPI="4" GCONF_DEBUG="no" @@ -35,3 +35,9 @@ pkg_setup() { $(use_enable vapigen)" DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README" } + +src_install() { + gnome2_src_install + rm -v "${ED}usr/share/aclocal/vala.m4" || die "rm failed" + rmdir "${ED}usr/share/aclocal" || die "rmdir failed" +} diff --git a/dev-lang/vala/vala-0.12.1-r1.ebuild b/dev-lang/vala/vala-0.12.1-r1.ebuild index 1fbd517e55c0..d321f44ee528 100644 --- a/dev-lang/vala/vala-0.12.1-r1.ebuild +++ b/dev-lang/vala/vala-0.12.1-r1.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/dev-lang/vala/vala-0.12.1-r1.ebuild,v 1.1 2012/08/20 18:39:57 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/vala/vala-0.12.1-r1.ebuild,v 1.2 2012/08/23 15:25:46 tetromino Exp $ EAPI="4" GCONF_DEBUG="no" @@ -37,5 +37,6 @@ pkg_setup() { src_install() { gnome2_src_install - rm -v "${ED}usr/share/aclocal/vala.m4" + rm -v "${ED}usr/share/aclocal/vala.m4" || die "rm failed" + rmdir "${ED}usr/share/aclocal" || die "rmdir failed" } |