gentoo auto-resync : 19:03:2024 - 06:50:06

7 files changed, 135 insertions, 144 deletions

diff --git a/app-metrics/Manifest.gz b/app-metrics/Manifest.gz
index 9f23f1c2cb67..d9aac76bc869 100644
--- a/app-metrics/Manifest.gz
+++ b/app-metrics/Manifest.gz
diff --git a/app-metrics/prometheus-podman-exporter/Manifest b/app-metrics/prometheus-podman-exporter/Manifest
index f386cc3bfca8..a56958646988 100644
--- a/app-metrics/prometheus-podman-exporter/Manifest
+++ b/app-metrics/prometheus-podman-exporter/Manifest
@@ -1,12 +1,8 @@
-DIST prometheus-podman-exporter-1.4.0.tar.gz 11934764 BLAKE2B 9f0c7431a15ca0abbfbc54affc7026180c156a655379e18840e8923cced2b80a86644e6edd139f052d9a777d1465a2b7bc4432fc2ebb2e3f47bc3b4880800745 SHA512 ba0c79741add66cb7e943dd64c0662fabb95be10864efa22cbb580b4e0ff01f5896e269b90b6b8b4a59878e77736344390258a1bf8ecbe58fd5870fd428ee388
-DIST prometheus-podman-exporter-1.5.0.tar.gz 12032097 BLAKE2B 15e209330342432a1f71e4686a705b6c6dc41d14b9022828cf10cb0538dcbf6b26c47f243ad96aef17eb71470d5af15bd090afc57960ee6d7b8828b2cff32c46 SHA512 d5eca9d0c87cbddfef6a58cdfc5213c65846219ff8a60e9efa038a8e4ca37f36bb6dc0687a78defb80a4901eeb617e8aa689b94ef0a48625548e74816fafbfec
-DIST prometheus-podman-exporter-1.6.0.tar.gz 12234381 BLAKE2B 18960a73962ac30c477cabdcc784268088ba2bdf6a0efa6a777f164333b3964b2a881cec8a7f48d6aa5969306f92ed33d2722bfe740e6401dd704dbeb0963e5f SHA512 ef0b565bab8d695f05cadd3689f40161d5a0943a9d54e42611db0ea43dc98aca42d9ce8b33d080c60ab5456df8dc50f4283001562c4edec2e64fe037dd7d6bf1
+DIST prometheus-podman-exporter-1.10.1.tar.gz 13578778 BLAKE2B e854a61ac1ac7237f0ab4bb7d6d2f39f3ebcf9c32f45e4b44c551aa45a8a97902084f0f24180a1253d0c664907fa1dcb5dc6ac587d31387c708c83388c2c9ed9 SHA512 f8da5b88e6d88d02bc48c2fcd627aca0e88d8264aa3c971b2e251fd7641b329fbe66686d12e2dfca8fe40cc1488359caa1a345844f32e45c79a28bc172bbd501
 DIST prometheus-podman-exporter-1.7.0.tar.gz 12251956 BLAKE2B 91a6a217db3fd2b408344f738a7acad5c161adad6da53ef3d3750b73d9135022b0a4c18d85d0f79fc331344462e600574c8cd94477b57261adb29e5ffccdcc83 SHA512 3f9184681f1466ca4bbd32830c8fd233bb7e95af4df0b97cff606e39987d6c608b8847924d3b1c5fe98d058b32324dea86a142065bae7afdb0f99e4cfe0d9b52
 DIST prometheus-podman-exporter-1.8.0.tar.gz 12253412 BLAKE2B 673986f2acce525ab6c9d0858ca6c193bc292bc5e6c8ad50f81921a8f66673c29f724ad562efefb6fe63d556e491432b593b7581af3a01faf44279013a2ec209 SHA512 eb647d8d5c7d30a6676fe192ac2f8c3be5ee67525206c67ac9d0dc06f2fd5fb7dbad838f53fa75f550f5dcfa5c188bd2eb0e7c46b13fe2795b38187ac2fdb81a
