gentoo auto-resync : 17:10:2024 - 04:04:26

11 files changed, 233 insertions, 11 deletions

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index d8a4237f96f0..cdfaf4caee3c 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest
index c0a8406cab24..53576a3fc821 100644
--- a/sys-apps/busybox/Manifest
+++ b/sys-apps/busybox/Manifest
@@ -21,6 +21,6 @@ AUX watchdog.confd 232 BLAKE2B 14ff3813297bc987e98bf3cabee2e7b150e23d8aa9f016303
 AUX watchdog.initd 219 BLAKE2B 3726fec4551962d6e20859c52e18582fbf127e2fc2807379afe9d490ad32b19a6d10d456155fdeb0468c67816f061b1cac166db7f104dbadadf0d175082efdb4 SHA512 d329fb72ce078a95a1fb77b72321dee56d19c76b45cb78a7a57a46d9fa385b982a114be49dd8696c2d4fc2b2dd90a17ee728ef2938172cc2f8b12b5a9ebd62f5
 DIST busybox-1.36.1.tar.bz2 2525473 BLAKE2B e515825cb3ab1c520e16b9c2512e9fc72947366a72a0466bff59b507fdffbc78fc9d16b44a26116175fc7a429d849ad944b1bc379d36c6d3a0eb20969997336e SHA512 8c0c754c9ae04b5e6b23596283a7d3a4ef96225fe179f92d6f6a99c69c0caa95b1aa56c267f52d7c807f6cc69e1f0b7dd29a8ac624098f601738f8c0c57980d4
 EBUILD busybox-1.36.1-r1.ebuild 10684 BLAKE2B 01184234de83fbb82550d655b5fde39b6f6a41e9962d62e11d3ece7eb449834f670ef5e92a21f3819b29268d2cc8fbb5a4e47131e56825fbb20d003603c5dbfa SHA512 7249315799228af3dd98f2f77d58c4cce7b92f7ff77f315af2313f188544bf2a5e3ab20c6bd6f3904ef86fdd65f965b6f6f33e1e0eb751109dd2a9b92c1c8be0
-EBUILD busybox-1.36.1-r3.ebuild 10790 BLAKE2B a462658c3ddc9594174fdb4496177c45db2e0f776a0a19ef1dfbce526853e363479f54c0d02379164bf961f084057c84f36dccefa79217c17dfc58dfe419e2dd SHA512 522bd8c341ea2752dedc70ee3d1e62a61e27402f5410b6a319cb56f871e12b3d0da2da8f187c7e002ab3f79d60ed3e98959e43125b2ea6ddca03177c2969242a
+EBUILD busybox-1.36.1-r3.ebuild 10789 BLAKE2B 1b363724675390f116e8fe1d84958b5035c97d8ec232e71227953aa259d6f38fc96cfea84cc04922519b036d3ea360d350fc42fe222bd7d3ab56d654fd53a666 SHA512 0e729167f0e4640545831935a5e9ea35b7a99792be61efd801f6c5a4b3b701258f2ac02326d796780fe4b3215122714011373e4c0fa39cb7ab4b587409a2282e
 EBUILD busybox-9999.ebuild 10737 BLAKE2B 6538582dbcca6da58d2139618fdc160621ec41d95cfdd9b6cba256094dbfe960a4de681794862185a1bbf845d0086ab919ef0c780d93fc08220582586b514bf8 SHA512 46df88c38bdf00fcea26acd0c82f3b2621c28f0c9f47bc94a3dabe529e0b9827fefe7b32de70649cd68811c35346d4cba40d753963e938e7fd75690daf65fec5
 MISC metadata.xml 873 BLAKE2B d9c3725e1c3587d497894761d9eda08b670522d5c1a5518ea879cb5c9f222519005d28a36d6dea0b34d4bf4a2352e54aa151177f98ac730ce5b83e87ae4d35a2 SHA512 4c74f718046b41fbcf0111c797d6cdfa1f647914bfa5ff9aaedd6844ba1367722f225ed8ac17717d7b44c5ddc3b450e130da46cc0f6e21501b66cfd267a8f9ad
