gentoo resync : 20.12.2017

9 files changed, 7 insertions, 619 deletions

diff --git a/net-analyzer/netdata/Manifest b/net-analyzer/netdata/Manifest
index bea89032159a..17fc54f0bc63 100644
--- a/net-analyzer/netdata/Manifest
+++ b/net-analyzer/netdata/Manifest
@@ -1,19 +1,7 @@
-AUX netdata-1.4.0-glibc-sysmacros.patch 560 BLAKE2B fc1f525b861dbabccc2329cd79e9c6676d2ee9cace69cdcbc6721a252c062429e8eacb44fdf4e7254ebb1be32a391c92b57c63e4da6da306915c8ced5bdd55ad SHA512 58af1778c9fce5333e984a1a0d8612da4455596f72e6343a656d4aaaa8d6a0809cb2b02647cbdfaef61776a657282583e298a3d5bd555ea9d7d9ee09b819e787
 AUX netdata-1.8.0-openrc-fixes.patch 3618 BLAKE2B 1de1767c3d2c3cf7d13ced971d3185d454415bdd518f10ac0a30ab18a830d597536f029d6a8cd8c24a344df91a33833b56318860a99d845fe5e7f887469fac34 SHA512 9ba1da7f5a75b99249abe997a54fbd0ec69ef8ad2291d656c739f580c9758c7133224f09462ce001719cc06a7017a1745722977bef91c4e45bdb455377e39069
-DIST netdata-1.2.0.tar.xz 1254000 BLAKE2B 1da38cfe5316c3d0036a7bea0f0abd1d8305d1a77204701ed7c57091259c958fb40b16e61ccde4091c6c7ddc63ca0c16c3fda39bdd87b09958a8411fe7b0fb3d SHA512 0c43e89c7cb52a5dde2aec13b06496ffb70fcb1952cf74156bd4400f3520b4136a94b5390077a4e5e3278a8e175dcc14505a456efafec5fdf0759af4846e03f4
-DIST netdata-1.3.0.tar.xz 1647708 BLAKE2B 637f1259ac5dad11f7987c085828cea46a907c1a78735ec5b00a449e6d17423f8b35b02b072ece2adf7cdb8d2c25d3fd48e1c8cd416c1418e5b9761f55abe2fc SHA512 0e96f12cbeb7aeecb07b885a0f10940022741633e5cfd76d9f79c9efe3bce2583d96ae18995831fc48d6724f65357929dc5a4220521230ecfb8517f15e779217
-DIST netdata-1.4.0.tar.xz 1801440 BLAKE2B 2d0b3feb4d1e66ca160f4bdb5b3e28edd99727148d7e0d9c2b3ced323a6c6514cd0f80767b49016dff7cdf912de0807dea3fd5bd11cbc7f8287cf85e780dfe20 SHA512 b5f60931372f0c6a437d1340bd9bb07557d8a9ffb478381715495c09c9b9bcf71f287c2e47be40945149a268e0f666289c75cc4eb1d1ab6fc73988f6b71daaf3
-DIST netdata-1.5.0.tar.gz 2257299 BLAKE2B bbfcd418329db1268173c9ff3f89632ebebb59f61200ef63fbc3055459c744417baaf0a747eb49de35f65742e006ad1165b1c3e691cb82e7f60aa00ab78c79f9 SHA512 54477c0f9fe2c920580e2e6c3f6c12828f3be2c3dfc1fee47ad98cab51ae3652cb3f223413e9de9399487a35ce844d502ce12fbf615102c0e1962b7dc96a9d95
-DIST netdata-1.6.0.tar.gz 2526589 BLAKE2B 209913f3ffc3afee30c24bf95eba8d1ff3f12154e9b5b8af3f311de2386d8aa1cde08ecf40464cdc5b0321511f0ec61fe9192b54aa15bb4291e8c99bea5b634b SHA512 9514fd320fc944897961f9581c123f37fb956dc3ae324a879744fabb0d853e8c6a1d62faf7a486f89a0507b2179f746e8dd0943443eb4744311e905a8c06aed6
-DIST netdata-1.7.0.tar.gz 2646936 BLAKE2B fbd0dd17e26e79f993e5daad5dfe55c84ba58e0f4a2f67015ab53729234b2a814bcd8132210819a7c39864d80f34ef505c6c5e5f2b21013d4ed580bbe414e08e SHA512 f7204d77963c06c010b91fb9df47b79cc03070a730f0c09d599a0ec606510f449bab3c8429db2df1494e4cee330c2229300de010c3ec705fe91376d92adf48fd
 DIST netdata-1.8.0.tar.gz 2779648 BLAKE2B 537d39c3f24ec53fbc7156663cf842143c560b8f8b40647d68e3ad0772bea441a70c7550da213bb0c5d75e0a0d685f32388f95f36e1e1101a0d619f44523c9f4 SHA512 8bb21f49ce1fcf3d199eabd18f65d5005ef784b227f08cd8efe91e5cab2ae980cf0aea4bcaa3aca1dc666c10845684deca48257510ad574bd948ecd019afcdaf
