Merge updates from master

11 files changed, 176 insertions, 173 deletions

diff --git a/dev-lang/erlang/Manifest b/dev-lang/erlang/Manifest
index 5e536f82ac1c..4e57d4826054 100644
--- a/dev-lang/erlang/Manifest
+++ b/dev-lang/erlang/Manifest
@@ -1,15 +1,12 @@
-DIST otp_doc_html_17.5.tar.gz 33510258 SHA256 baba1d373c1faacf4a1a6ec1220d57d0cb2b977edb74f32cd58dc786361c6cf5 SHA512 d3e455452e6d6e241c40de6e41a7b1069f8daa45c8d2340adb62f8867948261692c8465db7e288378942ebe86fd938847756992600da93aa99cb294fadcb5211 WHIRLPOOL 9657c1fd133fa713d0f30bae0394f47f43b090149ec3457a177bd9f129c052b73f1e757762ced02c1c8bcbaec294e845859b18b0e2004429e04df8e04e36cade
 DIST otp_doc_html_18.3.tar.gz 34285271 SHA256 8fd6980fd05367735779a487df107ace7c53733f52fbe56de7ca7844a355676f SHA512 0ac429f67ca9ae7f235cda72eb0f4e5b0b43ae90b70c706aeea08be0ad88968677ccc80eb1ba006e90c9f024de586ffd91741d4cef4d614d1dfac51b407d2659 WHIRLPOOL 7d64c2ec433b4bc2da4c56290ad6d21b85d15f72fe9b78654955d27e65b26e1b929d0c9b7d5f60c25c1f16db8d22e36c2ad6ca2a75044707ccd1eea1197fa15d
-DIST otp_doc_html_19.0.tar.gz 34550919 SHA256 b6f7c4e964673333f6c3eea8530dd988b41339b8912ae293f6f1b429489159ff SHA512 51d6da443d028fe533f12e2f2b8e12cb301977bc91cdf08530d1db53b707d60bf8ef8319b23d85ad1efbd5aaf08910b2f2a99e961b772a47e9647a03166f7d9f WHIRLPOOL 22ccd960ca4258a8afed3e68d6d3f7ef37842fd92c224f2cf6d942fcafee2539e7f91984286988b2f2bca63cb71cc8f8100e3d7f3df497f8d1d3bbeff5f6ffdd
 DIST otp_doc_html_19.1.tar.gz 34624316 SHA256 76c89aee1ac69b5107114b0065189101e3f42d53e929d8ef8f08b5c586f15930 SHA512 2c6448af0be4bf35427950aca82eac3aac7554575ba07a8ba8942c27e1eb668461fde00604c3be28fbaca8a1e28ee4861608e33a9c79bc951bb695f99b1c1ac8 WHIRLPOOL 5c344246b32f21abc5ad8403c136263a6f9f5f2664b8027ad7f574e1b7cfa9b127f7863547550114b889daba363c19936cf7a0199a0bf5b4da8ac23c02dd24d0
 DIST otp_doc_html_19.2.tar.gz 34761971 SHA256 c373c8c1a9fe7433825088684932f3ded76f53d5b8a4d3d2a364263f1f783043 SHA512 ac9393f3e077be33a4a6e2b50c7848d28298b0f61fbd3b3cc0c650902ebed48d90defcbd6bd3031ac252efa845a6ed94ed781743c04a94c709ae65e5d5957dbb WHIRLPOOL 576ee94e04cf2089a98b949e55443c1b415224a427cf066ff6e7d9871de50c0b21a998ea2346a10c699136d34e5dc1049268e98121f2a4083b4711cf0db3f9b5
