gentoo resync : 18.03.2018

5 files changed, 9 insertions, 203 deletions

diff --git a/dev-util/buildbot-worker/Manifest b/dev-util/buildbot-worker/Manifest
index 893cac6ba922..3e3ed47b272f 100644
--- a/dev-util/buildbot-worker/Manifest
+++ b/dev-util/buildbot-worker/Manifest
@@ -1,17 +1,13 @@
 AUX buildbot.tac.sample 1809 BLAKE2B 57b907edf44579b9f380d528d47fbf3616248d106190f700313e050bd439909f6522a20ce2bf91e6e18205b52ca79f9f6ecdb98d8018e67059c0a74c00d56483 SHA512 0cfe04d4587b9befef451d2fb47125643d84bbf12eec99a84622c21f06d7a8e10eb0ceb67c9491b61639b6634b2942ebc42d2ffa8253afbec688dc4e03d70158
-AUX buildbot_worker.confd 222 BLAKE2B 54c18448ab0b4b9b056aa45d2c1a02608f942428708933290338f46e16b19a3a6d02d4e8ecfe3c85960441c43ae4bcd8b50b8b9ac970ba33be2e4c1f5c2f27b2 SHA512 ccea785a073ba3a159f25c42d02722311eae3bdcafa4fe011e80d626f8b1aa74d3fe5118bf0c7831c7ceefdd896feab58667534e47e6814f5c62dd2b6bb0c550
 AUX buildbot_worker.confd2 367 BLAKE2B 51ea7eacb99bec3e8fe31ef9933ddeebc4ae6afad1880f4acb76b0460b16336f00b1868b980315b09ba591be9dab9379466cfa6eda5b6d7a999a5e4eaa1b76be SHA512 d46ca9656ba3f4fa58208954ba80d0c8e3a2a6a1eb14a92128653e56915811ac1f1e0a4aba0755fe4844aa0d85907eef6c657236035d139faf030b5d6940b820
-AUX buildbot_worker.initd 1139 BLAKE2B 8b4159313aca170c1aba90aa4315e877d5d7fb375bb70068505d6daa08400ab1270b2ec72aabbaf711aa5b700ff377c10b8d813090518d541f3cda306086cbaf SHA512 51a8f21f84849eaa8e26abdb8b7bfaa3be4f1af813485fbb294ac09bef5ea003de32ae07566267fb1d52177fedf2541805af60204a8793645ea4909388e39c10
 AUX buildbot_worker.initd2 1640 BLAKE2B 17a40547260004b40d77219aefa70f08846741e328a2a20bb0b075d5fa0007cc6ad63ecf600eee49251de14c4abb41f70ca813a9429dbce251509121157da9b9 SHA512 8eae575cb001b4750cd2033f9cb82d3985ad9bc2a4bc20ff0e4aaa0cbd05bacf8d6d885ec08112da15e0ccf8fd895006eed39b0b9a4bcaee86911b5180fab0f2
