gentoo resync : 02.11.2017

12 files changed, 147 insertions, 9 deletions

diff --git a/net-analyzer/argus/Manifest b/net-analyzer/argus/Manifest
index 9a7640c7cbfc..34648e92531a 100644
--- a/net-analyzer/argus/Manifest
+++ b/net-analyzer/argus/Manifest
@@ -1,11 +1,13 @@
 AUX argus-3.0.5-Makefile.patch 437 SHA256 ffbdc3e14ffd00c00e82675f47da7ffba824585b81b1cba0d0914ff220bd400d SHA512 cec8fae0027bcd48bf878781ed5b0352a1501cdd6a0470a76b6346aab3587b275d877434e1a3feddeebe3f4e166d42d07fd007a4b60cbef15d29076c188993b7 WHIRLPOOL d0f7d15e90ffe9c1743962120344365d8f4f211bc10e26ded15789abe19fb7e1e9671a40e2906be2756449b4ddcf24fb46f2fae93236025ea72e6bafcf39002c
 AUX argus-3.0.7.3-DLT_IPNET.patch 538 SHA256 5921972d79151e7809e62aabcb264f9edae2ef1a0d023338b0debf4b595c4713 SHA512 3f52c9531675713177cecb208d4b9c11e26ce60c4fa2e932520969dcbf74f37979443c2ad5039e61b803385058ea6a45e19afeed9f4b815a4dbf43ee5628621c WHIRLPOOL fdd17a2c9fd0577326daf92452dc74466e7e58290f3e338bf05296305612f68d11fa7ca037bb150cdf8e20ca1efc650a2fd63142a40ae2a06f024a182058d141
 AUX argus-3.0.8.1-disable-tcp-wrappers-automagic.patch 591 SHA256 0280a1ac020dcdf4c3791e444f44024c2943eddf5bcae0fb24339461462e72c5 SHA512 325cdc2c18ccf8665db11ab52f500395a0a76660c4c6d2620c8500a966e5f432c77d53b88549825bb90378929c6be47e35db792b59a9e74acec45a8c8ff73037 WHIRLPOOL 29ae63eb0f457237ed048f87e913be50c6894a32a7ea2fdd77faf95228b300e1335cace695c9f06998149867d17d9c6b6e86d99fc12d2721dfac958b86cc26fd
+AUX argus-3.0.8.2-rpc.patch 1777 SHA256 1d974aca70e5f11f00e37e50d500db0a15559c9909329650f0e4b151b3f571d2 SHA512 4556b784719b14508d4950c935a2fb9e8a9e195257b609ad85869000072339983b3a293ebe0b03c82b9d9f336b6da1a228d1a4266bc474004fa7882d09aa66d5 WHIRLPOOL e1b03323f23402ec529c74654743ca254515d740b0006035ff2e6d29a846216ebdd3aa8ab410f8a74930c0c76029dc5c47ad196d08dd529e42db44c4510a3efe
 AUX argus.initd 365 SHA256 4216da1c68e2e82e9d0eb23e0dd60459c9203854e1f6d11d78d16e437c8c66ad SHA512 54cbc2a0d92e5d0813ff6aecbf5f6d083e7de708a974af8aa90ce112e2d697b53b00e7918405973f487b2d9733bd2326a083ed13b52ee8dbbda4b06b73d95231 WHIRLPOOL 3ee148d0e2e595cf24ccf6371f9f8a4c1de8bb5cc05738a076e588a0c5e6bb5f5f9f0fed62da20cd8fad8b5c88a80c2860064f364884abc049a6a76c83654354
 DIST argus-3.0.8.1.tar.gz 523375 SHA256 1fb921104c8bd843fb9f5a1c32b57b20bfe8cd8a103b3f1d9bb686b9e6c490a4 SHA512 d96332849df7ce2297aa0d81a9f22c12763d04b2936ffaffc0e4b1942535846cfbc41dadf28791eb88d1ffd0429bdc280d16dff44369c415c713064849b158f7 WHIRLPOOL 2c9495d585c2297b3f9951e74a8fd28840941be6b298c0178d44801242d1abda4bd08f9469e2dd1a4b802735611c9ff82bc028d838628b1ccb184ba80d5dc529
 DIST argus-3.0.8.2.tar.gz 524749 SHA256 ca4e3bd5b9d4a8ff7c01cc96d1bffd46dbd6321237ec94c52f8badd51032eeff SHA512 146795880d8697e065ed23d2fbab226846d55db0b71945c5a4cab2896e48ceb6e1671ccb4e00dc3b0f984525bac4ced3773f3b9e70c3ea5f7c6972fe9bd94313 WHIRLPOOL 4a8fc3ce60df4da4cde87acec5f125d487c478a02a8789296d1f279081f6b8aabd604c3e6aefc0b8e472c4aef11dbef9e034f73a7de371ff18499d0ebb3618e8
 EBUILD argus-3.0.8.1.ebuild 1850 SHA256 d82bb4c464f603ab4e3c59d07a9e2256befa55a8275fdb40298bb846e78a5037 SHA512 7fae97954944c0c5d22f8a688a3ceeae803309c3b0f5d1d2c8144ef6fcc840e8997820d1974b3e1fbd0e72fdda3071d0b9641c59de43c098ce4aff8648448c87 WHIRLPOOL 103f219675531039833b3ea6238a7b80b5b26d5c33daff9751412788cd7e6b491479146893af33d32ddee7d06a50c8bfd1eeca2fe39964a4e5494e28b036a37a
