From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1363035-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (2048 bits))
	(No client certificate requested)
	by finch.gentoo.org (Postfix) with ESMTPS id 0E97D158088
	for <garchives@archives.gentoo.org>; Sun, 30 Jan 2022 18:47:33 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id D1D822BC015;
	Sun, 30 Jan 2022 18:47:30 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id 424F92BC015
	for <gentoo-commits@lists.gentoo.org>; Sun, 30 Jan 2022 18:47:30 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id 988CE342F10
	for <gentoo-commits@lists.gentoo.org>; Sun, 30 Jan 2022 18:47:28 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id C15222B3
	for <gentoo-commits@lists.gentoo.org>; Sun, 30 Jan 2022 18:47:26 +0000 (UTC)
From: "Arthur Zamarin" <arthurzam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Arthur Zamarin" <arthurzam@gentoo.org>
Message-ID: <1643568434.85de87a2081409a627a8d9bd18d9de9ed5a4296b.arthurzam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/buildbot-worker/
X-VCS-Repository: repo/gentoo
X-VCS-Files: dev-util/buildbot-worker/Manifest dev-util/buildbot-worker/buildbot-worker-2.10.0.ebuild dev-util/buildbot-worker/buildbot-worker-2.10.1.ebuild dev-util/buildbot-worker/buildbot-worker-2.8.2.ebuild dev-util/buildbot-worker/buildbot-worker-2.8.4.ebuild dev-util/buildbot-worker/buildbot-worker-3.0.2.ebuild dev-util/buildbot-worker/buildbot-worker-3.1.0.ebuild dev-util/buildbot-worker/buildbot-worker-3.1.1.ebuild dev-util/buildbot-worker/buildbot-worker-3.2.0.ebuild dev-util/buildbot-worker/buildbot-worker-3.3.0.ebuild
X-VCS-Directories: dev-util/buildbot-worker/
X-VCS-Committer: arthurzam
X-VCS-Committer-Name: Arthur Zamarin
X-VCS-Revision: 85de87a2081409a627a8d9bd18d9de9ed5a4296b
X-VCS-Branch: master
Date: Sun, 30 Jan 2022 18:47:26 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 2f2573af-aa8f-4c98-b772-87347e6542a9
X-Archives-Hash: c34c5024a7b8bff87abb225dc4c3e23f

commit:     85de87a2081409a627a8d9bd18d9de9ed5a4296b
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 30 18:34:46 2022 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sun Jan 30 18:47:14 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85de87a2

dev-util/buildbot-worker: drop versions

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 dev-util/buildbot-worker/Manifest                  |   9 --
 .../buildbot-worker/buildbot-worker-2.10.0.ebuild  | 126 ---------------------
 .../buildbot-worker/buildbot-worker-2.10.1.ebuild  | 126 ---------------------
 .../buildbot-worker/buildbot-worker-2.8.2.ebuild   | 126 ---------------------
 .../buildbot-worker/buildbot-worker-2.8.4.ebuild   | 126 ---------------------
 .../buildbot-worker/buildbot-worker-3.0.2.ebuild   | 126 ---------------------
 .../buildbot-worker/buildbot-worker-3.1.0.ebuild   | 126 ---------------------
 .../buildbot-worker/buildbot-worker-3.1.1.ebuild   | 126 ---------------------
 .../buildbot-worker/buildbot-worker-3.2.0.ebuild   | 126 ---------------------
 .../buildbot-worker/buildbot-worker-3.3.0.ebuild   | 126 ---------------------
 10 files changed, 1143 deletions(-)

diff --git a/dev-util/buildbot-worker/Manifest b/dev-util/buildbot-worker/Manifest
index bd0177bf8ae4..2143d4df82fc 100644
--- a/dev-util/buildbot-worker/Manifest
+++ b/dev-util/buildbot-worker/Manifest
@@ -1,10 +1 @@
-DIST buildbot-worker-2.10.0.tar.gz 107279 BLAKE2B 415b950b81862ac4c08ca00217e27351152b74c19e0395451e6cb965a039ccc8d16d3a63534053c15783cb904c279e8c80354f8b33d956cd3c45c5d5c1f5c1f4 SHA512 94b96abdad97d306998b995409f5220c967b0f7a2e33d1310fc99723bb3d54aa055e0ae2e6b771cd53340b132eb95515c266f08bf08e10bede29e2a93fe72b0a
-DIST buildbot-worker-2.10.1.tar.gz 107656 BLAKE2B 8b94ecacc18f1e1f2e58d64f223f77af31454a3b199de9ee4c5a174b2cb645a970614674f5917415c4ab6d1ee0180ff99fbf4f121339eb05fcd80b363bfad3c0 SHA512 93f684c36e7c07c90e24a666084734df33d30376436b50db74ae8bd3b3a5e306799d15bd03d93b02f723bdf878adbfe17bbc59fd9f49f43431aea90612113ed7
-DIST buildbot-worker-2.8.2.tar.gz 101707 BLAKE2B 451dff979c6934bf6dd4e1579abbe18e9cf43551c906bd516c788a6a5f6170650a5468927bec0a8d4ab242e5886247406b2e098e1908a8d9b5777744982c7be6 SHA512 0628825ac023a66cd249dc6b42ff2f3ad3b5c0cb97561fd332ce4775abaa5368a8b7b636115259ab4aa842c811178c9b641ef4453b06167315eb81117ffef815
-DIST buildbot-worker-2.8.4.tar.gz 101175 BLAKE2B 23077305d26ab282eaa4c633ebee7ca7c502285862604ecafe25d6b666ce802729c5478d676e6834bf9a2e27ccf48e1ad0e69449e55532aa81b0dcd3c6780011 SHA512 16ad9a0e5e9c875f90383fc90c359ee843e0b82a7878f87f2ac9e7091d8d907707c69210876f25b4fdf7148bcaafab10d10a8a0a8865c73808db707320757107
-DIST buildbot-worker-3.0.2.tar.gz 96923 BLAKE2B 720d265381c0dc4f876ba1c87df893d8adbb153fef8dd78f6d84b24cbf43d7637fb2f58fd4e312724e9fab3318c2ba6fb6bd7a881989790edc1e9aa02095543d SHA512 d970568bdec9d201699350383dfbcf9e915a75d2cc5f69c0af9db009ce1bf5dbed83302bcc6c7e34fdcc2aa739675a7bd14fda686900b05a32ae83cca6a2da10
-DIST buildbot-worker-3.1.0.tar.gz 97938 BLAKE2B a886656ad099a849731307ce5db4eea0990b46bbae3aef8f931cbbfbaac0c8ac69d81fde1c1f6791a489e6dd1abe8b09f90615c658a31d8fb8cf3a0eb0cb6cb1 SHA512 eca2a32c67822adc0dd258ba991205525024ee1543e218337835393ad9bd948d5f48dd4348976c64eb4c6812a16a7e951f4114ef81982a49a0d80da485567f98
-DIST buildbot-worker-3.1.1.tar.gz 98239 BLAKE2B e73abcdd0fb067da0e77bf8382f8d4d54c0db63e3cf04d003599dc68dfe5c742758ba2c3e39368413a45e8c5beb913a4cf5571e229c3ce5084066790702fb4e8 SHA512 9bf969aadf0f2ccea726365b1e250ebd0c0d0146b4fb1b49ae675e0db555a0b50a87ceb455c25f987b75605d72ab50306f5af9247978fe93270d2c97b8ed04dd
-DIST buildbot-worker-3.2.0.tar.gz 99401 BLAKE2B e50ee76f667aab2a07647df3bd1dfd2016827bc5bf96be5f2f6e90158790c3b908f0c5b88fead59bf9977dc15adbe275c7ba81829c56fde3c1c318084633624f SHA512 c7822c16761052f2b45b809de3d3ff910f40679d885213541aa87f54a3490e9a092152f9cbb8c4ab25d1e5b2c9597e87b202f0db62c79f35e8fec2cfcc797653
-DIST buildbot-worker-3.3.0.tar.gz 99996 BLAKE2B 4e2bbe6467fc58a9f8c597939cdcfd4538712445580ab7f2c0e1ce3415cc1f8c60ce2b3cba4c16f341d8c19e1b99a91e799c7d3ff2343af0fffa0a1740960588 SHA512 e75a7a91a5b2c418dae65abdd1dde2b840a840e5b9cc1a218007a9e33e1cd58288bc708ec43ecfd9ec74a257809a59f65923ec8dc8aee1ef28cfaf82314964e3
 DIST buildbot-worker-3.4.0.tar.gz 102910 BLAKE2B c38a806e8d0475a8c18176310f628b829fc359f013b315e82715e71071213fe4a0cdf38273ad7df39a66675f4ebc9fb1881fb990290f2bbedf4c8777ec93d4dc SHA512 411a2bf496622c2b9a3e0dea1ea8a71b347566010086c57ffc5d1114546cc5052af39a8ff7b10ffe6e7afdb6fc8ff73a9ffba23b96a76ff1cc0e3eff81cc59a7

