diff --git a/net-analyzer/netdata/metadata.xml b/net-analyzer/netdata/metadata.xml
index 666206a17892c..e43c896071788 100644
--- a/net-analyzer/netdata/metadata.xml
+++ b/net-analyzer/netdata/metadata.xml
@@ -11,7 +11,6 @@
     <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="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>
diff --git a/net-analyzer/netdata/netdata-1.35.1.ebuild b/net-analyzer/netdata/netdata-1.35.1.ebuild
index d4f2ab18da89b..e18bd1cca21c4 100644
--- a/net-analyzer/netdata/netdata-1.35.1.ebuild
+++ b/net-analyzer/netdata/netdata-1.35.1.ebuild
@@ -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 kinesis +lto mongodb mysql nfacct nodejs postgres prometheus +python tor xen"
+IUSE="caps cloud +compression cpu_flags_x86_sse2 cups +dbengine ipmi +jsonc +lto mongodb mysql nfacct nodejs postgres prometheus +python tor xen"
 REQUIRED_USE="
 	mysql? ( python )
 	python? ( ${PYTHON_REQUIRED_USE} )
@@ -53,7 +53,6 @@ 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
@@ -109,7 +108,7 @@ src_configure() {
 		$(use_enable dbengine) \
 		$(use_enable nfacct plugin-nfacct) \
 		$(use_enable ipmi plugin-freeipmi) \
-		$(use_enable kinesis exporting-kinesis) \
+		--disable-exporting-kinesis \
 		$(use_enable lto lto) \
 		$(use_enable mongodb exporting-mongodb) \
 		$(use_enable prometheus exporting-prometheus-remote-write) \
diff --git a/net-analyzer/netdata/netdata-1.36.0.ebuild b/net-analyzer/netdata/netdata-1.36.0.ebuild
index d4f2ab18da89b..e18bd1cca21c4 100644
--- a/net-analyzer/netdata/netdata-1.36.0.ebuild
+++ b/net-analyzer/netdata/netdata-1.36.0.ebuild
@@ -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 kinesis +lto mongodb mysql nfacct nodejs postgres prometheus +python tor xen"
+IUSE="caps cloud +compression cpu_flags_x86_sse2 cups +dbengine ipmi +jsonc +lto mongodb mysql nfacct nodejs postgres prometheus +python tor xen"
 REQUIRED_USE="
 	mysql? ( python )
 	python? ( ${PYTHON_REQUIRED_USE} )
@@ -53,7 +53,6 @@ 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
@@ -109,7 +108,7 @@ src_configure() {
 		$(use_enable dbengine) \
 		$(use_enable nfacct plugin-nfacct) \
 		$(use_enable ipmi plugin-freeipmi) \
-		$(use_enable kinesis exporting-kinesis) \
+		--disable-exporting-kinesis \
 		$(use_enable lto lto) \
 		$(use_enable mongodb exporting-mongodb) \
 		$(use_enable prometheus exporting-prometheus-remote-write) \
diff --git a/net-analyzer/netdata/netdata-1.36.1-r1.ebuild b/net-analyzer/netdata/netdata-1.36.1-r1.ebuild
index e4af7059cb02d..0f5d872e78b00 100644
--- a/net-analyzer/netdata/netdata-1.36.1-r1.ebuild
+++ b/net-analyzer/netdata/netdata-1.36.1-r1.ebuild
@@ -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 kinesis +lto mongodb mysql nfacct nodejs postgres prometheus +python tor xen"
+IUSE="caps cloud +compression cpu_flags_x86_sse2 cups +dbengine ipmi +jsonc +lto mongodb mysql nfacct nodejs postgres prometheus +python tor xen"
 REQUIRED_USE="
 	mysql? ( python )
 	python? ( ${PYTHON_REQUIRED_USE} )
@@ -53,7 +53,6 @@ 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
@@ -109,7 +108,7 @@ src_configure() {
 		$(use_enable dbengine) \
 		$(use_enable nfacct plugin-nfacct) \
 		$(use_enable ipmi plugin-freeipmi) \
-		$(use_enable kinesis exporting-kinesis) \
+		--disable-exporting-kinesis \
 		$(use_enable lto lto) \
 		$(use_enable mongodb exporting-mongodb) \
 		$(use_enable prometheus exporting-prometheus-remote-write) \
diff --git a/net-analyzer/netdata/netdata-1.37.0.ebuild b/net-analyzer/netdata/netdata-1.37.0.ebuild
index e4af7059cb02d..0f5d872e78b00 100644
--- a/net-analyzer/netdata/netdata-1.37.0.ebuild
+++ b/net-analyzer/netdata/netdata-1.37.0.ebuild
@@ -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 kinesis +lto mongodb mysql nfacct nodejs postgres prometheus +python tor xen"
+IUSE="caps cloud +compression cpu_flags_x86_sse2 cups +dbengine ipmi +jsonc +lto mongodb mysql nfacct nodejs postgres prometheus +python tor xen"
 REQUIRED_USE="
 	mysql? ( python )
 	python? ( ${PYTHON_REQUIRED_USE} )
@@ -53,7 +53,6 @@ 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
@@ -109,7 +108,7 @@ src_configure() {
 		$(use_enable dbengine) \
 		$(use_enable nfacct plugin-nfacct) \
 		$(use_enable ipmi plugin-freeipmi) \
-		$(use_enable kinesis exporting-kinesis) \
+		--disable-exporting-kinesis \
 		$(use_enable lto lto) \
 		$(use_enable mongodb exporting-mongodb) \
 		$(use_enable prometheus exporting-prometheus-remote-write) \
diff --git a/net-analyzer/netdata/netdata-1.37.1.ebuild b/net-analyzer/netdata/netdata-1.37.1.ebuild
index e4af7059cb02d..0f5d872e78b00 100644
--- a/net-analyzer/netdata/netdata-1.37.1.ebuild
+++ b/net-analyzer/netdata/netdata-1.37.1.ebuild
@@ -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 kinesis +lto mongodb mysql nfacct nodejs postgres prometheus +python tor xen"
+IUSE="caps cloud +compression cpu_flags_x86_sse2 cups +dbengine ipmi +jsonc +lto mongodb mysql nfacct nodejs postgres prometheus +python tor xen"
 REQUIRED_USE="
 	mysql? ( python )
 	python? ( ${PYTHON_REQUIRED_USE} )
@@ -53,7 +53,6 @@ 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
@@ -109,7 +108,7 @@ src_configure() {
 		$(use_enable dbengine) \
 		$(use_enable nfacct plugin-nfacct) \
 		$(use_enable ipmi plugin-freeipmi) \
-		$(use_enable kinesis exporting-kinesis) \
+		--disable-exporting-kinesis \
 		$(use_enable lto lto) \
 		$(use_enable mongodb exporting-mongodb) \
 		$(use_enable prometheus exporting-prometheus-remote-write) \
diff --git a/net-analyzer/netdata/netdata-9999.ebuild b/net-analyzer/netdata/netdata-9999.ebuild
index 1c367c2b30c44..e674facfb7470 100644
--- a/net-analyzer/netdata/netdata-9999.ebuild
+++ b/net-analyzer/netdata/netdata-9999.ebuild
@@ -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 kinesis +lto mongodb mysql nfacct nodejs postgres prometheus +python tor xen"
+IUSE="caps cloud +compression cpu_flags_x86_sse2 cups +dbengine ipmi +jsonc +lto mongodb mysql nfacct nodejs postgres prometheus +python tor xen"
 REQUIRED_USE="
 	mysql? ( python )
 	python? ( ${PYTHON_REQUIRED_USE} )
@@ -53,7 +53,6 @@ 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
@@ -109,7 +108,7 @@ src_configure() {
 		$(use_enable dbengine) \
 		$(use_enable nfacct plugin-nfacct) \
 		$(use_enable ipmi plugin-freeipmi) \
-		$(use_enable kinesis exporting-kinesis) \
+		--disable-exporting-kinesis \
 		$(use_enable lto lto) \
 		$(use_enable mongodb exporting-mongodb) \
 		$(use_enable prometheus exporting-prometheus-remote-write) \