gentoo auto-resync : 23:09:2022 - 05:29:13

4 files changed, 187 insertions, 4 deletions

diff --git a/dev-util/buildbot/Manifest b/dev-util/buildbot/Manifest
index 0c9090e27288..7526a7c97ac7 100644
--- a/dev-util/buildbot/Manifest
+++ b/dev-util/buildbot/Manifest
@@ -1,4 +1,4 @@
-AUX buildmaster.confd 362 BLAKE2B 72d36c02b825ab26e8d85348c3dc65800e03c8d9439a4ada658764b5f87e83e07eb89b1b5bedc59466135008135733319d8e4a31657c9f3f0c1713d1649ab820 SHA512 5b3e3cc75187d0b44c8e59cdfb605752db20913b025eadc7e673bc7c9c45b33e1a0d19362c0cc0c023cd32255946d510f172090ada9cbf2978f4807de29e2b72
+AUX buildmaster.confd 362 BLAKE2B 97a880c224ad11c15ef7acffa4ffaf961035d06f08d7f360a4da9838c2bd175f942eed4571aa8555f8d941b5e8d672d7701822e6d8637e3d9605311ee4e97a6c SHA512 d2d24f40aee3d98eab24b642d57cf79e54b5d47e4b6ef90de7e3e17c29b0140585a9e4584277c1c169782afd6257b6f421b0235f3efce7ca88603b099081b359
 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
@@ -6,8 +6,10 @@ AUX buildmaster_at.service.conf 150 BLAKE2B c6931c3ebfd77553d52b650668c440ca17f3
 DIST buildbot-3.4.0.tar.gz 2446868 BLAKE2B a58b268fd4569105f1c0ba48c9ed86210a3fee4725f167d6b6847960bbb56a092d0c0db427ecf5932a91d44065da8843fbb4046d289800a019b0b1d8b1f53fea SHA512 92e5085862ac37a6c3c059870a3998fbaac2019c48384295f3e209788ea14bddff6704f1b987a8f3b1550c1b0255d228f8a0b2a20b5cb760b22a513db465863b
 DIST buildbot-3.5.0.tar.gz 2450653 BLAKE2B 0e923f2a3a334241b25c6a151b397356d7ba81ab2ff19c17c50a5996494d0f99fa198b63aa18a27ab60c5ad53c0154494bf4dea4e2bd306f4b709858a64dc3c4 SHA512 9730305540db3cdf166fdfc071142061926bbb895aa941046ad25e8350d3c161d4175f3518cd8a3ab51f320b0a5980517e5e53d9f5ddc342492ee56a0f6f266f
 DIST buildbot-3.6.0.tar.gz 2458029 BLAKE2B 5f41702d4d61fbcbfa878c6febbb89a38da2648403c4fdcab24bde246adc225e9ac3f72eb7dc893e03763f00c2d3548c31b2d6597904032e4b75e660bb1faf72 SHA512 c0bec931d08adb1eec51114619d2a085fbef224944a4c0acf3ab396f84d846fd620b84379affee238d02dd90ca1294fdb2b7fb8ea6e82d95c4cfeae93a0b5e73
+DIST buildbot-3.6.1.tar.gz 2458176 BLAKE2B 4587ed222e2fae424f3c4f275e67e72bf25b0ce88231a29f931582d82fbe93a846f85b14bdc64740939466ccdc3f15dab3774244aa5c0a293250b52b542014ea SHA512 62a993d1acd8bc5cc916f009909b4b099d9f64007fe790dc219104f248bb21e0ab8f1771c354ef61e6d8ba497451cdef5e7a7de17a87cfd1e941b3b49fbf2206
 EBUILD buildbot-3.4.0-r1.ebuild 6653 BLAKE2B 8fc9cb4df5e6581771e89e91084d6679c67eb0b73c166c4a564920895767d7e9ec6fae53bd2631a56220baefb32e2d8cc8e686a36f29734702a88f107f37da57 SHA512 63dd31de86215b66f24cdcfd109e85ad3736060cae8439f04478a56d2bc53a5aa31e70faa0c7beb56dcce2dd6b1e79906e3d31846ff63795d9e9a093f8f38131
 EBUILD buildbot-3.5.0-r1.ebuild 6653 BLAKE2B e85f66fb8b27f230f24b932f348c2cd858d1b36ef8ca71f1db49747b85b407a4aef5e1c672f516315a5d118798cedc0bc84ecd85db9728cc4ca8489616eba76c SHA512 871cdc749948f80c7913e1d74f2b2341ef6688332be9979559acee835b0a6537d54897006ef1dea3b81feec74b7e90c7a1dd349626d1f8c70028741123cbb62f
 EBUILD buildbot-3.6.0.ebuild 6653 BLAKE2B 833bbcc0185d9ff6edba1807e3b79f6a7c3ff5ff08e914dfae925805b07b4eca0795f2ea69eb37550ebc3b2533cd841ca7fad5cec542224744a2df97a3b7ffb6 SHA512 f45af0cbcb10ea496301dd4329d2c394122ba5e3c3169a85c1daf083742de481c0ab44f7a624a5545a20daeb99b2b18d11cabe3a13d0ff7c49e19a10a42c31ec
