gentoo resync : 20.03.2022

4 files changed, 322 insertions, 1 deletions

diff --git a/net-analyzer/netdata/Manifest b/net-analyzer/netdata/Manifest
index 69467be55d72..eb29752bd514 100644
--- a/net-analyzer/netdata/Manifest
+++ b/net-analyzer/netdata/Manifest
@@ -1,6 +1,9 @@
 DIST netdata-1.32.1.tar.gz 22472431 BLAKE2B e05e4f29930493ad0c31373dabff57a3fd4f178730848fe4153aebb6219055ef0edda59577fe0c6cc9bd5cf3444b055e8330744f75581804f316f343fc692710 SHA512 869829eadcec4dd9c05cc6b6279830691b6cf9345cdcc0834e90d71f3bbee508c658d16bd379c51ce470c4e735e7c8d607dc045f45a60da2aa3dac36f37b5757
 DIST netdata-1.33.0.tar.gz 22470692 BLAKE2B fc0feed8a93876ca7ec304d8ff95312de19f81fccb5ec564e324751488fe6bb10033c815d456238503bcefdd31ec213d61191e21a5ee6671e23183aec7f298d9 SHA512 31b7ce97a3e756fddc358501d98b5ccf056dbe8d22585628873753f30041533d8926b8549a6f1c795c20b33952ec24df2a3ccdce85d6b1da984964bf08a5a66d
+DIST netdata-1.33.1.tar.gz 22611080 BLAKE2B 01838efcfc99ce644f04af1cde3dcbc5844cf2eaff8afb44503effd017b4dcd9ed990cd2ad6f285f81c72a0bae91586fa21c0306ad932252503ee755b949d7e3 SHA512 f6586426bd0fe1ac3d903ec279b27177b1d232f5ca1fc28b01f052a5f2f57846d2d6369c9d5a1872fb97e31f86f1f7a11c600beda590447f9ca30c93e7ac262c
 EBUILD netdata-1.32.1.ebuild 3875 BLAKE2B 313c72de1625f81e4404160402e52786579c418bd216d73bb869afad7e55e1e98d11620aa8752bf0a85f0e429d0eaa0d3eabc2f5d71ca954595cf5ad6953c8aa SHA512 84bb620ea6186b8cd0a1301558ce8534d429fd0f50a3d0356ce3b73223ab1364a8e772cbf758e3e87399139aee821ddc25a4ec83e0ff46dc9a0503af67e53421
 EBUILD netdata-1.33.0.ebuild 3846 BLAKE2B 7af687733ca6bda186277185084d6624ed7957d78ea1f4e009dd2447c84833a4bfbdd6dfe916c98178601371e31ab742b909d1de71796f64e920e3a851be76b0 SHA512 a151af5cc52e4e0fae3a30cb6fc7c97a9de6ea6e80d7984fdcbc9777ea5fbc1d1cd18a16f583d3f804f1c13115b536284b11868942f7a62347b55af08d495ab0
