gentoo resync : 13.06.2020

5 files changed, 4 insertions, 152 deletions

diff --git a/net-analyzer/netdata/Manifest b/net-analyzer/netdata/Manifest
index 1d98a9df113e..eabcb56727c2 100644
--- a/net-analyzer/netdata/Manifest
+++ b/net-analyzer/netdata/Manifest
@@ -1,10 +1,8 @@
-AUX netdata-1.19.0-fno-common.patch 3807 BLAKE2B 42908f83322a9dab98b52fba245d31ad56b86ea8fd37ed614b3399ee07fff30fc1afbc26fda2834177869c9e8cedb4a97480a18c9c7649b9f52021a6850e391d SHA512 1e032488fb8035a87024b9085cc12a87ba87ff99cb2084db56bcdeb280ba4cfca8042647b6df1a9a06cbb9627b6c25a350782408efeb3a7d780bd1ca3a6d86a8
-AUX netdata-1.19.0-prometheus-spelling.patch 1149 BLAKE2B 567e93c8099f7edc6afd3c40a6249162f44dca30f9cccf1702df453523203ee2e79fb4d03a53f5b1c4e5dd6dfaa52961b0717546aa21bc25bb3927a9280598ad SHA512 a498b04683138fd56e71bcf1191b4f3a655be03746f850d9f407bbe24c28f16dd564967401c856ce404f58c6a947b8277e2fa0868dbe7c0aa63ff05a8b465561
 DIST netdata-1.21.1.tar.gz 3748090 BLAKE2B 5cc8dd47b768838eecc7c8af35a82548dc5bb16acb0a88c17ee1254f86ca9b63a5108bce9205c000283b817478749d963b69c65e3bdc8e2fadecc9a1826a7f2e SHA512 66d2e0cb977275250fd7b51e5156957a4506ddba586de5fe796459ea241cbbed7013fd4cf9d7acf6666407352fb34e3b962a2d01565a9cb982c89c76b7cd79b9
 DIST netdata-1.22.0.tar.gz 3786121 BLAKE2B ad34bcdb94cf44f8de154bf53b2e4ecbecee43c6cef2e5337c0fa6bd08b0feb41c25ee96e51fc6c54d72909559e5ac822b44153daa71255487bb0713ce6eca1d SHA512 3bf239c3e950195ef7b8b43f1c17f2cc94f9257a4f21665629f7b518cc6fcef3b0837743254efd03323408b39e2afa9533487147fa30c8f015705c391aa543f3
 DIST netdata-1.22.1.tar.gz 3787203 BLAKE2B cb09ade9540d81fac9b30738650206bce263b74445ce76bf3e9c57a7935bd5fed04806b3b3ba6631ad7ed119b93b1f36eb10261a239127e238e4cf09ca2f4e7a SHA512 47a0b6c4c1b3d8ab18cf25725223c72683ed74084f0efd09cddbe293950839315f8fcadb16c2e5fa9a179745f20b08ce8652d4b972465eacc6a1792b4cfc296e
 EBUILD netdata-1.21.1-r1.ebuild 3370 BLAKE2B 4fd3103e4841a6146365d93a6e5c77b633b7786864c47ca9eba4067197b7c093536b91d8f1ee323ff84ed41a8af6ec952008d5938f0835a5b785081ae9590d3c SHA512 e80fc41089efdaa6cd11cd1131d961ccda8a67a8260a8363312d0fd6fdbc18fa67d6ce7c23d6c89682a9ac2a207f9c5464d5d055ebb4780dfd80eb33706da1c8
 EBUILD netdata-1.22.0-r1.ebuild 3457 BLAKE2B a4ee70e56b2298eea11449b09783f3778c09920ede42149949910c28a5a4ab6a01dc8137bacc4ff72490172db3f5995923b1483dc0f39478ca97f880ec778f02 SHA512 34bc66ca8bc201a24a07b2f2b0258132aecf1109cfe6c2928904e9de5effb978aed53716fec6af79c9c5b6a16879c33cc4be194c181db8de38f6be1ccb719c1b