-DIST otp_doc_man_17.5.tar.gz 1363320 SHA256 85b1b2a1011fc01af550f1fe9e5a599a4c5f2a35d264d2804af1d05590a857c3 SHA512 98d241aa127cfe377e5efc52284cd324713cacefc96db5992275c4f8712a9e35e43f0dbc0d2a8d58a1127fbfa3f762eb001aea1bb1c9fa82205a3d83659ad548 WHIRLPOOL b790046a449824aa02e11bef6b84a7027351edba0fffd241221e690739df30c9c692074b7354612970d8d02b3c1bccfdbd81bb988af9874d181f177ffed49e2c
+DIST otp_doc_html_19.3.tar.gz 35818689 SHA256 dc3e3a82d1aba7f0deac1ddb81b7d6f8dee9a75e1d42b90c677a2b645f19a00c SHA512 a70d2c470fa1dc0594b20af73ba36ccb7702b4192960e6fc0296738175215a43450f9bf558637f7f5e40757f7a15dcf4f1ae8a88515e211cd3c0fae45c5e1858 WHIRLPOOL 468cd8b9761fbcaa8892405f451c53bf1014067022966384db96520855366afcfb09aa9ddf1390931da2288c0620b909588637c9c4501f753413752b293a9cbe
 DIST otp_doc_man_18.3.tar.gz 1395166 SHA256 978be100e9016874921b3ad1a65ee46b7b6a1e597b8db2ec4b5ef436d4c9ecc2 SHA512 d45d72d7ee7492e081dd5fac1a4d1cea93fe5f5287900be13c92e1c1802f7ec77573eeb4d271497154b9e0723c393700f35982ceedbe29be6cb759a0ebe83325 WHIRLPOOL 03b57a87573630a2826dd5e9a597ab0bb67daa73e4b2b733982b6ce4a3cf6a32c5ad17cb3ba3fc0a29248c867b1ba303098c7f61c0cfe42636621aa8a370790f
-DIST otp_doc_man_19.0.tar.gz 1405918 SHA256 c7a3d6d85a5a2b96d844297a3fa1bee448c3dd86237734688466249fd5a1401e SHA512 bb31563542c51eaf94e8780717f57718ab49592f7718e0dee855f3dfeae809d67cc3ed750d28c0fa53e3bae29dd27c9511d9228bde21bf010cd1d8588d4b1b7b WHIRLPOOL 53889e4dd5140bdcb1e3311edbabebd80a13c032581d67987e705989022c0b4459742b6fbb7b9ba062a212ea2c3460579c59f8dd02636172e663390935f097db
 DIST otp_doc_man_19.1.tar.gz 1405580 SHA256 7200e9e5b3a229a6b3838046e1b3e64afc869265539d49d0e4853212f19c0c79 SHA512 4ee35feeff70419ff5500e00dc17e34fdea8be21342d41cf1e255b84a1826b51057046be543ee1052153ae8c8cd215f4720cecae7d9fe1576cbd681dcf4b2334 WHIRLPOOL e94333be9d1d9239d1dc6e9bbcc6930b148eda8d8a73e3d21896e498c331c062ea1541d8fa03a2d0dd6f21510874f5aa6062b22a3738c85d1b18a30b09fb5482
 DIST otp_doc_man_19.2.tar.gz 1409661 SHA256 8a76ff3bb40a6d6a1552fa5a4204c8a3c7d99d2ea6f12684f02d038b23ad25cb SHA512 613b50841443fb71e5666a281edbf580b35f28e9fad6a246170017552ee5a04770700b95eae8bcfef3fa2e327a559c43969568091ed8389ecfe3eeea4f67d674 WHIRLPOOL 2d59d572a7f13e8fcb2aed60d5adf44a9d6aa19737b6a0487a1df3e733713306b3b405d4f1e6da4a7ad02df9835eee556d741af4d2baeb261c9a0db5e8596998
-DIST otp_src_17.5.tar.gz 67242289 SHA256 3c28820c981b30c50df8ac2a4a238e5813454fa3ed2ad530bc7948a282846474 SHA512 cfd082c8baee7ded370a34f15a1ba3b846b7d81e06edc36c62308c9220697925f1feda91eeecb70fc658f8987087256f51a2ebd0c526d16eeb09c72889d2390d WHIRLPOOL 3c3d987981383bf148b9788fae0574da398ff63d81eea13da0463bed303922d06fe54354de1cd3d37091eb23438939c645176ab565877f06cc1f11235c4d8d3d
+DIST otp_doc_man_19.3.tar.gz 1410781 SHA256 f8192ffdd7367083c055695eeddf198155da43dcc221aed1d870d1e3871dd95c SHA512 675a0d2d5972660a60de17c832e630f646f942d23815427eb0dec3a5ca1c44ed8fe35a9c30f8b608dedfd10f6fb1e47e958ea6e32e296b6f6809b1844b4da9a1 WHIRLPOOL b7fb4954a46670c672eec02df8713fe68eeb4c15fa8c56e37c802f384bafeb77d88b257ebd1f8f7a0e35e3020853211b9f46ecb01fbe16c19254a3cd992c0fc1
 DIST otp_src_18.3.tar.gz 68292101 SHA256 fdab8129a1cb935db09f1832e3a7d511a4aeb2b9bb3602ca6a7ccb9730d5c9c3 SHA512 f4a69bb14743d9f913d7060cfb6426f7c54693d07ed439506ede5160a0ba5a79a81cf08a56aaa02c68b3377cd22fed66a0fbeb216378330d7ad5c6348ed82014 WHIRLPOOL 493fe8f803194647ab0c113d8f67f5f97636321618296969d9da0396cc9b083b6deffd42638fe3e3eb0b63c4ff996fb4b2c4559c6039add94f7dad62205b815b