-DIST buildbot-worker-0.9.10.tar.gz 99028 BLAKE2B 8cbbcceceb60afa6194c1e1c8f7382eb92a6e7517aa94477656f81c0c3eed38d39d85f1e98a37481fde39d24726c1dce73a6e8b9f2615faa2592f16900a4efd3 SHA512 0f515610d9c788657b10ba6624745841241fe554b472e53abdda221a678eb73d7a21a6529eb0769450de3a79b43bb6e51f4208247a4d8ef25c3d36b6ced6ec89
-DIST buildbot-worker-0.9.11.tar.gz 100746 BLAKE2B ad8111100ee565cb70a7234e1527b5145e40d791341f16e4b415fc0d2dbd33cdc226b462ebb4de370ba3731df0d81217d797691e1c8cb1fcbf73c199674968ce SHA512 c7209c3fff8c43a23de71fa61709c9f02a5bdd9c8c8980ac5d205f720abdaa9bdb78d0d4e40fe9f915c8d5cf253b9e3c63401712ee121ac085909b0244d82897
 DIST buildbot-worker-0.9.12.tar.gz 101655 BLAKE2B a73f98ec56bd3ad6d19ad0b9dfa015869fd6115789a7ddcecdebdac8707850715c677ee248668f73035ea5656665973634829f2f97e3e75fe8e1515cb0838b88 SHA512 c2e86bd8818eddc2849626a0c7642169bc91fa2cc1d531977736e53c4ad3c87c3f0cb17d7b9acd137e783ae822f558a19f4668e3cd37e90a8435157485bd1d57
 DIST buildbot-worker-0.9.13.tar.gz 102710 BLAKE2B ab60bc2607a706ecc760c2439655bca3f328d773fbb07e73c994f079356341a251ca23c573a71cce92dbf71ba62ceaa70210f8925fd4d1cdfac335b2a485ee9f SHA512 920f76d70c88a660b1d4c15683847a144b8dfaa01b91742ff2fedbe013ab030d3c5f07b6308f8bfb3f7bf3c2f805f7735d007e67257ca5233d2b585518f79e40
 DIST buildbot-worker-0.9.15.post1.tar.gz 100901 BLAKE2B 5e4744fcd69e2920e0ca9ba0b1aa77ea5f62ed4aecc9f00df17953dc813e1f8d61a859ab0aacc26f88f51d281574a8089b849fe063d55c8649c4a53b528d8ba8 SHA512 6ee23f1dd52672646f28978cec3fa9e29b64cae84f524bbcb6f2614a4a56e49e8363975b89cd3508e78c9779233a27403e46fc098be0808d6cfc1e6aa6b8499f
-EBUILD buildbot-worker-0.9.10-r2.ebuild 4810 BLAKE2B 8e4432a39c33377a58d78fdb442d9cdd7a343dec1cd22435288fef4b12fe28757090c27c1914fc0a6cc0366fd78ab712c2472617c711911327cc13afdceece4d SHA512 c330f345c67d69ac7c276462104942061ffd9fa5b55173222a8b5b927576ac218ec97a11c09c9fd4eca56beccbbc45f8080d771dd5c1ebde7eef7cff43ca4a2a
-EBUILD buildbot-worker-0.9.11.ebuild 4804 BLAKE2B 9bffadc0e2237049223801828898588e028ed3d6caa95d434149c01d3d2772263ae8e5843405d15efe10613ab288011e1e92e77d52fef59f059e278e21cac916 SHA512 999648a81ebd40ffc7cba11a718374e558d7026f0cc67cec1b7117e6b81f571043037e98ac3e5e0ef8751ae9a426be5fa5e675764223091c789c725ae99a1b7c
+DIST buildbot-worker-1.1.0.tar.gz 102142 BLAKE2B 144587edf2adc9d99837dc549b4d0696761f6cb3c959d4c133a5136606934ce03836cd1fcb019e7bb8ec473526c2ac07146c4820ef4d8b17ed9d843acd6c06b4 SHA512 77c46b3c9a16847eaf72de1dafa871a3242b66235c94ce8109f953db39aa4b74de2a03ca7ff06e91f8ea0751ed57e6ec1f39336912d56346f1bed171f597f6ed
 EBUILD buildbot-worker-0.9.12.ebuild 4807 BLAKE2B ca781f207c2ad6f5aa0028a4bcded57a7875c969642489791827ca94556e2710bedaa3142e18275431838a173c504a66d471d205705f54bc0c99a7aad8f9016e SHA512 a6e244e3971f9015652bdac9702932475da8fce610ab5a92fcde9c01e43ea6a0f18efbbb8f1589fd0babe3dc8975e3becebffc034105536442c090958cfd748d
 EBUILD buildbot-worker-0.9.13.ebuild 4814 BLAKE2B f84a2610fee9092d86a4f1acc2e7c07aff137d0f9f38c702a0f829a03186b5a644be47474966ce1c935c9881439c92830a6363066648776f9a1b1c0e8ef6c462 SHA512 eb66e9ba14a47d46d5bea97ce47d049664580ebf8f4748584b0fa26cc643a854ba1cdd1809e7255324f718053f0e8b0c9a8dc54cf59928d1a6cf0071355766ba
 EBUILD buildbot-worker-0.9.15_p1.ebuild 4818 BLAKE2B 9d0374a566c51b986135184ca776f51f4a2a424448de147e39fbb03694773216671c734ddc737ed14d0278ca9edcdea8c37317d7d641357bc50a95784d478ed4 SHA512 a4e08dffc7ddcde1b885361ed815daed61720ea579e29303fc563e632ffeb129298f62763baea99735417e48ef7cfd1b55267174474d4c04a8e9bc1396c1da9a
