6 files changed, 127 insertions, 2 deletions
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 151652095222..753434e35dc2 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/ext3grep/Manifest b/sys-fs/ext3grep/Manifest
index 830f1d7359f2..1042d5d66bc1 100644
--- a/sys-fs/ext3grep/Manifest
+++ b/sys-fs/ext3grep/Manifest
@@ -1,8 +1,10 @@
 AUX ext3grep-0.10.1-gcc44.patch 7824 BLAKE2B b0c7bb82f81f088388836d3d8c92496d164043592c97a5a97570f4db38128fb24fc8ba761e9f59f900e161214285f261bc978f3fe1341d7ec45e2cc76bb2d591 SHA512 11404bb9f606a223f328068d7b42911a49df05a0bee68e88e15b58c66964357bab1888af4a3284f3ea7ed559753ac7c80d4db59c63b53ee52117b8c92aae5607
+AUX ext3grep-0.10.2-include-order.patch 2608 BLAKE2B 5565ecd5e089d7625d402bc3292ba45e562c4d5b82acefe99e1563040ba3240b79840f08c24215cbdd932fcaa730a2595bf0daae5c34986307d67959a4459ecd SHA512 f910eff275d03965d0ea31efb185205df6d0a687a7022bec17b16effa6d4f760beed0fab69dcef6aaa27011db55052c50cc33d7b880cdd6a1f9af41ce4ea73dc
 AUX ext3grep-0.10.2-include-unistd_h-for-sysconf.patch 271 BLAKE2B b06c18ab18b5b1278883155dfefc3e0b4aff93e1fcfd2a500c92ada7ad10df56823564deb0acf1bfcb0c4453c2280cb27232bbf01be6567692ba2e4b0f2e395a SHA512 ea47220fc10d18bcaa6dbd9e89c94a9248f5af11d8f314a148edb1e99c9d655f753a9d8b3a33f0f3f20bc82eaa80cfd509b6d4255ff32b4977269a05af6f8e1e
 AUX ext3grep-0.10.2-missing-cassert-include.patch 227 BLAKE2B 9bd2d32865d3e16ee9ee0190299e334df27a15da2dab175618104bd421866a4b513e5dc672be5dc5221b7e3b4bffe9d99218a5db0d0aad085f36c598d20f9fd1 SHA512 3c638bed6d954c99063b7a510e4476a992b2ce245594b5783becf152b18cb567358b1e4e15083d712669866dcb71bb2869574d73f84ead0ea67d41247bb23c90
 AUX ext3grep-0.10.2-new-e2fsprogs.patch 1478 BLAKE2B aa7daaae9984f524b59a7391268f301d8570bf8e48ffea686cd65e98db950351ba9fe43b9da93925c636aef78749b00acf0aa72d57b08bb2817b229497019875 SHA512 f16b5ed428c7bd1bf453d331eb1c114a13a2ec7fdc19d61b9788c5f4f3e5d4d85c013c738e04dbea12967a678d81bddedb60e573ac97c801efffa3ef27774e19
 AUX ext3grep-0.10.2-newer-e2fsprogs.patch 1111 BLAKE2B c4343f4d8ad9d6e4c1b52f1dc41ab42d4de97e2185279cdc018ac3de7824ed2ca09eea8a9bd79d22628ccd2fb37b0e94bfaf27bfdc1e78da11a0ed0411ad432f SHA512 321d303e8f8e12270ee40f64418888e5a23347d33b978aec4979c87ceb21f70c970736087175ce141024997332f0772444cee9baab3758d2aab08d7d84b05faa
 DIST ext3grep-0.10.2.tar.gz 236364 BLAKE2B 0352e00a20c6a1486e4ddc0b80c9dcc9afa383775bb4ca6bcc83d2761b2901a9344ccd66f96e4a3e4b02177730f4e27b444695ba0644a5c42c4f3105618288ff SHA512 301a65c91d2342753a4588c40d496114067a18ceceb999f10fe3fc49c7d3a20c7836dba915575db352c89de7ff0ed3553cd8fbd2d1540109cb0ff7fa8f530b6f
 EBUILD ext3grep-0.10.2-r1.ebuild 778 BLAKE2B b4f3267a0e56dcc77be3393d518919d51d0fedb59724ba1953d3cb8b8fd7a1da954d3b764236f239d5b44ec1e0524df011d12d64eaf6e0ff99c9334636eecd8a SHA512 68e4f652b7d27a6794383c3a594bbde7e8db77f298dc73c1f4d1847226e9785058f474b9d1287fabf6d9a66eaa6f132916a340bcd38d7dab963448b714fc2d8b
