Gentoo Archives: gentoo-commits

From: Nirbheek Chauhan <nirbheek@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/gnome:master commit in: x11-libs/vte/, x11-libs/vte/files/
Date: Tue, 05 Apr 2011 01:00:01
Message-Id: 2a537627704fc78d033912800dfbfa0c70d56a45.nirbheek@gentoo
1 commit: 2a537627704fc78d033912800dfbfa0c70d56a45
2 Author: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
3 AuthorDate: Mon Apr 4 15:03:55 2011 +0000
4 Commit: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
5 CommitDate: Mon Apr 4 15:47:44 2011 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=2a537627
7
8 x11-libs/vte: 0.27.90 → 0.28.0
9
10 * Use -r300 for gtk3 version, don't use -r200 for gtk2 version
11
12 ---
13 ...gets.patch => vte-0.28.0-fix-gdk-targets.patch} | 4 ++--
14 .../{vte-0.27.90.ebuild => vte-0.28.0-r300.ebuild} | 7 +++----
15 .../{vte-0.27.90-r200.ebuild => vte-0.28.0.ebuild} | 0
16 3 files changed, 5 insertions(+), 6 deletions(-)
17
18 diff --git a/x11-libs/vte/files/vte-0.27.90-fix-gdk-targets.patch b/x11-libs/vte/files/vte-0.28.0-fix-gdk-targets.patch
19 similarity index 94%
20 rename from x11-libs/vte/files/vte-0.27.90-fix-gdk-targets.patch
21 rename to x11-libs/vte/files/vte-0.28.0-fix-gdk-targets.patch
22 index 1590b81..412baa0 100644
23 --- a/x11-libs/vte/files/vte-0.27.90-fix-gdk-targets.patch
24 +++ b/x11-libs/vte/files/vte-0.28.0-fix-gdk-targets.patch
25 @@ -5,17 +5,17 @@ no longer works. So, sort of hack around it for now?
26 --- configure.in
27 +++ configure.in
28 @@ -53,6 +53,7 @@
29 - VTE_SEAL_CFLAGS=
30 GTK_API_VERSION=2.0
31 GTK_REQUIRED=2.20.0
32 + GLADE_API_VERSION=1.0
33 + GDK_TARGETS=$($PKG_CONFIG --variable target gdk-$GTK_API_VERSION)
34 ;;
35 3.0) VTE_API_VERSION=2.90
36 VTE_API_MAJOR_VERSION=2
37 @@ -62,6 +63,7 @@
38 - VTE_SEAL_CFLAGS="-DVTE_SEAL_ENABLE"
39 GTK_API_VERSION=3.0
40 GTK_REQUIRED=3.0.0
41 + GLADE_API_VERSION=2.0
42 + GDK_TARGETS=$($PKG_CONFIG --variable targets gdk-$GTK_API_VERSION)
43 ;;
44 esac
45
46 diff --git a/x11-libs/vte/vte-0.27.90.ebuild b/x11-libs/vte/vte-0.28.0-r300.ebuild
47 similarity index 87%
48 rename from x11-libs/vte/vte-0.27.90.ebuild
49 rename to x11-libs/vte/vte-0.28.0-r300.ebuild
50 index 14307b0..e6164b6 100644
51 --- a/x11-libs/vte/vte-0.27.90.ebuild
52 +++ b/x11-libs/vte/vte-0.28.0-r300.ebuild
53 @@ -13,7 +13,7 @@ HOMEPAGE="http://git.gnome.org/browse/vte"
54
55 LICENSE="LGPL-2"
56 SLOT="2.90"
57 -IUSE="debug doc +introspection"
58 +IUSE="debug doc glade +introspection"
59 if [[ ${PV} = 9999 ]]; then
60 inherit gnome2-live
61 KEYWORDS=""
62 @@ -41,20 +41,19 @@ DEPEND="${RDEPEND}
63 src_prepare() {
64 # Python bindings are via gobject-introspection
65 # Ex: from gi.repository import Vte
66 - # Glade is disabled because it needs gladeui-1.0 & gtk3 glade is gladeui-2.0
67 G2CONF="${G2CONF}
68 - --disable-glade-catalogue
69 --disable-gnome-pty-helper
70 --disable-deprecation
71 --disable-maintainer-mode
72 --disable-static
73 $(use_enable debug)
74 + $(use_enable glade glade-catalogue)
75 $(use_enable introspection)
76 --with-html-dir=${ROOT}/usr/share/doc/${PF}/html
77 --with-gtk=3.0"
78 DOCS="AUTHORS ChangeLog HACKING NEWS README"
79
80 - epatch "${FILESDIR}/${PN}-0.27.90-fix-gdk-targets.patch"
81 + epatch "${FILESDIR}/${P}-fix-gdk-targets.patch"
82
83 [[ ${PV} != 9999 ]] && eautoreconf
84
85
86 diff --git a/x11-libs/vte/vte-0.27.90-r200.ebuild b/x11-libs/vte/vte-0.28.0.ebuild
87 similarity index 100%
88 rename from x11-libs/vte/vte-0.27.90-r200.ebuild
89 rename to x11-libs/vte/vte-0.28.0.ebuild