diff --git a/dev-util/buildbot-worker/buildbot-worker-2.10.0.ebuild b/dev-util/buildbot-worker/buildbot-worker-2.10.0.ebuild
deleted file mode 100644
index 06d672daee8f..000000000000
--- a/dev-util/buildbot-worker/buildbot-worker-2.10.0.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_COMPAT=( python3_{7,8} )
-
-DISTUTILS_USE_SETUPTOOLS="rdepend"
-
-inherit readme.gentoo-r1 distutils-r1
-
-DESCRIPTION="BuildBot Worker (slave) Daemon"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-worker/"
-
-MY_V="${PV/_p/.post}"
-MY_P="${PN}-${MY_V}"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	acct-user/buildbot
-	>=dev-python/twisted-17.9.0[${PYTHON_USEDEP}]
-	dev-python/future[${PYTHON_USEDEP}]
-	!<dev-util/buildbot-1.0.0
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/setuptools_trial[${PYTHON_USEDEP}]
-	)
-"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	DOC_CONTENTS="The \"buildbot\" user and the \"buildbot_worker\" init script has been added
-		to support starting buildbot_worker through Gentoo's init system. To use this,
-		execute \"emerge --config =${CATEGORY}/${PF}\" to create a new instance.
-		Set up your build worker following the documentation, make sure the
-		resulting directories are owned by the \"buildbot\" user and point
-		\"${ROOT}/etc/conf.d/buildbot_worker.myinstance\" at the right location.
-		The scripts can	run as a different user if desired."
-}
-
-distutils_enable_tests setup.py
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	doman docs/buildbot-worker.1
-
-	newconfd "${FILESDIR}/buildbot_worker.confd2" buildbot_worker
-	newinitd "${FILESDIR}/buildbot_worker.initd2" buildbot_worker
-
-	dodir /var/lib/buildbot_worker
-	cp "${FILESDIR}/buildbot.tac.sample" "${D}/var/lib/buildbot_worker"|| die "Install failed!"
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-
-	if [[ -n ${REPLACING_VERSIONS} ]]; then
-		ewarn
-		ewarn "More than one instance of a buildbot_worker can be run simultaneously."
-		ewarn " Note that \"BASEDIR\" in the buildbot_worker configuration file"
-		ewarn "is now the common base directory for all instances. If you are migrating from an older"
-		ewarn "version, make sure that you copy the current contents of \"BASEDIR\" to a subdirectory."
-		ewarn "The name of the subdirectory corresponds to the name of the buildbot_worker instance."
-		ewarn "In order to start the service running OpenRC-based systems need to link to the init file:"
-		ewarn "    ln --symbolic --relative /etc/init.d/buildbot_worker /etc/init.d/buildbot_worker.myinstance"
-		ewarn "    rc-update add buildbot_worker.myinstance default"
-		ewarn "    /etc/init.d/buildbot_worker.myinstance start"
-		ewarn "Systems using systemd can do the following:"
-		ewarn "    systemctl enable buildbot_worker@myinstance.service"
-		ewarn "    systemctl enable buildbot_worker.target"
-		ewarn "    systemctl start buildbot_worker.target"
-	fi
-}
-
-pkg_config() {
-	local buildworker_path="/var/lib/buildbot_worker"
-	local log_path="/var/log/buildbot_worker"
-
-	einfo "This will prepare a new buildbot_worker instance in ${buildworker_path}."
-	einfo "Press Control-C to abort."
-
-	einfo "Enter the name for the new instance: "
-	read instance_name
-	[[ -z "${instance_name}" ]] && die "Invalid instance name"
-
-	local instance_path="${buildworker_path}/${instance_name}"
-	local instance_log_path="${log_path}/${instance_name}"
-
-	if [[ -e "${instance_path}" ]]; then
-		eerror "The instance with the specified name already exists:"
-		eerror "${instance_path}"
-		die "Instance already exists"
-	fi
-
-	if [[ ! -d "${instance_path}" ]]; then
-		mkdir --parents "${instance_path}" || die "Unable to create directory ${buildworker_path}"
-	fi
-	chown --recursive buildbot:buildbot "${instance_path}" || die "Setting permissions for instance failed"
-	cp "${buildworker_path}/buildbot.tac.sample" "${instance_path}/buildbot.tac" \
-		|| die "Moving sample configuration failed"
-	ln --symbolic --relative "/etc/init.d/buildbot_worker" "/etc/init.d/buildbot_worker.${instance_name}" \
-		|| die "Unable to create link to init file"
-
-	if [[ ! -d "${instance_log_path}" ]]; then
-		mkdir --parents "${instance_log_path}" || die "Unable to create directory ${instance_log_path}"
-		chown --recursive buildbot:buildbot "${instance_log_path}" \
-			|| die "Setting permissions for instance failed"
-	fi
-	ln --symbolic --relative "${instance_log_path}/twistd.log" "${instance_path}/twistd.log" \
-		|| die "Unable to create link to log file"
-
-	einfo "Successfully created a buildbot_worker instance at ${instance_path}."
-	einfo "To change the default settings edit the buildbot.tac file in this directory."
-}

