3 files changed, 142 insertions, 0 deletions
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 92973daab419..9160473e4385 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/buildbot-worker/Manifest b/dev-util/buildbot-worker/Manifest
index e167007c7295..a0d839c8d72f 100644
--- a/dev-util/buildbot-worker/Manifest
+++ b/dev-util/buildbot-worker/Manifest
@@ -7,9 +7,11 @@ AUX buildbot_worker_at.service 343 BLAKE2B 6fed117fe1e5478ef3d2fb1bfeac92fd9b9e9
 AUX buildbot_worker_at.service.conf 154 BLAKE2B 20323a777b44200c5a73278a10804169c64e07a5c2fc8695eb49339d1ba415b06324db6ae3084aa4fa6cfd1a684e4f41fb4b73436fa4305314faf9e5da485a9c SHA512 5fd61d4436652a927af9788799bb9f8b7a66baadc0bf486c9bbe171a5cd9ec8457719bdda45f911d5b0620db8fb4c494c75e2b2fd69951ee4dc83119dd7d6628
 DIST buildbot-worker-3.11.0-remove_py27.tar.gz 7134 BLAKE2B 8c92f8425b9a8d60e46228aab6aef49352090c931e21818d684167100f0c5c184e5e4e6aabdbb420bfe0b124d572194b33889deccf123b934754ad4e75037af0 SHA512 d9158e7936336d6147c0938ea212da55775ffe1c431b94b1b89274113fa45cbd62b7042737bac8a6580e268aca823fa072ee3d3bb49bad97aa99bd56995d7134
 DIST buildbot-worker-3.11.0.tar.gz 131028 BLAKE2B 644e10f1d90c75a9f20439bc902764d9f69b16781d710e56bf4cad40d30f06f137d6a00d4c450c1589909ca93c98ff9a0cd6e1363a8feff58a4832e0096aada7 SHA512 73f42495bd252e75cd984d3222663260079887caadff29b69c23f188a1f3208fc6e2acfa38553fb5615ba1c3d4996655c96faa16ba0eb7335c6290ce3ce58679
+DIST buildbot-worker-3.11.1.tar.gz 131129 BLAKE2B d8466c086261c612e976586b4589ca20617f5b9a7b69ccf276500fd351caead1425ae24897c4db242024de53f83c98b869dd9035bc366d9ee0376290307922a0 SHA512 c4560f69a15434cf93a43521bd1bbb568937a6ad8be338bca9089c9f449c3d0c5b8f000abf06a5fcfe4ebf5b206a9c81417a91cee633b67ca89ee67497a8368a
 DIST buildbot-worker-3.6.1.tar.gz 120224 BLAKE2B 010893b7b4e5710654299b2541c4cdcdad47b3b763dbc7e2336e5480c841908e04d8350c7cb42edd9ea99d16fd26f36a524a6d6bec8c0f933665a02ded369f89 SHA512 f1e3bf7c0da2f31dd446dc16487e32fddaecc0c2f9c17c469146707322a3d7bb2cc77db4f6145c62530bce58dd61aa19e008e944a7f39a17dc66f1317ee26e1b
 DIST buildbot-worker-3.9.0.tar.gz 125913 BLAKE2B e053cd150cf21cc0e5dfb2d49c186c49d340670429b760ce9f697aa97a245d0e6a12f0ea84eb1256a610891042096877c89244b1f2862bf74160502170f9124c SHA512 08b74d6f019ca85f65c598a34c81bc47fdf873abad17205072788d938fcd5450f80aa6ca9d324edc01893947f4ac8e2968889dd73be854a82b4ea54e4730613b
 EBUILD buildbot-worker-3.11.0.ebuild 5313 BLAKE2B 18634d0dcf3c975842549e42774c937f867f50cbc0cb5f490284475c1504ccbb381f147932d05a19b721ab5f0e92c8f2caf6479440532f3d599691335d384e2c SHA512 7262096a6e7f28c4f10ed9771ea9433dec6929c0490e969b074043ca121881417dca967e2cd024e7949aaa70ab44582f5a6b17266bbd7a008a859b4a4dd53924
