commit: bf446f642ce3b94b224b7d281c7c350f37317e71
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 24 10:41:25 2024 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Tue Dec 24 10:41:25 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf446f64
games-arcade/rocksndiamonds: drop 4.3.6.0
Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>
games-arcade/rocksndiamonds/Manifest | 1 -
.../rocksndiamonds-4.3.2.0-music-info-url.patch | 71 -------------
.../rocksndiamonds/rocksndiamonds-4.3.6.0.ebuild | 117 ---------------------
3 files changed, 189 deletions(-)
diff --git a/games-arcade/rocksndiamonds/Manifest
b/games-arcade/rocksndiamonds/Manifest
index 67c4049e07dc..f5417d17475a 100644
--- a/games-arcade/rocksndiamonds/Manifest
+++ b/games-arcade/rocksndiamonds/Manifest
@@ -17,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.3.6.0-linux.tar.gz 4655278 BLAKE2B
29f6976119f2af3f3807f783d199e5ef3a34d1799718d66ff166420838c9352a559ec156d767e2731ca3c6b387f4254f6640938a1ba560444e79186a4878adf0
SHA512
db74d74b89b9ab307d2979eb11e8192a74bd3ef4edb0987c59ce839410a01322a0c0384c009603a370443ce6ce96e3d5e0a82b14002bad62a4a965bd40aefeac
DIST rocksndiamonds-4.3.8.2-linux.tar.gz 4666115 BLAKE2B
7c25db6a41544b53fc3f2b16ec3ab77c5407c5d5c6fecf5f69d2a853b7142a2d5e444df37a526b8400c6fdc93b96680073d38aaa9e5adfcc783841263740a12c
SHA512
3a722d55ce157d52b287ae833941dbd5b5ee45eb6ab277fdcd9e4838426cd27736b8a5c0a17b64d60a2f84d72b02fd7b983b6cc763bd9ea84be62e64fbdde8e9
DIST rocksndiamonds-4.4.0.0-linux.tar.gz 5314473 BLAKE2B
561deda75d608142cb143a4a7041a599d28f21614fbe2fc14ebb0e62e6da9aece680dcbe7346f3a5d35a0d9a550a425a6d32be3f76a91703ce1930eed53af0b8
SHA512
06e5f89863b7e0ee8b3d7f8831c2dfacd39adcb1de0c7f7c7946c33bd49556e73f7f5af47a7e9d88fb96f2d551296ffc4323e72e2ab1af6cfc10ed15e21664b7
DIST rocksndiamonds-distributable-music.tar.bz2 4957282 BLAKE2B
e00ccc1a06977289ffe79c010512b4a9a5c79d5a0fdff750e17f888f09395dd8a20ce06c5f1f7cc034d22e9651bad54beff1fa4e3dac854e77bbc57353d98bdd
SHA512
dd220e4506492e66742796d0c359bce24691f5ebfba092aa2c2b52c5582ae9d5a38aa558872c738eeb7619b8ca853d3affa6b0e4af0fda5621bf7e07441ff252
diff --git
a/games-arcade/rocksndiamonds/files/rocksndiamonds-4.3.2.0-music-info-url.patch
b/games-arcade/rocksndiamonds/files/rocksndiamonds-4.3.2.0-music-info-url.patch
deleted file mode 100644
index 6dc46277a1b2..000000000000
---
a/games-arcade/rocksndiamonds/files/rocksndiamonds-4.3.2.0-music-info-url.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-diff -up rocksndiamonds-4.3.2.0/src/files.c.url
rocksndiamonds-4.3.2.0/src/files.c
---- rocksndiamonds-4.3.2.0/src/files.c.url 2022-04-16 19:22:44.000000000
-0400
-+++ rocksndiamonds-4.3.2.0/src/files.c 2022-04-26 10:32:33.995238563 -0400
-@@ -12674,11 +12674,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 },
- };
-@@ -12794,11 +12796,13 @@ void LoadMusicInfo(void)
- 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.3.2.0/src/main.h.url
rocksndiamonds-4.3.2.0/src/main.h
---- rocksndiamonds-4.3.2.0/src/main.h.url 2022-04-16 19:22:44.000000000
-0400
-+++ rocksndiamonds-4.3.2.0/src/main.h 2022-04-26 10:32:33.995238563 -0400
-@@ -3710,11 +3710,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.3.2.0/src/screens.c.url
rocksndiamonds-4.3.2.0/src/screens.c
---- rocksndiamonds-4.3.2.0/src/screens.c.url 2022-04-26 10:32:33.996238568
-0400
-+++ rocksndiamonds-4.3.2.0/src/screens.c 2022-04-26 10:34:29.617828672
-0400
-@@ -3392,6 +3392,19 @@ void HandleInfoScreen_Music(int dx, int
- 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_foot, TEXT_NEXT_PAGE);
-
- if (button != MB_MENU_INITIALIZE)
diff --git a/games-arcade/rocksndiamonds/rocksndiamonds-4.3.6.0.ebuild
b/games-arcade/rocksndiamonds/rocksndiamonds-4.3.6.0.ebuild
deleted file mode 100644
index b5c59ce9daab..000000000000
--- a/games-arcade/rocksndiamonds/rocksndiamonds-4.3.6.0.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit desktop flag-o-matic unpacker
-
-DESCRIPTION="A Boulderdash clone"
-HOMEPAGE="https://www.artsoft.org/rocksndiamonds/";
-# rocksndiamonds-distributable-music.tar.bz2 from Fedora
-SRC_URI="https://www.artsoft.org/RELEASES/unix/rocksndiamonds/${P}-linux.tar.gz
-
https://dev.gentoo.org/~pacho/${PN}/rocksndiamonds-distributable-music.tar.bz2
-
https://upload.wikimedia.org/wikipedia/commons/e/e2/Rocks%27n%27Diamonds.png ->
${PN}.png
-
https://www.artsoft.org/RELEASES/rocksndiamonds/levels/Andreas_Buschbeck-1.0.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/Contributions-1.2.0.zip
-
https://www.artsoft.org/RELEASES/rocksndiamonds/levels/Emerald_Mine_Club-3.1.3.7z
-
https://www.artsoft.org/RELEASES/rocksndiamonds/levels/RS_MIX_01-needs_rnd_jue.zip
-
https://www.artsoft.org/RELEASES/rocksndiamonds/levels/RS_MIX_01-standalone.zip
-
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/rocksndiamonds/levels/Supaplex-2.0.0.zip
- 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/rnd-contrib-1.0.0.tar.gz
-
https://www.artsoft.org/RELEASES/unix/rocksndiamonds/levels/rockslevels-dx-1.0.tar.gz
-
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
- mirror://gentoo/rnd_jue-v8.tar.bz2
-
https://www.artsoft.org/rocksndiamonds/levels/jamiecullen/zips/wg_v1-0.zip
-
https://www.artsoft.org/rocksndiamonds/levels/jamiecullen/zips/wf_v1-3.zip
-
https://www.artsoft.org/rocksndiamonds/levels/jamiecullen/zips/ese_v1-1.zip
-
https://www.artsoft.org/rocksndiamonds/levels/jamiecullen/zips/es_b_v1-2.zip
-
https://www.artsoft.org/rocksndiamonds/levels/jamiecullen/zips/ww_v1-0.zip
-"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
- media-libs/libmodplug
- 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}"
-BDEPEND="$(unpacker_src_uri_depends)"
-
-PATCHES=(
- # From Fedora:
- "${FILESDIR}"/${PN}-4.3.2.0-music-info-url.patch
- "${FILESDIR}"/${PN}-4.1.0.0-CVE-2011-4606.patch
-)
-
-src_unpack() {
- unpack ${P}-linux.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
- unpacker \
- Andreas_Buschbeck-1.0.0.zip \
- 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-3.1.3.7z \
- RS_MIX_01-needs_rnd_jue.zip \
- RS_MIX_01-standalone.zip \
- Supaplex-2.0.0.zip \
- wg_v1-0.zip \
- wf_v1-3.zip \
- ese_v1-1.zip \
- es_b_v1-2.zip \
- ww_v1-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="BASE_PATH=/usr/share/${PN} RO_GAME_DIR=/usr/share/${PN}
RW_GAME_DIR=/usr/share/${PN} EXTRA_CFLAGS=-DUSE_USERDATADIR_FOR_COMMONDATA"
- emake -j1 clean
- emake ${makeopts} OPTIONS="${CFLAGS}"
-}
-
-src_install() {
- dobin rocksndiamonds
- insinto "/usr/share/${PN}"
- doins -r docs graphics levels music sounds
-
- einstalldocs
- doicon "${DISTDIR}/${PN}.png"
- make_desktop_entry ${PN} "Rocks 'N' Diamonds" ${PN}
-}
