2017-10-22 17:24:28 UTC

16 files changed, 68 insertions, 94 deletions

diff --git a/metadata/md5-cache/app-admin/socklog-2.1.0 b/metadata/md5-cache/app-admin/socklog-2.1.0
index 85618252a1c9..4af7a48151a3 100644
--- a/metadata/md5-cache/app-admin/socklog-2.1.0
+++ b/metadata/md5-cache/app-admin/socklog-2.1.0
@@ -1,6 +1,6 @@
 DEFINED_PHASES=install prepare
 DESCRIPTION=small secure replacement for syslogd with automatic log rotation
-EAPI=3
+EAPI=6
 HOMEPAGE=http://smarden.org/socklog/
 IUSE=static
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
@@ -9,4 +9,4 @@ RDEPEND=>=sys-process/runit-1.4.0
 SLOT=0
 SRC_URI=http://smarden.org/socklog/socklog-2.1.0.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=878a1956515a1d9c8f1c7eebc8ae02c6
+_md5_=e2f5d69a8f23ab15e51b4e3969b12b2e
diff --git a/metadata/md5-cache/dev-util/duma-2.5.15-r2 b/metadata/md5-cache/dev-util/duma-2.5.15-r2
index dcff357fbcc4..0fdc51821b27 100644
--- a/metadata/md5-cache/dev-util/duma-2.5.15-r2
+++ b/metadata/md5-cache/dev-util/duma-2.5.15-r2
@@ -3,9 +3,9 @@ DESCRIPTION=DUMA (Detect Unintended Memory Access) is a memory debugging library
 EAPI=6
 HOMEPAGE=http://duma.sourceforge.net
 IUSE=examples
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=~amd64 ppc ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/duma/duma_2_5_15.tar.gz mirror://gentoo/duma-2.5.15-GNUmakefile.patch.bz2
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=640cf77931d111913d3a9867f1482ef8
+_md5_=d430ae47709a99377f948b7ef132d64f
diff --git a/metadata/md5-cache/media-sound/ncmpcpp-0.8.1 b/metadata/md5-cache/media-sound/ncmpcpp-0.8.1
new file mode 100644
index 000000000000..1e6860cc5de8
--- /dev/null
+++ b/metadata/md5-cache/media-sound/ncmpcpp-0.8.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=!dev-libs/boost:0/1.57.0 >=media-libs/libmpdclient-2.1 dev-libs/boost:=[nls,threads] net-misc/curl sys-libs/ncurses:= sys-libs/readline:* taglib? ( media-libs/taglib ) visualizer? ( sci-libs/fftw:3.0= ) virtual/pkgconfig
+DESCRIPTION=featureful ncurses based MPD client inspired by ncmpc
+EAPI=6
+HOMEPAGE=https://rybczak.net/ncmpcpp/
+IUSE=clock outputs taglib visualizer
+KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!dev-libs/boost:0/1.57.0 >=media-libs/libmpdclient-2.1 dev-libs/boost:=[nls,threads] net-misc/curl sys-libs/ncurses:= sys-libs/readline:* taglib? ( media-libs/taglib ) visualizer? ( sci-libs/fftw:3.0= )
+SLOT=0
+SRC_URI=https://rybczak.net/ncmpcpp/stable/ncmpcpp-0.8.1.tar.bz2
+_md5_=dac259eb97b030753266e30e39282711
diff --git a/metadata/md5-cache/net-analyzer/pmacct-1.5.2 b/metadata/md5-cache/net-analyzer/pmacct-1.5.2
deleted file mode 100644
index 92eebcb29df2..000000000000
--- a/metadata/md5-cache/net-analyzer/pmacct-1.5.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=net-libs/libpcap geoip? ( dev-libs/geoip ) mongodb? ( >=dev-libs/mongo-c-driver-0.8.1-r1 <dev-libs/mongo-c-driver-0.98 ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql:* ) sqlite? ( =dev-db/sqlite-3* ) virtual/pkgconfig
-DESCRIPTION=A network tool to gather IP traffic information
-EAPI=5
-HOMEPAGE=http://www.pmacct.net/
-IUSE=64bit debug geoip ipv6 mongodb mysql postgres sqlite threads ulog
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=net-libs/libpcap geoip? ( dev-libs/geoip ) mongodb? ( >=dev-libs/mongo-c-driver-0.8.1-r1 <dev-libs/mongo-c-driver-0.98 ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql:* ) sqlite? ( =dev-db/sqlite-3* )
-SLOT=0
-SRC_URI=http://www.pmacct.net/pmacct-1.5.2.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=90760b3bc9982d08b3708c396313f682
diff --git a/metadata/md5-cache/net-analyzer/pmacct-1.5.3_pre20150925 b/metadata/md5-cache/net-analyzer/pmacct-1.5.3_pre20150925
deleted file mode 100644
index cc009bc66b85..000000000000
--- a/metadata/md5-cache/net-analyzer/pmacct-1.5.3_pre20150925
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=net-libs/libpcap geoip? ( dev-libs/geoip ) mongodb? ( >=dev-libs/mongo-c-driver-0.8.1-r1 <dev-libs/mongo-c-driver-0.98 ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql:* ) sqlite? ( =dev-db/sqlite-3* ) virtual/pkgconfig
-DESCRIPTION=A network tool to gather IP traffic information
-EAPI=5
-HOMEPAGE=http://www.pmacct.net/
-IUSE=64bit debug geoip ipv6 mongodb mysql postgres sqlite threads ulog
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=net-libs/libpcap geoip? ( dev-libs/geoip ) mongodb? ( >=dev-libs/mongo-c-driver-0.8.1-r1 <dev-libs/mongo-c-driver-0.98 ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql:* ) sqlite? ( =dev-db/sqlite-3* )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~jer/pmacct-1.5.3_pre20150925.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=752bb9ff02254ea4dce186eb4edcc69e
diff --git a/metadata/md5-cache/net-analyzer/pmacct-1.5.3_pre20150925-r1 b/metadata/md5-cache/net-analyzer/pmacct-1.5.3_pre20150925-r1
deleted file mode 100644
index db6ea73190fa..000000000000
--- a/metadata/md5-cache/net-analyzer/pmacct-1.5.3_pre20150925-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=net-libs/libpcap geoip? ( dev-libs/geoip ) geoipv2? ( dev-libs/libmaxminddb ) mongodb? ( >=dev-libs/mongo-c-driver-0.8.1-r1 <dev-libs/mongo-c-driver-0.98 ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql:* ) sqlite? ( =dev-db/sqlite-3* ) virtual/pkgconfig
-DESCRIPTION=A network tool to gather IP traffic information
-EAPI=5
-HOMEPAGE=http://www.pmacct.net/
-IUSE=64bit debug geoip geoipv2 ipv6 mongodb mysql postgres sqlite threads ulog
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=net-libs/libpcap geoip? ( dev-libs/geoip ) geoipv2? ( dev-libs/libmaxminddb ) mongodb? ( >=dev-libs/mongo-c-driver-0.8.1-r1 <dev-libs/mongo-c-driver-0.98 ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql:* ) sqlite? ( =dev-db/sqlite-3* )
-REQUIRED_USE=?? ( geoip geoipv2 )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~jer/pmacct-1.5.3_pre20150925.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=2ed1e8cc3cf20a05e800cdf061ddb0d3
diff --git a/metadata/md5-cache/net-analyzer/pmacct-1.6.0 b/metadata/md5-cache/net-analyzer/pmacct-1.6.0
deleted file mode 100644
index 4f8ef6197ce6..000000000000
--- a/metadata/md5-cache/net-analyzer/pmacct-1.6.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=net-libs/libpcap geoip? ( dev-libs/geoip ) geoipv2? ( dev-libs/libmaxminddb ) mongodb? ( >=dev-libs/mongo-c-driver-0.8.1-r1 <dev-libs/mongo-c-driver-0.98 ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql:* ) sqlite? ( =dev-db/sqlite-3* ) virtual/pkgconfig
-DESCRIPTION=A network tool to gather IP traffic information
-EAPI=6
-HOMEPAGE=http://www.pmacct.net/
-IUSE=64bit debug geoip geoipv2 ipv6 mongodb mysql postgres sqlite threads
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=net-libs/libpcap geoip? ( dev-libs/geoip ) geoipv2? ( dev-libs/libmaxminddb ) mongodb? ( >=dev-libs/mongo-c-driver-0.8.1-r1 <dev-libs/mongo-c-driver-0.98 ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql:* ) sqlite? ( =dev-db/sqlite-3* )
-REQUIRED_USE=?? ( geoip geoipv2 )
-SLOT=0
-SRC_URI=http://www.pmacct.net/pmacct-1.6.0.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=779723c8a219103fe2d15f91d9f801c2
diff --git a/metadata/md5-cache/net-analyzer/pmacct-1.6.1 b/metadata/md5-cache/net-analyzer/pmacct-1.6.1
deleted file mode 100644
index eeb7b075f7d4..000000000000
--- a/metadata/md5-cache/net-analyzer/pmacct-1.6.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=net-libs/libpcap geoip? ( dev-libs/geoip ) geoipv2? ( dev-libs/libmaxminddb ) mongodb? ( >=dev-libs/mongo-c-driver-0.8.1-r1 <dev-libs/mongo-c-driver-0.98 ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql:* ) sqlite? ( =dev-db/sqlite-3* ) virtual/pkgconfig
-DESCRIPTION=A network tool to gather IP traffic information
-EAPI=6
-HOMEPAGE=http://www.pmacct.net/
-IUSE=64bit debug geoip geoipv2 ipv6 mongodb mysql postgres sqlite threads
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=net-libs/libpcap geoip? ( dev-libs/geoip ) geoipv2? ( dev-libs/libmaxminddb ) mongodb? ( >=dev-libs/mongo-c-driver-0.8.1-r1 <dev-libs/mongo-c-driver-0.98 ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql:* ) sqlite? ( =dev-db/sqlite-3* )
-REQUIRED_USE=?? ( geoip geoipv2 )
-SLOT=0
-SRC_URI=http://www.pmacct.net/pmacct-1.6.1.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=779723c8a219103fe2d15f91d9f801c2
diff --git a/metadata/md5-cache/net-analyzer/pmacct-1.6.2 b/metadata/md5-cache/net-analyzer/pmacct-1.6.2
index 0ce86d6e8e58..a54ebee19291 100644
--- a/metadata/md5-cache/net-analyzer/pmacct-1.6.2
+++ b/metadata/md5-cache/net-analyzer/pmacct-1.6.2
@@ -4,11 +4,11 @@ DESCRIPTION=A network tool to gather IP traffic information
 EAPI=6
 HOMEPAGE=http://www.pmacct.net/
 IUSE=64bit debug geoip geoipv2 ipv6 jansson kafka mongodb mysql nflog postgres rabbitmq sqlite threads
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2
 RDEPEND=net-libs/libpcap geoip? ( dev-libs/geoip ) geoipv2? ( dev-libs/libmaxminddb ) jansson? ( dev-libs/jansson ) kafka? ( dev-libs/librdkafka ) mongodb? ( >=dev-libs/mongo-c-driver-0.8.1-r1 <dev-libs/mongo-c-driver-0.98 ) mysql? ( virtual/mysql ) nflog? ( net-libs/libnetfilter_log ) postgres? ( dev-db/postgresql:* ) rabbitmq? ( net-libs/rabbitmq-c ) sqlite? ( =dev-db/sqlite-3* )
 REQUIRED_USE=?? ( geoip geoipv2 ) kafka? ( jansson ) rabbitmq? ( jansson )
 SLOT=0
 SRC_URI=http://www.pmacct.net/pmacct-1.6.2.tar.gz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=422e82e8bf0c747212524dc1dd83813d
