Merge updates from master

9 files changed, 146 insertions, 122 deletions

diff --git a/dev-qt/qtx11extras/qtx11extras-5.5.1.ebuild b/dev-qt/qtx11extras/qtx11extras-5.5.1.ebuild
index c5b1af07f6bb..05d245e2f549 100644
--- a/dev-qt/qtx11extras/qtx11extras-5.5.1.ebuild
+++ b/dev-qt/qtx11extras/qtx11extras-5.5.1.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Linux/X11-specific support library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm ~arm64 ~hppa ~ppc64 x86"
+	KEYWORDS="amd64 arm ~arm64 hppa ~ppc64 x86"
 fi
 
 IUSE=""
diff --git a/net-analyzer/argus-clients/Manifest b/net-analyzer/argus-clients/Manifest
index 60024d3424d8..ed81d83603ca 100644
--- a/net-analyzer/argus-clients/Manifest
+++ b/net-analyzer/argus-clients/Manifest
@@ -1 +1,2 @@
+DIST argus-clients-3.0.8.2.tar.gz 2776072 SHA256 32073a60ddd56ea8407a4d1b134448ff4bcdba0ee7399160c2f801a0aa913bb1 SHA512 20aac16bd6474b8f98c8fc86b21ad0b43aca62264c6de2f7f26eea876a90f7276cdaf2241a510a19ae445f40f5d0d05ec6a5869980b6889e6eb5937dbff0f855 WHIRLPOOL 87d13fdf38e5fef6901d11613c51abecb6862ae4a3d1e8eb318342dbc3a9289c2fbd8a4c5741a4f2cfc4597087f0a18d475494e53679a95d6ce732e271f4fbde
 DIST argus-clients-3.0.8.tar.gz 2627515 SHA256 aee8585d50959e00070a382f3121edfaa844a0a51dc0b73edf84c0f4eb8912c9 SHA512 79022b3c3e472ebc526b27c20c25ae97abdb9a363a91ebbe3baf405f2aba9bdd80fbc0250b444d3d7ab4488e3c1325389a4719e92d9aded7598a91c3309369c2 WHIRLPOOL 5147a80ade6beaa44029253807033b1257b0826631deba66cb1176d82919e7e454b5e95df453d15e5a0a6b9b6e09472ab84d21b06ae97e69fca4217028513849
