games-arcade/rocksndiamonds: Bump to 4.1.4.1

Closes: https://bugs.gentoo.org/697902
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Pacho Ramos <pacho@gentoo.org>

3 files changed, 131 insertions, 0 deletions

diff --git a/games-arcade/rocksndiamonds/Manifest b/games-arcade/rocksndiamonds/Manifest
index e43385063a14..986c5800f4ca 100644
--- a/games-arcade/rocksndiamonds/Manifest
+++ b/games-arcade/rocksndiamonds/Manifest
@@ -1,11 +1,18 @@
 DIST BD2K3-1.0.0.zip 4715324 BLAKE2B 72e25038c41a7a1c29a896459db97954d18731d6980f5096c28ebddb09c0b6d7bdb68a8c56f17d26c71085e4ae883d2ceaad8e95b5525cbf532d18f32ecdd638 SHA512 80f172584d2077a3ade0749790802ef9cecde75283d6b889e7d2fedf9b55fd1fd7f1f1fd5596b17d5b2a542172699a929ea626086e77d28fde11487440c43622
 DIST Boulder_Dash_Dream-1.0.0.zip 10923437 BLAKE2B 976156c763281b993550a08361c5b6279a471e24568205c0369cc3f57d99e97db84d914a560c909b30fe92b8c8c10931cf6a8a8de4da181edac410a770d922b7 SHA512 f2765f52653b4f9d6c4a6548076281f6749d08c2dfd220345bdc0058b94d51c49ef81acdc87ff71bc1b3f337f3cc6a1d08b9e5a02d6aaeaeac5d894f97ba3d8e
 DIST Contributions-1.2.0.zip 9499312 BLAKE2B a90a84d230ab1032819bc3821871eb027ed83a8e289b01692f80185c42d50429ca8c6928b72b1ae5ea102ba2a0d25cd25391dc53b0cdb37ef4504233292dc2da SHA512 463e629bd4f592e24a82d20f1f249cea9e266a7c370bb5b079add8daa125d1af69a69746b696dd92f89b90e50972c6b2ba007aab87beed4cd980c0c7bdb81920
+DIST Emerald_Mine_Club-2.1.1.7z 20992125 BLAKE2B deb8e60058ead5e6b8df2c58f5c88da5fc9c1282a7f4a4c85c8e35f3f5c25fefe552d6440401093403cf2b0967c7a39cd1ec9c5926fa780aa6b224ed6bfe7804 SHA512 b45ca6c9163c28b0d000d783cd8a66fccd23a8c4ad2c7200366c6900fc31284d50a55171a12272d8bf117f135fb68810ac3f28e8708b9e47a98dbf0f53dd3d21
+DIST RS_MIX_01-needs_rnd_jue.zip 288339 BLAKE2B 08d08e934af95543d2027805d91f5c8b2806c2da74a8cdfed61afe26be5696a832cbac7e7aae30a314a2414b7d5a82b53b8556f7098c6570a54a26d751785347 SHA512 546fc50d089493a41f01895f16a7e96e664a472d61b1f92ebc391006c10142b493a55854d892019b0ff19fe318b4b67f78c137d7e1466c5fa4d49fbb521d7a48
 DIST Snake_Bite-1.0.0.zip 6506066 BLAKE2B 852f7815939100f78d6a7ce27df565277f6467cc63c069f77d4e067f0144df092c3b6e73a64d0a9743033d90b20d390761046b253c188fd65873f7b28bf8b451 SHA512 82131cb68c9654cb49ddbb46b0c15f13ce98af4f3b2a46e1cc4f2980eea45a707297c74787f365996321f39a9f7656a9492c3d437e3da0d71a295447c868960e
 DIST Sokoban-1.0.0.zip 295339 BLAKE2B e263e311e58dcc21d11dd10b0fa7af0f871405d932c2e1ea6d580ec58098c6a498202b516cbd3d2f1dd795521b419de61c8c9a195f4b2ea781a35ac645cd9c59 SHA512 b63be5b00c4c0b153bb6fc45fde556c26cd49fa672b279cce2f61b572d9c056d5e10a565530bdf539024d75ffdd38efe68310e98b8f810d9c5dfc17b24ec376b
