gentoo auto-resync : 25:12:2024 - 06:31:02

3 files changed, 3 insertions, 77 deletions

diff --git a/games-arcade/rocksndiamonds/Manifest b/games-arcade/rocksndiamonds/Manifest
index 8c6088058bd5..b4f3ac9239ac 100644
--- a/games-arcade/rocksndiamonds/Manifest
+++ b/games-arcade/rocksndiamonds/Manifest
@@ -1,5 +1,4 @@
 AUX rocksndiamonds-4.1.0.0-CVE-2011-4606.patch 961 BLAKE2B 10eae087eb32a90ae0f05df568aaaf9d9360badc056b77d2a1f00be4df24d7cfa884234860adb69aa4a21b8a6367c46b2d4b612c0205be10bfd1ba226c4e5f1e SHA512 5a76f0e16dd7e6bc7157050dae77f05b7b02130d2ee08051d6ef1574b201da0498d7bd14a480dd33a062ee323eb572291f9f20d44fc1bc48603980763f7763de
-AUX rocksndiamonds-4.3.2.0-music-info-url.patch 2605 BLAKE2B 90bbd4b96ee834f9b56d04ec7e06571ff7be4ddac7293a65626ae0d26aa8a6604476bde0832834df4cb6f5f5b5c37b0666e2a53330403c8a122e5c2f7a4acb50 SHA512 9360c03acb38df1a70c27ebed47df4d624a89b7fdeb9a56e8c6845b7d5a8c6c91d02776e45c8cbb85e92f40870b2528e77d288b0aa243d45d09adafdf342a423
 DIST Andreas_Buschbeck-1.0.0.zip 18331338 BLAKE2B b6520ab10ce62d4bec804a2a7e1c4908a683f9f3833e5b1d4c64d376eb4225abc38c44a519bed8cbbd3fc928bfdddda17f292b0011805e45a30b84101dad9d1d SHA512 1b47914561aea5b07035cc70f8b1b6d35f0c829d89327713ad644d82225e778a7ffd27f9d421c40dd303f85c9fc0774244dd97d405f5db866ba3d1f8027151e4
 DIST BD2K3-1.0.0.zip 4715324 BLAKE2B 72e25038c41a7a1c29a896459db97954d18731d6980f5096c28ebddb09c0b6d7bdb68a8c56f17d26c71085e4ae883d2ceaad8e95b5525cbf532d18f32ecdd638 SHA512 80f172584d2077a3ade0749790802ef9cecde75283d6b889e7d2fedf9b55fd1fd7f1f1fd5596b17d5b2a542172699a929ea626086e77d28fde11487440c43622
 DIST Boulder_Dash_Dream-1.0.0.zip 10923437 BLAKE2B 976156c763281b993550a08361c5b6279a471e24568205c0369cc3f57d99e97db84d914a560c909b30fe92b8c8c10931cf6a8a8de4da181edac410a770d922b7 SHA512 f2765f52653b4f9d6c4a6548076281f6749d08c2dfd220345bdc0058b94d51c49ef81acdc87ff71bc1b3f337f3cc6a1d08b9e5a02d6aaeaeac5d894f97ba3d8e
