gentoo resync : 06.01.2018

20 files changed, 19 insertions, 729 deletions

diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 25aab034185a..3b021e287fcb 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest
index 2f3925effdae..a2c1c842cdcb 100644
--- a/net-analyzer/nmap/Manifest
+++ b/net-analyzer/nmap/Manifest
@@ -12,8 +12,8 @@ DIST nmap-7.40.tar.bz2 9043221 BLAKE2B ddbc2f9d8b96aa2ddd53bb250acb5b0829dd79caf
 DIST nmap-7.50.tar.bz2 9309616 BLAKE2B 79f257f4c19762729ddfe7bb950263253d98b0902d22f0bf87ff64b7400c5e0c8e8c1a6b5a8c75e3f835dedbf7087808b1bd8444126655138382ea2db1ccb748 SHA512 b74c5711f03bae363164cdb7e62923ab938c81c7bbcd080eaa2d1acc89f09eb0a7e0f5deb9628b81057c7a35ecd487a2d09dfe3b58b0db6c84cf0b39f526e5f2
 DIST nmap-7.60.tar.bz2 10394925 BLAKE2B bb3a392292adeebe60dc9716ee61ee09a2f86703a1370ffd6a6c63969a75733660046279d122b1b529a3ea25083bde9334d5e13496ad6a9bd9d6562031b8ae09 SHA512 74ba8f6de026ade9ee6bb2252bee18a57210f8207977df7f1c04556629dcdc1e6127f33febc8a52ef88a1dac876116d590564dee4f1c23798c3ac37529991aa4
 DIST nmap-logo-64.png 3289 BLAKE2B 9563f57d126e6fa38dc777391c2887112836b4f5b521311bde64d5c5a04c45a3f420abba0750f776658015c0018b2afeb381c691bc8784e4f39abc78b9c2d2c7 SHA512 fb102d12aaeebc8a97543ecd653a3606e86996ad679bc26d6e6e274ad05ec3e9f92521289d1a24153c521b699e8c0cfa65d8856bb49af53ee4837268bbc6b5d3
-EBUILD nmap-7.40.ebuild 4352 BLAKE2B fb1bbeb49e8757d204fc4ca7fe4347d1f57860131bd1d0e928b808e393056dc38fd4291a0ffa63502da40b66c1866e55f2237fa52e31ba24e2b8ef97460f779e SHA512 e7f602c98215e2583a88360493e24c4ade72994154bd24b524426edb64aa5a3c688aa5e841fb1bfedf73566f8e494108636c2d7f29201e7fe179a7aa13117f90
-EBUILD nmap-7.50.ebuild 4353 BLAKE2B 6675a7bfc94c4ea0fbf5d8c4b5e741a742724e099269bb9eb05a0085a2bd5b22a0f7d6fa95924fd902928c3f08d5c9d04d1b29ff97cc4ee3995437078abca465 SHA512 f061ce79bc7c48fc30be3105c70e24621fcf0d0cfbfbe8416e67d10b497998117e4a782e073e14a52490d668916a180e2dab266ccdc2524733caff03d4aff482
-EBUILD nmap-7.60.ebuild 4567 BLAKE2B 6daea092084abc2cb3e9bb14860210565f4b35d191a7c59f8ca6aebc449703a87a8229c0d51246cdfd8c51660b2907f93856a0da5f64278d8ca4b84cc67c621c SHA512 8648fbb304949199b84d4e74faf281dd2893fcd3eca75ed07d3424ef4c97b00f8bfac795d08bd3fa72620122f71eb8c4054366c029ba82b4f76bc2d1d44f50b1
-EBUILD nmap-9999.ebuild 4382 BLAKE2B 2517a01240e47bc7de49e8d5761a8db1633276851504e4e2dd9486e9d6324230346a21cf7afbd2c82ddcd26d108321826987893fc65030ad5632f19eb6a360c5 SHA512 cf7694cb46891ce0e8fcd231085eb2adbced0e2ad9ad88e4fee5df72b4c34c81ff07fe55a0ef9fe661d98a1c4062e66f2963b33e23eb3728c2a8943da240d45b
+EBUILD nmap-7.40.ebuild 4323 BLAKE2B 6a7ee5f39c348282a5e251b3e85e0f1fc60fcde4c00e3f66e6e67491065b5af57f9d3d868fa5ec2be7e0c652cd0737274b0f8ddb65e4b6efb18c2738808a620e SHA512 4062635e101e17b2acfd8f6af986ac7ffc0fd734178a1ebdc6e528cc2f76996ca6b5b4b8a5682a89a3665c23f3525e19872aef976e121dffc8342160f594ee14
+EBUILD nmap-7.50.ebuild 4324 BLAKE2B 086ed32a2369e05e86594602152310b0b4ff0571e9665be98d2f3dc3f29f7cb792d6bc4d5b29956e8eaf65544ada29b396e7d3b57051b6f5d3886476691a02ef SHA512 ae8f7fef956c851cb2fed8e37409aeba6910704b6d0f9d10e6c100a5aaaf4c67111cc3f0fe7af4e6a90b282a8618c85418796e38c2752ce2c37b5225e1c29e07
+EBUILD nmap-7.60.ebuild 4538 BLAKE2B e40bb2b98d7836982f6bd7408a536ee05d35e21badc0775c9b4541534202ec02b48a3907929e53e323f1e8ff61a6f628043cd83e60f60b839f8d0bf380c8d3a6 SHA512 daa592a9693c1f3ff544459583b606c7beb4d98c394de22a03ac609457da1324d1b03629aa15a39b20cf64ba30579bcdf0d4e3bb5bb743137013c2352a0a875d
+EBUILD nmap-9999.ebuild 4353 BLAKE2B fcea0a8760336a5283931547cf055b8f13d62afc88add8889fe6cd8705be0e4754b17b13bbaf168c9cf9f4794bd49beeb6b2eca16de5e954f67ef23fbd78c301 SHA512 dca14cb1250ab48c691ce0e661aa8ab9ea6b7548c4571255fa9000b0a321e765df145d0e4ea3e5af2ddf2e11b3258977f2fb2cfc5472e73a9300e88d1a8377a9
 MISC metadata.xml 920 BLAKE2B c07add545e072588022e15d9de0595f1924fe10fdbec7a11cd401429a76a56ee0a53e4675b3e784f5e2e44372f531073cbdc3da717e4a7f3f906b5c1987530d8 SHA512 56d44c71139e48b75a89140bedd2c4a1bc20c8fe99e16ee8b71fb490cb606997571de95d6ac93147bdee81bbcbb736588c87c43b9cd4f9fac71280416a499185
