gentoo auto-resync : 28:04:2024 - 23:59:44

12 files changed, 41 insertions, 206 deletions

diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 8880333b61e9..cce16a45b749 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/binwalk/Manifest b/app-misc/binwalk/Manifest
index 5e0dfd062439..ddf62275a91e 100644
--- a/app-misc/binwalk/Manifest
+++ b/app-misc/binwalk/Manifest
@@ -1,8 +1,6 @@
-DIST binwalk-2.3.6.tar.gz 39723335 BLAKE2B 20710dc32f67981b1ba69ced649bfddc0247b9054a30ba9a8ab17710094fa4f45a44b32b18e2de6e0c63d632044432e8d4a8ec8cdacb007996b7d91b983547bc SHA512 05e06682a9b8aa6b68b580b6818a2f08d8d81d89961f6cacfd9d14185c26727bbdf6dedb2f26079fffebf7de6f45002944ed8f3475ba04e4b05ac6d5c19560ea
-DIST binwalk-2.3.8.tar.gz 39723354 BLAKE2B 87c4e9e78e7a2c6132266ad9bd4ba1cfc05fccb078b41b7a9890c59586175c1993bea5c642493c42c10d3e2af36965c88612c881fec750eb7d99b260226ae65f SHA512 5b99626496ae236f32ae190372b4e24dbb3873413bc822a67096fb380139835379556987cfd6f7561a8b36574ec4d4ea8007182edb6d58ac1cd993cafb46d1a7
 DIST binwalk-2.4.0.tar.gz 39744574 BLAKE2B 8503e86afb584e431b25611fbed91e85aaf307e9011b5ef09a83b5f4756a815f9d3de67d440a2b7547cbe162d1940e8d6ffc4899afac14ccb938304002b1eb41 SHA512 41bee6a0d1cd587f81dcf81c30215a305b61e4db208bc9d8e4f0b9f12acb47e4dc2e6af23e06118ef6e30c484f6be743b456b6d4324be4388413ff291682345e
-EBUILD binwalk-2.3.6.ebuild 933 BLAKE2B 6b1eef67f2f38b557e4a57a76bc13d3e939040125787fb4e2b68b3ce9b12b196701452ccbfdce659e92ee32fded644a285afa5beaa95af4b8e9474a861edc8a7 SHA512 e35c1e284f10dbc50d2cb0dcc6daffd67096e79c86c590b5017b4489c3efee4224298fe0c6edbad7e8dc8887a3c7b3f62de92a5b486b83d798b215e9a769371f
-EBUILD binwalk-2.3.8.ebuild 1047 BLAKE2B 99733084f0e38211482042d1aec0d863275766cf1fc8845eceab8955c969c1224f1ab763fe23ccc5a5f83a75bd01c630303d3cd8b0ae440d4adcfe1c2aa17efb SHA512 06008eefd94e6e0da07081c7df3a22596e5a34dbdd5eab9964b6e7ecdec4ffcd48f1a39e1623b343c0381556dc848100e58a3f0d76f4cceff28c1f1c04338d76
+DIST binwalk-2.4.1.tar.gz 39747760 BLAKE2B 480f8ff06932c77ca5ab2857cddf7ecebb36b6f2e55e3ccf15a971fa0f4c59d57b652556fd9f0dd20e6fbd887fdef3c6da022f76787b2edf16b0d1714d291e8a SHA512 f83d0ca09a39033944ce16345b7c2c8f3051a20f80315e4c797221df4e6844c7c89c0a49053d739156e2654b482d6ef93f0814fa588daab031dbeaed1423e6f2
 EBUILD binwalk-2.4.0.ebuild 1041 BLAKE2B 24635f029d24d35e687af91c647b83ba9370e715e73736254ca8f304ff0fcadd71585c447e5b7a7de03713d0f1f3014d76c500b84402b7a33d633dcc85f2c81b SHA512 16c23b245e57b1740143c0f96b9e9e6494d27b0df7dacd9fff3839d7052f258cc2514c236f746c89c7612804214820fb3ceecd1dd15d336990efc81c3f2f8bda
