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

2018-09-13 Thread Mart Raudsepp
commit: bc39a5e01958bb6bdd451aed3c1439c53ca43be4
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Thu Sep 13 07:38:03 2018 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Thu Sep 13 07:38:03 2018 +
URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=bc39a5e0

x11-libs/vte-: partial sync

Package-Manager: Portage-2.3.49, Repoman-2.3.10

 x11-libs/vte/vte-.ebuild | 8 +++-
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/x11-libs/vte/vte-.ebuild b/x11-libs/vte/vte-.ebuild
index 6fabac95..4beec99b 100644
--- a/x11-libs/vte/vte-.ebuild
+++ b/x11-libs/vte/vte-.ebuild
@@ -38,8 +38,8 @@ RDEPEND="
introspection? ( >=dev-libs/gobject-introspection-0.9.0:= )
 "
 DEPEND="${RDEPEND}
-   dev-util/gperf
-   dev-libs/libxml2
+   dev-libs/libxml2:2
+   dev-util/glib-utils
>=dev-util/gtk-doc-am-1.13
>=dev-util/intltool-0.35
sys-devel/gettext
@@ -76,12 +76,10 @@ src_configure() {
export ac_cv_header_stropts_h=no
fi
 
-   # Python bindings are via gobject-introspection
-   # Ex: from gi.repository import Vte
gnome2_src_configure \
-   --disable-test-application \
--disable-static \
--with-gtk=3.0 \
+   --with-iconv \
$(use_enable debug) \
$(use_enable glade glade-catalogue) \
$(use_with crypt gnutls) \



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

2018-09-13 Thread Mart Raudsepp
commit: 47cbd0e42a7cce43403dcf24d95ce7ff5656652e
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Thu Sep 13 07:36:52 2018 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Thu Sep 13 07:36:52 2018 +
URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=47cbd0e4

x11-libs/vte-0.50.4: remove, 0.54 available in ::gentoo

Package-Manager: Portage-2.3.49, Repoman-2.3.10

 x11-libs/vte/vte-0.50.4.ebuild | 90 --
 1 file changed, 90 deletions(-)

diff --git a/x11-libs/vte/vte-0.50.4.ebuild b/x11-libs/vte/vte-0.50.4.ebuild
deleted file mode 100644
index efbf0280..
--- a/x11-libs/vte/vte-0.50.4.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-VALA_USE_DEPEND="vapigen"
-VALA_MIN_API_VERSION="0.32"
-
-inherit gnome2 vala
-
-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="+crypt debug glade +introspection vala vanilla"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc 
~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-solaris ~x86-solaris"
-REQUIRED_USE="vala? ( introspection )"
-
-SRC_URI="${SRC_URI} !vanilla? ( 
https://dev.gentoo.org/~tranquility/distfiles/${PN}/${PN}-0.50.2-command-notify-scroll-speed.patch.xz
 )"
-
-RDEPEND="
-   >=dev-libs/glib-2.40:2
-   >=dev-libs/libpcre2-10.21
-   >=x11-libs/gtk+-3.16:3[introspection?]
-   >=x11-libs/pango-1.22.0
-
-   sys-libs/ncurses:0=
-   sys-libs/zlib
-
-   crypt?  ( >=net-libs/gnutls-3.2.7:0= )
-   glade? ( >=dev-util/glade-3.9:3.10 )
-   introspection? ( >=dev-libs/gobject-introspection-0.9.0:= )
-"
-DEPEND="${RDEPEND}
-   dev-util/gperf
-   dev-libs/libxml2
-   >=dev-util/gtk-doc-am-1.13
-   >=dev-util/intltool-0.35
-   sys-devel/gettext
-   virtual/pkgconfig
-
-   vala? ( $(vala_depend) )
-"
-RDEPEND="${RDEPEND}
-   !x11-libs/vte:2.90[glade]
-"
-
-src_prepare() {
-   if ! use vanilla; then
-   # First half of 
http://pkgs.fedoraproject.org/cgit/rpms/vte291.git/tree/vte291-command-notify-scroll-speed.patch
-   # Adds OSC 777 support for desktop notifications in 
gnome-terminal or elsewhere
-   eapply 
"${WORKDIR}"/${PN}-0.50.2-command-notify-scroll-speed.patch
-   fi
-
-   use vala && vala_src_prepare
-
-   # build fails because of -Werror with gcc-5.x
-   sed -e 's#-Werror=format=2#-Wformat=2#' -i configure || die "sed failed"
-
-   gnome2_src_prepare
-}
-
-src_configure() {
-   local myconf=""
-
-   if [[ ${CHOST} == *-interix* ]]; then
-   myconf="${myconf} --disable-Bsymbolic"
-
-   # interix stropts.h is empty...
-   export ac_cv_header_stropts_h=no
-   fi
-
-   # Python bindings are via gobject-introspection
-   # Ex: from gi.repository import Vte
-   gnome2_src_configure \
-   --disable-test-application \
-   --disable-static \
-   --with-gtk=3.0 \
-   $(use_enable debug) \
-   $(use_enable glade glade-catalogue) \
-   $(use_with crypt gnutls) \
-   $(use_enable introspection) \
-   $(use_enable vala) \
-   ${myconf}
-}
-
-src_install() {
-   gnome2_src_install
-   mv "${ED}"/etc/profile.d/vte{,-${SLOT}}.sh || die
-}



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

