gentoo resync : 28.04.2021

4 files changed, 67 insertions, 59 deletions

diff --git a/games-arcade/xjump/Manifest b/games-arcade/xjump/Manifest
index f6c3f609b8c9..9c08b5b08fdd 100644
--- a/games-arcade/xjump/Manifest
+++ b/games-arcade/xjump/Manifest
@@ -1,5 +1,5 @@
-AUX xjump-2.7.5-ldflags.patch 407 BLAKE2B d4a09bcb067facb9066156cfe2d5c4ec533492ab5e74d802c5976efa176c75c83e52077333b53dd741f2718f92b78d869b04c8994a5a171a01e3a3d1773a6b0f SHA512 8c21088e09053906c20f13027832d1cd0778c6707b6764a93c6cc5de904a2aa80a80ac5fa8372885889beca82f4cbb8c637ca0c186f05e54d441d2f15957b6af
+AUX xjump-2.7.5-ldflags.patch 335 BLAKE2B 53685cae49b253939a1f3e1172295294e1552918b86a6559f2a955d0fedcafd316de94b614a0298ee1313d2b1583437985285f026ec8d228afb0652ccc08e47a SHA512 e5fa4970475a5e00c42b11da05dfb18579080dd1d0c9e18e7077c709dbcab5e45322a636a6f12885248dcc771cbf615b4bcbe1fe99d3119f2da6b422cfef27c4
 DIST xjump_2.7.5-6.1.debian.tar.gz 9803 BLAKE2B 0a51a579aec18c71561f32d1f6321c383c8137dbe3923f3afdf00100f1c47ec062e2200a04a3281f32124f5fe72094abb6a1fc6a86de00c4886d872a21fe9a79 SHA512 c4962acd25c4cabef37acd3b5d39867a955f2fa769cc203fb00edfe37f37ce25369099b589a282189847e7bffeb874b4eaf8deea9320a9083da7e95425625cf8
 DIST xjump_2.7.5.orig.tar.gz 15940 BLAKE2B 9a022f9c6f522d8977268cd00709cc7a8aed9cf6ead042d1c75c0c0e7c011a1898690fa74e957198c5916806da4cc3d80d7d235342e7e41a33c2086553b91075 SHA512 6ce846d6681bf8b084edc06f8415a57f66d1778ec9af8b9b170f4f37292a8172b3507a08c85032a5b8588b50a7f2eefe205add4c779edd7c7ef8fb6d818d9300
-EBUILD xjump-2.7.5.ebuild 1261 BLAKE2B f39333b853d5a18ba79a37b42bba83bebb0a831dc6318b4bb67ccadd10d2167fe1c23b5a2b943c8348f5715ab810796044fddd1e25b34fc393ec36be6384159c SHA512 158dd39465505255b641684aa7769687f06569957a872d4c5db2da6094e424669a95cfd1967b952488f77fdb256c11b1bc7ed7a58e6c70eed6bac5d5e06f13d2
+EBUILD xjump-2.7.5-r1.ebuild 1445 BLAKE2B 581d4cb8d6b0f516c4dd94dfbc7bbf6303e6fe8120915075af34699fe4eddc60c03fb092fc5d0d37ca5936b740aa837ef3ff4c4490cd093ec4a8116ab96eb35d SHA512 661f55276b3bd10fa119205009dff1b44eb0618dc900904e48a9c9dfbd6ca208611dc4ab18b5faf352cdf2c15b965c07bceeeeceb803c8ee149f62a2e1448542
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-arcade/xjump/files/xjump-2.7.5-ldflags.patch b/games-arcade/xjump/files/xjump-2.7.5-ldflags.patch
index a30736811318..7cff45c60653 100644
--- a/games-arcade/xjump/files/xjump-2.7.5-ldflags.patch
+++ b/games-arcade/xjump/files/xjump-2.7.5-ldflags.patch
@@ -1,5 +1,5 @@
---- Makefile.old	2010-10-01 07:05:03.000000000 +0200
-+++ Makefile	2010-10-01 07:05:39.000000000 +0200
+--- a/Makefile
++++ b/Makefile
 @@ -28,7 +28,7 @@
  ##########################################################
  