diff --git a/net-analyzer/argus-clients/argus-clients-3.0.8.2.ebuild b/net-analyzer/argus-clients/argus-clients-3.0.8.2.ebuild
new file mode 100644
index 000000000000..1cf593af416b
--- /dev/null
+++ b/net-analyzer/argus-clients/argus-clients-3.0.8.2.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils toolchain-funcs
+
+DESCRIPTION="Clients for net-analyzer/argus"
+HOMEPAGE="http://www.qosient.com/argus/"
+SRC_URI="http://qosient.com/argus/dev/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug ft geoip mysql sasl tcpd"
+
+MY_CDEPEND="
+	net-analyzer/rrdtool[perl]
+	net-libs/libpcap
+	sys-libs/ncurses:=
+	sys-libs/readline:=
+	sys-libs/zlib
+	ft? ( net-analyzer/flow-tools )
+	geoip? ( dev-libs/geoip )
+	mysql? ( virtual/mysql )
+	sasl? ( dev-libs/cyrus-sasl )
+"
+
+RDEPEND="
+	${MY_CDEPEND}
+"
+
+DEPEND="
+	${MY_CDEPEND}
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-3.0.4.1-disable-tcp-wrappers-automagic.patch \
+		"${FILESDIR}"/${PN}-3.0.7.21-curses-readline.patch
+
+	sed -i -e 's| ar | $(AR) |g' common/Makefile.in || die
+	tc-export AR RANLIB
+
+	eautoreconf
+}
+
+src_configure() {
+	use debug && touch .debug
+	econf \
+		$(use_with ft libft) \
+		$(use_with geoip GeoIP /usr/) \
+		$(use_with sasl) \
+		$(use_with tcpd wrappers) \
+		$(use_with mysql)
+}
+
+src_compile() {
+	# racurses uses both libncurses and libtinfo, if present
+	emake \
+		CCOPT="${CFLAGS} ${LDFLAGS}" \
+		RANLIB=$(tc-getRANLIB) \
+		CURSESLIB="$( $(tc-getPKG_CONFIG) --libs ncurses)"
+}
+
+src_install() {
+	dobin bin/ra*
+	dodoc ChangeLog CREDITS README CHANGES
+	doman man/man{1,5}/*
+}
diff --git a/net-misc/apt-cacher-ng/Manifest b/net-misc/apt-cacher-ng/Manifest
index 3b6668c8d992..fb64886bac43 100644
--- a/net-misc/apt-cacher-ng/Manifest
+++ b/net-misc/apt-cacher-ng/Manifest
@@ -1,3 +1,2 @@
-DIST apt-cacher-ng_0.9.0.orig.tar.xz 299412 SHA256 db1557b615dc4dfd13cbe24cbcd474b5a6839f181785624b590551562edd7817 SHA512 3d8f05637fa15a89389a30e7bc9710085da65baa35138448990c078df1f9fc35ecca9d6c944d0c797dd8ef267ad1c98bf55dbfaa938105cf8cb58e7602b9f4eb WHIRLPOOL 5fe33ab86947bc1c4c27ccee05c3e87aa3ab0c6d2df00bda30f9108620ed998c7c303ce4cf31661dce9bf9f4dae10536e6523cd6844b6d4b9eaafeadf5ae97ff
-DIST apt-cacher-ng_0.9.1.orig.tar.xz 301440 SHA256 24994beac6ce1c51f97ce66f49ea68cac9e30a0162c5c0ae8a36bcb8ed34c8b4 SHA512 719b7ddb96fbcf0148554b0e6df61e35f7dcc7340e1269499f2055f9c7ee5000d9a27eab8dec823291f4cb7e8336ad1ff6aca97aca88adaff732c7429362a148 WHIRLPOOL 34fc54dc99353b331138cda08545bca95e9b06aed784fbf7337b16bf15178d019d5d7157499978e28e75a24a0fee869439ac43c781ba65557114ffffb05914e3
 DIST apt-cacher-ng_0.9.2.orig.tar.xz 303628 SHA256 926552658a4080c973335b20e2dc7066627a366e9728d28f5777b6630b09e072 SHA512 6e43f17a091e091f174665439cf2545c2859689e80ab7a67cf4ff1da57910336864cca024d0bd17e424fe021221259df9ed9a365ada9df2c6e4e7b5f5ea6749b WHIRLPOOL 2fc1875b9f4ea54db253a7258fd9a745ec2308d7f180ec0b4e8b8de98677f5c6fddf3f8fcc88e7c5165661c98d3c2b34ef45b27c0b6286d601f6d3679d711bb4
+DIST apt-cacher-ng_0.9.3.orig.tar.xz 306284 SHA256 8f3b3b0e0937eb6ef65e5d0a982beacddb2f1c75989a0dde4d3760f078a0a7ad SHA512 7b8d71e4b7d436c2f38fb8f0e2ad8e929f39db47e276be91af7250509020fdee07d5cb1c5852db25fb725bd11953729c8059ad9f8f897d12b5263942b93476b6 WHIRLPOOL cc3f550bfbbf5c9ba27423fd47bba393277fa6830e214aaa23376622e3386c6dbcb927fcef6c86ab67579325e1a873e24ca9888f23bdfdbbb8a4549ef5fda699
diff --git a/net-misc/apt-cacher-ng/apt-cacher-ng-0.9.1.ebuild b/net-misc/apt-cacher-ng/apt-cacher-ng-0.9.1.ebuild
deleted file mode 100644
index 9a99ab80732f..000000000000
--- a/net-misc/apt-cacher-ng/apt-cacher-ng-0.9.1.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit cmake-utils eutils toolchain-funcs user
-
-DESCRIPTION="Yet another implementation of an HTTP proxy for Debian/Ubuntu software packages written in C++"
-HOMEPAGE="
-	http://www.unix-ag.uni-kl.de/~bloch/acng/
-	http://packages.qa.debian.org/a/apt-cacher-ng.html
-"
-LICENSE="BSD-4 ZLIB public-domain"
-SLOT="0"
-SRC_URI="mirror://debian/pool/main/a/${PN}/${PN}_${PV}.orig.tar.xz"
-
-KEYWORDS="~amd64 ~x86"
-IUSE="doc fuse systemd tcpd"
-
-COMMON_DEPEND="
-	app-arch/bzip2
-	app-arch/xz-utils
-	sys-libs/zlib
-	systemd? (
-		sys-apps/systemd
-	)
-"
-DEPEND="
-	${COMMON_DEPEND}
-	dev-util/cmake
-	>sys-devel/gcc-4.8
-	virtual/pkgconfig
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	dev-lang/perl
-	fuse? ( sys-fs/fuse )
-	tcpd? ( sys-apps/tcp-wrappers )
-"
-
-S=${WORKDIR}/${P/_}
-
-pkg_pretend() {
-	if [[ $(gcc-major-version) -lt 4 ]]; then
-		die "GCC 4.8 or greater is required but you have $(gcc-major-version).$(gcc-minor-version)"
-	elif [[ $(gcc-major-version) = 4 ]] && [[ $(gcc-minor-version) -lt 8 ]]; then
-		die "GCC 4.8 or greater is required but you have $(gcc-major-version).$(gcc-minor-version)"
-	fi
-}
-
-pkg_setup() {
-	# add new user & group for daemon
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_configure(){
-	mycmakeargs="-DCMAKE_INSTALL_PREFIX=/usr"
-	if use fuse; then
-		mycmakeargs="-DHAVE_FUSE_25=yes ${mycmakeargs}"
-	else
-		mycmakeargs="-DHAVE_FUSE_25=no ${mycmakeargs}"
-	fi
-	if use tcpd; then
-		mycmakeargs="-DHAVE_LIBWRAP=yes ${mycmakeargs}"
-	else
-		mycmakeargs="-DHAVE_LIBWRAP=no ${mycmakeargs}"
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	pushd ${CMAKE_BUILD_DIR}
-	dosbin ${PN}
-	if use fuse; then
-		dobin acngfs
-	fi
-	popd
-
-	newinitd "${FILESDIR}"/initd-r1 ${PN}
-	newconfd "${FILESDIR}"/confd ${PN}
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/logrotate ${PN}
-
-	doman doc/man/${PN}*
-	if use fuse; then
-		doman doc/man/acngfs*
-	fi
-
-	# Documentation
-	dodoc README TODO VERSION INSTALL ChangeLog
-	if use doc; then
-		dodoc doc/*.pdf
-		dohtml doc/html/*
-		docinto examples/conf
-		dodoc conf/*
-	fi
-
-	# perl daily cron script
-	dosbin scripts/expire-caller.pl
-	exeinto /etc/cron.daily
-	newexe "${FILESDIR}"/cron.daily ${PN}
-
-	# default configuration
-	insinto /etc/${PN}
-	newins "${CMAKE_BUILD_DIR}"/conf/acng.conf ${PN}.conf
-	doins $( echo conf/* | sed 's|conf/acng.conf.in||g' )
-
-	keepdir /var/log/${PN}
-	# Some directories must exists
-	keepdir /var/log/${PN}
-	fowners -R ${PN}:${PN} \
-		/etc/${PN} \
-		/var/log/${PN}
-}
diff --git a/net-misc/apt-cacher-ng/apt-cacher-ng-0.9.0.ebuild b/net-misc/apt-cacher-ng/apt-cacher-ng-0.9.3.ebuild
index 9a99ab80732f..2fc058217e13 100644
--- a/net-misc/apt-cacher-ng/apt-cacher-ng-0.9.0.ebuild
+++ b/net-misc/apt-cacher-ng/apt-cacher-ng-0.9.3.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
 inherit cmake-utils eutils toolchain-funcs user
 
-DESCRIPTION="Yet another implementation of an HTTP proxy for Debian/Ubuntu software packages written in C++"
+DESCRIPTION="Yet another caching HTTP proxy for Debian/Ubuntu software packages"
 HOMEPAGE="
 	http://www.unix-ag.uni-kl.de/~bloch/acng/
 	http://packages.qa.debian.org/a/apt-cacher-ng.html
diff --git a/net-misc/iperf/Manifest b/net-misc/iperf/Manifest
index 573134bc2499..829b0fb7a7c1 100644
--- a/net-misc/iperf/Manifest
+++ b/net-misc/iperf/Manifest
@@ -1,3 +1,5 @@
 DIST iperf-2.0.5.tar.gz 248583 SHA256 636b4eff0431cea80667ea85a67ce4c68698760a9837e1e9d13096d20362265b SHA512 da9a0c01dea2a9dd33aa130b11d938d5f44dd6c3ab27526b0a43df5bf2550fede04238a00b7d54037426afe90ac6d8c4f4ae6861aa170ca7835b6664c9d6537f WHIRLPOOL d66b007fad372516c7f7377872b69ea450fa9ff6d1492f2a224a73f2fb3f7616bd2d57a34a815d4d95683d81fd02d76472d4727323e920410034ba725f6476ce
 DIST iperf-3.0.11.tar.gz 426434 SHA256 c774b807ea4db20e07558c47951df186b6fb1dd0cdef4282c078853ad87cc712 SHA512 292b826099a1fc813f2fbe4506f8bd8b3b2e4dde04e33a097cce966d7502b3c521a29b9ba74e55fe38406fdb85090695f59febbf4ca31bb1ffc801b3b7615d19 WHIRLPOOL e16799997d7e3c0abe2e2a93bd559a69c0d3c96aab954cd9fb4be93cc8ce4f38c7a2ced034b1b03b2dc257bd5c82d202b4da528ee11f86ed99890fb02cad4b04
+DIST iperf-3.0.12.tar.gz 432822 SHA256 280ecdb1b29b8c2dcb502f91be1575ac9e86cc3be198b3a009d8561f5b1bec89 SHA512 7b013e890b27482959a0e60e211ec53f717b895600047f553b34394d36276ba4bf8bcb2344b0c0f9d63ac57d84c597ff6ef316246d5e19fed1cac50f75c7118f WHIRLPOOL 0765e3b2f37cfb9c8124b81dec7157ac6f457cd43511be4c391defc1142e62d5f4a17a9b048dfdb1aca71f3f1bb8db77d7193ab88a4808039c64c0424524d4f7
 DIST iperf-3.1.2.tar.gz 545107 SHA256 48b5c783bb4a9c44f2bdcfe52c5d45b77ab1e1c82de3d0131f692457950811f9 SHA512 f0503e8dc77c575fe85f0800da9242da73c7d1ffce3aae0971f8fe7c5c3e74901ebdc3956bfe0bb58a5ffe4f6ccbe5a6d5402f188b0ceb1a02c410f5589a568d WHIRLPOOL 1537ba5a9e300b2b67ff42ba78fe97c09f99891feff6e2b66ec460dd1c12e29acdfee1e17b3af2d5a74aac17bd4bb635b0a268646b1117d5147dd8790ad77af9
+DIST iperf-3.1.3.tar.gz 549466 SHA256 e34cf60cffc80aa1322d2c3a9b81e662c2576d2b03e53ddf1079615634e6f553 SHA512 67795d9d5b4fc719b3fbbc2683cbe2777412bb7212282a50a378f5bb3793c3c17e278d22816fd9d289b2606ce97624d496ba236e3686ce1a31b9f1d6e6f474e9 WHIRLPOOL 0082f5156df751cbed49e86f794a48ff05857cd7cd4ee3bdb57f4df763a323d84f47d9e0b01e0b5932ae1e065bcf8ac706e6b96b6ac5ecee2daad6615ca4f38d
diff --git a/net-misc/iperf/iperf-3.0.12.ebuild b/net-misc/iperf/iperf-3.0.12.ebuild
new file mode 100644
index 000000000000..c622ad7f5615
--- /dev/null
+++ b/net-misc/iperf/iperf-3.0.12.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils
+
+DESCRIPTION="A TCP, UDP, and SCTP network bandwidth measurement tool"
+LICENSE="BSD"
+SLOT="3"
+HOMEPAGE="https://github.com/esnet/iperf/"
+SRC_URI="https://codeload.github.com/esnet/${PN}/tar.gz/${PV} -> ${P}.tar.gz"
+KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint"
+IUSE="static-libs"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-3.0.5-flags.patch
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	prune_libtool_files
+}
diff --git a/net-misc/iperf/iperf-3.1.3.ebuild b/net-misc/iperf/iperf-3.1.3.ebuild
new file mode 100644
index 000000000000..67636123ecdf
--- /dev/null
+++ b/net-misc/iperf/iperf-3.1.3.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit autotools eutils
+
+DESCRIPTION="A TCP, UDP, and SCTP network bandwidth measurement tool"
+LICENSE="BSD"
+SLOT="3"
+HOMEPAGE="https://github.com/esnet/iperf/"
+SRC_URI="https://codeload.github.com/esnet/${PN}/tar.gz/${PV/_beta/b} -> ${P}.tar.gz"
+KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint"
+IUSE="static-libs sctp"
+
+DEPEND="sctp? ( net-misc/lksctp-tools )"
+RDEPEND="$DEPEND"
+
+S=${WORKDIR}/${P/_beta/b}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-3.0.5-flags.patch
+
+	eapply_user
+
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	newconfd "${FILESDIR}"/iperf.confd iperf3
+	newinitd "${FILESDIR}"/iperf3.initd iperf3
+	prune_libtool_files
+}