diff --git a/sys-apps/busybox/busybox-1.36.1-r3.ebuild b/sys-apps/busybox/busybox-1.36.1-r3.ebuild
index f6158c0f2f5a..0787af842957 100644
--- a/sys-apps/busybox/busybox-1.36.1-r3.ebuild
+++ b/sys-apps/busybox/busybox-1.36.1-r3.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	MY_P="${PN}-${PV/_/-}"
 	SRC_URI="https://www.busybox.net/downloads/${MY_P}.tar.bz2"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 fi
 S="${WORKDIR}/${MY_P}"
 
diff --git a/sys-apps/findutils/Manifest b/sys-apps/findutils/Manifest
index 7d3148979162..c1e11391a057 100644
--- a/sys-apps/findutils/Manifest
+++ b/sys-apps/findutils/Manifest
@@ -3,6 +3,6 @@ DIST findutils-4.10.0.tar.xz 2240712 BLAKE2B 2eebdcb425c04170d17afb80e7270ba095b
 DIST findutils-4.10.0.tar.xz.sig 488 BLAKE2B fadd7dbf80a52965d6da641bda21ce00790623cf2c959ed03c1193a22c19f30417733511a739edcb1a0a97892a1257e0e88e32d872f94e71e3ade04776337d3c SHA512 a835153a0671309021be187bf78afee58d9682acb40545aaa9dd187f0ebdea0cfa5583bd03f363243633ea056ddb0a7a6603987ab5e34a608426cb4265ac6d8f
 DIST findutils-4.9.0.tar.xz 2046252 BLAKE2B 3ada8903fc552ad2e580a7b631a4b9d941935b3f4231029564c6f2b7b10ba6f2244e2de57f6d79268c5e0481a193f64edbbae637e7a51ae6f495e3eefabf52c9 SHA512 ba4844f4403de0148ad14b46a3dbefd5a721f6257c864bf41a6789b11705408524751c627420b15a52af95564d8e5b52f0978474f640a62ab86a41d20cf14be9
 DIST findutils-4.9.0.tar.xz.sig 488 BLAKE2B 7aab47ccb1351f08be03e781332b79d6778ff0d5d7959adf75fa8eab11325ee9971c89972338edfb58daac7f702891a1a5dd8379a703ccfa601e6b99db588197 SHA512 b8e0b5471242912a20b9e468fa27b7f27339af5f7be8918173105262dee0152183bf4cf516844d348b206a694e028490d5d3b190f3aed8c698ba5444941f8dfc
-EBUILD findutils-4.10.0.ebuild 2335 BLAKE2B b37613a35ef401c14fa171f135fcd54dcc18b9685dee8afc978d4e9454dd39ed63572cf60b6b640ac327669bb9ba54587497a85e8fdd40a09dd8dc24023a1ada SHA512 f26e261e10fe8847b9e02b1d06ca94ab97738c06937c299ee88562c3dfc2e83adde667abde3aed22d703d73a454c17383726ab0e10a920d9e62292ba11bde951
+EBUILD findutils-4.10.0.ebuild 2334 BLAKE2B d2ebd61841595c99e1935cca7f64aa674a46ab474887893d69bea400e21f450b497b23ac1bdd4e1d7d32cfec52a3a5c0cac3c9f5358ac836f27333923c4253d4 SHA512 5aa86f11f85eae421d4da327d932cd44845fd7bfe4e28636ffeb10432795bdf0bc1c046a4add03a5cc635c77386704446d9ebe5e92641e345da75fddf325aabf
 EBUILD findutils-4.9.0-r2.ebuild 2390 BLAKE2B 0dfd9a900b2672f95ab548e9dc9866416783950d7ad3b36070917b1c99f9703b2ca4f035d07ed50bd18dcd115db15a492f2c2a4529b63ce700e3d9f12a1ac70d SHA512 da9fce98bcf160caace94ca55cc499238adf04164aeb8be15a357ef95cdea6110479057446dbf30518bc2a3aafa80860623c393933dee53c679bf5ac3b27a7e8
 MISC metadata.xml 383 BLAKE2B 19523d687c23d0f2e1edc4f9f9f183642d34717f29e0ddb0215c3fecabc4af9eb36443451044dd41e0b379c5b69d11ea60332f777c4ebc17dd8569483b88e3b2 SHA512 355aca11f02d0770f684a423dad09a107b28f4d4bcfdbede4b5dd80523803fe6f0d03dea23569c1d728a51c7545ee3ac041068492038ace55093d738f81d04d1
