gentoo auto-resync : 10:01:2024 - 01:02:07

3 files changed, 37 insertions, 48 deletions

diff --git a/net-analyzer/netdata/Manifest b/net-analyzer/netdata/Manifest
index 2a495f04c24c..27e02d89c209 100644
--- a/net-analyzer/netdata/Manifest
+++ b/net-analyzer/netdata/Manifest
@@ -1,5 +1,5 @@
 AUX netdata-1.44.0-dbengine.patch 1703 BLAKE2B 50af2960a6bf44361a5d9a0bd916c6909874211e170bd986794d901503e841fc3dd7ff1cbb5d2d97a86506b84d0bdc1a1199e3da6615d6f3e94486fba53eac31 SHA512 5b223f522bb25f5ace9e1622cd7d23526343c5499dccf10ea2353524d089134742b5cdf11c7f2f813844b0a96b8f469c485cccb282f49bd07e097108da2f085c
 DIST netdata-1.44.0.tar.gz 47423685 BLAKE2B 2b430d07abed1e49c5b7a3c24188446e929301eecc849d03ee9c33860f13942dbc06453401d166195b1aadd16e28e19b7533d16fc10e6f3eca51117b52485a85 SHA512 ef3534351504385ac33e18917a839c6506c377a4f25246d8819da916c6e46ae3d2d6f5422e8a685fd3aabbf851829233943abce8a8aeba0ce94db011ed406602
 EBUILD netdata-1.44.0.ebuild 4194 BLAKE2B 2537be743e2f79d32e26178ef4383d31bd2f62c3569cc97f2cbe0dbe38cda4deaf06805cd05058032e8723f0431673fab68101fbed4a0971a9d2c6fb3be225ce SHA512 6d72c64347410e16a0e56e6a90f052a77e0f3b847e049a0bc260a1e90053c779466ce4183168bba7ab18d03648c746db6ae592bd7289cb1069ccb93a8e90dd13
-EBUILD netdata-9999.ebuild 4146 BLAKE2B 3eaa34d560faa0face5cb6a3b4e43a05e16837581786960fca2fcf05256651621376a2f9206ab958620dcc0a4a3e336384f5c2e45a758f99b319cb371d6fe64d SHA512 a3f917f41dc523f8772f4f27920f9abc6b80b66e4746c4d2bec2db57cd09c165088936cd3713722034e9df18fb42024d144bf782b2728082839512561643258e
-MISC metadata.xml 1203 BLAKE2B 231af387a26e28b4251706f86879e5c4aba597492900488d003d75f6f1ef414bd601c2e03a1a64d0be5cffbf2d650f0c9501467ab8874eb6afc1214ed5a734c4 SHA512 d94ac9824fe69671e5ddc2d853054d7ba1a7ae8af7d16ba64bcd098b0c23caea2b16f666d5454439956972c517e547486c7dc9dbcfee9e1a6d79a83478d9aded
+EBUILD netdata-9999.ebuild 4005 BLAKE2B c510ece3c310879633e991b2c3ef91511201f369aaceb86840dc1e433270c2d6aa93407fb3338bc2eda9886e50865778e7ccb080b834947e8cccf4cc02fb5379 SHA512 3c2ca2a440afe653e2f3c5068ff31c53b5ba674aee18ad8e2128f61df8c9e80e96b35de8155a398d878c421256ab06db372d4bc11e3adb69067fc9fe7caf97f2
+MISC metadata.xml 1512 BLAKE2B 321d3c1be16a0fd3c64d89f96c510d68ea82fca12730183d2724f7a0f30fdcb94c2be2749a6f9651ae7effdf7c250e977f95cf03c865a20e03e136456429c2b3 SHA512 4bd5583efd1fee4a0f221708fedf6dcf424639852842c8ba1089a2303a57ae58ccfd302fc5fcbfdada65a56efa8c7c949b95eedde0133a770ef68ca6688bbefd
diff --git a/net-analyzer/netdata/metadata.xml b/net-analyzer/netdata/metadata.xml
index f1324e58552f..ea8a63a7fd26 100644
--- a/net-analyzer/netdata/metadata.xml
+++ b/net-analyzer/netdata/metadata.xml
@@ -6,6 +6,8 @@
     <name>Craig Andrews</name>
   </maintainer>
   <use>
+    <flag name="aclk">Enable Agent-Cloud Link (ACLK) for securely connecting a Netdata Agent to your web browser through Netdata Cloud</flag>
+    <flag name="bpf">Enable the extended Berkeley Packet Filter (eBPF) collector to monitor kernel-level metrics about applications with per-second granularity</flag>
     <flag name="cloud">Enable Netdata Cloud support</flag>
     <flag name="compression">Enable compression via zlib</flag>
     <flag name="dbengine">Enable the Netdata database engine</flag>
diff --git a/net-analyzer/netdata/netdata-9999.ebuild b/net-analyzer/netdata/netdata-9999.ebuild
index 9d37063dbfcd..e6d230c74a3e 100644
--- a/net-analyzer/netdata/netdata-9999.ebuild
+++ b/net-analyzer/netdata/netdata-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 PYTHON_COMPAT=( python{3_9,3_10,3_11} )
 
-inherit autotools fcaps flag-o-matic linux-info optfeature python-single-r1 systemd toolchain-funcs
+inherit cmake fcaps linux-info optfeature python-single-r1 systemd
 
 if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/netdata/${PN}.git"