diff --git a/dev-util/buildbot-worker/buildbot-worker-2.10.1.ebuild b/dev-util/buildbot-worker/buildbot-worker-2.10.1.ebuild
deleted file mode 100644
index 06d672daee8f..000000000000
--- a/dev-util/buildbot-worker/buildbot-worker-2.10.1.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_COMPAT=( python3_{7,8} )
-
-DISTUTILS_USE_SETUPTOOLS="rdepend"
-
-inherit readme.gentoo-r1 distutils-r1
-
-DESCRIPTION="BuildBot Worker (slave) Daemon"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-worker/"
-
-MY_V="${PV/_p/.post}"
-MY_P="${PN}-${MY_V}"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	acct-user/buildbot
-	>=dev-python/twisted-17.9.0[${PYTHON_USEDEP}]
-	dev-python/future[${PYTHON_USEDEP}]
-	!<dev-util/buildbot-1.0.0
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/setuptools_trial[${PYTHON_USEDEP}]
-	)
-"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	DOC_CONTENTS="The \"buildbot\" user and the \"buildbot_worker\" init script has been added
-		to support starting buildbot_worker through Gentoo's init system. To use this,
-		execute \"emerge --config =${CATEGORY}/${PF}\" to create a new instance.
-		Set up your build worker following the documentation, make sure the
-		resulting directories are owned by the \"buildbot\" user and point
-		\"${ROOT}/etc/conf.d/buildbot_worker.myinstance\" at the right location.
-		The scripts can	run as a different user if desired."
-}
-
-distutils_enable_tests setup.py
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	doman docs/buildbot-worker.1
-
-	newconfd "${FILESDIR}/buildbot_worker.confd2" buildbot_worker
-	newinitd "${FILESDIR}/buildbot_worker.initd2" buildbot_worker
-
-	dodir /var/lib/buildbot_worker
-	cp "${FILESDIR}/buildbot.tac.sample" "${D}/var/lib/buildbot_worker"|| die "Install failed!"
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-
-	if [[ -n ${REPLACING_VERSIONS} ]]; then
-		ewarn
-		ewarn "More than one instance of a buildbot_worker can be run simultaneously."
-		ewarn " Note that \"BASEDIR\" in the buildbot_worker configuration file"
-		ewarn "is now the common base directory for all instances. If you are migrating from an older"
-		ewarn "version, make sure that you copy the current contents of \"BASEDIR\" to a subdirectory."
-		ewarn "The name of the subdirectory corresponds to the name of the buildbot_worker instance."
-		ewarn "In order to start the service running OpenRC-based systems need to link to the init file:"
-		ewarn "    ln --symbolic --relative /etc/init.d/buildbot_worker /etc/init.d/buildbot_worker.myinstance"
-		ewarn "    rc-update add buildbot_worker.myinstance default"
-		ewarn "    /etc/init.d/buildbot_worker.myinstance start"
-		ewarn "Systems using systemd can do the following:"
-		ewarn "    systemctl enable buildbot_worker@myinstance.service"
-		ewarn "    systemctl enable buildbot_worker.target"
-		ewarn "    systemctl start buildbot_worker.target"
-	fi
-}
-
-pkg_config() {
-	local buildworker_path="/var/lib/buildbot_worker"
-	local log_path="/var/log/buildbot_worker"
-
-	einfo "This will prepare a new buildbot_worker instance in ${buildworker_path}."
-	einfo "Press Control-C to abort."
-
-	einfo "Enter the name for the new instance: "
-	read instance_name
-	[[ -z "${instance_name}" ]] && die "Invalid instance name"
-
-	local instance_path="${buildworker_path}/${instance_name}"
-	local instance_log_path="${log_path}/${instance_name}"
-
-	if [[ -e "${instance_path}" ]]; then
-		eerror "The instance with the specified name already exists:"
-		eerror "${instance_path}"
-		die "Instance already exists"
-	fi
-
-	if [[ ! -d "${instance_path}" ]]; then
-		mkdir --parents "${instance_path}" || die "Unable to create directory ${buildworker_path}"
-	fi
-	chown --recursive buildbot:buildbot "${instance_path}" || die "Setting permissions for instance failed"
-	cp "${buildworker_path}/buildbot.tac.sample" "${instance_path}/buildbot.tac" \
-		|| die "Moving sample configuration failed"
-	ln --symbolic --relative "/etc/init.d/buildbot_worker" "/etc/init.d/buildbot_worker.${instance_name}" \
-		|| die "Unable to create link to init file"
-
-	if [[ ! -d "${instance_log_path}" ]]; then
-		mkdir --parents "${instance_log_path}" || die "Unable to create directory ${instance_log_path}"
-		chown --recursive buildbot:buildbot "${instance_log_path}" \
-			|| die "Setting permissions for instance failed"
-	fi
-	ln --symbolic --relative "${instance_log_path}/twistd.log" "${instance_path}/twistd.log" \
-		|| die "Unable to create link to log file"
-
-	einfo "Successfully created a buildbot_worker instance at ${instance_path}."
-	einfo "To change the default settings edit the buildbot.tac file in this directory."
-}