+EBUILD ext3grep-0.10.2-r2.ebuild 818 BLAKE2B 61b592da059b05a9d49196eeaadc54ad030db8e1b9bb3c3390de41c47478947f6a3ff634432774e2f989cbd8111a38bacd5e779d7adc11420edcc1e909205650 SHA512 3c35048fa0536ace4abfae53ed3ff8f65a831e49845c621b3fe0b72d4dfad323fd3fc606422f4c214041e4aa1ba57f0090089ea65e798e4a16d50e6ec665ec47
 MISC metadata.xml 295 BLAKE2B 78fd1bd49fbcee6b961da117736ab0801ea68eb1f7a63f8844bfbce88a051e4f3b0734e75c4d9b1bdc3ab31f7fd694314a8bd8cee653f82cd08950700e65f850 SHA512 674a418d6ddb0df5b9260b4f3160c409afbb030d19c20e3777344d218039cad2b41244767b3f9bb300a29dc186bded3d167f175f8842b4bfa137ab7880b36176
diff --git a/sys-fs/ext3grep/ext3grep-0.10.2-r2.ebuild b/sys-fs/ext3grep/ext3grep-0.10.2-r2.ebuild
new file mode 100644
index 000000000000..1311fc4dc750
--- /dev/null
+++ b/sys-fs/ext3grep/ext3grep-0.10.2-r2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Recover deleted files on an ext3 file system"
+HOMEPAGE="https://code.google.com/p/ext3grep/"
+SRC_URI="https://ext3grep.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug pch"
+
+DEPEND="
+	sys-fs/e2fsprogs
+	virtual/os-headers
+"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.10.1-gcc44.patch"
+	"${FILESDIR}/${P}-include-unistd_h-for-sysconf.patch"
+	"${FILESDIR}/${P}-new-e2fsprogs.patch"
+	"${FILESDIR}/${P}-newer-e2fsprogs.patch"
+	"${FILESDIR}/${P}-missing-cassert-include.patch"
+	"${FILESDIR}/${P}-include-order.patch"
+)
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable debug)
+		$(use_enable pch)
+	)
+
+	econf "${myeconfargs[@]}"
+}
diff --git a/sys-fs/ext3grep/files/ext3grep-0.10.2-include-order.patch b/sys-fs/ext3grep/files/ext3grep-0.10.2-include-order.patch
new file mode 100644
index 000000000000..6f08e5ad9329
--- /dev/null
+++ b/sys-fs/ext3grep/files/ext3grep-0.10.2-include-order.patch
@@ -0,0 +1,86 @@
+https://bugs.gentoo.org/934532
+https://bugs.gentoo.org/939024
+Ordering of includes is important, so we don't redefine "clamp" from
+under STL internals:
+https://en.cppreference.com/w/cpp/algorithm/clamp takes four args
+but clamp in ext2fs.h takes three
+diff -ur a/src/directories.cc b/src/directories.cc
+--- a/src/directories.cc	2024-12-30 14:12:51.353812001 +0400
++++ b/src/directories.cc	2024-12-30 14:13:51.472524523 +0400
+@@ -21,6 +21,10 @@
+ // You should have received a copy of the GNU General Public License
+ // along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ 
++#include <cstring>
++#include <ctime>
++#include <algorithm>
++
+ #ifndef USE_PCH
+ #include "sys.h"
+ #include "ext3.h"
+@@ -33,9 +37,6 @@
+ #include "indirect_blocks.h"
+ #include "get_block.h"
+ #include "directories.h"
+-#include <cstring>
+-#include <ctime>
+-#include <algorithm>
+ 
+ //-----------------------------------------------------------------------------
+ //
+diff -ur a/src/init_files.cc b/src/init_files.cc
+--- a/src/init_files.cc	2024-12-30 14:12:51.353812001 +0400
++++ b/src/init_files.cc	2024-12-30 14:13:37.823593692 +0400
+@@ -21,6 +21,8 @@
+ // You should have received a copy of the GNU General Public License
+ // along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ 
++#include <algorithm>
++
+ #ifndef USE_PCH
+ #include "sys.h"
+ #include <iomanip>
+@@ -33,7 +35,6 @@
+ #include "globals.h"
+ #include "forward_declarations.h"
+ #include "journal.h"
+-#include <algorithm>
+ 
+ //-----------------------------------------------------------------------------
+ //
+diff -ur a/src/journal.cc b/src/journal.cc
+--- a/src/journal.cc	2024-12-30 14:12:51.353812001 +0400
++++ b/src/journal.cc	2024-12-30 14:14:07.808441493 +0400
+@@ -21,6 +21,9 @@
+ // You should have received a copy of the GNU General Public License
+ // along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ 
++#include <algorithm>
++#include <ctime>
++
+ #ifndef USE_PCH
+ #include "sys.h"
+ #include <stdint.h>
+@@ -37,8 +40,6 @@
+ #include "indirect_blocks.h"
+ #include "get_block.h"
+ #include "commandline.h"
+-#include <algorithm>
+-#include <ctime>
+ 
+ //-----------------------------------------------------------------------------
+ //
+It throws warning - we already define LARGEFILE on Gentoo, so let's not redefine
+diff -ur a/src/sys.h.in b/src/sys.h.in
+--- a/src/sys.h.in	2024-12-30 14:12:51.353812001 +0400
++++ b/src/sys.h.in	2024-12-30 14:24:36.796244569 +0400
+@@ -31,7 +31,9 @@
+ #endif
+ 
+ // This is needed for lseek64.
++#ifndef _LARGEFILE64_SOURCE
+ #define _LARGEFILE64_SOURCE
++#endif
+ 
+ #ifdef CWDEBUG
+ #ifndef _GNU_SOURCE
diff --git a/sys-fs/xfsprogs/Manifest b/sys-fs/xfsprogs/Manifest
index 4e3c72c95224..6e608b43b887 100644
--- a/sys-fs/xfsprogs/Manifest
+++ b/sys-fs/xfsprogs/Manifest
@@ -8,7 +8,7 @@ DIST xfsprogs-6.8.0.tar.xz 1367196 BLAKE2B 8c296698da1170bb7ff369c2bf5f156e812dd
 DIST xfsprogs-6.9.0.tar.xz 1383116 BLAKE2B d952603716cc4022a935c426630b0b7838573476a730c6832f36ef0274a640e64667d3e3a2dd9fd2c5f2c12cdb348fd93abfef5c49e5c5fe2d5a83945dfc7894 SHA512 c597453759c400690810971f0b2daf0e4e22c74270b0f9800e2235da5e5c1383b59bc1176c5bba0023f74b623020fb51c62f0e98a74885cf3a8336e0b81c9023
 EBUILD xfsprogs-6.10.0-r2.ebuild 2859 BLAKE2B 527366c51df7a215fce8b0e7d2d366e6d587dc37b86b379488aaa31e668eb495af757af8baf6d436a2ef760affd6fe7b2d47afe8a6088f5b6d130c9cbc098cd0 SHA512 9b8d76a07e4d5ffb26453b58f18f8739d95d4e9c3f6ff89d9e7222fbd7aa261570c63b7f1af49a5e001bc337c7e90ec2fca019ef429eae0bd617f82d25d8040c
 EBUILD xfsprogs-6.10.1.ebuild 2795 BLAKE2B 03fad313fe94ab824066c2d7c3a9d0f02d8cf1833b21fc3f71bb38a0802c145f2ce11e7ac2745ea298a88cf487d0b5d86eeb4cd0a010bf4e4e05029e1f45157a SHA512 ec1698750ee990598979bfb3fd6e662590c546560317043772d564fbb048ec6d11ea8e29b92d1c744b02bf2833c08ce4c59bc445e6d04d03a0b43ad21c407291
