From d87262dd706fec50cd150aab3e93883b6337466d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Jul 2018 20:56:41 +0100 Subject: gentoo resync : 14.07.2018 --- app-metrics/buildbot-prometheus/Manifest | 4 -- .../buildbot-prometheus-17.7.2-r2.ebuild | 35 --------------- ...rate-duration-calculations-to-buildbot-09.patch | 52 ---------------------- app-metrics/buildbot-prometheus/metadata.xml | 16 ------- 4 files changed, 107 deletions(-) delete mode 100644 app-metrics/buildbot-prometheus/Manifest delete mode 100644 app-metrics/buildbot-prometheus/buildbot-prometheus-17.7.2-r2.ebuild delete mode 100644 app-metrics/buildbot-prometheus/files/buildbot-prometheus-17.7.2-Migrate-duration-calculations-to-buildbot-09.patch delete mode 100644 app-metrics/buildbot-prometheus/metadata.xml (limited to 'app-metrics/buildbot-prometheus') diff --git a/app-metrics/buildbot-prometheus/Manifest b/app-metrics/buildbot-prometheus/Manifest deleted file mode 100644 index c37d724464f8..000000000000 --- a/app-metrics/buildbot-prometheus/Manifest +++ /dev/null @@ -1,4 +0,0 @@ -AUX buildbot-prometheus-17.7.2-Migrate-duration-calculations-to-buildbot-09.patch 2430 BLAKE2B 1c7cc11d95301cf119b3cf0a1d9b1c0af9e48fd486a03350138d97c625abcb72e0f13b0eb4c826341f4e9a6938a708f0afee4c1cd36750a99580a34b23aa290b SHA512 ef63fbfabe5bef28eae222dca2509e24f5f1ec3aa71aa3af3c0092cf78cb9efe58296d54e46760c43ecd38c3d9ab741d1c83c79f2eee7f96572a82f125a389b6 -DIST buildbot-prometheus-17.7.2.tar.gz 10101 BLAKE2B 25c060b5368aa1dea6145b6d380db8001f3cd1fb49f9b3bb1e4ecccdb771591abc269d5aee9d022a9b182b19650a0c398b580004f20def0675b86ca9f3a1e2db SHA512 8a0ecaf57eade3d69fabc57a19a1c02af8e398c3bc4732e40f39e8904a16c9b751d4f6f8ace0dd7893b380d1ffc8a51360279aeb7b4059a6cd9438145344e74b -EBUILD buildbot-prometheus-17.7.2-r2.ebuild 1122 BLAKE2B 4ed47d8f6f252be8866c997639f7380d0ecf33f7813c1c08b7f6fd83837b216dac116cc78bdd3e5d892ba8a8952f65564919b59286d1375b2b09f42b36065f51 SHA512 b72291f2d007542bd510e3f2f2b0bd42439d3c70583909a742a02a209e9f8507850597512222acfb99f355b4dcedb51777b7f1c67177fccd5bd2a1373b9e3d2e -MISC metadata.xml 498 BLAKE2B e2cfffddc7ee5bcf879529fea9c97b2c5f93134c16b57dcac5a9f445cba4097f001f973668d82a9a619a524e03da6d79f8910a76637ed1070beb742ad25599c1 SHA512 6a99e044eef36810ef2dee8b090e852ec9518fb8cc8a019257543e77200aae69faf0e0e89f54d562be701dd8f5ebae9d90af860e3bdc3c54fa079e669af16202 diff --git a/app-metrics/buildbot-prometheus/buildbot-prometheus-17.7.2-r2.ebuild b/app-metrics/buildbot-prometheus/buildbot-prometheus-17.7.2-r2.ebuild deleted file mode 100644 index 67323d1dbeff..000000000000 --- a/app-metrics/buildbot-prometheus/buildbot-prometheus-17.7.2-r2.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# 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-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/app-metrics/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 deleted file mode 100644 index 7fbdbdd09133..000000000000 --- a/app-metrics/buildbot-prometheus/files/buildbot-prometheus-17.7.2-Migrate-duration-calculations-to-buildbot-09.patch +++ /dev/null @@ -1,52 +0,0 @@ -From ceddea3f55773e104c628ef6316ce74785d235f3 Mon Sep 17 00:00:00 2001 -From: Brian Dolbec -Date: Tue, 6 Mar 2018 02:30:56 +0000 -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['complete_at'] - br_duration = br_finished - br_started -- duration_seconds = br_duration.total_seconds() -+ duration_seconds = br_duration - self.g_build_requests_duration.labels(**labels).set(duration_seconds) - - br_success = resolve_results_status(msg['results']) -@@ -491,7 +491,7 @@ class Prometheus(service.BuildbotService): - step_started = msg['started_at'] - step_finished = msg['complete_at'] - step_duration = step_finished - step_started -- duration_seconds = step_duration.total_seconds() -+ duration_seconds = step_duration - self.g_steps_duration.labels(**labels).set(duration_seconds) - - step_success = resolve_results_status(msg['results']) --- -libgit2 0.24.6 - diff --git a/app-metrics/buildbot-prometheus/metadata.xml b/app-metrics/buildbot-prometheus/metadata.xml deleted file mode 100644 index 81ebfb154a13..000000000000 --- a/app-metrics/buildbot-prometheus/metadata.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - mrueg@gentoo.org - Manuel Rüger - - - dolsen@gentoo.org - Brian Dolbec - - - buildbot-prometheus - claws/buildbot-prometheus - - -- cgit v1.2.3