gentoo resync : 29.12.2022

5 files changed, 192 insertions, 10 deletions

diff --git a/dev-util/buildbot/Manifest b/dev-util/buildbot/Manifest
index c8239a32832f..3868e755197a 100644
--- a/dev-util/buildbot/Manifest
+++ b/dev-util/buildbot/Manifest
@@ -1,9 +1,11 @@
 AUX buildmaster.confd 362 BLAKE2B 72d36c02b825ab26e8d85348c3dc65800e03c8d9439a4ada658764b5f87e83e07eb89b1b5bedc59466135008135733319d8e4a31657c9f3f0c1713d1649ab820 SHA512 5b3e3cc75187d0b44c8e59cdfb605752db20913b025eadc7e673bc7c9c45b33e1a0d19362c0cc0c023cd32255946d510f172090ada9cbf2978f4807de29e2b72
-AUX buildmaster.initd 1654 BLAKE2B baec16ceb91386629cc9ea0b22118dd3dd76ec6f50a1ced00ca246fd8b0e5df96d9ccb75620d4e8a96560f99a3a2ceaf8e113172a9ed4de238dc21c955470bec SHA512 a036559f61bd7d8f5834e9e9cc6bfaa7e8b70a694c6344482449c29c8168a34ecc180c908e7aab6b722e1487c51a53928693c0dcfbfd016622781bcfdb7d5d7b
+AUX buildmaster.initd 1651 BLAKE2B 49012bf396862e28af3abcec1669bac93cfa4a60ae889d9c1584f028afe22508db797260615541267d3d501820e2643b2f03f12409b0d2d1c374e20dcebd6030 SHA512 72ea57072291d1eb49a4d567a7bd4931cf2f2d962e1e885183468b73d4052b1f0f4d454a18320969db84d82c144fe47076646f70a7f141f832123465cbba6016
 AUX buildmaster.target 138 BLAKE2B 7570fc327d2e002803f7d6691740f5885e6b54d3df2522c0439d551d0c01161fcd99779df0bff417dd66e1bacde2956bfa7b39f988f2fe204fb2abdb675adfe9 SHA512 c5f56688349af0adcfa644abc699445e2c61bb268d5407f8fc540ac80ea9be6aee615df16bbf0f41db272dd4159762d7be744b3116efc0f9bc7cb1d458edb050
 AUX buildmaster_at.service 375 BLAKE2B 1a4d829389298713bf66885a5bcd28202eec32b6356b43b9e0861b00052e3702593a2e2a4764246dd62e52805ba2f2e62a86d0ae8ec4cbed3df42400dc562f74 SHA512 c37f1c461a4c7ee741a839772a5feabf10103542e159c6ae4eddfa37a146732dfc23f91d867d69c3718a21714516a3847485ae4e6580c93a5aa94daec40dd093
 AUX buildmaster_at.service.conf 150 BLAKE2B c6931c3ebfd77553d52b650668c440ca17f37bf270ab807eb97702d23cc504c0a933453addeef4abd3ddb13e9441cd330dd4cff9dc9962bdabbed8f0fa6d892c SHA512 d533b95c5b180cda5aa73966c590b7828598d5b6bcd77147a88238941adaa4c3c78e5f17d771598f622212856b16ce4582ab915a4cb57f0dd633eb2ad6b4c10d
 DIST buildbot-3.4.0.tar.gz 2446868 BLAKE2B a58b268fd4569105f1c0ba48c9ed86210a3fee4725f167d6b6847960bbb56a092d0c0db427ecf5932a91d44065da8843fbb4046d289800a019b0b1d8b1f53fea SHA512 92e5085862ac37a6c3c059870a3998fbaac2019c48384295f3e209788ea14bddff6704f1b987a8f3b1550c1b0255d228f8a0b2a20b5cb760b22a513db465863b
