From 3b08f674e3f771b49370edb144dab0958c8cf721 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Tue, 31 Aug 2021 08:59:54 +0100
Subject: gentoo resync : 31.08.2021

---
 games-puzzle/xbomb/Manifest             |  2 +-
 games-puzzle/xbomb/xbomb-2.2b-r2.ebuild | 55 -------------------------------
 games-puzzle/xbomb/xbomb-2.2b-r3.ebuild | 57 +++++++++++++++++++++++++++++++++
 3 files changed, 58 insertions(+), 56 deletions(-)
 delete mode 100644 games-puzzle/xbomb/xbomb-2.2b-r2.ebuild
 create mode 100644 games-puzzle/xbomb/xbomb-2.2b-r3.ebuild

(limited to 'games-puzzle/xbomb')

diff --git a/games-puzzle/xbomb/Manifest b/games-puzzle/xbomb/Manifest
index b15051b58678..9b4a394e1926 100644
--- a/games-puzzle/xbomb/Manifest
+++ b/games-puzzle/xbomb/Manifest
@@ -1,5 +1,5 @@
 AUX xbomb-2.2b-DESTDIR.patch 706 BLAKE2B 257023ee9127df592b81c7e4cb24b2004cd1522f89766ac8a6ee094889567278f59b2c17faca7f00954fb5021762ebdd593fb0e253f54c2b83546e4b5f83c0e8 SHA512 be770c9dd42e7c802af60ebe019b359d12b74397956d32881504b20f8ad44994a3cf1dcd3e23fcf65642cbee1aa622ba2fff63ec223fce9faaef0c03ed4b1914
 AUX xbomb-2.2b-ldflags.patch 177 BLAKE2B b43eab3cf0fdbabce44b2ec6c2f47db947cb857e46620a4d4b5d2d30da07a0ee169e54403854f54a755e7569d37d9a43948ebf6bdb35611a0cbc8f415d2507dc SHA512 047f410f34505d4582969f071eb1982fd3bb38357ad228e61608ca9307118263f34d6a1b43832877ca2862e107018132bad3bf6e3df79b641d5466efb94a6d8c
 DIST xbomb-2.2b.tgz 24774 BLAKE2B 77a447af42ecd47654b826d884e7c31e98e0bdfb06d1574401064fe79dc42c961fc95a96dd6509871d78589e06eb54f975a292a5371c16520e125b75aae8b637 SHA512 7315cc08bff1ef14cc376ea3ad4913c4286e2e33e92ca1d924e4703fba2f58e5aa9df0db760cd0d9a83f2f1730cc65281403f5b198f32a30d0c5e736add8c2e1
-EBUILD xbomb-2.2b-r2.ebuild 1067 BLAKE2B 5c8da07f6598eb0e77798482a4fabe65260dcd284e70b032af0cb6cbfb59a68db1b686e2d2effa30fea8906ff2bd02504db26b0f3f1bf971655e56f53c5280e6 SHA512 64ac7055c889ab7de07425c30ad2567c2e90568165a0b854328c13b523f97a395ed9eb09dd9cb21e5ad25e8128f70478d57621de38136af3c4005c2a7eb7aa5b
+EBUILD xbomb-2.2b-r3.ebuild 1163 BLAKE2B 7e9772230e49bc203341255451152732c82e761305c20646dd327ff3ece27e16c2ae8b20d9e216924522f96ba50c01c2e2567faad6f8cfc04bff23e6294afc82 SHA512 8152d60709cc5cb970dc1d912b6b4f03a5828f4ecdea06ee6b9a69d089214e3f6671762cc53fa284eee31747c87f0e287451259f113e835087b99c2912af6daf
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/xbomb/xbomb-2.2b-r2.ebuild b/games-puzzle/xbomb/xbomb-2.2b-r2.ebuild
deleted file mode 100644
index d43f0aec54a7..000000000000
--- a/games-puzzle/xbomb/xbomb-2.2b-r2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop toolchain-funcs
-
-DESCRIPTION="Minesweeper clone with hexagonal, rectangular and triangular grid"
-HOMEPAGE="http://www.gedanken.org.uk/software/xbomb/"
-SRC_URI="http://www.gedanken.org.uk/software/xbomb/download/${P}.tgz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-
-DEPEND="x11-libs/libXaw"
-RDEPEND="
-	${DEPEND}
-	acct-group/gamestat
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-DESTDIR.patch
-	"${FILESDIR}"/${P}-ldflags.patch
-)
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e '/strip/d' \
-		-e '/^CC=/d' \
-		-e "/^CFLAGS/ { s:=.*:=${CFLAGS}: }" \
-		Makefile || die
-	sed -i \
-		-e "s:/var/tmp:/var/lib/${PN}:g" \
-		hiscore.c || die
-}
-
-src_configure() {
-	tc-export CC
-}
-
-src_install() {
-	default
-
-	dodir /var/lib/${PN}
-	touch "${ED}"/var/lib/${PN}/${PN}{3,4,6}.hi || die "touch failed"
-	fperms 660 /var/lib/${PN}/${PN}{3,4,6}.hi
-
-	fowners root:gamestat /var/lib/${PN} /usr/bin/${PN}
-	fperms g+s /usr/bin/${PN}
-
-	make_desktop_entry xbomb XBomb
-}
diff --git a/games-puzzle/xbomb/xbomb-2.2b-r3.ebuild b/games-puzzle/xbomb/xbomb-2.2b-r3.ebuild
new file mode 100644
index 000000000000..ac1174f80e21
--- /dev/null
+++ b/games-puzzle/xbomb/xbomb-2.2b-r3.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop toolchain-funcs
+
+DESCRIPTION="Minesweeper clone with hexagonal, rectangular and triangular grid"
+HOMEPAGE="http://www.gedanken.org.uk/software/xbomb/"
+SRC_URI="http://www.gedanken.org.uk/software/xbomb/download/${P}.tgz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+DEPEND="
+	acct-group/gamestat
+	x11-libs/libX11
+	x11-libs/libXaw
+	x11-libs/libXt
+"
+RDEPEND="
+	${DEPEND}
+	media-fonts/font-misc-misc
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-DESTDIR.patch
+	"${FILESDIR}"/${P}-ldflags.patch
+)
+
+src_prepare() {
+	default
+
+	sed -i -e '/strip/d' Makefile || die
+	sed -i \
+		-e "s:/var/tmp:${EPREFIX}/var/games/${PN}:g" \
+		hiscore.c || die
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
+}
+
+src_install() {
+	emake DESTDIR="${ED}" install
+	einstalldocs
+
+	dodir /var/games/${PN}
+	touch "${ED}"/var/games/${PN}/${PN}{3,4,6}.hi || die "touch failed"
+
+	fowners :gamestat /var/games/${PN}{,/${PN}{3,4,6}.hi} /usr/bin/${PN}
+	fperms 660 /var/games/${PN}/${PN}{3,4,6}.hi
+	fperms g+s /usr/bin/${PN}
+
+	make_desktop_entry xbomb XBomb
+}
-- 
cgit v1.2.3