commit: 2b541fdfe5df85dc7b55270d658404e53ffc735d Author: Ionen Wolkens <sudinave <AT> gmail <DOT> com> AuthorDate: Thu Apr 15 22:42:15 2021 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri Apr 16 04:46:55 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b541fdf
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 <AT> gmail.com> Signed-off-by: Sam James <sam <AT> gentoo.org> x11-terms/kterm/{kterm-6.2.0-r6.ebuild => kterm-6.2.0-r7.ebuild} | 8 +++++--- 1 file 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 similarity index 90% rename from x11-terms/kterm/kterm-6.2.0-r6.ebuild rename to x11-terms/kterm/kterm-6.2.0-r7.ebuild index 008593f2879..7d388786579 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() {
