gentoo resync : 29.12.2022

5 files changed, 142 insertions, 5 deletions

diff --git a/dev-util/buildbot-worker/Manifest b/dev-util/buildbot-worker/Manifest
index 1d4547428337..32ba7437f67f 100644
--- a/dev-util/buildbot-worker/Manifest
+++ b/dev-util/buildbot-worker/Manifest
@@ -1,7 +1,9 @@
 AUX buildbot.tac.sample 1799 BLAKE2B 25fa4b85b0ad16d51780613b20f89c56e0131d73eb7d8b6cb23cfeee84bcff31b99a6bf2e81bbc467db340a774a43be6a2f7fc3c03068df09dd6164fc9e8050d SHA512 4a1b6d78b51067b5d3efb8de18d91995efb820bf9486c6ad6acd5bf726e39c3a7746cc9fb90b5a07eda8a40b09988490972b11707026d951184660a21fddccc1
 AUX buildbot_worker.confd2 366 BLAKE2B bfd08d2c6ee89c9e9d09e3280ded65765789b701cd4aa31d953b8f87d24ec1d85260b22d978d152191c918c72569e77bdac91de07d3eae4dad9ac529b4c140d4 SHA512 2bcb93b739827566bce295bc508481c50b57c1202d858359733649d4f35f116d994e0285a53a84d1b89d371a6fd23c0a89f4e555c31555bf14783eb5f57f15b0
-AUX buildbot_worker.initd2 1640 BLAKE2B 17a40547260004b40d77219aefa70f08846741e328a2a20bb0b075d5fa0007cc6ad63ecf600eee49251de14c4abb41f70ca813a9429dbce251509121157da9b9 SHA512 8eae575cb001b4750cd2033f9cb82d3985ad9bc2a4bc20ff0e4aaa0cbd05bacf8d6d885ec08112da15e0ccf8fd895006eed39b0b9a4bcaee86911b5180fab0f2
+AUX buildbot_worker.initd2 1637 BLAKE2B d29fa6d6596f789af88319300537ef8ba9d51eff452d54afbf27dcc0da358482b73b0c721d537c217ffe01502acb0eb08c31c138042bc39e4d1457091f84a284 SHA512 63ca598dc7d3102cf74166ddc92045cc06f798f17676bcb7166b95bb5b1562bb1ea172afe39ea275783ec7ca7db1c469c7f54dd588a007026e93b3877ba2ada5
 DIST buildbot-worker-3.4.0.tar.gz 102910 BLAKE2B c38a806e8d0475a8c18176310f628b829fc359f013b315e82715e71071213fe4a0cdf38273ad7df39a66675f4ebc9fb1881fb990290f2bbedf4c8777ec93d4dc SHA512 411a2bf496622c2b9a3e0dea1ea8a71b347566010086c57ffc5d1114546cc5052af39a8ff7b10ffe6e7afdb6fc8ff73a9ffba23b96a76ff1cc0e3eff81cc59a7
