commit: a2d01892254fe1577b199afa7365e7a7a3ac7a69
Author: Ole Reifschneider <tranquility <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 11 20:40:27 2015 +0000
Commit: Ole Reifschneider <tranquility <AT> gentoo <DOT> org>
CommitDate: Sun Oct 11 20:46:13 2015 +0000
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=a2d01892
x11-libs/vte: Bump version to 0.42.0
Package-Manager: portage-2.2.20.1
Manifest-Sign-Key: 7E8B4D42
.../vte/{vte-9999.ebuild => vte-0.42.0.ebuild} | 31 ++++++----------------
x11-libs/vte/vte-9999.ebuild | 11 ++++----
2 files changed, 14 insertions(+), 28 deletions(-)
diff --git a/x11-libs/vte/vte-9999.ebuild b/x11-libs/vte/vte-0.42.0.ebuild
similarity index 70%
copy from x11-libs/vte/vte-9999.ebuild
copy to x11-libs/vte/vte-0.42.0.ebuild
index b0b1161..e42dfe9 100644
--- a/x11-libs/vte/vte-9999.ebuild
+++ b/x11-libs/vte/vte-0.42.0.ebuild
@@ -3,14 +3,10 @@
# $Id$
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";
@@ -18,20 +14,14 @@
HOMEPAGE="https://wiki.gnome.org/action/show/Apps/Terminal/VTE";
LICENSE="LGPL-2+"
SLOT="2.91"
IUSE="+crypt 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
+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"
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/ncurses:0=
sys-libs/zlib
x11-libs/libX11
x11-libs/libXft
@@ -46,15 +36,11 @@ DEPEND="${RDEPEND}
sys-devel/gettext
virtual/pkgconfig
- crypt? ( >=net-libs/gnutls-3.2.0 )
+ crypt? ( >=net-libs/gnutls-3.2.7 )
+"
+RDEPEND="${RDEPEND}
+ !x11-libs/vte:2.90[glade]
"
-
-if [[ ${PV} = 9999 ]]; then
- DEPEND="${DEPEND}
- dev-libs/libxml2
- doc? ( >=dev-util/gtk-doc-1.13 )
- "
-fi
src_prepare() {
vala_src_prepare
@@ -73,14 +59,13 @@ src_configure() {
# Python bindings are via gobject-introspection
# Ex: from gi.repository import Vte
- # Do not disable gnome-pty-helper, bug #401389
gnome2_src_configure \
--disable-deprecation \
--disable-test-application \
--disable-static \
$(use_enable debug) \
$(use_enable glade glade-catalogue) \
- $(use_enable crypt gnutls) \
+ $(use_with 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 b0b1161..5ae7fe6 100644
--- a/x11-libs/vte/vte-9999.ebuild
+++ b/x11-libs/vte/vte-9999.ebuild
@@ -25,13 +25,12 @@ 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
-PDEPEND="x11-libs/gnome-pty-helper"
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/ncurses:0=
sys-libs/zlib
x11-libs/libX11
x11-libs/libXft
@@ -46,7 +45,10 @@ DEPEND="${RDEPEND}
sys-devel/gettext
virtual/pkgconfig
- crypt? ( >=net-libs/gnutls-3.2.0 )
+ crypt? ( >=net-libs/gnutls-3.2.7 )
+"
+RDEPEND="${RDEPEND}
+ !x11-libs/vte:2.90[glade]
"
if [[ ${PV} = 9999 ]]; then
@@ -73,14 +75,13 @@ src_configure() {
# Python bindings are via gobject-introspection
# Ex: from gi.repository import Vte
- # Do not disable gnome-pty-helper, bug #401389
gnome2_src_configure \
--disable-deprecation \
--disable-test-application \
--disable-static \
$(use_enable debug) \
$(use_enable glade glade-catalogue) \
- $(use_enable crypt gnutls) \
+ $(use_with crypt gnutls) \
$(use_enable introspection) \
$(use_enable vala) \
${myconf}
