2018-01-03 19:10:08 UTC

36 files changed, 110 insertions, 161 deletions

diff --git a/metadata/md5-cache/app-misc/ondir-0.2.2-r1 b/metadata/md5-cache/app-misc/ondir-0.2.2-r1
deleted file mode 100644
index a0ae9c895feb..000000000000
--- a/metadata/md5-cache/app-misc/ondir-0.2.2-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=sys-apps/sed
-DESCRIPTION=Automatically execute scripts as you traverse directories
-EAPI=3
-HOMEPAGE=http://swapoff.org/OnDir
-KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://swapoff.org/files/ondir/ondir-0.2.2.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=d89f798fbd89a674d79387fca31f9be7
diff --git a/metadata/md5-cache/app-misc/splitvt-1.6.6-r2 b/metadata/md5-cache/app-misc/splitvt-1.6.6-r2
deleted file mode 100644
index 5e87661ce527..000000000000
--- a/metadata/md5-cache/app-misc/splitvt-1.6.6-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=sys-libs/ncurses-5.2
-DESCRIPTION=Splitting terminals into two shells
-EAPI=3
-HOMEPAGE=http://www.devolution.com/~slouken/projects/splitvt
-KEYWORDS=amd64 ia64 ppc sparc x86
-LICENSE=GPL-2
-RDEPEND=>=sys-libs/ncurses-5.2
-SLOT=0
-SRC_URI=http://www.devolution.com/~slouken/projects/splitvt/splitvt-1.6.6.tar.gz mirror://debian/pool/main/s/splitvt/splitvt_1.6.6-7.diff.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=225593ea077248cbbca5e546800901c8
diff --git a/metadata/md5-cache/app-misc/splitvt-1.6.6-r3 b/metadata/md5-cache/app-misc/splitvt-1.6.6-r3
index f47ad365e892..427a1ff3462e 100644
--- a/metadata/md5-cache/app-misc/splitvt-1.6.6-r3
+++ b/metadata/md5-cache/app-misc/splitvt-1.6.6-r3
@@ -3,10 +3,10 @@ DEPEND=sys-libs/ncurses:0=
 DESCRIPTION=Splitting terminals into two shells
 EAPI=6
 HOMEPAGE=http://www.devolution.com/~slouken/projects/splitvt
-KEYWORDS=~amd64 ~ia64 ~ppc ~sparc ~x86
+KEYWORDS=amd64 ia64 ppc sparc x86
 LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses:0=
 SLOT=0
 SRC_URI=http://www.devolution.com/~slouken/projects/splitvt/splitvt-1.6.6.tar.gz mirror://debian/pool/main/s/splitvt/splitvt_1.6.6-7.diff.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=3c8e7f5f953d271cf19a225776622a4c
+_md5_=0cbcc5f2fc6227512750da458426418c
diff --git a/metadata/md5-cache/dev-python/elasticsearch-py-6.0.0 b/metadata/md5-cache/dev-python/elasticsearch-py-6.0.0
index 5be72cc1ea80..63d922a2a36a 100644
--- a/metadata/md5-cache/dev-python/elasticsearch-py-6.0.0
+++ b/metadata/md5-cache/dev-python/elasticsearch-py-6.0.0
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/elasticsearch/elasticsearch-py/archive/6.0.0.tar.gz -> elasticsearch-py-6.0.0.tar.gz test? ( https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-6.0.0.tar.gz )
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=8817129055a3e54ecd1c16cd4e99481b
+_md5_=eb3d193dfc55c81c6b2149b27cfce819
diff --git a/metadata/md5-cache/gnustep-apps/preview-0.9 b/metadata/md5-cache/gnustep-apps/preview-0.9
index c2d6c17fad5d..26bff1d2dcd1 100644
--- a/metadata/md5-cache/gnustep-apps/preview-0.9
+++ b/metadata/md5-cache/gnustep-apps/preview-0.9
@@ -1,7 +1,7 @@
 DEFINED_PHASES=compile configure install postinst prepare setup
 DEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
 DESCRIPTION=Simple image viewer
-EAPI=3
+EAPI=6
 HOMEPAGE=http://www.sonappart.net/softwares/preview/
 IUSE=debug doc
 KEYWORDS=amd64 ~ppc x86
@@ -10,4 +10,4 @@ RDEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-deve
 SLOT=0
 SRC_URI=http://www.sonappart.net/softwares/preview/download/Preview-0.9.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnustep-2	08755606aae625944316a7bd6d8228f5	gnustep-base	7a6c767d10a6758f97c305691b7d7a2a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=51af78618ab375d9a692b832547e9291
+_md5_=bac9d106cc824736922afe489d522dd0
diff --git a/metadata/md5-cache/gnustep-libs/gsldap-0.0.1_pre20070219 b/metadata/md5-cache/gnustep-libs/gsldap-0.0.1_pre20070219
index 22b9a483cd16..30318000bd70 100644
--- a/metadata/md5-cache/gnustep-libs/gsldap-0.0.1_pre20070219
+++ b/metadata/md5-cache/gnustep-libs/gsldap-0.0.1_pre20070219
@@ -1,7 +1,7 @@
 DEFINED_PHASES=compile configure install postinst prepare setup
 DEPEND=net-nds/openldap >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
 DESCRIPTION=GNUstep LDAP library for open ldap C libraries
-EAPI=3
+EAPI=6
 HOMEPAGE=http://www.gnustep.org/
 IUSE=debug doc
 KEYWORDS=~amd64 ~x86
@@ -10,4 +10,4 @@ RDEPEND=net-nds/openldap >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back de
 SLOT=0
 SRC_URI=mirror://gentoo/gsldap-0.0.1_pre20070219.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnustep-2	08755606aae625944316a7bd6d8228f5	gnustep-base	7a6c767d10a6758f97c305691b7d7a2a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=8662b14ba4b2fc4aaa30030fdc5a9da6
+_md5_=80d64d8631cbe7f4a514364fb1128eba
diff --git a/metadata/md5-cache/media-gfx/replicatorg-37-r2 b/metadata/md5-cache/media-gfx/replicatorg-37-r2
index 684279e3f52b..f932b9871828 100644
--- a/metadata/md5-cache/media-gfx/replicatorg-37-r2
+++ b/metadata/md5-cache/media-gfx/replicatorg-37-r2
@@ -1,12 +1,12 @@
 DEFINED_PHASES=install postinst setup
