[gentoo-commits] proj/gnome:master commit in: x11-libs/vte/

["Gilles Dartiguelongue" <eva@gentoo.org>]

commit:     766cbf8a809aa8c0998ab47dffd4e23998f13196
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Mon Nov  3 23:35:14 2014 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Mon Nov  3 23:35:14 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=766cbf8a

x11-libs/vte: add a blocker for conflicting glade integration

Fixes bug #525420.

---
 x11-libs/vte/vte-0.38.1.ebuild | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/x11-libs/vte/vte-0.38.1.ebuild b/x11-libs/vte/vte-0.38.1.ebuild
index 64c3832..47f5311 100644
--- a/x11-libs/vte/vte-0.38.1.ebuild
+++ b/x11-libs/vte/vte-0.38.1.ebuild
@@ -18,7 +18,7 @@ IUSE="debug glade +introspection vala"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~x64-solaris ~x86-solaris"
 
 PDEPEND=">=x11-libs/gnome-pty-helper-${PV}"
-RDEPEND="
+DEPEND="
 	>=dev-libs/glib-2.40:2
 	>=x11-libs/gtk+-3.8:3[introspection?]
 	>=x11-libs/pango-1.22.0
@@ -37,6 +37,9 @@ DEPEND="${RDEPEND}
 	sys-devel/gettext
 	virtual/pkgconfig
 "
+RDEPEND="${RDEPEND}
+	!x11-libs/vte:2.90[glade]
+"
 
 src_prepare() {
 	vala_src_prepare
@@ -71,4 +74,4 @@ src_install() {
 	DOCS="AUTHORS ChangeLog HACKING NEWS README"
 	gnome2_src_install
 	mv "${D}"/etc/profile.d/vte{,-${SLOT}}.sh || die
-}
\ No newline at end of file
+}