2018-04-15 Thread Ole Reifschneider
commit: 9c9916a4a2f309a6ba4c20e8eef514953a8dca5c
Author: Ole Reifschneider  gentoo  org>
AuthorDate: Sun Apr 15 18:47:56 2018 +
Commit: Ole Reifschneider  gentoo  org>
CommitDate: Sun Apr 15 18:47:56 2018 +
URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=9c9916a4

x11-libs/vte: Bump version to 0.50.2

Package-Manager: Portage-2.3.28, Repoman-2.3.9
Manifest-Sign-Key: 0xE9E568677E8B4D42

 x11-libs/vte/vte-0.50.2.ebuild | 90 ++
 1 file changed, 90 insertions(+)

diff --git a/x11-libs/vte/vte-0.50.2.ebuild b/x11-libs/vte/vte-0.50.2.ebuild
new file mode 100644
index ..ff5ace3c
--- /dev/null
+++ b/x11-libs/vte/vte-0.50.2.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+VALA_USE_DEPEND="vapigen"
+VALA_MIN_API_VERSION="0.32"
+
+inherit gnome2 vala
+
+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="+crypt debug glade +introspection vala vanilla"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc 
~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-solaris ~x86-solaris"
+REQUIRED_USE="vala? ( introspection )"
+
+SRC_URI="${SRC_URI} !vanilla? ( 
https://dev.gentoo.org/~tranquility/distfiles/${PN}/${P}-command-notify-scroll-speed.patch.xz
 )"
+
+RDEPEND="
+   >=dev-libs/glib-2.40:2
+   >=dev-libs/libpcre2-10.21
+   >=x11-libs/gtk+-3.16:3[introspection?]
+   >=x11-libs/pango-1.22.0
+
+   sys-libs/ncurses:0=
+   sys-libs/zlib
+
+   crypt?  ( >=net-libs/gnutls-3.2.7:0= )
+   glade? ( >=dev-util/glade-3.9:3.10 )
+   introspection? ( >=dev-libs/gobject-introspection-0.9.0:= )
+"
+DEPEND="${RDEPEND}
+   dev-util/gperf
+   dev-libs/libxml2
+   >=dev-util/gtk-doc-am-1.13
+   >=dev-util/intltool-0.35
+   sys-devel/gettext
+   virtual/pkgconfig
+
+   vala? ( $(vala_depend) )
+"
+RDEPEND="${RDEPEND}
+   !x11-libs/vte:2.90[glade]
+"
+
+src_prepare() {
+   if ! use vanilla; then
+   # First half of 
http://pkgs.fedoraproject.org/cgit/rpms/vte291.git/tree/vte291-command-notify-scroll-speed.patch
+   # Adds OSC 777 support for desktop notifications in 
gnome-terminal or elsewhere
+   eapply "${WORKDIR}"/${P}-command-notify-scroll-speed.patch
+   fi
+
+   use vala && vala_src_prepare
+
+   # build fails because of -Werror with gcc-5.x
+   sed -e 's#-Werror=format=2#-Wformat=2#' -i configure || die "sed failed"
+
+   gnome2_src_prepare
+}
+
+src_configure() {
+   local myconf=""
+
+   if [[ ${CHOST} == *-interix* ]]; then
+   myconf="${myconf} --disable-Bsymbolic"
+
+   # interix stropts.h is empty...
+   export ac_cv_header_stropts_h=no
+   fi
+
+   # Python bindings are via gobject-introspection
+   # Ex: from gi.repository import Vte
+   gnome2_src_configure \
+   --disable-test-application \
+   --disable-static \
+   --with-gtk=3.0 \
+   $(use_enable debug) \
+   $(use_enable glade glade-catalogue) \
+   $(use_with crypt gnutls) \
+   $(use_enable introspection) \
+   $(use_enable vala) \
+   ${myconf}
+}
+
+src_install() {
+   gnome2_src_install
+   mv "${ED}"/etc/profile.d/vte{,-${SLOT}}.sh || die
+}



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