diff --git a/dev-util/buildbot-worker/buildbot-worker-2.8.2.ebuild b/dev-util/buildbot-worker/buildbot-worker-2.8.2.ebuild
deleted file mode 100644
index bd9c309e10b7..000000000000
--- a/dev-util/buildbot-worker/buildbot-worker-2.8.2.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_COMPAT=( python3_{7,8} )
-
-DISTUTILS_USE_SETUPTOOLS="rdepend"
-
-inherit readme.gentoo-r1 distutils-r1
-
-DESCRIPTION="BuildBot Worker (slave) Daemon"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-worker/"
-
-MY_V="${PV/_p/.post}"
-MY_P="${PN}-${MY_V}"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	acct-user/buildbot
-	>=dev-python/twisted-17.9.0[${PYTHON_USEDEP}]
-	dev-python/future[${PYTHON_USEDEP}]
-	!<dev-util/buildbot-1.0.0
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/setuptools_trial[${PYTHON_USEDEP}]
-	)
-"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	DOC_CONTENTS="The \"buildbot\" user and the \"buildbot_worker\" init script has been added
-		to support starting buildbot_worker through Gentoo's init system. To use this,
-		execute \"emerge --config =${CATEGORY}/${PF}\" to create a new instance.
-		Set up your build worker following the documentation, make sure the
-		resulting directories are owned by the \"buildbot\" user and point
-		\"${ROOT}/etc/conf.d/buildbot_worker.myinstance\" at the right location.
-		The scripts can	run as a different user if desired."
-}
-
-distutils_enable_tests setup.py
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	doman docs/buildbot-worker.1
-
-	newconfd "${FILESDIR}/buildbot_worker.confd2" buildbot_worker
-	newinitd "${FILESDIR}/buildbot_worker.initd2" buildbot_worker
-
-	dodir /var/lib/buildbot_worker
-	cp "${FILESDIR}/buildbot.tac.sample" "${D}/var/lib/buildbot_worker"|| die "Install failed!"
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-
-	if [[ -n ${REPLACING_VERSIONS} ]]; then
-		ewarn
-		ewarn "More than one instance of a buildbot_worker can be run simultaneously."
-		ewarn " Note that \"BASEDIR\" in the buildbot_worker configuration file"
-		ewarn "is now the common base directory for all instances. If you are migrating from an older"
-		ewarn "version, make sure that you copy the current contents of \"BASEDIR\" to a subdirectory."
-		ewarn "The name of the subdirectory corresponds to the name of the buildbot_worker instance."
-		ewarn "In order to start the service running OpenRC-based systems need to link to the init file:"
-		ewarn "    ln --symbolic --relative /etc/init.d/buildbot_worker /etc/init.d/buildbot_worker.myinstance"
-		ewarn "    rc-update add buildbot_worker.myinstance default"
-		ewarn "    /etc/init.d/buildbot_worker.myinstance start"
-		ewarn "Systems using systemd can do the following:"
-		ewarn "    systemctl enable buildbot_worker@myinstance.service"
-		ewarn "    systemctl enable buildbot_worker.target"
-		ewarn "    systemctl start buildbot_worker.target"
-	fi
-}
-
-pkg_config() {
-	local buildworker_path="/var/lib/buildbot_worker"
-	local log_path="/var/log/buildbot_worker"
-
-	einfo "This will prepare a new buildbot_worker instance in ${buildworker_path}."
-	einfo "Press Control-C to abort."
-
-	einfo "Enter the name for the new instance: "
-	read instance_name
-	[[ -z "${instance_name}" ]] && die "Invalid instance name"
-
-	local instance_path="${buildworker_path}/${instance_name}"
-	local instance_log_path="${log_path}/${instance_name}"
-
-	if [[ -e "${instance_path}" ]]; then
-		eerror "The instance with the specified name already exists:"
-		eerror "${instance_path}"
-		die "Instance already exists"
-	fi
-
-	if [[ ! -d "${instance_path}" ]]; then
-		mkdir --parents "${instance_path}" || die "Unable to create directory ${buildworker_path}"
-	fi
-	chown --recursive buildbot:buildbot "${instance_path}" || die "Setting permissions for instance failed"
-	cp "${buildworker_path}/buildbot.tac.sample" "${instance_path}/buildbot.tac" \
-		|| die "Moving sample configuration failed"
-	ln --symbolic --relative "/etc/init.d/buildbot_worker" "/etc/init.d/buildbot_worker.${instance_name}" \
-		|| die "Unable to create link to init file"
-
-	if [[ ! -d "${instance_log_path}" ]]; then
-		mkdir --parents "${instance_log_path}" || die "Unable to create directory ${instance_log_path}"
-		chown --recursive buildbot:buildbot "${instance_log_path}" \
-			|| die "Setting permissions for instance failed"
-	fi
-	ln --symbolic --relative "${instance_log_path}/twistd.log" "${instance_path}/twistd.log" \
-		|| die "Unable to create link to log file"
-
-	einfo "Successfully created a buildbot_worker instance at ${instance_path}."
-	einfo "To change the default settings edit the buildbot.tac file in this directory."
-}

diff --git a/dev-util/buildbot-worker/buildbot-worker-2.8.4.ebuild b/dev-util/buildbot-worker/buildbot-worker-2.8.4.ebuild
deleted file mode 100644
index bd9c309e10b7..000000000000
--- a/dev-util/buildbot-worker/buildbot-worker-2.8.4.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_COMPAT=( python3_{7,8} )
-
-DISTUTILS_USE_SETUPTOOLS="rdepend"
-
-inherit readme.gentoo-r1 distutils-r1
-
-DESCRIPTION="BuildBot Worker (slave) Daemon"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-worker/"
-
-MY_V="${PV/_p/.post}"
-MY_P="${PN}-${MY_V}"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	acct-user/buildbot
-	>=dev-python/twisted-17.9.0[${PYTHON_USEDEP}]
-	dev-python/future[${PYTHON_USEDEP}]
-	!<dev-util/buildbot-1.0.0
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/setuptools_trial[${PYTHON_USEDEP}]
-	)
-"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	DOC_CONTENTS="The \"buildbot\" user and the \"buildbot_worker\" init script has been added
-		to support starting buildbot_worker through Gentoo's init system. To use this,
-		execute \"emerge --config =${CATEGORY}/${PF}\" to create a new instance.
-		Set up your build worker following the documentation, make sure the
-		resulting directories are owned by the \"buildbot\" user and point
-		\"${ROOT}/etc/conf.d/buildbot_worker.myinstance\" at the right location.
-		The scripts can	run as a different user if desired."
-}
-
-distutils_enable_tests setup.py
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	doman docs/buildbot-worker.1
-
-	newconfd "${FILESDIR}/buildbot_worker.confd2" buildbot_worker
-	newinitd "${FILESDIR}/buildbot_worker.initd2" buildbot_worker
-
-	dodir /var/lib/buildbot_worker
-	cp "${FILESDIR}/buildbot.tac.sample" "${D}/var/lib/buildbot_worker"|| die "Install failed!"
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-
-	if [[ -n ${REPLACING_VERSIONS} ]]; then
-		ewarn
-		ewarn "More than one instance of a buildbot_worker can be run simultaneously."
-		ewarn " Note that \"BASEDIR\" in the buildbot_worker configuration file"
-		ewarn "is now the common base directory for all instances. If you are migrating from an older"
-		ewarn "version, make sure that you copy the current contents of \"BASEDIR\" to a subdirectory."
-		ewarn "The name of the subdirectory corresponds to the name of the buildbot_worker instance."
-		ewarn "In order to start the service running OpenRC-based systems need to link to the init file:"
-		ewarn "    ln --symbolic --relative /etc/init.d/buildbot_worker /etc/init.d/buildbot_worker.myinstance"
-		ewarn "    rc-update add buildbot_worker.myinstance default"
-		ewarn "    /etc/init.d/buildbot_worker.myinstance start"
-		ewarn "Systems using systemd can do the following:"
-		ewarn "    systemctl enable buildbot_worker@myinstance.service"
-		ewarn "    systemctl enable buildbot_worker.target"
-		ewarn "    systemctl start buildbot_worker.target"
-	fi
-}
-
-pkg_config() {
-	local buildworker_path="/var/lib/buildbot_worker"
-	local log_path="/var/log/buildbot_worker"
-
-	einfo "This will prepare a new buildbot_worker instance in ${buildworker_path}."
-	einfo "Press Control-C to abort."
-
-	einfo "Enter the name for the new instance: "
-	read instance_name
-	[[ -z "${instance_name}" ]] && die "Invalid instance name"
-
-	local instance_path="${buildworker_path}/${instance_name}"
-	local instance_log_path="${log_path}/${instance_name}"
-
-	if [[ -e "${instance_path}" ]]; then
-		eerror "The instance with the specified name already exists:"
-		eerror "${instance_path}"
-		die "Instance already exists"
-	fi
-
-	if [[ ! -d "${instance_path}" ]]; then
-		mkdir --parents "${instance_path}" || die "Unable to create directory ${buildworker_path}"
-	fi
-	chown --recursive buildbot:buildbot "${instance_path}" || die "Setting permissions for instance failed"
-	cp "${buildworker_path}/buildbot.tac.sample" "${instance_path}/buildbot.tac" \
-		|| die "Moving sample configuration failed"
-	ln --symbolic --relative "/etc/init.d/buildbot_worker" "/etc/init.d/buildbot_worker.${instance_name}" \
-		|| die "Unable to create link to init file"
-
-	if [[ ! -d "${instance_log_path}" ]]; then
-		mkdir --parents "${instance_log_path}" || die "Unable to create directory ${instance_log_path}"
-		chown --recursive buildbot:buildbot "${instance_log_path}" \
-			|| die "Setting permissions for instance failed"
-	fi
-	ln --symbolic --relative "${instance_log_path}/twistd.log" "${instance_path}/twistd.log" \
-		|| die "Unable to create link to log file"
-
-	einfo "Successfully created a buildbot_worker instance at ${instance_path}."
-	einfo "To change the default settings edit the buildbot.tac file in this directory."
-}