diff --git a/net-analyzer/nmap/nmap-7.40.ebuild b/net-analyzer/nmap/nmap-7.40.ebuild
index 1582792f3e64..75ad3bdc6aaa 100644
--- a/net-analyzer/nmap/nmap-7.40.ebuild
+++ b/net-analyzer/nmap/nmap-7.40.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
@@ -22,7 +22,6 @@ KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~
 
 IUSE="ipv6 libressl +nse system-lua ncat ndiff nls nmap-update nping ssl zenmap"
 NMAP_LINGUAS=( de fr hi hr it ja pl pt_BR ru zh )
-IUSE+=" ${NMAP_LINGUAS[@]/#/linguas_}"
 
 REQUIRED_USE="
 	system-lua? ( nse )
@@ -82,10 +81,10 @@ src_prepare() {
 
 	default
 
+	local lingua
 	if use nls; then
-		local lingua=''
 		for lingua in ${NMAP_LINGUAS[@]}; do
-			if ! use linguas_${lingua}; then
+			if ! has ${linguas} ${LINGUAS-${lingua}}; then
 				rm -r zenmap/share/zenmap/locale/${lingua} || die
 				rm zenmap/share/zenmap/locale/${lingua}.po || die
 			fi
diff --git a/net-analyzer/nmap/nmap-7.50.ebuild b/net-analyzer/nmap/nmap-7.50.ebuild
index cfbafe0a31bf..4cef5f17ec77 100644
--- a/net-analyzer/nmap/nmap-7.50.ebuild
+++ b/net-analyzer/nmap/nmap-7.50.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
@@ -22,7 +22,6 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~spa
 
 IUSE="ipv6 libressl +nse system-lua ncat ndiff nls nmap-update nping ssl zenmap"
 NMAP_LINGUAS=( de fr hi hr it ja pl pt_BR ru zh )
-IUSE+=" ${NMAP_LINGUAS[@]/#/linguas_}"
 
 REQUIRED_USE="
 	system-lua? ( nse )
@@ -82,10 +81,10 @@ src_prepare() {
 
 	default
 
+	local lingua
 	if use nls; then
-		local lingua=''
 		for lingua in ${NMAP_LINGUAS[@]}; do
-			if ! use linguas_${lingua}; then
+			if ! has ${linguas} ${LINGUAS-${lingua}}; then
 				rm -r zenmap/share/zenmap/locale/${lingua} || die
 				rm zenmap/share/zenmap/locale/${lingua}.po || die
 			fi
diff --git a/net-analyzer/nmap/nmap-7.60.ebuild b/net-analyzer/nmap/nmap-7.60.ebuild
index e925ad725d85..d6bd64a6b69e 100644
--- a/net-analyzer/nmap/nmap-7.60.ebuild
+++ b/net-analyzer/nmap/nmap-7.60.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
@@ -25,7 +25,6 @@ IUSE="
 	zenmap
 "
 NMAP_LINGUAS=( de fr hi hr it ja pl pt_BR ru zh )
-IUSE+=" ${NMAP_LINGUAS[@]/#/linguas_}"
 
 REQUIRED_USE="
 	system-lua? ( nse )
@@ -88,10 +87,10 @@ src_prepare() {
 
 	default
 
+	local lingua
 	if use nls; then
-		local lingua=''
 		for lingua in ${NMAP_LINGUAS[@]}; do
-			if ! use linguas_${lingua}; then
+			if ! has ${linguas} ${LINGUAS-${lingua}}; then
 				rm -r zenmap/share/zenmap/locale/${lingua} || die
 				rm zenmap/share/zenmap/locale/${lingua}.po || die
 			fi
diff --git a/net-analyzer/nmap/nmap-9999.ebuild b/net-analyzer/nmap/nmap-9999.ebuild
index f92eba2649f1..3424bf9d8b6e 100644
--- a/net-analyzer/nmap/nmap-9999.ebuild
+++ b/net-analyzer/nmap/nmap-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
@@ -22,7 +22,6 @@ IUSE="
 	zenmap
 "
 NMAP_LINGUAS=( de fr hi hr it ja pl pt_BR ru zh )
-IUSE+=" ${NMAP_LINGUAS[@]/#/linguas_}"
 REQUIRED_USE="
 	system-lua? ( nse )
 	ndiff? ( ${PYTHON_REQUIRED_USE} )
@@ -83,10 +82,10 @@ src_prepare() {
 
 	default
 
+	local lingua
 	if use nls; then
-		local lingua=''
 		for lingua in ${NMAP_LINGUAS[@]}; do
-			if ! use linguas_${lingua}; then
+			if ! has ${linguas} ${LINGUAS-${lingua}}; then
 				rm -r zenmap/share/zenmap/locale/${lingua} || die
 				rm zenmap/share/zenmap/locale/${lingua}.po || die
 			fi
diff --git a/net-analyzer/ntop/Manifest b/net-analyzer/ntop/Manifest
deleted file mode 100644
index e88336245a99..000000000000
--- a/net-analyzer/ntop/Manifest
+++ /dev/null
@@ -1,12 +0,0 @@
-AUX ntop-5.0.1-INCS.patch 951 BLAKE2B 8dd124da27ec324aba523ed0bb8b30ee8cc8458af5a0e8d1e8df8589b806bd2aa695af61eab3e212ec88b68cc0dc9678f2e5eb41e374499212ec069734d57fa2 SHA512 396b1d8b9c99faa390615795f470221a6b2a5d9a9e4bf73ae6758e8cf4615e44571ac7c112e61f6be914a299b289f7caceffab08bbc083a5fcba069a5e1713c7
-AUX ntop-5.0.1-gentoo.patch 6752 BLAKE2B 3c4af6183ee4225b9409b0a56cda6b56055d2b13fe9356896a3e5d89c6d7f024baebc84c578eef8c23078bb2ac8196be41fcd193f87c8ff935502ab500d932ef SHA512 dd8309cd5c24eda0a9bb4a35b5598ff5f9a22b2af36ae9692f13b6254b2d9e624b646dda38610f6552b2694eb18d5946f0623fff76261c1d4e2ef94518fd5c69
-AUX ntop-5.0.1-includes.patch 388 BLAKE2B 2563a9bd2bc939dfd691add128c257d409c483428e0bd38219b7e087be01520e41dc17e18e777455a2329710fb32c9e48e83a375be92e89160f5cba47fa4a857 SHA512 6afe8aee2dfee0c9b778a11896aa8b3341618171a74497832d2d67d76dea4374c14060c308ba9a69369b4bfd19c83ff9d5891410758b252bcc714e6031a44a30
-AUX ntop-5.0.1-librrd.patch 853 BLAKE2B 0acb7bfeae12e21bccd7f31674e52ae6094e816176e7da817cce3776a147381a5dee06bd622df38ba8ced5f14f216f5cd0651a96c51caffb11ee8ec455fa88eb SHA512 32f19b1713aa26852df31928dcfaebc8861176f175b06de1724711146b0aad7686608264f1ef9f8a1b1396b0571d5cdd53599cc7944a6cd0d08f8e2935fabbb8
-AUX ntop-confd 341 BLAKE2B 20305bb07769f62111c9f7c17a654b2cd5d54b3b9589e028b3567944f14a83bc9a39f224c2c4cd3ec2500b230dbe5395863eb66bf6831ee334954b7fd71e876e SHA512 8693050cab03eeb29b59e0a7b173c7791625e8cd6bc33eaa5d74a50ab3ecf435577d7918626cfe3963a0d23d4522a737737b2b9fd8335df29784858a6191813d
-AUX ntop-initd 748 BLAKE2B bc844c0a5ecf056495a70ca1889314c5394ac0ff7401bb9830e8789b533dd597f931f1d8b83f0cf5e440f11e5988b0d190241914af16ab3e7f19adbc71ed7dfb SHA512 22b61d88e1fc30106d07ee87701ff46b7f63f1ee2aa7bb5666d9cb5cb6251c583f793c80a5d799ac27fcb63650e7ecacb37e7992feb8aa8cbc2d326b36b05a8f
-AUX ntop-initd-r1 670 BLAKE2B d08a946c96698cf7f5055142e6377cb4b7d2d5c978937d9092acc0bac0ae987c85b31c09777325e758e816923cfb98a534546f80a8d726cbb1d4109627cf8a7b SHA512 22bf70d2f4f026702a123abc6da5bc08a879b554f45a301266d0eb2d1e8978f8510811138bd5ec63af29fa47b9b44624a7fc79f3740860860c86ce82717a9771
-AUX ntop-update-geoip-db 492 BLAKE2B b21d0e73a9142e7403cc16a43b1a61db21e05f198ec4bce9df6355c6695369bf3231425ec80283758bbb5efd71677c97b2dac6b37e1dd03831f29af45f28928e SHA512 7b5ae8dbd7d5d084c7278af1deb64a903b106663c3195df70acead3e8d7e14fbd996e69d5132c0ddac9147b3e70892c91695d834ab7b22fec2569efcd52df5f6
-DIST ntop-5.0.1.tar.gz 40133867 BLAKE2B a0f44114312c0d427e6d6fa75d4a19de782c670c0b47ff5e26c236fe825e089a1d706182f0e12226f55f9553e592489053d9b102652341523f0277b71925eff2 SHA512 f52c40e6c00c8d2f46b68078c5f9aef8ed78670f92a0a81f66f2f44c71d41bc4c001b4550f19b71c546f7c07cbbed15e0aa1ee13873ac63a11678bf2b8483f2a
-EBUILD ntop-5.0.1-r2.ebuild 2986 BLAKE2B db6f6f0600c2e3c73f1d44bb45a3cc29186aaed0d1fec8eb265271b7310056348203c85b161c81bc49222bfbb566a9e7c92b26413a63194acda5930325bfad01 SHA512 d3816746937039d1105bb7b373cb0dd531dd9a820d31067dd27f9789c20aceefa5749ad6b56648bd356986a14eb2effa9b6b1022c37eb04d5410c60d161a2b30
-EBUILD ntop-5.0.1-r3.ebuild 3058 BLAKE2B 12394fb1082b415a6479ac8faa07d19132ae0d80ba1784b32403951a4e89f4d67cd1f754bac3458186bc6d615b73d687bd8db0509ca1db6a4a1c295a84b68496 SHA512 2210d50bc0c4a4161e9e0f18cbf2360f9a675873b0d7ae81a10d826ab09559b94f6f4e6bd097d0bd632db9c7a5fb0afa12d645b8a42f93766788553044966ca5
-MISC metadata.xml 925 BLAKE2B 430389db59eac03f5f9ead73eca56909594665b174b5a9c00d13c4cc51abfa74866dea7f20d6018e1eb726730cb3954af064563ded94136d1aaf8b8fa1dd211f SHA512 cdd3a2f6b763a78e208d3be386f4d175a53a30047f4c15f1cf7a4a102325380fbf7c77bc754bf0b1b5e38d0600781c3a876c1a75ac2aa997ef1c3ff423f3bbb0
diff --git a/net-analyzer/ntop/files/ntop-5.0.1-INCS.patch b/net-analyzer/ntop/files/ntop-5.0.1-INCS.patch
deleted file mode 100644
index de49a41d7175..000000000000
--- a/net-analyzer/ntop/files/ntop-5.0.1-INCS.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- a/configure
-+++ b/configure
-@@ -18983,7 +18983,7 @@
-     else
-         LIBS="${LIBS} ${PYTHON_LIBS}"
- 
--            PYTHON_INCS=`$PYTHON_CONFIG --cflags | sed -e "s/-arch i386//" | sed -e "s/-arch ppc//" | sed -e "s/-arch x86_64//"`
-+            PYTHON_INCS=`$PYTHON_CONFIG --includes | sed -e "s/-arch i386//" | sed -e "s/-arch ppc//" | sed -e "s/-arch x86_64//"`
- 
-     INCS="${INCS} ${PYTHON_INCS}"
- 
-@@ -19335,15 +19335,6 @@
-         for(i=NF; i>0; i--) { \
-             if ($i in fields) { } else { fields[$i]="."; out[i]=$i } \
-         } \
--        for(i=1; i<=NF; i++) { \
--            if (i in out) { printf("%s ", out[i]) } \
--        } \
--        print "" \
--    }'`
--    INCS=`echo ${INCS} | ${ac_cv_prog_AWK} '{ \
--        for(i=NF; i>0; i--) { \
--            if ($i in fields) { } else { fields[$i]="."; out[i]=$i } \
--        } \
-         for(i=1; i<=NF; i++) { \
-             if (i in out) { printf("%s ", out[i]) } \
-         } \
diff --git a/net-analyzer/ntop/files/ntop-5.0.1-gentoo.patch b/net-analyzer/ntop/files/ntop-5.0.1-gentoo.patch
deleted file mode 100644
index 57f136971cfc..000000000000
--- a/net-analyzer/ntop/files/ntop-5.0.1-gentoo.patch
+++ /dev/null
@@ -1,240 +0,0 @@
---- a/configure.in
-+++ b/configure.in
-@@ -469,11 +469,6 @@
-     LOCALEDIR="/usr/lib/locale"
- fi
- 
--dnl> Add /usr/local/ /opt/local
--CFLAGS="${CFLAGS} -I/usr/local/include -I/opt/local/include"
--CPPFLAGS="${CPPFLAGS} -I/usr/local/include -I/opt/local/include"
--LDFLAGS="${LDFLAGS} -L/usr/local/lib -L/opt/local/lib"
--
- PWD=`pwd`
- 
- echo
-@@ -1739,18 +1734,6 @@
- if test ".${ac_cv_lib_GeoIP_GeoIP_record_by_ipnum}" = ".yes"; then
- LIBS="$LIBS -lGeoIP"
- 
--if test -f "GeoLiteCity.dat"; then
--   echo "GeoLiteCity.dat already present"
--else
--   if test -f "3rd_party/GeoLiteCity.dat.gz"; then
--     cp 3rd_party/GeoLiteCity.dat.gz .
--   else
--     wget http://www.maxmind.com/download/geoip/database/GeoLiteCity.dat.gz
--   fi
--
--   gunzip GeoLiteCity.dat.gz
--fi
--
- dnl> --------
- 
- if test -f "GeoIPASNum.dat"; then
-@@ -1769,8 +1752,11 @@
- exit 1
- fi
- 
--cp "3rd_party/oui.txt.gz" .
--cp "3rd_party/specialMAC.txt.gz" .
-+gunzip 3rd_party/GeoLiteCity.dat.gz &&
-+mv "3rd_party/etter.finger.os.gz" . &&
-+mv "3rd_party/oui.txt.gz" . &&
-+mv "3rd_party/specialMAC.txt.gz" . ||
-+    exit 1
- 
- if test -d ./configureextra; then
- 
-@@ -1931,7 +1917,6 @@
- AC_SUBST(SO_VERSION_PATCH)
- AC_SUBST(RRD_LIB)
- AC_SUBST(RRD_INC)
--AC_SUBST(GEO_DIR)
- AC_SUBST(GETOPT_H)
- AC_SUBST(GETOPT_C)
- AC_SUBST(NDPI_LIB)
---- a/globals-core.c
-+++ b/globals-core.c
-@@ -369,7 +369,7 @@
-   _mtuSize[DLT_ATM_RFC1483] = 9180                             /* LLC/SNAP encapsulated atm */;
-   _headerSize[DLT_ATM_RFC1483] = 0;
- 
--  /* _mtuSize[DLT_RAW] = ?                                        raw IP */
-+  _mtuSize[DLT_RAW] = 1500;                                     /*   raw IP */
-   _headerSize[DLT_RAW] = 0;
- 
-   /* Others defined in bpf.h at tcpdump.org as of the resync - it would be NICE
-@@ -470,19 +470,18 @@
-   struct stat statbuf;
- 
-   /* Initialize GeoIP databases */
--  for(i=0; myGlobals.configFileDirs[i] != NULL; i++) {
-+  {
-     char path[256];
-     
-     safe_snprintf(__FILE__, __LINE__, path, sizeof(path),
- 		  "%s%c%s",
--		  myGlobals.configFileDirs[i], 
-+		  myGlobals.dbPath,
- 		  CONST_PATH_SEP, GEO_IP_FILE);
-     revertSlashIfWIN32(path, 0);
- 
-     if(stat(path, &statbuf) == 0) {
-       if((myGlobals.geo_ip_db = GeoIP_open(path, GEOIP_CHECK_CACHE)) != NULL) {
- 	traceEvent(CONST_TRACE_INFO, "GeoIP: loaded config file %s", path);
--	break;
-       }
-     }
-   }
-@@ -491,20 +490,18 @@
-     traceEvent(CONST_TRACE_ERROR, "GeoIP: unable to load file %s", GEO_IP_FILE);
-   
-   /* *************************** */
--
--  for(i=0; myGlobals.configFileDirs[i] != NULL; i++) {
-+  {
-     char path[256];
-     
-     safe_snprintf(__FILE__, __LINE__, path, sizeof(path),
- 		  "%s%c%s",
--		  myGlobals.configFileDirs[i], 
-+		  myGlobals.dbPath,
- 		  CONST_PATH_SEP, GEO_IP_ASN_FILE);
-     revertSlashIfWIN32(path, 0);
- 
-     if(stat(path, &statbuf) == 0) {
-       if((myGlobals.geo_ip_asn_db = GeoIP_open(path, GEOIP_CHECK_CACHE)) != NULL) {
- 	traceEvent(CONST_TRACE_INFO, "GeoIP: loaded ASN config file %s", path);
--	break;
-       }
-     }
-   }
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -36,7 +36,6 @@
- 
- #AM_CFLAGS =
- #AM_LDFLAGS=
--ACLOCAL_AMFLAGS=-I m4
- 
- DISTCLEANFILES = trivialcompilemessage *.db #* *~ *.log
- CLEANFILES     = $(DISTCLEANFILES) stamp-h1
-@@ -67,9 +66,7 @@
- NTOPDATA = ntop-cert.pem \
-            $(ETTER_PASSIVE) \
-            oui.txt.gz \
--           specialMAC.txt.gz \
--	   GeoIPASNum.dat \
--	   GeoLiteCity.dat
-+           specialMAC.txt.gz
- 
- NTOPHTML = html html/*.js html/*.html  html/*.gif html/*.jpg html/*.ico html/*.png \
-            html/*.css html/*.dtd \
-@@ -133,7 +130,7 @@
- 
- libntop_la_DEPENDENCIES =  config.h
- libntop_la_LIBADD       = $(BASE_LIBS)
--libntop_la_LDFLAGS      = $(AM_LDFLAGS) -release $(VERSION) -export-dynamic @DYN_FLAGS@
-+libntop_la_LDFLAGS      = $(AM_LDFLAGS) -release $(VERSION) -export-dynamic -shared @DYN_FLAGS@
- 
- # Archive for http representation, or the 'viewer'
- libntopreport_la_SOURCES = emitter.c       globals-report.c  graph.c \
-@@ -145,7 +142,7 @@
- 
- libntopreport_la_DEPENDENCIES = libntop.la
- libntopreport_la_LIBADD       = libntop.la $(BASE_LIBS)
--libntopreport_la_LDFLAGS      = $(AM_LDFLAGS) -release $(VERSION) -export-dynamic @DYN_FLAGS@
-+libntopreport_la_LDFLAGS      = $(AM_LDFLAGS) -release $(VERSION) -export-dynamic -shared @DYN_FLAGS@
- 
- man_MANS = ntop.8
- 
-@@ -367,30 +364,7 @@
- 
- # download the vendor information table
- dnvt:
--	@echo ""
--	@echo ""
--	@echo -n "Preparing "
--	@if test -f oui.txt; then \
--	  rm -rf oui.txt; \
--	fi
--	@if test -f oui.txt.gz.old; then \
--	  rm -rf oui.txt.gz.old; \
--	fi;
--	@mv oui.txt.gz oui.txt.gz.old
--	@echo "(old oui.txt.gz file is now oui.txt.gz.old)"
--	@echo ""
--	@wget -c http://standards.ieee.org/regauth/oui/oui.txt
--	@gzip oui.txt
--	@echo ""
--	@echo ""
--	@echo -n "Old file lines were: "
--	@gunzip -c oui.txt.gz.old | wc -l
--	@echo -n "New file lines are:  "
--	@gunzip -c oui.txt.gz | wc -l
--	@echo ""
--	@echo ""
--	@echo "New file is:"
--	@ls -l oui.txt.gz
-+	@echo "Use included oui.txt.gz"
- 
- # download the Novell SAP Protocol information table
- #dnsapt:
-@@ -398,45 +372,7 @@
- 
- # download the passive ethernet fingerprint database
- dnetter:
--	@echo ""
--	@echo ""
--	@echo "Preparing "
--	@echo ""
--
--	@if test -f $(ETTER_PASSIVE).old; then \
--	  echo "...Deleting prior file, $(ETTER_PASSIVE).old..."; \
--	  rm -rf $(ETTER_PASSIVE).old; \
--	fi;
--	@if test -f $(ETTER_PASSIVE); then \
--	  echo "...Moving current $(ETTER_PASSIVE) to $(ETTER_PASSIVE).old"; \
--	  mv $(ETTER_PASSIVE) $(ETTER_PASSIVE).old; \
--	fi;
--	@for file in $(ETTER_PASSIVE) $(ETTER_PASSIVE).gz \
--		$(ETTER_PASSIVE_FILE) $(ETTER_PASSIVE_FILE).gz; do \
--          if test -f $$file; then \
--	     echo "...Deleting prior file, $$file..."; \
--             rm -rf $$file; \
--          fi; \
--        done
--	@echo ""
--	@echo "...Downloading new file..."
--	@wget -O $(ETTER_PASSIVE_FILE) \
--		$(ETTER_PASSIVE_DOWNLOAD_FROM)/$(ETTER_PASSIVE_FILE)?$(ETTER_PASSIVE_DOWNLOAD_PARMS)
--	@echo ""
--	@echo "gziping downloaded file..."
--	@gzip $(ETTER_PASSIVE_FILE)
--	@echo ""
--	@echo ""
--	@if test -f $(ETTER_PASSIVE).old; then \
--	  echo -n "Old file lines were: "; \
--	  gunzip -c $(ETTER_PASSIVE).old | wc -l; \
--	fi;
--	@echo -n "New file lines are:  "
--	@gunzip -c $(ETTER_PASSIVE) | wc -l
--	@echo ""
--	@echo ""
--	@echo "New file is:"
--	@ls -l $(ETTER_PASSIVE)
-+	@echo "Use included $(ETTER_PASSIVE)"
- 
- # ntop census
- census-fail:
---- a/report.c
-+++ b/report.c
-@@ -2299,7 +2299,7 @@
-   if(fetchPrefsValue("dot.path", buf, sizeof(buf)) != -1) {
-     snprintf(dotPath, sizeof(dotPath), "%s", buf);
-   } else {
--    snprintf(dotPath, sizeof(dotPath), "/usr/local/bin/dot");
-+    snprintf(dotPath, sizeof(dotPath), "/usr/bin/dot");
-     storePrefsValue("dot.path", dotPath); /* Set the default */
-   }
- 
diff --git a/net-analyzer/ntop/files/ntop-5.0.1-includes.patch b/net-analyzer/ntop/files/ntop-5.0.1-includes.patch
deleted file mode 100644
index fcd5f28d3491..000000000000
--- a/net-analyzer/ntop/files/ntop-5.0.1-includes.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/nDPI/src/lib/protocols/netflow.c
-+++ b/nDPI/src/lib/protocols/netflow.c
-@@ -19,6 +19,7 @@
- 
- 
- #include "ipq_utils.h"
-+#include <time.h> /* time() */
- 
- #ifdef NTOP_PROTOCOL_NETFLOW
- 
---- a/nDPI/src/lib/protocols/ssl.c
-+++ b/nDPI/src/lib/protocols/ssl.c
-@@ -22,6 +22,7 @@
- 
- 
- #include "ipq_utils.h"
-+#include <ctype.h> /* isalpha() isdigit() ... */
- 
- #ifdef IPOQUE_PROTOCOL_SSL
- 
diff --git a/net-analyzer/ntop/files/ntop-5.0.1-librrd.patch b/net-analyzer/ntop/files/ntop-5.0.1-librrd.patch
deleted file mode 100644
index db2530c8a5e5..000000000000
--- a/net-analyzer/ntop/files/ntop-5.0.1-librrd.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- a/configure.in
-+++ b/configure.in
-@@ -887,28 +887,6 @@
-    fi
- fi
- 
--RRD_LIB="-L${RRD_HOME}/lib -lrrd_th"
--
--if test -f "$RRD_HOME/lib/librrd_th.so"; then
--   AC_MSG_RESULT(checking for rrdtool... yes)
--else
--  if test -f "$RRD_HOME/lib/librrd_th.dylib"; then # OSX
--     AC_MSG_RESULT(checking for rrdtool... yes)
--  else
--     if test -f "$RRD_HOME/lib/librrd_th.a"; then
--       AC_MSG_RESULT(checking for rrdtool... yes)
--     else
--       AC_CHECK_LIB([rrd_th], [main])
--       if test ".${ac_cv_lib_rrd_th_main}" != ".yes"; then
--         AC_MSG_ERROR(Unable to find RRD at $RRD_HOME: please use --with-rrd-home=DIR);
--	 AC_MSG_ERROR(RRD source can be downloaded from http://www.rrdtool.org/);
--       else
--         RRD_LIB=
--       fi
--     fi
--  fi
--fi
--
- RRD_INC=
- if test -d "${RRD_HOME}/include"; then
-   RRD_INC="-I${RRD_HOME}/include"
diff --git a/net-analyzer/ntop/files/ntop-confd b/net-analyzer/ntop/files/ntop-confd
deleted file mode 100644
index 352a26fa9b1c..000000000000
--- a/net-analyzer/ntop/files/ntop-confd
+++ /dev/null
@@ -1,9 +0,0 @@
-# Config file for /etc/init.d/ntop
-
-# Set preferred options here
-#NTOP_OPTS="--http-server 3000 --https-server 0 --interface eth0"
-
-# suggestions from bug #136983 (use it in case you experience ntop hangs)
-#NTOP_OPTS="u ntop -P /var/lib/ntop --disable-schedyield --http-server 3000 --https-server 3001"
-
-NTOP_OPTS="-u ntop -P /var/lib/ntop"
diff --git a/net-analyzer/ntop/files/ntop-initd b/net-analyzer/ntop/files/ntop-initd
deleted file mode 100644
index ec9afd576f32..000000000000
--- a/net-analyzer/ntop/files/ntop-initd
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	need net
-}
-
-checkconfig() {
-	if [ ! -e /var/lib/ntop/ntop_pw.db ]; then
-		eerror "You need to set a password first by running"
-		eerror "ntop --set-admin-password"
-		return 1
-	fi
-}
-
-start() {
-	checkconfig || return 1
-	ebegin "Starting ntop"
-	export LC_ALL=C # apparently doesn't work with some locales (#191576 and #205382)
-	export GDFONTPATH=/usr/share/fonts/corefonts # apparently the only font that works (#231705)
-	start-stop-daemon --start --exec /usr/bin/ntop -- -d -L ${NTOP_OPTS}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping ntop"
-	start-stop-daemon --stop --retry 30 --pidfile /var/run/ntop.pid
-	eend $?
-}
diff --git a/net-analyzer/ntop/files/ntop-initd-r1 b/net-analyzer/ntop/files/ntop-initd-r1
deleted file mode 100644
index e303753891e6..000000000000
--- a/net-analyzer/ntop/files/ntop-initd-r1
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-description="ntop - a network traffic analyzer"
-pidfile="/run/ntop.pid"
-command="/usr/bin/ntop"
-command_args="-L ${NTOP_OPTS}"
-start_stop_daemon_args="-p ${pidfile} -m -b"
-
-depend() {
-	need net
-}
-
-start_pre() {
-	if [ ! -e /var/lib/ntop/ntop_pw.db ] ; then
-		eerror "You need to set a password first by running"
-		eerror "ntop --set-admin-password"
-		return 1
-	fi
-
-	export LC_ALL=C # apparently doesn't work with some locales (#191576 and #205382)
-	export GDFONTPATH=/usr/share/fonts/corefonts # apparently the only font that works (#231705)
-}
diff --git a/net-analyzer/ntop/files/ntop-update-geoip-db b/net-analyzer/ntop/files/ntop-update-geoip-db
deleted file mode 100644
index 2bf3faaf68cb..000000000000
--- a/net-analyzer/ntop/files/ntop-update-geoip-db
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh
-
-BASE_URL=http://geolite.maxmind.com/download/geoip/database
-
-echo "Updating NTOP GeoIP databases..."
-
-cd /var/lib/ntop || exit
-
-for u in asnum/GeoIPASNum.dat.gz GeoLiteCity.dat.gz ; do
-	FILE_GZ=${u#*/}
-	FILE=${FILE_GZ%.gz}
-	wget -nv -O ${FILE_GZ} ${BASE_URL}/${u} &&
-		gunzip < ${FILE_GZ} > .${FILE} &&
-		mv -f .${FILE} ${FILE} &&
-		rm -f ${FILE_GZ} ||
-		exit
-done
-
-/etc/init.d/ntop --quiet status && /etc/init.d/ntop restart
-
-echo "NTOP GeoIP databases were successfully updated"
diff --git a/net-analyzer/ntop/metadata.xml b/net-analyzer/ntop/metadata.xml
deleted file mode 100644
index 00542da20918..000000000000
--- a/net-analyzer/ntop/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>netmon@gentoo.org</email>
-    <name>Gentoo network monitoring and analysis project</name>
-  </maintainer>
-  <longdescription>ntop is a network traffic probe that shows the network usage,
-  similar to what the popular top Unix command does. ntop is based on libpcap
-  and it has been written in a portable way in order to virtually run on every
-  Unix platform and on Win32 as well.
-  ntop users can use a a web browser (e.g. netscape) to navigate through ntop
-  (that acts as a web server) traffic information and get a dump of the network
-  status. In the latter case, ntop can be seen as a simple RMON-like agent with an
-  embedded web interface.</longdescription>
-  <upstream>
-    <remote-id type="sourceforge">ntop</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/net-analyzer/ntop/ntop-5.0.1-r2.ebuild b/net-analyzer/ntop/ntop-5.0.1-r2.ebuild
deleted file mode 100644
index 8d51b212322b..000000000000
--- a/net-analyzer/ntop/ntop-5.0.1-r2.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools eutils multilib user python-single-r1
-
-DESCRIPTION="Network traffic analyzer with web interface"
-HOMEPAGE="http://www.ntop.org/products/ntop/"
-SRC_URI="mirror://sourceforge/ntop/ntop/Stable/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
-IUSE="snmp ssl"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="
-	dev-lang/lua:=
-	dev-lang/perl
-	dev-libs/geoip
-	dev-libs/libevent
-	media-libs/gd
-	media-libs/libpng:0=
-	net-analyzer/rrdtool[graph]
-	net-libs/libpcap
-	snmp? ( net-analyzer/net-snmp[ipv6] )
-	ssl? ( dev-libs/openssl:0= )
-	sys-libs/gdbm
-	sys-libs/zlib
-	virtual/awk
-	${PYTHON_DEPS}
-"
-DEPEND="
-	${COMMON_DEPEND}
-	>=sys-devel/libtool-1.5.26
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	app-arch/gzip
-	dev-libs/glib:2
-	dev-python/mako
-	media-gfx/graphviz
-	net-misc/wget
-"
-
-pkg_setup() {
-	enewgroup ntop
-	enewuser ntop -1 -1 /var/lib/ntop ntop
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-gentoo.patch \
-		"${FILESDIR}"/${P}-includes.patch \
-		"${FILESDIR}"/${P}-librrd.patch
-
-	cp /usr/share/aclocal/libtool.m4 libtool.m4.in
-	cat acinclude.m4.in libtool.m4.in acinclude.m4.ntop > acinclude.m4
-	eautoreconf
-
-	# The build system is a complete mess, so apply a configure patch here
-	# instead of patching configure.in above
-	epatch "${FILESDIR}"/${P}-INCS.patch
-
-	# Stop make from doing autotools stuff
-	sed -i -e '/missing --run echo/s|=.*|= true|g' Makefile.in || die
-}
-
-src_configure() {
-	export \
-		ac_cv_header_glib_h=no \
-		ac_cv_header_glibconfig_h=no \
-		ac_cv_header_gdome_h=no \
-		ac_cv_lib_glib_g_date_julian=no \
-		ac_cv_lib_xml2_xmlCheckVersion=no \
-		ac_cv_lib_gdome_gdome_di_saveDocToFile=no
-
-	pushd nDPI >/dev/null || die
-	econf
-	popd &>/dev/null || die
-
-	if has_version '<net-analyzer/rrdtool-1.6'; then
-		export RRD_LIB=-lrrd_th
-	else
-		export RRD_LIB=-lrrd
-	fi
-
-	econf \
-		$(use_enable snmp) \
-		$(use_with ssl) \
-		--with-rrd-home=/usr/$(get_libdir)
-}
-
-src_compile() {
-	pushd nDPI >/dev/null || die
-	emake
-	popd &>/dev/null || die
-
-	emake
-}
-
-src_install() {
-	LC_ALL=C # apparently doesn't work with some locales (#191576 and #205382)
-
-	emake DESTDIR="${D}" install
-
-	keepdir /var/lib/ntop
-
-	insinto /var/lib/ntop
-	gunzip 3rd_party/GeoIPASNum.dat.gz
-	gunzip 3rd_party/GeoLiteCity.dat.gz
-	local f
-	for f in GeoIPASNum.dat GeoLiteCity.dat; do
-		# Don't install included GeoIP files if newer versions are available
-		[ -f "${ROOT}/var/lib/ntop/${f}" ] ||
-			doins "3rd_party/${f}"
-	done
-
-	dodoc AUTHORS CONTENTS ChangeLog MANIFESTO NEWS
-	dodoc PORTING README SUPPORT_NTOP.txt THANKS $(find docs -type f)
-
-	newinitd "${FILESDIR}"/ntop-initd-r1 ntop
-	newconfd "${FILESDIR}"/ntop-confd ntop
-
-	exeinto /etc/cron.monthly
-	doexe "${FILESDIR}"/ntop-update-geoip-db
-}
-
-pkg_postinst() {
-	fowners ntop:ntop /var/lib/ntop
-	fperms 750 /var/lib/ntop
-}
diff --git a/net-analyzer/ntop/ntop-5.0.1-r3.ebuild b/net-analyzer/ntop/ntop-5.0.1-r3.ebuild
deleted file mode 100644
index 02987b7d1a68..000000000000
--- a/net-analyzer/ntop/ntop-5.0.1-r3.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools eutils multilib user python-single-r1
-
-DESCRIPTION="Network traffic analyzer with web interface"
-HOMEPAGE="http://www.ntop.org/products/ntop/"
-SRC_URI="mirror://sourceforge/ntop/ntop/Stable/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="libressl snmp ssl"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="
-	dev-lang/lua:=
-	dev-lang/perl
-	dev-libs/geoip
-	dev-libs/libevent
-	media-libs/gd
-	media-libs/libpng:0=
-	net-analyzer/rrdtool[graph]
-	net-libs/libpcap
-	snmp? ( net-analyzer/net-snmp[ipv6] )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	sys-libs/gdbm
-	sys-libs/zlib
-	virtual/awk
-	${PYTHON_DEPS}
-"
-DEPEND="
-	${COMMON_DEPEND}
-	>=sys-devel/libtool-1.5.26
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	app-arch/gzip
-	dev-libs/glib:2
-	dev-python/mako
-	media-gfx/graphviz
-	net-misc/wget
-"
-
-pkg_setup() {
-	enewgroup ntop
-	enewuser ntop -1 -1 /var/lib/ntop ntop
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-gentoo.patch \
-		"${FILESDIR}"/${P}-includes.patch \
-		"${FILESDIR}"/${P}-librrd.patch
-
-	cp /usr/share/aclocal/libtool.m4 libtool.m4.in
-	cat acinclude.m4.in libtool.m4.in acinclude.m4.ntop > acinclude.m4
-	eautoreconf
-
-	# The build system is a complete mess, so apply a configure patch here
-	# instead of patching configure.in above
-	epatch "${FILESDIR}"/${P}-INCS.patch
-
-	# Stop make from doing autotools stuff
-	sed -i -e '/missing --run echo/s|=.*|= true|g' Makefile.in || die
-}
-
-src_configure() {
-	export \
-		ac_cv_header_glib_h=no \
-		ac_cv_header_glibconfig_h=no \
-		ac_cv_header_gdome_h=no \
-		ac_cv_lib_glib_g_date_julian=no \
-		ac_cv_lib_xml2_xmlCheckVersion=no \
-		ac_cv_lib_gdome_gdome_di_saveDocToFile=no
-
-	pushd nDPI >/dev/null || die
-	econf
-	popd &>/dev/null || die
-
-	if has_version '<net-analyzer/rrdtool-1.6'; then
-		export RRD_LIB=-lrrd_th
-	else
-		export RRD_LIB=-lrrd
-	fi
-
-	econf \
-		$(use_enable snmp) \
-		$(use_with ssl) \
-		--with-rrd-home=/usr/$(get_libdir)
-}
-
-src_compile() {
-	pushd nDPI >/dev/null || die
-	emake
-	popd &>/dev/null || die
-
-	emake
-}
-
-src_install() {
-	LC_ALL=C # apparently doesn't work with some locales (#191576 and #205382)
-
-	emake DESTDIR="${D}" install
-
-	keepdir /var/lib/ntop
-
-	insinto /var/lib/ntop
-	gunzip 3rd_party/GeoIPASNum.dat.gz
-	gunzip 3rd_party/GeoLiteCity.dat.gz
-	local f
-	for f in GeoIPASNum.dat GeoLiteCity.dat; do
-		# Don't install included GeoIP files if newer versions are available
-		[ -f "${ROOT}/var/lib/ntop/${f}" ] ||
-			doins "3rd_party/${f}"
-	done
-
-	dodoc AUTHORS CONTENTS ChangeLog MANIFESTO NEWS
-	dodoc PORTING README SUPPORT_NTOP.txt THANKS $(find docs -type f)
-
-	newinitd "${FILESDIR}"/ntop-initd-r1 ntop
-	newconfd "${FILESDIR}"/ntop-confd ntop
-
-	exeinto /etc/cron.monthly
-	doexe "${FILESDIR}"/ntop-update-geoip-db
-}
-
-pkg_postinst() {
-	fowners ntop:ntop /var/lib/ntop
-	fperms 750 /var/lib/ntop
-}
diff --git a/net-analyzer/rrdtool/Manifest b/net-analyzer/rrdtool/Manifest
index 969fa51a7f87..df5a10eeb34a 100644
--- a/net-analyzer/rrdtool/Manifest
+++ b/net-analyzer/rrdtool/Manifest
@@ -16,6 +16,6 @@ DIST rrdtool-1.7.0.tar.gz 2849994 BLAKE2B f7a91fa661728850af55356a69b61ea1d4343c
 EBUILD rrdtool-1.4.8-r1.ebuild 4038 BLAKE2B 3bf893dd39546b26280d36fc3474660ff53cad1b5538e104be1131623466a195b008073cfccd023236d3ab9c1bfee47235663b0991acc42e29d562f5fe24c20c SHA512 264d53646ed3854ce49618dfae1287bee512e8e59aefeb7a8118dbeeb4984a9e15d77fe60d07cf730e91beb5f7c356bfef3fbb4b3dbcb2efe607b709d6202b4f
 EBUILD rrdtool-1.5.5-r1.ebuild 4301 BLAKE2B 049b30a1c6eb88c9629ea98fc951fc66eeeacd14944cf44020236768210e07a29bd552c2707910b292a113b0b47bb1eae9fed0d36f6c0f914c0fd1d5814aa301 SHA512 57199dbdf7eb7a38341e5106191b0e4e0076269c125e1ce76e69c94cc2c2f0e03788d541212d4ae4b05a31b2bb87119003be626b9a585e08038e13f4c13d0fc7
 EBUILD rrdtool-1.5.5.ebuild 4027 BLAKE2B 1b281d9d92463ac5027750e45d673295e914dcc32ed512d19cd9558ddf1a433aba28c918f669dd9a42d61421b44b8d44b0cbdb2110c8e716e401f3b85e57b73b SHA512 6b0346093e6787f76d018c2e8fc52d60b0f8d0e108d17a8f6cc30f91856d69d082a75555861b4c71e1c62c466eb21d2acc38bf029993972bd8b90496debcf28c
-EBUILD rrdtool-1.6.0-r1.ebuild 4253 BLAKE2B d10be0ba8c0132ce56dc4f7361c12d4f55b1678d1ad5ac78f47adb74036b2355a0f92fadf424b24ec41146cfb7c83a5c6152e4794f6c782e645486b9b170f7f5 SHA512 cb7e258b588d4be3097a41f3a256ce4c338bdfb3bb6882ab3f01d01eb3f41ed2de1449b53340646ce52d2564fcb1b8bcfc01a8c45dd57226af5a7ee3fe2835bb
+EBUILD rrdtool-1.6.0-r1.ebuild 4252 BLAKE2B 71ea024eda1113e8aa7c0b682fdc2bc565854e1ee97545ae7e1ab75795f58d623d47684fbb34aa771fc96e02d49885f72d12c119804ec1f8343d5385aa5064bc SHA512 8055b0432db0c7a728e0d5ddc699457d0203464192ffcc8a6fd1c1abe1206856f9f83feaff82995ec4f775d030bb0363a953cb56697a7604b412dbd1e1bb5298
 EBUILD rrdtool-1.7.0.ebuild 4310 BLAKE2B 3084372a08723bf67e31eafad1b38f74a650710a1e5abbbc3c06857d21a9535d5d3d0860d3751ab431e5f09a21917a08e875e383a0ae7613932cda6a23fde083 SHA512 e7813b76116883440c66108b1b15481f7a7a3a665b39f11c3ea719372563b5e983749a9b2b2f8d61cdc808ea37230cc08e250d67a301b4271bc3819bf5d79e7e
 MISC metadata.xml 486 BLAKE2B d4e04c193a7b46a532791a0a448c7db4acaa4b4d4d775db70b6ab843ba32b616c91b516dbaca5b4e0a30649743553325a134291edb0ee17fe2ca049ed1e720ff SHA512 ddca3904aa3e0f1d2f543ae9329298a2dc69bbc0803c568d0871bb5ace21d2dee4d0b226e5eef0258fd59dd2cf046ee807afaa588e31db35e574f3d707894a23
diff --git a/net-analyzer/rrdtool/rrdtool-1.6.0-r1.ebuild b/net-analyzer/rrdtool/rrdtool-1.6.0-r1.ebuild
index 03bd3fbee4e6..9d61df1ee9a9 100644
--- a/net-analyzer/rrdtool/rrdtool-1.6.0-r1.ebuild
+++ b/net-analyzer/rrdtool/rrdtool-1.6.0-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="5"
@@ -15,7 +15,7 @@ SRC_URI="http://oss.oetiker.ch/rrdtool/pub/${P/_/-}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/8.0.0"
-KEYWORDS="alpha ~amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
 IUSE="dbi doc graph lua perl python rados rrdcgi ruby static-libs tcl tcpd"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"