gentoo resync : 25.11.2020

2 files changed, 63 insertions, 0 deletions

diff --git a/app-metrics/prometheus/Manifest b/app-metrics/prometheus/Manifest
index c1da4748a5dc..c27d87c8cd99 100644
--- a/app-metrics/prometheus/Manifest
+++ b/app-metrics/prometheus/Manifest
@@ -3,6 +3,9 @@ AUX prometheus.initd 929 BLAKE2B d48650b11b77d4d04b5458682456fb20f8085dc3efe9d0d
 DIST prometheus-2.13.1.tar.gz 15249891 BLAKE2B 35cd3c81bdb4f3a783c2ab1f1318946db5b25c94496fe351739a59259a726bf54d418d6b29efeff44c8007353ed63368819ce89ffe6a4f380b7ae216da3c4d63 SHA512 aed3b44db97cd2a67add64d13e950246b25c2b459f6b1081a6c548862c4e85c055254a0dfb94b08ac85f83dbbe30afceb1c54a8ad6f7ff1367aeb6af6d270e8a
 DIST prometheus-2.19.1-assets.tar.gz 5032055 BLAKE2B 75bc247d3dfbcccf3a9d7ef8a23fabe2d92d698670f5aabb19e1ee019e0197aa4fd49cfd53353e09a765a014af70ad860c7d1b6bce292632e5ed1175dd206ae9 SHA512 52d1f80d9ab2de778e8a0c81549ff83647d3d8af37ccf535a6fc4ac45fe29f25f6592e9b5eb137cd5ed6f6730835e4ba52b6c4c82e5b0bb2336b90c809d756de
 DIST prometheus-2.19.1.tar.gz 13343138 BLAKE2B 042f2c6e10e3d7f50b2373d9c3977db0318c8c9839e313463890ccae58c91d6d46c306d5aaeb795fb1a9649477b179999cb6b182aca9dee222d8fba557bf6d74 SHA512 a54a83b21ac8f3477e678ca365b8f04adcbe5cdd8a17d842eb9cd2e3428238841fb0492da6f4ec973f48803b0739667c734ae8a88b48d12555e23410e6461629
+DIST prometheus-2.21.0-assets.tar.gz 5060038 BLAKE2B 10c9a89be71935072e6096c1bd62d9e3ff015b98baa4d11eb19cc938c857d38ebd22345173a9e404441bc1dceda4f86e82d455e6f4ea23d6ef5c78cba130ce9d SHA512 0f4b03b33c04a86d44c6521d4f0a1048f69d32b0e1797b5508a279d990171ca15268b461f567146f689aeda9fc696fd8a656147b20b6fd0293542fa15fd35a29
+DIST prometheus-2.21.0.tar.gz 13971178 BLAKE2B 8701d8c4318b6624e448b91959ea5afd62d0574f4329bc72c141145b197c653912b050f2da93d670ad350a244eb18c0a7e8ea9c12083fcb885233d8631653447 SHA512 6c4af981582a0cb07a8be5cfa786797507f3f23e4d52f03a4f4126b9b5df84f0481d7400120ed3368268f77d07d8d939f1a8758044e65ede291d9ccafc1b3239
 EBUILD prometheus-2.13.1.ebuild 2059 BLAKE2B 4614929b87ff860eac5b7b46d9b8f60474c51faab659699a0866dccaaef4d149214430d370dc5f0420c756d8d240da4cc8bb33b1948e6b4baf690c20b8905f06 SHA512 aac4922659750e6bcde07a8ef7823a5d8c4d47ccd1107a9f593b95079322031f4c8546b7d0d6df20f736a6a24d869105866c30eaf9e81773e21a6dcad27beac9
 EBUILD prometheus-2.19.1.ebuild 1947 BLAKE2B 64f7ac94e68fd321be19747fcc29a8adda3ab99183e509c33241e34b014b9ed7c3e3d8beaa8c3da58e7a5c11fbba3a85a3fccaf58ef3723d43a798e18f99600d SHA512 726f4d332155e642bb7213e4efc3a06c6202a9e4c08d96f372a36ed3e752ba944fd7d51ad1a6f2ff601fdaac2db6ee171e6b72594e409363a0a7acbb68d44849
+EBUILD prometheus-2.21.0.ebuild 1901 BLAKE2B d78ca60ce6580810928b5a90dc45eee14c02a7239515ad27dce8387a2852fdb712a5a2f0eaa6a5727f5e95d2ce5e5704b3bea96dce96c8e62c47a9e583ec646a SHA512 2a2fc7829ed0d4c704d2cc6736e0b953d7d030c3208e9738e11a59157e4804ab815359dfd9b1ed28c23a5c60902aa9da7b859e64a9e012bebec77935047c07f4
 MISC metadata.xml 334 BLAKE2B f35628a28c6087863ab4d96e1a4a3705f470845fe6c963c47457caf85e14cb1f99938b1b78bad2f87653f525c154f76c8e0e7b18d6f21d2cf10016eacc565984 SHA512 1a64169c81388848bb26d32e8706fb6d4fbcbde847b1e075f1eee297d5fd4b35ecc835e9ed16ac79825f8c17efac78271e6c8735809a57a8b4ed73b5a789300a
diff --git a/app-metrics/prometheus/prometheus-2.21.0.ebuild b/app-metrics/prometheus/prometheus-2.21.0.ebuild
new file mode 100644
index 000000000000..b4bb7a694d13
--- /dev/null
+++ b/app-metrics/prometheus/prometheus-2.21.0.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module
+MY_PV=v${PV/_rc/-rc.}
+GIT_COMMIT=e83ef207b
+
+DESCRIPTION="Prometheus monitoring system and time series database"
+HOMEPAGE="https://github.com/prometheus/prometheus"
+SRC_URI="https://github.com/prometheus/prometheus/archive/${MY_PV}.tar.gz -> ${P}.tar.gz
+	https://dev.gentoo.org/~williamh/dist/${P}-assets.tar.gz"
+
+LICENSE="Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm"
+
+COMMON_DEPEND="acct-group/prometheus
+	acct-user/prometheus"
+DEPEND="!app-metrics/prometheus-bin
+	${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+BDEPEND=">=dev-util/promu-0.3.0"
+
+RESTRICT+=" test"
+
+src_prepare() {
+	default
+	sed -i -e "s/{{.Revision}}/${GIT_COMMIT}/" .promu.yml || die
+	mv ../assets_vfsdata.go web/ui || die
+}
+
+src_compile() {
+	promu build --prefix bin -v || die
+}
+
+src_install() {
+	dobin bin/*
+	dodoc -r {documentation,{README,CHANGELOG,CONTRIBUTING}.md}
+	insinto /etc/prometheus
+	doins documentation/examples/prometheus.yml
+	insinto /usr/share/prometheus
+	doins -r console_libraries consoles
+	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
+}