diff --git a/dev-util/buildbot-worker/buildbot-worker-3.0.2.ebuild b/dev-util/buildbot-worker/buildbot-worker-3.0.2.ebuild
deleted file mode 100644
index 6f105d83f93e..000000000000
--- a/dev-util/buildbot-worker/buildbot-worker-3.0.2.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-DISTUTILS_USE_SETUPTOOLS="rdepend"
-
-inherit readme.gentoo-r1 distutils-r1
-
-DESCRIPTION="BuildBot Worker (slave) Daemon"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-worker/"
-
-MY_V="${PV/_p/.post}"
-MY_P="${PN}-${MY_V}"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	acct-user/buildbot
-	>=dev-python/twisted-17.9.0[${PYTHON_USEDEP}]
-	dev-python/future[${PYTHON_USEDEP}]
-	!<dev-util/buildbot-1.0.0
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/setuptools_trial[${PYTHON_USEDEP}]
-	)
-"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	DOC_CONTENTS="The \"buildbot\" user and the \"buildbot_worker\" init script has been added
-		to support starting buildbot_worker through Gentoo's init system. To use this,
-		execute \"emerge --config =${CATEGORY}/${PF}\" to create a new instance.
-		Set up your build worker following the documentation, make sure the
-		resulting directories are owned by the \"buildbot\" user and point
-		\"${ROOT}/etc/conf.d/buildbot_worker.myinstance\" at the right location.
-		The scripts can	run as a different user if desired."
-}
-
-distutils_enable_tests setup.py
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	doman docs/buildbot-worker.1
-
-	newconfd "${FILESDIR}/buildbot_worker.confd2" buildbot_worker
-	newinitd "${FILESDIR}/buildbot_worker.initd2" buildbot_worker
-
-	dodir /var/lib/buildbot_worker
-	cp "${FILESDIR}/buildbot.tac.sample" "${D}/var/lib/buildbot_worker"|| die "Install failed!"
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-
-	if [[ -n ${REPLACING_VERSIONS} ]]; then
-		ewarn
-		ewarn "More than one instance of a buildbot_worker can be run simultaneously."
-		ewarn " Note that \"BASEDIR\" in the buildbot_worker configuration file"
-		ewarn "is now the common base directory for all instances. If you are migrating from an older"
-		ewarn "version, make sure that you copy the current contents of \"BASEDIR\" to a subdirectory."
-		ewarn "The name of the subdirectory corresponds to the name of the buildbot_worker instance."
-		ewarn "In order to start the service running OpenRC-based systems need to link to the init file:"
-		ewarn "    ln --symbolic --relative /etc/init.d/buildbot_worker /etc/init.d/buildbot_worker.myinstance"
-		ewarn "    rc-update add buildbot_worker.myinstance default"
-		ewarn "    /etc/init.d/buildbot_worker.myinstance start"
-		ewarn "Systems using systemd can do the following:"
-		ewarn "    systemctl enable buildbot_worker@myinstance.service"
-		ewarn "    systemctl enable buildbot_worker.target"
-		ewarn "    systemctl start buildbot_worker.target"
-	fi
-}
-
-pkg_config() {
-	local buildworker_path="/var/lib/buildbot_worker"
-	local log_path="/var/log/buildbot_worker"
-
-	einfo "This will prepare a new buildbot_worker instance in ${buildworker_path}."
-	einfo "Press Control-C to abort."
-
-	einfo "Enter the name for the new instance: "
-	read instance_name
-	[[ -z "${instance_name}" ]] && die "Invalid instance name"
-
-	local instance_path="${buildworker_path}/${instance_name}"
-	local instance_log_path="${log_path}/${instance_name}"
-
-	if [[ -e "${instance_path}" ]]; then
-		eerror "The instance with the specified name already exists:"
-		eerror "${instance_path}"
-		die "Instance already exists"
-	fi
-
-	if [[ ! -d "${instance_path}" ]]; then
-		mkdir --parents "${instance_path}" || die "Unable to create directory ${buildworker_path}"
-	fi
-	chown --recursive buildbot:buildbot "${instance_path}" || die "Setting permissions for instance failed"
-	cp "${buildworker_path}/buildbot.tac.sample" "${instance_path}/buildbot.tac" \
-		|| die "Moving sample configuration failed"
-	ln --symbolic --relative "/etc/init.d/buildbot_worker" "/etc/init.d/buildbot_worker.${instance_name}" \
-		|| die "Unable to create link to init file"
-
-	if [[ ! -d "${instance_log_path}" ]]; then
-		mkdir --parents "${instance_log_path}" || die "Unable to create directory ${instance_log_path}"
-		chown --recursive buildbot:buildbot "${instance_log_path}" \
-			|| die "Setting permissions for instance failed"
-	fi
-	ln --symbolic --relative "${instance_log_path}/twistd.log" "${instance_path}/twistd.log" \
-		|| die "Unable to create link to log file"
-
-	einfo "Successfully created a buildbot_worker instance at ${instance_path}."
-	einfo "To change the default settings edit the buildbot.tac file in this directory."
-}

diff --git a/dev-util/buildbot-worker/buildbot-worker-3.1.0.ebuild b/dev-util/buildbot-worker/buildbot-worker-3.1.0.ebuild
deleted file mode 100644
index 6ccf06830ba8..000000000000
--- a/dev-util/buildbot-worker/buildbot-worker-3.1.0.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-DISTUTILS_USE_SETUPTOOLS="rdepend"
-
-inherit readme.gentoo-r1 distutils-r1
-
-DESCRIPTION="BuildBot Worker (slave) Daemon"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-worker/"
-
-MY_V="${PV/_p/.post}"
-MY_P="${PN}-${MY_V}"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	acct-user/buildbot
-	>=dev-python/twisted-17.9.0[${PYTHON_USEDEP}]
-	dev-python/future[${PYTHON_USEDEP}]
-	!<dev-util/buildbot-1.0.0
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/setuptools_trial[${PYTHON_USEDEP}]
-	)
-"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	DOC_CONTENTS="The \"buildbot\" user and the \"buildbot_worker\" init script has been added
-		to support starting buildbot_worker through Gentoo's init system. To use this,
-		execute \"emerge --config =${CATEGORY}/${PF}\" to create a new instance.
-		Set up your build worker following the documentation, make sure the
-		resulting directories are owned by the \"buildbot\" user and point
-		\"${ROOT}/etc/conf.d/buildbot_worker.myinstance\" at the right location.
-		The scripts can	run as a different user if desired."
-}
-
-distutils_enable_tests setup.py
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	doman docs/buildbot-worker.1
-
-	newconfd "${FILESDIR}/buildbot_worker.confd2" buildbot_worker
-	newinitd "${FILESDIR}/buildbot_worker.initd2" buildbot_worker
-
-	dodir /var/lib/buildbot_worker
-	cp "${FILESDIR}/buildbot.tac.sample" "${D}/var/lib/buildbot_worker"|| die "Install failed!"
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-
-	if [[ -n ${REPLACING_VERSIONS} ]]; then
-		ewarn
-		ewarn "More than one instance of a buildbot_worker can be run simultaneously."
-		ewarn " Note that \"BASEDIR\" in the buildbot_worker configuration file"
-		ewarn "is now the common base directory for all instances. If you are migrating from an older"
-		ewarn "version, make sure that you copy the current contents of \"BASEDIR\" to a subdirectory."
-		ewarn "The name of the subdirectory corresponds to the name of the buildbot_worker instance."
-		ewarn "In order to start the service running OpenRC-based systems need to link to the init file:"
-		ewarn "    ln --symbolic --relative /etc/init.d/buildbot_worker /etc/init.d/buildbot_worker.myinstance"
-		ewarn "    rc-update add buildbot_worker.myinstance default"
-		ewarn "    /etc/init.d/buildbot_worker.myinstance start"
-		ewarn "Systems using systemd can do the following:"
-		ewarn "    systemctl enable buildbot_worker@myinstance.service"
-		ewarn "    systemctl enable buildbot_worker.target"
-		ewarn "    systemctl start buildbot_worker.target"
-	fi
-}
-
-pkg_config() {
-	local buildworker_path="/var/lib/buildbot_worker"
-	local log_path="/var/log/buildbot_worker"
-
-	einfo "This will prepare a new buildbot_worker instance in ${buildworker_path}."
-	einfo "Press Control-C to abort."
-
-	einfo "Enter the name for the new instance: "
-	read instance_name
-	[[ -z "${instance_name}" ]] && die "Invalid instance name"
-
-	local instance_path="${buildworker_path}/${instance_name}"
-	local instance_log_path="${log_path}/${instance_name}"
-
-	if [[ -e "${instance_path}" ]]; then
-		eerror "The instance with the specified name already exists:"
-		eerror "${instance_path}"
-		die "Instance already exists"
-	fi
-
-	if [[ ! -d "${instance_path}" ]]; then
-		mkdir --parents "${instance_path}" || die "Unable to create directory ${buildworker_path}"
-	fi
-	chown --recursive buildbot:buildbot "${instance_path}" || die "Setting permissions for instance failed"
-	cp "${buildworker_path}/buildbot.tac.sample" "${instance_path}/buildbot.tac" \
-		|| die "Moving sample configuration failed"
-	ln --symbolic --relative "/etc/init.d/buildbot_worker" "/etc/init.d/buildbot_worker.${instance_name}" \
-		|| die "Unable to create link to init file"
-
-	if [[ ! -d "${instance_log_path}" ]]; then
-		mkdir --parents "${instance_log_path}" || die "Unable to create directory ${instance_log_path}"
-		chown --recursive buildbot:buildbot "${instance_log_path}" \
-			|| die "Setting permissions for instance failed"
-	fi
-	ln --symbolic --relative "${instance_log_path}/twistd.log" "${instance_path}/twistd.log" \
-		|| die "Unable to create link to log file"
-
-	einfo "Successfully created a buildbot_worker instance at ${instance_path}."
-	einfo "To change the default settings edit the buildbot.tac file in this directory."
-}