-EBUILD netdata-9999.ebuild 3843 BLAKE2B 85ab674b580ec9240397c42eff7f88749f83637cc72f4faf15a9529ba8f19e71e5664819cd970853cf0ead417b9fe210620763ff50a629ee7778cd1532975b37 SHA512 e745c8741094d9510f6f12ea240b93cbb89a64fe5ba4091592b71b45e579c271fce3fe1ce98e29040a861ffa879458eceff8687c3701811258d089db4b4db8ac
+EBUILD netdata-1.33.1-r1.ebuild 3909 BLAKE2B 2b393e1c9e107f5e5fd91c0f7e0560bb6d808921c454ec16bc93910e74e9a15e4605e880b5c75e4b75dac84fefe8f3e1a98e00d5558447020469343ef882ea5d SHA512 5e7395c0ce56e1107e0d282616b4d5b9f48061389a38b7760184fc1cf20dce47db80dcf35ca5d70f8a54bbf535e74a5e404b8fd3570cdf616bb89c75f85ea324
+EBUILD netdata-1.33.1.ebuild 3846 BLAKE2B 7af687733ca6bda186277185084d6624ed7957d78ea1f4e009dd2447c84833a4bfbdd6dfe916c98178601371e31ab742b909d1de71796f64e920e3a851be76b0 SHA512 a151af5cc52e4e0fae3a30cb6fc7c97a9de6ea6e80d7984fdcbc9777ea5fbc1d1cd18a16f583d3f804f1c13115b536284b11868942f7a62347b55af08d495ab0
+EBUILD netdata-9999.ebuild 3906 BLAKE2B 62c2648d5c5c0e4768467f8a852fdfdc969b0ae67c356f2dc59d1f96ff0c3ea92a18487e4e3802335c0d7612193ee025395034ad4be9d57a809c7462ee6358b4 SHA512 83d2683d067551a75e8e2c9af2aa9974d19565dfcaf4aceb55f9710f47126269ea5ce03519d665e1aabbebdd6d4a90f20149896787fc449cc1adedaa6f088b03
 MISC metadata.xml 1289 BLAKE2B 8c18928662fdfb9166a3dd147b73206d41b6038268121b23b464f5e8ff8cacf929ac6374aa8b54b63281599be21dd92c352ac229a0e0ff180a57b86faf020ea2 SHA512 e3a344e81572b366848b51022febaeb9f9f5df3555343757061370dc42757817b4b77de85a4f0efb6b52032461cb97edd4b9d41b44b9cec7681b06448f706484