2018-01-12 Thread Dennis Lamm
commit: 3eacb61c4b7e62dfb4d832c75147e1b7cea26c19
Author: Dennis Lamm  gentoo  org>
AuthorDate: Fri Jan 12 15:03:23 2018 +
Commit: Dennis Lamm  gentoo  org>
CommitDate: Fri Jan 12 15:03:23 2018 +
URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=3eacb61c

x11-libs/vte: drop old

Package-Manager: Portage-2.3.13, Repoman-2.3.3

 x11-libs/vte/vte-0.44.2.ebuild | 78 --
 1 file changed, 78 deletions(-)

diff --git a/x11-libs/vte/vte-0.44.2.ebuild b/x11-libs/vte/vte-0.44.2.ebuild
deleted file mode 100644
index 0baf4331..
--- a/x11-libs/vte/vte-0.44.2.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-VALA_USE_DEPEND="vapigen"
-
-inherit eutils gnome2 vala
-
-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="+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"
-
-RDEPEND="
-   >=dev-libs/glib-2.40:2
-   >=x11-libs/gtk+-3.8:3[introspection?]
-   >=x11-libs/pango-1.22.0
-
-   sys-libs/ncurses:0=
-   sys-libs/zlib
-   x11-libs/libX11
-   x11-libs/libXft
-
-   glade? ( >=dev-util/glade-3.9:3.10 )
-   introspection? ( >=dev-libs/gobject-introspection-0.9.0:= )
-"
-DEPEND="${RDEPEND}
-   $(vala_depend)
-   >=dev-util/gtk-doc-am-1.13
-   >=dev-util/intltool-0.35
-   sys-devel/gettext
-   virtual/pkgconfig
-
-   crypt?  ( >=net-libs/gnutls-3.2.7 )
-"
-RDEPEND="${RDEPEND}
-   !x11-libs/vte:2.90[glade]
-"
-
-src_prepare() {
-   vala_src_prepare
-   gnome2_src_prepare
-}
-
-src_configure() {
-   local myconf=""
-
-   if [[ ${CHOST} == *-interix* ]]; then
-   myconf="${myconf} --disable-Bsymbolic"
-
-   # interix stropts.h is empty...
-   export ac_cv_header_stropts_h=no
-   fi
-
-   # Python bindings are via gobject-introspection
-   # Ex: from gi.repository import Vte
-   # FIXME: add USE for pcre
-   gnome2_src_configure \
-   --disable-test-application \
-   --disable-static \
-   $(use_enable debug) \
-   $(use_enable glade glade-catalogue) \
-   $(use_with crypt gnutls) \
-   $(use_enable introspection) \
-   $(use_enable vala) \
-   ${myconf}
-}
-
-src_install() {
-   DOCS="AUTHORS ChangeLog HACKING NEWS README"
-   gnome2_src_install
-   mv "${D}"/etc/profile.d/vte{,-${SLOT}}.sh || die
-}



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

