gentoo auto-resync : 28:03:2023 - 09:49:10

5 files changed, 45 insertions, 86 deletions

diff --git a/app-metrics/prometheus/Manifest b/app-metrics/prometheus/Manifest
index 1bdf2a6b58e4..c611a309428d 100644
--- a/app-metrics/prometheus/Manifest
+++ b/app-metrics/prometheus/Manifest
@@ -1,16 +1,12 @@
-AUX prometheus.confd 43 BLAKE2B c83afa8ad1133c9e93abd40c862ff5b3ac9a3b3c4447b915ae1482d92096dec9f200d089de2458a6cdb0e72d2bf0652d56e3afd6d5a3cd8a3ed7a6c9a0e3e42c SHA512 37468e897cd34b50b0edc65ada3f0c2e05459c3d96bb7f82d58b6de5bf10a127f1bf7912af93d83d94e3ea7287cfeb2311e36535f291d01a11d152a0b438591c
-AUX prometheus.initd 929 BLAKE2B d48650b11b77d4d04b5458682456fb20f8085dc3efe9d0ddd2a6c75751ddae156bbb83c20082bc7b6833395602c24da61e2f7610bdff291e05e3eeb4fb651317 SHA512 504122eb8ed19beac81987b77eb78bba9b36b2ef15f28b1a542804271046e06363baf464f3c303982f647eba65fbc2b5459235f56625e1ff3fed9834937cd0d2
+AUX prometheus.confd 869 BLAKE2B 2106111f7f89604379aa450de88b4902df56d744872183ae4b4f293fa675a46755366121492a04bd1595f165a20e509023c027265945032aec021791619f65b7 SHA512 fa23f8805e7f7965462d07fd0ae366b6978db3388f9fc541f0f8e5e8f035adfa396ae1813994da58afaf506558348079b67154955f308ce045c835b9f2cc83a3
+AUX prometheus.initd 1257 BLAKE2B 1f4f8c0c3f6223d3d0c4817df067ec7a6d4b10b32c3f82f00702bc9ecfaddc90f71f7df81baf2b4ecd69f99f0f7462a03106d2b7a6da1d049966342a5530e312 SHA512 135f26ccc5c754557f196f2eacacf0d57f3b68c271aeaba42018423474ca39bcaf05605f911c958fccce7d3020293bdf0cac3d1a0b04e60af7ab910b3e0fa335
 AUX prometheus.service 534 BLAKE2B fcae8c118b19169e6cdf7469754307ff9037ad72991cd1b6f3f816b51ac4716b75d5623ead83cf4b4d1b8a26fcd3ce54c16bff400e454b9ba00c7149e7c4120e SHA512 84eaffba13c030dc7b2b9dcdf4c96eb12ea5ca16e569ea4f9d4647b1bf912c00826f12cabf02cd97c0e2e76646ab9f179429a92bc32d49ba33c6360ec3cfce8f
-DIST prometheus-2.37.5-assets.tar.xz 43891228 BLAKE2B f0bf050e9de3d790fd826c96b176a9d44292435e21df6fefc47c53f1a0bd71838711120155b64b6696a98aa6babcb8388ca5711b2a1ac5b6a653628f9890513d SHA512 639c3a84ea2b2f75d646feb21f1b33276fe06aa3c76348a34bd7b1173e2525d7de6ff313c049923eb142c617a26c065034a22b72b8f57c4e2c552f19d8294da5
-DIST prometheus-2.37.5-deps.tar.xz 251720200 BLAKE2B 78ddab5fee6f0f64c7413058e622fd40e3e486318e5749befb3f204e2df52dada16ecad755c02d0583826b80904b53d41a973c348f1af6462cd077f2157c38e4 SHA512 eed981ff5ae07f79fbb38d59905c124b1766d3047bcf103aa416379f9d370cc0ad878a15aceacd0a450100166b9c8e1c7c5dae9605c3bcd9f96bd89929b41136
-DIST prometheus-2.37.5.tar.gz 6048663 BLAKE2B c3dfaee0093f50ce5a9bfe7fd27a21d77593fa983838d89a30f890fcccd543c1d3dda35e7bbb01181649321b6b652c9aac83f8d247bd28058b4fb5a7f4e10f0c SHA512 3c3617e03b036bc1a7a7347d57823c2fa342a5aa4a113ddcc6af2367c2be90ba71042208eb146ed50320e9f6a8ab55edb8239aadb5654c76590b46249fac8bd6
 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