-EBUILD xfsprogs-6.11.0.ebuild 2914 BLAKE2B 81fd37c78e7a7147542eccce2813ccd288a9d6c9172557f553aedd3a7b54ee27e8258690eb1c786c521559b91073359b91c8de8d01a17bce11d0942f931ab0f4 SHA512 b0ed94a6900c06048375f77a032234937453ca0ffba9d6ad5cbefcee61c3948c847cfbb7d151001ad27a0166afabae3a2904c900452113673ddfb1aa53316670
+EBUILD xfsprogs-6.11.0.ebuild 2913 BLAKE2B cd505b5b3d6bc37b94ea4fae6b875363621a10b94a9c7c0ad949e27db3515370c9413657406fafe0366907c80ea8f3b6af28e2b42ebb61939bbfd11a3ec4f2f3 SHA512 05789d6fad97041eb1723d1fd615b3f41975413297e62b04559462a6db3dfffb88d515dfd16de398bd927a9c85fd954d8b131f971af18d7ed1170c1d1d65221b
 EBUILD xfsprogs-6.12.0.ebuild 2921 BLAKE2B d471a2cbdf45e6c68384f8d8a4f03305a9c01fa3cc5cd7a01025f73468cc254d4e0c202157b3042e85f04f9e8af329377c27943ad9eff3c71a94857212f4561e SHA512 188ea919cff548c31e7f57f41b13e93d88ee56f7d2d00bd5e122a445a11afc72caedcb290c361187659693bc91f4fadec2535dee0c3a8fa58ad8994b51929233
 EBUILD xfsprogs-6.8.0.ebuild 2589 BLAKE2B 724a51c203639b6ef3a1e60e04705ca46084acf58c59bed0ae8615fdfe60b8ba473092eb33b72b1276ca86b81a9dcdfcbda613a4c0643b061e1877ea139600d8 SHA512 9c2a1aadc1a5122e48768cbe60d6179c1e172960a92218767fcdf03adcf5a64b694798591c620e5045d131da61058a8651333607abe6ae237b607bddf8d1a5e7
 EBUILD xfsprogs-6.9.0.ebuild 2597 BLAKE2B 38ba299dc0db1edac052fa0336a4723f395e0c7a1372c66269f0c012a2ccc17e11c929f050d1dab935bb976ff5702cfc4f9399893aa322a347ad73fa2651911f SHA512 29071b95a57a12e68fdcfb0641d5fb0a357aff1b77aebe607f777e6ded28d1472764f6bcb01987dcd3296cef20c50bce820cc1f166255650adfae6ebe834e9a2
diff --git a/sys-fs/xfsprogs/xfsprogs-6.11.0.ebuild b/sys-fs/xfsprogs/xfsprogs-6.11.0.ebuild
index 0bbd7a8805db..118c09e2c963 100644
--- a/sys-fs/xfsprogs/xfsprogs-6.11.0.ebuild
+++ b/sys-fs/xfsprogs/xfsprogs-6.11.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.kernel.org/pub/linux/utils/fs/xfs/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="icu libedit nls selinux static-libs"
 
 RDEPEND="