10 files changed, 25 insertions, 150 deletions
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 38f2bbed039f..2598fac97345 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/dog/Manifest b/sys-apps/dog/Manifest
index 5f21c21e35d6..cb7364df7fc5 100644
--- a/sys-apps/dog/Manifest
+++ b/sys-apps/dog/Manifest
@@ -1,7 +1,8 @@
 AUX 1.7-manpage-touchup.patch 502 BLAKE2B 273d31b693eb935ee5b90bd9a91b8806877c10c4c5c08f5a4cfa8584993a5a84397f35e926eb9821b0b26d4c1c513866c562e9cc6f5d5805cd113956bd078264 SHA512 b10244561296a082c98e79623789f660d4c964c4c32dc8e60962847b6f8fc4f9843c1c5dab96ac9f9202255b55c424131c91b22f9442f2ee2a241948dac5b4c3
 AUX dog-1.7-64bit-goodness.patch 773 BLAKE2B a8fc3e4eae20f3da5d948f4c2d888c7d5fccac44d95a439b45b6db07fdb281dee01721c391d3c474b3e9096ffc92e2d54ea57e7b309f1c51db7812e41c53d785 SHA512 479086b023302886618fab874d2466d6a79b755f62de11b37fa26070f266fec7ae4578affdca4746ca7e1eb728ba29fce537c3c53ee52ac54e36cbe75e3de36e
 AUX dog-1.7-check-ctime.diff 1355 BLAKE2B 0cb2b34eba9e28df58cb9f23daaefcd66ddb55ca6fec9bd12d364489abfd47fb85fc6d9bb0d898226d90e4ec203e28b63292d948682684640c1685fcfd6fc4bb SHA512 8892c0ad357ca53dd00e6402dadd1ce05ae52cf6c8eb9745ef1406ab95bd1357558b94d85e0b8eb3a8de7a209e8be9f9e020cc378804f88b180496b294de8b5b
+AUX dog-1.7-musl-strfry-fix.patch 243 BLAKE2B ecfe8533189826982dbade981f1beab8853f855718db9310f2745d12d3d03aad2cf4ea6786de830735712df88a5b5b9e99c6cb7cbfd33e8a64adbb2ccd174c41 SHA512 b488976e5dfa22155e3a6c322f4c8e5aeb99c841ffe73d281437c71508dc8d64e35897a2dc00fe8f1e24f961df1a085f25d66bdf57ce06d6d6c67959a89c2de5
 AUX dog-1.7-strfry.patch 287 BLAKE2B f4de25adeca6aa533740293f1087b43dced48302a99854878fc5a0acc0cd8b250897894e0e821a5e15f5985d0b12cf498d731f65ba5a7d42b036bb2856c42cd4 SHA512 a00051d4a190c56d08c4cfd2ebc9cf5201dc945043906b9185547b83c478220675a1f99f1fdc6903b0150ae2942868ab951a650ce0104989c702a268077a2513
 DIST dog-1.7.tar.gz 30433 BLAKE2B 0708203c2a18f21185ec3684ff477e7b03b41985ca5a9d56d4ad2b45f8d5496e3c2a7e59b7c968c762f04ec268cc23d40da60957f76358fd9084be4998d7f67e SHA512 852373ba988075a47c60c38da0ff3a344f996e6e149d23e1061d6f8fbb0999f32c975c323944375ba758e5663efa57f62c8ff88d46264f72196ea450eacfa4f5
-EBUILD dog-1.7-r6.ebuild 923 BLAKE2B f7d93c4f08764cb918fb648915eb7161a5d8e2a4cd90e8ff8de4fc6860e54ec8d818133099f769dfed6fa1f1b9b64f89bb9fb126304938703e0e01f3eca8dba2 SHA512 b4568db83fb1fe8656187bad3da260d01ac5437f5ed7269ea7e8171a0fc7d237784a90acc6a1ddd10220353c3041ea430d857413e3e0056913027c936e32ec46
+EBUILD dog-1.7-r6.ebuild 965 BLAKE2B 605544443b1e75cfa0dec7e4cef179ce89f18b722d1abce8fd51bcfa45c282879a5136541db88ffa0160edd9d18473e6a16b76e91db0aceb5141ce62b87a5fea SHA512 7ece11d64d1708734e0f1949f70c45b185ba45a23ec33427713bb5c187d6620cb509a2df4e2bc125e9bf28c426e592aaae87b47a7034f54cf866733468bfb59a
 MISC metadata.xml 266 BLAKE2B 74ac06b4ea12603c8713e69cbff9ce6874266fc48ee5c846f0ac3d50bf577c3edb1e4b6690ec44fc4dd51e55e96dd5c2478831c9f754b04661fe7700d8baf66f SHA512 b996554131284e3556af42d2c5032c5b1635de67d48983096991935e7ee04c32aadc93e48cae5160861e86d64eb6fd4abafc40d9dd8b85ddc032b042a77677cb