+EBUILD buildbot-worker-3.11.1.ebuild 5235 BLAKE2B 99bd01ba2d74fc43a57fb2becf71a6522ddc847fc8e2619d838c0eeefab4565567411ce7a9be4554ef097586b07dea72c73a437700baee352ef6b7ce444ee8dc SHA512 980b528a8d8dd5731cc0a295dfe64cff7fed4e25307cb634af41d38555b6975247caa9bd1ea89dcd0400b663f1cbe140effa8f5f9d3c56c34a8ce4c50b12df60
 EBUILD buildbot-worker-3.6.1-r2.ebuild 5191 BLAKE2B 67702aedccac19aaabed0aaf9857caa1b12746ee50fea70e33580f87f36466f508a7981cbf1f36933c9d3ca2dea399f8282953920cc72d154610ae405ad81004 SHA512 6b1cfc2c6905279ad45d8d1fd3111f716351bef2d887f9adc71eb65c36ec01333199c0d8e0ba6340498bac766d705fa92bead0fc5b4b0a488065822e4c71daf2
 EBUILD buildbot-worker-3.9.0.ebuild 5155 BLAKE2B 8ea8a6475fbe37ff1764c02bfd55d35d03bb8332af4aeb2bafc379fd65587a3828575abfe2b3bdb4f2b906e98b4cb545cecfa279df16b773f18ff5ad024705b4 SHA512 e508c826334eaed6132287afcdf3cbaebd1ba11c546ef990c128b652057014ba83f223706a29eeed06cdae84e3f367ad5e2c5d25bcc2ba64ecb99f4ab101c808
 EBUILD buildbot-worker-9999.ebuild 5104 BLAKE2B 58af73cb40b8d48ef60acf09e5dded6b9076cd62afe08bb599861d2c0a883e60db1e1dffdb0f0586a8b96b05ee437e67001617a7bc4da99f389fb1dc1d829c2f SHA512 141e36672adce0aecf77403daee423809690135c20da4bb0e7f550df7a6f1ca72235145554001c0bd7d3d9f447bc9a23ae28e1030f18110a66f7e7f4e07c04da
diff --git a/dev-util/buildbot-worker/buildbot-worker-3.11.1.ebuild b/dev-util/buildbot-worker/buildbot-worker-3.11.1.ebuild
new file mode 100644
index 000000000000..8467423a060b
--- /dev/null
+++ b/dev-util/buildbot-worker/buildbot-worker-3.11.1.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+PYTHON_COMPAT=( python3_{10..12} )
+inherit readme.gentoo-r1 systemd distutils-r1 pypi
+
+DESCRIPTION="BuildBot Worker (slave) Daemon"
+HOMEPAGE="https://buildbot.net/
+	https://github.com/buildbot/buildbot
+	https://pypi.org/project/buildbot-worker/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~sparc ~amd64-linux ~x86-linux"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+SRC_URI+="
+	https://github.com/buildbot/buildbot/releases/download/v${PV}/${P}.tar.gz
+"
+
+RDEPEND="
+	acct-user/buildbot
+	!<dev-util/buildbot-3.0.0
+	>=dev-python/autobahn-0.16.0[${PYTHON_USEDEP}]
+	>=dev-python/msgpack-0.6.0[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	>=dev-python/twisted-18.7.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/parameterized[${PYTHON_USEDEP}]
+		dev-python/psutil[${PYTHON_USEDEP}]
+	)
+"
+
+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."
+
+src_prepare() {
+	# Remove shipped windows start script
+	sed -e "/'buildbot_worker_windows_service=buildbot_worker.scripts.windows_service:HandleCommandLine',/d" \
+		-i setup.py || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	"${EPYTHON}" -m twisted.trial buildbot_worker || die "Tests failed with ${EPYTHON}"
+}
+
+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
+	systemd_dounit "${FILESDIR}/buildbot_worker.target"
+	systemd_newunit "${FILESDIR}/buildbot_worker_at.service" "buildbot_worker@.service"
+	systemd_install_serviced "${FILESDIR}/buildbot_worker_at.service.conf" "buildbot_worker@.service"
+
+	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."
+}