gentoo resync : 07.05.2019

7 files changed, 46 insertions, 80 deletions

diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 1104cbce2287..2ff6d38e29c5 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/flow-tools/Manifest b/net-analyzer/flow-tools/Manifest
index d48fe90e6d26..0cb141f28c35 100644
--- a/net-analyzer/flow-tools/Manifest
+++ b/net-analyzer/flow-tools/Manifest
@@ -6,6 +6,5 @@ AUX flowcapture.initd 816 BLAKE2B 6e27085fa0b8048f1b6f2d449d154a0fe9f2d7b8fa511d
 AUX linkme 283 BLAKE2B 1c1e84a29f8fccc62dc84ba8ffbd182255a5bda7979132ff721fc537bb523e221b3963e3dce4f5700f53586ef4c4acccbab605099edf7e068bf6dd2e71882721 SHA512 a9db8dec8b6f2a83b8896951bf1711ec7c58dd18d2da7db7015c0a000114b3d1da9bee4dd64842c074b332a06a890b2eea1b8ffc0399ce0efa39bf6527466359
 DIST flow-tools-0.68.5.1.tar.bz2 914062 BLAKE2B 8a987c1aac53a1370045ab118888c51ce2de7b8db4074432e86e701153469163870cf1cf9da9e2267ed934d240de4b4bf2391b4681012b82db7e4205207b7fa4 SHA512 ae17ba39854daa8ef3deecd3a554bb6d1fa47648cb791d8225a40bec13f65bf0692871660b2c3490d133b1251875c323d066bb0c0483eceb0707cec9b7714c57
 EBUILD flow-tools-0.68.5.1-r10.ebuild 1640 BLAKE2B 1d7b5e006cea30d8bd874ac57e770622d6f7b94d3bd3d7c2f7e5891d77265919abf46fbf84dd4947b16d92d98857f01ab18e49d62591783431b52cb5708dab5b SHA512 76d38aeaa85a409926c51bcd3c8bb7c603f0f24507013fe70ca3ef919af72c9240a3d11e72068e983e7dce9e91f7709972feb489ed0b790b1d01b8fc2234bf41
-EBUILD flow-tools-0.68.5.1-r2.ebuild 1687 BLAKE2B 360f0d59242c3b4a9dd89fe6ce8282ef53f1ce168ced1e32660a87bb3de4576b1cfdf08c5be56f7b70f3f97bf0115bd345c4c434ce051d1ebfd81b577d1fde22 SHA512 19fab6d40f16607410ab530c2624e36a40e806bab2bcd9e336bbb03164020e9a84b376adaa9a3cabaca6441982b1effe4c4f5ccfa4f9c134888990aba6600293
 EBUILD flow-tools-0.68.5.1-r9.ebuild 1615 BLAKE2B f041ee019a4d4d70f4612f25c5904112a2c08e4868d727dcea9c370bb9461acc5d1eadbe2f452fec3d5f319e38ebcf0910a8217eef8ebcbc4b7ed9f7af2dc36d SHA512 c7d85fc7c617008977f8e9d151eb1765a416d8ad7edc011b870b9b1f6727dbc80b26f1a3ce527b661d5f4da68047c4910e007e467d006796523a6135689003d8
 MISC metadata.xml 902 BLAKE2B 16f4780c8fc2a803580d1ad9321e1db662c1c720f744f544b57a2eb65f9859c02dced677f3ea1732b05afe70abb55b4a9c349fb375ee24abf083b8376d521fb1 SHA512 45f900d25bc2b968ce9a04fd143106962c1a242b776840eb2c1b51f0e02d71000f9a2fdf19286f7873e07c25aa9d528597f1b1fe0e7e083c29de5304b87aeab3
