gentoo resync : 11.07.2019

5 files changed, 3 insertions, 215 deletions

diff --git a/app-metrics/prometheus/Manifest b/app-metrics/prometheus/Manifest
index 5835911dd6d2..002c7ebd87ae 100644
--- a/app-metrics/prometheus/Manifest
+++ b/app-metrics/prometheus/Manifest
@@ -2,15 +2,9 @@ AUX prometheus-3.initd 851 BLAKE2B 600d9e541206f99c0ddddc0f5a1d37d9bea69d8f45ce6
 AUX prometheus.confd 43 BLAKE2B c83afa8ad1133c9e93abd40c862ff5b3ac9a3b3c4447b915ae1482d92096dec9f200d089de2458a6cdb0e72d2bf0652d56e3afd6d5a3cd8a3ed7a6c9a0e3e42c SHA512 37468e897cd34b50b0edc65ada3f0c2e05459c3d96bb7f82d58b6de5bf10a127f1bf7912af93d83d94e3ea7287cfeb2311e36535f291d01a11d152a0b438591c
 AUX prometheus.initd 929 BLAKE2B d48650b11b77d4d04b5458682456fb20f8085dc3efe9d0ddd2a6c75751ddae156bbb83c20082bc7b6833395602c24da61e2f7610bdff291e05e3eeb4fb651317 SHA512 504122eb8ed19beac81987b77eb78bba9b36b2ef15f28b1a542804271046e06363baf464f3c303982f647eba65fbc2b5459235f56625e1ff3fed9834937cd0d2
 DIST prometheus-2.10.0.tar.gz 11752395 BLAKE2B add59b45e3823d6ab8dcef8f00ba3dda4bb01f8edf891ee142ab790b7145fb2190ee98386dce6aae6afc3ea7bfba3c69749944828c62ed40169e56cda3f53c1c SHA512 eb67fc8a1ecd95689de0aae7e822c40395f82ec4b7f711457d7d504ffaf9a240ad9015a0c568dc93d350cea12cc3db2492bb5fe6300f6193be410b0e00d4463a
-DIST prometheus-2.6.1.tar.gz 6612143 BLAKE2B 33dc64406dd45f494720a1ff5f6d09ed4b45b3880b15626ab7455909258addc5d1549d3edbf8af9a374516930b297c5bdb6ef51a78cac3cb338357896c0d71ae SHA512 80bf6afa00b60aa4245a53e275a2b9579a7936609aba4ffacbbe478f34e530208e0498d8c5ea53dd3a940726e05bd6fac19fed3d6d9dd209af565d5368b2340f
-DIST prometheus-2.7.2.tar.gz 7276689 BLAKE2B 4fa1325b0f68bd33f4db45d3ea0fcac24bc1319284086d3ee0d3aa65c1a4ab4c37a1a67fd6e1de74e851dd90d50b566f5a1fa5b68b11c3defefd2506f5b4ce98 SHA512 3dc46069581c457005de0eefe777e93ae72b73c624d7c728973f3c64c34d68628da13d76e3527e3825309d543fd81ef7446c776e0772c1f6bf58e5ebad805973
-DIST prometheus-2.8.1.tar.gz 11097954 BLAKE2B 90add9b1daff278b8ec185eee1af5e00e26abaa6ab1f99383dd7de8ce2b99cc0612957681c36640b7a822d3b8d05e5ecb015b00409d67292d6176a058233932e SHA512 7a93d7c6e1f9fc1a57d11e6a17e6d0b3375b2e1babac0a89b8deac0834eac29b3ed7c4131c8992e4cdfd76f7d9eea0162e880fd9e44432f537e070eda647cef2
-DIST prometheus-2.9.1.tar.gz 11474112 BLAKE2B bd5916c81b56b90fc92881cc223974bdf1dc511bc0be5493977f3f187da8deea85e1af2fa0a9dec217d210c2b6714bcca677daa559f7c12e001e80c73f8148ed SHA512 d9ae1078ab5b242020f00f5dfc154a75c3e1473be8f1fbecdf8f2589d55a09f8418cbf9aa189a9b2e61b4b5fca875735a26200496c02bb17793bbccbdc9f69cd
+DIST prometheus-2.11.0.tar.gz 12133603 BLAKE2B 0036777f95b3e0f6d187129b1ab06c0ead70cd6763a3ace96bd61830e92282072978f04b264bcecf45dc3be78cfffa843a7f3caf6fb5eaecd49e41aecd376cfb SHA512 c6d292f658c99fa6a1e1a9baf0fbcb32e1da7c61bdae1dac1e77385813248c2573c1ac9533dd7b01608b6093d4753454c0f9a2167434fb26c8436ddfc7d97cd2
 DIST prometheus-2.9.2.tar.gz 11477683 BLAKE2B f0c18c57ff0fe292710174a91080a84ecf0375b4335aacaf4a8e32c842a9346b9fd48888ef8a19a597511c57eb8af7f90cca57d0cc51b9de4558c3f22953d165 SHA512 4cce1827580e49b1659ad492de946a81694c1dab90e079f3f0e56c1991254cf4ecac7f052aac75bf58a0b95d3cf4daa8c15b3e8305a3c089570da40c44a8ccc0
 EBUILD prometheus-2.10.0.ebuild 2006 BLAKE2B 6ca787542ee4f0360352dcc7f9bfaae190f6f2d6132b4c749942b979bb3a2304cc1a5b3b361c1cf014cef6d363561b20329ff371e58b4645526c3ce47ca81180 SHA512 66f860e92ba1a7054b2ec72aa60128a3a2d983091fdfae766406694ef44c34b303fe4a94efdf6f139cf221670acaaa9a92ac6477951457c4afd7c5ae2f245e37
