8 files changed, 164 insertions, 2 deletions
diff --git a/app-metrics/Manifest.gz b/app-metrics/Manifest.gz
index 19c9f0f9ef42..a311fbd5ea92 100644
--- a/app-metrics/Manifest.gz
+++ b/app-metrics/Manifest.gz
diff --git a/app-metrics/collectd/Manifest b/app-metrics/collectd/Manifest
index d76281f12c19..05ed0db31e54 100644
--- a/app-metrics/collectd/Manifest
+++ b/app-metrics/collectd/Manifest
@@ -7,5 +7,5 @@ AUX collectd.initd-r3 1877 BLAKE2B 8e81c314abdd366a7583dd18bdad10c9d7da14589c030
 AUX collectd.logrotate 115 BLAKE2B ce2a79787096b04af6ecd128633dde68fb868a02cc1d246c3e512c1733133fcc8da41b3ab2a0051b4da78c53e6629b2ad8085872dec1d4c28e397c88cafe3a90 SHA512 87ec01784d415f00834c2b20614f11f7e08b70f88d7c87509a8b8fd7e1af8758565b9ed6a6840af7bf1006cb941a61a6ff4f3176f6ded722728f24483b08bc8e
 AUX collectd.tmpfile 39 BLAKE2B 0d1ee2f02e539e854b62b47032308d08505fa31d8428e98f8d150c924201074c5edae22eea3990edf3a7837f1473193fe009a501645bf064638c532ec53a36cc SHA512 55fb70da9ece74b143c3e971b890954842230691039f8ad2240cc4c8d699e4e7a21efcbfd0b3cb2503e90af0bbdd0c7d886e09baf9fc86ec26c115a0bce6a668
 DIST collectd-5.12.0.tar.bz2 1902756 BLAKE2B 9567c55b47c0ea5b7836c0d858c16a637c4a2054486a9d9ca6cd9951a92381bdf4f49d7dc0be0c9c9131802120d0af2e542a3997f01484c89ba135b3c46db795 SHA512 7a15e4c0ae587db4987d673a790a4f3bea1cab29ce24a506fb21fa7bd2f60bfec70867eaa1c1395cb5b0e0ae81a024fb6109b064da0ef50e7c146d2198871c70
-EBUILD collectd-5.12.0-r11.ebuild 20178 BLAKE2B 7a44e279047b10b611a480dec3ab9f9701149e1a0c333fc2b37ad87810797ba399ff14775cd63d79f05f0615ab6a65b29d1f46f9764ecb7fd76bb3b72417d74c SHA512 61effd63e98f2da537faf4570c6f28174111470d8c945537536679ec2b12bcca1f2249ebff8048a347928ee4eab5b2026dcb4cabb931ecba1e685378c0989352
+EBUILD collectd-5.12.0-r11.ebuild 20178 BLAKE2B 704b53c9d29788d933d87185e6b6d39b2da4c93969294b8a3801ca929f2001d6f0642d17a6cbcfa82eb8b31c7dadd7b75e859ac6950d01328d417ba4c5849105 SHA512 81a2f35599784711445598ebe66085cce1c0c48caff573e485517a278081573ca42fbc789c70721cfda4fb2aecf0318fcc6595a526270c8277ed0ffc0a429fbd
 MISC metadata.xml 1515 BLAKE2B 318f796bfacb0e1facbd60f80fc9176e24f06661fc4dce4acda3a218aab10766231566a9ae58f9985770513fb53a52e9ea5e985aba0bcff62c042c75fb662c70 SHA512 4c886d89143d2862a3d915e5b0ef14382c76d758a306fa9971a762fdae400086175c470045e85775f028947156a4bb40a09bd9810c56dda08662e835cba3b45c
diff --git a/app-metrics/collectd/collectd-5.12.0-r11.ebuild b/app-metrics/collectd/collectd-5.12.0-r11.ebuild
index d487dd5f4ce4..673259170978 100644
--- a/app-metrics/collectd/collectd-5.12.0-r11.ebuild
+++ b/app-metrics/collectd/collectd-5.12.0-r11.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 JAVA_PKG_OPT_USE="collectd_plugins_java"
 LUA_COMPAT=( lua5-{1..4} )
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 
 inherit autotools fcaps java-pkg-opt-2 linux-info lua-single perl-functions python-single-r1 systemd tmpfiles udev
 