-EBUILD buildbot-9999.ebuild 6532 BLAKE2B 1c926776771eabfc7c6d1a559f845da991d065f23092f64e7b0213458a6619225cc0fa410a320f1abb189da9044ab5435dae6620dc1d36c88a7316570b461f1b SHA512 0a2b2b5b2f09b728bd6fbb02328bfb618916275d0cf37ac9aca584e7ac14f1178a0b79c4dff9ab97831a6c158a91077fc7aed4b477e02985a5631da7d88d7c54
+EBUILD buildbot-3.6.1.ebuild 6646 BLAKE2B 2f48622efa22f8273b976ef88abf888b770de8c2db6fb91b63e07538b50a1dfdff1eebdc62b4176d723969b9f028c048144ced39c0f2427402242f7bdca72b7b SHA512 b901c20cff21d8f4c3c4785690716672b64fc36cbaa6cda4e706aa35c87ca14c43fb6271290bd2fe2846f1fc565b7b8cdec51d08b786cd329c2bc30848b97313
+EBUILD buildbot-9999.ebuild 6525 BLAKE2B b490dc02be9125945d6b8a81f26d433488e0356aa67270ee43716543274979064ff76ceaf3c5eaaba90492108dc3e859ee8c64bfe3ffe8465aa96d54b4c16986 SHA512 4f13b80b3161cc4e60bf195c5668cc8436af9aa25893834816ad20dc5217b4c031df916c575ed7b4aaf7709c8f53b6b66af2efdba2f9bdb6a3099d5e466df22e
 MISC metadata.xml 1360 BLAKE2B 4f54443c55c18288e1cd887528e94c5c258441cbde1579222f141ccba69b241b7163ee5c65056b9ba89794c543342394cd656b5f6d9f8356af47c4681d60bf4f SHA512 3ba99aead69ebc879d9e8a42ed41f250cfea97bdb21147dcefba40b759f87e682f0f416ab6b915afdd4dbe2c4e41ce99aeee23ea8afa349a131f6f450ef7ea95
diff --git a/dev-util/buildbot/buildbot-3.6.1.ebuild b/dev-util/buildbot/buildbot-3.6.1.ebuild
new file mode 100644
index 000000000000..9ca1baf06d21
--- /dev/null
+++ b/dev-util/buildbot/buildbot-3.6.1.ebuild
@@ -0,0 +1,181 @@
+# 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-18.7.0[${PYTHON_USEDEP}]
+	>=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/twisted-18.7.0[${PYTHON_USEDEP},ssl(-)]
+			>=dev-python/twisted-18.7.0[${PYTHON_USEDEP},crypt(-)]
+		)
+		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[${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() {
+	"${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 b0ebb30b9273..17faf70a4028 100644
--- a/dev-util/buildbot/buildbot-9999.ebuild
+++ b/dev-util/buildbot/buildbot-9999.ebuild
@@ -33,7 +33,7 @@ RDEPEND="
 	>=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}]
+	dev-util/buildbot-worker[${PYTHON_USEDEP}]
 	crypt? (
 		>=dev-python/pyopenssl-16.0.0[${PYTHON_USEDEP}]
 		dev-python/service_identity[${PYTHON_USEDEP}]
diff --git a/dev-util/buildbot/files/buildmaster.confd b/dev-util/buildbot/files/buildmaster.confd
index eb3185aef358..9bb2eb0328d9 100644
--- a/dev-util/buildbot/files/buildmaster.confd
+++ b/dev-util/buildbot/files/buildmaster.confd
@@ -11,5 +11,5 @@ TWISTD_OPTS=""
 
 # Optional specific python version to run in
 # (if not the system default version)
-# ie: RUNTIME_PYTHON="/usr/bin/python2.7"
+# ie: RUNTIME_PYTHON="/usr/bin/python3.8"
 RUNTIME_PYTHON=""