diff --git a/dev-util/buildbot-worker/buildbot-worker-3.1.1.ebuild b/dev-util/buildbot-worker/buildbot-worker-3.1.1.ebuild
deleted file mode 100644
index e66c92ea2278..000000000000
--- a/dev-util/buildbot-worker/buildbot-worker-3.1.1.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-DISTUTILS_USE_SETUPTOOLS="rdepend"
-
-inherit readme.gentoo-r1 distutils-r1
-
-DESCRIPTION="BuildBot Worker (slave) Daemon"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-worker/"
-
-MY_V="${PV/_p/.post}"
-MY_P="${PN}-${MY_V}"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~amd64-linux ~x86-linux"
-
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	acct-user/buildbot
-	>=dev-python/twisted-17.9.0[${PYTHON_USEDEP}]
-	dev-python/future[${PYTHON_USEDEP}]
-	!<dev-util/buildbot-1.0.0
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/setuptools_trial[${PYTHON_USEDEP}]
-	)
-"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	DOC_CONTENTS="The \"buildbot\" user and the \"buildbot_worker\" init script has been added
-		to support starting buildbot_worker through Gentoo's init system. To use this,
-		execute \"emerge --config =${CATEGORY}/${PF}\" to create a new instance.
-		Set up your build worker following the documentation, make sure the
-		resulting directories are owned by the \"buildbot\" user and point
-		\"${ROOT}/etc/conf.d/buildbot_worker.myinstance\" at the right location.
-		The scripts can	run as a different user if desired."
-}
-
-distutils_enable_tests setup.py
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	doman docs/buildbot-worker.1
-
-	newconfd "${FILESDIR}/buildbot_worker.confd2" buildbot_worker
-	newinitd "${FILESDIR}/buildbot_worker.initd2" buildbot_worker
-
-	dodir /var/lib/buildbot_worker
-	cp "${FILESDIR}/buildbot.tac.sample" "${D}/var/lib/buildbot_worker"|| die "Install failed!"
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-
-	if [[ -n ${REPLACING_VERSIONS} ]]; then
-		ewarn
-		ewarn "More than one instance of a buildbot_worker can be run simultaneously."
-		ewarn " Note that \"BASEDIR\" in the buildbot_worker configuration file"
-		ewarn "is now the common base directory for all instances. If you are migrating from an older"
-		ewarn "version, make sure that you copy the current contents of \"BASEDIR\" to a subdirectory."
-		ewarn "The name of the subdirectory corresponds to the name of the buildbot_worker instance."
-		ewarn "In order to start the service running OpenRC-based systems need to link to the init file:"
-		ewarn "    ln --symbolic --relative /etc/init.d/buildbot_worker /etc/init.d/buildbot_worker.myinstance"
-		ewarn "    rc-update add buildbot_worker.myinstance default"
-		ewarn "    /etc/init.d/buildbot_worker.myinstance start"
-		ewarn "Systems using systemd can do the following:"
-		ewarn "    systemctl enable buildbot_worker@myinstance.service"
-		ewarn "    systemctl enable buildbot_worker.target"
-		ewarn "    systemctl start buildbot_worker.target"
-	fi
-}
-
-pkg_config() {
-	local buildworker_path="/var/lib/buildbot_worker"
-	local log_path="/var/log/buildbot_worker"
-
-	einfo "This will prepare a new buildbot_worker instance in ${buildworker_path}."
-	einfo "Press Control-C to abort."
-
-	einfo "Enter the name for the new instance: "
-	read instance_name
-	[[ -z "${instance_name}" ]] && die "Invalid instance name"
-
-	local instance_path="${buildworker_path}/${instance_name}"
-	local instance_log_path="${log_path}/${instance_name}"
-
-	if [[ -e "${instance_path}" ]]; then
-		eerror "The instance with the specified name already exists:"
-		eerror "${instance_path}"
-		die "Instance already exists"
-	fi
-
-	if [[ ! -d "${instance_path}" ]]; then
-		mkdir --parents "${instance_path}" || die "Unable to create directory ${buildworker_path}"
-	fi
-	chown --recursive buildbot:buildbot "${instance_path}" || die "Setting permissions for instance failed"
-	cp "${buildworker_path}/buildbot.tac.sample" "${instance_path}/buildbot.tac" \
-		|| die "Moving sample configuration failed"
-	ln --symbolic --relative "/etc/init.d/buildbot_worker" "/etc/init.d/buildbot_worker.${instance_name}" \
-		|| die "Unable to create link to init file"
-
-	if [[ ! -d "${instance_log_path}" ]]; then
-		mkdir --parents "${instance_log_path}" || die "Unable to create directory ${instance_log_path}"
-		chown --recursive buildbot:buildbot "${instance_log_path}" \
-			|| die "Setting permissions for instance failed"
-	fi
-	ln --symbolic --relative "${instance_log_path}/twistd.log" "${instance_path}/twistd.log" \
-		|| die "Unable to create link to log file"
-
-	einfo "Successfully created a buildbot_worker instance at ${instance_path}."
-	einfo "To change the default settings edit the buildbot.tac file in this directory."
-}

diff --git a/dev-util/buildbot-worker/buildbot-worker-3.2.0.ebuild b/dev-util/buildbot-worker/buildbot-worker-3.2.0.ebuild
deleted file mode 100644
index e66c92ea2278..000000000000
--- a/dev-util/buildbot-worker/buildbot-worker-3.2.0.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-DISTUTILS_USE_SETUPTOOLS="rdepend"
-
-inherit readme.gentoo-r1 distutils-r1
-
-DESCRIPTION="BuildBot Worker (slave) Daemon"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-worker/"
-
-MY_V="${PV/_p/.post}"
-MY_P="${PN}-${MY_V}"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~amd64-linux ~x86-linux"
-
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	acct-user/buildbot
-	>=dev-python/twisted-17.9.0[${PYTHON_USEDEP}]
-	dev-python/future[${PYTHON_USEDEP}]
-	!<dev-util/buildbot-1.0.0
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/setuptools_trial[${PYTHON_USEDEP}]
-	)
-"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	DOC_CONTENTS="The \"buildbot\" user and the \"buildbot_worker\" init script has been added
-		to support starting buildbot_worker through Gentoo's init system. To use this,
-		execute \"emerge --config =${CATEGORY}/${PF}\" to create a new instance.
-		Set up your build worker following the documentation, make sure the
-		resulting directories are owned by the \"buildbot\" user and point
-		\"${ROOT}/etc/conf.d/buildbot_worker.myinstance\" at the right location.
-		The scripts can	run as a different user if desired."
-}
-
-distutils_enable_tests setup.py
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	doman docs/buildbot-worker.1
-
-	newconfd "${FILESDIR}/buildbot_worker.confd2" buildbot_worker
-	newinitd "${FILESDIR}/buildbot_worker.initd2" buildbot_worker
-
-	dodir /var/lib/buildbot_worker
-	cp "${FILESDIR}/buildbot.tac.sample" "${D}/var/lib/buildbot_worker"|| die "Install failed!"
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-
-	if [[ -n ${REPLACING_VERSIONS} ]]; then
-		ewarn
-		ewarn "More than one instance of a buildbot_worker can be run simultaneously."
-		ewarn " Note that \"BASEDIR\" in the buildbot_worker configuration file"
-		ewarn "is now the common base directory for all instances. If you are migrating from an older"
-		ewarn "version, make sure that you copy the current contents of \"BASEDIR\" to a subdirectory."
-		ewarn "The name of the subdirectory corresponds to the name of the buildbot_worker instance."
-		ewarn "In order to start the service running OpenRC-based systems need to link to the init file:"
-		ewarn "    ln --symbolic --relative /etc/init.d/buildbot_worker /etc/init.d/buildbot_worker.myinstance"
-		ewarn "    rc-update add buildbot_worker.myinstance default"
-		ewarn "    /etc/init.d/buildbot_worker.myinstance start"
-		ewarn "Systems using systemd can do the following:"
-		ewarn "    systemctl enable buildbot_worker@myinstance.service"
-		ewarn "    systemctl enable buildbot_worker.target"
-		ewarn "    systemctl start buildbot_worker.target"
-	fi
-}
-
-pkg_config() {
-	local buildworker_path="/var/lib/buildbot_worker"
-	local log_path="/var/log/buildbot_worker"
-
-	einfo "This will prepare a new buildbot_worker instance in ${buildworker_path}."
-	einfo "Press Control-C to abort."
-
-	einfo "Enter the name for the new instance: "
-	read instance_name
-	[[ -z "${instance_name}" ]] && die "Invalid instance name"
-
-	local instance_path="${buildworker_path}/${instance_name}"
-	local instance_log_path="${log_path}/${instance_name}"
-
-	if [[ -e "${instance_path}" ]]; then
-		eerror "The instance with the specified name already exists:"
-		eerror "${instance_path}"
-		die "Instance already exists"
-	fi
-
-	if [[ ! -d "${instance_path}" ]]; then
-		mkdir --parents "${instance_path}" || die "Unable to create directory ${buildworker_path}"
-	fi
-	chown --recursive buildbot:buildbot "${instance_path}" || die "Setting permissions for instance failed"
-	cp "${buildworker_path}/buildbot.tac.sample" "${instance_path}/buildbot.tac" \
-		|| die "Moving sample configuration failed"
-	ln --symbolic --relative "/etc/init.d/buildbot_worker" "/etc/init.d/buildbot_worker.${instance_name}" \
-		|| die "Unable to create link to init file"
-
-	if [[ ! -d "${instance_log_path}" ]]; then
-		mkdir --parents "${instance_log_path}" || die "Unable to create directory ${instance_log_path}"
-		chown --recursive buildbot:buildbot "${instance_log_path}" \
-			|| die "Setting permissions for instance failed"
-	fi
-	ln --symbolic --relative "${instance_log_path}/twistd.log" "${instance_path}/twistd.log" \
-		|| die "Unable to create link to log file"
-
-	einfo "Successfully created a buildbot_worker instance at ${instance_path}."
-	einfo "To change the default settings edit the buildbot.tac file in this directory."
-}