-EBUILD netdata-1.22.1-r1.ebuild 3457 BLAKE2B a4ee70e56b2298eea11449b09783f3778c09920ede42149949910c28a5a4ab6a01dc8137bacc4ff72490172db3f5995923b1483dc0f39478ca97f880ec778f02 SHA512 34bc66ca8bc201a24a07b2f2b0258132aecf1109cfe6c2928904e9de5effb978aed53716fec6af79c9c5b6a16879c33cc4be194c181db8de38f6be1ccb719c1b
-EBUILD netdata-9999.ebuild 3457 BLAKE2B a4ee70e56b2298eea11449b09783f3778c09920ede42149949910c28a5a4ab6a01dc8137bacc4ff72490172db3f5995923b1483dc0f39478ca97f880ec778f02 SHA512 34bc66ca8bc201a24a07b2f2b0258132aecf1109cfe6c2928904e9de5effb978aed53716fec6af79c9c5b6a16879c33cc4be194c181db8de38f6be1ccb719c1b
+EBUILD netdata-1.22.1-r1.ebuild 3459 BLAKE2B 51e39961afa8e068776f3316df2f6becf524e0506f4097c8e77d4fbd939f58ea29aa41b47e70b163ad97c660681c47b1322adcb95a5e888cd48afdfcebdc1876 SHA512 091da4e745725d9f4c626bb62e163ae999c822e148d84551225836ee83f50acd7619e5e96dbfcb1ddc765bd4bcf6c0e657c791a0da1f32c4431cd08a6a0a89c1
+EBUILD netdata-9999.ebuild 3459 BLAKE2B 51e39961afa8e068776f3316df2f6becf524e0506f4097c8e77d4fbd939f58ea29aa41b47e70b163ad97c660681c47b1322adcb95a5e888cd48afdfcebdc1876 SHA512 091da4e745725d9f4c626bb62e163ae999c822e148d84551225836ee83f50acd7619e5e96dbfcb1ddc765bd4bcf6c0e657c791a0da1f32c4431cd08a6a0a89c1
 MISC metadata.xml 1270 BLAKE2B e2c5bac8fd169d84daf8a6e6cfea30761490cca3d7211a29e29f6cf298a9cd728ddc56075e5a85c8f5ed5467900a2f3fb1e09c40b764c2bb0e02bf1ff8e98108 SHA512 77e4d91d31d9d48b769b13f5c9778e09fc8d64941a145ea0bc1ce3e735eb64e5c89fa36a4314753e7c0871738a7b3e94f6a998a87b9c7b9d1d7aa6e8800cdbdf