+_md5_=d10a74aeb60c907c1db62daa8990cdab
diff --git a/metadata/md5-cache/net-analyzer/pmacct-1.6.1-r1 b/metadata/md5-cache/net-analyzer/pmacct-1.7.0
index 01cd473cc8ac..f39494bb0384 100644
--- a/metadata/md5-cache/net-analyzer/pmacct-1.6.1-r1
+++ b/metadata/md5-cache/net-analyzer/pmacct-1.7.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=configure install
-DEPEND=net-libs/libpcap geoip? ( dev-libs/geoip ) geoipv2? ( dev-libs/libmaxminddb ) jansson? ( dev-libs/jansson ) kafka? ( dev-libs/librdkafka ) mongodb? ( >=dev-libs/mongo-c-driver-0.8.1-r1 <dev-libs/mongo-c-driver-0.98 ) mysql? ( virtual/mysql ) nflog? ( net-libs/libnetfilter_log ) postgres? ( dev-db/postgresql:* ) rabbitmq? ( net-libs/rabbitmq-c ) sqlite? ( =dev-db/sqlite-3* ) virtual/pkgconfig
+DEPEND=net-libs/libpcap geoip? ( dev-libs/geoip ) geoipv2? ( dev-libs/libmaxminddb ) jansson? ( dev-libs/jansson ) kafka? ( dev-libs/librdkafka ) mongodb? ( >=dev-libs/mongo-c-driver-0.8.1-r1 <dev-libs/mongo-c-driver-0.98 ) mysql? ( virtual/mysql ) ndpi? ( net-libs/nDPI ) nflog? ( net-libs/libnetfilter_log ) postgres? ( dev-db/postgresql:* ) rabbitmq? ( net-libs/rabbitmq-c ) sqlite? ( =dev-db/sqlite-3* ) zmq? ( >=net-libs/zeromq-4.2.0:= ) virtual/pkgconfig
 DESCRIPTION=A network tool to gather IP traffic information
 EAPI=6
 HOMEPAGE=http://www.pmacct.net/