-DEPEND=dev-java/oracle-jre-bin
+DEPEND=dev-java/oracle-jre-bin:*
 DESCRIPTION=ReplicatorG is a simple, open source 3D printing program
-EAPI=3
+EAPI=6
 HOMEPAGE=http://replicat.org/start https://github.com/makerbot/ReplicatorG
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=dev-java/oracle-jre-bin
+RDEPEND=dev-java/oracle-jre-bin:*
 SLOT=0
 SRC_URI=https://replicatorg.googlecode.com/files/replicatorg-0037-linux.tgz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=2c5dfdc6cd45183a45991e960ba9c18d
+_md5_=11fe86e230b140fc7f2d738da753d418
diff --git a/metadata/md5-cache/media-gfx/replicatorg-40-r1 b/metadata/md5-cache/media-gfx/replicatorg-40-r1
index 718ef0ff94ea..2ff6d05cf158 100644
--- a/metadata/md5-cache/media-gfx/replicatorg-40-r1
+++ b/metadata/md5-cache/media-gfx/replicatorg-40-r1
@@ -1,11 +1,11 @@
 DEFINED_PHASES=install postinst setup
-DEPEND=dev-java/oracle-jre-bin
+DEPEND=dev-java/oracle-jre-bin:*
 DESCRIPTION=ReplicatorG is a simple, open source 3D printing program
-EAPI=3
+EAPI=6
 HOMEPAGE=http://replicat.org/start https://github.com/makerbot/ReplicatorG
 LICENSE=GPL-2
-RDEPEND=dev-java/oracle-jre-bin
+RDEPEND=dev-java/oracle-jre-bin:*
 SLOT=0
 SRC_URI=https://replicatorg.googlecode.com/files/replicatorg-0040-linux.tgz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=9e829ae6b35d88b357c91b4bea58661f
+_md5_=90d7df6ed7fe8a0524af5260f0712e1c
diff --git a/metadata/md5-cache/media-plugins/gmpc-discogs-0.20.0 b/metadata/md5-cache/media-plugins/gmpc-discogs-0.20.0
index 8e6b84cb3e0e..b195353daeee 100644
--- a/metadata/md5-cache/media-plugins/gmpc-discogs-0.20.0
+++ b/metadata/md5-cache/media-plugins/gmpc-discogs-0.20.0
@@ -1,11 +1,11 @@
 DEFINED_PHASES=install
-DEPEND=>=media-sound/gmpc-0.20.0 dev-libs/libxml2 || ( x11-libs/gdk-pixbuf:2[jpeg] x11-libs/gtk+:2[jpeg] ) virtual/pkgconfig
+DEPEND=>=media-sound/gmpc-0.20.0 dev-libs/libxml2:= || ( x11-libs/gdk-pixbuf:2[jpeg] x11-libs/gtk+:2[jpeg] ) virtual/pkgconfig
 DESCRIPTION=This plugin fetches artist and album images from discogs
-EAPI=3
+EAPI=6
 HOMEPAGE=http://gmpc.wikia.com/wiki/GMPC_PLUGIN_DISCOGS
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
-RDEPEND=>=media-sound/gmpc-0.20.0 dev-libs/libxml2 || ( x11-libs/gdk-pixbuf:2[jpeg] x11-libs/gtk+:2[jpeg] )
+RDEPEND=>=media-sound/gmpc-0.20.0 dev-libs/libxml2:= || ( x11-libs/gdk-pixbuf:2[jpeg] x11-libs/gtk+:2[jpeg] )
 SLOT=0
 SRC_URI=mirror://sourceforge/musicpd/gmpc-discogs-0.20.0.tar.gz
-_md5_=d4c0bdd9a578aac9623f6f8711f6c979
+_md5_=4ba03897fcf6586a685e2db98d3ff450
diff --git a/metadata/md5-cache/media-plugins/gmpc-extraplaylist-0.20.0 b/metadata/md5-cache/media-plugins/gmpc-extraplaylist-0.20.0
index 31b18dfe13c4..19cd100d1682 100644
--- a/metadata/md5-cache/media-plugins/gmpc-extraplaylist-0.20.0
+++ b/metadata/md5-cache/media-plugins/gmpc-extraplaylist-0.20.0
@@ -1,11 +1,11 @@
 DEFINED_PHASES=install
-DEPEND=>=media-sound/gmpc-0.20.0 dev-libs/libxml2 virtual/pkgconfig
+DEPEND=>=media-sound/gmpc-0.20.0 dev-libs/libxml2:= virtual/pkgconfig
 DESCRIPTION=This plugin adds a second pane showing the playlist
-EAPI=3
+EAPI=6
 HOMEPAGE=http://gmpc.wikia.com/wiki/GMPC_PLUGIN_EXTRA_PLAYLIST
 KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
-RDEPEND=>=media-sound/gmpc-0.20.0 dev-libs/libxml2
+RDEPEND=>=media-sound/gmpc-0.20.0 dev-libs/libxml2:=
 SLOT=0
 SRC_URI=mirror://sourceforge/musicpd/gmpc-extraplaylist-0.20.0.tar.gz
-_md5_=a6044c0c4c34e2d48761df6e91a7acc5
+_md5_=6faeb5b28b089816e0de9795023fd41b
diff --git a/metadata/md5-cache/media-plugins/gmpc-last-fm-0.20.0 b/metadata/md5-cache/media-plugins/gmpc-last-fm-0.20.0
index 19d03b6a6282..5e97bb76e5a5 100644
--- a/metadata/md5-cache/media-plugins/gmpc-last-fm-0.20.0
+++ b/metadata/md5-cache/media-plugins/gmpc-last-fm-0.20.0
@@ -1,11 +1,11 @@
 DEFINED_PHASES=install
-DEPEND=>=media-sound/gmpc-0.20.0 dev-libs/libxml2 || ( x11-libs/gdk-pixbuf:2[jpeg] x11-libs/gtk+:2[jpeg] ) virtual/pkgconfig
+DEPEND=>=media-sound/gmpc-0.20.0 dev-libs/libxml2:= || ( x11-libs/gdk-pixbuf:2[jpeg] x11-libs/gtk+:2[jpeg] ) virtual/pkgconfig
 DESCRIPTION=This plugin fetches artist art from last.fm