diff --git a/app-metrics/prometheus/Manifest b/app-metrics/prometheus/Manifest
index 7b5cb9d6e25e..9dff9afe0cd3 100644
--- a/app-metrics/prometheus/Manifest
+++ b/app-metrics/prometheus/Manifest
@@ -1,3 +1,6 @@
+AUX prometheus-3.2.confd 664 BLAKE2B 2c94eeba469ae3052d323bd5df181901b6e68004638b32454800e97b2de457b71b7688201b6e41fb5682994570561cc4b368fb8154a053609db2614c68852e8b SHA512 225b0e57fa9f76cfe8f523183ae8e1d210e3f29fdd09b2cd1f1bea8d4556650e088f40e7d16a6fb725ffe685562d8f477d3efe7bebdfaede6d414a29a9970f20
+AUX prometheus-3.2.initd 935 BLAKE2B 5779f8aec9d7a71cedac239c75fa0703f5f2f0a7523dcd05cf19b20586534311bfdc1d7ad448267a81d951f0ae2fd165d6a1ec578601e4aa47542446c0f86830 SHA512 15492cf4c5b63211498e8c4a00f96ae70631f56975ba093da121b66a7931b5ede08a9786bdc2aeaa58c8642c5f49407e6ac86bad4583c47e268712e9790ab4ef
+AUX prometheus-3.2.service 372 BLAKE2B 4cf583d4a6c21f5cc497e24188144ef10914ef3e282e675171306e460cf565b3ccb7d5f04d9c7179224b814e418ce7ee57270c4876ac11d6d0cc9977e7faf55d SHA512 cffd4cbe2e57fe8d591515c7eb3488d4a2291b7e4680ff1dc4388e59e6764444e5797520070ef666a600a0807ee30e9c27c8fd8d6fb93cb24cc40d00cf2dc9c8
 AUX prometheus-3.confd 794 BLAKE2B 49e255f28c03d89295fdbcf06e1683ecb66cf16b461caf951b191c26cf315cac8966ef4aedc54360327804b2d9219c75fedce0de43e3f3235b8face77258a8ec SHA512 6a5bfeca5522e3441e3307ad9582995b678cd5bb6b64a6e720cfcf42c9232aa8d5c48e328ea81b97c81cbf438de15b1541b9ee97b505d19eda6dcbff6ce3ff2a
 AUX prometheus-3.initd 1020 BLAKE2B e190a48fa42cf541b7f3bb6de599714d541e6a5217842f6dab4b673bd25fe523145b859ba18bd60458154394dc503977a468a0d737d1c9899104bcf49d5d844b SHA512 ac18a1ba4626fd6ac159c8f965a828a650daed6d64832f224326ddd59ddd3bade7aec63baaf9a1274e1f1772e2d4b1b8c65e221c0ee67e1bb82c8a00849ec7da
 AUX prometheus-3.service 419 BLAKE2B 931fdf45b64f266e6fe0718f6dadfc8622a48b41512cbf595ef104589f667f88b5b00dabce7912f5a1d04d90fec2fff5567d9b52ec9ec6028801a8f2a4f22027 SHA512 fcb492b0a6e18757141836c1c3c801590f6b23ee66f0d906f3706aa311e8df83dc389d3033d75d9c6a4b93462fd7255c4c6e9d9cdf9159f82824f8a557f8dfc4
@@ -10,6 +13,10 @@ DIST prometheus-2.52.0.tar.gz 6192779 BLAKE2B 488483b32ee0927f2d0aa5d7bd1f82dee3
 DIST prometheus-3.1.0-assets.tar.xz 78517784 BLAKE2B df17c7a545d1efe770d70d0d250d03bc8c1887df34fedde3a785de1c03004de209c0d30287bd7abd134550afac39152c57a3e37271ca3baa5487e40b3352f300 SHA512 96293cc3395e5a3a7a7b64ee3c8372255e1cfe9986145f09656a82dfea19019fff517ffd622de9edfa93fa62bb02dac09cd1e85bec105190eae359aa0e88a1f9
 DIST prometheus-3.1.0-deps.tar.xz 126208728 BLAKE2B 36007a7ea302badaee745a49fb706f870c62c6ed9dd1ad5616ebf70e5cde05b5f7d8143c3d1a1f6bfbaca7dae1b00fb0d83347814245fe2a6db10073a85b6175 SHA512 1740230d930bf038e5d7eb1655e506bda88f2161be9d831ab06902d7559c12973367d13b05aa9c0d3f44a8f9cd9a0ac1e14a2e162da775e6f1cee4b97e0e18cf
 DIST prometheus-3.1.0.tar.gz 4973352 BLAKE2B ac8f68002f3924f79ee2a75aed8ea585fc09a9d0188e2b5e97152896717f04855124335ca6713e97c399109c6d087c1098dd2dc1485440dca775c5e34a5a52ef SHA512 9e61ba2aae62319f0da8b01a52d033f504adb5155955cc0d74bef251aa06b7a01f9df8e3347ceb1031826ec7518773423a342c6ee526b9d48577701594c973bc