-IUSE=64bit debug geoip geoipv2 ipv6 jansson kafka mongodb mysql nflog postgres rabbitmq sqlite threads
-KEYWORDS=~amd64 ~ppc ~x86
+IUSE=64bit debug geoip geoipv2 ipv6 jansson kafka mongodb mysql ndpi nflog postgres rabbitmq sqlite threads zmq
+KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=net-libs/libpcap geoip? ( dev-libs/geoip ) geoipv2? ( dev-libs/libmaxminddb ) jansson? ( dev-libs/jansson ) kafka? ( dev-libs/librdkafka ) mongodb? ( >=dev-libs/mongo-c-driver-0.8.1-r1 <dev-libs/mongo-c-driver-0.98 ) mysql? ( virtual/mysql ) nflog? ( net-libs/libnetfilter_log ) postgres? ( dev-db/postgresql:* ) rabbitmq? ( net-libs/rabbitmq-c ) sqlite? ( =dev-db/sqlite-3* )
+RDEPEND=net-libs/libpcap geoip? ( dev-libs/geoip ) geoipv2? ( dev-libs/libmaxminddb ) jansson? ( dev-libs/jansson ) kafka? ( dev-libs/librdkafka ) mongodb? ( >=dev-libs/mongo-c-driver-0.8.1-r1 <dev-libs/mongo-c-driver-0.98 ) mysql? ( virtual/mysql ) ndpi? ( net-libs/nDPI ) nflog? ( net-libs/libnetfilter_log ) postgres? ( dev-db/postgresql:* ) rabbitmq? ( net-libs/rabbitmq-c ) sqlite? ( =dev-db/sqlite-3* ) zmq? ( >=net-libs/zeromq-4.2.0:= )
 REQUIRED_USE=?? ( geoip geoipv2 ) kafka? ( jansson ) rabbitmq? ( jansson )
 SLOT=0
