| 1 |
commit: 8c1c66084b945cf38659fba13654255f426ab829 |
| 2 |
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri May 8 17:41:52 2020 +0000 |
| 4 |
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue May 12 18:15:05 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c1c6608 |
| 7 |
|
| 8 |
dev-util/buildbot-worker: Version bump, adds python 3.7,3.8 |
| 9 |
|
| 10 |
metadata.xml: take maintainership |
| 11 |
|
| 12 |
Package-Manager: Portage-2.3.99, Repoman-2.3.22 |
| 13 |
Signed-off-by: Brian Dolbec <dolsen <AT> gentoo.org> |
| 14 |
|
| 15 |
dev-util/buildbot-worker/Manifest | 1 + |
| 16 |
...er-9999.ebuild => buildbot-worker-2.7.0.ebuild} | 25 ++++++++++------------ |
| 17 |
.../buildbot-worker/buildbot-worker-9999.ebuild | 25 ++++++++++------------ |
| 18 |
dev-util/buildbot-worker/metadata.xml | 5 ++++- |
| 19 |
4 files changed, 27 insertions(+), 29 deletions(-) |
| 20 |
|
| 21 |
diff --git a/dev-util/buildbot-worker/Manifest b/dev-util/buildbot-worker/Manifest |
| 22 |
index ccee63bcc80..72f72b3635a 100644 |
| 23 |
--- a/dev-util/buildbot-worker/Manifest |
| 24 |
+++ b/dev-util/buildbot-worker/Manifest |
| 25 |
@@ -1,3 +1,4 @@ |
| 26 |
DIST buildbot-worker-0.9.12.tar.gz 101655 BLAKE2B a73f98ec56bd3ad6d19ad0b9dfa015869fd6115789a7ddcecdebdac8707850715c677ee248668f73035ea5656665973634829f2f97e3e75fe8e1515cb0838b88 SHA512 c2e86bd8818eddc2849626a0c7642169bc91fa2cc1d531977736e53c4ad3c87c3f0cb17d7b9acd137e783ae822f558a19f4668e3cd37e90a8435157485bd1d57 |
| 27 |
DIST buildbot-worker-1.1.2.tar.gz 103013 BLAKE2B b44593b71e61fee4037911759fa4f686aaabf5ef4be9efaecd539e88c5fc2ed2059d8dd8d6d1c4b3ba57d3563f79aaa404176529622003070c136803c90beb10 SHA512 3dd3da7e87d667307fca264d91af4671f76c3aad93a0512ae5777bb2e3972efe349968cf72fa17b99e45f2d7cec1ec16b1180c48d296e2702c9548bf858951a7 |
| 28 |
DIST buildbot-worker-1.3.0.tar.gz 103765 BLAKE2B a5f06ad6b87442292f9fe0c7935f791d2fdb450db09c9614324f8230d0bec408380a7b1637dc32806259c4de7699b164f20f76d959232a82253f7134749531d7 SHA512 5e59aab6cecf8dd932df0e8063c69fda5613b76a46df63479ff554085275d4a19fb1b5142034bd4245423e99f3e46d45e765b10c3c74a9f28b92b70119fab9e2 |
| 29 |
+DIST buildbot-worker-2.7.0.tar.gz 101075 BLAKE2B 2ee82434f565bef111685712b9b4dd7b0c522de59eefe3eda672827e4bcffae8288c5b9842221b52aa7d5907eeadd4bc5c635382b8c6c4e82977b3c139afdd4b SHA512 bdfce0a7b222fdddbf7830f90c1775e2bded7080e5053b114b7c136b3e114f6c8b26ee4ad802fce66514524e29e863a2f1a4366758c59ebbc6eeadb4b0a271db |
| 30 |
|
| 31 |
diff --git a/dev-util/buildbot-worker/buildbot-worker-9999.ebuild b/dev-util/buildbot-worker/buildbot-worker-2.7.0.ebuild |
| 32 |
similarity index 89% |
| 33 |
copy from dev-util/buildbot-worker/buildbot-worker-9999.ebuild |
| 34 |
copy to dev-util/buildbot-worker/buildbot-worker-2.7.0.ebuild |
| 35 |
index a8ac9da44f5..08a96964fa3 100644 |
| 36 |
--- a/dev-util/buildbot-worker/buildbot-worker-9999.ebuild |
| 37 |
+++ b/dev-util/buildbot-worker/buildbot-worker-2.7.0.ebuild |
| 38 |
@@ -1,13 +1,15 @@ |
| 39 |
# Copyright 1999-2020 Gentoo Authors |
| 40 |
# Distributed under the terms of the GNU General Public License v2 |
| 41 |
|
| 42 |
-EAPI="6" |
| 43 |
-PYTHON_COMPAT=( python3_6 ) |
| 44 |
+EAPI="7" |
| 45 |
+PYTHON_COMPAT=( python3_{6,7,8} ) |
| 46 |
|
| 47 |
EGIT_REPO_URI="https://github.com/buildbot/buildbot.git" |
| 48 |
|
| 49 |
+DISTUTILS_USE_SETUPTOOLS="rdepend" |
| 50 |
+ |
| 51 |
[[ ${PV} == *9999 ]] && inherit git-r3 |
| 52 |
-inherit readme.gentoo-r1 user distutils-r1 |
| 53 |
+inherit readme.gentoo-r1 distutils-r1 |
| 54 |
|
| 55 |
DESCRIPTION="BuildBot Worker (slave) Daemon" |
| 56 |
HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-worker/" |
| 57 |
@@ -26,10 +28,11 @@ fi |
| 58 |
IUSE="test" |
| 59 |
RESTRICT="!test? ( test )" |
| 60 |
|
| 61 |
-RDEPEND=">=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}] |
| 62 |
+RDEPEND=" |
| 63 |
+ acct-user/buildbot |
| 64 |
>=dev-python/twisted-17.9.0[${PYTHON_USEDEP}] |
| 65 |
dev-python/future[${PYTHON_USEDEP}] |
| 66 |
- !<dev-util/buildbot-0.9.7 |
| 67 |
+ !<dev-util/buildbot-1.0.0 |
| 68 |
" |
| 69 |
DEPEND="${RDEPEND} |
| 70 |
test? ( |
| 71 |
@@ -42,8 +45,6 @@ S="${WORKDIR}/${MY_P}" |
| 72 |
[[ ${PV} == *9999 ]] && S=${S}/worker |
| 73 |
|
| 74 |
pkg_setup() { |
| 75 |
- enewuser buildbot |
| 76 |
- |
| 77 |
DOC_CONTENTS="The \"buildbot\" user and the \"buildbot_worker\" init script has been added |
| 78 |
to support starting buildbot_worker through Gentoo's init system. To use this, |
| 79 |
execute \"emerge --config =${CATEGORY}/${PF}\" to create a new instance. |
| 80 |
@@ -53,11 +54,7 @@ pkg_setup() { |
| 81 |
The scripts can run as a different user if desired." |
| 82 |
} |
| 83 |
|
| 84 |
-python_test() { |
| 85 |
- distutils_install_for_testing |
| 86 |
- |
| 87 |
- esetup.py test || die "Tests failed under ${EPYTHON}" |
| 88 |
-} |
| 89 |
+distutils_enable_tests setup.py |
| 90 |
|
| 91 |
python_install_all() { |
| 92 |
distutils-r1_python_install_all |
| 93 |
@@ -78,8 +75,8 @@ pkg_postinst() { |
| 94 |
|
| 95 |
if [[ -n ${REPLACING_VERSIONS} ]]; then |
| 96 |
ewarn |
| 97 |
- ewarn "Starting with buildbot-worker-0.9.10-r1, more than one instance of a buildbot_worker" |
| 98 |
- ewarn "can be run simultaneously. Note that \"BASEDIR\" in the buildbot_worker configuration file" |
| 99 |
+ ewarn "More than one instance of a buildbot_worker can be run simultaneously." |
| 100 |
+ ewarn " Note that \"BASEDIR\" in the buildbot_worker configuration file" |
| 101 |
ewarn "is now the common base directory for all instances. If you are migrating from an older" |
| 102 |
ewarn "version, make sure that you copy the current contents of \"BASEDIR\" to a subdirectory." |
| 103 |
ewarn "The name of the subdirectory corresponds to the name of the buildbot_worker instance." |
| 104 |
|
| 105 |
diff --git a/dev-util/buildbot-worker/buildbot-worker-9999.ebuild b/dev-util/buildbot-worker/buildbot-worker-9999.ebuild |
| 106 |
index a8ac9da44f5..08a96964fa3 100644 |
| 107 |
--- a/dev-util/buildbot-worker/buildbot-worker-9999.ebuild |
| 108 |
+++ b/dev-util/buildbot-worker/buildbot-worker-9999.ebuild |
| 109 |
@@ -1,13 +1,15 @@ |
| 110 |
# Copyright 1999-2020 Gentoo Authors |
| 111 |
# Distributed under the terms of the GNU General Public License v2 |
| 112 |
|
| 113 |
-EAPI="6" |
| 114 |
-PYTHON_COMPAT=( python3_6 ) |
| 115 |
+EAPI="7" |
| 116 |
+PYTHON_COMPAT=( python3_{6,7,8} ) |
| 117 |
|
| 118 |
EGIT_REPO_URI="https://github.com/buildbot/buildbot.git" |
| 119 |
|
| 120 |
+DISTUTILS_USE_SETUPTOOLS="rdepend" |
| 121 |
+ |
| 122 |
[[ ${PV} == *9999 ]] && inherit git-r3 |
| 123 |
-inherit readme.gentoo-r1 user distutils-r1 |
| 124 |
+inherit readme.gentoo-r1 distutils-r1 |
| 125 |
|
| 126 |
DESCRIPTION="BuildBot Worker (slave) Daemon" |
| 127 |
HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-worker/" |
| 128 |
@@ -26,10 +28,11 @@ fi |
| 129 |
IUSE="test" |
| 130 |
RESTRICT="!test? ( test )" |
| 131 |
|
| 132 |
-RDEPEND=">=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}] |
| 133 |
+RDEPEND=" |
| 134 |
+ acct-user/buildbot |
| 135 |
>=dev-python/twisted-17.9.0[${PYTHON_USEDEP}] |
| 136 |
dev-python/future[${PYTHON_USEDEP}] |
| 137 |
- !<dev-util/buildbot-0.9.7 |
| 138 |
+ !<dev-util/buildbot-1.0.0 |
| 139 |
" |
| 140 |
DEPEND="${RDEPEND} |
| 141 |
test? ( |
| 142 |
@@ -42,8 +45,6 @@ S="${WORKDIR}/${MY_P}" |
| 143 |
[[ ${PV} == *9999 ]] && S=${S}/worker |
| 144 |
|
| 145 |
pkg_setup() { |
| 146 |
- enewuser buildbot |
| 147 |
- |
| 148 |
DOC_CONTENTS="The \"buildbot\" user and the \"buildbot_worker\" init script has been added |
| 149 |
to support starting buildbot_worker through Gentoo's init system. To use this, |
| 150 |
execute \"emerge --config =${CATEGORY}/${PF}\" to create a new instance. |
| 151 |
@@ -53,11 +54,7 @@ pkg_setup() { |
| 152 |
The scripts can run as a different user if desired." |
| 153 |
} |
| 154 |
|
| 155 |
-python_test() { |
| 156 |
- distutils_install_for_testing |
| 157 |
- |
| 158 |
- esetup.py test || die "Tests failed under ${EPYTHON}" |
| 159 |
-} |
| 160 |
+distutils_enable_tests setup.py |
| 161 |
|
| 162 |
python_install_all() { |
| 163 |
distutils-r1_python_install_all |
| 164 |
@@ -78,8 +75,8 @@ pkg_postinst() { |
| 165 |
|
| 166 |
if [[ -n ${REPLACING_VERSIONS} ]]; then |
| 167 |
ewarn |
| 168 |
- ewarn "Starting with buildbot-worker-0.9.10-r1, more than one instance of a buildbot_worker" |
| 169 |
- ewarn "can be run simultaneously. Note that \"BASEDIR\" in the buildbot_worker configuration file" |
| 170 |
+ ewarn "More than one instance of a buildbot_worker can be run simultaneously." |
| 171 |
+ ewarn " Note that \"BASEDIR\" in the buildbot_worker configuration file" |
| 172 |
ewarn "is now the common base directory for all instances. If you are migrating from an older" |
| 173 |
ewarn "version, make sure that you copy the current contents of \"BASEDIR\" to a subdirectory." |
| 174 |
ewarn "The name of the subdirectory corresponds to the name of the buildbot_worker instance." |
| 175 |
|
| 176 |
diff --git a/dev-util/buildbot-worker/metadata.xml b/dev-util/buildbot-worker/metadata.xml |
| 177 |
index 02cba1b8df4..04061719612 100644 |
| 178 |
--- a/dev-util/buildbot-worker/metadata.xml |
| 179 |
+++ b/dev-util/buildbot-worker/metadata.xml |
| 180 |
@@ -1,7 +1,10 @@ |
| 181 |
<?xml version="1.0" encoding="UTF-8"?> |
| 182 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
| 183 |
<pkgmetadata> |
| 184 |
- <!-- maintainer-needed --> |
| 185 |
+ <maintainer type="person"> |
| 186 |
+ <email>dolsen@g.o</email> |
| 187 |
+ <name>Brian Dolbec</name> |
| 188 |
+ </maintainer> |
| 189 |
<upstream> |
| 190 |
<maintainer> |
| 191 |
<email>devel@××××××××.net</email> |
Archives