gentoo resync : 28.04.2021

6 files changed, 80 insertions, 67 deletions

diff --git a/games-arcade/rockdodger/Manifest b/games-arcade/rockdodger/Manifest
index 40851b3fa969..64ee27853eb9 100644
--- a/games-arcade/rockdodger/Manifest
+++ b/games-arcade/rockdodger/Manifest
@@ -1,6 +1,6 @@
-AUX 0.6.0a-sec.patch 660 BLAKE2B ff9277217038b07e9ec4d8df3c09b024761d507881c080616218397a56a30088a1b99494b26ee1d054b80881ed5c9b30aca7fa44fe0210a96f94f14ec5b3a82e SHA512 aed20b03bac5e717a8eaad580b8f5580b26a862cc43ce0e7d5a6d4dcccc1d447ef2efedf333c94b52fa2782018375aa06c57861e6742efe8a8bf70c57b4f2c9a
-AUX rockdodger-0.6.0a-gcc41.patch 516 BLAKE2B 4ed4ab15db86db0e22ce52174d576d9d8e1997142d8f02eb02b6d89f9612ca70cb77d3fa4f97c190837ad954a02e2cc858822313aeb57ac3cc3b4186e1c40293 SHA512 83dee968da1ae24514ffeb5a8aafb8bb9c1c4c94ed54ff2b2dc3dac3084948b88fae21b834918d8514d04ec8c027602540b5e62b72017048e3dcb6e970be5df3
-AUX rockdodger-0.6.0a-underlink.patch 315 BLAKE2B bacc643f6955230cb590f8d87626f3ad2dfa6f31acaec0a8d313ad86082089e9784edaddeab76828a71a522cc758893da0dd65313890d3e9281ab5243fbac79b SHA512 96613eb9716845e3cd4ae164b30063871a3f199d468f4b0f909fe8d7829a3e9649022ee9a93ee20190e522ce8df1d6ba1d09b8977c7600ee378c408e54584aff
+AUX 0.6.0a-sec.patch 588 BLAKE2B 1c6d4217d1a0cde1372549b1dc7e8dacc80c2caced3852a62b924086f4d7c5ce5dd698dc96058f1244a8ab2e82af9d4f31af4db1d609186af7581479bd57434b SHA512 8b9e3efce020a25f35efe277e45e9e7a234260c377fc7ef6feb90be25b3551c5cc74d726fefddac229c90fb6ee1730c98bc641a01c3d7a17ca69bf91d271edfb
+AUX rockdodger-0.6.0a-gcc41.patch 444 BLAKE2B 3418458d34d1b26c62d36327f9b53256e580a6ca7ee77d0cd6a16457aae244a9c5cdd262432506e4b1f843a12e28d72bec4a6e8946980eb6f93d5d6d9ff88900 SHA512 1fc4591c0bc3242a5760bf345c41c1f6f475f5e87e49df58697b91afcdd418864be896d9a674edeb9c38207f4a9b2ed3e2c73cb5d6dae225a7e016a3e4c7ab59
+AUX rockdodger-0.6.0a-underlink.patch 243 BLAKE2B 58e061e45bdb39a7bc23a81270ddafef284234b8ea32e4ad65f08fb6fcc51332dddf4f58480d9981467dd34668fa323fbf625917ea8d3531c857925ee9a54546 SHA512 681f925988471efd34a5a78f7eb8dc916e4fef30d11e2f89f9d14eda4639c3be407d843058aa503dcd6e5e8aad09fb288d6eafb16aac32df0601e2d6d9989ec5
 DIST rockdodger-0.6.0a.tar.gz 410223 BLAKE2B 5ccda4400468d6a7209adfdad3045773bf31581e34dfb77bff7d314ca9d9fa18e6c5a24996259782c002cf8ea611f92388c9ca46be4e0c7492a526421e8e8163 SHA512 d517cc844df21e8772b13d0226841a64bede0cc2f5461fb83d313f49cd99192dcf6af4597e3d1f3e1c60f578437e355ce665e0288415da803a503fb12d8462eb
