gentoo resync : 27.10.2018

14 files changed, 89 insertions, 184 deletions

diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 28c6598ab103..c27ca9659a1d 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/argus/Manifest b/net-analyzer/argus/Manifest
index a7702f2b9296..d61af810bbda 100644
--- a/net-analyzer/argus/Manifest
+++ b/net-analyzer/argus/Manifest
@@ -3,9 +3,6 @@ AUX argus-3.0.7.3-DLT_IPNET.patch 538 BLAKE2B b909831f15f56d34281d8001dd525a0e8f
 AUX argus-3.0.8.1-disable-tcp-wrappers-automagic.patch 591 BLAKE2B 2a04cb018d385820e6bf7fcf2bcf20abf92bd3c43e11dadb9a0c4e2727d60dcc90aa1eacdc220ed3ce23ecec811eb1e1f8dc5156104072d965c2459ae1fd82d7 SHA512 325cdc2c18ccf8665db11ab52f500395a0a76660c4c6d2620c8500a966e5f432c77d53b88549825bb90378929c6be47e35db792b59a9e74acec45a8c8ff73037
 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
-EBUILD argus-3.0.8.1.ebuild 1850 BLAKE2B 838f107c5e002894480cd4f82e5b4b3c12662cca9dcbf9362089b69911c365fb4420b270fdd2c0ed1d709bc84e60bca4a15863d72114eb467459514a7c04a7a4 SHA512 7fae97954944c0c5d22f8a688a3ceeae803309c3b0f5d1d2c8144ef6fcc840e8997820d1974b3e1fbd0e72fdda3071d0b9641c59de43c098ce4aff8648448c87
 EBUILD argus-3.0.8.2-r1.ebuild 2051 BLAKE2B 07a38831af71a6b58a65cb5a04572ea82fdd3814d1227b06ecf5fdfbb2c8acd70832b506dc21542680f14186d0c1af0acc80c0304fd236f03c52d888fda3d916 SHA512 5c7cd31160f04f545109716ff050b8ca235d17bf2a4c92b1e75ee1af1e5fddfc2c318f5f3d6e6256689f326f0c4b878a7373be904eeedc7819c3ad9e2e060f01
-EBUILD argus-3.0.8.2.ebuild 1876 BLAKE2B 7f01ccbf95c2cc9990acf77d0443c6eb5b453eac19867007359b5434306eb7e5d505ceb1a914276c9b311c9d7130402aa3eeb4e311688dd415f3770d56ed19ea SHA512 70832f5bc42829924d7667e79018eb859e381b4cc0811e8147fe9e87b9170ff4f5250c18f020af9fe376da7cce98afca031b4550217608e3e8ee0a29cb8e8ce9
 MISC metadata.xml 468 BLAKE2B ce716483a5c126030c044618343341e853b367516f0fb6142b5cf7140738a5950eec5fcc514a856dd119310d7a1e05adab9f4ac0e802e01ee873a6c81f14a2e4 SHA512 64c97706da7a48ebaf5d3bd9aecdd11b1eff9516d5e99993ba65217b169c503bb509fdf19ade828925c85a82573b186aab89991b5870161681c42985a244771f
