gentoo auto-resync : 18:09:2022 - 23:20:40

11 files changed, 136 insertions, 174 deletions

diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 80e5669bbe32..346adbaec4f3 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/carbon-c-relay/Manifest b/app-misc/carbon-c-relay/Manifest
index 73a9cfa1cc6e..4c2f76ee642a 100644
--- a/app-misc/carbon-c-relay/Manifest
+++ b/app-misc/carbon-c-relay/Manifest
@@ -1,9 +1,11 @@
 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.2.tar.gz 561080 BLAKE2B 55674699b2afcffa911954a52e3c51b92380c81083db0330e7e6eab495e72938b7761a8c7bc17ac65ea56db1c11f4c360bab3b7442ca13f3466170d6bb3f6fd6 SHA512 dab2eaf2da07afd429012b93f0c826e2fe6e43371afa07d34793dd212820790af2487f5710524deac52c3ed18b874ce8ff54d90b3872e269dc570b7ad30c1826
 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.2-r1.ebuild 1567 BLAKE2B 13280b7bde34cd94b238fc0d95bdf78d5727c7535891a9b0382caeb4ced930dabcdef57a34de586b90b2c1c6b586e4120ebd2fbe7dbc4d53c34a4aceb46088e5 SHA512 73039e2207eb62431fc06ce0bd9216d8f0f337abe686d290ed3e3e84fb3130a45be437ca035d9fb35a4ac381ef1fef63d7e6eb409f735945631357e5e0ca2b95
 EBUILD carbon-c-relay-3.7.3.ebuild 1567 BLAKE2B 13280b7bde34cd94b238fc0d95bdf78d5727c7535891a9b0382caeb4ced930dabcdef57a34de586b90b2c1c6b586e4120ebd2fbe7dbc4d53c34a4aceb46088e5 SHA512 73039e2207eb62431fc06ce0bd9216d8f0f337abe686d290ed3e3e84fb3130a45be437ca035d9fb35a4ac381ef1fef63d7e6eb409f735945631357e5e0ca2b95
+EBUILD carbon-c-relay-3.7.4-r1.ebuild 1574 BLAKE2B d262ce31744c36c7c290e7ea6af90e23623800f1138560997eb17c2b44ef00c926765cdb658545a556b0a974cfbf4190dd98d63a2de1267685eb1a543faf8129 SHA512 eac70773fdf5764b54026be4ff0cee01e8e968eadecf05b95a982547977651f8ca70c68a5906004d7bb8d67e2c7d129de7b283e5a26e8cf43910fc6007e6fe34
 EBUILD carbon-c-relay-3.7.4.ebuild 1574 BLAKE2B b7329b23b4811211ca680ea46d4214a1426953531606042dfcfa81b0d24c9ddaa042de895909f2120f5f41464011c155ca5215220c063615d9a9045f4f64b730 SHA512 8897e50aaed1b72b4b5f8eaf0f0c53dcafbce81fecd3c6a3e642f225a6d1643b33f2578b2c9a5c3b7bae93e974001bb4d81766c37c6007447ecdb48e87aa3b9c
 MISC metadata.xml 654 BLAKE2B 9cf6ce108100d80ba05644a782876997280ae4523b07366b3a88942fad4392fed358b134e8f33597fdc98540698531e3e7b0155e63194b4030de227f4a4c75e1 SHA512 954f00ed3ccde9cc651e9de24bcc2339deca58b2cc27f923801862fdc5298771ce5c0e729fa03c2d4d5b03624dbcbd3a17295b7e4e31fbb57221da861747d545
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.7.4-r1.ebuild
new file mode 100644
index 000000000000..d34fed5a74de
--- /dev/null
+++ b/app-misc/carbon-c-relay/carbon-c-relay-3.7.4-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2022 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 ~arm64 ~ppc64 ~x64-macos ~x64-solaris ~x86-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-r2 ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd-r1 ${PN}
+}
diff --git a/app-misc/carbon-c-relay/files/carbon-c-relay.initd-r2 b/app-misc/carbon-c-relay/files/carbon-c-relay.initd-r2
new file mode 100644
index 000000000000..fa0781dcddc8
--- /dev/null
+++ b/app-misc/carbon-c-relay/files/carbon-c-relay.initd-r2
@@ -0,0 +1,74 @@
+#!/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 $(cat "${pidfile}") >/dev/null 2>&1
+	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/tmuxp/Manifest b/app-misc/tmuxp/Manifest
index 9211aa931f9a..c5dab04d4e5c 100644
--- a/app-misc/tmuxp/Manifest
+++ b/app-misc/tmuxp/Manifest
@@ -1,13 +1,5 @@
-AUX tmuxp-1.6.4-tests.patch 689 BLAKE2B b3c52055186d41be30378d9960099a705c0f7f4606c16a5aaa62f3e2df55b5ceec7feb77329715d13b7aa9fadad9424ed55dfaccb7c24bd6550be40ea6faa425 SHA512 d5ab3b391fe9c4b0646cbecbe3c3f4633829d6f1544503e96ad7d9b2265736c3082c959988344146a6623f125eac339f2f6875ec7b121e5c7db256089324cef8
 AUX tmuxp-1.7.2-tests.patch 475 BLAKE2B 07d6def54c025b6b1d538813258ba06cf9b030ac8e40160492490f31d37c07e5158a95b5b1a28a3350aab1b1bb188b29a2c12b8521ac3a12f937ceb623e04707 SHA512 1842005a34e7b4a495e9e735243d1681158cb8e24b37006edcd7c1929df1eefc2a2f174f6eefd08866f1b830951610d881c654063ce20217fb8e457a84baa7fb
 AUX tmuxp-1.9.2-tests.patch 564 BLAKE2B f164bcd3bd5344e39fe050bc3c716dc3678584071990ed19c6cdcc0ab816852d0b18f89d358ba0607260dec0eb87596e245dc386a7afb0884461d44e22dec35f SHA512 f15745bfeb8c72dc0d4a1e1cac489acaa31a18282aa8d39e5b142d207f92cbbf110e1752449f14eb2b4fabcaf9022d7f3256956e26328a2f607edfd87ac05c47