-DIST prometheus-2.41.0-assets.tar.xz 45792212 BLAKE2B 79e494a983d1e666b2e706532c2bd16562382b458132af2c8f26ab684097bd70384e1a11d0926662592b0d3133cab4435b16d1e2d7f1cd3a3b237831cf762dc4 SHA512 a35ec5b31fa05f2f044b9b843095cf68913664f88a4b9f64479ae2392682a7a7c8cf5e7239340ff260bf151c92d06929284174371cac072d32355103d9257131
-DIST prometheus-2.41.0-deps.tar.xz 254253988 BLAKE2B 8ba4697b53a99660d9191097fb734c1024b8b9a437c18d9eaf0a10e7e065364e34eb419751fce253188aa3ec6714ab1231ed85d11469dd76fe1eb76e4cdd4360 SHA512 87f591c93bec487210e9adf4c486f96fc02b708f923b4dd01f4e264a800190733f36718170f5da647e5aef4839214809e850ffac3cad17cb80957adaa80ef5a9
-DIST prometheus-2.41.0.tar.gz 6184846 BLAKE2B 525fca8b006b0edf9c6c3e71120b4c11af1e08966108c21ab4897501f64d454b3ac2ac7c5f986485d2c1c2d2186f3dc131ad6df1499f5006fa68473de7fc0aed SHA512 87076421a9c641c3553fe039a5de6e6c0a63f44869895bc0741a446bd150a59ca77eaa4080bac61ecbc3c4bf378ea79fabe1e640710793cd8c83a20ba7e4a5e1
-EBUILD prometheus-2.37.5.ebuild 2279 BLAKE2B 8f7bf02ab9654b392e78b69c5cd47498744802615d35b85e62df2d42c910c8d4e6662ddef06c64c3bd00aae05aec32f708c4de966eb7d999fc972aaec82de91d SHA512 2d785cf4b895388d67bab2ba9bd95eaf9a639169b3f18c2c5d914637470453e4eb760acc7ac9e559ee2cd6e658051b5e8ae86348597ac9220b9db835d37aa48f
+DIST prometheus-2.43.0-assets.tar.xz 45483188 BLAKE2B 603ba713947954d5c54748cc5778d7c3f6f3ef90abbb73eb3b44269c4b2973290e408d284abe83d30d99107be6007feeb2078d70b4fba71a8b4e612cd7e923a2 SHA512 8a15a3ebbeb8ae27d20d036ee7a9eae09ca8829f8e5b96ebe662e078e57ec02c3654916f705101ea1e371d7b79a4ea9f98b3c3f0433137c7750699e6bf3e0d97
+DIST prometheus-2.43.0-deps.tar.xz 261021244 BLAKE2B b2f9af3e1f511135dd782f99aa552c6f20f2196eca95bd88643e4c29c03be81ce5e9fe8818c7700680cbac8c853a9f8c98cc10c517e28cecbf67db257a224019 SHA512 304f49997a8a466811b7a383a2512a47f15f0c0be878af1818698231d7bfbead8974bba31b30fdad59185c00915f45652a68b9f4b52950e81fe6dfa957906358
+DIST prometheus-2.43.0.tar.gz 6228230 BLAKE2B d004bb077c70849e7d9e0c28420582475f32d6b5541c12f3c79af02b897fd9df0847c27317cdffe7ccc4183a31e7d0d0535ce980dfe79b3a517a7a6d819645f3 SHA512 d84fcd064224c6b0a9306151ce96052bac53b5c08f6a69ced88e6424c65d1c6143e82a863ac5c9e348a7be97bc2caa38f64f521a5b050e710b474025f6e41014
 EBUILD prometheus-2.40.4.ebuild 2279 BLAKE2B b1ed565eb7fb2c5c486109a219e595f47e97d099ad437371c2a2cef28d396b7faf90e1b532fc198db3dc3acdc28da0939895a2edb9cc6434c6a172971856d9d3 SHA512 8a9732252fba87970d586fb789cf6cc55749fcff9ae698508df7dc82aabcc1a45e165fed27e9f0abd3c904a943b1432c419d1185767d99393314d70b8f3595a9
-EBUILD prometheus-2.41.0.ebuild 2280 BLAKE2B a0ebb6f18deaaf9dfd4825e6a013bffacfa15f609dc90379b9aa9eabe0cf1517120d8893801f84e3edd47871ed589913230a15e3916c427553d96ee2b060af6b SHA512 885e93ffa09914532b817352f815fa8a525d8a5e3215424d2c17371507faae8e8a3866ec078a018a989689ac1a5c0d39aefbe6a8b561d673f42bca84f49df15e
+EBUILD prometheus-2.43.0-r2.ebuild 2292 BLAKE2B 6ad9750802efb51fb28bcf6199925ec765178b4b3b97622e29212c76beca63c6ee62ba18560ee52e42f5c5c92c1bd243ad65815c23adba8687cde83a7ae680d5 SHA512 7b484d87d98f11795c49620dba45df8ed456f9332d1fc935f3e39bdef8a503cfb1d61531749386cc6618a7ec9fb1cd8b69963689ce2684c757ce97897cb6077b
 MISC metadata.xml 335 BLAKE2B 076c290a728cbf3dd8831aea0ac3bfe973d4dd199bef806d166d6b08ac60bda5ef845305c7bd43385a54def93a3e4b6de70d40b099b80dc0e8693bbb167373ef SHA512 f33ad70518cea19f0ee71187f2daf24e3b5eb27d82e58512338768abdd85d13c3f464038729f560a844cff142daeb900cbfef99c338add6ad17d6746edb7964d
