gentoo auto-resync : 26:08:2022 - 02:51:21

4 files changed, 146 insertions, 2 deletions

diff --git a/dev-util/buildbot-worker/Manifest b/dev-util/buildbot-worker/Manifest
index 86f48068ccf2..a1bf3070b155 100644
--- a/dev-util/buildbot-worker/Manifest
+++ b/dev-util/buildbot-worker/Manifest
@@ -1,9 +1,12 @@
 AUX buildbot.tac.sample 1799 BLAKE2B 25fa4b85b0ad16d51780613b20f89c56e0131d73eb7d8b6cb23cfeee84bcff31b99a6bf2e81bbc467db340a774a43be6a2f7fc3c03068df09dd6164fc9e8050d SHA512 4a1b6d78b51067b5d3efb8de18d91995efb820bf9486c6ad6acd5bf726e39c3a7746cc9fb90b5a07eda8a40b09988490972b11707026d951184660a21fddccc1
 AUX buildbot_worker.confd2 366 BLAKE2B bfd08d2c6ee89c9e9d09e3280ded65765789b701cd4aa31d953b8f87d24ec1d85260b22d978d152191c918c72569e77bdac91de07d3eae4dad9ac529b4c140d4 SHA512 2bcb93b739827566bce295bc508481c50b57c1202d858359733649d4f35f116d994e0285a53a84d1b89d371a6fd23c0a89f4e555c31555bf14783eb5f57f15b0
 AUX buildbot_worker.initd2 1637 BLAKE2B d29fa6d6596f789af88319300537ef8ba9d51eff452d54afbf27dcc0da358482b73b0c721d537c217ffe01502acb0eb08c31c138042bc39e4d1457091f84a284 SHA512 63ca598dc7d3102cf74166ddc92045cc06f798f17676bcb7166b95bb5b1562bb1ea172afe39ea275783ec7ca7db1c469c7f54dd588a007026e93b3877ba2ada5
+AUX buildbot_worker.service 296 BLAKE2B 2f557007489fa0d7c355dfcd12388c405fca269ca10573489fd9d303f9edfb2900e5505cdf851c464aec7a7e908aecf3d16c2773bea26158c08caae0ab1a9e4b SHA512 936035e92d8bd481b8af93450445a82ccf8eb21d3f6bf99c2a02f52ba71d911940b8a6316b7f8b888443f577d73184bf7e7d99329ffbaa995e32ea3d9cf715bc
 DIST buildbot-worker-3.4.0.tar.gz 102910 BLAKE2B c38a806e8d0475a8c18176310f628b829fc359f013b315e82715e71071213fe4a0cdf38273ad7df39a66675f4ebc9fb1881fb990290f2bbedf4c8777ec93d4dc SHA512 411a2bf496622c2b9a3e0dea1ea8a71b347566010086c57ffc5d1114546cc5052af39a8ff7b10ffe6e7afdb6fc8ff73a9ffba23b96a76ff1cc0e3eff81cc59a7
 DIST buildbot-worker-3.5.0.tar.gz 111349 BLAKE2B 90d193fb89ac65ca03274e0ad5c7fde8fc478bb932ccc4240495437f79171d49f623f50731c7619336386b7d1d7df3f955e10bf006ad86b8dcf294d75c874774 SHA512 1df67b6332753f91179863cca76b0578e4f36954e0aa4eb9c28f98d6451d6972e247849fb9d4e20b753b5702d100406b306ce4982181510ad81de0d35a9828ed
+DIST buildbot-worker-3.6.0.tar.gz 120158 BLAKE2B c762237d802f6eff1c6b74f0ed364ecf085d762c80f6cc90edc1fed0084c7bf6a0b74b6fcaf8611b9c21b6249bde547d5a10bc7ff5b4588d138b2ebf76e823a3 SHA512 6b5f50694fe1559dacba599f8641c6b370cad4b68c8182e8a6e31528ffbeeed81c405fd764e3718003913fe5fe8d9faa920a2ad81373fbd028cbf046ed0d3136
 EBUILD buildbot-worker-3.4.0.ebuild 4644 BLAKE2B a934c87f28b81ab622e0ffcfb3e0e0636722b6d6ea0066fb9aedeb57b9f61857891007584bbcbcc1306b8454616f8a8c241def5467732818e54988e234ef4905 SHA512 a08935e46cb9bcd9ecf76a0e5e4cf94a31f5a27a4d22d94d9ab19e86e6ed163082b36d507d76be8e3692ae4278081d0d60aa8ed0d09b44e53939ad9050be6c0a
 EBUILD buildbot-worker-3.5.0-r1.ebuild 4820 BLAKE2B d56eb4bda74894de2a6130c5c87db55242e686f4ecc54d718a2c51f24500a61af92bbdf4e0c35b146f766ddcf6f065397158783d9da0ca4f493ab48fbd2e831c SHA512 33344be29c8aed20cc78a82563959d3881de5a3d1bc102018dc9539c39539cf3854cc2182d2534a4c671179ea54d27f179270c1708efdb97a454c125fa3e6683
