From bb3c56486834445a00814e4166159d7c964dfe30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20F=C3=B6rster?= Date: Sat, 25 Oct 2025 19:49:08 +0200 Subject: [PATCH] [www-apps/grafana] bump --- www-apps/grafana/Manifest | 6 +++--- www-apps/grafana/files/grafana.initd | 5 +++-- ...na-12.1.1.ebuild => grafana-12.2.1.ebuild} | 21 ++++++++----------- 3 files changed, 15 insertions(+), 17 deletions(-) rename www-apps/grafana/{grafana-12.1.1.ebuild => grafana-12.2.1.ebuild} (94%) diff --git a/www-apps/grafana/Manifest b/www-apps/grafana/Manifest index 9986863..8ced868 100644 --- a/www-apps/grafana/Manifest +++ b/www-apps/grafana/Manifest @@ -1,4 +1,4 @@ -DIST grafana-12.1.1-vendor.tar.xz 57327732 BLAKE2B b384a1b2df8982c4ec350a249594cc9936d762b1376da63c37b05c8bf8cc4ab3c4896110c4b99da5bd65928cd82115ba5afdf0bbcbe354dc203883220bf4037d SHA512 721a9a0704e998d37abed7375cc48d9b3187bd578a64fa8bddfee00be079721a8aa9f6389738573fd3de5bcb3f5f7fc9dc1d743b8067ca3e749a51646ae45d5c -DIST grafana-12.1.1-vendor_yarn.tar.xz 314824256 BLAKE2B e5bf29d04e52a838c25624d50da4a0177ab918e95e027bd6ef4a7f55a25c6c77fc6a354d2d1364aa0467531b0cb9a0b47bc1019d136eeadbf6ee67b019fda9a2 SHA512 77dc62e64a41b48888842278ebd7fc6c45b83fc856d97300d5337bdf3365cd4e7489935567da5f85e294d3eb413ba9b7a60eb683debc39ea6ee424afbda4ed0f -DIST grafana-12.1.1.tar.gz 40131521 BLAKE2B c9a2507c1111402916bd0e0cb42816eb056ca6dd443c7a85651b8564d7ecb93aef90c26d96ac58973199d3e91cf813d7eadbc9d24690dcce25dc29f2cd29c226 SHA512 3df8b4ada36c490062759f7c157f9e5b203db4ca4d7002f2e347797dc0c528f499beec1a65782d91c85c04efbea28ecef43d6ba4bf85080bc4a4d7068ea02379 +DIST grafana-12.2.1-vendor.tar.xz 56449456 BLAKE2B 409a9dfe0ba6ec9049476689f9f933ba5d7cf3e5312fa7aca30f7b66f9dc1f3bc1550ea7dbf636619a328bdadcde3d4f9af8db0e01fc614ce0c84cc980335797 SHA512 44d51c9d30132a65d1b669d148df848f6bdba168c5fd732f5458c165972b96a9e82ceeb589a60b4b679b8cd343edccc02ef6eff4f3dc2092b7701ab45a493bb8 +DIST grafana-12.2.1-vendor_yarn.tar.xz 309446896 BLAKE2B 8c75c83eff3bed5ba8e46c9325e0485cf6215ec8d482f4572901830928bd62067e4313f198745f7abdb5f7fb821dd2b74214f0065932a1371dd4d439f304c5c9 SHA512 63bd50e058458c5ab22a7d2ef2fb8eec8dc8a26b06d0889f7dbba4b9b5992951118f3e16f72cc2d071070ad8db86be6c609897c24f8c8d6b2e180d92fca7fd63 +DIST grafana-12.2.1.tar.gz 42267564 BLAKE2B e938e02794e01b04c932f3c1766b8609453c76daef1ef1f5a466ec872c6aaf338e4f21042f6da915ff8ac3ea3cc63fb18659af334f2f9f05a2f6c02e12eb6f62 SHA512 cc85cc2b644d31479abfcd17a0b9b33fa2e71294fd60962b565dccb3c336afcf6297eaaa0ac71c8d8ce1e7a53bb2a1957839dd179b0cdf9f5c9aff0162bc1943 DIST yarn-4.9.2.cjs 3005024 BLAKE2B b7d02b8ca523e48b4cd7430640acca2f81cce8737a5f14dabe7c8aae8584a4130edc72f997ca75ce010cae2739bb52a5fae47461102088311d2ef3b7e8625f8d SHA512 1fc009bc09d13cfd0e19efa44cbfc2b9cf6ca61482725eb35bbc5e257e093ebf4130db6dfe15d604ff4b79efd8e1e8e99b25fa7d0a6197c9f9826358d4d65c3c diff --git a/www-apps/grafana/files/grafana.initd b/www-apps/grafana/files/grafana.initd index 5d5eb4a..f0b6ed7 100644 --- a/www-apps/grafana/files/grafana.initd +++ b/www-apps/grafana/files/grafana.initd @@ -1,5 +1,5 @@ #!/sbin/openrc-run -# Copyright 1999-2022 Gentoo Foundation +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 description="The open-source platform for monitoring and observability" @@ -8,13 +8,14 @@ description="The open-source platform for monitoring and observability" : ${GRAFANA_DATADIR:=/var/lib/~PN_S~} : ${GRAFANA_LOGDIR:=/var/log/~PN_S~} : ${GRAFANA_TERMTIMEOUT:="TERM/20/KILL/5"} -: ${SSD_OPTS:="-d /usr/share/~PN_S~ -w 1000"} +: ${SSD_OPTS:="-w 1000"} name="Grafana" command="/usr/bin/~PN_S~-server" command_args="${GRAFANA_OPTS}" command_user="${GRAFANA_USER}" command_background=true +directory="/usr/share/~PN_S~" pidfile="/run/${SVCNAME}.pid" required_files="${GRAFANA_CONFIG}" retry="${GRAFANA_TERMTIMEOUT}" diff --git a/www-apps/grafana/grafana-12.1.1.ebuild b/www-apps/grafana/grafana-12.2.1.ebuild similarity index 94% rename from www-apps/grafana/grafana-12.1.1.ebuild rename to www-apps/grafana/grafana-12.2.1.ebuild index d9be4ef..a0df678 100644 --- a/www-apps/grafana/grafana-12.1.1.ebuild +++ b/www-apps/grafana/grafana-12.2.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -12,7 +12,7 @@ DESCRIPTION="The open-source platform for monitoring and observability" HOMEPAGE="https://grafana.com" yarn_version="4.9.2" -## building vendor and yarn vendors (@WilliamH - ping me!) +## building vendor and yarn vendors needs nodejs[npm] # >> git clone https://github.com/grafana/grafana -b v /tmp/grafana # >> cd /tmp/grafana && version=`git describe --tags | sed -E "s/v([0-9.]+)/\1/g"` # >> GOWORK=off go mod vendor && go work vendor && mkdir grafana-${version} && mv vendor grafana-${version}/vendor @@ -33,7 +33,7 @@ LICENSE="AGPL-3.0 Apache-2.0 BSD-2 BSD-3 BSD-4 BSL-1.0 ImageMagick ISC LGPL-3.0 SLOT="12/"${PV} KEYWORDS="~amd64" IUSE="systemd" -RESTRICT="test" # Tests not wroking (a proper fix would take to long) +RESTRICT="test" # Tests not working (a proper fix would take to long) # needed for webpack (nodejs) CHECKREQS_MEMORY="8G" @@ -41,18 +41,15 @@ CHECKREQS_MEMORY="8G" DEPEND="!www-apps/${PN}-bin acct-group/${PN} acct-user/${PN} - media-libs/fontconfig - net-libs/nodejs[icu] +" + +BDEPEND="media-libs/fontconfig + net-libs/nodejs:0/22[icu] sys-apps/yarn - >=dev-lang/go-1.20 + >=dev-lang/go-1.25 >=dev-go/wire-0.6.0" - PN_S="${PN}-${SLOT%/*}" -PATCHES=( - "${FILESDIR}/${PN}-12.1.1-node-22.18.0.patch" -) - src_prepare() { sed -i "s:;reporting_enabled = .*:reporting_enabled = false:" \ conf/sample.ini || die "prepare failed" @@ -78,7 +75,7 @@ src_prepare() { src_compile() { ## install yarn deps(offline).. - CYPRESS_INSTALL_BINARY=0 PUPPETEER_SKIP_DOWNLOAD=0 yarn install || die "prepare failed" + CYPRESS_INSTALL_BINARY=0 PUPPETEER_SKIP_DOWNLOAD=1 yarn install || die "prepare failed" einfo "Wiring everything up.." wire gen -tags oss ./pkg/server ./pkg/cmd/grafana-cli/runner || die "wiring failed"