diff --git a/dev-util/buildbot-worker/buildbot-worker-3.3.0.ebuild b/dev-util/buildbot-worker/buildbot-worker-3.3.0.ebuild
deleted file mode 100644
index e66c92ea2278..000000000000
--- a/dev-util/buildbot-worker/buildbot-worker-3.3.0.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-DISTUTILS_USE_SETUPTOOLS="rdepend"
-
-inherit readme.gentoo-r1 distutils-r1
-
-DESCRIPTION="BuildBot Worker (slave) Daemon"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-worker/"
-
-MY_V="${PV/_p/.post}"
-MY_P="${PN}-${MY_V}"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~amd64-linux ~x86-linux"
-
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	acct-user/buildbot
-	>=dev-python/twisted-17.9.0[${PYTHON_USEDEP}]
-	dev-python/future[${PYTHON_USEDEP}]
-	!<dev-util/buildbot-1.0.0
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/setuptools_trial[${PYTHON_USEDEP}]
-	)
-"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	DOC_CONTENTS="The \"buildbot\" user and the \"buildbot_worker\" init script has been added
-		to support starting buildbot_worker through Gentoo's init system. To use this,
-		execute \"emerge --config =${CATEGORY}/${PF}\" to create a new instance.
-		Set up your build worker following the documentation, make sure the
-		resulting directories are owned by the \"buildbot\" user and point
-		\"${ROOT}/etc/conf.d/buildbot_worker.myinstance\" at the right location.
-		The scripts can	run as a different user if desired."
-}
-
-distutils_enable_tests setup.py
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	doman docs/buildbot-worker.1
-
-	newconfd "${FILESDIR}/buildbot_worker.confd2" buildbot_worker
-	newinitd "${FILESDIR}/buildbot_worker.initd2" buildbot_worker
-
-	dodir /var/lib/buildbot_worker
-	cp "${FILESDIR}/buildbot.tac.sample" "${D}/var/lib/buildbot_worker"|| die "Install failed!"
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-
-	if [[ -n ${REPLACING_VERSIONS} ]]; then
-		ewarn
-		ewarn "More than one instance of a buildbot_worker can be run simultaneously."
-		ewarn " Note that \"BASEDIR\" in the buildbot_worker configuration file"
-		ewarn "is now the common base directory for all instances. If you are migrating from an older"
-		ewarn "version, make sure that you copy the current contents of \"BASEDIR\" to a subdirectory."
-		ewarn "The name of the subdirectory corresponds to the name of the buildbot_worker instance."
-		ewarn "In order to start the service running OpenRC-based systems need to link to the init file:"
-		ewarn "    ln --symbolic --relative /etc/init.d/buildbot_worker /etc/init.d/buildbot_worker.myinstance"
-		ewarn "    rc-update add buildbot_worker.myinstance default"
-		ewarn "    /etc/init.d/buildbot_worker.myinstance start"
-		ewarn "Systems using systemd can do the following:"
-		ewarn "    systemctl enable buildbot_worker@myinstance.service"
-		ewarn "    systemctl enable buildbot_worker.target"
-		ewarn "    systemctl start buildbot_worker.target"
-	fi
-}
-
-pkg_config() {
-	local buildworker_path="/var/lib/buildbot_worker"
-	local log_path="/var/log/buildbot_worker"
-
-	einfo "This will prepare a new buildbot_worker instance in ${buildworker_path}."
-	einfo "Press Control-C to abort."
-
-	einfo "Enter the name for the new instance: "
-	read instance_name
-	[[ -z "${instance_name}" ]] && die "Invalid instance name"
-
-	local instance_path="${buildworker_path}/${instance_name}"
-	local instance_log_path="${log_path}/${instance_name}"
-
-	if [[ -e "${instance_path}" ]]; then
-		eerror "The instance with the specified name already exists:"
-		eerror "${instance_path}"
-		die "Instance already exists"
-	fi
-
-	if [[ ! -d "${instance_path}" ]]; then
-		mkdir --parents "${instance_path}" || die "Unable to create directory ${buildworker_path}"
-	fi
-	chown --recursive buildbot:buildbot "${instance_path}" || die "Setting permissions for instance failed"
-	cp "${buildworker_path}/buildbot.tac.sample" "${instance_path}/buildbot.tac" \
-		|| die "Moving sample configuration failed"
-	ln --symbolic --relative "/etc/init.d/buildbot_worker" "/etc/init.d/buildbot_worker.${instance_name}" \
-		|| die "Unable to create link to init file"
-
-	if [[ ! -d "${instance_log_path}" ]]; then
-		mkdir --parents "${instance_log_path}" || die "Unable to create directory ${instance_log_path}"
-		chown --recursive buildbot:buildbot "${instance_log_path}" \
-			|| die "Setting permissions for instance failed"
-	fi
-	ln --symbolic --relative "${instance_log_path}/twistd.log" "${instance_path}/twistd.log" \
-		|| die "Unable to create link to log file"
-
-	einfo "Successfully created a buildbot_worker instance at ${instance_path}."
-	einfo "To change the default settings edit the buildbot.tac file in this directory."
-}