-EBUILD buildbot-worker-9999.ebuild 4723 BLAKE2B 624265dba845045056b7c7b6a58fe070141ea043e8e0b713650e83bf6d1e3ce78389001f831990843df149f2cfab0c02128ab4494310ffea19fadae3560dc4c5 SHA512 680b8c0f51a9a02f8f57dc48af1928084519b5d14a319f0090b0cbe9d7b40a5eb730e4e46ae21ccddb8f1e412450cb09c765cd9689b8bc31f178663701bd4683
+EBUILD buildbot-worker-3.6.0.ebuild 4820 BLAKE2B b3a98bb98922bd4f02b58e599e836e083ba156493f566ad37cb618d9a998fcfb96c3ed2246c38507ede4db4fcd98a305177b4636371514f1a06e95b96c157291 SHA512 683e621a440a3a7e99dde21bfd9897bf8e35a49dc2cc236a5612f8d45a2d20bf702019ca79146355c7dad1b6a10e5925e0eb25bfff584d27c981465606e902f5
+EBUILD buildbot-worker-9999.ebuild 4723 BLAKE2B dca9bafeed289948c0b026f3511fac8ae7b5b774c059a4d6bf429fb6753a4a6c0a1ec0e5e5ce39b72df073b597cfbeaa43f29191a096280418fd006f1d2c2b27 SHA512 1fbc0a4f0ce37baa439d2ca8824cc46b715b9308b3fd75d3843cbe30fc55760c9fc68dc96a85db9e9d1c48cf5327af9add53f66068f83cc8960bc9244cf7651f
 MISC metadata.xml 481 BLAKE2B 884b573e537512f10a184b60b3d354ef70aca1200507c74ad4be79ebd0fc81cabeaafc9db05e23edae6cec47b92340febbcb3345c0227a32f95119d607493cae SHA512 d6f00cc040032613bbbc55fd957a0544266b20e54ae30710f7c32847576a91d329c55692a9fdc74e25827c7b8689eb17770b7935bd91ebd8395237e0e8b200ae
diff --git a/dev-util/buildbot-worker/buildbot-worker-3.6.0.ebuild b/dev-util/buildbot-worker/buildbot-worker-3.6.0.ebuild
new file mode 100644
index 000000000000..34360f39c453
--- /dev/null
+++ b/dev-util/buildbot-worker/buildbot-worker-3.6.0.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+inherit readme.gentoo-r1 distutils-r1
+
+MY_V="${PV/_p/.post}"
+MY_P="${PN}-${MY_V}"
+
+DESCRIPTION="BuildBot Worker (slave) Daemon"
+HOMEPAGE="https://buildbot.net/
+	https://github.com/buildbot/buildbot
+	https://pypi.org/project/buildbot-worker/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	acct-user/buildbot
+	>=dev-python/autobahn-0.16.0[${PYTHON_USEDEP}]
+	>=dev-python/msgpack-0.6.0[${PYTHON_USEDEP}]
+	>=dev-python/twisted-18.7.0[${PYTHON_USEDEP}]
+	dev-python/future[${PYTHON_USEDEP}]
+	!<dev-util/buildbot-1.0.0
+"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/mock[${PYTHON_USEDEP}]
+		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."
+
+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
+
+	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-9999.ebuild b/dev-util/buildbot-worker/buildbot-worker-9999.ebuild
index 3c8df2e78a33..6fb30ec0ecab 100644
--- a/dev-util/buildbot-worker/buildbot-worker-9999.ebuild
+++ b/dev-util/buildbot-worker/buildbot-worker-9999.ebuild
@@ -22,7 +22,7 @@ RESTRICT="!test? ( test )"
 RDEPEND="
 	acct-user/buildbot
 	>=dev-python/autobahn-0.16.0[${PYTHON_USEDEP}]
-	>=dev-python/twisted-17.9.0[${PYTHON_USEDEP}]
+	>=dev-python/twisted-18.7.0[${PYTHON_USEDEP}]
 	dev-python/future[${PYTHON_USEDEP}]
 	!<dev-util/buildbot-1.0.0
 "
diff --git a/dev-util/buildbot-worker/files/buildbot_worker.service b/dev-util/buildbot-worker/files/buildbot_worker.service
new file mode 100644
index 000000000000..e75a2d51e4f3
--- /dev/null
+++ b/dev-util/buildbot-worker/files/buildbot_worker.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=buildbot worker (slave) instances
+After=local-fs.target network.target
+
+[Service]
+Type=forking
+User=buildbot
+ExecStart=/usr/bin/buildbot_worker start /var/lib/buildbot_worker
+ExecStop=/usr/bin/buildbot_worker stop /var/lib/buildbot_worker
+
+[Install]
+WantedBy=multi-user.target