diff --git a/sys-apps/findutils/findutils-4.10.0.ebuild b/sys-apps/findutils/findutils-4.10.0.ebuild
index 5d2aaaa40023..fccb8bb8914c 100644
--- a/sys-apps/findutils/findutils-4.10.0.ebuild
+++ b/sys-apps/findutils/findutils-4.10.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="nls selinux static test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-apps/lm-sensors/Manifest b/sys-apps/lm-sensors/Manifest
index d637d62a3ba3..a05c36307cad 100644
--- a/sys-apps/lm-sensors/Manifest
+++ b/sys-apps/lm-sensors/Manifest
@@ -10,5 +10,7 @@ AUX sensord.confd 695 BLAKE2B e435c63a48da41218b793f9beefd5f9d1702aa80a525ca378e
 AUX sensord.initd 574 BLAKE2B bbc4e39d6b906a0e7539c4521420b9da686722eb6d26d486c29554c2cdc1b8c45d770c5e587f707d4fad0e34e083b2388dda194908a78c89e3ad4606cd61e464 SHA512 69abc9a92bfffae59f17a93e4792fd1f6b64285271693a443e1007adb73f95cb62a8dbf318f407f60fb3e3573d0e7ea11357076f14dbb58a0964f7b0bfe30b4a
 AUX sensord.service-r1 155 BLAKE2B 8a61565976b7d333dfb257d0e57a18140229bedb44fc095446e64de85d829f3d34802d4f762967cc503d527b8f28deaeaf3e0a93b3a4384b9c9b62a8b71d4dfe SHA512 83132636209f3e3717edad28ed230f767ee8bf00eabf3036238f64c370d1e42db1c14d1ed965c650da8aa3a6deb3ce7a0794425491ff7f8ce67e2fde934fc4fb
 DIST lm-sensors-3.6.0.tar.gz 273209 BLAKE2B d05efa2bf5f052158a9b3f8bbe925d45a8e00fd7fb07490ddf6c87db786c803fbe8a728693f36c301269b995c72d510657d02f2e94fbbe5a7e9f50a36214635b SHA512 4e80361913aff5403f1f0737fd4f42cffe43cc170ef48fff3914c9952f71990739d723f7b0b8120d9a01bcbbc829e964cfbd0a5cf18508af8f8dc825b49860bf
+DIST lm-sensors-3.6.2.tar.gz 292327 BLAKE2B 99398e951fa72857768222eed7f05ef21f547e73e31baba0a953400a594214ae572cfd65d3dd841bdbe32c96039f4350716e51aa6bcdcb9a3577d235ef3a3d37 SHA512 a89ae984814f5224bf621727252042d2b84a5cc5c125dd7024ff1be223e4c269b1e7c23512e56b3f2f38c088d7c6e54df47af51d63740deb09c44f837060695a
 EBUILD lm-sensors-3.6.0-r1.ebuild 6686 BLAKE2B a4f7b181dde32e7b63fb81cde1d1e2bfff786db7b372782e20367883176745954400727570df71bf87b6808b3c49e3c5d22cf07641c190e477916b5ba4184e40 SHA512 ed5786cb2cbacecf370b284c1c8917b913f8b300ad26daa69a4bf21a60cf8b8085745e375239f0748d16df9b12160a24da1823cfd2d8f27db016880b1c24cf93
+EBUILD lm-sensors-3.6.2.ebuild 6572 BLAKE2B 9a4f05bffa426f7160016b0e7d87d9401ae0243de6c9adbf37b0486dcf343d227ec78a0b9164782524d2b0fdd5bbb68632ea038ac42674863edc1eb27a8d928f SHA512 cc0f170f65e67c4d765e062ab788e4b3a78958cde77dbaf11733ab0e2716a668db88aa93ddd32e6b2e35eb9331fd44aee916d3bf434db7e9206b8d2378974fbd
 MISC metadata.xml 752 BLAKE2B 2869500f45d7843af710ca30fcd756f8bf6cf8be350a0c8b28a19488090e43b5cc067f93e24d7a719d270cb15e4ed12af2ec495813ef26b6aa75ecb50f6e70e8 SHA512 079c7d7775c434858bd71621f61a0893fda3afe2d83380c6a9a54932314b6b41524962aaa4d71c3ea5c1a392e2e1e9e962ff077becc743b1a6a24dd3effa7f79
