7 files changed, 79 insertions, 2 deletions
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index d2a2c9d2f248..83f08e473feb 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/bfr/Manifest b/app-misc/bfr/Manifest
index c33fad3cc6f3..a24afbf5e404 100644
--- a/app-misc/bfr/Manifest
+++ b/app-misc/bfr/Manifest
@@ -1,5 +1,8 @@
+AUX bfr-1.6-bools.patch 732 BLAKE2B 190ec7242962041e18e295a76323000ccfca91fe7fea58882445a1b3d4b088e676c4eb2b81d2634966885aeccf3bc35f840a93fc9631ee0f4a6b09a2328c1f68 SHA512 b8a15f939c41346757b0c9e075b39098387d07d7add2027e075d47d28ff79d9b7c299fbb599b8f7b3b173fa6ebcd2b5b20648664fe282fddd49b4d57de8da96e
 AUX bfr-1.6-long-types.patch 3638 BLAKE2B 251050b40495293b2ed9c3a27b12584a9556a92194338714294129cf74faa5e5cc45e1f139da7ebff4322750593a9b3a04c2190edff6acf81e34d65df6b8d084 SHA512 dd9067e5d8cc323f069bb1f7e6866a1948a6426ac71541e0855d7a2ce595aa4ffcc49f78413604b86c7b871d5788339382b89136a7a8628ba320b8288244c5f0
+AUX bfr-1.6-musl-include.patch 311 BLAKE2B 0d6490f304836c290dfcb0125380743571cc49ae896a31174df3f8829a9f1ec8a604958984ed2e45cc67c591284f69eb7c2d9abd02b05f6b688c1ef4860d2728 SHA512 532107cb335e9e1ba9664e0fa6be0db458400a0c5e4594308570af37ed5f807e0b538c43c1e4cb05b8490b2de15e93cb35f60860795c489cb68853bb41208886
 AUX bfr-1.6-perl.patch 326 BLAKE2B b5e5273b8cd5e198d5c3dd76740d7d3e8588571e29822095ffe3b0eb50a85d6422163aca0774d8de955c64bf066ffc445d3e140eb5dcb4d06e39274c07e8e6fe SHA512 8f65f5113b60a6cbe692b9b2cbf02a7a7b3f046a6a5203cc05cae7a08e1344afd5ababa41608d334d5d1f04afb0eb2bf705622056c5620626805eec41351ffc3
 DIST bfr-1.6.tar.bz2 81002 BLAKE2B 24339eb7e882ca319b29a2a5e033ccfd6a0abe920572d4f023b4ad0321e2e9ce3096c3aba317bada297f9d17bbe368edf08cddd903377e99f5cc2a1dda7261ea SHA512 19939218029219cc328e3efb8e799bb8c755ccff7b8cb81ba0c735d499a48f581aa42322045fdbd153dcfdb8792e84d9fddbfba9e9c5d94675e2830163936762
 EBUILD bfr-1.6-r5.ebuild 613 BLAKE2B efa8eb587e4b3e7ddc5e298fc578f981b8a86ae77d172781c520cd8ce4d893ee70cb2c95976410126d7cd1f54be6b9eb4509de69c40473cf2349ba126f6fa008 SHA512 a59d580c1febccb40c3f8171999c339f7d3e0f66fd31664aa217533b73fdc9eacbe1c5321f68cff278bbd065da46f39386d1f23e04bfdf5062b3e06bf0254ab7
+EBUILD bfr-1.6-r6.ebuild 688 BLAKE2B 5ef1cb33e3c92adcbc5538e6e53cd96783f564a473300ce088221e0fb5f5cda8f724aae34177db074f7b6fe17fcd6613812d2919b181a4414b0492b5cbc50814 SHA512 4c4851b79d2ed4134a2984ea7d76a0f0c23167921acb19b823434790caeecc5c8c7c1ddbcce9f0b1897fd26c01fe2373c6037794a5084e3b149bf6e24cbedb22
 MISC metadata.xml 272 BLAKE2B a253052dbe7dfd2dea2cdc3692698a5a94d0e2414979a348d56448cee6329b7fe29a1f252146f9ff04c1ea3b270996631395ecea454ac901eb726dc0b4dd9f29 SHA512 247c1006dd352c3cc7ee07dee2f283394767bdc0f72f0438a6cc845ac53549c05b3741c64ffedb992f003759e67f24aaa7121561db97d1b095c11269115746dc
