gentoo resync : 16.06.2018

27 files changed, 296 insertions, 76 deletions

diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 74af8abb5504..0a545eeb75e0 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/graphite-web/Manifest b/net-analyzer/graphite-web/Manifest
index b1d21c819b8f..d196f145df8a 100644
--- a/net-analyzer/graphite-web/Manifest
+++ b/net-analyzer/graphite-web/Manifest
@@ -1,6 +1,9 @@
 AUX graphite-web-0.9.13-fhs-paths.patch 3183 BLAKE2B 0ef1c5e5c171cd1823a3d52d11d5e4b426f82b26636bd0f250514653f7bc0ddb4da9d698562aabac5711bf3d8a2cf5c8d64c2eb7cd7ad79dc495da6e3339d09e SHA512 18ec1ef401c2e3d1209ed3a2a796dfc94088ea7324ae28c3afddd8c857a83ff00afcb5ef0673b838eedae433893b12b57283c9d4a0e53f90b5063ae4f36abcf2
 AUX graphite-web-0.9.13-system-libs.patch 3379 BLAKE2B 28fbbd23365d67891b6b818a77a07c9eabafd8c519764d2ee6227a07e42a410800f868753f9c46677269a4c9e978bfb6024ae9551d2830742e5d1cb17998c59b SHA512 df4b95dfa6f6a58ba2e8aeb7b3d3e26e5d122718b88e2ec747676fcbb0539190ebc9e7938b3d34a73f0018e121ce297faa50af839f138ce5b21116777fcb7748
+AUX graphite-web-1.1.3-fhs-paths.patch 2360 BLAKE2B 7ca032f15121f2cedd6478bb137517798ad38a08d21cf1f20063241006aea1ae4f2ca96ecc39e039e6157d9d918c2dd0adbdbb54ff4bf561e909a4905f837209 SHA512 fac8caf178ab80785e7d4d55d233f9219cc217cc75f5ac3b303a77a4e91b234010f9f15896c25e0d88b515006fbcc8c0ebad18ad2fcab60def5c07774185ec5f
 DIST graphite-web-0.9.13-share.png 325 BLAKE2B 390d5de23ae8300ca042e9c259fb7f892a4fd69ee8225d171b1f32b4215188fdd7a5c4f8e65fb3eae64cf154044ddb03c4490a8318ef8dc5934f3d5c04aeb6bb SHA512 19dc9139e97a99bf06fded2958bc52bc856fa11d0dc50f57e6c54214373795534cb74883ab5da7a05e2ddb69a2870d3b02dcf2ab0628bdf289f1ffd925e044e2
 DIST graphite-web-0.9.13.tar.gz 2182781 BLAKE2B c4db10fbdfd45efb683862967e743de5d96a6342ade85548c43f3072fbc7f15d32a606979800e1c46ce8c81611121fa91ed873d57a184c92cc3167a7c5ac531e SHA512 5e2cc84ec57e1fa0ecff8c9671d8753655a8ce2c07ce2f446451ceaad7679b0cefe932de45315be360b8f13eb25cd25ef179814f340c2c42b0e7048a3d4f4a96
+DIST graphite-web-1.1.3.tar.gz 1171342 BLAKE2B f18c84d707f93d897553ec05d7b910a3dba97c6068498d1b216f178ea8a1f64baf59bb572b433a56f5e417a2873c018a38a19c3b8c765f667d7c3fbb38b9ed0a SHA512 3f9de216bd55e4e8de7391087e9b876a16e4f137fd60932a6d5855804c3d9868422645177776258e74486b97ec7a853b63a6d89b1de9b325bcb50ad694208436
 EBUILD graphite-web-0.9.13-r3.ebuild 3418 BLAKE2B 7c884d1866210c4be2c884663dedea1ede3b9dc8fd3b0189e7cc07c063292420df118e6b578dbe7be97beb7812c45d5630c37c129ec6ac01df3a60708dfa5fb0 SHA512 6ec67b34b46994ab4e9761bcf72b58ec5f62609353ef1349a26ef2580a9bff16c1737423c9073add748a141002f235a019ee5f6f36d98f8e43f2b7eafa00675a
+EBUILD graphite-web-1.1.3.ebuild 3565 BLAKE2B 0e4b9e66e0aea873e5b024ea12ed3489e74f6e97491d4a76216687fcb84b34a0a6e1e90e099f543e3315f6386f188877043002926e0d5995db36590c8ebf0e87 SHA512 42cc064625b047b4a9c6ce224084759924c3165c3231f0f917eead87f4c067ce3b22bef7841d5045f5b5876306bb1be1a86a02b802fd6e68937f862320698fa7
 MISC metadata.xml 446 BLAKE2B a0d9086db1e991d5ec91bda9c99ba49f6068ffc3c04117dfe974a41ad0ba6d00e0ff15ce931996e3fce3519f873ae8c3ee1be403c0e4e38758e5cd2183ec6e03 SHA512 7a94e8f66bf14b0d74b4825908282db8bf8155d14c21fda79aa3815cc0b0aa70c2ebfbc69e3239d9fd1bec02f072b9423cc54cc4d0d605fa5febb39651b25f3d
