gentoo resync : 31.01.2018

19 files changed, 314 insertions, 140 deletions

diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 2dc84eb9127f..3d6fa46d688c 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/argus-clients/Manifest b/net-analyzer/argus-clients/Manifest
index 47d30b118836..03d6520c7662 100644
--- a/net-analyzer/argus-clients/Manifest
+++ b/net-analyzer/argus-clients/Manifest
@@ -1,7 +1,10 @@
-AUX argus-clients-3.0.4.1-disable-tcp-wrappers-automagic.patch 593 BLAKE2B fc642bf22101fb4503e0fc50cfceb1c0fb52e3d7dce3e04033fd3fb3c0be14bee7ce89f06199ff9249bc6143896384bdd6f23631975214c61ef53772c48cf666 SHA512 f817bd51125c4c0c8f17b651db2edb1be232440f0a3e3922588e23f5e26c0cff3d0682a0d23654386b5db318d39daa20c6bc94966925d98e62ebae225da74894
+AUX argus-clients-3.0.4.1-disable-tcp-wrappers-automagic.patch 521 BLAKE2B 729ad11ec1fce4bf6d795d7317bb124b7992d7b3800a4a9390af9b611839e5a355eddaedbafd1cd8661b2d3a94aca3a7952ec4e1601680c46fbfe61f08c7fd40 SHA512 63f3526e2c13820a8d58bbd0d4d2c19c289a6a59bfbe2b1d6593820304cf6cdc4159cb24ff019175016116f036c99c7a73947ca51a1ec18893948a09a651f28e
 AUX argus-clients-3.0.7.21-curses-readline.patch 611 BLAKE2B 046d31d75bef26da50b58fd646192437c25cff3a13752f5c94a3b5fab6f3f5ef265c2a51c9768e90b9bf8bbb197d363ab132f27f967b925ce19a98f66ed2020d SHA512 17910c0e2e2d3efefd1efe713bea5b394087415d103aa18254c7f8e8e4f4aae7d8670db8ab9d6045c145bfc0d5e804c653eca6e1c169813075c1af37ff01a0b2
+AUX argus-clients-3.0.8.2-ar.patch 767 BLAKE2B b13abee07d0d11319890e36d0dd3f446996eb0fe5ddda70d834873349c5b9bfdaa2029526ce2146efb88887b454c6019462908786f47b372e1d2de4f52a8dadf SHA512 793dec8cf09bb730b327a6af35e89b029922329d5e031767b840b1c974dd0ed3482f5590ee6b3f76480d0518139281474c849797df70ddd3013ac06822d0575a
+AUX argus-clients-3.0.8.2-rpc.patch 967 BLAKE2B b59450ad0a21eeb1e37d84f518e0e5417ab82f9e6afe5bca078e3dc14f8b52a0a07abc42040569d4d665145794187cf8f554310acd4f98cfab17f0046f381ad6 SHA512 3292d71b78be693901cd8fca3712d5f866185968e30747278d793b9c280091ecbd1f6e61390b48338b07dfa760efda96e1cbf15d279137a4f85991d69b7526cc
 DIST argus-clients-3.0.8.2.tar.gz 2776072 BLAKE2B 429a12d63f38ce1c5dae343be28543f3c8b6dd746661a893a0108db100762d60dec619cdccfff525b84c0843f0bb61c7e5d96df561a369e6df0d1e6a821d938a SHA512 20aac16bd6474b8f98c8fc86b21ad0b43aca62264c6de2f7f26eea876a90f7276cdaf2241a510a19ae445f40f5d0d05ec6a5869980b6889e6eb5937dbff0f855
 DIST argus-clients-3.0.8.tar.gz 2627515 BLAKE2B e7753ce1a65f24639c0c36d694033b038abb7cf835b89a1020edf72829f9196cad2a1be5958a28a51884c169ff7b4e295381501e61cf1e1eb1ee1557fccb6d8f SHA512 79022b3c3e472ebc526b27c20c25ae97abdb9a363a91ebbe3baf405f2aba9bdd80fbc0250b444d3d7ab4488e3c1325389a4719e92d9aded7598a91c3309369c2
+EBUILD argus-clients-3.0.8.2-r1.ebuild 1444 BLAKE2B 2d51bf4b6b8e255a1a5a94f6de100f31f4121c433aab8eaf2106f54b472c27bf90a49eea1ef7bfd98a045baa9892b1e799e501e21a4b5fe0325b286a2ea8bc3e SHA512 71019c1b0b3c8db335c8cefd2ee1f4699c47c15a1dab3b6b07db749918b88c160fcd245076e35530f7857ed33624906b0208334042d49c9332bff16c6fc60847
 EBUILD argus-clients-3.0.8.2.ebuild 1453 BLAKE2B f18f8d5c4e85d441b72e6490730dd6b6f9e0c04e433caa58b9fe297d2a40ba3f811f113a7739a8b7df67aafd07d254c7561703ff5bd5fad523879502567eade1 SHA512 b5fd648853deb3a81982a462da9e6ac1c8cbcc453fb6144e5afa303a6465f33daf846212e47d781c33b9e5a0737fa8fcc6dcb0edc4ebf4a1f59583606382851b
 EBUILD argus-clients-3.0.8.ebuild 1446 BLAKE2B aeb8501a05352c57c5cf5338ee19f598549d96df3d39da2864da8eefa32d3d59e48b0e8f89de39970524bba1a861a3dbf7b50110c815eecdd54258d1fa1f98cb SHA512 90119ef5268e3afafb73b97d4eab3b55d761609064b1d1f371f908715d49f81992d35d6f86466f312e106b014410b1afe4b6815d5b626a2e0485f74cd968f147
 MISC metadata.xml 383 BLAKE2B f19de1514d40bf02fc21d447b5d5eed6cf1917fff41a0462a993b0d7572d5d75ca80c6a2e7a0b1de83e9c167d5b5046e96a11ddc3d99595b79079cc4c76e5a54 SHA512 16728e62acf8d17d105ce0d0c0bd32197a9157544aeee9c9601ffc716ccd70cb126086b732c2814d5c4124f3546bb1fe7efddd27b7f686ae2c1960cbf7f90780
