gentoo resync : 14.05.2020

5 files changed, 160 insertions, 23 deletions

diff --git a/dev-util/buildbot-worker/Manifest b/dev-util/buildbot-worker/Manifest
index c79cedb58a7e..3918d6df92c3 100644
--- a/dev-util/buildbot-worker/Manifest
+++ b/dev-util/buildbot-worker/Manifest
@@ -1,11 +1,13 @@
-AUX buildbot.tac.sample 1809 BLAKE2B 57b907edf44579b9f380d528d47fbf3616248d106190f700313e050bd439909f6522a20ce2bf91e6e18205b52ca79f9f6ecdb98d8018e67059c0a74c00d56483 SHA512 0cfe04d4587b9befef451d2fb47125643d84bbf12eec99a84622c21f06d7a8e10eb0ceb67c9491b61639b6634b2942ebc42d2ffa8253afbec688dc4e03d70158
+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
 DIST buildbot-worker-0.9.12.tar.gz 101655 BLAKE2B a73f98ec56bd3ad6d19ad0b9dfa015869fd6115789a7ddcecdebdac8707850715c677ee248668f73035ea5656665973634829f2f97e3e75fe8e1515cb0838b88 SHA512 c2e86bd8818eddc2849626a0c7642169bc91fa2cc1d531977736e53c4ad3c87c3f0cb17d7b9acd137e783ae822f558a19f4668e3cd37e90a8435157485bd1d57
 DIST buildbot-worker-1.1.2.tar.gz 103013 BLAKE2B b44593b71e61fee4037911759fa4f686aaabf5ef4be9efaecd539e88c5fc2ed2059d8dd8d6d1c4b3ba57d3563f79aaa404176529622003070c136803c90beb10 SHA512 3dd3da7e87d667307fca264d91af4671f76c3aad93a0512ae5777bb2e3972efe349968cf72fa17b99e45f2d7cec1ec16b1180c48d296e2702c9548bf858951a7
 DIST buildbot-worker-1.3.0.tar.gz 103765 BLAKE2B a5f06ad6b87442292f9fe0c7935f791d2fdb450db09c9614324f8230d0bec408380a7b1637dc32806259c4de7699b164f20f76d959232a82253f7134749531d7 SHA512 5e59aab6cecf8dd932df0e8063c69fda5613b76a46df63479ff554085275d4a19fb1b5142034bd4245423e99f3e46d45e765b10c3c74a9f28b92b70119fab9e2
+DIST buildbot-worker-2.7.0.tar.gz 101075 BLAKE2B 2ee82434f565bef111685712b9b4dd7b0c522de59eefe3eda672827e4bcffae8288c5b9842221b52aa7d5907eeadd4bc5c635382b8c6c4e82977b3c139afdd4b SHA512 bdfce0a7b222fdddbf7830f90c1775e2bded7080e5053b114b7c136b3e114f6c8b26ee4ad802fce66514524e29e863a2f1a4366758c59ebbc6eeadb4b0a271db
 EBUILD buildbot-worker-0.9.12.ebuild 4818 BLAKE2B b685b7deeb4fe497dac792fb308f334f8652462b4a16966700e5ad5dc676281e533e9be7e59f62cd70d7904b698d32961fd480aaa03460fad38c33e00a1857ec SHA512 632c8e4b67585278f26776d7f3501b741102b68471f7c0ffc01dc3e1da092fa04ae631ccd6215747bc2e82f6b88acafe7cf7c86a88841c928a712301c0ee42f6
 EBUILD buildbot-worker-1.1.2.ebuild 4823 BLAKE2B b47514c9c3b149cbab12af9223533c2255a8a08252df7b0830a8909f3bd2dd8361e2046dd56977ceb67106b66e9d7c51129fc4a1539c9638cd3d8cce3dcea48d SHA512 1860190cd09936cd96636c4e9b63a393dc6d1d09447aa9f8292a29634b71a1f7bf946776b17b10a1c417b76a1361936a587d0bd4966a6d6285f97cb7b5e4d30f
 EBUILD buildbot-worker-1.3.0.ebuild 4823 BLAKE2B b47514c9c3b149cbab12af9223533c2255a8a08252df7b0830a8909f3bd2dd8361e2046dd56977ceb67106b66e9d7c51129fc4a1539c9638cd3d8cce3dcea48d SHA512 1860190cd09936cd96636c4e9b63a393dc6d1d09447aa9f8292a29634b71a1f7bf946776b17b10a1c417b76a1361936a587d0bd4966a6d6285f97cb7b5e4d30f