-EBUILD binwalk-9999.ebuild 1047 BLAKE2B 99733084f0e38211482042d1aec0d863275766cf1fc8845eceab8955c969c1224f1ab763fe23ccc5a5f83a75bd01c630303d3cd8b0ae440d4adcfe1c2aa17efb SHA512 06008eefd94e6e0da07081c7df3a22596e5a34dbdd5eab9964b6e7ecdec4ffcd48f1a39e1623b343c0381556dc848100e58a3f0d76f4cceff28c1f1c04338d76
+EBUILD binwalk-2.4.1.ebuild 1053 BLAKE2B c14f5be35204c116b66b1201617b0b99fa994e3119bd10bf108ba067c6347dac12de6edc123e460b863c5ac059c079996c6b95e1b7af102a4ff24e535a3130fd SHA512 0835361f16e64644f8d7f482b2e376e7a598df649124c41902aca20e0ddff41539881b7d55c9434a16a5f332d3d6eb6b2b8ace62198841bec9dce99579431f3e
+EBUILD binwalk-9999.ebuild 1053 BLAKE2B c14f5be35204c116b66b1201617b0b99fa994e3119bd10bf108ba067c6347dac12de6edc123e460b863c5ac059c079996c6b95e1b7af102a4ff24e535a3130fd SHA512 0835361f16e64644f8d7f482b2e376e7a598df649124c41902aca20e0ddff41539881b7d55c9434a16a5f332d3d6eb6b2b8ace62198841bec9dce99579431f3e
 MISC metadata.xml 1056 BLAKE2B 6af373bfeff084c9d068255f7e8fec1fa485f23a3619c9995c83e94ad1a88c269926a71777c7165355ac8d363808efb65ac16a496e2b39a96c5c25f1c3aee9ce SHA512 b65dbca86bb1f9dfca4b2656426576f9dc8d98859f52ad7fe9c9c5fbf0c893c3b3022452fc707730fbab85d7ca32d84a3c3fddbd80826cec73ff2b8747d2bc70
diff --git a/app-misc/binwalk/binwalk-2.3.6.ebuild b/app-misc/binwalk/binwalk-2.3.6.ebuild
deleted file mode 100644
index d77b715b9380..000000000000
--- a/app-misc/binwalk/binwalk-2.3.6.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-
-inherit distutils-r1
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/OSPG/binwalk.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/OSPG/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86 ~x64-macos"
-fi
-
-DESCRIPTION="A tool for identifying files embedded inside firmware images"
-HOMEPAGE="https://github.com/ReFirmLabs/binwalk"
-
-LICENSE="MIT"
-SLOT="0"
-
-distutils_enable_tests pytest
-
-python_install_all() {
-	local DOCS=( API.md INSTALL.md README.md )
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog "binwalk has many optional dependencies to automatically"
-		elog "extract/decompress data, see INSTALL.md for more details."
-	fi
-}
diff --git a/app-misc/binwalk/binwalk-2.3.8.ebuild b/app-misc/binwalk/binwalk-2.4.1.ebuild
index 53c023e8014b..e628cb990f4e 100644
--- a/app-misc/binwalk/binwalk-2.3.8.ebuild
+++ b/app-misc/binwalk/binwalk-2.4.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..12} pypy3 )
+PYTHON_COMPAT=( python3_{10..12} pypy3 )
 
 inherit distutils-r1 optfeature
 
@@ -34,7 +34,7 @@ pkg_postinst() {
 	optfeature "disassembly" dev-libs/capstone[python]
 
 	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog "binwalk has many optional dependencies to automatically"
+		elog "binwalk has many more optional dependencies to automatically"
 		elog "extract/decompress data, see INSTALL.md for more details."
 	fi
 }