-EBUILD prometheus-podman-exporter-1.4.0.ebuild 1181 BLAKE2B 94ac5d59771174717a92be914b38524cb2016e2bd49b124c424dfb8b41478b89b1e75f265a7d44a015dc2df1ef64e03c0f5e2593e92e52b392f1cd310bb9b612 SHA512 72d44ecb5eb300856766c774f39ea561e7abdb6cbfd435a5feb5c24f333fc539aba63d872747e580c1a70e832f75efdddf45573af8009af9cd856a6400ca864f
-EBUILD prometheus-podman-exporter-1.5.0.ebuild 1180 BLAKE2B 6d2d2a00598f86d4ced05c2b4c46e7fe8eac95642aab1cc7a117c9633b3720b6c0d7a6309093677134541f49a8aa6dad74a37d14c682434cdd82f9dd3501b40a SHA512 6c5f8e6fd90d92630620b0a16c230d8a569d32466292a77c59e39410382121b4977127e2290f01df3d52e66ae732c0121b1dbd7b9100c08b93af6aabe683d52f
-EBUILD prometheus-podman-exporter-1.6.0.ebuild 1180 BLAKE2B 6d2d2a00598f86d4ced05c2b4c46e7fe8eac95642aab1cc7a117c9633b3720b6c0d7a6309093677134541f49a8aa6dad74a37d14c682434cdd82f9dd3501b40a SHA512 6c5f8e6fd90d92630620b0a16c230d8a569d32466292a77c59e39410382121b4977127e2290f01df3d52e66ae732c0121b1dbd7b9100c08b93af6aabe683d52f
+EBUILD prometheus-podman-exporter-1.10.1.ebuild 2910 BLAKE2B 661f60cd7591bc85137c8d1aed8c7dd955f12e9e4c0ea0c7511292131bdbc6a2d62b68adc550787c75223d07546c1d24a651e19a893a53c04d6621fc037f32bf SHA512 43cf204e8174c155c21dcbb049c0def70e94b19e4d1751577e757fb463f1f2d002370e63534fc2cba89540f71a47332c113c70dec8cd9b25f0d974738399d91c
 EBUILD prometheus-podman-exporter-1.7.0.ebuild 1180 BLAKE2B dc7cf905e259415e8f9c633c7f9d557495e9dbbf28d4e01e0ebbfe0bc2b635244fbca24a0745a318c847a232ea2a9ecfc77273c30f3efcccc129dd29631962c2 SHA512 85a051a6c051376fe90c495108a9e7718eeccd0848e38ab5371ede2bab58ccde2bb903fb0d7eb31b8a10635c51af805be09fc002350c4a7bdbc12b0f572e8088
 EBUILD prometheus-podman-exporter-1.8.0.ebuild 1154 BLAKE2B c59cc2a1e61485cc7c849423c71e5ae0c1f1fc07e2763fccb904faec90ecdf920249549179f3f9436e6ec05b15b1dff7e9698e8ad3aae23c573886b107139d19 SHA512 7fcb8c45b1c79f79d7b3f5953a3a6feff3fe49e57f80f00bc8e84707bd2d8520bc1ccba91d96459ce99fe3d579484c70998d1906007fa20020ac76bea8e4a2e3
-EBUILD prometheus-podman-exporter-9999.ebuild 1154 BLAKE2B c59cc2a1e61485cc7c849423c71e5ae0c1f1fc07e2763fccb904faec90ecdf920249549179f3f9436e6ec05b15b1dff7e9698e8ad3aae23c573886b107139d19 SHA512 7fcb8c45b1c79f79d7b3f5953a3a6feff3fe49e57f80f00bc8e84707bd2d8520bc1ccba91d96459ce99fe3d579484c70998d1906007fa20020ac76bea8e4a2e3
+EBUILD prometheus-podman-exporter-9999.ebuild 2910 BLAKE2B 661f60cd7591bc85137c8d1aed8c7dd955f12e9e4c0ea0c7511292131bdbc6a2d62b68adc550787c75223d07546c1d24a651e19a893a53c04d6621fc037f32bf SHA512 43cf204e8174c155c21dcbb049c0def70e94b19e4d1751577e757fb463f1f2d002370e63534fc2cba89540f71a47332c113c70dec8cd9b25f0d974738399d91c
 MISC metadata.xml 885 BLAKE2B 3758f44af7c220271fa6e9c87c6c535b675d0ca6478f90bc29966b44dd2dbc23dd2c101558fda6f258939c000292ad5995ebbbfb8061775acbed307249760d85 SHA512 a07c768eaea09f1d8511d7c5926c71b682793f44662aac7ee1373ed44e858677f84cbad383027533aa21147597aad224201c2834e982c0d0d7860ff8b465690a