diff --git a/net-analyzer/argus-clients/argus-clients-3.0.8.2-r1.ebuild b/net-analyzer/argus-clients/argus-clients-3.0.8.2-r1.ebuild
new file mode 100644
index 000000000000..4abbc598cf21
--- /dev/null
+++ b/net-analyzer/argus-clients/argus-clients-3.0.8.2-r1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools 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"
+
+ARGUS_CDEPEND="
+	net-analyzer/rrdtool[perl]
+	net-libs/libpcap
+	net-libs/libtirpc:=
+	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="
+	${ARGUS_CDEPEND}
+"
+DEPEND="
+	${ARGUS_CDEPEND}
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.0.4.1-disable-tcp-wrappers-automagic.patch
+	"${FILESDIR}"/${PN}-3.0.7.21-curses-readline.patch
+	"${FILESDIR}"/${PN}-3.0.8.2-rpc.patch
+	"${FILESDIR}"/${PN}-3.0.8.2-ar.patch
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	tc-export AR RANLIB
+
+	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() {
+	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-analyzer/argus-clients/files/argus-clients-3.0.4.1-disable-tcp-wrappers-automagic.patch b/net-analyzer/argus-clients/files/argus-clients-3.0.4.1-disable-tcp-wrappers-automagic.patch
index a08d974ce893..8e240043625d 100644
--- a/net-analyzer/argus-clients/files/argus-clients-3.0.4.1-disable-tcp-wrappers-automagic.patch
+++ b/net-analyzer/argus-clients/files/argus-clients-3.0.4.1-disable-tcp-wrappers-automagic.patch
@@ -1,5 +1,5 @@
---- configure.ac.org	2011-01-28 18:26:54.000000000 +0100
-+++ configure.ac	2011-04-20 00:09:37.000000000 +0200
+--- a/configure.ac
++++ b/configure.ac
 @@ -121,6 +121,12 @@
  esac
  
diff --git a/net-analyzer/argus-clients/files/argus-clients-3.0.8.2-ar.patch b/net-analyzer/argus-clients/files/argus-clients-3.0.8.2-ar.patch
new file mode 100644
index 000000000000..e5df5378ab17
--- /dev/null
+++ b/net-analyzer/argus-clients/files/argus-clients-3.0.8.2-ar.patch
@@ -0,0 +1,31 @@
+--- a/common/Makefile.in
++++ b/common/Makefile.in
+@@ -113,23 +113,23 @@
+ all: $(LIBS)
+ 
+ @INSTALL_LIB@/argus_common.a: $(COMMONOBJ)
+-	rm -f $@; ar qc $@ $(COMMONOBJ)
++	rm -f $@; $(AR) qc $@ $(COMMONOBJ)
+ 	-$(RANLIB) $@
+ 
+ @INSTALL_LIB@/argus_parse.a: $(PARSEOBJ)
+-	rm -f $@; ar qc $@ $(PARSEOBJ)
++	rm -f $@; $(AR) qc $@ $(PARSEOBJ)
+ 	-$(RANLIB) $@
+ 
+ @INSTALL_LIB@/argus_client.a: $(CLIENTOBJ)
+-	rm -f $@; ar qc $@ $(CLIENTOBJ)
++	rm -f $@; $(AR) qc $@ $(CLIENTOBJ)
+ 	-$(RANLIB) $@
+ 
+ @INSTALL_LIB@/argus_output.a: $(OUTPUTOBJ)
+-	rm -f $@; ar qc $@ $(OUTPUTOBJ)
++	rm -f $@; $(AR) qc $@ $(OUTPUTOBJ)
+ 	-$(RANLIB) $@
+ 
+ @INSTALL_LIB@/argus_event.a: $(EVENTOBJ)
+-	rm -f $@; ar qc $@ $(EVENTOBJ)
++	rm -f $@; $(AR) qc $@ $(EVENTOBJ)
+ 	-$(RANLIB) $@
+ 
+ scanner.c: scanner.l
diff --git a/net-analyzer/argus-clients/files/argus-clients-3.0.8.2-rpc.patch b/net-analyzer/argus-clients/files/argus-clients-3.0.8.2-rpc.patch
new file mode 100644
index 000000000000..e140fa96b2a3
--- /dev/null
+++ b/net-analyzer/argus-clients/files/argus-clients-3.0.8.2-rpc.patch
@@ -0,0 +1,34 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -40,6 +40,7 @@
+ AC_PROG_INSTALL
+ AC_PROG_RANLIB
+ AC_PROG_YACC
++PKG_PROG_PKG_CONFIG
+ 
+ AC_CHECK_PROGS(V_RANLIB, ranlib, @true)
+ AC_QOSIENT_LEX_AND_YACC(V_LEX, V_YACC, argus_)
+@@ -82,6 +83,12 @@
+ AC_CHECK_HEADERS([stdlib.h stddef.h string.h strings.h sys/file.h sys/ioctl.h sys/param.h sys/socket.h])
+ AC_CHECK_HEADERS([sys/mount.h sys/time.h sys/vfs.h syslog.h termios.h unistd.h values.h ifaddrs.h])
+ 
++PKG_CHECK_MODULES(libtirpc, libtirpc,
++	[LIBS="${LIBS} ${libtirpc_LIBS}"],
++[AC_CHECK_HEADER([rpc/types.h],,
++		[AC_MSG_ERROR([Cannot find <rpc/types.h>])])]
++)
++
+ # Checks for typedefs, structures, and compiler characteristics.
+ AC_C_CONST
+ AC_C_INLINE
+--- a/common/Makefile.in
++++ b/common/Makefile.in
+@@ -48,7 +48,7 @@
+ 
+ CC = @CC@
+ CCOPT = @V_CCOPT@
+-INCLS = -I. -I../include @V_INCLS@ @MYSQL_INCLS@
++INCLS = -I. -I../include @V_INCLS@ @MYSQL_INCLS@ @libtirpc_CFLAGS@
+ DEFS = @DEFS@ -DARGUS_SYSLOG
+ 
+ # Standard CFLAGS
diff --git a/net-analyzer/argus/Manifest b/net-analyzer/argus/Manifest
index 5e83ea5f80e9..322ae58f03c2 100644
--- a/net-analyzer/argus/Manifest
+++ b/net-analyzer/argus/Manifest
@@ -1,7 +1,7 @@
 AUX argus-3.0.5-Makefile.patch 437 BLAKE2B 95d853328925c46dcf9ff3edc98be0ce581cf9349f75f94cfb3eb122b9e78c353187ec5a26d646468df55bbd1d63106f33908f0c8395d4b8f08addaa5e5e3916 SHA512 cec8fae0027bcd48bf878781ed5b0352a1501cdd6a0470a76b6346aab3587b275d877434e1a3feddeebe3f4e166d42d07fd007a4b60cbef15d29076c188993b7
 AUX argus-3.0.7.3-DLT_IPNET.patch 538 BLAKE2B b909831f15f56d34281d8001dd525a0e8f3ea76ae5449c682b7727237ad8a2ee6d55d6da8f45d34581f393464ae9c3a4a5f74aad7dcecee0f3c5378581d3fd92 SHA512 3f52c9531675713177cecb208d4b9c11e26ce60c4fa2e932520969dcbf74f37979443c2ad5039e61b803385058ea6a45e19afeed9f4b815a4dbf43ee5628621c
 AUX argus-3.0.8.1-disable-tcp-wrappers-automagic.patch 591 BLAKE2B 2a04cb018d385820e6bf7fcf2bcf20abf92bd3c43e11dadb9a0c4e2727d60dcc90aa1eacdc220ed3ce23ecec811eb1e1f8dc5156104072d965c2459ae1fd82d7 SHA512 325cdc2c18ccf8665db11ab52f500395a0a76660c4c6d2620c8500a966e5f432c77d53b88549825bb90378929c6be47e35db792b59a9e74acec45a8c8ff73037
-AUX argus-3.0.8.2-rpc.patch 1777 BLAKE2B 2cc3bef0ad0f2ff5b573b292c9f4b5589693ed788165ee25571adcee9963921d49cd77eaa9806aca28c70661aab0287ae448cd4acb2658a71b0504441acf7980 SHA512 4556b784719b14508d4950c935a2fb9e8a9e195257b609ad85869000072339983b3a293ebe0b03c82b9d9f336b6da1a228d1a4266bc474004fa7882d09aa66d5
+AUX argus-3.0.8.2-rpc.patch 1425 BLAKE2B c71d72db164a343114ac39f754cdd7a9d19bf4338ea809966c5de1de5a71d6c339a11021207c1c20f5029052e6ce7cc43298e227574a96369a9fee1c40adc3e2 SHA512 61136d8d736429a4e291f0a92e47bb02ec5706e0e9e8b68db4e5213baebff064427733edd054d163e582ed0288209d008b38b7f1ab77f54b1968f246b8c6db77
 AUX argus.initd 365 BLAKE2B 1b7841cd53679b10444a1da1af0f0226bc84c08e9e5427f964622c03f4a8661997cd2b31db35d804f7373ca89ca4eca006662c6d08d26d6b65d13c209ae92aa0 SHA512 54cbc2a0d92e5d0813ff6aecbf5f6d083e7de708a974af8aa90ce112e2d697b53b00e7918405973f487b2d9733bd2326a083ed13b52ee8dbbda4b06b73d95231
 DIST argus-3.0.8.1.tar.gz 523375 BLAKE2B 785f68d3977b72146a57c1a1fb6c40d80cce1b9c4e5ca46555ac12766fd8885f657997da8f54a5d0610ccedf2ed652231c15518dc631d61051edae75c57849a2 SHA512 d96332849df7ce2297aa0d81a9f22c12763d04b2936ffaffc0e4b1942535846cfbc41dadf28791eb88d1ffd0429bdc280d16dff44369c415c713064849b158f7
 DIST argus-3.0.8.2.tar.gz 524749 BLAKE2B 4d93fd8acd71b198da712961d75f0e813f5ed3fde841e77b8a10c3a9b89571902b7597969a4be12437c97ffc69ba5ebefaee8b684c5d2d4ce4f1309c1cfd1199 SHA512 146795880d8697e065ed23d2fbab226846d55db0b71945c5a4cab2896e48ceb6e1671ccb4e00dc3b0f984525bac4ced3773f3b9e70c3ea5f7c6972fe9bd94313
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
index 462d465609f1..96af0caf140e 100644
--- a/net-analyzer/argus/files/argus-3.0.8.2-rpc.patch
+++ b/net-analyzer/argus/files/argus-3.0.8.2-rpc.patch
@@ -1,6 +1,5 @@
-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
+--- a/common/Makefile.in
++++ b/common/Makefile.in
 @@ -35,12 +35,12 @@
  
  CC = @CC@
@@ -16,9 +15,8 @@ diff -ruN argus-3.0.8.2.orig/common/Makefile.in argus-3.0.8.2/common/Makefile.in
  
  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
+--- a/configure.ac
++++ b/configure.ac
 @@ -120,6 +120,25 @@
  AC_CHECK_FUNCS(floorf remainderf)
  AC_CHECK_FUNCS(timegm)
diff --git a/net-analyzer/cacti/Manifest b/net-analyzer/cacti/Manifest
index b99fb08f280e..4f959fc24680 100644
--- a/net-analyzer/cacti/Manifest
+++ b/net-analyzer/cacti/Manifest
@@ -2,7 +2,7 @@ AUX postinstall-en.txt 2249 BLAKE2B ec7a32177aca0ebec0194fc4dee825251a5ac71c1005
 DIST cacti-1.1.20.tar.gz 8903728 BLAKE2B 0efc22726540c57d9d6af71f80e9843bfee3d846ecfffbb8552511d06080c377ccfad8c8d19e21186b666c393d32a8f39196cb9caa0f005bb92f7c87c0fc316d SHA512 2d51c757916b366a188a3ab31771bafb6492aaa6ab2e778255945677bbb3f23f6fbfbb73ea9b05abf2f7cb26c0970bc208f68d5f1c016f8fe3b9da003dcd3b1b
 DIST cacti-1.1.21.tar.gz 8905650 BLAKE2B a6e579b7d846388a9b732465eecdb5694c226b5edc98c1a005bbb8c17a307fa4d6ec56342e77e68bc62302c29451527e634fbbe6a9788073f0c5608dac57b76b SHA512 383bfc24c038154fd03d8997cba0fdf8d87ee69305f392b254102b6c279c0b7e53562a2d3d1f996315152a36da467821876e3834dd7b62bdc057a3b7838b94d2
 DIST cacti-1.1.28.tar.gz 8953179 BLAKE2B a1a7c3e39cfdb0f47eee86131d2210fb209b351cf91b56b8584d90ef53d216ab85936d66942506415d7e2610bdf2aa5235430cc664edd05ab612815d60d42b18 SHA512 2816a78604d169951519404e4bfbf17377912efd7a8bf1ef2a262fde7414783e65ee4a6bcac7dd3175fd9942aebf475b7dbd1fe6d350f75cf88246d3561ef9e8
-EBUILD cacti-1.1.20.ebuild 1256 BLAKE2B acd5fc47cdc38cee840bec35a3e090c1f60c33892995ad05b933d3f3dc921db20963e384784ca295c1053ce76c5f840a09171c4121cbba22f8ef24638fabff45 SHA512 efcba1fe5319225ddf5a95dd231b45811c5ed868716c4a003bc62696fd202f640a36eac2a1e406241fce3ef14a0147c0d5fbedffc8a2c76986d01903ad14029e
-EBUILD cacti-1.1.21.ebuild 1259 BLAKE2B 667ef36b00fef1cbd608bbae4caaa21bc32faa5e49a9bca21eff1220a5b086feea6fe4e57998ced79fd22888b357d77f0a4c9efc9998c0bd5b21c52c8823af3e SHA512 e9f48fbc4348eb47d07c0d47272e001d0f815fa6527b2bb48989e818d4984bb042d19f4c0369f29cc7b2537c884b8c1483f1058c95720c8f440aa62bf4903884
-EBUILD cacti-1.1.28.ebuild 1050 BLAKE2B 55199db5379ee4c66f51c6b6ec2769292926ac2fdef295486d170362636e1320dc07c844d0ee17121c42b0baa3527611fc06a67c8fb0b23d6bfea312cdd0d707 SHA512 94bd12777ea28c602f9b5e3a2fe317afefc10833e3f4b3e4c7cc2218b8759e3347d53f2b78a94de5dcbf33f1610fd5e403c7bcef4a839c12f7255f46cca08d01
+EBUILD cacti-1.1.20.ebuild 1260 BLAKE2B 108e6629d2899ee824b7780d16767fab184ce3728dd393cd67d71eef0dc80f519403ce36892dd12f0b625ff9497d4d33a886ffe4c8d41b62e5755401b8ed7148 SHA512 eca659c97f78a3d6c07541f9e6704a2f30b7607f4105aef14e9fb3d8f5ebfbe4a597d9caf5b0c61c1ab2077c93022e77c123f6def9dad2acb7378af8f0e0bdf0
+EBUILD cacti-1.1.21.ebuild 1263 BLAKE2B 18d258e8b49dac987da9201380a7688637c0ad4ee97937038063813ef559ffe8eeb4e364acdca2389474664a4b48f41e38e12a8e45d373dd30393d00717fdce3 SHA512 48918c9e3f8619c23e8af4dad9c806fc65dfcc5c2b7478adde44cddcf4fe3201eb4e4a9c114517f1f4f809b98a017fb24096f988fa63b29f7094f44aa85a931a
+EBUILD cacti-1.1.28.ebuild 1054 BLAKE2B 6e526ffd0439381c33d07a8535da5b4d9fff7d1a9afa51a12b119565ec99972f48989ab8e60a4c8321d25efb0336d9f6221f4e4938b9e09148d2dd1dbfccb551 SHA512 77fd43ae932a181431a05e52520a7f8f00c9d29b55367b09f2064e3482165b2339c38caabafacce3cf6252a80ea44309d89a490a25717c1ca01c33a649e365b8
 MISC metadata.xml 834 BLAKE2B 964a66f49027e0190434a6fe4dfdabd9153cb9a44b8b23ee1a0331e9c38a9ca1480b35412a2088d2ffc7feba6232330e26c8156b4461d663cb8c3bebbdf0e250 SHA512 f74b807c0629400ad06ee2b03650be38524268b2590d455ab4b672bc2c6c13856f881226a7c1d6e74e1acb6f85abc3d5bd311abaa6571216aca7698e8368e616
diff --git a/net-analyzer/cacti/cacti-1.1.20.ebuild b/net-analyzer/cacti/cacti-1.1.20.ebuild
index d3b41fd3fc3c..e85926548ee1 100644
--- a/net-analyzer/cacti/cacti-1.1.20.ebuild
+++ b/net-analyzer/cacti/cacti-1.1.20.ebuild
@@ -18,7 +18,7 @@ IUSE="snmp doc"
 need_httpd
 
 RDEPEND="
-	dev-lang/php[cli,mysql,session,sockets,xml]
+	dev-lang/php[cli,mysql,pdo,session,sockets,xml]
 	dev-php/adodb
 	net-analyzer/rrdtool[graph]
 	virtual/cron
diff --git a/net-analyzer/cacti/cacti-1.1.21.ebuild b/net-analyzer/cacti/cacti-1.1.21.ebuild
index b0f3b50324d5..7d51a73050c1 100644
--- a/net-analyzer/cacti/cacti-1.1.21.ebuild
+++ b/net-analyzer/cacti/cacti-1.1.21.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,7 +18,7 @@ IUSE="snmp doc"
 need_httpd
 
 RDEPEND="
-	dev-lang/php[cli,mysql,session,sockets,xml]
+	dev-lang/php[cli,mysql,pdo,session,sockets,xml]
 	dev-php/adodb
 	net-analyzer/rrdtool[graph]
 	virtual/cron
diff --git a/net-analyzer/cacti/cacti-1.1.28.ebuild b/net-analyzer/cacti/cacti-1.1.28.ebuild
index 4dc1e3f0ccda..921139358544 100644
--- a/net-analyzer/cacti/cacti-1.1.28.ebuild
+++ b/net-analyzer/cacti/cacti-1.1.28.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,7 +18,7 @@ IUSE="snmp doc"
 need_httpd
 
 RDEPEND="
-	dev-lang/php[cli,mysql,session,sockets,xml]
+	dev-lang/php[cli,mysql,pdo,session,sockets,xml]
 	dev-php/adodb
 	net-analyzer/rrdtool[graph]
 	virtual/cron
diff --git a/net-analyzer/linkchecker/Manifest b/net-analyzer/linkchecker/Manifest
index 172d94af3c6b..63bef745f64f 100644
--- a/net-analyzer/linkchecker/Manifest
+++ b/net-analyzer/linkchecker/Manifest
@@ -7,6 +7,6 @@ AUX linkchecker-9.3.1-requests.patch 1870 BLAKE2B 6ac551b151b805f373b2bccf6d47e0
 DIST LinkChecker-9.3.tar.gz 719896 BLAKE2B f0fb43d320c0d82d5cb8fdc277e74c820501d602fd5ea0004155db8fa9b27976c0fcd5af23eb2ceda21315b94c13ac1d5aed5507555889f16b6b47a92a8c18d8 SHA512 26686e5373aaa942b631b5184f8bda8fbe1410c8875bf8499a2b61dc18b7bdfa29a3c18edf98c28dc189a493a3f5794a0020a0211b7d5d3814b33994603dcc59
 DIST linkchecker-9.3.1.tar.gz 779286 BLAKE2B eec374a3455b5348533b29b03ab14558dd19a20e1058947eed9d8027a8b1705b63525e6b8fcf2c4feb59a782ca0e0ad8567e321ca4679320e9d6f256e14df990 SHA512 355c9d262502e123732807b5aaabc17060d267de44a6dc1fee9dd6655c56320ded0c1ff638d985c2dbec366d15803cfb78fae4c1a9943de11c5b4292f5a99305
 EBUILD linkchecker-9.3-r2.ebuild 2016 BLAKE2B 735b62d47111032c2a2e1530f542516588d17752381741124f52a22b83c55179119f3b7775effee058ff4ae01279f32ad74a49c298fc729d843b0b8799703631 SHA512 daba5c569f2be5f22df9a7c8330a47cdb8aade0329e90ac682aef133fa0b69e2315bb0aaa6470327595c4d9c61f586c65263279890c3f79d710fa9b3e962d3b5
-EBUILD linkchecker-9.3.1-r1.ebuild 1942 BLAKE2B de9f519af202980a5d954d7a33301677594e4bcc183d0362b2ddef0eee830df433354d1000f827f68e0300034ab778bd56a3b7079a044cd46c6ee7d9dec1e994 SHA512 03d33e0203aeb0c36d39caab3456c599a281898acb3cb35e2a69723c39ae38bf2048f8e26643eb06b2b16443cdea3e9f26a1907190520537f79421af42643c88
-EBUILD linkchecker-9999.ebuild 1873 BLAKE2B d1afdc7f039b7eb2ffb83138e3d20ad7ed88c3d71d5c8e6cd482d578ab45b8860ef97fca67a8a5500f7a28cebfdc61c372cdbd3b30931ea460bcf0e7be3d85c0 SHA512 7857c356f300001bb66978ec65a006f19f334047723b152f62a83c9a219f69120c5e23f285d8884948f57ac5289767b48f551b513aa01569a340988bb1804670
+EBUILD linkchecker-9.3.1-r1.ebuild 1637 BLAKE2B 794e6321a44900f0aad5b2f0df7d9fb363ca899fb0dc658825cc3b06bc4d280b8aed25a6debcfeb92e3e5ade8cbb03e4a2dfcc1a4af1746f5143e4e76d1588b4 SHA512 9e053c21cce08d16f088285cea42f365a85569444d3f0be24cf253b9d4aa38474b9fa53637aaf7e3d8e0eee448d8030f6ce1394e0099c170b93c451339640edf
+EBUILD linkchecker-9999.ebuild 1195 BLAKE2B 91e070bf852276911bfa7550a40d287183854a5e503a7adacb1977b3cbdb7c668e17b9cc89fabe7b38c7f1fbfb2500b2e90dc3fc33bfaa5406b030ef5ffdf616 SHA512 8c07f7ad36675aa44905579f2ba56cc80b2b81693272bab03e87dde56f1893f66199307cc9d7498838f17ed55078a06315b2fb16788b613b411be9bda02b9cb1
 MISC metadata.xml 319 BLAKE2B dbf67b67a9a9a65ff108e9ee4c5881023a53533d9bbeee71e9ba1a55658f2a746b408859515f593ce2ef0fd93f938fbb17c5c7a70fa48eda4be977634d11e7c5 SHA512 2fbc3b85bcfd178e2614ef73d55c633e6e3b5ee59d39ca0a6099ffd7e8067e890f69252666d8d6d9a173371d95c4b1fbb8157cb94fd307ee20672fb9ff4182fb
diff --git a/net-analyzer/linkchecker/linkchecker-9.3.1-r1.ebuild b/net-analyzer/linkchecker/linkchecker-9.3.1-r1.ebuild
index 109499f785bb..77b392d670e5 100644
--- a/net-analyzer/linkchecker/linkchecker-9.3.1-r1.ebuild
+++ b/net-analyzer/linkchecker/linkchecker-9.3.1-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="sqlite?"
 
-inherit bash-completion-r1 distutils-r1 eutils multilib
+inherit bash-completion-r1 distutils-r1 eutils
 
 DESCRIPTION="Check websites for broken links"
 HOMEPAGE="https://github.com/linkcheck/linkchecker"
@@ -15,21 +15,14 @@ SRC_URI="https://github.com/linkcheck/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~ppc-macos ~x64-solaris"
-IUSE="gnome sqlite X"
+IUSE="gnome sqlite"
 
 RDEPEND="
-	virtual/python-dnspython[${PYTHON_USEDEP}]
 	dev-python/requests[${PYTHON_USEDEP}]
+	virtual/python-dnspython[${PYTHON_USEDEP}]
 	gnome? ( dev-python/pygtk:2[${PYTHON_USEDEP}] )
-	X? (
-		dev-python/PyQt4[X,help,${PYTHON_USEDEP}]
-		dev-python/qscintilla-python[qt4(+),${PYTHON_USEDEP}]
-		)"
-DEPEND="
-	X? (
-		dev-qt/qthelp:4
-		dev-python/markdown2[${PYTHON_USEDEP}]
-		)"
+"
+DEPEND=""
 
 RESTRICT="test"
 
@@ -37,7 +30,6 @@ python_prepare_all() {
 	local PATCHES=(
 		"${FILESDIR}/${PN}-9.2-unbundle.patch"
 		"${FILESDIR}/${PN}-9.3-bash-completion.patch"
-		"${FILESDIR}/${PN}-9.3-desktop.patch"
 		"${FILESDIR}/${PN}-9.3.1-build-fix.patch"
 		"${FILESDIR}/${PN}-9.3.1-requests.patch"
 	)
@@ -46,6 +38,12 @@ python_prepare_all() {
 }
 
 python_install_all() {
+	delete_gui() {
+		rm -rf \
+			"${ED}"/usr/bin/linkchecker-gui* \
+			"${ED}"/$(python_get_sitedir)/linkcheck/gui* || die
+	}
+
 	DOCS=(
 		doc/upgrading.txt
 		doc/python3.txt
@@ -53,23 +51,18 @@ python_install_all() {
 		doc/development.txt
 	)
 	distutils-r1_python_install_all
-	if ! use X; then
-		delete_gui() {
-				rm -rf \
-					"${ED}"/usr/bin/linkchecker-gui* \
-					"${ED}"/$(python_get_sitedir)/linkcheck/gui* || die
-		}
-		python_foreach_impl delete_gui
-		rm -f "${ED}"/usr/share/applications/linkchecker*.desktop || die
-	fi
 
-	rm -f "${ED}"/usr/share/applications/linkchecker.desktop || die
+	python_foreach_impl delete_gui
+	rm -f "${ED}"/usr/share/applications/linkchecker*.desktop || die
 
 	newicon doc/html/logo64x64.png ${PN}.png
 
 	docinto html
 	dodoc doc/html/*
 	newbashcomp config/linkchecker-completion ${PN}
+}
+
+pkg_postinst() {
 	optfeature "bash-completion support" dev-python/argcomplete[${PYTHON_USEDEP}]
 	optfeature "Virus scanning" app-antivirus/clamav
 	optfeature "Geo IP support" dev-python/geoip-python[${PYTHON_USEDEP}]
diff --git a/net-analyzer/linkchecker/linkchecker-9999.ebuild b/net-analyzer/linkchecker/linkchecker-9999.ebuild
index 82cfea75b987..38439a0d7a14 100644
--- a/net-analyzer/linkchecker/linkchecker-9999.ebuild
+++ b/net-analyzer/linkchecker/linkchecker-9999.ebuild
@@ -1,48 +1,33 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="sqlite?"
 
-inherit bash-completion-r1 distutils-r1 eutils git-r3 multilib
-
-MY_P="${P/linkchecker/LinkChecker}"
+EGIT_REPO_URI="https://github.com/linkcheck/linkchecker.git"
+inherit bash-completion-r1 distutils-r1 eutils git-r3
 
 DESCRIPTION="Check websites for broken links"
-HOMEPAGE="https://wummel.github.com/linkchecker/ https://pypi.python.org/pypi/linkchecker/"
+HOMEPAGE="https://github.com/linkcheck/linkchecker"
 SRC_URI=""
-EGIT_REPO_URI="https://github.com/wummel/linkchecker.git"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="gnome sqlite X"
+IUSE="gnome sqlite"
 
 RDEPEND="
 	virtual/python-dnspython[${PYTHON_USEDEP}]
 	gnome? ( dev-python/pygtk:2[${PYTHON_USEDEP}] )
-	X? (
-		dev-python/PyQt4[X,help,${PYTHON_USEDEP}]
-		dev-python/qscintilla-python[qt4(+),${PYTHON_USEDEP}]
-		)"
-DEPEND="
-	X? (
-		dev-qt/qthelp:4
-		dev-python/markdown2[${PYTHON_USEDEP}]
-		)"
+"
+DEPEND=""
 
 RESTRICT="test"
 
 python_prepare_all() {
-	local PATCHES=(
-		"${FILESDIR}"/${PN}-9.2-unbundle.patch
-		"${FILESDIR}"/${PN}-9.3-bash-completion.patch
-		"${FILESDIR}"/${PN}-9.3-desktop.patch
-		)
-
-	emake -C doc/html
+	local PATCHES=( "${FILESDIR}"/${PN}-9.3-bash-completion.patch )
 
 	distutils-r1_python_prepare_all
 }
@@ -52,26 +37,16 @@ python_install_all() {
 		doc/upgrading.txt
 		doc/python3.txt
 		doc/changelog.txt
-		doc/development.txt
+		doc/development.mdwn
 	)
 	distutils-r1_python_install_all
-	if ! use X; then
-		delete_gui() {
-				rm -rf \
-					"${ED}"/usr/bin/linkchecker-gui* \
-					"${ED}"/$(python_get_sitedir)/linkcheck/gui* || die
-		}
-		python_foreach_impl delete_gui
-		rm -f "${ED}"/usr/share/applications/linkchecker*.desktop || die
-	fi
-
-	rm -f "${ED}"/usr/share/applications/linkchecker.desktop || die
 
-	newicon doc/html/logo64x64.png ${PN}.png
+	rm "${ED}"/usr/share/applications/linkchecker.desktop || die
 
-	docinto html
-	dodoc doc/html/*
 	newbashcomp config/linkchecker-completion ${PN}
+}
+
+pkg_postinst() {
 	optfeature "bash-completion support" dev-python/argcomplete[${PYTHON_USEDEP}]
 	optfeature "Virus scanning" app-antivirus/clamav
 	optfeature "Geo IP support" dev-python/geoip-python[${PYTHON_USEDEP}]
diff --git a/net-analyzer/nast/Manifest b/net-analyzer/nast/Manifest
index e7e4abdcbe64..f6e2c3c57fc3 100644
--- a/net-analyzer/nast/Manifest
+++ b/net-analyzer/nast/Manifest
@@ -1,4 +1,5 @@
-AUX nast-0.2.0-gentoo.patch 3029 BLAKE2B 5a3e2974f3d4681dbd762e420878353b72f8a466630112e7b6ce4a32a81e59c7bae2568ae8c00a8438efc892be7fddfac2715bc1b3973a72cca38ca9ecf1849c SHA512 fbbd0b5d8426bacf64958032381d5d236d26985802b5c86327fd4102742563a56c7cb873e0f51758b1e2c3ed53d6bf7b57da497eaa401f5ed4eb32941d22adb1
+AUX nast-0.2.0-gentoo.patch 3056 BLAKE2B e64a4e76fb4c9b0bb4e325f5addae07d740f8b4d6dc76a4011e16a9dddcff137f5a3fba013f8d29db342cd08b37228e2daf7e78b18607e385e71b9eb7b84a4c4 SHA512 9ce75c031dde2a8460d187ee082d182d9aa60524475ca1a5972dce5e4b20c68275c90dfc7a7fec5ae2585a5815ca4dc2a9e059ba31de64ad4f890f811cfea4c3
 DIST nast-0.2.0.tar.gz 147568 BLAKE2B f51a0b3cebfac04cb3aa57f627099aecf893722ca8552c0e6f7f67266e13729e5c54c533cd7599c6d7cfa50c89ad5181439d4c1bc5bba883438213b45b4221ee SHA512 fbf29f9c2ae783e38d40054577a697f631c6590075ef80aa970002f1133c681a4cc1fcd715bc6140cc361c609dcebe8c6bf74544e8710363d30649398b3e388c
-EBUILD nast-0.2.0-r1.ebuild 744 BLAKE2B d2f84616a130610850c0ed17c7b027627dac6efb921a4fcb80fba38c533bdc483e71a899adaafef270879e492837e9e599b9e3e077c8357c3e448bc06a4e6d37 SHA512 5403f70c4b64204494a85443366348be0ef2fe02963d986f7487485141642d619c3042019e322f6ef0d0e8c5e9a2438bab79b944a2a113a30945e15d57a7a127
+EBUILD nast-0.2.0-r1.ebuild 746 BLAKE2B 1ce039f23876bf15ca06f509a6ecfaa8fa60337f818b33074e2426b9fb27aaf337f3f8e787cffe6c47b09c8c0e884d367adffb2999c1942097a802c32d140d18 SHA512 a28997e6077a1fc61467289fbbd584a01343fb2ff7561b3c09941175bc7a8a84ad5812f382cc8b62283dcde0374913954cf7b1901b13efaf8bc9cb49e408aca8
+EBUILD nast-0.2.0-r2.ebuild 754 BLAKE2B 09ec474b2d1d620508804a6e8e2cdb970b8e8cfc0ea3ef8588165e97bb24b8d4419969f54a7f381a06043427de7af5440fa5eb40cec849aa1a09c5397391ff50 SHA512 29526619e81a3eaafd2dd618566abec177ab7aa12d9cc4a5313f719bb1b8bdd0b0963a02134c3f6311a2e079677e8d51d01a2c434d331abb9b1e60074b906785
 MISC metadata.xml 362 BLAKE2B 71e940947887c3c558f6c84124909fef707dd02fd9fbaee18d58df8c0bcef64e01bb65731c64def6d619392b6ed35b2232054e31d63c3c3ab8a59e70c1a36276 SHA512 594d05be889c3a8d6019ee0762773f8abb71f4da276c3a546704ae4e073856fa404f5f9b466502b19423ac9e7f00ad8c2ef85d4adbfebf7fdd0184189e454148
diff --git a/net-analyzer/nast/files/nast-0.2.0-gentoo.patch b/net-analyzer/nast/files/nast-0.2.0-gentoo.patch
index f8f05ab3a16c..015354e51862 100644
--- a/net-analyzer/nast/files/nast-0.2.0-gentoo.patch
+++ b/net-analyzer/nast/files/nast-0.2.0-gentoo.patch
@@ -1,79 +1,104 @@
 --- a/configure.ac
 +++ b/configure.ac
-@@ -84,14 +84,14 @@
+@@ -83,22 +83,6 @@
+ # -- libnet --
  #
  
- filechk="yes"
+-filechk="yes"
 -AC_CHECK_FILE(/usr/lib/libnet.a,, filechk="no")
-+AC_CHECK_FILE(/usr/lib/libnet.so,, filechk="no")
- if test "$filechk" = "no"; then
+-if test "$filechk" = "no"; then
 - AC_CHECK_FILE(/usr/local/lib/libnet.a, filechk="yes" ; LDFLAGS="-L/usr/local/lib"; CPPFLAGS="-I/usr/local/include")
-+ AC_CHECK_FILE(/usr/local/lib/libnet.so, filechk="yes" ; LDFLAGS="-L/usr/local/lib"; CPPFLAGS="-I/usr/local/include")
- fi
- 
- if test "$filechk" = "no"; then AC_MSG_ERROR([
- 
+-fi
+-
+-if test "$filechk" = "no"; then AC_MSG_ERROR([
+-
 -Libnet archive file (libnet.a) not found in /usr or /usr/local!
-+Libnet archive file (libnet.so) not found in /usr or /usr/local!
- 
- Libnet-1.1.x Packet Shaping Library is required.
- You can download it from official web site: http://www.packetfactory.net/libnet
-@@ -111,14 +111,14 @@
+-
+-Libnet-1.1.x Packet Shaping Library is required.
+-You can download it from official web site: http://www.packetfactory.net/libnet
+-
+-])
+-fi
+-
+ AC_CHECK_LIB(net, libnet_name2addr4,, AC_MSG_ERROR([
+ 
+ Libnet-1.1.x Packet Shaping Library not found! It's required.
+@@ -110,22 +94,6 @@
+ # -- libpcap --
  #
  
- filechk="yes"
+-filechk="yes"
 -AC_CHECK_FILE(/usr/lib/libpcap.a,, filechk="no")
-+AC_CHECK_FILE(/usr/lib/libpcap.so,, filechk="no")
- if test "$filechk" = "no"; then
+-if test "$filechk" = "no"; then
 - AC_CHECK_FILE(/usr/local/lib/libpcap.a, filechk="yes" ; LDFLAGS="-L/usr/local/lib"; CPPFLAGS="-I/usr/local/include")
-+ AC_CHECK_FILE(/usr/local/lib/libpcap.so, filechk="yes" ; LDFLAGS="-L/usr/local/lib"; CPPFLAGS="-I/usr/local/include")
- fi
- 
- if test "$filechk" = "no"; then AC_MSG_ERROR([
- 
+-fi
+-
+-if test "$filechk" = "no"; then AC_MSG_ERROR([
+-
 -Libpcap archive file (libpcap.a) not found in /usr or /usr/local!
-+Libpcap archive file (libpcap.so) not found in /usr or /usr/local!
- 
- Libpcap-0.7.1 Packet Capture Library is required. 
- You can download it from official web site: http://www.tcpdump.org/#current
-@@ -137,16 +137,18 @@
+-
+-Libpcap-0.7.1 Packet Capture Library is required. 
+-You can download it from official web site: http://www.tcpdump.org/#current
+-
+-])
+-fi
+-
+ AC_CHECK_LIB(pcap, pcap_dispatch,, AC_MSG_ERROR([
+ 
+ Libpcap-0.7.1 Packet Capture Library not found! It's required. 
+@@ -137,25 +105,7 @@
  # -- libncurses support --
  #
  
-+PKG_CHECK_MODULES(ncurses,ncurses,[LIBS="$LIBS $ncurses_LIBS"],)
-+
- filechk="yes"
+-filechk="yes"
 -AC_CHECK_FILE(/usr/lib/libncurses.a,, filechk="no")
-+AC_CHECK_FILE(/usr/lib/libncurses.so,, filechk="no")
- if test "$filechk" = "no"; then
+-if test "$filechk" = "no"; then
 - AC_CHECK_FILE(/usr/local/lib/libncurses.a, filechk="yes" ; LDFLAGS="-L/usr/local/lib"; CPPFLAGS="-I/usr/local/include")
-+ AC_CHECK_FILE(/usr/local/lib/libncurses.so, filechk="yes" ; LDFLAGS="-L/usr/local/lib"; CPPFLAGS="-I/usr/local/include")
- fi
- 
- if test "$filechk" = "no"; 
- then AC_MSG_WARN([
- 
+-fi
+-
+-if test "$filechk" = "no"; 
+-then AC_MSG_WARN([
+-
 -Libncurses archive file (libncurses.a) not found in /usr or /usr/local!
-+Libncurses archive file (libncurses.so) not found in /usr or /usr/local!
+-
+-Ncurses library (*) not found in your system.
+-You can download it from official web site: http://www.gnu.org/software/ncurses/ncurses.html
+-(*): CRT screen handling and optimization package
+-
+-Building without ncurses menu support (-G flag will doesn't work)
+-
+-])
+-fi
++PKG_CHECK_MODULES(ncurses,ncurses,[LIBS="$LIBS $ncurses_LIBS"],)
  
- Ncurses library (*) not found in your system.
- You can download it from official web site: http://www.gnu.org/software/ncurses/ncurses.html
-@@ -174,15 +176,15 @@
+ ENABLE_NCRS="no"
+ AC_CHECK_LIB(ncurses, initscr, ENABLE_NCRS="yes"; NCURSES=ncurses/n_nast.o; LIBS="-lncurses $LIBS"; AC_DEFINE(HAVE_LIBNCURSES), AC_MSG_RESULT([
+@@ -173,28 +123,6 @@
+ #  --lmenu support--
  #
  
- filechk="yes"
+-filechk="yes"
 -AC_CHECK_FILE(/usr/lib/libmenu.a,, filechk="no")
-+AC_CHECK_FILE(/usr/lib/libmenu.so,, filechk="no")
- if test "$filechk" = "no"; then
+-if test "$filechk" = "no"; then
 - AC_CHECK_FILE(/usr/local/lib/libmenu.a, filechk="yes" ; LDFLAGS="-L/usr/local/lib"; CPPFLAGS="-I/usr/local/include")
-+ AC_CHECK_FILE(/usr/local/lib/libmenu.so, filechk="yes" ; LDFLAGS="-L/usr/local/lib"; CPPFLAGS="-I/usr/local/include")
- fi
- 
- if test "$filechk" = "no"; 
- then AC_MSG_WARN([
- 
+-fi
+-
+-if test "$filechk" = "no"; 
+-then AC_MSG_WARN([
+-
 -Menu archive file (libncurses.a) not found in /usr or /usr/local!
-+Menu archive file (libncurses.so) not found in /usr or /usr/local!
- 
+-
+-
+-Menu library (*) not found in your system.
+-You can download it from official web site: http://www.gnu.org/software/ncurses/ncurses.html
+-(*): CRT screen handling and optimization package
+-
+-
+-Building without ncurses menu support (-G flag will doesn't work)
+-])
+-
+-fi
+-
+ ENABLE_NCRS="no"
+ AC_CHECK_LIB(menu, menu_opts_off, ENABLE_NCRS="yes"; MENU=ncurses/n_menu.o; LIBS="-lmenu $LIBS"; AC_DEFINE(HAVE_LIBMENU), AC_MSG_RESULT([
  
- Menu library (*) not found in your system.
diff --git a/net-analyzer/nast/nast-0.2.0-r1.ebuild b/net-analyzer/nast/nast-0.2.0-r1.ebuild
index 1b4c53803c5b..9eefa451cd9c 100644
--- a/net-analyzer/nast/nast-0.2.0-r1.ebuild
+++ b/net-analyzer/nast/nast-0.2.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,7 +15,7 @@ IUSE="ncurses"
 RDEPEND="
 	>=net-libs/libnet-1.1.1
 	net-libs/libpcap
-	ncurses? ( >=sys-libs/ncurses-5.4 )
+	ncurses? ( >=sys-libs/ncurses-5.4:= )
 "
 DEPEND="
 	${RDEPEND}
diff --git a/net-analyzer/nast/nast-0.2.0-r2.ebuild b/net-analyzer/nast/nast-0.2.0-r2.ebuild
new file mode 100644
index 000000000000..493d47ee9f4b
--- /dev/null
+++ b/net-analyzer/nast/nast-0.2.0-r2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools
+
+DESCRIPTION="NAST - Network Analyzer Sniffer Tool"
+HOMEPAGE="https://sourceforge.net/projects/nast.berlios/"
+SRC_URI="mirror://sourceforge/${PN}.berlios/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="ncurses"
+
+RDEPEND="
+	>=net-libs/libnet-1.1.1
+	net-libs/libpcap
+	ncurses? ( >=sys-libs/ncurses-5.4:= )
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+PATCHES=(
+	"${FILESDIR}"/${P}-gentoo.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_compile() {
+	emake CFLAGS="${CFLAGS}"
+}
+
+src_install() {
+	dosbin nast
+	doman nast.8
+	dodoc AUTHORS BUGS CREDITS ChangeLog NCURSES_README README TODO
+}