gentoo resync : 23.06.2018

32 files changed, 122 insertions, 143 deletions

diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index 44c9b8454480..d32bb8483887 100644
--- a/metadata/md5-cache/sys-apps/Manifest.gz
+++ b/metadata/md5-cache/sys-apps/Manifest.gz
diff --git a/metadata/md5-cache/sys-apps/acl-2.2.52-r1 b/metadata/md5-cache/sys-apps/acl-2.2.52-r1
index dee86bb25593..156ea70742be 100644
--- a/metadata/md5-cache/sys-apps/acl-2.2.52-r1
+++ b/metadata/md5-cache/sys-apps/acl-2.2.52-r1
@@ -8,6 +8,6 @@ KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=>=sys-apps/attr-2.4.47-r1[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(-)?]
 SLOT=0
-SRC_URI=http://download.savannah.gnu.org/releases/acl/acl-2.2.52.src.tar.gz
+SRC_URI=mirror://nongnu/acl/acl-2.2.52.src.tar.gz
 _eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b6c3f3f520f1a12f828d0ada8b14e64f
+_md5_=0595d3c6892862fb16a58c5f3e745106
diff --git a/metadata/md5-cache/sys-apps/acl-2.2.52-r2 b/metadata/md5-cache/sys-apps/acl-2.2.53
index 2f4241f52941..3aaa6384a991 100644
--- a/metadata/md5-cache/sys-apps/acl-2.2.52-r2
+++ b/metadata/md5-cache/sys-apps/acl-2.2.53
@@ -8,6 +8,6 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh
 LICENSE=LGPL-2.1
 RDEPEND=>=sys-apps/attr-2.4.47-r1[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(-)?]
 SLOT=0
-SRC_URI=http://download.savannah.gnu.org/releases/acl/acl-2.2.52.src.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=790898e7e07043a84ea038909c2465e5
+SRC_URI=mirror://nongnu/acl/acl-2.2.53.tar.gz
+_eclasses_=libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=ec8cc4933c6f4a03d9fab9fc0876bd64
diff --git a/metadata/md5-cache/sys-apps/attr-2.4.48 b/metadata/md5-cache/sys-apps/attr-2.4.48-r2
index 075b50b48075..fb5ded8d752f 100644
--- a/metadata/md5-cache/sys-apps/attr-2.4.48
+++ b/metadata/md5-cache/sys-apps/attr-2.4.48-r2
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/autoconf sys-devel/gettext >=app-portage/elt-patches-20170422
+DEPEND=nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170422
 DESCRIPTION=Extended attributes tools
 EAPI=6
 HOMEPAGE=https://savannah.nongnu.org/projects/attr
-IUSE=debug static-libs 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
+IUSE=debug nls static-libs 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=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux
 LICENSE=LGPL-2.1
 SLOT=0
-SRC_URI=https://dev.gentoo.org/~polynomial-c/dist/attr-2.4.48.tar.xz
+SRC_URI=mirror://nongnu/attr/attr-2.4.48.tar.gz
 _eclasses_=libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=60817f4f8d274e547e2055f17c5d28f5
+_md5_=420596e04d2acc9561907df77fe5f810
diff --git a/metadata/md5-cache/sys-apps/diffutils-3.3 b/metadata/md5-cache/sys-apps/diffutils-3.3
deleted file mode 100644
index 251acda20e32..000000000000
--- a/metadata/md5-cache/sys-apps/diffutils-3.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure prepare test
-DEPEND=app-arch/xz-utils nls? ( sys-devel/gettext )
-DESCRIPTION=Tools to make diffs and compare files
-EAPI=4
-HOMEPAGE=https://www.gnu.org/software/diffutils/
-IUSE=nls static
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://gnu-alpha/diffutils/diffutils-3.3.tar.xz mirror://gnu/diffutils/diffutils-3.3.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=93db8389b3fc03647c36e55c5696bbb6
diff --git a/metadata/md5-cache/sys-apps/diffutils-3.5 b/metadata/md5-cache/sys-apps/diffutils-3.5
index a47ace7960a6..0d01b90ed45f 100644
--- a/metadata/md5-cache/sys-apps/diffutils-3.5
+++ b/metadata/md5-cache/sys-apps/diffutils-3.5
@@ -4,9 +4,9 @@ DESCRIPTION=Tools to make diffs and compare files
 EAPI=5
 HOMEPAGE=https://www.gnu.org/software/diffutils/
 IUSE=nls static
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ~ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://gnu/diffutils/diffutils-3.5.tar.xz mirror://gnu-alpha/diffutils/diffutils-3.5.tar.xz
 _eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=fc5ab25a7749f30b9631c55f5ab4c0af
