gentoo resync : 18.08.2019

4 files changed, 3 insertions, 143 deletions

diff --git a/app-metrics/prometheus/Manifest b/app-metrics/prometheus/Manifest
index 98d2439550a2..85a619ff184d 100644
--- a/app-metrics/prometheus/Manifest
+++ b/app-metrics/prometheus/Manifest
@@ -1,12 +1,8 @@
 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.10.0.tar.gz 11752395 BLAKE2B add59b45e3823d6ab8dcef8f00ba3dda4bb01f8edf891ee142ab790b7145fb2190ee98386dce6aae6afc3ea7bfba3c69749944828c62ed40169e56cda3f53c1c SHA512 eb67fc8a1ecd95689de0aae7e822c40395f82ec4b7f711457d7d504ffaf9a240ad9015a0c568dc93d350cea12cc3db2492bb5fe6300f6193be410b0e00d4463a
-DIST prometheus-2.11.0.tar.gz 12133603 BLAKE2B 0036777f95b3e0f6d187129b1ab06c0ead70cd6763a3ace96bd61830e92282072978f04b264bcecf45dc3be78cfffa843a7f3caf6fb5eaecd49e41aecd376cfb SHA512 c6d292f658c99fa6a1e1a9baf0fbcb32e1da7c61bdae1dac1e77385813248c2573c1ac9533dd7b01608b6093d4753454c0f9a2167434fb26c8436ddfc7d97cd2
-DIST prometheus-2.11.1.tar.gz 12133604 BLAKE2B 78370f85f9997f776b8acdbdad9db45cc34c8a18a8d467a1a839daca41cbf8ba1e50d5b359282f7062a4d9ba90d7989e13163018ac5043556be5a06dae28dbf9 SHA512 3d238466aad16faecd654f87cab45fe1097119acb241d5f8859d4d8bbeeb007e2c074eb9dc82569e3e1a9ae22a4b9cc0f40160c231d230f2f3f52b4ebf77035c
+DIST prometheus-2.11.2.tar.gz 12132678 BLAKE2B 0b6b9a93b7329c124f901d0acc6130132aa187142f0416e087c12f20b0cd35f8564a27d0df8c0bc811284b9811f446344adf700d6611afac3c5c1131c208b341 SHA512 cecdaf4522885bdf62492667d92475a97c54b04c1e93f48b6078def319fe33f5e28aafbab61e3609413615d6f853e817564fc372e5d1df0d867fe9fa333f6de9
 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.11.0.ebuild 2006 BLAKE2B 48e0b9fb67a2ace32ab8eb390a475fbd1264bc47965662ef2018799522465da57126767cc679fc86cf9eca0c6159f4657c1254fd7b37be93008486c2818fb169 SHA512 79589b7e746204d83f65494ccbee0019ae32968c6cf549cccd446958592e5792d68ba58537a70363863edcbba34187da5b4c6a8a80b5cecf005aa1f2b67c3d8a
-EBUILD prometheus-2.11.1.ebuild 2006 BLAKE2B 3a60f2bc2ecba6ac8e86057f67cde8262dab374a7e01122a3aad80e5c0e062c349ea8fd38bf7b4b067773cd26a73c92ac5092d9b62d04c7c7c55c7884138a92d SHA512 2cffd8817a1edf23f214781802d23db1092f3a455dd373f85f3124b5f449cc4d2ce1426ad9416f878188af686f3b91ebea5d1cb8ed635321ec3db2321c19e0f1
+EBUILD prometheus-2.11.2.ebuild 2006 BLAKE2B 9eb972c513982c3e8321b87490180b95048e4cb46aa64f879735f3e3c729d742cb3d2ced1873a6a4c24b8cab7a94ca95b5d41190a6a20a26ee778f63b194d770 SHA512 89b982df1c665375c9eaa9b43373ae725fec9d72b70087615f72f4c017557d6637353cdd57870b6eac1c5fcf3a1a1ed98c8b80d9c00197c8bfce31f6c14877ec
 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.11.0.ebuild b/app-metrics/prometheus/prometheus-2.11.0.ebuild
deleted file mode 100644
index ce78bb584332..000000000000
--- a/app-metrics/prometheus/prometheus-2.11.0.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="4ef6600"
-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.12
-	>=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
-}
diff --git a/app-metrics/prometheus/prometheus-2.11.1.ebuild b/app-metrics/prometheus/prometheus-2.11.1.ebuild
deleted file mode 100644
index 7a86debe75b1..000000000000
--- a/app-metrics/prometheus/prometheus-2.11.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="e5b2249"
-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.12
-	>=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
-}
diff --git a/app-metrics/prometheus/prometheus-2.10.0.ebuild b/app-metrics/prometheus/prometheus-2.11.2.ebuild
index 45f198a6df6f..54264f899cc6 100644
--- a/app-metrics/prometheus/prometheus-2.10.0.ebuild
+++ b/app-metrics/prometheus/prometheus-2.11.2.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="d20e84d"
+PROMETHEUS_COMMIT="343d8d7"
 KEYWORDS="~amd64"
 
 DESCRIPTION="Prometheus monitoring system and time series database"