gentoo resync : 25.09.2021

2 files changed, 128 insertions, 0 deletions

diff --git a/dev-util/buildbot-worker/Manifest b/dev-util/buildbot-worker/Manifest
index f2099f2a547a..4b6f728f02ee 100644
--- a/dev-util/buildbot-worker/Manifest
+++ b/dev-util/buildbot-worker/Manifest
@@ -9,6 +9,7 @@ DIST buildbot-worker-3.0.2.tar.gz 96923 BLAKE2B 720d265381c0dc4f876ba1c87df893d8
 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
 EBUILD buildbot-worker-2.10.0.ebuild 4612 BLAKE2B d6025654e4e330d8a58ef67050aa6eea06e2f6f6ddd528a8f1b945a8efb1ba23c767bcf7a52e46a928c56fe97071d883e410ff1b330567677c7887776d4c4a64 SHA512 45813c1392eb44f9245c4528ef97bccc91bf89a991a9df861537721fefbb7f3464dce8f073dcf7c5483fec02ad6ff85aaef1eaeacfc4bed07fad0947941ab2b6
 EBUILD buildbot-worker-2.10.1.ebuild 4612 BLAKE2B d6025654e4e330d8a58ef67050aa6eea06e2f6f6ddd528a8f1b945a8efb1ba23c767bcf7a52e46a928c56fe97071d883e410ff1b330567677c7887776d4c4a64 SHA512 45813c1392eb44f9245c4528ef97bccc91bf89a991a9df861537721fefbb7f3464dce8f073dcf7c5483fec02ad6ff85aaef1eaeacfc4bed07fad0947941ab2b6
 EBUILD buildbot-worker-2.8.2.ebuild 4612 BLAKE2B b24029d46d49eb188f8955a8a31b5bb59c68f10d78ac778f5fc739080825d59539ff81c0d1e1bcaccaeafe345e60474098db52509431fe10e616c33eeca85e73 SHA512 a21d78d2a7ee910efd8da093b092aa0e9386a433f2abd8832932e9c6c2c2a3e31524ee6a9bd0bb64a6bfa1174ee529b9bf361a1961a46250ed12b42c29f7bccf
@@ -17,5 +18,6 @@ EBUILD buildbot-worker-3.0.2.ebuild 4614 BLAKE2B 46c5d74b0654c0cdf7e3d589bed5c34
 EBUILD buildbot-worker-3.1.0.ebuild 4621 BLAKE2B 68e47ab3e16a63124b1b9c9dbfe1c68befc387e861bac3fb3e7937a3c97b623841526807d3b68b1bdcc6575de454b281603cd582ae7675e237aa6c446b859175 SHA512 7fe155aaab0f7020044d0f4617ec2e7419d5cb7fa99c3e0cbfe360b0053f4d2347f2c1cd724b77e320e4a10608866b381f1e55fbac52a64d27a96400f0ebac70
 EBUILD buildbot-worker-3.1.1.ebuild 4645 BLAKE2B fdf1dcbe3d5925c5d65ca7c82ac549146915407f312b34c437211da55ac7ff92688d33387c20c3f8c6911885b2c7eb83358c9e2f81a30072f73e490c4522877d SHA512 29f3834f42a7d1589d6ac91d1385c37e826b5ef28c8eace06c6ca84c456f6c9a7b1735c168a384b110c901846042a87355198cb3aa2706510219b1dfacdf7a91
 EBUILD buildbot-worker-3.2.0.ebuild 4645 BLAKE2B fdf1dcbe3d5925c5d65ca7c82ac549146915407f312b34c437211da55ac7ff92688d33387c20c3f8c6911885b2c7eb83358c9e2f81a30072f73e490c4522877d SHA512 29f3834f42a7d1589d6ac91d1385c37e826b5ef28c8eace06c6ca84c456f6c9a7b1735c168a384b110c901846042a87355198cb3aa2706510219b1dfacdf7a91
+EBUILD buildbot-worker-3.3.0.ebuild 4645 BLAKE2B fdf1dcbe3d5925c5d65ca7c82ac549146915407f312b34c437211da55ac7ff92688d33387c20c3f8c6911885b2c7eb83358c9e2f81a30072f73e490c4522877d SHA512 29f3834f42a7d1589d6ac91d1385c37e826b5ef28c8eace06c6ca84c456f6c9a7b1735c168a384b110c901846042a87355198cb3aa2706510219b1dfacdf7a91
 EBUILD buildbot-worker-9999.ebuild 4619 BLAKE2B 50d4fa32c36c1517aede27e2ca335414d260a4a58eafc4069c1ee777194f6c70da5de8f7dafe310001ed16924c49749d5bfdbc8496b866b0c38d46f38f5d6f8b SHA512 ca127a2b3153241355ef8f5a903c72f771018e59ade8e74f4f1e241a8adf4cdd01cfeb5379f2a294b5fabb600b26cd0fee75fd99e747d7927e09689338ad07fb
 MISC metadata.xml 481 BLAKE2B 884b573e537512f10a184b60b3d354ef70aca1200507c74ad4be79ebd0fc81cabeaafc9db05e23edae6cec47b92340febbcb3345c0227a32f95119d607493cae SHA512 d6f00cc040032613bbbc55fd957a0544266b20e54ae30710f7c32847576a91d329c55692a9fdc74e25827c7b8689eb17770b7935bd91ebd8395237e0e8b200ae
diff --git a/dev-util/buildbot-worker/buildbot-worker-3.3.0.ebuild b/dev-util/buildbot-worker/buildbot-worker-3.3.0.ebuild
new file mode 100644
index 000000000000..e66c92ea2278
--- /dev/null
+++ b/dev-util/buildbot-worker/buildbot-worker-3.3.0.ebuild
@@ -0,0 +1,126 @@
+# 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."
+}