+DIST prometheus-3.2.1-assets.tar.xz 78754104 BLAKE2B 142dcf8bf5e2fd7d241f5ed0e7d9ed5beaea413b631a8c80b93766aa7554ef125c769d262b6af23efd128eb787d40c673e75dde917fe0ded9518581194c80901 SHA512 8f1b74397d111676a091dc58730e180a9d350726d2195daebd40dad8f90deb7e226919864e4bb7206a1b95cb082e227a19c3406ff53eee177874a0b53e5accc9
+DIST prometheus-3.2.1-deps.tar.xz 137051124 BLAKE2B a0b74c935bfcfc2dc369ed9e3474e4da25f69a1da6d602524b21958858550f892d1c7e1b4d414e9c075445055608910c21b3e72b82076313f733b39e03c42b2e SHA512 b187411b7e3586c638a9c7cdbf3289255e8fee987a95f17e2d606ebfbd31e4926472990ad7d92a0b416592a227a0e238be64b2ce8444312134ce050d619b4e52
+DIST prometheus-3.2.1.tar.gz 5001971 BLAKE2B f341e177c94ca949fa374603d57356ba191daa7ffd5f2edda532cdb4b977f25dbbb241e6a08dc04dbc6aac4c0cf4e5db951c0add5fd92451fecacb9eac2e422f SHA512 6e6a972c23efaba80699d2f82f4ca3fbe2bc81644d9a4540a3a82c556009a5388a2e81e7548792fa01f7cfea8727d3aa8c9e4bc0f0538f0016e0a88502399c51
 EBUILD prometheus-2.52.0.ebuild 2298 BLAKE2B 549408cbbd64e1810b40fa6e9a6985a59e2749918a5915b3c8e9f2cbd264174c5d0ae1629cd6ce0ebf8911b99b90bc9dae81d4c7fcdf4e3c83cc34c92c2aaf4c SHA512 beac148cf7b382d2c103ce14ce01590d2d218dcb4ddb02f7ee971b59e03eb69cecea236b9c5bc375676efd0990af806273df2d50d877ccb44a9e80caab87c722
 EBUILD prometheus-3.1.0.ebuild 1734 BLAKE2B 76932eac1f0e9327138d9f047e1e91632cd89fde2f52932760b8d957a15ce08ae4f389f3a40e697e51d89c8a7b96eda85c778ff94ce1134cc3c9ce519b5cc6af SHA512 8b84d1643b93e16de094a6812e6f5dbdeef89fc6a920516a97615ad9ad200bcc0d8c09d532cd23794881dca012dea8c13de378c230097ea387a29b76aa960096
+EBUILD prometheus-3.2.1.ebuild 2413 BLAKE2B 12dcf4c46613f40d1835ec1b8347a63a6ef76db849937437f060c6863807d419aeddda38346c83d397b4096c243b49f6e47c84afd5dc7ccf95413cfe939fe73c SHA512 454032ee0d46186f31c0651f42868dbe044bedeeb99961bbd6da304b0e9d52f47a1cbec02bb2ff2547e73064da59c06cc6a3e1712d330e6dabc5b8fdd1841d5e
 MISC metadata.xml 335 BLAKE2B 076c290a728cbf3dd8831aea0ac3bfe973d4dd199bef806d166d6b08ac60bda5ef845305c7bd43385a54def93a3e4b6de70d40b099b80dc0e8693bbb167373ef SHA512 f33ad70518cea19f0ee71187f2daf24e3b5eb27d82e58512338768abdd85d13c3f464038729f560a844cff142daeb900cbfef99c338add6ad17d6746edb7964d