diff --git a/net-analyzer/argus/argus-3.0.8.1.ebuild b/net-analyzer/argus/argus-3.0.8.1.ebuild
deleted file mode 100644
index 605285628f0b..000000000000
--- a/net-analyzer/argus/argus-3.0.8.1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2015 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="http://qosient.com/argus/src/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="debug sasl tcpd"
-
-RDEPEND="
-	net-libs/libpcap
-	sys-libs/zlib
-	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
-"
-
-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
-	eautoreconf
-}
-
-src_configure() {
-	use debug && touch .debug # enable debugging
-	econf $(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/argus-3.0.8.2.ebuild b/net-analyzer/argus/argus-3.0.8.2.ebuild
deleted file mode 100644
index 927bbe427308..000000000000
--- a/net-analyzer/argus/argus-3.0.8.2.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2016 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 sasl tcpd"
-
-RDEPEND="
-	net-libs/libpcap
-	sys-libs/zlib
-	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
-	eautoreconf
-}
-
-src_configure() {
-	use debug && touch .debug # enable debugging
-	econf $(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/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index d581f8620b43..7f687e3d2623 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -5,7 +5,7 @@ DIST icinga2-2.10.1.tar.gz 4406432 BLAKE2B cccc60f63faabed43f9a99f313e3835c15afa
 DIST icinga2-2.8.4.tar.gz 2510333 BLAKE2B f551a5eadc93d8455612af40e34a0922bc75f41b8064f9989c8f0c28dc2c3fb18963cf9b3272efa29f03973e7cf5824762bebff1bfa1a23c4ba39c93fc29c8e5 SHA512 b2cb5989962ac65da927cbdbac1b3345c913321d507b5113f32dd90bf969b2513478e68d52b9cd4cf255057d74428f9e42067288b7ddc59ad060ca7b84f4f114
 DIST icinga2-2.9.1.tar.gz 2193190 BLAKE2B 29be491c4b43e218ef8aaa2128822040ccb0989e91d83f033cf7873216e4307cdbc8ee9052d79fd22220c396efeb68759acc97938e3ee596e0820e3f6c8f73bc SHA512 1d69a24f85249386e30ff1625cf522ba58e5f2ab641dbe950bf1764324a6c7516d1532942954e842002566823b0f30383747d5ec8b7bd36705aa5f0ccfa29533
 DIST icinga2-2.9.2.tar.gz 2194226 BLAKE2B edf3309711657437439db907f39d9dd04b57ae6b245f4299cfdfc9e8c27d18bdfa704dc5c1459a94d47985103979915a5d2d8594072586cf908e5f8a9d209ee6 SHA512 75a638a37f66a68f47ec161be4bcadbd1ca0e121143528d08d83170209e0b117fa12b1b9a03d1c1550f495bfd0509ca15f4d80be618177f2791b7a1a69308f99
-EBUILD icinga2-2.10.1-r1.ebuild 4739 BLAKE2B af9e0e626730fb2514cd38c8decf2308046beffffba6df1e5768593da0941f23a702913af03ca67b0a4034dc59cc7a5f0745fe36903a9bb7c4665a4bd06c1705 SHA512 3f6d8bda9d1f4729d3abf162d1d8d883e7da4310a29d83d8468ced54db64b84caf9c27d2c10b128d2ec8d7aeb9cd654c5416904d8deade3b243ec8a851711f06
+EBUILD icinga2-2.10.1-r1.ebuild 4737 BLAKE2B e4df75153cd908b76f323f10eb6413615aad342ddb19c84303b47ce43d9b188b897a49e1c27580039b59627879071a462f5473aefebcc82f2f9d3f39a8683ce0 SHA512 85cfcb9e2fd81289ff39b48e36db648fec4b9a766323ad6aa75daec753b49249a47f635e4f3ad8ebc6528a0c5908afddcde6beea4e47fc7e2e11a29afd1a05ff
 EBUILD icinga2-2.8.4.ebuild 4604 BLAKE2B 074505319ffdb68d93df79dbfe6c2a88a971b1a188e28526dd97e131d7494e6076173cbe9b8ee3599c7deecb62610f23828f0c107460555d47394d29f81eedbe SHA512 be570d2178c8750227b1dfb46c682a1805696fe9b46241f6ef9f59fa1e6ac9886d7e88cc14bcd5e094cd3671f49dfa1ad91046d3e08288b8266f888fde37a2a1
 EBUILD icinga2-2.9.1-r1.ebuild 4433 BLAKE2B aac55d84d5e6318524227b9477fa895d185d87dae43fabad5c0514580799d13f0f4d7c70bdd302333fb467cfdbfd77096ee99f9b15155d22c65c7c14be56ba5d SHA512 40a3f58a913c481d2e54550e7c9b6186f22542225fa069a06228d31a80868b6472ab7df1f5c5640eabcae9f70add5e3562084d27157505689980c0e8a5598331
 EBUILD icinga2-2.9.1-r2.ebuild 4742 BLAKE2B e16c72fda3de6b45a4f6f3682d683f8e037a3a2f3dbbea136f7c9c2a013892938586d2094cce045a81564046a80a9ba7bfa0f5925b92c3266695a24054235295 SHA512 2201d7a9f01dab71ed53245e9447044d928eb444da952f71aaa366bf27f5e9965e742ea70efd59064ffbc765940445f4b35b7cf5767524379e43a130da0b89fd
diff --git a/net-analyzer/icinga2/icinga2-2.10.1-r1.ebuild b/net-analyzer/icinga2/icinga2-2.10.1-r1.ebuild
index 913217ef694f..e19f3c3869b0 100644
--- a/net-analyzer/icinga2/icinga2-2.10.1-r1.ebuild
+++ b/net-analyzer/icinga2/icinga2-2.10.1-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 if [[ ${PV} != 9999 ]]; then
 	inherit cmake-utils depend.apache eutils systemd toolchain-funcs user wxwidgets
 	SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 else
 	inherit cmake-utils depend.apache eutils git-r3 systemd toolchain-funcs user wxwidgets
 	EGIT_REPO_URI="https://github.com/Icinga/icinga2.git"
diff --git a/net-analyzer/netsniff-ng/Manifest b/net-analyzer/netsniff-ng/Manifest
index 7aab0a01fe11..04162ee18ff5 100644
--- a/net-analyzer/netsniff-ng/Manifest
+++ b/net-analyzer/netsniff-ng/Manifest
@@ -1,6 +1,6 @@
 DIST netsniff-ng-0.6.0.tar.xz 554612 BLAKE2B f677c0988f9b8c59c536a278abf996bec9d30ac20b252aeccb577cf9a3ceb09855023285d98a5255864f17df746f67bffdc1dc7d5f51ae7a7ab678a6f64a06a0 SHA512 a77d548cc16ef175b120945428e07e8ff2aaabba6add239b7f42429811bbb6e024ace92a15944551c45025b185f1df5aa3dee4500ff9ecb30536ec9a8deded74
 DIST netsniff-ng-0.6.1.tar.xz 565956 BLAKE2B ed965ee91c3d4bb6f339f983ee67052633f1fb90da114e1086672342adeec06ca2fa1b70a210b6a7cd43baacf59ff2c2b7fa72c2ea3e9477ba12055d0f34f50e SHA512 a07f3d5f85c517e220db53ac3a93e6337e49cbc8d69b730261697e765e449fa25024782b2b4fac089288f8753471e2fca3162b55c3bb2a9fcbbb10b96391efc1
-EBUILD netsniff-ng-0.6.0.ebuild 1321 BLAKE2B d55a5b963a0534bb571e3dce152a88966092376f9ea21fe741d4891c0d3fb84d5b330d6b6e69109259570520987941fb758ae5ec694402ec17c874899ca891b1 SHA512 4f7ed0c859b578c46c70f7eebdd6bc52e9089c44b8e0a377f8c43d71168f925f5899909487ca46ce6ec2c024c90640b1a3f3f57829ee9ad0985163880c152f7a
-EBUILD netsniff-ng-0.6.1.ebuild 1325 BLAKE2B 9c64bdced3e60be17ef2602512b84bc5a42c5446f541b22d90ef2d6b70d8d728061fe465defe7262cbb3ca38791d3d8ccbc4b30e9f52afe73ed2b913ba939d58 SHA512 045263865525333ae322df331a9cb3ae8e4a0f33830fdce32b44716d6673153ec7b343a19e106b436de899a8b3fd848f6fa043c0022effcc7a97359fbdcc8e30
-EBUILD netsniff-ng-9999.ebuild 1322 BLAKE2B 668391cba5d72c437917c17b7041521c2131965eeed6cdf329bbf60c12559a97148653d316a864b8d88bb23575beabd9d0b40ac66025717997f78bbeb4041028 SHA512 394706e0cd216bd5c458afa689a0544f6f98e9c33fbf5f819e65ea00c0226dab931a8227e0246e7e2a17cac3fa26e2da6d10ddd59b2a8d17d822885859c5ff70
+EBUILD netsniff-ng-0.6.0.ebuild 1320 BLAKE2B 68cee00362c24a31186394df316e552d44c0786782fb8ba045d73b1f82b8cdb6fc0fbfb706bef130dc48d2bd4abf1f243b9d4bb084812f13860cac148a2f84aa SHA512 5dde5693a54ccf3a4aeb39dda5ff03eb3e966388e1e157c910c8bfabb9a7f0f75cb1e934361962ea8ece8101a39fe58ed9a5418069977c307c4caf85ab575f12
+EBUILD netsniff-ng-0.6.1.ebuild 1324 BLAKE2B 43e5ab2c4dd9b2b6b2241b11c423330c03d2055649fa6c363ffe53b91dc56bbfabc54b8bc394442cac48150fe97ebcc94a7f5821bef1eba371f654fd69e297e6 SHA512 6d297cfc26ea6f5f6a1cbb577cb9c593a68022cd4448112e40f93a56ab250820fed3071245459c9d5b1fa60372feb0bfe8e473ea33a9eb8285c190c67b2036ae
+EBUILD netsniff-ng-9999.ebuild 1321 BLAKE2B 6972fb2c40d19b2d4257ec0641ca6777e8ee236b0da9cf159da18279b6b9b3aa204148d4e4c75046bdec64c51089ebfba06d2b2f0e615ae9331c912c55c97284 SHA512 39e58aaa796dc1056a54b8f00bf6ffca0a2bc21b66d0b1c75d6b84251a44250d5e6858d84b5fd3c8dcabce5baf55896744c2a8f269328659aa68d650a3ff1fb5
 MISC metadata.xml 237 BLAKE2B f22c3926ba75c18fce7667217807f3710a315b12b1341622c949e7bc0056cd1cb403ea6c66d838675f3cb5dcd53d2fc4ec71425ec3f96aaffb94b70b73e99320 SHA512 ae2360aa6b1b00c67e0acea4935c02b64585b9a15e126fec9d5d99637021c542c0a495e5116205f3da287def46fa5b19cb1a7f3042c12c5f7a78d66d92fcb03f
diff --git a/net-analyzer/netsniff-ng/netsniff-ng-0.6.0.ebuild b/net-analyzer/netsniff-ng/netsniff-ng-0.6.0.ebuild
index b1243b2e8aba..a62b4469379c 100644
--- a/net-analyzer/netsniff-ng/netsniff-ng-0.6.0.ebuild
+++ b/net-analyzer/netsniff-ng/netsniff-ng-0.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -17,7 +17,7 @@ IUSE=""
 RDEPEND="dev-libs/geoip
 	dev-libs/libcli
 	dev-libs/libnl:3
-	dev-libs/userspace-rcu
+	dev-libs/userspace-rcu:=
 	net-libs/libnet:1.1
 	net-libs/libnetfilter_conntrack
 	net-libs/libpcap
diff --git a/net-analyzer/netsniff-ng/netsniff-ng-0.6.1.ebuild b/net-analyzer/netsniff-ng/netsniff-ng-0.6.1.ebuild
index a9f01cd54821..e2787720d544 100644
--- a/net-analyzer/netsniff-ng/netsniff-ng-0.6.1.ebuild
+++ b/net-analyzer/netsniff-ng/netsniff-ng-0.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -17,7 +17,7 @@ IUSE=""
 RDEPEND="dev-libs/geoip
 	dev-libs/libcli
 	dev-libs/libnl:3
-	dev-libs/userspace-rcu
+	dev-libs/userspace-rcu:=
 	net-libs/libnet:1.1
 	net-libs/libnetfilter_conntrack
 	net-libs/libpcap
diff --git a/net-analyzer/netsniff-ng/netsniff-ng-9999.ebuild b/net-analyzer/netsniff-ng/netsniff-ng-9999.ebuild
index d924f6ec3741..7cf9b0ff7822 100644
--- a/net-analyzer/netsniff-ng/netsniff-ng-9999.ebuild
+++ b/net-analyzer/netsniff-ng/netsniff-ng-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -17,7 +17,7 @@ IUSE=""
 RDEPEND="dev-libs/geoip
 	dev-libs/libcli
 	dev-libs/libnl:3
-	dev-libs/userspace-rcu
+	dev-libs/userspace-rcu:=
 	net-libs/libnet:1.1
 	net-libs/libnetfilter_conntrack
 	net-libs/libpcap
diff --git a/net-analyzer/sslscan/Manifest b/net-analyzer/sslscan/Manifest
index 60962a538e66..5cce515d4f93 100644
--- a/net-analyzer/sslscan/Manifest
+++ b/net-analyzer/sslscan/Manifest
@@ -1,7 +1,7 @@
-DIST sslscan-1.11.10-rbsec-openssl.tar.gz 5523414 BLAKE2B 4cadd45ac8c41983ca79ec994b3bc5cafbacd02ea4b0336eead2dc8e77f6c2c0a39e5c6c07c7e12f16e92a753e3ee352a60148ea0a402b5b57f24b39be184a2e SHA512 e0ab14cd20bf8251defb685ca1384564f5f3624a8168608bed476f8d77ae4fd9096eacc36c0f271fc281d2d9070d25fa9e56ebf993321e06d6954e40c28537a7
-DIST sslscan-1.11.10-rbsec.tar.gz 52108 BLAKE2B db78ae281149da451cc2f6f60d8379d50bc2707b18b605960783dc90c75e365ee849435dfe982f6b3f3e33d1f99855f1a147754a97db2b58a82e67342a593c35 SHA512 802be7ad5289fb56b2902c69e2c831b5d8cacc01d650353b29c839e0ce4ae03e55656fa5d481c213b5162fc71b2a82da19b0ea34f6d86c34278c275a2bb73a7a
 DIST sslscan-1.11.11-rbsec-openssl.tar.gz 5523256 BLAKE2B d8f5aa8bf748310fe1186ec9ab74ecc33425d6fa3db709d94516780d4efadbdd9cf6358798796704dfeb4032ec615298f3b67c8150e314f1e79a4d826c2589b7 SHA512 9bfdac0b6dcbb9e932ef41db9753f7298cf38ddc18731386968289114fd5ed10d81e95523d557b42b431377638d2f62fb710189e7d944ba89979fe5e3437fd3f
 DIST sslscan-1.11.11-rbsec.tar.gz 53432 BLAKE2B 08be7c5a4126e8dee85adb48bd5d55f5e7931820462a18fe904439edc8fc690d60379c53c436d4953f9fbbb94c4e47eebd3fd48867b00d5819ba651569c99b7b SHA512 9492f1460b45212f80a19364c284ef2a11ad0c343bb324447ec519685d52805104d95a7817fda4d43af98ce2be2edede889e6ae83eab37d75be0ab46dca29d72
-EBUILD sslscan-1.11.10.ebuild 1303 BLAKE2B 2c39f37ed0ad85e4e2a3f76e5b47a29906e2d50150f96686b2466fd5ebb7a364bf9355cf155434720967e1430c6363eaf1b468bbb884039914504038f2bf6085 SHA512 f11f67b88a4577a70c684584e70b6bf75e8498a3b48fc9ed7f07601ce97415375ab3136577e3b4feabc3ebe02d711de3b76b4b14715b2831a4312d517f0d43a4
+DIST sslscan-1.11.12-rbsec-openssl.tar.gz 5523256 BLAKE2B d8f5aa8bf748310fe1186ec9ab74ecc33425d6fa3db709d94516780d4efadbdd9cf6358798796704dfeb4032ec615298f3b67c8150e314f1e79a4d826c2589b7 SHA512 9bfdac0b6dcbb9e932ef41db9753f7298cf38ddc18731386968289114fd5ed10d81e95523d557b42b431377638d2f62fb710189e7d944ba89979fe5e3437fd3f
+DIST sslscan-1.11.12-rbsec.tar.gz 56346 BLAKE2B 0079a4be50c037c02bc716341315e0a2164742f270a54fa616ba223b5ecc56bdfa9cec3bc495cd57d4d20cdb4331c622bb78b705f2516fcff228306bb1e5c6ff SHA512 e667cc50f0ec71343b73ca11871a1a53aa9f255c671f16b7c5f33093125a1e60d6e7945e7bd7296f4a71aa6837c823dc939e18982f3e3f831acc061ead9e7ebb
 EBUILD sslscan-1.11.11.ebuild 1161 BLAKE2B 11d5dc98ef503bef04efdb8037ca794e2e7341378543f3c987b5c3e2c25665ee94c393ea632dd1af69bcb5e7463b727db72dbe6666c812c5e88161b8c589e792 SHA512 b1be927c3ee5a5fe0a26621c089222ca38d31f1d169c4dca73986dfb27a7e4dcdceafb37ce7b68828003422e008a1dca241589777616476b687834b4a6e1eefc
+EBUILD sslscan-1.11.12.ebuild 1160 BLAKE2B 78393762f24f14b4ab4b35b1e42652cd99702b6e6deead3a2b494322f436b3b4b4435f89c5c686ef94666cc7757c90c946b8aefc791b6bd83ad0f3626f7cf033 SHA512 4cf812a3cea514ea1cf56e599821b008cd7e1144edf33279c539c203b9d4eedc99ebf9e9268b6808774d338be2551809be2f75b284a7c0f7d8e4518a1f6c6553
 MISC metadata.xml 295 BLAKE2B 4aed9a7658ee65ef0630a49abe71b2ab860377365b040ea0e19dfd8069f05e64cdab2c93fdf95276ad4087c247a18c195d05c81d90226ab6e753950fafce846e SHA512 561d272316db60726db149ffd3f77a59ed4fd7d16dd96e8064e1994666812d5056180965ef93939904ae653e0aa2cbc04621f5700464d5115490d56c24354bb4
diff --git a/net-analyzer/sslscan/sslscan-1.11.10.ebuild b/net-analyzer/sslscan/sslscan-1.11.12.ebuild
index bbc02f4e1bd5..dc915652a7f7 100644
--- a/net-analyzer/sslscan/sslscan-1.11.10.ebuild
+++ b/net-analyzer/sslscan/sslscan-1.11.12.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-# Upstream now builds against the 1.0.2-chacha branch of PeterMosmans
-MOSMANS_OPENSSL_COMMIT=e90b60086e4ed9649cb3aab08f2b4c6529e7a95a
+# Upstream now builds against the openssl 1.0.x fork by PeterMosmans
+MOSMANS_OPENSSL_COMMIT=c9ba19c8b7fd131137373dbd1fccd6a8bb0628be
 
 inherit eutils toolchain-funcs
 
@@ -16,12 +16,10 @@ SRC_URI="https://github.com/${MY_FORK}/${PN}/archive/${PV}-${MY_FORK}.tar.gz ->
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="libressl +static"
 
-# Depend on -bindist since sslscan unconditionally requires elliptic
-# curve support, bug 491102
-DEPEND="!libressl? ( dev-libs/openssl:0[-bindist] ) libressl? ( dev-libs/libressl )"
+DEPEND="libressl? ( dev-libs/libressl )"
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${P}-${MY_FORK}"
diff --git a/net-analyzer/vnstat/Manifest b/net-analyzer/vnstat/Manifest
index cb1492bcd464..6462d4462cc9 100644
--- a/net-analyzer/vnstat/Manifest
+++ b/net-analyzer/vnstat/Manifest
@@ -11,8 +11,10 @@ AUX vnstatd.systemd 262 BLAKE2B e54c30a1bfa6c7a8bba32fa93c3d2417506c55e949975441
 AUX vnstatd.tmpfile 35 BLAKE2B c56373ebe1abe1111f6927839d79094b6ffd11527ce4e21016c31fc227f9564218ca479455b7cf4eb697d18d8389ba65266b91d71c5bf22c83a9337ae1d861d9 SHA512 e13b52e3c4fe8743074ab2704b6a6cbe0c855589fe19e05bba98f0193473437f350dfdc9675689172c54ed83491d9caef0cbb842f6c2533b98366cd78a4f0bac
 DIST vnstat-1.17.tar.gz 238397 BLAKE2B 73aaffda3c91a1146b1d6a21f637272be227a15a7964aad90fb76c407c5f7fb0085e6f9f54408e8ebc667475c15f260d701c5924737f20921ebc0a35affd52be SHA512 c9c119a89054dacdc15026c766a20d88336d7689dd4264530d0347fcc58f3cbfc806b271e0f83e76c3b4a31ab793a628ee7d7b696943da919ee4cd2fdb481cc3
 DIST vnstat-1.18.tar.gz 242502 BLAKE2B 2190c33ddf1c0a573e638234a94a86eb44fcc39e106ce8ece1f5ee5314dcc1efee237376ec109eb0873b9cf27ac3fe663526512f98a130114d417380bcb82a31 SHA512 4f9f08a57586bc57ede3d66802ee977c69b5f76ab42aa36e942e8d827dfce806dfc04916646fac01f57b026742a639fc5f7395b141a1c03ad11a1f977d02aa68
+DIST vnstat-2.0.tar.gz 259439 BLAKE2B f28f10962ae2acf04fc6669268bf5cf911ca2a5c77422b773f82a1ae25a0f90c2022aa5981c701bfa0246340113e24e0c3854174f6b3bee17d5474b9ba0916f0 SHA512 d5c9012b692adc9032ca1abde8619bd6a5de53c7c03b0fcae5b4b901c9769285a9de0b3a4f1bc21cfd74b96cfb10130a95e90cf179126ea676a777e1a9579a62
 EBUILD vnstat-1.17-r3.ebuild 1516 BLAKE2B c1638aa8e9ae4f36fb1490e7133e48fcab98c2368ea2f673c3449dde1bbf1c4211209c2865837ccc1355fc9e635e7100430447b8906516369da45922f35ff9ca SHA512 49d2f2cc331e380d66dceedeab8ed04e5f9767f4efabc2cc3211618cdc2abcc949cc72038abd15cc89e57b7e2dfe672e27bbcf7e3a768d084dab93200786b447
 EBUILD vnstat-1.17.ebuild 1432 BLAKE2B 670816f4084b10dd622dd9ab90d95c01f185d9d7a51bddd430c5cb0b0fd7900b5cf3417310b814a7299102978c9d4f165e0991978defb025e2935f9922715059 SHA512 669b9f5f8638dcca0c97d2f1c0a160bbfbf24ac5dfa6c4e3c0d6b1280dc6fb5923c512924397576ccbe75c762464fa93aa4022c524fd167800da1c5195e8c9b4
 EBUILD vnstat-1.18.ebuild 1516 BLAKE2B c1638aa8e9ae4f36fb1490e7133e48fcab98c2368ea2f673c3449dde1bbf1c4211209c2865837ccc1355fc9e635e7100430447b8906516369da45922f35ff9ca SHA512 49d2f2cc331e380d66dceedeab8ed04e5f9767f4efabc2cc3211618cdc2abcc949cc72038abd15cc89e57b7e2dfe672e27bbcf7e3a768d084dab93200786b447
+EBUILD vnstat-2.0.ebuild 1528 BLAKE2B 757d07cd46bfd69e4095401ea4380ef235a7cce65c81274f694fe9f243345b26bc9d997a4442edac1ce6cc3f700057208a2992107a22e31292b5cb6ffcc2f268 SHA512 c61469e9817aa4c15e0bb1d8a7438e5f2cc5af01c9a9cc6f2429c5c180662a0eb38de51e6780984deb7d6070e55bdd8e9f8afbd0ac8d74c5042bd66fd960dabd
 EBUILD vnstat-9999.ebuild 1499 BLAKE2B 55e75f51d727d550b7ce56ff65d8a14bd493ca074df2114ae18b1dad10061d1493f8e27ca28584b59730a3b75fbe7c5400c022174695362b864c3ebc7ac93526 SHA512 b618e04b5ffd88b00f9e0f744db908f2e637ef422b17889f12dedeec3f9d4e22e0f6161c4ea065ab3eac737b8ea711f8256aba0c9822f49af0a5fd7cf52a0e20
 MISC metadata.xml 603 BLAKE2B 6cd01f8334d5768e057d6866f9c8d739af3680787d9159638a504eeeb74b2f01a36775bfa3e2afeb169d2948e290e8995b2100d572603eaa5ffa44c96b15b385 SHA512 7dbda5d3a317201c8eb0000f2b55af6b2de6fd44368ab39b08c60ee8eb1355264a8886d9a484ab75d47c0c0ce3f41059a8f354f7d6480ae20e469e4c29ca31e2
diff --git a/net-analyzer/vnstat/vnstat-2.0.ebuild b/net-analyzer/vnstat/vnstat-2.0.ebuild
new file mode 100644
index 000000000000..8838083fcd65
--- /dev/null
+++ b/net-analyzer/vnstat/vnstat-2.0.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit systemd user
+
+DESCRIPTION="Console-based network traffic monitor that keeps statistics of network usage"
+HOMEPAGE="https://humdi.net/vnstat/"
+SRC_URI="https://humdi.net/vnstat/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="gd selinux test"
+
+COMMON_DEPEND="
+	dev-db/sqlite
+	gd? ( media-libs/gd[png] )
+"
+DEPEND="
+	${COMMON_DEPEND}
+	test? ( dev-libs/check )
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	selinux? ( sec-policy/selinux-vnstatd )
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.17-conf.patch
+	"${FILESDIR}"/${PN}-1.17-drop-root.patch
+	"${FILESDIR}"/${PN}-1.17-run.patch
+)
+
+pkg_setup() {
+	enewgroup vnstat
+	enewuser vnstat -1 -1 /var/lib/vnstat vnstat
+}
+
+src_compile() {
+	emake ${PN} ${PN}d $(usex gd ${PN}i '')
+}
+
+src_install() {
+	use gd && dobin vnstati
+	dobin vnstat vnstatd
+
+	exeinto /usr/share/${PN}
+	newexe "${FILESDIR}"/vnstat.cron-r1 vnstat.cron
+
+	insinto /etc
+	doins cfg/vnstat.conf
+	fowners root:vnstat /etc/vnstat.conf
+
+	keepdir /var/lib/vnstat
+	fowners vnstat:vnstat /var/lib/vnstat
+
+	newconfd "${FILESDIR}"/vnstatd.confd-r1 vnstatd
+	newinitd "${FILESDIR}"/vnstatd.initd-r2 vnstatd
+
+	systemd_newunit "${FILESDIR}"/vnstatd.systemd vnstatd.service
+	systemd_newtmpfilesd "${FILESDIR}"/vnstatd.tmpfile vnstatd.conf
+
+	use gd && doman man/vnstati.1
+	doman man/vnstat.1 man/vnstatd.1
+
+	newdoc INSTALL README.setup
+	dodoc CHANGES README UPGRADE FAQ examples/vnstat.cgi
+}