2016-05-10 Thread Remi Cardona
commit: 0829540ec0ca1fe6456905307381546ff3f24fad
Author: Rémi Cardona  gentoo  org>
AuthorDate: Wed May 11 06:15:06 2016 +
Commit: Remi Cardona  gentoo  org>
CommitDate: Wed May 11 06:15:06 2016 +
URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=0829540e

x11-libs/vte: bump to 0.44.2

Package-Manager: portage-2.2.28
Manifest-Sign-Key: 0xE0663D48103108F8

 x11-libs/vte/{vte-0.44.0.ebuild => vte-0.44.2.ebuild} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/x11-libs/vte/vte-0.44.0.ebuild b/x11-libs/vte/vte-0.44.2.ebuild
similarity index 100%
rename from x11-libs/vte/vte-0.44.0.ebuild
rename to x11-libs/vte/vte-0.44.2.ebuild



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

2016-03-24 Thread Ole Reifschneider
commit: 65f133cf9cf5d29126c75f330972e1acfbb8ed91
Author: Ole Reifschneider  gentoo  org>
AuthorDate: Thu Mar 24 20:18:28 2016 +
Commit: Ole Reifschneider  gentoo  org>
CommitDate: Fri Mar 25 00:55:46 2016 +
URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=65f133cf

x11-libs/vte: Bump version to 0.44.0

Package-Manager: portage-2.2.28
Manifest-Sign-Key: 0xE9E568677E8B4D42

 x11-libs/vte/{vte-0.42.1.ebuild => vte-0.44.0.ebuild} | 6 +++---
 x11-libs/vte/vte-.ebuild  | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/x11-libs/vte/vte-0.42.1.ebuild b/x11-libs/vte/vte-0.44.0.ebuild
similarity index 92%
rename from x11-libs/vte/vte-0.42.1.ebuild
rename to x11-libs/vte/vte-0.44.0.ebuild
index e42dfe9..0baf433 100644
--- a/x11-libs/vte/vte-0.42.1.ebuild
+++ b/x11-libs/vte/vte-0.44.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -27,7 +27,7 @@ RDEPEND="
x11-libs/libXft
 
glade? ( >=dev-util/glade-3.9:3.10 )
-   introspection? ( >=dev-libs/gobject-introspection-0.9.0 )
+   introspection? ( >=dev-libs/gobject-introspection-0.9.0:= )
 "
 DEPEND="${RDEPEND}
$(vala_depend)
@@ -59,8 +59,8 @@ src_configure() {
 
# Python bindings are via gobject-introspection
# Ex: from gi.repository import Vte
+   # FIXME: add USE for pcre
gnome2_src_configure \
-   --disable-deprecation \
--disable-test-application \
--disable-static \
$(use_enable debug) \

diff --git a/x11-libs/vte/vte-.ebuild b/x11-libs/vte/vte-.ebuild
index 5ae7fe6..95087c5 100644
--- a/x11-libs/vte/vte-.ebuild
+++ b/x11-libs/vte/vte-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -36,7 +36,7 @@ RDEPEND="
x11-libs/libXft
 
glade? ( >=dev-util/glade-3.9:3.10 )
-   introspection? ( >=dev-libs/gobject-introspection-0.9.0 )
+   introspection? ( >=dev-libs/gobject-introspection-0.9.0:= )
 "
 DEPEND="${RDEPEND}
$(vala_depend)
@@ -75,8 +75,8 @@ src_configure() {
 
# Python bindings are via gobject-introspection
# Ex: from gi.repository import Vte
+   # FIXME: add USE for pcre
gnome2_src_configure \
-   --disable-deprecation \
--disable-test-application \
--disable-static \
$(use_enable debug) \



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

2015-10-18 Thread Ole Reifschneider
commit: ec57fb2dd6d06474ccb7d33c0a3dec57ad56058d
Author: Ole Reifschneider  gentoo  org>
AuthorDate: Sun Oct 18 12:00:55 2015 +
Commit: Ole Reifschneider  gentoo  org>
CommitDate: Sun Oct 18 12:00:55 2015 +
URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=ec57fb2d

x11-libs/vte: Bump version to 0.42.1

Package-Manager: portage-2.2.23
Manifest-Sign-Key: 0xE9E568677E8B4D42

 x11-libs/vte/{vte-0.42.0.ebuild => vte-0.42.1.ebuild} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/x11-libs/vte/vte-0.42.0.ebuild b/x11-libs/vte/vte-0.42.1.ebuild
similarity index 100%
rename from x11-libs/vte/vte-0.42.0.ebuild
rename to x11-libs/vte/vte-0.42.1.ebuild



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

2015-10-11 Thread Ole Reifschneider
commit: a2d01892254fe1577b199afa7365e7a7a3ac7a69
Author: Ole Reifschneider  gentoo  org>
AuthorDate: Sun Oct 11 20:40:27 2015 +
Commit: Ole Reifschneider  gentoo  org>
CommitDate: Sun Oct 11 20:46:13 2015 +
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-.ebuild => vte-0.42.0.ebuild} | 31 ++
 x11-libs/vte/vte-.ebuild   | 11 
 2 files changed, 14 insertions(+), 28 deletions(-)

diff --git a/x11-libs/vte/vte-.ebuild b/x11-libs/vte/vte-0.42.0.ebuild
similarity index 70%
copy from x11-libs/vte/vte-.ebuild
copy to x11-libs/vte/vte-0.42.0.ebuild
index b0b1161..e42dfe9 100644
--- a/x11-libs/vte/vte-.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} =  ]]; 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} =  ]]; 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} =  ]]; 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-.ebuild b/x11-libs/vte/vte-.ebuild
index b0b1161..5ae7fe6 100644
--- a/x11-libs/vte/vte-.ebuild
+++ b/x11-libs/vte/vte-.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} =  ]]; 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}



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

