gentoo resync : 11.07.2019

32 files changed, 1139 insertions, 12 deletions

diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index d20391cb902c..60dae65b8d78 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/barnyard2/Manifest b/net-analyzer/barnyard2/Manifest
index 98bc65c61791..c1cca42e98c5 100644
--- a/net-analyzer/barnyard2/Manifest
+++ b/net-analyzer/barnyard2/Manifest
@@ -1,5 +1,11 @@
+AUX barnyard2-1.13-free.patch 235 BLAKE2B 5c96aa8048a8445ce34c4bed29d60ae66b82cd7758e58fb34c2ec96d0b1d43404ee24a5cf7f5815bf1201adf621fa954096000c52aba56db919c20f335dd7749 SHA512 40aa34cb3b778e17a917ae1791ba640060e6cbd6fff1b3edb43f95d4b187a57e2c826abbb6709d71d6b30b73a07a117f2a27b19600a0129462d9d5106ab40285
+AUX barnyard2-1.13-libdir.patch 2976 BLAKE2B f940e9302aea3a55867c081de832dc4d2be6759c73152a9e204dad4987dd3975efe8dfe4e1d16ffd965d95205b5ef7eb178876e8bcc23dd3d6e5cb7c892bf84e SHA512 c87aec5043b7a589cc2c23464cadcb073d1a1da3c11491080b306f04191e7359942acf56fc42a85c7e52349ce5ae82bbc3dd26f886ae6f45191506b2cffdf8ce
+AUX barnyard2-1.13-odbc.patch 1453 BLAKE2B a238e0456227c82620a59b1b8b66d1e99a88baacf029a476851241cd5e795118d6b9cd3aada07013f67ee25b88568f63376c7a4eb64946321731daa1b1fb2f4f SHA512 34b2d744c933a007412536b95b7bd152425c37022c9d8c92b5e1f104baea60b831e2c0816a57e0a8f662975005a073b424408e6f5630432588add3a7c6ad28c9
+AUX barnyard2-1.13-pcap-1.9.0.patch 944 BLAKE2B 143d2cc61e447d5c493a3d503e7e2020432fea9c5292b5837f20ef4e9bd5ba306180280a2bc3e25bd98ceb3859328e94f4967e88fccc74f5d9ebdd3e01be0179 SHA512 23d39af20e6a062547f57c9c0a3614bd5b1d08622611a455e7faa6201d12a9ce26e6985d61cae44e3d85842a596b34c921fe07c5ab88caa2a1c48542bda1563c
 AUX barnyard2.confd 1487 BLAKE2B 0eaae6d5c5bd249c5033e404712b14b10eacb2ea7f638872927bd4e2fe5d005225e257bd5971597ae62db5a1f10da2d092e086eb60fb6ea3b552801f992d8646 SHA512 25fb327829da9f23a100e69310dd57c1f99404dd9923f2ef73d90635013ca68678122ee5f45f2e267c7b2f6264fd8e57998b1730d4ee02d3c2f61f1fe72d1f5f
 AUX barnyard2.initd 680 BLAKE2B 3cd613eb91029876a98900f38bde0cfaca15e47d66d9900a109797bf698ec61f4430cb4bed266c6875ec2a4bfa41a285e5c068b2f9b1f11b16394b9bba6d889b SHA512 32370ac32444e44df517dcc86ae59c548311ab02e49d2cf81d391e111334335968ee1d639c8a36a937dfdaa6a83f5dc33fb9f44ab3d7b822ace28985eabe3423
+DIST barnyard2-1.13-github.tar.gz 435017 BLAKE2B 2bfd6b038f4691cd9b40128c48db89cdb0cdefd9c779cbae4f6a86246507849f8faf73e10c986d9a48d45d608b02cbb8486bd731ebe1c78be115fe65c5a97704 SHA512 b9cf42ff3cb066493a3a6e8d095f6af1c59815ebb19725374a75977294620fe825cdbc6650d3600d3f8525860c39d3580aa1d6ef773cd31fbc28d500d6c75246
 DIST barnyard2-1.9-github.tar.gz 344672 BLAKE2B 720d55170eaf66d2fac7a73990f00dab6faf27c5fcfbcd2f3fa5bad8fa028880fc257a78b60660eaaa5cea3cd8ab04aea2ad173d2135757d7a1f93a80e049d06 SHA512 eb10e4333e862ba6d708e7956b86f9da5da8c52b2756724e821ac5f5ba064791cf84125942bf76e7c563f62c83558aff90219ccc694884e213f6571428849666
+EBUILD barnyard2-1.13.ebuild 1881 BLAKE2B d0416ca8952ffbe4bba4cde68c7abb6ebf5207adbf356d154e21e665594c5bef305f96d1589a8913d999c4f1e422221163772bbf8aa24b8eeb9d02067f567c97 SHA512 ee78d77e42cdaa0899a5d85b837bb6279aa1e927faff82a110a18542e9d8af57489e71a0d408b06d89ddc35273e0988389d1d5c7aa30f4d35f114b9f7109c784
 EBUILD barnyard2-1.9-r2.ebuild 1720 BLAKE2B b05ec48d30fc48ecd74d814790ec61df13c7e7d2b98e389859dfdf4a05642e7fd5bb9f47d3b9b8a587f9a6a154657cbbb925af2e493cb951e889239e3a4c28f0 SHA512 0d0967ce5498054f075d163e407d1d04741c2329cee2ab205e1d4990e5918ec63f4948e75456e8b9ae628e9206a95b0a3602473074d9ff2be3313788b6302fcd
