gentoo auto-resync : 16:03:2024 - 12:48:37

6 files changed, 96 insertions, 19 deletions

diff --git a/app-metrics/Manifest.gz b/app-metrics/Manifest.gz
index e0d8aacee4d7..991c9a693d7b 100644
--- a/app-metrics/Manifest.gz
+++ b/app-metrics/Manifest.gz
diff --git a/app-metrics/node_exporter/Manifest b/app-metrics/node_exporter/Manifest
index e4d1bfedd2d5..99b7efcc6f87 100644
--- a/app-metrics/node_exporter/Manifest
+++ b/app-metrics/node_exporter/Manifest
@@ -1,10 +1,11 @@
 AUX 01-default-settings-1.7.0.patch 7705 BLAKE2B 9de6d34f5b8bbf1edb193c794e844288c4560773691e9a7805c0068f1843b5b9fca675c52c0f2ff3bdbc21a0201a51f1f6bc88b420944f0c0d8ec995473abaf3 SHA512 ce5061a4e50662d37e7a09e0cbd80164f626e1384b10592e73f9d08cac87130174f860c38675b83067c9924def2f60371c7373cfc83757636be57956a9a43159
 AUX node_exporter-1.7.0.logrotate 147 BLAKE2B 4153888cc2bf626217dc998943208498dec58200ef110288bf910857592fead4fa1a3fc4996608adfd7f05d635381f9c183bc109c4f4f7f666c8b12910f1e141 SHA512 b1a893c4939b819e69a4afc8d8c6c2e965eb88a83e708878c757c533741ecd0b65d2dc052f54484f39ed8e52c96107c43050c5b1e37f22d8d0053b21b9b47701
-AUX node_exporter-1.7.0.service 464 BLAKE2B 6f306e2d21727f91f2139cebbf2d3c18ca61150b8bb2b3827d0666c155c19efe3d1c44eb2d05cd8c77ba70ddc7061d07ce9c9f70bc0e64a45931a0d2424021a2 SHA512 8a1943d80a95b5ad9790b9e14e62d2e2153c7d95a40f114fdf54ca93bfe109ad92815cbb6b7d340e6c4330f19a6f167a58d805c5e3402b84d491a5daed9800e8
-AUX node_exporter.confd 111 BLAKE2B bb40370633c41a4f1283677ed16ad9734c7f180683e4d9d82be36ea5e63d3b8fc2a861a61c62e2e899209f7293588e3e7532ffe52ecb9aab4773a3943168d5dd SHA512 cce5db8eccf2ecfe1198aa8252b04fd6a96006f707e7132c2d01c5400d175551c3b9890c4d57fec9ccbe17594dfb937e1f99ead0e1c3fd8cf22930dabd70418d
+AUX node_exporter-1.7.0.service 518 BLAKE2B de602f92fe43955eca670e920b4a40b78e2bdfe08bccd78d7846c87eb10562fe9f53100f97e7d551fd00f021888feb92ce533f95f34dedd4f1d120594bf1d920 SHA512 6c6afe1cb7df07ff11b9b272dce5fe30f156ea71a03ccc24af07a7abd37688d642f0f435772d74c00ec14b23627a02ffac510e0338991b54754d664902d73516
+AUX node_exporter.confd 165 BLAKE2B b58f7d7e99b7cd29d89b310a28ca58c473315d7096759c579d1d2720259ecae382f9c4583bd69728af270a1190f07d821922b28c9c2313f50636245a790af801 SHA512 746e38c9bbb2d515009c484d721b8287e87e673f0bf62c27252119303e368ae9def81290a79df57bf1aa68cbeecb2f2e816c398e5b1cdf98216bca19e9e2d3cd
 AUX node_exporter.initd-1 674 BLAKE2B e33c8ba727f82ccdf166a836c31364a6f41f5445a05b518e92c5b4ecada75dccf97fdfc93ed4f65757f3b5d9716f650e9e5779cdb1c79d6a1a67f15f1edbced1 SHA512 6f51a4c4b1c7381fc92e47d1ca4434d1b3839ff15af1c16c47374cd2b96d615937bcd13470bff16d067b05b79bdfa94b018f5e986222dc0e5a932de765216bba
 DIST node_exporter-1.7.0-deps.tar.xz 26490120 BLAKE2B 3177aa96a50eefaeafad73b293144772443428b8c1b90210230e3e508a678f5515aebec1c51661d47a1e021cd03c8febe9aa948cc3d955eff2b2f272a539b6af SHA512 9fe19ad0fc375f4846fddb7618de5b34ddad583b5c6b09d896c099c3218976fd337c11765699a713c66bbaa834b6cfcaee960b1b1d4014be263b99b897fb1e1c
 DIST node_exporter-1.7.0.tar.gz 328830 BLAKE2B 5f6b8101637bc0df605ea84446f905fcf8abeb68d0f2eda1e172b12aae4cffcfef54996f8725ad458671947c72a48fbbd73d4d401d8fd001e9e9d75f248230fc SHA512 4cd38b81cb54ca620a57c642a88b89d6d1ae36a752fff5f065c8848ea02066a211c6feb955bea4e311f7baafffee30a74670efe1cf4dac113c9bf7d154a1067b