diff --git a/sys-apps/dog/dog-1.7-r6.ebuild b/sys-apps/dog/dog-1.7-r6.ebuild
index ea419e8e51c7..7346f1f008ee 100644
--- a/sys-apps/dog/dog-1.7-r6.ebuild
+++ b/sys-apps/dog/dog-1.7-r6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -18,6 +18,7 @@ PATCHES=(
 	"${FILESDIR}"/${PV}-manpage-touchup.patch
 	"${FILESDIR}"/${P}-64bit-goodness.patch
 	"${FILESDIR}"/${P}-strfry.patch
+	"${FILESDIR}"/${P}-musl-strfry-fix.patch
 )
 
 src_prepare() {
diff --git a/sys-apps/dog/files/dog-1.7-musl-strfry-fix.patch b/sys-apps/dog/files/dog-1.7-musl-strfry-fix.patch
new file mode 100644
index 000000000000..a36bc68bac49
--- /dev/null
+++ b/sys-apps/dog/files/dog-1.7-musl-strfry-fix.patch
@@ -0,0 +1,15 @@
+See bug #938613
+--- a/dog.c
++++ b/dog.c
+@@ -77,9 +77,11 @@
+ #endif
+ 
+ #if ALLOW_LINUX_EXTENSIONS
++#if defined(__GLIBC__)
+ #define ALLOW_STRFRY			1
+ extern char *strfry __P ((char *__string));
+ #else
++#endif
+ #define ALLOW_STRFRY			0
+ #endif
+ 
diff --git a/sys-apps/gawk/Manifest b/sys-apps/gawk/Manifest
index bdc452b53955..857b8cc843f6 100644
--- a/sys-apps/gawk/Manifest
+++ b/sys-apps/gawk/Manifest
@@ -1,4 +1,4 @@
 DIST gawk-5.3.1.tar.xz 3510032 BLAKE2B be9132324344c0b052e954e004a942ff7c6b14b86b73cda491d7a33485f60341be4d8da1a06d1d7a27445b9b39a528bcce3eee9c2a3f8756de21bdc57a33f54d SHA512 c6b4c50ce565e6355ca162955072471e37541c51855c0011e834243a7390db8811344b0c974335844770e408e1f63d72d0d81459a081c392e0245c726019eaff
 DIST gawk-5.3.1.tar.xz.sig 488 BLAKE2B 2abafbb965912a194d047bed3ac1ef33a2b44dce0bc4b1a83a6ca3e2ecf676da0ad8333bb3817f0f32c7d67ab8662dc6086c9e1d6f2185a93d786390197fc643 SHA512 3e13b1bd598b7d4c715c802dcc9db298aeab12721620692f9dd76d3941fdfd87381f660c93be5cc04b6cd7378a6464b9033c93419dfcb514dcc33da8d0d9f502
-EBUILD gawk-5.3.1.ebuild 2676 BLAKE2B ffd0a95b7d5924e9f77402cb7c75fc5cc3de4fbfcf8898ee305727bbfa207325b18b2e8f8345527fcf822656530c0012f5b769963cfc8261602a18d4717b2637 SHA512 b9aca962eb72030927c44ad1b94131ae2ac4b742e3840b832ad5e9d6a6cebfc1ed15000859286da3be7e2401a25645e56c21ba79c7a439ded1585c1f9159b952
+EBUILD gawk-5.3.1.ebuild 2743 BLAKE2B b4f50a501b9d6fb85b0badac9325800ddb3a73bd5e18b8d4a66d860e2681f9f6525d5a5c4cc5b87cfcb0f2abf17b8713e4aca94925ccf7601221c1c8b3a8805a SHA512 e23bdc86b845f309a943d927c5a4977a0f8142f7a4c7019a8d5c739561d227fa65e1d8638afc4503bcdc7ff76ee91441cb6e021db6f8b65beddbf6d7fbbe6520
 MISC metadata.xml 654 BLAKE2B e04183a376da2006e727296257a18431f2e4f29fdabcee48edebb1c9dbf099c846af6bfe90d9e551ec4536c2dd034a80b47e6a1b8e442a89c1228929bef7d956 SHA512 9bb5a19c4b9a8ff7669c7ae7320a88d64eb68b4897f06d2046f71efe562a4846cb8c611bcc03b0111dfde19b40275f3357a5cd6285d4d5f0b4464a9c8b3eacb2
diff --git a/sys-apps/gawk/gawk-5.3.1.ebuild b/sys-apps/gawk/gawk-5.3.1.ebuild
index 116a94925b2f..2d4476058498 100644
--- a/sys-apps/gawk/gawk-5.3.1.ebuild
+++ b/sys-apps/gawk/gawk-5.3.1.ebuild
@@ -24,7 +24,7 @@ if [[ ${GAWK_IS_BETA} == yes || ${PV} == *_beta* ]] ; then
 	SRC_URI="https://www.skeeve.com/gawk/${MY_P}.tar.gz"
 else
 	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/gawk.asc
-	inherit verify-sig
+	inherit verify-sig flag-o-matic
 
 	SRC_URI="mirror://gnu/gawk/${P}.tar.xz"
 	SRC_URI+=" verify-sig? ( mirror://gnu/gawk/${P}.tar.xz.sig )"
@@ -60,6 +60,8 @@ fi
 src_prepare() {
 	default
 
+	use elibc_musl && append-cppflags -D__GNU_LIBRARY__
+
 	# Use symlinks rather than hardlinks, and disable version links
 	sed -i \
 		-e '/^LN =/s:=.*:= $(LN_S):' \
diff --git a/sys-apps/tuned/Manifest b/sys-apps/tuned/Manifest
index 74aeb4f7e348..02f1bcaac9d5 100644
--- a/sys-apps/tuned/Manifest
+++ b/sys-apps/tuned/Manifest
@@ -1,10 +1,6 @@
 AUX tuned.initd 421 BLAKE2B b60d6fbf4110ba7e0b5c36159dc9624460ccb8774f101a50b89e633bb177a8ef9d7c36fa425a27d8c5ec6c7b9b19965212cb5ee4b60e02abb3c3990beb26840a SHA512 0123e60def031887040df8690222cc553d93b3c5eb7413e19f722ef04ccf2aeb6468709f66866d432d4d0b0c0ed6875929f1292fde8ad18c4a6b589d1b40fab4
-DIST tuned-2.23.0.tar.gz 261402 BLAKE2B 7fb46fc8eb074779c963c8424c3e802cd9ef216ef80cd96ba8d9d3f1bc83dc03187496044d164cbc1ef6c164ee9004b2dfc6795cf6b6605cb662502f3b4cc5c2 SHA512 b7d95b17ab38ac944e6e5b8b4345ddf65120a03ebb73cdb1795525c237852a8fa4223dcef6ce28189874e5010c8076816bd3646fd7f700983f2449400a2057d8
-DIST tuned-2.24.0.tar.gz 263676 BLAKE2B e699ca612bdf9395e47c0882c8302c14a3d657299f224580cab0a9c3eda73a6a435af6d34d69d5cf9df138a1d87fcd2eb16e551427d348231322a1250de4981d SHA512 d004cd621e26195fff14b39f29b2143cf47de09641454acd3029d61142c3d000a452f018356c84c32772bd99fc766f6ee847d2a8eddbde8ae34aaa0ecefa644e
 DIST tuned-2.24.1.tar.gz 264503 BLAKE2B 7b83e52c03ceb9b565707cbc95122065badfca2e29a818f6ca78523550eb27d27eddb95bc3e5f81d997e36c52d342e87929a025fa60844144df93175613dafef SHA512 66c0a438a6bd0f2febd3bd0f1bb65ab05141f167b51581fae997922965308f0127b605cf57291244074f24598d1166f628dd2ed102f4829e5b164a23f8712b3f
 DIST tuned-2.25.1.tar.gz 268726 BLAKE2B 324f47f7a45bb363fb171ceed3139da3a7f2b16fecda061ac1183b58c09c9787dff50d2092b21d3e0c8a2c259cecbd8f501ff6de284837f47b49c2deb89b4185 SHA512 fa5ac9d818d11b118fb7c26db28993b704f590070edbece570fee1a6c60a1f5f850b711683c45b46f33d9b056a84e43ced2c4c1ee58e9ef3d1fd035a4c1d4de4
-EBUILD tuned-2.23.0.ebuild 1661 BLAKE2B 0dbb4e4bd026c23b9df9dc150ed823a01a4fcfb945dfb4aec55f42142be0f33c4a1de6d56b8a65208d5a61f202044fa53694fea327198d7f5ec47c0ebfac7542 SHA512 a6e50c3389abb2c4ced5232468bfa4d6c5ebddb45f9db9b05dd39a342d1343a5a88e5cf8150ce0cb25c9ea3675b1cb3e5e9b9cb550ef5ee2755f9582fc6fd16f
-EBUILD tuned-2.24.0.ebuild 1661 BLAKE2B 0dbb4e4bd026c23b9df9dc150ed823a01a4fcfb945dfb4aec55f42142be0f33c4a1de6d56b8a65208d5a61f202044fa53694fea327198d7f5ec47c0ebfac7542 SHA512 a6e50c3389abb2c4ced5232468bfa4d6c5ebddb45f9db9b05dd39a342d1343a5a88e5cf8150ce0cb25c9ea3675b1cb3e5e9b9cb550ef5ee2755f9582fc6fd16f
 EBUILD tuned-2.24.1.ebuild 1661 BLAKE2B 0dbb4e4bd026c23b9df9dc150ed823a01a4fcfb945dfb4aec55f42142be0f33c4a1de6d56b8a65208d5a61f202044fa53694fea327198d7f5ec47c0ebfac7542 SHA512 a6e50c3389abb2c4ced5232468bfa4d6c5ebddb45f9db9b05dd39a342d1343a5a88e5cf8150ce0cb25c9ea3675b1cb3e5e9b9cb550ef5ee2755f9582fc6fd16f
-EBUILD tuned-2.25.1.ebuild 1661 BLAKE2B e480dc82145d364ad556b6bf7e7171e9440120c4896658afb2f1db78dadc28e05a850afe1737b645ee47228ff4f6effd618b67d348f911bc34ffad3ceccfa0b8 SHA512 1a0121dafe18cab3d97132bf482ef36752b9634b81b6635087167997274efd582795fbd23965f714779a6693182cad52b16eb77ba375475830842ef577306bf6
+EBUILD tuned-2.25.1.ebuild 1661 BLAKE2B 7e2ba5c2b934003675ea21d07e56db2461b49c690e7e4d7f6f060707e851ed88119042ad0b40b9e13c8190680c2279c7cc858b5f57017ac1349fa91b306a6f23 SHA512 da74730eec227b4925c4bf1447cd003a71f9db68d28076455a0a4ad249ca93705415fc1f6fc7d4c8c6a0f0bb95942a46936778819fe9d8110a76478ecdb94265
 MISC metadata.xml 475 BLAKE2B ca2eee9508f8d677576ed4d45fc766caf947e7d6489d35419d8093259d8b1aae0cc9986c5c24487ccb2d07fa33553396f7cc1cd6de9ad2ad013dce102d76ce65 SHA512 2a065af5dcd2dd55ca66f7b56207578a97b173af82e77b1d3f2c912b3efcfa6f4b3d2febe2e84f36028a83e59c0809e7da7cdd93bc0020e1e5ae46b39e0e735e
diff --git a/sys-apps/tuned/tuned-2.23.0.ebuild b/sys-apps/tuned/tuned-2.23.0.ebuild
deleted file mode 100644
index 7f5306e69847..000000000000
--- a/sys-apps/tuned/tuned-2.23.0.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit optfeature python-single-r1 tmpfiles xdg-utils
-
-DESCRIPTION="Daemon for monitoring and adaptive tuning of system devices"
-HOMEPAGE="https://github.com/redhat-performance/tuned"
-SRC_URI="https://github.com/redhat-performance/tuned/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="
-	${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-python/configobj[${PYTHON_USEDEP}]
-		dev-python/dbus-python[${PYTHON_USEDEP}]
-		dev-python/decorator[${PYTHON_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-		dev-python/python-linux-procfs[${PYTHON_USEDEP}]
-		dev-python/pyudev[${PYTHON_USEDEP}]
-	')"
-
-RDEPEND="
-	${DEPEND}
-	app-emulation/virt-what
-	dev-debug/systemtap
-	sys-apps/dbus
-	sys-apps/ethtool
-	sys-power/powertop
-	"
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e "/^PYTHON/s:/usr/bin/python3:${EPREFIX}/usr/bin/${EPYTHON}:" \
-		-e "/^export DOCDIR/s/$/&\-\$(VERSION)/g" \
-		-e "/\$(DESTDIR)\/run\/tuned/d" \
-		-e "/\$(DESTDIR)\/var\/lib\/tuned/d" \
-		-e "/\$(DESTDIR)\/var\/log\/tuned/d" \
-		Makefile || die
-}
-
-src_install() {
-	default
-
-	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
-	python_fix_shebang "${D}"
-	python_optimize
-}
-
-pkg_postinst() {
-	tmpfiles_process ${PN}.conf
-	xdg_icon_cache_update
-
-	optfeature_header
-	optfeature "Optimize for power saving by spinning-down rotational disks" sys-apps/hdparm
-	optfeature "Get hardware info" sys-apps/dmidecode
-	optfeature "Optimize network txqueuelen" sys-apps/iproute2
-}
diff --git a/sys-apps/tuned/tuned-2.24.0.ebuild b/sys-apps/tuned/tuned-2.24.0.ebuild
deleted file mode 100644
index 7f5306e69847..000000000000
--- a/sys-apps/tuned/tuned-2.24.0.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit optfeature python-single-r1 tmpfiles xdg-utils
-
-DESCRIPTION="Daemon for monitoring and adaptive tuning of system devices"
-HOMEPAGE="https://github.com/redhat-performance/tuned"
-SRC_URI="https://github.com/redhat-performance/tuned/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="
-	${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-python/configobj[${PYTHON_USEDEP}]
-		dev-python/dbus-python[${PYTHON_USEDEP}]
-		dev-python/decorator[${PYTHON_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-		dev-python/python-linux-procfs[${PYTHON_USEDEP}]
-		dev-python/pyudev[${PYTHON_USEDEP}]
-	')"
-
-RDEPEND="
-	${DEPEND}
-	app-emulation/virt-what
-	dev-debug/systemtap
-	sys-apps/dbus
-	sys-apps/ethtool
-	sys-power/powertop
-	"
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e "/^PYTHON/s:/usr/bin/python3:${EPREFIX}/usr/bin/${EPYTHON}:" \
-		-e "/^export DOCDIR/s/$/&\-\$(VERSION)/g" \
-		-e "/\$(DESTDIR)\/run\/tuned/d" \
-		-e "/\$(DESTDIR)\/var\/lib\/tuned/d" \
-		-e "/\$(DESTDIR)\/var\/log\/tuned/d" \
-		Makefile || die
-}
-
-src_install() {
-	default
-
-	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
-	python_fix_shebang "${D}"
-	python_optimize
-}
-
-pkg_postinst() {
-	tmpfiles_process ${PN}.conf
-	xdg_icon_cache_update
-
-	optfeature_header
-	optfeature "Optimize for power saving by spinning-down rotational disks" sys-apps/hdparm
-	optfeature "Get hardware info" sys-apps/dmidecode
-	optfeature "Optimize network txqueuelen" sys-apps/iproute2
-}
diff --git a/sys-apps/tuned/tuned-2.25.1.ebuild b/sys-apps/tuned/tuned-2.25.1.ebuild
index 4acfafc66f79..f0dbc2de388f 100644
--- a/sys-apps/tuned/tuned-2.25.1.ebuild
+++ b/sys-apps/tuned/tuned-2.25.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 
 inherit optfeature python-single-r1 tmpfiles xdg-utils