-EBUILD buildbot-worker-9999.ebuild 4823 BLAKE2B b47514c9c3b149cbab12af9223533c2255a8a08252df7b0830a8909f3bd2dd8361e2046dd56977ceb67106b66e9d7c51129fc4a1539c9638cd3d8cce3dcea48d SHA512 1860190cd09936cd96636c4e9b63a393dc6d1d09447aa9f8292a29634b71a1f7bf946776b17b10a1c417b76a1361936a587d0bd4966a6d6285f97cb7b5e4d30f
-MISC metadata.xml 402 BLAKE2B 8ae4401e82aeac4b9e28c94cbfefaaf2f15d15dad0771fda3e1447dc98ef99fd4578b6dbc8e475eb3354ae781f481dd8c6422c06a67d0612ea89e7f39a1d33ab SHA512 a47717971189510d5781fa3ea41de026fe2518d32619eb6830cdc1cbad89182dc01dc2c57877c9689565fcea713ac08dd36af9f51ef47888319ea2380b488deb
+EBUILD buildbot-worker-2.7.0.ebuild 4824 BLAKE2B 89494ddf6d8a70d022bea3ee54ea7366cdceb698daa31225ce47b68ae07b3f0546b2607f7c53e7123cf0272c210d94fccd351010a0fb018510dd25fc9006baf5 SHA512 3ba8a04299340a2e372e2455f0e80edd81067281131f9f1673f803ff740ab7cb423ce3c24929bdcc6bbf03e87e99bedcad3f1127cb9bcfd046047dd82e83700e
+EBUILD buildbot-worker-9999.ebuild 4824 BLAKE2B 89494ddf6d8a70d022bea3ee54ea7366cdceb698daa31225ce47b68ae07b3f0546b2607f7c53e7123cf0272c210d94fccd351010a0fb018510dd25fc9006baf5 SHA512 3ba8a04299340a2e372e2455f0e80edd81067281131f9f1673f803ff740ab7cb423ce3c24929bdcc6bbf03e87e99bedcad3f1127cb9bcfd046047dd82e83700e
+MISC metadata.xml 480 BLAKE2B 5ee99e9a87b5449742a0066a5c720137406a952a63f81574bb7d5cc94f235ee54c1fae5bd13e320e7b017d5005cc45a009360351c987609fe208089ed464cacb SHA512 95b7d71c74d693b93e2d0ff8943d97ffb2d9ea9fb2090bdb5fd8948444237ad20c571b97aa16f0ea5d20cf76e4d8e0392df276a0d1ba39b5263a72c57da3dea0
diff --git a/dev-util/buildbot-worker/buildbot-worker-2.7.0.ebuild b/dev-util/buildbot-worker/buildbot-worker-2.7.0.ebuild
new file mode 100644
index 000000000000..be5258cd9984
--- /dev/null
+++ b/dev-util/buildbot-worker/buildbot-worker-2.7.0.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
+
+DISTUTILS_USE_SETUPTOOLS="rdepend"
+
+[[ ${PV} == *9999 ]] && inherit git-r3
+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}"
+[[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+if [[ ${PV} == *9999 ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+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}"
+[[ ${PV} == *9999 ]] && S=${S}/worker
+
+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-9999.ebuild b/dev-util/buildbot-worker/buildbot-worker-9999.ebuild
index a8ac9da44f52..be5258cd9984 100644
--- a/dev-util/buildbot-worker/buildbot-worker-9999.ebuild
+++ b/dev-util/buildbot-worker/buildbot-worker-9999.ebuild
@@ -1,13 +1,15 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
-PYTHON_COMPAT=( python3_6 )
+EAPI="7"
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
 
+DISTUTILS_USE_SETUPTOOLS="rdepend"
+
 [[ ${PV} == *9999 ]] && inherit git-r3
-inherit readme.gentoo-r1 user distutils-r1
+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/"
@@ -26,10 +28,11 @@ fi
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-RDEPEND=">=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
+RDEPEND="
+	acct-user/buildbot
 	>=dev-python/twisted-17.9.0[${PYTHON_USEDEP}]
 	dev-python/future[${PYTHON_USEDEP}]
-	!<dev-util/buildbot-0.9.7
+	!<dev-util/buildbot-1.0.0
 "
 DEPEND="${RDEPEND}
 	test? (
@@ -42,22 +45,16 @@ S="${WORKDIR}/${MY_P}"
 [[ ${PV} == *9999 ]] && S=${S}/worker
 
 pkg_setup() {
-	enewuser buildbot
-
 	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.
+		\"${ROOT}/etc/conf.d/buildbot_worker.myinstance\" at the right location.
 		The scripts can	run as a different user if desired."
 }
 
-python_test() {
-	distutils_install_for_testing
-
-	esetup.py test || die "Tests failed under ${EPYTHON}"
-}
+distutils_enable_tests setup.py
 
 python_install_all() {
 	distutils-r1_python_install_all
@@ -78,8 +75,8 @@ pkg_postinst() {
 
 	if [[ -n ${REPLACING_VERSIONS} ]]; then
 		ewarn
-		ewarn "Starting with buildbot-worker-0.9.10-r1, more than one instance of a buildbot_worker"
-		ewarn "can be run simultaneously. Note that \"BASEDIR\" in the buildbot_worker configuration file"
+		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."
@@ -117,7 +114,7 @@ pkg_config() {
 	if [[ ! -d "${instance_path}" ]]; then
 		mkdir --parents "${instance_path}" || die "Unable to create directory ${buildworker_path}"
 	fi
-	chown --recursive buildbot "${instance_path}" || die "Setting permissions for instance failed"
+	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}" \
@@ -125,6 +122,8 @@ pkg_config() {
 
 	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"
diff --git a/dev-util/buildbot-worker/files/buildbot.tac.sample b/dev-util/buildbot-worker/files/buildbot.tac.sample
index ee3d7ca3cef9..19bd941911bd 100644
--- a/dev-util/buildbot-worker/files/buildbot.tac.sample
+++ b/dev-util/buildbot-worker/files/buildbot.tac.sample
@@ -29,9 +29,9 @@ maxRotatedFiles = 10
 port = 9989
 
 # worker settings
-worker_name = 'worker-1'
-passwd = 'mypasswd'
-buildmaster_host = 'mybuildbot.foobar.org'
+worker_name = 'example-worker'
+passwd = 'pass'
+buildmaster_host = 'localhost'
 keepalive = 600
 umask = None
 maxdelay = 300
diff --git a/dev-util/buildbot-worker/metadata.xml b/dev-util/buildbot-worker/metadata.xml
index 02cba1b8df4a..04061719612a 100644
--- a/dev-util/buildbot-worker/metadata.xml
+++ b/dev-util/buildbot-worker/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>dolsen@gentoo.org</email>
+		<name>Brian Dolbec</name>
+	</maintainer>
 	<upstream>
 		<maintainer>
 			<email>devel@buildbot.net</email>