+EBUILD node_exporter-1.7.0-r1.ebuild 1884 BLAKE2B b446559b3c28c9a9e1dd311b0fa93a6813d632965ddbe01577b015e335e718f15f1cf406a78c020fc889c916f8e3a23cd6309cd3e88de34c18cc61deee207c4b SHA512 7b72066b5fe96dc03359ccf4fd5b8a1536846fdacbf379e7f61e34a634093f42bd6264d2e17490ddadab6d2a16b084998dd9d4011ea23e72fe55b670d428a4cb
 EBUILD node_exporter-1.7.0.ebuild 1943 BLAKE2B f4f7dd6f5b6e6eba320357442c4909f93f334d21273ae29eccc611039d4ccd8c8de960a47e8eda5d47ca031733cc7114530c50bc1a8161f37d90742e22c420cc SHA512 4357f81b0b40a88b4fb19b04340d07c9d7225cf3ff247f0ee05807ec14a7496913445354d89ea91b82041205f9f0f7ee8ed21c9eac71537990e3a00fb2b17231
-EBUILD node_exporter-9999.ebuild 1814 BLAKE2B 25c3007ac2f0b6573cb319f45bb0fe7800583b4dfaeb08f4484f25685ec7cbff374bbde7940d13c919e76050a2d5551a409ae5f83f9fc4b7f60b6f5027801aed SHA512 d277651a8d1d3b76305452accbeb4c3b5ca50f780ca813b5d03a7306d4ec0a46f304b68e175029cb91cae976e4f68a1940f0a9bb8894346c22122480303546bf
+EBUILD node_exporter-9999.ebuild 1884 BLAKE2B b446559b3c28c9a9e1dd311b0fa93a6813d632965ddbe01577b015e335e718f15f1cf406a78c020fc889c916f8e3a23cd6309cd3e88de34c18cc61deee207c4b SHA512 7b72066b5fe96dc03359ccf4fd5b8a1536846fdacbf379e7f61e34a634093f42bd6264d2e17490ddadab6d2a16b084998dd9d4011ea23e72fe55b670d428a4cb
 MISC metadata.xml 831 BLAKE2B eba45344fe1d19be5656038d109827066f0aef5fa9f1338bca84217b98a880f232f5459bf017a661334cf8ec4221b749cd4feab8f166d027ceb77ab67a38a70c SHA512 3654c7f6cbe75997ad120d3470691125daa51d1d4be531e12026ddf1313c4cce07d05bba6d48b67ebd19931a47d5a2ec79d8f0c4c2ca8314928c32574e136747
diff --git a/app-metrics/node_exporter/files/node_exporter-1.7.0.service b/app-metrics/node_exporter/files/node_exporter-1.7.0.service
index e704c809b8e5..b1723196b9db 100644
--- a/app-metrics/node_exporter/files/node_exporter-1.7.0.service
+++ b/app-metrics/node_exporter/files/node_exporter-1.7.0.service
@@ -9,7 +9,7 @@ User=node_exporter
 Group=node_exporter
 Restart=on-failure
 Type=exec
-ExecStart=/usr/sbin/node_exporter
+ExecStart=/usr/sbin/node_exporter --collector.textfile.directory=/var/lib/node_exporter
 ExecReload=/usr/bin/kill -HUP $MAINPID
 TimeoutStopSec=20s
 SendSIGKILL=no
diff --git a/app-metrics/node_exporter/files/node_exporter.confd b/app-metrics/node_exporter/files/node_exporter.confd
index b65652001308..2feccf6346e4 100644
--- a/app-metrics/node_exporter/files/node_exporter.confd
+++ b/app-metrics/node_exporter/files/node_exporter.confd
@@ -1,2 +1,2 @@
 # arguments for prometheus node exporter