+_md5_=f774fdfc4e5d2b9e473aae7ee8e720aa
diff --git a/metadata/md5-cache/sys-apps/diffutils-3.6 b/metadata/md5-cache/sys-apps/diffutils-3.6
deleted file mode 100644
index 48a0a3dba94f..000000000000
--- a/metadata/md5-cache/sys-apps/diffutils-3.6
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure test
-DEPEND=app-arch/xz-utils nls? ( sys-devel/gettext )
-DESCRIPTION=Tools to make diffs and compare files
-EAPI=5
-HOMEPAGE=https://www.gnu.org/software/diffutils/
-IUSE=nls static
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://gnu/diffutils/diffutils-3.6.tar.xz mirror://gnu-alpha/diffutils/diffutils-3.6.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=da57de843bed392d9b2262555bcf962e
diff --git a/metadata/md5-cache/sys-apps/duc-1.4.3 b/metadata/md5-cache/sys-apps/duc-1.4.3-r1
index 220a69a8f8ed..fc71ee75b368 100644
--- a/metadata/md5-cache/sys-apps/duc-1.4.3
+++ b/metadata/md5-cache/sys-apps/duc-1.4.3-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=configure prepare unpack
-DEPEND=cairo? ( x11-libs/cairo x11-libs/pango ) gui? ( X? ( x11-libs/cairo[X] x11-libs/libX11 x11-libs/pango[X] ) !X? ( >=media-libs/glfw-3.0 ) ) leveldb? ( dev-libs/leveldb ) ncurses? ( sys-libs/ncurses:= ) sqlite? ( dev-db/sqlite:3 ) tokyocabinet? ( dev-db/tokyocabinet ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=cairo? ( x11-libs/cairo x11-libs/pango ) gui? ( X? ( x11-libs/cairo[X] x11-libs/libX11 x11-libs/pango[X] ) !X? ( >=media-libs/glfw-3.0 ) ) leveldb? ( dev-libs/leveldb:= ) ncurses? ( sys-libs/ncurses:= ) sqlite? ( dev-db/sqlite:3 ) tokyocabinet? ( dev-db/tokyocabinet ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=A library and suite of tools for inspecting disk usage
 EAPI=6
 HOMEPAGE=https://github.com/zevv/duc
 IUSE=cairo gui -leveldb ncurses -sqlite +tokyocabinet X
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=cairo? ( x11-libs/cairo x11-libs/pango ) gui? ( X? ( x11-libs/cairo[X] x11-libs/libX11 x11-libs/pango[X] ) !X? ( >=media-libs/glfw-3.0 ) ) leveldb? ( dev-libs/leveldb ) ncurses? ( sys-libs/ncurses:= ) sqlite? ( dev-db/sqlite:3 ) tokyocabinet? ( dev-db/tokyocabinet )
+RDEPEND=cairo? ( x11-libs/cairo x11-libs/pango ) gui? ( X? ( x11-libs/cairo[X] x11-libs/libX11 x11-libs/pango[X] ) !X? ( >=media-libs/glfw-3.0 ) ) leveldb? ( dev-libs/leveldb:= ) ncurses? ( sys-libs/ncurses:= ) sqlite? ( dev-db/sqlite:3 ) tokyocabinet? ( dev-db/tokyocabinet )
 REQUIRED_USE=^^ ( tokyocabinet leveldb sqlite ) X? ( cairo gui )
 SLOT=0
 SRC_URI=https://github.com/zevv/duc/releases/download/1.4.3/duc-1.4.3.tar.gz
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=dbeda69666bf4257374c52332c3ea118
+_md5_=38bd098b8a391c70b2f27e7183ab71d3
diff --git a/metadata/md5-cache/sys-apps/duc-9999 b/metadata/md5-cache/sys-apps/duc-9999
index 5c595949d0aa..d6201ff153bc 100644
--- a/metadata/md5-cache/sys-apps/duc-9999
+++ b/metadata/md5-cache/sys-apps/duc-9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=configure prepare unpack
-DEPEND=cairo? ( x11-libs/cairo x11-libs/pango ) gui? ( X? ( x11-libs/cairo[X] x11-libs/libX11 x11-libs/pango[X] ) !X? ( >=media-libs/glfw-3.0 ) ) leveldb? ( dev-libs/leveldb ) ncurses? ( sys-libs/ncurses:= ) sqlite? ( dev-db/sqlite:3 ) tokyocabinet? ( dev-db/tokyocabinet ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=cairo? ( x11-libs/cairo x11-libs/pango ) gui? ( X? ( x11-libs/cairo[X] x11-libs/libX11 x11-libs/pango[X] ) !X? ( >=media-libs/glfw-3.0 ) ) leveldb? ( dev-libs/leveldb:= ) ncurses? ( sys-libs/ncurses:= ) sqlite? ( dev-db/sqlite:3 ) tokyocabinet? ( dev-db/tokyocabinet ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=A library and suite of tools for inspecting disk usage
 EAPI=6
 HOMEPAGE=https://github.com/zevv/duc
 IUSE=cairo gui -leveldb ncurses -sqlite +tokyocabinet X
 LICENSE=GPL-2
-RDEPEND=cairo? ( x11-libs/cairo x11-libs/pango ) gui? ( X? ( x11-libs/cairo[X] x11-libs/libX11 x11-libs/pango[X] ) !X? ( >=media-libs/glfw-3.0 ) ) leveldb? ( dev-libs/leveldb ) ncurses? ( sys-libs/ncurses:= ) sqlite? ( dev-db/sqlite:3 ) tokyocabinet? ( dev-db/tokyocabinet )
+RDEPEND=cairo? ( x11-libs/cairo x11-libs/pango ) gui? ( X? ( x11-libs/cairo[X] x11-libs/libX11 x11-libs/pango[X] ) !X? ( >=media-libs/glfw-3.0 ) ) leveldb? ( dev-libs/leveldb:= ) ncurses? ( sys-libs/ncurses:= ) sqlite? ( dev-db/sqlite:3 ) tokyocabinet? ( dev-db/tokyocabinet )
 REQUIRED_USE=^^ ( tokyocabinet leveldb sqlite ) X? ( cairo gui )
 SLOT=0
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	git-r3	8f6de46b0aa318aea0e8cac62ece098b	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=dbeda69666bf4257374c52332c3ea118
+_md5_=38bd098b8a391c70b2f27e7183ab71d3
diff --git a/metadata/md5-cache/sys-apps/ethtool-4.17 b/metadata/md5-cache/sys-apps/ethtool-4.17
new file mode 100644
index 000000000000..57860547399d
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/ethtool-4.17
@@ -0,0 +1,10 @@
+DEFINED_PHASES=-
+DEPEND=app-arch/xz-utils
+DESCRIPTION=Utility for examining and tuning ethernet-based network interfaces
+EAPI=6
+HOMEPAGE=https://www.kernel.org/pub/software/network/ethtool/
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=mirror://kernel/software/network/ethtool/ethtool-4.17.tar.xz
+_md5_=6782aab6660010d10d6e093c9db7db49
diff --git a/metadata/md5-cache/sys-apps/file-5.32-r1 b/metadata/md5-cache/sys-apps/file-5.32-r1
deleted file mode 100644
index 253f8c15cf3a..000000000000
--- a/metadata/md5-cache/sys-apps/file-5.32-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python? ( python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[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(-)?] ) >=app-portage/elt-patches-20170422
-DESCRIPTION=identify a file's format by scanning binary data for patterns
-EAPI=6
-HOMEPAGE=https://www.darwinsys.com/file/
-IUSE=python static-libs zlib python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 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=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=BSD-2
-RDEPEND=python? ( python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[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(-)?] ) python? ( !dev-python/python-magic )
-REQUIRED_USE=python? ( || ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) )
-SLOT=0
-SRC_URI=ftp://ftp.astron.com/pub/file/file-5.32.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	ffa9c3284c6b07b8c9f7933911f63812	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4dcef8de1a1b52f1e3de5e7320ab49bd
diff --git a/metadata/md5-cache/sys-apps/file-5.33-r1 b/metadata/md5-cache/sys-apps/file-5.33-r1
deleted file mode 100644
index c219943470da..000000000000
--- a/metadata/md5-cache/sys-apps/file-5.33-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python? ( python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[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(-)?] ) >=app-portage/elt-patches-20170422
-DESCRIPTION=identify a file's format by scanning binary data for patterns
-EAPI=6
-HOMEPAGE=https://www.darwinsys.com/file/
-IUSE=python static-libs zlib python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 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=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=BSD-2
-RDEPEND=python? ( python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[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(-)?] ) python? ( !dev-python/python-magic )
-REQUIRED_USE=python? ( || ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) )
-SLOT=0
-SRC_URI=ftp://ftp.astron.com/pub/file/file-5.33.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	ffa9c3284c6b07b8c9f7933911f63812	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=57381e3d601b39649e7b19e06eefb3ca
diff --git a/metadata/md5-cache/sys-apps/file-5.33-r2 b/metadata/md5-cache/sys-apps/file-5.33-r2
index 157dce1545c7..43de21bda376 100644
--- a/metadata/md5-cache/sys-apps/file-5.33-r2
+++ b/metadata/md5-cache/sys-apps/file-5.33-r2
@@ -4,11 +4,11 @@ DESCRIPTION=identify a file's format by scanning binary data for patterns
 EAPI=6
 HOMEPAGE=https://www.darwinsys.com/file/
 IUSE=python static-libs zlib python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 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=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD-2
 RDEPEND=python? ( python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[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(-)?] ) python? ( !dev-python/python-magic )
 REQUIRED_USE=python? ( || ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) )
 SLOT=0
 SRC_URI=ftp://ftp.astron.com/pub/file/file-5.33.tar.gz
 _eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	ffa9c3284c6b07b8c9f7933911f63812	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d4b8879d0acd4b5364000b5962485632
+_md5_=2f734cc91d032174af8012af76ddb0aa
diff --git a/metadata/md5-cache/sys-apps/ipmicfg-1.27.1.170901 b/metadata/md5-cache/sys-apps/ipmicfg-1.28.0.180302
index dcc7e9951b2f..3d3a5d46c72f 100644
--- a/metadata/md5-cache/sys-apps/ipmicfg-1.27.1.170901
+++ b/metadata/md5-cache/sys-apps/ipmicfg-1.28.0.180302
@@ -8,6 +8,6 @@ LICENSE=supermicro
 RDEPEND=sys-libs/glibc
 RESTRICT=bindist fetch mirror strip
 SLOT=0
-SRC_URI=ftp://ftp.supermicro.com/utility/IPMICFG/IPMICFG_1.27.1_build.170901.zip
+SRC_URI=ftp://ftp.supermicro.com/utility/IPMICFG/IPMICFG_1.28.0_build.180302.zip
 _eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f
 _md5_=f62e5a59fc3ad5aa8540200e1703ff7e
diff --git a/metadata/md5-cache/sys-apps/memtest86+-5.01-r3 b/metadata/md5-cache/sys-apps/memtest86+-5.01-r4
index 74ea703e0e49..4175d1d2a57b 100644
--- a/metadata/md5-cache/sys-apps/memtest86+-5.01-r3
+++ b/metadata/md5-cache/sys-apps/memtest86+-5.01-r4
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend test
 DEPEND=iso? ( app-cdr/cdrtools )
 DESCRIPTION=Memory tester based on memtest86
-EAPI=5
+EAPI=6
 HOMEPAGE=http://www.memtest.org/
-IUSE=floppy iso serial
+IUSE=+boot floppy iso serial
 KEYWORDS=-* ~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=floppy? ( >=sys-boot/grub-0.95:0 sys-fs/mtools )
 SLOT=0
 SRC_URI=http://www.memtest.org/download/5.01/memtest86+-5.01.tar.gz
 _eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	mount-boot	1e82d96b7a7dcb483b412497a90bb646	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e4172bcfd0d4031f26634bc11218b5c0
+_md5_=0568cf696ca85dc59afe70247875bdb2
diff --git a/metadata/md5-cache/sys-apps/pick-2.0.2 b/metadata/md5-cache/sys-apps/pick-2.0.2
new file mode 100644
index 000000000000..222f9aa90427
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/pick-2.0.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=prepare
+DEPEND=sys-libs/ncurses:0= virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=a fuzzy search tool for the command-line
+EAPI=6
+HOMEPAGE=https://github.com/mptre/pick
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=sys-libs/ncurses:0=
+SLOT=0
+SRC_URI=https://github.com/mptre/pick/releases/download/v2.0.2/pick-2.0.2.tar.gz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=724b7414f479083d88c89ba0857650a7
diff --git a/metadata/md5-cache/sys-apps/portage-2.3.40-r1 b/metadata/md5-cache/sys-apps/portage-2.3.40-r1
index bca167b8defc..a49abc97478c 100644
--- a/metadata/md5-cache/sys-apps/portage-2.3.40-r1
+++ b/metadata/md5-cache/sys-apps/portage-2.3.40-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Portage is the package management and distribution system for Gentoo
 EAPI=5
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Portage
 IUSE=build doc epydoc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha amd64 ~arm arm64 hppa ia64 ~mips ~ppc ~ppc64 s390 ~sparc x86 ~amd64-fbsd
+KEYWORDS=alpha amd64 ~arm arm64 hppa ia64 ~mips ~ppc ~ppc64 s390 sparc x86 ~amd64-fbsd
 LICENSE=GPL-2
 PDEPEND=!build? ( >=net-misc/rsync-2.6.4 userland_GNU? ( >=sys-apps/coreutils-6.4 ) )
 RDEPEND=>=app-arch/tar-1.27 dev-lang/python-exec:2 !build? ( >=sys-apps/sed-4.0.5 app-shells/bash:0[readline] >=app-admin/eselect-1.2 python_targets_pypy? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python2_7? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_4? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_5? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) rsync-verify? ( >=app-portage/gemato-12.1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] app-crypt/openpgp-keys-gentoo-release >=app-crypt/gnupg-2.2.4-r2[ssl(-)] ) ) elibc_FreeBSD? ( sys-freebsd/freebsd-bin ) elibc_glibc? ( >=sys-apps/sandbox-2.2 ) elibc_musl? ( >=sys-apps/sandbox-2.2 ) elibc_uclibc? ( >=sys-apps/sandbox-2.2 ) >=app-misc/pax-utils-0.1.17 selinux? ( >=sys-libs/libselinux-2.0.94[python,python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) xattr? ( kernel_linux? ( >=sys-apps/install-xattr-0.3 python_targets_pypy? ( dev-python/pyxattr[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/pyxattr[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) ) !<app-admin/logrotate-3.8.0 python_targets_pypy? ( >=virtual/pypy-5:0=[bzip2(+),threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[bzip2(+),threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[bzip2(+),threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[bzip2(+),threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[bzip2(+),threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
@@ -12,4 +12,4 @@ REQUIRED_USE=epydoc? ( python_targets_python2_7 ) || ( python_targets_pypy pytho
 SLOT=0
 SRC_URI=mirror://gentoo/portage-2.3.40.tar.bz2 https://dev.gentoo.org/~zmedico/portage/archives/portage-2.3.40.tar.bz2 https://github.com/gentoo/portage/compare/b7f94fccf4163364ab7b4c4f0dcd42b8847f03e0...937d0156aa060bdba9095313dedbb62e0a993aea.patch -> portage-2.3.40-bug-656942-bug-657436-937d0156aa06.patch https://github.com/gentoo/portage/compare/937d0156aa060bdba9095313dedbb62e0a993aea...1fc628eead43fa5da4b142479aa004ded8acceab.patch -> portage-2.3.40-bug-657436-937d0156aa06-1fc628eead43.patch
 _eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	ffa9c3284c6b07b8c9f7933911f63812	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=17cd3d6360743736fc6e677bb04b04ed
+_md5_=08cf702a95f8bfd552e7471bf059498c
diff --git a/metadata/md5-cache/sys-apps/s390-tools-1.23.1 b/metadata/md5-cache/sys-apps/s390-tools-1.23.1
deleted file mode 100644
index 9d6e566ceb09..000000000000
--- a/metadata/md5-cache/sys-apps/s390-tools-1.23.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=sys-libs/zlib fuse? ( sys-fs/fuse ) ncurses? ( sys-libs/ncurses:0= ) snmp? ( net-analyzer/net-snmp ) dev-util/indent app-admin/genromfs virtual/pkgconfig
-DESCRIPTION=User space utilities for the zSeries (s390) Linux kernel and device drivers
-EAPI=5
-HOMEPAGE=https://www.ibm.com/developerworks/linux/linux390/s390-tools.html
-IUSE=fuse ncurses snmp zfcpdump
-KEYWORDS=-* s390
-LICENSE=GPL-2
-RDEPEND=sys-libs/zlib fuse? ( sys-fs/fuse ) ncurses? ( sys-libs/ncurses:0= ) snmp? ( net-analyzer/net-snmp )
-SLOT=0
-SRC_URI=https://download.boulder.ibm.com/ibmdl/pub/software/dw/linux390/ht_src/s390-tools-1.23.1.tar.bz2 zfcpdump? ( mirror://sourceforge/e2fsprogs/e2fsprogs-1.41.3.tar.gz mirror://kernel/linux/kernel/v2.6/linux-2.6.27.tar.bz2 )
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=27148bd88dfc6630fb68f2ab4a3c0262
diff --git a/metadata/md5-cache/sys-apps/s390-tools-1.36.1 b/metadata/md5-cache/sys-apps/s390-tools-1.36.1
deleted file mode 100644
index ecb5809f9526..000000000000
--- a/metadata/md5-cache/sys-apps/s390-tools-1.36.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install
-DEPEND=fuse? ( sys-fs/fuse ) ncurses? ( sys-libs/ncurses:0= ) pfm? ( app-misc/pfm ) snmp? ( net-analyzer/net-snmp ) zlib? ( sys-libs/zlib ) dev-util/indent app-admin/genromfs virtual/pkgconfig
-DESCRIPTION=User space utilities for the zSeries (s390) Linux kernel and device drivers
-EAPI=5
-HOMEPAGE=https://www.ibm.com/developerworks/linux/linux390/s390-tools.html
-IUSE=fuse ncurses pfm snmp zlib
-KEYWORDS=-* s390
-LICENSE=GPL-2
-RDEPEND=fuse? ( sys-fs/fuse ) ncurses? ( sys-libs/ncurses:0= ) pfm? ( app-misc/pfm ) snmp? ( net-analyzer/net-snmp ) zlib? ( sys-libs/zlib )
-SLOT=0
-SRC_URI=https://download.boulder.ibm.com/ibmdl/pub/software/dw/linux390/ht_src/s390-tools-1.36.1.tar.bz2
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88
-_md5_=c2f7f06ad7e03e393d4bcf0c13ce7a81
diff --git a/metadata/md5-cache/sys-apps/s390-tools-2.2.0 b/metadata/md5-cache/sys-apps/s390-tools-2.2.0
index 190dec3b9f96..140e32197c87 100644
--- a/metadata/md5-cache/sys-apps/s390-tools-2.2.0
+++ b/metadata/md5-cache/sys-apps/s390-tools-2.2.0
@@ -4,10 +4,10 @@ DESCRIPTION=User space utilities for the zSeries (s390) Linux kernel and device
 EAPI=5
 HOMEPAGE=https://www.ibm.com/developerworks/linux/linux390/s390-tools.html
 IUSE=fuse ncurses pfm snmp zlib
-KEYWORDS=-* ~s390
+KEYWORDS=-* s390
 LICENSE=GPL-2 MIT
 RDEPEND=fuse? ( sys-fs/fuse:= ) ncurses? ( sys-libs/ncurses:0= ) pfm? ( app-misc/pfm ) snmp? ( net-analyzer/net-snmp ) zlib? ( sys-libs/zlib )
 SLOT=0
 SRC_URI=https://github.com/ibm-s390-tools/s390-tools/archive/v2.2.0.tar.gz -> s390-tools-2.2.0.tar.gz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88
-_md5_=9cb35816477a1a9dd66cfce2e94e0b17
+_md5_=cf37e0788bd5df69e9f31dfb9bfaafd0
diff --git a/metadata/md5-cache/sys-apps/s390-tools-2.4.0 b/metadata/md5-cache/sys-apps/s390-tools-2.4.0
new file mode 100644
index 000000000000..e2cefb464ae5
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/s390-tools-2.4.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install
+DEPEND=fuse? ( sys-fs/fuse:= ) ncurses? ( sys-libs/ncurses:0= ) pfm? ( app-misc/pfm ) snmp? ( net-analyzer/net-snmp ) zlib? ( sys-libs/zlib ) dev-util/indent app-admin/genromfs virtual/pkgconfig
+DESCRIPTION=User space utilities for the zSeries (s390) Linux kernel and device drivers
+EAPI=5
+HOMEPAGE=https://www.ibm.com/developerworks/linux/linux390/s390-tools.html
+IUSE=fuse ncurses pfm snmp zlib
+KEYWORDS=-* ~s390
+LICENSE=GPL-2 MIT
+RDEPEND=fuse? ( sys-fs/fuse:= ) ncurses? ( sys-libs/ncurses:0= ) pfm? ( app-misc/pfm ) snmp? ( net-analyzer/net-snmp ) zlib? ( sys-libs/zlib )
+SLOT=0
+SRC_URI=https://github.com/ibm-s390-tools/s390-tools/archive/v2.4.0.tar.gz -> s390-tools-2.4.0.tar.gz
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88
+_md5_=9cb35816477a1a9dd66cfce2e94e0b17
diff --git a/metadata/md5-cache/sys-apps/sed-4.3-r1 b/metadata/md5-cache/sys-apps/sed-4.3-r1
deleted file mode 100644
index 84a266074c4b..000000000000
--- a/metadata/md5-cache/sys-apps/sed-4.3-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure prepare
-DEPEND=acl? ( virtual/acl ) nls? ( virtual/libintl ) selinux? ( sys-libs/libselinux ) nls? ( sys-devel/gettext )
-DESCRIPTION=Super-useful stream editor
-EAPI=5
-HOMEPAGE=http://sed.sourceforge.net/
-IUSE=acl nls selinux static
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=GPL-3
-RDEPEND=acl? ( virtual/acl ) nls? ( virtual/libintl ) selinux? ( sys-libs/libselinux )
-SLOT=0
-SRC_URI=mirror://gnu/sed/sed-4.3.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e3eaf1c1e58cd5a2a45cb9c88e7d914f
diff --git a/metadata/md5-cache/sys-apps/sed-4.4-r1 b/metadata/md5-cache/sys-apps/sed-4.4-r1
deleted file mode 100644
index dfce00654ad4..000000000000
--- a/metadata/md5-cache/sys-apps/sed-4.4-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure prepare
-DEPEND=acl? ( virtual/acl ) nls? ( virtual/libintl ) selinux? ( sys-libs/libselinux ) nls? ( sys-devel/gettext )
-DESCRIPTION=Super-useful stream editor
-EAPI=5
-HOMEPAGE=http://sed.sourceforge.net/
-IUSE=acl forced-sandbox nls selinux static
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=GPL-3
-RDEPEND=acl? ( virtual/acl ) nls? ( virtual/libintl ) selinux? ( sys-libs/libselinux )
-SLOT=0
-SRC_URI=mirror://gnu/sed/sed-4.4.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9e08c60b0142646477201675b8f71b07
diff --git a/metadata/md5-cache/sys-apps/sed-4.5 b/metadata/md5-cache/sys-apps/sed-4.5
index 7b591b8c89c9..3b74d723a2f2 100644
--- a/metadata/md5-cache/sys-apps/sed-4.5
+++ b/metadata/md5-cache/sys-apps/sed-4.5
@@ -4,10 +4,10 @@ DESCRIPTION=Super-useful stream editor
 EAPI=6
 HOMEPAGE=http://sed.sourceforge.net/
 IUSE=acl forced-sandbox nls selinux static
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-3
 RDEPEND=acl? ( virtual/acl ) nls? ( virtual/libintl ) selinux? ( sys-libs/libselinux )
 SLOT=0
 SRC_URI=mirror://gnu/sed/sed-4.5.tar.xz
 _eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7060d14cd9e0ccc975edac27afa2e4ed
+_md5_=9a73f0bf4846c5145699922d86f3ed46
diff --git a/metadata/md5-cache/sys-apps/sysvinit-2.90 b/metadata/md5-cache/sys-apps/sysvinit-2.90
new file mode 100644
index 000000000000..6e5b8f98f36c
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/sysvinit-2.90
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst prepare
+DEPEND=selinux? ( >=sys-libs/libselinux-1.28 ) virtual/os-headers
+DESCRIPTION=/sbin/init - parent of all processes
+EAPI=6
+HOMEPAGE=https://savannah.nongnu.org/projects/sysvinit
+IUSE=selinux ibm static kernel_FreeBSD
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=selinux? ( >=sys-libs/libselinux-1.28 ) selinux? ( sec-policy/selinux-shutdown ) !<sys-apps/openrc-0.13
+SLOT=0
+SRC_URI=mirror://nongnu/sysvinit/sysvinit-2.90.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=d691baf0ff0a2e0bbcfb78f8a12bf8dc
diff --git a/metadata/md5-cache/sys-apps/usbutils-009 b/metadata/md5-cache/sys-apps/usbutils-009
index c6fe100191bc..9d5e52751f94 100644
--- a/metadata/md5-cache/sys-apps/usbutils-009
+++ b/metadata/md5-cache/sys-apps/usbutils-009
@@ -4,11 +4,11 @@ DESCRIPTION=USB enumeration utilities
 EAPI=6
 HOMEPAGE=https://www.kernel.org/pub/linux/utils/usb/usbutils/ https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usbutils.git/
 IUSE=python python_targets_python2_7
-KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ~ppc ~ppc64 s390 sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=virtual/libusb:1= virtual/libudev:= sys-apps/hwids python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=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? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://kernel/linux/utils/usb/usbutils/usbutils-009.tar.xz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	ffa9c3284c6b07b8c9f7933911f63812	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=a7c8e2676fa89ec1960a81dc28f69cf4
+_md5_=d7a2a947d5c5f5791c3710578fb39558
diff --git a/metadata/md5-cache/sys-apps/xinetd-2.3.15-r2 b/metadata/md5-cache/sys-apps/xinetd-2.3.15-r2
index 75ac1f3f16d6..4eb17831ca05 100644
--- a/metadata/md5-cache/sys-apps/xinetd-2.3.15-r2
+++ b/metadata/md5-cache/sys-apps/xinetd-2.3.15-r2
@@ -4,10 +4,10 @@ DESCRIPTION=powerful replacement for inetd
 EAPI=5
 HOMEPAGE=http://www.xinetd.org/
 IUSE=perl rpc tcpd
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
 LICENSE=BSD
 RDEPEND=tcpd? ( >=sys-apps/tcp-wrappers-7.6-r2 ) rpc? ( net-libs/libtirpc:= ) perl? ( dev-lang/perl )
 SLOT=0
 SRC_URI=http://www.xinetd.org/xinetd-2.3.15.tar.gz
 _eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=efe9059a0312b1125a62507b3dc50bad
+_md5_=cf2d0ce7ad9c446a3ece20eec2075afa
diff --git a/metadata/md5-cache/sys-apps/xinetd-2.3.15-r3 b/metadata/md5-cache/sys-apps/xinetd-2.3.15-r3
index 8f05e6473d9c..eef00680b125 100644
--- a/metadata/md5-cache/sys-apps/xinetd-2.3.15-r3
+++ b/metadata/md5-cache/sys-apps/xinetd-2.3.15-r3
@@ -4,10 +4,10 @@ DESCRIPTION=powerful replacement for inetd
 EAPI=5
 HOMEPAGE=http://www.xinetd.org/ https://github.com/xinetd-org/xinetd
 IUSE=perl rpc tcpd
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd
 LICENSE=BSD
 RDEPEND=tcpd? ( >=sys-apps/tcp-wrappers-7.6-r2 ) rpc? ( net-libs/libtirpc:= ) perl? ( dev-lang/perl )
 SLOT=0
 SRC_URI=http://www.xinetd.org/xinetd-2.3.15.tar.gz
 _eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=74ec3c070bcdd1352b57ecb0487252c3
+_md5_=47ac8c447b1ac95cd58fdf3d0045e100
diff --git a/metadata/md5-cache/sys-apps/xinetd-2.3.15.3 b/metadata/md5-cache/sys-apps/xinetd-2.3.15.3
index fd124247eb77..db88a4c1e826 100644
--- a/metadata/md5-cache/sys-apps/xinetd-2.3.15.3
+++ b/metadata/md5-cache/sys-apps/xinetd-2.3.15.3
@@ -1,13 +1,13 @@
 DEFINED_PHASES=configure install
-DEPEND=selinux? ( sys-libs/libselinux ) kernel_linux? ( net-libs/libtirpc:= ) tcpd? ( >=sys-apps/tcp-wrappers-7.6-r2 ) virtual/pkgconfig virtual/pkgconfig
+DEPEND=selinux? ( sys-libs/libselinux ) net-libs/libtirpc:= tcpd? ( >=sys-apps/tcp-wrappers-7.6-r2 ) virtual/pkgconfig virtual/pkgconfig
 DESCRIPTION=powerful replacement for inetd
 EAPI=6
 HOMEPAGE=https://github.com/openSUSE/xinetd
 IUSE=perl selinux tcpd
-KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86
 LICENSE=BSD
-RDEPEND=selinux? ( sys-libs/libselinux ) kernel_linux? ( net-libs/libtirpc:= ) tcpd? ( >=sys-apps/tcp-wrappers-7.6-r2 ) perl? ( dev-lang/perl )
+RDEPEND=selinux? ( sys-libs/libselinux ) net-libs/libtirpc:= tcpd? ( >=sys-apps/tcp-wrappers-7.6-r2 ) perl? ( dev-lang/perl )
 SLOT=0
 SRC_URI=https://github.com/openSUSE/xinetd/releases/download/2.3.15.3/xinetd-2.3.15.3.tar.xz
 _eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=cc4e074d5ae209dada0f8dbb37b05c59
+_md5_=51a6091a21ff01dd16ab7f41f163ccae
diff --git a/metadata/md5-cache/sys-apps/xinetd-2.3.15.3-r2 b/metadata/md5-cache/sys-apps/xinetd-2.3.15.3-r2
new file mode 100644
index 000000000000..db841d8a631c
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/xinetd-2.3.15.3-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=rpc? ( net-libs/libtirpc:= ) selinux? ( sys-libs/libselinux ) tcpd? ( >=sys-apps/tcp-wrappers-7.6-r2 ) virtual/pkgconfig virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=powerful replacement for inetd
+EAPI=6
+HOMEPAGE=https://github.com/xinetd-org/xinetd https://github.com/openSUSE/xinetd
+IUSE=perl rpc selinux tcpd
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=BSD
+RDEPEND=rpc? ( net-libs/libtirpc:= ) selinux? ( sys-libs/libselinux ) tcpd? ( >=sys-apps/tcp-wrappers-7.6-r2 ) perl? ( dev-lang/perl )
+SLOT=0
+SRC_URI=https://github.com/openSUSE/xinetd/releases/download/2.3.15.3/xinetd-2.3.15.3.tar.xz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=98573de419f717b4b21268fc5307ea28
diff --git a/metadata/md5-cache/sys-apps/yarn-1.7.0 b/metadata/md5-cache/sys-apps/yarn-1.7.0
new file mode 100644
index 000000000000..b4dc2ee3ef97
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/yarn-1.7.0
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DEPEND=!dev-util/cmdtest net-libs/nodejs
+DESCRIPTION=Fast, reliable, and secure node dependency management
+EAPI=6
+HOMEPAGE=https://yarnpkg.com
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD-2
+RDEPEND=!dev-util/cmdtest net-libs/nodejs
+SLOT=0
+SRC_URI=https://github.com/yarnpkg/yarn/releases/download/v1.7.0/yarn-v1.7.0.tar.gz
+_md5_=84a7f4b3608aace13a64770867e81a43
diff --git a/metadata/md5-cache/sys-apps/yarn-1.8.0 b/metadata/md5-cache/sys-apps/yarn-1.8.0
new file mode 100644
index 000000000000..f8e20cf2c2af
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/yarn-1.8.0
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DEPEND=!dev-util/cmdtest net-libs/nodejs
+DESCRIPTION=Fast, reliable, and secure node dependency management
+EAPI=6
+HOMEPAGE=https://yarnpkg.com
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD-2
+RDEPEND=!dev-util/cmdtest net-libs/nodejs
+SLOT=0
+SRC_URI=https://github.com/yarnpkg/yarn/releases/download/v1.8.0/yarn-v1.8.0.tar.gz
+_md5_=84a7f4b3608aace13a64770867e81a43