gentoo resync : 31.01.2021

6 files changed, 136 insertions, 8 deletions

diff --git a/dev-util/buildbot-worker/Manifest b/dev-util/buildbot-worker/Manifest
index e3b4a0f8a673..ee1562b363d6 100644
--- a/dev-util/buildbot-worker/Manifest
+++ b/dev-util/buildbot-worker/Manifest
@@ -2,10 +2,12 @@ AUX buildbot.tac.sample 1799 BLAKE2B 25fa4b85b0ad16d51780613b20f89c56e0131d73eb7
 AUX buildbot_worker.confd2 366 BLAKE2B bfd08d2c6ee89c9e9d09e3280ded65765789b701cd4aa31d953b8f87d24ec1d85260b22d978d152191c918c72569e77bdac91de07d3eae4dad9ac529b4c140d4 SHA512 2bcb93b739827566bce295bc508481c50b57c1202d858359733649d4f35f116d994e0285a53a84d1b89d371a6fd23c0a89f4e555c31555bf14783eb5f57f15b0
 AUX buildbot_worker.initd2 1640 BLAKE2B 17a40547260004b40d77219aefa70f08846741e328a2a20bb0b075d5fa0007cc6ad63ecf600eee49251de14c4abb41f70ca813a9429dbce251509121157da9b9 SHA512 8eae575cb001b4750cd2033f9cb82d3985ad9bc2a4bc20ff0e4aaa0cbd05bacf8d6d885ec08112da15e0ccf8fd895006eed39b0b9a4bcaee86911b5180fab0f2
 DIST buildbot-worker-2.10.0.tar.gz 107279 BLAKE2B 415b950b81862ac4c08ca00217e27351152b74c19e0395451e6cb965a039ccc8d16d3a63534053c15783cb904c279e8c80354f8b33d956cd3c45c5d5c1f5c1f4 SHA512 94b96abdad97d306998b995409f5220c967b0f7a2e33d1310fc99723bb3d54aa055e0ae2e6b771cd53340b132eb95515c266f08bf08e10bede29e2a93fe72b0a
+DIST buildbot-worker-2.10.1.tar.gz 107656 BLAKE2B 8b94ecacc18f1e1f2e58d64f223f77af31454a3b199de9ee4c5a174b2cb645a970614674f5917415c4ab6d1ee0180ff99fbf4f121339eb05fcd80b363bfad3c0 SHA512 93f684c36e7c07c90e24a666084734df33d30376436b50db74ae8bd3b3a5e306799d15bd03d93b02f723bdf878adbfe17bbc59fd9f49f43431aea90612113ed7
 DIST buildbot-worker-2.8.2.tar.gz 101707 BLAKE2B 451dff979c6934bf6dd4e1579abbe18e9cf43551c906bd516c788a6a5f6170650a5468927bec0a8d4ab242e5886247406b2e098e1908a8d9b5777744982c7be6 SHA512 0628825ac023a66cd249dc6b42ff2f3ad3b5c0cb97561fd332ce4775abaa5368a8b7b636115259ab4aa842c811178c9b641ef4453b06167315eb81117ffef815
 DIST buildbot-worker-2.8.4.tar.gz 101175 BLAKE2B 23077305d26ab282eaa4c633ebee7ca7c502285862604ecafe25d6b666ce802729c5478d676e6834bf9a2e27ccf48e1ad0e69449e55532aa81b0dcd3c6780011 SHA512 16ad9a0e5e9c875f90383fc90c359ee843e0b82a7878f87f2ac9e7091d8d907707c69210876f25b4fdf7148bcaafab10d10a8a0a8865c73808db707320757107
