| 1 |
commit: bc8bdd812f7407d420063c877f71a1d2e9058858 |
| 2 |
Author: Aaron Bauman <bman <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Jun 27 00:40:09 2020 +0000 |
| 4 |
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jun 27 00:40:09 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc8bdd81 |
| 7 |
|
| 8 |
app-metrics/buildbot-prometheus: drop last-rited pkg |
| 9 |
|
| 10 |
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org> |
| 11 |
|
| 12 |
app-metrics/buildbot-prometheus/Manifest | 1 - |
| 13 |
.../buildbot-prometheus-17.7.2-r2.ebuild | 35 --------------- |
| 14 |
...rate-duration-calculations-to-buildbot-09.patch | 52 ---------------------- |
| 15 |
app-metrics/buildbot-prometheus/metadata.xml | 9 ---- |
| 16 |
profiles/package.mask | 6 --- |
| 17 |
5 files changed, 103 deletions(-) |
| 18 |
|
| 19 |
diff --git a/app-metrics/buildbot-prometheus/Manifest b/app-metrics/buildbot-prometheus/Manifest |
| 20 |
deleted file mode 100644 |
| 21 |
index 0cc6923df04..00000000000 |
| 22 |
--- a/app-metrics/buildbot-prometheus/Manifest |
| 23 |
+++ /dev/null |
| 24 |
@@ -1 +0,0 @@ |
| 25 |
-DIST buildbot-prometheus-17.7.2.tar.gz 10101 BLAKE2B 25c060b5368aa1dea6145b6d380db8001f3cd1fb49f9b3bb1e4ecccdb771591abc269d5aee9d022a9b182b19650a0c398b580004f20def0675b86ca9f3a1e2db SHA512 8a0ecaf57eade3d69fabc57a19a1c02af8e398c3bc4732e40f39e8904a16c9b751d4f6f8ace0dd7893b380d1ffc8a51360279aeb7b4059a6cd9438145344e74b |
| 26 |
|
| 27 |
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 |
| 28 |
deleted file mode 100644 |
| 29 |
index 739ad58b123..00000000000 |
| 30 |
--- a/app-metrics/buildbot-prometheus/buildbot-prometheus-17.7.2-r2.ebuild |
| 31 |
+++ /dev/null |
| 32 |
@@ -1,35 +0,0 @@ |
| 33 |
-# Copyright 1999-2020 Gentoo Authors |
| 34 |
-# Distributed under the terms of the GNU General Public License v2 |
| 35 |
- |
| 36 |
-EAPI=6 |
| 37 |
- |
| 38 |
-PYTHON_COMPAT=( python3_6 ) |
| 39 |
-inherit distutils-r1 |
| 40 |
- |
| 41 |
-DESCRIPTION="A Prometheus metrics exporter for Buildbot" |
| 42 |
-HOMEPAGE="https://github.com/claws/buildbot-prometheus" |
| 43 |
-SRC_URI="https://github.com/claws/buildbot-prometheus/archive/${PV}.tar.gz -> ${P}.tar.gz" |
| 44 |
- |
| 45 |
-LICENSE="MIT" |
| 46 |
-SLOT="0" |
| 47 |
-KEYWORDS="~amd64" |
| 48 |
-IUSE="" |
| 49 |
- |
| 50 |
-RDEPEND="dev-python/prometheus_client[${PYTHON_USEDEP}] |
| 51 |
- >=dev-util/buildbot-0.9.0[${PYTHON_USEDEP}]" |
| 52 |
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] |
| 53 |
- ${RDEPEND}" |
| 54 |
- |
| 55 |
-PATCHES=( |
| 56 |
- "${FILESDIR}/buildbot-prometheus-17.7.2-Migrate-duration-calculations-to-buildbot-09.patch" |
| 57 |
-) |
| 58 |
- |
| 59 |
-python_prepare_all() { |
| 60 |
- sed -i -e "/^install_reqs.*$/d" -e "/^from pip.*$/d" -e "s/requires = .*/requires = ['buildbot', 'prometheus_client']/" setup.py || die |
| 61 |
- distutils-r1_python_prepare_all |
| 62 |
-} |
| 63 |
- |
| 64 |
-pkg_postinst() { |
| 65 |
- einfo "This version has been patched to be compatible with the current buildbot releases >=0.9.0" |
| 66 |
- einfo "For older buildbot-0.8* releases, please use dev-python/buildbot-prometheus-17.7.2-r1 version" |
| 67 |
-} |
| 68 |
|
| 69 |
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 |
| 70 |
deleted file mode 100644 |
| 71 |
index 7fbdbdd0913..00000000000 |
| 72 |
--- a/app-metrics/buildbot-prometheus/files/buildbot-prometheus-17.7.2-Migrate-duration-calculations-to-buildbot-09.patch |
| 73 |
+++ /dev/null |
| 74 |
@@ -1,52 +0,0 @@ |
| 75 |
-From ceddea3f55773e104c628ef6316ce74785d235f3 Mon Sep 17 00:00:00 2001 |
| 76 |
-From: Brian Dolbec <brian.dolbec@××××.com> |
| 77 |
-Date: Tue, 6 Mar 2018 02:30:56 +0000 |
| 78 |
-Subject: [PATCH] Migrate duration calculations to >=buildbot-0.9 |
| 79 |
- |
| 80 |
---- |
| 81 |
- buildbot_prometheus/prometheus.py | 8 ++++---- |
| 82 |
- 1 file changed, 4 insertions(+), 4 deletions(-) |
| 83 |
- |
| 84 |
-diff --git a/buildbot_prometheus/prometheus.py b/buildbot_prometheus/prometheus.py |
| 85 |
-index a766f41..ebf41a1 100644 |
| 86 |
---- a/buildbot_prometheus/prometheus.py |
| 87 |
-+++ b/buildbot_prometheus/prometheus.py |
| 88 |
-@@ -302,7 +302,7 @@ class Prometheus(service.BuildbotService): |
| 89 |
- build_started = msg['started_at'] |
| 90 |
- build_finished = msg['complete_at'] |
| 91 |
- build_duration = build_finished - build_started |
| 92 |
-- duration_seconds = build_duration.total_seconds() |
| 93 |
-+ duration_seconds = build_duration |
| 94 |
- self.g_builds_duration.labels(**labels).set(duration_seconds) |
| 95 |
- |
| 96 |
- build_status = resolve_results_status(msg['results']) |
| 97 |
-@@ -401,7 +401,7 @@ class Prometheus(service.BuildbotService): |
| 98 |
- buildset_started = msg['submitted_at'] |
| 99 |
- buildset_finished = msg['complete_at'] |
| 100 |
- buildset_duration = buildset_finished - buildset_started |
| 101 |
-- duration_seconds = buildset_duration.total_seconds() |
| 102 |
-+ duration_seconds = buildset_duration |
| 103 |
- self.g_buildsets_duration.labels(**labels).set(duration_seconds) |
| 104 |
- |
| 105 |
- bs_success = resolve_results_status(msg['results']) |
| 106 |
-@@ -444,7 +444,7 @@ class Prometheus(service.BuildbotService): |
| 107 |
- br_started = msg['submitted_at'] |
| 108 |
- br_finished = msg['complete_at'] |
| 109 |
- br_duration = br_finished - br_started |
| 110 |
-- duration_seconds = br_duration.total_seconds() |
| 111 |
-+ duration_seconds = br_duration |
| 112 |
- self.g_build_requests_duration.labels(**labels).set(duration_seconds) |
| 113 |
- |
| 114 |
- br_success = resolve_results_status(msg['results']) |
| 115 |
-@@ -491,7 +491,7 @@ class Prometheus(service.BuildbotService): |
| 116 |
- step_started = msg['started_at'] |
| 117 |
- step_finished = msg['complete_at'] |
| 118 |
- step_duration = step_finished - step_started |
| 119 |
-- duration_seconds = step_duration.total_seconds() |
| 120 |
-+ duration_seconds = step_duration |
| 121 |
- self.g_steps_duration.labels(**labels).set(duration_seconds) |
| 122 |
- |
| 123 |
- step_success = resolve_results_status(msg['results']) |
| 124 |
--- |
| 125 |
-libgit2 0.24.6 |
| 126 |
- |
| 127 |
|
| 128 |
diff --git a/app-metrics/buildbot-prometheus/metadata.xml b/app-metrics/buildbot-prometheus/metadata.xml |
| 129 |
deleted file mode 100644 |
| 130 |
index 7499dcce717..00000000000 |
| 131 |
--- a/app-metrics/buildbot-prometheus/metadata.xml |
| 132 |
+++ /dev/null |
| 133 |
@@ -1,9 +0,0 @@ |
| 134 |
-<?xml version="1.0" encoding="UTF-8"?> |
| 135 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
| 136 |
-<pkgmetadata> |
| 137 |
- <!-- maintainer-needed --> |
| 138 |
- <upstream> |
| 139 |
- <remote-id type="pypi">buildbot-prometheus</remote-id> |
| 140 |
- <remote-id type="github">claws/buildbot-prometheus</remote-id> |
| 141 |
- </upstream> |
| 142 |
-</pkgmetadata> |
| 143 |
|
| 144 |
diff --git a/profiles/package.mask b/profiles/package.mask |
| 145 |
index 86b7838b3a6..f6fe7da0e22 100644 |
| 146 |
--- a/profiles/package.mask |
| 147 |
+++ b/profiles/package.mask |
| 148 |
@@ -416,12 +416,6 @@ games-util/pogo-manager-bin |
| 149 |
net-p2p/bisq |
| 150 |
sci-mathematics/geogebra |
| 151 |
|
| 152 |
-# Michał Górny <mgorny@g.o> (2020-03-29) |
| 153 |
-# Unmaintained, seriously outdated, vulnerable. Multiple bugs reported. |
| 154 |
-# Stuck on Python 3.6. |
| 155 |
-# Removal in 30 days. Bug #711702. |
| 156 |
-app-metrics/buildbot-prometheus |
| 157 |
- |
| 158 |
# Joshua Kinard <kumba@g.o> (2020-03-28) |
| 159 |
# In Linux ~4.18, IPX (Internetwork Packet eXchange) protocol and |
| 160 |
# NCPFS (NetWare Core Protocol Filesystem) support was removed due |
Archives