-EBUILD buildbot-3.4.0.ebuild 6534 BLAKE2B bd72225c1638f8f472340e92f3cd9ed4f4af34e5cc21be2cb6c9d1efd147a83cda96b3f872432f8ec0afa633712e01212f643214010d47f9420e4483a171dcbe SHA512 bce6e5cf3afe7d37b7992cef9cc36e5368aa362a849c8f6247bcab1f634147d398399ffe7b56dba1edd1937b237c99f9282967d01a0b0dff214d193c1375d1e0
-EBUILD buildbot-9999.ebuild 6432 BLAKE2B 815bc338ec0f9ff949d32ca02201c59b446bde86bfa9b8c9272b785425a53f4dbba30dc16204d20175b9b45f643bcbcb590a86b9457ad063cc4a10cf1d8e5729 SHA512 b46f1955b7a36d981f0cf4fe62925b3aaa93051b0e264c0f5acbb7fe9efb65ef68927f0510273dacad167db22b6ecc5ce6a21a387bc34a666cc47bdc8c16844d
+DIST buildbot-3.5.0.tar.gz 2450653 BLAKE2B 0e923f2a3a334241b25c6a151b397356d7ba81ab2ff19c17c50a5996494d0f99fa198b63aa18a27ab60c5ad53c0154494bf4dea4e2bd306f4b709858a64dc3c4 SHA512 9730305540db3cdf166fdfc071142061926bbb895aa941046ad25e8350d3c161d4175f3518cd8a3ab51f320b0a5980517e5e53d9f5ddc342492ee56a0f6f266f
+EBUILD buildbot-3.4.0.ebuild 6566 BLAKE2B be9edf41162c3d9e0e78d3a80aef9efac6e208cb4862ecab62dd3c6f447ecda995b25b70b1c639c137a5ab96c09aa85d48523da1ac7b8f0013c0ea12401ffc29 SHA512 4d0d86a7ffa33937ddacccfe7f9bca35f03c0c39b5bb080ed576aeec93dad58155c42429474b59b2076d7972f79a6724bc63dd7937910f4dc7dc4c926f0b56fb
+EBUILD buildbot-3.5.0.ebuild 6566 BLAKE2B a39542ace97fc4324b0bde9151b61046bf62c900a5b09fffa1f1a633273a29d145a816738b7c74d057f7fc7d1e43b10e659defd5dfb33a8a66a94b64813480f3 SHA512 683ba1890dc5c99d0d78fff18c690edc835af7c3d57d226b91bb12fed9c493ecd5e59a160919c42ac90f53aab7648c871aa348d64cf4583a4066b5be2e284c9a
+EBUILD buildbot-9999.ebuild 6445 BLAKE2B bd10410044ae6dd5769e78e7c8046d40ff6db777459db60d1683668fc5a4fbf774ecd7208d072cf8a9fe7564e56231b63e654b4c22ae2b227a1b42373d79220b SHA512 da2d4a6481725df2e9307e3a6dd5241827fe0e7b449ae93c5c11e43f6521530842d775ae7ba7c0a147b21ca32dd48e2064b4a3b765a9415702fe29e85f24dd24
 MISC metadata.xml 1360 BLAKE2B 4f54443c55c18288e1cd887528e94c5c258441cbde1579222f141ccba69b241b7163ee5c65056b9ba89794c543342394cd656b5f6d9f8356af47c4681d60bf4f SHA512 3ba99aead69ebc879d9e8a42ed41f250cfea97bdb21147dcefba40b759f87e682f0f416ab6b915afdd4dbe2c4e41ce99aeee23ea8afa349a131f6f450ef7ea95
diff --git a/dev-util/buildbot/buildbot-3.4.0.ebuild b/dev-util/buildbot/buildbot-3.4.0.ebuild
index 38255fa6053e..da16ccd719c4 100644
--- a/dev-util/buildbot/buildbot-3.4.0.ebuild
+++ b/dev-util/buildbot/buildbot-3.4.0.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=8
 
+DISTUTILS_USE_PEP517=setuptools
 PYTHON_REQ_USE="sqlite"
 PYTHON_COMPAT=( python3_{8..10} )
 inherit readme.gentoo-r1 systemd distutils-r1
