[gentoo-commits] repo/gentoo:master commit in: dev-util/buildbot-prometheus/files/, profiles/updates/, ...

2018-03-27 Thread Manuel Rüger 
commit: 8bc3a018a783b7c6026a55e945c795212db1b688
Author: Manuel Rüger  gentoo  org>
AuthorDate: Tue Mar 27 13:43:32 2018 +
Commit: Manuel Rüger  gentoo  org>
CommitDate: Tue Mar 27 14:10:55 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8bc3a018

app-metrics/buildbot-prometheus: Move package from dev-util/buildbot-prometheus

 {dev-util => app-metrics}/buildbot-prometheus/Manifest   | 0
 .../buildbot-prometheus/buildbot-prometheus-17.7.2-r1.ebuild | 0
 .../buildbot-prometheus/buildbot-prometheus-17.7.2-r2.ebuild | 0
 .../buildbot-prometheus/buildbot-prometheus-17.7.2.ebuild| 0
 ...-prometheus-17.7.2-Migrate-duration-calculations-to-buildbot-09.patch | 0
 {dev-util => app-metrics}/buildbot-prometheus/metadata.xml   | 0
 profiles/updates/1Q-2018 | 1 +
 7 files changed, 1 insertion(+)

diff --git a/dev-util/buildbot-prometheus/Manifest 
b/app-metrics/buildbot-prometheus/Manifest
similarity index 100%
rename from dev-util/buildbot-prometheus/Manifest
rename to app-metrics/buildbot-prometheus/Manifest

diff --git a/dev-util/buildbot-prometheus/buildbot-prometheus-17.7.2-r1.ebuild 
b/app-metrics/buildbot-prometheus/buildbot-prometheus-17.7.2-r1.ebuild
similarity index 100%
rename from dev-util/buildbot-prometheus/buildbot-prometheus-17.7.2-r1.ebuild
rename to app-metrics/buildbot-prometheus/buildbot-prometheus-17.7.2-r1.ebuild

diff --git a/dev-util/buildbot-prometheus/buildbot-prometheus-17.7.2-r2.ebuild 
b/app-metrics/buildbot-prometheus/buildbot-prometheus-17.7.2-r2.ebuild
similarity index 100%
rename from dev-util/buildbot-prometheus/buildbot-prometheus-17.7.2-r2.ebuild
rename to app-metrics/buildbot-prometheus/buildbot-prometheus-17.7.2-r2.ebuild

diff --git a/dev-util/buildbot-prometheus/buildbot-prometheus-17.7.2.ebuild 
b/app-metrics/buildbot-prometheus/buildbot-prometheus-17.7.2.ebuild
similarity index 100%
rename from dev-util/buildbot-prometheus/buildbot-prometheus-17.7.2.ebuild
rename to app-metrics/buildbot-prometheus/buildbot-prometheus-17.7.2.ebuild

diff --git 
a/dev-util/buildbot-prometheus/files/buildbot-prometheus-17.7.2-Migrate-duration-calculations-to-buildbot-09.patch
 
b/app-metrics/buildbot-prometheus/files/buildbot-prometheus-17.7.2-Migrate-duration-calculations-to-buildbot-09.patch
similarity index 100%
rename from 
dev-util/buildbot-prometheus/files/buildbot-prometheus-17.7.2-Migrate-duration-calculations-to-buildbot-09.patch
rename to 
app-metrics/buildbot-prometheus/files/buildbot-prometheus-17.7.2-Migrate-duration-calculations-to-buildbot-09.patch

diff --git a/dev-util/buildbot-prometheus/metadata.xml 
b/app-metrics/buildbot-prometheus/metadata.xml
similarity index 100%
rename from dev-util/buildbot-prometheus/metadata.xml
rename to app-metrics/buildbot-prometheus/metadata.xml

diff --git a/profiles/updates/1Q-2018 b/profiles/updates/1Q-2018
index 6ef8771520f..49fd89ff026 100644
--- a/profiles/updates/1Q-2018
+++ b/profiles/updates/1Q-2018
@@ -14,3 +14,4 @@ move app-admin/nginx-vts-exporter 
app-metrics/nginx-vts-exporter
 move app-admin/prom2json app-metrics/prom2json
 move net-analyzer/prometheus app-metrics/prometheus
 move net-analyzer/prometheus-alertmanager app-metrics/alertmanager
+move dev-util/buildbot-prometheus app-metrics/buildbot-prometheus

[gentoo-commits] repo/gentoo:master commit in: dev-util/buildbot-prometheus/files/, dev-util/buildbot-prometheus/

