commit: 3c23603512cc46d0e83821776b1a78982e1094e0 Author: Craig Andrews <candrews <AT> integralblue <DOT> com> AuthorDate: Mon Mar 20 19:53:22 2017 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Fri Mar 24 16:56:04 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c236035
net-analyzer/netdata: version bump 1.6.0 Package-Manager: Portage-2.3.5, Repoman-2.3.2 Closes: https://github.com/gentoo/gentoo/pull/4264 net-analyzer/netdata/Manifest | 1 + net-analyzer/netdata/metadata.xml | 1 + .../{netdata-9999.ebuild => netdata-1.6.0.ebuild} | 44 +++++++++++----------- net-analyzer/netdata/netdata-9999.ebuild | 44 +++++++++++----------- 4 files changed, 48 insertions(+), 42 deletions(-) diff --git a/net-analyzer/netdata/Manifest b/net-analyzer/netdata/Manifest index 10e5d742a4b..0d7c1bd87ad 100644 --- a/net-analyzer/netdata/Manifest +++ b/net-analyzer/netdata/Manifest @@ -2,3 +2,4 @@ DIST netdata-1.2.0.tar.xz 1254000 SHA256 5c1ff3fe0501b654cd92dbba3fe4c0fc125736b DIST netdata-1.3.0.tar.xz 1647708 SHA256 bad5d259467ae42ceb0cf5f03fc4b37d094a81f21a772477e6ccc5b8a778bf15 SHA512 0e96f12cbeb7aeecb07b885a0f10940022741633e5cfd76d9f79c9efe3bce2583d96ae18995831fc48d6724f65357929dc5a4220521230ecfb8517f15e779217 WHIRLPOOL 85b87fc6ec76a0255732613606fd4d3000870252c84dbd7be51a2b0132d4d1875d38b61085daeb3ea4e31e522b5e86e05bacf3eb57895ca718cd58501b995955 DIST netdata-1.4.0.tar.xz 1801440 SHA256 22e293aae156759d220b36ff02fa496548e7386cb4ee53df660fde57418e69ea SHA512 b5f60931372f0c6a437d1340bd9bb07557d8a9ffb478381715495c09c9b9bcf71f287c2e47be40945149a268e0f666289c75cc4eb1d1ab6fc73988f6b71daaf3 WHIRLPOOL ae70a9bca7bf107610e4a81b71f1728a5ffb0721e1c5d53bd2025b8897dbdd6c3569b58bd285e2961243f7d1b501b8ea69c258b5b266ee0bdf04092f62fee249 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 diff --git a/net-analyzer/netdata/metadata.xml b/net-analyzer/netdata/metadata.xml index a48e8d1bd94..13484c54ae1 100644 --- a/net-analyzer/netdata/metadata.xml +++ b/net-analyzer/netdata/metadata.xml @@ -11,6 +11,7 @@ </maintainer> <use> <flag name="compression">Enable compression via zlib</flag> + <flag name="ipmi">Install <pkg>sys-apps/ipmitool</pkg> required for monitoring IPMI sensors.</flag> <flag name="nfacct">Enable the nfacct plugin</flag> <flag name="nodejs">Enable use of nodejs (which some plugins use)</flag> </use> diff --git a/net-analyzer/netdata/netdata-9999.ebuild b/net-analyzer/netdata/netdata-1.6.0.ebuild similarity index 78% copy from net-analyzer/netdata/netdata-9999.ebuild copy to net-analyzer/netdata/netdata-1.6.0.ebuild index f23d6499dcd..63f879951fa 100644 --- a/net-analyzer/netdata/netdata-9999.ebuild +++ b/net-analyzer/netdata/netdata-1.6.0.ebuild @@ -2,15 +2,13 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=6 -PYTHON_COMPAT=( python{2_7,3_4,3_5} ) +PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) inherit autotools fcaps linux-info python-r1 systemd user -if [[ ${PV} == "9999" ]] ; then +if [[ ${PV} == *9999 ]] ; then EGIT_REPO_URI="git://github.com/firehol/${PN}.git" inherit git-r3 - SRC_URI="" - KEYWORDS="" else SRC_URI="https://github.com/firehol/netdata/archive/v${PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="~amd64 ~x86" @@ -21,39 +19,42 @@ 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" +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 - net-libs/libmnl - || ( net-analyzer/netcat6 net-analyzer/netcat ) - net-analyzer/tcpdump - net-analyzer/traceroute + 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}] + || ( + dev-python/mysqlclient[${PYTHON_USEDEP}] + dev-python/mysql-python[${PYTHON_USEDEP}] + ) ) - ) - nfacct? ( - net-firewall/nfacct - net-libs/libmnl - ) - nodejs? ( - net-libs/nodejs + postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] ) )" - DEPEND="${RDEPEND} virtual/pkgconfig" @@ -81,6 +82,7 @@ src_configure() { --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) } diff --git a/net-analyzer/netdata/netdata-9999.ebuild b/net-analyzer/netdata/netdata-9999.ebuild index f23d6499dcd..63f879951fa 100644 --- a/net-analyzer/netdata/netdata-9999.ebuild +++ b/net-analyzer/netdata/netdata-9999.ebuild @@ -2,15 +2,13 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=6 -PYTHON_COMPAT=( python{2_7,3_4,3_5} ) +PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) inherit autotools fcaps linux-info python-r1 systemd user -if [[ ${PV} == "9999" ]] ; then +if [[ ${PV} == *9999 ]] ; then EGIT_REPO_URI="git://github.com/firehol/${PN}.git" inherit git-r3 - SRC_URI="" - KEYWORDS="" else SRC_URI="https://github.com/firehol/netdata/archive/v${PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="~amd64 ~x86" @@ -21,39 +19,42 @@ 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" +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 - net-libs/libmnl - || ( net-analyzer/netcat6 net-analyzer/netcat ) - net-analyzer/tcpdump - net-analyzer/traceroute + 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}] + || ( + dev-python/mysqlclient[${PYTHON_USEDEP}] + dev-python/mysql-python[${PYTHON_USEDEP}] + ) ) - ) - nfacct? ( - net-firewall/nfacct - net-libs/libmnl - ) - nodejs? ( - net-libs/nodejs + postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] ) )" - DEPEND="${RDEPEND} virtual/pkgconfig" @@ -81,6 +82,7 @@ src_configure() { --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) }
