4 files changed, 94 insertions, 27 deletions
diff --git a/sys-apps/bfs/Manifest b/sys-apps/bfs/Manifest
index a3cbf1d0d247..90523df51ba1 100644
--- a/sys-apps/bfs/Manifest
+++ b/sys-apps/bfs/Manifest
@@ -1,5 +1,7 @@
-DIST bfs-3.1.3.tar.gz 237696 BLAKE2B ca76ef02cd8ea65ab7d866a9c677063367c16c89b5f521da842ca0465e0485a90077009d9b5f324c7df09c1ab53036eb0f2965f372fd56762556dfbed43deb2c SHA512 4511c809666241f1b14ef3a01b80f0dc369510b67f45c1ce3e2d4445bcec9a4b86fb01333067b8dd713e992e57be7b99328b47a21b27864e6575981287de8e36
-DIST bfs-3.2.tar.gz 252756 BLAKE2B 444d23c8df92c6c0bcbd38889cec29012c40d742a23e1755390259a325fab9d082a23ef444bf76462b21fcdeb41fa749593f5ec7d640f7270252ed4268ccc3fe SHA512 2881a37b65d8015853a658a4f759a5213ea433a726ee9952b82bd2d6c682f92e7d014eaa7ec8f1d127b3c25b5d3b04e3b24ae61ec2549212a7a4f9335f91bf8b
-EBUILD bfs-3.1.3-r1.ebuild 1083 BLAKE2B f9f6e08ef6dcb587adfcc84f02c5ddefaed54d6a52758c385034f4972f1d1eaa1d8fc7217a0f3b3b18ea4990219ea8943aa023a9a181c053d84617849b8ef15d SHA512 46a8104d9461043785c9ac145e05dcf92a1c59a6a1bae53ffef1873aec527627f55d2d1b240115a134ed544e3301de9d04e7372d600a8234e1b1bff6e440b08f
-EBUILD bfs-3.2.ebuild 1285 BLAKE2B 245293b20193df0394feac532852ae023cdc777888e6711f8591a9147490467d16ea526f0768a6f35b7aff708021821a7428199a9bb37efeda9752b532562ab2 SHA512 55c4d27724353a87e91c8ec7da543497e173b4f2d7c4f95338feeb4be77739b32aeafdb42f56e7eddab7f15cd4540b97184061405604489f4fcd6b41c0d64e83
+DIST bfs-3.3.1.tar.gz 262841 BLAKE2B bc848f4daa98172531e6c13100dcd1f3b722f4282acc5fd3677b2c4a83effa49e681d0cac3fa2c104fd1db03543c4f0a6ca9bc494ee3737d0c927f0170171eac SHA512 e31153ef244483e4337bd2bb64fc4ddf55d56048b5af54003a917287868114c81befb771b6cfc7473e384d3157b24cbec7ca27336362a438c7803eb7fc85d8d3
+DIST bfs-4.0.1.tar.gz 272678 BLAKE2B c25165b469ea52ef2e0b73ae0cbcef485a739d25cd3c49d25cd0543ab97009b256637d0dab5cb1ce01c3da7ab77519ac6a5b9cff36634c81415ec309d46c7d1d SHA512 0697aab71e2101638fbb5923ec57b9439d6fdd212dccd2f1b90cd4a1bc9c72acca5dca92e9aa6efef06696b324cb6754784602064f35b529ff97d1933672d73c
+DIST bfs-4.0.2.tar.gz 274986 BLAKE2B d87dd646a0c6bced3881426f8a82501e9a8ab19b0d4a249fd44d774cac9fd37a7a0cb01551a2af343b4f0c64f7b9e926cee8db67f5217bd39dd469a85b0b434e SHA512 a3ce3ccee27576a4a0ffb2bd46635aaabc5718cbe53eef5da52bc510dcf629a613802d0b2f95da47d009873e6ab1b87eb84087b30c227b27676bb14cac9f6e97
+EBUILD bfs-3.3.1.ebuild 1313 BLAKE2B 1645d1461f3ade2cbd5def9b0bb61842cf63895f293e867149ddfea57baea41a8d0585f81d1a836a10316b5f1af61f8e8f3eccec731779051f7df1c9193804ea SHA512 89600118bebfe6cb7fed9725e88b037bcd010d4557e94f8b87b382617132dab85cabd7a0760bdc19a8195921fbcb75a3dd15644fad3850e097df8f041aa81fe2
+EBUILD bfs-4.0.1.ebuild 1313 BLAKE2B 1645d1461f3ade2cbd5def9b0bb61842cf63895f293e867149ddfea57baea41a8d0585f81d1a836a10316b5f1af61f8e8f3eccec731779051f7df1c9193804ea SHA512 89600118bebfe6cb7fed9725e88b037bcd010d4557e94f8b87b382617132dab85cabd7a0760bdc19a8195921fbcb75a3dd15644fad3850e097df8f041aa81fe2
+EBUILD bfs-4.0.2.ebuild 1380 BLAKE2B 00945b6243cb7aeed1fda3992dd9026981da0a3e9e9edf48e7154ca8823811d823114705c95d387603bda39964ee89d54db81608f2e3bd6375068d96d587f8de SHA512 98be087a63ef2f7c2aa7e72ef6c731128bffa0fb59e24e7d706a8c0f8a622ad72df6c55fdc256fa5092187a451c1b4fde19656f1e53330036f2fb90a224edb83
 MISC metadata.xml 419 BLAKE2B eadf85369714b56ec89d384a8603c78c282e197db94c324fa9e627d70fa8c0c7c557c21c9c25ff292c93312d9752f36b4dd06a9a9c758c5375621694fb55e50d SHA512 192ae0599d4f36d43d8d2d94fa1e16fc5798b75abf0befecfa4a768a2b57e17387cb98a0663678b0c672c65c50d74cc3d1668cf222e0a9a4084be9078eb09445
