diff --git a/Manifest b/Manifest
index b6018b06b588..eb9c595e8dd4 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 28996 BLAKE2B 7465e45211929883916be58e537a0f6efc60d8bb0fd3301cddaf4b597a8e50b0d70356bf6a293bdc1143aeff9cc2c78a773b694da2fda0906e0afb94302f62ec SHA512 4fa7a4b66c8e59deed3a288411519a3a8e687f7fe7eeff6d8f53a9d6e08456dc40c67ea169daf237dd38518bc348f0659b2a0571a9bea73c6be734a43151bee0
-TIMESTAMP 2018-04-12T05:08:31Z
+MANIFEST Manifest.files.gz 28972 BLAKE2B 1562ac709e9b856973705f1c23389c7d5355c95977a775508daf3f2526182df6035ccd96ad13f2657944d62cd8721e9371b7954f7a9afaa626620bc493c1b288 SHA512 0d69f5b26892714f7102e7dffc81f700ad189bf0586011ce17cf7d9d8bf8d6ee93c1643aaf14d4028ede23959e0a61d591827aa3529a837fbc7bc95cb0188a28
+TIMESTAMP 2018-04-12T08:38:32Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlrO6c9fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlrPGwhfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAPNBAAldeTgciiyBREVaGSNSbRcp60yudAj+AF1J1E1qdHBY3o+wHevRiHEtoW
-6AptlsVcsIxdeIoIo/Ojwt1tWI+62lWugEmt0gxaBD4c4yizmCk+H6KozRrj61kK
-9JkGY2WXqa+G3jaKcVoKWWh8ukz0R8nyFUkX11xLeFGwwjkb70mEHaZre7RwK5j/
-YiCf8sECpGKbd/yDJl1+JbV47MiK0avANrwQ1JYXFIjIZagw9vmsWecFCke112RS
-guJcbgfUSkbTuG7z0g9piGyNU02Y1lBwgcGeWFC8MzisEs2sfkJiLaet4UNhjtHy
-HR/YX/eS5aVMrgBljLGLAIEb2+kf/n7FEGqP60xUPIiZ9Jjq+GcUZGmFzN+sRsdG
-9Rn+8nALjN2UfTLKwZ5iQqhEz5/43Ho5reGkZADhEWB9+wF0Qz06dsotz57X5TuV
-kV5x0k7O3alKbc7eyw/EQWR9X4htnjBIgYS9u2YAYkBg1xgRUua99YDkp0mRaTtZ
-QbkzseSq91p2je+SIOHeRojdApf3Y3hUgm5O4ClrkrHVEq0XeLC5tcUUmD+3EZKZ
-A/iYbmPIhgvTjyG2yaGkVzDPJ9FX+xBQAqfz3cYjskGpIaN+czTzA1AR4YM1RvPz
-tvUdPCSPSlxS4XS/XqpkmRNxVpJR+evC2Q3b0JTXAG/7G1HYuGc=
-=CWGX
+klCwkg/+M+H04qcDlYHVZMn3j+T+9Xnwxpl0zhZPBCV422B6i6iqW/xcxWdmkr4S
+PRArDE/pTC//2doDyJ5YPv17NK2qV7x2rx1EihUps+iw7K2X1zOb+hj+TnlQT+aC
+71ypnXej68VypvcsGuNUTf13O93GGWyuAhWH+CkRMC8PAD/6JnYEHSToIg0sf5Wg
+AZ8K1gqpRZ6W8DRIMrxZCR80/deFD/EKEvT6xUfHHOo2XSSRBI60sS3RdeJnDpOH
+69ogjLvrMIuWuShZ2Mc2I71gi5/VKSIlQ+C1q4Yv57goMyFf5xyjl4hY1n6I25C2
+Ikr5oHDbUEHcWA41Fx8s/vmRj/N0hxNhcUhSksmZYDh7ieyuYVGvDMeCqmW6e5uo
+FMCuM/KRbqR4O+M0/oPSc4xIdDtfuwTvtQ01ONth3QsSDZnonjGC9cvpoPI6hXfZ
+IjFRcyJSymNSfEANQQf8xhoVAI6KV4BBV5LMGsNi6RZBNK3Yk1CjPRJSR8PoeaPD
+ahwUjaNnaIpd3b9liLzgdHcgaZH3m4nKAE2BHieA1ggFxjekJAevp2itrr+EjQqi
+OeIiV+TIJLArlGZA3xsgmqAgtSskRJLzQwf9WnW58+pzJA7Kian/Dp6VhcUsztoV
+cCewybrqs+FIaixK9gUjTJpT9+tTaRUPDFPyw1YIaaNVhuY1rQ4=
+=t1GX
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 5ff9dcc6f358..4e7ba6b304d8 100644
Binary files a/Manifest.files.gz and b/Manifest.files.gz differ
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 5c2f16c9a5c8..2a88535a7841 100644
Binary files a/app-crypt/Manifest.gz and b/app-crypt/Manifest.gz differ
diff --git a/app-crypt/pinentry/Manifest b/app-crypt/pinentry/Manifest
index 1fe09bddfedd..2e5e0a25e3ac 100644
--- a/app-crypt/pinentry/Manifest
+++ b/app-crypt/pinentry/Manifest
@@ -7,5 +7,5 @@ DIST pinentry-1.0.0.tar.bz2 436930 BLAKE2B 949be8de8504a42cd5bd6ffebe331a825db7f
 DIST pinentry-1.1.0.tar.bz2 467702 BLAKE2B cf43555848ab0dc60756fca123aba7599ebb1bfe0458b973ed9d84479f8de9ee69ef309b518b40aa340434d64d37793cf97c94f78f99820bc5c71ecd2aac7a49 SHA512 5012672925bcb5f683358c259e55e4b87c67cf063ad52c759308933733025c33f7ce08e5b8019ffc101cbf7ef30499040ef2fd34a7611698e65e1593f80948cd
 EBUILD pinentry-1.0.0-r2.ebuild 2886 BLAKE2B 27f6057b0d5d0d474397660d755c90ab8dc025a80d5573e44c71093839efee3c0a126fb5dc10fb53083946c46989cdb63aa1baf6e75f40c2e3aef6bae558bfef SHA512 32cc1cc04357afe5f0b84f1bd75af877e1b849d3a4fc70d194e627a32da883a05037d36d15b25cea67d2963563402c13d125a928278f9326fda8463b5951eb3a
 EBUILD pinentry-1.0.0-r3.ebuild 2958 BLAKE2B 350c3f20934857f72ce46dad5d8a047f5b04c10dbf4f398e346a5b1339a81fa1263296859a240fe717970840ed81b2f271a902d3e26b5d93f108bbdf3117cc20 SHA512 10c088dd6cd0efab43430856615cd795986c127765fbb47c0d324085aac9474da85bd317a8ec23aecc05fafba19f14392ccbf59b1820590223be0eb57855a2a6
-EBUILD pinentry-1.1.0.ebuild 2740 BLAKE2B 9e786d37ff4416c7db0acc0130f7f04f8b642ab3f8f7c8d9246d1ff2e36b2586f271b7d5c99d3e6350d7c0076236ac0079d43d68acf7b2fd959d515836360407 SHA512 bb9b37937dc2a668d61c292a6265b9ca5b750a7301d07b09b1b079a295b4150e95b4dfa9467403aac49352f032313cb46105c609aff4eda0d030474783e82e1f
+EBUILD pinentry-1.1.0-r1.ebuild 2812 BLAKE2B ae22cbfaddbba62ebc6ea4cd28d701fc54d466f2918c2021f145bf7cb5d50cf488cbdc8ae5144413831253c6ca7689a9136f90535966ae2bc00810ecfded4d0e SHA512 64d205410bba1137d660e6a9ac77e5366e655787b53bdf8d3a4567350be2ed9e9ffaea4711faffa8469dbc5bb5d2f2e2a1a4316afbc96c713a726226b906fc95
 MISC metadata.xml 352 BLAKE2B 75bb4d471f7b82b6cfe614d5c2ed226df087792ed84803ce4b011c5ad0a5a1548a87c6ab4c17ffeef53eb64bdea262fda4f89d27c38950ff1ced736b38d7df59 SHA512 3817eb6ad931ab0ee363ed7f8612b08a44c0d02e7abb9d0734452c289350c9909ca4208acad01c54a3f1b260417c400f4692e37b34113c6d618680d41796e2d0
diff --git a/app-crypt/pinentry/pinentry-1.1.0.ebuild b/app-crypt/pinentry/pinentry-1.1.0-r1.ebuild
similarity index 97%
rename from app-crypt/pinentry/pinentry-1.1.0.ebuild
rename to app-crypt/pinentry/pinentry-1.1.0-r1.ebuild
index c960a939b3c8..2e72ca450419 100644
--- a/app-crypt/pinentry/pinentry-1.1.0.ebuild
+++ b/app-crypt/pinentry/pinentry-1.1.0-r1.ebuild
@@ -46,6 +46,7 @@ REQUIRED_USE="
 DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
 
 PATCHES=(
+    "${FILESDIR}/${PN}-1.0.0-make-icon-work-under-Plasma-Wayland.patch"
 	"${FILESDIR}/${PN}-0.8.2-ncurses.patch"
 )
 
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index a43c85ae01ba..b113861291c2 100644
Binary files a/app-editors/Manifest.gz and b/app-editors/Manifest.gz differ
diff --git a/app-editors/gvim/Manifest b/app-editors/gvim/Manifest
index 7885ed04f383..b948c2f64886 100644
--- a/app-editors/gvim/Manifest
+++ b/app-editors/gvim/Manifest
@@ -5,8 +5,10 @@ DIST vim-8.0.0938-gentoo-patches.tar.bz2 2316 BLAKE2B 05a87f32fc5cc65e7f5e4e5a87
 DIST vim-8.0.1298.tar.gz 13395459 BLAKE2B 4b6e3c4443cd675dc3727e8609b89c422f66c7d32908b5136ee312d48427568a8236214c85135242269b6575e0e1336b0973395a6372664435f8bae4d7bee843 SHA512 7704c493359c1a922f876e4d6f3b4ad265d8ce974a59d51a39e5a4424251105250ffc803bcf6c6750daeb5e6376cbbfd24557b075eacf2b0274d7c432db2f681
 DIST vim-8.0.1428.tar.gz 13415243 BLAKE2B 88f86c371d0a644212b9e4dc1a15d61244847037f36262a225c361bfc2799b741c128de21ac92bb3fb4a4955894e46d34dc01baa7cbf58f1371d772b36887103 SHA512 f635c53c7e2ca808dc1cb424e6e4b16d8c41c66a86c3c7584444dab3d2482904795fea7c071d65862ae6ac6b2b66b7ad5ac832e1e30f4624d46f220c6f41e2e9
 DIST vim-8.0.1645.tar.gz 13535252 BLAKE2B a5c7463e85eed12825bdf46d15eb7e7513d62831eba76cbb90af875010b33662b7a6ef2c4c5cecddface415d75e97caf0a670e69835ecd3b4a89704f3b18b905 SHA512 367b9e205e776f84fcfbb92725afd5e7aa66898110d46dbea1a33f7b74c239559e829b5104c45360539c8f2b23c375ed59ccea7ee35a5dd10770400d9a7be085
+DIST vim-8.0.1699.tar.gz 13546105 BLAKE2B cabf29d5a89c55e2fe3bc5e39eb499412f5907ddf856f8644b466f1e0fbffefff3cd801b6bc5e49e62ffdf8805b0556058b9a913015a9f9fbe1a4f580132fd49 SHA512 b0fe8e1dc05fdc3758896caf4746da40988ca7604d77dbe78c47525cbf8f0d7e6c05f690687268eda581009050d4e02e93fb4d30734cbbab4cfd6a8a1488c1e7
 EBUILD gvim-8.0.1298.ebuild 10469 BLAKE2B b0f04d4d5a1df2854184d2d0f9b64129524af078e86096704348a86710b8b551b77f3d8b0a2071a56a650cd747b45cf437e58ec7a3259b5b1332c46de1dd7f2e SHA512 27f0671ee4de3ffbbd4d6d56c09550fe4774ec1d9b5b45513f6314719e1f1c6e0ea55215dfe5b88c253d16bd97bbcc7cbf734d7c9049b11df625da300e7c589c
 EBUILD gvim-8.0.1428.ebuild 10477 BLAKE2B 764132ab93aa42aeef1f26fdfaf1095630ddcbdf148681d2ff929611a6fc736ab7c325947d39752dbe112c869cdf1ff51fb0419c9316f9e05eb0440a662cc38f SHA512 ca3474ac8e4ffa20bb0d96677f4bee91683cafeceb6db4d2654c4d3f3037adc7a5a78bf57bc019222fbde96d06a5731c4d6474324ac676941115e728dcc085bf
 EBUILD gvim-8.0.1645.ebuild 10502 BLAKE2B 47db270abf2ea71b92173df98377634c0b59d04383059ac557c0c8fcd8aeeb11ff8aaa1a7cb4b40819f386b040952ca356457e500d9b0a9a553e1bea60379a16 SHA512 da4f6c564a06f5f8eb50a56836235eddadd20515afe66a74efd0fce24a3a048db52a0cc0ae8d7e5fbf5fd57f0861e0a50e966a4a31f106059f0952ceccb7b589
-EBUILD gvim-9999.ebuild 10495 BLAKE2B 2c3e61a00479e7adf15fdd2bb32a3eb4c806c67b40aefa068bda7270a5af7cd27ed3bd02c04c07d60697b5710e47a30097e925d86a88062a3fb3bdcf35636b20 SHA512 6335c49298a9e01775b0baf9f52bb8aae61bd6cae0ecf51f43c1b5b9fc19fbd8b2919c02280e38cf391a80bce364ff83b7eddcc0acdf2f0c64e58ff8609c4296
+EBUILD gvim-8.0.1699.ebuild 10490 BLAKE2B 18c912fb875ea79a541ecdc6723714782520d9f6524dc9eced18b3704c46ece46f296c45ad8a817978755b9367b43b04bf82e1692996fd08027e1db6a45553ef SHA512 bdf28681e8503cde8067c013ab634bdc0dbfab4d6367b3bdd5c4f11cd90e3f8c49471a87cd50086e80f305f797a7c7d5203ab7cee30dd41436a7f787c1f32a35
+EBUILD gvim-9999.ebuild 10490 BLAKE2B 18c912fb875ea79a541ecdc6723714782520d9f6524dc9eced18b3704c46ece46f296c45ad8a817978755b9367b43b04bf82e1692996fd08027e1db6a45553ef SHA512 bdf28681e8503cde8067c013ab634bdc0dbfab4d6367b3bdd5c4f11cd90e3f8c49471a87cd50086e80f305f797a7c7d5203ab7cee30dd41436a7f787c1f32a35
 MISC metadata.xml 578 BLAKE2B a0b7e41324455706748f79109affec89e72dece0b41346d0cc804742cc7e5aa88f89556623b1aac4f53387afe6e6145049079b1cd44d3411bcf2f8ee8c7c2bfd SHA512 b2db961a6e59b803e2371c4e6dda496917d6c5e332f36062be8dbfa4fb47b4b640d8deb6871c9ff3c5a527fdf9c16aa13f14b9e0a37f93a3a10c6f6b57808126
diff --git a/app-editors/gvim/gvim-8.0.1699.ebuild b/app-editors/gvim/gvim-8.0.1699.ebuild
new file mode 100644
index 000000000000..bb0c86ef868e
--- /dev/null
+++ b/app-editors/gvim/gvim-8.0.1699.ebuild
@@ -0,0 +1,373 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+VIM_VERSION="8.0"
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_REQ_USE="threads"
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
+
+inherit vim-doc flag-o-matic xdg-utils gnome2-utils versionator bash-completion-r1 prefix python-single-r1 ruby-single
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/vim/vim.git"
+	EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${PV}
+else
+	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
+		https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+fi
+
+DESCRIPTION="GUI version of the Vim text editor"
+HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim"
+
+SLOT="0"
+LICENSE="vim"
+IUSE="acl aqua cscope debug gnome gtk gtk3 lua luajit motif neXt netbeans nls perl python racket ruby selinux session tcl"
+REQUIRED_USE="
+	luajit? ( lua )
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+RDEPEND="
+	~app-editors/vim-core-${PV}
+	>=app-eselect/eselect-vi-1.1
+	>=sys-libs/ncurses-5.2-r2:0=
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libXext
+	x11-libs/libXt
+	acl? ( kernel_linux? ( sys-apps/acl ) )
+	!aqua? (
+		gtk3? (
+			x11-libs/gtk+:3
+			x11-libs/libXft
+		)
+		!gtk3? (
+			gtk? (
+				>=x11-libs/gtk+-2.6:2
+				x11-libs/libXft
+				gnome? ( >=gnome-base/libgnomeui-2.6 )
+			)
+			!gtk? (
+				motif? ( >=x11-libs/motif-2.3:0 )
+				!motif? (
+					neXt? ( x11-libs/neXtaw )
+					!neXt? ( x11-libs/libXaw )
+				)
+			)
+		)
+	)
+	cscope? ( dev-util/cscope )
+	lua? (
+		luajit? ( dev-lang/luajit:2= )
+		!luajit? ( dev-lang/lua:0[deprecated] )
+	)
+	nls? ( virtual/libintl )
+	perl? ( dev-lang/perl:= )
+	python? ( ${PYTHON_DEPS} )
+	racket? ( dev-scheme/racket )
+	ruby? ( ${RUBY_DEPS} )
+	selinux? ( sys-libs/libselinux )
+	session? ( x11-libs/libSM )
+	tcl? ( dev-lang/tcl:0= )
+"
+DEPEND="${RDEPEND}
+	dev-util/ctags
+	sys-devel/autoconf
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+
+S=${WORKDIR}/vim-${PV}
+
+pkg_setup() {
+	# people with broken alphabets run into trouble. bug 82186.
+	unset LANG LC_ALL
+	export LC_COLLATE="C"
+
+	# Gnome sandbox silliness. bug #114475.
+	mkdir -p "${T}"/home || die
+	export HOME="${T}"/home
+
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	if [[ ${PV} != 9999* ]]; then
+		# Gentoo patches to fix runtime issues, cross-compile errors, etc
+		eapply "${WORKDIR}"/patches/
+	fi
+
+	# Fixup a script to use awk instead of nawk
+	sed -i -e \
+		'1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \
+		"${S}"/runtime/tools/mve.awk || die "mve.awk sed failed"
+
+	# Read vimrc and gvimrc from /etc/vim
+	echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' \
+	    >> "${S}"/src/feature.h || die "echo failed"
+	echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' \
+	    >> "${S}"/src/feature.h || die "echo failed"
+
+	# Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
+	# Hopefully this pattern won't break for a while at least.
+	# This fixes bug 29398 (27 Sep 2003 agriffis)
+	sed -i -e \
+		's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
+		"${S}"/runtime/doc/syntax.txt \
+		"${S}"/runtime/doc/tagsrch.txt \
+		"${S}"/runtime/doc/usr_29.txt \
+		"${S}"/runtime/menu.vim \
+		"${S}"/src/configure.ac || die 'sed failed'
+
+	# Don't be fooled by /usr/include/libc.h.  When found, vim thinks
+	# this is NeXT, but it's actually just a file in dev-libs/9libs
+	# This fixes bug 43885 (20 Mar 2004 agriffis)
+	sed -i -e \
+		's/ libc\.h / /' "${S}"/src/configure.ac || die 'sed failed'
+
+	# gcc on sparc32 has this, uhm, interesting problem with detecting EOF
+	# correctly. To avoid some really entertaining error messages about stuff
+	# which isn't even in the source file being invalid, we'll do some trickery
+	# to make the error never occur. bug 66162 (02 October 2004 ciaranm)
+	find "${S}" -name '*.c' | while read c; do
+	    echo >> "$c" || die "echo failed"
+	done
+
+	# Try to avoid sandbox problems. Bug #114475.
+	if [[ -d "${S}"/src/po ]]; then
+		sed -i -e \
+			'/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
+			"${S}"/src/po/Makefile || die
+	fi
+
+	cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed"
+
+	# Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0
+	sed -i -e \
+		"s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
+		"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
+
+	eapply_user
+}
+
+src_configure() {
+	local myconf=()
+
+	# Fix bug 37354: Disallow -funroll-all-loops on amd64
+	# Bug 57859 suggests that we want to do this for all archs
+	filter-flags -funroll-all-loops
+
+	# Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
+	# everyone since previous flag filtering bugs have turned out to affect
+	# multiple archs...
+	replace-flags -O3 -O2
+
+	# Fix bug 18245: Prevent "make" from the following chain:
+	# (1) Notice configure.ac is newer than auto/configure
+	# (2) Rebuild auto/configure
+	# (3) Notice auto/configure is newer than auto/config.mk
+	# (4) Run ./configure (with wrong args) to remake auto/config.mk
+	sed -i -e \
+		's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
+	rm -v src/auto/configure || die "rm failed"
+	emake -j1 -C src autoconf
+
+	# This should fix a sandbox violation (see bug 24447). The hvc
+	# things are for ppc64, see bug 86433.
+	local file
+	for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do
+		if [[ -e ${file} ]]; then
+			addwrite $file
+		fi
+	done
+
+	use debug && append-flags "-DDEBUG"
+
+	myconf=(
+		--with-features=huge
+		--disable-gpm
+		--enable-multibyte
+		$(use_enable acl)
+		$(use_enable cscope)
+		$(use_enable lua luainterp)
+		$(use_with luajit)
+		$(use_enable netbeans)
+		$(use_enable nls)
+		$(use_enable perl perlinterp)
+		$(use_enable python pythoninterp)
+		$(use_enable python python3interp)
+		$(use_enable racket mzschemeinterp)
+		$(use_enable ruby rubyinterp)
+		$(use_enable selinux)
+		$(use_enable session xsmp)
+		$(use_enable tcl tclinterp)
+	)
+
+	# --with-features=huge forces on cscope even if we --disable it. We need
+	# to sed this out to avoid screwiness. (1 Sep 2004 ciaranm)
+	if ! use cscope; then
+		sed -i -e \
+			'/# define FEAT_CSCOPE/d' src/feature.h || die "couldn't disable cscope"
+	fi
+
+	# gvim's GUI preference order is as follows:
+	# aqua                          CARBON (not tested)
+	# -aqua gtk3                    GTK3
+	# -aqua -gtk3 gnome             GNOME2
+	# -aqua -gtk3 -gnome gtk        GTK2
+	# -aqua -gtk -gtk3 motif        MOTIF
+	# -aqua -gtk -gtk3 -motif neXt  NEXTAW
+	# -aqua -gtk -gtk3 -motif -neXt ATHENA
+	echo ; echo
+	if use aqua; then
+		einfo "Building gvim with the Carbon GUI"
+		myconf+=(
+			--enable-darwin
+			--enable-gui=carbon
+		)
+	elif use gtk3; then
+		myconf+=( --enable-gtk3-check )
+		einfo "Building gvim with the gtk+-3 GUI"
+		myconf+=( --enable-gui=gtk3 )
+	elif use gtk; then
+		myconf+=( --enable-gtk2-check )
+		if use gnome; then
+			einfo "Building gvim with the Gnome 2 GUI"
+			myconf+=( --enable-gui=gnome2 )
+		else
+			einfo "Building gvim with the gtk+-2 GUI"
+			myconf+=( --enable-gui=gtk2 )
+		fi
+	elif use motif; then
+		einfo "Building gvim with the MOTIF GUI"
+		myconf+=( --enable-gui=motif )
+	elif use neXt; then
+		einfo "Building gvim with the neXtaw GUI"
+		myconf+=( --enable-gui=nextaw )
+	else
+		einfo "Building gvim with the Athena GUI"
+		myconf+=( --enable-gui=athena )
+	fi
+	echo ; echo
+
+	# let package manager strip binaries
+	export ac_cv_prog_STRIP="$(type -P true ) faking strip"
+
+	# keep prefix env contained within the EPREFIX
+	use prefix && myconf+=( --without-local-dir )
+
+	if [[ ${CHOST} == *-interix* ]]; then
+		# avoid finding of this function, to avoid having to patch either
+		# configure or the source, which would be much more hackish.
+		# after all vim does it right, only interix is badly broken (again)
+		export ac_cv_func_sigaction=no
+	fi
+
+	econf \
+		--with-modified-by=Gentoo-${PVR} \
+		--with-vim-name=gvim \
+		--with-x \
+		"${myconf[@]}"
+}
+
+src_compile() {
+	# The following allows emake to be used
+	emake -j1 -C src auto/osdef.h objects
+
+	emake
+}
+
+src_test() {
+	echo
+	einfo "Starting vim tests. Several error messages will be shown"
+	einfo "while the tests run. This is normal behaviour and does not"
+	einfo "indicate a fault."
+	echo
+	ewarn "If the tests fail, your terminal may be left in a strange"
+	ewarn "state. Usually, running 'reset' will fix this."
+	echo
+
+	# Don't let vim talk to X
+	unset DISPLAY
+
+	# Make gvim not try to connect to X. See :help gui-x11-start in vim for how
+	# this evil trickery works.
+	ln -s "${S}"/src/gvim "${S}"/src/testvim || die
+
+	# Make sure our VIMPROG is used.
+	sed -i -e 's:\.\./vim:../testvim:' src/testdir/test49.vim || die
+
+	# Don't do additional GUI tests.
+	emake -j1 VIMPROG=../testvim -C src/testdir nongui
+}
+
+# Call eselect vi update with --if-unset
+# to respect user's choice (bug 187449)
+eselect_vi_update() {
+	einfo "Calling eselect vi update..."
+	eselect vi update --if-unset
+	eend $?
+}
+
+src_install() {
+	local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
+
+	dobin src/gvim
+	dosym gvim /usr/bin/gvimdiff
+	dosym gvim /usr/bin/evim
+	dosym gvim /usr/bin/eview
+	dosym gvim /usr/bin/gview
+	dosym gvim /usr/bin/rgvim
+	dosym gvim /usr/bin/rgview
+
+	emake -C src DESTDIR="${D}" DATADIR="${EPREFIX}"/usr/share install-icons
+
+	dodir /usr/share/man/man1
+	echo ".so vim.1" > "${ED}"/usr/share/man/man1/gvim.1 || die "echo failed"
+	echo ".so vim.1" > "${ED}"/usr/share/man/man1/gview.1 || die "echo failed"
+	echo ".so vimdiff.1" > "${ED}"/usr/share/man/man1/gvimdiff.1 || \
+		die "echo failed"
+
+	insinto /etc/vim
+	newins "${FILESDIR}"/gvimrc-r1 gvimrc
+	eprefixify "${ED}"/etc/vim/gvimrc
+
+	doicon -s scalable "${FILESDIR}"/gvim.svg
+
+	# bash completion script, bug #79018.
+	newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
+
+	# don't install vim desktop file
+	rm -v "${ED}"/usr/share/applications/vim.desktop || die "failed to remove vim.desktop"
+}
+
+pkg_postinst() {
+	# Update documentation tags (from vim-doc.eclass)
+	update_vim_helptags
+
+	# Update fdo mime stuff, bug #78394
+	xdg_desktop_database_update
+
+	# Update icon cache
+	gnome2_icon_cache_update
+
+	# Call eselect vi update
+	eselect_vi_update
+}
+
+pkg_postrm() {
+	# Update documentation tags (from vim-doc.eclass)
+	update_vim_helptags
+
+	# Update fdo mime stuff, bug #78394
+	xdg_desktop_database_update
+
+	# Update icon cache
+	gnome2_icon_cache_update
+
+	# Call eselect vi update
+	eselect_vi_update
+}
diff --git a/app-editors/gvim/gvim-9999.ebuild b/app-editors/gvim/gvim-9999.ebuild
index 1de46facaa9c..bb0c86ef868e 100644
--- a/app-editors/gvim/gvim-9999.ebuild
+++ b/app-editors/gvim/gvim-9999.ebuild
@@ -1,11 +1,13 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 VIM_VERSION="8.0"
 PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-PYTHON_REQ_USE=threads