+DIST Supaplex-2.0.0.zip 13023727 BLAKE2B 0ea4077d66af893e5f42d8857138e4c926c02d6f75642b5a316c4e606d4c3dfb0655c71530a4becfcc6c536727b908122d413fe37cd8f3b094b629f27f31a3d9 SHA512 75641f603499bce062b74657ac1718b7009eed1159504088807ed77600f07b76775d986859e03e2e1bc0693c58850ed94711e1def74eb73a8c92fcc517de5886
+DIST Zelda-1.0.0.zip 2175860 BLAKE2B 8c44e67a0e04a992675c1f14acd07c2537873adc1f38f495dd6b12f45eb67962164664a24128ba3abfd602f59eedf9407be8a45800a5aa2e5086473a9b1b403d SHA512 930235aa784cb8304af811144c1c33cd92f5cfda1e744ea04836e9d817223c09dfcd7be6d4d66a050bd50474f7c3e5547f69c166124df288e596f486eeeb426e
+DIST ZeldaII-1.0.0.zip 11542241 BLAKE2B abe6a8407148478e3ea8a4a9561ffef2a7e193419b65877aeb5844700d6a15d83387140195567029f356a4ead331eff6c6575d074fa522b099f6810519111287 SHA512 9e7fb213251e790b2415745c5a4de671902439abff0d90b8cbb9cfaf90b01b7bb124f8c95360516f93100ccec66d2cddbcefb7a05dfb395b74854568c74c186e
 DIST rnd-contrib-1.0.0.tar.gz 3389242 BLAKE2B bcdc926a7164788c8c640bf1aced57fbe9d71d99332751d2c4e30460427cb09a30ee3e45f2e6b6a1d83cce9bdf4c92ab187a2385a57bdc2a893735bd19c64b9b SHA512 8bd82f9c34e6e2d2b7ea22fc5899e72a64587469bfb1336d0d33e6ee2bcd04b3b6adca958861b0e29e18e8dac74651c642126511cacb247072e367783a5c6a08
 DIST rnd_jue-v8.tar.bz2 17244645 BLAKE2B 92d0cf646296b065c9ebe54d8d5ecb831eeb49748e47b6d2f019c2fd359d1e6ef5d3cd0472f1247e5c41b6b5aa7154b9e3baae000defc83b24470163a9dfc416 SHA512 cbff4cd16c812d77fe8446da4016d8f75dfa8675298a745062ff53a7783a39a59cffd886fedf1097023e72e111f10ddd56f280a109058a1a8ee069d664d2c59c
 DIST rockslevels-dx-1.0.tar.gz 211151 BLAKE2B 637a600f9197925d82e7ef344c90f04e8508c6b114fd07ad00977d91a856ff85dc29207e5f22c659382ee0759f8607e9dc8ad0c0de3826d57b74d494320b57ad SHA512 2e1bc4484a76bf638e8ce285972b20b6377e0483abb2475e2343d48de1f84ee102f430049d685b89bc1087e0f20b9b6e29370f8e6cae66b480d3650be9991f44
 DIST rockslevels-emc-1.0.tar.gz 3824268 BLAKE2B 0feadd5d9c6225c8574576281d07e14ff98fc9a33c67d3fa5083219ce39daaa1902a5ed652b5379fa4e58ee2428a8a452d66520571206143fd0fcd54f71b977a SHA512 9abad888fa00bc305444367c5ab8ffdad95eaca22613573e44d5ecd93b1a9a1cbc931497c064002d90fd3174c4661d0b009ede7746b2fe8da0a00072303a1301
 DIST rockslevels-sp-1.0.tar.gz 373564 BLAKE2B 3f724ea55bbdaae80a35d6a9f5d8751a9228862fbe1ba45419343b1968510e10d3c82cc01844e35bc35561e65df3bc7e5ec2a0b807e1f56359dc7dccc16e3cb0 SHA512 2d44e9238a72846b9d4fbab90288aa3b23af4957ffe0d42d95c523fd22f3587572864b3fc0b277894d2f3f56d6eff52ea009e5b2d59aebc34163a1067662d729
 DIST rocksndiamonds-4.1.0.0.tar.gz 3850621 BLAKE2B 9c85aced223b855eec0300634d2fb30513d8b2d1856d8e134594f7de1669cf64f487a87335e28f7b8abb0c13492573ac5bd3261cfc5274287e75d0ace258ab93 SHA512 4949c2e9a601c8e005b006b13b82e36f7f001321051d392bc34aa4c234c6cddfa9fae16e58d83070072cac1429e13f1fb96d2c4b2ecd35a309065ca3c1c869c2