2015-05-12 Thread Gilles Dartiguelongue
commit: 241c3d2a33ec156fb7135bf0033d9d4618a492b7
Author: Gilles Dartiguelongue  gentoo  org>
AuthorDate: Tue May 12 18:11:07 2015 +
Commit: Gilles Dartiguelongue  gentoo  org>
CommitDate: Tue May 12 18:24:01 2015 +
URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=241c3d2a

x11-libs/vte: 0.40.0 → 0.40.2

 x11-libs/vte/{vte-0.40.0.ebuild => vte-0.40.2.ebuild} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/x11-libs/vte/vte-0.40.0.ebuild b/x11-libs/vte/vte-0.40.2.ebuild
similarity index 100%
rename from x11-libs/vte/vte-0.40.0.ebuild
rename to x11-libs/vte/vte-0.40.2.ebuild



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

2015-04-26 Thread Ole Reifschneider
commit: 7f5d4f19c20d8d220d046827c2469e78b03fb4f8
Author: Ole Reifschneider  gentoo  org>
AuthorDate: Sun Apr 26 13:48:25 2015 +
Commit: Ole Reifschneider  gentoo  org>
CommitDate: Sun Apr 26 13:53:15 2015 +
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-.ebuild => vte-0.40.0.ebuild} | 35 --
 x11-libs/vte/vte-.ebuild   |  6 +++-
 2 files changed, 18 insertions(+), 23 deletions(-)

diff --git a/x11-libs/vte/vte-.ebuild b/x11-libs/vte/vte-0.40.0.ebuild
similarity index 71%
copy from x11-libs/vte/vte-.ebuild
copy to x11-libs/vte/vte-0.40.0.ebuild
index 8ba6ab5..3da4be5 100644
--- a/x11-libs/vte/vte-.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} =  ]]; 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} =  ]]; 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} =  ]]; 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-.ebuild b/x11-libs/vte/vte-.ebuild
index 8ba6ab5..98ba16b 100644
--- a/x11-libs/vte/vte-.ebuild
+++ b/x11-libs/vte/vte-.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} =  ]]; 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} =  ]]; 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}



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

2014-12-15 Thread Gilles Dartiguelongue
commit: 1d712b188aa84a04ca4d662e0567b7b762c3075d
Author: Gilles Dartiguelongue  gentoo  org>
AuthorDate: Mon Dec 15 23:26:55 2014 +
Commit: Gilles Dartiguelongue  gentoo  org>
CommitDate: Mon Dec 15 23:26:55 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=1d712b18

