gentoo resync : 05.02.2020

12 files changed, 103 insertions, 5 deletions

diff --git a/app-metrics/Manifest.gz b/app-metrics/Manifest.gz
index 17bc4aeb408e..5febeec2f067 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 516d84c6a627..4bfe590f8b9e 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 1115 BLAKE2B e0aaa68c414fc0b0dfe99cc3b1377fad6e8fba7dbd5690adb64780aae1832d53492ba433d6a4264f10617ad4f65a1a998634847f7e2408acf5e8c32ce7d512cf SHA512 965f5a846d7843c21a9d5cc678a8fbe0359efa4d5c4bd9fcef1d4436da2f0375c0a502ca427d9100b7ecd22281802c8cf280d914943d53ef2e8945399dfec4c9
+EBUILD buildbot-prometheus-17.7.2-r2.ebuild 1105 BLAKE2B c594e9c1749758239a800ceee83ea86cb43ac941091f84998feaf04fac5f77cd413eb7d97a096596ddbd40a5bd5d9017130863468e34105f7511401f779a66c9 SHA512 be6dde29eafb22270a4617ec9c620755672a489a2f1711685cc7dd71418c341eb7fccfa635107765237df322370a60bf49872acc931ee22d29a954fc4a6736ba
 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 e5db796569b8..739ad58b123e 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
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( 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 b86d8e76280d..00f0117c6ab8 100644
--- a/app-metrics/collectd/Manifest
+++ b/app-metrics/collectd/Manifest
@@ -9,7 +9,7 @@ DIST collectd-5.8.1.tar.bz2 1789228 BLAKE2B 739f961172978db33bdf95c8f93bde0036a2
 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 19531 BLAKE2B 0ed64c914062c6a4c894bb922e9c9bdb0c4c583c41c771082ea52becc588941b754e193198762c97fbc194a45e1c9e7daed4073b3374617ed9081fdf97c33184 SHA512 af2a1228ee6f79f829a5f6168d36cf3dfa0f91a23188a273f1572e19f7afd17658f0a8ad02f5d434b066e0cb251110556413b5af5052ba31838392812b17dda0
-EBUILD collectd-5.8.1-r1.ebuild 19434 BLAKE2B c92fe5125de1ba850e447d6c137023f8a3668e49b6dd34718f93a8d841855fbf420143f2afa8861ea6415e9abcec92275d74c875fa508450889cc6e7ad5eebea SHA512 26790fc987675f9ed88b4a093bc95ed144c47873f4128fb5126e3e6aed14a99770ed902548fc2a1080fed3e004332940794a6d5d9b5eedd08553f7ef11d92922
+EBUILD collectd-5.8.1-r1.ebuild 19435 BLAKE2B e7fb35e135984fd275a0404602f47ee9cda72637b1d488d281de1d9e5b326e481f5a976f50025b1db892f4b1ebc452b64ec85864d2ee76ce26c07ee5ebab7557 SHA512 7b26db67f303163ea1eaff8d065e05e214b5dc243bf6ace9cb7a354c9fadd2439f17ef7a9347def06fa18add4c58c8f91f463f1702e7a59dac792d2c22a92b00
 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.8.1-r1.ebuild b/app-metrics/collectd/collectd-5.8.1-r1.ebuild
index 67da0a218144..54d65f2b928b 100644
--- a/app-metrics/collectd/collectd-5.8.1-r1.ebuild
+++ b/app-metrics/collectd/collectd-5.8.1-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://collectd.org/files/${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/prometheus-bin/Manifest b/app-metrics/prometheus-bin/Manifest
new file mode 100644
index 000000000000..c77ba667c584
--- /dev/null
+++ b/app-metrics/prometheus-bin/Manifest
@@ -0,0 +1,5 @@
+AUX prometheus.confd 43 BLAKE2B c83afa8ad1133c9e93abd40c862ff5b3ac9a3b3c4447b915ae1482d92096dec9f200d089de2458a6cdb0e72d2bf0652d56e3afd6d5a3cd8a3ed7a6c9a0e3e42c SHA512 37468e897cd34b50b0edc65ada3f0c2e05459c3d96bb7f82d58b6de5bf10a127f1bf7912af93d83d94e3ea7287cfeb2311e36535f291d01a11d152a0b438591c
+AUX prometheus.initd 929 BLAKE2B d48650b11b77d4d04b5458682456fb20f8085dc3efe9d0ddd2a6c75751ddae156bbb83c20082bc7b6833395602c24da61e2f7610bdff291e05e3eeb4fb651317 SHA512 504122eb8ed19beac81987b77eb78bba9b36b2ef15f28b1a542804271046e06363baf464f3c303982f647eba65fbc2b5459235f56625e1ff3fed9834937cd0d2
+DIST prometheus-2.15.2.linux-amd64.tar.gz 59204993 BLAKE2B 700d61063cddea02ca4445257b11b782c3b6fc84ed3d48f8d196c5602819f0d44b218d15b870281293bf0661929b02930b937e66fec34918b81cd3d010a6fa21 SHA512 a3b95fe6101d5587329d84adb18c0c261babe5a909e62ab1a39f42df28c058d311b0b2ea9ecbdad9227789ed83c0fae4a12776348999cda3a70cdc457f6d3611
+EBUILD prometheus-bin-2.15.2.ebuild 1503 BLAKE2B f99d34d3633e91878c7c64223ee071c717dfe6aa438e7ff548cbcd62a10b62d1802a946c44486f539b263076f8b14dcb9705d1de5355d5945fc19f18f06ebca3 SHA512 54ae33cb31f85b53735eb29c6f0b0377f94b73eb5b7838a762c2a0c649f887c46e5de6437e88493961b5f871eb6a0e5d058405cd9343309a7cd0ffd52e631e2e
+MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/app-metrics/prometheus-bin/files/prometheus.confd b/app-metrics/prometheus-bin/files/prometheus.confd
new file mode 100644
index 000000000000..93b41b31624c
--- /dev/null
+++ b/app-metrics/prometheus-bin/files/prometheus.confd
@@ -0,0 +1,2 @@
+# arguments for Prometheus
+command_args=""
diff --git a/app-metrics/prometheus-bin/files/prometheus.initd b/app-metrics/prometheus-bin/files/prometheus.initd
new file mode 100644
index 000000000000..f7371f8ca060
--- /dev/null
+++ b/app-metrics/prometheus-bin/files/prometheus.initd
@@ -0,0 +1,34 @@
+#!/sbin/openrc-run
+# Copyright 2016-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+description="Prometheus monitoring system and time series database"
+pidfile=/var/run/${RC_SVCNAME}.pid
+user=${user:-${RC_SVCNAME}}
+group=${group:-${RC_SVCNAME}}
+command_user=${user}:${group}
+
+command="/usr/bin/prometheus"
+command_args="${command_args:---config.file=/etc/prometheus/prometheus.yml --storage.tsdb.path=/var/lib/prometheus/data}"
+command_background="true"
+error_log=/var/log/${RC_SVCNAME}/${RC_SVCNAME}.log
+output_log=/var/log/${RC_SVCNAME}/${RC_SVCNAME}.log
+
+extra_started_commands="reload"
+
+depend() {
+	after net
+}
+
+reload() {
+	ebegin "Reloading configuration for ${RC_SVCNAME}"
+	case "$supervisor" in
+		supervise-daemon)
+		supervise-daemon ${RC_SVCNAME} --signal HUP
+		;;
+		*)
+		start-stop-daemon --signal HUP --pidfile "${pidfile}"
+		;;
+	esac
+	eend $? "Failed to reload ${RC_SVCNAME}"
+}
diff --git a/app-metrics/prometheus-bin/metadata.xml b/app-metrics/prometheus-bin/metadata.xml
new file mode 100644
index 000000000000..c36c37139fad
--- /dev/null
+++ b/app-metrics/prometheus-bin/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>williamh@gentoo.org</email>
+		<name>William Hubbs</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-metrics/prometheus-bin/prometheus-bin-2.15.2.ebuild b/app-metrics/prometheus-bin/prometheus-bin-2.15.2.ebuild
new file mode 100644
index 000000000000..89e508d0cf53
--- /dev/null
+++ b/app-metrics/prometheus-bin/prometheus-bin-2.15.2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="prometheus monitoring system and time series database"
+HOMEPAGE="http://prometheus.io"
+MY_PN=${PN%%-bin}
+MY_P=${MY_PN}-${PV}
+SRC_URI="https://github.com/prometheus/prometheus/releases/download/v${PV}/${MY_P}.linux-amd64.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+QA_PREBUILT=".*"
+RESTRICT="strip"
+
+DEPEND="acct-group/prometheus
+	acct-user/prometheus
+	!app-metrics/prometheus"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}.linux-amd64"
+
+src_install() {
+	dobin prometheus promtool tsdb
+	insinto /usr/share/prometheus
+	doins -r console_libraries consoles
+	insinto /etc/prometheus
+	doins prometheus.yml
+	dosym ../../usr/share/prometheus/console_libraries /etc/prometheus/console_libraries
+	dosym ../../usr/share/prometheus/consoles /etc/prometheus/consoles
+
+	newinitd "${FILESDIR}"/prometheus.initd prometheus
+	newconfd "${FILESDIR}"/prometheus.confd prometheus
+	keepdir /var/log/prometheus /var/lib/prometheus
+	fowners prometheus:prometheus /var/log/prometheus /var/lib/prometheus
+}
+
+pkg_postinst() {
+	if has_version '<net-analyzer/prometheus-2.0.0_rc0'; then
+		ewarn "Old prometheus 1.x TSDB won't be converted to the new prometheus 2.0 format"
+		ewarn "Be aware that the old data currently cannot be accessed with prometheus 2.0"
+		ewarn "This release requires a clean storage directory and is not compatible with"
+		ewarn "files created by previous beta releases"
+	fi
+}
diff --git a/app-metrics/prometheus/Manifest b/app-metrics/prometheus/Manifest
index c9e816d6d4d5..988b90a1d6f7 100644
--- a/app-metrics/prometheus/Manifest
+++ b/app-metrics/prometheus/Manifest
@@ -1,5 +1,5 @@
 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