@@ -20,7 +20,7 @@ HOMEPAGE="https://github.com/netdata/netdata https://my-netdata.io/"
 
 LICENSE="GPL-3+ MIT BSD"
 SLOT="0"
-IUSE="caps cloud +compression cpu_flags_x86_sse2 cups +dbengine ipmi +jsonc +lto mongodb mysql nfacct nodejs postgres prometheus +python tor xen"
+IUSE="aclk bpf cloud cups +dbengine ipmi mongodb mysql nfacct nodejs postgres prometheus +python tor xen"
 REQUIRED_USE="
 	mysql? ( python )
 	python? ( ${PYTHON_REQUIRED_USE} )
@@ -41,19 +41,23 @@ RDEPEND="
 	net-misc/wget
 	sys-apps/util-linux
 	app-alternatives/awk
-	caps? ( sys-libs/libcap )
+	sys-libs/libcap
 	cups? ( net-print/cups )
+	app-arch/lz4:=
+	app-arch/zstd:=
+	app-arch/brotli:=
 	dbengine? (
-		app-arch/lz4:=
 		dev-libs/judy
 		dev-libs/openssl:=
 	)
+	dev-libs/libpcre2:=
 	dev-libs/libuv:=
 	dev-libs/libyaml
-	cloud? ( dev-libs/protobuf:= )
+	dev-libs/protobuf:=
+	bpf? ( virtual/libelf:= )
 	sys-libs/zlib
 	ipmi? ( sys-libs/freeipmi )
-	jsonc? ( dev-libs/json-c:= )
+	dev-libs/json-c:=
 	mongodb? ( dev-libs/mongo-c-driver )
 	nfacct? (
 		net-firewall/nfacct
@@ -89,59 +93,42 @@ pkg_setup() {
 	linux-info_pkg_setup
 }
 
-src_prepare() {
-	default
-	eautoreconf
-}
-
 src_configure() {
-	if use ppc64; then
-		# bundled dlib does not support vsx on big-endian
-		# https://github.com/davisking/dlib/issues/397
-		[[ $(tc-endian) == big ]] && append-flags -mno-vsx
-	fi
-
-	econf \
-		--localstatedir="${EPREFIX}"/var \
-		--with-user=netdata \
-		--without-bundled-protobuf \
-		$(use_enable cloud) \
-		$(use_enable jsonc) \
-		$(use_enable cups plugin-cups) \
-		$(use_enable dbengine) \
-		$(use_enable nfacct plugin-nfacct) \
-		$(use_enable ipmi plugin-freeipmi) \
-		--disable-exporting-kinesis \
-		$(use_enable lto lto) \
-		$(use_enable mongodb exporting-mongodb) \
-		$(use_enable prometheus exporting-prometheus-remote-write) \
-		$(use_enable xen plugin-xenstat) \
-		$(use_enable cpu_flags_x86_sse2 x86-sse)
-}
-
-src_compile() {
-	emake clean
-	default
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_Git=TRUE
+		-DCMAKE_INSTALL_PREFIX=/
+		-DENABLE_ACLK=$(usex aclk)
+		-DENABLE_CLOUD=$(usex cloud)
+		-DENABLE_DBENGINE=$(usex dbengine)
+		-DENABLE_PLUGIN_CUPS=$(usex cups)
+		-DENABLE_PLUGIN_NFACCT=$(usex nfacct)
+		-DENABLE_PLUGIN_FREEIPMI=$(usex ipmi)
+		-DENABLE_EXPORTER_MONGODB=$(usex mongodb)
+		-DENABLE_EXPORTER_PROMETHEUS_REMOTE_WRITE=$(usex prometheus)
+		-DENABLE_PLUGIN_XENSTAT=$(usex xen)
+		-DENABLE_PLUGIN_EBPF=$(usex bpf)
+	)
+	cmake_src_configure
 }
 
 src_install() {
-	default
+	cmake_src_install
 
 	rm -rf "${D}/var/cache" || die
+	rm -rf "${D}/var/run" || die
 
 	keepdir /var/log/netdata
 	fowners -Rc netdata:netdata /var/log/netdata
 	keepdir /var/lib/netdata
 	keepdir /var/lib/netdata/registry
+	keepdir /var/lib/netdata/cloud.d
 	fowners -Rc netdata:netdata /var/lib/netdata
 
-	fowners -Rc root:netdata /usr/share/${PN}
-
-	newinitd system/openrc/init.d/netdata ${PN}
-	newconfd system/openrc/conf.d/netdata ${PN}
-	systemd_dounit system/systemd/netdata.service
-	systemd_dounit system/systemd/netdata-updater.service
-	systemd_dounit system/systemd/netdata-updater.timer
+	newinitd "${D}/usr/lib/netdata/system/openrc/init.d/netdata" "${PN}"
+	newconfd "${D}/usr/lib/netdata/system/openrc/conf.d/netdata" "${PN}"
+	systemd_newunit "${D}/usr/lib/netdata/system/systemd/netdata.service.v235" netdata.service
+	systemd_dounit "${D}/usr/lib/netdata/system/systemd/netdata-updater.service"
+	systemd_dounit "${D}/usr/lib/netdata/system/systemd/netdata-updater.timer"
 	insinto /etc/netdata
 	doins system/netdata.conf
 }