x11-libs/vte: moved to gentoo-x86

---
 x11-libs/vte/vte-0.36.3.ebuild | 70 --
 x11-libs/vte/vte-0.38.2.ebuild | 77 --
 2 files changed, 147 deletions(-)

diff --git a/x11-libs/vte/vte-0.36.3.ebuild b/x11-libs/vte/vte-0.36.3.ebuild
deleted file mode 100644
index b4e7efc..000
--- a/x11-libs/vte/vte-0.36.3.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/vte/vte-0.36.3.ebuild,v 1.9 
2014/09/15 08:24:54 ago Exp $
-
-EAPI="5"
-GCONF_DEBUG="yes"
-
-inherit eutils gnome2
-
-DESCRIPTION="Library providing a virtual terminal emulator widget"
-HOMEPAGE="https://wiki.gnome.org/action/show/Apps/Terminal/VTE";
-
-LICENSE="LGPL-2+"
-SLOT="2.90"
-IUSE="debug glade +introspection"
-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="
-   >=dev-libs/glib-2.31.13:2
-   >=x11-libs/gtk+-3.1.9:3[introspection?]
-   >=x11-libs/pango-1.22.0
-
-   sys-libs/ncurses
-   x11-libs/libX11
-   x11-libs/libXft
-
-   glade? ( >=dev-util/glade-3.9:3.10 )
-   introspection? ( >=dev-libs/gobject-introspection-0.9.0 )
-"
-DEPEND="${RDEPEND}
-   >=dev-util/gtk-doc-am-1.13
-   >=dev-util/intltool-0.35
-   sys-devel/gettext
-   virtual/pkgconfig
-"
-
-src_prepare() {
-   # https://bugzilla.gnome.org/show_bug.cgi?id=663779
-   epatch "${FILESDIR}/${PN}-0.30.1-alt-meta.patch"
-
-   gnome2_src_prepare
-}
-
-src_configure() {
-   local myconf=""
-
-   if [[ ${CHOST} == *-interix* ]]; then
-   myconf="${myconf} --disable-Bsymbolic"
-
-   # interix stropts.h is empty...
-   export ac_cv_header_stropts_h=no
-   fi
-
-   # 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-static \
-   $(use_enable debug) \
-   $(use_enable glade glade-catalogue) \
-   $(use_enable introspection)
-}
-
-src_install() {
-   DOCS="AUTHORS ChangeLog HACKING NEWS README"
-   gnome2_src_install
-   rm -v "${ED}usr/libexec/gnome-pty-helper" || die
-}

diff --git a/x11-libs/vte/vte-0.38.2.ebuild b/x11-libs/vte/vte-0.38.2.ebuild
deleted file mode 100644
index 47f5311..000
--- a/x11-libs/vte/vte-0.38.2.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="5"
-GCONF_DEBUG="yes"
-VALA_USE_DEPEND="vapigen"
-VALA_MIN_API_VERSION="0.18"
-
-inherit eutils gnome2 vala
-
-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"
-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}"
-DEPEND="
-   >=dev-libs/glib-2.40:2
-   >=x11-libs/gtk+-3.8:3[introspection?]
-   >=x11-libs/pango-1.22.0
-
-   sys-libs/ncurses
-   x11-libs/libX11
-   x11-libs/libXft
-
-   glade? ( >=dev-util/glade-3.9:3.10 )
-   introspection? ( >=dev-libs/gobject-introspection-0.9.0 )
-"
-DEPEND="${RDEPEND}
-   $(vala_depend)
-   >=dev-util/gtk-doc-am-1.13
-   >=dev-util/intltool-0.35
-   sys-devel/gettext
-   virtual/pkgconfig
-"
-RDEPEND="${RDEPEND}
-   !x11-libs/vte:2.90[glade]
-"
-
-src_prepare() {
-   vala_src_prepare
-   gnome2_src_prepare
-}
-
-src_configure() {
-   local myconf=""
-
-   if [[ ${CHOST} == *-interix* ]]; then
-   myconf="${myconf} --disable-Bsymbolic"
-
-   # interix stropts.h is empty...
-   export ac_cv_header_stropts_h=no
-   fi
-
-   # 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-

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

2014-11-23 Thread Gilles Dartiguelongue
commit: 0cf67fab9bdd54fdf2b98219173dfd026f93b213
Author: Gilles Dartiguelongue  gentoo  org>
AuthorDate: Sun Nov 23 22:36:10 2014 +
Commit: Gilles Dartiguelongue  gentoo  org>
CommitDate: Sun Nov 23 22:49:03 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=0cf67fab

x11-libs/vte: 0.38.1 → 0.38.2

---
 x11-libs/vte/{vte-0.38.1.ebuild => vte-0.38.2.ebuild} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/x11-libs/vte/vte-0.38.1.ebuild b/x11-libs/vte/vte-0.38.2.ebuild
similarity index 100%
rename from x11-libs/vte/vte-0.38.1.ebuild
rename to x11-libs/vte/vte-0.38.2.ebuild



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

2014-11-03 Thread Gilles Dartiguelongue
commit: 766cbf8a809aa8c0998ab47dffd4e23998f13196
Author: Gilles Dartiguelongue  gentoo  org>
AuthorDate: Mon Nov  3 23:35:14 2014 +
Commit: Gilles Dartiguelongue  gentoo  org>
CommitDate: Mon Nov  3 23:35:14 2014 +
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
+}



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