2018-03-13 Thread Brian Dolbec 
commit: c63f7c6af40310a9043d089a4886b6defc4793bd
Author: Brian Dolbec  gentoo  org>
AuthorDate: Tue Mar  6 03:50:35 2018 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Tue Mar 13 23:56:27 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c63f7c6a

dev-util/buildbot-prometheus: Revision bump, patch for >=buildbot-0.9.0

Adjust buildbot dep accordingly

Package-Manager: Portage-2.3.13, Repoman-2.3.3

 .../buildbot-prometheus-17.7.2-r1.ebuild   |  4 ++
 ...ebuild => buildbot-prometheus-17.7.2-r2.ebuild} | 11 -
 ...rate-duration-calculations-to-buildbot-09.patch | 52 ++
 dev-util/buildbot-prometheus/metadata.xml  |  4 ++
 4 files changed, 70 insertions(+), 1 deletion(-)

diff --git a/dev-util/buildbot-prometheus/buildbot-prometheus-17.7.2-r1.ebuild 
b/dev-util/buildbot-prometheus/buildbot-prometheus-17.7.2-r1.ebuild
index a930624175f..f6c6bd792ce 100644
--- a/dev-util/buildbot-prometheus/buildbot-prometheus-17.7.2-r1.ebuild
+++ b/dev-util/buildbot-prometheus/buildbot-prometheus-17.7.2-r1.ebuild
@@ -20,6 +20,10 @@ RDEPEND="dev-python/prometheus_client[${PYTHON_USEDEP}]
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
${RDEPEND}"
 
