summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dev-util/buildbot-console-view/Manifest1
-rw-r--r--dev-util/buildbot-console-view/buildbot-console-view-0.9.10.ebuild52
-rw-r--r--dev-util/buildbot-pkg/Manifest1
-rw-r--r--dev-util/buildbot-pkg/buildbot-pkg-0.9.10.ebuild45
-rw-r--r--dev-util/buildbot-slave/Manifest1
-rw-r--r--dev-util/buildbot-slave/buildbot-slave-0.8.10.ebuild53
-rw-r--r--dev-util/buildbot-waterfall-view/Manifest1
-rw-r--r--dev-util/buildbot-waterfall-view/buildbot-waterfall-view-0.9.10.ebuild52
-rw-r--r--dev-util/buildbot-worker/Manifest1
-rw-r--r--dev-util/buildbot-worker/buildbot-worker-0.9.10.ebuild74
-rw-r--r--dev-util/buildbot-worker/buildbot-worker-9999.ebuild2
-rw-r--r--dev-util/buildbot-www/Manifest1
-rw-r--r--dev-util/buildbot-www/buildbot-www-0.9.10.ebuild51
-rw-r--r--dev-util/buildbot/Manifest2
-rw-r--r--dev-util/buildbot/buildbot-0.8.10.ebuild97
-rw-r--r--dev-util/buildbot/buildbot-0.9.10.ebuild201
-rw-r--r--dev-util/buildbot/buildbot-9999.ebuild1
-rw-r--r--eclass/toolchain-funcs.eclass8
-rw-r--r--www-client/google-chrome-beta/Manifest2
-rw-r--r--www-client/google-chrome-beta/google-chrome-beta-61.0.3163.39.ebuild (renamed from www-client/google-chrome-beta/google-chrome-beta-61.0.3163.31.ebuild)0
-rw-r--r--www-plugins/chrome-binary-plugins/Manifest2
-rw-r--r--www-plugins/chrome-binary-plugins/chrome-binary-plugins-61.0.3163.39_beta.ebuild (renamed from www-plugins/chrome-binary-plugins/chrome-binary-plugins-61.0.3163.31_beta.ebuild)0
22 files changed, 488 insertions, 160 deletions
diff --git a/dev-util/buildbot-console-view/Manifest b/dev-util/buildbot-console-view/Manifest
index ffdef94d3d07..cb987b2da145 100644
--- a/dev-util/buildbot-console-view/Manifest
+++ b/dev-util/buildbot-console-view/Manifest
@@ -1,3 +1,4 @@
+DIST buildbot-console-view-0.9.10.tar.gz 640908 SHA256 ca62780a7405df761fa2d80019890c8b25d79f6b716df26fbc4ce257a21f762e SHA512 a7ad6289a314f096e6375646d17e2f6b595ecae040e9d135334ac46e810d24f6903318e5ef34f015d923b795d01d8e4011dca00b9b6adeb8c91734350f5d1982 WHIRLPOOL fb60315596c0f0d1ef1a07bd9f40a6f194430e5b825979c5e80616fb96c185a3fee126c42634ab7183c1bdb60ff53f058e8ef6085271c29007a468788117deaa
DIST buildbot-console-view-0.9.4.tar.gz 631510 SHA256 16d1ab8801439d50d712883ab155530840588d4d77ab600299ead0ef23da5bf0 SHA512 f2e99e58acea3eebec7600a23597c6235fe93532653352c8e427d4b55a14066534dbc046de02856d738a5943ccdaed0ac14643a830d9d11acf76f6d1760def03 WHIRLPOOL 1d3ec1476d69e68f9bd752f5ff88796b504b997373e82f3428e5ead44f7c19c66278448e61aa1a36bd1d3e2bc7e55e21877537b8d02f9add0d12c5dd7c0e24b7
DIST buildbot-console-view-0.9.7.tar.gz 632458 SHA256 757ee80e5c4b698e6bac7b409c63af7ebd8c00c31117fa290776ad6c103a67c7 SHA512 e07c032e17ce9faa9d71b71c5c48fde9ebde4995dec408781b6bb2ed77edcbe320b8d825a9a4bd76d9f3c48dd445560ec55867639c454591c5b7095e4142c4f2 WHIRLPOOL 58a534d641d3f28272f074998231b4873086cc1c8cc081463545e0d6b49145299e2496974ba6d51150cab505b67c5bd81d56fa9747271b64ed8b487d1409a5ae
DIST buildbot-console-view-0.9.8.tar.gz 632459 SHA256 573b03db8c102114b12bcc29c3224653bbc4a08cce25b91725b4bcee2abd7020 SHA512 f6419fd47b70369866440437521a10a2e4062466878979b0c65594c7d74095c89c01c65cc0641f8faf7dee163347426e50a272f93dfe45ee91d072360e249674 WHIRLPOOL 5bfe80b6f148603f98ff684b1b317e059587d37baf88c04e2f4f6f1eb4f4026d92df57463365f4bf460743c2bc4ce5407cce2df74ff2623f95d09d5b6230d7fa
diff --git a/dev-util/buildbot-console-view/buildbot-console-view-0.9.10.ebuild b/dev-util/buildbot-console-view/buildbot-console-view-0.9.10.ebuild
new file mode 100644
index 000000000000..e40d00b64c60
--- /dev/null
+++ b/dev-util/buildbot-console-view/buildbot-console-view-0.9.10.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python2_7 python3_5 )
+
+EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
+
+[[ ${PV} == *9999 ]] && inherit git-r3
+inherit distutils-r1
+
+DESCRIPTION="Buildbot console-view plugin"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.python.org/pypi/buildbot-console-view"
+
+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-util/buildbot-${PV}[${PYTHON_USEDEP}]
+ dev-python/mock[${PYTHON_USEDEP}]
+ ~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
+"
+
+DEPEND="${RDEPEND}
+ >=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
+"
+
+S="${WORKDIR}/${MY_P}"
+#[[ ${PV} == *9999 ]] && S=${S}/www/base
+
+python_test() {
+ distutils_install_for_testing
+
+ esetup.py test || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+ distutils-r1_python_install_all
+}
diff --git a/dev-util/buildbot-pkg/Manifest b/dev-util/buildbot-pkg/Manifest
index 07ec3c7fea92..a635f9e2d0a6 100644
--- a/dev-util/buildbot-pkg/Manifest
+++ b/dev-util/buildbot-pkg/Manifest
@@ -1,3 +1,4 @@
+DIST buildbot-pkg-0.9.10.tar.gz 4422 SHA256 6eecdde02f98be469ec9fde47c55fe64ca04eec764a4729be2ff4faa892532d8 SHA512 d31ef269ddbd042a9064daea526f289f2ec3ffa58dc8f43a8e40ae81b03cfa026f219bcce2ccb83addca0b1da0a8a2d3bc894a400edb9c45f4c0cde7691b5e4d WHIRLPOOL 36ff1465b3f0ab2699d3c9b5916862b1f3038e4fa999939730a7a280576b2bae5f106d2f34faabfe6ae3cabfe4ea5bcfd75bb472dddc6ac43fc36ad702d81aed
DIST buildbot-pkg-0.9.4.tar.gz 3830 SHA256 968f252f0700fbbcc6cac9f3fcf66d06bd577db5bf793fb3d7c84158f4f64325 SHA512 ac41792076e5a86ffeb58e694d6aedcf3cf386facf156ce658dfa7c73166c7883c097d160babf6d6ca92c1fba1527db58bade74c3500fb62c448eeecbd840dc0 WHIRLPOOL cb4255c90ae59750aa43fea890d79880bb30958ca36ee27a0f11e859575372dbee82708960dd8862c1ac551b4f9e5b38e4d70c8b7cc87048385c08c31ed455c3
DIST buildbot-pkg-0.9.7.tar.gz 3871 SHA256 fbb75cff1d313a0fa810894073716ddf56b834ede761b1fae34f100f420e655c SHA512 7991425e69a404e15fd018d920accc65915e9d40a3b4b1faeca7b7501d1c9a2b01c2bef209ac10b9ea4dce03a41fd0d05266a5c3c9d50ec0f936a5f1c80f577b WHIRLPOOL 186fe1d1f155df98452e441303f916c498a01fc1e01ce741388ca00f33dd83105aad59d3024fd5b2f50680369f99e17fa609c3d325f291f4a33df7699d8394e5
DIST buildbot-pkg-0.9.8.tar.gz 3913 SHA256 10000b0630d2f96230fada97828b986b4e9f4897fefb4b8be63e51b73e6ed63c SHA512 53e21a4ed20df687f9f646f0570fe610bd6d9da116bf7fdd60f1f2d245541ba9444e6cf7c63e3d780979a9320c9b98fcbe310acd736e3877c02bee31c683ebfc WHIRLPOOL 831f21235e4396603e4fdaec226006a7c6e01fd8378c7df9c2a8a24724542c315f97641b9fe4edb353405b79273bd361e7dade34a2be81be9e27c551728351ee
diff --git a/dev-util/buildbot-pkg/buildbot-pkg-0.9.10.ebuild b/dev-util/buildbot-pkg/buildbot-pkg-0.9.10.ebuild
new file mode 100644
index 000000000000..dd96a049c7cf
--- /dev/null
+++ b/dev-util/buildbot-pkg/buildbot-pkg-0.9.10.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python2_7 python3_5 )
+
+EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
+
+[[ ${PV} == *9999 ]] && inherit git-r3
+inherit distutils-r1
+
+MY_PV="${PV/_p/.post}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="BuildBot common www build tools for packaging releases"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.python.org/pypi/buildbot-pkg"
+[[ ${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
+
+# No real integration tests for this pkg.
+# all tests are related to making releases and final checks for distribution
+
+RDEPEND="
+ ~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
+ dev-python/mock[${PYTHON_USEDEP}]
+"
+
+DEPEND="${RDEPEND}
+ >=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
+"
+
+S=${WORKDIR}/${MY_P}
+
+python_install_all() {
+ distutils-r1_python_install_all
+}
diff --git a/dev-util/buildbot-slave/Manifest b/dev-util/buildbot-slave/Manifest
index 6557b0dbdc86..e48d8d08d049 100644
--- a/dev-util/buildbot-slave/Manifest
+++ b/dev-util/buildbot-slave/Manifest
@@ -1,2 +1 @@
-DIST buildbot-slave-0.8.10.tar.gz 117593 SHA256 ef5634249407bf643b666976158a4e11c7aaa3db3658ff0fcd781f460867f626 SHA512 0b05f8b9d6e6c29291893c47707409bc50681d2631ed1825908050f30cff34bf422d7f574076ea9c6b36a16b37e2e79ed28c9e84e31b3270bf6ec3aee426def4 WHIRLPOOL 52806ebd2e2c54bf844fb4752ded7ea314fd68cba229ea09039e0b83b1cdd373e40528d779ce5b3a188028932f3d443986f006bfb5555eaf141569ba3949297e
DIST buildbot-slave-0.8.12.tar.gz 118339 SHA256 905eab122dcfc9425d51f0ed0c7682e7f933e140a7203637aa12a84498bd7461 SHA512 74f7f9ffab946000a5d31ae28140698ca259ba5b75815ed839d51fa5d9f702e998b61a716b66aab7946b6143d329244f2403d9b98cbbfc70223b691dcb70f0bc WHIRLPOOL f0281c11520ff31291977fa67397c7398d8ecf7fe0e70a45521158e792862aa9bb6eb65591181a1a3d71913241768e65143a1b35d6316cb5f8b5bc5373d02979
diff --git a/dev-util/buildbot-slave/buildbot-slave-0.8.10.ebuild b/dev-util/buildbot-slave/buildbot-slave-0.8.10.ebuild
deleted file mode 100644
index 8bb290378b53..000000000000
--- a/dev-util/buildbot-slave/buildbot-slave-0.8.10.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-inherit distutils-r1 readme.gentoo systemd user
-
-DESCRIPTION="BuildBot Slave Daemon"
-HOMEPAGE="http://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.python.org/pypi/buildbot-slave"
-
-MY_PV="${PV/_p/p}"
-MY_P="${PN}-${MY_PV}"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux"
-IUSE="test"
-
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
- dev-python/twisted-core[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
- test? ( dev-python/mock[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
- enewuser buildbot
-
- DOC_CONTENTS="The \"buildbot\" user and the \"buildslave\" init script has been added
- to support starting buildslave through Gentoo's init system. To use this,
- set up your build slave following the documentation, make sure the
- resulting directories are owned by the \"buildbot\" user and point
- \"${ROOT}etc/conf.d/buildslave\" at the right location. The scripts can
- run as a different user if desired. If you need to run more than one
- build slave, just copy the scripts."
-}
-
-src_install() {
- distutils-r1_src_install
-
- doman docs/buildslave.1
-
- newconfd "${FILESDIR}/buildslave.confd" buildslave
- newinitd "${FILESDIR}/buildslave.initd" buildslave
- systemd_dounit "${FILESDIR}/buildslave.service"
-
- readme.gentoo_create_doc
-}
-
-pkg_postinst() {
- readme.gentoo_print_elog
-}
diff --git a/dev-util/buildbot-waterfall-view/Manifest b/dev-util/buildbot-waterfall-view/Manifest
index 322fe133abc8..9de89c13465e 100644
--- a/dev-util/buildbot-waterfall-view/Manifest
+++ b/dev-util/buildbot-waterfall-view/Manifest
@@ -1,3 +1,4 @@
+DIST buildbot-waterfall-view-0.9.10.tar.gz 714260 SHA256 c2768391d7eb92e550afe4210e3cba7b69b34a7c9a27d333582f2a04b0f8b030 SHA512 e57a680fb3be7072f1dd6a757787932d9640f1442370048411987d3521f6c600c1f1adedb439ed439cf7928110a6191c8cc4207bf7cd7ebc8e6d1ac5a36f4a1e WHIRLPOOL 95894f7d7b1a52f0312cf1a11f645f5212cd0a18a62ad99f90c804271013ccd4c3f82f7e851d0e02bddef5da9c1ba8af1b2599d424bd95a7f3f29e7f914fe6c3
DIST buildbot-waterfall-view-0.9.4.tar.gz 705483 SHA256 4e8e8d85a77a95fb6ec6e9b0eaa4a774f80cbc6f3a6568f8525d4c90f336b69f SHA512 b619e366b2d276ec956c7f2b814fbea5ad8d626f21d365f586fb93d9ddd8d90c6e3f290a6404b401051e780b228b84f78642f876783c0da6e96549f0e2c9929c WHIRLPOOL f6622afe37931b1525f4234b138d7cd6c296ab92ea00a476eab2b8cd00192972e2b3ca936d54d01b5ed4d93441824d79734b179153614f568a3023ecb308fcfd
DIST buildbot-waterfall-view-0.9.7.tar.gz 705818 SHA256 d6455df447720e367988f043ae381130add96daf80ae45cdf5a0fbcc8aa082e0 SHA512 4f5a068ff03d2ea24eca2344676eecd5558b02127f805b0c88ab0b1bcf353640a6b0bc8756c12d0565a5fdfc8dedff8394b5dc014378200880d469fa26b7263b WHIRLPOOL 2d63af137626018440975cb55e587a94dd9227e0dbc2b62b6726b9bb86e78b183ad656dcb52ec0afecca6b66a0320bc3ac42bb208c4f835343e6e062d00abfdd
DIST buildbot-waterfall-view-0.9.8.tar.gz 705815 SHA256 a8ffe67b5bb8bd5ac15e6cf853cc693c3328fc508ecfa337613fc8f6081c3603 SHA512 82f75f706c97bdedb744f34229c5efefe6f7bb713874f0d99a322233663764b37572b9c9b7a2004c64d7693f6e58625e0c17bacbf743c16ed5fce16d6ad87b2d WHIRLPOOL 87922d9637a8f9b028c1e7495d552b7b2c63a78c5efb313066e6cc212211b6728de105076ad399ea04086948707b7f5f0182fa6c5e471b5cc83cd9b135ab6677
diff --git a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-0.9.10.ebuild b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-0.9.10.ebuild
new file mode 100644
index 000000000000..a2fb58771439
--- /dev/null
+++ b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-0.9.10.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python2_7 python3_5 )
+
+EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
+
+[[ ${PV} == *9999 ]] && inherit git-r3
+inherit distutils-r1
+
+DESCRIPTION="Buildbot waterfall-view plugin"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.python.org/pypi/buildbot-waterfall-view"
+
+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-util/buildbot-${PV}[${PYTHON_USEDEP}]
+ dev-python/mock[${PYTHON_USEDEP}]
+ ~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
+"
+
+DEPEND="${RDEPEND}
+ >=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
+"
+
+S="${WORKDIR}/${MY_P}"
+#[[ ${PV} == *9999 ]] && S=${S}/www/base
+
+python_test() {
+ distutils_install_for_testing
+
+ esetup.py test || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+ distutils-r1_python_install_all
+}
diff --git a/dev-util/buildbot-worker/Manifest b/dev-util/buildbot-worker/Manifest
index 36c003e5161e..d38d1bf39f8d 100644
--- a/dev-util/buildbot-worker/Manifest
+++ b/dev-util/buildbot-worker/Manifest
@@ -1,3 +1,4 @@
+DIST buildbot-worker-0.9.10.tar.gz 99028 SHA256 1793631d74629cd73bc0df1fadf28fb34d87e63aa72cba82058122bde165a824 SHA512 0f515610d9c788657b10ba6624745841241fe554b472e53abdda221a678eb73d7a21a6529eb0769450de3a79b43bb6e51f4208247a4d8ef25c3d36b6ced6ec89 WHIRLPOOL 67cb199328428167c7e52f7b6ecbe7aa73729b5b453b5a8c16ba4999502bf30d9b139788f755eb4811968a60ce61fde32cdc29a31242d3777302792bb04863a6
DIST buildbot-worker-0.9.4.tar.gz 100889 SHA256 129e0d3fa9ee34f0f227487b6d1645820d2d4853099a1b0aed56587d3acab965 SHA512 7d055b7b005ebf1cc8033fb86f5321a9d80e0505c1a8b28b9ba3945323f157d34f34066ee9513e82b05c63af099d6030bf42d6f44533859b4e01983f1114462b WHIRLPOOL 8f2b95a476e93beaba5305137bb1d219a9aff59e8bb4450d6352babe799bb0166c299e7c8ea69e53c467e7e58be2681ddba4ae74ad8ba945221e1059906e5fc1
DIST buildbot-worker-0.9.7.tar.gz 96416 SHA256 a41b4e0c7329821a0d85ee0e6edbde3db403676c62e59a6f436a048a008ac268 SHA512 84ccaf0472553f8422b342163e44e55481f6691338df38db6b1be74f0a79c13e2a52be56df632491662ab79648cd5034ce04d906bbedb01030e4fa96f1689ef9 WHIRLPOOL 70379e6f34ea30aef0e0008fd098a53ba144696f1416ac77c3756018bc371646d2261a28589ad5131f7be7de930189bd771b4a82de27343441543da5c683e122
DIST buildbot-worker-0.9.8.tar.gz 97193 SHA256 825e022a794c7470276169b6ac1b774f39f60d16545bb46fdf5b4a3b2c78f44f SHA512 43cb7d83835d009c3d4f9a9671d3bd1037d50969b6238f9c77e9f1caedea83c9b9f77d642743d47ff2eea8f3c6549b9e4c843b7d9f638dc5a28339e034ea9b47 WHIRLPOOL 1127b956c3a94ad426c686e42dcbdf6a6f4427751c4ddf247569bc0ee03e86d1ae609263386e730d92b2a572be76208cb999c571fdee9f85de49de161a5c1ab1
diff --git a/dev-util/buildbot-worker/buildbot-worker-0.9.10.ebuild b/dev-util/buildbot-worker/buildbot-worker-0.9.10.ebuild
new file mode 100644
index 000000000000..18aad48371ca
--- /dev/null
+++ b/dev-util/buildbot-worker/buildbot-worker-0.9.10.ebuild
@@ -0,0 +1,74 @@
+# 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,
+ 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\" at the right location. The scripts can
+ run as a different user if desired. If you need to run more than one
+ build worker, just copy the scripts."
+}
+
+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.confd" buildbot_worker
+ newinitd "${FILESDIR}/buildbot_worker.initd" buildbot_worker
+
+ readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+ readme.gentoo_print_elog
+}
diff --git a/dev-util/buildbot-worker/buildbot-worker-9999.ebuild b/dev-util/buildbot-worker/buildbot-worker-9999.ebuild
index d3e878cd1624..e756aeaa6cc3 100644
--- a/dev-util/buildbot-worker/buildbot-worker-9999.ebuild
+++ b/dev-util/buildbot-worker/buildbot-worker-9999.ebuild
@@ -9,7 +9,7 @@ EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
[[ ${PV} == *9999 ]] && inherit git-r3
inherit readme.gentoo user distutils-r1
-DESCRIPTION="BuildBot Slave Daemon"
+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}"
diff --git a/dev-util/buildbot-www/Manifest b/dev-util/buildbot-www/Manifest
index 9f879f179348..bbc160f8cc84 100644
--- a/dev-util/buildbot-www/Manifest
+++ b/dev-util/buildbot-www/Manifest
@@ -1,3 +1,4 @@
+DIST buildbot-www-0.9.10.tar.gz 693452 SHA256 9083516d702feefb8b61dd6cb351a54163f3b2d4f34b14071f77f2f550de9bf6 SHA512 9ff91de09ceff6dc53619ddd7b8a233f9206b91d75f508cb82fa948451eff8146aa112bada5f1f261f3c25870867046c40a41b85a4acd3b98c00ddab76580780 WHIRLPOOL 7986ad9423d5b585a52a9b04e0fbaf98716f9bfe81f1d99fe57fef7cd84dd391347cd16acaf3684626fc5927171cebec71cf2b12c60e24f393da5d3dcedb7fba
DIST buildbot-www-0.9.4.tar.gz 691706 SHA256 eb2f48aabee5e840aa8a4fce1f95f2fe4e2ae98045f9465d275ee5e263ae04b3 SHA512 522716f4200c00c1fbf196834279caef0fa2d805c7020d31890ce4d95ade85c5fa4a605d343a4fbf0d404f3088d98a7fd3c39bea58f3b02bc9e4a6daa9e3f6c6 WHIRLPOOL 6991e6052b3e5c3fffb83f2808f0b7da4f2267c0b4aa9b3cf3b665ba2046e5f123baf18d8dfbe25780782e9230b488edf1cfee8b3c07241aa59ce99509bb735c
DIST buildbot-www-0.9.7.tar.gz 691849 SHA256 3123b1518976edbf285c2c0791719dafda59baab0103e533a54eb6ed134b78c9 SHA512 be9eaef167d354e1a028552792047ba31b475f57fc19204076f125552b5ee84770987d16894bc78ebc281b69d480e7b204d8cdaf5a4041af9ae09fb7785721ba WHIRLPOOL abee257ab8df9851bdcb047432d48648176a423337c1dbcc9c45832cb905bc58df8ba3d359b9de7367df36a251375f94f2579a984353a8747e1d256efb691676
DIST buildbot-www-0.9.8.tar.gz 691945 SHA256 d3384b942b9194f52d8855df066ae355417a52cb69dc02ba061ebeb0f996f06b SHA512 819fa74219f27c0a8a7d4b05f099d4a92e1211cd6cf212dd9db4df3fb3d2ec3bf29bd4de8a463bedb611fec5e7c82e64b3a139b77505b0b9955ee3ed1cde205f WHIRLPOOL cdfa636af9aaaee8d42425b0269cd77c2c87846333d9b62cbdae9dc513ad37bc52ebc631b4f1284e2c27f94aed78a01df84114dfa1c766102e49ead1d7806505
diff --git a/dev-util/buildbot-www/buildbot-www-0.9.10.ebuild b/dev-util/buildbot-www/buildbot-www-0.9.10.ebuild
new file mode 100644
index 000000000000..e248b15e6f78
--- /dev/null
+++ b/dev-util/buildbot-www/buildbot-www-0.9.10.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python2_7 python3_5 )
+
+EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
+
+[[ ${PV} == *9999 ]] && inherit git-r3
+inherit distutils-r1
+
+DESCRIPTION="BuildBot base web interface, use with buildbot-{console-view,waterfall-view}..."
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.python.org/pypi/buildbot-www"
+
+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=""
+
+DEPEND="${RDEPEND}
+ >=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
+ ~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
+ ~dev-util/buildbot-pkg-${PV}[${PYTHON_USEDEP}]
+ dev-python/mock[${PYTHON_USEDEP}]
+"
+
+S="${WORKDIR}/${MY_P}"
+#[[ ${PV} == *9999 ]] && S=${S}/www/base
+
+python_test() {
+ distutils_install_for_testing
+
+ esetup.py test || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+ distutils-r1_python_install_all
+}
diff --git a/dev-util/buildbot/Manifest b/dev-util/buildbot/Manifest
index a0e595b72df8..21102ff942a8 100644
--- a/dev-util/buildbot/Manifest
+++ b/dev-util/buildbot/Manifest
@@ -1,5 +1,5 @@
-DIST buildbot-0.8.10.tar.gz 4822307 SHA256 c4964d2ebd81cb80a14cb058fb2aab0572a1d8d86672d514e775b42deb08a5f4 SHA512 e148a1670a56837587d858d1697fe117661cbbfedab42bf7be905f9e8e4266e4ff0170b0cd81aed61234d30497a05427061c3084033f09811d0bc306b200661b WHIRLPOOL 26397b6f914266201aba4feb4df7353facad4fd0f51bdf7e35cf25205c45eadcf83f24c265e540b13d327750ce9561362be6a5aa237152cf1298d970c504f76c
DIST buildbot-0.8.12.tar.gz 4834352 SHA256 c6b66976dff712268566574d57131ec15e5682f6d4390cd5c8559bab0980c4d6 SHA512 18c5144132fb033f3581d3c494d5e8ff35d3e8b1548764452ce9ae543d710e58a2c6e3e8e46a0ef237804f9a6a45485890ae4616ab655fb00d4ccf328d6f6645 WHIRLPOOL 5754b7c0278fb5e7da8a7dd66253f6f4d12f54c125f6a78aa9018a2b6b22fd88a27e79e6821ab05e4cd9e87bf0dd08c3c73c7914d4c499ac13c48ca232ed21c8
+DIST buildbot-0.9.10.tar.gz 3112750 SHA256 8c5ed75f3f16f4ff0f2c9e3f9b091acb5e6e1c0ef68ffa8f687a55413a833143 SHA512 95b489d5f7d0bc00ae5f71cd056b36fe689c4dc9408a7a0e4b1b45e036c9074832c8e3755981520a8c85a791b50f7f40765962c12a71887198dc0bbd0140d0e0 WHIRLPOOL 8d62d0aecdea4122709693ce48c72d5dbac2e946a6923a7ea41842dc759369a678e21a8abb0b4ff825e1ba559a9d490bcc4ff56fc5568a4f7f2d94b4f6c5f027
DIST buildbot-0.9.4.docs.tar.xz 69224 SHA256 69fc33762a885568b02c42954a64d62d28bcb750b3aed011c3da8a9f84c13371 SHA512 906e551e0db32c8a0b4010b3b8b00c4776e3d1b7d7381e4dc0ccf01d361184e4605c3ab0ecaf4e42207bd73c3e72f8a570a4d4c29db72f4d68241abf48741d7e WHIRLPOOL 95f263e0b9ab22a649118f362d866b08cbdf62511f2a1f9bd6a7265103f174e35d0c8d86ad6a3b7dd5fd0b4277d60dbd25801c5e6f7e414e7fa634c241dae987
DIST buildbot-0.9.4.tar.gz 3020851 SHA256 068161cd9ada10b87f40117c768a37ce796ebf5e7bf08f224f4c7ded88cd7472 SHA512 938a94192560b989a277d9650c50781d7e7c116bc5e2010ccb2e655df757de0ee254369531b2f432c835c0285c724e52d999a393d0ce1b104d4b9dcc5c6687da WHIRLPOOL 0ffe61b82ee93b78cdb3cb74ef96d5a3547e0fcab9ec8093b59a7212c5e2a1ad16eff046306bffcc0ea63b2e0bf2df1e54b5a0874dc78e27744db2088ccac804
DIST buildbot-0.9.7.tar.gz 3092434 SHA256 8fcbf0e6536e5d60407f59d14f96d5f8386cd91846a4fa47b4336d71551a9e33 SHA512 3fd2b488cabac37e297bb1a475cdb115f261324a22ec4d6fbcf8dc5bfb6ee135fab3763998433be8795581d476f69e2adb6f42d248bf2131a42eecfc1667202a WHIRLPOOL 427d4c1c452f767550a3d2731b2e34480c399dcf50e57d4fb69f0a350f381e3e7ecc47d712fc8fbb99afcf8b230c7bd3afe8437ec3b24bf9ddbf7d35b4d1caad
diff --git a/dev-util/buildbot/buildbot-0.8.10.ebuild b/dev-util/buildbot/buildbot-0.8.10.ebuild
deleted file mode 100644
index 87e8bcf233e0..000000000000
--- a/dev-util/buildbot/buildbot-0.8.10.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-
-inherit distutils-r1 readme.gentoo systemd user
-
-MY_PV="${PV/_p/p}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="BuildBot build automation system"
-HOMEPAGE="http://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.python.org/pypi/buildbot"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
-IUSE="doc examples irc mail manhole test"
-
-RDEPEND=">=dev-python/jinja-2.1[${PYTHON_USEDEP}]
- dev-python/twisted-core[${PYTHON_USEDEP}]
- dev-python/twisted-web[${PYTHON_USEDEP}]
- <=dev-python/sqlalchemy-0.7.10-r999[${PYTHON_USEDEP}]
- ~dev-python/sqlalchemy-migrate-0.7.2[${PYTHON_USEDEP}]
- irc? ( dev-python/twisted-words[${PYTHON_USEDEP}] )
- mail? ( dev-python/twisted-mail[${PYTHON_USEDEP}] )
- manhole? ( dev-python/twisted-conch[${PYTHON_USEDEP}] )"
-DEPEND="${DEPEND}
- dev-python/setuptools[${PYTHON_USEDEP}]
- doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
- test? (
- dev-python/python-dateutil[${PYTHON_USEDEP}]
- dev-python/mock[${PYTHON_USEDEP}]
- dev-python/twisted-mail[${PYTHON_USEDEP}]
- dev-python/twisted-web[${PYTHON_USEDEP}]
- dev-python/twisted-words[${PYTHON_USEDEP}]
- )"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
- enewuser buildbot
-
- DOC_CONTENTS="The \"buildbot\" user and the \"buildmaster\" init script has been added
- to support starting buildbot through Gentoo's init system. To use this,
- set up your build master following the documentation, make sure the
- resulting directories are owned by the \"buildbot\" user and point
- \"${EROOT}etc/conf.d/buildmaster\" at the right location. The scripts can
- run as a different user if desired. If you need to run more than one
- build master, just copy the scripts."
-}
-
-src_compile() {
- distutils-r1_src_compile
-
- if use doc; then
- einfo "Generation of documentation"
- pushd docs > /dev/null
- #'man' target is currently broken
- emake html
- popd > /dev/null
- fi
-}
-
-src_install() {
- distutils-r1_src_install
-
- doman docs/buildbot.1
-
- if use doc; then
- dohtml -r docs/_build/html/
- # TODO: install man pages
- fi
-
- if use examples; then
- insinto /usr/share/doc/${PF}
- doins -r contrib docs/examples
- fi
-
- newconfd "${FILESDIR}/buildmaster.confd" buildmaster
- newinitd "${FILESDIR}/buildmaster.initd" buildmaster
- systemd_dounit "${FILESDIR}"/${PN}.service
-
- readme.gentoo_create_doc
-}
-
-pkg_postinst() {
- readme.gentoo_print_elog
- elog
- elog "Upstream recommends the following when upgrading:"
- elog "Each time you install a new version of Buildbot, you should run the"
- elog "\"buildbot upgrade-master\" command on each of your pre-existing build masters."
- elog "This will add files and fix (or at least detect) incompatibilities between"
- elog "your old config and the new code."
-}
diff --git a/dev-util/buildbot/buildbot-0.9.10.ebuild b/dev-util/buildbot/buildbot-0.9.10.ebuild
new file mode 100644
index 000000000000..faf2365417b5
--- /dev/null
+++ b/dev-util/buildbot/buildbot-0.9.10.ebuild
@@ -0,0 +1,201 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python2_7 python3_5 )
+
+EGIT_REPO_URI="https://github.com/buildbot/${PN}.git"
+
+[[ ${PV} == *9999 ]] && inherit git-r3
+inherit readme.gentoo-r1 user systemd distutils-r1
+
+MY_PV="${PV/_p/.post}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="BuildBot build automation system"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.python.org/pypi/buildbot"
+[[ ${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="crypt doc examples irc test"
+
+RDEPEND="
+ >=dev-python/jinja-2.1[${PYTHON_USEDEP}]
+ >=dev-python/twisted-17.5.0[${PYTHON_USEDEP}]
+ >=dev-python/autobahn-0.16.0[${PYTHON_USEDEP}]
+ >=dev-python/sqlalchemy-0.8[${PYTHON_USEDEP}]
+ >=dev-python/sqlalchemy-migrate-0.9[${PYTHON_USEDEP}]
+ crypt? (
+ >=dev-python/twisted-17.5.0[${PYTHON_USEDEP},crypt]
+ >=dev-python/pyopenssl-16.0.0[${PYTHON_USEDEP}]
+ dev-python/idna[${PYTHON_USEDEP}]
+ dev-python/service_identity[${PYTHON_USEDEP}]
+ )
+ irc? (
+ dev-python/txrequests[${PYTHON_USEDEP}]
+ )
+ dev-python/future[${PYTHON_USEDEP}]
+ >=dev-python/python-dateutil-1.5[${PYTHON_USEDEP}]
+ >=dev-python/txaio-2.2.2[${PYTHON_USEDEP}]
+ dev-python/pyjwt[${PYTHON_USEDEP}]
+ >=dev-python/zope-interface-4.1.1[${PYTHON_USEDEP}]
+ ~dev-util/buildbot-worker-${PV}[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+ >=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
+ doc? (
+ >=dev-python/sphinx-1.4.3[${PYTHON_USEDEP}]
+ dev-python/sphinxcontrib-blockdiag[${PYTHON_USEDEP}]
+ dev-python/sphinxcontrib-spelling[${PYTHON_USEDEP}]
+ dev-python/pyenchant[${PYTHON_USEDEP}]
+ >=dev-python/docutils-0.8[${PYTHON_USEDEP}]
+ <dev-python/docutils-0.13.0[${PYTHON_USEDEP}]
+ dev-python/sphinx-jinja[${PYTHON_USEDEP}]
+ dev-python/ramlfications[${PYTHON_USEDEP}]
+ )
+ test? (
+ >=dev-python/python-dateutil-1.5[${PYTHON_USEDEP}]
+ >=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+ dev-python/moto[${PYTHON_USEDEP}]
+ dev-python/boto3[${PYTHON_USEDEP}]
+ dev-python/ramlfications[${PYTHON_USEDEP}]
+ dev-python/pyjade[${PYTHON_USEDEP}]
+ dev-python/txgithub[${PYTHON_USEDEP}]
+ dev-python/txrequests[${PYTHON_USEDEP}]
+ dev-python/lz4[${PYTHON_USEDEP}]
+ dev-python/treq[${PYTHON_USEDEP}]
+ dev-python/setuptools_trial[${PYTHON_USEDEP}]
+ ~dev-util/buildbot-worker-${PV}[${PYTHON_USEDEP}]
+ )"
+
+S=${WORKDIR}/${MY_P}
+[[ ${PV} == *9999 ]] && S=${S}/master
+
+pkg_setup() {
+ enewuser buildbot
+
+ DOC_CONTENTS="The \"buildbot\" user and the \"buildmaster\" init script has been added
+ to support starting buildbot through Gentoo's init system. To use this,
+ execute \"emerge --config =${CATEGORY}/${PF}\" to create a new instance.
+ The scripts can run as a different user if desired."
+}
+
+python_prepare_all() {
+ # Disable distribution version test.
+ sed \
+ -e 's/self.assertNotIn("unknown", distro\[1\])//' \
+ -i buildbot/test/unit/test_buildbot_net_usage_data.py || die
+
+ distutils-r1_python_prepare_all
+}
+
+src_compile() {
+ distutils-r1_src_compile
+
+ if use doc; then
+ einfo "Generation of documentation"
+ pushd docs > /dev/null
+ #'man' target is currently broken
+ emake html
+ popd > /dev/null
+ fi
+}
+
+src_install() {
+ distutils-r1_src_install
+
+ doman docs/buildbot.1
+
+ if use doc; then
+ dohtml -r docs/_build/html/
+ # TODO: install man pages
+ fi
+
+ if use examples; then
+ insinto /usr/share/doc/${PF}
+ doins -r contrib docs/examples
+ fi
+
+ newconfd "${FILESDIR}/buildmaster.confd" buildmaster
+ newinitd "${FILESDIR}/buildmaster.initd" buildmaster
+ systemd_dounit "${FILESDIR}/buildmaster.target"
+ systemd_newunit "${FILESDIR}/buildmaster_at.service" "buildmaster@.service"
+ systemd_install_serviced "${FILESDIR}/buildmaster_at.service.conf" "buildmaster@.service"
+
+ readme.gentoo_create_doc
+}
+
+python_test() {
+ distutils_install_for_testing
+
+ esetup.py test || die "Tests failed under ${EPYTHON}"
+}
+
+pkg_postinst() {
+ readme.gentoo_print_elog
+
+ if [[ -n ${REPLACING_VERSIONS} ]]; then
+ ewarn
+ ewarn "Starting with buildbot-0.8.12-r2, more than one instance of buildmaster"
+ ewarn "can be run simultaneously. Note that \"BASEDIR\" in the buildbot 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 buildmaster 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/buildmaster /etc/init.d/buildmaster.myinstance"
+ ewarn " rc-update add buildmaster.myinstance default"
+ ewarn " /etc/init.d/buildmaster.myinstance start"
+ ewarn "Systems using systemd can do the following:"
+ ewarn " systemctl enable buildmaster@myinstance.service"
+ ewarn " systemctl enable buildmaster.target"
+ ewarn " systemctl start buildmaster.target"
+ elog
+ elog "Upstream recommends the following when upgrading:"
+ elog "Each time you install a new version of Buildbot, you should run the"
+ elog "\"buildbot upgrade-master\" command on each of your pre-existing build masters."
+ elog "This will add files and fix (or at least detect) incompatibilities between"
+ elog "your old config and the new code."
+ fi
+ elog
+ elog "In order to create a new instance of buildmaster, execute:"
+ elog " emerge --config =${CATEGORY}/${PF}"
+}
+
+pkg_config() {
+ local buildmaster_path="/var/lib/buildmaster"
+ einfo "This will prepare a new buildmaster instance in ${buildmaster_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="${buildmaster_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
+
+ local buildbot="/usr/bin/buildbot"
+ if [[ ! -d "${buildmaster_path}" ]]; then
+ mkdir --parents "${buildmaster_path}" || die "Unable to create directory ${buildmaster_path}"
+ fi
+ "${buildbot}" create-master "${instance_path}" &>/dev/null || die "Creating instance failed"
+ chown --recursive buildbot "${instance_path}" || die "Setting permissions for instance failed"
+ mv "${instance_path}/master.cfg.sample" "${instance_path}/master.cfg" \
+ || die "Moving sample configuration failed"
+ ln --symbolic --relative "/etc/init.d/buildmaster" "/etc/init.d/buildmaster.${instance_name}" \
+ || die "Unable to create link to init file"
+
+ einfo "Successfully created a buildmaster instance at ${instance_path}."
+ einfo "To change the default settings edit the master.cfg file in this directory."
+}
diff --git a/dev-util/buildbot/buildbot-9999.ebuild b/dev-util/buildbot/buildbot-9999.ebuild
index ed83f8319940..d3239e23f64f 100644
--- a/dev-util/buildbot/buildbot-9999.ebuild
+++ b/dev-util/buildbot/buildbot-9999.ebuild
@@ -46,7 +46,6 @@ RDEPEND="
>=dev-python/python-dateutil-1.5[${PYTHON_USEDEP}]
>=dev-python/txaio-2.2.2[${PYTHON_USEDEP}]
dev-python/pyjwt[${PYTHON_USEDEP}]
- dev-python/distro[${PYTHON_USEDEP}]
>=dev-python/zope-interface-4.1.1[${PYTHON_USEDEP}]
~dev-util/buildbot-worker-${PV}[${PYTHON_USEDEP}]
"
diff --git a/eclass/toolchain-funcs.eclass b/eclass/toolchain-funcs.eclass
index 777fce905f3e..aeb6f7c70299 100644
--- a/eclass/toolchain-funcs.eclass
+++ b/eclass/toolchain-funcs.eclass
@@ -798,7 +798,7 @@ gcc-specs-stack-check() {
# Return truth if the current compiler generates position-independent code (PIC)
# which can be linked into executables.
tc-enables-pie() {
- local ret="$($(tc-getCC) ${CPPFLAGS} ${CFLAGS} -E -P - <<-EOF 2> /dev/null
+ local ret="$($(tc-getCC) ${CPPFLAGS} ${CFLAGS} -E -P - <<-EOF 2> /dev/null | grep '^true$'
#if defined(__PIE__)
true
#endif
@@ -816,7 +816,7 @@ tc-enables-pie() {
# -fstack-protector-strong
# -fstack-protector-all
tc-enables-ssp() {
- local ret="$($(tc-getCC) ${CPPFLAGS} ${CFLAGS} -E -P - <<-EOF 2> /dev/null
+ local ret="$($(tc-getCC) ${CPPFLAGS} ${CFLAGS} -E -P - <<-EOF 2> /dev/null | grep '^true$'
#if defined(__SSP__) || defined(__SSP_STRONG__) || defined(__SSP_ALL__)
true
#endif
@@ -833,7 +833,7 @@ tc-enables-ssp() {
# -fstack-protector-strong
# -fstack-protector-all
tc-enables-ssp-strong() {
- local ret="$($(tc-getCC) ${CPPFLAGS} ${CFLAGS} -E -P - <<-EOF 2> /dev/null
+ local ret="$($(tc-getCC) ${CPPFLAGS} ${CFLAGS} -E -P - <<-EOF 2> /dev/null | grep '^true$'
#if defined(__SSP_STRONG__) || defined(__SSP_ALL__)
true
#endif
@@ -849,7 +849,7 @@ tc-enables-ssp-strong() {
# on level corresponding to any of the following options:
# -fstack-protector-all
tc-enables-ssp-all() {
- local ret="$($(tc-getCC) ${CPPFLAGS} ${CFLAGS} -E -P - <<-EOF 2> /dev/null
+ local ret="$($(tc-getCC) ${CPPFLAGS} ${CFLAGS} -E -P - <<-EOF 2> /dev/null | grep '^true$'
#if defined(__SSP_ALL__)
true
#endif
diff --git a/www-client/google-chrome-beta/Manifest b/www-client/google-chrome-beta/Manifest
index 369c8b39f452..61bc7731f7b5 100644
--- a/www-client/google-chrome-beta/Manifest
+++ b/www-client/google-chrome-beta/Manifest
@@ -1 +1 @@
-DIST google-chrome-beta_61.0.3163.31-1_amd64.deb 76196422 SHA256 c90b766fabb453e343dd6429a6f5cc8052c87102b39ab771bc9e0887b860c9d7 SHA512 58f2e082bee219ed23748b4c1b7281faae9589436825674e42936d08cec97e6270b6defabeba5056e085f0fe1a65cd5a70412521e1fd53cfca2707fa84868d9f WHIRLPOOL da0ec7d1a2f92f5acf40234f51be3f9a7e049fa9e7746231b26c7e61d7e7ce5eca9901cac34d290a305a21e538af21f8e60a1836a00e86cac0468e44c3150405
+DIST google-chrome-beta_61.0.3163.39-1_amd64.deb 76821968 SHA256 582ecb2679b9bb724cfd3f5434195511440ed969277d127669e04feeec216f3a SHA512 679c4c0cca993d3bbee20b0e43b1f8ed7fc196ba2dc8b598d749a8abd19546bebe81f2fbd93257beaa5c0e1fe61ba8118a3c251b8db8391ed887cac411f485b7 WHIRLPOOL de560e7525cf4b8d504d82046c19714341ca6e1c4910a5f1daa9dffe32fcb0c066826ce44180d649a79d98df888876824c365df61ba7a08a328cb3699c77c7b2
diff --git a/www-client/google-chrome-beta/google-chrome-beta-61.0.3163.31.ebuild b/www-client/google-chrome-beta/google-chrome-beta-61.0.3163.39.ebuild
index 15a697bab362..15a697bab362 100644
--- a/www-client/google-chrome-beta/google-chrome-beta-61.0.3163.31.ebuild
+++ b/www-client/google-chrome-beta/google-chrome-beta-61.0.3163.39.ebuild
diff --git a/www-plugins/chrome-binary-plugins/Manifest b/www-plugins/chrome-binary-plugins/Manifest
index b31b21489c96..9a459f2107aa 100644
--- a/www-plugins/chrome-binary-plugins/Manifest
+++ b/www-plugins/chrome-binary-plugins/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-beta_61.0.3163.31-1_amd64.deb 76196422 SHA256 c90b766fabb453e343dd6429a6f5cc8052c87102b39ab771bc9e0887b860c9d7 SHA512 58f2e082bee219ed23748b4c1b7281faae9589436825674e42936d08cec97e6270b6defabeba5056e085f0fe1a65cd5a70412521e1fd53cfca2707fa84868d9f WHIRLPOOL da0ec7d1a2f92f5acf40234f51be3f9a7e049fa9e7746231b26c7e61d7e7ce5eca9901cac34d290a305a21e538af21f8e60a1836a00e86cac0468e44c3150405
+DIST google-chrome-beta_61.0.3163.39-1_amd64.deb 76821968 SHA256 582ecb2679b9bb724cfd3f5434195511440ed969277d127669e04feeec216f3a SHA512 679c4c0cca993d3bbee20b0e43b1f8ed7fc196ba2dc8b598d749a8abd19546bebe81f2fbd93257beaa5c0e1fe61ba8118a3c251b8db8391ed887cac411f485b7 WHIRLPOOL de560e7525cf4b8d504d82046c19714341ca6e1c4910a5f1daa9dffe32fcb0c066826ce44180d649a79d98df888876824c365df61ba7a08a328cb3699c77c7b2
DIST google-chrome-stable_60.0.3112.90-1_amd64.deb 58348198 SHA256 936eb6dbf6062b4a375593d3289375d3f7823d3168673534f54f037d632283d3 SHA512 27d3ca3b6199fa17c9e569ed52b58b70525bef04add845000145db7289f9bbeb893b743827e42f95113391f9287778b36fd3f5cd69d94aa32720edf810aa3bfd WHIRLPOOL ef1f22524844c313d3e94de8fe6b06fed173d568226eef6f4b31bee954e55e094f2b73fc2d1993c3aa63e3faa7adbcf34e6547d40df2a0575ad9a6abffb9077c
DIST google-chrome-unstable_62.0.3178.0-1_amd64.deb 48800018 SHA256 10b021a3dc9c640b61a59671ceb1335f5c4eb3ceb831dbcb2ec5f6fe8981eeff SHA512 307b5d1f86fe6240a2db0357204352e623af1c8042dcbf9b3a8f4c2c0a52ac6515f8f669a9258db2f945b7a9868b145c548106c2e09908a250dd150dc171d7c4 WHIRLPOOL 8328a060fb4d3c998405bb6f37ef74f70e6af2ff5c20ce19a3febe2ac2bbac8b2b5b218d0684233d1fb4c5340b30872f0136fa792151b6144988e69a59c26866
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-61.0.3163.31_beta.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-61.0.3163.39_beta.ebuild
index fb901aa5d5d9..fb901aa5d5d9 100644
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-61.0.3163.31_beta.ebuild
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-61.0.3163.39_beta.ebuild