commit: 00155ab8b13bb0f24fc2c2e1b9b1903ea207983a
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 19 06:42:42 2022 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Mon Dec 19 07:11:35 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00155ab8
games-arcade/rocksndiamonds: drop 4.1.4.1
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
games-arcade/rocksndiamonds/Manifest | 2 -
.../files/rocksndiamonds-4.1.0.0-YN.patch | 22 -----
.../rocksndiamonds-4.1.0.0-music-info-url.patch | 71 --------------
.../files/rocksndiamonds-4.1.4.1-gcc10.patch | 21 -----
.../rocksndiamonds/rocksndiamonds-4.1.4.1.ebuild | 104 ---------------------
5 files changed, 220 deletions(-)
diff --git a/games-arcade/rocksndiamonds/Manifest
b/games-arcade/rocksndiamonds/Manifest
index f258d895cc94..027ab971641f 100644
--- a/games-arcade/rocksndiamonds/Manifest
+++ b/games-arcade/rocksndiamonds/Manifest
@@ -2,7 +2,6 @@ DIST Andreas_Buschbeck-1.0.0.zip 18331338 BLAKE2B
b6520ab10ce62d4bec804a2a7e1c49
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 Emerald_Mine_Club-3.1.3.7z 45669526 BLAKE2B
8cc44ba75c67bf2b53b042b07b9cf160f42155559137a873676fff773757760c0d5084b6646e2a1127bd4454beb16e4d5a8ec263c7db36cb782cf0655bba3e8d
SHA512
bb4eb28515d01b9bc8fd3a542a017091e7e27ab5a043c3fad128f8ea4deb0ec14edbc026cccc28a6c6d998a882e5bcfef9a7dcb59d478459f49b654f7ea6b9be
DIST RS_MIX_01-needs_rnd_jue.zip 288339 BLAKE2B
08d08e934af95543d2027805d91f5c8b2806c2da74a8cdfed61afe26be5696a832cbac7e7aae30a314a2414b7d5a82b53b8556f7098c6570a54a26d751785347
SHA512
546fc50d089493a41f01895f16a7e96e664a472d61b1f92ebc391006c10142b493a55854d892019b0ff19fe318b4b67f78c137d7e1466c5fa4d49fbb521d7a48
DIST RS_MIX_01-standalone.zip 17982550 BLAKE2B
829055ec48c5de31b8bb0edc3eb5dc8f60001e1cbfa7cd85706e635b2389fd800d22fbe657ceac64c0e3cc7725dbfef23d518d53df1cc35bf8a2aa25ece7cac6
SHA512
1ea070017f80c47c9eff29b644e30b0ae4d5eb78e11dfef10fd183aad7b8af981af74728883f9d223d63b24361a7c5449a68558d142a0f391d102f14f22ceaa5
@@ -18,7 +17,6 @@ DIST rnd_jue-v8.tar.bz2 17244645 BLAKE2B
92d0cf646296b065c9ebe54d8d5ecb831eeb497
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.4.1.tar.gz 3982860 BLAKE2B
c19baf38f77c9b9eaaf7c57e9b43d4862a0ff677d99753d6520b9e4746f6340d7f3a2cf8d3e6b692230bf49289cc2aef29d7a846d2d1e0ad162e55f6433634a2
SHA512
eb66dd0fcc162c522384b1c2fb7b380a6a460a4078dd0ffb5f16a63c3faa4a502d9a9a6e3505becd8ab4c188c0eb5edd32db45412c881ab90d6a9d05e5ed6d4b
DIST rocksndiamonds-4.3.2.1.tar.gz 4415020 BLAKE2B
2886891dcc32b71a61b83717941d56348ae8a330d7a5e2dfde1675ebd2c6f44ebbd365d6396d0099a9f9f7968f280036c5735499a7e9d9b94796671f37561a93
SHA512
c0f53e9664895ba5e749d417843ba8e4a4b481e7ac8729e12f2714264e24b72dc5acba5019ca2bd30064406dd8d7d6a26505d35c1e5636898862d7c8df99808f
DIST rocksndiamonds-distributable-music.tar.bz2 4957282 BLAKE2B
e00ccc1a06977289ffe79c010512b4a9a5c79d5a0fdff750e17f888f09395dd8a20ce06c5f1f7cc034d22e9651bad54beff1fa4e3dac854e77bbc57353d98bdd
SHA512
dd220e4506492e66742796d0c359bce24691f5ebfba092aa2c2b52c5582ae9d5a38aa558872c738eeb7619b8ca853d3affa6b0e4af0fda5621bf7e07441ff252
DIST rocksndiamonds.png 2021 BLAKE2B
795be09e6d60aaa66dd457f6ce7dcb0069a82e395cb54578b83ad49ba70b669aa5bd52a4da34979d1e0ba95413a499c13355ce6816c4e364d9d88d1988c88060
SHA512
026abfef17bfc8621d036b83a8a4a878b1d68615e69975ea37589e8d29d864dc42dbabc5a381e579c66be1053175df02209f2c1c1feff3bd9e29db3e09c40346
diff --git a/games-arcade/rocksndiamonds/files/rocksndiamonds-4.1.0.0-YN.patch
b/games-arcade/rocksndiamonds/files/rocksndiamonds-4.1.0.0-YN.patch
deleted file mode 100644
index 70c95bd076dc..000000000000
--- a/games-arcade/rocksndiamonds/files/rocksndiamonds-4.1.0.0-YN.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -up rocksndiamonds-4.0.0.1/src/tools.c.yesno
rocksndiamonds-4.0.0.1/src/tools.c
---- rocksndiamonds-4.0.0.1/src/tools.c.yesno 2017-01-12 07:47:09.921343574
-0500
-+++ rocksndiamonds-4.0.0.1/src/tools.c 2017-01-12 07:51:45.059649653 -0500
-@@ -3901,6 +3901,18 @@ static int RequestHandleEvents(unsigned
- result = 0;
- break;
-
-+ case KSYM_y:
-+ case KSYM_Y:
-+ if (req_state & REQ_ASK)
-+ result = TRUE;
-+ break;
-+
-+ case KSYM_n:
-+ case KSYM_N:
-+ if (req_state & REQ_ASK)
-+ result = FALSE;
-+ break;
-+
- default:
- HandleKeysDebug(key);
- break;
diff --git
a/games-arcade/rocksndiamonds/files/rocksndiamonds-4.1.0.0-music-info-url.patch
b/games-arcade/rocksndiamonds/files/rocksndiamonds-4.1.0.0-music-info-url.patch
deleted file mode 100644
index f913be382e94..000000000000
---
a/games-arcade/rocksndiamonds/files/rocksndiamonds-4.1.0.0-music-info-url.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-diff -up rocksndiamonds-4.1.0.0/src/files.c.url
rocksndiamonds-4.1.0.0/src/files.c
---- rocksndiamonds-4.1.0.0/src/files.c.url 2018-04-10 15:44:08.000000000
-0400
-+++ rocksndiamonds-4.1.0.0/src/files.c 2018-04-17 16:30:19.726734512 -0400
-@@ -10127,11 +10127,13 @@ static struct MusicFileInfo *get_music_f
- { "artist_header", &tmp_music_file_info.artist_header },
- { "album_header", &tmp_music_file_info.album_header },
- { "year_header", &tmp_music_file_info.year_header },
-+ { "url_header", &tmp_music_file_info.url_header },
-
- { "title", &tmp_music_file_info.title },
- { "artist", &tmp_music_file_info.artist },
- { "album", &tmp_music_file_info.album },
- { "year", &tmp_music_file_info.year },
-+ { "url", &tmp_music_file_info.url },
-
- { NULL, NULL },
- };
-@@ -10247,11 +10249,13 @@ void LoadMusicInfo()
- checked_free(music_file_info->artist_header);
- checked_free(music_file_info->album_header);
- checked_free(music_file_info->year_header);
-+ checked_free(music_file_info->url_header);
-
- checked_free(music_file_info->title);
- checked_free(music_file_info->artist);
- checked_free(music_file_info->album);
- checked_free(music_file_info->year);
-+ checked_free(music_file_info->url);
-
- free(music_file_info);
-
-diff -up rocksndiamonds-4.1.0.0/src/main.h.url
rocksndiamonds-4.1.0.0/src/main.h
---- rocksndiamonds-4.1.0.0/src/main.h.url 2018-04-10 15:44:08.000000000
-0400
-+++ rocksndiamonds-4.1.0.0/src/main.h 2018-04-17 16:30:19.727734490 -0400
-@@ -3463,11 +3463,13 @@ struct MusicFileInfo
- char *artist_header;
- char *album_header;
- char *year_header;
-+ char *url_header;
-
- char *title;
- char *artist;
- char *album;
- char *year;
-+ char *url;
-
- int music;
-
-diff -up rocksndiamonds-4.1.0.0/src/screens.c.url
rocksndiamonds-4.1.0.0/src/screens.c
---- rocksndiamonds-4.1.0.0/src/screens.c.url 2018-04-17 16:30:19.728734467
-0400
-+++ rocksndiamonds-4.1.0.0/src/screens.c 2018-04-17 16:34:00.653803869
-0400
-@@ -3060,6 +3060,19 @@ void HandleInfoScreen_Music(int button)
- ystart += ystep_head;
- }
-
-+ if (!strEqual(list->url, UNKNOWN_NAME))
-+ {
-+ if (!strEqual(list->url_header, UNKNOWN_NAME))
-+ DrawTextSCentered(ystart, font_head, list->url_header);
-+ else
-+ DrawTextSCentered(ystart, font_head, "from the website");
-+
-+ ystart += ystep_head;
-+
-+ DrawTextFCentered(ystart, font_text, "%s", list->url);
-+ ystart += ystep_head;
-+ }
-+
- DrawTextSCentered(ybottom, FONT_TEXT_4,
- "Press any key or button for next page");
-
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
deleted file mode 100644
index 08edb4236e37..000000000000
--- a/games-arcade/rocksndiamonds/files/rocksndiamonds-4.1.4.1-gcc10.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-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
deleted file mode 100644
index 37f602b5fc75..000000000000
--- a/games-arcade/rocksndiamonds/rocksndiamonds-4.1.4.1.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# 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/p7zip
- 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
-}