-EBUILD prometheus-2.6.1.ebuild 2057 BLAKE2B 2f9c0dd3bc43b880df01e82bc1f0285d0f2aa8a0a248ed5164abe05aa39303785a05f2a53fcb3db2ae6a0a401b9683b86922daa7cf636a89c89eb3b8dcf8b9bb SHA512 93dc6bf0920de873ef5ad44f5a1461389bdc4d2eacdf66cbcdbbde0ce0443ac050ecd1a924f0fb4f8042f76ea189afead79140537c528ea961a2ae46fca03fc7
-EBUILD prometheus-2.7.2-r1.ebuild 1998 BLAKE2B bba14ebdcd6e12c2cb562f448da0fa5359e6a384d7ed23a55b3dbf47ab485012bb2fb5ba219962ca7000b71fa98a889321b484b54210d2d6e2ffc5bf03e0009d SHA512 8c5eaa91525bf646bd7dd393f665637e62d9fb2527e93ab8a6f32ffaf58c3616daea65d3d83b095e81be6e4852d792d5a84d7a9cef64217935e305e16cb3ed6a
-EBUILD prometheus-2.8.1.ebuild 2005 BLAKE2B 6546ff42fc6d8a6d28ae207278294cd1002c4f952c7ecc912026e591a3888ad51fcb952dbdc09963c2429d86ff308de7bf99fdda94b2134ba373a54ffcdcd305 SHA512 a61ae371278d6c1428cc99972fbd66787c78ee29d22a4e43d2de7365048a4683264f9b8f468c74f42c2f23adf6aefdb2e748c909285609fda1c53588151c5092
-EBUILD prometheus-2.9.1.ebuild 2006 BLAKE2B 67d045245eac3498e8f53bcfba2c3dfa3bf1751237def837ae33093ad2ed5c9580ca63c83bb6ed192923108a53a83e98eeb97cce4522bc9f6c04689dce789dca SHA512 cbbe31e6896d860c9b7ea40cc96f40d2c995ee10f9d101ed66ee6025e0ca14961dc273acd268537efe67128ebaf06c7ad621ebaad6b3741c83690f313958c9ab
+EBUILD prometheus-2.11.0.ebuild 2006 BLAKE2B 48e0b9fb67a2ace32ab8eb390a475fbd1264bc47965662ef2018799522465da57126767cc679fc86cf9eca0c6159f4657c1254fd7b37be93008486c2818fb169 SHA512 79589b7e746204d83f65494ccbee0019ae32968c6cf549cccd446958592e5792d68ba58537a70363863edcbba34187da5b4c6a8a80b5cecf005aa1f2b67c3d8a
 EBUILD prometheus-2.9.2.ebuild 2005 BLAKE2B be44fa8627cb4ba1be2f6696bf8a7086bdf720508bf1fd47d451f7fcc0d54b7f97e6ba1c46260a71dca1a18fbca3013ae861cdf6437c6d9a25140e731d10e5d7 SHA512 937cac2265388d791b486b5131692f3d8fa30bf0fe20d76fe35f0ea44087a9fb036a5557a3deb70d8627ba4783525ce8510f9531190a097ffea6f91834161f7d
 MISC metadata.xml 331 BLAKE2B 80bf59233349fc1fdc6c102fb65ba146bcde2c5c2a6039ec9b9f50f21a36fb1e8c864cba422e721d01216c792ffcf0429a3a840540305442b5e516ac09c03850 SHA512 06fd0da413c0280a902bbdf50e1e0557375d2208021fda3c3081d8a25a4b17ad1ca647d994dd97ba2d838ea5c87148d3ffd13a8a54cb8dc007b45927df8de47a
diff --git a/app-metrics/prometheus/prometheus-2.9.1.ebuild b/app-metrics/prometheus/prometheus-2.11.0.ebuild
index 558158dc117d..ce78bb584332 100644
--- a/app-metrics/prometheus/prometheus-2.9.1.ebuild
+++ b/app-metrics/prometheus/prometheus-2.11.0.ebuild
@@ -6,7 +6,7 @@ inherit user golang-build golang-vcs-snapshot
 
 EGO_PN="github.com/prometheus/prometheus"
 MY_PV=v${PV/_rc/-rc.}
