commit:     bfa1f24582efb3c0ff53b43834d72d4553ade905
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Wed Apr  9 14:11:54 2025 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Wed Apr  9 14:13:09 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bfa1f245

app-metrics/carbonapi-booking-0.3.0_p20250201: code bump

Over the past two years a lot of changes have been made, but no
releases, cut a snapshot.

carbonzipper has been merged with carbonapi in this code.

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 app-metrics/carbonapi-booking/Manifest             |  1 +
 .../carbonapi-booking-0.3.0_p20250201.ebuild       | 59 ++++++++++++++++++++++
 ...carbonapi-booking-0.3.0_p20250201-colours.patch | 55 ++++++++++++++++++++
 ...carbonapi-booking-0.3.0_p20250201-logfile.patch | 14 +++++
 4 files changed, 129 insertions(+)

diff --git a/app-metrics/carbonapi-booking/Manifest 
b/app-metrics/carbonapi-booking/Manifest
index b7df71a38195..72651eaa5943 100644
--- a/app-metrics/carbonapi-booking/Manifest
+++ b/app-metrics/carbonapi-booking/Manifest
@@ -1 +1,2 @@
 DIST carbonapi-booking-0.3.0.tar.gz 1395080 BLAKE2B 
e5ebe20a4833f17919f0a14e091b06b5270d7dd8880fa87600454ac33b7df7600d1428f0b2e06c65a1a36796e2eb026e8c47b98444dce168cec0e965ebee9d69
 SHA512 
327af89fd86661ccca9d7250e70b66f03089841b20e3c51128bcbb835a91d553d952928d991424f9bbe1fea235cd9e6242784d8cbd828725ba5b2cfb64328487
+DIST carbonapi-booking-0.3.0_p20250201.zip 6001476 BLAKE2B 
a0104d6d8822f06a4d66ab0c433054182e02de82e7c9e8e773f9478dd463113eab2c21e88027c6a220788cbca4d66f78519193cc3488e4e8466a44fe05e27139
 SHA512 
227b86cd5d900ea11bb220034a753fd89e48b36859377233a6524de05742cc6ea494e2c2824987ad8a80c55d6c88a8a800a9c6024ddf59b94a92c7093aee6b68