diff --git a/net-analyzer/flow-tools/flow-tools-0.68.5.1-r2.ebuild b/net-analyzer/flow-tools/flow-tools-0.68.5.1-r2.ebuild
deleted file mode 100644
index e6447657ab54..000000000000
--- a/net-analyzer/flow-tools/flow-tools-0.68.5.1-r2.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit eutils user
-
-DESCRIPTION="library and programs to collect, send, process, and generate reports from NetFlow data"
-HOMEPAGE="https://code.google.com/p/flow-tools/"
-SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.bz2"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="debug mysql postgres ssl static-libs"
-
-RDEPEND="sys-apps/tcp-wrappers
-	sys-libs/zlib
-	mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql )
-	ssl? ( dev-libs/openssl )"
-
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	sys-devel/bison"
-
-DOCS=( ChangeLog README SECURITY TODO )
-
-pkg_setup() {
-	enewgroup flows
-	enewuser flows -1 -1 /var/lib/flows flows
-}
-
-src_prepare() {
-	sed -i \
-		-e 's|/var/run/|/run/|g' \
-		src/flow-capture.c \
-		src/flow-fanout.c \
-		|| die
-}
-
-src_configure() {
-	local myconf="--sysconfdir=/etc/flow-tools"
-	use mysql && myconf="${myconf} --with-mysql"
-	if use postgres; then
-		myconf="${myconf} --with-postgresql=yes"
-	else
-		myconf="${myconf} --with-postgresql=no"
-	fi
-	use ssl && myconf="${myconf} --with-openssl"
-	econf ${myconf} $(use_enable static-libs static)
-}
-
-src_install() {
-	default
-
-	prune_libtool_files
-
-	exeinto /var/lib/flows/bin
-	doexe "${FILESDIR}"/linkme
-
-	keepdir /var/lib/flows/ft
-
-	newinitd "${FILESDIR}/flowcapture.initd" flowcapture
-	newconfd "${FILESDIR}/flowcapture.confd" flowcapture
-
-	fowners flows:flows /var/lib/flows
-	fowners flows:flows /var/lib/flows/bin
-	fowners flows:flows /var/lib/flows/ft
-
-	fperms 0755 /var/lib/flows
-	fperms 0755 /var/lib/flows/bin
-}
-
-pkg_preinst() {
-	enewgroup flows
-	enewuser flows -1 -1 /var/lib/flows flows
-}
diff --git a/net-analyzer/nagios-icinga-openvpn/Manifest b/net-analyzer/nagios-icinga-openvpn/Manifest
index 8b5d9be05e07..5c34b96ca0c7 100644
--- a/net-analyzer/nagios-icinga-openvpn/Manifest
+++ b/net-analyzer/nagios-icinga-openvpn/Manifest
@@ -1,3 +1,3 @@
 DIST nagios-icinga-openvpn-0.0.1.tar.gz 4637 BLAKE2B 365b6450cccd5f7f25348583eae45c0b15932ec1e858d375171911e4108dd2b7fc133559a35399ece8d2a349f05b2f51897cf9e271f498b6bbaa2c6bba3551a9 SHA512 0dae6c2df71a20e287720767aa4ba41d0568f3cd4bd2a6eb252f86d810d3de265ddc38397df15bb1b115ba35ac68aa6e18345dc4432d4d13b08b500483ffbb11
-EBUILD nagios-icinga-openvpn-0.0.1.ebuild 1119 BLAKE2B e295b34ab41c296db0626f1b40a591ad976ccb573151c0529dbc2100489b87a3342084cdba1ded401400b4a14d5787d2b1a5a214b54cc033a1b3dd53c5f68680 SHA512 a7d55763ca4257becc5bf054eb7c9a78fb9b1b9c017778559a074a07805d5178a583fec8708848f92c7ee1c54d509a653c953e79be0e4ff36d57302a3d467394
+EBUILD nagios-icinga-openvpn-0.0.1.ebuild 1118 BLAKE2B 6394f812bcf52e88e97b29d40e6f08397a6b234a8e5e7af736d8288805c58153a7f509041af99b3b48cb3fd526cf3d57c4c7908e158a8756a629a5ca3d4f46d0 SHA512 f37546d9424e369a030343981ba8d015c1272dc894a5787862e12a89b7348448bf58f2ad964c96b3d66b28e61645ee2936591d577afd79d6c07d82c179985c49
 MISC metadata.xml 252 BLAKE2B fa9e1dbdc0de3313b50ecd9de7ac59006074b8b75ecb97a8fc4de5fb14609cb00dc1b24ba95a2e7fb11cbc6f8c8f0c068bd0311713cc2aa7e6016992dbd6e8bd SHA512 92f660063c96ac5b3e24e58733006d4a72a7e2f41605988efb575546a2539a92b1ceb3a37e018fcb5c08264a42af26950d6520ea80ba60130ad25ce6092ce742
