gentoo resync : 15.01.2020

10 files changed, 17 insertions, 46 deletions

diff --git a/app-metrics/Manifest.gz b/app-metrics/Manifest.gz
index 6a51b4cf9909..17bc4aeb408e 100644
--- a/app-metrics/Manifest.gz
+++ b/app-metrics/Manifest.gz
diff --git a/app-metrics/buildbot-prometheus/Manifest b/app-metrics/buildbot-prometheus/Manifest
index f33a0fee78b0..516d84c6a627 100644
--- a/app-metrics/buildbot-prometheus/Manifest
+++ b/app-metrics/buildbot-prometheus/Manifest
@@ -1,4 +1,4 @@
 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
+EBUILD buildbot-prometheus-17.7.2-r2.ebuild 1115 BLAKE2B e0aaa68c414fc0b0dfe99cc3b1377fad6e8fba7dbd5690adb64780aae1832d53492ba433d6a4264f10617ad4f65a1a998634847f7e2408acf5e8c32ce7d512cf SHA512 965f5a846d7843c21a9d5cc678a8fbe0359efa4d5c4bd9fcef1d4436da2f0375c0a502ca427d9100b7ecd22281802c8cf280d914943d53ef2e8945399dfec4c9
 MISC metadata.xml 314 BLAKE2B 7ea3af51048358bd6291056e64324eee54fdd041b5a6199c14058e54ccafdffcbfddad12490cc6a6a5baf0aff47648c23ee8e7df6234e5aac10d15740b93d47e SHA512 73b0984af8b92c14a21617b3977d2f7b84f5ac33b9cb3ec26dbb12d59789f8c50c839c3de6044667e9d2ab12c420a28511ab4fa445f043c98e22bdf0b16fb68e
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
index 67323d1dbeff..e5db796569b8 100644
--- a/app-metrics/buildbot-prometheus/buildbot-prometheus-17.7.2-r2.ebuild
+++ b/app-metrics/buildbot-prometheus/buildbot-prometheus-17.7.2-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="A Prometheus metrics exporter for Buildbot"
diff --git a/app-metrics/collectd/Manifest b/app-metrics/collectd/Manifest
index 3f542bd33664..b86d8e76280d 100644
--- a/app-metrics/collectd/Manifest
+++ b/app-metrics/collectd/Manifest
@@ -8,8 +8,8 @@ DIST collectd-5.10.0.tar.bz2 1856377 BLAKE2B d4c011c5d2d9bfcf8400a35ca92f0b8c82f
 DIST collectd-5.8.1.tar.bz2 1789228 BLAKE2B 739f961172978db33bdf95c8f93bde0036a26b2ed2abd3396a734d4b97c4ae117bb26a62fcdbb3d77bd63d9f64a38f83d0c8a0665e8fa7bf5ed2efc6838b0e8e SHA512 8c75448c6e59ee1ea5c1cf486c07040d20fb36d5b7a1be2ab45facea330166e8c1d1fa38e3fa82ec905428d7b2c92c66aae35ee8e3546f67ce76f7f410739901
 DIST collectd-5.9.1.tar.gz 1501178 BLAKE2B ed0984637161427f3b354002850b7ea8c49a4aca64b637b864e5513c8057f52a4a479477b21e2a4cff436728c16d66c6d561df14308adcaeb7d597c290f543ce SHA512 424ef12a3ba6997a71e6eda1a62d73fec588c9c4d90542c2381c1f9f4e118b2c02e18c71507e8984e20fb255b69b7f42afe83085b3df5e225c576d1eee1655fb
 DIST collectd-5.9.2.tar.gz 1501275 BLAKE2B f878dc9ee0d1948643dcbfcf3a427558a1c17adedcc31f02f4f4bb689e841760dcf732866c0617b8b139b4aecb094f8ca4aa5e7c7c707adf5589fc8767a1d2f9 SHA512 cbbc8d6409242108550b974f388d15c6084753dd51c6056614db34bceb3b72abb0237892ea65086093b9a5c5569087666c0430eb16021d22c3dde8e6d1ae7922
