gentoo auto-resync : 10:04:2025 - 08:43:23

6 files changed, 132 insertions, 2 deletions

diff --git a/app-metrics/Manifest.gz b/app-metrics/Manifest.gz
index ac6eb6095103..6f8b09202dbd 100644
--- a/app-metrics/Manifest.gz
+++ b/app-metrics/Manifest.gz
diff --git a/app-metrics/carbonapi-booking/Manifest b/app-metrics/carbonapi-booking/Manifest
index 08b711d29b8f..847c792e21b1 100644
--- a/app-metrics/carbonapi-booking/Manifest
+++ b/app-metrics/carbonapi-booking/Manifest
@@ -1,7 +1,11 @@
 AUX carbonapi-booking-0.3.0-colours.patch 1273 BLAKE2B ef8e882c78668d54ca7cbbca051bafd5c291cb9cd9e6a2a7293b8069f1a886af44deea9cfb7abe4257894a42fc69794125fb58b31a33c831877bfb9f8c3b1e79 SHA512 0fedbee15d83de86b2edf4b5d1eb84f7cc4ad7d22a209fec3f50f45772a1ea6184f50b8ef635d5a9793bb2b0dd4921d62fa2348c46ce3ccca9a9824353f64bb5
 AUX carbonapi-booking-0.3.0-logfile.patch 395 BLAKE2B 2b4d87cc68d8ac798ec91d8de6d07b35adc583903fc4961f9cbdab8f3c1590a2a449fe83fb935e202c50139d629e835c2c096dbf0d5b084432b95581de3b2581 SHA512 675a04e32c8e449459d4410a6c472d8e7fa3892b9086b9314ac740c3fafd7b9b4df64455304eb917fc335f92305eec1e84cd0b87aa674e894880413e66d2d9ff
+AUX carbonapi-booking-0.3.0_p20250201-colours.patch 1281 BLAKE2B 2b748d380c1c2d3f982aed25eac106adb236ce13f81c483d6e6d34947080e930ba612cbc0c8874c604e3e40afbadeaaf96236e225960d602b64d55e1bfd56557 SHA512 276f088195f4ec83633f02cb6a616cbef5ac8513c48c43f0c2922a860019701591f4defd9321c57bebf627185551ee2ceb8027f379c1eeafcc3642654ba5fbaa
+AUX carbonapi-booking-0.3.0_p20250201-logfile.patch 369 BLAKE2B bb5467ea978e370c5194a5e8c46f7c1fffb4c8f8949436517c7fc079f979bcb9ee63a7272ad01e644c6e9f49f5dc55a15771c4542da317a77a72741915a9e6c1 SHA512 3ff2638cf393b9a97f40a517abdd979b333c1ef813850281187ccfd922c6f358585895cf655aeeb60f0cf26d051fbe2fdff4a20348885cce0fb74a6bc16893f4
 AUX carbonapi-booking.confd 213 BLAKE2B 2a23f23f102c0f20a988d9a8d3da8f06494c1292de1fa26f500e5614b196b012129aae492f6e377ea4e0e092a01fed8888563e2958c2cdfcca3ecd7023ab7cbd SHA512 a014879eaa49accf7004d696dc5a46c157fdf07dce9dd0427e103ddbf524611036f48cadcf5875af00a22c2b2c14627435af3d835aa4bcdfcb5504bfcd89b1a9
 AUX carbonapi-booking.initd 932 BLAKE2B 52f37edae9b7f70ce53df62fe4c548bdaf977087efa776ba2d73214553912129b300b349ceadada51aa72b04d72908327b1cb73977bf80bae2bb3a96ee9214f0 SHA512 eca90cc38fa8a9af5459de7758b794503108fa64cbe2bb20cb18360cd5a2312091ca4236f018c5e51b325af474c1d4cf40286b4a18ca7096a3dee9b4ecfaea55
 DIST carbonapi-booking-0.3.0.tar.gz 1395080 BLAKE2B e5ebe20a4833f17919f0a14e091b06b5270d7dd8880fa87600454ac33b7df7600d1428f0b2e06c65a1a36796e2eb026e8c47b98444dce168cec0e965ebee9d69 SHA512 327af89fd86661ccca9d7250e70b66f03089841b20e3c51128bcbb835a91d553d952928d991424f9bbe1fea235cd9e6242784d8cbd828725ba5b2cfb64328487