-EAPI=3
+EAPI=6
 HOMEPAGE=http://gmpc.wikia.com/wiki/GMPC_PLUGIN_LASTFM
 KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
-RDEPEND=>=media-sound/gmpc-0.20.0 dev-libs/libxml2 || ( x11-libs/gdk-pixbuf:2[jpeg] x11-libs/gtk+:2[jpeg] )
+RDEPEND=>=media-sound/gmpc-0.20.0 dev-libs/libxml2:= || ( x11-libs/gdk-pixbuf:2[jpeg] x11-libs/gtk+:2[jpeg] )
 SLOT=0
 SRC_URI=mirror://sourceforge/musicpd/gmpc-last-fm-0.20.0.tar.gz
-_md5_=a33bd44e285f6816d0811a1adc5151d7
+_md5_=8edd9fba15fa87313de002a10046e880
diff --git a/metadata/md5-cache/media-plugins/gmpc-mdcover-0.20.0 b/metadata/md5-cache/media-plugins/gmpc-mdcover-0.20.0
index 9ff2d4537f11..4ad8a7a064f2 100644
--- a/metadata/md5-cache/media-plugins/gmpc-mdcover-0.20.0
+++ b/metadata/md5-cache/media-plugins/gmpc-mdcover-0.20.0
@@ -1,12 +1,12 @@
 DEFINED_PHASES=configure install
-DEPEND=>=media-sound/gmpc-0.20.0 dev-libs/libxml2 || ( x11-libs/gdk-pixbuf:2[jpeg] x11-libs/gtk+:2[jpeg] ) virtual/pkgconfig nls? ( dev-util/intltool sys-devel/gettext )
-DESCRIPTION=This plugin fetches cover art, artist art, album and artist information from the file system
-EAPI=3
+DEPEND=>=media-sound/gmpc-0.20.0 dev-libs/libxml2:= || ( x11-libs/gdk-pixbuf:2[jpeg] x11-libs/gtk+:2[jpeg] ) virtual/pkgconfig nls? ( dev-util/intltool sys-devel/gettext )
+DESCRIPTION=Plugin for fetching cover art, artist art, album and artist information
+EAPI=6
 HOMEPAGE=http://gmpc.wikia.com/wiki/GMPC_PLUGIN_MDCOVER
 IUSE=nls
 KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
-RDEPEND=>=media-sound/gmpc-0.20.0 dev-libs/libxml2 || ( x11-libs/gdk-pixbuf:2[jpeg] x11-libs/gtk+:2[jpeg] )
+RDEPEND=>=media-sound/gmpc-0.20.0 dev-libs/libxml2:= || ( x11-libs/gdk-pixbuf:2[jpeg] x11-libs/gtk+:2[jpeg] )
 SLOT=0
 SRC_URI=mirror://sourceforge/musicpd/gmpc-mdcover-0.20.0.tar.gz
-_md5_=7115be4d9af3f5948d91341abc909d1a
+_md5_=518b2a24de40569d48454842e7dce2b8
diff --git a/metadata/md5-cache/media-plugins/gmpc-playlistsort-0.20.0 b/metadata/md5-cache/media-plugins/gmpc-playlistsort-0.20.0
index bc9eae59492a..65c9eb53d4d7 100644
--- a/metadata/md5-cache/media-plugins/gmpc-playlistsort-0.20.0
+++ b/metadata/md5-cache/media-plugins/gmpc-playlistsort-0.20.0
@@ -1,11 +1,11 @@
-DEFINED_PHASES=configure install
-DEPEND=>=media-sound/gmpc-0.20.0 >=gnome-base/libglade-2 dev-libs/libxml2 virtual/pkgconfig
+DEFINED_PHASES=install
+DEPEND=>=media-sound/gmpc-0.20.0 >=gnome-base/libglade-2 dev-libs/libxml2:= virtual/pkgconfig
 DESCRIPTION=This plugin adds a dialog to sort the current playlist
-EAPI=3
+EAPI=6
 HOMEPAGE=http://gmpc.wikia.com/
 KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
-RDEPEND=>=media-sound/gmpc-0.20.0 >=gnome-base/libglade-2 dev-libs/libxml2
+RDEPEND=>=media-sound/gmpc-0.20.0 >=gnome-base/libglade-2 dev-libs/libxml2:=
 SLOT=0
 SRC_URI=mirror://sourceforge/musicpd/gmpc-playlistsort-0.20.0.tar.gz
-_md5_=08275f8e0ff3fa1337ed2c6d0e3b886f
+_md5_=df972d631949f4c578458ea64b92a096
diff --git a/metadata/md5-cache/media-plugins/gmpc-shout-0.20.0 b/metadata/md5-cache/media-plugins/gmpc-shout-0.20.0
index 2f4f8cbc6416..be1d759c5c2e 100644
--- a/metadata/md5-cache/media-plugins/gmpc-shout-0.20.0
+++ b/metadata/md5-cache/media-plugins/gmpc-shout-0.20.0
@@ -1,12 +1,12 @@
 DEFINED_PHASES=configure install
-DEPEND=>=media-sound/gmpc-0.20.0 media-sound/vorbis-tools[ogg123] dev-libs/libxml2 x11-libs/cairo virtual/pkgconfig nls? ( dev-util/intltool sys-devel/gettext )
+DEPEND=>=media-sound/gmpc-0.20.0 media-sound/vorbis-tools[ogg123] dev-libs/libxml2:= x11-libs/cairo:= virtual/pkgconfig nls? ( dev-util/intltool sys-devel/gettext )
 DESCRIPTION=This plugin calls ogg123 and points it at mpd's shoutstream
-EAPI=3
+EAPI=6
 HOMEPAGE=http://gmpc.wikia.com/wiki/GMPC_PLUGIN_SHOUT
 IUSE=nls
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
-RDEPEND=>=media-sound/gmpc-0.20.0 media-sound/vorbis-tools[ogg123] dev-libs/libxml2 x11-libs/cairo
+RDEPEND=>=media-sound/gmpc-0.20.0 media-sound/vorbis-tools[ogg123] dev-libs/libxml2:= x11-libs/cairo:=
 SLOT=0
 SRC_URI=mirror://sourceforge/musicpd/gmpc-shout-0.20.0.tar.gz