-EBUILD netdata-1.2.0-r1.ebuild 1671 BLAKE2B c47120c9628b8a8bf99061dfd4245e98d68abacf0bde7e71374610338cec730e82188a29942806350934889faa15e8169f706f1925edc57b3182574b9edd23b3 SHA512 201ea834dcc7abfad427c190c745365980cd934ed9506ac9effe78fd1eca9c4f2f623e5735345b260d85e7822f552dbcc98b258cfadd2e36d7df79348c1eb1b5
-EBUILD netdata-1.3.0.ebuild 2081 BLAKE2B 640a72dbd420917b5c24f42bed69bb76dedefd8f10ebdfa3ccebc33bf483e3b9c3d55e38973bbb136bf41ffed2aa5eb7ef88edb12f7a55206ebd9d5030272edc SHA512 e6d2277dd199a3f652728bbeffcacbea1f8c184bbde640a344bf617ea0a098a661f9107f9371962c018b988c69d4099f932d5b50a43e85c5a87f612e37941955
-EBUILD netdata-1.4.0-r1.ebuild 2309 BLAKE2B cdf52f02ca14cc1dc9c48d1e8c89a35ebc84c54f09d4ad778623be018ab96908a99de6231c84fd0843ebd3320e7e2681b311e559af5208c62bc8c0654298750b SHA512 32133c833878e9f4ca9c5a69aa8740a3f90b92d0001365aa94e505464599f33eae121c9eb1b290f221ad7d9e69f74c833fb66c3ff25a13bec391c5c7c37e30b3
-EBUILD netdata-1.5.0.ebuild 2317 BLAKE2B 3f62036449e8c8363a44da1c21de2387f04da0ab2597366e848be4e7b60d6027d5d0c9f9ede4c1ee99eb5e6c9545a280731c69b2556e114d0809acb6830aeb1c SHA512 817050b6455d5be59577acee787add2b129b5e07bcf7704d7b08163fbbdf59edcce547f451204af35dcd85e0875e53004a4843ddca465b44909dee524522d7d6
-EBUILD netdata-1.6.0.ebuild 2411 BLAKE2B e92f1876f8074eed300d74a30f4270e5676b2fce6950011dbeb368ae99dfced99f6f42f08e03ccfa9952e85773cdfa54802744aa84f6205e9069b8bd3a52f065 SHA512 a707699734fa39b033247300aca59a21a38bcd68a178a49c4d5f5a7c5780e13d7081d9014d8e07b357343ba1bdf91dd8073b5dd89178761f9cc8f96d55f09ad3
-EBUILD netdata-1.7.0.ebuild 2411 BLAKE2B e92f1876f8074eed300d74a30f4270e5676b2fce6950011dbeb368ae99dfced99f6f42f08e03ccfa9952e85773cdfa54802744aa84f6205e9069b8bd3a52f065 SHA512 a707699734fa39b033247300aca59a21a38bcd68a178a49c4d5f5a7c5780e13d7081d9014d8e07b357343ba1bdf91dd8073b5dd89178761f9cc8f96d55f09ad3
+DIST netdata-1.9.0.tar.gz 2483847 BLAKE2B 7f1bcc9cc5768a91b39c39cac04f877472d008630dfa3da97c0893c3cceeed721fb2982fce1f377267cf76e2a9ea70cca650d53bdd442e944820b0356f2700ea SHA512 d17112e2222e48a7d06704d03598e6020b6172f93a6f19e5577657fc5ffe902b8a0472f53b880552eb653e855da3e743a863db446520af008d3b75fb1b438e90
 EBUILD netdata-1.8.0-r1.ebuild 2512 BLAKE2B de6d953a4f910a9fd25a89218db797fd62768ff99ab97826d337b34d2be784eb6e97a4b5cc4e369871ea18c054c89ba381019d4daf05a5aabf9b28a606a3ed71 SHA512 b0c67391956880bf60e6ec9caeb1addb8029cc676dad69762d90c65a974f3fa6fe847f55b8b7c85739f03759fbaae64216cec31cf8130fbbedb85b23669ae062