-EBUILD rockdodger-0.6.0a-r1.ebuild 1434 BLAKE2B a9bb1041a631c6792105d9f2ef411750028fc43d83025350b9ef1e712740d501e5c60d994f4fbb8b2ce000c72d014e8ec4d7ff062b18fb819361191a34c9b369 SHA512 9c2eaea20734b306ade47774cb2a4e1955ea6fc4b92dc930a7e68052bf63089da2b0c3350aa3c7bf3340011461aea0dbea6b598606ff25d14ce508fe7fec5a0b
+EBUILD rockdodger-0.6.0a-r2.ebuild 1527 BLAKE2B 0e3ad21b32f6dbd4348fd5194ee8f75210c89160121e3707371440e058bc4531d379c720f8e9ad7f8ef6ddd3fc38cb7550672eed80fb760d476ed37d2fe9f90a SHA512 94b714f014a078476e96acbe1c3c1dd3c6554e280d8cfd1b9a7974cab025cb85466e600346b9d19dcf77e0a44c0b614bba41b38f5f2009cb1872e824825c9e85
 MISC metadata.xml 333 BLAKE2B 86aa43a28193b28b46fa52ba9a898a26a8f53b43e1c927062d29f34f8bdf952355ed6a333b0336278fce760dd5506588e103e96f7ef9449e0be26c72b6fe446a SHA512 fa4831b21647e72987ac3b956d81b5efc4308004c76213a046bd026a9939687b5f98c633a1f39d693a502f9557248e9810ba7301334cb3e82c9570e29efd6a6c