-EBUILD prometheus-2.13.1.ebuild 2030 BLAKE2B d92e41af8c98efc93b325177f0e04d6e56de70d322f917edc586e9d07badc2ea00f67e34ef3e337f0c988112098567b9b223aa93dbddf4db9ab040a0bf919450 SHA512 f40e14d641388fa1b7a7e73c3d2c4d105037f186d4c66378651580b0a677382d24b1747f5a664c698756f01f122b4fce7bcee5d7847844b26fb1b665e993e3fd
+EBUILD prometheus-2.13.1.ebuild 2059 BLAKE2B b8672e9979a53de55e1f09c3292ec7c7b9a81f64743da2276ca9dda91c8658da07e39438d52b30fba5149614af73b24c73b09fbe5b26ad27f8d07e178b778f7d SHA512 7217a732aa2346942ad4c8f252465fbdc525a07be1419dce6fc3a296b733f603cb40935b5209d2a2da0a40d368c45cedd08db778bcee2a65c4218a3ac7089ff9
 MISC metadata.xml 334 BLAKE2B f35628a28c6087863ab4d96e1a4a3705f470845fe6c963c47457caf85e14cb1f99938b1b78bad2f87653f525c154f76c8e0e7b18d6f21d2cf10016eacc565984 SHA512 1a64169c81388848bb26d32e8706fb6d4fbcbde847b1e075f1eee297d5fd4b35ecc835e9ed16ac79825f8c17efac78271e6c8735809a57a8b4ed73b5a789300a
diff --git a/app-metrics/prometheus/prometheus-2.13.1.ebuild b/app-metrics/prometheus/prometheus-2.13.1.ebuild
index d9614ddc2a6b..35f3c3c87b5f 100644
--- a/app-metrics/prometheus/prometheus-2.13.1.ebuild
+++ b/app-metrics/prometheus/prometheus-2.13.1.ebuild
@@ -17,6 +17,7 @@ SLOT="0"
 IUSE=""
 
 DEPEND="
+	!app-metrics/prometheus-bin
 	>=dev-lang/go-1.12
 	>=dev-util/promu-0.3.0"