From caee0cc22d76df22d05a2ec6ab3beb2afea88403 Mon Sep 17 00:00:00 2001
From: Ionen Wolkens <sudinave@gmail.com>
Date: Thu, 15 Apr 2021 19:46:05 -0400
Subject: games-board/xgammon: revbump for x11-terms/kterm collision fix

Like kterm, this too creates an unneeded symlink, removed to be safe
on top of blocker.

Bug: https://bugs.gentoo.org/668892
Signed-off-by: Ionen Wolkens <sudinave@gmail.com>
Signed-off-by: Sam James <sam@gentoo.org>
---
 games-board/xgammon/xgammon-0.98-r2.ebuild | 50 --------------------------
 games-board/xgammon/xgammon-0.98-r3.ebuild | 57 ++++++++++++++++++++++++++++++
 2 files changed, 57 insertions(+), 50 deletions(-)
 delete mode 100644 games-board/xgammon/xgammon-0.98-r2.ebuild
 create mode 100644 games-board/xgammon/xgammon-0.98-r3.ebuild

(limited to 'games-board')

diff --git a/games-board/xgammon/xgammon-0.98-r2.ebuild b/games-board/xgammon/xgammon-0.98-r2.ebuild
deleted file mode 100644
index f06e57934f4d..000000000000
--- a/games-board/xgammon/xgammon-0.98-r2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="very nice backgammon game for X"
-HOMEPAGE="http://fawn.unibw-hamburg.de/steuer/xgammon/xgammon.html"
-SRC_URI="http://fawn.unibw-hamburg.de/steuer/xgammon/Downloads/${P}a.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	x11-libs/libX11
-	x11-libs/libXaw
-	x11-libs/libXt"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	app-text/rman
-	>=x11-misc/imake-1.0.8-r1"
-
-S="${WORKDIR}/${P}a"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-broken.patch
-	"${FILESDIR}"/${P}-r2-config.patch
-	"${FILESDIR}"/${P}-glibc-2.32.patch
-	"${FILESDIR}"/${P}-fno-common.patch
-)
-
-src_configure() {
-	CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \
-		IMAKECPP="${IMAKECPP:-$(tc-getCPP)}" xmkmf || die
-}
-
-src_compile() {
-	env PATH=".:${PATH}" emake \
-		EXTRA_LDOPTIONS="${LDFLAGS}" \
-		CDEBUGFLAGS="${CFLAGS}" \
-		CC="$(tc-getCC)"
-}
-
-pkg_postinst() {
-	einfo "xgammon need helvetica fonts"
-	einfo "They can be loaded emerging media-fonts/font-adobe-100dpi"
-	einfo "or similar. Remember to restart X after loading fonts"
-}
diff --git a/games-board/xgammon/xgammon-0.98-r3.ebuild b/games-board/xgammon/xgammon-0.98-r3.ebuild
new file mode 100644
index 000000000000..6b1305059c62
--- /dev/null
+++ b/games-board/xgammon/xgammon-0.98-r3.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="very nice backgammon game for X"
+HOMEPAGE="http://fawn.unibw-hamburg.de/steuer/xgammon/xgammon.html"
+SRC_URI="http://fawn.unibw-hamburg.de/steuer/xgammon/Downloads/${P}a.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	x11-libs/libX11
+	x11-libs/libXaw
+	x11-libs/libXt
+	!<x11-terms/kterm-6.2.0-r7"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-text/rman
+	>=x11-misc/imake-1.0.8-r1"
+
+S="${WORKDIR}/${P}a"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-broken.patch
+	"${FILESDIR}"/${P}-r2-config.patch
+	"${FILESDIR}"/${P}-glibc-2.32.patch
+	"${FILESDIR}"/${P}-fno-common.patch
+)
+
+src_configure() {
+	CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \
+		IMAKECPP="${IMAKECPP:-$(tc-getCPP)}" xmkmf || die
+}
+
+src_compile() {
+	env PATH=".:${PATH}" emake \
+		EXTRA_LDOPTIONS="${LDFLAGS}" \
+		CDEBUGFLAGS="${CFLAGS}" \
+		CC="$(tc-getCC)"
+}
+
+src_install() {
+	default
+	# remove link to avoid collision (bug #668892)
+	rm "${ED}"/usr/$(get_libdir)/X11/app-defaults || die
+}
+
+pkg_postinst() {
+	einfo "xgammon need helvetica fonts"
+	einfo "They can be loaded emerging media-fonts/font-adobe-100dpi"
+	einfo "or similar. Remember to restart X after loading fonts"
+}
-- 
cgit v1.2.3-65-gdbad