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

5 files changed, 189 insertions, 9 deletions

diff --git a/dev-util/buildbot/Manifest b/dev-util/buildbot/Manifest
index 893db0e4ee62..0c9090e27288 100644
--- a/dev-util/buildbot/Manifest
+++ b/dev-util/buildbot/Manifest
@@ -5,7 +5,9 @@ AUX buildmaster_at.service 375 BLAKE2B 1a4d829389298713bf66885a5bcd28202eec32b63
 AUX buildmaster_at.service.conf 150 BLAKE2B c6931c3ebfd77553d52b650668c440ca17f37bf270ab807eb97702d23cc504c0a933453addeef4abd3ddb13e9441cd330dd4cff9dc9962bdabbed8f0fa6d892c SHA512 d533b95c5b180cda5aa73966c590b7828598d5b6bcd77147a88238941adaa4c3c78e5f17d771598f622212856b16ce4582ab915a4cb57f0dd633eb2ad6b4c10d
 DIST buildbot-3.4.0.tar.gz 2446868 BLAKE2B a58b268fd4569105f1c0ba48c9ed86210a3fee4725f167d6b6847960bbb56a092d0c0db427ecf5932a91d44065da8843fbb4046d289800a019b0b1d8b1f53fea SHA512 92e5085862ac37a6c3c059870a3998fbaac2019c48384295f3e209788ea14bddff6704f1b987a8f3b1550c1b0255d228f8a0b2a20b5cb760b22a513db465863b
 DIST buildbot-3.5.0.tar.gz 2450653 BLAKE2B 0e923f2a3a334241b25c6a151b397356d7ba81ab2ff19c17c50a5996494d0f99fa198b63aa18a27ab60c5ad53c0154494bf4dea4e2bd306f4b709858a64dc3c4 SHA512 9730305540db3cdf166fdfc071142061926bbb895aa941046ad25e8350d3c161d4175f3518cd8a3ab51f320b0a5980517e5e53d9f5ddc342492ee56a0f6f266f
-EBUILD buildbot-3.4.0-r1.ebuild 6684 BLAKE2B 6aa2c72d62cbcd3f33ef9cdffa26762aa6a1600b3747f9e0070b9f3f098143ee32083a528a4b9331c866ecca36297d591019ac8d02718588a328eeeb567430e5 SHA512 033dd139371dc1ac260f71ce54a01dd9d59a085011b4ff6b9bc08d8bc60fd9af34aeb636b966e6cdce8104c70af03b85769b626464da0632046f2b15f1b7ccd6
-EBUILD buildbot-3.5.0-r1.ebuild 6684 BLAKE2B 96a17e28885f24c6270c39e01eeba4c5b06bef0ad9a5f0cfed6296dcd567f9a62ea624ee23ed511b933f6aac5471ffff12f8c2a44433aaa9415465080485bc07 SHA512 3d1a89cb2cd325d8e01fcf62358bf70c47bf2188f856dfc007c92c8e804f149da2b0265213a6fdb8c37b71439f960205deb904486cfe0cd1e40e8d2230a5ab17
-EBUILD buildbot-9999.ebuild 6563 BLAKE2B fe2a4112637a6b633bd20ff4971f9d0755e60c369c0ff4a52edad6cda54dd4286a73e2e9e3383b1b074b9199fc587434ec33f5eb3441725c8fcaca293023aa2c SHA512 903bd9ff7cd3a949701a3f719645e8d86114c8c441e6e1f869941be3e7ea18fd4c282ef36ad268df3ecc2d8ebea048ebd86367813b9cd01d968d0e99972c5f6d
+DIST buildbot-3.6.0.tar.gz 2458029 BLAKE2B 5f41702d4d61fbcbfa878c6febbb89a38da2648403c4fdcab24bde246adc225e9ac3f72eb7dc893e03763f00c2d3548c31b2d6597904032e4b75e660bb1faf72 SHA512 c0bec931d08adb1eec51114619d2a085fbef224944a4c0acf3ab396f84d846fd620b84379affee238d02dd90ca1294fdb2b7fb8ea6e82d95c4cfeae93a0b5e73
+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
 MISC metadata.xml 1360 BLAKE2B 4f54443c55c18288e1cd887528e94c5c258441cbde1579222f141ccba69b241b7163ee5c65056b9ba89794c543342394cd656b5f6d9f8356af47c4681d60bf4f SHA512 3ba99aead69ebc879d9e8a42ed41f250cfea97bdb21147dcefba40b759f87e682f0f416ab6b915afdd4dbe2c4e41ce99aeee23ea8afa349a131f6f450ef7ea95
diff --git a/dev-util/buildbot/buildbot-3.4.0-r1.ebuild b/dev-util/buildbot/buildbot-3.4.0-r1.ebuild
index 48e0f782f784..2805b245be55 100644
--- a/dev-util/buildbot/buildbot-3.4.0-r1.ebuild
+++ b/dev-util/buildbot/buildbot-3.4.0-r1.ebuild
@@ -86,7 +86,6 @@ src_prepare() {
 }
 
 python_test() {
-	distutils_install_for_testing
 	"${EPYTHON}" -m twisted.trial buildbot || die "Tests failed with ${EPYTHON}"
 }
 
diff --git a/dev-util/buildbot/buildbot-3.5.0-r1.ebuild b/dev-util/buildbot/buildbot-3.5.0-r1.ebuild
index e6a1f69bd613..38fdc881f1a2 100644
--- a/dev-util/buildbot/buildbot-3.5.0-r1.ebuild
+++ b/dev-util/buildbot/buildbot-3.5.0-r1.ebuild
@@ -86,7 +86,6 @@ src_prepare() {
 }
 
 python_test() {
-	distutils_install_for_testing
 	"${EPYTHON}" -m twisted.trial buildbot || die "Tests failed with ${EPYTHON}"
 }
 
diff --git a/dev-util/buildbot/buildbot-3.6.0.ebuild b/dev-util/buildbot/buildbot-3.6.0.ebuild
new file mode 100644
index 000000000000..63802dfa22aa
--- /dev/null
+++ b/dev-util/buildbot/buildbot-3.6.0.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-${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() {
+	"${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 2f299e4c1c37..b0ebb30b9273 100644
--- a/dev-util/buildbot/buildbot-9999.ebuild
+++ b/dev-util/buildbot/buildbot-9999.ebuild
@@ -22,7 +22,7 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
 	acct-user/buildbot
-	>=dev-python/twisted-17.9.0[${PYTHON_USEDEP}]
+	>=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}]
@@ -38,8 +38,8 @@ RDEPEND="
 		>=dev-python/pyopenssl-16.0.0[${PYTHON_USEDEP}]
 		dev-python/service_identity[${PYTHON_USEDEP}]
 		|| (
-			>=dev-python/twisted-17.9.0[${PYTHON_USEDEP},ssl(-)]
-			>=dev-python/twisted-17.9.0[${PYTHON_USEDEP},crypt(-)]
+			>=dev-python/twisted-18.7.0[${PYTHON_USEDEP},ssl(-)]
+			>=dev-python/twisted-18.7.0[${PYTHON_USEDEP},crypt(-)]
 		)
 		dev-python/idna[${PYTHON_USEDEP}]
 	)
@@ -81,7 +81,6 @@ src_prepare() {
 }
 
 python_test() {
-	distutils_install_for_testing
 	"${EPYTHON}" -m twisted.trial buildbot || die "Tests failed with ${EPYTHON}"
 }