diff --git a/games-arcade/xjump/xjump-2.7.5-r1.ebuild b/games-arcade/xjump/xjump-2.7.5-r1.ebuild
new file mode 100644
index 000000000000..5e3328386b46
--- /dev/null
+++ b/games-arcade/xjump/xjump-2.7.5-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DEBIAN_PATCH="6.1"
+DESCRIPTION="An X game where one tries to jump up as many levels as possible"
+HOMEPAGE="http://packages.debian.org/stable/games/xjump"
+SRC_URI="mirror://debian/pool/main/x/${PN}/${PN}_${PV}.orig.tar.gz
+	mirror://debian/pool/main/x/${PN}/${PN}_${PV}-${DEBIAN_PATCH}.debian.tar.gz"
+S="${WORKDIR}"/${P}.orig
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXaw
+	x11-libs/libXpm
+	x11-libs/libXt"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+
+RDEPEND+=" acct-group/gamestat"
+
+PATCHES=(
+	"${WORKDIR}"/debian/patches/01_overflow.patch
+	"${WORKDIR}"/debian/patches/02_fix_repeat.patch
+	"${WORKDIR}"/debian/patches/03_source_warnings.patch
+	"${WORKDIR}"/debian/patches/04_makefile_respect_cflags.patch
+	"${WORKDIR}"/debian/patches/05_unneded_deps.patch
+	"${FILESDIR}"/${P}-ldflags.patch
+)
+
+src_prepare() {
+	default
+
+	# set up where we will keep the highscores file:
+	sed -i \
+		-e "/^CC/d" \
+		-e "/^CFLAGS/d" \
+		-e "s,/record,/xjump.hiscores," \
+		Makefile || die
+}
+
+src_configure() {
+	tc-export CC
+}
+
+src_install() {
+	dobin xjump
+	dodoc README.euc
+
+	# Set up the hiscores file
+	dodir /var/games/${PN}
+	touch "${ED}"/var/games/${PN}/xjump.hiscores || die
+
+	fperms -R 660 /var/games/${PN}
+	fowners -R root:gamestat /var/games/${PN}
+	fperms g+s /usr/bin/xjump
+}
diff --git a/games-arcade/xjump/xjump-2.7.5.ebuild b/games-arcade/xjump/xjump-2.7.5.ebuild
deleted file mode 100644
index 58d403ffe1bd..000000000000
--- a/games-arcade/xjump/xjump-2.7.5.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils games
-
-DEBIAN_PATCH="6.1"
-DESCRIPTION="An X game where one tries to jump up as many levels as possible"
-HOMEPAGE="http://packages.debian.org/stable/games/xjump"
-SRC_URI="mirror://debian/pool/main/x/${PN}/${PN}_${PV}.orig.tar.gz
-	mirror://debian/pool/main/x/${PN}/${PN}_${PV}-${DEBIAN_PATCH}.debian.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXaw
-	x11-libs/libXpm
-	x11-libs/libXt"
-
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-S=${WORKDIR}/${P}.orig
-
-src_prepare() {
-	# Where we will keep the highscore file:
-	HISCORE_FILENAME=xjump.hiscores
-	HISCORE_FILE="${GAMES_STATEDIR}/${HISCORE_FILENAME}"
-
-	epatch \
-		"${WORKDIR}"/debian/patches/0*.patch \
-		"${FILESDIR}"/${P}-ldflags.patch
-
-	# set up where we will keep the highscores file:
-	sed -i \
-		-e "/^CC/d" \
-		-e "/^CFLAGS/d" \
-		-e "s,/var/games/xjump,${GAMES_STATEDIR}," \
-		-e "s,/record,/${HISCORE_FILENAME}," \
-		Makefile || die
-}
-
-src_install() {
-	dogamesbin xjump
-	dodoc README.euc
-
-	# Set up the hiscores file:
-	dodir "${GAMES_STATEDIR}"
-	touch "${D}/${HISCORE_FILE}"
-	fperms 660 "${HISCORE_FILE}"
-	prepgamesdirs
-}