[net-analyzer/netdata] sync, not tested yet

net-analyzer/netdata/Manifest

@@ -1 +1 @@
-DIST netdata-1.44.1.tar.gz 47466484 BLAKE2B 54ba1a20846a536a7bd931bf63b9b55fbff6f542d3fe5862847c1940dd5e4c4a1854a6526b19482f8232483f57745e2f66bd2a15163c9a4807b15d5aab1d0d8d SHA512 2c3f4ff03704eb19a203a2ee7494c6f16e2b1a45ec3464ca3685dc6baa4b82e5d216c6076610a07a610db7e0eae93b3be52eb69382fc07fcde83fdc4727c8ba2
+DIST netdata-1.47.1.tar.gz 51028613 BLAKE2B 435aeb7a87655b234ac7373307d05b9933e40817fdcdbdf291c1b2719eb9d6e5fa53fe4fb81b715303a87d8f1f7faeac1b3f97c042f76f6872250aacf805503e SHA512 33a94d93caf2c58874da3dd4e62ebabda7e8d303a4f04712dac0cf4e59ff9c384016a6b356783370567c6857c81f0df294331f889198bbf115a00f3df7378758

net-analyzer/netdata/metadata.xml

@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
     <email>candrews@gentoo.org</email>
     <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="dbengine">Enable the Netdata database engine</flag>
     <flag name="ipmi">Install <pkg>sys-apps/ipmitool</pkg> required for monitoring IPMI sensors.</flag>
-    <flag name="jsonc">Enable optimization of JSON using <pkg>dev-libs/json-c</pkg></flag>
-    <flag name="lto">Build with Link Time Optimization (LTO)</flag>
     <flag name="mongodb">Enable support for the mongodb backend</flag>
     <flag name="nfacct">Enable the nfacct plugin</flag>
     <flag name="nodejs">Enable use of nodejs (which some plugins use)</flag>
@@ -20,5 +20,6 @@
   </use>
   <upstream>
     <remote-id type="github">netdata/netdata</remote-id>
+    <remote-id type="cpe">cpe:/a:netdata:netdata</remote-id>
   </upstream>
 </pkgmetadata>

net-analyzer/netdata/netdata-1.47.1.ebuild

@@ -1,10 +1,10 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-PYTHON_COMPAT=( python{3_10,3_11} )
+PYTHON_COMPAT=( python{3_9,3_10,3_11,3_12} )
 
-inherit autotools fcaps flag-o-matic linux-info 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 systemd tor xen"
 REQUIRED_USE="
 	mysql? ( python )
 	python? ( ${PYTHON_REQUIRED_USE} )
@@ -32,29 +32,32 @@ RDEPEND="
 	acct-user/netdata
 	app-misc/jq
 	>=app-shells/bash-4:0
-	dev-libs/libpcre2:=
 	|| (
 		net-analyzer/openbsd-netcat
 		net-analyzer/netcat
 	)
+	net-libs/libwebsockets
 	net-misc/curl
 	net-misc/wget
 	sys-apps/util-linux
 	app-alternatives/awk
-	caps? ( sys-libs/libcap )
+	sys-libs/libcap
 	cups? ( net-print/cups )