+EBUILD buildbot-worker-1.1.0.ebuild 4818 BLAKE2B 9d0374a566c51b986135184ca776f51f4a2a424448de147e39fbb03694773216671c734ddc737ed14d0278ca9edcdea8c37317d7d641357bc50a95784d478ed4 SHA512 a4e08dffc7ddcde1b885361ed815daed61720ea579e29303fc563e632ffeb129298f62763baea99735417e48ef7cfd1b55267174474d4c04a8e9bc1396c1da9a
 EBUILD buildbot-worker-9999.ebuild 4818 BLAKE2B 9d0374a566c51b986135184ca776f51f4a2a424448de147e39fbb03694773216671c734ddc737ed14d0278ca9edcdea8c37317d7d641357bc50a95784d478ed4 SHA512 a4e08dffc7ddcde1b885361ed815daed61720ea579e29303fc563e632ffeb129298f62763baea99735417e48ef7cfd1b55267174474d4c04a8e9bc1396c1da9a
 MISC metadata.xml 591 BLAKE2B e5b06e8136a2adbab54c70e416a7117fccf3ae0a33bab129e1b5db13096cdb8716ca09606fd67a9c82088a0e40e0ae8bc3137262086c8ebb45bbc6993c14984a SHA512 d3273df1c8e6284b75ab5cd15cc5092d10db8ab8c0126e5eb21425bf3f2cab0f582a4e1bdf1e96881cc580a13047ac9fc72e09474f03dd788f85cd7962be6257