-_md5_=0fe6e4662227ac2d1fabc878a611f3f2
+_md5_=b64d8f7c75e22e464214067b7113fd8c
diff --git a/metadata/md5-cache/media-plugins/npapi-vlc-2.0.0 b/metadata/md5-cache/media-plugins/npapi-vlc-2.0.0
index 48ea88e7bea3..20079519a0f5 100644
--- a/metadata/md5-cache/media-plugins/npapi-vlc-2.0.0
+++ b/metadata/md5-cache/media-plugins/npapi-vlc-2.0.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=media-video/vlc-1.1 x11-libs/libX11 !gtk? ( x11-libs/libXpm x11-libs/libSM x11-libs/libICE ) gtk? ( x11-libs/gtk+:2 ) !<media-video/vlc-1.2[nsplugin] app-arch/xz-utils virtual/pkgconfig >=net-misc/npapi-sdk-0.27 >=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
+DEPEND=app-arch/xz-utils >=media-video/vlc-1.1 x11-libs/libX11 !gtk? ( x11-libs/libXpm x11-libs/libSM x11-libs/libICE ) gtk? ( x11-libs/gtk+:2 ) !<media-video/vlc-1.2[nsplugin] virtual/pkgconfig >=net-misc/npapi-sdk-0.27
 DESCRIPTION=Mozilla plugin based on VLC
-EAPI=3
+EAPI=6
 HOMEPAGE=http://www.videolan.org/
 IUSE=gtk
 KEYWORDS=amd64 ~ppc64 x86
@@ -9,5 +9,4 @@ LICENSE=LGPL-2.1
 RDEPEND=>=media-video/vlc-1.1 x11-libs/libX11 !gtk? ( x11-libs/libXpm x11-libs/libSM x11-libs/libICE ) gtk? ( x11-libs/gtk+:2 ) !<media-video/vlc-1.2[nsplugin]
 SLOT=0
 SRC_URI=http://download.videolan.org/pub/videolan/vlc/2.0.0/npapi-vlc-2.0.0.tar.xz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=975e090695c41d3865e84f13ec5a2224
+_md5_=277363f8ecdd1343ba03282c838480db
diff --git a/metadata/md5-cache/media-plugins/npapi-vlc-9999 b/metadata/md5-cache/media-plugins/npapi-vlc-9999
index e05491defcf6..9d7cb6541686 100644
--- a/metadata/md5-cache/media-plugins/npapi-vlc-9999
+++ b/metadata/md5-cache/media-plugins/npapi-vlc-9999
@@ -1,11 +1,11 @@
 DEFINED_PHASES=configure install prepare unpack
-DEPEND=>=media-video/vlc-1.1 x11-libs/libX11 !gtk? ( x11-libs/libXpm x11-libs/libSM x11-libs/libICE ) gtk? ( x11-libs/gtk+:2 ) !<media-video/vlc-1.2[nsplugin] virtual/pkgconfig >=net-misc/npapi-sdk-0.27 >=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 dev-vcs/git
+DEPEND=>=media-video/vlc-1.1 x11-libs/libX11 !gtk? ( x11-libs/libXpm x11-libs/libSM x11-libs/libICE ) gtk? ( x11-libs/gtk+:2 ) !<media-video/vlc-1.2[nsplugin] virtual/pkgconfig >=net-misc/npapi-sdk-0.27 >=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 >=dev-vcs/git-1.8.2.1
 DESCRIPTION=Mozilla plugin based on VLC
-EAPI=3
+EAPI=6
 HOMEPAGE=http://www.videolan.org/
 IUSE=gtk
 LICENSE=LGPL-2.1
 RDEPEND=>=media-video/vlc-1.1 x11-libs/libX11 !gtk? ( x11-libs/libXpm x11-libs/libSM x11-libs/libICE ) gtk? ( x11-libs/gtk+:2 ) !<media-video/vlc-1.2[nsplugin]
 SLOT=0
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	git-2	195a672bfaf52d868442171c9469bbb6	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=6de9fe96d0fd94ec01ce9b7142686422
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=7552a9c751f32fc0e63daca046f3c8da
diff --git a/metadata/md5-cache/net-libs/enet-1.2.2 b/metadata/md5-cache/net-libs/enet-1.2.2
deleted file mode 100644
index 17672660c356..000000000000
--- a/metadata/md5-cache/net-libs/enet-1.2.2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install prepare unpack
-DESCRIPTION=relatively thin, simple and robust network communication layer on top of UDP
-EAPI=3
-HOMEPAGE=http://enet.bespin.org/
-IUSE=static-libs
-KEYWORDS=amd64 ppc ~ppc64 x86
-LICENSE=MIT
-SLOT=0
-SRC_URI=http://enet.bespin.org/download/enet-1.2.2.tar.gz
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=f83c7a568dd89cf32fcfda282ea4421a
diff --git a/metadata/md5-cache/net-libs/enet-1.2.2-r1 b/metadata/md5-cache/net-libs/enet-1.2.2-r1
index 4ec6a735ea26..c4fa442987b4 100644
--- a/metadata/md5-cache/net-libs/enet-1.2.2-r1
+++ b/metadata/md5-cache/net-libs/enet-1.2.2-r1
@@ -3,8 +3,8 @@ DESCRIPTION=relatively thin, simple and robust network communication layer on to
 EAPI=6
 HOMEPAGE=http://enet.bespin.org/
 IUSE=static-libs
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ppc ~ppc64 x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://enet.bespin.org/download/enet-1.2.2.tar.gz
-_md5_=1303e54bb520ee576fa0d296c15b7a07
+_md5_=b44bcc4be9834336044a3c7634ac6b13
diff --git a/metadata/md5-cache/net-mail/safecat-1.13 b/metadata/md5-cache/net-mail/safecat-1.13
index 0bc4eeb52ce6..7466e8222a09 100644
--- a/metadata/md5-cache/net-mail/safecat-1.13
+++ b/metadata/md5-cache/net-mail/safecat-1.13
@@ -1,12 +1,12 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=sys-apps/groff >=sys-apps/sed-4
-DESCRIPTION=Safecat implements qmail's maildir algorithm, copying standard input safely to a specified directory
-EAPI=3
+DEPEND=sys-apps/groff
+DESCRIPTION=Safecat implements qmail's maildir algorithm, safely copying standard input
+EAPI=6
 HOMEPAGE=http://www.jeenyus.net/linux/software/safecat.html
 KEYWORDS=amd64 ~hppa ~mips ppc ~sparc x86
 LICENSE=BSD
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.jeenyus.net/linux/software/safecat/safecat-1.13.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=7865eaef3ba2b6f7de900689d40baa0f
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=f6c4b93db10b57180c3605c59351bcc6
diff --git a/metadata/md5-cache/net-mail/vchkuser-0.4 b/metadata/md5-cache/net-mail/vchkuser-0.4
index d36e23f63a78..cda62bb228c8 100644
--- a/metadata/md5-cache/net-mail/vchkuser-0.4
+++ b/metadata/md5-cache/net-mail/vchkuser-0.4
@@ -1,7 +1,7 @@
 DEFINED_PHASES=configure install prepare
 DEPEND=net-mail/vpopmail || ( mail-mta/netqmail[qmail-spp] mail-mta/qmail-ldap[qmail-spp] ) >=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 >=sys-apps/sed-4
 DESCRIPTION=qmail-spp plugin to check recipient existance with vpopmail