-inherit vim-doc flag-o-matic xdg-utils gnome2-utils versionator bash-completion-r1 prefix python-single-r1
+PYTHON_REQ_USE="threads"
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
+
+inherit vim-doc flag-o-matic xdg-utils gnome2-utils versionator bash-completion-r1 prefix python-single-r1 ruby-single
 
 if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
@@ -14,7 +16,7 @@ if [[ ${PV} == 9999* ]]; then
 else
 	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
 		https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 fi
 
 DESCRIPTION="GUI version of the Vim text editor"
@@ -66,7 +68,7 @@ RDEPEND="
 	perl? ( dev-lang/perl:= )
 	python? ( ${PYTHON_DEPS} )
 	racket? ( dev-scheme/racket )
-	ruby? ( || ( dev-lang/ruby:2.5 dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.2 ) )
+	ruby? ( ${RUBY_DEPS} )
 	selinux? ( sys-libs/libselinux )
 	session? ( x11-libs/libSM )
 	tcl? ( dev-lang/tcl:0= )
diff --git a/app-editors/vim-core/Manifest b/app-editors/vim-core/Manifest
index db67bb15656a..f7609e7e709d 100644
--- a/app-editors/vim-core/Manifest
+++ b/app-editors/vim-core/Manifest
@@ -1,16 +1,13 @@
 AUX vimrc-r5 7337 BLAKE2B 3f28db016b3956b4c5e2833ff4440417d3ccdc446618a776119513549c0b9831d0eb4bfb9abf992e436508b95f0586f2b4fc30ddba7f2b595574a5c2ccc257c8 SHA512 b9cc07386b97e6042166b11cd6270d4c3134eb816ff396ad544cfb14b349d79b32b5a07b5995580aea607b7936eef0dfd5ab1dc7e158dea26afc0c944fae8e3c
 AUX xxd-completion 461 BLAKE2B 1f36c4877fffd68e951d80c1a64cd2d458d92555a99fd06e29513da8caa6c28c27e44131b2873258e3ff5a0ab232d66f75a8f051ccf7a4d940b3b0102e6967dd SHA512 fc92426ea657e86ff765aa5a60736cdc70db938156dd8946db0a30c54d3f557bd8af421f1713bd750e779ccacd73f8f290a12a5e71ed48259fe1e6dece2de19c
-DIST vim-8.0.0106-gentoo-patches.tar.bz2 2281 BLAKE2B 8e10c0c56ad97cbae0677ec91b0b35359f6e08b5eb542b00028fd0e243a075551adab4e140a90930cbce4549c3c4bc79a40c0e1a6c13aae18f67d6fc55a80e0e SHA512 39edd9f518c230d2b0486b18aa155572a9eada4a5e21108573d6e66e2eef1276f23b77d766648f018c9cf973a7d03712d8861be6ea13255d7b389912d554a47a
-DIST vim-8.0.0386.tar.gz 13000882 BLAKE2B c38c1b75334cae916f76562ec5a06d59c4f2df6123d4b27a0a854dd8ecd9ae6f5d008a94137abe6217fc28d233077d636d30f2c26a5a139ff35f50cb52204f79 SHA512 3169ea4dbc836c724f63d99cd345227f870a3a922beba84a6b42011685c0dd209f6bba8c69af0650c9a57bb47fc541e1150ca8cefb21fcada022259bf4c94a66
 DIST vim-8.0.0938-gentoo-patches.tar.bz2 2316 BLAKE2B 05a87f32fc5cc65e7f5e4e5a87c654b2040ad39f1555ddde7e0e6f473dc8b520916a795406bb6bbeaf5e7ae8748aacebe7a9679461e48802e69417e945eea827 SHA512 a6062be5e6a5c5b437081312df5742353242b5171bf26da04aa6ca216d2b142b2411a88bc1edd460d28e00a59a210c8e1729e801fac6f1efd86bb2e437a56a2b
-DIST vim-8.0.1188.tar.gz 13363260 BLAKE2B 545b2d6e8322b27967c974bb960f4e5ea2c6811d2649ac4c008eb8e6af78fe555a035657704af40026f96f12f83e3cebe435e90d21d7da87980446710424f79f SHA512 9c3733aa894c276de593d6144ee0aaf251092a11f4d0ac603d3d49a282ac6176aa4e88eccfd2527ff53b386bdd0177a85c0942367d68a652b5ca4040390ba49b
 DIST vim-8.0.1298.tar.gz 13395459 BLAKE2B 4b6e3c4443cd675dc3727e8609b89c422f66c7d32908b5136ee312d48427568a8236214c85135242269b6575e0e1336b0973395a6372664435f8bae4d7bee843 SHA512 7704c493359c1a922f876e4d6f3b4ad265d8ce974a59d51a39e5a4424251105250ffc803bcf6c6750daeb5e6376cbbfd24557b075eacf2b0274d7c432db2f681
 DIST vim-8.0.1428.tar.gz 13415243 BLAKE2B 88f86c371d0a644212b9e4dc1a15d61244847037f36262a225c361bfc2799b741c128de21ac92bb3fb4a4955894e46d34dc01baa7cbf58f1371d772b36887103 SHA512 f635c53c7e2ca808dc1cb424e6e4b16d8c41c66a86c3c7584444dab3d2482904795fea7c071d65862ae6ac6b2b66b7ad5ac832e1e30f4624d46f220c6f41e2e9
 DIST vim-8.0.1645.tar.gz 13535252 BLAKE2B a5c7463e85eed12825bdf46d15eb7e7513d62831eba76cbb90af875010b33662b7a6ef2c4c5cecddface415d75e97caf0a670e69835ecd3b4a89704f3b18b905 SHA512 367b9e205e776f84fcfbb92725afd5e7aa66898110d46dbea1a33f7b74c239559e829b5104c45360539c8f2b23c375ed59ccea7ee35a5dd10770400d9a7be085
-EBUILD vim-core-8.0.0386.ebuild 6742 BLAKE2B 7c60a03815ee7bf63b9676c45d12f78511c526bc3dcd4eb7a3ece264e141650a15e9ce8fb0111b3f0aacd75056205ef7bbfed3d828c4592b43cb09eb3c90f4b1 SHA512 20b78ddb0bf153bc0e6111703d6a77f500ff8cf4cb71b1c01c22619027619f9dbbbc9b25163c888d5faf780dc5c4b05a2b8a8ec888ca592167e0ebee4b86b49d
-EBUILD vim-core-8.0.1188.ebuild 6648 BLAKE2B 8513f6f21478c099566a70c56ba739abd46174373cb228e170fd4ff701ed153e44eeef181218a09a1d9a5593dbeb66ef77d89b0c6285dca2add63086110ffa41 SHA512 fe73d0fb57acbddb58740e95e919383f02d176169513b5e6f9774b351fa886d572cc7cdc60b787e305819716f544cca8fa3222b40975c8590dd346bddaff7a38
+DIST vim-8.0.1699.tar.gz 13546105 BLAKE2B cabf29d5a89c55e2fe3bc5e39eb499412f5907ddf856f8644b466f1e0fbffefff3cd801b6bc5e49e62ffdf8805b0556058b9a913015a9f9fbe1a4f580132fd49 SHA512 b0fe8e1dc05fdc3758896caf4746da40988ca7604d77dbe78c47525cbf8f0d7e6c05f690687268eda581009050d4e02e93fb4d30734cbbab4cfd6a8a1488c1e7
 EBUILD vim-core-8.0.1298.ebuild 6638 BLAKE2B b57e18cf8bfb21288bba91782e5c0f61e361a62ad8a1a66fb3a278a6f2126dfc0944ee115bf44fabe80d98c79f0f7f75a533a7823dc01f579addec429d0dfa02 SHA512 46cde1a42d98f0459ea66a64657a6f88aa2e0a64ec2492ddbf0964938b566d3f7d9a4b03b640a21d9d1b364c6a0a3db53b1bf2c667ce9b18e5fcc4fd42147781
 EBUILD vim-core-8.0.1428.ebuild 6648 BLAKE2B 8513f6f21478c099566a70c56ba739abd46174373cb228e170fd4ff701ed153e44eeef181218a09a1d9a5593dbeb66ef77d89b0c6285dca2add63086110ffa41 SHA512 fe73d0fb57acbddb58740e95e919383f02d176169513b5e6f9774b351fa886d572cc7cdc60b787e305819716f544cca8fa3222b40975c8590dd346bddaff7a38
 EBUILD vim-core-8.0.1645.ebuild 6648 BLAKE2B 8513f6f21478c099566a70c56ba739abd46174373cb228e170fd4ff701ed153e44eeef181218a09a1d9a5593dbeb66ef77d89b0c6285dca2add63086110ffa41 SHA512 fe73d0fb57acbddb58740e95e919383f02d176169513b5e6f9774b351fa886d572cc7cdc60b787e305819716f544cca8fa3222b40975c8590dd346bddaff7a38
+EBUILD vim-core-8.0.1699.ebuild 6648 BLAKE2B 8513f6f21478c099566a70c56ba739abd46174373cb228e170fd4ff701ed153e44eeef181218a09a1d9a5593dbeb66ef77d89b0c6285dca2add63086110ffa41 SHA512 fe73d0fb57acbddb58740e95e919383f02d176169513b5e6f9774b351fa886d572cc7cdc60b787e305819716f544cca8fa3222b40975c8590dd346bddaff7a38
 EBUILD vim-core-9999.ebuild 6648 BLAKE2B 8513f6f21478c099566a70c56ba739abd46174373cb228e170fd4ff701ed153e44eeef181218a09a1d9a5593dbeb66ef77d89b0c6285dca2add63086110ffa41 SHA512 fe73d0fb57acbddb58740e95e919383f02d176169513b5e6f9774b351fa886d572cc7cdc60b787e305819716f544cca8fa3222b40975c8590dd346bddaff7a38
 MISC metadata.xml 321 BLAKE2B 018b535f5c81e8df2ee4f38a61ab95f999fb7fcd07ab67f9d5f7d2459768dc7e771006f50f903e1d0ba6cbf42ba2ae299901c1edb951a6e1dcbe3decaac98c57 SHA512 7d4a40b09c24eb8f08e6c171a4cf0e332d82f06163846602db338a1ad2e51133ed18694f216ce061fd9964fba3380b9991d86b93f111c6f8d0bb62ac5e14f705