-EBUILD collectd-5.10.0.ebuild 19538 BLAKE2B 7e2c4441f3742477409df962a85f202db453b2c93b6316361ee16a404935223ab657162da5aed7220a622978c030332cb3d429180a6d03652a924e2a5643705d SHA512 9415e8f670cdfad50fdc0d24487e99e7e86393a0992afe02c0ed1738af88874a66b59148c8099aaf38c289234e22ea7fbb1ed6b020e1b53e41e53beb6dc8863e
-EBUILD collectd-5.8.1-r1.ebuild 19431 BLAKE2B 970be74630e220d80bb5ad2ad59d1f82356c41d8ec3a360427ea0c0ea6f792d3698551cb2980f6020a227b656f6cd4a8d20d750404db9e7fcbceafb3f4c71796 SHA512 4f1e16610288db0be07fa89a1d32792a11d69277a71367a201013fcc92f98659fb5c3b1220e0c4bdac935b14afddbf5e78a282445b83487e9e9a8fe5f4e83284
-EBUILD collectd-5.9.1-r2.ebuild 19597 BLAKE2B ae1badd06dbe8a0a756fa338440c06e9c814a45c59e657c68d56db1dc62e53e99354f6e452904e7351206b06813638f9bbd55bc646ba96789cf6be96a78c60da SHA512 ffdd05679e68dd265e1385c6ba11c2040fafa27841e8e5a0495c6a1c9d04078b829557a3c0e92194fb8136c6fb1208556152eb23d50bb714ee0922efeecc6266
-EBUILD collectd-5.9.2.ebuild 19553 BLAKE2B 946259abe31b6051c143bf949d223e9d52f6aa420479415920caf445029df791b58f70522af1edff754366f649e3ba2e86c90e59f9db46dd632c8ff36a6e179b SHA512 3fb0c1f080c905787d179e6d78cc24884c6c9990e6947021341a822dc878dc546b90afb313e4b80d8cb0751e6ecfc96fb9bd63073ab498ba2f78b1f40152ae9b
+EBUILD collectd-5.10.0.ebuild 19531 BLAKE2B 0ed64c914062c6a4c894bb922e9c9bdb0c4c583c41c771082ea52becc588941b754e193198762c97fbc194a45e1c9e7daed4073b3374617ed9081fdf97c33184 SHA512 af2a1228ee6f79f829a5f6168d36cf3dfa0f91a23188a273f1572e19f7afd17658f0a8ad02f5d434b066e0cb251110556413b5af5052ba31838392812b17dda0
+EBUILD collectd-5.8.1-r1.ebuild 19434 BLAKE2B c92fe5125de1ba850e447d6c137023f8a3668e49b6dd34718f93a8d841855fbf420143f2afa8861ea6415e9abcec92275d74c875fa508450889cc6e7ad5eebea SHA512 26790fc987675f9ed88b4a093bc95ed144c47873f4128fb5126e3e6aed14a99770ed902548fc2a1080fed3e004332940794a6d5d9b5eedd08553f7ef11d92922
+EBUILD collectd-5.9.1-r2.ebuild 19593 BLAKE2B 15522042239a71ffdaf91e78822a2acc3992c684b7255039c2433d2f8214c7705ddc758e3f964e8a8a8476b049024e4156d563bcd90242733b3600d07e4a9978 SHA512 96ef357f9110967c68c5ed897406c3d20e017db65206619b10ae0b525f91534035ba91cc6972a7d51b5c12a9ab57f1880444048538127d0e49a41efd57c7fd7f
+EBUILD collectd-5.9.2.ebuild 19549 BLAKE2B b3f7cf9159ad7c0869a7d7fe171f1a381e2569dca07532ee159afb8ad6135cef9972a137de7c152e75dd53a435224e136ceedab84b96f9582035f84b9ae71c1b SHA512 224e60339f6330cdc215951bb4525a1d75a738d26ab5437a0fb51dba9e976b22dc13e0c9e0715d88ae9e5fde6ddcdd1f7882300c360bd20463e41ee02be4d455
 MISC metadata.xml 1515 BLAKE2B 5525766b822463f94f7c2cddbdf78b4c4ea5a473880a473d0b51481d948569cfc7f51bd2e74eb67065ab2be1b23e4fb7ee99512d018c6e6b5ac1ee7331eae9eb SHA512 51c17c16d27b722d729d036d67c562ab76e212dac9bcd004a7e43c2c5e041b8c46e74f9a130f30c2e18cc95ca1b367034246eff02cfaf55f6f9375ff836749e5
diff --git a/app-metrics/collectd/collectd-5.10.0.ebuild b/app-metrics/collectd/collectd-5.10.0.ebuild
index f3a9f179a082..ae50631c0bc1 100644
--- a/app-metrics/collectd/collectd-5.10.0.ebuild
+++ b/app-metrics/collectd/collectd-5.10.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 JAVA_PKG_OPT_USE="collectd_plugins_java"
 
 inherit autotools fcaps flag-o-matic java-pkg-opt-2 linux-info multilib perl-functions python-single-r1 systemd tmpfiles user
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.bz2"
 
 LICENSE="MIT GPL-2 GPL-2+ GPL-3 GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~x86"
+KEYWORDS="~alpha amd64 arm x86"
 IUSE="contrib debug java kernel_Darwin kernel_FreeBSD kernel_linux perl selinux static-libs udev xfs"
 
 # The plugin lists have to follow here since they extend IUSE
diff --git a/app-metrics/collectd/collectd-5.8.1-r1.ebuild b/app-metrics/collectd/collectd-5.8.1-r1.ebuild
index 5ab2828b9777..67da0a218144 100644
--- a/app-metrics/collectd/collectd-5.8.1-r1.ebuild
+++ b/app-metrics/collectd/collectd-5.8.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 JAVA_PKG_OPT_USE="collectd_plugins_java"
 
 inherit autotools fcaps flag-o-matic java-pkg-opt-2 linux-info multilib perl-functions python-single-r1 systemd tmpfiles user
@@ -11,7 +11,7 @@ inherit autotools fcaps flag-o-matic java-pkg-opt-2 linux-info multilib perl-fun
 DESCRIPTION="Collects system statistics and provides mechanisms to store the values"
 
 HOMEPAGE="https://collectd.org/"