diff --git a/net-analyzer/netdata/netdata-1.33.1-r1.ebuild b/net-analyzer/netdata/netdata-1.33.1-r1.ebuild
new file mode 100644
index 000000000000..6dfe8112013e
--- /dev/null
+++ b/net-analyzer/netdata/netdata-1.33.1-r1.ebuild
@@ -0,0 +1,159 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{3_8,3_9,3_10} )
+
+inherit autotools fcaps flag-o-matic linux-info python-single-r1 systemd toolchain-funcs
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/netdata/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/netdata/${PN}/releases/download/v${PV}/${PN}-v${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-v${PV}"
+	KEYWORDS="~amd64 ~ppc64 ~x86"
+fi
+
+DESCRIPTION="Linux real time system monitoring, done right!"
+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 kinesis +lto mongodb mysql nfacct nodejs postgres prometheus +python tor xen"
+REQUIRED_USE="
+	mysql? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	tor? ( python )"
+
+# most unconditional dependencies are for plugins.d/charts.d.plugin:
+RDEPEND="
+	acct-group/netdata
+	acct-user/netdata
+	app-misc/jq
+	>=app-shells/bash-4:0
+	|| (
+		net-analyzer/openbsd-netcat
+		net-analyzer/netcat
+	)
+	net-libs/libwebsockets
+	net-misc/curl
+	net-misc/wget
+	sys-apps/util-linux
+	virtual/awk
+	caps? ( sys-libs/libcap )
+	cups? ( net-print/cups )
+	dbengine? (
+		app-arch/lz4
+		dev-libs/judy
+		dev-libs/openssl:=
+	)
+	dev-libs/libuv
+	cloud? ( dev-libs/protobuf:= )
+	compression? ( sys-libs/zlib )
+	ipmi? ( sys-libs/freeipmi )
+	jsonc? ( dev-libs/json-c:= )
+	kinesis? ( dev-libs/aws-sdk-cpp[kinesis] )
+	mongodb? ( dev-libs/mongo-c-driver )
+	nfacct? (
+		net-firewall/nfacct
+		net-libs/libmnl
+	)
+	nodejs? ( net-libs/nodejs )
+	prometheus? (
+		dev-libs/protobuf:=
+		app-arch/snappy
+	)
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
+		mysql? ( $(python_gen_cond_dep 'dev-python/mysqlclient[${PYTHON_USEDEP}]') )
+		postgres? ( $(python_gen_cond_dep 'dev-python/psycopg:2[${PYTHON_USEDEP}]') )
+		tor? ( $(python_gen_cond_dep 'net-libs/stem[${PYTHON_USEDEP}]') )
+	)
+	xen? (
+		app-emulation/xen-tools
+		dev-libs/yajl
+	)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+FILECAPS=(
+	'cap_dac_read_search,cap_sys_ptrace+ep' 'usr/libexec/netdata/plugins.d/apps.plugin'
+)
+
+pkg_setup() {
+	use python && python-single-r1_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) \
+		$(use_enable kinesis backend-kinesis) \
+		$(use_enable lto lto) \
+		$(use_enable mongodb backend-mongodb) \
+		$(use_enable prometheus backend-prometheus-remote-write) \
+		$(use_enable xen plugin-xenstat) \
+		$(use_enable cpu_flags_x86_sse2 x86-sse) \
+		$(use_with compression zlib)
+}
+
+src_compile() {
+	emake clean
+	default
+}
+
+src_install() {
+	default
+
+	rm -rf "${D}/var/cache" || die
+
+	keepdir /var/log/netdata
+	fowners -Rc netdata:netdata /var/log/netdata
+	keepdir /var/lib/netdata
+	keepdir /var/lib/netdata/registry
+	fowners -Rc netdata:netdata /var/lib/netdata
+
+	fowners -Rc root:netdata /usr/share/${PN}
+
+	newinitd system/netdata-openrc ${PN}
+	systemd_dounit system/netdata.service
+	insinto /etc/netdata
+	doins system/netdata.conf
+}
+
+pkg_postinst() {
+	fcaps_pkg_postinst
+
+	if use nfacct ; then
+		fcaps 'cap_net_admin' 'usr/libexec/netdata/plugins.d/nfacct.plugin'
+	fi
+
+	if use xen ; then
+		fcaps 'cap_dac_override' 'usr/libexec/netdata/plugins.d/xenstat.plugin'
+	fi
+
+	if use ipmi ; then
+	    fcaps 'cap_dac_override' 'usr/libexec/netdata/plugins.d/freeipmi.plugin'
+	fi
+}
diff --git a/net-analyzer/netdata/netdata-1.33.1.ebuild b/net-analyzer/netdata/netdata-1.33.1.ebuild
new file mode 100644
index 000000000000..5fe0d66e35d4
--- /dev/null
+++ b/net-analyzer/netdata/netdata-1.33.1.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{3_8,3_9,3_10} )
+
+inherit autotools fcaps flag-o-matic linux-info python-single-r1 systemd toolchain-funcs
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/netdata/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/netdata/${PN}/releases/download/v${PV}/${PN}-v${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-v${PV}"
+	KEYWORDS="~amd64 ~ppc64 ~x86"
+fi
+
+DESCRIPTION="Linux real time system monitoring, done right!"
+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 kinesis +lto mongodb mysql nfacct nodejs postgres prometheus +python tor xen"
+REQUIRED_USE="
+	mysql? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	tor? ( python )"
+
+# most unconditional dependencies are for plugins.d/charts.d.plugin:
+RDEPEND="
+	acct-group/netdata
+	acct-user/netdata
+	app-misc/jq
+	>=app-shells/bash-4:0
+	|| (
+		net-analyzer/openbsd-netcat
+		net-analyzer/netcat
+	)
+	net-libs/libwebsockets
+	net-misc/curl
+	net-misc/wget
+	sys-apps/util-linux
+	virtual/awk
+	caps? ( sys-libs/libcap )
+	cups? ( net-print/cups )
+	dbengine? (
+		app-arch/lz4
+		dev-libs/judy
+		dev-libs/openssl:=
+	)
+	dev-libs/libuv
+	compression? ( sys-libs/zlib )
+	ipmi? ( sys-libs/freeipmi )
+	jsonc? ( dev-libs/json-c:= )
+	kinesis? ( dev-libs/aws-sdk-cpp[kinesis] )
+	mongodb? ( dev-libs/mongo-c-driver )
+	nfacct? (
+		net-firewall/nfacct
+		net-libs/libmnl
+	)
+	nodejs? ( net-libs/nodejs )
+	prometheus? (
+		dev-libs/protobuf:=
+		app-arch/snappy
+	)
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
+		mysql? ( $(python_gen_cond_dep 'dev-python/mysqlclient[${PYTHON_USEDEP}]') )
+		postgres? ( $(python_gen_cond_dep 'dev-python/psycopg:2[${PYTHON_USEDEP}]') )
+		tor? ( $(python_gen_cond_dep 'net-libs/stem[${PYTHON_USEDEP}]') )
+	)
+	xen? (
+		app-emulation/xen-tools
+		dev-libs/yajl
+	)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+FILECAPS=(
+	'cap_dac_read_search,cap_sys_ptrace+ep' 'usr/libexec/netdata/plugins.d/apps.plugin'
+)
+
+pkg_setup() {
+	use python && python-single-r1_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 \
+		$(use_enable cloud) \
+		$(use_enable jsonc) \
+		$(use_enable cups plugin-cups) \
+		$(use_enable dbengine) \
+		$(use_enable nfacct plugin-nfacct) \
+		$(use_enable ipmi plugin-freeipmi) \
+		$(use_enable kinesis backend-kinesis) \
+		$(use_enable lto lto) \
+		$(use_enable mongodb backend-mongodb) \
+		$(use_enable prometheus backend-prometheus-remote-write) \
+		$(use_enable xen plugin-xenstat) \
+		$(use_enable cpu_flags_x86_sse2 x86-sse) \
+		$(use_with compression zlib)
+}
+
+src_compile() {
+	emake clean
+	default
+}
+
+src_install() {
+	default
+
+	rm -rf "${D}/var/cache" || die
+
+	keepdir /var/log/netdata
+	fowners -Rc netdata:netdata /var/log/netdata
+	keepdir /var/lib/netdata
+	keepdir /var/lib/netdata/registry
+	fowners -Rc netdata:netdata /var/lib/netdata
+
+	fowners -Rc root:netdata /usr/share/${PN}
+
+	newinitd system/netdata-openrc ${PN}
+	systemd_dounit system/netdata.service
+	insinto /etc/netdata
+	doins system/netdata.conf
+}
+
+pkg_postinst() {
+	fcaps_pkg_postinst
+
+	if use nfacct ; then
+		fcaps 'cap_net_admin' 'usr/libexec/netdata/plugins.d/nfacct.plugin'
+	fi
+
+	if use xen ; then
+		fcaps 'cap_dac_override' 'usr/libexec/netdata/plugins.d/xenstat.plugin'
+	fi
+
+	if use ipmi ; then
+	    fcaps 'cap_dac_override' 'usr/libexec/netdata/plugins.d/freeipmi.plugin'
+	fi
+}
diff --git a/net-analyzer/netdata/netdata-9999.ebuild b/net-analyzer/netdata/netdata-9999.ebuild
index 5759c79ca15e..427b0ff777e1 100644
--- a/net-analyzer/netdata/netdata-9999.ebuild
+++ b/net-analyzer/netdata/netdata-9999.ebuild
@@ -49,6 +49,7 @@ RDEPEND="
 		dev-libs/openssl:=
 	)
 	dev-libs/libuv
+	cloud? ( dev-libs/protobuf:= )
 	compression? ( sys-libs/zlib )
 	ipmi? ( sys-libs/freeipmi )
 	jsonc? ( dev-libs/json-c:= )
@@ -101,6 +102,7 @@ src_configure() {
 	econf \
 		--localstatedir="${EPREFIX}"/var \
 		--with-user=netdata \
+		--without-bundled-protobuf \
 		$(use_enable cloud) \
 		$(use_enable jsonc) \
 		$(use_enable cups plugin-cups) \