gentoo auto-resync : 30:11:2022 - 01:22:10

4 files changed, 5 insertions, 81 deletions

diff --git a/app-metrics/Manifest.gz b/app-metrics/Manifest.gz
index f03bf93c290a..4090b56b811d 100644
--- a/app-metrics/Manifest.gz
+++ b/app-metrics/Manifest.gz
diff --git a/app-metrics/prometheus/Manifest b/app-metrics/prometheus/Manifest
index 707ac11446e8..5a521e164bd6 100644
--- a/app-metrics/prometheus/Manifest
+++ b/app-metrics/prometheus/Manifest
@@ -1,12 +1,8 @@
 AUX prometheus.confd 43 BLAKE2B c83afa8ad1133c9e93abd40c862ff5b3ac9a3b3c4447b915ae1482d92096dec9f200d089de2458a6cdb0e72d2bf0652d56e3afd6d5a3cd8a3ed7a6c9a0e3e42c SHA512 37468e897cd34b50b0edc65ada3f0c2e05459c3d96bb7f82d58b6de5bf10a127f1bf7912af93d83d94e3ea7287cfeb2311e36535f291d01a11d152a0b438591c
 AUX prometheus.initd 929 BLAKE2B d48650b11b77d4d04b5458682456fb20f8085dc3efe9d0ddd2a6c75751ddae156bbb83c20082bc7b6833395602c24da61e2f7610bdff291e05e3eeb4fb651317 SHA512 504122eb8ed19beac81987b77eb78bba9b36b2ef15f28b1a542804271046e06363baf464f3c303982f647eba65fbc2b5459235f56625e1ff3fed9834937cd0d2
 AUX prometheus.service 534 BLAKE2B fcae8c118b19169e6cdf7469754307ff9037ad72991cd1b6f3f816b51ac4716b75d5623ead83cf4b4d1b8a26fcd3ce54c16bff400e454b9ba00c7149e7c4120e SHA512 84eaffba13c030dc7b2b9dcdf4c96eb12ea5ca16e569ea4f9d4647b1bf912c00826f12cabf02cd97c0e2e76646ab9f179429a92bc32d49ba33c6360ec3cfce8f
-DIST prometheus-2.39.1-assets.tar.xz 45639572 BLAKE2B 291998ea03128042cf5fa1ac40c3bac2bea298e44b408bc4a4dcb15ab3e7899b12850f4ae9bda37fbbf1756e53043ae7c29e7b2d28b1e60e2ccaf8b83308443a SHA512 356abf7b08030c474c083d2eb3e4a0635c8f6b3b1ab6639c112c619efa5135535b1258fa3c4a1e2987ae032ab6662651abf4468b34385158eed3217459d3fb87
-DIST prometheus-2.39.1-deps.tar.xz 251770124 BLAKE2B 39d1ae2affbdc0dedfa16b3802b78987878e2d46a1af7ac5bf3416626f72f7a6963c92d2358940cda074ce7d5196b8b3b7a6b802592a29401586e7923e5e0ae5 SHA512 a93abc79f0d06bd86b802d3c8e868e65b9dc1653ce8c1b3af9ab7e40a3e43cc47b6fe600e7005f730716849ecf0d0cc8b60939e35883fdcc47f9922a732122ec
-DIST prometheus-2.39.1.tar.gz 6045708 BLAKE2B 306a93c74257bbd33994538d7679d730a0926ac55280e1198b0d528c4c20c44f9ad3e0b4ca3a820e45ace114ade9c60f12f80846900213e0da0850399856afdf SHA512 d3c61a366ee14fff9ebf554e94647ec27ea21f3d829396d6b132dfe268a9153e30f4ce63d762d79593e6876246cd110b52da1e196f55390c5c657d5a57df0055
-DIST prometheus-2.40.1-assets.tar.xz 45591668 BLAKE2B 76f1a6aa2eece8977b1573da51befc56dab7de95302b837d108a90b2e68640cbd7a37dc5ca09e385ba7f6ac5f4cac8fe902380e0c3c747909a27662e01e83c75 SHA512 38bb67689466bd864b7dff930d712f679fb2d56494641e99d5999a9df583c5cb9db24c5eccf951e944fb91cb564dfaf3905ea1159ff6975c672531fe7be34f8f
-DIST prometheus-2.40.1-deps.tar.xz 253177652 BLAKE2B a0120addebe8ef5229af8f24624584b25bf625be9072d66b037ca9802190ec3c4451b735c9e31fbc9fd8a08a17e1c0c7f9c7602d1ff2f4bff1619c98a5eb1a35 SHA512 856dcb15f54eec34ca9216fe626165e08096f4114be62721b0edb3d07583ff0ff22d962e2d9ed0094626e42c5131c38908f1ba96327f741ff349b2f5fc237cd7
-DIST prometheus-2.40.1.tar.gz 6156441 BLAKE2B 9b65733370e6f11ec559f7a4f2d80320d33d9cca29fb9609da3a255d90f06f14482976b5bbd58fc553b7d60a317cf8be0d1b6217128325f594ac9a4424cc3dbb SHA512 077c8aa2e4f6d51501b3281ab394afa26b0a9a8a7d5ed8f437b98e0bd83aceb3337bd877afc8942bf6b007dcfb53fbbafc746a5f305c9ba79bec55f0afbb0d58
-EBUILD prometheus-2.39.1.ebuild 2279 BLAKE2B af820df9acb8be788724f331ddd41eafa2ca6839d5013b262bcfc1504559ae6f8e89f920f0250d485b5987d20087e7746640e2becc9c1e6174613f8e93d7631e SHA512 3844794a3ee60e190df7ca6d0c46559be95186391a852d4ac0338dfb25ec2a1257fd55d198ba29e0e43c78fcb4ad0467d1fb97ed82192ef8354ebe405487f738
-EBUILD prometheus-2.40.1.ebuild 2280 BLAKE2B 962a93b576edd5b9a7e3eb147479e012cbd8e8a9d1a1c952f231d066bbc9fc042af6955680dc764edf6c4fad30f53fb17440afaf1db0a6edad114b0bc3335a65 SHA512 eb9f7e1829908d4724691c06b538a1c926af96af4e50d7880c0b9be45c67e6d9f944022f3c888a7d1316ea401da6bb5d60635aa1d30d58bc43990ec5375b6131
+DIST prometheus-2.40.4-assets.tar.xz 45585656 BLAKE2B b187b6683c778b5e9746f1f9695e03303cf5481387bb0517afee56685edc62bbb82c515f8dfeeafeb09a74b57b540da49d1936c7ec74b3013adc7afc8f07ea5f SHA512 8a229504b66bac0ef2fa7a9caafc93fdf3e1c9aa33e892219e57a21b44355515e69a232db98ce4f5664fb98cb37cfb3ec619eb2a3ccf662474544dfdbbba580c
+DIST prometheus-2.40.4-deps.tar.xz 253189332 BLAKE2B ca2c2f3e111897ac47d71acc3046230608134c854f7af7a4c5ec1fe75dfbb61c6bf278fe00f77ecf65113b72cbd67171634a0fbf57ad09e3349a7e8f45791e33 SHA512 29bf419e45d389805b1f37256cb8a9ce9cc6cb88b3cd4a7a1681121f24158cce7aa5a949554f5344409ba4f683976866bfc766666e2a0a247996c135d2068b6f
+DIST prometheus-2.40.4.tar.gz 6156657 BLAKE2B a522b31516f5e26475afa2d59a7074b7deb2a70ffbf7cce6e3951bfeacc6dae6d8f59d1b1b591d1c59c0ac9839bc691ce315d55f7fe0a45be573e124f651764b SHA512 9b46f9f3b986929bdfe365645e43c0a3c2073b920e59cc512287f866506d7db7b83ffb2dbe24d1835fccc1b2cc781be7a373da5fb58c04521648981b19e81737
+EBUILD prometheus-2.40.4.ebuild 2279 BLAKE2B b1ed565eb7fb2c5c486109a219e595f47e97d099ad437371c2a2cef28d396b7faf90e1b532fc198db3dc3acdc28da0939895a2edb9cc6434c6a172971856d9d3 SHA512 8a9732252fba87970d586fb789cf6cc55749fcff9ae698508df7dc82aabcc1a45e165fed27e9f0abd3c904a943b1432c419d1185767d99393314d70b8f3595a9
 MISC metadata.xml 443 BLAKE2B e6f1b0fa6c89174aebf787bdfe37000233cb29f68aecea6b2586af76216c04fa094e6dc08793092c36e51b2f34887a968174960e55c45fcd3d2c91f93f3b1ee1 SHA512 13cdf9d1e49aeb1470223c4cfa830c3063e5816141afddfffe6eb6078b9118cab262bc520b873254e65b81663042f317b5797e35b74e25df21cf28b46fe1477d