-EAPI=3
+EAPI=6
 HOMEPAGE=https://github.com/hollow/vchkuser
 IUSE=debug
 KEYWORDS=amd64 x86
@@ -9,4 +9,4 @@ LICENSE=BSD
 SLOT=0
 SRC_URI=https://github.com/hollow/vchkuser/tarball/v0.4 -> vchkuser-0.4.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qmail	0cddcd9f34297dbca4a09fbdafa7398a	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=a8844585467a9083208a41333745d30e
+_md5_=755014e3a95090323c2d540ce2e773d2
diff --git a/metadata/md5-cache/net-misc/arpd-0.2-r1 b/metadata/md5-cache/net-misc/arpd-0.2-r1
index ee7cce64a7d2..0d04ed9e1323 100644
--- a/metadata/md5-cache/net-misc/arpd-0.2-r1
+++ b/metadata/md5-cache/net-misc/arpd-0.2-r1
@@ -1,12 +1,12 @@
 DEFINED_PHASES=configure install prepare
 DEPEND=>=dev-libs/libdnet-1.4 >=dev-libs/libevent-0.6 net-libs/libpcap !sys-apps/iproute2 >=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=ARP server which claims all unassigned addresses (for network monitoring or simulation)
-EAPI=3
+DESCRIPTION=ARP server claiming all unassigned addresses (for network monitoring/simulation)
+EAPI=6
 HOMEPAGE=http://www.citi.umich.edu/u/provos/honeyd/
 KEYWORDS=amd64 hppa ppc ~ppc64 sparc x86
 LICENSE=BSD
 RDEPEND=>=dev-libs/libdnet-1.4 >=dev-libs/libevent-0.6 net-libs/libpcap !sys-apps/iproute2
 SLOT=0
 SRC_URI=http://www.citi.umich.edu/u/provos/honeyd/arpd-0.2.tar.gz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=1d249e088f56c93d325beb52767b1e57
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=86132883cc0d97ba9c8bef6a0cf005f3
diff --git a/metadata/md5-cache/net-misc/netkit-bootpd-2.4-r1 b/metadata/md5-cache/net-misc/netkit-bootpd-2.4-r1
index fd58c8f6a283..63676beba331 100644
--- a/metadata/md5-cache/net-misc/netkit-bootpd-2.4-r1
+++ b/metadata/md5-cache/net-misc/netkit-bootpd-2.4-r1
@@ -1,10 +1,10 @@
-DEFINED_PHASES=compile install prepare
+DEFINED_PHASES=compile configure install
 DESCRIPTION=Netkit - bootp
-EAPI=3
+EAPI=6
 HOMEPAGE=ftp://ftp.uk.linux.org/pub/linux/Networking/netboot/
 KEYWORDS=amd64 ~hppa ~mips ppc ~sparc x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=ftp://ftp.uk.linux.org/pub/linux/Networking/netboot/bootpd-2.4.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=cb15f95a69a788ee819ba527d8a23fe0
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=ab0bdfe81c130ebd7d7365a98ee26431
diff --git a/metadata/md5-cache/net-misc/openr2-1.3.0 b/metadata/md5-cache/net-misc/openr2-1.3.0
index 9b691ad7a7f4..ce257b04a387 100644
--- a/metadata/md5-cache/net-misc/openr2-1.3.0
+++ b/metadata/md5-cache/net-misc/openr2-1.3.0
@@ -1,12 +1,12 @@
-DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=>=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
+DEFINED_PHASES=configure install prepare
+DEPEND=net-misc/dahdi >=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=An open implementation of the MFC/R2 telephony signaling protocol
-EAPI=3
+EAPI=6
 HOMEPAGE=http://libopenr2.org/
 KEYWORDS=~amd64
 LICENSE=GPL-2
 RDEPEND=net-misc/dahdi
 SLOT=0
 SRC_URI=https://openr2.googlecode.com/files/openr2-1.3.0.tar.gz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=433ee28650b0a671517934a4886df5b1
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=973f90012f04790873bef26ea08a027b
diff --git a/metadata/md5-cache/net-misc/ssvnc-1.0.28 b/metadata/md5-cache/net-misc/ssvnc-1.0.28
deleted file mode 100644
index 0927ebdbbc43..000000000000
--- a/metadata/md5-cache/net-misc/ssvnc-1.0.28
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=sys-libs/zlib virtual/jpeg dev-libs/openssl dev-lang/tk net-misc/stunnel java? ( virtual/jre ) x11-terms/xterm x11-libs/libICE x11-libs/libSM x11-libs/libXaw x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXp x11-libs/libXpm x11-libs/libXt java? ( virtual/jdk )
-DESCRIPTION=VNC viewer that adds encryption security to VNC connections
-EAPI=3
-HOMEPAGE=http://www.karlrunge.com/x11vnc/ssvnc.html
-IUSE=java
-KEYWORDS=amd64 x86 ~x86-linux
-LICENSE=GPL-2
-RDEPEND=sys-libs/zlib virtual/jpeg dev-libs/openssl dev-lang/tk net-misc/stunnel java? ( virtual/jre ) x11-terms/xterm x11-libs/libICE x11-libs/libSM x11-libs/libXaw x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXp x11-libs/libXpm x11-libs/libXt
-SLOT=0
-SRC_URI=mirror://sourceforge/ssvnc/ssvnc-1.0.28.src.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=f2345e9059ac409944e684ca1b310900
diff --git a/metadata/md5-cache/net-misc/ssvnc-1.0.29-r1 b/metadata/md5-cache/net-misc/ssvnc-1.0.29-r1
index d38e8ccb4be2..eee08618cec6 100644
--- a/metadata/md5-cache/net-misc/ssvnc-1.0.29-r1
+++ b/metadata/md5-cache/net-misc/ssvnc-1.0.29-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile install prepare
-DEPEND=sys-libs/zlib virtual/jpeg dev-libs/openssl dev-lang/tk net-misc/stunnel java? ( virtual/jre ) x11-terms/xterm x11-libs/libICE x11-libs/libSM x11-libs/libXaw x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXp x11-libs/libXpm x11-libs/libXt java? ( virtual/jdk )
+DEPEND=sys-libs/zlib virtual/jpeg:0 dev-libs/openssl:0= dev-lang/tk:0 net-misc/stunnel java? ( virtual/jre:* ) x11-terms/xterm x11-libs/libICE x11-libs/libSM x11-libs/libXaw x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXp x11-libs/libXpm x11-libs/libXt java? ( virtual/jdk )
 DESCRIPTION=VNC viewer that adds encryption security to VNC connections
 EAPI=6
 HOMEPAGE=http://www.karlrunge.com/x11vnc/ssvnc.html
 IUSE=java
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~arm-linux ~x86-linux
 LICENSE=GPL-2