diff --git a/app-editors/vim-core/vim-core-8.0.0386.ebuild b/app-editors/vim-core/vim-core-8.0.0386.ebuild
deleted file mode 100644
index f7d16fcf1349..000000000000
--- a/app-editors/vim-core/vim-core-8.0.0386.ebuild
+++ /dev/null
@@ -1,217 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VIM_VERSION="8.0"
-inherit eutils vim-doc flag-o-matic versionator bash-completion-r1 prefix
-
-if [[ ${PV} == 9999* ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/vim/vim.git"
-	EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${PV}
-else
-	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
-		https://dev.gentoo.org/~radhermit/vim/vim-8.0.0106-gentoo-patches.tar.bz2"
-	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"
-fi
-
-DESCRIPTION="vim and gvim shared files"
-HOMEPAGE="http://www.vim.org/ https://github.com/vim/vim"
-
-SLOT="0"
-LICENSE="vim"
-IUSE="nls acl minimal"
-
-DEPEND="sys-devel/autoconf"
-PDEPEND="!minimal? ( app-vim/gentoo-syntax )"
-
-S=${WORKDIR}/vim-${PV}
-
-pkg_setup() {
-	# people with broken alphabets run into trouble. bug 82186.
-	unset LANG LC_ALL
-	export LC_COLLATE="C"
-
-	# Gnome sandbox silliness. bug #114475.
-	mkdir -p "${T}"/home
-	export HOME="${T}"/home
-}
-
-src_prepare() {
-	if [[ ${PV} != 9999* ]] ; then
-		# Gentoo patches to fix runtime issues, cross-compile errors, etc
-		eapply "${WORKDIR}"/patches
-	fi
-
-	# Fixup a script to use awk instead of nawk
-	sed -i '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' "${S}"/runtime/tools/mve.awk \
-		|| die "mve.awk sed failed"
-
-	# Read vimrc and gvimrc from /etc/vim
-	echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> "${S}"/src/feature.h
-	echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h
-
-	# Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
-	# Hopefully this pattern won't break for a while at least.
-	# This fixes bug 29398 (27 Sep 2003 agriffis)
-	sed -i 's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
-		"${S}"/runtime/doc/syntax.txt \
-		"${S}"/runtime/doc/tagsrch.txt \
-		"${S}"/runtime/doc/usr_29.txt \
-		"${S}"/runtime/menu.vim \
-		"${S}"/src/configure.ac || die 'sed failed'
-
-	# Don't be fooled by /usr/include/libc.h.  When found, vim thinks
-	# this is NeXT, but it's actually just a file in dev-libs/9libs
-	# This fixes bug 43885 (20 Mar 2004 agriffis)
-	sed -i 's/ libc\.h / /' "${S}"/src/configure.ac || die 'sed failed'
-
-	# gcc on sparc32 has this, uhm, interesting problem with detecting EOF
-	# correctly. To avoid some really entertaining error messages about stuff
-	# which isn't even in the source file being invalid, we'll do some trickery
-	# to make the error never occur. bug 66162 (02 October 2004 ciaranm)
-	find "${S}" -name '*.c' | while read c ; do echo >> "$c" ; done
-
-	# Try to avoid sandbox problems. Bug #114475.
-	if [[ -d "${S}"/src/po ]] ; then
-		sed -i -e \
-			'/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
-			"${S}"/src/po/Makefile
-	fi
-
-	if version_is_at_least 7.3.122 ; then
-		cp "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk
-	fi
-
-	# Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0
-	if version_is_at_least 7.3 ; then
-		sed -i "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:"	\
-			"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
-	fi
-
-	eapply_user
-}
-
-src_configure() {
-	local myconf
-
-	# Fix bug 37354: Disallow -funroll-all-loops on amd64
-	# Bug 57859 suggests that we want to do this for all archs
-	filter-flags -funroll-all-loops
-
-	# Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
-	# everyone since previous flag filtering bugs have turned out to affect
-	# multiple archs...
-	replace-flags -O3 -O2
-
-	# Fix bug 18245: Prevent "make" from the following chain:
-	# (1) Notice configure.ac is newer than auto/configure
-	# (2) Rebuild auto/configure
-	# (3) Notice auto/configure is newer than auto/config.mk
-	# (4) Run ./configure (with wrong args) to remake auto/config.mk
-	sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
-	rm -f src/auto/configure
-	emake -j1 -C src autoconf
-
-	# This should fix a sandbox violation (see bug 24447). The hvc
-	# things are for ppc64, see bug 86433.
-	for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc* ; do
-		[[ -e ${file} ]] && addwrite $file
-	done
-
-	# Let Portage do the stripping. Some people like that.
-	export ac_cv_prog_STRIP="$(type -P true ) faking strip"
-
-	# Keep Gentoo Prefix env contained within the EPREFIX
-	use prefix && myconf+=" --without-local-dir"
-
-	econf \
-		--with-modified-by=Gentoo-${PVR} \
-		--enable-gui=no \
-		--without-x \
-		--disable-darwin \
-		--disable-perlinterp \
-		--disable-pythoninterp \
-		--disable-rubyinterp \
-		--disable-gpm \
-		--disable-selinux \
-		$(use_enable nls) \
-		$(use_enable acl) \
-		${myconf}
-}
-
-src_compile() {
-	# The following allows emake to be used
-	emake -j1 -C src auto/osdef.h objects
-
-	emake tools
-}
-
-src_test() { :; }
-
-src_install() {
-	local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
-
-	dodir /usr/{bin,share/{man/man1,vim}}
-	emake -C src \
-		installruntime \
-		installmanlinks \
-		installmacros \
-		installtutor \
-		installtutorbin \
-		installtools \
-		install-languages \
-		DESTDIR="${D}" \
-		BINDIR="${EPREFIX}"/usr/bin \
-		MANDIR="${EPREFIX}"/usr/share/man \
-		DATADIR="${EPREFIX}"/usr/share
-
-	keepdir ${vimfiles}/keymap
-
-	# default vimrc is installed by vim-core since it applies to
-	# both vim and gvim
-	insinto /etc/vim/
-	newins "${FILESDIR}"/vimrc-r5 vimrc
-	eprefixify "${ED}"/etc/vim/vimrc
-
-	if use minimal ; then
-		# To save space, install only a subset of the files.
-		# Helps minimalize the livecd, bug 65144.
-		eshopts_push -s extglob
-
-		rm -fr "${ED}${vimfiles}"/{compiler,doc,ftplugin,indent}
-		rm -fr "${ED}${vimfiles}"/{macros,print,tools,tutor}
-		rm "${ED}"/usr/bin/vimtutor
-
-		local keep_colors="default"
-		ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim )
-
-		local keep_syntax="conf|crontab|fstab|inittab|resolv|sshdconfig"
-		# tinkering with the next line might make bad things happen ...
-		keep_syntax="${keep_syntax}|syntax|nosyntax|synload"
-		ignore=$(rm -fr "${ED}${vimfiles}"/syntax/!(${keep_syntax}).vim )
-
-		eshopts_pop
-	fi
-
-	# These files might have slight security issues, so we won't
-	# install them. See bug #77841. We don't mind if these don't
-	# exist.
-	rm "${ED}${vimfiles}"/tools/{vimspell.sh,tcltags} 2>/dev/null
-
-	newbashcomp "${FILESDIR}"/xxd-completion xxd
-
-	# We shouldn't be installing the ex or view man page symlinks, as they
-	# are managed by eselect-vi
-	rm -f "${ED}"/usr/share/man/man1/{ex,view}.1
-}
-
-pkg_postinst() {
-	# Update documentation tags (from vim-doc.eclass)
-	update_vim_helptags
-}
-
-pkg_postrm() {
-	# Update documentation tags (from vim-doc.eclass)
-	update_vim_helptags
-}
diff --git a/app-editors/vim-core/vim-core-8.0.1188.ebuild b/app-editors/vim-core/vim-core-8.0.1699.ebuild
similarity index 100%
rename from app-editors/vim-core/vim-core-8.0.1188.ebuild
rename to app-editors/vim-core/vim-core-8.0.1699.ebuild
diff --git a/app-editors/vim/Manifest b/app-editors/vim/Manifest
index 9363a718464a..059dfb9fdae0 100644
--- a/app-editors/vim/Manifest
+++ b/app-editors/vim/Manifest
@@ -3,8 +3,10 @@ DIST vim-8.0.0938-gentoo-patches.tar.bz2 2316 BLAKE2B 05a87f32fc5cc65e7f5e4e5a87
 DIST vim-8.0.1298.tar.gz 13395459 BLAKE2B 4b6e3c4443cd675dc3727e8609b89c422f66c7d32908b5136ee312d48427568a8236214c85135242269b6575e0e1336b0973395a6372664435f8bae4d7bee843 SHA512 7704c493359c1a922f876e4d6f3b4ad265d8ce974a59d51a39e5a4424251105250ffc803bcf6c6750daeb5e6376cbbfd24557b075eacf2b0274d7c432db2f681
 DIST vim-8.0.1428.tar.gz 13415243 BLAKE2B 88f86c371d0a644212b9e4dc1a15d61244847037f36262a225c361bfc2799b741c128de21ac92bb3fb4a4955894e46d34dc01baa7cbf58f1371d772b36887103 SHA512 f635c53c7e2ca808dc1cb424e6e4b16d8c41c66a86c3c7584444dab3d2482904795fea7c071d65862ae6ac6b2b66b7ad5ac832e1e30f4624d46f220c6f41e2e9
 DIST vim-8.0.1645.tar.gz 13535252 BLAKE2B a5c7463e85eed12825bdf46d15eb7e7513d62831eba76cbb90af875010b33662b7a6ef2c4c5cecddface415d75e97caf0a670e69835ecd3b4a89704f3b18b905 SHA512 367b9e205e776f84fcfbb92725afd5e7aa66898110d46dbea1a33f7b74c239559e829b5104c45360539c8f2b23c375ed59ccea7ee35a5dd10770400d9a7be085
+DIST vim-8.0.1699.tar.gz 13546105 BLAKE2B cabf29d5a89c55e2fe3bc5e39eb499412f5907ddf856f8644b466f1e0fbffefff3cd801b6bc5e49e62ffdf8805b0556058b9a913015a9f9fbe1a4f580132fd49 SHA512 b0fe8e1dc05fdc3758896caf4746da40988ca7604d77dbe78c47525cbf8f0d7e6c05f690687268eda581009050d4e02e93fb4d30734cbbab4cfd6a8a1488c1e7
 EBUILD vim-8.0.1298.ebuild 8772 BLAKE2B 53c2fcb911fc27374cd00f4a1c5df9c30245540da78e4e3468d020fcd3149d0a0c57273eb1f4d38bd3f416604c1d29e08e49e8cf5a820f99bc28e82d1e999b6a SHA512 f200661012bc5505b0261aed18d360cfada37e93f84a30b74696c26175d7b369be9f0380c9b2db28324b4a8e0ae5fc888a328ae94a58e18d5112fc15b1d8cc5f
 EBUILD vim-8.0.1428.ebuild 8782 BLAKE2B d503bbec09a4710ecae79ed853f8ff733c89777ec23b08316d104d35fbedb81a1e8557aaaf69f104dab6969d9f09cdd0ea8ba223527a7e308de965ae923899cf SHA512 846b01412281def6ea63f4ec2bb313e8619849d4a8beedf7172f71c982000db7f3afb5e39662394609d95a3a537afd751cefacd49102e431a5a6ffe673dd0065
 EBUILD vim-8.0.1645.ebuild 8800 BLAKE2B 1eb5e4864b0e83c4c820b45e5791c2c22e8667799d9296d83f59b5cf07c263f2873deec04f6586e32bdca9dbd958876a971b67cc73b8f8bf3fd897692e60bcf0 SHA512 60d07415e38176b2ee9f16dc5c4f0d4da821e8505c0723791d1a38342bc1d1ab59ad8348f81950367859392849d69b385514fc16b1741cf95357f75291a84d83
-EBUILD vim-9999.ebuild 8800 BLAKE2B 1eb5e4864b0e83c4c820b45e5791c2c22e8667799d9296d83f59b5cf07c263f2873deec04f6586e32bdca9dbd958876a971b67cc73b8f8bf3fd897692e60bcf0 SHA512 60d07415e38176b2ee9f16dc5c4f0d4da821e8505c0723791d1a38342bc1d1ab59ad8348f81950367859392849d69b385514fc16b1741cf95357f75291a84d83
+EBUILD vim-8.0.1699.ebuild 8788 BLAKE2B 6f30fc561bc164d54c8b45d56f6589e4bd88bbaa87c419120ed5ae08a0821d4415062eb3e8002352f97faca2901048ff0ad9368485df95f0f41f6ee7bc55ebc2 SHA512 afa9c34b8bee7f3e5c066c48a70b61ef991e8ba56082254eb4796a62aef0bb01a250d813660d699c3814da1b343f97e69373474c9b0bb44064e1c841ca0de9a0
+EBUILD vim-9999.ebuild 8788 BLAKE2B 6f30fc561bc164d54c8b45d56f6589e4bd88bbaa87c419120ed5ae08a0821d4415062eb3e8002352f97faca2901048ff0ad9368485df95f0f41f6ee7bc55ebc2 SHA512 afa9c34b8bee7f3e5c066c48a70b61ef991e8ba56082254eb4796a62aef0bb01a250d813660d699c3814da1b343f97e69373474c9b0bb44064e1c841ca0de9a0
 MISC metadata.xml 752 BLAKE2B 91fa465837da7fef20719826bbee3592d1d0f72f0015accaf425dad3999ee5f6d6f1ff6cdaa539dc1621d9735e1e97156824fb2e74e8707bae9c213719b20d4e SHA512 e49f531537dc14352cfd1550f77e830599addc6cfc9bc9f4a3a20449b0bab2ec5bfeb8923eab15a0585ff156c4b61cfcb5795caf0b9f6fcf14054559a1cd5476
diff --git a/app-editors/vim/vim-8.0.1699.ebuild b/app-editors/vim/vim-8.0.1699.ebuild
new file mode 100644
index 000000000000..1fdeedc42c87
--- /dev/null
+++ b/app-editors/vim/vim-8.0.1699.ebuild
@@ -0,0 +1,311 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+VIM_VERSION="8.0"
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_REQ_USE="threads"
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
+
+inherit vim-doc flag-o-matic versionator bash-completion-r1 python-single-r1 ruby-single
+
+if [[ ${PV} == 9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/vim/vim.git"
+else
+	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz
+		https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2"
+	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"
+fi
+
+DESCRIPTION="Vim, an improved vi-style text editor"
+HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim"
+
+SLOT="0"
+LICENSE="vim"
+IUSE="X acl cscope debug gpm lua luajit minimal nls perl python racket ruby selinux tcl terminal vim-pager"
+REQUIRED_USE="
+	luajit? ( lua )
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+RDEPEND="
+	>=app-eselect/eselect-vi-1.1
+	>=sys-libs/ncurses-5.2-r2:0=
+	nls? ( virtual/libintl )
+	acl? ( kernel_linux? ( sys-apps/acl ) )
+	cscope? ( dev-util/cscope )
+	gpm? ( >=sys-libs/gpm-1.19.3 )
+	lua? (
+		luajit? ( dev-lang/luajit:2= )
+		!luajit? ( dev-lang/lua:0[deprecated] )
+	)
+	!minimal? (
+		~app-editors/vim-core-${PV}
+		dev-util/ctags
+	)
+	perl? ( dev-lang/perl:= )
+	python? ( ${PYTHON_DEPS} )
+	racket? ( dev-scheme/racket )
+	ruby? ( ${RUBY_DEPS} )
+	selinux? ( sys-libs/libselinux )
+	tcl? ( dev-lang/tcl:0= )
+	X? ( x11-libs/libXt )
+"
+
+DEPEND="
+	${RDEPEND}
+	sys-devel/autoconf
+	nls? ( sys-devel/gettext )
+"
+
+pkg_setup() {
+	# people with broken alphabets run into trouble. bug 82186.
+	unset LANG LC_ALL
+	export LC_COLLATE="C"
+
+	# Gnome sandbox silliness. bug #114475.
+	mkdir -p "${T}"/home || die "mkdir failed"
+	export HOME="${T}"/home
+
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	if [[ ${PV} != 9999* ]] ; then
+		# Gentoo patches to fix runtime issues, cross-compile errors, etc
+		eapply "${WORKDIR}"/patches/
+	fi
+
+	# Fixup a script to use awk instead of nawk
+	sed -i -e \
+		'1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \
+		"${S}"/runtime/tools/mve.awk || die "mve.awk sed failed"
+
+	# Read vimrc and gvimrc from /etc/vim
+	echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' \
+		>> "${S}"/src/feature.h || die "echo failed"
+	echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' \
+		>> "${S}"/src/feature.h || die "echo failed"
+
+	# Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
+	# Hopefully this pattern won't break for a while at least.
+	# This fixes bug 29398 (27 Sep 2003 agriffis)
+	sed -i -e \
+		's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
+		"${S}"/runtime/doc/syntax.txt \
+		"${S}"/runtime/doc/tagsrch.txt \
+		"${S}"/runtime/doc/usr_29.txt \
+		"${S}"/runtime/menu.vim \
+		"${S}"/src/configure.ac || die 'sed failed'
+
+	# Don't be fooled by /usr/include/libc.h.  When found, vim thinks
+	# this is NeXT, but it's actually just a file in dev-libs/9libs
+	# This fixes bug 43885 (20 Mar 2004 agriffis)
+	sed -i -e \
+		's/ libc\.h / /' \
+		"${S}"/src/configure.ac || die 'sed failed'
+
+	# gcc on sparc32 has this, uhm, interesting problem with detecting EOF
+	# correctly. To avoid some really entertaining error messages about stuff
+	# which isn't even in the source file being invalid, we'll do some trickery
+	# to make the error never occur. bug 66162 (02 October 2004 ciaranm)
+	find "${S}" -name '*.c' | while read c; do
+	    echo >> "$c" || die "echo failed"
+	done
+
+	# conditionally make the manpager.sh script
+	if use vim-pager; then
+		cat > "${S}"/runtime/macros/manpager.sh <<-_EOF_ || die "cat EOF failed"
+			#!/bin/sh
+			sed -e 's/\x1B\[[[:digit:]]\+m//g' | col -b | \\
+					vim \\
+						-c 'let no_plugin_maps = 1' \\
+						-c 'set nolist nomod ft=man ts=8' \\
+						-c 'let g:showmarks_enable=0' \\
+						-c 'runtime! macros/less.vim' -
+			_EOF_
+	fi
+
+	# Try to avoid sandbox problems. Bug #114475.
+	if [[ -d "${S}"/src/po ]]; then
+		sed -i -e \
+			'/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
+			"${S}"/src/po/Makefile || die "sed failed"
+	fi
+
+	cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed"
+
+	sed -i -e \
+		"s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
+		"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
+
+	eapply_user
+}
+
+src_configure() {
+	local myconf=()
+
+	# Fix bug 37354: Disallow -funroll-all-loops on amd64
+	# Bug 57859 suggests that we want to do this for all archs
+	filter-flags -funroll-all-loops
+
+	# Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
+	# everyone since previous flag filtering bugs have turned out to affect
+	# multiple archs...
+	replace-flags -O3 -O2
+
+	# Fix bug 18245: Prevent "make" from the following chain:
+	# (1) Notice configure.ac is newer than auto/configure
+	# (2) Rebuild auto/configure
+	# (3) Notice auto/configure is newer than auto/config.mk
+	# (4) Run ./configure (with wrong args) to remake auto/config.mk
+	sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
+	rm src/auto/configure || die "rm failed"
+	emake -j1 -C src autoconf
+
+	# This should fix a sandbox violation (see bug 24447). The hvc
+	# things are for ppc64, see bug 86433.
+	for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do
+		if [[ -e "${file}" ]]; then
+			addwrite $file
+		fi
+	done
+
+	if use minimal; then
+		myconf=(
+			--with-features=tiny
+			--disable-nls
+			--disable-multibyte
+			--disable-acl
+			--enable-gui=no
+			--without-x
+			--disable-darwin
+			--disable-luainterp
+			--disable-perlinterp
+			--disable-pythoninterp
+			--disable-mzschemeinterp
+			--disable-rubyinterp
+			--disable-selinux
+			--disable-tclinterp
+			--disable-gpm
+		)
+	else
+		use debug && append-flags "-DDEBUG"
+
+		myconf=(
+			--with-features=huge
+			--enable-multibyte
+			$(use_enable acl)
+			$(use_enable cscope)
+			$(use_enable gpm)
+			$(use_enable lua luainterp)
+			$(usex lua "--with-lua-prefix=${EPREFIX}/usr" "")
+			$(use_with luajit)
+			$(use_enable nls)
+			$(use_enable perl perlinterp)
+			$(use_enable python pythoninterp)
+			$(use_enable python python3interp)
+			$(use_enable racket mzschemeinterp)
+			$(use_enable ruby rubyinterp)
+			$(use_enable selinux)
+			$(use_enable tcl tclinterp)
+			$(use_enable terminal)
+		)
+
+		# --with-features=huge forces on cscope even if we --disable it. We need
+		# to sed this out to avoid screwiness. (1 Sep 2004 ciaranm)
+		if ! use cscope; then
+			sed -i -e \
+				'/# define FEAT_CSCOPE/d' src/feature.h || die "sed failed"
+		fi
+
+		# don't test USE=X here ... see bug #19115
+		# but need to provide a way to link against X ... see bug #20093
+		myconf+=(
+			--enable-gui=no
+			--disable-darwin
+			$(use_with X x)
+		)
+	fi
+
+	# let package manager strip binaries
+	export ac_cv_prog_STRIP="$(type -P true ) faking strip"
+
+	# keep prefix env contained within the EPREFIX
+	use prefix && myconf+=( --without-local-dir )
+
+	econf \
+		--with-modified-by=Gentoo-${PVR} \
+		"${myconf[@]}"
+}
+
+src_compile() {
+	# The following allows emake to be used
+	emake -j1 -C src auto/osdef.h objects
+
+	emake
+}
+
+src_test() {
+	einfo
+	einfo "Starting vim tests. Several error messages will be shown"
+	einfo "while the tests run. This is normal behaviour and does not"
+	einfo "indicate a fault."
+	einfo
+	ewarn "If the tests fail, your terminal may be left in a strange"
+	ewarn "state. Usually, running 'reset' will fix this."
+	einfo
+
+	# Don't let vim talk to X
+	unset DISPLAY
+
+	emake -j1 -C src/testdir nongui
+}
+
+# Call eselect vi update with --if-unset
+# to respect user's choice (bug 187449)
+eselect_vi_update() {
+	einfo "Calling eselect vi update..."
+	eselect vi update --if-unset
+	eend $?
+}
+
+src_install() {
+	local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
+
+	# Note: Do not install symlinks for 'vi', 'ex', or 'view', as these are
+	#       managed by eselect-vi
+	dobin src/vim
+	dosym vim /usr/bin/vimdiff
+	dosym vim /usr/bin/rvim
+	dosym vim /usr/bin/rview
+	if use vim-pager ; then
+		dosym ${vimfiles}/macros/less.sh /usr/bin/vimpager
+		dosym ${vimfiles}/macros/manpager.sh /usr/bin/vimmanpager
+		insinto ${vimfiles}/macros
+		doins runtime/macros/manpager.sh
+		fperms a+x ${vimfiles}/macros/manpager.sh
+	fi
+
+	newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
+
+	# keep in sync with 'complete ... -F' list
+	bashcomp_alias vim ex vi view rvim rview vimdiff
+}
+
+pkg_postinst() {
+	# Update documentation tags (from vim-doc.eclass)
+	update_vim_helptags
+
+	# Call eselect vi update
+	eselect_vi_update
+}
+
+pkg_postrm() {
+	# Update documentation tags (from vim-doc.eclass)
+	update_vim_helptags
+
+	# Call eselect vi update
+	eselect_vi_update
+}
diff --git a/app-editors/vim/vim-9999.ebuild b/app-editors/vim/vim-9999.ebuild
index 01f04731da4a..1fdeedc42c87 100644
--- a/app-editors/vim/vim-9999.ebuild
+++ b/app-editors/vim/vim-9999.ebuild
@@ -4,8 +4,10 @@
 EAPI=6
 VIM_VERSION="8.0"
 PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-PYTHON_REQ_USE=threads
-inherit vim-doc flag-o-matic versionator bash-completion-r1 python-single-r1
+PYTHON_REQ_USE="threads"
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
+
+inherit vim-doc flag-o-matic versionator bash-completion-r1 python-single-r1 ruby-single
 
 if [[ ${PV} == 9999* ]] ; then
 	inherit git-r3
@@ -45,7 +47,7 @@ RDEPEND="
 	perl? ( dev-lang/perl:= )
 	python? ( ${PYTHON_DEPS} )
 	racket? ( dev-scheme/racket )
-	ruby? ( || ( dev-lang/ruby:2.5 dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.2 ) )
+	ruby? ( ${RUBY_DEPS} )
 	selinux? ( sys-libs/libselinux )
 	tcl? ( dev-lang/tcl:0= )
 	X? ( x11-libs/libXt )
diff --git a/dev-perl/Manifest.gz b/dev-perl/Manifest.gz
index 7b74b254bfc0..25e35dcc0838 100644
Binary files a/dev-perl/Manifest.gz and b/dev-perl/Manifest.gz differ
diff --git a/dev-perl/Number-Bytes-Human/Manifest b/dev-perl/Number-Bytes-Human/Manifest
new file mode 100644
index 000000000000..784c972cd187
--- /dev/null
+++ b/dev-perl/Number-Bytes-Human/Manifest
@@ -0,0 +1,3 @@
+DIST Number-Bytes-Human-0.11.tar.gz 11571 BLAKE2B 370718d87e0466fdb5efe367765baf290192dce1dcda2fd08624658a2bafea55152e9f108a7b1dee6b1a2d0dfddcce995365d586d730346e89f04c3afaf917ba SHA512 045bfe3d26b3460cb45ef69aeb1398c897605e621f559c43cf199829b1715e12781ad0330d80bed8b7c15b332ca6c9e620e580c71a0f1cf68c7d2fcf4b023936
+EBUILD Number-Bytes-Human-0.110.0.ebuild 454 BLAKE2B 0d387999e5fc6a54828fc1f10c8f040a9293657aea29dfd4b923d075ee084b5b78535231c6ebf6ac1d0b47a5154e297f2472dc0e5237877d15eda7ba55e49097 SHA512 53bb4fb9bf2eb546e0df7cc0a728b70da1c1b96b6c1c7d0c64e632c3cf4b869415ddd1dbdf1fafb0f0940beefe3855aab309c4a68276f19b98873975a38538a2
+MISC metadata.xml 409 BLAKE2B 6ef1621d559b582e47d35b135cace5595357bec93c8c2e1d74378ca48a51fe8340625edf325f402ddad8b7718f9d12758ca1a9b86f4b00f5962707ed3dfe3917 SHA512 28f510b043c75a78ba49869a5e16ce3cc9172cff31e5f6d9811003a797b57f32a856b8dbb6ed4813d898e4300049c97130dc7d7840a0d54acb45872bf3f116f9
diff --git a/dev-perl/Number-Bytes-Human/Number-Bytes-Human-0.110.0.ebuild b/dev-perl/Number-Bytes-Human/Number-Bytes-Human-0.110.0.ebuild
new file mode 100644
index 000000000000..5d70eec70bb8
--- /dev/null
+++ b/dev-perl/Number-Bytes-Human/Number-Bytes-Human-0.110.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=FERREIRA
+DIST_VERSION=0.11
+inherit perl-module
+
+DESCRIPTION="Convert byte count to human readable format"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	virtual/perl-Carp
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		virtual/perl-Test-Simple
+	)
+"
+PERL_RM_FILES=( "t/90pod.t" "t/98pod-coverage.t" )
diff --git a/dev-perl/Number-Bytes-Human/metadata.xml b/dev-perl/Number-Bytes-Human/metadata.xml
new file mode 100644
index 000000000000..7b3ba29e7875
--- /dev/null
+++ b/dev-perl/Number-Bytes-Human/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="cpan">Number-Bytes-Human</remote-id>
+    <remote-id type="cpan-module">Number::Bytes::Human</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index f4d22654011b..2ebb716b802c 100644
Binary files a/dev-ruby/Manifest.gz and b/dev-ruby/Manifest.gz differ
diff --git a/dev-ruby/dalli/Manifest b/dev-ruby/dalli/Manifest
index 7ec5bced41b5..3831c76ecb0d 100644
--- a/dev-ruby/dalli/Manifest
+++ b/dev-ruby/dalli/Manifest
@@ -1,5 +1,7 @@
 DIST dalli-2.7.6.tar.gz 48481 BLAKE2B 9f83523b75d1c6fa109aba7e288e13924d8c7677c6fa38ffe5ce21dfb22f858f8a3ab8593afceed97e980e5f0172c1f8c58cc96b42f4bde31013f5ffcbb26f8b SHA512 ee2270e719f6ff108654d20dfc560cdc6067808c211ae75304f5ca3f7772561b25a699fddb051e42db744bb202228bdbb904171faf5e1804f1f2bed4341bc258
 DIST dalli-2.7.7.tar.gz 51532 BLAKE2B a625e333130f2c9ec47a9e3aec892a8e0d5f7248b71f6c666461104e2b29d4a384dd415b00dbe70d24fdd44a3b6835fdebdeb75297d4cd6d48506d146f892d4e SHA512 ed2a3f0b41451ae703060fe6197675ed6096531b91e5210a2fbded7a40a9a5717d47f5611081a488931318fd89888f00a539c67bab3dc600cea12676cab289cc
+DIST dalli-2.7.8.tar.gz 51599 BLAKE2B 935fc1b0ffb2c93c0ef8ab6a82e63b4e272c51ae6c2cbd0c670953c0943942c25b4c795ca7953ad4e53284f6b6e35b44be386ec4dba0c96345256e3b3173152d SHA512 5fa48a01db15fdafa179663b71867dd6a9c2ab7b4b94434f650c1ce37bd71caa2bb22efe032a4eed777538cdc341f22a251d14772aaba62f4a6d9d8c33b6a346
 EBUILD dalli-2.7.6.ebuild 1407 BLAKE2B c1a47e18c933355b7cb917582e8342218da00e1755e92691abae96254d09a43e06c0b27ddaf64df66e9831a8eac04c0297d57007ea4509546b9f529a4fa601b5 SHA512 de044b223df4c284be5b981aeccc401365c47143c7f1b33768278e24f51eda5270ffc482f72eadf9af31b8b5b527becfbcafd810c1b9d1e2d2683560156fdadf
 EBUILD dalli-2.7.7.ebuild 1401 BLAKE2B c6119bf16e8b63f85b677507f225b25cccf32c33112dcd2c5374f62d507472d014d7eb0b0445d99de1aa3307f517fa90ab16c6c70478bb954c62868495224a23 SHA512 b898e173732ba03315325018579086522d653d2e3cf7671be74bf762d0789b666e5d0089dc61a3b9511d6e5fc40a246b86f41d0455c0528d51859c3e768894f5
+EBUILD dalli-2.7.8.ebuild 1401 BLAKE2B c6119bf16e8b63f85b677507f225b25cccf32c33112dcd2c5374f62d507472d014d7eb0b0445d99de1aa3307f517fa90ab16c6c70478bb954c62868495224a23 SHA512 b898e173732ba03315325018579086522d653d2e3cf7671be74bf762d0789b666e5d0089dc61a3b9511d6e5fc40a246b86f41d0455c0528d51859c3e768894f5
 MISC metadata.xml 346 BLAKE2B e34b47009de19ff810f3c3893517533730fa09cc4713b5fb8ebc05011004e17466ca0a6e6df307e5748003a7b4c83691d28ca0d80b423f6f870c4f7fc9be88eb SHA512 22b3ca0c5024974556840a2cf47ffa0dac63b6a4573d2ca6244c3ec9231b1c8321c7f544bc979882a6bb6ca37545b8ccf4612ce9ffd1ab34521b24e896f57e41
diff --git a/dev-ruby/dalli/dalli-2.7.8.ebuild b/dev-ruby/dalli/dalli-2.7.8.ebuild
new file mode 100644
index 000000000000..89dc2a156175
--- /dev/null
+++ b/dev-ruby/dalli/dalli-2.7.8.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby22 ruby23 ruby24"
+
+RUBY_FAKEGEM_TASK_TEST="test"
+
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="History.md Performance.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A high performance pure Ruby client for accessing memcached servers"
+HOMEPAGE="https://github.com/petergoldstein/dalli"
+SRC_URI="https://github.com/petergoldstein/dalli/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE=""
+
+DEPEND+="${DEPEND} test? ( >=net-misc/memcached-1.4.0 )"
+
+ruby_add_bdepend "test? (
+		dev-ruby/minitest:5
+		>=dev-ruby/mocha-0.13
+		dev-ruby/rack
+		>=dev-ruby/activesupport-4.2 <dev-ruby/activesupport-5.2
+		dev-ruby/connection_pool )"
+
+all_ruby_prepare() {
+	chmod 0755 "${HOME}" || die "Failed to fix permissions on home"
+
+	sed -i -e '/\(appraisal\|bundler\)/ s:^:#:' Rakefile || die
+
+	sed -i -e '3igem "minitest", "~> 5.0"; gem "activesupport", "< 5.2"' \
+		-e '/bundler/ s:^:#:' test/helper.rb || die
+
+	# Drop rails dependency which is only used to display the version
+	# number, so we only need to depend on activesupport and avoid
+	# complicated circular dependencies.
+	sed -i -e '/rails/I s:^:#:' \
+		-e '14irequire "active_support"' test/helper.rb || die
+}
diff --git a/dev-ruby/loofah/Manifest b/dev-ruby/loofah/Manifest
index 8464268db8d2..72f8ca9d78f5 100644
--- a/dev-ruby/loofah/Manifest
+++ b/dev-ruby/loofah/Manifest
@@ -1,9 +1,5 @@
-DIST loofah-2.0.3.gem 60416 BLAKE2B 04e37464ac9e2b61fcc838763b6360fe80a8aeec26cc365803e6121bb4a628f17e79bc2426d0b351935dffc18829ab9d37239786fb3192c328f5a8026365cc41 SHA512 1f08bcfa09bf075b4d84707099cce6bdaa986cd6c79f63fc60c8bee4812c5a31cee1021cd314fc2033842d7b01ffe63f5f6acbf271a0db2ee631cd326520d700
-DIST loofah-2.1.1.gem 61440 BLAKE2B adefeb040e0ad6302de3cfdd169cf33c22eb409be519f2acd610d210254295a935a8fc1223200003c27275756c8a3c604fb3c5589e3abc7c5207b457dcc6c349 SHA512 16499113ba3b435ba2cd3a583ed958db7f02604a56d87125341d5c143602ed9755272598faef9995be57f2b408c4696675f69cf5fb15d472c958e16f46c35d58
 DIST loofah-2.2.1.gem 65024 BLAKE2B dfa45264e9dc0cb4c9fd8eaff8831b5098ae9c1e7fd46d3e965362e46851d5b19102fb23dc96393091ca8e2f8bd9a12f5098ace3c2d6e25236a33fa5f2579c69 SHA512 df971a1bee08f0ee0913af2b4b7baefa6d1ad04af82de796f6f0d505fab7749d52ce79db0118343d336bdae6fcfd4190fecb315019b2c821d81ac1c08d5b8e2a
 DIST loofah-2.2.2.gem 65024 BLAKE2B 4ddb20943b4258c4be621439d38b094dfc79947f092ffa2ff9af56db40538e9672f50762562ffbe5b7c5788fe12ab07ff7601383cfe7e6fc0f4209dad9edceee SHA512 3c64182f8fdb7d79a5be65969728c4c51a4535f53fdae7c8e5f4d487d43af3efac9d2f3746d8e02564d0979e94a0e63dc5974701c151e31c502cb8ff97f1295e
-EBUILD loofah-2.0.3.ebuild 990 BLAKE2B 9bf4e3221612c2167843ec6a4660d55ed56cbd2d677cd93b29eab5b82e8b19f5ff1f7a97212bd6e3be459052983e910ff22ad1187b3b937a02272c051149189b SHA512 3335f16bb241ec5280342fb31ebc9ef2c514ac1804d89c60e64f794fdd6a55773abc18758c912371af63db09d174d02f7a1c1b5d734397b986b13c067c629eca
-EBUILD loofah-2.1.1.ebuild 1113 BLAKE2B 0bab4595c693e0b9b473186e4fad0e7fb4e1f41f015e8ff0a76d95ab85b72df7a124d72e4a7fe3cb674dce5ad445436d754b450be0c34620943c0891bbb1d45a SHA512 ac52f9a1a55f4635fee4a9788abd473755a9c8f53991de61b9743bab4f20161d3edb454bcac2951c0558c464466864071af52ea409cf2ba2a79aec893f0239f6
 EBUILD loofah-2.2.1.ebuild 1111 BLAKE2B fcc45fdf8a497aa038a01fab8a22e771c993bee533ddc22ead0eac920da70432f2760a71db12446ddb0e864a97143c48296a67aac1a29b39496b13282f78ab22 SHA512 0f64103eaa919ba66c76cbaa8eb144cf1bef933df1f98038d28d661831c121ae13fde36d56754912ec26aa8ffd34b75d71b4974d2fe8010a3504c5ca40b93d43
 EBUILD loofah-2.2.2.ebuild 924 BLAKE2B e3f6611657fc73c7933a615eafdc8fdece0c7d4e759a6e2e6061f899f2562a271ec2cd3350646781c1925b8acdddaa0e4555e1daaa2d97ff9fe86c8d413dbecb SHA512 432f58ff35e3056cd3be76a6a9f7bb64572ecc7aca4e9b9f8f149921a09a3dc20ead05a627372fc4039b01c3d3c56c7ef77bc3cd4102883f495eb4e945a2c570
 MISC metadata.xml 344 BLAKE2B a3f2ff5b2aab094581e9f6a3874fbc35fde908d210ea6fbe3643bf8ffcae21de206d0d6afa5055ef3f9dc520778aebfe182dc6018bebc19b075e717278b7babc SHA512 dbcf17023520a30b8d578f04db73d0a67851199b31589473c9bddf1d82f6096d78369ce1b943f05cca904f1bdb2a09adc605a3dc5d8d4e64db5df152b89dd843
diff --git a/dev-ruby/loofah/loofah-2.0.3.ebuild b/dev-ruby/loofah/loofah-2.0.3.ebuild
deleted file mode 100644
index 971d0fa4976a..000000000000
--- a/dev-ruby/loofah/loofah-2.0.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.rdoc README.rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Library for manipulating and transforming HTML/XML documents and fragments."
-HOMEPAGE="https://github.com/flavorjones/loofah"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/nokogiri-1.5.9"
-
-ruby_add_bdepend "test? ( >=dev-ruby/rr-1.1.0 >=dev-ruby/hoe-2.3.0 )"
-
-all_ruby_prepare() {
-	# Avoid test failing on different whitespace.
-	sed -i -e '/test_fragment_whitewash_on_microsofty_markup/askip "gentoo"' test/integration/test_ad_hoc.rb || die
-
-	# Fix test for new libxml2 results (fixed upstream)
-	sed -i -e '348i "xhtml": "&lt;&lt;script&gt;alert(\\\"XSS\\\");//&lt;&lt;/script&gt;",' test/assets/testdata_sanitizer_tests1.dat || die
-}
diff --git a/dev-ruby/loofah/loofah-2.1.1.ebuild b/dev-ruby/loofah/loofah-2.1.1.ebuild
deleted file mode 100644
index 5beac09e3b39..000000000000
--- a/dev-ruby/loofah/loofah-2.1.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Library for manipulating and transforming HTML/XML documents and fragments."
-HOMEPAGE="https://github.com/flavorjones/loofah"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
-IUSE=""
-
-ruby_add_rdepend "=dev-ruby/crass-1.0* >=dev-ruby/crass-1.0.2 >=dev-ruby/nokogiri-1.5.9"
-
-ruby_add_bdepend "test? ( >=dev-ruby/rr-1.1.0 >=dev-ruby/hoe-2.3.0 )"
-
-all_ruby_prepare() {
-	# Avoid unneeded development dependencies
-	sed -i -e '/concourse/I s:^:#:' Rakefile || die
-
-	# Avoid test failing on different whitespace.
-	sed -i -e '/test_fragment_whitewash_on_microsofty_markup/askip "gentoo"' test/integration/test_ad_hoc.rb || die
-
-	# Fix test for new libxml2 results (fixed upstream)
-	#sed -i -e '348i "xhtml": "&lt;&lt;script&gt;alert(\\\"XSS\\\");//&lt;&lt;/script&gt;",' test/assets/testdata_sanitizer_tests1.dat || die
-}
diff --git a/dev-ruby/sdoc/Manifest b/dev-ruby/sdoc/Manifest
index e49f15b34575..b88b1abf5f8e 100644
--- a/dev-ruby/sdoc/Manifest
+++ b/dev-ruby/sdoc/Manifest
@@ -1,5 +1,5 @@
-DIST sdoc-0.4.1.gem 281088 BLAKE2B 3a744a2f3209044c5b60e5bea3412e0fbbe3fd059fbc77c9cae576ea20b3fc091b09395e7ca274596ddfdf690ebc9da009592a3f1d587c2da15cf07dcc690768 SHA512 2c68b5d49ac29d453440447869b4567554d5fb722ea17b06935184d6df7e972d73a5323c1d8777461c196fa3cceb9380f8c50f824bad9a665b36ab6cc4cc3a71
 DIST sdoc-0.4.2.gem 282112 BLAKE2B d3ea14735e35d9da6562e19f6b1b5bb3fad915ec235f64bce460d02d574d0da50d81d1e09a3b3753bbf199da5cde80f78ffff17a66f9a42f9b7925b9b1bc38f2 SHA512 2c3aef526b22fbcae1fc4911daca6499df677b4a22364f9ec5598ff3feb74242d0e00d93a16df741d2e383c297835a89ab4fa8122faef00492d7a97ae7e77b1b
-EBUILD sdoc-0.4.1.ebuild 598 BLAKE2B 496fc8d1641b0555bbcf779e6ca8c52074b40c43cd93bc2207f7cf81c40cf1f81f4b94156f4959abd6b8aea1dbcff62fd0d1ebc100460d075570b0c735e2d18a SHA512 5bc4f6d3b4f2177a85299880daef223eb2b63a5a0e5ded71370029abfb37b48b40978b9c86a1679474188b4a28e2371aa1c674424e6bda8593bb58ed58e9cfb5
+DIST sdoc-1.0.0.gem 268800 BLAKE2B 238b36af9909e7329f6b54e297b4e03f27e8850bee2cb65483c9b912b92c16933639fba5f085ae8c30f808cbd6a94d1b34b5bb45af3f1d9a7fc37a4ea45f32f8 SHA512 cee8be23a2bc53dc3e052e183405ae17546594e2b1b87b7d83c8dc527b2c4bd71a5f642f52ae489f4990ba5d3571c23b590b6a562d677b32597cdeeb08c63a38
 EBUILD sdoc-0.4.2.ebuild 598 BLAKE2B 496fc8d1641b0555bbcf779e6ca8c52074b40c43cd93bc2207f7cf81c40cf1f81f4b94156f4959abd6b8aea1dbcff62fd0d1ebc100460d075570b0c735e2d18a SHA512 5bc4f6d3b4f2177a85299880daef223eb2b63a5a0e5ded71370029abfb37b48b40978b9c86a1679474188b4a28e2371aa1c674424e6bda8593bb58ed58e9cfb5
+EBUILD sdoc-1.0.0.ebuild 603 BLAKE2B feae130f9a9f73d0ea4fe435c818945945bb6e91e0df98eee0e11c0b58c457ee851910d924e8e51df1b416d0086e8b14016da914565775e4f4c808e02f276db3 SHA512 dd57b35ab09df90357f260d3b48f4bae2822bee8ab103d91ca54bd325ebcb21cc5a5cb60dea3573617b3fdf49b320c967e86186448cf2b5b0459a5f946775a31
 MISC metadata.xml 430 BLAKE2B 0aef69f5cf64546a53d97f95bc931935c2e00a4dcec015467aebd1e100349c9808470b536583dd91ec53337202286c6b5837f0fe0571b0df732bab734d692a39 SHA512 abf1644b3da843261358135709a6f6895c34da54714a1d2e83fc6960e2228721e767b44c75e942af360242c9959619e7fd2323fbb96a46df2f652f6c9325d277
diff --git a/dev-ruby/sdoc/sdoc-0.4.1.ebuild b/dev-ruby/sdoc/sdoc-1.0.0.ebuild
similarity index 61%
rename from dev-ruby/sdoc/sdoc-0.4.1.ebuild
rename to dev-ruby/sdoc/sdoc-1.0.0.ebuild
index 162047e3096d..abcf559a4753 100644
--- a/dev-ruby/sdoc/sdoc-0.4.1.ebuild
+++ b/dev-ruby/sdoc/sdoc-1.0.0.ebuild
@@ -1,13 +1,12 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
+EAPI=6
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
 
 inherit ruby-fakegem
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_TASK_TEST="spec"
 
 DESCRIPTION="rdoc generator html with javascript search index"
 HOMEPAGE="https://rubygems.org/gems/sdoc"
@@ -17,11 +16,12 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
 IUSE="test"
 
-ruby_add_rdepend ">=dev-ruby/json-1.7:0
-	=dev-ruby/rdoc-4*"
+ruby_add_rdepend ">=dev-ruby/rdoc-5.0"
 
-ruby_add_bdepend "test? ( dev-ruby/minitest:0 )"
+ruby_add_bdepend "test? ( dev-ruby/minitest )"
 
 all_ruby_prepare() {
 	sed -i -e '/git ls-files/ s:^:#:' sdoc.gemspec || die
+
+	sed -i -e '/bundler/ s:^:#:' spec/spec_helper.rb || die
 }
diff --git a/dev-ruby/windows_error/Manifest b/dev-ruby/windows_error/Manifest
index bb0303e8fc1a..c0a14b56ce46 100644
--- a/dev-ruby/windows_error/Manifest
+++ b/dev-ruby/windows_error/Manifest
@@ -1,5 +1,3 @@
-DIST windows_error-0.1.1.gem 227328 BLAKE2B 10b106ca59e036b229ee36c092eb91e6e9438d6bcaecab8c905a404afdbe61b098a0d439a2bc72e4f28216a7b9a6221e52a5e37e24a9739ccccacc351bcb1fae SHA512 b0c6614a821311604e64821f5a1d31a4c7200d6cb390113d8175a797a5c239a74ebe882869cef5bade5e71709de847417f4e0728d71714998f60371109a3f37e
 DIST windows_error-0.1.2.gem 227328 BLAKE2B 99cd75d66f3e3322d62daea39a8e217dfeda89141ec3d78c61a29306b78206a40c4bd7867d59a783752da20007b43c45577ec3afe53b7037b850d4983f482e4b SHA512 32e94e561f53f77c5efff5457068e31e66b1d3c73531870b52af00297f69341e390b6d8419a0c0b78ec05f6b65be6456128b9055c143e7b65663520baeac90ad
-EBUILD windows_error-0.1.1.ebuild 424 BLAKE2B ff52088fc8afafa145df685c44b9dcbe5722b32e645c79c1561a764f60c50d92e9a5830520fb92fdd4ea840a6aa1179a29f49599ea87c1853599647dfde0b769 SHA512 61318eb0dd776e9caa28dad7a219453769f4f7bf61e7c0ff6f8b708134a31fb9ebc260d8306a31f852a43b6d672756cb19de23cf450aa264fea240592222e891
-EBUILD windows_error-0.1.2.ebuild 533 BLAKE2B fcb2cefeb15136c5c4a13cb723f6216776ba5c5a20ce551f1905923fcc8795199687c06ddb58cd5df189a06d4511b0b9e51542f01a343fe168a4281b61989a8a SHA512 d866bf17f5a678b25adedc5243bec9da8a6196449f03cc3b6a3c6baed741eb675acbb064fd2b5fee18a2a527d06eff5ae00c6169774fa6c71debcea7786d10e6
+EBUILD windows_error-0.1.2.ebuild 540 BLAKE2B 6c53244b9478abe170247d6dd3247c32c8e2c2509b400bb8de555b4ff8c85ca847d39f5d3a4d92b58f5b42a12fa041dd4de8b67c0d65d79b1d992a66caf8686f SHA512 060682f823e18eedfb3c3a86adff719bd1d032aa15b8b7392469e4786a08cd8bef37727b732ca66c7838191fe62c24cd869cb97f644a16473babbd5e41bf349c
 MISC metadata.xml 332 BLAKE2B 4e88cdce8315d0ce7314550e37efe1fc5a3ca127667dbe3cb4c1c8faa0979d155f7e65077eb2fb06eaa10faf70a76977c4dbe11f89a5de965fcd36a7906a6211 SHA512 1c82e7a96391f0c97e74580cd5101bba1181abe33bc3c19bd3c09628e04d2017093e1f4805c76b63e9460754a9729cda55227b1dfa851b06055d462b702a185e
diff --git a/dev-ruby/windows_error/windows_error-0.1.1.ebuild b/dev-ruby/windows_error/windows_error-0.1.1.ebuild
deleted file mode 100644
index 240fbfd14dc5..000000000000
--- a/dev-ruby/windows_error/windows_error-0.1.1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23"
-
-inherit ruby-fakegem versionator
-
-DESCRIPTION="reference for standard Windows API Error Codes"
-HOMEPAGE="https://github.com/rapid7/windows_error"
-SRC_URI="mirror://rubygems/${P}.gem"
-
-LICENSE="BSD"
-SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~x86"
-RESTRICT=test
-IUSE=""
diff --git a/dev-ruby/windows_error/windows_error-0.1.2.ebuild b/dev-ruby/windows_error/windows_error-0.1.2.ebuild
index 13b8f6e246ff..88a54a29d02f 100644
--- a/dev-ruby/windows_error/windows_error-0.1.2.ebuild
+++ b/dev-ruby/windows_error/windows_error-0.1.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby22 ruby23 ruby24"
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_EXTRADOC="README.md"
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 316c8449aec1..bb2f1bd661c3 100644
Binary files a/metadata/Manifest.gz and b/metadata/Manifest.gz differ
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 6be33feda32c..9e16ff47e0f4 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Thu, 12 Apr 2018 05:08:25 +0000
+Thu, 12 Apr 2018 08:38:26 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 8a32974bc319..41ccd05dbf0c 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 421225 BLAKE2B 3ea0f2afdb7fa11952c73e1802a82ddcb4bbe95b75606861aa9d94acba35691b97854b65d7d3bec40e0f5f2ef206de903696db876b0bd6db34bb27aaac0696b0 SHA512 76fd57544ae0eee9baf3d5b9e8ef3b04f05195897cba1f495609eaed7c83e275ffa678d92f50587d688bf40cbb1147872efee9d9634b6c45b00f94da4fa7cdc0
-TIMESTAMP 2018-04-12T05:08:29Z
+TIMESTAMP 2018-04-12T08:38:30Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlrO6c1fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlrPGwZfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBfNw//QCZH4CIa1IVBuy0rCnUOumIQsNh5GyznjEhZYh5kA7NzL70SP3YAXick
-URT6bEFrPyTB/dEtZVYmzm764KY/zgThQ2zCFzQKiOdDzQoTAJhEGvGT4ZgFwXI0
-tlekinlCPIg/RPoJnilbACNNiKRKQpeZRTd+DGvWo6CVkEF24QU+C6P7SdC3GyG4
-dni+ZXR6C1d0/325ftqAugvms2u7ZzA7V9rp3z3FeP+JxAgC04VYG79gkzSj8yGd
-WP7J8ScBXCd+Rc32+b3wUhVX9fAvf7Qpu3yJcEURbc1jENq5TjpEiIgkDXGThHyI
-IRkbJMcn41de6iBNKqBIntI3CqZqvbYIsI9f9hrzm6eh1m0JlHWfVPNJunBX5/Vl
-pyQCuHpR9XG8Ins+vnhAJy6MCDgggKSzH1UisynNdQnZPzfqpjs+JouiSpHax5cG
-MZBaTpNSEVs+AppBAzHL7Ih5FfWv4Q65m38Z4f9RtUQ5WHciDcroaXelCOVSi4Sy
-AC/VHUqoA6rIFTJ+ooH+PWViwd5JaoZz1F33uH0P18V84D1y1RAELQ86xIILRmY2
-HF8ema/kKHr2qjBpSb3vhQ4QlDKmxOwhtI9OprVsBPXaKv2tjfuW1n1D1ShtQfvB
-joFO3oMRJ8DZstEUFKrhR5NTZ7M9pvG2VmLj3w7gMYrac28trVM=
-=m4CK
+klD9Jg/7BqDwM2T8jguDJ8I1hABXSZJ6OptseOKn0yNsJrEd0RyJHp2mQDv66oFa
+hdC+K2gOqVPui2eKFvkwiK0yydkxNk3014BUtBorJhSMgJbF1KGPTiY8DHRDwZfi
+MBCVZE4PzXGIKaFk6zlODdvC5if5RedFN+E2386UEqrGzV8Vpu8IyrEaWiu+7Vzl
+MwIk8mY0ACsGzetldjWc2xIxJvjj1CC/yqbFEfucj3D91GCjcDjBd/oOC+FtEak7
+3M2hDHmYlPz4mbAyKWg/ZKTqyORpRiPyXFkC9tZz5K3xatSZgdIkmum6Mnr656Q0
+OSsMxHQY5ye0NxNAQKkAHBs5sOokmTZlMTCsKwvoVzorHBqdV7Le1q+FUMkkGZIx
+fz2qfQKGHkJducAruXWftDar15khrA1Frs7C4cY45heYKiLKTTOcu/d7GG8tNfdA
+y44gWNVbxzB67KcvezsxxebD/Qzi35r37BlE3EXq4mi8ONKlIZ/MwJpN0aTrobmh
+x7tAm/ju3Tq9+OM68UI76zICzO5cj0NLG3LG3nzE1RmwT2IHrUvf4x+0o4fV+EHk
+cW7mN+9FRhmDsOqekxAgltJCj6MYThahz42cGtCyZO4QzMs7vvh2mWNbP79tdRYT
+KgttluTeLwRRVs24fIL38hBblzqVeLLHV9JfoR62DRja+2OSjUA=
+=leir
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index cd56ed9d7839..9e16ff47e0f4 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Thu, 12 Apr 2018 05:08:26 +0000
+Thu, 12 Apr 2018 08:38:26 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 7a39f74397f2..88faf347981f 100644
Binary files a/metadata/md5-cache/Manifest.gz and b/metadata/md5-cache/Manifest.gz differ
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index ffcbb0af0eb7..5db914e4e9c6 100644
Binary files a/metadata/md5-cache/app-crypt/Manifest.gz and b/metadata/md5-cache/app-crypt/Manifest.gz differ
diff --git a/metadata/md5-cache/app-crypt/pinentry-1.1.0 b/metadata/md5-cache/app-crypt/pinentry-1.1.0-r1
similarity index 98%
rename from metadata/md5-cache/app-crypt/pinentry-1.1.0
rename to metadata/md5-cache/app-crypt/pinentry-1.1.0-r1
index f8f94a364907..319acd85812b 100644
--- a/metadata/md5-cache/app-crypt/pinentry-1.1.0
+++ b/metadata/md5-cache/app-crypt/pinentry-1.1.0-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=gtk? ( !static ) qt5? ( !static )
 SLOT=0
 SRC_URI=mirror://gnupg/pinentry/pinentry-1.1.0.tar.bz2
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=91509c9a28a5816e7bca699e58a7ac75
+_md5_=33478b8aa0a87b5580f4bdc7bb8a954e
diff --git a/metadata/md5-cache/app-editors/Manifest.gz b/metadata/md5-cache/app-editors/Manifest.gz
index f13b5b4087f3..837852e38052 100644
Binary files a/metadata/md5-cache/app-editors/Manifest.gz and b/metadata/md5-cache/app-editors/Manifest.gz differ
diff --git a/metadata/md5-cache/app-editors/gvim-8.0.1699 b/metadata/md5-cache/app-editors/gvim-8.0.1699
new file mode 100644
index 000000000000..518438dd8985
--- /dev/null
+++ b/metadata/md5-cache/app-editors/gvim-8.0.1699
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=~app-editors/vim-core-8.0.1699 >=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt acl? ( kernel_linux? ( sys-apps/acl ) ) !aqua? ( gtk3? ( x11-libs/gtk+:3 x11-libs/libXft ) !gtk3? ( gtk? ( >=x11-libs/gtk+-2.6:2 x11-libs/libXft gnome? ( >=gnome-base/libgnomeui-2.6 ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( neXt? ( x11-libs/neXtaw ) !neXt? ( x11-libs/libXaw ) ) ) ) ) cscope? ( dev-util/cscope ) lua? ( luajit? ( dev-lang/luajit:2= ) !luajit? ( dev-lang/lua:0[deprecated] ) ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.3 dev-lang/ruby:2.2 dev-lang/ruby:2.4 dev-lang/ruby:2.5 ) virtual/rubygems ) selinux? ( sys-libs/libselinux ) session? ( x11-libs/libSM ) tcl? ( dev-lang/tcl:0= ) dev-util/ctags sys-devel/autoconf virtual/pkgconfig nls? ( sys-devel/gettext ) >=sys-apps/sed-4
+DESCRIPTION=GUI version of the Vim text editor
+EAPI=6
+HOMEPAGE=https://vim.sourceforge.io/ https://github.com/vim/vim
+IUSE=acl aqua cscope debug gnome gtk gtk3 lua luajit motif neXt netbeans nls perl python racket ruby selinux session tcl python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+LICENSE=vim
+RDEPEND=~app-editors/vim-core-8.0.1699 >=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt acl? ( kernel_linux? ( sys-apps/acl ) ) !aqua? ( gtk3? ( x11-libs/gtk+:3 x11-libs/libXft ) !gtk3? ( gtk? ( >=x11-libs/gtk+-2.6:2 x11-libs/libXft gnome? ( >=gnome-base/libgnomeui-2.6 ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( neXt? ( x11-libs/neXtaw ) !neXt? ( x11-libs/libXaw ) ) ) ) ) cscope? ( dev-util/cscope ) lua? ( luajit? ( dev-lang/luajit:2= ) !luajit? ( dev-lang/lua:0[deprecated] ) ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.3 dev-lang/ruby:2.2 dev-lang/ruby:2.4 dev-lang/ruby:2.5 ) virtual/rubygems ) selinux? ( sys-libs/libselinux ) session? ( x11-libs/libSM ) tcl? ( dev-lang/tcl:0= )
+REQUIRED_USE=luajit? ( lua ) python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
+SLOT=0
+SRC_URI=https://github.com/vim/vim/archive/v8.0.1699.tar.gz -> vim-8.0.1699.tar.gz https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2
+_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ruby-single	7435c1687c234eb8cf5b212756f6381e	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=157e217532e4d3c7d0538261ffecf766
diff --git a/metadata/md5-cache/app-editors/gvim-9999 b/metadata/md5-cache/app-editors/gvim-9999
index a47c51085d65..0912202f6684 100644
--- a/metadata/md5-cache/app-editors/gvim-9999
+++ b/metadata/md5-cache/app-editors/gvim-9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=~app-editors/vim-core-9999 >=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt acl? ( kernel_linux? ( sys-apps/acl ) ) !aqua? ( gtk3? ( x11-libs/gtk+:3 x11-libs/libXft ) !gtk3? ( gtk? ( >=x11-libs/gtk+-2.6:2 x11-libs/libXft gnome? ( >=gnome-base/libgnomeui-2.6 ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( neXt? ( x11-libs/neXtaw ) !neXt? ( x11-libs/libXaw ) ) ) ) ) cscope? ( dev-util/cscope ) lua? ( luajit? ( dev-lang/luajit:2= ) !luajit? ( dev-lang/lua:0[deprecated] ) ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.5 dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.2 ) ) selinux? ( sys-libs/libselinux ) session? ( x11-libs/libSM ) tcl? ( dev-lang/tcl:0= ) dev-util/ctags sys-devel/autoconf virtual/pkgconfig nls? ( sys-devel/gettext ) >=sys-apps/sed-4 >=dev-vcs/git-1.8.2.1
+DEPEND=~app-editors/vim-core-9999 >=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt acl? ( kernel_linux? ( sys-apps/acl ) ) !aqua? ( gtk3? ( x11-libs/gtk+:3 x11-libs/libXft ) !gtk3? ( gtk? ( >=x11-libs/gtk+-2.6:2 x11-libs/libXft gnome? ( >=gnome-base/libgnomeui-2.6 ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( neXt? ( x11-libs/neXtaw ) !neXt? ( x11-libs/libXaw ) ) ) ) ) cscope? ( dev-util/cscope ) lua? ( luajit? ( dev-lang/luajit:2= ) !luajit? ( dev-lang/lua:0[deprecated] ) ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.3 dev-lang/ruby:2.2 dev-lang/ruby:2.4 dev-lang/ruby:2.5 ) virtual/rubygems ) selinux? ( sys-libs/libselinux ) session? ( x11-libs/libSM ) tcl? ( dev-lang/tcl:0= ) dev-util/ctags sys-devel/autoconf virtual/pkgconfig nls? ( sys-devel/gettext ) >=sys-apps/sed-4 >=dev-vcs/git-1.8.2.1
 DESCRIPTION=GUI version of the Vim text editor
 EAPI=6
 HOMEPAGE=https://vim.sourceforge.io/ https://github.com/vim/vim
 IUSE=acl aqua cscope debug gnome gtk gtk3 lua luajit motif neXt netbeans nls perl python racket ruby selinux session tcl python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
 LICENSE=vim
-RDEPEND=~app-editors/vim-core-9999 >=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt acl? ( kernel_linux? ( sys-apps/acl ) ) !aqua? ( gtk3? ( x11-libs/gtk+:3 x11-libs/libXft ) !gtk3? ( gtk? ( >=x11-libs/gtk+-2.6:2 x11-libs/libXft gnome? ( >=gnome-base/libgnomeui-2.6 ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( neXt? ( x11-libs/neXtaw ) !neXt? ( x11-libs/libXaw ) ) ) ) ) cscope? ( dev-util/cscope ) lua? ( luajit? ( dev-lang/luajit:2= ) !luajit? ( dev-lang/lua:0[deprecated] ) ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.5 dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.2 ) ) selinux? ( sys-libs/libselinux ) session? ( x11-libs/libSM ) tcl? ( dev-lang/tcl:0= )
+RDEPEND=~app-editors/vim-core-9999 >=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt acl? ( kernel_linux? ( sys-apps/acl ) ) !aqua? ( gtk3? ( x11-libs/gtk+:3 x11-libs/libXft ) !gtk3? ( gtk? ( >=x11-libs/gtk+-2.6:2 x11-libs/libXft gnome? ( >=gnome-base/libgnomeui-2.6 ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( neXt? ( x11-libs/neXtaw ) !neXt? ( x11-libs/libXaw ) ) ) ) ) cscope? ( dev-util/cscope ) lua? ( luajit? ( dev-lang/luajit:2= ) !luajit? ( dev-lang/lua:0[deprecated] ) ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.3 dev-lang/ruby:2.2 dev-lang/ruby:2.4 dev-lang/ruby:2.5 ) virtual/rubygems ) selinux? ( sys-libs/libselinux ) session? ( x11-libs/libSM ) tcl? ( dev-lang/tcl:0= )
 REQUIRED_USE=luajit? ( lua ) python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
 SLOT=0
-_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	25b08efef07cea6bcd45b8c6dcce2782	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=45181b5f5308c23ab05d7fe238082ab8
+_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	25b08efef07cea6bcd45b8c6dcce2782	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ruby-single	7435c1687c234eb8cf5b212756f6381e	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=157e217532e4d3c7d0538261ffecf766
diff --git a/metadata/md5-cache/app-editors/vim-8.0.1699 b/metadata/md5-cache/app-editors/vim-8.0.1699
new file mode 100644
index 000000000000..0073a30ef95c
--- /dev/null
+++ b/metadata/md5-cache/app-editors/vim-8.0.1699
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) lua? ( luajit? ( dev-lang/luajit:2= ) !luajit? ( dev-lang/lua:0[deprecated] ) ) !minimal? ( ~app-editors/vim-core-8.0.1699 dev-util/ctags ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.3 dev-lang/ruby:2.2 dev-lang/ruby:2.4 dev-lang/ruby:2.5 ) virtual/rubygems ) selinux? ( sys-libs/libselinux ) tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt ) sys-devel/autoconf nls? ( sys-devel/gettext )
+DESCRIPTION=Vim, an improved vi-style text editor
+EAPI=6
+HOMEPAGE=https://vim.sourceforge.io/ https://github.com/vim/vim
+IUSE=X acl cscope debug gpm lua luajit minimal nls perl python racket ruby selinux tcl terminal vim-pager python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
+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=vim
+RDEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) lua? ( luajit? ( dev-lang/luajit:2= ) !luajit? ( dev-lang/lua:0[deprecated] ) ) !minimal? ( ~app-editors/vim-core-8.0.1699 dev-util/ctags ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.3 dev-lang/ruby:2.2 dev-lang/ruby:2.4 dev-lang/ruby:2.5 ) virtual/rubygems ) selinux? ( sys-libs/libselinux ) tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt )
+REQUIRED_USE=luajit? ( lua ) python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
+SLOT=0
+SRC_URI=https://github.com/vim/vim/archive/v8.0.1699.tar.gz -> vim-8.0.1699.tar.gz https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2
+_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ruby-single	7435c1687c234eb8cf5b212756f6381e	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	vim-doc	af2c81a1feeb0a99e91bee3e20769edb
+_md5_=afed47f5984834953221e33d99627e58
diff --git a/metadata/md5-cache/app-editors/vim-9999 b/metadata/md5-cache/app-editors/vim-9999
index 6bdb70f0bed9..d5f5e158a8e9 100644
--- a/metadata/md5-cache/app-editors/vim-9999
+++ b/metadata/md5-cache/app-editors/vim-9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) lua? ( luajit? ( dev-lang/luajit:2= ) !luajit? ( dev-lang/lua:0[deprecated] ) ) !minimal? ( ~app-editors/vim-core-9999 dev-util/ctags ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.5 dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.2 ) ) selinux? ( sys-libs/libselinux ) tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt ) sys-devel/autoconf nls? ( sys-devel/gettext ) >=dev-vcs/git-1.8.2.1
+DEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) lua? ( luajit? ( dev-lang/luajit:2= ) !luajit? ( dev-lang/lua:0[deprecated] ) ) !minimal? ( ~app-editors/vim-core-9999 dev-util/ctags ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.3 dev-lang/ruby:2.2 dev-lang/ruby:2.4 dev-lang/ruby:2.5 ) virtual/rubygems ) selinux? ( sys-libs/libselinux ) tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt ) sys-devel/autoconf nls? ( sys-devel/gettext ) >=dev-vcs/git-1.8.2.1
 DESCRIPTION=Vim, an improved vi-style text editor
 EAPI=6
 HOMEPAGE=https://vim.sourceforge.io/ https://github.com/vim/vim
 IUSE=X acl cscope debug gpm lua luajit minimal nls perl python racket ruby selinux tcl terminal vim-pager python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
 LICENSE=vim
-RDEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) lua? ( luajit? ( dev-lang/luajit:2= ) !luajit? ( dev-lang/lua:0[deprecated] ) ) !minimal? ( ~app-editors/vim-core-9999 dev-util/ctags ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.5 dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.2 ) ) selinux? ( sys-libs/libselinux ) tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt )
+RDEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) lua? ( luajit? ( dev-lang/luajit:2= ) !luajit? ( dev-lang/lua:0[deprecated] ) ) !minimal? ( ~app-editors/vim-core-9999 dev-util/ctags ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.3 dev-lang/ruby:2.2 dev-lang/ruby:2.4 dev-lang/ruby:2.5 ) virtual/rubygems ) selinux? ( sys-libs/libselinux ) tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt )
 REQUIRED_USE=luajit? ( lua ) python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
 SLOT=0
-_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	25b08efef07cea6bcd45b8c6dcce2782	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	vim-doc	af2c81a1feeb0a99e91bee3e20769edb
-_md5_=4e7218ef57ce47be2f5f74980b9c2c11
+_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	25b08efef07cea6bcd45b8c6dcce2782	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ruby-single	7435c1687c234eb8cf5b212756f6381e	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	vim-doc	af2c81a1feeb0a99e91bee3e20769edb
+_md5_=afed47f5984834953221e33d99627e58
diff --git a/metadata/md5-cache/app-editors/vim-core-8.0.0386 b/metadata/md5-cache/app-editors/vim-core-8.0.0386
deleted file mode 100644
index 51eb0ec3f6b2..000000000000
--- a/metadata/md5-cache/app-editors/vim-core-8.0.0386
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=sys-devel/autoconf
-DESCRIPTION=vim and gvim shared files
-EAPI=6
-HOMEPAGE=http://www.vim.org/ https://github.com/vim/vim
-IUSE=nls acl minimal
-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=vim
-PDEPEND=!minimal? ( app-vim/gentoo-syntax )
-SLOT=0
-SRC_URI=https://github.com/vim/vim/archive/v8.0.0386.tar.gz -> vim-8.0.0386.tar.gz https://dev.gentoo.org/~radhermit/vim/vim-8.0.0106-gentoo-patches.tar.bz2
-_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	vim-doc	af2c81a1feeb0a99e91bee3e20769edb
-_md5_=5482d0b41f5c12656c160e59da9219e3
diff --git a/metadata/md5-cache/app-editors/vim-core-8.0.1188 b/metadata/md5-cache/app-editors/vim-core-8.0.1699
similarity index 90%
rename from metadata/md5-cache/app-editors/vim-core-8.0.1188
rename to metadata/md5-cache/app-editors/vim-core-8.0.1699
index 77f4fd621ef1..7cb7d0963af9 100644
--- a/metadata/md5-cache/app-editors/vim-core-8.0.1188
+++ b/metadata/md5-cache/app-editors/vim-core-8.0.1699
@@ -8,6 +8,6 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh
 LICENSE=vim
 PDEPEND=!minimal? ( app-vim/gentoo-syntax )
 SLOT=0