+PATCHES=(
+   
"$FILESDIR}/buildbot-prometheus-17.7.2-Migrate-duration-calculations-to-buildbot-09.patch"
+)
+
 python_prepare_all() {
sed -i -e "/^install_reqs.*$/d" -e "/^from pip.*$/d" -e "s/requires = 
.*/requires = ['buildbot', 'prometheus_client']/" setup.py || die
distutils-r1_python_prepare_all

diff --git a/dev-util/buildbot-prometheus/buildbot-prometheus-17.7.2-r1.ebuild 
b/dev-util/buildbot-prometheus/buildbot-prometheus-17.7.2-r2.ebuild
similarity index 66%
copy from dev-util/buildbot-prometheus/buildbot-prometheus-17.7.2-r1.ebuild
copy to dev-util/buildbot-prometheus/buildbot-prometheus-17.7.2-r2.ebuild
index a930624175f..67323d1dbef 100644
--- a/dev-util/buildbot-prometheus/buildbot-prometheus-17.7.2-r1.ebuild
+++ b/dev-util/buildbot-prometheus/buildbot-prometheus-17.7.2-r2.ebuild
@@ -16,11 +16,20 @@ KEYWORDS="~amd64"
 IUSE=""
 
 RDEPEND="dev-python/prometheus_client[${PYTHON_USEDEP}]
-   dev-util/buildbot[${PYTHON_USEDEP}]"
+   >=dev-util/buildbot-0.9.0[${PYTHON_USEDEP}]"
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
${RDEPEND}"
 
+PATCHES=(
+   
"${FILESDIR}/buildbot-prometheus-17.7.2-Migrate-duration-calculations-to-buildbot-09.patch"
+)
+
 python_prepare_all() {
sed -i -e "/^install_reqs.*$/d" -e "/^from pip.*$/d" -e "s/requires = 
.*/requires = ['buildbot', 'prometheus_client']/" setup.py || die
distutils-r1_python_prepare_all
 }
+
+pkg_postinst() {
+   einfo "This version has been patched to be compatible with the current 
buildbot releases >=0.9.0"
+   einfo "For older buildbot-0.8* releases, please use 
dev-python/buildbot-prometheus-17.7.2-r1 version"
+}

diff --git 
a/dev-util/buildbot-prometheus/files/buildbot-prometheus-17.7.2-Migrate-duration-calculations-to-buildbot-09.patch
 
b/dev-util/buildbot-prometheus/files/buildbot-prometheus-17.7.2-Migrate-duration-calculations-to-buildbot-09.patch
new file mode 100644
index 000..0ba69478ac7
--- /dev/null
+++ 
b/dev-util/buildbot-prometheus/files/buildbot-prometheus-17.7.2-Migrate-duration-calculations-to-buildbot-09.patch
@@ -0,0 +1,52 @@
+From ceddea3f55773e104c628ef6316ce74785d235f3 Mon Sep 17 00:00:00 2001
+From: �RӨ < _�>
+Date: Tue, 6 Mar 2018 02:30:56 +
+Subject: [PATCH] Migrate duration calculations to >=buildbot-0.9
+
+---
+ buildbot_prometheus/prometheus.py | 8 
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/buildbot_prometheus/prometheus.py 
b/buildbot_prometheus/prometheus.py
+index a766f41..ebf41a1 100644
+--- a/buildbot_prometheus/prometheus.py
 b/buildbot_prometheus/prometheus.py
+@@ -302,7 +302,7 @@ class Prometheus(service.BuildbotService):
+ build_started = msg['started_at']
+ build_finished = msg['complete_at']
+ build_duration = build_finished - build_started
+-duration_seconds = build_duration.total_seconds()
++duration_seconds = build_duration
+ self.g_builds_duration.labels(**labels).set(duration_seconds)
+ 
+ build_status = resolve_results_status(msg['results'])
+@@ -401,7 +401,7 @@ class Prometheus(service.BuildbotService):
+ buildset_started = msg['submitted_at']
+ buildset_finished = msg['complete_at']
+ buildset_duration = buildset_finished - buildset_started
+-duration_seconds = buildset_duration.total_seconds()
++duration_seconds = buildset_duration
+ self.g_buildsets_duration.labels(**labels).set(duration_seconds)
+ 
+ bs_success = resolve_results_status(msg['results'])
+@@ -444,7 +444,7 @@ class Prometheus(service.BuildbotService):
+ br_started = msg['submitted_at']
+ br_finished = msg['complet

[gentoo-commits] repo/gentoo:master commit in: dev-util/buildbot-prometheus/

2018-03-02 Thread Manuel Rüger 
commit: 64a9702a67f63b58a159139bbe395595c864404a
Author: Manuel Rüger  gentoo  org>
AuthorDate: Fri Mar  2 13:14:16 2018 +
Commit: Manuel Rüger  gentoo  org>
CommitDate: Fri Mar  2 13:14:16 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64a9702a

dev-util/buildbot-prometheus: Drop dependency on pip

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 ...rometheus-17.7.2.ebuild => buildbot-prometheus-17.7.2-r1.ebuild} | 6 +-
 dev-util/buildbot-prometheus/buildbot-prometheus-17.7.2.ebuild  | 6 +-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/dev-util/buildbot-prometheus/buildbot-prometheus-17.7.2.ebuild 
b/dev-util/buildbot-prometheus/buildbot-prometheus-17.7.2-r1.ebuild
similarity index 75%
copy from dev-util/buildbot-prometheus/buildbot-prometheus-17.7.2.ebuild
copy to dev-util/buildbot-prometheus/buildbot-prometheus-17.7.2-r1.ebuild
index e84caf19914..a930624175f 100644
--- a/dev-util/buildbot-prometheus/buildbot-prometheus-17.7.2.ebuild
+++ b/dev-util/buildbot-prometheus/buildbot-prometheus-17.7.2-r1.ebuild
@@ -18,5 +18,9 @@ IUSE=""
 RDEPEND="dev-python/prometheus_client[${PYTHON_USEDEP}]
dev-util/buildbot[${PYTHON_USEDEP}]"
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-   dev-python/pip[${PYTHON_USEDEP}]
${RDEPEND}"
+
+python_prepare_all() {
+   sed -i -e "/^install_reqs.*$/d" -e "/^from pip.*$/d" -e "s/requires = 
.*/requires = ['buildbot', 'prometheus_client']/" setup.py || die
+   distutils-r1_python_prepare_all
+}

diff --git a/dev-util/buildbot-prometheus/buildbot-prometheus-17.7.2.ebuild 
b/dev-util/buildbot-prometheus/buildbot-prometheus-17.7.2.ebuild
index e84caf19914..a930624175f 100644
--- a/dev-util/buildbot-prometheus/buildbot-prometheus-17.7.2.ebuild
+++ b/dev-util/buildbot-prometheus/buildbot-prometheus-17.7.2.ebuild
@@ -18,5 +18,9 @@ IUSE=""
 RDEPEND="dev-python/prometheus_client[${PYTHON_USEDEP}]
dev-util/buildbot[${PYTHON_USEDEP}]"
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-   dev-python/pip[${PYTHON_USEDEP}]
${RDEPEND}"
+
+python_prepare_all() {
+   sed -i -e "/^install_reqs.*$/d" -e "/^from pip.*$/d" -e "s/requires = 
.*/requires = ['buildbot', 'prometheus_client']/" setup.py || die
+   distutils-r1_python_prepare_all
+}

[gentoo-commits] repo/gentoo:master commit in: dev-util/buildbot-prometheus/

2018-01-24 Thread Manuel Rüger 
commit: 63238087899314bbe4b5db4b3cd8208e26f97b41
Author: Manuel Rüger  gentoo  org>
AuthorDate: Wed Jan 24 18:22:15 2018 +
Commit: Manuel Rüger  gentoo  org>
CommitDate: Wed Jan 24 18:23:12 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63238087

dev-util/buildbot-prometheus: Fix missing dependency on pip

Closes: https://bugs.gentoo.org/645582
Package-Manager: Portage-2.3.19, Repoman-2.3.6

 dev-util/buildbot-prometheus/buildbot-prometheus-17.7.2.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dev-util/buildbot-prometheus/buildbot-prometheus-17.7.2.ebuild 
b/dev-util/buildbot-prometheus/buildbot-prometheus-17.7.2.ebuild
index 4a401d88a64..e84caf19914 100644
--- a/dev-util/buildbot-prometheus/buildbot-prometheus-17.7.2.ebuild
+++ b/dev-util/buildbot-prometheus/buildbot-prometheus-17.7.2.ebuild
@@ -18,4 +18,5 @@ IUSE=""
 RDEPEND="dev-python/prometheus_client[${PYTHON_USEDEP}]
dev-util/buildbot[${PYTHON_USEDEP}]"
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+   dev-python/pip[${PYTHON_USEDEP}]
${RDEPEND}"

[gentoo-commits] repo/gentoo:master commit in: dev-util/buildbot-prometheus/

2018-01-23 Thread Manuel Rüger 
commit: 37562fdd465ac2164abb43fd3d4bff23253efe89
Author: Manuel Rüger  gentoo  org>
AuthorDate: Tue Jan 23 13:07:17 2018 +
Commit: Manuel Rüger  gentoo  org>
CommitDate: Tue Jan 23 15:11:53 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37562fdd

dev-util/buildbot-prometheus: Initial version

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 dev-util/buildbot-prometheus/Manifest   |  1 +
 .../buildbot-prometheus-17.7.2.ebuild   | 21 +
 dev-util/buildbot-prometheus/metadata.xml   | 12 
 3 files changed, 34 insertions(+)

diff --git a/dev-util/buildbot-prometheus/Manifest 
b/dev-util/buildbot-prometheus/Manifest
new file mode 100644
index 000..0cc6923df04
--- /dev/null
+++ b/dev-util/buildbot-prometheus/Manifest
@@ -0,0 +1 @@
+DIST buildbot-prometheus-17.7.2.tar.gz 10101 BLAKE2B 
25c060b5368aa1dea6145b6d380db8001f3cd1fb49f9b3bb1e4ecccdb771591abc269d5aee9d022a9b182b19650a0c398b580004f20def0675b86ca9f3a1e2db
 SHA512 
8a0ecaf57eade3d69fabc57a19a1c02af8e398c3bc4732e40f39e8904a16c9b751d4f6f8ace0dd7893b380d1ffc8a51360279aeb7b4059a6cd9438145344e74b

diff --git a/dev-util/buildbot-prometheus/buildbot-prometheus-17.7.2.ebuild 
b/dev-util/buildbot-prometheus/buildbot-prometheus-17.7.2.ebuild
new file mode 100644
index 000..4a401d88a64
--- /dev/null
+++ b/dev-util/buildbot-prometheus/buildbot-prometheus-17.7.2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
+inherit distutils-r1
+
+DESCRIPTION="A Prometheus metrics exporter for Buildbot"
+HOMEPAGE="https://github.com/claws/buildbot-prometheus";
+SRC_URI="https://github.com/claws/buildbot-prometheus/archive/${PV}.tar.gz -> 
${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="dev-python/prometheus_client[${PYTHON_USEDEP}]
+   dev-util/buildbot[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+   ${RDEPEND}"

diff --git a/dev-util/buildbot-prometheus/metadata.xml 
b/dev-util/buildbot-prometheus/metadata.xml
new file mode 100644
index 000..688a3484930
--- /dev/null
+++ b/dev-util/buildbot-prometheus/metadata.xml
@@ -0,0 +1,12 @@
+
+http://www.gentoo.org/dtd/metadata.dtd";>
+
+   
+   mr...@gentoo.org
+   Manuel Rüger
+   
+   
+   buildbot-prometheus
+   claws/buildbot-prometheus
+   
+