diff --git 
a/app-metrics/carbonapi-booking/carbonapi-booking-0.3.0_p20250201.ebuild 
b/app-metrics/carbonapi-booking/carbonapi-booking-0.3.0_p20250201.ebuild
new file mode 100644
index 000000000000..dd4e2fa7ea03
--- /dev/null
+++ b/app-metrics/carbonapi-booking/carbonapi-booking-0.3.0_p20250201.ebuild
@@ -0,0 +1,59 @@
+# Copyright 2023-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module
+
+COMMIT=8881b346c8579862a34c4ab46314501117e339dc
+MY_PN=${PN%-booking}
+DESCRIPTION="High-performance Graphite front-end, Booking.com fork"
+HOMEPAGE="https://github.com/bookingcom/carbonapi";
+SRC_URI="https://github.com/bookingcom/carbonapi/archive/${COMMIT}.zip -> 
${P}.zip"
+
+S="${WORKDIR}/${MY_PN}-${COMMIT}"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="
+       app-arch/bzip2
+       dev-libs/expat
+       media-libs/fontconfig
+       media-libs/freetype
+       media-libs/libpng
+       x11-libs/cairo[X]
+       x11-libs/libX11
+       x11-libs/libXau
+       x11-libs/libxcb
+       x11-libs/libXdmcp
+       x11-libs/libXext
+       x11-libs/libXrender
+       x11-libs/pixman
+"
+RDEPEND="${DEPEND}
+       acct-group/carbon
+       acct-user/carbon"
+BDEPEND=""
+
+src_prepare() {
+       export VERSION="gentoo-${PVR}"
+
+       # bug 904051: disable data-race detection, conflicts with
+       # go-module's -buildmode=pie
+       sed -i -e 's/ -race / /' Makefile || die
+
+       eapply "${FILESDIR}"/${P}-logfile.patch
+       eapply "${FILESDIR}"/${P}-colours.patch
+
+       eapply_user
+}
+
+src_install() {
+       insinto /etc/carbonapi
+       doins -r "${S}"/config/*
+       dobin carbonapi
+
+       newinitd "${FILESDIR}"/${PN}.initd carbonapi
+       newconfd "${FILESDIR}"/${PN}.confd carbonapi
+}

diff --git 
a/app-metrics/carbonapi-booking/files/carbonapi-booking-0.3.0_p20250201-colours.patch
 
b/app-metrics/carbonapi-booking/files/carbonapi-booking-0.3.0_p20250201-colours.patch
new file mode 100644
index 000000000000..7726853e17ab
--- /dev/null
+++ 
b/app-metrics/carbonapi-booking/files/carbonapi-booking-0.3.0_p20250201-colours.patch
@@ -0,0 +1,55 @@
+use colouring defaults from graphite-web-1.10
+
+--- carbonapi-0.3.0/pkg/expr/functions/cairo/png/picture_params.go
++++ carbonapi-0.3.0/pkg/expr/functions/cairo/png/picture_params.go
+@@ -351,10 +351,10 @@
+       Height:     250,
+       Margin:     10,
+       LogBase:    0,
+-      FgColor:    "white",
+-      BgColor:    "black",
+-      MajorLine:  "rose",
+-      MinorLine:  "grey",
++      FgColor:    "black",
++      BgColor:    "white",
++      MajorLine:  "grey",
++      MinorLine:  "rose",
+       FontName:   "Sans",
+       FontSize:   10,
+       FontBold:   FontWeightNormal,
+@@ -414,8 +414,8 @@
+       LeftDashed:  false,
+       LeftColor:   "",
+ 
+-      MajorGridLineColor: "white",
+-      MinorGridLineColor: "grey",
++      MajorGridLineColor: "grey",
++      MinorGridLineColor: "rose",
+ }
+ 
+ var templates = map[string]PictureParams{
+@@ -424,10 +424,10 @@
+               Height:     250,
+               Margin:     10,
+               LogBase:    0,
+-              FgColor:    "white",
+-              BgColor:    "black",
+-              MajorLine:  "rose",
+-              MinorLine:  "grey",
++              FgColor:    "black",
++              BgColor:    "white",
++              MajorLine:  "grey",
++              MinorLine:  "rose",
+               FontName:   "Sans",
+               FontSize:   10,
+               FontBold:   FontWeightNormal,
+@@ -487,7 +487,7 @@
+               LeftDashed:  false,
+               LeftColor:   "",
+ 
+-              MajorGridLineColor: "white",
+-              MinorGridLineColor: "grey",
++              MajorGridLineColor: "grey",
++              MinorGridLineColor: "rose",
+       },
+ }

diff --git 
a/app-metrics/carbonapi-booking/files/carbonapi-booking-0.3.0_p20250201-logfile.patch
 
b/app-metrics/carbonapi-booking/files/carbonapi-booking-0.3.0_p20250201-logfile.patch
new file mode 100644
index 000000000000..c365e8317c8d
--- /dev/null
+++ 
b/app-metrics/carbonapi-booking/files/carbonapi-booking-0.3.0_p20250201-logfile.patch
@@ -0,0 +1,14 @@
+- don't log to stdout
+- change log to be under subdir so ebuild can manage its permissions
+
+--- carbonapi-0.3.0/config/carbonapi.yaml
++++ carbonapi-0.3.0/config/carbonapi.yaml
+@@ -130,7 +130,7 @@
+     - X-Real-Ip
+     - X-Webauth-User
+ loggerConfig:
+-  outputPaths: ["stdout"]
++  outputPaths: ["/var/log/carbonapi/carbonapi.log"]
+   level: "info"
+   encoding: "json"
+ 

Reply via email to