diff --git a/sys-apps/lm-sensors/lm-sensors-3.6.2.ebuild b/sys-apps/lm-sensors/lm-sensors-3.6.2.ebuild
new file mode 100644
index 000000000000..ee6656a42aab
--- /dev/null
+++ b/sys-apps/lm-sensors/lm-sensors-3.6.2.ebuild
@@ -0,0 +1,223 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit linux-info systemd toolchain-funcs multilib-minimal
+
+DESCRIPTION="Hardware Monitoring user-space utilities"
+HOMEPAGE="https://hwmon.wiki.kernel.org/ https://github.com/lm-sensors/lm-sensors"
+
+if [[ "${PV}" =~ .*_p[[:digit:]]{8}.* ]] ; then
+	COMMIT="5c3ba50f806dea27c3b1e368966191c735459111"
+	SRC_URI="https://github.com/hramrach/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${COMMIT}"
+else
+	SRC_URI="https://github.com/hramrach/lm-sensors/archive/V$(ver_rs 1- -).tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-$(ver_rs 1- -)"
+fi
+
+LICENSE="GPL-2+ LGPL-2.1"
+
+# SUBSLOT based on SONAME of libsensors.so
+SLOT="0/5.0.0"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="contrib selinux sensord static-libs"
+
+COMMON_DEPS="
+	sensord? (
+		net-analyzer/rrdtool
+		virtual/logger
+	)"
+
+RDEPEND="${COMMON_DEPS}
+	dev-lang/perl
+	selinux? ( sec-policy/selinux-sensord )"
+
+DEPEND="${COMMON_DEPS}
+	app-alternatives/yacc
+	app-alternatives/lex"
+
+CONFIG_CHECK="~HWMON ~I2C_CHARDEV ~I2C"
+WARNING_HWMON="${PN} requires CONFIG_HWMON to be enabled for use."
+WARNING_I2C_CHARDEV="sensors-detect requires CONFIG_I2C_CHARDEV to be enabled."
+WARNING_I2C="${PN} requires CONFIG_I2C to be enabled for most sensors."
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.5.0-sensors-detect-gentoo.patch
+)
+
+DOCS=( CHANGES CONTRIBUTORS INSTALL README )
+DOCS+=( doc/{donations,fancontrol.txt,fan-divisors,libsensors-API.txt,progs,temperature-sensors,vid} )
+
+src_prepare() {
+	default
+
+	if [[ -n "${COMMIT}" ]]; then
+		local _version="${PV%_*}+git_${COMMIT}"
+
+		sed -i \
+			-e "s:LM_VERSION.*:LM_VERSION \"${_version}\":" \
+			version.h || \
+			die "Failed to update version.h"
+
+		sed -i \
+			-e "s/^\$revision = '.*/\$revision = '${_version}';/" \
+			-e "/^\$revision =~ s.*/d" \
+			prog/detect/sensors-detect || \
+			die "Failed to set revision in prog/detect/sensors-detect"
+
+		sed -i \
+			-e "s/^echo \"# pwmconfig revision.*/echo \"# pwmconfig revision ${_version}\"/" \
+			-e "/^REVISION=.*/d" \
+			-e "/^REVDATE=.*/d" \
+			-e "s:^PIDFILE=\".*:PIDFILE=\"/run/fancontrol.pid\":" \
+			prog/pwm/pwmconfig || \
+			die "Failed to adjust prog/pwm/pwmconfig"
+	else
+		sed -i \
+			-e "s:^PIDFILE=\".*:PIDFILE=\"/run/fancontrol.pid\":" \
+			prog/pwm/pwmconfig || \
+			die "Failed to adjust PIDFILE in prog/pwm/pwmconfig"
+	fi
+
+	# Respect LDFLAGS
+	sed -i -e 's/\$(LIBDIR)$/\$(LIBDIR) \$(LDFLAGS)/g' Makefile || \
+		die "Failed to sed in LDFLAGS"
+
+	sed -i \
+		-e "s:^PIDFILE=\".*:PIDFILE=\"/run/fancontrol.pid\":" \
+		prog/pwm/fancontrol || \
+		die "Failed to adjust PIDFILE of prog/pwm/fancontrol"
+
+	# Don't use EnvironmentFile in systemd unit
+	sed -i \
+		-e '/^EnvironmentFile=/d' \
+		-e '/^Exec.*modprobe.*/d' \
+		prog/init/lm_sensors.service || \
+		die "Failed to remove EnvironmentFile from systemd unit file"
+
+	if ! use static-libs; then
+		sed -i -e '/^BUILD_STATIC_LIB/d' Makefile || \
+			die "Failed to disable static building"
+	fi
+
+	# Don't show outdated user instructions
+	sed -i -e '/^	@echo "\*\*\* /d' Makefile || \
+		die "Failed to remove outdated user instructions"
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	default
+
+	if multilib_is_native_abi && use sensord; then
+		# sensord requires net-analyzer/rrdtool which doesn't have real multilib
+		# support. To prevent errors like
+		#
+		#   skipping incompatible /usr/lib/librrd.so when searching for -lrrd
+		#   cannot find -lrrd
+		#
+		# we only build sensord when we are building for profile's native ABI
+		# (it doesn't affect libsensors.so).
+		sed -i -e 's:^#\(PROG_EXTRA.*\):\1:' Makefile || \
+			die "Failed to enable building of sensord"
+	fi
+}
+
+multilib_src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		CXX="$(tc-getCXX)" \
+		LD="$(tc-getLD)" \
+		AR="$(tc-getAR)"
+}
+
+multilib_src_install() {
+	# We need to set CC and friends again here to avoid recompilation for cross
+	# bug #799851
+	emake \
+		CC="$(tc-getCC)" \
+		CXX="$(tc-getCXX)" \
+		LD="$(tc-getLD)" \
+		AR="$(tc-getAR)" \
+		DESTDIR="${ED}" \
+		PREFIX="/usr" \
+		MANDIR="/usr/share/man" \
+		ETCDIR="/etc" \
+		LIBDIR="/usr/$(get_libdir)" \
+		install
+}
+
+multilib_src_install_all() {
+	newinitd "${FILESDIR}"/lm_sensors.initd lm_sensors
+	newconfd "${FILESDIR}"/lm_sensors.confd lm_sensors
+	systemd_dounit prog/init/lm_sensors.service
+
+	newinitd "${FILESDIR}"/fancontrol.initd fancontrol
+	newconfd "${FILESDIR}"/fancontrol.confd fancontrol
+	systemd_newunit "${FILESDIR}"/fancontrol.service-r1 fancontrol.service
+
+	if use sensord; then
+		newconfd "${FILESDIR}"/sensord.confd sensord
+		newinitd "${FILESDIR}"/sensord.initd sensord
+		systemd_newunit "${FILESDIR}"/sensord.service-r1 sensord.service
+	fi
+
+	einstalldocs
+
+	docinto developers
+	dodoc doc/developers/applications
+
+	if use contrib; then
+		insinto /usr/share/lm_sensors
+		doins -r "${S}"/configs
+	fi
+}
+
+pkg_postinst() {
+	local _new_loader='3.4.0_p20160725'
+	local _v
+	for _v in ${REPLACING_VERSIONS}; do
+		if ! ver_test "${_v}" -gt "${_new_loader}"; then
+			# This is an upgrade which require migration
+
+			elog ""
+			elog "Since version 3.4.0_p20160725 ${PN} no longer loads modules on its own"
+			elog "instead it is using \"modules-load\" services provided by OpenRC or systemd."
+			elog ""
+			elog "To migrate your configuration you have 2 options:"
+			elog ""
+			elog "  a) Re-create a new configuration using \"/usr/sbin/sensors-detect\""
+			elog ""
+			elog "  b) Copy existing \"modules_<n>\", \"HWMON_MODULES\" or \"BUS_MODULES\""
+			elog "     variables from \"/etc/conf.d/lm_modules\" to"
+			elog "     \"/etc/modules-load.d/lm_sensors.conf\" and adjust format."
+			elog ""
+			elog "     For details see https://wiki.gentoo.org/wiki/Systemd#Automatic_module_loading"
+			elog ""
+			elog "     Important: Don't forget to migrate your module's argument"
+			elog "                (modules_<name>_args variable) if your are not already"
+			elog "                using \"/etc/modprobe.d\" (which is recommended)."
+
+			# Show this elog only once
+			break
+		fi
+	done
+
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		# New installation
+
+		elog ""
+		elog "Please run \`/usr/sbin/sensors-detect' in order to setup"
+		elog "\"/etc/modules-load.d/lm_sensors.conf\"."
+		elog ""
+		elog "You might want to add lm_sensors to your default runlevel to make"
+		elog "sure the sensors get initialized on the next startup."
+		elog ""
+		elog "Be warned, the probing of hardware in your system performed by"
+		elog "sensors-detect could freeze your system."
+	fi
+}
diff --git a/sys-apps/texinfo/Manifest b/sys-apps/texinfo/Manifest
index fd3a8e179822..66479e7e8c6e 100644
--- a/sys-apps/texinfo/Manifest
+++ b/sys-apps/texinfo/Manifest
@@ -5,7 +5,7 @@ AUX 7.1/0004-tp-Texinfo-XS-parsetexi-tree.c-reset_obstacks.patch 1867 BLAKE2B 95
 AUX 7.1/0005-tp-Texinfo-command_data.txt.patch 7841 BLAKE2B 47b482d95904b96af0d538c1d969e7c90e82f547d5d96bab855780209378efd5b577a7e0b1b3fef1ca32cb442bb9bee74a80f0bd62237b8a8f03764a368134ae SHA512 050e87f0a0ec5f23eabaeb8ddbc12e42a65121d67da5843210ac3c80deea5ef415b274216702e236919ad42b5e25552fbd704f78c81fb3e737188417a9405195
 DIST texinfo-7.1.1.tar.xz 5572864 BLAKE2B 64dbd315e65d5b7cb0bb06c918e9924bb15a25a4bb26322db10b7ee98e9e6626b62592f8edd0ff016256f4a84837dabacb5278c3826e34fa3e080a5e8c0fb626 SHA512 05d605fba810f2939cab16ed5ddb341e22d397370648e6e0271c807fa573267e933c75ed7ae682c3c9cfecb568311a8df7abeb8c0556a94ef7169737d5b9c52a
 DIST texinfo-7.1.tar.xz 5545720 BLAKE2B 4385ca6250daeaa4f6bfedd9ab41f25993613031bcb8da55360365701213f4f3cf786d958749c59dc1c9dda328eca42f028aa051a7062313142aa92f55a96ecd SHA512 ceab03e8422d800b08c7b44e8263b0a1f35bb7758d83a81136df6f3304a14daecda98a12a282afb85406d2ca2f665b2295e10b6f4064156ea1285d80d5d355db