-RDEPEND=sys-libs/zlib virtual/jpeg dev-libs/openssl dev-lang/tk net-misc/stunnel java? ( virtual/jre ) x11-terms/xterm x11-libs/libICE x11-libs/libSM x11-libs/libXaw x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXp x11-libs/libXpm x11-libs/libXt
+RDEPEND=sys-libs/zlib virtual/jpeg:0 dev-libs/openssl:0= dev-lang/tk:0 net-misc/stunnel java? ( virtual/jre:* ) x11-terms/xterm x11-libs/libICE x11-libs/libSM x11-libs/libXaw x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXp x11-libs/libXpm x11-libs/libXt
 SLOT=0
 SRC_URI=mirror://sourceforge/ssvnc/ssvnc-1.0.29.src.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=e5eb6cb12c31051a87b654fe35cd88c9
+_md5_=53fd436e2525f4e7b09ab4631bcef47e
diff --git a/metadata/md5-cache/sys-auth/fprint_demo-0.4 b/metadata/md5-cache/sys-auth/fprint_demo-0.4
index ab333b30629b..346533b395a3 100644
--- a/metadata/md5-cache/sys-auth/fprint_demo-0.4
+++ b/metadata/md5-cache/sys-auth/fprint_demo-0.4
@@ -1,11 +1,11 @@
-DEFINED_PHASES=install
+DEFINED_PHASES=-
 DEPEND=sys-auth/libfprint x11-libs/gtk+:2
 DESCRIPTION=a simple GTK+ application to demonstrate and test libfprint's capabilities
-EAPI=3
+EAPI=6
 HOMEPAGE=http://www.reactivated.net/fprint/wiki/Fprint_demo
 KEYWORDS=~amd64
 LICENSE=GPL-2
 RDEPEND=sys-auth/libfprint x11-libs/gtk+:2
 SLOT=0
 SRC_URI=mirror://sourceforge/fprint/fprint_demo-0.4.tar.bz2
-_md5_=0689af0c7805591d253df2fb64edbe1c
+_md5_=ee2f10f92f7da1405140bca39b809ddd
diff --git a/metadata/md5-cache/sys-auth/libnss-cache-0.10.2 b/metadata/md5-cache/sys-auth/libnss-cache-0.10.2
index 6642059b4942..6ccfbbb8f2b9 100644
--- a/metadata/md5-cache/sys-auth/libnss-cache-0.10.2
+++ b/metadata/md5-cache/sys-auth/libnss-cache-0.10.2
@@ -1,11 +1,11 @@
-DEFINED_PHASES=compile install prepare
+DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=libnss-cache is a library that serves nss lookups
-EAPI=3
+EAPI=6
 HOMEPAGE=https://github.com/google/nsscache
-IUSE=multilib
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=https://nsscache.googlecode.com/files/libnss-cache-0.10.2.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=d4f6893bef1a60c412c137a705d3404f
+_eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=a4af66bf3db655b899c4cd61d8db5ba5
diff --git a/metadata/md5-cache/sys-auth/pam_fprint-0.2-r1 b/metadata/md5-cache/sys-auth/pam_fprint-0.2-r1
index b8f5ece525a8..00b9436edf5f 100644
--- a/metadata/md5-cache/sys-auth/pam_fprint-0.2-r1
+++ b/metadata/md5-cache/sys-auth/pam_fprint-0.2-r1
@@ -1,7 +1,7 @@
-DEFINED_PHASES=install prepare
+DEFINED_PHASES=install
 DEPEND=sys-auth/libfprint sys-libs/pam
 DESCRIPTION=a simple PAM module which uses libfprint's functionality for authentication
-EAPI=3
+EAPI=6
 HOMEPAGE=http://www.reactivated.net/fprint/wiki/Pam_fprint
 KEYWORDS=alpha amd64 arm ia64 ppc ppc64 sparc x86
 LICENSE=GPL-2
@@ -9,4 +9,4 @@ RDEPEND=sys-auth/libfprint sys-libs/pam
 SLOT=0
 SRC_URI=mirror://sourceforge/fprint/pam_fprint-0.2.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=69e7c24da37cec8b6f4831e8bd8547e8
+_md5_=43967a3e465dab6920637d374ced4e83
diff --git a/metadata/md5-cache/sys-auth/realtime-base-0.1 b/metadata/md5-cache/sys-auth/realtime-base-0.1
index 9e8a9ead601f..6c6a6b177008 100644
--- a/metadata/md5-cache/sys-auth/realtime-base-0.1
+++ b/metadata/md5-cache/sys-auth/realtime-base-0.1
@@ -1,10 +1,10 @@
 DEFINED_PHASES=compile install postinst setup
 DESCRIPTION=Sets up realtime scheduling