-EBUILD carbonapi-booking-0.3.0-r1.ebuild 1216 BLAKE2B 3848b750a058b49a62e038ebc45cf9664f22e751aa01c1e70ece86c6f21130c3341bec87a658df8cabb4d1b3eb047f9b61a48ab0073a8d8914e3c113bb3f7bbf SHA512 8066dc7874a8fa63019b0592f5b34297b5c8e96a77f1087182aa5ed7e1816c5e73a2fc73597ef905bfec11d4654d4310377914ec517f0637ecb3356a983c5ad5
+DIST carbonapi-booking-0.3.0_p20250201.tar.gz 4408797 BLAKE2B 617012a5ff6387bf0730a14774297794db1d72be40cef2a9aa038f8dcfc40c9f623e7436921f73e27c26a8dcdfbb92cd794ca2390e94a942b69f0f9c69499b1a SHA512 16cb94f644e2d3e84cafaf005a3aab8b48b076468ddee7ea65a353438a693d254e4d6e68816b2fc78dce57e9b67f08eda4b896cf6cfe2505a7fbc932600840f8
+EBUILD carbonapi-booking-0.3.0-r1.ebuild 1205 BLAKE2B fef7c01be1a39d21aff31c9a55594c2d0c29df2c000bb2b29f8e94c3e0508380a4bcf48479bd6bf118dc3cd83b7772db789ee8bdd23c004148997c837060b4eb SHA512 ede15d5f09dbc8a87d77fefe4466e2365be5431bcae30a45d7c241cee088fa9489cb6de30d84c8b7e3a48bab26064fd15e80de049b1ea3a5f0a77331367ebec8
+EBUILD carbonapi-booking-0.3.0_p20250201.ebuild 1256 BLAKE2B 4f2abc68699dd327c187f80d9b6ef4825f28ee7aa8febeed1a400acea8bfccc3d506cd1d8c3f092ed15d9bc3d35efac46a2933d3b9d9013c6e0a11d2041138e6 SHA512 0971640e8337b8838c288f71c541b0b4e3571800a01fee0ed21548f389391e474083c7b1c51b7fda5224c121d74ea6787362506ed90b07138e59b513d04b7f24
 MISC metadata.xml 334 BLAKE2B 81ff9b6976e8c05afd1a70cb03b1e3d14adf26df09883f21b13ad7368d527aea5aacaa1222e427a34c5b39922d0b4ab568d06846fb80381ed3c1e83e9c301e6d SHA512 a73a32986d738bef2d5ea5e479cd626c14c4bf7222e1b6b1918fd9232574975e1d002d479080a55ea02c40c129650093133da3b2eb1b8d658bff3f26d476cb27
diff --git a/app-metrics/carbonapi-booking/carbonapi-booking-0.3.0-r1.ebuild b/app-metrics/carbonapi-booking/carbonapi-booking-0.3.0-r1.ebuild
index 166f4baa33fa..cb8dd0c332a6 100644
--- a/app-metrics/carbonapi-booking/carbonapi-booking-0.3.0-r1.ebuild
+++ b/app-metrics/carbonapi-booking/carbonapi-booking-0.3.0-r1.ebuild
@@ -33,7 +33,6 @@ DEPEND="
 RDEPEND="${DEPEND}
 	acct-group/carbon
 	acct-user/carbon"
-BDEPEND=""
 
 src_prepare() {
 	export VERSION="gentoo-${PVR}"
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..65b45b2d0e0f
--- /dev/null
+++ b/app-metrics/carbonapi-booking/carbonapi-booking-0.3.0_p20250201.ebuild
@@ -0,0 +1,58 @@
+# 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}.tar.gz -> ${P}.tar.gz"
+
+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"
+
+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"
+