-EBUILD buildbot-worker-3.4.0.ebuild 4612 BLAKE2B 7f048e1a8f8dfcf0009d17428fa4dbf4edaf0b3773bab1cf915ad2c9820233a1a528871de45b55276a6cf9cfd727af9e5bb47b954e1ef8c0423c81957065c9a0 SHA512 378b83c7943d08fbd9c316b1fc180f8fc886c2408b9ab56778dae2fa0ea5e5e6caebbb7b8400788d342d817d4649d457d197ea5f2e69c66917e3446247067633
-EBUILD buildbot-worker-9999.ebuild 4514 BLAKE2B 2f6fea082878f4ee08eb5d488237a83f2962fa16cdc46bb40e917ea4c906dab5fe3c33879356f3c5cd6fc7d563f22d543194451f59921853462bfe119bf2b9d5 SHA512 0a0ab5c9eb9eeff2ad181b726bce42820f4a5ec40cec51e28cf3c20d2d6aea298d241de7a9608c914289fc0362315938a93d393186f4af1f351543e8b252affd
+DIST buildbot-worker-3.5.0.tar.gz 111349 BLAKE2B 90d193fb89ac65ca03274e0ad5c7fde8fc478bb932ccc4240495437f79171d49f623f50731c7619336386b7d1d7df3f955e10bf006ad86b8dcf294d75c874774 SHA512 1df67b6332753f91179863cca76b0578e4f36954e0aa4eb9c28f98d6451d6972e247849fb9d4e20b753b5702d100406b306ce4982181510ad81de0d35a9828ed
+EBUILD buildbot-worker-3.4.0.ebuild 4644 BLAKE2B a934c87f28b81ab622e0ffcfb3e0e0636722b6d6ea0066fb9aedeb57b9f61857891007584bbcbcc1306b8454616f8a8c241def5467732818e54988e234ef4905 SHA512 a08935e46cb9bcd9ecf76a0e5e4cf94a31f5a27a4d22d94d9ab19e86e6ed163082b36d507d76be8e3692ae4278081d0d60aa8ed0d09b44e53939ad9050be6c0a
+EBUILD buildbot-worker-3.5.0-r1.ebuild 4821 BLAKE2B fd63774649fdeafbb3f6f007d91cc1ded300455b2bbc73bbcf8f06af973528a43d77703170b23595c0dbd4bf6b02eb584bee023e26feebf611f4a5c68c8b6794 SHA512 1859408413d58f7b9b79f2c19c83b4244c19906b58650bc3b22087d32b81b97c8f972acea737db855cedca0f8f17071bdfff722cdd95dba00dfab983f5173ef9
+EBUILD buildbot-worker-9999.ebuild 4723 BLAKE2B 624265dba845045056b7c7b6a58fe070141ea043e8e0b713650e83bf6d1e3ce78389001f831990843df149f2cfab0c02128ab4494310ffea19fadae3560dc4c5 SHA512 680b8c0f51a9a02f8f57dc48af1928084519b5d14a319f0090b0cbe9d7b40a5eb730e4e46ae21ccddb8f1e412450cb09c765cd9689b8bc31f178663701bd4683
 MISC metadata.xml 481 BLAKE2B 884b573e537512f10a184b60b3d354ef70aca1200507c74ad4be79ebd0fc81cabeaafc9db05e23edae6cec47b92340febbcb3345c0227a32f95119d607493cae SHA512 d6f00cc040032613bbbc55fd957a0544266b20e54ae30710f7c32847576a91d329c55692a9fdc74e25827c7b8689eb17770b7935bd91ebd8395237e0e8b200ae
diff --git a/dev-util/buildbot-worker/buildbot-worker-3.4.0.ebuild b/dev-util/buildbot-worker/buildbot-worker-3.4.0.ebuild
index 53095e2d7956..e80a110a2894 100644
--- a/dev-util/buildbot-worker/buildbot-worker-3.4.0.ebuild
+++ b/dev-util/buildbot-worker/buildbot-worker-3.4.0.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=8
 
+DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{8..10} )
 inherit readme.gentoo-r1 distutils-r1
 
diff --git a/dev-util/buildbot-worker/buildbot-worker-3.5.0-r1.ebuild b/dev-util/buildbot-worker/buildbot-worker-3.5.0-r1.ebuild
new file mode 100644
index 000000000000..9da9100eb30d
--- /dev/null
+++ b/dev-util/buildbot-worker/buildbot-worker-3.5.0-r1.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-17.9.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 18ee776e0e52..3c8df2e78a33 100644
--- a/dev-util/buildbot-worker/buildbot-worker-9999.ebuild
+++ b/dev-util/buildbot-worker/buildbot-worker-9999.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=8
 
+DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{8..10} )
 EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
 inherit readme.gentoo-r1 git-r3 distutils-r1
@@ -20,14 +21,18 @@ 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/future[${PYTHON_USEDEP}]
 	!<dev-util/buildbot-1.0.0
 "
 BDEPEND="
+	>=dev-python/msgpack-0.6.0[${PYTHON_USEDEP}]
 	test? (
 		${RDEPEND}
 		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/parameterized[${PYTHON_USEDEP}]
+		dev-python/psutil[${PYTHON_USEDEP}]
 	)
 "
 
diff --git a/dev-util/buildbot-worker/files/buildbot_worker.initd2 b/dev-util/buildbot-worker/files/buildbot_worker.initd2
index 453d207e5d88..4ebfdd452926 100644
--- a/dev-util/buildbot-worker/files/buildbot_worker.initd2
+++ b/dev-util/buildbot-worker/files/buildbot_worker.initd2
@@ -1,8 +1,8 @@
 #!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-BUILDWORKER_NAME=${RC_SVCNAME:16}
+BUILDWORKER_NAME=${RC_SVCNAME#*.}
 BUILDWORKER_PATH="${BASEDIR}/${BUILDWORKER_NAME}"
 depend() {
 	need net