-EBUILD netdata-1.8.0.ebuild 2411 BLAKE2B e92f1876f8074eed300d74a30f4270e5676b2fce6950011dbeb368ae99dfced99f6f42f08e03ccfa9952e85773cdfa54802744aa84f6205e9069b8bd3a52f065 SHA512 a707699734fa39b033247300aca59a21a38bcd68a178a49c4d5f5a7c5780e13d7081d9014d8e07b357343ba1bdf91dd8073b5dd89178761f9cc8f96d55f09ad3
+EBUILD netdata-1.9.0.ebuild 2462 BLAKE2B 2b84381b701bbc729db9567aa3debcb0ca6dadaa312129a5fc19cb0005b8839889b7d3c90c46a1f06df541a61ee0e1b58b0ce74a8c2ddb6aa9bcfeb217b876ee SHA512 8925ef75c6c54588bf4ee97e42f71c0e24f3baad2aec58585b0e789b0fcace1185ba727fb800cdeb5cd109e76139b7cf1c1fe6a9a10d0c90baca52479e23fa8f
 EBUILD netdata-9999.ebuild 2462 BLAKE2B 2b84381b701bbc729db9567aa3debcb0ca6dadaa312129a5fc19cb0005b8839889b7d3c90c46a1f06df541a61ee0e1b58b0ce74a8c2ddb6aa9bcfeb217b876ee SHA512 8925ef75c6c54588bf4ee97e42f71c0e24f3baad2aec58585b0e789b0fcace1185ba727fb800cdeb5cd109e76139b7cf1c1fe6a9a10d0c90baca52479e23fa8f
 MISC metadata.xml 807 BLAKE2B fa551c2d00268159e7bbd6e3c4a37d29a68ce7ceb1d5390a8e55571c24046f74fa1f464b8a9dd54fac2aaf7a71289e2ce05e006e2de904262f0cc283dc9d4c27 SHA512 bc6d35a5d9f28c8bf6fc9ccee126f4db6c22c915ee75c45ff0e898e712f8a7277f3d6fb22024a76d624e34609dbab9a36cfff696626eec9de84fadd361d8410d