@@ -19,13 +18,13 @@ 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
 DIST rocksndiamonds.png 2021 BLAKE2B 795be09e6d60aaa66dd457f6ce7dcb0069a82e395cb54578b83ad49ba70b669aa5bd52a4da34979d1e0ba95413a499c13355ce6816c4e364d9d88d1988c88060 SHA512 026abfef17bfc8621d036b83a8a4a878b1d68615e69975ea37589e8d29d864dc42dbabc5a381e579c66be1053175df02209f2c1c1feff3bd9e29db3e09c40346
 DIST wf_v1-3.zip 35570 BLAKE2B eded867101b316406cdf378ce8bf36d1dbd28d38ebc9f904df85753955ec2d8f5a87a528975c58ee81b60362bcc37efa766ad87ccf1a1e8a5b062c59c6cc69a2 SHA512 b1b3b2efe20e7d74a072a6289d1af5c22fccf1b9359700269a381d38bdf2458d7d365df7db616a93512428a05f58cf872ea70fcf87080df327e0c4fc231f0470
 DIST wg_v1-0.zip 821765 BLAKE2B 5bc69179e0429992a916e2287eb57bfa947e4bb08bc6e3d801f940bc73dc8fc8af93aa82a9b8a9f8535d0d22043f50414f09b9643ea9cfa081a92943b1c73273 SHA512 7e7605d258deccbe938fedc4651bdcc4b9a01478de66f793053bb4191429cf733ad317a315965597817dbaa03d5cb538a9ab36bee53cf6a2fd3457aeb06dac88
 DIST ww_v1-0.zip 199805 BLAKE2B 167a36cc33f157e11850a786f511fb5eb9043eb732c514c00e13a71bdce3f63a2406aec88ca25e1510b3d7aeea0434101c878fcdbc2806f89b45c75417a931f3 SHA512 5689663e7d0da797a8a4904d69a3d37cfb09826acf55cf93b41beabf2638b13c6c666f4f40c011018cd84b6c14681061d5efcae3cc09ac86054ec23e0253f6d5
-EBUILD rocksndiamonds-4.3.6.0.ebuild 3969 BLAKE2B 71eaf67c04cef48826461e4a95741549acfe73ca0dbbd43cc82eff328df87b1130930b27d62d8bcc50ea4bad6558486ea2b51c069db6d365f547c1e24cb3f56e SHA512 3b0fd48b1596637c10a6fb8f94e3525c3499801e3eddfb8770104cc4a998164ada167a9f8b362103f570d812fc25195c6a1140cb326fa752510f57aa2664affd
 EBUILD rocksndiamonds-4.3.8.2.ebuild 3911 BLAKE2B 1414775a63578715037c04e426df6eaa2ed7c3b7c3786f7a0d4f2110ae37c7b40696cd0ffefeec08796a54d573fe3e66edf064ce347a8c1821cebe8732f555c6 SHA512 2f9238d40f63a634ce77539f468d95fb2af13da8f77a51df387079eaeb804a3da7364706e01db68e73d598192410bc91534aa2d44b8919775cd78673eb0c5d83
+EBUILD rocksndiamonds-4.4.0.0.ebuild 3911 BLAKE2B 1414775a63578715037c04e426df6eaa2ed7c3b7c3786f7a0d4f2110ae37c7b40696cd0ffefeec08796a54d573fe3e66edf064ce347a8c1821cebe8732f555c6 SHA512 2f9238d40f63a634ce77539f468d95fb2af13da8f77a51df387079eaeb804a3da7364706e01db68e73d598192410bc91534aa2d44b8919775cd78673eb0c5d83
 MISC metadata.xml 250 BLAKE2B 8d44bd4c6e7d6491273e2015e36ddac74af7b94a124fd240ff030e16430f5c85e53ab812f0e3e94bb2e6d138f39b512bbe01ff98b0081cacc21a02d648ec7643 SHA512 80ac07a3cac10ad2e72e9989a130b7d2073934fe92914a9db2af4d0e769d4bf537770f8faba0654bbd64a7e85ee38cf1f9d03b4b9cd322864b1b2bb35087d610
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.4.0.0.ebuild
index b5c59ce9daab..24b053961855 100644
--- a/games-arcade/rocksndiamonds/rocksndiamonds-4.3.6.0.ebuild
+++ b/games-arcade/rocksndiamonds/rocksndiamonds-4.4.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -36,7 +36,6 @@ SRC_URI="https://www.artsoft.org/RELEASES/unix/rocksndiamonds/${P}-linux.tar.gz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 RDEPEND="
 	media-libs/libmodplug
@@ -51,7 +50,6 @@ 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
 )