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

["Ole Reifschneider" <tranquility@gentoo.org>]

commit:     7f5d4f19c20d8d220d046827c2469e78b03fb4f8
Author:     Ole Reifschneider <tranquility <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 26 13:48:25 2015 +0000
Commit:     Ole Reifschneider <tranquility <AT> gentoo <DOT> org>
CommitDate: Sun Apr 26 13:53:15 2015 +0000
URL:        https://gitweb.gentoo.org/proj/gnome.git/commit/?id=7f5d4f19

Bump vte to 0.40.0

Package-Manager: portage-2.2.14
Manifest-Sign-Key: 7E8B4D42

 .../vte/{vte-9999.ebuild => vte-0.40.0.ebuild}     | 35 ++++++++--------------
 x11-libs/vte/vte-9999.ebuild                       |  6 +++-
 2 files changed, 18 insertions(+), 23 deletions(-)

diff --git a/x11-libs/vte/vte-9999.ebuild b/x11-libs/vte/vte-0.40.0.ebuild
similarity index 71%
copy from x11-libs/vte/vte-9999.ebuild
copy to x11-libs/vte/vte-0.40.0.ebuild
index 8ba6ab5..3da4be5 100644
--- a/x11-libs/vte/vte-9999.ebuild
+++ b/x11-libs/vte/vte-0.40.0.ebuild
@@ -1,37 +1,29 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/vte/vte-0.38.3.ebuild,v 1.6 2015/03/29 11:19:29 jer Exp $
 
 EAPI="5"
-GCONF_DEBUG="yes"
+GCONF_DEBUG="no"
 VALA_USE_DEPEND="vapigen"
-VALA_MIN_API_VERSION="0.18"
 
 inherit eutils gnome2 vala
-if [[ ${PV} = 9999 ]]; then
-	inherit gnome2-live
-fi
 
 DESCRIPTION="Library providing a virtual terminal emulator widget"
 HOMEPAGE="https://wiki.gnome.org/action/show/Apps/Terminal/VTE"
 
 LICENSE="LGPL-2+"
 SLOT="2.91"
-IUSE="debug glade +introspection vala"
-if [[ ${PV} = 9999 ]]; then
-	KEYWORDS=""
-	IUSE="${IUSE} doc"
-else
-	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"
-fi
+IUSE="+crypt 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"
+PDEPEND=">=x11-libs/gnome-pty-helper-${PV}"
 RDEPEND="
 	>=dev-libs/glib-2.40:2
 	>=x11-libs/gtk+-3.8:3[introspection?]
 	>=x11-libs/pango-1.22.0
 
 	sys-libs/ncurses
+	sys-libs/zlib
 	x11-libs/libX11
 	x11-libs/libXft
 
@@ -44,14 +36,12 @@ DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.35
 	sys-devel/gettext
 	virtual/pkgconfig
-"
 
-if [[ ${PV} = 9999 ]]; then
-	DEPEND="${DEPEND}
-		dev-libs/libxml2
-		doc? ( >=dev-util/gtk-doc-1.13 )
-	"
-fi
+	crypt?  ( >=net-libs/gnutls-3.2.0 )
+"
+RDEPEND="${RDEPEND}
+	!x11-libs/vte:2.90[glade]
+"
 
 src_prepare() {
 	vala_src_prepare
@@ -77,6 +67,7 @@ src_configure() {
 		--disable-static \
 		$(use_enable debug) \
 		$(use_enable glade glade-catalogue) \
+		$(use_enable crypt gnutls) \
 		$(use_enable introspection) \
 		$(use_enable vala) \
 		${myconf}

diff --git a/x11-libs/vte/vte-9999.ebuild b/x11-libs/vte/vte-9999.ebuild
index 8ba6ab5..98ba16b 100644
--- a/x11-libs/vte/vte-9999.ebuild
+++ b/x11-libs/vte/vte-9999.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://wiki.gnome.org/action/show/Apps/Terminal/VTE"
 
 LICENSE="LGPL-2+"
 SLOT="2.91"
-IUSE="debug glade +introspection vala"
+IUSE="+crypt debug glade +introspection vala"
 if [[ ${PV} = 9999 ]]; then
 	KEYWORDS=""
 	IUSE="${IUSE} doc"
@@ -32,6 +32,7 @@ RDEPEND="
 	>=x11-libs/pango-1.22.0
 
 	sys-libs/ncurses
+	sys-libs/zlib
 	x11-libs/libX11
 	x11-libs/libXft
 
@@ -44,6 +45,8 @@ DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.35
 	sys-devel/gettext
 	virtual/pkgconfig
+
+	crypt?  ( >=net-libs/gnutls-3.2.0 )
 "
 
 if [[ ${PV} = 9999 ]]; then
@@ -77,6 +80,7 @@ src_configure() {
 		--disable-static \
 		$(use_enable debug) \
 		$(use_enable glade glade-catalogue) \
+		$(use_enable crypt gnutls) \
 		$(use_enable introspection) \
 		$(use_enable vala) \
 		${myconf}