diff --git a/sys-apps/bfs/bfs-3.2.ebuild b/sys-apps/bfs/bfs-3.3.1.ebuild
index c99fcb8e9ad7..265ded51c383 100644
--- a/sys-apps/bfs/bfs-3.2.ebuild
+++ b/sys-apps/bfs/bfs-3.3.1.ebuild
@@ -26,7 +26,7 @@ RDEPEND="${DEPEND}"
 QA_CONFIG_IMPL_DECL_SKIP=(
 	# Not available on Linux
 	acl_is_trivial_np acl_trivial fdclosedir getdents getprogname
-	posix_spawn_file_actions_addfchdir
+	posix_spawn_file_actions_addfchdir getmntinfo posix_getdents strtofflags
 )
 
 src_configure() {
@@ -34,11 +34,11 @@ src_configure() {
 	use debug || append-cppflags -DNDEBUG
 
 	edo ./configure \
-		$(use_enable acl libacl) \
-		$(use_enable caps libcap) \
-		$(use_enable selinux libselinux) \
-		$(use_enable io-uring liburing) \
-		$(use_enable unicode oniguruma) \
+		$(use_with acl libacl) \
+		$(use_with caps libcap) \
+		$(use_with selinux libselinux) \
+		$(use_with io-uring liburing) \
+		$(use_with unicode oniguruma) \
 		V=1
 }
 
diff --git a/sys-apps/bfs/bfs-3.1.3-r1.ebuild b/sys-apps/bfs/bfs-4.0.1.ebuild
index b4bf6e267d1f..265ded51c383 100644
--- a/sys-apps/bfs/bfs-3.1.3-r1.ebuild
+++ b/sys-apps/bfs/bfs-4.0.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit flag-o-matic toolchain-funcs
+inherit edo flag-o-matic toolchain-funcs
 
 DESCRIPTION="Breadth-first version of the UNIX find command"
 HOMEPAGE="https://tavianator.com/projects/bfs.html"
@@ -12,40 +12,46 @@ SRC_URI="https://github.com/tavianator/bfs/archive/refs/tags/${PV}.tar.gz -> ${P
 LICENSE="0BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc"
-IUSE="acl caps debug io-uring unicode xattr"
+IUSE="acl caps debug io-uring selinux unicode"
 
 DEPEND="
 	acl? ( virtual/acl )
 	caps? ( sys-libs/libcap )
 	io-uring? ( sys-libs/liburing:= )
+	selinux? ( sys-libs/libselinux )
 	unicode? ( dev-libs/oniguruma:= )
-	xattr? ( sys-apps/attr )
 "
 RDEPEND="${DEPEND}"
 
-bfsmake() {
-	emake \
-		USE_ACL=$(usev acl '1') \
-		USE_ATTR=$(usev xattr '1') \
-		USE_LIBCAP=$(usev caps '1') \
-		USE_LIBURING=$(usev io-uring '1') \
-		USE_ONIGURUMA=$(usev unicode '1') \
-		"$@"
-}
+QA_CONFIG_IMPL_DECL_SKIP=(
+	# Not available on Linux
+	acl_is_trivial_np acl_trivial fdclosedir getdents getprogname
+	posix_spawn_file_actions_addfchdir getmntinfo posix_getdents strtofflags
+)
 
-src_compile() {
-	tc-export CC
+src_configure() {
+	tc-export CC PKG_CONFIG
 	use debug || append-cppflags -DNDEBUG
 
-	bfsmake
+	edo ./configure \
+		$(use_with acl libacl) \
+		$(use_with caps libcap) \
+		$(use_with selinux libselinux) \
+		$(use_with io-uring liburing) \
+		$(use_with unicode oniguruma) \
+		V=1
+}
+
+src_compile() {
+	emake V=1
 }
 
 src_test() {
 	# -n check gets confused so need manual src_test definition?
-	bfsmake check
+	emake V=1 check
 }
 
 src_install() {
-	bfsmake DESTDIR="${D}" install
+	emake V=1 DESTDIR="${D}" install
 	einstalldocs
 }
diff --git a/sys-apps/bfs/bfs-4.0.2.ebuild b/sys-apps/bfs/bfs-4.0.2.ebuild
new file mode 100644
index 000000000000..f98d49a5b7c4
--- /dev/null
+++ b/sys-apps/bfs/bfs-4.0.2.ebuild
@@ -0,0 +1,59 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit edo flag-o-matic toolchain-funcs
+
+DESCRIPTION="Breadth-first version of the UNIX find command"
+HOMEPAGE="https://tavianator.com/projects/bfs.html"
+SRC_URI="https://github.com/tavianator/bfs/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="0BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc"
+IUSE="acl caps debug io-uring selinux unicode"
+
+DEPEND="
+	acl? ( virtual/acl )
+	caps? ( sys-libs/libcap )
+	io-uring? ( sys-libs/liburing:= )
+	selinux? ( sys-libs/libselinux )
+	unicode? ( dev-libs/oniguruma:= )
+"
+RDEPEND="${DEPEND}"
+
+QA_CONFIG_IMPL_DECL_SKIP=(
+	# Not available on Linux
+	acl_is_trivial_np acl_trivial fdclosedir getdents getprogname
+	posix_spawn_file_actions_addfchdir getmntinfo posix_getdents strtofflags
+	# Seems to be in POSIX 2024 but not yet in ncurses?
+	tcgetwinsize
+)
+
+src_configure() {
+	tc-export CC PKG_CONFIG
+	use debug || append-cppflags -DNDEBUG
+
+	edo ./configure \
+		$(use_with acl libacl) \
+		$(use_with caps libcap) \
+		$(use_with selinux libselinux) \
+		$(use_with io-uring liburing) \
+		$(use_with unicode oniguruma) \
+		V=1
+}
+
+src_compile() {
+	emake V=1
+}
+
+src_test() {
+	# -n check gets confused so need manual src_test definition?
+	emake V=1 check
+}
+
+src_install() {
+	emake V=1 DESTDIR="${D}" install
+	einstalldocs
+}