diff --git a/dev-util/buildbot-worker/buildbot-worker-0.9.10-r2.ebuild b/dev-util/buildbot-worker/buildbot-worker-0.9.10-r2.ebuild
deleted file mode 100644
index 419fd619809a..000000000000
--- a/dev-util/buildbot-worker/buildbot-worker-0.9.10-r2.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 python3_5 )
-
-EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
-
-[[ ${PV} == *9999 ]] && inherit git-r3
-inherit readme.gentoo user distutils-r1
-
-DESCRIPTION="BuildBot Worker (slave) Daemon"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.python.org/pypi/buildbot-worker"
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
-[[ ${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"
-
-RDEPEND=">=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
-	>=dev-python/twisted-17.5.0[${PYTHON_USEDEP}]
-	dev-python/future[${PYTHON_USEDEP}]
-	!<dev-util/buildbot-0.9.7
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/setuptools_trial[${PYTHON_USEDEP}]
-	)
-"
-
-S="${WORKDIR}/${MY_P}"
-[[ ${PV} == *9999 ]] && S=${S}/slave
-
-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.
-		The scripts can	run as a different user if desired."
-}
-
-python_test() {
-	distutils_install_for_testing
-
-	esetup.py test || die "Tests failed under ${EPYTHON}"
-}
-
-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 "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 "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 "${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}"
-	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-0.9.11.ebuild b/dev-util/buildbot-worker/buildbot-worker-1.1.0.ebuild
index 0697e9a2ce0d..bfcad9dc970b 100644
--- a/dev-util/buildbot-worker/buildbot-worker-0.9.11.ebuild
+++ b/dev-util/buildbot-worker/buildbot-worker-1.1.0.ebuild
@@ -1,18 +1,18 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
-PYTHON_COMPAT=( python2_7 python3_5 )
+EAPI="6"
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 
 EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
 
 [[ ${PV} == *9999 ]] && inherit git-r3
-inherit readme.gentoo user distutils-r1
+inherit readme.gentoo-r1 user distutils-r1
 
 DESCRIPTION="BuildBot Worker (slave) Daemon"
 HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.python.org/pypi/buildbot-worker"
 
-MY_V="${PV/_p/p}"
+MY_V="${PV/_p/.post}"
 MY_P="${PN}-${MY_V}"
 [[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
 
@@ -26,7 +26,7 @@ fi
 IUSE="test"
 
 RDEPEND=">=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
-	>=dev-python/twisted-17.5.0[${PYTHON_USEDEP}]
+	>=dev-python/twisted-17.9.0[${PYTHON_USEDEP}]
 	dev-python/future[${PYTHON_USEDEP}]
 	!<dev-util/buildbot-0.9.7
 "
@@ -38,7 +38,7 @@ DEPEND="${RDEPEND}
 "
 
 S="${WORKDIR}/${MY_P}"
-[[ ${PV} == *9999 ]] && S=${S}/slave
+[[ ${PV} == *9999 ]] && S=${S}/worker
 
 pkg_setup() {
 	enewuser buildbot
diff --git a/dev-util/buildbot-worker/files/buildbot_worker.confd b/dev-util/buildbot-worker/files/buildbot_worker.confd
deleted file mode 100644
index 7e77999cf0c8..000000000000
--- a/dev-util/buildbot-worker/files/buildbot_worker.confd
+++ /dev/null
@@ -1,9 +0,0 @@
-# Path to the build slave's basedir.
-BASEDIR="/var/lib/buildbot_worker"
-
-# User account for the buildslave.
-# The basedir should be owned by this user.
-USERNAME="buildbot"
-
-# Extra options passed to twistd.
-TWISTD_OPTS=""
diff --git a/dev-util/buildbot-worker/files/buildbot_worker.initd b/dev-util/buildbot-worker/files/buildbot_worker.initd
deleted file mode 100644
index 8b13460491e4..000000000000
--- a/dev-util/buildbot-worker/files/buildbot_worker.initd
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	need net
-}
-
-checkconfig() {
-	if [ -z "${BASEDIR}" ]; then
-		eerror "BASEDIR not set"
-		return 1
-	fi
-	if [ -z "${USERNAME}" ]; then
-		eerror "USERNAME not set"
-		return 1
-	fi
-	if [ ! -d "${BASEDIR}" ]; then
-		eerror "${BASEDIR} is not a directory"
-		return 1
-	fi
-	if [ ! -e "${BASEDIR}/buildbot.tac" ]; then
-		eerror "${BASEDIR} does not contain buildbot.tac"
-		return 1
-	fi
-}
-
-start() {
-	checkconfig || return 1
-	ebegin "Starting buildslave in ${BASEDIR}"
-	# We set HOME here to make something valid show up in the env of child
-	# processes spawned by the buildslave.
-	start-stop-daemon --start -u "${USERNAME}" \
-		--pidfile "${BASEDIR}/buildbot_worker.pid" \
-		--env HOME="${BASEDIR}" \
-		--exec /usr/bin/twistd -- \
-		--no_save \
-		--logfile="${BASEDIR}/twistd.log" \
-		--pidfile="${BASEDIR}/buildbot_worker.pid" \
-		--python="${BASEDIR}/buildbot.tac"
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping buildslave in ${BASEDIR}"
-	start-stop-daemon --stop --pidfile "${BASEDIR}/buildbot_worker.pid"
-	eend $?
-}