diff --git a/app-metrics/prometheus/files/prometheus-3.2.confd b/app-metrics/prometheus/files/prometheus-3.2.confd
new file mode 100644
index 000000000000..b6857c42ab02
--- /dev/null
+++ b/app-metrics/prometheus/files/prometheus-3.2.confd
@@ -0,0 +1,22 @@
+# 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.
+#
+#The default settings are:
+#
+# --config.file=/etc/prometheus/prometheus.yml
+# --storage.tsdb.path=/var/lib/prometheus/data
+#
+prometheus_args=""
diff --git a/app-metrics/prometheus/files/prometheus-3.2.initd b/app-metrics/prometheus/files/prometheus-3.2.initd
new file mode 100644
index 000000000000..21242af90625
--- /dev/null
+++ b/app-metrics/prometheus/files/prometheus-3.2.initd
@@ -0,0 +1,37 @@
+#!/sbin/openrc-run
+# Copyright 2016-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+description="Prometheus monitoring system and time series database"
+pidfile=/var/run/${RC_SVCNAME}.pid
+user=${user:-${RC_SVCNAME}}
+group=${group:-${RC_SVCNAME}}
+command_user=${user}:${group}
+
+command="/usr/bin/prometheus"
+command_args="
+	--config.file=/etc/prometheus/prometheus.yml
+	--storage.tsdb.path=/var/lib/prometheus/data
+	${prometheus_args}"
+command_background="true"
+error_log=/var/log/${RC_SVCNAME}/${RC_SVCNAME}.log
+output_log=/var/log/${RC_SVCNAME}/${RC_SVCNAME}.log
+
+extra_started_commands="reload"
+
+depend() {
+	after net
+}
+
+reload() {
+	ebegin "Reloading configuration for ${RC_SVCNAME}"
+	case "$supervisor" in
+		supervise-daemon)
+		supervise-daemon ${RC_SVCNAME} --signal HUP
+		;;
+		*)
+		start-stop-daemon --signal HUP --pidfile "${pidfile}"
+		;;
+	esac
+	eend $? "Failed to reload ${RC_SVCNAME}"
+}
diff --git a/app-metrics/prometheus/files/prometheus-3.2.service b/app-metrics/prometheus/files/prometheus-3.2.service
new file mode 100644
index 000000000000..816a4bab3072
--- /dev/null
+++ b/app-metrics/prometheus/files/prometheus-3.2.service
@@ -0,0 +1,17 @@
+[Unit]
+Description=Prometheus Server
+Documentation=https://prometheus.io/docs/
+Wants=network-online.target
+After=network-online.target
+
+[Service]
+Type=simple
+User=prometheus
+Group=prometheus
+Restart=always
+ExecStart=/usr/bin/prometheus \
+  --config.file=/etc/prometheus/prometheus.yml \
+  --storage.tsdb.path=/var/lib/prometheus/data
+
+[Install]
+WantedBy=multi-user.target
diff --git a/app-metrics/prometheus/prometheus-3.2.1.ebuild b/app-metrics/prometheus/prometheus-3.2.1.ebuild
new file mode 100644
index 000000000000..805da2cb56a2
--- /dev/null
+++ b/app-metrics/prometheus/prometheus-3.2.1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module systemd eapi9-ver
+
+GIT_COMMIT=804c49d58f3f3784c77c9c8ec17c9062092cae27
+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://prometheus.io"
+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 ~arm64 ~riscv"
+
+COMMON_DEPEND="acct-group/prometheus
+	acct-user/prometheus"
+DEPEND="!app-metrics/prometheus-bin
+	${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+
+BDEPEND=">=dev-util/promu-0.17.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 -u "${WORKDIR}"/web/ui web || die "cp failed"
+}
+
+src_compile() {
+	emake PROMU="${EPREFIX}"/usr/bin/promu common-build plugins
+}
+
+src_install() {
+	dobin prometheus promtool
+	dodoc -r documentation/{images,*.md} *.md docs
+	insinto /etc/prometheus
+	doins -r documentation/examples/prometheus.yml
+	insinto /usr/share/prometheus
+	doins -r documentation/examples
+
+	systemd_newunit "${FILESDIR}"/prometheus-3.2.service prometheus.service
+	newinitd "${FILESDIR}"/prometheus-3.2.initd prometheus
+	newconfd "${FILESDIR}"/prometheus-3.2.confd prometheus
+	keepdir /var/log/prometheus /var/lib/prometheus
+	fowners prometheus:prometheus /var/log/prometheus /var/lib/prometheus
+}
+
+pkg_postinst() {
+	# added 2025-03-28 to warn about a fix for version 3.1.0
+	if ver_replacing -eq 3.1.0; then
+		ewarn "The systemd service has been renamed from prometheus-3 to prometheus."
+	fi
+	# added 2025-03-28 for version 3.2.1
+	if ver_replacing -lt 3.2; then
+		ewarn "The --web.enable-lifecycle and --web.enable-admin-api options have been removed"
+		ewarn "from the default command line."
+		ewarn "If you need these options, please enable them in /etc/prometheus/prometheus.yml"
+		elog
+		elog "The --web.listen-address option was removed from the default command line"
+		elog "because we were using the default upstream setting."
+	fi
+}