Gentoo Archives: gentoo-commits

From: Ole Reifschneider <tranquility@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/gnome:master commit in: x11-libs/vte/
Date: Sun, 11 Oct 2015 20:47:05
Message-Id: 1444596373.a2d01892254fe1577b199afa7365e7a7a3ac7a69.tranquility@gentoo
1 commit: a2d01892254fe1577b199afa7365e7a7a3ac7a69
2 Author: Ole Reifschneider <tranquility <AT> gentoo <DOT> org>
3 AuthorDate: Sun Oct 11 20:40:27 2015 +0000
4 Commit: Ole Reifschneider <tranquility <AT> gentoo <DOT> org>
5 CommitDate: Sun Oct 11 20:46:13 2015 +0000
6 URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=a2d01892
7
8 x11-libs/vte: Bump version to 0.42.0
9
10 Package-Manager: portage-2.2.20.1
11 Manifest-Sign-Key: 7E8B4D42
12
13 .../vte/{vte-9999.ebuild => vte-0.42.0.ebuild} | 31 ++++++----------------
14 x11-libs/vte/vte-9999.ebuild | 11 ++++----
15 2 files changed, 14 insertions(+), 28 deletions(-)
16
17 diff --git a/x11-libs/vte/vte-9999.ebuild b/x11-libs/vte/vte-0.42.0.ebuild
18 similarity index 70%
19 copy from x11-libs/vte/vte-9999.ebuild
20 copy to x11-libs/vte/vte-0.42.0.ebuild
21 index b0b1161..e42dfe9 100644
22 --- a/x11-libs/vte/vte-9999.ebuild
23 +++ b/x11-libs/vte/vte-0.42.0.ebuild
24 @@ -3,14 +3,10 @@
25 # $Id$
26
27 EAPI="5"
28 -GCONF_DEBUG="yes"
29 +GCONF_DEBUG="no"
30 VALA_USE_DEPEND="vapigen"
31 -VALA_MIN_API_VERSION="0.18"
32
33 inherit eutils gnome2 vala
34 -if [[ ${PV} = 9999 ]]; then
35 - inherit gnome2-live
36 -fi
37
38 DESCRIPTION="Library providing a virtual terminal emulator widget"
39 HOMEPAGE="https://wiki.gnome.org/action/show/Apps/Terminal/VTE"
40 @@ -18,20 +14,14 @@ HOMEPAGE="https://wiki.gnome.org/action/show/Apps/Terminal/VTE"
41 LICENSE="LGPL-2+"
42 SLOT="2.91"
43 IUSE="+crypt debug glade +introspection vala"
44 -if [[ ${PV} = 9999 ]]; then
45 - KEYWORDS=""
46 - IUSE="${IUSE} doc"
47 -else
48 - 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"
49 -fi
50 +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"
51
52 -PDEPEND="x11-libs/gnome-pty-helper"
53 RDEPEND="
54 >=dev-libs/glib-2.40:2
55 >=x11-libs/gtk+-3.8:3[introspection?]
56 >=x11-libs/pango-1.22.0
57
58 - sys-libs/ncurses
59 + sys-libs/ncurses:0=
60 sys-libs/zlib
61 x11-libs/libX11
62 x11-libs/libXft
63 @@ -46,15 +36,11 @@ DEPEND="${RDEPEND}
64 sys-devel/gettext
65 virtual/pkgconfig
66
67 - crypt? ( >=net-libs/gnutls-3.2.0 )
68 + crypt? ( >=net-libs/gnutls-3.2.7 )
69 +"
70 +RDEPEND="${RDEPEND}
71 + !x11-libs/vte:2.90[glade]
72 "
73 -
74 -if [[ ${PV} = 9999 ]]; then
75 - DEPEND="${DEPEND}
76 - dev-libs/libxml2
77 - doc? ( >=dev-util/gtk-doc-1.13 )
78 - "
79 -fi
80
81 src_prepare() {
82 vala_src_prepare
83 @@ -73,14 +59,13 @@ src_configure() {
84
85 # Python bindings are via gobject-introspection
86 # Ex: from gi.repository import Vte
87 - # Do not disable gnome-pty-helper, bug #401389
88 gnome2_src_configure \
89 --disable-deprecation \
90 --disable-test-application \
91 --disable-static \
92 $(use_enable debug) \
93 $(use_enable glade glade-catalogue) \
94 - $(use_enable crypt gnutls) \
95 + $(use_with crypt gnutls) \
96 $(use_enable introspection) \
97 $(use_enable vala) \
98 ${myconf}
99
100 diff --git a/x11-libs/vte/vte-9999.ebuild b/x11-libs/vte/vte-9999.ebuild
101 index b0b1161..5ae7fe6 100644
102 --- a/x11-libs/vte/vte-9999.ebuild
103 +++ b/x11-libs/vte/vte-9999.ebuild
104 @@ -25,13 +25,12 @@ else
105 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"
106 fi
107
108 -PDEPEND="x11-libs/gnome-pty-helper"
109 RDEPEND="
110 >=dev-libs/glib-2.40:2
111 >=x11-libs/gtk+-3.8:3[introspection?]
112 >=x11-libs/pango-1.22.0
113
114 - sys-libs/ncurses
115 + sys-libs/ncurses:0=
116 sys-libs/zlib
117 x11-libs/libX11
118 x11-libs/libXft
119 @@ -46,7 +45,10 @@ DEPEND="${RDEPEND}
120 sys-devel/gettext
121 virtual/pkgconfig
122
123 - crypt? ( >=net-libs/gnutls-3.2.0 )
124 + crypt? ( >=net-libs/gnutls-3.2.7 )
125 +"
126 +RDEPEND="${RDEPEND}
127 + !x11-libs/vte:2.90[glade]
128 "
129
130 if [[ ${PV} = 9999 ]]; then
131 @@ -73,14 +75,13 @@ src_configure() {
132
133 # Python bindings are via gobject-introspection
134 # Ex: from gi.repository import Vte
135 - # Do not disable gnome-pty-helper, bug #401389
136 gnome2_src_configure \
137 --disable-deprecation \
138 --disable-test-application \
139 --disable-static \
140 $(use_enable debug) \
141 $(use_enable glade glade-catalogue) \
142 - $(use_enable crypt gnutls) \
143 + $(use_with crypt gnutls) \
144 $(use_enable introspection) \
145 $(use_enable vala) \
146 ${myconf}