5 files changed, 113 insertions, 15 deletions
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index f064385f7138..9e0370c982ff 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/fatcat/Manifest b/sys-fs/fatcat/Manifest
index 33b9bde0bb38..12a0f733580b 100644
--- a/sys-fs/fatcat/Manifest
+++ b/sys-fs/fatcat/Manifest
@@ -1,4 +1,4 @@
-AUX fatcat-include-getopt.patch 268 BLAKE2B f197d14653e3c738bc096fe1f2865794e1cedffe87c49d62e769b542f6ff85caf2e8079cf17204010d4e5c5438c8df92c12aa780bfbdafb9bdbcd66b994c499b SHA512 71b6970aea57969099deba84bc1c7ad6aca025841140bdcb569d0e2b8f083618022eac84895522c33dc6f5e53bcccb0b21d380eed1ebb251928f17e08486315b
+AUX fatcat-1.1.1-musl-1.2.4-fixes.patch 3069 BLAKE2B c9d8fb032451aab5e1747a3c16b2d1e6d7371aa7c772d56e08bfb3acef9bf17ad34ee65b0a9d7a5b55324d7a8807838386bbff6fd005f4357655a367600e89ea SHA512 6042137439d12896d86df3d7ddbec1eaf3d772c6daa962fe2a6c819952c12df8394a4c7a3e54c17e872b539f5401e35857a0e6ca26c8b404c104ed7982cb9d22
 DIST fatcat-1.1.1.tar.gz 57213 BLAKE2B 095d69d828759860c182a9208e234a90b80656207f3c6ee217adc903f4c75e09f44b9d8a45a37404c904657e787edcc7b3c5969f175414bde2c03b52765b537c SHA512 eb3feca0ee330fc7d3a557ff2ecca96102351105799d89cef64ddfaeaa5bbb5d8815f5f109bbd8f2721538ddbb231bebf3f3515c5b33a6d4093f4c1389000f9e
-EBUILD fatcat-1.1.1.ebuild 585 BLAKE2B 86a956842917f74db369e206965b21862aede6196dbf435fff88662aaeb752b6c3f5bbd679df01c3fe1a30b716657184a63e5fc6b60b7a2f2f8796ea17b65e36 SHA512 9be47bd3fbce7fbcd1e530028f9e06e691752e5f783ac9266323c55783189603de4fb427971b83eaa163d3a3bed1205a7d267ed391df6d315a9bfeee04b2ed01
+EBUILD fatcat-1.1.1.ebuild 594 BLAKE2B 55a67c8da6574b42f26a7cf9f4811ff237f98e7967108251e5eb54080d007033fb4e1b025e6f7681db792b42d151a549b43b5682ad5e1585ee98e7838c04cf29 SHA512 bbf2107296f88eb51d8178df59793a67d252cb7760ac407b1617c7d4f88806afebef88336378ce2280e008ad5395f9d5a5e838a46b6dd12e3ffb1a8852dd7897
 MISC metadata.xml 317 BLAKE2B a929084c78dc1954dad83df95193331f8012da82844e5615ed92ddf7565cf9446e113d60fdd1db94e750e6131238249db3cb3826b2f9c708b01d9b9230fccb10 SHA512 6e0b19e2fb6b88de06dbef57e9da8b4d583c1ef405027ba08d6e27c9326ad3d4f1fd060a1e3ad1803e95d7b4410709da301be7a341937f54c7c633134ff78c45
diff --git a/sys-fs/fatcat/fatcat-1.1.1.ebuild b/sys-fs/fatcat/fatcat-1.1.1.ebuild
index 1cbdeace786e..ac61be67b09a 100644
--- a/sys-fs/fatcat/fatcat-1.1.1.ebuild
+++ b/sys-fs/fatcat/fatcat-1.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2018-2022 Gentoo Authors
+# Copyright 2018-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,9 @@ IUSE=""
 DEPEND="!elibc_glibc? ( sys-libs/argp-standalone )"
 RDEPEND="${DEPEND}"
 