-command_args="--collector.textfile.directory=/var/lib/node_exporter/"
+command_args="--collector.textfile.directory=/var/lib/node_exporter/ --collector.textfile.directory=/var/lib/node_exporter"
diff --git a/app-metrics/node_exporter/node_exporter-1.7.0-r1.ebuild b/app-metrics/node_exporter/node_exporter-1.7.0-r1.ebuild
new file mode 100644
index 000000000000..9e3f1d237576
--- /dev/null
+++ b/app-metrics/node_exporter/node_exporter-1.7.0-r1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module systemd
+
+DESCRIPTION="Prometheus exporter for machine metrics"
+HOMEPAGE="https://github.com/prometheus/node_exporter"
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/prometheus/node_exporter.git"
+else
+	SRC_URI="https://github.com/prometheus/node_exporter/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI+=" https://github.com/rahilarious/gentoo-distfiles/releases/download/${P}/deps.tar.xz -> ${P}-deps.tar.xz"
+	KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86"
+fi
+
+# main pkg
+LICENSE="Apache-2.0"
+# deps
+LICENSE+=" BSD BSD-2 MIT"
+SLOT="0"
+IUSE="selinux systemd"
+
+COMMON_DEPEND="
+	acct-group/node_exporter
+	acct-user/node_exporter
+	selinux? ( sec-policy/selinux-node_exporter )
+	systemd? ( sys-apps/systemd )
+"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+BDEPEND=">=dev-util/promu-0.3.0"
+
+src_unpack() {
+	if [[ ${PV} == 9999* ]]; then
+		git-r3_src_unpack
+		go-module_live_vendor
+	else
+		go-module_src_unpack
+	fi
+}
+
+src_prepare() {
+	default
+	use systemd && { sed -i -e "s|defaultDisabled|defaultEnabled|g;" collector/systemd_linux.go || die; }
+}
+
+src_compile() {
+	if use x86; then
+		#917577 pie breaks build on x86
+		GOFLAGS=${GOFLAGS//-buildmode=pie}
+	fi
+	promu build -v || die
+	./"${PN}" --help-man > "${PN}".1 || die
+}
+
+src_test() {
+	emake test-flags= test
+}
+
+src_install() {
+	dosbin "${PN}"
+	dodoc example-rules.yml *.md
+	doman "${PN}".1
+	systemd_newunit "${FILESDIR}"/node_exporter-1.7.0.service node_exporter.service
+	newinitd "${FILESDIR}"/${PN}.initd-1 ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/node_exporter-1.7.0.logrotate "${PN}"
+	keepdir /var/lib/node_exporter /var/log/node_exporter
+	fowners ${PN}:${PN} /var/lib/node_exporter /var/log/node_exporter
+}
diff --git a/app-metrics/node_exporter/node_exporter-9999.ebuild b/app-metrics/node_exporter/node_exporter-9999.ebuild
index e02032dc5f61..9e3f1d237576 100644
--- a/app-metrics/node_exporter/node_exporter-9999.ebuild
+++ b/app-metrics/node_exporter/node_exporter-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -24,22 +24,15 @@ LICENSE+=" BSD BSD-2 MIT"
 SLOT="0"
 IUSE="selinux systemd"
 
-RDEPEND="
+COMMON_DEPEND="
 	acct-group/node_exporter
 	acct-user/node_exporter
 	selinux? ( sec-policy/selinux-node_exporter )
 	systemd? ( sys-apps/systemd )
 "
-DEPEND="${RDEPEND}"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
 BDEPEND=">=dev-util/promu-0.3.0"
-PATCHES=(
-	 "${FILESDIR}"/01-default-settings-1.7.0.patch
-)
-
-src_prepare() {
-	default
-	use !systemd && { sed -i -e "s|defaultEnabled|defaultDisabled|g;" collector/systemd_linux.go || die; }
-}
 
 src_unpack() {
 	if [[ ${PV} == 9999* ]]; then
@@ -50,7 +43,16 @@ src_unpack() {
 	fi
 }
 
+src_prepare() {
+	default
+	use systemd && { sed -i -e "s|defaultDisabled|defaultEnabled|g;" collector/systemd_linux.go || die; }
+}
+
 src_compile() {
+	if use x86; then
+		#917577 pie breaks build on x86
+		GOFLAGS=${GOFLAGS//-buildmode=pie}
+	fi
 	promu build -v || die
 	./"${PN}" --help-man > "${PN}".1 || die
 }
@@ -61,6 +63,8 @@ src_test() {
 
 src_install() {
 	dosbin "${PN}"
+	dodoc example-rules.yml *.md
+	doman "${PN}".1
 	systemd_newunit "${FILESDIR}"/node_exporter-1.7.0.service node_exporter.service
 	newinitd "${FILESDIR}"/${PN}.initd-1 ${PN}
 	newconfd "${FILESDIR}"/${PN}.confd ${PN}
@@ -68,7 +72,4 @@ src_install() {
 	newins "${FILESDIR}"/node_exporter-1.7.0.logrotate "${PN}"
 	keepdir /var/lib/node_exporter /var/log/node_exporter
 	fowners ${PN}:${PN} /var/lib/node_exporter /var/log/node_exporter
-
-	doman "${PN}".1
-	dodoc example-rules.yml *.md
 }