-SRC_URI="${HOMEPAGE%/}/files/${P}.tar.bz2"
+SRC_URI="https://collectd.org/files/${P}.tar.bz2"
 
 LICENSE="MIT GPL-2 GPL-2+ GPL-3 GPL-3+"
 SLOT="0"
diff --git a/app-metrics/collectd/collectd-5.9.1-r2.ebuild b/app-metrics/collectd/collectd-5.9.1-r2.ebuild
index 6a6e866259d1..efb841270073 100644
--- a/app-metrics/collectd/collectd-5.9.1-r2.ebuild
+++ b/app-metrics/collectd/collectd-5.9.1-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 JAVA_PKG_OPT_USE="collectd_plugins_java"
 
 inherit autotools fcaps flag-o-matic java-pkg-opt-2 linux-info multilib perl-functions python-single-r1 systemd tmpfiles user
diff --git a/app-metrics/collectd/collectd-5.9.2.ebuild b/app-metrics/collectd/collectd-5.9.2.ebuild
index 35c1fbd584f3..5c75f25d1a37 100644
--- a/app-metrics/collectd/collectd-5.9.2.ebuild
+++ b/app-metrics/collectd/collectd-5.9.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 JAVA_PKG_OPT_USE="collectd_plugins_java"
 
 inherit autotools fcaps flag-o-matic java-pkg-opt-2 linux-info multilib perl-functions python-single-r1 systemd tmpfiles user
diff --git a/app-metrics/prometheus/Manifest b/app-metrics/prometheus/Manifest
index b568383ae451..c9e816d6d4d5 100644
--- a/app-metrics/prometheus/Manifest
+++ b/app-metrics/prometheus/Manifest
@@ -1,4 +1,3 @@
-AUX prometheus-3.initd 851 BLAKE2B 600d9e541206f99c0ddddc0f5a1d37d9bea69d8f45ce6562a2d3c040a75c3665d9862829fc44134db2fbbbbf1d38b7dc4010c9c284f5af38f0dd2cf4be1f9d11 SHA512 7d3650ef5b632507ade4cfb00a167ec7c2d3d8e91551ef8f4550f9947038df0b22a3dd0a33e093296eeb0ca88f1d12ae40e73c7fec4df03e5dcc7630893ded59
 AUX prometheus.confd 43 BLAKE2B c83afa8ad1133c9e93abd40c862ff5b3ac9a3b3c4447b915ae1482d92096dec9f200d089de2458a6cdb0e72d2bf0652d56e3afd6d5a3cd8a3ed7a6c9a0e3e42c SHA512 37468e897cd34b50b0edc65ada3f0c2e05459c3d96bb7f82d58b6de5bf10a127f1bf7912af93d83d94e3ea7287cfeb2311e36535f291d01a11d152a0b438591c
 AUX prometheus.initd 929 BLAKE2B d48650b11b77d4d04b5458682456fb20f8085dc3efe9d0ddd2a6c75751ddae156bbb83c20082bc7b6833395602c24da61e2f7610bdff291e05e3eeb4fb651317 SHA512 504122eb8ed19beac81987b77eb78bba9b36b2ef15f28b1a542804271046e06363baf464f3c303982f647eba65fbc2b5459235f56625e1ff3fed9834937cd0d2
 DIST prometheus-2.13.1.tar.gz 15249891 BLAKE2B 35cd3c81bdb4f3a783c2ab1f1318946db5b25c94496fe351739a59259a726bf54d418d6b29efeff44c8007353ed63368819ce89ffe6a4f380b7ae216da3c4d63 SHA512 aed3b44db97cd2a67add64d13e950246b25c2b459f6b1081a6c548862c4e85c055254a0dfb94b08ac85f83dbbe30afceb1c54a8ad6f7ff1367aeb6af6d270e8a
diff --git a/app-metrics/prometheus/files/prometheus-3.initd b/app-metrics/prometheus/files/prometheus-3.initd
deleted file mode 100644
index ae151ef91fbd..000000000000
--- a/app-metrics/prometheus/files/prometheus-3.initd
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 2016-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-description="Prometheus monitoring system and time series database"
-pidfile=${pidfile:-"/run/${RC_SVCNAME}.pid"}
-user=${user:-${SVCNAME}}
-group=${group:-${SVCNAME}}
-
-command="/usr/bin/prometheus"
-command_args="${command_args:---config.file=/etc/prometheus/prometheus.yml --storage.tsdb.path=/var/lib/prometheus/data}"
-command_background="true"
-start_stop_daemon_args="--user ${user} --group ${group} \
-	--stdout /var/log/${RC_SVCNAME}/${RC_SVCNAME}.log \
-	--stderr /var/log/${RC_SVCNAME}/${RC_SVCNAME}.log"
-
-extra_started_commands="reload"
-
-depend() {
-	after net
-}
-
-reload() {
-        ebegin "Reloading ${SVCNAME}"
-        start-stop-daemon --signal HUP --pidfile "${pidfile}"
-        eend $? "Failed to stop ${SVCNAME}"
-}
-