Gentoo Archives: gentoo-commits

From: Matt Turner <mattst88@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/
Date: Sun, 01 Apr 2018 22:27:55
Message-Id: 1522621659.3260e5ad5c5fcc7ddd9f3da9d414c0b55ec42b8d.mattst88@gentoo
1 commit: 3260e5ad5c5fcc7ddd9f3da9d414c0b55ec42b8d
2 Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
3 AuthorDate: Sun Apr 1 22:25:30 2018 +0000
4 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
5 CommitDate: Sun Apr 1 22:27:39 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3260e5ad
7
8 sci-geosciences/grass: Clean up X11 dependencies
9
10 Xaw, Xmu, Xpm, and Xp are unused. Also switch to depending on xorg-proto
11 directly while we're here.
12
13 Closes: https://bugs.gentoo.org/649096
14
15 .../grass/{grass-7.2.0.ebuild => grass-7.2.0-r1.ebuild} | 9 ++-------
16 1 file changed, 2 insertions(+), 7 deletions(-)
17
18 diff --git a/sci-geosciences/grass/grass-7.2.0.ebuild b/sci-geosciences/grass/grass-7.2.0-r1.ebuild
19 similarity index 97%
20 rename from sci-geosciences/grass/grass-7.2.0.ebuild
21 rename to sci-geosciences/grass/grass-7.2.0-r1.ebuild
22 index f62fa1a2565..be625fa853d 100644
23 --- a/sci-geosciences/grass/grass-7.2.0.ebuild
24 +++ b/sci-geosciences/grass/grass-7.2.0-r1.ebuild
25 @@ -1,4 +1,4 @@
26 -# Copyright 1999-2017 Gentoo Foundation
27 +# Copyright 1999-2018 Gentoo Foundation
28 # Distributed under the terms of the GNU General Public License v2
29
30 EAPI=6
31 @@ -56,11 +56,7 @@ RDEPEND="${PYTHON_DEPS}
32 x11-libs/libICE
33 x11-libs/libSM
34 x11-libs/libX11
35 - x11-libs/libXaw
36 x11-libs/libXext
37 - x11-libs/libXmu
38 - x11-libs/libXp
39 - x11-libs/libXpm
40 x11-libs/libXt
41 )"
42
43 @@ -71,8 +67,7 @@ DEPEND="${RDEPEND}
44 sys-devel/bison
45 X? (
46 dev-lang/swig
47 - x11-proto/xextproto
48 - x11-proto/xproto
49 + x11-base/xorg-proto
50 )"
51
52 S="${WORKDIR}/${MY_P}"