-PROMETHEUS_COMMIT="ad71f27"
+PROMETHEUS_COMMIT="4ef6600"
 KEYWORDS="~amd64"
 
 DESCRIPTION="Prometheus monitoring system and time series database"
diff --git a/app-metrics/prometheus/prometheus-2.6.1.ebuild b/app-metrics/prometheus/prometheus-2.6.1.ebuild
deleted file mode 100644
index fa109dc86cc3..000000000000
--- a/app-metrics/prometheus/prometheus-2.6.1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit user golang-build golang-vcs-snapshot
-
-EGO_PN="github.com/prometheus/prometheus"
-MY_PV=${PV/_rc/-rc.}
-EGIT_COMMIT="v${MY_PV}"
-PROMETHEUS_COMMIT="b639fe1"
-ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="amd64"
-
-DESCRIPTION="Prometheus monitoring system and time series database"
-HOMEPAGE="https://github.com/prometheus/prometheus"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	>=dev-lang/go-1.10
-	dev-util/promu"
-
-PROMETHEUS_HOME="/var/lib/prometheus"
-
-RESTRICT="test"
-
-pkg_setup() {
-	enewgroup prometheus
-	enewuser prometheus -1 -1 "${PROMETHEUS_HOME}" prometheus
-}
-
-src_prepare() {
-	default
-	sed -i -e "s/{{.Revision}}/${PROMETHEUS_COMMIT}/" src/${EGO_PN}/.promu.yml || die
-}
-
-src_compile() {
-	pushd src/${EGO_PN} || die
-	GO111MODULE=on GOPATH="${S}" GOCACHE="${T}/go-cache" promu build -v || die
-	popd || die
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin promtool prometheus
-	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
-	popd || die
-
-	newinitd "${FILESDIR}"/prometheus-3.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/prometheus-2.7.2-r1.ebuild b/app-metrics/prometheus/prometheus-2.7.2-r1.ebuild
deleted file mode 100644
index 7b06b19766f1..000000000000
--- a/app-metrics/prometheus/prometheus-2.7.2-r1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit user golang-build golang-vcs-snapshot
-
-EGO_PN="github.com/prometheus/prometheus"
-MY_PV=v${PV/_rc/-rc.}
-PROMETHEUS_COMMIT="82f98c8"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Prometheus monitoring system and time series database"
-HOMEPAGE="https://github.com/prometheus/prometheus"
-SRC_URI="https://${EGO_PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	>=dev-lang/go-1.10
-	dev-util/promu"
-
-PROMETHEUS_HOME="/var/lib/prometheus"
-
-RESTRICT="test"
-
-pkg_setup() {
-	enewgroup prometheus
-	enewuser prometheus -1 -1 "${PROMETHEUS_HOME}" prometheus
-}
-
-src_prepare() {
-	default
-	sed -i -e "s/{{.Revision}}/${PROMETHEUS_COMMIT}/" src/${EGO_PN}/.promu.yml || die
-}
-
-src_compile() {
-	pushd src/${EGO_PN} || die
-	GO111MODULE=on GOPATH="${S}" GOCACHE="${T}/go-cache" promu build -v || die
-	popd || die
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin promtool prometheus
-	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
-	popd || die
-
-	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/prometheus-2.8.1.ebuild b/app-metrics/prometheus/prometheus-2.8.1.ebuild
deleted file mode 100644
index 555b997a3d4d..000000000000
--- a/app-metrics/prometheus/prometheus-2.8.1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit user golang-build golang-vcs-snapshot
-
-EGO_PN="github.com/prometheus/prometheus"
-MY_PV=v${PV/_rc/-rc.}
-PROMETHEUS_COMMIT="4d60eb3"
-KEYWORDS="amd64"
-
-DESCRIPTION="Prometheus monitoring system and time series database"
-HOMEPAGE="https://github.com/prometheus/prometheus"
-SRC_URI="https://${EGO_PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	>=dev-lang/go-1.11
-	>=dev-util/promu-0.3.0"
-
-PROMETHEUS_HOME="/var/lib/prometheus"
-
-RESTRICT="test"
-
-pkg_setup() {
-	enewgroup prometheus
-	enewuser prometheus -1 -1 "${PROMETHEUS_HOME}" prometheus
-}
-
-src_prepare() {
-	default
-	sed -i -e "s/{{.Revision}}/${PROMETHEUS_COMMIT}/" src/${EGO_PN}/.promu.yml || die
-}
-
-src_compile() {
-	pushd src/${EGO_PN} || die
-	GO111MODULE=on GOPATH="${S}" GOCACHE="${T}/go-cache" promu build -v || die
-	popd || die
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin promtool prometheus
-	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
-	popd || die
-
-	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
-}