Gentoo Archives: gentoo-commits

From: Mart Raudsepp <leio@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-terms/gnome-terminal/
Date: Tue, 09 Jan 2018 02:02:36
Message-Id: 1515437640.ea82df78be457f6edf44c565de6310a676a60092.leio@gentoo
1 commit: ea82df78be457f6edf44c565de6310a676a60092
2 Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
3 AuthorDate: Mon Jan 8 18:49:45 2018 +0000
4 Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
5 CommitDate: Mon Jan 8 18:54:00 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea82df78
7
8 x11-terms/gnome-terminal: remove some unnecessary USE requirements on dependencies
9
10 dev-libs/glib[dbus] just pulls in dconf at runtime, but we already have that
11 dependency here explicitly ourselves; no need to force a rebuild of glib just
12 for that then.
13
14 gtk+[X] is not required and a build against a pure-wayland gtk+ should work
15 just fine. The problem is that it won't grow X11 support after gtk+ is rebuilt
16 with USE=X and gnome-terminal not rebuilt. But it'll work fine, just have some
17 X11 specific extra cases or features disabled. Or it will break if USE=X is
18 initially there on gtk+, but later removed.
19 This is a global issue in gtk+[X,wayland] handling and we shouldn't disallow
20 pure wayland gnome-terminal builds in the meantime. Bug 624960 tracks the
21 global concerns.
22
23 Package-Manager: Portage-2.3.19, Repoman-2.3.6
24
25 x11-terms/gnome-terminal/gnome-terminal-3.24.2.ebuild | 8 ++++----
26 1 file changed, 4 insertions(+), 4 deletions(-)
27
28 diff --git a/x11-terms/gnome-terminal/gnome-terminal-3.24.2.ebuild b/x11-terms/gnome-terminal/gnome-terminal-3.24.2.ebuild
29 index 0a7b6da0999..934e903908d 100644
30 --- a/x11-terms/gnome-terminal/gnome-terminal-3.24.2.ebuild
31 +++ b/x11-terms/gnome-terminal/gnome-terminal-3.24.2.ebuild
32 @@ -1,4 +1,4 @@
33 -# Copyright 1999-2017 Gentoo Foundation
34 +# Copyright 1999-2018 Gentoo Foundation
35 # Distributed under the terms of the GNU General Public License v2
36
37 EAPI="6"
38 @@ -16,11 +16,11 @@ SRC_URI="${SRC_URI} !vanilla? ( https://dev.gentoo.org/~leio/distfiles/gnome-ter
39
40 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
41
42 -# FIXME: automagic dependency on gtk+[X], just transitive but needs proper control
43 +# FIXME: automagic dependency on gtk+[X], just transitive but needs proper control, bug 624960
44 # Needed vte in 3.24.2 is 0.48.2, but we add desktop notification patches in 0.48.3 that non-vanilla needs
45 RDEPEND="
46 - >=dev-libs/glib-2.42:2[dbus]
47 - >=x11-libs/gtk+-3.20:3[X]
48 + >=dev-libs/glib-2.42:2
49 + >=x11-libs/gtk+-3.20:3
50 >=x11-libs/vte-0.48.3:2.91[!vanilla?]
51 >=dev-libs/libpcre2-10
52 >=gnome-base/dconf-0.14