Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: games-board/xgammon/
Date: Fri, 16 Apr 2021 04:47:40
Message-Id: 1618548414.caee0cc22d76df22d05a2ec6ab3beb2afea88403.sam@gentoo
1 commit: caee0cc22d76df22d05a2ec6ab3beb2afea88403
2 Author: Ionen Wolkens <sudinave <AT> gmail <DOT> com>
3 AuthorDate: Thu Apr 15 23:46:05 2021 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Fri Apr 16 04:46:54 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=caee0cc2
7
8 games-board/xgammon: revbump for x11-terms/kterm collision fix
9
10 Like kterm, this too creates an unneeded symlink, removed to be safe
11 on top of blocker.
12
13 Bug: https://bugs.gentoo.org/668892
14 Signed-off-by: Ionen Wolkens <sudinave <AT> gmail.com>
15 Signed-off-by: Sam James <sam <AT> gentoo.org>
16
17 .../xgammon/{xgammon-0.98-r2.ebuild => xgammon-0.98-r3.ebuild} | 9 ++++++++-
18 1 file changed, 8 insertions(+), 1 deletion(-)
19
20 diff --git a/games-board/xgammon/xgammon-0.98-r2.ebuild b/games-board/xgammon/xgammon-0.98-r3.ebuild
21 similarity index 86%
22 rename from games-board/xgammon/xgammon-0.98-r2.ebuild
23 rename to games-board/xgammon/xgammon-0.98-r3.ebuild
24 index f06e57934f4..6b1305059c6 100644
25 --- a/games-board/xgammon/xgammon-0.98-r2.ebuild
26 +++ b/games-board/xgammon/xgammon-0.98-r3.ebuild
27 @@ -16,7 +16,8 @@ KEYWORDS="~amd64 ~x86"
28 RDEPEND="
29 x11-libs/libX11
30 x11-libs/libXaw
31 - x11-libs/libXt"
32 + x11-libs/libXt
33 + !<x11-terms/kterm-6.2.0-r7"
34 DEPEND="${RDEPEND}"
35 BDEPEND="
36 app-text/rman
37 @@ -43,6 +44,12 @@ src_compile() {
38 CC="$(tc-getCC)"
39 }
40
41 +src_install() {
42 + default
43 + # remove link to avoid collision (bug #668892)
44 + rm "${ED}"/usr/$(get_libdir)/X11/app-defaults || die
45 +}
46 +
47 pkg_postinst() {
48 einfo "xgammon need helvetica fonts"
49 einfo "They can be loaded emerging media-fonts/font-adobe-100dpi"