diff --git a/net-analyzer/graphite-web/files/graphite-web-1.1.3-fhs-paths.patch b/net-analyzer/graphite-web/files/graphite-web-1.1.3-fhs-paths.patch
new file mode 100644
index 000000000000..39d325984245
--- /dev/null
+++ b/net-analyzer/graphite-web/files/graphite-web-1.1.3-fhs-paths.patch
@@ -0,0 +1,53 @@
+Install FHS-style paths
+
+--- a/conf/graphite.wsgi.example
++++ b/conf/graphite.wsgi.example
+@@ -1,4 +1,4 @@
+ import sys
+-sys.path.append('/opt/graphite/webapp')
++sys.path.append('@GENTOO_PORTAGE_EPREFIX@/usr/share/graphite-web/webapp')
+ 
+ from graphite.wsgi import application
+--- a/setup.py
++++ b/setup.py
+@@ -59,8 +59,7 @@
+       ],
+       package_data={'graphite' :
+         ['templates/*', 'local_settings.py.example']},
+-      scripts=glob('bin/*'),
+-      data_files=list(webapp_content.items()) + storage_dirs + conf_files + examples,
++      data_files=list(webapp_content.items()),
+       install_requires=['Django>=1.8,<1.11.99', 'django-tagging==0.4.3', 'pytz', 'pyparsing', 'cairocffi', 'urllib3', 'scandir', 'six'],
+       classifiers=[
+           'Intended Audience :: Developers',
+--- a/webapp/graphite/local_settings.py.example
++++ b/webapp/graphite/local_settings.py.example
+@@ -101,6 +101,7 @@
+ # Change only GRAPHITE_ROOT if your install is merely shifted from /opt/graphite
+ # to somewhere else
+ #GRAPHITE_ROOT = '/opt/graphite'
++GRAPHITE_ROOT = '@GENTOO_PORTAGE_EPREFIX@/usr/share/graphite-web'
+ 
+ # Most installs done outside of a separate tree such as /opt/graphite will
+ # need to change these settings. Note that the default settings for each
+@@ -110,6 +111,11 @@
+ #STATIC_ROOT = '/opt/graphite/static'
+ #LOG_DIR = '/opt/graphite/storage/log/webapp'
+ #INDEX_FILE = '/opt/graphite/storage/index'     # Search index file
++CONF_DIR = '@GENTOO_PORTAGE_EPREFIX@/etc/graphite-web'
++STORAGE_DIR = '@GENTOO_PORTAGE_EPREFIX@/var/lib/carbon'
++STATIC_ROOT = '@GENTOO_PORTAGE_EPREFIX@/usr/share/graphite-web'
++LOG_DIR = '@GENTOO_PORTAGE_EPREFIX@/var/log/graphite-web'
++INDEX_FILE = '@GENTOO_PORTAGE_EPREFIX@/var/lib/graphite-web/index'  # Search index file
+ 
+ # To further or fully customize the paths, modify the following. Note that the
+ # default settings for each of these are relative to CONF_DIR and STORAGE_DIR
+@@ -127,6 +133,8 @@
+ #CERES_DIR = '/opt/graphite/storage/ceres'
+ #WHISPER_DIR = '/opt/graphite/storage/whisper'
+ #RRD_DIR = '/opt/graphite/storage/rrd'
++WHISPER_DIR = '@GENTOO_PORTAGE_EPREFIX@/var/lib/carbon/whisper'
++RRD_DIR = '@GENTOO_PORTAGE_EPREFIX@/var/lib/carbon/rrd'
+ #
+ # Data directories using the "Standard" metrics finder (i.e. not Ceres)
+ #STANDARD_DIRS = [WHISPER_DIR, RRD_DIR] # Default: set from the above variables
diff --git a/net-analyzer/graphite-web/graphite-web-1.1.3.ebuild b/net-analyzer/graphite-web/graphite-web-1.1.3.ebuild
new file mode 100644
index 000000000000..e8d0e6ccfcbe
--- /dev/null
+++ b/net-analyzer/graphite-web/graphite-web-1.1.3.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+
+inherit distutils-r1 python-utils-r1 prefix
+
+DESCRIPTION="Enterprise scalable realtime graphing"
+HOMEPAGE="http://graphite.readthedocs.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+carbon mysql memcached postgres +sqlite"
+#ldap - needs bump of python-ldap to latest
+# ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
+
+DEPEND=""
+RDEPEND="
+	carbon? ( dev-python/carbon[${PYTHON_USEDEP}] )
+	mysql? (
+		|| (
+			dev-python/mysql-python[${PYTHON_USEDEP}]
+			dev-python/mysqlclient[${PYTHON_USEDEP}]
+		)
+	)
+	memcached? ( dev-python/python-memcached[${PYTHON_USEDEP}] )
+	postgres? (
+		dev-python/psycopg:2[${PYTHON_USEDEP}]
+	)
+	dev-lang/python[sqlite?]
+	dev-python/cairocffi[${PYTHON_USEDEP}]
+	>=dev-python/django-1.8[sqlite?,${PYTHON_USEDEP}]
+	<dev-python/django-1.11.99[sqlite?,${PYTHON_USEDEP}]
+	>=dev-python/django-tagging-0.4.3[${PYTHON_USEDEP}]
+	dev-python/pyparsing[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/scandir[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/txAMQP[${PYTHON_USEDEP}]
+	dev-python/twisted[${PYTHON_USEDEP}]
+	dev-python/urllib3[${PYTHON_USEDEP}]
+	dev-python/zope-interface[${PYTHON_USEDEP}]
+	dev-python/whisper[${PYTHON_USEDEP}]
+	media-libs/fontconfig"
+
+PATCHES=(
+	# Do not install the configuration and data files. We install them
+	# somewhere sensible by hand.
+	"${FILESDIR}"/${PN}-1.1.3-fhs-paths.patch
+)
+
+src_prepare() {
+	# use FHS-style paths
+	export GRAPHITE_NO_PREFIX=yes
+	# make sure we don't use bundled stuff
+	rm -Rf webapp/graphite/thirdparty
+	distutils-r1_src_prepare
+	eprefixify \
+		conf/graphite.wsgi.example \
+		webapp/graphite/local_settings.py.example
+}
+
+python_install() {
+	distutils-r1_python_install \
+		--install-data="${EPREFIX}"/usr/share/${PN}
+
+	# make manage.py available from an easier location/name
+	# (missing from tarball)
+	dodir /usr/bin
+	cat > "${ED}"/usr/bin/${PN}-manage <<- EOS
+		#!/usr/bin/env python
+		import os
+		import sys
+
+		if __name__ == "__main__":
+		    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "graphite.settings")
+
+		    from django.core.management import execute_from_command_line
+
+		    execute_from_command_line(sys.argv)
+	EOS
+	#mv "${D}"/$(python_get_sitedir)/graphite/manage.py \
+	#	"${ED}"/usr/bin/${PN}-manage || die
+	chmod 0755 "${ED}"/usr/bin/${PN}-manage || die
+	python_fix_shebang "${ED}"/usr/bin/${PN}-manage
+
+	insinto /etc/${PN}
+	newins webapp/graphite/local_settings.py.example local_settings.py
+	pushd "${D}"/$(python_get_sitedir)/graphite > /dev/null || die
+	ln -s ../../../../../etc/${PN}/local_settings.py local_settings.py
+	popd > /dev/null || die
+
+	insinto /usr/share/doc/${PF}/examples
+	doins \
+		examples/example-graphite-vhost.conf \
+		conf/dashboard.conf.example \
+		conf/graphite.wsgi.example
+}
+
+pkg_config() {
+	"${ROOT}"/usr/bin/${PN}-manage syncdb --noinput
+	local idx=$(grep 'INDEX_FILE =' "${EROOT}"/etc/graphite-web/local_settings.py 2>/dev/null)
+	if [[ -n ${idx} ]] ; then
+		idx=${idx##*=}
+		idx=$(echo ${idx})
+		eval "idx=${idx}"
+		touch "${ROOT}"/"${idx}"/index
+	fi
+}
+
+pkg_postinst() {
+	einfo "You need to configure ${PN} to run with a WSGI server of your choice."
+	einfo "Don't forget to edit local_settings.py in ${EPREFIX}/etc/${PN}"
+	einfo "See http://graphite.readthedocs.org/en/latest/config-local-settings.html"
+	einfo "Run emerge --config =${PN}-${PVR} if this is a fresh install."
+}
diff --git a/net-analyzer/nagios-core/Manifest b/net-analyzer/nagios-core/Manifest
index db409b6561bf..31a670554568 100644
--- a/net-analyzer/nagios-core/Manifest
+++ b/net-analyzer/nagios-core/Manifest
@@ -12,8 +12,8 @@ DIST nagios-4.3.1.tar.gz 11095797 BLAKE2B 46c7ca25b7277dc1b114b08fba6eece6d841ea
 DIST nagios-4.3.3.tar.gz 11101531 BLAKE2B 537d49ecf28b457fbc1e24eaaa9c5d9e8c4db59ed69c91a573c0cacb6cfb6fd2d52c31e87c0cef34b81a69247bb5b9513983d95e7eae3ea7f861742da485d2d4 SHA512 588292a95342cb2d95d7b58f70442b82b99a23dd9fdc1390e9ae0743626a047e5127d77b1d7e6a1d8edd6f34a425e581bcd42459b673a0ddea14125bde4b7d9e
 DIST nagios-4.3.4.tar.gz 11101966 BLAKE2B 6cb8182f40a4f83875c94df040bb1c62ce078d4130e10fa8595ea0b14cf715fc2a237ffb34199da9c1528e4789f3ce8deae3d993b5b795ad712d48b1e5fdb820 SHA512 f4e92aa98151739442a225a245871d93b5560d89510bdacb1a615959b9687f7a92675f10fcba71078b104ca8f237b0155a9261d67ec66f80aec7f033b4b3e316
 DIST nagios-core-gentoo-icons-20141125.tar 40960 BLAKE2B 31c1953e1160c7c7b89606b72b1a80407e4c1b7a7938b40bd1c577cd0c309dd88ca6b775d692a9b846dbf67736537fa9c91e56aa15fdd447769608ca525bff09 SHA512 bf109879cddd6136b76baba55d0b60b2596e37431dcf5ce0905d34a9fa292ebf7e4bde82d9a084362c486e8fac344c76d88f9298b1b85541ed70ffd608493766
-EBUILD nagios-core-3.5.1.ebuild 6154 BLAKE2B a12a36fc2217394d21f7084fce74104f5c17749271fcf984a1dd96cac505327abb89a20e9582c927286b4b93dbcbecfa131129bc3362a29b900441138dae580a SHA512 c402040b5449fe096d40d0313ee08380089788c57da4dc780a8736eb335fb775379db4667145baed355dbbe9128e99d2662f54d9a57e44f2cc5fc35f0fe2bf01
-EBUILD nagios-core-4.3.1-r1.ebuild 7579 BLAKE2B 931cbb9b132ad116fc2e7ed6670d309ecb5165b172eef9e24ef401b7946c4dc0f434f9678a338f4ecac2cf65cd2147cdda046d9ede2676e8aa7f7b5d5b8795b5 SHA512 8a4273cb4e2f50ed4e69d190743c362db3c1c9480ea19d061501dc57e48fea7e6b3c1811107714667b7ead9eb748ee8a7a106b792f066422ef13640b14bd5aac
-EBUILD nagios-core-4.3.3.ebuild 7466 BLAKE2B af8a11f344adbb8e8e7bb46b48c8bb414ef7c58e7b8aab77c2988919bc5fae24c6272f96cf51a9b43f64f6e42003187e6616d4d87d56f86a5e00184c8c5e9483 SHA512 860b07673f9d77e296bfc471291cd07de65b1195ea2cfd0bad7ceffdf316afa23fda0c5f90a2de2c7115f053f54dbced5e45627d6747512af62833d0c398682b
-EBUILD nagios-core-4.3.4.ebuild 6643 BLAKE2B d3ab6cbd0a2d7fbc90eb73e22b4b0c86f546afeb1919562df2dd4b0b5481fa9a31286086e68fb70ce8d820e4cb225772911691003ce58e8e995a2516389178f5 SHA512 689e4e5bb5b832a9c50f546aaaf4187c2a7bd38d3c520e3dd3527f45b778bf6ae805f39c2a12057bab1a4e7b1db93871abc2e2de4409f6b6fa8e706e4611acec
+EBUILD nagios-core-3.5.1.ebuild 6155 BLAKE2B fd6eb2d5bda94625f5f5b265d8e99e5e1cd802e94deaa04b3c1d4acba13d37c49dff07780aaa47ecf50073643b32dabcceb8d86b2eb71c1a1577c9e0304b7f79 SHA512 54259b2f4ba0251c92441a3fb7bd686a66c31d0abe6368c04d7d1c764089f004e2911534ccf2b005d687815f6d60307b9e97209c044db7c5c7adcea164a9f28c
+EBUILD nagios-core-4.3.1-r1.ebuild 7580 BLAKE2B 0ae2c990bdbbc08df278b40027763868bc88497d7462b57560558ec2e3bc04df9ece62358390b0ee510d7414f9bc20051a5124bee03804d1e3bbf65f279b8d1d SHA512 c9ac60fa3010434f409a5f889046546c8d6132652eb2a6bb9f89ada7d01447b79f130c1e529d88256636bc7ee45307489b2684532d4c0156a021d3dcae3b1d3b
+EBUILD nagios-core-4.3.3.ebuild 7467 BLAKE2B f337eabcfbd918295f437ec735917fda59e0695ee2a6800eea4a15d9f49b1fb63ee135498c8556c0c1a545f7ff0f0141abfb2080a605f19928a5036cac1fdfac SHA512 250b84f3b417756fbb9034af2a909c94c7c2ec7e1539f66590f84b4ff3735314d403b8b6496880c9e0aee2f4052dd7d7829779d1fc4ae78e01f53449abe206ab
+EBUILD nagios-core-4.3.4.ebuild 6644 BLAKE2B 74ea9541876cb35aafbae6721c096e572200b8aa0975b9867ea535a6878d4786c4d552c1f08263a5e5ef2c534b562223726dc248499a793f3a86acf29deb58e5 SHA512 7e51585249db59f040033e22ec2043dbae6cc6e96117f87ded0a4ce4049b4dcf6bdc10d597233f3d5fec95ec60842bdb98f3bf354665d9f4c1ef4ab27cd038e2
 MISC metadata.xml 1466 BLAKE2B 655e382c72b7fcf8f4283055a503e2ad79dbfc695f730980543e6a7381f5aa093ab279341cd2df19a1d5e5053b2c686ecf6884c541a7b984dce60fc1ae4d4599 SHA512 51f819fc2cbe3b87ee96b048fd0e622f78673a29d5b42b2b8f1d963f6f71ead679b057863f5f1a56e997c1e19ff26edf52697c02f79ba89ed6a5480d0ae2296b
diff --git a/net-analyzer/nagios-core/nagios-core-3.5.1.ebuild b/net-analyzer/nagios-core/nagios-core-3.5.1.ebuild
index 515322c7481c..06ad6320317a 100644
--- a/net-analyzer/nagios-core/nagios-core-3.5.1.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-3.5.1.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=5
@@ -7,7 +7,7 @@ inherit depend.apache eutils multilib toolchain-funcs user
 
 MY_P=${PN/-core}-${PV}
 DESCRIPTION="Nagios Core - Check daemon, CGIs, docs"
-HOMEPAGE="http://www.nagios.org/"
+HOMEPAGE="https://www.nagios.org/"
 SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/net-analyzer/nagios-core/nagios-core-4.3.1-r1.ebuild b/net-analyzer/nagios-core/nagios-core-4.3.1-r1.ebuild
index 7acee4a50aa9..7e952737c4d0 100644
--- a/net-analyzer/nagios-core/nagios-core-4.3.1-r1.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-4.3.1-r1.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
@@ -7,7 +7,7 @@ inherit toolchain-funcs user
 
 MY_P=${PN/-core}-${PV}
 DESCRIPTION="Nagios core - monitoring daemon, web GUI, and documentation"
-HOMEPAGE="http://www.nagios.org/"
+HOMEPAGE="https://www.nagios.org/"
 
 # The name of the directory into which our Gentoo icons will be
 # extracted, and also the basename of the archive containing it.
diff --git a/net-analyzer/nagios-core/nagios-core-4.3.3.ebuild b/net-analyzer/nagios-core/nagios-core-4.3.3.ebuild
index 553186b60646..5773285f59b5 100644
--- a/net-analyzer/nagios-core/nagios-core-4.3.3.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-4.3.3.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
@@ -7,7 +7,7 @@ inherit toolchain-funcs user
 
 MY_P=${PN/-core}-${PV}
 DESCRIPTION="Nagios core - monitoring daemon, web GUI, and documentation"
-HOMEPAGE="http://www.nagios.org/"
+HOMEPAGE="https://www.nagios.org/"
 
 # The name of the directory into which our Gentoo icons will be
 # extracted, and also the basename of the archive containing it.
diff --git a/net-analyzer/nagios-core/nagios-core-4.3.4.ebuild b/net-analyzer/nagios-core/nagios-core-4.3.4.ebuild
index 122423ab1055..5bd7da55c5f0 100644
--- a/net-analyzer/nagios-core/nagios-core-4.3.4.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-4.3.4.ebuild
@@ -7,7 +7,7 @@ inherit toolchain-funcs user
 
 MY_P=${PN/-core}-${PV}
 DESCRIPTION="Nagios core - monitoring daemon, web GUI, and documentation"
-HOMEPAGE="http://www.nagios.org/"
+HOMEPAGE="https://www.nagios.org/"
 
 # The name of the directory into which our Gentoo icons will be
 # extracted, and also the basename of the archive containing it.
diff --git a/net-analyzer/nagios/Manifest b/net-analyzer/nagios/Manifest
index 11fa78eb35b6..8b6d45d11424 100644
--- a/net-analyzer/nagios/Manifest
+++ b/net-analyzer/nagios/Manifest
@@ -1,4 +1,4 @@
-EBUILD nagios-4.3.1.ebuild 392 BLAKE2B 05c3bf374d21e12b78bef9ffade93f2936b908fbf077723881dd20a2669c1785fb9cc0539708238c9aad851f8e17d83240f6ea626702e19344bf8e7d876df4db SHA512 13cd73016da7a9675039b73f1f3b1cd4d2e0aedf617019278ce728653b3cb7fab7ed1ef572ff942a87cc651b1ee567f9701bfca7080bc90d17ddcbb5e16a7b58
-EBUILD nagios-4.3.3.ebuild 392 BLAKE2B 05c3bf374d21e12b78bef9ffade93f2936b908fbf077723881dd20a2669c1785fb9cc0539708238c9aad851f8e17d83240f6ea626702e19344bf8e7d876df4db SHA512 13cd73016da7a9675039b73f1f3b1cd4d2e0aedf617019278ce728653b3cb7fab7ed1ef572ff942a87cc651b1ee567f9701bfca7080bc90d17ddcbb5e16a7b58
-EBUILD nagios-4.3.4.ebuild 399 BLAKE2B 9004b484ee699edb9cc0c9371cf4707f0b36a0aeba414f566961fc9d6061a9c94cd6eb19a189ad4b8626661b5bcd915f11f8f5dd4315abe175771504b9e9f5d2 SHA512 1efb7d777b2fd99310dfad42eeeec251347f065637fdf46e5faa8c5579a8f572654828e1e4084982c2f06d5c0e0a5a5fb2966621eac83bc973e3964bf40a471c
+EBUILD nagios-4.3.1.ebuild 393 BLAKE2B 9698b8a0efcd6930c84611cb9aee6a792dc1555922f93ddd62f546a966cec83e4d03e7b7a4bd18ceb10de91e58fb4dae04f0514be0ca94247059848c95616383 SHA512 d5cb30f16a97bbd59154223e4dbf62bf98d6c2e03d5021bc8f3ed9c11c8a1bc25b0391d1809a5cbb8b2345ce7c5ae88afb3f3c8473c09bee0bec46da5a52639a
+EBUILD nagios-4.3.3.ebuild 393 BLAKE2B 9698b8a0efcd6930c84611cb9aee6a792dc1555922f93ddd62f546a966cec83e4d03e7b7a4bd18ceb10de91e58fb4dae04f0514be0ca94247059848c95616383 SHA512 d5cb30f16a97bbd59154223e4dbf62bf98d6c2e03d5021bc8f3ed9c11c8a1bc25b0391d1809a5cbb8b2345ce7c5ae88afb3f3c8473c09bee0bec46da5a52639a
+EBUILD nagios-4.3.4.ebuild 400 BLAKE2B fbd1d3c6d07c27bae1f9ebe45385f5c02797e85c557b1ea2276de7a211cb0afe4edb7589e6b492d466daa66906cf14ce4cb73fccdd3915ce99a4f861a1d24e01 SHA512 e766f3e115adb6e8c1ad8e490b107d8dfc1d8125e7290ce854332198f49d9d2cf0ee7adc5c9091250b8ca2357dc1f48e875fe31e7f0b811b4e631e79cc1efb93
 MISC metadata.xml 1110 BLAKE2B a3577be74f7ae7da47c1add86da6b9cd2972ebea1e4e4241886027e7c4aecb936ffa776a32bcc0b77498c393ebb4c81aa9a98a3c8d45cbd5556f8b9014384e52 SHA512 7614b25879899b4939a136de6cd4cbd3995372747e95d2d6b90ccd8e074800b6acb738df5f9c852625c34f5a72c3072c0dec910266068ec8a72184f75aa204e1
diff --git a/net-analyzer/nagios/nagios-4.3.1.ebuild b/net-analyzer/nagios/nagios-4.3.1.ebuild
index e2be13acf415..2c40afdab198 100644
--- a/net-analyzer/nagios/nagios-4.3.1.ebuild
+++ b/net-analyzer/nagios/nagios-4.3.1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DESCRIPTION="The Nagios metapackage"
-HOMEPAGE="http://www.nagios.org/"
+HOMEPAGE="https://www.nagios.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/net-analyzer/nagios/nagios-4.3.3.ebuild b/net-analyzer/nagios/nagios-4.3.3.ebuild
index e2be13acf415..2c40afdab198 100644
--- a/net-analyzer/nagios/nagios-4.3.3.ebuild
+++ b/net-analyzer/nagios/nagios-4.3.3.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DESCRIPTION="The Nagios metapackage"
-HOMEPAGE="http://www.nagios.org/"
+HOMEPAGE="https://www.nagios.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/net-analyzer/nagios/nagios-4.3.4.ebuild b/net-analyzer/nagios/nagios-4.3.4.ebuild
index 56f21be590af..a29da55bee71 100644
--- a/net-analyzer/nagios/nagios-4.3.4.ebuild
+++ b/net-analyzer/nagios/nagios-4.3.4.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DESCRIPTION="The Nagios metapackage"
-HOMEPAGE="http://www.nagios.org/"
+HOMEPAGE="https://www.nagios.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/net-analyzer/ntopng/Manifest b/net-analyzer/ntopng/Manifest
index 36a3943d40a3..365d54a98654 100644
--- a/net-analyzer/ntopng/Manifest
+++ b/net-analyzer/ntopng/Manifest
@@ -9,5 +9,5 @@ AUX ntopng.init.d 549 BLAKE2B de561950f001e35a26b522728affa5971d8a0fdd1d85574650
 DIST ntopng-2.4.tar.gz 134074662 BLAKE2B dbf654e5cd1f9eddb5ae325bdf0ac2e7ce22c08f55363b10723bde2cb5fd86cf3b0c7fef0f55dc7fcce0341f5fbb9a7132f26e29649bcf66020b640975c0e6da SHA512 515dd7889ae3aaf2482371bb2c55ab7300cf4207fe07f37029b7529bfb710379c19a54f58cf6df87e42454c0c99d15291af334adff676252301d9edd0acf3c7a
 DIST ntopng-3.0.tar.gz 23017655 BLAKE2B f791690118a5ecfb1be5ad791229f2438354a0c2271350aa1a2f0fee05886c54d181a669e6e1b27657c5bfe4b68db24b06d91adfb89e803a154a7a4bbff146b7 SHA512 d5e310d5dba7fe696d38d9d8251ffa4077182200e41c3f0b6034e68cf6623220ec47ba9d9fd5d2392a7b65a6de770e330821169c7ec06b4952f68c3f5f738eb1
 EBUILD ntopng-2.4.ebuild 1724 BLAKE2B bfa8ed23ce2b4a5e7b0de83cda74a0211f89868e718cfe027f4c282db9e939b5efd6b48dd8d68cef4714dd238e8126e2a5716cdc939f04511599abaa5b7e2a0d SHA512 4c0298162c77666ee7ec2b3fa139468f5fc61e25baef6f7a55f5057dee1238e951e6d6b6ab7b824e31791172912bd106ae28ccafcf42fd89622676400a8132b1
-EBUILD ntopng-3.0-r2.ebuild 1629 BLAKE2B cc4f109a79f52d93416db7d10e7c3d7291d2d286ca9eec38dbe990691e5c5bd236bb264c76dfd0063cd2e31de2c9682e6247131a1b668d47051f9553a86d1124 SHA512 90ae9cc4bc63818a48056685a256596b19a049d6812bb4fac534408587c31602f33e03f3ab0217cf8681bceeddaed17826b0b1cc4551c46ee9b55a65fb619794
+EBUILD ntopng-3.0-r3.ebuild 1631 BLAKE2B b77cffb6554e04821db246fe2bfb1ba0468a63a5b456b6bde71c5c36886173b78d00c0fe46359ce90fbe66ce96a12bfcb2d607eef778f6c230abf5769e44f228 SHA512 892942a332dfce2bca02e8ace13fea7da75089c0ca0b8e68b5e2b7294d51a3f8f375cf7acffd0a34e26a177cb6e232153b7b50350b2e457f6beba3f2a6239c60
 MISC metadata.xml 299 BLAKE2B 466c255eb9dd221bc91a9308a7ad2d4032c96072f96220d56f78f8c2e9f79392a83603e7bd3a78e4bfa32bd61b04351261ccc86dc82ca9d834c2afc73724ed19 SHA512 5c8e5b8f97b306a059913e2adc9e02137502ec35da1a753a2b9af4d4c67c0af0f0266c14acdd488c89bb96da3cc0464512de05ce389055d35bc6a0feab7ac996
diff --git a/net-analyzer/ntopng/ntopng-3.0-r2.ebuild b/net-analyzer/ntopng/ntopng-3.0-r3.ebuild
index bbf5c8da9375..18736380ba1b 100644
--- a/net-analyzer/ntopng/ntopng-3.0-r2.ebuild
+++ b/net-analyzer/ntopng/ntopng-3.0-r3.ebuild
@@ -25,7 +25,7 @@ DEPEND="dev-db/sqlite:3
 	net-libs/libpcap
 	=net-libs/nDPI-2.0
 	net-misc/curl
-	sys-libs/binutils-libs
+	sys-libs/binutils-libs:=
 	virtual/libmysqlclient"
 RDEPEND="${DEPEND}
 	dev-db/redis"
diff --git a/net-analyzer/suricata/Manifest b/net-analyzer/suricata/Manifest
index 8a7208a4ceb3..ac025ccfe588 100644
--- a/net-analyzer/suricata/Manifest
+++ b/net-analyzer/suricata/Manifest
@@ -1,6 +1,7 @@
 AUX suricata-4.0.3-conf 2767 BLAKE2B fe356820f57a8a7b068b66fd8c012c94a9bffdc8a62e2bd4a2210a9625778fa358a303bc770aeb4b1600ed8da5443533c50356ac4dfdabce6d0438ba246e1cd4 SHA512 fd3aec48b4e7e52f192af117f3cda063c5614f33082986dca4e3bdf7a46d62655cd03a1d723db9d36a1b1f84964dc2273e3bf00fb23648902639b18a64025d6b
 AUX suricata-4.0.3-init 5499 BLAKE2B c2aece3a386d0ecf821e9d0e6bcb74efd97b90a71bad59a3e86f0f6a30702c711e7a287d1065745e73521c6f6cfaf5444b50b064fc06052dc33d8a6bc690f2da SHA512 ac407c70751a3610d9082b0736e76dfe04bd82014a5ac850b581c2e3c5806bb9d8fd59788cfaeabf51a856861a4568e31f9f1e33687623cc380ce226c0e06b92
+AUX suricata-4.0.4_configure-lua-flags.patch 502 BLAKE2B 14693f51888ba8d41a736a91065d1376e542d7c41d53dcc3ed9edd95d10f1db30a51d8b244154406a98338f844e67e2f836bcfc44bfa6dd6d0ffc19332c6a2c0 SHA512 a1be159aa592f2121b5e3fde70485e6a502cdfbd15fc76056e6ca1401a94ab7eddf1639728fa402f754ca546229aa5fd6fc05c243be761475c9249a7206b2830
 AUX suricata-logrotate 161 BLAKE2B d55edb7e36cc27819b6fba26778eff3cc66bfc5c04877e36e27ef9adcf3f003c10cff787b317e00a32a4c764c2180f90c9abd3f81e877d73bd2c892d5ca2d161 SHA512 c22a85667460df9b7b1fd15af1e4472dd5b7d1726a43f3b621547a884dcd64ff49b0728767d6a4dc70c413dd8997905e3753fa94c82cda34e4aaf903ebdb1cec
-DIST suricata-4.0.3.tar.gz 12392388 BLAKE2B 9b6338b343ff85f070d61608ff9dc7f25df868fdffbc13b5a8d245cb3db5cd757cb1785c827c388653b2f8a7977129259671900bc1abfebeb878a668b4058bdf SHA512 aa6b6d1ae86efad0184ba4fa06375f34334e07c22b7b1f82bf17fcb0ae48ad7f867bced57ab4f713de01583965e1260cb82e1355f78002071b689dddd3b53892
-EBUILD suricata-4.0.3.ebuild 4561 BLAKE2B d1b439fa196eb3e7e3d8b2eae0a3114d0db584d3d80ee914e10e62a245049b42f614432a8139a274091200fe485ed7e48eccf11f5de070751b82f977e7fe8021 SHA512 e21acd789dd6e45ba0b0afc0912a7d22a6cd3014329031a5662022d6af5032b5fc42ccb6c59e51db8a55386d90f7596865979526953ed8d9835182ab2b040394
+DIST suricata-4.0.4.tar.gz 12511121 BLAKE2B d9dfb00a45c2e9810409a8ce91a83e23ebce20eb28492bf24f9688d292b5805dca932c39cc673cf1148325fe5ef7936dda7f6c7819605753cb2e2ddc1cf5dba0 SHA512 6e158aa6d3edb9d11e0df3f986392ee2ae49ab4dfb978288ced4484dbe5c08ae061db2a566be6d22cf14bd0b88f87f9cb9c0a657d7fc44e099b8783d933c771e
+EBUILD suricata-4.0.4.ebuild 4628 BLAKE2B 734f3ca0c4aeb9ec7bfd820c8192c422966c43c2390eac49c50a507587fbb570e1e5f8d7ae62347539f464d73b3e4827ef5747dae8522373ab20cca28dfb8932 SHA512 4e361bdfb9fd716f1c10444247f3c788536d73d601cbc3b3b7c59f5923634cf20d3aed9d06fac9759233cd5dc2816015aaf9a21e53eecc03e6b12a1294e6e866
 MISC metadata.xml 775 BLAKE2B faf442e43b5388b3a24b57ee3aa73ea22eb0f230bd7bfbdee98bc4ec0be260f52f47cf7caa67d44d3498cdba58e18c487741a295149c64cf2b4631a141537e8a SHA512 e9407a4c043553a31b1a66c6b45d352444368567eef3bfa4af26e64bb84a70a81bcc7a21e48dba7e532a3115c7086932e22b75a05b00ba1f84b59d4d7ec187c6
diff --git a/net-analyzer/suricata/files/suricata-4.0.4_configure-lua-flags.patch b/net-analyzer/suricata/files/suricata-4.0.4_configure-lua-flags.patch
new file mode 100644
index 000000000000..bad66359afa1
--- /dev/null
+++ b/net-analyzer/suricata/files/suricata-4.0.4_configure-lua-flags.patch
@@ -0,0 +1,16 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -1749,11 +1749,11 @@
+   # liblua
+     AC_ARG_ENABLE(lua,
+ 	        AS_HELP_STRING([--enable-lua],[Enable Lua support]),
+-	        [ enable_lua="yes"],
++	        [],
+ 	        [ enable_lua="no"])
+     AC_ARG_ENABLE(luajit,
+ 	        AS_HELP_STRING([--enable-luajit],[Enable Luajit support]),
+-	        [ enable_luajit="yes"],
++	        [],
+ 	        [ enable_luajit="no"])
+     if test "$enable_lua" = "yes"; then
+         if test "$enable_luajit" = "yes"; then
diff --git a/net-analyzer/suricata/suricata-4.0.3.ebuild b/net-analyzer/suricata/suricata-4.0.4.ebuild
index 501a7c7a03ac..2622dccdb3b7 100644
--- a/net-analyzer/suricata/suricata-4.0.3.ebuild
+++ b/net-analyzer/suricata/suricata-4.0.4.ebuild
@@ -46,6 +46,7 @@ pkg_setup() {
 }
 
 src_prepare() {
+	epatch "${FILESDIR}"/${P}_configure-lua-flags.patch
 	eautoreconf
 }
 
@@ -129,8 +130,8 @@ src_install() {
 	fowners -R ${PN}: "/var/lib/${PN}" "/var/log/${PN}" "/etc/${PN}"
 	fperms 750 "/var/lib/${PN}" "/var/log/${PN}" "/etc/${PN}"
 
-	newinitd "${FILESDIR}/${P}-init" ${PN}
-	newconfd "${FILESDIR}/${P}-conf" ${PN}
+	newinitd "${FILESDIR}/${PN}-4.0.3-init" ${PN}
+	newconfd "${FILESDIR}/${PN}-4.0.3-conf" ${PN}
 
 	if use logrotate; then
 		insopts -m0644
diff --git a/net-analyzer/tcpdump/Manifest b/net-analyzer/tcpdump/Manifest
index 9e57186e97d5..695cf2a3bc91 100644
--- a/net-analyzer/tcpdump/Manifest
+++ b/net-analyzer/tcpdump/Manifest
@@ -1,4 +1,4 @@
 DIST tcpdump-4.9.2.tar.gz 2298386 BLAKE2B b7e90d1091affa6f4734a622f23565976b0cb5be8c0afa12656f52acea29384306f2875477dc180b5dc60110a57e0f30f5654ba27dac9f03ff610ca0548de0a7 SHA512 e1bc19a5867d6e3628f3941bdf3ec831bf13784f1233ca1bccc46aac1702f47ee9357d7ff0ca62cddf211b3c8884488c21144cabddd92c861e32398cd8f7c44b
-EBUILD tcpdump-4.9.2.ebuild 2082 BLAKE2B d801c3bd9530bb20b8446991a1279d936e798947be87495cfda10770c58f83c9444a0e9a69529dae3499124d39561098e33599f95fed623a64cf4e6a5a623406 SHA512 bc7d4065cfa34d0d3d1f6991823e531f414ee368a0bc24a2e8f339981dee4a3b17003aaee257bf7e8982584f9507b8931d49110d98e2c4ffbc475824d05d53ee
-EBUILD tcpdump-9999.ebuild 2210 BLAKE2B da1f08451d672650c53c4e6e6d968bf3f482c071c94ed36b50b9386d99e8af23c4ac2ad82c231c716f3f65583e80c812416c58ef85afe9367e489ef08866af62 SHA512 1c6e0b3ff504bcca0ebbb160f5a0eb88d5c57a4afc09400bbbccfaf62396018f4a03e284626b7a7d55829ffc8bf2648f5d84ae63defa9c1d7cde3678bf2635e6
+EBUILD tcpdump-4.9.2.ebuild 2085 BLAKE2B 446e89b171d3eec3ecb3db30576939004664214889c74ebfab6d4924a9e036823fbf575a0cdcee3d7da102a864db6848b949eaf963489f26f166cd88c2d108d0 SHA512 3dcc26ee312c4be33465c8fb7d33f1c8931d9b369e36004499f7bab8363dcbb86599a1ca44b65ec9a28d57e356ae025ac35179ffcefbc846a9200c7f48b8b186
+EBUILD tcpdump-9999.ebuild 2213 BLAKE2B 7882e2bce5692484384cb06191be0235f00ac98083b54140849a83ac76682a6bd2406983dcb9d12dccb7fa898a967088f6b1513a8692ef5adef98e7a633d96f2 SHA512 ad832aa82cced2d7d893713b1bd26198041178283114a2aadc33399954931971a80546a7e66c5a5e4ea95f0b5e588de3ea1a13a136fcbab944fa330ab7a58b85
 MISC metadata.xml 580 BLAKE2B 0769370fb4433cb7be15b66cbf8598298818b3ae024c534aab956afa695766cc77ec44041559547daac91a1b71d8427039137353497da9b8c6d8dbdb24c41952 SHA512 b8fd75f13c0993c8aa97e0c35649b4f11f992413f4dce8f737c28741d047bb36637b6c509139a046594fa788eb2932ee39a87046742372c63fe0bc6e037da49a
diff --git a/net-analyzer/tcpdump/tcpdump-4.9.2.ebuild b/net-analyzer/tcpdump/tcpdump-4.9.2.ebuild
index 1a08871479af..519175a1f4bb 100644
--- a/net-analyzer/tcpdump/tcpdump-4.9.2.ebuild
+++ b/net-analyzer/tcpdump/tcpdump-4.9.2.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
@@ -23,8 +23,8 @@ RDEPEND="
 	net-libs/libpcap
 	smi? ( net-libs/libsmi )
 	ssl? (
-		!libressl? ( >=dev-libs/openssl-0.9.6m:0 )
-		libressl? ( dev-libs/libressl )
+		!libressl? ( >=dev-libs/openssl-0.9.6m:0= )
+		libressl? ( dev-libs/libressl:= )
 	)
 "
 DEPEND="
diff --git a/net-analyzer/tcpdump/tcpdump-9999.ebuild b/net-analyzer/tcpdump/tcpdump-9999.ebuild
index 0a56c11cfe97..0d8200183ddf 100644
--- a/net-analyzer/tcpdump/tcpdump-9999.ebuild
+++ b/net-analyzer/tcpdump/tcpdump-9999.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
@@ -27,8 +27,8 @@ RDEPEND="
 	net-libs/libpcap
 	smi? ( net-libs/libsmi )
 	ssl? (
-		!libressl? ( >=dev-libs/openssl-0.9.6m:0 )
-		libressl? ( dev-libs/libressl )
+		!libressl? ( >=dev-libs/openssl-0.9.6m:0= )
+		libressl? ( dev-libs/libressl:= )
 	)
 "
 DEPEND="
diff --git a/net-analyzer/testssl/Manifest b/net-analyzer/testssl/Manifest
index bf00c6bddd96..af06eb2719a8 100644
--- a/net-analyzer/testssl/Manifest
+++ b/net-analyzer/testssl/Manifest
@@ -1,3 +1,5 @@
 DIST testssl-2.9.5.tar.gz 8955393 BLAKE2B 32518ace02f410ca7b407b51dcdab8a53218e572bec5d9a3ba380152546aaf63d8068f60d6468fbcba84e948e15c5c5769ef1da8ce53aae32978373de098d4e6 SHA512 9b9cc9f4e5d85cb2bd3767f10d0342b65cd9662df2df4d21b838c8f6a904e8e91f0242e7be1a9e0d9532d13d210beacd1b9f189ba6f955f9c4d3a6bde675677c
+DIST testssl-2.9.5_p5.tar.gz 8955523 BLAKE2B dcafb0931ddfb9d653acf79f72d2e30b2acc4a80246ecb3f26eaa35d4a69d5af65123005de34d09c563978593450895bf451b866182fd3ea38bdb121fb8e9385 SHA512 8a26989e1b8f45a2ac25efab500c89eeec2dbdbb9c0af715a61433ce0737ed69221df09a9554b6ae4415081a66ef4f6afd44c92405afefe4a810cb4375988700
 EBUILD testssl-2.9.5.ebuild 1426 BLAKE2B 30cc93e1c03ee6bc48df4fe81e765349af6c94c794e8e6291d2b3580a96a5b55919034ede2cfe5ff8ab8c6b02aa3afec6087ff3d70932f5c099d25ea54f21d80 SHA512 b1ecb8479877f7b92c6b008c5b0bfda6a554a0f22c5806b9b3c1022f058d4ff584570a9dfebe78f790820543ae8d659efa2ad679ae7671d14d62ea7b72c5b22a
+EBUILD testssl-2.9.5_p5.ebuild 1474 BLAKE2B a74f9ade90da190db9ae541cfa712b18311f915af277dffad45ce50a7b6f5989996543243dedb775afd9035296e0cf9397e219b38bccebc3d272b005b8111f57 SHA512 ef436d78eea58571ffb52ae722fe02beb649ccc78150034528adf736eb7e37387e8f97ad87ff5599a0b9a426fdd6397c3b96f1f4af44156163dc86a1f4ee6025
 MISC metadata.xml 427 BLAKE2B 5504150e6ed2e079db47b71afd8826e0543162d259ffb690caab572f6f87cf358ec4216b7859c274047f4d880aed40ab6858633856e12f9d9d05683198b75fba SHA512 83dacfa2293a8f14bce97a01f732376e76f84c4eb4fffbed1049b08210850cc5b54381d83df15bec2ecc1c1a592148d538ac37053b36fa1022542e023a97d9ab
diff --git a/net-analyzer/testssl/testssl-2.9.5_p5.ebuild b/net-analyzer/testssl/testssl-2.9.5_p5.ebuild
new file mode 100644
index 000000000000..cdd8f511f518
--- /dev/null
+++ b/net-analyzer/testssl/testssl-2.9.5_p5.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="${PN}.sh"
+MY_PV="${PV/_p/-}"
+
+DESCRIPTION="Tool to check TLS/SSL cipher support"
+HOMEPAGE="https://testssl.sh/"
+SRC_URI="https://github.com/drwetter/${MY_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2 bundled-openssl? ( openssl )"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="bundled-openssl"
+
+RDEPEND="
+	app-shells/bash[net]
+	dev-libs/openssl:0
+	net-dns/bind-tools
+	sys-apps/util-linux
+	sys-libs/ncurses:0
+	sys-process/procps
+"
+
+S=${WORKDIR}/${MY_PN}-${MY_PV}
+
+QA_PREBUILT="opt/${PN}/*"
+
+pkg_setup() {
+	use amd64 && BUNDLED_OPENSSL="openssl.Linux.x86_64"
+}
+
+src_prepare() {
+	default
+	sed -i ${PN}.sh \
+		-e 's|TESTSSL_INSTALL_DIR="${TESTSSL_INSTALL_DIR:-""}"|TESTSSL_INSTALL_DIR="/"|' \
+		-e 's|$TESTSSL_INSTALL_DIR/etc/|&testssl/|g' || die
+}
+
+src_install() {
+	dodoc CHANGELOG.stable-releases.txt CREDITS.md Readme.md
+	dodoc openssl-rfc.mappping.html
+
+	dobin ${PN}.sh
+
+	insinto /etc/${PN}
+	doins etc/*
+
+	if use bundled-openssl; then
+		exeinto /opt/${PN}
+		use amd64 && doexe bin/${BUNDLED_OPENSSL}
+	fi
+}
+
+pkg_postinst() {
+	if use bundled-openssl; then
+		einfo "A precompiled version of OpenSSL has been installed into /opt/${PN},"
+		einfo "configured to enable a wider range of features to allow better testing."
+		einfo ""
+		einfo "To use it, call ${PN} appropriately:"
+		einfo "${MY_PN} --openssl /opt/${PN}/${BUNDLED_OPENSSL} example.com"
+	fi
+}
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 1b91db39b374..83a84aead4f8 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -15,6 +15,6 @@ DIST wireshark-2.4.6.tar.xz 28851192 BLAKE2B 19a69d077b794ab07fbfb22b7cf9e61ff54
 DIST wireshark-2.6.1.tar.xz 28386244 BLAKE2B fe45f4249c81fd83ce35384b7038d7f1b5e21d884a5faec4344dda8f0c8b71393207e043672ce57bb6f1c45800ffce8feed8573a064db8048b3c0268feb0b486 SHA512 e68f7fa5975f10feccb76ab64c9a00f141cd04a12fa586a9839c93630d3554565d8e2ddfab83ec31cb813485b14b3227b7ec6e59baef007a6fe74b8b2a5ed444
 EBUILD wireshark-2.4.5.ebuild 7380 BLAKE2B 0fd3f07582d42cf9651496978c983c9cfa54b2ee0df52151c04bcb7ffd7c886aecf233598226dc2427ec0fbf6fa7d5d4ca8bf92f361c853a10b72dd625fa72dd SHA512 558350df39da8b7419d63251544900f519d920e120ffa40cdfefc7b088731d2ac6755928758bd4c9379f49b1b00b93f4cda8713601e340647d955cc73e6e590c
 EBUILD wireshark-2.4.6.ebuild 7388 BLAKE2B 1d73922229e3216ee9aeb3f95f964da3aa6afea193e88209df3f91419ba99de6de201538750dd79c3421bd8cf12dcfd1b12022b0be97a21f3e743fea17f70107 SHA512 dc66e5dd25527f9fd7ec05f6d810b4d92f2c138e2337def5571e7a7bcaf6034099ad649869190aa366700e6223e9de09997fa36c6910f9dbbc5e0c736e26a92b
-EBUILD wireshark-2.6.1.ebuild 6790 BLAKE2B 430b730aee91af383d262f5900ef4ff12250f24e2054f3a1a2d1592b3a0a8f8caba6f223ad55d2a6144c588fe79d474981d7c4c77fbb7dd0790d5442dd580a6c SHA512 7e696dc58ba80acf94afddada8f63660f03023a18dc654daf541b2aa7b98fc902f70c25b72050afa3456e0ab95b07491a514538309705a0de34a31dc59818441
+EBUILD wireshark-2.6.1.ebuild 6789 BLAKE2B ba7e455a10617d05bc601e1b3dfe91435a98cbc5c60ae5a86dfc9ca2739b31caad3e71a1420e2a335ad0fb6ceabace19a7b3621ac3c07e832fd76058d4974f7e SHA512 3b6245df2f0fe2ef6d7e4de7daf9b3ada6b99c6a1fb22912789db9712bf002c03f7592806c95f47cfd8a500aaa99640a93db0e0f5dd5c0a3faeccfb082f8bc5d
 EBUILD wireshark-99999999.ebuild 6391 BLAKE2B a97356a1ffeafe735cad35e35d7633dc34c97239f7a0f47542da28d2912ca8eff0f9e5172d37efdc157d921026ddd6a92bb22d45b628cdecfdd485b0369552d4 SHA512 56818a23c3cd32a9553b4e7ca77ca21f99546a0a2bbab5fd8c3311d4c564c7e634fb19da5587609386ceb3c925150031b1c296753e89be68626b0f1e137903d8
 MISC metadata.xml 4787 BLAKE2B dcdb28c47094cfddc0effc4c16aa9132386f94d4d6e6cdb46f31a06ebb5dd7cd5c7bf967f50c6a002b7aeecddeb8aa8b86cb5961405a463c10389d6ec9b5cb7f SHA512 b683b159266bc37471ef26f6c0c4b2e94f72d2a77a2a7647e28b8b49e611973522af294c39050dbfa8aa5cca65bf2670f9d4c1e6a93d01b386e76f1ab75ff2e9
diff --git a/net-analyzer/wireshark/wireshark-2.6.1.ebuild b/net-analyzer/wireshark/wireshark-2.6.1.ebuild
index c5eea4d2e6e9..088cd5cb5d0d 100644
--- a/net-analyzer/wireshark/wireshark-2.6.1.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.6.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="${HOMEPAGE}download/src/all-versions/${P/_/}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm hppa ia64 ~ppc64 x86"
+KEYWORDS="amd64 arm hppa ia64 ~ppc64 x86"
 IUSE="
 	adns androiddump bcg729 +capinfos +captype ciscodump +dftest doc
 	+dumpcap +editcap gtk kerberos libxml2 lua lz4 maxminddb +mergecap +netlink
diff --git a/net-analyzer/zmap/Manifest b/net-analyzer/zmap/Manifest
index cf2981c13555..d5031a0d159d 100644
--- a/net-analyzer/zmap/Manifest
+++ b/net-analyzer/zmap/Manifest
@@ -1,6 +1,4 @@
-DIST zmap-1.2.1.tar.gz 99840 BLAKE2B 11e04684444f23d30f0e91b7f70a3f60968cffb02623c1f3918774eb92206ce6fc9858ae41ea899cc84afa8e5205247c7c2eb9a57f75cc9acbe336c4655adc32 SHA512 1b3d7fa41bb75c859463f3ec8bcde31778f5d91a6f561aa9638ba93be97dacdba89493574581ce52aebcf093a86b042dcce41cffe6cb0849bb76a6005b714be2
 DIST zmap-2.1.1.tar.gz 131689 BLAKE2B c4bcea835b080dca879c227691230ad135d1822db0b81245ea60963b0a78ac71fd64df7ddca5d5a762c3d7dc67f2d689fd9d0d13e0ee9be21033de75c61ebd1f SHA512 9d62dceff77fa20ff5945516b0766340366175947130bb844f19c11dac7676e658bcdedd6be29ffc945706aa3cdc0e4ac207bd127b618592769a4d3e75892857
-EBUILD zmap-1.2.1.ebuild 827 BLAKE2B df66e2ac38b090956169fa0125f8563e4f7d80de12ac8c25e3f797c09eaf940bd50b3de1b49c651f71b352d9a5f6697fc56057c216983f380dbf01794ebc83e6 SHA512 d804ffea470b2ed54edea33eb025ce9c47f986e118c1fad063708ef75450836a78c05b9c980443ecf2cc5ff60993f8c6291ebd72b3090255eb4eddb420185dc9
 EBUILD zmap-2.1.1.ebuild 1001 BLAKE2B 64c3264b0ed163f307637dd3f01fcdd03ecbdec738d64fc7735543a4d92a180210189dec5919c06be29a6492bb74a1293feee1b5dc80b70c3c41a47a643fea45 SHA512 b64eb68e9068cd3e0488dada4185acbd47585f373ec03bc067ee4316f10b3f7b84bb9eacbbbd7ff06f0aac0ed6b09e317d02faafba23181a6a99658287121b01
 EBUILD zmap-9999.ebuild 822 BLAKE2B aa127933409d7e7f4dba6558b99085d7681ecb98b833a46ef88d08da2f680f26e6d6b00f66c519793b5f7b6162be31a47ff8b5034c46acd58c7eefd376fc6aae SHA512 17404dc9dfa2ba9a5cdd138a66574d99d65c6e4fc3dbf64fa8903ce0feae026e3bc725ccd2e52a2c91c272ef86b3b0b15f1225631f439bff0a8f3bebd6198284
 MISC metadata.xml 1137 BLAKE2B 1474e02866f4ff83084a8dc259badf0904219685b5c11ec357eb07ce17b4b07c99d43a5392e1ddadd08b09e510634493b940bd7e4ac4e22a936191aa15825757 SHA512 ba948942b57ac083ad7a7baa0b31cdb8d009945419e20e60c374b0bda1b009fe09eca2a7575f79ce3d05f3282aa3e6cde061b72eec512bfecec6d255dfbfaad6
diff --git a/net-analyzer/zmap/zmap-1.2.1.ebuild b/net-analyzer/zmap/zmap-1.2.1.ebuild
deleted file mode 100644
index b5f767ee654d..000000000000
--- a/net-analyzer/zmap/zmap-1.2.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils fcaps
-
-DESCRIPTION="Fast network scanner designed for Internet-wide network surveys"
-HOMEPAGE="https://zmap.io/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="Apache-2.0"
-KEYWORDS=" ~amd64 ~x86"
-IUSE="json redis"
-
-RDEPEND="
-	dev-libs/gmp:0
-	net-libs/libpcap
-	json? ( dev-libs/json-c:= )
-	redis? ( dev-libs/hiredis )"
-DEPEND="${RDEPEND}
-	dev-util/gengetopt
-	sys-devel/flex
-	dev-util/byacc"
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_DEVELOPMENT=OFF
-		-DENABLE_HARDENING=OFF
-		-DWITH_WERROR=OFF
-		$(cmake-utils_use_with json)
-		$(cmake-utils_use_with redis)
-		)
-	cmake-utils_src_configure
-}
-
-FILECAPS=( cap_net_raw=ep usr/sbin/zmap )