2014-10-13 Thread Gilles Dartiguelongue
commit: 5b6c4e9972fa64783a1195e4c13525c6988c4ef8
Author: Gilles Dartiguelongue  gentoo  org>
AuthorDate: Mon Oct 13 21:23:55 2014 +
Commit: Gilles Dartiguelongue  gentoo  org>
CommitDate: Mon Oct 13 21:23:55 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=5b6c4e99

x11-libs/vte: 0.38.0 → 0.38.1

---
 x11-libs/vte/{vte-0.38.0.ebuild => vte-0.38.1.ebuild} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/x11-libs/vte/vte-0.38.0.ebuild b/x11-libs/vte/vte-0.38.1.ebuild
similarity index 100%
rename from x11-libs/vte/vte-0.38.0.ebuild
rename to x11-libs/vte/vte-0.38.1.ebuild



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

2014-04-24 Thread Gilles Dartiguelongue
commit: c5da61177f811fc7ac2a496062691878101f1208
Author: Gilles Dartiguelongue  gentoo  org>
AuthorDate: Thu Apr 24 21:35:33 2014 +
Commit: Gilles Dartiguelongue  gentoo  org>
CommitDate: Thu Apr 24 21:35:44 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=c5da6117

x11-libs/vte: update live ebuild using master

---
 x11-libs/vte/vte-.ebuild | 19 +--
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/x11-libs/vte/vte-.ebuild b/x11-libs/vte/vte-.ebuild
index ad73e0b..63a7591 100644
--- a/x11-libs/vte/vte-.ebuild
+++ b/x11-libs/vte/vte-.ebuild
@@ -4,8 +4,10 @@
 
 EAPI="5"
 GCONF_DEBUG="yes"
+VALA_USE_DEPEND="vapigen"
+VALA_MIN_API_VERSION="0.18"
 
-inherit eutils gnome2
+inherit eutils gnome2 vala
 if [[ ${PV} =  ]]; then
inherit gnome2-live
 fi
@@ -14,8 +16,8 @@ DESCRIPTION="Library providing a virtual terminal emulator 
widget"
 HOMEPAGE="https://wiki.gnome.org/action/show/Apps/Terminal/VTE";
 
 LICENSE="LGPL-2+"
-SLOT="2.90"
-IUSE="debug glade +introspection"
+SLOT="2.91"
+IUSE="debug glade +introspection vala"
 if [[ ${PV} =  ]]; then
KEYWORDS=""
IUSE="${IUSE} doc"
@@ -25,8 +27,8 @@ fi
 
 PDEPEND="x11-libs/gnome-pty-helper"
 RDEPEND="
-   >=dev-libs/glib-2.31.13:2
-   >=x11-libs/gtk+-3.1.9:3[introspection?]
+   >=dev-libs/glib-2.40:2
+   >=x11-libs/gtk+-3.8:3[introspection?]
>=x11-libs/pango-1.22.0
 