+EBUILD argus-3.0.8.2-r1.ebuild 2035 SHA256 642c490163a64b8187ef1f8a0ac20ce1b55c9d375d5feaf0a9dbdf77fc6c5198 SHA512 4b92db365f92a5a2aaff6060e30b5335df241cadd077775ddc6b79c3744d651fc3115b0cca28049703aa01b7efcd4396c829f43ac73d5eb70ae6b8112a52721e WHIRLPOOL d9fd82eb9706dd93545b6c379c7a49672a83042e5a8498d5fcb6e28d2044ab19c78c29d5ed542735b9c72ce9109ecb7b9b0f33a3429ca69dbe10a502bec1c1d8
 EBUILD argus-3.0.8.2.ebuild 1876 SHA256 8ca7018449d29f654e032e7d48912bf39e0b3e4e18486e46a377716e5462c5fd SHA512 70832f5bc42829924d7667e79018eb859e381b4cc0811e8147fe9e87b9170ff4f5250c18f020af9fe376da7cce98afca031b4550217608e3e8ee0a29cb8e8ce9 WHIRLPOOL 87c974c68e6b97756269afd808f83ceee85e354a2fabae398f12dc5d9afa30c72a5417fd01cdcdd83d987040d66208e9ca0fcd6fc7f2c8dff473d5dc97e669cf
 MISC ChangeLog 4135 SHA256 ae94681577b4a6299e5c39ba0d93aa1333589f6a3fe4ebc699368d4954864a1e SHA512 547f9de80d1db70f26925b4d8093c8f7cb20e8c70e178d6b32555e8de2d23bd5a7e4eea9e66f156c8a2133c5e7baa3a31fe1a2483c384bb14f9d8477e93b0c91 WHIRLPOOL 7693fdc92a138d845987e78152ec84141810e18988baf13e61ae7692959bde32178b91c8943884a061f0d338c83883abca4e736a846901d58cc09a2e5f0c4c5d
 MISC ChangeLog-2015 9185 SHA256 fe6b50e15a5ac84cc4c1b3d0067402edf5944b3d5caf30a147eeaf05da0b2ed9 SHA512 ff4e8208341eafca681ce21db1a2d58aa59f7ae59eb48419d898b0199d700ce1a08614851f0145727f779f0ebee18cb0d8c6dcbf3e018246533e7bf7d244f962 WHIRLPOOL adf0adea7876f811a529ab22c6072114e258ad15a6c697e6618849cdc42344768630337cd160b8d2e39648ce5b662113690b354da7ac8d9ce84475521cbcb285
