Update net-analyzer/netdata-1.6.0, net-analyzer/netdata-1.7.0, net-analyzer/netdata-9999

7 files changed, 316 insertions, 5 deletions

diff --git a/net-analyzer/netdata/Manifest b/net-analyzer/netdata/Manifest
index 3380c204..3b21df8f 100644
--- a/net-analyzer/netdata/Manifest
+++ b/net-analyzer/netdata/Manifest
@@ -1,4 +1,5 @@
 AUX netdata-1.4.0-glibc-sysmacros.patch 560 SHA256 3dfd873d8faf9e7578f27c00294b31f3ad4749e2443d74f8fdf3dff65b492055 SHA512 58af1778c9fce5333e984a1a0d8612da4455596f72e6343a656d4aaaa8d6a0809cb2b02647cbdfaef61776a657282583e298a3d5bd555ea9d7d9ee09b819e787 WHIRLPOOL fbba339d641681f23fd25748635c693e1469f05bd9a51314236ef5782eec1c65529268eb18020408ff7a79685915f4ea76ff7b3afde31569cf94d1eb916c87e1
+AUX netdata-1.8.0-openrc-fixes.patch 3618 SHA256 6b5bea165dfb3a377d17a386efd5d952acb24dfd1e5d5d5bca3078f05e3faf74 SHA512 9ba1da7f5a75b99249abe997a54fbd0ec69ef8ad2291d656c739f580c9758c7133224f09462ce001719cc06a7017a1745722977bef91c4e45bdb455377e39069 WHIRLPOOL 8dc713c02954db2c106defc5100b7c143fb308660bc4b52a58be2904c7da38b9eeadcc7fd35b2f69367210c72538e0c76687d5a59e02b9f3c9c481befa2135c3
 AUX netdata.initd 2552 SHA256 5b801e4f4dd5be71a1bd580ea1b4b307533b961f5716b70162405102ecaf49fb SHA512 c79bcf24e83b7cbf0aaf02db9b76823e8b7e5633ba8d5ddb53eb51c071eeb041d95062b34cd58e057aa78d17afb7c05eb7bed4552e049faa453dcdab7f3cca30 WHIRLPOOL a876cc4dba18d6c551c5626e9278fc08fd0aac09081463064f82e0f58805339e80191ee47ea5c739e913040ccded6c65fa3a7ddd669be592b24b9ca09897b7eb
 DIST netdata-1.2.0.tar.gz 1393005 SHA256 886288bdc66c744256cd735d6a074407d2b6450610df3dd80ae9f99ff7475773 SHA512 5ffb9f8e33f8270f0ec8f40fd5140641582a15366e83b8b39010284613fda6cd338efdfb7f9ed47b6d898cf235fba23547df8c6a5f4fcbfe020bdd1e429d1f9f WHIRLPOOL 7bc84b11252eed665627485e2cd62565c4e037362cbeca61f0c1a604fb436d69fd3eff5552df661082b71f9c9c219ea03cfed9667f4f7c7174b05a97eae11285
 DIST netdata-1.3.0.tar.gz 1867166 SHA256 14800d75fce645c8b6850cc16035175c3c2f7e109c33fea2b8b563f3ec39d678 SHA512 8626d1a55ff600ba94f5c667322b91d15068be1acccc8350d4ef5520291af0934fe9a2712865da7d2d2a8da2a22b2d5fa1a1ae20fce19db5980f6d7ab2d016c5 WHIRLPOOL b94b6c6a0c3c55573f4178a644c6ea841b2ff495f1e7c7aacb85d03536317792f03270275e56f94a832e9ba2d3c6dae23044e833cb211961eea57b57d76c57f6
@@ -13,5 +14,6 @@ EBUILD netdata-1.4.0-r1.ebuild 4795 SHA256 7e4161b6fa5f82169233cdaef19057ab2e97f
 EBUILD netdata-1.5.0.ebuild 4871 SHA256 1f5eb32dd03dcf60c73d0ebe49344eb5ff83660d301142af9e2b4c68d6a24127 SHA512 ebaf93650737505e06897307f4b7a9f0feac2f5282e6e0f89a2e882320e1b3f0f73975cc2a7bcb0e57f3d561e0c5e915d5edc8c2e1fadf22f696d415a6d821f8 WHIRLPOOL ecda35ad8b44975c5d3c0c0c937cf848b4f4d5a0d40412b11edb43eaf6d60589da2a0e9db66c491793bc0171941e2a0e0e7ecfb3bd82c724bdd0ca76b1650d71
 EBUILD netdata-1.6.0.ebuild 5635 SHA256 7daaef9144613c52197152e4743be4864a5e79f5fb17da60b756a5a25d0ca9f0 SHA512 ab80f0e1166c20e635b3ec738924d97fbb03c6609cfc0d34e63301c3f1f8156b7b945120bc7f917e4fe53f3c3a6cae4c272d0136f7672b9dd7add41f03bd8708 WHIRLPOOL 5acbb2c3a69f7d7c15f93d5eb6a4cf5dd4fffd20edc370998ef118c9c5955693da6e75a25f816de76b62e12b9356f67879e150f75434eeed1f7ff526cea998f4
 EBUILD netdata-1.7.0.ebuild 5635 SHA256 7daaef9144613c52197152e4743be4864a5e79f5fb17da60b756a5a25d0ca9f0 SHA512 ab80f0e1166c20e635b3ec738924d97fbb03c6609cfc0d34e63301c3f1f8156b7b945120bc7f917e4fe53f3c3a6cae4c272d0136f7672b9dd7add41f03bd8708 WHIRLPOOL 5acbb2c3a69f7d7c15f93d5eb6a4cf5dd4fffd20edc370998ef118c9c5955693da6e75a25f816de76b62e12b9356f67879e150f75434eeed1f7ff526cea998f4
+EBUILD netdata-1.8.0-r1.ebuild 5694 SHA256 27aa553dbe8aa24775df24d1ef59c8a97a3529b2d48894d36e8d22adf3c898fc SHA512 5173da77f0ebad818eeaf8c1b74cac8c2658869603fdf62da1d85bf73d0a2d04e404b981248a425f35e1e26bff286790d02049f5fba47cd2c24a5223df1b94e2 WHIRLPOOL 49384b08e02ceb948e1f6ac55b534251388ab91b2f85817e2c042fd0376dc4fd7a20848540f3cde4da54bf5062e7f5b5632bf37e4904012cb6b3d1b82f44083d
 EBUILD netdata-1.8.0.ebuild 5635 SHA256 7daaef9144613c52197152e4743be4864a5e79f5fb17da60b756a5a25d0ca9f0 SHA512 ab80f0e1166c20e635b3ec738924d97fbb03c6609cfc0d34e63301c3f1f8156b7b945120bc7f917e4fe53f3c3a6cae4c272d0136f7672b9dd7add41f03bd8708 WHIRLPOOL 5acbb2c3a69f7d7c15f93d5eb6a4cf5dd4fffd20edc370998ef118c9c5955693da6e75a25f816de76b62e12b9356f67879e150f75434eeed1f7ff526cea998f4
-EBUILD netdata-9999.ebuild 5635 SHA256 7daaef9144613c52197152e4743be4864a5e79f5fb17da60b756a5a25d0ca9f0 SHA512 ab80f0e1166c20e635b3ec738924d97fbb03c6609cfc0d34e63301c3f1f8156b7b945120bc7f917e4fe53f3c3a6cae4c272d0136f7672b9dd7add41f03bd8708 WHIRLPOOL 5acbb2c3a69f7d7c15f93d5eb6a4cf5dd4fffd20edc370998ef118c9c5955693da6e75a25f816de76b62e12b9356f67879e150f75434eeed1f7ff526cea998f4
+EBUILD netdata-9999.ebuild 5694 SHA256 27aa553dbe8aa24775df24d1ef59c8a97a3529b2d48894d36e8d22adf3c898fc SHA512 5173da77f0ebad818eeaf8c1b74cac8c2658869603fdf62da1d85bf73d0a2d04e404b981248a425f35e1e26bff286790d02049f5fba47cd2c24a5223df1b94e2 WHIRLPOOL 49384b08e02ceb948e1f6ac55b534251388ab91b2f85817e2c042fd0376dc4fd7a20848540f3cde4da54bf5062e7f5b5632bf37e4904012cb6b3d1b82f44083d
diff --git a/net-analyzer/netdata/files/netdata-1.8.0-openrc-fixes.patch b/net-analyzer/netdata/files/netdata-1.8.0-openrc-fixes.patch
new file mode 100644
index 00000000..517eaec5
--- /dev/null
+++ b/net-analyzer/netdata/files/netdata-1.8.0-openrc-fixes.patch
@@ -0,0 +1,105 @@
+From 3f4db620484e777265a7e5f0cfe10ba840f7eefd Mon Sep 17 00:00:00 2001
+From: Craig Andrews <candrews@integralblue.com>
+Date: Tue, 3 Oct 2017 10:52:02 -0400
+Subject: [PATCH 1/3] Eliminate bashisms in openrc script
+
+---
+ system/netdata-openrc.in | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/system/netdata-openrc.in b/system/netdata-openrc.in
+index 465e1232c..5c4eafa57 100644
+--- a/system/netdata-openrc.in
++++ b/system/netdata-openrc.in
+@@ -38,13 +38,13 @@ depend() {
+ }
+ 
+ start_post() {
+-	if [[ ! -f @sysconfdir_POST@/netdata/netdata.conf ]]; then
++	if [ ! -f @sysconfdir_POST@/netdata/netdata.conf ]; then
+ 		ebegin "Downloading default configuration to @sysconfdir_POST@/netdata/netdata.conf"
+ 		sleep 2
+ 		curl -s -o @sysconfdir_POST@/netdata/netdata.conf.new "${NETDATA_CONFIG_URL}"
+ 		ret=$?
+-		if [[ $ret -eq 0 && -s @sysconfdir_POST@/netdata/netdata.conf.new ]]; then
+-			mv @sysconfdir_POST@/netdata/netdata.conf{.new,}
++		if [ $ret -eq 0 && -s @sysconfdir_POST@/netdata/netdata.conf.new ]; then
++			mv @sysconfdir_POST@/netdata/netdata.conf.new @sysconfdir_POST@/netdata/netdata.conf
+ 		else
+ 			ret=1
+ 			rm @sysconfdir_POST@/netdata/netdata.conf.new 2>/dev/null
+@@ -57,20 +57,20 @@ stop_post() {
+ 	local result ret=0 count=0 sigkill=0
+ 
+ 	ebegin "Waiting for netdata to save its database"
+-	while [[ -f "${pidfile}" ]]; do
+-		if [[ $count -gt ${NETDATA_WAIT_EXIT_TIMEOUT} ]]; then
++	while [ -f "${pidfile}" ]; do
++		if [ $count -gt ${NETDATA_WAIT_EXIT_TIMEOUT} ]; then
+ 			sigkill=1
+ 			break
+ 		fi
+ 
+-		count=$[count + 1]
++		count=$((count + 1))
+ 		kill -0 $(cat ${pidfile}) 2>/dev/null
+ 		ret=$?
+ 		test $ret -eq 0 && sleep 1
+ 	done
+ 	eend $sigkill
+ 
+-	if [[ $sigkill -eq 1 && -f "${pidfile}" ]]; then
++	if [ $sigkill -eq 1 && -f "${pidfile}" ]; then
+ 		ebegin "Netdata is taking too long to exit, forcing it to quit"
+ 		kill -SIGKILL $(cat ${pidfile}) 2>/dev/null
+ 		eend $?
+
+From b6d80fb3a3ae60077cbbc1e8dd0d01e1eb3ff67d Mon Sep 17 00:00:00 2001
+From: Craig Andrews <candrews@integralblue.com>
+Date: Tue, 3 Oct 2017 14:56:53 -0400
+Subject: [PATCH 2/3] Fix the path to the netdata executable in the openrc
+ script
+
+Fixes #2826
+---
+ system/netdata-openrc.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/system/netdata-openrc.in b/system/netdata-openrc.in
+index 5c4eafa57..512d48278 100644
+--- a/system/netdata-openrc.in
++++ b/system/netdata-openrc.in
+@@ -23,7 +23,7 @@
+ 
+ extra_started_commands="getconf"
+ pidfile="/run/netdata.pid"
+-command="${NETDATA_INSTALL_PATH}/usr/sbin/netdata"
++command="@sbindir_POST@/netdata"
+ command_background="yes"
+ command_args="-P ${pidfile} ${NETDATA_EXTRA_ARGS}"
+ # start_stop_daemon_args="-u ${NETDATA_OWNER}"
+
+From b5823e7865851c3cc2381c4fb45716f269a4e85f Mon Sep 17 00:00:00 2001
+From: Craig Andrews <candrews@integralblue.com>
+Date: Tue, 3 Oct 2017 15:56:39 -0400
+Subject: [PATCH 3/3] Create the var/cache/netdata directory if it doesn't
+ already exist in the systemd script
+
+---
+ system/netdata.service.in | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/system/netdata.service.in b/system/netdata.service.in
+index 1d4af988a..58cdff225 100644
+--- a/system/netdata.service.in
++++ b/system/netdata.service.in
+@@ -9,6 +9,9 @@ Group=netdata
+ RuntimeDirectory=netdata
+ RuntimeDirectoryMode=0775
+ ExecStart=@sbindir_POST@/netdata -P /run/netdata/netdata.pid -D
++ExecStartPre=/bin/mkdir -p @localstatedir_POST@/cache/netdata
++ExecStartPre=/bin/chown -R netdata:netdata @localstatedir_POST@/cache/netdata
++PermissionsStartOnly=true
+ 
+ # saving a big db on slow disks may need some time
+ TimeoutStopSec=60
diff --git a/net-analyzer/netdata/netdata-1.6.0.ebuild b/net-analyzer/netdata/netdata-1.6.0.ebuild
index 54fa40f5..93c1f155 120000
--- a/net-analyzer/netdata/netdata-1.6.0.ebuild
+++ b/net-analyzer/netdata/netdata-1.6.0.ebuild
@@ -1 +1 @@
-netdata-9999.ebuild
\ No newline at end of file
+netdata-1.8.0.ebuild
\ No newline at end of file
diff --git a/net-analyzer/netdata/netdata-1.7.0.ebuild b/net-analyzer/netdata/netdata-1.7.0.ebuild
index 54fa40f5..93c1f155 120000
--- a/net-analyzer/netdata/netdata-1.7.0.ebuild
+++ b/net-analyzer/netdata/netdata-1.7.0.ebuild
@@ -1 +1 @@
-netdata-9999.ebuild
\ No newline at end of file
+netdata-1.8.0.ebuild
\ No newline at end of file
diff --git a/net-analyzer/netdata/netdata-1.8.0-r1.ebuild b/net-analyzer/netdata/netdata-1.8.0-r1.ebuild
new file mode 120000
index 00000000..54fa40f5
--- /dev/null
+++ b/net-analyzer/netdata/netdata-1.8.0-r1.ebuild
@@ -0,0 +1 @@
+netdata-9999.ebuild
\ No newline at end of file
diff --git a/net-analyzer/netdata/netdata-1.8.0.ebuild b/net-analyzer/netdata/netdata-1.8.0.ebuild
index 54fa40f5..6917835b 120000..100644
--- a/net-analyzer/netdata/netdata-1.8.0.ebuild
+++ b/net-analyzer/netdata/netdata-1.8.0.ebuild
@@ -1 +1,201 @@
-netdata-9999.ebuild
\ No newline at end of file
+# 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} )
+WANT_AUTOCONF="2.5" # For autoconf-2.60+
+
+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"
+	RESTRICT="mirror"
+fi
+
+GIT_COMMIT=""
+case "${PV}" in
+	1.2.0)
+		GIT_COMMIT="bb4aa949f5ac825253d8adc6070661299abc1c3b"
+		;;
+	1.3.0)
+		GIT_COMMIT="b4591e87bd5bf5164eb55c90474bbb9f38f2dad4"
+		;;
+	1.4.0)
+		GIT_COMMIT="3028b87ee19e8550df6b9decc49733d595e0bd6e"
+		;;
+	1.5.0)
+		GIT_COMMIT="3bd41a09fccccbc6b095805556d3009b9ebf6213"
+		;;
+	1.6.0)
+		GIT_COMMIT="f5fa346a188e906a8f2cce3c2cf32a88ce81c666"
+		;;
+	1.7.0)
+		GIT_COMMIT="4016e2d9e3c2fcf5f6d59827bf5f81083d6645ba"
+		;;
+	1.8.0)
+		GIT_COMMIT="89ed309252981ddd50f697fde4fe93019cb3e652"
+		;;
+esac
+
+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 fping ipmi mysql nfacct nodejs postgres +python systemd cpu_flags_x86_sse2"
+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 )
+	fping? ( >=net-analyzer/fping-4.0 )
+	ipmi? ( sys-libs/freeipmi )
+	nfacct? (
+		net-firewall/nfacct
+		net-libs/libmnl
+	)
+	nodejs? ( net-libs/nodejs )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		virtual/python-dnspython
+		virtual/python-ipaddress
+		mysql? (
+			|| (
+				dev-python/mysqlclient[${PYTHON_USEDEP}]
+				dev-python/mysql-python[${PYTHON_USEDEP}]
+			)
+		)
+		postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
+	)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+# Check for Kernel-Samepage-Merging (CONFIG_KSM)
+CONFIG_CHECK="
+	~KSM
+"
+
+: ${NETDATA_USER:=${PN}}
+: ${NETDATA_GROUP:=${PN}}
+
+FILECAPS=(
+	'cap_dac_read_search,cap_sys_ptrace+ep' 'usr/libexec/netdata/plugins.d/apps.plugin'
+)
+
+pkg_setup() {
+	linux-info_pkg_setup
+
+	enewgroup "${NETDATA_GROUP}"
+	enewuser "${NETDATA_USER}" -1 -1 / "${NETDATA_USER}"
+}
+
+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
+
+	newdoc "${ED}"/usr/libexec/netdata/charts.d/README.md charts.md
+	newdoc "${ED}"/usr/libexec/netdata/plugins.d/README.md plugins.md
+
+	if ! [[ -s "${ED}"/usr/share/netdata/web/version.txt && "$( < "${ED}"/usr/share/netdata/web/version.txt )" != '0' ]]; then
+		if [[ -n "${GIT_COMMIT:-}" ]]; then
+			einfo "Replacing packaged version '$( < "${ED}"/usr/share/netdata/web/version.txt )' with version '${GIT_COMMIT}'"
+			echo "${GIT_COMMIT}" > "${ED}"/usr/share/netdata/web/version.txt
+		else
+			ewarn "Removing packaged version file '/usr/share/netdata/web/version.txt' with version '$( < "${ED}"/usr/share/netdata/web/version.txt )'"
+			rm "${ED}"/usr/share/netdata/web/version.txt
+		fi
+	fi
+
+	if ! use nodejs; then
+		rm -r "${ED}"/usr/libexec/netdata/node.d
+		rm "${ED}"/usr/libexec/netdata/plugins.d/node.d.plugin
+	fi
+
+	rm -r "${ED}"/usr/share/netdata/web/old
+	rm 2>/dev/null \
+		"${ED}"/var/log/netdata/.keep "${ED}"/var/cache/netdata/.keep \
+		"${ED}"/usr/libexec/netdata/charts.d/README.md \
+		"${ED}"/usr/libexec/netdata/node.d/README.md \
+		"${ED}"/usr/libexec/netdata/plugins.d/README.md
+	rmdir -p "${ED}"/var/log/netdata "${ED}"/var/cache/netdata 2>/dev/null
+
+	# netdata includes 'web root owner' settings, but ignores them and fails to
+	# serve its pages if netdata:netdata isn't the owner :(
+	fowners -Rc "${NETDATA_USER}":"${NETDATA_GROUP}" /usr/share/"${PN}"/web ||
+		die "Failed settings owners: ${?}"
+
+	insinto /etc/netdata
+	doins system/netdata.conf
+
+	#newinitd system/netdata-openrc "${PN}"
+	newinitd "${FILESDIR}"/"${PN}".initd "${PN}"
+	use systemd && systemd_dounit system/netdata.service
+}
+
+pkg_postinst() {
+	if [[ -e "/sys/kernel/mm/ksm/run" ]]; then
+		if [[ "$( < /sys/kernel/mm/ksm/run )" != '1' ]]; then
+			elog "INFORMATION:"
+			echo
+			elog "I see you have kernel memory de-duper (called Kernel Same-page Merging,"
+			elog "or KSM) available, but it is not currently enabled."
+			echo
+			elog "To enable it run:"
+			echo
+			elog "echo 1 >/sys/kernel/mm/ksm/run"
+			elog "echo 1000 >/sys/kernel/mm/ksm/sleep_millisecs"
+			echo
+			elog "If you enable it, you will save 20-60% of netdata memory."
+		fi
+	else
+		elog "INFORMATION:"
+		echo
+		elog "I see you do not have kernel memory de-duper (called Kernel Same-page"
+		elog "Merging, or KSM) available."
+		echo
+		elog "To enable it, you need a kernel built with CONFIG_KSM=y"
+		echo
+		elog "If you can have it, you will save 20-60% of netdata memory."
+	fi
+
+	if ! use prefix; then
+		# This should be handled by FILECAPS, but wasn't... plus we want a
+		# fallback.
+		setcap cap_dac_read_search,cap_sys_ptrace+ep "${EROOT%/}"/usr/libexec/netdata/plugins.d/apps.plugin ||
+		chmod 4755 "${EROOT%/}"/usr/libexec/netdata/plugins.d/apps.plugin ||
+		eerror "Cannot set capabilities or SUID on '/usr/libexec/netdata/plugins.d/apps.plugin'"
+	fi
+}
diff --git a/net-analyzer/netdata/netdata-9999.ebuild b/net-analyzer/netdata/netdata-9999.ebuild
index 6917835b..7812e89d 100644
--- a/net-analyzer/netdata/netdata-9999.ebuild
+++ b/net-analyzer/netdata/netdata-9999.ebuild
@@ -43,6 +43,7 @@ esac
 
 DESCRIPTION="Linux real time system monitoring, done right!"
 HOMEPAGE="https://github.com/firehol/netdata https://my-netdata.io/"
+PATCHES=( "${FILESDIR}/${P}-openrc-fixes.patch" )
 
 LICENSE="GPL-3+ MIT BSD"
 SLOT="0"
@@ -126,6 +127,9 @@ src_configure() {
 src_install() {
 	default
 
+	# Remove unneeded .keep files
+	find "${ED}" -name ".keep" -delete || die
+
 	newdoc "${ED}"/usr/libexec/netdata/charts.d/README.md charts.md
 	newdoc "${ED}"/usr/libexec/netdata/plugins.d/README.md plugins.md
 
@@ -146,7 +150,6 @@ src_install() {
 
 	rm -r "${ED}"/usr/share/netdata/web/old
 	rm 2>/dev/null \
-		"${ED}"/var/log/netdata/.keep "${ED}"/var/cache/netdata/.keep \
 		"${ED}"/usr/libexec/netdata/charts.d/README.md \
 		"${ED}"/usr/libexec/netdata/node.d/README.md \
 		"${ED}"/usr/libexec/netdata/plugins.d/README.md