sys-libs/ncurses
@@ -37,6 +39,7 @@ RDEPEND="
introspection? ( >=dev-libs/gobject-introspection-0.9.0 )
 "
 DEPEND="${RDEPEND}
+   $(vala_depend)
>=dev-util/gtk-doc-am-1.13
>=dev-util/intltool-0.35
sys-devel/gettext
@@ -45,13 +48,16 @@ DEPEND="${RDEPEND}
 
 if [[ ${PV} =  ]]; then
DEPEND="${DEPEND}
-   doc? ( >=dev-util/gtk-doc-1.13 )"
+   dev-libs/libxml2
+   doc? ( >=dev-util/gtk-doc-1.13 )
+   "
 fi
 
 src_prepare() {
# https://bugzilla.gnome.org/show_bug.cgi?id=663779
epatch "${FILESDIR}/${PN}-0.30.1-alt-meta.patch"
 
+   vala_src_prepare
gnome2_src_prepare
 }
 
@@ -74,6 +80,7 @@ src_configure() {
$(use_enable debug) \
$(use_enable glade glade-catalogue) \
$(use_enable introspection) \
+   $(use_enable vala) \
${myconf}
 }
 



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

2014-04-15 Thread Gilles Dartiguelongue
commit: 21c15dee7fb4b65378d10fe5f619764426ba6d20
Author: Gilles Dartiguelongue  gentoo  org>
AuthorDate: Sat Apr 12 21:06:39 2014 +
Commit: Gilles Dartiguelongue  gentoo  org>
CommitDate: Tue Apr 15 20:58:53 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=21c15dee

x11-libs/vte: 0.34.9 → 0.36.0

---
 .../vte/{vte-.ebuild => vte-0.36.0.ebuild} | 22 --
 x11-libs/vte/vte-.ebuild   |  2 +-
 2 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/x11-libs/vte/vte-.ebuild b/x11-libs/vte/vte-0.36.0.ebuild
similarity index 74%
copy from x11-libs/vte/vte-.ebuild
copy to x11-libs/vte/vte-0.36.0.ebuild
index 2362447..56784ee 100644
--- a/x11-libs/vte/vte-.ebuild
+++ b/x11-libs/vte/vte-0.36.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -6,9 +6,6 @@ EAPI="5"
 GCONF_DEBUG="yes"
 
 inherit eutils gnome2
-if [[ ${PV} =  ]]; then
-   inherit gnome2-live
-fi
 
 DESCRIPTION="Library providing a virtual terminal emulator widget"
 HOMEPAGE="https://wiki.gnome.org/action/show/Apps/Terminal/VTE";
@@ -16,14 +13,9 @@ 
HOMEPAGE="https://wiki.gnome.org/action/show/Apps/Terminal/VTE";
 LICENSE="LGPL-2+"
 SLOT="2.90"
 IUSE="debug glade +introspection"
-if [[ ${PV} =  ]]; 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"
+PDEPEND="=x11-libs/gnome-pty-helper-${PV}"
 RDEPEND="
>=dev-libs/glib-2.31.13:2
>=x11-libs/gtk+-3.1.9:3[introspection?]
@@ -43,11 +35,6 @@ DEPEND="${RDEPEND}
virtual/pkgconfig
 "
 
-if [[ ${PV} =  ]]; then
-   DEPEND="${DEPEND}
-   doc? ( >=dev-util/gtk-doc-1.13 )"
-fi
-
 src_prepare() {
# https://bugzilla.gnome.org/show_bug.cgi?id=663779
epatch "${FILESDIR}/${PN}-0.30.1-alt-meta.patch"
@@ -73,8 +60,7 @@ src_configure() {
--disable-static \
$(use_enable debug) \
$(use_enable glade glade-catalogue) \
-   $(use_enable introspection) \
-   ${myconf}
+   $(use_enable introspection)
 }
 
 src_install() {

diff --git a/x11-libs/vte/vte-.ebuild b/x11-libs/vte/vte-.ebuild
index 2362447..ad73e0b 100644
--- a/x11-libs/vte/vte-.ebuild
+++ b/x11-libs/vte/vte-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $