commit:     046a20abe5025ed1fbc56fffd5a7607b90204a43
Author:     Rahil Bhimjiani <me <AT> rahil <DOT> rocks>
AuthorDate: Fri May  3 14:50:35 2024 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Wed May  8 15:56:51 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=046a20ab

app-metrics/node_exporter: add 1.8.0

* reduce deps tarball from 25+ -> <2 MiB
* Stop enabling systemd collector by default as it is not ready
yet. There is a reason why upstream has disabled it by default. Also why
diverge from upstream unneccessarily.
* remove systemd USE flag as redundant now

Signed-off-by: Rahil Bhimjiani <me <AT> rahil.rocks>
Closes: https://github.com/gentoo/gentoo/pull/36533
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 app-metrics/node_exporter/Manifest                                 | 2 ++
 .../{node_exporter-9999.ebuild => node_exporter-1.8.0.ebuild}      | 7 +++----
 app-metrics/node_exporter/node_exporter-9999.ebuild                | 7 +++----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app-metrics/node_exporter/Manifest 
b/app-metrics/node_exporter/Manifest
index 2957bf62ecd8..51ab0df8392f 100644
--- a/app-metrics/node_exporter/Manifest
+++ b/app-metrics/node_exporter/Manifest
@@ -1,2 +1,4 @@
 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
+DIST node_exporter-1.8.0-deps.tar.xz 1684580 BLAKE2B 
0c02ca1177444885556da08676e78a413952955bfa80d9d7a9026133059594eaddd6f43fe10783701c71d0ecf2be9ac9383d019daeb287d5d016bd1188e5b37c
 SHA512 
7268139beec7bf088ae4819809221985d1920e38b60db75cc074e92ce4dbe573c362f5227f095b4e5d1de7005b8ec2fbf96d3dcdf565eb2c9524d71676e1752e
+DIST node_exporter-1.8.0.tar.gz 335029 BLAKE2B 
639edfec973e7412620da855c997e1e50ccb5fc4afc4070c44ab3fbb9b4925103719c87f813e092db3548cd55b779233fbf71bf3affc6b779ba0e45f4767ec32
 SHA512 
4774ff3e146665783044769235b9d4f538ba3ff1d7c9fdfb33e5546042846371c7d26efa8a6d672e6de3c5a10107c2e72e5bbf38ed2952a5c48eda81fdc1379a

diff --git a/app-metrics/node_exporter/node_exporter-9999.ebuild 
b/app-metrics/node_exporter/node_exporter-1.8.0.ebuild
similarity index 90%
copy from app-metrics/node_exporter/node_exporter-9999.ebuild
copy to app-metrics/node_exporter/node_exporter-1.8.0.ebuild
index 9e3f1d237576..8f35f716feb4 100644
--- a/app-metrics/node_exporter/node_exporter-9999.ebuild
+++ b/app-metrics/node_exporter/node_exporter-1.8.0.ebuild
@@ -22,13 +22,12 @@ LICENSE="Apache-2.0"
 # deps
 LICENSE+=" BSD BSD-2 MIT"
 SLOT="0"
-IUSE="selinux systemd"
+IUSE="selinux"
 
 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}"
@@ -39,13 +38,13 @@ src_unpack() {
                git-r3_src_unpack
                go-module_live_vendor
        else
-               go-module_src_unpack
+               default
        fi
 }
 
 src_prepare() {
+       [[ ${PV} != 9999* ]] && { ln -sv ../vendor ./ || die ; }
        default
-       use systemd && { sed -i -e "s|defaultDisabled|defaultEnabled|g;" 
collector/systemd_linux.go || die; }
 }
 
 src_compile() {

diff --git a/app-metrics/node_exporter/node_exporter-9999.ebuild 
b/app-metrics/node_exporter/node_exporter-9999.ebuild
index 9e3f1d237576..8f35f716feb4 100644
--- a/app-metrics/node_exporter/node_exporter-9999.ebuild
+++ b/app-metrics/node_exporter/node_exporter-9999.ebuild
@@ -22,13 +22,12 @@ LICENSE="Apache-2.0"
 # deps
 LICENSE+=" BSD BSD-2 MIT"
 SLOT="0"
-IUSE="selinux systemd"
+IUSE="selinux"
 
 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}"
@@ -39,13 +38,13 @@ src_unpack() {
                git-r3_src_unpack
                go-module_live_vendor
        else
-               go-module_src_unpack
+               default
        fi
 }
 
 src_prepare() {
+       [[ ${PV} != 9999* ]] && { ln -sv ../vendor ./ || die ; }
        default
-       use systemd && { sed -i -e "s|defaultDisabled|defaultEnabled|g;" 
collector/systemd_linux.go || die; }
 }
 
 src_compile() {

Reply via email to