+DIST rocksndiamonds-4.1.4.1.tar.gz 3982860 BLAKE2B c19baf38f77c9b9eaaf7c57e9b43d4862a0ff677d99753d6520b9e4746f6340d7f3a2cf8d3e6b692230bf49289cc2aef29d7a846d2d1e0ad162e55f6433634a2 SHA512 eb66dd0fcc162c522384b1c2fb7b380a6a460a4078dd0ffb5f16a63c3faa4a502d9a9a6e3505becd8ab4c188c0eb5edd32db45412c881ab90d6a9d05e5ed6d4b
+DIST rocksndiamonds.png 2021 BLAKE2B 795be09e6d60aaa66dd457f6ce7dcb0069a82e395cb54578b83ad49ba70b669aa5bd52a4da34979d1e0ba95413a499c13355ce6816c4e364d9d88d1988c88060 SHA512 026abfef17bfc8621d036b83a8a4a878b1d68615e69975ea37589e8d29d864dc42dbabc5a381e579c66be1053175df02209f2c1c1feff3bd9e29db3e09c40346
diff --git a/games-arcade/rocksndiamonds/files/rocksndiamonds-4.1.4.1-gcc10.patch b/games-arcade/rocksndiamonds/files/rocksndiamonds-4.1.4.1-gcc10.patch
new file mode 100644
index 000000000000..08edb4236e37
--- /dev/null
+++ b/games-arcade/rocksndiamonds/files/rocksndiamonds-4.1.4.1-gcc10.patch
@@ -0,0 +1,21 @@
+diff -up rocksndiamonds-4.1.4.1/src/main.c.gcc10 rocksndiamonds-4.1.4.1/src/main.c
+--- rocksndiamonds-4.1.4.1/src/main.c.gcc10	2019-05-20 15:24:46.000000000 -0400
++++ rocksndiamonds-4.1.4.1/src/main.c	2020-01-31 05:56:37.154931291 -0500
+@@ -67,7 +67,7 @@ short			ExplodeDelay[MAX_LEV_FIELDX][MAX
+ int			RunnerVisit[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
+ int			PlayerVisit[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
+ 
+-int			GfxFrame[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
++// int			GfxFrame[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
+ int 			GfxRandom[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
+ int 			GfxElement[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
+ int			GfxAction[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
+@@ -132,7 +132,7 @@ struct LevelInfo	level, level_template;
+ struct PlayerInfo	stored_player[MAX_PLAYERS], *local_player = NULL;
+ struct HiScore		highscore[MAX_SCORE_ENTRIES];
+ struct TapeInfo		tape;
+-struct SetupInfo	setup;
++// struct SetupInfo	setup;
+ struct GameInfo		game;
+ struct GlobalInfo	global;
+ struct BorderInfo	border;
diff --git a/games-arcade/rocksndiamonds/rocksndiamonds-4.1.4.1.ebuild b/games-arcade/rocksndiamonds/rocksndiamonds-4.1.4.1.ebuild
new file mode 100644
index 000000000000..33c5d476c83d
--- /dev/null
+++ b/games-arcade/rocksndiamonds/rocksndiamonds-4.1.4.1.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit desktop flag-o-matic
+
+DESCRIPTION="A Boulderdash clone"
+HOMEPAGE="https://www.artsoft.org/rocksndiamonds/"
+SRC_URI="https://www.artsoft.org/RELEASES/unix/rocksndiamonds/${P}.tar.gz
+	https://upload.wikimedia.org/wikipedia/commons/e/e2/Rocks%27n%27Diamonds.png -> ${PN}.png
+	https://www.artsoft.org/RELEASES/rocksndiamonds/levels/Contributions-1.2.0.zip
+	https://www.artsoft.org/RELEASES/rocksndiamonds/levels/BD2K3-1.0.0.zip
+	https://www.artsoft.org/RELEASES/rocksndiamonds/levels/Boulder_Dash_Dream-1.0.0.zip
+	https://www.artsoft.org/RELEASES/rocksndiamonds/levels/rnd-contrib-1.0.0.tar.gz
+	https://www.artsoft.org/RELEASES/rocksndiamonds/levels/Snake_Bite-1.0.0.zip
+	https://www.artsoft.org/RELEASES/rocksndiamonds/levels/Sokoban-1.0.0.zip
+	https://www.artsoft.org/RELEASES/unix/rocksndiamonds/levels/rockslevels-emc-1.0.tar.gz
+	https://www.artsoft.org/RELEASES/unix/rocksndiamonds/levels/rockslevels-sp-1.0.tar.gz
+	https://www.artsoft.org/RELEASES/unix/rocksndiamonds/levels/rockslevels-dx-1.0.tar.gz
+	mirror://gentoo/rnd_jue-v8.tar.bz2
+	https://www.artsoft.org/RELEASES/rocksndiamonds/levels/Zelda-1.0.0.zip
+	https://www.artsoft.org/RELEASES/rocksndiamonds/levels/ZeldaII-1.0.0.zip
+	https://www.artsoft.org/RELEASES/rocksndiamonds/levels/Emerald_Mine_Club-2.1.1.7z
+	https://www.artsoft.org/RELEASES/rocksndiamonds/levels/RS_MIX_01-needs_rnd_jue.zip
+	https://www.artsoft.org/RELEASES/rocksndiamonds/levels/Supaplex-2.0.0.zip
+"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	media-libs/libsdl2[joystick,video]
+	media-libs/sdl2-mixer[mod,mp3,timidity]
+	media-libs/sdl2-net
+	media-libs/sdl2-image[gif]
+	media-libs/smpeg
+"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+"
+
+PATCHES=(
+	# From Fedora:
+	"${FILESDIR}"/${PN}-4.1.0.0-YN.patch
+	"${FILESDIR}"/${PN}-4.1.0.0-music-info-url.patch
+	"${FILESDIR}"/${PN}-4.1.0.0-CVE-2011-4606.patch
+	"${FILESDIR}"/${PN}-4.1.4.1-gcc10.patch
+)
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	cd "${S}"
+	unpack \
+		rockslevels-emc-1.0.tar.gz \
+		rockslevels-sp-1.0.tar.gz \
+		rockslevels-dx-1.0.tar.gz
+	cd levels
+	unpack \
+		rnd_jue-v8.tar.bz2 \
+		BD2K3-1.0.0.zip \
+		rnd-contrib-1.0.0.tar.gz \
+		Snake_Bite-1.0.0.zip \
+		Contributions-1.2.0.zip \
+		Boulder_Dash_Dream-1.0.0.zip \
+		Sokoban-1.0.0.zip \
+		Zelda-1.0.0.zip \
+		ZeldaII-1.0.0.zip \
+		Emerald_Mine_Club-2.1.1.7z \
+		RS_MIX_01-needs_rnd_jue.zip \
+		Supaplex-2.0.0.zip
+}
+
+src_prepare() {
+	default
+	sed -i \
+		-e 's:\$(MAKE_CMD):$(MAKE) -C $(SRC_DIR):' \
+		-e '/^MAKE/d' \
+		-e '/^CC/d' \
+		Makefile || die
+
+	sed -i \
+		-e '/^LDFLAGS/s/=/+=/' \
+		src/Makefile || die
+}
+
+src_compile() {
+	replace-cpu-flags k6 k6-1 k6-2 i586
+
+	local makeopts="RO_GAME_DIR=/usr/share/${PN} RW_GAME_DIR=/usr/share/${PN}"
+	emake -j1 clean
+	emake ${makeopts} OPTIONS="${CFLAGS}" sdl2
+}
+
+src_install() {
+	dobin rocksndiamonds
+	insinto "/usr/share/${PN}"
+	doins -r docs graphics levels music sounds
+
+	einstalldocs
+	doicon "${DISTDIR}/${PN}.png"
+	make_desktop_entry rocksndiamonds "Rocks 'N' Diamonds" /usr/share/pixmaps/${PN}.png
+}