diff --git a/net-analyzer/netdata/files/netdata-1.19.0-fno-common.patch b/net-analyzer/netdata/files/netdata-1.19.0-fno-common.patch
deleted file mode 100644
index 1b6d5b75020d..000000000000
--- a/net-analyzer/netdata/files/netdata-1.19.0-fno-common.patch
+++ /dev/null
@@ -1,126 +0,0 @@
-https://github.com/netdata/netdata/pull/7877
-
-From c65f57af0714558294c1ad1b9568077720fb282b Mon Sep 17 00:00:00 2001
-From: Thiago Marques <thiagoftsm@gmail.com>
-Date: Tue, 28 Jan 2020 13:59:20 +0000
-Subject: [PATCH 1/2] missing_extern: Fix missing
-
-Fix few externs that were missing in global variables
----
- daemon/common.h            | 2 +-
- health/health.h            | 2 +-
- libnetdata/health/health.h | 2 +-
- web/api/web_api_v1.h       | 2 +-
- 4 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/daemon/common.h b/daemon/common.h
-index 6ac3cb3c87..59dbc41a8d 100644
---- a/daemon/common.h
-+++ b/daemon/common.h
-@@ -84,6 +84,6 @@ extern char *netdata_configured_timezone;
- extern int netdata_zero_metrics_enabled;
- extern int netdata_anonymous_statistics_enabled;
- 
--int netdata_ready;
-+extern int netdata_ready;
- 
- #endif /* NETDATA_COMMON_H */
-diff --git a/health/health.h b/health/health.h
-index 9da90d70c9..d77318fd78 100644
---- a/health/health.h
-+++ b/health/health.h
-@@ -52,7 +52,7 @@ extern unsigned int default_health_enabled;
- 
- #define HEALTH_SILENCERS_MAX_FILE_LEN 10000
- 
--char *silencers_filename;
-+extern char *silencers_filename;
- 
- extern void health_init(void);
- extern void *health_main(void *ptr);
-diff --git a/libnetdata/health/health.h b/libnetdata/health/health.h
-index a3dc0775fc..f7580edab2 100644
---- a/libnetdata/health/health.h
-+++ b/libnetdata/health/health.h
-@@ -44,7 +44,7 @@ typedef struct silencers {
-     SILENCER *silencers;
- } SILENCERS;
- 
--SILENCERS *silencers;
-+extern SILENCERS *silencers;
- 
- extern SILENCER *create_silencer(void);
- extern int health_silencers_json_read_callback(JSON_ENTRY *e);
-diff --git a/web/api/web_api_v1.h b/web/api/web_api_v1.h
-index 4fe3c8f6be..edeea98bed 100644
---- a/web/api/web_api_v1.h
-+++ b/web/api/web_api_v1.h
-@@ -29,6 +29,6 @@ extern void host_labels2json(RRDHOST *host, BUFFER *wb, size_t indentation);
- extern void web_client_api_v1_init(void);
- extern void web_client_api_v1_management_init(void);
- 
--char *api_secret;
-+extern char *api_secret;
- 
- #endif //NETDATA_WEB_API_V1_H
-
-From c0275ddaad62459a6da1eee0a0c76282a1391590 Mon Sep 17 00:00:00 2001
-From: Thiago Marques <thiagoftsm@gmail.com>
-Date: Tue, 28 Jan 2020 14:06:56 +0000
-Subject: [PATCH 2/2] missing_extern: Variables
-
-This commit declares the variables inside .c files
----
- daemon/common.c            | 2 +-
- health/health.c            | 1 +
- libnetdata/health/health.c | 2 ++
- web/api/web_api_v1.c       | 2 ++
- 4 files changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/daemon/common.c b/daemon/common.c
-index e28f6cf000..67497a4e93 100644
---- a/daemon/common.c
-+++ b/daemon/common.c
-@@ -13,4 +13,4 @@ char *netdata_configured_varlib_dir          = VARLIB_DIR;
- char *netdata_configured_home_dir            = CACHE_DIR;
- char *netdata_configured_host_prefix         = NULL;
- char *netdata_configured_timezone            = NULL;
--
-+int netdata_ready;
-diff --git a/health/health.c b/health/health.c
-index 1124cf9107..4a84ef7fca 100644
---- a/health/health.c
-+++ b/health/health.c
-@@ -9,6 +9,7 @@ struct health_cmdapi_thread_status {
- };
- 
- unsigned int default_health_enabled = 1;
-+char *silencers_filename;
- 
- // ----------------------------------------------------------------------------
- // health initialization
-diff --git a/libnetdata/health/health.c b/libnetdata/health/health.c
-index e03538db3f..98d26d295f 100644
---- a/libnetdata/health/health.c
-+++ b/libnetdata/health/health.c
-@@ -1,5 +1,7 @@
- #include "health.h"
- 
-+SILENCERS *silencers;
-+
- /**
-  * Create Silencer
-  *
-diff --git a/web/api/web_api_v1.c b/web/api/web_api_v1.c
-index aafcbc70be..4ac50524ad 100644
---- a/web/api/web_api_v1.c
-+++ b/web/api/web_api_v1.c
-@@ -2,6 +2,8 @@
- 
- #include "web_api_v1.h"
- 
-+char *api_secret;
-+
- static struct {
-     const char *name;
-     uint32_t hash;
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
deleted file mode 100644
index 25c8dd4051ff..000000000000
--- a/net-analyzer/netdata/files/netdata-1.19.0-prometheus-spelling.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-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/netdata-1.22.1-r1.ebuild b/net-analyzer/netdata/netdata-1.22.1-r1.ebuild
index 16f4f1078275..3b6458e2fb4e 100644
--- a/net-analyzer/netdata/netdata-1.22.1-r1.ebuild
+++ b/net-analyzer/netdata/netdata-1.22.1-r1.ebuild
@@ -49,7 +49,7 @@ RDEPEND="
 	dev-libs/libuv
 	compression? ( sys-libs/zlib )
 	ipmi? ( sys-libs/freeipmi )
-	jsonc? ( dev-libs/json-c )
+	jsonc? ( dev-libs/json-c:= )
 	kinesis? ( dev-libs/aws-sdk-cpp[kinesis] )
 	mongodb? ( dev-libs/mongo-c-driver )
 	nfacct? (
diff --git a/net-analyzer/netdata/netdata-9999.ebuild b/net-analyzer/netdata/netdata-9999.ebuild
index 16f4f1078275..3b6458e2fb4e 100644
--- a/net-analyzer/netdata/netdata-9999.ebuild
+++ b/net-analyzer/netdata/netdata-9999.ebuild
@@ -49,7 +49,7 @@ RDEPEND="
 	dev-libs/libuv
 	compression? ( sys-libs/zlib )
 	ipmi? ( sys-libs/freeipmi )
-	jsonc? ( dev-libs/json-c )
+	jsonc? ( dev-libs/json-c:= )
 	kinesis? ( dev-libs/aws-sdk-cpp[kinesis] )
 	mongodb? ( dev-libs/mongo-c-driver )
 	nfacct? (