-AUX tmuxp-1.9.4-relax-click-dep.patch 305 BLAKE2B f15674bb3b007321dda444b747cfca5f5da13b4d3e5ff741aa7559271c804cf5939d511792259dd0cdd62864e08d12ebc6acc0ba2836f9d8ecc50e93f3546db4 SHA512 cb476d64cb95f94b41536ec6fb5c1954cb6e168836c1d6b40cba407d4cb0753174d6e437e71d1aba51d084004377e048e129f84caa03df671022995c4a1349ec
-DIST tmuxp-1.11.1.tar.gz 830701 BLAKE2B 37f23abf16ef78b27f04e6af9c95990d39173e62fb4ab2c898fb45075242ee2761e0c69b8f391cb59d4fd2ccee8d157650718450814ebd06716c54afd0e59338 SHA512 23cf70cffa86e8478f39661951ca468b09a8caa3e7c8a9114011a5a5440fa817c3425b38cbf00b9b7966ac1449094d101f74a450e77c153e9a1d9ca73c49e856
-DIST tmuxp-1.12.1.tar.gz 839714 BLAKE2B 98ecb807c1bb1d6cea05e997001866c29a0b4e43b79ffbae945093ed8a2487563b1d1a884fce8f8fa9ff202f602369774677ef760ab0e03881c66bc7390b16a8 SHA512 2b7f98d6e003964fbe6ed873d251fd120da50fd54f48521a0c5cbc441cb2b3031ecc963c273824ac3541783989ece4fab329a89bf29a8e9572825fcdfb541dc1
 DIST tmuxp-1.13.0.tar.gz 833657 BLAKE2B 5938121b2951b735e52eb7361a83dace4327b120ea7bb8217a5e4c32488e8cd93074b8993068b1d5d87d79df16c2f1e3d254d010b5c2836f435ed887349a010f SHA512 21a5a9fb21e30d5022d6aa6257dd9eb2977574e16e9b8ea0a3af8af4d55f69d4f6a3730ca9fc5e9a4e0b6194922d73717154cc55b808e71714570326cc7f27a9