diff --git a/dev-util/buildbot/buildbot-3.5.0.ebuild b/dev-util/buildbot/buildbot-3.5.0.ebuild
new file mode 100644
index 000000000000..eb038ad1f925
--- /dev/null
+++ b/dev-util/buildbot/buildbot-3.5.0.ebuild
@@ -0,0 +1,178 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python3_{8..10} )
+inherit readme.gentoo-r1 systemd distutils-r1
+
+MY_PV="${PV/_p/.post}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="BuildBot build automation system"
+HOMEPAGE="https://buildbot.net/
+	https://github.com/buildbot/buildbot
+	https://pypi.org/project/buildbot/"
+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="crypt docker examples irc test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	acct-user/buildbot
+	>=dev-python/twisted-17.9.0[${PYTHON_USEDEP},crypt?]
+	>=dev-python/jinja-2.1[${PYTHON_USEDEP}]
+	>=dev-python/zope-interface-4.1.1[${PYTHON_USEDEP}]
+	>=dev-python/sqlalchemy-1.3.0[${PYTHON_USEDEP}]
+	<dev-python/sqlalchemy-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/alembic-1.6.0[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-1.5[${PYTHON_USEDEP}]
+	>=dev-python/txaio-2.2.2[${PYTHON_USEDEP}]
+	>=dev-python/autobahn-0.16.0[${PYTHON_USEDEP}]
+	dev-python/pyjwt[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	~dev-util/buildbot-worker-${PV}[${PYTHON_USEDEP}]
+	crypt? (
+		>=dev-python/pyopenssl-16.0.0[${PYTHON_USEDEP}]
+		dev-python/service_identity[${PYTHON_USEDEP}]
+		dev-python/idna[${PYTHON_USEDEP}]
+	)
+	irc? (
+		dev-python/txrequests[${PYTHON_USEDEP}]
+	)
+	docker? (
+		>=dev-python/docker-py-2.2.0[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+	)
+"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/treq[${PYTHON_USEDEP}]
+		dev-python/txrequests[${PYTHON_USEDEP}]
+		dev-python/pypugjs[${PYTHON_USEDEP}]
+		>=dev-python/boto3-1.12.48[${PYTHON_USEDEP}]
+		dev-python/moto[${PYTHON_USEDEP}]
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+		dev-python/parameterized[${PYTHON_USEDEP}]
+		dev-python/lz4[${PYTHON_USEDEP}]
+		dev-python/ldap3[${PYTHON_USEDEP}]
+		~dev-util/buildbot-pkg-${PV}[${PYTHON_USEDEP}]
+		~dev-util/buildbot-worker-${PV}[${PYTHON_USEDEP}]
+		~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
+	)"
+
+DOC_CONTENTS="The \"buildbot\" user and the \"buildmaster\" init script has been added
+to support starting buildbot through Gentoo's init system. To use this,
+execute \"emerge --config =${CATEGORY}/${PF}\" to create a new instance.
+The scripts can	run as a different user if desired."
+
+src_prepare() {
+	# disable all warnings as errors
+	sed -e "/warnings.filterwarnings('error')/d" -i buildbot/test/__init__.py || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	distutils_install_for_testing
+	"${EPYTHON}" -m twisted.trial buildbot || die "Tests failed with ${EPYTHON}"
+}
+
+src_install() {
+	distutils-r1_src_install
+
+	doman docs/buildbot.1
+
+	if use examples; then
+		dodoc -r docs/examples
+	fi
+
+	newconfd "${FILESDIR}/buildmaster.confd" buildmaster
+	newinitd "${FILESDIR}/buildmaster.initd" buildmaster
+	systemd_dounit "${FILESDIR}/buildmaster.target"
+	systemd_newunit "${FILESDIR}/buildmaster_at.service" "buildmaster@.service"
+	systemd_install_serviced "${FILESDIR}/buildmaster_at.service.conf" "buildmaster@.service"
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+
+	if [[ -n ${REPLACING_VERSIONS} ]]; then
+		ewarn
+		ewarn "Starting with buildbot-0.8.12-r2, more than one instance of buildmaster"
+		ewarn "can be run simultaneously. Note that \"BASEDIR\" in the buildbot 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 buildmaster 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/buildmaster /etc/init.d/buildmaster.myinstance"
+		ewarn "    rc-update add buildmaster.myinstance default"
+		ewarn "    /etc/init.d/buildmaster.myinstance start"
+		ewarn "Systems using systemd can do the following:"
+		ewarn "    systemctl enable buildmaster@myinstance.service"
+		ewarn "    systemctl enable buildmaster.target"
+		ewarn "    systemctl start buildmaster.target"
+		elog
+		elog "Upstream recommends the following when upgrading:"
+		elog "Each time you install a new version of Buildbot, you should run the"
+		elog "\"buildbot upgrade-master\" command on each of your pre-existing build masters."
+		elog "This will add files and fix (or at least detect) incompatibilities between"
+		elog "your old config and the new code."
+	fi
+	elog
+	elog "In order to create a new instance of buildmaster, execute:"
+	elog "    emerge --config =${CATEGORY}/${PF}"
+}
+
+pkg_config() {
+	local buildmaster_path="/var/lib/buildmaster"
+	local log_path="/var/log/buildmaster"
+
+	einfo "This will prepare a new buildmaster instance in ${buildmaster_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="${buildmaster_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
+
+	local buildbot="/usr/bin/buildbot"
+	if [[ ! -d "${buildmaster_path}" ]]; then
+		mkdir --parents "${buildmaster_path}" || die "Unable to create directory ${buildmaster_path}"
+	fi
+	"${buildbot}" create-master "${instance_path}" &>/dev/null || die "Creating instance failed"
+	chown --recursive buildbot:buildbot "${instance_path}" || die "Setting permissions for instance failed"
+	mv "${instance_path}/master.cfg.sample" "${instance_path}/master.cfg" \
+		|| die "Moving sample configuration failed"
+	ln --symbolic --relative "/etc/init.d/buildmaster" "/etc/init.d/buildmaster.${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 buildmaster instance at ${instance_path}."
+	einfo "To change the default settings edit the master.cfg file in this directory."
+}
diff --git a/dev-util/buildbot/buildbot-9999.ebuild b/dev-util/buildbot/buildbot-9999.ebuild
index 0f755c2b1c80..4b1b1de3957d 100644
--- a/dev-util/buildbot/buildbot-9999.ebuild
+++ b/dev-util/buildbot/buildbot-9999.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=8
 
+DISTUTILS_USE_PEP517=setuptools
 PYTHON_REQ_USE="sqlite"
 PYTHON_COMPAT=( python3_{8..10} )
 EGIT_REPO_URI="https://github.com/buildbot/${PN}.git"
@@ -24,7 +25,7 @@ RDEPEND="
 	>=dev-python/twisted-17.9.0[${PYTHON_USEDEP},crypt?]
 	>=dev-python/jinja-2.1[${PYTHON_USEDEP}]
 	>=dev-python/zope-interface-4.1.1[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/sqlalchemy-1.3.0[${PYTHON_USEDEP}]
 	<dev-python/sqlalchemy-1.5.0[${PYTHON_USEDEP}]
 	>=dev-python/alembic-1.6.0[${PYTHON_USEDEP}]
 	>=dev-python/python-dateutil-1.5[${PYTHON_USEDEP}]
@@ -55,12 +56,12 @@ BDEPEND="
 		>=dev-python/boto3-1.12.48[${PYTHON_USEDEP}]
 		dev-python/moto[${PYTHON_USEDEP}]
 		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		dev-python/parameterized[${PYTHON_USEDEP}]
+		>=dev-python/msgpack-0.6.0[${PYTHON_USEDEP}]
 		dev-python/lz4[${PYTHON_USEDEP}]
 		dev-python/ldap3[${PYTHON_USEDEP}]
-		~dev-util/buildbot-pkg-${PV}[${PYTHON_USEDEP}]
-		~dev-util/buildbot-worker-${PV}[${PYTHON_USEDEP}]
-		~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
+		dev-util/buildbot-pkg[${PYTHON_USEDEP}]
+		dev-util/buildbot-worker[${PYTHON_USEDEP}]
+		dev-util/buildbot-www[${PYTHON_USEDEP}]
 	)"
 
 DOC_CONTENTS="The \"buildbot\" user and the \"buildmaster\" init script has been added
diff --git a/dev-util/buildbot/files/buildmaster.initd b/dev-util/buildbot/files/buildmaster.initd
index b75ae34830d4..2fe8db9f513e 100644
--- a/dev-util/buildbot/files/buildmaster.initd
+++ b/dev-util/buildbot/files/buildmaster.initd
@@ -1,10 +1,10 @@
 #!/sbin/openrc-run
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 extra_started_commands="reload"
 
-BUILDMASTER_NAME=${RC_SVCNAME:12}
+BUILDMASTER_NAME=${RC_SVCNAME#*.}
 BUILDMASTER_PATH="${BASEDIR}/${BUILDMASTER_NAME}"
 
 depend() {