gentoo resync : 08.06.2019

37 files changed, 90 insertions, 131 deletions

diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 90046f634616..da5fdb1be7eb 100644
--- a/metadata/md5-cache/dev-util/Manifest.gz
+++ b/metadata/md5-cache/dev-util/Manifest.gz
diff --git a/metadata/md5-cache/dev-util/android-studio-3.4.0.18.183.5452501 b/metadata/md5-cache/dev-util/android-studio-3.4.0.18.183.5452501
index d933490d280f..748da406fe83 100644
--- a/metadata/md5-cache/dev-util/android-studio-3.4.0.18.183.5452501
+++ b/metadata/md5-cache/dev-util/android-studio-3.4.0.18.183.5452501
@@ -5,11 +5,11 @@ DESCRIPTION=Android development environment based on IntelliJ IDEA
 EAPI=7
 HOMEPAGE=http://developer.android.com/sdk/installing/studio.html
 IUSE=custom-jdk selinux elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
 RDEPEND=dev-java/commons-logging:0 dev-java/log4j:0 >=virtual/jdk-1.7 selinux? ( sec-policy/selinux-android ) >=app-arch/bzip2-1.0.6-r4 dev-java/commons-logging:0 dev-java/log4j:0 >=dev-libs/expat-2.1.0-r3 >=dev-libs/libffi-3.0.13-r1 >=media-libs/fontconfig-2.10.92 >=media-libs/freetype-2.5.5 >=media-libs/libpng-1.2.51 >=media-libs/mesa-10.2.8 || ( gnome-extra/zenity kde-apps/kdialog x11-apps/xmessage x11-libs/libnotify ) >=sys-libs/ncurses-5.9-r3:5/5[tinfo] >=sys-libs/zlib-1.2.8-r1 >=x11-libs/libX11-1.6.2 >=x11-libs/libXau-1.0.7-r1 >=x11-libs/libXdamage-1.1.4-r1 >=x11-libs/libXdmcp-1.1.1-r1 >=x11-libs/libXext-1.3.2 >=x11-libs/libXfixes-5.0.1 >=x11-libs/libXrender-0.9.8 >=x11-libs/libXxf86vm-1.1.3 >=x11-libs/libdrm-2.4.46 >=x11-libs/libxcb-1.9.1 >=x11-libs/libxshmfence-1.1 >=dev-java/java-config-2.2.0-r3
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://dl.google.com/dl/android/studio/ide-zips/3.4.0.18/android-studio-ide-183.5452501-linux.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	dd352559d0e143500ec878acc74da909
-_md5_=9e3348bca484d90737a7897b173c6cc2
+_md5_=5c35e1f0eb77def15fc078b4c3815a67
diff --git a/metadata/md5-cache/dev-util/android-studio-3.4.1.0.183.5522156 b/metadata/md5-cache/dev-util/android-studio-3.4.1.0.183.5522156
new file mode 100644
index 000000000000..21fb90de99b3
--- /dev/null
+++ b/metadata/md5-cache/dev-util/android-studio-3.4.1.0.183.5522156
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/patchelf
+DEFINED_PHASES=compile install preinst prepare setup
+DEPEND=dev-java/commons-logging:0 dev-java/log4j:0 >=dev-java/java-config-2.2.0-r3
+DESCRIPTION=Android development environment based on IntelliJ IDEA
+EAPI=7
+HOMEPAGE=http://developer.android.com/sdk/installing/studio.html
+IUSE=custom-jdk selinux elibc_FreeBSD
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-java/commons-logging:0 dev-java/log4j:0 >=virtual/jdk-1.7 selinux? ( sec-policy/selinux-android ) >=app-arch/bzip2-1.0.6-r4 dev-java/commons-logging:0 dev-java/log4j:0 >=dev-libs/expat-2.1.0-r3 >=dev-libs/libffi-3.0.13-r1 >=media-libs/fontconfig-2.10.92 >=media-libs/freetype-2.5.5 >=media-libs/libpng-1.2.51 >=media-libs/mesa-10.2.8 || ( gnome-extra/zenity kde-apps/kdialog x11-apps/xmessage x11-libs/libnotify ) >=sys-libs/ncurses-5.9-r3:5/5[tinfo] >=sys-libs/zlib-1.2.8-r1 >=x11-libs/libX11-1.6.2 >=x11-libs/libXau-1.0.7-r1 >=x11-libs/libXdamage-1.1.4-r1 >=x11-libs/libXdmcp-1.1.1-r1 >=x11-libs/libXext-1.3.2 >=x11-libs/libXfixes-5.0.1 >=x11-libs/libXrender-0.9.8 >=x11-libs/libXxf86vm-1.1.3 >=x11-libs/libdrm-2.4.46 >=x11-libs/libxcb-1.9.1 >=x11-libs/libxshmfence-1.1 >=dev-java/java-config-2.2.0-r3
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://dl.google.com/dl/android/studio/ide-zips/3.4.1.0/android-studio-ide-183.5522156-linux.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	dd352559d0e143500ec878acc74da909
+_md5_=9e3348bca484d90737a7897b173c6cc2
diff --git a/metadata/md5-cache/dev-util/aruba-0.6.2-r1 b/metadata/md5-cache/dev-util/aruba-0.6.2-r1
deleted file mode 100644
index a86f07952a49..000000000000
--- a/metadata/md5-cache/dev-util/aruba-0.6.2-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( sys-devel/bc ) test? ( ruby_targets_ruby24? ( >=dev-ruby/childprocess-0.3.6[ruby_targets_ruby24] >=dev-ruby/rspec-expectations-2.7:2[ruby_targets_ruby24] >=dev-util/cucumber-1.1.1[ruby_targets_ruby24] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/rspec-2.11:2[ruby_targets_ruby24] >=dev-ruby/bcat-0.6.1[ruby_targets_ruby24] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby24? ( test? ( dev-util/cucumber[ruby_targets_ruby24] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
-DESCRIPTION=Cucumber steps for driving out command line applications
-EAPI=5
-HOMEPAGE=https://github.com/cucumber/aruba
-IUSE=test elibc_FreeBSD ruby_targets_ruby24 test test
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 s390 sparc x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby24? ( >=dev-ruby/childprocess-0.3.6[ruby_targets_ruby24] >=dev-ruby/rspec-expectations-2.7:2[ruby_targets_ruby24] >=dev-util/cucumber-1.1.1[ruby_targets_ruby24] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby24 )
-SLOT=0
-SRC_URI=mirror://rubygems/aruba-0.6.2.gem
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=1ca2e66640f8d6f1c13ff275fc0301ea
diff --git a/metadata/md5-cache/dev-util/aruba-0.6.2-r2 b/metadata/md5-cache/dev-util/aruba-0.6.2-r2
index 1e6240b70e50..ac75a2295cd8 100644
--- a/metadata/md5-cache/dev-util/aruba-0.6.2-r2
+++ b/metadata/md5-cache/dev-util/aruba-0.6.2-r2
@@ -4,11 +4,11 @@ DESCRIPTION=Cucumber steps for driving out command line applications
 EAPI=6
 HOMEPAGE=https://github.com/cucumber/aruba
 IUSE=test elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test test
-KEYWORDS=alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 s390 sparc x86
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sparc x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby24? ( >=dev-ruby/childprocess-0.3.6[ruby_targets_ruby24] >=dev-ruby/rspec-expectations-2.7:2[ruby_targets_ruby24] >=dev-util/cucumber-1.1.1[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/childprocess-0.3.6[ruby_targets_ruby25] >=dev-ruby/rspec-expectations-2.7:2[ruby_targets_ruby25] >=dev-util/cucumber-1.1.1[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/childprocess-0.3.6[ruby_targets_ruby26] >=dev-ruby/rspec-expectations-2.7:2[ruby_targets_ruby26] >=dev-util/cucumber-1.1.1[ruby_targets_ruby26] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
 REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=0
 SRC_URI=mirror://rubygems/aruba-0.6.2.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=1ce19b015f538fe7b5a468a9efa5c349
+_md5_=c06b8ba4c7b8e37a86163103a43624d2
diff --git a/metadata/md5-cache/dev-util/ccache-3.6 b/metadata/md5-cache/dev-util/ccache-3.6
index a65f3f22fd88..ef9a60c46322 100644
--- a/metadata/md5-cache/dev-util/ccache-3.6
+++ b/metadata/md5-cache/dev-util/ccache-3.6
@@ -3,10 +3,10 @@ DEPEND=app-arch/xz-utils sys-libs/zlib
 DESCRIPTION=fast compiler cache
 EAPI=7
 HOMEPAGE=https://ccache.samba.org/
-KEYWORDS=alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd
+KEYWORDS=alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd
 LICENSE=GPL-3
 RDEPEND=app-arch/xz-utils sys-libs/zlib dev-util/shadowman sys-apps/gentoo-functions
 SLOT=0
 SRC_URI=https://www.samba.org/ftp/ccache/ccache-3.6.tar.xz
 _eclasses_=readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
-_md5_=59e52a27edfbb8e2e4da83fc891950ac
+_md5_=9a92a39a8f94ec587cd0bc3259c5b01a
diff --git a/metadata/md5-cache/dev-util/cmake-3.14.3 b/metadata/md5-cache/dev-util/cmake-3.14.3
index 61a63cc517be..a5d44df4cde6 100644
--- a/metadata/md5-cache/dev-util/cmake-3.14.3
+++ b/metadata/md5-cache/dev-util/cmake-3.14.3
@@ -5,10 +5,10 @@ DESCRIPTION=Cross platform Make
 EAPI=7
 HOMEPAGE=https://cmake.org/
 IUSE=doc emacs system-jsoncpp ncurses qt5 test test
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=CMake
 RDEPEND=app-crypt/rhash >=app-arch/libarchive-3.0.0:= >=dev-libs/expat-2.0.1 >=dev-libs/libuv-1.10.0:= >=net-misc/curl-7.21.5[ssl] sys-libs/zlib virtual/pkgconfig emacs? ( virtual/emacs ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= )
 SLOT=0
 SRC_URI=https://cmake.org/files/v3.14/cmake-3.14.3.tar.gz
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	elisp-common	23f47b2e1de7abf387105eddd1318738	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=29e6629666ed9e088b9d3e12f76684c6
+_md5_=8ee862c77ff022a2dde924e0b8b7ac36
diff --git a/metadata/md5-cache/dev-util/ctags-20190331 b/metadata/md5-cache/dev-util/ctags-20190331
index c3e370e971bf..c26e594f0679 100644
--- a/metadata/md5-cache/dev-util/ctags-20190331
+++ b/metadata/md5-cache/dev-util/ctags-20190331
@@ -4,10 +4,10 @@ DESCRIPTION=Exuberant Ctags creates tags files for code browsing in editors
 EAPI=6
 HOMEPAGE=https://ctags.io/ https://github.com/universal-ctags/ctags
 IUSE=json xml yaml
-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=GPL-2+
 RDEPEND=json? ( dev-libs/jansson ) xml? ( dev-libs/libxml2:2 ) yaml? ( dev-libs/libyaml ) app-eselect/eselect-ctags
 SLOT=0
 SRC_URI=https://github.com/universal-ctags/ctags/archive/95975bd157cc1326120977ce530f0477bcbf43b1.tar.gz -> ctags-20190331.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=8af1d3c9ce3ded88c5fb023f5d2b22dd
+_md5_=228fc3b266a3cf9d06469d4c8fcfcc14
diff --git a/metadata/md5-cache/dev-util/cucumber-2.4.0-r1 b/metadata/md5-cache/dev-util/cucumber-2.4.0-r1
deleted file mode 100644
index 2eb87be07bb8..000000000000
--- a/metadata/md5-cache/dev-util/cucumber-2.4.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] dev-ruby/bundler[ruby_targets_ruby24] >=dev-ruby/nokogiri-1.5.2[ruby_targets_ruby24] >=dev-ruby/syntax-1.0.0[ruby_targets_ruby24] >=dev-util/aruba-0.6.1[ruby_targets_ruby24] =dev-util/aruba-0.6*[ruby_targets_ruby24] >=dev-ruby/json-1.7[ruby_targets_ruby24] >=dev-util/cucumber-2[ruby_targets_ruby24] >=dev-ruby/mime-types-2.99:2[ruby_targets_ruby24] ) ) test? ( ruby_targets_ruby24? ( >=dev-ruby/builder-2.1.2:*[ruby_targets_ruby24] >=dev-util/cucumber-core-1.5.0:0[ruby_targets_ruby24] >=dev-util/cucumber-wire-0.0.1:0[ruby_targets_ruby24] >=dev-ruby/diff-lcs-1.1.3[ruby_targets_ruby24] >=dev-ruby/gherkin-4.0:4[ruby_targets_ruby24] >=dev-ruby/multi_json-1.7.5[ruby_targets_ruby24] >=dev-ruby/multi_test-0.1.2[ruby_targets_ruby24] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
-DESCRIPTION=Executable feature scenarios
-EAPI=5
-HOMEPAGE=https://github.com/aslakhellesoy/cucumber/wikis
-IUSE=examples test test elibc_FreeBSD ruby_targets_ruby24 test test
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 s390 sparc x86
-LICENSE=Ruby
-RDEPEND=ruby_targets_ruby24? ( >=dev-ruby/builder-2.1.2:*[ruby_targets_ruby24] >=dev-util/cucumber-core-1.5.0:0[ruby_targets_ruby24] >=dev-util/cucumber-wire-0.0.1:0[ruby_targets_ruby24] >=dev-ruby/diff-lcs-1.1.3[ruby_targets_ruby24] >=dev-ruby/gherkin-4.0:4[ruby_targets_ruby24] >=dev-ruby/multi_json-1.7.5[ruby_targets_ruby24] >=dev-ruby/multi_test-0.1.2[ruby_targets_ruby24] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby24 )
-SLOT=0
-SRC_URI=mirror://rubygems/cucumber-2.4.0.gem
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=c33dfcb8d20f9d74bd74bcdbbc3b8f5c
diff --git a/metadata/md5-cache/dev-util/cucumber-3.1.2 b/metadata/md5-cache/dev-util/cucumber-3.1.2
index c5403ffae523..c402791eea14 100644
--- a/metadata/md5-cache/dev-util/cucumber-3.1.2
+++ b/metadata/md5-cache/dev-util/cucumber-3.1.2
@@ -4,11 +4,11 @@ DESCRIPTION=Executable feature scenarios
 EAPI=6
 HOMEPAGE=https://github.com/aslakhellesoy/cucumber/wikis
 IUSE=examples test test elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test test
-KEYWORDS=alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 s390 sparc x86
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sparc x86
 LICENSE=Ruby
 RDEPEND=ruby_targets_ruby24? ( >=dev-ruby/builder-2.1.2:*[ruby_targets_ruby24] dev-util/cucumber-core:3.2[ruby_targets_ruby24] >=dev-util/cucumber-expressions-6.0.1:6.0[ruby_targets_ruby24] >=dev-util/cucumber-wire-0.0.1:0[ruby_targets_ruby24] >=dev-ruby/diff-lcs-1.3:0[ruby_targets_ruby24] >=dev-ruby/gherkin-5.1.0:5[ruby_targets_ruby24] >=dev-ruby/multi_json-1.7.5[ruby_targets_ruby24] >=dev-ruby/multi_test-0.1.2[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/builder-2.1.2:*[ruby_targets_ruby25] dev-util/cucumber-core:3.2[ruby_targets_ruby25] >=dev-util/cucumber-expressions-6.0.1:6.0[ruby_targets_ruby25] >=dev-util/cucumber-wire-0.0.1:0[ruby_targets_ruby25] >=dev-ruby/diff-lcs-1.3:0[ruby_targets_ruby25] >=dev-ruby/gherkin-5.1.0:5[ruby_targets_ruby25] >=dev-ruby/multi_json-1.7.5[ruby_targets_ruby25] >=dev-ruby/multi_test-0.1.2[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/builder-2.1.2:*[ruby_targets_ruby26] dev-util/cucumber-core:3.2[ruby_targets_ruby26] >=dev-util/cucumber-expressions-6.0.1:6.0[ruby_targets_ruby26] >=dev-util/cucumber-wire-0.0.1:0[ruby_targets_ruby26] >=dev-ruby/diff-lcs-1.3:0[ruby_targets_ruby26] >=dev-ruby/gherkin-5.1.0:5[ruby_targets_ruby26] >=dev-ruby/multi_json-1.7.5[ruby_targets_ruby26] >=dev-ruby/multi_test-0.1.2[ruby_targets_ruby26] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
 REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=0
 SRC_URI=https://github.com/cucumber/cucumber-ruby/archive/v3.1.2.tar.gz -> cucumber-3.1.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=b7f0d4210306302feaefa64acab1aac6
+_md5_=bfba3d7c69f413190dc397f3db44674b
diff --git a/metadata/md5-cache/dev-util/cucumber-core-3.2.1 b/metadata/md5-cache/dev-util/cucumber-core-3.2.1
index 169c201ea807..cc978e22616a 100644
--- a/metadata/md5-cache/dev-util/cucumber-core-3.2.1
+++ b/metadata/md5-cache/dev-util/cucumber-core-3.2.1
@@ -4,11 +4,11 @@ DESCRIPTION=Executable feature scenarios
 EAPI=6
 HOMEPAGE=https://github.com/aslakhellesoy/cucumber/wikis
 IUSE=test elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
-KEYWORDS=alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 s390 sparc x86
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sparc x86
 LICENSE=Ruby
 RDEPEND=ruby_targets_ruby24? ( >=dev-ruby/backports-3.8.0[ruby_targets_ruby24] >=dev-util/cucumber-tag_expressions-1.1.0[ruby_targets_ruby24] dev-ruby/gherkin:5[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/backports-3.8.0[ruby_targets_ruby25] >=dev-util/cucumber-tag_expressions-1.1.0[ruby_targets_ruby25] dev-ruby/gherkin:5[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/backports-3.8.0[ruby_targets_ruby26] >=dev-util/cucumber-tag_expressions-1.1.0[ruby_targets_ruby26] dev-ruby/gherkin:5[ruby_targets_ruby26] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
 REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=3.2
 SRC_URI=https://github.com/cucumber/cucumber-ruby-core/archive/v3.2.1.tar.gz -> cucumber-core-3.2.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=002207e0d9203e6d7f016c0a94934cf3
+_md5_=19f86c114345e51ea36bdb6e7f2bc356
diff --git a/metadata/md5-cache/dev-util/cucumber-expressions-6.0.1 b/metadata/md5-cache/dev-util/cucumber-expressions-6.0.1
index 63a5dae61283..f086fa4534a1 100644
--- a/metadata/md5-cache/dev-util/cucumber-expressions-6.0.1
+++ b/metadata/md5-cache/dev-util/cucumber-expressions-6.0.1
@@ -4,11 +4,11 @@ DESCRIPTION=a simpler alternative to Regular Expressions
 EAPI=6
 HOMEPAGE=https://github.com/cucumber/cucumber-expressions-ruby#readme
 IUSE=elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
-KEYWORDS=alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 s390 sparc x86
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sparc x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
 REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=6.0
 SRC_URI=mirror://rubygems/cucumber-expressions-6.0.1.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=e883c051d3efea95a2f7e5736fc25442
+_md5_=715fecff670da9a96f56407b7f7e9c7f
diff --git a/metadata/md5-cache/dev-util/cucumber-tag_expressions-1.1.1 b/metadata/md5-cache/dev-util/cucumber-tag_expressions-1.1.1
index bdb7838b5367..fa7d1c0d9ccb 100644
--- a/metadata/md5-cache/dev-util/cucumber-tag_expressions-1.1.1
+++ b/metadata/md5-cache/dev-util/cucumber-tag_expressions-1.1.1
@@ -4,11 +4,11 @@ DESCRIPTION=Cucumber tag expressions for ruby
 EAPI=6
 HOMEPAGE=https://docs.cucumber.io/tag-expressions/
 IUSE=elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
-KEYWORDS=alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 s390 sparc x86
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sparc x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
 REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=1
 SRC_URI=mirror://rubygems/cucumber-tag_expressions-1.1.1.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=b3bfee6f0b12748a2f556f23e6567492
+_md5_=dfb5a2769d3206052e54a598b2becf45
diff --git a/metadata/md5-cache/dev-util/cucumber-wire-0.0.1 b/metadata/md5-cache/dev-util/cucumber-wire-0.0.1
deleted file mode 100644
index 9e3d8986a7df..000000000000
--- a/metadata/md5-cache/dev-util/cucumber-wire-0.0.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby24? ( test? ( dev-util/cucumber[ruby_targets_ruby24] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
-DESCRIPTION=Executable feature scenarios
-EAPI=5
-HOMEPAGE=https://github.com/aslakhellesoy/cucumber/wikis
-IUSE=test elibc_FreeBSD ruby_targets_ruby24 doc test test
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86
-LICENSE=Ruby
-RDEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby24 )
-SLOT=0
-SRC_URI=mirror://rubygems/cucumber-wire-0.0.1.gem
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=ad7e5a1a70c446091cc1cc406a696c5c
diff --git a/metadata/md5-cache/dev-util/cucumber-wire-0.0.1-r1 b/metadata/md5-cache/dev-util/cucumber-wire-0.0.1-r1
index bfd1cf6c911e..ee27bc1fa362 100644
--- a/metadata/md5-cache/dev-util/cucumber-wire-0.0.1-r1
+++ b/metadata/md5-cache/dev-util/cucumber-wire-0.0.1-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Executable feature scenarios
 EAPI=6
 HOMEPAGE=https://github.com/aslakhellesoy/cucumber/wikis
 IUSE=test elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
-KEYWORDS=alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 s390 sparc x86
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sparc x86
 LICENSE=Ruby
 RDEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
 REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=0
 SRC_URI=mirror://rubygems/cucumber-wire-0.0.1.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=64298aca31a3e017d711916caab7fd81
+_md5_=a9bf236b984d4a38de892842eab7121f
diff --git a/metadata/md5-cache/dev-util/dejagnu-1.4.4-r3 b/metadata/md5-cache/dev-util/dejagnu-1.4.4-r3
deleted file mode 100644
index f3d5157e572a..000000000000
--- a/metadata/md5-cache/dev-util/dejagnu-1.4.4-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install test unpack
-DEPEND=dev-lang/tcl dev-tcltk/expect
-DESCRIPTION=framework for testing other programs
-EAPI=0
-HOMEPAGE=https://www.gnu.org/software/dejagnu/
-IUSE=doc
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=dev-lang/tcl dev-tcltk/expect
-SLOT=0
-SRC_URI=mirror://gnu/dejagnu/dejagnu-1.4.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=4f4c55db4fef2fc94944506d4b765e5a
diff --git a/metadata/md5-cache/dev-util/dejagnu-1.5 b/metadata/md5-cache/dev-util/dejagnu-1.5
deleted file mode 100644
index d63dee61ef1a..000000000000
--- a/metadata/md5-cache/dev-util/dejagnu-1.5
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install test
-DEPEND=dev-lang/tcl dev-tcltk/expect
-DESCRIPTION=framework for testing other programs
-EAPI=0
-HOMEPAGE=https://www.gnu.org/software/dejagnu/
-IUSE=doc
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris
-LICENSE=GPL-3
-RDEPEND=dev-lang/tcl dev-tcltk/expect
-SLOT=0
-SRC_URI=mirror://gnu/dejagnu/dejagnu-1.5.tar.gz
-_md5_=dc32b86e233371a919bd1b11d3f1b5f7
diff --git a/metadata/md5-cache/dev-util/devhelp-3.30.1 b/metadata/md5-cache/dev-util/devhelp-3.30.1
index 24cefa0f7df9..925fc803032c 100644
--- a/metadata/md5-cache/dev-util/devhelp-3.30.1
+++ b/metadata/md5-cache/dev-util/devhelp-3.30.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.56:2 >=x11-libs/gtk+-3.22:3[introspection?] >=net-libs
 REQUIRED_USE=gedit? ( ^^ ( python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
 SLOT=0/3-6
 SRC_URI=mirror://gnome/sources/devhelp/3.30/devhelp-3.30.1.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	2fbe03e3b496f82fd941bcdb9d351c91	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=f19010d231f295421c4edbc506883a28
diff --git a/metadata/md5-cache/dev-util/drone-cli-1.1.1 b/metadata/md5-cache/dev-util/drone-cli-1.1.1
new file mode 100644
index 000000000000..d52e5520022c
--- /dev/null
+++ b/metadata/md5-cache/dev-util/drone-cli-1.1.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install test unpack
+DEPEND=>=dev-lang/go-1.10
+DESCRIPTION=Command-line interface for Drone
+EAPI=6
+HOMEPAGE=https://github.com/drone/drone-cli
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=!!<dev-util/drone-0.7
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/drone/drone-cli/archive/v1.1.1.tar.gz -> drone-cli-1.1.1.tar.gz
+_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b
+_md5_=68036157c37cd25758b11c642b13703c
diff --git a/metadata/md5-cache/dev-util/dwarves-9999 b/metadata/md5-cache/dev-util/dwarves-9999
index e265841c0f54..88f7f2f2b605 100644
--- a/metadata/md5-cache/dev-util/dwarves-9999
+++ b/metadata/md5-cache/dev-util/dwarves-9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-libs/elfutils-0.131 sys-libs/zlib sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),python_single_target_python3_6(+)] >=dev-libs/elfutils-0.131 sys-libs/zlib sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=pahole (Poke-a-Hole) and other DWARF2 utilities
 EAPI=6
 HOMEPAGE=https://git.kernel.org/cgit/devel/pahole/pahole.git/
-IUSE=debug python_targets_python2_7
+IUSE=debug python_targets_python3_6
 LICENSE=GPL-2
-RDEPEND=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_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-libs/elfutils-0.131 sys-libs/zlib
-REQUIRED_USE=python_targets_python2_7
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),python_single_target_python3_6(+)] >=dev-libs/elfutils-0.131 sys-libs/zlib
+REQUIRED_USE=python_targets_python3_6
 SLOT=0
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	git-r3	0d4635eeb5a96cd5315597a47eba25c9	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=8b8a8365ffabac2803d62b2433529ca8
+_md5_=2c4ae7523f83807f0c396951a967596f
diff --git a/metadata/md5-cache/dev-util/edi-0.7.1 b/metadata/md5-cache/dev-util/edi-0.7.1
index 9358345a50e0..268e81bdfc75 100644
--- a/metadata/md5-cache/dev-util/edi-0.7.1
+++ b/metadata/md5-cache/dev-util/edi-0.7.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1-with-linking-exception
 RDEPEND=|| ( dev-libs/efl[X] dev-libs/efl[wayland] ) >=dev-libs/efl-1.22.0[eet] clang? ( sys-devel/clang:= )
 SLOT=0
 SRC_URI=https://github.com/Enlightenment/edi/archive/v0.7.1.tar.gz -> edi-0.7.1.tar.gz
-_eclasses_=llvm	83a68dab6355a0f96b37fe96bc4f317c	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=llvm	83a68dab6355a0f96b37fe96bc4f317c	meson	2fbe03e3b496f82fd941bcdb9d351c91	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=48bb625c7cd5194d7f50da44a183de16
diff --git a/metadata/md5-cache/dev-util/gengetopt-2.23 b/metadata/md5-cache/dev-util/gengetopt-2.23
new file mode 100644
index 000000000000..f587fe5d432a
--- /dev/null
+++ b/metadata/md5-cache/dev-util/gengetopt-2.23
@@ -0,0 +1,11 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<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
+DEFINED_PHASES=configure prepare
+DESCRIPTION=A tool to write command line option parsing code for C programs
+EAPI=7
+HOMEPAGE=https://www.gnu.org/software/gengetopt/
+KEYWORDS=~amd64 ~arm ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris
+LICENSE=GPL-3
+SLOT=0
+SRC_URI=mirror://gnu/gengetopt/gengetopt-2.23.tar.xz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=048c7ad5e0070ccb05e19c6f6d622000
diff --git a/metadata/md5-cache/dev-util/glslang-7.10.2984 b/metadata/md5-cache/dev-util/glslang-7.10.2984
index df31d8a81d08..9d7d33d76b76 100644
--- a/metadata/md5-cache/dev-util/glslang-7.10.2984
+++ b/metadata/md5-cache/dev-util/glslang-7.10.2984
@@ -4,9 +4,9 @@ DESCRIPTION=Khronos reference front-end for GLSL and ESSL, and sample SPIR-V gen
 EAPI=6
 HOMEPAGE=https://www.khronos.org/opengles/sdk/tools/Reference-Compiler/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://github.com/KhronosGroup/glslang/archive/7.10.2984.tar.gz -> glslang-7.10.2984.tar.gz
 _eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=817af1244a889c78e3541ee8fc9dc1c1
+_md5_=aa7107968518fc70e1cdb5e2ab0ef6ec
diff --git a/metadata/md5-cache/dev-util/gnome-builder-3.30.3 b/metadata/md5-cache/dev-util/gnome-builder-3.30.3
index 0ebab5688808..233e124435b5 100644
--- a/metadata/md5-cache/dev-util/gnome-builder-3.30.3
+++ b/metadata/md5-cache/dev-util/gnome-builder-3.30.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/libdazzle-3.30.2[introspection,vala?] >=dev-libs/glib-2.58.0:
 REQUIRED_USE=^^ ( python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-builder/3.30/gnome-builder-3.30.3.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	llvm	83a68dab6355a0f96b37fe96bc4f317c	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vala	cfb1d97eac9fead928d3240c8636b9ae	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	llvm	83a68dab6355a0f96b37fe96bc4f317c	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	2fbe03e3b496f82fd941bcdb9d351c91	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vala	cfb1d97eac9fead928d3240c8636b9ae	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=fef86d89750247c6a749b0a5af37b385
diff --git a/metadata/md5-cache/dev-util/gtk-update-icon-cache-3.24.7 b/metadata/md5-cache/dev-util/gtk-update-icon-cache-3.24.7
index 680a58d52816..7b1b01757843 100644
--- a/metadata/md5-cache/dev-util/gtk-update-icon-cache-3.24.7
+++ b/metadata/md5-cache/dev-util/gtk-update-icon-cache-3.24.7
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.53.4:2 >=x11-libs/gdk-pixbuf-2.30:2 !<x11-libs/gtk+-2.24.28-r1:2 !<x11-libs/gtk+-3.22.2:3
 SLOT=0
 SRC_URI=https://gitlab.gnome.org/Community/gentoo/gtk-update-icon-cache/-/archive/3.24.7/gtk-update-icon-cache-3.24.7.tar.bz2
-_eclasses_=meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=meson	2fbe03e3b496f82fd941bcdb9d351c91	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=5640c505e9f5a3b87cc69b50246d5db2
diff --git a/metadata/md5-cache/dev-util/gtk-update-icon-cache-3.24.8 b/metadata/md5-cache/dev-util/gtk-update-icon-cache-3.24.8
index cde64a48ef99..6a3c32f329dc 100644
--- a/metadata/md5-cache/dev-util/gtk-update-icon-cache-3.24.8
+++ b/metadata/md5-cache/dev-util/gtk-update-icon-cache-3.24.8
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.53.4:2 >=x11-libs/gdk-pixbuf-2.30:2 !<x11-libs/gtk+-2.24.28-r1:2 !<x11-libs/gtk+-3.22.2:3
 SLOT=0
 SRC_URI=https://gitlab.gnome.org/Community/gentoo/gtk-update-icon-cache/-/archive/3.24.8/gtk-update-icon-cache-3.24.8.tar.bz2
-_eclasses_=meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=meson	2fbe03e3b496f82fd941bcdb9d351c91	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=9437ff1e1bbbe79563a5058481e8efe1
diff --git a/metadata/md5-cache/dev-util/lttng-ust-2.8.1 b/metadata/md5-cache/dev-util/lttng-ust-2.8.1
index b17b166e58cf..3f15472be29a 100644
--- a/metadata/md5-cache/dev-util/lttng-ust-2.8.1
+++ b/metadata/md5-cache/dev-util/lttng-ust-2.8.1
@@ -4,10 +4,10 @@ DESCRIPTION=Linux Trace Toolkit - UST library
 EAPI=5
 HOMEPAGE=http://lttng.org
 IUSE=examples
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ia64 ppc ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/userspace-rcu:=
 SLOT=0/2.8
 SRC_URI=http://lttng.org/files/lttng-ust/lttng-ust-2.8.1.tar.bz2
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	estack	43ddf5aaffa7a8d0482df54d25a66a1f	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=0a471e7c679d98c0cc8dd4b7d383cc8a
+_md5_=b008d2a1e5d61c67c2e2a7fe4de06ab3
diff --git a/metadata/md5-cache/dev-util/meson-0.50.1 b/metadata/md5-cache/dev-util/meson-0.50.1
index 29b9a1b38c44..1ef59adedebf 100644
--- a/metadata/md5-cache/dev-util/meson-0.50.1
+++ b/metadata/md5-cache/dev-util/meson-0.50.1
@@ -5,7 +5,7 @@ DESCRIPTION=Open source build system
 EAPI=7
 HOMEPAGE=http://mesonbuild.com/
 IUSE=test python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
+KEYWORDS=alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
 LICENSE=Apache-2.0
 RDEPEND=dev-python/setuptools[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/meson/meson-0.50.1.tar.gz
 _eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=f5e02c2d612ecd636fc96ca2f0d69409
+_md5_=194e78c31466ca911d72ee1bc165a22a
diff --git a/metadata/md5-cache/dev-util/qbs-1.11.1 b/metadata/md5-cache/dev-util/qbs-1.11.1
deleted file mode 100644
index 8adb65a3aea5..000000000000
--- a/metadata/md5-cache/dev-util/qbs-1.11.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare test
-DEPEND=dev-qt/qtcore:5= dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtscript:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qdoc:5 dev-qt/qthelp:5 ) test? ( dev-qt/qtdeclarative:5 )
-DESCRIPTION=Modern build tool for software projects
-EAPI=6
-HOMEPAGE=https://wiki.qt.io/Qbs
-IUSE=doc examples test
-KEYWORDS=amd64 ~arm ~x86
-LICENSE=|| ( LGPL-2.1 LGPL-3 )
-RDEPEND=dev-qt/qtcore:5= dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtscript:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 test? ( dev-qt/qttest:5 )
-SLOT=0
-SRC_URI=http://download.qt.io/official_releases/qbs/1.11.1/qbs-src-1.11.1.tar.gz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=fe30ecf8ce96e3813dd5b5845a4dc2a5
diff --git a/metadata/md5-cache/dev-util/qbs-1.12.2 b/metadata/md5-cache/dev-util/qbs-1.12.2
index 5c573312d046..b48f00e20731 100644
--- a/metadata/md5-cache/dev-util/qbs-1.12.2
+++ b/metadata/md5-cache/dev-util/qbs-1.12.2
@@ -4,10 +4,10 @@ DESCRIPTION=Modern build tool for software projects
 EAPI=7
 HOMEPAGE=https://wiki.qt.io/Qbs
 IUSE=doc examples test
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm ~x86
 LICENSE=|| ( LGPL-2.1 LGPL-3 )
 RDEPEND=dev-qt/qtcore:5= dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtscript:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 test? ( dev-qt/qttest:5 )
 SLOT=0
 SRC_URI=http://download.qt.io/official_releases/qbs/1.12.2/qbs-src-1.12.2.tar.gz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=9ff881075a652028972e6e88dd1fa4f7
+_md5_=0b22a4a849879f34df72ce2618eb8127
diff --git a/metadata/md5-cache/dev-util/ragel-6.10 b/metadata/md5-cache/dev-util/ragel-6.10
index 7709850fb70a..39b492ee3265 100644
--- a/metadata/md5-cache/dev-util/ragel-6.10
+++ b/metadata/md5-cache/dev-util/ragel-6.10
@@ -4,10 +4,10 @@ DESCRIPTION=Compiles finite state machines from regular languages into executabl
 EAPI=5
 HOMEPAGE=http://www.colm.net/open-source/ragel/
 IUSE=vim-syntax
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~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 ~mips ppc ppc64 s390 ~sh sparc x86 ~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=GPL-2
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.colm.net/files/ragel/ragel-6.10.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f592985937d4f65cf25e57ea9153a30d
+_md5_=4b00ebc584aad44f1151bb3dacfc9ad1
diff --git a/metadata/md5-cache/dev-util/scons-3.0.5 b/metadata/md5-cache/dev-util/scons-3.0.5
index ef510093414b..8435e6a8eedf 100644
--- a/metadata/md5-cache/dev-util/scons-3.0.5
+++ b/metadata/md5-cache/dev-util/scons-3.0.5
@@ -4,7 +4,7 @@ DESCRIPTION=Extensible Python-based build utility
 EAPI=6
 HOMEPAGE=http://www.scons.org/
 IUSE=doc test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/scons/scons-3.0.5.tar.gz doc? ( http://www.scons.org/doc/3.0.5/PDF/scons-user.pdf -> scons-3.0.5-user.pdf http://www.scons.org/doc/3.0.5/HTML/scons-user.html -> scons-3.0.5-user.html ) test? ( https://github.com/scons/scons/archive/3.0.5.tar.gz -> scons-3.0.5.gh.tar.gz )
 _eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=2839b34c709be27dae234cf04804c8d4
+_md5_=3b26225b5e61b705985436124df4ab84
diff --git a/metadata/md5-cache/dev-util/spirv-headers-1.3.4_pre20190302 b/metadata/md5-cache/dev-util/spirv-headers-1.3.4_pre20190302
index 85f11ed85baa..cc0cac021816 100644
--- a/metadata/md5-cache/dev-util/spirv-headers-1.3.4_pre20190302
+++ b/metadata/md5-cache/dev-util/spirv-headers-1.3.4_pre20190302
@@ -3,9 +3,9 @@ DEPEND=sys-devel/make >=dev-util/cmake-3.9.6
 DESCRIPTION=Machine-readable files for the SPIR-V Registry
 EAPI=6
 HOMEPAGE=https://www.khronos.org/registry/spir-v/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/KhronosGroup/SPIRV-Headers/archive/d3752ea20886d2fceb6cecda3c2b146a8f22d214.tar.gz -> spirv-headers-1.3.4_pre20190302.tar.gz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=7709870aa44fd131b7d02ab6e226f7ad
+_md5_=207ed0bdb29cf04fe96c1bf5d781d162
diff --git a/metadata/md5-cache/dev-util/spirv-tools-2019.1-r1 b/metadata/md5-cache/dev-util/spirv-tools-2019.1-r1
index 6b9bad70fa97..773572d46ef4 100644
--- a/metadata/md5-cache/dev-util/spirv-tools-2019.1-r1
+++ b/metadata/md5-cache/dev-util/spirv-tools-2019.1-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Provides an API and commands for processing SPIR-V modules
 EAPI=6
 HOMEPAGE=https://github.com/KhronosGroup/SPIRV-Tools
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/KhronosGroup/SPIRV-Tools/archive/v2019.1.tar.gz -> spirv-tools-2019.1.tar.gz
 _eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=d27843ef3da546095529dc62dd4822d2
+_md5_=08f82aef90c7aa7d4ff7f474c5170876
diff --git a/metadata/md5-cache/dev-util/strace-4.26 b/metadata/md5-cache/dev-util/strace-4.26
index 0bdee31c8e1b..dfdf33486040 100644
--- a/metadata/md5-cache/dev-util/strace-4.26
+++ b/metadata/md5-cache/dev-util/strace-4.26
@@ -4,11 +4,11 @@ DESCRIPTION=A useful diagnostic, instructional, and debugging tool
 EAPI=6
 HOMEPAGE=https://strace.io/
 IUSE=aio perl static unwind elfutils
-KEYWORDS=~alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=!static? ( unwind? ( sys-libs/libunwind ) elfutils? ( dev-libs/elfutils ) ) perl? ( dev-lang/perl )
 REQUIRED_USE=?? ( unwind elfutils )
 SLOT=0
 SRC_URI=https://github.com/strace/strace/releases/download/v4.26/strace-4.26.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=26e311ee449ed148151de344fdc31f7a
+_md5_=5529573c29a9e922da215b390769f33d
diff --git a/metadata/md5-cache/dev-util/sysprof-3.30.2-r1 b/metadata/md5-cache/dev-util/sysprof-3.30.2-r1
index 4818aef9a0ae..5e64008761c9 100644
--- a/metadata/md5-cache/dev-util/sysprof-3.30.2-r1
+++ b/metadata/md5-cache/dev-util/sysprof-3.30.2-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.44:2 sys-auth/polkit gtk? ( >=x11-libs/gtk+-3.22.0:3 )
 REQUIRED_USE=?? ( elogind systemd )
 SLOT=0
 SRC_URI=mirror://gnome/sources/sysprof/3.30/sysprof-3.30.2.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	2fbe03e3b496f82fd941bcdb9d351c91	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=dd9cfa3b61e03fe2fa530bc02ebf12b4
diff --git a/metadata/md5-cache/dev-util/vulkan-headers-1.1.101 b/metadata/md5-cache/dev-util/vulkan-headers-1.1.101
index f728fedecccc..eaba536a1905 100644
--- a/metadata/md5-cache/dev-util/vulkan-headers-1.1.101
+++ b/metadata/md5-cache/dev-util/vulkan-headers-1.1.101
@@ -3,10 +3,10 @@ DEPEND=sys-devel/make >=dev-util/cmake-3.9.6
 DESCRIPTION=Vulkan Header files and API registry
 EAPI=6
 HOMEPAGE=https://github.com/KhronosGroup/Vulkan-Headers
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=Apache-2.0
 RDEPEND=!<=media-libs/vulkan-loader-1.1.70.0-r999
 SLOT=0
 SRC_URI=https://github.com/KhronosGroup/Vulkan-Headers/archive/8e2c4cd554b644592a6d904f2c8000ebbd4aa77f.tar.gz -> vulkan-headers-1.1.101.tar.gz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=b7de0abe9e606e83c0f7af9bcfe3a2e7
+_md5_=29cdedd1765f4a2e2fa99505f5c5a607