-MISC metadata.xml 1266 BLAKE2B 00bb6b8c75617632fb4e89059005bcaf90e6f637a1227f6717a3d3d3f5957b17eee0936764ae5f74b37a76fd3681dfd87feed8858170ff8dc56a1683549bd028 SHA512 fcc818ef5d01ef3887994a1426e3ded3df4c8239e9b68edc6be943392252a072a42cd98dacb119fc568097e72d8dff0909bc3241e81314194290b40ae0f56b27
+MISC metadata.xml 1369 BLAKE2B 90fc4c66290d2b82184e109a0affc8550b38b4f1781215531496bef639150b5e610feca7182335c263db764f94c248fe16448025835b3f2bb6e92b1b5703b13a SHA512 3fcbf3709f433993d2fac432ff9175547afbcc646efa98dc49f1ffc8ea5b5f5bf3872a557994af885cd1d2106358bfbd2a8a08361218c7a87f07f46ce61746ce
diff --git a/net-analyzer/barnyard2/barnyard2-1.13.ebuild b/net-analyzer/barnyard2/barnyard2-1.13.ebuild
new file mode 100644
index 000000000000..7214129d7ec1
--- /dev/null
+++ b/net-analyzer/barnyard2/barnyard2-1.13.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools
+
+DESCRIPTION="Parser for Snort unified/unified2 files"
+HOMEPAGE="https://github.com/firnsy/barnyard2 https://firnsy.com/projects"
+SRC_URI="https://github.com/firnsy/barnyard2/archive/v2-${PV}.tar.gz -> ${P}-github.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug gre mpls mysql odbc postgres sguil"
+
+DEPEND="
+	net-libs/libpcap
+	mysql? ( dev-db/mysql-connector-c:0= )
+	odbc? ( dev-db/unixODBC )
+	postgres? ( dev-db/postgresql:* )
+	sguil? ( dev-lang/tcl:* )
+"
+RDEPEND="
+	${DEPEND}
+"
+DOCS="RELEASE.NOTES etc/barnyard2.conf doc/README* schemas/create_*"
+S="${WORKDIR}/${PN}-2-${PV}"
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.13-free.patch
+	"${FILESDIR}"/${PN}-1.13-libdir.patch
+	"${FILESDIR}"/${PN}-1.13-odbc.patch
+	"${FILESDIR}"/${PN}-1.13-pcap-1.9.0.patch
+)
+
+src_prepare() {
+	default
+
+	sed -i -e "s:^#config interface:config interface:" \
+		"etc/barnyard2.conf" || die
+	sed -i -e "s:^output alert_fast:#output alert_fast:" \
+		"etc/barnyard2.conf" || die
+
+	AT_M4DIR="m4" eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable debug) \
+		$(use_enable gre) \
+		$(use_enable mpls) \
+		$(use_with mysql) \
+		$(use_with odbc) \
+		$(use_with postgres postgresql) \
+		$(use_with sguil tcl) \
+		--disable-aruba \
+		--disable-ipv6 \
+		--disable-mysql-ssl-support \
+		--disable-prelude \
+		--disable-static \
+		--without-oracle
+}
+
+src_install () {
+	default
+
+	newconfd "${FILESDIR}/barnyard2.confd" barnyard2
+	newinitd "${FILESDIR}/barnyard2.initd" barnyard2
+
+	dodir /etc/barnyard2
+	keepdir /var/log/barnyard2
+	keepdir /var/log/snort/archive
+
+	rm "${D}"/etc/barnyard2.conf || die
+}
+
+pkg_postinst() {
+	elog "Configuration options can be set in /etc/conf.d/barnyard2."
+	elog
+	elog "An example configuration file can be found in /usr/share/doc/${PF}."
+}
diff --git a/net-analyzer/barnyard2/files/barnyard2-1.13-free.patch b/net-analyzer/barnyard2/files/barnyard2-1.13-free.patch
new file mode 100644
index 000000000000..216fe480de7a
--- /dev/null
+++ b/net-analyzer/barnyard2/files/barnyard2-1.13-free.patch
@@ -0,0 +1,11 @@
+--- a/src/output-plugins/spo_alert_unixsock.c
++++ b/src/output-plugins/spo_alert_unixsock.c
+@@ -56,6 +56,8 @@
+ #include "spo_alert_unixsock.h"
+ #include "barnyard2.h"
+ 
++#include <stdlib.h>
++
+ #define UNSOCK_FILE "barnyard2_alert"
+ 
+ 
diff --git a/net-analyzer/barnyard2/files/barnyard2-1.13-libdir.patch b/net-analyzer/barnyard2/files/barnyard2-1.13-libdir.patch
new file mode 100644
index 000000000000..5d3c7e37aa38
--- /dev/null
+++ b/net-analyzer/barnyard2/files/barnyard2-1.13-libdir.patch
@@ -0,0 +1,112 @@
+--- a/configure.in
++++ b/configure.in
+@@ -570,53 +570,7 @@
+       fi
+   done
+ 
+-  for i in $mysql_lib_directory; do
+-      if test -z "$MYSQL_LIB_DIR"; then
+-        str="$i/libmysqlclient.*"
+-        for j in `echo $str`; do
+-          if test -r $j; then
+-            MYSQL_LIB_DIR=$i
+-            break 2
+-          fi
+-        done
+-      fi
+-      if test -z "$MYSQL_LIB_DIR"; then
+-        str="$i/lib/libmysqlclient.*"
+-        for j in `echo $str`; do
+-          if test -r "$j"; then
+-            MYSQL_LIB_DIR="$i/lib"
+-            break 2
+-          fi
+-        done
+-      fi
+-      if test -z "$MYSQL_LIB_DIR"; then
+-        str="$i/mysql/libmysqlclient.*"
+-        for j in `echo $str`; do
+-          if test -r "$j"; then
+-            MYSQL_LIB_DIR="$i/mysql"
+-            break 2
+-          fi
+-        done 
+-      fi
+-      if test -z "$MYSQL_LIB_DIR"; then
+-        str="$i/mysql/lib/libmysqlclient.*"
+-        for j in `echo $str`; do
+-          if test -r "$j"; then
+-            MYSQL_LIB_DIR="$i/mysql/lib"
+-            break 2
+-          fi
+-        done
+-      fi
+-      if test -z "$MYSQL_LIB_DIR"; then
+-        str="$i/lib/mysql/libmysqlclient.*"
+-        for j in `echo $str`; do
+-          if test -r "$j"; then
+-            MYSQL_LIB_DIR="$i/lib/mysql"
+-            break 2
+-          fi
+-        done
+-      fi
+-  done
++  AC_CHECK_LIB([mysqlclient],[mysql_query],[MYSQL_LIB_DIR="$libdir"])
+ 
+   if test -z "$MYSQL_INC_DIR"; then
+     if test "x$mysql_fail" != "xno"; then
+@@ -760,13 +714,7 @@
+     fi
+   else
+ 
+-    str="$ODBC_DIR/lib/libodbc.*"
+-    for j in `echo $str`; do
+-      if test -r "$j"; then 
+-        ODBC_LIB_DIR="$ODBC_DIR/lib"
+-        ODBC_LIB="odbc"
+-      fi
+-    done
++    AC_CHECK_LIB([odbc],[SQLAllocHandle],[ODBC_LIB_DIR="$libdir";ODBC_LIB="odbc"])
+ 
+ dnl    if test -z "$ODBC_LIB_DIR"; then
+ dnl      str="$ODBC_DIR/lib/libiodbc.*"
+@@ -786,7 +734,6 @@
+       fi
+     else
+       AC_MSG_RESULT(yes)
+-      LDFLAGS="${LDFLAGS} -L${ODBC_LIB_DIR}"
+       CPPFLAGS="${CPPFLAGS} -I${ODBC_INC_DIR} -DENABLE_ODBC"
+       LIBS="${LIBS} -l$ODBC_LIB"
+     fi
+@@ -863,21 +810,7 @@
+   fi
+ 
+ 
+-  if test -z "$POSTGRESQL_DIR"; then
+-    for dir in $postgresql_directory; do
+-       for i in "lib" "lib/pgsql"; do
+-         str="$dir/$i/libpq.*"
+-         for j in `echo $str`; do
+-           if test -r $j; then
+-  	     POSTGRESQL_LIB_DIR="$dir/$i"
+-             break 2
+-           fi
+-         done
+-       done
+-   done
+-  else
+-   POSTGRESQL_LIB_DIR="$POSTGRESQL_DIR/lib"
+-  fi
++  AC_CHECK_LIB([pq],[PQexec],[POSTGRESQL_LIB_DIR="$libdir"])
+ 
+   if test -z "$POSTGRESQL_LIB_DIR"; then
+      if test "$postgresql_fail" != "no"; then
+@@ -892,7 +825,7 @@
+      CPPFLAGS="${CPPFLAGS} -I${POSTGRESQL_INC_DIR} -DENABLE_POSTGRESQL"
+      AC_CHECK_LIB(pq, PQexec,, PQLIB="no")
+      if test "x$PQLIB" != "xno"; then
+-        LIBS="${LIBS} -lpq"
++        :
+      else
+         echo
+         echo "   ERROR!  libpq (postgresql) not found!"
diff --git a/net-analyzer/barnyard2/files/barnyard2-1.13-odbc.patch b/net-analyzer/barnyard2/files/barnyard2-1.13-odbc.patch
new file mode 100644
index 000000000000..a7d77ee914fa
--- /dev/null
+++ b/net-analyzer/barnyard2/files/barnyard2-1.13-odbc.patch
@@ -0,0 +1,41 @@
+--- a/src/output-plugins/spo_database_cache.c
++++ b/src/output-plugins/spo_database_cache.c
+@@ -1202,10 +1202,10 @@
+ 
+     
+     
+-#if  (defined(ENABLE_MYSQL) || defined(ENABLE_POSTGRESQL))    
++#if  (defined(ENABLE_MYSQL) || defined(ENABLE_POSTGRESQL) || defined(ENABLE_ODBC))    
+     u_int32_t curr_row = 0;
+     u_int32_t queryColCount =0;
+-#endif /* (defined(ENABLE_MYSQL) || defined(ENABLE_POSTGRESQL)) */
++#endif /* (defined(ENABLE_MYSQL) || defined(ENABLE_POSTGRESQL) || defined(ENABLE_ODBC)) */
+ 
+ 
+ #ifdef ENABLE_ODBC
+--- a/src/output-plugins/spo_database.c
++++ b/src/output-plugins/spo_database.c
+@@ -3443,9 +3443,9 @@
+ #endif
+ 
+ 
+-#if defined(ENABLE_MYSQL) || defined(ENABLE_POSTGRESQL)
++#if defined(ENABLE_MYSQL) || defined(ENABLE_POSTGRESQL) || defined(ENABLE_ODBC)
+     int result = 0;
+-#endif /* defined(ENABLE_MYSQL) || defined(ENABLE_POSTGRESQL) */
++#endif /* defined(ENABLE_MYSQL) || defined(ENABLE_POSTGRESQL) || defined(ENABLE_ODBC) */
+ 
+     
+     if( (query == NULL) ||
+@@ -3668,9 +3668,9 @@
+ int Select(char * query, DatabaseData * data,u_int32_t *rval)
+ {
+ 
+-#if defined(ENABLE_MYSQL) || defined(ENABLE_POSTGRESQL)
++#if defined(ENABLE_MYSQL) || defined(ENABLE_POSTGRESQL) || defined(ENABLE_ODBC)
+     int result = 0;
+-#endif /* defined(ENABLE_MYSQL) || defined(ENABLE_POSTGRESQL) */
++#endif /* defined(ENABLE_MYSQL) || defined(ENABLE_POSTGRESQL) || defined(ENABLE_ODBC) */
+     
+     if( (query == NULL) || 
+ 	(data == NULL) ||
diff --git a/net-analyzer/barnyard2/files/barnyard2-1.13-pcap-1.9.0.patch b/net-analyzer/barnyard2/files/barnyard2-1.13-pcap-1.9.0.patch
new file mode 100644
index 000000000000..87aec539cae1
--- /dev/null
+++ b/net-analyzer/barnyard2/files/barnyard2-1.13-pcap-1.9.0.patch
@@ -0,0 +1,38 @@
+--- a/src/output-plugins/spo_alert_fwsam.c
++++ b/src/output-plugins/spo_alert_fwsam.c
+@@ -115,7 +115,7 @@
+ #include <sys/filio.h>
+ #endif
+ 
+-typedef int SOCKET;
++typedef int BY2_SOCKET;
+ 
+ #ifndef INVALID_SOCKET
+ #define INVALID_SOCKET  -1
+@@ -961,7 +961,7 @@
+     FWsamPacket sampacket;
+     FWsamStation *station=NULL;
+     FWsamList *fwsamlist;
+-    SOCKET stationsocket;
++    BY2_SOCKET stationsocket;
+     int i,len,deletestation,stationtry=0;
+     char *encbuf,*decbuf;
+     static unsigned long lastbsip[FWSAM_REPET_BLOCKS];
+@@ -1387,7 +1387,7 @@
+ void FWsamCheckOut(FWsamStation *station)
+ {
+     FWsamPacket sampacket;
+-    SOCKET stationsocket;
++    BY2_SOCKET stationsocket;
+     int i,len;
+     char *encbuf,*decbuf;
+ 
+@@ -1538,7 +1538,7 @@
+     int i,len,stationok=TRUE;
+     FWsamPacket sampacket;
+     char *encbuf,*decbuf;
+-    SOCKET stationsocket;
++    BY2_SOCKET stationsocket;
+ 
+ 
+     /* create a socket for the station */
diff --git a/net-analyzer/barnyard2/metadata.xml b/net-analyzer/barnyard2/metadata.xml
index c97636709d30..d6bf89e69a2c 100644
--- a/net-analyzer/barnyard2/metadata.xml
+++ b/net-analyzer/barnyard2/metadata.xml
@@ -28,5 +28,6 @@
 	<use>
 		<flag name="gre">Enable GRE support</flag>
 		<flag name="mpls">Enable support for mpls networks</flag>
+		<flag name="sguil">Enable sguil (The Analyst Console for Network Security Monitoring) support</flag>
 	</use>
 </pkgmetadata>
diff --git a/net-analyzer/chaosreader/Manifest b/net-analyzer/chaosreader/Manifest
index 84473bb0e02b..ffbc5c948da2 100644
--- a/net-analyzer/chaosreader/Manifest
+++ b/net-analyzer/chaosreader/Manifest
@@ -9,5 +9,5 @@ AUX chaosreader-0.96-zombies.patch 343 BLAKE2B 85dd641d9c20a5f90a0f102fbae1abee3
 DIST chaosreader-0.94.bz2 41039 BLAKE2B 664ac7de3ea15dcc2942f7d9ffa4a7ffd2066a521345877127594ece197cab8d49d2f3441335c012dc09041543cda31c723d021ae86a512b4d578f958acc3afc SHA512 f2c2b31e6f7fc27c5cb59a43ce9cdea67de520c79f6354c9a0f627c098d73f4666461fb4f3c393a0a9ac36105979fe36b08035c4404371db2f573dd534e1adad
 DIST chaosreader-0.96.tar.gz 99124 BLAKE2B 04e9dd45543033bb3d15264fcc9168b7e2cec6f304f10142df36c363e841afc91659d7956bbb60b05cc6ab4e8fd519adaf9a2e69be2efc129fd2f38ca0d99f1f SHA512 46ba4a66152403e150e652bf6fa08af98cd3d709ea2cb834a32411ca5dde5f94a7e972404626787e604c1449c29ab5f335673b305ab83856c0dfff7cbf2f4de4
 EBUILD chaosreader-0.94-r1.ebuild 840 BLAKE2B 8060c14564abfe0a5994fe7ca8263ac281fcedf33cc590adc0a10927281ced71a8f6dd4e8659fc36597835086501bef436db99d383b7deb9426a1ae5e8102484 SHA512 365f6740dce7ad5b9938fa5e15a2564cadc35f49b04a2b7e7dac9efbb8071be872a8bdf8e58c7b44eb3386ed392b60d73f4b483a49002743dedf7a598f5c7a70
-EBUILD chaosreader-0.96.ebuild 726 BLAKE2B bbc041d07cf075465a04a9b594c52b13d919dcea78d61a88213b5454ae23222ba40d10c9e63494dd05dd4fe915acfd59a2736c6f1c592988ea5bf3c2ccf1c856 SHA512 5064abb43c24fd06d8862144d6d4c02302a746af2bde3759cc2734ecaf035404086256b36404f3734282c9ef4a5ad797b5af6a1f10b69441493f47dfc39ce966
+EBUILD chaosreader-0.96.ebuild 724 BLAKE2B 33936dddbff112b78e99ffb0d2f4421d317c354434b870bb30b33a49ce1f7293ff349d6f11771956533eeda20d1b1bbef9b0f5f5954419c908c52e84e573daf0 SHA512 0ff77d9619e81f3fde969c781620c117ddcab6cf8cd2f892550bb7d835c64a20bb7a5f06876830737a3c6335db90e9c64d740bb7d342bab940eaa2ecd18fea95
 MISC metadata.xml 519 BLAKE2B bb962789720f669f73a42bb2b4b0cf80f39d8efc8c7ef191048ed554813dd2ca3e3e8b0fecdbd46513fe7bf815d0129fc9d11be45ef240ba280d931a751377b6 SHA512 1c1018ea975b13592ac38a1d5207ad599f8a6f36f58718232a27870e23d5d5b2c7b3977b31975bf24c42176e0d8043259a130e4020a05942fe6d7aca073444a4
diff --git a/net-analyzer/chaosreader/chaosreader-0.96.ebuild b/net-analyzer/chaosreader/chaosreader-0.96.ebuild
index ab29f713b3df..09f3c3382e7a 100644
--- a/net-analyzer/chaosreader/chaosreader-0.96.ebuild
+++ b/net-analyzer/chaosreader/chaosreader-0.96.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="http://chaosreader.sourceforge.net
 SRC_URI="https://github.com/brendangregg/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 SLOT="0"
 
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~x86-macos"
 LICENSE="GPL-2+"
 
 DEPEND=">=dev-lang/perl-5.8.0"
diff --git a/net-analyzer/ettercap/Manifest b/net-analyzer/ettercap/Manifest
index 2c97cf556038..607dd6c0e171 100644
--- a/net-analyzer/ettercap/Manifest
+++ b/net-analyzer/ettercap/Manifest
@@ -1,6 +1,8 @@
 AUX cve-2017-6430.patch 2437 BLAKE2B 4267c1028467734e45f0a2b730498b6b1de86d9aca95377d7afe76d872ae05c0c9c5e600e8c35f7e0f74d00a125cbffce7f372d543e1728a83121c234ef65366 SHA512 fd3477e7ab087d2b0fdfff6ef331ca8ae4aa838ece54a84d4e597d57cf45425a4dc4be60b9caadf0af25ebe8072eea542092e400e6fe219696b0dc13ca4e205b
 AUX ettercap-0.8.2-openssl-1.1.patch 8769 BLAKE2B 6c9d7e8c60264b6ac0724891f9cbc9b2436bb943680d3e8612aee152bd360ea9f38a778175906787039041e654b49f91353f4cdc678f36753e289270c4b148b3 SHA512 0ba60719cde9648aae37499c1caa6f3e0630e31f1e819945648d778aa6359f0b3771d7673f16a81c4e7ea8efdcf84bf3fb55979d952cb767cb5334f5d154ca9d
 DIST ettercap-0.8.2.tar.gz 8082561 BLAKE2B 851df0a8700de45ce0e3427f7fdbdcd13feb2f75c0d1136563449db634b1f02276bade0d82a1a51bf8de726d6faddf05ff537e397c2e56cfc3e3181d25566fe9 SHA512 18137b1cc518c9db3c9650157a5cbf09dbb665b79876a24875d6c5125e8923ebde543464adb61cf1d1244101242f4d66b80d94ef3b36aa265cefca7646aa6415
+DIST ettercap-0.8.3.tar.gz 8381943 BLAKE2B f49098d61f60877d3f979d7861f36dad6ec3fbfca7ed89d8f9826867145ea36daec65a1076c893f81391218688448515ef020a9cdf9a16ffddc830bacec8eb1c SHA512 1929c986d3a17ebc693ffe8531e01c66379c0ee6ea71305ea49b6a9eece84b6da1923135311db458bdb6035feb593e525786e6cf4c465ced5a7683384d4a4ae7
 EBUILD ettercap-0.8.2-r2.ebuild 1789 BLAKE2B a23ee25a8d7c4b95a072183c1cbc6f1465b013ba5cb9cd894481b9063af043f7802ffd2b4311b030973b9acc04bf956e49922b2ed6105c67073f50b62b798946 SHA512 29bb82ce78874bf7b0b512b4a6033a80d1eafa125e4bbae14d6df3d89d92e55158ed6dea064fee50d04d82472b07082e177ffde512274c9e037f7a62299eb7ba
+EBUILD ettercap-0.8.3.ebuild 1755 BLAKE2B ce833bba1d3ffdf58036646cf1e35fb2ef16ab3fde6a5a9949c1eb61f084ed40dbe85fc8f3131ef5dd59e24a12faa4f71c5997a372e90854f7b696217573e5c9 SHA512 14e9ca6d102aaf37fb947c349333816aba6f414e7bfb8f5cff1cd73c6402ea2c22f5c3ad491c7d29739a880a23e0b95eb766b1c4d8d743c11ece05078d0cacdd
 EBUILD ettercap-9999.ebuild 1711 BLAKE2B 0ed80f63f24c4c595f2b1caf410259fbe974d0833bf8bdaa14f964009a9bd5c75540fcd6beff17622a355bce45408ea2ca52d2378196c7b37a515c6222d96441 SHA512 9d4fd99f08e11126ba68519404490c7000997aa349805a8d4a6d271e52fcda764dc3c8164a3f5ddfe63e819343d24c7f792d229da9d44ec56f039c87854e37ec
 MISC metadata.xml 657 BLAKE2B e32e3fbc55029a9398399a2e2b69974f720826f8769379868ae80e32d2a9b2a69bfeb59b349dae91b7f27a759647091f58ea07a9b23a6dcf32d373966310bdde SHA512 0b682cb596f905882f2c0682c163d31410b94ca873a468db93e155103aeb1e943bff1c55bde1c9537478ce324d368f468bcb91c98f0aefb9dfa2a2239d7f73d5
diff --git a/net-analyzer/ettercap/ettercap-0.8.3.ebuild b/net-analyzer/ettercap/ettercap-0.8.3.ebuild
new file mode 100644
index 000000000000..12a0ca3162d5
--- /dev/null
+++ b/net-analyzer/ettercap/ettercap-0.8.3.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+DESCRIPTION="A suite for man in the middle attacks"
+HOMEPAGE="https://github.com/Ettercap/ettercap"
+
+LICENSE="GPL-2+"
+SLOT="0"
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/Ettercap/${PN}.git"
+else
+	SRC_URI="https://github.com/Ettercap/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+fi
+
+IUSE="doc geoip gtk ipv6 libressl ncurses +plugins test"
+
+RDEPEND="dev-libs/libbsd
+	dev-libs/libpcre
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	net-libs/libnet:1.1
+	>=net-libs/libpcap-0.8.1
+	sys-libs/zlib
+	geoip? ( dev-libs/geoip )
+	gtk? (
+		>=dev-libs/atk-1.2.4
+		>=dev-libs/glib-2.2.2:2
+		media-libs/freetype
+		x11-libs/cairo
+		x11-libs/gdk-pixbuf:2
+		>=x11-libs/gtk+-2.2.2:2
+		>=x11-libs/pango-1.2.3
+	)
+	ncurses? ( >=sys-libs/ncurses-5.3:= )
+	plugins? ( >=net-misc/curl-7.26.0 )"
+DEPEND="${RDEPEND}
+	doc? ( app-text/ghostscript-gpl
+		sys-apps/groff )
+	test? ( dev-libs/check )
+	sys-devel/flex
+	virtual/yacc"
+
+src_prepare() {
+	sed -i "s:Release:Release Gentoo:" CMakeLists.txt || die
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_CURSES="$(usex ncurses)"
+		-DENABLE_GTK="$(usex gtk)"
+		-DENABLE_PLUGINS="$(usex plugins)"
+		-DENABLE_IPV6="$(usex ipv6)"
+		-DENABLE_TESTS="$(usex test)"
+		-DENABLE_PDF_DOCS="$(usex doc)"
+		-DENABLE_GEOIP="$(usex geoip)"
+		-DBUNDLED_LIBS=OFF
+		-DSYSTEM_LIBS=ON
+		-DINSTALL_SYSCONFDIR="${EROOT}"etc
+	)
+		#right now we only support gtk2, but ettercap also supports gtk3
+		#do we care? do we want to support both?
+	cmake-utils_src_configure
+}
diff --git a/net-analyzer/netdata/Manifest b/net-analyzer/netdata/Manifest
index e72990d41344..c8e2fe360ae5 100644
--- a/net-analyzer/netdata/Manifest
+++ b/net-analyzer/netdata/Manifest
@@ -1,9 +1,13 @@
 DIST netdata-1.13.0.tar.gz 3095581 BLAKE2B 0149600d308717ce8bdab2af6b4b0403a762fff15c62cf61a94141c0a73f8867cde265a2065e6f1e42cee7291375a7c33a3eff804017d40146d5ecba6f5414a8 SHA512 dddd0005b746429255601e284f498072560bb62c4875a17a731d8e47c3c168c4934476f46eefc7b0deafb54490fcbb6e5ea97aac51a0461f7a63f34d3770c250
 DIST netdata-1.14.0.tar.gz 3116199 BLAKE2B 366fdd7fc94799f170a2957e26fadfacd0cc71ae22f1ac2390633fc2e9d48b2f725ec1f87cc21096d2ed8a948e1dfcfc5d9e90540ad3ef93fd918569a387a64f SHA512 7e4d9eb171eadd0d2b553a6ac7345a7f1ec368f22fa0d1d67b6430e2b388be5d06a1464b539b9b44c07a5440dab58ece5605c44b279889d9e4bf696102b01b25
 DIST netdata-1.15.0.tar.gz 3175237 BLAKE2B 75f4c6f0dba53e6ff01fb98767e266ede8a8b8b965c484a03d5f72a55b39d55b150ada7784a971897a365ff9ebeb9bb66cadc72d4ce33dbc1465a758321d4104 SHA512 34b783d3b550c8ac5dc22e08f30fe87de65a5cd97008e271d9328d09b59620a6807ca3daa81a2e49d7ddf1c015f868b21f4118700b2630dcb78c4f9feda3fe4d
+DIST netdata-1.16.0.tar.gz 3233403 BLAKE2B 5e51722f9f11171a38231afd918a319c18fb7c95d5605a3fe73616af955b50036d2db7729494e8cc08d95a0bd11fb0259abb50d5f4da979f977b734778b16678 SHA512 132e8c0c57798d69ca8c3f360c2d55f1b8a46deaeacbb59979bc5bb5c52c9eaf02db7f7a166848787aae5807122d86f48fa86c0b9211ed0fdfd92889d1d8e2e4
 EBUILD netdata-1.13.0.ebuild 2633 BLAKE2B 917373166cefb26f30a9f62fedec407be3e7332774b419cb36db4a8ec6978d774f527a21d8b09e9bc4ed920144d7dc0378c9ecd30eaf51e855c6557b4e950556 SHA512 b964e4a3949b0ccf268cc8caa6ede03a45c3fbf5ec9b2d98e2c8ca9efec2643d8bbcf4233a087ac259c9a62c19f54ecaa15183a51fae0642c93c80d27c95cda8
 EBUILD netdata-1.14.0-r1.ebuild 2783 BLAKE2B 581d2bf6e944612d833d5d1c9a96a4de3f885df5587b57a3ddbdf88ed1781ffc2ea51c6179baeec5bc10322e09249fc1f745c1613b61a8ebb80b84d988040409 SHA512 15f74bfe0a00e23d2d108ffa2325b3837cf5cbfae91a22350cad78a4bfd0d05c89857b32a92896180a15d70e2c4aec7de53e1a70420636075092a642790c82dd
 EBUILD netdata-1.14.0.ebuild 2623 BLAKE2B 8552936e3884d9b62a6b2ee94ce4d14fb80feff59412e35b5f6174f5de2abc0506fc22311386b3337c3ee250fe0952acda36ae1524e924bf39673aa5f74a7eac SHA512 82d51a4bcd131b4dca9090ec6c6b344e37efabb5521f06315324bc006fdf5cd9930f4b68c4aa4a90f1ca7a1135803872726521f3d4ac21504a60047f8abaab96
+EBUILD netdata-1.15.0-r1.ebuild 2904 BLAKE2B 07a2bdffb08348bdb67c3458148b13a9a0c8b5d961f7a5e112202780f481c6d2876f0fd7001ac92871eed2380c46acd45c85ec4d07a58cf4a776f651af23de71 SHA512 0abc01056a0c320c84db10483c58ce31e3e1bbac5e29953afedc6481627f0f8a3ba83826a72f6105706c6c8d5dbc5a6873f134b561ebb21e9da2ced343fe212d
+EBUILD netdata-1.15.0-r2.ebuild 3006 BLAKE2B 1f48be63c01ef90eda30ce79c9bc709f3b5341d202813a19f83fcbda151b38c8b01c8efb10f0824e3a11293d7ebd851a696a2fbf7253c1fc39c3b1e184d1f3f9 SHA512 a02c16908fcc6c4def13040c2891dfdb40053b6bd7f05430f10dd08e36ec1b42e47b9d6884bc8fffbb00ff14fbd9f184316c1fc3e5388a07f154b69f9d36b93c
 EBUILD netdata-1.15.0.ebuild 2783 BLAKE2B 581d2bf6e944612d833d5d1c9a96a4de3f885df5587b57a3ddbdf88ed1781ffc2ea51c6179baeec5bc10322e09249fc1f745c1613b61a8ebb80b84d988040409 SHA512 15f74bfe0a00e23d2d108ffa2325b3837cf5cbfae91a22350cad78a4bfd0d05c89857b32a92896180a15d70e2c4aec7de53e1a70420636075092a642790c82dd
-EBUILD netdata-9999.ebuild 2783 BLAKE2B 581d2bf6e944612d833d5d1c9a96a4de3f885df5587b57a3ddbdf88ed1781ffc2ea51c6179baeec5bc10322e09249fc1f745c1613b61a8ebb80b84d988040409 SHA512 15f74bfe0a00e23d2d108ffa2325b3837cf5cbfae91a22350cad78a4bfd0d05c89857b32a92896180a15d70e2c4aec7de53e1a70420636075092a642790c82dd
-MISC metadata.xml 921 BLAKE2B d0dfbd5bc5d49552053b908e2fc43357821b0bc63cc2a80a067bb699b937405e7e83ee9e2204de47676891d588cf259d4349e7c7104570671d9be114e78f1175 SHA512 7b1d4da58e73201c0e402ee5d5acd4edb0fd72a8cef212539c9bb020cb68cf101d5afda37538e0c4945947f2cdcaf60b6600634468c4a2de9b163cb45307ab1e
+EBUILD netdata-1.16.0.ebuild 3006 BLAKE2B 1f48be63c01ef90eda30ce79c9bc709f3b5341d202813a19f83fcbda151b38c8b01c8efb10f0824e3a11293d7ebd851a696a2fbf7253c1fc39c3b1e184d1f3f9 SHA512 a02c16908fcc6c4def13040c2891dfdb40053b6bd7f05430f10dd08e36ec1b42e47b9d6884bc8fffbb00ff14fbd9f184316c1fc3e5388a07f154b69f9d36b93c
+EBUILD netdata-9999.ebuild 3006 BLAKE2B 1f48be63c01ef90eda30ce79c9bc709f3b5341d202813a19f83fcbda151b38c8b01c8efb10f0824e3a11293d7ebd851a696a2fbf7253c1fc39c3b1e184d1f3f9 SHA512 a02c16908fcc6c4def13040c2891dfdb40053b6bd7f05430f10dd08e36ec1b42e47b9d6884bc8fffbb00ff14fbd9f184316c1fc3e5388a07f154b69f9d36b93c
+MISC metadata.xml 993 BLAKE2B 94e8d906b5e1f52b67a35a622efba0f581b90bd7603dbca52191410676980da200b7c83d736beec48fea1fef6534c247fa8bc4e017bc4cfe730394f12a5f4a3f SHA512 0a88120e40aadc1647135b93771330a4076ff25d9881c92856b7ac0873d56e3e6365da27c1f080eaabec702aa05281dfc308572e0b3488e4c232609ae543d07f
diff --git a/net-analyzer/netdata/metadata.xml b/net-analyzer/netdata/metadata.xml
index 06a8ae53618a..f12bf742e155 100644
--- a/net-analyzer/netdata/metadata.xml
+++ b/net-analyzer/netdata/metadata.xml
@@ -7,6 +7,7 @@
     </maintainer>
     <use>
         <flag name="compression">Enable compression via zlib</flag>
+        <flag name="dbengine">Enable the Netdata database engine</flag>
         <flag name="ipmi">Install <pkg>sys-apps/ipmitool</pkg> required for monitoring IPMI sensors.</flag>
         <flag name="nfacct">Enable the nfacct plugin</flag>
         <flag name="nodejs">Enable use of nodejs (which some plugins use)</flag>
diff --git a/net-analyzer/netdata/netdata-1.15.0-r1.ebuild b/net-analyzer/netdata/netdata-1.15.0-r1.ebuild
new file mode 100644
index 000000000000..19ed4f693a0a
--- /dev/null
+++ b/net-analyzer/netdata/netdata-1.15.0-r1.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+
+inherit autotools fcaps linux-info python-r1 systemd user
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/netdata/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/netdata/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Linux real time system monitoring, done right!"
+HOMEPAGE="https://github.com/netdata/netdata https://my-netdata.io/"
+
+LICENSE="GPL-3+ MIT BSD"
+SLOT="0"
+IUSE="caps +compression cpu_flags_x86_sse2 cups dbengine ipmi mysql nfacct nodejs postgres +python tor xen"
+REQUIRED_USE="
+	mysql? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	tor? ( python )"
+
+# most unconditional dependencies are for plugins.d/charts.d.plugin:
+RDEPEND="
+	app-misc/jq
+	>=app-shells/bash-4:0
+	|| (
+		net-analyzer/openbsd-netcat
+		net-analyzer/netcat
+	)
+	net-analyzer/tcpdump
+	net-analyzer/traceroute
+	net-misc/curl
+	net-misc/wget
+	sys-apps/util-linux
+	virtual/awk
+	caps? ( sys-libs/libcap )
+	cups? ( net-print/cups )
+	dbengine? (
+		dev-libs/libuv
+		app-arch/lz4
+		dev-libs/judy
+		dev-libs/openssl:=
+	)
+	compression? ( sys-libs/zlib )
+	ipmi? ( sys-libs/freeipmi )
+	nfacct? (
+		net-firewall/nfacct
+		net-libs/libmnl
+	)
+	nodejs? ( net-libs/nodejs )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		mysql? (
+			|| (
+				dev-python/mysqlclient[${PYTHON_USEDEP}]
+				dev-python/mysql-python[${PYTHON_USEDEP}]
+			)
+		)
+		postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
+		tor? ( net-libs/stem[${PYTHON_USEDEP}] )
+	)
+	xen? (
+		app-emulation/xen-tools
+		dev-libs/yajl
+	)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+: ${NETDATA_USER:=netdata}
+: ${NETDATA_GROUP:=netdata}
+
+FILECAPS=(
+	'cap_dac_read_search,cap_sys_ptrace+ep' 'usr/libexec/netdata/plugins.d/apps.plugin'
+)
+
+pkg_setup() {
+	linux-info_pkg_setup
+
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 / ${PN}
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--localstatedir="${EPREFIX}"/var \
+		--with-user=${NETDATA_USER} \
+		$(use_enable cups plugin-cups) \
+		$(use_enable dbengine) \
+		$(use_enable nfacct plugin-nfacct) \
+		$(use_enable ipmi plugin-freeipmi) \
+		$(use_enable xen plugin-xenstat) \
+		$(use_enable cpu_flags_x86_sse2 x86-sse) \
+		$(use_with compression zlib)
+}
+
+src_install() {
+	default
+
+	rm -rf "${D}/var/cache" || die
+
+	# Remove unneeded .keep files
+	find "${ED}" -name ".keep" -delete || die
+
+	fowners -Rc ${NETDATA_USER}:${NETDATA_GROUP} /var/log/netdata
+	keepdir /var/log/netdata
+	fowners -Rc ${NETDATA_USER}:${NETDATA_GROUP} /var/lib/netdata
+	keepdir /var/lib/netdata
+	keepdir /var/lib/netdata/registry
+
+	fowners -Rc root:${NETDATA_GROUP} /usr/share/${PN}
+
+	newinitd system/netdata-openrc ${PN}
+	systemd_dounit system/netdata.service
+	insinto /etc/netdata
+	doins system/netdata.conf
+}
diff --git a/net-analyzer/netdata/netdata-1.15.0-r2.ebuild b/net-analyzer/netdata/netdata-1.15.0-r2.ebuild
new file mode 100644
index 000000000000..77427218be1f
--- /dev/null
+++ b/net-analyzer/netdata/netdata-1.15.0-r2.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+
+inherit autotools fcaps linux-info python-r1 systemd user
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/netdata/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/netdata/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Linux real time system monitoring, done right!"
+HOMEPAGE="https://github.com/netdata/netdata https://my-netdata.io/"
+
+LICENSE="GPL-3+ MIT BSD"
+SLOT="0"
+IUSE="caps +compression cpu_flags_x86_sse2 cups dbengine ipmi mysql nfacct nodejs postgres +python tor xen"
+REQUIRED_USE="
+	mysql? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	tor? ( python )"
+
+# most unconditional dependencies are for plugins.d/charts.d.plugin:
+RDEPEND="
+	app-misc/jq
+	>=app-shells/bash-4:0
+	|| (
+		net-analyzer/openbsd-netcat
+		net-analyzer/netcat
+	)
+	net-analyzer/tcpdump
+	net-analyzer/traceroute
+	net-misc/curl
+	net-misc/wget
+	sys-apps/util-linux
+	virtual/awk
+	caps? ( sys-libs/libcap )
+	cups? ( net-print/cups )
+	dbengine? (
+		dev-libs/libuv
+		app-arch/lz4
+		dev-libs/judy
+		dev-libs/openssl:=
+	)
+	compression? ( sys-libs/zlib )
+	ipmi? ( sys-libs/freeipmi )
+	nfacct? (
+		net-firewall/nfacct
+		net-libs/libmnl
+	)
+	nodejs? ( net-libs/nodejs )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		mysql? (
+			|| (
+				dev-python/mysqlclient[${PYTHON_USEDEP}]
+				dev-python/mysql-python[${PYTHON_USEDEP}]
+			)
+		)
+		postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
+		tor? ( net-libs/stem[${PYTHON_USEDEP}] )
+	)
+	xen? (
+		app-emulation/xen-tools
+		dev-libs/yajl
+	)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+: ${NETDATA_USER:=netdata}
+: ${NETDATA_GROUP:=netdata}
+
+FILECAPS=(
+	'cap_dac_read_search,cap_sys_ptrace+ep' 'usr/libexec/netdata/plugins.d/apps.plugin'
+)
+
+pkg_setup() {
+	linux-info_pkg_setup
+
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 / ${PN}
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--localstatedir="${EPREFIX}"/var \
+		--with-user=${NETDATA_USER} \
+		$(use_enable cups plugin-cups) \
+		$(use_enable dbengine) \
+		$(use_enable nfacct plugin-nfacct) \
+		$(use_enable ipmi plugin-freeipmi) \
+		$(use_enable xen plugin-xenstat) \
+		$(use_enable cpu_flags_x86_sse2 x86-sse) \
+		$(use_with compression zlib)
+}
+
+src_install() {
+	default
+
+	rm -rf "${D}/var/cache" || die
+
+	# Remove unneeded .keep files
+	find "${ED}" -name ".keep" -delete || die
+
+	fowners -Rc ${NETDATA_USER}:${NETDATA_GROUP} /var/log/netdata
+	keepdir /var/log/netdata
+	fowners -Rc ${NETDATA_USER}:${NETDATA_GROUP} /var/lib/netdata
+	keepdir /var/lib/netdata
+	keepdir /var/lib/netdata/registry
+
+	fowners -Rc root:${NETDATA_GROUP} /usr/share/${PN}
+
+	newinitd system/netdata-openrc ${PN}
+	systemd_dounit system/netdata.service
+	insinto /etc/netdata
+	doins system/netdata.conf
+
+	echo "CONFIG_PROTECT=\"${EPREFIX}/usr/$(get_libdir)/netdata/conf.d\"" > 99netdata
+	doenvd 99netdata
+}
diff --git a/net-analyzer/netdata/netdata-1.16.0.ebuild b/net-analyzer/netdata/netdata-1.16.0.ebuild
new file mode 100644
index 000000000000..77427218be1f
--- /dev/null
+++ b/net-analyzer/netdata/netdata-1.16.0.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+
+inherit autotools fcaps linux-info python-r1 systemd user
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/netdata/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/netdata/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Linux real time system monitoring, done right!"
+HOMEPAGE="https://github.com/netdata/netdata https://my-netdata.io/"
+
+LICENSE="GPL-3+ MIT BSD"
+SLOT="0"
+IUSE="caps +compression cpu_flags_x86_sse2 cups dbengine ipmi mysql nfacct nodejs postgres +python tor xen"
+REQUIRED_USE="
+	mysql? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	tor? ( python )"
+
+# most unconditional dependencies are for plugins.d/charts.d.plugin:
+RDEPEND="
+	app-misc/jq
+	>=app-shells/bash-4:0
+	|| (
+		net-analyzer/openbsd-netcat
+		net-analyzer/netcat
+	)
+	net-analyzer/tcpdump
+	net-analyzer/traceroute
+	net-misc/curl
+	net-misc/wget
+	sys-apps/util-linux
+	virtual/awk
+	caps? ( sys-libs/libcap )
+	cups? ( net-print/cups )
+	dbengine? (
+		dev-libs/libuv
+		app-arch/lz4
+		dev-libs/judy
+		dev-libs/openssl:=
+	)
+	compression? ( sys-libs/zlib )
+	ipmi? ( sys-libs/freeipmi )
+	nfacct? (
+		net-firewall/nfacct
+		net-libs/libmnl
+	)
+	nodejs? ( net-libs/nodejs )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		mysql? (
+			|| (
+				dev-python/mysqlclient[${PYTHON_USEDEP}]
+				dev-python/mysql-python[${PYTHON_USEDEP}]
+			)
+		)
+		postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
+		tor? ( net-libs/stem[${PYTHON_USEDEP}] )
+	)
+	xen? (
+		app-emulation/xen-tools
+		dev-libs/yajl
+	)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+: ${NETDATA_USER:=netdata}
+: ${NETDATA_GROUP:=netdata}
+
+FILECAPS=(
+	'cap_dac_read_search,cap_sys_ptrace+ep' 'usr/libexec/netdata/plugins.d/apps.plugin'
+)
+
+pkg_setup() {
+	linux-info_pkg_setup
+
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 / ${PN}
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--localstatedir="${EPREFIX}"/var \
+		--with-user=${NETDATA_USER} \
+		$(use_enable cups plugin-cups) \
+		$(use_enable dbengine) \
+		$(use_enable nfacct plugin-nfacct) \
+		$(use_enable ipmi plugin-freeipmi) \
+		$(use_enable xen plugin-xenstat) \
+		$(use_enable cpu_flags_x86_sse2 x86-sse) \
+		$(use_with compression zlib)
+}
+
+src_install() {
+	default
+
+	rm -rf "${D}/var/cache" || die
+
+	# Remove unneeded .keep files
+	find "${ED}" -name ".keep" -delete || die
+
+	fowners -Rc ${NETDATA_USER}:${NETDATA_GROUP} /var/log/netdata
+	keepdir /var/log/netdata
+	fowners -Rc ${NETDATA_USER}:${NETDATA_GROUP} /var/lib/netdata
+	keepdir /var/lib/netdata
+	keepdir /var/lib/netdata/registry
+
+	fowners -Rc root:${NETDATA_GROUP} /usr/share/${PN}
+
+	newinitd system/netdata-openrc ${PN}
+	systemd_dounit system/netdata.service
+	insinto /etc/netdata
+	doins system/netdata.conf
+
+	echo "CONFIG_PROTECT=\"${EPREFIX}/usr/$(get_libdir)/netdata/conf.d\"" > 99netdata
+	doenvd 99netdata
+}
diff --git a/net-analyzer/netdata/netdata-9999.ebuild b/net-analyzer/netdata/netdata-9999.ebuild
index 54d150969d3c..77427218be1f 100644
--- a/net-analyzer/netdata/netdata-9999.ebuild
+++ b/net-analyzer/netdata/netdata-9999.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="https://github.com/netdata/netdata https://my-netdata.io/"
 
 LICENSE="GPL-3+ MIT BSD"
 SLOT="0"