diff --git a/app-misc/binwalk/binwalk-9999.ebuild b/app-misc/binwalk/binwalk-9999.ebuild
index 53c023e8014b..e628cb990f4e 100644
--- a/app-misc/binwalk/binwalk-9999.ebuild
+++ b/app-misc/binwalk/binwalk-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..12} pypy3 )
+PYTHON_COMPAT=( python3_{10..12} pypy3 )
 
 inherit distutils-r1 optfeature
 
@@ -34,7 +34,7 @@ pkg_postinst() {
 	optfeature "disassembly" dev-libs/capstone[python]
 
 	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog "binwalk has many optional dependencies to automatically"
+		elog "binwalk has many more optional dependencies to automatically"
 		elog "extract/decompress data, see INSTALL.md for more details."
 	fi
 }
diff --git a/app-misc/carbon-c-relay/Manifest b/app-misc/carbon-c-relay/Manifest
index c9ea29839fa0..7100e98c5456 100644
--- a/app-misc/carbon-c-relay/Manifest
+++ b/app-misc/carbon-c-relay/Manifest
@@ -1,9 +1,7 @@
 AUX carbon-c-relay.confd-r1 365 BLAKE2B 10a531055296877bb027f5dc6546b054da7e5b84950bbcf8de8d4af552e61fcd9bbebeea3bc432a25f14103c4f2f30db4885259f855182e6923b79649e63fb60 SHA512 a432cf28c86ec45c807eeb5a7b506e7dcc6155c138aea5dc60eb8bcf5036ac0efc3a81fbc044af34dab5f05f250635892c5e706dfd69cc1087f0c283c3aa9393
-AUX carbon-c-relay.initd-r1 1801 BLAKE2B 4627b6e0d9a44d5c544ccff0c33557c73dd971929fbb442be79f3913752f39b1d534d4e4e936ebe94ebd5883d56e3f04314b9033c0a5ef7a3cbe7e05e1aeeb42 SHA512 5cf3c424a8be6bb55a80b58ce590838fec8ed26f8f407e8561c1e3ea094e80ad4021d153b3d816ab6d4e6589494d9ce621fe14196e223ef3a092d0aa26a63399
 AUX carbon-c-relay.initd-r2 1805 BLAKE2B 4e45257b74319b06e3e4092d803ea967436dfedd3da10406dc398e9fe2a2fbd1cdc2020e47d1864209ed16adb8b4bfb77eabe41b304d9cc262da528e95935fbb SHA512 0842fa097c7a441907210b30ed1a75b9137d41f4c885f273d5d3b2eedd2403bb55bd7c443be10f8a4f3645d19ae1c466404a7b30c06d09810f7895fa64bb23f7
-DIST carbon-c-relay-3.7.3.tar.gz 575680 BLAKE2B d2d07c7f1ec356a16bb375bd740ffa018a0d256ef1ce97ae0555001411a05e28173c2009f3980b0d711977068392b5a0baca68f9dda3a677c7c3d245cad70a0e SHA512 ba3e4b7173abe5e3b018413a8d46d91c3f433e785dcf3d7643836b91f9a6ff993b22c3db51192476c75d45486d1e2541ad73056671b4bdbfd1447dcfc3f26ff3
 DIST carbon-c-relay-3.7.4.tar.gz 584098 BLAKE2B 27fe6d7b785129aa6edd81e0a92880eee3530249900662e63f1ad7a9c1b4c8f9ff98635989311de964e4c42d4bb98f3ce1956ed170b8eceeea558ec3c191f45e SHA512 a9bcaa699e071e57e0a9092b97d1ead6781af4e00ef19f289a986c5baf56dec2c747961dfc2622285de034c17ce7ed2f5a7c856d617b26488dbdea58c4d72754