diff --git a/app-metrics/prometheus-podman-exporter/prometheus-podman-exporter-1.10.1.ebuild b/app-metrics/prometheus-podman-exporter/prometheus-podman-exporter-1.10.1.ebuild
new file mode 100644
index 000000000000..4452311819fe
--- /dev/null
+++ b/app-metrics/prometheus-podman-exporter/prometheus-podman-exporter-1.10.1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module systemd
+
+DESCRIPTION="Exporter for podman giving containers, pods, images, volumes & networks metrics"
+HOMEPAGE="https://github.com/containers/prometheus-podman-exporter"
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/containers/prometheus-podman-exporter.git"
+else
+	SRC_URI="https://github.com/containers/prometheus-podman-exporter/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+# Main package
+LICENSE="Apache-2.0"
+# Dependencies
+LICENSE+=" BSD-2 BSD ISC MIT MPL-2.0"
+
+SLOT="0"
+IUSE="btrfs systemd"
+
+# there are no test files so prevent tests
+RESTRICT="test"
+
+PATCHES=(
+	"${T}/gentoo-specific-systemd-service.patch"
+)
+
+src_prepare() {
+	cat <<-'EOF' > "${T}/gentoo-specific-systemd-service.patch"
+		--- a/contrib/systemd/system/prometheus-podman-exporter.service
+		+++ b/contrib/systemd/system/prometheus-podman-exporter.service
+		@@ -2,7 +2,7 @@
+		 Description=Prometheus exporter for podman (v4) machine
+		 [Service]
+		 Restart=on-failure
+		-EnvironmentFile=-/etc/sysconfig/prometheus-podman-exporter
+		+EnvironmentFile=-/etc/default/prometheus-podman-exporter
+		 ExecStart=/usr/bin/prometheus-podman-exporter $PODMAN_EXPORTER_OPTS
+		 ExecReload=/bin/kill -HUP $MAINPID
+		 TimeoutStopSec=20s
+		--- a/contrib/systemd/user/prometheus-podman-exporter.service
+		+++ b/contrib/systemd/user/prometheus-podman-exporter.service
+		@@ -2,7 +2,7 @@
+		 Description=Prometheus exporter for podman (v4) machine
+		 [Service]
+		 Restart=on-failure
+		-EnvironmentFile=-/etc/sysconfig/prometheus-podman-exporter
+		+EnvironmentFile=-/etc/default/prometheus-podman-exporter
+		 EnvironmentFile=-%h/.config/prometheus-podman-exporter
+		 ExecStart=/usr/bin/prometheus-podman-exporter $PODMAN_EXPORTER_OPTS
+		 ExecReload=/bin/kill -HUP $MAINPID
+	EOF
+	default
+}
+
+src_compile() {
+	export BUILDTAGS="exclude_graphdriver_devicemapper"
+	use !btrfs && BUILDTAGS+=",exclude_graphdriver_btrfs,btrfs_noversion"
+	use systemd && BUILDTAGS+=",systemd"
+	default
+}
+
+src_install() {
+	emake DESTDIR="${ED}/usr/bin" install
+	dosym -r /usr/bin/"${PN}" /usr/bin/podman_exporter
+
+	insinto /etc/default
+	newins "contrib/systemd/system/prometheus-podman-exporter.sysconfig" "${PN}"
+	systemd_dounit "contrib/systemd/system/prometheus-podman-exporter.service"
+	systemd_douserunit "contrib/systemd/user/prometheus-podman-exporter.service"
+	dosym prometheus-podman-exporter.service $(systemd_get_systemunitdir)/podman_exporter.service
+	dosym prometheus-podman-exporter.service $(systemd_get_userunitdir)/podman_exporter.service
+
+	newconfd "contrib/openrc/prometheus-podman-exporter.confd" "${PN}"
+	newinitd "contrib/openrc/prometheus-podman-exporter.initd" "${PN}"
+	dosym "${PN}" /etc/conf.d/podman_exporter
+	dosym "${PN}" /etc/init.d/podman_exporter
+
+	einstalldocs
+}
diff --git a/app-metrics/prometheus-podman-exporter/prometheus-podman-exporter-1.4.0.ebuild b/app-metrics/prometheus-podman-exporter/prometheus-podman-exporter-1.4.0.ebuild
deleted file mode 100644
index b6b911e1954f..000000000000
--- a/app-metrics/prometheus-podman-exporter/prometheus-podman-exporter-1.4.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-module systemd
-
-DESCRIPTION="Exporter for podman giving containers, pods, images, volumes & networks metrics"
-HOMEPAGE="https://github.com/containers/prometheus-podman-exporter"
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/containers/prometheus-podman-exporter.git"
-else
-	SRC_URI="https://github.com/containers/prometheus-podman-exporter/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-fi
-
-# Main package
-LICENSE="Apache-2.0"
-# Dependencies
-LICENSE+=" BSD-2 BSD ISC MIT MPL-2.0"
-
-SLOT="0"
-IUSE="btrfs"
-
-# there are no test files so prevent tests
-RESTRICT="test"
-RDEPEND="
-	app-containers/podman[btrfs?]
-"
-DEPEND="${RDEPEND}"
-
-src_compile() {
-	export BUILDFLAGS=" -tags exclude_graphdriver_devicemapper"
-	use !btrfs && BUILDFLAGS+=",exclude_graphdriver_btrfs,btrfs_noversion"
-	default
-}
-
-src_install() {
-	emake DESTDIR="${ED}/usr/bin" install
-	systemd_dounit "contrib/systemd/prometheus-podman-exporter.service"
-	systemd_douserunit "contrib/systemd/prometheus-podman-exporter.service"
-	einstalldocs
-}
diff --git a/app-metrics/prometheus-podman-exporter/prometheus-podman-exporter-1.5.0.ebuild b/app-metrics/prometheus-podman-exporter/prometheus-podman-exporter-1.5.0.ebuild
deleted file mode 100644
index 029b77899c4a..000000000000
--- a/app-metrics/prometheus-podman-exporter/prometheus-podman-exporter-1.5.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-module systemd
-
-DESCRIPTION="Exporter for podman giving containers, pods, images, volumes & networks metrics"
-HOMEPAGE="https://github.com/containers/prometheus-podman-exporter"
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/containers/prometheus-podman-exporter.git"
-else
-	SRC_URI="https://github.com/containers/prometheus-podman-exporter/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-fi
-
-# Main package
-LICENSE="Apache-2.0"
-# Dependencies
-LICENSE+=" BSD-2 BSD ISC MIT MPL-2.0"
-
-SLOT="0"
-IUSE="btrfs"
-
-# there are no test files so prevent tests
-RESTRICT="test"
-RDEPEND="
-	app-containers/podman[btrfs?]
-"
-DEPEND="${RDEPEND}"
-
-src_compile() {
-	export BUILDFLAGS=" -tags exclude_graphdriver_devicemapper"
-	use !btrfs && BUILDFLAGS+=",exclude_graphdriver_btrfs,btrfs_noversion"
-	default
-}
-
-src_install() {
-	emake DESTDIR="${ED}/usr/bin" install
-	systemd_dounit "contrib/systemd/prometheus-podman-exporter.service"
-	systemd_douserunit "contrib/systemd/prometheus-podman-exporter.service"
-	einstalldocs
-}
diff --git a/app-metrics/prometheus-podman-exporter/prometheus-podman-exporter-1.6.0.ebuild b/app-metrics/prometheus-podman-exporter/prometheus-podman-exporter-1.6.0.ebuild
deleted file mode 100644
index 029b77899c4a..000000000000
--- a/app-metrics/prometheus-podman-exporter/prometheus-podman-exporter-1.6.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-module systemd
-
-DESCRIPTION="Exporter for podman giving containers, pods, images, volumes & networks metrics"
-HOMEPAGE="https://github.com/containers/prometheus-podman-exporter"
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/containers/prometheus-podman-exporter.git"
-else
-	SRC_URI="https://github.com/containers/prometheus-podman-exporter/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-fi
-
-# Main package
-LICENSE="Apache-2.0"
-# Dependencies
-LICENSE+=" BSD-2 BSD ISC MIT MPL-2.0"
-
-SLOT="0"
-IUSE="btrfs"
-
-# there are no test files so prevent tests
-RESTRICT="test"
-RDEPEND="
-	app-containers/podman[btrfs?]
-"
-DEPEND="${RDEPEND}"
-
-src_compile() {
-	export BUILDFLAGS=" -tags exclude_graphdriver_devicemapper"
-	use !btrfs && BUILDFLAGS+=",exclude_graphdriver_btrfs,btrfs_noversion"
-	default
-}
-
-src_install() {
-	emake DESTDIR="${ED}/usr/bin" install
-	systemd_dounit "contrib/systemd/prometheus-podman-exporter.service"
-	systemd_douserunit "contrib/systemd/prometheus-podman-exporter.service"
-	einstalldocs
-}
diff --git a/app-metrics/prometheus-podman-exporter/prometheus-podman-exporter-9999.ebuild b/app-metrics/prometheus-podman-exporter/prometheus-podman-exporter-9999.ebuild
index 1547a7a4946d..4452311819fe 100644
--- a/app-metrics/prometheus-podman-exporter/prometheus-podman-exporter-9999.ebuild
+++ b/app-metrics/prometheus-podman-exporter/prometheus-podman-exporter-9999.ebuild
@@ -27,6 +27,38 @@ IUSE="btrfs systemd"
 # there are no test files so prevent tests
 RESTRICT="test"
 