-SRC_URI=http://www.pmacct.net/pmacct-1.6.1.tar.gz
+SRC_URI=http://www.pmacct.net/pmacct-1.7.0.tar.gz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=d10a74aeb60c907c1db62daa8990cdab
+_md5_=b4d648dbfef79ef0e3684e7030316c3b
diff --git a/metadata/md5-cache/net-im/corebird-1.6 b/metadata/md5-cache/net-im/corebird-1.6
new file mode 100644
index 000000000000..35d2820f24c0
--- /dev/null
+++ b/metadata/md5-cache/net-im/corebird-1.6
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=dev-db/sqlite:3 >=dev-libs/glib-2.44:2 dev-libs/json-glib gstreamer? ( >=media-libs/gst-plugins-bad-1.6:1.0[X,gtk] media-libs/gst-plugins-base:1.0[X] media-libs/gst-plugins-good:1.0 media-plugins/gst-plugins-hls:1.0 media-plugins/gst-plugins-libav:1.0 media-plugins/gst-plugins-meta:1.0[X] media-plugins/gst-plugins-soup:1.0 ) spellcheck? ( >=app-text/gspell-1.0[vala] ) >=net-libs/libsoup-2.42.3.1 >=net-libs/rest-0.7.91:0.7 >=x11-libs/gtk+-3.20:3 || ( dev-lang/vala:0.36 dev-lang/vala:0.34 ) >=dev-util/intltool-0.40 sys-apps/sed virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Native GTK+3 Twitter client
+EAPI=6
+HOMEPAGE=http://corebird.baedert.org/
+IUSE=debug gstreamer spellcheck test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-db/sqlite:3 >=dev-libs/glib-2.44:2 dev-libs/json-glib gstreamer? ( >=media-libs/gst-plugins-bad-1.6:1.0[X,gtk] media-libs/gst-plugins-base:1.0[X] media-libs/gst-plugins-good:1.0 media-plugins/gst-plugins-hls:1.0 media-plugins/gst-plugins-libav:1.0 media-plugins/gst-plugins-meta:1.0[X] media-plugins/gst-plugins-soup:1.0 ) spellcheck? ( >=app-text/gspell-1.0[vala] ) >=net-libs/libsoup-2.42.3.1 >=net-libs/rest-0.7.91:0.7 >=x11-libs/gtk+-3.20:3
+SLOT=0
+SRC_URI=https://github.com/baedert/corebird/archive/1.6.tar.gz -> corebird-1.6.tar.gz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	vala	103e6885c83965507391cdc5b6fa0e67	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=d3860b8b8972112d1dba03ac774b41fb
diff --git a/metadata/md5-cache/net-libs/nDPI-2.0 b/metadata/md5-cache/net-libs/nDPI-2.0
index 2307ef95b686..504dccfa8769 100644
--- a/metadata/md5-cache/net-libs/nDPI-2.0
+++ b/metadata/md5-cache/net-libs/nDPI-2.0
@@ -1,12 +1,13 @@
-DEFINED_PHASES=prepare
+DEFINED_PHASES=install prepare
 DEPEND=dev-libs/json-c net-libs/libpcap >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Open Source Deep Packet Inspection Software Toolkit
 EAPI=6
 HOMEPAGE=http://www.ntop.org/