-EBUILD texinfo-7.1-r1.ebuild 2555 BLAKE2B e83e7246accc8c594bb8acad127336f2a9a05ca05d44b13883878e5c1fa3d6e8e146276a337406735e9f6790a8652bcc5ca98b0996710a347c17351026ca6c27 SHA512 921a09c8b1d10288dbc161686503ffe8c1231b5bc3f0ecc9c3d43e16cbce0d8b200e79c5a5058454f536238292895ffd0b2ffbf41fead598e167c0928b12e19a
-EBUILD texinfo-7.1.1.ebuild 2485 BLAKE2B 7017a60395aae3066463ddee0a8bd4e0b31a77e468792fb92c50fa815eb8fa4648bcc09590f63bdea6d75fe98cfa81cfdd0349e518d5fb5402546328ead919bd SHA512 c7c799cdc491d3664cbff84fe5d96e4edc9223750a1afd94f1a63d2df06f7e5bb8493ec76c05a564887bb318d3fe9abfd49c4658d890529de9ac8af16232283a
-EBUILD texinfo-9999.ebuild 2490 BLAKE2B 0c00ce6914a69fd92d11374f3d98e2478bb6df5dcfa354c3e7dca7945ff3e24d61e71ccab7b582cc10c3ad6677a9c666674cdac8cf9cab4a876f3cfedc5e12e0 SHA512 11aebd8e32bc87512a60254eded2ac4309f6dd6d48615c15385cf353e8491940132aa2fbf273d0d152a1cf095dd8431b53ffaa7c4c01638de5a84b4d16a9c6e6
+EBUILD texinfo-7.1-r1.ebuild 2534 BLAKE2B d451b5949d7e57d010fcf3a4638d2ee899ba9bc3625441ce49559727cb5b2b5ac947f2a20b01034bddf21bb67ae31551de0b58446075c5392ad8aec76ed61185 SHA512 eba76343f12bb54891e8963d08a47ea008699402b6321326ae0b3c9abbb0fc6074c28a2d938dd7d3f072aeeb99964c7d075e89570ed26579d2ba53ba6d971694
+EBUILD texinfo-7.1.1.ebuild 2463 BLAKE2B 67852c104fdf92b1e2c300e6cd0ffbbee04d50177c80911931d78b41ad94fb826c6357907ed7b68d4bcb836cb345f0b5ff9c2dec580c1a2ee1d4f297e79bbd82 SHA512 6fd628b9b576a5c2aa95f33bffaf036f430bdae2257c5f06a08bb54e47f34cc7c951c41f31b1e18860637efd3e68e312b025e8d80e94a8209bcabe5d31ad0dbb
+EBUILD texinfo-9999.ebuild 2469 BLAKE2B e618b521a09399d8d5ed2131cd3a9c45a534720df4dae25212930da1326814f750017804b56d1b2117785fd365408aa6a6404a18114c707b346845c90f3b99cd SHA512 813703a04ece913809736af871449a501c0e0fa08310b4c07d28c67442df4650e2be1551c9df79001f1d70b6401fd607c19250d4a16dfcbfb41a484fbfdbb95b
 MISC metadata.xml 588 BLAKE2B 4e5549f1b07df4c081d2cc03691f0f8ba13c0f8f86807a7e5e87ea618080895a2714f169e9a1294226e71207ed88586a027092a328ab618f417ae3a74ac2586b SHA512 343c287a2c0c7f7bcbd5a40373c0aebe718d46042947abcb8364fed0aeb6dd7e585e9d226ef5bfb0084074d085510e802faf3a3c08b1489ed35556b6c14d1015
