Add net-analyzer/netdata-1.3.0, net-analyzer/netdata-1.4.0-r1, net-analyzer/netdata-1.5.0, net-analyzer/netdata-1.6.0, net-analyzer/netdata-1.7.0, update net-analyzer/netdata-1.2.0-r1, net-analyzer/netdata-9999

10 files changed, 613 insertions, 36 deletions

diff --git a/net-analyzer/netdata/Manifest b/net-analyzer/netdata/Manifest
index 76b1f5f1..9a51d35b 100644
--- a/net-analyzer/netdata/Manifest
+++ b/net-analyzer/netdata/Manifest
@@ -1,4 +1,15 @@
-AUX netdata.initd 2378 SHA256 b7be86b106e450ac3cdeffb7799056963e8243f73a4e6c91e047611f5ba57baf SHA512 b1c5f214930cb40d06715b31b4a30ece9eab873541faca9f86d3ab946f7648cd363fc63f1809264be8d8e8705a621b936ca94c549978e5692244a476182f323f WHIRLPOOL ab90989c693bfa6697c100341330d3167554a65c3dfc91c9187029c40773ced303e0068c96d5401a2cfb754e843a0780f31ce17dfa6a61126e5b1b7646a2e2c1
-DIST netdata-1.2.0.tar.xz 1254000 SHA256 5c1ff3fe0501b654cd92dbba3fe4c0fc125736b58d604340f138df80fb1de1ce SHA512 0c43e89c7cb52a5dde2aec13b06496ffb70fcb1952cf74156bd4400f3520b4136a94b5390077a4e5e3278a8e175dcc14505a456efafec5fdf0759af4846e03f4 WHIRLPOOL 211fabbecfd4b0ffe8f6fb5dbdc28cf08a743c4544e29dd500187547107500c1b42a95677d8de746cce367d4a59c17ff29328c47b0de65208004e6de65d63277
-EBUILD netdata-1.2.0-r1.ebuild 4087 SHA256 e38c67642e1abc0ae06c96e1a496cb2bc41d177d324518fcc2801464eb14c5f7 SHA512 e3868c887a1992fa2ae1a8ffcf7e51b97ca64f76ce0341d6d3064ae5c5f9d29177872c8790f776eabd994dd3c712471578fdd350891c3c94b4f6fb63f425b0c6 WHIRLPOOL 65333276e894fc762ea032f5070bc3b7256175a97b2d87cc1938f4a15e469b4bb54d21b796cd33d22d04eb7b5aa0b7b5f68b85d843ddddc9964d09a31e9dfffe
-EBUILD netdata-9999.ebuild 5154 SHA256 a13d92b0f644b276feb579ab2d1d3f8f6c58e30323716cbbf6665ce33338bc15 SHA512 f2827fcb92b0ce077cfdbd99fdb329d78724c4ff9775d0967876c7c316952b9ba497927a45bca234b040b527da68b174b62eca54c38cb427b57d6b531c5422e4 WHIRLPOOL f7e734ba2ef0d69416220d9386c8010521ad99b274e6378dd475cabd29c819374cd537b08cb0a4514982db8dd0fcd8c978a256d8524ca424b86646c19d7543ef
+AUX netdata-1.4.0-glibc-sysmacros.patch 560 SHA256 3dfd873d8faf9e7578f27c00294b31f3ad4749e2443d74f8fdf3dff65b492055 SHA512 58af1778c9fce5333e984a1a0d8612da4455596f72e6343a656d4aaaa8d6a0809cb2b02647cbdfaef61776a657282583e298a3d5bd555ea9d7d9ee09b819e787 WHIRLPOOL fbba339d641681f23fd25748635c693e1469f05bd9a51314236ef5782eec1c65529268eb18020408ff7a79685915f4ea76ff7b3afde31569cf94d1eb916c87e1
+AUX netdata.initd 2391 SHA256 502570a2fb66bd3c3ec0f99907021b01f754ae70d9c72a5e2e050fb561ffe20c SHA512 869b0e877a605e4a5f7f60b56ce5328973cc72b6feaabee8d47919f1c43aaa66716ef6d6d1e8111366318eeea67b299df7b54dc9aa1432f16f5ae4892b6b6152 WHIRLPOOL c1ce8316bfc9653ce2336e54656f2d6ebc11ccf509f110a0a0dfca95f8beb22a7b592cebbcebb303f930be21cbb20319d17a296c3b9731f5b31a87dab9e792f4
+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
+DIST netdata-1.4.0.tar.gz 2051113 SHA256 4926e39894df9e37021f9811605be0dc16c220039cd5ee3e34148353e0f09b1b SHA512 bb20c80b064d69d7fbb0f1bace0ba8eef462b1cdaebbde8697dea960e09b34c76f57eb907f1ace3413932716d24598251efeeb17cbeffb6a083c88b7322c925b WHIRLPOOL bcf40f77ca2624c38b5278129b0b3c6727523693929dbb01fa80e59438ffc54ac94c6e50719cc2e969115aa284b16f41e9213f21033fed39d8a32e3e59c46f6c
+DIST netdata-1.5.0.tar.gz 2257299 SHA256 8f66e40ba72ebf5c6e478197eaee3099823fd6380c0870b201f53b5423945338 SHA512 54477c0f9fe2c920580e2e6c3f6c12828f3be2c3dfc1fee47ad98cab51ae3652cb3f223413e9de9399487a35ce844d502ce12fbf615102c0e1962b7dc96a9d95 WHIRLPOOL 2a57636b8ddc6991b6ce18fdb4be73fbd4f658ae0e152eb3c50400c062df87931b3d43b04a31b3857753f7d9ae2ea1a0e62c5235088e20629df1b95abfaf8821
+DIST netdata-1.6.0.tar.gz 2526589 SHA256 960dae3038be1aaf69fe1d1908d898f9a0c535a88362437772170a2979c1740b SHA512 9514fd320fc944897961f9581c123f37fb956dc3ae324a879744fabb0d853e8c6a1d62faf7a486f89a0507b2179f746e8dd0943443eb4744311e905a8c06aed6 WHIRLPOOL f90ca525817dbc3be9b18b8629c8093a32bb642e3d32fff77caf347aa7a6e48ce7b127b87fca43e99db62b7db8f0c2f6e8b4f61f3970256bf75fce6f59cc6977
+DIST netdata-1.7.0.tar.gz 2646936 SHA256 ad57facc58f97f03cd2390ba2ffd253807fb641ec1afc390a81a4e4809287095 SHA512 f7204d77963c06c010b91fb9df47b79cc03070a730f0c09d599a0ec606510f449bab3c8429db2df1494e4cee330c2229300de010c3ec705fe91376d92adf48fd WHIRLPOOL 845b551aab019247b06612d769075b0dee5c4440f3cf2c8d46752f7ccb42b4d9db75d0cfa25279f72ebaf7230d6525e62012d583cba61a12f89fd5df7175a958
+EBUILD netdata-1.2.0-r1.ebuild 4101 SHA256 07d67cf03faffc23cecdb44df0420bd2cb4d5879a252584a1d58eddb21b6fc81 SHA512 32bcd5ff8e2c9c353686d5dfca76632864e4afbef7638e501cea324187fcd1b4fb8476b8c3a6075b9b5992c128881bf4a176d8aaef6fd185584962739d33a718 WHIRLPOOL d8958b202a51cff3720479033cc794ce27ca63fd26387a6c3ba245a0caddd0ab6940de8824d0eafc9a8e5dd584560a3eaec5ee8bc6104890f339ebb81b4a8446
+EBUILD netdata-1.3.0.ebuild 4605 SHA256 c1d3a96ccc8fe1b0d308853bc27b28719f5b7df47ffba3613cf5e138c11de661 SHA512 557d157147d5c76e10145b714e0c9b19e58ecf1bfc21179727892c75375dd0c60375501b12ca9bddcbae8667ff95b209f872e6078394c67970c9b0e43c2542f6 WHIRLPOOL 1ce4ee7fa76d76174a55d88c705086cdc81bd4c60ad35aa82f04768ecb83d83be819c056af90259d476af7c0defd52ed7b28cdd4fc56f933b78412cd129cbc14
+EBUILD netdata-1.4.0-r1.ebuild 4795 SHA256 7e4161b6fa5f82169233cdaef19057ab2e97f716d7d2429f9974c83e465cf911 SHA512 aaec94a718e24c96d5a37a64db490c3e336722c2fe34cb50d9ecf852ee21d84dc930b5cb65a30a371f94337b532ef7d526355ce851ee6af73310d7e94623c935 WHIRLPOOL c87ba7616f394547fec5a6e21a447d3b51793b6a7bd3e9ade59c20b5501d9b3d4223e9e7064cf2c0d66e51e7d5afc40d6a689af6b2d25d628d547ad4c7343449
+EBUILD netdata-1.5.0.ebuild 4871 SHA256 1f5eb32dd03dcf60c73d0ebe49344eb5ff83660d301142af9e2b4c68d6a24127 SHA512 ebaf93650737505e06897307f4b7a9f0feac2f5282e6e0f89a2e882320e1b3f0f73975cc2a7bcb0e57f3d561e0c5e915d5edc8c2e1fadf22f696d415a6d821f8 WHIRLPOOL ecda35ad8b44975c5d3c0c0c937cf848b4f4d5a0d40412b11edb43eaf6d60589da2a0e9db66c491793bc0171941e2a0e0e7ecfb3bd82c724bdd0ca76b1650d71
+EBUILD netdata-1.6.0.ebuild 5163 SHA256 f9b629ba2428a8fd239621e6e9c01ac1077fc51dcd51cd85b9b8acddae80e9e4 SHA512 a75fa9e9b86aff3ea91cbfeec7dfcbcd207ff1ef250d457e2bde2e7ec7974862e3deaab8f32d1db4ddb39d4121eaf9d5ec3c7103e4a3d5e7d0d1d71079c80359 WHIRLPOOL 9ce148f4e57f499c12c6c3e1de81f5e003dd1dd27a4be8e220a96adaf002da812d1500aad4260e77185d96bc9c8828335f5840798da6254582b66218f8d3849d
+EBUILD netdata-1.7.0.ebuild 5163 SHA256 f9b629ba2428a8fd239621e6e9c01ac1077fc51dcd51cd85b9b8acddae80e9e4 SHA512 a75fa9e9b86aff3ea91cbfeec7dfcbcd207ff1ef250d457e2bde2e7ec7974862e3deaab8f32d1db4ddb39d4121eaf9d5ec3c7103e4a3d5e7d0d1d71079c80359 WHIRLPOOL 9ce148f4e57f499c12c6c3e1de81f5e003dd1dd27a4be8e220a96adaf002da812d1500aad4260e77185d96bc9c8828335f5840798da6254582b66218f8d3849d
+EBUILD netdata-9999.ebuild 5163 SHA256 f9b629ba2428a8fd239621e6e9c01ac1077fc51dcd51cd85b9b8acddae80e9e4 SHA512 a75fa9e9b86aff3ea91cbfeec7dfcbcd207ff1ef250d457e2bde2e7ec7974862e3deaab8f32d1db4ddb39d4121eaf9d5ec3c7103e4a3d5e7d0d1d71079c80359 WHIRLPOOL 9ce148f4e57f499c12c6c3e1de81f5e003dd1dd27a4be8e220a96adaf002da812d1500aad4260e77185d96bc9c8828335f5840798da6254582b66218f8d3849d
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
new file mode 100644
index 00000000..7722af2e
--- /dev/null
+++ b/net-analyzer/netdata/files/netdata-1.4.0-glibc-sysmacros.patch
@@ -0,0 +1,21 @@
+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/files/netdata.initd b/net-analyzer/netdata/files/netdata.initd
index bb77cfda..e5d8fe1c 100755
--- a/net-analyzer/netdata/files/netdata.initd
+++ b/net-analyzer/netdata/files/netdata.initd
@@ -26,7 +26,7 @@ pidfile="/var/run/netdata.pid"
 config_dir="${NETDATA_INSTALL_PATH:-}/etc/netdata"
 command="${NETDATA_INSTALL_PATH:-}/usr/sbin/netdata"
 command_background="yes"
-command_args="-pidfile ${pidfile} ${NETDATA_EXTRA_ARGS}"
+command_args="-P ${pidfile} ${NETDATA_EXTRA_ARGS}"
 # start_stop_daemon_args="-u ${NETDATA_OWNER}"
 start_stop_daemon_args=""
 
@@ -34,30 +34,33 @@ depend() {
 	use logger
 	need net
 	after ${NETDATA_START_AFTER_SERVICES}
+}
 
+start_pre() {
 	checkpath -o "${NETDATA_OWNER}" -d /var/log/netdata /var/cache/netdata /var/run/netdata
+	return ${?}
 }
 
 start_post() {
-	local -i ret=1
+	local -i rc=0
 
 	if ! [ -f "${config_dir}"/netdata.conf ]; then
 		ebegin "Downloading default configuration to '${config_dir}/netdata.conf'"
 		#sleep 2
 		curl -s -o "${config_dir}"/netdata.conf.new "${NETDATA_CONFIG_URL}"
-		ret=$?
-		if [ 0 -eq ${ret} ] && [ -s "${config_dir}"/netdata.conf.new ]; then
+		rc=$?
+		if [ 0 -eq ${rc} ] && [ -s "${config_dir}"/netdata.conf.new ]; then
 			mv "${config_dir}"/netdata.conf{.new,}
 		else
-			ret=1
+			rc=1
 			rm "${config_dir}"/netdata.conf.new 2>/dev/null
 		fi
-		eend ${ret}
+		eend ${rc}
 	fi
 }
 
 stop_post() {
-	local -i ret=1 count=0 sigkill=0
+	local -i rc=1 count=0 sigkill=0
 
 	ebegin "Waiting for netdata to save its database"
 	while [ -f "${pidfile}" ]; do
@@ -67,9 +70,9 @@ stop_post() {
 		fi
 
 		: $(( count += 1 ))
-		kill -0 "$( cat "${pidfile}" )" 2>/dev/null
-		ret=${?}
-		[ 0 -eq ${ret} ] && sleep 1
+		kill -0 "$( < "${pidfile}" )" 2>/dev/null
+		rc=${?}
+		[ 0 -eq ${rc} ] && sleep 1
 	done
 	eend ${sigkill}
 
diff --git a/net-analyzer/netdata/netdata-1.2.0-r1.ebuild b/net-analyzer/netdata/netdata-1.2.0-r1.ebuild
index e8027be8..0ee18852 100644
--- a/net-analyzer/netdata/netdata-1.2.0-r1.ebuild
+++ b/net-analyzer/netdata/netdata-1.2.0-r1.ebuild
@@ -1,19 +1,16 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id: ad8fb330313856814c3d6522e4509d28ce5a420d $
 
 EAPI=6
 
-inherit linux-info systemd user fcaps
+inherit autotools fcaps linux-info systemd user
 
-if [[ ${PV} == "9999" ]] ; then
+if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/firehol/${PN}.git"
-	inherit git-r3 autotools
-	SRC_URI=""
-	KEYWORDS=""
+	inherit git-r3
 else
-	SRC_URI="https://firehol.org/download/${PN}/releases/v${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 x86"
+	SRC_URI="https://github.com/firehol/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
 	RESTRICT="mirror"
 fi
 
@@ -42,10 +39,8 @@ RDEPEND="
 		net-firewall/nfacct
 		net-libs/libmnl
 	)
-	nodejs? (
-		net-libs/nodejs
-	)
-"
+	nodejs? ( net-libs/nodejs )
+	"
 
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
@@ -71,12 +66,13 @@ pkg_setup() {
 
 src_prepare() {
 	default
-	[[ ${PV} == "9999" ]] && eautoreconf
+
+	eautoreconf
 }
 
 src_configure() {
 	econf \
-		--localstatedir="/var" \
+		--localstatedir="${EPREFIX}"/var \
 		--with-user="${NETDATA_USER}" \
 		$(use_enable nfacct plugin-nfacct) \
 		$(use_with compression zlib)
@@ -85,12 +81,12 @@ src_configure() {
 src_install() {
 	default
 
-	cat >> "${T}"/"${PN}"-sysctl <<- EOF
+	cat >> "${T}"/"${PN}".sysctl.conf <<- EOF
 	kernel.mm.ksm.run = 1
 	kernel.mm.ksm.sleep_millisecs = 1000
 	EOF
 
-	dodoc "${T}"/"${PN}"-sysctl
+	dodoc "${T}"/"${PN}".sysctl.conf
 	newdoc "${ED}"/usr/libexec/netdata/charts.d/README.md charts.md
 	newdoc "${ED}"/usr/libexec/netdata/plugins.d/README.md plugins.md
 
@@ -104,7 +100,7 @@ src_install() {
 		fi
 	fi
 
-	use nodejs || rm -r "${ED}"//usr/libexec/netdata/node.d
+	use nodejs || rm -r "${ED}"/usr/libexec/netdata/node.d
 
 	rm -r "${ED}"/usr/share/netdata/web/old
 	rm 2>/dev/null \
@@ -114,8 +110,12 @@ src_install() {
 		"${ED}"/usr/libexec/netdata/plugins.d/README.md
 	rmdir -p "${ED}"/var/log/netdata "${ED}"/var/cache/netdata 2>/dev/null
 
-	fowners -R "${NETDATA_USER}":"${NETDATA_GROUP}" /usr/share/"${PN}" || die
+	fowners -Rc root:"${NETDATA_GROUP}" /usr/share/"${PN}"/web || die
+
+	insinto /etc/netdata
+	doins system/netdata.conf
 
+	#newinitd system/netdata-openrc "${PN}"
 	newinitd "${FILESDIR}"/"${PN}".initd "${PN}"
 	use systemd && systemd_dounit system/netdata.service
 }
@@ -135,7 +135,7 @@ pkg_postinst() {
 			echo
 			elog "If you enable it, you will save 20-60% of netdata memory."
 			echo
-			elog "You may copy /usr/share/doc/${PF}/${PN}-sysctl to"
+			elog "You may copy /usr/share/doc/${PF}/${PN}.sysctl.conf to"
 			elog "/etc/sysctl.d/${PN}.conf in order to activate this change"
 			elog "automatically upon reboot."
 		fi
diff --git a/net-analyzer/netdata/netdata-1.3.0.ebuild b/net-analyzer/netdata/netdata-1.3.0.ebuild
new file mode 100644
index 00000000..8558bb9c
--- /dev/null
+++ b/net-analyzer/netdata/netdata-1.3.0.ebuild
@@ -0,0 +1,174 @@
+# 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
+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"
+		;;
+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="+compression mysql nfacct nodejs +python systemd"
+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-libs/libmnl
+	net-misc/curl
+	net-misc/wget
+	virtual/awk
+	compression? ( sys-libs/zlib )
+	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}]
+			)
+		)
+	)"
+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_with compression zlib)
+}
+
+src_install() {
+	default
+
+	cat >> "${T}"/"${PN}".sysctl.conf <<- EOF
+	kernel.mm.ksm.run = 1
+	kernel.mm.ksm.sleep_millisecs = 1000
+	EOF
+
+	dodoc "${T}"/"${PN}".sysctl.conf
+	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
+
+	use nodejs || rm -r "${ED}"/usr/libexec/netdata/node.d
+
+	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
+
+	fowners -Rc root:"${NETDATA_GROUP}" /usr/share/"${PN}"/web || die
+
+	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."
+			echo
+			elog "You may copy /usr/share/doc/${PF}/${PN}.sysctl.conf to"
+			elog "/etc/sysctl.d/${PN}.conf in order to activate this change"
+			elog "automatically upon reboot."
+		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
+
+}
diff --git a/net-analyzer/netdata/netdata-1.4.0-r1.ebuild b/net-analyzer/netdata/netdata-1.4.0-r1.ebuild
new file mode 100644
index 00000000..2b0ff377
--- /dev/null
+++ b/net-analyzer/netdata/netdata-1.4.0-r1.ebuild
@@ -0,0 +1,182 @@
+# 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
+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"
+		;;
+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="+compression mysql nfacct nodejs +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-libs/libmnl
+	net-misc/curl
+	net-misc/wget
+	virtual/awk
+	compression? ( sys-libs/zlib )
+	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}]
+			)
+		)
+	)"
+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'
+)
+
+PATCHES=(
+	"${FILESDIR}"/"${P}"-glibc-sysmacros.patch
+)
+
+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 cpu_flags_x86_sse2 x86-sse) \
+		$(use_with compression zlib)
+}
+
+src_install() {
+	default
+
+	cat >> "${T}"/"${PN}".sysctl.conf <<- EOF
+	kernel.mm.ksm.run = 1
+	kernel.mm.ksm.sleep_millisecs = 1000
+	EOF
+
+	dodoc "${T}"/"${PN}".sysctl.conf
+	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
+
+	use nodejs || rm -r "${ED}"/usr/libexec/netdata/node.d
+
+	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
+
+	fowners -Rc root:"${NETDATA_GROUP}" /usr/share/"${PN}"/web || die
+
+	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."
+			echo
+			elog "You may copy /usr/share/doc/${PF}/${PN}.sysctl.conf to"
+			elog "/etc/sysctl.d/${PN}.conf in order to activate this change"
+			elog "automatically upon reboot."
+		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
+
+}
diff --git a/net-analyzer/netdata/netdata-1.5.0.ebuild b/net-analyzer/netdata/netdata-1.5.0.ebuild
new file mode 100644
index 00000000..a3572df4
--- /dev/null
+++ b/net-analyzer/netdata/netdata-1.5.0.ebuild
@@ -0,0 +1,182 @@
+# 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
+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"
+		;;
+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="+compression 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-libs/libmnl
+	net-misc/curl
+	net-misc/wget
+	virtual/awk
+	compression? ( sys-libs/zlib )
+	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"
+
+# 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 cpu_flags_x86_sse2 x86-sse) \
+		$(use_with compression zlib)
+}
+
+src_install() {
+	default
+
+	cat >> "${T}"/"${PN}".sysctl.conf <<- EOF
+	kernel.mm.ksm.run = 1
+	kernel.mm.ksm.sleep_millisecs = 1000
+	EOF
+
+	dodoc "${T}"/"${PN}".sysctl.conf
+	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
+
+	use nodejs || rm -r "${ED}"/usr/libexec/netdata/node.d
+
+	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
+
+	fowners -Rc root:"${NETDATA_GROUP}" /usr/share/"${PN}"/web || die
+
+	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."
+			echo
+			elog "You may copy /usr/share/doc/${PF}/${PN}.sysctl.conf to"
+			elog "/etc/sysctl.d/${PN}.conf in order to activate this change"
+			elog "automatically upon reboot."
+		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
+
+}
diff --git a/net-analyzer/netdata/netdata-1.6.0.ebuild b/net-analyzer/netdata/netdata-1.6.0.ebuild
new file mode 120000
index 00000000..54fa40f5
--- /dev/null
+++ b/net-analyzer/netdata/netdata-1.6.0.ebuild
@@ -0,0 +1 @@
+netdata-9999.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
new file mode 120000
index 00000000..54fa40f5
--- /dev/null
+++ b/net-analyzer/netdata/netdata-1.7.0.ebuild
@@ -0,0 +1 @@
+netdata-9999.ebuild
\ No newline at end of file
diff --git a/net-analyzer/netdata/netdata-9999.ebuild b/net-analyzer/netdata/netdata-9999.ebuild
index 8eda0062..147308aa 100644
--- a/net-analyzer/netdata/netdata-9999.ebuild
+++ b/net-analyzer/netdata/netdata-9999.ebuild
@@ -3,6 +3,7 @@
 
 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
 
@@ -102,7 +103,8 @@ pkg_setup() {
 
 src_prepare() {
 	default
-	[[ ${PV} == "9999" ]] && eautoreconf
+
+	eautoreconf
 }
 
 src_configure() {
@@ -147,7 +149,7 @@ src_install() {
 		"${ED}"/usr/libexec/netdata/plugins.d/README.md
 	rmdir -p "${ED}"/var/log/netdata "${ED}"/var/cache/netdata 2>/dev/null
 
-	fowners -R "${NETDATA_USER}":"${NETDATA_GROUP}" /usr/share/"${PN}" || die
+	fowners -Rc root:"${NETDATA_GROUP}" /usr/share/"${PN}"/web || die
 
 	insinto /etc/netdata
 	doins system/netdata.conf