-PATCHES=( "${FILESDIR}"/fatcat-include-getopt.patch )
+PATCHES=(
+	"${FILESDIR}/fatcat-1.1.1-musl-1.2.4-fixes.patch"
+)
 
 src_install() {
 	cmake_src_install
diff --git a/sys-fs/fatcat/files/fatcat-1.1.1-musl-1.2.4-fixes.patch b/sys-fs/fatcat/files/fatcat-1.1.1-musl-1.2.4-fixes.patch
new file mode 100644
index 000000000000..e01533fee306
--- /dev/null
+++ b/sys-fs/fatcat/files/fatcat-1.1.1-musl-1.2.4-fixes.patch
@@ -0,0 +1,107 @@
+From 12fdf46cb916b71ed8360250d50b9208684695c9 Mon Sep 17 00:00:00 2001
+From: Alex Kiernan <alex.kiernan@gmail.com>
+Date: Sun, 19 Jan 2020 16:03:21 +0000
+Subject: [PATCH 1/2] Use unistd.h not argp.h for all POSIX systems
+
+getopt(3) is found in unistd.h on all POSIX systems and we make no use
+of any of the GNU specific argp extensions. Include unistd.h directly to
+allow building with musl on linux, whilst retaining compatibility with
+glibc and other unices.
+
+Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
+---
+ src/fatcat.cpp | 8 ++------
+ 1 file changed, 2 insertions(+), 6 deletions(-)
+
+diff --git a/src/fatcat.cpp b/src/fatcat.cpp
+index ce23ca0..b4427e4 100644
+--- a/src/fatcat.cpp
++++ b/src/fatcat.cpp
+@@ -1,14 +1,10 @@
+ #include <stdlib.h>
+-#include<string.h>
+-#ifdef __APPLE__
+-#include <unistd.h>
+-#else
++#include <string.h>
+ #ifdef __WIN__
+ #include <ctype.h>
+ #include "xgetopt/xgetopt.h"
+ #else
+-#include <argp.h>
+-#endif
++#include <unistd.h>
+ #endif
+ 
+ #include <stdio.h>
+
+From 29021747ac2e52a27013310a532439bfdf438c24 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Fri, 16 Dec 2022 18:54:55 -0800
+Subject: [PATCH 2/2] Enable 64bit off_t
+
+Ensure that off_t is always 64-bit by specifying -D_LARGEFILE_SOURCE
+-D_FILE_OFFSET_BITS=64 this will ensure that normal lseek() function is
+same as lseek64
+
+This helps compiling on latest musl where lseek64 and friends are not
+available
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ CMakeLists.txt         | 2 ++
+ src/core/FatSystem.cpp | 4 ++--
+ src/core/FatSystem.h   | 2 --
+ 3 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d6a2649..4cdd1fb 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -34,6 +34,8 @@ IF(DEFINE_WIN)
+ 	add_definitions(-D__WIN__)
+ ENDIF(DEFINE_WIN)
+ 
++add_definitions(-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64)
++
+ include_directories("${CMAKE_SOURCE_DIR}/src")
+ 
+ add_executable(fatcat "src/fatcat.cpp" ${ALL_SOURCES})
+diff --git a/src/core/FatSystem.cpp b/src/core/FatSystem.cpp
+index 79cda8c..1f52e82 100644
+--- a/src/core/FatSystem.cpp
++++ b/src/core/FatSystem.cpp
+@@ -90,7 +90,7 @@ int FatSystem::readData(unsigned long long address, char *buffer, int size)
+         cerr << "! Trying to read outside the disk" << endl;
+     }
+ 
+-    lseek64(fd, globalOffset+address, SEEK_SET);
++    lseek(fd, globalOffset+address, SEEK_SET);
+ 
+     int n;
+     int pos = 0;
+@@ -112,7 +112,7 @@ int FatSystem::writeData(unsigned long long address, const char *buffer, int siz
+         throw string("Trying to write data while write mode is disabled");
+     }
+ 
+-    lseek64(fd, globalOffset+address, SEEK_SET);
++    lseek(fd, globalOffset+address, SEEK_SET);
+ 
+     int n;
+     int pos = 0;
+diff --git a/src/core/FatSystem.h b/src/core/FatSystem.h
+index cd3c914..f9f2ca3 100644
+--- a/src/core/FatSystem.h
++++ b/src/core/FatSystem.h
+@@ -11,11 +11,9 @@
+ 
+ #ifdef __APPLE__
+ #define O_LARGEFILE 0
+-#define lseek64 lseek
+ #endif
+ #ifdef __WIN__
+ #define O_LARGEFILE 0
+-#define lseek64 lseek
+ #endif
+ using namespace std;
+ 
diff --git a/sys-fs/fatcat/files/fatcat-include-getopt.patch b/sys-fs/fatcat/files/fatcat-include-getopt.patch
deleted file mode 100644
index a9c9094eceb3..000000000000
--- a/sys-fs/fatcat/files/fatcat-include-getopt.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ur a/src/fatcat.cpp b/src/fatcat.cpp
---- a/src/fatcat.cpp	2020-04-05 11:12:55.773602065 -0500
-+++ b/src/fatcat.cpp	2020-04-05 11:13:14.112132604 -0500
-@@ -8,6 +8,7 @@
- #include "xgetopt/xgetopt.h"
- #else
- #include <argp.h>
-+#include <getopt.h>
- #endif
- #endif
-