diff --git a/net-analyzer/netdata/files/netdata-1.4.0-glibc-sysmacros.patch b/net-analyzer/netdata/files/netdata-1.4.0-glibc-sysmacros.patch
deleted file mode 100644
index 7722af2e1a8c..000000000000
--- a/net-analyzer/netdata/files/netdata-1.4.0-glibc-sysmacros.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 471d1b5404cd60ea638450e39554ae2878fd5b0d Mon Sep 17 00:00:00 2001
-From: Costa Tsaousis <costa@tsaousis.gr>
-Date: Tue, 20 Dec 2016 20:31:24 +0200
-Subject: [PATCH] added sys/sysmacros.h; fixes #1408
-
----
- src/common.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/common.h b/src/common.h
-index c92c049..70cb4d6 100644
---- a/src/common.h
-+++ b/src/common.h
-@@ -64,6 +64,7 @@
- #include <sys/syscall.h>
- #include <sys/time.h>
- #include <sys/types.h>
-+#include <sys/sysmacros.h> // #1408
- #include <sys/wait.h>
- #include <time.h>
- #include <unistd.h>
diff --git a/net-analyzer/netdata/netdata-1.2.0-r1.ebuild b/net-analyzer/netdata/netdata-1.2.0-r1.ebuild
deleted file mode 100644
index 02c65adda6e2..000000000000
--- a/net-analyzer/netdata/netdata-1.2.0-r1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit linux-info systemd user fcaps
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/firehol/${PN}.git"
-	inherit git-r3 autotools
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="https://firehol.org/download/${PN}/releases/v${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Linux real time system monitoring, done right!"
-HOMEPAGE="https://github.com/firehol/netdata https://my-netdata.io/"
-
-LICENSE="GPL-3+ MIT BSD"
-SLOT="0"
-IUSE="+compression nfacct nodejs"
-
-# most unconditional dependencies are for plugins.d/charts.d.plugin:
-RDEPEND="
-	>=app-shells/bash-4:0
-	net-misc/curl
-	net-misc/wget
-	virtual/awk
-	compression? ( sys-libs/zlib )
-	nfacct? (
-		net-firewall/nfacct
-		net-libs/libmnl
-	)
-	nodejs? (
-		net-libs/nodejs
-	)"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-: ${NETDATA_USER:=netdata}
-: ${NETDATA_GROUP:=netdata}
-
-FILECAPS=(
-	'cap_dac_read_search,cap_sys_ptrace+ep' 'usr/libexec/netdata/plugins.d/apps.plugin'
-)
-
-pkg_setup() {
-	linux-info_pkg_setup
-
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 / ${PN}
-}
-
-src_prepare() {
-	default
-	[[ ${PV} == "9999" ]] && eautoreconf
-}
-
-src_configure() {
-	econf \
-		--localstatedir=/var \
-		--with-user=${NETDATA_USER} \
-		$(use_enable nfacct plugin-nfacct) \
-		$(use_with compression zlib)
-}
-
-src_install() {
-	default
-
-	fowners ${NETDATA_USER}:${NETDATA_GROUP} /var/log/netdata
-	fowners ${NETDATA_USER}:${NETDATA_GROUP} /var/cache/netdata
-
-	chown -Rc ${NETDATA_USER}:${NETDATA_GROUP} "${ED}"/usr/share/${PN} || die
-
-	newinitd system/netdata-openrc ${PN}
-	systemd_dounit system/netdata.service
-}
diff --git a/net-analyzer/netdata/netdata-1.3.0.ebuild b/net-analyzer/netdata/netdata-1.3.0.ebuild
deleted file mode 100644
index e7e9b14a560b..000000000000
--- a/net-analyzer/netdata/netdata-1.3.0.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-inherit fcaps linux-info python-r1 systemd user
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/firehol/${PN}.git"
-	inherit git-r3 autotools
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="https://firehol.org/download/${PN}/releases/v${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Linux real time system monitoring, done right!"
-HOMEPAGE="https://github.com/firehol/netdata https://my-netdata.io/"
-
-LICENSE="GPL-3+ MIT BSD"
-SLOT="0"
-IUSE="+compression mysql nfacct nodejs +python"
-REQUIRED_USE="
-	mysql? ( python )
-	python? ( ${PYTHON_REQUIRED_USE} )"
-# most unconditional dependencies are for plugins.d/charts.d.plugin:
-RDEPEND="
-	>=app-shells/bash-4:0
-	net-misc/curl
-	net-misc/wget
-	virtual/awk
-	net-libs/libmnl
-	|| ( net-analyzer/netcat6 net-analyzer/netcat )
-	net-analyzer/tcpdump
-	net-analyzer/traceroute
-	compression? ( sys-libs/zlib )
-	python? (
-		${PYTHON_DEPS}
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		mysql? (
-			|| ( dev-python/mysqlclient[${PYTHON_USEDEP}] dev-python/mysql-python[${PYTHON_USEDEP}] )
-		)
-	)
-	nfacct? (
-		net-firewall/nfacct
-		net-libs/libmnl
-	)
-	nodejs? (
-		net-libs/nodejs
-	)"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-: ${NETDATA_USER:=netdata}
-: ${NETDATA_GROUP:=netdata}
-
-FILECAPS=(
-	'cap_dac_read_search,cap_sys_ptrace+ep' 'usr/libexec/netdata/plugins.d/apps.plugin'
-)
-
-pkg_setup() {
-	linux-info_pkg_setup
-
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 / ${PN}
-}
-
-src_prepare() {
-	default
-	[[ ${PV} == "9999" ]] && eautoreconf
-}
-
-src_configure() {
-	econf \
-		--localstatedir=/var \
-		--with-user=${NETDATA_USER} \
-		$(use_enable nfacct plugin-nfacct) \
-		$(use_with compression zlib)
-}
-
-src_install() {
-	default
-
-	fowners ${NETDATA_USER}:${NETDATA_GROUP} /var/log/netdata
-	fowners ${NETDATA_USER}:${NETDATA_GROUP} /var/cache/netdata
-
-	fowners -Rc ${NETDATA_USER}:${NETDATA_GROUP} /usr/share/${PN}
-
-	newinitd system/netdata-openrc ${PN}
-	systemd_dounit system/netdata.service
-}
diff --git a/net-analyzer/netdata/netdata-1.4.0-r1.ebuild b/net-analyzer/netdata/netdata-1.4.0-r1.ebuild
deleted file mode 100644
index fa90f4bdc014..000000000000
--- a/net-analyzer/netdata/netdata-1.4.0-r1.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-inherit fcaps linux-info python-r1 systemd user
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/firehol/${PN}.git"
-	inherit git-r3 autotools
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="https://firehol.org/download/${PN}/releases/v${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Linux real time system monitoring, done right!"
-HOMEPAGE="https://github.com/firehol/netdata https://my-netdata.io/"
-
-LICENSE="GPL-3+ MIT BSD"
-SLOT="0"
-IUSE="+compression cpu_flags_x86_sse2 mysql nfacct nodejs +python"
-REQUIRED_USE="
-	mysql? ( python )
-	python? ( ${PYTHON_REQUIRED_USE} )"
-# most unconditional dependencies are for plugins.d/charts.d.plugin:
-RDEPEND="
-	>=app-shells/bash-4:0
-	net-misc/curl
-	net-misc/wget
-	virtual/awk
-	net-libs/libmnl
-	|| ( net-analyzer/netcat6 net-analyzer/netcat )
-	net-analyzer/tcpdump
-	net-analyzer/traceroute
-	compression? ( sys-libs/zlib )
-	python? (
-		${PYTHON_DEPS}
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		mysql? (
-			|| ( dev-python/mysqlclient[${PYTHON_USEDEP}] dev-python/mysql-python[${PYTHON_USEDEP}] )
-		)
-	)
-	nfacct? (
-		net-firewall/nfacct
-		net-libs/libmnl
-	)
-	nodejs? (
-		net-libs/nodejs
-	)"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-: ${NETDATA_USER:=netdata}
-: ${NETDATA_GROUP:=netdata}
-
-FILECAPS=(
-	'cap_dac_read_search,cap_sys_ptrace+ep' 'usr/libexec/netdata/plugins.d/apps.plugin'
-)
-
-PATCHES=(
-	"${FILESDIR}"/${P}-glibc-sysmacros.patch
-)
-
-pkg_setup() {
-	linux-info_pkg_setup
-
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 / ${PN}
-}
-
-src_prepare() {
-	default
-	[[ ${PV} == "9999" ]] && eautoreconf
-}
-
-src_configure() {
-	econf \
-		--localstatedir=/var \
-		--with-user=${NETDATA_USER} \
-		$(use_enable nfacct plugin-nfacct) \
-		$(use_enable cpu_flags_x86_sse2 x86-sse) \
-		$(use_with compression zlib)
-}
-
-src_install() {
-	default
-
-	fowners -Rc ${NETDATA_USER}:${NETDATA_GROUP} /var/log/netdata
-	fowners -Rc ${NETDATA_USER}:${NETDATA_GROUP} /var/cache/netdata
-	fowners -Rc ${NETDATA_USER}:${NETDATA_GROUP} /var/lib/netdata
-
-	fowners -Rc root:${NETDATA_GROUP} /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.5.0.ebuild b/net-analyzer/netdata/netdata-1.5.0.ebuild
deleted file mode 100644
index f8e7926d3d72..000000000000
--- a/net-analyzer/netdata/netdata-1.5.0.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-inherit autotools fcaps linux-info python-r1 systemd user
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/firehol/${PN}.git"
-	inherit git-r3
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="https://github.com/firehol/${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/firehol/netdata https://my-netdata.io/"
-
-LICENSE="GPL-3+ MIT BSD"
-SLOT="0"
-IUSE="+compression cpu_flags_x86_sse2 mysql nfacct nodejs postgres +python"
-REQUIRED_USE="
-	mysql? ( python )
-	python? ( ${PYTHON_REQUIRED_USE} )"
-# most unconditional dependencies are for plugins.d/charts.d.plugin:
-RDEPEND="
-	>=app-shells/bash-4:0
-	net-misc/curl
-	net-misc/wget
-	virtual/awk
-	net-libs/libmnl
-	|| ( net-analyzer/netcat6 net-analyzer/netcat )
-	net-analyzer/tcpdump
-	net-analyzer/traceroute
-	compression? ( sys-libs/zlib )
-	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}]
-		)
-	)
-	nfacct? (
-		net-firewall/nfacct
-		net-libs/libmnl
-	)
-	nodejs? (
-		net-libs/nodejs
-	)"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-: ${NETDATA_USER:=netdata}
-: ${NETDATA_GROUP:=netdata}
-
-FILECAPS=(
-	'cap_dac_read_search,cap_sys_ptrace+ep' 'usr/libexec/netdata/plugins.d/apps.plugin'
-)
-
-pkg_setup() {
-	linux-info_pkg_setup
-
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 / ${PN}
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--localstatedir="${EPREFIX}"/var \
-		--with-user=${NETDATA_USER} \
-		$(use_enable nfacct plugin-nfacct) \
-		$(use_enable cpu_flags_x86_sse2 x86-sse) \
-		$(use_with compression zlib)
-}
-
-src_install() {
-	default
-
-	fowners -Rc ${NETDATA_USER}:${NETDATA_GROUP} /var/log/netdata
-	fowners -Rc ${NETDATA_USER}:${NETDATA_GROUP} /var/cache/netdata
-	fowners -Rc ${NETDATA_USER}:${NETDATA_GROUP} /var/lib/netdata
-
-	fowners -Rc root:${NETDATA_GROUP} /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.7.0.ebuild b/net-analyzer/netdata/netdata-1.7.0.ebuild
deleted file mode 100644
index e2948db1d764..000000000000
--- a/net-analyzer/netdata/netdata-1.7.0.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-inherit autotools fcaps linux-info python-r1 systemd user
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/firehol/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/firehol/${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/firehol/netdata https://my-netdata.io/"
-
-LICENSE="GPL-3+ MIT BSD"
-SLOT="0"
-IUSE="caps +compression cpu_flags_x86_sse2 ipmi mysql nfacct nodejs postgres +python"
-REQUIRED_USE="
-	mysql? ( python )
-	python? ( ${PYTHON_REQUIRED_USE} )"
-# most unconditional dependencies are for plugins.d/charts.d.plugin:
-RDEPEND="
-	>=app-shells/bash-4:0
-	|| (
-		net-analyzer/netcat6
-		net-analyzer/netcat
-	)
-	net-analyzer/tcpdump
-	net-analyzer/traceroute
-	net-misc/curl
-	net-misc/wget
-	sys-apps/util-linux
-	virtual/awk
-	caps? ( sys-libs/libcap )
-	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}] )
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-: ${NETDATA_USER:=netdata}
-: ${NETDATA_GROUP:=netdata}
-
-FILECAPS=(
-	'cap_dac_read_search,cap_sys_ptrace+ep' 'usr/libexec/netdata/plugins.d/apps.plugin'
-)
-
-pkg_setup() {
-	linux-info_pkg_setup
-
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 / ${PN}
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--localstatedir="${EPREFIX}"/var \
-		--with-user=${NETDATA_USER} \
-		$(use_enable nfacct plugin-nfacct) \
-		$(use_enable ipmi plugin-freeipmi) \
-		$(use_enable cpu_flags_x86_sse2 x86-sse) \
-		$(use_with compression zlib)
-}
-
-src_install() {
-	default
-
-	fowners -Rc ${NETDATA_USER}:${NETDATA_GROUP} /var/log/netdata
-	fowners -Rc ${NETDATA_USER}:${NETDATA_GROUP} /var/cache/netdata
-	fowners -Rc ${NETDATA_USER}:${NETDATA_GROUP} /var/lib/netdata
-
-	fowners -Rc root:${NETDATA_GROUP} /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.8.0.ebuild b/net-analyzer/netdata/netdata-1.8.0.ebuild
deleted file mode 100644
index e2948db1d764..000000000000
--- a/net-analyzer/netdata/netdata-1.8.0.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-inherit autotools fcaps linux-info python-r1 systemd user
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/firehol/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/firehol/${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/firehol/netdata https://my-netdata.io/"
-
-LICENSE="GPL-3+ MIT BSD"
-SLOT="0"
-IUSE="caps +compression cpu_flags_x86_sse2 ipmi mysql nfacct nodejs postgres +python"
-REQUIRED_USE="
-	mysql? ( python )
-	python? ( ${PYTHON_REQUIRED_USE} )"
-# most unconditional dependencies are for plugins.d/charts.d.plugin:
-RDEPEND="
-	>=app-shells/bash-4:0
-	|| (
-		net-analyzer/netcat6
-		net-analyzer/netcat
-	)
-	net-analyzer/tcpdump
-	net-analyzer/traceroute
-	net-misc/curl
-	net-misc/wget
-	sys-apps/util-linux
-	virtual/awk
-	caps? ( sys-libs/libcap )
-	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}] )
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-: ${NETDATA_USER:=netdata}
-: ${NETDATA_GROUP:=netdata}
-
-FILECAPS=(
-	'cap_dac_read_search,cap_sys_ptrace+ep' 'usr/libexec/netdata/plugins.d/apps.plugin'
-)
-
-pkg_setup() {
-	linux-info_pkg_setup
-
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 / ${PN}
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--localstatedir="${EPREFIX}"/var \
-		--with-user=${NETDATA_USER} \
-		$(use_enable nfacct plugin-nfacct) \
-		$(use_enable ipmi plugin-freeipmi) \
-		$(use_enable cpu_flags_x86_sse2 x86-sse) \
-		$(use_with compression zlib)
-}
-
-src_install() {
-	default
-
-	fowners -Rc ${NETDATA_USER}:${NETDATA_GROUP} /var/log/netdata
-	fowners -Rc ${NETDATA_USER}:${NETDATA_GROUP} /var/cache/netdata
-	fowners -Rc ${NETDATA_USER}:${NETDATA_GROUP} /var/lib/netdata
-
-	fowners -Rc root:${NETDATA_GROUP} /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.6.0.ebuild b/net-analyzer/netdata/netdata-1.9.0.ebuild
index e2948db1d764..7c343955b897 100644
--- a/net-analyzer/netdata/netdata-1.6.0.ebuild
+++ b/net-analyzer/netdata/netdata-1.9.0.ebuild
@@ -90,8 +90,12 @@ src_configure() {
 src_install() {
 	default
 
+	rm -rf "${D}/var/cache/netdata" || die
+
+	# Remove unneeded .keep files
+	find "${ED}" -name ".keep" -delete || die
+
 	fowners -Rc ${NETDATA_USER}:${NETDATA_GROUP} /var/log/netdata
-	fowners -Rc ${NETDATA_USER}:${NETDATA_GROUP} /var/cache/netdata
 	fowners -Rc ${NETDATA_USER}:${NETDATA_GROUP} /var/lib/netdata
 
 	fowners -Rc root:${NETDATA_GROUP} /usr/share/${PN}