diff options
| author |   Ionen Wolkens <sudinave@gmail.com> | 2021-04-15 18:42:15 -0400 |
|---|---|---|
| committer |   Sam James <sam@gentoo.org> | 2021-04-16 04:46:55 +0000 |
| commit | 2b541fdfe5df85dc7b55270d658404e53ffc735d (patch) | |
| tree | 141ea5fe4889daeec0c89bd8a2eea5c9dc7d0a64 /x11-terms/kterm | |
| parent | games-board/xgammon: revbump for x11-terms/kterm collision fix (diff) | |
| download | gentoo-2b541fdfe5df85dc7b55270d658404e53ffc735d.tar.gz gentoo-2b541fdfe5df85dc7b55270d658404e53ffc735d.tar.bz2 gentoo-2b541fdfe5df85dc7b55270d658404e53ffc735d.zip | |
x11-terms/kterm: revbump to fix the collision fix
Fix pre-existed to avoid collisions with games-board/xscrabble and
games-board/xgammon but didn't check for right libdir.
New revisions are able to coexist.
Closes: https://bugs.gentoo.org/668892
Closes: https://bugs.gentoo.org/706322
Signed-off-by: Ionen Wolkens <sudinave@gmail.com>
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'x11-terms/kterm')
| -rw-r--r-- | x11-terms/kterm/kterm-6.2.0-r7.ebuild (renamed from x11-terms/kterm/kterm-6.2.0-r6.ebuild) | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/x11-terms/kterm/kterm-6.2.0-r6.ebuild b/x11-terms/kterm/kterm-6.2.0-r7.ebuild index 008593f28790..7d3887865794 100644 --- a/x11-terms/kterm/kterm-6.2.0-r6.ebuild +++ b/x11-terms/kterm/kterm-6.2.0-r7.ebuild @@ -23,7 +23,9 @@ RDEPEND="app-text/rman x11-libs/libXmu x11-libs/libXpm x11-libs/libxkbfile - Xaw3d? ( x11-libs/libXaw3d )" + Xaw3d? ( x11-libs/libXaw3d ) + !<games-board/xgammon-0.98-r3 + !<games-board/xscrabble-2.10-r4" DEPEND="${RDEPEND} virtual/pkgconfig x11-misc/gccmakedep @@ -71,8 +73,8 @@ src_install() { iconv -f ISO-2022-JP -t UTF-8 ${PN}.jman > ${PN}.ja.1 doman ${PN}.ja.1 - # Remove link to avoid collision - rm -f "${ED}"/usr/lib/X11/app-defaults + # remove link to avoid collision (bug #668892,706322) + rm "${ED}"/usr/$(get_libdir)/X11/app-defaults || die } pkg_postinst() { |