-DIST tmuxp-1.9.4.tar.gz 821650 BLAKE2B 34454919e811bc4901dcb570046b45d481934ab36f9b8f50753972fe6545ca9e487b2f04ee818c4b54eea01181c62efb1f5262ab033f2fc92c3cee3828d16bf4 SHA512 ecf113011231a03998b3be2d146f7e6c6cc2ccfc36af59b88d51e09726259c92dc4360bde569fba13ca8d81eb9639f85b45cd5f4b50d70d347e3237e396ea446
-EBUILD tmuxp-1.11.1.ebuild 1013 BLAKE2B 5ac12b621d4f1821c584465812ed9bc8de91168702cc4b831e7dd45e24a8a887a246c747e27a7cdc7ae3fb06da53bf0693b3c04d802edca3032a8fe54ad47a2a SHA512 c8b7424ee32b259c12c8e19f5e4da0b8f7feb44a83707331d8935796c8a872c90012b3cd153c88e0dff542af54e23f9510baaddb2231441b175ef980e0146b69
-EBUILD tmuxp-1.12.1.ebuild 1013 BLAKE2B 03da38be3654cd6cd4fd3e68a945f604d491f859f4b559e4eff8ecfa8a8d2a4077b1016b39b5f2128d5a177c06a3e3f710e6eb6cdde7b16d394a2b42bd16d242 SHA512 a07afa1fb7899184079c38ab8ffd6b67ef74ec47741a5487b1ccb815f8ba3a6d97199b4082add5561f200e9915b2035e3b9d23a97f5d96d6a814b09f95f38d11
-EBUILD tmuxp-1.13.0.ebuild 1006 BLAKE2B a73d6013e96f7bfdf540d88040fdc2cf4aea73681d20d4c64e2161febbee22a9bc4e74de5dc8a5515f9ef8798273bb00f29a5fefd5f44847395ba121b1d39f1b SHA512 da755b805172238323d172ec76bcf5178ea895c8ecee2553f04b47cdff900fe1af10ce57150a9644eb8885256bb72460829c62f220196ef17f67f4ffca300f0f
-EBUILD tmuxp-1.9.4.ebuild 1028 BLAKE2B 3b7b6711c437b617ba12d41756fff7b5dfd239d1db0b9043785b65d45f31c78d73fa4c1d63e6ccc72c88904711c69fd674ee2e5a2066c42a90a90b0bb381f2ab SHA512 4a8125d4702bd42220db1e7abd1300ecf053d1f847468051e06ad0934c27b52bda2cff4f55ab7afa69cde11c0f680d07e64dc98f25c398c2ee6c948863707bdc
+EBUILD tmuxp-1.13.0.ebuild 1004 BLAKE2B 117193b813735527156d70a0047b08fc5e41bfc8acc8782fbd7bc0932a2194c084e8b00cff233c8cdf0df7755aa3ee5451c236d04c0e357fb1b741580bd5f793 SHA512 058dce47281254ecbd769e2ff18587622c47286d81e75ad299e12c62f301d6c4cf94d2952dda0640be17c3ac9989eb7800af8d225073de792b7778da95d26783
 MISC metadata.xml 256 BLAKE2B e4fb7b4732dc88ff20c10bd7e5425beca8310c14d3934046ad6fcd99d8f401ea8610a6df5444d094f5bae4e5120cb7aedc15b45f0862b73f83bd7d5e54617337 SHA512 d37651285ce883fc1c73b41e09e66788d47b2451a4f96ac4237e6bef59643b3171a7a24900f204f0ca1accdbd5961d74e4bd7c8c41e1d29492874e4cbc737611