diff --git a/sys-apps/texinfo/texinfo-7.1-r1.ebuild b/sys-apps/texinfo/texinfo-7.1-r1.ebuild
index 53db7d720e85..6cb50bcb6b49 100644
--- a/sys-apps/texinfo/texinfo-7.1-r1.ebuild
+++ b/sys-apps/texinfo/texinfo-7.1-r1.ebuild
@@ -36,7 +36,6 @@ SLOT="0"
 IUSE="nls +standalone static"
 
 RDEPEND="
-	!=app-text/tetex-2*
 	>=sys-libs/ncurses-5.2-r2:=
 	virtual/perl-Data-Dumper
 	virtual/perl-Encode
diff --git a/sys-apps/texinfo/texinfo-7.1.1.ebuild b/sys-apps/texinfo/texinfo-7.1.1.ebuild
index 18ea519bae9b..12e4440bddef 100644
--- a/sys-apps/texinfo/texinfo-7.1.1.ebuild
+++ b/sys-apps/texinfo/texinfo-7.1.1.ebuild
@@ -27,7 +27,7 @@ elif [[ $(ver_cut 3) -ge 90 || $(ver_cut 4) -ge 90 ]] ; then
 	REGEN_BDEPEND=""
 else
 	SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 	REGEN_BDEPEND=""
 fi
 
@@ -36,7 +36,6 @@ SLOT="0"
 IUSE="nls +standalone static"
 
 RDEPEND="
-	!=app-text/tetex-2*
 	>=sys-libs/ncurses-5.2-r2:=
 	virtual/perl-Data-Dumper
 	virtual/perl-Encode
diff --git a/sys-apps/texinfo/texinfo-9999.ebuild b/sys-apps/texinfo/texinfo-9999.ebuild
index b972581ef424..eda59950b465 100644
--- a/sys-apps/texinfo/texinfo-9999.ebuild
+++ b/sys-apps/texinfo/texinfo-9999.ebuild
@@ -36,7 +36,6 @@ SLOT="0"
 IUSE="nls +standalone static"
 
 RDEPEND="
-	!=app-text/tetex-2*
 	>=sys-libs/ncurses-5.2-r2:=
 	virtual/perl-Data-Dumper
 	virtual/perl-Encode