-EAPI=3
+EAPI=6
 HOMEPAGE=http://jackaudio.org/faq/linux_rt_config.html
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sh sparc x86 ~amd64-fbsd
 LICENSE=public-domain
 RDEPEND=virtual/pam
 SLOT=0
 _eclasses_=user	8bc2845510e2109af75e3eeac607ec81
-_md5_=8fabcd0993926e0f012b5a5669f282b2
+_md5_=20d24acd96373935ed5d87e1dcedb4b7
diff --git a/metadata/md5-cache/sys-block/megamgr-5.20-r2 b/metadata/md5-cache/sys-block/megamgr-5.20-r2
index 3de7f8221263..c4219864e13b 100644
--- a/metadata/md5-cache/sys-block/megamgr-5.20-r2
+++ b/metadata/md5-cache/sys-block/megamgr-5.20-r2
@@ -1,12 +1,11 @@
-DEFINED_PHASES=install setup
+DEFINED_PHASES=install
 DEPEND=app-arch/unzip
 DESCRIPTION=LSI Logic MegaRAID Text User Interface management tool
-EAPI=3
+EAPI=6
 HOMEPAGE=http://www.lsi.com
 KEYWORDS=~amd64 ~x86
 LICENSE=LSI
 RESTRICT=mirror fetch
 SLOT=0
 SRC_URI=http://www.lsi.com/downloads/Public/MegaRAID%20Common%20Files/ut_linux_mgr_5.20.zip
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=13c2e0fddfe15940e36eb055be9d71f6
+_md5_=cbcfa1353dfbd66a5449018b5fdf96fc
diff --git a/metadata/md5-cache/sys-libs/suacomp-0.6.14 b/metadata/md5-cache/sys-libs/suacomp-0.6.14
index 469fc54dfb33..00b03a48f192 100644
--- a/metadata/md5-cache/sys-libs/suacomp-0.6.14
+++ b/metadata/md5-cache/sys-libs/suacomp-0.6.14
@@ -1,10 +1,10 @@
-DEFINED_PHASES=compile install prepare setup test
+DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=library wrapping the interix lib-c to make it less buggy
-EAPI=3
+EAPI=6
 HOMEPAGE=http://suacomp.sf.net
 IUSE=debug
 LICENSE=BEER-WARE
 SLOT=0
 SRC_URI=mirror://sourceforge/suacomp/suacomp-0.6.14.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=a7728219802eb56f4656b2c2c3978e94
+_md5_=4bece6d8a930780c4be6d191c8829270
diff --git a/metadata/md5-cache/sys-libs/suacomp-9999 b/metadata/md5-cache/sys-libs/suacomp-9999
index fab4690172db..c2b513ff0849 100644
--- a/metadata/md5-cache/sys-libs/suacomp-9999
+++ b/metadata/md5-cache/sys-libs/suacomp-9999
@@ -1,10 +1,10 @@
-DEFINED_PHASES=compile install setup test unpack
-DEPEND=dev-vcs/git
+DEFINED_PHASES=compile configure install test unpack
+DEPEND=>=dev-vcs/git-1.8.2.1
 DESCRIPTION=library wrapping the interix lib-c to make it less buggy
-EAPI=4
+EAPI=6
 HOMEPAGE=http://suacomp.sf.net
 IUSE=debug
 LICENSE=BEER-WARE
 SLOT=0
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-2	195a672bfaf52d868442171c9469bbb6	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=9ac0b7c11c83ea75ed5cfe1e634b3845
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=d165346c45a34d140e3d58b9ef2884e9
diff --git a/metadata/md5-cache/x11-plugins/pidgin-bot-sentry-1.3.0 b/metadata/md5-cache/x11-plugins/pidgin-bot-sentry-1.3.0
index 65dd1c464807..19ce4c1339ef 100644
--- a/metadata/md5-cache/x11-plugins/pidgin-bot-sentry-1.3.0
+++ b/metadata/md5-cache/x11-plugins/pidgin-bot-sentry-1.3.0
@@ -1,12 +1,11 @@
 DEFINED_PHASES=install
 DEPEND=net-im/pidgin[gtk] x11-libs/gtk+:2 >=dev-util/intltool-0.40 virtual/pkgconfig
 DESCRIPTION=Bot Sentry is a Pidgin plugin to prevent Instant Message (IM) spam
-EAPI=3
+EAPI=6
 HOMEPAGE=http://pidgin-bs.sourceforge.net/
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=net-im/pidgin[gtk] x11-libs/gtk+:2
 SLOT=0
 SRC_URI=mirror://sourceforge/pidgin-bs/bot-sentry-1.3.0.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=bd1a98faf73c46cb74fcb8f084ada9e8
+_md5_=4e569b948a3546bcdf50c6acc25545a8
diff --git a/metadata/md5-cache/x11-plugins/pidgin-led-notification-0.1 b/metadata/md5-cache/x11-plugins/pidgin-led-notification-0.1
index 33c65bd6cd44..815f10c079c2 100644
--- a/metadata/md5-cache/x11-plugins/pidgin-led-notification-0.1
+++ b/metadata/md5-cache/x11-plugins/pidgin-led-notification-0.1
@@ -1,12 +1,12 @@
-DEFINED_PHASES=compile install prepare
+DEFINED_PHASES=compile install
 DEPEND=net-im/pidgin[gtk] x11-libs/gtk+:2 virtual/pkgconfig
 DESCRIPTION=Pidgin plugin to notify by writing user defined strings to (led control) files
-EAPI=3
+EAPI=6
 HOMEPAGE=https://sites.google.com/site/simohmattila/led-notification
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-2
 RDEPEND=net-im/pidgin[gtk] x11-libs/gtk+:2
 SLOT=0
 SRC_URI=https://sites.google.com/site/simohmattila/led-notification-0.1.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=8b77ef34d1ef729d3c1203a1a5c21358
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=0fd367ce876b915ce0ea90e470ce2721
diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index
index 6c0e4061c925..4526b6055577 100644
--- a/metadata/pkg_desc_index
+++ b/metadata/pkg_desc_index
@@ -1048,7 +1048,7 @@ app-misc/mvcase 0.1-r1: A modified version of mv, used to convert filenames to l
 app-misc/neofetch 3.3.0: Simple information system script
 app-misc/note 1.3.3-r1: A note taking perl program
 app-misc/nut 20.1: Record what you eat and analyze your nutrient levels