diff --git a/app-metrics/prometheus/files/prometheus.confd b/app-metrics/prometheus/files/prometheus.confd
index 93b41b31624c..19a286f5677a 100644
--- a/app-metrics/prometheus/files/prometheus.confd
+++ b/app-metrics/prometheus/files/prometheus.confd
@@ -1,2 +1,26 @@
-# arguments for Prometheus
-command_args=""
+# additional arguments for Prometheus
+#
+# command_args should not be set in this file. Instead, you should set
+# prometheus_args.
+#
+# The default settings are listed below.
+# If you are not changing these settings, you do
+# not need to include them in prometheus_args.
+#
+# To migrate from using command_args to prometheus_args, drop any of the
+# default settings below that you have set the same way then switch to
+# prometheus_args.
+# 
+# The new behavior is that prometheus_args will be appended to these
+# defaults allowing anything you add to override them.
+#
+#The default settings are:
+#
+# --web.enable-lifecycle
+# --config.file=/etc/prometheus/prometheus.yml
+# --storage.tsdb.path=/var/lib/prometheus/data
+# --web.console.templates=/etc/prometheus/consoles
+# --web.console.libraries=/etc/prometheus/console_libraries
+# --web.enable-admin-api 
+#
+prometheus_args=""
diff --git a/app-metrics/prometheus/files/prometheus.initd b/app-metrics/prometheus/files/prometheus.initd
index f7371f8ca060..00e3c25ebe84 100644
--- a/app-metrics/prometheus/files/prometheus.initd
+++ b/app-metrics/prometheus/files/prometheus.initd
@@ -9,7 +9,18 @@ group=${group:-${RC_SVCNAME}}
 command_user=${user}:${group}
 
 command="/usr/bin/prometheus"
+if [ -z "${command_args}" ]; then
+command_args="
+	--web.enable-lifecycle
+	--config.file=/etc/prometheus/prometheus.yml
+	--storage.tsdb.path=/var/lib/prometheus/data
+	--web.console.templates=/etc/prometheus/consoles
+	--web.console.libraries=/etc/prometheus/console_libraries
+	--web.enable-admin-api 
+	${prometheus_args}"
+else
 command_args="${command_args:---config.file=/etc/prometheus/prometheus.yml --storage.tsdb.path=/var/lib/prometheus/data}"
+fi
 command_background="true"
 error_log=/var/log/${RC_SVCNAME}/${RC_SVCNAME}.log
 output_log=/var/log/${RC_SVCNAME}/${RC_SVCNAME}.log
diff --git a/app-metrics/prometheus/prometheus-2.37.5.ebuild b/app-metrics/prometheus/prometheus-2.37.5.ebuild
deleted file mode 100644
index 02d3f583d761..000000000000
--- a/app-metrics/prometheus/prometheus-2.37.5.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit go-module systemd
-GIT_COMMIT=414d31aee6586a5f29e755ae059b7d7131f1c6c8
-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.41.0.ebuild b/app-metrics/prometheus/prometheus-2.43.0-r2.ebuild
index c22eb2ffd1c7..ff0cb6c8462d 100644
--- a/app-metrics/prometheus/prometheus-2.41.0.ebuild
+++ b/app-metrics/prometheus/prometheus-2.43.0-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 inherit go-module systemd
-GIT_COMMIT=414d31aee6586a5f29e755ae059b7d7131f1c6c8
+GIT_COMMIT=edfc3bcd025dd6fe296c167a14a216cab1e552ee
 MY_PV=v${PV/_rc/-rc.}
 
 # To create the assets tarball run the following:
@@ -38,7 +38,7 @@ src_prepare() {
 		-e "s/{{.Revision}}/${GIT_COMMIT}/" \
 		-e "s/{{.Version}}/${PV}/" \
 		.promu.yml || die
-	cp -a -n "${WORKDIR}"/web/ui web || die
+	cp -a -u "${WORKDIR}"/web/ui web || die "cp failed"
 }
 
 src_compile() {