commit: bc8bdd812f7407d420063c877f71a1d2e9058858 Author: Aaron Bauman <bman <AT> gentoo <DOT> org> AuthorDate: Sat Jun 27 00:40:09 2020 +0000 Commit: Aaron Bauman <bman <AT> gentoo <DOT> org> CommitDate: Sat Jun 27 00:40:09 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc8bdd81
app-metrics/buildbot-prometheus: drop last-rited pkg Signed-off-by: Aaron Bauman <bman <AT> gentoo.org> app-metrics/buildbot-prometheus/Manifest | 1 - .../buildbot-prometheus-17.7.2-r2.ebuild | 35 --------------- ...rate-duration-calculations-to-buildbot-09.patch | 52 ---------------------- app-metrics/buildbot-prometheus/metadata.xml | 9 ---- profiles/package.mask | 6 --- 5 files changed, 103 deletions(-) diff --git a/app-metrics/buildbot-prometheus/Manifest b/app-metrics/buildbot-prometheus/Manifest deleted file mode 100644 index 0cc6923df04..00000000000 --- a/app-metrics/buildbot-prometheus/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST buildbot-prometheus-17.7.2.tar.gz 10101 BLAKE2B 25c060b5368aa1dea6145b6d380db8001f3cd1fb49f9b3bb1e4ecccdb771591abc269d5aee9d022a9b182b19650a0c398b580004f20def0675b86ca9f3a1e2db SHA512 8a0ecaf57eade3d69fabc57a19a1c02af8e398c3bc4732e40f39e8904a16c9b751d4f6f8ace0dd7893b380d1ffc8a51360279aeb7b4059a6cd9438145344e74b 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 739ad58b123..00000000000 --- a/app-metrics/buildbot-prometheus/buildbot-prometheus-17.7.2-r2.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python3_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 7fbdbdd0913..00000000000 --- 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 <brian.dol...@sony.com> -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 7499dcce717..00000000000 --- a/app-metrics/buildbot-prometheus/metadata.xml +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <!-- maintainer-needed --> - <upstream> - <remote-id type="pypi">buildbot-prometheus</remote-id> - <remote-id type="github">claws/buildbot-prometheus</remote-id> - </upstream> -</pkgmetadata> diff --git a/profiles/package.mask b/profiles/package.mask index 86b7838b3a6..f6fe7da0e22 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -416,12 +416,6 @@ games-util/pogo-manager-bin net-p2p/bisq sci-mathematics/geogebra -# Michał Górny <mgo...@gentoo.org> (2020-03-29) -# Unmaintained, seriously outdated, vulnerable. Multiple bugs reported. -# Stuck on Python 3.6. -# Removal in 30 days. Bug #711702. -app-metrics/buildbot-prometheus - # Joshua Kinard <ku...@gentoo.org> (2020-03-28) # In Linux ~4.18, IPX (Internetwork Packet eXchange) protocol and # NCPFS (NetWare Core Protocol Filesystem) support was removed due