-DIST otp_src_19.0.tar.gz 68022550 SHA256 3fdc27a2a826e7f3d9cda43302d27d98704d6b41ce29a8a5df747a161da53bb1 SHA512 fdab82883f7be04cca91041819d15e0b065bdd049b134d056fe4ea12657f1c6f77aeebd778c09b4064e6d974734fe087592739181e14fe60597dbe37f492684f WHIRLPOOL b3b70b04b7189606dc89a3acaebc2fc0b8f8c2bbca20ab4556641bc51d3fcf784155a3ad406d6e0b1c2be12a243ff51a019038b3ab103c91c5b9af2e13a1a09f
 DIST otp_src_19.1.tar.gz 68103074 SHA256 fed4cbbc1ee5cc8efc2b8f14c3db97bfde1de967703f5f9a95f8ab6852737e23 SHA512 bd1c243393c867c91768367613aedb40d56889add149390c81f22e022e76b716d6e9a4d5db7e6477ceb1216c26c18c962abdfd8215a87420758f5ef2063b9714 WHIRLPOOL 3422ad4ab48916f79bcfd2b4550059f88e4e55340a9eb298a9039f07f899e6430eb2fd346bf52931acc2a03e86f3fc5571e9e577fce83bd2040c6cb37fb5348f
 DIST otp_src_19.2.tar.gz 68395949 SHA256 a016b3ef5dac1e532972617b2715ef187ecb616f7cd7ddcfe0f1d502f5d24870 SHA512 6403f2160ea1de9c5b269af47de5d0a0c5714544cdfdbdf366bb20b7b6a60a91b893344ab932b2689021cbd4cedf3dea0de8b390e659eff23b0cc99f36c30f0c WHIRLPOOL 6407ec880ad743b844e1a6b00bf5adcc99b9fe686cff89015a96b5341c58f62aebcc7db547da4e5ad4f680fdc22334d59e20a63f0277d3d60bd8ad72c59ed8c2