diff --git a/app-misc/bfr/bfr-1.6-r6.ebuild b/app-misc/bfr/bfr-1.6-r6.ebuild
new file mode 100644
index 000000000000..dcb4d1e2571d
--- /dev/null
+++ b/app-misc/bfr/bfr-1.6-r6.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools toolchain-funcs
+
+DESCRIPTION="General-purpose command-line pipe buffer"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+SRC_URI="http://www.glines.org/bin/pk/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+
+BDEPEND="dev-lang/perl"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-perl.patch
+	"${FILESDIR}"/${P}-long-types.patch
+	"${FILESDIR}"/${P}-bools.patch
+	"${FILESDIR}"/${P}-musl-include.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf # uses old broken checks for compiler, bug #874519
+}
+
+src_configure() {
+	tc-export CC
+	default
+}
diff --git a/app-misc/bfr/files/bfr-1.6-bools.patch b/app-misc/bfr/files/bfr-1.6-bools.patch
new file mode 100644
index 000000000000..e1d7ed1e34ba
--- /dev/null
+++ b/app-misc/bfr/files/bfr-1.6-bools.patch
@@ -0,0 +1,29 @@
+Uses bools for enabling/disabling debug.
+Switch from self-defined to system version.
+https://bugs.gentoo.org/944302
+--- a/bfr.h
++++ b/bfr.h
+@@ -9,6 +9,7 @@
+ #include <unistd.h>
+ #include <fcntl.h>
+ #include <errno.h>
++#include <stdbool.h>
+ #ifdef BUFPLAY
+ #include <sys/mman.h>
+ #endif
+@@ -17,14 +18,13 @@
+ # include "config.h"
+ #endif
+ 
+-typedef enum {false, true} logical;
+ typedef enum { IN, RO, BF, WO, RW } state;
+ 
+ #ifndef DEBUG
+ # define debug(args...)
+ #else
+ # define debug(args...)  if(dodebug==true) { fprintf(stderr, ## args); }
+-logical dodebug;
++bool dodebug;
+ #endif
+ #define verbose(args...)  if(verbose >= 1) { fprintf(stderr, ## args); }
+ #define vverbose(args...)  if(verbose >= 2) { fprintf(stderr, ## args); }
diff --git a/app-misc/bfr/files/bfr-1.6-musl-include.patch b/app-misc/bfr/files/bfr-1.6-musl-include.patch
new file mode 100644
index 000000000000..fa56a0cc186e
--- /dev/null
+++ b/app-misc/bfr/files/bfr-1.6-musl-include.patch
@@ -0,0 +1,12 @@
+Missing include for strcmp
+https://bugs.gentoo.org/942415
+--- a/getopt.c
++++ b/getopt.c
+@@ -52,6 +52,7 @@
+ #endif
+ 
+ #include <stdio.h>
++#include <string.h>
+ 
+ /* Comment out all this code if we are using the GNU C Library, and are not
+    actually compiling the library itself.  This code is part of the GNU C
diff --git a/app-misc/uptimed/Manifest b/app-misc/uptimed/Manifest
index 4680bc818947..94502f025cb1 100644
--- a/app-misc/uptimed/Manifest
+++ b/app-misc/uptimed/Manifest
@@ -3,5 +3,5 @@ AUX uptimed.service 209 BLAKE2B 9f763df7f903aa9a2563041acad553906e0a69faf93280bc
 DIST uptimed-0.4.6.tar.gz 56796 BLAKE2B 9ea2e5f9e045f11f29232e51746bd4984fb93a8b9c36b652c4b247ab0923c1b162067aa20cb5bf0d8d2dee8e927aecea33b7be488b51f573ba525b6234b78e86 SHA512 035caba32182a807312b587b3cb3b6322027b7c8f3e69a3f0b52ea4f44ecfc40505fe58b6a1b56a87a967f1f8b1fbc075414a04b60717577e32972feadb9bc2d
 DIST uptimed-0.4.7.tar.gz 56796 BLAKE2B 2ebc8229bded21cfd6f5ae644515b79606eddf931e976747560c684e9e651e910fa3d9623fd8245e4d4abf4d764446170c5b27f6e538966c8f9d5be3d1c657ce SHA512 857357d3f21770ea04710eae7775dad562b1112c3d17e3d771d67d80fc11d1e5aeb8a869a70cdb76c103e0fd6384273c4498a3d5cbd33035b3b72dcce65ea211
 EBUILD uptimed-0.4.6-r1.ebuild 1204 BLAKE2B 5bdeb70b03569a0ee099ce42f5f4d6ccbfdcfdac73077b95fc9f75cfe07af0186c374584dc1b2d7d2c47d8557c42ac0b6c877bb4eacdbd7c7db51344daaabf24 SHA512 de31e3444ad9b2ba19d0d267149309ce1fecf052686c6d8930a1a3b51e41b75960995e0282366deaa2e604c9a17da6d0c23a4d61716b1a1b61a53bf29a0c701e
-EBUILD uptimed-0.4.7.ebuild 1210 BLAKE2B 363ce36ab85165d49e9ec047f20a034ff5da7dc6f905eab65868d32316d7582079c5d638919a458345adc08d9af2ceae2b14ce99c513b500b760da07cc728327 SHA512 d2205b7f7371df0c70965f73f38393e49fc3a89d400a9e86187d838535d51336e57dd02310435b0f2895f4b5c2705c0f3a49d9de42d2a575eb78e318a472e6f1
+EBUILD uptimed-0.4.7.ebuild 1204 BLAKE2B 48e268966c79c90b13b61ba700b0a2dc97851c64ca2d524280c9c0b06fb31315da64c1edc42123ebec4fd20b97d8c25516da93244e24369658c0b8e65b0e8168 SHA512 82693d6cd6c8d6ffe07f485aa7db14ece8d63975a846d12226ee275b7c22d3b9ab7453dc48cc42e78f6133430c605234d5e87bca398b64b7be21358a5b10c08d
 MISC metadata.xml 333 BLAKE2B bf68e69969537872f8a77b770b3eb3045bf9325226d0e2796cbc29356003823c33e4a66ffc68eb2ec5c381dbbed3428e137d4bead876280bdda566b8e04f5f1f SHA512 81f613cfdc5895b230285b6605d520ffdbddc3193a8aa32447129055adf0a0dcb76b64cc9de34495707b3e4d480cebca9b1d6a96d1b3db50113f0867a50c9602
diff --git a/app-misc/uptimed/uptimed-0.4.7.ebuild b/app-misc/uptimed/uptimed-0.4.7.ebuild
index 152b3c8d1c6e..a28bf7ad2255 100644
--- a/app-misc/uptimed/uptimed-0.4.7.ebuild
+++ b/app-misc/uptimed/uptimed-0.4.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/rpodgorny/uptimed/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~mips ppc ppc64 ~riscv sparc x86"
 IUSE="selinux"
 
 RDEPEND="