-EBUILD carbon-c-relay-3.7.3.ebuild 1554 BLAKE2B 5b6503c4885b83de536991982ed922e9dd29fe45b22ca521b3fec74670f10db374cf5d9b836bfd24f0813c649b6c0c1c67bac5928d826cf7adfae1fed69a88fa SHA512 618d79a13ec5d434aeebd9ebda98cb59a8e83a8533a4b60e7b7de4060801f9768e5910ab7f3a521c14b41652fdf2e36d9bbb1cad099b9b5e7f0b1ba6e59d2ded
-EBUILD carbon-c-relay-3.7.4-r1.ebuild 1561 BLAKE2B c6d83bf7ed429d8241f5c1fba7b2314f4df73cc78f07c47f19a26d735e12aa02527cabd65958a3b7a1ac6c4a580e1a8569123457f7ea29b33e6500b3695693ba SHA512 b3b5c6702bcc93722b40acf1d9fafa1f5a4be520b7a622152cb60788439141a97b0f6040d46d8013f65763e52c37f1de984f80df2a2ec25307a8499885cf5c44
+DIST carbon-c-relay-3.8.1.tar.gz 465489 BLAKE2B 984bc330e0188cd403461c44388e8166840eeafc6f76cefd3f13da617ef9026ee7638367522d046b7f7df268aecaa088603be98a7f5650cce7759b00193d52d0 SHA512 fd59bf8af91a606e03e80c7ab7c8819d6040e2f8057bd66c6fcdacc526e5ba41479b19393919d89712af78a5050dd61db378b9620a880e7cec6b5c9b19e10ff5
 EBUILD carbon-c-relay-3.7.4-r3.ebuild 1331 BLAKE2B 5384dd8c9f18acc3dccfa78ee30d7dcd230b48ef2b50ece9bbe2c5240f49ab8b77a4b837aa0ff5f9b6492649e369ff9199adfaa0a71cbb524548eaebc66aa893 SHA512 82d7d9d46a32d9a9fe5ea52aa93a2f188711b9f9042f1ecd95d7993b1fb9cb20b7915eb2450c0d648ca5d79d02d57553eba30ba71a185e5dcb34429b6e52c6ec
-MISC metadata.xml 654 BLAKE2B 9cf6ce108100d80ba05644a782876997280ae4523b07366b3a88942fad4392fed358b134e8f33597fdc98540698531e3e7b0155e63194b4030de227f4a4c75e1 SHA512 954f00ed3ccde9cc651e9de24bcc2339deca58b2cc27f923801862fdc5298771ce5c0e729fa03c2d4d5b03624dbcbd3a17295b7e4e31fbb57221da861747d545
+EBUILD carbon-c-relay-3.8.1.ebuild 1432 BLAKE2B 2c2325504b024561d6f4a984c6a54b2830f981e1eaccd49c7a73310aa6cce9c88e1742e0edccfbd8616037e35f13229354cf8fecf644802c7b367a1132516067 SHA512 f0df2165193d24bd3f1425789af84ad5f480d70af5be760c3b7c24dd572c1494768968050db91734a9c7b16a4d89a4eb1ede3adc4147c9b8664027a3870b76ed
+MISC metadata.xml 729 BLAKE2B 524f22188951b038e4c33458cd3fac69b8cafc1f70a517b0115ef305c7a0e0961210582471eefc91ec9074afe96fae0e2dcc249f223148dca1a6f74c49216f3f SHA512 86e44039f5fb939cb0af1202e2ad9458f48203faec0ea2ea14dbba7a0da51272d6afac36dee2d5942f0ec000e6049e5687423dc6a0c17fa0687a8a0ceb3ec18b
diff --git a/app-misc/carbon-c-relay/carbon-c-relay-3.7.3.ebuild b/app-misc/carbon-c-relay/carbon-c-relay-3.7.3.ebuild
deleted file mode 100644
index 4e3fbd702416..000000000000
--- a/app-misc/carbon-c-relay/carbon-c-relay-3.7.3.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Enhanced C version of Carbon relay, aggregator and rewriter"
-HOMEPAGE="https://github.com/grobian/carbon-c-relay"
-SRC_URI="https://github.com/grobian/carbon-c-relay/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x64-macos ~x64-solaris"
-IUSE="lz4 snappy zlib ssl pcre pcre2 +oniguruma"
-
-# ensure only one of pcre, pcre2 and oniguruma is set, or none (libc)
-# unforunately pcre is in global USE, so we have to exclude that here
-REQUIRED_USE="
-	pcre2?     ( !oniguruma )
-	oniguruma? ( !pcre2 )
-"
-RDEPEND="lz4? ( app-arch/lz4 )
-	snappy? ( app-arch/snappy )
-	zlib? ( app-arch/gzip )
-	ssl? ( dev-libs/openssl:0= )
-	!oniguruma? ( !pcre2? ( pcre? ( dev-libs/libpcre ) ) )
-	pcre2? ( dev-libs/libpcre2 )
-	oniguruma? ( dev-libs/oniguruma )
-	acct-group/carbon
-	acct-user/carbon"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	local pcrecfg
-	if use !pcre2 && use !oniguruma ; then
-		pcrecfg=$(use_with pcre)
-	else
-		pcrecfg="--without-pcre"
-	fi
-
-	econf $(use_with lz4) $(use_with snappy) \
-		$(use_with ssl) $(use_with zlib gzip) \
-		"${pcrecfg}" $(use_with pcre2) $(use_with oniguruma)
-}
-
-src_install() {
-	default
-
-	# rename too generic name
-	mv "${ED}"/usr/bin/{relay,${PN}} || die
-
-	# remove libfaketime, necessary for testing only
-	rm -f "${ED}"/usr/$(get_libdir)/libfaketime.*
-
-	dodoc ChangeLog.md
-
-	newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd-r1 ${PN}
-}
diff --git a/app-misc/carbon-c-relay/carbon-c-relay-3.7.4-r1.ebuild b/app-misc/carbon-c-relay/carbon-c-relay-3.8.1.ebuild
index 3282c5737a7d..17b4a10ca21f 100644
--- a/app-misc/carbon-c-relay/carbon-c-relay-3.7.4-r1.ebuild
+++ b/app-misc/carbon-c-relay/carbon-c-relay-3.8.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 DESCRIPTION="Enhanced C version of Carbon relay, aggregator and rewriter"
 HOMEPAGE="https://github.com/grobian/carbon-c-relay"