-EBUILD buildbot-worker-2.10.0.ebuild 4614 BLAKE2B f6c344371057fa584eee5f0428cd40f014333ad8b9449580050ea74cf97fa482fd55fca576de09d5a940ff2507371e97a0a332344b10517678c23c4257eba110 SHA512 9a94be20b1a9d7f56e8133fea1c31bacbdbcd12ee8ddac3505c22c2fca21306454aec4327dab42c2cbc4ba8b0c8b8f8c4331142dd8ed59e155f76025c905144e
-EBUILD buildbot-worker-2.8.2.ebuild 4614 BLAKE2B c42112272244fb8a1da208eaa6e3583d98b4465bfa39c2240012eeb4243fd6a5edf59321a54bc72f0918d353a43c0d89062fdeb523b7a5bc9078c6ef86475d80 SHA512 b655a8a68739e287f2f2e4a19ad22f3567801982342d491d0c75e949d0d7671869b0b624d8cf2c1d2f4003eb3a97938d893654c780939de6256f7706556b5bee
-EBUILD buildbot-worker-2.8.4.ebuild 4614 BLAKE2B c42112272244fb8a1da208eaa6e3583d98b4465bfa39c2240012eeb4243fd6a5edf59321a54bc72f0918d353a43c0d89062fdeb523b7a5bc9078c6ef86475d80 SHA512 b655a8a68739e287f2f2e4a19ad22f3567801982342d491d0c75e949d0d7671869b0b624d8cf2c1d2f4003eb3a97938d893654c780939de6256f7706556b5bee
-EBUILD buildbot-worker-9999.ebuild 4619 BLAKE2B a88900d63e3fb4e3b51e31b4736cacd7bc8f60a3aa7f27f6bd6200e9fa788147ad4073d5aea22ec55cc1a54148f87dda3de5f0953cac31f3152fba10d8399012 SHA512 79bdf14db42b15492932d100ee01c3bf043f7ad01dc72d35d68152d95601359aaee73b8661ada31d490218f5081465b7dac5c649aa2a704373e9bbe18426fa3f
+EBUILD buildbot-worker-2.10.0.ebuild 4612 BLAKE2B d6025654e4e330d8a58ef67050aa6eea06e2f6f6ddd528a8f1b945a8efb1ba23c767bcf7a52e46a928c56fe97071d883e410ff1b330567677c7887776d4c4a64 SHA512 45813c1392eb44f9245c4528ef97bccc91bf89a991a9df861537721fefbb7f3464dce8f073dcf7c5483fec02ad6ff85aaef1eaeacfc4bed07fad0947941ab2b6
+EBUILD buildbot-worker-2.10.1.ebuild 4612 BLAKE2B d6025654e4e330d8a58ef67050aa6eea06e2f6f6ddd528a8f1b945a8efb1ba23c767bcf7a52e46a928c56fe97071d883e410ff1b330567677c7887776d4c4a64 SHA512 45813c1392eb44f9245c4528ef97bccc91bf89a991a9df861537721fefbb7f3464dce8f073dcf7c5483fec02ad6ff85aaef1eaeacfc4bed07fad0947941ab2b6
+EBUILD buildbot-worker-2.8.2.ebuild 4612 BLAKE2B b24029d46d49eb188f8955a8a31b5bb59c68f10d78ac778f5fc739080825d59539ff81c0d1e1bcaccaeafe345e60474098db52509431fe10e616c33eeca85e73 SHA512 a21d78d2a7ee910efd8da093b092aa0e9386a433f2abd8832932e9c6c2c2a3e31524ee6a9bd0bb64a6bfa1174ee529b9bf361a1961a46250ed12b42c29f7bccf
+EBUILD buildbot-worker-2.8.4.ebuild 4612 BLAKE2B b24029d46d49eb188f8955a8a31b5bb59c68f10d78ac778f5fc739080825d59539ff81c0d1e1bcaccaeafe345e60474098db52509431fe10e616c33eeca85e73 SHA512 a21d78d2a7ee910efd8da093b092aa0e9386a433f2abd8832932e9c6c2c2a3e31524ee6a9bd0bb64a6bfa1174ee529b9bf361a1961a46250ed12b42c29f7bccf
+EBUILD buildbot-worker-9999.ebuild 4617 BLAKE2B 108d13f5845f81e4c50bca58139b97c850c516eeac2fd2b9ed29534a8149d5d7b9892d9f013866d4059593dde8fbf6a8e96c45ebf591a08160342962b9c84aa5 SHA512 80512c98b6734fdfd93ca5e9f46a0ac3ef7e1a09a888ae891c74c60d59d2b07c3eef79f2baebda27cede813e4691a9aa465574aa39bd5a97c800cc606dbb7f20
 MISC metadata.xml 480 BLAKE2B 5ee99e9a87b5449742a0066a5c720137406a952a63f81574bb7d5cc94f235ee54c1fae5bd13e320e7b017d5005cc45a009360351c987609fe208089ed464cacb SHA512 95b7d71c74d693b93e2d0ff8943d97ffb2d9ea9fb2090bdb5fd8948444237ad20c571b97aa16f0ea5d20cf76e4d8e0392df276a0d1ba39b5263a72c57da3dea0