diff --git a/net-analyzer/nagios-icinga-openvpn/nagios-icinga-openvpn-0.0.1.ebuild b/net-analyzer/nagios-icinga-openvpn/nagios-icinga-openvpn-0.0.1.ebuild
index e9b11236fdba..355630403ebd 100644
--- a/net-analyzer/nagios-icinga-openvpn/nagios-icinga-openvpn-0.0.1.ebuild
+++ b/net-analyzer/nagios-icinga-openvpn/nagios-icinga-openvpn-0.0.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE=""
 
 src_install() {
diff --git a/net-analyzer/scapy/Manifest b/net-analyzer/scapy/Manifest
index 0b8ac0d9f70c..c0c8985be57f 100644
--- a/net-analyzer/scapy/Manifest
+++ b/net-analyzer/scapy/Manifest
@@ -1,6 +1,8 @@
 DIST scapy-2.3.2.tar.gz 1166056 BLAKE2B bce5f37bd833dc457089cdfebd2dc019c4f7bed636935b4a6b51a2cf7355f5761fadaa304e93c276daa2200c48ab0e1c0a08bd278e30dfea1faa01321a0b957e SHA512 6b15e102708d1bd0ca0c910e2d82416cd172634409f93c506542a7dc6b69ddc9c9afef6ec07929f70cc0f8f4c455cdc84d9b35bc2c5b72f79dd7e6785306dc7a
 DIST scapy-2.4.0.tar.gz 3182131 BLAKE2B af591b103c90736a5e62801f4c0ebd495e2e71c79ee81f04fdd194739b460c9940b8fcf0c6e279701095979144eff25ca4734926c0251721b37dc63fe8dd9e89 SHA512 0fe80150cd83db7735c9d0b70ec832a4e68eb5160ad8559e9b1bd79c52a9950ef7c9555ea2a1ee1dc8df1f055a885c52552c29e304faf40250ce9c502a5f870a
+DIST scapy-2.4.2.tar.gz 3330071 BLAKE2B a40074594cd561b33d04364fba743fa5fe741b06b2ad8f8f9ebe9dfb0b9a3bc4f641cd16d99a4ba070fc0763d7cfeb8d3ecd056f162d509070cdd57d55d6ad9c SHA512 980f708a849ae26edca3eb6618a41668818c5883bca699f347f47a8964b3ee44a6ceefe4a12cb7d5fe6c13f5cbe2b7547938e53139f4ec9e6ef384e30c9bb6db
 EBUILD scapy-2.3.2-r1.ebuild 859 BLAKE2B 0ca5a6e0167ba5979444c5e994f7b7cc70ff6956862f757a2303698c71930f1f08815a74e4500a7fe9f5667d9723765461b02b2264c9332e29d9c38820cc8386 SHA512 7b731147b9b3024e00dcaf4ce0c43d23fafcff737389be66d7ad4a9b3f5f4a15ef00d2e255eaf0487377e2c6a4b88017c4fb8265dcc4f9a817ef0785da494661
 EBUILD scapy-2.4.0.ebuild 1032 BLAKE2B fc0f639924d5e7fe3664e5935a569653b3f30964a9ec20900ddf00869c51ecb2ab9260dcf0d1f7615a3fcbf16ae7248f07c3d7be442c245e407ac60ecab6b116 SHA512 60b0c20b04e0463c38e10c1e74fc675e316b0976e85fd0a76abc630cbeecb08fb2159212c493e82077c5f1abeeec09b7cbecc436eb4f06648307602ec24a39d8
+EBUILD scapy-2.4.2.ebuild 1034 BLAKE2B e49261facec1453d9a35955e7c0c959bb1df5a16192052e3c88de498625a2fff1ae72422e5973b6837e59d3fdfde8c223dbd442fe0e5da7c20391de5e5dcda31 SHA512 71f020a55c0748eb1bcb76a27137248460c6c23db5bb5dd7160af6c8f45bf0c761c314ac76aca24c2c1eeef31a40406fa7f614ddce11e77d81220a1ab54d3617
 EBUILD scapy-9999.ebuild 994 BLAKE2B 89b25b3c24f18409eefaf5b29ebe052a2c2dd8436ca8d467d7709f61c570e8006d5277bb7d1a0311334f30146e61a06f5a1dd4a9f358c70a27940fb951af2cc4 SHA512 b848b8bf4752e5eea1bcfc491f328d8a58795fa0719f7861e6e647bf705af36c5ff82cdbcfa5f31ff80875f1d9f0aa35366b5f02ac871bb61bb470cabde101b3
 MISC metadata.xml 674 BLAKE2B 9aeb70531e3395462033100fc9b709533c158bf7939aa46930558b48e9f750030bc26f750b574f3e31ee5779c65a7afb48ed74f8db9d738849e9ab97d621f351 SHA512 54bbc8a152f8433e3da143261bc530df95e8a5808791582e2d2115476001f63381219a3738bb80c1833f56d331ee54908cf72f3c72cc27e05100f6de8edc6caf
diff --git a/net-analyzer/scapy/scapy-2.4.2.ebuild b/net-analyzer/scapy/scapy-2.4.2.ebuild
new file mode 100644
index 000000000000..113734a51279
--- /dev/null
+++ b/net-analyzer/scapy/scapy-2.4.2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+inherit distutils-r1 readme.gentoo-r1
+
+DESCRIPTION="A Python interactive packet manipulation program for mastering the network"
+HOMEPAGE="http://www.secdev.org/projects/scapy/ https://github.com/secdev/scapy"
+SRC_URI="https://github.com/secdev/${PN}/archive/v${PV/_/}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RDEPEND="
+	net-analyzer/tcpdump
+"
+S=${WORKDIR}/${P/_/}
+DOC_CONTENTS="
+Scapy has optional support for the following packages:
+
+	dev-python/cryptography
+	dev-python/gnuplot-py
+	dev-python/ipython
+	dev-python/pyx
+	media-gfx/graphviz
+	net-analyzer/tcpreplay
+	virtual/imagemagick-tools
+
+	See also ""${EPREFIX}/usr/share/doc/${PF}/installation.rst""
+"
+
+src_prepare() {
+	echo ${PV/_/} > ${PN}/VERSION
+	distutils-r1_src_prepare
+}
+
+src_install() {
+	distutils-r1_src_install
+	dodoc -r doc/${PN}/*
+	DISABLE_AUTOFORMATTING=plz readme.gentoo_create_doc
+}