commit: 8c1c66084b945cf38659fba13654255f426ab829
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Fri May 8 17:41:52 2020 +0000
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Tue May 12 18:15:05 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c1c6608
dev-util/buildbot-worker: Version bump, adds python 3.7,3.8
metadata.xml: take maintainership
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Brian Dolbec <dolsen <AT> gentoo.org>
dev-util/buildbot-worker/Manifest | 1 +
...er-9999.ebuild => buildbot-worker-2.7.0.ebuild} | 25 ++++++++++------------
.../buildbot-worker/buildbot-worker-9999.ebuild | 25 ++++++++++------------
dev-util/buildbot-worker/metadata.xml | 5 ++++-
4 files changed, 27 insertions(+), 29 deletions(-)
diff --git a/dev-util/buildbot-worker/Manifest
b/dev-util/buildbot-worker/Manifest
index ccee63bcc80..72f72b3635a 100644
--- a/dev-util/buildbot-worker/Manifest
+++ b/dev-util/buildbot-worker/Manifest
@@ -1,3 +1,4 @@
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
diff --git a/dev-util/buildbot-worker/buildbot-worker-9999.ebuild
b/dev-util/buildbot-worker/buildbot-worker-2.7.0.ebuild
similarity index 89%
copy from dev-util/buildbot-worker/buildbot-worker-9999.ebuild
copy to dev-util/buildbot-worker/buildbot-worker-2.7.0.ebuild
index a8ac9da44f5..08a96964fa3 100644
--- a/dev-util/buildbot-worker/buildbot-worker-9999.ebuild
+++ b/dev-util/buildbot-worker/buildbot-worker-2.7.0.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,8 +45,6 @@ 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.
@@ -53,11 +54,7 @@ pkg_setup() {
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."
diff --git a/dev-util/buildbot-worker/buildbot-worker-9999.ebuild
b/dev-util/buildbot-worker/buildbot-worker-9999.ebuild
index a8ac9da44f5..08a96964fa3 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,8 +45,6 @@ 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.
@@ -53,11 +54,7 @@ pkg_setup() {
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."
diff --git a/dev-util/buildbot-worker/metadata.xml
b/dev-util/buildbot-worker/metadata.xml
index 02cba1b8df4..04061719612 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>dol...@gentoo.org</email>
+ <name>Brian Dolbec</name>
+ </maintainer>
<upstream>
<maintainer>
<email>de...@buildbot.net</email>