@@ -10,36 +10,44 @@ SRC_URI="https://github.com/grobian/carbon-c-relay/releases/download/v${PV}/${P}
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x64-macos ~x64-solaris"
-IUSE="lz4 snappy zlib ssl pcre pcre2 +oniguruma"
+IUSE="client lz4 snappy zlib ssl pcre2 +oniguruma"
 
-# ensure only one of pcre, pcre2 and oniguruma is set, or none (libc)
-# unforunately pcre is in global USE, so we have to exclude that here
+# ensure only one of pcre2 and oniguruma is set, or none (libc)
 REQUIRED_USE="
 	pcre2?     ( !oniguruma )
 	oniguruma? ( !pcre2 )
 "
-RDEPEND="lz4? ( app-arch/lz4 )
+DEPEND="
+	lz4? ( app-arch/lz4 )
 	snappy? ( app-arch/snappy )
 	zlib? ( app-arch/gzip )
 	ssl? ( dev-libs/openssl:0= )
-	!oniguruma? ( !pcre2? ( pcre? ( dev-libs/libpcre ) ) )
 	pcre2? ( dev-libs/libpcre2 )
 	oniguruma? ( dev-libs/oniguruma )
+"
+RDEPEND="
+	${DEPEND}
 	acct-group/carbon
-	acct-user/carbon"
-DEPEND="${RDEPEND}"
+	acct-user/carbon
+"
 
 src_configure() {
-	local pcrecfg
-	if use !pcre2 && use !oniguruma ; then
-		pcrecfg=$(use_with pcre)
-	else
-		pcrecfg="--without-pcre"
-	fi
+	econf \
+		$(use_with lz4) \
+		$(use_with snappy) \
+		$(use_with ssl) \
+		$(use_with zlib gzip) \
+		--without-pcre \
+		$(use_with pcre2) \
+		$(use_with oniguruma)
+}
 