diff --git a/app-metrics/prometheus/prometheus-2.40.1.ebuild b/app-metrics/prometheus/prometheus-2.40.1.ebuild
deleted file mode 100644
index 9b6825201b4a..000000000000
--- a/app-metrics/prometheus/prometheus-2.40.1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit go-module systemd
-GIT_COMMIT=965274259f993801d63f553639d248588287120b
-MY_PV=v${PV/_rc/-rc.}
-
-# To create the assets tarball run the following:
-# git checkout <tag>
-# make assets-compress
-# tar -acf <tarball> web/ui
-
-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}-deps.tar.xz
-	https://dev.gentoo.org/~williamh/dist/${P}-assets.tar.xz"
-
-LICENSE="Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~riscv"
-
-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/{{.Branch}}/HEAD/" \
-		-e "s/{{.Revision}}/${GIT_COMMIT}/" \
-		-e "s/{{.Version}}/${PV}/" \
-		.promu.yml || die
-	cp -a -n "${WORKDIR}"/web/ui web || die
-}
-
-src_compile() {
-	emake PROMU="${EPREFIX}"/usr/bin/promu common-build plugins
-}
-
-src_install() {
-	dobin prometheus promtool
-	dodoc -r {documentation,{README,CHANGELOG,CONTRIBUTING}.md}
-	insinto /usr/share/prometheus
-	doins -r console_libraries consoles
-	insinto /etc/prometheus
-	doins documentation/examples/prometheus.yml
-	dosym -r /usr/share/prometheus/console_libraries /etc/prometheus/console_libraries
-	dosym -r /usr/share/prometheus/consoles /etc/prometheus/consoles
-
-	systemd_dounit "${FILESDIR}"/prometheus.service
-	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.39.1.ebuild b/app-metrics/prometheus/prometheus-2.40.4.ebuild
index f8ce6497ae7d..f88dcdde4212 100644
--- a/app-metrics/prometheus/prometheus-2.39.1.ebuild
+++ b/app-metrics/prometheus/prometheus-2.40.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 inherit go-module systemd
-GIT_COMMIT=818d6e60888b2a3ea363aee8a9828c7bafd73699
+GIT_COMMIT=414d31aee6586a5f29e755ae059b7d7131f1c6c8
 MY_PV=v${PV/_rc/-rc.}
 
 # To create the assets tarball run the following: