gentoo resync : 15.01.2020

6 files changed, 60 insertions, 136 deletions

diff --git a/net-analyzer/netdata/Manifest b/net-analyzer/netdata/Manifest
index 73e8a013dde7..4eaed2360faf 100644
--- a/net-analyzer/netdata/Manifest
+++ b/net-analyzer/netdata/Manifest
@@ -1,6 +1,5 @@
-DIST netdata-1.18.1.tar.gz 3413907 BLAKE2B 9047f23875f446b378c80962e7f8e5c9424fbc2a405c75b76e242b26ae48336cbb026d3fc5c0e4127b0e5d1f1d5a14652ae92661474cd11ecbd64614461ab118 SHA512 fb72f4729e05ab83fe9462e31b10fc40243472ea9f6cbb9421e2ca549810f2f80b28b05e886faa66e15c53b317ee559a3e0fb3d382c36a424dd39fec779918d9
+AUX netdata-1.19.0-prometheus-spelling.patch 1149 BLAKE2B 567e93c8099f7edc6afd3c40a6249162f44dca30f9cccf1702df453523203ee2e79fb4d03a53f5b1c4e5dd6dfaa52961b0717546aa21bc25bb3927a9280598ad SHA512 a498b04683138fd56e71bcf1191b4f3a655be03746f850d9f407bbe24c28f16dd564967401c856ce404f58c6a947b8277e2fa0868dbe7c0aa63ff05a8b465561
 DIST netdata-1.19.0.tar.gz 3443251 BLAKE2B 8e18a661367850e712a75c1c11b661a977bf77b48369e0e36763a74f96b3726c523093a82eb6f94257c02e754d900cb675d501fda824ceb94eef31dfa30e5712 SHA512 026ae159d8ed52a30e406c110c2732e54e50f070865ba3e430df73e4df40387105053e750ca6029cfbc7f40a2c05b7fb6ba4e3e4a7070822c7eec4c1a4712aea
-EBUILD netdata-1.18.1-r1.ebuild 2757 BLAKE2B 1393c8575061ae6d7ee93b7f376155c0dba91da48ff283176f192fc46e01aff1459234fdadc4c8ab711e77169fc5e6c393dc87234ff30d900a9514aa6396a5ab SHA512 93d03fb2caeb01fb51a7e51b6191e8f99c4a0865165918d6e921b24a22c402dd601d8511980c28f2766320d0651da45e1015571c6b251b5bf5e2928cfe2d77eb
-EBUILD netdata-1.19.0-r1.ebuild 2895 BLAKE2B b417866ba85e6fd75845053bce61aabef3647e65862b7e9746c5c52e59a4c3249a3ccee8fb50a5dcd7b9b36fbb390a471ba061fa669a44830ad07653573f4502 SHA512 9bf42bc88658a0af839f81fb13375f944911531959b02cd70bffb118f9fd1588adad9834c4009c0767dc206538d0beee9384215e3cc5c98909c6cc193a1b885f
-EBUILD netdata-9999.ebuild 2895 BLAKE2B b417866ba85e6fd75845053bce61aabef3647e65862b7e9746c5c52e59a4c3249a3ccee8fb50a5dcd7b9b36fbb390a471ba061fa669a44830ad07653573f4502 SHA512 9bf42bc88658a0af839f81fb13375f944911531959b02cd70bffb118f9fd1588adad9834c4009c0767dc206538d0beee9384215e3cc5c98909c6cc193a1b885f
-MISC metadata.xml 939 BLAKE2B fa9652dfc67eb1f088383a62d435349665f81dc9db3e1dd9c8412110f27297cc15681cbd2307c8a09cd490bd195e830311bf9a2612abfe14ecec18fb99a17eed SHA512 c9e7794f190c22d0b5a14d2431d7f15d7b048fcbcf8cf48499e6a71fb21f7fc0292bd944db6767e1f70413c484a338ffeccbf7a70c63d7c128e4bc72c7d24fe3
+EBUILD netdata-1.19.0-r2.ebuild 3301 BLAKE2B b112d96251fec1cb4492aeea5d236841b54011f70604ee425239bed81b7cc0c65c4eea9567c53535d8471a108b2390c5260cd7df300dc955b568e20263c80e3f SHA512 fc0241a4053a6804288ad791477887d165b5763ae7e2d6c7b0ed2cf30e97fc51ef511c28b7272c96a3ee30d6ce65702074e1c5d99bf38cb22b05e6c08ca12af6
+EBUILD netdata-9999.ebuild 3242 BLAKE2B 7fc66998ce13afdd645676053b71d6b857e8a6098a5b2bda72125b26b6fa55c42d58238f9306cd4930b0426de7d7a9794611098856cb452e4c64216c42c0246f SHA512 e9a16abf1c0c99fe134a60e8a088c95381c22d171652ce23b98478ccaf9d258950b842176ef72a7422609633e855aa9a501e9ec09dc61ab3e63fe895f469c936
+MISC metadata.xml 1270 BLAKE2B e2c5bac8fd169d84daf8a6e6cfea30761490cca3d7211a29e29f6cf298a9cd728ddc56075e5a85c8f5ed5467900a2f3fb1e09c40b764c2bb0e02bf1ff8e98108 SHA512 77e4d91d31d9d48b769b13f5c9778e09fc8d64941a145ea0bc1ce3e735eb64e5c89fa36a4314753e7c0871738a7b3e94f6a998a87b9c7b9d1d7aa6e8800cdbdf
diff --git a/net-analyzer/netdata/files/netdata-1.19.0-prometheus-spelling.patch b/net-analyzer/netdata/files/netdata-1.19.0-prometheus-spelling.patch
new file mode 100644
index 000000000000..25c8dd4051ff
--- /dev/null
+++ b/net-analyzer/netdata/files/netdata-1.19.0-prometheus-spelling.patch
@@ -0,0 +1,20 @@
+https://github.com/netdata/netdata/pull/7674
+
+From d19b834d0011485759604ecfa095a898b597d8e0 Mon Sep 17 00:00:00 2001
+From: Craig Andrews <candrews@integralblue.com>
+Date: Sun, 5 Jan 2020 16:13:18 -0500
+Subject: [PATCH] Fix spelling of Prometheus (#7673)
+
+diff --git a/configure.ac b/configure.ac
+index 00927ba8b1..8b2facb966 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -999,7 +999,7 @@ test "${enable_backend_prometheus_remote_write}" = "yes" -a "${have_CXX_compiler
+     AC_MSG_ERROR([C++ compiler required but not found. try installing g++])
+ 
+ AC_MSG_CHECKING([if prometheus remote write backend should be enabled])
+-if test "${enable_backend_prometeus_remote_write}" != "no" -a "${have_libprotobuf}" = "yes" -a "${have_libsnappy}" = "yes" \
++if test "${enable_backend_prometheus_remote_write}" != "no" -a "${have_libprotobuf}" = "yes" -a "${have_libsnappy}" = "yes" \
+                                                            -a "${have_protoc}" = "yes" -a "${have_CXX_compiler}" = "yes"; then
+     enable_backend_prometheus_remote_write="yes"
+     AC_DEFINE([ENABLE_PROMETHEUS_REMOTE_WRITE], [1], [Prometheus remote write API usability])
diff --git a/net-analyzer/netdata/metadata.xml b/net-analyzer/netdata/metadata.xml
index a160e06f3657..70b99cd52f39 100644
--- a/net-analyzer/netdata/metadata.xml
+++ b/net-analyzer/netdata/metadata.xml
@@ -9,8 +9,12 @@
     <flag name="compression">Enable compression via zlib</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="kinesis">Enable support for Amazon Kenesis as a backend</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>
+    <flag name="prometheus">Enable support for the Prometheus remote write backend</flag>
     <flag name="tor">Enable monitoring of tor</flag>
     <flag name="xen">Enable monitoring of xen</flag>
   </use>
diff --git a/net-analyzer/netdata/netdata-1.18.1-r1.ebuild b/net-analyzer/netdata/netdata-1.18.1-r1.ebuild
deleted file mode 100644
index 3a8c0f7f98d0..000000000000
--- a/net-analyzer/netdata/netdata-1.18.1-r1.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
-
-inherit autotools fcaps linux-info python-r1 systemd
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/netdata/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/netdata/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~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 +compression cpu_flags_x86_sse2 cups +dbengine ipmi mysql nfacct nodejs postgres +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-misc/curl
-	net-misc/wget
-	sys-apps/util-linux
-	virtual/awk
-	caps? ( sys-libs/libcap )
-	cups? ( net-print/cups )
-	dbengine? (
-		dev-libs/libuv
-		app-arch/lz4
-		dev-libs/judy
-		dev-libs/openssl:=
-	)
-	compression? ( sys-libs/zlib )
-	ipmi? ( sys-libs/freeipmi )
-	nfacct? (
-		net-firewall/nfacct
-		net-libs/libmnl
-	)
-	nodejs? ( net-libs/nodejs )
-	python? (
-		${PYTHON_DEPS}
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		mysql? (
-			|| (
-				dev-python/mysqlclient[${PYTHON_USEDEP}]
-				dev-python/mysql-python[${PYTHON_USEDEP}]
-			)
-		)
-		postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
-		tor? ( 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() {
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--localstatedir="${EPREFIX}"/var \
-		--with-user=netdata \
-		--disable-jsonc \
-		$(use_enable cups plugin-cups) \
-		$(use_enable dbengine) \
-		$(use_enable nfacct plugin-nfacct) \
-		$(use_enable ipmi plugin-freeipmi) \
-		$(use_enable xen plugin-xenstat) \
-		$(use_enable cpu_flags_x86_sse2 x86-sse) \
-		$(use_with compression zlib)
-}
-
-src_install() {
-	default
-
-	rm -rf "${D}/var/cache" || die
-
-	# Remove unneeded .keep files
-	find "${ED}" -name ".keep" -delete || die
-
-	fowners -Rc netdata:netdata /var/log/netdata
-	keepdir /var/log/netdata
-	fowners -Rc netdata:netdata /var/lib/netdata
-	keepdir /var/lib/netdata
-	keepdir /var/lib/netdata/registry
-
-	fowners -Rc root:netdata /usr/share/${PN}
-
-	newinitd system/netdata-openrc ${PN}
-	systemd_dounit system/netdata.service
-	insinto /etc/netdata
-	doins system/netdata.conf
-}
diff --git a/net-analyzer/netdata/netdata-1.19.0-r1.ebuild b/net-analyzer/netdata/netdata-1.19.0-r2.ebuild
index 7133c9ae7f67..2c99a7a4fe82 100644
--- a/net-analyzer/netdata/netdata-1.19.0-r1.ebuild
+++ b/net-analyzer/netdata/netdata-1.19.0-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 inherit autotools fcaps linux-info python-r1 systemd
 
@@ -19,7 +19,7 @@ HOMEPAGE="https://github.com/netdata/netdata https://my-netdata.io/"
 
 LICENSE="GPL-3+ MIT BSD"
 SLOT="0"
-IUSE="caps +compression cpu_flags_x86_sse2 cups +dbengine ipmi mysql nfacct nodejs postgres +python tor xen"
+IUSE="caps +compression cpu_flags_x86_sse2 cups +dbengine ipmi +jsonc kinesis mongodb mysql nfacct nodejs postgres prometheus +python tor xen"
 REQUIRED_USE="
 	mysql? ( python )
 	python? ( ${PYTHON_REQUIRED_USE} )
@@ -49,11 +49,18 @@ RDEPEND="
 	)
 	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}
 		dev-python/pyyaml[${PYTHON_USEDEP}]
@@ -77,6 +84,10 @@ FILECAPS=(
 	'cap_dac_read_search,cap_sys_ptrace+ep' 'usr/libexec/netdata/plugins.d/apps.plugin'
 )
 
+PATCHES=(
+	"${FILESDIR}/${P}-prometheus-spelling.patch"
+)
+
 pkg_setup() {
 	linux-info_pkg_setup
 }
@@ -90,11 +101,14 @@ src_configure() {
 	econf \
 		--localstatedir="${EPREFIX}"/var \
 		--with-user=netdata \
-		--disable-jsonc \
+		$(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 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)
diff --git a/net-analyzer/netdata/netdata-9999.ebuild b/net-analyzer/netdata/netdata-9999.ebuild
index 7133c9ae7f67..6e2a420b82c9 100644
--- a/net-analyzer/netdata/netdata-9999.ebuild
+++ b/net-analyzer/netdata/netdata-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 inherit autotools fcaps linux-info python-r1 systemd
 
@@ -19,7 +19,7 @@ HOMEPAGE="https://github.com/netdata/netdata https://my-netdata.io/"
 
 LICENSE="GPL-3+ MIT BSD"
 SLOT="0"
-IUSE="caps +compression cpu_flags_x86_sse2 cups +dbengine ipmi mysql nfacct nodejs postgres +python tor xen"
+IUSE="caps +compression cpu_flags_x86_sse2 cups +dbengine ipmi +jsonc kinesis mongodb mysql nfacct nodejs postgres prometheus +python tor xen"
 REQUIRED_USE="
 	mysql? ( python )
 	python? ( ${PYTHON_REQUIRED_USE} )
@@ -49,11 +49,18 @@ RDEPEND="
 	)
 	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}
 		dev-python/pyyaml[${PYTHON_USEDEP}]
@@ -90,11 +97,14 @@ src_configure() {
 	econf \
 		--localstatedir="${EPREFIX}"/var \
 		--with-user=netdata \
-		--disable-jsonc \
+		$(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 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)