+IUSE=static-libs
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=dev-libs/json-c net-libs/libpcap
 SLOT=0
 SRC_URI=https://github.com/ntop/nDPI/archive/2.0.tar.gz -> nDPI-2.0.tar.gz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=a4b2f3bda72600ebe94b8c77328587dd
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=a88a0b54d4d56e23e9a8bbbac6af3e72
diff --git a/metadata/md5-cache/x11-misc/zim-0.67 b/metadata/md5-cache/x11-misc/zim-0.67
new file mode 100644
index 000000000000..fa300fdc5e00
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/zim-0.67
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/pygobject:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] x11-misc/xdg-utils test? ( dev-vcs/bzr dev-vcs/git dev-vcs/mercurial ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=A desktop wiki
+EAPI=6
+HOMEPAGE=http://zim-wiki.org/
+IUSE=test python_targets_python2_7 test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD GPL-2+
+RDEPEND=dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/pygobject:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)]
+REQUIRED_USE=python_targets_python2_7
+SLOT=0
+SRC_URI=http://zim-wiki.org/downloads/zim-0.67.tar.gz
+_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=33fbbb7fb984a12143a92e37d3ca8475
diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index
index e1482609f44b..9d4fd19a4b51 100644
--- a/metadata/pkg_desc_index
+++ b/metadata/pkg_desc_index
@@ -13883,7 +13883,7 @@ media-sound/musescore 2.0.2-r1 2.0.3 2.1.0 9999: WYSIWYG Music Score Typesetter
 media-sound/music-file-organizer 1.0.1: Organizes audio files into directories based on metadata tags, along with other metadata utilities.
 media-sound/musique 1.5: Qt music player
 media-sound/ncmpc 0.24 0.24-r2 0.25 0.27: A ncurses client for the Music Player Daemon (MPD)
-media-sound/ncmpcpp 0.7.7 0.8 9999: featureful ncurses based MPD client inspired by ncmpc
+media-sound/ncmpcpp 0.7.7 0.8 0.8.1 9999: featureful ncurses based MPD client inspired by ncmpc
 media-sound/neroaac 1.5.1: Nero AAC reference quality MPEG-4 and 3GPP audio codec
 media-sound/neutrino 0.8.4: A GNOME application to manage Creative music players using the PDE protocol
 media-sound/normalize 0.7.7-r1: Audio file volume normalizer
@@ -14456,7 +14456,7 @@ net-analyzer/pbnj 2.04: A tool for running Nmap scans and diff'ing the results
 net-analyzer/pchar 1.5-r1: Internet bandwidth, latency, and loss of links analyzer
 net-analyzer/pinger 0.32e 0.33: Cyclic multi ping utility for selected adresses using GTK/ncurses
 net-analyzer/pktstat 1.8.5-r1: A network monitoring tool with bandwidth tracking
-net-analyzer/pmacct 1.5.1 1.5.2 1.5.3_pre20150925 1.5.3_pre20150925-r1 1.6.0 1.6.1 1.6.1-r1 1.6.2: A network tool to gather IP traffic information
+net-analyzer/pmacct 1.5.1 1.6.2 1.7.0: A network tool to gather IP traffic information
 net-analyzer/pnp4nagios 0.6.24 0.6.25 0.6.25-r1 0.6.25-r2 0.6.25-r3: A performance data analyzer for nagios
 net-analyzer/poink 2.03: TCP/IP-based ping implementation
 net-analyzer/portmon 2.0: Portmon is a network service monitoring daemon