diff --git a/app-misc/tmuxp/files/tmuxp-1.6.4-tests.patch b/app-misc/tmuxp/files/tmuxp-1.6.4-tests.patch
deleted file mode 100644
index 4bdfe015474a..000000000000
--- a/app-misc/tmuxp/files/tmuxp-1.6.4-tests.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/tests/test_cli.py b/tests/test_cli.py
-index 1e14e51..6945c2b 100644
---- a/tests/test_cli.py
-+++ b/tests/test_cli.py
-@@ -486,7 +486,7 @@ session_name: hello
-                 '{SESSION_NAME}',
-                 '{WINDOW_NAME}',
-                 '-c',
--                'print(pane.id)',
-+                'print(getattr(pane, "id", "{PANE_ID}"))',
-             ],
-             [],
-             {},
-@@ -496,7 +496,7 @@ session_name: hello
-             [
-                 '-L{SOCKET_NAME}',
-                 '-c',
--                'print(pane.id)',
-+                'print(getattr(pane, "id", "{PANE_ID}"))',
-             ],
-             [],
-             {'TMUX_PANE': '{PANE_ID}'},
diff --git a/app-misc/tmuxp/files/tmuxp-1.9.4-relax-click-dep.patch b/app-misc/tmuxp/files/tmuxp-1.9.4-relax-click-dep.patch
deleted file mode 100644
index a4450e37c11e..000000000000
--- a/app-misc/tmuxp/files/tmuxp-1.9.4-relax-click-dep.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/pyproject.toml b/pyproject.toml
-index 228a1ae..e24f106 100644
---- a/pyproject.toml
-+++ b/pyproject.toml
-@@ -49,7 +49,7 @@ tmuxp = 'tmuxp:cli.cli'
- 
- [tool.poetry.dependencies]
- python = "^3.7"
--click = ">7,<8.1"
-+click = ">7.0"
- kaptan = ">=0.5.10"
- libtmux = "~0.10.3"
- colorama = ">=0.3.9"
diff --git a/app-misc/tmuxp/tmuxp-1.11.1.ebuild b/app-misc/tmuxp/tmuxp-1.11.1.ebuild
deleted file mode 100644
index cad088ac77ef..000000000000
--- a/app-misc/tmuxp/tmuxp-1.11.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 2019-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..11} pypy3 )
-DISTUTILS_USE_PEP517=poetry
-inherit distutils-r1
-
-DESCRIPTION="tmux session manager. built on libtmux"
-HOMEPAGE="https://tmuxp.git-pull.com"
-SRC_URI="https://github.com/tmux-python/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-
-RDEPEND="
-	>=app-misc/tmux-3.0a
-	>=dev-python/kaptan-0.5.10[${PYTHON_USEDEP}]
-	~dev-python/libtmux-0.11.0[${PYTHON_USEDEP}]
-	>=dev-python/click-8.0[${PYTHON_USEDEP}]
-	>=dev-python/colorama-0.3.9[${PYTHON_USEDEP}]
-	dev-python/pathspec[${PYTHON_USEDEP}]
-	>=dev-python/tomli-1.1.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		>=dev-python/pytest-rerunfailures-4.2[${PYTHON_USEDEP}]
-		!dev-python/flaky
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/tmuxp-1.7.2-tests.patch"
-	"${FILESDIR}/tmuxp-1.9.2-tests.patch"
-)
-
-distutils_enable_tests pytest
-
-python_test() {
-	SHELL="/bin/bash" epytest
-}
diff --git a/app-misc/tmuxp/tmuxp-1.12.1.ebuild b/app-misc/tmuxp/tmuxp-1.12.1.ebuild
deleted file mode 100644
index e4488877fe08..000000000000
--- a/app-misc/tmuxp/tmuxp-1.12.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 2019-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..11} pypy3 )
-DISTUTILS_USE_PEP517=poetry
-inherit distutils-r1
-
-DESCRIPTION="tmux session manager. built on libtmux"
-HOMEPAGE="https://tmuxp.git-pull.com"
-SRC_URI="https://github.com/tmux-python/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-
-RDEPEND="
-	>=app-misc/tmux-3.0a
-	>=dev-python/kaptan-0.5.10[${PYTHON_USEDEP}]
-	~dev-python/libtmux-0.12.0[${PYTHON_USEDEP}]
-	>=dev-python/click-8.0[${PYTHON_USEDEP}]
-	>=dev-python/colorama-0.3.9[${PYTHON_USEDEP}]
-	dev-python/pathspec[${PYTHON_USEDEP}]
-	>=dev-python/tomli-1.1.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		>=dev-python/pytest-rerunfailures-4.2[${PYTHON_USEDEP}]
-		!dev-python/flaky
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/tmuxp-1.7.2-tests.patch"
-	"${FILESDIR}/tmuxp-1.9.2-tests.patch"
-)
-
-distutils_enable_tests pytest
-
-python_test() {
-	SHELL="/bin/bash" epytest
-}
diff --git a/app-misc/tmuxp/tmuxp-1.13.0.ebuild b/app-misc/tmuxp/tmuxp-1.13.0.ebuild
index 688f6ab2ea69..0c48179e4fe1 100644
--- a/app-misc/tmuxp/tmuxp-1.13.0.ebuild
+++ b/app-misc/tmuxp/tmuxp-1.13.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/tmux-python/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 
 RDEPEND="
 	>=app-misc/tmux-3.0a
diff --git a/app-misc/tmuxp/tmuxp-1.9.4.ebuild b/app-misc/tmuxp/tmuxp-1.9.4.ebuild
deleted file mode 100644
index ad7df0ede1e0..000000000000
--- a/app-misc/tmuxp/tmuxp-1.9.4.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 2019-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-inherit distutils-r1
-
-DESCRIPTION="tmux session manager. built on libtmux"
-HOMEPAGE="https://tmuxp.git-pull.com"
-SRC_URI="https://github.com/tmux-python/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-
-RDEPEND="
-	>=app-misc/tmux-3.0a
-	>=dev-python/kaptan-0.5.10[${PYTHON_USEDEP}]
-	~dev-python/libtmux-0.10.3[${PYTHON_USEDEP}]
-	>=dev-python/click-7.0[${PYTHON_USEDEP}]
-	>=dev-python/colorama-0.3.9[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		>=dev-python/pytest-rerunfailures-4.2[${PYTHON_USEDEP}]
-		!dev-python/flaky
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/tmuxp-1.6.4-tests.patch"
-	"${FILESDIR}/tmuxp-1.7.2-tests.patch"
-	"${FILESDIR}/tmuxp-1.9.4-relax-click-dep.patch"
-	"${FILESDIR}/tmuxp-1.9.2-tests.patch"
-)
-
-distutils_enable_tests pytest
-
-python_test() {
-	SHELL="/bin/bash" epytest
-}