-SRC_URI=https://github.com/vim/vim/archive/v8.0.1188.tar.gz -> vim-8.0.1188.tar.gz https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2
+SRC_URI=https://github.com/vim/vim/archive/v8.0.1699.tar.gz -> vim-8.0.1699.tar.gz https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	vim-doc	af2c81a1feeb0a99e91bee3e20769edb
 _md5_=270757509200029d6bc809620769bf83
diff --git a/metadata/md5-cache/dev-perl/Manifest.gz b/metadata/md5-cache/dev-perl/Manifest.gz
index af612f95d293..f64311c78bfc 100644
Binary files a/metadata/md5-cache/dev-perl/Manifest.gz and b/metadata/md5-cache/dev-perl/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-perl/Number-Bytes-Human-0.110.0 b/metadata/md5-cache/dev-perl/Number-Bytes-Human-0.110.0
new file mode 100644
index 000000000000..4d4979ce0daa
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Number-Bytes-Human-0.110.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=virtual/perl-Carp virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-Test-Simple ) dev-lang/perl:=
+DESCRIPTION=Convert byte count to human readable format
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/Number-Bytes-Human/
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-Carp dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/F/FE/FERREIRA/Number-Bytes-Human-0.11.tar.gz
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=f59cdc3d13537daa0007051bb29b4f94
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index b70ee4d53cef..74e522f5c76f 100644
Binary files a/metadata/md5-cache/dev-ruby/Manifest.gz and b/metadata/md5-cache/dev-ruby/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-ruby/dalli-2.7.8 b/metadata/md5-cache/dev-ruby/dalli-2.7.8
new file mode 100644
index 000000000000..e2c920ecc7c8
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/dalli-2.7.8
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( >=net-misc/memcached-1.4.0 ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby22] >=dev-ruby/mocha-0.13[ruby_targets_ruby22] dev-ruby/rack[ruby_targets_ruby22] >=dev-ruby/activesupport-4.2[ruby_targets_ruby22] <dev-ruby/activesupport-5.2[ruby_targets_ruby22] dev-ruby/connection_pool[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby23] >=dev-ruby/mocha-0.13[ruby_targets_ruby23] dev-ruby/rack[ruby_targets_ruby23] >=dev-ruby/activesupport-4.2[ruby_targets_ruby23] <dev-ruby/activesupport-5.2[ruby_targets_ruby23] dev-ruby/connection_pool[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby24] >=dev-ruby/mocha-0.13[ruby_targets_ruby24] dev-ruby/rack[ruby_targets_ruby24] >=dev-ruby/activesupport-4.2[ruby_targets_ruby24] <dev-ruby/activesupport-5.2[ruby_targets_ruby24] dev-ruby/connection_pool[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DESCRIPTION=A high performance pure Ruby client for accessing memcached servers
+EAPI=6
+HOMEPAGE=https://github.com/petergoldstein/dalli
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+SLOT=0
+SRC_URI=https://github.com/petergoldstein/dalli/archive/v2.7.8.tar.gz -> dalli-2.7.8.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=ab67543594f2e051ce490c1e1e3c4794
diff --git a/metadata/md5-cache/dev-ruby/loofah-2.0.3 b/metadata/md5-cache/dev-ruby/loofah-2.0.3
deleted file mode 100644
index d6ab30aadca9..000000000000
--- a/metadata/md5-cache/dev-ruby/loofah-2.0.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/nokogiri-1.5.9[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/nokogiri-1.5.9[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/nokogiri-1.5.9[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/rr-1.1.0[ruby_targets_ruby22] >=dev-ruby/hoe-2.3.0[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/rr-1.1.0[ruby_targets_ruby23] >=dev-ruby/hoe-2.3.0[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/rr-1.1.0[ruby_targets_ruby24] >=dev-ruby/hoe-2.3.0[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
-DESCRIPTION=Library for manipulating and transforming HTML/XML documents and fragments.
-EAPI=5
-HOMEPAGE=https://github.com/flavorjones/loofah
-IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/nokogiri-1.5.9[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/nokogiri-1.5.9[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/nokogiri-1.5.9[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
-SLOT=0
-SRC_URI=mirror://rubygems/loofah-2.0.3.gem
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=4a6ef432594364b42567ba43f5e18ddb
diff --git a/metadata/md5-cache/dev-ruby/loofah-2.1.1 b/metadata/md5-cache/dev-ruby/loofah-2.1.1
deleted file mode 100644
index ef5771d20a93..000000000000
--- a/metadata/md5-cache/dev-ruby/loofah-2.1.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( =dev-ruby/crass-1.0*[ruby_targets_ruby22] >=dev-ruby/crass-1.0.2[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.5.9[ruby_targets_ruby22] ) ruby_targets_ruby23? ( =dev-ruby/crass-1.0*[ruby_targets_ruby23] >=dev-ruby/crass-1.0.2[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.5.9[ruby_targets_ruby23] ) ruby_targets_ruby24? ( =dev-ruby/crass-1.0*[ruby_targets_ruby24] >=dev-ruby/crass-1.0.2[ruby_targets_ruby24] >=dev-ruby/nokogiri-1.5.9[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/rr-1.1.0[ruby_targets_ruby22] >=dev-ruby/hoe-2.3.0[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/rr-1.1.0[ruby_targets_ruby23] >=dev-ruby/hoe-2.3.0[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/rr-1.1.0[ruby_targets_ruby24] >=dev-ruby/hoe-2.3.0[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
-DESCRIPTION=Library for manipulating and transforming HTML/XML documents and fragments.
-EAPI=6
-HOMEPAGE=https://github.com/flavorjones/loofah
-IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=amd64 ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( =dev-ruby/crass-1.0*[ruby_targets_ruby22] >=dev-ruby/crass-1.0.2[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.5.9[ruby_targets_ruby22] ) ruby_targets_ruby23? ( =dev-ruby/crass-1.0*[ruby_targets_ruby23] >=dev-ruby/crass-1.0.2[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.5.9[ruby_targets_ruby23] ) ruby_targets_ruby24? ( =dev-ruby/crass-1.0*[ruby_targets_ruby24] >=dev-ruby/crass-1.0.2[ruby_targets_ruby24] >=dev-ruby/nokogiri-1.5.9[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
-SLOT=0
-SRC_URI=mirror://rubygems/loofah-2.1.1.gem
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=d56f0de95f22f64935afd1ce911892a9
diff --git a/metadata/md5-cache/dev-ruby/sdoc-0.4.1 b/metadata/md5-cache/dev-ruby/sdoc-0.4.1
deleted file mode 100644
index 2ff77fc8b356..000000000000
--- a/metadata/md5-cache/dev-ruby/sdoc-0.4.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/json-1.7:0[ruby_targets_ruby22] =dev-ruby/rdoc-4*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/json-1.7:0[ruby_targets_ruby23] =dev-ruby/rdoc-4*[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest:0[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest:0[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
-DESCRIPTION=rdoc generator html with javascript search index
-EAPI=5
-HOMEPAGE=https://rubygems.org/gems/sdoc
-IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/json-1.7:0[ruby_targets_ruby22] =dev-ruby/rdoc-4*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/json-1.7:0[ruby_targets_ruby23] =dev-ruby/rdoc-4*[ruby_targets_ruby23] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
-SLOT=0
-SRC_URI=mirror://rubygems/sdoc-0.4.1.gem
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=2ec794fd2c697ad7561e453493125d7d
diff --git a/metadata/md5-cache/dev-ruby/sdoc-1.0.0 b/metadata/md5-cache/dev-ruby/sdoc-1.0.0
new file mode 100644
index 000000000000..38fb7139c27d
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/sdoc-1.0.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/rdoc-5.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rdoc-5.0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/rdoc-5.0[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/rdoc-5.0[ruby_targets_ruby25] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/minitest[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/minitest[ruby_targets_ruby25] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DESCRIPTION=rdoc generator html with javascript search index
+EAPI=6
+HOMEPAGE=https://rubygems.org/gems/sdoc
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/rdoc-5.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rdoc-5.0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/rdoc-5.0[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/rdoc-5.0[ruby_targets_ruby25] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+SLOT=0
+SRC_URI=mirror://rubygems/sdoc-1.0.0.gem
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=2371a94434e69283eb7ca0106d6f84f9
diff --git a/metadata/md5-cache/dev-ruby/windows_error-0.1.1 b/metadata/md5-cache/dev-ruby/windows_error-0.1.1
deleted file mode 100644
index 0fd007c19938..000000000000
--- a/metadata/md5-cache/dev-ruby/windows_error-0.1.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
-DESCRIPTION=reference for standard Windows API Error Codes
-EAPI=6
-HOMEPAGE=https://github.com/rapid7/windows_error
-IUSE=elibc_FreeBSD ruby_targets_ruby23 doc test test
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=BSD
-RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 )
-RESTRICT=test
-SLOT=0.1
-SRC_URI=mirror://rubygems/windows_error-0.1.1.gem
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=c17ef3dbdd3ed316ffec279842f26a13
diff --git a/metadata/md5-cache/dev-ruby/windows_error-0.1.2 b/metadata/md5-cache/dev-ruby/windows_error-0.1.2
index 7dc6284e9817..9a13cee3c666 100644
--- a/metadata/md5-cache/dev-ruby/windows_error-0.1.2
+++ b/metadata/md5-cache/dev-ruby/windows_error-0.1.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
 DESCRIPTION=reference for standard Windows API Error Codes
 EAPI=6
 HOMEPAGE=https://github.com/rapid7/windows_error
-IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=BSD
-RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=0.1
 SRC_URI=mirror://rubygems/windows_error-0.1.2.gem
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=d851281ed389d8d3930394ca5e701a34
+_md5_=f4078e034c14b5170a10e2ebc6968a50
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index c28371acae51..4ee913f6943b 100644
Binary files a/metadata/md5-cache/sys-apps/Manifest.gz and b/metadata/md5-cache/sys-apps/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-apps/restorecond-2.7 b/metadata/md5-cache/sys-apps/restorecond-2.7
index 9b22b7c01dd2..3bcdf82316a1 100644
--- a/metadata/md5-cache/sys-apps/restorecond-2.7
+++ b/metadata/md5-cache/sys-apps/restorecond-2.7
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile install prepare
-DEPEND=>=sys-libs/libsepol-2.7:= >=sys-libs/libselinux-2.7:= dev-libs/libpcre:= >=sys-libs/libcap-1.10-r10:=
+DEPEND=>=sys-libs/libsepol-2.7:= >=sys-libs/libselinux-2.7:= dev-libs/dbus-glib dev-libs/libpcre:= >=sys-libs/libcap-1.10-r10:=
 DESCRIPTION=Daemon to watch for creation and set default SELinux fcontexts
 EAPI=6
 HOMEPAGE=https://github.com/SELinuxProject/selinux/wiki
 KEYWORDS=amd64 ~arm ~arm64 ~mips x86
 LICENSE=GPL-2
-RDEPEND=>=sys-libs/libsepol-2.7:= >=sys-libs/libselinux-2.7:= dev-libs/libpcre:= >=sys-libs/libcap-1.10-r10:= !<sys-apps/policycoreutils-2.7_pre
+RDEPEND=>=sys-libs/libsepol-2.7:= >=sys-libs/libselinux-2.7:= dev-libs/dbus-glib dev-libs/libpcre:= >=sys-libs/libcap-1.10-r10:= !<sys-apps/policycoreutils-2.7_pre
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20170804/restorecond-2.7.tar.gz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=e8a9cdfd556f0ecd56d17a2d833dcf12
+_md5_=1b86e8d107022025d4d3c3b489ad93e9
diff --git a/metadata/md5-cache/sys-apps/restorecond-9999 b/metadata/md5-cache/sys-apps/restorecond-9999
index 5deb4de5651e..9cc5052e896d 100644
--- a/metadata/md5-cache/sys-apps/restorecond-9999
+++ b/metadata/md5-cache/sys-apps/restorecond-9999
@@ -1,10 +1,10 @@
 DEFINED_PHASES=compile install prepare unpack
-DEPEND=>=sys-libs/libsepol-9999:= >=sys-libs/libselinux-9999:= dev-libs/libpcre:= >=sys-libs/libcap-1.10-r10:= >=dev-vcs/git-1.8.2.1
+DEPEND=>=sys-libs/libsepol-9999:= >=sys-libs/libselinux-9999:= dev-libs/dbus-glib dev-libs/libpcre:= >=sys-libs/libcap-1.10-r10:= >=dev-vcs/git-1.8.2.1
 DESCRIPTION=Daemon to watch for creation and set default SELinux fcontexts
 EAPI=6
 HOMEPAGE=https://github.com/SELinuxProject/selinux/wiki
 LICENSE=GPL-2
-RDEPEND=>=sys-libs/libsepol-9999:= >=sys-libs/libselinux-9999:= dev-libs/libpcre:= >=sys-libs/libcap-1.10-r10:= !<sys-apps/policycoreutils-2.7_pre
+RDEPEND=>=sys-libs/libsepol-9999:= >=sys-libs/libselinux-9999:= dev-libs/dbus-glib dev-libs/libpcre:= >=sys-libs/libcap-1.10-r10:= !<sys-apps/policycoreutils-2.7_pre
 SLOT=0
 _eclasses_=git-r3	25b08efef07cea6bcd45b8c6dcce2782	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=9f6af2db94950f240b8a1317872e75ea
+_md5_=b1318156c76c0b6bd199dce4a634a36a
diff --git a/metadata/md5-cache/x11-drivers/Manifest.gz b/metadata/md5-cache/x11-drivers/Manifest.gz
index 4c9570d841be..a1bb7e13b335 100644
Binary files a/metadata/md5-cache/x11-drivers/Manifest.gz and b/metadata/md5-cache/x11-drivers/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-396.18 b/metadata/md5-cache/x11-drivers/nvidia-drivers-396.18-r1
similarity index 99%
rename from metadata/md5-cache/x11-drivers/nvidia-drivers-396.18
rename to metadata/md5-cache/x11-drivers/nvidia-drivers-396.18-r1
index 1a802c8ef9c0..037c8ccf35b9 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-396.18
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-396.18-r1
@@ -12,4 +12,4 @@ RESTRICT=bindist mirror
 SLOT=0/396
 SRC_URI=amd64-fbsd? ( http://us.download.nvidia.com/XFree86/FreeBSD-x86_64/396.18/NVIDIA-FreeBSD-x86_64-396.18.tar.gz ) amd64? ( http://us.download.nvidia.com/XFree86/Linux-x86_64/396.18/NVIDIA-Linux-x86_64-396.18.run ) tools? ( https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-396.18.tar.bz2 )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	linux-info	ca370deef9d44125d829f2eb6ebc83e0	linux-mod	731711290c6e38e1cf7ddcdca7d445e1	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	nvidia-driver	039386e140d0965363b97a869d96f5c6	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	udev	d91cac2c73b94629cad2daea66e0d182	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=fdb5edae4ebfde24d5ac8652cb81ce19
+_md5_=6bed38be673c8f7139042fb50678b4c5
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index d7562376e4d4..b04b5a003786 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 19582 BLAKE2B 9fc9cbe8fb3f91d1121694d9f65c77dccaa3a5e942d3fa2a476b09eb5b656361f8847037b308aac86b7cae934fd70e0ddbfc94f0ee35cfa6b27451814b6b7b33 SHA512 f9fc52a2e65e760677796caf947ff4692963718a9e344281000add570f0a8304f93abf5af66aac9201160caa4f01a92aedbd46f4fe2c171b0ba908e6dc390956
-TIMESTAMP 2018-04-12T05:08:29Z
+TIMESTAMP 2018-04-12T08:38:30Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlrO6c1fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlrPGwZfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBrwBAAnEkiporqMc65s6mpQEOSmG9wdWqfT9y78z5PJs4xec785orUDEd2C8fM
-qzydFqX84s/nqLwg0uE9KEr8vxtGy9YYY7aeyGHmUmfU9pqB8IaRGx7uhdBfqP8o
-Qz9eXYEY+NrEDLLdYieisswzP9U0aDPyFa9t4AUX5CWSzHCDfGfo/yoWgoB5o4Gd
-pHC+QAAz2wvUyq0dajffpJUE+tEU7Ql1D2TIcklWpm6sFSboqcJmRhps0kZxVG0x
-UeOmYe+lonNK5ytCQeFsnQhL7OOJGP2WlouA2W0/H9kqO9Xco9P2YnrDwudRGkY2
-wJbVIxbg8OYpvY4ZqPS1uHnSiNH8CplqOWGPqBThT6kjKQQDKKFjZ/WsCYUtPD4J
-ZmAjKnOHFXTGe6t1Flb9hVTt2TTDXR2l+w7P2wHAiHIAYYpGylI7hKn3XMMfqsTs
-OI1CpqAp3YMMuobsguT3hG285U5xCs7mvG2LNOcG7ot3hNkqB33b1XTUdduWfZVO
-ImbAYhJ/gmWAwE9h5KmiHrK6yMXQxjsuRY6ze9yxcPB9/hGGIKps3WaBGNRDU1tK
-YF4ZJcIVAU8ZMR8iGKiprCIxHrNsJ9D6VsnNaTloM1x+89BojWafIvy7QrctRl1m
-fYt2mcKV1tDJmJE/kxqDXTK/kfAv/WdLFDCagkpPEOF8NHhm0IE=
-=9iuj
+klAnfxAArXdV7Aj9ESmD69PBxGOJxubFEcMEWkYCUw9ELYG+zQ34NfrfaWCocDgl
+TqytUEsACMtKdDVxmveU2rAsDPBcStm88rhRJ5fc/Wbt+ZTX852UdvJx9P+y8bv+
+OwnUAsoPJQsohErllSkmXSm8Na0Ujece8MTXxh8qtrM1+rPHGo1P/BaTibWCRrAr
+lYN/XBmVAVZM2zblr9GSOKbqmP0qOeyXzYjQybuyhKROJSSUWCcQJMF5+ifu6v71
+Xtqow8TxVFSVDZjK5hveYRy4oLmfPvZB6ggJ502cO5X9izrclQTadSHAC8Fc9/Cq
+xdL7YsTIq91P0uQJVcbuQEAVOoSVyubJadCXRq7OwuiZY4Ze8VGUrCyyvJG+Hs64
+WgUn+rRxpORiI2mKfOkJXwyd8kxz0w4bB7fxMhCTqNT1MVbGAdHRFfSG/v79JyXq
+G2LkBzZzFXDzPPmNeOG+eIJPm6iQninrF+Ys0RKPe3D7AosmZpCG3bSVkQcjpSdq
+2rv+jESUIXtNFrrcglvwZRpKywuvAbvIIflo//g81z7GdG1jXP2n1m9+Rc5d2MSk
+AQCggsIPhUFXVoR9omvKY84ffphzznJmmWcWr3jqcFV8Ry8Go43P5515oW4cKaEW
+32HELVdYvVcCgr+RciuQrLchFSB8qvxQjqTwluw0ewRYo8B1l4I=
+=4AH2
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index cd56ed9d7839..9e16ff47e0f4 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Thu, 12 Apr 2018 05:08:26 +0000
+Thu, 12 Apr 2018 08:38:26 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 390839c0f330..64a10de8813b 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Thu Apr 12 05:08:25 UTC 2018
+Thu Apr 12 08:38:26 UTC 2018
diff --git a/metadata/timestamp.calculate b/metadata/timestamp.calculate
index 808c636277da..60774790c2e7 100644
--- a/metadata/timestamp.calculate
+++ b/metadata/timestamp.calculate
@@ -2038,8 +2038,7 @@
 1804110908 ./dev-ruby/font-awesome-rails/font-awesome-rails-4.7.0.4.ebuild
 1801100939 ./dev-ruby/font-awesome-rails/font-awesome-rails-4.7.0.3.ebuild
 1702282250 ./dev-ruby/debugger-linecache/debugger-linecache-1.2.0.ebuild
-1705160807 ./dev-ruby/windows_error/windows_error-0.1.2.ebuild
-1705090608 ./dev-ruby/windows_error/windows_error-0.1.1.ebuild
+1804120908 ./dev-ruby/windows_error/windows_error-0.1.2.ebuild
 1803222338 ./dev-ruby/http-form_data/http-form_data-2.1.0.ebuild
 1803222338 ./dev-ruby/http-form_data/http-form_data-2.0.0.ebuild
 1803222338 ./dev-ruby/http-form_data/http-form_data-1.0.3.ebuild
@@ -2381,8 +2380,8 @@
 1803251608 ./dev-ruby/activemodel/activemodel-5.1.5.ebuild
 1707170920 ./dev-ruby/dep_selector/dep_selector-1.0.5.ebuild
 1708160912 ./dev-ruby/bogus/bogus-0.1.6.ebuild
+1804120908 ./dev-ruby/sdoc/sdoc-1.0.0.ebuild
 1702282250 ./dev-ruby/sdoc/sdoc-0.4.2.ebuild
-1702282250 ./dev-ruby/sdoc/sdoc-0.4.1.ebuild
 1708020742 ./dev-ruby/bindata/bindata-2.4.0.ebuild
 1708300800 ./dev-ruby/bindata/bindata-2.4.1.ebuild
 1802270938 ./dev-ruby/dust/dust-0.1.7-r2.ebuild
@@ -2643,6 +2642,7 @@
 1801200938 ./dev-ruby/jira-ruby/jira-ruby-1.5.0.ebuild
 1708261125 ./dev-ruby/jira-ruby/jira-ruby-1.4.3.ebuild
 1801131139 ./dev-ruby/dalli/dalli-2.7.6.ebuild
+1804120838 ./dev-ruby/dalli/dalli-2.7.8.ebuild
 1804100838 ./dev-ruby/dalli/dalli-2.7.7.ebuild
 1708180911 ./dev-ruby/coercible/coercible-1.0.0.ebuild
 1803082238 ./dev-ruby/memoist/memoist-0.15.0.ebuild
@@ -2764,9 +2764,7 @@
 1803222338 ./dev-ruby/patron/patron-0.10.0.ebuild
 1803222338 ./dev-ruby/patron/patron-0.12.0.ebuild
 1703140803 ./dev-ruby/gh/gh-0.15.1.ebuild
-1803222338 ./dev-ruby/loofah/loofah-2.1.1.ebuild
 1803230908 ./dev-ruby/loofah/loofah-2.2.1.ebuild
-1803222338 ./dev-ruby/loofah/loofah-2.0.3.ebuild
 1804112208 ./dev-ruby/loofah/loofah-2.2.2.ebuild
 1802041408 ./dev-ruby/levenshtein/levenshtein-0.2.2-r2.ebuild
 1803252108 ./dev-ruby/sprockets-rails/sprockets-rails-3.2.1.ebuild
@@ -4406,9 +4404,9 @@
 1702282250 ./app-crypt/asekey/asekey-3.7.ebuild
 1703161245 ./app-crypt/quickcrypt/quickcrypt-0.9.2b-r1.ebuild
 1801192010 ./app-crypt/stoken/stoken-0.92.ebuild
+1804121138 ./app-crypt/pinentry/pinentry-1.1.0-r1.ebuild
 1803212238 ./app-crypt/pinentry/pinentry-1.0.0-r3.ebuild
 1803030308 ./app-crypt/pinentry/pinentry-1.0.0-r2.ebuild
-1804102008 ./app-crypt/pinentry/pinentry-1.1.0.ebuild
 1702282250 ./app-crypt/sbsigntool/sbsigntool-0.8.ebuild
 1702282250 ./app-crypt/sbsigntool/sbsigntool-0.6-r1.ebuild
 1802102238 ./app-crypt/hmaccalc/hmaccalc-0.9.14.ebuild
@@ -11228,9 +11226,8 @@
 1801231609 ./app-editors/vim-core/vim-core-8.0.1428.ebuild
 1803260208 ./app-editors/vim-core/vim-core-8.0.1645.ebuild
 1803110838 ./app-editors/vim-core/vim-core-8.0.1298.ebuild
-1801231609 ./app-editors/vim-core/vim-core-8.0.1188.ebuild
+1804120908 ./app-editors/vim-core/vim-core-8.0.1699.ebuild
 1801231609 ./app-editors/vim-core/vim-core-9999.ebuild
-1801231609 ./app-editors/vim-core/vim-core-8.0.0386.ebuild
 1712192239 ./app-editors/gedit/gedit-3.22.1.ebuild
 1702282250 ./app-editors/dhex/dhex-0.68.ebuild
 1802161608 ./app-editors/notepadqq/notepadqq-1.2.0.ebuild
@@ -11293,8 +11290,9 @@
 1803052038 ./app-editors/leo/leo-5.6.ebuild
 1801051409 ./app-editors/gvim/gvim-8.0.1428.ebuild
 1803312208 ./app-editors/gvim/gvim-8.0.1645.ebuild
-1803260208 ./app-editors/gvim/gvim-9999.ebuild
+1804120908 ./app-editors/gvim/gvim-9999.ebuild
 1801202108 ./app-editors/gvim/gvim-8.0.1298.ebuild
+1804120908 ./app-editors/gvim/gvim-8.0.1699.ebuild
 1801251738 ./app-editors/qxmledit/qxmledit-0.9.9.2.ebuild
 1709301022 ./app-editors/qxmledit/qxmledit-0.9.8.ebuild
 1712221309 ./app-editors/qxmledit/qxmledit-0.9.9.ebuild
@@ -11342,10 +11340,11 @@
 1702282250 ./app-editors/joe/joe-4.2.ebuild
 1801300108 ./app-editors/joe/joe-4.6.ebuild
 1702282250 ./app-editors/xmlcopyeditor/xmlcopyeditor-1.2.1.3.ebuild
+1804120908 ./app-editors/vim/vim-8.0.1699.ebuild
 1801231609 ./app-editors/vim/vim-8.0.1428.ebuild
 1803260208 ./app-editors/vim/vim-8.0.1645.ebuild
 1803110838 ./app-editors/vim/vim-8.0.1298.ebuild
-1803260208 ./app-editors/vim/vim-9999.ebuild
+1804120908 ./app-editors/vim/vim-9999.ebuild
 1709301022 ./app-editors/tea/tea-44.1.0.ebuild
 1712221409 ./app-editors/tea/tea-44.1.1.ebuild
 1702282250 ./app-editors/le/le-1.16.1.ebuild
@@ -24382,11 +24381,11 @@
 1702282250 ./sys-boot/vboot-utils/vboot-utils-1.0_p20130222.ebuild
 1711221248 ./x11-drivers/nvidia-drivers/nvidia-drivers-381.22-r1.ebuild
 1709271527 ./x11-drivers/nvidia-drivers/nvidia-drivers-304.137.ebuild
-1804112239 ./x11-drivers/nvidia-drivers/nvidia-drivers-396.18.ebuild
 1803140108 ./x11-drivers/nvidia-drivers/nvidia-drivers-387.34.ebuild
 1709271923 ./x11-drivers/nvidia-drivers/nvidia-drivers-375.82.ebuild
 1803311508 ./x11-drivers/nvidia-drivers/nvidia-drivers-390.48.ebuild
 1803140108 ./x11-drivers/nvidia-drivers/nvidia-drivers-390.42.ebuild
+1804121139 ./x11-drivers/nvidia-drivers/nvidia-drivers-396.18-r1.ebuild
 1803311508 ./x11-drivers/nvidia-drivers/nvidia-drivers-340.106.ebuild
 1804112239 ./x11-drivers/nvidia-drivers/nvidia-drivers-384.130.ebuild
 1711221248 ./x11-drivers/nvidia-drivers/nvidia-drivers-378.13-r1.ebuild
@@ -25086,6 +25085,7 @@
 1702282250 ./dev-perl/File-KeePass/File-KeePass-2.30.0.ebuild
 1710211138 ./dev-perl/File-KeePass/File-KeePass-2.30.0-r1.ebuild
 1801152209 ./dev-perl/MusicBrainz-DiscID/MusicBrainz-DiscID-0.40.0.ebuild
+1804120908 ./dev-perl/Number-Bytes-Human/Number-Bytes-Human-0.110.0.ebuild
 1708271849 ./dev-perl/YAML-Syck/YAML-Syck-1.300.0.ebuild
 1804112208 ./dev-perl/Test-File-ShareDir/Test-File-ShareDir-1.1.2.ebuild
 1703171326 ./dev-perl/Module-Compile/Module-Compile-0.350.0.ebuild
@@ -32418,8 +32418,8 @@
 1710260405 ./sys-apps/rng-tools/rng-tools-6-r1.ebuild
 1702282250 ./sys-apps/rng-tools/rng-tools-5-r2.ebuild
 1803212139 ./sys-apps/entropy/entropy-302-r1.ebuild
-1708071946 ./sys-apps/restorecond/restorecond-9999.ebuild
-1709230513 ./sys-apps/restorecond/restorecond-2.7.ebuild
+1804120839 ./sys-apps/restorecond/restorecond-9999.ebuild
+1804120839 ./sys-apps/restorecond/restorecond-2.7.ebuild
 1706100008 ./sys-apps/noexec/noexec-1.1.0-r1.ebuild
 1802120608 ./sys-apps/usbredir/usbredir-0.7.1_p20180211.ebuild
 1708172005 ./sys-apps/usbredir/usbredir-9999.ebuild
@@ -39419,6 +39419,7 @@
 1804040708 metadata/md5-cache/dev-ruby/ox-2.9.0
 1803280108 metadata/md5-cache/dev-ruby/ruby-sdl-2.1.2-r2
 1803021159 metadata/md5-cache/dev-ruby/net-http-digest_auth-1.4.1
+1804120908 metadata/md5-cache/dev-ruby/sdoc-1.0.0
 1803021159 metadata/md5-cache/dev-ruby/twitter-6.2.0
 1803021159 metadata/md5-cache/dev-ruby/ruby-gobject-introspection-3.1.1
 1803021159 metadata/md5-cache/dev-ruby/gettext_i18n_rails-1.8.0
@@ -39440,7 +39441,6 @@
 1803021159 metadata/md5-cache/dev-ruby/ruby-gettext-3.2.2
 1803241138 metadata/md5-cache/dev-ruby/rspec-2.99.0
 1804040708 metadata/md5-cache/dev-ruby/httparty-0.16.2
-1803222339 metadata/md5-cache/dev-ruby/loofah-2.1.1
 1803021159 metadata/md5-cache/dev-ruby/webmock-1.20.3
 1803021159 metadata/md5-cache/dev-ruby/actioncable-5.1.1
 1803211008 metadata/md5-cache/dev-ruby/calendar_date_select-2.1.2
@@ -39515,7 +39515,6 @@
 1803021159 metadata/md5-cache/dev-ruby/little-plugger-1.1.4
 1803021159 metadata/md5-cache/dev-ruby/rex-zip-0.1.1
 1803312138 metadata/md5-cache/dev-ruby/activejob-5.0.7
-1803021159 metadata/md5-cache/dev-ruby/sdoc-0.4.1
 1804112208 metadata/md5-cache/dev-ruby/crass-1.0.2
 1803021159 metadata/md5-cache/dev-ruby/ragol-1.0.1-r2
 1803222339 metadata/md5-cache/dev-ruby/sass-listen-4.0.0
@@ -39722,7 +39721,7 @@
 1803021159 metadata/md5-cache/dev-ruby/sanitize-4.5.0
 1803021159 metadata/md5-cache/dev-ruby/capistrano-3.9.1
 1803021159 metadata/md5-cache/dev-ruby/vcr-1.11.3
-1804120008 metadata/md5-cache/dev-ruby/Manifest.gz
+1804120908 metadata/md5-cache/dev-ruby/Manifest.gz
 1803021159 metadata/md5-cache/dev-ruby/bunny-2.8.1
 1803021159 metadata/md5-cache/dev-ruby/cmdparse-3.0.3
 1803021159 metadata/md5-cache/dev-ruby/fast_xs-0.8.0-r2
@@ -39747,7 +39746,6 @@
 1803021159 metadata/md5-cache/dev-ruby/ruby_parser-3.11.0
 1803252308 metadata/md5-cache/dev-ruby/webmock-3.0.1
 1803021159 metadata/md5-cache/dev-ruby/jquery-ui-rails-4.2.1
-1803222339 metadata/md5-cache/dev-ruby/loofah-2.0.3
 1803021159 metadata/md5-cache/dev-ruby/ruby-vte3-3.1.1
 1803021159 metadata/md5-cache/dev-ruby/ruby-clutter-3.0.8
 1803021159 metadata/md5-cache/dev-ruby/tins-1.16.0
@@ -39791,7 +39789,6 @@
 1803021159 metadata/md5-cache/dev-ruby/ast-2.4.0
 1803021159 metadata/md5-cache/dev-ruby/metasploit_data_models-2.0.14
 1803021159 metadata/md5-cache/dev-ruby/deprecated-3.0.1-r2
-1803021159 metadata/md5-cache/dev-ruby/windows_error-0.1.1
 1803021159 metadata/md5-cache/dev-ruby/state_machine-1.2.0
 1803160038 metadata/md5-cache/dev-ruby/jeweler-2.3.7
 1803021159 metadata/md5-cache/dev-ruby/ruby-gtk3-3.0.8
@@ -39992,7 +39989,7 @@
 1803021159 metadata/md5-cache/dev-ruby/rubygems-2.6.14
 1803021159 metadata/md5-cache/dev-ruby/execjs-2.7.0
 1803021159 metadata/md5-cache/dev-ruby/flexmock-2.3.5
-1803021159 metadata/md5-cache/dev-ruby/windows_error-0.1.2
+1804120908 metadata/md5-cache/dev-ruby/windows_error-0.1.2
 1803252108 metadata/md5-cache/dev-ruby/sourcemap-0.1.1
 1803090938 metadata/md5-cache/dev-ruby/rspec-support-3.7.1
 1804102339 metadata/md5-cache/dev-ruby/pdf-reader-2.1.0
@@ -40212,6 +40209,7 @@
 1804090838 metadata/md5-cache/dev-ruby/crass-1.0.4
 1803072038 metadata/md5-cache/dev-ruby/rainbow-1.1.4-r1
 1803021159 metadata/md5-cache/dev-ruby/aws-sdk-2.8.14
+1804120838 metadata/md5-cache/dev-ruby/dalli-2.7.8
 1803021159 metadata/md5-cache/dev-ruby/ultraviolet-1.0.1
 1803021159 metadata/md5-cache/dev-ruby/rouge-1.11.1-r1
 1803021159 metadata/md5-cache/dev-ruby/net-scp-1.1.2-r1
@@ -41442,7 +41440,7 @@
 1803290617 metadata/md5-cache/app-crypt/acme-0.21.1
 1803021159 metadata/md5-cache/app-crypt/johntheripper-1.7.9-r6
 1802262111 metadata/md5-cache/app-crypt/onak-0.5.0
-1804120008 metadata/md5-cache/app-crypt/Manifest.gz
+1804121138 metadata/md5-cache/app-crypt/Manifest.gz
 1708210038 metadata/md5-cache/app-crypt/debian-archive-keyring-2014.3
 1804060238 metadata/md5-cache/app-crypt/libu2f-server-1.1.0
 1803021159 metadata/md5-cache/app-crypt/jetring-0.25
@@ -41507,8 +41505,8 @@
 1804021138 metadata/md5-cache/app-crypt/gnupg-2.2.4-r2
 1804050808 metadata/md5-cache/app-crypt/certbot-apache-9999
 1803290617 metadata/md5-cache/app-crypt/yubikey-manager-0.4.6
+1804121138 metadata/md5-cache/app-crypt/pinentry-1.1.0-r1
 1801011404 metadata/md5-cache/app-crypt/pdfcrack-0.15
-1804102008 metadata/md5-cache/app-crypt/pinentry-1.1.0
 1803021159 metadata/md5-cache/app-crypt/tpm-tools-1.3.9
 1803270108 metadata/md5-cache/app-crypt/dehydrated-0.6.1
 1803021159 metadata/md5-cache/app-crypt/sign-1.0.7
@@ -48355,7 +48353,7 @@
 1804021708 metadata/md5-cache/app-editors/jed-0.99.19
 1803021159 metadata/md5-cache/app-editors/vim-8.0.1428
 1803290617 metadata/md5-cache/app-editors/emacs-vcs-26.0.9999-r1
-1803290617 metadata/md5-cache/app-editors/vim-9999
+1804120908 metadata/md5-cache/app-editors/vim-9999
 1803290617 metadata/md5-cache/app-editors/nano-9999
 1803021159 metadata/md5-cache/app-editors/fte-20051115-r3
 1801011404 metadata/md5-cache/app-editors/dav-0.8.5-r2
@@ -48363,7 +48361,6 @@
 1803021159 metadata/md5-cache/app-editors/qxmledit-0.9.9
 1702282308 metadata/md5-cache/app-editors/yudit-2.9.2
 1803220108 metadata/md5-cache/app-editors/hteditor-2.1.0-r1
-1803021159 metadata/md5-cache/app-editors/vim-core-8.0.0386
 1803021159 metadata/md5-cache/app-editors/cooledit-3.17.17-r1
 1802262111 metadata/md5-cache/app-editors/hexcurse-1.60.0
 1803290617 metadata/md5-cache/app-editors/neovim-9999
@@ -48383,6 +48380,7 @@
 1803190338 metadata/md5-cache/app-editors/emacs-25.3-r1
 1803021159 metadata/md5-cache/app-editors/ersatz-emacs-20060515
 1702282308 metadata/md5-cache/app-editors/le-1.16.1
+1804120908 metadata/md5-cache/app-editors/vim-core-8.0.1699
 1803021159 metadata/md5-cache/app-editors/bluefish-2.2.10
 1804021838 metadata/md5-cache/app-editors/jasspa-microemacs-20091011-r3
 1803021159 metadata/md5-cache/app-editors/hexedit-1.2.13
@@ -48409,13 +48407,14 @@
 1802090038 metadata/md5-cache/app-editors/zile-2.3.24-r2
 1803260208 metadata/md5-cache/app-editors/vim-core-8.0.1645
 1803021159 metadata/md5-cache/app-editors/latexila-3.24.2
-1803290617 metadata/md5-cache/app-editors/gvim-9999
+1804120908 metadata/md5-cache/app-editors/gvim-9999
 1803021159 metadata/md5-cache/app-editors/ne-3.1.1
 1803021159 metadata/md5-cache/app-editors/tea-44.1.1
 1801011404 metadata/md5-cache/app-editors/wily-1.0-r1
 1803021159 metadata/md5-cache/app-editors/nvi-1.81.6-r7
 1803021159 metadata/md5-cache/app-editors/fte-20110708-r1
 1802161608 metadata/md5-cache/app-editors/notepadqq-1.2.0
+1804120908 metadata/md5-cache/app-editors/gvim-8.0.1699
 1803021159 metadata/md5-cache/app-editors/atom-1.24.0_beta3
 1803021159 metadata/md5-cache/app-editors/shed-1.15
 1803201012 metadata/md5-cache/app-editors/emacs-23.4-r17
@@ -48441,7 +48440,7 @@
 1801011404 metadata/md5-cache/app-editors/ee-1.5.2
 1803021159 metadata/md5-cache/app-editors/moe-1.7
 1802210008 metadata/md5-cache/app-editors/mg-20170828
-1804102339 metadata/md5-cache/app-editors/Manifest.gz
+1804120908 metadata/md5-cache/app-editors/Manifest.gz
 1702282308 metadata/md5-cache/app-editors/emact-2.56.0
 1801091400 metadata/md5-cache/app-editors/elvis-2.2.0-r5
 1803250109 metadata/md5-cache/app-editors/jedit-5.2.0-r1
@@ -48502,11 +48501,11 @@
 1803021159 metadata/md5-cache/app-editors/focuswriter-1.6.8
 1803021159 metadata/md5-cache/app-editors/gedit-3.22.1
 1803021159 metadata/md5-cache/app-editors/amyedit-1.0-r2
+1804120908 metadata/md5-cache/app-editors/vim-8.0.1699
 1803021159 metadata/md5-cache/app-editors/bluefish-2.2.8
 1803021159 metadata/md5-cache/app-editors/ted-2.23
 1804100138 metadata/md5-cache/app-editors/emacs-26.1_rc1
 1801011404 metadata/md5-cache/app-editors/aee-2.2.15b
-1803021159 metadata/md5-cache/app-editors/vim-core-8.0.1188
 1803021159 metadata/md5-cache/app-editors/qemacs-0.4.1_pre20150916
 1801011404 metadata/md5-cache/app-editors/aee-2.2.21
 1803052038 metadata/md5-cache/app-editors/uemacs-pk-4.0.15_p20180117
@@ -56746,7 +56745,7 @@
 1803021159 metadata/md5-cache/sys-freebsd/freebsd-pam-modules-9.1-r1
 1803021159 metadata/md5-cache/sys-freebsd/freebsd-usbin-11.1
 1803021159 metadata/md5-cache/sys-freebsd/freebsd-sources-9.1-r9
-1804120738 metadata/md5-cache/Manifest.gz
+1804121138 metadata/md5-cache/Manifest.gz
 1801011405 metadata/md5-cache/www-apache/mod_macro-1.1.10
 1803021159 metadata/md5-cache/www-apache/mod_wsgi-4.5.17
 1803021159 metadata/md5-cache/www-apache/mod_perl-2.0.10
@@ -61599,6 +61598,7 @@
 1803290617 metadata/md5-cache/sys-boot/raspberrypi-firmware-9999
 1702282333 metadata/md5-cache/sys-boot/mbr-1.1.11
 1803151938 metadata/md5-cache/x11-drivers/xf86-video-ati-18.0.1
+1804121139 metadata/md5-cache/x11-drivers/nvidia-drivers-396.18-r1
 1803021159 metadata/md5-cache/x11-drivers/xf86-video-virtualbox-5.1.34
 1803102239 metadata/md5-cache/x11-drivers/xf86-video-r128-6.10.2
 1803021159 metadata/md5-cache/x11-drivers/xf86-input-evdev-2.10.5
@@ -61643,7 +61643,7 @@
 1803021159 metadata/md5-cache/x11-drivers/xf86-video-ati-7.9.0
 1803190338 metadata/md5-cache/x11-drivers/xf86-input-mtrack-0.3.1
 1803021159 metadata/md5-cache/x11-drivers/xf86-video-nouveau-1.0.15
-1804120008 metadata/md5-cache/x11-drivers/Manifest.gz
+1804121139 metadata/md5-cache/x11-drivers/Manifest.gz
 1803021159 metadata/md5-cache/x11-drivers/xf86-input-void-1.4.1
 1803021159 metadata/md5-cache/x11-drivers/xf86-video-openchrome-0.6.0
 1803021159 metadata/md5-cache/x11-drivers/xf86-video-newport-0.2.3
@@ -61660,7 +61660,6 @@
 1803060608 metadata/md5-cache/x11-drivers/xf86-video-intel-2.99.917_p20180214
 1803021159 metadata/md5-cache/x11-drivers/xf86-input-vmmouse-13.1.0-r1
 1803021159 metadata/md5-cache/x11-drivers/xf86-video-qxl-0.1.5
-1804120008 metadata/md5-cache/x11-drivers/nvidia-drivers-396.18
 1803021159 metadata/md5-cache/x11-drivers/xf86-input-wacom-0.36.0
 1803151908 metadata/md5-cache/x11-drivers/xf86-video-amdgpu-18.0.1
 1803021159 metadata/md5-cache/x11-drivers/xf86-video-vesa-2.4.0
@@ -63237,6 +63236,7 @@
 1801050119 metadata/md5-cache/dev-perl/HTTP-Server-Simple-0.520.0
 1801050119 metadata/md5-cache/dev-perl/CPAN-Perl-Releases-3.180.0
 1801050119 metadata/md5-cache/dev-perl/Log-Agent-1.1.0
+1804120908 metadata/md5-cache/dev-perl/Number-Bytes-Human-0.110.0
 1801050119 metadata/md5-cache/dev-perl/Lab-VXI11-0.20.0
 1803011138 metadata/md5-cache/dev-perl/Test-LeakTrace-0.160.0
 1803021159 metadata/md5-cache/dev-perl/Class-DBI-mysql-1.0.0-r1
@@ -63286,7 +63286,7 @@
 1801050119 metadata/md5-cache/dev-perl/String-Flogger-1.101.245
 1804022138 metadata/md5-cache/dev-perl/Data-Dump-1.230.0
 1803021159 metadata/md5-cache/dev-perl/RTF-Writer-1.110.0-r2
-1804112208 metadata/md5-cache/dev-perl/Manifest.gz
+1804120908 metadata/md5-cache/dev-perl/Manifest.gz
 1803021159 metadata/md5-cache/dev-perl/Crypt-OpenSSL-Bignum-0.40.0-r2
 1803280638 metadata/md5-cache/dev-perl/XML-Compile-Cache-1.60.0
 1801050119 metadata/md5-cache/dev-perl/MooseX-FollowPBP-0.50.0-r1
@@ -69223,7 +69223,7 @@
 1803021159 metadata/md5-cache/sys-apps/paxctl-0.8
 1803180008 metadata/md5-cache/sys-apps/hdparm-9.55
 1802262111 metadata/md5-cache/sys-apps/fwts-15.12.00
-1801011404 metadata/md5-cache/sys-apps/restorecond-2.7
+1804120838 metadata/md5-cache/sys-apps/restorecond-2.7
 1803021159 metadata/md5-cache/sys-apps/baobab-3.24.0
 1801012210 metadata/md5-cache/sys-apps/mawk-1.3.4_p20171017
 1803021159 metadata/md5-cache/sys-apps/nix-2.0
@@ -69383,9 +69383,9 @@
 1803021159 metadata/md5-cache/sys-apps/uam-0.3.2
 1803290617 metadata/md5-cache/sys-apps/iproute2-9999
 1803290617 metadata/md5-cache/sys-apps/toybox-9999
-1804120008 metadata/md5-cache/sys-apps/Manifest.gz
+1804120838 metadata/md5-cache/sys-apps/Manifest.gz
 1801120740 metadata/md5-cache/sys-apps/hwids-20170328
-1803290617 metadata/md5-cache/sys-apps/restorecond-9999
+1804120838 metadata/md5-cache/sys-apps/restorecond-9999
 1702282332 metadata/md5-cache/sys-apps/daemonize-1.7.6
 1803191608 metadata/md5-cache/sys-apps/agedu-20180302
 1803021159 metadata/md5-cache/sys-apps/iproute2-4.7.0
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 2d63a5df0b96..71f5737ea31c 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Thu, 12 Apr 2018 05:30:01 +0000
+Thu, 12 Apr 2018 09:00:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 02a8dec65694..7a660a92f7d6 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-e7abad3eacab4b30ce6e594676b87866bf017d3a 1523507238 2018-04-12T04:27:18+00:00
+8344e873510ee3890f9e3e932028a2067d258e38 1523521747 2018-04-12T08:29:07+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 91fabb4896cd..0edf30ac89c6 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1523509501 Thu 12 Apr 2018 05:05:01 AM UTC
+1523522101 Thu 12 Apr 2018 08:35:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index cd56ed9d7839..9e16ff47e0f4 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Thu, 12 Apr 2018 05:08:26 +0000
+Thu, 12 Apr 2018 08:38:26 +0000
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 64b01b8f58cb..9a905d8d8fea 100644
Binary files a/net-misc/Manifest.gz and b/net-misc/Manifest.gz differ
diff --git a/net-misc/cfengine/Manifest b/net-misc/cfengine/Manifest
index ab0e015e0603..f60386c9e612 100644
--- a/net-misc/cfengine/Manifest
+++ b/net-misc/cfengine/Manifest
@@ -7,7 +7,7 @@ AUX cfengine-2.2.10-snprintf_buffer_overflow.patch 456 BLAKE2B 9466bbae7d47fccf3
 AUX cfengine-3.4.5-acl.patch 1024 BLAKE2B 0cd02ca5c62cc088f9b18e55dae019cd2193d086d4ccba721869f2e2956c4fc613d3af07ad9831593dc06acc9a64788ab6a00ba32c0185a7b07351a578d50583 SHA512 f8e7987cf26c8791d3b0c816a61fdd8b877114729c804d096270f9e98c69f0cdcfe4d72a4120d9d8fa8fd260fae340ef75f9897b4a421da7648d05c10a4bc02b
 AUX cfengine-3.4.5-ifconfig.patch 1447 BLAKE2B 69fb92a9456705342f1231af7a21f3cf3c4f704cf17c85f99f3c4e85402d3364a03de3fb905912416e4c2ad257de017a76e197a7f07f8617eb530908ce843448 SHA512 e2e3f362777951c9778fe9f98f95fb934fd76a3a0af39612ab3a6aeec320d181834d4531382ab70c0ebc3162180dd9e9508f082ee99fd80fb5144eb1815ebc55
 AUX cfengine-3.5.3-ifconfig.patch 1776 BLAKE2B e96d9ac013494d43ad2dcf9c7ee5499eae3f799ddf36cf6c147fa9c416b01f31a2fd9b1de1377e82c4f389fda874b06e862055701343c58e5124eba58ab09e6b SHA512 33c7ce6a3f064e8d9fbb393dcf56816be3ed4e679864dd2163681686b15c458b7694a05731607971acadd643c763c8d94d3fd14d19e5fb1814e4898cfedf9ef9
-AUX cfengine-3.6.2-ifconfig.patch 486 BLAKE2B ce8b91a8afe94fcdd30aa5a59a26b9cc5099e3093fa6a2f0ad1250b810aa6200d1f550ce38314ba1fb57c68364ce348a911086de6c5922dce4cada855be2fd5b SHA512 e0c308dcb1ac1d865b6410e5e4a5afb4619dc56e77ddb247a4c3314e9b2e9ffcab7dd09682ead3acd259dfdc76403c5c7312d3306e53285da7812912f59d8582
+AUX cfengine-3.6.2-ifconfig.patch 486 BLAKE2B c8ccad409a64f1a0232fc800fe3787ece597c63728a7dd890ffbf363bed81d2be22b6354df9acf6d7082fe573418ba53e805ce1581251a458811cccb084a144e SHA512 f2cd1c008f3d4dea418207660c6d6cc4769e7effa50259b59e74ecc3e6fc1581f282fec1482046f50c0e0aa46d40084aa1616bd618de33ae3055ce626bfa9c5d
 AUX cfengine-3.6.2-sysmacros.patch 555 BLAKE2B e1111a7cd5dd1b28787c0db6af1f55fed2b95ac3f1267eb5ad516584f6bf4c070a5243185808ce772c2a70171bcf3e5eb331bc0cfc5b82a04e8dccd99fdce761 SHA512 404468a5e10b535c8f10c2cff9c8928730a4323145cd29cfc080cd3af9effef1b890fb038f3dad8d84ba67d1af72b402d35cc1f382ff34fb0cdd07b8af23732c
 AUX cfenvd.rc6 255 BLAKE2B e65d843b93d6eacc657f2fc7d03c48ddf55ec1bee8d278cce9c44e9822bbec352cb2f98480095804d5b4511e260448898182deeab28c2127fc4ca723c83ebf3f SHA512 3b6356bd75d2986d4482a6d603cb1b07697d5314a748f440b8f11e7275670c072ed96fddd5a41d4066e19ebbf1d126f93d70428324e37bbb40185dc414e10994
 AUX cfexecd.rc6 260 BLAKE2B c31397f5b0c8473ee4dc1c505ea32bf7618fc5ef25572f0e8023e6bed812ba665d4cd68b050f58035fe29429bbad7b907f0a548deecfaebe24b3ac7e97dc71f0 SHA512 735a34204b6c9d555b454f264edeaf371e1ee7cf80a2c23fcc83d604ed87d3a19dcd9008f6c815a024535b1d9e9a32aac008ce7b4e440f9b688b642050ec7ff1
@@ -23,4 +23,4 @@ EBUILD cfengine-3.3.9.ebuild 3519 BLAKE2B 3be8e09e3e0345eec2e83aed2dee2b8a37c71d
 EBUILD cfengine-3.4.5.ebuild 3745 BLAKE2B 8bd609d245891a3139fa3e98425bc960436e6a8d95e7d31153b9fb0ce4cbd5a9886804751954dc1bd3df47942cb1d2545b1e7bbddd86488f29e8554a60643f29 SHA512 285447ad8239f57f076ebf10224e5582414be174b4f1f35644dff2f170e2032a65fa76aa2877c22fdb6681abe855492a1cd7da13409563a1d83ef21b45871e89
 EBUILD cfengine-3.5.3.ebuild 3812 BLAKE2B 70b4bc5c20970c2da13c36880cb40e6a01b7b75b0e4ce070207234575bb62285dda049805942d8ff388c5ff9db73a93655fce5a6fba9d8d7fe9ad7a153d0ee97 SHA512 d0bec07edd75d17705894a9d771feb112f7fb892cbdae8c341bac6290a82eeef5e90187fc6dc7d7f1b911c5f020d30de9b8f043d196f663805eae628701656b4
 EBUILD cfengine-3.6.2.ebuild 4254 BLAKE2B 2215d2dc3d49105049e1eea181b52e22b051820f9a8c8ef8b961e2b4d2e786a97ff0ae1a6161e3e71d595499a67216affbe6cfcca745f78e0113dfc7f63cbbb3 SHA512 30d2adfe8aa0ba9e42daeff457d12d881e2d059781343da9ecb7b6a7fb5f2ce1238e8c33277179396dde2a3a310f2d36a210d770843fd8552e9b4bcc61291733
-MISC metadata.xml 2316 BLAKE2B 841e95b118a868d289099e24f2c8031dd6412220367e404ed2d67724354b90fcd82e1c74b8f70181cd79f7fbbad67be81322355029fc5015bd284c37f9c839f5 SHA512 1879e2df9ae3f23a236ab29bd6b9168b5b3ed7eaf348decd3aace7fda7691ce03f6b8352c01eaa3888a53597cf3b46985e332373d7b21545e78cfa3523b2df3c
+MISC metadata.xml 2159 BLAKE2B fce780617a458d494a437239729a7841c860e797e66f1a8c783c4ffce62bef89b92ef644fa8258cf4209e44aa56b566e9df493a1ba34667611b47bf274cb7bd9 SHA512 c30ddd7fce32d4e7231b860d64940d9368085bc8f65851fefa886b312995512c48f7a1291afcfb80921fac64f2a676946c286723483294d13d4a9c89c01659e4
diff --git a/net-misc/cfengine/files/cfengine-3.6.2-ifconfig.patch b/net-misc/cfengine/files/cfengine-3.6.2-ifconfig.patch
index ae0f491347f9..a31b3513ded4 100644
--- a/net-misc/cfengine/files/cfengine-3.6.2-ifconfig.patch
+++ b/net-misc/cfengine/files/cfengine-3.6.2-ifconfig.patch
@@ -5,7 +5,7 @@
      }
  #else
 -    if ((pp = cf_popen("/sbin/ifconfig -a", "r", true)) == NULL)
-+    if ((pp = cf_popen("/sbin/ifconfig -a", "r", true)) == NULL || (pp = cf_popen("/bin/ifconfig -a", "r", true)) == NULL)
++    if ((pp = cf_popen("/sbin/ifconfig -a", "r", true)) == NULL && (pp = cf_popen("/bin/ifconfig -a", "r", true)) == NULL)
      {
          Log(LOG_LEVEL_VERBOSE, "Could not find interface info");
          return;
diff --git a/net-misc/cfengine/metadata.xml b/net-misc/cfengine/metadata.xml
index 86fa96098b09..3c6b17c9adcc 100644
--- a/net-misc/cfengine/metadata.xml
+++ b/net-misc/cfengine/metadata.xml
@@ -1,11 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>idl0r@gentoo.org</email>
-		<name>Christian Ruppert</name>
-		<description>cfengine 2.x only</description>
-	</maintainer>
 	<maintainer type="project">
 		<email>sysadmin@gentoo.org</email>
 		<name>Gentoo Sysadmin Project</name>
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index a7849eb9622f..ff5d93db33ea 100644
Binary files a/profiles/Manifest.gz and b/profiles/Manifest.gz differ
diff --git a/profiles/default/linux/x86/17.0/hardened/selinux/eapi b/profiles/default/linux/x86/17.0/hardened/selinux/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/x86/17.0/hardened/selinux/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/x86/17.0/hardened/selinux/parent b/profiles/default/linux/x86/17.0/hardened/selinux/parent
new file mode 100644
index 000000000000..2190e9797eaa
--- /dev/null
+++ b/profiles/default/linux/x86/17.0/hardened/selinux/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../features/selinux
diff --git a/profiles/profiles.desc b/profiles/profiles.desc
index a1a9e1947726..5438111602b2 100644
--- a/profiles/profiles.desc
+++ b/profiles/profiles.desc
@@ -239,6 +239,7 @@ x86		default/linux/x86/13.0/systemd			stable
 x86             default/linux/x86/17.0                          stable
 x86             default/linux/x86/17.0/selinux                  stable
 x86             default/linux/x86/17.0/hardened                 stable
+x86             default/linux/x86/17.0/hardened/selinux         stable
 x86             default/linux/x86/17.0/desktop                  stable
 x86             default/linux/x86/17.0/desktop/gnome            stable
 x86             default/linux/x86/17.0/desktop/gnome/systemd    stable
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 349e22eb122c..be19cb9fa084 100644
Binary files a/sys-apps/Manifest.gz and b/sys-apps/Manifest.gz differ
diff --git a/sys-apps/restorecond/Manifest b/sys-apps/restorecond/Manifest
index e1e3ba0d777b..b47809ff698d 100644
--- a/sys-apps/restorecond/Manifest
+++ b/sys-apps/restorecond/Manifest
@@ -1,5 +1,5 @@
 AUX restorecond.init 650 BLAKE2B 507c65c11f756d5cf11045ba75d40a39a9fb6a527c9e0406247e8d2d06a41ec977110bdb9c77f4a75d97fc179bf507b0fd58b962c1976eff57a743cf019c684a SHA512 ee0ff9bfe542124eff0217dbf9cc2e00586b4577e0eee2bfa67946f78a97fe009c6e5c337e8ad68e1cd9af2f69ec3ce3acba9157b4d53c2fdeeb01f9e0aa9d0a
 DIST restorecond-2.7.tar.gz 17753 BLAKE2B 793a41dbfd0a33d79e15c62e79f4fbbacc4208a8f2057813d7c3e2d16a3435c12e0c29ca60a3b45cef33ec13b5aacd28c8ad95ddcbf47a812654d3a59fcb6c89 SHA512 c81950e4f748a729c8951b13a4075ab1003530f8ada7a9d3fbe6428f76070df4819a37daaab557b63fc234aa8c8320ec41757fbdb24b76fa2c11747bde0038ad
-EBUILD restorecond-2.7.ebuild 1230 BLAKE2B 3317279f51085b9f89b6d291281a8d1cd8808155d146afddb61df89ce05bc7b8b64b324d48920bbc7a1763b3cae13fe5d1ef33c711c4388dca834a55c9560542 SHA512 bac8e86d00ac5c116aa877938f69427a1fa5ce7758594db6400722d953e5ea3fd000f0c4520364a7390cb0e6cd91ba737487b747aea25a38358fbb9c7e8a38eb
-EBUILD restorecond-9999.ebuild 1232 BLAKE2B 5bbb9e4a0507a53bbeae71adbcf6ed3fdd52dcd5cc263e3998540188beecccdc728e115efe15d124da5d5149cbdda6bb412f1cee83103eb4ee4157fbbe066770 SHA512 0c51444d0c278aee93a8da5f35a122d6d9c0849eb1d78f1b347f91f5399e87e11d8cc40b141e1295d5a0df406921e21f16264fb63fb50fa488463a01b057b74e
+EBUILD restorecond-2.7.ebuild 1250 BLAKE2B 7ae1b18d0eb9906ace64c5e2191c894fe424e69fe4f38f14238b3706c426a8272ea7f35ba5237a3375f7329d2140b78c02161cc855460e70f09d7c3f4850a51a SHA512 c5bbc404f56d756897433561485a6c90d5bdfb70958181cf5b670bb4a3dc9b428f91b8960e0960251d7acdd35f0e9b6141c5f4056f90d934a913b5b5ebfc6af8
+EBUILD restorecond-9999.ebuild 1252 BLAKE2B c8a3dd1772439c6b40cbdea77fbe24391b1a4afb2ea4337294e1a189b19ce0c6af491fd4d82c27e52a13eba50e30bfc2bbbfd4145babc7ebf1efe3f4b01bf911 SHA512 f01a7e9a2553090e11f7a5cfcc3abf363b756c57f7e6d6fa0584f70fb1e7a9e31d60e434f1bdfcef091513e10fd235abb4c7c0d98cc16b1d6735d05ed81fb68d
 MISC metadata.xml 460 BLAKE2B d0de63ca5ac8e0c1c061f418ea9dba5472644626bbc5799499ce70ff0c2d1c7e49b023e3855cc7c767e78f5fb6f62429f5aab59dd272d9a906dbe026895e2e46 SHA512 0e4910de5e3932eb2914ddf4ef3250ae919885428337b1939f6827037a4dc5a75b13c97531c7b81748b1c90e3eb2b10a4671c76ede69749dbd1955bc67b5ca0a
diff --git a/sys-apps/restorecond/restorecond-2.7.ebuild b/sys-apps/restorecond/restorecond-2.7.ebuild
index a63282f7029d..d55b72f66e5f 100644
--- a/sys-apps/restorecond/restorecond-2.7.ebuild
+++ b/sys-apps/restorecond/restorecond-2.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -28,6 +28,7 @@ SLOT="0"
 
 DEPEND=">=sys-libs/libsepol-${PV}:=
 	>=sys-libs/libselinux-${PV}:=
+	dev-libs/dbus-glib
 	dev-libs/libpcre:=
 	>=sys-libs/libcap-1.10-r10:="
 
diff --git a/sys-apps/restorecond/restorecond-9999.ebuild b/sys-apps/restorecond/restorecond-9999.ebuild
index 3d679bcf4c7e..f638bbc5aee2 100644
--- a/sys-apps/restorecond/restorecond-9999.ebuild
+++ b/sys-apps/restorecond/restorecond-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -28,6 +28,7 @@ SLOT="0"
 
 DEPEND=">=sys-libs/libsepol-${PV}:=
 	>=sys-libs/libselinux-${PV}:=
+	dev-libs/dbus-glib
 	dev-libs/libpcre:=
 	>=sys-libs/libcap-1.10-r10:="
 
diff --git a/x11-drivers/Manifest.gz b/x11-drivers/Manifest.gz
index 349539f3a3f5..3415defa4f83 100644
Binary files a/x11-drivers/Manifest.gz and b/x11-drivers/Manifest.gz differ
diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
index 1158355c9915..23f345fc1f2a 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -82,5 +82,5 @@ EBUILD nvidia-drivers-384.130.ebuild 16122 BLAKE2B 24a59ab053d40caa6bace34cf34c4
 EBUILD nvidia-drivers-387.34.ebuild 16295 BLAKE2B 0e6e77ed5654425bf03e358d5d8c539dd302d8ea1566f2ccd0604818dae31825127779a1bc735b28ab994db0e947afa32985f145c793bfc5a4f00b4bfafeb484 SHA512 15e1fc883e77bebf8e4642dbb3575f2a5f016083624491bd3b4b047d6fd02d5cc4c6987529819f19dbfc3dd741bcf73dc1a6143c7ea5fd64aa8429aefc97b8cb
 EBUILD nvidia-drivers-390.42.ebuild 16294 BLAKE2B f382b9931bd1713c2ccdb8b13cf3c29d0141c56963b4e77be149dc756805f5fa48add582b0046a4fa0d1518aca9da7dfe1fa43c1c59df73280c40feaacf00d07 SHA512 b2eb4c69a145747b196eae24bb7666284ac2117d0a2dcfe875ac90e4eb677c57be1e573089f00e3defe266d13be3e74a2d7a2c7a7fae4aa24355f654b7fc43da
 EBUILD nvidia-drivers-390.48.ebuild 16295 BLAKE2B dd1034da5571b9394ac1aae26d232ac16023558c01537924c58ba230456c472e41e7c3408cf2f65cefe7f0391bcfeaaf4995b78cf8df728c6f18830eb2c1ce90 SHA512 3d9811373b44054e8404450c1117279dd07b6176d988704d40fe869ff55fdedb478a140035a6b4527a7b1835df784ce35ad0b014ba59b9ba337f65adf5991e3a
-EBUILD nvidia-drivers-396.18.ebuild 16088 BLAKE2B 2a1f571ed2e317f33aff59199c945b37161fddbf2594223113a1199c1caf1fc2debdcc836b50c69e5ee64ccc6f50cdb4218433df1b0996766678f90871badb4e SHA512 fee4911de03d1fd8c566b8ddcad32759d0ae506d0bfd6823d40cac3f43ce157c69457f920ec0f4b4e3060c05f6b95b4eb88cdff23535a5557f1575af4881efdb
+EBUILD nvidia-drivers-396.18-r1.ebuild 16128 BLAKE2B 91c34fc1663e605a4847b64e55df47b9d908ed20b5752eb8be508fe13342c5f893298dd75035b57eebfd1e9b2ec2f12d88b69bb484cac36b3561c1aba6222efe SHA512 861802e81439dc58520e4725c94b35316164528b42c5b6b7b57f4f20c183a4275df6b29ccb46a2a8a180a3f2404e2a65889699f0a2ebb33618c6321901502292
 MISC metadata.xml 1275 BLAKE2B df5cb10ac396802437bf6efb3e80226124c11d6167bef2b64c3e525c17fb27213b13d7413ef909469440804a373b6e5c7088c53e0a6b44897860b7276ac3de6b SHA512 464ba5638a5d82a6e6bcbfe11b52759846f9f81e3f223cc313e0059b923427f21dab95b84595d6bffad4441fec96fe5f01044be572b72add8196a812f5682edb
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-396.18.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-396.18-r1.ebuild
similarity index 99%
rename from x11-drivers/nvidia-drivers/nvidia-drivers-396.18.ebuild
rename to x11-drivers/nvidia-drivers/nvidia-drivers-396.18-r1.ebuild
index caacba0061a9..a262278534c0 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-396.18.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-396.18-r1.ebuild
@@ -481,6 +481,7 @@ src_install-libs() {
 			"libnvidia-fbc.so.${NV_SOVER}"
 			"libnvidia-glcore.so.${NV_SOVER}"
 			"libnvidia-glsi.so.${NV_SOVER}"
+			"libnvidia-glvkspirv.so.${NV_SOVER}"
 			"libnvidia-ifr.so.${NV_SOVER}"
 			"libnvidia-opencl.so.${NV_SOVER}"
 			"libnvidia-ptxjitcompiler.so.${NV_SOVER}"