@@ -14743,7 +14743,7 @@ net-im/centerim 4.22.10 4.22.10-r1 5.0.0_beta2: CenterIM is a ncurses ICQ/Yahoo!
 net-im/choqok 1.6.0: Free/Open Source micro-blogging client by KDE
 net-im/climm 0.7.1: ICQ text-mode client with many features
 net-im/coccinella 0.96.20: Jabber Client With a Built-in Whiteboard and VoIP (jingle)
-net-im/corebird 0.8 1.0 1.1 1.5-r2 1.5.1: Native GTK+3 Twitter client
+net-im/corebird 0.8 1.0 1.1 1.5-r2 1.5.1 1.6: Native GTK+3 Twitter client
 net-im/coturn 4.5.0.4-r1 4.5.0.6 9999: coturn TURN server project
 net-im/cpop 0.0.4-r1: GTK+ network popup message client. Compatible with the jpop protocol
 net-im/dianara 1.3.7: Qt-based client for the pump.io distributed social network
@@ -19112,7 +19112,7 @@ x11-misc/xwit 3.4_p15: A collection of simple routines to call some of those X11
 x11-misc/xwrits 2.26-r1: Reminds you to take wrist breaks to help you prevent repetitive stress injury
 x11-misc/xxkb 1.11.1: eXtended XKB - assign different keymaps to different windows
 x11-misc/xystray 1.0: A simple implementation of freedesktop.org notification area for X
-x11-misc/zim 0.65 0.66: A desktop wiki
+x11-misc/zim 0.65 0.66 0.67: A desktop wiki
 x11-plugins/allin1 0.5.0 0.5.0-r2: All in one monitoring dockapp: RAM, CPU, Net, Power, df, seti
 x11-plugins/asapm 3.1-r1: APM monitor for AfterStep
 x11-plugins/asclock 2.0.12-r1: Clock applet for AfterStep
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index cb00ef86e0b1..38a4d13bf7e4 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Sun, 22 Oct 2017 17:11:58 +0000
+Sun, 22 Oct 2017 17:24:29 +0000
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 2dc281e944fa..56907f20b6e9 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -5264,13 +5264,15 @@ net-analyzer/pchar:pcap - Use the net-libs/libpcap library
 net-analyzer/pinger:gtk2 - Install the gtkpinger GUI utility based on x11-libs/gtk+:2
 net-analyzer/pinger:gtk3 - Install the gtkpinger GUI utility based on x11-libs/gtk+:3
 net-analyzer/pmacct:64bit - Use 64bit counters instead of 32bit ones
-net-analyzer/pmacct:geoipv2 - Add support for GeoIP2 through dev-libs/libmaxminddb
-net-analyzer/pmacct:jansson - Add support for JSON through dev-libs/jansson
-net-analyzer/pmacct:kafka - Add support for Apache Kafka through dev-libs/librdkafka
-net-analyzer/pmacct:mongodb - Add support for mongodb backend
-net-analyzer/pmacct:nflog - Add support for NFLOG through uacctd
-net-analyzer/pmacct:rabbitmq - Add support for RabbitMQ through net-libs/rabbitmq-c
+net-analyzer/pmacct:geoipv2 - Enable support for GeoIP2 through dev-libs/libmaxminddb
+net-analyzer/pmacct:jansson - Enable support for JSON through dev-libs/jansson
+net-analyzer/pmacct:kafka - Enable support for Apache Kafka through dev-libs/librdkafka
+net-analyzer/pmacct:mongodb - Enable support for MongoDB through dev-libs/mongo-c-driver
+net-analyzer/pmacct:ndpi - Enable support for nDPI through net-libs/nDPI
+net-analyzer/pmacct:nflog - Enable support for NFLOG through uacctd
+net-analyzer/pmacct:rabbitmq - Enable support for RabbitMQ through net-libs/rabbitmq-c
 net-analyzer/pmacct:ulog - Enable support for ULOG in older kernels (deprecated)
+net-analyzer/pmacct:zmq - Enable support for ZeroMQ through net-libs/zeromq
 net-analyzer/prelude-lml:tls - Enables Prelude LML support Syslog through TLS using net-libs/gnutls.
 net-analyzer/rrdcollect:exec - Enable exec:/// support
 net-analyzer/rrdcollect:librrd - Use the librrd library from net-analyzer/rrdtool