diff --git a/games-arcade/rockdodger/files/0.6.0a-sec.patch b/games-arcade/rockdodger/files/0.6.0a-sec.patch
index e870cf2d2974..b7af24f160a7 100644
--- a/games-arcade/rockdodger/files/0.6.0a-sec.patch
+++ b/games-arcade/rockdodger/files/0.6.0a-sec.patch
@@ -1,5 +1,5 @@
---- main.c.old	2002-11-17 23:56:12.000000000 +0100
-+++ main.c	2004-10-29 22:32:00.000000000 +0200
+--- a/main.c
++++ b/main.c
 @@ -459,7 +459,7 @@ FILE *hs_fopen(char *mode) {/*{{{*/
      else {
  	char s[1024];
diff --git a/games-arcade/rockdodger/files/rockdodger-0.6.0a-gcc41.patch b/games-arcade/rockdodger/files/rockdodger-0.6.0a-gcc41.patch
index 59e01bba17c3..f69797520975 100644
--- a/games-arcade/rockdodger/files/rockdodger-0.6.0a-gcc41.patch
+++ b/games-arcade/rockdodger/files/rockdodger-0.6.0a-gcc41.patch
@@ -1,5 +1,5 @@
---- main.c.old	2006-04-24 16:16:13.000000000 +0200
-+++ main.c	2006-04-24 16:16:21.000000000 +0200
+--- a/main.c
++++ b/main.c
 @@ -206,7 +206,6 @@
  struct bangdots bdot[MAX_BANG_DOTS], *bdotptr=bdot;
  struct spacedot sdot[MAX_SPACE_DOTS];
diff --git a/games-arcade/rockdodger/files/rockdodger-0.6.0a-underlink.patch b/games-arcade/rockdodger/files/rockdodger-0.6.0a-underlink.patch
index 87cd8453476c..3ee7d9c5cc75 100644
--- a/games-arcade/rockdodger/files/rockdodger-0.6.0a-underlink.patch
+++ b/games-arcade/rockdodger/files/rockdodger-0.6.0a-underlink.patch
@@ -1,5 +1,5 @@
---- Makefile.old	2011-06-20 21:25:56.788323912 +0200
-+++ Makefile	2011-06-20 21:26:11.970287694 +0200
+--- a/Makefile
++++ b/Makefile
 @@ -27,7 +27,7 @@
  #SOUNDLIBRARIES=
  SOUNDLIBRARIES=-lSDL_mixer
diff --git a/games-arcade/rockdodger/rockdodger-0.6.0a-r1.ebuild b/games-arcade/rockdodger/rockdodger-0.6.0a-r1.ebuild
deleted file mode 100644
index 5e0cd21a6857..000000000000
--- a/games-arcade/rockdodger/rockdodger-0.6.0a-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils games
-
-DESCRIPTION="Dodge the rocks for as long as possible until you die"
-HOMEPAGE="http://spacerocks.sourceforge.net/"
-SRC_URI="mirror://sourceforge/spacerocks/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="media-libs/libsdl[sound,video]
-	media-libs/sdl-image[png]
-	media-libs/sdl-mixer"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	# Modify highscores & data directory and add our CFLAGS to the Makefile
-	sed -i \
-		-e "s:\./data:${GAMES_DATADIR}/${PN}:" \
-		-e "s:/usr/share/rockdodger/\.highscore:${GAMES_STATEDIR}/rockdodger.scores:" \
-		-e 's:umask(0111):umask(0117):' main.c \
-		|| die " sed main.c failed"
-	sed -i \
-		-e "s:-g:${CFLAGS}:" \
-		-e 's:cc:$(CC):' \
-		-e '/-o/s:\$+:$(LDFLAGS) $+:' \
-		Makefile \
-		|| die "sed Makefile failed"
-
-	# The 512 chunksize makes the music skip
-	sed -i \
-		-e "s:512:1024:" sound.c \
-			|| die "sed sound.c failed"
-	epatch \
-		"${FILESDIR}"/${PV}-sec.patch \
-		"${FILESDIR}"/${P}-gcc41.patch \
-		"${FILESDIR}"/${P}-underlink.patch
-}
-
-src_install() {
-	dogamesbin ${PN}
-	insinto "${GAMES_DATADIR}"/${PN}
-	doins data/*
-
-	newicon spacerocks.xpm ${PN}.xpm
-	make_desktop_entry ${PN} "Rock Dodger" ${PN}
-
-	dodir "${GAMES_STATEDIR}"
-	touch "${D}/${GAMES_STATEDIR}"/${PN}.scores
-	fperms 660 "${GAMES_STATEDIR}"/${PN}.scores
-	prepgamesdirs
-}
diff --git a/games-arcade/rockdodger/rockdodger-0.6.0a-r2.ebuild b/games-arcade/rockdodger/rockdodger-0.6.0a-r2.ebuild
new file mode 100644
index 000000000000..d446d78f27b8
--- /dev/null
+++ b/games-arcade/rockdodger/rockdodger-0.6.0a-r2.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop toolchain-funcs
+
+DESCRIPTION="Dodge the rocks for as long as possible until you die"
+HOMEPAGE="http://spacerocks.sourceforge.net/"
+SRC_URI="mirror://sourceforge/spacerocks/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	media-libs/libsdl[sound,video]
+	media-libs/sdl-image[png]
+	media-libs/sdl-mixer
+"
+RDEPEND="
+	${DEPEND}
+	acct-group/gamestat
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PV}-sec.patch
+	"${FILESDIR}"/${P}-gcc41.patch
+	"${FILESDIR}"/${P}-underlink.patch
+)
+
+src_prepare() {
+	default
+
+	# Modify highscores & data directory and add our CFLAGS to the Makefile
+	sed -i \
+		-e "s:\./data:/var/games/${PN}:" \
+		-e "s:/usr/share/rockdodger/\.highscore:/var/games/${PN}/rockdodger.scores:" \
+		-e 's:umask(0111):umask(0117):' \
+		main.c || die " sed main.c failed"
+
+	sed -i \
+		-e "s:-g:${CFLAGS}:" \
+		-e 's:cc:${CC}:' \
+		-e '/-o/s:\$+:$(LDFLAGS) $+:' \
+		Makefile || die "sed Makefile failed"
+
+	# The 512 chunksize makes the music skip
+	sed -i -e "s:512:1024:" sound.c || die "sed sound.c failed"
+}
+
+src_configure() {
+	tc-export CC
+}
+
+src_install() {
+	dobin ${PN}
+	insinto /usr/share/${PN}
+	doins data/*
+
+	newicon spacerocks.xpm ${PN}.xpm
+	make_desktop_entry ${PN} "Rock Dodger" ${PN}
+
+	dodir /var/games/${PN}
+	touch "${ED}"/var/games/${PN}/${PN}.scores || die
+
+	fperms 660 /var/games/${PN}/${PN}.scores
+	fowners -R root:gamestat /var/games/${PN}
+	fperms g+s /usr/bin/${PN}
+}