-IUSE="caps +compression cpu_flags_x86_sse2 cups ipmi mysql nfacct nodejs postgres +python tor xen"
+IUSE="caps +compression cpu_flags_x86_sse2 cups dbengine ipmi mysql nfacct nodejs postgres +python tor xen"
 REQUIRED_USE="
 	mysql? ( python )
 	python? ( ${PYTHON_REQUIRED_USE} )
@@ -41,6 +41,12 @@ RDEPEND="
 	virtual/awk
 	caps? ( sys-libs/libcap )
 	cups? ( net-print/cups )
+	dbengine? (
+		dev-libs/libuv
+		app-arch/lz4
+		dev-libs/judy
+		dev-libs/openssl:=
+	)
 	compression? ( sys-libs/zlib )
 	ipmi? ( sys-libs/freeipmi )
 	nfacct? (
@@ -91,6 +97,7 @@ src_configure() {
 		--localstatedir="${EPREFIX}"/var \
 		--with-user=${NETDATA_USER} \
 		$(use_enable cups plugin-cups) \
+		$(use_enable dbengine) \
 		$(use_enable nfacct plugin-nfacct) \
 		$(use_enable ipmi plugin-freeipmi) \
 		$(use_enable xen plugin-xenstat) \
@@ -118,4 +125,7 @@ src_install() {
 	systemd_dounit system/netdata.service
 	insinto /etc/netdata
 	doins system/netdata.conf
+
+	echo "CONFIG_PROTECT=\"${EPREFIX}/usr/$(get_libdir)/netdata/conf.d\"" > 99netdata
+	doenvd 99netdata
 }
diff --git a/net-analyzer/ossec-hids/Manifest b/net-analyzer/ossec-hids/Manifest
index ee3c9ec820a6..185b78f39c03 100644
--- a/net-analyzer/ossec-hids/Manifest
+++ b/net-analyzer/ossec-hids/Manifest
@@ -1,8 +1,11 @@
 AUX makefile-3.2.0.patch 942 BLAKE2B a60f51130d66f25447bfab9356c76a1f67a0e55a2f1429dd86cfead36122a080779c11669b6cd201c9e4bf06760a9daa7e1876e87f1475ce6960980c923c2961 SHA512 472e4b201fc20b23926223f7321c94b9035b7a6c6c37357d229a5bccba64ef9e19706434d7e7087c2e522d0e2ef5d72579845cfd340d06d4ee78f86a42e47a88
+AUX makefile-3.3.0.patch 942 BLAKE2B a60f51130d66f25447bfab9356c76a1f67a0e55a2f1429dd86cfead36122a080779c11669b6cd201c9e4bf06760a9daa7e1876e87f1475ce6960980c923c2961 SHA512 472e4b201fc20b23926223f7321c94b9035b7a6c6c37357d229a5bccba64ef9e19706434d7e7087c2e522d0e2ef5d72579845cfd340d06d4ee78f86a42e47a88
 AUX makefile.patch 933 BLAKE2B 29e0d41592983d060c5faeaf1a5719c6c6b41469e1de6f63dfdee051a066ee84e06cc29a0978318b07aa02265c4a04b6eddeeba35c85d8c24e7b1a20d3ddf712 SHA512 bb83123e06fee5ee84fcfcb0c4225210dba7149b3a414abe33425e6db9a1514128ceac0cc31c8d0e9b044a868f0241a799252566d3889f4abc7b821d3c0af6fa
 DIST ossec-hids-3.1.0.tar.gz 1886469 BLAKE2B c175c8659a8b5d0d269a5cb6bf142276f29e6f676afc6029accf854d68299d71147ba65a667601e77c6db8ca49a29afa49534e5683369f420f6389059ae61fc3 SHA512 fe55f82ac354d9fcd767d8379a492279644308788535780bb029d46688c93f259771686462570137555b40082c6756daad44bbdd1ddc953ed0bb22b65c6cb566
 DIST ossec-hids-3.2.0.tar.gz 1896977 BLAKE2B d77cff3a3a72287ad2235f346c7d07cfdad83872d956f57877ed44ad21bb717e4b4ddcfd0e8b2ce45cb90160bb63a28a7d06bc6225b53cc5ed42f7a97c5a1765 SHA512 40b25b97c43a66b8a145914ab0badd9d4f7de7d2168aa7a49abdf778c620a4b533ce3de0883d26c4c39816cf78674a053788a57c5f9c38fbea7cd8b13a35d18f
+DIST ossec-hids-3.3.0.tar.gz 1900070 BLAKE2B a18a1e55ba44450c634b59099f10b674d27b2079ff456a034dc7bb4bbaf3c89b96f197515f3fb7aa54c248643f333e830a519b04cd4a9402cec2c32597fd96b2 SHA512 97c7e7b21ce88a3f1c89b79ff74b0c13804ba313cf3f30b98bcb4011f422ca050876e780c30624812d399d6b5c59629e52f6772b9ee0cd7cead1d66044dca627
 EBUILD ossec-hids-3.1.0.ebuild 1565 BLAKE2B a87f9f384fd9164a1aac6c1febbafccc8018d10a75508c9acd4fb97d5da6dbe1d1c7dc364c1e38017ca64f5a758764cbb3f628ac52dc1d71496dbf6f7d70e3bf SHA512 797ee671d1f16d8d0144f069a55223d8a030477cb8137c9549ae5cf20d1831fd6c47bcb7ee0bb3134430cbcaa1cc6e97be5a3f96a29a8fd7b7168bd9f705d043
 EBUILD ossec-hids-3.2.0-r1.ebuild 1590 BLAKE2B 849c6e5e9327cf2babdc642c79517d30bfcc67a69ac1c3fa253d4166eb139df663653687b29ab8dccb1da694d04ef0130d7b278737ab7a414b2a749cbaf5b569 SHA512 ddba4ca1c940717ac291f53114d6aba2338e69dd03ecca1b0d7cdbd249906c9ae7fd1f886f3c5d9d133d86c235fd2a13d858b5d8b8a632e2d4d403ba725aeda0
 EBUILD ossec-hids-3.2.0.ebuild 1530 BLAKE2B fbb10305328d1666b2718485c3c4afc7ac7f08402cd07b265debc891212b2ffa152c8a0c22d46221ee81229f5fd289306c26fcab32f82c4203910bfe81dc2ce4 SHA512 1e0b2fe87c451ade9d83466f9bcef7e476ff5e39441fa17e5665006b01f7d07cb1d564ef09a2af6d60c867ddc32d524eaa0004125527b6f7eafaa07ec3db359a
+EBUILD ossec-hids-3.3.0.ebuild 1652 BLAKE2B c6965ea9d00a91b3046a47c17bb9100c03ee68085f33867aa499b17ff4ce0db678c642267df377507bb3ee0bd001ce2e3fec9bb9c317b8598eae6a2b0f768221 SHA512 fa725f3edb9d20b3c82a89c2e6fc32a9a8247ec360702dd795eeffb0479f6691c006c9e0121b4e875c2e3a1e46899262730e2ee0c6e51c0683d4f0d42e2c75b7
 MISC metadata.xml 1184 BLAKE2B 491f885913c264b0bd1eb3bea5131e64afd36f8a07a8964a07a987dc67a5537a2a6fd1a8018b339e487218649833eab4a05199fe5d2b7aa79483ec3494a44bb7 SHA512 e786d57b92a5563eb9d3e4ca60c7f45cf1adf59e9409001f032dac07621cfcfedeaed4fc0d438d0b8c2f3146074d9e75874ebeb31616e158692ae2447fd3c767
diff --git a/net-analyzer/ossec-hids/files/makefile-3.3.0.patch b/net-analyzer/ossec-hids/files/makefile-3.3.0.patch
new file mode 100644
index 000000000000..810bc077d438
--- /dev/null
+++ b/net-analyzer/ossec-hids/files/makefile-3.3.0.patch
@@ -0,0 +1,28 @@
+--- a/Makefile	2019-03-09 16:33:13.465947636 +0100
++++ b/Makefile	2019-03-09 16:32:57.105946856 +0100
+@@ -370,7 +370,6 @@
+ install-server: install-server-generic
+ 
+ install-common: build
+-	./init/adduser.sh ${OSSEC_USER} ${OSSEC_USER_MAIL} ${OSSEC_USER_REM} ${OSSEC_GROUP} ${PREFIX}
+ 	$(call INSTALL_CMD,0550,root,${OSSEC_GROUP}) -d ${PREFIX}/
+ 	$(call INSTALL_CMD,0750,${OSSEC_USER},${OSSEC_GROUP}) -d ${PREFIX}/logs
+ 	$(call INSTALL_CMD,0660,${OSSEC_USER},${OSSEC_GROUP}) /dev/null ${PREFIX}/logs/ossec.log
+@@ -1160,7 +1159,7 @@
+ #### test ##########
+ ####################
+ 
+-CFLAGS_TEST = -g -O0 --coverage
++CFLAGS_TEST = -g -O0
+ 
+ LDFLAGS_TEST = -lcheck -lm -pthread -lrt
+ 
+@@ -1171,7 +1170,7 @@
+ 
+ test_programs = test_os_zlib test_os_xml test_os_regex test_os_crypto test_shared
+ 
+-.PHONY: test run_tests build_tests test_valgrind test_coverage
++.PHONY: test run_tests build_tests test_valgrind
+ 
+ test: build_tests
+ 	${MAKE} run_tests
diff --git a/net-analyzer/ossec-hids/ossec-hids-3.3.0.ebuild b/net-analyzer/ossec-hids/ossec-hids-3.3.0.ebuild
new file mode 100644
index 000000000000..c9b83c7daa34
--- /dev/null
+++ b/net-analyzer/ossec-hids/ossec-hids-3.3.0.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit user
+
+DESCRIPTION="Open Source Host-based Intrusion Detection System"
+HOMEPAGE="https://www.ossec.net/"
+SRC_URI="https://github.com/ossec/ossec-hids/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="agent hybrid local mysql postgres server sqlite"
+REQUIRED_USE="^^ ( agent hybrid local server )
+	?? ( mysql postgres )"
+
+DEPEND="dev-libs/libpcre2
+	mysql? ( virtual/mysql )
+	sqlite? ( dev-db/sqlite:3 )
+	postgres? ( dev-db/postgresql:= )"
+RDEPEND="${DEPEND}"
+S="${WORKDIR}/${P}/src"
+PATCHES=( "${FILESDIR}/makefile-${PV}.patch" )
+
+declare -a MY_OPT
+
+pkg_setup() {
+	enewgroup ossec
+	enewuser ossec -1 -1 /var/ossec ossec
+	enewuser ossecm -1 -1 -1 ossec
+	enewuser ossecr -1 -1 -1 ossec
+}
+
+src_configure() {
+	local target="local"
+	use agent && target="agent"
+	use hybrid && target="hybrid"
+	use server && target="server"
+	MY_OPT=(
+		PCRE2_SYSTEM=yes
+		TARGET=${target}
+		USE_SQLITE=$(usex sqlite)
+		V=0
+		ZLIB_SYSTEM=yes
+	)
+	use mysql && MY_OPT+=( DATABASE=mysql )
+	use postgres && MY_OPT+=( DATABASE=pgsql )
+}
+
+src_compile() {
+	emake "${MY_OPT[@]}" PREFIX=/var/ossec
+}
+
+src_test() {
+	emake "${MY_OPT[@]}" PREFIX=/var/ossec test
+}
+
+src_install() {
+	keepdir /var/ossec/logs/{alerts,archives,firewall}
+	keepdir /var/ossec/lua/{compiled,native}
+	keepdir /var/ossec/queue/{agent-info,agentless,alerts,diff,fts,ossec,rids,rootcheck,syscheck}
+	keepdir /var/ossec/{.ssh,stats,tmp,var/run}
+	newenvd - 50ossec-hids <<<'CONFIG_PROTECT="/var/ossec/etc"'
+	emake "${MY_OPT[@]}" PREFIX="${D}/var/ossec" install
+}
diff --git a/net-analyzer/scapy/Manifest b/net-analyzer/scapy/Manifest
index 4815cc5859b4..64491cf01e31 100644
--- a/net-analyzer/scapy/Manifest
+++ b/net-analyzer/scapy/Manifest
@@ -1,10 +1,10 @@
 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
-DIST scapy-2.4.3_rc1.tar.gz 2455703 BLAKE2B 7db2af39afad694b49296d0e02a7e649c31023fbb12d66faccb777e297240b84e39558dd0ba56dab159e8412cec93d868ec02542afa385e2ec49d1a80b8788d4 SHA512 29996996521d5802b435c27dee5ad91fdd3e974dc86a3ba1377c67eb5c81a639fdfa18790ca2275df54685a963f7c69bde10b01887ba54315ddef6d2c002f8d8
+DIST scapy-2.4.3_rc2.tar.gz 2785755 BLAKE2B 75c89f22beafbc9350d0f42fd186a4860d0c3146d543c66a6a8561d9c644ce92496c678740abfdfaf5811e3da01de211c76b590920c0860fc04c61e8f19bf0eb SHA512 09e45742a87be31f9230f6948f4d746f16fcd37aaae257d456deefa4ed7d9adcd93f647910210d0fc7d8d1db05a6d62a3937550d560d6099672a3360dfd0c88d
+DIST scapy-2.4.3_rc3.tar.gz 2947417 BLAKE2B c01528cfdd96c39f5d4b103e4537b5f2b59019a9aaa86a6a264565f709e60adaa934bad1036b62a236127e81c82dda30c7f14aac23394eb90bdaed7377c9aaf5 SHA512 135f5112f97e6a7ea88dff7b7c81ceb9acd3b76a63cdc66f579400b9dd4a19ce908cd4037dbe8a98ae7581d8e51451426527f2f401f46ef83866a5b8c2744d1d
 EBUILD scapy-2.3.2-r1.ebuild 869 BLAKE2B a1695ad6505bc5367342dfc3ffbd9a5d8e537f3cbdda910e69f617e1a93932d4f2bdd2a7bba2b1d887de7bb7f79a14dca981d12a7c4468683fe3eaae7820a67c SHA512 375c40a3da50a5ba136034c2c3cccba46d61c6ac63ff29c12d0ceeb3e20fece28812b0a1bd22710ec1ec0be62c57263f5744a652052bdd461099f657d63636f5
-EBUILD scapy-2.4.0.ebuild 1013 BLAKE2B e3c6a15e9faacdcf4bd5e36b0ab8e97b962012ca80df400393fc3011847829c52ce231e5594a85a611e74b342f1713d9a0679e0dbef71ca251205a22af1aac48 SHA512 e4c1595760abbb32fc7d0545e94974a044201d7219ea9537ef2ccd60550fd1d4fa0d0b30bdb639885c53cdce9077fcd974ea71182bb5d664b3210576c68ae596
 EBUILD scapy-2.4.2.ebuild 1015 BLAKE2B 84ed365afa54aca1f499902ebc7a200f3464f9f7e9157fdab17749ce59cf25524e18ae9f7181e09e760d2a02ddd701eeccb5b10371573e33961f0037ebfced13 SHA512 434e19fcee3d9c71b7967440cd8af2dd2cae36f8e26f99e9b02de202fe80116a0e8eb501be8db7ff7d633f6f1bec7202b5b65826a7a21881042f1b9b5f723dc4
-EBUILD scapy-2.4.3_rc1.ebuild 1015 BLAKE2B 4217feb98a994332d8efc0f8a5ab46352aaccc3125fd962ed18a1da49731399a5826ccbe8de1c963ca8becf9c9d1c5f7389d995a3d763e9fbcf822bf30a231ab SHA512 990f4c97c5f86a33c41f1af6ea761eabcccfff6bc7f492f0c552765fcaf6c0b6122940da696d06cea3b08de1b702b38ac17cc29aeed7513ad6d6107e5c29fad7
+EBUILD scapy-2.4.3_rc2.ebuild 1015 BLAKE2B 4217feb98a994332d8efc0f8a5ab46352aaccc3125fd962ed18a1da49731399a5826ccbe8de1c963ca8becf9c9d1c5f7389d995a3d763e9fbcf822bf30a231ab SHA512 990f4c97c5f86a33c41f1af6ea761eabcccfff6bc7f492f0c552765fcaf6c0b6122940da696d06cea3b08de1b702b38ac17cc29aeed7513ad6d6107e5c29fad7
+EBUILD scapy-2.4.3_rc3.ebuild 1015 BLAKE2B 4217feb98a994332d8efc0f8a5ab46352aaccc3125fd962ed18a1da49731399a5826ccbe8de1c963ca8becf9c9d1c5f7389d995a3d763e9fbcf822bf30a231ab SHA512 990f4c97c5f86a33c41f1af6ea761eabcccfff6bc7f492f0c552765fcaf6c0b6122940da696d06cea3b08de1b702b38ac17cc29aeed7513ad6d6107e5c29fad7
 EBUILD scapy-9999.ebuild 977 BLAKE2B a15521edc49f7bf13c8aed716444ad120bde4d1208a4dee50737e21ab49b79870dbefb3a0793814bf81dffc778da0902f31fd6bc7ffe8268214c25da62db3e54 SHA512 d038dfbb47a750cc6cd7067f97d92f8f728e82d446fda21d1110d55886e9fc2defe54299946ca30be335b4dac40eb7fffc79ae5aa9f1b0f04149bd7e978fc4c5
 MISC metadata.xml 674 BLAKE2B 9aeb70531e3395462033100fc9b709533c158bf7939aa46930558b48e9f750030bc26f750b574f3e31ee5779c65a7afb48ed74f8db9d738849e9ab97d621f351 SHA512 54bbc8a152f8433e3da143261bc530df95e8a5808791582e2d2115476001f63381219a3738bb80c1833f56d331ee54908cf72f3c72cc27e05100f6de8edc6caf
diff --git a/net-analyzer/scapy/scapy-2.4.3_rc1.ebuild b/net-analyzer/scapy/scapy-2.4.3_rc2.ebuild
index 25877178edf3..25877178edf3 100644
--- a/net-analyzer/scapy/scapy-2.4.3_rc1.ebuild
+++ b/net-analyzer/scapy/scapy-2.4.3_rc2.ebuild
diff --git a/net-analyzer/scapy/scapy-2.4.0.ebuild b/net-analyzer/scapy/scapy-2.4.3_rc3.ebuild
index 25d400437783..25877178edf3 100644
--- a/net-analyzer/scapy/scapy-2.4.0.ebuild
+++ b/net-analyzer/scapy/scapy-2.4.3_rc3.ebuild
@@ -1,8 +1,8 @@
 # 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}} )
+EAPI=7
+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"
diff --git a/net-analyzer/sguil-client/Manifest b/net-analyzer/sguil-client/Manifest
index 4fa28e7e68be..0d335f530677 100644
--- a/net-analyzer/sguil-client/Manifest
+++ b/net-analyzer/sguil-client/Manifest
@@ -1,5 +1,7 @@
 DIST sguil-0.9.0.tar.gz 464204 BLAKE2B 147b743fd8f70969ee560a3f6995775c40cfbaf543d8292f16aa6f02289edde54207a3cddb4969229e0a123dad2fb589eaef3bddb016e6ff408a3d9be4c7820d SHA512 3f300901d0f0260fbc950b4c7604e3dc3eeb2d088ff45171db84e2d58e281242bf3582eac51162968f1f3766961aec4d0a7af54e85773102ee643a52e879cfa6
+DIST sguil-1.0.0.tar.gz 892934 BLAKE2B 69459eed682d91a1b57ba08c141dd655dbbfaa0d9d2956e6a26065f1b6820307b0e0e4dcbcad89537eba7499aea38f81739c351246e3dd6c46cab46bdf0d054f SHA512 fc3007383f90c99a0ace3eeebac75864f9aa549676e784c7bf1d81222282e3a5a3d5290b121097ae3c027dee3dd35bbe8ac9dfede04dbd561edfd3948a0465ab
 DIST sguil-client-0.8.0.tar.gz 216433 BLAKE2B 65403d7c0de38fd4c010129ee692ab4af6853299566e3ffc6ac9a7f4e64b781830dad41f76dcaf4567bf5f217c5bd59396040cf36017b0ecdac733bc02c179db SHA512 44e14273cb7506b89d3138a1c50160de99576e77d6d18e3cdab9f257a1d00d5a100c8d9790f6e93aea8312fab51d52260aedfaa00facf54107249686d93e09b3
 EBUILD sguil-client-0.8.0.ebuild 1146 BLAKE2B a1b0ea60b014ba9e87a7f61b599d2d0d6096c4668e31a2da969155209641b48816cadf1947fe71c408267faea457913ea9ab9f945e52e59ccdab965fd1b6ba22 SHA512 128c4a4f45e7359e0275e8fc33a3984ef1aeab5171015526dcfd34d48d79a8aeb7c0a0e277c032f3a6fea9fec26b54fd9dff08bf539cce9d536bafab78073ba0
 EBUILD sguil-client-0.9.0.ebuild 1102 BLAKE2B fbf995943267883c71ce8d03730fd732da63f11c0ccde412384916c0711d664801b58def85413ac26b3932ffeae0625d20bb7a7bb34ca6c77ce8988740ac97e3 SHA512 0a287f755f98e56312696acfa83e69bf274d2719f539ed36e10d6c4c50a75fff3d7dd610e03ee984bef19a7420d9f02ab0a2671a13d4bc5cfa8bae41bbdd0932
+EBUILD sguil-client-1.0.0.ebuild 1074 BLAKE2B b60039f9764b0e1ff19b3d0b32927ede30e9bdb5ab7eea908487dc40634031ccd66c60fa936ac3bc9e4b25cc9e2d6872eccb67dbc79d142af2da7a63a0e72721 SHA512 30f4728b3e8a7f3884c4ce9bd91eef3fc05ea0ff175cbedd87d6e6914f9fb705d0ba791145a5f76f8df641520e23facc9a13ccde83ec47662bd0c70e01246e55
 MISC metadata.xml 418 BLAKE2B 7d1502fb438a75e29db9a29cd469c6ded1cb6566e374bd9ec0aa1ba4902b160a6e2f568bbacf78956db116df52e7bf647fc9c1b69a3e38b254c60ebc74fc6ea0 SHA512 bbe71ed5ce17f337808f82d4fe54ef68b94723a808c597a52d049b88b7334be9abb066911accf9175886405f3f02d37d838422a933afe8e00eeeac2c74ba5ed3
diff --git a/net-analyzer/sguil-client/sguil-client-1.0.0.ebuild b/net-analyzer/sguil-client/sguil-client-1.0.0.ebuild
new file mode 100644
index 000000000000..7188ff915ed2
--- /dev/null
+++ b/net-analyzer/sguil-client/sguil-client-1.0.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PV="${PV/_p/p}"
+DESCRIPTION="GUI Console for sguil Network Security Monitoring"
+HOMEPAGE="https://github.com/bammv/sguil"
+SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P/-client}.tar.gz"
+
+LICENSE="QPL"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ssl"
+
+RDEPEND="
+	>=dev-lang/tcl-8.3:0=[-threads]
+	>=dev-lang/tk-8.3:0=
+	>=dev-tcltk/itcl-3.2
+	>=dev-tcltk/tclx-8.3
+	dev-tcltk/itk
+	dev-tcltk/iwidgets
+	dev-tcltk/tcllib
+	net-analyzer/wireshark
+	ssl? ( >=dev-tcltk/tls-1.4.1 )
+"
+S=${WORKDIR}/sguil-${MY_PV}
+
+src_prepare() {
+	default
+	sed -i \
+		-e "/^set SGUILLIB /s:./lib:/usr/$(get_libdir)/sguil:" \
+		-e '/^set SERVERHOST /s:demo.sguil.net:localhost:' \
+		-e '/^set MAILSERVER /s:mail.example.com:localhost:' \
+		-e '/^set GPG_PATH /s:/usr/local/bin/gpg:/usr/bin/gpg:' \
+		client/sguil.conf || die
+}
+
+src_install() {
+	dobin client/sguil.tk
+	insinto /etc/sguil
+	doins client/sguil.conf
+	insinto "/usr/$(get_libdir)/sguil"
+	doins -r "${S}"/client/lib/*
+	dodoc doc/*
+}
diff --git a/net-analyzer/sguil-sensor/Manifest b/net-analyzer/sguil-sensor/Manifest
index 0b4d873233c1..f23e8ce89968 100644
--- a/net-analyzer/sguil-sensor/Manifest
+++ b/net-analyzer/sguil-sensor/Manifest
@@ -2,7 +2,9 @@ AUX log_packets.confd 527 BLAKE2B 568a785fab6f027218269378d345986c354246dad66673
 AUX log_packets.initd 2093 BLAKE2B a251bc9692a599e66943d5b3f6615f281d7872da22a76699875853f72836102cdb94fdf558250ee74e8618f8c45725dea0410e5fb635f153aadf5499575b4fe9 SHA512 43bc027f4769e986641a9820a1dfcb8a794ae417cb49efe333fd6a960953e1f9854c660e95ae9c0e14f4c1ec59da9e3096ae7352bbbb77805dc71729ed76514d
 AUX sensor_agent.initd 742 BLAKE2B 6d8a1aee38f81f4d9d971ec3a2d56112c0789ca60d5ee51ff7444109e55ddac889db81199e5883070031fe247cc06506febcb3ae27b5a215974a4f953121b887 SHA512 3a025479579ee9eec6a26d2a2c70efc362d37b7821dfa211236d8fe9dc2ea7b7b0694dccfd9b208655702401c1b0e3ecb08bac9e3b177ee77f161e5c774c1611
 DIST sguil-0.9.0.tar.gz 464204 BLAKE2B 147b743fd8f70969ee560a3f6995775c40cfbaf543d8292f16aa6f02289edde54207a3cddb4969229e0a123dad2fb589eaef3bddb016e6ff408a3d9be4c7820d SHA512 3f300901d0f0260fbc950b4c7604e3dc3eeb2d088ff45171db84e2d58e281242bf3582eac51162968f1f3766961aec4d0a7af54e85773102ee643a52e879cfa6
+DIST sguil-1.0.0.tar.gz 892934 BLAKE2B 69459eed682d91a1b57ba08c141dd655dbbfaa0d9d2956e6a26065f1b6820307b0e0e4dcbcad89537eba7499aea38f81739c351246e3dd6c46cab46bdf0d054f SHA512 fc3007383f90c99a0ace3eeebac75864f9aa549676e784c7bf1d81222282e3a5a3d5290b121097ae3c027dee3dd35bbe8ac9dfede04dbd561edfd3948a0465ab
 DIST sguil-sensor-0.8.0.tar.gz 142829 BLAKE2B f753c1bf6a95ba7b12d3a91d2d6ddf506b9dfb09208d08ad5ffcea95210525f014c3807d3e79df10739b00466e5e10e88d2e2494cfbbbb7c7145f2800df62600 SHA512 9b90598f2a3fdcf8652ccb92123944ffbda61c00f131bc951b12a95002f84f555f8c63cc1235fd7bb90875d00edbecbda02750bcca3bba7d16e1b1a150eb74ae
 EBUILD sguil-sensor-0.8.0.ebuild 2129 BLAKE2B 398b1e178cccc0814579378a69de2ab129d5f0b8c145e3c778f5a4076ec1ddccece005fdd4dbbe9f7cc2f2365d4e85748fc795238f538b331d3f54a75a271040 SHA512 5f8b73a592c21266b4cab281861f5c4173443a0bb05a91498394f5dc2561776e30152d790710448583555f0ebb91575335811d7a644cbed4c4c59e3e4491a9c9
 EBUILD sguil-sensor-0.9.0.ebuild 2161 BLAKE2B ee8cbc4719f3891f58297d89415609964db35649f3da01d16bde68fd7d918c50b1dddd0d5b5067bd0e4dc32aa930ae46a3e7159268cabb029b82aa2a444812e3 SHA512 8f9934b42fa92264c4eef6c6436b10b4686de6d612e26ee458cf4cba170ce172f66e40dbda3730f74410341a8d95101f6ca396e931bc03fc9abf6fee8c4abccb
+EBUILD sguil-sensor-1.0.0.ebuild 2141 BLAKE2B b74157cee416d6771923b97bb4380b189213a9cb6848ad8fb6ae27871c7079e7edd82bda3573b9611c228469c6895803acf0592cb4e3eeb7d2ac460dbb09fecf SHA512 7c0e48c9356ae779e97f7bbcb58a7327bd994aaa8c09c0ed440a4f7d853129ee691dcb80616b4947bd565623df267759f58ab8289ceb210acaaf61fd9020cc5a
 MISC metadata.xml 418 BLAKE2B 7d1502fb438a75e29db9a29cd469c6ded1cb6566e374bd9ec0aa1ba4902b160a6e2f568bbacf78956db116df52e7bf647fc9c1b69a3e38b254c60ebc74fc6ea0 SHA512 bbe71ed5ce17f337808f82d4fe54ef68b94723a808c597a52d049b88b7334be9abb066911accf9175886405f3f02d37d838422a933afe8e00eeeac2c74ba5ed3
diff --git a/net-analyzer/sguil-sensor/sguil-sensor-1.0.0.ebuild b/net-analyzer/sguil-sensor/sguil-sensor-1.0.0.ebuild
new file mode 100644
index 000000000000..cb9d1ed1994a
--- /dev/null
+++ b/net-analyzer/sguil-sensor/sguil-sensor-1.0.0.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit user
+
+MY_PV="${PV/_p/p}"
+DESCRIPTION="Sensor part of sguil Network Security Monitoring"
+HOMEPAGE="https://github.com/bammv/sguil"
+SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P/-sensor}.tar.gz"
+
+LICENSE="GPL-2 QPL"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-lang/tcl-8.3:0=[-threads]
+	>=dev-tcltk/tclx-8.3
+	>=net-analyzer/barnyard-0.2.0-r1
+	>=net-analyzer/snort-2.4.1-r1
+	dev-ml/pcre-ocaml
+	net-analyzer/sancp
+"
+
+S="${WORKDIR}/sguil-${MY_PV}"
+
+pkg_setup() {
+	enewgroup sguil
+	enewuser sguil -1 -1 /var/lib/sguil sguil
+}
+
+src_prepare() {
+	default
+	sed -i \
+		-e "s:gateway:${HOSTNAME}:" \
+		-e 's:/snort_data:/var/lib/sguil:' \
+		-e 's:DAEMON 0:DAEMON 1:' \
+		-e 's:DEBUG 1:DEBUG 0:g' \
+		sensor/sensor_agent.conf || die
+	sed -i \
+		-e 's:/var/run/sensor_agent.pid:/run/sguil-sensor.pid:' \
+		sensor/sensor_agent.tcl || die
+}
+
+src_install() {
+	dodoc doc/*
+
+	dobin sensor/sensor_agent.tcl
+
+	newinitd "${FILESDIR}/log_packets.initd" log_packets
+	newinitd "${FILESDIR}/sensor_agent.initd" sensor_agent
+	newconfd "${FILESDIR}/log_packets.confd" log_packets
+	insinto /etc/sguil
+	doins sensor/sensor_agent.conf
+
+	# Create the directory structure
+	diropts -g sguil -o sguil
+	keepdir /var/lib/sguil /var/lib/sguil/archive \
+		"/var/lib/sguil/${HOSTNAME}" \
+		"/var/lib/sguil/${HOSTNAME}/portscans" \
+		"/var/lib/sguil/${HOSTNAME}/ssn_logs" \
+		"/var/lib/sguil/${HOSTNAME}/dailylogs" \
+		"/var/lib/sguil/${HOSTNAME}/sancp"
+
+}
+
+pkg_postinst() {
+	elog
+	elog "You should check /etc/sguil/sensor_agent.conf and"
+	elog "/etc/init.d/logpackets and ensure that they are accurate"
+	elog "for your environment. They should work providing that you"
+	elog "are running the sensor on the same machine as the server."
+	elog "This ebuild assumes that you are running a single sensor"
+	elog "environment, if this is not the case then you must make sure"
+	elog "to modify /etc/sguil/sensor_agent.conf and change the HOSTNAME variable."
+	elog "You should crontab the /etc/init.d/log_packets script to restart"
+	elog "each hour."
+	elog
+}
diff --git a/net-analyzer/sguil-server/Manifest b/net-analyzer/sguil-server/Manifest
index 90c8c53ae199..d9f5e40efeca 100644
--- a/net-analyzer/sguil-server/Manifest
+++ b/net-analyzer/sguil-server/Manifest
@@ -1,7 +1,9 @@
 AUX sguild.confd 718 BLAKE2B b2ac186865f8fbe20c920b8f493fe6b7fd5736244e8d5574c8362e9c663baecd270821d024f124cb952d49a2ea80513d0bf961db9bf1fa5a93262b2236051037 SHA512 48bf64ed2335367c6b11dafb7f157fc507398e2466e186602e3319891848b3b47a5f9a70a39d8d94ecba170a7604252f689d116442572c3bc71441b01e3c0e34
 AUX sguild.initd 1198 BLAKE2B bd1225afa2e9544a818d234270fa1179db899b400492cea5efce91d59b7f211ba44cf4014eb7b5b785fa5da318cf7c52ca87d961ac4cd0c90e354219de270d8f SHA512 73bc162660ec36e568071026b6578a6e46215720cafdf957356307a341fcb159f201ba075d3f97563c81384da119f88a002f0f9e990071aef18026ad77e2e101
 DIST sguil-0.9.0.tar.gz 464204 BLAKE2B 147b743fd8f70969ee560a3f6995775c40cfbaf543d8292f16aa6f02289edde54207a3cddb4969229e0a123dad2fb589eaef3bddb016e6ff408a3d9be4c7820d SHA512 3f300901d0f0260fbc950b4c7604e3dc3eeb2d088ff45171db84e2d58e281242bf3582eac51162968f1f3766961aec4d0a7af54e85773102ee643a52e879cfa6
+DIST sguil-1.0.0.tar.gz 892934 BLAKE2B 69459eed682d91a1b57ba08c141dd655dbbfaa0d9d2956e6a26065f1b6820307b0e0e4dcbcad89537eba7499aea38f81739c351246e3dd6c46cab46bdf0d054f SHA512 fc3007383f90c99a0ace3eeebac75864f9aa549676e784c7bf1d81222282e3a5a3d5290b121097ae3c027dee3dd35bbe8ac9dfede04dbd561edfd3948a0465ab
 DIST sguil-server-0.8.0.tar.gz 102236 BLAKE2B 15dfe03f79bba92486e12fa85a368e01005c8587abd7119ef5264c14efaf8f8861346c1744590316a2a40160d11b3042abe8456f911fee677d83846561a8ee70 SHA512 84161365579e3b4227314d9f61afad6ad220261525d7fc8016210a13ee607815eb33178bab026f8a217c43a42f2e623c41d579c5898f58207a18e31685426710
 EBUILD sguil-server-0.8.0.ebuild 2716 BLAKE2B 194464c08905549da414376bdff269f777f3836555cff3ee4a379e2498d5dc6a41bc42ece6bc73bccc1200051c2e7447f615c079b19142ec2dcc7fd3fcd06701 SHA512 69c4956fcec20c7813150fdcbb75f2df7ccc5b7691944967e03a88d63678e27d9d3179fd93a217e24880a5591e072891d0ad81931c7a847e04671d2c6a75383c
 EBUILD sguil-server-0.9.0.ebuild 2744 BLAKE2B e7edb0c386675f3a9a216d4728b238a322414533a2547b059611ace37aec043f2fc22b8aec4fa3d293d2e6fcb97d5eb6713abb761087d0452a1fec3ecf204af2 SHA512 bae037820841e967a714d7b054a2830fb8dcc369729fce90132286b07abc7fa09fcb777c667a0b8a69a1182a584962dce47d0a7323f89a5a4762e06ec588e931
+EBUILD sguil-server-1.0.0.ebuild 2674 BLAKE2B ec252a002fe56e3040749eb08292c225d2d8218a55b271dc54106ef6925d054d1b20363a14e997acd9e106b53fb1fcdf1b62e6b3baf835cd885849b0f029e477 SHA512 927006d9ddfd4f9fcb71601c87579974d662e5b6f0679646f553ce54bfd1137e214754da9cf6bf9b8afbabcf41941bf92d5df684af327d68f0766458899f941f
 MISC metadata.xml 418 BLAKE2B 7d1502fb438a75e29db9a29cd469c6ded1cb6566e374bd9ec0aa1ba4902b160a6e2f568bbacf78956db116df52e7bf647fc9c1b69a3e38b254c60ebc74fc6ea0 SHA512 bbe71ed5ce17f337808f82d4fe54ef68b94723a808c597a52d049b88b7334be9abb066911accf9175886405f3f02d37d838422a933afe8e00eeeac2c74ba5ed3
diff --git a/net-analyzer/sguil-server/sguil-server-1.0.0.ebuild b/net-analyzer/sguil-server/sguil-server-1.0.0.ebuild
new file mode 100644
index 000000000000..82b621af6cde
--- /dev/null
+++ b/net-analyzer/sguil-server/sguil-server-1.0.0.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit ssl-cert user
+
+MY_PV="${PV/_p/p}"
+DESCRIPTION="Daemon for Sguil Network Security Monitoring"
+HOMEPAGE="https://github.com/bammv/sguil"
+SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P/-server}.tar.gz"
+
+LICENSE="GPL-2 QPL"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ssl"
+
+DEPEND="
+	>=dev-lang/tcl-8.3:0=[-threads]
+	>=dev-tcltk/tclx-8.3
+	dev-tcltk/tcllib
+	dev-tcltk/mysqltcl
+	ssl? ( >=dev-tcltk/tls-1.4.1 )
+"
+RDEPEND="
+	${DEPEND}
+	net-analyzer/p0f
+	net-analyzer/tcpflow
+	net-misc/openssh
+"
+
+S="${WORKDIR}/sguil-${MY_PV}"
+
+pkg_setup() {
+	enewgroup sguil
+	enewuser sguil -1 -1 /var/lib/sguil sguil
+}
+
+src_prepare(){
+	default
+	sed -i \
+		-e 's:DEBUG 2:DEBUG 1:' -e 's:DAEMON 0:DAEMON 1:' \
+		-e 's:SGUILD_LIB_PATH ./lib:SGUILD_LIB_PATH /usr/'$(get_libdir)'/sguild:g' \
+		-e 's:/sguild_data/rules:/var/lib/sguil/rules:g' \
+		-e 's:/sguild_data/archive:/var/lib/sguil/archive:g' \
+		server/sguild.conf || die
+}
+
+src_install(){
+	dodoc server/sql_scripts/*
+	dodoc doc/CHANGES doc/OPENSSL.README doc/USAGE doc/INSTALL \
+	doc/TODO doc/sguildb.dia
+
+	insopts -m640
+	insinto /etc/sguil
+	doins server/{sguild.email,sguild.users,sguild.conf,sguild.queries,sguild.access,autocat.conf}
+
+	insinto /usr/$(get_libdir)/sguild
+	doins server/lib/*
+	dobin server/sguild
+	newinitd "${FILESDIR}/sguild.initd" sguild
+	newconfd "${FILESDIR}/sguild.confd" sguild
+
+	if use ssl; then
+		sed -i -e "s/#OPENSSL/OPENSSL/" "${D}/etc/conf.d/sguild"
+	fi
+
+	diropts -g sguil -o sguil
+	keepdir \
+		/var/lib/sguil \
+		/var/lib/sguil/archive \
+		/var/lib/sguil/rules
+
+}
+
+pkg_postinst(){
+	if use ssl && ! [ -f "${ROOT}"/etc/sguil/sguild.key ]; then
+		install_cert /etc/sguil/sguild
+	fi
+
+	chown -R sguil:sguil "${ROOT}"/etc/sguil/sguild.*
+	chown -R sguil:sguil "${ROOT}"/usr/lib/sguild
+
+	if [ -d "${ROOT}"/etc/snort/rules ] ; then
+		ln -s /etc/snort/rules "${ROOT}"/var/lib/sguil/rules/${HOSTNAME}
+	fi
+
+	elog
+	elog "Please customize the sguild configuration files in /etc/sguild before"
+	elog "trying to run the daemon. Additionally you will need to setup the"
+	elog "mysql database. See /usr/share/doc/${PF}/INSTALL.gz for information."
+	elog "Please note that it is STRONGLY recommended to mount a separate"
+	elog "filesystem at /var/lib/sguil for both space and performance reasons"
+	elog "as a large amount of data will be kept in the directory structure"
+	elog "underneath that top directory."
+	elog
+	elog "You should create the sguild db as per the install instructions in"
+	elog "/usr/share/doc/${PF}/ and use the appropriate"
+	elog "database setup script located in the same directory."
+
+	elog
+}
diff --git a/net-analyzer/speedtest-cli/Manifest b/net-analyzer/speedtest-cli/Manifest
index 81e636f09c5f..61165138ce18 100644
--- a/net-analyzer/speedtest-cli/Manifest
+++ b/net-analyzer/speedtest-cli/Manifest
@@ -1,3 +1,5 @@
 DIST speedtest-cli-2.0.2.tar.gz 23915 BLAKE2B 95b88e1666d7bc50c525ae7eb587e1b53babe02549e3b6b81f59451166fdbfb5561daa29e1de308d3ca7340989bcb6e7b43edd84bf371716284c034cdeb21fd8 SHA512 12fa9a5dd8bcb7a7ee68ecc9075dc5c18f089cecf003e7e643dbb6b1c3663f17c2aba48d1e84aa27bff6b66e207d39ecaf874aebad1d71cac772c58b62191723
+DIST speedtest-cli-2.1.1.tar.gz 24380 BLAKE2B ea6f5fc3127246ad4cf90dee4b53529fa9f3b9b9558c9ebb92661380663a5e5950490e91cda97f9207b26c23464026b91c8faa50ef5a515b817b0f84fcb2e13b SHA512 afc1fc0264d5124efe5afc9b0583b2b37ae50eac229e6971656a906b9a7a78d44158485d5c2e44c3430694fd7355926f578a54a196cc9b9baf6cfbc357a789d1
 EBUILD speedtest-cli-2.0.2.ebuild 659 BLAKE2B b1158cc13f1edcf3430f0ba7973a5d5bb617aa836cf9ccf08c7b15b57585642468a41237de0cb9e7254f2fc5a8f997529c1a323c5d4b10173d183d585f3702d0 SHA512 3830ba3d46b8391cd2f0f63a11f70acda45af07cc8025ca4ac1aba574312634f754558cb54bf40c2d051c20a06221f193610f45bbfd76836e7ea24e936eb9324
+EBUILD speedtest-cli-2.1.1.ebuild 661 BLAKE2B 6dbca712919867894da38ae045b6b737b7b50f79b70a7aab04373aeb086928888d486e33728073108f7ce1eb2b350598f7c0ba9a28b825a7d759c503d8c03e86 SHA512 6085506ffd9e89f83538e7aae5a816c50b0f9a87e3a945633ac1631d3d46344ba1839030eff091eeecaa0dc5651aef6bd96aaf41f70179470b462c78f297c7f1
 MISC metadata.xml 460 BLAKE2B 488a43d888cbc4baa7d74bcf4b8852054037be8227f380d43f187baba239e253c2a0aa3ce1d8c2c672a4947be9e4268a2d1fa8adbb3db38fee9e2334851bc7eb SHA512 6e911380a7bc75a4f5726f4bb8f864a2660e93cb07be2cdf55b428fe8615e9e31c7a78f978064ed73fdc1133d6611b3bc3a39966439bb249e4f8a69dbae88f1c
diff --git a/net-analyzer/speedtest-cli/speedtest-cli-2.1.1.ebuild b/net-analyzer/speedtest-cli/speedtest-cli-2.1.1.ebuild
new file mode 100644
index 000000000000..8c5b2bfd8f88
--- /dev/null
+++ b/net-analyzer/speedtest-cli/speedtest-cli-2.1.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+
+inherit distutils-r1
+
+DESCRIPTION="Command line interface for testing internet bandwidth using speedtest.net"
+HOMEPAGE="https://github.com/sivel/speedtest-cli"
+SRC_URI="https://github.com/sivel/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+DOCS=( CONTRIBUTING.md README.rst )
+
+python_install_all() {
+	doman ${PN}.1
+	distutils-r1_python_install_all
+}