gentoo auto-resync : 15:02:2024 - 23:36:26

4 files changed, 38 insertions, 2 deletions

diff --git a/games-rpg/Manifest.gz b/games-rpg/Manifest.gz
index 7e40babad7ac..fc96cb638233 100644
--- a/games-rpg/Manifest.gz
+++ b/games-rpg/Manifest.gz
diff --git a/games-rpg/rpg-cli/Manifest b/games-rpg/rpg-cli/Manifest
index 45797b7029cb..cb85faff95fd 100644
--- a/games-rpg/rpg-cli/Manifest
+++ b/games-rpg/rpg-cli/Manifest
@@ -1,3 +1,4 @@
+AUX getrandom-0.2.3-open64.patch 795 BLAKE2B 16157ef660fd293a2057bf142dbb8a2c235c40a2aaf95468b40b77e6f31db3c54fad76b5d8fdcbe7795e6b07d2c66512e517baa62219071aaa298483a2145c65 SHA512 6b06e40237f4c068c3a4a1b8b54735efd8d71d4d47a0228672fc4cb40cf016291f34a0142a858da01edfe2227dc3e77ac742491c4359d1469558dc29645dc5d0
 DIST anyhow-1.0.43.crate 34968 BLAKE2B a846dbc5275906e9f8ec4d5019a0fbff56e16eb970f8f528f2a7e5e2078e39a235d879870ffb92d6af45dc01b730825beb0a346fd6a2de1ddbf076366cd8eada SHA512 d35eb86b3c1676a88fcd9fa8a956f0fb3d3a657caa777e27eb8d5f6a86fec352273c463782dd803a87514c72fe679855d7a379c63bb385df593a5e14c069b7a3
 DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9
 DIST autocfg-1.0.1.crate 12908 BLAKE2B 40c53cab298e4f26634c3acff3ece6a3371188d91dbf377ed664eabedcde20536edaa93daf406618f37edde019f049a6e7b9a47f627344587dbd126bee2b5e3a SHA512 630b348acb98b012e97804e6325d03c89abc22f2157762c59144c04e6c733daf550bdc7f0fe0b9f3b50e15dae8c1c3c4bdfce3d805b02f0fc987311f5332419b
@@ -63,5 +64,5 @@ DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f955297217
 DIST winapi-util-0.1.5.crate 10164 BLAKE2B fc800aceae5249a858c806c3e969ef2545766099872d856ebee51c883d9acf1122278db9607d50ca53eac351502b700fd2463900932d342240f97f683d517963 SHA512 7baeb661f397c4693dfa001fdc774b323c51a7c55caad40f2de5112a1cefd1d6151e3df41fa4ee193460a5905917c83d2b1de5fa10b4bd014ad96690af95c0fd
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 DIST yaml-rust-0.4.5.crate 47783 BLAKE2B 3e888c5cc7afb43eaf3aaab2b6f47b86df164a66eb54d4e166b965cc84b1e06cd17bd992a0d6ee175d9a73a76e2b44a13167246383ed054afcf3cc1710b309cb SHA512 7621dc8dfd5e7d4a7a8805b2a7e8319b63b852367655f2359d4e3e8fec6c4fad52d75c46ce1161e4c674eac0780b757ce9d34e664e304d8d2beec7afa0363ea0
-EBUILD rpg-cli-1.0.1.ebuild 1768 BLAKE2B 9b120701b73eb0ed4f4e148f4794fdef9c2894497a192808c5193ce1c9e0ce3bf8f7fec170bf784539291e8da4cd1e2bc35627af3f81454912148e2c7823db47 SHA512 4f88dce3c5ebb7b686b3b3725560ef90786304700c17fdf2879c8dc70984a9eda56b12ee35a20f0c698696004fe7419825b821dcc7e403858d4c93e1e0a16b6d
+EBUILD rpg-cli-1.0.1.ebuild 1922 BLAKE2B 14eda36f0fd7471b15ec6daa1b55b16ae052979c77108a1e6887066e77ad87d07a886d30477871c7093c2ea22ec1a736f1dd7a3052b72d3a140ff27c1d4dd6f7 SHA512 bf9392b5b946b6d75a36c53ce40be4543a413d26131c629fe484ee9f42bb7836fc3a1b83d6136ac20bb6c7105a358a94d8fad045e51af3a2d61a6d48758e0c76
 MISC metadata.xml 711 BLAKE2B 3f5ca9f093c95681b14d4e16143dc377326b73cd3f95659ec8ffe37967c277452edc5ede4db385c6b9b14a3c8f6c21b3b2c41ba1dae967f7af6546422c790a53 SHA512 dd6f4eba37ef9e074929f3aff72f61f7925dcf98f57e1f2b0705e61f60edbcf27c32d64e5ca82e81665607999322c4051d9ceff1ffce116ef8470d4746601929
diff --git a/games-rpg/rpg-cli/files/getrandom-0.2.3-open64.patch b/games-rpg/rpg-cli/files/getrandom-0.2.3-open64.patch
new file mode 100644
index 000000000000..eb29e580c058
--- /dev/null
+++ b/games-rpg/rpg-cli/files/getrandom-0.2.3-open64.patch
@@ -0,0 +1,27 @@
+Fix build with musl 1.2.4
+
+https://bugs.gentoo.org/923901
+https://github.com/rust-random/getrandom/pull/326
+
+--- a/src/util_libc.rs
++++ b/src/util_libc.rs
+@@ -96,18 +96,10 @@ impl Weak {
+     }
+ }
+ 
+-cfg_if! {
+-    if #[cfg(any(target_os = "linux", target_os = "emscripten"))] {
+-        use libc::open64 as open;
+-    } else {
+-        use libc::open;
+-    }
+-}
+-
+ // SAFETY: path must be null terminated, FD must be manually closed.
+ pub unsafe fn open_readonly(path: &str) -> Result<libc::c_int, Error> {
+     debug_assert_eq!(path.as_bytes().last(), Some(&0));
+-    let fd = open(path.as_ptr() as *const _, libc::O_RDONLY | libc::O_CLOEXEC);
++    let fd = libc::open(path.as_ptr() as *const _, libc::O_RDONLY | libc::O_CLOEXEC);
+     if fd < 0 {
+         return Err(last_os_error());
+     }
diff --git a/games-rpg/rpg-cli/rpg-cli-1.0.1.ebuild b/games-rpg/rpg-cli/rpg-cli-1.0.1.ebuild
index b42762da9613..4ec52d582136 100644
--- a/games-rpg/rpg-cli/rpg-cli-1.0.1.ebuild
+++ b/games-rpg/rpg-cli/rpg-cli-1.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021-2022 Gentoo Authors
+# Copyright 2021-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Auto-Generated by cargo-ebuild 0.3.2
@@ -85,6 +85,14 @@ KEYWORDS="~amd64 ~ppc64"
 
 QA_FLAGS_IGNORED="usr/bin/rpg-cli"
 
+src_prepare() {
+	pushd "${WORKDIR}"/cargo_home/gentoo/getrandom-0.2.3 || die
+	eapply "${FILESDIR}"/getrandom-0.2.3-open64.patch
+	popd || die
+
+	default
+}
+
 src_install() {
 	cargo_src_install
 	dodoc README.md