-MISC metadata.xml 366 SHA256 93d538a9e291d67e36025f5ee48d8b50966778e3f3f6978cb9bd104a673e1ef4 SHA512 52ae5aab1db1228559c6c5851f3b5ceee14573c40b59c90500d574a351483c761c0d517e2918cc3b57c59b8e0350643bba3b0060f5acbb0cca6b3a22e60225cc WHIRLPOOL 9ed8849333455e9e87b3c5cf36f2cc14ca2190e40b965b5e67ce411f64d1a4e62ac4f2928458e7bda523c7e097e2e1c9e4d170dd155df2460d346fbcdf9933e1
+MISC metadata.xml 468 SHA256 00ec9a83f7236016192841d3929c74a74b22da94dee27717b7421c32d4b526fc SHA512 64c97706da7a48ebaf5d3bd9aecdd11b1eff9516d5e99993ba65217b169c503bb509fdf19ade828925c85a82573b186aab89991b5870161681c42985a244771f WHIRLPOOL f23f73b39710a08eb04cc90457a70dd861b9ac82f8a0bf678ea912f04615a215bae124e27242428601bf223e1e8b96f918be638408cbbad316e160355ffbd713
diff --git a/net-analyzer/argus/argus-3.0.8.2-r1.ebuild b/net-analyzer/argus/argus-3.0.8.2-r1.ebuild
new file mode 100644
index 000000000000..4484cf276e72
--- /dev/null
+++ b/net-analyzer/argus/argus-3.0.8.2-r1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools eutils user
+
+DESCRIPTION="network Audit Record Generation and Utilization System"
+HOMEPAGE="http://www.qosient.com/argus/"
+SRC_URI="${HOMEPAGE}dev/${P/_rc/.rc.}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="debug +libtirpc sasl tcpd"
+
+RDEPEND="
+	net-libs/libpcap
+	sys-libs/zlib
+	!libtirpc? ( sys-libs/glibc[rpc(-)] )
+	libtirpc? ( net-libs/libtirpc )
+	sasl? ( dev-libs/cyrus-sasl )
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+"
+
+DEPEND="
+	${RDEPEND}
+	>=sys-devel/bison-1.28
+	>=sys-devel/flex-2.4.6
+"
+
+S=${WORKDIR}/${P/_rc/.rc.}
+
+src_prepare() {
+	find . -type f -execdir chmod +w {} \; #561360
+	sed -e 's:/etc/argus.conf:/etc/argus/argus.conf:' \
+		-i argus/argus.c \
+		-i support/Config/argus.conf \
+		-i man/man8/argus.8 \
+		-i man/man5/argus.conf.5 || die
+
+	sed -e 's:#\(ARGUS_SETUSER_ID=\).*:\1argus:' \
+		-e 's:#\(ARGUS_SETGROUP_ID=\).*:\1argus:' \
+		-e 's:\(#ARGUS_CHROOT_DIR=\).*:\1/var/lib/argus:' \
+			-i support/Config/argus.conf || die
+	epatch \
+		"${FILESDIR}"/${PN}-3.0.8.1-disable-tcp-wrappers-automagic.patch \
+		"${FILESDIR}"/${PN}-3.0.5-Makefile.patch \
+		"${FILESDIR}"/${PN}-3.0.7.3-DLT_IPNET.patch \
+		"${FILESDIR}"/${PN}-3.0.8.2-rpc.patch
+
+	epatch_user
+	eautoreconf
+}
+
+src_configure() {
+	use debug && touch .debug # enable debugging
+	econf $(use_with libtirpc) $(use_with tcpd wrappers) $(use_with sasl)
+}
+
+src_compile() {
+	emake CCOPT="${CFLAGS} ${LDFLAGS}"
+}
+
+src_install () {
+	doman man/man5/*.5 man/man8/*.8
+
+	dosbin bin/argus{,bug}
+
+	dodoc ChangeLog CREDITS README
+
+	insinto /etc/argus
+	doins support/Config/argus.conf
+
+	newinitd "${FILESDIR}/argus.initd" argus
+	keepdir /var/lib/argus
+}
+
+pkg_preinst() {
+	enewgroup argus
+	enewuser argus -1 -1 /var/lib/argus argus
+}
+
+pkg_postinst() {
+	elog "Note, if you modify ARGUS_DAEMON value in argus.conf it's quite"
+	elog "possible that the init script will fail to work."
+}
diff --git a/net-analyzer/argus/files/argus-3.0.8.2-rpc.patch b/net-analyzer/argus/files/argus-3.0.8.2-rpc.patch
new file mode 100644
index 000000000000..462d465609f1
--- /dev/null
+++ b/net-analyzer/argus/files/argus-3.0.8.2-rpc.patch
@@ -0,0 +1,47 @@
+diff -ruN argus-3.0.8.2.orig/common/Makefile.in argus-3.0.8.2/common/Makefile.in
+--- argus-3.0.8.2.orig/common/Makefile.in	2015-04-14 14:32:33.000000000 -0000
++++ argus-3.0.8.2/common/Makefile.in	2017-09-25 10:27:16.272856331 -0000
+@@ -35,12 +35,12 @@
+ 
+ CC = @CC@
+ CCOPT = @V_CCOPT@
+-INCLS = -I$(srcdir) @V_INCLS@ -I$(srcdir)/../include  -I$(srcdir)/../argus
++INCLS = -I$(srcdir) @V_INCLS@ @RPC_CFLAGS@ -I$(srcdir)/../include  -I$(srcdir)/../argus
+ DEFS = @DEFS@
+ 
+ # Standard CFLAGS
+ CFLAGS = $(CCOPT) $(INCLS) $(DEFS)
+-LDFLAGS = @LDFLAGS@
++LDFLAGS = @LDFLAGS@ @RPC_LIBS@
+ 
+ INSTALL = @INSTALL@
+ RANLIB = @V_RANLIB@
+diff -ruN argus-3.0.8.2.orig/configure.ac argus-3.0.8.2/configure.ac
+--- argus-3.0.8.2.orig/configure.ac	2017-09-25 10:20:04.155174606 -0000
++++ argus-3.0.8.2/configure.ac	2017-09-25 10:24:39.151904377 -0000
+@@ -120,6 +120,25 @@
+ AC_CHECK_FUNCS(floorf remainderf)
+ AC_CHECK_FUNCS(timegm)
+ 
++AC_ARG_WITH([libtirpc],
++           AS_HELP_STRING([--with-libtirpc], [Use libtirpc as RPC implementation (instead of sunrpc)]),
++           [], [ with_libtirpc=no ])
++
++AS_IF([test "x$with_libtirpc" != xno], 
++      [PKG_CHECK_MODULES([TIRPC], 
++                         [libtirpc], 
++                         [RPC_CFLAGS=$TIRPC_CFLAGS; RPC_LIBS=$TIRPC_LIBS;],
++                        [AC_MSG_ERROR([libtirpc requested, but library not found.])]
++                       )], 
++      [AC_CHECK_HEADER(rpc/rpc.h, 
++                      [RPC_CFLAGS=""; RPC_LIBS="";],
++                      [AC_MSG_ERROR([sunrpc requested, but headers are not present.])]
++                     )]
++)
++
++AC_SUBST(RPC_CFLAGS)
++AC_SUBST(RPC_LIBS)
++
+ AC_CHECK_FUNCS(xdrmem_create)
+ if test "$ac_cv_func_xdrmem_create" = yes ; then
+    AC_DEFINE([HAVE_XDR], [], [Using system XDR library])
diff --git a/net-analyzer/argus/metadata.xml b/net-analyzer/argus/metadata.xml
index 90955da4b592..e7da258d5266 100644
--- a/net-analyzer/argus/metadata.xml
+++ b/net-analyzer/argus/metadata.xml
@@ -6,4 +6,7 @@
 	<name>Gentoo network monitoring and analysis project</name>
 </maintainer>
 <longdescription>network Audit Record Generation and Utilization System</longdescription>
+<use>
+	<flag name="libtirpc">Build against <pkg>net-libs/libtirpc</pkg> for RPC support</flag>
+</use>
 </pkgmetadata>
diff --git a/net-analyzer/dsniff/Manifest b/net-analyzer/dsniff/Manifest
index f75bad73d183..b8fed2358559 100644
--- a/net-analyzer/dsniff/Manifest
+++ b/net-analyzer/dsniff/Manifest
@@ -9,7 +9,7 @@ DIST dsniff_2.4b1+debian-18.diff.gz 44819 SHA256 a65142b8d2206d3eae5db35d9972f8e
 DIST dsniff_2.4b1+debian-22.1.debian.tar.gz 29657 SHA256 28ddb8514c6a7a17f51f428b6fada299baf5a3efa153f77f081ac6c1e6466633 SHA512 11c6a3c04b5a8b3afb78901003132186964e88019011bea69b43a000c31d23f15c1a1c343c2ad1b03bf0a09664aebfa6f99e335fdfa1496bb020db6541eab6e3 WHIRLPOOL a1236e7452e3442a1ac0d7a6bbf71d0d0ef22bf508aa47838d220ed18e8c16aba4a822a343c9922de71f6f77c6b10d58d6a56a631488e71ca3307d9a9132bee5
 EBUILD dsniff-2.4_beta1-r4.ebuild 1418 SHA256 6f2be728d1ccf0d264f8200d4788164ad3c98250f2c01547c425530c809da9e8 SHA512 6dfbc3a94e4c9361dcb5875097c15547b61d8754f282b9b71c223be033712c8d2e0fe83ebf45017ad00c26f2646320077c7c102053f452ca5f60e0297cadcb32 WHIRLPOOL c159b0bdbad69a2c39b7b89b411b9ab5c91e3cb1221540db38bafbc28af5d3c1e004e08f8e14f7a0fd6e660cf4acb1720af9e964731a109ff61bc68af5e66fe9
 EBUILD dsniff-2.4_beta1-r7.ebuild 1563 SHA256 04463768252b73f95efc74cdd16fc3f9ac5beab7a89d3bfe1916bf5809c2d229 SHA512 941d3954e19d99513298fc8c18a2c9bc257efb2611311aeb1d0e9a079c4e2f4439f95389e8e3f103e97a7c8dc87860c1b45b29c6a43f579ce7a001a0c4d4e8fe WHIRLPOOL 7f03b13b750c56c34056f7e6db18989832e286c87264e82f0ca205553aafe9d2c4665222dbdee908b18509a8d62145b77118d84f6ab33d8e31bf1f8cf6037bf8
-EBUILD dsniff-2.4_beta1-r9.ebuild 2081 SHA256 ba254584367b6b98512ba944a42116a1bcf2e0fd08b63dfe1113ba195ad7cb80 SHA512 88e1f8daa373ab4296d06e71a5a4471cca2c3494d9ee8891ffbc560a157538b98e183ea29c68547ad18b01a930c54957996409deb90e78c1164d5e5ce2d9fc4d WHIRLPOOL 31c3ca5b9081d9ab87075b0a86388eda90da82d2c06e1897658799114d0caa9fcd64f5fe48c82295a0bc3b0c7636f7321397b65622a1cbbeaf8635bf9a0be8c5
+EBUILD dsniff-2.4_beta1-r9.ebuild 2082 SHA256 2d6e4b29395be67be7712bc4579e338568975c1de90ae04bfcb54b2912d11ca4 SHA512 54484074acf7b0f906985530d3f7a1c0139bbd30325ba53234627d40d154377e6e53ef5fc99c33db6381d3ba329d6b26d7002e8a979eabfa5db69dcb9de1a2c9 WHIRLPOOL eaa6af0f39dcaa856cb293b8a94c6bd90af3c74af20f16b3a9716362493d5090d52309b85676c1c2a45900cb5edd57d28679ac0048a6e6fc05d626edae38a06a
 MISC ChangeLog 2938 SHA256 dbc1f35f443ea04b4aff8f41a60a1b9bf0f3a237549c6e9072b8e4ab9f0f5653 SHA512 32c55a03208d65419ec1ad3f6b1e7fe1fe7b08ee572b439a6b5af3be10798dd4a57f61447f1275b7b4932a8d7016f58967d6df12c8c78a70822dfe58bb1f8855 WHIRLPOOL 693cb97d79994e798e6971dce933b01465a57ac400e57a10e6d68a3ee133ff169c042c1093b3b1678ca0d07263fa616598d79204399018410ef3ac8b37d98f2a
 MISC ChangeLog-2015 8971 SHA256 8d8d46117d34223bac70fc28cc20c3402e31382a5bb3713ddfa608cd3bd735c2 SHA512 88c9f799b54e3a79df52416b92680ff4d37fb5aed78ab6685d56833f38310114ac3cac258906be27879548511baa2cfb499ca87883bed1e2c82a02ecb10b4cee WHIRLPOOL ba0b863a14424c111fe20438bd9d4558bb1eb7e935248cb7145aff24237f3516a5b19ff2d30d50db680423a2a2a43097a4ce50a8e9e4858057f5ad63154875cc
 MISC metadata.xml 832 SHA256 9ccfd52757644e218266ff90b4ea9ab35203531bbc36f44ab67f214bc5ca448a SHA512 0209f1adfd521cabc7b37a69d3ba8842a8d612487cb414d7aa16eccf461e78c4ab96c1387606badb896acd6a7a495697c30773c8eb5c74e949e22910212a9d44 WHIRLPOOL 5cf73605832e04c08442d3f4b990074403dffead964cc3f70325583ca6bdec171da125a0fe6613e83f49fc5d244287f58996f43b8fc8ae4c60d496fd093a2c4f
diff --git a/net-analyzer/dsniff/dsniff-2.4_beta1-r9.ebuild b/net-analyzer/dsniff/dsniff-2.4_beta1-r9.ebuild
index 0ea1f57476ba..a248b3cc0676 100644
--- a/net-analyzer/dsniff/dsniff-2.4_beta1-r9.ebuild
+++ b/net-analyzer/dsniff/dsniff-2.4_beta1-r9.ebuild
@@ -19,6 +19,7 @@ IUSE="libressl X"
 DEPEND="net-libs/libpcap
 	>=net-libs/libnet-1.1.2.1-r1
 	>=net-libs/libnids-1.21
+	net-libs/libnsl:0=
 	!libressl? ( dev-libs/openssl:0= )
 	libressl? ( dev-libs/libressl:0= )
 	>=sys-libs/db-4:*
@@ -27,7 +28,6 @@ DEPEND="net-libs/libpcap
 			>=sys-libs/glibc-2.26
 			net-libs/rpcsvc-proto
 			net-libs/libtirpc
-			net-libs/libnsl
 		)
 	)
 	X? ( x11-libs/libXmu )"
diff --git a/net-analyzer/ifstatus/Manifest b/net-analyzer/ifstatus/Manifest
index c6b4ff4833db..a1fd72f06ef8 100644
--- a/net-analyzer/ifstatus/Manifest
+++ b/net-analyzer/ifstatus/Manifest
@@ -3,7 +3,7 @@ AUX ifstatus-1.1.0-gcc6.patch 397 SHA256 d27ccad23815b517d1bd56a5b97ad2a0b71efcc
 AUX ifstatus-1.1.0-tinfo.patch 472 SHA256 3206a39f60b2174c38bc96bb3e942549fb579bdee074a42e49637b55a83bce80 SHA512 0b30c07113d2bd8012438bdefcc494d8a80e14143af9e2099d511f934d50995e3f9cf3fcbafce947c139753f118dbee484742241a1ee3ea85593012a4835b56c WHIRLPOOL eea8ce897de8efcfe90cc28ad1b71f9800fd9536b562592b164639d793a7f9a7ce923e8fefb86c136590db3bb640fbe036cf61e31fe398407c36067876dda95a
 DIST ifstatus-v1.1.0.tar.gz 25233 SHA256 0ca8a8655a1edf07698efbd5e1d4adc962dbb1bfb078b4899062e89bb05eac10 SHA512 2660310be7186067315414218e3d3d269499e391c7ffa12022ac53a0456ddbe0f7d5562b788fe6b2569b7d0eba7acf5699e0386769a91606a3e14b51239a2766 WHIRLPOOL 7aebc62d229160a07a28e876d2d7daa6847ed16d6c6b0f457de70d85584afce36f6e4903befb383720426f6ee20def4d1d02245fabf8671a6df367517d2a648b
 EBUILD ifstatus-1.1.0-r1.ebuild 897 SHA256 2f1ced83f8dc72cbb326abbb4de97aa3b01f97a3ded12134c14c6cd2d842cf69 SHA512 71e51872bfb0653fa56446ee7be7c5e09f4dd88ebd41d670c7ef1ac769b480a66437ab739a84418b1a86dce9beec9fac822b96e2fe0456b58c5e00d5e47d7b6b WHIRLPOOL 0ea24e6583a26380487a89bf9fdcd44940a27b1ac2ac3ae5cc5cdf9f7c566d9ac30670a4ee10803f090c619ab1b35271d0bd9f06bfb75bc755ee8c24b7646baa
-EBUILD ifstatus-1.1.0-r2.ebuild 930 SHA256 090de08d43be72e3739b986de63d2fb141b84c01013f087851aba46afb675816 SHA512 cb6db21e6b3e09a0488ae5a6f3f0735b765ff56f023a605960f02a3e81e7d8757881f53324dd761d25d44c766851ca606232bcf02e0ffb8ce2c49e7c5286e12f WHIRLPOOL 3e1d4c5b8da478e02a1e75424f9172a1df3dfa81f8367bf60f669020d4a245d16565d079f3cd74290f89f2a6af1ec42f592e28bc189d90fefabb1f525569d4d5
+EBUILD ifstatus-1.1.0-r2.ebuild 929 SHA256 754e8c0f5ee1e2e342b22148d9a98949d39d19e2c5de6329296cd470e9fd0adc SHA512 5e00b0dee8651aafe502ad81b89fe88a74b6d78fd91991fe9129de8a03a1d3d01a034a9c20574f89623a69aa8e233bb17de1c2e3da1ef4c64e91afd194764661 WHIRLPOOL aa9d5dfc3c0ba3c1be8c8214b8e106a79069c827b86ade1991d9b34ab349bf08b78d2032a9198942433585a82796e689fb2c222b6a4b4635b665aa74f1f36e19
 MISC ChangeLog 2512 SHA256 0c2cc57a849fd2b11e60ba40aa1b6defa0f5f228bba97c3b7ab40e115c766275 SHA512 02a80f476fffbc87d25c4aeb2d3af82d719afc923559c10f92e72799eb83166900678b6eec059d484c41f4e2accf772a887be79db1ddd16100d768cd42f7e5e9 WHIRLPOOL 8ec55abf53e17de826029fedc6dfb319181fe9d422eea8300849a0e042da50bc388b50347509846d4b2c4a1c61f9cb0e2f1870dee78c347be70134645836b287
 MISC ChangeLog-2015 2829 SHA256 800ae990ab28b0396c1ca27625925756348ba1fb1e75f2f89e8c7f8e6b26e953 SHA512 1ad26b9846faea01376f3f7195ffea9a41db1e654870113d5f254866003fd92d86156e71a594e0e0ce9b1d4d2e19556508b4b7c51f9e7bc5e7e164085113bbd3 WHIRLPOOL 9d9944020146238167408284645b9d6275f5736348f359dd27321421cf46aba351c63db90990e802052575027aad17f53207aeb1fdff842b074aa225c14c282a
 MISC metadata.xml 358 SHA256 702bea6dc122b1e98b1408004c4a30767a184c15119451fe9984e9e2f406a682 SHA512 b23a7f0e009c71d86cd145b033b4bc7f77e7a316f048d8236e9bb2bf9cd34671ec24af37b11ef934791c6f046e1a761087c7f5e570bac80b09e30862e162d005 WHIRLPOOL 40cba310ce594df402e63c6ce5967f6a18bce005b90d6d8473b7902d49428d3eda01268c4909b49dcaab6fcde7202bdb2ccc1f7bcf678b944ce8398eb66175b4
diff --git a/net-analyzer/ifstatus/ifstatus-1.1.0-r2.ebuild b/net-analyzer/ifstatus/ifstatus-1.1.0-r2.ebuild
index dcd4cdbcb380..d76e595171c1 100644
--- a/net-analyzer/ifstatus/ifstatus-1.1.0-r2.ebuild
+++ b/net-analyzer/ifstatus/ifstatus-1.1.0-r2.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 inherit eutils toolchain-funcs
 
-KEYWORDS="~amd64 ~arm ~ppc x86"
+KEYWORDS="amd64 ~arm ~ppc x86"
 
 DESCRIPTION="A simple CLI program for displaying network statistics in real time"
 HOMEPAGE="http://ifstatus.sourceforge.net/"
diff --git a/net-analyzer/nsat/Manifest b/net-analyzer/nsat/Manifest
index bd9e58fde5ff..cb24a575e31a 100644
--- a/net-analyzer/nsat/Manifest
+++ b/net-analyzer/nsat/Manifest
@@ -7,7 +7,7 @@ AUX nsat-1.5-strip.patch 205 SHA256 2506beca0f13fe9717857d7b9f10970adacf7dc5e3d7
 AUX nsat-1.5-va_list.patch 470 SHA256 63376bdfa6623806f73a122648069132814050e2460c6fd70721a542a9e78ef6 SHA512 1963419110a34b826d27b5b34e22ae71906380bc8a2ce130d374c00ad91827fab3781e97aadf417613f042d195ee9e85e50b898befff82190c7e031276903baa WHIRLPOOL 5f86e4a9609e83021e8d73db0a954bb8c964501b7140de1b66efae8f03aad8115b57465f7ac90cbb0f02d0797c53bdec84d5d07303641b3b69a502e4f63d289b
 DIST nsat-1.5.tgz 410603 SHA256 2ece807b3240a6e91ea88fd84c470a87de711c33554b231e071549388cb65114 SHA512 1a5b8e88f7bcacdbe1144a719a2e446c0ea025ad4e5f8c79ccb939083308cd2c1b2c1f3d7ab3b791924d5855994cbc3fded95aa36df23c12fd76fc20341a87d0 WHIRLPOOL 52cd94b75668bb3b7342090ec1ec9949b1e9324aabff4a0b03b251c0933829cd63eeb53877c463b282806896099ccbacaa01c390ef61c4b24e8c6d8e356fb5ff
 EBUILD nsat-1.5-r3.ebuild 1448 SHA256 378d9e538329914a4f572577988e673763e3d154d8228b8e68f61d3c325373ec SHA512 e9fed8fba8257ccafe401a4f16cbc70b9b8cace66342d6cbaadd70d88084fa84dc8a4a54e0b5047a201e159668ab3badf99f38a011f7130368b789043010d9d4 WHIRLPOOL bde059938ec0ae619e7286761aceaf5ab5951c216fe2e845f538f9bc42ebb51ccc6050f77bb043f6f5ead77a3ffb4374cdf5367335ca3df3384838e526b754e6
-EBUILD nsat-1.5-r4.ebuild 1547 SHA256 588a9536ef518aa5def79d94366ecc67f90f1179a33b494152d3b2d032afb783 SHA512 73263ccca5463bc90831b18d67a98e6274d917c2762778cb8de254e061466635b020947359a80eacb413a52d81faeb43e6d5d0ad82fb99acb4d1cbbbcdc561f2 WHIRLPOOL 721b3ff4058ffddfd26fcae6507a76a3ab68c02c4b1111640cc1b1a0d2fecf74b052eca170ba2a78db9e058c570779a91f57d77a07e19fa49d8f45551c472af0
+EBUILD nsat-1.5-r4.ebuild 1548 SHA256 1d4b7ac760e1d30127764f514ba59ea9b781f86962eaf00ded48cd2ff59bbad3 SHA512 6973436f22c62ffefdd76e198e3b436f28bd84dcf4ddab01c528f519d6d5268cbaca8da7531ef3cc95d908e683ed12287e076ee2a9adb8ba54158a6954f70a12 WHIRLPOOL 9524042e70dae2abf1062cff53c36a145716141b0f068985a7b164e5abe11b71ecb457a58ee0fd07814175cb76fbdd96b6a4796ab1f69f7c91d74598faa420bf
 MISC ChangeLog 2622 SHA256 0d90dd2dedd9f2c12713b7fa966edff8ad94b17fa45ed1c2417acb6e6f3e8da2 SHA512 a46e1b35772f7b270d4c93025dc10f420b205e3d7d7ded7da8eb054b433c1efd69495bcc26b2953b01e0cba99af9f18d2f82ba7748f2821bae453a7e3ec412f3 WHIRLPOOL 164ed425bf826645102952a0edf7acfc2534f2b91f8c35b4a1a6e2c1ff27f0ad039e3917d4915f61e30801fefe9af0a96b500deea2114648c6489a6990671586
 MISC ChangeLog-2015 3998 SHA256 f75a6955e6279f241e262e0fee9361e9419e6453f22284a41d29b5009cf5a7aa SHA512 7dcb73dba87135237423d2c11e0580cc88d96f00ee4d95130de1b55c1fbe6ea47a0a106b396510e623c2d3866a39f8256520e219acbeb2c50dbae63c06bef9d8 WHIRLPOOL 0c2d6b9016dc517797583cc973de6e897918a442f0bf5f3c8e7a67b4d53c35e81476235b38314070e4552fbd43fa65feedbd3ac11b130a69d7718f39418d51d1
 MISC metadata.xml 468 SHA256 d7e7522d2eb250adbc98a65264c6c5357a9820f1718a84510610249994a6c6ec SHA512 54bdd25a484a9b3f2ec4642494f4f8e9433c33f013eadc149a77b0ffc3455579a3598ba323344107143b41ae81e1cef6195dcab5b38c6f093f804e468a650454 WHIRLPOOL 743139eea81ce4311ec612b9624ce2720d4fde08ca6cb85c472067c3ec29addcd6bc1b336995ae0e2eddd3cbc6ad0723e8c9a0ec1d521e7b06e312619d7ce1fe
diff --git a/net-analyzer/nsat/nsat-1.5-r4.ebuild b/net-analyzer/nsat/nsat-1.5-r4.ebuild
index 52381d75fcfb..71f484cf1270 100644
--- a/net-analyzer/nsat/nsat-1.5-r4.ebuild
+++ b/net-analyzer/nsat/nsat-1.5-r4.ebuild
@@ -15,6 +15,7 @@ IUSE="X"
 
 RDEPEND="
 	dev-libs/libmix
+	net-libs/libnsl:0=
 	net-libs/libpcap
 	X? (
 		dev-lang/tk:*
@@ -22,7 +23,6 @@ RDEPEND="
 	)
 	|| (	<sys-libs/glibc-2.26
 		(
-			net-libs/libnsl
 			net-libs/libtirpc
 			net-libs/rpcsvc-proto
 		)
diff --git a/net-analyzer/snort/Manifest b/net-analyzer/snort/Manifest
index b5eaae398a7c..803b781c6080 100644
--- a/net-analyzer/snort/Manifest
+++ b/net-analyzer/snort/Manifest
@@ -18,7 +18,7 @@ EBUILD snort-2.9.7.5.ebuild 8546 SHA256 02d0c8eaa75186133291d83f5be812adb02f12cb
 EBUILD snort-2.9.8.0.ebuild 8546 SHA256 02d0c8eaa75186133291d83f5be812adb02f12cbf8dd7aba5dce4572d5094610 SHA512 d1c8a854ed5c4b43d58e1c8188ce6660db879610b09059791aab948c982990d47c3a39ec992c9e349490df5f9eb933ca21f1f135755a7ad7e4d10c5c04db256b WHIRLPOOL 73524c21d57c567a9c21bb903631ac2b89bb36e1b305cddcf47584c0e57830458e8bb82387947dc25c2e1ae31950414bd86be8272bb9fe246527216fa9e5f653
 EBUILD snort-2.9.8.2.ebuild 8546 SHA256 02d0c8eaa75186133291d83f5be812adb02f12cbf8dd7aba5dce4572d5094610 SHA512 d1c8a854ed5c4b43d58e1c8188ce6660db879610b09059791aab948c982990d47c3a39ec992c9e349490df5f9eb933ca21f1f135755a7ad7e4d10c5c04db256b WHIRLPOOL 73524c21d57c567a9c21bb903631ac2b89bb36e1b305cddcf47584c0e57830458e8bb82387947dc25c2e1ae31950414bd86be8272bb9fe246527216fa9e5f653
 EBUILD snort-2.9.8.3-r1.ebuild 8339 SHA256 c118e0af4d76ceb4d1150e00d47cbe4fc75e6b59a614fa20eb951901c564bcc7 SHA512 8c0ee1620090ce311512e199f3a3f117b563912871dd0d128f2a852f851c030027b774f8f61c6461902a38f1f47a6df96679a28fc9c30c12c578d9a5c19112de WHIRLPOOL e2acce337a3b66c1c9a5ff8651fd897bbdd3d089303f849e987ad923d236f999cd8283ae478524957b770ce4ffad158401ecc1edbaef54bf75bac993507e3c8f
-EBUILD snort-2.9.8.3-r2.ebuild 8522 SHA256 e1d083c77a8238d1a8e5d66b9f13690ea58f5b47c8913023bba2ee16c88c9d4f SHA512 fa50d23e9c72c35beec382841ed51dbaaee4c82b2ad633be5e3a90e7e332117325d05b6da86d5d0feacafcbe3c041c4e16f202b409fc7a9605688ccd54dff2d2 WHIRLPOOL 37fe73f1412be053c2c02e43ab83c38b092819b0ee81e42c211f227572c4ff72eac3370bcd08a20ab20c05b5ab2d254e09531fd10bddd3ff493c7be269899fcf
+EBUILD snort-2.9.8.3-r2.ebuild 8497 SHA256 6adfa761f79cd342b002723ed396e8ae31a7a3c0e2ee2544704c7ecadff23833 SHA512 24dcc8e8f35c58f3a269e80a81ab00ca50e41c04b395cc617c469c31a94574f7a2f453e09f2e9e62c8a89849c3dca3f7af79a062371882d6e0094fa10e4e0588 WHIRLPOOL 7855d24b1c7f423d6b54b8a59b4f2efa2eb36e6b51166dd6d72b9ac670f7bc703fb17b2d81b1b4108d9c05057548bdb7f4e8a070bf396aa475c86aded469682e
 EBUILD snort-2.9.8.3.ebuild 8546 SHA256 3f31b2696ed17f3984c1e39c729a2167aa73261ccdc332376715331a642ade3b SHA512 e2b0a6e303ef3cb0d906a6c809d3d12ff9c3540fe9cdafdea24579ca88c3adf53e1895b60035db42e2a7058e39e16b83798cd2818f42d7b64d89eb25471816f3 WHIRLPOOL 4a7f15a8fc0c734c545bd145fb460e2c62f5a0deef306569f3cac987b41e3f2d27cb3eba0a4ae952a37b141b492ead404fd00b9ed441e7e8518c9447bdf280c3
 MISC ChangeLog 4623 SHA256 c7311eeb028b9f8b2ad38bd55b74a04289a5a165cb71c9521e1bae8d9528a33d SHA512 db43e349b79046b727cd6f5ec4b7ea972353fe9f05b76495a2b3fc4719c16a12750f382aa2c7bc731a03a7586021da52e1e1cdfacfcb3868ffc1426603b2f851 WHIRLPOOL 13512ea19848d1024c4a671c6ec204c040166b57bd601e042223fd08cc011ff561b4686b81626fc0510fb1c0777d0cd4060f8ce1c4c6fc256a7309142ff06eb8
 MISC ChangeLog-2015 36554 SHA256 2ec7c84ae8da30cc4c2e1b6dea4a05910ce8dcc4b7a3b43bc10420b2396aa82f SHA512 cc24cde8374d0ad8ab31f403928e8cf313f9a0b4173b3de94bc4620b591821f0166531d932fdc64d2a71c64bf18d903472a7330714a4a6e96ac2231a2f0150d0 WHIRLPOOL ad5d457d0a2cb6a01ca18cd769106358ba1035af4cce893b6b67c26355481cc234b1c460b560dd04d6ea112243e9d8b0ed7941fde83b20b2d65c009249ad43bd
diff --git a/net-analyzer/snort/snort-2.9.8.3-r2.ebuild b/net-analyzer/snort/snort-2.9.8.3-r2.ebuild
index 161524dd7965..8fcbf6080db7 100644
--- a/net-analyzer/snort/snort-2.9.8.3-r2.ebuild
+++ b/net-analyzer/snort/snort-2.9.8.3-r2.ebuild
@@ -20,10 +20,10 @@ DEPEND=">=net-libs/libpcap-1.3.0
 	>=net-libs/daq-2.0.2
 	>=dev-libs/libpcre-8.33
 	dev-libs/libdnet
+	net-libs/libnsl:0=
 	sys-libs/zlib
 	!libtirpc? ( sys-libs/glibc[rpc(-)] )
 	libtirpc? ( net-libs/libtirpc )
-	|| ( net-libs/libnsl <sys-libs/glibc-2.26 )
 "
 
 RDEPEND="${DEPEND}