+PATCHES=(
+	"${T}/gentoo-specific-systemd-service.patch"
+)
+
+src_prepare() {
+	cat <<-'EOF' > "${T}/gentoo-specific-systemd-service.patch"
+		--- a/contrib/systemd/system/prometheus-podman-exporter.service
+		+++ b/contrib/systemd/system/prometheus-podman-exporter.service
+		@@ -2,7 +2,7 @@
+		 Description=Prometheus exporter for podman (v4) machine
+		 [Service]
+		 Restart=on-failure
+		-EnvironmentFile=-/etc/sysconfig/prometheus-podman-exporter
+		+EnvironmentFile=-/etc/default/prometheus-podman-exporter
+		 ExecStart=/usr/bin/prometheus-podman-exporter $PODMAN_EXPORTER_OPTS
+		 ExecReload=/bin/kill -HUP $MAINPID
+		 TimeoutStopSec=20s
+		--- a/contrib/systemd/user/prometheus-podman-exporter.service
+		+++ b/contrib/systemd/user/prometheus-podman-exporter.service
+		@@ -2,7 +2,7 @@
+		 Description=Prometheus exporter for podman (v4) machine
+		 [Service]
+		 Restart=on-failure
+		-EnvironmentFile=-/etc/sysconfig/prometheus-podman-exporter
+		+EnvironmentFile=-/etc/default/prometheus-podman-exporter
+		 EnvironmentFile=-%h/.config/prometheus-podman-exporter
+		 ExecStart=/usr/bin/prometheus-podman-exporter $PODMAN_EXPORTER_OPTS
+		 ExecReload=/bin/kill -HUP $MAINPID
+	EOF
+	default
+}
+
 src_compile() {
 	export BUILDTAGS="exclude_graphdriver_devicemapper"
 	use !btrfs && BUILDTAGS+=",exclude_graphdriver_btrfs,btrfs_noversion"
@@ -36,7 +68,19 @@ src_compile() {
 
 src_install() {
 	emake DESTDIR="${ED}/usr/bin" install
-	systemd_dounit "contrib/systemd/prometheus-podman-exporter.service"
-	systemd_douserunit "contrib/systemd/prometheus-podman-exporter.service"
+	dosym -r /usr/bin/"${PN}" /usr/bin/podman_exporter
+
+	insinto /etc/default
+	newins "contrib/systemd/system/prometheus-podman-exporter.sysconfig" "${PN}"
+	systemd_dounit "contrib/systemd/system/prometheus-podman-exporter.service"
+	systemd_douserunit "contrib/systemd/user/prometheus-podman-exporter.service"
+	dosym prometheus-podman-exporter.service $(systemd_get_systemunitdir)/podman_exporter.service
+	dosym prometheus-podman-exporter.service $(systemd_get_userunitdir)/podman_exporter.service
+
+	newconfd "contrib/openrc/prometheus-podman-exporter.confd" "${PN}"
+	newinitd "contrib/openrc/prometheus-podman-exporter.initd" "${PN}"
+	dosym "${PN}" /etc/conf.d/podman_exporter
+	dosym "${PN}" /etc/init.d/podman_exporter
+
 	einstalldocs
 }