-	econf $(use_with lz4) $(use_with snappy) \
-		$(use_with ssl) $(use_with zlib gzip) \
-		"${pcrecfg}" $(use_with pcre2) $(use_with oniguruma)
+src_compile() {
+	default
+	# build useful utility irregardless of FEATURES=test
+	if use client ; then
+		emake sendmetric || die
+	fi
 }
 
 src_install() {
@@ -47,9 +55,8 @@ src_install() {
 
 	# rename too generic name
 	mv "${ED}"/usr/bin/{relay,${PN}} || die
-
-	# remove libfaketime, necessary for testing only
-	rm -f "${ED}"/usr/$(get_libdir)/libfaketime.*
+	# install useful utility
+	use client && dobin sendmetric
 
 	dodoc ChangeLog.md
 
diff --git a/app-misc/carbon-c-relay/files/carbon-c-relay.initd-r1 b/app-misc/carbon-c-relay/files/carbon-c-relay.initd-r1
deleted file mode 100644
index 1e2734941cc1..000000000000
--- a/app-misc/carbon-c-relay/files/carbon-c-relay.initd-r1
+++ /dev/null
@@ -1,74 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-extra_commands="configtest"
-extra_started_commands="reload"
-
-description="Lightweight graphite metrics router and aggregator."
-description_configtest="Run carbon-c-relay's internal config check."
-description_reload="Reload the carbon-c-relay configuration without losing connections."
-
-routes_config=${ROUTES_FILE:-/etc/${SVCNAME}.conf}
-
-command="/usr/bin/carbon-c-relay"
-command_args="-f ${routes_config} ${EXTRA_OPTS}"
-pidfile="/run/carbon-c-relay/${SVCNAME}.pid"
-logfile=${LOGFILE:-/var/log/${SVCNAME}.log}
-user=${USER:-carbon}
-group=${GROUP:-carbon}
-
-depend() {
-	need net
-	use dns
-}
-
-start_pre() {
-	if [ "${RC_CMD}" != "restart" ]; then
-		configtest || return 1
-	fi
-	touch "${logfile}"
-	mkdir -p "${pidfile%/*}"
-	chown ${user}:${group} "${logfile}" "${pidfile%/*}"
-}
-
-stop_pre() {
-	if [ "${RC_CMD}" = "restart" ]; then
-		configtest || return 1
-	fi
-}
-
-stop_post() {
-	rm -f "${pidfile}"
-}
-
-start() {
-	ebegin "Starting ${SVCNAME}"
-	start-stop-daemon --start --pidfile "${pidfile}" \
-		--user ${user} --group ${group} \
-		--exec ${command} -- -D -P "${pidfile}" -l "${logfile}" \
-		${command_args}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping ${SVCNAME}"
-	# migration path
-	local pfile=${pidfile}
-	[[ -e /run/carbon-c-relay.pid ]] && pfile="/run/carbon-c-relay.pid"
-	start-stop-daemon --stop --exec ${command} --pidfile "${pfile}"
-	eend $?
-}
-
-reload() {
-	configtest || return 1
-	ebegin "Refreshing ${SVCNAME}'s configuration"
-	kill -HUP $(< "${pidfile}") &>/dev/null
-	eend $? "Failed to reload ${SVCNAME}"
-}
-
-configtest() {
-	ebegin "Checking ${SVCNAME}'s configuration"
-	${command} -f "${routes_config}" -t < /dev/null > /dev/null
-	eend $? "failed, please correct errors above"
-}
diff --git a/app-misc/carbon-c-relay/metadata.xml b/app-misc/carbon-c-relay/metadata.xml
index 6555a55f462c..a156277eb8f0 100644
--- a/app-misc/carbon-c-relay/metadata.xml
+++ b/app-misc/carbon-c-relay/metadata.xml
@@ -5,6 +5,7 @@
     <email>grobian@gentoo.org</email>
   </maintainer>
   <use>
+    <flag name="client">build and install sendmetric client utility</flag>
     <flag name="lz4">add support for LZ4 compressed transport</flag>
     <flag name="snappy">add support for Snappy compressed transport</flag>
     <flag name="pcre2">use <pkg>dev-libs/libpcre2</pkg> as regex implementation</flag>
diff --git a/app-misc/gnote/Manifest b/app-misc/gnote/Manifest
index cfd8387da1fb..7e19ceb9ba1b 100644
--- a/app-misc/gnote/Manifest
+++ b/app-misc/gnote/Manifest
@@ -1,5 +1,5 @@
 DIST gnote-44.1.tar.xz 3330072 BLAKE2B ff86fa34bdfff61eceb25abef1c73377f888082e70e539172849bf9425eada1c11000c1a75f69eb74fdbc2fc6d45ad3c58c843bf769279a026dd5298a07abc68 SHA512 89364d161d6ecc11822b89dec0353d0e20bc08d883573f324e4980ff2420361ddeb326213eb668fba4ce8de7d5d9668a1a058666ad2b81658ef94f8a65b87363
 DIST gnote-45.2.tar.xz 3248256 BLAKE2B ab687802aa6046556c579f1a11fb807398e69f2a256a8a63f50ea76bbcdfc8708ead603f25274b678912bb567c45e96bfe708ea2d56f9733ee1e6061195826bf SHA512 5380a50cfbf235b0007c47c3a1f4860ade599789e1746a7741fc672265698bb0717858bb39e5c0612d4d4e13040f1865674ddeda1427a4818aff508ba5ce8059
 EBUILD gnote-44.1.ebuild 1467 BLAKE2B 94ec94b7ca56f9adea99504ef6f2fda297c4cc3d0e9fd886e9454e5e251d82c075e2e16367ebba848b05f041b0b7de83f12aeb8ecc6727e7bd5e05f9682398b0 SHA512 ff3ad289bdeea8f9b9e8151f45877eeae5d77c18a2109b5d27a596ca6ff2ec06efe0dbb755cde80e2177ac2a654d3a1d8287b4906402a638a9b93c00934f0d28
-EBUILD gnote-45.2.ebuild 1440 BLAKE2B b298885a59b299febf8d46b0b6e094d310f5481fd252a9b1605a17d442abe16e39993d0ef668a45acf7d2dba0e03c7ebddaeb75b9f39501b27eb75859489cb52 SHA512 c270793589eb32844294bf58608e6123c597d4c0c0bb0675aaa0f20dc0cc25ca91d32121c94596d12b61df9ae295b93844fdd1ba63a638d61c7806ebc0a1bfca
+EBUILD gnote-45.2.ebuild 1439 BLAKE2B 91c1ac5e65a8ace5485af39981af020d3a948aa2e848b2f4b0b6ea25a978523706c0fe92add93bd4391b0d09dd923a34a0039570fdd009e51a1937b2404199ae SHA512 8a333602a7693217dad23efc085f459fcddd4832d58d17e1a7b3655d8d947320731ddb4861185b6cb2632643c3eda439e232b537d507151257bd9dbf774b5482
 MISC metadata.xml 346 BLAKE2B dd5d67f5f5f2bd3205f8087ee8abab196289213b451493bcb0e059f902482449329bf03e9cd44e13cb72a347b4ee97f6b1cdf771c0723bcb93b06dcda9a3cb00 SHA512 0f177f3c20fb7215c21a2df360abfdab37bac8cc8b1405d31cd76d552d65661762a929972b0bed0a4c46b7f9c4b053b9a544209282db688699208b5ba0ccec64
diff --git a/app-misc/gnote/gnote-45.2.ebuild b/app-misc/gnote/gnote-45.2.ebuild
index 206dcb77a3c9..01cf2b8730fd 100644
--- a/app-misc/gnote/gnote-45.2.ebuild
+++ b/app-misc/gnote/gnote-45.2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Gnote"
 
 LICENSE="GPL-3+ FDL-1.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~riscv x86"
 IUSE="test"
 RESTRICT="!test? ( test )"