summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPacho Ramos <pacho@gentoo.org>2011-01-28 11:55:47 +0000
committerPacho Ramos <pacho@gentoo.org>2011-01-28 11:55:47 +0000
commit048a2944fc8d8104d47f0451a2501f17cf70de83 (patch)
tree41521d1d7e4e9d690813d9597d085871d72157dc /dev-lang/vala
parentVersion bump, add static-libs USE flag, and remove old. (diff)
downloadgentoo-2-048a2944fc8d8104d47f0451a2501f17cf70de83.tar.gz
gentoo-2-048a2944fc8d8104d47f0451a2501f17cf70de83.tar.bz2
gentoo-2-048a2944fc8d8104d47f0451a2501f17cf70de83.zip
Drop provided dconf.vapi since dconf ships its own one causing vala:0 to collide. Bump to eapi3.
(Portage version: 2.1.9.35/cvs/Linux x86_64)
Diffstat (limited to 'dev-lang/vala')
-rw-r--r--dev-lang/vala/ChangeLog6
-rw-r--r--dev-lang/vala/vala-0.9.3.ebuild12
2 files changed, 14 insertions, 4 deletions
diff --git a/dev-lang/vala/ChangeLog b/dev-lang/vala/ChangeLog
index eac4a913a532..b58cd5fce4a1 100644
--- a/dev-lang/vala/ChangeLog
+++ b/dev-lang/vala/ChangeLog
@@ -1,6 +1,10 @@
# 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.37 2011/01/23 17:43:07 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/vala/ChangeLog,v 1.38 2011/01/28 11:55:47 pacho Exp $
+
+ 28 Jan 2011; Pacho Ramos <pacho@gentoo.org> vala-0.9.3.ebuild:
+ Drop provided dconf.vapi since dconf ships its own one causing vala:0 to
+ collide. Bump to eapi3.
*vala-0.10.3 (23 Jan 2011)
diff --git a/dev-lang/vala/vala-0.9.3.ebuild b/dev-lang/vala/vala-0.9.3.ebuild
index 325416b74e42..65c0369acc9e 100644
--- a/dev-lang/vala/vala-0.9.3.ebuild
+++ b/dev-lang/vala/vala-0.9.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# 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.9.3.ebuild,v 1.2 2010/12/20 22:37:26 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/vala/vala-0.9.3.ebuild,v 1.3 2011/01/28 11:55:47 pacho Exp $
-EAPI=1
+EAPI=3
GCONF_DEBUG=no
inherit gnome2
@@ -28,3 +28,9 @@ pkg_setup() {
$(use_enable vapigen)"
DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README"
}
+
+src_install() {
+ gnome2_src_install
+ # dconf ships it for itself, this is already fixed on newer vala
+ rm -f "${ED}"/usr/share/vala/vapi/dconf.vapi
+}