gentoo resync : 15.06.2021

6 files changed, 52 insertions, 124 deletions

diff --git a/games-arcade/rockdodger/Manifest b/games-arcade/rockdodger/Manifest
index 64ee27853eb9..7b3ccf631abb 100644
--- a/games-arcade/rockdodger/Manifest
+++ b/games-arcade/rockdodger/Manifest
@@ -1,6 +1,3 @@
-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-r2.ebuild 1527 BLAKE2B 0e3ad21b32f6dbd4348fd5194ee8f75210c89160121e3707371440e058bc4531d379c720f8e9ad7f8ef6ddd3fc38cb7550672eed80fb760d476ed37d2fe9f90a SHA512 94b714f014a078476e96acbe1c3c1dd3c6554e280d8cfd1b9a7974cab025cb85466e600346b9d19dcf77e0a44c0b614bba41b38f5f2009cb1872e824825c9e85
+DIST rockdodger-1.1.4.tar.gz 1026184 BLAKE2B 08885155508adb878908d3cf9201c98cffded37dea051cb9a668ddb63891a19369648964f3f19d94b72a08626d3d1dea73686b190898d8b59c3b91805e08677c SHA512 542a8b5b1a9dc7fc8e61d3183c14c3f45952614f2e00f71383dfd42ddcf275cbc14520797d4555f2f19f354a4f1819d8527a587598c9dbc06a75b21643a8b019
+EBUILD rockdodger-1.1.4.ebuild 1076 BLAKE2B 335e2e5ff5bdeca9221db80fc0325dd00263357f3e02c9b7717fa741a761b4e0d13f8e65e614a2d3ed45219d9424b19bbab0ce01786bec3fcc720bbd09032959 SHA512 f50aef0f20961129aee897d1c90c40da12f6ab013c20fbb0bd0597cef8bb9e3b240ff1546ea41673ea31442dcae0fc3e41801536ecaaa6e570e219d6b4420d14
 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
deleted file mode 100644
index b7af24f160a7..000000000000
--- a/games-arcade/rockdodger/files/0.6.0a-sec.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/main.c
-+++ b/main.c
-@@ -459,7 +459,7 @@ FILE *hs_fopen(char *mode) {/*{{{*/
-     else {
- 	char s[1024];
- 	umask(0177);
--	sprintf(s,"%s/.rockdodger_high",getenv("HOME"));
-+	snprintf(s,1024,"%s/.rockdodger_high",getenv("HOME"));
- 	if (f=fopen(s,mode)) {
- 	    umask(mask);
- 	    return f;
-@@ -478,7 +478,7 @@ void read_high_score_table() {/*{{{*/
- 	for (i=0; i<8; i++) {
- 	    char s[1024];
- 	    int highscore;
--	    if (fscanf (f, "%d %[^\n]", &highscore, s)!=2)
-+	    if (fscanf (f, "%d %1023[^\n]", &highscore, s)!=2)
- 		break;
- 	    if (high[i].allocated)
- 		free(high[i].name);
diff --git a/games-arcade/rockdodger/files/rockdodger-0.6.0a-gcc41.patch b/games-arcade/rockdodger/files/rockdodger-0.6.0a-gcc41.patch
deleted file mode 100644
index f69797520975..000000000000
--- a/games-arcade/rockdodger/files/rockdodger-0.6.0a-gcc41.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/main.c
-+++ b/main.c
-@@ -206,7 +206,6 @@
- struct bangdots bdot[MAX_BANG_DOTS], *bdotptr=bdot;
- struct spacedot sdot[MAX_SPACE_DOTS];
- 
--struct greeble greeb[MAX_GREEBLES];
- struct greeble {
-     int active;
-     float x,y; // When landed, these represent an offset from the host rock
-@@ -214,6 +213,7 @@
-     int landed;
-     int boredom; // Goes up while landed
- };
-+struct greeble greeb[MAX_GREEBLES];
- // }}}
- 
- void init_greeblies() {
diff --git a/games-arcade/rockdodger/files/rockdodger-0.6.0a-underlink.patch b/games-arcade/rockdodger/files/rockdodger-0.6.0a-underlink.patch
deleted file mode 100644
index 3ee7d9c5cc75..000000000000
--- a/games-arcade/rockdodger/files/rockdodger-0.6.0a-underlink.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -27,7 +27,7 @@
- #SOUNDLIBRARIES=
- SOUNDLIBRARIES=-lSDL_mixer
- 
--LIBRARIES=`sdl-config --libs` -lSDL_image $(SOUNDLIBRARIES)
-+LIBRARIES=`sdl-config --libs` -lSDL_image $(SOUNDLIBRARIES) -lm
- 
- all:	$(EXENAME)
- 
diff --git a/games-arcade/rockdodger/rockdodger-0.6.0a-r2.ebuild b/games-arcade/rockdodger/rockdodger-0.6.0a-r2.ebuild
deleted file mode 100644
index d446d78f27b8..000000000000
--- a/games-arcade/rockdodger/rockdodger-0.6.0a-r2.ebuild
+++ /dev/null
@@ -1,70 +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="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}
-}
diff --git a/games-arcade/rockdodger/rockdodger-1.1.4.ebuild b/games-arcade/rockdodger/rockdodger-1.1.4.ebuild
new file mode 100644
index 000000000000..6f4a73b078fd
--- /dev/null
+++ b/games-arcade/rockdodger/rockdodger-1.1.4.ebuild
@@ -0,0 +1,50 @@
+# 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="https://bitbucket.org/rpkrawczyk/rockdodger"
+SRC_URI="https://bitbucket.org/rpkrawczyk/rockdodger/downloads/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	acct-group/gamestat
+	media-libs/libsdl[joystick,sound,video]
+	media-libs/sdl-image[png]
+	media-libs/sdl-mixer[mod,wav]"
+DEPEND="${DEPEND}"
+
+src_compile() {
+	tc-export CC
+
+	local emakeargs=(
+		prefix="${EPREFIX}"/usr
+		gamesdir="${EPREFIX}"/var/games/${PN}
+		MOREOPTS="${CFLAGS} ${CPPFLAGS}"
+	)
+	emake "${emakeargs[@]}"
+}
+
+src_install() {
+	dobin ${PN}
+	doman ${PN}.6
+
+	insinto /usr/share/${PN}
+	doins -r data/.
+
+	newicon ${PN}.icon.64x64.xpm ${PN}.xpm
+	domenu ${PN}.desktop
+
+	dodir /var/games/${PN}
+	touch "${ED}"/var/games/${PN}/${PN}.scores || die
+
+	fowners -R :gamestat /{usr/bin,var/games}/${PN}
+	fperms 660 /var/games/${PN}/${PN}.scores
+	fperms g+s /usr/bin/${PN}
+}