-app-misc/ondir 0.2.2-r1 0.2.2-r2: Automatically execute scripts as you traverse directories
+app-misc/ondir 0.2.2-r2: Automatically execute scripts as you traverse directories
 app-misc/oneko 1.2-r2: A cat, dog and others which chase the mouse or windows around the screen
 app-misc/pal 0.4.3-r2: Command-line calendar program
 app-misc/pax-utils 1.1.7: ELF utils that can check files for security relevant properties
@@ -1083,7 +1083,7 @@ app-misc/socnetv 2.2: Qt Social Network Visualizer
 app-misc/solaar 0.9.2-r3: A Linux device manager for Logitech's Unifying Receiver peripherals
 app-misc/spacenavd 0.5-r5 0.6: The spacenavd daemon provides free alternative to the 3dxserv daemon
 app-misc/sphinx 2.0.10 2.1.9 2.2.11: Full-text search engine with support for MySQL and PostgreSQL
-app-misc/splitvt 1.6.6-r2: Splitting terminals into two shells
+app-misc/splitvt 1.6.6-r3: Splitting terminals into two shells
 app-misc/srm 1.2.11-r2 1.2.15: A command-line compatible rm which destroys file contents before unlinking
 app-misc/supercat 0.5.5-r2: A text file colorizer using powerful regular expressions
 app-misc/symlinks 1.4-r3: Scans for and fixes broken or messy symlinks
@@ -7633,7 +7633,7 @@ media-plugins/gmpc-libnotify 11.8.16: This plugin sends an announcement to the n
 media-plugins/gmpc-lyrics 11.8.16: This plugin fetches lyrics
 media-plugins/gmpc-lyricwiki 11.8.16: This plugin uses lyricwiki to fetch lyrics
 media-plugins/gmpc-magnatune 11.8.16: This plugin allows you to browse and preview available albums on magnatune.com
-media-plugins/gmpc-mdcover 0.20.0: This plugin fetches cover art, artist art, album and artist information from the file system
+media-plugins/gmpc-mdcover 0.20.0: Plugin for fetching cover art, artist art, album and artist information
 media-plugins/gmpc-mmkeys 11.8.16: Bind multimedia keys via gnome settings daemon
 media-plugins/gmpc-playlistsort 0.20.0: This plugin adds a dialog to sort the current playlist
 media-plugins/gmpc-shout 0.20.0: This plugin calls ogg123 and points it at mpd's shoutstream
@@ -8502,7 +8502,7 @@ net-libs/dleyna-connector-dbus 0.2.0: utility library for higher level dLeyna li
 net-libs/dleyna-core 0.5.0: utility library for higher level dLeyna libraries
 net-libs/dleyna-renderer 0.5.0: library implementing services that allow clients to discover and manipulate DLNA renderers
 net-libs/dslib 3.0-r1: Library to access Czech eGov system "Datove schranky"
-net-libs/enet 1.2.2 1.3.7 1.3.13: relatively thin, simple and robust network communication layer on top of UDP
+net-libs/enet 1.2.2-r1 1.3.7 1.3.13: relatively thin, simple and robust network communication layer on top of UDP
 net-libs/farstream 0.1.2-r2 0.2.8-r1: Audio/video conferencing framework specifically designed for instant messengers
 net-libs/glib-networking 2.50.0: Network-related giomodules for glib
 net-libs/gnet 2.0.8-r2: A simple network library
@@ -8680,7 +8680,7 @@ net-mail/relay-ctrl 3.1.1-r2: SMTP Relaying Control designed for qmail & tcpserv
 net-mail/ripmime 1.4.0.10: extract attachment files out of a MIME-encoded email pack
 net-mail/ripole 0.2.2: Program/library to pull out attachment from OLE2 data files
 net-mail/rss2email 2.71-r1: A python script that converts RSS/Atom newsfeeds to email
-net-mail/safecat 1.13: Safecat implements qmail's maildir algorithm, copying standard input safely to a specified directory
+net-mail/safecat 1.13: Safecat implements qmail's maildir algorithm, safely copying standard input
 net-mail/sendEmail 1.56-r1 1.56-r2: Command line based, SMTP email agent
 net-mail/smtptools 0.2.3: A collection of tools to send or receive mails with SMTP
 net-mail/swaks 20130209.0-r1: Swiss Army Knife SMTP; Command line SMTP testing, including TLS and AUTH
@@ -8699,7 +8699,7 @@ net-misc/aget 0.4.1-r2: multithreaded HTTP download accelerator
 net-misc/aggregate 1.6: Take a list of prefixes and perform two optimisations to reduce the length of the prefix list
 net-misc/aggregate-flim 1.0.2: aggregate is a tool for aggregating CIDR networks
 net-misc/aria2 1.30.0: A download utility with segmented downloading with BitTorrent support
-net-misc/arpd 0.2-r1: ARP server which claims all unassigned addresses (for network monitoring or simulation)
+net-misc/arpd 0.2-r1: ARP server claiming all unassigned addresses (for network monitoring/simulation)
 net-misc/asterisk 11.25.1 11.25.3: Asterisk: A Modular Open Source PBX System
 net-misc/asterisk-core-sounds 1.4.21-r1 1.4.22: Core sounds for asterisk
 net-misc/asterisk-extra-sounds 1.4.11: Extra sounds for asterisk
@@ -8866,7 +8866,6 @@ net-misc/ssh-askpass-fullscreen 1.0-r1: A small SSH Askpass replacement written
 net-misc/sshpass 1.05: Tool for noninteractively performing password authentication with ssh
 net-misc/sslh 1.18-r2: Port multiplexer - accept both HTTPS and SSH connections on the same port
 net-misc/sstp-client 1.0.10-r1: A client implementation of Secure Socket Tunneling Protocol (SSTP)
-net-misc/ssvnc 1.0.28: VNC viewer that adds encryption security to VNC connections
 net-misc/stone 2.3e-r1: A simple TCP/IP packet repeater
 net-misc/streamtuner 0.99.99-r5: Stream directory browser for browsing internet radio streams
 net-misc/stunnel 5.36: TLS/SSL - Port Wrapper
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index a8bace408042..a0ac26a358f5 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Wed, 03 Jan 2018 18:40:45 +0000
+Wed, 03 Jan 2018 19:10:09 +0000