-	dbengine? (
-		app-arch/brotli:=
 	app-arch/lz4:=
 	app-arch/zstd:=
+	app-arch/brotli:=
+	dbengine? (
+		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
@@ -75,7 +78,8 @@ RDEPEND="
 	xen? (
 		app-emulation/xen-tools
 		dev-libs/yajl
-	)"
+	)
+	systemd? ( sys-apps/systemd )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
@@ -96,63 +100,44 @@ pkg_setup() {
 	linux-info_pkg_setup
 }
 
-src_prepare() {
-	default
-	eautoreconf
-}
-
 src_configure() {
-	if use ppc64; then
+	local mycmakeargs=(
-		# bundled dlib does not support vsx on big-endian
+		-DCMAKE_DISABLE_FIND_PACKAGE_Git=TRUE
-		# https://github.com/davisking/dlib/issues/397
+		-DCMAKE_INSTALL_PREFIX=/
-		[[ $(tc-endian) == big ]] && append-flags -mno-vsx
+		-DENABLE_ACLK=$(usex aclk)
-	fi
+		-DENABLE_CLOUD=$(usex cloud)
-
+		-DENABLE_DBENGINE=$(usex dbengine)
-	econf \
+		-DENABLE_PLUGIN_CUPS=$(usex cups)
-		--localstatedir="${EPREFIX}"/var \
+		-DENABLE_PLUGIN_NFACCT=$(usex nfacct)
-		--with-user=netdata \
+		-DENABLE_PLUGIN_FREEIPMI=$(usex ipmi)
-		--without-bundled-protobuf \
+		-DENABLE_EXPORTER_MONGODB=$(usex mongodb)
-		$(use_enable cloud) \
+		-DENABLE_EXPORTER_PROMETHEUS_REMOTE_WRITE=$(usex prometheus)
-		$(use_enable jsonc) \
+		-DENABLE_PLUGIN_XENSTAT=$(usex xen)
-		$(use_enable cups plugin-cups) \
+		-DENABLE_PLUGIN_EBPF=$(usex bpf)
-		$(use_enable dbengine) \
+		-DENABLE_PLUGIN_GO=FALSE
-		$(use_enable nfacct plugin-nfacct) \
+		-DENABLE_PLUGIN_SYSTEMD_JOURNAL=$(usex systemd)
-		$(use_enable ipmi plugin-freeipmi) \
+	)
-		--disable-exporting-kinesis \
+	cmake_src_configure
-		$(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
 }
 
 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 "${D}/usr/lib/netdata/system/openrc/init.d/netdata" "${PN}"
-
+	newconfd "${D}/usr/lib/netdata/system/openrc/conf.d/netdata" "${PN}"
-	fowners -Rc root:netdata /usr/libexec/netdata/plugins.d
+	systemd_newunit "${D}/usr/lib/netdata/system/systemd/netdata.service.v235" netdata.service
-
+	systemd_dounit "${D}/usr/lib/netdata/system/systemd/netdata-updater.service"
-	fperms 4750 /usr/libexec/netdata/plugins.d/{cgroup-network,ioping.plugin,perf.plugin,slabinfo.plugin}
+	systemd_dounit "${D}/usr/lib/netdata/system/systemd/netdata-updater.timer"
-
-	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
 	insinto /etc/netdata
 	doins system/netdata.conf
 }
@@ -171,4 +156,6 @@ pkg_postinst() {
 	if use ipmi ; then
 		fcaps 'cap_dac_override' 'usr/libexec/netdata/plugins.d/freeipmi.plugin'
 	fi
+
+	optfeature "go.d external plugin" net-analyzer/netdata-go-plugin
 }

net-analyzer/netdata/netdata-9999.ebuild

@@ -1,10 +1,10 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-PYTHON_COMPAT=( python{3_10,3_11} )
+PYTHON_COMPAT=( python{3_9,3_10,3_11,3_12} )
 
-inherit autotools fcaps flag-o-matic linux-info 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 systemd tor xen"
 REQUIRED_USE="
 	mysql? ( python )
 	python? ( ${PYTHON_REQUIRED_USE} )
@@ -32,29 +32,32 @@ RDEPEND="
 	acct-user/netdata
 	app-misc/jq
 	>=app-shells/bash-4:0
-	dev-libs/libpcre2:=
 	|| (
 		net-analyzer/openbsd-netcat
 		net-analyzer/netcat
 	)
+	net-libs/libwebsockets
 	net-misc/curl
 	net-misc/wget
 	sys-apps/util-linux
 	app-alternatives/awk
-	caps? ( sys-libs/libcap )
+	sys-libs/libcap
 	cups? ( net-print/cups )
-	dbengine? (
-		app-arch/brotli:=
 	app-arch/lz4:=
 	app-arch/zstd:=
+	app-arch/brotli:=
+	dbengine? (
+		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
@@ -75,7 +78,8 @@ RDEPEND="
 	xen? (
 		app-emulation/xen-tools
 		dev-libs/yajl
-	)"
+	)
+	systemd? ( sys-apps/systemd )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
@@ -96,63 +100,44 @@ pkg_setup() {
 	linux-info_pkg_setup
 }
 
-src_prepare() {
-	default
-	eautoreconf
-}
-
 src_configure() {
-	if use ppc64; then
+	local mycmakeargs=(
-		# bundled dlib does not support vsx on big-endian
+		-DCMAKE_DISABLE_FIND_PACKAGE_Git=TRUE
-		# https://github.com/davisking/dlib/issues/397
+		-DCMAKE_INSTALL_PREFIX=/
-		[[ $(tc-endian) == big ]] && append-flags -mno-vsx
+		-DENABLE_ACLK=$(usex aclk)
-	fi
+		-DENABLE_CLOUD=$(usex cloud)
-
+		-DENABLE_DBENGINE=$(usex dbengine)
-	econf \
+		-DENABLE_PLUGIN_CUPS=$(usex cups)
-		--localstatedir="${EPREFIX}"/var \
+		-DENABLE_PLUGIN_NFACCT=$(usex nfacct)
-		--with-user=netdata \
+		-DENABLE_PLUGIN_FREEIPMI=$(usex ipmi)
-		--without-bundled-protobuf \
+		-DENABLE_EXPORTER_MONGODB=$(usex mongodb)
-		$(use_enable cloud) \
+		-DENABLE_EXPORTER_PROMETHEUS_REMOTE_WRITE=$(usex prometheus)
-		$(use_enable jsonc) \
+		-DENABLE_PLUGIN_XENSTAT=$(usex xen)
-		$(use_enable cups plugin-cups) \
+		-DENABLE_PLUGIN_EBPF=$(usex bpf)
-		$(use_enable dbengine) \
+		-DENABLE_PLUGIN_GO=FALSE
-		$(use_enable nfacct plugin-nfacct) \
+		-DENABLE_PLUGIN_SYSTEMD_JOURNAL=$(usex systemd)
-		$(use_enable ipmi plugin-freeipmi) \
+	)
-		--disable-exporting-kinesis \
+	cmake_src_configure
-		$(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
 }
 
 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 "${D}/usr/lib/netdata/system/openrc/init.d/netdata" "${PN}"
-
+	newconfd "${D}/usr/lib/netdata/system/openrc/conf.d/netdata" "${PN}"
-	fowners -Rc root:netdata /usr/libexec/netdata/plugins.d
+	systemd_newunit "${D}/usr/lib/netdata/system/systemd/netdata.service.v235" netdata.service
-
+	systemd_dounit "${D}/usr/lib/netdata/system/systemd/netdata-updater.service"
-	fperms 4750 /usr/libexec/netdata/plugins.d/{cgroup-network,ioping.plugin,perf.plugin,slabinfo.plugin}
+	systemd_dounit "${D}/usr/lib/netdata/system/systemd/netdata-updater.timer"
-
-	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
 	insinto /etc/netdata
 	doins system/netdata.conf
 }
@@ -171,4 +156,6 @@ pkg_postinst() {
 	if use ipmi ; then
 		fcaps 'cap_dac_override' 'usr/libexec/netdata/plugins.d/freeipmi.plugin'
 	fi
+
+	optfeature "go.d external plugin" net-analyzer/netdata-go-plugin
 }