+DIST otp_src_19.3.tar.gz 68510871 SHA256 fe4a00651db39b8542b04530a48d24b2f2e7e0b77cbe93d728c9f05325bdfe83 SHA512 6920eab6e1681a76ab44bdd0eeb9b012e601191f91ca06edf1f63ba2e261c555d6f8dddf7025b2e9c3c6459bd63ff78659010ec33967fb1952840fb451ec2de6 WHIRLPOOL ae5b65001872dc855e45a7fbadef278a373935b66819342f4d222055043e1e1ad8974356468e2b1821b36246f5cd621c06cb2e287abab290d6891ea6cd8b698a
diff --git a/dev-lang/erlang/erlang-17.5.ebuild b/dev-lang/erlang/erlang-17.5.ebuild
deleted file mode 100644
index f2c7821224ef..000000000000
--- a/dev-lang/erlang/erlang-17.5.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-WX_GTK_VER="2.8"
-
-inherit autotools elisp-common eutils java-pkg-opt-2 multilib systemd versionator wxwidgets
-
-# NOTE: If you need symlinks for binaries please tell maintainers or
-# open up a bug to let it be created.
-
-DESCRIPTION="Erlang programming language, runtime environment and libraries (OTP)"
-HOMEPAGE="http://www.erlang.org/"
-SRC_URI="http://www.erlang.org/download/otp_src_${PV}.tar.gz
-	http://erlang.org/download/otp_doc_man_${PV}.tar.gz
-	doc? ( http://erlang.org/download/otp_doc_html_${PV}.tar.gz )"
-
-LICENSE="ErlPL-1.1"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
-IUSE="compat-ethread doc emacs halfword hipe java kpoll odbc smp sctp ssl systemd tk wxwidgets"
-
-RDEPEND=">=dev-lang/perl-5.6.1
-	ssl? ( >=dev-libs/openssl-0.9.7d )
-	emacs? ( virtual/emacs )
-	java? ( >=virtual/jdk-1.2 )
-	odbc? ( dev-db/unixODBC )"
-DEPEND="${RDEPEND}
-	wxwidgets? ( x11-libs/wxGTK:2.8[X,opengl] virtual/glu )
-	sctp? ( net-misc/lksctp-tools )
-	tk? ( dev-lang/tk )"
-
-S="${WORKDIR}/otp_src_${PV}"
-
-SITEFILE=50${PN}-gentoo.el
-
-pkg_setup() {
-	if use halfword ; then
-		use amd64 || die "halfword support is limited to amd64"
-	fi
-}
-
-src_prepare() {
-	use odbc || sed -i 's: odbc : :' lib/Makefile
-
-	# bug 263129, don't ignore LDFLAGS, reported upstream
-	sed -e 's:LDFLAGS = \$(DED_LDFLAGS):LDFLAGS += \$(DED_LDFLAGS):' -i "${S}"/lib/megaco/src/flex/Makefile.in
-
-	# don't ignore LDFLAGS, reported upstream
-	sed -e 's:LDFLAGS =  \$(ODBC_LIB) \$(EI_LDFLAGS):LDFLAGS += \$(ODBC_LIB) \$(EI_LDFLAGS):' -i "${S}"/lib/odbc/c_src/Makefile.in
-
-	if ! use wxwidgets; then
-		sed -i 's: wx : :' lib/Makefile
-		rm -rf lib/wx
-	fi
-
-	# Nasty workaround, reported upstream
-	cp "${S}"/lib/configure.in.src "${S}"/lib/configure.in
-
-	# bug 383697
-	sed -i '1i#define OF(x) x' erts/emulator/drivers/common/gzio.c
-	cd erts && eautoreconf
-}
-
-src_configure() {
-	use java || export JAVAC=false
-
-	econf \
-		--enable-threads \
-		$(use_enable sctp) \
-		$(use_enable systemd) \
-		$(use_enable halfword halfword-emulator) \
-		$(use_enable hipe) \
-		$(use_with ssl ssl "${EPREFIX}"/usr) \
-		$(use_enable ssl dynamic-ssl-lib) \
-		$(use_enable kpoll kernel-poll) \
-		$(use_enable smp smp-support) \
-		$(use compat-ethread && echo "--enable-ethread-pre-pentium4-compatibility") \
-		$(use x64-macos && echo "--enable-darwin-64bit")
-}
-
-src_compile() {
-	use java || export JAVAC=false
-	emake
-
-	if use emacs ; then
-		pushd lib/tools/emacs
-		elisp-compile *.el
-		popd
-	fi
-}
-
-extract_version() {
-	sed -n -e "/^$2 = \(.*\)$/s::\1:p" "${S}/$1/vsn.mk"
-}
-
-src_install() {
-	local ERL_LIBDIR=/usr/$(get_libdir)/erlang
-	local ERL_INTERFACE_VER=$(extract_version lib/erl_interface EI_VSN)
-	local ERL_ERTS_VER=$(extract_version erts VSN)
-
-	emake INSTALL_PREFIX="${D}" install
-	dodoc AUTHORS README.md
-
-	dosym "${ERL_LIBDIR}/bin/erl" /usr/bin/erl
-	dosym "${ERL_LIBDIR}/bin/erlc" /usr/bin/erlc
-	dosym "${ERL_LIBDIR}/bin/escript" /usr/bin/escript
-	dosym \
-		"${ERL_LIBDIR}/lib/erl_interface-${ERL_INTERFACE_VER}/bin/erl_call" \
-		/usr/bin/erl_call
-	dosym "${ERL_LIBDIR}/erts-${ERL_ERTS_VER}/bin/beam" /usr/bin/beam
-	use smp && dosym "${ERL_LIBDIR}/erts-${ERL_ERTS_VER}/bin/beam.smp" /usr/bin/beam.smp
-
-	## Remove ${D} from the following files
-	sed -e "s:${D}::g" -i "${ED}${ERL_LIBDIR}/bin/erl"
-	sed -e "s:${D}::g" -i "${ED}${ERL_LIBDIR}/bin/start"
-	grep -rle "${D}" "${ED}/${ERL_LIBDIR}/erts-${ERL_ERTS_VER}" | xargs sed -i -e "s:${D}::g"
-
-	## Clean up the no longer needed files
-	rm "${ED}/${ERL_LIBDIR}/Install"
-
-	for i in "${WORKDIR}"/man/man* ; do
-		dodir "${ERL_LIBDIR}/${i##${WORKDIR}}"
-	done
-	for file in "${WORKDIR}"/man/man*/*.[1-9]; do
-		# doman sucks so we can't use it
-		cp ${file} "${ED}/${ERL_LIBDIR}"/man/man${file##*.}/
-	done
-	# extend MANPATH, so the normal man command can find it
-	# see bug 189639
-	dodir /etc/env.d/
-	echo "MANPATH=\"${EPREFIX}${ERL_LIBDIR}/man\"" > "${ED}/etc/env.d/90erlang"
-
-	if use doc ; then
-		dohtml -A README,erl,hrl,c,h,kwc,info -r \
-			"${WORKDIR}"/doc "${WORKDIR}"/lib "${WORKDIR}"/erts-*
-	fi
-
-	if use emacs ; then
-		pushd "${S}"
-		elisp-install erlang lib/tools/emacs/*.{el,elc}
-		sed -e "s:/usr/share:${EPREFIX}/usr/share:g" \
-			"${FILESDIR}"/${SITEFILE} > "${T}"/${SITEFILE}
-		elisp-site-file-install "${T}"/${SITEFILE}
-		popd
-	fi
-
-	newinitd "${FILESDIR}"/epmd.init epmd
-	systemd_dounit "${FILESDIR}"/epmd.service
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-lang/erlang/erlang-19.0.ebuild b/dev-lang/erlang/erlang-19.3.ebuild
index c7314145b6b4..17f0d84b3b09 100644
--- a/dev-lang/erlang/erlang-19.0.ebuild
+++ b/dev-lang/erlang/erlang-19.3.ebuild
@@ -18,7 +18,7 @@ SRC_URI="http://www.erlang.org/download/otp_src_${PV}.tar.gz
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
-IUSE="compat-ethread doc emacs hipe java kpoll libressl odbc smp sctp ssl systemd tk wxwidgets"
+IUSE="compat-ethread dirty-schedulers doc emacs hipe java kpoll libressl odbc smp sctp ssl systemd tk wxwidgets"
 
 RDEPEND="
 	ssl? (
@@ -76,7 +76,8 @@ src_configure() {
 		$(use_enable kpoll kernel-poll) \
 		$(use_enable smp smp-support) \
 		$(use compat-ethread && echo "--enable-ethread-pre-pentium4-compatibility") \
-		$(use x64-macos && echo "--enable-darwin-64bit")
+		$(use x64-macos && echo "--enable-darwin-64bit") \
+		$(use_enable dirty-schedulers)
 }
 
 src_compile() {
diff --git a/dev-python/bitarray/bitarray-0.8.1.ebuild b/dev-python/bitarray/bitarray-0.8.1.ebuild
index da23dd24ebee..13dc3ca656d8 100644
--- a/dev-python/bitarray/bitarray-0.8.1.ebuild
+++ b/dev-python/bitarray/bitarray-0.8.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=(python{2_7,3_4})
+PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
 
 inherit distutils-r1
 
diff --git a/dev-python/blockdiag/blockdiag-1.5.3.ebuild b/dev-python/blockdiag/blockdiag-1.5.3-r1.ebuild
index 4f645e7fc3bb..7496b2c82d81 100644
--- a/dev-python/blockdiag/blockdiag-1.5.3.ebuild
+++ b/dev-python/blockdiag/blockdiag-1.5.3-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_4 )
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
 
 inherit distutils-r1
 
@@ -18,6 +18,7 @@ IUSE="test"
 RDEPEND="
 	>=dev-python/funcparserlib-0.3.6[${PYTHON_USEDEP}]
 	>=dev-python/pillow-2.2.1[${PYTHON_USEDEP}]
+	dev-python/webcolors[${PYTHON_USEDEP}]
 "
 DEPEND="
 	${RDEPEND}
@@ -36,6 +37,11 @@ python_prepare_all() {
 	distutils-r1_python_prepare_all
 }
 
+python_test() {
+	ALL_TESTS=1 \
+	esetup.py test
+}
+
 pkg_postinst() {
 	einfo "For additional functionality, install the following optional packages:"
 	einfo "    dev-python/reportlab for pdf format"
diff --git a/dev-python/funcparserlib/funcparserlib-0.3.6.ebuild b/dev-python/funcparserlib/funcparserlib-0.3.6.ebuild
index 8b9378d1fbb0..42b86b323040 100644
--- a/dev-python/funcparserlib/funcparserlib-0.3.6.ebuild
+++ b/dev-python/funcparserlib/funcparserlib-0.3.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_4} pypy )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
 
 inherit distutils-r1
 
diff --git a/dev-python/reportlab/reportlab-3.3.0-r1.ebuild b/dev-python/reportlab/reportlab-3.3.0-r1.ebuild
index f3a09e9bb59a..558ab2b237c7 100644
--- a/dev-python/reportlab/reportlab-3.3.0-r1.ebuild
+++ b/dev-python/reportlab/reportlab-3.3.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5} ) # Tests crash with pypy
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) # Tests crash with pypy
 
 inherit distutils-r1 flag-o-matic prefix
 
diff --git a/net-analyzer/pmacct/Manifest b/net-analyzer/pmacct/Manifest
index cbe3e6b80a2f..dbd1e0c4065b 100644
--- a/net-analyzer/pmacct/Manifest
+++ b/net-analyzer/pmacct/Manifest
@@ -1,2 +1,3 @@
 DIST pmacct-1.5.1.tar.gz 874563 SHA256 96134549a10947f3f6d610b670a26f1a54e01af4be0eff09bf48c19246d33584 SHA512 c3a0ddaf1b8679df2097147ce844eb2a3e3058599aea457e463cd4e65a7601e0ce5bac5ca5e1c82afecd5edc92dae673eed3ed1787bfbd3e8ac2af5677885bb7 WHIRLPOOL bd071ac30493f5ee2e0393eb9277dfae2d2fdd6283293aee589ae41ab326b0aaef0ec9b70a421eeca4df857a0046ca7b196e0692ffdd2ea12d9a7c66a74e9a32
 DIST pmacct-1.6.1.tar.gz 1280968 SHA256 eb332a6812d1e02134900a1d115a24f315de7c861a9b63093c1226753486cbe7 SHA512 e4c24d4c09716374a1315f8b4a70f3c58fb45848d80cf5c36e5a7653c47249717353a297826e341ec9fd741dd77b840241ad8f5e9d33f4c3dd0525661127cf27 WHIRLPOOL 2ba781d320ceccf7a815d5dd1f8e2362d3fa5085fecafe4e6d75116ca3dafb7ce49d4c455add1615773a83e614f7b7c941c2e4c6ec8424b1cdaf559227f3ab98
+DIST pmacct-1.6.2.tar.gz 1311678 SHA256 e6ede7f500fb1771b5cdfb63dfa016e34c19b8aa2d2f672bd4c63016a5d6bbe2 SHA512 8495f97752ae586fd842eed49ce91db3e4753133f7d380d067e7df153abeea469e5126800074e9071cb7227a3f1df64d4642dfece624fbbfa39b4537fde38b46 WHIRLPOOL ebfa8caeaa1cf48d6b3785cb600d4459e9408e9e8e110b636d0dd0108fcd33a8660259d99469960d32aff720b5387b029891f4d6419dab88920f3bae89f0871a
diff --git a/net-analyzer/pmacct/pmacct-1.6.2.ebuild b/net-analyzer/pmacct/pmacct-1.6.2.ebuild
new file mode 100644
index 000000000000..72d65265800b
--- /dev/null
+++ b/net-analyzer/pmacct/pmacct-1.6.2.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit toolchain-funcs
+
+DESCRIPTION="A network tool to gather IP traffic information"
+HOMEPAGE="http://www.pmacct.net/"
+SRC_URI="http://www.pmacct.net/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="64bit debug geoip geoipv2 ipv6 jansson kafka mongodb mysql nflog postgres rabbitmq sqlite threads"
+REQUIRED_USE="
+	?? ( geoip geoipv2 )
+	kafka? ( jansson )
+	rabbitmq? ( jansson )
+"
+
+RDEPEND="
+	net-libs/libpcap
+	geoip? ( dev-libs/geoip )
+	geoipv2? ( dev-libs/libmaxminddb )
+	jansson? ( dev-libs/jansson )
+	kafka? ( dev-libs/librdkafka )
+	mongodb? (
+		>=dev-libs/mongo-c-driver-0.8.1-r1
+		<dev-libs/mongo-c-driver-0.98
+	)
+	mysql? ( virtual/mysql )
+	nflog? ( net-libs/libnetfilter_log )
+	postgres? ( dev-db/postgresql:* )
+	rabbitmq? ( net-libs/rabbitmq-c )
+	sqlite? ( =dev-db/sqlite-3* )
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+
+DOCS=(
+	CONFIG-KEYS ChangeLog FAQS QUICKSTART TOOLS UPGRADE
+	docs/INTERNALS docs/PLUGINS docs/SIGNALS
+)
+
+src_configure() {
+	tc-export CC AR RANLIB
+
+	econf \
+		$(use_enable 64bit) \
+		$(use_enable debug) \
+		$(use_enable geoip) \
+		$(use_enable geoipv2) \
+		$(use_enable ipv6) \
+		$(use_enable jansson) \
+		$(use_enable kafka) \
+		$(use_enable mongodb) \
+		$(use_enable mysql) \
+		$(use_enable nflog) \
+		$(use_enable postgres pgsql) \
+		$(use_enable rabbitmq) \
+		$(use_enable sqlite sqlite3) \
+		$(use_enable threads) \
+		--disable-debug
+}
+
+src_install() {
+	default
+
+	for dirname in examples sql; do
+		docinto ${dirname}
+		dodoc -r ${dirname}/*
+	done
+
+	newinitd "${FILESDIR}"/pmacctd-init.d pmacctd
+	newconfd "${FILESDIR}"/pmacctd-conf.d pmacctd
+
+	insinto /etc/pmacctd
+	newins examples/pmacctd-imt.conf.example pmacctd.conf
+}
diff --git a/net-analyzer/tcpreplay/Manifest b/net-analyzer/tcpreplay/Manifest
index 16cc14e45d66..cf8a70f9d0d1 100644
--- a/net-analyzer/tcpreplay/Manifest
+++ b/net-analyzer/tcpreplay/Manifest
@@ -1,3 +1,4 @@
 DIST tcpreplay-4.1.2.tar.gz 2162175 SHA256 da483347e83a9b5df0e0dbb0f822a2d37236e79dda35f4bc4e6684fa827f25ea SHA512 3a7d125f38fe15070d666eacb4a5ef026a73ff850adec7ef3592966f38d1d155002792c5d5ac2476aa034d71be5f31b9dacd5be34af01a336149af3a42cad360 WHIRLPOOL e5ca80234655b3614eebd400954b53d958d08dbe91cf123db07935e5bebfb34ad40cd41a7a25a8d8ee684dbcaeda41c75a18503172830141dca022713b7814d6
 DIST tcpreplay-4.2.1.tar.gz 3528019 SHA256 224b519e561d969b4bdb0e700c2283e036620e3cb5895d5aab2a7e4f27d21a79 SHA512 0ecfc6ec80c94b2ea001ea1fee31f06cfb265dcd7bb45cc09d480aa6ed2d11733b7383c54425805bfed02750e05339500f3d4de9b7c6054fa12f015153366875 WHIRLPOOL b6d1bbb0c18398b9f10562f1040780e4a058046e8b040a195fdf0a937ccfa9282fed520ec5478ed443b92fa322412bc6b3ff2040728393903acf2080eedbf350
 DIST tcpreplay-4.2.2.tar.gz 3597722 SHA256 e674166b54486db8f5417554ed88c06f44f368d70585c2897b0bc085009d8dd5 SHA512 5ae57957ab95790df8e880a53905e0e8e62b3a3d80f1fb2030e7bc360d8d4146335b48d7a5c02448edacafc146f2ea485086a824ce4e305eb3a34a8587ac46ae WHIRLPOOL 195ef1c28850e8a57f7cf520d4bb3e32e1bdc89a1e230176ac2334ff7b9f8026f24ef0d07ab9331e93ed106485ef3b501521fc4a8a3ba9752cabeb4f4d675dc5
+DIST tcpreplay-4.2.3.tar.gz 3490534 SHA256 68d8d49dab5bf58b2e8d244eee1ee7f2379d967da19fe97dd9d59bcf40a22abc SHA512 0d92c8cdb231d602dddc58e1c5b4e4a443a68f302b20a8ac402fb4eefbac365fd1ba72cfbe05ca667240e4b82ce9fd5de6a04b7eed7017e5b9563eff779c3a85 WHIRLPOOL d87a2176e980d44993a932c4cc90b360834f31e4d49003d979a83b337fb7e15d1c0a0de8967ef7b6ddbc58d74302be38a5361a0925e437f0b38702203a450eaa
diff --git a/net-analyzer/tcpreplay/tcpreplay-4.2.3.ebuild b/net-analyzer/tcpreplay/tcpreplay-4.2.3.ebuild
new file mode 100644
index 000000000000..ee0ea9dffd4b
--- /dev/null
+++ b/net-analyzer/tcpreplay/tcpreplay-4.2.3.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools flag-o-matic
+
+DESCRIPTION="utilities for editing and replaying previously captured network traffic"
+HOMEPAGE="http://tcpreplay.appneta.com/ https://github.com/appneta/tcpreplay"
+LICENSE="BSD GPL-3"
+SRC_URI="https://github.com/appneta/${PN}/releases/download/v${PV/_/-}/${P/_/-}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+KEYWORDS="~amd64 ~sparc ~x86"
+IUSE="debug pcapnav +tcpdump"
+
+DEPEND="
+	>=sys-devel/autogen-5.18.4[libopts]
+	dev-libs/libdnet
+	>=net-libs/libpcap-0.9
+	tcpdump? ( net-analyzer/tcpdump )
+	pcapnav? ( net-libs/libpcapnav )
+"
+RDEPEND="${DEPEND}"
+
+DOCS=(
+	docs/{CHANGELOG,CREDIT,HACKING,TODO}
+)
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.1.0-enable-pcap_findalldevs.patch
+)
+
+S=${WORKDIR}/${P/_/-}
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e 's|#include <dnet.h>|#include <dnet/eth.h>|g' \
+		src/common/sendpacket.c || die
+	sed -i \
+		-e 's|@\([A-Z_]*\)@|$(\1)|g' \
+		-e '/tcpliveplay_CFLAGS/s|$| $(LDNETINC)|g' \
+		-e '/tcpliveplay_LDADD/s|$| $(LDNETLIB)|g' \
+		src/Makefile.am || die
+
+	eautoreconf
+}
+
+src_configure() {
+	# By default it uses static linking. Avoid that, bug 252940
+	econf \
+		$(use_enable debug) \
+		$(use_with pcapnav pcapnav-config /usr/bin/pcapnav-config) \
+		$(use_with tcpdump tcpdump /usr/sbin/tcpdump) \
+		--disable-local-libopts \
+		--enable-dynamic-link \
+		--enable-shared \
+		--with-libdnet \
+		--with-testnic2=lo \
+		--with-testnic=lo
+}
+
+src_test() {
+	if [[ ! ${EUID} -eq 0 ]]; then
+		ewarn "Some tests were disabled due to FEATURES=userpriv"
+		ewarn "To run all tests issue the following command as root:"
+		ewarn " # make -C ${S}/test"
+		emake -j1 -C test tcpprep || die "self test failed - see ${S}/test/test.log"
+	else
+		emake -j1 test || {
+			ewarn "Note, that some tests require eth0 iface to be UP." ;
+			die "self test failed - see ${S}/test/test.log" ; }
+	fi
+}