diff --git a/dev-util/buildbot-worker/buildbot-worker-2.10.0.ebuild b/dev-util/buildbot-worker/buildbot-worker-2.10.0.ebuild
index 523e6755f973..06d672daee8f 100644
--- a/dev-util/buildbot-worker/buildbot-worker-2.10.0.ebuild
+++ b/dev-util/buildbot-worker/buildbot-worker-2.10.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{7,8} )
 
 DISTUTILS_USE_SETUPTOOLS="rdepend"
 
diff --git a/dev-util/buildbot-worker/buildbot-worker-2.10.1.ebuild b/dev-util/buildbot-worker/buildbot-worker-2.10.1.ebuild
new file mode 100644
index 000000000000..06d672daee8f
--- /dev/null
+++ b/dev-util/buildbot-worker/buildbot-worker-2.10.1.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=( python3_{7,8} )
+
+DISTUTILS_USE_SETUPTOOLS="rdepend"
+
+inherit readme.gentoo-r1 distutils-r1
+
+DESCRIPTION="BuildBot Worker (slave) Daemon"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-worker/"
+
+MY_V="${PV/_p/.post}"
+MY_P="${PN}-${MY_V}"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	acct-user/buildbot
+	>=dev-python/twisted-17.9.0[${PYTHON_USEDEP}]
+	dev-python/future[${PYTHON_USEDEP}]
+	!<dev-util/buildbot-1.0.0
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/setuptools_trial[${PYTHON_USEDEP}]
+	)
+"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	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."
+}
+
+distutils_enable_tests setup.py
+
+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-2.8.2.ebuild b/dev-util/buildbot-worker/buildbot-worker-2.8.2.ebuild
index 3bd934a50342..bd9c309e10b7 100644
--- a/dev-util/buildbot-worker/buildbot-worker-2.8.2.ebuild
+++ b/dev-util/buildbot-worker/buildbot-worker-2.8.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{7,8} )
 
 DISTUTILS_USE_SETUPTOOLS="rdepend"
 
diff --git a/dev-util/buildbot-worker/buildbot-worker-2.8.4.ebuild b/dev-util/buildbot-worker/buildbot-worker-2.8.4.ebuild
index 3bd934a50342..bd9c309e10b7 100644
--- a/dev-util/buildbot-worker/buildbot-worker-2.8.4.ebuild
+++ b/dev-util/buildbot-worker/buildbot-worker-2.8.4.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{7,8} )
 
 DISTUTILS_USE_SETUPTOOLS="rdepend"
 
diff --git a/dev-util/buildbot-worker/buildbot-worker-9999.ebuild b/dev-util/buildbot-worker/buildbot-worker-9999.ebuild
index 68c35436d35e..f632c94e16c1 100644
--- a/dev-util/buildbot-worker/buildbot-worker-9999.ebuild
+++ b/dev-util/buildbot-worker/buildbot-worker-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{7,8} )
 
 EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"