diff --git a/Manifest.files.gz b/Manifest.files.gz
index f18213a6aadb..99a888f99c0a 100644
Binary files a/Manifest.files.gz and b/Manifest.files.gz differ
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 9acae8b81b41..df79c85aa7dd 100644
Binary files a/app-admin/Manifest.gz and b/app-admin/Manifest.gz differ
diff --git a/app-admin/conky/Manifest b/app-admin/conky/Manifest
index e9ded135a752..2ee703460a62 100644
--- a/app-admin/conky/Manifest
+++ b/app-admin/conky/Manifest
@@ -1,2 +1,2 @@
 DIST conky-1.10.4.tar.gz 365145 SHA256 ed61ffb3be9fd24965d40401c7d54553e732038f3da2e03454915779384f59b4 SHA512 665a3c2a9b150576d7c29964dafb7030f5aa5955530142cf0d00f0f49f4a3b320924d389b3a833ef6eb18468000f5c62d918e8f067c7b40cd9e205d0bf0d8e0c WHIRLPOOL 6ca2a043dbc20aaff94bd0c05367b535cd71819543d76dd9a90b79417e2ebb0462c9203901f4e26e887bc249388ec041e0f76dcccf24a88fed9ce4bb532af558
-DIST conky-1.10.6.tar.gz 365669 SHA256 4c80982960b2a72e3e33cef33347c97b9239ed110d9584da4e7f17f28faf60ca SHA512 ddd0b087e89654f8dace7d9682935a802b3bb22b7e65acd25dcc0f06e90b46bee695502d78b6e40a409f8eaffcd65a78d5f861ee6dbcbff6e48f88c2f20319c9 WHIRLPOOL 65a43baf0ec1b5e298a81a062d2aa511488026baf440a470eecc89d15aac010d0f89f86b60a16040ae1941fedbdb46f9aed82431a79f59b7f97439f148b9c5f5
+DIST conky-1.10.6.tar.gz 365669 BLAKE2B 4f072b950083a1352904e9fbc2de016dbb3af93291e308ad2db799381f14880da4e32fa1da5ea1dab568bb782352c249d6200d581916ef3174e222f7a8294cc1 SHA512 ddd0b087e89654f8dace7d9682935a802b3bb22b7e65acd25dcc0f06e90b46bee695502d78b6e40a409f8eaffcd65a78d5f861ee6dbcbff6e48f88c2f20319c9
diff --git a/app-admin/conky/conky-1.10.6-r5.ebuild b/app-admin/conky/conky-1.10.6-r6.ebuild
similarity index 100%
rename from app-admin/conky/conky-1.10.6-r5.ebuild
rename to app-admin/conky/conky-1.10.6-r6.ebuild
diff --git a/app-admin/conky/files/conky-1.10.6-cpu-hotplug.patch b/app-admin/conky/files/conky-1.10.6-cpu-hotplug.patch
index 16adbd8a6908..00e1003617ef 100644
--- a/app-admin/conky/files/conky-1.10.6-cpu-hotplug.patch
+++ b/app-admin/conky/files/conky-1.10.6-cpu-hotplug.patch
@@ -15,7 +15,7 @@ index 664ddf5e..63b3ea40 100644
  			} else {
  				idx = 0;
  			}
-+			if (idx >= info.cpu_count) {
++			if (idx > info.cpu_count) {
 +				continue;
 +			}
  			sscanf(buf, stat_template, &(cpu[idx].cpu_user),
diff --git a/app-admin/haskell-updater/Manifest b/app-admin/haskell-updater/Manifest
index 17e41fe0dbc0..2e3286937a4f 100644
--- a/app-admin/haskell-updater/Manifest
+++ b/app-admin/haskell-updater/Manifest
@@ -1,2 +1,3 @@
-DIST haskell-updater-1.2.10.tar.gz 26586 SHA256 e9712ccaa38bb2ca4242272eee72c72e5b2d0943d7d35c846fccdd89a5428e7d SHA512 c0a72ae77362e5ed4ea0e244449175454119b1284756adeb43534bf58b661f3cabb88e08bd5903d415a9f95a6de309753dedf974ddd853b300fd215250e0ad7c WHIRLPOOL 930975884f1f2b3ae47902cf3e4e88894ee7d4227dbf8bbd06e4f893d00bd715eae5ffd5c78375edf9d43f853da0fcac856492520de350ca1d044ee9da6a1dca
-DIST haskell-updater-1.2.9.tar.gz 26675 SHA256 eafc441bad4f15d60c8686c189d6dd49ea9e87bdddf09a24cef2a3eca9eca859 SHA512 d19b6154d5ef4da176638c237082586688e2ac73a41c075fc3e51979b86b9e48ca5a9bfe6c870d468d66d95c1464456feed8afc388aea282aa7aad5a35f5e0da WHIRLPOOL e28c55e9bd2d9033b42fb42e2db6ff2911a2fb50a5d1ad276d6344ca29b4b05abf73d746604ced6766b983d8a7e6e688534be28ba61f0c62f8aca20d9a46c669
+DIST haskell-updater-1.2.10.tar.gz 26586 BLAKE2B adc46f85118fa55e530aa079ef2df0663b178b15311f4f2ff6474db75aacf1277238a27a2bb98841fc1fe50b556d7f01a677861b3ce9559fe809a02db401ef8d SHA512 c0a72ae77362e5ed4ea0e244449175454119b1284756adeb43534bf58b661f3cabb88e08bd5903d415a9f95a6de309753dedf974ddd853b300fd215250e0ad7c
+DIST haskell-updater-1.2.12.tar.gz 26708 BLAKE2B d0b040cb3b6211b3c5c60f8cfa3dbccbf9cb15d246b21609a21aac746a8a034e284fe0b99891b5035980252a7aa8b376ad943f32882dc29e16226d95583cb053 SHA512 f3a993cb556919bf2e57fdaca7eea9146abc59096e779cbffb69a5c29fc5f6ef889c8ccf4d8331dbd9279919ea91bb05a16d83ad70085d5ef5a44d61120fe7e7
+DIST haskell-updater-1.2.9.tar.gz 26675 BLAKE2B a3d11cdcee886a07d87cd2888a9deea1d963b7234b4a10a6b78e9467fae4e9382c92f14a6ba0593f86bf9422ab2cb4bec823de96f34b463590ae18429c118edb SHA512 d19b6154d5ef4da176638c237082586688e2ac73a41c075fc3e51979b86b9e48ca5a9bfe6c870d468d66d95c1464456feed8afc388aea282aa7aad5a35f5e0da
diff --git a/app-admin/haskell-updater/haskell-updater-1.2.12.ebuild b/app-admin/haskell-updater/haskell-updater-1.2.12.ebuild
new file mode 100644
index 000000000000..5d51680239c9
--- /dev/null
+++ b/app-admin/haskell-updater/haskell-updater-1.2.12.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+CABAL_FEATURES="bin nocabaldep"
+inherit eutils haskell-cabal
+
+DESCRIPTION="Rebuild Haskell dependencies in Gentoo"
+HOMEPAGE="http://haskell.org/haskellwiki/Gentoo#haskell-updater"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=">=dev-lang/ghc-6.12.1"
+
+# Need a lower version for portage to get --keep-going
+RDEPEND="|| ( >=sys-apps/portage-2.1.6
+		sys-apps/pkgcore
+		sys-apps/paludis )"
+
+src_prepare() {
+	default
+
+	if use prefix; then
+		sed -i -e "s,/var/db/pkg,${EPREFIX}&,g" \
+			"${S}/Distribution/Gentoo/Packages.hs" || die
+
+		sed -i -e 's,"/","'"${EPREFIX}"'/",g' \
+			"${S}/Distribution/Gentoo/GHC.hs" || die
+	fi
+}
+
+src_configure() {
+	cabal_src_configure \
+		--bindir="${EPREFIX}/usr/sbin" \
+		--constraint="Cabal == $(cabal-version)"
+}
+
+src_install() {
+	cabal_src_install
+
+	dodoc TODO
+}
diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
index 654bc69ac066..dac92b5672db 100644
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@@ -1,6 +1,6 @@
-DIST puppet-3.8.7.tar.gz 2650247 SHA256 50460a3dd8d25118e25eb01178d09743dabc01cd185f6b2cc723bae21ff023c2 SHA512 f86568d4f33c8c18da270e089e1274ce2e3c705c116b078531bb66656f0bbb9a2fc95effbb8bf5355a082d4f32ce5b44e7f6e316937164aa0d71dd47e654c618 WHIRLPOOL 6e3b754f9e6f40c6037652dc7d746e616871a653640e2a91ab7dd3e70b4240c0b377d0f79c543ca95c5d661046c6431e30f263e0f18998cac0ca3089a4634273
-DIST puppet-4.10.1.tar.gz 2954351 SHA256 271738d2b5aaec8faafd543076ac0d9012fcd6051bccd2f70a66cd479362c605 SHA512 d232f062b93485f7eea8abb9c5420462e313e6050e7335159f051f7c7af86338c006ae4edc09e0e1370784ee7b076911ca563a4cfc6a1f2afc7179bed08d2032 WHIRLPOOL 1a5b8c3fc87fdb4e23196cc13ad46c963cdb6314cfc0e4d3a6d44adad4545289cf41886c6150ee14fcd0d30d9b29f32987c6e31a7c39077a2c53aac7147c69dd
-DIST puppet-4.10.6.tar.gz 2977099 SHA256 19250a3659339961953d48d71aa5951d52bcee3bac0a1e2f45042aa82fcf358a SHA512 f983005d161bbd5fb81dfd15a32cb0ae2417557bd4faa1a62d2fb10fffa55c91ea29c1577785af9642a2878c78405ab99c7e6ee4268fcedcc107c07a0a5bfdd1 WHIRLPOOL 4619f7e89a02560f2c6bd1194b1f50699348fcddf5889628884c807deb0afd9b530883d280db20086a787052d2456ef61b2eef84854e95724562f1a0225b2640
-DIST puppet-4.10.8.tar.gz 2979824 SHA256 2a11f9230f2b681173107fcfe6574dc38d8061c7d369fa88525dfb652fb7f198 SHA512 9f3384702dd4938e1e00aeceb0745b760de32000e0dd59d5b846d1120a46026499176a51d0409e3a0ae414efc0872854c204d1941385695a4c57c209fbd1f28d WHIRLPOOL 06ed0f915786e6d0c5698a8bebfb68628d96b236b667ec44c994c043949cb4a47c8d42b2fbe8391178f38862fe816237d28501b4e39a6326d74ef2d62eb438eb
-DIST puppet-5.1.0.tar.gz 2734018 SHA256 ceb8059704d2e79c1f9147716b596261e1c6c38da3313a2283def777ecf9193c SHA512 07019f40c5b7f18243f13abb899c2ff2ea4b135895ab98c13da3df50f8e720e2759f8eb39e349ff04286da7de504cffea3df8acf9711e8591b25001a2a3f9c15 WHIRLPOOL a5e4e44c68a503307b01729546121a03a0271bc68f8db139e7d52981f9ce9f6db4e24b18a252633794e7de1c7aceb6d833c817a291099081b31190060bb59d50
+DIST puppet-3.8.7.tar.gz 2650247 BLAKE2B 20728a12c9c123f4a366ee89b25235fd73215a764ebe7fbd5f618d99f8db06935845778d3759722ccaf6f6a68536ea6de34a413824afba777d72e11d0543e864 SHA512 f86568d4f33c8c18da270e089e1274ce2e3c705c116b078531bb66656f0bbb9a2fc95effbb8bf5355a082d4f32ce5b44e7f6e316937164aa0d71dd47e654c618
+DIST puppet-4.10.1.tar.gz 2954351 BLAKE2B 6cf8ac28d8c09f4b82956b3fc8ebc17c0ec35c77818797e5101d03e099850b75fcfa35ec19bd351bcb51fb1d5071541f4f2b8b3be9eada3d21c00c8d8108aa95 SHA512 d232f062b93485f7eea8abb9c5420462e313e6050e7335159f051f7c7af86338c006ae4edc09e0e1370784ee7b076911ca563a4cfc6a1f2afc7179bed08d2032
+DIST puppet-4.10.6.tar.gz 2977099 BLAKE2B fea4ece994c9ee639bdc4a079760b04286e8d9804dc502c7598add658cd7abc975d74fcce49dc63223a6696565e8be6f6a2c495bf4cf40aded314d36f1ce839e SHA512 f983005d161bbd5fb81dfd15a32cb0ae2417557bd4faa1a62d2fb10fffa55c91ea29c1577785af9642a2878c78405ab99c7e6ee4268fcedcc107c07a0a5bfdd1
+DIST puppet-4.10.8.tar.gz 2979824 BLAKE2B 802b65d48ff7d8303e3cc847a9f753a5e19c0ada6ee02dc1fc9c748da8d69462c34bdfeddeedf0057179ff1133665439c41e970c41ca1728463292ef26e996ab SHA512 9f3384702dd4938e1e00aeceb0745b760de32000e0dd59d5b846d1120a46026499176a51d0409e3a0ae414efc0872854c204d1941385695a4c57c209fbd1f28d
+DIST puppet-5.1.0.tar.gz 2734018 BLAKE2B d4169fee328710b7685de2606196de68e21ca31f9a9945bdd84255f5185fd2d95c6543a7b88b5130f1f01e60e04294664de71a8ccd1319c2e0bebf4d031e6225 SHA512 07019f40c5b7f18243f13abb899c2ff2ea4b135895ab98c13da3df50f8e720e2759f8eb39e349ff04286da7de504cffea3df8acf9711e8591b25001a2a3f9c15
 DIST puppet-5.3.3.tar.gz 2843386 SHA256 45360f64fe0375df617571d58e929515e2094daa1d0dc78e2b6718d7cbeaf18e SHA512 b5bb9ac4059855c7cac624ea0fdc2c3366cea82bf07bee195a179a0a709fa53e7fffe883e581c1e07a64705a638b156288301227f7334226ddc401a9bf770afe WHIRLPOOL 19c8511ba58186692ee0ace02158c16529715cc213f0eb7266bb078a10db6e698081edc4b3e0735f1e79fb568066cc6f1699d0b1a954a29d74d1a91f393130fa
diff --git a/app-admin/puppet/puppet-4.10.1.ebuild b/app-admin/puppet/puppet-4.10.1.ebuild
index 0b1f70e67d94..77b1ce4bfcd7 100644
--- a/app-admin/puppet/puppet-4.10.1.ebuild
+++ b/app-admin/puppet/puppet-4.10.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
 
 LICENSE="Apache-2.0 GPL-2"
 SLOT="0"
-KEYWORDS="amd64 hppa ~ppc x86"
+KEYWORDS="amd64 ~hppa ~ppc x86"
 IUSE="augeas diff doc emacs experimental ldap rrdtool selinux shadow sqlite vim-syntax xemacs"
 RESTRICT="test"
 
diff --git a/app-benchmarks/Manifest.gz b/app-benchmarks/Manifest.gz
index 909222d2a887..26055b51b4cb 100644
Binary files a/app-benchmarks/Manifest.gz and b/app-benchmarks/Manifest.gz differ
diff --git a/app-benchmarks/tiobench/files/0.3.3-LDFLAGS.patch b/app-benchmarks/tiobench/files/0.3.3-LDFLAGS.patch
deleted file mode 100644
index 9145ae47044a..000000000000
--- a/app-benchmarks/tiobench/files/0.3.3-LDFLAGS.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur tiobench-0.3.3.orig/Makefile tiobench-0.3.3/Makefile
---- tiobench-0.3.3.orig/Makefile	2002-03-13 20:22:55.000000000 +0000
-+++ tiobench-0.3.3/Makefile	2006-09-16 17:07:21.181644608 +0000
-@@ -34,7 +34,7 @@
- 	$(CC) -c $(CFLAGS) $(DEFINES) tiotest.c -o tiotest.o
- 
- $(EXE): tiotest.o crc32.o
--	$(LINK) -o $(EXE) tiotest.o crc32.o -lpthread
-+	$(LINK) -o $(EXE) $(LDFLAGS) tiotest.o crc32.o -lpthread
- 	@echo
- 	@echo "./tiobench.pl --help for usage options"
- 	@echo
diff --git a/app-benchmarks/tiobench/files/0.3.3-column-description-fix.patch b/app-benchmarks/tiobench/files/0.3.3-column-description-fix.patch
deleted file mode 100644
index b3ebb90b33e1..000000000000
--- a/app-benchmarks/tiobench/files/0.3.3-column-description-fix.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- tiobench.pl	2005-02-23 00:21:33.000000000 +0100
-+++ tiobench.pl	2005-03-15 18:11:19.000000000 +0100
-@@ -168,6 +168,8 @@
-                   $stat_data{$identifier}{$thread}{$size}{$block}{$field}{'stime'} ) / 
-                   $stat_data{$identifier}{$thread}{$size}{$block}{$field}{'time'};
-                $stat_data{$identifier}{$thread}{$size}{$block}{$field}{'cpueff'} =
-+                  ($stat_data{$identifier}{$thread}{$size}{$block}{$field}{'cpu'} == 0) ?
-+                  '0' :
-                   ($stat_data{$identifier}{$thread}{$size}{$block}{$field}{'rate'} /
-                   ($stat_data{$identifier}{$thread}{$size}{$block}{$field}{'cpu'}/100));
-             }
-@@ -196,6 +198,9 @@
- $report{'SEQ_WRITES'}   = "Sequential Writes";
- $report{'RAND_WRITES'}  = "Random Writes";
- 
-+# The top is the same for all 4 reports
-+$^ = 'SEQ_READS_TOP';
-+
- foreach my $title ('SEQ_READS', 'RAND_READS', 'SEQ_WRITES', 'RAND_WRITES') {
-    $-=0; $~="$title"; $^L=''; # reporting variables
-    print "\n$report{$title}\n";
diff --git a/app-benchmarks/tiobench/files/0.3.3-glibc-2.16.patch b/app-benchmarks/tiobench/files/0.3.3-glibc-2.16.patch
deleted file mode 100644
index fed845a51d62..000000000000
--- a/app-benchmarks/tiobench/files/0.3.3-glibc-2.16.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -Nur tiobench-0.3.3.orig/tiotest.c tiobench-0.3.3/tiotest.c
---- tiobench-0.3.3.orig/tiotest.c	2001-03-05 02:34:00.000000000 +0000
-+++ tiobench-0.3.3/tiotest.c	2012-11-04 22:44:41.695677071 +0000
-@@ -31,7 +31,7 @@
- */
- ArgumentOptions args;
- 
--static void * aligned_alloc(ssize_t size)
-+static void * tio_aligned_alloc(ssize_t size)
- {
- 	caddr_t a;
- 	a = mmap((caddr_t )0, size, 
-@@ -281,7 +281,7 @@
- 		pthread_attr_setscope(&(d->threads[i].thread_attr),
- 				      PTHREAD_SCOPE_SYSTEM);
- 
--		d->threads[i].buffer = aligned_alloc( d->threads[i].blockSize );
-+		d->threads[i].buffer = tio_aligned_alloc( d->threads[i].blockSize );
- 		if( d->threads[i].buffer == NULL )
- 		{
- 			perror("Error allocating memory");
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index cc7a32349bbd..3e0fb67658ea 100644
Binary files a/app-crypt/Manifest.gz and b/app-crypt/Manifest.gz differ
diff --git a/app-crypt/libb2/Manifest b/app-crypt/libb2/Manifest
new file mode 100644
index 000000000000..44054d6b9678
--- /dev/null
+++ b/app-crypt/libb2/Manifest
@@ -0,0 +1 @@
+DIST libb2-0.98.tar.gz 275076 BLAKE2B 7c0aa473a58a5ceb6e913487cc6f0078e6cab661bd26cb1f5611473b430213521a23adbde227da6d7561b4d581369e268308ae6b2a10da5399c0d2d6ab288b26 SHA512 be400d16ab00b3006ec7412dcbf580427600f4997cee19c0448d849ff8bbbb58bbb7be3d49e4052cb1b6791b6bed9c9cc48b51da3ec77b2fdf3d197ccf0c8073
diff --git a/app-crypt/libb2/libb2-0.98.ebuild b/app-crypt/libb2/libb2-0.98.ebuild
new file mode 100644
index 000000000000..08bf237662f2
--- /dev/null
+++ b/app-crypt/libb2/libb2-0.98.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools ltprune
+
+DESCRIPTION="C library providing BLAKE2b, BLAKE2s, BLAKE2bp, BLAKE2sp"
+HOMEPAGE="https://github.com/BLAKE2/libb2"
+GITHASH="0d7015f6a640a63bc6c68562328e112445ea9d5c"
+SRC_URI="https://github.com/BLAKE2/libb2/archive/${GITHASH}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="CC0-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64"
+IUSE="static"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${PN}-${GITHASH}
+
+src_prepare() {
+	default
+	# fix bashism
+	sed -i -e 's/ == / = /' configure.ac || die
+	eautoreconf  # upstream doesn't make releases
+}
+
+src_configure() {
+	econf $(use_enable static)
+}
+
+src_compile() {
+	# respect our CFLAGS
+	emake CFLAGS="${CFLAGS}"
+}
+
+src_install() {
+	default
+	prune_libtool_files
+}
diff --git a/app-crypt/libb2/metadata.xml b/app-crypt/libb2/metadata.xml
new file mode 100644
index 000000000000..5ef83e989e93
--- /dev/null
+++ b/app-crypt/libb2/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>grobian@gentoo.org</email>
+		<name>Fabian Groffen</name>
+	</maintainer>
+	<longdescription lang="en">
+		C library providing BLAKE2b, BLAKE2s, BLAKE2bp, BLAKE2sp
+
+		Official implementations from BLAKE2 project.
+	</longdescription>
+</pkgmetadata>
diff --git a/app-crypt/rhash/rhash-1.3.5.ebuild b/app-crypt/rhash/rhash-1.3.5.ebuild
index ae45a3261d4f..652f90180707 100644
--- a/app-crypt/rhash/rhash-1.3.5.ebuild
+++ b/app-crypt/rhash/rhash-1.3.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="debug nls openssl static-libs"
 
 RDEPEND="openssl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )"
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 3d95f83accd2..e11ef1527c0d 100644
Binary files a/app-editors/Manifest.gz and b/app-editors/Manifest.gz differ
diff --git a/app-editors/e3/Manifest b/app-editors/e3/Manifest
index 5c6c02eae1d8..1d01bc2c47ab 100644
--- a/app-editors/e3/Manifest
+++ b/app-editors/e3/Manifest
@@ -1 +1 @@
-DIST e3-2.8.tgz 119939 SHA256 035737d0cc82b287386fdff8682b2c23ef620d7ef97dff7a1b1fe1777e4c4fb7 SHA512 f3443ac558203b6921458761174ebc060936ae9f8a834670044152b9af52e0919075ac8110ba47b4b6f4e8261afa917e9fe49492b8d40d38d69987353ddd5189 WHIRLPOOL 9531a30229fe78bb2f55621d085d561923cae4b7db6c91f46320c81516936389f765fa0ef8bc65c19fefae40a60e50b5541f1e751a03aabf56d6b57dbf4cb165
+DIST e3-2.8.tgz 119939 BLAKE2B b0882a359126d392a3e24971b1f2e39572bbbe0d95f388a4b75e8cc3e4424e798ddc381c9489ca65452668884abbacc2c27c33b6c7f230a6eb4d44986313a42c SHA512 f3443ac558203b6921458761174ebc060936ae9f8a834670044152b9af52e0919075ac8110ba47b4b6f4e8261afa917e9fe49492b8d40d38d69987353ddd5189
diff --git a/app-editors/emacs-vcs/Manifest b/app-editors/emacs-vcs/Manifest
index 43ce88986349..64a131bd1d9c 100644
--- a/app-editors/emacs-vcs/Manifest
+++ b/app-editors/emacs-vcs/Manifest
@@ -1 +1 @@
-DIST emacs-26.0.90.tar.xz 43908428 SHA256 efb27124cb8f3eeba9472f4f5774b5d9bf4f87fd4d6023aae78469fb5667cf2c SHA512 c263d1d1a12d8b21cc43ddcb46a28ce3a54d0ef09e240518f19bfdabf4c4ceebc3c2d1521aae9808cafdd3e731c93dd22b4f1e7e619e38076aa4ffdbaadea93b WHIRLPOOL 383b4e2fb73a9cfc825859a2f3b791dfbc0ef186fe5c25126e1d562aff27900f5bad452725f62dedb3be5492b365dff80e30d64a3cff709e305697662f252ada
+DIST emacs-26.0.90.tar.xz 43908428 BLAKE2B 20858eb7b06b488451ebdffd7cedf28055f38cb45960c2b74c926204be1225cff297a8ce95a4cf535349fe73b24c9e5347fed3c3decf55492c82daca9fb470c2 SHA512 c263d1d1a12d8b21cc43ddcb46a28ce3a54d0ef09e240518f19bfdabf4c4ceebc3c2d1521aae9808cafdd3e731c93dd22b4f1e7e619e38076aa4ffdbaadea93b
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index 6d548429ccbd..f2d63430bc7d 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -1,12 +1,12 @@
-DIST emacs-18.59-linux22x-elf-glibc21.diff.gz 15671 SHA256 fb810d893938883d50a3a8d7c43fbeb1604d5454f760b8f1f700326c8ee659dd SHA512 c6c6ea33850dadf08d68fff56fc6aacc80ad1aa36661260715d50b95438942d56e6244094427d50356cfe716f26559feb885254c436399bff7be639637d605b6 WHIRLPOOL cafaa0fb0d06058cac8e445a7a1b5cba145d23186477a9c681efdab8ca0f18a9675dec3a93851fd7138890701f83fab83300c28a548c8fc22478a0cfff95d5da
-DIST emacs-18.59-patches-9.tar.xz 21380 SHA256 69411c57b20850e8aab1e20614437f9a836c2ddf47c46a833d0262c138fa3270 SHA512 595a4a7a4052c3b3325e4d4952eed24c98d3dd62b7ce89bd149f046552e2dd67ec3e720b7559fbc086b06a667c992bccc60201ef53b263dbd0fc96cbcdceee38 WHIRLPOOL 23f803d940c35fe9519fe7169e6bca7012c2d2db2246dec121fba37e8dbf39f411a9e579a9cbd4193562da72b9ac226286ad687877ccadd7cb78ea7eb615ab3f
-DIST emacs-18.59.tar.gz 2962652 SHA256 1e27e33f91984a91e9b4c1f21433f931aba03670960ecc147bb6d7b0de0f051e SHA512 03ce565e346e89b7aacb1852f4783e8907f394de7da0c543b475cb038eb89b87f980d0f7ca1841b1d2108b20f211e95113c7214e4a33e5767a1827ff43173f33 WHIRLPOOL 5e98e71518f665e2a8278afe54e0ace6d7fdd9df23ff0a3354ffc1d5cc25cd21b0dd4d82766fcb436d4f24e9291c933295e956e1ffea43cfeedf915175763be6
-DIST emacs-23.4-patches-20.tar.xz 18544 SHA256 3ea6d9211b03ee5566674bf1ae3d4032c0921234c1612af66407e880f7e52749 SHA512 cf98090327a1963625b91149d8ff66e9ec4dc8c0bb1054eee138429b5c0d39c2a4662ae5425d7f06e7e69a17d28353f163ca38f6fe786d10def8e143f8a6b1d6 WHIRLPOOL ac3283271d71dc43595fc95dd8930e5888ef7d22cbd19c4701206ebc5aaac8178f462b789a058bb3ae6c9a17c63c0f2a16185708c4517566de50fc035298fe31
-DIST emacs-23.4-patches-21.tar.xz 19604 SHA256 b8974eab444e90b2327a3023e7c385df1a7c0e5c583a675ef3cf5f1730174535 SHA512 135eda432de64200797456d594f7de811275a7adf792d10a1c3a51ca4bbbbaa3a2c682b9fd577c4d93fbce967ca08d4ac47eb45f031477c3e44c69c14d5d5b48 WHIRLPOOL 0f746ca161861c128a9d15bc7590954c5a6242c1af495bc65e9bb9c1da3a536ca92755660d0b719155bdb3d3ad18b0d14d820e271c566c97428ea4221b76adce
-DIST emacs-23.4.tar.bz2 38646508 SHA256 26576f9e664397c729f78f5ffcd092969251988461896fe8793062346ee988b9 SHA512 def7a95ecaefae24d8102b96b1d575a23def1b11a8f0bb17b68f7913bd118e2ea4449a8feee76c1bd649f099b70419f0d494ddd9bb32b26f92720cda842b0296 WHIRLPOOL 2384c3f63ff153c3975e373334d6021d46b23ad3cab448ed2e1180501236453a61d13bf1dfbb2e6075bb141dd8511d85f77e37c763b39769f98de48eacc56f3b
-DIST emacs-24.5-patches-3.tar.xz 12500 SHA256 4927e037141c0c242d0d6d3aa7dfde140faae361aa556e6ded64b7ab26819f07 SHA512 9bddca3d4a67b57ca03c26fbca378def345592a95c40e868fc47fd9944ed0f750bc30f3a4d588a8a0b4c90daa6c9ed63b56182e8d2d87b4c8d849bf834ead1cc WHIRLPOOL c16cbfda1040b205ced4c1ed120aad6f65285fb315ce89dc936e6a357fbc8f9215fb178b696d2a914c53c6869384f0b1b56fcb6b84c5438f026101b4989de6c5
-DIST emacs-24.5-patches-4.tar.xz 13632 SHA256 3b2d7c2034711d114494745780b6521150aa0c524966cbaceeb8d4d053dcbdd3 SHA512 569c3a55aaf1102c0bae4ab25ee06372763cd2de8a54e26b3eefd54e585cf90b53c8ffe1ca48eb4fd312a340380fd3f2fcdb584697814bf429129b48fa56ffb5 WHIRLPOOL 1855ac4178faafcc2d86141e023ff2626246c87e7ff2e7bfbaf9a989e9a48d2767acb9f7af99924cd7db04d34913a42764490831b7b45a34bcd131999180ff28
-DIST emacs-24.5.tar.xz 39759804 SHA256 dd47d71dd2a526cf6b47cb49af793ec2e26af69a0951cc40e43ae290eacfc34e SHA512 89dee4c3aadb6e505c523f84c65b5e40e5bf28a586cc8a4518a59581c22972f942bb6f3c772df0d5b2685c3e78247c545c6bb2576e981d1ef0f9298c18ad1677 WHIRLPOOL 3d9f8fb840f4c846246e642369f967ba0ec357c7cf718ed865523a3cd39605ba14b8c15fc9ae3f076c27e5b6e41fcb681d15f1c6ffc5934430c0a2bf47c233a3
-DIST emacs-25.2-patches-1.tar.xz 2104 SHA256 ea0ba1cf1fb06eb76907cc034acb440af1147bdc0fa849ba8185d016fe58e4ff SHA512 45c666ba6332c8fb60a925c6af9c0da113f46055159d931feddb99ce19b2a03e0101b3a4d671fe699cd5f33fd58a25791bfb8b16e20f463e5d304902ee24854a WHIRLPOOL 97c49266b7be18f028ae939dbdcfd3933637770506f108fcd9d08fa33c63f376fbb6fe520e42ec28adb6d4527c298173bffe596af774748946a3d8a130aa90f7
-DIST emacs-25.2.tar.xz 46900336 SHA256 59b55194c9979987c5e9f1a1a4ab5406714e80ffcfd415cc6b9222413bc073fa SHA512 2485d5ccd58ecc953cbd2458bdfa45e3c9a6ddfdb1b93c72b957a0da2460d4e42092905e039e8f5bac337ea1ecb9ac404b28702a363323ee5813b30032ebf00c WHIRLPOOL 98de8ad164cf65b21e5fbfdbd7fcee84da32e3de66715d2f03f3c4d03cfa68d49aff2124e5da331282bb5fd9c2b2fbac4ddfd0985e907d2354994c783dddd83f
-DIST emacs-25.3.tar.xz 42854740 SHA256 253ac5e7075e594549b83fd9ec116a9dc37294d415e2f21f8ee109829307c00b SHA512 1cce656451b6ca8502ebb229e88bd3ef48b7f9444a10eeac4ea43bd5491b2efacd641dfa35227a33362c3866493d3449cf1df81606563eef44bba0ed668e457f WHIRLPOOL 603ec6b203523a22556e48616b4a5ab227c32d3653ac4b713e6cb0357e3556964bc92a1818b417bbf9037cca7dac55935da9458dc3d29b3bb24d66157e74c8df
+DIST emacs-18.59-linux22x-elf-glibc21.diff.gz 15671 BLAKE2B 0106fe8053b4f65f384d451ca85138991a57afaca16b32035585055bb877c039af826859fa58c4660ec80664d3bfb0ee7a757ad76381c150ebcb22cb333a98d6 SHA512 c6c6ea33850dadf08d68fff56fc6aacc80ad1aa36661260715d50b95438942d56e6244094427d50356cfe716f26559feb885254c436399bff7be639637d605b6
+DIST emacs-18.59-patches-9.tar.xz 21380 BLAKE2B 5c61b1894d10f3c8583de5fb2b07d2e5741d1034f859d8e77dc9499e2567c158f5567de7dbe814e9d991eb20536fb28f1df064a2256437fd4021d8951fb29de1 SHA512 595a4a7a4052c3b3325e4d4952eed24c98d3dd62b7ce89bd149f046552e2dd67ec3e720b7559fbc086b06a667c992bccc60201ef53b263dbd0fc96cbcdceee38
+DIST emacs-18.59.tar.gz 2962652 BLAKE2B d617636daff41e672af2dcda26ec24b2495cf0a3e6373561ee26a2a922b7252c074dd6b79289d771853a4720c60f084f5726b904bf65989718173232ac874b0b SHA512 03ce565e346e89b7aacb1852f4783e8907f394de7da0c543b475cb038eb89b87f980d0f7ca1841b1d2108b20f211e95113c7214e4a33e5767a1827ff43173f33
+DIST emacs-23.4-patches-20.tar.xz 18544 BLAKE2B 57b8d8b357ea991bee00968b322f83e0d774fdaa4f90b97b991958df7bf3c0fd74d61a328edcbf7af954288434e5a46a4ba1622cf42b3c70fee110d0e291abd4 SHA512 cf98090327a1963625b91149d8ff66e9ec4dc8c0bb1054eee138429b5c0d39c2a4662ae5425d7f06e7e69a17d28353f163ca38f6fe786d10def8e143f8a6b1d6
+DIST emacs-23.4-patches-21.tar.xz 19604 BLAKE2B 97327f2079c496c28122203d233a12199a3c11a8c4efb2107247a4ca4483b898467d73d19d4f0570ec7be2a49dc5f6bd1bc9ee0811f932e7deb6b1c4ca96e362 SHA512 135eda432de64200797456d594f7de811275a7adf792d10a1c3a51ca4bbbbaa3a2c682b9fd577c4d93fbce967ca08d4ac47eb45f031477c3e44c69c14d5d5b48
+DIST emacs-23.4.tar.bz2 38646508 BLAKE2B 33dac5d27a63b7aab6b4053964a0ecf7f7939c7aea5af15103f2da7bd34fbb18dba7a1bf44cc4fcc2e3fb1439cdf7085d8dfc4b0005f5485748996e75ca6872d SHA512 def7a95ecaefae24d8102b96b1d575a23def1b11a8f0bb17b68f7913bd118e2ea4449a8feee76c1bd649f099b70419f0d494ddd9bb32b26f92720cda842b0296
+DIST emacs-24.5-patches-3.tar.xz 12500 BLAKE2B d4a0452fdc1e95306bb7eea41885baf6a75629a08a3e500788bf979beb31792406cc2cbd4ce39320d3bc237741f1ce21f6a2ad7fdec2187a43f7ebeab3128d40 SHA512 9bddca3d4a67b57ca03c26fbca378def345592a95c40e868fc47fd9944ed0f750bc30f3a4d588a8a0b4c90daa6c9ed63b56182e8d2d87b4c8d849bf834ead1cc
+DIST emacs-24.5-patches-4.tar.xz 13632 BLAKE2B 99e70f4ee32c1ba3a66b934de692437aaf0b83eb6fa841ce4569bc58e2bd12802890c2a8496375280c0ce8fa56515918dfdcbc958f349bc2472104e37ad1fcd1 SHA512 569c3a55aaf1102c0bae4ab25ee06372763cd2de8a54e26b3eefd54e585cf90b53c8ffe1ca48eb4fd312a340380fd3f2fcdb584697814bf429129b48fa56ffb5
+DIST emacs-24.5.tar.xz 39759804 BLAKE2B aec253528038686822d1f8ed9a52dff276789ef7744053fc9b6176fceba4d4d8684fe979cf97e756b3feaf734d2377baef81f5efaa5450930a4e94d9f3bca355 SHA512 89dee4c3aadb6e505c523f84c65b5e40e5bf28a586cc8a4518a59581c22972f942bb6f3c772df0d5b2685c3e78247c545c6bb2576e981d1ef0f9298c18ad1677
+DIST emacs-25.2-patches-1.tar.xz 2104 BLAKE2B deae1dcaf5c32dcdab365ffab53976158148a125deff2a0373c7da5696c48c36f87f8388fc8f64ab08b3bfcbf694011b58235e972d4bc0e101ca6bbcec779abf SHA512 45c666ba6332c8fb60a925c6af9c0da113f46055159d931feddb99ce19b2a03e0101b3a4d671fe699cd5f33fd58a25791bfb8b16e20f463e5d304902ee24854a
+DIST emacs-25.2.tar.xz 46900336 BLAKE2B 4bcb1dbf1647e1abd1006f586f5e465fa9ced78a87a3bc6edd7de7adb3b4145830b9cd7d889811882603a6f4be74e38626a80ab7d097d3331f42e811f3a93710 SHA512 2485d5ccd58ecc953cbd2458bdfa45e3c9a6ddfdb1b93c72b957a0da2460d4e42092905e039e8f5bac337ea1ecb9ac404b28702a363323ee5813b30032ebf00c
+DIST emacs-25.3.tar.xz 42854740 BLAKE2B 4f4e2572bbef48b75c561497fc22046081e56099b6174725d79b15a5b16d5c886eaf8ff3f75cf561e989ebb092ab9e98ba7503e720a9db7560758b30d5116f23 SHA512 1cce656451b6ca8502ebb229e88bd3ef48b7f9444a10eeac4ea43bd5491b2efacd641dfa35227a33362c3866493d3449cf1df81606563eef44bba0ed668e457f
diff --git a/app-editors/emact/Manifest b/app-editors/emact/Manifest
index 575bdfcbf562..daac0ab26499 100644
--- a/app-editors/emact/Manifest
+++ b/app-editors/emact/Manifest
@@ -1 +1 @@
-DIST emact-2.56.0.tar.gz 578640 SHA256 dfe5c17ed6bab49bdb46425bf616a6ce689b73f498a61c094eb97d1765007e57 SHA512 96fce3bf3e00e84abd9de0778a02cfd284689073391e6f9eb3bb4a54e8899ae32d9e8acd45d0f1d575e36f171ca148fc574c9ecc71615df9a9907ee1d30bb99d WHIRLPOOL 8d4e821c4a24c3cb2b9a5ca898a9a8e0d245242c1c0f8e2986212939d772df503222023d19918b32276e3061d92c7dbe6292a720a0255464e614254c7f7d742a
+DIST emact-2.56.0.tar.gz 578640 BLAKE2B 2bdf0a88003c0cbd28153737eac588dbb068ed99a1166dc66a5fac33f91d2b3c7e058518733c6eddbfeb3291f3ad89dd4a6bfc4b11ccda0963a314a5fbf4e2b0 SHA512 96fce3bf3e00e84abd9de0778a02cfd284689073391e6f9eb3bb4a54e8899ae32d9e8acd45d0f1d575e36f171ca148fc574c9ecc71615df9a9907ee1d30bb99d
diff --git a/app-editors/ersatz-emacs/Manifest b/app-editors/ersatz-emacs/Manifest
index bcbfd55be3b0..8f9d80ad6dc7 100644
--- a/app-editors/ersatz-emacs/Manifest
+++ b/app-editors/ersatz-emacs/Manifest
@@ -1 +1 @@
-DIST ersatz-emacs-20060515.tar.gz 45581 SHA256 7585aaa0aba1232204332ecf91906e0d74da9cb33dfa2889e45bcf0f251f99a5 SHA512 c30ede63ebb44076762aa430a73c73d3fa3bcd0e3d0016162aab31347257124479f464a1003012f7418e807abfd3c613c81f5196ccf65b0cb3f939b7ad5c989d WHIRLPOOL 0c19be0c1b891abf4e09d641e56008743da7297a5d6b3fa48de14b75e5a5d1bc2e9caf53d96d995a0807e47618d091bbb1348ee781bc980f2a1a79d0f582b71d
+DIST ersatz-emacs-20060515.tar.gz 45581 BLAKE2B 641cad2f5a873b0c70743a6f60ffc31615bb8789d5c6a100a67aaa82c59e7a83d35023eb596303ef0160e3ff561c89e5814b685a7a650aa4625326e86ec4fdf3 SHA512 c30ede63ebb44076762aa430a73c73d3fa3bcd0e3d0016162aab31347257124479f464a1003012f7418e807abfd3c613c81f5196ccf65b0cb3f939b7ad5c989d
diff --git a/app-editors/fe/Manifest b/app-editors/fe/Manifest
index 4cfbe51edacb..b9eac49345e4 100644
--- a/app-editors/fe/Manifest
+++ b/app-editors/fe/Manifest
@@ -1,2 +1,2 @@
-DIST fe-1.8.tar.gz 169151 SHA256 ee8473dd37662b8a8067005bc0f258389057281981c5034fcad6a7b4e4786013 SHA512 c00f23769193b8b74867da32e7424ecb7f807a0186c8f91cd007f83a543777e1ca70909ee17a54ac8e7da743cd3fcb6b0e8cdd6d2fefbfb6766122ade125893b WHIRLPOOL 226af461ce132dcd5d524898971d948dbe61e18fd1e37e58a9e417a4cd754ac04782eea350a9a1bcd7164db4c2843faa2e006cec35400d36d83dc275e3a890e5
-DIST fe-1.9.tar.gz 178678 SHA256 3221e946f95271b88e73b19964e04a6848984824e1ddd0925fc7b191f741a689 SHA512 38121a21c1539ff8ad4f61b92ddfd0582c100f1bc1c5524faf7a60a162c5f8a0b2d1528da7719e522e9b75a527166223c2636f78c9f516abbb33434a9f6e6251 WHIRLPOOL f556433b2100e34100e909d40cdad411ebfe6a0a780c411a1bf58a9c380615de609711b9a1ced7442c6d05e24036183eb19551297fbc74cf589a0eb20b9a1cc1
+DIST fe-1.8.tar.gz 169151 BLAKE2B 82ce56137ac462982e314e20f027f3e325b5810b778efe5503624728b48a4e06f6e60c668e35ca8bb70d2bfd07f4d6083d487ac83f382e760451e26a9721ac4e SHA512 c00f23769193b8b74867da32e7424ecb7f807a0186c8f91cd007f83a543777e1ca70909ee17a54ac8e7da743cd3fcb6b0e8cdd6d2fefbfb6766122ade125893b
+DIST fe-1.9.tar.gz 178678 BLAKE2B 144d8edf2f6bf38f75b7e5593d0fb9d9e3fc4a7e91d974f49fa5f7974ee1e077dbdee4ee25931b34691032c0d4e676ab6b03e4de646947a4ea133876213285d9 SHA512 38121a21c1539ff8ad4f61b92ddfd0582c100f1bc1c5524faf7a60a162c5f8a0b2d1528da7719e522e9b75a527166223c2636f78c9f516abbb33434a9f6e6251
diff --git a/app-editors/jasspa-microemacs/Manifest b/app-editors/jasspa-microemacs/Manifest
index 0994b321db4b..6d13d7ac036b 100644
--- a/app-editors/jasspa-microemacs/Manifest
+++ b/app-editors/jasspa-microemacs/Manifest
@@ -1,4 +1,4 @@
-DIST jasspa-mehtml-20091011.tar.gz 628008 SHA256 c106af1a7a1bd5862883ae237ae8a27dccfa30f300944211995658bcfb8621d0 SHA512 0328ad7af88b98840c76003c15461f45cba9f54b7935330ec881c588cdd02ee937684ce42c1889f7ca311cc80bd027ae6cb6b088c5ed5105107b22b384780a4e WHIRLPOOL cb5025c8ca711911d2e54c518a906e39c9ac31936853840bb6aa65e8873150eb4070c7ca53900044de44200d7ac596a6fc81ab39e8b2beadfe6af67d851b43e6
-DIST jasspa-memacros-20091017.tar.gz 1105437 SHA256 aa23d2bb4d5d5b87eb8aa5a28439ff1bcdd2162c5c14a186b84366c06691aa2d SHA512 08908acac4dbe56695362172dabe621b8cca77a35da599c6cf5b4e87700c03f4ee190ca12d5c69b2d88c623cec527daac0980dec2ed713ff563e88ebe636a725 WHIRLPOOL 2f36d5d280d0ec6dee793a6783ccfd860eca6622824b7a3727778564bebf91f05c5d77b2e4a9b464f078cf26de903aa42c25ac849752d33b480c8723203c11a4
-DIST jasspa-mesrc-20091011.tar.gz 810128 SHA256 44109a9118da34a1d026450ec85a3f85d983c4015c97db2b9abbad69e8d90889 SHA512 60cc5a83b3cafd8e517f88732dc94feb0329b962bc714eaa5616ba89776fbfac41833be88fd3a666443291184086494434fb8763747c1dc5e216ce793b694b68 WHIRLPOOL a896c4eb594c4cbc126c2980cf8efaf1f6f07b4846c3d70f93ee842ec9a719b04fd85e8c390a34091e5c913676af371bc2c28500cd9f223ebf4fa73e8778f635
-DIST meicons-extra.tar.gz 43345 SHA256 d56864a6abccda2b6f79b8b86c545ae4b2abb40b8761cd97bda986aed454e8ef SHA512 bb6879fb12ec1c7b346bc1df2412a837ffdd0569f6be2800a433307a7736bb31798b3c2a71e02cebdce39c59d93d1a986f80c92184604e4292606c98285fe02a WHIRLPOOL a33c89b4c9f47a82273d7789b397893402cb8d35b625d5f6378007062527b7510e86cb2d614a21757c98205508f10cf6fb8e2c65c72d4585735f8445bfa2135b
+DIST jasspa-mehtml-20091011.tar.gz 628008 BLAKE2B 97c8326e7acfdc4bc4ddd2ef6bbcf0384f114cfe1487d1ab5f456b0b64ea87a2410ce644860a33c863224e4dc66a476a63881d865455a62a5ce5a0877d03bfc4 SHA512 0328ad7af88b98840c76003c15461f45cba9f54b7935330ec881c588cdd02ee937684ce42c1889f7ca311cc80bd027ae6cb6b088c5ed5105107b22b384780a4e
+DIST jasspa-memacros-20091017.tar.gz 1105437 BLAKE2B 0a74715db55498fed646f209a9121a96c673cb34c487968c4f838bacf6404db717fbd8392d26f8fa120174923724af91e4a14bda088bf229765d1e99c785d8ba SHA512 08908acac4dbe56695362172dabe621b8cca77a35da599c6cf5b4e87700c03f4ee190ca12d5c69b2d88c623cec527daac0980dec2ed713ff563e88ebe636a725
+DIST jasspa-mesrc-20091011.tar.gz 810128 BLAKE2B ce627dab7cf4ec09b099e755c3eb17e773c64fbff60741244cdb134ee1555ffff592ef3684eecae72d5da36c10cd7caa23a03112154c616ad3c7667d913354b4 SHA512 60cc5a83b3cafd8e517f88732dc94feb0329b962bc714eaa5616ba89776fbfac41833be88fd3a666443291184086494434fb8763747c1dc5e216ce793b694b68
+DIST meicons-extra.tar.gz 43345 BLAKE2B 5b3d6e8a76604364d8e5464ba764aec96d822054c02bffed4cd763f7691f78bc3455904cd06d89ddcf8a0861134ada3c7d228751d4f3685e6700ebfc3dda2354 SHA512 bb6879fb12ec1c7b346bc1df2412a837ffdd0569f6be2800a433307a7736bb31798b3c2a71e02cebdce39c59d93d1a986f80c92184604e4292606c98285fe02a
diff --git a/app-editors/jed/Manifest b/app-editors/jed/Manifest
index d1898d992ada..10b2c6d07374 100644
--- a/app-editors/jed/Manifest
+++ b/app-editors/jed/Manifest
@@ -1 +1 @@
-DIST jed-0.99-19.tar.bz2 884198 SHA256 97a339ce2fb0a446767ee550786e6914fa2e8cdbad39a402e48368cd0d6b5763 SHA512 db8a30284f9b8e3e2c5d1a600eeb7af29c9f943a5c23d7c74fce926e0b0252f54805e214670e7c9357ce0e6918ad67cba2769a523979bfbd285328f94fff747c WHIRLPOOL 7ba51882004bdb9a59b2fffcc7c976f3a32bdb95247e6c3c8e3c423b0345af0a6eb74d4ed0a69831db160f7f69250a32f114dfb679a343eb002adee94a4ec987
+DIST jed-0.99-19.tar.bz2 884198 BLAKE2B c3d967e59b909a39d0f7fb49c8ce9aef70585ba433bc5c6bebf5db1b6b88de0c41b35059a242a38be91a97a5296a279bdc85ac30ec9d4ae221d94e50e41d8995 SHA512 db8a30284f9b8e3e2c5d1a600eeb7af29c9f943a5c23d7c74fce926e0b0252f54805e214670e7c9357ce0e6918ad67cba2769a523979bfbd285328f94fff747c
diff --git a/app-editors/jove/Manifest b/app-editors/jove/Manifest
index 79067d1716d7..f8f0ce69df7f 100644
--- a/app-editors/jove/Manifest
+++ b/app-editors/jove/Manifest
@@ -1 +1 @@
-DIST jove4.16.0.73.tgz 465214 SHA256 9c9e202607f5972c382098d10b63c815ac01e578f432626c982e6aa65000c630 SHA512 2198504f9a23590710acba7f27661fa5649fdbed559a4c6bde9d2c1d673c22ce7d99a690be45a4602d37cf6e70399230c4ae3a251d8451af0c5252bdca61b09d WHIRLPOOL aad67b0a4ed52f89719feffbacb8b3de9acf50ccb2fbc6cb8f35bb9bcb475794d5aeb4bfe7485c9ccfc41f687bb42a4d9a9242d1ba84fd17790c35a03b1a8000
+DIST jove4.16.0.73.tgz 465214 BLAKE2B cc1eeca2cdbd7ca98a5deaf27c37bfcdc529f2b388361e0cd5fd6278b72740a06283abd1f60212e6dc0d1e540e4dc4d99edb99b781645b13e1675644db0f38eb SHA512 2198504f9a23590710acba7f27661fa5649fdbed559a4c6bde9d2c1d673c22ce7d99a690be45a4602d37cf6e70399230c4ae3a251d8451af0c5252bdca61b09d
diff --git a/app-editors/mg/Manifest b/app-editors/mg/Manifest
index 52999fd168a2..986ef610bde0 100644
--- a/app-editors/mg/Manifest
+++ b/app-editors/mg/Manifest
@@ -1,4 +1,4 @@
-DIST mg-20161005.tar.gz 140797 SHA256 b7fcb5136a6783ca24c8463ab0852fc1f26bdb2bb1c24759b2c51ccfc46c5e61 SHA512 3ec2e10d0cd427f9543818690fdd469b64e6eb5d061a221eb7b18566dfb1965ee68cea7c83e4e4ae9b2d6027a0803aacfc815390571ac550bc0b7004b46972ae WHIRLPOOL 4cfb72313b8181acc40b1cd06269f2162198302d2e088a7b04263af4b127071adbe9725aed2ecdf6cd3854a9e9c9df9173a75bf7a83cf2492a644448df9d297d
-DIST mg-20170401.tar.gz 140895 SHA256 0a3608b17c153960cb1d954ca3b62445a77c0c1a18aa5c8c58aba9f6b8d62aab SHA512 729b2d9ba7eb236cc8bcbcf3ac7604494980cbf2fd21dc5a3856011bc830eee75be29a246b0bf3dfa6c7a03fcf69a902ae50d05ea371ac4d0225a4da6089d7ce WHIRLPOOL ecdd49bcf8a220dc7a8c57de322c354437b646db231177e3640ae0840ea49ddd9bfc8d9ecaff6e4c9c3ca140e173b14bc52411bebfe586cac144f412d07b59ca
-DIST mg-20170828.tar.gz 141028 SHA256 1f8886ab62e9abfeed7fafbb5ea71685450a34c5d0a243461bd2c5425161368d SHA512 1ea16b1dd5e9e08abf9fcf0889130b4f39d36872bb64df85470a9ced1db87c0eecb18cc6e8c3c5a04f9049d58ef4492d5a88cf3502ec3351abccb7bddfb90c14 WHIRLPOOL ebe1559c385788f53c4e49a22713fec5bdf22837b854310543995bf2988d0c946ba1386f33eb84a44b10e9811dacc176079dc930562060ecaaec9b3232a781f5
-DIST mg-20171014.tar.gz 141045 SHA256 51519698f3f44acd984d7805e4e315ded50c15aba8222521f88756fd67745341 SHA512 d55818308421aa523fb30b6e4725bb122f37637a822fabafeba9f9da3b97fd7f6af6431fce3015c969d0e656a48e89ed49b790deefc69fbdbb7e257f8a1aeb56 WHIRLPOOL c138c2bed663fa07fca6e257feb68c6de124af89ce010785180b64c36eea1a85bf7b1b05310bbb32b8cec3379b22a300f6afac962aac69ae3cdddcedd953e331
+DIST mg-20161005.tar.gz 140797 BLAKE2B 27498f483ce64bd5624f77ca0e1d544e2a518c9f010393c93bdd4671bc95ddbda9b893a8d1b2e157330db961257e09b9cbc35ab0c3a10f5d4b7908d56d7d6622 SHA512 3ec2e10d0cd427f9543818690fdd469b64e6eb5d061a221eb7b18566dfb1965ee68cea7c83e4e4ae9b2d6027a0803aacfc815390571ac550bc0b7004b46972ae
+DIST mg-20170401.tar.gz 140895 BLAKE2B 09cf3483a5f3fe1b240743d07008de62ffded10f32454b5795307b70ae42f9477cac3b8c1a59da6dc493fb3d2477fea418479d19e432e10b42a05bcfe509d242 SHA512 729b2d9ba7eb236cc8bcbcf3ac7604494980cbf2fd21dc5a3856011bc830eee75be29a246b0bf3dfa6c7a03fcf69a902ae50d05ea371ac4d0225a4da6089d7ce
+DIST mg-20170828.tar.gz 141028 BLAKE2B a0243ee05f86161f1a9448ec92c8cf14362a60dd3643ad49f79fdd6c2ffe56f51415321eb6f3d7b78c1ca6eab9cb91380cdb63f699359080011d6801feaedd04 SHA512 1ea16b1dd5e9e08abf9fcf0889130b4f39d36872bb64df85470a9ced1db87c0eecb18cc6e8c3c5a04f9049d58ef4492d5a88cf3502ec3351abccb7bddfb90c14
+DIST mg-20171014.tar.gz 141045 BLAKE2B a5b3bda6ff3b6416093069b471762687c2279737aa05b297ccd3077aff195cf52831566768613a81dcc977a27ac5ffd6e8a1874aa1010b6d90f4c678b6825cee SHA512 d55818308421aa523fb30b6e4725bb122f37637a822fabafeba9f9da3b97fd7f6af6431fce3015c969d0e656a48e89ed49b790deefc69fbdbb7e257f8a1aeb56
diff --git a/app-editors/mg/mg-20170828.ebuild b/app-editors/mg/mg-20170828.ebuild
index 046da181d4af..e2b9dc5491e5 100644
--- a/app-editors/mg/mg-20170828.ebuild
+++ b/app-editors/mg/mg-20170828.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://homepage.boetes.org/software/mg/${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm hppa ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha ~amd64 ~arm hppa ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="livecd"
 
 RDEPEND="sys-libs/ncurses:0
diff --git a/app-editors/qemacs/Manifest b/app-editors/qemacs/Manifest
index 6f2977c8a6d1..41d0dd3d0548 100644
--- a/app-editors/qemacs/Manifest
+++ b/app-editors/qemacs/Manifest
@@ -1,3 +1,3 @@
-DIST qemacs-0.4.0_pre20090420.tar.bz2 1393436 SHA256 14f1ffad569f1bdaaa27d2d7ab0251ce69afc9efc347bb244b11f5e34e818ab5 SHA512 4595e34d3a83cbd7f25514dd96b7578976b30de80eb19b1391448ecdb9c06d24088880978961e5abb94b3f715057e7563ae0976d704bc5afaaf83e62a67e8dd4 WHIRLPOOL 63ba6950a0340731cd9a041a5929d18f1769d915a7343a94b2b0c48d82a0af1680b2163426e8d268240d3c0c740895853439d96c2d49791e106f0798f5d88a8b
-DIST qemacs-0.4.1_pre20150916.tar.xz 1136592 SHA256 1f019c7fc7aceaa2c5608a7ca251e244ee8bf67086e4b285c28f88849e1269b0 SHA512 e9775ff3dfef6d6b6b263029a620e6575f9f4718b94c0acfcddc8e5da8cd835e57dfbd5fbd948778135b609ae0588924fc9a727b2e763a25148aa27886a9f467 WHIRLPOOL 4f97d931eb3880a8ce0f1f09a6f404297797f230cfcc4d2507fcf0b6fcf0c4d28d5868e943905d316cb0d5d22581095c4cd1a8bf00c44f11ed7606a357f7cc19
-DIST qemacs-0.4.1_pre20170225.tar.xz 1147408 SHA256 9a3f754effbd9253b7aec9909fea801fc233cf69f98f6c807e5334ae1c8a08a6 SHA512 a17c8901c917f91401e16b4f857735957ab0d3533d9dcc7a0decf768f453b68023f45e1241225a84d35ba793beb69754e0f2caa857165f8223882d5041d56c99 WHIRLPOOL b430a0fd8ecef701d4727acb023d0a56553cf109e18ae64dfec886923ec6e5395d1dae9484c274d298675928c69e0e966f3443c0f9f4f8c6890af15bc0fd52ae
+DIST qemacs-0.4.0_pre20090420.tar.bz2 1393436 BLAKE2B 73cc34e711957db31d765e07712b5fb0ec94523c8d3a175beec95ca244929335088c69156a0f9f8c4875868c1add52a1c5f76e74a07f70d89f2c1c5d80917669 SHA512 4595e34d3a83cbd7f25514dd96b7578976b30de80eb19b1391448ecdb9c06d24088880978961e5abb94b3f715057e7563ae0976d704bc5afaaf83e62a67e8dd4
+DIST qemacs-0.4.1_pre20150916.tar.xz 1136592 BLAKE2B aff8875b81bd51f77bebcb4dfe60ed0d4396a05af1f42e6b8765e15f9e04e00162924c3514a9ea1e8cb8c0b9ecd2a4112b9d7a46b7d156c032d37d381f2ae0f0 SHA512 e9775ff3dfef6d6b6b263029a620e6575f9f4718b94c0acfcddc8e5da8cd835e57dfbd5fbd948778135b609ae0588924fc9a727b2e763a25148aa27886a9f467
+DIST qemacs-0.4.1_pre20170225.tar.xz 1147408 BLAKE2B 369f3c5ff1b1f7b22bbd1f70f0c150e425a5b68828e62db427e4b41c58c8ee9ae0449a83693e9354d88fc482691d7a5f3661360ef602aeaba963776c4725b894 SHA512 a17c8901c917f91401e16b4f857735957ab0d3533d9dcc7a0decf768f453b68023f45e1241225a84d35ba793beb69754e0f2caa857165f8223882d5041d56c99
diff --git a/app-editors/uemacs-pk/Manifest b/app-editors/uemacs-pk/Manifest
index dcbd5437708e..8ad8909e6987 100644
--- a/app-editors/uemacs-pk/Manifest
+++ b/app-editors/uemacs-pk/Manifest
@@ -1 +1 @@
-DIST uemacs-4.0.15_p20141208.tar.xz 151500 SHA256 271cf8afde5e069d5b22dfdb93ace83367a89ab9ebfb753e62219d3003633a62 SHA512 a632c82275ee652412aec7d8f3549d80c5fd5bb1211675828ec4c58365bb7819927ff4e92f6fb7b5b9030b681062773ea19f1af345d4d3ddb652c3d68507bdbb WHIRLPOOL aba112d6142a40b439300ab78c206d2cd4271486d45530c9a1500705ba46cbca03df11f1d0242bed1dd7701394c86a8349eb5661f3145ddd01a8f45ae5e478e7
+DIST uemacs-4.0.15_p20141208.tar.xz 151500 BLAKE2B 18fed2319b7440583e4e5bb46b8f05a7fe3ec7ffc44c1c8d6311a760472a509a28bc8bbded02f1128d0d663bc78b6a9382173d203bad83a1d09503a992382d33 SHA512 a632c82275ee652412aec7d8f3549d80c5fd5bb1211675828ec4c58365bb7819927ff4e92f6fb7b5b9030b681062773ea19f1af345d4d3ddb652c3d68507bdbb
diff --git a/app-editors/xemacs/Manifest b/app-editors/xemacs/Manifest
index 21a3c53553a4..810f075dcc5d 100644
--- a/app-editors/xemacs/Manifest
+++ b/app-editors/xemacs/Manifest
@@ -1,4 +1,4 @@
-DIST NeXT_XEmacs.tar.gz 39571 SHA256 35a0d988fd4ee801572639a99798571aa9fad140ddbed1455565ae9d5e0086c7 SHA512 611ddbbf5be3d2274e7f76be7f8200c6c7f3cba917efcc24e73685aa5f61c94237e6e48ce66f2d59ee4b74862e686f3ea7a29cf006717d5d0674db24d243d566 WHIRLPOOL d47aafa6fe7a11de94196dffb752c683722b8ead23979a7f4344c61964ebcd052a4f0ad6b9ab42a5d41f5551c0a543f46af59656fc8a79340257626272c1faae
-DIST xemacs-21.4.22.tar.gz 8357931 SHA256 87fb7633106625935105e821eb8fe65e521a3de44d45fe864109779c3a8e4bd1 SHA512 7ddd91f8d1a1b9f6d984a5bfddd98705dd6f7e3d6b4f81c1e03d971c93e33bff09b641bc2ad0a0d9d2e44170063550ad0399f3e28237dd34b8ad6200d8b197e8 WHIRLPOOL f1d313aa2dee7f4238190b90c10dc951a31302563a8a098e69ed740e85f428ac360b363e44f1e618f2d97782b5532846df290e9f79f11abdc7648a1e380cb44e
-DIST xemacs-21.4.24.tar.gz 8543879 SHA256 9016a51496d4978cf3dba75000a8e38bfc8cb4ca3a3f3e71371aa19259f26cd5 SHA512 b7a88d5a4a9f74f74c2067ed60f7ea87ac8ccad5d9c2c1033ecf07f540250191f8fa5f9e6d23d9fedd0f2ab1eb5ea6c29a7665a310ec512d85e2e4f337447213 WHIRLPOOL 469d52341833037e22cebeb6b554435c81b3f5749f64d86ddf31c3990dfc08a57f49fab7e868ab8c2009d1cae665f4fd731813f25c942d5aafd287ad7736a049
-DIST xemacs-21.5.34.tar.gz 15816932 SHA256 33cc54a6a9a45224a64b6c57c8138b5a5f0f1be368951a6d9ec8c0aec5993ee5 SHA512 b61d88fe530a77b88c2ed0cecd6597ed3c265450bc61f7c6823920f774b2d566ef6fc18a6c33928d846d08d465617d4ccd3c4656606ec8634127a683abbc929a WHIRLPOOL 733aabc45309ff4172ab77492dd85e71f156722f2e06d9a185c0a4260b9fbea607ff8a41dc43fc009cb8cdf3f05d4523778610a501f27a4917ab43cea03c6209
+DIST NeXT_XEmacs.tar.gz 39571 BLAKE2B 7abf17627ec34e6b0d0edde444028c46dca6d703cfa208a8a1eaf30e2fc2543b953c9a9582c3d55bd5b37e746f45c03ebfc408a0d965606e45d5f4adb9148dea SHA512 611ddbbf5be3d2274e7f76be7f8200c6c7f3cba917efcc24e73685aa5f61c94237e6e48ce66f2d59ee4b74862e686f3ea7a29cf006717d5d0674db24d243d566
+DIST xemacs-21.4.22.tar.gz 8357931 BLAKE2B 257a624f2709a883d1b5c54939b332af0ba4a993faab1c5766dd18a6a0ca0ec8d26fbc44911e234c3131b73b22da132f5e09f0593dcfdf973c6c9e62e71d0b58 SHA512 7ddd91f8d1a1b9f6d984a5bfddd98705dd6f7e3d6b4f81c1e03d971c93e33bff09b641bc2ad0a0d9d2e44170063550ad0399f3e28237dd34b8ad6200d8b197e8
+DIST xemacs-21.4.24.tar.gz 8543879 BLAKE2B d7e60e4e053a10bfc4591a5d691c849ef5e5436f6951c801f5a169592b160669d0f6b9dc8f10b6b79889a3210de977ed78a5cea826c02e425495364745ef9e10 SHA512 b7a88d5a4a9f74f74c2067ed60f7ea87ac8ccad5d9c2c1033ecf07f540250191f8fa5f9e6d23d9fedd0f2ab1eb5ea6c29a7665a310ec512d85e2e4f337447213
+DIST xemacs-21.5.34.tar.gz 15816932 BLAKE2B e3be282717b91308c94d3d4bee74527d0b31ea5019e8ac38a62385d2ffd6f684c9e4eaf37c025db5e48a4c8f82d165fcc5258e49934c094cb66e0655d27c3e7d SHA512 b61d88fe530a77b88c2ed0cecd6597ed3c265450bc61f7c6823920f774b2d566ef6fc18a6c33928d846d08d465617d4ccd3c4656606ec8634127a683abbc929a
diff --git a/app-editors/zile/Manifest b/app-editors/zile/Manifest
index f738f84a11e0..13c0fa86cd4a 100644
--- a/app-editors/zile/Manifest
+++ b/app-editors/zile/Manifest
@@ -1,3 +1,3 @@
-DIST zile-2.3.24.tar.gz 953962 SHA256 218bb2af414c6a168101656631a5b2da92f20a965895e1006658cc658b0b7e89 SHA512 8361f42436ae9ca150f09d830096b7a3fb0089d58bffe5ad7538b5ec5cd4e0e50085213e938db1a95e2922db845d1d2f36841a65fe1b9b72f60cd930dd8f09b9 WHIRLPOOL 37aae22305abdc2c2b86c8f6b43dcb7621464213ac375ec2fde767d99f79ddba08216c392c5500a71175f30762fe57e786f94305ff03947e413d5291cfafa934
-DIST zile-2.4.11.tar.gz 1293707 SHA256 1fd27bbddc61491b1fbb29a345d0d344734aa9e80cfa07b02892eedf831fa9cc SHA512 dbcbae98d8b9fc7ea71abc8ad0c4248edf1498a731172e800dd4b1fd598597924cc61e24fbfce5eb44dd2b3a0b2aea416c6373843a450e19cc8c98aa83d6ae0e WHIRLPOOL c39cafe9b4409580656c29df78e8a4aeb37487b93bb01e357c964866f27207ef2811672967c7da7e2ad9bdfb2d47ea09168c611d89757b000530dbb60d5785d9
-DIST zile-2.4.13.tar.gz 1296379 SHA256 c795f369ea432219c21bf59ffc9322fd5f221217021a8fbaa6f9fed91778ac0e SHA512 ada0eabe6285894ab4c25fa71c3ca6f07f0df2d36ad64f92037cb1b02d7b898dbd64fa47ef96800b7d995a5958ddec525e0d849a427e1f9bf14da944a4c30e88 WHIRLPOOL a23e3a68f7895a15ef19480c2c6f30330f7b4ee719fdc8523fed16e6a387b965ccdca5afb5c17cf4bd63b5c935c53ef2c320f083598bd75bfbf9c9721851cf98
+DIST zile-2.3.24.tar.gz 953962 BLAKE2B 242f0f9532a536d5ba36664031cf86eba753239c0f6dcd47c086496628a730bdd0a9112dc1ffd26965068f6d66d35d3ad3c92fc2753e129adf9a5923321e2cdf SHA512 8361f42436ae9ca150f09d830096b7a3fb0089d58bffe5ad7538b5ec5cd4e0e50085213e938db1a95e2922db845d1d2f36841a65fe1b9b72f60cd930dd8f09b9
+DIST zile-2.4.11.tar.gz 1293707 BLAKE2B 30317856303cd093e767f7c057fab74cddcd49e95d8218b550e343d689914db02c82c5f35c66335e0685df9113dcbef93b4640fcf42438fb600f360b82c4e396 SHA512 dbcbae98d8b9fc7ea71abc8ad0c4248edf1498a731172e800dd4b1fd598597924cc61e24fbfce5eb44dd2b3a0b2aea416c6373843a450e19cc8c98aa83d6ae0e
+DIST zile-2.4.13.tar.gz 1296379 BLAKE2B 00dce642e6b452f66fd06e70a7f9e9047abb2c79af7fbc0c9150da37bfda31027c06c43028e22b657ce6a948f2e3e89375a6f5bddfe5222aa69f843cc5fc3ec9 SHA512 ada0eabe6285894ab4c25fa71c3ca6f07f0df2d36ad64f92037cb1b02d7b898dbd64fa47ef96800b7d995a5958ddec525e0d849a427e1f9bf14da944a4c30e88
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index 9dc59f1e48aa..4abb883bf4bc 100644
Binary files a/app-emacs/Manifest.gz and b/app-emacs/Manifest.gz differ
diff --git a/app-emacs/actionscript-mode/Manifest b/app-emacs/actionscript-mode/Manifest
index bd2e60ef99df..a626292e4445 100644
--- a/app-emacs/actionscript-mode/Manifest
+++ b/app-emacs/actionscript-mode/Manifest
@@ -1,2 +1,2 @@
-DIST actionscript-mode-7.2.2_p20120405.tar.gz 8226 SHA256 f752546eab05c5249187b79489b74dcce385f99814b5ec708a1e347aabc154c4 SHA512 79f59b5c6e53d8b7b5a765579629e956a90adadac65c8a46be883cb22813a15437cc63a0ec1a5c9b44e2034284f5d7c4405bbf3670861186f7a85af0a1e720fb WHIRLPOOL fa647438e5d0f7ad6ea6e83d67b42c753430f7d7e8d3217a65b5a0aa0b3a7b3f0b6714b60183f3c6d4d9be09a7ee38acb657d7ded43eebb63ea67d33ddeb9056
-DIST actionscript-mode-7.2.2_p20140605.tar.gz 8276 SHA256 c7131633c05fe78ed4a196b0fa21758bf3748ec03c532f6a5bfb9dfb63d6bb5e SHA512 05a3a0a0bc185bdbc96bf292a220912e8649acd20eb3f55dbfde04cd956da3e4f71daa10957bb2ba6e150589f626ec1059908e3b294a643b4034a6c08e507fb8 WHIRLPOOL bb0673e38c7a5579a1e3a6915f691965d445fa2345de17374d6e35671620986c4b0db09d12ba1afc0c0a54d0e5a3fb7de9459643c0819067cf3a8c3a6e90d0c8
+DIST actionscript-mode-7.2.2_p20120405.tar.gz 8226 BLAKE2B e8f33f3320b4b0891b244963fea282e16d50cb256fe4439a2f26bc2640607d5f530b537392248832f695d9f4ac5b89f6a8e0f17ae6941aa4ce58b0ba1c028e1b SHA512 79f59b5c6e53d8b7b5a765579629e956a90adadac65c8a46be883cb22813a15437cc63a0ec1a5c9b44e2034284f5d7c4405bbf3670861186f7a85af0a1e720fb
+DIST actionscript-mode-7.2.2_p20140605.tar.gz 8276 BLAKE2B 8fbe8147b1626f4e454753ae92baf14020424c0806aee4a9e050b789770e7bd1f19f45b0d493fd94af0d05ce541916c0dec1bad2327b285de77e8d27a7a1e675 SHA512 05a3a0a0bc185bdbc96bf292a220912e8649acd20eb3f55dbfde04cd956da3e4f71daa10957bb2ba6e150589f626ec1059908e3b294a643b4034a6c08e507fb8
diff --git a/app-emacs/adaptive-wrap/Manifest b/app-emacs/adaptive-wrap/Manifest
index 6e7f1cc21a3d..bb4df8bebdf1 100644
--- a/app-emacs/adaptive-wrap/Manifest
+++ b/app-emacs/adaptive-wrap/Manifest
@@ -1 +1 @@
-DIST adaptive-wrap-0.5.el 6111 SHA256 fefa54ba670b84360d2602fae477642b27ca4c2312983a7d24b4e6bcd1ad2f3b SHA512 0ffc52ad4343b57376dfb1ef09c7cc31d5933568ed614afc7d6d104fcb2ddf1eb69a69d4b04f5f97b726cc66ddacfc8d56ff10e447cf24f45227ee568adbcb95 WHIRLPOOL 9b4c64e26da9320a13cd7e0e77d10505c8aec60200e3e26c73367827fa1320ea5eb791834b3264f77998c5e29f07fe6c0f66ee7f8cfa89e75d5f63d19ba8a4d4
+DIST adaptive-wrap-0.5.el 6111 BLAKE2B 72813abcbe674a9e15dc72d189a1b2a0cf6ca490ad5f96daaba94feac832b10ca0c6fde364e8ea34ddcd8f1b170e331cb31f3be2844d72e1c039dbefa3069451 SHA512 0ffc52ad4343b57376dfb1ef09c7cc31d5933568ed614afc7d6d104fcb2ddf1eb69a69d4b04f5f97b726cc66ddacfc8d56ff10e447cf24f45227ee568adbcb95
diff --git a/app-emacs/analog/Manifest b/app-emacs/analog/Manifest
index 7eda8285e1f0..cbb1fd86eda3 100644
--- a/app-emacs/analog/Manifest
+++ b/app-emacs/analog/Manifest
@@ -1 +1 @@
-DIST analog-1.9.99.el.bz2 9626 SHA256 22c2744c29e7bda90203d014bb2caa234b66561f65e4fd4b602e374ad819e43e SHA512 c4ce5dcce93805cf4cbcd3316f044485adaa36e6479956f2a87c8bb6a6c1522e46a60cb8ef5a4bb3fd6a60187c4ed6760f74afe870c7491ba5c3e760ae2d6cc0 WHIRLPOOL fdc9aef16620ed7ee7b29d90dd54993361e6958b59201ed4637ae479096ca1631aed86de039961b45589a0ed27ba36441e916bcf35e9fdb2d8cbce208109cda2
+DIST analog-1.9.99.el.bz2 9626 BLAKE2B e96802c075d078b4f8a951176b52457da4a6cc52d909a1ffa6dec32fce85036b38acadc1a667e0d93808abe5b3f3ae2f22be071950948da13712a864cd500233 SHA512 c4ce5dcce93805cf4cbcd3316f044485adaa36e6479956f2a87c8bb6a6c1522e46a60cb8ef5a4bb3fd6a60187c4ed6760f74afe870c7491ba5c3e760ae2d6cc0
diff --git a/app-emacs/anything/Manifest b/app-emacs/anything/Manifest
index cdc44b832a14..607fc3a940ba 100644
--- a/app-emacs/anything/Manifest
+++ b/app-emacs/anything/Manifest
@@ -1 +1 @@
-DIST anything-1.3.2.tar.gz 2165646 SHA256 32a27ebd15ef4006af8f86957f541411e4567e9af716288252574c9422045e31 SHA512 aeeecb6ab9991e3b230005e0f7328cc436b0a3508001c18d46137b8bb6e1883308d2e0af25a57e92a8b980fa119fd7eb094d3f4abacc3f0b9a0a9c409b623960 WHIRLPOOL cc70c54c661d183e4ff7c487302f80af59df08335973126d19a5138bbdafa534be456d1edf0336dd78afd3bd3a5229e304c5c91391ea6cb109528b5414cc44fe
+DIST anything-1.3.2.tar.gz 2165646 BLAKE2B a61e48538d550d55c841c9a788dac5b4f80ba7ad61950245234a1a08b8a8ed6fd4ec8c7f85f448d66acfc579217e02126b9542ad1685b6bd7534a0deb92bf3cf SHA512 aeeecb6ab9991e3b230005e0f7328cc436b0a3508001c18d46137b8bb6e1883308d2e0af25a57e92a8b980fa119fd7eb094d3f4abacc3f0b9a0a9c409b623960
diff --git a/app-emacs/apache-mode/Manifest b/app-emacs/apache-mode/Manifest
index c816fc2bbe22..adcc7bbaad32 100644
--- a/app-emacs/apache-mode/Manifest
+++ b/app-emacs/apache-mode/Manifest
@@ -1 +1 @@
-DIST apache-mode-1.1.el.gz 3468 SHA256 1e3e708700f187d8a6a1c3638d80f8b9a8b0e0310fd30e0cbfd5f785e350e887 SHA512 4eb42a0b4db847026832f14473dfc6cfea6c436eaed5a52c2ca3ba27cc89b0b36b0e7be1472048e1c559f3b5d5a5e7e85b9e2cb9c5563bf781f241b540e141f1 WHIRLPOOL 77a2098df3015411ac688a97d387d70355510d4686bd6d0bd2424e77f586d6842d85e5ef3bbe933925718cab0622c4496f3470c46b0bae0f535d344976e1974f
+DIST apache-mode-1.1.el.gz 3468 BLAKE2B aa89b18877049fa8399ef75dd048e40eb84c20dec4365b08bcb1d1df2a14e4a2d63a2baff3bfeed1bb01fdd0489a757b3377ad21d311c03e958650e68a0f927b SHA512 4eb42a0b4db847026832f14473dfc6cfea6c436eaed5a52c2ca3ba27cc89b0b36b0e7be1472048e1c559f3b5d5a5e7e85b9e2cb9c5563bf781f241b540e141f1
diff --git a/app-emacs/apel/Manifest b/app-emacs/apel/Manifest
index 6a4f82134f2d..4ae2aa39ddc9 100644
--- a/app-emacs/apel/Manifest
+++ b/app-emacs/apel/Manifest
@@ -1,2 +1,2 @@
-DIST apel-10.8-030_Use-new-style-backquotes.patch.gz 7869 SHA256 064edbe19f90e884ea2f5b64479e4498afacbb8d550c3882a4626bdf10a1bc98 SHA512 4074dc612feb2d63637bea2e9303423d4e9e035fad7f440d2da5331a6adc08f5ec61abb5087c2c4c72ec8931d1ccc4db3ffd061bcf3150d20c222c8df2e0b274 WHIRLPOOL f9bf88d85c5cdc8164bc0778bc5275c4e6c494f5927d11bcdf008851d7e2e70c32a3430a936abecc0239da1cf4a9b4a295ff7f4184a488462750f1dd8ac89363
-DIST apel-10.8.tar.gz 126326 SHA256 a511cc36bb51dc32b4915c9e03c67a994060b3156ceeab6fafa0be7874b9ccfe SHA512 39f13f15ec0a078d8f8dfe797899474cf4dfeb0bf7b8432a0c05bb38cf134d805c171a66b3d3efd074fbf294d68006d1e1d49903e45f1991d79cdcb4cca4aa9d WHIRLPOOL d222d3a477430b63e9a383a888fad0bc1871942830f462f505090495740028e517eac4052a72d0c00ea947308a6d75c0cade8ca12f76a81bd58f4643bf72f87d
+DIST apel-10.8-030_Use-new-style-backquotes.patch.gz 7869 BLAKE2B 93b93a089693a2fec68033b44f1cf96117fcdcb9dad5dbbf4283a79cd19f358c2a3bdc80ce2f7517e8b396182141583a371c21a8df7db7d05156ffd16987a872 SHA512 4074dc612feb2d63637bea2e9303423d4e9e035fad7f440d2da5331a6adc08f5ec61abb5087c2c4c72ec8931d1ccc4db3ffd061bcf3150d20c222c8df2e0b274
+DIST apel-10.8.tar.gz 126326 BLAKE2B 6fc8f04006a971e9d48dbf5f7b43e201a4f5fa515210bb69829bc3b0f05aba2e9f205915e6117e20220ae5b48a6543520533dc95a90754a30ff3fb8094779901 SHA512 39f13f15ec0a078d8f8dfe797899474cf4dfeb0bf7b8432a0c05bb38cf134d805c171a66b3d3efd074fbf294d68006d1e1d49903e45f1991d79cdcb4cca4aa9d
diff --git a/app-emacs/atomic-chrome/Manifest b/app-emacs/atomic-chrome/Manifest
index 30905645d683..eb84d9f94110 100644
--- a/app-emacs/atomic-chrome/Manifest
+++ b/app-emacs/atomic-chrome/Manifest
@@ -1 +1 @@
-DIST atomic-chrome-2.0.0.tar.gz 218286 SHA256 f239fabd2438df8d947b333453534e6ab76f946c8879df2e3f1151baf76dac97 SHA512 702c8e80246f47dd46f4c864412e47c7cb74a13737754ccf81053a5054b97c4f48c4ca7613d1734dbf7251fbcd1d15269e2a605c36b3e7b631613506bb3a49bc WHIRLPOOL b6167c4299f0de6c56a1e68c2dfa7389d7c40dbc2e7820830c16eb02c29038e3eca7ed4aae6d2701e7fa41f02ebe88fda3948b4effbfbc6d89c779cce67d1613
+DIST atomic-chrome-2.0.0.tar.gz 218286 BLAKE2B db75055df1d337d6f5adfb1dcbef0f9976da38d50bcff96dd5e94993cca84c837d05432c27cab7b3b7bfc14c8a960d667e7c852eda4732f9209f8b72c9a3a191 SHA512 702c8e80246f47dd46f4c864412e47c7cb74a13737754ccf81053a5054b97c4f48c4ca7613d1734dbf7251fbcd1d15269e2a605c36b3e7b631613506bb3a49bc
diff --git a/app-emacs/auctex/Manifest b/app-emacs/auctex/Manifest
index 38318a73eabb..bab5a046220a 100644
--- a/app-emacs/auctex/Manifest
+++ b/app-emacs/auctex/Manifest
@@ -1,3 +1,3 @@
-DIST auctex-11.88.tar.gz 1302836 SHA256 716867d5fbcc5c67cca781d7c1984e6a3a6d5da056ec3b4f35170805bf4dc83f SHA512 30c422b52b3fc698e453ada9643038dd30978f6b1a99f5118a53ae5b939d63246adcb1937f0e5c4cf166477dca78fa17d721402a90c833c9e91d75072ae0f67d WHIRLPOOL fa348913637bf6062184873f50c6988aa1afdd7e4a456acfb139d704de9769480503e796716a632e9769f7d3f68d70e6e42a739ae8742857fcf6390baec156d6
-DIST auctex-11.89.tar.gz 1332904 SHA256 98af296907b371083289a8b35bd6ff24cfd8fafb013033b724aacb5fe774c9b1 SHA512 a78ddefb46c1eb271646f3c4e723f49a913e391eb58263df3d3de272bc1ad5b70c0a9de682f28124aa5a48b36c030b3e83425667ee1a1973a054ff03ef1d8be9 WHIRLPOOL 6d8614961ddf95c764ac5f4dc8ce63bc265ddf2b8a33ee827594930b6239217f8818fffa4b30a204f8c2cf16d127c3ae97bd8d24421ce1f5254deb3f833e9e8a
-DIST auctex-11.90.tar.gz 1437331 SHA256 3c232fd8e57780edea28cd3035afcc2b6ed965b5954e96b34a258cacfcaaf18f SHA512 b90b246a6193570897102d8f95396b35c8b899fc594446f2455469b9c58ca8fd1dafbb852c6f167fd8500261f007c8a66531bb04582d7a5c4a50a15933b70c83 WHIRLPOOL a8f42017cfa80ec3b21127068338f89526e584ea3cce0a92214fb40386fa82d4465f9514da62fc55edefa7ff3914d5dd5ee77d0cf7e4b0cecf93716f5f94f2f6
+DIST auctex-11.88.tar.gz 1302836 BLAKE2B ffb7d3ff8d5b2cc8208bddf782a736c2d347be399fe3702c6bcc2e7cda3562b667bc42204ceac9ec512587f6ecf28fd7a6d1b720ce8b5de9ef815d6af772393c SHA512 30c422b52b3fc698e453ada9643038dd30978f6b1a99f5118a53ae5b939d63246adcb1937f0e5c4cf166477dca78fa17d721402a90c833c9e91d75072ae0f67d
+DIST auctex-11.89.tar.gz 1332904 BLAKE2B 1f89b9ee81d5cf5c896ce38731bb43978827452d607f7b61b995d55911bc36ca0071d0abadb293234e9c3f41bb8a57b92951e4eb0c3d7f13db063cb286920f37 SHA512 a78ddefb46c1eb271646f3c4e723f49a913e391eb58263df3d3de272bc1ad5b70c0a9de682f28124aa5a48b36c030b3e83425667ee1a1973a054ff03ef1d8be9
+DIST auctex-11.90.tar.gz 1437331 BLAKE2B 9f4c236132fcebb2c6996d3105e6e6d095e29e1ff531ad9d55c609b972a0a3cea0a580830c950ab6f59b0eda50625cc617e868c82a00705f41f472c08b13a7c3 SHA512 b90b246a6193570897102d8f95396b35c8b899fc594446f2455469b9c58ca8fd1dafbb852c6f167fd8500261f007c8a66531bb04582d7a5c4a50a15933b70c83
diff --git a/app-emacs/auto-complete/Manifest b/app-emacs/auto-complete/Manifest
index c11db0c5c2d5..598b1d8345d3 100644
--- a/app-emacs/auto-complete/Manifest
+++ b/app-emacs/auto-complete/Manifest
@@ -1 +1 @@
-DIST auto-complete-1.3.1.tar.bz2 155081 SHA256 9266b66be840582d1ce304a2c17eb63d2f4422cb6e69952be5f0b20baeeb9888 SHA512 5b82120f8faf1ee4ff139f4fbacb894fa0bf617b9a0aaebb5a0d672a6f90cb01bc35f0c99cebe2bef55cb7a6af6ce03936a7226c89e3c79248aacf4ae554fb7b WHIRLPOOL df05e94eaa75b0a326da8653202a8d7b607b8f7ebd8f252727e164d98e05d5d1b5cbd0396b7028f4fd16c6b3ad6a42a379c2ad4df0ae309ce4c0b50e1dd7683e
+DIST auto-complete-1.3.1.tar.bz2 155081 BLAKE2B 7ceedcececcd80b7d8207cb2ff88f2bbfeee892d56a96f44c6929323ca974206b6d977830a8593ba9f7c87ba86914bf9a0771f5e11a284d7bb42fdd9e9985b48 SHA512 5b82120f8faf1ee4ff139f4fbacb894fa0bf617b9a0aaebb5a0d672a6f90cb01bc35f0c99cebe2bef55cb7a6af6ce03936a7226c89e3c79248aacf4ae554fb7b
diff --git a/app-emacs/autoconf-mode/Manifest b/app-emacs/autoconf-mode/Manifest
index 66c412b7009e..ef4886ffce5a 100644
--- a/app-emacs/autoconf-mode/Manifest
+++ b/app-emacs/autoconf-mode/Manifest
@@ -1 +1 @@
-DIST autoconf-2.69.tar.xz 1214744 SHA256 64ebcec9f8ac5b2487125a86a7760d2591ac9e1d3dbd59489633f9de62a57684 SHA512 995d3e5a8eb1eb37e2b7fae53c6ec7a9b4df997286b7d643344818f94636756b1bf5ff5ea9155e755cb9461149a853dfbf2886fc6bd7132e5afa9c168e306e9b WHIRLPOOL 9d806d685b9951acb15ab837b08437a6632f0907f105057e84ba3e0d99539371c32153333f459f04fb537cbb96a80e4418937e937381aec677b319ad667f7918
+DIST autoconf-2.69.tar.xz 1214744 BLAKE2B 71d33d72a06e9a05fbed0eda73bc9d8a3805c7c90bf082959862f93f3c5f01192114176e84d84ecb58fa99512eafbc0ab21ad1407be18c8c63bb3dc1117c482d SHA512 995d3e5a8eb1eb37e2b7fae53c6ec7a9b4df997286b7d643344818f94636756b1bf5ff5ea9155e755cb9461149a853dfbf2886fc6bd7132e5afa9c168e306e9b
diff --git a/app-emacs/basic-toolkit/Manifest b/app-emacs/basic-toolkit/Manifest
index 309bd0f5edb5..cdd04ed453c2 100644
--- a/app-emacs/basic-toolkit/Manifest
+++ b/app-emacs/basic-toolkit/Manifest
@@ -1 +1 @@
-DIST basic-toolkit-0.3.el.xz 6524 SHA256 22d93aa75512c861dfad57bc4923527da31b7c8c9a8eee13ee2f73f985ecdbec SHA512 3ba22833e8e899c5276e9c36779b1cffdcf3a76adaa0379a346331190f4529c8706b7e3b850768ce270016d8bc184abb4a48dc5ed11bb4766062bae966e9806d WHIRLPOOL 5ede8fa1c938491457fd3fd1a7a0f38cff6eba696dcf9bfc3857880f429b3e794b988589ed6ec615ba0a2d9e958e64982d516d59ee018f645468808ab806a662
+DIST basic-toolkit-0.3.el.xz 6524 BLAKE2B e0cebca137c786faebe5b76b1fd0e9b7181a4970aee69c1486deabd8e7712e6b54a3491768212516f9b7c8cc5a073d41dd1a22b49a3a9140ae21e1756997ea6d SHA512 3ba22833e8e899c5276e9c36779b1cffdcf3a76adaa0379a346331190f4529c8706b7e3b850768ce270016d8bc184abb4a48dc5ed11bb4766062bae966e9806d
diff --git a/app-emacs/bbdb/Manifest b/app-emacs/bbdb/Manifest
index 0d9a043453bf..2bf9a8ec1b6d 100644
--- a/app-emacs/bbdb/Manifest
+++ b/app-emacs/bbdb/Manifest
@@ -1,4 +1,4 @@
-DIST bbdb-2.35.tar.gz 393097 SHA256 3fb1316e2ed74d47ca61187fada550e58797467bd9e8ad67343ed16da769f916 SHA512 ee815f62796bcda63d37ae5a3805d065f6cc79648ca86852b97d4c1b849a1eb6c8f46dab2f257b9a8f9efc44d38469739f98137037c10f79f37a1ff235f6a413 WHIRLPOOL 8b5bfb01d03618b9b7e5715484f2594b58ca5689e0a1a6f69df6430d276f207618e2a254042c2c539ac470732f8d746d9302db8a09609ab2226f3350ff6b78ed
-DIST bbdb-3.1.2.tar.gz 378935 SHA256 05780f030584ddaa717d04700bc70e7d9e929141223c7f130fc0c778d73241bf SHA512 8b32baadc4eb06b0abf533ccb1f540f4f407f27b8d2e847ae25e62d1405e1de5cfc6af16368eecd4086f281ee7a4016cf25568847b3cb798156c7e18e1912576 WHIRLPOOL d8d50c34ba3a1ccf879a1749b37f0cdc8c5d46ff4d01940256501574e933b1e8d141d6ded8bc6a797e6377b759ba55582b5d2c3190489e9cbf96487c7124dbb5
-DIST dates.el 7048 SHA256 8de33f7b00ac1766eb104c1bf2f362aff54e3de4d67cbd0a4da1b6b137363ec4 SHA512 51b0dca58a1b54e913a0dbd97df12230ec49f05b368404fa3d49cddf4ca8e14dbff47a28087c4ba41b189a38a3608c77454e102ae5bb124d07d1ad3ec9c39e71 WHIRLPOOL eb2239adc4e2b7392e6f091ef253685f155ab9acc09432b61d67b44f572f8cd774282806d2c50e48f80be4786890d000727f1fc94966289c2f03441844b52c26
-DIST point-at.el 440 SHA256 c9695455b96f17fbebc9cf0ae21b042fb04b688016279010d87c01e9d270e0c8 SHA512 e38cbf39cb3f29f51f6759a7ba548f065c4763668d38c746eb69d9ab2384357f6b1c7f032a6afe739bc64658f5863730b7a4b3023cc9df1cc5e088e591c02760 WHIRLPOOL 9dc36a49a8d5ea6a9a5619cbccd7e2a3f668d3c6bf917e1cf315ad0eb72fd3032d1c3bb40a17995b6b5ab81760f261a128ecd3b45615fd30d87ae2430a782102
+DIST bbdb-2.35.tar.gz 393097 BLAKE2B 194924e828cb02022e90b49bc1c1cf8cfa23146e3118dbf6be7310930463c743f1648d54daf5f605f8d7a83ea307974084cbc07d630ae2273e8147a05dced799 SHA512 ee815f62796bcda63d37ae5a3805d065f6cc79648ca86852b97d4c1b849a1eb6c8f46dab2f257b9a8f9efc44d38469739f98137037c10f79f37a1ff235f6a413
+DIST bbdb-3.1.2.tar.gz 378935 BLAKE2B 3fc862d2d68632c997e3f250aa82cced743c3cc3861c74789bb12015ab99745270c79722dc0342334b90f4dd9071ef809ab670a342ac227c24a927870907c25c SHA512 8b32baadc4eb06b0abf533ccb1f540f4f407f27b8d2e847ae25e62d1405e1de5cfc6af16368eecd4086f281ee7a4016cf25568847b3cb798156c7e18e1912576
+DIST dates.el 7048 BLAKE2B 866a9a7a5524290a7762d0ad3c7b91766ca61fa025c2f634ce11909fdbd2a6d8bd7316ec66649590148a92660ef6122c93bac8085f333f1e319cc740349a8e90 SHA512 51b0dca58a1b54e913a0dbd97df12230ec49f05b368404fa3d49cddf4ca8e14dbff47a28087c4ba41b189a38a3608c77454e102ae5bb124d07d1ad3ec9c39e71
+DIST point-at.el 440 BLAKE2B fba28258d84c378985d2f17e28f0258e1e671f831f726e1d1289e84e246d9965300aa303c7f7dd383c9d33ec84e1e8bb014bba1e4f737661a5522a37ce6541ad SHA512 e38cbf39cb3f29f51f6759a7ba548f065c4763668d38c746eb69d9ab2384357f6b1c7f032a6afe739bc64658f5863730b7a4b3023cc9df1cc5e088e591c02760
diff --git a/app-emacs/binclock/Manifest b/app-emacs/binclock/Manifest
index e8c304fcf682..f5df7ffc8fb8 100644
--- a/app-emacs/binclock/Manifest
+++ b/app-emacs/binclock/Manifest
@@ -1 +1 @@
-DIST binclock-1.7.tar.bz2 2734 SHA256 8ccb2ce75e2efffc95c22187dd27e5e00f22c476180c1cf6567c13f5feb341f3 SHA512 fe7d69605dc72777236930368e2900b71717a0a96655afa939c9cfcf76fb6cccc8c21cd81e933eed210a9e948b6d3681eb60f494f4aef276a1026a6dfe186354 WHIRLPOOL f0c25e7b88ebe2b9fad920fba76e78b817c673eed8a5b30db4c203ce7fc18140ef6a7ad95ab47c7eb836bf2f45ac458546f612c4fdc65cc2ee760cd6cbf3998b
+DIST binclock-1.7.tar.bz2 2734 BLAKE2B 57d872b2dc4259ca8cb033b8ff5359dd9f57fa2c7469b1ab6f2d0871cae74efef3f4874fac712b63ff783f50e0722e1959586a2e194426e0098c4e3bf16d8b5a SHA512 fe7d69605dc72777236930368e2900b71717a0a96655afa939c9cfcf76fb6cccc8c21cd81e933eed210a9e948b6d3681eb60f494f4aef276a1026a6dfe186354
diff --git a/app-emacs/bison-mode/Manifest b/app-emacs/bison-mode/Manifest
index 50af7a9ac1bc..d07ad9f32bad 100644
--- a/app-emacs/bison-mode/Manifest
+++ b/app-emacs/bison-mode/Manifest
@@ -1 +1 @@
-DIST bison-mode-0.3.tar.bz2 7541 SHA256 ad29b3f71d1d52a36a22271aa314eb986e3406706c34bfb5eca11161dd5adbee SHA512 b3b173152700562f813534d9352ed50cfac8ad131f037b1e2bf9d1370f0b56f109f14206cbfde82acac0c93a1bc0092da7f78c1b42fc3154248dfb1222a7f85b WHIRLPOOL 563b9def2187fdae93220a30d0e536eeb504b0f3706454a1c49074846ddb4c485c181ef0b3503e14d2c18c3553ef77b310b7fe5fcba3fdf860efc41f77e3f4f6
+DIST bison-mode-0.3.tar.bz2 7541 BLAKE2B ddd8d75f264a5f3fd38bb1b2df28973958e176c434fbc6d52c0afd9c38327b4be760407046ec359b93eb8fe5067774141ff97c66570a96990db1ae6b7a1e69bc SHA512 b3b173152700562f813534d9352ed50cfac8ad131f037b1e2bf9d1370f0b56f109f14206cbfde82acac0c93a1bc0092da7f78c1b42fc3154248dfb1222a7f85b
diff --git a/app-emacs/blogmax/Manifest b/app-emacs/blogmax/Manifest
index 495513a3a834..601a495e8329 100644
--- a/app-emacs/blogmax/Manifest
+++ b/app-emacs/blogmax/Manifest
@@ -1 +1 @@
-DIST blogmax-20110305.zip 194956 SHA256 c2143b7df9d194f0f97d9ddddf5e4bcabe5fdc78fd0b9cad200e2a528b5632c5 SHA512 dc0529c5d61ea9beaecf9dfdfe0631ae31fb9737845aa81f2ac7c19df7aa30eb7392f73ea96a00b678cd441f0815129bb04d521e697ce2cb3938d8699483d19b WHIRLPOOL f8fce4a9f37058f209c2076ba2473d6b57825204feb0ec68b39074c74e56b0fb6481bd640894e83dbb175b9cdec3df18b12bb408046b8186948deddfe8ede26f
+DIST blogmax-20110305.zip 194956 BLAKE2B b5f90254a218fc45b65faa8d5cdc53ec55f092716286a5757f483eed621d2142aeda398449b1c1b9c3acad67575025ce6bf9b9dce42f1d97d35227d13a0aa65e SHA512 dc0529c5d61ea9beaecf9dfdfe0631ae31fb9737845aa81f2ac7c19df7aa30eb7392f73ea96a00b678cd441f0815129bb04d521e697ce2cb3938d8699483d19b
diff --git a/app-emacs/bm/Manifest b/app-emacs/bm/Manifest
index 51a01c2e9f1c..5aa297913691 100644
--- a/app-emacs/bm/Manifest
+++ b/app-emacs/bm/Manifest
@@ -1 +1 @@
-DIST bm-1.32_p20140214.tar.xz 11800 SHA256 abd338d61ae10dff9c0635cac0f5fa3724605ec8bd2715738a7df000e2ed2ab9 SHA512 0a40c5dc3d21c0b8af7e885f7e2f48c92413dff48a6a3a10366f9a63274886cd22a247b61ef25e4ad1f283446b05093658f233c6501c6d0bf5312d9a67b83ff4 WHIRLPOOL 0937952bf331b24aae55fdf476522a7a9f6de84ebc541fde49dbc6e27738d229393dfddc2d822c844adc1f95846476bad81f63edd35f086139f6d9de056d94ac
+DIST bm-1.32_p20140214.tar.xz 11800 BLAKE2B 0c27f35a64dac09e5fff4391d6958ce5b2a2a6a8194a29500322137979e5fc0618fe1d47ca844bccba78d388d8a2569c5742f1a531c43c42a02845a31fb1f6c2 SHA512 0a40c5dc3d21c0b8af7e885f7e2f48c92413dff48a6a3a10366f9a63274886cd22a247b61ef25e4ad1f283446b05093658f233c6501c6d0bf5312d9a67b83ff4
diff --git a/app-emacs/bongo/Manifest b/app-emacs/bongo/Manifest
index 4d678e697928..81da00ff8081 100644
--- a/app-emacs/bongo/Manifest
+++ b/app-emacs/bongo/Manifest
@@ -1,2 +1,2 @@
-DIST bongo-20110621.tar.xz 97652 SHA256 0fa7603d8239351725c6abe37ca8781a221821defb081c329620ed4dcc2a5cfe SHA512 31c2a477cfb5ff36fbc64da29c725db0b0242ea09f80883fb21feb3b23f5c14c688379c4c4e53b26ffef3aca5d2813d5b2a38b91266da088c73516f7ea1d712b WHIRLPOOL 29fa53b77626cf0c8dc79bbdea16912dbb12ddb8cdcd344f98ecef5c20e480566aa6792341739efd08a600a0c5ef09b0fdb7c679aaf520f66845af3ca83a7adb
-DIST bongo-mplayer-20070204.tar.bz2 3563 SHA256 a80aa2c3c6def4e679094817ca9db3c0766811f094766ee4b399eec93c062ec9 SHA512 e503ed7980f011a6fc3fa75d0bb9b1cec1ed49d4fb07da92aad65e3c5096b42cf9eb203a8edbb93f2e7924254e4926e9f3fcf473de877fea130557aefad73ebd WHIRLPOOL 86ed787b8fa4909cbb89f24d17b524cc4b5d7c8d5e1d0c4ecac5289967176c599df58abc91c643f70f0c40cfbee573101641d7c53db35cd7521664fa22eaa93e
+DIST bongo-20110621.tar.xz 97652 BLAKE2B a3fd04f24b122af580e75ed68ad42dcd99045ab9cc7ea9fd273c9b256dc732fd6a0328f15489a50b427c85dad4de1ea2254afc257a9e3f2896baeefc1cff1c56 SHA512 31c2a477cfb5ff36fbc64da29c725db0b0242ea09f80883fb21feb3b23f5c14c688379c4c4e53b26ffef3aca5d2813d5b2a38b91266da088c73516f7ea1d712b
+DIST bongo-mplayer-20070204.tar.bz2 3563 BLAKE2B 684c702da46fedd365f780b165619b20e5da643db7b457cc527017971e18a2b0e843896d28216527adbda1e6e7432ff081a7368b697256ac79f2032b30d97123 SHA512 e503ed7980f011a6fc3fa75d0bb9b1cec1ed49d4fb07da92aad65e3c5096b42cf9eb203a8edbb93f2e7924254e4926e9f3fcf473de877fea130557aefad73ebd
diff --git a/app-emacs/boxquote/Manifest b/app-emacs/boxquote/Manifest
index 7bfaf80c25aa..f63c0c7eb829 100644
--- a/app-emacs/boxquote/Manifest
+++ b/app-emacs/boxquote/Manifest
@@ -1 +1 @@
-DIST boxquote-1.23.el.bz2 4957 SHA256 59ad204c4eb787bbc69a82d16737829bf6c6b44ddda1c5137d42245d0dcc6825 SHA512 776835e6a21ede6e7ba82a57f381f0c9c3c740994b4d463b76d1f8a328fdf7b1b996cf6c593c3300a68fa773f1dd21b7c1a8ccc38536d5f1874973541181646d WHIRLPOOL 9793910877ac827167b96023e033577b412d4eacbf6ebd40632ea5d5bd2e2897ae53f02c282d4ea5eb05cba08b9a138956f2bea4e4e515149bb647242c7ac309
+DIST boxquote-1.23.el.bz2 4957 BLAKE2B d132f6f4bd6448bff498b6b8d7ad20b2295e0febff025b02d5d6bcec58d6a963749a3f0b429269fdf32e9565caf490f09b1ac6466dc251a3b7dec0b546c4333e SHA512 776835e6a21ede6e7ba82a57f381f0c9c3c740994b4d463b76d1f8a328fdf7b1b996cf6c593c3300a68fa773f1dd21b7c1a8ccc38536d5f1874973541181646d
diff --git a/app-emacs/browse-kill-ring/Manifest b/app-emacs/browse-kill-ring/Manifest
index d746a0c04bfc..3a1ba99a0bce 100644
--- a/app-emacs/browse-kill-ring/Manifest
+++ b/app-emacs/browse-kill-ring/Manifest
@@ -1,2 +1,2 @@
-DIST browse-kill-ring-1.3.el.bz2 9225 SHA256 2805f8d512720e14ebeb57bad0b6c9383a4a24fa4d547da99f17594ecdf1ec97 SHA512 f77e41a932b4f28e2a31896424c6ad56d072145609254e3970733e2e4eca515cfe5cd86861f71ab37abfeaa0cc36939f4f50d97ef0ffcbe34e4806bad1819938 WHIRLPOOL 6a4dd7c7eb4087158f5a9f79969997c8e99fb1089392b2f6f5b708ab81a9fe14b61a02338396336949d08880a193188e9ff5da5c7debbdcc9c85994323b131ec
-DIST browse-kill-ring-1.3c.el.bz2 9757 SHA256 daa4784c160fd3f03d7e310a965b06da87732728591306d15c1c050cb75f3d18 SHA512 a7244db55b08b7247047cb71aa024dd2ba8579bd1588a31d65120145228729a329dac87c268b4be14b79beded6ec4f3473542c26bfb3c5624557023369737644 WHIRLPOOL 108b3594ba10e0c77ec9e66e2abd2c282fdfc3ec33e4fb9308da3e8e4516a88710d0d01614d470ab47b823f52456fea70baef3eba7b4864ab0e1b6f007e6abfb
+DIST browse-kill-ring-1.3.el.bz2 9225 BLAKE2B a1910653cfd188f17fc7fcad0ff4e042254ab585d5a50929c8b5effc4f55fd8383452fef7f394bed02715473095c1c819d27611789c3f716555a25406554ed05 SHA512 f77e41a932b4f28e2a31896424c6ad56d072145609254e3970733e2e4eca515cfe5cd86861f71ab37abfeaa0cc36939f4f50d97ef0ffcbe34e4806bad1819938
+DIST browse-kill-ring-1.3c.el.bz2 9757 BLAKE2B 3287de095f1909a7da702a12575c6ac0254c5dd4ea485007a96bcda0ac75fb9c9017a1f594b688387b7c005bb2dba2c689464730bb8ea9ff3f005a9cc02f4caa SHA512 a7244db55b08b7247047cb71aa024dd2ba8579bd1588a31d65120145228729a329dac87c268b4be14b79beded6ec4f3473542c26bfb3c5624557023369737644
diff --git a/app-emacs/bubblet/Manifest b/app-emacs/bubblet/Manifest
index 8a3f14b0dd3f..681842b761a7 100644
--- a/app-emacs/bubblet/Manifest
+++ b/app-emacs/bubblet/Manifest
@@ -1 +1 @@
-DIST bubblet-0.74.tar.bz2 7151 SHA256 791b02bb345fcc062f1ca8a724da84be870762c954e77f97cd993d03501ec691 SHA512 696425d7f854f83d9edf1e2fb195fbdf9a993b6758493620c9bc8e0c8bea2b94d758abf904bfebd983ff2093a25a55923964f32a1c5d47f0cb4665f3d5dda233 WHIRLPOOL 3144e6c15b27a83655ded8f4268eb2e92846633147eb9f9b2d7a47772e0fdfb4215204f63bba661e211f9626e3e735ec360fbf72ef81176ccd0a7b22f4e829a8
+DIST bubblet-0.74.tar.bz2 7151 BLAKE2B 96df4bab1eb564f87f7dec24cc5e64f1aeb9ad3502a8f4ae7b9a06f4d733f293626881765531433930752265efd5852bdba8667d9fe7e9507a431ecb95dff934 SHA512 696425d7f854f83d9edf1e2fb195fbdf9a993b6758493620c9bc8e0c8bea2b94d758abf904bfebd983ff2093a25a55923964f32a1c5d47f0cb4665f3d5dda233
diff --git a/app-emacs/buffer-extension/Manifest b/app-emacs/buffer-extension/Manifest
index b3105f0a69e5..493676072749 100644
--- a/app-emacs/buffer-extension/Manifest
+++ b/app-emacs/buffer-extension/Manifest
@@ -1 +1 @@
-DIST buffer-extension-0.1.el.xz 2472 SHA256 34dc964347be388aaba54c5a2f42d5f7b36eb53ef57cfccf1a0ee353a04860d8 SHA512 fef6380a7455fab534563da44868cbab2a54a793e7c86142171940b6133c4e8a9d7008c7f1297568135071eb4f1936f67ec6eea4d2f0a450be5337d97cd0139c WHIRLPOOL 5bc948ea4c9cdd422855a70e17c447a1167bc28ad5a8f149606f47f4e58f272aafbe8921d10fbc6312791a6281eee0291d1c6fe4d6237dee124b0f09968cb176
+DIST buffer-extension-0.1.el.xz 2472 BLAKE2B 10e6cbbe3075871c79a90dd17cd20fad15c9a12f5778758f94e6c509fdf5bb96a17ca0069c1420f53a320041ec5634034ea199e7515c8aef2c0f4808c376b259 SHA512 fef6380a7455fab534563da44868cbab2a54a793e7c86142171940b6133c4e8a9d7008c7f1297568135071eb4f1936f67ec6eea4d2f0a450be5337d97cd0139c
diff --git a/app-emacs/calfw/Manifest b/app-emacs/calfw/Manifest
index 3178a9102c28..06d8134af32c 100644
--- a/app-emacs/calfw/Manifest
+++ b/app-emacs/calfw/Manifest
@@ -1 +1 @@
-DIST calfw-1.3.tar.gz 67187 SHA256 b18b1955e34bfeb65f4dd238a1fe240bfb90c2139300ecf613a992d25e36a401 SHA512 76fc957dac22b2e4e41fa3d5ef3eb9e603369044d5aa90fa2e32ca0abbaa897d4537358f7849d0491c366b6a76c1b463e57e7a9483fca7c67555a8f6157f46bc WHIRLPOOL d68ccf2d696cec6e8fa584ea741a12d85c06fef3c1d7cfd93e151bbda976128c947456f5597bfe7ee7d586026ef58b603fff9612a229432cb786759a288b2159
+DIST calfw-1.3.tar.gz 67187 BLAKE2B 7a8f34c5d6ad2ac245837b89c6854ca0c3c8f94733752a8c0d86e460eb2424e4017bd01b877d2b4d6b8fe05f6ffac8dae2d838d6cdf68fad489264fe861317df SHA512 76fc957dac22b2e4e41fa3d5ef3eb9e603369044d5aa90fa2e32ca0abbaa897d4537358f7849d0491c366b6a76c1b463e57e7a9483fca7c67555a8f6157f46bc
diff --git a/app-emacs/chess/Manifest b/app-emacs/chess/Manifest
index 38c452742213..4be4ade6094d 100644
--- a/app-emacs/chess/Manifest
+++ b/app-emacs/chess/Manifest
@@ -1,4 +1,4 @@
-DIST chess-2.0.4.tar.xz 364620 SHA256 01ced9398b125756bb9a793a69b3caa64c697ba6f4307643b4fe70b94c9a118b SHA512 2c8155185878fec8b45ab84b7723f4af0f518fc81ab7534c36c09c96a9a30cb20da26c2a89320cc5a9f9d8991e4516da393e82658a7f15642929591d1b6a0e99 WHIRLPOOL 94b659e48efd0d58fb6c0084007c3b943b29dc250a745643dc06fe7b86aa57f4f2e9063f98ccba59fe77818b08fd7330324fc83e22211a603a5540c63205af74
-DIST chess-2.0b6.tar.gz 383951 SHA256 4d9938365965c109fc832109eec25d0a79d8c4b1ebd2025a4939ad88e75a396e SHA512 90dbb79f60d8d8e475c497a3d0da431e54b5bfe06285d493551c1ac6457e80ad9e71ada640374e9a0c4e9d5ee578ab68b2e370a47b5f5ff7f035caac839091e2 WHIRLPOOL 6a30f084dbb21fba4d69f1772acd33900fb4bd575b5e83596743fff25e475288386cd1f28e5f070e658cce2daeb5ac797e20559cab6a05fab2cf135ad2548b88
-DIST emacs-chess-pieces-2.0.tar.bz2 297687 SHA256 c47278127ebcd8b4503fe4058317436757f795b1404cc02b883dce215eb1c1b0 SHA512 e1ee59a338b68796fd60f8693f4ff8bf20ded535c516916cc8b1f4cf00ff696ca1eead844e2a6a9a1f2578a70370d7a67cbadb6ae454ae16b2ae93864e1b1f94 WHIRLPOOL c1951531aa0ba09442c389f39240946c476184458f339352c6cd2f243e71c15b5c62dd84b88a424aa80520ec36c65c43c52aa0223d35ddfa0524f96cbd274d04
-DIST emacs-chess-sounds-2.0.tar.bz2 3390098 SHA256 32c3577c512157523bc40d514a1682d9381bd28b3d8f5788c22eef5ef2cf6257 SHA512 f07894dd7a6e43450405c0eee8d1d95a08925ca8ebd5ca7e584eca45369cb2aa8eecb754b351d1977f473b520288d3e3e9a8ebe73216d14e26345b44e498efb4 WHIRLPOOL ea7190ab9fbb0648ecf7f765b7975ea3065feb4a057b3f4d5d6fe4b91554f81744bd0fb667c1fa0aeb98471947b56f4ecbe0af1b60a18225b767f2ff8535afc6
+DIST chess-2.0.4.tar.xz 364620 BLAKE2B cf02ff2734d675ac39b6b00869abe233a71af330fa60114d12092604d0173c6da5ad5c2e4cf3e2262c99cfc598abdbbe02a7df4eaadda7c628c8b9c48d8f8a8a SHA512 2c8155185878fec8b45ab84b7723f4af0f518fc81ab7534c36c09c96a9a30cb20da26c2a89320cc5a9f9d8991e4516da393e82658a7f15642929591d1b6a0e99
+DIST chess-2.0b6.tar.gz 383951 BLAKE2B 0bf5a15e5e00ee824158cb3372eceb0f4f05f713ebf1561ccc97d00146df876ea21ef4ec650c6c733ba092d1205f3803891cf6be6b59b1ef281e5a67a75e3f7d SHA512 90dbb79f60d8d8e475c497a3d0da431e54b5bfe06285d493551c1ac6457e80ad9e71ada640374e9a0c4e9d5ee578ab68b2e370a47b5f5ff7f035caac839091e2
+DIST emacs-chess-pieces-2.0.tar.bz2 297687 BLAKE2B b97f6bbfdb4573e7a59e50431ac4ce68d2acd698ed57a2a2b9dfc83c7afdadc3ca244e8a0d55fa29eebcf7234001062606c0d21c80675864804a27d47deb6b93 SHA512 e1ee59a338b68796fd60f8693f4ff8bf20ded535c516916cc8b1f4cf00ff696ca1eead844e2a6a9a1f2578a70370d7a67cbadb6ae454ae16b2ae93864e1b1f94
+DIST emacs-chess-sounds-2.0.tar.bz2 3390098 BLAKE2B 1babc804a4ef05d4da4cb56d0829e93dfef84e703b1c56dfcbd14f941357dee68e4dffaff13b30498037f907a62c79751f53be33582ecf5c1c266d8aea492fb1 SHA512 f07894dd7a6e43450405c0eee8d1d95a08925ca8ebd5ca7e584eca45369cb2aa8eecb754b351d1977f473b520288d3e3e9a8ebe73216d14e26345b44e498efb4
diff --git a/app-emacs/circe/Manifest b/app-emacs/circe/Manifest
index 128435b28162..54ce733d6d81 100644
--- a/app-emacs/circe/Manifest
+++ b/app-emacs/circe/Manifest
@@ -1 +1 @@
-DIST circe-1.3.tar.gz 118776 SHA256 02598a9e1e28fffc526fa81fd5350622af303f766a45771f99d0c0df08e294f7 SHA512 60bbd752c73e875f2306877591ad8de324db0a7446bbfebf460e44ef19c0c28d40d08c8ed9e0caa4062859b07545d310d86380377a479eb6bc38c72decfaa213 WHIRLPOOL ac531d3f5aa4a5697c2927c4b33913101383ac92ff61f159505935d33bf0b69e61db90a975840d55e790209355a4e4930bab6928503a12698558089a0cd39a92
+DIST circe-1.3.tar.gz 118776 BLAKE2B 61ffc7df022be50beaba29a4025fde6d7cbde5cab28d0661e2e3388f712281f8d9370b92e8c56b4eb49984573d5a2f7edff308a7d1fe74ff630620f0867b1441 SHA512 60bbd752c73e875f2306877591ad8de324db0a7446bbfebf460e44ef19c0c28d40d08c8ed9e0caa4062859b07545d310d86380377a479eb6bc38c72decfaa213
diff --git a/app-emacs/cldoc/Manifest b/app-emacs/cldoc/Manifest
index 045027da16a7..17043f0a41ba 100644
--- a/app-emacs/cldoc/Manifest
+++ b/app-emacs/cldoc/Manifest
@@ -1 +1 @@
-DIST cldoc-1.16.el.bz2 16869 SHA256 7f75cb6d05939cced1030b095d8136f4a1d0918981fa1660cba9382edafabf18 SHA512 6b53418252e6c139cca24768b502d58cb9d316fd5778b541306b5e7806e9ddac1d7662e099e7dd90c98932555adaeb8a7481b0a72669d5231c803818133cbacc WHIRLPOOL 79a349253f1d50bb4b068fbeeec363b83c7d1c5f4cf83a2f4b8eead4fc153e2b403afa04a9a1661d4a774ed78a1482a1c8e4c73efdcf29ca37395c694845b511
+DIST cldoc-1.16.el.bz2 16869 BLAKE2B 5ddcb96e77be37c00cf4c2e897d3b8c7ef71aaa236258a9aacd015eca36b91708e8a174113b7b3bccdc755825817fec429c57a6294049e1fc161632a2849ad98 SHA512 6b53418252e6c139cca24768b502d58cb9d316fd5778b541306b5e7806e9ddac1d7662e099e7dd90c98932555adaeb8a7481b0a72669d5231c803818133cbacc
diff --git a/app-emacs/cmail/Manifest b/app-emacs/cmail/Manifest
index 4cfde9483c5a..a449ae81bac2 100644
--- a/app-emacs/cmail/Manifest
+++ b/app-emacs/cmail/Manifest
@@ -1 +1 @@
-DIST cmail-2.62.tar.gz 507137 SHA256 b59c19fe9e8ecb0269960691916f5328f8fa133363808a59ece125fc7bf65668 SHA512 0b042861b6975910f281e949592bce7d83f94f6f5c78690ad7a4ecd4267b57c1e84fda0746d3018194d4e6d1a3c84a5a4c7fa172ec25027a957ad8400aff17b8 WHIRLPOOL 3611265181dbf9b4c5157c171f1f69ef59dec6f166f674c7ea75dbc6c5dbcbd3eabb39b445b6e2f4e7c23fdb22b763482bb0b3d011248e4d803dedc95227f519
+DIST cmail-2.62.tar.gz 507137 BLAKE2B b12500fe3bcb58a65436822eed057865eedfdd1ca5f91805987b61d940e187598b6edacadfff83857533b29577ff89836328d7f9fed1ae7f1bc35fcd42129816 SHA512 0b042861b6975910f281e949592bce7d83f94f6f5c78690ad7a4ecd4267b57c1e84fda0746d3018194d4e6d1a3c84a5a4c7fa172ec25027a957ad8400aff17b8
diff --git a/app-emacs/color-browser/Manifest b/app-emacs/color-browser/Manifest
index 03747ebd9fb3..bc80c87a9808 100644
--- a/app-emacs/color-browser/Manifest
+++ b/app-emacs/color-browser/Manifest
@@ -1 +1 @@
-DIST color-browser-0.3.tar.gz 18685 SHA256 5456c099f8c90d943f8b8e02a4199a631cac0952a91b41bede09b2dc0464fdc7 SHA512 76648adbd1dd990ec513ad9a239e6ed5ba86ce29a689e74f669b943498dadf14d019eff81a416ca574e78f031dbf14ed9b1e467a3d197ff559f75b67033ca2d3 WHIRLPOOL f2523f80fee2f22df0ed8ff2ce81fdf445686026ab9b94d67c472795fbc5a3ec96e6d7b30a8d22f16140fc4493d6cf46a22d408e4bcb1b5a9ffface411bc8747
+DIST color-browser-0.3.tar.gz 18685 BLAKE2B ffbce159134cb896e2c9b53fd8348e7e35171392238bbb3648ceebe28811046f4e53ba435740873aeb73c83dd793b12b2429053ca4e0d7c1957caf86c90eac36 SHA512 76648adbd1dd990ec513ad9a239e6ed5ba86ce29a689e74f669b943498dadf14d019eff81a416ca574e78f031dbf14ed9b1e467a3d197ff559f75b67033ca2d3
diff --git a/app-emacs/color-moccur/Manifest b/app-emacs/color-moccur/Manifest
index 648e88124de7..a0450885ad5f 100644
--- a/app-emacs/color-moccur/Manifest
+++ b/app-emacs/color-moccur/Manifest
@@ -1 +1 @@
-DIST color-moccur-2.73.el.xz 22252 SHA256 5abd5ac46edd213c5b6065f549d969104465c91cd0c4226c83d283355652469f SHA512 15ce4c9776e5a5bb273c31b8552a8f434a2a4065e874ee558ef2b9dd19ccda6f5807430e7588c4e2e1add8d0d94dba3e19be2745138ea440d4ac2705efdbf528 WHIRLPOOL af48750930e2dda291e1a360a0e981faad4849c572f2f36b6ce8701409c9853be7966716ff5d293f83a3acbc76a3bbdf5f3868111d27c63fb655aafc5ad1a7eb
+DIST color-moccur-2.73.el.xz 22252 BLAKE2B d7d6a1ff291c44cfe4ec2597ac0f27c63d7f953f807788eca00e74d8b50910cbffcce9076b136c27d7ebbb14a3743cab40367791e7607c439854a1b6baecea6c SHA512 15ce4c9776e5a5bb273c31b8552a8f434a2a4065e874ee558ef2b9dd19ccda6f5807430e7588c4e2e1add8d0d94dba3e19be2745138ea440d4ac2705efdbf528
diff --git a/app-emacs/color-theme/Manifest b/app-emacs/color-theme/Manifest
index bd5e4e8456fa..1a9fbb84a05d 100644
--- a/app-emacs/color-theme/Manifest
+++ b/app-emacs/color-theme/Manifest
@@ -1 +1 @@
-DIST color-theme-6.6.0.tar.gz 124858 SHA256 56d35f02dc4c8dd386a7242007432adc458466c8a48d0d680eda1826197ca17b SHA512 4faa22900f6ad4a1dd57452470e23b57827d3f02bf2b9e3c4eed6f5693432d6478aa5008e67f219a95412a63fe52dbcad15b0ac7a3b4d39f1d28ceda75e5e76c WHIRLPOOL d4139af0f1c2d3c14e6b142cb7eac1f28bcb89cf011e4b6041fca0bc5c01810ddb2e1e9cc916887c5f11741fe69d0fed996473d5f662ec35a85de224909b96ae
+DIST color-theme-6.6.0.tar.gz 124858 BLAKE2B b98e97b6c02fa9bac30c5eaefaa1724f751e1176b99fcf10e5d44507ada0c82e2cc2df8352c6d605d097a0c3697b071c2cf9bfe32b4a8cbf67cf00dd5c1545e4 SHA512 4faa22900f6ad4a1dd57452470e23b57827d3f02bf2b9e3c4eed6f5693432d6478aa5008e67f219a95412a63fe52dbcad15b0ac7a3b4d39f1d28ceda75e5e76c
diff --git a/app-emacs/company-mode/Manifest b/app-emacs/company-mode/Manifest
index fe92e834f2a6..8e0386fb9cfa 100644
--- a/app-emacs/company-mode/Manifest
+++ b/app-emacs/company-mode/Manifest
@@ -1,2 +1,2 @@
-DIST company-mode-0.6.14.tar.gz 51776 SHA256 5472cd634bf09da4557f055d3615afdd5436f814f63923ad94ccbebe60ab5e08 SHA512 7b8c0b70dc9c010214e8671fd7393faa9d1dd0839f41d532eb93eda91c77b4c93f2145ad2d688011976bfbb45282f35b937f195499f29cda79147ec2815e94d9 WHIRLPOOL 1aeefc6e4a5d7e3696150c38187131811c88fd3e9478a401400a31a7f7f7e3aad42736cabb093398470f9b20041639143665bb9d7335e2ae40ccfab8d2ab91ce
-DIST company-mode-0.7.tar.gz 54670 SHA256 73d55d9288537800c23f5e9e5b6208dd5e36e29271dca1a6c3840ca20142a268 SHA512 375c8541a0c5b34fba37ea136c8549e6ec916c238bee8115f036d88f273d6bcb0c0f436a6193d3b4be6528945d8f85c605de8d340e903a9764f5ace664f8cf61 WHIRLPOOL 23e18a37be0a2c1f4c7ded455557a5503c8f25b910ce5c0f36d8b09a22bd4aa96a944b0363750fce6b111dc3854c896f1800ac4dad20f99c76d7e0c9829e6014
+DIST company-mode-0.6.14.tar.gz 51776 BLAKE2B 2e5a651b13d959d964847a307814106b5db95092d764e1d6889c94412d0aa1995d2a34182786493afc426b6c6ae4f229498f58b7556d1dc264c71ec57dcb8b6f SHA512 7b8c0b70dc9c010214e8671fd7393faa9d1dd0839f41d532eb93eda91c77b4c93f2145ad2d688011976bfbb45282f35b937f195499f29cda79147ec2815e94d9
+DIST company-mode-0.7.tar.gz 54670 BLAKE2B 4b56182d6d37e1c0dd827babf3e5c17c49a2e86959c99aa4dc6832f5003a9c1baf0019c610cf9bd46e6db5f1d68e72381ae22f71afb636873552440c48b218c0 SHA512 375c8541a0c5b34fba37ea136c8549e6ec916c238bee8115f036d88f273d6bcb0c0f436a6193d3b4be6528945d8f85c605de8d340e903a9764f5ace664f8cf61
diff --git a/app-emacs/crontab-mode/Manifest b/app-emacs/crontab-mode/Manifest
index 4e50056a7525..56b182c76f57 100644
--- a/app-emacs/crontab-mode/Manifest
+++ b/app-emacs/crontab-mode/Manifest
@@ -1 +1 @@
-DIST crontab-mode-1.20.tar.bz2 2617 SHA256 e3c79e655ee62bb9f61ac4e665755bd2a3d55877eaa0c4c59e7a0ff7a7b52936 SHA512 30588baca16a46c2dd079bce12386324ccf26eb50e7a99c8e824704a399d0a7f34b425c5732a196a5e5655b242d243a02fdc816abbdfaaaaa87f983e4846cbf4 WHIRLPOOL 53c26a54998bd847fdf5d09a50c1897c9914eea82293d5df5a2656edafef712f0299d9ceda18b7a56dafddfb6777fc5467e145e116bdc9203f025b361985b99f
+DIST crontab-mode-1.20.tar.bz2 2617 BLAKE2B 39c29c077977f0776f71784ee3daf09cf67a8bf9bf300702ff3ee6ea809bdf4d7c8019613d897320f19e32bbd718e4b0c92d14a748384ab8d02e3643bbd3ad6f SHA512 30588baca16a46c2dd079bce12386324ccf26eb50e7a99c8e824704a399d0a7f34b425c5732a196a5e5655b242d243a02fdc816abbdfaaaaa87f983e4846cbf4
diff --git a/app-emacs/crypt++/Manifest b/app-emacs/crypt++/Manifest
index 44764e7b1399..4b12537558a8 100644
--- a/app-emacs/crypt++/Manifest
+++ b/app-emacs/crypt++/Manifest
@@ -1,2 +1,2 @@
-DIST crypt++-2.94_pre20080430.el.bz2 28692 SHA256 198a90f32a0461ad0fcbccfc9c0782217cd9ba44183daa2e21108c35e02fd3f6 SHA512 8e142840f8e2db4688e9ce4432ee14db4225899a88a35dea3e371f829ccfc24faa34c607517e344e7706bf75126d758b0490dd5324efa43d4649de127076a5ce WHIRLPOOL f17ca1ed7888597b5ac2f640ba54752c2fb80bf47b36dfcd466f95aa7c2351b589eb006278fb618c798b66461fa1739a0de538289ba28838d7fb4c0eeae4f40d
-DIST crypt++el_2.92.orig.tar.gz 34251 SHA256 ca0a44968c6a75763857fcd61063310a6011b912be473e09d8762a6451f9f3a4 SHA512 d3abf169f60c3d1a270149b800d96f7132ebeb99b6952858b81cb2c05ffdce30f6c46f75723490731c47e7eb44515554e012da98351bbd9f9127dcba8453e389 WHIRLPOOL c4326c2daa6ac0c207ca028d5d4f3756f9499944428f8b9eaaf66d8d6cdb29016c7c0cc8cc83317e880ffc351e2b28a7492ee710d2b11396ea90876c3b257a46
+DIST crypt++-2.94_pre20080430.el.bz2 28692 BLAKE2B 2b7f227b87b16fc6b3fdfdb62059a55c70ee95008a144bc7ec0e8c3f5699ec2ba14989b8ae2da3fa7c4bb56070eac7ea1755caddfd27e6c2a53e8a62068ca6cc SHA512 8e142840f8e2db4688e9ce4432ee14db4225899a88a35dea3e371f829ccfc24faa34c607517e344e7706bf75126d758b0490dd5324efa43d4649de127076a5ce
+DIST crypt++el_2.92.orig.tar.gz 34251 BLAKE2B 579d44269ec84a9548e9e4cb845601027be3862f2f56a2ab99b3c46155f6839c7e5b9426c97ea12ac936df62fb533f5424de8afc7df6983f339eb166b6df6486 SHA512 d3abf169f60c3d1a270149b800d96f7132ebeb99b6952858b81cb2c05ffdce30f6c46f75723490731c47e7eb44515554e012da98351bbd9f9127dcba8453e389
diff --git a/app-emacs/csharp-mode/Manifest b/app-emacs/csharp-mode/Manifest
index 3575da909a90..5d6756d1c9b5 100644
--- a/app-emacs/csharp-mode/Manifest
+++ b/app-emacs/csharp-mode/Manifest
@@ -1,2 +1,2 @@
-DIST csharp-mode-0.7.0.tar.bz2 6254 SHA256 e72a17972283691c33080aaa60d8060576d2951f1e374da223cf76468bd2eeec SHA512 b6cbf2899853c29f44d19f37a01984a03c61f7bde144880f6f32e2a890d3b90a546ff69ad328d157e5494191aed37836373f49ddbafac49d8b9bd1cea3e22de9 WHIRLPOOL 58816ec16158adb4de40fe27540a3734813012ecd7f345fc048faa4807d85ecef9617d82e30f945ad7dfb1452ef066a1ed3e38c3e792e43940e23464ba70c552
-DIST csharp-mode-0.9.0.tar.gz 50453 SHA256 4232fe0fc4528be543ca1e338ce3e839814f2a5b43e480c16b7b4f1ea1bca3c5 SHA512 81661d98acdf03e01caf3b9388da8571e78402b8914755b223a38a723457a988201adcaf7b5b825c4e0126ad5e7628063f85dd4e60ee272102a5f1509f9446ef WHIRLPOOL c84d316b0160b092e5d368fc0020e9a05a2616b7da80cb8777dc7a80b7cbc19f79eeb5f112d6541343e468281958db4c3c1ee723c1b8443de93813bd6a636c81
+DIST csharp-mode-0.7.0.tar.bz2 6254 BLAKE2B 259d3ab7a6005428043398d44068dd8accc222c50581b7a760c740af96275a5877efc186d2582dccdc73442b9549bc8f5e1ff7f95e69effa7c90bbffc46fe461 SHA512 b6cbf2899853c29f44d19f37a01984a03c61f7bde144880f6f32e2a890d3b90a546ff69ad328d157e5494191aed37836373f49ddbafac49d8b9bd1cea3e22de9
+DIST csharp-mode-0.9.0.tar.gz 50453 BLAKE2B ed4b6ba56a9283687db332749510dcb63cc4bfc35687979cabae48b76d9e36598c88ff43f2920ca5272b56833d5cadd6602b47be21d88a7cd25d6ecb0e748493 SHA512 81661d98acdf03e01caf3b9388da8571e78402b8914755b223a38a723457a988201adcaf7b5b825c4e0126ad5e7628063f85dd4e60ee272102a5f1509f9446ef
diff --git a/app-emacs/css-mode/Manifest b/app-emacs/css-mode/Manifest
index a82f493e1e2c..32fcdcbff5c8 100644
--- a/app-emacs/css-mode/Manifest
+++ b/app-emacs/css-mode/Manifest
@@ -1 +1 @@
-DIST css-mode-0.11.tar.bz2 6848 SHA256 f7980d13a2d5ba2ac6873fdc2c7b54db5c13e93294a2c1068b4b04e7b6a2f7d4 SHA512 b93574fde8bb24ffc4dac6ddda20db3ec3c1834c1201f250f24805d31c7972edc2ffc157e7717327e7baac5c71a1d943a9d80bc7bec96be99c44cd2ab16e0e03 WHIRLPOOL e9036b4ef8604025aa123fc56c51b2171f0027d493134b89a96d2eceef3b0de3668c5ced5396c684b3ff8cfa595eb21d3ddd491a3c2b45f486955cee4f020b30
+DIST css-mode-0.11.tar.bz2 6848 BLAKE2B f5110cb5e1db9cddd47372dd8ba180892b9d9a5999643832227fb710089c08526eb077393350440ac30d2860a84dd821368323a528ce2056ca82a890399302ed SHA512 b93574fde8bb24ffc4dac6ddda20db3ec3c1834c1201f250f24805d31c7972edc2ffc157e7717327e7baac5c71a1d943a9d80bc7bec96be99c44cd2ab16e0e03
diff --git a/app-emacs/csv-mode/Manifest b/app-emacs/csv-mode/Manifest
index 8de7aa129751..52c31991371f 100644
--- a/app-emacs/csv-mode/Manifest
+++ b/app-emacs/csv-mode/Manifest
@@ -1 +1 @@
-DIST csv-mode-1.50.tar.gz 14379 SHA256 ece4d72af5f829cc0c3702c22a7968940c69f9ac1dac474e25c2eb725e4fe8ff SHA512 f62e9561f3ec9c14d0fc44de92f83b733ab86e45ba4b8919e5dbbee05d25a346cf7f1412aa0c5be7e88079d219dd4c22d6e198f4e53f801ae1b137e014a7943c WHIRLPOOL 3fa41e2cf377f39a6cba6bf2ac9c9cd61cc71457af2f71bc5f4e428821af14bb3751eecda03c96119824b03749bd7916daee4027a2e4424c93c5b7139dd6a40b
+DIST csv-mode-1.50.tar.gz 14379 BLAKE2B 8b3b60414aa8d6c54f18a0452c1f0d7ea4cb85311392f928e3ec99555b91cd9e7a47e4315b07df3970acf4c05b05b85e1a4e2e7b87b3bb8527904003f89ade75 SHA512 f62e9561f3ec9c14d0fc44de92f83b733ab86e45ba4b8919e5dbbee05d25a346cf7f1412aa0c5be7e88079d219dd4c22d6e198f4e53f801ae1b137e014a7943c
diff --git a/app-emacs/cycle-buffer/Manifest b/app-emacs/cycle-buffer/Manifest
index fb673761a34d..a0045ba00447 100644
--- a/app-emacs/cycle-buffer/Manifest
+++ b/app-emacs/cycle-buffer/Manifest
@@ -1 +1 @@
-DIST cycle-buffer-2.16.el.xz 5392 SHA256 bf7a63fb50dffdb553d13c41bd8aa188b6eebda4b1de4e5e10d450c86398c3a8 SHA512 344c07af9e2c9ff06dfa81ff44d02c1e8a9434381486c227a7af06c989e7c623b0f9bf547500b320e2ede7d181f0212725c03a84f53a43683ab3b8229b99a6c6 WHIRLPOOL 43f3b8793ead034f59488d9082d6f72df2a72598285e6cae5b175ddb52b12a71b44fd90fdc8e8140a9f8c0920cbadbf7b7df11b17cb6273ea72af3cfd1d34704
+DIST cycle-buffer-2.16.el.xz 5392 BLAKE2B 7d4b765da320109274605731bfc6910bf75ab4a0610f75d4dd4a4b45e03c7103a76bf0dedffbdb67831d0c8cb04f147f8c77757cb40b714c80a7bc69c9105b79 SHA512 344c07af9e2c9ff06dfa81ff44d02c1e8a9434381486c227a7af06c989e7c623b0f9bf547500b320e2ede7d181f0212725c03a84f53a43683ab3b8229b99a6c6
diff --git a/app-emacs/d-mode/Manifest b/app-emacs/d-mode/Manifest
index f5594f0595e4..5d032ba22e90 100644
--- a/app-emacs/d-mode/Manifest
+++ b/app-emacs/d-mode/Manifest
@@ -1 +1 @@
-DIST d-mode-2.0.6.tar.gz 5465 SHA256 303ede6d2555ab935676ec4576d36c79bc880af86f37838a3b651b39f20a8f38 SHA512 8706459af61e49b3ca1ef6d4021abff752706b4dca9385c4fbe2b7c29ecb028dc3df558b1e9b3a358e5c38e3d2ab7121505583f95d3afdd9a06bc9449ed678f2 WHIRLPOOL 6f86955536c68fdc6da917c453d0e2ab9603de661abb6b2c504a298a8f76ad4111a0afa2ac0e5b585f8f7acb7a8a688fd3a3089726aa4150476acdd4364ae09c
+DIST d-mode-2.0.6.tar.gz 5465 BLAKE2B 4ccb9341ac25c4856c1dc3ce7a7acc68942fb7ce3dbb6818b2fab6de843b6f6757907e994d2e777d0590b8ae26fbf4483eaa7d1b5e0ab7d635047ced4a276c60 SHA512 8706459af61e49b3ca1ef6d4021abff752706b4dca9385c4fbe2b7c29ecb028dc3df558b1e9b3a358e5c38e3d2ab7121505583f95d3afdd9a06bc9449ed678f2
diff --git a/app-emacs/dash/Manifest b/app-emacs/dash/Manifest
index 4e25c84c3b1d..d17489480a08 100644
--- a/app-emacs/dash/Manifest
+++ b/app-emacs/dash/Manifest
@@ -1 +1 @@
-DIST dash-2.13.0.tar.gz 146280 SHA256 0bc298129ff3421ba2de87b95c157fe35be0f7f26de83eae5d8558947f9e54de SHA512 59969e3df1b258a1bae76904e5abaf64c5143de9b8994a04799dad3a317c6ccc1dcd19b99a337a23bce0e46cfb6bc90bf8c6b0e6a532946b4f0ec188d331b559 WHIRLPOOL eda8c2dcfb97074c7459cc281c068a4fa724e4ea66cff5299c55145b997124eb1b39b2a3ff87ce059343e71fa4a04d390d0603af181be012dbf80d5272b6ab7a
+DIST dash-2.13.0.tar.gz 146280 BLAKE2B e9552a19b1f84db0e16fba07fe5bcfc0eb8a6871aabf395fa7ca527b77ba23616fdaa29e67d73e6cf11260bd23807be17de1e52f4abd23b0f9562cb26e6a5feb SHA512 59969e3df1b258a1bae76904e5abaf64c5143de9b8994a04799dad3a317c6ccc1dcd19b99a337a23bce0e46cfb6bc90bf8c6b0e6a532946b4f0ec188d331b559
diff --git a/app-emacs/ddskk/Manifest b/app-emacs/ddskk/Manifest
index c227a7c6d284..62a96d8b162f 100644
--- a/app-emacs/ddskk/Manifest
+++ b/app-emacs/ddskk/Manifest
@@ -1,2 +1,2 @@
-DIST ddskk-16.1.tar.gz 878564 SHA256 fe7229d8ec76e955527878f8bb8a55767a8901069392b403dcc4a9402298803c SHA512 68875f7ad89ce847103bbe4644db3800c84cc5907a4769c37f7aab5bc64577e1ea5f49de41c5708daf3f5f2bb7176237dcec5ea05e52a61f7c78cfb2670ced7b WHIRLPOOL 85ede848eb5d788238d2aadbb81f06b143f5039b8df6952dfe0fa6df00332aa70889f95db449b80e7920d26ef7987a7af394ed40efce40b12ca7432858dedc8c
-DIST ddskk-16.2.tar.gz 886618 SHA256 76d13486d7615a75d71107782684e7100cae32f21cec6a44731c192010a7a108 SHA512 591d66e2d217a289ce8273ed7da10c0ed72029e961efde0537044f7ad3f5f46943cf5c71ec1d97a27743fcea91a9fab81c86e2772047892f53e2852bf58ef45c WHIRLPOOL 9041bb4669bd61adc3207286aa16c48d0edd3223350a97f428a9badd4cbcbdfc97b0fb69a3a343798c64a48579bb90ed9594351acf3e0b1747a0bd01fd95b51c
+DIST ddskk-16.1.tar.gz 878564 BLAKE2B 4b57311cf4478999d19835f12594943e1a74ee4f8705ddd6140c924bd1a90251f4127187de7df7ae1bf0635f582c4e9fbd29e644dc80a89fb3fd2eed84589b72 SHA512 68875f7ad89ce847103bbe4644db3800c84cc5907a4769c37f7aab5bc64577e1ea5f49de41c5708daf3f5f2bb7176237dcec5ea05e52a61f7c78cfb2670ced7b
+DIST ddskk-16.2.tar.gz 886618 BLAKE2B 854b9d57993e8f69af4035df49511ec110a1afd83ee290be8934283fc5f2a1a648b80f80811396083fa019d9eb12469998ff26b692296dd770c21da81c3cad3e SHA512 591d66e2d217a289ce8273ed7da10c0ed72029e961efde0537044f7ad3f5f46943cf5c71ec1d97a27743fcea91a9fab81c86e2772047892f53e2852bf58ef45c
diff --git a/app-emacs/desktop+/Manifest b/app-emacs/desktop+/Manifest
index 82248270921f..67464f54ddc1 100644
--- a/app-emacs/desktop+/Manifest
+++ b/app-emacs/desktop+/Manifest
@@ -1 +1 @@
-DIST desktop+-0.2.tar.gz 19596 SHA256 74b1c4115e172e11c658c61f156c6a01fc3b862e7fdba5b3a92e5779dbb78fcf SHA512 3fe0647e506832e37378862d59f5d748f8db20d4ad776d7486ba3393f67047a69f0e5704042eec2e2327ead89b6b2e55196f5773efbe975f5913a6ec6f01269c WHIRLPOOL 18ac8dba3a49e65d0368a9a39b7bfb6fe412f0f641aebec80cc31ad80807c4f08584537c8b23b8c305ba1b0b9ba7dcb41a6ab9867949c7bbeb073be5db505073
+DIST desktop+-0.2.tar.gz 19596 BLAKE2B 601591977f981ebf66b9b01d397b08e3e0a72c73515760cf8b3333a0d25a9b8747a2f207ffeb13ed1c0292888049b4263ed6ecc875dd70273661a826be28a89b SHA512 3fe0647e506832e37378862d59f5d748f8db20d4ad776d7486ba3393f67047a69f0e5704042eec2e2327ead89b6b2e55196f5773efbe975f5913a6ec6f01269c
diff --git a/app-emacs/develock/Manifest b/app-emacs/develock/Manifest
index 365cc848aefb..78762e4aa310 100644
--- a/app-emacs/develock/Manifest
+++ b/app-emacs/develock/Manifest
@@ -1 +1 @@
-DIST develock-0.45.el.gz 13627 SHA256 0d8b69e8b4a30a0b50c6393056fb339dcf8088e220ef1d8ba663659ddad318f3 SHA512 e868efe9426ad6aed4c46bbbac3bc90c9207cd94367dedf7ac93710ae04d9f18348b10603c56d436dc1553be94f65b79615d5293578b9e7bb1a7b783d7a3f41e WHIRLPOOL 641aac67bcc27951c40f793a4897ad29d2dcc2526de7e4625ee6bb76617e5e90a39211f07475bce247f2f0010af15c0e6f9dabb834325d54d7cdc9c18ed0bd62
+DIST develock-0.45.el.gz 13627 BLAKE2B 8c67a46ae7eba961fd64b202128ca19da54251d1079bb4c9091c2b99a6dd6d3f42f1273c5d7ffd371911af3fb3b64e723f6a6d0bd432a1c243701d8ad793bf64 SHA512 e868efe9426ad6aed4c46bbbac3bc90c9207cd94367dedf7ac93710ae04d9f18348b10603c56d436dc1553be94f65b79615d5293578b9e7bb1a7b783d7a3f41e
diff --git a/app-emacs/df-mode/Manifest b/app-emacs/df-mode/Manifest
index 8fc155dd27da..797f87e48665 100644
--- a/app-emacs/df-mode/Manifest
+++ b/app-emacs/df-mode/Manifest
@@ -1 +1 @@
-DIST df-mode-20050509.el.bz2 3867 SHA256 e5ae29113c5ff5c646b8fd7839539ca387133b37fbee31f47907b7e572d5ca0a SHA512 e4d248d7b1fa9c231bac7d8d478c65d796123234503372ca945f5b122e62d816676c9744d42f41b1c6de6716682ad4233eeb57801155760cf7e4d41dc0e7d535 WHIRLPOOL 05a08b7f332d4cddff838b2b90e70843976781bccd0e8a943ad3eeaa59795f69c401c40d931697eb54ce35dba6c12f09f6445d45c542eda0e4552e92d72d9141
+DIST df-mode-20050509.el.bz2 3867 BLAKE2B f5051cba3b14174017e20983d26cb847ee8daceaf011b0f37f246e4730dd12fef5ed67131a86909636af28f22780563e4c5ba8d282e0272bbf08d0a89cc308e5 SHA512 e4d248d7b1fa9c231bac7d8d478c65d796123234503372ca945f5b122e62d816676c9744d42f41b1c6de6716682ad4233eeb57801155760cf7e4d41dc0e7d535
diff --git a/app-emacs/dictionary/Manifest b/app-emacs/dictionary/Manifest
index ceec026f4050..770384e42545 100644
--- a/app-emacs/dictionary/Manifest
+++ b/app-emacs/dictionary/Manifest
@@ -1 +1 @@
-DIST dictionary-1.10.tar.gz 33332 SHA256 9a8e0111590b09d3587f790ed1cd6d117bf82887cb10135be93af3e1e8e5ea60 SHA512 7f5ec0e023ea2ab3f42fbf9200c1ac86cbcb330c14d2fce791f65cdce010d7e6a6c72e0589769dd94fe3c3d7543b730aacfb373e496933caccf8542224bfa356 WHIRLPOOL bd1d2efad94679981de38b3e14497c256d4bfe23a532e16e6457c89aa1a27e5ffe68433e50647cc42c6090d4f15f9fd6616f38c3819a4fbe8f3718bfa93d10d2
+DIST dictionary-1.10.tar.gz 33332 BLAKE2B be0e5d851d3d66f7bb0bf08a7763d3c1e54ed8023ee9d0e3560965baad8cddb67894d85f6ace8caac6d2c1aedf24b3b753d7e48e706a49ace1a1a8ba0edf1b42 SHA512 7f5ec0e023ea2ab3f42fbf9200c1ac86cbcb330c14d2fce791f65cdce010d7e6a6c72e0589769dd94fe3c3d7543b730aacfb373e496933caccf8542224bfa356
diff --git a/app-emacs/dircolors/Manifest b/app-emacs/dircolors/Manifest
index c4bcb9455b95..852f0876f328 100644
--- a/app-emacs/dircolors/Manifest
+++ b/app-emacs/dircolors/Manifest
@@ -1 +1 @@
-DIST dircolors-1.0.tar.gz 2597 SHA256 c948b446e3063621f79eb4bb1a7b21f2d9a3d22f37f818b64510fe2af9f05e63 SHA512 345faf78607ce7522b21b14b34643b8c9864648bc99327ce7699daed91bf0050f69e3f3d229df4271ba47d8262b8555c394e6d4b3038ffb7fa53d5aea7cb69f7 WHIRLPOOL dcd78a68aa771a10ffa0d3e66464db947f8b40bbd03bf6cef725fa06c017c093e96a4216ddb37cd5fb2e5087c6c3c46f51e5811c6d679274385b331ea491d40a
+DIST dircolors-1.0.tar.gz 2597 BLAKE2B e215e172d09699592b23dfa686945309ced317cdcdd27ac7632147adf51899f64662113aadaf87b8bd8bb2415afea9158c87d4c99ce3a586267c715d62d8e825 SHA512 345faf78607ce7522b21b14b34643b8c9864648bc99327ce7699daed91bf0050f69e3f3d229df4271ba47d8262b8555c394e6d4b3038ffb7fa53d5aea7cb69f7
diff --git a/app-emacs/dired-sort-menu/Manifest b/app-emacs/dired-sort-menu/Manifest
index 2ce5313de90d..b1d3442a3994 100644
--- a/app-emacs/dired-sort-menu/Manifest
+++ b/app-emacs/dired-sort-menu/Manifest
@@ -1 +1 @@
-DIST dired-sort-menu-1.26.tar.gz 9770 SHA256 a4992d57cf86252a5c1877cee4066a42feee371b39abd3ac22bfc1f775ebf6a8 SHA512 aab746704636c01b7319574274786ce4bdb36e94b738a8cf2fdfd22aaddf8a68d9ac274a0f6c34caaed505f8ccfe8ad932a64f560d2e312ac161af528d63a577 WHIRLPOOL f9e64bfc130718aa45d465ac216c5ad30549120ce51c22dd51fc2eee6a9f5a13da7d4843043f887ab99063a00f019c958fd366064d523e08ad63337c41fd936e
+DIST dired-sort-menu-1.26.tar.gz 9770 BLAKE2B c594e8577ab78ca376056ff1f6afc23f61a5a6ce8b0ed914d71a91bdb9bfbb77e4cedf1e8db81bb9afc56e346305f587bdc83e8c6c3427377a3370bdf92f27a6 SHA512 aab746704636c01b7319574274786ce4bdb36e94b738a8cf2fdfd22aaddf8a68d9ac274a0f6c34caaed505f8ccfe8ad932a64f560d2e312ac161af528d63a577
diff --git a/app-emacs/distel/Manifest b/app-emacs/distel/Manifest
index 82b5aa91f5e4..755b567f7027 100644
--- a/app-emacs/distel/Manifest
+++ b/app-emacs/distel/Manifest
@@ -1 +1 @@
-DIST distel-4.0.6.tar.gz 210257 SHA256 a80538fab51008f4821f687e7bcda98b7ab9e6e3ef7d695087505a2e40caa1e1 SHA512 510f82b6794379d89020d234462e09251e0db285ebc111eaf096e32a4e3619384650cb2b47ed68d38762a496504b58981c73ca5b930bd0eb1407aee9599c149f WHIRLPOOL e8fef7f804f98fdf7a1bb97cda97f7d4e471ec5ca01d112d80c1ebd2cede5c0bb8f5ac023407820843a61dec959f31755aa50a2faf34021c9b8aa48d4fe0bf45
+DIST distel-4.0.6.tar.gz 210257 BLAKE2B 615682bfc2b773a78ad85d4817135144dda787d1db57b2743ea2fca8ed672fc1e37f6bc23803c9cc2b6096e7376d318cd7c25c3133f7b9c1326dbd451273841b SHA512 510f82b6794379d89020d234462e09251e0db285ebc111eaf096e32a4e3619384650cb2b47ed68d38762a496504b58981c73ca5b930bd0eb1407aee9599c149f
diff --git a/app-emacs/doctest-mode/Manifest b/app-emacs/doctest-mode/Manifest
index 22fbfa19e776..eac954b9c43f 100644
--- a/app-emacs/doctest-mode/Manifest
+++ b/app-emacs/doctest-mode/Manifest
@@ -1 +1 @@
-DIST doctest-mode.el 75232 SHA256 368c750b7b4e1f70db8d1b12e5d1e65ea7e2d7e460c96b24af7c353632a897ba SHA512 e32326644cb66bf5cfa9a597364a46b2279636368c751940eb418c670219cd907ecb60f6d2b6a8a4ec8970df4f17500be053b9fc6b75fece908dc37329d9aa9c WHIRLPOOL 8e08413989d1270b97ee48738d015cc618521c1d5866f3d406ab783cd0e481f2d695a743a24370c89c8a248039e3d2e8a1a953fd7a4de36e23617b6ea510f600
+DIST doctest-mode.el 75232 BLAKE2B aefe0953e66ebf5a3dd8a650a013af66d9eda41a496411012caf49098daa67d5576b5e1fb149cdfe4d088bc3342b83943676b58d088e685ee724875ab9aa0c15 SHA512 e32326644cb66bf5cfa9a597364a46b2279636368c751940eb418c670219cd907ecb60f6d2b6a8a4ec8970df4f17500be053b9fc6b75fece908dc37329d9aa9c
diff --git a/app-emacs/doxymacs/Manifest b/app-emacs/doxymacs/Manifest
index d595dd0a094d..1d3b1cecba13 100644
--- a/app-emacs/doxymacs/Manifest
+++ b/app-emacs/doxymacs/Manifest
@@ -1 +1 @@
-DIST doxymacs-1.8.0.tar.gz 133600 SHA256 a23fd833bc3c21ee5387c62597610941e987f9d4372916f996bf6249cc495afa SHA512 7461a8a415aadf331f856e4f122712cbedc2907eff9e452f24e6ee83b96903d9944d2cfdbcfeab8a66144a0be508eae723c29f82a081df9723560b10c444f8ac WHIRLPOOL f8b39d0a38032c1364d1d4ccf9a78f87be877fc8655cf29a8b189a01ec0fb76ca2b26b52c19fd780c27243c0ebf5f344331b62f1278efa3c341851ee7a9c86c0
+DIST doxymacs-1.8.0.tar.gz 133600 BLAKE2B 0e1545498234eec6259ab89a406286dc6f73c1fbec5001ef3e89513de6d91b499e33ca6e25b344dd33c763c59424e592647619f548b223ab1f9ac821815e60d4 SHA512 7461a8a415aadf331f856e4f122712cbedc2907eff9e452f24e6ee83b96903d9944d2cfdbcfeab8a66144a0be508eae723c29f82a081df9723560b10c444f8ac
diff --git a/app-emacs/dropdown-list/Manifest b/app-emacs/dropdown-list/Manifest
index 49674ab7145f..95baf690322a 100644
--- a/app-emacs/dropdown-list/Manifest
+++ b/app-emacs/dropdown-list/Manifest
@@ -1 +1 @@
-DIST dropdown-list-20120329.el.xz 3104 SHA256 46da77f2fab70f75deea8f3dd439555c940f063a40c325211f8767b18ec2b634 SHA512 fac1139c1339cb94be6bfd2c0e6adddfd1851b55aaba6112e0c451e2666f22cc0fa9013d5cc03bb86c6adf3e4f076d90975ab8e59546956d753cd9613309919d WHIRLPOOL 5cc05236728e540b949edfa3a011fe502dd92c2ddcc7da893d1de2cc3003c2aef86845df21eb04f06a7f0f51c75c60562aeb8a982c0e95cd2701c4d309cf5bb2
+DIST dropdown-list-20120329.el.xz 3104 BLAKE2B 37d240cad53bf2062b3877f4d6118c6f1fedd28da68f7e4d7ffb9d38492a5805f7e01c5d640770e40ab271fc007fd640fd9500d15c208f9c5af79c01c19b9330 SHA512 fac1139c1339cb94be6bfd2c0e6adddfd1851b55aaba6112e0c451e2666f22cc0fa9013d5cc03bb86c6adf3e4f076d90975ab8e59546956d753cd9613309919d
diff --git a/app-emacs/dts-mode/Manifest b/app-emacs/dts-mode/Manifest
index 0422ebd4a976..e41ebc74c003 100644
--- a/app-emacs/dts-mode/Manifest
+++ b/app-emacs/dts-mode/Manifest
@@ -1 +1 @@
-DIST dts-mode-0.1.0_pre20141014.tar.xz 1944 SHA256 9882970b6be92f088a81d233f7ef9c23c697ddd231ec41e8fd73feab196782c5 SHA512 81679f83dfe8e9d2f5b9314cd16615ca79c16e36468c41f5d499584f08ddda73f6cd3c6b6bef3251129e292884e18b8615a0a5cec2c2ea0146718e784f0c210c WHIRLPOOL 46296d6a9e84e4e6944bf7852583b980ed99e141040981e0a15c78e1f14222462d9cc2067d1768aa7e6f15bcbc7b3981e769e17eec9ecfcb148ee9eaff0e9596
+DIST dts-mode-0.1.0_pre20141014.tar.xz 1944 BLAKE2B 352a8a3e3430a5684e440b5b930990094bba6db6cc653be792725bdfdc7cec6ffcbd0a7b1fc138ab2edde274ea77e46dfddb5f3479faa7ac8137d82acbfcc978 SHA512 81679f83dfe8e9d2f5b9314cd16615ca79c16e36468c41f5d499584f08ddda73f6cd3c6b6bef3251129e292884e18b8615a0a5cec2c2ea0146718e784f0c210c
diff --git a/app-emacs/ebuild-mode/Manifest b/app-emacs/ebuild-mode/Manifest
index 4184e3ed8d7a..605451c549b9 100644
--- a/app-emacs/ebuild-mode/Manifest
+++ b/app-emacs/ebuild-mode/Manifest
@@ -1,3 +1,3 @@
-DIST ebuild-mode-1.37.tar.xz 30816 SHA256 f7368a8757036874dde542c69c26b824fe3da5241098f89a6b7d7e2665cbbf1d SHA512 1d570b213ad0c6eef8817f69c99c0862703b9bddc24477234dde542b697ba372a06bbe8e4a91179a7d528b720a7dbfc13bb92c8ea0a4d3b3b8684fa4ee0065c0 WHIRLPOOL 75928f5965bdfe66733e203588f01ab3b5de67a5958d33f41069d0793842bd9617ab0904ab71f95aeae04e0aa2f55646e4c545d6199cc1d357140b8fd1a714ab
-DIST ebuild-mode-1.38.tar.xz 30744 SHA256 63f39bb1a09e29b86e5048f162f4779f287c8825e161a092e74530962947d3c3 SHA512 bfcc4fb100f7d9299e9b466c7661e865f9b93ee352780da1647f1a98159fe3e9eeb8cd4b7d1d9906d532316d1256ec7b6f821cac3d064cda15f2fd62ca7cb349 WHIRLPOOL ea61825ac0fd2d50ec9722088b03ed9664708dd6fac076ff3db8323bfdf8d1b2e351c7059f2f77471ea200b7a19d9f67ab233ebdb743ece80218f0e940fb0706
-DIST ebuild-mode-1.40.tar.xz 34676 SHA256 fcce06f2c429989cecb50d043c50a06c28e640987aef84f5760a1c5df1793ef2 SHA512 50caa3255ff874e779f8dcb34b84845fd3b03edee35fc20df8aa3606dc2a00a4a0e88fab79f7872cfe3e92f04263ce74e60f3aeb1d97a2706116414ac9b352d5 WHIRLPOOL 369b152f1ffa6cd818fbb5be7d1ef054508056adfa1fa614d8bcbfba71c8b7f8a61e7b81ee162632cb31e4914c15c7def07bc64ef62a41eafbb9572749a35037
+DIST ebuild-mode-1.37.tar.xz 30816 BLAKE2B f93d1513ec3f2eab4fc4dda4d46aeedaba7f2ffecf20e6f90426c84e979fe72120719b13182ca407576effcf62f839ebc9c2f94d5f9e9d8230b449dd74a58dcb SHA512 1d570b213ad0c6eef8817f69c99c0862703b9bddc24477234dde542b697ba372a06bbe8e4a91179a7d528b720a7dbfc13bb92c8ea0a4d3b3b8684fa4ee0065c0
+DIST ebuild-mode-1.38.tar.xz 30744 BLAKE2B a147fbb462f0e1a2ba3272c74b12c9357200b0ca6671d75263547d7b777489772504c9fda634a797fecff8dce35e40b7bb579cdbd9a7da99f68f74b08a48a4da SHA512 bfcc4fb100f7d9299e9b466c7661e865f9b93ee352780da1647f1a98159fe3e9eeb8cd4b7d1d9906d532316d1256ec7b6f821cac3d064cda15f2fd62ca7cb349
+DIST ebuild-mode-1.40.tar.xz 34676 BLAKE2B bf34c773966540f67c74fe72a8c47073f9385ba210ceecaf8fa8977a67f5945314090c0555b2b12dcee8486ed495dda062d6d36bcaff3a291f3d4ba5ca6886fa SHA512 50caa3255ff874e779f8dcb34b84845fd3b03edee35fc20df8aa3606dc2a00a4a0e88fab79f7872cfe3e92f04263ce74e60f3aeb1d97a2706116414ac9b352d5
diff --git a/app-emacs/ecb/Manifest b/app-emacs/ecb/Manifest
index 77fe417c4b4d..2220bd521f51 100644
--- a/app-emacs/ecb/Manifest
+++ b/app-emacs/ecb/Manifest
@@ -1 +1 @@
-DIST ecb-2.41_pre20140215.tar.xz 565404 SHA256 f3103afd4324cfd1c50bf4c1d6a6d52d94af192b1f4c8665a91c87929b0635a2 SHA512 bf87bdd38e7ddaeec044fc56d56f7c456ef0a1922f50b962f932bf739895f046387bab7a934439e749fd7e838d9f742938408f4f9cb47079440abd8c1ba181b6 WHIRLPOOL a1906bc4cad119959d76a5e3d79c97fba9d302eeea67e86bc597af449a6b6b2efb7053c4a9251502f35f571b7d69e557b6b9d7a52a11f4e69348e83649d2433c
+DIST ecb-2.41_pre20140215.tar.xz 565404 BLAKE2B 135aa4a71bb41e78933604c5e549d8a163715061c7946e90a115cf802499f9a78884e554cbf4fd4edc9b5856b1f32b3189eb3e1e2537b16e5dd57cfe3ccd1ee3 SHA512 bf87bdd38e7ddaeec044fc56d56f7c456ef0a1922f50b962f932bf739895f046387bab7a934439e749fd7e838d9f742938408f4f9cb47079440abd8c1ba181b6
diff --git a/app-emacs/edb/Manifest b/app-emacs/edb/Manifest
index adc976273301..16f8658392db 100644
--- a/app-emacs/edb/Manifest
+++ b/app-emacs/edb/Manifest
@@ -1,2 +1,2 @@
-DIST edb-1.31.tar.gz 585728 SHA256 f97bc288af71c5011aa6c251ac0bbf458b30b926b1c1a1f12e2cb0470e0e4c38 SHA512 99af00f1e876b490205e9c3b1807d0af0efcd9a5bff018629f00e36d1572f7d05e979d6bfb50f9c15edfe3ad5382fa6f6171f13c638f3143ece53790bdaa31c3 WHIRLPOOL 53f7b8f47ef0030bf5967bf2983602f15aa7bdaf397ffae4598a9a0c6f7b58346e9abb6d118ec65180b6f72534a92221b2a7c01ab1d965e986cca074c4d55dba
-DIST edb-1.32.tar.gz 692581 SHA256 b85046de79f00eccadb0181840771385ee9e3a40ae745e503c750c70debd1e80 SHA512 ee8bd642c019d30401202f540b37f28c914c17083123ca61b741de72d168ecb855d0508f922af208bb717b02b4819cf6f3c5137d589f2e858410a3e9ab4034e0 WHIRLPOOL 267c4642b9b1a0ebf8d78391b35ee6a6ae30efcaca3bc3bad83121b03fae105ea462db9c540b3c7b121de9d6c16f347c69d657054794a18fa2c9e6c65b3f3a81
+DIST edb-1.31.tar.gz 585728 BLAKE2B ffe1ef3171724b1c608d347393955615a48737230f7493e22c48504134682d1c73397e1e559708f16ab2284a17b4b6baff7dbb15e255511b6ed5d07d6a22e249 SHA512 99af00f1e876b490205e9c3b1807d0af0efcd9a5bff018629f00e36d1572f7d05e979d6bfb50f9c15edfe3ad5382fa6f6171f13c638f3143ece53790bdaa31c3
+DIST edb-1.32.tar.gz 692581 BLAKE2B 3f77d6f9d6550ce1c064dc0820fdc9a24293964900d4f390ad1456e79f42444d7c9512585cf230d742e66360011e2e314446748e23395bee1e7f8086c38853b7 SHA512 ee8bd642c019d30401202f540b37f28c914c17083123ca61b741de72d168ecb855d0508f922af208bb717b02b4819cf6f3c5137d589f2e858410a3e9ab4034e0
diff --git a/app-emacs/edit-list/Manifest b/app-emacs/edit-list/Manifest
index 51da7b90bda9..c37c8350f897 100644
--- a/app-emacs/edit-list/Manifest
+++ b/app-emacs/edit-list/Manifest
@@ -1 +1 @@
-DIST edit-list-0.3.el.bz2 2072 SHA256 2ce1542d60938987f835ed0fb67d975bf7ac0b1ce1b732ccdda07e65b427c23c SHA512 f7441d42e95b46d0cefd5cc32af5c0738aa15b338b81e31dc89fa968fc34e6387b6bc927999f4e077632acf6c2edcbbac609eb066363db896099f5fa3e19c1e7 WHIRLPOOL 8ec7b7c269cc6dd5c3cc74c2829420e7fea4e3155e003df8869499d9c3daf61a0f193ce443ffcbae4533f208aae0abd2dc306b5ee8e52d7d16429579e6a785c9
+DIST edit-list-0.3.el.bz2 2072 BLAKE2B f6e98b44a6ba73bc727d5725c58756d4dd70017831deb184ed1e7f40697fac37d3b7a7a78dbc51218b5b2cca924702032ba29f5d42b3c814edd6b4d64f31ecaf SHA512 f7441d42e95b46d0cefd5cc32af5c0738aa15b338b81e31dc89fa968fc34e6387b6bc927999f4e077632acf6c2edcbbac609eb066363db896099f5fa3e19c1e7
diff --git a/app-emacs/editorconfig-emacs/Manifest b/app-emacs/editorconfig-emacs/Manifest
index 4cbc72d5745c..d47180ba91a5 100644
--- a/app-emacs/editorconfig-emacs/Manifest
+++ b/app-emacs/editorconfig-emacs/Manifest
@@ -1 +1 @@
-DIST editorconfig-emacs-0.7.8.tar.gz 28250 SHA256 3abb4bc349a50fc84f7cc006a355edd773cd21d5a728fb0cb64eac80fa948ff6 SHA512 21815a5a778ffef68b5205e409aa827c1bd6c9a8c542647ebec889a9f00f5b3f71e3a2072bc2f0373e8ce30c1bb57f5f6350953a3c149742a8e2e46ca9846c9a WHIRLPOOL f5fd5d66d075a57204bcad0eae6a4569cf17f1eb77b1d89873e5d3f645dd3241a4cceaefbe8918753d8cec83969f335993f57ce169bac9fbbefc5208482c6ea2
+DIST editorconfig-emacs-0.7.8.tar.gz 28250 BLAKE2B 8c09b7e495ff38d4276cdbaf60109f91b3e32215f2c6a8aceffd80a02cf024d79eac1739b3f2efa3697b78804da32d0cc2969db628d1064a0fb1db1b059a191d SHA512 21815a5a778ffef68b5205e409aa827c1bd6c9a8c542647ebec889a9f00f5b3f71e3a2072bc2f0373e8ce30c1bb57f5f6350953a3c149742a8e2e46ca9846c9a
diff --git a/app-emacs/elib/Manifest b/app-emacs/elib/Manifest
index ddeba21bb9d2..5507f45d562a 100644
--- a/app-emacs/elib/Manifest
+++ b/app-emacs/elib/Manifest
@@ -1 +1 @@
-DIST elib-1.0.tar.gz 58335 SHA256 2109764b6220e2936e7d98effc323723f688f148dc66519cdb79d07bfe82f134 SHA512 ca5d6e0861f3d8d049911a9e4455169263bd781992103baacadae560fce0fedddb734617338cb5fac51420fcb2035622042836fa7198fe7bec312a0015da266d WHIRLPOOL 3093777dcddade3d4c69deaff9b9c23a2e53f6ec747e536e435d352e881230d183299663fc73a0173bda94d3862aef744ea5f4e387c1fd5cb9002091b3a71847
+DIST elib-1.0.tar.gz 58335 BLAKE2B 7c2a976685cc23a73fce86d63f40a476d24551415d7427044ca9e5ab72df64043d8102db21394f66f2fdf2b98bdc336312d3754f16b891122cb1e170ff3fa62c SHA512 ca5d6e0861f3d8d049911a9e4455169263bd781992103baacadae560fce0fedddb734617338cb5fac51420fcb2035622042836fa7198fe7bec312a0015da266d
diff --git a/app-emacs/elscreen/Manifest b/app-emacs/elscreen/Manifest
index 509c3300dec1..93e1d90d4e36 100644
--- a/app-emacs/elscreen/Manifest
+++ b/app-emacs/elscreen/Manifest
@@ -1 +1 @@
-DIST elscreen-1.4.6.tar.gz 21680 SHA256 134cef5b4ffe75898ca30776b4a4191a9425cbafc650a43e87aae4188adbd650 SHA512 2f19941c9c3e74bbe3912e99f53710f42d33a5b063af99c3907c478d2f571a50a75942519bfcad3bf178585f736bb6e2baf2cdffe8ac66b8e4dbd1b0d881fab2 WHIRLPOOL 8eb4c82941bdee8af3e0e396623efcfae406e254cd8228579e53281311b299f4a0e90e5346292728a099344e0a6206ae0f5163bca428f09d4d2c110b55f70cc8
+DIST elscreen-1.4.6.tar.gz 21680 BLAKE2B a23b7eb617e67205e816cb5c6588f65d8140788ab9c32b90b9c1f53dc4497e6f8250f3c51c38aa40780872f3d878a34aaf2fb455c61640d327df6e3166a59dc7 SHA512 2f19941c9c3e74bbe3912e99f53710f42d33a5b063af99c3907c478d2f571a50a75942519bfcad3bf178585f736bb6e2baf2cdffe8ac66b8e4dbd1b0d881fab2
diff --git a/app-emacs/emacs-common-gentoo/Manifest b/app-emacs/emacs-common-gentoo/Manifest
index 7254540e1156..fd7d7bba1a0f 100644
--- a/app-emacs/emacs-common-gentoo/Manifest
+++ b/app-emacs/emacs-common-gentoo/Manifest
@@ -1 +1 @@
-DIST emacs-common-gentoo-1.6.tar.xz 61224 SHA256 7f43a198068abba9e0735f7dee3bb642dd1531e33563ded364751319bea8f9ec SHA512 a7daed2241d778ab283482ecc016801e25084eed10fcbbc50e187d5f842df5a0d278a77f94ae950b086c8651e8ca1a18f89c11dffdde9cf9168755288aae926a WHIRLPOOL 7112026dda683d6282807181e7a6e1d666c90df0858b63ae704db05b40ff59b10ab984dd066eeb91fc670cff71eb9bc94cac7b19571409ac166d53a6cec16e39
+DIST emacs-common-gentoo-1.6.tar.xz 61224 BLAKE2B 70e4f30c26c9098fdb02a53cab5d60cb611143d8bac6947707f3c7596b5a81ceb513b5a0809ee90f351472824f1d4216720c02cadb51d25b3dfce5e436e02bdf SHA512 a7daed2241d778ab283482ecc016801e25084eed10fcbbc50e187d5f842df5a0d278a77f94ae950b086c8651e8ca1a18f89c11dffdde9cf9168755288aae926a
diff --git a/app-emacs/emacs-daemon/Manifest b/app-emacs/emacs-daemon/Manifest
index fdaf1dc3b39d..8c51ac74ebf8 100644
--- a/app-emacs/emacs-daemon/Manifest
+++ b/app-emacs/emacs-daemon/Manifest
@@ -1 +1 @@
-DIST emacs-daemon-0.22.tar.xz 5276 SHA256 62743bc32f48bd5406dedb1d5356e7959c413dbc295977de0315a6ea8c1c6272 SHA512 f013cd00d3a24ca348bf718dd20dec7bea89107c0a27c921d6b58595b611991830604fc658d57681708218fbee1dae6dd0b277a2a9da67639e3553e0fd133094 WHIRLPOOL ccc9a7bc1d378b4b64873f9458284bef9008b1380a58700d5210404a216a62fe98d0b4547e28a2f52d0b3e958b45c84e8654eddb4fab48854629cb513462b948
+DIST emacs-daemon-0.22.tar.xz 5276 BLAKE2B a866b14951df94e1d382253dcb7045beb800c9dd754f7eed40eadecde43fd583bb2bc20ad9ccc9f87174b06aadbb26f7875deaf36d9bb5325f98ffa58fded8c7 SHA512 f013cd00d3a24ca348bf718dd20dec7bea89107c0a27c921d6b58595b611991830604fc658d57681708218fbee1dae6dd0b277a2a9da67639e3553e0fd133094
diff --git a/app-emacs/emacs-jabber/Manifest b/app-emacs/emacs-jabber/Manifest
index e0ea60dae831..5103c340f7e0 100644
--- a/app-emacs/emacs-jabber/Manifest
+++ b/app-emacs/emacs-jabber/Manifest
@@ -1 +1 @@
-DIST emacs-jabber-0.8.92.tar.xz 293948 SHA256 f2efa690ea21a86ad0d0d8feb38d4dde809306334cc1294ee9f8f128313b9c93 SHA512 30cfb5e420914e411bfbbc0c4f1b7fb78190bee6aea61fad0f9b426e0138608f327626da6ff792fc443c58b7d3b70dc3f6291ca4e1a16965fa1283f91afe8882 WHIRLPOOL db53b7c758b81b5f512877f33ca035760804c989f08fc9e7d08960d800b7d5ef68c382d9cf43705ce6f8a0c4d9a253244a679afa4a34bc3b14bd90a4d52f08a4
+DIST emacs-jabber-0.8.92.tar.xz 293948 BLAKE2B 0de6eacb0ae1487a080a241e9ef4c38a98d96647773b7d35857e958e06f35906963947f7de836d2ea80a1935f96ccbc79de83ab88ce307085017ba229679f0f0 SHA512 30cfb5e420914e411bfbbc0c4f1b7fb78190bee6aea61fad0f9b426e0138608f327626da6ff792fc443c58b7d3b70dc3f6291ca4e1a16965fa1283f91afe8882
diff --git a/app-emacs/emacs-w3m/Manifest b/app-emacs/emacs-w3m/Manifest
index b5f2b735146c..399c8449828a 100644
--- a/app-emacs/emacs-w3m/Manifest
+++ b/app-emacs/emacs-w3m/Manifest
@@ -1,2 +1,2 @@
-DIST emacs-w3m-1.4.528_pre20140213.tar.xz 751532 SHA256 0be76617be14532493f95c1bb01b4c7337aa0407c5effe58d32feb9bd2b30f7f SHA512 f4ccb41f2011354c091c9b07b2ab596f030a6b2e8ef2ef674db75c93e5bfe7347b8b3602283e169e7fd591c44b222482d1a399880c60176fc55a5e77ed728483 WHIRLPOOL e3c838c1d65735899f74e09ed5362bc93e79564cb8c5076cf2dcd77880dd9d72afb7c3ddc2f9d60a49f1bda1766a6235ae702c368878e654d890127f6d0e445c
-DIST emacs-w3m-1.4.570_pre20170203.tar.xz 765108 SHA256 2923b18dcd9daea27ab2e3bbb8c3328723da97f34a0eeed57e8803ccad72f268 SHA512 d1940679055d7ad74b7c417dc9e56061524f5afdf758075139e279c2df325af10eae334a6b83d40d39857237396da04744f19c293ffb8adb2e579c32ed118b52 WHIRLPOOL a77c2e78d82f46482e890d28678fa05ff4c23f657093f22b0e03a8e8a8b70898ed9caf1a27c0d640f6d168b063b188ed41d285d14c39b0c41be7da6600256b82
+DIST emacs-w3m-1.4.528_pre20140213.tar.xz 751532 BLAKE2B 14527b80ed3938f2685a98cf37633a9ba046b070d94dffd7c8082d65c09dfca4a63114aff55d0bfe85853d8623db55dd63db3e7d10142871287312281fa4ef59 SHA512 f4ccb41f2011354c091c9b07b2ab596f030a6b2e8ef2ef674db75c93e5bfe7347b8b3602283e169e7fd591c44b222482d1a399880c60176fc55a5e77ed728483
+DIST emacs-w3m-1.4.570_pre20170203.tar.xz 765108 BLAKE2B 75568e543719a25863ee943293f1a6ca4fff8b5af19a39d910efe5a8bfa7f311ef3620c34a6fcfe23e231e33d61c9ba5a03cf39b23155982079a0cf28471a341 SHA512 d1940679055d7ad74b7c417dc9e56061524f5afdf758075139e279c2df325af10eae334a6b83d40d39857237396da04744f19c293ffb8adb2e579c32ed118b52
diff --git a/app-emacs/emacs-wget/Manifest b/app-emacs/emacs-wget/Manifest
index 96e441b39f0d..273b59ecda3d 100644
--- a/app-emacs/emacs-wget/Manifest
+++ b/app-emacs/emacs-wget/Manifest
@@ -1 +1 @@
-DIST emacs-wget-0.5.0.tar.gz 37074 SHA256 ce59516c15f9de0c637d033419605c58f4da2f5ba762f74a5911cc96b6df7e81 SHA512 32d322cda7435b901115cdc01ef6b6e84f2af7f686f7d6a89cc486523d9d8b9807903c4ee0fb945a4ff457720033523beb34037e29ef7c9cdf2a10c62b725d54 WHIRLPOOL 9ba21389535396d8cb79dabf263cc276a087644f52a5497b7bce30d26162598636fcff8fdec1a5e9b362afa4101501b8138ce8ce8d995857ac745b9ff12b0818
+DIST emacs-wget-0.5.0.tar.gz 37074 BLAKE2B d2922c0396dfc745335ee5adc7bad1ecc440ada6e43ac1be00939c592fca5a5de0ea0e4a69a4186efe7a23cbdabcae17fa146a146743add1c615eead3a42a75e SHA512 32d322cda7435b901115cdc01ef6b6e84f2af7f686f7d6a89cc486523d9d8b9807903c4ee0fb945a4ff457720033523beb34037e29ef7c9cdf2a10c62b725d54
diff --git a/app-emacs/emacs-wiki-blog/Manifest b/app-emacs/emacs-wiki-blog/Manifest
index fdc3fded83a4..3245256eb88b 100644
--- a/app-emacs/emacs-wiki-blog/Manifest
+++ b/app-emacs/emacs-wiki-blog/Manifest
@@ -1 +1 @@
-DIST emacs-wiki-blog-0.5.tar.bz2 7108 SHA256 eb74abb9ed29d9fc2706675e9ca85214f1ae3026176b7663cdca8a1e0584a15c SHA512 1f0481f3344b3264d33b2ddf9ff7290ef168743092313a3d9198466f002515906e3c4f8f56ef9375ea7ce77b9fb5620b2f1891d6f8b41772df46f7fd34edcc85 WHIRLPOOL 4a3217ec0b919e5c9bb010742ac2e7e038c53a2de4ffb60a447daad5304fa2bdbfbcc85050679717c7138cecf63f717770714d6c3f58ded7240c04e5779ca1b1
+DIST emacs-wiki-blog-0.5.tar.bz2 7108 BLAKE2B 5039857dcbbe3bee0f29588ccf1361d460e48b2f5bacc3861f5841cc8dee1b35644c62b14aa6f044050e3c8d8e1b5fe767b58d9b92a387e0b2639c818dcac604 SHA512 1f0481f3344b3264d33b2ddf9ff7290ef168743092313a3d9198466f002515906e3c4f8f56ef9375ea7ce77b9fb5620b2f1891d6f8b41772df46f7fd34edcc85
diff --git a/app-emacs/emacs-wiki/Manifest b/app-emacs/emacs-wiki/Manifest
index 7e17a51ab1eb..25fee7a55367 100644
--- a/app-emacs/emacs-wiki/Manifest
+++ b/app-emacs/emacs-wiki/Manifest
@@ -1 +1 @@
-DIST emacs-wiki-2.72.tar.gz 217896 SHA256 66d39fbae5020d2936fbfae754f34415fff3ed8fb5f3f4b97c8bdfddbb81b5c5 SHA512 eed759f43c8ba6bb06be2d6b5ab3eef4f13593ce952402dc0d054ff7283b236ded789807b080d19c06857367385dcbf76aec440ebbd7e2a23b113ddb4d288cb7 WHIRLPOOL 6ef71f14e2cd324bbcfdf951612c75812631291e9d00172f47e9d72581492149795fd0cc0504d9376041096287dceb23f8fb2a524c1cfc06b3eb5183def1f774
+DIST emacs-wiki-2.72.tar.gz 217896 BLAKE2B 43d17a8b0940d7855bbc83d547d7d57fe485715c25def37f673bfdb92908f517d99710773a455cf14a2967ef219ee6c6663d78cfbf06359597f55f0a7700fa63 SHA512 eed759f43c8ba6bb06be2d6b5ab3eef4f13593ce952402dc0d054ff7283b236ded789807b080d19c06857367385dcbf76aec440ebbd7e2a23b113ddb4d288cb7
diff --git a/app-emacs/emhacks/Manifest b/app-emacs/emhacks/Manifest
index 7fa6c2b158ea..68fa1fabb71b 100644
--- a/app-emacs/emhacks/Manifest
+++ b/app-emacs/emhacks/Manifest
@@ -1 +1 @@
-DIST emhacks-20070920.tar.bz2 71232 SHA256 d249a6dfcb0e7b40c76844ee5959032ad0a792ff391ee11fe5e4a461c6b86ed7 SHA512 097a4602d82587a20feeb14c4717c69536336319f43f7b5e8b4ba0c7f878218138eddbe1edb6293222b7c5798b94dd2c8393231a7b8fb8f32fe5349f2b054bb1 WHIRLPOOL 7e876c0dd2e425da97ef3a721c86b49f2229c318bd35334cb9a9bdd1c2506f4e802c7e9d89e7ea38b35d1b781c38d8e2ca280bfceca2d0b5741fd45791548772
+DIST emhacks-20070920.tar.bz2 71232 BLAKE2B 82c80bc41daa37868fe6376461df9cc96ee6d5db1b5e4a2e6414b9cd114fe57f3f5a226e82d2b9e5ac7e42a84faea585fa18621da5c7db4181334fb8db73cc9e SHA512 097a4602d82587a20feeb14c4717c69536336319f43f7b5e8b4ba0c7f878218138eddbe1edb6293222b7c5798b94dd2c8393231a7b8fb8f32fe5349f2b054bb1
diff --git a/app-emacs/emms/Manifest b/app-emacs/emms/Manifest
index e21bb5f496d9..ff74f06f7585 100644
--- a/app-emacs/emms/Manifest
+++ b/app-emacs/emms/Manifest
@@ -1,4 +1,4 @@
-DIST emms-3.0.tar.gz 200838 SHA256 5b750312dc82f856b1c725c0d795216f430ef7c25a301cda75b4847e52773594 SHA512 a6637d6d9bcf7fdc81815e698b51579d2dcb51b70b39d65117a81d180541f4774c82a1da23f5e67a5ffd37d5f1a4ce4fe5f653f8e443f899910320eaf5420119 WHIRLPOOL b8f9eecf1c1883e59051a31076888abb038627960012c22d9822764d558e84d97afb0b3eee9c6bf3fe89b707c6657d62099b384cac684709f1250f8fe63e9c59
-DIST emms-4.1.tar.gz 283625 SHA256 032e5680c39f70234245e2c6d56bc8278cfb80e5539f3aa1ed26b771c330c62b SHA512 b92773bb102e8d082a70644743665d5a1bfa470f579b8aaa1df60a29d0156aa6c4d516ea92a842db50d3418d63be7eb0cd36f18e9e3574b840056ed4ea210107 WHIRLPOOL 4ce84196531fae53e37d50b4e802b731db5f99a530b83965dfc95c63f105cdf1703df65af95fe2b4849ce1f412e3ba2fb4141cc6f9ec9bae0541e73226932de8
-DIST emms-4.3.tar.gz 287153 SHA256 00112d631eee0cfee80a85c048bfbf7c2d25886067ee02152376208ae87c2c36 SHA512 fd674e8637700d0a08cbdf0253ffd285623ba8181fac389eb94a701091ce25b071f995baa4fd68d60528dbbb90bbf034705bf52b41d9d5edd7af12c2c99418ed WHIRLPOOL fe7347c9a7013d0be81c9dff0c52e94ba5d62cbf9a04b4fcd18e7074658f12c0d3188a9242554d28143c5ebae62101e1d5f39ce302c94ed1852b0cf5094a23b0
-DIST emms-4.4.tar.gz 288922 SHA256 10ecc2e9c957ca1f80bbf8d9a0473b9eae552218aaea278dc8b10564215513ac SHA512 d0aaac80728b542366885916e43c2c50302a5a5d6c9e35ff53a5b46a7185fda19459ea28f0d77929920873d7d9732fa531a4ef50f5052ed4df42cc474d14d0ba WHIRLPOOL 0c25526a7c55410a25fc7c873c3ba63b7caea87a00f24ca5c763e402e5f12aff93e2f37cbd28cdfd34ea4411eff053990591209e85a01385c983a58c394968c9
+DIST emms-3.0.tar.gz 200838 BLAKE2B bca2f720abfa79d8ba460115169660ef1c52be895d9f49638cb771e2824456f59a4bbb8e92c4dafe3eb11203099ec564e4033e4fcaf305d26f39047423efde93 SHA512 a6637d6d9bcf7fdc81815e698b51579d2dcb51b70b39d65117a81d180541f4774c82a1da23f5e67a5ffd37d5f1a4ce4fe5f653f8e443f899910320eaf5420119
+DIST emms-4.1.tar.gz 283625 BLAKE2B 4ec32ca724f414024ef26db1f93f573f36605b32530ace833d2f3b1a7230f2da374c0cd3307082d44372c201ac6fd8b8eec9da0938db1699437b93236bda5cbe SHA512 b92773bb102e8d082a70644743665d5a1bfa470f579b8aaa1df60a29d0156aa6c4d516ea92a842db50d3418d63be7eb0cd36f18e9e3574b840056ed4ea210107
+DIST emms-4.3.tar.gz 287153 BLAKE2B 2b8dab4f18ea7a6eb4e0b982d795d5f16dcdbe39dc091e6f6fe056cf1143b11620ef8ee4fc83612224c6674978747b8c96575e797f0779b6fab71f46f921f918 SHA512 fd674e8637700d0a08cbdf0253ffd285623ba8181fac389eb94a701091ce25b071f995baa4fd68d60528dbbb90bbf034705bf52b41d9d5edd7af12c2c99418ed
+DIST emms-4.4.tar.gz 288922 BLAKE2B d86cd9124f1d92d9d91aa96c45f7fd5e86776ff5f15cfa5e139eb40bc72e673f394b3d5209e64da62d3ab02ef18d6ac690e1d4e4273f3aad9c53b7e5ac4e7839 SHA512 d0aaac80728b542366885916e43c2c50302a5a5d6c9e35ff53a5b46a7185fda19459ea28f0d77929920873d7d9732fa531a4ef50f5052ed4df42cc474d14d0ba
diff --git a/app-emacs/erobot/Manifest b/app-emacs/erobot/Manifest
index ce38a3a685f4..466f86633da8 100644
--- a/app-emacs/erobot/Manifest
+++ b/app-emacs/erobot/Manifest
@@ -1 +1 @@
-DIST erobot-2.1.0.tar.bz2 8748 SHA256 36c02702406ed15f8f67e148a7b098006e5cde2e1fde9f6e748e7fb22a03197c SHA512 a5e8ad1d6cbc736302d846576a3effb6ef6a22b31677e604374df50920435a8082a8b3124a3a76c5086a066956ba457bfb4d2477cdc16ae45919aa7dd8c7e874 WHIRLPOOL 69b8e0ea181f882a22254c8be9d9a7d7e03c021285fb2a3d475ee950d45cd9c246eaba2352d3d5ee77b596ed1c25eddde84abc5e59de5b15ea3f7b831a791563
+DIST erobot-2.1.0.tar.bz2 8748 BLAKE2B 920ef81a774b12cce29f8aaa75e4fa2462e034f91a2e1c791817f22d79387067d2760662b4c838d7b73d04cd88e9eb17045c6df6abbb5df4c944513e50a19222 SHA512 a5e8ad1d6cbc736302d846576a3effb6ef6a22b31677e604374df50920435a8082a8b3124a3a76c5086a066956ba457bfb4d2477cdc16ae45919aa7dd8c7e874
diff --git a/app-emacs/eselect-mode/Manifest b/app-emacs/eselect-mode/Manifest
index c77de7fb1c7d..78e2b2d1ef0e 100644
--- a/app-emacs/eselect-mode/Manifest
+++ b/app-emacs/eselect-mode/Manifest
@@ -1 +1 @@
-DIST eselect-1.4.4.tar.xz 177536 SHA256 120c123eae4a1d03515e94f9efd51af6ff2f09340daf1ada4dc21079df7a937f SHA512 1ed01cf00e3f13aad3e5f844c7086c3dd48398efd76e68cd91cf13b9939f4b48eef8915c5f3926954d158023115ad66ee67c0bc8fc4c9570900a37207674fc8f WHIRLPOOL e56c3ea3e54bdbcfffba3fbbe85b3c824cab796a0bae2680fac962356a2f707783571a9f73e0ea8299098838e593bea77b14edbeaadc372f186c2da2928e9ab5
+DIST eselect-1.4.4.tar.xz 177536 BLAKE2B 9991d69a0589be0a7df881fe5d6c0021c99fd7fd5b561ad7a9423edc46b25528b499a3e839dfe974d5d53e8e8a5b3a798cd7f5f1eeb78e531fff16680babce96 SHA512 1ed01cf00e3f13aad3e5f844c7086c3dd48398efd76e68cd91cf13b9939f4b48eef8915c5f3926954d158023115ad66ee67c0bc8fc4c9570900a37207674fc8f
diff --git a/app-emacs/ess/Manifest b/app-emacs/ess/Manifest
index d26eedd47155..3161c755363a 100644
--- a/app-emacs/ess/Manifest
+++ b/app-emacs/ess/Manifest
@@ -1,4 +1,4 @@
-DIST ess-14.09.tgz 3350987 SHA256 b6f1badd065e2e42f1d9d75a4e7a04290849d6f7a2bdb8413f73e0eae4014571 SHA512 91e275810f7a8c856f3392194ad3fb3d5f5b966e887568b22c133a362164e71ff5306d1d1a70e97f9d10261fe82eecb5f14e99a0dad4a4e239f5b810d7bba8ac WHIRLPOOL 5eabe6d65d7b5d420a7c6989b82d9901ac20d7b6376223f5aee39da7212ea395d15a98ce86c49fb2782706ba524532ceb38fd23dafaae5891a55958d1c676221
-DIST ess-15.03-1.tgz 3177102 SHA256 ad2f1b48dd4671848709d226aab72427129ac2fd5f85c0c0b39b96be24eee66f SHA512 5260d8afa10e1382cac3c70a4b6f753dd77e9f24bb2f68247732605b0f5fbb1b06e090dbcb45d747a484333f0779959c9213a4792103839b11c9e239bf35534d WHIRLPOOL eb1e6917a05b7444f4c37949a51554b6b33a0841bad5dae6aa93f575a7914fb36299c7c63ec27ec24944104a39b5844ada12b1c74a64daa04a682d5e97001834
-DIST ess-15.09-2.tgz 3248241 SHA256 706c41237e1edf33a369902f503bb25254b2bbb750b9ed1adee244e875264afb SHA512 9ba2f8800ece437e18749e29b6ecec3cf52297fa1c5a149dbf8eeb991df4f5dc99a76925458bd03203b7e8418347c4bcb5226e08dc64bd95d16e9a5b32f8634b WHIRLPOOL 3ad3cba11dc33f7b9c909017e6db2850fa078c736e4637e5bc15a8bbb23e2f66996186c31092caf3bb522d5e5d15543c9f4df6fe4f013ac8744695faf19bbd4f
-DIST ess-16.04.tgz 3265496 SHA256 8fdde4aecec5139fd262063f4354140b9991fdad4134bb6b7be70c2bd55af570 SHA512 5070197c8c622c83db98100272aa3bc947a0687fa357db1d63dab81b30175d7044f1eb5dc7274039f85636c613d23ad7b84eaae5ccef0cca7061d6d5af7b97d6 WHIRLPOOL c31bfb7a24a0bee0f8c07e1efcfceb07c9ce92dd1dd1df4a103d21d494a3d8245ecc4ff69ca0273b38b1c7dec62154011972a8f7a03e3fdc2175169e25e7acab
+DIST ess-14.09.tgz 3350987 BLAKE2B 38b6f5e341d6822fe7e94b6555b0cf5d6fc6a1e63799c1bdc60906aeedf3c28bff4fe6ff197c52e82293eb3863edd094322c0761b301c9e028cbd7a2faae119c SHA512 91e275810f7a8c856f3392194ad3fb3d5f5b966e887568b22c133a362164e71ff5306d1d1a70e97f9d10261fe82eecb5f14e99a0dad4a4e239f5b810d7bba8ac
+DIST ess-15.03-1.tgz 3177102 BLAKE2B 83aa1a8a2e43d1bc144246593552b62ada9ac938d7e340c3e034e60adc609342fa688b21d69967b395a1c371defe6004cea4242f17ed1c11a30fad998df49e74 SHA512 5260d8afa10e1382cac3c70a4b6f753dd77e9f24bb2f68247732605b0f5fbb1b06e090dbcb45d747a484333f0779959c9213a4792103839b11c9e239bf35534d
+DIST ess-15.09-2.tgz 3248241 BLAKE2B 63e83436e60d6f9398dabaaed2aa795dee8888f3a992749bdf6ab9541464c65297c29e1d2936d3e6b1da6284c0c3508556b30a6b5a68e4e090e8e1ce3d925894 SHA512 9ba2f8800ece437e18749e29b6ecec3cf52297fa1c5a149dbf8eeb991df4f5dc99a76925458bd03203b7e8418347c4bcb5226e08dc64bd95d16e9a5b32f8634b
+DIST ess-16.04.tgz 3265496 BLAKE2B 2b7b9c972afb0fdea1b8c386d91ab0f2797c8ab1bf0e6a9ca17915670d7e4d61afbec108beb5e61fe7e0491f851aac21d5c2145c6c61d77b3be4046448479580 SHA512 5070197c8c622c83db98100272aa3bc947a0687fa357db1d63dab81b30175d7044f1eb5dc7274039f85636c613d23ad7b84eaae5ccef0cca7061d6d5af7b97d6
diff --git a/app-emacs/evil/Manifest b/app-emacs/evil/Manifest
index 495d0cf97da5..5a47ce65b8fb 100644
--- a/app-emacs/evil/Manifest
+++ b/app-emacs/evil/Manifest
@@ -1 +1 @@
-DIST evil-1.0.8.tar.xz 427884 SHA256 f88760b93fd9c918a1ed567e1ce23ce7fa6709b1f603137df3397a005c2800bf SHA512 d827ff8856c0240c334088f4c61226c93994a4c5afdd775a7170233add884af134b22cdc8bfa6432d3f44d3e6cf3cea89501a4ebfdc37ed5c70b3c712ad2ea86 WHIRLPOOL 81c8f6fc175103ab05e993fff516fa17c82d22ed5409eb59c8640f9bab1914746a47acba8f80d4a31482031086c7da70efa7977ea22b521469b95f9808f797c0
+DIST evil-1.0.8.tar.xz 427884 BLAKE2B 9a2327d268c7d64c2b439788a3d6fc8104ad2554bce150431efeecd9c6db8dd41acb2e5886328ccfd21a3a94d56962cc9167ec53b3abb785565783beb213acdb SHA512 d827ff8856c0240c334088f4c61226c93994a4c5afdd775a7170233add884af134b22cdc8bfa6432d3f44d3e6cf3cea89501a4ebfdc37ed5c70b3c712ad2ea86
diff --git a/app-emacs/expand-region/Manifest b/app-emacs/expand-region/Manifest
index 84a929cf7d4d..b0d8e0ec50b1 100644
--- a/app-emacs/expand-region/Manifest
+++ b/app-emacs/expand-region/Manifest
@@ -1 +1 @@
-DIST expand-region-0.11.0.tar.gz 31562 SHA256 e085621267b250486856422d13e7ddc3b11601e2328fc239e709ea10880bbe21 SHA512 3469ab0420d85fbaaa1ae9f3d0101c28b6e1786d761ecd186d744537795226917314b8b748d3499b02ea269a46a62350c37fecb34dd4183a73eafc67ce1344a8 WHIRLPOOL 762ceeefaae4728776d493daac6453d00c6ff232dab4130fcb5965a71b4da6bcc046ed3894912b38716a7047f83286335e4b01616dfc8c8e30edd1360869c79d
+DIST expand-region-0.11.0.tar.gz 31562 BLAKE2B 84058b1aea880de0f4a1894bbf818ae622ec7740d15564e74adbe8f3769f72b514d71de9c6b83a8f0fd60c590e281739ae15110f5f886315cc10b661b21ecc56 SHA512 3469ab0420d85fbaaa1ae9f3d0101c28b6e1786d761ecd186d744537795226917314b8b748d3499b02ea269a46a62350c37fecb34dd4183a73eafc67ce1344a8
diff --git a/app-emacs/f/Manifest b/app-emacs/f/Manifest
index dde00f8b0b57..a185ef2ec888 100644
--- a/app-emacs/f/Manifest
+++ b/app-emacs/f/Manifest
@@ -1,2 +1,2 @@
-DIST f-0.18.2.tar.gz 18485 SHA256 e5791b653128f6508244a64096526439fcff6b40011b56c07fba552f20d446a4 SHA512 5b11084dcc6afcc85ed0e187f6dd252c391fa43325be5b88b776171b3bc7076ea2bbd32b7c424deb70e035f6acd46acd86053547663502530832db2c50eba346 WHIRLPOOL ef30dda229dba4da6432f5383f0e842132211da9472ab0625933d4421b74d9fa1adbb92654f2a3aacc9797ca312c4aa20b3b9572c7e11fa750ef34a011e1c099
-DIST f-0.19.0.tar.gz 19477 SHA256 3abf449393f5b26a68520a7ebaa7823995868dfaedd83e3d4646710f902d2914 SHA512 694eca1872cb0a0da7f75f610e4101993a79a5e7601c3f72fd2c642b1a44f5eada24777313b5166d901d9d983c18b4d412b4c6f01c382ace7530bacaa3b67c56 WHIRLPOOL 533548fc95f2cc39feb18e225547cffc49ce9aa18c8a61219ca92b84bed202a2183d5cdedbf26f95dd2c34adcfdd1e2ebd8d574c2e061879221e929470b63c64
+DIST f-0.18.2.tar.gz 18485 BLAKE2B 5b450b82eb31b23243a14308121380f53310de6b312c0b6c821b478d81019f20e0ca1765e267ed53a715aae626dabf743e978acfc9202559e14166fb5fda332f SHA512 5b11084dcc6afcc85ed0e187f6dd252c391fa43325be5b88b776171b3bc7076ea2bbd32b7c424deb70e035f6acd46acd86053547663502530832db2c50eba346
+DIST f-0.19.0.tar.gz 19477 BLAKE2B 47cfb8c876e11cae7eca61815085c4290f65f9d72a7c5d397d8b53f6d57421f46997786556074027de5405acbf38ddb42ecbb767c809763e84d880286e6942dc SHA512 694eca1872cb0a0da7f75f610e4101993a79a5e7601c3f72fd2c642b1a44f5eada24777313b5166d901d9d983c18b4d412b4c6f01c382ace7530bacaa3b67c56
diff --git a/app-emacs/fff/Manifest b/app-emacs/fff/Manifest
index 8e3f3733bab1..f63d7d42e4ab 100644
--- a/app-emacs/fff/Manifest
+++ b/app-emacs/fff/Manifest
@@ -1 +1 @@
-DIST fff-20050517.tar.bz2 13774 SHA256 c6333255ebe50d481e4b7d7472a445b1bcd268622771bcd640a7201f82b07ee0 SHA512 829a833a25378d868db0dad04d062c397336aa98167fd5706a9c75a7ec4c60a49bc77b5dfa9ed9f48565d09ae2817fafeffeb7546b5e5bbfcd13c78fcdfc9939 WHIRLPOOL 05f6c9ddedadc7025006ab520e70531847f636d5be93d773a61a6a1a9819e2141d5395e647ae7aae80573ed22ce60bb53b16a657581dc530b898308c7e7ac62f
+DIST fff-20050517.tar.bz2 13774 BLAKE2B 2b98f7d7c1b557839a879375d92d6f030685956f60eceb5414afd31a629792afb41c5690f65e81edec7dfaca8407107c4d50a5f1a40989fdec55cc2cd6aaa34e SHA512 829a833a25378d868db0dad04d062c397336aa98167fd5706a9c75a7ec4c60a49bc77b5dfa9ed9f48565d09ae2817fafeffeb7546b5e5bbfcd13c78fcdfc9939
diff --git a/app-emacs/filladapt/Manifest b/app-emacs/filladapt/Manifest
index ff135d476670..ef111e1a41a3 100644
--- a/app-emacs/filladapt/Manifest
+++ b/app-emacs/filladapt/Manifest
@@ -1 +1 @@
-DIST filladapt-2.12.el.gz 9267 SHA256 5d96051b605ea05d89372dc032d1e33ba8f4dcb82c89a178a9fb62bc8feb261c SHA512 31bf3dca48129cc25653827678215eb4c62ff777cfbdf0d71142c0cc3111a078b1af316e121b27be2a47c317cfa440ac00e7fbc2bdf3e8ac7d54748297249328 WHIRLPOOL bd591375a15e35468a78b595c8b073d63879aaa766803017c1087a762affe3d7bd83d5f8f2f4370ad67293169dabf0eac765f55f9556fc60d900daba3bc9bfe5
+DIST filladapt-2.12.el.gz 9267 BLAKE2B 81510bd51808f7aaa4874a1127a74bfc7d35c5f1dca0100694853025fd1bc884d75c2023f0e373eb1fe69cc5d423a48d884b4ff5cfdfc82b161f6a404965b6bd SHA512 31bf3dca48129cc25653827678215eb4c62ff777cfbdf0d71142c0cc3111a078b1af316e121b27be2a47c317cfa440ac00e7fbc2bdf3e8ac7d54748297249328
diff --git a/app-emacs/flashcard/Manifest b/app-emacs/flashcard/Manifest
index 7fbd60661f45..11178fe42028 100644
--- a/app-emacs/flashcard/Manifest
+++ b/app-emacs/flashcard/Manifest
@@ -1 +1 @@
-DIST flashcard-2.3.3.tar.bz2 10048 SHA256 30e6228a485f1210e526c5117c1f5f18f4cd70cdc0ab0b8db63023a0a71068c6 SHA512 30d18b488549c8aba1c6e9320d10b8b566e1ff162bd5a072bb2ba3602111744d7f21cdc26fd48f7b427727c264c9017b1a8534fc402d3990d1f9bb0e0f54877c WHIRLPOOL 9ff27e6ed32c6318443059b0d52b5e99cdeca1dbdae78fd9dcf195a4ea8b35b6cb94d2a38969d8189177080b717e9ab3acac6d77d24beee592b1bd0c17807493
+DIST flashcard-2.3.3.tar.bz2 10048 BLAKE2B 86c02a9cfae15a55302d8733f97203bc3ddd526022f47308ac58b489fac13d1bba6d362b62ff67dee767bfd33a60cfbb39d3c84f7904cf53d68f41b3ccdf985f SHA512 30d18b488549c8aba1c6e9320d10b8b566e1ff162bd5a072bb2ba3602111744d7f21cdc26fd48f7b427727c264c9017b1a8534fc402d3990d1f9bb0e0f54877c
diff --git a/app-emacs/flim/Manifest b/app-emacs/flim/Manifest
index 3a4f65a90cc6..adcf62df6d1b 100644
--- a/app-emacs/flim/Manifest
+++ b/app-emacs/flim/Manifest
@@ -1 +1 @@
-DIST flim-1.14.9.tar.gz 182065 SHA256 bbd5a8729ea27457c7c2ffdcb1be6219ad38fdfa323341f4fad2d298780070ec SHA512 a272a30f27cea24f537b9bf3a6dbb25113deff0ab8e1c03bd802e4d32d673d567d282297ed9e4d35217f069699a1fc25bfdde09778171a188dfa46f49e9bb7dd WHIRLPOOL 82f7aac34bc61857fdf824e2d218e5c0b0b0b1947fda1b8cadbe0e8c7ff5be8ac5e4eb18a7c77f5e221b4bb49f34f708610c8c06ed9f8092597c2600abb96427
+DIST flim-1.14.9.tar.gz 182065 BLAKE2B e15779e93a422bc2c2b82ab5969f2b3d30a31d47b96769abf89bfe7e9aebf74e5f0f0e87270bcc187bdaf3e1af4bdd663c7d6661f1adc9575af0e4ba1dd316f1 SHA512 a272a30f27cea24f537b9bf3a6dbb25113deff0ab8e1c03bd802e4d32d673d567d282297ed9e4d35217f069699a1fc25bfdde09778171a188dfa46f49e9bb7dd
diff --git a/app-emacs/folding/Manifest b/app-emacs/folding/Manifest
index fd3ca6154ea9..9d0fac2254fb 100644
--- a/app-emacs/folding/Manifest
+++ b/app-emacs/folding/Manifest
@@ -1,2 +1,2 @@
-DIST folding-2012.0226.1623.el.bz2 49503 SHA256 d1d00dd48284c7509c24003d56e8cf86c46839880d6775efe76682e1cd859482 SHA512 efb645e46e55174f2b538b6812f36d08f576f765ffffdf25af756c852e7bfd6455cb3bc3a540089a60600251b2c144384b7f58b412840a95ce614efd9d5b50c9 WHIRLPOOL 42a17c72d91cee51bec9d37466ef1e9b9812ac05cf01b6dc006e0ec204bff2edc84a2a776e656deb86ca17917eaf7d1716c849d67cdcf9f6c5a1017c99cf9588
-DIST folding-2013.0613.1821.el.xz 52164 SHA256 bc818ec6a07537d716b28ea1b1a3798c042503b967578e387894599ea1ab5bf3 SHA512 9eb7cf4e1b01d7f37969bab0a66ad564da3742981ec0623b3100b0aef1bb997a80c91b88286ac673775edd197110496e1849210cc40fe310d8a478471cc1ec53 WHIRLPOOL b67c9e477738c0cc0ed88cae486eff12e773d9ed0e32a9c54981861e6e492ece2d98d100947d39c6add87b8121044d4f55ede0ab3f5e36df6e824cbd46ed582d
+DIST folding-2012.0226.1623.el.bz2 49503 BLAKE2B 6e364c9c93c92d4e9c322b5cc75b2525d95d63fe5a5b5916e054063fb2452f8ade4cce7e805243cb95a078157f33feff1bc9890b3a7d0de66813c63c74be0dbf SHA512 efb645e46e55174f2b538b6812f36d08f576f765ffffdf25af756c852e7bfd6455cb3bc3a540089a60600251b2c144384b7f58b412840a95ce614efd9d5b50c9
+DIST folding-2013.0613.1821.el.xz 52164 BLAKE2B cb9dc74ab409ddeff8434191f53dadac5c53a15fdf4b8edb041daa156221e7271bd30bf66e60049ebd4ed761f16b1adfa113e05967cc70729f6b5c3f1dc71306 SHA512 9eb7cf4e1b01d7f37969bab0a66ad564da3742981ec0623b3100b0aef1bb997a80c91b88286ac673775edd197110496e1849210cc40fe310d8a478471cc1ec53
diff --git a/app-emacs/ghc-mod/Manifest b/app-emacs/ghc-mod/Manifest
index 996ba725e478..a411df4b0373 100644
--- a/app-emacs/ghc-mod/Manifest
+++ b/app-emacs/ghc-mod/Manifest
@@ -1,3 +1,3 @@
-DIST ghc-mod-5.4.0.0.tar.gz 132546 SHA256 736652a2f63f9e8625c859c94f193ad8ac9f8fe793bbee672b65576309bfb069 SHA512 fabcc5ce2fb9e8790043faae2d42b3714fab96da1409d7f1c4736f332c6b74c76724dce253456fd787526d125cfaa1fe48c4725a0da16aabb35d5edf560f2415 WHIRLPOOL 8f493cf40724ffb7b56877f9a9cf752e9b23d7babb4fbd29fad0068a1b8f8ef85b40a96c1fa65508ef924cb05d73300762081a762777b982e5c8d41af467d2f0
-DIST ghc-mod-5.5.0.0.tar.gz 150774 SHA256 d05be8f3541e875cd4ebefb28968cfc095fc323e49328f2e40581f6f5de70d31 SHA512 006f292394fc24766a2ae2c778635697a63e1b48ef96052af66dc35d1ef30eb600760cd2a517011a7a2b027a0c725ceb3b5e37cfe157741ba97f19068f1264e8 WHIRLPOOL d3aea3a4b3e3c1fd0a1a5c0e094c822d16eb4db6d68a0740062fc0a811aba09efac19eecfd192013ab3da4ca552ea21b497c8793ece67811794834d01e33672d
-DIST ghc-mod-5.7.0.0.tar.gz 146797 SHA256 2aab240c89ab6513807cea4e2065d474274a5ae20f8edc4f77df8e2eafb9e5ca SHA512 843cd0546c0a0cdf30dd9cde5e9148dabf391648bae6d7f2852c83a4cd5b8329f30d0cc578ba6afda02e8885b2ed63c7def4885e0dbaac199d311e476a0cc6e3 WHIRLPOOL 83e5df75283a4fa1ccc961cb62d19a3c85aae2061f7d57d2f050f2018c62f08c84d0a6dd381cec6eb8d37c31e816ee40395b9ca14de6d3c3ddfb86ebe29dc0fa
+DIST ghc-mod-5.4.0.0.tar.gz 132546 BLAKE2B 6670df6b271527ee2a69c74b0522b94e78e799b62d260ca744a382312c815e904d516345c6258be0d9aa82f91866126b95cc4682bc1925616078ffef1a559905 SHA512 fabcc5ce2fb9e8790043faae2d42b3714fab96da1409d7f1c4736f332c6b74c76724dce253456fd787526d125cfaa1fe48c4725a0da16aabb35d5edf560f2415
+DIST ghc-mod-5.5.0.0.tar.gz 150774 BLAKE2B 87d2be174200f05da0f38a2947c4404c0b25ce77a03d3b456f8cde769e978bbe6fad6e2c04d1af61e05d61fb941c139c297baaeb4835c02390516a88bebbf539 SHA512 006f292394fc24766a2ae2c778635697a63e1b48ef96052af66dc35d1ef30eb600760cd2a517011a7a2b027a0c725ceb3b5e37cfe157741ba97f19068f1264e8
+DIST ghc-mod-5.7.0.0.tar.gz 146797 BLAKE2B b5d684dbb505001bfc061473cd62d00491bfe8ca5710cb69c72cb2544838a9a3b7d88d414be8123f9edf82cf96773f49439912a98efec843c167334d31caeaf8 SHA512 843cd0546c0a0cdf30dd9cde5e9148dabf391648bae6d7f2852c83a4cd5b8329f30d0cc578ba6afda02e8885b2ed63c7def4885e0dbaac199d311e476a0cc6e3
diff --git a/app-emacs/gnuplot-mode/Manifest b/app-emacs/gnuplot-mode/Manifest
index 1f3efd53e5b6..0205ca392cd5 100644
--- a/app-emacs/gnuplot-mode/Manifest
+++ b/app-emacs/gnuplot-mode/Manifest
@@ -1 +1 @@
-DIST gnuplot-mode-0.7.0.tar.gz 373475 SHA256 310018d8c313ebd817e3e6116ab28eb2b848fa0992917b5ee4148d6073f59f3e SHA512 fdf04a3a32755892d422de8a535682ff44d1b635ecdc814738564376f5c7027a82c23807439835f2b7bf959f4f8b7a7d38d07a643f84ab2056ba187f3558e596 WHIRLPOOL 77f98735fd0fa6e1379278aaaeacf2834d2fad3c5ed3f56b4232215142a1c8336c4d7375282856fa4fe754dfaae2500027f9022f5c2799e90571af57e8be783d
+DIST gnuplot-mode-0.7.0.tar.gz 373475 BLAKE2B 6aa547b90922fa445de10825ae8f0c05249a335a1cc531118200bc49c4b62f610e07a7c5bd694a3c6bf6605b937a520a8008d67263d2e83cabf009fb855e7a97 SHA512 fdf04a3a32755892d422de8a535682ff44d1b635ecdc814738564376f5c7027a82c23807439835f2b7bf959f4f8b7a7d38d07a643f84ab2056ba187f3558e596
diff --git a/app-emacs/gnuserv/Manifest b/app-emacs/gnuserv/Manifest
index 561973dda534..a54f86bdc993 100644
--- a/app-emacs/gnuserv/Manifest
+++ b/app-emacs/gnuserv/Manifest
@@ -1 +1 @@
-DIST gnuserv-3.12.8.tar.gz 124070 SHA256 c9ba560e7d773c175ef1cbced8fae17d7a921b050a11457971a7b7a6216aeed9 SHA512 e8f387a554c22fb2eb166d388085b9d68a0d865ae56ab71f3ffe09ff46bef04a4ba5b05ca51a1110e1dff67ae2cd6acc8b18a0fb9df9299dbbf4a001f0924f31 WHIRLPOOL 56203ac84fe967f8c602ac5eaf9d3e9ad5f2b0feb68c8719ff3ca7b61d44c676e0c52f42c7919eed39ffaa25683f28b558a0b55b23ef8a11bdbf3665f8017616
+DIST gnuserv-3.12.8.tar.gz 124070 BLAKE2B 7531d85f6cd1873f75499c37230907f96ac484e1d58a4a3459f44d3bfaa6a6124d44f99a7c27d1fa3deb16b1cc29d08313b911cdc1782a1c5b24bd702ef4c9ba SHA512 e8f387a554c22fb2eb166d388085b9d68a0d865ae56ab71f3ffe09ff46bef04a4ba5b05ca51a1110e1dff67ae2cd6acc8b18a0fb9df9299dbbf4a001f0924f31
diff --git a/app-emacs/go-mode/Manifest b/app-emacs/go-mode/Manifest
index 6437a2ab6bce..3b02695253e0 100644
--- a/app-emacs/go-mode/Manifest
+++ b/app-emacs/go-mode/Manifest
@@ -1,2 +1,2 @@
-DIST go-mode-1.4.0.tar.gz 30705 SHA256 31365aa8b220ca67e6fb24fa197e99121a6db815690df731df2f56915805935d SHA512 00e3aa832b81d6039e38e12f1346ef838f0cd9ccbebac947d394d453690862025ce30fc253d52d485c3161a1c2307ef00272f014c8f3fa86304216525ae47bdd WHIRLPOOL e5fc9f010dd8a0346aacb9797f9d2061f02165cfce6329d1f627169dd70d288f4618f3fa12bc89403e9c00bbbb691d8390560c068af69e57391729d5c926f7cf
-DIST go-mode-1.5.0.tar.gz 36876 SHA256 d54a4afac1658082da1f26bab486c346262e5b185e6463cfe316a3e5e57ab6a9 SHA512 fee67461467feb272dbb90abbad3df786f984925747ad8588c271784f8d27db888dd1da9d4589fb63ccfded1a833b01bb860d3254b00ca5e3f3aa89f199880c3 WHIRLPOOL a5ebcd0bcb47403d4c809249f11796fbeb9d86401f8e140cb8b8882f8ae54c698ce6846a1ec0dd0471b8cde6f11688e6fc5bbaf7887ba7d6e5d4d39add5c8045
+DIST go-mode-1.4.0.tar.gz 30705 BLAKE2B c5b4f53697d18d1a727353c203ea5734a6a63f3e179ca8034d24cd6a414f1d7acecfecff5fc027fd465d7228f876beec558c0e0bca1865866bcef52e0183415a SHA512 00e3aa832b81d6039e38e12f1346ef838f0cd9ccbebac947d394d453690862025ce30fc253d52d485c3161a1c2307ef00272f014c8f3fa86304216525ae47bdd
+DIST go-mode-1.5.0.tar.gz 36876 BLAKE2B dca184f1cb79c919067ffecd1111f2404685459dca374a1ff14512067d0235bc862a04cb5fb014620856d0d03c15668149d0c62c238098b8561ea2512b26ec36 SHA512 fee67461467feb272dbb90abbad3df786f984925747ad8588c271784f8d27db888dd1da9d4589fb63ccfded1a833b01bb860d3254b00ca5e3f3aa89f199880c3
diff --git a/app-emacs/google-c-style/Manifest b/app-emacs/google-c-style/Manifest
index e6aba3818670..e3711720f3a4 100644
--- a/app-emacs/google-c-style/Manifest
+++ b/app-emacs/google-c-style/Manifest
@@ -1 +1 @@
-DIST google-c-style-20091009.tar.bz2 2178 SHA256 58606847b01df277055d48ae8f013e3302bd22eebf067ad47aad289ed92da47b SHA512 5d61d6e021643ffc1468c14cdbbde0b52dc9346330983c19bdb7f4d6fb8960c662ca6198658963ff6d2b4d7d2dc96853a8c58de48da77364a860f2f777855b5a WHIRLPOOL ca42ded98e47990198be221a364b2fbc5416ae9a16f9b0843c2ff47223f7725e3aa8d406356345817be030fa05bdb24f5de97d1318f8769f45e1a37da04a79a3
+DIST google-c-style-20091009.tar.bz2 2178 BLAKE2B 72d7b430f9148589e8b4b1a57c9b4b96203c7ffddae3bbbc7aa9978e85c2c51510571f8617ac5d2bcaabe5688ed7799d5de597e96a2479d844a49e6661f93a05 SHA512 5d61d6e021643ffc1468c14cdbbde0b52dc9346330983c19bdb7f4d6fb8960c662ca6198658963ff6d2b4d7d2dc96853a8c58de48da77364a860f2f777855b5a
diff --git a/app-emacs/graphviz-dot-mode/Manifest b/app-emacs/graphviz-dot-mode/Manifest
index 162c5c3a464a..0f15954bb043 100644
--- a/app-emacs/graphviz-dot-mode/Manifest
+++ b/app-emacs/graphviz-dot-mode/Manifest
@@ -1 +1 @@
-DIST graphviz-dot-mode-0.3.7.el.xz 10840 SHA256 86b9c147f3068a625c0259799237c67ae79ba5a9f5bc6f8bb9f0ed8a054d7166 SHA512 1b142cd4ea257a1b18f557d9b166db9c69538238c100d3eb682219df3488803566bbb366be6b57d129753c745b21a585eb815dbef870ad2e71560d4acc33edf3 WHIRLPOOL 74df128985acbc14730269946a70f4701065eb06bb4350b20d33b22c81194f1cd91d244a69ab7bc0cf0fd25d69dd21de288b5cdc19aa94b9864cd2e341163f77
+DIST graphviz-dot-mode-0.3.7.el.xz 10840 BLAKE2B 6d4d80705ba01723ce538dcf97a218197c4d5295196d94c72dc5debdd59bf3e755227088a89b55c0ef019c9c4dbdaf5a7c01c441440ae8be32d5d472711160b2 SHA512 1b142cd4ea257a1b18f557d9b166db9c69538238c100d3eb682219df3488803566bbb366be6b57d129753c745b21a585eb815dbef870ad2e71560d4acc33edf3
diff --git a/app-emacs/h4x0r/Manifest b/app-emacs/h4x0r/Manifest
index c351992a3ef9..18caab234864 100644
--- a/app-emacs/h4x0r/Manifest
+++ b/app-emacs/h4x0r/Manifest
@@ -1 +1 @@
-DIST h4x0r-0.13.tar.gz 2033 SHA256 03c92719581f4407f308af6c80fbf6b8a13e5f19cd2af6e2a9d297da4ad66f57 SHA512 9648410ffa13ea9056c3def84108ff99966b62b7ee13fb48d5596d5c90f5d5296ff43d1c3ee2f534b7a219603ce1cbcd2a917307ea57ee6c914f9a8843eab0aa WHIRLPOOL e72240b286a07aa6e4e7321cc58a969051360be7757b808f2f54e8e5ec1985f006be900b62a0bfb0dcf43f4e1dcb8e5efaae38214032d63ebf9e1675ccb35bc7
+DIST h4x0r-0.13.tar.gz 2033 BLAKE2B 202279ba4dd1f49bfb7609b47e10369444ae40a6b0b46ab22370d2af44315b642266b64f29883742e0111f2e67d55c1e864687f7792048e9d937bd9bae4c3961 SHA512 9648410ffa13ea9056c3def84108ff99966b62b7ee13fb48d5596d5c90f5d5296ff43d1c3ee2f534b7a219603ce1cbcd2a917307ea57ee6c914f9a8843eab0aa
diff --git a/app-emacs/haskell-mode/Manifest b/app-emacs/haskell-mode/Manifest
index 2f5cff89dafd..12733f6b5637 100644
--- a/app-emacs/haskell-mode/Manifest
+++ b/app-emacs/haskell-mode/Manifest
@@ -1,2 +1,2 @@
-DIST haskell-mode-13.07.tar.gz 131102 SHA256 7d16441f67e027a9fccbe58e3d8284489f811f4914a9e07fcc73fa9a24b38895 SHA512 e19d55a99f4d9a571c1ed0b095254e4d1b8080d9ba671461aa228cbf8aa7c7a213e19e588c0f69450a1bd4ac25793b523415a6f11bfb5dda7706dc35f7beee68 WHIRLPOOL 56be74675d47928cbb149515f796f7e45fe5238df26021510a140c1ca0613ded959b2891525350a9eb4aa39bf2a2f1e0a890e9a5cc8db35ac75c1ae37ab2761f
-DIST haskell-mode-2.9.1.tar.gz 123579 SHA256 cac350804a89d0f76fcbe8c2ad10e4b9f83d81242dbd4927b546248db9477348 SHA512 7c4cbdfd0f9e43ab3efd39c8ca7fcd941538865fe41522703175b7ca8a67276945ef7feef4207fa66aee156a028cb52bb96593867db0c777baba9f59415ee979 WHIRLPOOL bb31e6cb4e7f12c79ae4eeaf55cbed54bdb814e56c691d87da4612f884de7de018796d85442ae44f9aec323815982154b95d4555cebb7198820a639edbd03e7a
+DIST haskell-mode-13.07.tar.gz 131102 BLAKE2B 402a4f21eb400c0f20a17b37c556b2f3eb949ef7fe38ffc2a0f7384ef252da9f69a6ab405ab782ab9739d2b2e57bab5c471c840cc8c3e4db7b42082f8e5bb428 SHA512 e19d55a99f4d9a571c1ed0b095254e4d1b8080d9ba671461aa228cbf8aa7c7a213e19e588c0f69450a1bd4ac25793b523415a6f11bfb5dda7706dc35f7beee68
+DIST haskell-mode-2.9.1.tar.gz 123579 BLAKE2B f6aa2d989961868d2de5815ccfe79fbc75902ca33572a799e4967047685fe8d598aa3057d655ed0006c5d814e706ee94e6460c702d4bf88ba253acd0187e0970 SHA512 7c4cbdfd0f9e43ab3efd39c8ca7fcd941538865fe41522703175b7ca8a67276945ef7feef4207fa66aee156a028cb52bb96593867db0c777baba9f59415ee979
diff --git a/app-emacs/hexrgb/Manifest b/app-emacs/hexrgb/Manifest
index bffcdc073b13..13905f5528cb 100644
--- a/app-emacs/hexrgb/Manifest
+++ b/app-emacs/hexrgb/Manifest
@@ -1 +1 @@
-DIST hexrgb-0_p957.el.xz 9620 SHA256 7d5af0007afa7c07962543c06cf0b53c7843171e09d7193ab1e8083f294a3a0e SHA512 5948dac5a771a7d3e9632a9783478181a39c4cb0e6d399ec8793730883182e44eb1aeef1dc9ebaadb4004f1b766e85033f79fa6db4b68ed5b11d38eec5b934d1 WHIRLPOOL f1a2c4d9090cd1365f3d183d605212c8790df76c572f6e6cb7837f20eaab03665469959811cc1d2fda5067e7d2808453bf53d451afb0dee9c82ff84dd75b48a5
+DIST hexrgb-0_p957.el.xz 9620 BLAKE2B 6bcb432cce9a0981f19acd4beba785941148fa9ca8ebd2575b2ef4a39fe28c641160b5c27d6515220f122e66154d89807ba0075e41c2506d5c8aa1a6b291404c SHA512 5948dac5a771a7d3e9632a9783478181a39c4cb0e6d399ec8793730883182e44eb1aeef1dc9ebaadb4004f1b766e85033f79fa6db4b68ed5b11d38eec5b934d1
diff --git a/app-emacs/highline/Manifest b/app-emacs/highline/Manifest
index e008b59c9c69..2d02b2757b1f 100644
--- a/app-emacs/highline/Manifest
+++ b/app-emacs/highline/Manifest
@@ -1 +1 @@
-DIST highline-7.2.2.el.xz 8600 SHA256 0deac0160e5adea004f865848899bbdf7b22950d91e0cf5f4e081d26cd5203e2 SHA512 353fc034a823d0892c6266fbc48a22e2650c379f904f9a0be78bd2f11e5ac8333cf6070fa7ebc2225c57cc6a85f49c6db9322e31e33f87e481aa117b1290be87 WHIRLPOOL 465f7e688140588c1b24d282b65026a7281a311684111e76f96b7fda813595e6f9bdef4c6c0db399d08f28904e5bcb8a1f01035877996bfac1144e079187a44a
+DIST highline-7.2.2.el.xz 8600 BLAKE2B e92007f6ee38e67441b8d9e7b029570e5ef2ecb888f971191f7e1fb919ffe0c58e2e5abc7d4615449e786b882f0e7b511ed37d85de6d3b98658d4ce5a1cb9253 SHA512 353fc034a823d0892c6266fbc48a22e2650c379f904f9a0be78bd2f11e5ac8333cf6070fa7ebc2225c57cc6a85f49c6db9322e31e33f87e481aa117b1290be87
diff --git a/app-emacs/howm/Manifest b/app-emacs/howm/Manifest
index 052a78e9b2c1..82f04e2ec1f6 100644
--- a/app-emacs/howm/Manifest
+++ b/app-emacs/howm/Manifest
@@ -1 +1 @@
-DIST howm-1.4.3.tar.gz 552747 SHA256 fb7336e0a52df3d5fe72e1bbf4ffb57f1139757f6af2964ee62cc94b4729dcab SHA512 da6eec498545dced3bad3c6968bb31a24b01b85220dd80c6e1ee312a0cf1a0b883dc77744f5052261e4bf0d536da057fbe05040fbb429b61a8580330750ce189 WHIRLPOOL e7ea2edd39a008b65e493de5728fd07ffd14b04e6b2e38eae6a68b6bdc670a11ac50fbe952890ef8563283de674230e3813125eb8e62d2afc0fd7bdfd72c8f3b
+DIST howm-1.4.3.tar.gz 552747 BLAKE2B 26ddf709fcbcefb962a3cf447c1ccaef61b2407cb875be49a7a207159db5c2425fff953859c2c77ec36250e73d9da17647667d2e0a4448ed0dc40bb25ded0635 SHA512 da6eec498545dced3bad3c6968bb31a24b01b85220dd80c6e1ee312a0cf1a0b883dc77744f5052261e4bf0d536da057fbe05040fbb429b61a8580330750ce189
diff --git a/app-emacs/htmlize/Manifest b/app-emacs/htmlize/Manifest
index 51f1592c3299..c5ff8cf2dc19 100644
--- a/app-emacs/htmlize/Manifest
+++ b/app-emacs/htmlize/Manifest
@@ -1,2 +1,2 @@
-DIST htmlize-1.43.el.bz2 21018 SHA256 1f4f2e94376477a0d1e8b3e886d973984429c4632b6ebf604b4274943b8e8b60 SHA512 cdef3f8478862e9743cad23697775111fbd64737daa6e0525923cff1ccc8dfd20ad554e5e92ec99281d87acf9ecd358474761858c8c6639c5459234bf79d4be9 WHIRLPOOL 18148f86f54dd4f71669eb1ec1659f2c5c6f152d7ff765f25785a605d74aa87c723a1acae911538a35899ff8d6173c957138efdf55d59070587751758ee2a67e
-DIST htmlize-1.47.el.xz 21544 SHA256 813c8a3f9fca217f4cc76916513a4177a1b4ec5766c78486ffe8dc2f8ab6f7ca SHA512 2cca746f696d382336a800d3f15e6a5812afa7c6965d6695c501085ed6c8f447da8ee6ed31a27c240e9d70f7c30b91292ac60c0c903a7ca0d52f2a4bfedbf06f WHIRLPOOL f719c2d6e6ebb229c275bd4b96cbe4ca5028a4215841b80ca3187bcabcb3f04f2eb452cf5fb98e94a7d3e47af2d612a9c2dc661f3310b1a4969a7a6611649649
+DIST htmlize-1.43.el.bz2 21018 BLAKE2B ff07571bda31c3733e3a5ef703625ea485721080d13ad28f7e2be3f7470cae7f00ebf7f7a899a7351942643c5f3b854f01918b9fd3175b8f7ba0ae9237665d42 SHA512 cdef3f8478862e9743cad23697775111fbd64737daa6e0525923cff1ccc8dfd20ad554e5e92ec99281d87acf9ecd358474761858c8c6639c5459234bf79d4be9
+DIST htmlize-1.47.el.xz 21544 BLAKE2B c00222fa39bbd530fae89b6a71cc515dd37cce4d787267eca9d23eddd9f3054b932df8908712971c46c28fc89921a42ac613e826d73094b333aa977335077f54 SHA512 2cca746f696d382336a800d3f15e6a5812afa7c6965d6695c501085ed6c8f447da8ee6ed31a27c240e9d70f7c30b91292ac60c0c903a7ca0d52f2a4bfedbf06f
diff --git a/app-emacs/httpd/Manifest b/app-emacs/httpd/Manifest
index 27426dc0f400..3347e2c86dc8 100644
--- a/app-emacs/httpd/Manifest
+++ b/app-emacs/httpd/Manifest
@@ -1 +1 @@
-DIST httpd-1.1.tar.gz 3770 SHA256 e94aa61dada1a289eec2ea5d3d7e5056aee34064fdafdf6cbea1d5b279f2ff81 SHA512 b6078e8dd79ed4bcdabc85640ce14f556b14f82efb1429382ff75aefcd19ce586978ac79c59c4a20865fc67e103451937bc1e49dcca64dbdab4364c4e29510a2 WHIRLPOOL a6ab9b72a6cdb704333c6b73a66fec6ae279ebf6e37b0d0305f63a98a86545ed59d9becfafcdf7b713a739798499a64998b35c32345ed71e460494f248886fe8
+DIST httpd-1.1.tar.gz 3770 BLAKE2B 00fa14b035db349504d96fd01fc2881052e45d73a5084b33d77b3f6edb8f675c4467a048eae5fee6e502ecbe27c740d0827b35c724d016aef6446724b0d2a3f5 SHA512 b6078e8dd79ed4bcdabc85640ce14f556b14f82efb1429382ff75aefcd19ce586978ac79c59c4a20865fc67e103451937bc1e49dcca64dbdab4364c4e29510a2
diff --git a/app-emacs/icicles/Manifest b/app-emacs/icicles/Manifest
index b8a08ffe201b..ee8688abbdd9 100644
--- a/app-emacs/icicles/Manifest
+++ b/app-emacs/icicles/Manifest
@@ -1 +1 @@
-DIST icicles-2013.04.23.23400.tar.gz 886525 SHA256 a7d80d6d8b8150dafea8cf2f3e25ebf3846091edda9fdb7e5910986fffbd713d SHA512 548c20fe83f72d03820d620d0d5f9feb6d249ca96c8f951ddbf650691ad30649d28d736b7c01677e260fed0490382a5771c0e88adef6c9c0089ecbd225f9acd5 WHIRLPOOL 11db63085253451f1e84e371ff47173db2fb072060afc8a4db943907d53daaa5247036a4a33a9aaf09cedac557fcc185668a47e28b844e70714b9c6f92644797
+DIST icicles-2013.04.23.23400.tar.gz 886525 BLAKE2B 92325f9486f3008b45d336828025e828b83bdeb91ea7fef3a72f8093b9800ca1303cebcc3cc6c7c4bfadb9b66a26371f55a98498a34d23dc3511d1e2f6de4b36 SHA512 548c20fe83f72d03820d620d0d5f9feb6d249ca96c8f951ddbf650691ad30649d28d736b7c01677e260fed0490382a5771c0e88adef6c9c0089ecbd225f9acd5
diff --git a/app-emacs/identica-mode/Manifest b/app-emacs/identica-mode/Manifest
index c49c649d0c59..b8b32c46fd22 100644
--- a/app-emacs/identica-mode/Manifest
+++ b/app-emacs/identica-mode/Manifest
@@ -1 +1 @@
-DIST identica-mode-1.1.tar.gz 33078 SHA256 f2c46ef46fc66e8804f772b5fef0a8b433501a524b773091f30a68deb1ed9eed SHA512 c8dfe17da04d7124398065a171829b30036d1df32d383c0297c0155a2fbe4a8260901c903194c1136c05add960270aea4b92a9b97928541985ff1c2f1084f53c WHIRLPOOL 0aee47f8aebede10039b3fa0bd49d038b2295b8f2f0475adbf331db47f34cb86afdbe404a5d610bf0e9331480533a6bcb0b6188140d30b06330378106e9e20f2
+DIST identica-mode-1.1.tar.gz 33078 BLAKE2B f10665b5468a2fef27dc7142aa88aab1ee7583872149654b1d4f072e74732ae9512e117a2c9d26c99b2445dc93d370c77250fe4c80e432865983d1fafe4fd0da SHA512 c8dfe17da04d7124398065a171829b30036d1df32d383c0297c0155a2fbe4a8260901c903194c1136c05add960270aea4b92a9b97928541985ff1c2f1084f53c
diff --git a/app-emacs/igrep/Manifest b/app-emacs/igrep/Manifest
index 0ac1344ed10f..dd51ec03bd36 100644
--- a/app-emacs/igrep/Manifest
+++ b/app-emacs/igrep/Manifest
@@ -1 +1 @@
-DIST igrep-2.113.tar.bz2 10662 SHA256 819c0d5cc4bbcd4503f2429bc4f88a5185cac5504a6679801137c064262b250a SHA512 60ca8fa09cb2aa02ec7178afc7d8a2a6d98ebd98b951b29c9c7150588d5ca0dbf01e23e77c6524e2ce510466bd17aba607a172efde1fb4bc56e8478a752d5ff1 WHIRLPOOL bdddf788ac8c83016f31a1b5aec234222da118f74b242c7a61ebd467a92eabe13f7144d268ff8a691f7515d7aec0897a4af6f9d91c6e66955e336921ddb0f227
+DIST igrep-2.113.tar.bz2 10662 BLAKE2B fa854e1975548e037f33ce97988b9e4abf8182c13f6cce804a8b305e03282fc7990cccc2061aa3ed829279721f13610b89e2a4125b637d0584ccfd28ba628d0b SHA512 60ca8fa09cb2aa02ec7178afc7d8a2a6d98ebd98b951b29c9c7150588d5ca0dbf01e23e77c6524e2ce510466bd17aba607a172efde1fb4bc56e8478a752d5ff1
diff --git a/app-emacs/inform-mode/Manifest b/app-emacs/inform-mode/Manifest
index cc2ddb2cdbf9..e862e486e63c 100644
--- a/app-emacs/inform-mode/Manifest
+++ b/app-emacs/inform-mode/Manifest
@@ -1,2 +1,2 @@
-DIST inform-mode-1.5.8.tar.bz2 14734 SHA256 d1a4d91df7fb80f9888515c8969dd36ce5ba40f36a4d683c22fb15d9def880a7 SHA512 edf073d1c4f60ec9eb186a68cafff22ad67a32f40f21bd89584f3a02eada6d073935892e761a6a2f2726e90f59cf0c1a77c2cd59b8b4e85a17374f47997265d8 WHIRLPOOL 1364f966861a20b9eefd8c5ff6b66d74c9167e0893b1376a3a97a178a8780850d245287311c2d1451a5dfbe529b399a6a3c5f5f275afd216a86f11b26c776ea2
-DIST inform-mode-1.6.2.tar.gz 33359 SHA256 a84235c66a650ff71945ab57fb1aa94f91c94c49c798f444c2823efd42a8bd34 SHA512 41ab2353942a5d605ec848aed87aa731282a43305cd739fe76d9e6ddd333c84594455f0fb72d95ed02fbcfa9f78f11b16ea8bb579504d1ed29244cbe50e444ee WHIRLPOOL 60dc9078d56290944ce7f6fe4320b7457cf4ae9fd4c0f1d2a1c86356b7cb5f818fe65011acafc18392240b1fd2695a61a28b9b53306e70cb47b3924a1ba4abfc
+DIST inform-mode-1.5.8.tar.bz2 14734 BLAKE2B 9ffae6571786109ae324e6d1336c453b279f5ef7d8b8be7561fd062cbe71f106c0d2b3e1065fadb7a153942fd5ad9db9d763652912a021cfc66ff2a0a16da3ed SHA512 edf073d1c4f60ec9eb186a68cafff22ad67a32f40f21bd89584f3a02eada6d073935892e761a6a2f2726e90f59cf0c1a77c2cd59b8b4e85a17374f47997265d8
+DIST inform-mode-1.6.2.tar.gz 33359 BLAKE2B 5ea2a31443db436e3230b61d4f8cf6a724f0103857ce98b41becf2271956e1aba2dbacc73b47be20ca347314c1be186d99a1884d11ce14a7cbce6944096ad588 SHA512 41ab2353942a5d605ec848aed87aa731282a43305cd739fe76d9e6ddd333c84594455f0fb72d95ed02fbcfa9f78f11b16ea8bb579504d1ed29244cbe50e444ee
diff --git a/app-emacs/initsplit/Manifest b/app-emacs/initsplit/Manifest
index f986a9a14217..2f63d2de810a 100644
--- a/app-emacs/initsplit/Manifest
+++ b/app-emacs/initsplit/Manifest
@@ -1 +1 @@
-DIST initsplit-1.7_pre20140203.el.xz 4792 SHA256 4005271af94ca4dad7a3b6b084fcb1e5b93097e98ee15810b766efddd2f8a718 SHA512 f2c894bb9d0359b5e95760541feb83f465950de732266059b9498b7ee7361ebb843e0d900fec92fa5e9c37547ea160836b9fc24f64c56083e3ea4416b4b52e50 WHIRLPOOL d10ba44154fc6030fed39a2cb325ced928501d8bfddc47b5364ac95b0ee55bea6f3a7d01a2dad166622d2baa247a0188b30da6d2fa5f42ad43cbd20259b8ef9d
+DIST initsplit-1.7_pre20140203.el.xz 4792 BLAKE2B eb853870e9d159129e22e48dd5704b83fe8877933ab68f75127e4c82000b7a2a3b87ccd779f16f2ed2b0407ed6574694e42310fd6195152adb099bfd5c592187 SHA512 f2c894bb9d0359b5e95760541feb83f465950de732266059b9498b7ee7361ebb843e0d900fec92fa5e9c37547ea160836b9fc24f64c56083e3ea4416b4b52e50
diff --git a/app-emacs/jam-mode/Manifest b/app-emacs/jam-mode/Manifest
index fcfcb7322615..b7e5a8222c79 100644
--- a/app-emacs/jam-mode/Manifest
+++ b/app-emacs/jam-mode/Manifest
@@ -1 +1 @@
-DIST jam-mode-0.3.el.xz 3368 SHA256 d08958a9b3dae000303a98dd776d24f21aadbc385999ccf55876bf2c7c7c90c9 SHA512 17cfbbc2a1e65f65d3a2366a861ada2133e4a16f2c9a99b40915a3c50744dcb4360226a7ec9efc53092731389a3b397df92764b79240f203a5ef6c132c5c9350 WHIRLPOOL 684c4b23d974245614f3525435edd0447503870197b9b3de7dbe3f3a903324ce382a462423cca852b6e518b7ba21c26277f9a077368da5803336e3cc9810805b
+DIST jam-mode-0.3.el.xz 3368 BLAKE2B 53b701a8580c29e2a4ebc705f79b4eb312f8466a9ec7c721adbdd243a812ba25e1dda0bfd32a4ca84453b4ccf19ac2cfaaed54269d80e05da62deece18761d9e SHA512 17cfbbc2a1e65f65d3a2366a861ada2133e4a16f2c9a99b40915a3c50744dcb4360226a7ec9efc53092731389a3b397df92764b79240f203a5ef6c132c5c9350
diff --git a/app-emacs/jasmin/Manifest b/app-emacs/jasmin/Manifest
index 956367aeffe7..c17a30f66b64 100644
--- a/app-emacs/jasmin/Manifest
+++ b/app-emacs/jasmin/Manifest
@@ -1 +1 @@
-DIST jasmin-1.2.tar.gz 9287 SHA256 7fa064835acd6bdcedac7d57debe1dfbbf83f08083404a0c6adb7c2a1b95c8d3 SHA512 2b89fad8e4bdfe71f09af8f2a31347cc63ad6c70008b33500e85d58c0ec872076229d9113170c54f57c969940cb2973b6167e2b7f825a94c1d3f55680f419043 WHIRLPOOL 64dcb042106103800e1c2b4b7a27f8d433854df69ea7170ddcb31832f7ef07f2096e7d4969dd23e6befb4ed7cfe4b7e14424269050258d068af01783f341743e
+DIST jasmin-1.2.tar.gz 9287 BLAKE2B 2ddc69f61662c66a58c9422a43d88642fea79d678942138d7c7e79276e2c322c3af5b17d82728ce7fdcf7501a171d9c8199b671cf6ac7511bd0e126fd73b2a67 SHA512 2b89fad8e4bdfe71f09af8f2a31347cc63ad6c70008b33500e85d58c0ec872076229d9113170c54f57c969940cb2973b6167e2b7f825a94c1d3f55680f419043
diff --git a/app-emacs/javascript/Manifest b/app-emacs/javascript/Manifest
index f3ec65542e4d..aa58e26b42d8 100644
--- a/app-emacs/javascript/Manifest
+++ b/app-emacs/javascript/Manifest
@@ -1,2 +1,2 @@
-DIST javascript-2.0_beta8.el.bz2 6067 SHA256 d2e77337442ceaf065d0767cce22609ecdfe045ec60552db79f2d8683d90b512 SHA512 fe212b938bf390f06e97981b127bb3cbda048d665fa56a2053f9ed2a27f76abb77d0c1cf120afacc26f423f9a0abc70fb53ef05537942b2c8768c6626eecbdb8 WHIRLPOOL cb90ba5b7726bae9382f29dd25133ce813241f40007096d9890ad49380c78a6ebd780d2e578b920fc0490654952b94f0061787870242e79be1a7608cd119a642
-DIST javascript-2.2.1.el.bz2 6141 SHA256 9f7e7039662e2081b1d373f2c1fb449c975882f6d09f566719eef85c8bc21433 SHA512 1c84b394bafa4ebbdb9827f109ada2219860b147546e7bda337cb570296aced30758276da1c12ac33398ce3f6e6fc49b6a1e9c300dd2759017882fcd1ee085ec WHIRLPOOL 845571cb06b6b059a3b0524c020c19072e79ad0d579bd37f73779f8c9285ede081cffeb99913528ad39dec234c7c47610fe620461a17ff5a1cb5789de238d950
+DIST javascript-2.0_beta8.el.bz2 6067 BLAKE2B e57dc6b8a75e5e19731d9f8682e834fc2b2902ff5631a245a41675c126a31b2bbf0cddb6fcf50e66daa68189c8db348ef333e45c0393da9aa8d28644d80d3a34 SHA512 fe212b938bf390f06e97981b127bb3cbda048d665fa56a2053f9ed2a27f76abb77d0c1cf120afacc26f423f9a0abc70fb53ef05537942b2c8768c6626eecbdb8
+DIST javascript-2.2.1.el.bz2 6141 BLAKE2B b915ac74269c0715124f0fa32fcb3ec1bd91f8a442d1b8c8cc95d326cf3b004102a122ede6155ecd34d875e1cc511217c01457d343e9a86cc0cac321f71216a6 SHA512 1c84b394bafa4ebbdb9827f109ada2219860b147546e7bda337cb570296aced30758276da1c12ac33398ce3f6e6fc49b6a1e9c300dd2759017882fcd1ee085ec
diff --git a/app-emacs/jde/Manifest b/app-emacs/jde/Manifest
index 7e047b03dd2d..8bf849d51654 100644
--- a/app-emacs/jde/Manifest
+++ b/app-emacs/jde/Manifest
@@ -1 +1 @@
-DIST jdee-2.4.1.tar.xz 2742232 SHA256 24241376837361e23a2c181775423ac248e441e3ced513e21cbef30529cbeb43 SHA512 5ce5f0f84b2502e9af808f33210511e8b7682902b1f342d678fe42dd8f9f3690b90ef7bb22583550eb769818782c50f545d6baf47b52bc7f4502fab411ab5359 WHIRLPOOL c20988fc59fdd453e9942b53d444605dd3738a9978e2bd6a67d30b550e5510926056bc0b7734a9fdf4fd7c4ac09a2bbd1baaf35b92bc94438b378d722ab76a37
+DIST jdee-2.4.1.tar.xz 2742232 BLAKE2B f022cb55583acc7846bc04b59e843050947819c6bb2494bbe08ac3895c15d914df28d3c3a50cfd945efa7ed507cda9906a42866c85463907544095377cc1bf07 SHA512 5ce5f0f84b2502e9af808f33210511e8b7682902b1f342d678fe42dd8f9f3690b90ef7bb22583550eb769818782c50f545d6baf47b52bc7f4502fab411ab5359
diff --git a/app-emacs/keywiz/Manifest b/app-emacs/keywiz/Manifest
index 9baee226a43a..a2bc1e0b4b3a 100644
--- a/app-emacs/keywiz/Manifest
+++ b/app-emacs/keywiz/Manifest
@@ -1 +1 @@
-DIST keywiz-1.4.tar.gz 4159 SHA256 39d8511c805329d1432b49c0a528a2a6f6cc35e96a1bc10e74d39434ac93d926 SHA512 e6143562a7bdba6ceb838e56504dcbcf9d975be04af28007cfd6e79a5fdcb4028882f1e2fd57e4245b47b80dd5234bcb7ddc2eef4ab0c09bb80483f9db7eca19 WHIRLPOOL 6ac58c7e3755e481b9d9feefa5b77551486eb206fbec8f4891f9cbca0b35d1a13a83baec0f3fddc3a5d3f8eb226a99ca224c9176fc8140ff6ca50da4cc3d5054
+DIST keywiz-1.4.tar.gz 4159 BLAKE2B 85498eb95194fcdc20589791d48b49ffba77982c310654fad133a6ed096a290ef75ec6983cf492e80153c8c967bb8271c059140bd8353b743ced86887a7cbf61 SHA512 e6143562a7bdba6ceb838e56504dcbcf9d975be04af28007cfd6e79a5fdcb4028882f1e2fd57e4245b47b80dd5234bcb7ddc2eef4ab0c09bb80483f9db7eca19
diff --git a/app-emacs/limit/Manifest b/app-emacs/limit/Manifest
index d83b5ddebcd7..8b12ff94aeac 100644
--- a/app-emacs/limit/Manifest
+++ b/app-emacs/limit/Manifest
@@ -1 +1 @@
-DIST limit-1_14-200811252332.tar.gz 186477 SHA256 41951bf2a0b4fca79cfa14b4a249e655ea028ecfc27b1380acb615ba05916701 SHA512 59cce771747cc1e144cf5b3e043c87b09f81935334327a1ea46197951f2c572c3f3e28efc71076fd3da54f9f667852574088ab009d2e966ea3eb363ee53ce0a0 WHIRLPOOL 39351e0a869225c374e98687ea1d65af30f0a0ca7721bb1f332e8ace26e38213513c192f6b0fb8c0827ec79cd0bc17961e7021507789575d924bcd9b0a8c3af0
+DIST limit-1_14-200811252332.tar.gz 186477 BLAKE2B ccc9ac2f95e2cc27dd82fad215ab15f8cab8bbd92aa009f7d47a11f727bbf2c50a67797e76d9830fee0d84b1ee0bd1a5dd01ded877dc77695a49058b541680e6 SHA512 59cce771747cc1e144cf5b3e043c87b09f81935334327a1ea46197951f2c572c3f3e28efc71076fd3da54f9f667852574088ab009d2e966ea3eb363ee53ce0a0
diff --git a/app-emacs/lookup/Manifest b/app-emacs/lookup/Manifest
index f6871f255324..206763e3eab1 100644
--- a/app-emacs/lookup/Manifest
+++ b/app-emacs/lookup/Manifest
@@ -1 +1 @@
-DIST lookup-1.4.1.tar.gz 346391 SHA256 13ab02652e322773f279db1862e4423c24da0da0b662dd6a29dbd95aca729bfa SHA512 a28a770ba58f07db5a7b2452792fc0e83b74e3b45556e84a9729c73773df661dbb7d356c1f7be803feb66f23e154aa825dab610f841bbe655bc76bd7120370bf WHIRLPOOL 2096df15468826cdd69b53210c3e86cd83823dbc4c5cc4b16f438732a4ddc21e902a057f60a5d076b319b977f485a2b7badd5d8983c79c0b04822c8fa0f00746
+DIST lookup-1.4.1.tar.gz 346391 BLAKE2B 4de52e0bf444e4822408db580f1aacbeb8a42ea1492eda2c7678f1838615da00a370b1d12efdf0ff1fef4e81302426245e0c2411f42bf17667966c90f8b39cbb SHA512 a28a770ba58f07db5a7b2452792fc0e83b74e3b45556e84a9729c73773df661dbb7d356c1f7be803feb66f23e154aa825dab610f841bbe655bc76bd7120370bf
diff --git a/app-emacs/lyskom-elisp-client/Manifest b/app-emacs/lyskom-elisp-client/Manifest
index 20d4b854a92f..433c111efb0e 100644
--- a/app-emacs/lyskom-elisp-client/Manifest
+++ b/app-emacs/lyskom-elisp-client/Manifest
@@ -1,2 +1,2 @@
-DIST lyskom-elisp-client-0.48_p20131231.tar.xz 888212 SHA256 d34ebefc299942ae3990f4d309ae17bef847b5e546482bbfe6b5cdd78a0c55b7 SHA512 124dc45194d68588535e134acae9de9b19484b568c43d2eb49d3c4e8ee923e0baf64a634181a3238f34cf59a98a5a1e92e988519d26e8f3c3a0e867f500d53e9 WHIRLPOOL f13addd5561a86f257def968b5a7d73433e1d53bde0452dcc6bbfe41381eb977fa1da398eac05da1c113c8c82c59a4db2c62ba4825fb83db1f548bdb54dc6f04
-DIST lyskom-elisp-client-0.48_p20161231.tar.xz 889464 SHA256 5c8c932dcb7d8068b574dc5812dd71f1ce277c00ce3b891bbec210245ad148b7 SHA512 f412a0b1b9f71be26ac511f66ba5215e757287baa668ce71802802eb13f907137fe27a96614c58abac510104c1d9558cf9b62b3bf8e598c11b4fa3bc33269f81 WHIRLPOOL 0fcf0ebc581a7d0a973905c4ba5c4b3a6f904fdd7a3ffc553fce8fe0edf76d3ab985e83245b11f260d0ece7af03f762cb4e568c9e87d954e8037283d3c42017c
+DIST lyskom-elisp-client-0.48_p20131231.tar.xz 888212 BLAKE2B 54bcd028a8adc51aeedd8f8e8940b391d06bfda389c3ce776c113a2f1fe738d5d46a5332bba07c708dc38b06f6c4d6feff3328a4ff10bce1c22dd9c73d6bf349 SHA512 124dc45194d68588535e134acae9de9b19484b568c43d2eb49d3c4e8ee923e0baf64a634181a3238f34cf59a98a5a1e92e988519d26e8f3c3a0e867f500d53e9
+DIST lyskom-elisp-client-0.48_p20161231.tar.xz 889464 BLAKE2B fda0de6e335c0f50dd8ca78c45ea161ce1e8290beba54567c1352609f9f5b1fd69be5d651b33ed89e6a19a52665954e80cb22dfafbf8d396d87bef735114f528 SHA512 f412a0b1b9f71be26ac511f66ba5215e757287baa668ce71802802eb13f907137fe27a96614c58abac510104c1d9558cf9b62b3bf8e598c11b4fa3bc33269f81
diff --git a/app-emacs/magit/Manifest b/app-emacs/magit/Manifest
index c6704099104c..7495084a6aeb 100644
--- a/app-emacs/magit/Manifest
+++ b/app-emacs/magit/Manifest
@@ -1,5 +1,5 @@
-DIST magit-1.2.2.tar.gz 111245 SHA256 8ed300887909d0990cf17b1f4a3b902944db2471ca93dbf0202724b3f44e5d0c SHA512 c7817a5231485e593e8f7aab8c01db19f433ff9b77d6635c95eec6beabb45901f1dbd9d02fad718436f9e25516df14714e7ca1b05b53244e8465dcc14a8cee7a WHIRLPOOL 4b7116bf2568f786a859299ed8039bee32fda51322e29f7ddd139a9ee5e3f3a3caa9d245fffed3e6c28f11b0e068c398f424450275de94a4559a9812634639a0
-DIST magit-2.10.2.tar.gz 429389 SHA256 c550e6ffba4613a3aced45b3af03b175762e3a385c96d1e2ed480b9e2b43c446 SHA512 3309824a4a9fe36316912911f53a1c9aa8f93230b6461cf4bbcb9cdb38d474ba59c8450fe1722155959c8cf5610358ea9ec28723cdbbce226219f4cf1c5c4bd2 WHIRLPOOL 8f53d046585b077e4df8b8f5ddb82b2bb9d1673e1bd0cb4c0a0c81b04cde39efe899cfcd98386868376bfc900e598818b06132cd2cbb9774bf28e68843a1d21f
-DIST magit-2.10.3.tar.gz 430343 SHA256 dc797db8da8683767ffa5d006f6e85d334892979c76057baf03c99bb0c6f669c SHA512 54cd4c54548583972111ffb18c3b4e0834e061d84d071d5b559fe4b800872eadc214d01c8efc4452ed725184ec5bb1954e897d94fdb82397c9e953aa7236532b WHIRLPOOL ab39f72babb68f619993e221ae03616e6a1c1eea62e2f106f9a4783bdb9e160ec04a183be38a7d2450aa0a75fe97ac119605e32b9f2b9f0983b437855a7c0166
-DIST magit-2.11.0.tar.gz 451030 SHA256 5138509a3f5b1be3cbacdf4ddaace4ce4a3b6bafb4f209fffccf69ef99e329f7 SHA512 d32abdc9e89e77f65f05cc3dbec720320bc93d9ae827604c4f90acd115e76f8d05e445a96a141fbfbe88cdacca8383615fb73bddf01e776eeb3f63a459e973b6 WHIRLPOOL 12e2b85e39019998c20438fdf22b5e5ae8b601ab5ad0513bb0281e621bae11985e4ae4ce70a86d48be4e402c60c7606b77367876bf1b6a4ca0d5df2ace567947
-DIST magit-2.9.0.tar.gz 421074 SHA256 0de38797cb89a5abe202f08ea371ab0070f5829587285cf48cb28340b5bbde78 SHA512 0a15e4b6c145c081929f4f49cb40f7827bb3e68b4122e9e76b74ea24ded4c3bd3ea5c431ef6d56b08705fe3b77f2d32ee4383c7eddc93de2a3170add098e15ed WHIRLPOOL e12d5e406531a1fa70da062c94e977384cfcd22f50e51867d4a436c2cc722acde3e62725304d867af7e63a9529287aaf547b8f973281d574bdbbf0878fb54bb5
+DIST magit-1.2.2.tar.gz 111245 BLAKE2B 357da63085cfc934eafbbef3439880e12e9baac1e47be08e30803b9c51fba7cc6ec616fc2996da6795e95d331e71da8934a107ccc661b907550f33eabb99d17d SHA512 c7817a5231485e593e8f7aab8c01db19f433ff9b77d6635c95eec6beabb45901f1dbd9d02fad718436f9e25516df14714e7ca1b05b53244e8465dcc14a8cee7a
+DIST magit-2.10.2.tar.gz 429389 BLAKE2B d197a1d4ad2e6dccbe693ca9daf44cde91d276cddc8b9d07f13b12c907afe0a2a7591419f909ddeb1b8c107ce8a529d562a0a4cdd1d2f888367a1fb552d2b4fe SHA512 3309824a4a9fe36316912911f53a1c9aa8f93230b6461cf4bbcb9cdb38d474ba59c8450fe1722155959c8cf5610358ea9ec28723cdbbce226219f4cf1c5c4bd2
+DIST magit-2.10.3.tar.gz 430343 BLAKE2B 61afda0c50ca315d1d601ddaa2b6df2425a83d6dd3f501f5499df446c8498db0846d2ec58c7f1760933c0d05aec89d4b39d2ea19297f1302a156a97e29f3bd0c SHA512 54cd4c54548583972111ffb18c3b4e0834e061d84d071d5b559fe4b800872eadc214d01c8efc4452ed725184ec5bb1954e897d94fdb82397c9e953aa7236532b
+DIST magit-2.11.0.tar.gz 451030 BLAKE2B e5a5301d720e927c6c81aca4c5572a9a7fda938c695738246a87c46adc00a13e94438bb18d5f33e796c798cfec7dc438632cac6e4a452cff7d6e899a67f33575 SHA512 d32abdc9e89e77f65f05cc3dbec720320bc93d9ae827604c4f90acd115e76f8d05e445a96a141fbfbe88cdacca8383615fb73bddf01e776eeb3f63a459e973b6
+DIST magit-2.9.0.tar.gz 421074 BLAKE2B 6fb8305ccf3933c2ee7962da897484b0d5860b656aa84f8e95a6950ca1c7491deb535f52418d9156ca8a71f5a08fc8e10fd4af9143d6fe26f77d724d799ed24a SHA512 0a15e4b6c145c081929f4f49cb40f7827bb3e68b4122e9e76b74ea24ded4c3bd3ea5c431ef6d56b08705fe3b77f2d32ee4383c7eddc93de2a3170add098e15ed
diff --git a/app-emacs/mailcrypt/Manifest b/app-emacs/mailcrypt/Manifest
index 233b6fd9c831..53c746459434 100644
--- a/app-emacs/mailcrypt/Manifest
+++ b/app-emacs/mailcrypt/Manifest
@@ -1 +1 @@
-DIST mailcrypt-3.5.9.tar.gz 172073 SHA256 a195e1e56db44519945861900c6a11c787fc28482d939d5a7564a0f0b900e054 SHA512 df6524ecc42d4c7bdddb34439186690192bc4091a1965e405223106fc71047c33e4bbbd571b030c326efec46961ba0aefd018ff1205d230dc74c34daf93ba079 WHIRLPOOL 19e7cceb7e1cc400e53165f21355ab501e0712f9d3da23cc81569a440bf20ef0d423ffbc7a5f4a9a00271fc3bccae2a322bbdf89a717aae55dea38a071865d5b
+DIST mailcrypt-3.5.9.tar.gz 172073 BLAKE2B 02a911c0676464a670754cf8ddfccefa1ab9c69c680911ce63faa0affe6d3f72ad7d409f716a1edf326225f3378878caedfd4194201894baf05110d26acba533 SHA512 df6524ecc42d4c7bdddb34439186690192bc4091a1965e405223106fc71047c33e4bbbd571b030c326efec46961ba0aefd018ff1205d230dc74c34daf93ba079
diff --git a/app-emacs/markdown-mode/Manifest b/app-emacs/markdown-mode/Manifest
index 1b6968ab8135..9e857817e3c2 100644
--- a/app-emacs/markdown-mode/Manifest
+++ b/app-emacs/markdown-mode/Manifest
@@ -1,3 +1,3 @@
-DIST markdown-mode-1.8.1.el.xz 18152 SHA256 865d83162cfb39ee06a2e46b3d586e71d144d360e8f2f1cdf72bdb5923ededc0 SHA512 1e679a409fa5a7f6f622e4a554d74ea1820ba1e82eb77d3ce6b33d5494350232a2b165c9f002a076d4ce97138584381938d5c2ccac4161131ffba82da5091946 WHIRLPOOL b8b05f9b8ffa1db6c20fda46e6058fb7b05ba64f9bd921ae310d274c4be0887c29ab180cbd984c1ea21020be4e8af619a91e4a8c0a8a33d280298ba9cfbec162
-DIST markdown-mode-2.0.el.xz 39508 SHA256 a24f06f4aa2f1d4847e045a54c25c73f503ed89c0f8954b934b2b6c658357819 SHA512 eaad1561c5a84f47cd07318f0c80454d28a59becc0372453ec1412511879335a5717d1531895fe969c5d2fe7a4aac5a9e55ee727dcee621ba203737ca9182f3d WHIRLPOOL 14d15b9ad20c1f857e99056fbfd5c2305a7ba579a8210a73d10806589e201e5e881a33b49ea31277fe354c2bb8cdab090811c8c27aca64811248596927c82994
-DIST markdown-mode-2.1.el.xz 50484 SHA256 c4b4fb632d1354ea5ed6d8500a85326c05e24d0343cc4fd5d54860f70dc67022 SHA512 3f0d68b03408281e49c9dbf4d26b8c1f766aa675efea6789b13722c7b1d831af35d3ea30ac071be00242279bca31d04fe92a28b901698fe2072d4504d9901253 WHIRLPOOL 909b542f6523b47bae8b27445b3d8fc0f82a6fe6867e16b471c68f067fbc4f7918f482b0e373ea0b5d0763bbf5b0275e15427ac76007a6329b3aa8dfcebebdeb
+DIST markdown-mode-1.8.1.el.xz 18152 BLAKE2B 38d41ffc9fa22db0b31a0f6fa9eeeeb8beab5ac519a737f2e0de926f736a40c6570d3a98097a90b347b16569e2d191cb1cd9e630bf1a9071fa7939a0f88f2c5c SHA512 1e679a409fa5a7f6f622e4a554d74ea1820ba1e82eb77d3ce6b33d5494350232a2b165c9f002a076d4ce97138584381938d5c2ccac4161131ffba82da5091946
+DIST markdown-mode-2.0.el.xz 39508 BLAKE2B 723d3762584a9723851f7dda63f172a5d495bd8c967538bbf9f2b3b2dacebc31ee3369dde1d8bfc288419a585e9f3a66382fc3e35de143618cdfd5e5cd77010f SHA512 eaad1561c5a84f47cd07318f0c80454d28a59becc0372453ec1412511879335a5717d1531895fe969c5d2fe7a4aac5a9e55ee727dcee621ba203737ca9182f3d
+DIST markdown-mode-2.1.el.xz 50484 BLAKE2B 12ae664f0680a420727148c2ed78275ab7dcdc8ae742a0152f82dc25150cea9bd5d880b9244351792354ac1d64789267163512e55c2b83f64855bbc0ab0ac33e SHA512 3f0d68b03408281e49c9dbf4d26b8c1f766aa675efea6789b13722c7b1d831af35d3ea30ac071be00242279bca31d04fe92a28b901698fe2072d4504d9901253
diff --git a/app-emacs/matlab/Manifest b/app-emacs/matlab/Manifest
index 332d327514c7..7fa30782fa77 100644
--- a/app-emacs/matlab/Manifest
+++ b/app-emacs/matlab/Manifest
@@ -1 +1 @@
-DIST matlab-3.3.2_pre20130829.tar.xz 92784 SHA256 6165769a41597ae0469efbaf476f5e5ec395ccabbaeb2ba7ada3627d0a3de7da SHA512 b549314f71dd876453c395268a0ec1fca8d68ba8ae074ef45d0fb430afbbd6a45bc30a45bdd64be83dd44a0114d7f4ec8ca2f9acb250337fbdc407691d0a2c00 WHIRLPOOL 691d9291358884c99b5fc8502fffcd4d17a4ca4082493591b4dd72bbfffd07c79ca195e339ef5008d3b8b3878e441aa36b3857af23aa1b81f4c9e9f851de0c56
+DIST matlab-3.3.2_pre20130829.tar.xz 92784 BLAKE2B 327c1a5126cd3f686b053f404122975578edb92bef53e6c6fadd6ff27873646ab2e15ed5dc3aa34604c052675b9e0f47b82c4c89a72e1de017544a45e826e935 SHA512 b549314f71dd876453c395268a0ec1fca8d68ba8ae074ef45d0fb430afbbd6a45bc30a45bdd64be83dd44a0114d7f4ec8ca2f9acb250337fbdc407691d0a2c00
diff --git a/app-emacs/mcomplete/Manifest b/app-emacs/mcomplete/Manifest
index eb951f2dbce3..389b24a1226f 100644
--- a/app-emacs/mcomplete/Manifest
+++ b/app-emacs/mcomplete/Manifest
@@ -1 +1 @@
-DIST mcomplete-1.10.el.xz 10780 SHA256 ba2a047e1c91b35301ae111e6a9e9b21b6fd6a60bda44fc177cda29c0de1e1a4 SHA512 c6ee7a56b63e10769cc2f30a7dcd0a3f085f996adee5944bffdf633b91118dea5e1e5360fde2f556041526133b71d1722d558f951286721a9a691c4f25d9fd17 WHIRLPOOL b7d791f76a5bc465865d337312c4b0512ea0cf74a6a87a9c1162b1b294993189c9ee9e7f2a3133df0ded49df201088795b3f5d08e0a6cc2bb1a1a37ddd4fa7b0
+DIST mcomplete-1.10.el.xz 10780 BLAKE2B 601902ca5697c021048576bf0d4de1d4733e400638754a844e5ff74929a18014d9839e0eb72abcc17abbda8e3520bcb66b9df065100a5afbe1597630b3c1468c SHA512 c6ee7a56b63e10769cc2f30a7dcd0a3f085f996adee5944bffdf633b91118dea5e1e5360fde2f556041526133b71d1722d558f951286721a9a691c4f25d9fd17
diff --git a/app-emacs/mediawiki/Manifest b/app-emacs/mediawiki/Manifest
index d515f4fce00d..b11d9696e6fb 100644
--- a/app-emacs/mediawiki/Manifest
+++ b/app-emacs/mediawiki/Manifest
@@ -1 +1 @@
-DIST mediawiki-2.2.4.1.el.xz 19108 SHA256 142156428be0dc851e0d25771fe519574013ad55a9aefc1d9eeb410c7a1f64cf SHA512 4526c04c560679196900310c90d6321ab10a447ff4f904b0bc40bfc56296c3a773cc8fe7d4001cdfc108e9e11ce3ca4dd6677e51b220eb3b453a1b975118f52c WHIRLPOOL 058fb322d90dae325ad0300cba8cb173a5c749dff23bca160f69f502e748b7b410299510f69abdbdd215b90def555f048e3eb072975ecc5ac6d614d055b274e6
+DIST mediawiki-2.2.4.1.el.xz 19108 BLAKE2B e8603a622c80943153f96f6f9997053fd0913ef23e0a672576726fbac3d2a5de850afbcdb3748a05769b9c880bc641aa8aa5e48bf6dca800b1fbadd6c8b8a2ce SHA512 4526c04c560679196900310c90d6321ab10a447ff4f904b0bc40bfc56296c3a773cc8fe7d4001cdfc108e9e11ce3ca4dd6677e51b220eb3b453a1b975118f52c
diff --git a/app-emacs/mew/Manifest b/app-emacs/mew/Manifest
index 6dcc2f4ee18c..69794fb04776 100644
--- a/app-emacs/mew/Manifest
+++ b/app-emacs/mew/Manifest
@@ -1,2 +1,2 @@
-DIST mew-6.5.tar.gz 1026322 SHA256 f198b35c2a4cc1c082aaad8f6ccede80ed93d559aed0f66ee2c00c05f8394128 SHA512 481c55915e57889e7b8c6d27c3d21802b624a886eb8f6541c2997db4d5328e16c3b5a8c9a9ce09637b1779b8c52af86a8662ee30dfbab0a411a586d4679ac69e WHIRLPOOL 218fc42969fa4581c9fb43a9a1c65c67d83faf3ebced8ccd1e95c9b43a542753623cfebd14e042e2a21c29b8eca7bee930b306b9919fca6d249901def54bd5b5
-DIST mew-6.6.tar.gz 989941 SHA256 20c879d8488620ac77144c3259fd19cebae0b63404856e426a7e8895d2f9c1e4 SHA512 55a91faaba09a28dfe7da33d34a8c3638540db71a3572ce01646976fbdd0ac3e327475ccc2908876ee6f516c6ee60082a27413b210c4591ef12cc4f878a07472 WHIRLPOOL f07a626bfa32cc9885352eca83769c343ebe539ee6e23863018e04316e14b8c2e209c09b274af7937e3023d604698720df5ae6b57e363f0d09cbeca9246ccf3c
+DIST mew-6.5.tar.gz 1026322 BLAKE2B 16fa19eb19ce4b49ea1b33db13c46a8b6c79cdc602e6bc295d1ab3310db772dc2a73c6c218ce6358baba943e6572a803103e8bc56d3eaeb67dd29666e482f3f5 SHA512 481c55915e57889e7b8c6d27c3d21802b624a886eb8f6541c2997db4d5328e16c3b5a8c9a9ce09637b1779b8c52af86a8662ee30dfbab0a411a586d4679ac69e
+DIST mew-6.6.tar.gz 989941 BLAKE2B 7ec4e502865e13108cc51dc74ffa246dd1084ae369979c05b9c1fc326c01f716766b7aa445ac489fe7c34cbc610e130738fa7578ab338d496970f6e59847c295 SHA512 55a91faaba09a28dfe7da33d34a8c3638540db71a3572ce01646976fbdd0ac3e327475ccc2908876ee6f516c6ee60082a27413b210c4591ef12cc4f878a07472
diff --git a/app-emacs/mic-paren/Manifest b/app-emacs/mic-paren/Manifest
index 308f265b6033..a48dea340887 100644
--- a/app-emacs/mic-paren/Manifest
+++ b/app-emacs/mic-paren/Manifest
@@ -1 +1 @@
-DIST mic-paren-3.11.el.xz 13992 SHA256 f70756d031a7645fe70fac7fa60e365f47f8e7e59f1b4d8f1826d3295b4d2b74 SHA512 ac896c425330935c0d6ae86eb65232c8fb6c463f6cf259c4bfd79023c3e25243d6b998e9f0ea5393ef1491ab0bf1d6fe5dd33278fec93ec3231603bb6e910b77 WHIRLPOOL 29cec9587f9823a9fd11668f2a2dd06fc23a60e10815a1018c7c73f13e50040d59c8dc22bf9e9db805ccc31f22b6cd4ac279d022b363b3b9c0e69b5f6c1fc2c5
+DIST mic-paren-3.11.el.xz 13992 BLAKE2B 05b99123f32248eb20611c1889e26af34c42f7f3a37753eda59bfb0e499befd698644b283cbd491925e7a766293e0fe2172dc1da9a36eb94be94e17a6b9cd46d SHA512 ac896c425330935c0d6ae86eb65232c8fb6c463f6cf259c4bfd79023c3e25243d6b998e9f0ea5393ef1491ab0bf1d6fe5dd33278fec93ec3231603bb6e910b77
diff --git a/app-emacs/mldonkey/Manifest b/app-emacs/mldonkey/Manifest
index cfcbf3942b18..2b185605cb33 100644
--- a/app-emacs/mldonkey/Manifest
+++ b/app-emacs/mldonkey/Manifest
@@ -1 +1 @@
-DIST mldonkey-el-0.0.4b.tar.gz 17442 SHA256 5b14873c45c13bd4da553457798cdd7e552fb00dcba880343a958e63823d3f06 SHA512 3c6a16292968e0f40d319614bfd2a53c9612ec4121c5720f51498d8983f6b944c38fc1d664f1c7ebe1d68653ba62d828fa00092b1a1d278547c225b33f4e740b WHIRLPOOL 07e14a910a6748f2e0faea78aca80ea95758fa598a01317074208dbec60b7c2d262eb2771f1b3764ebb557ed4fcd76446d93de0bed4b45e5952a27822991f857
+DIST mldonkey-el-0.0.4b.tar.gz 17442 BLAKE2B d9057a00c3b3532162564f59afb838a41b83b17adeb569d86c13cef8a6338083f12d078a19d0568936d9116e0c9adf0b53db3933116dc46925ac095c1a529d89 SHA512 3c6a16292968e0f40d319614bfd2a53c9612ec4121c5720f51498d8983f6b944c38fc1d664f1c7ebe1d68653ba62d828fa00092b1a1d278547c225b33f4e740b
diff --git a/app-emacs/mmm-mode/Manifest b/app-emacs/mmm-mode/Manifest
index a6e6143e31fa..f7544ecbfeec 100644
--- a/app-emacs/mmm-mode/Manifest
+++ b/app-emacs/mmm-mode/Manifest
@@ -1 +1 @@
-DIST mmm-mode-0.5.4.tar.gz 174680 SHA256 db55529ba95f841826bee952e73e55b87d9c191004e7c985a9582eea2cd57c82 SHA512 71828769f40ca56d87c581481fc6531466de30155af3f22eb96ee176cd9dae354ed95a6c37d79e47a033bb79c67335e0f50dac2fb57f262bbe0ef43266af2b6e WHIRLPOOL ec46237a1537a334c017c56f52e0cb5b3e1890882cb07e6c88b5d5b76a8e03a9423270995bf4151946fbf0b6b00209f9e6e047f2225685f8ab703ec035425c33
+DIST mmm-mode-0.5.4.tar.gz 174680 BLAKE2B fbe69ffe291d7144ddaa22d161545350893285e2594f9343d6b4e3b6c929a83209c8dbdf5f270b179c98c7fd1ab88d2c5f68066e6aca0ef5e8533335c4c194e9 SHA512 71828769f40ca56d87c581481fc6531466de30155af3f22eb96ee176cd9dae354ed95a6c37d79e47a033bb79c67335e0f50dac2fb57f262bbe0ef43266af2b6e
diff --git a/app-emacs/moccur-edit/Manifest b/app-emacs/moccur-edit/Manifest
index d082870ff2a6..fc7c444b50cb 100644
--- a/app-emacs/moccur-edit/Manifest
+++ b/app-emacs/moccur-edit/Manifest
@@ -1 +1 @@
-DIST moccur-edit-2.16.el.bz2 4325 SHA256 326edfe22835854ee949622822d7a212d04f075e757b5885b3f3fc399a03946e SHA512 dcb6e2a6336534bf475790c5b80fc86ef8a6ee6d7525a7c45a0050e0f9df3d5d4fdc52151af7ff2ef5c72785affef151c488a12e6b6d723511303bb836d03025 WHIRLPOOL 73f3ab3e2a007859df7f8f103cebe6000025d849bf8c1d5fb41795ff988abd552c2a020af9f88e9babee27b1395a66f3f1eb8f56d58cc824938147785e95ffbb
+DIST moccur-edit-2.16.el.bz2 4325 BLAKE2B a93b09e6a4a844ede92878f70873d56fe7e91142c8702e839b3d44b06f64daf99f73c119453d365586f18c1c69bfe962d5864d79e6c20574f344599204d82825 SHA512 dcb6e2a6336534bf475790c5b80fc86ef8a6ee6d7525a7c45a0050e0f9df3d5d4fdc52151af7ff2ef5c72785affef151c488a12e6b6d723511303bb836d03025
diff --git a/app-emacs/mode-compile/Manifest b/app-emacs/mode-compile/Manifest
index 35f72a72a54c..7b4b89aae63e 100644
--- a/app-emacs/mode-compile/Manifest
+++ b/app-emacs/mode-compile/Manifest
@@ -1 +1 @@
-DIST mode-compile-2.29.1.tar.gz 22924 SHA256 9c7dafa3a5c5706316a01071a2769beeecf228d0831fceb53d27d4e47c9d0421 SHA512 bc43d9cae411f5177ce70c736041db74c6db1dc5b766b22b92227e9e1324d304276bd104d8e3cac9ff5a877fc48b6da5b904e1acdb6cca7396fc7c26cc572815 WHIRLPOOL 3980e43e28438f5eefbd1d8e689cc18d9cc922857ec3e32b58c6aa6d056cc6798c2094b65de28705db6dfc95e493a06858a208c536f2c9d217027d47c4b311a9
+DIST mode-compile-2.29.1.tar.gz 22924 BLAKE2B 7ef71f958ffd5022ddcc64c07ef60822af5bc4a1f5deac5c4e57ce63cd9596d5f612d73eb9cdac627ecfef59e893d795afbeaa19b380b0cc4291bb4dc23fc05c SHA512 bc43d9cae411f5177ce70c736041db74c6db1dc5b766b22b92227e9e1324d304276bd104d8e3cac9ff5a877fc48b6da5b904e1acdb6cca7396fc7c26cc572815
diff --git a/app-emacs/mpg123-el/Manifest b/app-emacs/mpg123-el/Manifest
index 5a4d28097b1e..738e74811963 100644
--- a/app-emacs/mpg123-el/Manifest
+++ b/app-emacs/mpg123-el/Manifest
@@ -1,2 +1,2 @@
-DIST mpg123-el-1.59.tar.xz 34076 SHA256 6105c3d11099a96cc5cb77909ca8d9e5ea4d5cb78b6a7ca185eb350425e075b4 SHA512 48fae024529be7b88553fc43fb626253f3d3a10d6709378a565a0d407374569e5573e52c0b26abc4d6f2f51ad7f680d655a1ac15ff696f4534c39a9a3536bc0e WHIRLPOOL 6434aa2368976698437c0a7ec12c126861c7f0096f4263f59b555b59c8d20377b5279ce09ceb99bb4b333318541126bb990009234cbd611ffdc2b91e980903f0
-DIST mpg123-el-1.60.tar.xz 34104 SHA256 b80685f47488f602657e3cb320240b74ba0d1a49e8200dc2abe92850abbdc501 SHA512 5f4d7aefeaec6c5e94dcd5d15af7d0b89dc79274dce117309a70170cd0ec8cafac7c275518ea21d797d9251c31033b93c0581f26f83792c7b697094f4b194611 WHIRLPOOL 4d5cb7349648787894056c7f98ac00bba351f06f78049876a8ff3385367222839957d5f3fea07676000b78f42bfc98eedef9688ce91252fb1b30537265e9eccd
+DIST mpg123-el-1.59.tar.xz 34076 BLAKE2B ddfd5940665fb11e692958332d1e53cb5adf3e36bd1d178b764ceb2b1a34928fc37ec843e8e1d10d22c9efe4b5de863797be3b3a527d28fad5081ee682ff1d4b SHA512 48fae024529be7b88553fc43fb626253f3d3a10d6709378a565a0d407374569e5573e52c0b26abc4d6f2f51ad7f680d655a1ac15ff696f4534c39a9a3536bc0e
+DIST mpg123-el-1.60.tar.xz 34104 BLAKE2B f48a0ce460ee382b261accaf2188bb1dde7b17b1b09766cda7ef69f92d3e022a4390a7c9e9a97085f1c1e87377d114bcbdb29de512438ee3652baa0be0b413a7 SHA512 5f4d7aefeaec6c5e94dcd5d15af7d0b89dc79274dce117309a70170cd0ec8cafac7c275518ea21d797d9251c31033b93c0581f26f83792c7b697094f4b194611
diff --git a/app-emacs/mu-cite/Manifest b/app-emacs/mu-cite/Manifest
index 30e22754150d..5531468d2f71 100644
--- a/app-emacs/mu-cite/Manifest
+++ b/app-emacs/mu-cite/Manifest
@@ -1,2 +1,2 @@
-DIST mu-cite-200709030413.tar.gz 19439 SHA256 17db5bff75e0f24b46b53c8c0e85d7b5063ce114372d9cdb4d4cc23600930985 SHA512 aee355abf8d77ca9ce6d5d2f00e5e8d9a1123b82bb15169bbbdf22c9447c37f1d200ffe1cd05abb61f1011c0d9731d3300d0e5bbf6f10ca6155c00a610a46703 WHIRLPOOL 88fd3f41083599613878ef3f13374da73274dfb3ebf93a4958c7b5978b8be77ea83217ed461052677636020dfc17b392ebfa4e259a2a92f915529db68e5242f8
-DIST mu-cite-201202272330.tar.gz 19212 SHA256 b16b066eed65b6f984d81a8df2ecb53fbd0ce68599f96c7ca3b279a4ad51292f SHA512 78013bed020c46baeecf56bcd155eb6058d11b1d61a0af55b075454601e3cd1a992bdad887e125ffd569782a38e4509d60efdc431ded501c35da096133b475b8 WHIRLPOOL 6605a3b4857b13bddd0847e1d39a03c9cf38dfdb5a8aedc13cc77faf7a5e3e2072d4b8158d91ad1c7cddc7530544bca4c45d4b85a5cc6d8ef978d01c09729822
+DIST mu-cite-200709030413.tar.gz 19439 BLAKE2B 279627608af2759ee5fe566c315f8c2be168e0e4a01bc179ae7289f6c990f4a569d59288b02097a3230271ec4c1ba6aefa3db9e46271eb476eb50e912bacc9d0 SHA512 aee355abf8d77ca9ce6d5d2f00e5e8d9a1123b82bb15169bbbdf22c9447c37f1d200ffe1cd05abb61f1011c0d9731d3300d0e5bbf6f10ca6155c00a610a46703
+DIST mu-cite-201202272330.tar.gz 19212 BLAKE2B d52378258b3804e2867d6f8f6f471a73eebb3ff955df70a2ddc5dfd91d6ada2ea2349d44e86c81e1c314b88787b08b39f40238b22760a74b77f8393361aecdcc SHA512 78013bed020c46baeecf56bcd155eb6058d11b1d61a0af55b075454601e3cd1a992bdad887e125ffd569782a38e4509d60efdc431ded501c35da096133b475b8
diff --git a/app-emacs/multi-term/Manifest b/app-emacs/multi-term/Manifest
index 5d47676ce35f..65dccdc9b80b 100644
--- a/app-emacs/multi-term/Manifest
+++ b/app-emacs/multi-term/Manifest
@@ -1 +1 @@
-DIST multi-term-1.3.el.xz 7968 SHA256 9e151e0e5fa81ff69c9ab7ea8c561dc8713fdd64628c195b6652fecbc17b3d93 SHA512 fcb31da193f84fde653583b999e344fb7ec7404948fbf64b15f9a86eb69e9cc9514ad4380ce5b9c3813a74226d8addf8c87bb539f9ee927d4a0c0a7c2ea7c361 WHIRLPOOL ca52cda0c7012a5daa9de88917e93f1b7e29c52aa6b1991cc77330d3502e1e16b84ed0b7b79603e5556f1b0f38d2047eb8c32a4d07a7a4e866c42d3051f024b3
+DIST multi-term-1.3.el.xz 7968 BLAKE2B 6cb9a8bec0f2e1ef18229ecbec78a856808f6b3cab3eecc4ba2c78f91adcd687fcca870307c808cc1d0e6c2de71d42effdd0cdf38fc1b97b19511da7aad2be84 SHA512 fcb31da193f84fde653583b999e344fb7ec7404948fbf64b15f9a86eb69e9cc9514ad4380ce5b9c3813a74226d8addf8c87bb539f9ee927d4a0c0a7c2ea7c361
diff --git a/app-emacs/multiple-cursors/Manifest b/app-emacs/multiple-cursors/Manifest
index 90e30a8206b4..cf3305570371 100644
--- a/app-emacs/multiple-cursors/Manifest
+++ b/app-emacs/multiple-cursors/Manifest
@@ -1 +1 @@
-DIST multiple-cursors-1.3.0.tar.gz 25880 SHA256 0fba83ca60ce83758b5b2ae23ec6e14fb8d6ff50b02322e572bc317d9908d6d8 SHA512 2d321f9016b78aeb37507071756781c84b576a0fbefa385474c8c6287c989412b72b83dfdbe79bc0da1485893ea01952b6e0d392573386338db9e8728f722259 WHIRLPOOL b1f092ca3d75d5b223140f9faeed0b3c309336990a2c70492b2566198d453a0ea0bb89a1cd574fc33a5c88217628cf925a9baa2e9bb9e3c4aac8b89fda42397d
+DIST multiple-cursors-1.3.0.tar.gz 25880 BLAKE2B b0578299fc1e700ec627f1cdcf153e47d0c32df3374db2bad0d88a76933b0253de61f4670ff155fe6cb7d92d43204d47ffd44d8b90f093fee64a18ee3085049b SHA512 2d321f9016b78aeb37507071756781c84b576a0fbefa385474c8c6287c989412b72b83dfdbe79bc0da1485893ea01952b6e0d392573386338db9e8728f722259
diff --git a/app-emacs/muse/Manifest b/app-emacs/muse/Manifest
index 52b66c40b0bd..fb2eccb7a7a4 100644
--- a/app-emacs/muse/Manifest
+++ b/app-emacs/muse/Manifest
@@ -1 +1 @@
-DIST muse-3.20.tar.gz 411316 SHA256 080990e105050fc963bb1938209cc843f259488ae5c8373c5487f99a8dc383b6 SHA512 23cd0e864586f907418753bc3284afde51b4f8559c5d043c52baa70de70ec4a845d9e8362b93e701308dbbd662e3429035df8ad440916e61d5909498cd55f7be WHIRLPOOL 6840d3666925af91ddcc74e69f29216581f4207db9169fb8e39b38797ac9483711b42f8f12be083c8a818faf04f95dc4617b94d4f0eeb06e60d1efa34b7e1339
+DIST muse-3.20.tar.gz 411316 BLAKE2B a67c72a470e7e2d75cf94ed262b0e9503166326666a119f41968a603b4e48f3527705691a1b4b819ae6ec69c382a09074eef74ddad598faa08be6c74793b1e97 SHA512 23cd0e864586f907418753bc3284afde51b4f8559c5d043c52baa70de70ec4a845d9e8362b93e701308dbbd662e3429035df8ad440916e61d5909498cd55f7be
diff --git a/app-emacs/nagios-mode/Manifest b/app-emacs/nagios-mode/Manifest
index abb0b3058ffc..6fcff2ec8eeb 100644
--- a/app-emacs/nagios-mode/Manifest
+++ b/app-emacs/nagios-mode/Manifest
@@ -1 +1 @@
-DIST nagios-mode-0.3.tar.gz 7917 SHA256 a85de6caa36b0fff2f02f0911ce43581108c318aec205fce90780cda0cee1f43 SHA512 e9ff6e0684ee0f9f1919ec9dd4c8e0dfa7faab347f56724f7fe69bc366cf8d81f98c4c4245ddde95bbf9a2b9f72fec80a100c22b6b0b9e3c28c999515d0b6a50 WHIRLPOOL a87c166825f994b3fa271ae7d5f188ac3edd8d510f43dcabcd28c1e199f76bc08268f5808bb0e2a97a43b367439fc0a5c5be796e890cb7b84686528b1c0658b4
+DIST nagios-mode-0.3.tar.gz 7917 BLAKE2B 17f69dd9736b5a3f94a69ef2af7827503d2ee87f97346e5ead44563d1e056457bb425f0145b58246dafebbb0fd346857e5fe9aa11a616c8e6608722013a73500 SHA512 e9ff6e0684ee0f9f1919ec9dd4c8e0dfa7faab347f56724f7fe69bc366cf8d81f98c4c4245ddde95bbf9a2b9f72fec80a100c22b6b0b9e3c28c999515d0b6a50
diff --git a/app-emacs/navi2ch/Manifest b/app-emacs/navi2ch/Manifest
index 1e7371d44197..6f6a32c1f0a3 100644
--- a/app-emacs/navi2ch/Manifest
+++ b/app-emacs/navi2ch/Manifest
@@ -1 +1 @@
-DIST navi2ch-1.8.4.tar.gz 470499 SHA256 a2647881d1c20539148f8a01fcfa6f230d59582331ffd2d930effcbba307c603 SHA512 3028ea05c1e264f734f5a7578a0eb7e7aa5f23dbe33ccf9b0659344dbbb36c140842100923bb77e82614307e9793fb73e2bff42d6308438410d80102e33a3184 WHIRLPOOL 66b73d26e4b161d65a3720f6d16aca576c3ac9a7585d6bffd9e1e29d4082ed750f83ea625bad87fa6ef81265103514c13b7c031965ab22d309cdd5c482ff52f4
+DIST navi2ch-1.8.4.tar.gz 470499 BLAKE2B 55cc673365ac174de9d3919dc8579c76b0f1e2901c3e50b0c24d7b9b81c8ae2090e6b534e779c2a67a9b2bb1f693c3435dffe165a4a05516202be1edd507006d SHA512 3028ea05c1e264f734f5a7578a0eb7e7aa5f23dbe33ccf9b0659344dbbb36c140842100923bb77e82614307e9793fb73e2bff42d6308438410d80102e33a3184
diff --git a/app-emacs/nxml-docbook5-schemas/Manifest b/app-emacs/nxml-docbook5-schemas/Manifest
index 82aa008d0f0f..f4c322379bb2 100644
--- a/app-emacs/nxml-docbook5-schemas/Manifest
+++ b/app-emacs/nxml-docbook5-schemas/Manifest
@@ -1 +1 @@
-DIST docbookxi.rnc 292523 SHA256 cf4360946a2a7120b463721b6379f73e7a9589e08943e5d3eb20244e4b22a336 SHA512 13309beb2dbf76168889a962782d3dd1849fb254ebf1941ffd4fcfc272353ba0ddece509a9b74250462b3e1eff12f31fc408aa790e0efea01d527482b3fa3a48 WHIRLPOOL 2567079c80825ac01c4c2d814df33a434d79a1317b3eccc5cf38a67d7fbf35bf0bcac7f071b58d44dd07121f71205edc69f98a21490c646e1a63308b186e7a29
+DIST docbookxi.rnc 292523 BLAKE2B 13ae2f3756485845e2fc6dca87bce5eb12c419c84b6edaab5051b075700387c32904f54286756c5fed2480c17af00e385845105a94b13ced9fe13ba959e22224 SHA512 13309beb2dbf76168889a962782d3dd1849fb254ebf1941ffd4fcfc272353ba0ddece509a9b74250462b3e1eff12f31fc408aa790e0efea01d527482b3fa3a48
diff --git a/app-emacs/nxml-gentoo-schemas/Manifest b/app-emacs/nxml-gentoo-schemas/Manifest
index e64d563b39dc..655a1f002861 100644
--- a/app-emacs/nxml-gentoo-schemas/Manifest
+++ b/app-emacs/nxml-gentoo-schemas/Manifest
@@ -1,2 +1,2 @@
-DIST nxml-gentoo-schemas-20160506.tar.xz 11472 SHA256 c900fb55047071c749e07ba081101ccc229c7048989c057b1067ed0a9c2922df SHA512 5f826342e3af11a93ca22abe4333838f3f26cb01ff98a270929d6e5091e65b4ab9971b1f7e52404b235bd208f195d51eef868580d19a4c113ddb7925a9118b8d WHIRLPOOL 865b1771cfe2a5adb4e3e3f0b9ffeaaf26e519173cbdc8624fd137becf15765f640ab33eb64362fc52f3a93af40dd59382db3b4648c0455605fc2b835d700cde
-DIST nxml-gentoo-schemas-20170302.tar.xz 11496 SHA256 dcb9a4069d686aebc682857861e53f5d0c29b367fb28007c9a04de7feac86d0d SHA512 34f02d2b5e3decad51b4d5801826cf0f7a7e863a1f61a529d3d53dc38d0a687cf100da8007c9dd1ee2172dc22af3dc963dddf3c8fefcdc47db616261d8f2f259 WHIRLPOOL d8df72bb44fb9d17d22d54768131ed909489bc738bd1e13c05b4b0d796f536c11c48cbd7fb1b5c65f48a20180a714306723930687240b7accc093197775dadfc
+DIST nxml-gentoo-schemas-20160506.tar.xz 11472 BLAKE2B 1cda5e285110d0b5f782777c897d275a946ee4b3e26e7e73c9aff5288976f7c1e65ed808608cc69c206e37b5a97b6b5a9080a2571b1921d8ac91e508497fdf62 SHA512 5f826342e3af11a93ca22abe4333838f3f26cb01ff98a270929d6e5091e65b4ab9971b1f7e52404b235bd208f195d51eef868580d19a4c113ddb7925a9118b8d
+DIST nxml-gentoo-schemas-20170302.tar.xz 11496 BLAKE2B 34e3517a6c57980f0a349e6c0a659ff8cbc38ade3a1cf2fd36ef7179e841de38eb73bbd85c65cf8e284f5b58583f850fd9e9622699c8dd5a909d2aa5a756164a SHA512 34f02d2b5e3decad51b4d5801826cf0f7a7e863a1f61a529d3d53dc38d0a687cf100da8007c9dd1ee2172dc22af3dc963dddf3c8fefcdc47db616261d8f2f259
diff --git a/app-emacs/nxml-libvirt-schemas/Manifest b/app-emacs/nxml-libvirt-schemas/Manifest
index db2166feebfd..0cbd469ab8bd 100644
--- a/app-emacs/nxml-libvirt-schemas/Manifest
+++ b/app-emacs/nxml-libvirt-schemas/Manifest
@@ -1,2 +1,2 @@
-DIST libvirt-0.9.7.tar.gz 17853636 SHA256 29ff05bfe5177d6680c02c279ed2573dcfae993f2824bffa192a3a2cdd05af23 SHA512 ac082f3872b37fc7aad891ba3f2a9614bdc85123b3d626fc7a2e43327a7ec346a0ec154c25161592a4337e3f694d9b27d031544190dec7d6086343f15fe9ba2d WHIRLPOOL 1704503c979b20a7bb31da4007724b7fd537d7f4f95dc7c0d8929d24f5f7c297c4d1f4d4d2a541265fa9c87b2bfba1d27a8b61c9ab29b092916dedb7a5a52a23
-DIST libvirt-1.2.1.tar.gz 27228694 SHA256 bc29b5751bf36753c17e2fdbb75e70c7b07df3d9527586d3426e90f5f4abb898 SHA512 6184840623156ca01ee7f59078ebf031bc84c25b37bb110372c7bcf230a79b74e267475f989fb73db5e3c096dcc74f03cb30adfc5de022f756ed2cd6ab05bfd0 WHIRLPOOL 75c2a37b1101950474aad8931d999564ff575512d38c9e8d2cf989cef3ad7057853046b738b20bd77be80c1e6677319aea7227797ae95ce91512dc36bd05a142
+DIST libvirt-0.9.7.tar.gz 17853636 BLAKE2B d149fe4f095c76d003bdca1a307e588a9bd1b011b34119e90b8875837ced533caa2f05f2b9e7709d13f5af0a078fdc4779b7fc8a247f7ca04ad490b18fe728c5 SHA512 ac082f3872b37fc7aad891ba3f2a9614bdc85123b3d626fc7a2e43327a7ec346a0ec154c25161592a4337e3f694d9b27d031544190dec7d6086343f15fe9ba2d
+DIST libvirt-1.2.1.tar.gz 27228694 BLAKE2B 5552508f87bddbd8d2dd65a37298f7f7e7238a7ac5aeef878bd8b3c6d5ecab8f2cf6fb94c8d520312b6c6399f1e663f8d68febf2badd544020635df841f5488f SHA512 6184840623156ca01ee7f59078ebf031bc84c25b37bb110372c7bcf230a79b74e267475f989fb73db5e3c096dcc74f03cb30adfc5de022f756ed2cd6ab05bfd0
diff --git a/app-emacs/nxml-svg-schemas/Manifest b/app-emacs/nxml-svg-schemas/Manifest
index a61e6a3baa08..7e43bf78ad9a 100644
--- a/app-emacs/nxml-svg-schemas/Manifest
+++ b/app-emacs/nxml-svg-schemas/Manifest
@@ -1 +1 @@
-DIST w3c-svg-rng-1.1.20081123.zip 48420 SHA256 995d72804ae518363080544999ea3f356fac168e193d0967ce9944fe0f8c31cf SHA512 69e44a7c04a3af77d0fed8f19372cfcad7998e262a44b520145fe2c0ad03bf20daf57e1e97f71ff27f0e06bd3f07d1ec0b0976fdd893d77df2f82709f7c1ce1f WHIRLPOOL 706509d058a187d7581612c103a333d83cc758a0fd436686d20c8de7fe07bb7e6be63169f3c14aee662ac9475d7e7718a696d68b8cfff6a8a0adfe941712e4be
+DIST w3c-svg-rng-1.1.20081123.zip 48420 BLAKE2B a89da9708ea79085ad5aef1f85769683af2a5c8ab84a5a4f53b9c2fdeebf422a96065309d69eb4ac9bd069bcd3685ee849c7cdb4b9b9e7829ff58fb0b7b8b754 SHA512 69e44a7c04a3af77d0fed8f19372cfcad7998e262a44b520145fe2c0ad03bf20daf57e1e97f71ff27f0e06bd3f07d1ec0b0976fdd893d77df2f82709f7c1ce1f
diff --git a/app-emacs/ocaml-mode/Manifest b/app-emacs/ocaml-mode/Manifest
index b6602e1fa506..3b1a5aea6b5c 100644
--- a/app-emacs/ocaml-mode/Manifest
+++ b/app-emacs/ocaml-mode/Manifest
@@ -1,2 +1,2 @@
-DIST ocaml-3.12.1.tar.bz2 2949124 SHA256 edcf563da75e0b91f09765649caa98ab1535e0c7498f0737b5591b7de084958d SHA512 cbb050aabcbe19a4aa070d6cb74f3774cb136692dfd9433ca977f0f9520ad2f583b6cfb1a9cedfedc92e7dc794ac4a869e20aa5a67a4739002feb290435dc7e7 WHIRLPOOL b7bf4844452ab52027e6b785159df6e4defc548d2f3d31eb73dc0dc05214e7c19ed654c8b3ff234a85691599df0be568ba02fafe257856be7f603177584a7ca0
-DIST ocaml-4.00.1.tar.bz2 2762205 SHA256 33c3f4acff51685f5bfd7c260f066645e767d4e865877bf1613c176a77799951 SHA512 77899430706394af558666361b152d47df3a3e21831059875f8b317d0ff9d1a010177bf1e5851e522e086c20768e92c71344aa53eda0ce003f278752870ab5da WHIRLPOOL 3fdc090e1158ae72c91685aef62c751f897f4e3efcfbdc07e00d92e83351494fd126bdaca31039c1bf5dc4107072d978bb30e02c879caafc215dbc913f2d6ed1
+DIST ocaml-3.12.1.tar.bz2 2949124 BLAKE2B 8814927411cb9b604c78f44d172fd1f8b3d5f6009a1e722d442b8e49709778824cd6d1341e8129454d49000ea4d1234c533ee72cf0fa8fa84ee3b4d664177c4a SHA512 cbb050aabcbe19a4aa070d6cb74f3774cb136692dfd9433ca977f0f9520ad2f583b6cfb1a9cedfedc92e7dc794ac4a869e20aa5a67a4739002feb290435dc7e7
+DIST ocaml-4.00.1.tar.bz2 2762205 BLAKE2B f9a788eef67158b036ee551360410921beab87f1b01684ca17d5cb87a30cc0cd475ca640fcb284ad88d9054927ae0fd397921574cc9098956d60e80915d4cbb4 SHA512 77899430706394af558666361b152d47df3a3e21831059875f8b317d0ff9d1a010177bf1e5851e522e086c20768e92c71344aa53eda0ce003f278752870ab5da
diff --git a/app-emacs/org-mode/Manifest b/app-emacs/org-mode/Manifest
index 4e3492b09651..963714dc65d7 100644
--- a/app-emacs/org-mode/Manifest
+++ b/app-emacs/org-mode/Manifest
@@ -1,4 +1,4 @@
-DIST org-8.2.6.tar.gz 4221803 SHA256 a14a20f3d11855758ad8859e8ccdc50922c31bd64b493d44b856d46441362938 SHA512 a64e975738f26b5315584b51332dbcd29eb6e5b03cb505d638d611455beb921c5e0b728b23fb63f380d46d2e33092865b02de01259cff8985693febebcc1a8a3 WHIRLPOOL b834203c48948a84d6458b7f455451cfd3f40fccd0ae55f150cf105ef937f46fb52492642990cf33c90a2464b93d184d85d922680adf4e66a2af5308d3ac631c
-DIST org-8.3.2.tar.gz 4442361 SHA256 8ae811d19546f73306710f70eed8ee1a1ec9981e78b98af077fa224d5e8875b8 SHA512 3e1ff47c875a2db3239add8b060f555da357e465161ca62860c0ac2734c2e31c5387d2df4223ab7ea8ea60050f9a845d160b0bcb3afcf36f1d3cabcaa961e6a2 WHIRLPOOL 7ae9c53aa116d1e5cf7527959cdb58cdce63d99d0e487979ee02a12bbb21cbbd0b9a25de7dc86364a6e4affa89813557fc58efa8c1693bcfe1a975f836ef6c1c
-DIST org-9.0.1.tar.gz 4439964 SHA256 0b6087cf9a955bc507b69d620c6461a44976479bcd9c31405c1c033348b9b6f7 SHA512 c0a88372787c5b71ec1523fcf58b3cbf80678835c7b0bfe3b2406290da6fc88b977121ca3b35b47abf2c32ef40c0bfb6733170f225ea35ba24f2e801bb634afe WHIRLPOOL 2799373a3e027ba8822350fe389ecacd2e02fabf4ed99153472e7ff3314b717ff02042fe930f094382e0a059964c9abe9274ac4d66fdc889d2305808c89406c9
-DIST org-9.0.4.tar.gz 4431853 SHA256 9c4b563e6ce4babdd651fa70ed5528fff05170045e4edf4070017fa5c14e6a2a SHA512 fc3ab3e7c2b5f3243937497ea9515ea81434f2274ac158da7d0418e8ddc33debae2f1887ffbe37e3768d32a028834cc0ef35f3c3cc3938d7b24e0c5bfcf65ae0 WHIRLPOOL fefe7ffc45e542e18ef86458dd2b264ff52249444e1abbdfc577b2095c5be3870f11bf3867332be5a6323cfdf92b8d60382ac6c96b8ab6126c740f5e29ed2299
+DIST org-8.2.6.tar.gz 4221803 BLAKE2B 78adcafdc2a9020a71ef9efe4699f6c2ae20b774861cd9dae04360114a942fd32d91d66dba2508a2529f3d678ccff60cd9d328425d4d43d5d391af36f0958bbd SHA512 a64e975738f26b5315584b51332dbcd29eb6e5b03cb505d638d611455beb921c5e0b728b23fb63f380d46d2e33092865b02de01259cff8985693febebcc1a8a3
+DIST org-8.3.2.tar.gz 4442361 BLAKE2B f21f07578e870cd3edaa3721a53f679627c0115c320c666c2086e201e272c0ef03540bfdd90936a624cd4c4dcbac21b91346ba975b6006ada2d46184f73574f3 SHA512 3e1ff47c875a2db3239add8b060f555da357e465161ca62860c0ac2734c2e31c5387d2df4223ab7ea8ea60050f9a845d160b0bcb3afcf36f1d3cabcaa961e6a2
+DIST org-9.0.1.tar.gz 4439964 BLAKE2B 20f921fbcc3a45180395ec5158a6ab055e1ae7a318a5c2dcbbd8de9460a2639da222f89169f4289a2e9b4a5cd4c7928a5d4edb8997ef24fc8f41abbc919b1e52 SHA512 c0a88372787c5b71ec1523fcf58b3cbf80678835c7b0bfe3b2406290da6fc88b977121ca3b35b47abf2c32ef40c0bfb6733170f225ea35ba24f2e801bb634afe
+DIST org-9.0.4.tar.gz 4431853 BLAKE2B 1ecb8fa08597e08a6143cdf5d262274472eb5b245fa1103fe6b5509a5bb0d0aa471e9414b8f6293c3d5720c7b307a77e0f03ad6a9b590bf2469da5d54ddedfaf SHA512 fc3ab3e7c2b5f3243937497ea9515ea81434f2274ac158da7d0418e8ddc33debae2f1887ffbe37e3768d32a028834cc0ef35f3c3cc3938d7b24e0c5bfcf65ae0
diff --git a/app-emacs/outline-magic/Manifest b/app-emacs/outline-magic/Manifest
index 2b2996de7804..15e5a26a97c2 100644
--- a/app-emacs/outline-magic/Manifest
+++ b/app-emacs/outline-magic/Manifest
@@ -1 +1 @@
-DIST outline-magic-0.9.el.bz2 6823 SHA256 5b6cb179c3fc118ec518269e1cf0f820ad1d532b87d7e33d01a4a63e16050b69 SHA512 46c404954642cb88da4bfe82432e4d45b9c05671d81333dd6bfd422a5311c1fd76daf1893be3875044e68ce43bb8b70928017a420715a7e08da76d366d969a49 WHIRLPOOL c55f97a785732fafc02a1f46d3783aee841cba90f3763830c20ba109895e059daa6cde7616d84183cc82141e2c859cca432097bf8f65966c63d5707a893ec5db
+DIST outline-magic-0.9.el.bz2 6823 BLAKE2B bcdada425fb8a1e7121d8592dcbf078a95ec7c9fe67cdb4f982e7e58cf16e969de62a6a025dcde2aad23164d23e131c73dc4a0abcd40b87d406f7b236cc23a09 SHA512 46c404954642cb88da4bfe82432e4d45b9c05671d81333dd6bfd422a5311c1fd76daf1893be3875044e68ce43bb8b70928017a420715a7e08da76d366d969a49
diff --git a/app-emacs/paredit/Manifest b/app-emacs/paredit/Manifest
index 77822c9c255e..b0e5784ba1bc 100644
--- a/app-emacs/paredit/Manifest
+++ b/app-emacs/paredit/Manifest
@@ -1 +1 @@
-DIST paredit-23.tar.xz 24204 SHA256 c501d5a716258a6b6758cc40d3e12b3d7271e62b457202271402e8ad43053478 SHA512 33ae10d95d3b2d8fe2466fba20d6aa0abac56684807fb381ab0db2798e99e2358c6dca71794b95768b53be661b9181f458e932bb37c31ba7ebba155a57f1bb01 WHIRLPOOL 4e2f6ee89f6cf9edd4b0b88e03f8b26f288f646cca14324025d022d34d756e44cfb8bb8289345ca77f3bdeecc1d1c114c90a496d094149d4d0f59ce28affce93
+DIST paredit-23.tar.xz 24204 BLAKE2B 1bb1f9466a4c418800ca66a6e0ac76f8d2324d27e27a6f2ac1aa0be576dc8fede6392bde919ed489b14f4ddd3e26fab102e722803d3e9dc5874c5321bd269d35 SHA512 33ae10d95d3b2d8fe2466fba20d6aa0abac56684807fb381ab0db2798e99e2358c6dca71794b95768b53be661b9181f458e932bb37c31ba7ebba155a57f1bb01
diff --git a/app-emacs/php-mode/Manifest b/app-emacs/php-mode/Manifest
index edbf9b748adf..dcdc282d441f 100644
--- a/app-emacs/php-mode/Manifest
+++ b/app-emacs/php-mode/Manifest
@@ -1,2 +1,2 @@
-DIST php-mode-1.18.2.tar.gz 81772 SHA256 16b26a5584139db2dbc05414a686f54173d7505d7aa041ca12238188c23ea90c SHA512 39c00216c6a1801ae0be016eadc95bf9574ab285dd6125a343cf4c3a5c3ef5b8e579877513c94843a836b97a969402fa0a3714a8cf2f68f7007d629e86834bc3 WHIRLPOOL a1f49e40895b7c00969efe4b61616414d494e66cdd559c3c35e8c2918ab9ca34263d2d22b3fd431efde7025dbc137c295b452f7029ca0c9675b0c6decb0312f4
-DIST php-mode-1.5.0.tar.gz 42687 SHA256 d8b179941141994d9cc9e77d244e91df3b4d845f4c6e1818eeefc59bc97bcead SHA512 e05cf9eeff3d17f6af29b03d08f279e4c04f79a2c018de5ddcf097adbf9e67978eeb9f0f9e67b9406c1f33c494597ab1bfa629bdab131d668de40b81d68e796f WHIRLPOOL fd5a92af5c006abc00d10803770a64452f49d803c16c3b57a77f3f87ebf984ad3db951304d6ece9fad395cd46ac4a0e7ec2d256e3dbe7c75d68b276bc178ab74
+DIST php-mode-1.18.2.tar.gz 81772 BLAKE2B fc27453c15fbc3da1cba8e61392501ba71da7979cd9b9770e147b562950a7a68ec1be19b28cfde1770e48a9edd86e4f7ddda1f280f0c5dc2b58428758ebaf585 SHA512 39c00216c6a1801ae0be016eadc95bf9574ab285dd6125a343cf4c3a5c3ef5b8e579877513c94843a836b97a969402fa0a3714a8cf2f68f7007d629e86834bc3
+DIST php-mode-1.5.0.tar.gz 42687 BLAKE2B 70ed666e5561bbd879ddd3d56d6cf602b873c2a3c68a2f1bab08bc44648c252ae23519bcefc9a215922a137d69b956ebd74c202d8e567ec21ba4db3c68e44a44 SHA512 e05cf9eeff3d17f6af29b03d08f279e4c04f79a2c018de5ddcf097adbf9e67978eeb9f0f9e67b9406c1f33c494597ab1bfa629bdab131d668de40b81d68e796f
diff --git a/app-emacs/planner/Manifest b/app-emacs/planner/Manifest
index 3aaa1e6132e0..5c9219ef3eb4 100644
--- a/app-emacs/planner/Manifest
+++ b/app-emacs/planner/Manifest
@@ -1 +1 @@
-DIST planner-3.42.tar.gz 412086 SHA256 4dc66bf7103ad9dce21e34c40530b040a9718e4b61c16870b3a0f43e1e387129 SHA512 6c0674a1b780005c37850f25ec8b20c72b3d34b6f4e8ad463392e887e498807567af41c0c6ef0f4141230e2d3bf8c702acebae869efc37f72b1e984519c23b3e WHIRLPOOL bcf5ddfca6aa1705108e69a6c973988b0f708ec279fee09d192932861743b28b441da1a198487abe01c1d7a7a6f4b83f29c61179ca096431613c62bd34379979
+DIST planner-3.42.tar.gz 412086 BLAKE2B a9cc8db317d51b2c885f5bb186f367c4778a9175dfc93d8cdfea38014c4964214c27d023bf99ee452dee0e7322f1f2c397d024ef95fd33254f4a19d2ccd40281 SHA512 6c0674a1b780005c37850f25ec8b20c72b3d34b6f4e8ad463392e887e498807567af41c0c6ef0f4141230e2d3bf8c702acebae869efc37f72b1e984519c23b3e
diff --git a/app-emacs/po-mode/Manifest b/app-emacs/po-mode/Manifest
index f25cbd2a27b4..23908db0c3fe 100644
--- a/app-emacs/po-mode/Manifest
+++ b/app-emacs/po-mode/Manifest
@@ -1,3 +1,3 @@
-DIST gettext-0.19.3.tar.gz 17414357 SHA256 93952d505a3d3b1ec10c69d340c7d438b1f9c332710d583981c0608be3eeb3f6 SHA512 2ec02065b376cf9ec2b9d32328a7181d292ac940356a710f785450f37e03a8513e07d4b981824374671cfa2f60024e4649fc89ad79ee0adda87a8b9b63ad28e8 WHIRLPOOL cbf86dab685fe3a5f4dbe5bcb39295809511904fdc65d9e0ef188c228bbe38c408ea38c14ac0ad38634ef1f5d79474d38399e95ab50ff6922cb0087ccfe434be
-DIST gettext-0.19.4.tar.gz 17717034 SHA256 8ac9f1ed1a5f8c4e656a2f37f5ba6b9ee04c4df79a575e876b0b6946aa417f3f SHA512 274e00fe0149468e3073562f8f3b292597e9dbd82dfe8d068e4a1983914d25b603bb26f3fa4aa10e9fcd65826e3552c1871218342270927481e95eb64288ad97 WHIRLPOOL 2eb56c47d76f63b6557ae825538a35ae59f3f77da35321688547d9c420f47879c79ca1ab8ebd6bc6b4a3a8ce59ed620648884cd46455f6218213587f76967918
-DIST gettext-0.19.8.1.tar.gz 19704011 SHA256 ff942af0e438ced4a8b0ea4b0b6e0d6d657157c5e2364de57baa279c1c125c43 SHA512 073042fa2dc48804c58e76f036130a669e19612c25427b0ab14d0b366b549a63751bf3af03bfd0745d7c4f72497a4b2aab26a3cc6de83189ce111679073878e1 WHIRLPOOL ef9aa9eef3067595dc725169075401dfad8ba15d6224d2b563e3421afa7c4dce9336a287147404273b772def811230b3758c005902ec90192e6ee4ac373d9a9a
+DIST gettext-0.19.3.tar.gz 17414357 BLAKE2B b2b2085e8ee7339c6b6509807a9601163498edd9265f2ec899337943bd2c1394a905b01e8a9f44e7a57985cb11f4fdfe302ff9320dacf1da78fdc4fdb5e30fd9 SHA512 2ec02065b376cf9ec2b9d32328a7181d292ac940356a710f785450f37e03a8513e07d4b981824374671cfa2f60024e4649fc89ad79ee0adda87a8b9b63ad28e8
+DIST gettext-0.19.4.tar.gz 17717034 BLAKE2B 2022ed7963ff01c842c345f13c33ea7cc7221629c6beaa73cee7af68f709c6b8824d1e93ef919318b5d0a63286821efe2fdffbbdd709edf25a1f25be8909222d SHA512 274e00fe0149468e3073562f8f3b292597e9dbd82dfe8d068e4a1983914d25b603bb26f3fa4aa10e9fcd65826e3552c1871218342270927481e95eb64288ad97
+DIST gettext-0.19.8.1.tar.gz 19704011 BLAKE2B 17dc7aad338a26d71b818fea51e46a47dccf14744ee575ce86b591becaea402e36d64dc018e1a84113c356122ffef367cf2fa424e51ebc9720350040b4960091 SHA512 073042fa2dc48804c58e76f036130a669e19612c25427b0ab14d0b366b549a63751bf3af03bfd0745d7c4f72497a4b2aab26a3cc6de83189ce111679073878e1
diff --git a/app-emacs/popwin/Manifest b/app-emacs/popwin/Manifest
index a6e406923460..3f56f3061882 100644
--- a/app-emacs/popwin/Manifest
+++ b/app-emacs/popwin/Manifest
@@ -1 +1 @@
-DIST popwin-0.6.2.tar.gz 16821 SHA256 77069e5c642ccee21788f462dc2bdc30ac4789d658585da950cf7097fa41d6e9 SHA512 3c086361d6b79d7c68583cdbfb76cfd95b6ed56883382e42a863137d93e2a64fa8dce7b7873a4c46ce04a742942dd5f16367c691be608438079555578709b108 WHIRLPOOL 2739efa75f9e88296f28ab2df93990dac5630a4e6b3a7d094fed1b0ee23066c51f2ff42301cbefec9dff132ec2ddbdab2c532bd49b6f7e20903f382d9f4aa208
+DIST popwin-0.6.2.tar.gz 16821 BLAKE2B 6fcf2e711c28db3465fd4e267195f8526eff26aedeb04f07d66f5adac83f2447beef1ee988f692b9062a0e0eabbbe0760d3df6f1f7679fb4ab76317237aa8fdf SHA512 3c086361d6b79d7c68583cdbfb76cfd95b6ed56883382e42a863137d93e2a64fa8dce7b7873a4c46ce04a742942dd5f16367c691be608438079555578709b108
diff --git a/app-emacs/pov-mode/Manifest b/app-emacs/pov-mode/Manifest
index 410d6426cbd9..b4740d661b1b 100644
--- a/app-emacs/pov-mode/Manifest
+++ b/app-emacs/pov-mode/Manifest
@@ -1 +1 @@
-DIST pov-mode-3.3.tar.gz 65929 SHA256 ff766da83af91d17a2ab4103ded50fa2025a6e79dd97114c9cc96cd0d34587d8 SHA512 e705f25f1eb719152dbf5ec17c833f67b4c7be5b1ff9ddab94f67830d9d2caddabc47bcc6ce4864521eedd2728f4b59a6d2c0ddaba83f0b194bb0834d86e9396 WHIRLPOOL 51d9661dc7cfbd63da87eafc4951c9d9321f77ffd933f22f51d83a37280d374014b90e35630207f1a395bd83f28802f186197eb5a89a9ea45d9a1e750a76e395
+DIST pov-mode-3.3.tar.gz 65929 BLAKE2B eddaa355b58ad397e377c055fbc06fcdf552fd32057246d11d9b11908635da72c9b19e8b2179fcad54bbe5a5d158a36faf0d42e62b79d4a4e5a57405672dafde SHA512 e705f25f1eb719152dbf5ec17c833f67b4c7be5b1ff9ddab94f67830d9d2caddabc47bcc6ce4864521eedd2728f4b59a6d2c0ddaba83f0b194bb0834d86e9396
diff --git a/app-emacs/prom-wl/Manifest b/app-emacs/prom-wl/Manifest
index edd09b227447..18ecd15b3147 100644
--- a/app-emacs/prom-wl/Manifest
+++ b/app-emacs/prom-wl/Manifest
@@ -1 +1 @@
-DIST prom-wl-2.7.0.tar.gz 10563 SHA256 964c3106e42cca9f0c069c502b19bd8157d71c0e2b513ca190f015bcb654de48 SHA512 c05d61761b8c050bb6c09f3028f54351d3ffed5a17bb8519be76c8c706df825569cccfc8cd1ff2b656ef885a9606768eeb1b3dc0955ff4316bbe35c5db8ed989 WHIRLPOOL d039fb4f2436299e70077730686fc3b8b997684f3d5001ab5fa48b33dba3155fdee727f9f037bab241b9d76b4d6b194993d8262a308ee19cd9fe6b5c80e61036
+DIST prom-wl-2.7.0.tar.gz 10563 BLAKE2B 63bbd6f708a21b403f30c44493023841242bcc8aed667ddc501933f46abe8e29138502b57d500b4b58056b190d4571d6ef4dda9a9eda7695b7f34c38f8049af2 SHA512 c05d61761b8c050bb6c09f3028f54351d3ffed5a17bb8519be76c8c706df825569cccfc8cd1ff2b656ef885a9606768eeb1b3dc0955ff4316bbe35c5db8ed989
diff --git a/app-emacs/proofgeneral/Manifest b/app-emacs/proofgeneral/Manifest
index 3789e04d25cb..60a383039cc2 100644
--- a/app-emacs/proofgeneral/Manifest
+++ b/app-emacs/proofgeneral/Manifest
@@ -1 +1 @@
-DIST ProofGeneral-4.2.tgz 1613190 SHA256 3567b68077798396ccd55c501b7ea7bd2c4d6300e4c74ff609dc19837d050b27 SHA512 102c56a1bc113439b1fa8aa10efe571d47d68b344d3489fe18ca3bdbf8828bb31fd2302a68a4bd639c59c429d41e82e5d933abddd3444781cb0e8a603db432ab WHIRLPOOL 9c4e54cf3b1528ee6cbdfac19b0c589f0c2640defbac15d5aaf0a1bfd64680bff45d2faa17f669210f47f30debb768d593590d350acac9c2669d24dc109bb4d8
+DIST ProofGeneral-4.2.tgz 1613190 BLAKE2B e12913d67f95b20d99d5bdaa82a36f0dd2b664441a86dc86cb4f8afaac2379691c01e60cfe6af3bbf177f0dc2f82ce34ea4d706ee34c2d5986de3f807ce05045 SHA512 102c56a1bc113439b1fa8aa10efe571d47d68b344d3489fe18ca3bdbf8828bb31fd2302a68a4bd639c59c429d41e82e5d933abddd3444781cb0e8a603db432ab
diff --git a/app-emacs/protbuf/Manifest b/app-emacs/protbuf/Manifest
index f43e1b5e6637..25f37aeb4eca 100644
--- a/app-emacs/protbuf/Manifest
+++ b/app-emacs/protbuf/Manifest
@@ -1 +1 @@
-DIST protbuf-1.7.tar.bz2 2270 SHA256 a3c78450bc9e04934d842913984e36f674a7c8d54eaf1c63aef61d8904d2fca5 SHA512 9dad81784b71234812ac35be695895c3063e5337dddbed73b28fde800d12110cec6bb9faa42b6ed74d9a2d4f12da96b8e692d193edfc775fd33a7922a019b8b2 WHIRLPOOL a55039d8f4d4dedf4b8c7083204c9cf45c8d9de18b9763ad1f1e05ecd92af93e3c10a0c745b8c3888d6d797704d61dcab0272e2dfffa0c36fade9e89d9a4903f
+DIST protbuf-1.7.tar.bz2 2270 BLAKE2B fa840549e785dcccbca53e4ddad7b6572f6da0191d3b82544ed562a4e1d6e6a28e1cc44aaf81498a0f6c8f9ef6d37451104b6552bb0c8469029d0589489d03e5 SHA512 9dad81784b71234812ac35be695895c3063e5337dddbed73b28fde800d12110cec6bb9faa42b6ed74d9a2d4f12da96b8e692d193edfc775fd33a7922a019b8b2
diff --git a/app-emacs/psgml/Manifest b/app-emacs/psgml/Manifest
index 0863d1c80706..982ef25d8889 100644
--- a/app-emacs/psgml/Manifest
+++ b/app-emacs/psgml/Manifest
@@ -1 +1 @@
-DIST psgml-1.4.0.tar.gz 262246 SHA256 a1c4d5ae3c27b475bebbea539c0933b7a7356dd69c5e1498a4125e5ee2db46e5 SHA512 99bab6440a0f437009edff6371412c16f47d48c6b1eaa5b894523130e3a8d604ea79dc81f1895ceecd4283d0c7fd908d4e5bdeace63e54b9ac048a80fc0f6f44 WHIRLPOOL 12d300e30702beae1c67975388625f961cffb90aa13e3a62e32d3a0ce65bd15c3baf27cd5ddd99d768027f980f8f4b246de21322a3341577948cac957330bb5c
+DIST psgml-1.4.0.tar.gz 262246 BLAKE2B e888e7e13b39108efd19bbce41f3630015556ca9e5250665456866173302b5388add506694f28a6fa7e4e4572ce4596eec66762650f7203a14d84fcfbcd8ac7f SHA512 99bab6440a0f437009edff6371412c16f47d48c6b1eaa5b894523130e3a8d604ea79dc81f1895ceecd4283d0c7fd908d4e5bdeace63e54b9ac048a80fc0f6f44
diff --git a/app-emacs/puppet-mode/Manifest b/app-emacs/puppet-mode/Manifest
index dd9c034ea33e..0db97010f4a2 100644
--- a/app-emacs/puppet-mode/Manifest
+++ b/app-emacs/puppet-mode/Manifest
@@ -1 +1 @@
-DIST puppet-mode-0.3.tar.gz 25617 SHA256 71ebcb4bf518f9aca404260186b97556fb52060bc56edb77ab1881d64543174d SHA512 16ba5f71a1ec6c40b1eddf2acf5c1aa1968526b959279e1cac0cfac947f82f404fc35978ce12f5851309f293e2c92f054a718ade97d156528d505dcda58434e8 WHIRLPOOL cb48404309236b6778e6a81b17cc4ad0870438eb87c4c66b208ddceae2c88370af7702565cfa2f2ddf15308cdef61bba69c9c2cf86b43847227cdc334197a19f
+DIST puppet-mode-0.3.tar.gz 25617 BLAKE2B a9afb8e2f6c0a2b40cef6bb39d0fa2effe2ddffaa3b646562f0fc5b84d1613e556df88206835d6aad5862d526161d69c49ecd188e299e4f4175b479fe1957eee SHA512 16ba5f71a1ec6c40b1eddf2acf5c1aa1968526b959279e1cac0cfac947f82f404fc35978ce12f5851309f293e2c92f054a718ade97d156528d505dcda58434e8
diff --git a/app-emacs/pymacs/Manifest b/app-emacs/pymacs/Manifest
index e9bd82781d88..8609dde22a4b 100644
--- a/app-emacs/pymacs/Manifest
+++ b/app-emacs/pymacs/Manifest
@@ -1 +1 @@
-DIST pymacs-0.25.tar.gz 120597 SHA256 51dc21b33316e6e244e78e5e88d8ae9a88afc0dcef34ba702ea9be589839bec2 SHA512 e17f7ee754413e21403d23894ee263fb0edae180a60c746b02cf101b2f0c782116e7bb61215bd0a8c689a991e211d780d220d4672b58f43108e7218a6f0c8dc0 WHIRLPOOL 90a211d1b62387e05deb759786fd82eeed23c1800307f1345e1c06c579c0455480433c24fda34a881f887595e169076a6ed56f6e8774933f0431aa96940e0152
+DIST pymacs-0.25.tar.gz 120597 BLAKE2B 837c67d862c11d2a9d74cb55a055f60627834a50717d5386ec604db70a62270aa2ad3e56942602dc10a5f997ab3ce6d7f91e29a8c5b959144286182ad861b3bb SHA512 e17f7ee754413e21403d23894ee263fb0edae180a60c746b02cf101b2f0c782116e7bb61215bd0a8c689a991e211d780d220d4672b58f43108e7218a6f0c8dc0
diff --git a/app-emacs/python-mode/Manifest b/app-emacs/python-mode/Manifest
index c0664170393d..0ed74879e3d3 100644
--- a/app-emacs/python-mode/Manifest
+++ b/app-emacs/python-mode/Manifest
@@ -1,3 +1,3 @@
-DIST python-mode.el-6.1.2.tar.gz 330107 SHA256 ae1223bba504c6db08b7a4fc5ef2e148ad861048b4146f5966ddb4ce39e244e3 SHA512 967ad7fdb3503c2dc37df79ba9f45ed7627a5b8e287cae9e8963a259a6568282c16d509e873c7d8b97e4acaafbd71dcec00e5ac71ed695b20ecddca5da20ba96 WHIRLPOOL 05a9f6f60fa0dca16695c1b9fd43fe5c9d9304cc564292412df12d1894f971c119b0d4a57c297684968e58e0bb4a5e9f4472700d7d9fff461f20294c4c5faabe
-DIST python-mode.el-6.2.0.tar.gz 393046 SHA256 3238df550a4dec1523efbbba6090e3bb6cb9d4d31973b8a9a4852d6640a0e8a9 SHA512 0280649fa646e071a756a657be91dc3b4ab0a227105eeba7601b98fbac1916af0607add20c58c74434eb2fa139a996736e963783b1500ca6f3656a90deaa427e WHIRLPOOL ed829a8f3c1ca1f1f06ef7aa562fa74bb31f202b067a309c341f257aa609f15d767473fdbd6279776422a0660bf339aee4583ecae1df7439e41d61ad4764fcf0
-DIST python-mode.el-6.2.3.tar.gz 314461 SHA256 40098432ca1b3e3dcd8fa0a7d23bd8f2e57471587911d448b9c5cde0569d3335 SHA512 4aeb33d4054d582cd2a3f4834472c7d0cb3fe5e12e10f5117dcbcd90ec2ca490964c774918c83697f283c68e57766c3c67d3853ddbaa3408777fdafc7f2674f2 WHIRLPOOL ec36db8a39ee8e5722a05ddc333ea8bc36479cdae623ea821cfbc0f2b89d628f96a5bc8b66044d4a183eda21c18a157e78ba0f8899d11405e558ac3b21f09437
+DIST python-mode.el-6.1.2.tar.gz 330107 BLAKE2B f04df366ee3e47921f5635472ac22412066d3d97e0f4d2627993b1b6173321687a575abc8700907a9c63829704792505681196e0786e7dc39b9ecbab7562ef9e SHA512 967ad7fdb3503c2dc37df79ba9f45ed7627a5b8e287cae9e8963a259a6568282c16d509e873c7d8b97e4acaafbd71dcec00e5ac71ed695b20ecddca5da20ba96
+DIST python-mode.el-6.2.0.tar.gz 393046 BLAKE2B bc1327324a0b4d2e35cdb4ee593ca6ae5ef203dcea3312e3f24690ce90780c50f4a60e17d9ff32730e5a0dcef9cb04af2150211fc23fe620a4e265d335115616 SHA512 0280649fa646e071a756a657be91dc3b4ab0a227105eeba7601b98fbac1916af0607add20c58c74434eb2fa139a996736e963783b1500ca6f3656a90deaa427e
+DIST python-mode.el-6.2.3.tar.gz 314461 BLAKE2B 3bd71b47de1284d59db61f829e3419f2fb10e226900392d903256f31ad90f47317b7bde4cde1cf7d86518f9c706d9c844b208a9e2469a41037252a63f7bc1ba6 SHA512 4aeb33d4054d582cd2a3f4834472c7d0cb3fe5e12e10f5117dcbcd90ec2ca490964c774918c83697f283c68e57766c3c67d3853ddbaa3408777fdafc7f2674f2
diff --git a/app-emacs/quack/Manifest b/app-emacs/quack/Manifest
index fbe43305a328..3ea6ade36355 100644
--- a/app-emacs/quack/Manifest
+++ b/app-emacs/quack/Manifest
@@ -1 +1 @@
-DIST quack-0.47.el.xz 44508 SHA256 9f3173d0b8ab9bf070ef8e823c0d7c65e4992cef47df94f1a6eeaed96316956e SHA512 41775f5850518a8738aae9d7185c733ad4d5a778859a9d9a7235c84184fb7b84dd49d37a607291f39fac4ddc1cd507806a01dd19ab3351646ecf35e747feb8ce WHIRLPOOL ab284d3d520b49368726ed00164811ac8601a0d298d2bddc54f4677a621ca1c0ff2ebb3c244c59c18f7929e9dc8c2c6014f95036bf325ec531c3cc597e9d69c5
+DIST quack-0.47.el.xz 44508 BLAKE2B 36b05926e019d191a21bac6e8e0d8f2c0228a4decee807f3ed61b145db56af5bdede43708c5e04d1f65f261b7de645a40a02a95f0300b8673b454293011903e9 SHA512 41775f5850518a8738aae9d7185c733ad4d5a778859a9d9a7235c84184fb7b84dd49d37a607291f39fac4ddc1cd507806a01dd19ab3351646ecf35e747feb8ce
diff --git a/app-emacs/quilt-el/Manifest b/app-emacs/quilt-el/Manifest
index 36c6431a0248..334cb7d8ac38 100644
--- a/app-emacs/quilt-el/Manifest
+++ b/app-emacs/quilt-el/Manifest
@@ -1 +1 @@
-DIST quilt-el-0.48.0.tar.gz 13147 SHA256 6c7a80d7f121d4958e989ad98065667d328905b893551f2f3e6f56449506ad24 SHA512 0a198ef0f8354c927c4527bb7a3e99fd6d12f17cbe65c736341c527de440d144581205337163912ce04f83749c31833221cc4153d5736ffec060ad4ade73c694 WHIRLPOOL fc083629a622500105315ab8553f81721b9902132bb63ebf0a4132aee8303ba304a6779cdff9a6db282cc01b3cc66fd30ace4a9e27eb4adb5e795ea34d6e997b
+DIST quilt-el-0.48.0.tar.gz 13147 BLAKE2B 595e7d12c24095df3c0d12de607b4e43e36345b53f9d89e6ea6ea781ed25f893d5100e3a023b4f5bc0aee11dcf93a7ef3862fabe28c8eda98a43dce634969444 SHA512 0a198ef0f8354c927c4527bb7a3e99fd6d12f17cbe65c736341c527de440d144581205337163912ce04f83749c31833221cc4153d5736ffec060ad4ade73c694
diff --git a/app-emacs/qwerty/Manifest b/app-emacs/qwerty/Manifest
index d2975b48fbd8..bfafe5ad6237 100644
--- a/app-emacs/qwerty/Manifest
+++ b/app-emacs/qwerty/Manifest
@@ -1 +1 @@
-DIST qwerty-1.1.tar.gz 3629 SHA256 e420815acb8bea40e2cfac7f241b275bd131e5079abdf9e0164872bffaef6a7d SHA512 1e808f758c2db054a1ae9fbfd961a1ca279226738d2cfcfc640e1613814469320dba75a2b6be00641403ce165e0fd02da04b791928979506deb8ef98cb9b9ada WHIRLPOOL 5cb0feed5d84f530691e5f0da78373005a81947802df1f592401eb1d186511ff9ae8a59754031dbc0b356634b44228e46fd2f5871724523f517f9ecfd6b71e25
+DIST qwerty-1.1.tar.gz 3629 BLAKE2B 593103d464f0745fc1d0ebb5268eb3ef9e67fc0ef59c10bc5975e8c4f512afc705ba1867975c91fb48c70ab4d32690f16ab13eaad16f577e1ecf5af4038a1320 SHA512 1e808f758c2db054a1ae9fbfd961a1ca279226738d2cfcfc640e1613814469320dba75a2b6be00641403ce165e0fd02da04b791928979506deb8ef98cb9b9ada
diff --git a/app-emacs/redo+/Manifest b/app-emacs/redo+/Manifest
index e3f913a50aa0..ac2b5310d6ff 100644
--- a/app-emacs/redo+/Manifest
+++ b/app-emacs/redo+/Manifest
@@ -1 +1 @@
-DIST redo+-1.19.el.xz 4160 SHA256 71376025c285c9baf7dd24e3ca2d99c8ec920a160a90156ff0fc02dccec3c2b4 SHA512 e6e436b3e11d90b637e66328f2f1bfeffe0c7fe4e4f1778825e95cdb2bdf934797e9ed5563f8d83bef4fcdbf5fa4f4ab4d85bcd35b967615fdd5bce45ba39d95 WHIRLPOOL 20da0f2c05de55df019bdbd584f4564e95effad9bc18f4b092c8c435c7912e2e70643c72e72fc431d0ab4ba69a1715ea8f523ae22af862a7ab74cf96bd40d2ed
+DIST redo+-1.19.el.xz 4160 BLAKE2B e595fa0c5dc7d2b7da5bef77815b9c6bfe1372db37a2b7dbf6d3c84e7b8243fa9003f6c76d1175df2805a72fd9eab3c1f0245b42435cd3513311fc708d9cb7eb SHA512 e6e436b3e11d90b637e66328f2f1bfeffe0c7fe4e4f1778825e95cdb2bdf934797e9ed5563f8d83bef4fcdbf5fa4f4ab4d85bcd35b967615fdd5bce45ba39d95
diff --git a/app-emacs/regress/Manifest b/app-emacs/regress/Manifest
index 2af0e04c9894..cad6af1cacba 100644
--- a/app-emacs/regress/Manifest
+++ b/app-emacs/regress/Manifest
@@ -1 +1 @@
-DIST regress-1.5.1.tar.gz 8633 SHA256 9be43cde347106c3979526b1049cf7af080dd9a6f8c71446562e78f1d871c81d SHA512 8718d44fc8cd62b9f02f53e59b0843f23cd9f1852c8f3c3038a3009b72f65efff94ac0fa9a18356d5efe7dde593e4643ed17fb54b5cc602f60c730cbb5cbd64a WHIRLPOOL d2c3f7d94e3d1a9807fba12e938ed6ca5accbb2a5d68283160996a01fbcbed5b350b037970562a894f046da5514a611b2375161b5713913b21cbd05835195e08
+DIST regress-1.5.1.tar.gz 8633 BLAKE2B c399da64c802d261690bc7d513d9ca1dc5a1c76968273f50f933cd6ae8e04ec716ad4b1b7e598a7983ce8fb77daae3d21eb24f3c80629dfbbb2df5415f2ad756 SHA512 8718d44fc8cd62b9f02f53e59b0843f23cd9f1852c8f3c3038a3009b72f65efff94ac0fa9a18356d5efe7dde593e4643ed17fb54b5cc602f60c730cbb5cbd64a
diff --git a/app-emacs/remember/Manifest b/app-emacs/remember/Manifest
index 56a20730ba06..af6e2a8c84b8 100644
--- a/app-emacs/remember/Manifest
+++ b/app-emacs/remember/Manifest
@@ -1 +1 @@
-DIST remember-2.0.tar.gz 48096 SHA256 95a7a69e6418d8cb9a5edd65b38f40a2bf3c81fa8c5f79f5aa662dd9c3017711 SHA512 c5d1a55904699565af6375d19e88924a31364cf6f9b09b6e5510ac3e65c9bddbb2e0a5aa668dfd6e541ea6572209cad8af68694b7376b1bfe964032d247e5e01 WHIRLPOOL df32bd6456a0475bfa361c5504ca30c1ced4b076d96e06c296e626f2c48f78a395c7fabbabc1dd0d67b1bd54f8e0655de271e2867c388e40b548dd9c3f2c31fa
+DIST remember-2.0.tar.gz 48096 BLAKE2B 7296760b561ab3c626a4c356aeaf02f9783d0ce84fb2e1bfbcfd46f392a5128bc956e378f646394645589ca6dd2a9bf1ff364ade25787ffa58f580d4decc485f SHA512 c5d1a55904699565af6375d19e88924a31364cf6f9b09b6e5510ac3e65c9bddbb2e0a5aa668dfd6e541ea6572209cad8af68694b7376b1bfe964032d247e5e01
diff --git a/app-emacs/revive/Manifest b/app-emacs/revive/Manifest
index ce12ab1ff0c8..9845a48a93c8 100644
--- a/app-emacs/revive/Manifest
+++ b/app-emacs/revive/Manifest
@@ -1 +1 @@
-DIST revive-2.23.el.xz 9960 SHA256 6a68048e6e6de6b2bc3059d25accaf2ec63e240aad63bc401c735d269f832a2d SHA512 6eccd93e217bdb6d6f78b95c5b620f069c70e87deb5d9ddfdb30c01edafd1ea123eb9d2943e0143062e8db4423cf30bf9028e51cbb1519e67e9210b2dc282128 WHIRLPOOL 85e1b7f98e8ee4eed2bfb8b0f821e408046396c372af7d996d7d67564254e8ee5dca8dd6ae208eb4b66f8f87847669b3742a7806d31847432b40eb0c097fde65
+DIST revive-2.23.el.xz 9960 BLAKE2B c5955137e7f152691b5dde888536a61dcf2b1ceb3045da9ba861f2b10d467942d3581ca706a9041f7c9bf7092a88f7fe4b6fd8f1dc19ed303350f1bf581439cb SHA512 6eccd93e217bdb6d6f78b95c5b620f069c70e87deb5d9ddfdb30c01edafd1ea123eb9d2943e0143062e8db4423cf30bf9028e51cbb1519e67e9210b2dc282128
diff --git a/app-emacs/rfcview/Manifest b/app-emacs/rfcview/Manifest
index 4c62df04bb72..deceeb8f299e 100644
--- a/app-emacs/rfcview/Manifest
+++ b/app-emacs/rfcview/Manifest
@@ -1 +1 @@
-DIST rfcview-0.13.el.xz 8836 SHA256 eff317b01824832288abe4e60884665fc22e3dbec315a1fb1779cf679f0a8d89 SHA512 84cda45b5e941808e2ddc50d5f03d7b2d3831208d08dddd2fe2121a20ddcbb7d24b148b2ec2ba07e0b9a04da81ae4d14269d0062955961679ac5c7532de1e6e5 WHIRLPOOL 6f10e4cd4f2d027804f030ff90430b80b89bfbb1df01b4ed8c30fcba049f11d0d3bb192ad18f453d73c81fbf3406b92f92817c3b9c0fa8c74860a371fbd341b1
+DIST rfcview-0.13.el.xz 8836 BLAKE2B a71f7bfcee9170330f30b7087e37723fff1081b146141d26d1c0ae60a98060a069f4018ff252808dbe27b4d5d78d053da36a420657ba137b91d37820d055cfa3 SHA512 84cda45b5e941808e2ddc50d5f03d7b2d3831208d08dddd2fe2121a20ddcbb7d24b148b2ec2ba07e0b9a04da81ae4d14269d0062955961679ac5c7532de1e6e5
diff --git a/app-emacs/riece/Manifest b/app-emacs/riece/Manifest
index bf79cbde07ac..bd36ae263b6b 100644
--- a/app-emacs/riece/Manifest
+++ b/app-emacs/riece/Manifest
@@ -1,2 +1,2 @@
-DIST riece-8.0.0.tar.gz 432370 SHA256 e2da635832a07c8a44bdc4ff57e6f427d270fad9a5c71423b8de5811f21ef5a6 SHA512 ac219f882c2dedcba2bf3d75e5b934c363dfdd6d8f9e35ce11040d85fca526f8368a57535b729952d6f2731f3ec328bad3913426d0bb0b4bff78a407bfd63a96 WHIRLPOOL d5840e6a723d4a5c3faf62a3ae1c819722ac811c3b33260dd46c99b7bdbcfdc4c779ffde68b98c8f8a788642286a63420c31a3ac0e9e90306762f422a997b433
-DIST riece-9.0.0.tar.gz 438553 SHA256 88928dc21df3f3b15158e64b77268882544e6afa1d93f3545435ce430837fd2d SHA512 3fbfa4a6d898a713248ce217939af208729eb441ab7ecea2d2c028ce228db1363cb7d90d0de4636bd9fe10813c73f9ef70fb003cfc2fe64ec25b71c9821e8bf6 WHIRLPOOL 0897c79535aadd004cf3953428d1785ecf410ab3aa13ea1345df9384af72ec3bae8d8ab30260897c068f2c160f4e70e0b171fbd5e4feb4c3ca28cf94e3e9b776
+DIST riece-8.0.0.tar.gz 432370 BLAKE2B 042392697d6110490dcdb278fe8c9c68983b1d926f97231ddf08967735c3f526f41a7135378d49dcfba1344c0092cf43ce7ebe05ca039053002d166182c22601 SHA512 ac219f882c2dedcba2bf3d75e5b934c363dfdd6d8f9e35ce11040d85fca526f8368a57535b729952d6f2731f3ec328bad3913426d0bb0b4bff78a407bfd63a96
+DIST riece-9.0.0.tar.gz 438553 BLAKE2B eaa54c7f5b445657b0a1e09914b145ccaa88a26c5f14d7b6c37061c25b90210f4fd0ec9bb6867ed881212314d0f4d9fe81f60fbde64accf8091d72cc6f9a8576 SHA512 3fbfa4a6d898a713248ce217939af208729eb441ab7ecea2d2c028ce228db1363cb7d90d0de4636bd9fe10813c73f9ef70fb003cfc2fe64ec25b71c9821e8bf6
diff --git a/app-emacs/rnc-mode/Manifest b/app-emacs/rnc-mode/Manifest
index b90cddc62811..db7a2fe28b19 100644
--- a/app-emacs/rnc-mode/Manifest
+++ b/app-emacs/rnc-mode/Manifest
@@ -1 +1 @@
-DIST RncMode-1_0b3.tgz 3420 SHA256 135cc63a65e079598d64fd2603500653b65e7ce1359acc9ceae4b65b8c7a3619 SHA512 0118e7b03dc039568ed427f9268878075077c360e34cd7fd9a565a11418161037890b08cc6169ddf92289ca1bdb66a1e373910b67735085a18618089729416cd WHIRLPOOL 02411df6699cc3301b37d7536cc5130eefc6775a5aeddb0770a4adc33f1b8cbeae48e06fccce56e8bb53362e7f57a57741b7db01a292df38275e603bb62616f3
+DIST RncMode-1_0b3.tgz 3420 BLAKE2B f955f4bb3064e54756ffaf377f4b0f51e65a62d5255e3e7516836576b8c84481945ae176d43f0e2066aacdf605714d935fd4e043fba711026bd3568d8f66404f SHA512 0118e7b03dc039568ed427f9268878075077c360e34cd7fd9a565a11418161037890b08cc6169ddf92289ca1bdb66a1e373910b67735085a18618089729416cd
diff --git a/app-emacs/rpm-spec-mode/Manifest b/app-emacs/rpm-spec-mode/Manifest
index 71efde5ec397..1b6a5932c6ce 100644
--- a/app-emacs/rpm-spec-mode/Manifest
+++ b/app-emacs/rpm-spec-mode/Manifest
@@ -1 +1 @@
-DIST rpm-spec-mode-0.15.el.xz 11176 SHA256 f065ac2545eca293b4eef8e00a01640990e6b8f9e57412d0472c0af5a12eae1f SHA512 cd2f1dc1d3b7bc18512d14bdbc8b73183b0d917e93911aa5c88bd847cbf24f090480cdac46f9f8a82336085ea801abbbed567fce19498cc70661d051dfa287dc WHIRLPOOL 95e1f38ce57483dcb188c44ab571fb3e4a2a176449fe68551629c7af2c442beb06b4082eee4f8d7f7729a26af29c2f85eab0292e09af01edc15eb16edda5ecdc
+DIST rpm-spec-mode-0.15.el.xz 11176 BLAKE2B 209720693ab1d749187ce923534db18ecc57daabf83bd9051988a2ae660df8482370f33aae3730152f99c1267ad366848ba6b7df72ad9a8c7b195ea94313b224 SHA512 cd2f1dc1d3b7bc18512d14bdbc8b73183b0d917e93911aa5c88bd847cbf24f090480cdac46f9f8a82336085ea801abbbed567fce19498cc70661d051dfa287dc
diff --git a/app-emacs/ruby-mode/Manifest b/app-emacs/ruby-mode/Manifest
index 212dd2f3f38e..bda428a80173 100644
--- a/app-emacs/ruby-mode/Manifest
+++ b/app-emacs/ruby-mode/Manifest
@@ -1,4 +1,4 @@
-DIST ruby-2.0.0-p247.tar.bz2 10804581 SHA256 08e3d4b85b8a1118a8e81261f59dd8b4ddcfd70b6ae554e0ec5ceb99c3185e8a SHA512 9bd793d0df8f0704fb1521a937c09ecc89b777851312793f0b3391df11dec8239808585697b932c4a94665fa29c7781503166dbd109f269811788c4c648f285f WHIRLPOOL 59eb0a5d71125b63226435d825f5793fd9ff7f065851b902ee45f974fdaf5f5498d12b07d8e20e668a1e4636dbc8f34d025f8713bd98e3c565327484e484a863
-DIST ruby-2.2.2.tar.xz 10463044 SHA256 f033b5d08ab57083e48c1d81bcd7399967578c370b664da90e12a32891424462 SHA512 bd72d0a4c017e2527659f64ef2781bbe8bd540a2302eaa60234a12282fd53c359e04205c56385402c67e81bb9dab3b88de53de82e12bb13e3386c26301043b64 WHIRLPOOL ee9c3a664ac1d67bd9ff4ed8fcc7d4c8e9b6e2f5774c938f876223b22022b498932afc41990890a03b560c65ffe29a039761d18bbeeab46fe13cbfff515bc115
-DIST ruby-2.3.0.tar.xz 11294412 SHA256 70125af0cfd7048e813a5eecab3676249582bfb65cfd57b868c3595f966e4097 SHA512 d893c5e6db5a0533e0da48d899c619964388852ef90e7d1b92a4363d5f189cd2dba32a009581f62b9f42a8e6027975fc3c18b64faf356f5e3ac43a8d69ec5327 WHIRLPOOL 1d39136dad87580339f87057649d136e1b76cb58118b275d6847b791be8f6882820de892d9fb7144991a7acf30c355311fd289d1a7931fd018b3b95398945c07
-DIST ruby-2.4.1.tar.xz 9939188 SHA256 4fc8a9992de3e90191de369270ea4b6c1b171b7941743614cc50822ddc1fe654 SHA512 e6fd290b6edd166348b70f0f1c56f7ed9d956c4c1eb91d97d0548041ca4196b9b75ec1ad35c745bdbfd4de195899093e7205d7f02b014ecf1c48e6f31cf25903 WHIRLPOOL b45a6e3bd70e6ef802d084ad87ad0eddd85932e07939bd6ed6a2e6944aa289f231971fedd7d1eece792becb08312f37b80073a2a9df070f61f32747c0708523e
+DIST ruby-2.0.0-p247.tar.bz2 10804581 BLAKE2B b7f2f8234426361f7e53965ef93aada24f63975c4f920656541024ffced84a19b0e53f1c985879e3ca08ae9424f2b5b005afa31527eccb581ff7201e94b5b27c SHA512 9bd793d0df8f0704fb1521a937c09ecc89b777851312793f0b3391df11dec8239808585697b932c4a94665fa29c7781503166dbd109f269811788c4c648f285f
+DIST ruby-2.2.2.tar.xz 10463044 BLAKE2B 77e1bda547102da9aa47c1ca58c9c8189b204019605ca6363df678a4590fe59f63910a657bb653d605aab612351e09ba0384351e552c788fb6c54520fe9c6277 SHA512 bd72d0a4c017e2527659f64ef2781bbe8bd540a2302eaa60234a12282fd53c359e04205c56385402c67e81bb9dab3b88de53de82e12bb13e3386c26301043b64
+DIST ruby-2.3.0.tar.xz 11294412 BLAKE2B 2c1324154aadd287952cc6430891048ea69922c063b1b2bac89b58603247eb09a79a8c527259d59ceabfc7be08ec2528c982bf2b0f1a223cf3e60d7a3934e8bc SHA512 d893c5e6db5a0533e0da48d899c619964388852ef90e7d1b92a4363d5f189cd2dba32a009581f62b9f42a8e6027975fc3c18b64faf356f5e3ac43a8d69ec5327
+DIST ruby-2.4.1.tar.xz 9939188 BLAKE2B 5be893c8996d17ff333276a772747d3099cec0c41331e1a1916679afc43a8ad5ed99a827bc76b32652ec950eaec933dbe28e1dde313987c2891f258ba7097af7 SHA512 e6fd290b6edd166348b70f0f1c56f7ed9d956c4c1eb91d97d0548041ca4196b9b75ec1ad35c745bdbfd4de195899093e7205d7f02b014ecf1c48e6f31cf25903
diff --git a/app-emacs/rudel/Manifest b/app-emacs/rudel/Manifest
index 02d61da43c98..9ec0bf20a36e 100644
--- a/app-emacs/rudel/Manifest
+++ b/app-emacs/rudel/Manifest
@@ -1 +1 @@
-DIST rudel-0.3_pre20110721.tar.xz 416060 SHA256 7c0a3ba5ff7d8c5bfdb7a53c1d2d138977e2795025388a1b5fdaf0f031e6b2af SHA512 abf6c8eb4fcaf4acafb9bed7cafff5d3c8e19e3fecd2aa779065bfb11ce5cb198ef14cc9deed360ac895166ea159a821e24dc92dbeda4f5481d1bb3bc2f8c023 WHIRLPOOL 5160716cd66ab4c4df18e8f02a31807ae9e6f239d532ddc1837a3d34c548ae5abd349ba86abc3b9613f44d5a7450d82837b18f5fbca7eaa52b617a1345c4d626
+DIST rudel-0.3_pre20110721.tar.xz 416060 BLAKE2B 813ec0dc034a0893c0cc540118d9471fcb353c232ce37b70816183ebc99ff82c16e80eddf015f5d5663c7380a93c29b153871bb1ca58f37f06d4e09bddd87912 SHA512 abf6c8eb4fcaf4acafb9bed7cafff5d3c8e19e3fecd2aa779065bfb11ce5cb198ef14cc9deed360ac895166ea159a821e24dc92dbeda4f5481d1bb3bc2f8c023
diff --git a/app-emacs/rust-mode/Manifest b/app-emacs/rust-mode/Manifest
index 5cbb71c204cc..693efa22deb0 100644
--- a/app-emacs/rust-mode/Manifest
+++ b/app-emacs/rust-mode/Manifest
@@ -1 +1 @@
-DIST rust-mode-1_beta20150411.tar.gz 18155 SHA256 ac29e082fa09a98f864213553685bd085fe48ba3ec871032ef3cec19b2388c3a SHA512 fc9fe74ba4924cf54664f37c5a88d86b38e17e4ad5e0d4d924afd7f3c8428764dece81cfbe40397460685859f34c3eb841b2c83aef8f34526f4ed3f065cc504e WHIRLPOOL a4ba69d96701bc48049bb16513b71a836cd2faf197f346d6c4f7fadcb18cf9dc4143e6f82e965d6875c3913f16cda3a4cce2dc83821885a0fa2e4bcfb5ce74a1
+DIST rust-mode-1_beta20150411.tar.gz 18155 BLAKE2B 140cad8709f742216822b3933cac64dc7d136fe9fbf0ddec523b395cb148cd8935587a590be41187c4cdfce43b64a72ede9a67a2e77fa7b11b9562e20ae729da SHA512 fc9fe74ba4924cf54664f37c5a88d86b38e17e4ad5e0d4d924afd7f3c8428764dece81cfbe40397460685859f34c3eb841b2c83aef8f34526f4ed3f065cc504e
diff --git a/app-emacs/s/Manifest b/app-emacs/s/Manifest
index 7f23c177f31b..a50b2b4074f4 100644
--- a/app-emacs/s/Manifest
+++ b/app-emacs/s/Manifest
@@ -1,2 +1,2 @@
-DIST s-1.11.0.tar.gz 46771 SHA256 826d186458f7568f1304bca0c094034a9e7370bd2858dcf806dd513abe2d384f SHA512 364fa7ea875e9be6db464a826c1259889b67d87817b41cff40ab7da80e0bfc3e27dcadadfd005a64a895ee92644c2dea82789bdf1b1fe538501c40f748455608 WHIRLPOOL cccae8d9539dbc91da97e68dd88e13b08bd2ba1a414b62bb431c43dc1f4c8b1e4a8d37996a861d7817763bc08c4fee53dd9a4f8134ba0719f33b6e6f6a4b7496
-DIST s-1.12.0.tar.gz 59193 SHA256 70674d307aca5f75b44413888198c0f2db8f0fa7a183f70d4095dd6150397475 SHA512 036369011295dfde7567ae8bd479be9635de479e8821c3fe117a6c3827bc83492bb91e6ac64d4b20b061da95690f5585ed58f116a2b8c877dceee22153c8c990 WHIRLPOOL 679f27727754e08cae94456ac6cbab31e7e0e753e8428ea5d04a9cdac48b01a998e1aa59b4b2564f29e395ef34bcd289ceaf7e39f3345e4fde3120a208e2e0ec
+DIST s-1.11.0.tar.gz 46771 BLAKE2B 5cc93e4f52ea4fbb4d4b9b418a632e8bbc789f0f36b9486a4a1b36725e255f4a78d1924a420fd04af5c2bc50a652adfc83db3285569367749fe3712f2f0b560b SHA512 364fa7ea875e9be6db464a826c1259889b67d87817b41cff40ab7da80e0bfc3e27dcadadfd005a64a895ee92644c2dea82789bdf1b1fe538501c40f748455608
+DIST s-1.12.0.tar.gz 59193 BLAKE2B 89e4c453b6590116a4cc08fc1be73519e6c95586c1e80b37f37d7273232aa707cd030cf74106fdd7eb7f05fe8ebd04253592076573472c3927cc1428b4c029f8 SHA512 036369011295dfde7567ae8bd479be9635de479e8821c3fe117a6c3827bc83492bb91e6ac64d4b20b061da95690f5585ed58f116a2b8c877dceee22153c8c990
diff --git a/app-emacs/scala-mode/Manifest b/app-emacs/scala-mode/Manifest
index 8c4f03cf1ed6..4e13fc69208b 100644
--- a/app-emacs/scala-mode/Manifest
+++ b/app-emacs/scala-mode/Manifest
@@ -1 +1 @@
-DIST scala-tool-support-2.10.3.tgz 26040 SHA256 d0f67730614f81e7387cdc3cbab633bd0b823a8d84e9d01ac545fd91c5d8e050 SHA512 77bd695d1e577d05884a8b70d4edcc6a0af1da13de0f8cdf54d5636e0e93c22ec919ccd3d79e92382b6a9fe8085a08af37b9f5428c1ed14359faf8fc860a81b5 WHIRLPOOL be1742f55c03f80a819a4336bf01d89d32ab6d0cfc080e08c7b27479cb76d19a2d03aefc66ee286f5eb28e0aa9952586801534dba2df2ab24f2d317b245be780
+DIST scala-tool-support-2.10.3.tgz 26040 BLAKE2B 7ff24aa2e16a1eb587e633839b9e6be7a146dfc99b0edaabe260a653aa931ddff6c10dea3d7bb5ad12bc3f25373f7064f20a75945badb3c3e55f4bff5991c697 SHA512 77bd695d1e577d05884a8b70d4edcc6a0af1da13de0f8cdf54d5636e0e93c22ec919ccd3d79e92382b6a9fe8085a08af37b9f5428c1ed14359faf8fc860a81b5
diff --git a/app-emacs/scheme-complete/Manifest b/app-emacs/scheme-complete/Manifest
index 3a09df9208be..9fad773475f1 100644
--- a/app-emacs/scheme-complete/Manifest
+++ b/app-emacs/scheme-complete/Manifest
@@ -1,2 +1,2 @@
-DIST scheme-complete-0.8.10.el.gz 38713 SHA256 9af540763d75ba894ff3e84546cfea191f045f57a85ff9578bb5599c2a61950a SHA512 7058983a57f1fe3cbbc4066f62075b755bd8e9a83ce65bf26a3568889d05abc9972d4b7be57ac54867fc4abe5567e223c9640bd8c898dbc6422d449f41090956 WHIRLPOOL 073e880810c30e3f4fc9a3e0f2a9013597805f85c8e8e36450a9a49b3347ecc6be6c81756cb7fcf03c92601406253fe2b8b44434f4aed20decb04093007960b2
-DIST scheme-complete-0.8.11.el.gz 38847 SHA256 19663b5104044d84b1326d48b4ef8801da9b4da18bea3577dc52830b3a4233ce SHA512 90fe73dfee3377f19eca2107deb6c9d88260b2097358416dab5ad839dabc0a0678b7254ab6dbdc058cae2be5feeaa4cba2f66296e49060df5251c1888044fea8 WHIRLPOOL 6688e3a917fc2a6a400979203c5b8cf3e0f573849522822231e8a41acf91796d8b268e424266935a264db783e4bf659dd394d02c8a4b980179320c06729e4e2c
+DIST scheme-complete-0.8.10.el.gz 38713 BLAKE2B cdb1e821ef752dcb5e1067f636e3b023c114bf564fe44c0e7224c879858d5da51d2ecbfa659d9699f6c7feb1f74dad3462b4ab769e834f2e4b8d9132d4b4a63a SHA512 7058983a57f1fe3cbbc4066f62075b755bd8e9a83ce65bf26a3568889d05abc9972d4b7be57ac54867fc4abe5567e223c9640bd8c898dbc6422d449f41090956
+DIST scheme-complete-0.8.11.el.gz 38847 BLAKE2B 649a4124b0b643211c2132dc0e03e8930ea7f311637b3afd375d75e3aa33abaae888b1aa34744bf22d13738179d4048faa173ec8e5e0868f5789623fb7b11c0c SHA512 90fe73dfee3377f19eca2107deb6c9d88260b2097358416dab5ad839dabc0a0678b7254ab6dbdc058cae2be5feeaa4cba2f66296e49060df5251c1888044fea8
diff --git a/app-emacs/scim-bridge-el/Manifest b/app-emacs/scim-bridge-el/Manifest
index f3836e10498b..df52f9778620 100644
--- a/app-emacs/scim-bridge-el/Manifest
+++ b/app-emacs/scim-bridge-el/Manifest
@@ -1 +1 @@
-DIST scim-bridge-el-0.8.2.tar.gz 67369 SHA256 c70edd7a2688d67781901f87f36854a3f6f74c46b6768381da5258463f151b87 SHA512 2d173acb2d0182cd4c1fb6301cb34de0a5a08f4776e9dcec16bf2d1342bea98765c55d61cb7d666c42c2bb8c63d3083f4d4e59dbbec13a6ec72c7c48350c5c0c WHIRLPOOL 5c9d2e9034e3f395fb6fe446895e413a65d35b56139835cf8f4ff559e45bb2287339d094a7f03a2c82d07b585ef73a19875a56ed31d4393ca8328a44e41551bf
+DIST scim-bridge-el-0.8.2.tar.gz 67369 BLAKE2B 453c6d458e9ade8971de1adcceeb10e0d9c6ee7a090a0986cdcf419ec8b2b4422eb8b6ebe1e2a8f3d22330759b2af5e9cc3aac5db37a4d837de9d3d677a9ceff SHA512 2d173acb2d0182cd4c1fb6301cb34de0a5a08f4776e9dcec16bf2d1342bea98765c55d61cb7d666c42c2bb8c63d3083f4d4e59dbbec13a6ec72c7c48350c5c0c
diff --git a/app-emacs/scss-mode/Manifest b/app-emacs/scss-mode/Manifest
index d5b122b69272..6cc9f7332f4a 100644
--- a/app-emacs/scss-mode/Manifest
+++ b/app-emacs/scss-mode/Manifest
@@ -1,2 +1,2 @@
-DIST scss-mode-20130215-git.tar.gz 2632 SHA256 79c5360c7f3e76851d6aeb810d20d9ac66362f4420f967d9847338adb7df5f2a SHA512 2241d7e0c2689ba3997e4ffdf1ed167409c1d99a4f6a11911de39775a409d3299ba7e1bb2f7f0878b5b0d91e46706b65ef8e25cef83278894d8842af8bbc95be WHIRLPOOL 67792f4c20dc370e0dd078dc6212ddfd16030226a1fded057a69b514b984b79168e5a994d2126b32b9e17e4147a2597b16b5c1f788dbd378c71b45bd15772834
-DIST scss-mode-20150107-git.tar.gz 2718 SHA256 6f412eab87db85cdf3172d67c28841b0a0b910c473bf020c3babbb31ddd4ea2f SHA512 68a33d14166289af119625a5609c4dec47a05eb8c8452b42cf8e819368cc7561270c8223ac0624fee989f8c51592f456f91009c153fb857549d9c7e7c7e801a2 WHIRLPOOL 639653ccc9cdba87b7982a04ddd66236eaa4f2c8137839fdf35c5a015611fa01e160d790c9f698d0d1ac3e7033a29eb3f523554bff5ccdecaa8390dc3de13834
+DIST scss-mode-20130215-git.tar.gz 2632 BLAKE2B f73ad6ee5120518c6e083cc5c963601649866a826e0bf5628f90a1c1e952c36b66a7f1a385244b71d0f78f958edf1d39142aabd309af380a650f5205a1300ba3 SHA512 2241d7e0c2689ba3997e4ffdf1ed167409c1d99a4f6a11911de39775a409d3299ba7e1bb2f7f0878b5b0d91e46706b65ef8e25cef83278894d8842af8bbc95be
+DIST scss-mode-20150107-git.tar.gz 2718 BLAKE2B 5551ca7258caf22957e1d3becf147cfb617378c606c05196b87fa2ce7b035f06e48db1ad01476bcca87bde461971ab040fc7085422cd076469c6d7a9b73b624a SHA512 68a33d14166289af119625a5609c4dec47a05eb8c8452b42cf8e819368cc7561270c8223ac0624fee989f8c51592f456f91009c153fb857549d9c7e7c7e801a2
diff --git a/app-emacs/semi/Manifest b/app-emacs/semi/Manifest
index d24f94ef9c2c..73743402f2aa 100644
--- a/app-emacs/semi/Manifest
+++ b/app-emacs/semi/Manifest
@@ -1 +1 @@
-DIST semi-1.14.6.tar.gz 142549 SHA256 717fe9261863b2a36cf5882cc669452848d6b91f48ce6a695d81118500ed1bfb SHA512 1011271c58414f4ca23da079f16f273b408643e0d9f4961db321b65c1ed9a7d4ca66a7d7cb5b0c9fa2b4904fa992c9188858de6131180ee30132d3cadaeef33f WHIRLPOOL 1922f3647acaa8ccb4f1e4cffb471164d7ea44fcc0e98a9b118b6477d02aae0ccce8efaea0581c7710ffc59e8101fbdb8ae7affbd29c19e769be312b40aad88e
+DIST semi-1.14.6.tar.gz 142549 BLAKE2B e417b305ad814b2a23fad4fd37057395efb47bdb61778aa167149eda4277cda47dc81148821d9e4ad3225a858c77f781a6565c3e49747d78882b9401fd5fbac1 SHA512 1011271c58414f4ca23da079f16f273b408643e0d9f4961db321b65c1ed9a7d4ca66a7d7cb5b0c9fa2b4904fa992c9188858de6131180ee30132d3cadaeef33f
diff --git a/app-emacs/session/Manifest b/app-emacs/session/Manifest
index c868af674e47..ecd997ef7f81 100644
--- a/app-emacs/session/Manifest
+++ b/app-emacs/session/Manifest
@@ -1 +1 @@
-DIST session-2.3a.tar.gz 26648 SHA256 592237b1380f3cbbdfa83629f386d5f82b15171930832bd8baf1db26342ad9e2 SHA512 eb0721c780256ca5dfcdf5071d73a89e3e7e477bbe2ddc380adaf7a7cbf870bbc0e334192f59362df93571ff91063d53df918761322e31d7c6ffa8059d4bc15a WHIRLPOOL 63e2084204dbf3680c407aa48fbad18633f190ffde64b7699cbeb6c282604dc3c26910d2f557d3f031ee287b9873d93412d3ae2bf896f65840de174b2ea23d76
+DIST session-2.3a.tar.gz 26648 BLAKE2B 6380e9c31c37afc99229bbe63ce86f0e80340e093c9ec859adbc688e10e8e6f9b40153344fe02336e9336dcbc7c40e0a2337d82a90d0a40f161b5e4b062988a7 SHA512 eb0721c780256ca5dfcdf5071d73a89e3e7e477bbe2ddc380adaf7a7cbf870bbc0e334192f59362df93571ff91063d53df918761322e31d7c6ffa8059d4bc15a
diff --git a/app-emacs/setnu/Manifest b/app-emacs/setnu/Manifest
index ea211a9a0759..7839976b8919 100644
--- a/app-emacs/setnu/Manifest
+++ b/app-emacs/setnu/Manifest
@@ -1 +1 @@
-DIST setnu-1.06.tar.gz 4488 SHA256 cfc5c3b67f0779bf4c33933eb8ac4c6407f1ca06d3db59d928287c19af8e2345 SHA512 84ff5ba3da8c8d1c205f251ac408ff1f5b1368d5a418826dbe55e86e26e8dd9ea9a65d89c3432d45126adc2b4e6ed7b210b2c1bfe6abe38d77aba76a85d2792e WHIRLPOOL 92a8c8aac4b4e4bae0403230cbf32c43276321cd58b39fbc9d87f66aed4b507a731485c123458dc8924a3364048023252143991fbba99bcfdf76f253990341e7
+DIST setnu-1.06.tar.gz 4488 BLAKE2B a549e5e43c47276b5110059002609a1de36198e7b2f53f101689f3b4df952190197b9b77602eb78ceb6b19d3386043aade8b214bdae656a487eea51f95495c0f SHA512 84ff5ba3da8c8d1c205f251ac408ff1f5b1368d5a418826dbe55e86e26e8dd9ea9a65d89c3432d45126adc2b4e6ed7b210b2c1bfe6abe38d77aba76a85d2792e
diff --git a/app-emacs/slime/Manifest b/app-emacs/slime/Manifest
index 011b55acef75..c1458498f9ff 100644
--- a/app-emacs/slime/Manifest
+++ b/app-emacs/slime/Manifest
@@ -1,5 +1,5 @@
-DIST slime-2.0_p20101103-patches.tar.bz2 4730 SHA256 9cab942f4ea64ec2f0e127db3b5428513c51899e5518d9f8c2bd9143c644fd19 SHA512 7990a3ffa4a5867fe84e326034aa794d3396dd2a74125e256be33524e2e737e052094fa11f2f486db34dc619e89e9343d4c5d2f84f3972139c2c7ac33248ce2c WHIRLPOOL a11ebfdf6b9054ed07ea8af667a5ef909cbe129531ee63dd3b4556fedc4d0e334ed913423a23acab176312b1c781f3c25f1c499184d7f2c6bfe459d4b67c368b
-DIST slime-2.0_p20101103.tar.bz2 725888 SHA256 0596532fa8cb78e59f685557474bd0ac5d00a79ac84c361ab93f079797a4041f SHA512 cb0cc3232304ef6efec5e01d3660cc649abb3e5803f17c82785b154b6f0b581889ea3b2dcf261be39b16ff22c912c34c7ec84c400856f5c4a29fbeaf7c49851d WHIRLPOOL 3421ea5aa5ed96a3d7b552fe74804bc3e7e822dd21623c0b36f7f84d7ad726fa57d0eb496e15d4ef9ea5027f0c247a3ba8ae7ae46118851c3f0ed13ec1cf482f
-DIST slime-2.11.tar.gz 1054516 SHA256 d63962c22f983a52519fb51b5ca28183aeb23ff6892804d02311e54d73ec8b2a SHA512 9507a4460a2f0d5b4f0857824fcaa36f6efeb09aebde7ca682bdc0214b6a722e471180c34ddce26a8f94d7cf3aae959954565ada314729e803d36767afc3e850 WHIRLPOOL 530c5b341f2ca4a95c954cea848c67cfd027345691feb9c246eb56ecaf6c420b642ed1991f1d615dabc0ca1f54bc6b28482e57c800498cf25a17ce39a7dc0ba3
-DIST slime-2.12.tar.gz 1057243 SHA256 29d57d1036abe69cb62809b5bb31d08c76c3e0e559b7e601b9d76fb7a554d53b SHA512 f18c79cba3eb75761982f2d1f163aab8213b77fa72a689d110fe91b1aa40953516566adc5f771638eee95d33ba8b4c8842ddf99738804483ccfb76a00290b2a1 WHIRLPOOL b0b78101f114514c16cba823dee02aac8a1fee74d23d5623838c2fdedaaa4fda953e6ee9bfcfcd6cf5a174d245f4ba801596c16e0bb67c1729d73a69d0ebc0b1
-DIST slime-2.15.tar.gz 1072190 SHA256 bad1851ce99b7f40b0593dc91842b261b526e0af797e660184159dda05355f50 SHA512 15f943981e35995b225b168a3d1c2099f7205c2ff359fa209f164464caf05f9fab4d24906442d94ddeb4222f7116d09a832c7377baf95fbe02d6a98a721fd611 WHIRLPOOL ff2d8f76314c111782f7c96c6e509197b0620149e683ebbc91714d77d6a0d4b52ba10dad5d8590b321de3867188997876b13fff533ca49361161b8fcff9a48d2
+DIST slime-2.0_p20101103-patches.tar.bz2 4730 BLAKE2B 536f0953d7bb772a7c020b6b3d43f5096faca94f5f6b507dd1ec18de3d1f6df42b172aec30b1cb7c1ee06034a86bda6d4af246de6ba98321dc0f8fc398b4ad6e SHA512 7990a3ffa4a5867fe84e326034aa794d3396dd2a74125e256be33524e2e737e052094fa11f2f486db34dc619e89e9343d4c5d2f84f3972139c2c7ac33248ce2c
+DIST slime-2.0_p20101103.tar.bz2 725888 BLAKE2B 6ab5ccc40fbe44839a24f2019ba982894932d7c2d0722b4881d0cb39bb0620009ce814026bb1dd85f637ef74f345df06aec456586f3f1d2f3a928c3c7e734825 SHA512 cb0cc3232304ef6efec5e01d3660cc649abb3e5803f17c82785b154b6f0b581889ea3b2dcf261be39b16ff22c912c34c7ec84c400856f5c4a29fbeaf7c49851d
+DIST slime-2.11.tar.gz 1054516 BLAKE2B ca86f2dcf4826fb491cb86321e1ac92cb6c7ffac115a8e6daf7d1ea61e1a6048c1f4cee132f87244a98878414f470d122980bddaf58290f105b8275a7484feb8 SHA512 9507a4460a2f0d5b4f0857824fcaa36f6efeb09aebde7ca682bdc0214b6a722e471180c34ddce26a8f94d7cf3aae959954565ada314729e803d36767afc3e850
+DIST slime-2.12.tar.gz 1057243 BLAKE2B 2b41fbef0fcc0588e56e187e849652a7671186a9dd231ed31c918039a16f1cce2feff20ae570ed02aec79b57e1809635946df85b945a6690232a2f609ee5afca SHA512 f18c79cba3eb75761982f2d1f163aab8213b77fa72a689d110fe91b1aa40953516566adc5f771638eee95d33ba8b4c8842ddf99738804483ccfb76a00290b2a1
+DIST slime-2.15.tar.gz 1072190 BLAKE2B 7623d2d109486e35cb94a3bd8a6b72008c28fbc0bac5bdbcde5fcde19b2ebc74d488a6ff67f026922ea716e67ac732cc72f7b984cc4c2574f57323db93de300c SHA512 15f943981e35995b225b168a3d1c2099f7205c2ff359fa209f164464caf05f9fab4d24906442d94ddeb4222f7116d09a832c7377baf95fbe02d6a98a721fd611
diff --git a/app-emacs/sml-mode/Manifest b/app-emacs/sml-mode/Manifest
index 54ee5f321f05..983136bf9252 100644
--- a/app-emacs/sml-mode/Manifest
+++ b/app-emacs/sml-mode/Manifest
@@ -1 +1 @@
-DIST sml-mode-6.4.el.xz 20512 SHA256 ce524bd955fe3bd7e548e00ea4f568fd2b045f635268a086167b86a5d3760efe SHA512 238c69cf34bdd9b825fdc00e65741a458e64bf4bf38ed96ba0518154dd92f25877d56d09f4c13271577ea8641ca828023db950db07a42fe1a02659527b65cb5b WHIRLPOOL 16c534d6aa9e354804ab74717bdd9872dea8d67645ec541ba230b4cc7cea0a79c376ef9067ad4e9d6b1e0aaa56d47cc47329081293c4f2f519bb4e2c6f2d9f2b
+DIST sml-mode-6.4.el.xz 20512 BLAKE2B ec82b44e7e1ff9d4c89ffdec6d29afddb2bb5a62474dfef417409496fd374373aca53f3a850990972e888ec2dc006606a06c63e327316e28552273d7995cd38e SHA512 238c69cf34bdd9b825fdc00e65741a458e64bf4bf38ed96ba0518154dd92f25877d56d09f4c13271577ea8641ca828023db950db07a42fe1a02659527b65cb5b
diff --git a/app-emacs/sokoban/Manifest b/app-emacs/sokoban/Manifest
index b0e5679da1f1..cf3b6783d46e 100644
--- a/app-emacs/sokoban/Manifest
+++ b/app-emacs/sokoban/Manifest
@@ -1 +1 @@
-DIST sokoban-1.4.tar 61440 SHA256 8127798c25bb19ae8d9a4d8d9d3e24b43a5a1ec45b0c79f1003a66991157d3f9 SHA512 8c04f509013e1d8f6e8cc1e182ec253fc84870e5733623038ea03f2447952dcbc77236c64b158ea4e4613dafce192f2c4b50aac3e1e219a049a6a951a44a7ac1 WHIRLPOOL ca5cde6a3418a05c289b03352add8a9c615381c93e2ec13238e2955de8b3c06267ac351c873cdc0eba1abdc125d02d57275a72d1f4a1b4318434d437ec737e2f
+DIST sokoban-1.4.tar 61440 BLAKE2B b0348084517e4fddfe5adffc6fac3020bc7147983733354fe18bbe90bdd49e620dfb392385c0dbb7ffed47bfd05d6b9b28cdf1bd81cc182fde83b243d33b6415 SHA512 8c04f509013e1d8f6e8cc1e182ec253fc84870e5733623038ea03f2447952dcbc77236c64b158ea4e4613dafce192f2c4b50aac3e1e219a049a6a951a44a7ac1
diff --git a/app-emacs/ssh/Manifest b/app-emacs/ssh/Manifest
index 9606c6656b72..d86f22c61937 100644
--- a/app-emacs/ssh/Manifest
+++ b/app-emacs/ssh/Manifest
@@ -1 +1 @@
-DIST ssh-20120709.el.xz 4876 SHA256 7e3553c4d19c695c6955f89f62991a4a019e78504318956321f8771f9d615910 SHA512 69048f160bdd1b8ca29f0d49734cff7f9c4360ca9dd2abdacfcbca61bb964e84c962bf6388f424c0eb0161f1e8c8c9787dafebc084826b27d94300fba475ab9c WHIRLPOOL 81af759215bf637099aff22685abdae08241dcb37eb2e2eb61a523d94e079b7d3fa511d10f1bb305b059041e2f6a8cbd9288f7cc949fd51e9df15cb40681fa50
+DIST ssh-20120709.el.xz 4876 BLAKE2B f4b5d0c1c7f4bc7818b70b9f4c177169fb3e0bc759eba28d64c2c6e614516822f1803a85d38f02c60cda35ba4b33e35013b0a93f2d44e9a776abcf64e1f19f30 SHA512 69048f160bdd1b8ca29f0d49734cff7f9c4360ca9dd2abdacfcbca61bb964e84c962bf6388f424c0eb0161f1e8c8c9787dafebc084826b27d94300fba475ab9c
diff --git a/app-emacs/stripes/Manifest b/app-emacs/stripes/Manifest
index 7c8a42154a25..eb6e484602e3 100644
--- a/app-emacs/stripes/Manifest
+++ b/app-emacs/stripes/Manifest
@@ -1 +1 @@
-DIST stripes-0.2.tar.gz 2203 SHA256 578f9be672e457652ea41e5af3c44c8eb679024f2c90c324fc02e56448d9c83a SHA512 c0e0d7c16f6d593221573268e8ec30f30374a6c4ad6e34458139de90f5cde12cdb02b81e91f40176ea10a9e411921bdeb324eb0bc6aa5f2874602bf38bdf9521 WHIRLPOOL a11659ddf2fb46418b8b5659ea60f745ae76f35886576142c44bf25a96b963a2a679ba65e248d58c6d36166bb4f1f637ea5ce6e831fd0507015524d330f75331
+DIST stripes-0.2.tar.gz 2203 BLAKE2B 4daec93d681bd2cb7187b427c13b27990e03bdb34b6131cda3b8d88bd48cdece57d53dd9f124c0f65e2869045e69ca8c98e39cc03b3a6c75f5b1ca359a12582f SHA512 c0e0d7c16f6d593221573268e8ec30f30374a6c4ad6e34458139de90f5cde12cdb02b81e91f40176ea10a9e411921bdeb324eb0bc6aa5f2874602bf38bdf9521
diff --git a/app-emacs/sumibi/Manifest b/app-emacs/sumibi/Manifest
index 98f41a4334d6..eef5a3f6a74f 100644
--- a/app-emacs/sumibi/Manifest
+++ b/app-emacs/sumibi/Manifest
@@ -1 +1 @@
-DIST sumibi-0.5.2.tar.gz 26755 SHA256 345d956a537f56f36139e679e61f18c316908f92d21e31ad5042a92466066fbc SHA512 b630be8b7c73ba5e0babc2c2946ddb05019fa15b0a8aaf5b578c97de32094de174d6ced9c0168b2e802e35e2b30b4a02501a0d8c41b90a8f8bb4a85fe501cff3 WHIRLPOOL eecee77c92267178da091433158d3f991b9aaa42160589b209d4ef3a945a5eabf6434c4fccb9d8e6aa8ce8cef03fbc4f73654d183d64aa39b1716c8d88739fdd
+DIST sumibi-0.5.2.tar.gz 26755 BLAKE2B 329c094ed118e9dc53af1fb77fa31f8db5b97d69ac39fb0eaba99eeeeb8ab4588b1f9e232145a3c377fcf38bbaced605e86dd8c1ccb078969762d475d9cff7b7 SHA512 b630be8b7c73ba5e0babc2c2946ddb05019fa15b0a8aaf5b578c97de32094de174d6ced9c0168b2e802e35e2b30b4a02501a0d8c41b90a8f8bb4a85fe501cff3
diff --git a/app-emacs/tdtd/Manifest b/app-emacs/tdtd/Manifest
index 92fb5f6f9332..055fd776af5f 100644
--- a/app-emacs/tdtd/Manifest
+++ b/app-emacs/tdtd/Manifest
@@ -1 +1 @@
-DIST tdtd071.zip 37673 SHA256 1e4a3b499187ef92b186d5cffa161f3377a9ee7bb44f3e9f5eafaa72cf862844 SHA512 3de529178718352bc437a3e91d3102990a88314d1dc5ad3d3120c6dfcbb1aef008edc00e46ee051fd5c968c698230393a301dd645484aa748b5b982df84e0556 WHIRLPOOL dca2378f48785c7de643791090f9724aa62ddbe16900cfdd50a53da95dcc42304b174ea3c4ebf10d069d373053f0587bf83d8c423b6ffe72bcc2cb3b5019aacd
+DIST tdtd071.zip 37673 BLAKE2B 0bc5be6e8c9050a06b233b1645fe3bb3ad9bb89ba087309d75afd63af28ce1d4873c88447fcd6e654f50728682d5156e1a795865f11f5e2e54607e630687ed0a SHA512 3de529178718352bc437a3e91d3102990a88314d1dc5ad3d3120c6dfcbb1aef008edc00e46ee051fd5c968c698230393a301dd645484aa748b5b982df84e0556
diff --git a/app-emacs/teco/Manifest b/app-emacs/teco/Manifest
index 7d6e9564ab6c..2f8cdfdfa3fe 100644
--- a/app-emacs/teco/Manifest
+++ b/app-emacs/teco/Manifest
@@ -1 +1 @@
-DIST teco-7.el.bz2 16372 SHA256 28c04c00f36bc04ffd31291fa2718538a549a5d86dc372a427fba60b40801570 SHA512 7fb050d2d12aadeccc18d852b4191493be301c90ac5426ee4f985a89eba62f9b57d263a2156d5252e88d06bbe68508aca2bebeca65402ff9e8f00937f5189feb WHIRLPOOL 97aea17fe808c44a42cf24485a5f738103e46ee6fc3da86fadde40134f93894639068092a5298d2266a2ca184a11c890f64ef98d282fcfc5a163e88c8bd4c19b
+DIST teco-7.el.bz2 16372 BLAKE2B c5608c1546262b9dcb52e0c5f1e41c87e94f142a96e8ce1262201b00672d810c925c20090c36edc596e0fb362265e72861f4bc214cb13ed94fa71b586bc4f45d SHA512 7fb050d2d12aadeccc18d852b4191493be301c90ac5426ee4f985a89eba62f9b57d263a2156d5252e88d06bbe68508aca2bebeca65402ff9e8f00937f5189feb
diff --git a/app-emacs/template/Manifest b/app-emacs/template/Manifest
index 69101a66716e..4b0dfa97b7ca 100644
--- a/app-emacs/template/Manifest
+++ b/app-emacs/template/Manifest
@@ -1 +1 @@
-DIST template-3.1c.tar.gz 37903 SHA256 d71885ec8d230a5a7cc909f052b97ed7cc30423ca0e2647392424dfd10459845 SHA512 d9fee39b67ff986d7c2dccbd09af3ce208f0e1a616a406fefefe4a6399f69a3527fa5609e87d41f7ceec5bf95818a62cb8da62994b28945998f8a9074821914c WHIRLPOOL 57043085455aefc5a378fa0d48525d823345932d67c34ceee1c5106481d468c1e9fb8559d511f4184d326e71bd46b9416d92f0c080de04607f559da34c163683
+DIST template-3.1c.tar.gz 37903 BLAKE2B c6bcd602727d6a6bd60c1b26694b98b28f4f7c752c8c31cd2ad9359297265579b1317effadad956e5aba455b22714985367e84f3295528a1dcc09ff50bf9882d SHA512 d9fee39b67ff986d7c2dccbd09af3ce208f0e1a616a406fefefe4a6399f69a3527fa5609e87d41f7ceec5bf95818a62cb8da62994b28945998f8a9074821914c
diff --git a/app-emacs/tempo-snippets/Manifest b/app-emacs/tempo-snippets/Manifest
index 2c393d7c6738..e2347ad4b5ad 100644
--- a/app-emacs/tempo-snippets/Manifest
+++ b/app-emacs/tempo-snippets/Manifest
@@ -1 +1 @@
-DIST tempo-snippets-0.1.5.el.bz2 5369 SHA256 fba98dfe5f8c37fd9367a8ec26cebfb09c483a8667c5f1a29d22c51dabcbd573 SHA512 77b739d3c9def0abc422daee372cdf5602ed79b7cb154125a0aa3ca99e24b025c070fbb8439638ce35849243efadc9cddf187debc53905242ab417ec79acacec WHIRLPOOL e568081d78e53c80dbc80903fd6a282eb618e2613c36ca7942025ec9414acc69b4de760285c1e37fe588d145905cbead2ec72f553ca562f10a8ad767f36439de
+DIST tempo-snippets-0.1.5.el.bz2 5369 BLAKE2B d58073b1cd6585b76388f89470a0e5272e1f686a456ca7a7b7ae69e4a8aba81414c70c443be209eacd3b1404b21227330618e74c9f2f0056ba11b22933b6744c SHA512 77b739d3c9def0abc422daee372cdf5602ed79b7cb154125a0aa3ca99e24b025c070fbb8439638ce35849243efadc9cddf187debc53905242ab417ec79acacec
diff --git a/app-emacs/thinks/Manifest b/app-emacs/thinks/Manifest
index c79ca2f88015..25cf1ce85cd9 100644
--- a/app-emacs/thinks/Manifest
+++ b/app-emacs/thinks/Manifest
@@ -1 +1 @@
-DIST thinks-1.9.el.bz2 2989 SHA256 fe51755231be601686a10901af276de9d746ef71b57b0954a21f0e9a98b35d38 SHA512 ba85485df0decb2825a832b60b01a4ae8ef2e32dc356d16b770a4b59a795e138f3c26e14d8eb27e97038d10d2633945c7b2bd14933fdf7815f6c0abc07de5802 WHIRLPOOL 32981107e64cd04aafe8d52ef2bf4a2b3ab2b5589514591437b0422a82ae7fd7e2ab92955a4ecccf58769858fbe0e37765c63db1304acd2fd54fe03a67df0f49
+DIST thinks-1.9.el.bz2 2989 BLAKE2B 91fd4fe2b004625f758f0a3941228c0db6de37c637fcbf0456060e2a2f6e9c3618f6a815d9c649a87da286745f4831df21ebf225947d926f89ae20c49e3e8403 SHA512 ba85485df0decb2825a832b60b01a4ae8ef2e32dc356d16b770a4b59a795e138f3c26e14d8eb27e97038d10d2633945c7b2bd14933fdf7815f6c0abc07de5802
diff --git a/app-emacs/thumbs/Manifest b/app-emacs/thumbs/Manifest
index d92efde82d6f..955f5c16272c 100644
--- a/app-emacs/thumbs/Manifest
+++ b/app-emacs/thumbs/Manifest
@@ -1 +1 @@
-DIST thumbs-2.0.el.bz2 6521 SHA256 e7f788f4e19c21b535024cdc49185e922fe91e39f7502486cca09a0125bb6935 SHA512 d4bca861ed5db620a2319659e255bef14241a68067be994402d2d36bb7fe34ab5a22b6b76dea5631aa5288d03caadb3a8163a8ecf439144d8d50cc410cfe078d WHIRLPOOL 3fd85cff14a9e40cf657994c9d44b337ad525dcf13ddede1a2d9262fe249ccfc126d702ee67b2c809bf1a25dc7764d6bc2f447b168abea1e967c0d595bd48573
+DIST thumbs-2.0.el.bz2 6521 BLAKE2B f37154658fdc660698a28ac01d0b266ff6cc4f86f30d93a9e0929e565a6666ccd168d861122d5ff893073f9aaa4a3c7412a3f96758b044faad11f13ec7000533 SHA512 d4bca861ed5db620a2319659e255bef14241a68067be994402d2d36bb7fe34ab5a22b6b76dea5631aa5288d03caadb3a8163a8ecf439144d8d50cc410cfe078d
diff --git a/app-emacs/tuareg-mode/Manifest b/app-emacs/tuareg-mode/Manifest
index bb85e57b1b3c..833e07679e33 100644
--- a/app-emacs/tuareg-mode/Manifest
+++ b/app-emacs/tuareg-mode/Manifest
@@ -1,3 +1,3 @@
-DIST tuareg-2.0.7.tar.gz 57999 SHA256 7ba8016cdd2195d37ccc1c0e300323f807b8bdc6d3ce9e622ae9a36355d3a9c9 SHA512 6cf290879dd9b7993a046dbebb9944a245fa82d1e7849b46f477b7217b46026ce5195e40e4d9b990e047a03680197827334e6d54d82610da6fc2e62386357d42 WHIRLPOOL 19b6c8fb7e7b6427499aa7aec0b22e0152ca35e93c042c2f3e4a760a76ba4c89c7951df25a128414a2f7df5aee7d76aea255c0b235065c9dcae4e62ed3c05c86
-DIST tuareg-2.0.8.tar.gz 57777 SHA256 13da95153d6d50ef697878c45d81302340f97a42ab14112c61b8c6b0e891512c SHA512 c9e268eb550fd36614e6632335b623a0916d64dd84a0259fd83c6f08e3138196d3871bc7664d6debe62732d4459130ef1e9271b24982138ff69d90442d031990 WHIRLPOOL 08e5f39111e8770ee1e4c8d0fe5104b20a3bcf89bb08a7acac0758d7933243cc55f6933e838c85aae2dadd1836301d3e9988fe38f7863fbe39410f879d17a67e
-DIST tuareg-mode-2.0.10.tar.gz 102576 SHA256 f83438208fa4f0e93e662620fb6c939e272041ba6b32cf28397618cd28ab5ae4 SHA512 53bdc3b2b78bcf7e6b075932b9319f9d08b02b4b3fd74fc9aa30b390b30e4069e19e09e0fbb03fb11877e6d89649b8e59c645cc8de196115c1bbdab308145743 WHIRLPOOL 1a48ec2ecc9ab7d4203860cbf1dc00d64b80082014d3053db686097ca1f7ef1d2cb311976b2b3a0bd58704ab5f8734b33ee781de3bf57ee2323ea54c2286318a
+DIST tuareg-2.0.7.tar.gz 57999 BLAKE2B 12649da41c8bbc547d28fe391cec51ca552dd66bb1fbf052a9d44d693b9df45ac6dc10336e146109248b130ea7ba94f7097398b598f3a7eb113b0031eea83486 SHA512 6cf290879dd9b7993a046dbebb9944a245fa82d1e7849b46f477b7217b46026ce5195e40e4d9b990e047a03680197827334e6d54d82610da6fc2e62386357d42
+DIST tuareg-2.0.8.tar.gz 57777 BLAKE2B 38d401319640ab4e691ccdbbca03c95b3bd03189aa2399a7258cfcd6660b0c30e7931072ec791ae000ceb228bb8195bd96c6b681a53e3c4cbb861037ab0f7678 SHA512 c9e268eb550fd36614e6632335b623a0916d64dd84a0259fd83c6f08e3138196d3871bc7664d6debe62732d4459130ef1e9271b24982138ff69d90442d031990
+DIST tuareg-mode-2.0.10.tar.gz 102576 BLAKE2B fac81b5f43dc9143a62fe7ebf5d35bc44994db3a155b780329339b73b087cf53e63aa15b7e817388a92f1effcc08febc617747b242d57d5e900b20fe100a8f03 SHA512 53bdc3b2b78bcf7e6b075932b9319f9d08b02b4b3fd74fc9aa30b390b30e4069e19e09e0fbb03fb11877e6d89649b8e59c645cc8de196115c1bbdab308145743
diff --git a/app-emacs/twittering-mode/Manifest b/app-emacs/twittering-mode/Manifest
index 173bf340891c..a3f34a702e9e 100644
--- a/app-emacs/twittering-mode/Manifest
+++ b/app-emacs/twittering-mode/Manifest
@@ -1,2 +1,2 @@
-DIST twittering-mode-2.0.0.tar.gz 615223 SHA256 164f6c46eae1e8ac65c60bdd40fb315df0044a5819ef25ce5ebc639b2b4ac1cd SHA512 318768c54c99c03c7641bfeb8396fdcaf65752121da6a64e6af9c071b6c429f73e44d1698df600915c4c7042233ef96cf86c037eece21b00d8e52a01ae569601 WHIRLPOOL 4b686e543a3b9ba0bc176141f6f6908a02cbd4c81984c5518092d489613595697d6bed1c7abc29675fcaa50b8fb961c413da5f69ee4640072b8755a8d81b5817
-DIST twittering-mode-3.0.0.tar.gz 1363235 SHA256 4848c4df0aad547d77412d04ad5f2c5c690a853cc39605a0a220fdfe828e350a SHA512 c696a8f31abcf6944c127575719d3e9b24a2bfb6271e0193e2a6faa8137c6468c7686b88d1e4ec0c3cc3b833e26853b435726d1acb422e9f37d3c0334e278494 WHIRLPOOL f926861a842bd1325f103ae2f0178b543e6a3c8cc366fbbbaf71005d200927c9d9286edd302517897099020e30708f835e97483723fb20023714f168e606b7c8
+DIST twittering-mode-2.0.0.tar.gz 615223 BLAKE2B 1fc5ceb440ac9a00dde4d49cd48580d3e8f78ed2e9bccb8b2dcf41c6be1c7e0394c8db958e6ab4ac632b91bbdfc9a0930ad3867584d642b3f90b15a7bc0132d5 SHA512 318768c54c99c03c7641bfeb8396fdcaf65752121da6a64e6af9c071b6c429f73e44d1698df600915c4c7042233ef96cf86c037eece21b00d8e52a01ae569601
+DIST twittering-mode-3.0.0.tar.gz 1363235 BLAKE2B 31801fcb339cab42c7b9a9bfb186ef6a21570be16dd90d36baaabe97ec9fc93bdc35ead707e366e7262347158da145c04a6f51340abd3386b8c2a9fd8b5d417b SHA512 c696a8f31abcf6944c127575719d3e9b24a2bfb6271e0193e2a6faa8137c6468c7686b88d1e4ec0c3cc3b833e26853b435726d1acb422e9f37d3c0334e278494
diff --git a/app-emacs/typing/Manifest b/app-emacs/typing/Manifest
index 512973ddd110..dc5aab4ab167 100644
--- a/app-emacs/typing/Manifest
+++ b/app-emacs/typing/Manifest
@@ -1 +1 @@
-DIST typing-1.1.4.el.xz 5092 SHA256 6f1c812481f21f610599e446ed408b28cb450b9c9a6923e06bbb73bffc13602a SHA512 9033b4ca2d23de98f8721796c708392b97d49b6719544ad4ee6d73f11ef253600d9c2a0d2b8ea89ef58355d1bfa36244ccd527994170ae0f43404c6ac19b62f3 WHIRLPOOL 2b7be549c67b55e9974e1fa40af0364c0554b8bf672225d2be3f43fc04a7f315907f3b54d2d732bcd04c68fcf894af33a9ce2c6a01660446189386b65ea92b09
+DIST typing-1.1.4.el.xz 5092 BLAKE2B 4126cc2ff0666688cdd80b4ed83675a62ed089fa69fb7a780ee58485d1832d8cbf039b0dec2d1ebcae5f71b156a5fb485c930452dcc5b27d6513c10155ed99b2 SHA512 9033b4ca2d23de98f8721796c708392b97d49b6719544ad4ee6d73f11ef253600d9c2a0d2b8ea89ef58355d1bfa36244ccd527994170ae0f43404c6ac19b62f3
diff --git a/app-emacs/uboat/Manifest b/app-emacs/uboat/Manifest
index 0985b267e268..e656a5a32eaf 100644
--- a/app-emacs/uboat/Manifest
+++ b/app-emacs/uboat/Manifest
@@ -1 +1 @@
-DIST uboat-1.2.tar.bz2 1978 SHA256 c00a7b6f293358d3daed9db306473a51f9a79270dd2c114167aef04058675a62 SHA512 f77de2c0859a5eb8c09f03aea5be068e2f61f96e10c72d9f18ec6c3fdcc19ab7ca62d606d06aa669b07a89e9f677f5bcb6d3e211b7b7710840cacf9d4f3e307c WHIRLPOOL d4d3f3128fc52203642bcc1f5180c49f610a1865f10c1934a0af116408062c92e73dff0081cbd4c90c4b0a2a4ebeab5cafc6bf0914896fd7bf899d15dbcef3b2
+DIST uboat-1.2.tar.bz2 1978 BLAKE2B c40c054863d5d13a415355144d216bb03e34205ba65853669758d8e2c44de34534a8460f1c5f6a4dd25543e9d2d0c2f3df5ec3b7146348b616ed2a88ca6b5cd6 SHA512 f77de2c0859a5eb8c09f03aea5be068e2f61f96e10c72d9f18ec6c3fdcc19ab7ca62d606d06aa669b07a89e9f677f5bcb6d3e211b7b7710840cacf9d4f3e307c
diff --git a/app-emacs/undo-tree/Manifest b/app-emacs/undo-tree/Manifest
index 7d04bd7b61c8..68dd11aa666f 100644
--- a/app-emacs/undo-tree/Manifest
+++ b/app-emacs/undo-tree/Manifest
@@ -1,2 +1,2 @@
-DIST undo-tree-0.5.2.el.bz2 27985 SHA256 35b3bef32c39a99656fb46d9ca7b2eccde4287ca2d226a93c90d8fd12f5354dc SHA512 62b355cbebd4e17a59b70acdae69bdddc9a6fd57d5c684d0560eb03dfac69121bc63941ef6520853b174a6de0a5ae54dc4f240a55f0623312a86e799ea3785d0 WHIRLPOOL 41aef615a8aadd29b5012bf3b3adbdbffdee75d0ce8fa1b50fa78371ed2c2a40ae932e8f50fe870be5541ae2e67f2271071645623589587b36b42533856823c3
-DIST undo-tree-0.6.4.el.xz 31124 SHA256 1d84f368a2a4c60c4f2d05e30c61bfa01a7f0804dab6eeb5744e1cc1ee400183 SHA512 e7017b23cceaf544de855bb21059959df539f5380db9c15b62f171d037b6ebb2d31f86f7ab3b724b048dafddfc3d2ace65dfac84c3eb0f6847489afb7f4b99cc WHIRLPOOL 949d6403a568e161ab09db0ab8974cdcc58f0e93bb4f1f3c48e897a57d6d20193644433ca7a3352462d0a0b70545eb6e7e52c163dac3a20f5c536a23df5d882a
+DIST undo-tree-0.5.2.el.bz2 27985 BLAKE2B a9c4fe9a1cf245278f88df97d6269c81a3ebae9d10a62b8390805c06636516fb7163dc5b4cfc81463e0b45f9cd04664b8aa5c86c3ebb56a7f07e86ee45f0305c SHA512 62b355cbebd4e17a59b70acdae69bdddc9a6fd57d5c684d0560eb03dfac69121bc63941ef6520853b174a6de0a5ae54dc4f240a55f0623312a86e799ea3785d0
+DIST undo-tree-0.6.4.el.xz 31124 BLAKE2B a81bb93489189d04ea81b98912fef6b7a6903f24548dcf9a9f44decc77e3219dd233d2d91c1c6c32047565297aa8583c09dc451ca060a10b52fc7b4e85d32b2d SHA512 e7017b23cceaf544de855bb21059959df539f5380db9c15b62f171d037b6ebb2d31f86f7ab3b724b048dafddfc3d2ace65dfac84c3eb0f6847489afb7f4b99cc
diff --git a/app-emacs/uptimes/Manifest b/app-emacs/uptimes/Manifest
index f14b0cea8950..fc5ae50f32d3 100644
--- a/app-emacs/uptimes/Manifest
+++ b/app-emacs/uptimes/Manifest
@@ -1 +1 @@
-DIST uptimes-2.3.tar.bz2 3637 SHA256 7cbf6843f3fafbb0e89ce4dd05241a021381270efc67f127012a9e25c700d423 SHA512 31a8e4da410c1c02e96b3aa910fb3afe99c924af0f8299465e1c1b4b22e925aeb427b1ad349df459f93d2efd8bbf66804186f26486957d9e8196eda1b50eb5ba WHIRLPOOL 71aea7b2bb4c1756ded2decacf558a957b542de8f4faf22d66575a9c13efc7d971f1887e715e4b469ad734fd40456343ed43e4adb9dad64806ca0d5790bbbdf4
+DIST uptimes-2.3.tar.bz2 3637 BLAKE2B 75517032993f8192c4985d6bb5793b90c828565495a4471845e3efb6fa939268c7b94751baa6b85f5462cfb2a944ea4f4904a75b950a071c0840bb21313bb751 SHA512 31a8e4da410c1c02e96b3aa910fb3afe99c924af0f8299465e1c1b4b22e925aeb427b1ad349df459f93d2efd8bbf66804186f26486957d9e8196eda1b50eb5ba
diff --git a/app-emacs/vhdl-mode/Manifest b/app-emacs/vhdl-mode/Manifest
index 00758b4bdc06..812e45a6fd7c 100644
--- a/app-emacs/vhdl-mode/Manifest
+++ b/app-emacs/vhdl-mode/Manifest
@@ -1,3 +1,3 @@
-DIST vhdl-mode-3.34.2.tar.gz 313856 SHA256 83f5fdb56652bc328698584cf2cbd80f09f9b901e7085dc0a181bcaf6984431c SHA512 38b3275fd4d92966bc806e16362bfea3d3ed8789330ba891fa0c149633d938abb1c8ea32085dd0b06a17fdd98a645121a5fe60a8c4c5fd3261d1f45d14ee4a6f WHIRLPOOL 23df41f11a0fb2df36333b39f83d3f54bd9e5066a83fdeef6b5416af0ac91e23c32759a3779a42c70f1e3e31b4d7479fadd44af9d3eaf4bc05d3110925c51f7b
-DIST vhdl-mode-3.35.1.tar.gz 316090 SHA256 2947e298c50629cb668cd65ce6b60d5a4c09ddc0d55114a166561ccf9c6b5655 SHA512 963d4c8c938c9c9279a7ab862da6fc91257ab270e8eefb185d73b9c9217c4cc7b7330f2b33300bb7b604ed348543621d8371685e7e4a8f29d596e76ce8795f1c WHIRLPOOL 58de56ccb64bcc521194e372d995636b837a4d4f54b861501c5379afb7a8df711f3744a872acdce509b4a08aab7560d56893ae07b2370da29a79968f86f5ce69
-DIST vhdl-mode-3.38.1.tar.gz 318400 SHA256 bc2a87a0a176e2639fe1e2ad08c9cfde27f8b87b347b1102a78a482407b50307 SHA512 2cc12994e17658d65cffa348c59ac3208cc0f498731941b8f64da68e258ca57d6aa500d72103b005996cf3496e119cf59b52bbc1c4b740401685030b42f272a8 WHIRLPOOL a60a529d8b29a70beaeb470a6e414f2ce37b8c2366883ce94eb5acf24ec390c995f7bdb18cbcf803a3f9bd5efbd5e0a8fc442a21343c4ff787dc95f3be7aa680
+DIST vhdl-mode-3.34.2.tar.gz 313856 BLAKE2B e4c685b0e9d616bc242e02d6ad17dec56feba580c11763d522f336c96b0ff09a740bf37ce5473437175e111d6b64b9b8e5612d70f9d2823a5e17b484ef54b0ec SHA512 38b3275fd4d92966bc806e16362bfea3d3ed8789330ba891fa0c149633d938abb1c8ea32085dd0b06a17fdd98a645121a5fe60a8c4c5fd3261d1f45d14ee4a6f
+DIST vhdl-mode-3.35.1.tar.gz 316090 BLAKE2B 5517c7881fc52df631d3efeb82e88d0b5db7038575eb378e241d062c4746d810ab308005b24570725ab244d1d3229b69896f8821944b15664561a38d828f4ae3 SHA512 963d4c8c938c9c9279a7ab862da6fc91257ab270e8eefb185d73b9c9217c4cc7b7330f2b33300bb7b604ed348543621d8371685e7e4a8f29d596e76ce8795f1c
+DIST vhdl-mode-3.38.1.tar.gz 318400 BLAKE2B 2ddad9f4e8fdb0fafd2e27075f5722fcf7959a2b50ad61c5860af52706d9579065e0880d7b9bd1b884c21cfc902760dff006404490c8cbb1474831aa4c6d841d SHA512 2cc12994e17658d65cffa348c59ac3208cc0f498731941b8f64da68e258ca57d6aa500d72103b005996cf3496e119cf59b52bbc1c4b740401685030b42f272a8
diff --git a/app-emacs/visual-basic-mode/Manifest b/app-emacs/visual-basic-mode/Manifest
index 36fa354843ad..f0e1c05897f9 100644
--- a/app-emacs/visual-basic-mode/Manifest
+++ b/app-emacs/visual-basic-mode/Manifest
@@ -1 +1 @@
-DIST visual-basic-mode-1.4.12.el.xz 16872 SHA256 c25a800f09748359d700acb61c64955474e9d63842193d70f18a54960f816ed3 SHA512 ef8fdb883dbaa957d1d7526e0548611f755a7d3700a62d32790aafc0e25d97b3f6784969b584dcdda39da681b4e59253daff217bde5a783b923257e77e9549ca WHIRLPOOL 92b3f239d6758100b1e2ec4d3a763830a8f5fdb284bd2c8041391c30b5db885f74a09b85de66a4fefe790c4dfc3759d2133d0a5ecb30a4d6a5c1e36a31eaab93
+DIST visual-basic-mode-1.4.12.el.xz 16872 BLAKE2B 849a639dc54bf595541256424e26b6a157f2b75ab3c9fab8c6d7000d9abda6b9b979b51d06e81ff6a276353709aec5f4608e9806233560fcd4cdbdeff2e359f6 SHA512 ef8fdb883dbaa957d1d7526e0548611f755a7d3700a62d32790aafc0e25d97b3f6784969b584dcdda39da681b4e59253daff217bde5a783b923257e77e9549ca
diff --git a/app-emacs/vm/Manifest b/app-emacs/vm/Manifest
index 9eb4077e349c..42b74a039a96 100644
--- a/app-emacs/vm/Manifest
+++ b/app-emacs/vm/Manifest
@@ -1,2 +1,2 @@
-DIST vm-8.1.2.tgz 703527 SHA256 c779f65d422ea169a1030b1c86c72e8b6f8e6c589396331c4688d8e1d0814636 SHA512 6b879e237d6509ecd95aff3fb5e26018cb38dd19b29a57545bd28b0ca45961a7106cefd6fdd42e123119ac465a4b9ef66b683c47a9f1d9ac683a954b484a0ff4 WHIRLPOOL 2c459cadc4944ee8e5719cfe5d5b5edda281e58edd13ce697748b3b2da2bb6d085b5473c069da3521618ad86a7239e0cfd8b65ecccc63b6e64665aaa37bcea8f
-DIST vm-8.2.0b.tgz 839789 SHA256 6945821a521844a429ae3d0e25db69755185fa848343fdc3c754ab16344d2a12 SHA512 37b642975e8fe7e350c0a648f83608b28d8616417d376d9888c89b37c90d8bdb3c91cdc4c91a0f5072d29ac81bfea3d88f9b36699379bf8a5bdd15dd5a70858d WHIRLPOOL c35abe4d3ae3e9470733d761b3f6b8087dbda19b68cc99ed73b7d489e218e6fa257defccca72ed1b242d447ee43041da9bd8a3482d5b8df3893d5c81203d1578
+DIST vm-8.1.2.tgz 703527 BLAKE2B 34b6326363893b830d76a48dc6e103100d8da6891392926d21eff00bb25217af58eb6f161ba38e99becc31f6bf1496eb75fb71709b57b08cd247fa1b28543a1b SHA512 6b879e237d6509ecd95aff3fb5e26018cb38dd19b29a57545bd28b0ca45961a7106cefd6fdd42e123119ac465a4b9ef66b683c47a9f1d9ac683a954b484a0ff4
+DIST vm-8.2.0b.tgz 839789 BLAKE2B fc032e0a6259d2397d80cc80fbb7cf5845e43a228124f867402738a9123c78c798822d8d9c8edbdb823bfe3bce946d53afb6cd24e02d28925a51d458cf21eedf SHA512 37b642975e8fe7e350c0a648f83608b28d8616417d376d9888c89b37c90d8bdb3c91cdc4c91a0f5072d29ac81bfea3d88f9b36699379bf8a5bdd15dd5a70858d
diff --git a/app-emacs/volume/Manifest b/app-emacs/volume/Manifest
index 05bba8b81cad..ccfff2d77811 100644
--- a/app-emacs/volume/Manifest
+++ b/app-emacs/volume/Manifest
@@ -1 +1 @@
-DIST volume-1.0.el.bz2 8044 SHA256 e5756c21695d4142259e56aebf5001ff3b469a6ef6453c3fb4af21768a58e588 SHA512 32672ef525571bc022d6c0f5f5f5f9d16bb5f57176e63a3dbaa67f41cef5a8bfef06468093c439601b2b3439f6e77e8e7e6d6c9245b18a77ebb409c64eece510 WHIRLPOOL 55a126c65d78cddd8cdc6ede360240a19d9e92b1c862840dcc9df59339fadd0b844457e5eb0aa7d0b34b506fc5c299038542df3d1e8629272ebd8e2d4cc9bd4a
+DIST volume-1.0.el.bz2 8044 BLAKE2B cdd914a25c137f28f9f26e88430ed6ce3be7b4788c9fcaa3e0246b7057233c78af80f33ce9b6fd778fac47c9de624707f169f6e2836b93aa2c30f8c25e88deef SHA512 32672ef525571bc022d6c0f5f5f5f9d16bb5f57176e63a3dbaa67f41cef5a8bfef06468093c439601b2b3439f6e77e8e7e6d6c9245b18a77ebb409c64eece510
diff --git a/app-emacs/w3mnav/Manifest b/app-emacs/w3mnav/Manifest
index c6cd1723666c..4812acc19fde 100644
--- a/app-emacs/w3mnav/Manifest
+++ b/app-emacs/w3mnav/Manifest
@@ -1 +1 @@
-DIST w3mnav-0.5.tar.gz 2378 SHA256 23ca6c96bd15e66c4311fd47fdc3e21671369a7e6fa7835ed6d7e895ff2f2581 SHA512 8b04d31307e6fccdfb0d5ebd9bc4c2b52d347c5c2c022ad9b3f342b4c2666858ac201e11acd7a15b77b22dbef287c0cf481119ea18443776b00e5b133431e723 WHIRLPOOL bfc79429c052df6dd5c0a13401453341c305703e648f8fdeef52495a3f42af0b80984a2de100f24dd908d6d29bd0ed00a7cfc74782531b5357b5b9e1d3159cdd
+DIST w3mnav-0.5.tar.gz 2378 BLAKE2B 548953415020f08b83f07447c09a7facd5e6ccc5aeb36cdda3718d2b9f17d7756514d650936a30fd9006bf9ad90021c5ff33e355918257f14054da63a1db3237 SHA512 8b04d31307e6fccdfb0d5ebd9bc4c2b52d347c5c2c022ad9b3f342b4c2666858ac201e11acd7a15b77b22dbef287c0cf481119ea18443776b00e5b133431e723
diff --git a/app-emacs/wanderlust/Manifest b/app-emacs/wanderlust/Manifest
index 90e01d0372da..194fa5238807 100644
--- a/app-emacs/wanderlust/Manifest
+++ b/app-emacs/wanderlust/Manifest
@@ -1,3 +1,3 @@
-DIST wanderlust-2.14.0-20050405.patch.gz 3926 SHA256 240f32ece554b2afe7142ea557b41d0eb9667b8003ca00d390abe62e4b68ce16 SHA512 103e8eda374eab453363f3a735d877e313ff341e09abd66093bd090b404738d42d98edf5d1c9c8e8966963bf972d462aebc28ea6e470126af9266188247c4044 WHIRLPOOL 22518205351c26fe38e4c734778a3754fced5309a21395bd471b82f76e19baddeb333561572b8b4be9d02d744c8d9f7212c97270167af463e983d336393b280b
-DIST wanderlust-2.15.9_p20130619.tar.xz 818124 SHA256 cabc2f1a025d6c93484bc60dcda0672a9a8eef6c2c1932a21cfa6f2e2f377bcb SHA512 91bdcc1b29370b7be7a2072f4d8c638b3c0604ba31b5419952b848af268e73a3f199f07a88caabec56f66b38013e0f9cd7c1de26b46d1062ddff782e8080d4e0 WHIRLPOOL 99eac7cb2a623389161dc1e9cc0883b89e92d411c93757180140d94c7ce352d0b76a392bdd4439f551ecc5bd934b70a15391df6a60103ad97f1b3fd63de6b95a
-DIST wl-2.14.0.tar.gz 1101505 SHA256 883b61e7e9560aff35efcf7d0d48b0ddd7cde598895ffd111ff214072253eb1f SHA512 edb49c0c9ddbd50cba4ce4cdd1b2d609cee9553d063aeb4775d0b43e0ed83cc6374aa47b11b3ff94a55827f7a9a29f7c1054e0fd9b3a5a25a2c410b241d268d2 WHIRLPOOL 14e3c879e98ffbe2ae7e4ed1b63328f1937b7ca31aebae500b1bf100a6ca5db78f72c87ecd2f0aa65d1e3468741d2753e0ac2ddc98d9108482935bef0590a03b
+DIST wanderlust-2.14.0-20050405.patch.gz 3926 BLAKE2B 0986f743e512cc7216554585c1c62af659fe35873bfcdfdb520e4085ec2606360ae1a29566ac756ad0e7f03cc51d1e5c0bd7460c8448ceb6251004d887858885 SHA512 103e8eda374eab453363f3a735d877e313ff341e09abd66093bd090b404738d42d98edf5d1c9c8e8966963bf972d462aebc28ea6e470126af9266188247c4044
+DIST wanderlust-2.15.9_p20130619.tar.xz 818124 BLAKE2B b6bbd6f63d862f81a5a0c194f0fe1b276303f75f8ffde29c844f1f7d2d8ef55f1c211ac1d0b6c3357c2507b2abe73ba1c4c8f5fc65e067d93eb6bf23fd8490a6 SHA512 91bdcc1b29370b7be7a2072f4d8c638b3c0604ba31b5419952b848af268e73a3f199f07a88caabec56f66b38013e0f9cd7c1de26b46d1062ddff782e8080d4e0
+DIST wl-2.14.0.tar.gz 1101505 BLAKE2B 5ceb3a8e294b230d48d50134e3dc07b9e19a9470907a488a2e41e53da54a8826a50cb53c06c5f3f1a5bdd1b5760bc6acd6cc75a25e63d092f1a9b80b3f073ed5 SHA512 edb49c0c9ddbd50cba4ce4cdd1b2d609cee9553d063aeb4775d0b43e0ed83cc6374aa47b11b3ff94a55827f7a9a29f7c1054e0fd9b3a5a25a2c410b241d268d2
diff --git a/app-emacs/websocket/Manifest b/app-emacs/websocket/Manifest
index 287b2c761ffe..1727892d8198 100644
--- a/app-emacs/websocket/Manifest
+++ b/app-emacs/websocket/Manifest
@@ -1 +1 @@
-DIST websocket-1.9.tar.gz 27029 SHA256 e7afbb5785e423e108119c9e625c9bab08297415224b07718f75ec6295130533 SHA512 bcd98e7edcbe95cae2f196cea05fd6cfa9083ed1ab2392530ca00cb05b87d6fa95b5f5319981fd94244b74989850c171e4c31c8758a8b7fe95d49299103a4410 WHIRLPOOL b0534b8c098569cebdf9ff597a459df7815f0e0a919c64fbbf4d8c64aa9789f0bbd585ca8adb139bb35254f29798e01e13eb417764a8bc0b1fbd20fa7ff564f7
+DIST websocket-1.9.tar.gz 27029 BLAKE2B 9a492beda1b7f7211d1a72b5af0cab445f0fa78439797f05b565a0421a798a4fe0c6fb0e24aac0454f5b48f8f536762d0fcc5d92c216bd6b83b6ac34a1e024a4 SHA512 bcd98e7edcbe95cae2f196cea05fd6cfa9083ed1ab2392530ca00cb05b87d6fa95b5f5319981fd94244b74989850c171e4c31c8758a8b7fe95d49299103a4410
diff --git a/app-emacs/wgrep/Manifest b/app-emacs/wgrep/Manifest
index ffa70b86401e..91b515c68e2b 100644
--- a/app-emacs/wgrep/Manifest
+++ b/app-emacs/wgrep/Manifest
@@ -1 +1 @@
-DIST wgrep-2.1.10.el.xz 8708 SHA256 fa45f5724abd200c432701423f373f8106cec88c939b590bace394ba1b0a7ada SHA512 39761964406d3eedca9253f2f29f81dd9ee71c4e049a985c236ada4dd9b70dc553bf1e9e94cb6d3c8749f065146e2759a46a6ac52ed8e5e5f046e196798bc681 WHIRLPOOL 11b806d10dc1f089c959808ee47a1cc07beba534bc7df8bd3cb9cc17aa4ad7b8ec7ac381de410d84ebf436cb31001e83bca3bbc911e0b8c981ed19dab46650d5
+DIST wgrep-2.1.10.el.xz 8708 BLAKE2B f3881a5b774dd9bad6169f5621d4da4662127892786e708d31815cba2ff2f5a75170863ca5882cef67efb8e27964cab4176eda7c7ca561888edeb590943ae573 SHA512 39761964406d3eedca9253f2f29f81dd9ee71c4e049a985c236ada4dd9b70dc553bf1e9e94cb6d3c8749f065146e2759a46a6ac52ed8e5e5f046e196798bc681
diff --git a/app-emacs/whine/Manifest b/app-emacs/whine/Manifest
index c9189b950d3b..a862a4c97fc7 100644
--- a/app-emacs/whine/Manifest
+++ b/app-emacs/whine/Manifest
@@ -1 +1 @@
-DIST whine-20091222.tar.bz2 4452 SHA256 bd08faff510ebfbcd3f27679c2ddbe123cfa35fec620c44407f41c3cf0ad9e11 SHA512 74d02753a991140d5298f111f08fa346f458723bd1e5a46d2b67dc262fb53f513d5b39ff87eab167f37b0f2be1458ad8d0bc92479f6f9a329eb5dbf79f87fc4d WHIRLPOOL 93cde84778e938cddc42c4c8169e16e15660359d2e8adad97fd88e84821828161fb7eaf10882a53e64ef2b55201593e121e0715fd0b21cdfaa8bc9255bb3e9ce
+DIST whine-20091222.tar.bz2 4452 BLAKE2B e2148ddbd06853a1bcd3aa9cd017f97e97b7fcc25b87e05017b7860d604880b48dd45e0e8c0affa07fd10ea5aac2cfecda01221fc9b297a83af1957ebb636e7a SHA512 74d02753a991140d5298f111f08fa346f458723bd1e5a46d2b67dc262fb53f513d5b39ff87eab167f37b0f2be1458ad8d0bc92479f6f9a329eb5dbf79f87fc4d
diff --git a/app-emacs/wikipedia-mode/Manifest b/app-emacs/wikipedia-mode/Manifest
index 65e3b4332fc9..8bad89b237af 100644
--- a/app-emacs/wikipedia-mode/Manifest
+++ b/app-emacs/wikipedia-mode/Manifest
@@ -1 +1 @@
-DIST wikipedia-mode-0.5.el.bz2 14243 SHA256 61941b617f74a6c0da72190e1c83b4b46601062273b70d773c2b0eed1670467f SHA512 d10ddfb13e45fae347fe286df919bd9840ea0c2b38e903b451a9c3b6b6ab768566021d12b898bdc7236d034a89ba582dc8d22827bd3b4d80a0363ab323bd045d WHIRLPOOL bccb1917c2f8230f1d76e0ce28e41fd9fe7ad51c5a66ee26313d525e34e11810b1c6904ddff35851d2c4c1a81cec590fed0730ec1758b7d641c18907df820a9e
+DIST wikipedia-mode-0.5.el.bz2 14243 BLAKE2B 1824548c647141bce6bce4de02d42c933b512e132e80752a13c08851dd65d5750006a59880ff55ae663747f0d1ddbb158eae60ee9c610b23c2721ad2f9798c6e SHA512 d10ddfb13e45fae347fe286df919bd9840ea0c2b38e903b451a9c3b6b6ab768566021d12b898bdc7236d034a89ba582dc8d22827bd3b4d80a0363ab323bd045d
diff --git a/app-emacs/windows/Manifest b/app-emacs/windows/Manifest
index 0fcd237f1aa2..384344924203 100644
--- a/app-emacs/windows/Manifest
+++ b/app-emacs/windows/Manifest
@@ -1 +1 @@
-DIST windows-2.49.el.xz 26240 SHA256 14c32604b604f6ce7cb7622d5813870165cf97d65c4ed128cae3c3174afd957d SHA512 de75f2c07cd544de7e7c616b5b928c0dd538b341396819a49525304ed3d9c01c4814e0f8a8da97bdf1a449844605127da690db3ccd95980240156d3c3600b704 WHIRLPOOL 5e325a3756b1fe60cc7fca0d772f5f2bd4f7a8de3052b908590a3795fcc8e78670dd4d024421e829803401b2cdbf63ba74f774ed9d6f80e52d27ddd5fe1dc8d5
+DIST windows-2.49.el.xz 26240 BLAKE2B 161003a6b995b84df79eb0459ddfce41049ffcd053cacb2d5ceefda89afae0eb82f382b7f60b267846bd8690f406a5fcea166c6e602378729140f8e951977265 SHA512 de75f2c07cd544de7e7c616b5b928c0dd538b341396819a49525304ed3d9c01c4814e0f8a8da97bdf1a449844605127da690db3ccd95980240156d3c3600b704
diff --git a/app-emacs/with-editor/Manifest b/app-emacs/with-editor/Manifest
index 0d73764e7b76..03943ea07341 100644
--- a/app-emacs/with-editor/Manifest
+++ b/app-emacs/with-editor/Manifest
@@ -1,3 +1,3 @@
-DIST with-editor-2.5.10.tar.gz 28081 SHA256 c7a849ed827e830f0092695d6b99dce9fad5e1a87e6f0cf1fe7379f860505d53 SHA512 797c7d905eeb4d7398dfba10e4a9b7e7729098a87e48dd75c14fd80f1dd9c5a9693033367a0a9788c4b6c6cc3aa8d2a6ef66ac8bddd24457a61c830887e66a59 WHIRLPOOL bc57ec45d64f4c587fbba2bd847b27ad41ec79dca5745ddd1034005d5c4d48546692bc9dabe723e453ab807a7bc070598701761d7d65fde6d4f2357364376fe5
-DIST with-editor-2.5.8.tar.gz 27978 SHA256 56b2216fb316af5c7673589405a0a7e545a2414a9991374ad95ef15f2a68f0b5 SHA512 abd42a096e3318cc25576b240df1ed670de327afabe675d3df12780c392779f33b88e7a76d125f31cf37e3b22eda88391329c73d21ccc834e611893e759ea3e0 WHIRLPOOL 3b6c47ab250a892d31a7108d668ab14729ab8b37662f20c89450193613d3f5824df54720d3a23cd4b3c1afdf9b02ab462feb29528335d602b999daec161554d5
-DIST with-editor-2.6.0.tar.gz 28124 SHA256 8f26a619d745f0a47281fd389c6f947733752472eec26a2b1d5e7f641063ea04 SHA512 454af6222f54b6695aedb085b6f9a4e60d4ebd9dd6047d67cba13087d3966670aa63358dff45633f3492152f6a15c4c1e92efbaaa787867fef9edcf8b14f690c WHIRLPOOL d6c119d48ede86eb2eefc284d41691d277fea46fbb8292f76f36bba969c4372998658d5cc681115ad03322d33f940d828d5ccc3732e84a3bf3e765c54bd0a78e
+DIST with-editor-2.5.10.tar.gz 28081 BLAKE2B 6e5b0478509022669ecada46a26dc74d4277b0221f8a1691690e60c56a4e24a1c47526c1b75e0b283d2651749069c2a9e0f277ab3805f42c98d2b3d271076b98 SHA512 797c7d905eeb4d7398dfba10e4a9b7e7729098a87e48dd75c14fd80f1dd9c5a9693033367a0a9788c4b6c6cc3aa8d2a6ef66ac8bddd24457a61c830887e66a59
+DIST with-editor-2.5.8.tar.gz 27978 BLAKE2B a14db76077ec2254f79856c018ea4aed277997b3b35d0cdd1992ded2a5715a13dc2fd909041eafb69150e5bfbc7441e6d5b1549a20e0937aac2a59413cbcd01f SHA512 abd42a096e3318cc25576b240df1ed670de327afabe675d3df12780c392779f33b88e7a76d125f31cf37e3b22eda88391329c73d21ccc834e611893e759ea3e0
+DIST with-editor-2.6.0.tar.gz 28124 BLAKE2B b727fc645cba8c85e0ff688ffbb7fd165feeb3e2fe5033475d9f9b333435cdbb4bc6e0c05f862021c1cd32dcdf1c813a0d3a8fb6221a757c7cf4ee4853d40272 SHA512 454af6222f54b6695aedb085b6f9a4e60d4ebd9dd6047d67cba13087d3966670aa63358dff45633f3492152f6a15c4c1e92efbaaa787867fef9edcf8b14f690c
diff --git a/app-emacs/xclip/Manifest b/app-emacs/xclip/Manifest
index bb789403c3f1..4594bcd4f34c 100644
--- a/app-emacs/xclip/Manifest
+++ b/app-emacs/xclip/Manifest
@@ -1 +1 @@
-DIST xclip-1.3.el.xz 2164 SHA256 10ecb4d2f11c65707be3a1646f07b51d56a6670e30c676a94c03664b01930ab5 SHA512 5b51703a365fa3991a97c06734b6baf6473ba672ab2ed572db45330fc6b761258403191079725f8c3e8d72919355a2cadf0c04e31396805718de30474ac08520 WHIRLPOOL b24f22cd7c194897b52df134cfa9d55a40bf158de901ef65c10df0e428202739fcac599bfb476beadfebf88cf80d2ab06c21333a7f791ac7d1fe3890afa17941
+DIST xclip-1.3.el.xz 2164 BLAKE2B 739cad92a92732a12ac077fc9749bc883b4386977d4c47e793023811c1e668668277f6e0a6bc7105cb7a1186c0d6b3ab276dfb655478d5a6063882f60fa9a7e6 SHA512 5b51703a365fa3991a97c06734b6baf6473ba672ab2ed572db45330fc6b761258403191079725f8c3e8d72919355a2cadf0c04e31396805718de30474ac08520
diff --git a/app-emacs/xrdb-mode/Manifest b/app-emacs/xrdb-mode/Manifest
index 984ba41414e4..6adb042c6c84 100644
--- a/app-emacs/xrdb-mode/Manifest
+++ b/app-emacs/xrdb-mode/Manifest
@@ -1 +1 @@
-DIST xrdb-mode-3.0.el.xz 5448 SHA256 3fb184b9f186fb762f38751955ebdce63b66bdc9e549cb1901e05c1938f7e4b7 SHA512 1ad0f92edf08cca604b9534a5a715f79d019f73f8ad80bf8297fa3b4a201f8dbd864c23bed86579b7c48ddd9180add7b39e22469f6c23dceef4be9fdfd1ae290 WHIRLPOOL 59c6cd342e7a4517043f2fff4fa577c823edc8064e9909cec6b622899a58cd30b979d033b39025506bed5140a2c32e8824d6dfc90be2b88d67b47f94c37b96ab
+DIST xrdb-mode-3.0.el.xz 5448 BLAKE2B 32ce6b427ab2338d66a52c722ae3c69e1966c53cd63be15c35e218b17cb2c7476da5d5c1e49df3df1114b97382724f273f2f302abaef5995b5aa53824673867a SHA512 1ad0f92edf08cca604b9534a5a715f79d019f73f8ad80bf8297fa3b4a201f8dbd864c23bed86579b7c48ddd9180add7b39e22469f6c23dceef4be9fdfd1ae290
diff --git a/app-emacs/xslide/Manifest b/app-emacs/xslide/Manifest
index 88ba46366898..7457aa219833 100644
--- a/app-emacs/xslide/Manifest
+++ b/app-emacs/xslide/Manifest
@@ -1 +1 @@
-DIST xslide-0.2.2.zip 29051 SHA256 dde9884f1584bcb63a8e218542c1a2d619327f4e94847974b6ece31b36c63c42 SHA512 df658464517704289d2695faed02d733adea9f5858310b497d66bf103be5c3e1c3635aa1aa3c93f63c64cd2927b4948e53e7b2593622564f5292c583d6e245a8 WHIRLPOOL 419a49258c9ddf49f5b8870378867f9f1b591efdca685e12881f8c2edb4ddeb4a64817c206fc87df2ffbf7089d08b9a7b3291c8f60c1ad34749de063832ba952
+DIST xslide-0.2.2.zip 29051 BLAKE2B d29bfb9b932c1370d51695ccc00d16e6d0c3ea5025f42281df51bed016cead5bdaef95dbc2fc538ba493641ca799b7a048f48b659692e975feaf5ae8b545f1ec SHA512 df658464517704289d2695faed02d733adea9f5858310b497d66bf103be5c3e1c3635aa1aa3c93f63c64cd2927b4948e53e7b2593622564f5292c583d6e245a8
diff --git a/app-emacs/yaml-mode/Manifest b/app-emacs/yaml-mode/Manifest
index b062458d7aa9..32fd5a84ec3c 100644
--- a/app-emacs/yaml-mode/Manifest
+++ b/app-emacs/yaml-mode/Manifest
@@ -1,2 +1,2 @@
-DIST yaml-mode-0.0.13.tar.gz 14446 SHA256 c547b1ec62e6b39fd3e95e28b8d3918958d4f00391c471485532dbc6cc3dcab8 SHA512 10876dfe576045bde363f62880ab3c91894d965c9dc1b7ff2b86783d31c05ab844c0abd77bcb1f7b5346d99969d69833ff4e5dc1b5700f7856fbd3dc4eebd5ef WHIRLPOOL 03300816f056fbe3d3e590c0f81a3593370b53f5c49aefb166bdbcca6823ffe4e4dae61dd4a0f091bff56f86cd33f07c8e2443dae3ba12910e1dc6b82169369b
-DIST yaml-mode-0.0.9.tar.gz 6498 SHA256 5d65852d9d738fd1966125f8ae737760ae48e647030e1aa5a78fd703f54358fc SHA512 cdfb0694d2efe5bb86ab5280e78d577d5bdac906a7745c6e988128cbb001f1f78569199288e2c12e7977a35c35f9e47f3271747bf26fcdfab5d2a961295550ea WHIRLPOOL 58ee875ce20ab49595b4372a979417deb672c09647f5b0859d3dddf484302b8bf4b65243e18709d7d6edec757d6528a59814f4b9f56fe98178d4966fcba5018f
+DIST yaml-mode-0.0.13.tar.gz 14446 BLAKE2B c80750aa78cc10342c5873d5227a2e2b7e0a1d9bdd9ee20f9c5a596e3b43a3344f9a0746eb77cc0cff4da2731cba41c5b52c8dd045d2376ee195d8103bbb7e19 SHA512 10876dfe576045bde363f62880ab3c91894d965c9dc1b7ff2b86783d31c05ab844c0abd77bcb1f7b5346d99969d69833ff4e5dc1b5700f7856fbd3dc4eebd5ef
+DIST yaml-mode-0.0.9.tar.gz 6498 BLAKE2B aa491c9cff93ebb9a8e04ef6ff4205a020986ae1e390c1e7424b5ca6b067d65ccd711fdc494164eccfc1639273d346350d8ca102be7979a49116eacf34e3aace SHA512 cdfb0694d2efe5bb86ab5280e78d577d5bdac906a7745c6e988128cbb001f1f78569199288e2c12e7977a35c35f9e47f3271747bf26fcdfab5d2a961295550ea
diff --git a/app-emacs/yasnippet/Manifest b/app-emacs/yasnippet/Manifest
index 86e367508d90..3b791b464b32 100644
--- a/app-emacs/yasnippet/Manifest
+++ b/app-emacs/yasnippet/Manifest
@@ -1,6 +1,6 @@
-DIST yasnippet-0.5.10.tar.bz2 30583 SHA256 0b09c3aff9d60b68fec15d82fe888849685fad7d10094159a336bb7073327eb6 SHA512 2533ca3c9a3f9210d43cbf871ad82fe7c6ad7d850b1c4c9ef36b299c72190cf535706e434f39b54a70611871ad6329f3386527d77c7bb14b709d7594c75ae4a5 WHIRLPOOL 7e60e4884230226748b879160b5e652e90add7de92945e692b5b105fe540727588554a6cbcf0e61c0a79d9a86d40ba17188a6c848ba5a9c6213387aa3ed20849
-DIST yasnippet-0.6.0c.tar.bz2 39844 SHA256 a62f5c1cc6b7187ec861df78858f6d8a02158f98958d51803b6c8b9368b54efd SHA512 ab60149f867ccda7a9b4f8f97b280c22d1130addb811291459df8b32b8a3ec65b4eaea7b36e1b0ffa80c6338b5094430fc9c2812bd03bc46e582321caafee375 WHIRLPOOL 009f839f7ff75415c0ad2ea1a542137739690d2874156d3e1e67adb59bb8bec2b67021852117d80cbea72dce4278316f9e4b5d931489d263416586b383073aa6
-DIST yasnippet-0.6.1c.tar.bz2 47493 SHA256 81ff65691182c59fcc53cf10ff783757d143246bc2f7a2b79c4452d144c17f05 SHA512 ea4c5850ae80e4db9a188788654a099eddc43e29371ef0cb6367e1a39d3ee9f3e9dab7201178955ae47c92bcecbb5120e0b817e47e9c88c5bcef9e561636a603 WHIRLPOOL 99c7c924935879b04bb0790abf6d9f56e8fb81d879b2803b7918c598c4c7587b76e86a2bafce49e00de35b1d592a5d397eec7114b6b42b31708aa7cebe1ad177
-DIST yasnippet-doc-0.5.10.tar.bz2 182436 SHA256 55aa4c731a91bac695cd34fd23a972dcaec957290c2a1002064e4e9f742da071 SHA512 2abdea253a23291089e34366f3cc95dbad6904ec8cf9f603e1fce0d9995ee32fd1b8b69f98f27ddd3fd33318514cb6e269f2418c8575df98240e6a3c3e19a0ed WHIRLPOOL 7c36e2013e6ef940b53c3330d690e3016e0a274fa55da02c713881e70db0091efb6cdf3bdd4516691ec267270bfbabf95b61e8d65c950b5103981b94b1295c81
-DIST yasnippet-doc-0.6.0c.tar.bz2 246554 SHA256 2e4581ac310fa8e13d7deb524c6949e0b4c8ed208e60439ebef366b87c7351c0 SHA512 3e32936e1fed8ab5ac963e9cbb68a61d80f22acde910e4a700cc4005463f0aae0fb5ce6f6f5cbdf2e8dd9bd7e39e912cac8ea05f8efca08d58a07fd35ff26160 WHIRLPOOL 386612504a8685dd98160b703ae661d90692de9dd05d8a2e0ede54068328213f37ec0d9d1179783740c5af2f22b474e3349a74face96e4fc89197c89858be017
-DIST yasnippet-doc-0.6.1c.tar.bz2 490738 SHA256 fc426b1365097c1db2d7d24139e15982c3abd792bfb8990934993f8e49688304 SHA512 c96955cac11f319107e0ea907c92860049598cbfd47b6a2e3211dc2b030face77b03aa9495d7e9d78171be87083f77268e90c6c86b0cc467a96a5bd724daf8f1 WHIRLPOOL d06b8710af363050b7c996c6d7bd0b06457326d589939cbe85bc812d44d6920d62a22449fc6a08a2806c3782ac0816e346698b6bc1b144b41eaff8f528899e3c
+DIST yasnippet-0.5.10.tar.bz2 30583 BLAKE2B 28f9d3eaffe8f98fac55fdb0dc9021fe50be77ac2c980fbceb2d4be331e3135530d0e09a31f820a460f3b1c9ae0154b47504361cc13dfd8357e8f72e820e8c7b SHA512 2533ca3c9a3f9210d43cbf871ad82fe7c6ad7d850b1c4c9ef36b299c72190cf535706e434f39b54a70611871ad6329f3386527d77c7bb14b709d7594c75ae4a5
+DIST yasnippet-0.6.0c.tar.bz2 39844 BLAKE2B e49d1bbbe6f44270fc7d1e76532e3666dba35d69105a4ce902cbd53e5b6ab36b4534f389504b06ec7ec5b5b8a4b87c7adac2dbf10c55dcfd0023f3c14cf32ce2 SHA512 ab60149f867ccda7a9b4f8f97b280c22d1130addb811291459df8b32b8a3ec65b4eaea7b36e1b0ffa80c6338b5094430fc9c2812bd03bc46e582321caafee375
+DIST yasnippet-0.6.1c.tar.bz2 47493 BLAKE2B d3bb0d1c343c05f9bc212a0fc114d3c816c02d8de685c55c0f3407a02ee6d1c1e6c24681872dc66e67af773e0e98a78a0366bbfe72ebfd543c5174d2e2f994b0 SHA512 ea4c5850ae80e4db9a188788654a099eddc43e29371ef0cb6367e1a39d3ee9f3e9dab7201178955ae47c92bcecbb5120e0b817e47e9c88c5bcef9e561636a603
+DIST yasnippet-doc-0.5.10.tar.bz2 182436 BLAKE2B a258088d26acd494d848b4cf8723d88d1787ed1812dc0427b6c8be689a9e8be266f1a2c1833a540faeabccdae6f8090407b1396f3d82b08139af7afaf7ea8a82 SHA512 2abdea253a23291089e34366f3cc95dbad6904ec8cf9f603e1fce0d9995ee32fd1b8b69f98f27ddd3fd33318514cb6e269f2418c8575df98240e6a3c3e19a0ed
+DIST yasnippet-doc-0.6.0c.tar.bz2 246554 BLAKE2B 1ee5aacb33b5f058791c81332ec5a60cd1854a50327c00680e1782f322706175cef2d73faccc390285e9ffb95163eed699fd0c81ac47c3566993d089253b3e3b SHA512 3e32936e1fed8ab5ac963e9cbb68a61d80f22acde910e4a700cc4005463f0aae0fb5ce6f6f5cbdf2e8dd9bd7e39e912cac8ea05f8efca08d58a07fd35ff26160
+DIST yasnippet-doc-0.6.1c.tar.bz2 490738 BLAKE2B e312481c7693094d62eb0aec465412ea1c894ca5132df9c2beba49c3c78daaec90ca80d17fc9404edbdd8cea1fce63804a102cbe9b7d3d7b23f0761b8a0ea552 SHA512 c96955cac11f319107e0ea907c92860049598cbfd47b6a2e3211dc2b030face77b03aa9495d7e9d78171be87083f77268e90c6c86b0cc467a96a5bd724daf8f1
diff --git a/app-emacs/yatex/Manifest b/app-emacs/yatex/Manifest
index ebca99964371..76a262aaf29b 100644
--- a/app-emacs/yatex/Manifest
+++ b/app-emacs/yatex/Manifest
@@ -1,2 +1,2 @@
-DIST yatex1.76.tar.gz 357552 SHA256 66c6f162a0ce4ee1edb231bacb4a3926ea4b5a45a4ba004330bb0bc0a7887acf SHA512 ff2afea1cb1b7e4bef223c13d4cc6b942b1d555959321e7cb97595dfe7ca3adbc9efa6db7d7d13cdd0bb5aa62eabc1d3383d07635b1dbbe5b15175bf99c4c416 WHIRLPOOL 878b199d1479a501fb36763daf6565ddfe340df2b607e346c8b4e5523c20df2cefe4a7254dd2a3f415fc4b2bc0371b79f9c504d801d3e4cc8553091bd2b4cd36
-DIST yatex1.77.tar.gz 356721 SHA256 acc3e14c34ea5eba0c1a96cef6b5c7ab850e621f75cf25764e0ae37be483f177 SHA512 d6b909b540b0966cfcd35a36ad7c9e8d8a821ca668ea9b0a4d1f3267a45397800769dd47ce64f5f8cbda65c274a7f415c8e86b6598a365ea41104684cf9df07f WHIRLPOOL 1755e2592b04596f154afb4cf6598371b61ce8e85f0960dbbcbe5172f2543edcb610f7e93185480ae7bed492da2f7a66f450756e7615014e3a0034a928c7e3c9
+DIST yatex1.76.tar.gz 357552 BLAKE2B c829cf73d38fd0ea12bd9b831059fabae2d8cf6d7f111762a409770910aefc6f0617979e38ef0fb5c489d92c38c83832cf74e075f68a190c794aa15b5f0a696b SHA512 ff2afea1cb1b7e4bef223c13d4cc6b942b1d555959321e7cb97595dfe7ca3adbc9efa6db7d7d13cdd0bb5aa62eabc1d3383d07635b1dbbe5b15175bf99c4c416
+DIST yatex1.77.tar.gz 356721 BLAKE2B f923bc80ec32ee3d1654f15a99624251604c94af60738ad2f56b237d4385da0951bec32b32f297662540667da2648789a380b433332ce7e10f50f1d016c3b6d0 SHA512 d6b909b540b0966cfcd35a36ad7c9e8d8a821ca668ea9b0a4d1f3267a45397800769dd47ce64f5f8cbda65c274a7f415c8e86b6598a365ea41104684cf9df07f
diff --git a/app-emacs/yc/Manifest b/app-emacs/yc/Manifest
index 3c8baca4814f..bd72fd11f2c6 100644
--- a/app-emacs/yc/Manifest
+++ b/app-emacs/yc/Manifest
@@ -1,2 +1,2 @@
-DIST yc-4.0.13.tar.gz 43916 SHA256 5afd06ea819bbf20f5cbfbcd3c60eb58a50b2ef093defc4c93bfdf8ab69444f3 SHA512 2b5430766bbdbc77a0ec3aba6d51478ff91186a257e75a2a3af25a885bbddbf7180fbdf3b0876c1a65c149060bb754a44f77bb399c43cc666bd0add40226ca32 WHIRLPOOL fcd0fbb6729f42cf752a4d590357202ea54763c243e5e29d9f6a9676e420e1b501c1579e0230b0e59d88c15cc7f106c8c1d32effd7411e708bada5f68f3dd380
-DIST yc-5.2.1.el.gz 33305 SHA256 45854b3f51cf74b97c4ed0dd11b0f4bd2a96b78f59b7614d43fea85f9884fd84 SHA512 11c8d63a9f6cb94118a00976518949ab50496f8b8f994a8e1c352be5deefc549540935e0727b036c2b3c493366cfb8c47f040fcc425174b6668ec9f5e8d499dc WHIRLPOOL 00ef278c83e209ecd0a7940a26a105d8dfbd868e6eeb9b1525fcd0f5e8bae8aa0aafd1ba1dc8012facc83347fa8b059d36e9c5c45c26c3013bd80abb958ebcc3
+DIST yc-4.0.13.tar.gz 43916 BLAKE2B 7e52c5269b3fbf492d17742aafe242208ba243dadcdd2fb14fbdb4c72765125a39bf7b7c6cd73c50335cc3c64916d0b12814a25f918415d1e20c8e47974f09df SHA512 2b5430766bbdbc77a0ec3aba6d51478ff91186a257e75a2a3af25a885bbddbf7180fbdf3b0876c1a65c149060bb754a44f77bb399c43cc666bd0add40226ca32
+DIST yc-5.2.1.el.gz 33305 BLAKE2B 8bed47715f49466425afefd036cf562055025564e50ae219e027848104e3851b6cba29f74bcf81487d2494d314a290eabe27e128968dbba9d475562e248a267b SHA512 11c8d63a9f6cb94118a00976518949ab50496f8b8f994a8e1c352be5deefc549540935e0727b036c2b3c493366cfb8c47f040fcc425174b6668ec9f5e8d499dc
diff --git a/app-emacs/zenburn/Manifest b/app-emacs/zenburn/Manifest
index 9e0260d1134b..e0ba521ba96f 100644
--- a/app-emacs/zenburn/Manifest
+++ b/app-emacs/zenburn/Manifest
@@ -1 +1 @@
-DIST zenburn-20110907.el.bz2 6979 SHA256 b376c33ea3f97678d59b7d8103c352899515f3a6e68ab7f294ab787d9b29abd5 SHA512 552f4a751ffadaf2f4174c7f722abc1fb7a8f84934df01f61c2d7cf653328ce8fd18473f0748eaa570ab9221544e5e9c81243e731a2fff5f2c9028b992163062 WHIRLPOOL ab857e75d79745bfbf79675d7b6a784fc3d5f63e7a34492a663de5b9be6606728c41a0711e2cb3038bae578fd2c187ffc0bd2b7d097adbba5a7fa64f4852d4e7
+DIST zenburn-20110907.el.bz2 6979 BLAKE2B 3f38e857c9e09d73d5aafc7e5a98292c122b5ab903c902fe43be1d91ab20a9703a974707354b9f07eab190324ee4ac8a392efae06f2c05a07dd9914a78ebde4c SHA512 552f4a751ffadaf2f4174c7f722abc1fb7a8f84934df01f61c2d7cf653328ce8fd18473f0748eaa570ab9221544e5e9c81243e731a2fff5f2c9028b992163062
diff --git a/app-emacs/zenirc/Manifest b/app-emacs/zenirc/Manifest
index beaf1bcf8e6a..33ed14f9897d 100644
--- a/app-emacs/zenirc/Manifest
+++ b/app-emacs/zenirc/Manifest
@@ -1 +1 @@
-DIST zenirc-2.112.tar.gz 270951 SHA256 05bc964e7845acc0f5be4e385f01ea7da48967ea409a59417507360c155988ab SHA512 3859eb21ad80c8a32e473a272bf2b024039a7a5e4c87a168a71ee2d045f678397daebdce81358be3a50a0dae63c7f8f417600f0964250fdb505def2803a13fac WHIRLPOOL bf90ba7ef0a8f43ca954afb50666c2367a2cea53c34ba7ae7543eaafe3eaebc5229ecd589e616cf9948d57b50fd5ec7680617ce6487a2fd66109cfcd0d7e83f3
+DIST zenirc-2.112.tar.gz 270951 BLAKE2B 38c57a4e4957c9f1d95f5118d4e7f076c581f7dcbe04df70a1c5cac93cb7b44bbdfe390765921ef61c9899a8f66bd6fc8393317e275dc2e55054712d759abec2 SHA512 3859eb21ad80c8a32e473a272bf2b024039a7a5e4c87a168a71ee2d045f678397daebdce81358be3a50a0dae63c7f8f417600f0964250fdb505def2803a13fac
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 948b248ab8be..6d07b478490f 100644
Binary files a/app-emulation/Manifest.gz and b/app-emulation/Manifest.gz differ
diff --git a/app-emulation/e-uae/e-uae-0.8.29_rc4-r3.ebuild b/app-emulation/e-uae/e-uae-0.8.29_rc4-r3.ebuild
index 634a05202ab0..cf13ad5e5896 100644
--- a/app-emulation/e-uae/e-uae-0.8.29_rc4-r3.ebuild
+++ b/app-emulation/e-uae/e-uae-0.8.29_rc4-r3.ebuild
@@ -23,7 +23,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ppc ~x86"
 IUSE="X dga ncurses sdl alsa oss sdl-sound capslib"
 
 # Note: opposed to ./configure --help zlib support required! Check
diff --git a/app-emulation/genymotion-bin/Manifest b/app-emulation/genymotion-bin/Manifest
index 7bdf1601ca48..8b9371ba81f8 100644
--- a/app-emulation/genymotion-bin/Manifest
+++ b/app-emulation/genymotion-bin/Manifest
@@ -1 +1 @@
-DIST genymotion-2.10.0-linux_x64.bin 44847023 SHA256 558d9faf96780ddd972b7769d0e3871b71cdbc104c291d40b0be0092607dec60 SHA512 fe89376a48121b9c3cb1392d7365e13ee2865b795b1d8712e3461072bd0e0d38fd309814d7ecd5518fe2673229fb2e49b4c239211f4308f1057f3d01052d4007 WHIRLPOOL fea75a4d17bdb158316024db2b6d3f2e6e370595602b58fb7f38aa6a0bb91f0c11974548a5d2790179d139a374f515355f1e564de0e5a704afe0255b78e15509
+DIST genymotion-2.11.0-linux_x64.bin 45096365 SHA256 0ec695f5fd8a41b6fb306bd5e1088722cc0e17c0a8b174dabd9598f24225cfbc SHA512 b128fbe1e27120cdd88a6ac4661031231cc17fc0adf007fa986f7892571db7d8ce259bf6f106eb9e620149572d5ca242ae6032b7360ba7502b208ac18ef98e2e WHIRLPOOL 30990ede9dc5863c05b72fef8e67bf4dac68d185b8368247c1b6189e20ea224273fbc560d53bea10a68c3a2c0f595be9555b2fcfaae3ea20fee447809cd27868
diff --git a/app-emulation/genymotion-bin/genymotion-bin-2.10.0.ebuild b/app-emulation/genymotion-bin/genymotion-bin-2.11.0.ebuild
similarity index 98%
rename from app-emulation/genymotion-bin/genymotion-bin-2.10.0.ebuild
rename to app-emulation/genymotion-bin/genymotion-bin-2.11.0.ebuild
index 60d6d52b290a..5d9a81113554 100644
--- a/app-emulation/genymotion-bin/genymotion-bin-2.10.0.ebuild
+++ b/app-emulation/genymotion-bin/genymotion-bin-2.11.0.ebuild
@@ -84,7 +84,7 @@ src_install() {
 
 	doins "${MY_PN}"/{libcom,librendering}.so*
 	# library that differ from system version
-	doins "${MY_PN}"/{libswscale,libavutil,libprotobuf}.so*
+	doins "${MY_PN}"/libprotobuf.so*
 	# android library
 	doins "${MY_PN}"/{libEGL_translator,libGLES_CM_translator,libGLES_V2_translator,libOpenglRender,libemugl_logger}.so*
 
diff --git a/app-emulation/spim/spim-8.0-r2.ebuild b/app-emulation/spim/spim-8.0-r2.ebuild
index 4b8e0b1872d3..186dc730441e 100644
--- a/app-emulation/spim/spim-8.0-r2.ebuild
+++ b/app-emulation/spim/spim-8.0-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.cs.wisc.edu/~larus/SPIM/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~amd64 ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="doc X"
 
 RDEPEND="X? ( media-fonts/font-adobe-100dpi
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index e6e42189a282..3d0ddb4dcc4c 100644
Binary files a/app-misc/Manifest.gz and b/app-misc/Manifest.gz differ
diff --git a/app-misc/color/color-1.2-r2.ebuild b/app-misc/color/color-1.2-r2.ebuild
index 517b35761d3d..661294baa359 100644
--- a/app-misc/color/color-1.2-r2.ebuild
+++ b/app-misc/color/color-1.2-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://runslinux.net/projects/color/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
 IUSE=""
 
 src_prepare() {
diff --git a/app-misc/mc/Manifest b/app-misc/mc/Manifest
index dd32e78a0f44..24d505ab53dd 100644
--- a/app-misc/mc/Manifest
+++ b/app-misc/mc/Manifest
@@ -1,3 +1,4 @@
-DIST mc-4.8.15.tar.xz 2304812 SHA256 cf4e8f5dfe419830d56ca7e5f2495898e37ebcd05da1e47ff7041446c87fba16 SHA512 b8e05e1bcadcb766a43269a4724e36b77221b004d53783718fe455167693ff029e3e54cde47740d0c0ecd5adacfb3960a8ecce76eeaea234bbbcfd54db3b1760 WHIRLPOOL 6ddf2f5b88825584653a7027d515bfc84caba003408df31b4b8257a3f8c81a179e39a7bb7cc8571976537983f5dac7d6c06ddfbd6142ef0b31639a914f56c0f1
-DIST mc-4.8.18.tar.xz 2462080 SHA256 f7636815c987c1719c4f5de2dcd156a0e7d097b1d10e4466d2bdead343d5bece SHA512 edd81f6ab50ca7bb3582064f6722e490d33ae9dfbef3835e26206089d3898420968da394780c594083fa17c01a85cda9068d9931199b8319bf6361f90e900eb8 WHIRLPOOL dd0c1cdfe93468ebc399b270d693751bc7c0665cb49040d9409c3a336c953be0d304c463b8c8a0a26e42c720c116a4b4bd9b930caa2f2101298e01c4ac5c6237
-DIST mc-4.8.19.tar.xz 2521808 SHA256 eb9e56bbb5b2893601d100d0e0293983049b302c5ab61bfb544ad0ee2cc1f2df SHA512 aec49f0da1fc69099ce9b0f71926d1e9ee6df0be12f53da94a8f5f4266612515031cd02f328a458bf78260c5efb1c8ca2c34c89e20a77567c8b987e43d446531 WHIRLPOOL 21c57a2717c58488cc7aa5ba5159b9231e09181059662f392a5212a17aa5475493793d49b99e73ebe74d9594201a84cfc63c3a460654579b7399cc563594ab7a
+DIST mc-4.8.15.tar.xz 2304812 BLAKE2B 33d8055316b4ae9d8b2385c3a439339fa635e3f145c9599ce937c596c6ae18225451568a2387074af8d9afc702a0ec8528e07b00b7805dd86af459612d7fd187 SHA512 b8e05e1bcadcb766a43269a4724e36b77221b004d53783718fe455167693ff029e3e54cde47740d0c0ecd5adacfb3960a8ecce76eeaea234bbbcfd54db3b1760
+DIST mc-4.8.18.tar.xz 2462080 BLAKE2B 10cd93cea439290922c0dc19e85b6c9456ce4266f35eeecbf2f40d99e3aae64465d9c427fa01d7d2c542e8bae9d2926e8ce42766c4c1656373905c3d871d71c0 SHA512 edd81f6ab50ca7bb3582064f6722e490d33ae9dfbef3835e26206089d3898420968da394780c594083fa17c01a85cda9068d9931199b8319bf6361f90e900eb8
+DIST mc-4.8.19.tar.xz 2521808 BLAKE2B b4712d833e8562b0f760b4558533ac338cf8875dc9034cbec2160444bbe3e9f4dc7fcec16835cabdd5cde6b02a7020162b3cd1693863775ee3494c9b4659a7aa SHA512 aec49f0da1fc69099ce9b0f71926d1e9ee6df0be12f53da94a8f5f4266612515031cd02f328a458bf78260c5efb1c8ca2c34c89e20a77567c8b987e43d446531
+DIST mc-4.8.20.tar.xz 2529580 BLAKE2B 14e575b650d28e0dcaa8ef0dc0b8e9bbf3e840ddc3d34d20518d28a6b253a8769c041c29ef7136c5fb72bd6130b0fc6c367dab8e44e040ef6dfd5406c364b86c SHA512 c2460561ae94bed75b1ed12f5c8039c9f8ace4c06987c57d07b8399c4e01c5a6c57851fddb3e918a4541ade089c89e8526078572a09580ccd0ae95344e3c1138
diff --git a/app-misc/mc/mc-4.8.20.ebuild b/app-misc/mc/mc-4.8.20.ebuild
new file mode 100644
index 000000000000..cb720f326c5f
--- /dev/null
+++ b/app-misc/mc/mc-4.8.20.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools eutils flag-o-matic
+
+MY_P=${P/_/-}
+
+DESCRIPTION="GNU Midnight Commander is a text based file manager"
+HOMEPAGE="https://www.midnight-commander.org"
+SRC_URI="http://ftp.midnight-commander.org/${MY_P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+IUSE="+edit gpm mclib nls samba sftp +slang spell test X +xdg"
+
+REQUIRED_USE="spell? ( edit )"
+
+RDEPEND=">=dev-libs/glib-2.26.0:2
+	gpm? ( sys-libs/gpm )
+	kernel_linux? ( sys-fs/e2fsprogs )
+	samba? ( net-fs/samba )
+	sftp? ( net-libs/libssh2 )
+	slang? ( >=sys-libs/slang-2 )
+	!slang? ( sys-libs/ncurses:0= )
+	spell? ( app-text/aspell )
+	X? ( x11-libs/libX11
+		x11-libs/libICE
+		x11-libs/libXau
+		x11-libs/libXdmcp
+		x11-libs/libSM )"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+	test? ( dev-libs/check )
+	"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.8.13-tinfo.patch
+)
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	[[ -n ${LIVE_EBUILD} ]] && ./autogen.sh
+
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myscreen=ncurses
+	use slang && myscreen=slang
+	[[ ${CHOST} == *-solaris* ]] && append-ldflags "-lnsl -lsocket"
+
+	local homedir=".mc"
+	use xdg && homedir="XDG"
+
+	econf \
+		--disable-silent-rules \
+		--disable-dependency-tracking \
+		$(use_enable nls) \
+		--enable-vfs \
+		$(use_enable kernel_linux vfs-undelfs) \
+		--enable-charset \
+		$(use_with X x) \
+		$(use_enable samba vfs-smb) \
+		$(use_enable sftp vfs-sftp) \
+		$(use_enable spell aspell) \
+		$(use_with gpm gpm-mouse) \
+		--with-screen=${myscreen} \
+		$(use_with edit internal-edit) \
+		$(use_enable mclib) \
+		$(use_enable test tests) \
+		--with-homedir=${homedir}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc AUTHORS README NEWS
+
+	# fix bug #334383
+	if use kernel_linux && [[ ${EUID} == 0 ]] ; then
+		fowners root:tty /usr/libexec/mc/cons.saver
+		fperms g+s /usr/libexec/mc/cons.saver
+	fi
+
+	if ! use xdg ; then
+		sed 's@MC_XDG_OPEN="xdg-open"@MC_XDG_OPEN="/bin/false"@' \
+			-i "${ED}"/usr/libexec/mc/ext.d/*.sh || die
+	fi
+}
+
+pkg_postinst() {
+	elog "To enable exiting to latest working directory,"
+	elog "put this into your ~/.bashrc:"
+	elog ". ${EPREFIX}/usr/libexec/mc/mc.sh"
+}
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index c24047b076d5..12538a685544 100644
Binary files a/app-portage/Manifest.gz and b/app-portage/Manifest.gz differ
diff --git a/app-portage/gemato/Manifest b/app-portage/gemato/Manifest
index 5c888b6b8c48..46cb856ef8ab 100644
--- a/app-portage/gemato/Manifest
+++ b/app-portage/gemato/Manifest
@@ -1 +1 @@
-DIST gemato-4.tar.gz 57334 BLAKE2B 5aad3950e8b7fcf42d088de3b9dd5ded5eaeeb3f91414c38b79eaa4afd4799ccb4084da8a8bdf1bec67b82de8dd09a4c2977f07932a4c63bc833916d184418eb SHA512 a6747a83020efe72ad356873b1648bcf80828efaf9248e17e46cf626f879ebb77571c28d4097ebe56f891a0c096a81feed84bacbd04b37e6a6ce5f0ec37d27ba
+DIST gemato-8.tar.gz 57379 BLAKE2B e83cba508ed781667abab3e18059f838c99e92217a7f1dde90b2cc4200a0ab83baabf789bc6bc978b4f080bf285ab9b7ea62e86a98c272abf3889093d780eac3 SHA512 9e5e7c304166d311b7101330b36c3d781e5d3901feb5247235ed04a8aa316416f6045658fab176e34ca6c2d6653eda66ef19789b39a60cb316add9985c9a8040
diff --git a/app-portage/gemato/gemato-4.ebuild b/app-portage/gemato/gemato-8.ebuild
similarity index 81%
rename from app-portage/gemato/gemato-4.ebuild
rename to app-portage/gemato/gemato-8.ebuild
index b5c0440f4f0a..b6774a8be338 100644
--- a/app-portage/gemato/gemato-4.ebuild
+++ b/app-portage/gemato/gemato-8.ebuild
@@ -10,11 +10,11 @@ inherit distutils-r1
 
 DESCRIPTION="Stand-alone Manifest generation & verification tool"
 HOMEPAGE="https://github.com/mgorny/gemato"
-SRC_URI="https://github.com/mgorny/gemato/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
 IUSE="+blake2 bzip2 +gpg lzma sha3"
 
 RDEPEND="
@@ -23,8 +23,9 @@ RDEPEND="
 	gpg? ( app-crypt/gnupg )
 	lzma? ( $(python_gen_cond_dep 'dev-python/backports-lzma[${PYTHON_USEDEP}]' python2_7 pypy) )
 	sha3? ( $(python_gen_cond_dep 'dev-python/pysha3[${PYTHON_USEDEP}]' python{2_7,3_4,3_5} pypy{,3}) )"
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
 
 python_test() {
-	"${PYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}"
+	esetup.py test
 }
diff --git a/app-portage/gemato/gemato-9999.ebuild b/app-portage/gemato/gemato-9999.ebuild
index 2df8e801b285..2475d8627bb5 100644
--- a/app-portage/gemato/gemato-9999.ebuild
+++ b/app-portage/gemato/gemato-9999.ebuild
@@ -24,8 +24,9 @@ RDEPEND="
 	gpg? ( app-crypt/gnupg )
 	lzma? ( $(python_gen_cond_dep 'dev-python/backports-lzma[${PYTHON_USEDEP}]' python2_7 pypy) )
 	sha3? ( $(python_gen_cond_dep 'dev-python/pysha3[${PYTHON_USEDEP}]' python{2_7,3_4,3_5} pypy{,3}) )"
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
 
 python_test() {
-	"${PYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}"
+	esetup.py test
 }
diff --git a/app-portage/portage-utils/Manifest b/app-portage/portage-utils/Manifest
index e6d7be883897..be71e22516c1 100644
--- a/app-portage/portage-utils/Manifest
+++ b/app-portage/portage-utils/Manifest
@@ -1,3 +1,3 @@
-DIST portage-utils-0.62.tar.xz 527216 SHA256 f6ce1938e41ec2073be12568470a7aae51489579add0709c08af5d9be1c0c563 SHA512 71b2888cef1bf7549c3829cc7d4bbe2e99a711434bae4fb78c55b9c37815b61623518f19ab87db30f533d771398933c085640dc7c8ffcedf87a70ac702a52fa1 WHIRLPOOL 105d60d3f778a79972e39d2d8e78aa8b971f085721362e4d594d86006752d97b25d41a1e5a9006f603cda0088da89abb179d8bc129815c1363f30dfb6ff59891
-DIST portage-utils-0.63.tar.xz 529012 SHA256 7a754cccad2d4c3331d348ba9df51bb3b9565866674303152b55248b05130a02 SHA512 2b0bceee63b894e7f517f3c938a1873aa90c41b668abbf6a39125a1bb9ce1059731e34216cc357787b5cbf83a0cf0748530147262673ea0bc26404d6274714eb WHIRLPOOL fdaec19af639c744394063dd57f7e64fb02ff10c4ee5b1ef2f49928df6d47fb5bf732e547264390787e20ca6e3251be3935e9f348f2510aa0fc6779778ca44ba
-DIST portage-utils-0.64.tar.xz 533124 SHA256 a53505758d04b2115f636afc9f0c15176a591f3cdb58f684cfd148b29c4783f0 SHA512 e384b88454607aa9123ac3a71d55fb16de475ba59f4ba6efd236594f42140e75650696430138cdb6e1c4e1792db091bbc1db42b1c1102fd579af6514ecefffb7 WHIRLPOOL 19e34782c2f1ed637db73865acc6c07c4162ace55c0b24287bf92c66a9ebea4ca0ab230bb94478aa71bee72280231f75dd5de4eb8fc10248b52ee77cc977392e
+DIST portage-utils-0.62.tar.xz 527216 BLAKE2B ac8331b74998ddb86db55a937992447bccf60611cc259ceb5fe79918c1a43b6dc4633e4ad64462e2df5c39e8d8aa193bd57ab24dcd714e088357eb3cb177e972 SHA512 71b2888cef1bf7549c3829cc7d4bbe2e99a711434bae4fb78c55b9c37815b61623518f19ab87db30f533d771398933c085640dc7c8ffcedf87a70ac702a52fa1
+DIST portage-utils-0.63.tar.xz 529012 BLAKE2B 25ecf32a6a64484af5d3c73c2a9482b379ba420260de159b59a17ebd864b0ff49fcaa248db1e7d9a9c9582655ed6d4cb7a3e413212247890167b37c4275d201a SHA512 2b0bceee63b894e7f517f3c938a1873aa90c41b668abbf6a39125a1bb9ce1059731e34216cc357787b5cbf83a0cf0748530147262673ea0bc26404d6274714eb
+DIST portage-utils-0.64.tar.xz 533124 BLAKE2B c3e0ecdc2d82af197dabb8434677d4c3bfbbee01c482c496d89d2f7be988ef894e0b3c7cb64337216144644a48ee3213fc1683ae6d75091e471189a4550b8c71 SHA512 e384b88454607aa9123ac3a71d55fb16de475ba59f4ba6efd236594f42140e75650696430138cdb6e1c4e1792db091bbc1db42b1c1102fd579af6514ecefffb7
diff --git a/app-portage/portage-utils/files/portage-utils-0.64-fix-quiet.patch b/app-portage/portage-utils/files/portage-utils-0.64-fix-quiet.patch
new file mode 100644
index 000000000000..447fe3aa4138
--- /dev/null
+++ b/app-portage/portage-utils/files/portage-utils-0.64-fix-quiet.patch
@@ -0,0 +1,51 @@
+commit 237d1b34166fea2e4cb0eb28098a5b2759548b86
+Author: Robin H. Johnson <robbat2@gentoo.org>
+Date:   Sun Nov 26 23:50:58 2017 -0800
+
+    Fix PORTAGE_QUIET quiet result.
+    
+    Having PORTAGE_QUIET set caused the quiet variable to be incremented,
+    but it did not also setup the warnout variable.
+    
+    Add a common setup function for warnout quiet, and use consistently.
+    
+    Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
+
+diff --git a/main.c b/main.c
+index d124695..dea03a8 100644
+--- a/main.c
++++ b/main.c
+@@ -78,6 +78,15 @@ no_colors(void)
+ 	setenv("NOCOLOR", "true", 1);
+ }
+ 
++static void
++setup_quiet(void)
++{
++	/* "e" for FD_CLOEXEC */
++	if (quiet == 0)
++		warnout = fopen("/dev/null", "we");
++	++quiet;
++}
++
+ /* include common applet defs */
+ #include "applets.h"
+ 
+@@ -102,7 +111,7 @@ no_colors(void)
+ #define COMMON_GETOPTS_CASES(applet) \
+ 	case 0x1: portroot = optarg; break; \
+ 	case 'v': ++verbose; break; \
+-	case 'q': if (quiet == 0) { warnout = fopen("/dev/null", "we"); } ++quiet; break; \
++	case 'q': setup_quiet(); break; \
+ 	case 'V': version_barf(); break; \
+ 	case 'h': applet ## _usage(EXIT_SUCCESS); break; \
+ 	case 'C': no_colors(); break; \
+@@ -952,7 +961,7 @@ initialize_portage_env(void)
+ 		xarraypush_str(overlays, main_overlay);
+ 
+ 	if (getenv("PORTAGE_QUIET") != NULL)
+-		quiet = 1;
++		setup_quiet();
+ 
+ 	if (nocolor)
+ 		no_colors();
diff --git a/app-portage/portage-utils/portage-utils-0.64-r1.ebuild b/app-portage/portage-utils/portage-utils-0.64-r1.ebuild
new file mode 100644
index 000000000000..43a1f4df9846
--- /dev/null
+++ b/app-portage/portage-utils/portage-utils-0.64-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit toolchain-funcs epatch
+
+DESCRIPTION="small and fast portage helper tools written in C"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Portage-utils"
+SRC_URI="mirror://gentoo/${P}.tar.xz
+	https://dev.gentoo.org/~vapier/dist/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="nls static"
+
+RDEPEND="dev-libs/iniparser:0"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	static? ( dev-libs/iniparser:0[static-libs] )"
+
+PATCHES=(
+	"${FILESDIR}"/portage-utils-0.64-fix-quiet.patch
+)
+
+src_configure() {
+	# Avoid slow configure+gnulib+make if on an up-to-date Linux system
+	if use prefix || ! use kernel_linux || \
+	   has_version '<sys-libs/glibc-2.10'
+	then
+		econf --with-eprefix="${EPREFIX}"
+	else
+		tc-export CC
+	fi
+}
+
+src_compile() {
+	emake NLS=$(usex nls) STATIC=$(usex static)
+}
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 5bce42d4e170..59b5685bfd12 100644
Binary files a/app-text/Manifest.gz and b/app-text/Manifest.gz differ
diff --git a/app-text/djview/djview-4.10.6.ebuild b/app-text/djview/djview-4.10.6.ebuild
index a498817ec695..a9cc140b5498 100644
--- a/app-text/djview/djview-4.10.6.ebuild
+++ b/app-text/djview/djview-4.10.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/djvu/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ppc ~ppc64 x86"
 IUSE="debug nsplugin"
 
 RDEPEND="
diff --git a/app-text/libexttextcat/Manifest b/app-text/libexttextcat/Manifest
index fe9b08f0fb57..70d870f4285d 100644
--- a/app-text/libexttextcat/Manifest
+++ b/app-text/libexttextcat/Manifest
@@ -1,2 +1,2 @@
-DIST libexttextcat-3.4.4.tar.xz 1025376 SHA256 f24c086cf3523424228ed58b9f678cc7647688822e5407d5fbc155fbfc846293 SHA512 f1f7a4292199cb6102cc56a5338b19049664ea664adc96a67a71205fe33d6a40f68b8695825fe253427575347ab6230dce5e0b703635534f32a0f70ff001eeed WHIRLPOOL 00413e249aab03720bc237f72497441586c49a24bfdc23100adce0b76585602d44f84393b90eade07eeb6c7083eb4ba5ff9f5f439148880ad7599d2db2b080e2
+DIST libexttextcat-3.4.4.tar.xz 1025376 BLAKE2B da055b0a1d981dd91cfd2ca375b2ef13a0af5c8b910eaa7144ac69708296bbda5462a44f48dd2fc1f4cad84d9c31d11f430b6ee1c390c93ba7660368317b79c0 SHA512 f1f7a4292199cb6102cc56a5338b19049664ea664adc96a67a71205fe33d6a40f68b8695825fe253427575347ab6230dce5e0b703635534f32a0f70ff001eeed
 DIST libexttextcat-3.4.5.tar.xz 1041268 SHA256 13fdbc9d4c489a4d0519e51933a1aa21fe3fb9eb7da191b87f7a63e82797dac8 SHA512 f05a9f08c2f2f335d0e483c024321b96fee7424bc1398d4c6acbd9c501f92e22f881bc3d6ec2c0434f9bf4604f3c4b0e880e37d3d0de410eac1a20ea6669baa6 WHIRLPOOL 64c11606ac87af7ca9b1394a098b1a4490f2531db214aa9283625bc118cbc1bf123dd93f6dd94e608bddcc57f9ec522c7dfb641065232dfad7c53ba405299b9e
diff --git a/app-text/libexttextcat/libexttextcat-3.4.4.ebuild b/app-text/libexttextcat/libexttextcat-3.4.4.ebuild
index 6fd945af2870..ae54c4935583 100644
--- a/app-text/libexttextcat/libexttextcat-3.4.4.ebuild
+++ b/app-text/libexttextcat/libexttextcat-3.4.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://dev-www.libreoffice.org/src/${PN}/${P}.tar.xz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~s390 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
 DEPEND=""
diff --git a/app-text/libexttextcat/libexttextcat-3.4.5.ebuild b/app-text/libexttextcat/libexttextcat-3.4.5.ebuild
index 639d0e51f85c..05a6e80cafdf 100644
--- a/app-text/libexttextcat/libexttextcat-3.4.5.ebuild
+++ b/app-text/libexttextcat/libexttextcat-3.4.5.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://dev-www.libreoffice.org/src/${PN}/${P}.tar.xz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ppc ppc64 ~s390 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
 DEPEND=""
diff --git a/app-text/poppler/poppler-0.57.0-r1.ebuild b/app-text/poppler/poppler-0.57.0-r1.ebuild
index fafef568109a..49015b566297 100644
--- a/app-text/poppler/poppler-0.57.0-r1.ebuild
+++ b/app-text/poppler/poppler-0.57.0-r1.ebuild
@@ -11,7 +11,7 @@ if [[ "${PV}" == "9999" ]] ; then
 	SLOT="0/9999"
 else
 	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	SLOT="0/68"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi
 
diff --git a/app-text/ronn/Manifest b/app-text/ronn/Manifest
index ce1a24d48bae..fe5035bfa679 100644
--- a/app-text/ronn/Manifest
+++ b/app-text/ronn/Manifest
@@ -1 +1 @@
-DIST ronn-0.7.3.gem 61440 SHA256 82df6fd4a3aa91734866710d2811a6387e50a7513fc528ce6c7d95ee7ad7f41e SHA512 885418c88d5a1073f9457ea11e29d82d3bb40ad12506589ccfab83ad447445e41282c9688aba5646082ae5ecc6a047fa9439ffae14561152fc61a136474f611c WHIRLPOOL 0497ea22ff387f661381a2d0e13cc8d44068e85ec0b90f40cc80f7effa84c3277ee585464547f926aae853c4a88197c1b1b9056edf2da60583c1005bfa942c65
+DIST ronn-0.7.3.gem 61440 BLAKE2B 3ff0a1752d7a972b7d8319cac2b1287e7d21207e22b9eb288694172eb9b30b2198e4378eb02df8418585a44d3d2c89b4695675933dc5ef5d9ba63c78e71f4e7c SHA512 885418c88d5a1073f9457ea11e29d82d3bb40ad12506589ccfab83ad447445e41282c9688aba5646082ae5ecc6a047fa9439ffae14561152fc61a136474f611c
diff --git a/app-text/ronn/ronn-0.7.3-r3.ebuild b/app-text/ronn/ronn-0.7.3-r3.ebuild
index f3b3fad224ed..6a13ecd21d9d 100644
--- a/app-text/ronn/ronn-0.7.3-r3.ebuild
+++ b/app-text/ronn/ronn-0.7.3-r3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/rtomayko/ronn/"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~x64-macos ~x64-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~x64-macos ~x64-solaris"
 
 IUSE=""
 
diff --git a/app-text/xapian-omega/xapian-omega-1.4.4.ebuild b/app-text/xapian-omega/xapian-omega-1.4.4.ebuild
index 036a5b397900..e1d29c7a0e86 100644
--- a/app-text/xapian-omega/xapian-omega-1.4.4.ebuild
+++ b/app-text/xapian-omega/xapian-omega-1.4.4.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}/xapian-omega-${PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86"
 IUSE=""
 
 DEPEND="dev-libs/xapian:0/30
diff --git a/app-text/xindy/Manifest b/app-text/xindy/Manifest
index f1545877158f..bb5e218f36ce 100644
--- a/app-text/xindy/Manifest
+++ b/app-text/xindy/Manifest
@@ -1 +1 @@
-DIST xindy-2.4.tar.gz 498024 SHA256 616f977b014d67814d6ca45149e1452f3b1410176969d32b6ead5bdf6dc55d71 SHA512 d718954c0c9efcf36dcc99518542b45b3fbbb922b98989c56feb542b00944003adb5834656add0aa88b1983f98e1d9d76e5355aaf9e6ad39f3e0dd109a18ade4 WHIRLPOOL 2f361bd5d395f3b5cfb63d7dcdaea6d152e979b173244ed32438108639cee31ef71f53fdfc556549ad38dfc85ccc221360d0bce8f3d8b1f86407bd33cd31a9ca
+DIST xindy-2.4.tar.gz 498024 BLAKE2B 67cc7f96e4937e8130c66449226d581f121e7b06a82bde40f3f880e48e48e49805856e39c7670a34080731168ee7386beffe52fa6c3e8142a3d66f4c7ebb8ce3 SHA512 d718954c0c9efcf36dcc99518542b45b3fbbb922b98989c56feb542b00944003adb5834656add0aa88b1983f98e1d9d76e5355aaf9e6ad39f3e0dd109a18ade4
diff --git a/app-text/xindy/xindy-2.4-r1.ebuild b/app-text/xindy/xindy-2.4-r1.ebuild
index 4575091c5636..890b05bc030c 100644
--- a/app-text/xindy/xindy-2.4-r1.ebuild
+++ b/app-text/xindy/xindy-2.4-r1.ebuild
@@ -6,9 +6,12 @@ EAPI=6
 inherit autotools
 
 DESCRIPTION="A Flexible Indexing System"
-HOMEPAGE="http://www.xindy.org/"
+HOMEPAGE="http://www.xindy.org/ https://github.com/jschrod/xindy.ctan"
 SRC_URI="http://www.xindy.org/${P}.tar.gz"
 
+# The latest development is now on the TeXlive SVN. 
+# The author jschrod backports it from time to time to his github repo.
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~x86"
diff --git a/app-text/xindy/xindy-2.4.ebuild b/app-text/xindy/xindy-2.4.ebuild
index 70a2f65a96d7..0352e0f329aa 100644
--- a/app-text/xindy/xindy-2.4.ebuild
+++ b/app-text/xindy/xindy-2.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=3
@@ -6,8 +6,11 @@ EAPI=3
 inherit eutils autotools
 
 DESCRIPTION="A Flexible Indexing System"
-HOMEPAGE="http://www.xindy.org/"
-SRC_URI="http://www.xindy.org/xindy-2.4.tar.gz"
+HOMEPAGE="http://www.xindy.org/ https://github.com/jschrod/xindy.ctan"
+SRC_URI="http://www.xindy.org/${P}.tar.gz"
+
+# The latest development is now on the TeXlive SVN. 
+# The author jschrod backports it from time to time to his github repo.
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/app-xemacs/Manifest.gz b/app-xemacs/Manifest.gz
index 699a2355ba20..18f39474e86f 100644
Binary files a/app-xemacs/Manifest.gz and b/app-xemacs/Manifest.gz differ
diff --git a/app-xemacs/ada/Manifest b/app-xemacs/ada/Manifest
index 4d816e90cf65..2072cd6e7f1a 100644
--- a/app-xemacs/ada/Manifest
+++ b/app-xemacs/ada/Manifest
@@ -1 +1 @@
-DIST ada-1.14-pkg.tar.gz 55836 SHA256 a5f6d04db73211ca69db2f2fba689778c9ae7d386c36abdb1a1b7735273aa3b4 SHA512 9925cd30f9d67b72086114b1cc723ab131541f694eda77a6094a7d5b5d20b340ef9e285930e793b61c87bd8f732acc37a80ffe3fe0836ee01beca36b303bb1e3 WHIRLPOOL fbedd0d1382633dc3fa0b52dd5496154806a6eb02e0c15ded9740eaaf9226a4e92b8f073dea622162ea198080480e71a4b706c6d6c4e4e59c043479d83212974
+DIST ada-1.14-pkg.tar.gz 55836 BLAKE2B d61de679848b2cda840ee24fc930495b3b16c664a63d8e5d960cc891c3b327417657b143b18052f33b530aa82971154737c66d71876ca872e7ec0973fdff0834 SHA512 9925cd30f9d67b72086114b1cc723ab131541f694eda77a6094a7d5b5d20b340ef9e285930e793b61c87bd8f732acc37a80ffe3fe0836ee01beca36b303bb1e3
diff --git a/app-xemacs/apel/Manifest b/app-xemacs/apel/Manifest
index 7fcc24cf03bf..325d95488b4a 100644
--- a/app-xemacs/apel/Manifest
+++ b/app-xemacs/apel/Manifest
@@ -1,2 +1,2 @@
-DIST apel-1.32-pkg.tar.gz 121589 SHA256 0721f940d2ed302b14c2e4e64effb4648dd5d7f69cbad89a8293abe5233e5fa5 SHA512 5f0c18fcd05ef28766a0e5fe265cfbb5fd637fb393c10eee47475898617dfc54563e3e021a8b9cd54baca7b0a29168aeb451382c89c3ef0a3fe96f0682ba1d8b WHIRLPOOL 9287f4515d31d0a8f05f411038988bc62edd4e9af2d1ee25df8e5921703095623c01e3663c913e31dad87959abb0f663ca0d650b256f531951283c98dd0a345f
-DIST apel-1.34-pkg.tar.gz 124989 SHA256 fc6a657c81d90c714fa101c183c7b79cc7cd2b29e61543e909e23fafd711d4fd SHA512 29c42c0908499d4e78f1ba7197d2d0da57f1bea179dd870422b3ea8475c50a91cb5d0470b6b02d241b2af46b2ee4e05f7b3d836bb7315dbb58bf75751048da30 WHIRLPOOL 7adbf10d1bfe7b295692ba15a4c1faacad85d93222c8b835856432b793516e89a5a0d4c447632cf93a9ad3a071a85df602e21d1c6b0190316d0e5783e6324881
+DIST apel-1.32-pkg.tar.gz 121589 BLAKE2B 177a29672eec4ee8b47235eebed5bce25c90431461e23f378c6dd3d3303abc6e2b9667dd845b80e27421d1007ee2e377395fd2b64b72fe4d1298ea689edd96d3 SHA512 5f0c18fcd05ef28766a0e5fe265cfbb5fd637fb393c10eee47475898617dfc54563e3e021a8b9cd54baca7b0a29168aeb451382c89c3ef0a3fe96f0682ba1d8b
+DIST apel-1.34-pkg.tar.gz 124989 BLAKE2B c8504878f8c0df2e41bfd81db76136f280f22309e339bdb119260acc6aed568b240db1b82bf506bf26034543df1134ff50874a233d0e959c34ba2df126c6e0e9 SHA512 29c42c0908499d4e78f1ba7197d2d0da57f1bea179dd870422b3ea8475c50a91cb5d0470b6b02d241b2af46b2ee4e05f7b3d836bb7315dbb58bf75751048da30
diff --git a/app-xemacs/auctex/Manifest b/app-xemacs/auctex/Manifest
index f4f521e95162..f7db935cc75b 100644
--- a/app-xemacs/auctex/Manifest
+++ b/app-xemacs/auctex/Manifest
@@ -1,2 +1,2 @@
-DIST auctex-1.47-pkg.tar.gz 710901 SHA256 bdd03c1ca44a151e5401ada90c2b9ce800aa756082640eb7952eb090f19fd50c SHA512 a5c06277decb8ce5f515ec09103702bff95eeba48b7d9df9ca6f8fbaab33bd9964d6296de5d5baae0f02e07fb434b48831ff9bc86f061f38eedb1b6c708f4e56 WHIRLPOOL b78642ec4774f455401e6f2d3ced6a968fa7f9b24ea8eb27a7d74605b893002749f01bc3dd5345097f1c21efec863dbbfe44b475020641e5192db8782d180745
-DIST auctex-1.51-pkg.tar.gz 1002835 SHA256 38126fed57100dbaf67972fdd5601075aea18b5c5d6c28ca66921312cd3780d4 SHA512 f6a3edcf2992c03e6e39ecfdf534589341a5331df712a534c39b70976eaf6f353271987282d1217fc8bae2daf7104273f5eb0134f95a5bdf2d2e0fab31a5675f WHIRLPOOL a7f10050fee18887271162aca2a568e2071ab019b28e734b7d2d89fa88939d34a7677f5a2fea76637885164e8f4bf782c1785ea23fc8c0da5175e1cbdd443e24
+DIST auctex-1.47-pkg.tar.gz 710901 BLAKE2B 438296d1b4fb038b3c2956cfe4f54432680c76298f81610094a0be2c9cf0efa181f7cdc6d7fa1766b66f9851aa73636da018eb282b7c24de70a11bf246a74956 SHA512 a5c06277decb8ce5f515ec09103702bff95eeba48b7d9df9ca6f8fbaab33bd9964d6296de5d5baae0f02e07fb434b48831ff9bc86f061f38eedb1b6c708f4e56
+DIST auctex-1.51-pkg.tar.gz 1002835 BLAKE2B 8f71cb30bb78108d59e5ba76dbf0763c781167d112e1c59b2869a16e033061f5414709e31642a39ca0180333a3dfb50c304436a61d73653ff8b9a7812812cdf4 SHA512 f6a3edcf2992c03e6e39ecfdf534589341a5331df712a534c39b70976eaf6f353271987282d1217fc8bae2daf7104273f5eb0134f95a5bdf2d2e0fab31a5675f
diff --git a/app-xemacs/bbdb/Manifest b/app-xemacs/bbdb/Manifest
index 0a2f78b0b99e..7c283afbd41c 100644
--- a/app-xemacs/bbdb/Manifest
+++ b/app-xemacs/bbdb/Manifest
@@ -1 +1 @@
-DIST bbdb-1.32-pkg.tar.gz 380002 SHA256 669d69a167e0b719a5c52581e9f42d433e7266b2b26e9cade2349f08ee74c10f SHA512 238ab158f3a3606bfb753aa02aa6556170df61bfa523cada8570feb97d43cdee481264c2faef30eb2a9c6e345dc1e3f5fbdbe1e44272a2a57115733cc4e2e28c WHIRLPOOL a3ac7ea326b9f94cc380ad8bb416e5a0b7e9c691e6de2a6b684aa41849ed51bbd235c58892ceaa0c516503bc514175faad4a5595c6618e1765e2fb08026d5b38
+DIST bbdb-1.32-pkg.tar.gz 380002 BLAKE2B d4ba20cdcbb63cbe3aae65cf7c7dc69ef1dea7c888a841a697a77ca63bf6af58caab38efcda5993e6b029e8536cbe47312670498c0f0496dc2422138d8c8d6eb SHA512 238ab158f3a3606bfb753aa02aa6556170df61bfa523cada8570feb97d43cdee481264c2faef30eb2a9c6e345dc1e3f5fbdbe1e44272a2a57115733cc4e2e28c
diff --git a/app-xemacs/build/Manifest b/app-xemacs/build/Manifest
index 205a337ff3c9..6dfade44a2c7 100644
--- a/app-xemacs/build/Manifest
+++ b/app-xemacs/build/Manifest
@@ -1,2 +1,2 @@
-DIST build-1.14-pkg.tar.gz 49484 SHA256 d66666787bd7529aa9f3e88e18ef733d0875661cde70e628e423914574411879 SHA512 bdda0904d8790df0adcaace0df038714f8175dea682af567daac8b0436436dd6e20d2f49f84deae5090f6d5013165de61b8ca50d81d5fea837b9f6013f9ba050 WHIRLPOOL 2ac077688e0463fe291e50670b7fabd02964ae7d4ed25bfc0857e873b2afd139454c88a8d45afbff62b0409513545c912bf08d6f9c0abd88e9db9c544c8398c6
-DIST build-1.15-pkg.tar.gz 49849 SHA256 76196725ba6fade1829a6c4978819a95d9ea284c29d9042f108ca299397229eb SHA512 bf72d2509250fbd93a512ce445a5a17f01ea47965a729dc3e9a4745093b3057158482674393fa10fd76574f1cad0a998d0ceb5cd37d959cee70a3d8f098e5640 WHIRLPOOL 2e7e69cff67666f330950ba2cd06643cdd052e21c9353d0f583e879a1da95a9be23ad45a2457b91d0f2e4c4fc5aae7ebeccde70803355577a5ad32d7ff7b2e91
+DIST build-1.14-pkg.tar.gz 49484 BLAKE2B 1d0072b9d7737a8d74a12ef0ce45909f212aeb58a4343522da0036f65be11955766756428fd7f6302c449cbb8936bfad70e69fc3b90ec90884de79b248753633 SHA512 bdda0904d8790df0adcaace0df038714f8175dea682af567daac8b0436436dd6e20d2f49f84deae5090f6d5013165de61b8ca50d81d5fea837b9f6013f9ba050
+DIST build-1.15-pkg.tar.gz 49849 BLAKE2B a41e3441a9e1734bfd5caf1b999644fe0ff36c5e9bcb12d03b551bbcee308c14a5378f45966ca5b460a52950e22b4e06c20b215e2b5ccd1d2caef3b8f1f36812 SHA512 bf72d2509250fbd93a512ce445a5a17f01ea47965a729dc3e9a4745093b3057158482674393fa10fd76574f1cad0a998d0ceb5cd37d959cee70a3d8f098e5640
diff --git a/app-xemacs/c-support/Manifest b/app-xemacs/c-support/Manifest
index 7e476b8fa97f..ccad4d3091e6 100644
--- a/app-xemacs/c-support/Manifest
+++ b/app-xemacs/c-support/Manifest
@@ -1 +1 @@
-DIST c-support-1.22-pkg.tar.gz 78027 SHA256 e357700960e0b09cf828e00d919fce33d542758925866ea7d46555782bb1b785 SHA512 38ca69f114541a9886ac547701d3d2bae90707307e73ca9ef2b2867500c0ea1b16f9a1fe3bc69b039dafe9cfabafadab46c11d156873c3105c77026655ae00a4 WHIRLPOOL e8bc7f59d85a34fdebac3626a3f2ed0d6446c91cfbc39301c14d982344e94d205bb08a3bd0b837c6ff7e33b7ed7fd279ff3c06f0a0e5270dafc165ac2b05b5ea
+DIST c-support-1.22-pkg.tar.gz 78027 BLAKE2B 6431841a5bde016211016723b633b6aa1c7c10e62f0a846d52b4b77053226392e4ed4170384144235ca48f5dde5d47312c34085069ef682bb0b199f7d926c289 SHA512 38ca69f114541a9886ac547701d3d2bae90707307e73ca9ef2b2867500c0ea1b16f9a1fe3bc69b039dafe9cfabafadab46c11d156873c3105c77026655ae00a4
diff --git a/app-xemacs/calc/Manifest b/app-xemacs/calc/Manifest
index 169b84798667..c2c2e70b94f1 100644
--- a/app-xemacs/calc/Manifest
+++ b/app-xemacs/calc/Manifest
@@ -1 +1 @@
-DIST calc-1.26-pkg.tar.gz 1600637 SHA256 5ac3447cb63ae5886429e56f5819f872e15c3d51f6abd23dc35589d442b551f5 SHA512 f727675754980f448d9607fd45b561642104888042fae35f64e20130e0ee7c9dae8cb24b07d871281e3e995b97addf268e6d2db390d900f4826c85c89c30845b WHIRLPOOL f344cada7aa78f0806bbea4afd04ab2df0a172f623386b3970348e79f3d8d12b6a79355fb4cbc7cd6ae8ffa3dada36f2fce904b3de57cf109bd64e01084e4339
+DIST calc-1.26-pkg.tar.gz 1600637 BLAKE2B 5ded27390d06e9e5ade53e6b33ad9583233ebae64f2600e9cb3c8717bac7e372bad4e45c2fad45f15090bfaa7e661f98a84414e297765dae0578a58f06b49394 SHA512 f727675754980f448d9607fd45b561642104888042fae35f64e20130e0ee7c9dae8cb24b07d871281e3e995b97addf268e6d2db390d900f4826c85c89c30845b
diff --git a/app-xemacs/calendar/Manifest b/app-xemacs/calendar/Manifest
index c4849b058fa5..b69aa7a0ad86 100644
--- a/app-xemacs/calendar/Manifest
+++ b/app-xemacs/calendar/Manifest
@@ -1,2 +1,2 @@
-DIST calendar-1.32-pkg.tar.gz 410752 SHA256 b59f3984d9d7e571c671838f3c8a15eb93060bee61cfef0ccad06471a7a6b621 SHA512 ca9a2dd135d012e094044f066939dafad0ef5f73f738b538c0f7aefc08c2e9efa0e1bcd3a3630681cfb90ec3b3319fd9b8594675ca2747627924d53d3fbe8ec1 WHIRLPOOL 27dfbd52eb75b250fc07d6b23a5f4b99575fdc5cb84d228712585e5d5733b709d7500a5def2a97208bca9b1ce683adafc0f1d695f284ef770fa649ec853ba368
-DIST calendar-1.38-pkg.tar.gz 411386 SHA256 6f513caf85fcd494534664e77e4c56d378f9932c9c65690b578125fd309fc794 SHA512 d5158147df3fffcba550f4bdb34aba916b9071734c2e08b3bebb4c1969ac06b15b79337b4d2f50a53e057ff097fc63162849d5dc0983da4363e4e484357c571f WHIRLPOOL 279f4be00fd8c457c641e239fcfa0b07355e7e741d0deef113a4c27bd59ff33c9b174ab52a75a3b68c5cff118684899961f709bb6f21a66dbba972ef021dec5d
+DIST calendar-1.32-pkg.tar.gz 410752 BLAKE2B 698ffcef148c6c84fbea7328da45d73bdf49601a94e3776b00ea7bae58223ef6ff1706ee8bf0e090e6aca16bcc6ed5c2037af2f9bb694ba03a840b20913afc19 SHA512 ca9a2dd135d012e094044f066939dafad0ef5f73f738b538c0f7aefc08c2e9efa0e1bcd3a3630681cfb90ec3b3319fd9b8594675ca2747627924d53d3fbe8ec1
+DIST calendar-1.38-pkg.tar.gz 411386 BLAKE2B be833c4f81a9d2e79e06768836fe1e58601c9b483f9febe127bd2c2bfe77259a3cd50630920e2df38de14234c1eece9c498b71073d967a06bf27258d91c9010c SHA512 d5158147df3fffcba550f4bdb34aba916b9071734c2e08b3bebb4c1969ac06b15b79337b4d2f50a53e057ff097fc63162849d5dc0983da4363e4e484357c571f
diff --git a/app-xemacs/cc-mode/Manifest b/app-xemacs/cc-mode/Manifest
index 400ec9874e45..dc94b5fc715b 100644
--- a/app-xemacs/cc-mode/Manifest
+++ b/app-xemacs/cc-mode/Manifest
@@ -1 +1 @@
-DIST cc-mode-1.45-pkg.tar.gz 524116 SHA256 d70bf9bab27eddc68c4cbe2e378b8ebe7a3ca4da0e87d81cac06afcddcaa267f SHA512 1b584685e2d6878d29e07e0618ac1e3a8306be8e5f8e39f9ccecc9458d155967844a0544f87d9f25518d52f322dfc7433e5578f84e46423f14ffa8f901537d3c WHIRLPOOL 4e4aece6f339328333b46d3f66a25536e330d17c223269d6048b97753fc6b22be8c731df284e0beec5cab49e2b1941a2c585af33adf8766628427f03772d0a82
+DIST cc-mode-1.45-pkg.tar.gz 524116 BLAKE2B ba250dd9f9fd97c7659768f23c215a31e1b0b9fc7e60824328048bf3624a88577586e3cb06bd9e12a667b30a6dd68d097d6c448a571498b6d88dc73afae65268 SHA512 1b584685e2d6878d29e07e0618ac1e3a8306be8e5f8e39f9ccecc9458d155967844a0544f87d9f25518d52f322dfc7433e5578f84e46423f14ffa8f901537d3c
diff --git a/app-xemacs/cedet-common/Manifest b/app-xemacs/cedet-common/Manifest
index 5a74482f2ff7..0daa1a5452d1 100644
--- a/app-xemacs/cedet-common/Manifest
+++ b/app-xemacs/cedet-common/Manifest
@@ -1 +1 @@
-DIST cedet-common-1.01-pkg.tar.gz 73671 SHA256 146d5a0d0646770a3afb5217634d6b5cf1e0c197f50a2fbfb958c09c734f54ff SHA512 53ee8486ff02ff5dccfd9974b3f7bfc710befee95ad3db1bcfe5e67c5dcf740440f060770a080264f0b0f09013867ee7d66a83d7b3919c7e598ef3207340d9d8 WHIRLPOOL 5b1f6da977cda136f3e8c3953ff5ac70065f618b73d9de81b8b4ec9f4974d20c45f940e95810641e11a93d255f897a5a543dc8885add917ddfdefb334a696396
+DIST cedet-common-1.01-pkg.tar.gz 73671 BLAKE2B ced597935ef483ee6d92a1245d255200a767b0663b7c90d0adefadecf5b42bc4734597cefcb35268ef6eda5bc1887ea7a9110fc894e72b6fcefd7ea8d1ddb2a7 SHA512 53ee8486ff02ff5dccfd9974b3f7bfc710befee95ad3db1bcfe5e67c5dcf740440f060770a080264f0b0f09013867ee7d66a83d7b3919c7e598ef3207340d9d8
diff --git a/app-xemacs/clearcase/Manifest b/app-xemacs/clearcase/Manifest
index b4c333087bf0..6fc84acad756 100644
--- a/app-xemacs/clearcase/Manifest
+++ b/app-xemacs/clearcase/Manifest
@@ -1 +1 @@
-DIST clearcase-1.10-pkg.tar.gz 105865 SHA256 deb6489ce736009ba3cc849c8f73f2543cab25095c3b48a08e9aa6bcdc9aa870 SHA512 a2e909efcc372e40f05af9a588eb8e6222c64947ca61460e137f516c43294120727527e98af72bbd9c4c3782d62cc9ff8fe06743d4dc498e0c12721f229d9a1a WHIRLPOOL c1366caa0351cd8991242a06f378657e652709fdb9031976a0b33fccc245f2357c13be9eec0bf16bf6285a1ff4495da7324b861ffcd16cf437958989ebfd5787
+DIST clearcase-1.10-pkg.tar.gz 105865 BLAKE2B 42738b8614b4feae38fb45d4839219a523052bb330a78ca7f4c271b0163c89934c4e18b7329d970270880ae197a6ba1aec6e5713aebe073007cf079635ebfdd7 SHA512 a2e909efcc372e40f05af9a588eb8e6222c64947ca61460e137f516c43294120727527e98af72bbd9c4c3782d62cc9ff8fe06743d4dc498e0c12721f229d9a1a
diff --git a/app-xemacs/cogre/Manifest b/app-xemacs/cogre/Manifest
index 9ca400461c44..e75fb9476262 100644
--- a/app-xemacs/cogre/Manifest
+++ b/app-xemacs/cogre/Manifest
@@ -1 +1 @@
-DIST cogre-1.02-pkg.tar.gz 47588 SHA256 2c65a04e703f1185c938d7ab3b4916b90d3b875aabe6b4c3ada2d4cf374fd803 SHA512 a3256df974d92440cb63b612e30807088450854cb157e1ba01e0362c36262fcdef11d5f1240796091ee2a6869f4dec06e9ab55dabd55ada5d2c7e7410e0e537c WHIRLPOOL ae74bfa788db481ff5c0c1723eb1088d963b78cfc812633a4c598e4f061fc52340e6cc785e43d5ece292812cea4870e401855aada3d615752408ad60acec8554
+DIST cogre-1.02-pkg.tar.gz 47588 BLAKE2B 6ce7f40e5aafa2aeaedbb5f17b4624decd0c87ec4fb38f186e0419c5496109d0b6fc267d6f484eb84fdd22f5f59c70451241e92c7bf7dc26c956e3ae6a95e7b7 SHA512 a3256df974d92440cb63b612e30807088450854cb157e1ba01e0362c36262fcdef11d5f1240796091ee2a6869f4dec06e9ab55dabd55ada5d2c7e7410e0e537c
diff --git a/app-xemacs/cookie/Manifest b/app-xemacs/cookie/Manifest
index b21432a08064..f4bc0bfd4389 100644
--- a/app-xemacs/cookie/Manifest
+++ b/app-xemacs/cookie/Manifest
@@ -1 +1 @@
-DIST cookie-1.15-pkg.tar.gz 35035 SHA256 351e8957b59c057842cf591e683ba8ef58ed8f678bfc2e42aeb5ec0c0f8ab59b SHA512 0fdbc6f1db7f0fceaa35aaf8ab148875f4b391a3a2accab41c02267ad385fff4e54538e5335b2acca3e2d2550a9b2b00e78ae1e0b1bb997617ab439db9c89ece WHIRLPOOL cb766c465f98bc5d97a222211032df1fcf87af7bba787581db77dd30bbdfcc96d7538fec852e5ee480e94ab1a8c26de9688dff03177f9fa6de6fb58d6f4a16dd
+DIST cookie-1.15-pkg.tar.gz 35035 BLAKE2B 4cd1408781337b8f124a5106a0a1c5d0f47860c3300f5451a031ec0403e6434a13973d93906e6585318b757fbd670aa7dd7a239445f6882f2574f92e48bff66b SHA512 0fdbc6f1db7f0fceaa35aaf8ab148875f4b391a3a2accab41c02267ad385fff4e54538e5335b2acca3e2d2550a9b2b00e78ae1e0b1bb997617ab439db9c89ece
diff --git a/app-xemacs/crisp/Manifest b/app-xemacs/crisp/Manifest
index f4383115946b..2b0b1c94f116 100644
--- a/app-xemacs/crisp/Manifest
+++ b/app-xemacs/crisp/Manifest
@@ -1 +1 @@
-DIST crisp-1.15-pkg.tar.gz 10436 SHA256 4e1de2b0ee4b18742d899f9dc41d162bab7171762a61dcc22245770121bbcb9b SHA512 815d86bfc854e78c35fc8468f4e9aa3de05f9b029f4ec9e344880d398ae4b5a2bf8cc3391b0f6b8030090fcb4966dbc3871518410c99cd265c751b40c0e2b42f WHIRLPOOL b8e94a191c08d8d4849429378ff6853b0144155ff6b6fab47addcabcd4379ca8f533e03b31e78f5ebe26bf73d75702ee7b977c00d032d93f32a55cb773b30efd
+DIST crisp-1.15-pkg.tar.gz 10436 BLAKE2B df57ef3f1eb7cc235f21bf40c8770cecf3ea139833cb1f27b3c25649721734fe88eb9af88a7da2e19cc98d869816087c52464e13dc254d6c1693e05089ed8083 SHA512 815d86bfc854e78c35fc8468f4e9aa3de05f9b029f4ec9e344880d398ae4b5a2bf8cc3391b0f6b8030090fcb4966dbc3871518410c99cd265c751b40c0e2b42f
diff --git a/app-xemacs/debug/Manifest b/app-xemacs/debug/Manifest
index b0d64138e2d4..12a981c0276e 100644
--- a/app-xemacs/debug/Manifest
+++ b/app-xemacs/debug/Manifest
@@ -1 +1 @@
-DIST debug-1.18-pkg.tar.gz 107997 SHA256 ab10bab32508c4636551fe80ea189c1db54be7c6ead803c2e3edb6f5b21edd8c SHA512 0bbd5496636bf6b850d44f953865ca7c23bb5f5040be0d8f6ec385a590ffaa6d5e325b24aac7f07b0b6c8ba0abf3fc3b7214f06a09d20eabc6bdf940237106a1 WHIRLPOOL 1109ad937b94a7a50d6a6b5038f1adca8c404c33f69eaf23207d3d25dc62830d7e1a690e08f0a0d7f7b29fdeef3b8fc4d219f1733a913bb7448ed54c986ae5a4
+DIST debug-1.18-pkg.tar.gz 107997 BLAKE2B 06873ef6d3886c8b5e9659084bb3a50db955e27ab5104d0f29271ebcfa2e5c298c1bee59f46dac0d4d10f8c0dd89c4b0c99e23bef2c449da697d22641d15bb6f SHA512 0bbd5496636bf6b850d44f953865ca7c23bb5f5040be0d8f6ec385a590ffaa6d5e325b24aac7f07b0b6c8ba0abf3fc3b7214f06a09d20eabc6bdf940237106a1
diff --git a/app-xemacs/dictionary/Manifest b/app-xemacs/dictionary/Manifest
index a1246f82666e..61b090d3024c 100644
--- a/app-xemacs/dictionary/Manifest
+++ b/app-xemacs/dictionary/Manifest
@@ -1 +1 @@
-DIST dictionary-1.16-pkg.tar.gz 40085 SHA256 22917394b54d798962fbe90d7081ed0e092852563c40e84cef224176d589e59f SHA512 8dc0c0809d713f9eda280b110dbffa6f237c50ebb2e6c93f571efb3d22c1875ee5359fa91bc3faa58b3b0f431e75b84527262defb8aff5174a400be61f1a80dd WHIRLPOOL be827701650b09cc4a013e3aaf30087c1c4e7ad45f4fe664a2d16dc06d92040a06e3921d4da59cd30d45010b9ad752620ccf2cfb83c923699927d64cd95cbde2
+DIST dictionary-1.16-pkg.tar.gz 40085 BLAKE2B 413d5b82704eed5f96b99ffaedecdb149e8e562fa7e1a559cb396076d1ddae758fb634e00326f3f8682f7a1199905e3be7b0f271903f52faa532dbf31b8367fe SHA512 8dc0c0809d713f9eda280b110dbffa6f237c50ebb2e6c93f571efb3d22c1875ee5359fa91bc3faa58b3b0f431e75b84527262defb8aff5174a400be61f1a80dd
diff --git a/app-xemacs/dired/Manifest b/app-xemacs/dired/Manifest
index 0649d755345a..f4c1ce3640cf 100644
--- a/app-xemacs/dired/Manifest
+++ b/app-xemacs/dired/Manifest
@@ -1,3 +1,3 @@
-DIST dired-1.17-pkg.tar.gz 201027 SHA256 80c757ca26aca4a760e7b878eac62e94fa30b7333cc0c145c8fa39289795fcad SHA512 337e32734df33520d3bfb492f04c82430ca473da5d8f69ced98f7562260e40d1ff85739e905c05412d8ad8b0e175927e90304fb2c79b8670899173d8c0cc0472 WHIRLPOOL 9aa4798d965a1155c7492666d05e98a38a5998034a75332526f851cbb65566e536d839cd9fa5056047b0324ee28054e309c5394b42ca5c68d12c43aee9e362ca
-DIST dired-1.19-pkg.tar.gz 203355 SHA256 65dc2ab57bfd2804a7b34d2918f13a79c898b54d033e7df53c351ef145833015 SHA512 522d63a018f640cc1120dfe4bce8215649b745f8c692e0dd875f41b92ffb54cf22968983befb7a3e3dcede562c947aa92336c247522bd520b8fb5e53909f5d51 WHIRLPOOL 60a3f2bfb9e131c685e9665599742beceefa607dd5f4187da357512e6429054eeab34d7310c9894328825e8f2b1202a79ea5ca3eb991ebd77bbd175747af2e7b
-DIST dired-1.20-pkg.tar.gz 203778 SHA256 74c06add297c0cf462ea21500d7f5d7eac3164daf458f7bf6851300cab3b8d3c SHA512 889b922cc187689c67c3b6f98264780b4653fe2707730cfa9c32cf5e3d93a5c80c4599daabbe1273f25f32dfc4f487288cdcbc09b8d0ac8b58dc09efb18f689d WHIRLPOOL 958d899fa99dd560522dadd591df04bb4e444da10b8171f06910913bbd2877c538e22aa1634a45a24320cc59a07d6a132b5085c672ca0a8b0f7a9c4caabe7bb4
+DIST dired-1.17-pkg.tar.gz 201027 BLAKE2B f5662499f2c374fe8fe8bbcf7b859e3d923576078b126012d5d2b9b8c4581df607df0e3a9b9244afe333652ce0c92051e939d029c74d168b7052fa11e7e9cbb8 SHA512 337e32734df33520d3bfb492f04c82430ca473da5d8f69ced98f7562260e40d1ff85739e905c05412d8ad8b0e175927e90304fb2c79b8670899173d8c0cc0472
+DIST dired-1.19-pkg.tar.gz 203355 BLAKE2B 9825024621fc488d8ba603bf430b5ab9457afecdf288b95bcafab5e04bbf0524b49d642371e82aa1cee9d551c70867ed93a721e6568598f0797a8e2d4ac800c3 SHA512 522d63a018f640cc1120dfe4bce8215649b745f8c692e0dd875f41b92ffb54cf22968983befb7a3e3dcede562c947aa92336c247522bd520b8fb5e53909f5d51
+DIST dired-1.20-pkg.tar.gz 203778 BLAKE2B 90fdcdfc6cc33e58745bf65eb226c52617cccc73a246bcc4e7bb5525cb625b40ca0cbfd2bef1a97e1b7176c21efa11a0c157103bed7a35417ba06af034b3db94 SHA512 889b922cc187689c67c3b6f98264780b4653fe2707730cfa9c32cf5e3d93a5c80c4599daabbe1273f25f32dfc4f487288cdcbc09b8d0ac8b58dc09efb18f689d
diff --git a/app-xemacs/docbookide/Manifest b/app-xemacs/docbookide/Manifest
index 6ff5eca6e44f..d152c5aacd03 100644
--- a/app-xemacs/docbookide/Manifest
+++ b/app-xemacs/docbookide/Manifest
@@ -1 +1 @@
-DIST docbookide-0.08-pkg.tar.gz 32061 SHA256 289855c09906391260dba6bf71e0ca180e3408f08d1b070f9d3ad04c5ec0feed SHA512 a5de9193285bf185ab808c9aef3f483f81493a0f30327a923ed898700a5a7dcc489e4b6f9fc7767cadae481b62faa5f18e956955575543a037aba1a4059a42b0 WHIRLPOOL efd783657b815c449b956be85bd6b8cf2a692673ccdd3d9e640172820674a807465501e15367981c2aec35d5207df609a2fad0ef6e0b8a8f961db47f5a62a0cf
+DIST docbookide-0.08-pkg.tar.gz 32061 BLAKE2B 051331b77ed2d68feaadd163134b7c39e1c57e87b3ff925ba2c2c353d470f94f575c4977ee18e84acf9e84de5440ebf32a31f507d99b110dbc1bf271069d1164 SHA512 a5de9193285bf185ab808c9aef3f483f81493a0f30327a923ed898700a5a7dcc489e4b6f9fc7767cadae481b62faa5f18e956955575543a037aba1a4059a42b0
diff --git a/app-xemacs/easypg/Manifest b/app-xemacs/easypg/Manifest
index 3d9f6b4e82ed..9a5238b66643 100644
--- a/app-xemacs/easypg/Manifest
+++ b/app-xemacs/easypg/Manifest
@@ -1,2 +1,2 @@
-DIST easypg-1.02-pkg.tar.gz 73462 SHA256 0b441eab0a7a994fde9d7a1dc0a430a189d363d7d42ce8f0463342893e1b2e17 SHA512 ec73fbdec50a01788ca586212d4b71e2c744e3283117515a71f73c3bda82b26d86ef9be52c4f78efeb574635e0b84a87b763f09bb1ced956699d1d97fb294aee WHIRLPOOL 7d38fb7f131254886a3488f36c33856314e66f5b3459b3d325f7688e30d81c330710b773760b7f277c7afa50fe11d3d2242f6c829045c0ca5162c6f4708bc926
-DIST easypg-1.03-pkg.tar.gz 78192 SHA256 80503fd8b260c25d25321d6fe2fe6de2e0907f82a4a80c112b90bc3bb1d0ece1 SHA512 62541d38a09bcd60232cd18c54ded710515a88c2aa7940d823f120fef1c5316afca746723fb7ac564fad7407365daa736d96afc9d228d74b5d9ff19c4121b506 WHIRLPOOL afdd7f4c476d8709d75c79da3498d41eb90ec9593591a7dfcfd903f6b9c68355805b228eeffc8e2594664f7e01bdf98aac3307971d1a30ca9e3d8a142db86073
+DIST easypg-1.02-pkg.tar.gz 73462 BLAKE2B 050b064cf3b7618defbaf893babb5406f6715cb292aed99d9f54ae4e31a26f89a032a90aff0ffa313c7dd12d07e894ebc302fd311e5e5f3e7c49630285ff5fdf SHA512 ec73fbdec50a01788ca586212d4b71e2c744e3283117515a71f73c3bda82b26d86ef9be52c4f78efeb574635e0b84a87b763f09bb1ced956699d1d97fb294aee
+DIST easypg-1.03-pkg.tar.gz 78192 BLAKE2B 5369dbf4f5da0c25c9a2e451dd775a0dc4e6bb5fe077e35b98f655cd23174ec5fc3bcf5df397ad0e9fc5b5728b919da666e91397f0cf13c3a0d9788c580275af SHA512 62541d38a09bcd60232cd18c54ded710515a88c2aa7940d823f120fef1c5316afca746723fb7ac564fad7407365daa736d96afc9d228d74b5d9ff19c4121b506
diff --git a/app-xemacs/ebuild-mode/Manifest b/app-xemacs/ebuild-mode/Manifest
index 4184e3ed8d7a..605451c549b9 100644
--- a/app-xemacs/ebuild-mode/Manifest
+++ b/app-xemacs/ebuild-mode/Manifest
@@ -1,3 +1,3 @@
-DIST ebuild-mode-1.37.tar.xz 30816 SHA256 f7368a8757036874dde542c69c26b824fe3da5241098f89a6b7d7e2665cbbf1d SHA512 1d570b213ad0c6eef8817f69c99c0862703b9bddc24477234dde542b697ba372a06bbe8e4a91179a7d528b720a7dbfc13bb92c8ea0a4d3b3b8684fa4ee0065c0 WHIRLPOOL 75928f5965bdfe66733e203588f01ab3b5de67a5958d33f41069d0793842bd9617ab0904ab71f95aeae04e0aa2f55646e4c545d6199cc1d357140b8fd1a714ab
-DIST ebuild-mode-1.38.tar.xz 30744 SHA256 63f39bb1a09e29b86e5048f162f4779f287c8825e161a092e74530962947d3c3 SHA512 bfcc4fb100f7d9299e9b466c7661e865f9b93ee352780da1647f1a98159fe3e9eeb8cd4b7d1d9906d532316d1256ec7b6f821cac3d064cda15f2fd62ca7cb349 WHIRLPOOL ea61825ac0fd2d50ec9722088b03ed9664708dd6fac076ff3db8323bfdf8d1b2e351c7059f2f77471ea200b7a19d9f67ab233ebdb743ece80218f0e940fb0706
-DIST ebuild-mode-1.40.tar.xz 34676 SHA256 fcce06f2c429989cecb50d043c50a06c28e640987aef84f5760a1c5df1793ef2 SHA512 50caa3255ff874e779f8dcb34b84845fd3b03edee35fc20df8aa3606dc2a00a4a0e88fab79f7872cfe3e92f04263ce74e60f3aeb1d97a2706116414ac9b352d5 WHIRLPOOL 369b152f1ffa6cd818fbb5be7d1ef054508056adfa1fa614d8bcbfba71c8b7f8a61e7b81ee162632cb31e4914c15c7def07bc64ef62a41eafbb9572749a35037
+DIST ebuild-mode-1.37.tar.xz 30816 BLAKE2B f93d1513ec3f2eab4fc4dda4d46aeedaba7f2ffecf20e6f90426c84e979fe72120719b13182ca407576effcf62f839ebc9c2f94d5f9e9d8230b449dd74a58dcb SHA512 1d570b213ad0c6eef8817f69c99c0862703b9bddc24477234dde542b697ba372a06bbe8e4a91179a7d528b720a7dbfc13bb92c8ea0a4d3b3b8684fa4ee0065c0
+DIST ebuild-mode-1.38.tar.xz 30744 BLAKE2B a147fbb462f0e1a2ba3272c74b12c9357200b0ca6671d75263547d7b777489772504c9fda634a797fecff8dce35e40b7bb579cdbd9a7da99f68f74b08a48a4da SHA512 bfcc4fb100f7d9299e9b466c7661e865f9b93ee352780da1647f1a98159fe3e9eeb8cd4b7d1d9906d532316d1256ec7b6f821cac3d064cda15f2fd62ca7cb349
+DIST ebuild-mode-1.40.tar.xz 34676 BLAKE2B bf34c773966540f67c74fe72a8c47073f9385ba210ceecaf8fa8977a67f5945314090c0555b2b12dcee8486ed495dda062d6d36bcaff3a291f3d4ba5ca6886fa SHA512 50caa3255ff874e779f8dcb34b84845fd3b03edee35fc20df8aa3606dc2a00a4a0e88fab79f7872cfe3e92f04263ce74e60f3aeb1d97a2706116414ac9b352d5
diff --git a/app-xemacs/ecb/Manifest b/app-xemacs/ecb/Manifest
index 42d671250940..aae04386c98f 100644
--- a/app-xemacs/ecb/Manifest
+++ b/app-xemacs/ecb/Manifest
@@ -1 +1 @@
-DIST ecb-1.22-pkg.tar.gz 887270 SHA256 03c64d92e6ad51038f8205d5b6692363405ba6b8df7277c146c165c856c2bf8f SHA512 13c1254cd39f346b9165ea9b0eb3195372da54a5d6afce83a86b2c6b2e7673b0d614526f14330a2483a6eed45ce04b8d72ad119e02db2d3aaeff0fd9fd234b41 WHIRLPOOL d5f2b9af5e0e50bc96b39126f90774684ae79233a78eba400ef8ff7a6f9e96f76a2872f6c72ab7b1efbf5f52a0622a0b5cb12dc50dd5e8c629a731039af1e48a
+DIST ecb-1.22-pkg.tar.gz 887270 BLAKE2B 3185c440a06e90f0bfdf2314a8689eb992f568109a98aedf95f65438fee40e2d665cf5b30a175bc6f0cb02591b80439db072fae452a707e93537c2a0b630e650 SHA512 13c1254cd39f346b9165ea9b0eb3195372da54a5d6afce83a86b2c6b2e7673b0d614526f14330a2483a6eed45ce04b8d72ad119e02db2d3aaeff0fd9fd234b41
diff --git a/app-xemacs/ecrypto/Manifest b/app-xemacs/ecrypto/Manifest
index c555f0b937b0..40920a5999a6 100644
--- a/app-xemacs/ecrypto/Manifest
+++ b/app-xemacs/ecrypto/Manifest
@@ -1,2 +1,2 @@
-DIST ecrypto-0.20-pkg.tar.gz 76257 SHA256 557b38e1dad6c5384cf71b7820518b1b79f1fe5b03de833fa60f8f172a63daf2 SHA512 bacf0b8e5ee3c11aed744a9e7a3b33a7e4d10aa698b43b95226cc476db0daaa821b1d8e9fd64a487efc8a8c69b932c3112020815ca8abfaa7e5b08785d8b3e9b WHIRLPOOL 27481ac9588b24e322e5bff8a77620abbf18234361872d966a60db63d6d1c0f0d265ffe5e86d51f3fb2bd11018cfa9c5e90a5db7113607b51e405df8b831be03
-DIST ecrypto-0.21-pkg.tar.gz 76396 SHA256 b486ba0ccef1c3d736390a0d256787446267e4a4232b976521a1ea213ca8ebfb SHA512 b5d74079d940753a809ac294f466ee93244f5c96a79d9af26a45d005ed9b2b4ccb2459baeb63430b8e3dab44db31ea845ec8c64c8d57482e382955b793510e67 WHIRLPOOL 0e84c6d2eea3acc27fda54b7de808533b5948c3a9767f039fec8e6ff3e4ef1c4ed2f947c40e4969fbdb34d41218d4cafee772453226387188065c422a3a1076f
+DIST ecrypto-0.20-pkg.tar.gz 76257 BLAKE2B f9ae37e7addb3670a162ac36750def814121da60864372ab1f75ceacd7133e7071d94962b41a103a27edd081d0f093859eb2db6f6a84f3dcb9517e12af37fe1e SHA512 bacf0b8e5ee3c11aed744a9e7a3b33a7e4d10aa698b43b95226cc476db0daaa821b1d8e9fd64a487efc8a8c69b932c3112020815ca8abfaa7e5b08785d8b3e9b
+DIST ecrypto-0.21-pkg.tar.gz 76396 BLAKE2B b5f730a90370968ab5596a5b0ec8ee72ec93eb71f14df30161be19a9d0b2b8ca82195df462c80120aca3dc6189a1a2158b724eae7ac21c47c88332db79c4f9bb SHA512 b5d74079d940753a809ac294f466ee93244f5c96a79d9af26a45d005ed9b2b4ccb2459baeb63430b8e3dab44db31ea845ec8c64c8d57482e382955b793510e67
diff --git a/app-xemacs/ede/Manifest b/app-xemacs/ede/Manifest
index 20934c4315f0..567014f3f554 100644
--- a/app-xemacs/ede/Manifest
+++ b/app-xemacs/ede/Manifest
@@ -1 +1 @@
-DIST ede-1.03-pkg.tar.gz 124600 SHA256 a6a76f2d19c9820de66c338bca69a3712e0015fad425ff11efef29cbc441501f SHA512 9ac35acf8df8fd6b649720602772404a808556b105dc438bbc495af3ce3323afd0c3ebd05cec4ee5b12199342d836fcc6873146cf06525e12de8277248968de2 WHIRLPOOL 17d23775e2327e2202a90d7e0808f6e56ef4aa7fce67f636afb702ff320ade7904850dc716da9257036bea3d2f4677ac5a9b828ffa6e3390ca303fd19df918ff
+DIST ede-1.03-pkg.tar.gz 124600 BLAKE2B bcd1bdc260b401c2eac620e176d54707ea8ec014205d9d04e9f207629b4c22e311db1215450c2e9f66e6f7ebbd742c1bfe51bd1ccf0412fcfcb37cad7b865035 SHA512 9ac35acf8df8fd6b649720602772404a808556b105dc438bbc495af3ce3323afd0c3ebd05cec4ee5b12199342d836fcc6873146cf06525e12de8277248968de2
diff --git a/app-xemacs/edebug/Manifest b/app-xemacs/edebug/Manifest
index 263b069ba81f..e60ea18c62c6 100644
--- a/app-xemacs/edebug/Manifest
+++ b/app-xemacs/edebug/Manifest
@@ -1 +1 @@
-DIST edebug-1.22-pkg.tar.gz 115557 SHA256 d043b687f3478e50288e56f3eeee08f896a8603f5ab7809f6a228835b43d90c3 SHA512 5f4d86d770d68ab2199cb781da4f3b67dbda979396349212d851890bd257a85195fc5a8e0fa4ab337335887b3c2ff27e46002758926828093b6dce25f8796ada WHIRLPOOL 4c855dcb577f3d84388daab820c4e0fbc31ccdb2695a1230f42027b714a8d37f4ae4a4263da7791a0fa8fb2fe8529e18c40354ab73f23420236a55114fd7e29e
+DIST edebug-1.22-pkg.tar.gz 115557 BLAKE2B ce828bf916a02d15a699cbf0e1da97b3f2492595685bcd40c038dfdb3de2bc93cb1ef62a1ba280642384363a8c7fc7a23aa35073036d7e13aaa43597015a94e3 SHA512 5f4d86d770d68ab2199cb781da4f3b67dbda979396349212d851890bd257a85195fc5a8e0fa4ab337335887b3c2ff27e46002758926828093b6dce25f8796ada
diff --git a/app-xemacs/edict/Manifest b/app-xemacs/edict/Manifest
index c240242a4647..70d110a4fffe 100644
--- a/app-xemacs/edict/Manifest
+++ b/app-xemacs/edict/Manifest
@@ -1,2 +1,2 @@
-DIST edict-1.16-pkg.tar.gz 96111 SHA256 53ea82a89ebf386f9ca127393fefafa9129221b5331078b3f93735252e6c212b SHA512 702d8d454310aaeb0804a96ed5f90c34eb2eeb72c598504404e257640a6cc153e5603cd7d8d1233b152e828fa44ec6919c7e0f9a9870a303b837db6dd5e0632c WHIRLPOOL 8f80bd2b71b5a396ca9822d8f9c4c0ca47f88c38c5159f315399c4894c0fcd596e9b698763ca53487f3db873ed4fbe3a82ff7685b6827d0dda0a57eed6c2e77f
-DIST edict-1.17-pkg.tar.gz 96241 SHA256 78fc1d04a9ae2cf2bd430fdfb003474963475c7b80415057792b2d8a3b0f0fd2 SHA512 df70e1c128fd5d70ce9b5a927e25d3787b6f7e9bf7683c2da98e7a428d8bedbf2da9f1b26f7db41e94857cb30eed43e01eb9073b85a70650cabeea706599449c WHIRLPOOL 2d01ae3a7d6e58e5402636e13ac65fd050927c51cdef09a12a2395c9265e29aa47c2a4cfa9f2a1dd52b5600b2ec7e488e3570f8d97b312f56ed520878e24053a
+DIST edict-1.16-pkg.tar.gz 96111 BLAKE2B 60d0a990e8c2938205cdca4159f0d77360bb864b7ee66ac11b8f5714aa7cab1c2baf23fbcd891a2e0151be221efd9e46754e6ce651b2b4db2172a8835d7bbc46 SHA512 702d8d454310aaeb0804a96ed5f90c34eb2eeb72c598504404e257640a6cc153e5603cd7d8d1233b152e828fa44ec6919c7e0f9a9870a303b837db6dd5e0632c
+DIST edict-1.17-pkg.tar.gz 96241 BLAKE2B 7f353921e15a4334d5ba62048ed755b35e492536e43009c07d52acbb6a81ae92bc2190e3e8c033e1b9ad7cb685b2c673097ebe17c1eceab3d74fff4c9d82b44f SHA512 df70e1c128fd5d70ce9b5a927e25d3787b6f7e9bf7683c2da98e7a428d8bedbf2da9f1b26f7db41e94857cb30eed43e01eb9073b85a70650cabeea706599449c
diff --git a/app-xemacs/ediff/Manifest b/app-xemacs/ediff/Manifest
index 31a9cc4c9ad6..4f8831a15813 100644
--- a/app-xemacs/ediff/Manifest
+++ b/app-xemacs/ediff/Manifest
@@ -1,3 +1,3 @@
-DIST ediff-1.68-pkg.tar.gz 317183 SHA256 3307c5075b2b5b6b89c52fae7c4bb4888ae377b5cdfe6a52c9d2f39ddafe66c5 SHA512 adf3fc6fb0692022d4f44e9b966d076574dc12025b3f90bfb7f7bab6f3735d39c993757619d09a19479afdb73554cf484aae457f1184a8bf5bf831923c4ac6bb WHIRLPOOL a4d6fea67345c7022ffb6f31766007a3ace87abf3a6f34421c84d5598cbadc895e545031f6308d5a28c61d8f9c5d5ae7695117771a1fa58c8b664d269b49d678
-DIST ediff-1.77-pkg.tar.gz 317283 SHA256 2527b4b820ee19915bdc05dfd3541da7a0649cdd0d774e846aeefb93ef0efc34 SHA512 5f1ba2019dfa762382639516eabcfd81da14dcbb35df77c82f24ae3250d003fb4c596d529c6897b7502ee227a67be85da8d01d4d3109d9f28ef6558f0ebc78d2 WHIRLPOOL febb262850502988abd5807bb1de60ec790711a4fd99da6ad20b5db7e3c476d32d34f66c9e24f842c544b6721482915d9f6b480f90b2de057c62aa7edceeaf1e
-DIST ediff-1.81-pkg.tar.gz 321669 SHA256 755d69ae710b9a98058b5f0021e681667c3c32947ce89a3b66320279612f8ac4 SHA512 1535f39a6af02e488f756303223cb116687c28d635f761f8456a439c576bf6691119d29e5fa2c7fca2e2a578faa4d09bac34145a8ca92116aca14e7ea93d694f WHIRLPOOL 12d596ada25a1c1733c7282133b052fa09a442bb91b07e5ae4dca92c8b1ce1248343bb0bcf97756339528c5b53fa3cbd45212cf9c9418f5a2d50234825bf0116
+DIST ediff-1.68-pkg.tar.gz 317183 BLAKE2B 56610f91e61cf4cfba0c7ad444d06a929ddfb6fc65e41bc8dce57ba354e1e6d5b99c5cea0121d11c32d4f277b7f8303026522b0423669d2e77126905b8d61a0b SHA512 adf3fc6fb0692022d4f44e9b966d076574dc12025b3f90bfb7f7bab6f3735d39c993757619d09a19479afdb73554cf484aae457f1184a8bf5bf831923c4ac6bb
+DIST ediff-1.77-pkg.tar.gz 317283 BLAKE2B 1f0fb3206ef6b05cc56ae9512ba7a3f9368952b898e6e324e7b73f748c91de3ec7ed0d7c34dd4961ba9c2d86b988e75065d0578f0777bba602e7693983829e20 SHA512 5f1ba2019dfa762382639516eabcfd81da14dcbb35df77c82f24ae3250d003fb4c596d529c6897b7502ee227a67be85da8d01d4d3109d9f28ef6558f0ebc78d2
+DIST ediff-1.81-pkg.tar.gz 321669 BLAKE2B b4d28035fc6ed786053c04f759524f538e1e61c18df6db1d9e844e8f5718c228cd4c3e8d62f0ba3ef112b6e7bd85c02727a4404fb067fca0135784b963323e20 SHA512 1535f39a6af02e488f756303223cb116687c28d635f761f8456a439c576bf6691119d29e5fa2c7fca2e2a578faa4d09bac34145a8ca92116aca14e7ea93d694f
diff --git a/app-xemacs/edit-utils/Manifest b/app-xemacs/edit-utils/Manifest
index a90db161f0df..8c44206cc208 100644
--- a/app-xemacs/edit-utils/Manifest
+++ b/app-xemacs/edit-utils/Manifest
@@ -1,3 +1,3 @@
-DIST edit-utils-2.39-pkg.tar.gz 962340 SHA256 8ce0c4c88a45f9780c0e6309384c20583e6ef508ca501109e774d73f00a51fde SHA512 dcd6634ec0eb9cb71336ac445fa063a3fabf34d5bfe47f417c00b111a82c42f10679ab6512e1bfcb80596cacb532fa14cb3f5675fb36a5e6258696bb7491fb51 WHIRLPOOL 3278c73bf2b7e3cf569a2b24f11a1801ce8a30cb420008f859f09b02d90f167713ebc4ded495626b424524809772ad4f4458fa9681a2062bd7c000cc980d90c0
-DIST edit-utils-2.43-pkg.tar.gz 958798 SHA256 048f9cf100b2b382af64af733c5b052f7e3232d3b43518c5840ed2bc5b4b4232 SHA512 e42e416002f0f0c580f241ce4753c3868494025b4bfd087f5654e3c238a4b5c99d56f01db6b0fa47d1142085d5b4183625248266d76381387030a89e47a9e68f WHIRLPOOL dd87060c7f3270ac30049bfabee65f716c8bef20bc787ecbba502a69dd7fb5c6d21bae5881b67b634f3bc9544511832f4bfa54835280ffb72952821928f87c5e
-DIST edit-utils-2.44-pkg.tar.gz 958866 SHA256 a7e14d9c95d3f8f301a7a21c70a4b6d31390c180d8d966566dbf2446baec8b99 SHA512 fcb37c24304756e83cd273497cedf671e62ddce78f7bc460052cd3725948e35d87ce9d3108938483cd2ab8fb2d663ffb1df033b47b6e4b7e73f3a71d6d0ae886 WHIRLPOOL 523a7ecdfcbb726641ecd123867d48254e39c1d3edd83bc3a5cb0bf2f736baab8e93682c4d58c060eb34e8a9de0229374e012853968cbe671daa911ae5d9c6e8
+DIST edit-utils-2.39-pkg.tar.gz 962340 BLAKE2B 58fd356da23467c29976f39642d5aeac0898418deb60edc909b79d76e0e196bdf3757a672a12bebfd258014c495a8c43cc177dc00b5da5877905fe991814c41e SHA512 dcd6634ec0eb9cb71336ac445fa063a3fabf34d5bfe47f417c00b111a82c42f10679ab6512e1bfcb80596cacb532fa14cb3f5675fb36a5e6258696bb7491fb51
+DIST edit-utils-2.43-pkg.tar.gz 958798 BLAKE2B 276bc16f5e7dbf29fcc78ed05da80976262dd48b1a088e8070192dd414240389da08a737dc6fb8c8459552d9c5ae491e248196ba8e7bf30d49cd7c74d0070cae SHA512 e42e416002f0f0c580f241ce4753c3868494025b4bfd087f5654e3c238a4b5c99d56f01db6b0fa47d1142085d5b4183625248266d76381387030a89e47a9e68f
+DIST edit-utils-2.44-pkg.tar.gz 958866 BLAKE2B 826d508304a2b08b76b7f358e7629184ef5d441d5a728e4943158b6e5c37cd128a5353f4b760a1a460f7f6487b51f10882462859388618587a984b298dc92b98 SHA512 fcb37c24304756e83cd273497cedf671e62ddce78f7bc460052cd3725948e35d87ce9d3108938483cd2ab8fb2d663ffb1df033b47b6e4b7e73f3a71d6d0ae886
diff --git a/app-xemacs/edt/Manifest b/app-xemacs/edt/Manifest
index 95634418290f..33f202d17e5f 100644
--- a/app-xemacs/edt/Manifest
+++ b/app-xemacs/edt/Manifest
@@ -1,2 +1,2 @@
-DIST edt-1.13-pkg.tar.gz 62754 SHA256 449e5898e5c3c8541481683b740a9e156a3edcf57df20a254257c14797b1da5c SHA512 8371dd96b6996d1257c769be4fcc77ae386d187bfb51ccd03c57e09b12a2b193c575f15b8fce29380a59f795adaf02a3528fa80f3b24536c349fc10ab54f808a WHIRLPOOL 586f41a5bcc8e39770d26415784e0013f905696b640bbc13cb45208b119d114e2862fffdf13cf261a3817c5b4c02e8a7d794ce1055bd715652d3f42f91f84118
-DIST edt-1.14-pkg.tar.gz 62824 SHA256 ef12882f5b626e92303a899c4deabe89a515487ce461f8472d39d0c8b0d4c75a SHA512 8179652766eeffdd12b673e453f4dbe0117bc8f2ad743943c5f613dd217c80d3433b7cbe3a2d8b55604eaff489416edc5afd3e5bafafcec8782dd471688555c2 WHIRLPOOL a1a3f272bc055d23649a8c7f3ed764e52b97fe00dfd190b984b62a5c03aceb16a126608f92c63af2900754e43238f34dc1f5a9073b6e0d69c911632b72118e88
+DIST edt-1.13-pkg.tar.gz 62754 BLAKE2B f327f44febb3fcca7a79771126ff85716464ce23739b2caf49a95047f2244da706576f80e5ea58125f0c7cd4723262b6d759c77c66581d3393f56f1950465544 SHA512 8371dd96b6996d1257c769be4fcc77ae386d187bfb51ccd03c57e09b12a2b193c575f15b8fce29380a59f795adaf02a3528fa80f3b24536c349fc10ab54f808a
+DIST edt-1.14-pkg.tar.gz 62824 BLAKE2B 9ab1cc9e55364b901ee51d16b97ea8a72a935e10d2aec5ef4f1757954a5f3e0c36132686225bb64e47227e2c83171632b004621f14b1508a9bfc07c8ad4cfc04 SHA512 8179652766eeffdd12b673e453f4dbe0117bc8f2ad743943c5f613dd217c80d3433b7cbe3a2d8b55604eaff489416edc5afd3e5bafafcec8782dd471688555c2
diff --git a/app-xemacs/efs/Manifest b/app-xemacs/efs/Manifest
index f97f66152faa..d410dbd005ab 100644
--- a/app-xemacs/efs/Manifest
+++ b/app-xemacs/efs/Manifest
@@ -1,2 +1,2 @@
-DIST efs-1.33-pkg.tar.gz 375842 SHA256 7fd287e825dfd13f70c7e97f41b4d8aba09ce1bde1156e1e4b39a8d85891478f SHA512 d588b8885ec659a78b4b64dadf10e75d08766e1cdfbd03dda9fc822081552dd8f27ed77dbff6be28a8f52fcb6f6747d27b7dea5ed3c7defd704639d49d7d4ae1 WHIRLPOOL 0f367dac0c03b5ff49c9667a7ccd4c587adcf86f9d4cb79c887590b4d592069d43332685bf78789d581709decdda3c78940e5e3515c35e843edff1281bdadd00
-DIST efs-1.34-pkg.tar.gz 376920 SHA256 e9322ad32ef6825d2df23733c44aa58976807e39f4ea1279408552da16596d55 SHA512 44550090f4b122d995c10fa4e82972adeb4261bb27a431f7ac40a61773252fff1024a0f6a480cc7f35705aaa90781aed8473b96b5468d0ed18d2f5b3f59cb9fd WHIRLPOOL ace793c4efa2029376681dd7f5481a63bd0bb1eb874aa41a585db16aa3e2636b84d0e190b998eb23bda6c4a821607d5956affd87ce8819f4c49a5cd7c6cd3630
+DIST efs-1.33-pkg.tar.gz 375842 BLAKE2B 61e7751d5571a57ed0781773a6f26d476cc63a86a82ff9f381f4221e82c6731287c138e66326cb7881fab5656e04be1cb5de4f2a0fe09cb71cc82526c390efb0 SHA512 d588b8885ec659a78b4b64dadf10e75d08766e1cdfbd03dda9fc822081552dd8f27ed77dbff6be28a8f52fcb6f6747d27b7dea5ed3c7defd704639d49d7d4ae1
+DIST efs-1.34-pkg.tar.gz 376920 BLAKE2B c441fb03cebb97f845d3767001312a99d505c3fb7af4ae7d1902a67ba27633f18952136fdcfda442608034bc843a0a1754d3db829da967aa816a484f21a2f67e SHA512 44550090f4b122d995c10fa4e82972adeb4261bb27a431f7ac40a61773252fff1024a0f6a480cc7f35705aaa90781aed8473b96b5468d0ed18d2f5b3f59cb9fd
diff --git a/app-xemacs/egg-its/Manifest b/app-xemacs/egg-its/Manifest
index b8727161214e..e13d9924df52 100644
--- a/app-xemacs/egg-its/Manifest
+++ b/app-xemacs/egg-its/Manifest
@@ -1 +1 @@
-DIST egg-its-1.27-pkg.tar.gz 261339 SHA256 1a04614d713c9800617d9ead2726c1f8848cf683e52a43f96bbd1ba33638546f SHA512 f5a2a9412175cc4a825de907f566df0228a1838b082a20f9f11164fb76b7f87db2f4f4e337a8d58f7e0479ffb498c32ac0a7413a70f047a10ecc631edebd4ded WHIRLPOOL 5b83b0f16f371eaacf37e52097870da72750c11769055e217670f33e341bbbcfcb5cc02cf6816e17ed85d385606e2bf66c63d18eb89ca54f2a6b9ae433c7e85c
+DIST egg-its-1.27-pkg.tar.gz 261339 BLAKE2B 8e0fb9cf66d373ccdee6d54c0eb0d996d5ebc03a5d85e1ae8c43b66ae53b7a9ee97a90526b70d52232397ef2982baefc3d4bb327bdebe60aa79bb77ffe4a785a SHA512 f5a2a9412175cc4a825de907f566df0228a1838b082a20f9f11164fb76b7f87db2f4f4e337a8d58f7e0479ffb498c32ac0a7413a70f047a10ecc631edebd4ded
diff --git a/app-xemacs/eieio/Manifest b/app-xemacs/eieio/Manifest
index 9ecd2cb11abf..debef71b8440 100644
--- a/app-xemacs/eieio/Manifest
+++ b/app-xemacs/eieio/Manifest
@@ -1,2 +1,2 @@
-DIST eieio-1.05-pkg.tar.gz 165803 SHA256 e7f3eb725a42897aa0861b9fecdcdd3f14002fa11366f7cfca0b0f9eb1c4a5b4 SHA512 7caa2cff977f850e4b59b00a2c34252bb235d901e4605092181aebac7690eb996b2bce7bb9262a9ec4c6aa691e89046cb723b8f0cd643f5b9b6cb5af51385497 WHIRLPOOL 052fc3a0e5cf54ca81f84a590d396f99db1805374645a8c78294567b4bc73b272774e72f1d3e7c3dd1056a0dc181a3ba6c35c4efc04bfe2e4844e47c687d20cb
-DIST eieio-1.07-pkg.tar.gz 177923 SHA256 83f08a7ae77db5bd77ba994ea2b23db3c2d88f466a4c55a2019072a3a70478eb SHA512 e4c76aa617bf80ca3fa7de249535ba63b22c3c8d787361dfce9381f4cb31500cb8f40e564c70928ee99492a0b71a67a13dd90e9626335b18b2a49877a124a551 WHIRLPOOL 801234bc5f0ebcb3e6ced12e405c7b7fbb653d99bde334d9729bfaee4df7a48f075f98768411565bec9c5d0c3bc2583b64cf5e74731afa6817cee81df2ab93b5
+DIST eieio-1.05-pkg.tar.gz 165803 BLAKE2B 92425dbaf275be435acc9d51f1ab5fad0a771d8205b11881229a244372059f71a8fa5c2d485c9cdc5208a21a4b54acd03f41e39847c4901bde81bb42b30bb2a5 SHA512 7caa2cff977f850e4b59b00a2c34252bb235d901e4605092181aebac7690eb996b2bce7bb9262a9ec4c6aa691e89046cb723b8f0cd643f5b9b6cb5af51385497
+DIST eieio-1.07-pkg.tar.gz 177923 BLAKE2B efc84c48fac4bd76ca4c843a4bff97dc10f21f45be9067c54c871a64314c9012b80e8d5e292f8844e1b7c3ed86a3f8044dfa547109c09891a3aeb11d515b7b0d SHA512 e4c76aa617bf80ca3fa7de249535ba63b22c3c8d787361dfce9381f4cb31500cb8f40e564c70928ee99492a0b71a67a13dd90e9626335b18b2a49877a124a551
diff --git a/app-xemacs/elib/Manifest b/app-xemacs/elib/Manifest
index 201becfa599b..2c6784fd7b57 100644
--- a/app-xemacs/elib/Manifest
+++ b/app-xemacs/elib/Manifest
@@ -1,2 +1,2 @@
-DIST elib-1.11-pkg.tar.gz 73387 SHA256 dc14796dc118c6f3b4c8bdaebd564dafb312502d4d9465420ffe712c62342a90 SHA512 0ed1b6bd47b13c69b5990e6e1ca8e203440e28527f860a70e22fe0da94811909bcddcf184cfc9a8016a2fe590cea5e3ceec270bfb33ff655b542a3c8c0ea8638 WHIRLPOOL b176fa96f097e83f2326a66704830657c2232a755236cf98eb391f20dc182b10afff1caa88f50037caabb1efa1b4d56ae53c07d71f723da92cf91f5cf04a5b8d
-DIST elib-1.13-pkg.tar.gz 80235 SHA256 18610a1a18300baccc2640159f4d5eb3805affbc118f4c3afc92dbdc70ef98d4 SHA512 edffc77f9db1300693701df56fea7fa6e0fe3c4d11949bd8766faea21ccad79cb52b60f5c25e84350fa7f3cfc45820035b06f82890ea760dcb90e93a065feec9 WHIRLPOOL 337e9b2509b3fb864208401a94900f17c9fe795c331bb462c70c186dca44a6fc6faeb43c7e23d0d000b44a09bed300efa827aeca3977c8dc1330f302a60bba83
+DIST elib-1.11-pkg.tar.gz 73387 BLAKE2B 423476172a1a1ffe2731ca67fc24bec37a52de5387afc22c044aa90c40dbc0c2d4d858f57ccf2237274b7b3cc7b7b366bb44cd52c9c6f0d1264d1ad051a10be8 SHA512 0ed1b6bd47b13c69b5990e6e1ca8e203440e28527f860a70e22fe0da94811909bcddcf184cfc9a8016a2fe590cea5e3ceec270bfb33ff655b542a3c8c0ea8638
+DIST elib-1.13-pkg.tar.gz 80235 BLAKE2B b81ca5b529a808ee5a9c7f514cf53dfa1c5d5ad4531b3aef10706ba746b4ee4a3216460e006842f733bba073d1048d2d26c88643c1d3f9f5744924e66f84a9c4 SHA512 edffc77f9db1300693701df56fea7fa6e0fe3c4d11949bd8766faea21ccad79cb52b60f5c25e84350fa7f3cfc45820035b06f82890ea760dcb90e93a065feec9
diff --git a/app-xemacs/emerge/Manifest b/app-xemacs/emerge/Manifest
index 6d2ea06faed5..43ba48367ec5 100644
--- a/app-xemacs/emerge/Manifest
+++ b/app-xemacs/emerge/Manifest
@@ -1 +1 @@
-DIST emerge-1.11-pkg.tar.gz 61367 SHA256 b20d6b7c1a88733afa833584d91b70b20cc4fa888cf024e849b6caec51cf0d8c SHA512 c72569dc28b5db4c1e6b5b35107dcb4e1772de7a7b42898895c538f0ec127e28104b0ea0612d01138c1ff715285f06b9cd642609272ed40360f9b97e5e8dc784 WHIRLPOOL fbc0953c9fc429e1eb111115018db6cdfd4f757469ff235e6911b2c18b6e76d4bdd7202405e37ef845b5c5d2ea6f46be57b1ff8d1fb98b361d2135a61301b11d
+DIST emerge-1.11-pkg.tar.gz 61367 BLAKE2B 4b97e5118c34d89f7387e29c7e19337a0adc89c1588d35f338f910ea8d5f3003e358613850acf3124911e88aee31f387a7853ad51cf9a0f90d5b13608c81fcaa SHA512 c72569dc28b5db4c1e6b5b35107dcb4e1772de7a7b42898895c538f0ec127e28104b0ea0612d01138c1ff715285f06b9cd642609272ed40360f9b97e5e8dc784
diff --git a/app-xemacs/erc/Manifest b/app-xemacs/erc/Manifest
index 029dd004d94a..f654635ee85e 100644
--- a/app-xemacs/erc/Manifest
+++ b/app-xemacs/erc/Manifest
@@ -1,2 +1,2 @@
-DIST erc-0.21-pkg.tar.gz 516214 SHA256 00384e0d6e829cbbfb005806033ae12c8c9273dc0773d1ab65ebce441197460d SHA512 5743fe1840a1e42700aa3fe41292b29a31f93e7ba7956ec80eda6df0c4d4300da268ccc692fe48b24dc59a60234e7d5a5d774dd8e9db8b6bcd91ddd4b11562e2 WHIRLPOOL 6c6ce131a096b1be5e919478680d394b72e79296a883ad583a99ebc46e27a3dd978a035dda12f27412955406da17450c3a13212960d6e739ae2324dd7e7866f5
-DIST erc-0.23-pkg.tar.gz 517288 SHA256 ac1c911d6f5b1d8623d3d75bfb0e17529d9c1cfe31b0e4c309c47e7b0e6c94b4 SHA512 54df94abb666d76f65faf668e8f85d20f5411c70031e709387706fe7d77b9403dd9e8d4fc2c634cbe58f5de896bb2780e2fae2706758774e295e3bc2704e7dc0 WHIRLPOOL d426a9d0d2f521956d3e9857e2f92200ea830782f48d96c9ef337428b898f715705b3f4202fc665785739cd82fe0af757185ebef54e9cf0324c953a09ddd0df3
+DIST erc-0.21-pkg.tar.gz 516214 BLAKE2B f9f7811e9f73d895186e4c3bf6774db6304aba11af829886ccb4a7a4553a43e055baaf6ff830e757d75436cbbbdf1e1d341441d71cab4b75ca253481910390fe SHA512 5743fe1840a1e42700aa3fe41292b29a31f93e7ba7956ec80eda6df0c4d4300da268ccc692fe48b24dc59a60234e7d5a5d774dd8e9db8b6bcd91ddd4b11562e2
+DIST erc-0.23-pkg.tar.gz 517288 BLAKE2B ce5a5f41b70b25d8e4a123d3a7a8d32815f3059da2e5353dace6ef185d8df2d2539c88155136a60ef7bd934a79db87b772267836cdce1ee2d691a9f1a4917f8f SHA512 54df94abb666d76f65faf668e8f85d20f5411c70031e709387706fe7d77b9403dd9e8d4fc2c634cbe58f5de896bb2780e2fae2706758774e295e3bc2704e7dc0
diff --git a/app-xemacs/escreen/Manifest b/app-xemacs/escreen/Manifest
index c06492350e6c..f4f0118a1001 100644
--- a/app-xemacs/escreen/Manifest
+++ b/app-xemacs/escreen/Manifest
@@ -1 +1 @@
-DIST escreen-1.01-pkg.tar.gz 14639 SHA256 d23e0be493f6a1a8bee71fb121708769b348ae8650c6926a6736732a3953f1ec SHA512 3fb4d47ed6ae6173a530ea31b7ae759a34e2257e85e3f512c841234f7eba9780cd160e4ed600dd5f1871a022d4b2b28dd3dcdff788f679a07c05745914a04a89 WHIRLPOOL ada67ae061f2ebd057b42675140f51cb755fe2e466a30c6f9f8074e3698469f75c7ea7060435a1c476a19a7b56c4d0aff4fd73151ec7b20ed510acfb53846d65
+DIST escreen-1.01-pkg.tar.gz 14639 BLAKE2B 4686dfecc40c7f90b4351de0b3ab20b5c5fcbc77760de7d5e0e115ddfbf792b5f7238df5272b33c3f98e7fd5ef4ecc8b79b08723217a4dad7e0c65bc0f4e8eed SHA512 3fb4d47ed6ae6173a530ea31b7ae759a34e2257e85e3f512c841234f7eba9780cd160e4ed600dd5f1871a022d4b2b28dd3dcdff788f679a07c05745914a04a89
diff --git a/app-xemacs/eshell/Manifest b/app-xemacs/eshell/Manifest
index e896cfcbbc6c..4102e8e0b77d 100644
--- a/app-xemacs/eshell/Manifest
+++ b/app-xemacs/eshell/Manifest
@@ -1,2 +1,2 @@
-DIST eshell-1.10-pkg.tar.gz 232616 SHA256 faf76bc167c36f0b79739bc7e633ed2db2cd1d07c2bbf32cd90c67653b9ef075 SHA512 97b4d81b024513b4dacbdbd3d04150a3dcc10aa9c2a8ed0e7157ada3aa404de6c44f8cce60c59f1c75c0e9e31f0f7b6de86b402b2c6527111162e2ee54e51dc9 WHIRLPOOL 1d5557e99b279d9c00eb35099b9a6952dc0355ecea42bad05bbf181b9b9388e6b5a3066e190f6fffd028321b11bf4b75d9c0128d5a0b50a4d417d3a6a3fe6d6e
-DIST eshell-1.18-pkg.tar.gz 238988 SHA256 1fa6d8a167def5b25775d382207119a088cdfa12ad8fc379aa5ebc83e3fc8371 SHA512 3cb3f66c2714ffc5e2875bdbc3fd02dd60032db338ef9ef9c0904ec89945075ae95a5e02ce402299dbbc98b6e53d7304dbe50fc3cb3eb0dd2aacaef5535f2792 WHIRLPOOL 8920c246647be95f84153bf848917b55b32994c331e9c4f82af82587eca793cc6400e72f5860233993df1d3f6e15e5efc400bc52ddf979e30549f7da6d4585a7
+DIST eshell-1.10-pkg.tar.gz 232616 BLAKE2B 42c057c6afc401f480c8531be0b6dd2f1a1d1230063ca9649c23f751c6d988d2eb1918a3158840ada50d1b59f02319f7e06d1e021bd0b502be77dfe13036ea64 SHA512 97b4d81b024513b4dacbdbd3d04150a3dcc10aa9c2a8ed0e7157ada3aa404de6c44f8cce60c59f1c75c0e9e31f0f7b6de86b402b2c6527111162e2ee54e51dc9
+DIST eshell-1.18-pkg.tar.gz 238988 BLAKE2B d595f9c36ca5cd50ac46efabc813575b6f8415f47ac1d44632151bf8a39233c7166a0d9fdc2eb2cf00565b4e4f9ed9b4828ffb385ef4941745529260d31850e3 SHA512 3cb3f66c2714ffc5e2875bdbc3fd02dd60032db338ef9ef9c0904ec89945075ae95a5e02ce402299dbbc98b6e53d7304dbe50fc3cb3eb0dd2aacaef5535f2792
diff --git a/app-xemacs/ess/Manifest b/app-xemacs/ess/Manifest
index 4bb0ebcfb7be..d13cb144199d 100644
--- a/app-xemacs/ess/Manifest
+++ b/app-xemacs/ess/Manifest
@@ -1 +1 @@
-DIST ess-1.03-pkg.tar.gz 470257 SHA256 233b9d496c5f7647c989aa235c83ed8693b78df3068feaf2660e232d624dd639 SHA512 e9de030fd3b97e2840b023b2426ce4c9ffb1dfbf1a0d4f3178beb3299c16b20f612ca1ed20bf994c3844e0e57cdde7ded32b2cc58fb5a1946ddde02d18daec56 WHIRLPOOL 6f9ef87970b454ea39bf4203fa5aef2de2176d60ed4751b141bbab07c8fcc8ee04f9ad5451624057e909321e4cf4cf82040de4d335fc7c4d228d77d79e9c0a9c
+DIST ess-1.03-pkg.tar.gz 470257 BLAKE2B 154fb229284cc35bb2f6573918ccce0dd22dda6db6651f444bfe80d0165e75b6921f88a5bd7230b91e5a7ac0126c744189a9c338abc32c92391e8b7331c9777e SHA512 e9de030fd3b97e2840b023b2426ce4c9ffb1dfbf1a0d4f3178beb3299c16b20f612ca1ed20bf994c3844e0e57cdde7ded32b2cc58fb5a1946ddde02d18daec56
diff --git a/app-xemacs/eudc/Manifest b/app-xemacs/eudc/Manifest
index 3f24f05b2af6..f238e0d5acec 100644
--- a/app-xemacs/eudc/Manifest
+++ b/app-xemacs/eudc/Manifest
@@ -1,2 +1,2 @@
-DIST eudc-1.39-pkg.tar.gz 79488 SHA256 78a60fc7d7c953909a270e0f83d353b8c1c23bee6c2ce04f3f63dcddd979cf48 SHA512 c2442e701dad665fc0651aee3d9f0affd72006abcceb6da46eea67f0cdaf75a285f330615de54a5097ce39786537612b1dd053268fda01c0c18a00bb44c0fdda WHIRLPOOL fa3f4fce197c87b0b0af1a3c5dea9a35c63def0f97e16664c671957d8b922894fc833f93413a93d78153c12c878631b3f469903e9062d8e028356d65263c0ccc
-DIST eudc-1.40-pkg.tar.gz 79675 SHA256 26ce424b372627d5deeb83bc1ad9628653148d9168823848110c2cd77da618c1 SHA512 ecd14560771652450e6f4acbf468efad9215681e6c85e8f5b3c999a222f8e90299f7e63c4951a122f5d04a08ec247c95bc5da910df47f66b5f88656acf2ad827 WHIRLPOOL 8c3be3bdf3ac6a26b4f04873a93567e1b8167dab047ac276e2b7187cc9560a367ccdfeebf7319018fc15ee40531d87ba878752c102c597855a4a0cbe04a628fc
+DIST eudc-1.39-pkg.tar.gz 79488 BLAKE2B 62789aeedcc6f1efa1cb453161cee6d3134295d84bff591c606b5a871cf355a2f377d557a99bb4e818916b5a611c18d838bc375e539fe0219f07d111125914df SHA512 c2442e701dad665fc0651aee3d9f0affd72006abcceb6da46eea67f0cdaf75a285f330615de54a5097ce39786537612b1dd053268fda01c0c18a00bb44c0fdda
+DIST eudc-1.40-pkg.tar.gz 79675 BLAKE2B e3bac796fb0b7d496d6a3066795c5e89372b22a4af693a91cc3dbe6b6e68b3b9327841a18fb42b03bc6435b8831785872dad95516f2b494bc003be4ac85745ef SHA512 ecd14560771652450e6f4acbf468efad9215681e6c85e8f5b3c999a222f8e90299f7e63c4951a122f5d04a08ec247c95bc5da910df47f66b5f88656acf2ad827
diff --git a/app-xemacs/footnote/Manifest b/app-xemacs/footnote/Manifest
index 29a2fcaedebe..608f6f9ba431 100644
--- a/app-xemacs/footnote/Manifest
+++ b/app-xemacs/footnote/Manifest
@@ -1 +1 @@
-DIST footnote-1.16-pkg.tar.gz 22152 SHA256 26e5d8b86c65511a30aca5b596be32f656bd443f6abcc7958c7054652b1319e9 SHA512 4eba15270fd4529c3a8b5e8f488cd9dc294dab2f4b968490e8bbfc09e81bc4abd4f9c95b38a295a8f5899f4df55b7dab18e8979130cd8b24a533fbc609f0bf92 WHIRLPOOL 00929916df15ae0b2c436e2f700eb13e86496fa16efc670405a12684f88392d97d6d27c842f2b86ba832e66bd15b73887266495c3d7264912147c661e24a74bd
+DIST footnote-1.16-pkg.tar.gz 22152 BLAKE2B 4ff8d3df1d76fcf23ec5191516bfeb7be4dbdf11a428d387a5c4a722b8c9b7cf34680548a8e7be2fa39b8dc83f623c96328c974ea4f3d940879b57ae03fde259 SHA512 4eba15270fd4529c3a8b5e8f488cd9dc294dab2f4b968490e8bbfc09e81bc4abd4f9c95b38a295a8f5899f4df55b7dab18e8979130cd8b24a533fbc609f0bf92
diff --git a/app-xemacs/forms/Manifest b/app-xemacs/forms/Manifest
index 31df08101b4c..5e31fff9ddf4 100644
--- a/app-xemacs/forms/Manifest
+++ b/app-xemacs/forms/Manifest
@@ -1 +1 @@
-DIST forms-1.15-pkg.tar.gz 48747 SHA256 d054d544ca23a70ba56767b14cbbfb7ceda7c55c865c152ed29546da933b0dca SHA512 eec09fe907c6b2ec94132ccc508d70903b27fb74cd02ae58a60d2196b80ea62111b0849db0c220e205d9e58394e588913b42dcf350d83cbe17cd9fbdd8ac6a62 WHIRLPOOL 210032b752de10f3ea821295dcf19b73b5ecab57a923c1120f6586727f213890fd2041be9f41cd659d938bacae0ecaabc71c25cff12f7e8e58a639f00eac716c
+DIST forms-1.15-pkg.tar.gz 48747 BLAKE2B a7695c1d07fc33cf6ccf7f0a3e7bd1039da1f662d589fea02716c9dcccf1441c7acc6bfdf344f6f0dd55965d45fd55633af3f369d57cb18bab3c62f3f95417c8 SHA512 eec09fe907c6b2ec94132ccc508d70903b27fb74cd02ae58a60d2196b80ea62111b0849db0c220e205d9e58394e588913b42dcf350d83cbe17cd9fbdd8ac6a62
diff --git a/app-xemacs/fortran-modes/Manifest b/app-xemacs/fortran-modes/Manifest
index 78c0076d0d31..7a6584239dbb 100644
--- a/app-xemacs/fortran-modes/Manifest
+++ b/app-xemacs/fortran-modes/Manifest
@@ -1 +1 @@
-DIST fortran-modes-1.05-pkg.tar.gz 70602 SHA256 f448802fdf0c78529ae6298f6f9e5f597e3ae9122e26a12263cafc1275fb7cf6 SHA512 c3eac57a6d84605fde545951d423855cca8a40dd02dc24d0e005e165ab4e52f2f76f7347ddf33e4e85d25717689b85c578ce1e2b3b738df8a080b56057747b27 WHIRLPOOL 993273a81690155f99a561ed570331848de4d383f55f2c117e47e32ef3570723dda6fae0285a2254172d51c0df74b649c4b8d9dcb59436e0fb7306110a3813ee
+DIST fortran-modes-1.05-pkg.tar.gz 70602 BLAKE2B da1e620e74b497290bf655fcbf9d45b5510193388557e33abc769d874ef2d75786cb91ea9964f0019a40b19de968690f396523144f49c7bd79be783111830d8c SHA512 c3eac57a6d84605fde545951d423855cca8a40dd02dc24d0e005e165ab4e52f2f76f7347ddf33e4e85d25717689b85c578ce1e2b3b738df8a080b56057747b27
diff --git a/app-xemacs/frame-icon/Manifest b/app-xemacs/frame-icon/Manifest
index a4bcbc88f1ce..e5647a3b2db0 100644
--- a/app-xemacs/frame-icon/Manifest
+++ b/app-xemacs/frame-icon/Manifest
@@ -1 +1 @@
-DIST frame-icon-1.11-pkg.tar.gz 33800 SHA256 f632d3401a4b5c9cdde75d9bf3d8d9b557392a1179ae7b79affea07129ee1637 SHA512 30e4de2e4bdac71483d39f3893b4ccd5d1ec37bc8b522a621af35f569e00c69bf02312c1039a52bfae759da2eaa748d26356a2b7db8c6b4dc8ce2ceb494d7d82 WHIRLPOOL 5434b5c33625d973e1933c7efcbfb79e1ed7ef97123eee4f8d2a427bb1a92c6eeddb3eb9eedf5c55f904ac9f985ed343956e96623b69a59d0f5709090162b440
+DIST frame-icon-1.11-pkg.tar.gz 33800 BLAKE2B 93c404c9dfc894634e1b463d54eb53812de102e20f0d622dec9dcd5b37006bc92f5f4c1a2d47c5e1e1bc2344a49819bb6839a5c3d41df68546d6027abf6f5f8f SHA512 30e4de2e4bdac71483d39f3893b4ccd5d1ec37bc8b522a621af35f569e00c69bf02312c1039a52bfae759da2eaa748d26356a2b7db8c6b4dc8ce2ceb494d7d82
diff --git a/app-xemacs/fsf-compat/Manifest b/app-xemacs/fsf-compat/Manifest
index c35d66749ce9..df346e4dceba 100644
--- a/app-xemacs/fsf-compat/Manifest
+++ b/app-xemacs/fsf-compat/Manifest
@@ -1,2 +1,2 @@
-DIST fsf-compat-1.15-pkg.tar.gz 18912 SHA256 254cc36832d9b6c233ac19231305698b3eda714c98aad0f8ceab97c4b8f63154 SHA512 87e208b0f30d58953c9d49b7988b0dcd886870e29083ec9bfd47eef347e83b2c275e446593f200c8b76075b70c9691286f6c1e6639b82eb9f1599df33c5042a6 WHIRLPOOL b93dee0701e36f67d9809c95651fc256fbf705141fd706ab7e8a909a7841649d7d40ea8c97b823b139e54c41bc4e63956fe37bd7eb9a2efc5660312dc154fb57
-DIST fsf-compat-1.19-pkg.tar.gz 20477 SHA256 3edc09de0bb7dfd150f18d9292536b82c25f4c989056fabc0b035c21254e76aa SHA512 e1c64af5aee787691b527ee90a7ca6112ec0556b5939fc916c32fd4f990a60c8af70fda3b5c9e557888596ae5294b7ca8ddc4ae0df741299ec5d17a99a2479db WHIRLPOOL 92a116b083adab2c5f2136da986674e04b6590b2ced73232661be56e8e1bc0ce499c1e00869525717a72587d5c0a6657192f9f0e578a7162ae4fa8243a5a5e37
+DIST fsf-compat-1.15-pkg.tar.gz 18912 BLAKE2B c44bea3e0aba7dbd13d747a6faf6e5824df5cae83a2fb341d4fe81590cd0575c163f6f3a7a919ec71a7b3d2860436342df87fb93db89375099b1e08c7ceeeea5 SHA512 87e208b0f30d58953c9d49b7988b0dcd886870e29083ec9bfd47eef347e83b2c275e446593f200c8b76075b70c9691286f6c1e6639b82eb9f1599df33c5042a6
+DIST fsf-compat-1.19-pkg.tar.gz 20477 BLAKE2B d231757c8498693b1f08d164f1b93a89352e081cb52e3c46dc79007d5e5b0076d59950e7269b62eaa1efdf990aac21f56a355e42dd52b59008e5c182b4179912 SHA512 e1c64af5aee787691b527ee90a7ca6112ec0556b5939fc916c32fd4f990a60c8af70fda3b5c9e557888596ae5294b7ca8ddc4ae0df741299ec5d17a99a2479db
diff --git a/app-xemacs/games/Manifest b/app-xemacs/games/Manifest
index 37b89fc1e3bc..6c5ad4d563cc 100644
--- a/app-xemacs/games/Manifest
+++ b/app-xemacs/games/Manifest
@@ -1 +1 @@
-DIST games-1.20-pkg.tar.gz 84330 SHA256 ee4343d79f317b3f288fc9f8b10845c7c4f3a8dc0b5402acf36880455353c19e SHA512 dbee4a0da7a7ef1ddffcec72caa1af09aaa449c3d1f662c217bbd53ce0a7651c0ba3b31a3af750cba79454455c5325c5a9d81bcbae80610f356656b998b2f649 WHIRLPOOL 335099ba97fb929a1489d68552577c0889925d52268fceeab43ce682a6da5065f129b10d27503f908426cd7fbbfd9b7fb3300a697a4e8d7cd8e17a99b574198d
+DIST games-1.20-pkg.tar.gz 84330 BLAKE2B c2f7fbd059de6e9da0670ed77fc86d8ada289f9841885038ed81bcf7db2825cf2006fc12f12dd308287a4bcea4d06ee98bb60ec0a0d4d4867356f1e48c446544 SHA512 dbee4a0da7a7ef1ddffcec72caa1af09aaa449c3d1f662c217bbd53ce0a7651c0ba3b31a3af750cba79454455c5325c5a9d81bcbae80610f356656b998b2f649
diff --git a/app-xemacs/general-docs/Manifest b/app-xemacs/general-docs/Manifest
index 5f7d1f69b2e5..c74c47e90a68 100644
--- a/app-xemacs/general-docs/Manifest
+++ b/app-xemacs/general-docs/Manifest
@@ -1,2 +1,2 @@
-DIST general-docs-1.04-pkg.tar.gz 43374 SHA256 a2e1cf0d0c53b0d4a3cd00168f27c49044263fa90592cc75822a7bda4c4f9154 SHA512 a5df76303cffcac6e334decca3b11900e927e1ee70be73bbbd217e67ab0594c8f9829f7a0f582c254e616df491aee9a4e89c5a8ad6ef54ab3157abf367ecf647 WHIRLPOOL 6a6d56043cbb8d6483c5cff23446b9c610e11cc7538d27f3fd034758e7515bb863d1fb99d32234422de5f30c9be7eafcfb418f761d7126837612576813f8545f
-DIST general-docs-1.06-pkg.tar.gz 146305 SHA256 0a28c00873893969993b35165bef63960e6c17b8c38e8fa24a85bf3cdd7c7af0 SHA512 ff4847f881dd2f431e3a861015212798b23716087bd15ec117b7edb8f182bf5bddb31d370e9e69aa21847fd062164f05d2b4eba93326d6ffb784134b9152ddf8 WHIRLPOOL 56330f14be02357d3f4c0426e7b0af433e24a1e44a3046b57cd093c0f61db15fd3f31051f9c189c554d0c6136080abf08e6863e33513ffd03d8233e1ea3eebf8
+DIST general-docs-1.04-pkg.tar.gz 43374 BLAKE2B 535370c9dd135ac36603812db099624a167bc234203fb4b87f5a8b0e9a535d9e0bb9f6a9adad00fd62d4caf904f551ad61e50f3b16d9ccff9ab795b9e88d5a78 SHA512 a5df76303cffcac6e334decca3b11900e927e1ee70be73bbbd217e67ab0594c8f9829f7a0f582c254e616df491aee9a4e89c5a8ad6ef54ab3157abf367ecf647
+DIST general-docs-1.06-pkg.tar.gz 146305 BLAKE2B 5341120385d4c6c9d631f604e8ad71a8213c5033184a1b8ed14a14c066024a16bda397db9c656dc0d01483e42bfc9ff7754a47afce654014677187479dc4b828 SHA512 ff4847f881dd2f431e3a861015212798b23716087bd15ec117b7edb8f182bf5bddb31d370e9e69aa21847fd062164f05d2b4eba93326d6ffb784134b9152ddf8
diff --git a/app-xemacs/gnats/Manifest b/app-xemacs/gnats/Manifest
index 76f3bc444a62..892ee7baad6f 100644
--- a/app-xemacs/gnats/Manifest
+++ b/app-xemacs/gnats/Manifest
@@ -1 +1 @@
-DIST gnats-1.17-pkg.tar.gz 188959 SHA256 d75b241c0e0c72185abca9a2b821679aa8c819b2d55bb8eb1ed94050dc93b581 SHA512 b8d5a0faeb55c46b7a4f2d42d7b347304bff7a94f8487df72fac0a1aa4e388f188abb351de8764fac1c2381b01b3ac21abb1682878d4e998b5e141e4c443d29b WHIRLPOOL b82d422a1aee7f1f14309dcf73c15b2efa95beffb51e64064361dab57ffd3dc20b4b45f884f08fc4ad1f58c868ceaee39e8029c6fc0f0452849e5414ce351f19
+DIST gnats-1.17-pkg.tar.gz 188959 BLAKE2B fd32eea586b1610abba78a51383d86714091a3656dabeeb871bb56eb5b85e7f9ff52dfba87da76bdf3abd15c1e66f98c03d807b26071879f64b33b3fac048b4e SHA512 b8d5a0faeb55c46b7a4f2d42d7b347304bff7a94f8487df72fac0a1aa4e388f188abb351de8764fac1c2381b01b3ac21abb1682878d4e998b5e141e4c443d29b
diff --git a/app-xemacs/gnus/Manifest b/app-xemacs/gnus/Manifest
index d7c3e653ca6f..3fb155a8f0f3 100644
--- a/app-xemacs/gnus/Manifest
+++ b/app-xemacs/gnus/Manifest
@@ -1 +1 @@
-DIST gnus-1.99-pkg.tar.gz 3636886 SHA256 e513bf0c604552e94b42c5ebfe5c23dcfa66923798cec379307b610fa1b6249a SHA512 f938e77d2a93e29b7eb89db5b67d717a55ff36e827b7ba3ea1d114f59eda763e06933b645fe42d51a53c483f1e6fe74c669d595af36aa97b30cb97f5ca39db79 WHIRLPOOL 9d0cd9534831d7e8025c33926cf06dc37200921993cbe083e00d97a478ae9e5f65265fef7d183e130c2c4f269dce009ba3b28cdaf2e39d1c78901385a8235833
+DIST gnus-1.99-pkg.tar.gz 3636886 BLAKE2B 5345498a95388998c5cefe65c20991ae34386e582e291c45d51194e509670ec395b2d4ad164ca219e4892a7377030bd769b2e76e3f624b6751d60f2a5161bb5d SHA512 f938e77d2a93e29b7eb89db5b67d717a55ff36e827b7ba3ea1d114f59eda763e06933b645fe42d51a53c483f1e6fe74c669d595af36aa97b30cb97f5ca39db79
diff --git a/app-xemacs/guided-tour/Manifest b/app-xemacs/guided-tour/Manifest
index 4608de4afb9f..efce803d78c0 100644
--- a/app-xemacs/guided-tour/Manifest
+++ b/app-xemacs/guided-tour/Manifest
@@ -1 +1 @@
-DIST guided-tour-0.52-pkg.tar.gz 1450982 SHA256 c2c4624f3a42c73c2972d5a0c568914430d3ad3656ca6e5b84f78294062ee685 SHA512 160a4a1a70acaf6e6b02e5d9b3a0fa1d5a31accb98a3b9ad131d08dbc0366163cee21ec912aaa0c2bde7f0c785e01c417f3541bca0ba2eed8a88ad30c0a44691 WHIRLPOOL de84840baca3fbbeed06da943ab6b18d9dc01661047817a156d1c2000e2049c01fb8f42b6dc465370e4242fe87174038d9e6ad9f1baa2cf2dbdf83e6a1d7e710
+DIST guided-tour-0.52-pkg.tar.gz 1450982 BLAKE2B e201ec081b563998f269dd051e298591be1a885270b8e05b1c4f8e905f977ffcd173b5ea7b684a461866939490d783ef52e6d2c12c659065b542ec85d344b038 SHA512 160a4a1a70acaf6e6b02e5d9b3a0fa1d5a31accb98a3b9ad131d08dbc0366163cee21ec912aaa0c2bde7f0c785e01c417f3541bca0ba2eed8a88ad30c0a44691
diff --git a/app-xemacs/haskell-mode/Manifest b/app-xemacs/haskell-mode/Manifest
index ff5cba203601..f47245ff6e63 100644
--- a/app-xemacs/haskell-mode/Manifest
+++ b/app-xemacs/haskell-mode/Manifest
@@ -1 +1 @@
-DIST haskell-mode-1.11-pkg.tar.gz 110350 SHA256 8467c8a2e28cd18d9c5e11084fb166fb01dd30a7b5b0d18a1382f02849b32bcd SHA512 719b65cbf70680be25912a972fc1c4ce4609bd93f6decac6904b8d8b6266d466c577eb1a60d179f4d356af96f755f24b2802a2803be27e01be0132a22c75abb0 WHIRLPOOL d6720092ad694d5d6755497648600e1516e94edca2cc3eaf37d0dbccd27627b5d7f062c3da05031305a4fef0af2498121f70a1be9a33c0e3ca2f219822e6aabe
+DIST haskell-mode-1.11-pkg.tar.gz 110350 BLAKE2B 05acfe43c5fbf87dd97543d300c41695ee1383267dc0e88aa2b0ae9e2b84b179127500b5d292280099b77597fb93bee4504544979956a814d081b99bb0b88861 SHA512 719b65cbf70680be25912a972fc1c4ce4609bd93f6decac6904b8d8b6266d466c577eb1a60d179f4d356af96f755f24b2802a2803be27e01be0132a22c75abb0
diff --git a/app-xemacs/hm-html-menus/Manifest b/app-xemacs/hm-html-menus/Manifest
index 2496b6a4b2b5..0f6c2725fc4a 100644
--- a/app-xemacs/hm-html-menus/Manifest
+++ b/app-xemacs/hm-html-menus/Manifest
@@ -1,2 +1,2 @@
-DIST hm--html-menus-1.23-pkg.tar.gz 179091 SHA256 dc1023584e7cdc8b0869eb38fdb0444e1979b292142e033fe7040111d67e3f19 SHA512 9197c8a5c8bdf10c69e974ef80c51cb3849fd86f6ac40cccc50bf044f09d47d0f8ab77c637789a3175024ed8f818cbe0ffcfb548028e7cdcc112f81e0b2c3e54 WHIRLPOOL d1064e3e7fd1430d12fe16a58fa7fc931270bf9a56f075932d5d3e4a45687d2931e776537d3c61aed101fb7ae1b08fc686a09c5a952cd9243f391009bb1858d7
-DIST hm--html-menus-1.24-pkg.tar.gz 179443 SHA256 3872f5359104c9f268cc90e7ea6dfef0b888ddba542f90c455ffba6f107f0fbd SHA512 2576ba402fbbb6a538e497c88fd3472c37f7047c75a41396a94e17984021fa3c2bcf2c0c7c2c81a4a1a711d1dde474ad7505b7c78d7300d46a64ce3fdceded7f WHIRLPOOL ce42b9ac0dcc840a20c264ddf9fbead2337bdfc5ef5c0811dd601b6a310ea891d68ecfb75138e57783b56bc17dca6d9c8bc7378d76e68f4d12a5ea9a41f4efd3
+DIST hm--html-menus-1.23-pkg.tar.gz 179091 BLAKE2B caac889d17634f85084db88f4b6e2d97e0aa69224f52ae1e68daa536b7c339b8d1ab55e8b04f9ba26173b07e0bbfc8e6850285ff39311a30ff33d34b70671e9d SHA512 9197c8a5c8bdf10c69e974ef80c51cb3849fd86f6ac40cccc50bf044f09d47d0f8ab77c637789a3175024ed8f818cbe0ffcfb548028e7cdcc112f81e0b2c3e54
+DIST hm--html-menus-1.24-pkg.tar.gz 179443 BLAKE2B 91c8d753f7687b12f0d0b95393a21a3d05705725dcf9f1ed9eff44949763f3c6ec06367cb7df8d0ecf1aa11fbeb7409df316781dc51b0db37bd9a7ca53f77434 SHA512 2576ba402fbbb6a538e497c88fd3472c37f7047c75a41396a94e17984021fa3c2bcf2c0c7c2c81a4a1a711d1dde474ad7505b7c78d7300d46a64ce3fdceded7f
diff --git a/app-xemacs/hyperbole/Manifest b/app-xemacs/hyperbole/Manifest
index 8dc9f8c01c3d..3856198005c2 100644
--- a/app-xemacs/hyperbole/Manifest
+++ b/app-xemacs/hyperbole/Manifest
@@ -1,2 +1,2 @@
-DIST hyperbole-1.16-pkg.tar.gz 636211 SHA256 84d83f2d40e54c77084d3f9bf02f2d4f48f69af439e54e3268fa16eab8276e2b SHA512 f0064bf8580c321cd73922cbf651fcd9242ab8aa409ad2eb99ae620f1e284abdd24ad0fa104636646b974f15892d7d7e895fdd35603e42827f3f06c3eca86964 WHIRLPOOL a747ad3ce56437387a44cdff500c857070c515b093a58cca2e17ee6bfe31afc48f5d94d74b77b5782f61682e30fa13139c0cea7a44ce2491f5b8894da243d7d9
-DIST hyperbole-1.17-pkg.tar.gz 555380 SHA256 6f4aaaf154a7bca76f3a94707783afc6e8bf4cfdb92dda5f97cc992d242ca1ba SHA512 154e750124df8a610695847c041a3588404b4d2524dbe60a7ab86e546d4920eb95cd7abe34f82535d7c2869fbb80f12349ac41e87a67b614dbd19df034fe4c03 WHIRLPOOL 622547f3f00892ebf76909187ed2e2bf503e0d89befc1fcf32a61f2e1cc7a3013967b3906af5baf5212d1b506b7fc24e79c740b8547e04556f67d245d9e5e493
+DIST hyperbole-1.16-pkg.tar.gz 636211 BLAKE2B 87099625589e1bc8d39f9d3c6ea102f6796f8a74067b0234955dff355c1f2dd2781b0825f5885f750fe6440087cdff2d219496a0b1e018d63d1472b88f83c889 SHA512 f0064bf8580c321cd73922cbf651fcd9242ab8aa409ad2eb99ae620f1e284abdd24ad0fa104636646b974f15892d7d7e895fdd35603e42827f3f06c3eca86964
+DIST hyperbole-1.17-pkg.tar.gz 555380 BLAKE2B 35deb594f6fc9c335d8e5f35dce0eb0581a0aa7c0b85dbfaaef9e50250b56e6d00cca2c633dca71e56e241f342535871393ee706598e4cd06d3db3a309e89cd8 SHA512 154e750124df8a610695847c041a3588404b4d2524dbe60a7ab86e546d4920eb95cd7abe34f82535d7c2869fbb80f12349ac41e87a67b614dbd19df034fe4c03
diff --git a/app-xemacs/ibuffer/Manifest b/app-xemacs/ibuffer/Manifest
index 9bd97c1d2221..fd34c12bab6f 100644
--- a/app-xemacs/ibuffer/Manifest
+++ b/app-xemacs/ibuffer/Manifest
@@ -1,2 +1,2 @@
-DIST ibuffer-1.09-pkg.tar.gz 89926 SHA256 17af6c47efb201acac1f4c0cb102c859cb4e125a0fb6aa55fd3cb8a13f861992 SHA512 d5a9d4aa5fa9fbbab7a50d488742c271d2810f5312f7e1db04c2ef600e94473acf6a6c6e6bbe5f1ba4c35f2f550044a0f8847a7cbc0963386b18fa2ad36be1d2 WHIRLPOOL 296fcb564eb87bf10f9b8c6e488255d4f6646e8d51cef9569d12453677ceeec0adfa47f4b2d39c2c7fbf4b25dca2f33fca2f451060566c6f855ed00f4bfc3c17
-DIST ibuffer-1.10-pkg.tar.gz 87849 SHA256 a8f315374d45fd734cf1e683b0c5897d6e8a0d8c28764c7e5a2c02ca29f891b2 SHA512 698ab658eabbcefe7826d8fe01978bae33158275727b61a404b8f7fcb6361b9c3bb502e50123a05e789571b06f4d113ea64052c90f669f5648d4050f5d25ad31 WHIRLPOOL 187b96c963c59159b39c4e8835c60f016181610aa965d818dc35f886743fd213110008770c388a29f6b4ca654fcd25a43fc4571d07fa0566c784819dc52ca320
+DIST ibuffer-1.09-pkg.tar.gz 89926 BLAKE2B 3d8cac6a487e281fd73cb443137421a85367f6141b2dad3f6530540a7764b4c3f9ba7e3551b243815cd97846afdba7811cc0c3b6a02f45e6d48f31392aeb3915 SHA512 d5a9d4aa5fa9fbbab7a50d488742c271d2810f5312f7e1db04c2ef600e94473acf6a6c6e6bbe5f1ba4c35f2f550044a0f8847a7cbc0963386b18fa2ad36be1d2
+DIST ibuffer-1.10-pkg.tar.gz 87849 BLAKE2B 54e5b403d50691cc3a0989f1aad9c043d815a6b092237c8cee218b95c5b65e8b3b8bddd620546952d4d1a391c6758803dd288582e584e0534abe73c549765a28 SHA512 698ab658eabbcefe7826d8fe01978bae33158275727b61a404b8f7fcb6361b9c3bb502e50123a05e789571b06f4d113ea64052c90f669f5648d4050f5d25ad31
diff --git a/app-xemacs/idlwave/Manifest b/app-xemacs/idlwave/Manifest
index 9f0a0b31a992..9528cdad0407 100644
--- a/app-xemacs/idlwave/Manifest
+++ b/app-xemacs/idlwave/Manifest
@@ -1 +1 @@
-DIST idlwave-1.32-pkg.tar.gz 520863 SHA256 462afe7a926ba46d79f2eae0d3f618b990a6389334b3bde7e829099d286cdb4e SHA512 deebd2e3f49e8a0cf057735a6639f890da5282edbb67cc35bb653456d488e9d0c9f5c69a73a70023f276d7c8df974d9b9a3400c2a7ef1e0bbc4c07c416353995 WHIRLPOOL 9dac871e89e1f19f6c02c84b9a539748831f5024985405a19207f0d60e62c49010f99331d77920a5a40e18a067ba30597fe85ed53e41bbeefc0a9c5d62d00f42
+DIST idlwave-1.32-pkg.tar.gz 520863 BLAKE2B 1156dcb89c9900ade58f35de3fae1e6cad96fa7dcbfeda30a9097108614bb5d1f8e8e618112dd47320700d36165ee11abee86e41d8a0cf944a8c32c9c3f5904b SHA512 deebd2e3f49e8a0cf057735a6639f890da5282edbb67cc35bb653456d488e9d0c9f5c69a73a70023f276d7c8df974d9b9a3400c2a7ef1e0bbc4c07c416353995
diff --git a/app-xemacs/igrep/Manifest b/app-xemacs/igrep/Manifest
index f32e275c4e0a..4def5611a3c3 100644
--- a/app-xemacs/igrep/Manifest
+++ b/app-xemacs/igrep/Manifest
@@ -1,2 +1,2 @@
-DIST igrep-1.14-pkg.tar.gz 20838 SHA256 50ab10f8ac870e34bc6ee10b3c6f88e13bc44733743e6aa96ceb11e6c6dd3650 SHA512 f5fd38a84cd46478bf48bb2c8629aefba9e5e967c66b0dca716df9d7a840871e9874b3786d95820219c8b00b7beafe770e3363352f1384a18bb0084ee1ed0f8e WHIRLPOOL f5fe61ffeff0798d9d3d6de328f2114d88630a991b630a623f54385049ee054257a5604314c7f398a48ec8c03e17187fa1cb4a6d9b040e71e915104f0642e3b3
-DIST igrep-1.16-pkg.tar.gz 21993 SHA256 dd43e1ec1f99ca002062a148d3bdf2dd08212b0b4357c872f9e7a98f3e53abd5 SHA512 0cc70a42434398e4e15240935660477ba7104e9531d7f87f5d5fbaa73b3f36fe8016d17211270a5f7274478335930b970430921a94571b28b39d0da96d579a0e WHIRLPOOL 5eecd9956129cc4b10992954b18648c03c89b7f7fcb6c22f6fbd8d8a00030d903fdece78b1080b2487576fb52e60feb272a699687594d4ec4656c75a2c4ad100
+DIST igrep-1.14-pkg.tar.gz 20838 BLAKE2B 5dba352e6084d9f9b6715d5a855cfbaf9e79d4e198bbd373b6e25e61f6c8cc38f19d83b0672618778eaa243695a2748c6a78ae75dfb0a25278eaf18950c2df4d SHA512 f5fd38a84cd46478bf48bb2c8629aefba9e5e967c66b0dca716df9d7a840871e9874b3786d95820219c8b00b7beafe770e3363352f1384a18bb0084ee1ed0f8e
+DIST igrep-1.16-pkg.tar.gz 21993 BLAKE2B 688a1dd31421a07558da5d567d31d2ba14bc847943e201dc136023e5bf5a2aa595a3b0227d2cf38c0f0fc3f591316ec03a340390362953aafc432bedbf48e921 SHA512 0cc70a42434398e4e15240935660477ba7104e9531d7f87f5d5fbaa73b3f36fe8016d17211270a5f7274478335930b970430921a94571b28b39d0da96d579a0e
diff --git a/app-xemacs/ilisp/Manifest b/app-xemacs/ilisp/Manifest
index d5b69b8b9b41..bd78bde83ef8 100644
--- a/app-xemacs/ilisp/Manifest
+++ b/app-xemacs/ilisp/Manifest
@@ -1,2 +1,2 @@
-DIST ilisp-1.34-pkg.tar.gz 345867 SHA256 0557fad7411b92b1f1daf00f2ff6549a9df4b14f59700ac3a255880f6dabbc58 SHA512 c6d024383f6bb33dcc47f175895aace02bab209fa4ece11ac90812630e49a3ac43f10931a9398fcd9dc4f14747bdb0a0694fab4f67c9b15650bcf201fea7508c WHIRLPOOL 6e0ed8c27ce658f7a94d94f778f36ba7db9541e87a685fdd82e57c1605a35a678a0d7a7d3849e6af407b98767611ecea4f52135ce6124bc05be4f974d832b763
-DIST ilisp-1.36-pkg.tar.gz 347911 SHA256 e9ae0392250176d2e5c6c85c7f33105ef99e387876fddb20c73703cf2ad516c3 SHA512 71a637f80df53ef59b5e2d56ab1c36790d702a7419831d1a1ed54f4e29570e0120c757af71675039fc7076625ad1379eae07a2895c01ced0b066de88bb62576d WHIRLPOOL 179a870b8808e9fbfa9e8542364b8588933850e8c776fcfa0fc83a2d8bef040fd06e0495e9a22b4c14ca5e12f7fa7bd14af07edf83d602722644da2fb47f70f0
+DIST ilisp-1.34-pkg.tar.gz 345867 BLAKE2B 7a3faf630fabf39f25f4cbb73fafdc261441699d75bcdad0c8117ee051ae59b06735306b77617ab75c092178cfe0f0e0b98b53bda01a3026f0728ba86bef25ee SHA512 c6d024383f6bb33dcc47f175895aace02bab209fa4ece11ac90812630e49a3ac43f10931a9398fcd9dc4f14747bdb0a0694fab4f67c9b15650bcf201fea7508c
+DIST ilisp-1.36-pkg.tar.gz 347911 BLAKE2B 4e8783055d06b4824c806c80d79dacb4bad8066fcd1afb9c6e3911a176792a6ee8b6ff269726178642d7c75ce12b47856abe82504c67fa8caa5291f89e9c0f39 SHA512 71a637f80df53ef59b5e2d56ab1c36790d702a7419831d1a1ed54f4e29570e0120c757af71675039fc7076625ad1379eae07a2895c01ced0b066de88bb62576d
diff --git a/app-xemacs/jde/Manifest b/app-xemacs/jde/Manifest
index 12f44457993c..f03a6d32c0a4 100644
--- a/app-xemacs/jde/Manifest
+++ b/app-xemacs/jde/Manifest
@@ -1,2 +1,2 @@
-DIST jde-1.51-pkg.tar.gz 3508064 SHA256 1df43e08c034087def185f1a20c4fa27e660f2ffc6a601d9a55a375f119e79ec SHA512 6bd21d073562a7aef66f4a5c3fff014b5d293bbcb08483f003c0d914c18034806a4cb9e3fb31f07149106a9e0f69eea6311e8740a1660bc2317a63d158c2acc8 WHIRLPOOL efd6b07e866cfc07ecb49be26d1f13301247137f3a218cf98b9f2954de0a247995a5027347471559b67bb87bffa0372157abaf5677ead1272b2fb7fe17f08c4e
-DIST jde-1.52-pkg.tar.gz 3767445 SHA256 0fee8bde4d4454a427aee3ca03a40ba1ce6d35e4c89f0f19f275dbf879c657b5 SHA512 f2fa2e266cd832b5761ee967e2b4be52694b941699a099ffc363869bb4036a439ca8010e6428b98cf0dfc474b451f48b031e042092e1f66706b9a50e0f88c413 WHIRLPOOL 6b88a229f0664d41d2b5cd06bfee4e1554d55d44f31d3dda9ae9997d2ea5044f0ff96956624770be683018d28fe569f0a5b33632ac01fd78f515dee9cc816a5e
+DIST jde-1.51-pkg.tar.gz 3508064 BLAKE2B f3dd080be5bedc5dc01cdd8d270da9407e70b979af4ebb0ec7beee92f664af95217354cb952bf7fcf3e4d14d4b32c4ff4b2f45dd2175fbee84b395bc991c3e0f SHA512 6bd21d073562a7aef66f4a5c3fff014b5d293bbcb08483f003c0d914c18034806a4cb9e3fb31f07149106a9e0f69eea6311e8740a1660bc2317a63d158c2acc8
+DIST jde-1.52-pkg.tar.gz 3767445 BLAKE2B fddef76a453d594d896480089b45bb8472c72535b4a259d61a8facca62932c0420e9161843f494b2badc11f977d57b85c85687c50534a2d1b3c5320ab98d1bb1 SHA512 f2fa2e266cd832b5761ee967e2b4be52694b941699a099ffc363869bb4036a439ca8010e6428b98cf0dfc474b451f48b031e042092e1f66706b9a50e0f88c413
diff --git a/app-xemacs/latin-euro-standards/Manifest b/app-xemacs/latin-euro-standards/Manifest
index b9885d23c87f..6c8ee43cd24a 100644
--- a/app-xemacs/latin-euro-standards/Manifest
+++ b/app-xemacs/latin-euro-standards/Manifest
@@ -1,2 +1,2 @@
-DIST latin-euro-standards-1.07-pkg.tar.gz 13887 SHA256 5a46834c72572901af5c271e7d07200781f26d6ce7b58f1a5e29e87ec0787af0 SHA512 71e666f40be2e299394400235ab8d4474807feb7f8e041ad8f55fc743c71feb4edc71cebdc7a19a1cc22949752d4af297b16c1c03520cc17b1ed5882d6f4fc6d WHIRLPOOL 24f9a28b21c0c1f2f95d83c958fd110207a7e8b2576ae27255d84e927ec809e488410cdc00ad2a53243e5cdee8d63df763352c938a6408301c59d24be0ccef6f
-DIST latin-euro-standards-1.09-pkg.tar.gz 14360 SHA256 f1ded92f9bd9126e347ecbe06fe8be00ae11870734e577e2376c483588661eea SHA512 d76928736b98bd8c27aa8624de23702ca1f3f121ea926cfb11306bb6a5c64f452474ca643da63ce3801e5ddf757d67f28f92ce95fe885d56ce6f4e9baecb55f3 WHIRLPOOL 06213629bb6b672bb18c4f25c3438e2bc03ce7c7a8fd95b25c9d5658e334fbe757259fb17c0906f216f9bd45451b7c1c65d7e94d3a1addb762ec0542633fbc54
+DIST latin-euro-standards-1.07-pkg.tar.gz 13887 BLAKE2B 5a97c6639668d77e376af24ffa14723acd2b40a4bac0fad334f881319a537d5d610a9ddfa0a0f021e5fdba8df684bb0c3c5a514c8efbec52aaef684b1a546b24 SHA512 71e666f40be2e299394400235ab8d4474807feb7f8e041ad8f55fc743c71feb4edc71cebdc7a19a1cc22949752d4af297b16c1c03520cc17b1ed5882d6f4fc6d
+DIST latin-euro-standards-1.09-pkg.tar.gz 14360 BLAKE2B 00ce57c201c0e815f30eb284d04a04cb3670a2a8af8ef721d7fb46c926ab7a882d0ff23a8311900619347cc8daf85d9a73cb3ef43980cd179da16b119f138ce1 SHA512 d76928736b98bd8c27aa8624de23702ca1f3f121ea926cfb11306bb6a5c64f452474ca643da63ce3801e5ddf757d67f28f92ce95fe885d56ce6f4e9baecb55f3
diff --git a/app-xemacs/latin-unity/Manifest b/app-xemacs/latin-unity/Manifest
index aa4ccd18a32c..916199b546fe 100644
--- a/app-xemacs/latin-unity/Manifest
+++ b/app-xemacs/latin-unity/Manifest
@@ -1 +1 @@
-DIST latin-unity-1.20-pkg.tar.gz 106399 SHA256 3d0bf5138e7dc86d92d6f56307350509822b7ecfc409cc2e3db09fa17b97171d SHA512 9e2634c69ba1382113811e31b9bb2a4d3aa5780fb5d98b0bcb3e8c3ae813ff881ae13032318e14000f9ecb2c68d4490cb168ea8b10a373889962ba7c920569d1 WHIRLPOOL 303e99c1a5dfac5de20762422f04211df4f388c0de68ac9c180deee9385a57de8668e39b4599f9dfbafdb8e778264c394d04a79c34cb4e51b9b9ce51b1ba1c45
+DIST latin-unity-1.20-pkg.tar.gz 106399 BLAKE2B 3e5270865879a49f0ecd2eace7635df32219834240ed84e1a1953d2ad5c943fbff96b2e6efb3bd79ea1053adcd4a0daa1de9a62320eea313d43b1cbf0dd6e994 SHA512 9e2634c69ba1382113811e31b9bb2a4d3aa5780fb5d98b0bcb3e8c3ae813ff881ae13032318e14000f9ecb2c68d4490cb168ea8b10a373889962ba7c920569d1
diff --git a/app-xemacs/leim/Manifest b/app-xemacs/leim/Manifest
index c63f40dda515..3f3ecb2f3a63 100644
--- a/app-xemacs/leim/Manifest
+++ b/app-xemacs/leim/Manifest
@@ -1,2 +1,2 @@
-DIST leim-1.24-pkg.tar.gz 1723174 SHA256 8d5ac2b42401ce1506eeca9c24b79380dd7deea0c9b43e39ac3af91e19902ca0 SHA512 a5f338e63806802c743b1fc8702612948cccd43cb6ce87cc88059502a6ee3d919e48bbe0e6a34b3338e4d6ed617530e399169c35988cac4e5e17fd096676b83c WHIRLPOOL dd72c538abf35e116067e0cb90a13183662640626e8178bceb4b356ddee0b75cf2599b70bd65a6fe9aabaf47da792ec47f71ef14a3697be5129c2f0eff8ee03b
-DIST leim-1.31-pkg.tar.gz 1804784 SHA256 977406e885cc3aee97d9832053cd16fec44f4701f72ab91518a509ff2d5ce23c SHA512 1179480967e12a7a9701cba24e40f6bdeb51e57fe32e7f4ead4196e652029fa04e0470dfdbc5aecd4a0caf0b53893a815559c5c550d9dacf7e724c898ce6f26f WHIRLPOOL 08419035ad8b2557243f1d1d7eeab3df059ca90deb170f26428c4a8c691db95ccb82f556e4f77e1fdee6d2e88d9ace94573d87268892369c0ecaafc3e571314d
+DIST leim-1.24-pkg.tar.gz 1723174 BLAKE2B 103b0f73a3fcb81c7f8f4faab7a59b59b615f8731682eceb927d9307b21f8d1f41449cf9e908fe06579a2802187c39f6cbcf2c22949bed28fe11246bbd5f85a9 SHA512 a5f338e63806802c743b1fc8702612948cccd43cb6ce87cc88059502a6ee3d919e48bbe0e6a34b3338e4d6ed617530e399169c35988cac4e5e17fd096676b83c
+DIST leim-1.31-pkg.tar.gz 1804784 BLAKE2B e18e999335494795f1821e8a6d6e762c1a5db74f61e9ecf8f40dab4fc484ca6ff226799369f71df9628b09c1d92d328895405bd769e0cc62979cae328a1fa9a1 SHA512 1179480967e12a7a9701cba24e40f6bdeb51e57fe32e7f4ead4196e652029fa04e0470dfdbc5aecd4a0caf0b53893a815559c5c550d9dacf7e724c898ce6f26f
diff --git a/app-xemacs/locale/Manifest b/app-xemacs/locale/Manifest
index afe551f9eb75..7605761af28b 100644
--- a/app-xemacs/locale/Manifest
+++ b/app-xemacs/locale/Manifest
@@ -1,2 +1,2 @@
-DIST locale-1.24-pkg.tar.gz 46421 SHA256 9b74a7edc9461ef4131c73a0561e7156778ee186269b949c5881df09b7f983da SHA512 2c192e20f36d1d14d803cdf0c5e0949aa5a75059531a87823cc8e1192f4543a0d5ea5088a562a315e76a459bcfaaad95328b6c8a0740fd4ce1549eb2f443c3c6 WHIRLPOOL 0f83a8ab1531f2e8e2134a2beed2bf0fe0c9d13d65d39b04c5c7ae217097eeed56778ad5bbe0dd4b6f8de07f49c9ac26d22cd75b976693d87e1fda8cf64f1a08
-DIST locale-1.28-pkg.tar.gz 74931 SHA256 cd01c18a729fe6eeb0cc74806c9bcf609d7273704400e2a2271d4c14ade5c408 SHA512 f26370be8e614d74503d57a0c0bc9eab153ea54c36466245b7a4851d508942e4c075146d140a8cffba071513fd1f6360de714eafd8fbd600ad9dba053e789d8a WHIRLPOOL 16ba70f6299fb707922580af868d867275a65deaf2102fdd5313e63d23f747fbdb321ac89314e2252f9e2903ca40ec0cd75c60ff026f974fb01288d0b72ea6df
+DIST locale-1.24-pkg.tar.gz 46421 BLAKE2B ce87a15aa6480dcab5b5b5dcb7fed6c6b112207058fe43d2e369109f1560f9051b275a92ce2e19a0d7a621e94d67b2c9309fd67cfef8e41f546f955cfc71bbe4 SHA512 2c192e20f36d1d14d803cdf0c5e0949aa5a75059531a87823cc8e1192f4543a0d5ea5088a562a315e76a459bcfaaad95328b6c8a0740fd4ce1549eb2f443c3c6
+DIST locale-1.28-pkg.tar.gz 74931 BLAKE2B fa303cf6cacfada89cdc364fb9a6ab76b93b7421fe5b5a390f8f0f46f5814024dab53e4ffffe1ed76d746b08033863ce12f13b86cdeb425fa8fd500f7e8e768f SHA512 f26370be8e614d74503d57a0c0bc9eab153ea54c36466245b7a4851d508942e4c075146d140a8cffba071513fd1f6360de714eafd8fbd600ad9dba053e789d8a
diff --git a/app-xemacs/lookup/Manifest b/app-xemacs/lookup/Manifest
index 39ed020259cc..ead7a1f8c4ea 100644
--- a/app-xemacs/lookup/Manifest
+++ b/app-xemacs/lookup/Manifest
@@ -1 +1 @@
-DIST lookup-1.15-pkg.tar.gz 225952 SHA256 11b98cbc7668d2070c2b6653abf82732dd9ce05863e1f009c5c88a5b70a2e4cf SHA512 06d23009bb75475b7df36274ea67046938e328077185a9567a232f4b901f948fd4e36ec39fefacaaf4e1761d800e8803f9aa45dba93d00ccf71710673db28f01 WHIRLPOOL 11cc6542c829b8bd3b8d08e6a1dce1f787236ef0a936dbcaaefee881a6e2260647184af8a531f22e224fe311d47b482b759f61fec163f6537f0713bae0b3a90a
+DIST lookup-1.15-pkg.tar.gz 225952 BLAKE2B 6894dabb547accf5732859a30d6589c3a283c2bd3e45eaa6b25831a997999a619754db7b2baee9c4b87a399e2d7d2dc73ba0245b4878d03d59f5a8f3155c18f0 SHA512 06d23009bb75475b7df36274ea67046938e328077185a9567a232f4b901f948fd4e36ec39fefacaaf4e1761d800e8803f9aa45dba93d00ccf71710673db28f01
diff --git a/app-xemacs/mail-lib/Manifest b/app-xemacs/mail-lib/Manifest
index 72b67254e412..662d04ddd33d 100644
--- a/app-xemacs/mail-lib/Manifest
+++ b/app-xemacs/mail-lib/Manifest
@@ -1 +1 @@
-DIST mail-lib-1.83-pkg.tar.gz 211862 SHA256 feba4927009238f6eae1269e24697c546d32dd90d3027022d71f7fbba45080ae SHA512 09149c96e3716c2df054654a6111cd45f0bc86c47ea5a8c699e8c7822052c68885a01392e07611ad7b5f721679aa1a9c5da0694d1a0aef6af3a51b4290c31162 WHIRLPOOL 7231cbe90f1a79214bd1af6ccfeaf3b9faa8ad9476263985225cb8245511f6776a5b6a4f9c4119f2d75ff8cd2aa19d0ae2e49797d1ce7d42f967b10c588dc444
+DIST mail-lib-1.83-pkg.tar.gz 211862 BLAKE2B d84e39e45b8193bbb05a6d724d6b8672aae2daf506fef5ae99a71c4d122834d5259e82e83e05aa5480c1327c523c19f58f70e921eb44a6a90f84ad4c3aac36d1 SHA512 09149c96e3716c2df054654a6111cd45f0bc86c47ea5a8c699e8c7822052c68885a01392e07611ad7b5f721679aa1a9c5da0694d1a0aef6af3a51b4290c31162
diff --git a/app-xemacs/mailcrypt/Manifest b/app-xemacs/mailcrypt/Manifest
index 0c7162062458..01598eabe509 100644
--- a/app-xemacs/mailcrypt/Manifest
+++ b/app-xemacs/mailcrypt/Manifest
@@ -1 +1 @@
-DIST mailcrypt-2.14-pkg.tar.gz 154180 SHA256 27c83ca05d209f8771814a0ac501929174718e9c49b82214e7ba11d5033deb4e SHA512 61e252f67f8848d54bd372341545d88d9f2150f671dd8cf371fa7650c9183eb7e4d8f3e661255110ae1a47df152060d81143f83a2f2fbc942aa6a83d36f09e9e WHIRLPOOL d65e5711383e75df2c4455f76fafdb053a9686a533f17ca84391d65bbfa9c266a5f96c20b05d0cd8d610304c42a0530f5d379eef1058dbcd89201f6a3d1006d1
+DIST mailcrypt-2.14-pkg.tar.gz 154180 BLAKE2B a5db41632b13930cadac65921026a5c5c2d393313d94c6c851e2691eb964eb6f70a25909f71dd7748f537f1dee037e6d3a45b9a7a7d031100e2018e9b2fd0759 SHA512 61e252f67f8848d54bd372341545d88d9f2150f671dd8cf371fa7650c9183eb7e4d8f3e661255110ae1a47df152060d81143f83a2f2fbc942aa6a83d36f09e9e
diff --git a/app-xemacs/mew/Manifest b/app-xemacs/mew/Manifest
index 168377be8fd2..b9ab94673655 100644
--- a/app-xemacs/mew/Manifest
+++ b/app-xemacs/mew/Manifest
@@ -1 +1 @@
-DIST mew-1.19-pkg.tar.gz 745714 SHA256 3aa26c9531e1add74c283338af4995a1316ba03b692963c23f8bf93fcf964b28 SHA512 9168cae8ad96d1050eecfffa46b4c15d65fef1908407f339757a5c9af21d2ef7b53a74cc6b805f0e6bed264fbcce81656117c44382b5884c2f772503cb5f1180 WHIRLPOOL 73e4f01473838d02463aa2d984b1e104d799a8bf4749150c175c67e3589f3df995600c9d6329b467a7019844320a036ac7b88ea27344c1b16f6ee7570fb3625e
+DIST mew-1.19-pkg.tar.gz 745714 BLAKE2B b2f4a6889cb1e9aed82ce7a75c6861fe4e07a924f3adf32c9592800b6ba03f9960d65da579be2e5ed8343d2d70928336720d2f8f3578752df4cb9504a1231374 SHA512 9168cae8ad96d1050eecfffa46b4c15d65fef1908407f339757a5c9af21d2ef7b53a74cc6b805f0e6bed264fbcce81656117c44382b5884c2f772503cb5f1180
diff --git a/app-xemacs/mh-e/Manifest b/app-xemacs/mh-e/Manifest
index 6f266298a210..18a2f6f2ddf3 100644
--- a/app-xemacs/mh-e/Manifest
+++ b/app-xemacs/mh-e/Manifest
@@ -1,2 +1,2 @@
-DIST mh-e-1.29-pkg.tar.gz 578385 SHA256 0061e3b1461623c2772b9477e728541bdbdb9e292e741e3539cdc7b6f6fbaeb5 SHA512 49385d5acbea34df5957569ec851ef4e933c1683f313939550705fdee96350376f5434a10d8013797222d5416bd759fc5769022449241004777991b72bde1d05 WHIRLPOOL fe32ecdf780fc5b82c8a3c207b6d86b201e631213b4891108ec7bb619310a0ba3b66d96a0b9a2d954174dd368bfc8d0a1fdfbb09e042b9afdacb2303c7efd65c
-DIST mh-e-1.32-pkg.tar.gz 580383 SHA256 f4358a1f8471f4fc8255a5684a2d2764edbdcd2a9215c46862e5294c9499abba SHA512 364a1d7a1606a0cc18339a01569c64d98e6911a216d208231ea719455e8ef0bbe69fbc6def9f0ace6df180a924c2b65eca537994701bbb914cbd0f54dc75cf03 WHIRLPOOL 0ff1b7ca305d716b469a6423024ac001042eaec8573aebf20553615a4c1a0d834d7826e35337a4fb5711f31b4c9299c61573ce8034b485442340e9953dad50c2
+DIST mh-e-1.29-pkg.tar.gz 578385 BLAKE2B 1b0f6dc854dc346b5b47b9ce9b85d1533c7dc9e22d2bf2a85c3728c6388798927e04f1cc4619880c75c933888eb63c481ce792b942bea938b8fcd97aba3411be SHA512 49385d5acbea34df5957569ec851ef4e933c1683f313939550705fdee96350376f5434a10d8013797222d5416bd759fc5769022449241004777991b72bde1d05
+DIST mh-e-1.32-pkg.tar.gz 580383 BLAKE2B 596c7111ae90fc19c00a30e7291a364e7695f68236f87e526af4289e58f494aeaedf07cc56f8af8ffea7743b46a29d0a14e9e0bf2c4e9f384cfb9f409ad28616 SHA512 364a1d7a1606a0cc18339a01569c64d98e6911a216d208231ea719455e8ef0bbe69fbc6def9f0ace6df180a924c2b65eca537994701bbb914cbd0f54dc75cf03
diff --git a/app-xemacs/mine/Manifest b/app-xemacs/mine/Manifest
index e2f1aead40ab..a4f863f0072d 100644
--- a/app-xemacs/mine/Manifest
+++ b/app-xemacs/mine/Manifest
@@ -1 +1 @@
-DIST mine-1.16-pkg.tar.gz 67161 SHA256 17cb6dd3447978c50074422b6f3b01b0f2a350fee83ac48144e304bef9be78d0 SHA512 5d319b2ac1e2b5a8cdc753cafe8bd2af54a44aa97443eb0c34ea5f58e3c173801e83bf6b22cbb3b5f1fcbb0e6894586a03085eac81f6d9d43236b70134b35a84 WHIRLPOOL fea5ba3873f2eb3b2961b9569a4593b07d6c84f5e28a1da81ca796ac889e7d6898b7e62ad04e4164a4812d332f62532e933f753943b3a645337a39bc575e92af
+DIST mine-1.16-pkg.tar.gz 67161 BLAKE2B f25b20f0e9f956c8dc31f26395435ec5d0f6f6d38e1becd4618f5a210fd4b11f2888e05ff35452b68d809770a63678ed2c419762d89f7c837be2219de71b4dd9 SHA512 5d319b2ac1e2b5a8cdc753cafe8bd2af54a44aa97443eb0c34ea5f58e3c173801e83bf6b22cbb3b5f1fcbb0e6894586a03085eac81f6d9d43236b70134b35a84
diff --git a/app-xemacs/misc-games/Manifest b/app-xemacs/misc-games/Manifest
index 71ab6f35a86a..0c01ac4ef802 100644
--- a/app-xemacs/misc-games/Manifest
+++ b/app-xemacs/misc-games/Manifest
@@ -1,2 +1,2 @@
-DIST misc-games-1.19-pkg.tar.gz 170091 SHA256 1c9867d1decccf00d4c162ec4786e2749c55d5ae68c091731a1b3150230702f7 SHA512 5c4c3a91db45df3ef4dc78f31ad6a8552118fd6fa8ccbd79b1867e8f341bbf3afe85776b3808f0c14e636feaf2311117a3d3cbfd0d70f82ee6a88df4bb0f6c46 WHIRLPOOL 221d77c170ad3abafbf16778bfb423edcc4c8a18dbf39fde3cf7a65cac20490d18db0f4fea35f7340c450d5b2aca26d14f42007de837c321ade441580bd672e6
-DIST misc-games-1.22-pkg.tar.gz 170609 SHA256 c6dc73f0443be2e61b2bd84448cbd6314c1c93b902fb9c6bb13bcbf4dc352d1a SHA512 21a970e5f35c90bb838ba3964020c025219dab65b234056cadc409d2d396d39a792aaa58d42f806a5166db99b6c0dfb66da0d724f063041468b46a253f3424e6 WHIRLPOOL 4d64e65767a91bd143e7ea85b834c2791bad7e246d64afa0c35644eac7b489d4cd9a5c7ffcf3c059445d43242e203c475e2c062ff964003c85e10555a2d92ff0
+DIST misc-games-1.19-pkg.tar.gz 170091 BLAKE2B 4fda80c1a74061d885a5b8e553e4953750872bb5ca1c66c39af940361eb278036f412b42785a25abae9643573502fbe9932c9d71425c5678f89ba1a1db25bd24 SHA512 5c4c3a91db45df3ef4dc78f31ad6a8552118fd6fa8ccbd79b1867e8f341bbf3afe85776b3808f0c14e636feaf2311117a3d3cbfd0d70f82ee6a88df4bb0f6c46
+DIST misc-games-1.22-pkg.tar.gz 170609 BLAKE2B 336bc894d513b9750be7ff26ba6139a0c86dc0ce9acb91e07d27bd3ab617e7d9348075cedbb4242fd62ce70671d940c0c790f0bceca010f6a6d7c6f013811dff SHA512 21a970e5f35c90bb838ba3964020c025219dab65b234056cadc409d2d396d39a792aaa58d42f806a5166db99b6c0dfb66da0d724f063041468b46a253f3424e6
diff --git a/app-xemacs/mmm-mode/Manifest b/app-xemacs/mmm-mode/Manifest
index 006291feb6d2..87b03abd7b69 100644
--- a/app-xemacs/mmm-mode/Manifest
+++ b/app-xemacs/mmm-mode/Manifest
@@ -1,2 +1,2 @@
-DIST mmm-mode-1.02-pkg.tar.gz 176072 SHA256 caca4271ee6cc0509742c959b5716aecc4e5321b54f4f47ad4858f288d0db251 SHA512 9fa9d9d461a063a08b7b7874fb8329b9a7e84b3268593554c9c46e9ee0d433cfcff4049056a4d85b829d14d6bc50f495951b708adff27c43b7961a8ee6b4c5c3 WHIRLPOOL e13de59bdee48de36670676a0f15b9e8ebcd8679dcc0dff5bf469b934f5d85b09a1c528d4f4ed2c186c1b1372ea3886f32ef78496c334df28f182d4ddf2156f9
-DIST mmm-mode-1.05-pkg.tar.gz 205381 SHA256 d77a6dabe1b274b712dc188df3d3629c3344bd99b0516dfa20625fc7af7aa411 SHA512 4b5b649a0d25a6eb8967549188c32d9b6a2e7fb3abc0375b633df7c7b133a06f2c5bfae31aef8704c17e9ced32d205def85c906472fda00ff0d5fdfc6b95b01b WHIRLPOOL b9455317ddbd172086023b101fa7d6639d996b0ce7d8e3202d1652665bface77d00dc63cff9bfd634022195ac5a84ca59507bc254b9c207553a03e03fb5887d4
+DIST mmm-mode-1.02-pkg.tar.gz 176072 BLAKE2B 36bcf9c5bd889b988f8190277b4d02546d286fd2695c557cd7f703a8888a21416cae054d5e1192c6fcdcffa193d4017dcbb5f16a4ef341071ee8658bd9292c33 SHA512 9fa9d9d461a063a08b7b7874fb8329b9a7e84b3268593554c9c46e9ee0d433cfcff4049056a4d85b829d14d6bc50f495951b708adff27c43b7961a8ee6b4c5c3
+DIST mmm-mode-1.05-pkg.tar.gz 205381 BLAKE2B 532d29da7ec761e1c79d0b5e77c7f95694f8c22541834164c3c90d2dc21c9c2218614cec43ee2344cdfbf5acb2eba328f6fd55631a011256f7311f449479ec3c SHA512 4b5b649a0d25a6eb8967549188c32d9b6a2e7fb3abc0375b633df7c7b133a06f2c5bfae31aef8704c17e9ced32d205def85c906472fda00ff0d5fdfc6b95b01b
diff --git a/app-xemacs/mule-base/Manifest b/app-xemacs/mule-base/Manifest
index 513f2f1ef956..8fa175f33a41 100644
--- a/app-xemacs/mule-base/Manifest
+++ b/app-xemacs/mule-base/Manifest
@@ -1,2 +1,2 @@
-DIST mule-base-1.49-pkg.tar.gz 446628 SHA256 3834fe417838ab462dd8e18d4e9f1a0f8bd25f65fdf7f7adc8e96066df9f4db4 SHA512 ab5dfaaf620f0b59e54ab71eead60e27a110d48261bc597dd3b933629a17e5a0498b2e7aa6e75c32b97d71a2a8666b0a4376f73997c004bc299de78d2cbd5251 WHIRLPOOL f69ccc26649d92498eb6763fea7405956a7419251802c873833862cfd478d7472864cc08a980b9d055da2760435a795bcaf2dcd15378ed6a7a619852ad56e5b2
-DIST mule-base-1.56-pkg.tar.gz 445956 SHA256 44d4e9dd3aa4e57b489a38a9ce5d78d7188d4e62275b7383af613307f11bdf10 SHA512 b1d3aaf08afdd68352213ca5c08bfecca08369f18f97c9c709fc412153138a567dc72af07b086c0f96f025fbfabcb0f9d1da626a199add6aca6f8a6d23809865 WHIRLPOOL e955716740f092e73239b4b118634fa7d8762c08113776366bcf06037f8db446c2e57e5b4b0c17a07f90ac8c1f29ae0973cf2467d6674a079917d5a71ac4f56a
+DIST mule-base-1.49-pkg.tar.gz 446628 BLAKE2B 3b6a12a621622a93afd41dd0627d8e8da6f63cb244b81ed2f1ecfd1b127d12990a92538d6fde81342fb4bf09d83937c959cd4b21f480040c38b6acac68ab93e4 SHA512 ab5dfaaf620f0b59e54ab71eead60e27a110d48261bc597dd3b933629a17e5a0498b2e7aa6e75c32b97d71a2a8666b0a4376f73997c004bc299de78d2cbd5251
+DIST mule-base-1.56-pkg.tar.gz 445956 BLAKE2B 2d016323649ea702b7826091ed4af3513e077f068fe9776212550bab9aabb9e9a8bc2414c458424dc736cba8bca167f74f8fbc2ce2c077bcd2b27de0fe22a52b SHA512 b1d3aaf08afdd68352213ca5c08bfecca08369f18f97c9c709fc412153138a567dc72af07b086c0f96f025fbfabcb0f9d1da626a199add6aca6f8a6d23809865
diff --git a/app-xemacs/mule-ucs/Manifest b/app-xemacs/mule-ucs/Manifest
index f7dae3b53cc5..5cfbde9fce28 100644
--- a/app-xemacs/mule-ucs/Manifest
+++ b/app-xemacs/mule-ucs/Manifest
@@ -1,2 +1,2 @@
-DIST mule-ucs-1.14-pkg.tar.gz 1300714 SHA256 f8416b3efb80ec0c54a0f8ca1c860bb2e93ab65b2d627b5c634194a90586f409 SHA512 a4c66a8b037199fdabbafcd076f9cf0e0a2e00ca1330fd9dbf58c9d2a394da2cf9bce199b6b1d5f330e587a088976f9600c874251fe129d941fdf762d3788f37 WHIRLPOOL 816d5ca6244e18553ae21b470c184bae1f56b07f5af8745b9b650634c310e8cfaea35ea7811b8d6744e1ca5cf9f65ced0415a055bf8b76fc82b71447c6b7030a
-DIST mule-ucs-1.18-pkg.tar.gz 1301082 SHA256 ff0ac588e51d829477b3b9074077db6ef9846e9980b2471105fa64c94c716513 SHA512 1796b3b56b4c3e55241563eeab25568cd020f62bedb7c2d440e01afab0077e43f1a6298b34174b7e97f253ccdfd41f3c6bc40cfcc73759e34a0d04a90fdd5ca9 WHIRLPOOL 671454553e54fce57b6afacddd473ffd17d911d59bdda23058b67eec7bab9610ae5c24943b629d957f4ffe6e981e9aafc8c368d74e930ba37cca348403e0cce3
+DIST mule-ucs-1.14-pkg.tar.gz 1300714 BLAKE2B 2e87b682d5eaac563a00d8838457cc9f355f8323c95616147e74692c0edc6e1caf555be45b108c20be2988c7c91a4d3640d609e2e995407d02214e6298ddbd59 SHA512 a4c66a8b037199fdabbafcd076f9cf0e0a2e00ca1330fd9dbf58c9d2a394da2cf9bce199b6b1d5f330e587a088976f9600c874251fe129d941fdf762d3788f37
+DIST mule-ucs-1.18-pkg.tar.gz 1301082 BLAKE2B 57cb01431e8210d4ace63150b260600c14d8cb26e940dcc797d50ff0c7545f7f6278b717e703a3dffdd8906cffd77abf107b03aec958271dda2e1626f72165c9 SHA512 1796b3b56b4c3e55241563eeab25568cd020f62bedb7c2d440e01afab0077e43f1a6298b34174b7e97f253ccdfd41f3c6bc40cfcc73759e34a0d04a90fdd5ca9
diff --git a/app-xemacs/net-utils/Manifest b/app-xemacs/net-utils/Manifest
index 789e2fce14b2..b9d633f9e62c 100644
--- a/app-xemacs/net-utils/Manifest
+++ b/app-xemacs/net-utils/Manifest
@@ -1,2 +1,2 @@
-DIST net-utils-1.52-pkg.tar.gz 155813 SHA256 3b0e5e5ef723a7e9b2b84b2a9d76a83e584dadd7a1eb9f2f6b6eb9d8aa3a08da SHA512 93761d6d9085f6b01f227d0beafd13d4b83a2c902546ac1853be58a5ae3916d57ac528b217aeab398b9ebbac07a4e19cf6d5975ed71621c55f46ae0af5af4465 WHIRLPOOL b40dcf6b1dc2bcf3e20e219c2ca8c37b11141a8c1b49e659b9898cebbe81e92caba2cbb75caed8538ebde790ef305f15bb452e8516a2358708f2ec5b4c953be7
-DIST net-utils-1.56-pkg.tar.gz 157356 SHA256 bb480b71f81651ad9752b716cc1b9863df9df052602948ee9451d55b84a8943d SHA512 cfaae188a1922e3b7c51d5d1c3ce75b48a4e897a6dbb1278ba7e554f74531a984382cf0951a276b60421c5cde6a2bff3a265fcb8806d8850d9eaee3feb49ff77 WHIRLPOOL f83083d477c7293589f88a0ddb8047fae7727761b6a9256922a73c686c55c1704325a2f5e665ec4375ba0110718ad437a4fbbe4102878c292cea0f0cdbfa7e6d
+DIST net-utils-1.52-pkg.tar.gz 155813 BLAKE2B 07a1667dd74f51195f241354f199834f533a392f26295136760ad9e7e41124947ba8d83a4a2814bc1d7d66c96ad13dfc9de6e381434dfb2f1e0eff3177b8336d SHA512 93761d6d9085f6b01f227d0beafd13d4b83a2c902546ac1853be58a5ae3916d57ac528b217aeab398b9ebbac07a4e19cf6d5975ed71621c55f46ae0af5af4465
+DIST net-utils-1.56-pkg.tar.gz 157356 BLAKE2B ace09a691e7722872deb666cc5c360ca780eaa6c6cdd19d23bb1ddc4b2b3f5aa19838cb93b7fb5e6b699aa774f45339ffeb7c2108dcd4ce352510426e3a1fd31 SHA512 cfaae188a1922e3b7c51d5d1c3ce75b48a4e897a6dbb1278ba7e554f74531a984382cf0951a276b60421c5cde6a2bff3a265fcb8806d8850d9eaee3feb49ff77
diff --git a/app-xemacs/ocaml/Manifest b/app-xemacs/ocaml/Manifest
index bf13e7372404..66afddd23c03 100644
--- a/app-xemacs/ocaml/Manifest
+++ b/app-xemacs/ocaml/Manifest
@@ -1 +1 @@
-DIST ocaml-0.06-pkg.tar.gz 65300 SHA256 d22488580650c965c94a2abe9ebf5dcc5cc694f5be6082395d9ea0bb7f3df580 SHA512 ab21c0c4bc6cf204c4e2b9b9e1d153a4ddc2de941032946fb460e480d7396c17c563b2234ebd5aec0ff1e833ec578470366204b959f621e1da1d0cace2eea7f2 WHIRLPOOL 2d89326b23db81b21da3737d0d5cf5077be4789e2cb791ac9f7e2cb9f2530739326df7e2aea0e587db624a88619380c7cc3f334bafad67f91c4128d330c256b1
+DIST ocaml-0.06-pkg.tar.gz 65300 BLAKE2B 74e672bbc94e735faf9fdae81f9a961f4b6f0b9f35b008ffc70ef978bc2b269215a1d7ab51fb585fd49281628c3bc85d362d3de60abb3fb8557a78a249ee89c7 SHA512 ab21c0c4bc6cf204c4e2b9b9e1d153a4ddc2de941032946fb460e480d7396c17c563b2234ebd5aec0ff1e833ec578470366204b959f621e1da1d0cace2eea7f2
diff --git a/app-xemacs/oo-browser/Manifest b/app-xemacs/oo-browser/Manifest
index 632ff32a230b..ad8d246b631a 100644
--- a/app-xemacs/oo-browser/Manifest
+++ b/app-xemacs/oo-browser/Manifest
@@ -1,2 +1,2 @@
-DIST oo-browser-1.04-pkg.tar.gz 515713 SHA256 ff19676ea42b571de385597995468e51eee976cc1d71eb29b5ab6a88244f5fa7 SHA512 385b08f64cfb76f3a661fed3584edaec1d85076ea40369fbc9475409d33c17182995ca5eccb2757438390fcfaa1a30818dad1c4292ebb342c8c7193ef9963db3 WHIRLPOOL a40b294da44b9ccddfe0932994384d32ffc7cceefc8c11b800d88c729acce2f83317faf408402aba576ba1a178c09d2313852b691d5be4d2ea2d29d3e277a6f6
-DIST oo-browser-1.05-pkg.tar.gz 517598 SHA256 5a19fcfa2bd3a640ed05ed2a4151eadc45d2972d264e168d6dc39cc1636efc0e SHA512 29e4063fbdb7824b70fd666f1e5fa9815d38c56261653e966f85204c9f7e66a16720298b1727a3bc641d6d705deb90f7fd4127961dceb30bb1edc39093ca0d6c WHIRLPOOL 38a966a83be95811514e1fa6302402d63f61ea4fb611e191b4d414bfaa61d38bf894b322d6fb892f92eb6116d10ce8f3c19583be5b8f8039ea6c6e5acae47184
+DIST oo-browser-1.04-pkg.tar.gz 515713 BLAKE2B 96973a9af23695ac74c83d626f6e283be99540d3176b51d5ae1aa882f30079a8680929e3660674197819f2d21b75fe67ce860ffc514ddb865bc95eda5f5e6233 SHA512 385b08f64cfb76f3a661fed3584edaec1d85076ea40369fbc9475409d33c17182995ca5eccb2757438390fcfaa1a30818dad1c4292ebb342c8c7193ef9963db3
+DIST oo-browser-1.05-pkg.tar.gz 517598 BLAKE2B 6c09fbbdfce6f733e03b5f716076a30ffd3847b8e31e9f4fe1100d3e78e7c4952d2ca9977b1c4c10e4440d47a13b432345bf36c2d0beb5efb1c5606ceca17136 SHA512 29e4063fbdb7824b70fd666f1e5fa9815d38c56261653e966f85204c9f7e66a16720298b1727a3bc641d6d705deb90f7fd4127961dceb30bb1edc39093ca0d6c
diff --git a/app-xemacs/os-utils/Manifest b/app-xemacs/os-utils/Manifest
index b795024c772c..5dd9c5c9c48d 100644
--- a/app-xemacs/os-utils/Manifest
+++ b/app-xemacs/os-utils/Manifest
@@ -1,2 +1,2 @@
-DIST os-utils-1.39-pkg.tar.gz 231532 SHA256 b0acf9e661764951491b11de2c3b65b81e365c67991915e836a36352d02ba0a7 SHA512 2e929c911a93ce41074f5c8e2dfd31c422d42869a0da044638e4766ac044c331c081356a4ebdb8b682c88d5e4d65897158827cc4c8c3fd588fb5adad3707f984 WHIRLPOOL e43aae2a7f7d85680c74a8c1ef9421671a99843626191559c9f23d4f730812ab8c621485d5c6e1640a9338a7bffd43efd55087c41c4772544fdbddc355bb83ba
-DIST os-utils-1.41-pkg.tar.gz 232353 SHA256 3f9858b4bf4130810f806d2a6b521c7dcf63463a72820c1adcfc9edff2425e79 SHA512 8fab5891268f5cd011bfc62a97be750d8472f514836a3a2c29cb7400e3921fa7dccc32c9c2658503a5bc8b1b41558dd6c06b3be1560cefd00fd7407157d0b022 WHIRLPOOL 08125840a8a09b35c4d4120e24abd8fc298cba95c4c0f06a69ef39a00c6ed040ea94e70f5ebc4306535031dade161792d334f7c2a2bfdbd51642a92339a74614
+DIST os-utils-1.39-pkg.tar.gz 231532 BLAKE2B e3c0d93ee5bc9954e92f0d41c7660343742e50ea77d0ea4334cc975085f2fcedc7b8868c6c8b1326911bca0813573230ab7a620ffe263cf8a867f4d2fb0b8b94 SHA512 2e929c911a93ce41074f5c8e2dfd31c422d42869a0da044638e4766ac044c331c081356a4ebdb8b682c88d5e4d65897158827cc4c8c3fd588fb5adad3707f984
+DIST os-utils-1.41-pkg.tar.gz 232353 BLAKE2B 3212b72124c72b7c172c4767ea82aa7e072e3e4214ba9ad6be7cb7a3cc0370dd361da0d16537395fcd8761f583237ad6795ca8505ffc239af2e353af57945781 SHA512 8fab5891268f5cd011bfc62a97be750d8472f514836a3a2c29cb7400e3921fa7dccc32c9c2658503a5bc8b1b41558dd6c06b3be1560cefd00fd7407157d0b022
diff --git a/app-xemacs/pc/Manifest b/app-xemacs/pc/Manifest
index d0019aa6df83..427a651a17cf 100644
--- a/app-xemacs/pc/Manifest
+++ b/app-xemacs/pc/Manifest
@@ -1 +1 @@
-DIST pc-1.28-pkg.tar.gz 17720 SHA256 c767bf2217a5744c08705dc2f947c330f7fe66475f1fc848f68ad6efa4d1396d SHA512 cd296e2ce019b54de33560622622cf955937b85205850f7e31218c8de03a05d0516176bc2c8775c2649d271678f18fed3591d2fac572cc78fd11d9d05a43e922 WHIRLPOOL 27721b278309f48735cb250f6b69e334fb1a780e6ad0053273d4ebd0a160a730626aabdddc193eea1ac62f10ac5b6146f9691becaaa094f26db2f519a6a76591
+DIST pc-1.28-pkg.tar.gz 17720 BLAKE2B 06856dbe980ca7313a83d87d87c6d42f0a9a42c9d03e05e0f080abf3e9634e5d763003ed9acf5fedb5e541bbf8f47e0c236728f154cb8565e70b18947795e886 SHA512 cd296e2ce019b54de33560622622cf955937b85205850f7e31218c8de03a05d0516176bc2c8775c2649d271678f18fed3591d2fac572cc78fd11d9d05a43e922
diff --git a/app-xemacs/pcl-cvs/Manifest b/app-xemacs/pcl-cvs/Manifest
index fa18f680ac61..37eb12ce47bf 100644
--- a/app-xemacs/pcl-cvs/Manifest
+++ b/app-xemacs/pcl-cvs/Manifest
@@ -1,2 +1,2 @@
-DIST pcl-cvs-1.67-pkg.tar.gz 161871 SHA256 085046f6bc0f6940a6d87759dbb1a5d2b23a27a038973668315c51725a70af7a SHA512 db13b19d620da9ade30bbd912db20d47ee3f367f3b118a9209d14b1a0895a87bb4d8bc2c64f5d6f4276570f0533e7b03f1eb7bddf40a45cc197962a4a430c181 WHIRLPOOL 42b1a645d85ffcb9957638e0e8c384c60b7a2600f881f482e40f5ed82bdfe9fb09072f170006768aab9b8c7365603f11649e798f9a53b1b32cc06f581c8e4fbc
-DIST pcl-cvs-1.70-pkg.tar.gz 162044 SHA256 692cd3a5e1e2ad562f63fda0d7929f0cbe15174e9bf48b5f618673caa5538bf8 SHA512 ff0667d6c4a69fd042735af2187a29c374fb86c92c150497bb74125bcb5d7756a8949482132f3fccdf1308aa214dbc3db97282a6176ed714d19e87978457e170 WHIRLPOOL 80ed0aa870a4c73ec3567a339d302ab1ed4be92f1b66efb1c502dfafe82936a2420cf3bb258e5228e1f23dd29c3498ac6d8171cd6d2a248fa15e60ad14b7e8e1
+DIST pcl-cvs-1.67-pkg.tar.gz 161871 BLAKE2B 22542886adba206ec1b7f036bad00870c2913a9a085bcfd0001d9bc798acef55ae177e03b13d71f069bbc46e0e466b9067e0d3ab3bfdec7ef14f4d67529cbed2 SHA512 db13b19d620da9ade30bbd912db20d47ee3f367f3b118a9209d14b1a0895a87bb4d8bc2c64f5d6f4276570f0533e7b03f1eb7bddf40a45cc197962a4a430c181
+DIST pcl-cvs-1.70-pkg.tar.gz 162044 BLAKE2B 24ca04714035d00d77ca82f7a9722043be75970e38686788964126aee83b1c559dc8b2f0717f299559a9780d145347acc399743311e3069e405cc5c747a193f0 SHA512 ff0667d6c4a69fd042735af2187a29c374fb86c92c150497bb74125bcb5d7756a8949482132f3fccdf1308aa214dbc3db97282a6176ed714d19e87978457e170
diff --git a/app-xemacs/pcomplete/Manifest b/app-xemacs/pcomplete/Manifest
index e57aae5af561..77479e0b07d6 100644
--- a/app-xemacs/pcomplete/Manifest
+++ b/app-xemacs/pcomplete/Manifest
@@ -1,2 +1,2 @@
-DIST pcomplete-1.04-pkg.tar.gz 37573 SHA256 2d0d350a7eb653ebb0bcd6edb5091e09f57223ac155ae49e19f74d6656848a24 SHA512 cf12f90c2546c051526cf48a6fed96a03accba871cb91acd8ea88cc3ede9931555f2d8b7eea9ce56d573326692f4a3832fff714ecb84c8081b05f133e6b4d631 WHIRLPOOL 294a3bc5e25a28a76656be5e891086386e335461a2df7bf17732529a4f5b6a805313ede637b51b9cab27fd367a632b12d36368ee33fe0f4c4f651e1ed33ac690
-DIST pcomplete-1.06-pkg.tar.gz 37844 SHA256 a15d01377b60c14ea4d166f193fa1a8bf028a53e0f5792ecfc7dd530d03d2689 SHA512 b1406fae71f18849ea55ca0f6ecf970b1ef56c3957cfbfbf9b43ed241dab4338afeb8e7439f2de3d52344493cc6aa662f49f2ec56c465c5fddd6f1bfe50a6dcc WHIRLPOOL 329bd550ab9783fe986f10829734b15f22c1cbde67adfc94d3ebcc6bf50b6fef81fd5883ef352d73c16e246bb05d51c187a163d69093e387913c3b10c4f7dddd
+DIST pcomplete-1.04-pkg.tar.gz 37573 BLAKE2B 0e47f8f304193ed1336bbadd0c485826905b9420fce1fe5a433060dedc10840644c39526cb6421023ec50157e52211cfce38d881a2621ec59d447bc2797aef4f SHA512 cf12f90c2546c051526cf48a6fed96a03accba871cb91acd8ea88cc3ede9931555f2d8b7eea9ce56d573326692f4a3832fff714ecb84c8081b05f133e6b4d631
+DIST pcomplete-1.06-pkg.tar.gz 37844 BLAKE2B 5440edafa50d7b83111fff29603611a437f5f420c9033b33044f270ff413f39d9352416f8998957a842ea8cab8406ad68baf3d7c2b40d4c4729e5533b78d0181 SHA512 b1406fae71f18849ea55ca0f6ecf970b1ef56c3957cfbfbf9b43ed241dab4338afeb8e7439f2de3d52344493cc6aa662f49f2ec56c465c5fddd6f1bfe50a6dcc
diff --git a/app-xemacs/perl-modes/Manifest b/app-xemacs/perl-modes/Manifest
index f979bb801ff2..6df7c8634178 100644
--- a/app-xemacs/perl-modes/Manifest
+++ b/app-xemacs/perl-modes/Manifest
@@ -1,2 +1,2 @@
-DIST perl-modes-1.09-pkg.tar.gz 165762 SHA256 dc0a7110970568fa39768747c5e30c121b45cfadbcfe8555894d8ffccdfb104a SHA512 3c5f8627d38726e47627376bf2dc6f0d845e4d8ff4eda7e4cc94bdf365c814e022405cc6c920656079600c7cf906941739a4e9162b5e1f253dd1361d422dcc18 WHIRLPOOL 496aa768e813720a8a984d3f1b441701999695af5ddea62111a742e97a117e134dd160416ee2ab56c4a98705fbda13d04170c6105d3cc6f982b5f73e62db5e47
-DIST perl-modes-1.14-pkg.tar.gz 204091 SHA256 b85744fb5e4eac32aeab4268e4244ef6ca4b96e1d5f0e6c4a1f9716924021731 SHA512 b499951488cdfa7de0e17cd90d564c4df93fd6608dac0af5fa04a5bc76ae7dcf2c3d538c266cd92f2c8c6a37822c1900f9570e9f2280e82bfc98e3bab95f5c4a WHIRLPOOL b8e6b5b30aad1cebc15cac2d134f36696e97305931e3e627f0c19a2c04450b005e635f24f3c25beee48493074f20816dc441e8f8b21298ce61e1d47eac7570a4
+DIST perl-modes-1.09-pkg.tar.gz 165762 BLAKE2B 84a6a8dc1f9a8d31891460f92a7b9ca4b1db7dca019fbfe6ed4d93bfcfc85c338bf694ebdb92a24ded6fe1f79cf1a3c6af43342b32725e531fc219af5b136475 SHA512 3c5f8627d38726e47627376bf2dc6f0d845e4d8ff4eda7e4cc94bdf365c814e022405cc6c920656079600c7cf906941739a4e9162b5e1f253dd1361d422dcc18
+DIST perl-modes-1.14-pkg.tar.gz 204091 BLAKE2B d002ac798b306594250d1cc0e5451ad9eff09bfd179ea39c7ad96c50b276045b8fca244d2bde87b76183ec2ca5fc47f6736dff939c3248e88886e6180f81b2e7 SHA512 b499951488cdfa7de0e17cd90d564c4df93fd6608dac0af5fa04a5bc76ae7dcf2c3d538c266cd92f2c8c6a37822c1900f9570e9f2280e82bfc98e3bab95f5c4a
diff --git a/app-xemacs/pgg/Manifest b/app-xemacs/pgg/Manifest
index 275f6d2ec4ba..aa90da5f630c 100644
--- a/app-xemacs/pgg/Manifest
+++ b/app-xemacs/pgg/Manifest
@@ -1,2 +1,2 @@
-DIST pgg-1.06-pkg.tar.gz 33917 SHA256 90b92e6c5fadd275583441620aa109ad700632f49d856e2ea54232908214a7c3 SHA512 632f345a16d9fb94ec12a62590768709795bab47481b4c3123adbb1159c6c96879f872b9e389925a7c97d268cab9eed0cf9cf21a80e8a30a87c5e10f9213227c WHIRLPOOL 8990a1a96f27e98a17aa4d1663b75bb74bc813d8b5809119a6b9124b07a5bffa3d4ca1edf158f6a63a33b64fb0dadbc6737c65a28887fb6ff662602ca4fba8a4
-DIST pgg-1.07-pkg.tar.gz 34293 SHA256 f41de62d95bd0d1bba1e15c3c77eba46f96fc4cbdcf84abefc593e4c058845db SHA512 cec124e85fb59c0df2e748e5f5d51a819cd168fceecd8202ce2a42ce1b9a3934d4a184a148c38038447b5ffbe795785399118e1a7735dbb5834df8bd918589f4 WHIRLPOOL fefd6208ba3b104fc11a79f6b32e11c760ed7c116596fbf8bc9808826ea74d989b466b7da1a29a27170e95026a675b60d171a64244186857979ebc0cc7a13f11
+DIST pgg-1.06-pkg.tar.gz 33917 BLAKE2B d056b276e6606312638c9c7d68c9c2cf58c4ebdcf5b7336c6ec625236b567ed4659f63506f3646fecbf4f66272630403924ef4addf5a3e30bc5460cda7f8d76a SHA512 632f345a16d9fb94ec12a62590768709795bab47481b4c3123adbb1159c6c96879f872b9e389925a7c97d268cab9eed0cf9cf21a80e8a30a87c5e10f9213227c
+DIST pgg-1.07-pkg.tar.gz 34293 BLAKE2B 1b45e947de61678a2b85a3a7dac0c34d605becb8c29c75b59d236f770aac42aa86d781e80813b88e7218dbca348abc860d41e8cd030c5128baad9a35314dee39 SHA512 cec124e85fb59c0df2e748e5f5d51a819cd168fceecd8202ce2a42ce1b9a3934d4a184a148c38038447b5ffbe795785399118e1a7735dbb5834df8bd918589f4
diff --git a/app-xemacs/prog-modes/Manifest b/app-xemacs/prog-modes/Manifest
index 21e726e4d846..293f5a725cac 100644
--- a/app-xemacs/prog-modes/Manifest
+++ b/app-xemacs/prog-modes/Manifest
@@ -1,2 +1,2 @@
-DIST prog-modes-2.10-pkg.tar.gz 777434 SHA256 26b06168363b09717d32ec25fae1e85b4875a575cef5b1b5c427bc45ebe69c0f SHA512 63758b8bcda1c23c6da9658de4af2a96e18c0aa3a14a2e8aec481fa1f5275a2d44b07ada45f9081f992eaf04f304caa0429acc01130e9cb718f392b630e3db39 WHIRLPOOL e8c55ca90fe62426061819e7793d8091f0902315e1faa7338f3106ee6637e2d2549c163a41167efc1a5eb63b15f26f019ecbb01af76d4e0515556d9f2c55885a
-DIST prog-modes-2.20-pkg.tar.gz 821805 SHA256 b31ec9554062c17a2eb702bd2256b130a5e1a1789fda67341fc147b99b6d34bf SHA512 54123746a23e7ab480485042717474a28cf78425088416a3dfeaaf949207377f465057b18beb308ab11131f852ae715708ace53e5f57f3925b21dabeca106e07 WHIRLPOOL 48a5ab0dabb77627d7fa82736e25cd6451b981d07e9e90120d77713dba0262b3959b9aaf3c26bd00facee97ba2cd4393658622e9b1a0b15003d8b99e0a75e7a8
+DIST prog-modes-2.10-pkg.tar.gz 777434 BLAKE2B f3061eaf61767ed3f43b2602eb2f648cb2feee04e9c77d50ad8ab95f93643126d3644ddcdd24cc40e9fa6981552cd7e44bb9dca08da733443504c87a96ab5045 SHA512 63758b8bcda1c23c6da9658de4af2a96e18c0aa3a14a2e8aec481fa1f5275a2d44b07ada45f9081f992eaf04f304caa0429acc01130e9cb718f392b630e3db39
+DIST prog-modes-2.20-pkg.tar.gz 821805 BLAKE2B 73b69223d9c51338e4e9fa4cac4db80168df2991461e4813e7277ef79f02470fa9437cc442579bd35123bd67a3fd375a76656fd9d86a35940b409dcb0df19a27 SHA512 54123746a23e7ab480485042717474a28cf78425088416a3dfeaaf949207377f465057b18beb308ab11131f852ae715708ace53e5f57f3925b21dabeca106e07
diff --git a/app-xemacs/ps-print/Manifest b/app-xemacs/ps-print/Manifest
index 254c049c834c..3a1528c0f61d 100644
--- a/app-xemacs/ps-print/Manifest
+++ b/app-xemacs/ps-print/Manifest
@@ -1,2 +1,2 @@
-DIST ps-print-1.11-pkg.tar.gz 156222 SHA256 5adac5612dfd57a7266c4202a9ae5451fcbd744c9320c4b0eb33e1431dfb064c SHA512 c63cd0b399ab35c9171f452ddfcd914af61d37b17db27a9913fcf4a11195bafb107cd993f8db8aab68914e00211ab858319b08949f0a1173b784f4eafb6ea0a4 WHIRLPOOL 7a90c22ed0157cadf9a4d3416586a2e6d998691cf8d89500099b1765d5b9c605898f99d3bbb2e12401054a0799e25f84b2d27448cea2dab6a43597f12431e3dd
-DIST ps-print-1.12-pkg.tar.gz 156197 SHA256 0fd9320f7f649155fc577ee6f6bd3219da1e507c6ff0dc7227d71cacd09c44bb SHA512 0ba500177a9dff6d8e0b48938f3519af0700461c06af7224ed1a1e4c42465a7717761bbf1578895f32c71a205f10912d3b6ef47da2399121b47ed838bf7385fc WHIRLPOOL 2b7a982a2ff1ad029cff656998532e64f09f5d22b8c52943cebbac380598c5753bece42d022d7c30e978fcae270196f0c571f83208e6612ed3bc459c70470a9d
+DIST ps-print-1.11-pkg.tar.gz 156222 BLAKE2B fb297012e292b737c6e3da4ecc84d532163bbdbbdbfc28f91a0d45a48c8f75cbf3836c4ffe831089ff85ea56f00a05393d81d2343bcaa96e08ce4364bccf3063 SHA512 c63cd0b399ab35c9171f452ddfcd914af61d37b17db27a9913fcf4a11195bafb107cd993f8db8aab68914e00211ab858319b08949f0a1173b784f4eafb6ea0a4
+DIST ps-print-1.12-pkg.tar.gz 156197 BLAKE2B 0eab7740f3b0fec7573b9da4583060ac051c233da033da299bd7756f3910af34c61a9fc676e6a8741cef628f5cecddcf6bc2eae0f5104fe34f037837551d26ae SHA512 0ba500177a9dff6d8e0b48938f3519af0700461c06af7224ed1a1e4c42465a7717761bbf1578895f32c71a205f10912d3b6ef47da2399121b47ed838bf7385fc
diff --git a/app-xemacs/psgml-dtds/Manifest b/app-xemacs/psgml-dtds/Manifest
index 370ad26860f9..8b324654f28e 100644
--- a/app-xemacs/psgml-dtds/Manifest
+++ b/app-xemacs/psgml-dtds/Manifest
@@ -1 +1 @@
-DIST psgml-dtds-1.03-pkg.tar.gz 367476 SHA256 f15d54152db558867f98011f656c0397e97128a2ce538e4c60967e210f51969b SHA512 947e3acd754ca9e730b7c3f7e45fb4cf94044dc61874bf37f77da2f11fec9649c4468f73e00db03c92f41fa460f896cdd610088c5ce21a64954584e7ed2bfecb WHIRLPOOL 9e6833e84bc3af529bb98437654229f6afe19f132657d25e384d03d9fa1dd92ef69e3688cddbd199a314eeb7aea05e05ac82669ea7d6616307cc7361ba9f062d
+DIST psgml-dtds-1.03-pkg.tar.gz 367476 BLAKE2B c7b06622895757b1ea73102a1bdf39be6f456c0e276b3d633c6f5c295b09249796429104499358c12da1204c9d95f93bac66c12311e38325f69a03fec81828f5 SHA512 947e3acd754ca9e730b7c3f7e45fb4cf94044dc61874bf37f77da2f11fec9649c4468f73e00db03c92f41fa460f896cdd610088c5ce21a64954584e7ed2bfecb
diff --git a/app-xemacs/psgml/Manifest b/app-xemacs/psgml/Manifest
index 0a7c0be24e59..738815d97b6d 100644
--- a/app-xemacs/psgml/Manifest
+++ b/app-xemacs/psgml/Manifest
@@ -1,2 +1,2 @@
-DIST psgml-1.44-pkg.tar.gz 302065 SHA256 afca7ef2375ffecf720ebd9d4a725882f1970ea38f9bc28d7af96d3d6109656b SHA512 6c58520f6fd4f33e7b19bc01b8172ff670936c8dcab8ea9249ed9553423d581e5634ef09cec53d606f1d5329bbc37b8b286e5eaf689b5f9ad9ea345c37c5e177 WHIRLPOOL ffc23f5c9ce2f5cea7e58c3ac33d6997983569f685d847246514b18ae84d3a006f84a1ef125eac2d776500525db5479dfc1d28ba437c232b20e2ba719069eeaa
-DIST psgml-1.45-pkg.tar.gz 307383 SHA256 41934dd1e346b562e35c6942e3f54dc0bfa48727b8bdfab0e2e37212e500f443 SHA512 3e2e60a196d923eec5494e11a3690902c7d618d713e6c8df82412359d13d9bef40cac67e08ebc227b0584011fe0affe0c3880638d84ae47dda643b688065e570 WHIRLPOOL 8939e1692b37a8d5afc85a5cf836ff1e5195723c8fe1cd989d78abf17dd13dec800e13c2901eee2abed262c279b9d40070408295680c8eb6d4dc88dccea5a079
+DIST psgml-1.44-pkg.tar.gz 302065 BLAKE2B 8f183e4b696e5cd14d3037f5360c754ba2a03da8b25bcd13c277aa6c58d0deb127a289c18788bdf05303877f26ff963d2d9d7da14ab2ca67701c39fd75a874ec SHA512 6c58520f6fd4f33e7b19bc01b8172ff670936c8dcab8ea9249ed9553423d581e5634ef09cec53d606f1d5329bbc37b8b286e5eaf689b5f9ad9ea345c37c5e177
+DIST psgml-1.45-pkg.tar.gz 307383 BLAKE2B 0d19188b0d21204a1045e792ec53596664a4400785a6f4612248e86676fde59fd6174e5fd1e999521f53c227c4a6e613e468e3a884cb7fed1402bdd8b08f8bfd SHA512 3e2e60a196d923eec5494e11a3690902c7d618d713e6c8df82412359d13d9bef40cac67e08ebc227b0584011fe0affe0c3880638d84ae47dda643b688065e570
diff --git a/app-xemacs/python-modes/Manifest b/app-xemacs/python-modes/Manifest
index ab8c52292a70..39f6995cac38 100644
--- a/app-xemacs/python-modes/Manifest
+++ b/app-xemacs/python-modes/Manifest
@@ -1,2 +1,2 @@
-DIST python-modes-1.08-pkg.tar.gz 93002 SHA256 1e69c63a3ead8a0e909b84b244ef779373613257e5b7baa323f61b171731fa2f SHA512 edac5c557d1c49b8d11f915d9ee1ae83b2bfa3fe54bac7fb457b861a3a38f3389683eadacc6abbdbe293c5bd459184e4d17315513f77a62d40cd46f3662ea4dd WHIRLPOOL f5d88d9305563fdec0f19db5042dbd7ea809f80daa5e41c961f9e49e151b58ffe59121e45bc35778fee6c2b1cad39d119efef0ee42dd6e1f34e27ebfb424bc5f
-DIST python-modes-1.14-pkg.tar.gz 97116 SHA256 22e558486ed07bfbd045aefa14652fba1ccb37ff7520fe1ad281a43af5158448 SHA512 802cab0ff8295cb6ae0387f17fdbe85afc559ea09e8b17e8a446be7d015e6945e29d8338e32cba5337b367cd07e645bd5ddf7ed6974a70cbf30de2bf63a708e0 WHIRLPOOL 383fcf56da925169df3d4fd3443a2f9f985e032c1c1770b0d99a047afb193beba1096ea11432e3b9515b8eacb67b43d958b77af107cc580b40a8ce9e9b6fed0b
+DIST python-modes-1.08-pkg.tar.gz 93002 BLAKE2B 63e9aad70f52185efa68324bcb2d61c4b447cfa0a53aab31dd9fde07c987ccf96938418f639c16d4189724ca840386f3f831e83c338031dee712b2fafaae6222 SHA512 edac5c557d1c49b8d11f915d9ee1ae83b2bfa3fe54bac7fb457b861a3a38f3389683eadacc6abbdbe293c5bd459184e4d17315513f77a62d40cd46f3662ea4dd
+DIST python-modes-1.14-pkg.tar.gz 97116 BLAKE2B 04f2121b03e45a01b1f7c727c4aa48fd88fc06c02466583e0b4739fb3c57c0585d751f63f745edf8d7f351607dea395ef30642d42bc03e00705cb11cb75300f2 SHA512 802cab0ff8295cb6ae0387f17fdbe85afc559ea09e8b17e8a446be7d015e6945e29d8338e32cba5337b367cd07e645bd5ddf7ed6974a70cbf30de2bf63a708e0
diff --git a/app-xemacs/re-builder/Manifest b/app-xemacs/re-builder/Manifest
index edfe82034a75..1d5dceca5af9 100644
--- a/app-xemacs/re-builder/Manifest
+++ b/app-xemacs/re-builder/Manifest
@@ -1 +1 @@
-DIST re-builder-1.05-pkg.tar.gz 20729 SHA256 4846b2e66729d1bb483de28be45c2f3cc1ee054759ac856a3fc5aa5b5c38eb89 SHA512 13c7dd7152089a21b4d3c1310df56c4cd16c5fda39766feb3eb1e33037245a466ad055d7f4b57b98b9bce484e9ae3325a346a0c5fd139114df7219a406d1d47b WHIRLPOOL fe862dd5bb1ba72b963ba53cb9b100a4be7b8a0e32fe3ae00fad5bb9d98b876967a22b620811cf75e15d5d95096cf8078d630e48d0b85c1ec430f20872dd63e1
+DIST re-builder-1.05-pkg.tar.gz 20729 BLAKE2B bc4e7124bb08ba52662702bb29192a243c4ce48572b9530ddd5e5809aef7dfc47d8cc547b9aebe233425e1091371420bc1626f6c7a97f4b10e359862b61ecb0e SHA512 13c7dd7152089a21b4d3c1310df56c4cd16c5fda39766feb3eb1e33037245a466ad055d7f4b57b98b9bce484e9ae3325a346a0c5fd139114df7219a406d1d47b
diff --git a/app-xemacs/reftex/Manifest b/app-xemacs/reftex/Manifest
index 64defc796b23..4a958f0b4b62 100644
--- a/app-xemacs/reftex/Manifest
+++ b/app-xemacs/reftex/Manifest
@@ -1 +1 @@
-DIST reftex-1.34-pkg.tar.gz 352338 SHA256 7e3b07ab2052ab6c171a721ab714af449a6b51885d14d65cad1d66189fda21ad SHA512 89e5b73b3dde0ae9271a9e9e5d6195f856ddf1a45db894d8b3796cdfe68bf278aa9a24bd5656f9158d629fe286082ee91b678c48a277394cd155bd7b3365b8ab WHIRLPOOL 017431b58258ffb49e8f881c89de1d34a6b9b2ee213ee6f8f3ed13d96814b93563d7053b2856c7662736a34b70058016c793d6df2f6159f3b6593d4bbd323f03
+DIST reftex-1.34-pkg.tar.gz 352338 BLAKE2B 1f6b5afbed3b6c6de1637f8628724fc270132fd795a2d752a6e8d7c771501aabde48fbcabbc7a45ed89fb04eb1bb17b87f8478e34de0919d6a15f5b336de4ee3 SHA512 89e5b73b3dde0ae9271a9e9e5d6195f856ddf1a45db894d8b3796cdfe68bf278aa9a24bd5656f9158d629fe286082ee91b678c48a277394cd155bd7b3365b8ab
diff --git a/app-xemacs/riece/Manifest b/app-xemacs/riece/Manifest
index 24075e98142d..3d8a50ba3c29 100644
--- a/app-xemacs/riece/Manifest
+++ b/app-xemacs/riece/Manifest
@@ -1 +1 @@
-DIST riece-1.23-pkg.tar.gz 221779 SHA256 deb391da915f0ce432f5d3783ad83588efa5b454f534beeb5830714498cd6264 SHA512 ead33eb49e46b47b769dc8940774f1d9e3855e2ec91c9434a80c80da4ad7783e6c04f4c25ab5b71cfb1364f96c5eec03224758cee3b68ba16530d76b310c0b74 WHIRLPOOL c74f4e84f87fe0c8491cca50dedd285dfab2b7bf6934c6139a85ed61ede7daf47ee7bf56347303918b975047b297879250ea582add3961a4d110557d0afbe696
+DIST riece-1.23-pkg.tar.gz 221779 BLAKE2B 27ca4a644fd332c6c1e06ef4886c2f2fe744d50b4e15d701e35948c9e7682ce5e505ea92e32c8d5b8c71f521cb40a91b78f0044930c1e21e1e1f93769052e592 SHA512 ead33eb49e46b47b769dc8940774f1d9e3855e2ec91c9434a80c80da4ad7783e6c04f4c25ab5b71cfb1364f96c5eec03224758cee3b68ba16530d76b310c0b74
diff --git a/app-xemacs/rmail/Manifest b/app-xemacs/rmail/Manifest
index e159237770df..d321a577795d 100644
--- a/app-xemacs/rmail/Manifest
+++ b/app-xemacs/rmail/Manifest
@@ -1 +1 @@
-DIST rmail-1.14-pkg.tar.gz 96995 SHA256 9a8ba32e168b69ec9b8a42dcf6bed812a64eebd9f6b6421be8e034fce77ed9fd SHA512 a0e6c4279da4d70595c5bf1b90ee2047ccf181904f753f50211e2761fcb2d86a04267423e2076b276f5ea87fe5ab044c86c026c9e389cf38232518e288f60063 WHIRLPOOL a8169399897cdd4b49eb1493d774d7951de67adbe318db08d2f4a40652428aa597e32a22606c3a9fdb2afdeec4722b9595e1b059aeec5aee8265b6418c1cd6d4
+DIST rmail-1.14-pkg.tar.gz 96995 BLAKE2B 4d34d4a8ae5945232ce48405aed8c48d08a7db851a9505a53d4e2a699400a3bd95e405e86512522d64aabe1fd173ea0e2997a6f69df43c9c541bfd23605ba2e7 SHA512 a0e6c4279da4d70595c5bf1b90ee2047ccf181904f753f50211e2761fcb2d86a04267423e2076b276f5ea87fe5ab044c86c026c9e389cf38232518e288f60063
diff --git a/app-xemacs/ruby-modes/Manifest b/app-xemacs/ruby-modes/Manifest
index 4f2138f4a8d6..547c3b317dab 100644
--- a/app-xemacs/ruby-modes/Manifest
+++ b/app-xemacs/ruby-modes/Manifest
@@ -1,2 +1,2 @@
-DIST ruby-modes-1.02-pkg.tar.gz 21889 SHA256 14a61e146a18bca269f71d724d5d5f41f06ef0f9d59f806a097b82ea03115705 SHA512 91306a992c944f4d424934b6d90b3073bc5cd19f04678846400b3ea41acc349c92c604c337019bd9ca9beba32d401adbd6f78f72b57bf2597e78cf7cb64a4883 WHIRLPOOL a3a60709d3b209379508a5df535c40ca454a6c2755217273cf35c80d4e8da5ab8de2bc6cdfe1647133007773b398d93442a6ebb9ba7d94583d577027ac57b62a
-DIST ruby-modes-1.04-pkg.tar.gz 31720 SHA256 12118a176fd615a4de74e9d762ee8870a0f8bafcb93c1fdcef9f0ce78d16ddc7 SHA512 df12bec66cc8d70c3b75e1849b0b8ab1f8408f6a86d3dcf04d2703ae3815876fd96c382ef8b37135a99074ef20ee9628a2158217dc334b4aeb72c0a676ab748b WHIRLPOOL 8622c3e8a9701ea5202e360f40d4274958bb4e7dc64b307e5b71fdc75c67c55a47f74bf7d0247e0442204de89f6e12a29a381b182b88f9bfb59b0fa0d43f72a3
+DIST ruby-modes-1.02-pkg.tar.gz 21889 BLAKE2B dde2c5b566b1dac569536b233f70acf2259d1230cfe8f84a7caa3485934bc28f79d7a29c0c3e33daff48bed9de03658c4bbd11bb79262031e2f245e55186eca5 SHA512 91306a992c944f4d424934b6d90b3073bc5cd19f04678846400b3ea41acc349c92c604c337019bd9ca9beba32d401adbd6f78f72b57bf2597e78cf7cb64a4883
+DIST ruby-modes-1.04-pkg.tar.gz 31720 BLAKE2B 914d61671d48f5ba32269dc1ac68a3888c2b7361f98a293a071bce52c881ceaf5d92c70ebaf0e30ff3bfafc96d573e6c57764e2ea46f448c9671605f862d1e5a SHA512 df12bec66cc8d70c3b75e1849b0b8ab1f8408f6a86d3dcf04d2703ae3815876fd96c382ef8b37135a99074ef20ee9628a2158217dc334b4aeb72c0a676ab748b
diff --git a/app-xemacs/sasl/Manifest b/app-xemacs/sasl/Manifest
index 2c38ebd92ff6..8d7cdc1f2e31 100644
--- a/app-xemacs/sasl/Manifest
+++ b/app-xemacs/sasl/Manifest
@@ -1 +1 @@
-DIST sasl-1.16-pkg.tar.gz 27864 SHA256 9dca775fcd589e6ee85b92b2c0312f2c6eb75c010822851970a7628777309b37 SHA512 dcc0a8c14b1f7f687f7abe9409f69c9501f0f8b5ae89d12bcfe9193922c196635e01bf5a0efd7af148e89daaee5a341d84e1d3f597f4904b1e7e3bad4b8e16df WHIRLPOOL b012e61f15b76fa6b1eda903cc8b43700d2645c6c6cc5b4c185d563ee5e6a3b0d682cba0c5bec7db564d01caf5b65b46721aa1ed146a1dcb7b45dbf8160e99ce
+DIST sasl-1.16-pkg.tar.gz 27864 BLAKE2B 0db7238e14ed56beec938885d881375a7e8635bfd369cee52db9daa70e27401237ee313b841f6898732121beaa4bd445945468175f94dfc17efbe7a1f391fff2 SHA512 dcc0a8c14b1f7f687f7abe9409f69c9501f0f8b5ae89d12bcfe9193922c196635e01bf5a0efd7af148e89daaee5a341d84e1d3f597f4904b1e7e3bad4b8e16df
diff --git a/app-xemacs/scheme/Manifest b/app-xemacs/scheme/Manifest
index 91f4b4ecb309..a3a525ce1dff 100644
--- a/app-xemacs/scheme/Manifest
+++ b/app-xemacs/scheme/Manifest
@@ -1,2 +1,2 @@
-DIST scheme-1.15-pkg.tar.gz 38055 SHA256 3df97fd1ed4610301fd6d049bdc48824a60ea8cf46448c5f3ce28100b960a2a0 SHA512 90ce2be594a1d30a92a653bb5ba79572b0e564e32f7b701b58fffc45d367dfc7efd3dafb10295a0ae01876ebbd63ad59060a065ecf8fc4bcce25c30c3e5e3b32 WHIRLPOOL 823044a7391410a15a347b537aed0e0b811bf46ae21785bd3259f0711b016bf465e02a52c688eeceba0c82f4012b522b01e24521daeffa830fb773291580b32a
-DIST scheme-1.18-pkg.tar.gz 38398 SHA256 f6d0f8a382d65384aca8851ddfd71aa07390a77cd656a1a0397f1a15e4790905 SHA512 edf4e062663b72f4aff670cd2a73282314676f52b024cbe75d35b7445aa4fa8923723d59c7babafc0c86096eb7c9158e90452c4d06f27206c80eadd15236383c WHIRLPOOL ef9ad932abbb83b83cde0768f9c03badbca38131b794080ed7d750fce3a766ef647346e013f75176936e76921ec5f29608585a86686b1590ee6de1307a9a7bf0
+DIST scheme-1.15-pkg.tar.gz 38055 BLAKE2B a90deb028f49d4baead782ab671bc3d228089a96c0f06c6dfa26aeb9bdffe99bf1b0520e267d7321d57f217d8e5dfd5f69eaf47b41c018426752f5027fd6f530 SHA512 90ce2be594a1d30a92a653bb5ba79572b0e564e32f7b701b58fffc45d367dfc7efd3dafb10295a0ae01876ebbd63ad59060a065ecf8fc4bcce25c30c3e5e3b32
+DIST scheme-1.18-pkg.tar.gz 38398 BLAKE2B ae9846c8c60d644560644535e9a3570e86db0e0ab8a89eb1db32154183ea273dd3e76467991e3eea14b2d2ee79e88fc6017049b704de54d79a979a8e2cb6d2c4 SHA512 edf4e062663b72f4aff670cd2a73282314676f52b024cbe75d35b7445aa4fa8923723d59c7babafc0c86096eb7c9158e90452c4d06f27206c80eadd15236383c
diff --git a/app-xemacs/semantic/Manifest b/app-xemacs/semantic/Manifest
index 9493cb740e83..8be01832d248 100644
--- a/app-xemacs/semantic/Manifest
+++ b/app-xemacs/semantic/Manifest
@@ -1,2 +1,2 @@
-DIST semantic-1.20-pkg.tar.gz 455896 SHA256 86931a571674cc314faa6235cef2ab1b28ef9a0724633298fc0027481b8b75d1 SHA512 5432807711c89fc0ae740f87bd04617e0497786ace687f017352c5d44562c711dab1075801e93067d02e116dd3716f1792d5cfa2f69204d92cf531f0bc7eae84 WHIRLPOOL 89b99539dce6fb61ab6aa83c43789e02c8625d24322051c429359d26f6affe1f481a071aa8adb55bf2b96e92001c7542f18c97dd9b18b1fcdcc1ed82e911df50
-DIST semantic-1.21-pkg.tar.gz 1367279 SHA256 54b526fef7d7e56587ed3ecd775694d0356390fa3b5bda472b0a917d38461840 SHA512 8815ccae1c38ee25176d14b2e5d9e2ca05b2d3fbf7e97105892ea8604d6acf88d81a51d6c138b8ebaf5823a518aef312eefed9dcff905c55daa39fd4c3c7139d WHIRLPOOL b05b7166a1bef6664623b4f6daa9d97064b9f223b6c7b4cd366a952101a365e1b952e9d7e8c9ac739571ad9bf26d6e64886f3a4e2996f546ab52722112bc980d
+DIST semantic-1.20-pkg.tar.gz 455896 BLAKE2B 1b3b7ba434493f328bc2141e897c344b01fffdfc0c4df29df2c9747ff0eec3523b3acdb438148c2e9d1339aaadd0e375a4e6e1a9afc3c8558bc217caf5d3d76b SHA512 5432807711c89fc0ae740f87bd04617e0497786ace687f017352c5d44562c711dab1075801e93067d02e116dd3716f1792d5cfa2f69204d92cf531f0bc7eae84
+DIST semantic-1.21-pkg.tar.gz 1367279 BLAKE2B c4c4d0fc81039455e511ccf9b8439cafc439c7f42d2fe8fa42fa614e23556615ec98254f31ef27ccb1d29ec316b37e88abed42eca33b0a8a8530dbafbe582492 SHA512 8815ccae1c38ee25176d14b2e5d9e2ca05b2d3fbf7e97105892ea8604d6acf88d81a51d6c138b8ebaf5823a518aef312eefed9dcff905c55daa39fd4c3c7139d
diff --git a/app-xemacs/sgml/Manifest b/app-xemacs/sgml/Manifest
index 04211dc9808f..6c08d8cce1df 100644
--- a/app-xemacs/sgml/Manifest
+++ b/app-xemacs/sgml/Manifest
@@ -1 +1 @@
-DIST sgml-1.11-pkg.tar.gz 27506 SHA256 edd9bf0c43a27d2e9bb5a449fe2126fc55a8ef031be72efe148e724b9efe2aa5 SHA512 cd3e8d8694e77aad00d60f9331e60769cd6308715c698ed9d260b6d31838ba1f2e76fa0d90b430dad010b886576f8263d8223ca73ffda7d3654adcbc0d15b7d6 WHIRLPOOL 760ab1eb85456447c50a24ec29514d05555f79b6378fb965f4ccdb9156e5a7bb8435badab3ad370b92e3a9f56648e9fc4211439ea0e420db576f0df91420c4c4
+DIST sgml-1.11-pkg.tar.gz 27506 BLAKE2B e12c4efdbdc8d66fe381bcd650462bb0b07bc9b13a7a9fa7ee51a9b850b904b737788a888ca0f4c91265e1be83d6343143c3fc97b8aaa1bccf5cd78c0e3ab0b5 SHA512 cd3e8d8694e77aad00d60f9331e60769cd6308715c698ed9d260b6d31838ba1f2e76fa0d90b430dad010b886576f8263d8223ca73ffda7d3654adcbc0d15b7d6
diff --git a/app-xemacs/sh-script/Manifest b/app-xemacs/sh-script/Manifest
index 5ee6c6537add..61f22fc3e327 100644
--- a/app-xemacs/sh-script/Manifest
+++ b/app-xemacs/sh-script/Manifest
@@ -1,2 +1,2 @@
-DIST sh-script-1.22-pkg.tar.gz 70396 SHA256 21196a173975c8a9c6816f5758f23dc4b72e3fd08e2fe7fcda9013b75b48de48 SHA512 2eee3fb6f000469e2802f55971299901d044e9206372650ab8691789ccabc21601335c6dd2e7cf233c10209d6632959fce11e854ad9565e27d4688ddfc8e2d1a WHIRLPOOL 0e751a5472e6cbd43abc4fb8081362007cca52f1bdd0f7193e1563ede6cfb4bba8f236bba2ea281288a4673513bbdd8ba918548436fc24e72577b904b7bef4e2
-DIST sh-script-1.24-pkg.tar.gz 70667 SHA256 d26834b96b1c3bee14ad8610dcd8e92b1a8d3f20e14086996b6904386814da7c SHA512 b39fbec933b73a21e340a47e24058cb2fd741b0bd4868aa880f171a5a164aba8f6c8e708f70a775f6e74f120254f4c283ac98ee1d3ea532e3eee95c05e960c4f WHIRLPOOL 36bb32d08aa110caae511655c58b2f5a557dca8ac24f369a2bb7e69918504b193053a5eb9ca0dc2d7447cb198ff3fbde57d17453c8be5abd84777a15a1eed6d2
+DIST sh-script-1.22-pkg.tar.gz 70396 BLAKE2B a4f1f5394ec7bb80dbb0469883fd471bc3479bb886112e4eca7b97bef39e33018d98d56b02ce8e04f2d84a1794c0f97ddc139f330be985ae4a1a5f8e74989b4f SHA512 2eee3fb6f000469e2802f55971299901d044e9206372650ab8691789ccabc21601335c6dd2e7cf233c10209d6632959fce11e854ad9565e27d4688ddfc8e2d1a
+DIST sh-script-1.24-pkg.tar.gz 70667 BLAKE2B aa1290823da1d23a1eea030ae68fa5d1458d248f2635ff4c88557456e9f2ca8b55dc293746f66d2e7cd057c39f0cd5859364b33730b417aea762148f95828884 SHA512 b39fbec933b73a21e340a47e24058cb2fd741b0bd4868aa880f171a5a164aba8f6c8e708f70a775f6e74f120254f4c283ac98ee1d3ea532e3eee95c05e960c4f
diff --git a/app-xemacs/sieve/Manifest b/app-xemacs/sieve/Manifest
index 1a1045580ace..de2c9548a34f 100644
--- a/app-xemacs/sieve/Manifest
+++ b/app-xemacs/sieve/Manifest
@@ -1 +1 @@
-DIST sieve-1.18-pkg.tar.gz 27387 SHA256 87663041b5d2be3908bf26bc37b458c989d112d818a78cc5d1c24d80d013174e SHA512 cd870e7cc302524818ffb081422d5009e046da11b4228baecf43b0b872719f223ecd3ddc9fcaf86f474620cbeb0d6d672a505c1a7151772e07149369102a3a13 WHIRLPOOL e2e9d9cc7ea1eacd24256f6456e6803c4eddffc5328e1c885c2708ce8f81848a2ae777bdffdce68dcd8687fcba3daea2a90f6ac592a0fbc8d28f10b455d0d749
+DIST sieve-1.18-pkg.tar.gz 27387 BLAKE2B f619083c07840e0386a47708f79ce1e1bb0f3693b3e675b6945b0cd5cf63ae3c1bddd974e10607f4ddaaf1954b69c26ff29eb4f4d5f294b9bf81907fe236fc1e SHA512 cd870e7cc302524818ffb081422d5009e046da11b4228baecf43b0b872719f223ecd3ddc9fcaf86f474620cbeb0d6d672a505c1a7151772e07149369102a3a13
diff --git a/app-xemacs/skk/Manifest b/app-xemacs/skk/Manifest
index eae7a9c30638..15a30f3ce078 100644
--- a/app-xemacs/skk/Manifest
+++ b/app-xemacs/skk/Manifest
@@ -1,2 +1,2 @@
-DIST skk-1.23-pkg.tar.gz 1506691 SHA256 51a4d0259d95501749be0181a934cfaf161c4ff669512420a455b3a260e9ef74 SHA512 aaad61a9db6e48d03f1decb15c1d7797d437cc10f2ecfaba6c37c0c6f8e73f87d08d378c548f0a9a168ae6c7043d8087e6db532eb74732dfc2d588cba1215656 WHIRLPOOL 5faa5ac93e6bfcc6108d050bbf5d5e70ca232f8084674c855ab3db29a8135e76596f047e54db1cbaff2a38db24e5477f38732040ed0f661cc83463ef66f21f07
-DIST skk-1.24-pkg.tar.gz 1464019 SHA256 148a661e7152d7ba33bfcae5ec4198442e0a17767efd4954b1eff00b3e31e156 SHA512 391c3f0a65e50ac14bcd251bd53f6fd5eba2461f52f5753553138f39291e8415428db8b326adc58d6bb0a30dfe6607c67770b3df841e5aa2c4fd1a1e1028f285 WHIRLPOOL 848c74eb8f0c8d8a87f6045abb593e86e3d3c1f7a9da39f4d1d4d0820b66a8eb74f742a75edd452f64ee153fe797f1734cec0fd312af11e01dab5da49704eb31
+DIST skk-1.23-pkg.tar.gz 1506691 BLAKE2B 2597f32c1364b530c4da5a3db3cc26b170d8576c0bccecc70666fdc54261e0e1b3b3a559766c7acc2b3894bd4304d2359e707e99421ebd135c2c9c4f29faea1a SHA512 aaad61a9db6e48d03f1decb15c1d7797d437cc10f2ecfaba6c37c0c6f8e73f87d08d378c548f0a9a168ae6c7043d8087e6db532eb74732dfc2d588cba1215656
+DIST skk-1.24-pkg.tar.gz 1464019 BLAKE2B 28dcaa38a64f4d795494e0e5e37c94125a05bb7573df59c54385ab8053c146f49aa63378831f83ce5a35aa36e68ec86dea9389e23e3165caeaf0f74e696fc34c SHA512 391c3f0a65e50ac14bcd251bd53f6fd5eba2461f52f5753553138f39291e8415428db8b326adc58d6bb0a30dfe6607c67770b3df841e5aa2c4fd1a1e1028f285
diff --git a/app-xemacs/slider/Manifest b/app-xemacs/slider/Manifest
index 83a51556826f..58443b1df47d 100644
--- a/app-xemacs/slider/Manifest
+++ b/app-xemacs/slider/Manifest
@@ -1,2 +1,2 @@
-DIST slider-1.15-pkg.tar.gz 12516 SHA256 c491170e64d2a14bcbc2806646788c58ff8ee612588fa963701e6a09e75ebb92 SHA512 16e913c9f8eb5fd12954d93eec37798dc30144f3f654e6d9200fa00f524b22cdb9c9240ac43943bc7283dedd124657534216464a28d850bfc93e4b6d44db371f WHIRLPOOL ec25721e176783f5d10a83f3e626cd50a9c310b07996eb70c6c18a833d711f6adaefe9f669d70148bf4f65bcdfb54d2963759ec5e6411a8e8c6badf38c26d943
-DIST slider-1.16-pkg.tar.gz 12857 SHA256 47e65d428ab2ac4777fba57c9ba837851af4a63d6d60388368b7f15df2f70fb6 SHA512 058c9ddc3efb739effcceb0cdf556d09ab74930fca27ee2cf3e12180197c8fcdad4dfcd328989e11274489c5d6a5cb22183147dcebe5e1765114a00e031515dd WHIRLPOOL 3072b30ea3899a4dafe0436628f9204cb168e656f0a5bea655309b9ff31102a00c5d1d12a90271e49a8a44ab9fbb7e31629a0e1c4e52662e1aa68b08f8761752
+DIST slider-1.15-pkg.tar.gz 12516 BLAKE2B fee3036b8002316186e18293b185d2d18818a999f6098e0aff078e93cf2205c459be7aef9f32f7825c2ab0b86e64e1d19ec80d90dbe6b005f0ce96c9cae71bfb SHA512 16e913c9f8eb5fd12954d93eec37798dc30144f3f654e6d9200fa00f524b22cdb9c9240ac43943bc7283dedd124657534216464a28d850bfc93e4b6d44db371f
+DIST slider-1.16-pkg.tar.gz 12857 BLAKE2B 6713ee639d6ebb6d21de13b59a34cf651543f3fc752179ef6c48b10bdfba77013546b620cf80ed286f6063c61944b51e48322cb6166ac85da91ad493516c8d60 SHA512 058c9ddc3efb739effcceb0cdf556d09ab74930fca27ee2cf3e12180197c8fcdad4dfcd328989e11274489c5d6a5cb22183147dcebe5e1765114a00e031515dd
diff --git a/app-xemacs/sml-mode/Manifest b/app-xemacs/sml-mode/Manifest
index 4a8e807ed97c..6baf3c6534fc 100644
--- a/app-xemacs/sml-mode/Manifest
+++ b/app-xemacs/sml-mode/Manifest
@@ -1 +1 @@
-DIST sml-mode-0.12-pkg.tar.gz 82366 SHA256 3303b94ee31e399cef8c37de33c00ea4ace4e8006759925d664df7762c0dacc7 SHA512 7c059c485577516a13d4b58c594fc78eaea1779714d6cdf98a1ef57edd9b1e0442e854b421a8d9e9fa32cd2d8a060cc02b7e4743d3494a1f7271ac06fb092a9f WHIRLPOOL 2548580c97165fcb34de6483384a2aaf7c9722b5b3f2abeed53e5154628a9ba1e90bc6b253fddd51f50a0b5f66d6a0e799ca8348e036c0b47dca4284c820842e
+DIST sml-mode-0.12-pkg.tar.gz 82366 BLAKE2B 61ebbe1dc2b075a65dbe6f6d852dbbd698017414c741b9a551afe3b80f3c8d6dafa96793dcdfa22a76a89f6fdf982acf8daff9d3c033cdd0542f3f92f941ce93 SHA512 7c059c485577516a13d4b58c594fc78eaea1779714d6cdf98a1ef57edd9b1e0442e854b421a8d9e9fa32cd2d8a060cc02b7e4743d3494a1f7271ac06fb092a9f
diff --git a/app-xemacs/sounds-au/Manifest b/app-xemacs/sounds-au/Manifest
index 8fbe0bf94bef..35e982901961 100644
--- a/app-xemacs/sounds-au/Manifest
+++ b/app-xemacs/sounds-au/Manifest
@@ -1 +1 @@
-DIST sounds-au-1.12-pkg.tar.gz 126817 SHA256 c1041d416f93dfde255a3657fe8b4a4aaf4841d99e461d61f94da0330dc3fae0 SHA512 fd7022f1a7c23b041416cb1c0eb0532fdc5dd492b37c4e1438d9d1f24ebbc7544488bcafd1eecb36b9183bdbe7494b5fe0ad6bf8b2762a573094675d80c5b5ae WHIRLPOOL 5a8c1b0bcb4d863213ac6e4d2af08e1bd006df114d3cf9cd26531b7da1830529ca901444fadbf36ebc42e76bdf86aeb5c971878fae5c72161ac7ec6e9ca7e168
+DIST sounds-au-1.12-pkg.tar.gz 126817 BLAKE2B d7942cb4d249ab8e147658bdccec4a837ee7834576d10fd71f7c070e3c4b23bc2df6233d707607e91172ebed3c4fd09f3aa1dccf25841ae106306764303892bf SHA512 fd7022f1a7c23b041416cb1c0eb0532fdc5dd492b37c4e1438d9d1f24ebbc7544488bcafd1eecb36b9183bdbe7494b5fe0ad6bf8b2762a573094675d80c5b5ae
diff --git a/app-xemacs/sounds-wav/Manifest b/app-xemacs/sounds-wav/Manifest
index 31ac2bb2d85c..ede9925bfb1f 100644
--- a/app-xemacs/sounds-wav/Manifest
+++ b/app-xemacs/sounds-wav/Manifest
@@ -1 +1 @@
-DIST sounds-wav-1.12-pkg.tar.gz 149624 SHA256 48ef4a7e757025c88f2501865a5f382789db1d5e41631da4d82708d88b0b1046 SHA512 28a996d2339de6a69efdb95b42e6ca407a6fb53f1fc4af5ba8ef6a95ce7210e804d52c6e4ef85c3383324ff1125620ce45156a0c3581091836c9e21852cc5f95 WHIRLPOOL b8a526f85bd8175bd5957decb3f8b89553c34f04c0eeb27572f6b5af51ebc0cafec690c0f7bde1465af2f1a911e8df1b9abe9c08076209fb14ae010fc76f26c6
+DIST sounds-wav-1.12-pkg.tar.gz 149624 BLAKE2B 3ee397582fba2258d32351875aff4747ca799468c39d3c47411970feed6d0f352c2b572869e7cbcb456eec153036825061c0fae40c916bc0dfb79f06ee57813d SHA512 28a996d2339de6a69efdb95b42e6ca407a6fb53f1fc4af5ba8ef6a95ce7210e804d52c6e4ef85c3383324ff1125620ce45156a0c3581091836c9e21852cc5f95
diff --git a/app-xemacs/speedbar/Manifest b/app-xemacs/speedbar/Manifest
index bf3506ec30b5..47dc72376530 100644
--- a/app-xemacs/speedbar/Manifest
+++ b/app-xemacs/speedbar/Manifest
@@ -1,2 +1,2 @@
-DIST speedbar-1.28-pkg.tar.gz 163269 SHA256 915c7d507ac38e2c273c05f03d44377c180109e0b60a26d43a777f380a5438a1 SHA512 4852f81f17953436009c99bff537740ae921e1cb262a903dee3590b1f69906e614a7307d38dda45bec663dfe64ff1935152b84c74bd6500389f0054b3907df58 WHIRLPOOL 223d74cad03031350c56786445c85885d6ecdca8e797a959d41c264eece76e2259c48778c84786a3cc12cdfc80ba8b3554527bccf7e8f357b666e80f14148e11
-DIST speedbar-1.29-pkg.tar.gz 153300 SHA256 f0e0c7138e6c75eeaebc388ecf91a45a2b31c4d5d56c6237e1e908501e12169c SHA512 c4550221f45a4ff29a54008ca50d3fc9c2d8ca20736240ef2fcc437b0a1cbd1551d75248ec5eb661c4943a462588035a131857450e15b5f92b1dfdba283b6547 WHIRLPOOL e2c8bd74585ede6a66949d5d5589659cbedca84f2a3919ba741dda0374deef280f70a0d508897df66c57d0215ae13400a96cd4a3577c93a2e18c47f7856566d2
+DIST speedbar-1.28-pkg.tar.gz 163269 BLAKE2B d16219dbae65136d17f402d594a0aa102e489b6e9bbae33323d6e898359d7342d45c98ed84366fabff3fffbd1a83dd5a7d75b7423d95d440b07364a22b071e5c SHA512 4852f81f17953436009c99bff537740ae921e1cb262a903dee3590b1f69906e614a7307d38dda45bec663dfe64ff1935152b84c74bd6500389f0054b3907df58
+DIST speedbar-1.29-pkg.tar.gz 153300 BLAKE2B 33b1674d9ad53b31f5fb8fc558f1f47b8422c8f067365fe7b484ea620b23a119f99a85127631e584d01f9083d7c49f115698e6e7859646a080a5cd7791ac33fc SHA512 c4550221f45a4ff29a54008ca50d3fc9c2d8ca20736240ef2fcc437b0a1cbd1551d75248ec5eb661c4943a462588035a131857450e15b5f92b1dfdba283b6547
diff --git a/app-xemacs/strokes/Manifest b/app-xemacs/strokes/Manifest
index e8255797b22b..2465a033a668 100644
--- a/app-xemacs/strokes/Manifest
+++ b/app-xemacs/strokes/Manifest
@@ -1 +1 @@
-DIST strokes-1.10-pkg.tar.gz 43728 SHA256 4117b14e416a6c7c8ca97e4dd401677cbf3f88679128ac07ef58677f14526ffd SHA512 dc4c2e49cf5778122056cf10a20faea646598a4dbe24497b0feeaa341a6a05d845d1baf9dbd89afce1025e604f2b48b0e95abd7c5c0e749b3fb4aa0a524d924c WHIRLPOOL bcb65421305baa9940d19020a48a061c823d9460753beaba737ddeef30afc6db09daf622366cd0246562db88b6b4a6cdadc0cf93b274d1473caa76a797d87e09
+DIST strokes-1.10-pkg.tar.gz 43728 BLAKE2B 525fc8fabcbd23eb62730b2a31a962bb406712931867fcdc115c9fa96db7d5c4d9968063eadd9ec17208f54085023bce1467231a2f67c0e9839cb77d57df5640 SHA512 dc4c2e49cf5778122056cf10a20faea646598a4dbe24497b0feeaa341a6a05d845d1baf9dbd89afce1025e604f2b48b0e95abd7c5c0e749b3fb4aa0a524d924c
diff --git a/app-xemacs/sun/Manifest b/app-xemacs/sun/Manifest
index 527ecb20461a..ed489e40ab06 100644
--- a/app-xemacs/sun/Manifest
+++ b/app-xemacs/sun/Manifest
@@ -1 +1 @@
-DIST Sun-1.16-pkg.tar.gz 64431 SHA256 f6bc51de8049b66b512ec50fca97d500a1e0b8cc2f8bdfe68613e38271e31f67 SHA512 1e03553132adedf2d93e80094a6934919489360391d927614dccb85abe3e6a36e930312ee8ee9c70a0608d2041fc8161dfa54649b0822236ca9532e0d26c8c2c WHIRLPOOL adfceb6a4fded41a9a8aae3eb82c13f61ff31800bb00a084e5adc8fbe7b2f51b537566c3d31e16c6e3094230637bf43fcecd6dda0c7fd5c104ebbb5e6c65e492
+DIST Sun-1.16-pkg.tar.gz 64431 BLAKE2B 8511f5a999f4b9f595d788fffa67458d81a9e7168613b5ff245555731af5c5276c94908598d3a469593752570ad929920ee9f86e1f81047aadec6f6fe0994b58 SHA512 1e03553132adedf2d93e80094a6934919489360391d927614dccb85abe3e6a36e930312ee8ee9c70a0608d2041fc8161dfa54649b0822236ca9532e0d26c8c2c
diff --git a/app-xemacs/supercite/Manifest b/app-xemacs/supercite/Manifest
index 537bde4285f6..0e010fc41e89 100644
--- a/app-xemacs/supercite/Manifest
+++ b/app-xemacs/supercite/Manifest
@@ -1 +1 @@
-DIST supercite-1.21-pkg.tar.gz 100802 SHA256 5e163f0812367692d65aa6c278028579ccde7a7b9643c24e7d02191798cdd82e SHA512 6b1875e6b6913af7d5a6f32888472e75702e570067460a52f93e8d6d761d05c5cd5b373bca60c86c9d4d5edb8e6d8d0b6cb363c5645d527cd81c06e4a178487c WHIRLPOOL 16cbed414186d5f7ed72566b0b540fe216d696197c11d6d747b9da086a966a5da22f863d9a5e85cf0046ff0ad3632882bb75365f6eb2db4101578d8fd4ab6a0c
+DIST supercite-1.21-pkg.tar.gz 100802 BLAKE2B 6810ba1eb207914193f22d10ec30788e87f6d59f8fbe7bb87db46b71dca668b243a1b23f33e662f248873d6770382ced1b3c8a35662725c5f36a0f1265d77183 SHA512 6b1875e6b6913af7d5a6f32888472e75702e570067460a52f93e8d6d761d05c5cd5b373bca60c86c9d4d5edb8e6d8d0b6cb363c5645d527cd81c06e4a178487c
diff --git a/app-xemacs/texinfo/Manifest b/app-xemacs/texinfo/Manifest
index c1bc9454c08a..029a580b99c7 100644
--- a/app-xemacs/texinfo/Manifest
+++ b/app-xemacs/texinfo/Manifest
@@ -1 +1 @@
-DIST texinfo-1.30-pkg.tar.gz 145763 SHA256 5a328ae0c16716eefd69569e4acdef0f44a740b4bf409145726f2d9967746e6d SHA512 dadcbb0a2dbbdc311d19a4e796ac574f18234938ddeb16da1ac8b9e150459536bac46b00b1609b8cd837ef980cc5b13f77b8321edfb347614340d1db0f3f78c0 WHIRLPOOL ed3fb4d41482d0dbfe7800a984bcdf6caae93a9688c8286a18815e9aef6ab3ebcf2c0b14747bfaa62a85153dfc0ac62891ae0639c0b5d8f854086c02d432704c
+DIST texinfo-1.30-pkg.tar.gz 145763 BLAKE2B f4bdd2381fb2efa5e6d318431e8a8a56911b2f84b161f96610e2e43a8e49c9ba15c63915f3219b4b47901834c3cf51aaa4fbc1b51ce18ae0d574bf99baafcae6 SHA512 dadcbb0a2dbbdc311d19a4e796ac574f18234938ddeb16da1ac8b9e150459536bac46b00b1609b8cd837ef980cc5b13f77b8321edfb347614340d1db0f3f78c0
diff --git a/app-xemacs/text-modes/Manifest b/app-xemacs/text-modes/Manifest
index 9e1cb486ceac..3f3f73976171 100644
--- a/app-xemacs/text-modes/Manifest
+++ b/app-xemacs/text-modes/Manifest
@@ -1,2 +1,2 @@
-DIST text-modes-1.92-pkg.tar.gz 443017 SHA256 46909fcaa4f2a57e75debcc1027d852bfc3cac92eb58b897af69332adabb6353 SHA512 daec17a811b2b7d8dc9730dbad8a1fe0edf8667eb8f334b8c89502f06012b8f938967b578a91e7ca399ff7e853c23959a606021cb2a60c714c7db5a49421d63a WHIRLPOOL cd31029a77f0f256580e5a2f764a90498bdfd6fd7ffa9eb35549b09f6bbe7b019fb8bd0e7f6f24ecd2cdde207ecd55ecb7a9f25dbd6c5e1f5f727a64da1445ad
-DIST text-modes-1.98-pkg.tar.gz 450607 SHA256 a9f059ef2ae4dc4fbd37f64ec3df67ede82e3c8d5f4f878c6f266766b93258ad SHA512 72e4a20a53b52847d7b48550046eef50353e3f79e609a5a8de15f11259d6034ffad0b8369ec928cb4fd966706a16a3e020f62c890cca8eb59840729b886d8573 WHIRLPOOL eaae93bd026de17824f10f59e1ebcecc2587d4dfc41b8aa56ad54be0a98d513254197dfc9878d2c79999255e61149da79839948b55fab4b4fefbb6f99ff4bc34
+DIST text-modes-1.92-pkg.tar.gz 443017 BLAKE2B 62991cc84bf33ed259cd8fe03b71df3db2ca7ce20e0c7601a3d4fda0415c328ba55ac6ff51b9f7ff4c6f93a8a3e88869c91ba22e3b8922ce9d4a607707fcffb7 SHA512 daec17a811b2b7d8dc9730dbad8a1fe0edf8667eb8f334b8c89502f06012b8f938967b578a91e7ca399ff7e853c23959a606021cb2a60c714c7db5a49421d63a
+DIST text-modes-1.98-pkg.tar.gz 450607 BLAKE2B f4e3c2eaba1c8a1a6e751de1a483e199179692cf380f9f48a206b77db5b0dc3f57ff58790d9853f04d5e3a2f9364159e1c775afd72e673ca866972893382a312 SHA512 72e4a20a53b52847d7b48550046eef50353e3f79e609a5a8de15f11259d6034ffad0b8369ec928cb4fd966706a16a3e020f62c890cca8eb59840729b886d8573
diff --git a/app-xemacs/textools/Manifest b/app-xemacs/textools/Manifest
index 8c5d6aed92fa..1a5f0d61887f 100644
--- a/app-xemacs/textools/Manifest
+++ b/app-xemacs/textools/Manifest
@@ -1 +1 @@
-DIST textools-1.15-pkg.tar.gz 79966 SHA256 3f61b3c71286c9c8270fc30bb655e735786b82616ef011d7a30e23e026014882 SHA512 22c987d68acc1107eca9749246014f5a6c64e7d388519e7694dfa917241537cd7e815e73e5cd36edac564a27136b273c9b0e593a78ae63f683b0d70432b46310 WHIRLPOOL 85360dcf8215748fa0eff78acd54965cb8a80f3ed4d7520e55007023a1fa9c6e44b3f761344a51755aff30a225c729df0ae56939e445cf1689b4a28f206cae3e
+DIST textools-1.15-pkg.tar.gz 79966 BLAKE2B 5b2de39719f7c8e9af949365e3ac6a615253017a022e027bd288456da15fa5baba13603bb5cc2a61384dfbb4fbad18b2d8e2e96d9937a14a4f298404b0d148ae SHA512 22c987d68acc1107eca9749246014f5a6c64e7d388519e7694dfa917241537cd7e815e73e5cd36edac564a27136b273c9b0e593a78ae63f683b0d70432b46310
diff --git a/app-xemacs/time/Manifest b/app-xemacs/time/Manifest
index 770a3bb2d757..41f0dc391bfd 100644
--- a/app-xemacs/time/Manifest
+++ b/app-xemacs/time/Manifest
@@ -1 +1 @@
-DIST time-1.14-pkg.tar.gz 20431 SHA256 35851d62093834e8454767ee5d86fc2f863c32dc6f5651129674218926ee2949 SHA512 62dfea425ac0fd00d4e8003377341c03970fde921acc06f94cbe98e6c37e255462e7ba9e72d0d540c557d64559ce9d39d2f21bcb7736e0ee7939e4b41ab5c0ac WHIRLPOOL 1e6c174ca9cfb4487f8c407597afe4e0630f61aada2b7ce84ac38dedb045d7108bd255539099672699cdd0157c269d9151b9e82bdfddbab58c391878fe827d8c
+DIST time-1.14-pkg.tar.gz 20431 BLAKE2B c0b28f83de39a82fad9965e13681e4c88c1fad59d19821f951739dc7fd915b01f3308d0b6fe6485def0e65a4396b6fb6941103863243e9848f5ec235112b7c67 SHA512 62dfea425ac0fd00d4e8003377341c03970fde921acc06f94cbe98e6c37e255462e7ba9e72d0d540c557d64559ce9d39d2f21bcb7736e0ee7939e4b41ab5c0ac
diff --git a/app-xemacs/tm/Manifest b/app-xemacs/tm/Manifest
index b7abd40e7d62..d61462e7d27c 100644
--- a/app-xemacs/tm/Manifest
+++ b/app-xemacs/tm/Manifest
@@ -1,2 +1,2 @@
-DIST tm-1.38-pkg.tar.gz 333864 SHA256 624abace037d8c1a4e49c6cb5f4d4c4cd7d0be1280c315bc5a7c682d87d9e837 SHA512 cd051d92b538a9373509241c52e6740faf2bb49bb0c01996f253114519399b3f5ca0a47250fe9f4a61d903408ff4402640bdfbc5624c90628aeaa85e61a7a5b6 WHIRLPOOL dd1034ac12fd69c0356e20f2af44b04b6346147f7eaddcfbb2e4b3401590f422ae80a0876a387846b879a87f1ed4bf2300122cc01902f414cc12903cc8fba2f0
-DIST tm-1.39-pkg.tar.gz 335103 SHA256 e0d09817832c8b84e918579be08162342a4932ecc7348977dbfde3573ae0b60a SHA512 084d2e57810fd2a318ab766d0b5560983f6394b635a3596a06c106b68d80fde81bae5bd531d06e816efbda08066b3b718ff0284910e40b994f4a29b3159ee0d7 WHIRLPOOL 57e198b2b6c9be14abdf6d096e6cb8fe22d35f8475373940afe2691ca91109a01d85d6e611ef9fcfdde4d78723a6a8a733b45a686cccbfee58443d12427c195a
+DIST tm-1.38-pkg.tar.gz 333864 BLAKE2B f271fe59e3d4eab0e21dcf503a93191ce9bcd9630deb59f109551997511af423bef8c702a74437727223e24fe355ef05a89e88b35a2207c25c2259641d733e08 SHA512 cd051d92b538a9373509241c52e6740faf2bb49bb0c01996f253114519399b3f5ca0a47250fe9f4a61d903408ff4402640bdfbc5624c90628aeaa85e61a7a5b6
+DIST tm-1.39-pkg.tar.gz 335103 BLAKE2B a1dec2205292d4ab26f8427ca69ea6decf0935b15079244c9633b195119fb746a32410815c8ac5c5d7a2af282605bacff6e10cbd262f571b2f78d644621968b4 SHA512 084d2e57810fd2a318ab766d0b5560983f6394b635a3596a06c106b68d80fde81bae5bd531d06e816efbda08066b3b718ff0284910e40b994f4a29b3159ee0d7
diff --git a/app-xemacs/tooltalk/Manifest b/app-xemacs/tooltalk/Manifest
index 69c48f541804..db864c6de204 100644
--- a/app-xemacs/tooltalk/Manifest
+++ b/app-xemacs/tooltalk/Manifest
@@ -1 +1 @@
-DIST tooltalk-1.15-pkg.tar.gz 9749 SHA256 99c75f865cd3602e048b06dd06bcce3e7ae16754308178e30f539ead1f68bd0e SHA512 c884d357a8ba534f6a640cb9b5b0bee5138758181f53a66d8064c7cee9a7277b4e2a4c7d3d831404b4727bef724694882c1334ca7e0a39b1f934c4af966fb2aa WHIRLPOOL 1505ad6cee5b558b742f689ff5afc1827219884e4ae3a8156116efcbd480ae6cc6e3e5665b5d4f15c2f4568e8a788b68ad23cb406cb9f0b8ac1cc73e31de3504
+DIST tooltalk-1.15-pkg.tar.gz 9749 BLAKE2B f483f8972c0d8514b8cb1bae0795a82eb02858a632f2929cce114a6c0c98d0a92c176556bd6d87fef926936770b7afbbaa9541e090a42af6c0a18b567279b963 SHA512 c884d357a8ba534f6a640cb9b5b0bee5138758181f53a66d8064c7cee9a7277b4e2a4c7d3d831404b4727bef724694882c1334ca7e0a39b1f934c4af966fb2aa
diff --git a/app-xemacs/tpu/Manifest b/app-xemacs/tpu/Manifest
index 2a4c91d0c035..2d485c11427a 100644
--- a/app-xemacs/tpu/Manifest
+++ b/app-xemacs/tpu/Manifest
@@ -1 +1 @@
-DIST tpu-1.14-pkg.tar.gz 59529 SHA256 a2039d5bca8c652d5480b46301cfa52704ae803f2c22abe3e77cb42673050ad0 SHA512 07c448f17be698ba9967762de3f3c0b94793276e72e5ad1562491bd6ad0a2fa431ccae919526e105313adc658dc22ec095ecc81433854f28bfbc422967cda82f WHIRLPOOL 065cd54dae2f5c22d0ae5c0ac173d92722892f3d66c31866afe0672afb759885c464ca8d538d9e3cea5fd1b3e1d60e6eeaf0738ba34e67a7d0a556811c43003d
+DIST tpu-1.14-pkg.tar.gz 59529 BLAKE2B 75c562a4e83af5f077851410f0974aa09cb3f7dfdfe550e0c5904f7790694bbaa8c48798366086927fd26df6a17c4ce46fcb89664613cfcc967c6b548b43a239 SHA512 07c448f17be698ba9967762de3f3c0b94793276e72e5ad1562491bd6ad0a2fa431ccae919526e105313adc658dc22ec095ecc81433854f28bfbc422967cda82f
diff --git a/app-xemacs/tramp/Manifest b/app-xemacs/tramp/Manifest
index 94545cf72ac0..d90b2b93f6af 100644
--- a/app-xemacs/tramp/Manifest
+++ b/app-xemacs/tramp/Manifest
@@ -1 +1 @@
-DIST tramp-1.52-pkg.tar.gz 396316 SHA256 e3185e7bd8e3dd7076c8d4009014a8a70cd1953dcf4102f4408d181b7c148383 SHA512 ce61fe02bf0803a845bf34df7d9c7c0f72a28bcc84e2ebbcd8b80b1a28a5304bcffd5756a5a61d297b537e79a7d90e60821ba857a4c06911d4c098f2694897c6 WHIRLPOOL 6a45807355081ebc25fd3da40bae5d178f44345d87be430a629310962c40d65ff9bb0a8d216260d6bc2963b65a3a169b6af912836bcf2687cac144c17359cac5
+DIST tramp-1.52-pkg.tar.gz 396316 BLAKE2B daa38f4ccd399564d84f9cd5445f4483c49a591302ddc8a881376e4d3eac506b1123040fa7395255fd5f76bc93f6ed124771d557104b4261a74100a2bc6273c9 SHA512 ce61fe02bf0803a845bf34df7d9c7c0f72a28bcc84e2ebbcd8b80b1a28a5304bcffd5756a5a61d297b537e79a7d90e60821ba857a4c06911d4c098f2694897c6
diff --git a/app-xemacs/vc-cc/Manifest b/app-xemacs/vc-cc/Manifest
index 48687282e671..b1313e953744 100644
--- a/app-xemacs/vc-cc/Manifest
+++ b/app-xemacs/vc-cc/Manifest
@@ -1 +1 @@
-DIST vc-cc-1.22-pkg.tar.gz 95028 SHA256 63d90721f646378f190bb8ddd4d109e1a0bdb3993177cb45dda3d92a8de31f79 SHA512 34aec1f857220ff35c6aa3b428605c7d42e1f10d2e6d265a815e8a1940b3cc52ef937c22c6fbabf736e3e6363023250daacb151622f3791972ecc74d7f7e876b WHIRLPOOL f9ce95df8e75daede1de3bc42d95d2817488235cc0679a2295fc48f0388e36d281e0deb4c69363f7c78296737a09261b3549540216f061cc871adbc63fb0d788
+DIST vc-cc-1.22-pkg.tar.gz 95028 BLAKE2B 6ba8a0475d7a65d3f52982674f0d1eeebd262c7c9bcd939a3f4278324b7457ad9169352a3974627f03a12d9baee85908e27ec77100c3303ae186f2de1fea4a9a SHA512 34aec1f857220ff35c6aa3b428605c7d42e1f10d2e6d265a815e8a1940b3cc52ef937c22c6fbabf736e3e6363023250daacb151622f3791972ecc74d7f7e876b
diff --git a/app-xemacs/vc/Manifest b/app-xemacs/vc/Manifest
index 74b446930836..cc3dc32e839d 100644
--- a/app-xemacs/vc/Manifest
+++ b/app-xemacs/vc/Manifest
@@ -1,2 +1,2 @@
-DIST vc-1.41-pkg.tar.gz 94597 SHA256 dc5c4e51d1233179f932233dcf0af561a29467c1b77a521b223a697faa2c96a0 SHA512 fb4061a2740afed7978e42cd9ba9862d6bb067a0600a8635530c5aea1c5f4069b8825b9d1a0aeccbfd338cd4d1239b3611a823cd4646899690f99a1b6c12bde8 WHIRLPOOL 37d3ed0f498f71bb3c6c526f1c61e14f2520f2d9827ad5ffa15bc5b71fb1291a85f3e4e60284b0ce504388620a50907b57857e52b94e07611fb79578650abf4b
-DIST vc-1.48-pkg.tar.gz 231122 SHA256 1170c396a73ce99c3190c20d38343dd1de0bbc116e2a030e1854c0fd18426d69 SHA512 d043c6cac917ed80388ccb619f99c902baf50f5014af40dfd086d98fa0650e491a2b6746ef5463832d77158a75a14d2c39067a6165e55b33566c29ef4902d669 WHIRLPOOL ce8b441b42c25046442b3779934c283fca4713bdcef6eb6364bafa058ec83aec823089c6961f9114f509023e5d949caf63eb59eb82bfaa083a4f16f947cd79cd
+DIST vc-1.41-pkg.tar.gz 94597 BLAKE2B f709067926105d1b6047ba2e0116145fb34ba6fc1c94c5f9c4f3405304ba78348dfbdb75955f0a8971e886592318179b8e8cd17808d6b17621f05ca688857ea6 SHA512 fb4061a2740afed7978e42cd9ba9862d6bb067a0600a8635530c5aea1c5f4069b8825b9d1a0aeccbfd338cd4d1239b3611a823cd4646899690f99a1b6c12bde8
+DIST vc-1.48-pkg.tar.gz 231122 BLAKE2B 8dd697dc7fb1d973ab1fc8f0e6a25458221fa581d1fba129e55309b0bf3c263e2802d654ea741849b1f45454817496da94b78de00ecdc22695a7e8e23edd61e1 SHA512 d043c6cac917ed80388ccb619f99c902baf50f5014af40dfd086d98fa0650e491a2b6746ef5463832d77158a75a14d2c39067a6165e55b33566c29ef4902d669
diff --git a/app-xemacs/vhdl/Manifest b/app-xemacs/vhdl/Manifest
index fbc5d0f9fce5..1a8103390db8 100644
--- a/app-xemacs/vhdl/Manifest
+++ b/app-xemacs/vhdl/Manifest
@@ -1 +1 @@
-DIST vhdl-1.22-pkg.tar.gz 302693 SHA256 113da94704b48237decf283b5b3e273adb5fea726991bf55bcd1e353ff6c6c61 SHA512 3b0d6995f69d7dee47d4d5ab108be3c58f7911b37d31b6a46242eb678623275e32c3ee55393c5671237e11f3b84a56d8f1fa3b8f6492032aeb9f590bb1ad0848 WHIRLPOOL d496773825779f41c51108a85dff1384c277a64ec5e5fa84855dd8ecacdec9749fa88699d38bd617edd66dc88cbbd7cfd5a60301100c186b5f0be631c9f237cd
+DIST vhdl-1.22-pkg.tar.gz 302693 BLAKE2B c0ae6c5b079cf8e394a6e09eccaf327eb8729521f7982797e9ffe11cb150cd309752f79635a2f88845ce0888c562aa5fe1e23f491966c205a7c98ebfd0a2a3ec SHA512 3b0d6995f69d7dee47d4d5ab108be3c58f7911b37d31b6a46242eb678623275e32c3ee55393c5671237e11f3b84a56d8f1fa3b8f6492032aeb9f590bb1ad0848
diff --git a/app-xemacs/view-process/Manifest b/app-xemacs/view-process/Manifest
index bd9cf10dd982..c2136b7ab666 100644
--- a/app-xemacs/view-process/Manifest
+++ b/app-xemacs/view-process/Manifest
@@ -1 +1 @@
-DIST view-process-1.13-pkg.tar.gz 60814 SHA256 b7a612de6b359ca0d6d606ddf8f1cf67b7a27c880202bd9246bfb6f527d409c5 SHA512 01d965b9a1646ddb340c028177487010ac5411b217ac641587d62eed8c186cb4562c7d3f70f5165891ab761df20411f819abddf55c7480cfb7e73995f0d8dfcd WHIRLPOOL 55f95f12b67c01b836212cc971bbc5744ca522a336cbaf1b59fcb6318136a2079a5fca942e21d5f7821f88705f0ee9ec4306cb77913aa79412dfd143a19d0ab2
+DIST view-process-1.13-pkg.tar.gz 60814 BLAKE2B 17a6ca037baf9660aa9c01eea1b52fbf86464d5b9b17bbef3d5e7a5879e7797c2ccaac28390992a3085f43d707272407daeef3e97870be534f3b8c6b1f41a7ea SHA512 01d965b9a1646ddb340c028177487010ac5411b217ac641587d62eed8c186cb4562c7d3f70f5165891ab761df20411f819abddf55c7480cfb7e73995f0d8dfcd
diff --git a/app-xemacs/viper/Manifest b/app-xemacs/viper/Manifest
index d657999fa41d..99be928d94cf 100644
--- a/app-xemacs/viper/Manifest
+++ b/app-xemacs/viper/Manifest
@@ -1,2 +1,2 @@
-DIST viper-1.55-pkg.tar.gz 337549 SHA256 7aee2d43239b6f36fd6f61ad62729361b1d9a200c433160d77b7479f830cdc8b SHA512 e8b3aac23db14b712507b36733c7cb3caa43f0261b9fdc748225e90239877267f9d4155d05bebec2d8297d30fb0553b4593ee91987ae35e9f3cfc73ccd390f6d WHIRLPOOL 004e72608346d32c567dcc5c8c03bebd0a5cca4386b09d53b36b724c66805e0172e97670770255a0650557eef19735c23ba07569f43b4d91d8de5a7bf15604ff
-DIST viper-1.67-pkg.tar.gz 338588 SHA256 06f3b173c33b59de2cf6f6c63dcb1a2cb843adfb000b3155f40262cf7187b51c SHA512 7b768f82dcdf8246729e9f8ce0976cebf8148d41c815f3880028f795ac35628368d2a3fc5e623db588fa2cd96654f34884756ea962c9f1e03169e421a55517f8 WHIRLPOOL b3a4ef86f9f04228b362cbc3ebdec28a1a4e5c129c2998388f4fa36af857509cce2acb2e70630d3ff181656c4c1e6c166d123cb73c638da9b48499e3114d7f4e
+DIST viper-1.55-pkg.tar.gz 337549 BLAKE2B bd8ec3c636f3ae2900640140fcaeb32dc68e83a26ff30f4318ecbe83078f4c1d99a55f74a103cff76354dc13d29456306a3625dc5a81d79e5617ead1b5f29d90 SHA512 e8b3aac23db14b712507b36733c7cb3caa43f0261b9fdc748225e90239877267f9d4155d05bebec2d8297d30fb0553b4593ee91987ae35e9f3cfc73ccd390f6d
+DIST viper-1.67-pkg.tar.gz 338588 BLAKE2B 7898bd22d5f2e1afd02d5f6b8e13338325649b642f3a9639a23c325dd89a5ce81435f5bafb5bfeef358ddc7790e6191536a2551d876444002a30875b3bd96caa SHA512 7b768f82dcdf8246729e9f8ce0976cebf8148d41c815f3880028f795ac35628368d2a3fc5e623db588fa2cd96654f34884756ea962c9f1e03169e421a55517f8
diff --git a/app-xemacs/vm/Manifest b/app-xemacs/vm/Manifest
index 639a2e37d70e..883a34a303e0 100644
--- a/app-xemacs/vm/Manifest
+++ b/app-xemacs/vm/Manifest
@@ -1,2 +1,2 @@
-DIST vm-7.22-pkg.tar.gz 822094 SHA256 c10e7fba4df3c28c43f39397230a52e0e960ef9f6eecab7f9cbd1fdf24341b07 SHA512 5b84f336c5de35ebc5551cdab152fdf64e3da1c3e468487011233c80e8fcb160d3b9f1629659b596132b57d64958e80fe40a7f04ea27caf14a8223fe0b63a228 WHIRLPOOL 11c3d817fbb8e42348a814a359e9de241975e11541d007c017ab9e5d3194d2980e7b613c1f1392ffc3397be42bc9a58066dadf0b690a925c513fc22c9cb1d19c
-DIST vm-8.08-pkg.tar.gz 825312 SHA256 5b767d4b6cf22cf2b40e57f7bb1ab3d4873908643a33205d403c8f9453be5310 SHA512 443f2634eca98a31f504828723c6aed18e8958211179f4e96206bc1b16973fe924cbf60f3fb0c45a46a3e5618890d600af888cb85aaee22fe91d496e4d61624a WHIRLPOOL cc81ea716b1ccba776147ad0d5bcfac5960a0472a895a146d6b9f36a55c0a42698f6e944f8be6ad9b6c64b3538fac1041f79645b0b9d8dc66e64afb9f6b85b27
+DIST vm-7.22-pkg.tar.gz 822094 BLAKE2B a080c273964839d72fe81ca54839dd5c135137b4b10ffe854a04b23d7c3ef3e6b6633403f6c57f43c589c975bb86f2a173c531fdcb86506975874a82b6390cb1 SHA512 5b84f336c5de35ebc5551cdab152fdf64e3da1c3e468487011233c80e8fcb160d3b9f1629659b596132b57d64958e80fe40a7f04ea27caf14a8223fe0b63a228
+DIST vm-8.08-pkg.tar.gz 825312 BLAKE2B ab6d84dfc6b830c51007dacab55b1932626c1cb2dba9e6a84422e8eaa8327c9f4a2ca9e9ccb499c7d95449f0ab5195a294a2b67111a64aa9b41a12c0a7d0b72f SHA512 443f2634eca98a31f504828723c6aed18e8958211179f4e96206bc1b16973fe924cbf60f3fb0c45a46a3e5618890d600af888cb85aaee22fe91d496e4d61624a
diff --git a/app-xemacs/w3/Manifest b/app-xemacs/w3/Manifest
index 9da8c4c20e3c..7a86bccb71d0 100644
--- a/app-xemacs/w3/Manifest
+++ b/app-xemacs/w3/Manifest
@@ -1,2 +1,2 @@
-DIST w3-1.33-pkg.tar.gz 695864 SHA256 b26f2a8e6297b72ef86f6ad5fed0a8e54c59f8fcabd49fd77c9e816ef043fc04 SHA512 f5093d9866dd229d4541e981be94a353ff27be21f4d3118701b31a8bed0e81bc04c2abdae5082f1cc26a2c414614e7b522515f3716ed1443c9ce996a013f9e54 WHIRLPOOL 0781370a817fe3c4b19325e1ef83b1228996e519f810f12b09a05be44476173746cac16cccd1055add2cf9a7af4a663b92e644164d48bfb5d5c59880d87548fb
-DIST w3-1.35-pkg.tar.gz 696392 SHA256 5d096239f703190962cf4e07daa944fa780974024181adea2e40825eb9013cad SHA512 773de63d8e1de48ab8329eba1b0f38f1892a5e29c6cbe0b20ff6b9147527c393a79e8a3ee6e4027e73d385abe68c12352f97114a83014a99a186e3672d458e92 WHIRLPOOL 42ce99c644dd6f398376e73129e88938ee2d04ca7c95e165e4ba60696098d395ab76e6870cdc64f6e9b2cbc466526b3458e1088dbfad70310947c3e1b02af786
+DIST w3-1.33-pkg.tar.gz 695864 BLAKE2B 504f29d232a537318896ae3f1376f45ffb3638682a95fa56029bac8a79cb81bcf99805d2cc38200f5d0ee676d422bc56bcda0b44d743176ea4e34ba5505c8657 SHA512 f5093d9866dd229d4541e981be94a353ff27be21f4d3118701b31a8bed0e81bc04c2abdae5082f1cc26a2c414614e7b522515f3716ed1443c9ce996a013f9e54
+DIST w3-1.35-pkg.tar.gz 696392 BLAKE2B a92f46c5cc3ec4d7bb9c250a88ba417c10fe0a398b70a408c327f878e02dc78f510de0f2e231ae5431db5a2554248510ff76a3792e037d90a29b0810b97d48fb SHA512 773de63d8e1de48ab8329eba1b0f38f1892a5e29c6cbe0b20ff6b9147527c393a79e8a3ee6e4027e73d385abe68c12352f97114a83014a99a186e3672d458e92
diff --git a/app-xemacs/x-symbol/Manifest b/app-xemacs/x-symbol/Manifest
index 3b3fa6776500..5e0246da3e4e 100644
--- a/app-xemacs/x-symbol/Manifest
+++ b/app-xemacs/x-symbol/Manifest
@@ -1,2 +1,2 @@
-DIST x-symbol-1.10-pkg.tar.gz 680100 SHA256 f1ddde7a30206f2d60e3cdd36a5c8d07125323dbb69508d9bfc727d940b85fb5 SHA512 f2ce3117aab28cbc9f5d36caad8347da1c503a12db526e901f81d6698195a73b8f7444ff7a0d9609d11e4f5e52a1d105cc4d86e55fbf9f50ffb6b89675006845 WHIRLPOOL 7e4d76b00240d7e19ad62128211b660f15fc9b55946302ba36d67d0c3c4ece23f692ccc8124e8ad218d62dd9cedecc765ba7f254a34b79697d8529c1da15f3c9
-DIST x-symbol-1.11-pkg.tar.gz 684579 SHA256 2900f7b9917df4bda0818e67029b40e1720bc58b19c86a3215a29bd20ac63860 SHA512 86c1d80e3a6f11c9d5a54e51991166fd5f37443f77ad6f0292765af3aaf1c072a8b827fd6379c016f428040ae7616c572732f1d6806d14b9a7a0ce52dac4169a WHIRLPOOL b85225ddb3df7feed746e81acb43ad68a087af6163629fb07ae3859d9964222e5dde34b8f3430464e4cc237b10a88d5fcb7e6692c345d2460736ba4aefb0f6a8
+DIST x-symbol-1.10-pkg.tar.gz 680100 BLAKE2B 4b36403a8cc9fc025742e512d68a3efe2afc377f32cd51f3891a878d105634da0a9a53e0064c118f81f27a6938296f25eeb8645e72e5ccfd310fa662d7e395b5 SHA512 f2ce3117aab28cbc9f5d36caad8347da1c503a12db526e901f81d6698195a73b8f7444ff7a0d9609d11e4f5e52a1d105cc4d86e55fbf9f50ffb6b89675006845
+DIST x-symbol-1.11-pkg.tar.gz 684579 BLAKE2B 46915c56133ba3232821ab75ec497b984574aecc94acc9eaaf45a3beb8a9f7507ab7fc715dd21348fe6390b69191814f624677a8171b3f425ea3392f5059ab5e SHA512 86c1d80e3a6f11c9d5a54e51991166fd5f37443f77ad6f0292765af3aaf1c072a8b827fd6379c016f428040ae7616c572732f1d6806d14b9a7a0ce52dac4169a
diff --git a/app-xemacs/xemacs-base/Manifest b/app-xemacs/xemacs-base/Manifest
index 89272bec2ef9..5a8e3cd7c018 100644
--- a/app-xemacs/xemacs-base/Manifest
+++ b/app-xemacs/xemacs-base/Manifest
@@ -1,3 +1,3 @@
-DIST xemacs-base-2.08-pkg.tar.gz 537716 SHA256 99e16f722615d517f6cc618927f381bd1a2f5a4320d929f889550f9c9cd71039 SHA512 f72585f9c7da25361a40d632993f449f4d55f127189f9c57eac8e1f5c3bee7aebb98663c9109fcacebe813e578dc4569f2c795aaa799e95da8839ec12bc67bdf WHIRLPOOL 6c610867143dfc5330101fff997264ccec7ab5581ecb3b2a43240341420dbcbcde76ff3c0959bc7018d143ded321f6a905541ebaca085dc7d3e952734bc38d62
-DIST xemacs-base-2.10-pkg.tar.gz 538066 SHA256 02215aaee696b3b097cafdd4d4a71b61aa9aa6085796c452234cb90da3ad9b4b SHA512 c073b9799d5b02ace8aedf397ecd9cd25344cfe70479df52c8f1724df63f8d6400e04ed4f89714637afd0b854f3a36af6193ed68e71703f4a98e17ad59ef8fde WHIRLPOOL 7a1a8ce72f7d37a1bab80987627aad7b9a8198f7edc921debed832f730cc6bdde1fe1583efa9f3823f947f7397420e6f7d8dc3d922fbf0fb1d897464436332f2
-DIST xemacs-base-2.27-pkg.tar.gz 535989 SHA256 384ef390113548136cbee8bdc32122d45111bc46a1723c818a84613ef1924daa SHA512 5ed06fdf13cacab6bcf7429cd2d600dce54d3038fe9b9184aa41e847882ca9b51e7b9841fc383aae7df21eaaec36971471d598d0c0d165b0f07d1c6b0ac71508 WHIRLPOOL 35b3d7e80484f88434ce411b47150553714430b13b7e5cccce2f3799d2b49593006e68ce48e7e427c050c765d609c93c1f353a84d50a5121b0422fdee04a4a1a
+DIST xemacs-base-2.08-pkg.tar.gz 537716 BLAKE2B 4662de783de62da43de6c463350f1399f5d3a1ce21a08ff5784e3fef18310c7de373caa31f683dd77d677c57efea3a9b3a411ecc448039fb2bb2901a33c48776 SHA512 f72585f9c7da25361a40d632993f449f4d55f127189f9c57eac8e1f5c3bee7aebb98663c9109fcacebe813e578dc4569f2c795aaa799e95da8839ec12bc67bdf
+DIST xemacs-base-2.10-pkg.tar.gz 538066 BLAKE2B 732ddf3bc9946997e87d7b5ccae31aacea40cbdb3048eb9309069f569b4461663ebf19c5e8757cbceb462b3c51af1cadc9b46b98ac0bd178a63cb6dd65a84705 SHA512 c073b9799d5b02ace8aedf397ecd9cd25344cfe70479df52c8f1724df63f8d6400e04ed4f89714637afd0b854f3a36af6193ed68e71703f4a98e17ad59ef8fde
+DIST xemacs-base-2.27-pkg.tar.gz 535989 BLAKE2B dae22f9e8121074fc992c2b73703cc2c66c42b4d90a55bebd9facf9aaa697ce195937fef0bd4740ff1ff9aa340d43b43db70a4edeb2aeabb996e37fee22d50e8 SHA512 5ed06fdf13cacab6bcf7429cd2d600dce54d3038fe9b9184aa41e847882ca9b51e7b9841fc383aae7df21eaaec36971471d598d0c0d165b0f07d1c6b0ac71508
diff --git a/app-xemacs/xemacs-devel/Manifest b/app-xemacs/xemacs-devel/Manifest
index ee79ce7961c2..090a4428a3cf 100644
--- a/app-xemacs/xemacs-devel/Manifest
+++ b/app-xemacs/xemacs-devel/Manifest
@@ -1,2 +1,2 @@
-DIST xemacs-devel-1.75-pkg.tar.gz 246585 SHA256 46d6e029db83ee136f9b1e8b0a0526517fc5bd043e5dbda3a5bf3582ebb24d3c SHA512 f05629c0e116cb4d10e3ffcaa941be285b56250a95a9316050115fe9cb12e3581da87be59862b79fa3c3cd3fb29b5029d0514a0fd9e9d317bba1b1b3c500cf9e WHIRLPOOL 06f81c65540519f9a933ce220cd63145cf7282cb68cdd591d3d96f6ca17f3ebac9ffcf3874043df853d8f9f1a549cd4322a652383a045abfc30fe790811d06eb
-DIST xemacs-devel-1.80-pkg.tar.gz 257410 SHA256 bb6cd42d64e1653dd3a8ad3336de294112350cdd2500d496468f32470d21df1c SHA512 99d42ccd0b3db45a4b4fae931c59685c4e8cedd4daba744d8bf6232f6c1d388a2fb010ed58ce5a28a5e455fae73c19e9d3ad1bd12f2e95634c30605ae02099b2 WHIRLPOOL 74c7c2f2f2063a69b6a5be2deecee2cbf7dfcadcf9bc4cb3917dc2b111c755197ab8251cef09457d88cb0848677b6444074483ff6ddeed92696aedc6b53fda99
+DIST xemacs-devel-1.75-pkg.tar.gz 246585 BLAKE2B 01c8e7f3e71ae14ae40436879a84543040c6c3e84487a3df7e6dc70401bf82be5dedcab08cdf1d6d437cf1283099b37665a2f4c98c67f4811e7d4f1f1f0ba33d SHA512 f05629c0e116cb4d10e3ffcaa941be285b56250a95a9316050115fe9cb12e3581da87be59862b79fa3c3cd3fb29b5029d0514a0fd9e9d317bba1b1b3c500cf9e
+DIST xemacs-devel-1.80-pkg.tar.gz 257410 BLAKE2B c678554fac620d56b687611e56ce7ca6f048c3e70895209701e230079beb474d189d8d47b731d47c369866dcb3846f6d9781bd0c6b558ad7765eaa0e7b54c7ac SHA512 99d42ccd0b3db45a4b4fae931c59685c4e8cedd4daba744d8bf6232f6c1d388a2fb010ed58ce5a28a5e455fae73c19e9d3ad1bd12f2e95634c30605ae02099b2
diff --git a/app-xemacs/xemacs-eterm/Manifest b/app-xemacs/xemacs-eterm/Manifest
index 323927d6f8e3..3555abef2b9e 100644
--- a/app-xemacs/xemacs-eterm/Manifest
+++ b/app-xemacs/xemacs-eterm/Manifest
@@ -1,2 +1,2 @@
-DIST eterm-1.17-pkg.tar.gz 109229 SHA256 ca97c79830131c1f1a61733bc1e46afae4c7ec7eb0ce89fa2988de28a804a127 SHA512 0ba75254551fc3e10647088a0050dd076c0fb92e1d9549ee02fbc855e19ec5ea41ca24d0f61e080adac17f1427289607d6320950dee486f92630bc2f4b3a3e2f WHIRLPOOL a89ac37e6cf1196087fee2d32f4313bcec1b7755c9c08b255c5bd3706cae1be2b749da1638d1919ddc858043a7328bee85406435a83644d61b7c3ae66c49d492
-DIST eterm-1.18-pkg.tar.gz 116169 SHA256 f1024f990b0c45d8d2b44675a1879ffc9514ecf858b1cc7158f13a74e14780ad SHA512 110cc05d4f29f38c881eb5205c94ad841e16b67e6a4386c6d8f00945d4f1b20aa859c1295f987cee317a7b974121c59f2a5ebafac0057a261f9c7bf09eb7846a WHIRLPOOL ad67a1b9ea543bbc1b0a91238ceaaeaeabbee6460e16781e2a0b2c8dac71df2242a8d98097221c7eeeba8897745e49192a2bcffb567eb47ecc97fbe0ad760b9d
+DIST eterm-1.17-pkg.tar.gz 109229 BLAKE2B 45fdfe9dd109b960d1a86f8099f53f9c12924f9cae6eac53f8fdf10accf59b07bea5b2ce3c013d93b7dc343a7adfa070e28d3207a7a1ccedc0844f1ce529d798 SHA512 0ba75254551fc3e10647088a0050dd076c0fb92e1d9549ee02fbc855e19ec5ea41ca24d0f61e080adac17f1427289607d6320950dee486f92630bc2f4b3a3e2f
+DIST eterm-1.18-pkg.tar.gz 116169 BLAKE2B 2fdfd0575c9df55eee88ac14009518106af175aa94ba0c4243c5930c35827134d7186c1cbf7031615af3141f53cdad591b105488110584ac6b9b464fea2307a6 SHA512 110cc05d4f29f38c881eb5205c94ad841e16b67e6a4386c6d8f00945d4f1b20aa859c1295f987cee317a7b974121c59f2a5ebafac0057a261f9c7bf09eb7846a
diff --git a/app-xemacs/xemacs-ispell/Manifest b/app-xemacs/xemacs-ispell/Manifest
index e9e2223f39f9..3cd05d708b9f 100644
--- a/app-xemacs/xemacs-ispell/Manifest
+++ b/app-xemacs/xemacs-ispell/Manifest
@@ -1 +1 @@
-DIST ispell-1.32-pkg.tar.gz 83587 SHA256 2d4c8a18aa0adff6bad97ae33af4c234cf9935a2e14558bf3d211b663fcd33c9 SHA512 02108c33e5611ecd4ce6c574fcb12a93d3c8753079925c624ae3b155a6b13efaef581c468e311e7aa1f85e0a032cebf2a466ce8e5a9647be0b748251c3dfc070 WHIRLPOOL 4146b649a340e987701e1af74aeb51155b0f7a2f8edf708bace11c396187b7b183f51bebde638e898cc2fcd3cc17c5a2718a04d4d8a1f35da836b7fd8b6ab450
+DIST ispell-1.32-pkg.tar.gz 83587 BLAKE2B 80c65a5bb22711c6690ddef1213d60b5f6cca8d5fe342267e931294a10a976c9f3a50e6ba2d539720e460a25779363c954aac37b4c413741784251849fce0785 SHA512 02108c33e5611ecd4ce6c574fcb12a93d3c8753079925c624ae3b155a6b13efaef581c468e311e7aa1f85e0a032cebf2a466ce8e5a9647be0b748251c3dfc070
diff --git a/app-xemacs/xetla/Manifest b/app-xemacs/xetla/Manifest
index 2d79b171e58b..384634c03214 100644
--- a/app-xemacs/xetla/Manifest
+++ b/app-xemacs/xetla/Manifest
@@ -1,2 +1,2 @@
-DIST xetla-1.01-pkg.tar.gz 294912 SHA256 825e03040216cf565b03decf942f4348a779cb0c8cd7f417756d49c5b40a9cfc SHA512 535c40e4a6a6b0ba28818a5835540d8d8908eb7624144e4dfb301bf5fac4b8b08f1db8c11cfbb855695d082b5d4705aee9c7f6be409969868414472e3cdf7186 WHIRLPOOL c5cbbb17db64770032ebfa7275001ea5638d0ba09065eaa6bd0212baf987c1e0647e6971dbd5584c533868a434e4edf4d9023012e29e9e7e0070ea24c4878979
-DIST xetla-1.02-pkg.tar.gz 294986 SHA256 29230ba303c6c25b640ea00dc5a80ebe5ef67dd038ed1d0f434a278e16bd3b30 SHA512 91f6886f34d3d331deda5d1b172010482b9941f7b702981c77c87ead00fd16d5ac54f650b472ba03621f551c5e400abf7b19fe53ef88d6d82f2f86e28cd0e5e2 WHIRLPOOL 88114ef66cee5b635d5c8aed5ab13008671e7f5d607653e1bcf17c1b6167b214d9beec730398999cb01e27e84cc1694fa94760a8220b14fc36358641910ef0e5
+DIST xetla-1.01-pkg.tar.gz 294912 BLAKE2B 3dd9b6bf725445f98f7623a261b37906a4b0f81d046e80941658799dcf9abf77ab661255bc182b29e149be1d6eec226102ed4900fa8f94a4c56dfa51130271f7 SHA512 535c40e4a6a6b0ba28818a5835540d8d8908eb7624144e4dfb301bf5fac4b8b08f1db8c11cfbb855695d082b5d4705aee9c7f6be409969868414472e3cdf7186
+DIST xetla-1.02-pkg.tar.gz 294986 BLAKE2B fd586413dd9836987fb429e669bebe72117f10d07f98dcb530ff8b26d04803eb5b1803e6a31ccfbc37fe0ef7472c65c18c9abb407ae73fb5ac8a6a9d0a207bde SHA512 91f6886f34d3d331deda5d1b172010482b9941f7b702981c77c87ead00fd16d5ac54f650b472ba03621f551c5e400abf7b19fe53ef88d6d82f2f86e28cd0e5e2
diff --git a/app-xemacs/xlib/Manifest b/app-xemacs/xlib/Manifest
index dea97e2a79cf..8aa09385cf34 100644
--- a/app-xemacs/xlib/Manifest
+++ b/app-xemacs/xlib/Manifest
@@ -1 +1 @@
-DIST xlib-1.14-pkg.tar.gz 205806 SHA256 3e08de61c27b0ef502a5aa3c87cd2712b0b97417f373cad5a2f837fc71a3395a SHA512 ad704e10cfbf8fb01ab56666c47b58a0acefda615dda2d63b56c2416b023737a23e7b748f752b11336e2379271e84e1731db7e72274930ff82c16ed00921a0e0 WHIRLPOOL 8a566745c8a36691925e9c318888878a08154a9e612de159aa19a4286cb9aad093f2f083be040a791e80523bf25e7dbc672653c899320692984245ae5aff494c
+DIST xlib-1.14-pkg.tar.gz 205806 BLAKE2B 87c98668972496db0950181354633409a1416a5a20e4764913b5b0ef6c99e3fa487ec67f2b460b60eecb2358b1ba6e9bb532fbae53036ecb5d73b07eb2b483c7 SHA512 ad704e10cfbf8fb01ab56666c47b58a0acefda615dda2d63b56c2416b023737a23e7b748f752b11336e2379271e84e1731db7e72274930ff82c16ed00921a0e0
diff --git a/app-xemacs/xslide/Manifest b/app-xemacs/xslide/Manifest
index 675ee73b69c8..51bd0f4ea4e1 100644
--- a/app-xemacs/xslide/Manifest
+++ b/app-xemacs/xslide/Manifest
@@ -1 +1 @@
-DIST xslide-1.09-pkg.tar.gz 39199 SHA256 3fd6386dedd82655d5f26d0435fdb705a8ca63ab79e348ddf41e44b31c7b3da4 SHA512 2844b1d71b9a9938443d550e8a9dc5eb53932d92695839dd20d633dd5f0ab4448a08ff10f228d7b63380df6c367f27a236dd91e203d7cfe4b0632bb0639e6553 WHIRLPOOL 46bf44b56cdab0c4cf1c7360df95c1848a9c7c02dfe529b34e68313250bec2f120356a4593063055d2a42f901b324426687d101f872aa3eb58f992972452c0a2
+DIST xslide-1.09-pkg.tar.gz 39199 BLAKE2B bd8cdfec35c9f7e309e51639958c15ffdbe0ed99a720f0dc3c001d1bda5904de914d075b65eb25ec0151d8b90260c2b1baadab2939f3d1c90f319461f9c2e4bf SHA512 2844b1d71b9a9938443d550e8a9dc5eb53932d92695839dd20d633dd5f0ab4448a08ff10f228d7b63380df6c367f27a236dd91e203d7cfe4b0632bb0639e6553
diff --git a/app-xemacs/xslt-process/Manifest b/app-xemacs/xslt-process/Manifest
index d4a076eb1c55..b2e74facb034 100644
--- a/app-xemacs/xslt-process/Manifest
+++ b/app-xemacs/xslt-process/Manifest
@@ -1 +1 @@
-DIST xslt-process-1.12-pkg.tar.gz 59594 SHA256 c0883678de529165681ace55c2d402517526a71cd4e45c2d9930019864b986c7 SHA512 47945fc2c105e6ce54cb7bd5e1b5a437444a85b0a059ecce7ee6ebdc22b9d6140f939711a79d7b65b43b628afd7c57acc34e56e3592efc1bd0ff488810af134e WHIRLPOOL e3c7ab72f2ccf53295bcccebb17a58fad5fab11433aea379af44a7feeff84aa73ee646ea237378bd12a2490c22a904f71428dbad3153300f6dd2f6ac630e836a
+DIST xslt-process-1.12-pkg.tar.gz 59594 BLAKE2B 3e0d23799465a61bd209435e59ae11cc6f4d9dd58ab24674dbb83bfd836949bbd2f83e9c9d8397b904813169ec7b0e0121355046230094daaf008e95b1d5ba90 SHA512 47945fc2c105e6ce54cb7bd5e1b5a437444a85b0a059ecce7ee6ebdc22b9d6140f939711a79d7b65b43b628afd7c57acc34e56e3592efc1bd0ff488810af134e
diff --git a/app-xemacs/xwem/Manifest b/app-xemacs/xwem/Manifest
index 98bde9d64915..924e823aaee7 100644
--- a/app-xemacs/xwem/Manifest
+++ b/app-xemacs/xwem/Manifest
@@ -1,2 +1,2 @@
-DIST xwem-1.22-pkg.tar.gz 649363 SHA256 d276779f6d4d70ff0b50ca448c1dabc4a44b9724da8c5f5d58a69b79e5d0c68a SHA512 5de50db9a9b0e3fe33aeae0f01cf5f4df61c57760c0cb66ec37288f03f3c3da1c45805b9d37b2ab6e375ac308f7074fb2cf12d9f6174742a9075cb64c82f68f5 WHIRLPOOL 4285bfc5a88c1a30727b6418401e9ce7e4cb212a5ad7eb1f187d7522f0dfeea687cd4f56a864687cd5a75af369c0622bb45dee5c350175c1a3ae5126999bc478
-DIST xwem-1.23-pkg.tar.gz 649490 SHA256 87b89ed5f8292c0edb596c5f2906e5a68f4f6bf3f001644e32898b94f40423ac SHA512 f070ca895b6b1144444e2d17198b07e3584fd72410b0663fb86fe3048635b8a795ee9b575c8f583108bddaae37de44864080a0402ae6312dd1d7172882473063 WHIRLPOOL 151ce014ccfd5b9a98da390b6d83f17df4134df6908d3490d84ff0434f49393560dde18dee8c6b5c60c5ccf17d637dcdb4c2e77bf4a97a31b1ca34f91420dc9d
+DIST xwem-1.22-pkg.tar.gz 649363 BLAKE2B 732ea3fa3810a5a2aff923ed1e9e6d5aa8d95a6b27ba888f2a9ea6590c1e61e37a4c2df1e4af35e7bed1886bc85a3118deb56b2071eee8ffb78be56583f0b22a SHA512 5de50db9a9b0e3fe33aeae0f01cf5f4df61c57760c0cb66ec37288f03f3c3da1c45805b9d37b2ab6e375ac308f7074fb2cf12d9f6174742a9075cb64c82f68f5
+DIST xwem-1.23-pkg.tar.gz 649490 BLAKE2B 1d31ae12ffda979da37872a1653709f80b8965380d23ebbb3d021cfa86b3fee7fc3c232d000c27b4c0eec2ea5e34a27c80af283f14decc0ea72acca4685dd305 SHA512 f070ca895b6b1144444e2d17198b07e3584fd72410b0663fb86fe3048635b8a795ee9b575c8f583108bddaae37de44864080a0402ae6312dd1d7172882473063
diff --git a/app-xemacs/zenirc/Manifest b/app-xemacs/zenirc/Manifest
index 3bcf892143ff..241ad9783347 100644
--- a/app-xemacs/zenirc/Manifest
+++ b/app-xemacs/zenirc/Manifest
@@ -1 +1 @@
-DIST zenirc-1.16-pkg.tar.gz 277377 SHA256 a6a4ff49874c1f07bf48afa984546c0f96d1e3695890cf3877a3dc51a99f2d58 SHA512 2fd93791a94682bd26a2133a9a10b13587aa5a5d0b9a559c9589153f3132810c86d5fd7c6b607f2b777f22edf3aa4eab61d47ca161e0c2bf8b4a6f43ced2a07c WHIRLPOOL 07bd2d047223a6365161d70780c198ad7a752731b0c2a9279359259d0a3a3ece212acebf679d0fe23df04c1c8248e32cbc0d0f389d97397196ca949ccb34a05e
+DIST zenirc-1.16-pkg.tar.gz 277377 BLAKE2B 9d4bbe33bfa82ad1eb06ffdedb73e3eb52fe43a1eeb1b2da8692b877207a8e28a43d345472f67812b8531eb0222c17f9b99a40e3ad4bcaf14820dbbd377afd63 SHA512 2fd93791a94682bd26a2133a9a10b13587aa5a5d0b9a559c9589153f3132810c86d5fd7c6b607f2b777f22edf3aa4eab61d47ca161e0c2bf8b4a6f43ced2a07c
diff --git a/dev-ada/Manifest.gz b/dev-ada/Manifest.gz
index 44175fe46323..dae7418cc032 100644
Binary files a/dev-ada/Manifest.gz and b/dev-ada/Manifest.gz differ
diff --git a/dev-ada/aunit/metadata.xml b/dev-ada/aunit/metadata.xml
index 8e0def15bbcb..e2d94242dd42 100644
--- a/dev-ada/aunit/metadata.xml
+++ b/dev-ada/aunit/metadata.xml
@@ -10,6 +10,6 @@
 		<flag name="gnat_2017">Compile with dev-lang/gnat-gpl-2017</flag>
 	</use>
 	<longdescription lang="en">
-		 AUnit is a set of Ada packages based on the xUnit family of unit test frameworks. It’s intended as a developer’s tool to facilitate confident writing and evolution of Ada software. It is purposely lightweight, as one of its main goals is to make it easy to develop and run unit tests, rather than to generate artifacts for process management. The framework supports easy composition of sets of unit tests to provide flexibility in determining what tests to run for a given purpose.
+		AUnit is a set of Ada packages based on the xUnit family of unit test frameworks. It’s intended as a developer’s tool to facilitate confident writing and evolution of Ada software. It is purposely lightweight, as one of its main goals is to make it easy to develop and run unit tests, rather than to generate artifacts for process management. The framework supports easy composition of sets of unit tests to provide flexibility in determining what tests to run for a given purpose.
 	</longdescription>
 </pkgmetadata>
diff --git a/dev-ada/gprbuild/Manifest b/dev-ada/gprbuild/Manifest
index dab1b96f734e..f19ce6332877 100644
--- a/dev-ada/gprbuild/Manifest
+++ b/dev-ada/gprbuild/Manifest
@@ -1,4 +1,4 @@
-DIST gprbuild-gpl-2016-src.tar.gz 2142261 SHA256 d51659454bc0aaf1a9a9f1d05aab469a1f3d900065a4542123d3a59ab067275d SHA512 6b9e00248aaee90f3c00e7ce442c2b551b8532ec4d94a4471858d117feb27e91fd6d218995d4b71ee3f1f0677e9547d562fc2cda9ba80c3f6eb8d840ed56eb7e WHIRLPOOL 2afb9d3188f9498cf9cf9a6605081e27a843a15e4c4d5541616b8818757c6f8d458e8d6fbe97bcfc0607ac98d58ec2e4830d17aefd26458b3adcf1489a646945
-DIST gprbuild-gpl-2017-src.tar.gz 2454957 SHA256 0d0a48b8744e4f7230a85008d8213b583459046395704e8ab8c5cabedbf7c616 SHA512 12f3682d64ce0718de4940c1e71a4380b20021805d88543842dbf3b5ce5d518c23a6b2d868565579baf81efa1d8cf05c7778253162f0df5d7adc0eb1865c9f88 WHIRLPOOL 905b3a6d64a7f8a6970586b5d1c010badcc24c42e4b406ed7508e0470920b86d0992e80dc2326b10a314cb27519944f5199a7f0d75e72dae8fb096180c22a781
-DIST xmlada-gpl-2016-src.tar.gz 1440671 SHA256 ea64d8da2c5fb01a257fc5bf474b8d4ec40b01dc15b320b9fe260ff2db668ba4 SHA512 d1d7c3d91731394235aed4b80c91b1babe30d5f184282fae8087ee556318475e3923ed628b805693fc89a4d9bb219b0fb0937bc5024a742226da0245d36ed652 WHIRLPOOL b6ebb927d801394ad0b62d9538142c420ab33627582059466d4f64b12c3a45b1b5b489019aef715a59101370220a78507fe03d97c9e67233dfcc4f3aad1f16d7
-DIST xmlada-gpl-2017-src.tar.gz 1578393 SHA256 9b103157eb3ecd697b597ad4e60f56f39028bc2d6ea513d2dce8a3b0e65ac54b SHA512 371f6adc01550a4bb13204ec0404dc1165438db595f4346813e5a23a155de74c857c40c55adde173919c2fe35b3b91d78b235c9718ee86bc848e62ddfd7fa2b4 WHIRLPOOL 4b2da3fb799f8def6eb6383a9483258340368cc80e96e8ffab207c3c8849c1279a80cf68ca47c8a20ce91c084041bdfa95128a14321454055534d804272ef4dd
+DIST gprbuild-gpl-2016-src.tar.gz 2142261 BLAKE2B 69948427eb6315b9fb2b84755192b53c035f74093dacb34852713083779bf8bd88dac6b38fe7685f6a40ecb2482f78b15a5221913df997847eee8b1359cf6c14 SHA512 6b9e00248aaee90f3c00e7ce442c2b551b8532ec4d94a4471858d117feb27e91fd6d218995d4b71ee3f1f0677e9547d562fc2cda9ba80c3f6eb8d840ed56eb7e
+DIST gprbuild-gpl-2017-src.tar.gz 2454957 BLAKE2B 890e5aa29e9f8fa8b140988ee8e5d6042640c34fe0877acde959de803bf690bb33c63b1c7e7db486f804882bddd77ab76ffbaa4dd27da327e21ed0376cadb99d SHA512 12f3682d64ce0718de4940c1e71a4380b20021805d88543842dbf3b5ce5d518c23a6b2d868565579baf81efa1d8cf05c7778253162f0df5d7adc0eb1865c9f88
+DIST xmlada-gpl-2016-src.tar.gz 1440671 BLAKE2B 32998fbdb680f3a1ea7915f144c3039441d8608ded9fe2df99d9b5c9d13436a020c25a9773cced753ffa3ff89a918bbb1ef3ca310cbc58f583682deb7dcc9d09 SHA512 d1d7c3d91731394235aed4b80c91b1babe30d5f184282fae8087ee556318475e3923ed628b805693fc89a4d9bb219b0fb0937bc5024a742226da0245d36ed652
+DIST xmlada-gpl-2017-src.tar.gz 1578393 BLAKE2B 7b4894040b6044e86c96cbd530ebda5c0cfc4ad0e2b472d46798a93f535aca0916b03385a3aef49bd4e59d508a9665c856360e9cab0a4f67b15091228b629d81 SHA512 371f6adc01550a4bb13204ec0404dc1165438db595f4346813e5a23a155de74c857c40c55adde173919c2fe35b3b91d78b235c9718ee86bc848e62ddfd7fa2b4
diff --git a/dev-ada/gprbuild/gprbuild-2016.ebuild b/dev-ada/gprbuild/gprbuild-2016.ebuild
index 60d1b029292a..162f31f1ee4d 100644
--- a/dev-ada/gprbuild/gprbuild-2016.ebuild
+++ b/dev-ada/gprbuild/gprbuild-2016.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="bootstrap gnat_2016 gnat_2017 +shared static static-pic"
+IUSE="bootstrap +gnat_2016 gnat_2017 +shared static static-pic"
 
 DEPEND="!bootstrap? ( dev-ada/xmlada[static,gnat_2016=,gnat_2017=] )
 	gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
diff --git a/dev-ada/gprbuild/gprbuild-2017.ebuild b/dev-ada/gprbuild/gprbuild-2017.ebuild
index a6101175e17e..889b9667cf1b 100644
--- a/dev-ada/gprbuild/gprbuild-2017.ebuild
+++ b/dev-ada/gprbuild/gprbuild-2017.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="bootstrap gnat_2016 gnat_2017 +shared static static-pic"
+IUSE="bootstrap gnat_2016 +gnat_2017 +shared static static-pic"
 
 DEPEND="!bootstrap? ( dev-ada/xmlada[static,gnat_2016=,gnat_2017=] )
 	gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
diff --git a/dev-ada/gtkada/metadata.xml b/dev-ada/gtkada/metadata.xml
index ba0f05fc23e8..1b27068850f3 100644
--- a/dev-ada/gtkada/metadata.xml
+++ b/dev-ada/gtkada/metadata.xml
@@ -12,6 +12,6 @@
 		<flag name="static">Build gtkada as static library</flag>
 	</use>
 	<longdescription lang="en">
-		 GtkAda is an Ada graphical toolkit based on Gtk+, providing the complete set of Gtk+ widgets using the Object-Oriented features of this language. GtkAda supports the latest 3.14 stable releases.
+		GtkAda is an Ada graphical toolkit based on Gtk+, providing the complete set of Gtk+ widgets using the Object-Oriented features of this language. GtkAda supports the latest 3.14 stable releases.
 	</longdescription>
 </pkgmetadata>
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index 22593862eac8..85113fe69850 100644
Binary files a/dev-cpp/Manifest.gz and b/dev-cpp/Manifest.gz differ
diff --git a/dev-cpp/lucene++/metadata.xml b/dev-cpp/lucene++/metadata.xml
index 7e7d73fe4283..3eaca1156f33 100644
--- a/dev-cpp/lucene++/metadata.xml
+++ b/dev-cpp/lucene++/metadata.xml
@@ -5,7 +5,7 @@
 		<email>johu@gentoo.org</email>
 		<name>Johannes Huber</name>
 	</maintainer>
-    <upstream>
+	<upstream>
 		<remote-id type="github">luceneplusplus/luceneplusplus</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-cpp/muParser/metadata.xml b/dev-cpp/muParser/metadata.xml
index cb8c922154dc..c1bd2f6ab998 100644
--- a/dev-cpp/muParser/metadata.xml
+++ b/dev-cpp/muParser/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
@@ -6,9 +6,9 @@
 		<name>Gentoo Mathematics Project</name>
 	</maintainer>
 	<longdescription lang="en">
-  muParser is a C++ library for mathematical expression parsing.
-  It is based on transforming an expression into a bytecode and
-  precalculating constant parts of it.
+		muParser is a C++ library for mathematical expression parsing.
+		It is based on transforming an expression into a bytecode and
+		precalculating constant parts of it.
 	</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">muparser</remote-id>
diff --git a/dev-cpp/tree/metadata.xml b/dev-cpp/tree/metadata.xml
index c99a88a76fcf..f6bb7c0c19ad 100644
--- a/dev-cpp/tree/metadata.xml
+++ b/dev-cpp/tree/metadata.xml
@@ -6,10 +6,10 @@
 		<name>Gentoo Science Project</name>
 	</maintainer>
 	<longdescription lang="en">
-  The tree.hh library for C++ provides an STL-like container class for
-  n-ary trees, templated over the data stored at the nodes. Various
-  types of iterators are provided (post-order, pre-order, and
-  others). Where possible the access methods are compatible with the
-  STL or alternative algorithms are available.
-</longdescription>
+		The tree.hh library for C++ provides an STL-like container class for
+		n-ary trees, templated over the data stored at the nodes. Various
+		types of iterators are provided (post-order, pre-order, and
+		others). Where possible the access methods are compatible with the
+		STL or alternative algorithms are available.
+	</longdescription>
 </pkgmetadata>
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 3456049c307f..1d1bf9e3e97d 100644
Binary files a/dev-db/Manifest.gz and b/dev-db/Manifest.gz differ
diff --git a/dev-db/libzdb/metadata.xml b/dev-db/libzdb/metadata.xml
index e97f3c9a8559..947ae36c152a 100644
--- a/dev-db/libzdb/metadata.xml
+++ b/dev-db/libzdb/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-        <email>lordvan@gentoo.org</email>
- 	<name>Thomas Raschbacher</name>
-  </maintainer>
+	<maintainer type="person">
+		<email>lordvan@gentoo.org</email>
+		<name>Thomas Raschbacher</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-db/oracle-instantclient/metadata.xml b/dev-db/oracle-instantclient/metadata.xml
index dcbd81f2598c..4021726b1f0e 100644
--- a/dev-db/oracle-instantclient/metadata.xml
+++ b/dev-db/oracle-instantclient/metadata.xml
@@ -1,24 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-  <email>haubi@gentoo.org</email>
-</maintainer>
-<longdescription>
-	Free, light-weight and easily installed Oracle Database libraries
-	and SDKs for building and connecting client applications to local
-	or remote Oracle Databases.
-</longdescription>
-<use>
-	<flag name="jdbc">Support for XA, Internationalization, and RowSet operations under JDBC.
-	</flag>
-	<flag name="odbc">Libraries for enabling ODBC applications.
-	</flag>
-	<flag name="sdk">Header files and an example makefile for developing Oracle applications.
-	</flag>
-	<flag name="sqlplus">Libraries and executable for running SQL*Plus.
-	</flag>
-	<flag name="tools">Workload Replay Client.
-	</flag>
-</use>
+	<maintainer type="person">
+		<email>haubi@gentoo.org</email>
+	</maintainer>
+	<longdescription>
+		Free, light-weight and easily installed Oracle Database libraries
+		and SDKs for building and connecting client applications to local
+		or remote Oracle Databases.
+	</longdescription>
+	<use>
+		<flag name="jdbc">Support for XA, Internationalization, and RowSet operations under JDBC</flag>
+		<flag name="odbc">Libraries for enabling ODBC applications</flag>
+		<flag name="sdk">Header files and an example makefile for developing Oracle applications</flag>
+		<flag name="sqlplus">Libraries and executable for running SQL*Plus</flag>
+		<flag name="tools">Workload Replay Client</flag>
+	</use>
 </pkgmetadata>
diff --git a/dev-db/pspg/Manifest b/dev-db/pspg/Manifest
index 92ec6cfcf91b..e709c302c7b1 100644
--- a/dev-db/pspg/Manifest
+++ b/dev-db/pspg/Manifest
@@ -1 +1 @@
-DIST pspg-0.5.tar.gz 845824 SHA256 754d1e380d072517e9bc2c3c38785e2f19a9f927f061de9a646fd1094baa204e SHA512 69e45885d4c155fc0e95360d442ac0b67fb910005148537dbd758e9a22ec83fb232214bf5f292b72a79be444ce05f2eb7bc0a2effaeb8731d1442a7f7ddec5df WHIRLPOOL fe647cda821855a55b91be0a38f5859a65b5217bc6df2f0973f137029a7d24a3730e40f705cf865b5f7386fcbba7a82ae41fdd4ff5975cdd83a3d3e41de78a89
+DIST pspg-0.5.tar.gz 845824 BLAKE2B db7b36fbc644e1ac45906ba726212233c0a61230f609584d4fc6207576c4e350b926c6d93e2b9eb563340524e1dae7de0a0c846bed379143bb6a4fcb10cdfd0b SHA512 69e45885d4c155fc0e95360d442ac0b67fb910005148537dbd758e9a22ec83fb232214bf5f292b72a79be444ce05f2eb7bc0a2effaeb8731d1442a7f7ddec5df
diff --git a/dev-db/pspg/pspg-0.5.ebuild b/dev-db/pspg/pspg-0.5.ebuild
index 92c104bcb6dd..18d3c571e86d 100644
--- a/dev-db/pspg/pspg-0.5.ebuild
+++ b/dev-db/pspg/pspg-0.5.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/okbob/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="sys-libs/ncurses:*"
diff --git a/dev-db/sqlcl-bin/Manifest b/dev-db/sqlcl-bin/Manifest
index 838a5e1dd8e0..9e91e6dfe48d 100644
--- a/dev-db/sqlcl-bin/Manifest
+++ b/dev-db/sqlcl-bin/Manifest
@@ -1 +1 @@
-DIST sqlcl-17.2.0.184.1230-no-jre.zip 19805375 SHA256 62ec4348dc44cda1b4622617159a4f9fd7a29fe79864af26fc97555d6093fc23 SHA512 b57fdf46859a92cbecc53c9306d45a30c0fa8dfaaf3d9ecea7611a5344d6a6679b4dbf77c2171fe420c9473f2c55a2a659a0fbbfc07649b7a973d45212914134 WHIRLPOOL 8bde627c6e3474e7a8bd6bd22cc1081866caccdd6ffe3726aeaa5d33735334c04975f632738da1b4c195c9cbbb9eb9909e98f4927bc9aa6fbc3348637a3075db
+DIST sqlcl-17.3.0.271.1943-no-jre.zip 19672343 SHA256 1fde4252453474a671bc67a90e0e1077d63d804f9ee63c1280d81fa29e1952b0 SHA512 75e56ab042b34ca3290b07b4d4eb182dcf264a4bb8392f8a6942df7ca7041b1d25dc70d388f0f5ecd03decff22d040cfc3a4d58f0ec656af334ddd6531f5bbb4 WHIRLPOOL c7267c61df80e9984e71b8161cd34c8028706614ce0dcb1ff2c7c2424137d65fd90a312106e7e0aafe6c2d36e8e7ce2abbed477aa453b07dd7d6608c8baa3933
diff --git a/dev-db/sqlcl-bin/sqlcl-bin-17.2.0.184.1230.ebuild b/dev-db/sqlcl-bin/sqlcl-bin-17.3.0.271.1943.ebuild
similarity index 100%
rename from dev-db/sqlcl-bin/sqlcl-bin-17.2.0.184.1230.ebuild
rename to dev-db/sqlcl-bin/sqlcl-bin-17.3.0.271.1943.ebuild
diff --git a/dev-dotnet/Manifest.gz b/dev-dotnet/Manifest.gz
index 7d4a2befd72f..beb055816672 100644
Binary files a/dev-dotnet/Manifest.gz and b/dev-dotnet/Manifest.gz differ
diff --git a/dev-dotnet/referenceassemblies-pcl/metadata.xml b/dev-dotnet/referenceassemblies-pcl/metadata.xml
index 0074cec7bf81..2b3e4dc79789 100644
--- a/dev-dotnet/referenceassemblies-pcl/metadata.xml
+++ b/dev-dotnet/referenceassemblies-pcl/metadata.xml
@@ -7,8 +7,8 @@
 	</maintainer>
 	<longdescription lang="en">
 		.NET Portable Class Library reference assemblies
-    </longdescription>
+	</longdescription>
 	<longdescription lang="ru">
-        переносимые библиотеки классов (PCL) собранные Microsoft-ом
-    </longdescription>
+		переносимые библиотеки классов (PCL) собранные Microsoft-ом
+	</longdescription>
 </pkgmetadata>
diff --git a/dev-embedded/Manifest.gz b/dev-embedded/Manifest.gz
index 9242203c9802..7e2b88a1a8d8 100644
Binary files a/dev-embedded/Manifest.gz and b/dev-embedded/Manifest.gz differ
diff --git a/dev-embedded/icdprog/metadata.xml b/dev-embedded/icdprog/metadata.xml
index 571d5d28c36f..131ceff58518 100644
--- a/dev-embedded/icdprog/metadata.xml
+++ b/dev-embedded/icdprog/metadata.xml
@@ -5,9 +5,11 @@
 		<email>embedded@gentoo.org</email>
 		<name>Embedded Gentoo</name>
 	</maintainer>
-	<longdescription>ICDPROG is a simple command line programmer for Microchip PIC
-    controllers, using the Microchip ICD (in circuit debugger)
-    hardware.</longdescription>
+	<longdescription>
+		ICDPROG is a simple command line programmer for Microchip PIC
+		controllers, using the Microchip ICD (in circuit debugger)
+		hardware.
+	</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">icdprog</remote-id>
 	</upstream>
diff --git a/dev-embedded/mcu8051ide/metadata.xml b/dev-embedded/mcu8051ide/metadata.xml
index 2b85317c5087..dc146d03bcfa 100644
--- a/dev-embedded/mcu8051ide/metadata.xml
+++ b/dev-embedded/mcu8051ide/metadata.xml
@@ -5,10 +5,10 @@
 		<email>flameeyes@gentoo.org</email>
 	</maintainer>
 	<upstream>
-	  <maintainer>
-	    <!-- Valid on Gentoo Bugzilla -->
-	    <email>martin.osmera@gmail.com</email>
-	    <name>Martin Osmera</name>
-	  </maintainer>
+		<maintainer>
+			<!-- Valid on Gentoo Bugzilla -->
+			<email>martin.osmera@gmail.com</email>
+			<name>Martin Osmera</name>
+		</maintainer>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-games/Manifest.gz b/dev-games/Manifest.gz
index b7eda2f5f6e9..b16dec20c777 100644
Binary files a/dev-games/Manifest.gz and b/dev-games/Manifest.gz differ
diff --git a/dev-games/aseprite/metadata.xml b/dev-games/aseprite/metadata.xml
index 809c2d3b68a0..67070f03bd3e 100644
--- a/dev-games/aseprite/metadata.xml
+++ b/dev-games/aseprite/metadata.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-	<email>azamat.hackimov@gmail.com</email>
-	<name>Azamat H. Hackimov</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
-  </maintainer>
-  <longdescription>
-    Animated sprite editor and pixel art tool
-  </longdescription>
-  <use>
-    <flag name="bundled-libs">Use the upstream provided bundled version of allegro 4.4.2</flag>
-    <flag name="gtk3">Enable support for the experimental native GTK File Dialog</flag>
-    <flag name="webp">Enable webp image format support</flag>
-  </use>
-  <upstream>
-    <remote-id type="github">aseprite/aseprite</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>azamat.hackimov@gmail.com</email>
+		<name>Azamat H. Hackimov</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription>
+		Animated sprite editor and pixel art tool
+	</longdescription>
+	<use>
+		<flag name="bundled-libs">Use the upstream provided bundled version of allegro 4.4.2</flag>
+		<flag name="gtk3">Enable support for the experimental native GTK File Dialog</flag>
+		<flag name="webp">Enable webp image format support</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">aseprite/aseprite</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-games/libmaitretarot/metadata.xml b/dev-games/libmaitretarot/metadata.xml
index ddaeb89d9484..64ab523b4aaf 100644
--- a/dev-games/libmaitretarot/metadata.xml
+++ b/dev-games/libmaitretarot/metadata.xml
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-<longdescription>
-MaitreTarot is a Tarot card game. Understand a game like freecell or poker, 
-nothing to do with astrology. Tarot is rather a French game.
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+	<longdescription>
+		MaitreTarot is a Tarot card game. Understand a game like freecell or poker,
+		nothing to do with astrology. Tarot is rather a French game.
 
-MaitreTarot is made of two kind of elements:
+		MaitreTarot is made of two kind of elements:
 
-    * A server, that knows the rules, that gives the cards to the clients, that 
-counts the points, and everything else that a server should do.
-    * Clients. The main idea is to have differents clients. Some would be 
-clients for human players, with a GUI (gtk+, qt, web, ncurses, win32...). And 
-some would be AI. That would allow users to play with AI, and even AI 
-tournaments could be played in order to know the best AI!
-</longdescription>
+		* A server, that knows the rules, that gives the cards to the clients, that
+		counts the points, and everything else that a server should do.
+		* Clients. The main idea is to have differents clients. Some would be
+		clients for human players, with a GUI (gtk+, qt, web, ncurses, win32...). And
+		some would be AI. That would allow users to play with AI, and even AI
+		tournaments could be played in order to know the best AI!
+	</longdescription>
 </pkgmetadata>
diff --git a/dev-games/libmt_client/metadata.xml b/dev-games/libmt_client/metadata.xml
index ddaeb89d9484..64ab523b4aaf 100644
--- a/dev-games/libmt_client/metadata.xml
+++ b/dev-games/libmt_client/metadata.xml
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-<longdescription>
-MaitreTarot is a Tarot card game. Understand a game like freecell or poker, 
-nothing to do with astrology. Tarot is rather a French game.
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+	<longdescription>
+		MaitreTarot is a Tarot card game. Understand a game like freecell or poker,
+		nothing to do with astrology. Tarot is rather a French game.
 
-MaitreTarot is made of two kind of elements:
+		MaitreTarot is made of two kind of elements:
 
-    * A server, that knows the rules, that gives the cards to the clients, that 
-counts the points, and everything else that a server should do.
-    * Clients. The main idea is to have differents clients. Some would be 
-clients for human players, with a GUI (gtk+, qt, web, ncurses, win32...). And 
-some would be AI. That would allow users to play with AI, and even AI 
-tournaments could be played in order to know the best AI!
-</longdescription>
+		* A server, that knows the rules, that gives the cards to the clients, that
+		counts the points, and everything else that a server should do.
+		* Clients. The main idea is to have differents clients. Some would be
+		clients for human players, with a GUI (gtk+, qt, web, ncurses, win32...). And
+		some would be AI. That would allow users to play with AI, and even AI
+		tournaments could be played in order to know the best AI!
+	</longdescription>
 </pkgmetadata>
diff --git a/dev-games/openscenegraph-qt/metadata.xml b/dev-games/openscenegraph-qt/metadata.xml
index 9658acfd106c..53e9ef1d7edc 100644
--- a/dev-games/openscenegraph-qt/metadata.xml
+++ b/dev-games/openscenegraph-qt/metadata.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>reavertm@gentoo.org</email>
-	<name>Maciej Mrozowski</name>
-</maintainer>
-<maintainer type="project">
-    <email>games@gentoo.org</email>
-    <name>Gentoo Games Project</name>
-  </maintainer>
-<longdescription lang="en">
-The OpenSceneGraph is an open source high performance 3D graphics toolkit, used by application developers in fields such as visual simulation, games, virtual reality, scientific visualization and modelling. Written entirely in Standard C++ and OpenGL it runs on all Windows platforms, OSX, GNU/Linux, IRIX, Solaris, HP-Ux, AIX and FreeBSD operating systems. The OpenSceneGraph is now well established as the world leading scene graph technology, used widely in the vis-sim, space, scientific, oil-gas, games and virtual reality industries. This package is a module for Qt support.
-</longdescription>
+	<maintainer type="person">
+		<email>reavertm@gentoo.org</email>
+		<name>Maciej Mrozowski</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+	<longdescription lang="en">
+		The OpenSceneGraph is an open source high performance 3D graphics toolkit, used by application developers in fields such as visual simulation, games, virtual reality, scientific visualization and modelling. Written entirely in Standard C++ and OpenGL it runs on all Windows platforms, OSX, GNU/Linux, IRIX, Solaris, HP-Ux, AIX and FreeBSD operating systems. The OpenSceneGraph is now well established as the world leading scene graph technology, used widely in the vis-sim, space, scientific, oil-gas, games and virtual reality industries. This package is a module for Qt support.
+	</longdescription>
 </pkgmetadata>
diff --git a/dev-games/openscenegraph/metadata.xml b/dev-games/openscenegraph/metadata.xml
index 4a686db2be4b..fe61db28d513 100644
--- a/dev-games/openscenegraph/metadata.xml
+++ b/dev-games/openscenegraph/metadata.xml
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>reavertm@gentoo.org</email>
-	<name>Maciej Mrozowski</name>
-</maintainer>
-<maintainer type="project">
-    <email>games@gentoo.org</email>
-    <name>Gentoo Games Project</name>
-  </maintainer>
-<longdescription lang="en">
-The OpenSceneGraph is an open source high performance 3D graphics toolkit, used by application developers in fields such as visual simulation, games, virtual reality, scientific visualization and modelling. Written entirely in Standard C++ and OpenGL it runs on all Windows platforms, OSX, GNU/Linux, IRIX, Solaris, HP-Ux, AIX and FreeBSD operating systems. The OpenSceneGraph is now well established as the world leading scene graph technology, used widely in the vis-sim, space, scientific, oil-gas, games and virtual reality industries.
-</longdescription>
-  <use>
-    <flag name="asio">Enable support for <pkg>dev-cpp/asio</pkg> library</flag>
-    <flag name="fox">Build examples using <pkg>x11-libs/fox</pkg> library</flag>
-    <flag name="gdal">Enable support for <pkg>sci-libs/gdal</pkg> library</flag>
-    <flag name="las">Enable support for geospatial data LAS LiDAR format using <pkg>sci-geosciences/liblas</pkg></flag>
-    <flag name="openinventor">Build OpenInventor plugin</flag>
-    <flag name="osgapps">Build osg applications</flag>
-    <flag name="sdl2">Use <pkg>media-libs/libsdl2</pkg> additionally to <pkg>media-libs/libsdl</pkg></flag>
-    <flag name="xrandr">Enable support for the X xrandr extension</flag>
-  </use>
+	<maintainer type="person">
+		<email>reavertm@gentoo.org</email>
+		<name>Maciej Mrozowski</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+	<longdescription lang="en">
+		The OpenSceneGraph is an open source high performance 3D graphics toolkit, used by application developers in fields such as visual simulation, games, virtual reality, scientific visualization and modelling. Written entirely in Standard C++ and OpenGL it runs on all Windows platforms, OSX, GNU/Linux, IRIX, Solaris, HP-Ux, AIX and FreeBSD operating systems. The OpenSceneGraph is now well established as the world leading scene graph technology, used widely in the vis-sim, space, scientific, oil-gas, games and virtual reality industries.
+	</longdescription>
+	<use>
+		<flag name="asio">Enable support for <pkg>dev-cpp/asio</pkg> library</flag>
+		<flag name="fox">Build examples using <pkg>x11-libs/fox</pkg> library</flag>
+		<flag name="gdal">Enable support for <pkg>sci-libs/gdal</pkg> library</flag>
+		<flag name="las">Enable support for geospatial data LAS LiDAR format using <pkg>sci-geosciences/liblas</pkg></flag>
+		<flag name="openinventor">Build OpenInventor plugin</flag>
+		<flag name="osgapps">Build osg applications</flag>
+		<flag name="sdl2">Use <pkg>media-libs/libsdl2</pkg> additionally to <pkg>media-libs/libsdl</pkg></flag>
+		<flag name="xrandr">Enable support for the X xrandr extension</flag>
+	</use>
 </pkgmetadata>
diff --git a/dev-haskell/Manifest.gz b/dev-haskell/Manifest.gz
index 16087f0c0de9..20d07b8b4855 100644
Binary files a/dev-haskell/Manifest.gz and b/dev-haskell/Manifest.gz differ
diff --git a/dev-haskell/bifunctors/metadata.xml b/dev-haskell/bifunctors/metadata.xml
index 55365c128995..7c41a8ab499b 100644
--- a/dev-haskell/bifunctors/metadata.xml
+++ b/dev-haskell/bifunctors/metadata.xml
@@ -9,14 +9,18 @@
 		Haskell 98 bifunctors
 	</longdescription>
 	<use>
-		<flag name="semigroups">You can disable the use of the
-                `semigroups` package using `-f-semigroups`. Disabing this is
-                an unsupported configuration, but it may be useful for
-                accelerating builds in sandboxes for expert users.</flag>
-		<flag name="tagged">You can disable the use of the `tagged` package
-                using `-f-tagged`. Disabing this is an unsupported
-                configuration, but it may be useful for accelerating builds in
-                sandboxes for expert users.</flag>
+		<flag name="semigroups">
+			You can disable the use of the
+			`semigroups` package using `-f-semigroups`. Disabing this is
+			an unsupported configuration, but it may be useful for
+			accelerating builds in sandboxes for expert users.
+		</flag>
+		<flag name="tagged">
+			You can disable the use of the `tagged` package
+			using `-f-tagged`. Disabing this is an unsupported
+			configuration, but it may be useful for accelerating builds in
+			sandboxes for expert users.
+		</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">ekmett/bifunctors</remote-id>
diff --git a/dev-haskell/cgi/metadata.xml b/dev-haskell/cgi/metadata.xml
index a5b813d56cdc..4bd303b28a73 100644
--- a/dev-haskell/cgi/metadata.xml
+++ b/dev-haskell/cgi/metadata.xml
@@ -9,8 +9,7 @@
 		This is a Haskell library for writing CGI programs.
 	</longdescription>
 	<use>
-		<flag name="extensible-exceptions-in-base">Required to be
-                enabled for &gt;=dev-lang/ghc-7.</flag>
+		<flag name="extensible-exceptions-in-base">Required to be enabled for &gt;=dev-lang/ghc-7.</flag>
 		<flag name="network-uri">Get Network.URI from the network-uri package.</flag>
 	</use>
 	<upstream>
diff --git a/dev-haskell/comonad/metadata.xml b/dev-haskell/comonad/metadata.xml
index 5602d8274fe4..e94f4818100b 100644
--- a/dev-haskell/comonad/metadata.xml
+++ b/dev-haskell/comonad/metadata.xml
@@ -9,18 +9,26 @@
 		Haskell 98 comonads
 	</longdescription>
 	<use>
-		<flag name="test-doctests">Run the doctests test suite</flag>
-		<flag name="containers">You can disable the use of the `containers` package
-  using `-f-containers`. Disabing this is an unsupported configuration, but it
-  may be useful for accelerating builds in sandboxes for expert users.</flag>
-		<flag name="contravariant">You can disable the use of the `contravariant`
-  package using `-f-contravariant`. Disabling this is an unsupported
-  configuration, but it may be useful for accelerating builds in sandboxes for
-  expert users. If disabled we will not supply instances of `Contravariant`</flag>
-		<flag name="distributive">You can disable the use of the `distributive`
-  package using `-f-distributive`. Disabling this is an unsupported
-  configuration, but it may be useful for accelerating builds in sandboxes for
-  expert users. If disabled we will not supply instances of `Distributive`</flag>
+		<flag name="test-doctests">
+			Run the doctests test suite
+		</flag>
+		<flag name="containers">
+			You can disable the use of the `containers` package
+			using `-f-containers`. Disabing this is an unsupported configuration, but it
+			may be useful for accelerating builds in sandboxes for expert users.
+		</flag>
+		<flag name="contravariant">
+			You can disable the use of the `contravariant`
+			package using `-f-contravariant`. Disabling this is an unsupported
+			configuration, but it may be useful for accelerating builds in sandboxes for
+			expert users. If disabled we will not supply instances of `Contravariant`
+		</flag>
+		<flag name="distributive">
+			You can disable the use of the `distributive`
+			package using `-f-distributive`. Disabling this is an unsupported
+			configuration, but it may be useful for accelerating builds in sandboxes for
+			expert users. If disabled we will not supply instances of `Distributive`
+		</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">ekmett/comonad</remote-id>
diff --git a/dev-haskell/configfile/metadata.xml b/dev-haskell/configfile/metadata.xml
index c0043cb8b12a..c430e789391c 100644
--- a/dev-haskell/configfile/metadata.xml
+++ b/dev-haskell/configfile/metadata.xml
@@ -2,25 +2,25 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
-  <email>haskell@gentoo.org</email>
-  <name>Gentoo Haskell</name>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
 	</maintainer>
 	<longdescription>
 		Parser and writer for handling sectioned config files in
 		Haskell.
-		
+
 		The ConfigFile module works with configuration files in a standard
 		format that is easy for the user to edit, easy for the programmer
 		to work with, yet remains powerful and flexible.  It is inspired by,
 		and compatible with, Python's ConfigParser module.  It uses files
 		that resemble Windows .INI-style files, but with numerous
 		improvements.
-		
+
 		ConfigFile provides simple calls to both read and write config files.
 		It's possible to make a config file parsable by this module,
 		the Unix shell, and make.
 	</longdescription>
-<use>
-  <flag name="buildtests">Build the executable to run unit tests.</flag>
-</use>
+	<use>
+		<flag name="buildtests">Build the executable to run unit tests.</flag>
+	</use>
 </pkgmetadata>
diff --git a/dev-haskell/contravariant/metadata.xml b/dev-haskell/contravariant/metadata.xml
index d953fa3e4c11..7707171c83b0 100644
--- a/dev-haskell/contravariant/metadata.xml
+++ b/dev-haskell/contravariant/metadata.xml
@@ -2,28 +2,36 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
-          <email>haskell@gentoo.org</email>
-          <name>Gentoo Haskell</name>
-        </maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Haskell 98 contravariant functors
 	</longdescription>
-        <use>
-          <flag name="safe">Get Safe guarantees rather than merely
-          Trustworthy, but with worse constant factors.</flag>
-          <flag name="semigroups">You can disable the use of the `semigroups`
-          package using `-f-semigroups`. Disabling this is an unsupported
-          configuration, but it may be useful for accelerating builds in
-          sandboxes for expert users.</flag>
-          <flag name="statevar">You can disable the use of the `StateVar`
-          package using `-f-StateVar`. Disabling this is an unsupported
-          configuration, but it may be useful for accelerating builds in
-          sandboxes for expert users.</flag>
-          <flag name="tagged">You can disable the use of the `tagged` package
-          on older versons of GHC using `-f-tagged`. Disabling this is an
-          unsupported configuration, but it may be useful for accelerating
-          builds in sandboxes for expert users.</flag>
-        </use>
+	<use>
+		<flag name="safe">
+			Get Safe guarantees rather than merely
+			Trustworthy, but with worse constant factors.
+		</flag>
+		<flag name="semigroups">
+			You can disable the use of the `semigroups`
+			package using `-f-semigroups`. Disabling this is an unsupported
+			configuration, but it may be useful for accelerating builds in
+			sandboxes for expert users.
+		</flag>
+		<flag name="statevar">
+			You can disable the use of the `StateVar`
+			package using `-f-StateVar`. Disabling this is an unsupported
+			configuration, but it may be useful for accelerating builds in
+			sandboxes for expert users.
+		</flag>
+		<flag name="tagged">
+			You can disable the use of the `tagged` package
+			on older versons of GHC using `-f-tagged`. Disabling this is an
+			unsupported configuration, but it may be useful for accelerating
+			builds in sandboxes for expert users.
+		</flag>
+	</use>
 	<upstream>
 		<remote-id type="github">ekmett/contravariant</remote-id>
 	</upstream>
diff --git a/dev-haskell/glib/metadata.xml b/dev-haskell/glib/metadata.xml
index 37e92c0d372a..e57b11cbbed2 100644
--- a/dev-haskell/glib/metadata.xml
+++ b/dev-haskell/glib/metadata.xml
@@ -2,8 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
-        <email>haskell@gentoo.org</email>
-        <name>Gentoo Haskell</name>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
 	</maintainer>
 	<longdescription>
 		The GNU Library is a collection of C data structures and utility
@@ -12,7 +12,6 @@
 		wrap libraries that are themselves based on GLib.
 	</longdescription>
 	<use>
-		<flag name="closure_signals">Use the the GClosure-based signals
-        	implementation.</flag>
-        </use>
+		<flag name="closure_signals">Use the the GClosure-based signals implementation.</flag>
+	</use>
 </pkgmetadata>
diff --git a/dev-haskell/hit/metadata.xml b/dev-haskell/hit/metadata.xml
index 3f0d2b779d97..aeb520f51526 100644
--- a/dev-haskell/hit/metadata.xml
+++ b/dev-haskell/hit/metadata.xml
@@ -2,21 +2,19 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
-	    <email>haskell@gentoo.org</email>
-	    <name>Gentoo Haskell</name>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
 	</maintainer>
 	<longdescription>
-		
 		An haskell implementation of git storage operations, allowing users
 		to manipulate git repositories (read and write).
-		
+
 		This implementation is fully interoperable with the main C implementation.
-		
+
 		This is stricly only manipulating the git store (what's inside the .git directory),
 		and doesn't do anything with the index or your working directory files.
-		
 	</longdescription>
 	<use>
-	    <flag name="executable">Build the executable</flag>
+		<flag name="executable">Build the executable</flag>
 	</use>
 </pkgmetadata>
diff --git a/dev-haskell/lens/metadata.xml b/dev-haskell/lens/metadata.xml
index 475ca4ea9656..ffb64447adda 100644
--- a/dev-haskell/lens/metadata.xml
+++ b/dev-haskell/lens/metadata.xml
@@ -9,84 +9,87 @@
 		This package comes \"Batteries Included\" with many useful lenses for the types
 		commonly used from the Haskell Platform, and with tools for automatically
 		generating lenses and isomorphisms for user-supplied data types.
-		
+
 		The combinators in @Control.Lens@ provide a highly generic toolbox for composing
 		families of getters, folds, isomorphisms, traversals, setters and lenses and their
 		indexed variants.
-		
+
 		An overview, with a large number of examples can be found in the @README@: &lt;https://github.com/ekmett/lens#lens-lenses-folds-and-traversals&gt;
-		
+
 		A video on how to use lenses and how they are constructed is available from youtube: &lt;http://youtu.be/cefnmjtAolY?hd=1&gt;
-		
+
 		Slides can be obtained here: &lt;http://comonad.com/haskell/Lenses-Folds-and-Traversals-NYC.pdf&gt;
-		
+
 		More information on the care and feeding of lenses, including a brief tutorial and motivation
 		for their types can be found on the lens wiki: &lt;https://github.com/ekmett/lens/wiki&gt;
-		
+
 		A small game of @pong@ and other more complex examples that manage their state using lenses can be found in the example folder: &lt;https://github.com/ekmett/lens/blob/master/examples/&gt;
-		
+
 		/Lenses, Folds and Traversals/
-		
+
 		The core of the hierarchy of lens-like constructions looks like:
-		
-		
+
+
 		&lt;&lt;http://i.imgur.com/4fHw3Fd.png&gt;&gt;
-		
+
 		Local copy (&lt;Hierarchy.png&gt;)
-		
+
 		You can compose any two elements of the hierarchy above using @(.)@ from the @Prelude@, and you can
 		use any element of the hierarchy as any type it linked to above it.
-		
+
 		The result is their lowest upper bound in the hierarchy (or an error if that bound doesn't exist).
-		
+
 		For instance:
-		
+
 		* You can use any 'Traversal' as a 'Fold' or as a 'Setter'.
-		
+
 		* The composition of a 'Traversal' and a 'Getter' yields a 'Fold'.
-		
+
 		/Minimizing Dependencies/
-		
+
 		If you want to provide lenses and traversals for your own types in your own libraries, then you
 		can do so without incurring a dependency on this (or any other) lens package at all.
-		
+
 		/e.g./ for a data type:
-		
+
 		&gt; data Foo a = Foo Int Int a
-		
+
 		You can define lenses such as
-		
+
 		&gt; -- bar :: Lens' (Foo a) Int
 		&gt; bar :: Functor f =&gt; (Int -&gt; f Int) -&gt; Foo a -&gt; f (Foo a)
 		&gt; bar f (Foo a b c) = fmap (\a' -&gt; Foo a' b c) (f a)
-		
+
 		&gt; -- baz :: Lens (Foo a) (Foo b) a b
 		&gt; quux :: Functor f =&gt; (a -&gt; f b) -&gt; Foo a -&gt; f (Foo b)
 		&gt; quux f (Foo a b c) = fmap (Foo a b) (f c)
-		
+
 		without the need to use any type that isn't already defined in the @Prelude@.
-		
+
 		And you can define a traversal of multiple fields with 'Control.Applicative.Applicative':
-		
+
 		&gt; -- traverseBarAndBaz :: Traversal' (Foo a) Int
 		&gt; traverseBarAndBaz :: Applicative f =&gt; (Int -&gt; f Int) -&gt; Foo a -&gt; f (Foo a)
 		&gt; traverseBarAndBaz f (Foo a b c) = Foo &lt;$&gt; f a &lt;*&gt; f b &lt;*&gt; pure c
-		
+
 		What is provided in this library is a number of stock lenses and traversals for
 		common haskell types, a wide array of combinators for working them, and more
 		exotic functionality, (/e.g./ getters, setters, indexed folds, isomorphisms).
 	</longdescription>
 	<use>
-		<flag name="benchmark-uniplate">Enable benchmarking against Neil Mitchell's
-  uniplate library for comparative performance analysis. Defaults to being
-  turned off to avoid the extra dependency.</flag>
-		<flag name="inlining">Generate inline pragmas when using
-  template-haskell. This defaults to enabled, but you can
-  to shut it off to benchmark the relative performance impact,
-  or as last ditch effort to address compile errors resulting
-  from the myriad versions of template-haskell that all purport to be 2.8.</flag>
-		<flag name="old-inline-pragmas">Some 7.6.1-rc1 users report their TH still
-  uses old style inline pragmas. This lets them turn on inlining.</flag>
+		<flag name="benchmark-uniplate">
+			Enable benchmarking against Neil Mitchell's
+			uniplate library for comparative performance analysis. Defaults to being
+			turned off to avoid the extra dependency.
+		</flag>
+		<flag name="inlining">
+			Generate inline pragmas when using
+			template-haskell. This defaults to enabled, but you can
+			to shut it off to benchmark the relative performance impact,
+			or as last ditch effort to address compile errors resulting
+			from the myriad versions of template-haskell that all purport to be 2.8.
+		</flag>
+		<flag name="old-inline-pragmas">Some 7.6.1-rc1 users report their TH still uses old style inline pragmas. This lets them turn on inlining.</flag>
 		<flag name="safe">Disallow unsafeCoerce</flag>
 		<flag name="dump-splices">Build and run the doctests test-suite.</flag>
 		<flag name="j">Attempt a parallel build with GHC 7.8.</flag>
diff --git a/dev-haskell/linear/metadata.xml b/dev-haskell/linear/metadata.xml
index 8046e632c6e2..ac6c35143387 100644
--- a/dev-haskell/linear/metadata.xml
+++ b/dev-haskell/linear/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
@@ -9,10 +9,12 @@
 		Types and combinators for linear algebra on free vector spaces
 	</longdescription>
 	<use>
-		<flag name="template-haskell">You can disable the use of the
-  `template-haskell` package using `-f-template-haskell`. Disabling this is an
-  unsupported configuration, but it may be useful for accelerating builds in
-  sandboxes for expert users.</flag>
+		<flag name="template-haskell">
+			You can disable the use of the
+			`template-haskell` package using `-f-template-haskell`. Disabling this is an
+			unsupported configuration, but it may be useful for accelerating builds in
+			sandboxes for expert users.
+		</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">ekmett/linear</remote-id>
diff --git a/dev-haskell/monad-control/metadata.xml b/dev-haskell/monad-control/metadata.xml
index 11bac49d2aa7..7edd4dbbacf6 100644
--- a/dev-haskell/monad-control/metadata.xml
+++ b/dev-haskell/monad-control/metadata.xml
@@ -13,26 +13,28 @@
 		in the @transformers@ library except @ContT@.  For convenience, it
 		provides a wrapped version of @Control.Exception@ with types
 		generalized from @IO@ to all monads in @MonadControlIO@.
-		
+
 		Note that this package is a rewrite of Anders Kaseorg's @monad-peel@ library.
 		The main difference is that this package provides CPS style
 		operators and exploits the @RankNTypes@ language extension to
 		simplify most definitions.
-		
+
 		The package includes a copy of the @monad-peel@ testsuite written by Anders Kaseorg.
 		The tests can be performed by using @cabal test@.
-		
+
 		The following @critertion@ based benchmark shows that @monad-control@
 		is on average about 2.5 times faster than @monad-peel@:
-		
+
 		&lt;https://github.com/basvandijk/bench-monad-peel-control&gt;
 	</longdescription>
 	<use>
-		<flag name="instancest">If enabled this package will export
-                MonadBaseControl instances for the lazy and strict ST monad. If disabled these
-                instances are only exported when base &gt;= 4.4. If enabled it is required that
-                the transformer-base package exports MonadBase instances for ST. It will do
-                this by default.</flag>
+		<flag name="instancest">
+			If enabled this package will export
+			MonadBaseControl instances for the lazy and strict ST monad. If disabled these
+			instances are only exported when base &gt;= 4.4. If enabled it is required that
+			the transformer-base package exports MonadBase instances for ST. It will do
+			this by default.
+		</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">basvandijk/monad-control</remote-id>
diff --git a/dev-haskell/nats/metadata.xml b/dev-haskell/nats/metadata.xml
index 78af22829226..1c6077508d48 100644
--- a/dev-haskell/nats/metadata.xml
+++ b/dev-haskell/nats/metadata.xml
@@ -9,10 +9,12 @@
 		Haskell 98 natural numbers
 	</longdescription>
 	<use>
-		<flag name="hashable">You can disable the use of the `hashable` package using
-                USE=-hashable. Disabling this is an unsupported configuration, but it may be
-                useful for accelerating builds in sandboxes for expert users. If set we will
-                not supply an instance of `Hashable`.</flag>
+		<flag name="hashable">
+			You can disable the use of the `hashable` package using
+			USE=-hashable. Disabling this is an unsupported configuration, but it may be
+			useful for accelerating builds in sandboxes for expert users. If set we will
+			not supply an instance of `Hashable`.
+		</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">ekmett/nats</remote-id>
diff --git a/dev-haskell/persistent-sqlite/metadata.xml b/dev-haskell/persistent-sqlite/metadata.xml
index 09f6ce2d0ce1..8db950fedcee 100644
--- a/dev-haskell/persistent-sqlite/metadata.xml
+++ b/dev-haskell/persistent-sqlite/metadata.xml
@@ -2,13 +2,13 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
-          <email>haskell@gentoo.org</email>
-          <name>Gentoo Haskell</name>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
 	</maintainer>
 	<longdescription>
 		This package includes a thin sqlite3 wrapper based on the direct-sqlite package, as well as the entire C library, so there are no system dependencies.
 	</longdescription>
 	<use>
-	  <flag name="build-sanity-exe">Build a sanity check test executable.</flag>
+		<flag name="build-sanity-exe">Build a sanity check test executable.</flag>
 	</use>
 </pkgmetadata>
diff --git a/dev-haskell/sandi/metadata.xml b/dev-haskell/sandi/metadata.xml
index 30f55d34263f..7f88c7da76c1 100644
--- a/dev-haskell/sandi/metadata.xml
+++ b/dev-haskell/sandi/metadata.xml
@@ -2,13 +2,13 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
-                <email>haskell@gentoo.org</email>
-                <name>Gentoo Haskell</name>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
 	</maintainer>
 	<longdescription>
 		Reasonably fast data encoding library.
 	</longdescription>
 	<use>
-                <flag name="with-conduit">Build with conduit</flag>
+		<flag name="with-conduit">Build with conduit</flag>
 	</use>
 </pkgmetadata>
diff --git a/dev-haskell/scientific/metadata.xml b/dev-haskell/scientific/metadata.xml
index c0f46257525f..af4a88b17cb6 100644
--- a/dev-haskell/scientific/metadata.xml
+++ b/dev-haskell/scientific/metadata.xml
@@ -8,11 +8,11 @@
 	<longdescription>
 		A @Scientific@ number is an arbitrary-precision floating-point number
 		represented using scientific notation.
-		
+
 		A scientific number with 'coefficient' @c@ and
 		'base10Exponent' @e@ corresponds to the
 		'Fractional' number: @'fromInteger' c * 10 '^^' e@
-		
+
 		Its primary use-case is to serve as the target of
 		parsing floating point numbers. Since the textual
 		representation of floating point numbers use
@@ -20,8 +20,10 @@
 		parsed to a @Scientific@ number.
 	</longdescription>
 	<use>
-		<flag name="bytestring-builder">Provide the
-          Data.ByteString.Builder.Scientific module (requires bytestring &gt;= 0.10).</flag>
+		<flag name="bytestring-builder">
+			Provide the Data.ByteString.Builder.Scientific
+			module (requires bytestring &gt;= 0.10).
+		</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">basvandijk/scientific</remote-id>
diff --git a/dev-haskell/semigroupoid-extras/metadata.xml b/dev-haskell/semigroupoid-extras/metadata.xml
index 0ee68765138c..0ba1bc3ea5c9 100644
--- a/dev-haskell/semigroupoid-extras/metadata.xml
+++ b/dev-haskell/semigroupoid-extras/metadata.xml
@@ -9,10 +9,12 @@
 		Semigroupoids and semigroupoid operations requiring Haskell extensions
 	</longdescription>
 	<use>
-		<flag name="profunctors">You can disable the use of the
-                `profunctors` package using `-f-profunctors`. Disabing this is
-                an unsupported configuration, but it may be useful for
-                accelerating builds in sandboxes for expert users.</flag>
+		<flag name="profunctors">
+			You can disable the use of the
+			`profunctors` package using `-f-profunctors`. Disabing this is
+			an unsupported configuration, but it may be useful for
+			accelerating builds in sandboxes for expert users.
+		</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">ekmett/semigroupoid-extras</remote-id>
diff --git a/dev-haskell/semigroupoids/metadata.xml b/dev-haskell/semigroupoids/metadata.xml
index f7fae28fcf66..d6c06edca015 100644
--- a/dev-haskell/semigroupoids/metadata.xml
+++ b/dev-haskell/semigroupoids/metadata.xml
@@ -7,18 +7,18 @@
 	</maintainer>
 	<longdescription>
 		Provides a wide array of semigroupoids and operations for working with semigroupds.
-		
+
 		A Semigroupoid is a Category without the requirement of identity arrows for every object in the category.
-		
+
 		When working with comonads you often have the @\&lt;*\&gt;@ portion of an @Applicative@, but
 		not the @pure@. This was captured in Uustalu and Vene's \"Essence of Dataflow Programming\"
 		in the form of the @ComonadZip@ class in the days before @Applicative@. Apply provides a weaker invariant, but for the comonads used for data flow programming (found in the streams package), this invariant is preserved. Applicative function composition forms a semigroupoid.
-		
+
 		Similarly many structures are nearly a comonad, but not quite, for instance lists provide a reasonable 'extend' operation in the form of 'tails', but do not always contain a value.
-		
-		
+
+
 		Ideally the following relationships would hold:
-		
+
 		&gt; Traversable &lt;---- Foldable &lt;--- Functor ------&gt; Alt ---------&gt; Plus           Semigroupoid
 		&gt;      |               |            |                              |                  |
 		&gt;      v               v            v                              v                  v
@@ -27,36 +27,46 @@
 		&gt;                                   v               v              v                  v
 		&gt;                                 Bind ---------&gt; Monad -------&gt; MonadPlus          Arrow
 		&gt;
-		
+
 		Apply, Bind, and Extract give rise the Static, Kleisli and Cokleisli semigroupoids respectively.
-		
+
 		This lets us remove many of the restrictions from various monad transformers
 		as in many cases the binding operation or @\&lt;*\&gt;@ operation does not require them.
-		
+
 		Finally, to work with these weaker structures it is beneficial to have containers
 		that can provide stronger guarantees about their contents, so versions of 'Traversable'
 		and 'Foldable' that can be folded with just a 'Semigroup' are added.
 	</longdescription>
 	<use>
-		<flag name="comonad">You can disable the use of the `comonad` package using
-  `-f-comonad`. Disabling this is an unsupported configuration, but it may be
-  useful for accelerating builds in sandboxes for expert users. If disabled we
-  will not supply instances of `Comonad`</flag>
-		<flag name="containers">You can disable the use of the `containers` package
-  using `-f-containers`. Disabing this is an unsupported configuration, but it
-  may be useful for accelerating builds in sandboxes for expert users.</flag>
-		<flag name="contravariant">You can disable the use of the `contravariant`
-  package using `-f-contravariant`. Disabling this is an unsupported
-  configuration, but it may be useful for accelerating builds in sandboxes for
-  expert users. If disabled we will not supply instances of `Contravariant`</flag>
-		<flag name="distributive">You can disable the use of the `distributive`
-  package using `-f-distributive`. Disabling this is an unsupported
-  configuration, but it may be useful for accelerating builds in sandboxes for
-  expert users. If disabled we will not supply instances of `Distributive`</flag>
-		<flag name="tagged">You can disable the use of the `tagged` package
-  using `-f-tagged`. Disabing this is an unsupported
-  configuration, but it may be useful for accelerating builds in
-  sandboxes for expert users.</flag>
+		<flag name="comonad">
+			You can disable the use of the `comonad` package using
+			`-f-comonad`. Disabling this is an unsupported configuration, but it may be
+			useful for accelerating builds in sandboxes for expert users. If disabled we
+			will not supply instances of `Comonad`
+		</flag>
+		<flag name="containers">
+			You can disable the use of the `containers` package
+			using `-f-containers`. Disabing this is an unsupported configuration, but it
+			may be useful for accelerating builds in sandboxes for expert users.
+		</flag>
+		<flag name="contravariant">
+			You can disable the use of the `contravariant`
+			package using `-f-contravariant`. Disabling this is an unsupported
+			configuration, but it may be useful for accelerating builds in sandboxes for
+			expert users. If disabled we will not supply instances of `Contravariant`
+		</flag>
+		<flag name="distributive">
+			You can disable the use of the `distributive`
+			package using `-f-distributive`. Disabling this is an unsupported
+			configuration, but it may be useful for accelerating builds in sandboxes for
+			expert users. If disabled we will not supply instances of `Distributive`
+		</flag>
+		<flag name="tagged">
+			You can disable the use of the `tagged` package
+			using `-f-tagged`. Disabing this is an unsupported
+			configuration, but it may be useful for accelerating builds in
+			sandboxes for expert users.
+		</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">ekmett/semigroupoids</remote-id>
diff --git a/dev-haskell/shakespeare-js/metadata.xml b/dev-haskell/shakespeare-js/metadata.xml
index 290bdaf07ede..7e754854eb91 100644
--- a/dev-haskell/shakespeare-js/metadata.xml
+++ b/dev-haskell/shakespeare-js/metadata.xml
@@ -2,22 +2,22 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
-        <email>haskell@gentoo.org</email>
-        <name>Gentoo Haskell</name>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
 	</maintainer>
 	<longdescription>
 		Shakespeare is a template family for type-safe, efficient templates with simple variable interpolation . Shakespeare templates can be used inline with a quasi-quoter or in an external file. Shakespeare interpolates variables according to the type being inserted.
 		In this case, the variable type needs a ToJavascript instance.
-		
+
 		There is also shakespeare-coffeescript for coffeescript templates. Coffescript is a language that compiles down to javascript. It expects a coffeescript compiler in your path, and variable should be a ToCoffee instance.
-		
+
 		Please see http://docs.yesodweb.com/book/templates for a more thorough description and examples
-		
+
 		shakespeare-js was originally called julius, and shakespeare originated from the hamlet template package.
 	</longdescription>
 	<use>
 		<flag name="test_coffee">Test coffee.</flag>
 		<flag name="test_export">Test export.</flag>
 		<flag name="test_roy">Test roy.</flag>
-        </use>
+	</use>
 </pkgmetadata>
diff --git a/dev-haskell/shakespeare/metadata.xml b/dev-haskell/shakespeare/metadata.xml
index addd675c419d..4628e04a14a6 100644
--- a/dev-haskell/shakespeare/metadata.xml
+++ b/dev-haskell/shakespeare/metadata.xml
@@ -2,14 +2,14 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
-        <email>haskell@gentoo.org</email>
-        <name>Gentoo Haskell</name>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
 	</maintainer>
 	<longdescription>
 		Shakespeare is a template family for type-safe, efficient templates with simple variable interpolation . Shakespeare templates can be used inline with a quasi-quoter or in an external file. Shakespeare interpolates variables according to the type being inserted.
-		
+
 		Note there is no dependency on haskell-src-extras.
-		
+
 		packages that use this: shakespeare-js, shakespeare-css, shakespeare-interpolated, hamlet, and xml-hamlet
 		Please see the documentation at &lt;http://docs.yesodweb.com/book/hamlet/&gt; for more details.
 	</longdescription>
@@ -17,5 +17,5 @@
 		<flag name="test_export">Test export.</flag>
 		<flag name="test_coffee">Render tests through coffeescript render function.</flag>
 		<flag name="test_roy">Render tests through roy render function.</flag>
-        </use>
+	</use>
 </pkgmetadata>
diff --git a/dev-haskell/skein/metadata.xml b/dev-haskell/skein/metadata.xml
index aa8d85a88b16..155e664ff75c 100644
--- a/dev-haskell/skein/metadata.xml
+++ b/dev-haskell/skein/metadata.xml
@@ -10,26 +10,23 @@
 		secure cryptographic hash functions designed by Niels
 		Ferguson, Stefan Lucks, Bruce Schneier, Doug Whiting, Mihir
 		Bellare, Tadayoshi Kohno, Jon Callas and Jesse Walker.
-		
+
 		This package uses bindings to the optimized C implementation
 		of Skein.  We provide a high-level interface (see module
 		"Crypto.Skein") to some of the Skein use cases.  We also
 		provide a low-level interface (see module
 		"Crypto.Skein.Internal") should you need to use Skein in a
 		different way.
-		
+
 		Currently we have support for Skein as cryptographic hash
 		function as Skein as a message authentication code
 		(Skein-MAC).  For examples of how to use this package, see
 		"Crypto.Skein" module documentation.
 	</longdescription>
 	<use>
-		<flag name="big-endian">When manually selecting the
-                endianness, use big-endian (default is little-endian).</flag>
-		<flag name="force-endianness">Use a manually selected endian
-                when compiling (see flag 'big-endian').</flag>
-		<flag name="reference">Use the reference implementation
-                instead of the optimized one.</flag>
+		<flag name="big-endian">When manually selecting the endianness, use big-endian (default is little-endian)</flag>
+		<flag name="force-endianness">Use a manually selected endian when compiling (see flag 'big-endian')</flag>
+		<flag name="reference">Use the reference implementation instead of the optimized one</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">meteficha/skein</remote-id>
diff --git a/dev-haskell/tasty-quickcheck/metadata.xml b/dev-haskell/tasty-quickcheck/metadata.xml
index fe29b3c7b506..788d4f1313c5 100644
--- a/dev-haskell/tasty-quickcheck/metadata.xml
+++ b/dev-haskell/tasty-quickcheck/metadata.xml
@@ -2,13 +2,13 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
-  <email>haskell@gentoo.org</email>
-  <name>Gentoo Haskell</name>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
 	</maintainer>
 	<longdescription>
 		QuickCheck support for the Tasty test framework.
 	</longdescription>
-<use>
-  <flag name="old-quickcheck">Use Quick-Check &lt; 2.7.</flag>
-</use>
+	<use>
+		<flag name="old-quickcheck">Use Quick-Check &lt; 2.7.</flag>
+	</use>
 </pkgmetadata>
diff --git a/dev-haskell/vector/metadata.xml b/dev-haskell/vector/metadata.xml
index 8d7aed4adc3b..fac2f4dc8e54 100644
--- a/dev-haskell/vector/metadata.xml
+++ b/dev-haskell/vector/metadata.xml
@@ -6,72 +6,68 @@
 		<name>Gentoo Haskell</name>
 	</maintainer>
 	<longdescription>
-		
 		An efficient implementation of Int-indexed arrays (both mutable
 		and immutable), with a powerful loop optimisation framework .
-		
+
 		It is structured as follows:
-		
+
 		["Data.Vector"] Boxed vectors of arbitrary types.
-		
+
 		["Data.Vector.Unboxed"] Unboxed vectors with an adaptive
 		representation based on data type families.
-		
+
 		["Data.Vector.Storable"] Unboxed vectors of 'Storable' types.
-		
+
 		["Data.Vector.Primitive"] Unboxed vectors of primitive types as
 		defined by the @primitive@ package. "Data.Vector.Unboxed" is more
 		flexible at no performance cost.
-		
+
 		["Data.Vector.Generic"] Generic interface to the vector types.
-		
+
 		Each module has a @Safe@ version with is marked as @Trustworthy@
 		(see &lt;http://hackage.haskell.org/trac/ghc/wiki/SafeHaskell&gt;).
-		
+
 		There is also a (draft) tutorial on common uses of vector.
-		
+
 		* &lt;http://haskell.org/haskellwiki/Numeric_Haskell:_A_Vector_Tutorial&gt;
-		
+
 		Please use the project trac to submit bug reports and feature
 		requests.
-		
+
 		* &lt;http://trac.haskell.org/vector&gt;
-		
+
 		Changes in version 0.9
-		
+
 		* 'MonadPlus' instance for boxed vectors
-		
+
 		* Export more @construct@ and @constructN@ from @Safe@ modules
-		
+
 		* Require @primitive-0.4.0.1@
-		
+
 		Changes in version 0.8
-		
+
 		* New functions: @constructN@, @constructrN@
-		
+
 		* Support for GHC 7.2 array copying primitives
-		
+
 		* New fixity for @(!)@
-		
+
 		* Safe Haskell support (contributed by David Terei)
-		
+
 		* 'Functor', 'Monad', 'Applicative', 'Alternative', 'Foldable' and
 		'Traversable' instances for boxed vectors
 		(/WARNING: they tend to be slow and are only provided for completeness/)
-		
+
 		* 'Show' instances for immutable vectors follow containers conventions
-		
+
 		* 'Read' instances for all immutable vector types
-		
+
 		* Performance improvements
-		
 	</longdescription>
 	<use>
 		<flag name="boundschecks">Enable bounds checking</flag>
-		<flag name="internalchecks">Enable internal consistency checks at the cost of a
-                significant performance penalty</flag>
-		<flag name="unsafechecks">Enable bounds checking in unsafe operations at the cost of a
-                significant performance penalty</flag>
+		<flag name="internalchecks">Enable internal consistency checks at the cost of a significant performance penalty</flag>
+		<flag name="unsafechecks">Enable bounds checking in unsafe operations at the cost of a significant performance penalty</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">haskell/vector</remote-id>
diff --git a/dev-haskell/wai-app-static/metadata.xml b/dev-haskell/wai-app-static/metadata.xml
index 4639d4c71d33..cb0dd1304272 100644
--- a/dev-haskell/wai-app-static/metadata.xml
+++ b/dev-haskell/wai-app-static/metadata.xml
@@ -2,13 +2,13 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
-        <email>haskell@gentoo.org</email>
-        <name>Gentoo Haskell</name>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
 	</maintainer>
 	<longdescription>
 		Also provides some helper functions and datatypes for use outside of WAI.
 	</longdescription>
 	<use>
 		<flag name="print">print debug info.</flag>
-        </use>
+	</use>
 </pkgmetadata>
diff --git a/dev-haskell/warp/metadata.xml b/dev-haskell/warp/metadata.xml
index 3c26be7177c3..686087ee568d 100644
--- a/dev-haskell/warp/metadata.xml
+++ b/dev-haskell/warp/metadata.xml
@@ -9,8 +9,7 @@
 		The premier WAI handler. For more information, see &lt;http://steve.vinoski.net/blog/2011/05/01/warp-a-haskell-web-server/&gt;.
 	</longdescription>
 	<use>
-		<flag name="allow-sendfilefd">Allow use of sendfileFd (not
-                available on GNU/kFreeBSD).</flag>
+		<flag name="allow-sendfilefd">Allow use of sendfileFd (not available on GNU/kFreeBSD).</flag>
 		<flag name="warp-debug">Add additional debuging information</flag>
 	</use>
 	<upstream>
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index ca9af300859d..7917c2f44283 100644
Binary files a/dev-java/Manifest.gz and b/dev-java/Manifest.gz differ
diff --git a/dev-java/appframework/metadata.xml b/dev-java/appframework/metadata.xml
index 6d7f24baa1b5..d217a05000e5 100644
--- a/dev-java/appframework/metadata.xml
+++ b/dev-java/appframework/metadata.xml
@@ -6,11 +6,11 @@
 		<name>Java</name>
 	</maintainer>
 	<longdescription lang="en">
-		 The JSR-296  Swing Application Framework prototype implementation is a small set of Java classes that simplify building desktop applications. The prototype provides infrastructure that's common to most desktop applications:
+		The JSR-296  Swing Application Framework prototype implementation is a small set of Java classes that simplify building desktop applications. The prototype provides infrastructure that's common to most desktop applications:
 
-    * Application lifecyle, notably GUI startup and shutdown.
-    * Support for managing and loading resources, like strings, formatted messages, images, colors, fonts, and other types common to desktop applications.
-    * Support for defining, managing, and binding Actions, including Actions that run asynchronously (in the "background").
-    * Persistent session state: support for automatically and selectively saving GUI state from one run of an application to the next.
+		* Application lifecyle, notably GUI startup and shutdown.
+		* Support for managing and loading resources, like strings, formatted messages, images, colors, fonts, and other types common to desktop applications.
+		* Support for defining, managing, and binding Actions, including Actions that run asynchronously (in the "background").
+		* Persistent session state: support for automatically and selectively saving GUI state from one run of an application to the next.
 	</longdescription>
 </pkgmetadata>
diff --git a/dev-java/commons-primitives/metadata.xml b/dev-java/commons-primitives/metadata.xml
index b8e7fb848f74..a10f35ee50c8 100644
--- a/dev-java/commons-primitives/metadata.xml
+++ b/dev-java/commons-primitives/metadata.xml
@@ -1,16 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>java@gentoo.org</email>
-	<name>Java</name>
-</maintainer>
-
-<longdescription>
- Apache Jakarta Commons Primitives provides a collection of types and
- utilities optimized for working with Java primitives (boolean, byte,
- char, double, float, int, long, short). Generally, the
- Commons-Primitives classes are smaller, faster and easier to work with
- than their purely Object based alternatives.
-</longdescription>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<longdescription>
+		Apache Jakarta Commons Primitives provides a collection of types and
+		utilities optimized for working with Java primitives (boolean, byte,
+		char, double, float, int, long, short). Generally, the
+		Commons-Primitives classes are smaller, faster and easier to work with
+		than their purely Object based alternatives.
+	</longdescription>
 </pkgmetadata>
diff --git a/dev-java/ezmorph/metadata.xml b/dev-java/ezmorph/metadata.xml
index dc291df04bae..c4670b98a2e4 100644
--- a/dev-java/ezmorph/metadata.xml
+++ b/dev-java/ezmorph/metadata.xml
@@ -6,15 +6,15 @@
 		<name>Java</name>
 	</maintainer>
 	<longdescription lang="en">
-        EZMorph is simple java library for transforming an Object to another Object.
+		EZMorph is simple java library for transforming an Object to another Object.
 
-        EZMorph's key strengths are:
+		EZMorph's key strengths are:
 
-            Supports transformations for primitives and Objects
-            Supports transformations for multidimensional arrays
-            Supports transformations with DynaBeans
-            JDK 1.3.1 compatible
-            Small memory footprint (~76K)
+		Supports transformations for primitives and Objects
+		Supports transformations for multidimensional arrays
+		Supports transformations with DynaBeans
+		JDK 1.3.1 compatible
+		Small memory footprint (~76K)
 	</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">ezmorph</remote-id>
diff --git a/dev-java/icedtea-web/metadata.xml b/dev-java/icedtea-web/metadata.xml
index a073aa0c3e71..50b2caefc775 100644
--- a/dev-java/icedtea-web/metadata.xml
+++ b/dev-java/icedtea-web/metadata.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>java@gentoo.org</email>
-    <name>Java</name>
-  </maintainer>
-  <longdescription>
-    FOSS Java Web Start and optional browser plugin implementation based on NetX, to be used with icedtea.
-  </longdescription>
-  <use>
-    <flag name="javascript">Enable support for using proxy auto config (PAC) files.</flag>
-    <flag name="nsplugin">Enable the browser plugin (NPPlugin).</flag>
-	<flag name="tagsoup">Depend on dev-java/tagsoup which allows parsing malformed .jnlp files</flag>
-  </use>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<longdescription>
+		FOSS Java Web Start and optional browser plugin implementation based on NetX, to be used with icedtea.
+	</longdescription>
+	<use>
+		<flag name="javascript">Enable support for using proxy auto config (PAC) files.</flag>
+		<flag name="nsplugin">Enable the browser plugin (NPPlugin).</flag>
+		<flag name="tagsoup">Depend on dev-java/tagsoup which allows parsing malformed .jnlp files</flag>
+	</use>
 </pkgmetadata>
diff --git a/dev-java/idm-console-framework/metadata.xml b/dev-java/idm-console-framework/metadata.xml
index c4db44265c6b..664e0f4d871a 100644
--- a/dev-java/idm-console-framework/metadata.xml
+++ b/dev-java/idm-console-framework/metadata.xml
@@ -8,13 +8,14 @@
 	</maintainer>
 	<maintainer type="person">
 		<email>wes@sol1.com.au</email>
-			<name>Wes</name>
-		    <description>Proxy maintainer.</description>
-		</maintainer>
+		<name>Wes</name>
+		<description>Proxy maintainer.</description>
+	</maintainer>
 	<maintainer type="project">
-	    <email>proxy-maint@gentoo.org</email>
-	    <name>Proxy Maintainers</name>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
 	</maintainer>
-<longdescription>A Java Management Console framework used for remote server
-	management.</longdescription> 
+	<longdescription>
+		A Java Management Console framework used for remote server management.
+	</longdescription>
 </pkgmetadata>
diff --git a/dev-java/jackson-dataformat-xml/metadata.xml b/dev-java/jackson-dataformat-xml/metadata.xml
index 29d934574ee1..fc7bd29f5460 100644
--- a/dev-java/jackson-dataformat-xml/metadata.xml
+++ b/dev-java/jackson-dataformat-xml/metadata.xml
@@ -6,9 +6,9 @@
 		<name>Java</name>
 	</maintainer>
 	<longdescription>
-	  This projects contains Jackson extension component for reading and writing XML encoded data.
+		This projects contains Jackson extension component for reading and writing XML encoded data.
 
-	  Further, the goal is to emulate how JAXB data-binding works with "Code-first" approach (that is, no support is added for "Schema-first" approach). Support for JAXB annotations is provided by JAXB annotation module; this module provides low-level abstractions (JsonParser, JsonGenerator, JsonFactory) as well as small number of higher level overrides needed to make data-binding work.
+		Further, the goal is to emulate how JAXB data-binding works with "Code-first" approach (that is, no support is added for "Schema-first" approach). Support for JAXB annotations is provided by JAXB annotation module; this module provides low-level abstractions (JsonParser, JsonGenerator, JsonFactory) as well as small number of higher level overrides needed to make data-binding work.
 	</longdescription>
 	<upstream>
 		<remote-id type="github">FasterXML/jackson-dataformat-xml</remote-id>
diff --git a/dev-java/java-service-wrapper/metadata.xml b/dev-java/java-service-wrapper/metadata.xml
index b273b002325c..20395dafad7c 100644
--- a/dev-java/java-service-wrapper/metadata.xml
+++ b/dev-java/java-service-wrapper/metadata.xml
@@ -6,15 +6,15 @@
 		<name>Java</name>
 	</maintainer>
 	<longdescription lang="en">
-		The Java Service Wrapper is an application which has evolved out of a desire 
+		The Java Service Wrapper is an application which has evolved out of a desire
 		to solve a number of problems common to many Java applications:
-		
+
 		* Run as a Windows Service or Unix Daemon
-    	* Application Reliability
-    	* Standard, Out of the Box Scripting
-    	* On Demand Restarts
-    	* Flexible Configuration
-    	* Ease Application Installations
-    	* Logging
+		* Application Reliability
+		* Standard, Out of the Box Scripting
+		* On Demand Restarts
+		* Flexible Configuration
+		* Ease Application Installations
+		* Logging
 	</longdescription>
 </pkgmetadata>
diff --git a/dev-java/jetty-alpn-api/metadata.xml b/dev-java/jetty-alpn-api/metadata.xml
index d0ea9f190876..e7ff4b83b664 100644
--- a/dev-java/jetty-alpn-api/metadata.xml
+++ b/dev-java/jetty-alpn-api/metadata.xml
@@ -8,7 +8,9 @@
 	<upstream>
 		<remote-id type="github">eclipse/jetty.alpn.api</remote-id>
 	</upstream>
-    <longdescription>The Jetty project provides an implementation of the TLS extension for ALPN for OpenJDK 7 and OpenJDK 8. ALPN allows the application layer to negotiate which protocol to use over the secure connection.
+	<longdescription>
+		The Jetty project provides an implementation of the TLS extension for ALPN for OpenJDK 7 and OpenJDK 8. ALPN allows the application layer to negotiate which protocol to use over the secure connection.
 
-Any protocol can be negotiated by ALPN within a TLS connection. The protocols that are most commonly negotiated are HTTP/2 (for browsers that support it) and, historically, SPDY. The ALPN implementation is therefore not HTTP/2 or SPDY specific in any way. Jetty's ALPN implementation, although hosted under the umbrella of the Jetty project, is independent of Jetty (the Servlet Container); you can use the ALPN implementation in any other Java network server.</longdescription>
+		Any protocol can be negotiated by ALPN within a TLS connection. The protocols that are most commonly negotiated are HTTP/2 (for browsers that support it) and, historically, SPDY. The ALPN implementation is therefore not HTTP/2 or SPDY specific in any way. Jetty's ALPN implementation, although hosted under the umbrella of the Jetty project, is independent of Jetty (the Servlet Container); you can use the ALPN implementation in any other Java network server.
+	</longdescription>
 </pkgmetadata>
diff --git a/dev-java/jetty-npn-api/metadata.xml b/dev-java/jetty-npn-api/metadata.xml
index 6aaf1c0d7d08..df60d53575e0 100644
--- a/dev-java/jetty-npn-api/metadata.xml
+++ b/dev-java/jetty-npn-api/metadata.xml
@@ -5,7 +5,9 @@
 		<email>java@gentoo.org</email>
 		<name>Java</name>
 	</maintainer>
-    <longdescription>The Jetty project provides an implementation of the Next Protocol Negotiation TLS Extension (NPN) for OpenJDK 7 or greater. NPN allows the application layer to negotiate which protocol to use over the secure connection.
+	<longdescription>
+		The Jetty project provides an implementation of the Next Protocol Negotiation TLS Extension (NPN) for OpenJDK 7 or greater. NPN allows the application layer to negotiate which protocol to use over the secure connection.
 
-NPN currently negotiates using SPDY as an application level protocol on port 443, and also negotiates the SPDY version. However, NPN is not SPDY specific in any way. Jetty's NPN implementation, although hosted under the umbrella of the Jetty project, is independent of Jetty (the servlet container); you can use it in any other Java network server.</longdescription>
+		NPN currently negotiates using SPDY as an application level protocol on port 443, and also negotiates the SPDY version. However, NPN is not SPDY specific in any way. Jetty's NPN implementation, although hosted under the umbrella of the Jetty project, is independent of Jetty (the servlet container); you can use it in any other Java network server.
+	</longdescription>
 </pkgmetadata>
diff --git a/dev-java/jexcelapi/metadata.xml b/dev-java/jexcelapi/metadata.xml
index cbb59f0a0e7e..3d1e38d960d1 100644
--- a/dev-java/jexcelapi/metadata.xml
+++ b/dev-java/jexcelapi/metadata.xml
@@ -6,10 +6,8 @@
 		<name>Java</name>
 	</maintainer>
 	<longdescription>
-
- Java Excel API is a mature, open source java API enabling developers to read, write, and modifiy Excel spreadsheets dynamically. Now java developers can read Excel spreadsheets, modify them with a convenient and simple API, and write the changes to any output stream (e.g. disk, HTTP, database, or any socket).
-	
-</longdescription>
+		Java Excel API is a mature, open source java API enabling developers to read, write, and modifiy Excel spreadsheets dynamically. Now java developers can read Excel spreadsheets, modify them with a convenient and simple API, and write the changes to any output stream (e.g. disk, HTTP, database, or any socket).
+	</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">jexcelapi</remote-id>
 	</upstream>
diff --git a/dev-java/metadata-extractor/metadata.xml b/dev-java/metadata-extractor/metadata.xml
index 3d82341578d3..9ad285ab6075 100644
--- a/dev-java/metadata-extractor/metadata.xml
+++ b/dev-java/metadata-extractor/metadata.xml
@@ -6,13 +6,13 @@
 		<name>Java</name>
 	</maintainer>
 	<longdescription>
-	  metadata-extractor is a straightforward Java library for reading metadata from image files.
+		metadata-extractor is a straightforward Java library for reading metadata from image files.
 
-	  Metadata metadata = ImageMetadataReader.readMetadata(imagePath);
+		Metadata metadata = ImageMetadataReader.readMetadata(imagePath);
 
-	  With that metadata object, you can iterate or query the various tag values that were read from the image.
+		With that metadata object, you can iterate or query the various tag values that were read from the image.
 
-	  The library understands several formats of metadata, many of which may be present in a single image.
+		The library understands several formats of metadata, many of which may be present in a single image.
 	</longdescription>
 	<upstream>
 		<remote-id type="github">drewnoakes/metadata-extractor</remote-id>
diff --git a/dev-java/mimepull/metadata.xml b/dev-java/mimepull/metadata.xml
index ba80f7d6663d..b06e421248fc 100644
--- a/dev-java/mimepull/metadata.xml
+++ b/dev-java/mimepull/metadata.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>java@gentoo.org</email>
-    <name>Java</name>
-  </maintainer>
-  <longdescription lang="en">
-    This provides a streaming API to access attachments parts in a MIME message.
-	Often times, a large MIME message cannot be loaded into memory. Hence the
-	whole message or attachment parts are written to a file system and access to
-	the attachment parts is provided using those files.
-  </longdescription>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<longdescription lang="en">
+		This provides a streaming API to access attachments parts in a MIME message.
+		Often times, a large MIME message cannot be loaded into memory. Hence the
+		whole message or attachment parts are written to a file system and access to
+		the attachment parts is provided using those files.
+	</longdescription>
 </pkgmetadata>
diff --git a/dev-java/pdfbox/metadata.xml b/dev-java/pdfbox/metadata.xml
index 82ef400a70ab..0282d9706df5 100644
--- a/dev-java/pdfbox/metadata.xml
+++ b/dev-java/pdfbox/metadata.xml
@@ -5,7 +5,9 @@
 		<email>java@gentoo.org</email>
 		<name>Java</name>
 	</maintainer>
-    <longdescription>The Apache PDFBox™ library is an open source Java tool for working with PDF documents. This project allows creation of new PDF documents, manipulation of existing documents and the ability to extract content from documents. Apache PDFBox also includes several command line utilities.</longdescription>
+	<longdescription>
+		The Apache PDFBox™ library is an open source Java tool for working with PDF documents. This project allows creation of new PDF documents, manipulation of existing documents and the ability to extract content from documents. Apache PDFBox also includes several command line utilities.
+	</longdescription>
 	<upstream>
 		<remote-id type="github">apache/pdfbox</remote-id>
 	</upstream>
diff --git a/dev-java/xml-commons/metadata.xml b/dev-java/xml-commons/metadata.xml
index 7931bd4ad40e..aa326dec0d1e 100644
--- a/dev-java/xml-commons/metadata.xml
+++ b/dev-java/xml-commons/metadata.xml
@@ -1,21 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>java@gentoo.org</email>
-	<name>Java</name>
-</maintainer>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<longdescription>
+		These are some of the components that are provided by the Apache XML Commons
+		project.
 
-<longdescription>
-
-These are some of the components that are provided by the Apache XML Commons
-project.
-
- * Resolver - An XML Entity and URI Resolver donated by Norman Walsh.
- * Which - A simple environment checking utility for Apache projects by Shane
-   Curcuru
- * External Interfaces (xml-apis) - An Apache-hosted set of externally-defined
-   standards interfaces, namely DOM, SAX, and JAXP.
-
-</longdescription>
+		* Resolver - An XML Entity and URI Resolver donated by Norman Walsh.
+		* Which - A simple environment checking utility for Apache projects by Shane Curcuru
+		* External Interfaces (xml-apis) - An Apache-hosted set of externally-defined standards interfaces, namely DOM, SAX, and JAXP.
+	</longdescription>
 </pkgmetadata>
diff --git a/dev-java/xmlrpc/metadata.xml b/dev-java/xmlrpc/metadata.xml
index 0f98dc1259cc..535c71949d07 100644
--- a/dev-java/xmlrpc/metadata.xml
+++ b/dev-java/xmlrpc/metadata.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>java@gentoo.org</email>
-	<name>Java</name>
-</maintainer>
-<longdescription>
-  Apache XML-RPC (previously known as Helma XML-RPC) is a Java
-  implementation of XML-RPC, a popular protocol that uses XML over
-  HTTP to implement remote procedure calls.
-</longdescription>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<longdescription>
+		Apache XML-RPC (previously known as Helma XML-RPC) is a Java
+		implementation of XML-RPC, a popular protocol that uses XML over
+		HTTP to implement remote procedure calls.
+	</longdescription>
 </pkgmetadata>
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 2e19fa0a5ab9..a0fdad71a266 100644
Binary files a/dev-lang/Manifest.gz and b/dev-lang/Manifest.gz differ
diff --git a/dev-lang/cilk/metadata.xml b/dev-lang/cilk/metadata.xml
index f57da6f6b282..c8b5e5c42150 100644
--- a/dev-lang/cilk/metadata.xml
+++ b/dev-lang/cilk/metadata.xml
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>sci@gentoo.org</email>
-	<name>Gentoo Science Project</name>
-</maintainer>
-<longdescription lang="en">
-  Cilk is a language for multithreaded parallel programming based on
-  ANSI C. Cilk is especially effective for exploiting dynamic, highly
-  asynchronous parallelism, which can be difficult to write in data-parallel or
-  message-passing style. Cilk provides an effective platform for
-  programming dense and sparse numerical algorithms, such as matrix
-  factorization and N-body simulations. Cilk is algorithmic, in that
-  the runtime system employs a scheduler that allows the performance
-  of programs to be estimated accurately based on abstract complexity
-  measures.
-</longdescription>
+	<maintainer type="project">
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
+	<longdescription lang="en">
+		Cilk is a language for multithreaded parallel programming based on
+		ANSI C. Cilk is especially effective for exploiting dynamic, highly
+		asynchronous parallelism, which can be difficult to write in data-parallel or
+		message-passing style. Cilk provides an effective platform for
+		programming dense and sparse numerical algorithms, such as matrix
+		factorization and N-body simulations. Cilk is algorithmic, in that
+		the runtime system employs a scheduler that allows the performance
+		of programs to be estimated accurately based on abstract complexity
+		measures.
+	</longdescription>
 </pkgmetadata>
diff --git a/dev-lang/f2c/metadata.xml b/dev-lang/f2c/metadata.xml
index 1e43be760193..52a68bb17fdb 100644
--- a/dev-lang/f2c/metadata.xml
+++ b/dev-lang/f2c/metadata.xml
@@ -6,13 +6,13 @@
 		<name>Gentoo Science Project</name>
 	</maintainer>
 	<longdescription lang="en">
-  F2C compiles FORTRAN 77 sources by converting to C/C++ sources and
-  compiling the later with gcc. The resulting binaries depend on the
-  libf2c runtime library.
-</longdescription>
+		F2C compiles FORTRAN 77 sources by converting to C/C++ sources and
+		compiling the later with gcc. The resulting binaries depend on the
+		libf2c runtime library.
+	</longdescription>
 	<longdescription lang="de">
-  F2C kompiliert FORTRAN 77 Quellcode durch Konvertierung in C/C++
-  Quellcode und deren anschließendes Kompilieren mit Hilfe von gcc. Die
-  produzierten Binärdateien benötigen die Laufzeitbibliothek libf2c.
-</longdescription>
+		F2C kompiliert FORTRAN 77 Quellcode durch Konvertierung in C/C++
+		Quellcode und deren anschließendes Kompilieren mit Hilfe von gcc. Die
+		produzierten Binärdateien benötigen die Laufzeitbibliothek libf2c.
+	</longdescription>
 </pkgmetadata>
diff --git a/dev-lang/gdl/metadata.xml b/dev-lang/gdl/metadata.xml
index 7831d55c1928..3257bdf3c4cc 100644
--- a/dev-lang/gdl/metadata.xml
+++ b/dev-lang/gdl/metadata.xml
@@ -6,10 +6,10 @@
 		<name>Gentoo Science Project</name>
 	</maintainer>
 	<longdescription lang="en">
-  A free IDL (Interactive Data Language) compatible incremental compiler
-  (ie. runs IDL programs). IDL is a registered trademark of ITT Visual 
-  Information Solutions.
-</longdescription>
+		A free IDL (Interactive Data Language) compatible incremental compiler
+		(ie. runs IDL programs). IDL is a registered trademark of ITT Visual
+		Information Solutions.
+	</longdescription>
 	<use>
 		<flag name="eigen">Build matrix manipulation with <pkg>dev-cpp/eigen</pkg></flag>
 		<flag name="hdf">Add support for the Hierarchical Data Format v.4</flag>
diff --git a/dev-lang/gnat-gpl/Manifest b/dev-lang/gnat-gpl/Manifest
index 3752c9a93825..f60bded56f33 100644
--- a/dev-lang/gnat-gpl/Manifest
+++ b/dev-lang/gnat-gpl/Manifest
@@ -1,7 +1,7 @@
 DIST ecj-4.5.jar 1470676 BLAKE2B 793c10ba09fd8040c0e1181204141aea16780c9c9088e07126e00da2b510af2ad6f58d876357d7e98cbb02d783a3be434469d5de1df134ccb8cc508e45028d80 SHA512 d4e1bf7538ace56e3d69fa91da5bbd16c272923b4de0a9d8dee23ea2b75f9f38c603de72fc4061df49285c450b63f3df211cee5270e9fffc5447445d1a9c9e4e
 DIST gcc-4.4.3-specs-0.2.0.tar.bz2 2004 BLAKE2B 96f5ba2028bc6e0ef71e009857c37118a54d13d30de24d697c85e5772f9f2b7853615648cf2e4ee81d8385f6518c64588c0b56675c00f95ef39fca2a808f075e SHA512 779ecb0a064d2138b54569c8ae501975b8a6b72e5a3acbf8597619a8db77ee42ef9b0e62608d5192a15e4393e7dfc009bb50b994782236faa744b2c46b5fe517
 DIST gcc-4.9-gpl-2016-src.tar.gz 76361760 BLAKE2B 681aac3dd2e04110f58637cc9fe1eb663ce55af16a929a446eb59ce338bec9357e65517890f7fa01d61eec9c5041336722b2b94a5fea27a55ade686fe1fe9fbc SHA512 da1e26b4dbbe0ec634eab4e64d1cdb2632300c24f0885bc72fb57edba6ce29ab92b04eaedd8f8077ea623f1ef1428f53616e8c8d6630328d9790d968b60c67cf
-DIST gcc-4.9.4-patches-1.0.tar.bz2 22266 BLAKE2B 38536e8a86a8296754311633b73da0bd7dddb3a6ac65e4b5ba1dde352789e9114a1129aad11bcb988a1baadec6fdf893290c6af83bb9fad5613f35a37ebbb12e SHA512 cc2407221f858bad38b57d31f635314f91794293695e23d255685d8bec20b9db19c7dc76bbf5e8184c2ba0ccb530958b09bae4d8a402ca27cadf463f46bfb995
+DIST gcc-4.9.4-patches-1.2.tar.bz2 25447 BLAKE2B 3141897688409c84cab4ffea67deb220d2218107f279a0cc1758d08c858f3a3856150df48ae37d2f14c6f69bc82de1e87f22cc356f179dfdf47ae9eef28a4182 SHA512 61b1e86e8dbc2838e7b5c88c4a3bab9ed5b6485258b7971799850ffd97cb67ad2564552af4e9ebc860dcc2a4b786c91d2079469468fb95f8e28e2fc981b4c812
 DIST gcc-4.9.4-piepatches-v0.6.4.tar.bz2 14414 BLAKE2B 2eccd4f2a164fbb32d13c7fe91627a2424c0a5570fe0cac97c2bb1c95294ba3d770832da7c445f75c91791466c5139a1e13753a3a40d87ff5e44e42749adee27 SHA512 243fa272ea0e49f700a76508bab3e03bbb353bcb930581b2f87f9a47df5cd3880e29f20b71612b21190adc463849e1e6ac2a38a49c0002b562d93d436f538285
 DIST gcc-4.9.4-uclibc-patches-1.0.tar.bz2 2618 BLAKE2B bff85a4088fb94fdb7a8b0bd552be98ace3e6d145889b6f8b4a1f2db2dad14342d155890ab159b42d5b55d88dfb7c392eb7f92590084e1958f6284c561da30f1 SHA512 5a1f44caa9261f4947101379628143869b31dec67fa28605e8e1f3894d4b7120c3f68ba6deb59da7a74fa906e27ab32cd3767761837dc3dfebc37865d349d6db
 DIST gcc-4.9.4.tar.bz2 90097606 BLAKE2B 373ff939ea72d6c4a7f3ab899b852b4c919481af2cfe3291281d9354c58a270d2eba73a0f301d90840dfabf423c82b368e113df7a2cb6cc28b2a703b0b6eb585 SHA512 93abb78e16277454f41a8e9810f41f66c0fdffdc539a762ff6b67d3037f78db971378683fd2ebf707d1d51c059fad2161fe42d110c330027f40214b7db0f3efe
diff --git a/dev-lang/gnat-gpl/files/gnat-gpl-2016-bootstrap.patch b/dev-lang/gnat-gpl/files/gnat-gpl-2016-bootstrap.patch
new file mode 100644
index 000000000000..aed1ad0e90be
--- /dev/null
+++ b/dev-lang/gnat-gpl/files/gnat-gpl-2016-bootstrap.patch
@@ -0,0 +1,66 @@
+From 41a4aa66eac45c8862a79351647ec06dd03bd1f5 Mon Sep 17 00:00:00 2001
+From: jakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4>
+Date: Sat, 13 Dec 2014 11:24:37 +0000
+Subject: [PATCH] 	PR bootstrap/64023 	* Makefile.tpl
+ (EXTRA_TARGET_FLAGS): Set STAGE1_LDFLAGS 	to POSTSTAGE1_LDFLAGS and
+ STAGE1_LIBS to POSTSTAGE1_LIBS. 	Add -B to libstdc++-v3/src/.libs and
+ libstdc++-v3/libsupc++/.libs 	to CXX. 	* Makefile.in: Regenerated.
+
+git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@218705 138bc75d-0d04-0410-961f-82ee72b054a4
+---
+ ChangeLog    | 9 +++++++++
+ Makefile.in  | 6 +++++-
+ Makefile.tpl | 6 +++++-
+ 3 files changed, 19 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index ba5ae4c2ecb..8ffc313f157 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -835,7 +835,9 @@ EXTRA_TARGET_FLAGS = \
+ 	'AS=$(COMPILER_AS_FOR_TARGET)' \
+ 	'CC=$$(CC_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \
+ 	'CFLAGS=$$(CFLAGS_FOR_TARGET)' \
+-	'CXX=$$(CXX_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \
++	'CXX=$$(CXX_FOR_TARGET) -B$$r/$$(TARGET_SUBDIR)/libstdc++-v3/src/.libs \
++	 -B$$r/$$(TARGET_SUBDIR)/libstdc++-v3/libsupc++/.libs \
++	 $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \
+ 	'CXXFLAGS=$$(CXXFLAGS_FOR_TARGET)' \
+ 	'DLLTOOL=$$(DLLTOOL_FOR_TARGET)' \
+ 	'GCJ=$$(GCJ_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \
+@@ -853,6 +855,8 @@ EXTRA_TARGET_FLAGS = \
+ 	'WINDRES=$$(WINDRES_FOR_TARGET)' \
+ 	'WINDMC=$$(WINDMC_FOR_TARGET)' \
+ 	'XGCC_FLAGS_FOR_TARGET=$(XGCC_FLAGS_FOR_TARGET)' \
++	'STAGE1_LDFLAGS=$$(POSTSTAGE1_LDFLAGS)' \
++	'STAGE1_LIBS=$$(POSTSTAGE1_LIBS)' \
+ 	"TFLAGS=$$TFLAGS"
+ 
+ TARGET_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)
+diff --git a/Makefile.tpl b/Makefile.tpl
+index dcbc6b1b143..bb8227eaafa 100644
+--- a/Makefile.tpl
++++ b/Makefile.tpl
+@@ -641,7 +641,9 @@ EXTRA_TARGET_FLAGS = \
+ 	'AS=$(COMPILER_AS_FOR_TARGET)' \
+ 	'CC=$$(CC_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \
+ 	'CFLAGS=$$(CFLAGS_FOR_TARGET)' \
+-	'CXX=$$(CXX_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \
++	'CXX=$$(CXX_FOR_TARGET) -B$$r/$$(TARGET_SUBDIR)/libstdc++-v3/src/.libs \
++	 -B$$r/$$(TARGET_SUBDIR)/libstdc++-v3/libsupc++/.libs \
++	 $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \
+ 	'CXXFLAGS=$$(CXXFLAGS_FOR_TARGET)' \
+ 	'DLLTOOL=$$(DLLTOOL_FOR_TARGET)' \
+ 	'GCJ=$$(GCJ_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \
+@@ -659,6 +661,8 @@ EXTRA_TARGET_FLAGS = \
+ 	'WINDRES=$$(WINDRES_FOR_TARGET)' \
+ 	'WINDMC=$$(WINDMC_FOR_TARGET)' \
+ 	'XGCC_FLAGS_FOR_TARGET=$(XGCC_FLAGS_FOR_TARGET)' \
++	'STAGE1_LDFLAGS=$$(POSTSTAGE1_LDFLAGS)' \
++	'STAGE1_LIBS=$$(POSTSTAGE1_LIBS)' \
+ 	"TFLAGS=$$TFLAGS"
+ 
+ TARGET_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)
+-- 
+2.15.0
+
diff --git a/dev-lang/gnat-gpl/gnat-gpl-2016.ebuild b/dev-lang/gnat-gpl/gnat-gpl-2016.ebuild
index 89ff9031378a..8a347c7803b4 100644
--- a/dev-lang/gnat-gpl/gnat-gpl-2016.ebuild
+++ b/dev-lang/gnat-gpl/gnat-gpl-2016.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI="5"
 
-PATCH_VER="1.0"
+PATCH_VER="1.2"
 UCLIBC_VER="1.0"
 
 # Hardened gcc 4 stuff
@@ -48,11 +48,15 @@ DEPEND="${RDEPEND}
 	elibc_glibc? ( >=sys-libs/glibc-2.8 )
 	>=sys-devel/binutils-2.20"
 
+PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.8 )"
+
 S="${WORKDIR}"/${MYP}
 
 FSFGCC=gcc-${TOOLCHAIN_GCC_PV}
 
 pkg_setup() {
+	toolchain_pkg_setup
+
 	if use bootstrap; then
 		GCC="${WORKDIR}"/gnat-gpl-2014-x86_64-linux-bin/bin/gcc
 	else
@@ -120,10 +124,13 @@ src_prepare() {
 		EPATCH_EXCLUDE+=" 10_all_default-fortify-source.patch"
 	fi
 
+	# Bug 638056
+	epatch "${FILESDIR}/${P}-bootstrap.patch"
+
 	toolchain_src_prepare
 
 	use vanilla && return 0
-	#Use -r1 for newer piepatchet that use DRIVER_SELF_SPECS for the hardened specs.
+	# Use -r1 for newer piepatchet that use DRIVER_SELF_SPECS for the hardened specs.
 	[[ ${CHOST} == ${CTARGET} ]] && epatch "${FILESDIR}"/gcc-spec-env-r1.patch
 }
 
diff --git a/dev-lang/gnat-gpl/gnat-gpl-2017.ebuild b/dev-lang/gnat-gpl/gnat-gpl-2017.ebuild
index 50234668a010..445189b6be88 100644
--- a/dev-lang/gnat-gpl/gnat-gpl-2017.ebuild
+++ b/dev-lang/gnat-gpl/gnat-gpl-2017.ebuild
@@ -28,7 +28,7 @@ SRC_URI+="
 
 LICENSE+=" GPL-2 GPL-3"
 SLOT="${TOOLCHAIN_GCC_PV}"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="bootstrap"
 
 RDEPEND="!sys-devel/gcc:${TOOLCHAIN_GCC_PV}"
diff --git a/dev-lang/lazarus/metadata.xml b/dev-lang/lazarus/metadata.xml
index 0b781a1689e0..82e27eadf88f 100644
--- a/dev-lang/lazarus/metadata.xml
+++ b/dev-lang/lazarus/metadata.xml
@@ -1,16 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>amynka@gentoo.org</email>
+	</maintainer>
 	<longdescription lang="en">
 		A Borland Delphi lookalike for linux.
 		Uses the free pascal compiler.
 	</longdescription>
-	<maintainer type="person">
-            <email>amynka@gentoo.org</email>
-        </maintainer>
 	<use>
-		<flag name="minimal">Don't build extra packages from the
-			bigide component</flag>
+		<flag name="minimal">Don't build extra packages from the bigide component</flag>
 	</use>
 	<upstream>
 		<remote-id type="sourceforge">downloads</remote-id>
diff --git a/dev-lang/maude/metadata.xml b/dev-lang/maude/metadata.xml
index 87cb557f086f..2a557bd7618e 100644
--- a/dev-lang/maude/metadata.xml
+++ b/dev-lang/maude/metadata.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>sci@gentoo.org</email>
-	<name>Gentoo Science Project</name>
-</maintainer>
-<longdescription>
-  Maude is a high-performance reflective language and system supporting
-  both equational and rewriting logic specification and programming for a
-  wide range of applications. Maude has been influenced in important ways
-  by the OBJ3 language, which can be regarded as an equational logic
-  sublanguage. Besides supporting equational specification and
-  programming, Maude also supports rewriting logic computation.
-</longdescription>
+	<maintainer type="project">
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
+	<longdescription>
+		Maude is a high-performance reflective language and system supporting
+		both equational and rewriting logic specification and programming for a
+		wide range of applications. Maude has been influenced in important ways
+		by the OBJ3 language, which can be regarded as an equational logic
+		sublanguage. Besides supporting equational specification and
+		programming, Maude also supports rewriting logic computation.
+	</longdescription>
 </pkgmetadata>
diff --git a/dev-lang/ocaml/metadata.xml b/dev-lang/ocaml/metadata.xml
index 720c6c5d8b36..cb5669927300 100644
--- a/dev-lang/ocaml/metadata.xml
+++ b/dev-lang/ocaml/metadata.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>ml@gentoo.org</email>
-	<name>Gentoo ML Project</name>
-</maintainer>
-  <use>
-	<flag name="flambda">Enables the Flambda optimizer: A new intermediate representation (introduced in ocaml 4.03) in the depths of the compiler designed to allow for better inlining.</flag>
-	<flag name="spacetime">Enables the Spacetime memory profiler. See https://caml.inria.fr/pub/docs/manual-ocaml/spacetime.html for more information.</flag>
-  </use>
-  <upstream>
-	  <remote-id type="github">ocaml/ocaml</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>ml@gentoo.org</email>
+		<name>Gentoo ML Project</name>
+	</maintainer>
+	<use>
+		<flag name="flambda">Enables the Flambda optimizer: A new intermediate representation (introduced in ocaml 4.03) in the depths of the compiler designed to allow for better inlining.</flag>
+		<flag name="spacetime">Enables the Spacetime memory profiler. See https://caml.inria.fr/pub/docs/manual-ocaml/spacetime.html for more information.</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">ocaml/ocaml</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-lang/perl/Manifest b/dev-lang/perl/Manifest
index 8150aa526ec1..6a5d9f8e441d 100644
--- a/dev-lang/perl/Manifest
+++ b/dev-lang/perl/Manifest
@@ -1,16 +1,16 @@
-DIST perl-5.24.1-patches-3.tar.xz 24012 SHA256 b8f8164c1fb34c5db82d9f16c5330cdb2d56e283562dd2d684c2abc26e58bf83 SHA512 1af59b80fca8317fe8df171eba6fcc0830c65f94ad7f73bac611877afdd6e5dfe9ce7c67205a860703fcf6c5b87ba14a0163196e1b833a20562525d06b26b6f3 WHIRLPOOL 9d1f7d3050f544d04e413e1c6c4a8cc6bc593a8250dbf45fb166cf92060ea8bb8e4b09bb73a686cce8101395a04c853842588c1c223c903c5b74cedaf68c5d18
-DIST perl-5.24.1.tar.xz 11569284 SHA256 03a77bac4505c270f1890ece75afc7d4b555090b41aa41ea478747e23b2afb3f SHA512 9429608eb4d7f6a01b5a7df8601e0757acdf3e6d5af960d5cf710f8e4fd20ffe082bb42eedc2cd079d5173e48cf5574d55477e1c51f7f53b32fb5d1b89f6db8c WHIRLPOOL 26d401f03af54ba61ea8e761f483f3d374737660fa4beaa3bd77951c0f920f88f9e47f327754c32d4c3c49557882a2a531b9eebef420ad6155d62423f7753406
-DIST perl-5.24.2-patches-1.tar.xz 24012 SHA256 51b1dd61f4907da053558c6aa80de303230ee3348b6c4e7d6b149ee0a7c3e54e SHA512 3576dbce373a17de2de436b6bd33378c9bca899dab71b7448e3c2d1df5ed3d63ea19ad0e0406526b9a75b416585e0da0c32e653e6f76474fbcd66672094d7aaf WHIRLPOOL 2668b0d4ea7c0b4bbddc1c26c2187dc4d9b19d449bde91b522a7f500bcdec2d25ec59110001b9560fc610f9deacdfd8bcbdb2ce979e5ad09c9055c1f78820902
-DIST perl-5.24.2.tar.xz 11570420 SHA256 b25dd465ef32edf853078eb540b26243db0a3b5e1b1cc84393703d9564be67c0 SHA512 d7bb66e23064aba426fe3f7264d065f0926957675b0bba51fe2ddb623561ffcdb7657d9f27d78920a583a21bdee01a7ace37aae6d42c02d32403bd1347ad8df8 WHIRLPOOL 51e2fd19bff64c6d7bd8f40372089d14cc783c3ae17d6788361b3363a497a8e44688e490422b6c327b886eddf2ff0f2aa261c4c0aa76ecfac08ceb62f8d344d4
-DIST perl-5.24.3-patches-1.tar.xz 24016 SHA256 8dc42e629d50ea7193c890cfcd85abaed32db74507b8862c060bf93f5ea82ef4 SHA512 5feddaa14b66c6c5f926a3bee96e2849d829141ee7a6d74cfec68128785fcb8de38e13cfd229c420a9fe6c3a1db4a4bdd52a91aa72726233570f61c73d31f9fd WHIRLPOOL ffe2e5a530683a36d6d546eff0ac13b4b5014365574abe0cc90be9f73219ec3f5bcd3a9c3fa9a5744682d293e9f3a40e9b0bff0a389cf60d00b2b7f7f8fd32f2
-DIST perl-5.24.3.tar.xz 11574740 SHA256 03fe3e4ea39d2a4982703572599a80f3d5f368a1359ed89746ea1d8bec6cfbba SHA512 139c92c0ea0ee7bd5912ad52cc275e0732ceb0865d8b67c301e1fc5a96ae126a26432b4450a2bbc7fe65b8e1dd8adde92ea2cc91ee39cb13ec3c5096e8f787ec WHIRLPOOL 5c8f9234047ccb448373a1dde403d35a4c8f6e320537fad6b011c3650b6e5f8e7a300fc3567a5bd7cbc308266f2db5adcbd8f74b04c87855b058275c74e08bab
-DIST perl-5.25.11-patches-1.tar.xz 16776 SHA256 43dda2f9a20b44442d25caa733ba94acb0c48b26e8201b3f8fa3d2be24a6667e SHA512 ee340824746d3b626b41c76bfa901543869fb9560ef75ff6d338df017e5528e33c344a91ce7cbe9f2fa9e813bf61bbe9eb290433baceb05b832110e746ce9036 WHIRLPOOL 98681898039e1bcc3e9a33498a8b7b8b3f24cc4c49396b33dfd04a853c329323ad47081d64da61ba2880fbd3505e10ffe90367dffa8005bda86c4f114b283934
-DIST perl-5.26.0.tar.xz 11961692 SHA256 9bf2e3d0d72aad77865c3bdbc20d3b576d769c5c255c4ceb30fdb9335266bf55 SHA512 cd5af6495fe4c46c0d5d0f51d4015b54daa221f08a5fb48899c247cb57c2ba85cffb97e6d258d0f931504828bb23e175d899f311c73805d924d1042058ac42e4 WHIRLPOOL 9b87a1fd5371871c747351440e40f5d1345b8bf6ac5810b9ef239e58947fe0c243583fdac6888f0450bdca437b6031cc5281a4e045d5014642ef2dc671e24e47
-DIST perl-5.26.1-RC1.tar.xz 11923212 SHA256 3c52c1092a66ee7c809af53076e1f407e43f52962272d0fd2e95bfb6c70df111 SHA512 036151303704e8d91db8cc22a9c8972499babca112d46f570e4f921fdad1b73919f6d038973896ff3d55b079080c4682609b3f73b962999bc5f5425b7b877084 WHIRLPOOL 99ae7d69509fcd85486beff976f79da03216e2ef1b241080b3d65bbacc343b8fb577082e111f5fd5214c42dd704465efdb2622558ed76fefa1315fe0dec40d3f
-DIST perl-5.26.1.tar.xz 11922848 SHA256 fe8208133e73e47afc3251c08d2c21c5a60160165a8ab8b669c43a420e4ec680 SHA512 13faa7bcd7ed8c490c37e9032c115af06c9b8152b75f8062409dd72d263d1314480e8a9a883490de1b448b2e6d53b6a87d108e2eceb17de2524d5857c6a7d300 WHIRLPOOL 5126e3727ff4b7bd5cc3b0dce4a4a6f1d4c2601af318161981e66407850a08d8731cdb5554af00cd4889978c7564d85f900e526584ebbab0fee6d97b2aebc6d3
-DIST perl-5.27.1-patches-1.tar.xz 16444 SHA256 98e3c57398a3476ff809b98c7a17e52424842ca41499b3ee84b73d90c633ec62 SHA512 c70e033619e1caecb5e5d70e36094bb105f0387a383f7091c763b87ad9f31121c036446e337d44565ce66c9977870c951f2fbd61d34ac1633c18ac9d0b489a13 WHIRLPOOL d211c1b5b3358e8142dd6c6ec9b324db49d1097a0f717168a299e22872d7ff3f9066dace7ac1de935117849445de15f6c3b0afd14afa2750c69d388b83c464d9
-DIST perl-5.27.5.tar.xz 12053340 SHA256 039f4b22cfce13dc6723fd03959ac5035cb6c6255166a5be57882afed0a5778a SHA512 c97859b972c1d89d1d0037d05e5269c368ed06e06a2ad325c7c3a6e407bd5a4c564922112dcb555470eaf14e9439f59ba08d2e04832547596f52ce46c18deb6c WHIRLPOOL 78144c1ecf850b686ac1d16bca08c6034c89ed2c77b5014d12c3297e8ac62c962728fc7c06abe979b0c4706c111cb8cbc2883c31d2df02afecbe162583318046
-DIST perl-cross-1.1.4.tar.gz 94623 SHA256 c840a327d5464ca271cac40d52e2d199330875527bf1003c28a6e550fb7bcc57 SHA512 3bfc108245f0c05b7d45c317eb28c2eb70aba528dfe8a39bc99d6e49b4751f5dca4f4ac661484bfc7528c3e28fcdbd8994c36daa49c25516618fec1f58116d79 WHIRLPOOL c4a150cf15d067cd58db63dae01bbe810808888477f9a2bfcd8557b2eeee097bbf93509bb9128feef84e8a2913724a82de0accc3b9c5d65207ee9dcd2989fe51
-DIST perl-cross-1.1.5.tar.gz 95122 SHA256 0e719e75983b16c7726c2c9462f9498bb1fc4ad38c9f2513a65f3dd34e3decb3 SHA512 344ae0ff3ab8a2ce3fdb0de10972164c8cc14abd9c5c9bf55029bc8a6c2e62b3f9dda88892b1d8d0e30b76f94d42feea1dd5e5c55631f9eb53d1443285e2e3d1 WHIRLPOOL b194d4986511e3483921b11bd264586f1e185df8cd33e408b7f5702403b6dc9e20d0245a60e47e8ee03db8002effccdde48ab7ad1087a9f35ec703b558f699cc
-DIST perl-cross-1.1.6.tar.gz 96075 SHA256 2b3b88f54d85beb438bd2dddd948e2d89461db5ab6253f01b3c2c9ae3ddc30b4 SHA512 4d46ad55093d90da4b0589552d14390efdc6604532ad2b4a3b20a79c69ef3b3cfe0e171b439dfa464bbee2e1fbd92606af6e6584d9355a8476e5b4ada8733653 WHIRLPOOL 78254d35c462758c6fdcc7a0a30668919d2fc0034947900e8e7575deee4932d9659486fa32b938c5ca14332aef99bdf0ec198b301cc8cfb1225a322c8516192c
-DIST perl-cross-1.1.7.tar.gz 97622 SHA256 b79ce9d766b5f527ad7e73cb86d541da88ecbb69a443ee5f14658dd8f9e9415f SHA512 b64d487129b295ec6d996606b8b8559de681e1cf7c3e3167d6d646d5d7a848d7929b1ab698d1f950e265213749772fc74d209cea5020b61e133c8f8851b7cfa0 WHIRLPOOL 92b4c77e9cefeab026c246fc82abbe20a98c7ba20a4cde2e6f32423dbc98777601b39ca147d4bfa03e42530ad5e1fe7e1d18ca10a407bfd258318934a4a93998
+DIST perl-5.24.1-patches-3.tar.xz 24012 BLAKE2B b215bb7800c157d6ef1461bd898be3b51272b4aaa1d9022602eb319d35018c2adf4186a0bf5da2a22120e8176248940887bce828dcb3d19f3ffa804d45994be6 SHA512 1af59b80fca8317fe8df171eba6fcc0830c65f94ad7f73bac611877afdd6e5dfe9ce7c67205a860703fcf6c5b87ba14a0163196e1b833a20562525d06b26b6f3
+DIST perl-5.24.1.tar.xz 11569284 BLAKE2B 0db211fcfda401d6fc6818aa45b024cebc413360dae14948c2c22c3d546e23d160f84382afdd38619e8766281be81e381d296bae9f34e8582db1a41847f2a1bf SHA512 9429608eb4d7f6a01b5a7df8601e0757acdf3e6d5af960d5cf710f8e4fd20ffe082bb42eedc2cd079d5173e48cf5574d55477e1c51f7f53b32fb5d1b89f6db8c
+DIST perl-5.24.2-patches-1.tar.xz 24012 BLAKE2B ad1890707e40e2f7b3ad420473ed85a5ab4eaba1820df1fc222c669b73d9052db54834db749a515a80d2a9eca8fb8ae441bd567e8dc23c0489c70283f98a50a2 SHA512 3576dbce373a17de2de436b6bd33378c9bca899dab71b7448e3c2d1df5ed3d63ea19ad0e0406526b9a75b416585e0da0c32e653e6f76474fbcd66672094d7aaf
+DIST perl-5.24.2.tar.xz 11570420 BLAKE2B 8a81d16c029976d0e251f9a7c1b475bfc2c4dbb7017086f620dc88781549a29a268f35685d1084260f317ea324a9d4acf536ca2c0540597879977a479a7af10f SHA512 d7bb66e23064aba426fe3f7264d065f0926957675b0bba51fe2ddb623561ffcdb7657d9f27d78920a583a21bdee01a7ace37aae6d42c02d32403bd1347ad8df8
+DIST perl-5.24.3-patches-1.tar.xz 24016 BLAKE2B 5eec6c5ddea5fb61b4edad3449e7efdfe546a06bde7421da8d54a64dc8f401cb48b416237c2a01b63736ad3ae83cb4e4ce0b55e7ce3f5eb4e92347f71c370b2c SHA512 5feddaa14b66c6c5f926a3bee96e2849d829141ee7a6d74cfec68128785fcb8de38e13cfd229c420a9fe6c3a1db4a4bdd52a91aa72726233570f61c73d31f9fd
+DIST perl-5.24.3.tar.xz 11574740 BLAKE2B 79e719d1d0fcea3eea71653f276d0d093d8d1f6b1f981b053f25e6891c57af9ee1982f65ce4a31e4c5844eb11a7966f25c6b459cc7de51cf62b9127be96f6f25 SHA512 139c92c0ea0ee7bd5912ad52cc275e0732ceb0865d8b67c301e1fc5a96ae126a26432b4450a2bbc7fe65b8e1dd8adde92ea2cc91ee39cb13ec3c5096e8f787ec
+DIST perl-5.25.11-patches-1.tar.xz 16776 BLAKE2B 424cfe4ecf5c0b5d857a694fb166dc78f45e0cad9a1f7605fc57c7bf7d16ee7261ba960cf5175525242a378a95ae7b5705ee1717813bc5327962e48b096e4a6b SHA512 ee340824746d3b626b41c76bfa901543869fb9560ef75ff6d338df017e5528e33c344a91ce7cbe9f2fa9e813bf61bbe9eb290433baceb05b832110e746ce9036
+DIST perl-5.26.0.tar.xz 11961692 BLAKE2B a0bf9cb04a6f1f8459351d6b0398c3ef7b8eb16d34981ec22002e0cdfc96baf6ff45679f97472e85b06403ec2f1d05c43d6b0293fb37bc674848b9a7c33fafab SHA512 cd5af6495fe4c46c0d5d0f51d4015b54daa221f08a5fb48899c247cb57c2ba85cffb97e6d258d0f931504828bb23e175d899f311c73805d924d1042058ac42e4
+DIST perl-5.26.1-RC1.tar.xz 11923212 BLAKE2B 0f07040bfa8e2ef8fff434d02f874e71b03013620ab79f5d2d04d254881d33753999c5cd1f7d64cc9887122328ae4fd6dcc904f6ff76e47a6d775e4d655faddc SHA512 036151303704e8d91db8cc22a9c8972499babca112d46f570e4f921fdad1b73919f6d038973896ff3d55b079080c4682609b3f73b962999bc5f5425b7b877084
+DIST perl-5.26.1.tar.xz 11922848 BLAKE2B 8ba5ac50bc6bc3cea1ede7dbd9b41566bd3f62e432d9a1f5ee45837cc3051c1edc037a13d73d4c867edc7833f9dfa8a9d22216e14a19df179ba030a03d3acc07 SHA512 13faa7bcd7ed8c490c37e9032c115af06c9b8152b75f8062409dd72d263d1314480e8a9a883490de1b448b2e6d53b6a87d108e2eceb17de2524d5857c6a7d300
+DIST perl-5.27.6-patches-1.tar.xz 16280 BLAKE2B e80e84bc233a0a73464e59610f56a2857bda91599aad0e166e07c01b5a7167a586ad9bb198b44e01e26dbedcb0be8ecfaa246e3b32ec1c7a03895197fe490976 SHA512 4dbac74a1463bfc54158052bffc8bc25ee5cd9dcf28049bff8d0595f5679a44dcb69030fe8fc4713a9d45cc38be03d0621b606f159f46ce689e0c1ebe55fd627
+DIST perl-5.27.6.tar.xz 12064384 BLAKE2B 4714b3c30960a4f5bd2e8baf77e4e5c83ba416bcf136b2c6148fc784f2d6f210c67b02fb801423a5325a0f825faa17d03feb9b951c4b9d002664259413355868 SHA512 8866623499bc8b73813301dbf1c920b1220e1bece2842c22ca12f565bba7771dd241462cb0e61c5fbdc88526a8461ad401406688a847411f16438449ce48f1a1
+DIST perl-cross-1.1.4.tar.gz 94623 BLAKE2B 11ede9ad74e8f73e8bd8effea962933cba50e65e169fdcf4449a1a4f6df6f840a510033eab1e04c5d60f0aa14a660e0bf9e82569a553d2859c065c1c68056078 SHA512 3bfc108245f0c05b7d45c317eb28c2eb70aba528dfe8a39bc99d6e49b4751f5dca4f4ac661484bfc7528c3e28fcdbd8994c36daa49c25516618fec1f58116d79
+DIST perl-cross-1.1.5.tar.gz 95122 BLAKE2B 2b2596d156f3a7bb296855600ea37771412b0ba4e10be55fccd46c37aa7d1fe25e01ead283ecb8fa3becfbd6e3e9695c4eba4836c0d95ed0b8b827fc8017a8bb SHA512 344ae0ff3ab8a2ce3fdb0de10972164c8cc14abd9c5c9bf55029bc8a6c2e62b3f9dda88892b1d8d0e30b76f94d42feea1dd5e5c55631f9eb53d1443285e2e3d1
+DIST perl-cross-1.1.6.tar.gz 96075 BLAKE2B 08e324a58a193721a5ed2b6a32688030d1f257cb8407e5629039c8ab28893e73104a71e3758f540d1df06e53a4475371c4a625aab940253f1fabb13760e9e285 SHA512 4d46ad55093d90da4b0589552d14390efdc6604532ad2b4a3b20a79c69ef3b3cfe0e171b439dfa464bbee2e1fbd92606af6e6584d9355a8476e5b4ada8733653
+DIST perl-cross-1.1.7.tar.gz 97622 BLAKE2B c58dd51492cfbda6fc58b43d9de45c35dd5ed5768ca8db61b5ac092ad6c0067386597875d6613c75671f026387ba474ce8c28789d6d77b9dcfc4cf4bf7227126 SHA512 b64d487129b295ec6d996606b8b8559de681e1cf7c3e3167d6d646d5d7a848d7929b1ab698d1f950e265213749772fc74d209cea5020b61e133c8f8851b7cfa0
diff --git a/dev-lang/perl/perl-5.28.9999.ebuild b/dev-lang/perl/perl-5.28.9999.ebuild
index 70e967b70d3e..267767fa38dc 100644
--- a/dev-lang/perl/perl-5.28.9999.ebuild
+++ b/dev-lang/perl/perl-5.28.9999.ebuild
@@ -7,7 +7,7 @@ inherit eutils alternatives flag-o-matic toolchain-funcs multilib multiprocessin
 
 PATCH_VER=1
 CROSS_VER=1.1.7
-PATCH_BASE="perl-5.27.1-patches-${PATCH_VER}"
+PATCH_BASE="perl-5.27.6-patches-${PATCH_VER}"
 
 DIST_AUTHOR=SHAY
 
@@ -16,7 +16,7 @@ DIST_AUTHOR=SHAY
 # BIN_OLDVERSEN is contains only C-ABI-intercompatible versions
 PERL_BIN_OLDVERSEN=""
 if [[ "${PV##*.}" == "9999" ]]; then
-	DIST_VERSION=5.27.5
+	DIST_VERSION=5.27.6
 else
 	DIST_VERSION="${PV/_rc/-RC}"
 fi
@@ -80,10 +80,10 @@ dual_scripts() {
 	src_remove_dual      perl-core/Digest-SHA         5.960.0       shasum
 	src_remove_dual      perl-core/Encode             2.930.0       enc2xs piconv
 	src_remove_dual      perl-core/ExtUtils-MakeMaker 7.300.0       instmodsh
-	src_remove_dual      perl-core/ExtUtils-ParseXS   3.350.0       xsubpp
+	src_remove_dual      perl-core/ExtUtils-ParseXS   3.360.0       xsubpp
 	src_remove_dual      perl-core/IO-Compress        2.74.0        zipdetails
 	src_remove_dual      perl-core/JSON-PP            2.940.0       json_pp
-	src_remove_dual      perl-core/Module-CoreList    5.201.710.200 corelist
+	src_remove_dual      perl-core/Module-CoreList    5.201.711.200 corelist
 	src_remove_dual      perl-core/Pod-Parser         1.630.0       pod2usage podchecker podselect
 	src_remove_dual      perl-core/Pod-Perldoc        3.280.100     perldoc
 	src_remove_dual      perl-core/Test-Harness       3.390.0       prove
diff --git a/dev-lang/polyml/metadata.xml b/dev-lang/polyml/metadata.xml
index e5460b6ae6dc..bdeea6761bc4 100644
--- a/dev-lang/polyml/metadata.xml
+++ b/dev-lang/polyml/metadata.xml
@@ -6,11 +6,10 @@
 		<name>Gentoo ML Project</name>
 	</maintainer>
 	<longdescription lang="en">
-Poly/ML is a full implementation of Standard ML available as open-source.
-</longdescription>
+		Poly/ML is a full implementation of Standard ML available as open-source.
+	</longdescription>
 	<use>
-		<flag name="portable">Build the portable interpreter version of Poly/ML
-  instead of native.</flag>
+		<flag name="portable">Build the portable interpreter version of Poly/ML instead of native</flag>
 	</use>
 	<upstream>
 		<remote-id type="sourceforge">polyml</remote-id>
diff --git a/dev-lang/ruby/metadata.xml b/dev-lang/ruby/metadata.xml
index 249178be816f..99e5faab0bb7 100644
--- a/dev-lang/ruby/metadata.xml
+++ b/dev-lang/ruby/metadata.xml
@@ -1,28 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>ruby@gentoo.org</email>
-    <name>Gentoo Ruby Project</name>
-  </maintainer>
-  <use>
-    <flag name="rubytests">
-      Install ruby tests that can only be run after ruby is installed
-    </flag>
-    <flag name="readline">
-      Use the <pkg>sys-libs/readline</pkg> library to provide the
-      readline extension, used for instance by the irb tool. This flag
-      is meaningful only if the libedit USE flag is disabled.
+	<maintainer type="project">
+		<email>ruby@gentoo.org</email>
+		<name>Gentoo Ruby Project</name>
+	</maintainer>
+	<use>
+		<flag name="rubytests">Install ruby tests that can only be run after ruby is installed</flag>
+		<flag name="readline">
+			Use the <pkg>sys-libs/readline</pkg> library to provide the
+			readline extension, used for instance by the irb tool. This flag
+			is meaningful only if the libedit USE flag is disabled.
 
-      If neither libedit nor readline USE flags are enabled, the
-      readline extension will not be built (and irb will lose line
-      editing functionality).
-    </flag>
-    <flag name="rdoc">
-      Install <pkg>dev-ruby/rdoc</pkg> after installing Ruby.
-    </flag>
-    <flag name="jemalloc">
-	  Use <pkg>dev-libs/jemalloc</pkg> for memory allocation.
-	</flag>
-  </use>
+			If neither libedit nor readline USE flags are enabled, the
+			readline extension will not be built (and irb will lose line
+			editing functionality).
+		</flag>
+		<flag name="rdoc">Install <pkg>dev-ruby/rdoc</pkg> after installing Ruby.</flag>
+		<flag name="jemalloc">Use <pkg>dev-libs/jemalloc</pkg> for memory allocation.</flag>
+	</use>
 </pkgmetadata>
diff --git a/dev-lang/scala-bin/metadata.xml b/dev-lang/scala-bin/metadata.xml
index 5352e92a2dc2..4422c51f84a2 100644
--- a/dev-lang/scala-bin/metadata.xml
+++ b/dev-lang/scala-bin/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-	  <email>monsieurp@gentoo.org</email>
-  </maintainer>
-<maintainer type="project">
-	  <email>java@gentoo.org</email>
-	  <name>Java</name>
-  </maintainer>
+	<maintainer type="person">
+		<email>monsieurp@gentoo.org</email>
+	</maintainer>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index fc924b9c13b4..15da0d37a7d3 100644
Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ
diff --git a/dev-libs/blitz/metadata.xml b/dev-libs/blitz/metadata.xml
index d5e41172adad..e1719221d10e 100644
--- a/dev-libs/blitz/metadata.xml
+++ b/dev-libs/blitz/metadata.xml
@@ -10,15 +10,15 @@
 		<name>Gentoo C++ Project</name>
 	</maintainer>
 	<longdescription lang="en">
-  Blitz++ is a meta-template library for array
-  manipulation in C++ with a speed comparable to Fortran
-  implementations, while preserving an object-oriented
-  interface. These results are being obtained not through better
-  optimizing compilers, preprocessors, or language extensions, but
-  through the use of template techniques. By using templates cleverly,
-  optimizations such as loop fusion, unrolling, tiling, and algorithm
-  specialization can be performed automatically at compile time.
-</longdescription>
+		Blitz++ is a meta-template library for array
+		manipulation in C++ with a speed comparable to Fortran
+		implementations, while preserving an object-oriented
+		interface. These results are being obtained not through better
+		optimizing compilers, preprocessors, or language extensions, but
+		through the use of template techniques. By using templates cleverly,
+		optimizations such as loop fusion, unrolling, tiling, and algorithm
+		specialization can be performed automatically at compile time.
+	</longdescription>
 	<use>
 		<flag name="boost">Enable usage of boost::serialization</flag>
 	</use>
diff --git a/dev-libs/cgicc/metadata.xml b/dev-libs/cgicc/metadata.xml
index 644b8d29d3a6..8d6f3edbe619 100644
--- a/dev-libs/cgicc/metadata.xml
+++ b/dev-libs/cgicc/metadata.xml
@@ -6,18 +6,15 @@
 		<name>Gentoo C++ Project</name>
 	</maintainer>
 	<longdescription lang="en">
-GNU cgicc is an ANSI C++ compliant class library that greatly
-simplifies the creation of CGI applications for the World Wide
-Web. cgicc performs the following functions:
+		GNU cgicc is an ANSI C++ compliant class library that greatly
+		simplifies the creation of CGI applications for the World Wide
+		Web. cgicc performs the following functions:
 
- - Parses both GET and POST form data transparently
- - Provides string, integer, floating-point and single- and
-   multiple-choice retrieval methods for form data
- - Provides methods for saving and restoring CGI environments to aid
-   in application debugging
- - Provides full on-the-fly HTML 4.0 generation capabilities, with support
-   for cookies
- - Supports HTTP file upload
- - Compatible with FastCGI
+		- Parses both GET and POST form data transparently
+		- Provides string, integer, floating-point and single- and multiple-choice retrieval methods for form data
+		- Provides methods for saving and restoring CGI environments to aid in application debugging
+		- Provides full on-the-fly HTML 4.0 generation capabilities, with support for cookies
+		- Supports HTTP file upload
+		- Compatible with FastCGI
 	</longdescription>
 </pkgmetadata>
diff --git a/dev-libs/glib/metadata.xml b/dev-libs/glib/metadata.xml
index b73f9ed91053..b88ccebb54c6 100644
--- a/dev-libs/glib/metadata.xml
+++ b/dev-libs/glib/metadata.xml
@@ -1,23 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>gnome@gentoo.org</email>
-    <name>Gentoo GNOME Desktop</name>
-  </maintainer>
-  <use>
-	<flag name="dbus">Enable dependencies required by glib libraries
-		using dbus service to manage settings saving</flag>
-  	<flag name="mime">Pull in shared MIME database that many glib-based
-		applications require at runtime to detect or open files. Warning:
-		do not disable this flag unless installing on a headless server.</flag>
-	<flag name="systemtap">Build support for profiling and tracing using 
-		<pkg>dev-util/systemtap</pkg></flag>
-	<flag name="utils">Install gtester-report utility to generate test
-		report files for your software; build gresource utility with
-		ELF support.</flag>
-  </use>
-  <upstream>
-    <remote-id type="cpe">cpe:/a:gnome:glib</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
+	<use>
+		<flag name="dbus">
+			Enable dependencies required by glib libraries
+			using dbus service to manage settings saving
+		</flag>
+		<flag name="mime">
+			Pull in shared MIME database that many glib-based
+			applications require at runtime to detect or open files. Warning:
+			do not disable this flag unless installing on a headless server.
+		</flag>
+		<flag name="systemtap">
+			Build support for profiling and tracing using
+			<pkg>dev-util/systemtap</pkg>
+		</flag>
+		<flag name="utils">
+			Install gtester-report utility to generate test
+			report files for your software; build gresource utility with
+			ELF support.
+		</flag>
+	</use>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:gnome:glib</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-libs/gmp/gmp-6.1.2.ebuild b/dev-libs/gmp/gmp-6.1.2.ebuild
index f910ce634247..266f6ce8b86a 100644
--- a/dev-libs/gmp/gmp-6.1.2.ebuild
+++ b/dev-libs/gmp/gmp-6.1.2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="ftp://ftp.gmplib.org/pub/${MY_P}/${MY_P}.tar.xz
 LICENSE="|| ( LGPL-3+ GPL-2+ )"
 # The subslot reflects the C & C++ SONAMEs.
 SLOT="0/10.4"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+asm doc cxx pgo static-libs"
 
 DEPEND="sys-devel/m4
diff --git a/dev-libs/jansson/metadata.xml b/dev-libs/jansson/metadata.xml
index 149a60f516c3..fbaf2f425e7d 100644
--- a/dev-libs/jansson/metadata.xml
+++ b/dev-libs/jansson/metadata.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>zero@zer0-one.net</email>
-	<name>David Zero</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>proxy-maint@gentoo.org</email>
-	<name>Proxy Maintainers</name>
-  </maintainer>
+	<maintainer type="person">
+		<email>zero@zer0-one.net</email>
+		<name>David Zero</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-libs/libcdio/libcdio-1.0.0-r1.ebuild b/dev-libs/libcdio/libcdio-1.0.0-r1.ebuild
index 5a278ab70abe..251281eb2413 100644
--- a/dev-libs/libcdio/libcdio-1.0.0-r1.ebuild
+++ b/dev-libs/libcdio/libcdio-1.0.0-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit autotools libtool multilib-minimal
+inherit autotools libtool ltprune multilib-minimal
 
 DESCRIPTION="A library to encapsulate CD-ROM reading and control"
 HOMEPAGE="https://www.gnu.org/software/libcdio/"
diff --git a/dev-libs/libgcrypt/metadata.xml b/dev-libs/libgcrypt/metadata.xml
index 6d1eb56e4dd1..46f4637bdd41 100644
--- a/dev-libs/libgcrypt/metadata.xml
+++ b/dev-libs/libgcrypt/metadata.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <maintainer type="person">
-        <email>k_f@gentoo.org</email>
-        <name>Kristian Fiskerstrand</name>
-    </maintainer>
+	<maintainer type="person">
+		<email>k_f@gentoo.org</email>
+		<name>Kristian Fiskerstrand</name>
+	</maintainer>
 	<maintainer type="project">
 		<email>crypto@gentoo.org</email>
 		<name>Crypto</name>
diff --git a/dev-libs/liblinebreak/metadata.xml b/dev-libs/liblinebreak/metadata.xml
index 227870ef9dbe..807d441a36f6 100644
--- a/dev-libs/liblinebreak/metadata.xml
+++ b/dev-libs/liblinebreak/metadata.xml
@@ -3,10 +3,10 @@
 <pkgmetadata>
 	<!-- maintainer-needed -->
 	<longdescription lang="en">
-  Liblinebreak is an implementation of the line breaking algorithm as described
-  in Unicode 5.1.0 Standard Annex 14, Revision 22. It breaks lines that contain
-  Unicode characters. It is designed to be used in a generic text renderer.
-  </longdescription>
+		Liblinebreak is an implementation of the line breaking algorithm as described
+		in Unicode 5.1.0 Standard Annex 14, Revision 22. It breaks lines that contain
+		Unicode characters. It is designed to be used in a generic text renderer.
+	</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">vimgadgets</remote-id>
 	</upstream>
diff --git a/dev-libs/libmaa/metadata.xml b/dev-libs/libmaa/metadata.xml
index d75fa6bebf37..89d9c1acc0ab 100644
--- a/dev-libs/libmaa/metadata.xml
+++ b/dev-libs/libmaa/metadata.xml
@@ -3,14 +3,14 @@
 <pkgmetadata>
 	<!-- maintainer-needed -->
 	<longdescription lang="en">
-  The libmaa library provides many low-level data structures which
-  are helpful for writing compilers, including hash tables, sets, lists,
-  debugging support, and memory management. Although libmaa was
-  designed and implemented as a foundation for the KHEPERA Transformation
-  System, the data structures are generally applicable to a wide range of
-  programming problems. The memory management routines are especially helpful
-  for improving the performance of memory-intensive applications.
-</longdescription>
+		The libmaa library provides many low-level data structures which
+		are helpful for writing compilers, including hash tables, sets, lists,
+		debugging support, and memory management. Although libmaa was
+		designed and implemented as a foundation for the KHEPERA Transformation
+		System, the data structures are generally applicable to a wide range of
+		programming problems. The memory management routines are especially helpful
+		for improving the performance of memory-intensive applications.
+	</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">dict</remote-id>
 	</upstream>
diff --git a/dev-libs/libp11/metadata.xml b/dev-libs/libp11/metadata.xml
index a57621416f98..d6d0837d385c 100644
--- a/dev-libs/libp11/metadata.xml
+++ b/dev-libs/libp11/metadata.xml
@@ -6,13 +6,11 @@
 		<name>Crypto</name>
 	</maintainer>
 	<longdescription>
-    Library implementing a small layer on top of PKCS#11 API to make
-    using PKCS#11 implementations easier.
-  </longdescription>
+		Library implementing a small layer on top of PKCS#11 API to make
+		using PKCS#11 implementations easier.
+	</longdescription>
 	<use>
-		<flag name="doc">
-      Generate and install API documentation for the package.
-    </flag>
+		<flag name="doc">Generate and install API documentation for the package.</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">opensc/libp11</remote-id>
diff --git a/dev-libs/libpqxx/metadata.xml b/dev-libs/libpqxx/metadata.xml
index 87b73e3569a4..7a7404b989eb 100644
--- a/dev-libs/libpqxx/metadata.xml
+++ b/dev-libs/libpqxx/metadata.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>pgsql-bugs@gentoo.org</email>
-    <name>PostgreSQL and Related Package Development</name>
-  </maintainer>
-  <longdescription>
-	libpqxx is the official C++ client API for PostgreSQL. If you are
-	writing software in C++ that needs to access databases managed by
-	Postgres — on just about any platform — then libpqxx is the
-	library you use. Supersedes the now defunct libpq++ (AKA, libpqpp)
-	API.
-  </longdescription>
+	<maintainer type="project">
+		<email>pgsql-bugs@gentoo.org</email>
+		<name>PostgreSQL and Related Package Development</name>
+	</maintainer>
+	<longdescription>
+		libpqxx is the official C++ client API for PostgreSQL. If you are
+		writing software in C++ that needs to access databases managed by
+		Postgres — on just about any platform — then libpqxx is the
+		library you use. Supersedes the now defunct libpq++ (AKA, libpqpp)
+		API.
+	</longdescription>
 </pkgmetadata>
diff --git a/dev-libs/libtecla/metadata.xml b/dev-libs/libtecla/metadata.xml
index 5df44d38c662..3b9879ad9f7c 100644
--- a/dev-libs/libtecla/metadata.xml
+++ b/dev-libs/libtecla/metadata.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>sci@gentoo.org</email>
-	<name>Gentoo Science Project</name>
-</maintainer>
-<longdescription lang="en">
-  The tecla library provides UNIX and LINUX programs with interactive
-  command line editing facilities, similar to those of the UNIX tcsh
-  shell. In addition to simple command-line editing, it supports
-  recall of previously entered command lines, TAB completion of file
-  names or other tokens, and in-line wild-card expansion of
-  filenames. The internal functions which perform file-name completion
-  and wild-card expansion are also available externally for optional
-  use by programs.
-</longdescription>
+	<maintainer type="project">
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
+	<longdescription lang="en">
+		The tecla library provides UNIX and LINUX programs with interactive
+		command line editing facilities, similar to those of the UNIX tcsh
+		shell. In addition to simple command-line editing, it supports
+		recall of previously entered command lines, TAB completion of file
+		names or other tokens, and in-line wild-card expansion of
+		filenames. The internal functions which perform file-name completion
+		and wild-card expansion are also available externally for optional
+		use by programs.
+	</longdescription>
 </pkgmetadata>
diff --git a/dev-libs/libwacom/libwacom-0.25.ebuild b/dev-libs/libwacom/libwacom-0.25.ebuild
index 804b3669be6d..e4c403cdcd67 100644
--- a/dev-libs/libwacom/libwacom-0.25.ebuild
+++ b/dev-libs/libwacom/libwacom-0.25.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/linuxwacom/${PN}/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 arm ~ia64 ppc ppc64 sparc x86"
 IUSE="doc static-libs"
 
 RDEPEND="
diff --git a/dev-libs/mpc/mpc-1.0.3.ebuild b/dev-libs/mpc/mpc-1.0.3.ebuild
index 52bc0d270662..198111c0b081 100644
--- a/dev-libs/mpc/mpc-1.0.3.ebuild
+++ b/dev-libs/mpc/mpc-1.0.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.multiprecision.org/mpc/download/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 DEPEND=">=dev-libs/gmp-4.3.2[${MULTILIB_USEDEP},static-libs?]
diff --git a/dev-libs/mpfr/Manifest b/dev-libs/mpfr/Manifest
index c26962c4bd1b..19a99395090e 100644
--- a/dev-libs/mpfr/Manifest
+++ b/dev-libs/mpfr/Manifest
@@ -2,4 +2,4 @@ DIST mpfr-2.4.2.tar.bz2 1077886 BLAKE2B bdbd8fcd5b3f459383fff60adb75e3e419b65b20
 DIST mpfr-3.1.3.tar.xz 1112096 BLAKE2B cd7bc886e73ff43e323cde837bc90a41cf97238054e1ffe597455314f307ff7d8c95756b1414ee030a1f974c8041669b75dbf90581c9c5705e3f5c8a1878de46 SHA512 79846fd82974269aa48152c2b6dbcb2321130dc4d0f0ba2eb94d56619b177add9b2077ebf88b4382c56db19c4215910e5a252f216715c1eee40baa299da42eb4
 DIST mpfr-3.1.4.tar.xz 1122152 BLAKE2B d8d686c3280c062a0941c37cb0a0bacfb25a03a6064489b56db331ffbd9369c453ded1357b2c5841fc72eee2ef36c4d7a8acc27418dcf5f045c7e4ea6615d682 SHA512 4ef61708834efdea6b85258f46f1b25ce1c55b912f44b117d8c3d5e06d8f1177e50f627d9736f3289bd159c5bb10c80e09d1ad9f6f52c4ff43c3496034b04232
 DIST mpfr-3.1.5.tar.xz 1126668 BLAKE2B f902925036a4310e7b10461438bae5d5770b95ca6bd897038dc306d597ea412013c869b3d2f9c4ba2a1d5e59eee67f562fc3bf5db8fd1584b70c1b30574e42f5 SHA512 3643469b9099b31e41d6ec9158196cd1c30894030c8864ee5b1b1e91b488bccbf7c263c951b03fe9f4ae6f9d29279e157a7dfed0885467d875f107a3d964f032
-DIST mpfr-3.1.6.tar.xz 1133672 SHA256 7a62ac1a04408614fccdc506e4844b10cf0ad2c2b1677097f8f35d3a1344a950 SHA512 746ee74d5026f267f74ab352d850ed30ff627d530aa840c71b24793e44875f8503946bd7399905dea2b2dd5744326254d7889337fe94cfe58d03c4066e9d8054 WHIRLPOOL 63998e125743c71171143485b97ca4f340bb6d154dc7f77ae0f12a7c8f1aebc2f3fbdef3f30ad56134fd53e035d286be6c4276d4086104b14a327286fb01f68a
+DIST mpfr-3.1.6.tar.xz 1133672 BLAKE2B ab8b87be9d29e9ae5807976f72d65e16cd3e5b4c2ffc4e5bd7829e664250b1969a1ec3928b3519cd75365692e23eadfd413a8116f8c77d6cd66183020b72b656 SHA512 746ee74d5026f267f74ab352d850ed30ff627d530aa840c71b24793e44875f8503946bd7399905dea2b2dd5744326254d7889337fe94cfe58d03c4066e9d8054
diff --git a/dev-libs/mpfr/mpfr-3.1.6.ebuild b/dev-libs/mpfr/mpfr-3.1.6.ebuild
index 58ecdf868bcb..a2c7917b755f 100644
--- a/dev-libs/mpfr/mpfr-3.1.6.ebuild
+++ b/dev-libs/mpfr/mpfr-3.1.6.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://www.mpfr.org/mpfr-${MY_PV}/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/4" # libmpfr.so version
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND=">=dev-libs/gmp-4.1.4-r2[${MULTILIB_USEDEP},static-libs?]"
diff --git a/dev-libs/ntl/metadata.xml b/dev-libs/ntl/metadata.xml
index ff239d92d4de..46f676c3223b 100644
--- a/dev-libs/ntl/metadata.xml
+++ b/dev-libs/ntl/metadata.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>sci-mathematics@gentoo.org</email>
-	<name>Gentoo Mathematics Project</name>
-</maintainer>
-<maintainer type="project">
-	<email>cpp@gentoo.org</email>
-	<name>Gentoo C++ Project</name>
-</maintainer>
-<longdescription lang="en">
-  NTL is a high-performance, portable C++ library providing data
-  structures and algorithms for manipulating signed, arbitrary length
-  integers, and for vectors, matrices, and polynomials over the
-  integers and over finite fields.
-</longdescription>
+	<maintainer type="project">
+		<email>sci-mathematics@gentoo.org</email>
+		<name>Gentoo Mathematics Project</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>cpp@gentoo.org</email>
+		<name>Gentoo C++ Project</name>
+	</maintainer>
+	<longdescription lang="en">
+		NTL is a high-performance, portable C++ library providing data
+		structures and algorithms for manipulating signed, arbitrary length
+		integers, and for vectors, matrices, and polynomials over the
+		integers and over finite fields.
+	</longdescription>
 </pkgmetadata>
diff --git a/dev-libs/opencryptoki/metadata.xml b/dev-libs/opencryptoki/metadata.xml
index 9709f51f5332..6a481bee9cb4 100644
--- a/dev-libs/opencryptoki/metadata.xml
+++ b/dev-libs/opencryptoki/metadata.xml
@@ -6,9 +6,7 @@
 		<name>Crypto</name>
 	</maintainer>
 	<use>
-		<flag name="tpm">
-      Enable support for Trusted Platform Module (TPM) using <pkg>app-crypt/trousers</pkg>
-    </flag>
+		<flag name="tpm">Enable support for Trusted Platform Module (TPM) using <pkg>app-crypt/trousers</pkg></flag>
 	</use>
 	<upstream>
 		<remote-id type="sourceforge">opencryptoki</remote-id>
diff --git a/dev-libs/openct/metadata.xml b/dev-libs/openct/metadata.xml
index 6c9816fbd65e..38be29df0b18 100644
--- a/dev-libs/openct/metadata.xml
+++ b/dev-libs/openct/metadata.xml
@@ -7,15 +7,15 @@
 	</maintainer>
 	<use>
 		<flag name="pcsc-lite">
-      Build a driver library for <pkg>sys-apps/pcsc-lite</pkg>,
-      providing PC/SC API access to devices supported by OpenCT.
-    </flag>
+			Build a driver library for <pkg>sys-apps/pcsc-lite</pkg>,
+			providing PC/SC API access to devices supported by OpenCT.
+		</flag>
 		<flag name="debug">
-      Add debug output to the driver library for pcsc-lite.
-    </flag>
+			Add debug output to the driver library for pcsc-lite.
+		</flag>
 		<flag name="udev">
-      Install rules for <pkg>sys-fs/udev</pkg> to auto-start openct.
-    </flag>
+			Install rules for <pkg>sys-fs/udev</pkg> to auto-start openct.
+		</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">OpenSC/openct</remote-id>
diff --git a/dev-libs/opensc/metadata.xml b/dev-libs/opensc/metadata.xml
index 709cad6d774d..52bf7f8f7bb9 100644
--- a/dev-libs/opensc/metadata.xml
+++ b/dev-libs/opensc/metadata.xml
@@ -6,30 +6,20 @@
 		<name>Crypto</name>
 	</maintainer>
 	<longdescription>
-    OpenSC is a library for accessing SmartCard devices. It is also
-    the core library of the OpenSC project.
+		OpenSC is a library for accessing SmartCard devices. It is also
+		the core library of the OpenSC project.
 
-    Basic functionality (e.g. SELECT FILE, READ BINARY) should work on
-    any ISO 7816-4 compatible SmartCard.  Encryption and decryption
-    using private keys on the SmartCard is possible with PKCS #15
-    compatible cards, such as the FINEID (Finnish Electronic IDentity)
-    card.
-  </longdescription>
+		Basic functionality (e.g. SELECT FILE, READ BINARY) should work on
+		any ISO 7816-4 compatible SmartCard.  Encryption and decryption
+		using private keys on the SmartCard is possible with PKCS #15
+		compatible cards, such as the FINEID (Finnish Electronic IDentity)
+		card.
+	</longdescription>
 	<use>
-		<flag name="openct">
-      Use <pkg>dev-libs/openct</pkg> (and CT-API) for accessing
-      Smartcard hardware.
-    </flag>
-		<flag name="ctapi">
-      Use CT-API for accessing Smartcard hardware.
-    </flag>
-		<flag name="pcsc-lite">
-      Use <pkg>sys-apps/pcsc-lite</pkg> (and PC/SC API) for accessing
-      Smartcard hardware.
-    </flag>
-		<flag name="secure-messaging">
-      Enable secure messaging.
-    </flag>
+		<flag name="openct">Use <pkg>dev-libs/openct</pkg> (and CT-API) for accessing Smartcard hardware</flag>
+		<flag name="ctapi">Use CT-API for accessing Smartcard hardware</flag>
+		<flag name="pcsc-lite">Use <pkg>sys-apps/pcsc-lite</pkg> (and PC/SC API) for accessing Smartcard hardware</flag>
+		<flag name="secure-messaging">Enable secure messaging</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">OpenSC/OpenSC</remote-id>
diff --git a/dev-libs/vanessa-logger/metadata.xml b/dev-libs/vanessa-logger/metadata.xml
index e8866eff13e3..40aa45df2b01 100644
--- a/dev-libs/vanessa-logger/metadata.xml
+++ b/dev-libs/vanessa-logger/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-        <maintainer type="person">
-                <email>patrick@gentoo.org</email>
-                <name>Patrick Lauer</name>
-	        </maintainer>
+	<maintainer type="person">
+		<email>patrick@gentoo.org</email>
+		<name>Patrick Lauer</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-libs/xapian-bindings/xapian-bindings-1.4.4.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.4.4.ebuild
index eac9c1c9ae4c..b03aeae6e541 100644
--- a/dev-libs/xapian-bindings/xapian-bindings-1.4.4.ebuild
+++ b/dev-libs/xapian-bindings/xapian-bindings-1.4.4.ebuild
@@ -20,7 +20,7 @@ SRC_URI="http://oligarchy.co.uk/xapian/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86"
 IUSE="java lua mono perl php python ruby tcl"
 REQUIRED_USE="|| ( java lua mono perl php python ruby tcl )"
 
diff --git a/dev-libs/xapian/Manifest b/dev-libs/xapian/Manifest
index eaba29e03c6d..ab2482867472 100644
--- a/dev-libs/xapian/Manifest
+++ b/dev-libs/xapian/Manifest
@@ -1,4 +1,4 @@
-DIST xapian-core-1.2.24.tar.xz 3210192 SHA256 57a82717ba07e9777958b6ef48d94b81ea41ac4c74d544f74da597fab1e1f87b SHA512 1f8ae5848f94b5f0bee03024f12ae8c336b6d85e58f7b36e885fe604f9fb962c0525e1f44e6cfcd183e811226c61b23f0f2fcc35c7d2e63544b19347a0f96c80 WHIRLPOOL fef6db7f393d4563828e1650eecd02e30d37f5837042b6a8992cfddb962593675f9c3af4eb5d387db71f99468235905bdbe5666f91975b260cb649fd422425ae
+DIST xapian-core-1.2.24.tar.xz 3210192 BLAKE2B 062f0c15ce87fb64b0eec5e5e54b76c443d0581feab44791bce6925f0f77385b423218dc7006d7e095cc9764fffc73a74a067923c44f51816d94b731d001f903 SHA512 1f8ae5848f94b5f0bee03024f12ae8c336b6d85e58f7b36e885fe604f9fb962c0525e1f44e6cfcd183e811226c61b23f0f2fcc35c7d2e63544b19347a0f96c80
 DIST xapian-core-1.2.25.tar.xz 3253292 SHA256 7c77ff259bc92414c620015d6798f5f3e2c52907936096ec97c23c17fc0d6403 SHA512 a15b5d9b5770337519f671732f53f0642b31f08206824500d589ba309c9e91a05a30353d66ebf70a4c1cb1824b44e1c7b7630e799de3b15d645cf951a6017bfe WHIRLPOOL 6b6335fcf2beff23930ea20822fdd1251307d095f09424b36734a9ba001cecbf7398d525022c37b1d8b8d7d612f509946469dcbacc207cd51e68ce8bb75ce3d1
-DIST xapian-core-1.4.4.tar.xz 2807952 SHA256 a6a985a9841a452d75cf2169196b7ca6ebeef27da7c607078cd401ad041732d9 SHA512 dc88bab1d82c68b29d51c2113319ddb5d16840f3544b9d5fcc7a3671f97d58f16ddff58b865ad3521ea778cbaacf73fe7346bb514a1275f1f739283a4128d001 WHIRLPOOL f1b89b0a5ad47111eb4fe068a5aee29033b694fdd6405041972ebfcc81333662ce74bfc0251a37be9a0d04d7cc232681173e1443840277eedac814b46d9bc728
+DIST xapian-core-1.4.4.tar.xz 2807952 BLAKE2B 92f30c063dca4bd7806c1ab025d6b75564acc3a33a129bdc2cbf496518897addb2b63bd772b648a7a199041ea7b90534fb5c4692e94e1e3ef0a7f20301e28e8e SHA512 dc88bab1d82c68b29d51c2113319ddb5d16840f3544b9d5fcc7a3671f97d58f16ddff58b865ad3521ea778cbaacf73fe7346bb514a1275f1f739283a4128d001
 DIST xapian-core-1.4.5.tar.xz 2810612 SHA256 85b5f952de9df925fd13e00f6e82484162fd506d38745613a50b0a2064c6b02b SHA512 cff97a856a406583ca81164ddb704a0eeae7d8d6f94ce3b3f53d5208d657423e87dd06bdc7acb5e5904765bce1cefbc98365cde315c1d46f7b18cfba7b022ae6 WHIRLPOOL 287fa5a952a492da4b9f00a43e32474e40a0d6b3efc0c7585e5842f0f3d219aa87c0c29561d1ee0dd77db680e6f2bc2b755ac4a140c8b7e4bde63ff62717165c
diff --git a/dev-libs/xapian/xapian-1.4.4.ebuild b/dev-libs/xapian/xapian-1.4.4.ebuild
index c7431b739bfc..6b1d43a0a015 100644
--- a/dev-libs/xapian/xapian-1.4.4.ebuild
+++ b/dev-libs/xapian/xapian-1.4.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://oligarchy.co.uk/xapian/${PV}/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0/30" # ABI version of libxapian.so
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~x64-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x64-solaris"
 IUSE="doc static-libs -cpu_flags_x86_sse +cpu_flags_x86_sse2 +glass +chert +inmemory"
 
 DEPEND="sys-libs/zlib"
diff --git a/dev-lisp/Manifest.gz b/dev-lisp/Manifest.gz
index 1c0f9c3b239c..ba3d4bd5d26f 100644
Binary files a/dev-lisp/Manifest.gz and b/dev-lisp/Manifest.gz differ
diff --git a/dev-lisp/cl-ppcre/metadata.xml b/dev-lisp/cl-ppcre/metadata.xml
index 80cabfa13150..36bca3f8dbdf 100644
--- a/dev-lisp/cl-ppcre/metadata.xml
+++ b/dev-lisp/cl-ppcre/metadata.xml
@@ -6,26 +6,26 @@
 		<name>Gentoo Common Lisp Project</name>
 	</maintainer>
 	<longdescription lang="en">
-    CL-PPCRE is a portable regular expression library for Common Lisp
-    which has the following features:
+		CL-PPCRE is a portable regular expression library for Common Lisp
+		which has the following features:
 
-    * compatible with Perl
-    * fast (outperforms Perl)
-    * portable (ANSI Common Lisp)
-    * thread-safe
-    * includes convenience features
-    * well-documented
+		* compatible with Perl
+		* fast (outperforms Perl)
+		* portable (ANSI Common Lisp)
+		* thread-safe
+		* includes convenience features
+		* well-documented
 	</longdescription>
 	<longdescription lang="es">
-    CL-PPCRE es una biblioteca de expressiones regulares portable
-    para Common Lisp que tiene las siguientes características:
+		CL-PPCRE es una biblioteca de expressiones regulares portable
+		para Common Lisp que tiene las siguientes características:
 
-    * Compatible con Perl
-    * Rápida (más rápida que la versión para Perl)
-    * Portable (ANSI Common Lisp)
-    * Segura en la ejecución de hilos (thread-safe)
-    * Incluye características para hacerla cómoda
-    * Bien documentada
+		* Compatible con Perl
+		* Rápida (más rápida que la versión para Perl)
+		* Portable (ANSI Common Lisp)
+		* Segura en la ejecución de hilos (thread-safe)
+		* Incluye características para hacerla cómoda
+		* Bien documentada
 	</longdescription>
 	<upstream>
 		<remote-id type="github">edicl/cl-ppcre</remote-id>
diff --git a/dev-lisp/flexi-streams/metadata.xml b/dev-lisp/flexi-streams/metadata.xml
index 245d1e7eb09a..aee2b661396a 100644
--- a/dev-lisp/flexi-streams/metadata.xml
+++ b/dev-lisp/flexi-streams/metadata.xml
@@ -10,16 +10,16 @@
 		layered atop real binary or bivalent streams and that can be used
 		to read and write character data in various single- or multi-octet
 		encodings which can be changed on the fly. It also supplies
-		in-memory binary streams which are similar to string streams. 
+		in-memory binary streams which are similar to string streams.
 	</longdescription>
 	<longdescription lang="es">
 		FLEXI-STREAMS implementa flujos de datos bivalentes "virtuales"
-    que se pueden superponer a flujos de datos binarios reales o
-    bivalentes y que pueden ser utilizados para leer y escribir datos
-    en caracteres en distintas codificaciones sencillas o multi-octeto
-    que a su vez se pueden cambiar al vuelo. También proporciona flujos
-    de datos en memoria que son similares a los flujos de datos de
-    cadenas de caracteres.
+		que se pueden superponer a flujos de datos binarios reales o
+		bivalentes y que pueden ser utilizados para leer y escribir datos
+		en caracteres en distintas codificaciones sencillas o multi-octeto
+		que a su vez se pueden cambiar al vuelo. También proporciona flujos
+		de datos en memoria que son similares a los flujos de datos de
+		cadenas de caracteres.
 	</longdescription>
 	<upstream>
 		<remote-id type="github">edicl/flexi-streams</remote-id>
diff --git a/dev-lua/Manifest.gz b/dev-lua/Manifest.gz
index 9a58bd472823..aaf135599d30 100644
Binary files a/dev-lua/Manifest.gz and b/dev-lua/Manifest.gz differ
diff --git a/dev-lua/luafilesystem/metadata.xml b/dev-lua/luafilesystem/metadata.xml
index decffdac0f4a..fb533186d653 100644
--- a/dev-lua/luafilesystem/metadata.xml
+++ b/dev-lua/luafilesystem/metadata.xml
@@ -1,18 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>rafaelmartins@gentoo.org</email>
-  </maintainer>
-  <longdescription lang="en">
-    LuaFileSystem is a Lua library developed to complement the set of functions
-    related to file systems offered by the standard Lua distribution.
+	<maintainer type="person">
+		<email>rafaelmartins@gentoo.org</email>
+	</maintainer>
+	<longdescription lang="en">
+		LuaFileSystem is a Lua library developed to complement the set of functions
+		related to file systems offered by the standard Lua distribution.
 
-    LuaFileSystem offers a portable way to access the underlying directory
-	structure and file attributes.
-  </longdescription>
-  <use>
-    <flag name="luajit">Use <pkg>dev-lang/luajit</pkg> instead of
-      <pkg>dev-lang/lua</pkg></flag>
-  </use>
+		LuaFileSystem offers a portable way to access the underlying directory
+		structure and file attributes.
+	</longdescription>
+	<use>
+		<flag name="luajit">Use <pkg>dev-lang/luajit</pkg> instead of <pkg>dev-lang/lua</pkg></flag>
+	</use>
 </pkgmetadata>
diff --git a/dev-lua/lualdap/metadata.xml b/dev-lua/lualdap/metadata.xml
index 2a844069ae07..485a025884ba 100644
--- a/dev-lua/lualdap/metadata.xml
+++ b/dev-lua/lualdap/metadata.xml
@@ -6,7 +6,7 @@
 		<name>Tony Vroon</name>
 	</maintainer>
 	<maintainer type="person">
-	    <email>zx2c4@gentoo.org</email>
+		<email>zx2c4@gentoo.org</email>
 		<name>Jason A. Donenfeld</name>
-    </maintainer>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index df3eb080b60e..d8ae30f25851 100644
Binary files a/dev-ml/Manifest.gz and b/dev-ml/Manifest.gz differ
diff --git a/dev-ml/angstrom-async/metadata.xml b/dev-ml/angstrom-async/metadata.xml
index 6a85d809eb32..cd1f003b6403 100644
--- a/dev-ml/angstrom-async/metadata.xml
+++ b/dev-ml/angstrom-async/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>ml@gentoo.org</email>
-	<name>Gentoo ML Project</name>
-</maintainer>
-  <upstream>
-	  <remote-id type="github">inhabitedtype/angstrom</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>ml@gentoo.org</email>
+		<name>Gentoo ML Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">inhabitedtype/angstrom</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ml/angstrom-lwt-unix/metadata.xml b/dev-ml/angstrom-lwt-unix/metadata.xml
index 6a85d809eb32..cd1f003b6403 100644
--- a/dev-ml/angstrom-lwt-unix/metadata.xml
+++ b/dev-ml/angstrom-lwt-unix/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>ml@gentoo.org</email>
-	<name>Gentoo ML Project</name>
-</maintainer>
-  <upstream>
-	  <remote-id type="github">inhabitedtype/angstrom</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>ml@gentoo.org</email>
+		<name>Gentoo ML Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">inhabitedtype/angstrom</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ml/angstrom-unix/metadata.xml b/dev-ml/angstrom-unix/metadata.xml
index 6a85d809eb32..cd1f003b6403 100644
--- a/dev-ml/angstrom-unix/metadata.xml
+++ b/dev-ml/angstrom-unix/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>ml@gentoo.org</email>
-	<name>Gentoo ML Project</name>
-</maintainer>
-  <upstream>
-	  <remote-id type="github">inhabitedtype/angstrom</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>ml@gentoo.org</email>
+		<name>Gentoo ML Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">inhabitedtype/angstrom</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ml/angstrom/metadata.xml b/dev-ml/angstrom/metadata.xml
index 6a85d809eb32..cd1f003b6403 100644
--- a/dev-ml/angstrom/metadata.xml
+++ b/dev-ml/angstrom/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>ml@gentoo.org</email>
-	<name>Gentoo ML Project</name>
-</maintainer>
-  <upstream>
-	  <remote-id type="github">inhabitedtype/angstrom</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>ml@gentoo.org</email>
+		<name>Gentoo ML Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">inhabitedtype/angstrom</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ml/base/metadata.xml b/dev-ml/base/metadata.xml
index 7c9c3de16ad8..08acd8ba03fa 100644
--- a/dev-ml/base/metadata.xml
+++ b/dev-ml/base/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>ml@gentoo.org</email>
-	<name>Gentoo ML Project</name>
-</maintainer>
-  <upstream>
-	  <remote-id type="github">janestreet/base</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>ml@gentoo.org</email>
+		<name>Gentoo ML Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">janestreet/base</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ml/bos/metadata.xml b/dev-ml/bos/metadata.xml
index 9b594d778b1e..8ebac0e8d880 100644
--- a/dev-ml/bos/metadata.xml
+++ b/dev-ml/bos/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>ml@gentoo.org</email>
-	<name>Gentoo ML Project</name>
-</maintainer>
-  <upstream>
-	  <remote-id type="github">dbuenzli/bos</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>ml@gentoo.org</email>
+		<name>Gentoo ML Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">dbuenzli/bos</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ml/camlp5/metadata.xml b/dev-ml/camlp5/metadata.xml
index bcb339ab42cf..dc16ce3e1f12 100644
--- a/dev-ml/camlp5/metadata.xml
+++ b/dev-ml/camlp5/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>ml@gentoo.org</email>
-	<name>Gentoo ML Project</name>
-</maintainer>
-  <upstream>
-	  <remote-id type="github">camlp5/camlp5</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>ml@gentoo.org</email>
+		<name>Gentoo ML Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">camlp5/camlp5</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ml/core_kernel/metadata.xml b/dev-ml/core_kernel/metadata.xml
index ac382ab214c8..ec7db9c9396f 100644
--- a/dev-ml/core_kernel/metadata.xml
+++ b/dev-ml/core_kernel/metadata.xml
@@ -1,19 +1,19 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>ml@gentoo.org</email>
-    <name>Gentoo ML Project</name>
-  </maintainer>
-  <longdescription lang="en">
-	  Core_kernel is the system-independent part of Core.  It is aimed for
-	  cases when the full Core is not available, such as in Javascript.  It
-	  provides an overlay on the usual namespace, so the best way to use
-	  Core is to start your file with:
+	<maintainer type="project">
+		<email>ml@gentoo.org</email>
+		<name>Gentoo ML Project</name>
+	</maintainer>
+	<longdescription lang="en">
+		Core_kernel is the system-independent part of Core.  It is aimed for
+		cases when the full Core is not available, such as in Javascript.  It
+		provides an overlay on the usual namespace, so the best way to use
+		Core is to start your file with:
 
-	     open Core_kernel.Std
-  </longdescription>
-  <upstream>
-    <remote-id type="github">janestreet/core_kernel</remote-id>
-  </upstream>
+		open Core_kernel.Std
+	</longdescription>
+	<upstream>
+		<remote-id type="github">janestreet/core_kernel</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ml/cryptokit/metadata.xml b/dev-ml/cryptokit/metadata.xml
index 592d5adbb1ef..fad2f6d52138 100644
--- a/dev-ml/cryptokit/metadata.xml
+++ b/dev-ml/cryptokit/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>ml@gentoo.org</email>
-	<name>Gentoo ML Project</name>
-</maintainer>
-  <upstream>
-	  <remote-id type="github">xavierleroy/cryptokit</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>ml@gentoo.org</email>
+		<name>Gentoo ML Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">xavierleroy/cryptokit</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ml/csv/metadata.xml b/dev-ml/csv/metadata.xml
index 2aa54c8c0572..5008ee553fa7 100644
--- a/dev-ml/csv/metadata.xml
+++ b/dev-ml/csv/metadata.xml
@@ -8,7 +8,7 @@
 	<upstream>
 		<remote-id type="github">Chris00/ocaml-csv</remote-id>
 	</upstream>
-    <use>
+	<use>
 		<flag name="lwt">Enables the Lwt-based library for asynchronous operations.</flag>
 	</use>
 </pkgmetadata>
diff --git a/dev-ml/dose3/metadata.xml b/dev-ml/dose3/metadata.xml
index a15e9455adb9..e4749fd2b534 100644
--- a/dev-ml/dose3/metadata.xml
+++ b/dev-ml/dose3/metadata.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-    <email>ml@gentoo.org</email>
-    <name>Gentoo ML Project</name>
-  </maintainer>
-  <use>
-    <flag name="parmap">Adds multi-core CPU support via <pkg>dev-ml/parmap</pkg>.</flag>
-	<flag name="zip">Adds support for handling zip files.</flag>
-	<flag name="rpm4">Adds support for handling rpm4 files.</flag>
-  </use>
+	<maintainer type="project">
+		<email>ml@gentoo.org</email>
+		<name>Gentoo ML Project</name>
+	</maintainer>
+	<use>
+		<flag name="parmap">Adds multi-core CPU support via <pkg>dev-ml/parmap</pkg>.</flag>
+		<flag name="zip">Adds support for handling zip files.</flag>
+		<flag name="rpm4">Adds support for handling rpm4 files.</flag>
+	</use>
 </pkgmetadata>
diff --git a/dev-ml/eliom/metadata.xml b/dev-ml/eliom/metadata.xml
index 7d63e482b2ed..8cff44a8f0c9 100644
--- a/dev-ml/eliom/metadata.xml
+++ b/dev-ml/eliom/metadata.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>ml@gentoo.org</email>
-    <name>Gentoo ML Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">ocsigen/eliom</remote-id>
-  </upstream>
-  <use>
-	<flag name="ppx">Enable PPX syntax extension support.</flag>
-  </use>
+	<maintainer type="project">
+		<email>ml@gentoo.org</email>
+		<name>Gentoo ML Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">ocsigen/eliom</remote-id>
+	</upstream>
+	<use>
+		<flag name="ppx">Enable PPX syntax extension support.</flag>
+	</use>
 </pkgmetadata>
diff --git a/dev-ml/fieldslib/metadata.xml b/dev-ml/fieldslib/metadata.xml
index 5eb34b7dc5a9..1ae462b1d075 100644
--- a/dev-ml/fieldslib/metadata.xml
+++ b/dev-ml/fieldslib/metadata.xml
@@ -1,17 +1,17 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <maintainer type="project">
-        <email>ml@gentoo.org</email>
-        <name>Gentoo ML Project</name>
-    </maintainer>
-    <longdescription lang="en">
-	   This library defines a syntax extension for OCaml using Camlp4 that
-	   can be used to define first class values representing record fields,
-	   and additional routines, to get and set record fields, iterate and fold
-	   over all fields of a record and create new record values.
-    </longdescription>
-    <upstream>
-        <remote-id type="github">janestreet/fieldslib</remote-id>
-    </upstream>
+	<maintainer type="project">
+		<email>ml@gentoo.org</email>
+		<name>Gentoo ML Project</name>
+	</maintainer>
+	<longdescription lang="en">
+		This library defines a syntax extension for OCaml using Camlp4 that
+		can be used to define first class values representing record fields,
+		and additional routines, to get and set record fields, iterate and fold
+		over all fields of a record and create new record values.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">janestreet/fieldslib</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ml/flow_parser/metadata.xml b/dev-ml/flow_parser/metadata.xml
index 4d934e3ae441..44ea2b169869 100644
--- a/dev-ml/flow_parser/metadata.xml
+++ b/dev-ml/flow_parser/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>ml@gentoo.org</email>
-	<name>Gentoo ML Project</name>
-</maintainer>
-  <upstream>
-	  <remote-id type="github">facebook/flow</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>ml@gentoo.org</email>
+		<name>Gentoo ML Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">facebook/flow</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ml/fpath/metadata.xml b/dev-ml/fpath/metadata.xml
index 120208f31d2c..81ab008999ce 100644
--- a/dev-ml/fpath/metadata.xml
+++ b/dev-ml/fpath/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>ml@gentoo.org</email>
-	<name>Gentoo ML Project</name>
-</maintainer>
-  <upstream>
-	  <remote-id type="github">dbuenzli/fpath</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>ml@gentoo.org</email>
+		<name>Gentoo ML Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">dbuenzli/fpath</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ml/integers/metadata.xml b/dev-ml/integers/metadata.xml
index 7a15e07dd0ad..637f8241fbad 100644
--- a/dev-ml/integers/metadata.xml
+++ b/dev-ml/integers/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>ml@gentoo.org</email>
-	<name>Gentoo ML Project</name>
-</maintainer>
-  <upstream>
-	  <remote-id type="github">ocamllabs/ocaml-integers</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>ml@gentoo.org</email>
+		<name>Gentoo ML Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">ocamllabs/ocaml-integers</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ml/jbuilder/metadata.xml b/dev-ml/jbuilder/metadata.xml
index f707212c248c..9f016f75c9de 100644
--- a/dev-ml/jbuilder/metadata.xml
+++ b/dev-ml/jbuilder/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>ml@gentoo.org</email>
-	<name>Gentoo ML Project</name>
-</maintainer>
-  <upstream>
-	  <remote-id type="github">janestreet/jbuilder</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>ml@gentoo.org</email>
+		<name>Gentoo ML Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">janestreet/jbuilder</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ml/js_of_ocaml/metadata.xml b/dev-ml/js_of_ocaml/metadata.xml
index a7e813252c72..0e7d31b0a342 100644
--- a/dev-ml/js_of_ocaml/metadata.xml
+++ b/dev-ml/js_of_ocaml/metadata.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>ml@gentoo.org</email>
-    <name>Gentoo ML Project</name>
-  </maintainer>
-  <use>
-	<flag name="camlp4">Build with camlp4 syntax extensions.</flag>
-    <flag name="deriving">Enable <pkg>dev-ml/deriving</pkg> support for improving the type safety.</flag>
-	<flag name="lwt">Enable <pkg>dev-ml/lwt</pkg> support.</flag>
-	<flag name="ppx">Enables the ppx syntax extension</flag>
-	<flag name="react">Enable functionnal reactive programming support.</flag>
-  </use>
-  <upstream>
-    <remote-id type="github">ocsigen/js_of_ocaml</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>ml@gentoo.org</email>
+		<name>Gentoo ML Project</name>
+	</maintainer>
+	<use>
+		<flag name="camlp4">Build with camlp4 syntax extensions.</flag>
+		<flag name="deriving">Enable <pkg>dev-ml/deriving</pkg> support for improving the type safety.</flag>
+		<flag name="lwt">Enable <pkg>dev-ml/lwt</pkg> support.</flag>
+		<flag name="ppx">Enables the ppx syntax extension</flag>
+		<flag name="react">Enable functionnal reactive programming support.</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">ocsigen/js_of_ocaml</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ml/lwt/metadata.xml b/dev-ml/lwt/metadata.xml
index 2f6b7dc1cf9e..c3aa15b13c0c 100644
--- a/dev-ml/lwt/metadata.xml
+++ b/dev-ml/lwt/metadata.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>ml@gentoo.org</email>
-    <name>Gentoo ML Project</name>
-  </maintainer>
-  <use>
-	<flag name="camlp4">Enable camlp4 syntax extension</flag>
-	<flag name="libev">Enable the <pkg>dev-libs/libev</pkg>-based backend.</flag>
-	<flag name="ppx">Enables the ppx syntax extension</flag>
-  </use>
-  <upstream>
-    <remote-id type="github">ocsigen/lwt</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>ml@gentoo.org</email>
+		<name>Gentoo ML Project</name>
+	</maintainer>
+	<use>
+		<flag name="camlp4">Enable camlp4 syntax extension</flag>
+		<flag name="libev">Enable the <pkg>dev-libs/libev</pkg>-based backend.</flag>
+		<flag name="ppx">Enables the ppx syntax extension</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">ocsigen/lwt</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ml/mccs/metadata.xml b/dev-ml/mccs/metadata.xml
index 0ba4139391c5..966e8b481be6 100644
--- a/dev-ml/mccs/metadata.xml
+++ b/dev-ml/mccs/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>ml@gentoo.org</email>
-	<name>Gentoo ML Project</name>
-</maintainer>
-  <upstream>
-	  <remote-id type="github">AltGr/ocaml-mccs</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>ml@gentoo.org</email>
+		<name>Gentoo ML Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">AltGr/ocaml-mccs</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ml/ocaml-extunix/metadata.xml b/dev-ml/ocaml-extunix/metadata.xml
index 26a70b4729f6..d986b72622e7 100644
--- a/dev-ml/ocaml-extunix/metadata.xml
+++ b/dev-ml/ocaml-extunix/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>ml@gentoo.org</email>
-	<name>Gentoo ML Project</name>
-</maintainer>
-  <upstream>
-	  <remote-id type="github">ygrek/extunix</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>ml@gentoo.org</email>
+		<name>Gentoo ML Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">ygrek/extunix</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ml/ocaml-snappy/metadata.xml b/dev-ml/ocaml-snappy/metadata.xml
index a7b8d1d48a12..ed271f5f83cf 100644
--- a/dev-ml/ocaml-snappy/metadata.xml
+++ b/dev-ml/ocaml-snappy/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>ml@gentoo.org</email>
-	<name>Gentoo ML Project</name>
-</maintainer>
-  <upstream>
-	  <remote-id type="github">ygrek/ocaml-snappy</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>ml@gentoo.org</email>
+		<name>Gentoo ML Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">ygrek/ocaml-snappy</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ml/ocamlgraph/metadata.xml b/dev-ml/ocamlgraph/metadata.xml
index 3c1a3a18d2d6..7640c195a7fe 100644
--- a/dev-ml/ocamlgraph/metadata.xml
+++ b/dev-ml/ocamlgraph/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>ml@gentoo.org</email>
-    <name>Gentoo ML Project</name>
-  </maintainer>
-  <upstream>
-	  <remote-id type="github">backtracking/ocamlgraph</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>ml@gentoo.org</email>
+		<name>Gentoo ML Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">backtracking/ocamlgraph</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ml/ocsigen-i18n/metadata.xml b/dev-ml/ocsigen-i18n/metadata.xml
index e311bad86e7e..d19446036e3e 100644
--- a/dev-ml/ocsigen-i18n/metadata.xml
+++ b/dev-ml/ocsigen-i18n/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>ml@gentoo.org</email>
-	<name>Gentoo ML Project</name>
-</maintainer>
-  <upstream>
-	  <remote-id type="github">besport/ocsigen-i18n</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>ml@gentoo.org</email>
+		<name>Gentoo ML Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">besport/ocsigen-i18n</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ml/ocsigen-start/metadata.xml b/dev-ml/ocsigen-start/metadata.xml
index a05497880956..8757698182df 100644
--- a/dev-ml/ocsigen-start/metadata.xml
+++ b/dev-ml/ocsigen-start/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>ml@gentoo.org</email>
-	<name>Gentoo ML Project</name>
-</maintainer>
-  <upstream>
-    <remote-id type="github">ocsigen/ocsigen-start</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>ml@gentoo.org</email>
+		<name>Gentoo ML Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">ocsigen/ocsigen-start</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ml/ocsigen-toolkit/metadata.xml b/dev-ml/ocsigen-toolkit/metadata.xml
index 570d8b7fe62f..5539bc3ee579 100644
--- a/dev-ml/ocsigen-toolkit/metadata.xml
+++ b/dev-ml/ocsigen-toolkit/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>ml@gentoo.org</email>
-	<name>Gentoo ML Project</name>
-</maintainer>
-  <upstream>
-    <remote-id type="github">ocsigen/ocsigen-toolkit</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>ml@gentoo.org</email>
+		<name>Gentoo ML Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">ocsigen/ocsigen-toolkit</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ml/patience_diff/metadata.xml b/dev-ml/patience_diff/metadata.xml
index 949b707595ef..41ba0f8e6fe0 100644
--- a/dev-ml/patience_diff/metadata.xml
+++ b/dev-ml/patience_diff/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>ml@gentoo.org</email>
-	<name>Gentoo ML Project</name>
-</maintainer>
-  <upstream>
-	  <remote-id type="github">janestreet/patience_diff</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>ml@gentoo.org</email>
+		<name>Gentoo ML Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">janestreet/patience_diff</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ml/pgocaml/metadata.xml b/dev-ml/pgocaml/metadata.xml
index 5916b25a8911..a00e7949c4bb 100644
--- a/dev-ml/pgocaml/metadata.xml
+++ b/dev-ml/pgocaml/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-			<email>ml@gentoo.org</email>
-			<name>Gentoo ML Project</name>
-		</maintainer>
-  <use>
-	<flag name="camlp4">Enable PG'Ocaml syntax extension.</flag>
-  </use>
+	<maintainer type="project">
+		<email>ml@gentoo.org</email>
+		<name>Gentoo ML Project</name>
+	</maintainer>
+	<use>
+		<flag name="camlp4">Enable PG'Ocaml syntax extension.</flag>
+	</use>
 </pkgmetadata>
diff --git a/dev-ml/ppx_import/metadata.xml b/dev-ml/ppx_import/metadata.xml
index f35c3b20f37f..d0bba00f86b8 100644
--- a/dev-ml/ppx_import/metadata.xml
+++ b/dev-ml/ppx_import/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>ml@gentoo.org</email>
-	<name>Gentoo ML Project</name>
-</maintainer>
-  <upstream>
-	  <remote-id type="github">whitequark/ppx_import</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>ml@gentoo.org</email>
+		<name>Gentoo ML Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">whitequark/ppx_import</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ml/ppx_metaquot/metadata.xml b/dev-ml/ppx_metaquot/metadata.xml
index 12b5d625b73e..a5d8e36c3aa4 100644
--- a/dev-ml/ppx_metaquot/metadata.xml
+++ b/dev-ml/ppx_metaquot/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>ml@gentoo.org</email>
-	<name>Gentoo ML Project</name>
-</maintainer>
-  <upstream>
-	  <remote-id type="github">janestreet/ppx_metaquot</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>ml@gentoo.org</email>
+		<name>Gentoo ML Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">janestreet/ppx_metaquot</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ml/react/metadata.xml b/dev-ml/react/metadata.xml
index 1e1dddccbb71..230ed537ef5c 100644
--- a/dev-ml/react/metadata.xml
+++ b/dev-ml/react/metadata.xml
@@ -1,23 +1,23 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>ml@gentoo.org</email>
-    <name>Gentoo ML Project</name>
-  </maintainer>
-  <longdescription lang="en">
-	React is an OCaml module for functional reactive programming (FRP). It
-    provides support to program with time varying values : applicative
-    events and signals. React doesn't define any primitive event or
-    signal, this lets the client chooses the concrete timeline.
+	<maintainer type="project">
+		<email>ml@gentoo.org</email>
+		<name>Gentoo ML Project</name>
+	</maintainer>
+	<longdescription lang="en">
+		React is an OCaml module for functional reactive programming (FRP). It
+		provides support to program with time varying values : applicative
+		events and signals. React doesn't define any primitive event or
+		signal, this lets the client chooses the concrete timeline.
 
-    React is made of a single, independent, module and distributed under
-    the new BSD license.
+		React is made of a single, independent, module and distributed under
+		the new BSD license.
 
-	Given an absolute notion of time Rtime helps you to manage a timeline 
-	and provides time stamp events, delayed events and delayed signals.
-  </longdescription>
-  <upstream>
-    <remote-id type="github">dbuenzli/react</remote-id>
-  </upstream>
+		Given an absolute notion of time Rtime helps you to manage a timeline
+		and provides time stamp events, delayed events and delayed signals.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">dbuenzli/react</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ml/reactiveData/metadata.xml b/dev-ml/reactiveData/metadata.xml
index 217d9fe4c979..ab53110f16be 100644
--- a/dev-ml/reactiveData/metadata.xml
+++ b/dev-ml/reactiveData/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>ml@gentoo.org</email>
-    <name>Gentoo ML Project</name>
-  </maintainer>
-  <upstream>
-	  <remote-id type="github">ocsigen/reactiveData</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>ml@gentoo.org</email>
+		<name>Gentoo ML Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">ocsigen/reactiveData</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ml/rresult/metadata.xml b/dev-ml/rresult/metadata.xml
index bd8c75be2dec..9f837b5c8652 100644
--- a/dev-ml/rresult/metadata.xml
+++ b/dev-ml/rresult/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>ml@gentoo.org</email>
-	<name>Gentoo ML Project</name>
-</maintainer>
-  <upstream>
-	  <remote-id type="github">dbuenzli/rresult</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>ml@gentoo.org</email>
+		<name>Gentoo ML Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">dbuenzli/rresult</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ml/sedlex/metadata.xml b/dev-ml/sedlex/metadata.xml
index 32f6b384baa6..ae029bd9c53f 100644
--- a/dev-ml/sedlex/metadata.xml
+++ b/dev-ml/sedlex/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>ml@gentoo.org</email>
-	<name>Gentoo ML Project</name>
-</maintainer>
-  <upstream>
-	  <remote-id type="github">alainfrisch/sedlex</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>ml@gentoo.org</email>
+		<name>Gentoo ML Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">alainfrisch/sedlex</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ml/tyxml/metadata.xml b/dev-ml/tyxml/metadata.xml
index 0455e2d8c0cf..d1a8e687d88b 100644
--- a/dev-ml/tyxml/metadata.xml
+++ b/dev-ml/tyxml/metadata.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>ml@gentoo.org</email>
-    <name>Gentoo ML Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">ocsigen/tyxml</remote-id>
-  </upstream>
-  <use>
-    <flag name="camlp4">Enables the camlp4 syntax extension (deprecated)</flag>
-	<flag name="ppx">Enables the ppx syntax extension (preferred)</flag>
-  </use>
+	<maintainer type="project">
+		<email>ml@gentoo.org</email>
+		<name>Gentoo ML Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">ocsigen/tyxml</remote-id>
+	</upstream>
+	<use>
+		<flag name="camlp4">Enables the camlp4 syntax extension (deprecated)</flag>
+		<flag name="ppx">Enables the ppx syntax extension (preferred)</flag>
+	</use>
 </pkgmetadata>
diff --git a/dev-ml/zarith/metadata.xml b/dev-ml/zarith/metadata.xml
index 1e2b411522ce..c95afc027dca 100644
--- a/dev-ml/zarith/metadata.xml
+++ b/dev-ml/zarith/metadata.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-	  <email>ml@gentoo.org</email>
-	  <name>Gentoo ML Project</name>
-  </maintainer>
-  <use>
-	  <flag name="mpir">Use MPIR library instead of GMP.</flag>
-  </use>
-  <upstream>
-	  <remote-id type="github">ocaml/Zarith</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>ml@gentoo.org</email>
+		<name>Gentoo ML Project</name>
+	</maintainer>
+	<use>
+		<flag name="mpir">Use MPIR library instead of GMP.</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">ocaml/Zarith</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-perl/Mail-DKIM/Mail-DKIM-0.440.0.ebuild b/dev-perl/Mail-DKIM/Mail-DKIM-0.440.0.ebuild
index eb2752e94814..e48e45328ab4 100644
--- a/dev-perl/Mail-DKIM/Mail-DKIM-0.440.0.ebuild
+++ b/dev-perl/Mail-DKIM/Mail-DKIM-0.440.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Signs/verifies Internet mail using DKIM message signatures"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="test"
 
 RDEPEND=">=dev-perl/Crypt-OpenSSL-RSA-0.24
diff --git a/dev-perl/Manifest.gz b/dev-perl/Manifest.gz
index 4f7e81eae288..cdf031e22cae 100644
Binary files a/dev-perl/Manifest.gz and b/dev-perl/Manifest.gz differ
diff --git a/dev-perl/MogileFS-Server/Manifest b/dev-perl/MogileFS-Server/Manifest
index 1a1126ebfd72..50e5f572a4e5 100644
--- a/dev-perl/MogileFS-Server/Manifest
+++ b/dev-perl/MogileFS-Server/Manifest
@@ -1,2 +1,2 @@
-DIST MogileFS-Server-2.70.tar.gz 199850 SHA256 686f328a4a6dacdb6c6153e7c1837875580d8437bf91ebd74ef197b1caefa7a6 SHA512 e5dd7dbfd8422d69d1ffbe9d6cf5f8845e33484a7c812fe60285c0aa17d812a5de33d1a0503972749d70fed92767eedc1119bea650712150d9d5d4e4fdbccb8f WHIRLPOOL c47a79e0002b38d605d1b4407bab886a53f818f3b664421e6e83696a2db152fb71cd093acbaecc6fc46f2bb69a43339c105d4bf566af1e834492aa4a44adedcd
-DIST MogileFS-Server-2.72.tar.gz 200057 SHA256 d7d5a45d50127bf62e451c6d86eb247103b01c46662898ae4e18daa08be8e0bf SHA512 4076ba33123c984f9d7c56db7d308b4d857e852caa8d811d86ed551b9ab74a6dfc93b034d034ec2802376035799860c613aef2bdd3898c1225e37727fda34ade WHIRLPOOL 1bb22dd7701d885268416556bec8c37f1f7cadcadcec50c27ecebd84c8222626eeb018d6d72f6ce2aeb985d3bbf9f625d9561a3109ef443c82a35faf15dce083
+DIST MogileFS-Server-2.70.tar.gz 199850 BLAKE2B e3a69243cdcadce2155e3ab023b974a131cbdd13854e8d7b7a122cb4b82aa7c6a96a6632d69cdabdd8d14774225a8330aff4ec22218593dda20c54b206768400 SHA512 e5dd7dbfd8422d69d1ffbe9d6cf5f8845e33484a7c812fe60285c0aa17d812a5de33d1a0503972749d70fed92767eedc1119bea650712150d9d5d4e4fdbccb8f
+DIST MogileFS-Server-2.72.tar.gz 200057 BLAKE2B 835a7799389e536b42ed000b8ce07225609501ee6a4c002253a0018d0b17c815e8825a56f78ee0c0604d57cafea45ac044fda4e6e6bc33e0b60b8ed5b51a7e10 SHA512 4076ba33123c984f9d7c56db7d308b4d857e852caa8d811d86ed551b9ab74a6dfc93b034d034ec2802376035799860c613aef2bdd3898c1225e37727fda34ade
diff --git a/dev-perl/MogileFS-Server/MogileFS-Server-2.720.0.ebuild b/dev-perl/MogileFS-Server/MogileFS-Server-2.720.0-r1.ebuild
similarity index 99%
rename from dev-perl/MogileFS-Server/MogileFS-Server-2.720.0.ebuild
rename to dev-perl/MogileFS-Server/MogileFS-Server-2.720.0-r1.ebuild
index 70b6fe87e18b..691d30b4fd8f 100644
--- a/dev-perl/MogileFS-Server/MogileFS-Server-2.720.0.ebuild
+++ b/dev-perl/MogileFS-Server/MogileFS-Server-2.720.0-r1.ebuild
@@ -28,6 +28,7 @@ RDEPEND="dev-perl/Net-Netmask
 		>=dev-perl/MogileFS-Client-1.170.0
 		>=dev-perl/MogileFS-Utils-2.280.0
 		dev-perl/Cache-Memcached
+		dev-perl/DBI
 		mysql? ( dev-perl/DBD-mysql )
 		postgres? ( dev-perl/DBD-Pg )
 		sqlite? ( dev-perl/DBD-SQLite )"
diff --git a/dev-perl/Net-DNS-Resolver-Mock/Net-DNS-Resolver-Mock-1.201.710.310.ebuild b/dev-perl/Net-DNS-Resolver-Mock/Net-DNS-Resolver-Mock-1.201.710.310.ebuild
index 0c47e64b2dcc..2de4e526db7a 100644
--- a/dev-perl/Net-DNS-Resolver-Mock/Net-DNS-Resolver-Mock-1.201.710.310.ebuild
+++ b/dev-perl/Net-DNS-Resolver-Mock/Net-DNS-Resolver-Mock-1.201.710.310.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="Mock a DNS Resolver object for testing"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="test"
 
 RDEPEND="dev-perl/Net-DNS"
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 9145ad921b35..f2390a7444bf 100644
Binary files a/dev-python/Manifest.gz and b/dev-python/Manifest.gz differ
diff --git a/dev-python/PyQt4/PyQt4-4.12.1.ebuild b/dev-python/PyQt4/PyQt4-4.12.1.ebuild
index 113c1734c21e..99e18b6aeca0 100644
--- a/dev-python/PyQt4/PyQt4-4.12.1.ebuild
+++ b/dev-python/PyQt4/PyQt4-4.12.1.ebuild
@@ -18,7 +18,7 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 
 IUSE="X compat dbus debug declarative designer doc examples help multimedia
 	opengl phonon script scripttools sql svg testlib webkit xmlpatterns"
diff --git a/dev-python/backports-lzma/backports-lzma-0.0.8.ebuild b/dev-python/backports-lzma/backports-lzma-0.0.8.ebuild
index 90c977ca8a57..ebecdc999393 100644
--- a/dev-python/backports-lzma/backports-lzma-0.0.8.ebuild
+++ b/dev-python/backports-lzma/backports-lzma-0.0.8.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="app-arch/xz-utils
 	dev-python/backports[${PYTHON_USEDEP}]"
diff --git a/dev-python/bz2file/bz2file-0.98.ebuild b/dev-python/bz2file/bz2file-0.98.ebuild
index 7fcf93002fea..8ef56527509b 100644
--- a/dev-python/bz2file/bz2file-0.98.ebuild
+++ b/dev-python/bz2file/bz2file-0.98.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 python_test() {
diff --git a/dev-python/future/Manifest b/dev-python/future/Manifest
index d986df4e5b01..c6f9ebb99b5b 100644
--- a/dev-python/future/Manifest
+++ b/dev-python/future/Manifest
@@ -1,2 +1,2 @@
-DIST future-0.15.2.tar.gz 1583441 SHA256 3d3b193f20ca62ba7d8782589922878820d0a023b885882deec830adbf639b97 SHA512 24a0eaf70795efe1644b098c5abbcb0103d9172a5243721f0d26b1cbd108872b6c0616180da8f5507855ddfc7b26bb10a606a64e59d307d39042b346700f77ee WHIRLPOOL 557b53495033d4586dc0f34837cc7f0cab12fb770abda56049fd90b5bac3e36db561e185d86e8a08b153869f0f692ccf0b305f5edc20871edde487faa1b1fc4f
-DIST future-0.16.0.tar.gz 824484 SHA256 e39ced1ab767b5936646cedba8bcce582398233d6a627067d4c6a454c90cfedb SHA512 41c795cd1746a76df84de2da9fbc611fc6164322c1c712ec9e8a8626c21c2717cb4899ec150d95c5e0c037270e6bb71e099edd169609369aae619daea9df2e5f WHIRLPOOL 744ab7e228c608f49308609e18778e198804a7b6fea3a6285efcce14a4ea8d114e146e94779e084ac91916fb7cc560be2178806378305b40568d6bb7ff448951
+DIST future-0.15.2.tar.gz 1583441 BLAKE2B 9c552a5f3598922f8910480d054015020112aae4f7e14d2c139dda13a0b26e878b75eaf5068d66f20823ac4659d85edd4087a95d9474dc27bf15767cf6e9d921 SHA512 24a0eaf70795efe1644b098c5abbcb0103d9172a5243721f0d26b1cbd108872b6c0616180da8f5507855ddfc7b26bb10a606a64e59d307d39042b346700f77ee
+DIST future-0.16.0.tar.gz 824484 BLAKE2B b098366cc7a7866c4aa4a35f1a6a5cf113698307de8f4cce6c77e4ce72a8433dd102111f991e35ffa920c09a0d31cc048b9502dacd0aba1b701c11eaaeab8392 SHA512 41c795cd1746a76df84de2da9fbc611fc6164322c1c712ec9e8a8626c21c2717cb4899ec150d95c5e0c037270e6bb71e099edd169609369aae619daea9df2e5f
diff --git a/dev-python/future/future-0.15.2.ebuild b/dev-python/future/future-0.15.2.ebuild
index d8e02163af82..32698b14b9d9 100644
--- a/dev-python/future/future-0.15.2.ebuild
+++ b/dev-python/future/future-0.15.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa x86"
+KEYWORDS="~alpha amd64 hppa x86"
 IUSE=""
 
 PATCHES=( "${FILESDIR}/${P}-fix-py35-test-failures.patch" )
diff --git a/dev-python/pyinotify/pyinotify-0.9.6.ebuild b/dev-python/pyinotify/pyinotify-0.9.6.ebuild
index bf3d28daddf9..a9ba5de1c1c8 100644
--- a/dev-python/pyinotify/pyinotify-0.9.6.ebuild
+++ b/dev-python/pyinotify/pyinotify-0.9.6.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://seb.dbzteam.org/pub/pyinotify/releases/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 hppa ia64 ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm64 hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="examples"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/pyopenssl/Manifest b/dev-python/pyopenssl/Manifest
index 2558e91e7ff5..0c6380313edb 100644
--- a/dev-python/pyopenssl/Manifest
+++ b/dev-python/pyopenssl/Manifest
@@ -3,3 +3,4 @@ DIST pyOpenSSL-16.2.0.tar.gz 167305 SHA256 7779a3bbb74e79db234af6a08775568c6769b
 DIST pyOpenSSL-17.0.0.tar.gz 167121 SHA256 48abfe9d2bb8eb8d8947c8452b0223b7b1be2383b332f3b4f248fe59ef0bafdd SHA512 819be95f920a70b40ae48ed6740bd1d8cd3bf2fc080f682db8978946929994cb87ac467e220267dcdafc40aa7ed2cce51a334a49b06c1e2665d295157181ddad WHIRLPOOL 8256ad13d35d7c7d1678bd6c35140e13a1f601f149bc38633b3f04eaec7e302853abcb5df857a04fd04dc8ac3feeb35d4247dc979cee0969dafc538ec9b70d5c
 DIST pyOpenSSL-17.2.0.tar.gz 170816 SHA256 5d617ce36b07c51f330aa63b83bf7f25c40a0e95958876d54d1982f8c91b4834 SHA512 aef1628665353445760a0c869c5b88ba1f61a3ade7471bfd1ad9e57672573501574dab5a2491aaac1dc283893fcac1a81dd9b972f43d53fe7ef1aa48e3f0e88a WHIRLPOOL aab3617e825237032efa44d5b89603bcd6b33095f76bb04b53140138066d9c6e96b64bb6def4425b3cf3aa279691142c66bf5c6b9a89ef5e5c64eb83459dc5a9
 DIST pyOpenSSL-17.3.0.tar.gz 168119 SHA256 29630b9064a82e04d8242ea01d7c93d70ec320f5e3ed48e95fcabc6b1d0f6c76 SHA512 2b58a652b8d6e2adadbc620a6b3411cd44169940ef1839fd3365cd343ebe1e630ddbb580d8d4dc79e738e0b4f91db0bdbbaecf18aea74204499c737eebb3fae8 WHIRLPOOL 154cb8beedd57c24aced9c0a37b2395a9c25a0696b803c70d40bc4df98802587e73602c7c74aebd03c60dd54849c293eede1366c0b2f5ccb0967331235754bc0
+DIST pyOpenSSL-17.4.0.tar.gz 169362 BLAKE2B 87a51efaa157b4a91a48edfcd9348402b6734e1c9f78e7ed638e3d245ae3922083c625e3d967e7513c588e131f96b06f110ae528cccbbb820f685afb9dda72ef SHA512 c3c791b15f2245d3c1381f84471f9e1b07b4a01c318a5a4012ec70193ba055fe948ba150f9c88d2dabe30b37f2025fe26ffb95c01682ca656d561014d41cf965
diff --git a/dev-python/pyopenssl/pyopenssl-17.4.0.ebuild b/dev-python/pyopenssl/pyopenssl-17.4.0.ebuild
new file mode 100644
index 000000000000..d873a6b97ce3
--- /dev/null
+++ b/dev-python/pyopenssl/pyopenssl-17.4.0.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 flag-o-matic
+
+MY_PN=pyOpenSSL
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Python interface to the OpenSSL library"
+HOMEPAGE="
+	http://pyopenssl.sourceforge.net/
+	https://launchpad.net/pyopenssl
+	https://pypi.python.org/pypi/pyOpenSSL
+"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86"
+IUSE="doc examples test"
+
+RDEPEND="
+	>=dev-python/six-1.5.2[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-1.9[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+	)
+	test? (
+		virtual/python-cffi[${PYTHON_USEDEP}]
+		dev-python/flaky[${PYTHON_USEDEP}]
+		dev-python/pretend[${PYTHON_USEDEP}]
+		>=dev-python/pytest-3.0.1[${PYTHON_USEDEP}] )"
+
+S=${WORKDIR}/${MY_P}
+
+python_prepare_all() {
+	# Requires network access
+	sed -i -e 's/test_set_default_verify_paths/_&/' tests/test_ssl.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_test() {
+	# FIXME: for some reason, no-ops on PyPy
+	py.test -v || die "Testing failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/_build/html/. )
+	if use examples ; then
+		docinto examples
+		dodoc -r examples/*
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/python-heatclient/python-heatclient-1.11.1.ebuild b/dev-python/python-heatclient/python-heatclient-1.11.1.ebuild
index 34409536762d..fda6e1051e2b 100644
--- a/dev-python/python-heatclient/python-heatclient-1.11.1.ebuild
+++ b/dev-python/python-heatclient/python-heatclient-1.11.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc test"
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/sip/sip-4.19.3.ebuild b/dev-python/sip/sip-4.19.3.ebuild
index 03af916e9578..e4fd0fa2bf5f 100644
--- a/dev-python/sip/sip-4.19.3.ebuild
+++ b/dev-python/sip/sip-4.19.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/pyqt/${P}.tar.gz"
 # Sub-slot based on SIP_API_MAJOR_NR from siplib/sip.h.in
 SLOT="0/12"
 LICENSE="|| ( GPL-2 GPL-3 SIP )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="debug doc"
 
 RDEPEND="${PYTHON_DEPS}"
diff --git a/dev-python/snakeoil/Manifest b/dev-python/snakeoil/Manifest
index 4e79c6a54b5b..722b00cd9fda 100644
--- a/dev-python/snakeoil/Manifest
+++ b/dev-python/snakeoil/Manifest
@@ -1 +1,2 @@
 DIST snakeoil-0.7.4.tar.gz 301878 SHA256 67280c86e4b02c34100603d7525270c0017e0d182df54ad31ec2e5c145e69ceb SHA512 b3ae2223a267fa74699664470a4c4f6888cf2b68e688fe61d3acca85e00a138c3a037482ef304ee26f326cba252b473d265dcd72d0e0ab5723f4b0ed6e5e04ce WHIRLPOOL c76905b7540ad1ab2186d2ce9a75a55660eb343a1cfefc835f8012f3cf10ad706ee837a995085fa327f38de8f790cc2155c540e5b0d2a6f90a0aebbf7198c7bb
+DIST snakeoil-0.7.5.tar.gz 303270 BLAKE2B 66d00cf50c8efd73d765904b9c7e8ba725caef9608e68f5707ddc09358507fe64214af73b333ec5bee2ef950d8dbad474cb5d9e4412757bc3c82d75909f6fc23 SHA512 b9f6efce2e3f5df83248b1faa84493aa11d8a08935e3991a56daace96e0de39dd5c7d25a69a4394f7ba163de78ed56a2619ef64c33114128fc02052d676a86a5
diff --git a/dev-python/snakeoil/metadata.xml b/dev-python/snakeoil/metadata.xml
index 632e3554b912..9defaede9abc 100644
--- a/dev-python/snakeoil/metadata.xml
+++ b/dev-python/snakeoil/metadata.xml
@@ -7,5 +7,6 @@
   </maintainer>
   <upstream>
     <remote-id type="github">pkgcore/snakeoil</remote-id>
+    <remote-id type="pypi">snakeoil</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/snakeoil/snakeoil-0.7.5.ebuild b/dev-python/snakeoil/snakeoil-0.7.5.ebuild
new file mode 100644
index 000000000000..38a023db443b
--- /dev/null
+++ b/dev-python/snakeoil/snakeoil-0.7.5.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_REQ_USE="threads(+)"
+inherit distutils-r1
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/pkgcore/snakeoil.git"
+	inherit git-r3
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+	SRC_URI="https://github.com/pkgcore/snakeoil/releases/download/v${PV}/${P}.tar.gz"
+fi
+
+DESCRIPTION="misc common functionality and useful optimizations"
+HOMEPAGE="https://github.com/pkgcore/snakeoil"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/mock[${PYTHON_USEDEP}] )"
+[[ ${PV} == 9999 ]] && DEPEND+=" $(python_gen_cond_dep 'dev-python/cython[${PYTHON_USEDEP}]' 'python3*')"
+
+python_configure_all() {
+	# disable snakeoil 2to3 caching
+	unset PY2TO3_CACHEDIR
+}
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/snakeoil/snakeoil-9999.ebuild b/dev-python/snakeoil/snakeoil-9999.ebuild
index c037456a6ebe..38a023db443b 100644
--- a/dev-python/snakeoil/snakeoil-9999.ebuild
+++ b/dev-python/snakeoil/snakeoil-9999.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	SRC_URI="https://github.com/pkgcore/snakeoil/releases/download/v${PV}/${P}.tar.gz"
 fi
 
 DESCRIPTION="misc common functionality and useful optimizations"
diff --git a/dev-python/wstools/files/wstools-0.4.5-setup.patch b/dev-python/wstools/files/wstools-0.4.5-setup.patch
new file mode 100644
index 000000000000..9de7c159c972
--- /dev/null
+++ b/dev-python/wstools/files/wstools-0.4.5-setup.patch
@@ -0,0 +1,46 @@
+Avoid pulling in a lot of unnecessary test and setup deps.
+
+--- wstools-0.4.5/setup.py
++++ wstools-0.4.5/setup.py
+@@ -9,7 +9,7 @@
+ 
+ from setuptools import setup, find_packages, Command
+ from setuptools.command.test import test as TestCommand
+-from pip.req import parse_requirements
++#from pip.req import parse_requirements
+ 
+ NAME = "wstools"
+ url = "https://github.com/pycontribs/wstools.git"
+@@ -55,13 +55,13 @@
+ 
+     def run_tests(self):
+         # before running tests we need to run autopep8
+-        try:
+-            subprocess.check_call(
+-                "python -m autopep8 -r --in-place wstools/ tests/",
+-                shell=True)
+-        except subprocess.CalledProcessError:
+-            logging.getLogger().warn('autopep8 is not installed so '
+-                                     'it will not be run')
++        # try:
++        #     subprocess.check_call(
++        #         "python -m autopep8 -r --in-place wstools/ tests/",
++        #         shell=True)
++        # except subprocess.CalledProcessError:
++        #     logging.getLogger().warn('autopep8 is not installed so '
++        #                              'it will not be run')
+         # import here, cause outside the eggs aren't loaded
+         import pytest  # noqa
+         errno = pytest.main(self.pytest_args)
+@@ -136,9 +136,9 @@
+     cmdclass={'test': PyTest, 'release': Release, 'prerelease': PreRelease},
+     packages=find_packages(exclude=['tests']),
+     include_package_data=True,
+-    tests_require=get_requirements(base_path, 'requirements-dev.txt'),
++    #tests_require=get_requirements(base_path, 'requirements-dev.txt'),
+     setup_requires=['setuptools'],
+-    install_requires=get_requirements(base_path, 'requirements.txt'),
++    install_requires=['six'],
+ 
+     license='BSD',
+     description="WSDL parsing services package for Web Services for Python. see" + url,
diff --git a/dev-python/wstools/wstools-0.4.5-r1.ebuild b/dev-python/wstools/wstools-0.4.5-r1.ebuild
new file mode 100644
index 000000000000..9a3d508f201b
--- /dev/null
+++ b/dev-python/wstools/wstools-0.4.5-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="WSDL parsing services package for Web Services for Python"
+HOMEPAGE="https://github.com/kiorky/wstools https://pypi.python.org/pypi/wstools"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-macos ~x86-macos"
+IUSE="test"
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)"
+
+PATCHES=( "${FILESDIR}"/${P}-setup.patch )
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/wstools/wstools-0.4.5.ebuild b/dev-python/wstools/wstools-0.4.5.ebuild
deleted file mode 100644
index 50f2db48e105..000000000000
--- a/dev-python/wstools/wstools-0.4.5.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="WSDL parsing services package for Web Services for Python"
-HOMEPAGE="https://github.com/kiorky/wstools https://pypi.python.org/pypi/wstools"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-python/autopep8[${PYTHON_USEDEP}]
-	dev-python/execnet[${PYTHON_USEDEP}]
-	dev-python/pep8[${PYTHON_USEDEP}]
-	dev-python/pytest[${PYTHON_USEDEP}]
-	dev-python/pytest-cache[${PYTHON_USEDEP}]
-	dev-python/pytest-cov[${PYTHON_USEDEP}]
-	dev-python/pytest-pep8[${PYTHON_USEDEP}]
-	dev-python/pytest-timeout[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/pip[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/xapp/xapp-1.0.1-r2.ebuild b/dev-python/xapp/xapp-1.0.1-r2.ebuild
new file mode 100644
index 000000000000..5e6426fce4e9
--- /dev/null
+++ b/dev-python/xapp/xapp-1.0.1-r2.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python bindings for x11-libs/xapps"
+HOMEPAGE="https://github.com/linuxmint/python-xapp"
+SRC_URI="https://github.com/linuxmint/python-xapp/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="x11-libs/xapps[introspection]"
+RDEPEND="${DEPEND}
+	dev-python/psutil[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}/python-xapp-${PV}"
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index d2e21a4baf48..8de9b0e86c65 100644
Binary files a/dev-ruby/Manifest.gz and b/dev-ruby/Manifest.gz differ
diff --git a/dev-ruby/backports/metadata.xml b/dev-ruby/backports/metadata.xml
index 241c4fa202d7..570157f98d82 100644
--- a/dev-ruby/backports/metadata.xml
+++ b/dev-ruby/backports/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 	<maintainer type="project">
 		<email>ruby@gentoo.org</email>
-        <name>Gentoo Ruby Project</name>
+		<name>Gentoo Ruby Project</name>
 	</maintainer>
 	<upstream>
 		<remote-id type="github">marcandre/backports</remote-id>
diff --git a/dev-ruby/bcat/Manifest b/dev-ruby/bcat/Manifest
index a1180f78ec3e..3df437c5ea75 100644
--- a/dev-ruby/bcat/Manifest
+++ b/dev-ruby/bcat/Manifest
@@ -1 +1 @@
-DIST bcat-0.6.2.gem 22016 SHA256 a11816491a1f0233b838d6828f3a157cca95d0ca3dbab82b25ee68f62ce55c70 SHA512 142f853ca0931e5ba300276b1db0977fa275b9b13602940fbaca2c5d32ff881fe753dee25632526a348d71cf71eb6e390aed821b4ba1f48e380d6369ad87ead7 WHIRLPOOL 1132a63a18a5beb6e632dcd22d9585783a1699e97d62b4ec352e0c9892225a754ce1e70e3a2da6d4552b73c6298921cb02253096d9dba2a418f8589df2b7d783
+DIST bcat-0.6.2.gem 22016 BLAKE2B abfaec6d9db25990838019d0e9f4dde918f260c01340e34ab272f8a2e02155674ca38bf91843925df31102982cba02ada69abbf7e9ec4b91d4f2cb87b27be339 SHA512 142f853ca0931e5ba300276b1db0977fa275b9b13602940fbaca2c5d32ff881fe753dee25632526a348d71cf71eb6e390aed821b4ba1f48e380d6369ad87ead7
diff --git a/dev-ruby/bcat/bcat-0.6.2-r2.ebuild b/dev-ruby/bcat/bcat-0.6.2-r2.ebuild
index 122859ad9662..557d63c5dc84 100644
--- a/dev-ruby/bcat/bcat-0.6.2-r2.ebuild
+++ b/dev-ruby/bcat/bcat-0.6.2-r2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/rtomayko/bcat"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd"
 IUSE=""
 
 # Collides on /usr/bin/bcat, bug 418301
diff --git a/dev-ruby/bindata/metadata.xml b/dev-ruby/bindata/metadata.xml
index f14f55ce0ffb..4ff4595c0e57 100644
--- a/dev-ruby/bindata/metadata.xml
+++ b/dev-ruby/bindata/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>zerochaos@gentoo.org</email>
-    <name>Rick Farina</name>
-  </maintainer>
-  <upstream>
-	  <remote-id type="github">dmendel/bindata</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>zerochaos@gentoo.org</email>
+		<name>Rick Farina</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">dmendel/bindata</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/childprocess/Manifest b/dev-ruby/childprocess/Manifest
index 096006f53578..96cb4c9b6ee4 100644
--- a/dev-ruby/childprocess/Manifest
+++ b/dev-ruby/childprocess/Manifest
@@ -1,4 +1,4 @@
-DIST childprocess-0.6.3.gem 31744 SHA256 7b319509275e326d6b673c2f82ad21db7c3598fe854fe16bffa9ffc6f4206edc SHA512 93d2dbd23dfbaa6eb7eaf1c5791802180aece373aa912e78b1c3652e4e96f0e73ef948e484715863eef95e6af6daa1292944ebe987c331ce0d59ba086c803db5 WHIRLPOOL b5ec03b784d3576d6ad666a980c367638693786d932705b5520ba6094414fdd8e7b6c9c515846b9339b741c37b67eef28bc09106b50efe2635f9bedcc0951706
-DIST childprocess-0.7.0.gem 32256 SHA256 0da6258189a05d975727395c04e42d5ea2336fdc4c4cc615226b81fd4a2a0e67 SHA512 f06203ffecc09f5ab2dd2fe003de0e1f96906b1c5966c2dd630cccae046fd4b4efc6f8c96d4c825af2b4ab2e0e8dd63f6dee97701627d0ad311f0d8395c89c8a WHIRLPOOL 6ce3e7256deb415fbc46a06347b89cb7f216fda49520807b3b24732bdaf2b97f6b67f180d19cd2fe29ed22b9034f08665ca5fd306acf1ab535665128f1f74cea
-DIST childprocess-0.7.1.gem 32256 SHA256 411abbefacab4d769d20ab2b69fe6dff855b7ee4b7b6b2d22d5211ef79bd9e11 SHA512 c8e22a3244b5f6315ea003b20feb3f5a576c73938d8eb730f3aea99dc63662497a954531139983ffce74ebc089609e9ecc665144cfa6f05c699804615ca68902 WHIRLPOOL 750f0d5b5fa90cbbb86b80e5112c6a8269a6723ebeaec63800e76ee1e094c92aa4fe3b762c4a9dc55adc5106b219f915bd0e43dbdd77a2b7d1dd9a127ca1dba7
-DIST childprocess-0.8.0.gem 32768 SHA256 bab28cef7c17bc9242d75c8dd535dd8d2bdc989d1c5cf02550b04b9cdfea3020 SHA512 7e10c15930012bf99ea28afa677a6f745d4e6ebfc21f21f7101111c5a2d35df4fb146bbddb4d1e7a6711324ee7604af50995960570e85ed3f8fe087c59fc02cf WHIRLPOOL ab669a42b117722e6824c463b2d2af6f9db183f633c559b07d78e532114fae138c21964a45a26cea4e4976279e11072f39f1c7ef93ad3153d78f830fa2bf1398
+DIST childprocess-0.6.3.gem 31744 BLAKE2B 18fedbe7fbfa1a3954e74206b1f6207351d430a2092dda1f230f54c790c5531cf2a4f302bb86a9adf044e16cfafb132ece45152defd0c4c18445f49d5466f2b1 SHA512 93d2dbd23dfbaa6eb7eaf1c5791802180aece373aa912e78b1c3652e4e96f0e73ef948e484715863eef95e6af6daa1292944ebe987c331ce0d59ba086c803db5
+DIST childprocess-0.7.0.gem 32256 BLAKE2B 58654d088b2b45917ce279de5178b21694ddb32c2771eb04b2b9de2db5e1f4cfcd6250947a38f51332dbdde730118cd63cd5432f0d54138b795416bbc6589365 SHA512 f06203ffecc09f5ab2dd2fe003de0e1f96906b1c5966c2dd630cccae046fd4b4efc6f8c96d4c825af2b4ab2e0e8dd63f6dee97701627d0ad311f0d8395c89c8a
+DIST childprocess-0.7.1.gem 32256 BLAKE2B 428eef33c465e8805c855a9389fb0f393e04c48f0f30de4cd2f407cbf403fcfd621283cc9aafcc8336c19415245b180d46036c0e50910fcd8543ad346e0faec3 SHA512 c8e22a3244b5f6315ea003b20feb3f5a576c73938d8eb730f3aea99dc63662497a954531139983ffce74ebc089609e9ecc665144cfa6f05c699804615ca68902
+DIST childprocess-0.8.0.gem 32768 BLAKE2B c473da69bd38bda1e28e6adbac7b11597b05eafa58315996435052683f2e3ed500f3c83b27b17859115e1113e0da726007d0ccac3fee171b5338a9026482ac6f SHA512 7e10c15930012bf99ea28afa677a6f745d4e6ebfc21f21f7101111c5a2d35df4fb146bbddb4d1e7a6711324ee7604af50995960570e85ed3f8fe087c59fc02cf
diff --git a/dev-ruby/childprocess/childprocess-0.6.3.ebuild b/dev-ruby/childprocess/childprocess-0.6.3.ebuild
index b49f8702c987..e630342ebddf 100644
--- a/dev-ruby/childprocess/childprocess-0.6.3.ebuild
+++ b/dev-ruby/childprocess/childprocess-0.6.3.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/jarib/childprocess"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 x86"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 x86"
 IUSE=""
 
 ruby_add_bdepend "doc? ( dev-ruby/yard dev-ruby/rspec:3 )"
diff --git a/dev-ruby/coderay/Manifest b/dev-ruby/coderay/Manifest
index a35941d1c347..2916f100f46c 100644
--- a/dev-ruby/coderay/Manifest
+++ b/dev-ruby/coderay/Manifest
@@ -1,2 +1,2 @@
-DIST coderay-1.1.0.tar.gz 242639 SHA256 a33f6490aacd1d035fa82e2c1fe88b0e2c9553c1f7d24b813ca2b4d73804342f SHA512 9443a629bf60b7f888198ebfc72f012cceda5c9cb3e14204b3d025807dc4cb0ca0896869ae1cc89f1aa87a7c0e84830cb03aee2c4da4fd80326606a0e22b2031 WHIRLPOOL 50c5b6d07e803bfd7e14c10b0f583657f2b95dc548a748a8d677b80c49480110e9e763bdd6fe376bf58b1992a61a93e88ba2b5476ce9437e41a8d1fc5addc745
-DIST coderay-1.1.2.tar.gz 220645 SHA256 20b83bbe9009fe47aa7a90d514ba2670d161d7ae57265b5e5e2ab98eaa377a3b SHA512 cfce5e9f0a0d988e7920912e064ecbef3b54200a08ca2e07453452edd7f382a1eb9292bc566e069f5d1b784033e816f13d9ddfb39520e8e44a8d1e898aa33591 WHIRLPOOL e0823e864be015805b8961acafe869195b46fd527dfaa782d53bbb8051dfcefbb30a97c4d4f68669b5582b0c837bdec27b1a9572ef7976907ba8227d9a389b7f
+DIST coderay-1.1.0.tar.gz 242639 BLAKE2B fb12c20d499801260ade239273af72e62ef895004bfc805039f7a235fd0ea1befcc150f7ca6ca61da9fa90ab678f8b3e0fd865bea9e2d1c9776f2af92c525c4d SHA512 9443a629bf60b7f888198ebfc72f012cceda5c9cb3e14204b3d025807dc4cb0ca0896869ae1cc89f1aa87a7c0e84830cb03aee2c4da4fd80326606a0e22b2031
+DIST coderay-1.1.2.tar.gz 220645 BLAKE2B 85405da2b148ae23573abf2c3fcf94a643024756308e83c4cecf0a5edae2fedc4ca7c7bdf8fb5936310f6699ca8f06f91cceb475e00511a54af0a96dd517c234 SHA512 cfce5e9f0a0d988e7920912e064ecbef3b54200a08ca2e07453452edd7f382a1eb9292bc566e069f5d1b784033e816f13d9ddfb39520e8e44a8d1e898aa33591
diff --git a/dev-ruby/coderay/coderay-1.1.0-r2.ebuild b/dev-ruby/coderay/coderay-1.1.0-r2.ebuild
index dee3c56964ea..adfce2f3fa5f 100644
--- a/dev-ruby/coderay/coderay-1.1.0-r2.ebuild
+++ b/dev-ruby/coderay/coderay-1.1.0-r2.ebuild
@@ -22,7 +22,7 @@ SRC_URI="https://github.com/rubychan/coderay/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 # Redcloth is optional but automagically tested, so we add this
diff --git a/dev-ruby/coderay/coderay-1.1.2.ebuild b/dev-ruby/coderay/coderay-1.1.2.ebuild
index caa0e52681cf..12605221149e 100644
--- a/dev-ruby/coderay/coderay-1.1.2.ebuild
+++ b/dev-ruby/coderay/coderay-1.1.2.ebuild
@@ -22,7 +22,7 @@ SRC_URI="https://github.com/rubychan/coderay/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 # Redcloth is an optional but automagically tested dependency. This
diff --git a/dev-ruby/fakefs/Manifest b/dev-ruby/fakefs/Manifest
index dfb5774f2cc3..55ad80e898c3 100644
--- a/dev-ruby/fakefs/Manifest
+++ b/dev-ruby/fakefs/Manifest
@@ -1,6 +1,5 @@
-DIST fakefs-0.11.0.tar.gz 44675 SHA256 43053f3997afe9ed909e1e24e044bd6ce8db153d830847042bf8fd1cf6ce0eb3 SHA512 8d3347e7d2f088eba75a67c61b029a8eb40a14a553824c74d0af1f22211daed3502d7e31676cad90c436cbece17f5d3ee7522bc4ede9578d3ee5ab24ca02b4c5 WHIRLPOOL 11d084e4308ecefa446fe640a8e6ec5a4a5787d33fbe84ced312773ef9e25ab145a3ea25657a2c45622beb85f28dbf370970152be09cc02d6ee70e7ddc36ad01
-DIST fakefs-0.11.1.tar.gz 44692 SHA256 9436542d5d5d8ced67a84e459d7efd0ba3557fb2c8e61c50ee099eff9a338e31 SHA512 068137085a400f4a66394910e04434b9ed8bc317dcbe9d0b3d4d3034d11652771fc0fa7f48ff8e791fa2e33b9221b9d6dd8dd73c7c493b884dbe4f4a98f58722 WHIRLPOOL d598cc913a4a532aad8f465e02ae2e895f6a5060b81bcb743c683f0c9d8f3b41745a0e5486a2669794c05b4f43ab604f00cdca94e902a1e4291084a65bf759d0
-DIST fakefs-0.11.2.tar.gz 44830 SHA256 c936930397a3b307b549d86e3adde1ad9ccd50d776f3e88dff70828270dd2084 SHA512 a381f895d1dc38258c4a4d6bd804d0d9b483211534ce9e63929106256c9d93cd26b9b91e77a8bc5b9d185ce8ead89639fae744745bc1100a431d5cacd799c1ee WHIRLPOOL 0b11d2d0ddf510eda6931c670c8c522434a58d26806108d53c216b9b5bc080552675a0c234e66c088f7087f96c3119fb6b13a278ac555304a87863fc5869c1e2
-DIST fakefs-0.11.3.tar.gz 44888 SHA256 ea318ec5ebaf1c22e9c0432ebd82b9ea195bf0aaa61fc9c63d0202c4f3417f2d SHA512 9c9e18337d3c461fe4b5a4e6ede17cd840959147e66a57eb61fa203d8ba95d5655885d3e5b776ecb3a1cee93488dc711d1b2bd28df23bc131195e311229c329d WHIRLPOOL 4b0a6e78f8713cf6b3767cf0b34468c80f384e3c5ad2f5cfc8652fa12c1eae4de9add4420f508baad18564e0303977b92afa99bb6bcbefc4dc3b5c0aa8692320
-DIST fakefs-0.6.0.gem 41984 SHA256 43a668e9a436654d66eff7e896793800b4b8d87c3ecd5a6a84e23fb52580150e SHA512 8c0eac75103e1917551e2f5e74a5324d5a606e7692a8e4c49c9b97e2b5005bd381073a5780a8e6d1fb661a1bb4a67e56c29ce98cd2e2e62cce22602c30e4225f WHIRLPOOL c1a520c9cf3913e727ef570367d238e2ec88eb8d41789d1d33e9227a5a5dd9c62f4a462374066e1e5b5c5ac8bb0f738e6513b4d4182c20969178a82f90aa2739
-DIST fakefs-0.9.2.tar.gz 42792 SHA256 ee101189b93b96ef6980d10e6320294641488691e4ab9b6057169f3fd1fc43fa SHA512 ba68f9d240d54379ba8b16dcb3e375b586c50f78a081a916151d21af2d6d8b61471fdc842ad91d1390e8dcf54b0744e95ba4794a5ebc915858886ec47f9dbb8a WHIRLPOOL 60362f90e57abee6bfa6b8ecc833b6ff62558b7b14efe8f0c084b244e961511c839446f1f16bc7b1c1361c8cdc5031993083cac4a9aab6ed081f8fea5e6275be
+DIST fakefs-0.11.0.tar.gz 44675 BLAKE2B 7f3e1f494bc43d7b926bc78f8fd193c7e3f3b60d340711bdb92edc48916e60b8f8dd81db7f83ef79325d658570563b7fbcbffd6f4192345a9aa46219e6b9ffe8 SHA512 8d3347e7d2f088eba75a67c61b029a8eb40a14a553824c74d0af1f22211daed3502d7e31676cad90c436cbece17f5d3ee7522bc4ede9578d3ee5ab24ca02b4c5
+DIST fakefs-0.11.1.tar.gz 44692 BLAKE2B d53569e2983d5e8d3c00d1bfa8b2abe43eaca5f6006142722906f23d3b48a978493cf9f221e1e961e3941f3558d65c94b16ca751869297535582bde67796dfb6 SHA512 068137085a400f4a66394910e04434b9ed8bc317dcbe9d0b3d4d3034d11652771fc0fa7f48ff8e791fa2e33b9221b9d6dd8dd73c7c493b884dbe4f4a98f58722
+DIST fakefs-0.11.2.tar.gz 44830 BLAKE2B 6bde3ba36cca56fa56a0320dc5325cf5a75b5c7174ccd159b6d0f4b345187501eefd2415870ee822661587a49653c3b6d156278b2b941e4f475e8f85b138b715 SHA512 a381f895d1dc38258c4a4d6bd804d0d9b483211534ce9e63929106256c9d93cd26b9b91e77a8bc5b9d185ce8ead89639fae744745bc1100a431d5cacd799c1ee
+DIST fakefs-0.11.3.tar.gz 44888 BLAKE2B 498dbcbe12389f27b6c6776425910f91ccc45ff85db1fa59e4fef8635dc9923294dbc979df2d10846d1435e81ee6d622190d3195399a4778d00bd4446edd2571 SHA512 9c9e18337d3c461fe4b5a4e6ede17cd840959147e66a57eb61fa203d8ba95d5655885d3e5b776ecb3a1cee93488dc711d1b2bd28df23bc131195e311229c329d
+DIST fakefs-0.9.2.tar.gz 42792 BLAKE2B dc2037960f9aa05f62e09f8fb98f7b115c6f63af56436573ce88bc66fee2cb42f1e362ceb2de7f17b21701b884ad8bc7c6ef5170a7441fcc16fb16977cbb1b4f SHA512 ba68f9d240d54379ba8b16dcb3e375b586c50f78a081a916151d21af2d6d8b61471fdc842ad91d1390e8dcf54b0744e95ba4794a5ebc915858886ec47f9dbb8a
diff --git a/dev-ruby/fakefs/fakefs-0.6.0-r1.ebuild b/dev-ruby/fakefs/fakefs-0.6.0-r1.ebuild
deleted file mode 100644
index 5f243b93b8ec..000000000000
--- a/dev-ruby/fakefs/fakefs-0.6.0-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby21 ruby22"
-
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-# requires sdoc
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_EXTRADOC="CONTRIBUTORS README.markdown"
-
-inherit ruby-fakegem eutils
-
-DESCRIPTION="A fake filesystem. Use it in your tests"
-HOMEPAGE="https://github.com/defunkt/fakefs"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/rspec:2
-		>=dev-ruby/test-unit-2.5.1-r1
-	)"
-
-all_ruby_prepare() {
-	# Remove bundler
-	rm Gemfile || die
-}
-
-each_ruby_test() {
-	ruby-ng_rspec
-	ruby-ng_testrb-2 -Ilib:test test/**/*_test.rb
-}
diff --git a/dev-ruby/gh/metadata.xml b/dev-ruby/gh/metadata.xml
index d164aa53d4a1..976e775669cd 100644
--- a/dev-ruby/gh/metadata.xml
+++ b/dev-ruby/gh/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 	<maintainer type="project">
 		<email>ruby@gentoo.org</email>
-        <name>Gentoo Ruby Project</name>
+		<name>Gentoo Ruby Project</name>
 	</maintainer>
 	<upstream>
 		<remote-id type="github">travis-ci/gh</remote-id>
diff --git a/dev-ruby/gherkin/Manifest b/dev-ruby/gherkin/Manifest
index edf2036e0027..dd898708a14a 100644
--- a/dev-ruby/gherkin/Manifest
+++ b/dev-ruby/gherkin/Manifest
@@ -1,4 +1,4 @@
-DIST gherkin-2.12.0-git.tgz 605964 SHA256 09206d66e437bfa2cb917a251899e3e95479c47d713a2b8de3e7dcbdd9982bfa SHA512 e86c2299bb3b41845bf8a3119b65ff855023510173b04c1e08e1105c03523e0e89ec45db4c7034e85fc20b7a9e1ce5a791aaf3f4793d44c0aa782ffd9fcee83a WHIRLPOOL dcfc5b5a0dcad7e401c2e0afb41e53593d095a44e97df8eadffa634b155ccb5a979f3e719e57c32d18afac0be49d31021276abc20010a6a9259ca041c155a390
-DIST gherkin-2.12.2-git.tgz 1764938 SHA256 139739eae42c7da925c816c859a41dcf539a361040ffb64c174e90e3fd9425b9 SHA512 1030bcaf31791c7031f22b8e4c5d94ddbddf012b8686d06a7598fde99a28f8a1fda45dc66dbdefdb825a045730b077a10ca1134835630710551e20364886ce51 WHIRLPOOL b5bdcff4a1e8e8ff32c202cac4e33ba9f07dac09ad723b9b6ef202dfa6a86413aff4e5fe24c69962edccf24158c9c85e8d32fc75a92ee0243943dff04327fe7c
-DIST gherkin-4.1.3.gem 350208 SHA256 e9bc29c0352dc3a2054b1bf9c6f76fdafba69062bbf784974ccd63e12aca28b4 SHA512 7c113172ddf38ccf7e49eaac19355f3cb991f69d7499dba9189f375b75d3614f349fc6374e584a92c1223b0708cc8944859b4b38e28d79779a5091fa0c775e6e WHIRLPOOL adcd36c4991b7f548481089c927a8cca24092f392b4403fc2ec7414460a5786844801736290d83a1d7bf75a251926786e9e1f4d8ee9908906a1ccc57d28e43c1
-DIST gherkin-5.0.0.gem 340992 SHA256 c70bca25bb4a0f0fc47b47338713e53608431fc4da136955d8ab38cda4872e2b SHA512 cc782e37f5aea4ad0776f5336e6218b77e7fd8d193786acffaa44685de3a2592e4e6f37a3787add807654901afd12bc2d094a782b154bb2be9e2cd16e283df2a WHIRLPOOL f9b26222d7df5c04e5f32ad267e768fd331e145de7986f6d74c0137fea92e1b9e71d96f18413a1288fa4ea6a019801e3d7b3a7fd9dc65a98a37c391fc98836da
+DIST gherkin-2.12.0-git.tgz 605964 BLAKE2B 035f3ce3541010d42351b728c4452befa4939da0216b059d3895f5677e4bffa2a40b389e21292d0051a3126064d137e5e0f2c7bd030e42a8c4ab38cbd4a7f7f2 SHA512 e86c2299bb3b41845bf8a3119b65ff855023510173b04c1e08e1105c03523e0e89ec45db4c7034e85fc20b7a9e1ce5a791aaf3f4793d44c0aa782ffd9fcee83a
+DIST gherkin-2.12.2-git.tgz 1764938 BLAKE2B b5cc7f063c8567df2dfe92fe805d5310feeba967865221ce69c8c24986ab786851885f4724b17a028daea298eea340b3bcd0c7296f05b02816c837ffdf8a41b5 SHA512 1030bcaf31791c7031f22b8e4c5d94ddbddf012b8686d06a7598fde99a28f8a1fda45dc66dbdefdb825a045730b077a10ca1134835630710551e20364886ce51
+DIST gherkin-4.1.3.gem 350208 BLAKE2B 3b0f54124c9f29c9216aaa9810526f1e11f6243b02143443d0ac18209320c14fda67f1c36d3056dbe5adbc18c36f72270054c17a011921eb87f8d21bc3e8c3c9 SHA512 7c113172ddf38ccf7e49eaac19355f3cb991f69d7499dba9189f375b75d3614f349fc6374e584a92c1223b0708cc8944859b4b38e28d79779a5091fa0c775e6e
+DIST gherkin-5.0.0.gem 340992 BLAKE2B a8292fde04c98c409423733791e78b9d6e40a7a60b59a1acd0a0e9c6df0be9185e90f1c5af6ce0ac39f352457c18094c495557fb05323eb7ea5ae8ce27008950 SHA512 cc782e37f5aea4ad0776f5336e6218b77e7fd8d193786acffaa44685de3a2592e4e6f37a3787add807654901afd12bc2d094a782b154bb2be9e2cd16e283df2a
diff --git a/dev-ruby/gherkin/gherkin-2.12.0-r3.ebuild b/dev-ruby/gherkin/gherkin-2.12.0-r3.ebuild
index baecbaa0cd1b..77bb691d3a12 100644
--- a/dev-ruby/gherkin/gherkin-2.12.0-r3.ebuild
+++ b/dev-ruby/gherkin/gherkin-2.12.0-r3.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/cucumber/gherkin"
 LICENSE="MIT"
 SRC_URI="https://github.com/cucumber/gherkin/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 ~sparc x86"
 SLOT="0"
 IUSE="doc test"
 
diff --git a/dev-ruby/highline/highline-1.7.8.ebuild b/dev-ruby/highline/highline-1.7.8.ebuild
index 6dce707150f4..3458d5b82997 100644
--- a/dev-ruby/highline/highline-1.7.8.ebuild
+++ b/dev-ruby/highline/highline-1.7.8.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/JEG2/highline"
 IUSE=""
 LICENSE="|| ( GPL-2 Ruby )"
 SLOT="0"
-KEYWORDS="alpha amd64 ~hppa ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
 all_ruby_prepare() {
 	# fix up gemspec file not to call git
diff --git a/dev-ruby/hoe/Manifest b/dev-ruby/hoe/Manifest
index 846b2651fa3a..3d7afd7bca66 100644
--- a/dev-ruby/hoe/Manifest
+++ b/dev-ruby/hoe/Manifest
@@ -1,2 +1,2 @@
 DIST hoe-3.13.0.gem 130048 SHA256 a74013aa6749ab10f0db92e9ad56e735d407104baa0981bf0d10dc2feacefef7 SHA512 0b6b109a063811651787ccf3d63eff2944024013a75c0c3362056d2fba6668141b7541fff8e53a9ef414899adc560546a98c452878aa5c53620a115fef7ce242 WHIRLPOOL 3639b1b2d984110ab234e5d48744f362031c312ebb47d5994c102e2aa71e6b83039b5bf9549b951b3d653b6c131f39d489602787c6a1fb7cbefb3171a5f1a9b8
-DIST hoe-3.16.0.gem 188416 SHA256 8bee33376af7dacbd0f3440614453589e60df14c13471c938ab6124bb8b6280f SHA512 66cefb5a24906e19bbf0c82c8539d6d101b84d0dc1d3ce1910e4117357639489968271e76e86bd3c432b9ef7e3b24a78294c06210cbef280860f7dac18100606 WHIRLPOOL 778b59cab2ed778fa8e4ad62e90ca26b346bd0942e747f17594fbc475bc233f7495e5b4457818fc97e04b6111197d40012ebaa65acf5d2a27862c09d2a61acbe
+DIST hoe-3.16.0.gem 188416 BLAKE2B 48383c46512a359a269ca3475ec701b1443e0ef71b31d1ca1604de391ed4df6b0ad27dd1c5f6ed04751047d211f2c6299245361cf131e2418f224324ac9934c3 SHA512 66cefb5a24906e19bbf0c82c8539d6d101b84d0dc1d3ce1910e4117357639489968271e76e86bd3c432b9ef7e3b24a78294c06210cbef280860f7dac18100606
diff --git a/dev-ruby/hoe/hoe-3.16.0.ebuild b/dev-ruby/hoe/hoe-3.16.0.ebuild
index ed3876579b2b..5c621f71e5a8 100644
--- a/dev-ruby/hoe/hoe-3.16.0.ebuild
+++ b/dev-ruby/hoe/hoe-3.16.0.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://www.zenspider.com/projects/hoe.html"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc"
 
 ruby_add_bdepend "test? ( >=dev-ruby/minitest-5.9:5 )"
diff --git a/dev-ruby/hpricot/Manifest b/dev-ruby/hpricot/Manifest
index ef1c0f3d2e31..e2a1747d7308 100644
--- a/dev-ruby/hpricot/Manifest
+++ b/dev-ruby/hpricot/Manifest
@@ -1 +1 @@
-DIST hpricot-0.8.6.gem 293888 SHA256 dfe8f4b3414ba8377d7626030f3aa605caadee9de87cffbeadf8a50359eac8ca SHA512 f0ea9168ae79d099cdb751dd5a205e0896dfb229759e499fff833e94209d1497aa97becb285176dcbcc1fee19bc11913ca3ac0d7a467067e5d837c1eb6e310ad WHIRLPOOL d45ca1c1d8edfab43abcc0a14c3b035b9b9b934d95212ce61109692d83bbc641c34451b3dbd946fe9af7583628ab76eaeb097c909db5a182d2a86973b755ad4c
+DIST hpricot-0.8.6.gem 293888 BLAKE2B 5c054c6fcd5c3365dbf44f3c502bc4c1c3885f4aa43fd1fd15365aea19600ef0ef48157c39ef1709386bda0bc3fb6bba6d98862e8e28bdb5c173429969ef5ab9 SHA512 f0ea9168ae79d099cdb751dd5a205e0896dfb229759e499fff833e94209d1497aa97becb285176dcbcc1fee19bc11913ca3ac0d7a467067e5d837c1eb6e310ad
diff --git a/dev-ruby/hpricot/hpricot-0.8.6-r5.ebuild b/dev-ruby/hpricot/hpricot-0.8.6-r5.ebuild
index 73f1d06b5b86..3012d873536d 100644
--- a/dev-ruby/hpricot/hpricot-0.8.6-r5.ebuild
+++ b/dev-ruby/hpricot/hpricot-0.8.6-r5.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://wiki.github.com/hpricot/hpricot"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "dev-ruby/rake
diff --git a/dev-ruby/locale/Manifest b/dev-ruby/locale/Manifest
index 659297d82c49..e092a8d378fb 100644
--- a/dev-ruby/locale/Manifest
+++ b/dev-ruby/locale/Manifest
@@ -1,2 +1,2 @@
-DIST locale-2.1.0-git.tgz 99139 SHA256 0773283ff0db2a6574ba5ea05132598ea0bad1f88cd0bb037be7e461ed6aa565 SHA512 6f87730f8e6b128a6647bc0c7d223d5e90e85d5bcec884c0680963b09a221882a6dcadb088a27aeb8cc96652582278a5ce24302125902b2c97ca8b00c701abeb WHIRLPOOL 1cf895045c9fd5e273289082e7a1c357a0bf43e2c01a4b8e1567e27fcc71c5a01dbfdd0c7ccb2b08980b01abf00863c59bdd883820466ab36a776a1263245d70
-DIST locale-2.1.2-git.tgz 99433 SHA256 d881ed2a4e9c929ab060163ace2415c969324b0f600981637181ed9b6b99d9bd SHA512 62a0c60f2102cd2d144126985748f4ab186b8f582c9597f7f4080e782196a39d72b9947b90aaecf5b208ccad0175064ac90e816472fb374d19cb5209da0f7ff4 WHIRLPOOL f19bfaadcc46115f69e78c33b924170dde3f2dac04af24bbd196cbd5722d3c1abc7ccd0e18bb915adede09439619abfbaca2785475e4ce1dd2acab7e981c1ca8
+DIST locale-2.1.0-git.tgz 99139 BLAKE2B d45adbc07795fb045e13ea62493c97b7b635093e61e7ca807bd5a63720a8ecef57cfc522fe9d5fd2d6cd8bc5c02aaccfc509bf191f0f9d7e8d0fbd70fdc84557 SHA512 6f87730f8e6b128a6647bc0c7d223d5e90e85d5bcec884c0680963b09a221882a6dcadb088a27aeb8cc96652582278a5ce24302125902b2c97ca8b00c701abeb
+DIST locale-2.1.2-git.tgz 99433 BLAKE2B b735d913e4a2f1f09131eb9aabc17cee93cd4b28f10458928942a3edd159cd1cde71226d4ad9aa9e340f5df5ba52a298805d1a4e73cb8dbc83d00bcecb7ceb85 SHA512 62a0c60f2102cd2d144126985748f4ab186b8f582c9597f7f4080e782196a39d72b9947b90aaecf5b208ccad0175064ac90e816472fb374d19cb5209da0f7ff4
diff --git a/dev-ruby/locale/locale-2.1.0-r2.ebuild b/dev-ruby/locale/locale-2.1.0-r2.ebuild
index 2641f5a3d52f..ffcf605d6a35 100644
--- a/dev-ruby/locale/locale-2.1.0-r2.ebuild
+++ b/dev-ruby/locale/locale-2.1.0-r2.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/ruby-gettext/locale"
 LICENSE="|| ( Ruby GPL-2 )"
 SRC_URI="https://github.com/ruby-gettext/locale/archive/${PV}.tar.gz -> ${P}-git.tgz"
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 ~sparc x86 ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 ~sparc x86 ~x86-macos"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-ruby/minitest/Manifest b/dev-ruby/minitest/Manifest
index ec1e40de30b6..255db4809400 100644
--- a/dev-ruby/minitest/Manifest
+++ b/dev-ruby/minitest/Manifest
@@ -1,6 +1,6 @@
 DIST minitest-4.7.5.gem 57856 SHA256 3e0ac720a6d0787b4c822514739319493e187400e993fba96397bd64d58ae60e SHA512 7ea0a52d37f4631fb8b11d4389da2123e4207093f7b34c497fced8729c9086faaa35e997debdb53b694e05eb52b16e843960f0b54515c32207f87161a76c3851 WHIRLPOOL 49bbc557d62053b58208e6aef13dba085f393dbecd731b2915a0b885393ba2b4f1a612b46a018442d2f4fcfda9dfbe3025ae72d2946106a589623748fa4b382d
-DIST minitest-5.10.2.gem 75264 SHA256 be02bab5ab57b63520829d42fbded3d00ac420096c583b7db377c3689d41be86 SHA512 f2a0ee13166cd6cb2cebc1f075347f205ac14e03943b2cccff7eadd34d09f2fb8ea0a6c764f20a84efef6463f4101a998110809c81c385225b4f72eb5da687d2 WHIRLPOOL aa702445b9ea5fe923e13b8e1e49941e7a7293336fdcb0e194ec1c416f314a0cc0de983fe110accf91c315d932e60c9fcac93202b662a9d7c2550347c80afffc
-DIST minitest-5.10.3.gem 76288 SHA256 e2cf53a5b01932bfea16a5c76855836ddf2240ad53bcfdb09e99a6c0290ba214 SHA512 6a3b1c86471fd7bb6ca078de9f253aeb9533f8da027998c34cd7fb8165a1d3bb565c1f8df958bb0eef6b7e22658894175c5f54f475585f2c05bb667e812b7aa3 WHIRLPOOL 6f9a7d3f6ffa813a8fa5d38807df832352d168e34ce579673777fac788c4ce42bdaeecb538e370e2227cf0e3ebdf15e5d3b31b1324d15d42e50f4bf3e4179b8f
+DIST minitest-5.10.2.gem 75264 BLAKE2B a8967591bc590e839d1186e787c5d925b67d8a12f5b49dbcf04f653f53945aadae9b2bf93a432e67c3f7eb2c99d25d9730ee4530d189c059eeee9e46f4bc6ac8 SHA512 f2a0ee13166cd6cb2cebc1f075347f205ac14e03943b2cccff7eadd34d09f2fb8ea0a6c764f20a84efef6463f4101a998110809c81c385225b4f72eb5da687d2
+DIST minitest-5.10.3.gem 76288 BLAKE2B 2c4fa5bca17e8a6270923225cd91fa9b6374d2a00b278906faf4e3ead0baf5fb1572a3c75322befc35ad0016d86f49c905e7de0283b07c60585c4c0348d69701 SHA512 6a3b1c86471fd7bb6ca078de9f253aeb9533f8da027998c34cd7fb8165a1d3bb565c1f8df958bb0eef6b7e22658894175c5f54f475585f2c05bb667e812b7aa3
 DIST minitest-5.3.3.gem 67072 SHA256 b17c560235e6ab96ed243d7a821e4370af1316ad7a845188d22c56d7d71302d4 SHA512 e1ea2cea5b61231b3074aea1dfb15b104a4e8a6b361d274194b6876401c29f839be618eb7c0448a42bc51ce57f0c2fcd84a72d1b0e0ba034ec5ffe6fbf2ae509 WHIRLPOOL 66c72352b2cdeeeec494be4b2b0aac49153bce9d37c0dbcc9bb0eec4f4759d3f61fd12bbbda0a2a7f26bb75741033a4208da02f1f1a892ff3819bb597218d45f
-DIST minitest-5.8.4.gem 72192 SHA256 2ad73ec73ef54719efba24961a36ad3a65c0bff9cb5d9fda4ddaba2a38b8d416 SHA512 92569e41e334f209260ac77f9157f1dac8824111c6a810d954f7c66d24cf7a16d7d874186288580bf1f800889d8bdfc80437691d91208990878c295e14c1f906 WHIRLPOOL 02d23b3c96811ab163247bda437e0de163afc8029494c326018a43edab203d9789afbaafdea0794e7e4fc496e338c79859c5e0935634e011b17382627b467237
-DIST minitest-5.9.1.gem 73216 SHA256 78b5e553dd15bb12b3bd0b59c8b4fa7152a6134c51a3099c4eedd2489cb2000c SHA512 4b02ea62297ad5be8bbc8d541405b0d73668ec7fe0f78318fb85fcc35321d934285df13aac2f3e5c4f9cb303b2689bca36a13bf1f8359486f9c66d4ca2fc6e72 WHIRLPOOL ae92f125bddbb57e15edd94a8fc1c8f2d64e034fb4106553bff8c06213c2f44729310964f483d40f9f7e70b36614a72694b020f88385999ea5d85b075b2720f3
+DIST minitest-5.8.4.gem 72192 BLAKE2B 364cd5da716e33b9c4a6e0b1e249864445205a759b289f940379db033c25edda776177bb2435df75d30b51602193a1f039e72bf3515cfcc4cdbcc83e5a7815e6 SHA512 92569e41e334f209260ac77f9157f1dac8824111c6a810d954f7c66d24cf7a16d7d874186288580bf1f800889d8bdfc80437691d91208990878c295e14c1f906
+DIST minitest-5.9.1.gem 73216 BLAKE2B 553143159ddc688ee0961a1714aded658dea3b6d5823bfa1555e96d25506eed2a789ad0b31939da1947e3e1d21fa9b4a9f59f3b429354283baa8c28fcda1a444 SHA512 4b02ea62297ad5be8bbc8d541405b0d73668ec7fe0f78318fb85fcc35321d934285df13aac2f3e5c4f9cb303b2689bca36a13bf1f8359486f9c66d4ca2fc6e72
diff --git a/dev-ruby/minitest/minitest-5.9.1.ebuild b/dev-ruby/minitest/minitest-5.9.1.ebuild
index 2f1fd845c4b1..45fd48771d6e 100644
--- a/dev-ruby/minitest/minitest-5.9.1.ebuild
+++ b/dev-ruby/minitest/minitest-5.9.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/seattlerb/minitest"
 
 LICENSE="MIT"
 SLOT="5"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 
 each_ruby_test() {
diff --git a/dev-ruby/mocha/Manifest b/dev-ruby/mocha/Manifest
index 71fcd7372fdd..219ffa22103c 100644
--- a/dev-ruby/mocha/Manifest
+++ b/dev-ruby/mocha/Manifest
@@ -1,9 +1,9 @@
-DIST mocha-0.10.5.gem 73728 SHA256 cb511ef036cf411a128175e0dca69081d97a58ec70beff5077f87d74eda6940a SHA512 147c1b91e6d30598f91bc2c9311b71dd37cd83b0c870dbe7ec1a45b014ccde9ee37c9fe38b6ab250d78af9c0c5629ff4a47a208ae3e8c206eba401c2b3ec871d WHIRLPOOL 65261aac8610029e0d826860a8faafcf920efb0f875393b650133794fdfa16c435ad837ced31d4e5cf0f93aa1d84359a799e153c6d927116787ffbbd94a32347
-DIST mocha-0.11.4.gem 75776 SHA256 12e901203211af113231d539c92390d456d2f0be37339917b5a35efbee6bb3cc SHA512 8a862f49e0dc7f2c98d499d0fd48d567b0d20580bba7f963d4643962e598dbda75135caf53a7fa04118f3faefb75c7627dec47b2f1330d1bd4bfecd9c78581ed WHIRLPOOL 656a49ef3812ffba75090fa76ca387ff960041fddaa7b4e66f89bf2f4bf2837d70a61424272ab5143736f81920cc18b7db77be4f74d21ff7f67629a919dc42c7
-DIST mocha-0.12.10.gem 77312 SHA256 222147bc1fc130620ea6ce051e8e716b855c82b27a3e38126f08f490614c98be SHA512 78deff0f59895e27a66d1ceb7795f92ea3338f7f3d4ee897c6c594497bd5bcfa8383777925128c8e43bafcad89276a2d0d3c6d71d3e2ca4b1de552b5576199f2 WHIRLPOOL ec8cbc9d886c9a6487c7bcf65a352ecc0662687eb45456ac58465522060b8abd9c768de88493787ded1dd1feca0165fe6b533546f0764da82113f7162e46b0a6
-DIST mocha-0.13.3.gem 82432 SHA256 4f979512dd32f2e0881c143132160dea433a392287df40d12576bbbb0af6646a SHA512 4c013565644d4b3af9bdc515c7b9b5be39c606c53d0b5da4569bd7c3fd98db3f2a7e6b88e566b32277c8e8d0ea6c83340e6afd1e80cdec0dfabd41e4fe5dbf27 WHIRLPOOL 150b9c0d573670b3592ef1f435778c2c5e47fe71f45dc59f99314b9042bfc146b46a5e42aedf899f8ea2e531ae7e5478d043a34f3d994c38d579ec0f1840e763
-DIST mocha-0.14.0.gem 82944 SHA256 4bb00fdc69d628b15ad2b89ca6f490aaf92486f640282b8943fe3b43dee9a145 SHA512 918e45f2ee761c7dc399c7958e4d406f9e186c90f479fd01a421aa542944b47e9b2c5e938f4fc5292a7da345726447b2d47dc5f417e114201f8a4d9893c4d461 WHIRLPOOL 816cb472c08739b5e342b6b3a8f3ae5c0a4fee9d40234ecd1ed73f4b4a16cffc7d36034d5987c943d1f52c06a1e953fc9e41d2b5ecec6620b2b611dae2a228e3
-DIST mocha-1.1.0.gem 87552 SHA256 f1d3385b5bed21bdcdcb9d26fd10139b2c7a67b1572e789ec014edf5acadf680 SHA512 5a07c8364ae649a6be821c4b61c349d79e1dbf1e574ed95b07848f5dae3a2860e2f2e06499fc15b8352ec2146f273cc40ee8e65e670214f0f0669b6eedf698bb WHIRLPOOL b2f2621d6a039b8bf9000fd508680b359b14fdb913c883c5d86a3cd79736084a456577e621a20060a11dc3cdfa503a0c32a4ffd9c3c2b06af45e412a6ef2d7d6
-DIST mocha-1.2.0.gem 90112 SHA256 0526557184a50ed7aa5554b9e3e61267cb96e8dbe08c3b2086f6212c623fec73 SHA512 cedbbafb095ebc54b74cdb848d11acddaf44333c6f844282fc217906c551f1ec7f0d33bc881e1c410e59917bcfc0b2b7d15d8c549d56ef9c6663907d0d7c0a87 WHIRLPOOL 3424f0ddc1984f53c01c5e0eb5d82e94b5357412370660fc195115fc3f4a119692fcd052ca4ebed6e93d8f8ed81b372ca4d2e6ef96e3c08270b4648dce2632a2
-DIST mocha-1.2.1.gem 90624 SHA256 7de99b005aa41dc46841442afe468451a145f2c6d9b10fac0c23f0d911bef50d SHA512 318fc7275b7ef14b6839ce68beb4a6dcd2a06325bcc5e69d82bd6842dc39c78b8a09d6d06d36dbf0f43e59bbcf441be9a6b1d3037f0cbde25be9d04ae44b2aed WHIRLPOOL 04c1f2d8c1b7844ba1fd6c92ef5077bff05a368ae19208182b29356972090368c77fc00e91c12f31b8895bdf7d452a34a3980ba79b119c8de0dfc26bcaffa4dd
-DIST mocha-1.3.0.gem 92160 SHA256 22f247ad94e92cef32baac2e671d1d7262f165dc933ead1940cf874c3d1fc25e SHA512 a24de9129da65f6b37f06ad888fdb80ae987f51594980991a6ac3ffd23e9dafeedd7a2e758835f33f4de59e07b7c39449e3a49228159710bd87a3de7d3df6a3c WHIRLPOOL aae77377d9d1cca8977d24f406a2a49dec6abab85c93024ef47bb9a6b66fcb40fb613e67d8a3df14acc971b298f0d1237291aae83502606f0b178adadf92933f
+DIST mocha-0.10.5.gem 73728 BLAKE2B 334bb5f3fb0f2248362f43bf2efaa879294fb46b2984e1594822f6293496f23a70fcc3f5153fd47106d5139c1e98e362ed1e71a17c590db38b3e8b22324d0698 SHA512 147c1b91e6d30598f91bc2c9311b71dd37cd83b0c870dbe7ec1a45b014ccde9ee37c9fe38b6ab250d78af9c0c5629ff4a47a208ae3e8c206eba401c2b3ec871d
+DIST mocha-0.11.4.gem 75776 BLAKE2B 9dd3a7d4e2dccf11647436087ef287ea0273623cddbc41603905509083a69f979c1e14633f5705746a6e5bbef5fd030fbd52bb7b61facfc4e5211d00dca3461c SHA512 8a862f49e0dc7f2c98d499d0fd48d567b0d20580bba7f963d4643962e598dbda75135caf53a7fa04118f3faefb75c7627dec47b2f1330d1bd4bfecd9c78581ed
+DIST mocha-0.12.10.gem 77312 BLAKE2B b71ddfa79149d33d7a5c21655e2bbd7b80aa1296c08bda3b5d5d45606e8521aadf76e3f1e34f9e3f0f4d31fba977e49263a70b61d34c9622b305afaeb07af336 SHA512 78deff0f59895e27a66d1ceb7795f92ea3338f7f3d4ee897c6c594497bd5bcfa8383777925128c8e43bafcad89276a2d0d3c6d71d3e2ca4b1de552b5576199f2
+DIST mocha-0.13.3.gem 82432 BLAKE2B e5d8f495db5df3b51b2be9d294f2c9354de979d2547e1cb1d6e70cda4a36b0170cd934b3e17e8d3fa38d4a380a12ccdb49ddf2d34662dc0dc8029faae4463d8c SHA512 4c013565644d4b3af9bdc515c7b9b5be39c606c53d0b5da4569bd7c3fd98db3f2a7e6b88e566b32277c8e8d0ea6c83340e6afd1e80cdec0dfabd41e4fe5dbf27
+DIST mocha-0.14.0.gem 82944 BLAKE2B 50a066e2f5007df08a7f76785fd4c2b12327b4969c11324a0574c707bea3219d51edb9ab40635378c16b46ad826ec7eff42434a27cd61113a6f40251fa2e6930 SHA512 918e45f2ee761c7dc399c7958e4d406f9e186c90f479fd01a421aa542944b47e9b2c5e938f4fc5292a7da345726447b2d47dc5f417e114201f8a4d9893c4d461
+DIST mocha-1.1.0.gem 87552 BLAKE2B b09721474520b57472bc54eece8ea27f0172e49ffbf43802854c111632673d05f35931150fe83cf83862471b606c70e8667327f491d280f3cc3d059e752ff0b2 SHA512 5a07c8364ae649a6be821c4b61c349d79e1dbf1e574ed95b07848f5dae3a2860e2f2e06499fc15b8352ec2146f273cc40ee8e65e670214f0f0669b6eedf698bb
+DIST mocha-1.2.0.gem 90112 BLAKE2B afbf191380cb36b84dca7ceb9b1d638112797f64d9a8c03421123b5804313f322f542e94fc46b2057eb7ed87ae8dd9a974a27d0858e843449129bea24e39f895 SHA512 cedbbafb095ebc54b74cdb848d11acddaf44333c6f844282fc217906c551f1ec7f0d33bc881e1c410e59917bcfc0b2b7d15d8c549d56ef9c6663907d0d7c0a87
+DIST mocha-1.2.1.gem 90624 BLAKE2B 6c543c2e0d2f86cc6d4353308871486ad7a4e288e43d5c0c9f66159b021281ce964070a6857b3859729f3a3c367b79baeba542ec7d07a499884c5b03e2bd0a24 SHA512 318fc7275b7ef14b6839ce68beb4a6dcd2a06325bcc5e69d82bd6842dc39c78b8a09d6d06d36dbf0f43e59bbcf441be9a6b1d3037f0cbde25be9d04ae44b2aed
+DIST mocha-1.3.0.gem 92160 BLAKE2B 10ffd1bd9b1ecb99555490b17451ae883986ef17856fb401165bb5239a2c07af2532b20bd62a5b1d8dbdeabda830c01179a025174b890be7ceff238fd9a67dad SHA512 a24de9129da65f6b37f06ad888fdb80ae987f51594980991a6ac3ffd23e9dafeedd7a2e758835f33f4de59e07b7c39449e3a49228159710bd87a3de7d3df6a3c
diff --git a/dev-ruby/mocha/mocha-0.10.5-r2.ebuild b/dev-ruby/mocha/mocha-0.10.5-r2.ebuild
index d35a603a2130..ad0f32c8ab58 100644
--- a/dev-ruby/mocha/mocha-0.10.5-r2.ebuild
+++ b/dev-ruby/mocha/mocha-0.10.5-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -19,7 +19,7 @@ HOMEPAGE="http://mocha.rubyforge.org/"
 
 LICENSE="MIT"
 SLOT="0.10"
-KEYWORDS="alpha amd64 hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "
diff --git a/dev-ruby/multi_json/Manifest b/dev-ruby/multi_json/Manifest
index 1ed41a6e02a2..6dd34d176e6e 100644
--- a/dev-ruby/multi_json/Manifest
+++ b/dev-ruby/multi_json/Manifest
@@ -1,3 +1,3 @@
-DIST multi_json-1.12.1.tar.gz 25579 SHA256 1ec98fd529284e99cd6156509542ccd290cfdd5bce03910ceed5127bb84cbb42 SHA512 f61e500197c5a1373443b308bd9307238c54d2d23ba9da91843c667c12e491f34fd87575028c3630a81a7355d4903344996f20408bbb7971b12dfba3cc4f76df WHIRLPOOL 93152310d15ca126960814c53a24d8d1e7c6241eaabc913f88f1485451eaed70288d8c7e5b7a19260f73e2a25de17b95c46fb15c16e7758980b79a48be53b498
-DIST multi_json-1.12.2.tar.gz 25630 SHA256 1d5c51ea6ce8b4ead8c93964104e4935896452430e9209476550c57839abb3ad SHA512 bbbdd05a6dd12052aa3e09389f47212f15799310d5c265057f7ca801622d32295d1f0844b37e51f8f1fd2d48e4430234f99bc6de4b9ed149e81d9a33a831e6d9 WHIRLPOOL 6a550c7ccb3e234a12a42418048ad45c5abfc7aad1be56a13e9fea9b66c4864574e38cec69e2d184f46fdeece5cce8e1aa227dc69e9f3de6689f70cc44e22672
-DIST multi_json-1.9.3.gem 30720 SHA256 631390d4b6c3d3753a3df0c28339c8e7840704083dfdcefb1323a22ab97b2281 SHA512 7f06747e760a63b6421dfda480522924f12bd00ad63f95414f6624173b9b9b255b139f9dc33d2d2a8d19b232f99a005033e00e3a0b223be992f73d142a55b8b5 WHIRLPOOL a96f1c1e53865e153bc83079fc70b69af6c941c4995f4215317ca53567532d1406adb174683fc8c5229fdc3563f5e8d3c2c662d77cf9d9d55367aab2df5b34f0
+DIST multi_json-1.12.1.tar.gz 25579 BLAKE2B 50fa37b907289b8247ffff1e22ebde1b07ee32e5ca97984be1243340f14185ebaaeb72cb28a18c5c77b1b48bfd0b400479fe7ef532e40cef3736d782c84c0d09 SHA512 f61e500197c5a1373443b308bd9307238c54d2d23ba9da91843c667c12e491f34fd87575028c3630a81a7355d4903344996f20408bbb7971b12dfba3cc4f76df
+DIST multi_json-1.12.2.tar.gz 25630 BLAKE2B 61209dc4be50b44302cfe40e45b840ae8d81e827d8b9df82ca6b852a72d360fbe09c0f5b0ef8eecfbd08b6bd08343ab7bb307d91d9abf28c9b9adb35f18bea51 SHA512 bbbdd05a6dd12052aa3e09389f47212f15799310d5c265057f7ca801622d32295d1f0844b37e51f8f1fd2d48e4430234f99bc6de4b9ed149e81d9a33a831e6d9
+DIST multi_json-1.9.3.gem 30720 BLAKE2B 9e5fd49a1fd79857bd7c907d536d7e6eee9908720bca8a33abf9f1ff18deb68965140cf978d0d10323edf7e2f426aaa5925dc692fb5707c6f879f4921651a799 SHA512 7f06747e760a63b6421dfda480522924f12bd00ad63f95414f6624173b9b9b255b139f9dc33d2d2a8d19b232f99a005033e00e3a0b223be992f73d142a55b8b5
diff --git a/dev-ruby/multi_json/multi_json-1.9.3.ebuild b/dev-ruby/multi_json/multi_json-1.9.3.ebuild
index c1daebc91143..3772a8234e19 100644
--- a/dev-ruby/multi_json/multi_json-1.9.3.ebuild
+++ b/dev-ruby/multi_json/multi_json-1.9.3.ebuild
@@ -19,7 +19,7 @@ DESCRIPTION="A gem to provide swappable JSON backends"
 HOMEPAGE="https://github.com/intridea/multi_json"
 LICENSE="MIT"
 
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-ruby/mustache/Manifest b/dev-ruby/mustache/Manifest
index af6b3352956d..e46c362d03a5 100644
--- a/dev-ruby/mustache/Manifest
+++ b/dev-ruby/mustache/Manifest
@@ -1,4 +1,4 @@
 DIST mustache-1.0.2.gem 40960 SHA256 e79dbc8bae087011ace17bfbc4ee1e652b1d5efa5d56316b09b7c2256f447d34 SHA512 4bc50bf67317e9815b125c25cd94b6c6943b4c7cdeeae3118d29b002279386f00f73a38bfcba9072253cd389634c44a8da9aba775989ab235a444796e4634450 WHIRLPOOL 310359b29b8e9a948c92e9e82045ca7b2f8f01e52c63c13d345bc01c4b3ea5949d3f765d301e9cc209facb59748f459fadb98ac91bc6edfe50f1ba9026ab5f32
-DIST mustache-1.0.3.gem 40960 SHA256 4ed9d389e41c54f000ad33bba6d1939a5685c0a0c3eb02d707fc21bddf6e97ec SHA512 2329a8f63fd025cbf2dee7c8034b0914d5348874775a4df9067a8af9aa566c639dfa7a5fabf63c3f48d520d4b5b901ae47e880e5a85213c253780036e1650255 WHIRLPOOL f52f321004de712ee9a768b64d781cea9180277e1fbbd4a2303b5fa5930027be091a31b4c0d5d1f6cc34c469a499e983e60762f8b51d04a97e94397b7324bd53
-DIST mustache-1.0.4.gem 41984 SHA256 2cb937ef01d3302b4dffb885b0bb738ce260998e0c421a7e7e67e1d409e11e1b SHA512 20c4a9cf5cacd62d4741c884e873095eeffc58afffb935b8f78907bc22de75a2dc591c55b378b8e3635abea625b6e630b6e68cd2a3145736fdd5eeb256168d39 WHIRLPOOL b4aee246f23aab4e70cc24abef7ff580cc2262b1f270fff76026d11dc7b8cb5cb4961fe41afcbdf0d9ea877cd03ed1cf7c23af2fe5431cbabb327cb77d6cdd1d
-DIST mustache-1.0.5.gem 41984 SHA256 b99ea8d83e1f5256637ff0b2a1e8b61e2513e40584074ce29c641fa64b724ec8 SHA512 d9b2c55d758bd4e317732307b513e2a079b04ec7a1203233834fd08a3a32f7b1bf8283d207af2f7082a8c4847f9c5955a557f19bad9b08a1dee2f32417eca190 WHIRLPOOL 977c790f98aebddbe78594dfe94604b845ebfb7a7d9d6934a321e12250cbeb95de92626995734b0cce9a2bb0469dead1ede8b73e8e19aa57ad79130aad3a7820
+DIST mustache-1.0.3.gem 40960 BLAKE2B 1048c3e7ffc6cb9a9467067cf945d07270d541b02794091ff12a71357713990c1d55816c60db2e5ecf92a7799f5a98bac18a1fc6ff69c5d38bb85c56c413a7dd SHA512 2329a8f63fd025cbf2dee7c8034b0914d5348874775a4df9067a8af9aa566c639dfa7a5fabf63c3f48d520d4b5b901ae47e880e5a85213c253780036e1650255
+DIST mustache-1.0.4.gem 41984 BLAKE2B 17cf77aef724f4768bb4d4c43631c977b1ec987ccfe418c1d20fcd26325f7df0379d3a7d0a8def7503e917a7e2ece417af2103c7649544e67a04dbe598069c8c SHA512 20c4a9cf5cacd62d4741c884e873095eeffc58afffb935b8f78907bc22de75a2dc591c55b378b8e3635abea625b6e630b6e68cd2a3145736fdd5eeb256168d39
+DIST mustache-1.0.5.gem 41984 BLAKE2B c063af6c9464884114b55c30df6c6cb2685b0394aa9280f006b6c35cd0681c8776edddccd1a33de75e291a2e1992477c1d70f6cb1c603e800b08be5b989a9ca0 SHA512 d9b2c55d758bd4e317732307b513e2a079b04ec7a1203233834fd08a3a32f7b1bf8283d207af2f7082a8c4847f9c5955a557f19bad9b08a1dee2f32417eca190
diff --git a/dev-ruby/mustache/mustache-1.0.2.ebuild b/dev-ruby/mustache/mustache-1.0.2.ebuild
index 69205abcb67a..405a5177357f 100644
--- a/dev-ruby/mustache/mustache-1.0.2.ebuild
+++ b/dev-ruby/mustache/mustache-1.0.2.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://mustache.github.com/"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd"
 IUSE=""
 
 ruby_add_bdepend "doc? ( app-text/ronn )"
diff --git a/dev-ruby/net-http-pipeline/metadata.xml b/dev-ruby/net-http-pipeline/metadata.xml
index 59da3fd2d7d7..10bd8f038881 100644
--- a/dev-ruby/net-http-pipeline/metadata.xml
+++ b/dev-ruby/net-http-pipeline/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 	<maintainer type="project">
 		<email>ruby@gentoo.org</email>
-        <name>Gentoo Ruby Project</name>
+		<name>Gentoo Ruby Project</name>
 	</maintainer>
 	<upstream>
 		<remote-id type="github">drbrain/net-http-pipeline</remote-id>
diff --git a/dev-ruby/net-ssh/metadata.xml b/dev-ruby/net-ssh/metadata.xml
index 63fa6ab3a042..dd5cfa357115 100644
--- a/dev-ruby/net-ssh/metadata.xml
+++ b/dev-ruby/net-ssh/metadata.xml
@@ -1,16 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>ruby@gentoo.org</email>
-    <name>Gentoo Ruby Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">net-ssh/net-ssh</remote-id>
-  </upstream>
-  <use>
-    <flag name="sodium">
-      Use <pkg>dev-libs/libsodium</pkg> via <pkg>dev-ruby/rbnacl</pkg> for Ed25519 support.
-		</flag>
+	<maintainer type="project">
+		<email>ruby@gentoo.org</email>
+		<name>Gentoo Ruby Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">net-ssh/net-ssh</remote-id>
+	</upstream>
+	<use>
+		<flag name="sodium">Use <pkg>dev-libs/libsodium</pkg> via <pkg>dev-ruby/rbnacl</pkg> for Ed25519 support</flag>
 	</use>
 </pkgmetadata>
diff --git a/dev-ruby/ox/Manifest b/dev-ruby/ox/Manifest
index 0be88eb1ff74..edcabb29fbef 100644
--- a/dev-ruby/ox/Manifest
+++ b/dev-ruby/ox/Manifest
@@ -1,5 +1,6 @@
-DIST ox-2.5.0.tar.gz 191422 SHA256 01c6a98cb925b864ecefa40f297416a489c95b08715db4d2b276db8bb0c30edd SHA512 470c3b281e44423ab4197989f5b6fdb85e979a13dbcb9add192b4b36de1e768add4768f8cb4bee798aac424b9fe453e925f24af5a13c4cde4157e7fcebd0a3a2 WHIRLPOOL 8c843047ecf0431c810689698e4f5b6f025a5a093d68881cef09fdd919998fb98648d495be73c2eacdaec26ae38aaf235bcf423bcf38fef7690c6fe120309bcb
-DIST ox-2.6.0.tar.gz 191979 SHA256 d96f93640cde0e837e4b71e1a6dcd0f1d0221f3a4ad5b8484e74b851571459cc SHA512 8765fc3bfd10e52a05d59dab9e9ec973f933976c3511a91d6c84f120e2cac6abccc8ccb7ea9d301882198049b37823a392520464197a791cddf79ba9ce252f37 WHIRLPOOL a6d83bdedd6af70e17478893d3c7e91cdae6cea9a7b66360019310cd1511a0643a9a18f27fb497ba7da7a157b47ea00df8d85331c1dcb9ebf1419e003f291fdf
-DIST ox-2.7.0.tar.gz 193355 SHA256 11188cf3408e9774f24fcf1b35c20c0d37ce5b173132b9fff602b422fa5f741c SHA512 3c77fe8fee38a35ffb6317873d90f618f39215ce652dc48b6671a85960fbc1705f3d26c9100bd4e891620afe46f19e714acde79faecbe4393e429879017e8f24 WHIRLPOOL 502096c01a904e7ba18016956ea2d633b0204293c2988cdeeed7d5f839662de25f1aa9502ebf12f03f7e226a9bbbe690a35e1512f282062e2c424c4771aed873
-DIST ox-2.8.0.tar.gz 193494 SHA256 a14bdfb95ce02664da6b772edc7fa1617fe3007b537060816360e4f7d69ffb31 SHA512 e1f2e37f3c3c8e6bb550c656b483012f3eb829dc6c60f9caf252a0d12a5f211a4b11e3de4f2443553570fa4b545dca565f27119520db3113ecf5707a712ce900 WHIRLPOOL 9dac57ce43eabb8e08defb8810febb2d1f66083dec0a427df4582ff22813f9f6381da0cb86ee15265d3b0949d09ff24fcd2ed65f69ee357fcfcbba6438b0a0d2
-DIST ox-2.8.1.tar.gz 193614 SHA256 8ea03842ba85d5ba9dfed4ab8b7ba9559236a8f4397ce08399fd96c804828ff1 SHA512 0dd314027739bf3da5cb8e6b66d1bfe6e254809d718e17d17df8cbcb7e8ed5d98e541df7c6be13c72e690a5ecbbac0c9a88a1fceec71fcf251dcf991dd0040c0 WHIRLPOOL 035c5e60eb9d38c96bdbecb6acc6b7b8895617353af919a0ce3248dccbedb034362bde375a3e3cf522324b6ca681e861f5ccb6bdf671a9a865797e0fb1dc04b7
+DIST ox-2.5.0.tar.gz 191422 BLAKE2B 6dabb9914a2717cb11496bcb75a369796094eb57b334aefc85964256d48305fdac3a9a2c3145f58acb76e2f19730ea17f19411d4b175c08a620b47ebeb8ce80b SHA512 470c3b281e44423ab4197989f5b6fdb85e979a13dbcb9add192b4b36de1e768add4768f8cb4bee798aac424b9fe453e925f24af5a13c4cde4157e7fcebd0a3a2
+DIST ox-2.6.0.tar.gz 191979 BLAKE2B 744d00262e3f33ea6b11c2b38417ca26dfd61c115847b115c0999d9d9edae3befc5a088f54ce53bf6324505c9444d4b2c72479167691b962a0ab749b4c032ea2 SHA512 8765fc3bfd10e52a05d59dab9e9ec973f933976c3511a91d6c84f120e2cac6abccc8ccb7ea9d301882198049b37823a392520464197a791cddf79ba9ce252f37
+DIST ox-2.7.0.tar.gz 193355 BLAKE2B 1d6844b74c782e424fb6340b427c47e785665f3fce44a17183120ead885de706f4601d11daf7a1dd87d50fded2bcc2b691fbbad2bd3f48b9971f2e1a2d9bf90f SHA512 3c77fe8fee38a35ffb6317873d90f618f39215ce652dc48b6671a85960fbc1705f3d26c9100bd4e891620afe46f19e714acde79faecbe4393e429879017e8f24
+DIST ox-2.8.0.tar.gz 193494 BLAKE2B aa1e3aad052b19a9aa5a38002fd4e1972a291bf8c13f9120809a38d193e529e9415e64595a96dfafb8e10351ba37336796ca0440b0a4949ea7c20723b1d6b4b4 SHA512 e1f2e37f3c3c8e6bb550c656b483012f3eb829dc6c60f9caf252a0d12a5f211a4b11e3de4f2443553570fa4b545dca565f27119520db3113ecf5707a712ce900
+DIST ox-2.8.1.tar.gz 193614 BLAKE2B 0bab46e17ad8e254dd3cd47e39d44b4a3801ab9824bda90ed7f19724088a3bcf1f795ad82c6107851869d4c96cedacf911636ed623e04acd48db605962bd1843 SHA512 0dd314027739bf3da5cb8e6b66d1bfe6e254809d718e17d17df8cbcb7e8ed5d98e541df7c6be13c72e690a5ecbbac0c9a88a1fceec71fcf251dcf991dd0040c0
+DIST ox-2.8.2.tar.gz 193670 BLAKE2B 70e38754594a40ed35aa43aad32806d5c9eec7d3f60ee18a846a99f28b558173ea99b554f7f3a4f2b848686536d194035fd345ab33b9d7b5e12a246a472463d4 SHA512 18a887db70962a1dd1c6ea18461eca0efbcffdb231f934c3603e63537e9911e820465ce5e4ab86cbedd65b396a9a12b0ad7e60ea7ae687c4ebe8436e0c37988c
diff --git a/dev-ruby/ox/ox-2.8.2.ebuild b/dev-ruby/ox/ox-2.8.2.ebuild
new file mode 100644
index 000000000000..2f95cc6f0c92
--- /dev/null
+++ b/dev-ruby/ox/ox-2.8.2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A fast XML parser and Object marshaller"
+HOMEPAGE="http://www.ohler.com/ox/ https://github.com/ohler55/ox"
+SRC_URI="https://github.com/ohler55/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="BSD"
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+SLOT="0"
+IUSE=""
+
+each_ruby_configure() {
+	${RUBY} -Cext/ox extconf.rb || die
+}
+
+each_ruby_compile() {
+	emake V=1 -Cext/ox
+	cp ext/ox/ox$(get_modname) lib/ox/ || die
+}
+
+each_ruby_test() {
+	${RUBY} test/tests.rb || die
+}
diff --git a/dev-ruby/pusher-client/metadata.xml b/dev-ruby/pusher-client/metadata.xml
index 5ae6c2782e93..dc2cba2c9909 100644
--- a/dev-ruby/pusher-client/metadata.xml
+++ b/dev-ruby/pusher-client/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 	<maintainer type="project">
 		<email>ruby@gentoo.org</email>
-        <name>Gentoo Ruby Project</name>
+		<name>Gentoo Ruby Project</name>
 	</maintainer>
 	<upstream>
 		<remote-id type="github">pusher-community/pusher-websocket-ruby</remote-id>
diff --git a/dev-ruby/rack/Manifest b/dev-ruby/rack/Manifest
index 369f0f03c7a1..e795d73e1e15 100644
--- a/dev-ruby/rack/Manifest
+++ b/dev-ruby/rack/Manifest
@@ -1,5 +1,5 @@
 DIST rack-1.4.7.gem 204800 SHA256 fa06e970605808834fc7e5a8b9babd4871d7d4c23a4d9d61cb94cbd4c15de5e6 SHA512 26391faec30b12981413eb1f433bfc9be5d124689bc3ae6e32de7d544917f2330fa4f9255c6879632f2edae5a05a4198454b8fe1310bcdb3d2e0b8b336a20359 WHIRLPOOL 3e20db05b829b8dadbcc9dbeff6e883cdf1a8b175bd0af0f9c511ab2dc1111036b5815abe8c342120b74a0727a79b18b5966ec90d073404489b2045b134c527a
 DIST rack-1.5.5.gem 216576 SHA256 4ae4a74f555008ecc541060515c37baa9e16f131538447a668c0bf52117c43b7 SHA512 7b8ea669c55fa94801aae20612076db702837194bc602c64bec1085836712806a081504b37e4c545bcccf0337e7afc0ad9dca3c1258260fde5f3ec505247056a WHIRLPOOL 3eed7d4befb678d1b89f2dd8f03b119ab23f6155c9fdc55d545a02a23fd718d436ca5ff880bec1a17ee7927183aed1d298cef97c1737cf88a315161a2f4ab37e
-DIST rack-1.6.4.gem 228864 SHA256 455ec4545a54b40dae9937bc5f61ee0e32134191cc1ef9a7959a19ec4b127a25 SHA512 304a6ae21bfd38008fd7d147f82c44397f3a1d2e689bd01de689aedc6ea0e8784605207fd314bc796974edc5dfcab81636664ea2becb0489302999f99501d41a WHIRLPOOL e99b545a783eaf09bc1c0cf3b4abfafa3341980cfebf1840e25ab25d5801d911da7dfbb232f70df291b7494cc8f8c089fe8a654502aa808850801c02b1e481c6
+DIST rack-1.6.4.gem 228864 BLAKE2B 609bc7671947c2abfd00f0848e1870fcf46d5a92320427bea4b7104c1dbd6d4a9d0a89e3846e774c409d570ecc8fdb8d8099e553c5d73384f10a9f6e636765ca SHA512 304a6ae21bfd38008fd7d147f82c44397f3a1d2e689bd01de689aedc6ea0e8784605207fd314bc796974edc5dfcab81636664ea2becb0489302999f99501d41a
 DIST rack-1.6.7.gem 229888 SHA256 485c1bf52521ff354be7dd2a9f529423ee976a51ddec5aace4cf2eebc2ce9c59 SHA512 e1cc22d78a61998c034bbf9217cad5cc0e614697e787f58aed9cfb1c3a12f69b557c9e95a4b09fcc1509cb607332a8655a66159b2492ea6fdc2bda21f588a59e WHIRLPOOL 683a709dcd758e4f546ae84c217d59171cccecc35ed76724221a1661ddd7aa03120591c87a81901dd05a789284ab4581a7a443dd5eb21f9ddffc342d11ce8d72
-DIST rack-2.0.3.gem 254464 SHA256 8c1c9bbafd74f11c78a29bd87c72a70e7b5b872712d1768ab83b33fec57d9fcd SHA512 c48e6681544c2f37797ee697f5c4f0d4de6008a3df2506665b52c248fca1ef7321a892dd28475e4d7b461a0b2d12112903a67e1bed7c7397742833fce85167e1 WHIRLPOOL 0134f345068739a3ba65b726f2146b33672a083f42601dd45ee85ffb33677d6e3282040c9df19d7a4f13925a032a4c68fa3885f5a0fd86d826780b17cad74deb
+DIST rack-2.0.3.gem 254464 BLAKE2B c7052ae0210d2c8d9aeaa6e3b5b10b272ea48d6c2601aecd524eeab141d3987b7905d9511814d0ac7a62413ef5eb01e847168a278bafb5a0e8f882c526cdfcc9 SHA512 c48e6681544c2f37797ee697f5c4f0d4de6008a3df2506665b52c248fca1ef7321a892dd28475e4d7b461a0b2d12112903a67e1bed7c7397742833fce85167e1
diff --git a/dev-ruby/rack/rack-1.6.7.ebuild b/dev-ruby/rack/rack-1.6.7.ebuild
index dc158b66503a..340bf1be4ed1 100644
--- a/dev-ruby/rack/rack-1.6.7.ebuild
+++ b/dev-ruby/rack/rack-1.6.7.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://rack.github.com/"
 
 LICENSE="MIT"
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RUBY_PATCHES=( ${PN}-1.2.1-gentoo.patch ${PN}-1.6-rewindable-ruby23.patch )
diff --git a/dev-ruby/rainbow/rainbow-2.2.2.ebuild b/dev-ruby/rainbow/rainbow-2.2.2.ebuild
index bdcae2071ed3..42045ac3f444 100644
--- a/dev-ruby/rainbow/rainbow-2.2.2.ebuild
+++ b/dev-ruby/rainbow/rainbow-2.2.2.ebuild
@@ -18,5 +18,5 @@ SRC_URI="https://github.com/sickill/rainbow/archive/v${PV}.tar.gz -> ${PN}-git-$
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="amd64 ~hppa ~ppc ~sparc x86"
+KEYWORDS="amd64 hppa ~ppc ~sparc x86"
 IUSE=""
diff --git a/dev-ruby/rake-compiler/Manifest b/dev-ruby/rake-compiler/Manifest
index faa9fa39f0b5..b054d9865fb8 100644
--- a/dev-ruby/rake-compiler/Manifest
+++ b/dev-ruby/rake-compiler/Manifest
@@ -1,2 +1,2 @@
-DIST rake-compiler-1.0.2.tar.gz 32823 SHA256 59b9fefb73dde1da51fb634d34794f07101fd1a583395f5fd85a0b9410646ca7 SHA512 ef7132eff3afb29e98ce21facfd663cfe495053ca98d54b26275ee8e186c91f81f0450e52bf282bfad64e1443f6e065aefa62a30692895648a89966a8a0f0ebe WHIRLPOOL 9c9e730718bf065bea90be9e4c75661fc2f3dc912b6a7d7db2c49e824f4cb10982165b75fe546c1c0fb6e84cfab2c0b2745103124396c537196fe15f775ddf5d
-DIST rake-compiler-1.0.4.tar.gz 33590 SHA256 31966db08adb10513ba3033234655aafc5ea42a9e6798324e4466de4ea8fa068 SHA512 fc015d8f6dcc2ba380dbc3eb2959b068f3582e0efcdc765570f5b2c97737db2ba38fb324b9b5bb63d3af822843139561a36758408db637e7716afb3a6074251c WHIRLPOOL 2a8612ad5a1b5ef4454e302c109e610141114dbc4bff8ce3b26a6a010ae82ae364e48227a437b60b15d7b301267c2aaaf6d5dee9972b7af4121620ad652dab67
+DIST rake-compiler-1.0.2.tar.gz 32823 BLAKE2B 0751435c46a881b0501bcb6c4e1e29abe8a156f02aca79ccd4a6cf472ff696f8be89c4e8f860dc74e27a093a586b10c9a59e1df7b496ef3f530ab07dd84e8dcd SHA512 ef7132eff3afb29e98ce21facfd663cfe495053ca98d54b26275ee8e186c91f81f0450e52bf282bfad64e1443f6e065aefa62a30692895648a89966a8a0f0ebe
+DIST rake-compiler-1.0.4.tar.gz 33590 BLAKE2B 932e87a4d1405df4ce65b905f5d5d2b090ac17bf8cfde4a767952ad4debb83064ef368ecec33c9f3569d317b4e0fb24016f33777a03f0c88e3aedd689cdd4151 SHA512 fc015d8f6dcc2ba380dbc3eb2959b068f3582e0efcdc765570f5b2c97737db2ba38fb324b9b5bb63d3af822843139561a36758408db637e7716afb3a6074251c
diff --git a/dev-ruby/rake-compiler/rake-compiler-1.0.2.ebuild b/dev-ruby/rake-compiler/rake-compiler-1.0.2.ebuild
index 0d72c3afa36b..e03b426a9035 100644
--- a/dev-ruby/rake-compiler/rake-compiler-1.0.2.ebuild
+++ b/dev-ruby/rake-compiler/rake-compiler-1.0.2.ebuild
@@ -17,7 +17,7 @@ LICENSE="MIT"
 
 SRC_URI="https://github.com/luislavena/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-ruby/redcloth/Manifest b/dev-ruby/redcloth/Manifest
index 3bb35f4fd7d2..ae3b1a157b33 100644
--- a/dev-ruby/redcloth/Manifest
+++ b/dev-ruby/redcloth/Manifest
@@ -1,2 +1,2 @@
-DIST RedCloth-4.3.2.tar.gz 91880 SHA256 fbfc709ef742f962896e1cd063b8bd828bdc0ddce36755edbe493cd3231ea850 SHA512 377fef21e646beb1658a4b8b8d0228e9730c6c8f33075a14137afcf80e8d37501ede8c05b720d0dfb36a680017f4dedd01565fe9b326ae06ead77afee6f122ca WHIRLPOOL 5ad0dc82805495e7a47053499d9e1301b557199b4850556192a9238bd06076470be7a6837d3547dd115d3d5f849f8662f7e4dfc1de2d7fe102da9c499a25fdb9
-DIST RedCloth-git-4.2.9.tgz 96897 SHA256 e649f46a58b949c6d229714c25b747f331b4a5b887eaa65ac43eab1f39067e6c SHA512 646f7a1a88ab9b3ff078016df706a1c9d991bf21d86ef1dd4c0a0ee6b946f94276b52499218bca222461eb003510e84b81f44b08899c5b36ac115137193e968a WHIRLPOOL 4276714eb34ec2571544ff271698f1e6540ac62d51704c4216d19452be0b59d1da3014b7c290204b9ca42d5edd88094f1de79618d3bbf8d4f8ae5fb214ecca63
+DIST RedCloth-4.3.2.tar.gz 91880 BLAKE2B 0feac1ec59e23fcff39e2fdf9beff896be7949764e53a5a834c5f4e7d18813dc59bf354103d4fab82a709341a0f1b6919bbd3a463fd601564888672dbe73d343 SHA512 377fef21e646beb1658a4b8b8d0228e9730c6c8f33075a14137afcf80e8d37501ede8c05b720d0dfb36a680017f4dedd01565fe9b326ae06ead77afee6f122ca
+DIST RedCloth-git-4.2.9.tgz 96897 BLAKE2B e575c1fa247efb26265b44c50315d1449db3b84a1feaff349f2872c80b9abfc5fc767b09fbc741f9924f70901c73d9a7474b6d4fc3145d3e1842a34ea6e2be13 SHA512 646f7a1a88ab9b3ff078016df706a1c9d991bf21d86ef1dd4c0a0ee6b946f94276b52499218bca222461eb003510e84b81f44b08899c5b36ac115137193e968a
diff --git a/dev-ruby/redcloth/redcloth-4.2.9-r4.ebuild b/dev-ruby/redcloth/redcloth-4.2.9-r4.ebuild
index 350ea61be175..36988c062561 100644
--- a/dev-ruby/redcloth/redcloth-4.2.9-r4.ebuild
+++ b/dev-ruby/redcloth/redcloth-4.2.9-r4.ebuild
@@ -27,7 +27,7 @@ RUBY_S="${GITHUB_USER}-${PN}-*"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND+=" =dev-util/ragel-6*"
diff --git a/dev-ruby/rspec-core/Manifest b/dev-ruby/rspec-core/Manifest
index 278eb166d787..7bdb723ba276 100644
--- a/dev-ruby/rspec-core/Manifest
+++ b/dev-ruby/rspec-core/Manifest
@@ -1,7 +1,7 @@
-DIST rspec-core-2.14.8-git.tgz 195949 SHA256 757febdcc4465b62fb41572e1fb7e0deb86f903127cb2941ea65d2c1d4ac29db SHA512 2be487f0a820cb959771b0c2a725aa7a43cd80a76f85ed42f3341420cefa4ba6413b5dbd86e8fba9f5515afef3e895e0f1f2f8239d50f0b764f037d5f0791095 WHIRLPOOL 5b2422d7f1d087caf654ea04d81f269ae90be63eb73135d34691839c27e6dfa152aac425f64a860b3af50ef0bf513ac7f4a68c979c254083f187e57a96c20fe3
-DIST rspec-core-2.99.2-git.tgz 212935 SHA256 75794e3f94f3323b1212b93e827d37d6ab2813dea2f5f927929b40e9ee170c43 SHA512 e13bc3384fd85c367481a8651c14be4a412cba5f58e12a8f4ab14b5d2768a7b92191b81e000e7dbf6a28275b41044d8b3eb70a04e4b30b5bf88db98cbec4cc44 WHIRLPOOL 5584be2da2310688155c4fe600a4a36f68434440ebc00b063e9fcdcb3188138831a210f482ac86a469984fcf9838d795511ea02433020ecc6bc1d6aacc8c72bd
-DIST rspec-core-3.3.2-git.tgz 332730 SHA256 aef9a2867a435aa7be57826c850e88e593232077dc42f12bfed89a92c7704d26 SHA512 6cadfa43d63df8d24105d88d6e8b22a495a30f04b289c71c8887ea3fead9ec8f071a6c734a140b1e4910f25094fd36c7c37b54a0724e734233ca584202f0cf32 WHIRLPOOL 1e385223ea8c9b32bfc6ecc93146ccad793441bae3426f6cb4acc07d7a1f2bc6e20be11597fcd27f3c6bb207482213e2eaf214835041df631d06b9bc524e5b70
-DIST rspec-core-3.5.3-git.tgz 368960 SHA256 26a5788977ba1ce6889924e6e944d1a08becb059593f297b4f4dd58b600b037a SHA512 c8f983018e33bd111c75671d7208b38704dd0fddb22cca2b08a59a1e5ceb0939ed56ee4015df758f5d766fbe2390279c1d670f6fff4eef222f44621f48c581ef WHIRLPOOL 86afe335378b5e9e94ee53546d6e87c531bee71cc1ed5a79f1549d593f6912a6a07dfac2b783aaaaf808bba8405e6e1cbc5b20fc275ca80ce504bed1b4991fd2
-DIST rspec-core-3.5.4-git.tgz 369170 SHA256 6e7f0cbccf13f774936b25100f743682bb4359040f926a7aa83dce9d7e80209e SHA512 c672381e9233b6f8c6e92ed70d084ff7a558edd6ca7d5a09a28fff1554975b952b6fab94483324b5bd6a62ff7aac576e7a216dbb3972749ef0210fe1cd05411d WHIRLPOOL 816b9dc1648afd11965457b147a5748ea50fd9cef8b5e266a83131b532642f5882bde9099e037ee9f5bea2fa2bc2bca1140494d33f252ea7819b033a4b8dda99
-DIST rspec-core-3.6.0-git.tgz 375590 SHA256 8994ff9ef23e11262d2c0cc7c54ffaa3ce73c3d2fd01fc0c089f46a31e7667fa SHA512 cecd3885652e18ba1ffed45e40d12c932ba0d880e96b2f1d264709f55dbda8d6b0c78c3bf4bb940d246b84261d1b80038618735f65302ff62646165b2e932be1 WHIRLPOOL 7923ccf7959f5fdc23f27ba0a4619b582a6a16ff20dc27eee82a17436ba9c278eaf996f4e851fac8c9a2802cda30ef1928ab5a4bc20269fe66ac4df540d6b827
-DIST rspec-core-3.7.0-git.tgz 376565 SHA256 502b7dc92919e593c748840bbcbdf74e27d0b4a58e58838b9ffc13bdaea3bc34 SHA512 071bd2a5c905d4ce621f2d7255b882a9d34cf42001cb2995fdb05a91387805929198c32e53cf4c2df2a43d179d2c49337214066be87eb50ab044b5f70aba8c54 WHIRLPOOL 48d98d14f716a836a75d25ee523b10ce64e4a1dce91df953ab60320f41d9661c12509e9f788625311b3217eb10f760249c3aa454b28cee4c8d196206d6c26d2f
+DIST rspec-core-2.14.8-git.tgz 195949 BLAKE2B c249da4a6a46019a96cf67428bbf73d9033f98d8f3bae19f9cecc8fa183249e7987f52b01aed3e2b7067a6f7b671e1e23cf78922d0a0d827e4f537395dcdf9a9 SHA512 2be487f0a820cb959771b0c2a725aa7a43cd80a76f85ed42f3341420cefa4ba6413b5dbd86e8fba9f5515afef3e895e0f1f2f8239d50f0b764f037d5f0791095
+DIST rspec-core-2.99.2-git.tgz 212935 BLAKE2B 37195012f79aca3a1959f9143e2f5cbab63230ab07ea97928d6f66face8d07ab54d87f19535f5f235c441b2da6dec17ef2a889e9ccd7e83d987086e24afd1b82 SHA512 e13bc3384fd85c367481a8651c14be4a412cba5f58e12a8f4ab14b5d2768a7b92191b81e000e7dbf6a28275b41044d8b3eb70a04e4b30b5bf88db98cbec4cc44
+DIST rspec-core-3.3.2-git.tgz 332730 BLAKE2B 07077848d04f5628510f01ddf57b47f373b7e9dfd422ef21984af71ec62a9d92b5eaf40e5f61cda4f6def015301bad19af5c911b57503ea112be274614037189 SHA512 6cadfa43d63df8d24105d88d6e8b22a495a30f04b289c71c8887ea3fead9ec8f071a6c734a140b1e4910f25094fd36c7c37b54a0724e734233ca584202f0cf32
+DIST rspec-core-3.5.3-git.tgz 368960 BLAKE2B ba4db57ac16dbd98960f7e5bad4ae7382afc5caddfeebeea6e547554d240d030639f9edb00f5c101a843adb18992ed5cd9430a20e5a3d9783557ff62f1def6b2 SHA512 c8f983018e33bd111c75671d7208b38704dd0fddb22cca2b08a59a1e5ceb0939ed56ee4015df758f5d766fbe2390279c1d670f6fff4eef222f44621f48c581ef
+DIST rspec-core-3.5.4-git.tgz 369170 BLAKE2B c95fa7740bcc1b586b4e26be1db4cb52bb470cb23c9ef74dc644d0ea7c4ca769ab62e587ecff2a16cd6f656e9f3bbdc81b199765f9397dddbe28a8cdce6a1945 SHA512 c672381e9233b6f8c6e92ed70d084ff7a558edd6ca7d5a09a28fff1554975b952b6fab94483324b5bd6a62ff7aac576e7a216dbb3972749ef0210fe1cd05411d
+DIST rspec-core-3.6.0-git.tgz 375590 BLAKE2B e8b4987ea3d5cc3a403eaec98243e4c4be6c9eace798bc97599020543401ecd036c6121a6736995fb716aabd1a2016393506bee1e3076c61b0c49173d991d990 SHA512 cecd3885652e18ba1ffed45e40d12c932ba0d880e96b2f1d264709f55dbda8d6b0c78c3bf4bb940d246b84261d1b80038618735f65302ff62646165b2e932be1
+DIST rspec-core-3.7.0-git.tgz 376565 BLAKE2B 86b0584883047c83e4fddfd09924a5b68828f53e2018d2513cd79484a390d1b7b89e8176b0098b8869d5ed7206c132d77a0d8ef2ffb5447da317460b152e5e23 SHA512 071bd2a5c905d4ce621f2d7255b882a9d34cf42001cb2995fdb05a91387805929198c32e53cf4c2df2a43d179d2c49337214066be87eb50ab044b5f70aba8c54
diff --git a/dev-ruby/rspec-core/rspec-core-2.14.8-r4.ebuild b/dev-ruby/rspec-core/rspec-core-2.14.8-r4.ebuild
index 252675f496ff..e06222659137 100644
--- a/dev-ruby/rspec-core/rspec-core-2.14.8-r4.ebuild
+++ b/dev-ruby/rspec-core/rspec-core-2.14.8-r4.ebuild
@@ -2,10 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22"
+USE_RUBY="ruby22"
 
 RUBY_FAKEGEM_TASK_TEST="none"
-RUBY_FAKEGEM_TASK_DOC="none"
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 
 RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
 
@@ -35,9 +35,6 @@ ruby_add_bdepend "test? (
 		>=dev-ruby/rspec-mocks-2.12.0:2
 	)"
 
-# Skip yard for ruby21 for now since we can't bootstrap otherwise.
-USE_RUBY=${USE_RUBY/ruby21/} ruby_add_bdepend "doc? ( dev-ruby/yard )"
-
 all_ruby_prepare() {
 	# Don't set up bundler: it doesn't understand our setup.
 	sed -i -e '/[Bb]undler/d' Rakefile || die
@@ -72,12 +69,6 @@ each_ruby_prepare() {
 	sed -i -e 's:ruby -e:'${RUBY}' -e:' spec/rspec/core_spec.rb || die
 }
 
-all_ruby_compile() {
-	if use doc ; then
-		yardoc || die
-	fi
-}
-
 each_ruby_test() {
 	PATH="${S}/bin:${PATH}" RUBYLIB="${S}/lib" ${RUBY} -Ilib bin/rspec spec || die "Tests failed."
 }
diff --git a/dev-ruby/ruby-gettext/Manifest b/dev-ruby/ruby-gettext/Manifest
index 2badcb7ca7ea..5ed9be67fa2d 100644
--- a/dev-ruby/ruby-gettext/Manifest
+++ b/dev-ruby/ruby-gettext/Manifest
@@ -1,4 +1,3 @@
-DIST gettext-3.1.1.gem 221184 SHA256 323a1b07db0863e032436f6935a0e63a5ab7475ac8c387d2632065ee7bafc12a SHA512 b59462fd5c75aa64c1671fd54248ff86325be9aa53df2b4e720e663ae04d40febe83205c6ec75f6200dcf75abfdefe23db1effe838dc1149154457acc2fadc05 WHIRLPOOL 445999cff5241654252073b027388b058f272ffbaaa7d844208908996275cc22ed15c7055bd99a89977737192e60af84e0539bd6461b2da748bf97d41d5744f3
-DIST gettext-3.2.2.gem 283648 SHA256 9d250bb79273efb4a268977f219d2daca05cdc7473eff40288b8ab8ddd0f51b4 SHA512 c6806a4f2b9c8519cccdf7651b3482e5938015323648cb1b82acd0632d88ea5c7cdabd925eecb2d4e17d0d396126d4e2ebaac26241c3c7b4f61e187cd4b3133f WHIRLPOOL c83776908d16e0f47010be5ba830a0c3b13f4b51055f6f14b62572e70b08d72932ef4d1fdea468ae47cf67ab5b031cd29e3f3c03b164fdcc95979b0a6c4e654a
-DIST gettext-3.2.3.gem 283648 SHA256 85e161313b4193884af5aa25472db969247e876bb0b82ddab2a4d59ba305f938 SHA512 a7e6ca4e54a81eba7bd148849823ea480526f6d377d818f89aad28fc4cf79eb7e01dbbbbded441cad143ac806c73241173a1437deddb165ce7f178a9367bc4c5 WHIRLPOOL 07c20cc9cc2791317de58dc122884b2328fca0961abc9b9e5a58435eccd206d6fd669cf671472e1973e97298f66283299043b42fca73083aef858bc9c676da67
-DIST gettext-3.2.4.gem 284160 SHA256 ffd3f6dd5b8e73dd8117ac2a7f7caabae1118de85624d47b7163f9ace1c4dd77 SHA512 53613d29fbd68866a66c912428f87e8191682838f2ea9c218972633cc075a19052a7ed1f7e02c5818f2b600b2e0296c4efe832fd854557bfd0afb746cfbfa2c7 WHIRLPOOL 558e379ae92563e7509f7353e47b9c43350336f73474a05390d3f8aae56ace6d43aa035064c531ff5b3240acc11bb49d4ad1f92c5127aaad46479ecbf5ca157f
+DIST gettext-3.2.2.gem 283648 BLAKE2B d9095e11f3f92ac37f84aad9059e5740af07186caad963b6cbd6081329031122ed2acf402565b5e8bf7c6f51b18d045fab09e6d390effe2f0d7d66981f253efd SHA512 c6806a4f2b9c8519cccdf7651b3482e5938015323648cb1b82acd0632d88ea5c7cdabd925eecb2d4e17d0d396126d4e2ebaac26241c3c7b4f61e187cd4b3133f
+DIST gettext-3.2.3.gem 283648 BLAKE2B b746edbc9effd191a2abcff90f699d7a460845104b76410fab20bfef3294afc51951918441f0912fcadca4f59d810ffde9d5ac16c3de7adde6e5f7508c558bb3 SHA512 a7e6ca4e54a81eba7bd148849823ea480526f6d377d818f89aad28fc4cf79eb7e01dbbbbded441cad143ac806c73241173a1437deddb165ce7f178a9367bc4c5
+DIST gettext-3.2.4.gem 284160 BLAKE2B dcd4154686fc4bc596d5433a2d1f3c74eff136dcd2945b65caea495541b5d18bd4a77c7ceafa27c4d5c04b40d11b807941c504f07293bdbb16c473003cded72c SHA512 53613d29fbd68866a66c912428f87e8191682838f2ea9c218972633cc075a19052a7ed1f7e02c5818f2b600b2e0296c4efe832fd854557bfd0afb746cfbfa2c7
diff --git a/dev-ruby/ruby-gettext/ruby-gettext-3.1.1.ebuild b/dev-ruby/ruby-gettext/ruby-gettext-3.1.1.ebuild
deleted file mode 100644
index 53b552f036dc..000000000000
--- a/dev-ruby/ruby-gettext/ruby-gettext-3.1.1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby21 ruby22"
-
-RUBY_FAKEGEM_NAME="${PN/ruby-/}"
-RUBY_FAKEGEM_VERSION="${PV%_*}"
-
-RUBY_FAKEGEM_RECIPE_DOC="yard"
-RUBY_FAKEGEM_EXTRADOC="README.rdoc"
-
-RUBY_FAKEGEM_TASK_TEST="none"
-
-RUBY_FAKEGEM_EXTRAINSTALL="po"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Native Language Support Library and Tools modeled after GNU gettext package"
-HOMEPAGE="http://www.yotabanana.com/hiki/ruby-gettext.html"
-
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sparc"
-IUSE="doc test"
-SLOT="0"
-LICENSE="Ruby"
-
-ruby_add_rdepend ">=dev-ruby/locale-2.0.5 dev-ruby/text"
-
-ruby_add_bdepend "doc? ( dev-ruby/yard )
-	dev-ruby/racc"
-ruby_add_bdepend "test? (
-	dev-ruby/test-unit:2
-	dev-ruby/test-unit-rr )"
-
-RDEPEND+=" sys-devel/gettext"
-DEPEND+=" sys-devel/gettext"
-
-all_ruby_prepare() {
-	# Fix broken racc invocation
-	sed -i -e '/command_line/ s/#{racc}/-S racc/' Rakefile || die
-
-	# Avoid bundler dependency
-	sed -i -e '/bundler/,/helper.install/ s:^:#:' \
-		-e 's/helper.gemspec/Gem::Specification.new/' Rakefile || die
-
-	# Avoid dependency on developer-specific tools.
-	sed -i -e '/notify/ s:^:#:' test/run-test.rb || die
-}
-
-each_ruby_test() {
-	# Upstream tries to daisy-chain rake calls but they fail badly
-	# with our setup, so run it manually.
-	${RUBY} test/run-test.rb || die "tests failed"
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	insinto /usr/share/doc/${PF}
-	doins -r samples
-}
diff --git a/dev-ruby/ruby_smb/metadata.xml b/dev-ruby/ruby_smb/metadata.xml
index fc5240611ef8..bc86728ae97a 100644
--- a/dev-ruby/ruby_smb/metadata.xml
+++ b/dev-ruby/ruby_smb/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>zerochaos@gentoo.org</email>
-    <name>Rick Farina</name>
-  </maintainer>
-  <upstream>
-	  <remote-id type="github">rapid7/ruby_smb</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>zerochaos@gentoo.org</email>
+		<name>Rick Farina</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">rapid7/ruby_smb</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/sqlite3/Manifest b/dev-ruby/sqlite3/Manifest
index 5dad1133bd3d..13380d6d843f 100644
--- a/dev-ruby/sqlite3/Manifest
+++ b/dev-ruby/sqlite3/Manifest
@@ -1,3 +1,3 @@
-DIST sqlite3-1.3.11.gem 60928 SHA256 de8ecdcc00a7af0cda98661ed94ce442964b9403b425e95c3ac4544b1f3720a7 SHA512 02bef5f8f61d1f04c79d9032d62c9d708dddc2446dd256ad13f932ed4cae256d6c60f742a285bc4015ef5b1fb13e9541738f31fd270fe22320fc176525fe37bb WHIRLPOOL 2fb319f159e50d372ae374a6656b7452a746f6a85d94c7b15745feea73dc9c107dd4c51af54c76115ebe184ef906e41e53f2a72b9beffdada5a533cc5f142494
-DIST sqlite3-1.3.12.gem 64512 SHA256 7d912f1b53d4bc11f84c4076c7ebae73bc21a9d82cc2df750fc37bbef3418d42 SHA512 fd1888b3107b02b15a65fdf081cad59445de4bc00ed244f4d3c09504c78ebbe97d9e1e189d61e6776ef70dedcb4d7b976799fd9d4752caafff733bc50cd0abf5 WHIRLPOOL 0cab560c5f5bae01ac80490d11154e9cb8ab1567fe2596db568023006bb35f2f26c6fa1dfdac47d5d70ec821df846a5337179ac0b96fb6667c4021c5b7f16a9b
-DIST sqlite3-1.3.13.gem 64512 SHA256 b138a22e0dbbb69be08540671dabf602599437e389a54054bb177f6ed1fd2e06 SHA512 5d3eab7c788cc62c497de179919054324e53595294ec3a9df2a10d23151a406ee9a88f1c3ac945777f138e78cec61018c388b023456b873131d678a6788a505f WHIRLPOOL 75cd6914dc69f17e39ac3805e2df4db2b89d8e997ea2de22cb04022f585e91481106568f0f061866675e6a415c83e0cd1c5edcbe18da1e55bb17ae88bf7f4c50
+DIST sqlite3-1.3.11.gem 60928 BLAKE2B c2dd494b2c5870a65588bea59cdf6752506f6389614955ecc0d006ae8a325e5ec45476bfd59fac6861b4db64108af87df4479c32775da014ea7d7306a59f8c9f SHA512 02bef5f8f61d1f04c79d9032d62c9d708dddc2446dd256ad13f932ed4cae256d6c60f742a285bc4015ef5b1fb13e9541738f31fd270fe22320fc176525fe37bb
+DIST sqlite3-1.3.12.gem 64512 BLAKE2B 604d0dc4691bc229168546d0244ba7e86dabf0e7c3f48c976e8010d66f8f59c2d25f7f5d261691e8457e87f175b1ead339b63f956bbd66390bcecde411357dec SHA512 fd1888b3107b02b15a65fdf081cad59445de4bc00ed244f4d3c09504c78ebbe97d9e1e189d61e6776ef70dedcb4d7b976799fd9d4752caafff733bc50cd0abf5
+DIST sqlite3-1.3.13.gem 64512 BLAKE2B a36e3161e44004a0510297d16bf491df3dc29434432208ad231f5e46ddecb4607add417e105f5ae8472a768f80efef3f74b703b2a441396b4c9b6c9ff90bf31e SHA512 5d3eab7c788cc62c497de179919054324e53595294ec3a9df2a10d23151a406ee9a88f1c3ac945777f138e78cec61018c388b023456b873131d678a6788a505f
diff --git a/dev-ruby/sqlite3/sqlite3-1.3.11.ebuild b/dev-ruby/sqlite3/sqlite3-1.3.11.ebuild
index 5ab3715d817a..fbbe3767cd6a 100644
--- a/dev-ruby/sqlite3/sqlite3-1.3.11.ebuild
+++ b/dev-ruby/sqlite3/sqlite3-1.3.11.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="An extension library to access a SQLite database from Ruby"
 HOMEPAGE="https://github.com/sparklemotion/sqlite3-ruby"
 LICENSE="BSD"
 
-KEYWORDS="amd64 ~arm hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-ruby/test-unit/Manifest b/dev-ruby/test-unit/Manifest
index b3e5215b1994..4dec316f6046 100644
--- a/dev-ruby/test-unit/Manifest
+++ b/dev-ruby/test-unit/Manifest
@@ -1,6 +1,6 @@
-DIST test-unit-1.2.3.gem 40960 SHA256 a7551459c53b0d73ac8e3ad3624b88d211bc80bc41a8c1a57c9d4b422beea4b7 SHA512 5e12a9691715a1e1afb53623867b77e2e06739929da5f0615c7341dc75f5feb281492bc0f6c55bdf1cc190f09a9a2c0f602638d5cad8a65682ba5f361bd22e57 WHIRLPOOL 2d459056aabf5804cc868d893060f6833570fbdd5c3d1d3fae09c2488909a55bdd340ab34297ac57298a03ff9c48a660705c1e28390e498aaef7ed40bf165205
-DIST test-unit-2.5.5.gem 111104 SHA256 3216d6584293964c438e0573fa8f0273d12df2abb1c32d7a6aa427d6e0779d47 SHA512 4f710997d187011bc240ef869f5c86c11e01d9c7c8bee5fd938f194155137d7164e69bae6d63e41b90de8f7f6ab813a62131f2f9518d57b3913777923b491142 WHIRLPOOL 8bcdd17b02162e73afe6a306fc34e7687db7c6abb38cd94c3e558c25d30db3dda1893a923d217d887af55ff64f88e6c14861de5c30786798d3c4cf99f2c26ce3
-DIST test-unit-3.1.9.gem 124416 SHA256 3efe0e17e4bc9880ada13515198531f6101bf6d03c5e5556f53cc72b45c33aec SHA512 ec3068db7faceb5c6a3f3a848512aa76ec2e360a2a1ca7ec45fd6c1b84f45f04fb1b4d77120dfde7b0a41e4a8435fa37ba6550e4242e3817d344b3ca8d7b4428 WHIRLPOOL 715cd547da273b6384a5f6191d2d80c26a1044ff94639cd4bdfd9a80553e026522e495683323572be41081dbad1f35fcab20b6b4c98a9f65ac576c8682e088f7
-DIST test-unit-3.2.4.gem 128000 SHA256 470fe5e582650ea485c7a5c2242fc9b6dc2018d9aa11dab1662a3b672919ab26 SHA512 e2ff209c9aef1b01c14a9dcea0c07d22fdc302cb42d68ffa8dd98d64dc444252ee746c3f3a2ad6ff4651c176d84d1b862e037a8a140c078b7f142a624115d3c7 WHIRLPOOL 96f0be0e15e9492ee9370c1562b7f987f35125058d6b66eb55cfa3bb72d50967025216f65695b357396df223539bad9a6aa1a19a5e133ab6355f5dc8fb4c6b4b
-DIST test-unit-3.2.5.gem 128512 SHA256 a230fc4f832ca770bf0bdcd82dd6e83f48fb24cf4e6e883bf83806c09d197d15 SHA512 4c2efa61893d20d593c3b4ab620219c4540f04abd8566c4448e17f50727a955188d76e2d09759f7829b4587c40369a2b7419bf13315537cea7da8bb95c795ab0 WHIRLPOOL 5925a10923d864a2750d965589eca8f2eaed14839cbe56b492606f767368e87e85a37e3586e60e6f5cb3287cc6d1b45cfb56f53c4cd8a8c144e2823ff690f208
-DIST test-unit-3.2.6.gem 128512 SHA256 db329c4721e02964d63f0c78a99f71c7341e8dc5a4f41f14a856fb659a5885be SHA512 4731f40a0c7ef855892a308470ccf005d31518122b0431b44406e627957819c9fb6a00eaca970e5914626e2ed12a4f6801e90df2ffc2762085fa414ea2203d7e WHIRLPOOL 31caec7a087de173fc8fde354a3c9efb88481d94c8465a4cad8fe209b27af47cc98dd1e5b623bd206fbd77f5d9a4355f4578ee8d12ab77877c886afe2f36b303
+DIST test-unit-1.2.3.gem 40960 BLAKE2B f376db195cc7daf90807f8824954185591d913912c2b0f66efdff5fcbeb034dad4f9adc8586afcefe7946698be9d19d3afddea16b266a4c035376e84c2936470 SHA512 5e12a9691715a1e1afb53623867b77e2e06739929da5f0615c7341dc75f5feb281492bc0f6c55bdf1cc190f09a9a2c0f602638d5cad8a65682ba5f361bd22e57
+DIST test-unit-2.5.5.gem 111104 BLAKE2B c74aaffb3c7a4cee2d4bc31de9616918725af917aab507e175b16a92677ae6b83bf0c0453ce3c663ed0989c0c6e145476777750ff563280212312092058fca69 SHA512 4f710997d187011bc240ef869f5c86c11e01d9c7c8bee5fd938f194155137d7164e69bae6d63e41b90de8f7f6ab813a62131f2f9518d57b3913777923b491142
+DIST test-unit-3.1.9.gem 124416 BLAKE2B f1c88d9e7da576babaa979a57eb522a244856711d013f0bc38ffb3f04d2b290eeaa50fde14078cedf1d86e26ebf12061ed03b9b82a2d9365a0c61796ef25eb72 SHA512 ec3068db7faceb5c6a3f3a848512aa76ec2e360a2a1ca7ec45fd6c1b84f45f04fb1b4d77120dfde7b0a41e4a8435fa37ba6550e4242e3817d344b3ca8d7b4428
+DIST test-unit-3.2.4.gem 128000 BLAKE2B d651a951d41d0a1ee2b95380d68dd15862959244eaec0e77750b910fecbe0f1be8d75f0dad7a2ac9f73bc4398e996a737a1218404f532f9b87ea7980ecc048e5 SHA512 e2ff209c9aef1b01c14a9dcea0c07d22fdc302cb42d68ffa8dd98d64dc444252ee746c3f3a2ad6ff4651c176d84d1b862e037a8a140c078b7f142a624115d3c7
+DIST test-unit-3.2.5.gem 128512 BLAKE2B 08758e57b9080b37a00af804d86ab63c582440e879724427ffe8429c5d9cc1c7d7bb0fc94df7c5d72fa18e07ace565b39b9e8531328b227b8ef997306ea95fd7 SHA512 4c2efa61893d20d593c3b4ab620219c4540f04abd8566c4448e17f50727a955188d76e2d09759f7829b4587c40369a2b7419bf13315537cea7da8bb95c795ab0
+DIST test-unit-3.2.6.gem 128512 BLAKE2B 51d20d77858d706c3db7e653cfa372d10f339b441fd6ee8a0487f89e7ba82bb525ace07da6962a87fc01d0515825dd72bc376309010bcaf4ff2a21faded0edff SHA512 4731f40a0c7ef855892a308470ccf005d31518122b0431b44406e627957819c9fb6a00eaca970e5914626e2ed12a4f6801e90df2ffc2762085fa414ea2203d7e
diff --git a/dev-ruby/test-unit/test-unit-2.5.5-r2.ebuild b/dev-ruby/test-unit/test-unit-2.5.5-r2.ebuild
index 5c143bad133a..2839444f6700 100644
--- a/dev-ruby/test-unit/test-unit-2.5.5-r2.ebuild
+++ b/dev-ruby/test-unit/test-unit-2.5.5-r2.ebuild
@@ -2,20 +2,14 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby21 ruby22"
+USE_RUBY="ruby22"
 
-RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_DOCDIR="doc"
 RUBY_FAKEGEM_EXTRADOC="TODO README.textile"
 
 inherit ruby-fakegem
 
-# Assume for now that ruby21 is not eselected yet and only depend on
-# yard for the other ruby implementations. Without this assumption
-# bootstrapping ruby21 won't be possible due to the yard dependency
-# tree.
-USE_RUBY="${USE_RUBY/ruby21/}" ruby_add_bdepend "doc? ( dev-ruby/yard )"
-
 DESCRIPTION="An improved version of the Test::Unit framework from Ruby 1.8"
 HOMEPAGE="http://test-unit.rubyforge.org/"
 
@@ -24,14 +18,6 @@ SLOT="2"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 
-all_ruby_compile() {
-	all_fakegem_compile
-
-	if use doc; then
-		yard doc --title ${PN} || die
-	fi
-}
-
 each_ruby_test() {
 	${RUBY} test/run-test.rb || die "testsuite failed"
 }
diff --git a/dev-ruby/test-unit/test-unit-3.1.9.ebuild b/dev-ruby/test-unit/test-unit-3.1.9.ebuild
index df7041285b1b..9148e3b26341 100644
--- a/dev-ruby/test-unit/test-unit-3.1.9.ebuild
+++ b/dev-ruby/test-unit/test-unit-3.1.9.ebuild
@@ -2,20 +2,13 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
+USE_RUBY="ruby22 ruby23"
 
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="README.md doc/text/news.md"
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.md doc.orig/text/news.md"
 
 inherit ruby-fakegem
 
-# Assume for now that ruby23 is not eselected yet and only
-# depend on yard for the other ruby implementations. Without this
-# assumption bootstrapping ruby23 won't be possible due to the yard
-# dependency tree.
-USE_RUBY="${USE_RUBY/ruby23/}" ruby_add_bdepend "doc? ( dev-ruby/yard )"
-
 DESCRIPTION="An xUnit family unit testing framework for Ruby"
 HOMEPAGE="https://rubygems.org/gems/test-unit"
 
@@ -26,12 +19,8 @@ IUSE="doc test"
 
 ruby_add_rdepend "dev-ruby/power_assert"
 
-all_ruby_compile() {
-	all_fakegem_compile
-
-	if use doc; then
-		yard doc --title ${PN} || die
-	fi
+all_ruby_prepare() {
+	mv doc doc.orig || die
 }
 
 each_ruby_test() {
diff --git a/dev-ruby/travis/metadata.xml b/dev-ruby/travis/metadata.xml
index 3394e7a0c743..3fb523c30fc0 100644
--- a/dev-ruby/travis/metadata.xml
+++ b/dev-ruby/travis/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 	<maintainer type="project">
 		<email>ruby@gentoo.org</email>
-        <name>Gentoo Ruby Project</name>
+		<name>Gentoo Ruby Project</name>
 	</maintainer>
 	<upstream>
 		<remote-id type="github">travis-ci/travis.rb</remote-id>
diff --git a/dev-ruby/windows_error/metadata.xml b/dev-ruby/windows_error/metadata.xml
index b2e679bfa76d..229ac8603f89 100644
--- a/dev-ruby/windows_error/metadata.xml
+++ b/dev-ruby/windows_error/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>zerochaos@gentoo.org</email>
-    <name>Rick Farina</name>
-  </maintainer>
-  <upstream>
-	<remote-id type="github">rapid7/windows_error</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>zerochaos@gentoo.org</email>
+		<name>Rick Farina</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">rapid7/windows_error</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/yard/Manifest b/dev-ruby/yard/Manifest
index 6d01cc71fa6e..7fca3d20a6c9 100644
--- a/dev-ruby/yard/Manifest
+++ b/dev-ruby/yard/Manifest
@@ -1,5 +1,3 @@
-DIST yard-0.8.7.3-git.tgz 854557 BLAKE2B a509aca8a37795d600767fc115671fbac6de3b1bd179f1e925136904730c3329c76856715ee8af7a3adc1fab1a6be080ea7c37c1e22497ecae369cfdf0630e5a SHA512 96b8a128bacd005e64c3a863ac6cc7377755397c7532b5541809c8a0f5b157cd7433644887823e2d3c4435a0bded59fc2785992fdcf5ebcbf616a4ffd912f6fa
-DIST yard-0.8.7.6-git.tgz 859257 BLAKE2B 044d0a42432fd4614593670388a4d02014d143dd3700974f0fa5a7185270800356d8e8da8e579993af6426de71a4a1c842ebec16c2bd2b2a14ce0802f2177602 SHA512 7f9d4100183e51a2059f01a06a77d9856961390975fd9981b81bf9ea55f047cfd9056c78b5400df277b8230f28990cb421216c4506bbeea797651f37ae2e5db1
 DIST yard-0.9.11-git.tgz 916355 BLAKE2B e9f27fe129cf93c51dbf83f4a7d5745d385252ba63c90f85223f2e9436c22a55aaba296f263072069d39e4beaca3e0830775a8be121c64cdc2a15afd3539a73f SHA512 375a4878e61888cf73aaa06e9300195ae48b9898d8cd639fa796a067e5fa0b89d6ef62d327a388ee83953e80177515f4d8c070042188e3a1e597f48b82b3a72e
 DIST yard-0.9.4-git.tgz 884608 BLAKE2B 9d17d7cdfa0432d769026f6bc12354be236b5d07d65bc510bfd6bdd5add12d87f77808832f9f011d327f13b495d499e395c232a3d77c7e779dd0ed40a676d911 SHA512 2255c56498dc147ee5ede5e4898ce7aad78e9350f317e5d5c942f6b12262e9e1d0893ffd985a6bf3822d6af902e8ff555c489e1d847049ba51a472ad3c4aa140
 DIST yard-0.9.8-git.tgz 897925 BLAKE2B 55179a3adcdcbb59f3e6eacf5a946aa28a0d13de0b9e0c5e0844deacbcbe91142927a4ab1ed0e385696cd5e2e484bd8c20fe1656515114d4d55e14c2f1d9e257 SHA512 f2e340bb90e5da456f622aadbc12278a6db486ed8b5a2f9a7b4408d6201cb6388a1f4fe0f3ca7584fdab9d73533e49015f465fb39b5049fe2c27c18e1d6cd41e
diff --git a/dev-ruby/yard/yard-0.8.7.3.ebuild b/dev-ruby/yard/yard-0.8.7.3.ebuild
deleted file mode 100644
index 385a4f72fd9e..000000000000
--- a/dev-ruby/yard/yard-0.8.7.3.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-RUBY_FAKEGEM_TASK_DOC="yard"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-RUBY_FAKEGEM_DOCDIR="doc docs"
-
-RUBY_FAKEGEM_EXTRAINSTALL="templates"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Documentation generation tool for the Ruby programming language"
-HOMEPAGE="http://yardoc.org/"
-
-# The gem lakes the gemspec file needed to pass tests.
-SRC_URI="https://github.com/lsegal/yard/archive/${PV}.tar.gz -> ${P}-git.tgz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_bdepend "doc? ( || ( dev-ruby/bluecloth dev-ruby/maruku dev-ruby/rdiscount dev-ruby/kramdown ) )
-	test? ( dev-ruby/rack )"
-
-all_ruby_prepare() {
-	sed -i -e '/[Bb]undler/ s:^:#:' spec/spec_helper.rb || die
-	sed -i -e "s/require 'bundler'; rescue LoadError//" spec/cli/server_spec.rb || die
-}
diff --git a/dev-ruby/yard/yard-0.8.7.6.ebuild b/dev-ruby/yard/yard-0.8.7.6.ebuild
deleted file mode 100644
index 2e44ba6e8a42..000000000000
--- a/dev-ruby/yard/yard-0.8.7.6.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-RUBY_FAKEGEM_TASK_DOC="yard"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-RUBY_FAKEGEM_DOCDIR="doc docs"
-
-RUBY_FAKEGEM_EXTRAINSTALL="templates"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Documentation generation tool for the Ruby programming language"
-HOMEPAGE="http://yardoc.org/"
-
-# The gem lakes the gemspec file needed to pass tests.
-SRC_URI="https://github.com/lsegal/yard/archive/v${PV}.tar.gz -> ${P}-git.tgz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_bdepend "doc? ( || ( dev-ruby/maruku dev-ruby/rdiscount dev-ruby/bluecloth dev-ruby/kramdown ) )"
-
-USE_RUBY="ruby20 ruby21" ruby_add_bdepend "test? ( >=dev-ruby/ruby-gettext-2.3.8 )"
-
-all_ruby_prepare() {
-	sed -i -e '/[Bb]undler/ s:^:#:' spec/spec_helper.rb || die
-
-	# Avoid specs that make assumptions on load ordering that are not
-	# true for us. This may be related to how we install in Gentoo. This
-	# also drops a test requirement on dev-ruby/rack.
-	rm -f spec/cli/server_spec.rb || die
-}
-
-each_ruby_prepare() {
-	case ${RUBY} in
-		*ruby23)
-			# Avoid possible brittle test
-			# https://github.com/lsegal/yard/issues/927
-			sed -i -e '/should find lone comments/,/^    end/ s:^:#:' spec/parser/ruby/ruby_parser_spec.rb || die
-			;;
-	esac
-}
diff --git a/dev-scheme/Manifest.gz b/dev-scheme/Manifest.gz
index 728ad1acce65..7ab11e7fd988 100644
Binary files a/dev-scheme/Manifest.gz and b/dev-scheme/Manifest.gz differ
diff --git a/dev-scheme/gauche-gl/metadata.xml b/dev-scheme/gauche-gl/metadata.xml
index 27760741035e..86d5e8fbae5f 100644
--- a/dev-scheme/gauche-gl/metadata.xml
+++ b/dev-scheme/gauche-gl/metadata.xml
@@ -5,8 +5,8 @@
 		<email>hattya@gentoo.org</email>
 	</maintainer>
 	<longdescription>
-    OpenGL binding of Gauche
-  </longdescription>
+		OpenGL binding of Gauche
+	</longdescription>
 	<use>
 		<flag name="cg">Enable NVidia Cg binding</flag>
 	</use>
diff --git a/dev-scheme/gauche-gtk/metadata.xml b/dev-scheme/gauche-gtk/metadata.xml
index f91580dbecff..883d438926be 100644
--- a/dev-scheme/gauche-gtk/metadata.xml
+++ b/dev-scheme/gauche-gtk/metadata.xml
@@ -5,8 +5,8 @@
 		<email>hattya@gentoo.org</email>
 	</maintainer>
 	<longdescription>
-    Gauche extension module to use GTK.
-  </longdescription>
+		Gauche extension module to use GTK.
+	</longdescription>
 	<use>
 		<flag name="glgd">Enable GL graph draw</flag>
 	</use>
diff --git a/dev-scheme/gauche/metadata.xml b/dev-scheme/gauche/metadata.xml
index f4a4c8740c58..b2990653937c 100644
--- a/dev-scheme/gauche/metadata.xml
+++ b/dev-scheme/gauche/metadata.xml
@@ -9,13 +9,13 @@
 		<name>Gentoo Scheme Project</name>
 	</maintainer>
 	<longdescription>
-    Gauche is an R5RS Scheme implementation developed to be a handy script
-    interpreter, which allows programmers and system administrators to write
-    small to large scripts for their daily chores. Quick startup, built-in
-    system interface, native multilingual support are some of my goals.
+		Gauche is an R5RS Scheme implementation developed to be a handy script
+		interpreter, which allows programmers and system administrators to write
+		small to large scripts for their daily chores. Quick startup, built-in
+		system interface, native multilingual support are some of my goals.
 
-    Gauche runs on several Unix-like platforms. 
-  </longdescription>
+		Gauche runs on several Unix-like platforms.
+	</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">gauche</remote-id>
 	</upstream>
diff --git a/dev-tcltk/Manifest.gz b/dev-tcltk/Manifest.gz
index f3189d40295a..63beeb03f30e 100644
Binary files a/dev-tcltk/Manifest.gz and b/dev-tcltk/Manifest.gz differ
diff --git a/dev-tcltk/tkcon/metadata.xml b/dev-tcltk/tkcon/metadata.xml
index 16fe78d616a1..06799c8ae04f 100644
--- a/dev-tcltk/tkcon/metadata.xml
+++ b/dev-tcltk/tkcon/metadata.xml
@@ -6,12 +6,12 @@
 		<name>Gentoo Tcltk Project</name>
 	</maintainer>
 	<longdescription lang="en">
-  tkcon is a replacement for the standard console that comes with
-  Tk. The console itself provides  more features than the standard
-  console. It is meant primarily to aid one when working with the
-  little details inside tcl and tk, giving UNIX users the GUI console
-  provided by default in the Mac and Windows Tk.
-</longdescription>
+		tkcon is a replacement for the standard console that comes with
+		Tk. The console itself provides  more features than the standard
+		console. It is meant primarily to aid one when working with the
+		little details inside tcl and tk, giving UNIX users the GUI console
+		provided by default in the Mac and Windows Tk.
+	</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">tkcon</remote-id>
 	</upstream>
diff --git a/dev-tcltk/tkimg/metadata.xml b/dev-tcltk/tkimg/metadata.xml
index 7f29c15bbf0f..b1e9347d617c 100644
--- a/dev-tcltk/tkimg/metadata.xml
+++ b/dev-tcltk/tkimg/metadata.xml
@@ -6,8 +6,8 @@
 		<name>Gentoo Tcltk Project</name>
 	</maintainer>
 	<longdescription lang="en">
-  The "Img" package adds a lot of image formats to Tcl/Tk.
-</longdescription>
+		The "Img" package adds a lot of image formats to Tcl/Tk.
+	</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">tkimg</remote-id>
 	</upstream>
diff --git a/dev-tex/Manifest.gz b/dev-tex/Manifest.gz
index 26239b4f9a3a..0203a340ae51 100644
Binary files a/dev-tex/Manifest.gz and b/dev-tex/Manifest.gz differ
diff --git a/dev-tex/dvi2gr/metadata.xml b/dev-tex/dvi2gr/metadata.xml
index 4965543533d3..ebade2698096 100644
--- a/dev-tex/dvi2gr/metadata.xml
+++ b/dev-tex/dvi2gr/metadata.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>sci@gentoo.org</email>
-	<name>Gentoo Science Project</name>
-</maintainer>
-<longdescription lang="en">
-  dvi2gr is a small utility to translate a TeX file (DVI) into a string
-  recognized by the Grace plotting tool.
-</longdescription>
+	<maintainer type="project">
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
+	<longdescription lang="en">
+		dvi2gr is a small utility to translate a TeX file (DVI) into a string
+		recognized by the Grace plotting tool.
+	</longdescription>
 </pkgmetadata>
diff --git a/dev-tex/isotope/metadata.xml b/dev-tex/isotope/metadata.xml
index b11ea7c82657..f93354f40a90 100644
--- a/dev-tex/isotope/metadata.xml
+++ b/dev-tex/isotope/metadata.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>tex@gentoo.org</email>
-    <name>Gentoo TeX Project</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>sci@gentoo.org</email>
-    <name>Gentoo Science Project</name>
-  </maintainer>
-  <longdescription>
-    The package provides a command \isotope for setting the atomic weight and
-	atomic number indications of isotopes. (The naive way of doing the job with
-	(La)TeX mathematics commands produces an unsatisfactory result.)
-  </longdescription>
+	<maintainer type="project">
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
+	<longdescription>
+		The package provides a command \isotope for setting the atomic weight and
+		atomic number indications of isotopes. (The naive way of doing the job with
+		(La)TeX mathematics commands produces an unsatisfactory result.)
+	</longdescription>
 </pkgmetadata>
diff --git a/dev-tex/notoccite/metadata.xml b/dev-tex/notoccite/metadata.xml
index 83e4841ebe15..22a386d5270a 100644
--- a/dev-tex/notoccite/metadata.xml
+++ b/dev-tex/notoccite/metadata.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>tex@gentoo.org</email>
-    <name>Gentoo TeX Project</name>
-  </maintainer>
-  <longdescription>
-    If you have \cite commands in \section-like commands, or in \caption, the
-	citation will also appear in the table of contents, or list of whatever. If
-	you are also using an unsrt-like bibliography style, these citations will
-	come at the very start of the bibliography, which is confusing. This package
-	suppresses the effect.
-  </longdescription>
+	<maintainer type="project">
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
+	<longdescription>
+		If you have \cite commands in \section-like commands, or in \caption, the
+		citation will also appear in the table of contents, or list of whatever. If
+		you are also using an unsrt-like bibliography style, these citations will
+		come at the very start of the bibliography, which is confusing. This package
+		suppresses the effect.
+	</longdescription>
 </pkgmetadata>
diff --git a/dev-texlive/Manifest.gz b/dev-texlive/Manifest.gz
index f5da4c02479a..a94ffdd55c90 100644
Binary files a/dev-texlive/Manifest.gz and b/dev-texlive/Manifest.gz differ
diff --git a/dev-texlive/texlive-basic/metadata.xml b/dev-texlive/texlive-basic/metadata.xml
index 8cbce5efa2a2..c7ba1cd4167e 100644
--- a/dev-texlive/texlive-basic/metadata.xml
+++ b/dev-texlive/texlive-basic/metadata.xml
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-	  <email>aballier@gentoo.org</email>
-    <name>Alexis Ballier</name>
-  </maintainer>
-  <maintainer type="project">
-     <email>tex@gentoo.org</email>
-     <name>Gentoo TeX Project</name>
-  </maintainer>
-<longdescription lang="en">
-These files are regarded as basic for any TeX system, covering
-plain TeX macros, Computer Modern fonts, and configuration for
-common drivers; no LaTeX.
-</longdescription>
-  <use>
-    <flag name="luajittex">Add support for LuaJitTeX: LuaTeX based on LuaJIT which is usually faster.</flag>
-  </use>
+	<maintainer type="person">
+		<email>aballier@gentoo.org</email>
+		<name>Alexis Ballier</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
+	<longdescription lang="en">
+		These files are regarded as basic for any TeX system, covering
+		plain TeX macros, Computer Modern fonts, and configuration for
+		common drivers; no LaTeX.
+	</longdescription>
+	<use>
+		<flag name="luajittex">Add support for LuaJitTeX: LuaTeX based on LuaJIT which is usually faster.</flag>
+	</use>
 </pkgmetadata>
diff --git a/dev-texlive/texlive-bibtexextra/metadata.xml b/dev-texlive/texlive-bibtexextra/metadata.xml
index e537e5c32899..dc6ecf479ea6 100644
--- a/dev-texlive/texlive-bibtexextra/metadata.xml
+++ b/dev-texlive/texlive-bibtexextra/metadata.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-	  <email>aballier@gentoo.org</email>
-    <name>Alexis Ballier</name>
-  </maintainer>
-  <maintainer type="project">
-     <email>tex@gentoo.org</email>
-     <name>Gentoo TeX Project</name>
-  </maintainer>
-<longdescription lang="en">
-Additional BibTeX styles and bibliography data(bases),
-notably including BibLaTeX.
-</longdescription>
+	<maintainer type="person">
+		<email>aballier@gentoo.org</email>
+		<name>Alexis Ballier</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
+	<longdescription lang="en">
+		Additional BibTeX styles and bibliography data(bases),
+		notably including BibLaTeX.
+	</longdescription>
 </pkgmetadata>
diff --git a/dev-texlive/texlive-context/metadata.xml b/dev-texlive/texlive-context/metadata.xml
index 334e41c54422..6facab4d827c 100644
--- a/dev-texlive/texlive-context/metadata.xml
+++ b/dev-texlive/texlive-context/metadata.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-	  <email>aballier@gentoo.org</email>
-    <name>Alexis Ballier</name>
-  </maintainer>
-  <maintainer type="project">
-     <email>tex@gentoo.org</email>
-     <name>Gentoo TeX Project</name>
-  </maintainer>
-<longdescription lang="en">
-Hans Hagen's powerful ConTeXt system, http://pragma-ade.com.
-Also includes third-party ConTeXt packages.
-</longdescription>
+	<maintainer type="person">
+		<email>aballier@gentoo.org</email>
+		<name>Alexis Ballier</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
+	<longdescription lang="en">
+		Hans Hagen's powerful ConTeXt system, http://pragma-ade.com.
+		Also includes third-party ConTeXt packages.
+	</longdescription>
 </pkgmetadata>
diff --git a/dev-texlive/texlive-fontsextra/metadata.xml b/dev-texlive/texlive-fontsextra/metadata.xml
index ad12eec44560..54b0616d4eca 100644
--- a/dev-texlive/texlive-fontsextra/metadata.xml
+++ b/dev-texlive/texlive-fontsextra/metadata.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-	  <email>aballier@gentoo.org</email>
-    <name>Alexis Ballier</name>
-  </maintainer>
-  <maintainer type="project">
-     <email>tex@gentoo.org</email>
-     <name>Gentoo TeX Project</name>
-  </maintainer>
+	<maintainer type="person">
+		<email>aballier@gentoo.org</email>
+		<name>Alexis Ballier</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-texlive/texlive-fontsrecommended/metadata.xml b/dev-texlive/texlive-fontsrecommended/metadata.xml
index 115d07b75d51..da8c219ea96f 100644
--- a/dev-texlive/texlive-fontsrecommended/metadata.xml
+++ b/dev-texlive/texlive-fontsrecommended/metadata.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-	  <email>aballier@gentoo.org</email>
-    <name>Alexis Ballier</name>
-  </maintainer>
-  <maintainer type="project">
-     <email>tex@gentoo.org</email>
-     <name>Gentoo TeX Project</name>
-  </maintainer>
-<longdescription lang="en">
-Recommended fonts, including the base 35 PostScript fonts,
-Latin Modern, TeX Gyre, and T1 and other encoding support for
-Computer Modern, in outline form.
-</longdescription>
+	<maintainer type="person">
+		<email>aballier@gentoo.org</email>
+		<name>Alexis Ballier</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
+	<longdescription lang="en">
+		Recommended fonts, including the base 35 PostScript fonts,
+		Latin Modern, TeX Gyre, and T1 and other encoding support for
+		Computer Modern, in outline form.
+	</longdescription>
 </pkgmetadata>
diff --git a/dev-texlive/texlive-fontutils/metadata.xml b/dev-texlive/texlive-fontutils/metadata.xml
index 5dc8253968f7..7ded3b03b31d 100644
--- a/dev-texlive/texlive-fontutils/metadata.xml
+++ b/dev-texlive/texlive-fontutils/metadata.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-	  <email>aballier@gentoo.org</email>
-    <name>Alexis Ballier</name>
-  </maintainer>
-  <maintainer type="project">
-     <email>tex@gentoo.org</email>
-     <name>Gentoo TeX Project</name>
-  </maintainer>
-<longdescription lang="en">
-Programs for conversion between font formats, testing fonts,
-virtual fonts, .gf and .pk manipulation, mft, fontinst, etc.
-Manipulating OpenType, TrueType, Type 1,and for manipulation of
-PostScript and other image formats.
-</longdescription>
+	<maintainer type="person">
+		<email>aballier@gentoo.org</email>
+		<name>Alexis Ballier</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
+	<longdescription lang="en">
+		Programs for conversion between font formats, testing fonts,
+		virtual fonts, .gf and .pk manipulation, mft, fontinst, etc.
+		Manipulating OpenType, TrueType, Type 1,and for manipulation of
+		PostScript and other image formats.
+	</longdescription>
 </pkgmetadata>
diff --git a/dev-texlive/texlive-formatsextra/metadata.xml b/dev-texlive/texlive-formatsextra/metadata.xml
index f806b0c3caa4..eeca861b0653 100644
--- a/dev-texlive/texlive-formatsextra/metadata.xml
+++ b/dev-texlive/texlive-formatsextra/metadata.xml
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-	  <email>aballier@gentoo.org</email>
-    <name>Alexis Ballier</name>
-  </maintainer>
-  <maintainer type="project">
-     <email>tex@gentoo.org</email>
-     <name>Gentoo TeX Project</name>
-  </maintainer>
-<longdescription lang="en">
-Collected TeX `formats', i.e., large-scale macro packages
-designed to be dumped into .fmt files -- excluding the most common
-ones, such as latex and context, which have their own package(s).
-It also includes the Aleph engine and related Omega formats and
-packages.
-</longdescription>
+	<maintainer type="person">
+		<email>aballier@gentoo.org</email>
+		<name>Alexis Ballier</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
+	<longdescription lang="en">
+		Collected TeX `formats', i.e., large-scale macro packages
+		designed to be dumped into .fmt files -- excluding the most common
+		ones, such as latex and context, which have their own package(s).
+		It also includes the Aleph engine and related Omega formats and
+		packages.
+	</longdescription>
 </pkgmetadata>
diff --git a/dev-texlive/texlive-games/metadata.xml b/dev-texlive/texlive-games/metadata.xml
index 7cc9f17e6baa..ace6bc7d6e2a 100644
--- a/dev-texlive/texlive-games/metadata.xml
+++ b/dev-texlive/texlive-games/metadata.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-	  <email>aballier@gentoo.org</email>
-    <name>Alexis Ballier</name>
-  </maintainer>
-  <maintainer type="project">
-     <email>tex@gentoo.org</email>
-     <name>Gentoo TeX Project</name>
-  </maintainer>
-<longdescription lang="en">
-Setups for typesetting various games, including chess.
-</longdescription>
+	<maintainer type="person">
+		<email>aballier@gentoo.org</email>
+		<name>Alexis Ballier</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
+	<longdescription lang="en">
+		Setups for typesetting various games, including chess.
+	</longdescription>
 </pkgmetadata>
diff --git a/dev-texlive/texlive-genericextra/metadata.xml b/dev-texlive/texlive-genericextra/metadata.xml
index d673f278de3b..33756a414f58 100644
--- a/dev-texlive/texlive-genericextra/metadata.xml
+++ b/dev-texlive/texlive-genericextra/metadata.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-	  <email>aballier@gentoo.org</email>
-    <name>Alexis Ballier</name>
-  </maintainer>
-  <maintainer type="project">
-     <email>tex@gentoo.org</email>
-     <name>Gentoo TeX Project</name>
-  </maintainer>
-<longdescription lang="en">
-Extra packages that work with multiple formats, typically both
-TeX and LaTeX.
-</longdescription>
+	<maintainer type="person">
+		<email>aballier@gentoo.org</email>
+		<name>Alexis Ballier</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
+	<longdescription lang="en">
+		Extra packages that work with multiple formats, typically both
+		TeX and LaTeX.
+	</longdescription>
 </pkgmetadata>
diff --git a/dev-texlive/texlive-genericrecommended/metadata.xml b/dev-texlive/texlive-genericrecommended/metadata.xml
index 68d234944d0d..88f6c962b98d 100644
--- a/dev-texlive/texlive-genericrecommended/metadata.xml
+++ b/dev-texlive/texlive-genericrecommended/metadata.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-	  <email>aballier@gentoo.org</email>
-    <name>Alexis Ballier</name>
-  </maintainer>
-  <maintainer type="project">
-     <email>tex@gentoo.org</email>
-     <name>Gentoo TeX Project</name>
-  </maintainer>
-<longdescription lang="en">
-Recommended packages that work with multiple formats.
-</longdescription>
+	<maintainer type="person">
+		<email>aballier@gentoo.org</email>
+		<name>Alexis Ballier</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
+	<longdescription lang="en">
+		Recommended packages that work with multiple formats.
+	</longdescription>
 </pkgmetadata>
diff --git a/dev-texlive/texlive-humanities/metadata.xml b/dev-texlive/texlive-humanities/metadata.xml
index cd4dae63e78b..f216652a7ad0 100644
--- a/dev-texlive/texlive-humanities/metadata.xml
+++ b/dev-texlive/texlive-humanities/metadata.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-	  <email>aballier@gentoo.org</email>
-    <name>Alexis Ballier</name>
-  </maintainer>
-  <maintainer type="project">
-     <email>tex@gentoo.org</email>
-     <name>Gentoo TeX Project</name>
-  </maintainer>
-<longdescription lang="en">
-Packages for law, linguistics, social sciences, humanities, etc.
-</longdescription>
+	<maintainer type="person">
+		<email>aballier@gentoo.org</email>
+		<name>Alexis Ballier</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
+	<longdescription lang="en">
+		Packages for law, linguistics, social sciences, humanities, etc.
+	</longdescription>
 </pkgmetadata>
diff --git a/dev-texlive/texlive-langafrican/metadata.xml b/dev-texlive/texlive-langafrican/metadata.xml
index 741d6d629990..98e073b67b38 100644
--- a/dev-texlive/texlive-langafrican/metadata.xml
+++ b/dev-texlive/texlive-langafrican/metadata.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-	  <email>aballier@gentoo.org</email>
-    <name>Alexis Ballier</name>
-  </maintainer>
-  <maintainer type="project">
-     <email>tex@gentoo.org</email>
-     <name>Gentoo TeX Project</name>
-  </maintainer>
-<longdescription lang="en">
-Support for African scripts.
-</longdescription>
+	<maintainer type="person">
+		<email>aballier@gentoo.org</email>
+		<name>Alexis Ballier</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
+	<longdescription lang="en">
+		Support for African scripts.
+	</longdescription>
 </pkgmetadata>
diff --git a/dev-texlive/texlive-langarabic/metadata.xml b/dev-texlive/texlive-langarabic/metadata.xml
index 6e1499699177..7a9f9d164c7b 100644
--- a/dev-texlive/texlive-langarabic/metadata.xml
+++ b/dev-texlive/texlive-langarabic/metadata.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-	  <email>aballier@gentoo.org</email>
-    <name>Alexis Ballier</name>
-  </maintainer>
-  <maintainer type="project">
-     <email>tex@gentoo.org</email>
-     <name>Gentoo TeX Project</name>
-  </maintainer>
-<longdescription lang="en">
-Support for Arabic and Persian.
-</longdescription>
+	<maintainer type="person">
+		<email>aballier@gentoo.org</email>
+		<name>Alexis Ballier</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
+	<longdescription lang="en">
+		Support for Arabic and Persian.
+	</longdescription>
 </pkgmetadata>
diff --git a/dev-texlive/texlive-langchinese/metadata.xml b/dev-texlive/texlive-langchinese/metadata.xml
index 1d12d5e4511b..f37dcbf65909 100644
--- a/dev-texlive/texlive-langchinese/metadata.xml
+++ b/dev-texlive/texlive-langchinese/metadata.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-	  <email>aballier@gentoo.org</email>
-    <name>Alexis Ballier</name>
-  </maintainer>
-  <maintainer type="project">
-     <email>tex@gentoo.org</email>
-     <name>Gentoo TeX Project</name>
-  </maintainer>
-<longdescription lang="en">
-Support for Chinese; additional packages in collection-langcjk.
-</longdescription>
+	<maintainer type="person">
+		<email>aballier@gentoo.org</email>
+		<name>Alexis Ballier</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
+	<longdescription lang="en">
+		Support for Chinese; additional packages in collection-langcjk.
+	</longdescription>
 </pkgmetadata>
diff --git a/dev-texlive/texlive-langcjk/metadata.xml b/dev-texlive/texlive-langcjk/metadata.xml
index fa0015d18962..a3be6b8bfad1 100644
--- a/dev-texlive/texlive-langcjk/metadata.xml
+++ b/dev-texlive/texlive-langcjk/metadata.xml
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-	  <email>aballier@gentoo.org</email>
-    <name>Alexis Ballier</name>
-  </maintainer>
-  <maintainer type="project">
-     <email>tex@gentoo.org</email>
-     <name>Gentoo TeX Project</name>
-  </maintainer>
-<longdescription lang="en">
-Packages supporting a combination of Chinese, Japanese, Korean,
-including macros, fonts, documentation.  Also Thai in the c90
-encoding, since there is some overlap in those fonts; standard
-Thai support is in collection-langother.  Additional packages
-for CJK are in their individual language collections.
-</longdescription>
+	<maintainer type="person">
+		<email>aballier@gentoo.org</email>
+		<name>Alexis Ballier</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
+	<longdescription lang="en">
+		Packages supporting a combination of Chinese, Japanese, Korean,
+		including macros, fonts, documentation.  Also Thai in the c90
+		encoding, since there is some overlap in those fonts; standard
+		Thai support is in collection-langother.  Additional packages
+		for CJK are in their individual language collections.
+	</longdescription>
 </pkgmetadata>
diff --git a/dev-texlive/texlive-langcyrillic/metadata.xml b/dev-texlive/texlive-langcyrillic/metadata.xml
index e85c18b2227a..5bd05be71a56 100644
--- a/dev-texlive/texlive-langcyrillic/metadata.xml
+++ b/dev-texlive/texlive-langcyrillic/metadata.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-	  <email>aballier@gentoo.org</email>
-    <name>Alexis Ballier</name>
-  </maintainer>
-  <maintainer type="project">
-     <email>tex@gentoo.org</email>
-     <name>Gentoo TeX Project</name>
-  </maintainer>
-<longdescription lang="en">
-Support for Cyrillic scripts (Bulgarian, Russian,
-Serbian, Ukrainian), even if Latin alphabets may also be used.
-</longdescription>
+	<maintainer type="person">
+		<email>aballier@gentoo.org</email>
+		<name>Alexis Ballier</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
+	<longdescription lang="en">
+		Support for Cyrillic scripts (Bulgarian, Russian,
+		Serbian, Ukrainian), even if Latin alphabets may also be used.
+	</longdescription>
 </pkgmetadata>
diff --git a/dev-texlive/texlive-langczechslovak/metadata.xml b/dev-texlive/texlive-langczechslovak/metadata.xml
index cbc429e7b373..1c568eec4432 100644
--- a/dev-texlive/texlive-langczechslovak/metadata.xml
+++ b/dev-texlive/texlive-langczechslovak/metadata.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-	  <email>aballier@gentoo.org</email>
-    <name>Alexis Ballier</name>
-  </maintainer>
-  <maintainer type="project">
-     <email>tex@gentoo.org</email>
-     <name>Gentoo TeX Project</name>
-  </maintainer>
-<longdescription lang="en">
-Support for Czech/Slovak.
-</longdescription>
+	<maintainer type="person">
+		<email>aballier@gentoo.org</email>
+		<name>Alexis Ballier</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
+	<longdescription lang="en">
+		Support for Czech/Slovak.
+	</longdescription>
 </pkgmetadata>
diff --git a/dev-texlive/texlive-langenglish/metadata.xml b/dev-texlive/texlive-langenglish/metadata.xml
index de5c6b093941..3fe55ec500fd 100644
--- a/dev-texlive/texlive-langenglish/metadata.xml
+++ b/dev-texlive/texlive-langenglish/metadata.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-	  <email>aballier@gentoo.org</email>
-    <name>Alexis Ballier</name>
-  </maintainer>
-  <maintainer type="project">
-     <email>tex@gentoo.org</email>
-     <name>Gentoo TeX Project</name>
-  </maintainer>
-<longdescription lang="en">
-Support for, and documentation in, English.
-</longdescription>
+	<maintainer type="person">
+		<email>aballier@gentoo.org</email>
+		<name>Alexis Ballier</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
+	<longdescription lang="en">
+		Support for, and documentation in, English.
+	</longdescription>
 </pkgmetadata>
diff --git a/dev-texlive/texlive-langeuropean/metadata.xml b/dev-texlive/texlive-langeuropean/metadata.xml
index 666876685749..b2f2f003a2fe 100644
--- a/dev-texlive/texlive-langeuropean/metadata.xml
+++ b/dev-texlive/texlive-langeuropean/metadata.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-	  <email>aballier@gentoo.org</email>
-    <name>Alexis Ballier</name>
-  </maintainer>
-  <maintainer type="project">
-     <email>tex@gentoo.org</email>
-     <name>Gentoo TeX Project</name>
-  </maintainer>
-<longdescription lang="en">
-Support for a number of European languages; others (Greek,
-German, French, ...) have their own collections, depending
-simply on the size of the support.
-</longdescription>
+	<maintainer type="person">
+		<email>aballier@gentoo.org</email>
+		<name>Alexis Ballier</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
+	<longdescription lang="en">
+		Support for a number of European languages; others (Greek,
+		German, French, ...) have their own collections, depending
+		simply on the size of the support.
+	</longdescription>
 </pkgmetadata>
diff --git a/dev-texlive/texlive-langfrench/metadata.xml b/dev-texlive/texlive-langfrench/metadata.xml
index b5a1584aba9e..cfcadd3d5303 100644
--- a/dev-texlive/texlive-langfrench/metadata.xml
+++ b/dev-texlive/texlive-langfrench/metadata.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-	  <email>aballier@gentoo.org</email>
-    <name>Alexis Ballier</name>
-  </maintainer>
-  <maintainer type="project">
-     <email>tex@gentoo.org</email>
-     <name>Gentoo TeX Project</name>
-  </maintainer>
-<longdescription lang="en">
-Support for French and Basque.
-</longdescription>
+	<maintainer type="person">
+		<email>aballier@gentoo.org</email>
+		<name>Alexis Ballier</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
+	<longdescription lang="en">
+		Support for French and Basque.
+	</longdescription>
 </pkgmetadata>
diff --git a/dev-texlive/texlive-langgerman/metadata.xml b/dev-texlive/texlive-langgerman/metadata.xml
index fccfc1a3e4a4..ca0c50dbb9b3 100644
--- a/dev-texlive/texlive-langgerman/metadata.xml
+++ b/dev-texlive/texlive-langgerman/metadata.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-	  <email>aballier@gentoo.org</email>
-    <name>Alexis Ballier</name>
-  </maintainer>
-  <maintainer type="project">
-     <email>tex@gentoo.org</email>
-     <name>Gentoo TeX Project</name>
-  </maintainer>
-<longdescription lang="en">
-Support for German.
-</longdescription>
+	<maintainer type="person">
+		<email>aballier@gentoo.org</email>
+		<name>Alexis Ballier</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
+	<longdescription lang="en">
+		Support for German.
+	</longdescription>
 </pkgmetadata>
diff --git a/dev-texlive/texlive-langgreek/metadata.xml b/dev-texlive/texlive-langgreek/metadata.xml
index de7fe2411535..6c59fde89862 100644
--- a/dev-texlive/texlive-langgreek/metadata.xml
+++ b/dev-texlive/texlive-langgreek/metadata.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-	  <email>aballier@gentoo.org</email>
-    <name>Alexis Ballier</name>
-  </maintainer>
-  <maintainer type="project">
-     <email>tex@gentoo.org</email>
-     <name>Gentoo TeX Project</name>
-  </maintainer>
-<longdescription lang="en">
-Support for Greek.
-</longdescription>
+	<maintainer type="person">
+		<email>aballier@gentoo.org</email>
+		<name>Alexis Ballier</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
+	<longdescription lang="en">
+		Support for Greek.
+	</longdescription>
 </pkgmetadata>
diff --git a/dev-texlive/texlive-langindic/metadata.xml b/dev-texlive/texlive-langindic/metadata.xml
index 166d99654b6a..69beb8c840ef 100644
--- a/dev-texlive/texlive-langindic/metadata.xml
+++ b/dev-texlive/texlive-langindic/metadata.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-	  <email>aballier@gentoo.org</email>
-    <name>Alexis Ballier</name>
-  </maintainer>
-  <maintainer type="project">
-     <email>tex@gentoo.org</email>
-     <name>Gentoo TeX Project</name>
-  </maintainer>
-<longdescription lang="en">
-Support for Indic scripts.
-</longdescription>
+	<maintainer type="person">
+		<email>aballier@gentoo.org</email>
+		<name>Alexis Ballier</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
+	<longdescription lang="en">
+		Support for Indic scripts.
+	</longdescription>
 </pkgmetadata>
diff --git a/dev-texlive/texlive-langitalian/metadata.xml b/dev-texlive/texlive-langitalian/metadata.xml
index bd3e5c4996dd..cac43e9a313a 100644
--- a/dev-texlive/texlive-langitalian/metadata.xml
+++ b/dev-texlive/texlive-langitalian/metadata.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-	  <email>aballier@gentoo.org</email>
-    <name>Alexis Ballier</name>
-  </maintainer>
-  <maintainer type="project">
-     <email>tex@gentoo.org</email>
-     <name>Gentoo TeX Project</name>
-  </maintainer>
-<longdescription lang="en">
-Support for Italian.
-</longdescription>
+	<maintainer type="person">
+		<email>aballier@gentoo.org</email>
+		<name>Alexis Ballier</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
+	<longdescription lang="en">
+		Support for Italian.
+	</longdescription>
 </pkgmetadata>
diff --git a/dev-texlive/texlive-langjapanese/metadata.xml b/dev-texlive/texlive-langjapanese/metadata.xml
index 5a339826b2b3..04aa69c5295e 100644
--- a/dev-texlive/texlive-langjapanese/metadata.xml
+++ b/dev-texlive/texlive-langjapanese/metadata.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-	  <email>aballier@gentoo.org</email>
-    <name>Alexis Ballier</name>
-  </maintainer>
-  <maintainer type="project">
-     <email>tex@gentoo.org</email>
-     <name>Gentoo TeX Project</name>
-  </maintainer>
-<longdescription lang="en">
-Support for Japanese; additional packages in collection-langcjk.
-</longdescription>
+	<maintainer type="person">
+		<email>aballier@gentoo.org</email>
+		<name>Alexis Ballier</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
+	<longdescription lang="en">
+		Support for Japanese; additional packages in collection-langcjk.
+	</longdescription>
 </pkgmetadata>
diff --git a/dev-texlive/texlive-langkorean/metadata.xml b/dev-texlive/texlive-langkorean/metadata.xml
index 355eec8e82c3..245d8b4a89c1 100644
--- a/dev-texlive/texlive-langkorean/metadata.xml
+++ b/dev-texlive/texlive-langkorean/metadata.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-	  <email>aballier@gentoo.org</email>
-    <name>Alexis Ballier</name>
-  </maintainer>
-  <maintainer type="project">
-     <email>tex@gentoo.org</email>
-     <name>Gentoo TeX Project</name>
-  </maintainer>
-<longdescription lang="en">
-Support for Korean; additional packages in collection-langcjk.
-</longdescription>
+	<maintainer type="person">
+		<email>aballier@gentoo.org</email>
+		<name>Alexis Ballier</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
+	<longdescription lang="en">
+		Support for Korean; additional packages in collection-langcjk.
+	</longdescription>
 </pkgmetadata>
diff --git a/dev-texlive/texlive-langother/metadata.xml b/dev-texlive/texlive-langother/metadata.xml
index 856c6c971e3f..5c0a5c5c6649 100644
--- a/dev-texlive/texlive-langother/metadata.xml
+++ b/dev-texlive/texlive-langother/metadata.xml
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-	  <email>aballier@gentoo.org</email>
-    <name>Alexis Ballier</name>
-  </maintainer>
-  <maintainer type="project">
-     <email>tex@gentoo.org</email>
-     <name>Gentoo TeX Project</name>
-  </maintainer>
-<longdescription lang="en">
-Support for languages not otherwise listed, including Indic,
-Thai, Vietnamese, Hebrew, Indonesian, African languages, and
-plenty more.  The split is made simply on the basis of the size
-of the support, to keep both collection sizes and the number of
-collections reasonable.
-</longdescription>
+	<maintainer type="person">
+		<email>aballier@gentoo.org</email>
+		<name>Alexis Ballier</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
+	<longdescription lang="en">
+		Support for languages not otherwise listed, including Indic,
+		Thai, Vietnamese, Hebrew, Indonesian, African languages, and
+		plenty more.  The split is made simply on the basis of the size
+		of the support, to keep both collection sizes and the number of
+		collections reasonable.
+	</longdescription>
 </pkgmetadata>
diff --git a/dev-texlive/texlive-langpolish/metadata.xml b/dev-texlive/texlive-langpolish/metadata.xml
index 2ad42162d813..94f2ab83d520 100644
--- a/dev-texlive/texlive-langpolish/metadata.xml
+++ b/dev-texlive/texlive-langpolish/metadata.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-	  <email>aballier@gentoo.org</email>
-    <name>Alexis Ballier</name>
-  </maintainer>
-  <maintainer type="project">
-     <email>tex@gentoo.org</email>
-     <name>Gentoo TeX Project</name>
-  </maintainer>
-<longdescription lang="en">
-Support for Polish.
-</longdescription>
+	<maintainer type="person">
+		<email>aballier@gentoo.org</email>
+		<name>Alexis Ballier</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
+	<longdescription lang="en">
+		Support for Polish.
+	</longdescription>
 </pkgmetadata>
diff --git a/dev-texlive/texlive-langportuguese/metadata.xml b/dev-texlive/texlive-langportuguese/metadata.xml
index f1daa2a7c9f0..21f454b4383a 100644
--- a/dev-texlive/texlive-langportuguese/metadata.xml
+++ b/dev-texlive/texlive-langportuguese/metadata.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-	  <email>aballier@gentoo.org</email>
-    <name>Alexis Ballier</name>
-  </maintainer>
-  <maintainer type="project">
-     <email>tex@gentoo.org</email>
-     <name>Gentoo TeX Project</name>
-  </maintainer>
-<longdescription lang="en">
-Support for Portuguese.
-</longdescription>
+	<maintainer type="person">
+		<email>aballier@gentoo.org</email>
+		<name>Alexis Ballier</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
+	<longdescription lang="en">
+		Support for Portuguese.
+	</longdescription>
 </pkgmetadata>
diff --git a/dev-texlive/texlive-langspanish/metadata.xml b/dev-texlive/texlive-langspanish/metadata.xml
index 2b52fce2183b..360ac2ed4f02 100644
--- a/dev-texlive/texlive-langspanish/metadata.xml
+++ b/dev-texlive/texlive-langspanish/metadata.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-	  <email>aballier@gentoo.org</email>
-    <name>Alexis Ballier</name>
-  </maintainer>
-  <maintainer type="project">
-     <email>tex@gentoo.org</email>
-     <name>Gentoo TeX Project</name>
-  </maintainer>
-<longdescription lang="en">
-Support for Spanish.
-</longdescription>
+	<maintainer type="person">
+		<email>aballier@gentoo.org</email>
+		<name>Alexis Ballier</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
+	<longdescription lang="en">
+		Support for Spanish.
+	</longdescription>
 </pkgmetadata>
diff --git a/dev-texlive/texlive-latex/metadata.xml b/dev-texlive/texlive-latex/metadata.xml
index cab2d4d1e4e9..a70a256301a3 100644
--- a/dev-texlive/texlive-latex/metadata.xml
+++ b/dev-texlive/texlive-latex/metadata.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-	  <email>aballier@gentoo.org</email>
-    <name>Alexis Ballier</name>
-  </maintainer>
-  <maintainer type="project">
-     <email>tex@gentoo.org</email>
-     <name>Gentoo TeX Project</name>
-  </maintainer>
-<longdescription lang="en">
-These packages are either mandated by the core LaTeX team,
-or very widely used and strongly recommended in practice.
-</longdescription>
+	<maintainer type="person">
+		<email>aballier@gentoo.org</email>
+		<name>Alexis Ballier</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
+	<longdescription lang="en">
+		These packages are either mandated by the core LaTeX team,
+		or very widely used and strongly recommended in practice.
+	</longdescription>
 </pkgmetadata>
diff --git a/dev-texlive/texlive-latexextra/metadata.xml b/dev-texlive/texlive-latexextra/metadata.xml
index 510f180ed4e8..97e487049923 100644
--- a/dev-texlive/texlive-latexextra/metadata.xml
+++ b/dev-texlive/texlive-latexextra/metadata.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-	  <email>aballier@gentoo.org</email>
-    <name>Alexis Ballier</name>
-  </maintainer>
-  <maintainer type="project">
-     <email>tex@gentoo.org</email>
-     <name>Gentoo TeX Project</name>
-  </maintainer>
-<longdescription lang="en">
-A very large collection of add-on packages for LaTeX.
-</longdescription>
+	<maintainer type="person">
+		<email>aballier@gentoo.org</email>
+		<name>Alexis Ballier</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
+	<longdescription lang="en">
+		A very large collection of add-on packages for LaTeX.
+	</longdescription>
 </pkgmetadata>
diff --git a/dev-texlive/texlive-latexrecommended/metadata.xml b/dev-texlive/texlive-latexrecommended/metadata.xml
index 5f784d663acf..572c3f54698f 100644
--- a/dev-texlive/texlive-latexrecommended/metadata.xml
+++ b/dev-texlive/texlive-latexrecommended/metadata.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-	  <email>aballier@gentoo.org</email>
-    <name>Alexis Ballier</name>
-  </maintainer>
-  <maintainer type="project">
-     <email>tex@gentoo.org</email>
-     <name>Gentoo TeX Project</name>
-  </maintainer>
-<longdescription lang="en">
-A collection of recommended add-on packages for LaTeX which have
-widespread use.
-</longdescription>
+	<maintainer type="person">
+		<email>aballier@gentoo.org</email>
+		<name>Alexis Ballier</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
+	<longdescription lang="en">
+		A collection of recommended add-on packages for LaTeX which have
+		widespread use.
+	</longdescription>
 </pkgmetadata>
diff --git a/dev-texlive/texlive-luatex/metadata.xml b/dev-texlive/texlive-luatex/metadata.xml
index d0379fbd88ff..53a7e2fef7d3 100644
--- a/dev-texlive/texlive-luatex/metadata.xml
+++ b/dev-texlive/texlive-luatex/metadata.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-	  <email>aballier@gentoo.org</email>
-    <name>Alexis Ballier</name>
-  </maintainer>
-  <maintainer type="project">
-     <email>tex@gentoo.org</email>
-     <name>Gentoo TeX Project</name>
-  </maintainer>
-<longdescription lang="en">
-Packages for LuaTeX, a Unicode-aware extension of pdfTeX, using Lua 
-as an embedded scripting and extension language. http://luatex.org/
-</longdescription>
+	<maintainer type="person">
+		<email>aballier@gentoo.org</email>
+		<name>Alexis Ballier</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
+	<longdescription lang="en">
+		Packages for LuaTeX, a Unicode-aware extension of pdfTeX, using Lua
+		as an embedded scripting and extension language. http://luatex.org/
+	</longdescription>
 </pkgmetadata>
diff --git a/dev-texlive/texlive-mathscience/metadata.xml b/dev-texlive/texlive-mathscience/metadata.xml
index ad12eec44560..54b0616d4eca 100644
--- a/dev-texlive/texlive-mathscience/metadata.xml
+++ b/dev-texlive/texlive-mathscience/metadata.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-	  <email>aballier@gentoo.org</email>
-    <name>Alexis Ballier</name>
-  </maintainer>
-  <maintainer type="project">
-     <email>tex@gentoo.org</email>
-     <name>Gentoo TeX Project</name>
-  </maintainer>
+	<maintainer type="person">
+		<email>aballier@gentoo.org</email>
+		<name>Alexis Ballier</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-texlive/texlive-metapost/metadata.xml b/dev-texlive/texlive-metapost/metadata.xml
index ad12eec44560..54b0616d4eca 100644
--- a/dev-texlive/texlive-metapost/metadata.xml
+++ b/dev-texlive/texlive-metapost/metadata.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-	  <email>aballier@gentoo.org</email>
-    <name>Alexis Ballier</name>
-  </maintainer>
-  <maintainer type="project">
-     <email>tex@gentoo.org</email>
-     <name>Gentoo TeX Project</name>
-  </maintainer>
+	<maintainer type="person">
+		<email>aballier@gentoo.org</email>
+		<name>Alexis Ballier</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-texlive/texlive-music/metadata.xml b/dev-texlive/texlive-music/metadata.xml
index a7c52291e1a2..ddef38dd8a48 100644
--- a/dev-texlive/texlive-music/metadata.xml
+++ b/dev-texlive/texlive-music/metadata.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-	  <email>aballier@gentoo.org</email>
-    <name>Alexis Ballier</name>
-  </maintainer>
-  <maintainer type="project">
-     <email>tex@gentoo.org</email>
-     <name>Gentoo TeX Project</name>
-  </maintainer>
-<longdescription lang="en">
-Music-related fonts and packages.
-</longdescription>
+	<maintainer type="person">
+		<email>aballier@gentoo.org</email>
+		<name>Alexis Ballier</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
+	<longdescription lang="en">
+		Music-related fonts and packages.
+	</longdescription>
 </pkgmetadata>
diff --git a/dev-texlive/texlive-omega/metadata.xml b/dev-texlive/texlive-omega/metadata.xml
index f9556b6cbc92..e36f5fe4b36c 100644
--- a/dev-texlive/texlive-omega/metadata.xml
+++ b/dev-texlive/texlive-omega/metadata.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-	  <email>aballier@gentoo.org</email>
-    <name>Alexis Ballier</name>
-  </maintainer>
-  <maintainer type="project">
-     <email>tex@gentoo.org</email>
-     <name>Gentoo TeX Project</name>
-  </maintainer>
-<longdescription lang="en">
-Omega, a 16-bit extended TeX by John Plaice and Yannis Haralambous,
-now updated to Aleph.
-</longdescription>
+	<maintainer type="person">
+		<email>aballier@gentoo.org</email>
+		<name>Alexis Ballier</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
+	<longdescription lang="en">
+		Omega, a 16-bit extended TeX by John Plaice and Yannis Haralambous,
+		now updated to Aleph.
+	</longdescription>
 </pkgmetadata>
diff --git a/dev-texlive/texlive-pictures/metadata.xml b/dev-texlive/texlive-pictures/metadata.xml
index cf898468aaa1..7b294e1d108e 100644
--- a/dev-texlive/texlive-pictures/metadata.xml
+++ b/dev-texlive/texlive-pictures/metadata.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-	  <email>aballier@gentoo.org</email>
-    <name>Alexis Ballier</name>
-  </maintainer>
-  <maintainer type="project">
-     <email>tex@gentoo.org</email>
-     <name>Gentoo TeX Project</name>
-  </maintainer>
-<longdescription lang="en">
-Including TikZ, pict, etc., but MetaPost and PStricks are separate.
-</longdescription>
+	<maintainer type="person">
+		<email>aballier@gentoo.org</email>
+		<name>Alexis Ballier</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
+	<longdescription lang="en">
+		Including TikZ, pict, etc., but MetaPost and PStricks are separate.
+	</longdescription>
 </pkgmetadata>
diff --git a/dev-texlive/texlive-plainextra/metadata.xml b/dev-texlive/texlive-plainextra/metadata.xml
index 5c1e7e8d9564..65c29b002686 100644
--- a/dev-texlive/texlive-plainextra/metadata.xml
+++ b/dev-texlive/texlive-plainextra/metadata.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-	  <email>aballier@gentoo.org</email>
-    <name>Alexis Ballier</name>
-  </maintainer>
-  <maintainer type="project">
-     <email>tex@gentoo.org</email>
-     <name>Gentoo TeX Project</name>
-  </maintainer>
-<longdescription lang="en">
-Add-on packages and macros that work with plain TeX.
-</longdescription>
+	<maintainer type="person">
+		<email>aballier@gentoo.org</email>
+		<name>Alexis Ballier</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
+	<longdescription lang="en">
+		Add-on packages and macros that work with plain TeX.
+	</longdescription>
 </pkgmetadata>
diff --git a/dev-texlive/texlive-plaingeneric/metadata.xml b/dev-texlive/texlive-plaingeneric/metadata.xml
index 332b29c25903..c6aa110e82eb 100644
--- a/dev-texlive/texlive-plaingeneric/metadata.xml
+++ b/dev-texlive/texlive-plaingeneric/metadata.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-	  <email>aballier@gentoo.org</email>
-    <name>Alexis Ballier</name>
-  </maintainer>
-  <maintainer type="project">
-     <email>tex@gentoo.org</email>
-     <name>Gentoo TeX Project</name>
-  </maintainer>
-<longdescription lang="en">
-Add-on packages and macros that work with plain TeX,
-often LaTeX, and occasionally other formats.
-</longdescription>
+	<maintainer type="person">
+		<email>aballier@gentoo.org</email>
+		<name>Alexis Ballier</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
+	<longdescription lang="en">
+		Add-on packages and macros that work with plain TeX,
+		often LaTeX, and occasionally other formats.
+	</longdescription>
 </pkgmetadata>
diff --git a/dev-texlive/texlive-pstricks/metadata.xml b/dev-texlive/texlive-pstricks/metadata.xml
index abf5f7b13778..dce5fcf02f2a 100644
--- a/dev-texlive/texlive-pstricks/metadata.xml
+++ b/dev-texlive/texlive-pstricks/metadata.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-	  <email>aballier@gentoo.org</email>
-    <name>Alexis Ballier</name>
-  </maintainer>
-  <maintainer type="project">
-     <email>tex@gentoo.org</email>
-     <name>Gentoo TeX Project</name>
-  </maintainer>
-<longdescription lang="en">
-PSTricks core and all add-on packages.
-</longdescription>
+	<maintainer type="person">
+		<email>aballier@gentoo.org</email>
+		<name>Alexis Ballier</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
+	<longdescription lang="en">
+		PSTricks core and all add-on packages.
+	</longdescription>
 </pkgmetadata>
diff --git a/dev-texlive/texlive-publishers/metadata.xml b/dev-texlive/texlive-publishers/metadata.xml
index ad12eec44560..54b0616d4eca 100644
--- a/dev-texlive/texlive-publishers/metadata.xml
+++ b/dev-texlive/texlive-publishers/metadata.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-	  <email>aballier@gentoo.org</email>
-    <name>Alexis Ballier</name>
-  </maintainer>
-  <maintainer type="project">
-     <email>tex@gentoo.org</email>
-     <name>Gentoo TeX Project</name>
-  </maintainer>
+	<maintainer type="person">
+		<email>aballier@gentoo.org</email>
+		<name>Alexis Ballier</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-texlive/texlive-xetex/metadata.xml b/dev-texlive/texlive-xetex/metadata.xml
index c739f82887cf..5d8bd88f04c9 100644
--- a/dev-texlive/texlive-xetex/metadata.xml
+++ b/dev-texlive/texlive-xetex/metadata.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-	  <email>aballier@gentoo.org</email>
-    <name>Alexis Ballier</name>
-  </maintainer>
-  <maintainer type="project">
-     <email>tex@gentoo.org</email>
-     <name>Gentoo TeX Project</name>
-  </maintainer>
-<longdescription lang="en">
-Packages for XeTeX, the Unicode/OpenType-enabled TeX by Jonathan Kew,
-http://tug.org/xetex.
-</longdescription>
+	<maintainer type="person">
+		<email>aballier@gentoo.org</email>
+		<name>Alexis Ballier</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
+	<longdescription lang="en">
+		Packages for XeTeX, the Unicode/OpenType-enabled TeX by Jonathan Kew,
+		http://tug.org/xetex.
+	</longdescription>
 </pkgmetadata>
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index c19c94185b53..4898f22dfbcd 100644
Binary files a/dev-util/Manifest.gz and b/dev-util/Manifest.gz differ
diff --git a/dev-util/android-studio/Manifest b/dev-util/android-studio/Manifest
index aa7e4b044856..db3a6e6fc0eb 100644
--- a/dev-util/android-studio/Manifest
+++ b/dev-util/android-studio/Manifest
@@ -1,2 +1,3 @@
 DIST android-studio-ide-162.4069837-linux.zip 490782431 SHA256 1383cfd47441e5f820b6257a1bdd683e0e980bc76c7f2027ef84dc2e6ad2f17f SHA512 44f093ce4c97211913bb979fb28d5fe43163462ce6153c31c03576d872e11cbc11651f10397e14247ca41ea269a3cb0998e9e7d37fc63ac6782cc653037d925c WHIRLPOOL ed833816f48abba51d8142fda91175c07f019f40a3ed21ea026367870723016c17262c0eccb71d3d85a5f963ca0a84b0ee2111ae15f95ad92ac565f225d6c10a
-DIST android-studio-ide-171.4408382-linux.zip 771324214 SHA256 7991f95ea1b6c55645a3fc48f1534d4135501a07b9d92dd83672f936d9a9d7a2 SHA512 7637cc2bfd808cd641d8420e8f5a53660139f37beaf822b7b6a3bb49369d7f5a4e5ccfc805d914ff82eee3065d694a7c3d92b53ced88090ad15d57dae4e7e737 WHIRLPOOL b8b78d6838d960313d10bba98bf3deaf6e9e1defad0d6288c7108228210d8c3a6d9b92de38620f4c9ed43338d425605437d45f19e57c56eb369e10f046e9322d
+DIST android-studio-ide-171.4408382-linux.zip 771324214 BLAKE2B 4dbb194338a139d884d05acc60db65d2d85cb80cf28a44a50adf5dbb7390851d5d2640050f17a0048c926c7022794838f5ce6c259f5dd66b04dde47d7b237796 SHA512 7637cc2bfd808cd641d8420e8f5a53660139f37beaf822b7b6a3bb49369d7f5a4e5ccfc805d914ff82eee3065d694a7c3d92b53ced88090ad15d57dae4e7e737
+DIST android-studio-ide-171.4443003-linux.zip 773670325 BLAKE2B b8cff0b85cf20f9d181b4f5c29dc75385539ca2d8e2677211c6c42fcb115616c4208faa5df8cc8a8210c4e9e869d00ae42e7c9dd212756608ff9d4f47bdc8943 SHA512 ba91309c59e4f258222f5b5978bc9ea048476bab4d0662235c7900590f9d58716dc77e937464fab0e57752ee18353a13c163ee98615474f48d0b99e04dae1d34
diff --git a/dev-util/android-studio/android-studio-3.0.0.18.171.4408382.ebuild b/dev-util/android-studio/android-studio-3.0.0.18.171.4408382.ebuild
index fbc7007c5f62..446c76a3456d 100644
--- a/dev-util/android-studio/android-studio-3.0.0.18.171.4408382.ebuild
+++ b/dev-util/android-studio/android-studio-3.0.0.18.171.4408382.ebuild
@@ -28,7 +28,7 @@ SRC_URI="https://dl.google.com/dl/android/studio/ide-zips/${STUDIO_V}/${PN}-ide-
 LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="selinux"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND="app-arch/zip
 	dev-java/commons-logging:0
diff --git a/dev-util/android-studio/android-studio-3.0.1.0.171.4443003.ebuild b/dev-util/android-studio/android-studio-3.0.1.0.171.4443003.ebuild
new file mode 100644
index 000000000000..2791da5ee994
--- /dev/null
+++ b/dev-util/android-studio/android-studio-3.0.1.0.171.4443003.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils java-pkg-2 versionator
+
+RESTRICT="strip"
+QA_PREBUILT="opt/${PN}/bin/libbreakgen*.so
+	opt/${PN}/bin/fsnotifier*
+	opt/${PN}/lib/libpty/linux/x86*/libpty.so
+	opt/${PN}/plugins/android/lib/libwebp_jni*.so
+	opt/${PN}/plugins/android/resources/perfa/*/libperfa.so
+	opt/${PN}/plugins/android/resources/perfd/*/perfd
+	opt/${PN}/plugins/android/resources/simpleperf/*/simpleperf"
+
+if [[ $(get_version_component_count) -eq 6 ]]; then
+	STUDIO_V=$(get_version_component_range 1-4)
+	BUILD_V=$(get_version_component_range 5-6)
+else
+	STUDIO_V=$(get_version_component_range 1-3)
+	BUILD_V=$(get_version_component_range 4-5)
+fi
+
+DESCRIPTION="A new Android development environment based on IntelliJ IDEA"
+HOMEPAGE="http://developer.android.com/sdk/installing/studio.html"
+SRC_URI="https://dl.google.com/dl/android/studio/ide-zips/${STUDIO_V}/${PN}-ide-${BUILD_V}-linux.zip"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="selinux"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="app-arch/zip
+	dev-java/commons-logging:0
+	dev-java/log4j:0"
+
+#	dev-java/guava:18
+RDEPEND=">=virtual/jdk-1.7
+	selinux? ( sec-policy/selinux-android )
+	>=app-arch/bzip2-1.0.6-r4
+	dev-java/commons-logging:0
+	dev-java/log4j:0
+	>=dev-libs/expat-2.1.0-r3
+	>=dev-libs/libffi-3.0.13-r1
+	>=media-libs/fontconfig-2.10.92
+	>=media-libs/freetype-2.5.5
+	>=media-libs/libpng-1.2.51
+	>=media-libs/mesa-10.2.8
+	|| ( gnome-extra/zenity kde-apps/kdialog x11-apps/xmessage x11-libs/libnotify )
+	>=sys-libs/ncurses-5.9-r3:5/5[tinfo]
+	>=sys-libs/zlib-1.2.8-r1
+	>=x11-libs/libX11-1.6.2
+	>=x11-libs/libXau-1.0.7-r1
+	>=x11-libs/libXdamage-1.1.4-r1
+	>=x11-libs/libXdmcp-1.1.1-r1
+	>=x11-libs/libXext-1.3.2
+	>=x11-libs/libXfixes-5.0.1
+	>=x11-libs/libXrender-0.9.8
+	>=x11-libs/libXxf86vm-1.1.3
+	>=x11-libs/libdrm-2.4.46
+	>=x11-libs/libxcb-1.9.1
+	>=x11-libs/libxshmfence-1.1"
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+	eapply_user
+	# This is really a bundled jdk not a jre
+	rm -R "${S}/jre" || die "Could not remove bundled jdk"
+
+	# Replace bundled jars with system
+	# has problems with newer jdom:0 not updated to jdom:2
+	cd "${S}/lib" || die
+	local JARS="commons-logging log4j"
+	local j
+	for j in ${JARS}; do
+		rm -v ${j/:*/}*.jar || die
+		java-pkg_jar-from ${j}
+	done
+
+	cd "${S}" || die
+
+	# bug 629404
+	echo "-Djdk.util.zip.ensureTrailingSlash=false" >> bin/studio64.vmoptions || die
+	echo "-Djdk.util.zip.ensureTrailingSlash=false" >> bin/studio.vmoptions || die
+}
+
+src_compile() {
+	:
+}
+
+src_install() {
+	local dir="/opt/${PN}"
+
+	insinto "${dir}"
+	# Replaced bundled jre with system vm/jdk
+	# This is really a bundled jdk not a jre
+	doins -r *
+
+	rm -rf "${D}${dir}/jre" || die
+	dosym "/etc/java-config-2/current-system-vm" "${dir}/jre"
+
+	fperms 755 "${dir}/bin/studio.sh" "${dir}"/bin/fsnotifier{,64}
+	chmod 755 "${D}${dir}"/gradle/gradle-*/bin/gradle || die
+
+	newicon "bin/studio.png" "${PN}.png"
+	make_wrapper ${PN} ${dir}/bin/studio.sh
+	make_desktop_entry ${PN} "Android Studio" ${PN} "Development;IDE" "StartupWMClass=jetbrains-studio"
+}
diff --git a/dev-util/aruba/Manifest b/dev-util/aruba/Manifest
index b3ab21e742c1..3e372b71c487 100644
--- a/dev-util/aruba/Manifest
+++ b/dev-util/aruba/Manifest
@@ -1,4 +1,4 @@
-DIST aruba-0.5.4.gem 69632 SHA256 6f1c2210195ac94cf48e06de574e6f3897ec5ff7a7ca71cd10425b2cc889b0dc SHA512 e783aedccd4be6915621cc1f0d8b61f8a2895204ff9e483fdbd4b34b6f32eaccc973938a5e507c5346f50f9f9166fc7b7a885700aa13c6c7b00ffdf0eed78720 WHIRLPOOL 843e7cd5a0a70d15030bad868bbd1de94b25d96961865338c2596777ec87935bc0d3e4835259cb7b3e4843f4b0b5162cc11c44677ed966a927cae60eeb90c33b
-DIST aruba-0.6.2.gem 75776 SHA256 7c518ca72da37dc966c6a2f589d9953ab7576a43332b7bac38949d06f5009842 SHA512 ad859aa34f6e6778d9eb92b7e8f298180250e0690b21285e48b85dda88c09c74437ed0dff4e07ea8a02e8c784841ef89504219aa844457273349b8072ebc761e WHIRLPOOL cf85f65672946776f4de3f6b0b060c99adfa376353c3f11a0e27d2a32f7e400c58d863c0e574b415a19c52386294dfff01a7591c133772f45211700ea19f83ac
-DIST aruba-0.7.4.gem 91648 SHA256 64726a908f9355c1fdc15f26e4f657bc0c43aa034f86f3ce141c51f501e516b3 SHA512 f36f50b629a039c894b5a5e7e21dd37db2dacd0947c7288e254666110baa81975e1f2c0372fc20b915cdc6906715bbc10e0b078d3321c9d7c875da4b097de118 WHIRLPOOL 2512507ee530d767b3ee6bfd7fd0de289c9289da69fd1c940f16817b8458b7a8c532e235c9605ec0a00ee0aab591181bfa37ee3ba93900b3fe6cab16a4a3f135
-DIST aruba-0.8.1.gem 121344 SHA256 110440880e0f572f44805765bc22ea20e5f822fede3628be9de3f55c7d0af3f3 SHA512 9d65778828ac1915c56862acb1db0faf6214b102eb892317b390f451aab55750067519fb6cf6e08c55f58b865eaaa78921402d745addf2d3b0038527eb5d898f WHIRLPOOL 70b2ad1033b374e3ef61a7fe0b795d2bdf961b7d3d0a24e2a052fdd70755eaba37b3dfa1ff8e42a49fac1c715aca2859facb9c97d42d1a01fa425138c5255a58
+DIST aruba-0.5.4.gem 69632 BLAKE2B 77e0c739681d4ff08430a63db9614568346328c1c0594ff0d07d9fc74539d08f56df57a826bd87ee2b78989dad24b9bee7e6bfad7c10277b07b67ce39c663dac SHA512 e783aedccd4be6915621cc1f0d8b61f8a2895204ff9e483fdbd4b34b6f32eaccc973938a5e507c5346f50f9f9166fc7b7a885700aa13c6c7b00ffdf0eed78720
+DIST aruba-0.6.2.gem 75776 BLAKE2B 569af009cc20b644878fda25b5e7f79bd2f7c6f5fa9ef2503a5e730b8eb5938872563dace27031d31847bacfbb7e4764079da74fa2a917cc3d98a596cf2248c7 SHA512 ad859aa34f6e6778d9eb92b7e8f298180250e0690b21285e48b85dda88c09c74437ed0dff4e07ea8a02e8c784841ef89504219aa844457273349b8072ebc761e
+DIST aruba-0.7.4.gem 91648 BLAKE2B 6a71fc740bcaee845271f82f7ab36a9205df796aebcd1502466e65690f978a090df7e13ebec5d172d4562adf5c5fbbb7b68606511f704abb8371989eb0fc4b96 SHA512 f36f50b629a039c894b5a5e7e21dd37db2dacd0947c7288e254666110baa81975e1f2c0372fc20b915cdc6906715bbc10e0b078d3321c9d7c875da4b097de118
+DIST aruba-0.8.1.gem 121344 BLAKE2B 0b601a4d4bcd19159bb23b22b7975d1275ed2ab9c06e9ab550e11a151e953eba9ec4cc05280e69685a54b82996b4863b485a74f91d64270cc058f43272f6df6d SHA512 9d65778828ac1915c56862acb1db0faf6214b102eb892317b390f451aab55750067519fb6cf6e08c55f58b865eaaa78921402d745addf2d3b0038527eb5d898f
diff --git a/dev-util/aruba/aruba-0.5.4-r1.ebuild b/dev-util/aruba/aruba-0.5.4-r1.ebuild
index ddea35379014..6979e5175e4f 100644
--- a/dev-util/aruba/aruba-0.5.4-r1.ebuild
+++ b/dev-util/aruba/aruba-0.5.4-r1.ebuild
@@ -16,7 +16,7 @@ DESCRIPTION="Cucumber steps for driving out command line applications"
 HOMEPAGE="https://github.com/cucumber/aruba"
 LICENSE="MIT"
 
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 ~sparc x86"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-util/bazel/metadata.xml b/dev-util/bazel/metadata.xml
index 518e125be253..33d6c739e338 100644
--- a/dev-util/bazel/metadata.xml
+++ b/dev-util/bazel/metadata.xml
@@ -11,13 +11,13 @@
 		<remote-id type="github">bazelbuild/bazel</remote-id>
 	</upstream>
 	<longdescription>
-	  Bazel is Google's own build tool. Bazel has built-in support for
-	  building both client and server software, including client
-	  applications for both Android and iOS platforms. It also provides
-	  an extensible framework that you can use to develop your own build
-	  rules.
+		Bazel is Google's own build tool. Bazel has built-in support for
+		building both client and server software, including client
+		applications for both Android and iOS platforms. It also provides
+		an extensible framework that you can use to develop your own build
+		rules.
 	</longdescription>
 	<use>
-	  <flag name="tools">Install extra bazel tools to build from sources</flag>
+		<flag name="tools">Install extra bazel tools to build from sources</flag>
 	</use>
 </pkgmetadata>
diff --git a/dev-util/ccache/metadata.xml b/dev-util/ccache/metadata.xml
index 0d4a976163ca..f9b0907997d8 100644
--- a/dev-util/ccache/metadata.xml
+++ b/dev-util/ccache/metadata.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>robbat2@gentoo.org</email>
-  </maintainer>
-  <maintainer type="project">
-    <email>toolchain@gentoo.org</email>
-    <name>Gentoo Toolchain Project</name>
-  </maintainer>
-  <longdescription lang="en">
+	<maintainer type="person">
+		<email>robbat2@gentoo.org</email>
+	</maintainer>
+	<maintainer type="project">
+		<email>toolchain@gentoo.org</email>
+		<name>Gentoo Toolchain Project</name>
+	</maintainer>
+	<longdescription lang="en">
 		ccache acts as a caching pre-processor to C/C++ compilers, improving
 		compilation time when recompiling previously compiled source.
 	</longdescription>
diff --git a/dev-util/cucumber/Manifest b/dev-util/cucumber/Manifest
index 970ee76d04d2..d2c5f5e4032c 100644
--- a/dev-util/cucumber/Manifest
+++ b/dev-util/cucumber/Manifest
@@ -1,3 +1,3 @@
-DIST cucumber-1.3.20.gem 279040 SHA256 8720b60453866f3970d2743ccf62a503bc656a56c7077cb30a892011c248f080 SHA512 050573d2d7ea111dd9c8ec402321960203f7fd8d591be4f15b09fbd5bed89f3cb82104b8306f88f53bd92468ba689800707845f55785e6d20ed9f66f4b949050 WHIRLPOOL 72488e56a8e8c34cf35fcf8f3dae3b4d80baaa2b57d4e10207bfcdf93e2d7bc45cd13517c97aaf615049f0ee1e6f583db45473f6270f2db18455aa265eeb8ef1
-DIST cucumber-2.4.0.gem 250880 SHA256 307e87c24e250d015c1d9990a7d79f7bdd9b239aa25681fd861fe491541892cc SHA512 b7f9720e3f9e1f30aba9590ff92209073bdc028b880ac7a378f6dfe2a7f093c0521387cfc9319d7ed994c5e9de7106ccff23ba1f10c1cc5888785c69262c723e WHIRLPOOL 3a4fed0ea04a68732cf9d6177132e897e8de9de1b0cba225866e0657d1b798c53bc2139aba5fb1ac26990752595d3d92a524a1e3fdb04b26ffdf2eeeaffff141
-DIST cucumber-3.0.1.gem 265216 SHA256 bcd927f02c900178531d30714bdc3a5f201d0232a99565efbc65ad0c66ee16c9 SHA512 eee664d13dca5ce062f46a5d544ff43fc99bdc2ccd7c6d77d82380d8eb3c97a88305ba5a6052bfc8cee7fc59aa9d019116ef966d394b8b3d37d10fca122a2e7b WHIRLPOOL 0db85b2115e5c89667223f928fb4d433c5942c03327440e9e3fdb35ae5eb3a0ed40f3c91284b84131972f358f057d86f08b708427a4d8fca71beb1e4a7cd5344
+DIST cucumber-1.3.20.gem 279040 BLAKE2B 7615ab4041326b39193cdfc54c5016e5b9e87facb652d0cc17be3c7cfac5e38ee3558d06cbfe4167fb27f32a07eba92e9836100b236ed604c897c8af89349230 SHA512 050573d2d7ea111dd9c8ec402321960203f7fd8d591be4f15b09fbd5bed89f3cb82104b8306f88f53bd92468ba689800707845f55785e6d20ed9f66f4b949050
+DIST cucumber-2.4.0.gem 250880 BLAKE2B 2d0479695800639340332ab26b745a84cdbe7dfc575e652f6a94eca77b0c3397a48a2f3220a2a4eb164e9f0f747bf4866678b7927cd0ce47e5ce78ee057d273d SHA512 b7f9720e3f9e1f30aba9590ff92209073bdc028b880ac7a378f6dfe2a7f093c0521387cfc9319d7ed994c5e9de7106ccff23ba1f10c1cc5888785c69262c723e
+DIST cucumber-3.0.1.gem 265216 BLAKE2B 5bf7e2e28f268dde043a5b24ec18cac7ff1e00443d0aa80acb9ade5419c94c3854bfb58c24a88d7db7d9a00aa6576c5a2ff46c1092cd89629d73c6ed6f3c83ba SHA512 eee664d13dca5ce062f46a5d544ff43fc99bdc2ccd7c6d77d82380d8eb3c97a88305ba5a6052bfc8cee7fc59aa9d019116ef966d394b8b3d37d10fca122a2e7b
diff --git a/dev-util/cucumber/cucumber-1.3.20-r1.ebuild b/dev-util/cucumber/cucumber-1.3.20-r1.ebuild
index 76491b1cd5c4..d0ea2947ec3d 100644
--- a/dev-util/cucumber/cucumber-1.3.20-r1.ebuild
+++ b/dev-util/cucumber/cucumber-1.3.20-r1.ebuild
@@ -17,7 +17,7 @@ DESCRIPTION="Executable feature scenarios"
 HOMEPAGE="https://github.com/aslakhellesoy/cucumber/wikis"
 LICENSE="Ruby"
 
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 ~sparc x86"
 SLOT="0"
 IUSE="examples test"
 
diff --git a/dev-util/geany/metadata.xml b/dev-util/geany/metadata.xml
index 2231e497c97c..36e14323b610 100644
--- a/dev-util/geany/metadata.xml
+++ b/dev-util/geany/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>polynomial-c@gentoo.org</email>
-    <name>Lars Wendler</name>
-  </maintainer>
-  <longdescription lang="en">
+	<maintainer type="person">
+		<email>polynomial-c@gentoo.org</email>
+		<name>Lars Wendler</name>
+	</maintainer>
+	<longdescription lang="en">
 		Geany is a small and lightweight integrated development environment.
 		It was developed to provide a small and fast IDE, which has only a
 		few dependencies from other packages. Another goal was to be as
@@ -18,7 +18,7 @@
 		auto completion of XML and HTML tags; call tips; many supported
 		filetypes like C, Java, PHP, HTML, Python, Perl, Pascal; symbol lists.
 	</longdescription>
-  <longdescription lang="fr">
+	<longdescription lang="fr">
 		Geany est un environnement de développement integré (EDI) petit et
 		léger. Il a été développé pour fournir un EDI petit et rapide, qui ne
 		possède que peu de dépendences avec d'autres paquets. Un autre but
@@ -34,8 +34,8 @@
 		supportés, comme C, Java, PHP, HTML, Python, Perl, Pascal; liste des
 		symboles.
 	</longdescription>
-  <use>
-    <flag name="gtk3">Use GTK+3 instead of GTK+2</flag>
-    <flag name="vte">Enable Terminal support (<pkg>x11-libs/vte</pkg>)</flag>
-  </use>
+	<use>
+		<flag name="gtk3">Use GTK+3 instead of GTK+2</flag>
+		<flag name="vte">Enable Terminal support (<pkg>x11-libs/vte</pkg>)</flag>
+	</use>
 </pkgmetadata>
diff --git a/dev-util/idutils/metadata.xml b/dev-util/idutils/metadata.xml
index 9c67f75d7191..be1a52884a34 100644
--- a/dev-util/idutils/metadata.xml
+++ b/dev-util/idutils/metadata.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-  <email>robbat2@gentoo.org</email>
-</maintainer>
-<longdescription>
-	Fast, high-capacity, identifier database tool.
-	Actually, the term `identifier' is too limiting--`mkid' stores tokens, be
-	they program identifiers of any form, literal numbers, or words of
-	human-readable text. Database queries can be issued from the command-line,
-	or from within emacs, serving as an augmented tags facility.
-</longdescription>
+	<maintainer type="person">
+		<email>robbat2@gentoo.org</email>
+	</maintainer>
+	<longdescription>
+		Fast, high-capacity, identifier database tool.
+		Actually, the term `identifier' is too limiting--`mkid' stores tokens, be
+		they program identifiers of any form, literal numbers, or words of
+		human-readable text. Database queries can be issued from the command-line,
+		or from within emacs, serving as an augmented tags facility.
+	</longdescription>
 </pkgmetadata>
diff --git a/dev-util/nemiver/metadata.xml b/dev-util/nemiver/metadata.xml
index c61ba4c696b8..8ad7abb625a6 100644
--- a/dev-util/nemiver/metadata.xml
+++ b/dev-util/nemiver/metadata.xml
@@ -1,16 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-  <email>gnome@gentoo.org</email>
-  <name>Gentoo GNOME Desktop</name>
-  </maintainer>
-  <longdescription>
-    Nemiver is an on going effort to write an easy to use standalone C/C++
-	debugger that integrates well in the GNOME environment.
-  </longdescription>
-  <use>
-	<flag name="memoryview">Enable the optional hexadecimal memory inspection
-	with <pkg>app-editors/ghex</pkg>.</flag>
-  </use>
+	<maintainer type="project">
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
+	<longdescription>
+		Nemiver is an on going effort to write an easy to use standalone C/C++
+		debugger that integrates well in the GNOME environment.
+	</longdescription>
+	<use>
+		<flag name="memoryview">Enable the optional hexadecimal memory inspection with <pkg>app-editors/ghex</pkg></flag>
+	</use>
 </pkgmetadata>
diff --git a/dev-util/nvidia-cuda-sdk/metadata.xml b/dev-util/nvidia-cuda-sdk/metadata.xml
index 9ab4f583a9c4..f8631dbfe7a7 100644
--- a/dev-util/nvidia-cuda-sdk/metadata.xml
+++ b/dev-util/nvidia-cuda-sdk/metadata.xml
@@ -1,16 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>sci@gentoo.org</email>
-    <name>Gentoo Science Project</name>
-  </maintainer>
-  <use>
-    <flag name="opencl">
-			Build OpenCL binaries.
-		</flag>
-    <flag name="cuda">
-			Build CUDA binaries.
-		</flag>
-  </use>
+	<maintainer type="project">
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
+	<use>
+		<flag name="opencl">Build OpenCL binaries</flag>
+		<flag name="cuda">Build CUDA binaries</flag>
+	</use>
 </pkgmetadata>
diff --git a/dev-util/nvidia-cuda-toolkit/metadata.xml b/dev-util/nvidia-cuda-toolkit/metadata.xml
index ad6a3973276d..4b8ba09a6653 100644
--- a/dev-util/nvidia-cuda-toolkit/metadata.xml
+++ b/dev-util/nvidia-cuda-toolkit/metadata.xml
@@ -1,17 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>sci@gentoo.org</email>
-    <name>Gentoo Science Project</name>
-  </maintainer>
-  <use>
-    <flag name="profiler">
-			Installs the NVIDIA CUDA visual profiler.
-		</flag>
-    <flag name="debugger">
-			Installs the CUDA debugger.
-		</flag>
-    <flag name="eclipse">Install plugins for eclipse</flag>
-  </use>
+	<maintainer type="project">
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
+	<use>
+		<flag name="profiler">Installs the NVIDIA CUDA visual profiler</flag>
+		<flag name="debugger">Installs the CUDA debugger</flag>
+		<flag name="eclipse">Install plugins for eclipse</flag>
+	</use>
 </pkgmetadata>
diff --git a/dev-util/patdiff/metadata.xml b/dev-util/patdiff/metadata.xml
index 80d170f9a1b2..b31ec668fef0 100644
--- a/dev-util/patdiff/metadata.xml
+++ b/dev-util/patdiff/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>ml@gentoo.org</email>
-	<name>Gentoo ML Project</name>
-</maintainer>
-  <upstream>
-	  <remote-id type="github">janestreet/patdiff</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>ml@gentoo.org</email>
+		<name>Gentoo ML Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">janestreet/patdiff</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-util/perf/metadata.xml b/dev-util/perf/metadata.xml
index 1b50bf7e527b..abff870927b6 100644
--- a/dev-util/perf/metadata.xml
+++ b/dev-util/perf/metadata.xml
@@ -1,33 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>naota@gentoo.org</email>
-  </maintainer>
-  <maintainer type="person">
-    <email>dlan@gentoo.org</email>
-    <name>Yixun Lan</name>
-  </maintainer>
-  <use>
-    <flag name="demangle">
-      Enable C++ symbol name demangling, using libbfd from
-      <pkg>sys-devel/binutils</pkg>. When this flag is enabled, the
-      package will have to be rebuilt after every version bump of
-      binutils.
-    </flag>
-    <flag name="doc">
-      Build documentation and man pages. With this USE flag disabled,
-      the --help parameter for perf and its sub-tools will not be
-      available. This is optional because it depends on a few
-      documentation handling tools that are not always welcome on user
-      systems.
-    </flag>
-	<flag name="numa">Enable NUMA support</flag>
-    <flag name="perl">
-      Add support for Perl as a scripting language for perf tools.
-    </flag>
-    <flag name="unwind">
-      Use sys-libs/libunwind for frame unwinding support.
-    </flag>
-  </use>
+	<maintainer type="person">
+		<email>naota@gentoo.org</email>
+	</maintainer>
+	<maintainer type="person">
+		<email>dlan@gentoo.org</email>
+		<name>Yixun Lan</name>
+	</maintainer>
+	<use>
+		<flag name="demangle">
+			Enable C++ symbol name demangling, using libbfd from
+			<pkg>sys-devel/binutils</pkg>. When this flag is enabled, the
+			package will have to be rebuilt after every version bump of
+			binutils.
+		</flag>
+		<flag name="doc">
+			Build documentation and man pages. With this USE flag disabled,
+			the --help parameter for perf and its sub-tools will not be
+			available. This is optional because it depends on a few
+			documentation handling tools that are not always welcome on user
+			systems.
+		</flag>
+		<flag name="numa">Enable NUMA support</flag>
+		<flag name="perl">
+			Add support for Perl as a scripting language for perf tools.
+		</flag>
+		<flag name="unwind">
+			Use sys-libs/libunwind for frame unwinding support.
+		</flag>
+	</use>
 </pkgmetadata>
diff --git a/dev-util/premake/metadata.xml b/dev-util/premake/metadata.xml
index 798594dcbe68..e57cb3c992f6 100644
--- a/dev-util/premake/metadata.xml
+++ b/dev-util/premake/metadata.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>titanofold@gentoo.org</email>
-    <name>Aaron W. Swenson</name>
-  </maintainer>
-  <longdescription lang="en">
-	Describe your software project just once, using Premake's simple and
-	easy to read syntax, and build it everywhere. Generate project files
-	for Visual Studio, GNU Make, Xcode, Code::Blocks, and more across
-	Windows, Mac OS X, and Linux. Use the full featured Lua scripting
-	engine to make build configuration tasks a breeze.
-  </longdescription>
-  <upstream>
-    <remote-id type="sourceforge">premake</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>titanofold@gentoo.org</email>
+		<name>Aaron W. Swenson</name>
+	</maintainer>
+	<longdescription lang="en">
+		Describe your software project just once, using Premake's simple and
+		easy to read syntax, and build it everywhere. Generate project files
+		for Visual Studio, GNU Make, Xcode, Code::Blocks, and more across
+		Windows, Mac OS X, and Linux. Use the full featured Lua scripting
+		engine to make build configuration tasks a breeze.
+	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">premake</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-util/quilt/metadata.xml b/dev-util/quilt/metadata.xml
index 8b375ab7cfb6..85ac25a40330 100644
--- a/dev-util/quilt/metadata.xml
+++ b/dev-util/quilt/metadata.xml
@@ -2,10 +2,10 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		  <email>mpagano@gentoo.org</email>
+		<email>mpagano@gentoo.org</email>
 	</maintainer>
-<maintainer type="project">
-		  <email>suse@gentoo.org</email>
-		  <name>SUSE</name>
+	<maintainer type="project">
+		<email>suse@gentoo.org</email>
+		<name>SUSE</name>
 	</maintainer>
 </pkgmetadata>
diff --git a/dev-util/scala-ide/metadata.xml b/dev-util/scala-ide/metadata.xml
index 5352e92a2dc2..4422c51f84a2 100644
--- a/dev-util/scala-ide/metadata.xml
+++ b/dev-util/scala-ide/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-	  <email>monsieurp@gentoo.org</email>
-  </maintainer>
-<maintainer type="project">
-	  <email>java@gentoo.org</email>
-	  <name>Java</name>
-  </maintainer>
+	<maintainer type="person">
+		<email>monsieurp@gentoo.org</email>
+	</maintainer>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-util/shunit2/metadata.xml b/dev-util/shunit2/metadata.xml
index 52490b64142a..45da850feec0 100644
--- a/dev-util/shunit2/metadata.xml
+++ b/dev-util/shunit2/metadata.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<longdescription>shUnit2 is a xUnit unit test framework for Bourne based shell scripts, and
-  	it is designed to work in a similar manner to JUnit, PyUnit, etc. If you
-  	have ever had the desire to write a unit test for a shell script, shUnit2
-  	can do the job.</longdescription>
+	<longdescription>
+		shUnit2 is a xUnit unit test framework for Bourne based shell scripts, and
+		it is designed to work in a similar manner to JUnit, PyUnit, etc. If you
+		have ever had the desire to write a unit test for a shell script, shUnit2
+		can do the job.
+	</longdescription>
 	<upstream>
 		<remote-id type="google-code">shunit2</remote-id>
 		<remote-id type="github">kward/shunit2</remote-id>
diff --git a/dev-util/usb-robot/metadata.xml b/dev-util/usb-robot/metadata.xml
index 94119439ccc2..177384d92a1e 100644
--- a/dev-util/usb-robot/metadata.xml
+++ b/dev-util/usb-robot/metadata.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>bircoph@gentoo.org</email>
-    <name>Andrew Savchenko</name>
-  </maintainer>
+	<maintainer type="person">
+		<email>bircoph@gentoo.org</email>
+		<name>Andrew Savchenko</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">usb-robot</remote-id>
 	</upstream>
diff --git a/dev-util/weka/metadata.xml b/dev-util/weka/metadata.xml
index 21b778d163c4..1a7ed67ed610 100644
--- a/dev-util/weka/metadata.xml
+++ b/dev-util/weka/metadata.xml
@@ -2,11 +2,11 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-	    <email>amynka@gentoo.org</email>
+		<email>amynka@gentoo.org</email>
 	</maintainer>
 	<maintainer type="project">
-	    <email>java@gentoo.org</email>
-	    <name>Java</name>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
 	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">weka</remote-id>
diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index fed2efbfbcfe..ab83f89e7e98 100644
Binary files a/dev-vcs/Manifest.gz and b/dev-vcs/Manifest.gz differ
diff --git a/dev-vcs/git-remote-hg/metadata.xml b/dev-vcs/git-remote-hg/metadata.xml
index 5e9d5d52ba7a..0fe237632666 100644
--- a/dev-vcs/git-remote-hg/metadata.xml
+++ b/dev-vcs/git-remote-hg/metadata.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>wizardedit@gentoo.org</email>
-    <name>Austin English</name>
-  </maintainer>
-  <longdescription>
-  'git-remote-hg' is the semi-official Mercurial bridge from Git project,
-  once installed, it allows you to clone, fetch and push to and from
-  Mercurial repositories as if they were Git ones.
-  </longdescription>
-  <upstream>
-	<remote-id type="github">felipec/git-remote-hg</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>wizardedit@gentoo.org</email>
+		<name>Austin English</name>
+	</maintainer>
+	<longdescription>
+		'git-remote-hg' is the semi-official Mercurial bridge from Git project,
+		once installed, it allows you to clone, fetch and push to and from
+		Mercurial repositories as if they were Git ones.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">felipec/git-remote-hg</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-vcs/git-tools/metadata.xml b/dev-vcs/git-tools/metadata.xml
index ac0f43b4f27f..c4d5177abb15 100644
--- a/dev-vcs/git-tools/metadata.xml
+++ b/dev-vcs/git-tools/metadata.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>robbat2@gentoo.org</email>
-  </maintainer>
-  <upstream>
-	  <remote-id type="github">MestreLion/git-tools</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>robbat2@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">MestreLion/git-tools</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-vcs/gitg/metadata.xml b/dev-vcs/gitg/metadata.xml
index 0c98618eff71..bebf2c542746 100644
--- a/dev-vcs/gitg/metadata.xml
+++ b/dev-vcs/gitg/metadata.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>ikelos@gentoo.org</email>
-    <name>Mike Auty</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>gnome@gentoo.org</email>
-    <name>Gentoo GNOME Desktop</name>
-  </maintainer>
-  <maintainer type="person">
-	<email>mgorny@gentoo.org</email>
-	<name>Michał Górny</name>
-  </maintainer>
-  <longdescription lang="en">
+	<maintainer type="person">
+		<email>ikelos@gentoo.org</email>
+		<name>Mike Auty</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
+	<longdescription lang="en">
 		GTK+ based frontend for GIT
 	</longdescription>
-  <use>
-    <flag name="glade">Install a glade catalog file</flag>
-    <flag name="python">Install Python bindings for those plugins requiring it.</flag>
-  </use>
+	<use>
+		<flag name="glade">Install a glade catalog file</flag>
+		<flag name="python">Install Python bindings for those plugins requiring it.</flag>
+	</use>
 </pkgmetadata>
diff --git a/dev-vcs/hgsubversion/metadata.xml b/dev-vcs/hgsubversion/metadata.xml
index 276970ec47c5..9ed0465431f5 100644
--- a/dev-vcs/hgsubversion/metadata.xml
+++ b/dev-vcs/hgsubversion/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <!-- maintainer-needed -->
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="pypi">hgsubversion</remote-id>
 		<remote-id type="bitbucket">durin42/hgsubversion</remote-id>
diff --git a/dev-vcs/mercurial-server/metadata.xml b/dev-vcs/mercurial-server/metadata.xml
index 464002981e5f..16b6109563df 100644
--- a/dev-vcs/mercurial-server/metadata.xml
+++ b/dev-vcs/mercurial-server/metadata.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>rafaelmartins@gentoo.org</email>
-    <name>Rafael G. Martins</name>
-  </maintainer>
-  <longdescription lang="en">
-    mercurial-server gives your developers remote read/write access to
-	centralized Mercurial repositories using SSH public key authentication; it
-	provides convenient and fine-grained key management and access control.
-  </longdescription>
+	<maintainer type="person">
+		<email>rafaelmartins@gentoo.org</email>
+		<name>Rafael G. Martins</name>
+	</maintainer>
+	<longdescription lang="en">
+		mercurial-server gives your developers remote read/write access to
+		centralized Mercurial repositories using SSH public key authentication; it
+		provides convenient and fine-grained key management and access control.
+	</longdescription>
 </pkgmetadata>
diff --git a/dev-vcs/mr/metadata.xml b/dev-vcs/mr/metadata.xml
index 816a43e4d8f0..8214b7ad9921 100644
--- a/dev-vcs/mr/metadata.xml
+++ b/dev-vcs/mr/metadata.xml
@@ -18,12 +18,9 @@
 
 		* Update a repository no more frequently than once every twelve hours.
 		* Run an arbitrary command before committing to a repository.
-		* When updating a git repository, pull from two different upstreams
-		  and merge the two together.
-		* Run several repository updates in parallel, greatly speeding up
-		  the update process.
-		* Remember actions that failed due to a laptop being offline,
-		  so they can be retried when it comes back online.
+		* When updating a git repository, pull from two different upstreams and merge the two together.
+		* Run several repository updates in parallel, greatly speeding up the update process.
+		* Remember actions that failed due to a laptop being offline, so they can be retried when it comes back online.
 
 		This package also includes the webcheckout command.
 	</longdescription>
diff --git a/dev-vcs/notify-webhook/metadata.xml b/dev-vcs/notify-webhook/metadata.xml
index 2ac5d4996908..92ad1c0ab0df 100644
--- a/dev-vcs/notify-webhook/metadata.xml
+++ b/dev-vcs/notify-webhook/metadata.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>robbat2@gentoo.org</email>
-  </maintainer>
-  <longdescription lang="en">
-	notify-webhook is a git post-receive hook script that posts JSON data to a
-	webhook capable server.
+	<maintainer type="person">
+		<email>robbat2@gentoo.org</email>
+	</maintainer>
+	<longdescription lang="en">
+		notify-webhook is a git post-receive hook script that posts JSON data to a
+		webhook capable server.
 
-	This implements the GitHub Web hooks API as closely as possible. It allows
-	arbitrary git repositories to use webhook capable services.
-  </longdescription>
-  <upstream>
-    <remote-id type="github">metajack/notify-webhook</remote-id>
-  </upstream>
+		This implements the GitHub Web hooks API as closely as possible. It allows
+		arbitrary git repositories to use webhook capable services.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">metajack/notify-webhook</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-vcs/rabbitvcs/metadata.xml b/dev-vcs/rabbitvcs/metadata.xml
index 27128113e29f..a2d833d6ca7d 100644
--- a/dev-vcs/rabbitvcs/metadata.xml
+++ b/dev-vcs/rabbitvcs/metadata.xml
@@ -5,9 +5,11 @@
 		<email>xmw@gentoo.org</email>
 		<name>Michael Weber</name>
 	</maintainer>
-	<longdescription>RabbitVCS is a set of graphical tools written to provide
- simple and straightforward access to the version control systems you use.
- RabbitVCS is inspired by TortoiseSVN and others.</longdescription>
+	<longdescription>
+		RabbitVCS is a set of graphical tools written to provide
+		simple and straightforward access to the version control systems you use.
+		RabbitVCS is inspired by TortoiseSVN and others.
+	</longdescription>
 	<use>
 		<flag name="caja">Enable extension for <pkg>mate-base/caja</pkg></flag>
 		<flag name="cli">Eanble console based frontend</flag>
diff --git a/dev-vcs/rcs/metadata.xml b/dev-vcs/rcs/metadata.xml
index 521535ab1877..2fb1872a15b3 100644
--- a/dev-vcs/rcs/metadata.xml
+++ b/dev-vcs/rcs/metadata.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-	<email>titanofold@gentoo.org</email>
-	<name>Aaron W. Swenson</name>
-  </maintainer>
-  <longdescription>
-	The Revision Control System (RCS) is a system for managing
-	multiple versions of files. RCS automates the storage, retrieval,
-	logging, identification and merging of file revisions. RCS is useful
-	for text files that are revised frequently (for example, programs,
-	documentation, graphics, papers and form letters).
-  </longdescription>
+	<maintainer type="person">
+		<email>titanofold@gentoo.org</email>
+		<name>Aaron W. Swenson</name>
+	</maintainer>
+	<longdescription>
+		The Revision Control System (RCS) is a system for managing
+		multiple versions of files. RCS automates the storage, retrieval,
+		logging, identification and merging of file revisions. RCS is useful
+		for text files that are revised frequently (for example, programs,
+		documentation, graphics, papers and form letters).
+	</longdescription>
 </pkgmetadata>
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz
index 03dc3f96d341..713df79b9f1f 100644
Binary files a/eclass/Manifest.gz and b/eclass/Manifest.gz differ
diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 11847bcf0139..7462ab2059b3 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -6,6 +6,7 @@
 # qt@gentoo.org
 # @AUTHOR:
 # Davide Pesavento <pesa@gentoo.org>
+# @SUPPORTED_EAPIS: 6
 # @BLURB: Eclass for Qt5 split ebuilds.
 # @DESCRIPTION:
 # This eclass contains various functions that are used when building Qt5.
@@ -21,9 +22,10 @@ case ${EAPI} in
 esac
 
 # @ECLASS-VARIABLE: QT5_MODULE
+# @PRE_INHERIT
 # @DESCRIPTION:
 # The upstream name of the module this package belongs to. Used for
-# SRC_URI and EGIT_REPO_URI. Must be defined before inheriting the eclass.
+# SRC_URI and EGIT_REPO_URI. Must be set before inheriting the eclass.
 : ${QT5_MODULE:=${PN}}
 
 # @ECLASS-VARIABLE: QT5_TARGET_SUBDIRS
@@ -50,19 +52,13 @@ esac
 inherit estack flag-o-matic ltprune toolchain-funcs versionator virtualx
 
 HOMEPAGE="https://www.qt.io/"
+LICENSE="|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3"
+SLOT=5/$(get_version_component_range 1-2)
 
 QT5_MINOR_VERSION=$(get_version_component_range 2)
 QT5_PATCH_VERSION=$(get_version_component_range 3)
 readonly QT5_MINOR_VERSION QT5_PATCH_VERSION
 
-if [[ ${QT5_MINOR_VERSION} -ge 7 ]]; then
-	LICENSE="|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3"
-else
-	LICENSE="|| ( LGPL-2.1 LGPL-3 ) FDL-1.3"
-fi
-
-SLOT=5/$(get_version_component_range 1-2)
-
 case ${PV} in
 	5.9999)
 		# git dev branch
@@ -98,6 +94,7 @@ EGIT_REPO_URI=(
 [[ ${QT5_BUILD_TYPE} == live ]] && inherit git-r3
 
 # @ECLASS-VARIABLE: QT5_BUILD_DIR
+# @OUTPUT_VARIABLE
 # @DESCRIPTION:
 # Build directory for out-of-source builds.
 case ${QT5_BUILD_TYPE} in
@@ -131,10 +128,7 @@ EXPORT_FUNCTIONS src_unpack src_prepare src_configure src_compile src_install sr
 # Unpacks the sources.
 qt5-build_src_unpack() {
 	if tc-is-gcc; then
-		local min_gcc4_minor_version=5
-		if [[ ${QT5_MINOR_VERSION} -ge 7 || ${PN} == qtwebengine ]]; then
-			min_gcc4_minor_version=7
-		fi
+		local min_gcc4_minor_version=7
 		if [[ $(gcc-major-version) -lt 4 ]] || \
 		   [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt ${min_gcc4_minor_version} ]]; then
 			eerror "GCC version 4.${min_gcc4_minor_version} or later is required to build this package"
@@ -268,21 +262,9 @@ qt5-build_src_install() {
 	if [[ ${PN} == qtcore ]]; then
 		pushd "${QT5_BUILD_DIR}" >/dev/null || die
 
-		local qmake_install_target=install_qmake
-		if [[ ${QT5_MINOR_VERSION} -ge 7 ]]; then
-			# qmake/qmake-aux.pro
-			qmake_install_target=sub-qmake-qmake-aux-pro-install_subtargets
-		fi
-
-		local global_docs_install_target=
-		if [[ ${QT5_MINOR_VERSION} -le 6 && ${QT5_PATCH_VERSION} -le 2 ]]; then
-			global_docs_install_target=install_global_docs
-		fi
-
 		set -- emake INSTALL_ROOT="${D}" \
-			${qmake_install_target} \
-			install_{syncqt,mkspecs} \
-			${global_docs_install_target}
+			sub-qmake-qmake-aux-pro-install_subtargets \
+			install_{syncqt,mkspecs}
 
 		einfo "Running $*"
 		"$@"
@@ -585,7 +567,7 @@ qt5_base_configure() {
 		# prefer system libraries (only common hard deps here)
 		-system-zlib
 		-system-pcre
-		$([[ ${QT5_MINOR_VERSION} -ge 7 ]] && echo -system-doubleconversion)
+		-system-doubleconversion
 
 		# disable everything to prevent automagic deps (part 1)
 		-no-mtdev
@@ -603,7 +585,7 @@ qt5_base_configure() {
 		-glib
 
 		# disable everything to prevent automagic deps (part 2)
-		$([[ ${QT5_MINOR_VERSION} -ge 7 ]] && echo -no-gtk || echo -no-gtkstyle)
+		-no-gtk
 		$([[ ${QT5_MINOR_VERSION} -lt 8 ]] && echo -no-pulseaudio -no-alsa)
 
 		# exclude examples and tests from default build
diff --git a/games-action/Manifest.gz b/games-action/Manifest.gz
index 66dcd8ddea19..57582b2573bb 100644
Binary files a/games-action/Manifest.gz and b/games-action/Manifest.gz differ
diff --git a/games-action/d1x-rebirth/metadata.xml b/games-action/d1x-rebirth/metadata.xml
index 06533f138bb9..23d592266dfb 100644
--- a/games-action/d1x-rebirth/metadata.xml
+++ b/games-action/d1x-rebirth/metadata.xml
@@ -1,24 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>games@gentoo.org</email>
-    <name>Gentoo Games Project</name>
-  </maintainer>
-  <longdescription>
-Descent 1 is a classic first-person shooter released in 1995 by Interplay 
-and Parallax.  It was one of the first games with true 3-dimensional 
-graphics, movement, and light sourcing.  D1X-Rebirth is a modification of the 
-Descent 1 source that was released by Parallax and is based on the D1X source.
-</longdescription>
-  <use>
-    <flag name="demo">Use the demo data instead of the full game</flag>
-	<flag name="music">Support for ingame music</flag>
-    <flag name="l10n_de">Provides German translations for the game's
-      briefings, robot descriptions, and outro of the original campaign</flag>
-    <flag name="opl3-musicpack">Include alternate version of the game's music, recorded
-      with the Yamaha YMF262 OPL3 soundchip</flag>
-    <flag name="sc55-musicpack">Include alternate version of the game's music, recorded
-      with the Roland Sound Canvas SC-55 MIDI module</flag>
-  </use>
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+	<longdescription>
+		Descent 1 is a classic first-person shooter released in 1995 by Interplay
+		and Parallax.  It was one of the first games with true 3-dimensional
+		graphics, movement, and light sourcing.  D1X-Rebirth is a modification of the
+		Descent 1 source that was released by Parallax and is based on the D1X source.
+	</longdescription>
+	<use>
+		<flag name="demo">Use the demo data instead of the full game</flag>
+		<flag name="music">Support for ingame music</flag>
+		<flag name="l10n_de">Provides German translations for the game's briefings, robot descriptions, and outro of the original campaign</flag>
+		<flag name="opl3-musicpack">Include alternate version of the game's music, recorded with the Yamaha YMF262 OPL3 soundchip</flag>
+		<flag name="sc55-musicpack">Include alternate version of the game's music, recorded with the Roland Sound Canvas SC-55 MIDI module</flag>
+	</use>
 </pkgmetadata>
diff --git a/games-arcade/Manifest.gz b/games-arcade/Manifest.gz
index 0a9c462635dc..883803ee2183 100644
Binary files a/games-arcade/Manifest.gz and b/games-arcade/Manifest.gz differ
diff --git a/games-arcade/tuxanci/metadata.xml b/games-arcade/tuxanci/metadata.xml
index 9cb517a40b00..6c319f2cbfce 100644
--- a/games-arcade/tuxanci/metadata.xml
+++ b/games-arcade/tuxanci/metadata.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	  <email>games@gentoo.org</email>
-	  <name>Gentoo Games Project</name>
-</maintainer>
-<use>
-	<flag name="sound">Enable sound</flag>
-	<flag name="physfs">Use <pkg>dev-games/physfs</pkg> instead of
-		<pkg>dev-libs/libzip</pkg> to load compressed data</flag>
-</use>
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+	<use>
+		<flag name="sound">Enable sound</flag>
+		<flag name="physfs">Use <pkg>dev-games/physfs</pkg> instead of <pkg>dev-libs/libzip</pkg> to load compressed data</flag>
+	</use>
 </pkgmetadata>
diff --git a/games-fps/Manifest.gz b/games-fps/Manifest.gz
index 17d1a55ea552..90038f28bbc1 100644
Binary files a/games-fps/Manifest.gz and b/games-fps/Manifest.gz differ
diff --git a/games-fps/alienarena/metadata.xml b/games-fps/alienarena/metadata.xml
index a46f69349d3c..6767cd3e05d6 100644
--- a/games-fps/alienarena/metadata.xml
+++ b/games-fps/alienarena/metadata.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-    <email>games@gentoo.org</email>
-    <name>Gentoo Games Project</name>
-  </maintainer>
-  <use>
-    <flag name="vidmode">Link against <pkg>x11-libs/libXxf86vm</pkg>.
-	Required for full-screen support.</flag>
-  </use>
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+	<use>
+		<flag name="vidmode">Link against <pkg>x11-libs/libXxf86vm</pkg>. Required for full-screen support.</flag>
+	</use>
 </pkgmetadata>
diff --git a/games-fps/turtlearena/metadata.xml b/games-fps/turtlearena/metadata.xml
index 3b18515f6b24..76847d643c80 100644
--- a/games-fps/turtlearena/metadata.xml
+++ b/games-fps/turtlearena/metadata.xml
@@ -2,12 +2,12 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
-	    <email>games@gentoo.org</email>
-	    <name>Gentoo Games Project</name>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
 	</maintainer>
 	<use>
-	    <flag name="mumble">Adds player-location (positional audio) support to VoIP</flag>
+		<flag name="mumble">Adds player-location (positional audio) support to VoIP</flag>
 		<flag name="server">Build server target</flag>
-	    <flag name="voice">Adds VoIP support</flag>
+		<flag name="voice">Adds VoIP support</flag>
 	</use>
 </pkgmetadata>
diff --git a/games-rpg/Manifest.gz b/games-rpg/Manifest.gz
index 195a94134d7f..39dce47f9c7e 100644
Binary files a/games-rpg/Manifest.gz and b/games-rpg/Manifest.gz differ
diff --git a/games-rpg/eternal-lands-data/metadata.xml b/games-rpg/eternal-lands-data/metadata.xml
index b159e2e80c62..35a82f4ea804 100644
--- a/games-rpg/eternal-lands-data/metadata.xml
+++ b/games-rpg/eternal-lands-data/metadata.xml
@@ -1,19 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-  <email>rich0@gentoo.org</email>
-  <name>Rich Freeman</name>
-</maintainer>
-<maintainer type="project">
-  <email>games@gentoo.org</email>
-  <name>Gentoo Games Project</name>
-</maintainer>
-<longdescription>Eternal Lands is a FREE MMORPG (massively multiplayer online
-	role playing game)</longdescription>
-<use>
-  <flag name="bloodsuckermaps">Will install Bloodsucker's Maps in place of the official map files.</flag>
-  <flag name="music">Adds in-game music.</flag>
-  <flag name="sound">Adds in-game sound effects.</flag>
-</use>
+	<maintainer type="person">
+		<email>rich0@gentoo.org</email>
+		<name>Rich Freeman</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+	<longdescription>
+		Eternal Lands is a FREE MMORPG (massively multiplayer online role playing game)
+	</longdescription>
+	<use>
+		<flag name="bloodsuckermaps">Will install Bloodsucker's Maps in place of the official map files</flag>
+		<flag name="music">Enables in-game music</flag>
+		<flag name="sound">Enables in-game sound effects</flag>
+	</use>
 </pkgmetadata>
diff --git a/games-rpg/eternal-lands/metadata.xml b/games-rpg/eternal-lands/metadata.xml
index bae7929e7953..3a16e77fe8ea 100644
--- a/games-rpg/eternal-lands/metadata.xml
+++ b/games-rpg/eternal-lands/metadata.xml
@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-  <email>rich0@gentoo.org</email>
-  <name>Richard Freeman</name>
-</maintainer>
-<maintainer type="project">
-  <email>games@gentoo.org</email>
-  <name>Gentoo Games Project</name>
-</maintainer>
-<longdescription>Eternal Lands is a FREE MMORPG (massively multiplayer online
-	role playing game)</longdescription>
+	<maintainer type="person">
+		<email>rich0@gentoo.org</email>
+		<name>Richard Freeman</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+	<longdescription>
+		Eternal Lands is a FREE MMORPG (massively multiplayer online role playing game)
+	</longdescription>
 </pkgmetadata>
diff --git a/games-strategy/Manifest.gz b/games-strategy/Manifest.gz
index 3b936593ad35..1f59481ad211 100644
Binary files a/games-strategy/Manifest.gz and b/games-strategy/Manifest.gz differ
diff --git a/games-strategy/liquidwar6/metadata.xml b/games-strategy/liquidwar6/metadata.xml
index 4f04e7250855..5f504d57eb1c 100644
--- a/games-strategy/liquidwar6/metadata.xml
+++ b/games-strategy/liquidwar6/metadata.xml
@@ -10,26 +10,19 @@
 		<flag name="gles2">Enable OpenGL ES 2.0 support</flag>
 		<flag name="gtk">Used to display error/critical messages</flag>
 		<flag name="maps">Install extra maps</flag>
-		<flag name="ogg">Enable mod-ogg via <pkg>media-libs/sdl-mixer</pkg>
-			(currently the only sound provider)</flag>
-		<flag name="readline">Enable interactive script shell for
-			hacking</flag>
+		<flag name="ogg">Enable mod-ogg via <pkg>media-libs/sdl-mixer</pkg> (currently the only sound provider)</flag>
+		<flag name="readline">Enable interactive script shell for hacking</flag>
 	</use>
 	<longdescription lang="en">
-	FEATURES:
-    * Fast-paced tactical action. Control the movement of all your forces
-      at the same time
-    * Simple yet original game mechanics, discovered by Thomas Colcombet
-    * 10 different teams, each with their own charactaristics and special
-      attacks
-    * 13 levels, each one twisting the gameplay in a new direction
-    * 100+ more levels if you download the bonus pack
-    * Levels can be created using simple image files
-    * Lots of level design options: walls, edge wraparound, bridges,
-      different speed, special areas such as glue or danger and varied
-      army size and fighter behavior
-    * Internationalization support, interface translated in French,
-      Norwegian and Russian
-    * Free Software, part of the GNU project (licence: GNU GPL v3+)
+		FEATURES:
+		* Fast-paced tactical action. Control the movement of all your forces at the same time
+		* Simple yet original game mechanics, discovered by Thomas Colcombet
+		* 10 different teams, each with their own charactaristics and special attacks
+		* 13 levels, each one twisting the gameplay in a new direction
+		* 100+ more levels if you download the bonus pack
+		* Levels can be created using simple image files
+		* Lots of level design options: walls, edge wraparound, bridges, different speed, special areas such as glue or danger and varied army size and fighter behavior
+		* Internationalization support, interface translated in French, Norwegian and Russian
+		* Free Software, part of the GNU project (licence: GNU GPL v3+)
 	</longdescription>
 </pkgmetadata>
diff --git a/games-util/Manifest.gz b/games-util/Manifest.gz
index 6c303ed28cfb..d9dd860f28ab 100644
Binary files a/games-util/Manifest.gz and b/games-util/Manifest.gz differ
diff --git a/games-util/lgogdownloader/metadata.xml b/games-util/lgogdownloader/metadata.xml
index c85bfde8f4df..8a63172d961f 100644
--- a/games-util/lgogdownloader/metadata.xml
+++ b/games-util/lgogdownloader/metadata.xml
@@ -13,21 +13,21 @@
 		<remote-id type="github">Sude-/lgogdownloader</remote-id>
 	</upstream>
 	<longdescription>
-	  LGOGDownloader is open source downloader to GOG.com for Linux
-	  users using the same API as the official GOGDownloader.
+		LGOGDownloader is open source downloader to GOG.com for Linux
+		users using the same API as the official GOGDownloader.
 
-	  Features:
-	  * List available games
-	  * Resume downloads
-	  * Batch downloading
-	  * Repair downloaded files
-	  * Read/create XML files used by the official GOG Downloader
-	  * Download cover art
-	  * Check for orphaned files
-	  * Check status of files
-	  * Download individual files by id number
-	  * List/download updated files
-	  * Blacklist unwanted files
-	  * Perl regular expressions for filtering games
+		Features:
+		* List available games
+		* Resume downloads
+		* Batch downloading
+		* Repair downloaded files
+		* Read/create XML files used by the official GOG Downloader
+		* Download cover art
+		* Check for orphaned files
+		* Check status of files
+		* Download individual files by id number
+		* List/download updated files
+		* Blacklist unwanted files
+		* Perl regular expressions for filtering games
 	</longdescription>
 </pkgmetadata>
diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz
index 8b79b69bca19..a4f10da9db7f 100644
Binary files a/gnome-extra/Manifest.gz and b/gnome-extra/Manifest.gz differ
diff --git a/gnome-extra/chrome-gnome-shell/metadata.xml b/gnome-extra/chrome-gnome-shell/metadata.xml
index a24e5c1ae81a..3d84d898ca45 100644
--- a/gnome-extra/chrome-gnome-shell/metadata.xml
+++ b/gnome-extra/chrome-gnome-shell/metadata.xml
@@ -6,9 +6,9 @@
 		<name>Yuri Konotopov</name>
 	</maintainer>
 	<maintainer type="project">
-                <email>proxy-maint@gentoo.org</email>
-                <name>Proxy Maintainers</name>
-        </maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<bugs-to>https://github.com/nE0sIghT/chrome-gnome-shell-mirror/issues</bugs-to>
 		<remote-id type="github">GNOME/chrome-gnome-shell</remote-id>
diff --git a/gnome-extra/cinnamon-control-center/Manifest b/gnome-extra/cinnamon-control-center/Manifest
index a3085a8882a0..9a1d24c1be7c 100644
--- a/gnome-extra/cinnamon-control-center/Manifest
+++ b/gnome-extra/cinnamon-control-center/Manifest
@@ -2,3 +2,4 @@ DIST cinnamon-control-center-2.8.1.tar.gz 4090162 SHA256 595076ef89949c31357cd45
 DIST cinnamon-control-center-3.0.1.tar.gz 3834138 SHA256 3d9f0eb45168a91101f99452b38184dd6417dd89064be4523e565bd721a521fe SHA512 97f726cddb12afd697a542bf40b89c84e8256cc7e1bff31eaf3ed86ba9ffe23660085e4e4123f955f1aa4aa31930b209c2a26649f2dec55d10a4803d86942e46 WHIRLPOOL 68f0d2292d4fa43de31d9ed8cf4d15f1fc887e26ebc7c21cfec9c180ca01f6b7b11be0e88c5a4f2f84b35c2a6162565cb5b8eb647d563d8cd939e700dc76f4ff
 DIST cinnamon-control-center-3.2.0.tar.gz 3837279 SHA256 60696d6793e2e7de6746ee65b3dfd64948ad5eb8a46182abefb3c464e4a2ea2c SHA512 19a3481ba52784c733e5aae9603596a29fc12c78f21b8fe08492deda8c3eeac2bdbfc2da24f29dc5db6f6de02a26a43f67f3141dbfbd07c26f0e38a872c39216 WHIRLPOOL bcc9767b024a91a5cec947f95a1674e7abc25a8b29081a42fa4ec032ef1ee2b40f34bc369bfce1ed7418281b4da16012cc2f3a592987a4e6a7fcd457b7fa5d90
 DIST cinnamon-control-center-3.2.1.tar.gz 3838032 SHA256 12a29a3293cde58ae6fd6fdbab7eef4a2119ac8f515ca9218e75cccc3aacd15c SHA512 77f98aa47a10ef280ca7c3f8662e770d87a5427c91093382d3c289abcc0eac38317a31cd47a19a8ee67a4579375b84392f45d239b98fe494f7abfe10ef186554 WHIRLPOOL f6bb2c879877389673c72b5a8faa9974d5d67b4404776633f0954155d5fc1cdc483b8c900c13e680880d7ee6a02c4d876c0f4ad1facae2123ed5fb5a61a9ab62
+DIST cinnamon-control-center-3.6.5.tar.gz 3888881 BLAKE2B 9b867d6467ece64a3e2d5e8a87a83235f85738e4b5ee7ea9db31f63c5681b1eec24388ff29b54bc1e01c12e3a15d5eb445c72ffe8576c211f708945ed5dde2bf SHA512 09e482976fbefbd388151736fde4d4e198f3584b47f270ad7d0ce4299029012fa7c7825e221a094c8536ebd5824406bb943a8aad5cf51d60dc22dcf5c02b3b91
diff --git a/gnome-extra/cinnamon-control-center/cinnamon-control-center-3.6.5.ebuild b/gnome-extra/cinnamon-control-center/cinnamon-control-center-3.6.5.ebuild
new file mode 100644
index 000000000000..7204e5d76bcc
--- /dev/null
+++ b/gnome-extra/cinnamon-control-center/cinnamon-control-center-3.6.5.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes" # gmodule is used, which uses dlopen
+
+inherit autotools eutils gnome2
+
+DESCRIPTION="Cinnamons's main interface to configure various aspects of the desktop"
+HOMEPAGE="http://cinnamon.linuxmint.com/"
+SRC_URI="https://github.com/linuxmint/cinnamon-control-center/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="+colord +cups debug input_devices_wacom systemd"
+KEYWORDS="~amd64 ~x86"
+
+# False positives caused by nested configure scripts
+QA_CONFIGURE_OPTIONS=".*"
+
+# FIXME: modemmanager is not optional
+#        networkmanager is not optional
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.31:2
+	dev-libs/libxml2:2
+	>=gnome-base/libgnomekbd-2.91.91:0=
+	>=gnome-extra/cinnamon-desktop-1.0:0=
+	>=gnome-extra/cinnamon-menus-1.0:0=
+	>=gnome-extra/cinnamon-settings-daemon-1.0:0=
+	>=gnome-extra/nm-applet-0.9.8
+	media-libs/fontconfig
+	>=net-misc/modemmanager-0.7
+	>=net-misc/networkmanager-0.9.8:=[modemmanager]
+	>=sys-auth/polkit-0.103
+	>=x11-libs/gdk-pixbuf-2.23.0:2
+	>=x11-libs/gtk+-3.4.1:3
+	>=x11-libs/libnotify-0.7.3:0=
+	x11-libs/libX11
+	x11-libs/libxklavier
+	colord? ( >=x11-misc/colord-0.1.14:0= )
+	cups? ( >=net-print/cups-1.4[dbus] )
+	input_devices_wacom? (
+		>=dev-libs/libwacom-0.7
+		>=x11-libs/gtk+-3.8:3
+		>=x11-libs/libXi-1.2 )
+"
+# <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x
+# libgnomekbd needed only for gkbd-keyboard-display tool
+RDEPEND="${COMMON_DEPEND}
+	systemd? ( >=sys-apps/systemd-31 )
+	!systemd? ( app-admin/openrc-settingsd sys-auth/elogind )
+	x11-themes/adwaita-icon-theme
+	colord? ( >=gnome-extra/gnome-color-manager-3 )
+	cups? (
+		app-admin/system-config-printer
+		net-print/cups-pk-helper )
+	input_devices_wacom? ( gnome-extra/cinnamon-settings-daemon[input_devices_wacom] )
+"
+
+DEPEND="${COMMON_DEPEND}
+	app-text/iso-codes
+	x11-proto/xproto
+	x11-proto/xf86miscproto
+	x11-proto/kbproto
+
+	dev-libs/libxslt
+	>=dev-util/intltool-0.40.1
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+
+	gnome-base/gnome-common
+	sys-devel/autoconf-archive
+"
+src_prepare() {
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# --enable-systemd doesn't do anything in $PN-2.2.5
+	gnome2_src_configure \
+		--disable-static \
+		--enable-documentation \
+		--disable-onlineaccounts \
+		$(use_enable colord color) \
+		$(use_enable cups) \
+		$(usex debug --enable-debug=yes ' ') \
+		$(use_enable input_devices_wacom wacom) \
+		$(use_enable systemd)
+}
diff --git a/gnome-extra/cinnamon-control-center/metadata.xml b/gnome-extra/cinnamon-control-center/metadata.xml
index 2056a4559429..dbc06458f865 100644
--- a/gnome-extra/cinnamon-control-center/metadata.xml
+++ b/gnome-extra/cinnamon-control-center/metadata.xml
@@ -2,12 +2,11 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
-        <email>cinnamon@gentoo.org</email>
-        <name>Cinnamon Project</name>
+		<email>cinnamon@gentoo.org</email>
+		<name>Cinnamon Project</name>
 	</maintainer>
 	<use>
-		<flag name="colord">Support color management using
-			<pkg>x11-misc/colord</pkg></flag>
+		<flag name="colord">Support color management using <pkg>x11-misc/colord</pkg></flag>
 	</use>
 	<upstream>
 		<remote-id type="github">linuxmint/cinnamon-control-center</remote-id>
diff --git a/gnome-extra/cinnamon-desktop/Manifest b/gnome-extra/cinnamon-desktop/Manifest
index 7944e2cfa5fd..1aaff6bb51d7 100644
--- a/gnome-extra/cinnamon-desktop/Manifest
+++ b/gnome-extra/cinnamon-desktop/Manifest
@@ -3,3 +3,4 @@ DIST cinnamon-desktop-3.0.2.tar.gz 577776 SHA256 a8bbf148b9ee25f21fb2c196a54c95e
 DIST cinnamon-desktop-3.2.0.tar.gz 572478 SHA256 84c29fd9256370b6789613292fd12ec7893c1b752487dc938b056a3d68607212 SHA512 e93ec4ee44152b800f75848bd9327b46f4ab0c6b2f4d0dc7f6d6f631eda0d486b995a5bb1537b2c85774fb3a48ae99332937fa8b6021aa08d98b98fc25a8429f WHIRLPOOL de9ab65cc297d8000ee9c74245080da95e12ac2e2c39a1a02316fb4d257693acee8414d98950790e9c880c6acaca0c6d535a236ab6605edbccd30d93008a9f2b
 DIST cinnamon-desktop-3.2.4.tar.gz 570814 SHA256 f9920082b299c85d11cfdb6747026f5f044eabf3a09c0164873fa2850561abad SHA512 d07dbc63df4b689cb1fdeb7032c9f19557de0849def929a9ffc99d5aa1bb49edd37899256152d1245e1d43690821ed61a10e63f82962f787f5e06d999dadaf76 WHIRLPOOL 0474c43c922b517ba0a227bff5b9a48b737621f3bdcf01628c37f9ed3b7ce8cf910dc5ae3ec990c0416cae1c9ac1c882b8637862fc4cebd92c9b9d82cfbce392
 DIST cinnamon-desktop-3.4.2.tar.gz 570232 SHA256 58d594a896f2ce843b8dbc4430e1e538caa5f795e0bca07e5429ba953523c2c9 SHA512 821b49aefa2c4fff54a2ebf4ed61d8bd8ccb193d5ba113b9e5e917d7abe6baf4e85f721bdaf9dc206b4d6b1ba3080eff0c7925ab4d1970e0a58895e8891b4f8a WHIRLPOOL 5588077eeadeafd8ce75452b5cb8501080c2dfed43dde873e7cabc3c9d62eea85ff4c49e30adac854798b5963b870a5bb27270020ca433ea198fd83008233329
+DIST cinnamon-desktop-3.6.2.tar.gz 571728 BLAKE2B 17a3297b75a1ba9e34ff5ef8b7252748b4300fe40381b8d5942fcf5baaf7532a560cdbd918d2dc7ed34921e357c61f74d947a5e2174cd7b0310f91015a4bc4f4 SHA512 75af7ec916d43d02eebe9a83214cdb538067f6b674ca76e109f3bed909e61df11ec83350e97505ddaaed24f097e7b20512822e30b52d14a39d6a0e3d582d05fb
diff --git a/gnome-extra/cinnamon-desktop/cinnamon-desktop-3.6.2.ebuild b/gnome-extra/cinnamon-desktop/cinnamon-desktop-3.6.2.ebuild
new file mode 100644
index 000000000000..547abb541964
--- /dev/null
+++ b/gnome-extra/cinnamon-desktop/cinnamon-desktop-3.6.2.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit autotools eutils gnome2 python-single-r1
+
+DESCRIPTION="A collection of libraries and utilites used by Cinnamon"
+HOMEPAGE="http://cinnamon.linuxmint.com/"
+SRC_URI="https://github.com/linuxmint/cinnamon-desktop/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+ FDL-1.1+ LGPL-2+"
+SLOT="0/4" # subslot = libcinnamon-desktop soname version
+KEYWORDS="~amd64 ~x86"
+IUSE="+introspection systemd"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	>=dev-libs/glib-2.37.3:2[dbus]
+	media-sound/pulseaudio[glib]
+	>=x11-libs/gdk-pixbuf-2.22:2[introspection?]
+	>=x11-libs/gtk+-3.3.16:3[introspection?]
+	>=x11-libs/libXext-1.1
+	>=x11-libs/libXrandr-1.3
+	x11-libs/cairo:=[X]
+	x11-libs/libX11
+	x11-libs/libxkbfile
+	x11-misc/xkeyboard-config
+	>=gnome-base/gsettings-desktop-schemas-3.5.91
+	introspection? ( >=dev-libs/gobject-introspection-0.9.7:= )
+	sys-apps/accountsservice
+"
+RDEPEND="${COMMON_DEPEND}
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/gtk-doc-am-1.4
+	>=dev-util/intltool-0.40.6
+	gnome-base/gnome-common
+	x11-proto/randrproto
+	x11-proto/xproto
+	virtual/pkgconfig
+"
+
+pkg_setup() {
+	python_setup
+}
+
+src_prepare() {
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-static \
+		$(use_enable introspection)
+}
+
+src_install() {
+	gnome2_src_install
+
+	# set sane default gschema values for systemd users
+	if use systemd; then
+		insinto /usr/share/glib-2.0/schemas/
+		newins "${FILESDIR}"/${PN}-2.6.4.systemd.gschema.override ${PN}.systemd.gschema.override
+	fi
+}
diff --git a/gnome-extra/cinnamon-desktop/metadata.xml b/gnome-extra/cinnamon-desktop/metadata.xml
index e05983511df8..4664002df8ad 100644
--- a/gnome-extra/cinnamon-desktop/metadata.xml
+++ b/gnome-extra/cinnamon-desktop/metadata.xml
@@ -2,8 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
-        <email>cinnamon@gentoo.org</email>
-        <name>Cinnamon Project</name>
+		<email>cinnamon@gentoo.org</email>
+		<name>Cinnamon Project</name>
 	</maintainer>
 	<upstream>
 		<remote-id type="github">linuxmint/cinnamon-desktop</remote-id>
diff --git a/gnome-extra/cinnamon-menus/Manifest b/gnome-extra/cinnamon-menus/Manifest
index a7a8db532d20..05c8455232b9 100644
--- a/gnome-extra/cinnamon-menus/Manifest
+++ b/gnome-extra/cinnamon-menus/Manifest
@@ -2,3 +2,4 @@ DIST cinnamon-menus-2.8.0.tar.gz 208853 SHA256 06a6e0a11644dfba8459b2b77fac61563
 DIST cinnamon-menus-3.0.2.tar.gz 211077 SHA256 e17494e65edb6ca8b36e05ca21316db8ce6864d4f9bfa9312a661d5c39054ad7 SHA512 a309c10e21be1f5fe7e558017cc0573e7ae421ef860465411190bb071eb42caa8013f52ec71257322ec3dd37de998c78cd9014c4f4daca1edde413db6bed6b7f WHIRLPOOL 2bf6b26a40e45121c8adb40df0a3873aaf171beca14af8759adc725313b97fcce3ff150551bfe43d72e6caa835ebac9d1fe379852b280b967828486cd2951edf
 DIST cinnamon-menus-3.2.0.tar.gz 211237 SHA256 96eb3303151fabc18ccf2719849149d08f7391d22d0a6b72e82326009bb243b5 SHA512 5cec12ce4bf64880283064e3d5d169dc22ce692974b40a0f7eeebbb820780c941d9a2116eb6a2eb2bf3a3165262d23da47743390f56bfca6e74b298cf4be0aac WHIRLPOOL f988a4b90be60d9689e50f38fb192ce67de808f59f97d9a77f78a112277021517d917be7c2027623fb5094d819ee2ce8149a5ed7c9a371c1edec6ffe143ddcb5
 DIST cinnamon-menus-3.4.0.tar.gz 181649 SHA256 c0d60a612ab67ce76021b22821aff548e9779a6c3b2cc9ef393aca80c0044aad SHA512 77ec3f608323b263b70aefb633ecef83e68b82224e64d2cf3c6dc95c12537f81b41de08ab400596e2af0ecec1effa731ab66a83bddaffdb3bb6c8a7ef835f5b7 WHIRLPOOL be491935d33df5e56e688eca577836e4da6e66805a91fb2260b533751328607881d318f9d751e9b7928b8e7d7bf78aa1b2741b264285fb80c12f8c44a31e3b6b
+DIST cinnamon-menus-3.6.0.tar.gz 180165 BLAKE2B a014c120bc84206914be69fcae0f4ec09b98a281012ed3f6f2f21f46762ea0b5e289c6dbd321fb7889f6172c9e7150673513e4c15dbd2e634c48efcefa816176 SHA512 dc90dbb8633ac77f4c8be7b013e3d6f9ba8f4e830f7e8c09ec7dcb9566a3768171a59cdc90b6cd11ad015b93629cdf6fc8c2397656f74603a517c0fbc97d3b14
diff --git a/gnome-extra/cinnamon-menus/cinnamon-menus-3.6.0.ebuild b/gnome-extra/cinnamon-menus/cinnamon-menus-3.6.0.ebuild
new file mode 100644
index 000000000000..2dece04e2b33
--- /dev/null
+++ b/gnome-extra/cinnamon-menus/cinnamon-menus-3.6.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools gnome2
+
+DESCRIPTION="Cinnamon's library for the Desktop Menu fd.o specification"
+HOMEPAGE="http://cinnamon.linuxmint.com/"
+SRC_URI="https://github.com/linuxmint/cinnamon-menus/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug +introspection"
+
+RDEPEND="
+	>=dev-libs/glib-2.29.15:2
+	introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
+"
+DEPEND="${RDEPEND}
+	dev-libs/gobject-introspection-common
+	>=dev-util/intltool-0.40
+	gnome-base/gnome-common
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		$(usex debug --enable-debug=yes ' ') \
+		$(use_enable introspection) \
+		--disable-static
+}
diff --git a/gnome-extra/cinnamon-menus/metadata.xml b/gnome-extra/cinnamon-menus/metadata.xml
index 9725f06bf81f..9f2cc8ae0d4c 100644
--- a/gnome-extra/cinnamon-menus/metadata.xml
+++ b/gnome-extra/cinnamon-menus/metadata.xml
@@ -2,8 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
-        <email>cinnamon@gentoo.org</email>
-        <name>Cinnamon Project</name>
+		<email>cinnamon@gentoo.org</email>
+		<name>Cinnamon Project</name>
 	</maintainer>
 	<upstream>
 		<remote-id type="github">linuxmint/cinnamon-menus</remote-id>
diff --git a/gnome-extra/cinnamon-screensaver/Manifest b/gnome-extra/cinnamon-screensaver/Manifest
index d19be89f4bf5..0b379aeaaf35 100644
--- a/gnome-extra/cinnamon-screensaver/Manifest
+++ b/gnome-extra/cinnamon-screensaver/Manifest
@@ -4,4 +4,5 @@ DIST cinnamon-screensaver-3.2.13.tar.gz 143389 SHA256 7b1a0c156cc0e1983d6ed43704
 DIST cinnamon-screensaver-3.2.2.tar.gz 120816 SHA256 d8ec85d3b984f527790d68d61156adea84f84f35bc956d32923d5116d4937df2 SHA512 0ebc5da00973b6b7972e3f7a2ee671d204cadf25ae99af8a53fd176a5070598aaec9a0def86dca47538e6334c2b6d19db09bc0ac1ec226c85b439c0762a40d18 WHIRLPOOL dfd8ba669cd5732b5ff9e32fd9a1f5076da6da333d6a0822060340948b85aba34f043bd39a24797a7cef5ea0eb2f2e5acd931e3a76883da388bd5179f9df9c33
 DIST cinnamon-screensaver-3.2.6.tar.gz 124287 SHA256 5e0795d46f5f6f93e79139e87449c8a20438bc94af67f002b1b6ba3726db4741 SHA512 78b0347e5d6ae7970d070410d0a4aac08b2dbd69442d278f4869aa636f13de19c1d03118dce2f540739c37cbeebd5fa53ebf31270033fa8393220d6c35672d00 WHIRLPOOL e52657d656a5ee3b2290270c9a3f0c54c462338f35dd6c0edf4611b91c2fb0e0693587b1d63a4a2b7cf36882c655a2a4508601d45a7f6333af98b0648861afbc
 DIST cinnamon-screensaver-3.4.1.tar.gz 153389 SHA256 e25b68c74d7307eb0db30cf31d2f819981e25cf7371b339a08895c0506d55341 SHA512 3b5b35bfac37d220a260917633a2f0ed79bcc4d479cc9924a86eb73e864b2893d037eabf6c70b0ba68d93008b649399e29dd42b8490e58662db4840ee470e137 WHIRLPOOL 8704947ef29a9782dcfd82ed0da24d2d487a4b4a5b181886c1f5934e401a70a8c29aee4f10aab4ee193c7657a0da8e1ed626f302fd5a175113e2014c306a04b3
-DIST cinnamon-screensaver-3.4.2.tar.gz 154119 SHA256 9a86449eb6b2c1c2c31e3e18a336106c2fbfd0d6b68647ada1eff22867605335 SHA512 1d226f72c1f7d8e264bee8b1c175cf32866dfdbf7738383552c4d218dc6ca1f04ef37f56c91793ff42358dcf6b832ba1962b8e39129683b5bf9cd3c3c2b1a764 WHIRLPOOL ad147532cf461def895678f5be71b3807979bc0b16b232a21b94b2d61a52513044ba66601ffe622df97bb4cccf92734551d1d5631966fcefa7e350365d926ca8
+DIST cinnamon-screensaver-3.4.2.tar.gz 154119 BLAKE2B 2350f8aa1d256f964ef2da0e05b867da5a807b7799b47961e16e83fb25bdc0086b080638904b7d6dce44680640c73bcb2dc6946d2c0c7924291c9eb1aefea42e SHA512 1d226f72c1f7d8e264bee8b1c175cf32866dfdbf7738383552c4d218dc6ca1f04ef37f56c91793ff42358dcf6b832ba1962b8e39129683b5bf9cd3c3c2b1a764
+DIST cinnamon-screensaver-3.6.1.tar.gz 154729 BLAKE2B cd94413791d0500f01ec8eefc9b003e635c1bdac35d37768097ba19aff3005359e6596d3795dcf41ded9338f33dc9b68f6fdd5b7556eef9fbdcb88b8de4dd500 SHA512 9fd5ad0227993277d8ea773cbf80de7d3d7145eb38014e3673d2c31f9947dae0f45cd961077c56cd17deb6422b128ea56c909f4974ab55953bd42c63a2a2fc37
diff --git a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.6.1.ebuild b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.6.1.ebuild
new file mode 100644
index 000000000000..566c3485d0d5
--- /dev/null
+++ b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.6.1.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit autotools gnome2 multilib python-single-r1
+
+DESCRIPTION="Screensaver for Cinnamon"
+HOMEPAGE="http://cinnamon.linuxmint.com/"
+SRC_URI="https://github.com/linuxmint/cinnamon-screensaver/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="debug doc pam systemd"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+KEYWORDS="~amd64 ~x86"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.37.3:2[dbus]
+	>=x11-libs/gtk+-3.1.4:3[introspection]
+	>=gnome-extra/cinnamon-desktop-2.6.3:0=[systemd=]
+	>=gnome-base/gsettings-desktop-schemas-0.1.7
+	>=gnome-base/libgnomekbd-3.6
+	>=dev-libs/dbus-glib-0.78
+
+	net-libs/webkit-gtk:4[introspection]
+
+	sys-apps/dbus
+	x11-libs/libxklavier
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXrandr
+	x11-libs/libXScrnSaver
+	x11-libs/libXxf86misc
+	x11-libs/libXxf86vm
+	x11-themes/adwaita-icon-theme
+
+	!systemd? ( sys-auth/elogind )
+
+	${PYTHON_DEPS}
+
+	pam? ( virtual/pam )
+	systemd? ( >=sys-apps/systemd-31:0= )
+"
+# our cinnamon-1.8 ebuilds installed a cinnamon-screensaver.desktop hack
+RDEPEND="${COMMON_DEPEND}
+	!~gnome-extra/cinnamon-1.8.8.1
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	dev-python/setproctitle[${PYTHON_USEDEP}]
+	dev-python/xapp[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/intltool-0.35
+	gnome-base/gnome-common
+	sys-devel/gettext
+	virtual/pkgconfig
+	x11-proto/xextproto
+	x11-proto/randrproto
+	x11-proto/scrnsaverproto
+	x11-proto/xf86miscproto
+	doc? (
+		app-text/xmlto
+		app-text/docbook-xml-dtd:4.1.2
+		app-text/docbook-xml-dtd:4.4 )
+"
+
+pkg_setup() {
+	python_setup
+}
+
+src_prepare() {
+	python_fix_shebang screensavers
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		$(usex debug --enable-debug ' ') \
+	# Do not use --without-console-kit, it would provide no benefit: there is
+	# no build-time or run-time check for consolekit, $PN merely listens to
+	# consolekit's messages over dbus.
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	if ! has_version x11-misc/xscreensaver; then
+		elog "${PN} can use screensavers from x11-misc/xscreensaver"
+	fi
+
+}
diff --git a/gnome-extra/cinnamon-screensaver/metadata.xml b/gnome-extra/cinnamon-screensaver/metadata.xml
index 0c72d1717c58..00e290bb5707 100644
--- a/gnome-extra/cinnamon-screensaver/metadata.xml
+++ b/gnome-extra/cinnamon-screensaver/metadata.xml
@@ -2,8 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
-        <email>cinnamon@gentoo.org</email>
-        <name>Cinnamon Project</name>
+		<email>cinnamon@gentoo.org</email>
+		<name>Cinnamon Project</name>
 	</maintainer>
 	<upstream>
 		<remote-id type="github">linuxmint/cinnamon-screensaver</remote-id>
diff --git a/gnome-extra/cinnamon-session/Manifest b/gnome-extra/cinnamon-session/Manifest
index a5085ab10b33..ff38b9ea7a51 100644
--- a/gnome-extra/cinnamon-session/Manifest
+++ b/gnome-extra/cinnamon-session/Manifest
@@ -3,4 +3,5 @@ DIST cinnamon-session-2.8.3.tar.gz 591500 SHA256 306eb9448500b15b0d06826b66f438d
 DIST cinnamon-session-3.0.1.tar.gz 592265 SHA256 d8935747bc8aa70518e70a7d338eaf9109b5307d8a44d49dc57e0f15d69e9c89 SHA512 cdbf9f910954976854aa1b90033781269dc9d521b86edd3e97ae936b59a9ac4ffa956ba37a51ba11beac73e38a732913ce147557e999484bd68529677eed21e8 WHIRLPOOL 9af4cf92685e6a07220779ed8ef73c7435dff08e3771bbc87994d5294f998129b0d114a3092987b8fc59b49f936616d135ca59327d9979c70d9aec55238a0332
 DIST cinnamon-session-3.2.0.tar.gz 595530 SHA256 d7c3d951ae0dddef96941c9f08f028a099443888db41981524f618a92624e0ca SHA512 00475069849c7bb1d874c65200128128068e6500475c61053f07deabacb98046bf344ab5d3b4537487c48103dd6c6a8316d1326396e606a0d44bc486db9267d6 WHIRLPOOL 1753d5f99a98b718e0db8b945e94ade2c316bb7965943f2b1605b10dcc08a5e74661b4b7edcf8afdceb167c0ceffd57a0f97612c2638b13278240f695fae344e
 DIST cinnamon-session-3.4.1.tar.gz 595567 SHA256 20426fe91347193b13ede47d2b2f14af4321f95274267304dc9844e2a5178948 SHA512 caac3b445e2dca8e040bdb215e8aca833cbcdb77611e435aab5ebcd4b0f9b6bddb117d97763d26e99d42bbacb7ec51171e6927d87dbdd7d6ed0f5287648dee0e WHIRLPOOL aaf997cc1c6b62484be5e466b5d80f221e62b80a4d65e8ec91f5bd51e429df71154ceb5be742a5a3fdb8affebe5407339b4a8eb1593f1ec70909c3e7dabb4e50
-DIST cinnamon-session-3.4.2.tar.gz 595721 SHA256 bfeb8a73cc8c7d9dfd728d34df0f578bd2ad8ed88f7de9d7cd5d3ae08f454530 SHA512 4a2f49f1717418a7d87df5f46e47c9d3a95bc4484aad6760e5391289100ebec734a300fd2540fd4ff0385a5169c15c01c081a002cc842d9d57d817d15dd6963d WHIRLPOOL 7b4cc7c37b7ea02de59923752064edede742a9619a9dee86776475149cf3aa602d358b50cefa94601c8343119651792644f86f50ed27dacfb324b94fefab70ad
+DIST cinnamon-session-3.4.2.tar.gz 595721 BLAKE2B 7f50d208d6928144a6b47153fd21f4a90875eec8b37fac5b4efb3d7a70a8806561710a10568a2f597ff5f471e8a4d2deb6ce9e233d8c6a0616c966a7c74ca654 SHA512 4a2f49f1717418a7d87df5f46e47c9d3a95bc4484aad6760e5391289100ebec734a300fd2540fd4ff0385a5169c15c01c081a002cc842d9d57d817d15dd6963d
+DIST cinnamon-session-3.6.1.tar.gz 205682 BLAKE2B 5e4bb931da715feebec6c980cd59d82b682d75234ab0e2c4135948fd83b81ea8c57536b6b2a0294162de82288af57a31977e77383e9c426357ecb4dacc4bd1e4 SHA512 a8ae2d332ba8e9f83ab9444c56611b28bd1c32ef9764fd5e883b7835940ec2b6c8b87f8af1735a3c2fe59ad4f15af5f5dab065cd368aaa09d4d25f6156ec6137
diff --git a/gnome-extra/cinnamon-session/cinnamon-session-3.6.1.ebuild b/gnome-extra/cinnamon-session/cinnamon-session-3.6.1.ebuild
new file mode 100644
index 000000000000..487a19d7bd3f
--- /dev/null
+++ b/gnome-extra/cinnamon-session/cinnamon-session-3.6.1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools eutils gnome2
+
+DESCRIPTION="Cinnamon session manager"
+HOMEPAGE="http://cinnamon.linuxmint.com/"
+SRC_URI="https://github.com/linuxmint/cinnamon-session/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+ FDL-1.1+ LGPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc ipv6 systemd"
+
+COMMON_DEPEND="
+	>=dev-libs/dbus-glib-0.88
+	>=dev-libs/glib-2.37.3:2
+	media-libs/libcanberra
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3:3
+	x11-libs/cairo
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libXcomposite
+	x11-libs/libXext
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-libs/pango[X]
+	virtual/opengl
+	systemd? ( >=sys-apps/systemd-183 )
+	!systemd? ( >=sys-power/upower-pm-utils-0.9.23 )
+"
+RDEPEND="${COMMON_DEPEND}
+	>=gnome-extra/cinnamon-desktop-2.6[systemd=]
+	!systemd? ( sys-auth/elogind )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/libxslt
+	>=dev-util/intltool-0.40.6
+	virtual/pkgconfig
+	doc? ( app-text/xmlto )
+
+	gnome-base/gnome-common
+"
+#	gnome-base/gnome-common for eautoreconf
+
+src_prepare() {
+	# make upower and logind check non-automagic
+	eapply "${FILESDIR}/${PN}-3.0.1-automagic.patch"
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-gconf \
+		--disable-static \
+		$(use_enable doc docbook-docs) \
+		$(use_enable ipv6) \
+		$(use_enable systemd logind) \
+		$(usex systemd --disable-old-upower --enable-old-upower)
+}
diff --git a/gnome-extra/cinnamon-session/metadata.xml b/gnome-extra/cinnamon-session/metadata.xml
index 01596926d67b..ad3cba8d7130 100644
--- a/gnome-extra/cinnamon-session/metadata.xml
+++ b/gnome-extra/cinnamon-session/metadata.xml
@@ -2,8 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
-        <email>cinnamon@gentoo.org</email>
-        <name>Cinnamon Project</name>
+		<email>cinnamon@gentoo.org</email>
+		<name>Cinnamon Project</name>
 	</maintainer>
 	<upstream>
 		<remote-id type="github">linuxmint/cinnamon-session</remote-id>
diff --git a/gnome-extra/cinnamon-settings-daemon/Manifest b/gnome-extra/cinnamon-settings-daemon/Manifest
index a62954ea6451..c648d54fbc31 100644
--- a/gnome-extra/cinnamon-settings-daemon/Manifest
+++ b/gnome-extra/cinnamon-settings-daemon/Manifest
@@ -3,4 +3,5 @@ DIST cinnamon-settings-daemon-2.8.4.tar.gz 2935478 SHA256 2f7e8764a842d9b4f21c1e
 DIST cinnamon-settings-daemon-3.0.1.tar.gz 2912459 SHA256 0abe839e04a36a052bb486f90e84c25ae6ccc92b74223813d9666eaac257677b SHA512 848f1bc38e84edf9a8af48e55b7581881fbc9920dce9a4fc38627456dea7cbfe330bebba4bb46d1c231dd85bd3445d365b5e415485ac202e72335fe337a800e8 WHIRLPOOL 91b5b0455c2dcde8868eb8e1adf52229e3dd94fb4c4842d537b89e1c72cd8f8f54af854765c62eb382015b8f3299400f21a9034974440ce9b7d305be4ffb82fb
 DIST cinnamon-settings-daemon-3.2.0.tar.gz 2915197 SHA256 0726e8ce4b1008229fe157ba0888a2effa1d9efa4e60735faf67af1fde8586f1 SHA512 1977402fddf62cf29c0285fd2be8c951dcf5f1d914e3ce53e2e738cfdb211096653b9256028fcb887e403d11dc2105e976eda05cf97c95afe6101c84c72abb12 WHIRLPOOL f051d50a41c22035ef1ffc48fe557d791966aacea2a81f76598868d6d79afe3d02ef56d17d7a67bd3802beb2d287f882c152021e2495ab4dae5af18f3a9d5959
 DIST cinnamon-settings-daemon-3.4.2.tar.gz 3102793 SHA256 b30a3b64e4263e4dbe2678c0cff5cef97944282fabb8f4b6fa3ca6c65c8f1522 SHA512 597f3a08e5c2168d0fc3da4b83c85f4c1f4451573cccc79bcb2a3debaab7f4714244e0300dce8ddc62de40b2f4c1c44ff282d280a1437d14041b44d4541c83e0 WHIRLPOOL 85922de3b93e07565adeda762e4d5278e75038db7ab7ae372494a8050fc11302eed8b0a53c19a691b8b4f93e35f8182d58b88d56809103671dcf97308b3b5b5d
-DIST cinnamon-settings-daemon-3.4.4.tar.gz 3102951 SHA256 b883879a13f9120d2e17ad22fa2cf3ebe50a87d814c82e2f067b2bc32e7273f1 SHA512 93a7609a5c1b9c34061f9ba7836ace58cfa5549d9be811a1a5ca50e2cb9fc9e9462d9f356f50c9115cca93fa42f29ff9d130c184e19cccf9c0ee814fb39bc6d6 WHIRLPOOL 6fc3edb6697be3f24c7a6321f7a315620ef040b7cc2bb557b5e0f4f3bac2210fcac2e7127fd89629066024d6f862b0c79463fefc0ebb9734a2c387b7036cc964
+DIST cinnamon-settings-daemon-3.4.4.tar.gz 3102951 BLAKE2B d799621861d2450d401788b344dd7c26347054a2756081a8c85526b9f31f9a468ea97695dc26a9c060692efcf0189aae958988f3c911b5a8f7028873158ee3b4 SHA512 93a7609a5c1b9c34061f9ba7836ace58cfa5549d9be811a1a5ca50e2cb9fc9e9462d9f356f50c9115cca93fa42f29ff9d130c184e19cccf9c0ee814fb39bc6d6
+DIST cinnamon-settings-daemon-3.6.1.tar.gz 995005 BLAKE2B c512fe53b707099dca0926893f03056d508bbe22026367c3212a99f22df60d629e02e080fccdeb73151c7aa7e93396b47bede1820059f4a53eace11a56ae5521 SHA512 48a28decff08a191f4ec604386c3bb5c07001d4bc4f7b6d1da379626b41650653fdd14205bbed5321c41fbc281e8638b17e1de30dbba5d299f79cde03216cb33
diff --git a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.6.1.ebuild b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.6.1.ebuild
new file mode 100644
index 000000000000..33d4587404d7
--- /dev/null
+++ b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.6.1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+
+inherit autotools eutils gnome2 virtualx
+
+DESCRIPTION="Cinnamon's settings daemon"
+HOMEPAGE="http://cinnamon.linuxmint.com/"
+SRC_URI="https://github.com/linuxmint/cinnamon-settings-daemon/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+colord cups input_devices_wacom smartcard systemd"
+
+# udev is non-optional since lots of plugins, not just gudev, pull it in
+RDEPEND="
+	>=dev-libs/glib-2.38:2
+	>=gnome-base/libgnomekbd-3.6
+	>=gnome-base/librsvg-2.36.2
+	>=gnome-extra/cinnamon-desktop-2.8.0:0=
+	media-libs/fontconfig
+	>=media-libs/lcms-2.2:2
+	media-libs/libcanberra:0=[gtk3]
+	sys-apps/dbus
+	>=sys-auth/polkit-0.97
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3.9.10:3
+	>=x11-libs/libnotify-0.7.3:0=
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libxklavier
+	virtual/libgudev:=
+
+	colord? ( >=x11-misc/colord-0.1.27:= )
+	cups? ( >=net-print/cups-1.4[dbus] )
+	input_devices_wacom? (
+		>=dev-libs/libwacom-0.7
+		x11-drivers/xf86-input-wacom
+		x11-libs/libXtst )
+	smartcard? ( >=dev-libs/nss-3.11.2 )
+	systemd? (
+		sys-apps/systemd:0=
+		>=sys-power/upower-0.9.11:= )
+	!systemd? (
+		sys-auth/elogind:0=
+		|| ( >=sys-power/upower-0.9.11 sys-power/upower-pm-utils ) )
+"
+DEPEND="${RDEPEND}
+	dev-libs/libxml2:2
+	>=dev-util/intltool-0.37.1
+	x11-proto/kbproto
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	# make colord and wacom optional
+	eapply "${FILESDIR}"/${PN}-3.0.1-optional.patch
+
+	# Disable broken test
+	sed -e '/g_test_add_func ("\/color\/edid/d' \
+		-i plugins/color/gcm-self-test.c || die
+
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# no point in disabling gudev since other plugins pull it in
+	gnome2_src_configure \
+		--disable-static \
+		--enable-gudev \
+		--enable-polkit \
+		--enable-logind \
+		$(use_enable colord color) \
+		$(use_enable cups) \
+		$(use_enable smartcard smartcard-support) \
+		$(use_enable input_devices_wacom wacom)
+}
+
+src_test() {
+	virtx emake check
+}
diff --git a/gnome-extra/cinnamon-settings-daemon/metadata.xml b/gnome-extra/cinnamon-settings-daemon/metadata.xml
index 9738f243081c..aab7fdc66a7f 100644
--- a/gnome-extra/cinnamon-settings-daemon/metadata.xml
+++ b/gnome-extra/cinnamon-settings-daemon/metadata.xml
@@ -2,8 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
-        <email>cinnamon@gentoo.org</email>
-        <name>Cinnamon Project</name>
+		<email>cinnamon@gentoo.org</email>
+		<name>Cinnamon Project</name>
 	</maintainer>
 	<use>
 		<flag name="colord">Support color management using <pkg>x11-misc/colord</pkg></flag>
diff --git a/gnome-extra/cinnamon-translations/Manifest b/gnome-extra/cinnamon-translations/Manifest
index 23ee3daf9aa5..ee798bcd1c8d 100644
--- a/gnome-extra/cinnamon-translations/Manifest
+++ b/gnome-extra/cinnamon-translations/Manifest
@@ -1,3 +1,4 @@
 DIST cinnamon-translations-2.8.3.tar.gz 7701375 SHA256 8585670a2765ac6580b98477b2eb02ed3afe64be0ba09f8c3e61613c0a987cad SHA512 9902d79439624e4fb445cb41f6ff55076875fd9080abaf6c3debc7dfad0ea94d0d611bb6631717e4e15cb2b817d0e454df680d8c55d3a678acc87c04bf443b22 WHIRLPOOL 6984aef96d872a3e2cbe3b912ca2555ab44853d306a37c6e55d368438848fbef4aac01dd73d513cf386ffd6909fd64b448cfe98df18de7d371021f7a45d8a200
 DIST cinnamon-translations-3.0.3.tar.gz 7938822 SHA256 5f8eeb3c2d4af9ecd6a42cdf79cea6e6c92194aad6d37cf0a37724505da971a8 SHA512 f639f310a954a3b310117d324cdc627554b82833ad66b76395e8ead26cf8337998b665bea92c4263c20275440e6fc529a4b770e85d12d84b8b74529154c29b0c WHIRLPOOL ff9f0cdbdad0a01f64a851547bb3451b7b89e65b89816e113abbea42d48c672615445794e8e242367701a93c80daccb1af1028841039866ea55b2a7371787212
-DIST cinnamon-translations-3.2.0.tar.gz 7938813 SHA256 18cfe229900979b35686c638ba00530e88be33aeb473364067daf28b22aa9ca8 SHA512 3bdb2b50afac2d2b1d730c86168294d5e32b24f3eda38722d019c912805d2238559b31260e496debcb84e872d65dc5f7e12d4223e3b1006067616c5b83ed934c WHIRLPOOL 8de63a42fa0d408dc7c57108ea9457b5e0790dce66808b79071a4bc988ba4f31f39988f2247e9be51898654a8929e692d86f32e52a85408f9a9c0b549e566723
+DIST cinnamon-translations-3.2.0.tar.gz 7938813 BLAKE2B 12d3b4ce6fc41e5e224a0681f6133ee3f8e701b24eb420b38401969d5474101ca68b08b20f5195fabcba581bfe9f0afb5b3d3b01518f1ae4abe4488f585714d7 SHA512 3bdb2b50afac2d2b1d730c86168294d5e32b24f3eda38722d019c912805d2238559b31260e496debcb84e872d65dc5f7e12d4223e3b1006067616c5b83ed934c
+DIST cinnamon-translations-3.6.3.tar.gz 9486325 BLAKE2B 75d25beb66dc28565eb6d61f64df66e69de347ffe01984d9958b3388109d7e89f839205913432d7d68a7fedda743d4de52d63b1d95fc54ff77a8b80501d7e668 SHA512 274ad790ad9e8bc1d424ce45ff426ebdadf868bd48c065a21a8be014cabc889927974de5eb56ef909317bcecf4a0ca9e98af8ba3ade08c903fa286c93e05f695
diff --git a/gnome-extra/cinnamon-translations/cinnamon-translations-3.6.3.ebuild b/gnome-extra/cinnamon-translations/cinnamon-translations-3.6.3.ebuild
new file mode 100644
index 000000000000..832916ae5f4b
--- /dev/null
+++ b/gnome-extra/cinnamon-translations/cinnamon-translations-3.6.3.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PLOCALES="af am an ar as ast az be be@latin bg bn bn_IN br bs ca ca@valencia crh cs csb cy da de dz el en@shaw en_AU en_CA en_GB eo es es_AR et eu fa fi fil fo fr fr_CA frp fy ga gd gl gu he hi hr hu hy ia id ii is it ja jv ka kk km kn ko ksw ku ky la li lo lt lv mai mg mk ml mn mr ms my nb nds ne nl nn nso oc om or pa pap pl ps pt pt_BR ro ru rue rw sa sc sco shn si sk sl so sq sr sr@ijekavianlatin sr@latin sv sw ta te tg th tl tlh tpi tr ts tt ug uk ur uz uz@cyrillic vi wa xh yi zh_CN zh_HK zh_TW zu"
+
+inherit l10n
+
+DESCRIPTION="Translation data for Cinnamon"
+HOMEPAGE="http://cinnamon.linuxmint.com/"
+SRC_URI="https://github.com/linuxmint/cinnamon-translations/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+RESTRICT="test" # tests are for upstream translators and need network access
+
+src_configure() { :; }
+
+src_install() {
+	# Cannot run before since locales are not in the expected place for this to work
+	l10n_find_plocales_changes "${S}"/usr/share/locale "" ""
+
+	install_locale() {
+		dodir /usr/share/locale
+		insinto /usr/share/locale
+		doins -r usr/share/locale/${1}
+	}
+	l10n_for_each_locale_do install_locale
+}
diff --git a/gnome-extra/cinnamon-translations/metadata.xml b/gnome-extra/cinnamon-translations/metadata.xml
index 6f03e8fdd7ef..d5f1fb8d01fc 100644
--- a/gnome-extra/cinnamon-translations/metadata.xml
+++ b/gnome-extra/cinnamon-translations/metadata.xml
@@ -2,8 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
-        <email>cinnamon@gentoo.org</email>
-        <name>Cinnamon Project</name>
+		<email>cinnamon@gentoo.org</email>
+		<name>Cinnamon Project</name>
 	</maintainer>
 	<upstream>
 		<remote-id type="github">linuxmint/cinnamon-translations</remote-id>
diff --git a/gnome-extra/cinnamon/Manifest b/gnome-extra/cinnamon/Manifest
index 3b781cf16875..9e4f71e7612b 100644
--- a/gnome-extra/cinnamon/Manifest
+++ b/gnome-extra/cinnamon/Manifest
@@ -3,4 +3,5 @@ DIST cinnamon-3.2.0.tar.gz 2216495 SHA256 c1473aabb01329c07bf1e28148cb410255700f
 DIST cinnamon-3.2.6.tar.gz 2225445 SHA256 ab2e5681e4780e065ebf4aebf4b909e9b723a69d7d437ea490c7a9a39ffce8a5 SHA512 b21f762341c523a0292de27e37b664e758adafeeb658bb056a08f5aa3ec6c29709cf9db78ab48a9ab21982b7e1bfc0674f79395995348ff0b877c2c04e7038fb WHIRLPOOL 2d1c8c7662a3e76dae733300a86057962a159ad4fd7946f73b84bfdf624d6c6fb23b863847786879233d7dd2f3a8bc037c64fb065977732259f0c3b60857039f
 DIST cinnamon-3.2.7.tar.gz 2226152 SHA256 69ab4510e4239f577a7acc7ea987d0522caa9796bfaa4a062a5009009ebc5a80 SHA512 0da8ddb6e894b5ceda0cb92dc54e6b42618425f3b993b551b49aafbd4b9db95a6023083151fae75b9e60413484ff5235ed5058e9b2178c65dd108f806defe4df WHIRLPOOL fd3a0bbed451ca26844b9063d2a82aef7151a554a33522d5d765c4c871871d7a73ea9f4f5768f6d6135d45fd626fd871dc1cff4bcc5ff2f028694bc792207942
 DIST cinnamon-3.4.2.tar.gz 2213346 SHA256 182ed619f92831b83e9bfd89803bbd750c6cb0ee9d097120cdd40eb19d41e302 SHA512 dee9027788a2e8c9b6d536d27f4afcf28434ab7e52bcd0d26a6426f010f64ac6d3c29e7f225dae794e8215972d744d2eebb7fb9c102451269498a663e4c5dfb7 WHIRLPOOL 27a508e693d32c1c297df545028ca3737a15e91de197f52fbb41854b3b1f7aa813e20d6062fb1ece432166004651c4cf17d38551a1e79bc2ea1c1f652d96b76f
-DIST cinnamon-3.4.6.tar.gz 2217209 SHA256 857cd68ca4744332e9b20456ae3a0d63ee8a3eacd108ec82dd26b124765a45b4 SHA512 b5fa337dc236204a09a3650ca40d2c2a996c9d1ff6f789834e757d50d68939914bf56d2d623ee5b6e57a180c02b803dbae6349ce1a9dd969b7a4c8bad1b9d8bd WHIRLPOOL fcc2d2ea60099e021e6a761d7a519bc773430d128506d38f0d7653d586d79c3019af8c739b2b013dc3faadfbecae8643f5aa87c4137e9da5098e337623620f4f
+DIST cinnamon-3.4.6.tar.gz 2217209 BLAKE2B 87a01ffe8806fd7d252035533be25bd197e06f29f02644197132a9d5fa3eb766760fb0df5fc00c61e5f35b3d45b8464824def510e233fa93c84038c28aea5ccc SHA512 b5fa337dc236204a09a3650ca40d2c2a996c9d1ff6f789834e757d50d68939914bf56d2d623ee5b6e57a180c02b803dbae6349ce1a9dd969b7a4c8bad1b9d8bd
+DIST cinnamon-3.6.6.tar.gz 2211080 BLAKE2B a5be448413532b6cc84c77d17e56739a8c2f3c26f21fac3fcdcaeda127a00e1a8f7d623964c4040f77624da06795eb607491aef55bf31fcb291b074ee75930f9 SHA512 9bd153508458bae2f99a451620fe5e80e45cae0e10cf113b07ca2c0a76cd16e84c4a6d743c659ef41ab91066df025f78a0ea2005a3d34ddd065fe88f358b6642
diff --git a/gnome-extra/cinnamon/cinnamon-3.6.6.ebuild b/gnome-extra/cinnamon/cinnamon-3.6.6.ebuild
new file mode 100644
index 000000000000..16d2c5e028c8
--- /dev/null
+++ b/gnome-extra/cinnamon/cinnamon-3.6.6.ebuild
@@ -0,0 +1,227 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_REQ_USE="xml"
+
+inherit autotools eutils flag-o-matic gnome2 multilib pax-utils python-r1
+
+DESCRIPTION="A fork of GNOME Shell with layout similar to GNOME 2"
+HOMEPAGE="http://developer.linuxmint.com/"
+
+MY_PV="${PV/_p/-UP}"
+MY_P="${PN}-${MY_PV}"
+
+SRC_URI="https://github.com/linuxmint/Cinnamon/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+
+# bluetooth support dropped due to bug #511648
+IUSE="+nls +networkmanager" #+bluetooth
+
+# We need *both* python 2.x and 3.x
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	|| ( $(python_gen_useflags 'python2*') )
+	|| ( $(python_gen_useflags 'python3*') )
+"
+
+KEYWORDS="~amd64 ~x86"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	app-accessibility/at-spi2-atk:2
+	app-misc/ca-certificates
+	dev-libs/dbus-glib
+	>=dev-libs/glib-2.35.0:2[dbus]
+	>=dev-libs/gobject-introspection-0.10.1:=
+	>=dev-libs/json-glib-0.13.2
+	>=dev-libs/libcroco-0.6.2:0.6
+	dev-libs/libxml2:2
+	gnome-base/gconf:2[introspection]
+	gnome-base/librsvg
+	>=gnome-extra/cinnamon-desktop-2.4:0=[introspection]
+	>=gnome-extra/cinnamon-menus-3.0[introspection]
+	>=gnome-extra/cjs-3.2.0
+	>=media-libs/clutter-1.10:1.0[introspection]
+	media-libs/cogl:1.0=[introspection]
+	>=gnome-base/gsettings-desktop-schemas-2.91.91
+	media-libs/gstreamer:1.0
+	media-libs/gst-plugins-base:1.0
+	net-libs/libsoup:2.4[introspection]
+	>=sys-auth/polkit-0.100[introspection]
+	x11-libs/gdk-pixbuf:2[introspection]
+	>=x11-libs/gtk+-3.9.12:3[introspection]
+	x11-libs/pango[introspection]
+	>=x11-libs/startup-notification-0.11
+	x11-libs/libX11
+	>=x11-libs/libXfixes-5.0
+	>=x11-wm/muffin-3.2.0[introspection]
+	networkmanager? (
+		gnome-base/libgnome-keyring
+		>=net-misc/networkmanager-0.8.999:=[introspection] )
+"
+#bluetooth? ( >=net-wireless/gnome-bluetooth-3.1:=[introspection] )
+
+# Runtime-only deps are probably incomplete and approximate.
+# Each block:
+# 2. Introspection stuff + dconf needed via imports.gi.*
+# 3. gnome-session is needed for gnome-session-quit
+# 4. Control shell settings
+# 5. accountsservice is needed for GdmUserManager (0.6.14 needed for fast
+#    user switching with gdm-3.1.x)
+# 6. caribou needed for on-screen keyboard
+# 7. xdg-utils needed for xdg-open, used by extension tool
+# 8. gconf-python, imaging, lxml needed for cinnamon-settings
+# 9. gnome-icon-theme-symbolic needed for various icons
+# 10. pygobject needed for menu editor
+# 11. nemo - default file manager, tightly integrated with cinnamon
+# 12. polkit-gnome - explicitly autostarted by us
+# TODO(lxnay): fix error: libgnome-desktop/gnome-rr-labeler.h: No such file or directory
+RDEPEND="${COMMON_DEPEND}
+	>=gnome-base/dconf-0.4.1
+	>=gnome-base/libgnomekbd-2.91.4[introspection]
+	|| ( sys-power/upower[introspection] sys-power/upower-pm-utils[introspection] )
+
+	>=gnome-extra/cinnamon-session-2.4
+	>=gnome-extra/cinnamon-settings-daemon-2.4
+
+	>=sys-apps/accountsservice-0.6.14[introspection]
+
+	>=app-accessibility/caribou-0.3
+
+	x11-misc/xdg-utils
+	x11-libs/xapps[introspection]
+
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/gconf-python:2[${PYTHON_USEDEP}]' 'python2*')
+	$(python_gen_cond_dep 'dev-python/lxml[${PYTHON_USEDEP}]' 'python2*')
+	$(python_gen_cond_dep 'dev-python/pexpect[${PYTHON_USEDEP}]' 'python2*')
+	$(python_gen_cond_dep 'dev-python/pycairo[${PYTHON_USEDEP}]' 'python2*')
+	$(python_gen_cond_dep 'dev-python/pyinotify[${PYTHON_USEDEP}]' 'python2*')
+	$(python_gen_cond_dep 'dev-python/pypam[${PYTHON_USEDEP}]' 'python2*')
+	$(python_gen_cond_dep 'dev-python/pillow[${PYTHON_USEDEP}]' 'python2*')
+
+	x11-themes/gnome-themes-standard
+	x11-themes/adwaita-icon-theme
+
+	>=gnome-extra/nemo-2.4
+	>=gnome-extra/cinnamon-control-center-2.4
+	>=gnome-extra/cinnamon-screensaver-2.4
+
+	gnome-extra/polkit-gnome
+
+	networkmanager? (
+		gnome-extra/nm-applet
+		net-misc/mobile-broadband-provider-info
+		sys-libs/timezone-data )
+	nls? ( >=gnome-extra/cinnamon-translations-2.4 )
+"
+#bluetooth? ( net-wireless/cinnamon-bluetooth )
+
+DEPEND="${COMMON_DEPEND}
+	$(python_gen_cond_dep 'dev-python/polib[${PYTHON_USEDEP}]' 'python2*')
+	dev-util/gtk-doc
+	>=dev-util/intltool-0.4
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+	gnome-base/gnome-common
+	!!=dev-lang/spidermonkey-1.8.2*
+"
+# libmozjs.so is picked up from /usr/lib while compiling, so block at build-time
+# https://bugs.gentoo.org/show_bug.cgi?id=360413
+
+S="${WORKDIR}/Cinnamon-${PV}"
+
+pkg_setup() {
+	python_setup
+}
+
+src_prepare() {
+	# Fix backgrounds path as cinnamon doesn't provide them
+	# https://github.com/linuxmint/Cinnamon/issues/3575
+	eapply "${FILESDIR}"/${PN}-2.8.0-background.patch
+
+	# Fix automagic gnome-bluetooth dep, bug #398145
+	eapply "${FILESDIR}"/${PN}-2.2.6-automagic-gnome-bluetooth.patch
+
+	# Use pkexec instead of gksu (from Arch)
+	# https://github.com/linuxmint/Cinnamon/issues/3565
+	sed -i 's/gksu/pkexec/' files/usr/bin/cinnamon-settings-users || die
+
+	# Add polkit agent to required components (from Fedora/Arch), bug #523958
+	# https://github.com/linuxmint/Cinnamon/issues/3579
+	sed -i 's/RequiredComponents=\(.*\)$/RequiredComponents=\1polkit-gnome-authentication-agent-1;/' \
+		files/usr/share/cinnamon-session/sessions/cinnamon*.session || die
+
+	if ! use networkmanager; then
+		rm -rv files/usr/share/cinnamon/applets/network@cinnamon.org || die
+	fi
+
+	# python 2-and-3 shebang fixing craziness
+	local p
+	python_setup 'python3*'
+	for p in $(grep -rl '#!.*python3'); do
+		python_fix_shebang "${p}"
+	done
+
+	python_setup 'python2*'
+	for p in $(grep -rl '#!.*python[^3]'); do
+		python_fix_shebang "${p}"
+	done
+
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
+		--disable-jhbuild-wrapper-script \
+		$(use_enable networkmanager) \
+		--with-ca-certificates="${EPREFIX}/etc/ssl/certs/ca-certificates.crt" \
+		BROWSER_PLUGIN_DIR="${EPREFIX}/usr/$(get_libdir)/nsbrowser/plugins" \
+		--without-bluetooth
+}
+
+src_install() {
+	gnome2_src_install
+	python_optimize "${ED}"usr/$(get_libdir)/cinnamon-*
+
+	# Required for gnome-shell on hardened/PaX, bug #398941
+	pax-mark mr "${ED}usr/bin/cinnamon"
+
+	# Doesn't exist on Gentoo, causing this to be a dead symlink
+	rm -f "${ED}etc/xdg/menus/cinnamon-applications-merged" || die
+
+	# Ensure authentication-agent is started, bug #523958
+	# https://github.com/linuxmint/Cinnamon/issues/3579
+	insinto /etc/xdg/autostart/
+	doins "${FILESDIR}"/polkit-cinnamon-authentication-agent-1.desktop
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	if ! has_version 'media-libs/gst-plugins-good:1.0' || \
+	   ! has_version 'media-plugins/gst-plugins-vpx:1.0'; then
+		ewarn "To make use of Cinnamon's built-in screen recording utility,"
+		ewarn "you need to either install media-libs/gst-plugins-good:1.0"
+		ewarn "and media-plugins/gst-plugins-vpx:1.0, or use dconf-editor to change"
+		ewarn "org.cinnamon.recorder/pipeline to what you want to use."
+	fi
+
+	if ! has_version ">=x11-base/xorg-server-1.11"; then
+		ewarn "If you use multiple screens, it is highly recommended that you"
+		ewarn "upgrade to >=x11-base/xorg-server-1.11 to be able to make use of"
+		ewarn "pointer barriers which will make it easier to use hot corners."
+	fi
+
+	if has_version "<x11-drivers/ati-drivers-12"; then
+		ewarn "Cinnamon has been reported to show graphical corruption under"
+		ewarn "x11-drivers/ati-drivers-11.*; you may want to switch to"
+		ewarn "open-source drivers."
+	fi
+}
diff --git a/gnome-extra/cjs/Manifest b/gnome-extra/cjs/Manifest
index bfc47ddbc0a1..127a3c8fa464 100644
--- a/gnome-extra/cjs/Manifest
+++ b/gnome-extra/cjs/Manifest
@@ -1,3 +1,4 @@
 DIST cjs-3.0.1.tar.gz 325349 SHA256 cafda5a8a21421e93720732debeea08c59e63c058d240ab0f7b3a6969654864f SHA512 3980e60ca005e616be264ec5bf6cb920452eec538da266dc0645ec1c340506b864886007b371b96830efa379e8ed9dd9127dc205b45e004705fd5c181d82e538 WHIRLPOOL 9368a53f9284d0f234d6e816f27dd6893338b4c6807f7fa0f44403ec0fbcaea3cc6908f86ad1e528f12351e008e93942f0769779f3c271e46e994d6ea7139b5f
 DIST cjs-3.4.1.tar.gz 425003 SHA256 83254b01984452cc234891768e746f688924fe2904b6c1c76e214528ff44c060 SHA512 aab752aa03862979374bfe883d62968efab6b9137914b7ab9fcca2025bab6a6ae536db59aaee6deeeba06d2ff8c433d7f769ae0a4c0e2542e7c9a58f723d8690 WHIRLPOOL f6206a56b6e5b5984c567e3b8c4f48d3e0305c76da5c4d4320757248566975bddbf4b376118246beb6c447485e03b8a1a836598d215d6ba13a468ae91d6c7901
-DIST cjs-3.4.4.tar.gz 426665 SHA256 e2497bb3eb53a919776a2f4b869dcc2ba3deb09e955433272a8905e7f6ef9bee SHA512 318a1beef6f6a827266170f0c5c1cfaa8bf48908f96e0ce625aee20ddcd648ea967f09f465ed504f21f923830017d3c4a01f62bab26a1cb84181a96131058d33 WHIRLPOOL 8e774188cf6722075e019c8cac255fcae55ba6fc67c24a974ba033002d6faa8f12aad70c789666d14ed3bdcd63965bf60fe5782fa5b537f2b5e16e482f24664a
+DIST cjs-3.4.4.tar.gz 426665 BLAKE2B 18e232b446945ae296d1dcf4b4624ff10b733f023da99315ba9aeee72228e115a634eb7a31a7c6192c3d1bfb8af1cd89488a9e7fe81edfa3a729bd62061e3581 SHA512 318a1beef6f6a827266170f0c5c1cfaa8bf48908f96e0ce625aee20ddcd648ea967f09f465ed504f21f923830017d3c4a01f62bab26a1cb84181a96131058d33
+DIST cjs-3.6.1.tar.gz 426279 BLAKE2B b9d99e06b580b81178d0b4e2e3d854769357f28277500aed9f5bc2672f26ec72f584576c53d7aa6069737ae81bd0b1bf05d56d39c947de1206c506d72c8da075 SHA512 648997c76acb11885a53a73aa456989784fe5f5a12e0f349bce658c1eb3e3ce2b5c576ace488962c9b012fc85c2c3dd828f61f857cc9da7b60ee5fcdd7d25155
diff --git a/gnome-extra/cjs/cjs-3.6.1.ebuild b/gnome-extra/cjs/cjs-3.6.1.ebuild
new file mode 100644
index 000000000000..23afc9055f7d
--- /dev/null
+++ b/gnome-extra/cjs/cjs-3.6.1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools gnome2 pax-utils virtualx
+
+DESCRIPTION="Linux Mint's fork of gjs for Cinnamon"
+HOMEPAGE="http://cinnamon.linuxmint.com/"
+SRC_URI="https://github.com/linuxmint/cjs/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )"
+SLOT="0"
+IUSE="+cairo examples gtk test"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-lang/spidermonkey:38
+	>=dev-libs/glib-2.37.3:2
+	>=dev-libs/gobject-introspection-1.38:=
+	sys-libs/readline:0
+	virtual/libffi
+	cairo? ( x11-libs/cairo[X,glib] )
+	gtk? ( x11-libs/gtk+:3 )
+"
+DEPEND="${RDEPEND}
+	gnome-base/gnome-common
+	sys-devel/gettext
+	virtual/pkgconfig
+	test? ( sys-apps/dbus )
+	sys-devel/autoconf-archive
+"
+# Cinnamon 2.2 does not work with this release.
+RDEPEND="${RDEPEND}
+	!<gnome-extra/cinnamon-2.4
+"
+
+src_prepare() {
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# FIXME: add systemtap/dtrace support, like in glib:2
+	# FIXME: --enable-systemtap installs files in ${D}/${D} for some reason
+	gnome2_src_configure \
+		--disable-systemtap \
+		--disable-dtrace \
+		$(use_with cairo) \
+		$(use_with gtk)
+}
+
+src_test() {
+	virtx emake check
+}
+
+src_install() {
+	# installation sometimes fails in parallel
+	gnome2_src_install -j1
+
+	if use examples; then
+		insinto /usr/share/doc/"${PF}"/examples
+		doins "${S}"/examples/*
+	fi
+
+	# Required for cjs-console to run correctly on PaX systems
+	pax-mark mr "${ED}/usr/bin/cjs-console"
+}
diff --git a/gnome-extra/cjs/metadata.xml b/gnome-extra/cjs/metadata.xml
index 1f87fb620863..9e988588122b 100644
--- a/gnome-extra/cjs/metadata.xml
+++ b/gnome-extra/cjs/metadata.xml
@@ -2,8 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
-        <email>cinnamon@gentoo.org</email>
-        <name>Cinnamon Project</name>
+		<email>cinnamon@gentoo.org</email>
+		<name>Cinnamon Project</name>
 	</maintainer>
 	<upstream>
 		<remote-id type="github">linuxmint/cjs</remote-id>
diff --git a/gnome-extra/libgda/metadata.xml b/gnome-extra/libgda/metadata.xml
index aae12a8f52cf..c72a40986ea2 100644
--- a/gnome-extra/libgda/metadata.xml
+++ b/gnome-extra/libgda/metadata.xml
@@ -1,17 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>gnome@gentoo.org</email>
-    <name>Gentoo GNOME Desktop</name>
-  </maintainer>
-  <use>
-    <flag name="canvas">Enable support for <pkg>x11-libs/goocanvas</pkg></flag>
-    <flag name="http">Enable embedded <pkg>net-libs/libsoup</pkg> based server</flag>
-    <flag name="json">Enable support for JSON format</flag>
-    <flag name="mdb">Enable support for Microsoft Access database using 
-		<pkg>app-office/mdbtools</pkg></flag>
-    <flag name="reports">Install tools for generating graphical reports</flag>
-    <flag name="sourceview">Enable support for <pkg>x11-libs/gtksourceview</pkg></flag>
-  </use>
+	<maintainer type="project">
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
+	<use>
+		<flag name="canvas">Enable support for <pkg>x11-libs/goocanvas</pkg></flag>
+		<flag name="http">Enable embedded <pkg>net-libs/libsoup</pkg> based server</flag>
+		<flag name="json">Enable support for JSON format</flag>
+		<flag name="mdb">Enable support for Microsoft Access database using <pkg>app-office/mdbtools</pkg></flag>
+		<flag name="reports">Install tools for generating graphical reports</flag>
+		<flag name="sourceview">Enable support for <pkg>x11-libs/gtksourceview</pkg></flag>
+	</use>
 </pkgmetadata>
diff --git a/gnome-extra/mousetweaks/metadata.xml b/gnome-extra/mousetweaks/metadata.xml
index 6e38a49d0b0e..9c5233005cb2 100644
--- a/gnome-extra/mousetweaks/metadata.xml
+++ b/gnome-extra/mousetweaks/metadata.xml
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
-<longdescription lang="en">
-Mousetweaks is an Accessibility Software whose developement started as a GSoC
-2007 project under Ubuntu. It brings additional fonctionalities to the pointer
-that allow a user to:
+	<maintainer type="project">
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
+	<longdescription lang="en">
+		Mousetweaks is an Accessibility Software whose developement started as a GSoC
+		2007 project under Ubuntu. It brings additional fonctionalities to the pointer
+		that allow a user to:
 
-    * open the contextual menu by clicking and holding the left button; it is
-	* for example useful for users that can manipulate only one button
-    * perform the 4 click types (left click, double click, drag click and
-	* right click) by software; it is for example useful for users that are
-	* not able to manipulate any button
-	* to lock the pointer temporarily into an area on the screen; it is
-	* for example useful for people that have to use their pointing
-	* hardware not only for the computer
-</longdescription>
+		* open the contextual menu by clicking and holding the left button; it is
+		* for example useful for users that can manipulate only one button
+		* perform the 4 click types (left click, double click, drag click and
+		* right click) by software; it is for example useful for users that are
+		* not able to manipulate any button
+		* to lock the pointer temporarily into an area on the screen; it is
+		* for example useful for people that have to use their pointing
+		* hardware not only for the computer
+	</longdescription>
 </pkgmetadata>
diff --git a/gnome-extra/nemo/Manifest b/gnome-extra/nemo/Manifest
index 95edd704c060..936c73b5b5c5 100644
--- a/gnome-extra/nemo/Manifest
+++ b/gnome-extra/nemo/Manifest
@@ -2,4 +2,5 @@ DIST nemo-2.8.7.tar.gz 1413445 SHA256 79ca0e28b43ebb701a6449424be1be4224e9014bf1
 DIST nemo-3.0.6.tar.gz 1363302 SHA256 3a2704e110a30625f9e807d21df44a577606d383c1eaf1ef4dae0e4dd321cdec SHA512 a2741b13dd258c843a2b9096f6b3aca3cb22647e2d5e6b18013857bbbb4e9aceccbc80713365aff0d25faa31727ff86ec4a86dac2dd8a556cb0a6dc3346f7be2 WHIRLPOOL 9044e85af7e9fadb9ce56f33d0ba63c5f39cbcf8dce2df4850474f03fde440c8ed1e52bc50e92804f4269e2d3c4563760512a23323e1120db3b7ea39d37ed211
 DIST nemo-3.2.0.tar.gz 1365508 SHA256 84c5b0a1999c1b2ab08bd6933aa7c5bc18bb2805e52f2d7fdf2af644cd7cc8ac SHA512 0f238dca5849c9ad333592772588fd7ef5b572056f74794940c2ed6cd099f98587edea364221d5c5281918df21622780567993c051fc4f6adaf8e09ed63356b9 WHIRLPOOL 798856f8d014f1dfacd833a68f465795e33a48ebbabe9cc8ec9ff7c8851bc62576f28a75cbda8460002d01d115cc765ea40a4260a8274c7d3eee3f7d8ed3d0a2
 DIST nemo-3.4.4.tar.gz 1417650 SHA256 1ed1c4263c6c436bacbf70e2093c66f27c5ea9338d1b793df4dacd84993a9742 SHA512 f2056653a2ac1e26cd8da2226acbc05046988f2f051b72ed267f572ad010a6bd4d7d1ef39ee732cebb7a05dd3d88053bfe2cdc3aee31c20eac29a8f659bcd67b WHIRLPOOL 563a8b81b742b44e39d30dd642f0c428167c13aa2b78fa3e1f73663276ae3be60178a8ac7a5308206bacb797419970187447ddc33dfcbd26d80fc4b20c2ddc22
-DIST nemo-3.4.7.tar.gz 1422209 SHA256 73ca1cd22eaa229bcd87a74fdcf32ba58f1eb1e0376f12775870b6d1260550a1 SHA512 75f84e4c4f60c01a003ec413493107fa0ff02d3dcdb5772dd31b726905de1d49679b294e4760e5806b982c8a9e3fcd6411dc7deb3091545d74b688afaae39bbe WHIRLPOOL 923d52c297ebd870f334eae52a8913ff8f4c923bb320103e43e3ff75f6713074b18022d85eb3a9ab5b73459a9f8bba801f5a8a390b97d95e217b17c5437fc9bd
+DIST nemo-3.4.7.tar.gz 1422209 BLAKE2B 5ac6bdda0822850a61b61649258af793f514d6a5fb90143c58c52370210f65bdda53d40b911fafc369123739f3bab6b4a3be32efeb58c6f48fa8eb4e3a8b1731 SHA512 75f84e4c4f60c01a003ec413493107fa0ff02d3dcdb5772dd31b726905de1d49679b294e4760e5806b982c8a9e3fcd6411dc7deb3091545d74b688afaae39bbe
+DIST nemo-3.6.4.tar.gz 1433265 BLAKE2B 0640ad5e803d955072d0773ef3ea20739d6189720defbf3db6fc48da503b7cb72f8c33302542799933499f2f5c0e28c8e706da77f9943362e7db23eb9c4d6a21 SHA512 a8541e8944ce44b3f62ad0211c550509704f3210ce4aaaebcaefcb50a358f018eb01fba26d18ea8edbd662dab2b915fb7c4f4704e8468f6b9b3f4b636bf0d87e
diff --git a/gnome-extra/nemo/metadata.xml b/gnome-extra/nemo/metadata.xml
index d6f98f80633e..b3526b807770 100644
--- a/gnome-extra/nemo/metadata.xml
+++ b/gnome-extra/nemo/metadata.xml
@@ -2,12 +2,11 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
-        <email>cinnamon@gentoo.org</email>
-        <name>Cinnamon Project</name>
+		<email>cinnamon@gentoo.org</email>
+		<name>Cinnamon Project</name>
 	</maintainer>
 	<use>
-		<flag name="packagekit">Use packagekit to search for programs to open
-		unknown file types</flag>
+		<flag name="packagekit">Use packagekit to search for programs to open unknown file types</flag>
 		<flag name="tracker">Add support for <pkg>app-misc/tracker</pkg> search</flag>
 	</use>
 	<upstream>
diff --git a/gnome-extra/nemo/nemo-3.6.4.ebuild b/gnome-extra/nemo/nemo-3.6.4.ebuild
new file mode 100644
index 000000000000..6332a6dd879f
--- /dev/null
+++ b/gnome-extra/nemo/nemo-3.6.4.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit autotools eutils gnome2 python-any-r1 virtualx
+
+DESCRIPTION="A file manager for Cinnamon, forked from Nautilus"
+HOMEPAGE="http://cinnamon.linuxmint.com/"
+SRC_URI="https://github.com/linuxmint/nemo/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+ LGPL-2+ FDL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="exif +introspection +nls packagekit tracker xmp"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.37.3:2[dbus]
+	>=gnome-extra/cinnamon-desktop-2.6.1:0=
+	>=x11-libs/pango-1.28.3
+	>=x11-libs/gtk+-3.9.10:3[introspection?]
+	>=dev-libs/libxml2-2.7.8:2
+
+	gnome-base/dconf:0=
+	gnome-base/gsettings-desktop-schemas
+	>=x11-libs/libnotify-0.7:=
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXrender
+	>=x11-libs/xapps-1.0.4
+
+	exif? ( >=media-libs/libexif-0.6.20:= )
+	introspection? ( >=dev-libs/gobject-introspection-0.6.4:= )
+	tracker? ( >=app-misc/tracker-0.12:= )
+	xmp? ( >=media-libs/exempi-2.2.0:= )
+	sys-libs/libselinux
+"
+RDEPEND="${COMMON_DEPEND}
+	x11-themes/adwaita-icon-theme
+	nls? ( >=gnome-extra/cinnamon-translations-2.2 )
+"
+
+PDEPEND=">=gnome-base/gvfs-0.1.2"
+
+DEPEND="${COMMON_DEPEND}
+	${PYTHON_DEPS}
+	$(python_gen_any_dep '
+		dev-python/polib[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+	')
+	>=dev-lang/perl-5
+	>=dev-util/gdbus-codegen-2.31.0
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.40.1
+	sys-devel/gettext
+	virtual/pkgconfig
+	x11-proto/xproto
+
+	dev-util/gtk-doc
+	gnome-base/gnome-common
+"
+# For eautoreconf
+#	gnome-base/gnome-common, dev-util/gtk-doc (not only -am!)
+
+src_prepare() {
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		$(use_enable exif libexif) \
+		$(use_enable introspection) \
+		$(use_enable tracker) \
+		$(use_enable xmp)
+}
+
+src_test() {
+	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/libnemo-private" || die
+
+	cd src # we don't care about translation tests
+	GSETTINGS_SCHEMA_DIR="${S}/libnemo-private" virtx emake check
+}
diff --git a/gnome-extra/office-runner/metadata.xml b/gnome-extra/office-runner/metadata.xml
index 11ae369033d5..77410621ce8c 100644
--- a/gnome-extra/office-runner/metadata.xml
+++ b/gnome-extra/office-runner/metadata.xml
@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
-<longdescription lang="en">A tool in the form of a lighthearted game that
-  temporarily inhibits GNOME's default suspend on lid close behavior,
-  allowing the user to move his laptop with the lid closed without dropping
-  network connections.
-</longdescription>
+	<maintainer type="project">
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
+	<longdescription lang="en">
+		A tool in the form of a lighthearted game that
+		temporarily inhibits GNOME's default suspend on lid close behavior,
+		allowing the user to move his laptop with the lid closed without dropping
+		network connections.
+	</longdescription>
 </pkgmetadata>
diff --git a/kde-frameworks/Manifest.gz b/kde-frameworks/Manifest.gz
index 4e8f5282a5f9..f524f93567b5 100644
Binary files a/kde-frameworks/Manifest.gz and b/kde-frameworks/Manifest.gz differ
diff --git a/kde-frameworks/kio/Manifest b/kde-frameworks/kio/Manifest
index 6cdc8304cb1b..20bed421afaa 100644
--- a/kde-frameworks/kio/Manifest
+++ b/kde-frameworks/kio/Manifest
@@ -1,2 +1,2 @@
 DIST kio-5.37.0.tar.xz 3084204 SHA256 49448ebcfe182805f8f9cd40c1e2c8e686578cc2e7fa3688204d5ca4e182ac5b SHA512 42b2cbf6cbc414a0b69fdb36984d13574b1aee033170761dc55835cace44abead82f387f8afb35d8a82ee93a1909854ef43cff29d45c5881c4b13ca8862d2a64 WHIRLPOOL 649b16ebf5708d410d826a70726a9fdfd3668e00784246e7cb4d193b1951525e821046121886580bc16004280170277ac0344d1ee18afb91722e095118b1ccd6
-DIST kio-5.40.0.tar.xz 3100424 SHA256 30ea0b231b995faaf4283b9c9ecfaffb589268f5d7b5b805f69ed95601ac389b SHA512 e35a7fed3c38f91c056d5ac04b4839ebbf199e4509187e997d6d8a217175a9dc442c7beacccf333ec092c0d110f8f008144293364006888f25b570d697c10bed WHIRLPOOL cfae3b3dc85f1398217c934943829dc28d2b7bfefe6d8adb5a082593f66127b313652b34278e6e4d612b266f7df8b03462a5ae8ac71af5685ad9641c08181b3a
+DIST kio-5.40.0.tar.xz 3100424 BLAKE2B 27f69f10febc327d1f935e2b8f3c24dc8b64e85ef35830841f99fdefb6238f590dc8a1284bd0896d6e0e2eb86f123e6788ebd277ca208df18312e8ac475221dc SHA512 e35a7fed3c38f91c056d5ac04b4839ebbf199e4509187e997d6d8a217175a9dc442c7beacccf333ec092c0d110f8f008144293364006888f25b570d697c10bed
diff --git a/kde-frameworks/kio/files/kio-5.40.0-mkpath-qt-5.9.3.patch b/kde-frameworks/kio/files/kio-5.40.0-mkpath-qt-5.9.3.patch
new file mode 100644
index 000000000000..d9cf7402741d
--- /dev/null
+++ b/kde-frameworks/kio/files/kio-5.40.0-mkpath-qt-5.9.3.patch
@@ -0,0 +1,65 @@
+From 2353119aae8f03565bc7779ed1d597d266f5afda Mon Sep 17 00:00:00 2001
+From: Elvis Angelaccio <elvis.angelaccio@kde.org>
+Date: Thu, 16 Nov 2017 10:41:19 +0100
+Subject: Fix KIO::mkpath with qtbase 5.10 beta 4
+
+Summary:
+The latest Qt 5.10 beta includes [1] which breaks a bunch of unit tests,
+since `url.setPath("//foo")` will now result in an invalid (empty) QUrl.
+
+This patch fixes the KIO::mkpath() case.
+
+[1]: http://code.qt.io/cgit/qt/qtbase.git/commit/?id=f62768d046528636789f901ac79e2cfa1843a7b7
+
+Test Plan:
+
+* I can now create folders from dolphin and plasma.
+* fileundomanagertest and mkpathjobtest no longer fail
+
+Reviewers: #frameworks, dfaure
+
+Tags: #frameworks
+
+Differential Revision: https://phabricator.kde.org/D8836
+---
+ src/core/mkpathjob.cpp | 17 ++++++++++++++---
+ 1 file changed, 14 insertions(+), 3 deletions(-)
+
+diff --git a/src/core/mkpathjob.cpp b/src/core/mkpathjob.cpp
+index bff46ca..a177805 100644
+--- a/src/core/mkpathjob.cpp
++++ b/src/core/mkpathjob.cpp
+@@ -43,8 +43,13 @@ public:
+         m_url.setPath(QStringLiteral("/"));
+         int i = 0;
+         for (; i < basePathComponents.count() && i < m_pathComponents.count(); ++i) {
+-            if (m_pathComponents.at(i) == basePathComponents.at(i)) {
+-                m_url.setPath(m_url.path() + '/' + m_pathComponents.at(i));
++            const QString pathComponent = m_pathComponents.at(i);
++            if (pathComponent == basePathComponents.at(i)) {
++                if (m_url.path() == QLatin1Char('/')) {
++                    m_url.setPath(m_url.path() + pathComponent);
++                } else {
++                    m_url.setPath(m_url.path() + '/' + pathComponent);
++                }
+             } else {
+                 break;
+             }
+@@ -57,7 +62,13 @@ public:
+         if (m_url.isLocalFile()) {
+             i = 0;
+             for (; i < m_pathComponents.count(); ++i) {
+-                QString testDir = m_url.toLocalFile() + '/' + m_pathComponents.at(i);
++                const QString localFile = m_url.toLocalFile();
++                QString testDir;
++                if (localFile == QLatin1Char('/')) {
++                    testDir = localFile + m_pathComponents.at(i);
++                } else {
++                    testDir = localFile + '/' + m_pathComponents.at(i);
++                }
+                 if (QFileInfo(testDir).isDir()) {
+                     m_url.setPath(testDir);
+                 } else {
+-- 
+cgit v0.11.2
+
diff --git a/kde-frameworks/kio/kio-5.40.0-r1.ebuild b/kde-frameworks/kio/kio-5.40.0-r1.ebuild
new file mode 100644
index 000000000000..014388b99351
--- /dev/null
+++ b/kde-frameworks/kio/kio-5.40.0-r1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework providing transparent file and data management"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="acl +handbook kerberos +kwallet X"
+
+RDEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kbookmarks)
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep solid)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork 'ssl')
+	$(add_qt_dep qtscript)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	dev-libs/libxml2
+	dev-libs/libxslt
+	acl? (
+		sys-apps/attr
+		virtual/acl
+	)
+	kerberos? ( virtual/krb5 )
+	kwallet? ( $(add_frameworks_dep kwallet) )
+	X? ( $(add_qt_dep qtx11extras) )
+"
+DEPEND="${RDEPEND}
+	$(add_qt_dep qtconcurrent)
+	handbook? ( $(add_frameworks_dep kdoctools) )
+	test? ( sys-libs/zlib )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXrender
+		x11-proto/xproto
+	)
+"
+PDEPEND="
+	$(add_frameworks_dep kded)
+"
+
+PATCHES=( "${FILESDIR}/${P}-mkpath-qt-5.9.3.patch" )
+
+# tests hang
+RESTRICT+=" test"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package acl ACL)
+		$(cmake-utils_use_find_package handbook KF5DocTools)
+		$(cmake-utils_use_find_package kerberos GSSAPI)
+		$(cmake-utils_use_find_package kwallet KF5Wallet)
+		$(cmake-utils_use_find_package X X11)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-misc/Manifest.gz b/kde-misc/Manifest.gz
index 887874183e09..09080492c77f 100644
Binary files a/kde-misc/Manifest.gz and b/kde-misc/Manifest.gz differ
diff --git a/kde-misc/tellico/Manifest b/kde-misc/tellico/Manifest
index c7e2019c112d..694ebdd25fcc 100644
--- a/kde-misc/tellico/Manifest
+++ b/kde-misc/tellico/Manifest
@@ -1,2 +1 @@
-DIST tellico-3.0.2.tar.xz 5492348 SHA256 455b0b24e2046e0a4919677719c4e2dcb1d8076cb49617c4f4fe5908ee40768b SHA512 68ac3063cd12bb59368b6106fe8e580afebeb61dd6db0fbef1751f5d6ed0c9bed04456a5cf1fb7fcfdc52be936670831eb766073a2c370148cf3e89907615a8f WHIRLPOOL 28af59c9add426ebf857a7ff14a91b95cfd093b46568bd2d7d3d4abfa0ed6282a4f3dc0912133e149a2680aab6a17e37e5a0cf21fcd388cf288148a52b95f46d
-DIST tellico-3.1.tar.xz 5559552 SHA256 ca549c249ee2562ef583a2b2dedc76843660ff726ed2cd26025dd4607b59a124 SHA512 6b3ad53bede52564ebd6bdf567d0da290cc77c1ee86c802314a194a680dc7cdc8d097b687f2562c95b72a5cf494e7be024fc00240b7bc2eb01aa7792febd40ad WHIRLPOOL 42f357e060aec411f267e08ff7d2983fc8a99aaee455675ce70c62f17880b5a685a578ac5a74d331b4dcb24434a5f75c87b9d9a49cc955f388a8ef757bab4823
+DIST tellico-3.1.tar.xz 5559552 BLAKE2B 4512ea0780abf0ffae665099318c143b3979904a8a72806f440aa79456de63f8ce76c83c1ae7768405eab72129c4ad60f93ab21f32577e5a655595d0631b4d1c SHA512 6b3ad53bede52564ebd6bdf567d0da290cc77c1ee86c802314a194a680dc7cdc8d097b687f2562c95b72a5cf494e7be024fc00240b7bc2eb01aa7792febd40ad
diff --git a/kde-misc/tellico/tellico-3.0.2.ebuild b/kde-misc/tellico/tellico-3.0.2.ebuild
deleted file mode 100644
index 97f056c40841..000000000000
--- a/kde-misc/tellico/tellico-3.0.2.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="A collection manager based on KDE Frameworks"
-HOMEPAGE="http://tellico-project.org/"
-SRC_URI="http://tellico-project.org/files/${P}.tar.xz"
-
-LICENSE="|| ( GPL-2 GPL-3 )"
-KEYWORDS="amd64 x86"
-IUSE="cddb discid pdf scanner semantic-desktop taglib v4l xmp yaz"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep khtml)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep solid)
-	$(add_frameworks_dep sonnet)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	>=dev-perl/Text-BibTeX-0.780.0-r1
-	dev-libs/libxml2
-	dev-libs/libxslt
-	cddb? ( $(add_kdeapps_dep libkcddb) )
-	discid? ( media-libs/libdiscid )
-	pdf? ( app-text/poppler[qt5] )
-	scanner? ( $(add_kdeapps_dep libksane) )
-	semantic-desktop? ( $(add_frameworks_dep kfilemetadata) )
-	taglib? ( >=media-libs/taglib-1.5 )
-	v4l? ( >=media-libs/libv4l-0.8.3 )
-	xmp? ( >=media-libs/exempi-2 )
-	yaz? ( >=dev-libs/yaz-2:0 )
-"
-DEPEND="${COMMON_DEPEND}
-	sys-devel/gettext
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-misc/tellico:4
-"
-
-# tests need network access
-RESTRICT="test"
-
-DOCS=( AUTHORS ChangeLog README )
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_Csv=ON
-		$(cmake-utils_use_find_package cddb KF5Cddb)
-		$(cmake-utils_use_find_package discid DiscID)
-		$(cmake-utils_use_find_package pdf PopplerQt5)
-		$(cmake-utils_use_find_package scanner KF5Sane)
-		$(cmake-utils_use_find_package semantic-desktop KF5FileMetaData)
-		$(cmake-utils_use_find_package taglib Taglib)
-		-DENABLE_WEBCAM=$(usex v4l)
-		$(cmake-utils_use_find_package xmp Exempi)
-		$(cmake-utils_use_find_package yaz Yaz)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-misc/tellico/tellico-3.1.ebuild b/kde-misc/tellico/tellico-3.1.ebuild
index 65249033f944..528c524070a8 100644
--- a/kde-misc/tellico/tellico-3.1.ebuild
+++ b/kde-misc/tellico/tellico-3.1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://tellico-project.org/"
 SRC_URI="http://tellico-project.org/files/${P}.tar.xz"
 
 LICENSE="|| ( GPL-2 GPL-3 )"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="cddb discid pdf scanner semantic-desktop taglib v4l xmp yaz"
 
 COMMON_DEPEND="
diff --git a/mail-client/Manifest.gz b/mail-client/Manifest.gz
index fc6c0c5bb494..28ed64c6da6d 100644
Binary files a/mail-client/Manifest.gz and b/mail-client/Manifest.gz differ
diff --git a/mail-client/clawsker/metadata.xml b/mail-client/clawsker/metadata.xml
index bbceac2e8e2f..1c3bc7b3fcef 100644
--- a/mail-client/clawsker/metadata.xml
+++ b/mail-client/clawsker/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	  <email>net-mail@gentoo.org</email>
-	  <name>Net-Mail</name>
+	<maintainer type="project">
+		<email>net-mail@gentoo.org</email>
+		<name>Net-Mail</name>
 	</maintainer>
 </pkgmetadata>
diff --git a/mail-filter/MailScanner/metadata.xml b/mail-filter/MailScanner/metadata.xml
index 385e86109fe5..7c83ac4c13b3 100644
--- a/mail-filter/MailScanner/metadata.xml
+++ b/mail-filter/MailScanner/metadata.xml
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-  <email>patrick@gentoo.org</email>
-  <name>Patrick Lauer</name>
-</maintainer>
-<use>
-	<flag name="exim">Set <pkg>mail-mta/exim</pkg> to used MTA</flag>
-	<flag name="postfix">Set <pkg>mail-mta/postfix</pkg> to used MTA</flag>
-	<flag name="spamassassin">Enable usage of
-		<pkg>mail-filter/spamassassin</pkg> for spam protection</flag>
-</use>
+	<maintainer type="person">
+		<email>patrick@gentoo.org</email>
+		<name>Patrick Lauer</name>
+	</maintainer>
+	<use>
+		<flag name="exim">Set <pkg>mail-mta/exim</pkg> to used MTA</flag>
+		<flag name="postfix">Set <pkg>mail-mta/postfix</pkg> to used MTA</flag>
+		<flag name="spamassassin">Enable usage of <pkg>mail-filter/spamassassin</pkg> for spam protection</flag>
+	</use>
 </pkgmetadata>
diff --git a/mail-filter/Manifest.gz b/mail-filter/Manifest.gz
index 2727680717a1..aa27c4f95851 100644
Binary files a/mail-filter/Manifest.gz and b/mail-filter/Manifest.gz differ
diff --git a/mail-filter/postfwd/metadata.xml b/mail-filter/postfwd/metadata.xml
index 080f469f5bf5..e192a97b4308 100644
--- a/mail-filter/postfwd/metadata.xml
+++ b/mail-filter/postfwd/metadata.xml
@@ -10,14 +10,14 @@
 		<name>Marc Schiffbauer</name>
 	</maintainer>
 	<maintainer type="project">
-	    <email>proxy-maint@gentoo.org</email>
-	    <name>Proxy Maintainers</name>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
 	</maintainer>
 	<upstream>
-	    <maintainer status="active">
+		<maintainer status="active">
 			<email>info@postfwd.org</email>
 			<name>Jan Peter Kessler</name>
-	    </maintainer>
+		</maintainer>
 		<changelog>http://www.postfwd.org/postfwd2.CHANGELOG</changelog>
 	</upstream>
 	<longdescription lang="en">
diff --git a/mail-filter/postgrey/metadata.xml b/mail-filter/postgrey/metadata.xml
index 7c7830fef769..3411c7dc111a 100644
--- a/mail-filter/postgrey/metadata.xml
+++ b/mail-filter/postgrey/metadata.xml
@@ -1,20 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-	<email>lists@xunil.at</email>
-	<name>Stefan Weichinger</name>
-  </maintainer>
-<maintainer type="project">
-	  <email>net-mail@gentoo.org</email>
-	  <name>Net-Mail</name>
-  </maintainer>
-<maintainer type="project">
-	  <email>proxy-maint@gentoo.org</email>
-	  <name>Proxy Maintainers</name>
-  </maintainer>
-<longdescription>Postgrey is a Postfix policy server implementing greylisting developed by David Schweikert at the ISG.EE.</longdescription>
-<use>
-	<flag name="targrey">Enables the targrey patch</flag>
-</use>
+	<maintainer type="person">
+		<email>lists@xunil.at</email>
+		<name>Stefan Weichinger</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>net-mail@gentoo.org</email>
+		<name>Net-Mail</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription>
+		Postgrey is a Postfix policy server implementing greylisting developed by David Schweikert at the ISG.EE.
+	</longdescription>
+	<use>
+		<flag name="targrey">Enables the targrey patch</flag>
+	</use>
 </pkgmetadata>
diff --git a/mail-filter/rspamd/metadata.xml b/mail-filter/rspamd/metadata.xml
index b8b89d3d8a9c..458ce07c1fe4 100644
--- a/mail-filter/rspamd/metadata.xml
+++ b/mail-filter/rspamd/metadata.xml
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>c@roessner.co</email>
-    <name>Christian Roessner</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>proxy-maint@gentoo.org</email>
-	<name>Proxy Maintainers</name>
-  </maintainer>
-  <maintainer type="person">
-    <email>djc@gentoo.org</email>
-    <name>Dirkjan Ochtman</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">vstakhov/rspamd</remote-id>
-  </upstream>
-  <use>
-    <flag name="fann">Enable neural network plugin (requires <pkg>sci-mathematics/fann</pkg>).</flag>
-    <flag name="jemalloc">Use dev-libs/jemalloc for allocations</flag>
-    <flag name="pcre2">Use dev-libs/libpcre2</flag>
-  </use>
+	<maintainer type="person">
+		<email>c@roessner.co</email>
+		<name>Christian Roessner</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>djc@gentoo.org</email>
+		<name>Dirkjan Ochtman</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">vstakhov/rspamd</remote-id>
+	</upstream>
+	<use>
+		<flag name="fann">Enable neural network plugin (requires <pkg>sci-mathematics/fann</pkg>).</flag>
+		<flag name="jemalloc">Use dev-libs/jemalloc for allocations</flag>
+		<flag name="pcre2">Use dev-libs/libpcre2</flag>
+	</use>
 </pkgmetadata>
diff --git a/mail-mta/Manifest.gz b/mail-mta/Manifest.gz
index 66453f551a31..2b685382b59b 100644
Binary files a/mail-mta/Manifest.gz and b/mail-mta/Manifest.gz differ
diff --git a/mail-mta/exim/Manifest b/mail-mta/exim/Manifest
index bfccbae830e6..7a9008eda45a 100644
--- a/mail-mta/exim/Manifest
+++ b/mail-mta/exim/Manifest
@@ -1,3 +1,3 @@
-DIST exim-4.89.tar.bz2 1844430 SHA256 912f2ee03c8dba06a3a4c0ee40522d367e1b65dc59e38dfcc1f5d9eecff51ab0 SHA512 1e059966a93b47f055ab4ec2a4556f2c918aff56ea0367585f3a853f00411e9c275e13be4f9ae615a468fa06263135cd6a138fa1753f1b7fb3259a3321fcca65 WHIRLPOOL d0b30cde5cf2dbe278d393eae70e40a3861a153a2411f98f73a7ae43881032cc3e0f15163b09e17d61c09e673c2e766371c80533908af3460f483a5c18dff80f
-DIST exim-pdf-4.89.tar.bz2 1924606 SHA256 17d70ef5b2814f725633efcf339bcb49ac9564ecd648e0e3d010b5e43d6c167d SHA512 b04ea2e4dcdb1aaf52ef77ccd76e6599c68c4c6e5a98090720dbd3c50f7191bf3f6cd7dc2089a765c47576311780809cff547f85f004caec411d0f1ac9985299 WHIRLPOOL 4ab5bc7bdbbfc998ae7ee63f19449d051a1d7183f9b70297db100f44b82df2cca0853c309ddfccafee2d44cd1228258e06628ed82dab76de851bec856321c58f
-DIST system_filter.exim.gz 3075 SHA256 3a3471b486a09e0a0153f7b520e1eaf26d21b97d73ea8348bdc593c00eb1e437 SHA512 cb358d3ce2499a0bb5920d962a06f2af8486e55ec90c8c928bd8e3aefb279aa57f5f960d5adfcef68bd94110b405eaa144e9629cfe6014a529c79c544600bbf3 WHIRLPOOL ce68d9c18b24eca3ef97ea810964cc1ada5f85b795a7c432ad39b5788188a16419101c92fb52b418738d760e1d658f7a41485e5561079a667d84d276c71be5a4
+DIST exim-4.89.tar.bz2 1844430 BLAKE2B 255bb3f27a264d92bf4664cf1278beabffa888006dfc0b31cde8a04d62501b0fe282db5b959bd303e2a818322716548c97264842130b8d5c3b9075615f668ca7 SHA512 1e059966a93b47f055ab4ec2a4556f2c918aff56ea0367585f3a853f00411e9c275e13be4f9ae615a468fa06263135cd6a138fa1753f1b7fb3259a3321fcca65
+DIST exim-pdf-4.89.tar.bz2 1924606 BLAKE2B f03182d51f4cc5b71cb65c2e0bcf74142f8110b6bfbd5b0fc05e321b692ebde5dbc84c4562a39ee85065f4d2db0654e6a189c826bfdea19051f56969d4ca74e2 SHA512 b04ea2e4dcdb1aaf52ef77ccd76e6599c68c4c6e5a98090720dbd3c50f7191bf3f6cd7dc2089a765c47576311780809cff547f85f004caec411d0f1ac9985299
+DIST system_filter.exim.gz 3075 BLAKE2B d05e872b5cef377d29126cda03fc0a74c8777b2119b76ff43da6e8de808035eb9bfcb034a85d81824f135d484e864bfc0629fc1af2c228a7277d5ee7cf9cde79 SHA512 cb358d3ce2499a0bb5920d962a06f2af8486e55ec90c8c928bd8e3aefb279aa57f5f960d5adfcef68bd94110b405eaa144e9629cfe6014a529c79c544600bbf3
diff --git a/mail-mta/exim/exim-4.89-r4.ebuild b/mail-mta/exim/exim-4.89-r4.ebuild
new file mode 100644
index 000000000000..14b6181d4cb4
--- /dev/null
+++ b/mail-mta/exim/exim-4.89-r4.ebuild
@@ -0,0 +1,531 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit eutils toolchain-funcs multilib pam systemd
+
+IUSE="dane dcc +dkim dlfunc dmarc +dnsdb doc dovecot-sasl dsn exiscan-acl gnutls ipv6 ldap libressl lmtp maildir mbx mysql nis pam perl pkcs11 postgres +prdr proxy radius redis sasl selinux spf sqlite srs ssl syslog tcpd tpda X elibc_glibc"
+REQUIRED_USE="
+	dane? ( !gnutls )
+	dmarc? ( spf dkim )
+	pkcs11? ( gnutls )
+	spf? ( exiscan-acl )
+	srs? ( exiscan-acl )
+"
+
+COMM_URI="ftp://ftp.exim.org/pub/exim/exim4$([[ ${PV} == *_rc* ]] && echo /test)"
+
+DESCRIPTION="A highly configurable, drop-in replacement for sendmail"
+SRC_URI="${COMM_URI}/${P//rc/RC}.tar.bz2
+	mirror://gentoo/system_filter.exim.gz
+	doc? ( ${COMM_URI}/${PN}-pdf-${PV//rc/RC}.tar.bz2 )"
+HOMEPAGE="http://www.exim.org/"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-solaris"
+
+COMMON_DEPEND=">=sys-apps/sed-4.0.5
+	>=sys-libs/db-3.2:=
+	dev-libs/libpcre
+	perl? ( dev-lang/perl:= )
+	pam? ( virtual/pam )
+	tcpd? ( sys-apps/tcp-wrappers )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+	gnutls? ( net-libs/gnutls[pkcs11?]
+			  dev-libs/libtasn1 )
+	ldap? ( >=net-nds/openldap-2.0.7 )
+	nis? ( elibc_glibc? ( || (
+		<sys-libs/glibc-2.23
+		>=sys-libs/glibc-2.23[rpc]
+	) ) )
+	mysql? ( virtual/libmysqlclient )
+	postgres? ( dev-db/postgresql:= )
+	sasl? ( >=dev-libs/cyrus-sasl-2.1.26-r2 )
+	redis? ( dev-libs/hiredis )
+	spf? ( >=mail-filter/libspf2-1.2.5-r1 )
+	dmarc? ( mail-filter/opendmarc )
+	srs? ( mail-filter/libsrs_alt )
+	X? ( x11-proto/xproto
+		x11-libs/libX11
+		x11-libs/libXmu
+		x11-libs/libXt
+		x11-libs/libXaw
+	)
+	sqlite? ( dev-db/sqlite )
+	radius? ( net-dialup/freeradius-client )
+	virtual/libiconv
+	"
+	# added X check for #57206
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig"
+RDEPEND="${COMMON_DEPEND}
+	!mail-mta/courier
+	!mail-mta/esmtp
+	!mail-mta/mini-qmail
+	!<mail-mta/msmtp-1.4.19-r1
+	!>=mail-mta/msmtp-1.4.19-r1[mta]
+	!mail-mta/netqmail
+	!mail-mta/nullmailer
+	!mail-mta/postfix
+	!mail-mta/qmail-ldap
+	!mail-mta/sendmail
+	!mail-mta/opensmtpd
+	!<mail-mta/ssmtp-2.64-r2
+	!>=mail-mta/ssmtp-2.64-r2[mta]
+	!net-mail/mailwrapper
+	>=net-mail/mailbase-0.00-r5
+	virtual/logger
+	dcc? ( mail-filter/dcc )
+	selinux? ( sec-policy/selinux-exim )
+	"
+
+S=${WORKDIR}/${P//rc/RC}
+
+src_prepare() {
+	epatch "${FILESDIR}"/exim-4.14-tail.patch
+	epatch "${FILESDIR}"/exim-4.74-localscan_dlopen.patch
+	epatch "${FILESDIR}"/exim-4.69-r1.27021.patch
+	epatch "${FILESDIR}"/exim-4.74-radius-db-ENV-clash.patch # 287426
+	epatch "${FILESDIR}"/exim-4.82-makefile-freebsd.patch # 235785
+	epatch "${FILESDIR}"/exim-4.89-as-needed-ldflags.patch # 352265, 391279
+	epatch "${FILESDIR}"/exim-4.76-crosscompile.patch # 266591
+	epatch "${FILESDIR}"/exim-4.89-CVE-2017-1000369.patch # 622212
+	epatch "${FILESDIR}"/${P}-transport-crash.patch # from git/in next release
+	epatch "${FILESDIR}"/${P}-address-expando-crash.patch # from git/in next release
+	epatch "${FILESDIR}"/${P}-CVE-2017-16943.patch # from git/in next release
+
+	if use maildir ; then
+		epatch "${FILESDIR}"/exim-4.20-maildir.patch
+	else
+		epatch "${FILESDIR}"/exim-4.80-spool-mail-group.patch # 438606
+	fi
+
+	eapply_user
+
+	# user Exim believes it should be
+	MAILUSER=mail
+	MAILGROUP=mail
+	if use prefix && [[ ${EUID} != 0 ]] ; then
+		MAILUSER=$(id -un)
+		MAILGROUP=$(id -gn)
+	fi
+}
+
+src_configure() {
+	# general config and paths
+
+	sed -i.orig \
+		-e "/SYSTEM_ALIASES_FILE/s'SYSTEM_ALIASES_FILE'${EPREFIX}/etc/mail/aliases'" \
+		"${S}"/src/configure.default || die
+
+	sed -i -e 's/^buildname=.*/buildname=exim-gentoo/g' Makefile || die
+
+	sed -e "48i\CFLAGS=${CFLAGS}" \
+		-e "s:BIN_DIRECTORY=/usr/exim/bin:BIN_DIRECTORY=${EPREFIX}/usr/sbin:" \
+		-e "s:EXIM_USER=:EXIM_USER=${MAILUSER}:" \
+		-e "s:CONFIGURE_FILE=/usr/exim/configure:CONFIGURE_FILE=${EPREFIX}/etc/exim/exim.conf:" \
+		-e "s:ZCAT_COMMAND=.*$:ZCAT_COMMAND=${EPREFIX}/bin/zcat:" \
+		-e "s:COMPRESS_COMMAND=.*$:COMPRESS_COMMAND=${EPREFIX}/bin/gzip:" \
+		src/EDITME > Local/Makefile
+
+	if use elibc_musl; then
+		sed -e 's/^LIBS = -lnsl/LIBS =/g' \
+		-i OS/Makefile-Linux
+	fi
+
+	cd Local
+
+	cat >> Makefile <<- EOC
+		INFO_DIRECTORY=${EPREFIX}/usr/share/info
+		PID_FILE_PATH=${EPREFIX}/run/exim.pid
+		SPOOL_DIRECTORY=${EPREFIX}/var/spool/exim
+		HAVE_ICONV=yes
+	EOC
+
+	# if we use libiconv, now is the time to tell so
+	use !elibc_glibc && use !elibc_musl && echo "EXTRALIBS_EXIM=-liconv" >> Makefile
+
+	# support for IPv6
+	if use ipv6; then
+		cat >> Makefile <<- EOC
+			HAVE_IPV6=YES
+		EOC
+	fi
+
+	#
+	# mail storage formats
+
+	# mailstore is Exim's traditional storage format
+	cat >> Makefile <<- EOC
+		SUPPORT_MAILSTORE=yes
+	EOC
+
+	# mbox
+	if use mbx; then
+		cat >> Makefile <<- EOC
+			SUPPORT_MBX=yes
+		EOC
+	fi
+
+	# maildir
+	if use maildir; then
+		cat >> Makefile <<- EOC
+			SUPPORT_MAILDIR=yes
+		EOC
+	fi
+
+	#
+	# lookup methods
+
+	# use the "native" interfaces to the DBM and CDB libraries, support
+	# passwd and directory lookups by default
+	cat >> Makefile <<- EOC
+		USE_DB=yes
+		DBMLIB=-ldb
+		LOOKUP_CDB=yes
+		LOOKUP_PASSWD=yes
+		LOOKUP_DSEARCH=yes
+	EOC
+
+	if ! use dnsdb; then
+		# DNSDB lookup is enabled by default
+		sed -i "s:^LOOKUP_DNSDB=yes:# LOOKUP_DNSDB=yes:" Makefile
+	fi
+
+	if use ldap; then
+		cat >> Makefile <<- EOC
+			LOOKUP_LDAP=yes
+			LDAP_LIB_TYPE=OPENLDAP2
+			LOOKUP_INCLUDE += -I"${EROOT}"usr/include/ldap
+			LOOKUP_LIBS += -lldap -llber
+		EOC
+	fi
+
+	if use mysql; then
+		cat >> Makefile <<- EOC
+			LOOKUP_MYSQL=yes
+			LOOKUP_INCLUDE += $(mysql_config --include)
+			LOOKUP_LIBS += $(mysql_config --libs)
+		EOC
+	fi
+
+	if use nis; then
+		cat >> Makefile <<- EOC
+			LOOKUP_NIS=yes
+			LOOKUP_NISPLUS=yes
+		EOC
+	fi
+
+	if use postgres; then
+		cat >> Makefile <<- EOC
+			LOOKUP_PGSQL=yes
+			LOOKUP_INCLUDE += -I$(pg_config --includedir)
+			LOOKUP_LIBS += -L$(pg_config --libdir) -lpq
+		EOC
+	fi
+
+	if use sqlite; then
+		cat >> Makefile <<- EOC
+			LOOKUP_SQLITE=yes
+			LOOKUP_SQLITE_PC=sqlite3
+		EOC
+	fi
+
+	if use redis; then
+		cat >> Makefile <<- EOC
+			LOOKUP_REDIS=yes
+			LOOKUP_LIBS += -lhiredis
+		EOC
+	fi
+
+	#
+	# Exim monitor, enabled by default, controlled via X USE-flag,
+	# disable if not requested, bug #46778
+	if use X; then
+		cp ../exim_monitor/EDITME eximon.conf || die
+	else
+		sed -i -e '/^EXIM_MONITOR=/s/^/# /' Makefile
+	fi
+
+	#
+	# features
+
+	# content scanning support
+	if use exiscan-acl; then
+		cat >> Makefile <<- EOC
+			WITH_CONTENT_SCAN=yes
+			WITH_OLD_DEMIME=yes
+		EOC
+	fi
+
+	# DomainKeys Identified Mail, RFC4871
+	if ! use dkim; then
+		# DKIM is enabled by default
+		cat >> Makefile <<- EOC
+			DISABLE_DKIM=yes
+		EOC
+	fi
+
+	# Per-Recipient-Data-Response
+	if ! use prdr; then
+		# PRDR is enabled by default
+		cat >> Makefile <<- EOC
+			DISABLE_PRDR=yes
+		EOC
+	fi
+
+	# log to syslog
+	if use syslog; then
+		sed -i "s:LOG_FILE_PATH=/var/log/exim/exim_%s.log:LOG_FILE_PATH=syslog:" Makefile
+		cat >> Makefile <<- EOC
+			LOG_FILE_PATH=syslog
+		EOC
+	else
+		cat >> Makefile <<- EOC
+			LOG_FILE_PATH=${EPREFIX}/var/log/exim/exim_%s.log
+		EOC
+	fi
+
+	# starttls support (ssl)
+	if use ssl; then
+		echo "SUPPORT_TLS=yes" >> Makefile
+		if use gnutls; then
+			echo "USE_GNUTLS=yes" >> Makefile
+			echo "USE_GNUTLS_PC=gnutls" >> Makefile
+			use pkcs11 || echo "AVOID_GNUTLS_PKCS11=yes" >> Makefile
+		else
+			echo "USE_OPENSSL_PC=openssl" >> Makefile
+		fi
+	fi
+
+	# TCP wrappers
+	if use tcpd; then
+		cat >> Makefile <<- EOC
+			USE_TCP_WRAPPERS=yes
+			EXTRALIBS_EXIM += -lwrap
+		EOC
+	fi
+
+	# Light Mail Transport Protocol
+	if use lmtp; then
+		cat >> Makefile <<- EOC
+			TRANSPORT_LMTP=yes
+		EOC
+	fi
+
+	# embedded Perl
+	if use perl; then
+		cat >> Makefile <<- EOC
+			EXIM_PERL=perl.o
+		EOC
+	fi
+
+	# dlfunc
+	if use dlfunc; then
+		cat >> Makefile <<- EOC
+			EXPAND_DLFUNC=yes
+		EOC
+	fi
+
+	# Proxy Protocol
+	if use proxy; then
+		cat >> Makefile <<- EOC
+			SUPPORT_PROXY=yes
+		EOC
+	fi
+
+	#
+	# experimental features
+
+	# DANE
+	if use dane; then
+		cat >> Makefile <<- EOC
+			EXPERIMENTAL_DANE=yes
+		EOC
+	fi
+
+	# Distributed Checksum Clearinghouse
+	if use dcc; then
+		echo "EXPERIMENTAL_DCC=yes">> Makefile
+	fi
+
+	# Sender Policy Framework
+	if use spf; then
+		cat >> Makefile <<- EOC
+			EXPERIMENTAL_SPF=yes
+			EXTRALIBS_EXIM += -lspf2
+		EOC
+	fi
+
+	# Sender Rewriting Scheme
+	if use srs; then
+		cat >> Makefile <<- EOC
+			EXPERIMENTAL_SRS=yes
+			EXTRALIBS_EXIM += -lsrs_alt
+		EOC
+	fi
+
+	# DMARC
+	if use dmarc; then
+		cat >> Makefile <<- EOC
+			EXPERIMENTAL_DMARC=yes
+			EXTRALIBS_EXIM += -lopendmarc
+		EOC
+	fi
+
+	# Transport post-delivery actions
+	if use tpda; then
+		cat >> Makefile <<- EOC
+			EXPERIMENTAL_EVENT=yes
+		EOC
+	fi
+
+	# Delivery Sender Notifications
+	if use dsn; then
+		cat >> Makefile <<- EOC
+			EXPERIMENTAL_DSN=yes
+		EOC
+	fi
+
+	#
+	# authentication (SMTP AUTH)
+
+	# standard bits
+	cat >> Makefile <<- EOC
+		AUTH_SPA=yes
+		AUTH_CRAM_MD5=yes
+		AUTH_PLAINTEXT=yes
+	EOC
+
+	# Cyrus SASL
+	if use sasl; then
+		cat >> Makefile <<- EOC
+			CYRUS_SASLAUTHD_SOCKET=${EPREFIX}/run/saslauthd/mux
+			AUTH_CYRUS_SASL=yes
+			AUTH_LIBS += -lsasl2
+		EOC
+	fi
+
+	# Dovecot
+	if use dovecot-sasl; then
+		cat >> Makefile <<- EOC
+			AUTH_DOVECOT=yes
+		EOC
+	fi
+
+	# Pluggable Authentication Modules
+	if use pam; then
+		cat >> Makefile <<- EOC
+			SUPPORT_PAM=yes
+			AUTH_LIBS += -lpam
+		EOC
+	fi
+
+	# Radius
+	if use radius; then
+		cat >> Makefile <<- EOC
+			RADIUS_CONFIG_FILE=${EPREFIX}/etc/radiusclient/radiusclient.conf
+			RADIUS_LIB_TYPE=RADIUSCLIENTNEW
+			AUTH_LIBS += -lfreeradius-client
+		EOC
+	fi
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" HOSTCC="$(tc-getCC $CBUILD)" \
+		AR="$(tc-getAR) cq" RANLIB="$(tc-getRANLIB)" FULLECHO='' \
+		|| die "make failed"
+}
+
+src_install () {
+	cd "${S}"/build-exim-gentoo || die
+	dosbin exim
+	if use X; then
+		dosbin eximon.bin
+		dosbin eximon
+	fi
+	fperms 4755 /usr/sbin/exim
+
+	dosym exim /usr/sbin/sendmail
+	dosym exim /usr/sbin/rsmtp
+	dosym exim /usr/sbin/rmail
+	dosym ../sbin/exim /usr/bin/mailq
+	dosym ../sbin/exim /usr/bin/newaliases
+	dosym ../sbin/sendmail /usr/lib/sendmail
+
+	for i in exicyclog exim_dbmbuild exim_dumpdb exim_fixdb exim_lock \
+		exim_tidydb exinext exiwhat exigrep eximstats exiqsumm exiqgrep \
+		convert4r3 convert4r4 exipick
+	do
+		dosbin $i
+	done
+
+	dodoc "${S}"/doc/*
+	doman "${S}"/doc/exim.8
+	use dsn && dodoc "${S}"/README.DSN
+	use doc && dodoc "${WORKDIR}"/${PN}-pdf-${PV//rc/RC}/doc/*.pdf
+
+	# conf files
+	insinto /etc/exim
+	newins "${S}"/src/configure.default exim.conf.dist
+	if use exiscan-acl; then
+		newins "${S}"/src/configure.default exim.conf.exiscan-acl
+	fi
+	doins "${WORKDIR}"/system_filter.exim
+	doins "${FILESDIR}"/auth_conf.sub
+
+	pamd_mimic system-auth exim auth account
+
+	# headers, #436406
+	if use dlfunc ; then
+		# fixup includes so they actually can be found when including
+		sed -i \
+			-e '/#include "\(config\|store\|mytypes\).h"/s:"\(.\+\)":<exim/\1>:' \
+			local_scan.h || die
+		insinto /usr/include/exim
+		doins {config,local_scan}.h ../src/{mytypes,store}.h
+	fi
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/exim.logrotate" exim
+
+	newinitd "${FILESDIR}"/exim.rc10 exim
+	newconfd "${FILESDIR}"/exim.confd exim
+
+	systemd_dounit "${FILESDIR}"/{exim.service,exim.socket,exim-submission.socket}
+	systemd_newunit "${FILESDIR}"/exim_at.service 'exim@.service'
+	systemd_newunit "${FILESDIR}"/exim-submission_at.service 'exim-submission@.service'
+
+	diropts -m 0750 -o ${MAILUSER} -g ${MAILGROUP}
+	dodir /var/log/${PN}
+}
+
+pkg_postinst() {
+	if [[ ! -f ${EROOT}etc/exim/exim.conf ]] ; then
+		einfo "${EROOT}etc/exim/system_filter.exim is a sample system_filter."
+		einfo "${EROOT}etc/exim/auth_conf.sub contains the configuration sub for using smtp auth."
+		einfo "Please create ${EROOT}etc/exim/exim.conf from ${EROOT}etc/exim/exim.conf.dist."
+	fi
+	use dane && einfo "DANE support is experimental"
+	if use dcc ; then
+		einfo "DCC support is experimental, you can find some limited"
+		einfo "documentation at the bottom of this prerelease message:"
+		einfo "http://article.gmane.org/gmane.mail.exim.devel/3579"
+	fi
+	use spf && einfo "SPF support is experimental"
+	use srs && einfo "SRS support is experimental"
+	if use dmarc ; then
+		einfo "DMARC support is experimental.  See global settings to"
+		einfo "configure DMARC, for usage see the documentation at "
+		einfo "experimental-spec.txt."
+	fi
+	use tpda && einfo "TPDA/EVENT support is experimental"
+	use dsn && einfo "DSN support is experimental"
+	elog "The obsolete acl condition 'demime' is removed, the replacements"
+	elog "are the ACLs acl_smtp_mime and acl_not_smtp_mime"
+}
diff --git a/mail-mta/exim/files/exim-4.89-CVE-2017-16943.patch b/mail-mta/exim/files/exim-4.89-CVE-2017-16943.patch
new file mode 100644
index 000000000000..b864ffa5ad17
--- /dev/null
+++ b/mail-mta/exim/files/exim-4.89-CVE-2017-16943.patch
@@ -0,0 +1,40 @@
+From 4e6ae6235c68de243b1c2419027472d7659aa2b4 Mon Sep 17 00:00:00 2001
+From: Jeremy Harris <jgh146exb@wizmail.org>
+Date: Fri, 24 Nov 2017 20:22:33 +0000
+Subject: [PATCH] Avoid release of store if there have been later allocations. 
+ Bug 2199
+
+---
+ src/src/receive.c | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/src/src/receive.c b/src/src/receive.c
+index e7e518a..d9b5001 100644
+--- a/src/src/receive.c
++++ b/src/src/receive.c
+@@ -1810,8 +1810,8 @@ for (;;)
+   (and sometimes lunatic messages can have ones that are 100s of K long) we
+   call store_release() for strings that have been copied - if the string is at
+   the start of a block (and therefore the only thing in it, because we aren't
+-  doing any other gets), the block gets freed. We can only do this because we
+-  know there are no other calls to store_get() going on. */
++  doing any other gets), the block gets freed. We can only do this release if
++  there were no allocations since the once that we want to free. */
+ 
+   if (ptr >= header_size - 4)
+     {
+@@ -1820,9 +1820,10 @@ for (;;)
+     header_size *= 2;
+     if (!store_extend(next->text, oldsize, header_size))
+       {
++      BOOL release_ok = store_last_get[store_pool] == next->text;
+       uschar *newtext = store_get(header_size);
+       memcpy(newtext, next->text, ptr);
+-      store_release(next->text);
++      if (release_ok) store_release(next->text);
+       next->text = newtext;
+       }
+     }
+-- 
+1.9.1
+
diff --git a/media-fonts/Manifest.gz b/media-fonts/Manifest.gz
index 667cbaa2161f..5989e2b482cb 100644
Binary files a/media-fonts/Manifest.gz and b/media-fonts/Manifest.gz differ
diff --git a/media-fonts/ahem/metadata.xml b/media-fonts/ahem/metadata.xml
index c5429ea25edf..dbd34467cc91 100644
--- a/media-fonts/ahem/metadata.xml
+++ b/media-fonts/ahem/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <!-- maintainer-needed -->
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">Kozea/Ahem</remote-id>
 	</upstream>
diff --git a/media-fonts/jsmath-extra-dark/metadata.xml b/media-fonts/jsmath-extra-dark/metadata.xml
index 804d3a63cc6a..77dfed9aebcc 100644
--- a/media-fonts/jsmath-extra-dark/metadata.xml
+++ b/media-fonts/jsmath-extra-dark/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>sci-mathematics@gentoo.org</email>
-	<name>Gentoo Mathematics Project</name>
-</maintainer>
-<longdescription lang="en">
-  Extra jsMath fonts, dark version. Used in math web sites.
-</longdescription>
+	<maintainer type="project">
+		<email>sci-mathematics@gentoo.org</email>
+		<name>Gentoo Mathematics Project</name>
+	</maintainer>
+	<longdescription lang="en">
+		Extra jsMath fonts, dark version. Used in math web sites.
+	</longdescription>
 </pkgmetadata>
diff --git a/media-fonts/jsmath-extra-light/metadata.xml b/media-fonts/jsmath-extra-light/metadata.xml
index 2f9fa36b6da4..dbf37bf7a366 100644
--- a/media-fonts/jsmath-extra-light/metadata.xml
+++ b/media-fonts/jsmath-extra-light/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>sci-mathematics@gentoo.org</email>
-	<name>Gentoo Mathematics Project</name>
-</maintainer>
-<longdescription lang="en">
-  Extra jsMath fonts, light version. Used in math web sites.
-</longdescription>
+	<maintainer type="project">
+		<email>sci-mathematics@gentoo.org</email>
+		<name>Gentoo Mathematics Project</name>
+	</maintainer>
+	<longdescription lang="en">
+		Extra jsMath fonts, light version. Used in math web sites.
+	</longdescription>
 </pkgmetadata>
diff --git a/media-fonts/jsmath/metadata.xml b/media-fonts/jsmath/metadata.xml
index ad4d17fbd1e0..e27fe125029b 100644
--- a/media-fonts/jsmath/metadata.xml
+++ b/media-fonts/jsmath/metadata.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>sci-mathematics@gentoo.org</email>
-	<name>Gentoo Mathematics Project</name>
-</maintainer>
-<longdescription lang="en">
-  Rasterized fonts saved in image files to enable viewing of jsMath
-  pages by a web-browser which is missing access to TeX fonts.
-</longdescription>
+	<maintainer type="project">
+		<email>sci-mathematics@gentoo.org</email>
+		<name>Gentoo Mathematics Project</name>
+	</maintainer>
+	<longdescription lang="en">
+		Rasterized fonts saved in image files to enable viewing of jsMath
+		pages by a web-browser which is missing access to TeX fonts.
+	</longdescription>
 </pkgmetadata>
diff --git a/media-fonts/nunito/metadata.xml b/media-fonts/nunito/metadata.xml
index 47864f88858a..9e95941f30c5 100644
--- a/media-fonts/nunito/metadata.xml
+++ b/media-fonts/nunito/metadata.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>fonts@gentoo.org</email>
-    <name>Fonts</name>
-  </maintainer>
-  <longdescription lang="en">
-    Nunito is a well balanced Sans Serif with rounded terminals. Nunito has
-	been designed mainly to be used as a display font but is useable as a
-	text font too. Nunito has been designed to be used freely across the
-	internet by web browsers on desktop computers, laptops and mobile devices.
-  </longdescription>
+	<maintainer type="project">
+		<email>fonts@gentoo.org</email>
+		<name>Fonts</name>
+	</maintainer>
+	<longdescription lang="en">
+		Nunito is a well balanced Sans Serif with rounded terminals. Nunito has
+		been designed mainly to be used as a display font but is useable as a
+		text font too. Nunito has been designed to be used freely across the
+		internet by web browsers on desktop computers, laptops and mobile devices.
+	</longdescription>
 </pkgmetadata>
diff --git a/media-fonts/sil-charis/metadata.xml b/media-fonts/sil-charis/metadata.xml
index 88eef9b488a4..86d3212b8171 100644
--- a/media-fonts/sil-charis/metadata.xml
+++ b/media-fonts/sil-charis/metadata.xml
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-	<email>fonts@gentoo.org</email>
-	<name>Fonts</name>
-  </maintainer>
-  <longdescription lang="en">
-    Welcome to the Charis SIL font package. Charis is similar to
-    Bitstream Charter, one of the first fonts designed specifically
-    for laser printers. It is highly readable and holds up well in
-    less-than-ideal reproduction environments. It also has a full set
-    of styles - regular, italic, bold, bold italic - and so is more
-    useful in general publishing than Doulos SIL. Charis is a serif,
-    proportionally-spaced font optimized for readability in long
-    printed documents.
-  </longdescription>
-<use>
-	<flag name="compact">Use more compactly spaced font</flag>
-</use>
+	<maintainer type="project">
+		<email>fonts@gentoo.org</email>
+		<name>Fonts</name>
+	</maintainer>
+	<longdescription lang="en">
+		Welcome to the Charis SIL font package. Charis is similar to
+		Bitstream Charter, one of the first fonts designed specifically
+		for laser printers. It is highly readable and holds up well in
+		less-than-ideal reproduction environments. It also has a full set
+		of styles - regular, italic, bold, bold italic - and so is more
+		useful in general publishing than Doulos SIL. Charis is a serif,
+		proportionally-spaced font optimized for readability in long
+		printed documents.
+	</longdescription>
+	<use>
+		<flag name="compact">Use more compactly spaced font</flag>
+	</use>
 </pkgmetadata>
diff --git a/media-fonts/sil-gentium/metadata.xml b/media-fonts/sil-gentium/metadata.xml
index 77a92c85a4a7..dee455f96859 100644
--- a/media-fonts/sil-gentium/metadata.xml
+++ b/media-fonts/sil-gentium/metadata.xml
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>fonts@gentoo.org</email>
-    <name>Fonts</name>
-  </maintainer>
-  <longdescription lang="en">
-	Gentium is a typeface family designed to enable the diverse ethnic
-	groups around the world who use the Latin, Cyrillic and Greek
-	scripts to produce readable, high-quality publications. It supports
-	a wide range of Latin- and Cyrillic-based alphabets.
+	<maintainer type="project">
+		<email>fonts@gentoo.org</email>
+		<name>Fonts</name>
+	</maintainer>
+	<longdescription lang="en">
+		Gentium is a typeface family designed to enable the diverse ethnic
+		groups around the world who use the Latin, Cyrillic and Greek
+		scripts to produce readable, high-quality publications. It supports
+		a wide range of Latin- and Cyrillic-based alphabets.
 
-	The design is intended to be highly readable, reasonably compact,
-	and visually attractive. The additional ‘extended’ Latin letters are
-	designed to naturally harmonize with the traditional 26 ones.
-	Diacritics are treated with careful thought and attention to their
-	use. Gentium also supports both polytonic and monotonic Greek.
-	Gentium Plus now includes more extended Latin glyphs (Unicode 5.1),
-	archaic Greek symbols, and full extended Cyrillic script support.
-  </longdescription>
-  <use>
-    <flag name="compact">Also install more compact version of the font.</flag>
-  </use>
+		The design is intended to be highly readable, reasonably compact,
+		and visually attractive. The additional ‘extended’ Latin letters are
+		designed to naturally harmonize with the traditional 26 ones.
+		Diacritics are treated with careful thought and attention to their
+		use. Gentium also supports both polytonic and monotonic Greek.
+		Gentium Plus now includes more extended Latin glyphs (Unicode 5.1),
+		archaic Greek symbols, and full extended Cyrillic script support.
+	</longdescription>
+	<use>
+		<flag name="compact">Also install more compact version of the font.</flag>
+	</use>
 </pkgmetadata>
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index d8f54b74f4d6..1a0c0e6983fa 100644
Binary files a/media-gfx/Manifest.gz and b/media-gfx/Manifest.gz differ
diff --git a/media-gfx/asymptote/metadata.xml b/media-gfx/asymptote/metadata.xml
index c700a1d698dd..fee8887be49c 100644
--- a/media-gfx/asymptote/metadata.xml
+++ b/media-gfx/asymptote/metadata.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>grozin@gentoo.org</email>
-    <name>Andrey Grozin</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>sci@gentoo.org</email>
-    <name>Gentoo Science Project</name>
-  </maintainer>
-  <longdescription lang="en">
+	<maintainer type="person">
+		<email>grozin@gentoo.org</email>
+		<name>Andrey Grozin</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
+	<longdescription lang="en">
 		Asymptote is a powerful descriptive vector graphics language that
 		provides a natural coordinate-based framework for technical drawing.
 		Labels and equations are typeset with LaTeX, for high-quality PostScript
@@ -18,18 +18,12 @@
 		A major advantage of Asymptote over other graphics packages is that it
 		is a programming language, as opposed to just a graphics program.
 	</longdescription>
-  <use>
-    <flag name="boehm-gc">
-			Enables using the Boehm-Demers-Weiser conservative garbage collector
-		</flag>
-    <flag name="sigsegv">
-			Enables using <pkg>dev-libs/libsigsegv</pkg>
-		</flag>
-    <flag name="offscreen">
-			Enables off-screen rendering
-		</flag>
-  </use>
-  <upstream>
-    <remote-id type="sourceforge">asymptote</remote-id>
-  </upstream>
+	<use>
+		<flag name="boehm-gc">Enables using the Boehm-Demers-Weiser conservative garbage collector</flag>
+		<flag name="sigsegv">Enables using <pkg>dev-libs/libsigsegv</pkg></flag>
+		<flag name="offscreen">Enables off-screen rendering</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">asymptote</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-gfx/cura/metadata.xml b/media-gfx/cura/metadata.xml
index f06d3016b3d9..e0588ff0d2ec 100644
--- a/media-gfx/cura/metadata.xml
+++ b/media-gfx/cura/metadata.xml
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <maintainer type="person">
-        <email>tomboy64@sina.cn</email>
-        <name>Matthew Brewer</name>
-    </maintainer>
-    <maintainer type="project">
-        <email>3dprint@gentoo.org</email>
-        <name>Gentoo 3D Printer Project</name>
-    </maintainer>
-    <maintainer type="project">
-        <email>proxy-maint@gentoo.org</email>
-        <name>Gentoo Proxy Maintainers Project</name>
-    </maintainer>
+	<maintainer type="person">
+		<email>tomboy64@sina.cn</email>
+		<name>Matthew Brewer</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>3dprint@gentoo.org</email>
+		<name>Gentoo 3D Printer Project</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Gentoo Proxy Maintainers Project</name>
+	</maintainer>
 	<use>
 		<flag name="usb">Access 3D printers via USB</flag>
 	</use>
-    <upstream>
+	<upstream>
 		<remote-id type="github">Ultimaker/Cura</remote-id>
-    </upstream>
+	</upstream>
 </pkgmetadata>
diff --git a/media-gfx/curaengine/metadata.xml b/media-gfx/curaengine/metadata.xml
index f11feb002f87..befd642b942a 100644
--- a/media-gfx/curaengine/metadata.xml
+++ b/media-gfx/curaengine/metadata.xml
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <maintainer type="person">
-        <email>tomboy64@sina.cn</email>
-        <name>Matthew Brewer</name>
-    </maintainer>
-    <maintainer type="project">
-        <email>3dprint@gentoo.org</email>
-        <name>Gentoo 3D Printer Project</name>
-    </maintainer>
-    <maintainer type="project">
-        <email>proxy-maint@gentoo.org</email>
-        <name>Gentoo Proxy Maintainers Project</name>
-    </maintainer>
-    <upstream>
+	<maintainer type="person">
+		<email>tomboy64@sina.cn</email>
+		<name>Matthew Brewer</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>3dprint@gentoo.org</email>
+		<name>Gentoo 3D Printer Project</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Gentoo Proxy Maintainers Project</name>
+	</maintainer>
+	<upstream>
 		<remote-id type="github">Ultimaker/CuraEngine</remote-id>
-    </upstream>
+	</upstream>
 </pkgmetadata>
diff --git a/media-gfx/dawn/metadata.xml b/media-gfx/dawn/metadata.xml
index 0a1f931af8f8..7e014846cf46 100644
--- a/media-gfx/dawn/metadata.xml
+++ b/media-gfx/dawn/metadata.xml
@@ -1,26 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>sci-physics@gentoo.org</email>
-	<name>Gentoo Physics Project</name>
-</maintainer>
-<longdescription lang="en">
-  Fukui Renderer DAWN (Drawer for Academic WritiNgs) 
-  is a renderer, which reads 3D geometrical data and visualize them.  
-  It is a vectorized 3D PostScript processor with analytical 
-  hidden line/surface removal. 
-  It aims at precise technical drawing of complicated objects.  
-  It performs geometrical hidden line/surface removal and calculates 
-  out all visible parts of the 3D data before drawing.  This drawing 
-  algorithm realizes device-independent technical high quality of
-  vectorized graphics.
-    3D Data files should be generated by a modeler or by hands 
-  separately.  If you use DAWN as a visualizer of, 
-  say, a simulator of physical experiments, 
-  the simulator application itself is recognized as a modeler.
-    An important feature of DAWN is that it has been developed to
-  visualize 3D data generated by a high-energy experimental detector
-  simulator "GEANT4".
-</longdescription>
+	<maintainer type="project">
+		<email>sci-physics@gentoo.org</email>
+		<name>Gentoo Physics Project</name>
+	</maintainer>
+	<longdescription lang="en">
+		Fukui Renderer DAWN (Drawer for Academic WritiNgs)
+		is a renderer, which reads 3D geometrical data and visualize them.
+		It is a vectorized 3D PostScript processor with analytical
+		hidden line/surface removal.
+		It aims at precise technical drawing of complicated objects.
+		It performs geometrical hidden line/surface removal and calculates
+		out all visible parts of the 3D data before drawing.  This drawing
+		algorithm realizes device-independent technical high quality of
+		vectorized graphics.
+
+		3D Data files should be generated by a modeler or by hands
+		separately.  If you use DAWN as a visualizer of,
+		say, a simulator of physical experiments,
+		the simulator application itself is recognized as a modeler.
+
+		An important feature of DAWN is that it has been developed to
+		visualize 3D data generated by a high-energy experimental detector
+		simulator "GEANT4".
+	</longdescription>
 </pkgmetadata>
diff --git a/media-gfx/fotoxx/metadata.xml b/media-gfx/fotoxx/metadata.xml
index de79489b296c..046fd381d620 100644
--- a/media-gfx/fotoxx/metadata.xml
+++ b/media-gfx/fotoxx/metadata.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>grozin@gentoo.org</email>
-    <name>Andrey Grozin</name>
-  </maintainer>
-  <longdescription lang="en">
-	  Navigate a large image collection using a thumbnail browser.
-	  Import camera RAW files and edit with 16-bit color.
-	  Save edited images as TIFF-8/16, PNG or JPEG with adjustable compression.
-	  Edit the whole image or a selected area, with adjustable edge-blending.
-	  Edit functions have live feedback using the full window.
-	  Undo/redo up to 99 edits. Add tags, dates, and star-ratings to images
-	  and search using these criteria and (wildcard) file names.
-	  Fotoxx does not use filters, layers, and masks - the edit functions work directly on the image.
+	<maintainer type="person">
+		<email>grozin@gentoo.org</email>
+		<name>Andrey Grozin</name>
+	</maintainer>
+	<longdescription lang="en">
+		Navigate a large image collection using a thumbnail browser.
+		Import camera RAW files and edit with 16-bit color.
+		Save edited images as TIFF-8/16, PNG or JPEG with adjustable compression.
+		Edit the whole image or a selected area, with adjustable edge-blending.
+		Edit functions have live feedback using the full window.
+		Undo/redo up to 99 edits. Add tags, dates, and star-ratings to images
+		and search using these criteria and (wildcard) file names.
+		Fotoxx does not use filters, layers, and masks - the edit functions work directly on the image.
 	</longdescription>
 </pkgmetadata>
diff --git a/media-gfx/geeqie/geeqie-1.3-r1.ebuild b/media-gfx/geeqie/geeqie-1.3-r1.ebuild
index 285783cea80b..dd9b8e0511a4 100644
--- a/media-gfx/geeqie/geeqie-1.3-r1.ebuild
+++ b/media-gfx/geeqie/geeqie-1.3-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.geeqie.org/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="debug doc exif gpu-accel gtk3 jpeg lcms lirc lua map tiff xmp"
 
 RDEPEND="gtk3? ( x11-libs/gtk+:3 )
diff --git a/media-gfx/graphviz/metadata.xml b/media-gfx/graphviz/metadata.xml
index 73daee8cb67b..f76b39ca8a88 100644
--- a/media-gfx/graphviz/metadata.xml
+++ b/media-gfx/graphviz/metadata.xml
@@ -1,49 +1,42 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>graphics@gentoo.org</email>
-    <name>Gentoo Graphics Project</name>
-  </maintainer>
-  <longdescription>
-graphviz  is a set of graph drawing tools for Unix or MS-Windows 
-(win32), including a web service interface (webdot). Source code and 
-binary executables for common platforms are available. Graph drawing 
-addresses the problem of visualizing structural information by 
-constructing geometric representations of abstract graphs and networks. 
-Automatic generation of graph drawings has important applications in key 
-technologies such as database design, software engineering, VLSI and 
-network design and visual interfaces in other domains. Situations where 
-these tools might be particularly useful include:
+	<maintainer type="project">
+		<email>graphics@gentoo.org</email>
+		<name>Gentoo Graphics Project</name>
+	</maintainer>
+	<longdescription>
+		graphviz is a set of graph drawing tools for Unix or MS-Windows
+		(win32), including a web service interface (webdot). Source code and
+		binary executables for common platforms are available. Graph drawing
+		addresses the problem of visualizing structural information by
+		constructing geometric representations of abstract graphs and networks.
+		Automatic generation of graph drawings has important applications in key
+		technologies such as database design, software engineering, VLSI and
+		network design and visual interfaces in other domains. Situations where
+		these tools might be particularly useful include:
 
-    * you would like to restructure a program and first need to 
-understand the relationships between its types, procedures, and source 
-files.
-    * you need to find the bottlenecks in an Internet backbone - not 
-only individual links, but their relationships
-    * you're debugging a protocol or microarchitecture represented as a 
-finite state machine and need to figure out how a certain
-      error state arises
-    * you would like to browse a database schema, knowledge base, or 
-distributed program represented pictorially
-    * you would like to see an overview of a collection of linked 
-documents
-    * you would like to discover patterns and communities of interest in 
-a database of telephone calls or e-mail messages
-</longdescription>
-  <use>
-    <flag name="devil">Enables DevIL output plugin -Tdevil</flag>
-    <flag name="gdk-pixbuf">Enables gdk-pixbuf2 plugin</flag>
-    <flag name="gtk">Enables gtk+ output plugin -Tgtk (needs cairo)</flag>
-    <flag name="gts">Enables support for gts</flag>
-    <flag name="lasi">
-		Enables PostScript output via <pkg>media-libs/lasi</pkg>, for 
-		plugin -Tlasi (needs cairo)
-	</flag>
-    <flag name="qt4">Builds gvedit front-end</flag>
-    <flag name="X">
-		Builds lefty front-end, builds plugin -Txlib, and enables support
-		for x11 in various other modules (needs cairo)
-	</flag>
-  </use>
+		* you would like to restructure a program and first need to
+		understand the relationships between its types, procedures, and source
+		files.
+		* you need to find the bottlenecks in an Internet backbone - not
+		only individual links, but their relationships
+		* you're debugging a protocol or microarchitecture represented as a
+		finite state machine and need to figure out how a certain error state arises
+		* you would like to browse a database schema, knowledge base, or
+		distributed program represented pictorially
+		* you would like to see an overview of a collection of linked
+		documents
+		* you would like to discover patterns and communities of interest in
+		a database of telephone calls or e-mail messages
+	</longdescription>
+	<use>
+		<flag name="devil">Enables DevIL output plugin -Tdevil</flag>
+		<flag name="gdk-pixbuf">Enables gdk-pixbuf2 plugin</flag>
+		<flag name="gtk">Enables gtk+ output plugin -Tgtk (needs cairo)</flag>
+		<flag name="gts">Enables support for gts</flag>
+		<flag name="lasi">Enables PostScript output via <pkg>media-libs/lasi</pkg>, for plugin -Tlasi (needs cairo)</flag>
+		<flag name="qt4">Builds gvedit front-end</flag>
+		<flag name="X">Builds lefty front-end, builds plugin -Txlib, and enables support for x11 in various other modules (needs cairo)</flag>
+	</use>
 </pkgmetadata>
diff --git a/media-gfx/gscan2pdf/Manifest b/media-gfx/gscan2pdf/Manifest
index 1bf2255bbbe1..9a504e54ae80 100644
--- a/media-gfx/gscan2pdf/Manifest
+++ b/media-gfx/gscan2pdf/Manifest
@@ -1,3 +1,2 @@
-DIST gscan2pdf-1.8.6.tar.xz 402532 SHA256 0674d9f1decc84b0abfa7849a66d0d50fc508cef2b901a3806addb017c4e4645 SHA512 3d33d0666e452b313a8dca91734188ab268e2fae9f0e259cd2142661a61697302bba5d602ee7395c1ffd7c87e0c52b422f9201a2b70f5211246aed359ff4092c WHIRLPOOL 59ed68feaff638f24add40f1c931ca3bfe476e26edf9c40ce0fd22c21b7a0aa43711c205362506fae0a4b5c4bbab95edfc0c35f9c56e4f70c3c7d3ea80d231a9
-DIST gscan2pdf-1.8.7.tar.xz 403676 SHA256 91ac65d3a331109bcb4995e3a379991cb50815dab7f8e3fe68e055bbc271f78a SHA512 990338c9dd9bdd5685a40792803b3077e27296c5a3363471e55d3297a815e1c344bc94e3430981764531fb02380d7d7b1c253dda5e9e65e86e632ae8371ca72d WHIRLPOOL 2a1eb67942efb7ad703560a228d3a0cfe09081e30b688c68d2a7621a5ccfce73ae7711db1d6b02b9b57462ed0d94c7ff2a16da8ebd7a25beac08098077346768
-DIST gscan2pdf-1.8.8.tar.xz 404456 SHA256 2adcbfce4bcfaacb7b73b7c8b5ea3ca3a0257fbab717a589328439a04621c6a7 SHA512 331821c0f9d7365866b7ba6bdbcd29d03b69516e44f95d186296a9a105887924c747fd1c89740bd708f04d5d67a65481b972d57fef09d8bee16dfe1b2655b9e3 WHIRLPOOL 1f6141c347147ad5e8710d2aa4dfd6f9c67f1daefb724c5045a62a24118546f1405a1e01b0d06bf72744256ec7f5c7f6dc1d0b28d0787f7fe11a2659162ae78c
+DIST gscan2pdf-1.8.8.tar.xz 404456 BLAKE2B 23e81ad9d46867863f7cf14e0350cce568d9f9e7a57fd8eb9a4b1a56a112d72008adacf7cc4514c6d93dd6b225684d57494a5baa295c8f84a927de7bd208d722 SHA512 331821c0f9d7365866b7ba6bdbcd29d03b69516e44f95d186296a9a105887924c747fd1c89740bd708f04d5d67a65481b972d57fef09d8bee16dfe1b2655b9e3
+DIST gscan2pdf-1.8.9.tar.xz 405780 BLAKE2B 2b0b818f314064e03ecd6b1eed988f9d45808a7142c00d190dba552ac87f06da74aacb47341ce749a9e1c916cf607eafd4f1d412a6a239a07426e57c16e62dc9 SHA512 a9042b2a184b03bb7a53d5fa56abc93e873c6e675350db4094e38c04e3f7e784eb6f0369a950f598b052474e8cbaea007af10849a2cee18cdb18d90605d4d90a
diff --git a/media-gfx/gscan2pdf/gscan2pdf-1.8.6.ebuild b/media-gfx/gscan2pdf/gscan2pdf-1.8.6.ebuild
deleted file mode 100644
index ef4bdc2f70b7..000000000000
--- a/media-gfx/gscan2pdf/gscan2pdf-1.8.6.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils perl-module
-
-DESCRIPTION="Scan documents, perform OCR, produce PDFs and DjVus"
-HOMEPAGE="http://gscan2pdf.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-# OCR tests fail with tesseract[opencl], not fixed by addpredict
-# and others on Wayland and the console
-RESTRICT="test"
-
-RDEPEND="
-	dev-perl/Config-General
-	dev-perl/Date-Calc
-	dev-perl/Data-UUID
-	dev-perl/Filesys-Df
-	dev-perl/glib-perl
-	dev-perl/Goo-Canvas
-	dev-perl/Gtk2-Ex-PodViewer
-	dev-perl/Gtk2-Ex-Simple-List
-	dev-perl/Gtk2-ImageView
-	dev-perl/Gtk2
-	dev-perl/HTML-Parser
-	dev-perl/Image-Sane
-	dev-perl/Locale-gettext
-	dev-perl/List-MoreUtils
-	dev-perl/Log-Log4perl
-	dev-perl/PDF-API2
-	dev-perl/Proc-ProcessTable
-	dev-perl/Readonly
-	dev-perl/Set-IntSpan
-	dev-perl/Try-Tiny
-	virtual/perl-Archive-Tar
-	virtual/perl-Carp
-	virtual/perl-Data-Dumper
-	virtual/perl-File-Temp
-	virtual/perl-Getopt-Long
-	virtual/perl-threads
-	virtual/perl-threads-shared
-	media-gfx/gtkimageview
-	media-gfx/imagemagick[png,tiff,perl]
-	media-gfx/sane-backends
-	media-libs/tiff"
-
-mydoc="History"
-
-pkg_postinst() {
-	optfeature "DjVu file support" "app-text/djvu[tiff] media-gfx/imagemagick[djvu]"
-	optfeature "creating PostScript files from PDFs" app-text/ghostscript-gpl
-	optfeature "Optical Character Recognition" app-text/tesseract[osd,tiff]
-	optfeature "scan post-processing" app-text/unpaper
-	optfeature "automatic document feeder support" media-gfx/sane-frontends
-	optfeature "sending PDFs as email attachments" x11-misc/xdg-utils
-}
diff --git a/media-gfx/gscan2pdf/gscan2pdf-1.8.7.ebuild b/media-gfx/gscan2pdf/gscan2pdf-1.8.9.ebuild
similarity index 100%
rename from media-gfx/gscan2pdf/gscan2pdf-1.8.7.ebuild
rename to media-gfx/gscan2pdf/gscan2pdf-1.8.9.ebuild
diff --git a/media-gfx/hugin/metadata.xml b/media-gfx/hugin/metadata.xml
index 48424f55e336..df762b45d7ce 100644
--- a/media-gfx/hugin/metadata.xml
+++ b/media-gfx/hugin/metadata.xml
@@ -1,16 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>graphics@gentoo.org</email>
-    <name>Gentoo Graphics Project</name>
-  </maintainer>
-  <longdescription>hugin is a panorama stitching program</longdescription>
-  <use>
-    <flag name="sift">automatically align images with
-		<pkg>media-gfx/autopano-sift-C</pkg></flag>
-  </use>
-  <upstream>
-    <remote-id type="sourceforge">hugin</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>graphics@gentoo.org</email>
+		<name>Gentoo Graphics Project</name>
+	</maintainer>
+	<longdescription>hugin is a panorama stitching program</longdescription>
+	<use>
+		<flag name="sift">automatically align images with <pkg>media-gfx/autopano-sift-C</pkg></flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">hugin</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-gfx/jpeg2ps/metadata.xml b/media-gfx/jpeg2ps/metadata.xml
index d6fe5b053823..e62e2f53570a 100644
--- a/media-gfx/jpeg2ps/metadata.xml
+++ b/media-gfx/jpeg2ps/metadata.xml
@@ -1,13 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-	<email>graphics@gentoo.org</email>
-	<name>Gentoo Graphics Project</name>
-  </maintainer>
-<use>
-	<flag name="metric">
-		Default to A4 paper size
-	</flag>
-</use>
+	<maintainer type="project">
+		<email>graphics@gentoo.org</email>
+		<name>Gentoo Graphics Project</name>
+	</maintainer>
+	<use>
+		<flag name="metric">Default to A4 paper size</flag>
+	</use>
 </pkgmetadata>
diff --git a/media-gfx/librecad/Manifest b/media-gfx/librecad/Manifest
index cc4f479ec31d..e972fbdaa291 100644
--- a/media-gfx/librecad/Manifest
+++ b/media-gfx/librecad/Manifest
@@ -1,4 +1 @@
-DIST librecad-2.0.3.zip 16590256 SHA256 4221348541c46c6e9698c1fa3471a14a81376e022a009a164a7f0d0035da4643 SHA512 c40952ae967d83197645bef65dac6e050ddeacf536401b2b99cd18d753462af086ac2a410c6746a92c094ad76fd9177a900c21531ed7b7fcdf1e4b0f7f070e00 WHIRLPOOL c2e1d33b17b7a47ffd9b3795ad292b22cb1225aceacf052494745243630b0537e21701930b9433ea235c462d65581efc2b5ccda3b37712d4ab639ab9bcc6a97d
-DIST librecad-2.0.9.zip 25524745 SHA256 3fd92e8249642462d41d688446393ee5e79f68b7b0d9878388c6c194af2cb43a SHA512 e2029389b2ced67a94d9411cb2f49f524ac12542409bc7829a043af9611dd51544fc431e364f4dcfb1a8b645b2bc6eb86fc74294726a65ee687f69bd7eb8f700 WHIRLPOOL 20aaa38cd92547bae6cee4b696f5b7f3699438481c5051af6112c6b1661ffb018509ff1fdcfb4591e8828c8ffcfcc5a3002c594dbcf95beba93e9768c5133c02
-DIST librecad-2.1.1.zip 26085717 SHA256 a5d27119ff137611c090fb174890ed1312c56897fb1482327d676da148fbd7dc SHA512 82b27e75fddae798da0e30e0c560d3769dfddab936e33a3585fd3e871eccf88e51c28d5ed938a530cb65c2e2ecfc593772ca83a2d23dd29126aa8225595f3d01 WHIRLPOOL 50ac34d0bdf1cd55ee6f7a959c1c1430197ac8acb7739755887b726349e39c9a1fe32ef25cab285aeaf649057701256f6210750c986ddb67ed3f338c80e300ed
 DIST librecad-2.1.3.zip 26086377 SHA256 f05af030c71192109c1472c6fd24696fcb564b2eb83ff9789b88bec2e93c10a3 SHA512 9a41c17b512ccbc1a0ebb0e6da8e7297663490479f042fadaffda819e371afc7fa49b789449df9fd4e36a2e2b6f95b9b5be19df47cf3c4252111db2a7ed7f009 WHIRLPOOL a0209b3513fd5f10e608795e34267d5efc7338996ba6cc485cbd9084200cb87fb8b51ab3f224520fc8c693c5ac3db8d049dde68011e8005922ad9c761625971c
diff --git a/media-gfx/librecad/files/iota-fix-2.1.1.patch b/media-gfx/librecad/files/iota-fix-2.1.1.patch
deleted file mode 100644
index 12506f4b820d..000000000000
--- a/media-gfx/librecad/files/iota-fix-2.1.1.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- librecad/src/lib/engine/rs_spline.cpp.old	2016-06-20 20:43:27.000000000 +0200
-+++ librecad/src/lib/engine/rs_spline.cpp	2016-09-05 13:23:25.459841304 +0200
-@@ -26,6 +26,7 @@
- 
- #include<iostream>
- #include<cmath>
-+#include<numeric>
- #include "rs_spline.h"
- 
- 
diff --git a/media-gfx/librecad/librecad-2.0.3.ebuild b/media-gfx/librecad/librecad-2.0.3.ebuild
deleted file mode 100644
index c1767e4ccf78..000000000000
--- a/media-gfx/librecad/librecad-2.0.3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils qt4-r2
-
-DESCRIPTION="Generic 2D CAD program"
-HOMEPAGE="http://www.librecad.org/"
-SRC_URI="https://github.com/LibreCAD/LibreCAD/archive/${PV/_/}.zip -> ${P}.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug doc tools"
-
-DEPEND="
-	dev-cpp/muParser
-	dev-qt/qtgui:4
-	dev-qt/qthelp:4
-	dev-qt/qtsvg:4
-	dev-libs/boost
-	media-libs/freetype
-	"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/LibreCAD-${PV}"
-
-src_install() {
-	dobin unix/librecad
-	use tools && dobin unix/ttf2lff
-	insinto /usr/share/${PN}
-	doins -r unix/resources/*
-	use doc && dohtml -r librecad/support/doc/*
-	doicon librecad/res/main/${PN}.png
-	make_desktop_entry ${PN} LibreCAD ${PN} Graphics
-}
diff --git a/media-gfx/librecad/librecad-2.1.1.ebuild b/media-gfx/librecad/librecad-2.1.1.ebuild
deleted file mode 100644
index 87af2fd665b6..000000000000
--- a/media-gfx/librecad/librecad-2.1.1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils qmake-utils
-
-DESCRIPTION="Generic 2D CAD program"
-HOMEPAGE="http://www.librecad.org/"
-SRC_URI="https://github.com/LibreCAD/LibreCAD/archive/${PV/_/}.zip -> ${P}.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-IUSE="3d debug doc tools qt4 +qt5"
-REQUIRED_USE="|| ( qt4 qt5 )"
-
-DEPEND="
-	qt4? (
-		dev-qt/qtcore:4
-		dev-qt/qtgui:4
-		dev-qt/qtsvg:4
-		dev-qt/qthelp:4
-	)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qthelp:5
-		dev-qt/qtprintsupport:5
-		dev-qt/qtsvg:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtxml:5
-	)
-	dev-libs/boost:=
-	dev-cpp/muParser
-	media-libs/freetype:2"
-
-RDEPEND="${DEPEND}"
-S="${WORKDIR}/LibreCAD-${PV}"
-
-src_prepare() {
-	epatch "${FILESDIR}/iota-fix-2.1.1.patch"
-
-	# currently RS_VECTOR3D causes an internal compiler error on GCC-4.8
-	if ! use 3d; then
-		sed -i -e '/RS_VECTOR2D/ s/^#//' librecad/src/src.pro || die
-	fi
-}
-
-src_configure() {
-	if use qt4; then
-		eqmake4 -r
-	else
-		eqmake5 -r
-	fi
-}
-
-src_install() {
-	dobin unix/librecad
-	use tools && dobin unix/ttf2lff
-	insinto /usr/share/${PN}
-	doins -r unix/resources/*
-	use doc && insinto html && dodoc -r librecad/support/doc/*
-	insinto /usr/share/appdata
-	doins unix/appdata/librecad.appdata.xml
-	doicon librecad/res/main/${PN}.png
-	make_desktop_entry ${PN} LibreCAD ${PN} Graphics
-}
diff --git a/media-gfx/librecad/librecad-2.0.9-r1.ebuild b/media-gfx/librecad/librecad-2.1.3-r2.ebuild
similarity index 85%
rename from media-gfx/librecad/librecad-2.0.9-r1.ebuild
rename to media-gfx/librecad/librecad-2.1.3-r2.ebuild
index c1bc20456856..517916041bd8 100644
--- a/media-gfx/librecad/librecad-2.0.9-r1.ebuild
+++ b/media-gfx/librecad/librecad-2.1.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,15 +14,9 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 
 IUSE="3d debug doc tools qt4 +qt5"
-REQUIRED_USE="|| ( qt4 qt5 )"
+REQUIRED_USE="qt5"
 
 DEPEND="
-	qt4? (
-		dev-qt/qtcore:4
-		dev-qt/qtgui:4
-		dev-qt/qtsvg:4
-		dev-qt/qthelp:4
-	)
 	qt5? (
 		dev-qt/qtcore:5
 		dev-qt/qtgui:5
@@ -40,6 +34,8 @@ RDEPEND="${DEPEND}"
 S="${WORKDIR}/LibreCAD-${PV}"
 
 src_prepare() {
+# 	epatch "${FILESDIR}/iota-fix-2.1.1.patch"
+
 	# currently RS_VECTOR3D causes an internal compiler error on GCC-4.8
 	if ! use 3d; then
 		sed -i -e '/RS_VECTOR2D/ s/^#//' librecad/src/src.pro || die
@@ -47,11 +43,7 @@ src_prepare() {
 }
 
 src_configure() {
-	if use qt4; then
-		eqmake4 -r
-	else
-		eqmake5 -r
-	fi
+	eqmake5 -r
 }
 
 src_install() {
diff --git a/media-gfx/meshlab/metadata.xml b/media-gfx/meshlab/metadata.xml
index 0b461a28eacc..5454c9e8ca1b 100644
--- a/media-gfx/meshlab/metadata.xml
+++ b/media-gfx/meshlab/metadata.xml
@@ -9,10 +9,10 @@
 		<name>Gentoo 3D print</name>
 	</maintainer>
 	<longdescription lang="en">
-	Printrun is a set of G-code sending applications for RepRap.
-	It consists of printcore (dumb G-code sender), pronsole (featured command line
-	G-code sender), pronterface (featured G-code sender with graphical user
-	interface), and a small collection of helpful scripts.
+		Printrun is a set of G-code sending applications for RepRap.
+		It consists of printcore (dumb G-code sender), pronsole (featured command line
+		G-code sender), pronterface (featured G-code sender with graphical user
+		interface), and a small collection of helpful scripts.
 	</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">meshlab</remote-id>
diff --git a/media-gfx/optipng/optipng-0.7.6-r1.ebuild b/media-gfx/optipng/optipng-0.7.6-r1.ebuild
index 7cc031c42aab..9039ea4f1538 100644
--- a/media-gfx/optipng/optipng-0.7.6-r1.ebuild
+++ b/media-gfx/optipng/optipng-0.7.6-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ppc ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="sys-libs/zlib
diff --git a/media-gfx/pdf2svg/Manifest b/media-gfx/pdf2svg/Manifest
index b40696c7e776..f2287d436b3b 100644
--- a/media-gfx/pdf2svg/Manifest
+++ b/media-gfx/pdf2svg/Manifest
@@ -1,2 +1,3 @@
 DIST pdf2svg-0.2.1.tar.gz 77601 SHA256 96e6902e0bca6aeb70f3c6621d0d95b346b14c6a0282c12c1e7635f67af0c74b SHA512 17b54ed40f38982452206a9e7eb6fd309906904af10ef375d7e3894e7d8d8a351a5c47ef6553678db48373c5de878923fd46a66cc3e22a01034434fde9671793 WHIRLPOOL 4018341269d189000a79d58d429d3346e3e33e649ccc762fe84c6da04e1ecc10573d7a2659c4f897484023a5ab393ce723b6227ac8f7df76ceb0c1fda84d7dd6
 DIST pdf2svg-0.2.2.tar.gz 84009 SHA256 c2a29cc81d01fea220523abad39c400e9c5411b395b6ba3ccbedb4cd398ec6cb SHA512 ea8b3d33acc7900d162a338b715d55a0cda578e2f08afcbe2773558998b267134ce0c34d5ed295d3dcb2bf882f0097835a6ba83fc837a201173e4c67b9d4dca3 WHIRLPOOL b4a0381d175e0ad18534681c53e994e6e47915d27584f2efd12d638f1f5eb4fb9e181673f81079384addc0ba933da4f777dc632eafe1055b8b79952dbf599e33
+DIST pdf2svg-0.2.3.tar.gz 89461 BLAKE2B 5857935195429f43cf9d6dc3bd66a88945be45225f0ae8324762937b7bfe407f0c4fb4013069d4eda2f0e036710a1a78b261093c18e4693622cc6fc9f7fd7916 SHA512 e8f0cc34c112c7d9ae02396ca587f1354462add882501f003b0173e05ebb09c09456dc1736679674fec5a2c04bdc0ef4141266090ba7efeba8b194ee602f5ee2
diff --git a/media-gfx/pdf2svg/pdf2svg-0.2.1.ebuild b/media-gfx/pdf2svg/pdf2svg-0.2.1.ebuild
index ec0acdb0faa9..9494d3e45e1d 100644
--- a/media-gfx/pdf2svg/pdf2svg-0.2.1.ebuild
+++ b/media-gfx/pdf2svg/pdf2svg-0.2.1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 inherit eutils
 
 DESCRIPTION="pdf2svg is based on poppler and cairo and can convert pdf to svg files"
-HOMEPAGE="http://www.cityinthesky.co.uk/pdf2svg.html"
+HOMEPAGE="http://www.cityinthesky.co.uk/opensource/pdf2svg/ https://github.com/dawbarton/pdf2svg/"
 SRC_URI="http://www.cityinthesky.co.uk/files/${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/media-gfx/pdf2svg/pdf2svg-0.2.2.ebuild b/media-gfx/pdf2svg/pdf2svg-0.2.2.ebuild
index 3eae62f204e0..2eae4fdc0ed5 100644
--- a/media-gfx/pdf2svg/pdf2svg-0.2.2.ebuild
+++ b/media-gfx/pdf2svg/pdf2svg-0.2.2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 inherit eutils
 
 DESCRIPTION="pdf2svg is based on poppler and cairo and can convert pdf to svg files"
-HOMEPAGE="http://www.cityinthesky.co.uk/opensource/pdf2svg/"
+HOMEPAGE="http://www.cityinthesky.co.uk/opensource/pdf2svg/ https://github.com/dawbarton/pdf2svg/"
 SRC_URI="http://www.cityinthesky.co.uk/wp-content/uploads/2013/10/${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/media-gfx/pdf2svg/pdf2svg-0.2.3.ebuild b/media-gfx/pdf2svg/pdf2svg-0.2.3.ebuild
new file mode 100644
index 000000000000..a4cb3377aa84
--- /dev/null
+++ b/media-gfx/pdf2svg/pdf2svg-0.2.3.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="pdf2svg is based on poppler and cairo and can convert pdf to svg files"
+HOMEPAGE="http://www.cityinthesky.co.uk/opensource/pdf2svg/ https://github.com/dawbarton/pdf2svg/"
+SRC_URI="https://github.com/dawbarton/pdf2svg/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=app-text/poppler-0.12.3-r3:=[cairo]
+	>=x11-libs/cairo-1.2.6:=[svg]
+	x11-libs/gtk+:2="
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS="AUTHORS" # ChangeLog is only for <=0.2.1
+# and README.md doesn't have anything useful for usage
+
+src_prepare() {
+	sed -i \
+		-e 's:#include <stdio.h>:#include <stdio.h>\n#include <stdlib.h>:' \
+		${PN}.c || die
+	default
+}
diff --git a/media-gfx/printrun/metadata.xml b/media-gfx/printrun/metadata.xml
index 0611e6680367..e071fa596fc7 100644
--- a/media-gfx/printrun/metadata.xml
+++ b/media-gfx/printrun/metadata.xml
@@ -9,11 +9,11 @@
 		<name>Gentoo 3D print</name>
 	</maintainer>
 	<longdescription lang="en">
- Printrun is a set of G-code sending applications for RepRap.
- It consists of printcore (dumb G-code sender), pronsole (featured command line
- G-code sender), pronterface (featured G-code sender with graphical user
- interface), and a small collection of helpful scripts.
-</longdescription>
+		Printrun is a set of G-code sending applications for RepRap.
+		It consists of printcore (dumb G-code sender), pronsole (featured command line
+		G-code sender), pronterface (featured G-code sender with graphical user
+		interface), and a small collection of helpful scripts.
+	</longdescription>
 	<upstream>
 		<remote-id type="github">kliment/Printrun</remote-id>
 	</upstream>
diff --git a/media-gfx/pycam/Manifest b/media-gfx/pycam/Manifest
index 990a7583dc50..b20296ea598a 100644
--- a/media-gfx/pycam/Manifest
+++ b/media-gfx/pycam/Manifest
@@ -1,3 +1,2 @@
 DIST pycam-0.5.1.tar.gz 1680577 SHA256 e26a6db82efa4761a1db6b81de3165898430d5c14d09614b67321105d67e264c SHA512 f880d960f82eb374465a593f3b27e9f72148b3ceb99fde15bee4ccf1078acc8ef44ddfd9ee12f89e5b5e5ee14706b6e5d76eff7d0334c9526866ff263a057994 WHIRLPOOL 3f78eedcc6d745142578ef3e57141cf026b2ebca1a699a340237e2288c9c7054a1226ad47aa947d5de612c44c4445fd451e8adcfe7c0783b59332cb1a12998b9
 DIST pycam-0.6.2.tar.gz 3070572 BLAKE2B 3dbc6123f92035de1a9fa23453463ee1f45543c72f4f92b6d367d1031abd4cda638ff6b5bb261c8ae127c2cf875cf44837e76b73777acc8d58aaa3d95ec67894 SHA512 ff96a40aacf92ffd20e729912fc81177ffc01d688cfca300d31dd71399d91754dfbf5b864d95a88f938286e38c759c372968e53c29041653c85f446c6c9eca42
-DIST pycam-0.6_pre20130416.tar.gz 5766314 BLAKE2B ed29f1f553586b0428851b5d7d24fc56fc92351e5e9b1cafd3066b0012e39360223a0383256bde16ef9d888dc3631e2d8994abc19dbaecc4cace54b0828d523d SHA512 04d0a3328febbe58010cf9ad990b8c059f9fe0a17946d8485979082dfaa0b3b8705ffdcd695dca5887d9892a55285cca7acf774fe7c407240103da2de92dc9a1
diff --git a/media-gfx/pycam/pycam-0.6_pre20130416-r1.ebuild b/media-gfx/pycam/pycam-0.6_pre20130416-r1.ebuild
deleted file mode 100644
index 1eb3bef2beba..000000000000
--- a/media-gfx/pycam/pycam-0.6_pre20130416-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 python-r1
-
-DESCRIPTION="Open Source CAM - Toolpath Generation for 3-Axis CNC machining"
-HOMEPAGE="http://pycam.sourceforge.net/"
-SRC_URI="https://dev.gentoo.org/~slis/${P}.tar.gz"
-
-LICENSE="GPL-3"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-
-DEPEND="
-	dev-python/pygtk
-	dev-python/pygtkglext
-	dev-python/pyopengl
-"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	epatch "${FILESDIR}/fix-export-toolpath.patch"
-	distutils-r1_src_prepare
-}
diff --git a/media-gfx/svg2rlg/metadata.xml b/media-gfx/svg2rlg/metadata.xml
index 9563deaff36d..bba039ed4aed 100644
--- a/media-gfx/svg2rlg/metadata.xml
+++ b/media-gfx/svg2rlg/metadata.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
-  <longdescription lang="en">
-		The tool can be used as a console application to convert SVG to PDF
-		files.
+	<!-- maintainer-needed -->
+	<longdescription lang="en">
+		The tool can be used as a console application to convert SVG to PDF files.
 	</longdescription>
-  <upstream>
-    <remote-id type="pypi">svg2rlg</remote-id>
-  </upstream>
+	<upstream>
+		<remote-id type="pypi">svg2rlg</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 54f9f593c1ba..bfab379aaed0 100644
Binary files a/media-libs/Manifest.gz and b/media-libs/Manifest.gz differ
diff --git a/media-libs/libafterimage/metadata.xml b/media-libs/libafterimage/metadata.xml
index 2366daca2db9..fe1ce7f70cdc 100644
--- a/media-libs/libafterimage/metadata.xml
+++ b/media-libs/libafterimage/metadata.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>sci-physics@gentoo.org</email>
-	<name>Gentoo Physics Project</name>
-</maintainer>
-<longdescription lang="en">
-  libAfterImage is a generic image manipulation library.
-  It was initially implemented to address AfterStep Window Manager's needs for
-  image handling, but it evolved into software suitable for project
-  that has needs for handling images. Most of the popular image formats are
-  supported using standard libraries, with XCF, XPM, PPM/PNM, BMP, ICO,
-  TGA and GIF being supported internally. PNG, JPEG and TIFF formats are
-  supported via standard libraries. Text rendering capabilities
-  included, providing support for TrueType fonts using FreeType library,
-  and anti-aliasing of standard fonts from X window system.
-</longdescription>
-<use>
-	<flag name="shaping">Use MIT shaped X windows extention.</flag>
-	<flag name="shm">Use MIT shared memory extention for X image transfer.</flag>
-</use>
+	<maintainer type="project">
+		<email>sci-physics@gentoo.org</email>
+		<name>Gentoo Physics Project</name>
+	</maintainer>
+	<longdescription lang="en">
+		libAfterImage is a generic image manipulation library.
+		It was initially implemented to address AfterStep Window Manager's needs for
+		image handling, but it evolved into software suitable for project
+		that has needs for handling images. Most of the popular image formats are
+		supported using standard libraries, with XCF, XPM, PPM/PNM, BMP, ICO,
+		TGA and GIF being supported internally. PNG, JPEG and TIFF formats are
+		supported via standard libraries. Text rendering capabilities
+		included, providing support for TrueType fonts using FreeType library,
+		and anti-aliasing of standard fonts from X window system.
+	</longdescription>
+	<use>
+		<flag name="shaping">Use MIT shaped X windows extention.</flag>
+		<flag name="shm">Use MIT shared memory extention for X image transfer.</flag>
+	</use>
 </pkgmetadata>
diff --git a/media-libs/libbluray/metadata.xml b/media-libs/libbluray/metadata.xml
index e47b6ecc6bef..e690f3a3310d 100644
--- a/media-libs/libbluray/metadata.xml
+++ b/media-libs/libbluray/metadata.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>media-video@gentoo.org</email>
-    <name>Gentoo Video project</name>
-  </maintainer>
-  <use>
-    <flag name="aacs">Add support for decryption of AACS</flag>
-    <flag name="bdplus">Use <pkg>media-libs/libbdplus</pkg> for BD+ decryption</flag>
-    <flag name="java">Add support for BD-J</flag>
-	<flag name="udf">Add UDF (Universal Disk Format) support</flag>
-    <flag name="utils">Install command-line utilities and examples</flag>
-  </use>
+	<maintainer type="project">
+		<email>media-video@gentoo.org</email>
+		<name>Gentoo Video project</name>
+	</maintainer>
+	<use>
+		<flag name="aacs">Add support for decryption of AACS</flag>
+		<flag name="bdplus">Use <pkg>media-libs/libbdplus</pkg> for BD+ decryption</flag>
+		<flag name="java">Add support for BD-J</flag>
+		<flag name="udf">Add UDF (Universal Disk Format) support</flag>
+		<flag name="utils">Install command-line utilities and examples</flag>
+	</use>
 </pkgmetadata>
diff --git a/media-libs/libsdl/metadata.xml b/media-libs/libsdl/metadata.xml
index aede63475a7b..eef34652c6d4 100644
--- a/media-libs/libsdl/metadata.xml
+++ b/media-libs/libsdl/metadata.xml
@@ -1,30 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-  <email>games@gentoo.org</email>
-  <name>Gentoo Games Project</name>
-  </maintainer>
-  <longdescription>
-Simple DirectMedia Layer is a cross-platform multimedia library designed 
-to provide low level access to audio, keyboard, mouse, joystick, 3D 
-hardware via OpenGL, and 2D video framebuffer. It is used by MPEG 
-playback software, emulators, and many popular games, including the 
-award winning Linux port of "Civilization: Call To Power."
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+	<longdescription>
+		Simple DirectMedia Layer is a cross-platform multimedia library designed
+		to provide low level access to audio, keyboard, mouse, joystick, 3D
+		hardware via OpenGL, and 2D video framebuffer. It is used by MPEG
+		playback software, emulators, and many popular games, including the
+		award winning Linux port of "Civilization: Call To Power."
 
-Simple DirectMedia Layer supports Linux, Windows, BeOS, MacOS Classic, 
-MacOS X, FreeBSD, OpenBSD, BSD/OS, Solaris, IRIX, and QNX. There is also 
-code, but no official support, for Windows CE, AmigaOS, Dreamcast, 
-Atari, NetBSD, AIX, OSF/Tru64, RISC OS, and SymbianOS.
+		Simple DirectMedia Layer supports Linux, Windows, BeOS, MacOS Classic,
+		MacOS X, FreeBSD, OpenBSD, BSD/OS, Solaris, IRIX, and QNX. There is also
+		code, but no official support, for Windows CE, AmigaOS, Dreamcast,
+		Atari, NetBSD, AIX, OSF/Tru64, RISC OS, and SymbianOS.
 
-SDL is written in C, but works with C++ natively, and has bindings to 
-several other languages, including Ada, Eiffel, Java, Lua, ML, Perl, 
-PHP, Pike, Python, and Ruby.
-</longdescription>
-  <use>
-	<flag name="joystick">Control joystick support (disable at your own risk)</flag>
-	<flag name="sound">Control audio support (disable at your own risk)</flag>
-	<flag name="tslib">Build with tslib support for touchscreen devices</flag>
-	<flag name="video">Control video support (disable at your own risk)</flag>
-  </use>
+		SDL is written in C, but works with C++ natively, and has bindings to
+		several other languages, including Ada, Eiffel, Java, Lua, ML, Perl,
+		PHP, Pike, Python, and Ruby.
+	</longdescription>
+	<use>
+		<flag name="joystick">Control joystick support (disable at your own risk)</flag>
+		<flag name="sound">Control audio support (disable at your own risk)</flag>
+		<flag name="tslib">Build with tslib support for touchscreen devices</flag>
+		<flag name="video">Control video support (disable at your own risk)</flag>
+	</use>
 </pkgmetadata>
diff --git a/media-libs/libsdl2/metadata.xml b/media-libs/libsdl2/metadata.xml
index 04b7e237bb79..d72b5fdb4d5c 100644
--- a/media-libs/libsdl2/metadata.xml
+++ b/media-libs/libsdl2/metadata.xml
@@ -26,15 +26,10 @@
 	<use>
 		<flag name="fusionsound">use FusionSound audio driver</flag>
 		<flag name="gles">include OpenGL ES support</flag>
-		<flag name="haptic">Enable the haptic (force feedback) subsystem
-		</flag>
-		<flag name="joystick">Control joystick support
-			  (disable at your own risk)</flag>
-		<flag name="sound">Control audio support (disable at your own risk)
-		</flag>
-		<flag name="tslib">Build with tslib support for touchscreen devices
-		</flag>
-		<flag name="video">Control video support (disable at your own risk)
-		</flag>
+		<flag name="haptic">Enable the haptic (force feedback) subsystem</flag>
+		<flag name="joystick">Control joystick support (disable at your own risk)</flag>
+		<flag name="sound">Control audio support (disable at your own risk)</flag>
+		<flag name="tslib">Build with tslib support for touchscreen devices</flag>
+		<flag name="video">Control video support (disable at your own risk)</flag>
 	</use>
 </pkgmetadata>
diff --git a/media-libs/libsidplay/Manifest b/media-libs/libsidplay/Manifest
index 7bb1714673f3..87b267b1a61e 100644
--- a/media-libs/libsidplay/Manifest
+++ b/media-libs/libsidplay/Manifest
@@ -1,2 +1,2 @@
-DIST libsidplay-1.36.59.tgz 390097 SHA256 3da9b38d4eb5bf9e936b9604ba92da0594ef38047d50cf806a8e11c400008024 SHA512 e7b0859e1389683d3e6aad7040b78ba37bb0a393c85f68ddb8a064371f978b34cc2e951ec564fa1117d12885cd976d10b02937e132d9a11badecd8652cf4d410 WHIRLPOOL 121e985c861454c8755c4c6fe8066936bc0149c89ca9197ee23d03657f4e87b48e8f1e2c9e26202b04a1291746782be62cff86f16384ce9a9a50f885af9f4279
-DIST sidplay-libs-2.1.1.tar.gz 1900252 SHA256 e9a24ada48215a46d2c232a70c5601bc9505e997f120e8f2ba3713e09e28d1f9 SHA512 754cd41f3d2d76754049522c395022bc090f99ea838e6d1ffb8d7689f3aedad9b3879be0312d0af49ba108563296c1176d1e533d1151d5b33368bfda0a1910e3 WHIRLPOOL 53b4bd66bbac0bfc29514981f34e19fac41bae356d06e727f3a0f2ad2bedcb1cd815d22656bcf06460e9d908a91433bbdea029805af43b1cd97310f230f1c89c
+DIST libsidplay-1.36.59.tgz 390097 BLAKE2B bcb7e9eab4884270c8047af7f61e0afb2cf6ba24465b4859ac404f34cacec9a8c67ad42f3adf0c5f109cedecaa7710919296e30401c2dc0ca6f337186c9a329a SHA512 e7b0859e1389683d3e6aad7040b78ba37bb0a393c85f68ddb8a064371f978b34cc2e951ec564fa1117d12885cd976d10b02937e132d9a11badecd8652cf4d410
+DIST sidplay-libs-2.1.1.tar.gz 1900252 BLAKE2B f04e34f4cfc641a8222e5d53575108bd52deb2de2dc0b0d58e91581ade7128ac87f320f16e044baa23b54de6b5b6b833e9f6c0d37a1885341a329e778c0a0228 SHA512 754cd41f3d2d76754049522c395022bc090f99ea838e6d1ffb8d7689f3aedad9b3879be0312d0af49ba108563296c1176d1e533d1151d5b33368bfda0a1910e3
diff --git a/media-libs/libsidplay/libsidplay-1.36.59-r2.ebuild b/media-libs/libsidplay/libsidplay-1.36.59-r2.ebuild
index 3f64cb26126d..823b92a87bc5 100644
--- a/media-libs/libsidplay/libsidplay-1.36.59-r2.ebuild
+++ b/media-libs/libsidplay/libsidplay-1.36.59-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://critical.ch/distfiles/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="1"
-KEYWORDS="alpha amd64 ~hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ~hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="static-libs"
 DEPEND=""
 RDEPEND=""
diff --git a/media-libs/libyami/metadata.xml b/media-libs/libyami/metadata.xml
index 77b1337f051d..96b2eb2fb1e3 100644
--- a/media-libs/libyami/metadata.xml
+++ b/media-libs/libyami/metadata.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>media-video@gentoo.org</email>
-  </maintainer>
-  <use>
-	<flag name="egl">Enable EGL support.</flag>
-    <flag name="v4l">Add support for V4L2 hardware codecs.</flag>
-    <flag name="md5">Add support for generating md5 sums for each frame.</flag>
-    <flag name="dmabuf">Enable dma_buf buffer sharing.</flag>
-  </use>
-  <upstream>
-    <remote-id type="github">01org/libyami</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>media-video@gentoo.org</email>
+	</maintainer>
+	<use>
+		<flag name="egl">Enable EGL support.</flag>
+		<flag name="v4l">Add support for V4L2 hardware codecs.</flag>
+		<flag name="md5">Add support for generating md5 sums for each frame.</flag>
+		<flag name="dmabuf">Enable dma_buf buffer sharing.</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">01org/libyami</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-libs/lilv/metadata.xml b/media-libs/lilv/metadata.xml
index 1cf20fcf37e5..bbdf882cf303 100644
--- a/media-libs/lilv/metadata.xml
+++ b/media-libs/lilv/metadata.xml
@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-    <email>proaudio@gentoo.org</email>
-    <name>Gentoo ProAudio Project</name>
-  </maintainer>
-<longdescription lang="en">
-	Lilv is a library to make the use of LV2 plugins as simple as possible for applications. Lilv is the successor to SLV2, rewritten to be significantly faster and have minimal dependencies.
-</longdescription>
-  <use>
-    <flag name="dyn-manifest">Add LV2 Dynamic Manifest support. See http://lv2plug.in/ns/ext/dynmanifest/</flag>
-  </use>
+	<maintainer type="project">
+		<email>proaudio@gentoo.org</email>
+		<name>Gentoo ProAudio Project</name>
+	</maintainer>
+	<longdescription lang="en">
+		Lilv is a library to make the use of LV2 plugins as simple as possible for applications.
+		Lilv is the successor to SLV2, rewritten to be significantly faster and have minimal dependencies.
+	</longdescription>
+	<use>
+		<flag name="dyn-manifest">Add LV2 Dynamic Manifest support. See http://lv2plug.in/ns/ext/dynmanifest/</flag>
+	</use>
 </pkgmetadata>
diff --git a/media-libs/openctm/metadata.xml b/media-libs/openctm/metadata.xml
index 42ee0dd6eb0e..2dcfe570b108 100644
--- a/media-libs/openctm/metadata.xml
+++ b/media-libs/openctm/metadata.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>amynka@gentoo.org</email>
-  </maintainer>
-  <maintainer type="project">
-    <email>3dprint@gentoo.org</email>
-    <name>Gentoo 3D print</name>
-  </maintainer>
-  <longdescription>
-	OpenCTM - the Open Compressed Triangle Mesh file format - is a file format, a software library and a tool set for compression of 3D triangle meshes.
-  </longdescription>
-  <upstream>
-    <remote-id type="sourceforge">openctm</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>amynka@gentoo.org</email>
+	</maintainer>
+	<maintainer type="project">
+		<email>3dprint@gentoo.org</email>
+		<name>Gentoo 3D print</name>
+	</maintainer>
+	<longdescription>
+		OpenCTM - the Open Compressed Triangle Mesh file format - is a file format, a software library and a tool set for compression of 3D triangle meshes.
+	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">openctm</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index 0e8ded1a6aa8..f6394c767379 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -1,10 +1,9 @@
-DIST imgcodecs-opencv-3.3.0.tar.gz 7724 SHA256 5d1ef31142ed42e06b2bb71134da7e5fae5e94e70896aae26ac2dc0baa74a161 SHA512 9c6fc31830e299e3d15da1cfc3468fe23eecda970a02e5826e0a7cfba34200c557c0e46f940154a26e9916da05859a83376217cbe7452ec8d14e99bc76f63d37 WHIRLPOOL fbf18817a3f6e82d2ce1ecad237b223244328208fe9926033133c2126e785a1ad3fbf06b69113a94996d624e73003564ea9ce2314ffbdecfb0ea3fd67308084d
+DIST imgcodecs-opencv-3.3.0.tar.gz 7724 BLAKE2B 0e1c931a6dd796a7fa8e4a958f9a959d3bbba9bfa636a74a22d839b2919a8e1d0843765bcb69c5fbff7156efad0db2e5b3b70a2fc6e1911c0317ba46142cc130 SHA512 9c6fc31830e299e3d15da1cfc3468fe23eecda970a02e5826e0a7cfba34200c557c0e46f940154a26e9916da05859a83376217cbe7452ec8d14e99bc76f63d37
 DIST opencv-2.4.13.tar.gz 91669572 BLAKE2B 7f6be39e29c0db5d005cb14215fdf5955fa69c34d72c4f1e1fa8bf8de1e748a0d2fe5febb43296ef529c57e4dec8d1b6739c0c4df9e64657b9550ed382fbc4b9 SHA512 efdc4340fdf557dae44ac604c8c20f61ced89f99274264b61c2640f28741504462c6b57076e207040ca2513e3921275bdfbe6c22fc123bd50df78745e6b7bcd6
-DIST opencv-2.4.13.zip 94319943 SHA256 fa6a45f635f4e1dbc982b8ccc93206650e7fc584b2f3dd945759ce28b047b94f SHA512 b5ccaa22deabfedd29b697296d265a32c7db959f2e94ca3643c1cde65fb84463809535f2e6bd49c4baa06958fa223a32bbfdd7234b8e160ec333fd9cd7800d3b WHIRLPOOL 86f7690b460dbcf70dec30c29784d96b2bb99e43ba70fe967d18b375fcee4f8934591f0d9fe2ff6717346eb9be8628766658d589eae9943d528352d1ce1df455
 DIST opencv-3.1.0.tar.gz 76135587 SHA256 f00b3c4f42acda07d89031a2ebb5ebe390764a133502c03a511f67b78bbd4fbf SHA512 57e0fe41e3d5d1dc036e7fc5673523e53d54f5f62e4d3bcb95238a9cd53e79da7c1704dc136ce632f7cfce369ebf5eb27f629a9b6ac4f7fa34120b80b5c7438f WHIRLPOOL b2825d5cafa87e0fe9cacd093ddb969913d916c0370819073b2bde3c598798efcf23c406aae2116f2628c564ca99e5f871a448a3ece97d8d29ec73841ac283b4
 DIST opencv-3.1.0_contrib-75b3ea9.tar.gz 54277105 SHA256 478f742457d3f4e96f857b726e35b28a8d20a1de8e5f51b8671251bc896d443b SHA512 d1d11520b8729fbaf0257c927654251ff9ac1ba5cf937af9dd973ec39f483d1ee08aff7ad3f1a9941fef921a35dc466ac5574918197ddecd3f6c66b682bf671a WHIRLPOOL 18b70014428c4fa532658ca5ac332bffaae049b468f46cb027a6972f21f5b2bd17d02b33d68c43b84f821a77fa09efb9c372499cfa4f645a0516b93acb858353
 DIST opencv-3.2.0.tar.gz 78861546 SHA256 b9d62dfffb8130d59d587627703d5f3e6252dce4a94c1955784998da7a39dd35 SHA512 a338f4b4cdebfc2dcd763427b9c9632b3a3b0d072117b8e6367c73ea1ac21f7148553a23c7afbb44b01a48be3be95520789c2de1d6ae230b7b414ee713d3606d WHIRLPOOL 092c0c1195d80f89e0e2fd030a93eb80e7b83ce155fdcd9fa071248be20127a684922c83de73be9bf321d934e14b0b4e60cc78ab272ab9d39d6707da37db30d3
 DIST opencv-3.2.0_contrib.tar.gz 54765210 SHA256 1e2bb6c9a41c602904cc7df3f8fb8f98363a88ea564f2a087240483426bf8cbe SHA512 eadb6a8a3625235b0c71e29c36d15d9342278aaf9148ef6a7e1aa80f4db0491aaf30b6df16bfd0cd358402b2a3059b6acbce23fb5fe2c0c57150a733ffbbff5a WHIRLPOOL eb8f916c19474a58f4c2785e50dc261a31f684a917011473b94a19d26e4e9845c042f77196c000dd97543699b745360114cdd31cad549379b6394e9d727c72a8
-DIST opencv-3.3.0.tar.gz 81238534 SHA256 8bb312b9d9fd17336dc1f8b3ac82f021ca50e2034afc866098866176d985adc6 SHA512 13dee5c1c5fec1dccdbb05879d299b93ef8ddeb87f561a6c4178e33a4cf5ae919765119068d0387a3efea0e09a625ca993cffac60a772159690fcbee4e8d70fb WHIRLPOOL 211496e559fa3a78b662329a5e21613fdc39b616155584311f82f3d7c733676bcb58d8e04ffda2d73658933240e16122212413fa1c2e6dfe764439c9460d7c41
-DIST opencv-3.3.0_contrib.tar.gz 54848519 SHA256 e94acf39cd4854c3ef905e06516e5f74f26dddfa6477af89558fb40a57aeb444 SHA512 ebe3dbe6c754c6fbaabbf6b0d2a4209964e625fd68e593f30ce043792740c8c1d4440d7870949b5b33f488fd7e2e05f3752287b7f50dd24c29202e268776520e WHIRLPOOL b186f673e276c4b8c4c5253fd17181f0e1b7bd4a0e0c74f15ab55ea5f2ee54a72fc295247c7bfcbfbedba1fc01b4c5e2a53a2a4eff79ab0480977a6eefc90c58
+DIST opencv-3.3.0.tar.gz 81238534 BLAKE2B 9eac7de8eefbcc9981a249343052c2dcada4e73c3406d545a89b9e6a054a7c7153933537d123f227caf51f23196fcaaed4135229db195e9c4139f2977e034e34 SHA512 13dee5c1c5fec1dccdbb05879d299b93ef8ddeb87f561a6c4178e33a4cf5ae919765119068d0387a3efea0e09a625ca993cffac60a772159690fcbee4e8d70fb
+DIST opencv-3.3.0_contrib.tar.gz 54848519 BLAKE2B 53615af19426bf7a1540a6f23c7803276d6de594260b0d87b06b6b12c9e20326925a275e31e017784e8e876e30df7b8f326e192a75c5300252ae09f50d0d9a8b SHA512 ebe3dbe6c754c6fbaabbf6b0d2a4209964e625fd68e593f30ce043792740c8c1d4440d7870949b5b33f488fd7e2e05f3752287b7f50dd24c29202e268776520e
 DIST vgg_boostdesc-3.2.0.tar.gz 1867770 SHA256 6da9c2465e2b36330fa5d5c45320a0667da5cb4eafd66a5b1f45feb2af047a27 SHA512 4a046aedd639c8eb4b295b0f499e756deb66210ca083f0124c75531e540663367cb58f6d175f66c4713324177036cd89a8869bdab2de8d1736dafc7f00ef9f44 WHIRLPOOL 5c78e43c95d40d103ac741248deb130bcb49a5b7e2cd012135572630b525b6f15a7f89948170c76545d97eb3815a000a2a1236ad24de2205eeb8938ee8eb0c12
diff --git a/media-libs/opencv/opencv-2.4.13-r3.ebuild b/media-libs/opencv/opencv-2.4.13-r3.ebuild
index 34a5fe5bd589..9ff99bb067e2 100644
--- a/media-libs/opencv/opencv-2.4.13-r3.ebuild
+++ b/media-libs/opencv/opencv-2.4.13-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/Itseez/opencv/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/2.4"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux"
 IUSE="cuda +eigen examples ffmpeg gstreamer gtk ieee1394 ipp jpeg jpeg2k libav opencl openexr opengl openmp pch png +python qt5 testprograms threads tiff v4l vtk xine"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/media-libs/opencv/opencv-2.4.13.ebuild b/media-libs/opencv/opencv-2.4.13.ebuild
deleted file mode 100644
index b267fe7783b7..000000000000
--- a/media-libs/opencv/opencv-2.4.13.ebuild
+++ /dev/null
@@ -1,240 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit toolchain-funcs cmake-utils python-single-r1 java-pkg-opt-2 java-ant-2
-
-DESCRIPTION="A collection of algorithms and sample code for various computer vision problems"
-HOMEPAGE="https://opencv.org"
-
-SRC_URI="https://github.com/Itseez/opencv/archive/${PV}.zip -> ${P}.zip"
-
-LICENSE="BSD"
-SLOT="0/2.4"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux"
-IUSE="cuda +eigen examples ffmpeg gstreamer gtk ieee1394 ipp jpeg jpeg2k libav opencl openexr opengl openmp pch png +python qt4 qt5 testprograms threads tiff v4l vtk xine"
-REQUIRED_USE="
-	python? ( ${PYTHON_REQUIRED_USE} )
-	?? ( qt4 qt5 )
-"
-
-# The following logic is intrinsic in the build system, but we do not enforce
-# it on the useflags since this just blocks emerging pointlessly:
-#	gtk? ( !qt4 )
-#	opengl? ( || ( gtk qt4 ) )
-#	openmp? ( !threads )
-
-RDEPEND="
-	app-arch/bzip2
-	sys-libs/zlib
-	cuda? ( >=dev-util/nvidia-cuda-toolkit-5.5 )
-	ffmpeg? (
-		libav? ( media-video/libav:0= )
-		!libav? ( media-video/ffmpeg:0= )
-	)
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-	)
-	gtk? (
-		dev-libs/glib:2
-		x11-libs/gtk+:2
-		opengl? ( x11-libs/gtkglext )
-	)
-	java? ( >=virtual/jre-1.6:* )
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( media-libs/jasper:= )
-	ieee1394? (
-		media-libs/libdc1394
-		sys-libs/libraw1394
-	)
-	ipp? ( sci-libs/ipp )
-	opencl? ( virtual/opencl )
-	openexr? ( media-libs/openexr )
-	opengl? ( virtual/opengl virtual/glu )
-	png? ( media-libs/libpng:0= )
-	python? ( ${PYTHON_DEPS} dev-python/numpy[${PYTHON_USEDEP}] )
-	qt4? (
-		dev-qt/qtgui:4
-		dev-qt/qttest:4
-		opengl? ( dev-qt/qtopengl:4 )
-	)
-	qt5? (
-		dev-qt/qtgui:5
-		dev-qt/qttest:5
-		dev-qt/qtconcurrent:5
-		opengl? ( dev-qt/qtopengl:5 )
-	)
-	threads? ( dev-cpp/tbb )
-	tiff? ( media-libs/tiff:0 )
-	v4l? ( >=media-libs/libv4l-0.8.3 )
-	vtk? ( sci-libs/vtk[rendering] )
-	xine? ( media-libs/xine-lib )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	eigen? ( dev-cpp/eigen:3 )
-	java? ( >=virtual/jdk-1.6 )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.3.1a-libav-0.7.patch"
-	"${FILESDIR}/${PN}-2.4.3-gcc47.patch"
-	"${FILESDIR}/${PN}-2.4.2-cflags.patch"
-	"${FILESDIR}/${PN}-2.4.8-javamagic.patch"
-	"${FILESDIR}/${PN}-2.4.9-cuda-pkg-config.patch"
-	 "${FILESDIR}/${PN}-3.0.0-gles.patch"
-	)
-
-#"${FILESDIR}/${P}-git-autodetect.patch
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-	use python && python-single-r1_pkg_setup
-	java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# remove bundled stuff
-	rm -rf 3rdparty || die "Removing 3rd party components failed"
-	sed -i \
-		-e '/add_subdirectory(3rdparty)/ d' \
-		CMakeLists.txt || die
-
-	java-pkg-opt-2_src_prepare
-}
-
-src_configure() {
-
-	JAVA_ANT_ENCODING="iso-8859-1"
-	# set encoding so even this cmake build will pick it up.
-	export ANT_OPTS+=" -Dfile.encoding=iso-8859-1"
-	java-ant-2_src_configure
-
-	# please dont sort here, order is the same as in CMakeLists.txt
-	local mycmakeargs=(
-	# the optinal dependency libraries
-		-DWITH_1394=$(usex ieee1394)
-		-DWITH_AVFOUNDATION=OFF
-		-DWITH_VTK=$(usex vtk)
-		-DWITH_EIGEN=$(usex eigen)
-		-DWITH_VFW=OFF
-		-DWITH_FFMPEG=$(usex ffmpeg)
-		-DWITH_GSTREAMER=$(usex gstreamer)
-		-DWITH_GSTREAMER_0_10=OFF
-		-DWITH_GTK=$(usex gtk)
-		-DWITH_IMAGEIO=OFF
-		-DWITH_IPP=$(usex ipp)
-		-DWITH_JASPER=$(usex jpeg2k)
-		-DWITH_JPEG=$(usex jpeg)
-		-DWITH_OPENEXR=$(usex openexr)
-		-DWITH_OPENGL=$(usex opengl)
-		-DWITH_OPENCL=$(usex opencl)
-		-DWITH_OPENNI=OFF
-		-DWITH_PNG=$(usex png)
-		-DWITH_PVAPI=OFF
-		-DWITH_GIGEAPI=OFF
-		-DWITH_WIN32UI=OFF
-		-DWITH_QUICKTIME=OFF
-		-DWITH_TBB=$(usex threads)
-		-DWITH_OPENMP=$(usex openmp)
-		-DWITH_CSTRIPES=OFF
-		-DWITH_TIFF=$(usex tiff)
-		-DWITH_UNICAP=OFF
-		-DWITH_V4L=$(usex v4l)
-		-DWITH_LIBV4L=$(usex v4l)
-		-DWITH_DSHOW=ON
-		-DWITH_MSMF=OFF
-		-DWITH_XIMEA=OFF
-		-DWITH_XINE=$(usex xine)
-		-DWITH_OPENCL=$(usex opencl)
-		-DWITH_OPENCLAMDFFT=$(usex opencl)
-		-DWITH_OPENCLAMDBLAS=$(usex opencl)
-		-DWITH_INTELPERC=OFF
-		-DWITH_JAVA=$(usex java)
-
-		# the build components
-		-DBUILD_SHARED_LIBS=ON
-		-DBUILD_ANDROID_EXAMPLES=OFF
-		-DBUILD_DOCS=OFF #too much dark magic in cmakelists
-		-DBUILD_EXAMPLES=$(usex examples)
-		-DBUILD_PERF_TESTS=OFF
-		-DBUILD_TESTS=$(usex testprograms)
-
-		# install examples
-		-DINSTALL_C_EXAMPLES=$(usex examples)
-		-DINSTALL_TESTS=$(usex testprograms)
-
-		# build options
-		-DENABLE_PRECOMPILED_HEADERS=$(usex pch)
-		-DENABLE_SOLUTION_FOLDERS=OFF
-		-DENABLE_PROFILING=OFF
-		-DENABLE_COVERAGE=OFF
-		-DENABLE_OMIT_FRAME_POINTER=OFF
-		-DENABLE_FAST_MATH=OFF					#
-		-DENABLE_SSE=OFF					# these options do nothing but
-		-DENABLE_SSE2=OFF					# add params to CFLAGS
-		-DENABLE_SSE3=OFF
-		-DENABLE_SSSE3=OFF
-		-DENABLE_SSE41=OFF
-		-DENABLE_SSE42=OFF
-
-		-DOPENCV_EXTRA_FLAGS_RELEASE=""				# black magic
-	)
-
-	if use qt4; then
-		mycmakeargs+=( -DWITH_QT=4 )
-	elif use qt5; then
-		mycmakeargs+=( -DWITH_QT=5 )
-	else
-		mycmakeargs+=( -DWITH_QT=OFF )
-	fi
-
-	if use cuda; then
-		if [[ "$(gcc-version)" > "4.8" ]]; then
-			# bug 577410
-			# #error -- unsupported GNU version! gcc 4.9 and up are not supported!
-			ewarn "CUDA and >=sys-devel/gcc-4.9 do not play well together. Disabling CUDA support."
-			mycmakeargs+=( -DWITH_CUDA=OFF )
-			mycmakeargs+=( -DWITH_CUBLAS=OFF )
-			mycmakeargs+=( -DWITH_CUFFT=OFF )
-
-		else
-			mycmakeargs+=( -DWITH_CUDA=ON )
-			mycmakeargs+=( -DWITH_CUBLAS=ON )
-			mycmakeargs+=( -DWITH_CUFFT=ON )
-			mycmakeargs+=( -DCUDA_NPP_LIBRARY_ROOT_DIR=/opt/cuda )
-		fi
-	else
-		mycmakeargs+=( -DWITH_CUDA=OFF )
-		mycmakeargs+=( -DWITH_CUBLAS=OFF )
-		mycmakeargs+=( -DWITH_CUFFT=OFF )
-	fi
-
-	if use examples && use python; then
-		mycmakeargs+=( -DINSTALL_PYTHON_EXAMPLES=ON )
-	else
-		mycmakeargs+=( -DINSTALL_PYTHON_EXAMPLES=OFF )
-	fi
-
-	# things we want to be hard off or not yet figured out
-	mycmakeargs+=(
-		-DOPENCV_BUILD_3RDPARTY_LIBS=OFF
-		-DBUILD_PACKAGE=OFF
-	)
-
-	# things we want to be hard enabled not worth useflag
-	mycmakeargs+=(
-		-DCMAKE_SKIP_RPATH=ON
-		-DOPENCV_DOC_INSTALL_PATH=
-	)
-
-	# workaround for bug 413429
-	tc-export CC CXX
-
-	cmake-utils_src_configure
-}
diff --git a/media-libs/openglide/metadata.xml b/media-libs/openglide/metadata.xml
index b14a9fd7bc1b..7ead02eb8d86 100644
--- a/media-libs/openglide/metadata.xml
+++ b/media-libs/openglide/metadata.xml
@@ -14,8 +14,8 @@
 		<remote-id type="sourceforge">openglide</remote-id>
 	</upstream>
 	<longdescription>
-	  OpenGLide is a Glide to OpenGL wrapper. It emulates a Voodoo
-	  board so you can run old DOS/Windows Glide games by translating
-	  Glide calls into OpenGL.
+		OpenGLide is a Glide to OpenGL wrapper. It emulates a Voodoo
+		board so you can run old DOS/Windows Glide games by translating
+		Glide calls into OpenGL.
 	</longdescription>
 </pkgmetadata>
diff --git a/media-libs/openh264/metadata.xml b/media-libs/openh264/metadata.xml
index 13867b06c491..4971276ef942 100644
--- a/media-libs/openh264/metadata.xml
+++ b/media-libs/openh264/metadata.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+	<maintainer type="person">
 		<email>axs@gentoo.org</email>
 		<name>Ian Stakenvicius</name>
 	</maintainer>
-    <maintainer type="project">
-      <email>media-video@gentoo.org</email>
-    </maintainer>
+	<maintainer type="project">
+		<email>media-video@gentoo.org</email>
+	</maintainer>
 	<use>
 		<flag name="plugin">Install the Gecko Media Plugin (GMP) for use with Mozilla packages</flag>
 		<flag name="utils">Install the CLI encoder and decoder utilities</flag>
diff --git a/media-libs/openicc/metadata.xml b/media-libs/openicc/metadata.xml
index 94db08dfa706..fb3005160158 100644
--- a/media-libs/openicc/metadata.xml
+++ b/media-libs/openicc/metadata.xml
@@ -5,7 +5,7 @@
 		<email>asturm@gentoo.org</email>
 		<name>Andreas Sturmlechner</name>
 	</maintainer>
-    <upstream>
-        <remote-id type="github">OpenICC/config</remote-id>
-    </upstream>
+	<upstream>
+		<remote-id type="github">OpenICC/config</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-libs/sdl-gfx/metadata.xml b/media-libs/sdl-gfx/metadata.xml
index a9c8ec3bb72b..10e8f7e5f947 100644
--- a/media-libs/sdl-gfx/metadata.xml
+++ b/media-libs/sdl-gfx/metadata.xml
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-<longdescription>
-SDL graphics drawing primitives and other support functions
-The SDL_gfx library evolved out of the SDL_gfxPrimitives code which provided basic drawing 
-routines such as lines, circles or polygons and SDL_rotozoom which implemented a 
-interpolating rotozoomer for SDL surfaces.
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+	<longdescription>
+		SDL graphics drawing primitives and other support functions
+		The SDL_gfx library evolved out of the SDL_gfxPrimitives code which provided basic drawing
+		routines such as lines, circles or polygons and SDL_rotozoom which implemented a
+		interpolating rotozoomer for SDL surfaces.
 
-The current components of the SDL_gfx library are:
+		The current components of the SDL_gfx library are:
 
-    * Graphic Primitives (SDL_gfxPrimitves.h)
-    * Rotozoomer (SDL_rotozoom.h)
-    * Framerate control (SDL_framerate.h)
-    * MMX image filters (SDL_imageFilter.h) 
+		* Graphic Primitives (SDL_gfxPrimitves.h)
+		* Rotozoomer (SDL_rotozoom.h)
+		* Framerate control (SDL_framerate.h)
+		* MMX image filters (SDL_imageFilter.h)
 
-The library is backwards compatible to the above mentioned code. Its is written in plain C 
-and can be used in C++ code.
-</longdescription>
+		The library is backwards compatible to the above mentioned code. Its is written in plain C
+		and can be used in C++ code.
+	</longdescription>
 </pkgmetadata>
diff --git a/media-libs/sdl-image/metadata.xml b/media-libs/sdl-image/metadata.xml
index be29660cd215..a92c1a1c50db 100644
--- a/media-libs/sdl-image/metadata.xml
+++ b/media-libs/sdl-image/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	 <email>games@gentoo.org</email>
-	 <name>Gentoo Games Project</name>
-</maintainer>
-<use>
-	 <flag name="webp">support loading WEBP images</flag>
-</use>
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+	<use>
+		<flag name="webp">support loading WEBP images</flag>
+	</use>
 </pkgmetadata>
diff --git a/media-libs/sdl2-image/metadata.xml b/media-libs/sdl2-image/metadata.xml
index 3d3ba86206dd..a92c1a1c50db 100644
--- a/media-libs/sdl2-image/metadata.xml
+++ b/media-libs/sdl2-image/metadata.xml
@@ -2,10 +2,10 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
-		 <email>games@gentoo.org</email>
-		 <name>Gentoo Games Project</name>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
 	</maintainer>
 	<use>
-		 <flag name="webp">support loading WEBP images</flag>
+		<flag name="webp">support loading WEBP images</flag>
 	</use>
 </pkgmetadata>
diff --git a/media-libs/spandsp/metadata.xml b/media-libs/spandsp/metadata.xml
index 3a50b0af1588..747778779369 100644
--- a/media-libs/spandsp/metadata.xml
+++ b/media-libs/spandsp/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person"><email>chainsaw@gentoo.org</email></maintainer>
-  <use>
-	<flag name="fixed-point">Enable fixed point support</flag>
-  </use>
+	<maintainer type="person">
+		<email>chainsaw@gentoo.org</email>
+	</maintainer>
+	<use>
+		<flag name="fixed-point">Enable fixed point support</flag>
+	</use>
 </pkgmetadata>
diff --git a/media-libs/tiff/metadata.xml b/media-libs/tiff/metadata.xml
index 1844a8c19073..815534de05d9 100644
--- a/media-libs/tiff/metadata.xml
+++ b/media-libs/tiff/metadata.xml
@@ -1,14 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>graphics@gentoo.org</email>
-	<name>Gentoo Graphics Project</name>
-</maintainer>
-<longdescription>TIFF image library and tools, mostly for scanner and fax
- support, but also used by GIS and other imaging tools.</longdescription>
-<upstream>
-	<remote-id type="cpe">cpe:/a:libtiff:libtiff</remote-id>
-	<remote-id type="cpe">cpe:/a:libtiff_project:libtiff</remote-id>
-</upstream>
+	<maintainer type="project">
+		<email>graphics@gentoo.org</email>
+		<name>Gentoo Graphics Project</name>
+	</maintainer>
+	<longdescription>
+		TIFF image library and tools, mostly for scanner and fax
+		support, but also used by GIS and other imaging tools.
+	</longdescription>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:libtiff:libtiff</remote-id>
+		<remote-id type="cpe">cpe:/a:libtiff_project:libtiff</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-libs/vigra/metadata.xml b/media-libs/vigra/metadata.xml
index aad87b83017b..ab7510955b87 100644
--- a/media-libs/vigra/metadata.xml
+++ b/media-libs/vigra/metadata.xml
@@ -5,10 +5,10 @@
 		<email>printing@gentoo.org</email>
 		<name>Gentoo Printing Project</name>
 	</maintainer>
+	<use>
+		<flag name="valgrind">Enable valgrind in make check</flag>
+	</use>
 	<upstream>
 		<remote-id type="github">ukoethe/vigra</remote-id>
 	</upstream>
-	<use>
-	    <flag name="valgrind">Enable valgrind in make check</flag>
-	</use>
 </pkgmetadata>
diff --git a/media-libs/x264/metadata.xml b/media-libs/x264/metadata.xml
index 2088ea59fe46..1ab4b5f74437 100644
--- a/media-libs/x264/metadata.xml
+++ b/media-libs/x264/metadata.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>media-video@gentoo.org</email>
-  </maintainer>
-  <use>
-    <flag name="10bit">Set output bit depth to 10, this may not be compatible with all decoders</flag>
-    <flag name="interlaced">enable interlaced encoding support, this can decrease encoding speed by up to 2%</flag>
-	<flag name="opencl">Add support for OpenCL.</flag>
-    <flag name="pic">disable optimized assembly code that is not PIC friendly</flag>
-  </use>
+	<maintainer type="project">
+		<email>media-video@gentoo.org</email>
+	</maintainer>
+	<use>
+		<flag name="10bit">Set output bit depth to 10, this may not be compatible with all decoders</flag>
+		<flag name="interlaced">enable interlaced encoding support, this can decrease encoding speed by up to 2%</flag>
+		<flag name="opencl">Add support for OpenCL.</flag>
+		<flag name="pic">disable optimized assembly code that is not PIC friendly</flag>
+	</use>
 </pkgmetadata>
diff --git a/media-plugins/Manifest.gz b/media-plugins/Manifest.gz
index 4250c9803966..26ca63d8d449 100644
Binary files a/media-plugins/Manifest.gz and b/media-plugins/Manifest.gz differ
diff --git a/media-plugins/gmpc-lyrics/metadata.xml b/media-plugins/gmpc-lyrics/metadata.xml
index 60ae1fbf3f00..bb2d5997f23f 100644
--- a/media-plugins/gmpc-lyrics/metadata.xml
+++ b/media-plugins/gmpc-lyrics/metadata.xml
@@ -6,11 +6,11 @@
 		<name>Gentoo Sound project</name>
 	</maintainer>
 	<longdescription>
-This plugin fetches lyrics from the internet. It uses the following websites as sources:
-    * LyricWiki
-    * LeosLyrics
-    * Lyrics Tracker
-</longdescription>
+		This plugin fetches lyrics from the internet. It uses the following websites as sources:
+		* LyricWiki
+		* LeosLyrics
+		* Lyrics Tracker
+	</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">musicpd</remote-id>
 	</upstream>
diff --git a/media-plugins/gst-plugins-ladspa/Manifest b/media-plugins/gst-plugins-ladspa/Manifest
index 68a5b6554301..22e121fee3b0 100644
--- a/media-plugins/gst-plugins-ladspa/Manifest
+++ b/media-plugins/gst-plugins-ladspa/Manifest
@@ -1 +1,2 @@
 DIST gst-plugins-bad-0.10.23.tar.xz 3155044 SHA256 03cf0786391c64625569072e904082a08861f05a63d64b2f8e8dad3f26d81bf9 SHA512 6437dd12707ef29651f4014b54612cf2a3a42ed4e05a1c5f4a432d80e27efd2abc0df891ebcfdc9e7b2cf9f71a15b88e48b3aa6db24a178ed6de3b1bdf4c3dc4 WHIRLPOOL dd657100909c32ab75cb8aada8db24d68ddf7a10dc0eb055982d7e4d9ae7a50c364eeac9017cea8b176734fc09cf7f8e4e8f52d24e3173806633ddb8a7acd93c
+DIST gst-plugins-bad-1.12.3.tar.xz 4707000 BLAKE2B 1cb82e6f1c20d24a42ed0c7465e4dd8815627b0e716fe9be5d005ddd609c92a08619214a6b15059e7f537dadbc36c34d4c6ebfde1284c6a6029d2edf89bf9fa2 SHA512 6df47381de3a2f4286d047c1e7de2c76dd4312c9806636e2012717282cde0f3e5b2d0ffa910c564c8e122b19363e842b663cce1eda7ae95a05d63d1dbbd52661
diff --git a/media-plugins/gst-plugins-ladspa/gst-plugins-ladspa-1.12.3.ebuild b/media-plugins/gst-plugins-ladspa/gst-plugins-ladspa-1.12.3.ebuild
new file mode 100644
index 000000000000..3e754eb4b126
--- /dev/null
+++ b/media-plugins/gst-plugins-ladspa/gst-plugins-ladspa-1.12.3.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+DESCRIPTION="Ladspa elements for Gstreamer"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	media-libs/ladspa-sdk
+	>=media-libs/gstreamer-1.12:1.0
+"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/vdr-autosort/metadata.xml b/media-plugins/vdr-autosort/metadata.xml
index 3be95f1528c8..a7e476d255a0 100644
--- a/media-plugins/vdr-autosort/metadata.xml
+++ b/media-plugins/vdr-autosort/metadata.xml
@@ -11,8 +11,8 @@
 		housekeeping thread.
 	</longdescription>
 	<longdescription lang="de">
-                Das AutoSort-Plugin erweitert den VDR um die Fähigkeit, die
-                Kanalliste automatisch nach benutzerspezifischen Kriterien
-                zu sortieren.
+		Das AutoSort-Plugin erweitert den VDR um die Fähigkeit, die
+		Kanalliste automatisch nach benutzerspezifischen Kriterien
+		zu sortieren.
 	</longdescription>
 </pkgmetadata>
diff --git a/media-plugins/vdr-burn-templates/metadata.xml b/media-plugins/vdr-burn-templates/metadata.xml
index 714d921b61a9..3b87101de979 100644
--- a/media-plugins/vdr-burn-templates/metadata.xml
+++ b/media-plugins/vdr-burn-templates/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
+	<maintainer type="project">
 		<email>vdr@gentoo.org</email>
-	    <name>Gentoo VDR Project</name>
+		<name>Gentoo VDR Project</name>
 	</maintainer>
 	<longdescription>Many Templates for the vdr-burn Plugin</longdescription>
 </pkgmetadata>
diff --git a/media-plugins/vdr-burn/metadata.xml b/media-plugins/vdr-burn/metadata.xml
index 699f6c4c93a1..b6a0daaae369 100644
--- a/media-plugins/vdr-burn/metadata.xml
+++ b/media-plugins/vdr-burn/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
+	<maintainer type="project">
 		<email>vdr@gentoo.org</email>
 		<name>Gentoo VDR Project</name>
-    </maintainer>
-    <longdescription>VDR plugin to burn DVD's and DVD file structures</longdescription>
+	</maintainer>
+	<longdescription>VDR plugin to burn DVD's and DVD file structures</longdescription>
 	<use>
 		<flag name="dvdarchive">DMH DVD - Archive</flag>
 	</use>
diff --git a/media-plugins/vdr-clock/metadata.xml b/media-plugins/vdr-clock/metadata.xml
index 2c38a346b77d..f780a1ce0925 100644
--- a/media-plugins/vdr-clock/metadata.xml
+++ b/media-plugins/vdr-clock/metadata.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <maintainer type="project">
-            <email>vdr@gentoo.org</email>
-            <name>Gentoo VDR Project</name>
-    	    <description>
-	    Please contacts maintainer before you something change
-            </description>
-        </maintainer>
-    <longdescription>
-          This is the Clock plugin for the Video Disk Recorder (VDR)
-    </longdescription>
+	<maintainer type="project">
+		<email>vdr@gentoo.org</email>
+		<name>Gentoo VDR Project</name>
+		<description>
+			Please contacts maintainer before you change something
+		</description>
+	</maintainer>
+	<longdescription>
+		This is the Clock plugin for the Video Disk Recorder (VDR)
+	</longdescription>
 </pkgmetadata>
diff --git a/media-plugins/vdr-dvbsddevice/metadata.xml b/media-plugins/vdr-dvbsddevice/metadata.xml
index 18b2e396af49..984a01fab265 100644
--- a/media-plugins/vdr-dvbsddevice/metadata.xml
+++ b/media-plugins/vdr-dvbsddevice/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
+	<maintainer type="project">
 		<email>vdr@gentoo.org</email>
 		<name>Gentoo VDR Project</name>
-    </maintainer>
+	</maintainer>
 </pkgmetadata>
diff --git a/media-plugins/vdr-dvd/metadata.xml b/media-plugins/vdr-dvd/metadata.xml
index 79c4956e9dbb..dd16e5bcd1b2 100644
--- a/media-plugins/vdr-dvd/metadata.xml
+++ b/media-plugins/vdr-dvd/metadata.xml
@@ -6,7 +6,7 @@
 		<name>Gentoo VDR Project</name>
 	</maintainer>
 	<longdescription>
-	  This is the DVD plugin for the Video Disk Recorder (VDR)
+		This is the DVD plugin for the Video Disk Recorder (VDR)
 	</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">dvdplugin</remote-id>
diff --git a/media-plugins/vdr-dvdswitch/metadata.xml b/media-plugins/vdr-dvdswitch/metadata.xml
index 3fffe4c38bfb..f929b54e4906 100644
--- a/media-plugins/vdr-dvdswitch/metadata.xml
+++ b/media-plugins/vdr-dvdswitch/metadata.xml
@@ -2,8 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
-			<email>vdr@gentoo.org</email>
-			<name>Gentoo VDR Project</name>
-		</maintainer>
-  <longdescription>VDR plugin to play dvds and dvd file structures</longdescription>
+		<email>vdr@gentoo.org</email>
+		<name>Gentoo VDR Project</name>
+	</maintainer>
+	<longdescription>VDR plugin to play dvds and dvd file structures</longdescription>
 </pkgmetadata>
diff --git a/media-plugins/vdr-epgsync/metadata.xml b/media-plugins/vdr-epgsync/metadata.xml
index fd3086d89d1e..984a01fab265 100644
--- a/media-plugins/vdr-epgsync/metadata.xml
+++ b/media-plugins/vdr-epgsync/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
-  			<email>vdr@gentoo.org</email>
-			<name>Gentoo VDR Project</name>
-		</maintainer>
+		<email>vdr@gentoo.org</email>
+		<name>Gentoo VDR Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/media-plugins/vdr-extb/metadata.xml b/media-plugins/vdr-extb/metadata.xml
index 51ad9a486270..cfdfc8a7d454 100644
--- a/media-plugins/vdr-extb/metadata.xml
+++ b/media-plugins/vdr-extb/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
+	<maintainer type="project">
 		<email>vdr@gentoo.org</email>
 		<name>Gentoo VDR Project</name>
-    </maintainer>
-    <longdescription>VDR plugin to rename records on OSD</longdescription>
+	</maintainer>
+	<longdescription>VDR plugin to rename records on OSD</longdescription>
 </pkgmetadata>
diff --git a/media-plugins/vdr-extrecmenu/metadata.xml b/media-plugins/vdr-extrecmenu/metadata.xml
index 51ad9a486270..cfdfc8a7d454 100644
--- a/media-plugins/vdr-extrecmenu/metadata.xml
+++ b/media-plugins/vdr-extrecmenu/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
+	<maintainer type="project">
 		<email>vdr@gentoo.org</email>
 		<name>Gentoo VDR Project</name>
-    </maintainer>
-    <longdescription>VDR plugin to rename records on OSD</longdescription>
+	</maintainer>
+	<longdescription>VDR plugin to rename records on OSD</longdescription>
 </pkgmetadata>
diff --git a/media-plugins/vdr-ffnetdev/metadata.xml b/media-plugins/vdr-ffnetdev/metadata.xml
index 102fd39b32f5..00ce21d70b28 100644
--- a/media-plugins/vdr-ffnetdev/metadata.xml
+++ b/media-plugins/vdr-ffnetdev/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
+	<maintainer type="project">
 		<email>vdr@gentoo.org</email>
 		<name>Gentoo VDR Project</name>
-    </maintainer>
-    <longdescription>VDR plugin to stream OSD Data in a Transport Stream (TS)</longdescription>
+	</maintainer>
+	<longdescription>VDR plugin to stream OSD Data in a Transport Stream (TS)</longdescription>
 </pkgmetadata>
diff --git a/media-plugins/vdr-graphtft/metadata.xml b/media-plugins/vdr-graphtft/metadata.xml
index 7fbdb114477c..572dd1039e77 100644
--- a/media-plugins/vdr-graphtft/metadata.xml
+++ b/media-plugins/vdr-graphtft/metadata.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
+	<maintainer type="project">
 		<email>vdr@gentoo.org</email>
 		<name>Gentoo VDR Project</name>
-    </maintainer>
+	</maintainer>
 	<use>
 		<flag name="graphtft-fe">Install external x11 remote frontend</flag>
 		<flag name="theme_avp">graphTFT Alien vs. Predato theme</flag>
diff --git a/media-plugins/vdr-image/metadata.xml b/media-plugins/vdr-image/metadata.xml
index 9a4301e3be1c..8860e595d265 100644
--- a/media-plugins/vdr-image/metadata.xml
+++ b/media-plugins/vdr-image/metadata.xml
@@ -2,13 +2,13 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
-			<email>vdr@gentoo.org</email>
-			<name>Gentoo VDR Project</name>
-			<description>
-			  Please contacts maintainer before you something change.
-			</description>
-		</maintainer>
-		<longdescription>
-			VDR Plugin to show pictures on TV
-		</longdescription>
+		<email>vdr@gentoo.org</email>
+		<name>Gentoo VDR Project</name>
+		<description>
+			Please contact maintainer before you change something.
+		</description>
+	</maintainer>
+	<longdescription>
+		VDR Plugin to show pictures on TV
+	</longdescription>
 </pkgmetadata>
diff --git a/media-plugins/vdr-lcdproc/metadata.xml b/media-plugins/vdr-lcdproc/metadata.xml
index a271607787ef..984a01fab265 100644
--- a/media-plugins/vdr-lcdproc/metadata.xml
+++ b/media-plugins/vdr-lcdproc/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-	  <email>vdr@gentoo.org</email>
-	  <name>Gentoo VDR Project</name>
+	<maintainer type="project">
+		<email>vdr@gentoo.org</email>
+		<name>Gentoo VDR Project</name>
 	</maintainer>
 </pkgmetadata>
diff --git a/media-plugins/vdr-lcr/metadata.xml b/media-plugins/vdr-lcr/metadata.xml
index 9588b71f73ae..6fa8c920982a 100644
--- a/media-plugins/vdr-lcr/metadata.xml
+++ b/media-plugins/vdr-lcr/metadata.xml
@@ -2,13 +2,13 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
-  			<email>vdr@gentoo.org</email>
-			<name>Gentoo VDR Project</name>
-			<description>
-			Please contacts maintainer before you something change.
-			</description>
-		</maintainer>
+		<email>vdr@gentoo.org</email>
+		<name>Gentoo VDR Project</name>
+		<description>
+			Please contact maintainer before you change something.
+		</description>
+	</maintainer>
 	<longdescription>
-	    Video Disk Recorder (VDR) Plugin to show best telefon tarif (LCR) on OSD
+		Video Disk Recorder (VDR) Plugin for least cost routing (LCR) on OSD
 	</longdescription>
 </pkgmetadata>
diff --git a/media-plugins/vdr-loadepg/metadata.xml b/media-plugins/vdr-loadepg/metadata.xml
index e895d227ad04..cd06e186d946 100644
--- a/media-plugins/vdr-loadepg/metadata.xml
+++ b/media-plugins/vdr-loadepg/metadata.xml
@@ -2,12 +2,12 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
-			<email>vdr@gentoo.org</email>
-			<name>Gentoo VDR Project</name>
-  		</maintainer>
-    <longdescription>
-	  This is the Loadepg plugin for the Video Disk Recorder (VDR)
-	  With this Plugin EPG data can be received via Satelite, 
-	  become the information from the Canal+ group (Mediahighway of receivers) ready placed.
-	</longdescription>		
+		<email>vdr@gentoo.org</email>
+		<name>Gentoo VDR Project</name>
+	</maintainer>
+	<longdescription>
+		This is the Loadepg plugin for the Video Disk Recorder (VDR)
+		With this Plugin EPG data can be received via Satelite,
+		become the information from the Canal+ group (Mediahighway of receivers) ready placed.
+	</longdescription>
 </pkgmetadata>
diff --git a/media-plugins/vdr-mp3ng/metadata.xml b/media-plugins/vdr-mp3ng/metadata.xml
index 0b68056b5a3b..6e73c8bb891b 100644
--- a/media-plugins/vdr-mp3ng/metadata.xml
+++ b/media-plugins/vdr-mp3ng/metadata.xml
@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-  <email>vdr@gentoo.org</email>
-  <name>Gentoo VDR Project</name>
-  <description>
-	Please contacts maintainer before you something change.
-  </description>
-</maintainer>
-  <longdescription>VDR Plugin to play audio files, supports mp3, wav and ogg audio format.
-				  You can provide and edit your own playlists.
-  </longdescription>
+	<maintainer type="project">
+		<email>vdr@gentoo.org</email>
+		<name>Gentoo VDR Project</name>
+		<description>
+			Please contact maintainer before you change something.
+		</description>
+	</maintainer>
+	<longdescription>
+		VDR Plugin to play audio files, supports mp3, wav and ogg audio format.
+		You can provide and edit your own playlists.
+	</longdescription>
 </pkgmetadata>
diff --git a/media-plugins/vdr-mplayer/metadata.xml b/media-plugins/vdr-mplayer/metadata.xml
index 6e8f7243a8f5..d14fd47de5dc 100644
--- a/media-plugins/vdr-mplayer/metadata.xml
+++ b/media-plugins/vdr-mplayer/metadata.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-  <email>vdr@gentoo.org</email>
-  <name>Gentoo VDR Project</name>
-  <description>
-	Please contacts maintainer before you something change.
-  </description>
-</maintainer>
-  <longdescription>
-	VDR Plugin to play video files, the plugin use for this the mplayer.
-	All supported file types in mplayer will be played.
-  </longdescription>
+	<maintainer type="project">
+		<email>vdr@gentoo.org</email>
+		<name>Gentoo VDR Project</name>
+		<description>
+			Please contact maintainer before you change something.
+		</description>
+	</maintainer>
+	<longdescription>
+		VDR Plugin to play video files, the plugin uses mplayer for this.
+		All supported file types in mplayer can be played.
+	</longdescription>
 </pkgmetadata>
diff --git a/media-plugins/vdr-osdteletext/metadata.xml b/media-plugins/vdr-osdteletext/metadata.xml
index bf53265d5436..ec9a9c10e83e 100644
--- a/media-plugins/vdr-osdteletext/metadata.xml
+++ b/media-plugins/vdr-osdteletext/metadata.xml
@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-	  <email>vdr@gentoo.org</email>
-	  <name>Gentoo VDR Project</name>
-	  <description>Please contacts maintainer before you change something.</description>
+	<maintainer type="project">
+		<email>vdr@gentoo.org</email>
+		<name>Gentoo VDR Project</name>
+		<description>
+			Please contact maintainer before you change something.
+		</description>
 	</maintainer>
-	  <longdescription>
-	  VDR Plugin to show videotext on OSD
-	  </longdescription>
+	<longdescription>
+		VDR Plugin to show videotext on OSD
+	</longdescription>
 </pkgmetadata>
diff --git a/media-plugins/vdr-pin/metadata.xml b/media-plugins/vdr-pin/metadata.xml
index c0a745581ef1..f4b31327a4ad 100644
--- a/media-plugins/vdr-pin/metadata.xml
+++ b/media-plugins/vdr-pin/metadata.xml
@@ -2,10 +2,10 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
-  			<email>vdr@gentoo.org</email>
-			<name>Gentoo VDR Project</name>
-		</maintainer>
+		<email>vdr@gentoo.org</email>
+		<name>Gentoo VDR Project</name>
+	</maintainer>
 	<longdescription>
-	  With this Plugin one knows records with a pin code before the access by children protected
+		With this Plugin one knows records with a pin code before the access by children protected
 	</longdescription>
 </pkgmetadata>
diff --git a/media-plugins/vdr-radio/metadata.xml b/media-plugins/vdr-radio/metadata.xml
index a9129a924f32..d0e2e0192ae3 100644
--- a/media-plugins/vdr-radio/metadata.xml
+++ b/media-plugins/vdr-radio/metadata.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-	  <email>vdr@gentoo.org</email>
-	  <name>Gentoo VDR Project</name>
+	<maintainer type="project">
+		<email>vdr@gentoo.org</email>
+		<name>Gentoo VDR Project</name>
 	</maintainer>
 	<longdescription>
-	  This Plugin display a background image while the vdr is switcht to radio channels.
-	  Also it supports RDS on radio channels.
+		This Plugin display a background image while the vdr is switcht to radio channels.
+		Also it supports RDS on radio channels.
 	</longdescription>
 </pkgmetadata>
diff --git a/media-plugins/vdr-rcu/metadata.xml b/media-plugins/vdr-rcu/metadata.xml
index 18b2e396af49..984a01fab265 100644
--- a/media-plugins/vdr-rcu/metadata.xml
+++ b/media-plugins/vdr-rcu/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
+	<maintainer type="project">
 		<email>vdr@gentoo.org</email>
 		<name>Gentoo VDR Project</name>
-    </maintainer>
+	</maintainer>
 </pkgmetadata>
diff --git a/media-plugins/vdr-remoteosd/metadata.xml b/media-plugins/vdr-remoteosd/metadata.xml
index fd3086d89d1e..984a01fab265 100644
--- a/media-plugins/vdr-remoteosd/metadata.xml
+++ b/media-plugins/vdr-remoteosd/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
-  			<email>vdr@gentoo.org</email>
-			<name>Gentoo VDR Project</name>
-		</maintainer>
+		<email>vdr@gentoo.org</email>
+		<name>Gentoo VDR Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/media-plugins/vdr-remotetimers/metadata.xml b/media-plugins/vdr-remotetimers/metadata.xml
index fd3086d89d1e..984a01fab265 100644
--- a/media-plugins/vdr-remotetimers/metadata.xml
+++ b/media-plugins/vdr-remotetimers/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
-  			<email>vdr@gentoo.org</email>
-			<name>Gentoo VDR Project</name>
-		</maintainer>
+		<email>vdr@gentoo.org</email>
+		<name>Gentoo VDR Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/media-plugins/vdr-rpihddevice/metadata.xml b/media-plugins/vdr-rpihddevice/metadata.xml
index 18b2e396af49..984a01fab265 100644
--- a/media-plugins/vdr-rpihddevice/metadata.xml
+++ b/media-plugins/vdr-rpihddevice/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
+	<maintainer type="project">
 		<email>vdr@gentoo.org</email>
 		<name>Gentoo VDR Project</name>
-    </maintainer>
+	</maintainer>
 </pkgmetadata>
diff --git a/media-plugins/vdr-skinenigmang/metadata.xml b/media-plugins/vdr-skinenigmang/metadata.xml
index 3bfb99a6a9b2..4d107b34c420 100644
--- a/media-plugins/vdr-skinenigmang/metadata.xml
+++ b/media-plugins/vdr-skinenigmang/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-	  <email>vdr@gentoo.org</email>
-	  <name>Gentoo VDR Project</name>
+	<maintainer type="project">
+		<email>vdr@gentoo.org</email>
+		<name>Gentoo VDR Project</name>
 	</maintainer>
-	  <longdescription>
-	  The "Soppalusikka" is a standalone skin is based on "enElchi" text2skin addon.
-	  </longdescription>
+	<longdescription>
+		The "Soppalusikka" is a standalone skin is based on "enElchi" text2skin addon.
+	</longdescription>
 </pkgmetadata>
diff --git a/media-plugins/vdr-skinsoppalusikka/metadata.xml b/media-plugins/vdr-skinsoppalusikka/metadata.xml
index 3bfb99a6a9b2..4d107b34c420 100644
--- a/media-plugins/vdr-skinsoppalusikka/metadata.xml
+++ b/media-plugins/vdr-skinsoppalusikka/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-	  <email>vdr@gentoo.org</email>
-	  <name>Gentoo VDR Project</name>
+	<maintainer type="project">
+		<email>vdr@gentoo.org</email>
+		<name>Gentoo VDR Project</name>
 	</maintainer>
-	  <longdescription>
-	  The "Soppalusikka" is a standalone skin is based on "enElchi" text2skin addon.
-	  </longdescription>
+	<longdescription>
+		The "Soppalusikka" is a standalone skin is based on "enElchi" text2skin addon.
+	</longdescription>
 </pkgmetadata>
diff --git a/media-plugins/vdr-streamdev/metadata.xml b/media-plugins/vdr-streamdev/metadata.xml
index e2af9291c27b..b97ea7e5fea2 100644
--- a/media-plugins/vdr-streamdev/metadata.xml
+++ b/media-plugins/vdr-streamdev/metadata.xml
@@ -6,7 +6,7 @@
 		<name>Gentoo VDR Project</name>
 	</maintainer>
 	<use>
-	    <flag name="client">
+		<flag name="client">
 			Compile the VDR plugin vdr-streamdev-client
 			that acts like a dvb-budget card
 		</flag>
diff --git a/media-plugins/vdr-sudoku/metadata.xml b/media-plugins/vdr-sudoku/metadata.xml
index cc262e35c9b1..a4d741d7545c 100644
--- a/media-plugins/vdr-sudoku/metadata.xml
+++ b/media-plugins/vdr-sudoku/metadata.xml
@@ -1,15 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-	  <email>vdr@gentoo.org</email>
-	  <name>Gentoo VDR Project</name>
-	  <description>
-		  Please contacts maintainer before you something change
+	<maintainer type="project">
+		<email>vdr@gentoo.org</email>
+		<name>Gentoo VDR Project</name>
+		<description>
+			Please contact maintainer before you change something.
 		</description>
 	</maintainer>
 	<longdescription>
-	  Sudoku is a VDR plugin to generate and solve Number Place puzzles, 
-	  so called Sudokus.
+		Sudoku is a VDR plugin to generate and solve Number Place puzzles, so called Sudokus.
 	</longdescription>
 </pkgmetadata>
diff --git a/media-plugins/vdr-svdrposd/metadata.xml b/media-plugins/vdr-svdrposd/metadata.xml
index fd3086d89d1e..984a01fab265 100644
--- a/media-plugins/vdr-svdrposd/metadata.xml
+++ b/media-plugins/vdr-svdrposd/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
-  			<email>vdr@gentoo.org</email>
-			<name>Gentoo VDR Project</name>
-		</maintainer>
+		<email>vdr@gentoo.org</email>
+		<name>Gentoo VDR Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/media-plugins/vdr-svdrpservice/metadata.xml b/media-plugins/vdr-svdrpservice/metadata.xml
index fd3086d89d1e..984a01fab265 100644
--- a/media-plugins/vdr-svdrpservice/metadata.xml
+++ b/media-plugins/vdr-svdrpservice/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
-  			<email>vdr@gentoo.org</email>
-			<name>Gentoo VDR Project</name>
-		</maintainer>
+		<email>vdr@gentoo.org</email>
+		<name>Gentoo VDR Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/media-radio/Manifest.gz b/media-radio/Manifest.gz
index b45824ab0403..b46d9971edf3 100644
Binary files a/media-radio/Manifest.gz and b/media-radio/Manifest.gz differ
diff --git a/media-radio/qrq/metadata.xml b/media-radio/qrq/metadata.xml
index e91b5e271e2a..4e80019694b1 100644
--- a/media-radio/qrq/metadata.xml
+++ b/media-radio/qrq/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-	    <email>tomjbe@gentoo.org</email>
-	    <name>Thomas Beierlein</name>
+		<email>tomjbe@gentoo.org</email>
+		<name>Thomas Beierlein</name>
 	</maintainer>
 </pkgmetadata>
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index f4053cb3d387..2f3718ebfc4e 100644
Binary files a/media-sound/Manifest.gz and b/media-sound/Manifest.gz differ
diff --git a/media-sound/asunder/metadata.xml b/media-sound/asunder/metadata.xml
index f5afbca69616..06e70988f837 100644
--- a/media-sound/asunder/metadata.xml
+++ b/media-sound/asunder/metadata.xml
@@ -2,11 +2,11 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
-  <email>sound@gentoo.org</email>
-  <name>Gentoo Sound project</name>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
 	</maintainer>
-<use>
-  <flag name="mac">Support for creation of Monkey's Audio files (APE)</flag>
-  <flag name="opus">Support for creation of Opus files</flag>
-</use>
+	<use>
+		<flag name="mac">Support for creation of Monkey's Audio files (APE)</flag>
+		<flag name="opus">Support for creation of Opus files</flag>
+	</use>
 </pkgmetadata>
diff --git a/media-sound/beets/metadata.xml b/media-sound/beets/metadata.xml
index a6f2243141f4..46b548c1ee8c 100644
--- a/media-sound/beets/metadata.xml
+++ b/media-sound/beets/metadata.xml
@@ -1,57 +1,46 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>sound@gentoo.org</email>
-  </maintainer>
-  <longdescription lang="en">
-    The purpose of beets is to get your music collection right once and for
-    all. It catalogs your collection, automatically improving its metadata as
-    it goes using the MusicBrainz database. (It also downloads cover art for
-    albums it imports.) Then it provides a bouquet of tools for manipulating
-    and accessing your music.
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+	</maintainer>
+	<longdescription lang="en">
+		The purpose of beets is to get your music collection right once and for
+		all. It catalogs your collection, automatically improving its metadata as
+		it goes using the MusicBrainz database. (It also downloads cover art for
+		albums it imports.) Then it provides a bouquet of tools for manipulating
+		and accessing your music.
 
-    Because beets is designed as a library, it can do almost anything you can
-    imagine for your music collection. Via plugins, beets becomes a panacea:
-    * Embed and extract album art from files’ tags.
-    * Listen to your library with a music player that speaks the MPD protocol
-    and works with a staggering variety of interfaces.
-    * Fetch lyrics for all your songs from databases on the Web.
-    * Manage your MusicBrainz music collection.
-    * Analyze music files’ metadata from the command line.
-    * Clean up crufty tags left behind by other, less-awesome tools.
-    * Browse your music library graphically through a Web browser and play it
-    in any browser that supports HTML5 Audio.
+		Because beets is designed as a library, it can do almost anything you can
+		imagine for your music collection. Via plugins, beets becomes a panacea:
+		* Embed and extract album art from files’ tags.
+		* Listen to your library with a music player that speaks the MPD protocol
+		and works with a staggering variety of interfaces.
+		* Fetch lyrics for all your songs from databases on the Web.
+		* Manage your MusicBrainz music collection.
+		* Analyze music files’ metadata from the command line.
+		* Clean up crufty tags left behind by other, less-awesome tools.
+		* Browse your music library graphically through a Web browser and play it
+		in any browser that supports HTML5 Audio.
 
-    If beets doesn’t do what you want yet, writing your own plugin is
-    shockingly simple if you know a little Python.
-  </longdescription>
-  <use>
-    <flag name="badfiles">
-      Validate MP3 &amp; FLAC files.
-    </flag>
-    <flag name="bpd">
-      Enable support for <pkg>media-sound/mpd</pkg> server emulation
-    </flag>
-    <flag name="chroma">Enable support for acoustic fingerprinting plugin using
-      <pkg>media-libs/chromaprint</pkg></flag>
-    <flag name="convert">Enable support for the convert plugin which makes it
-      possible to transcode files</flag>
-    <flag name="discogs">Enable support for the discogs API plugin</flag>
-    <flag name="lastgenre">Enable support for importing music genres from
-      last.fm tags</flag>
-    <flag name="lastimport">Enable support for importing your last.fm playcounts</flag>
-    <flag name="mpdstats">Enable support for collecting statistic about
-      listening habits from <pkg>media-sound/mpd</pkg></flag>
-    <flag name="opus">Enable opus support in gstreamer-based replaygain</flag>
-    <flag name="replaygain">Enable support for Replay Gain metadata calculation
-      during import</flag>
-	<flag name="thumbnails">Generate thumbnails for albums</flag>
-    <flag name="web">
-      Enable embedded webserver support through <pkg>dev-python/flask</pkg>
-    </flag>
-  </use>
-  <upstream>
-    <remote-id type="pypi">beets</remote-id>
-  </upstream>
+		If beets doesn’t do what you want yet, writing your own plugin is
+		shockingly simple if you know a little Python.
+	</longdescription>
+	<use>
+		<flag name="badfiles">Validate MP3 &amp; FLAC files</flag>
+		<flag name="bpd">Enable support for <pkg>media-sound/mpd</pkg> server emulation</flag>
+		<flag name="chroma">Enable support for acoustic fingerprinting plugin using <pkg>media-libs/chromaprint</pkg></flag>
+		<flag name="convert">Enable support for the convert plugin which makes it possible to transcode files</flag>
+		<flag name="discogs">Enable support for the discogs API plugin</flag>
+		<flag name="lastgenre">Enable support for importing music genres from last.fm tags</flag>
+		<flag name="lastimport">Enable support for importing your last.fm playcounts</flag>
+		<flag name="mpdstats">Enable support for collecting statistic about listening habits from <pkg>media-sound/mpd</pkg></flag>
+		<flag name="opus">Enable opus support in gstreamer-based replaygain</flag>
+		<flag name="replaygain">Enable support for Replay Gain metadata calculation during import</flag>
+		<flag name="thumbnails">Generate thumbnails for albums</flag>
+		<flag name="web">Enable embedded webserver support through <pkg>dev-python/flask</pkg></flag>
+	</use>
+	<upstream>
+		<remote-id type="pypi">beets</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-sound/herrie/metadata.xml b/media-sound/herrie/metadata.xml
index 1f60fffd9530..94eb56d9752a 100644
--- a/media-sound/herrie/metadata.xml
+++ b/media-sound/herrie/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>sound@gentoo.org</email>
-    <name>Gentoo Sound project</name>
-  </maintainer>
-  <longdescription lang="en">
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<longdescription lang="en">
 		Herrie is a minimalistic music player that uses the command
 		line. It is written to support a variety of operating systems,
 		audio subsystems and file formats, including playlists.
@@ -20,8 +20,8 @@
 		for AudioScrobbler and the ability to chroot() itself
 		into a directory.
 	</longdescription>
-  <use>
-    <flag name="http">Enable http streaming</flag>
-    <flag name="xspf">Enable support for reading and saving XSPF playlists</flag>
-  </use>
+	<use>
+		<flag name="http">Enable http streaming</flag>
+		<flag name="xspf">Enable support for reading and saving XSPF playlists</flag>
+	</use>
 </pkgmetadata>
diff --git a/media-sound/jack-audio-connection-kit/metadata.xml b/media-sound/jack-audio-connection-kit/metadata.xml
index b01bff8f965e..da3dcaba033a 100644
--- a/media-sound/jack-audio-connection-kit/metadata.xml
+++ b/media-sound/jack-audio-connection-kit/metadata.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>proaudio@gentoo.org</email>
-    <name>Gentoo ProAudio Project</name>
-  </maintainer>
-  <use>
-    <flag name="coreaudio">Build the CoreAudio driver on Mac OS X systems</flag>
-    <flag name="cpudetection">Enables runtime cpudetection</flag>
-	<flag name="pam">Add basic realtime configuration via <pkg>sys-auth/realtime-base</pkg></flag>
-  </use>
+	<maintainer type="project">
+		<email>proaudio@gentoo.org</email>
+		<name>Gentoo ProAudio Project</name>
+	</maintainer>
+	<use>
+		<flag name="coreaudio">Build the CoreAudio driver on Mac OS X systems</flag>
+		<flag name="cpudetection">Enables runtime cpudetection</flag>
+		<flag name="pam">Add basic realtime configuration via <pkg>sys-auth/realtime-base</pkg></flag>
+	</use>
 </pkgmetadata>
diff --git a/media-sound/mp3blaster/mp3blaster-3.2.6.ebuild b/media-sound/mp3blaster/mp3blaster-3.2.6.ebuild
index 565272b311e6..cb697b8658f4 100644
--- a/media-sound/mp3blaster/mp3blaster-3.2.6.ebuild
+++ b/media-sound/mp3blaster/mp3blaster-3.2.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ppc ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="lirc oss +sdl sid vorbis"
 
 RDEPEND="
diff --git a/media-sound/mpdas/metadata.xml b/media-sound/mpdas/metadata.xml
index 61852ad99397..ee7258ac28eb 100644
--- a/media-sound/mpdas/metadata.xml
+++ b/media-sound/mpdas/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-  	<email>sound@gentoo.org</email>
-  	<name>Gentoo Sound project</name>
-  </maintainer>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/media-sound/ncmpcpp/metadata.xml b/media-sound/ncmpcpp/metadata.xml
index b19eb817aa0f..bc38f1746074 100644
--- a/media-sound/ncmpcpp/metadata.xml
+++ b/media-sound/ncmpcpp/metadata.xml
@@ -11,26 +11,25 @@
 	<use>
 		<flag name="clock">Enable clock screen</flag>
 		<flag name="outputs">Enable outputs screen</flag>
-		<flag name="visualizer">Enable visualizer screen with sound wave/frequency
-			spectrum modes</flag>
+		<flag name="visualizer">Enable visualizer screen with sound wave/frequency spectrum modes</flag>
 	</use>
 	<longdescription lang="en">
-	A featureful <pkg>sys-libs/ncurses</pkg> based <pkg>media-sound/mpd</pkg>
-	client inspired by <pkg>media-sound/ncmpc</pkg>
+		A featureful <pkg>sys-libs/ncurses</pkg> based <pkg>media-sound/mpd</pkg>
+		client inspired by <pkg>media-sound/ncmpc</pkg>
 
-	Ncmpcpp is very similar to ncmpc if it comes to user interface, but it
-	provides a lot of new useful features. 
+		Ncmpcpp is very similar to ncmpc if it comes to user interface, but it
+		provides a lot of new useful features.
 
-	Main new features:
-	 * tag editor
-	 * playlist editor
-	 * easy to use search engine
-	 * media library
-	 * music visualizer
-	 * ability to fetch artist info from last.fm
-	 * new display mode
-	 * alternative user interface
-	 * ability to browse and add files from outside of MPD music directory
-	 ..and a lot more minor convenient functions.
+		Main new features:
+		* tag editor
+		* playlist editor
+		* easy to use search engine
+		* media library
+		* music visualizer
+		* ability to fetch artist info from last.fm
+		* new display mode
+		* alternative user interface
+		* ability to browse and add files from outside of MPD music directory
+		..and a lot more minor convenient functions.
 	</longdescription>
 </pkgmetadata>
diff --git a/media-sound/pasystray/metadata.xml b/media-sound/pasystray/metadata.xml
index 2499ed091c18..778defeed5a7 100644
--- a/media-sound/pasystray/metadata.xml
+++ b/media-sound/pasystray/metadata.xml
@@ -2,17 +2,17 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-        	<email>lmiphay@gmail.com</email>
-	        <name>Paul Healy</name>
-	        <description>Proxy maintainer</description>
+		<email>lmiphay@gmail.com</email>
+		<name>Paul Healy</name>
+		<description>Proxy maintainer</description>
 	</maintainer>
 	<maintainer type="project">
-        	<email>sound@gentoo.org</email>
-        	<name>Gentoo Sound project</name>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
 	</maintainer>
 	<maintainer type="project">
-        	<email>proxy-maint@gentoo.org</email>
-        	<name>Proxy Maintainers</name>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
 	</maintainer>
 	<upstream>
 		<remote-id type="github">christophgysin/pasystray</remote-id>
diff --git a/media-sound/pulseeffects/Manifest b/media-sound/pulseeffects/Manifest
new file mode 100644
index 000000000000..61ae9377f537
--- /dev/null
+++ b/media-sound/pulseeffects/Manifest
@@ -0,0 +1 @@
+DIST pulseeffects-3.0.8.tar.gz 604530 BLAKE2B e55b08a861f8a9b45191727d000b28b6468d1d46328726ef30f63733bf6b3dd6b745d3f4c38f54c5924950c489c70bb87b57ada4735ce68420d678e93019da65 SHA512 2610b19c0a61510ab9ab29d2fb038a76dcdaf6c168f57d13df8baf32493cf2fe56cfad73f862144117ce511864b405c9d78f294afcab6bc4336ffc234e18110b
diff --git a/media-sound/pulseeffects/metadata.xml b/media-sound/pulseeffects/metadata.xml
new file mode 100644
index 000000000000..c9003b7aa9b2
--- /dev/null
+++ b/media-sound/pulseeffects/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>jpizarrocallejas@gmail.com</email>
+		<name>Jorge Pizarro Callejas</name>
+		<description>Jorgicio Gentoo Overlay</description>
+	</maintainer>
+	<longdescription lang="en">
+		Audio effects for Pulseaudio applications
+	</longdescription>
+	<upstream>
+		<remote-id type="github">wwmm/pulseeffects</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/pulseeffects/pulseeffects-3.0.8.ebuild b/media-sound/pulseeffects/pulseeffects-3.0.8.ebuild
new file mode 100644
index 000000000000..574026903658
--- /dev/null
+++ b/media-sound/pulseeffects/pulseeffects-3.0.8.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit gnome2-utils meson python-r1
+
+DESCRIPTION="Limiter, compressor, reverberation, equalizer auto volume effects for Pulseaudio"
+HOMEPAGE="https://github.com/wwmm/pulseeffects"
+
+if [[ ${PV} == *9999 ]];then
+	inherit git-r3
+	SRC_URI=""
+	EGIT_REPO_URI="${HOMEPAGE}"
+	KEYWORDS=""
+else
+	SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~x86 ~amd64"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	${PYTHON_DEPS}
+	python_targets_python3_4? ( dev-python/configparser )
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	dev-python/pycairo[${PYTHON_USEDEP}]
+	>=dev-python/gst-python-1.12.0:1.0[${PYTHON_USEDEP}]
+	media-plugins/swh-plugins
+	>=x11-libs/gtk+-3.18:3
+	dev-python/numpy[${PYTHON_USEDEP}]
+	>=sci-libs/scipy-0.18[${PYTHON_USEDEP}]
+	>=media-libs/gstreamer-1.12.0:1.0
+	>=media-libs/gst-plugins-good-1.12.0:1.0
+	>=media-libs/gst-plugins-bad-1.12.0:1.0
+	>=media-plugins/gst-plugins-ladspa-1.12.0:1.0
+	>=media-plugins/gst-plugins-pulse-1.12.0:1.0
+"
+RDEPEND="${DEPEND}
+	media-sound/pulseaudio[equalizer]
+"
+
+pkg_preinst(){
+	gnome2_schemas_savelist
+}
+
+pkg_postinst(){
+	gnome2_gconf_install
+	gnome2_schemas_update
+	elog "You must enable the equalizer plugin for pulse audio if you wish to use
+	this application as an equalizer.  See the wiki for details.
+	https://wiki.gentoo.org/wiki/PulseAudio#Equalizer"
+}
+
+pkg_postrm(){
+	gnome2_gconf_uninstall
+	gnome2_schemas_update
+}
diff --git a/media-sound/pulseeffects/pulseeffects-9999.ebuild b/media-sound/pulseeffects/pulseeffects-9999.ebuild
new file mode 100644
index 000000000000..574026903658
--- /dev/null
+++ b/media-sound/pulseeffects/pulseeffects-9999.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit gnome2-utils meson python-r1
+
+DESCRIPTION="Limiter, compressor, reverberation, equalizer auto volume effects for Pulseaudio"
+HOMEPAGE="https://github.com/wwmm/pulseeffects"
+
+if [[ ${PV} == *9999 ]];then
+	inherit git-r3
+	SRC_URI=""
+	EGIT_REPO_URI="${HOMEPAGE}"
+	KEYWORDS=""
+else
+	SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~x86 ~amd64"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	${PYTHON_DEPS}
+	python_targets_python3_4? ( dev-python/configparser )
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	dev-python/pycairo[${PYTHON_USEDEP}]
+	>=dev-python/gst-python-1.12.0:1.0[${PYTHON_USEDEP}]
+	media-plugins/swh-plugins
+	>=x11-libs/gtk+-3.18:3
+	dev-python/numpy[${PYTHON_USEDEP}]
+	>=sci-libs/scipy-0.18[${PYTHON_USEDEP}]
+	>=media-libs/gstreamer-1.12.0:1.0
+	>=media-libs/gst-plugins-good-1.12.0:1.0
+	>=media-libs/gst-plugins-bad-1.12.0:1.0
+	>=media-plugins/gst-plugins-ladspa-1.12.0:1.0
+	>=media-plugins/gst-plugins-pulse-1.12.0:1.0
+"
+RDEPEND="${DEPEND}
+	media-sound/pulseaudio[equalizer]
+"
+
+pkg_preinst(){
+	gnome2_schemas_savelist
+}
+
+pkg_postinst(){
+	gnome2_gconf_install
+	gnome2_schemas_update
+	elog "You must enable the equalizer plugin for pulse audio if you wish to use
+	this application as an equalizer.  See the wiki for details.
+	https://wiki.gentoo.org/wiki/PulseAudio#Equalizer"
+}
+
+pkg_postrm(){
+	gnome2_gconf_uninstall
+	gnome2_schemas_update
+}
diff --git a/media-sound/qmidiarp/metadata.xml b/media-sound/qmidiarp/metadata.xml
index 73b19701a760..0fa01de6dce3 100644
--- a/media-sound/qmidiarp/metadata.xml
+++ b/media-sound/qmidiarp/metadata.xml
@@ -2,13 +2,13 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
-    <email>sound@gentoo.org</email>
-    <name>Gentoo Sound project</name>
-  </maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">qmidiarp</remote-id>
 	</upstream>
-  <use>
-    <flag name="lv2">Enables Ladspa V2 plugins.</flag>
-  </use>
+	<use>
+		<flag name="lv2">Enables Ladspa V2 plugins.</flag>
+	</use>
 </pkgmetadata>
diff --git a/media-sound/rgain/metadata.xml b/media-sound/rgain/metadata.xml
index 8c838e4b2c3f..4096733e8436 100644
--- a/media-sound/rgain/metadata.xml
+++ b/media-sound/rgain/metadata.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
-  <longdescription lang="en">
-A set of Python modules and utility programmes to deal with Replay Gain information -- calculate it (with GStreamer), read and write it (with Mutagen). It has support for Ogg Vorbis (or probably anything stored in an Ogg container), Flac, WavPack (oddly enough) and MP3 (in different incarnations). There‘s also a command-line programme, replaygain, that works very similar to its like- named cousins, most prominently vorbisgain and mp3gain -- only that it works for all those supported formats alike. collectiongain on the other hand is a kind of fire-and-forget tool for big amounts of music files.
+	<!-- maintainer-needed -->
+	<longdescription lang="en">
+		A set of Python modules and utility programmes to deal with Replay Gain information -- calculate it (with GStreamer), read and write it (with Mutagen). It has support for Ogg Vorbis (or probably anything stored in an Ogg container), Flac, WavPack (oddly enough) and MP3 (in different incarnations). There‘s also a command-line programme, replaygain, that works very similar to its like- named cousins, most prominently vorbisgain and mp3gain -- only that it works for all those supported formats alike. collectiongain on the other hand is a kind of fire-and-forget tool for big amounts of music files.
 	</longdescription>
-  <upstream>
-    <remote-id type="pypi">rgain</remote-id>
-    <remote-id type="bitbucket">fk/rgain</remote-id>
-  </upstream>
+	<upstream>
+		<remote-id type="pypi">rgain</remote-id>
+		<remote-id type="bitbucket">fk/rgain</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-sound/rplay/metadata.xml b/media-sound/rplay/metadata.xml
index cade504eaab3..a8457ac72f28 100644
--- a/media-sound/rplay/metadata.xml
+++ b/media-sound/rplay/metadata.xml
@@ -6,7 +6,7 @@
 		<name>Gentoo Sound project</name>
 	</maintainer>
 	<longdescription lang="en">
- 		rplay is a flexible network audio system that allows sounds to be played
+		rplay is a flexible network audio system that allows sounds to be played
 		to and from local and remote Unix systems. Sounds can be played with or
 		without sending audio data over the network using either UDP or TCP.
 		rplay audio servers can be configured to share sound files with each
diff --git a/media-sound/sndfile-tools/metadata.xml b/media-sound/sndfile-tools/metadata.xml
index 2b515eb87eeb..398910b981cb 100644
--- a/media-sound/sndfile-tools/metadata.xml
+++ b/media-sound/sndfile-tools/metadata.xml
@@ -10,9 +10,9 @@
 		other libraries to do useful things. The collection currently includes
 		the following programs:
 
-		    * sndfile-generate-chirp
-		    * sndfile-jackplay
-		    * sndfile-spectrogram
-		    * sndfile-mix-to-mono 
+		* sndfile-generate-chirp
+		* sndfile-jackplay
+		* sndfile-spectrogram
+		* sndfile-mix-to-mono
 	</longdescription>
 </pkgmetadata>
diff --git a/media-sound/tomahawk/Manifest b/media-sound/tomahawk/Manifest
index c02148b54a2b..9a77cda1e424 100644
--- a/media-sound/tomahawk/Manifest
+++ b/media-sound/tomahawk/Manifest
@@ -1 +1,2 @@
-DIST tomahawk-0.9.0_pre20161029.tar.xz 7945264 SHA256 de4005fd68dfb11380419829e009f19b901c4b14ccec6dd63400b21612886271 SHA512 fcfe810f167de936ed5457b3f30d7e17ef5708389800c6be85a1f867fc75a6973fcc04181719910c127dcc226619bd7ea31e0273b981f84c8122a2e1709fbcf9 WHIRLPOOL b914df1f2a26cc18af021ef6fce5511b2a103d7243340bcaec3d0c98fa90fc2fcda32cabc8022c2106d9bd9dffa777765e17433dc268f2c317537716c31928f6
+DIST tomahawk-0.9.0_pre20161029.tar.xz 7945264 BLAKE2B 8d12eaaf055da7dfe0dc4ff3e07c2be824983ca160d8ccd592ab611a8df09cead0d334e2ca3113c1bc34dea85c61edcf1bdeb6208316f1c372caf08bc04243e1 SHA512 fcfe810f167de936ed5457b3f30d7e17ef5708389800c6be85a1f867fc75a6973fcc04181719910c127dcc226619bd7ea31e0273b981f84c8122a2e1709fbcf9
+DIST tomahawk-0.9.0_pre20170808.tar.gz 9913232 BLAKE2B 5a7ebd9419fece090c0aec1f8f47bf35e1f0fbae5cd6a41803ac265e7310dadac61ba4f2e25b0d2fbbb0068cbb3f7098c1d330ac81e671be1028ed3b78d32560 SHA512 edaa4c1637ca460f838dfdd7ecc9d5dae0b66a8280deb8dc6140c673ecc76aa1055efbbac1e9b2937ec01d6dd657935b907cadceb2059f8e055305e872866c2b
diff --git a/media-sound/tomahawk/tomahawk-9999.ebuild b/media-sound/tomahawk/tomahawk-0.9.0_pre20170808.ebuild
similarity index 77%
rename from media-sound/tomahawk/tomahawk-9999.ebuild
rename to media-sound/tomahawk/tomahawk-0.9.0_pre20170808.ebuild
index e433366a995b..11fbc52732b3 100644
--- a/media-sound/tomahawk/tomahawk-9999.ebuild
+++ b/media-sound/tomahawk/tomahawk-0.9.0_pre20170808.ebuild
@@ -3,20 +3,16 @@
 
 EAPI=6
 
-inherit kde5
-
-if [[ ${KDE_BUILD_TYPE} != live ]]; then
-	SRC_URI="http://download.tomahawk-player.org/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~x86"
-else
-	EGIT_REPO_URI="https://github.com/tomahawk-player/${PN}.git"
-fi
+COMMIT=00f602e10203b76fc28b4615868c567e6bd4ced4
+inherit kde5 vcs-snapshot
 
 DESCRIPTION="Multi-source social music player"
 HOMEPAGE="https://www.tomahawk-player.org/"
+SRC_URI="https://github.com/${PN}-player/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3 BSD"
 SLOT="0"
+KEYWORDS="~amd64 ~x86"
 IUSE="+hatchet telepathy xmpp"
 
 CDEPEND="
@@ -30,20 +26,20 @@ CDEPEND="
 	$(add_qt_dep qtwidgets)
 	$(add_qt_dep qtx11extras)
 	$(add_qt_dep qtxml)
-	app-crypt/qca:2[qt5]
+	app-crypt/qca:2[qt5(+)]
 	dev-cpp/lucene++
 	dev-cpp/sparsehash
 	dev-libs/boost:=
 	dev-libs/qtkeychain:=[qt5(+)]
-	>=dev-libs/quazip-0.7.2[qt5]
-	media-libs/liblastfm[qt5]
+	>=dev-libs/quazip-0.7.2[qt5(+)]
+	>=media-libs/liblastfm-1.0.9-r1[qt5(+)]
 	>=media-libs/taglib-1.8.0
 	media-video/vlc:=[flac,dvbpsi,ffmpeg,mp3]
 	>=net-libs/gnutls-3.2:=
 	x11-libs/libX11
 	hatchet? ( dev-cpp/websocketpp )
-	telepathy? ( net-libs/telepathy-qt[qt5(+)] )
-	xmpp? ( net-libs/jreen[qt5] )
+	telepathy? ( >=net-libs/telepathy-qt-0.9.7-r1[qt5(+)] )
+	xmpp? ( >=net-libs/jreen-1.3.0[qt5(+)] )
 "
 DEPEND="${CDEPEND}
 	$(add_qt_dep designer)
diff --git a/media-sound/traverso/metadata.xml b/media-sound/traverso/metadata.xml
index a7183fbcec8f..36674346cb85 100644
--- a/media-sound/traverso/metadata.xml
+++ b/media-sound/traverso/metadata.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>proaudio@gentoo.org</email>
-    <name>Gentoo ProAudio Project</name>
-  </maintainer>
-  <longdescription lang="en">
+	<maintainer type="project">
+		<email>proaudio@gentoo.org</email>
+		<name>Gentoo ProAudio Project</name>
+	</maintainer>
+	<longdescription lang="en">
 		Traverso is a multitrack audio recording and editing program for GNU/Linux with
 		special emphasis to create an easy to use program with a clean and
 		intuitive interface.
 	</longdescription>
-  <use>
-    <flag name="lv2">Add support for Ladspa V2</flag>
-  </use>
+	<use>
+		<flag name="lv2">Add support for Ladspa V2</flag>
+	</use>
 </pkgmetadata>
diff --git a/media-sound/xmms2/metadata.xml b/media-sound/xmms2/metadata.xml
index 26ce4e0e0a61..4072327e4cf2 100644
--- a/media-sound/xmms2/metadata.xml
+++ b/media-sound/xmms2/metadata.xml
@@ -13,22 +13,23 @@
 		your music.
 
 		List of features currently offered by XMMS2:
-		  Client-server model:
-		    * Allows XMMS2 to have various multiple interfaces (as clients).
-			o Command line interfaces
-			o GTK clients (matching GNOME &amp; XFCE4 look and feel)
-			o KDE clients (matching KDE look and feel)
-		    * Network transparency means you can run and control XMMS2 remotely, (e.g. run
-		      XMMS2 on your 'media box' and control it over network using a bluetooth-enabled
-		      PDA (TCP))
-		  Wide format support:
-		    * Can play FLAC, mp3, MOD, SID, speex, ogg vorbis, wave files.
-		    * Clean separation of transport and decoder subsystems
-		  Allows for more flexible access to media. (e.g. play mp3 files from a Samba
-		  share without having to mount it on the local filesystem)
+
+		Client-server model:
+		* Allows XMMS2 to have various multiple interfaces (as clients).
+		o Command line interfaces
+		o GTK clients (matching GNOME &amp; XFCE4 look and feel)
+		o KDE clients (matching KDE look and feel)
+		* Network transparency means you can run and control XMMS2 remotely, (e.g. run XMMS2 on your 'media box' and control it over network using a bluetooth-enabled PDA (TCP))
+
+		Wide format support:
+		* Can play FLAC, mp3, MOD, SID, speex, ogg vorbis, wave files.
+		* Clean separation of transport and decoder subsystems
+		Allows for more flexible access to media. (e.g. play mp3 files from a Samba
+		share without having to mount it on the local filesystem)
+
 		Medialib:
-		  Database-driven media library stores metadata about songs as they're played,
-		  so songs can be quickly recalled and new playlists easily made.
+		Database-driven media library stores metadata about songs as they're played,
+		so songs can be quickly recalled and new playlists easily made.
 	</longdescription>
 	<use>
 		<flag name="airplay">Support for airplay format</flag>
diff --git a/media-tv/Manifest.gz b/media-tv/Manifest.gz
index 78579e552ce7..8efd2ec7bfb4 100644
Binary files a/media-tv/Manifest.gz and b/media-tv/Manifest.gz differ
diff --git a/media-tv/dtv-scan-tables/Manifest b/media-tv/dtv-scan-tables/Manifest
new file mode 100644
index 000000000000..c7943ec318a8
--- /dev/null
+++ b/media-tv/dtv-scan-tables/Manifest
@@ -0,0 +1 @@
+DIST dtv-scan-tables-2017-10-03-c1986d5148d8.tar.bz2 168709 BLAKE2B fb4a7ad5b6892a7e7eed1d57ebb49b1f4493076f6f744953d2d5c51c0e1cf7fdaf864ad050c578c2697f5b11d72c245b96ee369522cb58d38a1a2cef035099a7 SHA512 e2b0cf8f52b536be6a532b4a2896421a8150fdc19613e92c92d0c8275fcfd306cb091db32fa26f97bbec0a51ef4ba61b5f98e8c974280a3f6dd36b67a3bf4aad
diff --git a/media-tv/dtv-scan-tables/dtv-scan-tables-0_p20171003.ebuild b/media-tv/dtv-scan-tables/dtv-scan-tables-0_p20171003.ebuild
new file mode 100644
index 000000000000..08c15c3ef583
--- /dev/null
+++ b/media-tv/dtv-scan-tables/dtv-scan-tables-0_p20171003.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV#9999} != ${PV} ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.linuxtv.org/dtv-scan-tables.git"
+else
+	COMMIT="c1986d5148d8"
+	SRC_URI="https://linuxtv.org/downloads/dtv-scan-tables/dtv-scan-tables-${PV:3:4}-${PV:7:2}-${PV:9:2}-${COMMIT}.tar.bz2"
+	KEYWORDS="~amd64 ~arm ~x86"
+	S="${WORKDIR}/usr/share/dvb"
+fi
+
+DESCRIPTION="Digital TV scan tables in v3 and v5 format"
+HOMEPAGE="https://linuxtv.org/"
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+
+DEPEND=">=media-tv/v4l-utils-1.4"
+
+DOCS=( README )
+
+src_compile() {
+	emake dvbv3 dvbv5
+}
+
+src_install() {
+	emake PREFIX="${ED}usr" install install_v3
+	einstalldocs
+}
diff --git a/media-tv/dtv-scan-tables/dtv-scan-tables-9999.ebuild b/media-tv/dtv-scan-tables/dtv-scan-tables-9999.ebuild
new file mode 100644
index 000000000000..08c15c3ef583
--- /dev/null
+++ b/media-tv/dtv-scan-tables/dtv-scan-tables-9999.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV#9999} != ${PV} ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.linuxtv.org/dtv-scan-tables.git"
+else
+	COMMIT="c1986d5148d8"
+	SRC_URI="https://linuxtv.org/downloads/dtv-scan-tables/dtv-scan-tables-${PV:3:4}-${PV:7:2}-${PV:9:2}-${COMMIT}.tar.bz2"
+	KEYWORDS="~amd64 ~arm ~x86"
+	S="${WORKDIR}/usr/share/dvb"
+fi
+
+DESCRIPTION="Digital TV scan tables in v3 and v5 format"
+HOMEPAGE="https://linuxtv.org/"
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+
+DEPEND=">=media-tv/v4l-utils-1.4"
+
+DOCS=( README )
+
+src_compile() {
+	emake dvbv3 dvbv5
+}
+
+src_install() {
+	emake PREFIX="${ED}usr" install install_v3
+	einstalldocs
+}
diff --git a/media-tv/dtv-scan-tables/metadata.xml b/media-tv/dtv-scan-tables/metadata.xml
new file mode 100644
index 000000000000..54be7ff7e5d6
--- /dev/null
+++ b/media-tv/dtv-scan-tables/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>chewi@gentoo.org</email>
+		<name>James Le Cuirot</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/media-tv/gentoo-vdr-scripts/metadata.xml b/media-tv/gentoo-vdr-scripts/metadata.xml
index 9eb70f5875c8..973d97889167 100644
--- a/media-tv/gentoo-vdr-scripts/metadata.xml
+++ b/media-tv/gentoo-vdr-scripts/metadata.xml
@@ -5,7 +5,7 @@
 		<email>vdr@gentoo.org</email>
 		<name>Gentoo VDR Project</name>
 	</maintainer>
-  <use>
-    <flag name="nvram">Add support for using nvram-wakeup to set wakeup time in bios</flag>
-  </use>
+	<use>
+		<flag name="nvram">Add support for using nvram-wakeup to set wakeup time in bios</flag>
+	</use>
 </pkgmetadata>
diff --git a/media-tv/xmltv/metadata.xml b/media-tv/xmltv/metadata.xml
index 2e6c749e564e..bef47687a8ae 100644
--- a/media-tv/xmltv/metadata.xml
+++ b/media-tv/xmltv/metadata.xml
@@ -1,60 +1,60 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>proxy-maint@gentoo.org</email>
-    <name>proxy-mintainers</name>
-  </maintainer>
-  <maintainer type="person">
-	<email>Aidenn0@geocities.com</email>
-    <name>Jason Miller</name>
-    <description>Proxied maintainer; set to assignee in all bugs</description>
-  </maintainer>
-  <use>
-    <flag name="ar">Argentina tv listing grabber</flag>
-    <flag name="ch">Switzerland bluewin tv listing grabber</flag>
-    <flag name="ch_search">Grabber for Switzerland</flag>
-    <flag name="dk">Denmark tv listing grabber</flag>
-    <flag name="dtvla">Latin America digital tv listing grabber</flag>
-    <flag name="ee">Estonia tv listing grabber</flag>
-    <flag name="es_laguiatv">Spain alternative grabber</flag>
-    <flag name="es_miguiatv">Spain alternative grabber</flag>
-    <flag name="eu_dotmedia">Grabber for Europe (xmltv.se / dotmedia)</flag>
-    <flag name="eu_egon">Grabber for german speaking area (Egon zappt)</flag>
-    <flag name="eu_epg">EPG grabber for some European countries.</flag>
-    <flag name="fi">Finland tv listing grabber</flag>
-    <flag name="fi_sv">Grabber for Finland (Swedish)</flag>
-    <flag name="fr">France tv listing grabber</flag>
-    <flag name="fr_kazer">France (Kazer) tv listing grabber</flag>
-    <flag name="hr">Croatia tv listing grabber</flag>
-    <flag name="huro">Hungarian tv listing grabber</flag>
-    <flag name="in">India tv listing grabber</flag>
-    <flag name="il">Israel tv listing grabber</flag>
-    <flag name="is">Iceland tv listing grabber</flag>
-    <flag name="it">Italy tv listing grabber</flag>
-    <flag name="na_dd">North America tv listing grabber</flag>
-    <flag name="na_dtv">North America Direct TV grabber</flag>
-    <flag name="na_tvmedia">Grabber for North America (TVMedia)</flag>
-    <flag name="na_icons">option for na_dd to download icons</flag>
-    <flag name="nl">Netherlands tv listing grabber</flag>
-    <flag name="no_gf">Norway Gfeed tv listing grabber</flag>
-    <flag name="pt">Portugal tv listing grabber</flag>
-    <flag name="pt_meo">Grabber for Portugal (MEO)</flag>
-    <flag name="re">Reunion Island (France) tv listing grabber</flag>
-    <flag name="se_swedb">Sweden tv listing grabber</flag>
-    <flag name="se_tvzon">Sweden (tvzon.se) tv listing grabber</flag>
-    <flag name="tr">Turkey (Digiturk) tv listing grabber</flag>
-    <flag name="tv_check">enable GUI checking</flag>
-    <flag name="tv_combiner">enable grabbers combiner</flag>
-    <flag name="tv_pick_cgi">enable CGI support</flag>
-    <flag name="uk_atlas">Fast UK and Ireland tv listing grabber</flag>
-    <flag name="uk_bleb">Britain tv listing grabber</flag>
-    <flag name="uk_rt">Britain alternative tv listing grabber</flag>
-    <flag name="uk_tvguide">UK and Ireland tv listing grabber using TV Guide website</flag>
-    <flag name="sd_json">Grabber for schedulesDirect.org SD-JSON service (many countries)</flag>
-    <flag name="za">South Africa tv listing grabber</flag>
-  </use>
-  <upstream>
-    <remote-id type="sourceforge">xmltv</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>proxy-mintainers</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>Aidenn0@geocities.com</email>
+		<name>Jason Miller</name>
+		<description>Proxied maintainer; set to assignee in all bugs</description>
+	</maintainer>
+	<use>
+		<flag name="ar">Argentina tv listing grabber</flag>
+		<flag name="ch">Switzerland bluewin tv listing grabber</flag>
+		<flag name="ch_search">Grabber for Switzerland</flag>
+		<flag name="dk">Denmark tv listing grabber</flag>
+		<flag name="dtvla">Latin America digital tv listing grabber</flag>
+		<flag name="ee">Estonia tv listing grabber</flag>
+		<flag name="es_laguiatv">Spain alternative grabber</flag>
+		<flag name="es_miguiatv">Spain alternative grabber</flag>
+		<flag name="eu_dotmedia">Grabber for Europe (xmltv.se / dotmedia)</flag>
+		<flag name="eu_egon">Grabber for german speaking area (Egon zappt)</flag>
+		<flag name="eu_epg">EPG grabber for some European countries.</flag>
+		<flag name="fi">Finland tv listing grabber</flag>
+		<flag name="fi_sv">Grabber for Finland (Swedish)</flag>
+		<flag name="fr">France tv listing grabber</flag>
+		<flag name="fr_kazer">France (Kazer) tv listing grabber</flag>
+		<flag name="hr">Croatia tv listing grabber</flag>
+		<flag name="huro">Hungarian tv listing grabber</flag>
+		<flag name="in">India tv listing grabber</flag>
+		<flag name="il">Israel tv listing grabber</flag>
+		<flag name="is">Iceland tv listing grabber</flag>
+		<flag name="it">Italy tv listing grabber</flag>
+		<flag name="na_dd">North America tv listing grabber</flag>
+		<flag name="na_dtv">North America Direct TV grabber</flag>
+		<flag name="na_tvmedia">Grabber for North America (TVMedia)</flag>
+		<flag name="na_icons">option for na_dd to download icons</flag>
+		<flag name="nl">Netherlands tv listing grabber</flag>
+		<flag name="no_gf">Norway Gfeed tv listing grabber</flag>
+		<flag name="pt">Portugal tv listing grabber</flag>
+		<flag name="pt_meo">Grabber for Portugal (MEO)</flag>
+		<flag name="re">Reunion Island (France) tv listing grabber</flag>
+		<flag name="se_swedb">Sweden tv listing grabber</flag>
+		<flag name="se_tvzon">Sweden (tvzon.se) tv listing grabber</flag>
+		<flag name="tr">Turkey (Digiturk) tv listing grabber</flag>
+		<flag name="tv_check">enable GUI checking</flag>
+		<flag name="tv_combiner">enable grabbers combiner</flag>
+		<flag name="tv_pick_cgi">enable CGI support</flag>
+		<flag name="uk_atlas">Fast UK and Ireland tv listing grabber</flag>
+		<flag name="uk_bleb">Britain tv listing grabber</flag>
+		<flag name="uk_rt">Britain alternative tv listing grabber</flag>
+		<flag name="uk_tvguide">UK and Ireland tv listing grabber using TV Guide website</flag>
+		<flag name="sd_json">Grabber for schedulesDirect.org SD-JSON service (many countries)</flag>
+		<flag name="za">South Africa tv listing grabber</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">xmltv</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index be6f3cda0762..01bc43b59d1d 100644
Binary files a/media-video/Manifest.gz and b/media-video/Manifest.gz differ
diff --git a/media-video/dv2sub/metadata.xml b/media-video/dv2sub/metadata.xml
index 518c9dc42991..bd2a94bb28b4 100644
--- a/media-video/dv2sub/metadata.xml
+++ b/media-video/dv2sub/metadata.xml
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>media-video@gentoo.org</email>
-    <name>Gentoo Video project</name>
-  </maintainer>
-  <longdescription lang="en">
+	<maintainer type="project">
+		<email>media-video@gentoo.org</email>
+		<name>Gentoo Video project</name>
+	</maintainer>
+	<longdescription lang="en">
 		Utility dv2sub reads raw DV stream from file argument dv-file or
 		standard input if absent. It can generate a parameter log about
 		every input DV frame or create MicroDVD subtitles with the
 		recording date and time.
 	</longdescription>
-  <use>
-    <flag name="kino">install kino plugin</flag>
-  </use>
-  <upstream>
-    <remote-id type="sourceforge">dv2sub</remote-id>
-  </upstream>
+	<use>
+		<flag name="kino">install kino plugin</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">dv2sub</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-video/ffdiaporama/metadata.xml b/media-video/ffdiaporama/metadata.xml
index 6b20ac540fec..cfafbcc57a86 100644
--- a/media-video/ffdiaporama/metadata.xml
+++ b/media-video/ffdiaporama/metadata.xml
@@ -11,34 +11,31 @@
 		<name>Proxy Maintainers</name>
 	</maintainer>
 	<upstream>
-        <changelog>http://ffdiaporama.tuxfamily.org/?page_id=7266&amp;lang=en</changelog>
-        <doc lang="en">http://ffdiaporama.tuxfamily.org/?page_id=6268</doc>
-        <bugs-to>http://ffdiaporama.tuxfamily.org/Forum/viewforum.php?id=4</bugs-to>
+		<changelog>http://ffdiaporama.tuxfamily.org/?page_id=7266&amp;lang=en</changelog>
+		<doc lang="en">http://ffdiaporama.tuxfamily.org/?page_id=6268</doc>
+		<bugs-to>http://ffdiaporama.tuxfamily.org/Forum/viewforum.php?id=4</bugs-to>
 	</upstream>
 	<longdescription lang="en">
-ffDiaporama is an application for creating video sequences consisting of
+		ffDiaporama is an application for creating video sequences consisting of
+		- titles, fixed or animated.
+		- images or photos, fixed or animated.
+		- movie clips
+		- music
 
-    - titles, fixed or animated.
-    - images or photos, fixed or animated.
-    - movie clips
-    - music
-
-These sequences are assembled into a slide show by means of transitions to produce complete videos
-The following options are available:
-
-
-    - Reframing of images and photos
-    - Cutting of video clips
-    - Adding text, notes to images, photos, sequences and animations
-    - Graphical filters on the images and the videos (conversion into black and white, dust removal, equalization of colors, etc.)
-    - Creation of animation by zoom, rotation or Ken Burns Effect on images or photos
-    - Correction of the images and the videos during animations (luminosity, contrast, gamma, colors, etc.)
-    - Transitions between sequences with definition of the transition type, sequence by sequence.
-    - Addition of a background sound (wav, mp3 or ogg) with customizable effects for volume, fade in/out and passage in pause, sequence by sequence.
-    - Generation of videos usable on most current video equipment (DVD player/smartphone, multimedia box, hard drive, etc.) but also publishable on the main video-sharing Websites (YouTube, Dailymotion, etc.)
-    - Video formats from QVGA (320×240) to Full HD (1920×1080) by way of the DVD and HD 720 formats.
-    - Image geometry (aspect ratio) : 4:3, 16:9 or 2.35:1 (cinema)
-    - Possible formats for rendering : avi, mpg, mp4, mkv
+		These sequences are assembled into a slide show by means of transitions to produce complete videos
+		The following options are available:
+		- Reframing of images and photos
+		- Cutting of video clips
+		- Adding text, notes to images, photos, sequences and animations
+		- Graphical filters on the images and the videos (conversion into black and white, dust removal, equalization of colors, etc.)
+		- Creation of animation by zoom, rotation or Ken Burns Effect on images or photos
+		- Correction of the images and the videos during animations (luminosity, contrast, gamma, colors, etc.)
+		- Transitions between sequences with definition of the transition type, sequence by sequence.
+		- Addition of a background sound (wav, mp3 or ogg) with customizable effects for volume, fade in/out and passage in pause, sequence by sequence.
+		- Generation of videos usable on most current video equipment (DVD player/smartphone, multimedia box, hard drive, etc.) but also publishable on the main video-sharing Websites (YouTube, Dailymotion, etc.)
+		- Video formats from QVGA (320×240) to Full HD (1920×1080) by way of the DVD and HD 720 formats.
+		- Image geometry (aspect ratio) : 4:3, 16:9 or 2.35:1 (cinema)
+		- Possible formats for rendering : avi, mpg, mp4, mkv
 	</longdescription>
 	<use>
 		<flag name="openclipart">Support openslipart database</flag>
diff --git a/media-video/handbrake/metadata.xml b/media-video/handbrake/metadata.xml
index 1c5819c4e49a..6f7dc3b848e0 100644
--- a/media-video/handbrake/metadata.xml
+++ b/media-video/handbrake/metadata.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>thev00d00@gentoo.org</email>
-	<name>Ian Whyman</name>
-  </maintainer>
-  <longdescription>
-    Open-source, GPL-licensed, multiplatform, multithreaded video transcoder.
-  </longdescription>
-  <use>
-    <flag name="gstreamer">Support for the streaming media framework from <pkg>media-libs/gstreamer</pkg>.</flag>
-    <flag name="gtk">Install the GTK UI, ghb.</flag>
-    <flag name="fdk">Support for encoding AAC using <pkg>media-libs/fdk-aac</pkg>.</flag>
-    <flag name="libav-aac">Support for encoding AAC using <pkg>media-video/libav</pkg>'s internal encoder.</flag>
-	<flag name="x265">Support for encoding h265 using <pkg>media-libs/x265</pkg>.</flag>
-  </use>
+	<maintainer type="person">
+		<email>thev00d00@gentoo.org</email>
+		<name>Ian Whyman</name>
+	</maintainer>
+	<longdescription>
+		Open-source, GPL-licensed, multiplatform, multithreaded video transcoder.
+	</longdescription>
+	<use>
+		<flag name="gstreamer">Support for the streaming media framework from <pkg>media-libs/gstreamer</pkg>.</flag>
+		<flag name="gtk">Install the GTK UI, ghb.</flag>
+		<flag name="fdk">Support for encoding AAC using <pkg>media-libs/fdk-aac</pkg>.</flag>
+		<flag name="libav-aac">Support for encoding AAC using <pkg>media-video/libav</pkg>'s internal encoder.</flag>
+		<flag name="x265">Support for encoding h265 using <pkg>media-libs/x265</pkg>.</flag>
+	</use>
 </pkgmetadata>
diff --git a/media-video/makemkv/metadata.xml b/media-video/makemkv/metadata.xml
index 9de3ac702c5f..47f90d86823d 100644
--- a/media-video/makemkv/metadata.xml
+++ b/media-video/makemkv/metadata.xml
@@ -6,21 +6,21 @@
 		<name>James Le Cuirot</name>
 	</maintainer>
 	<longdescription>
-      MakeMKV is your one-click solution to convert video that you own
-      into free and patents-unencumbered format that can be played
-      everywhere. MakeMKV is a format converter, otherwise called
-      transcoder. It converts the video clips from proprietary (and
-      usually encrypted) disc into a set of MKV files, preserving most
-      information but not changing it in any way. The MKV format can
-      store multiple video/audio tracks with all meta-information and
-      preserve chapters. There are many players that can play MKV
-      files nearly on all platforms, and there are tools to convert
-      MKV files to many formats, including DVD and Blu-ray discs.
+		MakeMKV is your one-click solution to convert video that you own
+		into free and patents-unencumbered format that can be played
+		everywhere. MakeMKV is a format converter, otherwise called
+		transcoder. It converts the video clips from proprietary (and
+		usually encrypted) disc into a set of MKV files, preserving most
+		information but not changing it in any way. The MKV format can
+		store multiple video/audio tracks with all meta-information and
+		preserve chapters. There are many players that can play MKV
+		files nearly on all platforms, and there are tools to convert
+		MKV files to many formats, including DVD and Blu-ray discs.
 
-      Additionally MakeMKV can instantly stream decrypted video
-      without intermediate conversion to wide range of players, so you
-      may watch Blu-ray and DVD discs with your favorite player on
-      your favorite OS or on your favorite device.
+		Additionally MakeMKV can instantly stream decrypted video
+		without intermediate conversion to wide range of players, so you
+		may watch Blu-ray and DVD discs with your favorite player on
+		your favorite OS or on your favorite device.
 	</longdescription>
 	<use>
 		<flag name="gui">Build the Qt5 GUI</flag>
diff --git a/media-video/mplayer-sh/metadata.xml b/media-video/mplayer-sh/metadata.xml
index 2e199ea15fcc..8899ec4cd72c 100644
--- a/media-video/mplayer-sh/metadata.xml
+++ b/media-video/mplayer-sh/metadata.xml
@@ -6,6 +6,6 @@
 		<name>Gentoo VDR Project</name>
 	</maintainer>
 	<longdescription lang="en">
-	  API script between Plugin vdr-mplayer and mplayer.
+		API script between Plugin vdr-mplayer and mplayer.
 	</longdescription>
 </pkgmetadata>
diff --git a/media-video/nvidia_video_sdk/metadata.xml b/media-video/nvidia_video_sdk/metadata.xml
index 3ccfba292b0d..cd42e8b7307e 100644
--- a/media-video/nvidia_video_sdk/metadata.xml
+++ b/media-video/nvidia_video_sdk/metadata.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>media-video@gentoo.org</email>
-  </maintainer>
-  <use>
-	<flag name="tools">Build and install example tools.</flag>
-  </use>
+	<maintainer type="project">
+		<email>media-video@gentoo.org</email>
+	</maintainer>
+	<use>
+		<flag name="tools">Build and install example tools.</flag>
+	</use>
 </pkgmetadata>
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 4eb5852fbb85..7f860192430e 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 5790559f51dd..71135410bff9 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Sun, 26 Nov 2017 07:09:18 +0000
+Mon, 27 Nov 2017 12:39:27 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 5790559f51dd..71135410bff9 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Sun, 26 Nov 2017 07:09:18 +0000
+Mon, 27 Nov 2017 12:39:27 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 9b660aab74e2..27836bf877c2 100644
Binary files a/metadata/md5-cache/Manifest.gz and b/metadata/md5-cache/Manifest.gz differ
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index f8624a1d5b8c..823fe6519d52 100644
Binary files a/metadata/md5-cache/app-admin/Manifest.gz and b/metadata/md5-cache/app-admin/Manifest.gz differ
diff --git a/metadata/md5-cache/app-admin/conky-1.10.6-r5 b/metadata/md5-cache/app-admin/conky-1.10.6-r6
similarity index 100%
rename from metadata/md5-cache/app-admin/conky-1.10.6-r5
rename to metadata/md5-cache/app-admin/conky-1.10.6-r6
diff --git a/metadata/md5-cache/app-admin/haskell-updater-1.2.12 b/metadata/md5-cache/app-admin/haskell-updater-1.2.12
new file mode 100644
index 000000000000..ff12d7684dd2
--- /dev/null
+++ b/metadata/md5-cache/app-admin/haskell-updater-1.2.12
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-lang/ghc-6.12.1
+DESCRIPTION=Rebuild Haskell dependencies in Gentoo
+EAPI=6
+HOMEPAGE=http://haskell.org/haskellwiki/Gentoo#haskell-updater
+KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=|| ( >=sys-apps/portage-2.1.6 sys-apps/pkgcore sys-apps/paludis )
+SLOT=0
+SRC_URI=mirror://hackage/packages/archive/haskell-updater/1.2.12/haskell-updater-1.2.12.tar.gz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ghc-package	f9cf05643e20f03876bb4807f008c80f	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=92001e1ddf4d3bef702ccadae53a652d
diff --git a/metadata/md5-cache/app-admin/puppet-4.10.1 b/metadata/md5-cache/app-admin/puppet-4.10.1
index 60d4337fc618..5f14c5a7a067 100644
--- a/metadata/md5-cache/app-admin/puppet-4.10.1
+++ b/metadata/md5-cache/app-admin/puppet-4.10.1
@@ -4,7 +4,7 @@ DESCRIPTION=A system automation and configuration management software.
 EAPI=5
 HOMEPAGE=http://puppetlabs.com/
 IUSE=augeas diff doc emacs experimental ldap rrdtool selinux shadow sqlite vim-syntax xemacs test elibc_FreeBSD ruby_targets_ruby22 doc test test
-KEYWORDS=amd64 hppa ~ppc x86
+KEYWORDS=amd64 ~hppa ~ppc x86
 LICENSE=Apache-2.0 GPL-2
 RDEPEND=ruby_targets_ruby22? ( dev-ruby/hiera[ruby_targets_ruby22] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby22] dev-ruby/json:=[ruby_targets_ruby22] >=dev-ruby/facter-3.0.0[ruby_targets_ruby22] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby22] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby22] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby22] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby22] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby22] ) virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby22? ( dev-ruby/hiera[ruby_targets_ruby22] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby22] dev-ruby/json:=[ruby_targets_ruby22] >=dev-ruby/facter-3.0.0[ruby_targets_ruby22] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby22] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby22] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby22] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby22] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby22] ) virtual/ruby-ssl[ruby_targets_ruby22] ) rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] ) selinux? ( sys-libs/libselinux[ruby] sec-policy/selinux-puppet ) vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 ) >=app-portage/eix-0.18.0 ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
 REQUIRED_USE=|| ( ruby_targets_ruby22 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://downloads.puppetlabs.com/puppet/puppet-4.10.1.tar.gz
 _eclasses_=elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	1a95cd8be181598c8171cf918aa225d9	ruby-utils	f8a0644cb27ba724df27b2a20a739b53	toolchain-funcs	185a06792159ca143528e7010368e8af	user	8bc2845510e2109af75e3eeac607ec81	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xemacs-elisp-common	5ad47e1940fe7ffbdeeb002a3912bf79
-_md5_=2542458e85b53fae459d61df9163c8a6
+_md5_=f45f5a28e449059ebaea4b0a69aa2168
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index c90e341fc555..bbe792219a96 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/libb2-0.98 b/metadata/md5-cache/app-crypt/libb2-0.98
new file mode 100644
index 000000000000..a13b63dc3d98
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/libb2-0.98
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=C library providing BLAKE2b, BLAKE2s, BLAKE2bp, BLAKE2sp
+EAPI=6
+HOMEPAGE=https://github.com/BLAKE2/libb2
+IUSE=static
+KEYWORDS=~amd64 ~ppc64
+LICENSE=CC0-1.0
+SLOT=0
+SRC_URI=https://github.com/BLAKE2/libb2/archive/0d7015f6a640a63bc6c68562328e112445ea9d5c.tar.gz -> libb2-0.98.tar.gz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=4fa1573e92c3468e38900c0e33286111
diff --git a/metadata/md5-cache/app-crypt/rhash-1.3.5 b/metadata/md5-cache/app-crypt/rhash-1.3.5
index 69f82020da4a..61f75bdee16c 100644
--- a/metadata/md5-cache/app-crypt/rhash-1.3.5
+++ b/metadata/md5-cache/app-crypt/rhash-1.3.5
@@ -4,10 +4,10 @@ DESCRIPTION=Console utility and library for computing and verifying file hash su
 EAPI=6
 HOMEPAGE=http://rhash.anz.ru/
 IUSE=debug nls openssl static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=openssl? ( dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
 SRC_URI=mirror://sourceforge/rhash/rhash-1.3.5-src.tar.gz
 _eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=7a34003172d86a26a2c3467a6a3d7963
+_md5_=cafb308da0115d68dd29cace3f11562f
diff --git a/metadata/md5-cache/app-editors/Manifest.gz b/metadata/md5-cache/app-editors/Manifest.gz
index 698234dca28e..a7c1bdd7831c 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/mg-20170828 b/metadata/md5-cache/app-editors/mg-20170828
index 05b529446ba4..d8e99e3181db 100644
--- a/metadata/md5-cache/app-editors/mg-20170828
+++ b/metadata/md5-cache/app-editors/mg-20170828
@@ -4,10 +4,10 @@ DESCRIPTION=MicroGnuEmacs, a port from the BSDs
 EAPI=6
 HOMEPAGE=http://homepage.boetes.org/software/mg/
 IUSE=livecd
-KEYWORDS=alpha ~amd64 ~arm hppa ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha ~amd64 ~arm hppa ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=public-domain
 RDEPEND=sys-libs/ncurses:0 !elibc_FreeBSD? ( >=dev-libs/libbsd-0.7.0 )
 SLOT=0
 SRC_URI=http://homepage.boetes.org/software/mg/mg-20170828.tar.gz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=389e36dfe559e34c9a0a63ca73f2807b
+_md5_=0ef2a7e291d3aac26311a58847f9465c
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index 79600afd7955..310d05ea35de 100644
Binary files a/metadata/md5-cache/app-emulation/Manifest.gz and b/metadata/md5-cache/app-emulation/Manifest.gz differ
diff --git a/metadata/md5-cache/app-emulation/e-uae-0.8.29_rc4-r3 b/metadata/md5-cache/app-emulation/e-uae-0.8.29_rc4-r3
index 5855b15deeb7..51d4c0309ae3 100644
--- a/metadata/md5-cache/app-emulation/e-uae-0.8.29_rc4-r3
+++ b/metadata/md5-cache/app-emulation/e-uae-0.8.29_rc4-r3
@@ -4,10 +4,10 @@ DESCRIPTION=The Ubiquitous Amiga Emulator with an emulation core largely based o
 EAPI=6
 HOMEPAGE=http://www.rcdrummond.net/uae/
 IUSE=X dga ncurses sdl alsa oss sdl-sound capslib
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=~amd64 ppc ~x86
 LICENSE=GPL-2
 RDEPEND=X? ( x11-libs/libXt x11-libs/libxkbfile x11-libs/libXext x11-misc/xkeyboard-config dga? ( x11-libs/libXxf86dga x11-libs/libXxf86vm ) ) !X? ( sdl? ( media-libs/libsdl ) !sdl? ( sys-libs/ncurses:0= ) ) alsa? ( media-libs/alsa-lib ) !alsa? ( sdl-sound? ( media-libs/sdl-sound ) ) capslib? ( >=games-emulation/caps-20060612 ) sys-libs/zlib virtual/cdrtools
 SLOT=0
 SRC_URI=http://www.rcdrummond.net/uae/e-uae-0.8.29-WIP4/e-uae-0.8.29-WIP4.tar.bz2
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=5c0cecd0ba4c79111b69702e4cba8db8
+_md5_=c89211d1fd012a05726ff41762fd36ec
diff --git a/metadata/md5-cache/app-emulation/genymotion-bin-2.10.0 b/metadata/md5-cache/app-emulation/genymotion-bin-2.11.0
similarity index 92%
rename from metadata/md5-cache/app-emulation/genymotion-bin-2.10.0
rename to metadata/md5-cache/app-emulation/genymotion-bin-2.11.0
index dad5fcde671c..a28c7866a8eb 100644
--- a/metadata/md5-cache/app-emulation/genymotion-bin-2.10.0
+++ b/metadata/md5-cache/app-emulation/genymotion-bin-2.11.0
@@ -7,6 +7,6 @@ LICENSE=genymotion
 RDEPEND=|| ( >=app-emulation/virtualbox-5.0.28 >=app-emulation/virtualbox-bin-5.0.28 ) virtual/opengl dev-libs/openssl dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtsql:5[sqlite] dev-qt/qtwebkit:5 dev-qt/qtwebsockets:5 dev-qt/qtsvg:5 dev-qt/qtx11extras:5 dev-qt/qtdeclarative:5[widgets] dev-qt/qtquickcontrols:5 dev-qt/qtconcurrent:5 dev-qt/qtgraphicaleffects:5 sys-apps/util-linux media-libs/gst-plugins-base:0.10
 RESTRICT=bindist fetch
 SLOT=0
-SRC_URI=genymotion-2.10.0-linux_x64.bin
+SRC_URI=genymotion-2.11.0-linux_x64.bin
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=ac2a62729ddd90b0c9f366e7c25364a3
+_md5_=03c0d29b452629565095d77839b8a73b
diff --git a/metadata/md5-cache/app-emulation/spim-8.0-r2 b/metadata/md5-cache/app-emulation/spim-8.0-r2
index fda50a32204d..b59d5f1b1e73 100644
--- a/metadata/md5-cache/app-emulation/spim-8.0-r2
+++ b/metadata/md5-cache/app-emulation/spim-8.0-r2
@@ -4,11 +4,11 @@ DESCRIPTION=MIPS Simulator
 EAPI=6
 HOMEPAGE=http://spimsimulator.sourceforge.net/
 IUSE=doc X
-KEYWORDS=~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=~amd64 ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=BSD
 RDEPEND=X? ( media-fonts/font-adobe-100dpi x11-libs/libXaw x11-libs/libXp )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.cs.wisc.edu/~larus/SPIM/spim-8.0.tar.gz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=206525dc38f6d068ab15d89eff749c6c
+_md5_=b5d18eaa557592d7723feba6cb78d27f
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index 133ed46a50d1..298ecb9c5ab9 100644
Binary files a/metadata/md5-cache/app-misc/Manifest.gz and b/metadata/md5-cache/app-misc/Manifest.gz differ
diff --git a/metadata/md5-cache/app-misc/color-1.2-r2 b/metadata/md5-cache/app-misc/color-1.2-r2
index ea0acbd4f553..87347aa19bb2 100644
--- a/metadata/md5-cache/app-misc/color-1.2-r2
+++ b/metadata/md5-cache/app-misc/color-1.2-r2
@@ -2,9 +2,9 @@ DEFINED_PHASES=install postinst prepare
 DESCRIPTION=Easily add ANSI colouring to shell scripts
 EAPI=6
 HOMEPAGE=http://www.runslinux.net/?page_id=10
-KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://runslinux.net/projects/color/color-1.2.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=e380c6e407f3cab8634afc83f8439b68
+_md5_=52b3bf0ce767551449c68c3c1c394b3c
diff --git a/metadata/md5-cache/app-misc/mc-4.8.20 b/metadata/md5-cache/app-misc/mc-4.8.20
new file mode 100644
index 000000000000..686b7cb3c0d0
--- /dev/null
+++ b/metadata/md5-cache/app-misc/mc-4.8.20
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=>=dev-libs/glib-2.26.0:2 gpm? ( sys-libs/gpm ) kernel_linux? ( sys-fs/e2fsprogs ) samba? ( net-fs/samba ) sftp? ( net-libs/libssh2 ) slang? ( >=sys-libs/slang-2 ) !slang? ( sys-libs/ncurses:0= ) spell? ( app-text/aspell ) X? ( x11-libs/libX11 x11-libs/libICE x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM ) app-arch/xz-utils virtual/pkgconfig nls? ( sys-devel/gettext ) test? ( dev-libs/check ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=GNU Midnight Commander is a text based file manager
+EAPI=6
+HOMEPAGE=https://www.midnight-commander.org
+IUSE=+edit gpm mclib nls samba sftp +slang spell test X +xdg
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris
+LICENSE=GPL-3
+RDEPEND=>=dev-libs/glib-2.26.0:2 gpm? ( sys-libs/gpm ) kernel_linux? ( sys-fs/e2fsprogs ) samba? ( net-fs/samba ) sftp? ( net-libs/libssh2 ) slang? ( >=sys-libs/slang-2 ) !slang? ( sys-libs/ncurses:0= ) spell? ( app-text/aspell ) X? ( x11-libs/libX11 x11-libs/libICE x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM )
+REQUIRED_USE=spell? ( edit )
+SLOT=0
+SRC_URI=http://ftp.midnight-commander.org/mc-4.8.20.tar.xz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=9dbfdbe6ffadae27aab09c008cdc4bbc
diff --git a/metadata/md5-cache/app-portage/Manifest.gz b/metadata/md5-cache/app-portage/Manifest.gz
index e3b0660fda20..cb086801bd86 100644
Binary files a/metadata/md5-cache/app-portage/Manifest.gz and b/metadata/md5-cache/app-portage/Manifest.gz differ
diff --git a/metadata/md5-cache/app-portage/gemato-4 b/metadata/md5-cache/app-portage/gemato-8
similarity index 83%
rename from metadata/md5-cache/app-portage/gemato-4
rename to metadata/md5-cache/app-portage/gemato-8
index bcd843d9028e..2f072aa34e57 100644
--- a/metadata/md5-cache/app-portage/gemato-4
+++ b/metadata/md5-cache/app-portage/gemato-8
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=blake2? ( python_targets_python2_7? ( dev-python/pyblake2[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_4? ( dev-python/pyblake2[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_5? ( dev-python/pyblake2[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) ) bzip2? ( python_targets_python2_7? ( dev-python/bz2file[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) gpg? ( app-crypt/gnupg ) lzma? ( python_targets_python2_7? ( dev-python/backports-lzma[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) sha3? ( python_targets_python2_7? ( dev-python/pysha3[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_4? ( dev-python/pysha3[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_5? ( dev-python/pysha3[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_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(-)]
+DEPEND=blake2? ( python_targets_python2_7? ( dev-python/pyblake2[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_4? ( dev-python/pyblake2[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_5? ( dev-python/pyblake2[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) ) bzip2? ( python_targets_python2_7? ( dev-python/bz2file[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) gpg? ( app-crypt/gnupg ) lzma? ( python_targets_python2_7? ( dev-python/backports-lzma[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) sha3? ( python_targets_python2_7? ( dev-python/pysha3[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_4? ( dev-python/pysha3[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_5? ( dev-python/pysha3[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) ) dev-python/setuptools[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(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_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(-)]
 DESCRIPTION=Stand-alone Manifest generation & verification tool
 EAPI=6
 HOMEPAGE=https://github.com/mgorny/gemato
 IUSE=+blake2 bzip2 +gpg lzma sha3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ia64 ~ppc ~ppc64 ~x86
 LICENSE=BSD-2
 RDEPEND=blake2? ( python_targets_python2_7? ( dev-python/pyblake2[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_4? ( dev-python/pyblake2[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_5? ( dev-python/pyblake2[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) ) bzip2? ( python_targets_python2_7? ( dev-python/bz2file[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) gpg? ( app-crypt/gnupg ) lzma? ( python_targets_python2_7? ( dev-python/backports-lzma[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) sha3? ( python_targets_python2_7? ( dev-python/pysha3[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_4? ( dev-python/pysha3[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_5? ( dev-python/pysha3[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_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(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
-SRC_URI=https://github.com/mgorny/gemato/archive/v4.tar.gz -> gemato-4.tar.gz
+SRC_URI=mirror://pypi/g/gemato/gemato-8.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=34a62539ef8ecbd41346ff8ac41079bc
+_md5_=f51e0a1be6a9c85ac7b6150eb3d7e772
diff --git a/metadata/md5-cache/app-portage/gemato-9999 b/metadata/md5-cache/app-portage/gemato-9999
index 7ba3b67a02f5..e6e465647f72 100644
--- a/metadata/md5-cache/app-portage/gemato-9999
+++ b/metadata/md5-cache/app-portage/gemato-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=blake2? ( python_targets_python2_7? ( dev-python/pyblake2[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_4? ( dev-python/pyblake2[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_5? ( dev-python/pyblake2[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) ) bzip2? ( python_targets_python2_7? ( dev-python/bz2file[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) gpg? ( app-crypt/gnupg ) lzma? ( python_targets_python2_7? ( dev-python/backports-lzma[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) sha3? ( python_targets_python2_7? ( dev-python/pysha3[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_4? ( dev-python/pysha3[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_5? ( dev-python/pysha3[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_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(-)] >=dev-vcs/git-1.8.2.1
+DEPEND=blake2? ( python_targets_python2_7? ( dev-python/pyblake2[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_4? ( dev-python/pyblake2[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_5? ( dev-python/pyblake2[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) ) bzip2? ( python_targets_python2_7? ( dev-python/bz2file[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) gpg? ( app-crypt/gnupg ) lzma? ( python_targets_python2_7? ( dev-python/backports-lzma[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) sha3? ( python_targets_python2_7? ( dev-python/pysha3[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_4? ( dev-python/pysha3[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_5? ( dev-python/pysha3[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) ) dev-python/setuptools[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(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_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(-)] >=dev-vcs/git-1.8.2.1
 DESCRIPTION=Stand-alone Manifest generation & verification tool
 EAPI=6
 HOMEPAGE=https://github.com/mgorny/gemato
@@ -9,4 +9,4 @@ RDEPEND=blake2? ( python_targets_python2_7? ( dev-python/pyblake2[python_targets
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	git-r3	52a888802d25387c2c74cb845d1219bc	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=44eeb606a29041910446c9dbd983d202
+_md5_=99386361be15de8a6cc906b8571b0c4b
diff --git a/metadata/md5-cache/app-portage/portage-utils-0.64-r1 b/metadata/md5-cache/app-portage/portage-utils-0.64-r1
new file mode 100644
index 000000000000..9781baa65b2d
--- /dev/null
+++ b/metadata/md5-cache/app-portage/portage-utils-0.64-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure
+DEPEND=dev-libs/iniparser:0 app-arch/xz-utils static? ( dev-libs/iniparser:0[static-libs] )
+DESCRIPTION=small and fast portage helper tools written in C
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Portage-utils
+IUSE=nls static
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=dev-libs/iniparser:0
+SLOT=0
+SRC_URI=mirror://gentoo/portage-utils-0.64.tar.xz https://dev.gentoo.org/~vapier/dist/portage-utils-0.64.tar.xz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=226468ff9110f07b40fdf32f493f15cb
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index 675c86369729..64346d4657e5 100644
Binary files a/metadata/md5-cache/app-text/Manifest.gz and b/metadata/md5-cache/app-text/Manifest.gz differ
diff --git a/metadata/md5-cache/app-text/djview-4.10.6 b/metadata/md5-cache/app-text/djview-4.10.6
index e2fbe1a2db60..e6f7d1a37345 100644
--- a/metadata/md5-cache/app-text/djview-4.10.6
+++ b/metadata/md5-cache/app-text/djview-4.10.6
@@ -4,10 +4,10 @@ DESCRIPTION=Portable DjVu viewer using Qt4
 EAPI=4
 HOMEPAGE=http://djvu.sourceforge.net/djview4.html
 IUSE=debug nsplugin
-KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 x86
+KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ppc ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=app-text/djvu-3.5.22-r1 dev-qt/qtdbus:4 dev-qt/qtopengl:4 dev-qt/qtgui:4
 SLOT=0
 SRC_URI=mirror://sourceforge/djvu/djview-4.10.6.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	mozextension	42c5ed513e5325a5d0629ad85bb27c23	multilib	97f470f374f2e94ccab04a2fb21d811e	nsplugins	2049586e425364a1c5bdb004205d1758	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d6c8b37653c2372cdf19ae4c43fe4867
+_md5_=d74852e3fc61bbdf2d90957a10e1ce29
diff --git a/metadata/md5-cache/app-text/libexttextcat-3.4.4 b/metadata/md5-cache/app-text/libexttextcat-3.4.4
index f3e82453686c..272e27e7fc2d 100644
--- a/metadata/md5-cache/app-text/libexttextcat-3.4.4
+++ b/metadata/md5-cache/app-text/libexttextcat-3.4.4
@@ -3,9 +3,9 @@ DESCRIPTION=Library implementing N-gram-based text categorization
 EAPI=5
 HOMEPAGE=http://software.wise-guys.nl/libtextcat/
 IUSE=static-libs
-KEYWORDS=alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~s390 x86 ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD-2
 SLOT=0
 SRC_URI=http://dev-www.libreoffice.org/src/libexttextcat/libexttextcat-3.4.4.tar.xz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=790b76b5018858cca3a65541336a20f9
+_md5_=61fd128d8cf711e6d2b429f70c3faa6c
diff --git a/metadata/md5-cache/app-text/libexttextcat-3.4.5 b/metadata/md5-cache/app-text/libexttextcat-3.4.5
index 9b4cde51644a..6f28d72ae589 100644
--- a/metadata/md5-cache/app-text/libexttextcat-3.4.5
+++ b/metadata/md5-cache/app-text/libexttextcat-3.4.5
@@ -3,8 +3,8 @@ DESCRIPTION=Library implementing N-gram-based text categorization
 EAPI=6
 HOMEPAGE=http://software.wise-guys.nl/libtextcat/
 IUSE=static-libs
-KEYWORDS=alpha amd64 ~arm ~arm64 hppa ~ia64 ppc ppc64 ~s390 x86 ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 ~arm ~arm64 hppa ~ia64 ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD-2
 SLOT=0
 SRC_URI=http://dev-www.libreoffice.org/src/libexttextcat/libexttextcat-3.4.5.tar.xz
-_md5_=3c50733f3254b749c9f4349317452a1a
+_md5_=b1461b791f96d7f4077389861aaeea05
diff --git a/metadata/md5-cache/app-text/poppler-0.57.0-r1 b/metadata/md5-cache/app-text/poppler-0.57.0-r1
index 9a5cd58209ba..4cc62b6cb7e5 100644
--- a/metadata/md5-cache/app-text/poppler-0.57.0-r1
+++ b/metadata/md5-cache/app-text/poppler-0.57.0-r1
@@ -4,11 +4,11 @@ DESCRIPTION=PDF rendering library based on the xpdf-3.0 code base
 EAPI=6
 HOMEPAGE=https://poppler.freedesktop.org/
 IUSE=cairo cjk curl cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt4 qt5 tiff +utils
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=media-libs/fontconfig-2.6.0 >=media-libs/freetype-2.3.9 sys-libs/zlib cairo? ( dev-libs/glib:2 >=x11-libs/cairo-1.10.0 introspection? ( >=dev-libs/gobject-introspection-1.32.1:= ) ) curl? ( net-misc/curl ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/openjpeg:2= ) lcms? ( media-libs/lcms:2 ) nss? ( >=dev-libs/nss-3.19:0 ) png? ( media-libs/libpng:0= ) qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtxml:5 ) tiff? ( media-libs/tiff:0 ) cjk? ( >=app-text/poppler-data-0.4.7 )
 RESTRICT=test
 SLOT=0/68
 SRC_URI=https://poppler.freedesktop.org/poppler-0.57.0.tar.xz
 _eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ce6eea760febfb954959030decdb809d
+_md5_=17dfdcde7030a4737a30d0719f1a92d1
diff --git a/metadata/md5-cache/app-text/ronn-0.7.3-r3 b/metadata/md5-cache/app-text/ronn-0.7.3-r3
index 95b3e81f2931..d697c16f0157 100644
--- a/metadata/md5-cache/app-text/ronn-0.7.3-r3
+++ b/metadata/md5-cache/app-text/ronn-0.7.3-r3
@@ -4,11 +4,11 @@ DESCRIPTION=Converts simple, human readable textfiles to roff for terminal displ
 EAPI=5
 HOMEPAGE=https://github.com/rtomayko/ronn/
 IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~x64-macos ~x64-solaris
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~x64-macos ~x64-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/hpricot-0.8.2[ruby_targets_ruby22] >=dev-ruby/mustache-0.7.0[ruby_targets_ruby22] >=dev-ruby/rdiscount-1.5.8[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/hpricot-0.8.2[ruby_targets_ruby23] >=dev-ruby/mustache-0.7.0[ruby_targets_ruby23] >=dev-ruby/rdiscount-1.5.8[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/hpricot-0.8.2[ruby_targets_ruby24] >=dev-ruby/mustache-0.7.0[ruby_targets_ruby24] >=dev-ruby/rdiscount-1.5.8[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/ronn-0.7.3.gem
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	1a95cd8be181598c8171cf918aa225d9	ruby-utils	f8a0644cb27ba724df27b2a20a739b53	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=e8622b40a31a27a258090c45125d90f9
+_md5_=aaf6288cc7ab7f67ccd00f65628e7d64
diff --git a/metadata/md5-cache/app-text/xapian-omega-1.4.4 b/metadata/md5-cache/app-text/xapian-omega-1.4.4
index ce670063d6b6..e2dec50a9de9 100644
--- a/metadata/md5-cache/app-text/xapian-omega-1.4.4
+++ b/metadata/md5-cache/app-text/xapian-omega-1.4.4
@@ -3,9 +3,9 @@ DEPEND=dev-libs/xapian:0/30 dev-lang/perl dev-libs/libpcre sys-libs/zlib
 DESCRIPTION=An application built on Xapian, consisting of indexers and a CGI search frontend
 EAPI=6
 HOMEPAGE=http://www.xapian.org/
-KEYWORDS=alpha amd64 arm ia64 ~mips ppc ppc64 sparc x86
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/xapian:0/30 dev-lang/perl dev-libs/libpcre sys-libs/zlib
 SLOT=0
 SRC_URI=http://www.oligarchy.co.uk/xapian/1.4.4/xapian-omega-1.4.4.tar.xz
-_md5_=2f15b3bc93dc99123c2cefbbc8b6065f
+_md5_=cc606128efaed4cf0cef865facfab0bf
diff --git a/metadata/md5-cache/app-text/xindy-2.4 b/metadata/md5-cache/app-text/xindy-2.4
index fb4552d8beb3..265d7775379a 100644
--- a/metadata/md5-cache/app-text/xindy-2.4
+++ b/metadata/md5-cache/app-text/xindy-2.4
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install prepare
 DEPEND=virtual/latex-base dev-texlive/texlive-fontsrecommended >=dev-lisp/clisp-2.44.1-r1 dev-texlive/texlive-langcyrillic dev-lang/perl sys-devel/flex >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=A Flexible Indexing System
 EAPI=3
-HOMEPAGE=http://www.xindy.org/
+HOMEPAGE=http://www.xindy.org/ https://github.com/jschrod/xindy.ctan
 IUSE=doc
 KEYWORDS=alpha amd64 ia64 ppc x86
 LICENSE=GPL-2
@@ -10,4 +10,4 @@ RDEPEND=virtual/latex-base dev-texlive/texlive-fontsrecommended >=dev-lisp/clisp
 SLOT=0
 SRC_URI=http://www.xindy.org/xindy-2.4.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=d1ddb58221403e4a80217a02dcc87a39
+_md5_=819cce63ff9ee93ee89fb071d206affc
diff --git a/metadata/md5-cache/app-text/xindy-2.4-r1 b/metadata/md5-cache/app-text/xindy-2.4-r1
index af7e6f6e5dee..a9dff5bf1f56 100644
--- a/metadata/md5-cache/app-text/xindy-2.4-r1
+++ b/metadata/md5-cache/app-text/xindy-2.4-r1
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure prepare
 DEPEND=virtual/latex-base dev-texlive/texlive-fontsrecommended >=dev-lisp/clisp-2.44.1-r1 dev-texlive/texlive-langcyrillic dev-lang/perl sys-devel/flex >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=A Flexible Indexing System
 EAPI=6
-HOMEPAGE=http://www.xindy.org/
+HOMEPAGE=http://www.xindy.org/ https://github.com/jschrod/xindy.ctan
 IUSE=doc
 KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~x86
 LICENSE=GPL-2
@@ -10,4 +10,4 @@ RDEPEND=virtual/latex-base dev-texlive/texlive-fontsrecommended >=dev-lisp/clisp
 SLOT=0
 SRC_URI=http://www.xindy.org/xindy-2.4.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=26abf7cd58cb0ae9e049abcae48f0eb4
+_md5_=7e370621eb0e2ca2ab1f8b6e240439a8
diff --git a/metadata/md5-cache/dev-ada/Manifest.gz b/metadata/md5-cache/dev-ada/Manifest.gz
index 20c20e2817a6..4519b2b293f3 100644
Binary files a/metadata/md5-cache/dev-ada/Manifest.gz and b/metadata/md5-cache/dev-ada/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-ada/gprbuild-2016 b/metadata/md5-cache/dev-ada/gprbuild-2016
index db827ae89208..7ce12a760026 100644
--- a/metadata/md5-cache/dev-ada/gprbuild-2016
+++ b/metadata/md5-cache/dev-ada/gprbuild-2016
@@ -3,7 +3,7 @@ DEPEND=!bootstrap? ( dev-ada/xmlada[static,gnat_2016=,gnat_2017=] ) gnat_2016? (
 DESCRIPTION=Multi-Language Management
 EAPI=6
 HOMEPAGE=http://libre.adacore.com/
-IUSE=bootstrap gnat_2016 gnat_2017 +shared static static-pic
+IUSE=bootstrap +gnat_2016 gnat_2017 +shared static static-pic
 KEYWORDS=~amd64
 LICENSE=GPL-3
 RDEPEND=!bootstrap? ( dev-ada/xmlada[static,gnat_2016=,gnat_2017=] ) gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) gnat_2017? ( dev-lang/gnat-gpl:6.3.0 )
@@ -11,4 +11,4 @@ REQUIRED_USE=bootstrap? ( !shared !static !static-pic ) ^^ ( gnat_2016 gnat_2017
 SLOT=0
 SRC_URI=http://mirrors.cdn.adacore.com/art/57399662c7a447658e0affa8 -> gprbuild-gpl-2016-src.tar.gz bootstrap? ( http://mirrors.cdn.adacore.com/art/57399978c7a447658e0affc0 -> xmlada-gpl-2016-src.tar.gz )
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=9cdee70096e35989624a5e38363e83bc
+_md5_=217f854dda036a26c480a482535acccd
diff --git a/metadata/md5-cache/dev-ada/gprbuild-2017 b/metadata/md5-cache/dev-ada/gprbuild-2017
index ab11395ca21e..821e64bfbfc2 100644
--- a/metadata/md5-cache/dev-ada/gprbuild-2017
+++ b/metadata/md5-cache/dev-ada/gprbuild-2017
@@ -3,7 +3,7 @@ DEPEND=!bootstrap? ( dev-ada/xmlada[static,gnat_2016=,gnat_2017=] ) gnat_2016? (
 DESCRIPTION=Multi-Language Management
 EAPI=6
 HOMEPAGE=http://libre.adacore.com/
-IUSE=bootstrap gnat_2016 gnat_2017 +shared static static-pic
+IUSE=bootstrap gnat_2016 +gnat_2017 +shared static static-pic
 KEYWORDS=~amd64
 LICENSE=GPL-3
 RDEPEND=!bootstrap? ( dev-ada/xmlada[static,gnat_2016=,gnat_2017=] ) gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) gnat_2017? ( dev-lang/gnat-gpl:6.3.0 )
@@ -11,4 +11,4 @@ REQUIRED_USE=bootstrap? ( !shared !static !static-pic ) ^^ ( gnat_2016 gnat_2017
 SLOT=0
 SRC_URI=http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deecff7 -> gprbuild-gpl-2017-src.tar.gz bootstrap? ( http://mirrors.cdn.adacore.com/art/591aeb88c7a4473fcbb154f8 -> xmlada-gpl-2017-src.tar.gz )
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=64a331b699b45551dd47335e5c9b24dc
+_md5_=b8a7aeaff442f41aee0bb07c339e2e86
diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz
index 959909577eb5..a31b08769d9d 100644
Binary files a/metadata/md5-cache/dev-db/Manifest.gz and b/metadata/md5-cache/dev-db/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-db/pspg-0.5 b/metadata/md5-cache/dev-db/pspg-0.5
index b2efcd24a822..d83b36b275c0 100644
--- a/metadata/md5-cache/dev-db/pspg-0.5
+++ b/metadata/md5-cache/dev-db/pspg-0.5
@@ -3,9 +3,9 @@ DEPEND=sys-libs/ncurses:*
 DESCRIPTION=A better pager for psql
 EAPI=6
 HOMEPAGE=https://github.com/okbob/pspg
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=BSD-2
 RDEPEND=sys-libs/ncurses:*
 SLOT=0
 SRC_URI=https://github.com/okbob/pspg/archive/0.5.tar.gz -> pspg-0.5.tar.gz
-_md5_=0821b73615965b58ac05b5bdd893138d
+_md5_=3eec431bed7e74d28ca68a86f777c353
diff --git a/metadata/md5-cache/dev-db/sqlcl-bin-17.2.0.184.1230 b/metadata/md5-cache/dev-db/sqlcl-bin-17.3.0.271.1943
similarity index 90%
rename from metadata/md5-cache/dev-db/sqlcl-bin-17.2.0.184.1230
rename to metadata/md5-cache/dev-db/sqlcl-bin-17.3.0.271.1943
index 713901e0781e..69442ab30aa0 100644
--- a/metadata/md5-cache/dev-db/sqlcl-bin-17.2.0.184.1230
+++ b/metadata/md5-cache/dev-db/sqlcl-bin-17.3.0.271.1943
@@ -7,5 +7,5 @@ LICENSE=OTN
 RDEPEND=virtual/jre:1.8 dev-java/java-config:2 dev-db/oracle-instantclient
 RESTRICT=bindist fetch mirror
 SLOT=0
-SRC_URI=sqlcl-17.2.0.184.1230-no-jre.zip
+SRC_URI=sqlcl-17.3.0.271.1943-no-jre.zip
 _md5_=4e2a1b93ee667095767d784ff82734a0
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index ad1170e11b90..71f60ca5b8b1 100644
Binary files a/metadata/md5-cache/dev-lang/Manifest.gz and b/metadata/md5-cache/dev-lang/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-lang/gnat-gpl-2016 b/metadata/md5-cache/dev-lang/gnat-gpl-2016
index fd980dd5e61b..9b37f5e1f5f6 100644
--- a/metadata/md5-cache/dev-lang/gnat-gpl-2016
+++ b/metadata/md5-cache/dev-lang/gnat-gpl-2016
@@ -6,10 +6,10 @@ HOMEPAGE=http://libre.adacore.com/
 IUSE=bootstrap regression-test vanilla altivec debug nopie nossp doc gcj awt hardened multilib objc pgo objc-gc libssp objc++ fixed-point go graphite cilk +vtv +nls +nptl +cxx +fortran +openmp +sanitize
 KEYWORDS=~amd64
 LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+ GPL-2 GPL-3
-PDEPEND=>=sys-devel/gcc-config-1.7
+PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/gcc-config-1.7
 RDEPEND=!sys-devel/gcc:4.9.4 sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0 >=dev-libs/mpfr-2.4.2:0 >=dev-libs/mpc-0.8.1:0 graphite? ( >=dev-libs/cloog-0.18.0 >=dev-libs/isl-0.11.1 )
 RESTRICT=strip
 SLOT=4.9.4
-SRC_URI=mirror://gnu/gcc/gcc-4.9.4/gcc-4.9.4.tar.bz2 mirror://gentoo/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.9.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.9.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.9.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.9.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.9.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.9.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.9.4-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 mirror://gentoo/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar ) http://mirrors.cdn.adacore.com/art/57399304c7a447658e0aff7f -> gnat-gpl-2016-src.tar.gz http://mirrors.cdn.adacore.com/art/573992d4c7a447658d00e1db -> gcc-4.9-gpl-2016-src.tar.gz http://mirrors.cdn.adacore.com/art/57399232c7a447658e0aff7d -> gcc-interface-4.9-gpl-2016-src.tar.gz bootstrap? ( http://mirrors.cdn.adacore.com/art/564b3ebec8e196b040fbe66c -> gnat-gpl-2014-x86_64-linux-bin.tar.gz )
+SRC_URI=mirror://gnu/gcc/gcc-4.9.4/gcc-4.9.4.tar.bz2 mirror://gentoo/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.9.4-patches-1.2.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.9.4-patches-1.2.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.9.4-patches-1.2.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.9.4-patches-1.2.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.9.4-patches-1.2.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.9.4-patches-1.2.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.9.4-patches-1.2.tar.bz2 mirror://gentoo/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 mirror://gentoo/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar ) http://mirrors.cdn.adacore.com/art/57399304c7a447658e0aff7f -> gnat-gpl-2016-src.tar.gz http://mirrors.cdn.adacore.com/art/573992d4c7a447658d00e1db -> gcc-4.9-gpl-2016-src.tar.gz http://mirrors.cdn.adacore.com/art/57399232c7a447658e0aff7d -> gcc-interface-4.9-gpl-2016-src.tar.gz bootstrap? ( http://mirrors.cdn.adacore.com/art/564b3ebec8e196b040fbe66c -> gnat-gpl-2014-x86_64-linux-bin.tar.gz )
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	prefix	7b6fb2fc216b101b5d97d171925a847c	toolchain	9147783f01244fc11a8b772e26e70ef3	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=49b24fe6e7cdafe65a2519eca1b38df6
+_md5_=1c35ba153fba63ed53c87ce8b857fcb8
diff --git a/metadata/md5-cache/dev-lang/gnat-gpl-2017 b/metadata/md5-cache/dev-lang/gnat-gpl-2017
index e951b0b2771b..0424bd2f0346 100644
--- a/metadata/md5-cache/dev-lang/gnat-gpl-2017
+++ b/metadata/md5-cache/dev-lang/gnat-gpl-2017
@@ -4,7 +4,7 @@ DESCRIPTION=GNAT Ada Compiler - GPL version
 EAPI=5
 HOMEPAGE=http://libre.adacore.com/
 IUSE=bootstrap regression-test vanilla altivec debug doc gcj awt hardened multilib objc pgo objc-gc libssp objc++ fixed-point go graphite cilk +vtv jit mpx +pie +ssp +pch +nls +nptl +cxx +fortran +openmp +sanitize
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+ GPL-2 GPL-3
 PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/gcc-config-1.7
 RDEPEND=!sys-devel/gcc:6.3.0 sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0 >=dev-libs/mpfr-2.4.2:0 >=dev-libs/mpc-0.8.1:0 graphite? ( >=dev-libs/isl-0.14 )
@@ -12,4 +12,4 @@ RESTRICT=strip
 SLOT=6.3.0
 SRC_URI=mirror://gnu/gcc/gcc-6.3.0/gcc-6.3.0.tar.bz2 mirror://gentoo/gcc-6.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-6.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-6.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-6.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-6.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-6.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-6.3.0-patches-1.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar ) http://mirrors.cdn.adacore.com/art/591adbb4c7a4473fcc4532a3 -> gnat-gpl-2017-src.tar.gz http://mirrors.cdn.adacore.com/art/591adb65c7a4473fcbb153ac -> gcc-6-gpl-2017-src.tar.gz http://mirrors.cdn.adacore.com/art/591adbc5c7a4473fcbb153ae -> gcc-interface-6-gpl-2017-src.tar.gz bootstrap? ( http://mirrors.cdn.adacore.com/art/564b3ebec8e196b040fbe66c -> gnat-gpl-2014-x86_64-linux-bin.tar.gz )
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	prefix	7b6fb2fc216b101b5d97d171925a847c	toolchain	9147783f01244fc11a8b772e26e70ef3	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=6cc8fc1195acd2a1071b776e9845e41d
+_md5_=895fb48fdbff1622967a9c528b83f31f
diff --git a/metadata/md5-cache/dev-lang/perl-5.28.9999 b/metadata/md5-cache/dev-lang/perl-5.28.9999
index fcc423a98953..32932447cf9e 100644
--- a/metadata/md5-cache/dev-lang/perl-5.28.9999
+++ b/metadata/md5-cache/dev-lang/perl-5.28.9999
@@ -7,7 +7,7 @@ IUSE=berkdb debug doc gdbm ithreads
 LICENSE=|| ( Artistic GPL-1+ )
 PDEPEND=>=app-admin/perl-cleaner-2.5 >=virtual/perl-File-Temp-0.230.400-r2 >=virtual/perl-Data-Dumper-2.154.0 virtual/perl-Test-Harness
 RDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( >=sys-libs/gdbm-1.8.3 ) app-arch/bzip2 sys-libs/zlib
-SLOT=0/5.27.5
-SRC_URI=mirror://cpan/src/5.0/perl-5.27.5.tar.xz mirror://cpan/authors/id/S/SH/SHAY/perl-5.27.5.tar.xz https://github.com/gentoo-perl/perl-patchset/releases/download/perl-5.27.1-patches-1/perl-5.27.1-patches-1.tar.xz mirror://gentoo/perl-5.27.1-patches-1.tar.xz https://dev.gentoo.org/~kentnl/distfiles/perl-5.27.1-patches-1.tar.xz https://github.com/arsv/perl-cross/releases/download/1.1.7/perl-cross-1.1.7.tar.gz
+SLOT=0/5.27.6
+SRC_URI=mirror://cpan/src/5.0/perl-5.27.6.tar.xz mirror://cpan/authors/id/S/SH/SHAY/perl-5.27.6.tar.xz https://github.com/gentoo-perl/perl-patchset/releases/download/perl-5.27.6-patches-1/perl-5.27.6-patches-1.tar.xz mirror://gentoo/perl-5.27.6-patches-1.tar.xz https://dev.gentoo.org/~kentnl/distfiles/perl-5.27.6-patches-1.tar.xz https://github.com/arsv/perl-cross/releases/download/1.1.7/perl-cross-1.1.7.tar.gz
 _eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=1af09ffa196743f16267c0dcf6ce007e
+_md5_=97ed4da253835d0a6da9b7b9942e5c6b
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 716b16148b16..458c16a4645f 100644
Binary files a/metadata/md5-cache/dev-libs/Manifest.gz and b/metadata/md5-cache/dev-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-libs/gmp-6.1.2 b/metadata/md5-cache/dev-libs/gmp-6.1.2
index 2febebb82bca..f2ee9eba3afb 100644
--- a/metadata/md5-cache/dev-libs/gmp-6.1.2
+++ b/metadata/md5-cache/dev-libs/gmp-6.1.2
@@ -4,9 +4,9 @@ DESCRIPTION=Library for arbitrary-precision arithmetic on different type of numb
 EAPI=5
 HOMEPAGE=http://gmplib.org/
 IUSE=+asm doc cxx pgo static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( LGPL-3+ GPL-2+ )
 SLOT=0/10.4
 SRC_URI=ftp://ftp.gmplib.org/pub/gmp-6.1.2/gmp-6.1.2.tar.xz mirror://gnu/gmp/gmp-6.1.2.tar.xz doc? ( http://gmplib.org/gmp-man-6.1.2.pdf )
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=280708914d024551c097a09fb208de2b
+_md5_=7f52caa8ae2305cb0f3ccaf2a10100e4
diff --git a/metadata/md5-cache/dev-libs/libcdio-1.0.0-r1 b/metadata/md5-cache/dev-libs/libcdio-1.0.0-r1
index b146447bb371..5eff38a0d5a8 100644
--- a/metadata/md5-cache/dev-libs/libcdio-1.0.0-r1
+++ b/metadata/md5-cache/dev-libs/libcdio-1.0.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=!minimal? ( >=sys-libs/ncurses-5.7-r7:0= cddb? ( >=media-libs/libcddb-1.3.2 ) ) >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r10 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )
 SLOT=0/17
 SRC_URI=mirror://gnu/libcdio/libcdio-1.0.0.tar.gz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=5c444afd848da1d71e3d797b41447f77
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=97fddcd7b55a0650c26433837d30413d
diff --git a/metadata/md5-cache/dev-libs/libwacom-0.25 b/metadata/md5-cache/dev-libs/libwacom-0.25
index ea74c370c108..387a6cc27ff5 100644
--- a/metadata/md5-cache/dev-libs/libwacom-0.25
+++ b/metadata/md5-cache/dev-libs/libwacom-0.25
@@ -4,10 +4,10 @@ DESCRIPTION=Library for identifying Wacom tablets and their model-specific featu
 EAPI=6
 HOMEPAGE=http://linuxwacom.sourceforge.net/
 IUSE=doc static-libs
-KEYWORDS=alpha amd64 arm ~ia64 ppc ppc64 ~sparc x86
+KEYWORDS=alpha amd64 arm ~ia64 ppc ppc64 sparc x86
 LICENSE=MIT
 RDEPEND=dev-libs/glib:2 virtual/libgudev:=
 SLOT=0
 SRC_URI=mirror://sourceforge/linuxwacom/libwacom/libwacom-0.25.tar.bz2
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	udev	d91cac2c73b94629cad2daea66e0d182
-_md5_=733a430eba7b010541692e6f90a39d04
+_md5_=2833ceb77256d6e0e17f05661f661588
diff --git a/metadata/md5-cache/dev-libs/mpc-1.0.3 b/metadata/md5-cache/dev-libs/mpc-1.0.3
index c964d23b3bfe..1ee3153c1c0b 100644
--- a/metadata/md5-cache/dev-libs/mpc-1.0.3
+++ b/metadata/md5-cache/dev-libs/mpc-1.0.3
@@ -4,10 +4,10 @@ DESCRIPTION=A library for multiprecision complex arithmetic with exact rounding
 EAPI=4
 HOMEPAGE=http://mpc.multiprecision.org/
 IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/gmp-4.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] >=dev-libs/mpfr-2.4.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?]
 SLOT=0
 SRC_URI=http://www.multiprecision.org/mpc/download/mpc-1.0.3.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=127f9e9a2c20c75d07ef7774893f4afa
+_md5_=eee2d88bd40a25d4023b90b4e6b157e2
diff --git a/metadata/md5-cache/dev-libs/mpfr-3.1.6 b/metadata/md5-cache/dev-libs/mpfr-3.1.6
index 48a9c2f34ef8..4d58e7c0e11e 100644
--- a/metadata/md5-cache/dev-libs/mpfr-3.1.6
+++ b/metadata/md5-cache/dev-libs/mpfr-3.1.6
@@ -4,10 +4,10 @@ DESCRIPTION=library for multiple-precision floating-point computations with exac
 EAPI=5
 HOMEPAGE=http://www.mpfr.org/
 IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/gmp-4.1.4-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?]
 SLOT=0/4
 SRC_URI=http://www.mpfr.org/mpfr-3.1.6/mpfr-3.1.6.tar.xz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=daf8cf7d1c26348fc03325aa54f950a2
+_md5_=dd6532d8ae3bdf19d47e639129a049dc
diff --git a/metadata/md5-cache/dev-libs/xapian-1.4.4 b/metadata/md5-cache/dev-libs/xapian-1.4.4
index d85be9335f8e..c83679eb8080 100644
--- a/metadata/md5-cache/dev-libs/xapian-1.4.4
+++ b/metadata/md5-cache/dev-libs/xapian-1.4.4
@@ -4,11 +4,11 @@ DESCRIPTION=Xapian Probabilistic Information Retrieval library
 EAPI=6
 HOMEPAGE=http://www.xapian.org/
 IUSE=doc static-libs -cpu_flags_x86_sse +cpu_flags_x86_sse2 +glass +chert +inmemory abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~x64-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x64-solaris
 LICENSE=GPL-2
 RDEPEND=sys-libs/zlib
 REQUIRED_USE=inmemory? ( chert )
 SLOT=0/30
 SRC_URI=http://oligarchy.co.uk/xapian/1.4.4/xapian-core-1.4.4.tar.xz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=c3b8dca1b32cf2007513a6c3da000590
+_md5_=085b22a389e5a5bf5c4638008dec0365
diff --git a/metadata/md5-cache/dev-libs/xapian-bindings-1.4.4 b/metadata/md5-cache/dev-libs/xapian-bindings-1.4.4
index 7532c18f3cac..71c8a6da15fb 100644
--- a/metadata/md5-cache/dev-libs/xapian-bindings-1.4.4
+++ b/metadata/md5-cache/dev-libs/xapian-bindings-1.4.4
@@ -4,11 +4,11 @@ DESCRIPTION=SWIG and JNI bindings for Xapian
 EAPI=5
 HOMEPAGE=http://www.xapian.org/
 IUSE=java lua mono perl php python ruby tcl python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 elibc_FreeBSD java php_targets_php5-6
-KEYWORDS=alpha amd64 arm ia64 ~mips ppc ppc64 sparc x86
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/xapian:0/30 lua? ( dev-lang/lua:= ) perl? ( dev-lang/perl:= ) python? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ruby? ( dev-lang/ruby:= ) tcl? ( dev-lang/tcl:= ) mono? ( dev-lang/mono ) java? ( >=virtual/jre-1.6 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] java? ( >=dev-java/java-config-2.2.0-r3 ) php? ( php_targets_php5-6? ( dev-lang/php:5.6 ) )
 REQUIRED_USE=|| ( java lua mono perl php python ruby tcl ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 ) php? ( || ( php_targets_php5-6 ) )
 SLOT=0
 SRC_URI=http://oligarchy.co.uk/xapian/1.4.4/xapian-bindings-1.4.4.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	mono-env	1f24c032c78290b0d9a07d5b343051a7	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	php-ext-source-r2	f89db15e993f2a909a1baea2031e409d	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3ce743e4cac4fb051556928ffe947aea
+_md5_=f37b7bc5b164bd1e88d5d17edc24a149
diff --git a/metadata/md5-cache/dev-perl/Mail-DKIM-0.440.0 b/metadata/md5-cache/dev-perl/Mail-DKIM-0.440.0
index 7a954bf556b8..89a85b308528 100644
--- a/metadata/md5-cache/dev-perl/Mail-DKIM-0.440.0
+++ b/metadata/md5-cache/dev-perl/Mail-DKIM-0.440.0
@@ -4,10 +4,10 @@ DESCRIPTION=Signs/verifies Internet mail using DKIM message signatures
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Mail-DKIM/
 IUSE=test examples
-KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
+KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Crypt-OpenSSL-RSA-0.24 virtual/perl-Digest-SHA virtual/perl-MIME-Base64 dev-perl/Net-DNS dev-perl/MailTools dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MB/MBRADSHAW/Mail-DKIM-0.44.tar.gz
 _eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=690c0de56744fd8f8dcce2a24ea730f8
+_md5_=01f9af955bf2d17d03bf2e0ff4783d74
diff --git a/metadata/md5-cache/dev-perl/Manifest.gz b/metadata/md5-cache/dev-perl/Manifest.gz
index 3a7cb7763595..0f4c9d8e9b70 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/MogileFS-Server-2.720.0 b/metadata/md5-cache/dev-perl/MogileFS-Server-2.720.0-r1
similarity index 70%
rename from metadata/md5-cache/dev-perl/MogileFS-Server-2.720.0
rename to metadata/md5-cache/dev-perl/MogileFS-Server-2.720.0-r1
index 2250de410506..6026793d28c6 100644
--- a/metadata/md5-cache/dev-perl/MogileFS-Server-2.720.0
+++ b/metadata/md5-cache/dev-perl/MogileFS-Server-2.720.0-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=dev-perl/Net-Netmask >=dev-perl/Danga-Socket-1.610.0 >=dev-perl/Sys-Syscall-0.220.0 >=dev-perl/Perlbal-1.790 >=dev-perl/IO-AIO-4 dev-perl/libwww-perl >=dev-perl/MogileFS-Client-1.170.0 >=dev-perl/MogileFS-Utils-2.280.0 dev-perl/Cache-Memcached mysql? ( dev-perl/DBD-mysql ) postgres? ( dev-perl/DBD-Pg ) sqlite? ( dev-perl/DBD-SQLite ) dev-lang/perl:=
+DEPEND=dev-perl/Net-Netmask >=dev-perl/Danga-Socket-1.610.0 >=dev-perl/Sys-Syscall-0.220.0 >=dev-perl/Perlbal-1.790 >=dev-perl/IO-AIO-4 dev-perl/libwww-perl >=dev-perl/MogileFS-Client-1.170.0 >=dev-perl/MogileFS-Utils-2.280.0 dev-perl/Cache-Memcached dev-perl/DBI mysql? ( dev-perl/DBD-mysql ) postgres? ( dev-perl/DBD-Pg ) sqlite? ( dev-perl/DBD-SQLite ) dev-lang/perl:=
 DESCRIPTION=Server for the MogileFS distributed file system
 EAPI=6
 HOMEPAGE=http://www.danga.com/mogilefs/ http://search.cpan.org/dist/MogileFS-Server/
 IUSE=mysql sqlite postgres
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=|| ( Artistic GPL-2 )
-RDEPEND=dev-perl/Net-Netmask >=dev-perl/Danga-Socket-1.610.0 >=dev-perl/Sys-Syscall-0.220.0 >=dev-perl/Perlbal-1.790 >=dev-perl/IO-AIO-4 dev-perl/libwww-perl >=dev-perl/MogileFS-Client-1.170.0 >=dev-perl/MogileFS-Utils-2.280.0 dev-perl/Cache-Memcached mysql? ( dev-perl/DBD-mysql ) postgres? ( dev-perl/DBD-Pg ) sqlite? ( dev-perl/DBD-SQLite ) dev-lang/perl:=
+RDEPEND=dev-perl/Net-Netmask >=dev-perl/Danga-Socket-1.610.0 >=dev-perl/Sys-Syscall-0.220.0 >=dev-perl/Perlbal-1.790 >=dev-perl/IO-AIO-4 dev-perl/libwww-perl >=dev-perl/MogileFS-Client-1.170.0 >=dev-perl/MogileFS-Utils-2.280.0 dev-perl/Cache-Memcached dev-perl/DBI mysql? ( dev-perl/DBD-mysql ) postgres? ( dev-perl/DBD-Pg ) sqlite? ( dev-perl/DBD-SQLite ) dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DO/DORMANDO/MogileFS-Server-2.72.tar.gz
 _eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=377b55b3554e20c4333af9b7b3751f03
+_md5_=3b01b0abe8f4a70b69fc88561b6dea81
diff --git a/metadata/md5-cache/dev-perl/Net-DNS-Resolver-Mock-1.201.710.310 b/metadata/md5-cache/dev-perl/Net-DNS-Resolver-Mock-1.201.710.310
index 32581dd4ebe4..b831b7bf0e5a 100644
--- a/metadata/md5-cache/dev-perl/Net-DNS-Resolver-Mock-1.201.710.310
+++ b/metadata/md5-cache/dev-perl/Net-DNS-Resolver-Mock-1.201.710.310
@@ -4,10 +4,10 @@ DESCRIPTION=Mock a DNS Resolver object for testing
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Net-DNS-Resolver-Mock/
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Net-DNS dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MB/MBRADSHAW/Net-DNS-Resolver-Mock-1.20171031.tar.gz
 _eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=191ff4f8714b251554afd71597aca4d9
+_md5_=4c12e5d983170b03e690c75d525c3246
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 82902034f3ea..d9ba109a7214 100644
Binary files a/metadata/md5-cache/dev-python/Manifest.gz and b/metadata/md5-cache/dev-python/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-python/PyQt4-4.12.1 b/metadata/md5-cache/dev-python/PyQt4-4.12.1
index 0f623cea71e4..1120b6824cce 100644
--- a/metadata/md5-cache/dev-python/PyQt4-4.12.1
+++ b/metadata/md5-cache/dev-python/PyQt4-4.12.1
@@ -4,11 +4,11 @@ DESCRIPTION=Python bindings for the Qt framework
 EAPI=6
 HOMEPAGE=https://www.riverbankcomputing.com/software/pyqt/intro
 IUSE=X compat dbus debug declarative designer doc examples help multimedia opengl phonon script scripttools sql svg testlib webkit xmlpatterns python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_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(-)] >=dev-python/sip-4.19.1:=[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(-)] >=dev-qt/qtcore-4.8.5:4 X? ( >=dev-qt/qtgui-4.8.5:4 ) dbus? ( dev-python/dbus-python[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(-)] >=dev-qt/qtdbus-4.8.5:4 ) declarative? ( >=dev-qt/qtdeclarative-4.8.5:4 ) designer? ( >=dev-qt/designer-4.8.5:4 ) help? ( >=dev-qt/qthelp-4.8.5:4 ) multimedia? ( >=dev-qt/qtmultimedia-4.8.5:4 ) opengl? ( >=dev-qt/qtopengl-4.8.5:4 ) phonon? ( >=media-libs/phonon-4.7[qt4] ) script? ( >=dev-qt/qtscript-4.8.5:4 ) scripttools? ( >=dev-qt/qtgui-4.8.5:4 ) sql? ( >=dev-qt/qtsql-4.8.5:4 ) svg? ( >=dev-qt/qtsvg-4.8.5:4 ) testlib? ( >=dev-qt/qttest-4.8.5:4 ) webkit? ( >=dev-qt/qtwebkit-4.8.5:4 ) xmlpatterns? ( >=dev-qt/qtxmlpatterns-4.8.5:4 )
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) sql? ( X ) testlib? ( X )
 SLOT=0
 SRC_URI=mirror://sourceforge/pyqt/PyQt4_gpl_x11-4.12.1.tar.gz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=6f9e93f9e7debfcd26d39989f8c74bbb
+_md5_=eb3b3d956d9ccd75350a56a6d4e6542a
diff --git a/metadata/md5-cache/dev-python/backports-lzma-0.0.8 b/metadata/md5-cache/dev-python/backports-lzma-0.0.8
index 7254f77ea3ca..c7edf47a13dc 100644
--- a/metadata/md5-cache/dev-python/backports-lzma-0.0.8
+++ b/metadata/md5-cache/dev-python/backports-lzma-0.0.8
@@ -4,11 +4,11 @@ DESCRIPTION=Backport of Python 3.3's lzma module for XZ/LZMA compressed files
 EAPI=6
 HOMEPAGE=https://github.com/peterjc/backports.lzma/ https://pypi.python.org/pypi/backports.lzma/
 IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=app-arch/xz-utils dev-python/backports[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/b/backports.lzma/backports.lzma-0.0.8.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b7515094557437286f9f21be1cbcbfd8
+_md5_=18c4f8fa0c8983525b3e86fba5fbfbfe
diff --git a/metadata/md5-cache/dev-python/bz2file-0.98 b/metadata/md5-cache/dev-python/bz2file-0.98
index 8bbba57625f2..e73f4b034587 100644
--- a/metadata/md5-cache/dev-python/bz2file-0.98
+++ b/metadata/md5-cache/dev-python/bz2file-0.98
@@ -4,11 +4,11 @@ DESCRIPTION=Replacement for bz2.BZ2File with features from newest CPython
 EAPI=6
 HOMEPAGE=https://pypi.python.org/pypi/bz2file https://github.com/nvawda/bz2file
 IUSE=python_targets_pypy python_targets_python2_7
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ia64 ~ppc ~ppc64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/b/bz2file/bz2file-0.98.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b28f1af1eb3b8628e5bd301b4274caf8
+_md5_=e916528e344227d9dedae07a843ac6e6
diff --git a/metadata/md5-cache/dev-python/future-0.15.2 b/metadata/md5-cache/dev-python/future-0.15.2
index 781e72f8e2b4..50de7842f56d 100644
--- a/metadata/md5-cache/dev-python/future-0.15.2
+++ b/metadata/md5-cache/dev-python/future-0.15.2
@@ -4,11 +4,11 @@ DESCRIPTION=Easy, clean, reliable Python 2/3 compatibility
 EAPI=6
 HOMEPAGE=http://python-future.org/
 IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~alpha amd64 ~hppa x86
+KEYWORDS=~alpha amd64 hppa x86
 LICENSE=MIT
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/f/future/future-0.15.2.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e9f44413ade2c386c9b52672d15818c9
+_md5_=fefcee95700854c3a7a6359774a88f68
diff --git a/metadata/md5-cache/dev-python/pyinotify-0.9.6 b/metadata/md5-cache/dev-python/pyinotify-0.9.6
index 6147e897cd9c..0f94adf6cd3d 100644
--- a/metadata/md5-cache/dev-python/pyinotify-0.9.6
+++ b/metadata/md5-cache/dev-python/pyinotify-0.9.6
@@ -4,11 +4,11 @@ DESCRIPTION=Python module used for monitoring filesystems events
 EAPI=5
 HOMEPAGE=http://trac.dbzteam.org/pyinotify https://pypi.python.org/pypi/pyinotify
 IUSE=examples python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha amd64 ~arm64 hppa ia64 ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm64 hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-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(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=http://seb.dbzteam.org/pub/pyinotify/releases/pyinotify-0.9.6.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5a88c3b50c26a9b71277d60ce30c2e47
+_md5_=e947aa8a1a0d5fde72132573c3db30d1
diff --git a/metadata/md5-cache/dev-python/pyopenssl-17.4.0 b/metadata/md5-cache/dev-python/pyopenssl-17.4.0
new file mode 100644
index 000000000000..fe10a53e39a3
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pyopenssl-17.4.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/six-1.5.2[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-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(-)] >=dev-python/cryptography-1.9[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-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(-)] doc? ( dev-python/sphinx[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-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(-)] dev-python/sphinx_rtd_theme[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-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(-)] ) test? ( virtual/python-cffi[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-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(-)] dev-python/flaky[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-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(-)] dev-python/pretend[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-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(-)] >=dev-python/pytest-3.0.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-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(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-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(-)]
+DESCRIPTION=Python interface to the OpenSSL library
+EAPI=6
+HOMEPAGE=http://pyopenssl.sourceforge.net/ https://launchpad.net/pyopenssl https://pypi.python.org/pypi/pyOpenSSL
+IUSE=doc examples test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/six-1.5.2[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-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(-)] >=dev-python/cryptography-1.9[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-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(-)] python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-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(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://pypi/p/pyOpenSSL/pyOpenSSL-17.4.0.tar.gz
+_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=2967c6f8c2945d0e55f825555662c163
diff --git a/metadata/md5-cache/dev-python/python-heatclient-1.11.1 b/metadata/md5-cache/dev-python/python-heatclient-1.11.1
index 964c6ba1b761..429636be20b1 100644
--- a/metadata/md5-cache/dev-python/python-heatclient-1.11.1
+++ b/metadata/md5-cache/dev-python/python-heatclient-1.11.1
@@ -4,11 +4,11 @@ DESCRIPTION=OpenStack Orchestration API Client Library
 EAPI=6
 HOMEPAGE=http://www.openstack.org/
 IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/pbr-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/Babel-2.3.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/Babel-2.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/cliff-2.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/iso8601-0.1.11[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/osc-lib-1.7.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/prettytable-0.7.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/prettytable-0.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-i18n-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-i18n-3.15.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-serialization-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-serialization-2.19.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-utils-3.20.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/keystoneauth-3.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-swiftclient-3.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pyyaml-3.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/requests-2.14.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-heatclient/python-heatclient-1.11.1.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c69c49489aed8301b64887540fb04f73
+_md5_=508759b207dd85daa169629bf8ae5af0
diff --git a/metadata/md5-cache/dev-python/sip-4.19.3 b/metadata/md5-cache/dev-python/sip-4.19.3
index e7f8b6beba1c..11d1744da152 100644
--- a/metadata/md5-cache/dev-python/sip-4.19.3
+++ b/metadata/md5-cache/dev-python/sip-4.19.3
@@ -4,11 +4,11 @@ DESCRIPTION=Python extension module generator for C and C++ libraries
 EAPI=6
 HOMEPAGE=https://www.riverbankcomputing.com/software/sip/intro
 IUSE=debug doc python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=|| ( GPL-2 GPL-3 SIP )
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_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(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0/12
 SRC_URI=mirror://sourceforge/pyqt/sip-4.19.3.tar.gz
 _eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=8f7b7eaac8543ce065b282ccc4011387
+_md5_=bfb2a222f2d2fa15a3716c278ed552d1
diff --git a/metadata/md5-cache/dev-python/snakeoil-0.7.5 b/metadata/md5-cache/dev-python/snakeoil-0.7.5
new file mode 100644
index 000000000000..0f80c00aaf38
--- /dev/null
+++ b/metadata/md5-cache/dev-python/snakeoil-0.7.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[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(-)] test? ( dev-python/mock[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(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_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(-)]
+DESCRIPTION=misc common functionality and useful optimizations
+EAPI=6
+HOMEPAGE=https://github.com/pkgcore/snakeoil
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=BSD
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_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(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://github.com/pkgcore/snakeoil/releases/download/v0.7.5/snakeoil-0.7.5.tar.gz
+_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=30102bb54c957b1c1a16e7fabf865a37
diff --git a/metadata/md5-cache/dev-python/snakeoil-9999 b/metadata/md5-cache/dev-python/snakeoil-9999
index e249e10e68d6..2d00179e61c2 100644
--- a/metadata/md5-cache/dev-python/snakeoil-9999
+++ b/metadata/md5-cache/dev-python/snakeoil-9999
@@ -9,4 +9,4 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] )
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	git-r3	52a888802d25387c2c74cb845d1219bc	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=380a76bb995e94cc273ce2a51566d49a
+_md5_=30102bb54c957b1c1a16e7fabf865a37
diff --git a/metadata/md5-cache/dev-python/wstools-0.4.5 b/metadata/md5-cache/dev-python/wstools-0.4.5
deleted file mode 100644
index 25e513a36b72..000000000000
--- a/metadata/md5-cache/dev-python/wstools-0.4.5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/autopep8[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/execnet[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pep8[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pytest[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pytest-cache[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pytest-cov[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pytest-pep8[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pytest-timeout[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/six[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pip[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_pypy? ( >=virtual/pypy-5:0=[xml(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[xml(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=WSDL parsing services package for Web Services for Python
-EAPI=6
-HOMEPAGE=https://github.com/kiorky/wstools https://pypi.python.org/pypi/wstools
-IUSE=python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=BSD
-RDEPEND=dev-python/autopep8[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/execnet[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pep8[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pytest[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pytest-cache[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pytest-cov[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pytest-pep8[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pytest-timeout[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/six[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_pypy? ( >=virtual/pypy-5:0=[xml(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[xml(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=mirror://pypi/w/wstools/wstools-0.4.5.tar.gz
-_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f8a638fc2ec2fba90a71cba769e96681
diff --git a/metadata/md5-cache/dev-python/wstools-0.4.5-r1 b/metadata/md5-cache/dev-python/wstools-0.4.5-r1
new file mode 100644
index 000000000000..0fd9702140ae
--- /dev/null
+++ b/metadata/md5-cache/dev-python/wstools-0.4.5-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/six[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0=[xml(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[xml(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[xml(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=WSDL parsing services package for Web Services for Python
+EAPI=6
+HOMEPAGE=https://github.com/kiorky/wstools https://pypi.python.org/pypi/wstools
+IUSE=test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-macos ~x86-macos
+LICENSE=BSD
+RDEPEND=dev-python/six[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0=[xml(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[xml(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[xml(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://pypi/w/wstools/wstools-0.4.5.tar.gz
+_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=597955fd190d0270c7878fe7e25dff41
diff --git a/metadata/md5-cache/dev-python/xapp-1.0.1-r2 b/metadata/md5-cache/dev-python/xapp-1.0.1-r2
new file mode 100644
index 000000000000..016e125b428a
--- /dev/null
+++ b/metadata/md5-cache/dev-python/xapp-1.0.1-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=x11-libs/xapps[introspection] python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Python bindings for x11-libs/xapps
+EAPI=6
+HOMEPAGE=https://github.com/linuxmint/python-xapp
+IUSE=python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2
+RDEPEND=x11-libs/xapps[introspection] dev-python/psutil[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://github.com/linuxmint/python-xapp/archive/1.0.1.tar.gz -> xapp-1.0.1.tar.gz
+_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=3179783684fb2e6e949db7814db02cd0
diff --git a/metadata/md5-cache/dev-qt/Manifest.gz b/metadata/md5-cache/dev-qt/Manifest.gz
index 48701406460c..42e8b12c3fa0 100644
Binary files a/metadata/md5-cache/dev-qt/Manifest.gz and b/metadata/md5-cache/dev-qt/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-qt/assistant-5.7.1 b/metadata/md5-cache/dev-qt/assistant-5.7.1
index 57dabe3ca57a..ca3e99083db5 100644
--- a/metadata/md5-cache/dev-qt/assistant-5.7.1
+++ b/metadata/md5-cache/dev-qt/assistant-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtgui-5.7.1 ~dev-qt/qthelp-5.7.1 ~dev-qt/qt
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qttools-opensource-src-5.7.1.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=de955874787a8d09b48d66997db7bf7e
diff --git a/metadata/md5-cache/dev-qt/assistant-5.9.2 b/metadata/md5-cache/dev-qt/assistant-5.9.2
index 1114d80e8018..7a67f6de1b77 100644
--- a/metadata/md5-cache/dev-qt/assistant-5.9.2
+++ b/metadata/md5-cache/dev-qt/assistant-5.9.2
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.2 ~dev-qt/qtgui-5.9.2 ~dev-qt/qthelp-5.9.2 ~dev-qt/qt
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.2/submodules/qttools-opensource-src-5.9.2.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=f00c00eff78e6a3bd3443db7b0cb2618
diff --git a/metadata/md5-cache/dev-qt/assistant-5.9.3 b/metadata/md5-cache/dev-qt/assistant-5.9.3
index 03512c8c0c33..16c58c4dd0e0 100644
--- a/metadata/md5-cache/dev-qt/assistant-5.9.3
+++ b/metadata/md5-cache/dev-qt/assistant-5.9.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.3 ~dev-qt/qtgui-5.9.3 ~dev-qt/qthelp-5.9.3 ~dev-qt/qt
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qttools-opensource-src-5.9.3.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=f00c00eff78e6a3bd3443db7b0cb2618
diff --git a/metadata/md5-cache/dev-qt/designer-5.7.1 b/metadata/md5-cache/dev-qt/designer-5.7.1
index 3fa450550f9b..a44d6137efc9 100644
--- a/metadata/md5-cache/dev-qt/designer-5.7.1
+++ b/metadata/md5-cache/dev-qt/designer-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtgui-5.7.1 ~dev-qt/qtnetwork-5.7.1 ~dev-qt
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qttools-opensource-src-5.7.1.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=65e8725189331a3117b88194437a6f0d
diff --git a/metadata/md5-cache/dev-qt/designer-5.9.2 b/metadata/md5-cache/dev-qt/designer-5.9.2
index c0aaa444dc84..6bebedf361f5 100644
--- a/metadata/md5-cache/dev-qt/designer-5.9.2
+++ b/metadata/md5-cache/dev-qt/designer-5.9.2
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.2 ~dev-qt/qtgui-5.9.2 ~dev-qt/qtnetwork-5.9.2 ~dev-qt
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.2/submodules/qttools-opensource-src-5.9.2.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=fcb98472b970fcb711760f75b8582e7a
diff --git a/metadata/md5-cache/dev-qt/designer-5.9.3 b/metadata/md5-cache/dev-qt/designer-5.9.3
index 8d281c9626c7..1e93ff756fe2 100644
--- a/metadata/md5-cache/dev-qt/designer-5.9.3
+++ b/metadata/md5-cache/dev-qt/designer-5.9.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.3 ~dev-qt/qtgui-5.9.3 ~dev-qt/qtnetwork-5.9.3 ~dev-qt
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qttools-opensource-src-5.9.3.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=fcb98472b970fcb711760f75b8582e7a
diff --git a/metadata/md5-cache/dev-qt/linguist-5.7.1 b/metadata/md5-cache/dev-qt/linguist-5.7.1
index 3ec109bcca12..0ff2933d0704 100644
--- a/metadata/md5-cache/dev-qt/linguist-5.7.1
+++ b/metadata/md5-cache/dev-qt/linguist-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/designer-5.7.1 ~dev-qt/qtcore-5.7.1 ~dev-qt/qtgui-5.7.1 ~dev-qt/
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qttools-opensource-src-5.7.1.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=a3ee70abae8cae0fb3fb0b5f636404be
diff --git a/metadata/md5-cache/dev-qt/linguist-5.9.2 b/metadata/md5-cache/dev-qt/linguist-5.9.2
index c583b3955d0c..f37ae79bcc73 100644
--- a/metadata/md5-cache/dev-qt/linguist-5.9.2
+++ b/metadata/md5-cache/dev-qt/linguist-5.9.2
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/designer-5.9.2 ~dev-qt/qtcore-5.9.2 ~dev-qt/qtgui-5.9.2 ~dev-qt/
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.2/submodules/qttools-opensource-src-5.9.2.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=ba2a39972e3e2cc6a6666f404785d8d8
diff --git a/metadata/md5-cache/dev-qt/linguist-5.9.3 b/metadata/md5-cache/dev-qt/linguist-5.9.3
index 5acc8820a5f3..93063ad2bb6f 100644
--- a/metadata/md5-cache/dev-qt/linguist-5.9.3
+++ b/metadata/md5-cache/dev-qt/linguist-5.9.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/designer-5.9.3 ~dev-qt/qtcore-5.9.3 ~dev-qt/qtgui-5.9.3 ~dev-qt/
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qttools-opensource-src-5.9.3.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=ba2a39972e3e2cc6a6666f404785d8d8
diff --git a/metadata/md5-cache/dev-qt/linguist-tools-5.7.1 b/metadata/md5-cache/dev-qt/linguist-tools-5.7.1
index 90f61d84fe89..7e001715cf65 100644
--- a/metadata/md5-cache/dev-qt/linguist-tools-5.7.1
+++ b/metadata/md5-cache/dev-qt/linguist-tools-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtxml-5.7.1 qml? ( ~dev-qt/qtdeclarative-5.
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qttools-opensource-src-5.7.1.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=dbeed594e096764ff6642240bd1240cf
diff --git a/metadata/md5-cache/dev-qt/linguist-tools-5.9.2 b/metadata/md5-cache/dev-qt/linguist-tools-5.9.2
index 519490eacfec..69ddbb5ea670 100644
--- a/metadata/md5-cache/dev-qt/linguist-tools-5.9.2
+++ b/metadata/md5-cache/dev-qt/linguist-tools-5.9.2
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.2 ~dev-qt/qtxml-5.9.2 qml? ( ~dev-qt/qtdeclarative-5.
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.2/submodules/qttools-opensource-src-5.9.2.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=dc32b3ab2a3b7ad35ec30e454ef5817e
diff --git a/metadata/md5-cache/dev-qt/linguist-tools-5.9.3 b/metadata/md5-cache/dev-qt/linguist-tools-5.9.3
index 8249ddfdb2bd..3e69c7114d9e 100644
--- a/metadata/md5-cache/dev-qt/linguist-tools-5.9.3
+++ b/metadata/md5-cache/dev-qt/linguist-tools-5.9.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.3 ~dev-qt/qtxml-5.9.3 qml? ( ~dev-qt/qtdeclarative-5.
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qttools-opensource-src-5.9.3.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=dc32b3ab2a3b7ad35ec30e454ef5817e
diff --git a/metadata/md5-cache/dev-qt/pixeltool-5.7.1 b/metadata/md5-cache/dev-qt/pixeltool-5.7.1
index 2d02ce76b8ab..380a68e8bcf8 100644
--- a/metadata/md5-cache/dev-qt/pixeltool-5.7.1
+++ b/metadata/md5-cache/dev-qt/pixeltool-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtgui-5.7.1 ~dev-qt/qtnetwork-5.7.1 ~dev-qt
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qttools-opensource-src-5.7.1.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=665ad50021991975ec683a46c3a3b72d
diff --git a/metadata/md5-cache/dev-qt/pixeltool-5.9.2 b/metadata/md5-cache/dev-qt/pixeltool-5.9.2
index 4c6793965885..6b9b54f53dbc 100644
--- a/metadata/md5-cache/dev-qt/pixeltool-5.9.2
+++ b/metadata/md5-cache/dev-qt/pixeltool-5.9.2
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.2 ~dev-qt/qtgui-5.9.2 ~dev-qt/qtwidgets-5.9.2 dev-qt/
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.2/submodules/qttools-opensource-src-5.9.2.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=a10a7c7583a5986442e9a218db32d635
diff --git a/metadata/md5-cache/dev-qt/pixeltool-5.9.3 b/metadata/md5-cache/dev-qt/pixeltool-5.9.3
index 352b9220a22c..b01de889404d 100644
--- a/metadata/md5-cache/dev-qt/pixeltool-5.9.3
+++ b/metadata/md5-cache/dev-qt/pixeltool-5.9.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.3 ~dev-qt/qtgui-5.9.3 ~dev-qt/qtwidgets-5.9.3 dev-qt/
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qttools-opensource-src-5.9.3.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=a10a7c7583a5986442e9a218db32d635
diff --git a/metadata/md5-cache/dev-qt/qdbus-5.7.1 b/metadata/md5-cache/dev-qt/qdbus-5.7.1
index f34dfc0e2647..7b4386457157 100644
--- a/metadata/md5-cache/dev-qt/qdbus-5.7.1
+++ b/metadata/md5-cache/dev-qt/qdbus-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtdbus-5.7.1 ~dev-qt/qtxml-5.7.1 dev-qt/qtc
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qttools-opensource-src-5.7.1.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=6dda8a2de2af7ed29b71cc6fdc914ed4
diff --git a/metadata/md5-cache/dev-qt/qdbus-5.9.2 b/metadata/md5-cache/dev-qt/qdbus-5.9.2
index baee893416b4..c0c75aa71a96 100644
--- a/metadata/md5-cache/dev-qt/qdbus-5.9.2
+++ b/metadata/md5-cache/dev-qt/qdbus-5.9.2
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.2 ~dev-qt/qtdbus-5.9.2 ~dev-qt/qtxml-5.9.2 dev-qt/qtc
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.2/submodules/qttools-opensource-src-5.9.2.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=082ed90cbe2501d1a63078a9bde9e7ca
diff --git a/metadata/md5-cache/dev-qt/qdbus-5.9.3 b/metadata/md5-cache/dev-qt/qdbus-5.9.3
index 6d5dc8f909f9..a45417fadd4f 100644
--- a/metadata/md5-cache/dev-qt/qdbus-5.9.3
+++ b/metadata/md5-cache/dev-qt/qdbus-5.9.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.3 ~dev-qt/qtdbus-5.9.3 ~dev-qt/qtxml-5.9.3 dev-qt/qtc
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qttools-opensource-src-5.9.3.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=082ed90cbe2501d1a63078a9bde9e7ca
diff --git a/metadata/md5-cache/dev-qt/qdbusviewer-5.7.1 b/metadata/md5-cache/dev-qt/qdbusviewer-5.7.1
index 8c88cc0db292..e32198ab8c1e 100644
--- a/metadata/md5-cache/dev-qt/qdbusviewer-5.7.1
+++ b/metadata/md5-cache/dev-qt/qdbusviewer-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtdbus-5.7.1 ~dev-qt/qtgui-5.7.1 ~dev-qt/qt
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qttools-opensource-src-5.7.1.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=f54c355e28463628eed095d295a48211
diff --git a/metadata/md5-cache/dev-qt/qdbusviewer-5.9.2 b/metadata/md5-cache/dev-qt/qdbusviewer-5.9.2
index dbe00721e723..2d8bb7dec4c5 100644
--- a/metadata/md5-cache/dev-qt/qdbusviewer-5.9.2
+++ b/metadata/md5-cache/dev-qt/qdbusviewer-5.9.2
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.2 ~dev-qt/qtdbus-5.9.2 ~dev-qt/qtgui-5.9.2 ~dev-qt/qt
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.2/submodules/qttools-opensource-src-5.9.2.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=5e40923d6d9bfca0dc34cb7a415a7262
diff --git a/metadata/md5-cache/dev-qt/qdbusviewer-5.9.3 b/metadata/md5-cache/dev-qt/qdbusviewer-5.9.3
index 68884bd37dc9..19c5aa443e48 100644
--- a/metadata/md5-cache/dev-qt/qdbusviewer-5.9.3
+++ b/metadata/md5-cache/dev-qt/qdbusviewer-5.9.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.3 ~dev-qt/qtdbus-5.9.3 ~dev-qt/qtgui-5.9.3 ~dev-qt/qt
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qttools-opensource-src-5.9.3.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=5e40923d6d9bfca0dc34cb7a415a7262
diff --git a/metadata/md5-cache/dev-qt/qdoc-5.7.1 b/metadata/md5-cache/dev-qt/qdoc-5.7.1
index 9338e271e232..1376f2c4695c 100644
--- a/metadata/md5-cache/dev-qt/qdoc-5.7.1
+++ b/metadata/md5-cache/dev-qt/qdoc-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtxml-5.7.1 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qttools-opensource-src-5.7.1.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=9d7d023c64c918edf558c7ea703cf9e4
diff --git a/metadata/md5-cache/dev-qt/qdoc-5.9.2 b/metadata/md5-cache/dev-qt/qdoc-5.9.2
index 8ecf3083fd29..42ff88bd73c4 100644
--- a/metadata/md5-cache/dev-qt/qdoc-5.9.2
+++ b/metadata/md5-cache/dev-qt/qdoc-5.9.2
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.2 qml? ( ~dev-qt/qtdeclarative-5.9.2 ) dev-qt/qtchoos
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.2/submodules/qttools-opensource-src-5.9.2.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=bacbc407873d7db6bd21571e7ffa6050
diff --git a/metadata/md5-cache/dev-qt/qdoc-5.9.3 b/metadata/md5-cache/dev-qt/qdoc-5.9.3
index e948555017ef..05af9b4d5e47 100644
--- a/metadata/md5-cache/dev-qt/qdoc-5.9.3
+++ b/metadata/md5-cache/dev-qt/qdoc-5.9.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.3 qml? ( ~dev-qt/qtdeclarative-5.9.3 ) dev-qt/qtchoos
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qttools-opensource-src-5.9.3.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=bacbc407873d7db6bd21571e7ffa6050
diff --git a/metadata/md5-cache/dev-qt/qt3d-5.7.1-r1 b/metadata/md5-cache/dev-qt/qt3d-5.7.1-r1
index a789a54ed84d..d84172370126 100644
--- a/metadata/md5-cache/dev-qt/qt3d-5.7.1-r1
+++ b/metadata/md5-cache/dev-qt/qt3d-5.7.1-r1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtconcurrent-5.7.1 ~dev-qt/qtcore-5.7.1 ~dev-qt/qtgui-5.7.1 ~dev
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qt3d-opensource-src-5.7.1.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=a14cade7a74204bc44bc18e96f732f95
diff --git a/metadata/md5-cache/dev-qt/qt3d-5.9.2 b/metadata/md5-cache/dev-qt/qt3d-5.9.2
index fe104c330657..bb8c2b47185b 100644
--- a/metadata/md5-cache/dev-qt/qt3d-5.9.2
+++ b/metadata/md5-cache/dev-qt/qt3d-5.9.2
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtconcurrent-5.9.2 ~dev-qt/qtcore-5.9.2 ~dev-qt/qtgui-5.9.2 ~dev
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.2/submodules/qt3d-opensource-src-5.9.2.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=e83fe3cccab7d8f86070c41445f9ad7f
diff --git a/metadata/md5-cache/dev-qt/qt3d-5.9.3 b/metadata/md5-cache/dev-qt/qt3d-5.9.3
index fdd2f5be51a7..6f0a2c36ea15 100644
--- a/metadata/md5-cache/dev-qt/qt3d-5.9.3
+++ b/metadata/md5-cache/dev-qt/qt3d-5.9.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtconcurrent-5.9.3 ~dev-qt/qtcore-5.9.3 ~dev-qt/qtgui-5.9.3 ~dev
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qt3d-opensource-src-5.9.3.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=e83fe3cccab7d8f86070c41445f9ad7f
diff --git a/metadata/md5-cache/dev-qt/qtbluetooth-5.7.1 b/metadata/md5-cache/dev-qt/qtbluetooth-5.7.1
index 11e521981346..50d506cc2c7a 100644
--- a/metadata/md5-cache/dev-qt/qtbluetooth-5.7.1
+++ b/metadata/md5-cache/dev-qt/qtbluetooth-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtconcurrent-5.7.1 ~dev-qt/qtcore-5.7.1 ~dev-qt/qtdbus-5.7.1 >=n
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qtconnectivity-opensource-src-5.7.1.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=2b95f75a1c6c5d4586fe1c7eeb71342f
diff --git a/metadata/md5-cache/dev-qt/qtbluetooth-5.9.2 b/metadata/md5-cache/dev-qt/qtbluetooth-5.9.2
index 0db14d553d94..62f5bdf645f9 100644
--- a/metadata/md5-cache/dev-qt/qtbluetooth-5.9.2
+++ b/metadata/md5-cache/dev-qt/qtbluetooth-5.9.2
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtconcurrent-5.9.2 ~dev-qt/qtcore-5.9.2 ~dev-qt/qtdbus-5.9.2 >=n
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.2/submodules/qtconnectivity-opensource-src-5.9.2.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=85c02300c40202ba90824059fffad21a
diff --git a/metadata/md5-cache/dev-qt/qtbluetooth-5.9.3 b/metadata/md5-cache/dev-qt/qtbluetooth-5.9.3
index ec3effe0cd4b..0595c7ce69c4 100644
--- a/metadata/md5-cache/dev-qt/qtbluetooth-5.9.3
+++ b/metadata/md5-cache/dev-qt/qtbluetooth-5.9.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtconcurrent-5.9.3 ~dev-qt/qtcore-5.9.3 ~dev-qt/qtdbus-5.9.3 >=n
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qtconnectivity-opensource-src-5.9.3.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=85c02300c40202ba90824059fffad21a
diff --git a/metadata/md5-cache/dev-qt/qtcharts-5.7.1 b/metadata/md5-cache/dev-qt/qtcharts-5.7.1
index 0e666ad9bf93..a177ba4f7c42 100644
--- a/metadata/md5-cache/dev-qt/qtcharts-5.7.1
+++ b/metadata/md5-cache/dev-qt/qtcharts-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtgui-5.7.1 ~dev-qt/qtwidgets-5.7.1 qml? (
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qtcharts-opensource-src-5.7.1.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=7a25fc03e96bb3ae33fa8569bebd2f4e
diff --git a/metadata/md5-cache/dev-qt/qtcharts-5.9.2 b/metadata/md5-cache/dev-qt/qtcharts-5.9.2
index 40e748e0e115..8fceb1de70e5 100644
--- a/metadata/md5-cache/dev-qt/qtcharts-5.9.2
+++ b/metadata/md5-cache/dev-qt/qtcharts-5.9.2
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.2 ~dev-qt/qtgui-5.9.2 ~dev-qt/qtwidgets-5.9.2 qml? (
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.2/submodules/qtcharts-opensource-src-5.9.2.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=491ee4b1f51e7d699947fc4815f7a7c0
diff --git a/metadata/md5-cache/dev-qt/qtcharts-5.9.3 b/metadata/md5-cache/dev-qt/qtcharts-5.9.3
index bc35ce92890f..1a963750fcbf 100644
--- a/metadata/md5-cache/dev-qt/qtcharts-5.9.3
+++ b/metadata/md5-cache/dev-qt/qtcharts-5.9.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.3 ~dev-qt/qtgui-5.9.3 ~dev-qt/qtwidgets-5.9.3 qml? (
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qtcharts-opensource-src-5.9.3.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=491ee4b1f51e7d699947fc4815f7a7c0
diff --git a/metadata/md5-cache/dev-qt/qtconcurrent-5.7.1 b/metadata/md5-cache/dev-qt/qtconcurrent-5.7.1
index b8739fb5dc02..b21d8e617f5b 100644
--- a/metadata/md5-cache/dev-qt/qtconcurrent-5.7.1
+++ b/metadata/md5-cache/dev-qt/qtconcurrent-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qtbase-opensource-src-5.7.1.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=fe9e4778b359dcd21362dc37c1ce3b82
diff --git a/metadata/md5-cache/dev-qt/qtconcurrent-5.9.2 b/metadata/md5-cache/dev-qt/qtconcurrent-5.9.2
index 760559173467..9f564682d919 100644
--- a/metadata/md5-cache/dev-qt/qtconcurrent-5.9.2
+++ b/metadata/md5-cache/dev-qt/qtconcurrent-5.9.2
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.2 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.2/submodules/qtbase-opensource-src-5.9.2.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=2928615655ff69503d98652a1e5021ec
diff --git a/metadata/md5-cache/dev-qt/qtconcurrent-5.9.3 b/metadata/md5-cache/dev-qt/qtconcurrent-5.9.3
index 566917d753c3..2c9abb98f543 100644
--- a/metadata/md5-cache/dev-qt/qtconcurrent-5.9.3
+++ b/metadata/md5-cache/dev-qt/qtconcurrent-5.9.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.3 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qtbase-opensource-src-5.9.3.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=2928615655ff69503d98652a1e5021ec
diff --git a/metadata/md5-cache/dev-qt/qtcore-5.7.1-r3 b/metadata/md5-cache/dev-qt/qtcore-5.7.1-r3
index 8bfde7d54098..66ed8eb15cac 100644
--- a/metadata/md5-cache/dev-qt/qtcore-5.7.1-r3
+++ b/metadata/md5-cache/dev-qt/qtcore-5.7.1-r3
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/double-conversion:= dev-libs/glib:2 >=dev-libs/libpcre-8.38[pcr
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qtbase-opensource-src-5.7.1.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=a367bd278558379df42d2c4b165d2ef3
diff --git a/metadata/md5-cache/dev-qt/qtcore-5.9.2 b/metadata/md5-cache/dev-qt/qtcore-5.9.2
index 452f25d37ccd..6a39941b4450 100644
--- a/metadata/md5-cache/dev-qt/qtcore-5.9.2
+++ b/metadata/md5-cache/dev-qt/qtcore-5.9.2
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/double-conversion:= dev-libs/glib:2 dev-libs/libpcre2[pcre16,un
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.2/submodules/qtbase-opensource-src-5.9.2.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=1b44ef7f97422cc1df65f13266b6b8b8
diff --git a/metadata/md5-cache/dev-qt/qtcore-5.9.3 b/metadata/md5-cache/dev-qt/qtcore-5.9.3
index f553249bffa1..77be83e7a7cf 100644
--- a/metadata/md5-cache/dev-qt/qtcore-5.9.3
+++ b/metadata/md5-cache/dev-qt/qtcore-5.9.3
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/double-conversion:= dev-libs/glib:2 dev-libs/libpcre2[pcre16,un
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qtbase-opensource-src-5.9.3.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=1b44ef7f97422cc1df65f13266b6b8b8
diff --git a/metadata/md5-cache/dev-qt/qtdatavis3d-5.7.1 b/metadata/md5-cache/dev-qt/qtdatavis3d-5.7.1
index 9009fcc81c64..c34a489cd5ee 100644
--- a/metadata/md5-cache/dev-qt/qtdatavis3d-5.7.1
+++ b/metadata/md5-cache/dev-qt/qtdatavis3d-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtgui-5.7.1[gles2=] qml? ( ~dev-qt/qtdeclar
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qtdatavis3d-opensource-src-5.7.1.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=5efd699a913bf017c8ae7b2f715d37cb
diff --git a/metadata/md5-cache/dev-qt/qtdatavis3d-5.9.2 b/metadata/md5-cache/dev-qt/qtdatavis3d-5.9.2
index 1c9c660e1927..0d438741f21c 100644
--- a/metadata/md5-cache/dev-qt/qtdatavis3d-5.9.2
+++ b/metadata/md5-cache/dev-qt/qtdatavis3d-5.9.2
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.2 ~dev-qt/qtgui-5.9.2[gles2=] qml? ( ~dev-qt/qtdeclar
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.2/submodules/qtdatavis3d-opensource-src-5.9.2.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=e50f455d4b2ffbf64a772f94f4342633
diff --git a/metadata/md5-cache/dev-qt/qtdatavis3d-5.9.3 b/metadata/md5-cache/dev-qt/qtdatavis3d-5.9.3
index c4337da176b1..5b9965a3a4d0 100644
--- a/metadata/md5-cache/dev-qt/qtdatavis3d-5.9.3
+++ b/metadata/md5-cache/dev-qt/qtdatavis3d-5.9.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.3 ~dev-qt/qtgui-5.9.3[gles2=] qml? ( ~dev-qt/qtdeclar
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qtdatavis3d-opensource-src-5.9.3.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=e50f455d4b2ffbf64a772f94f4342633
diff --git a/metadata/md5-cache/dev-qt/qtdbus-5.7.1 b/metadata/md5-cache/dev-qt/qtdbus-5.7.1
index 77b8533e93a7..30ec85306137 100644
--- a/metadata/md5-cache/dev-qt/qtdbus-5.7.1
+++ b/metadata/md5-cache/dev-qt/qtdbus-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 >=sys-apps/dbus-1.4.20 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qtbase-opensource-src-5.7.1.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=300d9f5a3bb98682966d30148e5f7e0c
diff --git a/metadata/md5-cache/dev-qt/qtdbus-5.9.2 b/metadata/md5-cache/dev-qt/qtdbus-5.9.2
index 5d7c21d3a683..257e9d9219f2 100644
--- a/metadata/md5-cache/dev-qt/qtdbus-5.9.2
+++ b/metadata/md5-cache/dev-qt/qtdbus-5.9.2
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.2 >=sys-apps/dbus-1.4.20 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.2/submodules/qtbase-opensource-src-5.9.2.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=22652e1639b9804593ec1aacedf30212
diff --git a/metadata/md5-cache/dev-qt/qtdbus-5.9.3 b/metadata/md5-cache/dev-qt/qtdbus-5.9.3
index ee3c240c83c3..a10416a5933e 100644
--- a/metadata/md5-cache/dev-qt/qtdbus-5.9.3
+++ b/metadata/md5-cache/dev-qt/qtdbus-5.9.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.3 >=sys-apps/dbus-1.4.20 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qtbase-opensource-src-5.9.3.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=22652e1639b9804593ec1aacedf30212
diff --git a/metadata/md5-cache/dev-qt/qtdeclarative-5.7.1 b/metadata/md5-cache/dev-qt/qtdeclarative-5.7.1
index c834975456a3..2e0145530fb4 100644
--- a/metadata/md5-cache/dev-qt/qtdeclarative-5.7.1
+++ b/metadata/md5-cache/dev-qt/qtdeclarative-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtgui-5.7.1[gles2=] ~dev-qt/qtnetwork-5.7.1
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qtdeclarative-opensource-src-5.7.1.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=3c04f179185fb1c7beaa54553ad7ecc8
diff --git a/metadata/md5-cache/dev-qt/qtdeclarative-5.7.1-r1 b/metadata/md5-cache/dev-qt/qtdeclarative-5.7.1-r1
index 1f14ad5ae349..f514b88f4ecb 100644
--- a/metadata/md5-cache/dev-qt/qtdeclarative-5.7.1-r1
+++ b/metadata/md5-cache/dev-qt/qtdeclarative-5.7.1-r1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtgui-5.7.1[gles2=] ~dev-qt/qtnetwork-5.7.1
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qtdeclarative-opensource-src-5.7.1.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=692ec7c258748fa466d999f56eba960a
diff --git a/metadata/md5-cache/dev-qt/qtdeclarative-5.9.2 b/metadata/md5-cache/dev-qt/qtdeclarative-5.9.2
index a61452e90a16..bfec4df7627e 100644
--- a/metadata/md5-cache/dev-qt/qtdeclarative-5.9.2
+++ b/metadata/md5-cache/dev-qt/qtdeclarative-5.9.2
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.2 ~dev-qt/qtgui-5.9.2[gles2=] ~dev-qt/qtnetwork-5.9.2
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.2/submodules/qtdeclarative-opensource-src-5.9.2.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=48866204dc6c697220dda87a1bc4eb99
diff --git a/metadata/md5-cache/dev-qt/qtdeclarative-5.9.3 b/metadata/md5-cache/dev-qt/qtdeclarative-5.9.3
index 5c62c5f4d77d..8638f344993a 100644
--- a/metadata/md5-cache/dev-qt/qtdeclarative-5.9.3
+++ b/metadata/md5-cache/dev-qt/qtdeclarative-5.9.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.3 ~dev-qt/qtgui-5.9.3[gles2=] ~dev-qt/qtnetwork-5.9.3
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qtdeclarative-opensource-src-5.9.3.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=48866204dc6c697220dda87a1bc4eb99
diff --git a/metadata/md5-cache/dev-qt/qtdiag-5.7.1 b/metadata/md5-cache/dev-qt/qtdiag-5.7.1
index 3e0b1697603d..74d5ef6d2424 100644
--- a/metadata/md5-cache/dev-qt/qtdiag-5.7.1
+++ b/metadata/md5-cache/dev-qt/qtdiag-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtgui-5.7.1 ~dev-qt/qtnetwork-5.7.1[ssl=] d
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qttools-opensource-src-5.7.1.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=708fd8fee5f122532763ee938714342c
diff --git a/metadata/md5-cache/dev-qt/qtdiag-5.9.2 b/metadata/md5-cache/dev-qt/qtdiag-5.9.2
index 159db5b9c824..1a43e1779763 100644
--- a/metadata/md5-cache/dev-qt/qtdiag-5.9.2
+++ b/metadata/md5-cache/dev-qt/qtdiag-5.9.2
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.2 ~dev-qt/qtgui-5.9.2 network? ( ~dev-qt/qtnetwork-5.
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.2/submodules/qttools-opensource-src-5.9.2.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=94debd9c530d97f5a9beb62a967ad0b7
diff --git a/metadata/md5-cache/dev-qt/qtdiag-5.9.3 b/metadata/md5-cache/dev-qt/qtdiag-5.9.3
index 5d19cfb4a59b..0263e4f5eb99 100644
--- a/metadata/md5-cache/dev-qt/qtdiag-5.9.3
+++ b/metadata/md5-cache/dev-qt/qtdiag-5.9.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.3 ~dev-qt/qtgui-5.9.3 network? ( ~dev-qt/qtnetwork-5.
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qttools-opensource-src-5.9.3.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=94debd9c530d97f5a9beb62a967ad0b7
diff --git a/metadata/md5-cache/dev-qt/qtgraphicaleffects-5.7.1 b/metadata/md5-cache/dev-qt/qtgraphicaleffects-5.7.1
index 4d8eb9e9e6e9..ad25418bc059 100644
--- a/metadata/md5-cache/dev-qt/qtgraphicaleffects-5.7.1
+++ b/metadata/md5-cache/dev-qt/qtgraphicaleffects-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtdeclarative-5.7.1 ~dev-qt/qtgui-5.7.1 dev
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qtgraphicaleffects-opensource-src-5.7.1.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=9c6d36e0a8bba5a791b151bbafc83bf0
diff --git a/metadata/md5-cache/dev-qt/qtgraphicaleffects-5.9.2 b/metadata/md5-cache/dev-qt/qtgraphicaleffects-5.9.2
index cb3181f47d0e..daadf1c514c6 100644
--- a/metadata/md5-cache/dev-qt/qtgraphicaleffects-5.9.2
+++ b/metadata/md5-cache/dev-qt/qtgraphicaleffects-5.9.2
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.2 ~dev-qt/qtdeclarative-5.9.2 ~dev-qt/qtgui-5.9.2 dev
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.2/submodules/qtgraphicaleffects-opensource-src-5.9.2.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=8b0e36d933ed505c15e2f30551b7e2d5
diff --git a/metadata/md5-cache/dev-qt/qtgraphicaleffects-5.9.3 b/metadata/md5-cache/dev-qt/qtgraphicaleffects-5.9.3
index edadf6fb28e6..76d85a59b252 100644
--- a/metadata/md5-cache/dev-qt/qtgraphicaleffects-5.9.3
+++ b/metadata/md5-cache/dev-qt/qtgraphicaleffects-5.9.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.3 ~dev-qt/qtdeclarative-5.9.3 ~dev-qt/qtgui-5.9.3 dev
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qtgraphicaleffects-opensource-src-5.9.3.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=8b0e36d933ed505c15e2f30551b7e2d5
diff --git a/metadata/md5-cache/dev-qt/qtgui-5.7.1-r1 b/metadata/md5-cache/dev-qt/qtgui-5.7.1-r1
index e8c3b4f43bd5..34e88717a4e2 100644
--- a/metadata/md5-cache/dev-qt/qtgui-5.7.1-r1
+++ b/metadata/md5-cache/dev-qt/qtgui-5.7.1-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( eglfs xcb ) accessibility? ( dbus xcb ) eglfs? ( egl ) ibus? (
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qtbase-opensource-src-5.7.1.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=f3f7e257dfac151c52801eeae2bb30a3
diff --git a/metadata/md5-cache/dev-qt/qtgui-5.9.2 b/metadata/md5-cache/dev-qt/qtgui-5.9.2
index 1c2b5f1cd139..905c347170c3 100644
--- a/metadata/md5-cache/dev-qt/qtgui-5.9.2
+++ b/metadata/md5-cache/dev-qt/qtgui-5.9.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( eglfs xcb ) accessibility? ( dbus xcb ) eglfs? ( egl ) ibus? (
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.2/submodules/qtbase-opensource-src-5.9.2.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=58121064becf6e8e9a62e16b52d1e1c8
diff --git a/metadata/md5-cache/dev-qt/qtgui-5.9.3 b/metadata/md5-cache/dev-qt/qtgui-5.9.3
index db4a205a032d..a4dd1858ebca 100644
--- a/metadata/md5-cache/dev-qt/qtgui-5.9.3
+++ b/metadata/md5-cache/dev-qt/qtgui-5.9.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( eglfs xcb ) accessibility? ( dbus xcb ) eglfs? ( egl ) ibus? (
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qtbase-opensource-src-5.9.3.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=58121064becf6e8e9a62e16b52d1e1c8
diff --git a/metadata/md5-cache/dev-qt/qthelp-5.7.1 b/metadata/md5-cache/dev-qt/qthelp-5.7.1
index 3c7fd577dfcc..26a8a0a14c06 100644
--- a/metadata/md5-cache/dev-qt/qthelp-5.7.1
+++ b/metadata/md5-cache/dev-qt/qthelp-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtgui-5.7.1 ~dev-qt/qtnetwork-5.7.1 ~dev-qt
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qttools-opensource-src-5.7.1.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=931c918fc95ed4e8fcaf34834c03b8b0
diff --git a/metadata/md5-cache/dev-qt/qthelp-5.9.2 b/metadata/md5-cache/dev-qt/qthelp-5.9.2
index b3c96822a370..f6cc682b06a3 100644
--- a/metadata/md5-cache/dev-qt/qthelp-5.9.2
+++ b/metadata/md5-cache/dev-qt/qthelp-5.9.2
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.2 ~dev-qt/qtgui-5.9.2 ~dev-qt/qtnetwork-5.9.2 ~dev-qt
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.2/submodules/qttools-opensource-src-5.9.2.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=f6c6d84ab0305c99267a20cf4693758b
diff --git a/metadata/md5-cache/dev-qt/qthelp-5.9.3 b/metadata/md5-cache/dev-qt/qthelp-5.9.3
index bcebbc1626d2..229e3d32d402 100644
--- a/metadata/md5-cache/dev-qt/qthelp-5.9.3
+++ b/metadata/md5-cache/dev-qt/qthelp-5.9.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.3 ~dev-qt/qtgui-5.9.3 ~dev-qt/qtnetwork-5.9.3 ~dev-qt
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qttools-opensource-src-5.9.3.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=f6c6d84ab0305c99267a20cf4693758b
diff --git a/metadata/md5-cache/dev-qt/qtimageformats-5.7.1 b/metadata/md5-cache/dev-qt/qtimageformats-5.7.1
index d707b2488f11..f2d48b9b904f 100644
--- a/metadata/md5-cache/dev-qt/qtimageformats-5.7.1
+++ b/metadata/md5-cache/dev-qt/qtimageformats-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtgui-5.7.1 media-libs/jasper:= media-libs/
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qtimageformats-opensource-src-5.7.1.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=5b45684084405c2cb0a770ef1e1b39e5
diff --git a/metadata/md5-cache/dev-qt/qtimageformats-5.9.2 b/metadata/md5-cache/dev-qt/qtimageformats-5.9.2
index 0ec89d76de3e..83ddc8f749d0 100644
--- a/metadata/md5-cache/dev-qt/qtimageformats-5.9.2
+++ b/metadata/md5-cache/dev-qt/qtimageformats-5.9.2
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.2 ~dev-qt/qtgui-5.9.2 media-libs/jasper:= media-libs/
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.2/submodules/qtimageformats-opensource-src-5.9.2.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=7c0973e4d7f95cbe35bbc05c9be5209c
diff --git a/metadata/md5-cache/dev-qt/qtimageformats-5.9.3 b/metadata/md5-cache/dev-qt/qtimageformats-5.9.3
index 1a8c2f0986f3..17f41544430e 100644
--- a/metadata/md5-cache/dev-qt/qtimageformats-5.9.3
+++ b/metadata/md5-cache/dev-qt/qtimageformats-5.9.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.3 ~dev-qt/qtgui-5.9.3 media-libs/jasper:= media-libs/
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qtimageformats-opensource-src-5.9.3.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=7c0973e4d7f95cbe35bbc05c9be5209c
diff --git a/metadata/md5-cache/dev-qt/qtlocation-5.7.1 b/metadata/md5-cache/dev-qt/qtlocation-5.7.1
index 443003f16ccc..c66b85f2f1a5 100644
--- a/metadata/md5-cache/dev-qt/qtlocation-5.7.1
+++ b/metadata/md5-cache/dev-qt/qtlocation-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtdeclarative-5.7.1 ~dev-qt/qtgui-5.7.1 ~de
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qtlocation-opensource-src-5.7.1.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=f16af598359c715ab69d2186912d6241
diff --git a/metadata/md5-cache/dev-qt/qtlocation-5.9.2 b/metadata/md5-cache/dev-qt/qtlocation-5.9.2
index fba613c306bf..67420268c89f 100644
--- a/metadata/md5-cache/dev-qt/qtlocation-5.9.2
+++ b/metadata/md5-cache/dev-qt/qtlocation-5.9.2
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.2 ~dev-qt/qtdeclarative-5.9.2 ~dev-qt/qtgui-5.9.2 ~de
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.2/submodules/qtlocation-opensource-src-5.9.2.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=320d543b38c87c6a4aa3bc2227bbfa1f
diff --git a/metadata/md5-cache/dev-qt/qtlocation-5.9.3 b/metadata/md5-cache/dev-qt/qtlocation-5.9.3
index 674cb9170fe5..cbf073d6a848 100644
--- a/metadata/md5-cache/dev-qt/qtlocation-5.9.3
+++ b/metadata/md5-cache/dev-qt/qtlocation-5.9.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.3 ~dev-qt/qtdeclarative-5.9.3 ~dev-qt/qtgui-5.9.3 ~de
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qtlocation-opensource-src-5.9.3.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=320d543b38c87c6a4aa3bc2227bbfa1f
diff --git a/metadata/md5-cache/dev-qt/qtmultimedia-5.7.1 b/metadata/md5-cache/dev-qt/qtmultimedia-5.7.1
index bac49b67b9b0..cd46822c1e63 100644
--- a/metadata/md5-cache/dev-qt/qtmultimedia-5.7.1
+++ b/metadata/md5-cache/dev-qt/qtmultimedia-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtgui-5.7.1[gles2=] ~dev-qt/qtnetwork-5.7.1
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qtmultimedia-opensource-src-5.7.1.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=a414cbddbd38fee4600900317d79a91e
diff --git a/metadata/md5-cache/dev-qt/qtmultimedia-5.9.2 b/metadata/md5-cache/dev-qt/qtmultimedia-5.9.2
index a7dfe4f49a14..c8cb5b4edaef 100644
--- a/metadata/md5-cache/dev-qt/qtmultimedia-5.9.2
+++ b/metadata/md5-cache/dev-qt/qtmultimedia-5.9.2
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.2 ~dev-qt/qtgui-5.9.2[gles2=] ~dev-qt/qtnetwork-5.9.2
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.2/submodules/qtmultimedia-opensource-src-5.9.2.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=97e074b6c2ea6e8ec7bd8fcf7c594893
diff --git a/metadata/md5-cache/dev-qt/qtmultimedia-5.9.3 b/metadata/md5-cache/dev-qt/qtmultimedia-5.9.3
index 8a877cfa511b..6072563e36fd 100644
--- a/metadata/md5-cache/dev-qt/qtmultimedia-5.9.3
+++ b/metadata/md5-cache/dev-qt/qtmultimedia-5.9.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.3 ~dev-qt/qtgui-5.9.3[gles2=] ~dev-qt/qtnetwork-5.9.3
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qtmultimedia-opensource-src-5.9.3.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=97e074b6c2ea6e8ec7bd8fcf7c594893
diff --git a/metadata/md5-cache/dev-qt/qtnetwork-5.7.1 b/metadata/md5-cache/dev-qt/qtnetwork-5.7.1
index 4f2d2441e81e..eba863d6e6ed 100644
--- a/metadata/md5-cache/dev-qt/qtnetwork-5.7.1
+++ b/metadata/md5-cache/dev-qt/qtnetwork-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 >=sys-libs/zlib-1.2.5 connman? ( ~dev-qt/qtdbus-5.7
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qtbase-opensource-src-5.7.1.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=cd3aab100c8c0dc80d1971f915f37739
diff --git a/metadata/md5-cache/dev-qt/qtnetwork-5.9.2 b/metadata/md5-cache/dev-qt/qtnetwork-5.9.2
index dce07b859107..668ffc83e01a 100644
--- a/metadata/md5-cache/dev-qt/qtnetwork-5.9.2
+++ b/metadata/md5-cache/dev-qt/qtnetwork-5.9.2
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.2 >=sys-libs/zlib-1.2.5 connman? ( ~dev-qt/qtdbus-5.9
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.2/submodules/qtbase-opensource-src-5.9.2.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=81faf5ec62dfd5a3a5d48ba16e3f5adc
diff --git a/metadata/md5-cache/dev-qt/qtnetwork-5.9.3 b/metadata/md5-cache/dev-qt/qtnetwork-5.9.3
index bbc8f2cbd930..d36b16a56a69 100644
--- a/metadata/md5-cache/dev-qt/qtnetwork-5.9.3
+++ b/metadata/md5-cache/dev-qt/qtnetwork-5.9.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.3 >=sys-libs/zlib-1.2.5 connman? ( ~dev-qt/qtdbus-5.9
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qtbase-opensource-src-5.9.3.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=81faf5ec62dfd5a3a5d48ba16e3f5adc
diff --git a/metadata/md5-cache/dev-qt/qtnetworkauth-5.9.2 b/metadata/md5-cache/dev-qt/qtnetworkauth-5.9.2
index 3335ded0c664..3b2a32771bec 100644
--- a/metadata/md5-cache/dev-qt/qtnetworkauth-5.9.2
+++ b/metadata/md5-cache/dev-qt/qtnetworkauth-5.9.2
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.2 ~dev-qt/qtnetwork-5.9.2 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.2/submodules/qtnetworkauth-opensource-src-5.9.2.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=a5d0b10c9f6fc56323ba72498b7712e3
diff --git a/metadata/md5-cache/dev-qt/qtnetworkauth-5.9.3 b/metadata/md5-cache/dev-qt/qtnetworkauth-5.9.3
index 40d2aee3616a..20299a3b10c8 100644
--- a/metadata/md5-cache/dev-qt/qtnetworkauth-5.9.3
+++ b/metadata/md5-cache/dev-qt/qtnetworkauth-5.9.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.3 ~dev-qt/qtnetwork-5.9.3 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qtnetworkauth-opensource-src-5.9.3.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=a5d0b10c9f6fc56323ba72498b7712e3
diff --git a/metadata/md5-cache/dev-qt/qtopengl-5.7.1 b/metadata/md5-cache/dev-qt/qtopengl-5.7.1
index 4ebd6238bd6c..29f690985b7f 100644
--- a/metadata/md5-cache/dev-qt/qtopengl-5.7.1
+++ b/metadata/md5-cache/dev-qt/qtopengl-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtgui-5.7.1[gles2=] ~dev-qt/qtwidgets-5.7.1
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qtbase-opensource-src-5.7.1.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=33702d61bc94ebe2ec41d4e571334f27
diff --git a/metadata/md5-cache/dev-qt/qtopengl-5.9.2 b/metadata/md5-cache/dev-qt/qtopengl-5.9.2
index 2eacde14fdea..52a09ab67e34 100644
--- a/metadata/md5-cache/dev-qt/qtopengl-5.9.2
+++ b/metadata/md5-cache/dev-qt/qtopengl-5.9.2
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.2 ~dev-qt/qtgui-5.9.2[gles2=] ~dev-qt/qtwidgets-5.9.2
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.2/submodules/qtbase-opensource-src-5.9.2.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=3d580076a240579b9ffca441ea2556ee
diff --git a/metadata/md5-cache/dev-qt/qtopengl-5.9.3 b/metadata/md5-cache/dev-qt/qtopengl-5.9.3
index 21e574539571..3e4f381fcb8b 100644
--- a/metadata/md5-cache/dev-qt/qtopengl-5.9.3
+++ b/metadata/md5-cache/dev-qt/qtopengl-5.9.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.3 ~dev-qt/qtgui-5.9.3[gles2=] ~dev-qt/qtwidgets-5.9.3
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qtbase-opensource-src-5.9.3.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=3d580076a240579b9ffca441ea2556ee
diff --git a/metadata/md5-cache/dev-qt/qtpaths-5.7.1 b/metadata/md5-cache/dev-qt/qtpaths-5.7.1
index 7922e67c004c..ef1cf0be532d 100644
--- a/metadata/md5-cache/dev-qt/qtpaths-5.7.1
+++ b/metadata/md5-cache/dev-qt/qtpaths-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qttools-opensource-src-5.7.1.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=e7030b81bb1e1985ffae10ff05325f23
diff --git a/metadata/md5-cache/dev-qt/qtpaths-5.9.2 b/metadata/md5-cache/dev-qt/qtpaths-5.9.2
index 69797dd62b3d..9068a5d0bf07 100644
--- a/metadata/md5-cache/dev-qt/qtpaths-5.9.2
+++ b/metadata/md5-cache/dev-qt/qtpaths-5.9.2
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.2 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.2/submodules/qttools-opensource-src-5.9.2.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=529c9cf384423268eaf25c7d953cd28b
diff --git a/metadata/md5-cache/dev-qt/qtpaths-5.9.3 b/metadata/md5-cache/dev-qt/qtpaths-5.9.3
index 3d632f9d01d4..b5bf817216de 100644
--- a/metadata/md5-cache/dev-qt/qtpaths-5.9.3
+++ b/metadata/md5-cache/dev-qt/qtpaths-5.9.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.3 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qttools-opensource-src-5.9.3.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=529c9cf384423268eaf25c7d953cd28b
diff --git a/metadata/md5-cache/dev-qt/qtplugininfo-5.7.1 b/metadata/md5-cache/dev-qt/qtplugininfo-5.7.1
index 311fbc715f7c..3a07e77c64c1 100644
--- a/metadata/md5-cache/dev-qt/qtplugininfo-5.7.1
+++ b/metadata/md5-cache/dev-qt/qtplugininfo-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qttools-opensource-src-5.7.1.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=0643ba650e59cc2fddf0bc18627ce522
diff --git a/metadata/md5-cache/dev-qt/qtplugininfo-5.9.2 b/metadata/md5-cache/dev-qt/qtplugininfo-5.9.2
index ff4c64827646..c2f5c47eb1b1 100644
--- a/metadata/md5-cache/dev-qt/qtplugininfo-5.9.2
+++ b/metadata/md5-cache/dev-qt/qtplugininfo-5.9.2
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.2 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.2/submodules/qttools-opensource-src-5.9.2.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=ca8ba2814d3e39f4038cf0491a0ff5d2
diff --git a/metadata/md5-cache/dev-qt/qtplugininfo-5.9.3 b/metadata/md5-cache/dev-qt/qtplugininfo-5.9.3
index 1438bece33a8..0f2a9cf45bd4 100644
--- a/metadata/md5-cache/dev-qt/qtplugininfo-5.9.3
+++ b/metadata/md5-cache/dev-qt/qtplugininfo-5.9.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.3 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qttools-opensource-src-5.9.3.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=ca8ba2814d3e39f4038cf0491a0ff5d2
diff --git a/metadata/md5-cache/dev-qt/qtpositioning-5.7.1 b/metadata/md5-cache/dev-qt/qtpositioning-5.7.1
index 5842ad6b2a42..a6ca5f1fe121 100644
--- a/metadata/md5-cache/dev-qt/qtpositioning-5.7.1
+++ b/metadata/md5-cache/dev-qt/qtpositioning-5.7.1
@@ -11,5 +11,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 geoclue? ( ~dev-qt/qtdbus-5.7.1 ) qml? ( ~dev-qt/qt
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qtlocation-opensource-src-5.7.1.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=b31f28eda98b13c7fad47cd84b0d34e9
diff --git a/metadata/md5-cache/dev-qt/qtpositioning-5.9.2 b/metadata/md5-cache/dev-qt/qtpositioning-5.9.2
index 0d42ab2107b2..e97e32a8ad49 100644
--- a/metadata/md5-cache/dev-qt/qtpositioning-5.9.2
+++ b/metadata/md5-cache/dev-qt/qtpositioning-5.9.2
@@ -11,5 +11,5 @@ RDEPEND=~dev-qt/qtcore-5.9.2 geoclue? ( ~dev-qt/qtdbus-5.9.2 ) qml? ( ~dev-qt/qt
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.2/submodules/qtlocation-opensource-src-5.9.2.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=644698f75aa6190028c1d4f1b67dfae2
diff --git a/metadata/md5-cache/dev-qt/qtpositioning-5.9.3 b/metadata/md5-cache/dev-qt/qtpositioning-5.9.3
index f5a277915dd3..9a341a0a6b69 100644
--- a/metadata/md5-cache/dev-qt/qtpositioning-5.9.3
+++ b/metadata/md5-cache/dev-qt/qtpositioning-5.9.3
@@ -11,5 +11,5 @@ RDEPEND=~dev-qt/qtcore-5.9.3 geoclue? ( ~dev-qt/qtdbus-5.9.3 ) qml? ( ~dev-qt/qt
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qtlocation-opensource-src-5.9.3.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=644698f75aa6190028c1d4f1b67dfae2
diff --git a/metadata/md5-cache/dev-qt/qtprintsupport-5.7.1 b/metadata/md5-cache/dev-qt/qtprintsupport-5.7.1
index f515667d1491..caf3ec3763f2 100644
--- a/metadata/md5-cache/dev-qt/qtprintsupport-5.7.1
+++ b/metadata/md5-cache/dev-qt/qtprintsupport-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtgui-5.7.1[gles2=] ~dev-qt/qtwidgets-5.7.1
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qtbase-opensource-src-5.7.1.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=f5562e8a887725d43355c80fe98d6160
diff --git a/metadata/md5-cache/dev-qt/qtprintsupport-5.9.2 b/metadata/md5-cache/dev-qt/qtprintsupport-5.9.2
index d3e87f202443..5d23e01acce3 100644
--- a/metadata/md5-cache/dev-qt/qtprintsupport-5.9.2
+++ b/metadata/md5-cache/dev-qt/qtprintsupport-5.9.2
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.2 ~dev-qt/qtgui-5.9.2[gles2=] ~dev-qt/qtwidgets-5.9.2
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.2/submodules/qtbase-opensource-src-5.9.2.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=1f60e213375ddbd5d062fc3d4ab1a1af
diff --git a/metadata/md5-cache/dev-qt/qtprintsupport-5.9.3 b/metadata/md5-cache/dev-qt/qtprintsupport-5.9.3
index 1fd7d1fe354f..6f454166ba6e 100644
--- a/metadata/md5-cache/dev-qt/qtprintsupport-5.9.3
+++ b/metadata/md5-cache/dev-qt/qtprintsupport-5.9.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.3 ~dev-qt/qtgui-5.9.3[gles2=] ~dev-qt/qtwidgets-5.9.3
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qtbase-opensource-src-5.9.3.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=1f60e213375ddbd5d062fc3d4ab1a1af
diff --git a/metadata/md5-cache/dev-qt/qtquickcontrols-5.7.1 b/metadata/md5-cache/dev-qt/qtquickcontrols-5.7.1
index ae2f8b117732..bb3c3c21156e 100644
--- a/metadata/md5-cache/dev-qt/qtquickcontrols-5.7.1
+++ b/metadata/md5-cache/dev-qt/qtquickcontrols-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtdeclarative-5.7.1 ~dev-qt/qtgui-5.7.1 wid
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qtquickcontrols-opensource-src-5.7.1.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=d373fd8804095291aca0e9d045cbdff6
diff --git a/metadata/md5-cache/dev-qt/qtquickcontrols-5.9.2 b/metadata/md5-cache/dev-qt/qtquickcontrols-5.9.2
index 4d17ab57b70a..e5e91b565678 100644
--- a/metadata/md5-cache/dev-qt/qtquickcontrols-5.9.2
+++ b/metadata/md5-cache/dev-qt/qtquickcontrols-5.9.2
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.2 ~dev-qt/qtdeclarative-5.9.2 ~dev-qt/qtgui-5.9.2 wid
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.2/submodules/qtquickcontrols-opensource-src-5.9.2.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=7f1403dfb36666220e3f4b5444717652
diff --git a/metadata/md5-cache/dev-qt/qtquickcontrols-5.9.3 b/metadata/md5-cache/dev-qt/qtquickcontrols-5.9.3
index d7611f5585dc..234c949c34fb 100644
--- a/metadata/md5-cache/dev-qt/qtquickcontrols-5.9.3
+++ b/metadata/md5-cache/dev-qt/qtquickcontrols-5.9.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.3 ~dev-qt/qtdeclarative-5.9.3 ~dev-qt/qtgui-5.9.3 wid
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qtquickcontrols-opensource-src-5.9.3.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=7f1403dfb36666220e3f4b5444717652
diff --git a/metadata/md5-cache/dev-qt/qtquickcontrols2-5.7.1 b/metadata/md5-cache/dev-qt/qtquickcontrols2-5.7.1
index 592a5b150e12..e4c6a64b8626 100644
--- a/metadata/md5-cache/dev-qt/qtquickcontrols2-5.7.1
+++ b/metadata/md5-cache/dev-qt/qtquickcontrols2-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtdeclarative-5.7.1 ~dev-qt/qtgraphicaleffe
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qtquickcontrols2-opensource-src-5.7.1.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=76a8075e6e58ad1696f5c0890c901074
diff --git a/metadata/md5-cache/dev-qt/qtquickcontrols2-5.9.2 b/metadata/md5-cache/dev-qt/qtquickcontrols2-5.9.2
index 286f6c4d9790..20e347ec4a22 100644
--- a/metadata/md5-cache/dev-qt/qtquickcontrols2-5.9.2
+++ b/metadata/md5-cache/dev-qt/qtquickcontrols2-5.9.2
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.2 ~dev-qt/qtdeclarative-5.9.2 ~dev-qt/qtgui-5.9.2 wid
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.2/submodules/qtquickcontrols2-opensource-src-5.9.2.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=a45f254daee4dfd9f7d9fef892155ecc
diff --git a/metadata/md5-cache/dev-qt/qtquickcontrols2-5.9.3 b/metadata/md5-cache/dev-qt/qtquickcontrols2-5.9.3
index f98115b496cc..cc8c15d02da4 100644
--- a/metadata/md5-cache/dev-qt/qtquickcontrols2-5.9.3
+++ b/metadata/md5-cache/dev-qt/qtquickcontrols2-5.9.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.3 ~dev-qt/qtdeclarative-5.9.3 ~dev-qt/qtgui-5.9.3 wid
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qtquickcontrols2-opensource-src-5.9.3.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=a45f254daee4dfd9f7d9fef892155ecc
diff --git a/metadata/md5-cache/dev-qt/qtscript-5.7.1 b/metadata/md5-cache/dev-qt/qtscript-5.7.1
index 162e2684192e..cb532d1dc960 100644
--- a/metadata/md5-cache/dev-qt/qtscript-5.7.1
+++ b/metadata/md5-cache/dev-qt/qtscript-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 scripttools? ( ~dev-qt/qtgui-5.7.1 ~dev-qt/qtwidget
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qtscript-opensource-src-5.7.1.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=6736b2476fc9c5189625b2e941b40dac
diff --git a/metadata/md5-cache/dev-qt/qtscript-5.9.2 b/metadata/md5-cache/dev-qt/qtscript-5.9.2
index 8372748f506b..23a559d5b6ea 100644
--- a/metadata/md5-cache/dev-qt/qtscript-5.9.2
+++ b/metadata/md5-cache/dev-qt/qtscript-5.9.2
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.2 scripttools? ( ~dev-qt/qtgui-5.9.2 ~dev-qt/qtwidget
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.2/submodules/qtscript-opensource-src-5.9.2.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=16365c5f01ad7e0d9b38cbd0d43753f4
diff --git a/metadata/md5-cache/dev-qt/qtscript-5.9.3 b/metadata/md5-cache/dev-qt/qtscript-5.9.3
index 726ff7f5742a..5ecccc8a72f7 100644
--- a/metadata/md5-cache/dev-qt/qtscript-5.9.3
+++ b/metadata/md5-cache/dev-qt/qtscript-5.9.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.3 scripttools? ( ~dev-qt/qtgui-5.9.3 ~dev-qt/qtwidget
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qtscript-opensource-src-5.9.3.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=16365c5f01ad7e0d9b38cbd0d43753f4
diff --git a/metadata/md5-cache/dev-qt/qtscxml-5.7.1 b/metadata/md5-cache/dev-qt/qtscxml-5.7.1
index 4d397c680bd1..afbf4ac79bf2 100644
--- a/metadata/md5-cache/dev-qt/qtscxml-5.7.1
+++ b/metadata/md5-cache/dev-qt/qtscxml-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtdeclarative-5.7.1 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qtscxml-opensource-src-5.7.1.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=04055beb06fbfb7fc86acdffb7b666e8
diff --git a/metadata/md5-cache/dev-qt/qtscxml-5.9.2 b/metadata/md5-cache/dev-qt/qtscxml-5.9.2
index 9685af2162a5..6bda04721f85 100644
--- a/metadata/md5-cache/dev-qt/qtscxml-5.9.2
+++ b/metadata/md5-cache/dev-qt/qtscxml-5.9.2
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.2 ~dev-qt/qtdeclarative-5.9.2 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.2/submodules/qtscxml-opensource-src-5.9.2.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=71c58017ad97e2ab56959960ca2bc139
diff --git a/metadata/md5-cache/dev-qt/qtscxml-5.9.3 b/metadata/md5-cache/dev-qt/qtscxml-5.9.3
index 50be65633fa1..17f5c7ceb613 100644
--- a/metadata/md5-cache/dev-qt/qtscxml-5.9.3
+++ b/metadata/md5-cache/dev-qt/qtscxml-5.9.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.3 ~dev-qt/qtdeclarative-5.9.3 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qtscxml-opensource-src-5.9.3.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=71c58017ad97e2ab56959960ca2bc139
diff --git a/metadata/md5-cache/dev-qt/qtsensors-5.7.1 b/metadata/md5-cache/dev-qt/qtsensors-5.7.1
index 998f2a5e55cc..bdf005c0e64f 100644
--- a/metadata/md5-cache/dev-qt/qtsensors-5.7.1
+++ b/metadata/md5-cache/dev-qt/qtsensors-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 qml? ( ~dev-qt/qtdeclarative-5.7.1 ) dev-qt/qtchoos
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qtsensors-opensource-src-5.7.1.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=c1fd72b820f83b02661f11d402a9ef3e
diff --git a/metadata/md5-cache/dev-qt/qtsensors-5.9.2 b/metadata/md5-cache/dev-qt/qtsensors-5.9.2
index 1ac6e822205c..c806a0b07cd9 100644
--- a/metadata/md5-cache/dev-qt/qtsensors-5.9.2
+++ b/metadata/md5-cache/dev-qt/qtsensors-5.9.2
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.2 ~dev-qt/qtdbus-5.9.2 qml? ( ~dev-qt/qtdeclarative-5
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.2/submodules/qtsensors-opensource-src-5.9.2.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=094910a38d69bb3caaf95353aa5af976
diff --git a/metadata/md5-cache/dev-qt/qtsensors-5.9.3 b/metadata/md5-cache/dev-qt/qtsensors-5.9.3
index c10e4934abe2..68fc4e48105e 100644
--- a/metadata/md5-cache/dev-qt/qtsensors-5.9.3
+++ b/metadata/md5-cache/dev-qt/qtsensors-5.9.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.3 ~dev-qt/qtdbus-5.9.3 qml? ( ~dev-qt/qtdeclarative-5
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qtsensors-opensource-src-5.9.3.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=094910a38d69bb3caaf95353aa5af976
diff --git a/metadata/md5-cache/dev-qt/qtserialbus-5.9.2 b/metadata/md5-cache/dev-qt/qtserialbus-5.9.2
index 912b6c068e26..17d99a67037e 100644
--- a/metadata/md5-cache/dev-qt/qtserialbus-5.9.2
+++ b/metadata/md5-cache/dev-qt/qtserialbus-5.9.2
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.2 ~dev-qt/qtnetwork-5.9.2 ~dev-qt/qtserialport-5.9.2
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.2/submodules/qtserialbus-opensource-src-5.9.2.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=f4ed19e9c2b7a34fed2788aee6590432
diff --git a/metadata/md5-cache/dev-qt/qtserialbus-5.9.3 b/metadata/md5-cache/dev-qt/qtserialbus-5.9.3
index 077e629f87f5..ed821d65b5e8 100644
--- a/metadata/md5-cache/dev-qt/qtserialbus-5.9.3
+++ b/metadata/md5-cache/dev-qt/qtserialbus-5.9.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.3 ~dev-qt/qtnetwork-5.9.3 ~dev-qt/qtserialport-5.9.3
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qtserialbus-opensource-src-5.9.3.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=f4ed19e9c2b7a34fed2788aee6590432
diff --git a/metadata/md5-cache/dev-qt/qtserialport-5.7.1 b/metadata/md5-cache/dev-qt/qtserialport-5.7.1
index 1de19bef3c8a..a8e336b04d35 100644
--- a/metadata/md5-cache/dev-qt/qtserialport-5.7.1
+++ b/metadata/md5-cache/dev-qt/qtserialport-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 virtual/libudev:= dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qtserialport-opensource-src-5.7.1.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=49ce7180d4115c76818f44cba7912401
diff --git a/metadata/md5-cache/dev-qt/qtserialport-5.9.2 b/metadata/md5-cache/dev-qt/qtserialport-5.9.2
index bfe17961a6e8..cab46802d172 100644
--- a/metadata/md5-cache/dev-qt/qtserialport-5.9.2
+++ b/metadata/md5-cache/dev-qt/qtserialport-5.9.2
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.2 virtual/libudev:= dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.2/submodules/qtserialport-opensource-src-5.9.2.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=4399d1bf39070876cf8b30690effd649
diff --git a/metadata/md5-cache/dev-qt/qtserialport-5.9.3 b/metadata/md5-cache/dev-qt/qtserialport-5.9.3
index cf2c233d9db0..6b4d4f3e2b60 100644
--- a/metadata/md5-cache/dev-qt/qtserialport-5.9.3
+++ b/metadata/md5-cache/dev-qt/qtserialport-5.9.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.3 virtual/libudev:= dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qtserialport-opensource-src-5.9.3.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=4399d1bf39070876cf8b30690effd649
diff --git a/metadata/md5-cache/dev-qt/qtspeech-5.9.2 b/metadata/md5-cache/dev-qt/qtspeech-5.9.2
index 95643e66ca73..de38b1e246b4 100644
--- a/metadata/md5-cache/dev-qt/qtspeech-5.9.2
+++ b/metadata/md5-cache/dev-qt/qtspeech-5.9.2
@@ -10,5 +10,5 @@ RDEPEND=>=app-accessibility/speech-dispatcher-0.8.7 ~dev-qt/qtcore-5.9.2 dev-qt/
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.2/submodules/qtspeech-opensource-src-5.9.2.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=67a38f59ac652928e9bf5ee8c66e1abf
diff --git a/metadata/md5-cache/dev-qt/qtspeech-5.9.3 b/metadata/md5-cache/dev-qt/qtspeech-5.9.3
index d535af990417..48aa4ed12b74 100644
--- a/metadata/md5-cache/dev-qt/qtspeech-5.9.3
+++ b/metadata/md5-cache/dev-qt/qtspeech-5.9.3
@@ -10,5 +10,5 @@ RDEPEND=>=app-accessibility/speech-dispatcher-0.8.7 ~dev-qt/qtcore-5.9.3 dev-qt/
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qtspeech-opensource-src-5.9.3.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=67a38f59ac652928e9bf5ee8c66e1abf
diff --git a/metadata/md5-cache/dev-qt/qtsql-5.7.1 b/metadata/md5-cache/dev-qt/qtsql-5.7.1
index 28c67fbd8b77..127c1fb61248 100644
--- a/metadata/md5-cache/dev-qt/qtsql-5.7.1
+++ b/metadata/md5-cache/dev-qt/qtsql-5.7.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( freetds mysql oci8 odbc postgres sqlite )
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qtbase-opensource-src-5.7.1.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=e8f0cdb244f23477e23ee55eb3f1f937
diff --git a/metadata/md5-cache/dev-qt/qtsql-5.7.1-r1 b/metadata/md5-cache/dev-qt/qtsql-5.7.1-r1
index b4cd5d2e646c..a319866d1e15 100644
--- a/metadata/md5-cache/dev-qt/qtsql-5.7.1-r1
+++ b/metadata/md5-cache/dev-qt/qtsql-5.7.1-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( freetds mysql oci8 odbc postgres sqlite )
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qtbase-opensource-src-5.7.1.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=84cd28235cb661fb555c9e967cb330c3
diff --git a/metadata/md5-cache/dev-qt/qtsql-5.9.2 b/metadata/md5-cache/dev-qt/qtsql-5.9.2
index 0b8d635e37c7..4d00b46f8f51 100644
--- a/metadata/md5-cache/dev-qt/qtsql-5.9.2
+++ b/metadata/md5-cache/dev-qt/qtsql-5.9.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( freetds mysql oci8 odbc postgres sqlite )
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.2/submodules/qtbase-opensource-src-5.9.2.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=741e5e3ff11cde8cad89e9216e3df3fa
diff --git a/metadata/md5-cache/dev-qt/qtsql-5.9.3 b/metadata/md5-cache/dev-qt/qtsql-5.9.3
index 88098eb29d9e..e5e30245eb18 100644
--- a/metadata/md5-cache/dev-qt/qtsql-5.9.3
+++ b/metadata/md5-cache/dev-qt/qtsql-5.9.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( freetds mysql oci8 odbc postgres sqlite )
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qtbase-opensource-src-5.9.3.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=741e5e3ff11cde8cad89e9216e3df3fa
diff --git a/metadata/md5-cache/dev-qt/qtsvg-5.7.1 b/metadata/md5-cache/dev-qt/qtsvg-5.7.1
index f88678007a3b..15bf9d21bdbf 100644
--- a/metadata/md5-cache/dev-qt/qtsvg-5.7.1
+++ b/metadata/md5-cache/dev-qt/qtsvg-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtgui-5.7.1 ~dev-qt/qtwidgets-5.7.1 >=sys-l
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qtsvg-opensource-src-5.7.1.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=fbcd165e7e76f2890e625ef87af67018
diff --git a/metadata/md5-cache/dev-qt/qtsvg-5.9.2 b/metadata/md5-cache/dev-qt/qtsvg-5.9.2
index f5e314bd8f9e..dfa9706ccb39 100644
--- a/metadata/md5-cache/dev-qt/qtsvg-5.9.2
+++ b/metadata/md5-cache/dev-qt/qtsvg-5.9.2
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.2 ~dev-qt/qtgui-5.9.2 ~dev-qt/qtwidgets-5.9.2 >=sys-l
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.2/submodules/qtsvg-opensource-src-5.9.2.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=f200af3ff7f0ff3d7c4821e5c142666c
diff --git a/metadata/md5-cache/dev-qt/qtsvg-5.9.3 b/metadata/md5-cache/dev-qt/qtsvg-5.9.3
index dd5e8b39f566..68042b7e8754 100644
--- a/metadata/md5-cache/dev-qt/qtsvg-5.9.3
+++ b/metadata/md5-cache/dev-qt/qtsvg-5.9.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.3 ~dev-qt/qtgui-5.9.3 ~dev-qt/qtwidgets-5.9.3 >=sys-l
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qtsvg-opensource-src-5.9.3.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=f200af3ff7f0ff3d7c4821e5c142666c
diff --git a/metadata/md5-cache/dev-qt/qttest-5.7.1 b/metadata/md5-cache/dev-qt/qttest-5.7.1
index e0dc4e3c5c8a..46e4b582b113 100644
--- a/metadata/md5-cache/dev-qt/qttest-5.7.1
+++ b/metadata/md5-cache/dev-qt/qttest-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qtbase-opensource-src-5.7.1.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=aebe413ac76c08a586128816d0313a81
diff --git a/metadata/md5-cache/dev-qt/qttest-5.9.2 b/metadata/md5-cache/dev-qt/qttest-5.9.2
index c0d983deb2e8..def9d728b6a2 100644
--- a/metadata/md5-cache/dev-qt/qttest-5.9.2
+++ b/metadata/md5-cache/dev-qt/qttest-5.9.2
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.2 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.2/submodules/qtbase-opensource-src-5.9.2.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=fbd71c5be36871bed8f0ca993f18b8ee
diff --git a/metadata/md5-cache/dev-qt/qttest-5.9.3 b/metadata/md5-cache/dev-qt/qttest-5.9.3
index 1d17794cb718..9bcd46700643 100644
--- a/metadata/md5-cache/dev-qt/qttest-5.9.3
+++ b/metadata/md5-cache/dev-qt/qttest-5.9.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.3 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qtbase-opensource-src-5.9.3.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=fbd71c5be36871bed8f0ca993f18b8ee
diff --git a/metadata/md5-cache/dev-qt/qttranslations-5.7.1 b/metadata/md5-cache/dev-qt/qttranslations-5.7.1
index 64734071805f..102e1b5ca28d 100644
--- a/metadata/md5-cache/dev-qt/qttranslations-5.7.1
+++ b/metadata/md5-cache/dev-qt/qttranslations-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qttranslations-opensource-src-5.7.1.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=0c557233df3820f27212a7aab0264ef6
diff --git a/metadata/md5-cache/dev-qt/qttranslations-5.9.2 b/metadata/md5-cache/dev-qt/qttranslations-5.9.2
index a79580a8b6cb..5651370774aa 100644
--- a/metadata/md5-cache/dev-qt/qttranslations-5.9.2
+++ b/metadata/md5-cache/dev-qt/qttranslations-5.9.2
@@ -10,5 +10,5 @@ RDEPEND=dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.2/submodules/qttranslations-opensource-src-5.9.2.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=dd235fbab214911599d7e26f1c64570e
diff --git a/metadata/md5-cache/dev-qt/qttranslations-5.9.3 b/metadata/md5-cache/dev-qt/qttranslations-5.9.3
index c9a489360902..6432757f435c 100644
--- a/metadata/md5-cache/dev-qt/qttranslations-5.9.3
+++ b/metadata/md5-cache/dev-qt/qttranslations-5.9.3
@@ -10,5 +10,5 @@ RDEPEND=dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qttranslations-opensource-src-5.9.3.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=dd235fbab214911599d7e26f1c64570e
diff --git a/metadata/md5-cache/dev-qt/qtvirtualkeyboard-5.7.1 b/metadata/md5-cache/dev-qt/qtvirtualkeyboard-5.7.1
index ae64095080a4..6b099fda92a2 100644
--- a/metadata/md5-cache/dev-qt/qtvirtualkeyboard-5.7.1
+++ b/metadata/md5-cache/dev-qt/qtvirtualkeyboard-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtdeclarative-5.7.1 ~dev-qt/qtgui-5.7.1 ~de
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qtvirtualkeyboard-opensource-src-5.7.1.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=0f0150eaccd9483baeccb20807cee990
diff --git a/metadata/md5-cache/dev-qt/qtvirtualkeyboard-5.9.2 b/metadata/md5-cache/dev-qt/qtvirtualkeyboard-5.9.2
index 159a5af434c4..3d067b405658 100644
--- a/metadata/md5-cache/dev-qt/qtvirtualkeyboard-5.9.2
+++ b/metadata/md5-cache/dev-qt/qtvirtualkeyboard-5.9.2
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.2 ~dev-qt/qtdeclarative-5.9.2 ~dev-qt/qtgui-5.9.2 ~de
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.2/submodules/qtvirtualkeyboard-opensource-src-5.9.2.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=0f0150eaccd9483baeccb20807cee990
diff --git a/metadata/md5-cache/dev-qt/qtvirtualkeyboard-5.9.3 b/metadata/md5-cache/dev-qt/qtvirtualkeyboard-5.9.3
index b4306e672180..7cbf7ecf737c 100644
--- a/metadata/md5-cache/dev-qt/qtvirtualkeyboard-5.9.3
+++ b/metadata/md5-cache/dev-qt/qtvirtualkeyboard-5.9.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.3 ~dev-qt/qtdeclarative-5.9.3 ~dev-qt/qtgui-5.9.3 ~de
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qtvirtualkeyboard-opensource-src-5.9.3.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=0f0150eaccd9483baeccb20807cee990
diff --git a/metadata/md5-cache/dev-qt/qtwayland-5.7.1 b/metadata/md5-cache/dev-qt/qtwayland-5.7.1
index 9a753db2d950..ebfb6714d942 100644
--- a/metadata/md5-cache/dev-qt/qtwayland-5.7.1
+++ b/metadata/md5-cache/dev-qt/qtwayland-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/wayland-1.4.0 ~dev-qt/qtcore-5.7.1 ~dev-qt/qtdeclarative-5.7.
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qtwayland-opensource-src-5.7.1.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=9d7394a0dc477a8ba16c9719632e18e3
diff --git a/metadata/md5-cache/dev-qt/qtwayland-5.9.2 b/metadata/md5-cache/dev-qt/qtwayland-5.9.2
index 4f25c1cf3c21..34d8ae26d1e8 100644
--- a/metadata/md5-cache/dev-qt/qtwayland-5.9.2
+++ b/metadata/md5-cache/dev-qt/qtwayland-5.9.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/wayland-1.6.0 ~dev-qt/qtcore-5.9.2 ~dev-qt/qtdeclarative-5.9.
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.2/submodules/qtwayland-opensource-src-5.9.2.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=5fb3aed5377bd12a02bb00e0dda33640
diff --git a/metadata/md5-cache/dev-qt/qtwayland-5.9.3 b/metadata/md5-cache/dev-qt/qtwayland-5.9.3
index 477dcc48b0f2..241da6fb8a64 100644
--- a/metadata/md5-cache/dev-qt/qtwayland-5.9.3
+++ b/metadata/md5-cache/dev-qt/qtwayland-5.9.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/wayland-1.6.0 ~dev-qt/qtcore-5.9.3 ~dev-qt/qtdeclarative-5.9.
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qtwayland-opensource-src-5.9.3.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=5fb3aed5377bd12a02bb00e0dda33640
diff --git a/metadata/md5-cache/dev-qt/qtwebchannel-5.7.1 b/metadata/md5-cache/dev-qt/qtwebchannel-5.7.1
index 178b9286c57b..28ddce5745b0 100644
--- a/metadata/md5-cache/dev-qt/qtwebchannel-5.7.1
+++ b/metadata/md5-cache/dev-qt/qtwebchannel-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 qml? ( ~dev-qt/qtdeclarative-5.7.1 ) dev-qt/qtchoos
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qtwebchannel-opensource-src-5.7.1.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=e8a26835419fd5a3c1421c024f273e4b
diff --git a/metadata/md5-cache/dev-qt/qtwebchannel-5.9.2 b/metadata/md5-cache/dev-qt/qtwebchannel-5.9.2
index 697029235148..e62165b8d906 100644
--- a/metadata/md5-cache/dev-qt/qtwebchannel-5.9.2
+++ b/metadata/md5-cache/dev-qt/qtwebchannel-5.9.2
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.2 qml? ( ~dev-qt/qtdeclarative-5.9.2 ) dev-qt/qtchoos
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.2/submodules/qtwebchannel-opensource-src-5.9.2.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=d9c5f87946f197e5c271af84a3c2c328
diff --git a/metadata/md5-cache/dev-qt/qtwebchannel-5.9.3 b/metadata/md5-cache/dev-qt/qtwebchannel-5.9.3
index 9b0722ecfd39..a133bd323c5b 100644
--- a/metadata/md5-cache/dev-qt/qtwebchannel-5.9.3
+++ b/metadata/md5-cache/dev-qt/qtwebchannel-5.9.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.3 qml? ( ~dev-qt/qtdeclarative-5.9.3 ) dev-qt/qtchoos
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qtwebchannel-opensource-src-5.9.3.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=d9c5f87946f197e5c271af84a3c2c328
diff --git a/metadata/md5-cache/dev-qt/qtwebengine-5.7.1-r2 b/metadata/md5-cache/dev-qt/qtwebengine-5.7.1-r2
index 2d7df437d318..5a70ea101c27 100644
--- a/metadata/md5-cache/dev-qt/qtwebengine-5.7.1-r2
+++ b/metadata/md5-cache/dev-qt/qtwebengine-5.7.1-r2
@@ -10,5 +10,5 @@ RDEPEND=app-arch/snappy:= dev-libs/glib:2 dev-libs/nspr dev-libs/nss ~dev-qt/qtc
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qtwebengine-opensource-src-5.7.1.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	pax-utils	4f95120230a315c8caaabeb2307b7eee	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	pax-utils	4f95120230a315c8caaabeb2307b7eee	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=33860c1055ddf549e86fe9e2ddf0b214
diff --git a/metadata/md5-cache/dev-qt/qtwebengine-5.9.2 b/metadata/md5-cache/dev-qt/qtwebengine-5.9.2
index 35991b609618..ae3c188dfa2d 100644
--- a/metadata/md5-cache/dev-qt/qtwebengine-5.9.2
+++ b/metadata/md5-cache/dev-qt/qtwebengine-5.9.2
@@ -10,5 +10,5 @@ RDEPEND=app-arch/snappy:= dev-libs/glib:2 dev-libs/nspr dev-libs/nss ~dev-qt/qtc
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.2/submodules/qtwebengine-opensource-src-5.9.2.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	pax-utils	4f95120230a315c8caaabeb2307b7eee	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	pax-utils	4f95120230a315c8caaabeb2307b7eee	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=5d1f21edc6d0a68238ef5493e2720669
diff --git a/metadata/md5-cache/dev-qt/qtwebengine-5.9.3 b/metadata/md5-cache/dev-qt/qtwebengine-5.9.3
index cde49671905e..a573fda649df 100644
--- a/metadata/md5-cache/dev-qt/qtwebengine-5.9.3
+++ b/metadata/md5-cache/dev-qt/qtwebengine-5.9.3
@@ -10,5 +10,5 @@ RDEPEND=app-arch/snappy:= dev-libs/glib:2 dev-libs/nspr dev-libs/nss ~dev-qt/qtc
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qtwebengine-opensource-src-5.9.3.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	pax-utils	4f95120230a315c8caaabeb2307b7eee	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	pax-utils	4f95120230a315c8caaabeb2307b7eee	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=5d1f21edc6d0a68238ef5493e2720669
diff --git a/metadata/md5-cache/dev-qt/qtwebkit-5.7.1 b/metadata/md5-cache/dev-qt/qtwebkit-5.7.1
index 6b0e82d7f1a1..35bb8ea06b97 100644
--- a/metadata/md5-cache/dev-qt/qtwebkit-5.7.1
+++ b/metadata/md5-cache/dev-qt/qtwebkit-5.7.1
@@ -11,5 +11,5 @@ REQUIRED_USE=?? ( gstreamer gstreamer010 multimedia )
 RESTRICT=mirror test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/community_releases/5.7/5.7.1/qtwebkit-opensource-src-5.7.1.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=e9e52d8f9b3c33300a1761c12b5eee6a
diff --git a/metadata/md5-cache/dev-qt/qtwebkit-5.9.1 b/metadata/md5-cache/dev-qt/qtwebkit-5.9.1
index 38162193b7bf..55d3ebc07e44 100644
--- a/metadata/md5-cache/dev-qt/qtwebkit-5.9.1
+++ b/metadata/md5-cache/dev-qt/qtwebkit-5.9.1
@@ -11,5 +11,5 @@ REQUIRED_USE=?? ( gstreamer multimedia )
 RESTRICT=mirror test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.1/submodules/qtwebkit-opensource-src-5.9.1.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=675068bc3ad1ecf755d14d9bc6ace647
diff --git a/metadata/md5-cache/dev-qt/qtwebsockets-5.7.1 b/metadata/md5-cache/dev-qt/qtwebsockets-5.7.1
index 339cab860b1c..2d44402990d8 100644
--- a/metadata/md5-cache/dev-qt/qtwebsockets-5.7.1
+++ b/metadata/md5-cache/dev-qt/qtwebsockets-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtnetwork-5.7.1[ssl=] qml? ( ~dev-qt/qtdecl
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qtwebsockets-opensource-src-5.7.1.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=9eb13718d8a7d4e451684d275bf2c83e
diff --git a/metadata/md5-cache/dev-qt/qtwebsockets-5.9.2 b/metadata/md5-cache/dev-qt/qtwebsockets-5.9.2
index 6d015e53e3a5..530bfabea6ce 100644
--- a/metadata/md5-cache/dev-qt/qtwebsockets-5.9.2
+++ b/metadata/md5-cache/dev-qt/qtwebsockets-5.9.2
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.2 ~dev-qt/qtnetwork-5.9.2[ssl=] qml? ( ~dev-qt/qtdecl
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.2/submodules/qtwebsockets-opensource-src-5.9.2.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=e53ff69c93d748c42bcaa1cdc58758a2
diff --git a/metadata/md5-cache/dev-qt/qtwebsockets-5.9.3 b/metadata/md5-cache/dev-qt/qtwebsockets-5.9.3
index 81d7179f121d..c555bf7b9de9 100644
--- a/metadata/md5-cache/dev-qt/qtwebsockets-5.9.3
+++ b/metadata/md5-cache/dev-qt/qtwebsockets-5.9.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.3 ~dev-qt/qtnetwork-5.9.3[ssl=] qml? ( ~dev-qt/qtdecl
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qtwebsockets-opensource-src-5.9.3.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=e53ff69c93d748c42bcaa1cdc58758a2
diff --git a/metadata/md5-cache/dev-qt/qtwebview-5.7.1 b/metadata/md5-cache/dev-qt/qtwebview-5.7.1
index 685275d0c074..6ac7ad3b7910 100644
--- a/metadata/md5-cache/dev-qt/qtwebview-5.7.1
+++ b/metadata/md5-cache/dev-qt/qtwebview-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtdeclarative-5.7.1 ~dev-qt/qtgui-5.7.1 ~de
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qtwebview-opensource-src-5.7.1.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=82697778ea3ac492e122861147c788ad
diff --git a/metadata/md5-cache/dev-qt/qtwebview-5.9.2 b/metadata/md5-cache/dev-qt/qtwebview-5.9.2
index 294587357071..6333a56b0ffe 100644
--- a/metadata/md5-cache/dev-qt/qtwebview-5.9.2
+++ b/metadata/md5-cache/dev-qt/qtwebview-5.9.2
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.2 ~dev-qt/qtdeclarative-5.9.2 ~dev-qt/qtgui-5.9.2 ~de
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.2/submodules/qtwebview-opensource-src-5.9.2.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=e8647f9198111762fe53da594ddbae5d
diff --git a/metadata/md5-cache/dev-qt/qtwebview-5.9.3 b/metadata/md5-cache/dev-qt/qtwebview-5.9.3
index 5ff3830794e5..c65f9d193f03 100644
--- a/metadata/md5-cache/dev-qt/qtwebview-5.9.3
+++ b/metadata/md5-cache/dev-qt/qtwebview-5.9.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.3 ~dev-qt/qtdeclarative-5.9.3 ~dev-qt/qtgui-5.9.3 ~de
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qtwebview-opensource-src-5.9.3.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=e8647f9198111762fe53da594ddbae5d
diff --git a/metadata/md5-cache/dev-qt/qtwidgets-5.7.1 b/metadata/md5-cache/dev-qt/qtwidgets-5.7.1
index be739df78104..c7e1f76714d9 100644
--- a/metadata/md5-cache/dev-qt/qtwidgets-5.7.1
+++ b/metadata/md5-cache/dev-qt/qtwidgets-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtgui-5.7.1[gles2=,png=,xcb?] dev-qt/qtchoo
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qtbase-opensource-src-5.7.1.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=6495bb5330a8f0e1ed3035e301a3178a
diff --git a/metadata/md5-cache/dev-qt/qtwidgets-5.9.2 b/metadata/md5-cache/dev-qt/qtwidgets-5.9.2
index 467ecbeef481..631331d7aa9f 100644
--- a/metadata/md5-cache/dev-qt/qtwidgets-5.9.2
+++ b/metadata/md5-cache/dev-qt/qtwidgets-5.9.2
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.2 ~dev-qt/qtgui-5.9.2[gles2=,png=,xcb?] gtk? ( ~dev-q
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.2/submodules/qtbase-opensource-src-5.9.2.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=508f46744af011dc2fe9c7efa9b6c933
diff --git a/metadata/md5-cache/dev-qt/qtwidgets-5.9.3 b/metadata/md5-cache/dev-qt/qtwidgets-5.9.3
index 2aa83a5b5554..6d162f8fb269 100644
--- a/metadata/md5-cache/dev-qt/qtwidgets-5.9.3
+++ b/metadata/md5-cache/dev-qt/qtwidgets-5.9.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.3 ~dev-qt/qtgui-5.9.3[gles2=,png=,xcb?] gtk? ( ~dev-q
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qtbase-opensource-src-5.9.3.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=508f46744af011dc2fe9c7efa9b6c933
diff --git a/metadata/md5-cache/dev-qt/qtx11extras-5.7.1 b/metadata/md5-cache/dev-qt/qtx11extras-5.7.1
index 1f9266fab1be..dec14ed1a7b3 100644
--- a/metadata/md5-cache/dev-qt/qtx11extras-5.7.1
+++ b/metadata/md5-cache/dev-qt/qtx11extras-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtgui-5.7.1[xcb] dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qtx11extras-opensource-src-5.7.1.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=ea23adca57db425b64a512f8402662a5
diff --git a/metadata/md5-cache/dev-qt/qtx11extras-5.9.2 b/metadata/md5-cache/dev-qt/qtx11extras-5.9.2
index c11957e842ff..f34941728522 100644
--- a/metadata/md5-cache/dev-qt/qtx11extras-5.9.2
+++ b/metadata/md5-cache/dev-qt/qtx11extras-5.9.2
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.2 ~dev-qt/qtgui-5.9.2[xcb] dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.2/submodules/qtx11extras-opensource-src-5.9.2.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=03dd3ed1dcd532fb496095a94a4187c1
diff --git a/metadata/md5-cache/dev-qt/qtx11extras-5.9.3 b/metadata/md5-cache/dev-qt/qtx11extras-5.9.3
index f5a028066b9d..b888b7093a7a 100644
--- a/metadata/md5-cache/dev-qt/qtx11extras-5.9.3
+++ b/metadata/md5-cache/dev-qt/qtx11extras-5.9.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.3 ~dev-qt/qtgui-5.9.3[xcb] dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qtx11extras-opensource-src-5.9.3.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=03dd3ed1dcd532fb496095a94a4187c1
diff --git a/metadata/md5-cache/dev-qt/qtxml-5.7.1 b/metadata/md5-cache/dev-qt/qtxml-5.7.1
index bc5eaf5c9898..c09ba6b5dd00 100644
--- a/metadata/md5-cache/dev-qt/qtxml-5.7.1
+++ b/metadata/md5-cache/dev-qt/qtxml-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qtbase-opensource-src-5.7.1.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=e6a031338a2cdc2ecba1dffe406860e7
diff --git a/metadata/md5-cache/dev-qt/qtxml-5.9.2 b/metadata/md5-cache/dev-qt/qtxml-5.9.2
index 50f2a6a95269..2e9a490728e9 100644
--- a/metadata/md5-cache/dev-qt/qtxml-5.9.2
+++ b/metadata/md5-cache/dev-qt/qtxml-5.9.2
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.2 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.2/submodules/qtbase-opensource-src-5.9.2.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=68f7d4b7249b9f5ac7dd097ffbc46119
diff --git a/metadata/md5-cache/dev-qt/qtxml-5.9.3 b/metadata/md5-cache/dev-qt/qtxml-5.9.3
index 9169c9d66f78..92e16a2e627d 100644
--- a/metadata/md5-cache/dev-qt/qtxml-5.9.3
+++ b/metadata/md5-cache/dev-qt/qtxml-5.9.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.3 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qtbase-opensource-src-5.9.3.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=68f7d4b7249b9f5ac7dd097ffbc46119
diff --git a/metadata/md5-cache/dev-qt/qtxmlpatterns-5.7.1 b/metadata/md5-cache/dev-qt/qtxmlpatterns-5.7.1
index bdb796f0cee8..9adc3756aefe 100644
--- a/metadata/md5-cache/dev-qt/qtxmlpatterns-5.7.1
+++ b/metadata/md5-cache/dev-qt/qtxmlpatterns-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtnetwork-5.7.1 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qtxmlpatterns-opensource-src-5.7.1.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=a31e531e8991eb6f6300a579ffe9de6a
diff --git a/metadata/md5-cache/dev-qt/qtxmlpatterns-5.9.2 b/metadata/md5-cache/dev-qt/qtxmlpatterns-5.9.2
index 3d145ca92874..7ccef9971eb1 100644
--- a/metadata/md5-cache/dev-qt/qtxmlpatterns-5.9.2
+++ b/metadata/md5-cache/dev-qt/qtxmlpatterns-5.9.2
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.2 ~dev-qt/qtnetwork-5.9.2 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.2/submodules/qtxmlpatterns-opensource-src-5.9.2.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=15bbfc7c1c5360523f01cc03755e547a
diff --git a/metadata/md5-cache/dev-qt/qtxmlpatterns-5.9.3 b/metadata/md5-cache/dev-qt/qtxmlpatterns-5.9.3
index 4842ec604688..aa7d5239e158 100644
--- a/metadata/md5-cache/dev-qt/qtxmlpatterns-5.9.3
+++ b/metadata/md5-cache/dev-qt/qtxmlpatterns-5.9.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.3 ~dev-qt/qtnetwork-5.9.3 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qtxmlpatterns-opensource-src-5.9.3.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	3e208d7dd0bcd8e50ced533fbebe36bf	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=15bbfc7c1c5360523f01cc03755e547a
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index 2540fc444730..2d9f87fc7709 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/bcat-0.6.2-r2 b/metadata/md5-cache/dev-ruby/bcat-0.6.2-r2
index 64caedc89c11..43fa5098ab81 100644
--- a/metadata/md5-cache/dev-ruby/bcat-0.6.2-r2
+++ b/metadata/md5-cache/dev-ruby/bcat-0.6.2-r2
@@ -4,11 +4,11 @@ DESCRIPTION=Pipe to browser utility for use at the shell and within editors
 EAPI=5
 HOMEPAGE=https://github.com/rtomayko/bcat
 IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd
 LICENSE=MIT
 RDEPEND=!!<app-accessibility/speech-tools-2.1-r3 ruby_targets_ruby22? ( dev-ruby/rack:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/rack:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/rack:*[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/bcat-0.6.2.gem
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	1a95cd8be181598c8171cf918aa225d9	ruby-utils	f8a0644cb27ba724df27b2a20a739b53	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=c3c726f8b37985e7649b115a100569ae
+_md5_=9d33c9f1350462376ab72cf5cbaaf2af
diff --git a/metadata/md5-cache/dev-ruby/childprocess-0.6.3 b/metadata/md5-cache/dev-ruby/childprocess-0.6.3
index 3a25a664a85d..c4e1754a56e7 100644
--- a/metadata/md5-cache/dev-ruby/childprocess-0.6.3
+++ b/metadata/md5-cache/dev-ruby/childprocess-0.6.3
@@ -4,11 +4,11 @@ DESCRIPTION=Solution for controlling external programs running in the background
 EAPI=5
 HOMEPAGE=https://github.com/jarib/childprocess
 IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 x86
+KEYWORDS=alpha amd64 arm ~hppa ia64 ppc ppc64 x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/ffi-1.0.11[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ffi-1.0.11[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=2
 SRC_URI=mirror://rubygems/childprocess-0.6.3.gem
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	1a95cd8be181598c8171cf918aa225d9	ruby-utils	f8a0644cb27ba724df27b2a20a739b53	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=a54b9b50613d8b1ad10b76b7937f8b78
+_md5_=a3dc604a08e2550613c1c23d857db969
diff --git a/metadata/md5-cache/dev-ruby/coderay-1.1.0-r2 b/metadata/md5-cache/dev-ruby/coderay-1.1.0-r2
index a35e9c7c41a8..3ccebe8f4194 100644
--- a/metadata/md5-cache/dev-ruby/coderay-1.1.0-r2
+++ b/metadata/md5-cache/dev-ruby/coderay-1.1.0-r2
@@ -4,11 +4,11 @@ DESCRIPTION=A Ruby library for syntax highlighting
 EAPI=5
 HOMEPAGE=http://coderay.rubychan.de/
 IUSE=elibc_FreeBSD ruby_targets_ruby22 doc test test
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~hppa ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
 REQUIRED_USE=|| ( ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/rubychan/coderay/archive/v1.1.0.tar.gz -> coderay-1.1.0.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	1a95cd8be181598c8171cf918aa225d9	ruby-utils	f8a0644cb27ba724df27b2a20a739b53	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=d471dc7259a760c67d84617817ea827d
+_md5_=be89e9ff7573bc25a0f5305b0a6d611d
diff --git a/metadata/md5-cache/dev-ruby/coderay-1.1.2 b/metadata/md5-cache/dev-ruby/coderay-1.1.2
index 9163f95cead4..ad5d14c3be33 100644
--- a/metadata/md5-cache/dev-ruby/coderay-1.1.2
+++ b/metadata/md5-cache/dev-ruby/coderay-1.1.2
@@ -4,11 +4,11 @@ DESCRIPTION=A Ruby library for syntax highlighting
 EAPI=6
 HOMEPAGE=http://coderay.rubychan.de/
 IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 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/rubychan/coderay/archive/v1.1.2.tar.gz -> coderay-1.1.2.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	1a95cd8be181598c8171cf918aa225d9	ruby-utils	f8a0644cb27ba724df27b2a20a739b53	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=d1deef55e32220a0c3caba283cd80c0d
+_md5_=26a456923113a87b9107d04b1d41ff44
diff --git a/metadata/md5-cache/dev-ruby/fakefs-0.6.0-r1 b/metadata/md5-cache/dev-ruby/fakefs-0.6.0-r1
deleted file mode 100644
index c64247d27d91..000000000000
--- a/metadata/md5-cache/dev-ruby/fakefs-0.6.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby22] >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
-DESCRIPTION=A fake filesystem. Use it in your tests
-EAPI=5
-HOMEPAGE=https://github.com/defunkt/fakefs
-IUSE=elibc_FreeBSD ruby_targets_ruby22 test
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 )
-SLOT=0
-SRC_URI=mirror://rubygems/fakefs-0.6.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	1a95cd8be181598c8171cf918aa225d9	ruby-utils	f8a0644cb27ba724df27b2a20a739b53	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=a099100af5d88ba639427a6501a6f52d
diff --git a/metadata/md5-cache/dev-ruby/gherkin-2.12.0-r3 b/metadata/md5-cache/dev-ruby/gherkin-2.12.0-r3
index 06b84db22d6a..f24c4105f069 100644
--- a/metadata/md5-cache/dev-ruby/gherkin-2.12.0-r3
+++ b/metadata/md5-cache/dev-ruby/gherkin-2.12.0-r3
@@ -4,11 +4,11 @@ DESCRIPTION=Fast Gherkin lexer and parser based on Ragel
 EAPI=5
 HOMEPAGE=https://github.com/cucumber/gherkin
 IUSE=doc test test elibc_FreeBSD ruby_targets_ruby22 doc test
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~sparc x86
+KEYWORDS=alpha amd64 arm ~hppa ia64 ppc ppc64 ~sparc x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/multi_json-1.3[ruby_targets_ruby22] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
 REQUIRED_USE=|| ( ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/cucumber/gherkin/archive/v2.12.0.tar.gz -> gherkin-2.12.0-git.tgz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	1a95cd8be181598c8171cf918aa225d9	ruby-utils	f8a0644cb27ba724df27b2a20a739b53	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=80d1d398081da6936c02d796aec0454c
+_md5_=3af1cca89a7791050280e2cb16493b1d
diff --git a/metadata/md5-cache/dev-ruby/highline-1.7.8 b/metadata/md5-cache/dev-ruby/highline-1.7.8
index 455d3d4fc633..3de3e1111ef8 100644
--- a/metadata/md5-cache/dev-ruby/highline-1.7.8
+++ b/metadata/md5-cache/dev-ruby/highline-1.7.8
@@ -4,11 +4,11 @@ DESCRIPTION=Highline is a high-level command-line IO library for ruby
 EAPI=5
 HOMEPAGE=https://github.com/JEG2/highline
 IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=alpha amd64 ~hppa ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 hppa ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=|| ( GPL-2 Ruby )
 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=mirror://rubygems/highline-1.7.8.gem
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	1a95cd8be181598c8171cf918aa225d9	ruby-utils	f8a0644cb27ba724df27b2a20a739b53	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=f58513677fb46db79e3e291605356b30
+_md5_=7aafcf4ff73087d81375072683a69619
diff --git a/metadata/md5-cache/dev-ruby/hoe-3.16.0 b/metadata/md5-cache/dev-ruby/hoe-3.16.0
index ef494a4dd5a7..d61b6e2ec22e 100644
--- a/metadata/md5-cache/dev-ruby/hoe-3.16.0
+++ b/metadata/md5-cache/dev-ruby/hoe-3.16.0
@@ -4,11 +4,11 @@ DESCRIPTION=Hoe extends rake to provide full project automation
 EAPI=5
 HOMEPAGE=https://www.zenspider.com/projects/hoe.html
 IUSE=doc test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/rake-0.8.7[ruby_targets_ruby22] <dev-ruby/rake-13.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rake-0.8.7[ruby_targets_ruby23] <dev-ruby/rake-13.0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/rake-0.8.7[ruby_targets_ruby24] <dev-ruby/rake-13.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? ( 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/hoe-3.16.0.gem
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	1a95cd8be181598c8171cf918aa225d9	ruby-utils	f8a0644cb27ba724df27b2a20a739b53	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=504c3152944f53fadcb72689cc6766e6
+_md5_=37170f49d05364e6ab8b61c5a5bc370a
diff --git a/metadata/md5-cache/dev-ruby/hpricot-0.8.6-r5 b/metadata/md5-cache/dev-ruby/hpricot-0.8.6-r5
index f5699e17e836..af034b63fb0a 100644
--- a/metadata/md5-cache/dev-ruby/hpricot-0.8.6-r5
+++ b/metadata/md5-cache/dev-ruby/hpricot-0.8.6-r5
@@ -4,11 +4,11 @@ DESCRIPTION=A fast and liberal HTML parser for Ruby
 EAPI=5
 HOMEPAGE=https://wiki.github.com/hpricot/hpricot
 IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby22? ( dev-ruby/fast_xs[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/fast_xs[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/fast_xs[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/hpricot-0.8.6.gem
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	1a95cd8be181598c8171cf918aa225d9	ruby-utils	f8a0644cb27ba724df27b2a20a739b53	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=20ca905ffb478d33ec8f1172a160336a
+_md5_=f3ccb13519f4b29cbd63cb70afddf6e8
diff --git a/metadata/md5-cache/dev-ruby/locale-2.1.0-r2 b/metadata/md5-cache/dev-ruby/locale-2.1.0-r2
index b35352dd2a0d..9e5b4fbcfec5 100644
--- a/metadata/md5-cache/dev-ruby/locale-2.1.0-r2
+++ b/metadata/md5-cache/dev-ruby/locale-2.1.0-r2
@@ -4,11 +4,11 @@ DESCRIPTION=A pure ruby library which provides basic APIs for localization
 EAPI=5
 HOMEPAGE=https://github.com/ruby-gettext/locale
 IUSE=elibc_FreeBSD ruby_targets_ruby22 doc test test
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ppc ppc64 ~sparc x86 ~x86-macos
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 ~sparc x86 ~x86-macos
 LICENSE=|| ( Ruby GPL-2 )
 RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
 REQUIRED_USE=|| ( ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/ruby-gettext/locale/archive/2.1.0.tar.gz -> locale-2.1.0-git.tgz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	1a95cd8be181598c8171cf918aa225d9	ruby-utils	f8a0644cb27ba724df27b2a20a739b53	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=68bf7893f4b4f9364934dd6044a0c531
+_md5_=d1607a7ac27cc091d9814626134511e3
diff --git a/metadata/md5-cache/dev-ruby/minitest-5.9.1 b/metadata/md5-cache/dev-ruby/minitest-5.9.1
index ed8597ac94c0..6493b1a234ab 100644
--- a/metadata/md5-cache/dev-ruby/minitest-5.9.1
+++ b/metadata/md5-cache/dev-ruby/minitest-5.9.1
@@ -4,11 +4,11 @@ DESCRIPTION=minitest/unit is a small and fast replacement for ruby's huge and sl
 EAPI=5
 HOMEPAGE=https://github.com/seattlerb/minitest
 IUSE=doc test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
-KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=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=5
 SRC_URI=mirror://rubygems/minitest-5.9.1.gem
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	1a95cd8be181598c8171cf918aa225d9	ruby-utils	f8a0644cb27ba724df27b2a20a739b53	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=edf7cfa349a2e0174f126a09d2755f4e
+_md5_=f7653864d8ead4ee8d435dd38716f457
diff --git a/metadata/md5-cache/dev-ruby/mocha-0.10.5-r2 b/metadata/md5-cache/dev-ruby/mocha-0.10.5-r2
index 72b60eefe437..0bbc17f5992a 100644
--- a/metadata/md5-cache/dev-ruby/mocha-0.10.5-r2
+++ b/metadata/md5-cache/dev-ruby/mocha-0.10.5-r2
@@ -4,11 +4,11 @@ DESCRIPTION=Mocking and stubbing using a syntax like that of JMock and SchMock
 EAPI=5
 HOMEPAGE=http://mocha.rubyforge.org/
 IUSE=test elibc_FreeBSD ruby_targets_ruby22 doc test test
-KEYWORDS=alpha amd64 hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby22? ( dev-ruby/metaclass[ruby_targets_ruby22] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
 REQUIRED_USE=|| ( ruby_targets_ruby22 )
 SLOT=0.10
 SRC_URI=mirror://rubygems/mocha-0.10.5.gem
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	1a95cd8be181598c8171cf918aa225d9	ruby-utils	f8a0644cb27ba724df27b2a20a739b53	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=556d54e1c8256d237c70a06c6736f1bc
+_md5_=e192eebf692e62d3636e07fd434417c6
diff --git a/metadata/md5-cache/dev-ruby/multi_json-1.9.3 b/metadata/md5-cache/dev-ruby/multi_json-1.9.3
index 57eabe16b6b9..a9d3c212a5c5 100644
--- a/metadata/md5-cache/dev-ruby/multi_json-1.9.3
+++ b/metadata/md5-cache/dev-ruby/multi_json-1.9.3
@@ -4,11 +4,11 @@ DESCRIPTION=A gem to provide swappable JSON backends
 EAPI=5
 HOMEPAGE=https://github.com/intridea/multi_json
 IUSE=test elibc_FreeBSD ruby_targets_ruby22 doc test test
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby22? ( || ( >=dev-ruby/json-1.4[ruby_targets_ruby22] >=dev-ruby/yajl-ruby-0.7[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
 REQUIRED_USE=|| ( ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/multi_json-1.9.3.gem
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	1a95cd8be181598c8171cf918aa225d9	ruby-utils	f8a0644cb27ba724df27b2a20a739b53	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=3589b37f439829b8bdab12149257dfef
+_md5_=7823a1f061c388ef8e0fb5258782b877
diff --git a/metadata/md5-cache/dev-ruby/mustache-1.0.2 b/metadata/md5-cache/dev-ruby/mustache-1.0.2
index 19790eb41491..c39edae8bcdb 100644
--- a/metadata/md5-cache/dev-ruby/mustache-1.0.2
+++ b/metadata/md5-cache/dev-ruby/mustache-1.0.2
@@ -4,11 +4,11 @@ DESCRIPTION=Mustache is a framework-agnostic way to render logic-free views
 EAPI=5
 HOMEPAGE=https://mustache.github.com/
 IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd
+KEYWORDS=alpha amd64 arm ~hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd
 LICENSE=MIT
 RDEPEND=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/mustache-1.0.2.gem
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	1a95cd8be181598c8171cf918aa225d9	ruby-utils	f8a0644cb27ba724df27b2a20a739b53	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=4b0a9fe43eec82ebec2147e576590dfe
+_md5_=a5ef272a13a46f976b7cdbe7cc946138
diff --git a/metadata/md5-cache/dev-ruby/ox-2.8.2 b/metadata/md5-cache/dev-ruby/ox-2.8.2
new file mode 100644
index 000000000000..242e3e79cfa5
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/ox-2.8.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DESCRIPTION=A fast XML parser and Object marshaller
+EAPI=6
+HOMEPAGE=http://www.ohler.com/ox/ https://github.com/ohler55/ox
+IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=BSD
+RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
+SLOT=0
+SRC_URI=https://github.com/ohler55/ox/archive/v2.8.2.tar.gz -> ox-2.8.2.tar.gz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	1a95cd8be181598c8171cf918aa225d9	ruby-utils	f8a0644cb27ba724df27b2a20a739b53	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=76ef4eadcb3604a51a9cfee8de0a5f14
diff --git a/metadata/md5-cache/dev-ruby/rack-1.6.7 b/metadata/md5-cache/dev-ruby/rack-1.6.7
index a7b36e7a2e39..3e1950a15b2c 100644
--- a/metadata/md5-cache/dev-ruby/rack-1.6.7
+++ b/metadata/md5-cache/dev-ruby/rack-1.6.7
@@ -4,11 +4,11 @@ DESCRIPTION=A modular Ruby webserver interface
 EAPI=6
 HOMEPAGE=https://rack.github.com/
 IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby22? ( virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/ruby-ssl[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/ruby-ssl[ruby_targets_ruby24] ) !<dev-ruby/rack-1.4.5-r1:1.4 !<dev-ruby/rack-1.5.2-r4:1.5 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=1.6
 SRC_URI=mirror://rubygems/rack-1.6.7.gem
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	1a95cd8be181598c8171cf918aa225d9	ruby-utils	f8a0644cb27ba724df27b2a20a739b53	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=0e78a779edc415e983235f1c53f4e1ac
+_md5_=e76d8e4f3496e9f589702b94e5fb5fbb
diff --git a/metadata/md5-cache/dev-ruby/rainbow-2.2.2 b/metadata/md5-cache/dev-ruby/rainbow-2.2.2
index a875746af343..837e07a4a189 100644
--- a/metadata/md5-cache/dev-ruby/rainbow-2.2.2
+++ b/metadata/md5-cache/dev-ruby/rainbow-2.2.2
@@ -4,11 +4,11 @@ DESCRIPTION=Colorize printed text on ANSI terminals
 EAPI=6
 HOMEPAGE=https://github.com/sickill/rainbow
 IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=amd64 ~hppa ~ppc ~sparc x86
+KEYWORDS=amd64 hppa ~ppc ~sparc 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=2
 SRC_URI=https://github.com/sickill/rainbow/archive/v2.2.2.tar.gz -> rainbow-git-2.2.2.tgz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	1a95cd8be181598c8171cf918aa225d9	ruby-utils	f8a0644cb27ba724df27b2a20a739b53	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=e87f79cad7875642f210097ee8440ff6
+_md5_=0deec37c7b4de0aca68afdfa7e77ccec
diff --git a/metadata/md5-cache/dev-ruby/rake-compiler-1.0.2 b/metadata/md5-cache/dev-ruby/rake-compiler-1.0.2
index 581d8cd87401..0705ea47955e 100644
--- a/metadata/md5-cache/dev-ruby/rake-compiler-1.0.2
+++ b/metadata/md5-cache/dev-ruby/rake-compiler-1.0.2
@@ -4,11 +4,11 @@ DESCRIPTION=Provide a standard and simplified way to build and package Ruby exte
 EAPI=5
 HOMEPAGE=https://github.com/luislavena/rake-compiler
 IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby22? ( dev-ruby/rake[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/rake[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/rake[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=https://github.com/luislavena/rake-compiler/archive/v1.0.2.tar.gz -> rake-compiler-1.0.2.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	1a95cd8be181598c8171cf918aa225d9	ruby-utils	f8a0644cb27ba724df27b2a20a739b53	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=22f2b01ffae4f8bb054e1ccc23c60d3e
+_md5_=43caee5eeae870c0d1be56faef01fa32
diff --git a/metadata/md5-cache/dev-ruby/redcloth-4.2.9-r4 b/metadata/md5-cache/dev-ruby/redcloth-4.2.9-r4
index d36e01e79551..eaef0f79aacc 100644
--- a/metadata/md5-cache/dev-ruby/redcloth-4.2.9-r4
+++ b/metadata/md5-cache/dev-ruby/redcloth-4.2.9-r4
@@ -4,11 +4,11 @@ DESCRIPTION=A module for using Textile in Ruby
 EAPI=5
 HOMEPAGE=http://redcloth.org/
 IUSE=elibc_FreeBSD ruby_targets_ruby22 doc test test
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~hppa ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
 REQUIRED_USE=|| ( ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/jgarber/redcloth/tarball/v4.2.9 -> RedCloth-git-4.2.9.tgz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	1a95cd8be181598c8171cf918aa225d9	ruby-utils	f8a0644cb27ba724df27b2a20a739b53	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=c0917d48c8a9c6ed2bc5fc3f9b5cf758
+_md5_=a47a13d9d0b14f264e701c0b3f8c7c84
diff --git a/metadata/md5-cache/dev-ruby/rspec-core-2.14.8-r4 b/metadata/md5-cache/dev-ruby/rspec-core-2.14.8-r4
index 10e814064139..32a78d8bba3a 100644
--- a/metadata/md5-cache/dev-ruby/rspec-core-2.14.8-r4
+++ b/metadata/md5-cache/dev-ruby/rspec-core-2.14.8-r4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( test? ( >=dev-ruby/nokogiri-1.5.2[ruby_targets_ruby22] dev-ruby/syntax[ruby_targets_ruby22] >=dev-ruby/zentest-4.6.2[ruby_targets_ruby22] >=dev-ruby/rspec-expectations-2.14.0:2[ruby_targets_ruby22] >=dev-ruby/rspec-mocks-2.12.0:2[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
+DEPEND=ruby_targets_ruby22? ( test? ( >=dev-ruby/nokogiri-1.5.2[ruby_targets_ruby22] dev-ruby/syntax[ruby_targets_ruby22] >=dev-ruby/zentest-4.6.2[ruby_targets_ruby22] >=dev-ruby/rspec-expectations-2.14.0:2[ruby_targets_ruby22] >=dev-ruby/rspec-mocks-2.12.0:2[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
 DESCRIPTION=A Behaviour Driven Development (BDD) framework for Ruby
 EAPI=5
 HOMEPAGE=https://github.com/rspec/rspec-core
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( ruby_targets_ruby22 )
 SLOT=2
 SRC_URI=https://github.com/rspec/rspec-core/archive/v2.14.8.tar.gz -> rspec-core-2.14.8-git.tgz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	1a95cd8be181598c8171cf918aa225d9	ruby-utils	f8a0644cb27ba724df27b2a20a739b53	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=8faf66f3a0db6b8732882b282ff468fb
+_md5_=ba688496c8d547821a4424359693e6a8
diff --git a/metadata/md5-cache/dev-ruby/ruby-gettext-3.1.1 b/metadata/md5-cache/dev-ruby/ruby-gettext-3.1.1
deleted file mode 100644
index 2da9ae78309d..000000000000
--- a/metadata/md5-cache/dev-ruby/ruby-gettext-3.1.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/locale-2.0.5[ruby_targets_ruby22] dev-ruby/text[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) dev-ruby/racc[ruby_targets_ruby22] ) ruby_targets_ruby22? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby22] dev-ruby/test-unit-rr[ruby_targets_ruby22] ) ) sys-devel/gettext ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
-DESCRIPTION=Native Language Support Library and Tools modeled after GNU gettext package
-EAPI=5
-HOMEPAGE=http://www.yotabanana.com/hiki/ruby-gettext.html
-IUSE=doc test test elibc_FreeBSD ruby_targets_ruby22 doc test test
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~sparc
-LICENSE=Ruby
-RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/locale-2.0.5[ruby_targets_ruby22] dev-ruby/text[ruby_targets_ruby22] ) sys-devel/gettext ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 )
-SLOT=0
-SRC_URI=mirror://rubygems/gettext-3.1.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	1a95cd8be181598c8171cf918aa225d9	ruby-utils	f8a0644cb27ba724df27b2a20a739b53	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=943fc3d9df1c9e6e7dddac07cc45dd48
diff --git a/metadata/md5-cache/dev-ruby/sqlite3-1.3.11 b/metadata/md5-cache/dev-ruby/sqlite3-1.3.11
index eff519a6636f..20b2e440eb36 100644
--- a/metadata/md5-cache/dev-ruby/sqlite3-1.3.11
+++ b/metadata/md5-cache/dev-ruby/sqlite3-1.3.11
@@ -4,11 +4,11 @@ DESCRIPTION=An extension library to access a SQLite database from Ruby
 EAPI=5
 HOMEPAGE=https://github.com/sparklemotion/sqlite3-ruby
 IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
-KEYWORDS=amd64 ~arm hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD
 RDEPEND=>=dev-db/sqlite-3.6.16:3 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/sqlite3-1.3.11.gem
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	1a95cd8be181598c8171cf918aa225d9	ruby-utils	f8a0644cb27ba724df27b2a20a739b53	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=6a296a83b97319abf4e9bb3839fdfa36
+_md5_=849f68c48096e00dffb169116918cc6d
diff --git a/metadata/md5-cache/dev-ruby/test-unit-2.5.5-r2 b/metadata/md5-cache/dev-ruby/test-unit-2.5.5-r2
index eb5e883b0d74..18cd52b58a44 100644
--- a/metadata/md5-cache/dev-ruby/test-unit-2.5.5-r2
+++ b/metadata/md5-cache/dev-ruby/test-unit-2.5.5-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
 DESCRIPTION=An improved version of the Test::Unit framework from Ruby 1.8
 EAPI=5
 HOMEPAGE=http://test-unit.rubyforge.org/
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( ruby_targets_ruby22 )
 SLOT=2
 SRC_URI=mirror://rubygems/test-unit-2.5.5.gem
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	1a95cd8be181598c8171cf918aa225d9	ruby-utils	f8a0644cb27ba724df27b2a20a739b53	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=2a98d7b610631dafcef6dd19c60aafab
+_md5_=d0e3f1678ed08e4c64b6a880c30ac281
diff --git a/metadata/md5-cache/dev-ruby/test-unit-3.1.9 b/metadata/md5-cache/dev-ruby/test-unit-3.1.9
index c5ef66771ff7..665dee137da3 100644
--- a/metadata/md5-cache/dev-ruby/test-unit-3.1.9
+++ b/metadata/md5-cache/dev-ruby/test-unit-3.1.9
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) test? ( ruby_targets_ruby22? ( dev-ruby/power_assert[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/power_assert[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) 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] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( dev-ruby/power_assert[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/power_assert[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/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[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=An xUnit family unit testing framework for Ruby
 EAPI=5
 HOMEPAGE=https://rubygems.org/gems/test-unit
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=2
 SRC_URI=mirror://rubygems/test-unit-3.1.9.gem
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	1a95cd8be181598c8171cf918aa225d9	ruby-utils	f8a0644cb27ba724df27b2a20a739b53	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=afe7dbf4a6a6611327ff97903aaa677d
+_md5_=b82cd5fbffe4775d61154e7f22f07256
diff --git a/metadata/md5-cache/dev-ruby/yard-0.8.7.3 b/metadata/md5-cache/dev-ruby/yard-0.8.7.3
deleted file mode 100644
index 273e079a4228..000000000000
--- a/metadata/md5-cache/dev-ruby/yard-0.8.7.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( doc? ( || ( dev-ruby/bluecloth[ruby_targets_ruby22] dev-ruby/maruku[ruby_targets_ruby22] dev-ruby/rdiscount[ruby_targets_ruby22] dev-ruby/kramdown[ruby_targets_ruby22] ) ) test? ( dev-ruby/rack[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby22] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
-DESCRIPTION=Documentation generation tool for the Ruby programming language
-EAPI=5
-HOMEPAGE=http://yardoc.org/
-IUSE=elibc_FreeBSD ruby_targets_ruby22 doc test test
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 )
-SLOT=0
-SRC_URI=https://github.com/lsegal/yard/archive/0.8.7.3.tar.gz -> yard-0.8.7.3-git.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	1a95cd8be181598c8171cf918aa225d9	ruby-utils	f8a0644cb27ba724df27b2a20a739b53	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=34db9e753d5ba78ac9437920fade0a5e
diff --git a/metadata/md5-cache/dev-ruby/yard-0.8.7.6 b/metadata/md5-cache/dev-ruby/yard-0.8.7.6
deleted file mode 100644
index 2e4843f9aa11..000000000000
--- a/metadata/md5-cache/dev-ruby/yard-0.8.7.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( doc? ( || ( dev-ruby/maruku[ruby_targets_ruby22] dev-ruby/rdiscount[ruby_targets_ruby22] dev-ruby/bluecloth[ruby_targets_ruby22] dev-ruby/kramdown[ruby_targets_ruby22] ) ) ) ruby_targets_ruby23? ( doc? ( || ( dev-ruby/maruku[ruby_targets_ruby23] dev-ruby/rdiscount[ruby_targets_ruby23] dev-ruby/bluecloth[ruby_targets_ruby23] dev-ruby/kramdown[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/rspec:2[ruby_targets_ruby22] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby23] >=dev-ruby/rspec-core-2.14.8-r2[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=Documentation generation tool for the Ruby programming language
-EAPI=5
-HOMEPAGE=http://yardoc.org/
-IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=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=https://github.com/lsegal/yard/archive/v0.8.7.6.tar.gz -> yard-0.8.7.6-git.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	1a95cd8be181598c8171cf918aa225d9	ruby-utils	f8a0644cb27ba724df27b2a20a739b53	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=8f8e1abe781f9e2b335530efae4e58f7
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 5cf91214273a..a1326ddebcae 100644
Binary files a/metadata/md5-cache/dev-util/Manifest.gz and b/metadata/md5-cache/dev-util/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-util/android-studio-3.0.0.18.171.4408382 b/metadata/md5-cache/dev-util/android-studio-3.0.0.18.171.4408382
index 06c799308a93..ca6d5f70cc3b 100644
--- a/metadata/md5-cache/dev-util/android-studio-3.0.0.18.171.4408382
+++ b/metadata/md5-cache/dev-util/android-studio-3.0.0.18.171.4408382
@@ -4,11 +4,11 @@ DESCRIPTION=A new Android development environment based on IntelliJ IDEA
 EAPI=6
 HOMEPAGE=http://developer.android.com/sdk/installing/studio.html
 IUSE=selinux elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jdk-1.7 selinux? ( sec-policy/selinux-android ) >=app-arch/bzip2-1.0.6-r4 dev-java/commons-logging:0 dev-java/log4j:0 >=dev-libs/expat-2.1.0-r3 >=dev-libs/libffi-3.0.13-r1 >=media-libs/fontconfig-2.10.92 >=media-libs/freetype-2.5.5 >=media-libs/libpng-1.2.51 >=media-libs/mesa-10.2.8 || ( gnome-extra/zenity kde-apps/kdialog x11-apps/xmessage x11-libs/libnotify ) >=sys-libs/ncurses-5.9-r3:5/5[tinfo] >=sys-libs/zlib-1.2.8-r1 >=x11-libs/libX11-1.6.2 >=x11-libs/libXau-1.0.7-r1 >=x11-libs/libXdamage-1.1.4-r1 >=x11-libs/libXdmcp-1.1.1-r1 >=x11-libs/libXext-1.3.2 >=x11-libs/libXfixes-5.0.1 >=x11-libs/libXrender-0.9.8 >=x11-libs/libXxf86vm-1.1.3 >=x11-libs/libdrm-2.4.46 >=x11-libs/libxcb-1.9.1 >=x11-libs/libxshmfence-1.1 >=dev-java/java-config-2.2.0-r3
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://dl.google.com/dl/android/studio/ide-zips/3.0.0.18/android-studio-ide-171.4408382-linux.zip
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=0c26a6bfab738759f00b4384c26e7b39
+_md5_=9dcf259fd69b00e457c308695a211e00
diff --git a/metadata/md5-cache/dev-util/android-studio-3.0.1.0.171.4443003 b/metadata/md5-cache/dev-util/android-studio-3.0.1.0.171.4443003
new file mode 100644
index 000000000000..30bc021ce807
--- /dev/null
+++ b/metadata/md5-cache/dev-util/android-studio-3.0.1.0.171.4443003
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install preinst prepare setup
+DEPEND=app-arch/zip dev-java/commons-logging:0 dev-java/log4j:0 >=dev-java/java-config-2.2.0-r3
+DESCRIPTION=A new Android development environment based on IntelliJ IDEA
+EAPI=6
+HOMEPAGE=http://developer.android.com/sdk/installing/studio.html
+IUSE=selinux elibc_FreeBSD
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jdk-1.7 selinux? ( sec-policy/selinux-android ) >=app-arch/bzip2-1.0.6-r4 dev-java/commons-logging:0 dev-java/log4j:0 >=dev-libs/expat-2.1.0-r3 >=dev-libs/libffi-3.0.13-r1 >=media-libs/fontconfig-2.10.92 >=media-libs/freetype-2.5.5 >=media-libs/libpng-1.2.51 >=media-libs/mesa-10.2.8 || ( gnome-extra/zenity kde-apps/kdialog x11-apps/xmessage x11-libs/libnotify ) >=sys-libs/ncurses-5.9-r3:5/5[tinfo] >=sys-libs/zlib-1.2.8-r1 >=x11-libs/libX11-1.6.2 >=x11-libs/libXau-1.0.7-r1 >=x11-libs/libXdamage-1.1.4-r1 >=x11-libs/libXdmcp-1.1.1-r1 >=x11-libs/libXext-1.3.2 >=x11-libs/libXfixes-5.0.1 >=x11-libs/libXrender-0.9.8 >=x11-libs/libXxf86vm-1.1.3 >=x11-libs/libdrm-2.4.46 >=x11-libs/libxcb-1.9.1 >=x11-libs/libxshmfence-1.1 >=dev-java/java-config-2.2.0-r3
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://dl.google.com/dl/android/studio/ide-zips/3.0.1.0/android-studio-ide-171.4443003-linux.zip
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=37f011419ee733e196cfc19ee2be665e
diff --git a/metadata/md5-cache/dev-util/aruba-0.5.4-r1 b/metadata/md5-cache/dev-util/aruba-0.5.4-r1
index dd2135f708ec..ec0c87f34b78 100644
--- a/metadata/md5-cache/dev-util/aruba-0.5.4-r1
+++ b/metadata/md5-cache/dev-util/aruba-0.5.4-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Cucumber steps for driving out command line applications
 EAPI=5
 HOMEPAGE=https://github.com/cucumber/aruba
 IUSE=test elibc_FreeBSD ruby_targets_ruby22 test test
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~sparc x86
+KEYWORDS=alpha amd64 arm ~hppa ia64 ppc ppc64 ~sparc x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/childprocess-0.3.6[ruby_targets_ruby22] >=dev-ruby/rspec-expectations-2.7:2[ruby_targets_ruby22] >=dev-util/cucumber-1.1.1[ruby_targets_ruby22] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
 REQUIRED_USE=|| ( ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/aruba-0.5.4.gem
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	1a95cd8be181598c8171cf918aa225d9	ruby-utils	f8a0644cb27ba724df27b2a20a739b53	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=7025ef109ffd07e57c7df8b60b145c6d
+_md5_=cbb23773b3f65f5fa9175fb629ca1fc7
diff --git a/metadata/md5-cache/dev-util/cucumber-1.3.20-r1 b/metadata/md5-cache/dev-util/cucumber-1.3.20-r1
index 92f6672f0a7f..5fca8752d45e 100644
--- a/metadata/md5-cache/dev-util/cucumber-1.3.20-r1
+++ b/metadata/md5-cache/dev-util/cucumber-1.3.20-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Executable feature scenarios
 EAPI=5
 HOMEPAGE=https://github.com/aslakhellesoy/cucumber/wikis
 IUSE=examples test test elibc_FreeBSD ruby_targets_ruby22 test test
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~sparc x86
+KEYWORDS=alpha amd64 arm ~hppa ia64 ppc ppc64 ~sparc x86
 LICENSE=Ruby
 RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/builder-2.1.2:*[ruby_targets_ruby22] >=dev-ruby/diff-lcs-1.1.3[ruby_targets_ruby22] >=dev-ruby/gherkin-2.12.0:0[ruby_targets_ruby22] >=dev-ruby/multi_json-1.7.5[ruby_targets_ruby22] >=dev-ruby/multi_test-0.1.2[ruby_targets_ruby22] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
 REQUIRED_USE=|| ( ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/cucumber-1.3.20.gem
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	1a95cd8be181598c8171cf918aa225d9	ruby-utils	f8a0644cb27ba724df27b2a20a739b53	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=44817b8bbdf01016bb98ebd5eca559b9
+_md5_=06b0395bfcda221a6d94eac6f48aba87
diff --git a/metadata/md5-cache/gnome-extra/Manifest.gz b/metadata/md5-cache/gnome-extra/Manifest.gz
index 46a5de1d3fa4..14336fa70c49 100644
Binary files a/metadata/md5-cache/gnome-extra/Manifest.gz and b/metadata/md5-cache/gnome-extra/Manifest.gz differ
diff --git a/metadata/md5-cache/gnome-extra/cinnamon-3.6.6 b/metadata/md5-cache/gnome-extra/cinnamon-3.6.6
new file mode 100644
index 000000000000..e8ef808435a4
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/cinnamon-3.6.6
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_targets_python3_4? ( dev-lang/python:3.4[xml] ) python_targets_python3_5? ( dev-lang/python:3.5[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] app-accessibility/at-spi2-atk:2 app-misc/ca-certificates dev-libs/dbus-glib >=dev-libs/glib-2.35.0:2[dbus] >=dev-libs/gobject-introspection-0.10.1:= >=dev-libs/json-glib-0.13.2 >=dev-libs/libcroco-0.6.2:0.6 dev-libs/libxml2:2 gnome-base/gconf:2[introspection] gnome-base/librsvg >=gnome-extra/cinnamon-desktop-2.4:0=[introspection] >=gnome-extra/cinnamon-menus-3.0[introspection] >=gnome-extra/cjs-3.2.0 >=media-libs/clutter-1.10:1.0[introspection] media-libs/cogl:1.0=[introspection] >=gnome-base/gsettings-desktop-schemas-2.91.91 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 net-libs/libsoup:2.4[introspection] >=sys-auth/polkit-0.100[introspection] x11-libs/gdk-pixbuf:2[introspection] >=x11-libs/gtk+-3.9.12:3[introspection] x11-libs/pango[introspection] >=x11-libs/startup-notification-0.11 x11-libs/libX11 >=x11-libs/libXfixes-5.0 >=x11-wm/muffin-3.2.0[introspection] networkmanager? ( gnome-base/libgnome-keyring >=net-misc/networkmanager-0.8.999:=[introspection] ) python_targets_python2_7? ( dev-python/polib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-util/gtk-doc >=dev-util/intltool-0.4 >=sys-devel/gettext-0.17 virtual/pkgconfig gnome-base/gnome-common !!=dev-lang/spidermonkey-1.8.2* >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A fork of GNOME Shell with layout similar to GNOME 2
+EAPI=6
+HOMEPAGE=http://developer.linuxmint.com/
+IUSE=+nls +networkmanager python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_targets_python3_4? ( dev-lang/python:3.4[xml] ) python_targets_python3_5? ( dev-lang/python:3.5[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] app-accessibility/at-spi2-atk:2 app-misc/ca-certificates dev-libs/dbus-glib >=dev-libs/glib-2.35.0:2[dbus] >=dev-libs/gobject-introspection-0.10.1:= >=dev-libs/json-glib-0.13.2 >=dev-libs/libcroco-0.6.2:0.6 dev-libs/libxml2:2 gnome-base/gconf:2[introspection] gnome-base/librsvg >=gnome-extra/cinnamon-desktop-2.4:0=[introspection] >=gnome-extra/cinnamon-menus-3.0[introspection] >=gnome-extra/cjs-3.2.0 >=media-libs/clutter-1.10:1.0[introspection] media-libs/cogl:1.0=[introspection] >=gnome-base/gsettings-desktop-schemas-2.91.91 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 net-libs/libsoup:2.4[introspection] >=sys-auth/polkit-0.100[introspection] x11-libs/gdk-pixbuf:2[introspection] >=x11-libs/gtk+-3.9.12:3[introspection] x11-libs/pango[introspection] >=x11-libs/startup-notification-0.11 x11-libs/libX11 >=x11-libs/libXfixes-5.0 >=x11-wm/muffin-3.2.0[introspection] networkmanager? ( gnome-base/libgnome-keyring >=net-misc/networkmanager-0.8.999:=[introspection] ) >=gnome-base/dconf-0.4.1 >=gnome-base/libgnomekbd-2.91.4[introspection] || ( sys-power/upower[introspection] sys-power/upower-pm-utils[introspection] ) >=gnome-extra/cinnamon-session-2.4 >=gnome-extra/cinnamon-settings-daemon-2.4 >=sys-apps/accountsservice-0.6.14[introspection] >=app-accessibility/caribou-0.3 x11-misc/xdg-utils x11-libs/xapps[introspection] dev-python/dbus-python[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pygobject:3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( dev-python/gconf-python:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/pexpect[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/pycairo[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/pyinotify[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/pypam[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) x11-themes/gnome-themes-standard x11-themes/adwaita-icon-theme >=gnome-extra/nemo-2.4 >=gnome-extra/cinnamon-control-center-2.4 >=gnome-extra/cinnamon-screensaver-2.4 gnome-extra/polkit-gnome networkmanager? ( gnome-extra/nm-applet net-misc/mobile-broadband-provider-info sys-libs/timezone-data ) nls? ( >=gnome-extra/cinnamon-translations-2.4 )
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 ) || ( python_targets_python2_7 ) || ( python_targets_python3_4 python_targets_python3_5 )
+SLOT=0
+SRC_URI=https://github.com/linuxmint/Cinnamon/archive/3.6.6.tar.gz -> cinnamon-3.6.6.tar.gz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=7227b04d391a0369b9a25bcaf1400015
diff --git a/metadata/md5-cache/gnome-extra/cinnamon-control-center-3.6.5 b/metadata/md5-cache/gnome-extra/cinnamon-control-center-3.6.5
new file mode 100644
index 000000000000..f480cf9bceec
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/cinnamon-control-center-3.6.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/glib-2.31:2 dev-libs/libxml2:2 >=gnome-base/libgnomekbd-2.91.91:0= >=gnome-extra/cinnamon-desktop-1.0:0= >=gnome-extra/cinnamon-menus-1.0:0= >=gnome-extra/cinnamon-settings-daemon-1.0:0= >=gnome-extra/nm-applet-0.9.8 media-libs/fontconfig >=net-misc/modemmanager-0.7 >=net-misc/networkmanager-0.9.8:=[modemmanager] >=sys-auth/polkit-0.103 >=x11-libs/gdk-pixbuf-2.23.0:2 >=x11-libs/gtk+-3.4.1:3 >=x11-libs/libnotify-0.7.3:0= x11-libs/libX11 x11-libs/libxklavier colord? ( >=x11-misc/colord-0.1.14:0= ) cups? ( >=net-print/cups-1.4[dbus] ) input_devices_wacom? ( >=dev-libs/libwacom-0.7 >=x11-libs/gtk+-3.8:3 >=x11-libs/libXi-1.2 ) app-text/iso-codes x11-proto/xproto x11-proto/xf86miscproto x11-proto/kbproto dev-libs/libxslt >=dev-util/intltool-0.40.1 >=sys-devel/gettext-0.17 virtual/pkgconfig gnome-base/gnome-common sys-devel/autoconf-archive >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Cinnamons's main interface to configure various aspects of the desktop
+EAPI=6
+HOMEPAGE=http://cinnamon.linuxmint.com/
+IUSE=+colord +cups debug input_devices_wacom systemd
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/glib-2.31:2 dev-libs/libxml2:2 >=gnome-base/libgnomekbd-2.91.91:0= >=gnome-extra/cinnamon-desktop-1.0:0= >=gnome-extra/cinnamon-menus-1.0:0= >=gnome-extra/cinnamon-settings-daemon-1.0:0= >=gnome-extra/nm-applet-0.9.8 media-libs/fontconfig >=net-misc/modemmanager-0.7 >=net-misc/networkmanager-0.9.8:=[modemmanager] >=sys-auth/polkit-0.103 >=x11-libs/gdk-pixbuf-2.23.0:2 >=x11-libs/gtk+-3.4.1:3 >=x11-libs/libnotify-0.7.3:0= x11-libs/libX11 x11-libs/libxklavier colord? ( >=x11-misc/colord-0.1.14:0= ) cups? ( >=net-print/cups-1.4[dbus] ) input_devices_wacom? ( >=dev-libs/libwacom-0.7 >=x11-libs/gtk+-3.8:3 >=x11-libs/libXi-1.2 ) systemd? ( >=sys-apps/systemd-31 ) !systemd? ( app-admin/openrc-settingsd sys-auth/elogind ) x11-themes/adwaita-icon-theme colord? ( >=gnome-extra/gnome-color-manager-3 ) cups? ( app-admin/system-config-printer net-print/cups-pk-helper ) input_devices_wacom? ( gnome-extra/cinnamon-settings-daemon[input_devices_wacom] )
+SLOT=0
+SRC_URI=https://github.com/linuxmint/cinnamon-control-center/archive/3.6.5.tar.gz -> cinnamon-control-center-3.6.5.tar.gz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=c01fcf54f303c602930f7906407f1be3
diff --git a/metadata/md5-cache/gnome-extra/cinnamon-desktop-3.6.2 b/metadata/md5-cache/gnome-extra/cinnamon-desktop-3.6.2
new file mode 100644
index 000000000000..9ef3d586ab73
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/cinnamon-desktop-3.6.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
+DEPEND=python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[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(+)?] >=dev-libs/glib-2.37.3:2[dbus] media-sound/pulseaudio[glib] >=x11-libs/gdk-pixbuf-2.22:2[introspection?] >=x11-libs/gtk+-3.3.16:3[introspection?] >=x11-libs/libXext-1.1 >=x11-libs/libXrandr-1.3 x11-libs/cairo:=[X] x11-libs/libX11 x11-libs/libxkbfile x11-misc/xkeyboard-config >=gnome-base/gsettings-desktop-schemas-3.5.91 introspection? ( >=dev-libs/gobject-introspection-0.9.7:= ) sys-apps/accountsservice >=dev-util/gtk-doc-am-1.4 >=dev-util/intltool-0.40.6 gnome-base/gnome-common x11-proto/randrproto x11-proto/xproto virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A collection of libraries and utilites used by Cinnamon
+EAPI=6
+HOMEPAGE=http://cinnamon.linuxmint.com/
+IUSE=+introspection systemd python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ FDL-1.1+ LGPL-2+
+RDEPEND=python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[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(+)?] >=dev-libs/glib-2.37.3:2[dbus] media-sound/pulseaudio[glib] >=x11-libs/gdk-pixbuf-2.22:2[introspection?] >=x11-libs/gtk+-3.3.16:3[introspection?] >=x11-libs/libXext-1.1 >=x11-libs/libXrandr-1.3 x11-libs/cairo:=[X] x11-libs/libX11 x11-libs/libxkbfile x11-misc/xkeyboard-config >=gnome-base/gsettings-desktop-schemas-3.5.91 introspection? ( >=dev-libs/gobject-introspection-0.9.7:= ) sys-apps/accountsservice dev-python/pygobject:3[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(+)?]
+REQUIRED_USE=^^ ( python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) 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/4
+SRC_URI=https://github.com/linuxmint/cinnamon-desktop/archive/3.6.2.tar.gz -> cinnamon-desktop-3.6.2.tar.gz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=12003b1c90144d230a6b4b5895cd0f67
diff --git a/metadata/md5-cache/gnome-extra/cinnamon-menus-3.6.0 b/metadata/md5-cache/gnome-extra/cinnamon-menus-3.6.0
new file mode 100644
index 000000000000..2a1d578559f8
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/cinnamon-menus-3.6.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/glib-2.29.15:2 introspection? ( >=dev-libs/gobject-introspection-0.9.5:= ) dev-libs/gobject-introspection-common >=dev-util/intltool-0.40 gnome-base/gnome-common sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Cinnamon's library for the Desktop Menu fd.o specification
+EAPI=6
+HOMEPAGE=http://cinnamon.linuxmint.com/
+IUSE=debug +introspection
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ LGPL-2+
+RDEPEND=>=dev-libs/glib-2.29.15:2 introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
+SLOT=0
+SRC_URI=https://github.com/linuxmint/cinnamon-menus/archive/3.6.0.tar.gz -> cinnamon-menus-3.6.0.tar.gz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=d78ad126b76bacb024688e57eefb7c2d
diff --git a/metadata/md5-cache/gnome-extra/cinnamon-screensaver-3.6.1 b/metadata/md5-cache/gnome-extra/cinnamon-screensaver-3.6.1
new file mode 100644
index 000000000000..3333a2839159
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/cinnamon-screensaver-3.6.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
+DEPEND=>=dev-libs/glib-2.37.3:2[dbus] >=x11-libs/gtk+-3.1.4:3[introspection] >=gnome-extra/cinnamon-desktop-2.6.3:0=[systemd=] >=gnome-base/gsettings-desktop-schemas-0.1.7 >=gnome-base/libgnomekbd-3.6 >=dev-libs/dbus-glib-0.78 net-libs/webkit-gtk:4[introspection] sys-apps/dbus x11-libs/libxklavier x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/libXScrnSaver x11-libs/libXxf86misc x11-libs/libXxf86vm x11-themes/adwaita-icon-theme !systemd? ( sys-auth/elogind ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[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(+)?] pam? ( virtual/pam ) systemd? ( >=sys-apps/systemd-31:0= ) >=dev-util/intltool-0.35 gnome-base/gnome-common sys-devel/gettext virtual/pkgconfig x11-proto/xextproto x11-proto/randrproto x11-proto/scrnsaverproto x11-proto/xf86miscproto doc? ( app-text/xmlto app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.4 ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Screensaver for Cinnamon
+EAPI=6
+HOMEPAGE=http://cinnamon.linuxmint.com/
+IUSE=debug doc pam systemd python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/glib-2.37.3:2[dbus] >=x11-libs/gtk+-3.1.4:3[introspection] >=gnome-extra/cinnamon-desktop-2.6.3:0=[systemd=] >=gnome-base/gsettings-desktop-schemas-0.1.7 >=gnome-base/libgnomekbd-3.6 >=dev-libs/dbus-glib-0.78 net-libs/webkit-gtk:4[introspection] sys-apps/dbus x11-libs/libxklavier x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/libXScrnSaver x11-libs/libXxf86misc x11-libs/libXxf86vm x11-themes/adwaita-icon-theme !systemd? ( sys-auth/elogind ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[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(+)?] pam? ( virtual/pam ) systemd? ( >=sys-apps/systemd-31:0= ) !~gnome-extra/cinnamon-1.8.8.1 dev-python/pygobject:3[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(+)?] dev-python/setproctitle[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(+)?] dev-python/xapp[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(+)?] dev-python/psutil[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(+)?]
+REQUIRED_USE=^^ ( python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) 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/linuxmint/cinnamon-screensaver/archive/3.6.1.tar.gz -> cinnamon-screensaver-3.6.1.tar.gz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=e2c90c5645fb7176e576469f7dbe646d
diff --git a/metadata/md5-cache/gnome-extra/cinnamon-session-3.6.1 b/metadata/md5-cache/gnome-extra/cinnamon-session-3.6.1
new file mode 100644
index 000000000000..f9fb4beb6c64
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/cinnamon-session-3.6.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/dbus-glib-0.88 >=dev-libs/glib-2.37.3:2 media-libs/libcanberra x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3:3 x11-libs/cairo x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libXcomposite x11-libs/libXext x11-libs/libXrender x11-libs/libXtst x11-libs/pango[X] virtual/opengl systemd? ( >=sys-apps/systemd-183 ) !systemd? ( >=sys-power/upower-pm-utils-0.9.23 ) dev-libs/libxslt >=dev-util/intltool-0.40.6 virtual/pkgconfig doc? ( app-text/xmlto ) gnome-base/gnome-common >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Cinnamon session manager
+EAPI=6
+HOMEPAGE=http://cinnamon.linuxmint.com/
+IUSE=doc ipv6 systemd
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ FDL-1.1+ LGPL-2+
+RDEPEND=>=dev-libs/dbus-glib-0.88 >=dev-libs/glib-2.37.3:2 media-libs/libcanberra x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3:3 x11-libs/cairo x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libXcomposite x11-libs/libXext x11-libs/libXrender x11-libs/libXtst x11-libs/pango[X] virtual/opengl systemd? ( >=sys-apps/systemd-183 ) !systemd? ( >=sys-power/upower-pm-utils-0.9.23 ) >=gnome-extra/cinnamon-desktop-2.6[systemd=] !systemd? ( sys-auth/elogind )
+SLOT=0
+SRC_URI=https://github.com/linuxmint/cinnamon-session/archive/3.6.1.tar.gz -> cinnamon-session-3.6.1.tar.gz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=960bd2f8c641d755befabb742373313c
diff --git a/metadata/md5-cache/gnome-extra/cinnamon-settings-daemon-3.6.1 b/metadata/md5-cache/gnome-extra/cinnamon-settings-daemon-3.6.1
new file mode 100644
index 000000000000..4bff3d76c017
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/cinnamon-settings-daemon-3.6.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=dev-libs/glib-2.38:2 >=gnome-base/libgnomekbd-3.6 >=gnome-base/librsvg-2.36.2 >=gnome-extra/cinnamon-desktop-2.8.0:0= media-libs/fontconfig >=media-libs/lcms-2.2:2 media-libs/libcanberra:0=[gtk3] sys-apps/dbus >=sys-auth/polkit-0.97 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.9.10:3 >=x11-libs/libnotify-0.7.3:0= x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libxklavier virtual/libgudev:= colord? ( >=x11-misc/colord-0.1.27:= ) cups? ( >=net-print/cups-1.4[dbus] ) input_devices_wacom? ( >=dev-libs/libwacom-0.7 x11-drivers/xf86-input-wacom x11-libs/libXtst ) smartcard? ( >=dev-libs/nss-3.11.2 ) systemd? ( sys-apps/systemd:0= >=sys-power/upower-0.9.11:= ) !systemd? ( sys-auth/elogind:0= || ( >=sys-power/upower-0.9.11 sys-power/upower-pm-utils ) ) dev-libs/libxml2:2 >=dev-util/intltool-0.37.1 x11-proto/kbproto virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Cinnamon's settings daemon
+EAPI=6
+HOMEPAGE=http://cinnamon.linuxmint.com/
+IUSE=+colord cups input_devices_wacom smartcard systemd test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/glib-2.38:2 >=gnome-base/libgnomekbd-3.6 >=gnome-base/librsvg-2.36.2 >=gnome-extra/cinnamon-desktop-2.8.0:0= media-libs/fontconfig >=media-libs/lcms-2.2:2 media-libs/libcanberra:0=[gtk3] sys-apps/dbus >=sys-auth/polkit-0.97 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.9.10:3 >=x11-libs/libnotify-0.7.3:0= x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libxklavier virtual/libgudev:= colord? ( >=x11-misc/colord-0.1.27:= ) cups? ( >=net-print/cups-1.4[dbus] ) input_devices_wacom? ( >=dev-libs/libwacom-0.7 x11-drivers/xf86-input-wacom x11-libs/libXtst ) smartcard? ( >=dev-libs/nss-3.11.2 ) systemd? ( sys-apps/systemd:0= >=sys-power/upower-0.9.11:= ) !systemd? ( sys-auth/elogind:0= || ( >=sys-power/upower-0.9.11 sys-power/upower-pm-utils ) )
+SLOT=0
+SRC_URI=https://github.com/linuxmint/cinnamon-settings-daemon/archive/3.6.1.tar.gz -> cinnamon-settings-daemon-3.6.1.tar.gz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=5450f06302573a6960abc8bbae0733b2
diff --git a/metadata/md5-cache/gnome-extra/cinnamon-translations-3.6.3 b/metadata/md5-cache/gnome-extra/cinnamon-translations-3.6.3
new file mode 100644
index 000000000000..9787b27a9f3a
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/cinnamon-translations-3.6.3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DESCRIPTION=Translation data for Cinnamon
+EAPI=6
+HOMEPAGE=http://cinnamon.linuxmint.com/
+IUSE=linguas_af linguas_am linguas_an linguas_ar linguas_as linguas_ast linguas_az linguas_be linguas_be@latin linguas_bg linguas_bn linguas_bn_IN linguas_br linguas_bs linguas_ca linguas_ca@valencia linguas_crh linguas_cs linguas_csb linguas_cy linguas_da linguas_de linguas_dz linguas_el linguas_en@shaw linguas_en_AU linguas_en_CA linguas_en_GB linguas_eo linguas_es linguas_es_AR linguas_et linguas_eu linguas_fa linguas_fi linguas_fil linguas_fo linguas_fr linguas_fr_CA linguas_frp linguas_fy linguas_ga linguas_gd linguas_gl linguas_gu linguas_he linguas_hi linguas_hr linguas_hu linguas_hy linguas_ia linguas_id linguas_ii linguas_is linguas_it linguas_ja linguas_jv linguas_ka linguas_kk linguas_km linguas_kn linguas_ko linguas_ksw linguas_ku linguas_ky linguas_la linguas_li linguas_lo linguas_lt linguas_lv linguas_mai linguas_mg linguas_mk linguas_ml linguas_mn linguas_mr linguas_ms linguas_my linguas_nb linguas_nds linguas_ne linguas_nl linguas_nn linguas_nso linguas_oc linguas_om linguas_or linguas_pa linguas_pap linguas_pl linguas_ps linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_rue linguas_rw linguas_sa linguas_sc linguas_sco linguas_shn linguas_si linguas_sk linguas_sl linguas_so linguas_sq linguas_sr linguas_sr@ijekavianlatin linguas_sr@latin linguas_sv linguas_sw linguas_ta linguas_te linguas_tg linguas_th linguas_tl linguas_tlh linguas_tpi linguas_tr linguas_ts linguas_tt linguas_ug linguas_uk linguas_ur linguas_uz linguas_uz@cyrillic linguas_vi linguas_wa linguas_xh linguas_yi linguas_zh_CN linguas_zh_HK linguas_zh_TW linguas_zu
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/linuxmint/cinnamon-translations/archive/3.6.3.tar.gz -> cinnamon-translations-3.6.3.tar.gz
+_eclasses_=l10n	2c2e15383ba891d642f51896a7f0ecfe
+_md5_=20674868b7677e8baff6dc46a1089c26
diff --git a/metadata/md5-cache/gnome-extra/cjs-3.6.1 b/metadata/md5-cache/gnome-extra/cjs-3.6.1
new file mode 100644
index 000000000000..893d3e10b868
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/cjs-3.6.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=dev-lang/spidermonkey:38 >=dev-libs/glib-2.37.3:2 >=dev-libs/gobject-introspection-1.38:= sys-libs/readline:0 virtual/libffi cairo? ( x11-libs/cairo[X,glib] ) gtk? ( x11-libs/gtk+:3 ) gnome-base/gnome-common sys-devel/gettext virtual/pkgconfig test? ( sys-apps/dbus ) sys-devel/autoconf-archive >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Linux Mint's fork of gjs for Cinnamon
+EAPI=6
+HOMEPAGE=http://cinnamon.linuxmint.com/
+IUSE=+cairo examples gtk test test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )
+RDEPEND=dev-lang/spidermonkey:38 >=dev-libs/glib-2.37.3:2 >=dev-libs/gobject-introspection-1.38:= sys-libs/readline:0 virtual/libffi cairo? ( x11-libs/cairo[X,glib] ) gtk? ( x11-libs/gtk+:3 ) !<gnome-extra/cinnamon-2.4
+SLOT=0
+SRC_URI=https://github.com/linuxmint/cjs/archive/3.6.1.tar.gz -> cjs-3.6.1.tar.gz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=544fc30f3483b2f60860108ea626568d
diff --git a/metadata/md5-cache/gnome-extra/nemo-3.6.4 b/metadata/md5-cache/gnome-extra/nemo-3.6.4
new file mode 100644
index 000000000000..b4081dbf8239
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/nemo-3.6.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=>=dev-libs/glib-2.37.3:2[dbus] >=gnome-extra/cinnamon-desktop-2.6.1:0= >=x11-libs/pango-1.28.3 >=x11-libs/gtk+-3.9.10:3[introspection?] >=dev-libs/libxml2-2.7.8:2 gnome-base/dconf:0= gnome-base/gsettings-desktop-schemas >=x11-libs/libnotify-0.7:= x11-libs/libX11 x11-libs/libXext x11-libs/libXrender >=x11-libs/xapps-1.0.4 exif? ( >=media-libs/libexif-0.6.20:= ) introspection? ( >=dev-libs/gobject-introspection-0.6.4:= ) tracker? ( >=app-misc/tracker-0.12:= ) xmp? ( >=media-libs/exempi-2.2.0:= ) sys-libs/libselinux || ( dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/python:3.4 ) || ( ( dev-lang/python:3.6 dev-python/polib[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/pygobject:3[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( dev-lang/python:3.5 dev-python/polib[python_targets_python3_5(-),python_single_target_python3_5(+)] dev-python/pygobject:3[python_targets_python3_5(-),python_single_target_python3_5(+)] ) ( dev-lang/python:3.4 dev-python/polib[python_targets_python3_4(-),python_single_target_python3_4(+)] dev-python/pygobject:3[python_targets_python3_4(-),python_single_target_python3_4(+)] ) ) >=dev-lang/perl-5 >=dev-util/gdbus-codegen-2.31.0 dev-util/gtk-doc-am >=dev-util/intltool-0.40.1 sys-devel/gettext virtual/pkgconfig x11-proto/xproto dev-util/gtk-doc gnome-base/gnome-common >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=A file manager for Cinnamon, forked from Nautilus
+EAPI=6
+HOMEPAGE=http://cinnamon.linuxmint.com/
+IUSE=exif +introspection +nls packagekit tracker xmp test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ LGPL-2+ FDL-1.1
+PDEPEND=>=gnome-base/gvfs-0.1.2
+RDEPEND=>=dev-libs/glib-2.37.3:2[dbus] >=gnome-extra/cinnamon-desktop-2.6.1:0= >=x11-libs/pango-1.28.3 >=x11-libs/gtk+-3.9.10:3[introspection?] >=dev-libs/libxml2-2.7.8:2 gnome-base/dconf:0= gnome-base/gsettings-desktop-schemas >=x11-libs/libnotify-0.7:= x11-libs/libX11 x11-libs/libXext x11-libs/libXrender >=x11-libs/xapps-1.0.4 exif? ( >=media-libs/libexif-0.6.20:= ) introspection? ( >=dev-libs/gobject-introspection-0.6.4:= ) tracker? ( >=app-misc/tracker-0.12:= ) xmp? ( >=media-libs/exempi-2.2.0:= ) sys-libs/libselinux x11-themes/adwaita-icon-theme nls? ( >=gnome-extra/cinnamon-translations-2.2 )
+SLOT=0
+SRC_URI=https://github.com/linuxmint/nemo/archive/3.6.4.tar.gz -> nemo-3.6.4.tar.gz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=2379a366155e615d6bbaef454da06a0b
diff --git a/metadata/md5-cache/kde-frameworks/Manifest.gz b/metadata/md5-cache/kde-frameworks/Manifest.gz
index 693de04e4f6c..7a8d568ca521 100644
Binary files a/metadata/md5-cache/kde-frameworks/Manifest.gz and b/metadata/md5-cache/kde-frameworks/Manifest.gz differ
diff --git a/metadata/md5-cache/kde-frameworks/kio-5.40.0-r1 b/metadata/md5-cache/kde-frameworks/kio-5.40.0-r1
new file mode 100644
index 000000000000..c1e65d8c0b42
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kio-5.40.0-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.40:5 >=kde-frameworks/kbookmarks-5.40:5 >=kde-frameworks/kcodecs-5.40:5 >=kde-frameworks/kcompletion-5.40:5 >=kde-frameworks/kconfig-5.40:5 >=kde-frameworks/kconfigwidgets-5.40:5 >=kde-frameworks/kcoreaddons-5.40:5 >=kde-frameworks/kdbusaddons-5.40:5 >=kde-frameworks/ki18n-5.40:5 >=kde-frameworks/kiconthemes-5.40:5 >=kde-frameworks/kitemviews-5.40:5 >=kde-frameworks/kjobwidgets-5.40:5 >=kde-frameworks/knotifications-5.40:5 >=kde-frameworks/kservice-5.40:5 >=kde-frameworks/ktextwidgets-5.40:5 >=kde-frameworks/kwidgetsaddons-5.40:5 >=kde-frameworks/kwindowsystem-5.40:5 >=kde-frameworks/kxmlgui-5.40:5 >=kde-frameworks/solid-5.40:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5[ssl] >=dev-qt/qtscript-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 dev-libs/libxml2 dev-libs/libxslt acl? ( sys-apps/attr virtual/acl ) kerberos? ( virtual/krb5 ) kwallet? ( >=kde-frameworks/kwallet-5.40:5 ) X? ( >=dev-qt/qtx11extras-5.7.1:5 ) >=dev-qt/qtconcurrent-5.7.1:5 handbook? ( >=kde-frameworks/kdoctools-5.40:5 ) test? ( sys-libs/zlib ) X? ( x11-libs/libX11 x11-libs/libXrender x11-proto/xproto ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework providing transparent file and data management
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=acl +handbook kerberos +kwallet X test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+PDEPEND=>=kde-frameworks/kded-5.40:5
+RDEPEND=>=kde-frameworks/karchive-5.40:5 >=kde-frameworks/kbookmarks-5.40:5 >=kde-frameworks/kcodecs-5.40:5 >=kde-frameworks/kcompletion-5.40:5 >=kde-frameworks/kconfig-5.40:5 >=kde-frameworks/kconfigwidgets-5.40:5 >=kde-frameworks/kcoreaddons-5.40:5 >=kde-frameworks/kdbusaddons-5.40:5 >=kde-frameworks/ki18n-5.40:5 >=kde-frameworks/kiconthemes-5.40:5 >=kde-frameworks/kitemviews-5.40:5 >=kde-frameworks/kjobwidgets-5.40:5 >=kde-frameworks/knotifications-5.40:5 >=kde-frameworks/kservice-5.40:5 >=kde-frameworks/ktextwidgets-5.40:5 >=kde-frameworks/kwidgetsaddons-5.40:5 >=kde-frameworks/kwindowsystem-5.40:5 >=kde-frameworks/kxmlgui-5.40:5 >=kde-frameworks/solid-5.40:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5[ssl] >=dev-qt/qtscript-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 dev-libs/libxml2 dev-libs/libxslt acl? ( sys-apps/attr virtual/acl ) kerberos? ( virtual/krb5 ) kwallet? ( >=kde-frameworks/kwallet-5.40:5 ) X? ( >=dev-qt/qtx11extras-5.7.1:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+RESTRICT=test
+SLOT=5/5.40
+SRC_URI=mirror://kde/stable/frameworks/5.40/kio-5.40.0.tar.xz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	a979463dcce77e632a3dd7b92be69e67	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=6b1737cdeaa8b7ffc426794fc8712682
diff --git a/metadata/md5-cache/kde-misc/Manifest.gz b/metadata/md5-cache/kde-misc/Manifest.gz
index a17dbff4bf43..5afd4c662f85 100644
Binary files a/metadata/md5-cache/kde-misc/Manifest.gz and b/metadata/md5-cache/kde-misc/Manifest.gz differ
diff --git a/metadata/md5-cache/kde-misc/tellico-3.0.2 b/metadata/md5-cache/kde-misc/tellico-3.0.2
deleted file mode 100644
index a6e78e163e2c..000000000000
--- a/metadata/md5-cache/kde-misc/tellico-3.0.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.37.0:5 >=kde-frameworks/kcodecs-5.37.0:5 >=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/kguiaddons-5.37.0:5 >=kde-frameworks/khtml-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/kitemmodels-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kjobwidgets-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/knewstuff-5.37.0:5 >=kde-frameworks/kparts-5.37.0:5 >=kde-frameworks/kservice-5.37.0:5 >=kde-frameworks/ktextwidgets-5.37.0:5 >=kde-frameworks/kwallet-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kwindowsystem-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-frameworks/solid-5.37.0:5 >=kde-frameworks/sonnet-5.37.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=dev-perl/Text-BibTeX-0.780.0-r1 dev-libs/libxml2 dev-libs/libxslt cddb? ( >=kde-apps/libkcddb-14.12.0:5 ) discid? ( media-libs/libdiscid ) pdf? ( app-text/poppler[qt5] ) scanner? ( >=kde-apps/libksane-14.12.0:5 ) semantic-desktop? ( >=kde-frameworks/kfilemetadata-5.37.0:5 ) taglib? ( >=media-libs/taglib-1.5 ) v4l? ( >=media-libs/libv4l-0.8.3 ) xmp? ( >=media-libs/exempi-2 ) yaz? ( >=dev-libs/yaz-2:0 ) sys-devel/gettext sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.37.0:5 handbook? ( >=kde-frameworks/kdoctools-5.37.0:5 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=A collection manager based on KDE Frameworks
-EAPI=6
-HOMEPAGE=http://tellico-project.org/
-IUSE=cddb discid pdf scanner semantic-desktop taglib v4l xmp yaz test debug +handbook test
-KEYWORDS=amd64 x86
-LICENSE=|| ( GPL-2 GPL-3 )
-RDEPEND=>=kde-frameworks/karchive-5.37.0:5 >=kde-frameworks/kcodecs-5.37.0:5 >=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/kguiaddons-5.37.0:5 >=kde-frameworks/khtml-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/kitemmodels-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kjobwidgets-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/knewstuff-5.37.0:5 >=kde-frameworks/kparts-5.37.0:5 >=kde-frameworks/kservice-5.37.0:5 >=kde-frameworks/ktextwidgets-5.37.0:5 >=kde-frameworks/kwallet-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kwindowsystem-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-frameworks/solid-5.37.0:5 >=kde-frameworks/sonnet-5.37.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=dev-perl/Text-BibTeX-0.780.0-r1 dev-libs/libxml2 dev-libs/libxslt cddb? ( >=kde-apps/libkcddb-14.12.0:5 ) discid? ( media-libs/libdiscid ) pdf? ( app-text/poppler[qt5] ) scanner? ( >=kde-apps/libksane-14.12.0:5 ) semantic-desktop? ( >=kde-frameworks/kfilemetadata-5.37.0:5 ) taglib? ( >=media-libs/taglib-1.5 ) v4l? ( >=media-libs/libv4l-0.8.3 ) xmp? ( >=media-libs/exempi-2 ) yaz? ( >=dev-libs/yaz-2:0 ) !kde-misc/tellico:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.37.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=http://tellico-project.org/files/tellico-3.0.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	a979463dcce77e632a3dd7b92be69e67	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=8e65958c84aa22d97558c311f169b04b
diff --git a/metadata/md5-cache/kde-misc/tellico-3.1 b/metadata/md5-cache/kde-misc/tellico-3.1
index e86665bc72f0..741427dcbf74 100644
--- a/metadata/md5-cache/kde-misc/tellico-3.1
+++ b/metadata/md5-cache/kde-misc/tellico-3.1
@@ -4,11 +4,11 @@ DESCRIPTION=A collection manager based on KDE Frameworks
 EAPI=6
 HOMEPAGE=http://tellico-project.org/
 IUSE=cddb discid pdf scanner semantic-desktop taglib v4l xmp yaz test debug +handbook test
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=|| ( GPL-2 GPL-3 )
 RDEPEND=>=kde-frameworks/karchive-5.37.0:5 >=kde-frameworks/kcodecs-5.37.0:5 >=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/kguiaddons-5.37.0:5 >=kde-frameworks/khtml-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/kitemmodels-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kjobwidgets-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/knewstuff-5.37.0:5 >=kde-frameworks/kparts-5.37.0:5 >=kde-frameworks/kservice-5.37.0:5 >=kde-frameworks/ktextwidgets-5.37.0:5 >=kde-frameworks/kwallet-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kwindowsystem-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-frameworks/solid-5.37.0:5 >=kde-frameworks/sonnet-5.37.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=dev-perl/Text-BibTeX-0.780.0-r1 dev-libs/libxml2 dev-libs/libxslt cddb? ( >=kde-apps/libkcddb-14.12.0:5 ) discid? ( dev-libs/libcdio:= ) pdf? ( app-text/poppler[qt5] ) scanner? ( >=kde-apps/libksane-14.12.0:5 ) semantic-desktop? ( >=kde-frameworks/kfilemetadata-5.37.0:5 ) taglib? ( >=media-libs/taglib-1.5 ) v4l? ( >=media-libs/libv4l-0.8.3 ) xmp? ( >=media-libs/exempi-2 ) yaz? ( >=dev-libs/yaz-2:0 ) !kde-misc/tellico:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.37.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 RESTRICT=test
 SLOT=5
 SRC_URI=http://tellico-project.org/files/tellico-3.1.tar.xz
 _eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	a979463dcce77e632a3dd7b92be69e67	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=fd447b0b747b398138c1dc8ce515d15e
+_md5_=e0e91d1a181e1006fe873d1f21db3f31
diff --git a/metadata/md5-cache/mail-mta/Manifest.gz b/metadata/md5-cache/mail-mta/Manifest.gz
index 73b61549b626..7ab17cef5d56 100644
Binary files a/metadata/md5-cache/mail-mta/Manifest.gz and b/metadata/md5-cache/mail-mta/Manifest.gz differ
diff --git a/metadata/md5-cache/mail-mta/exim-4.89-r4 b/metadata/md5-cache/mail-mta/exim-4.89-r4
new file mode 100644
index 000000000000..7ec157734fda
--- /dev/null
+++ b/metadata/md5-cache/mail-mta/exim-4.89-r4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare
+DEPEND=>=sys-apps/sed-4.0.5 >=sys-libs/db-3.2:= dev-libs/libpcre perl? ( dev-lang/perl:= ) pam? ( virtual/pam ) tcpd? ( sys-apps/tcp-wrappers ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) gnutls? ( net-libs/gnutls[pkcs11?] dev-libs/libtasn1 ) ldap? ( >=net-nds/openldap-2.0.7 ) nis? ( elibc_glibc? ( || ( <sys-libs/glibc-2.23 >=sys-libs/glibc-2.23[rpc] ) ) ) mysql? ( virtual/libmysqlclient ) postgres? ( dev-db/postgresql:= ) sasl? ( >=dev-libs/cyrus-sasl-2.1.26-r2 ) redis? ( dev-libs/hiredis ) spf? ( >=mail-filter/libspf2-1.2.5-r1 ) dmarc? ( mail-filter/opendmarc ) srs? ( mail-filter/libsrs_alt ) X? ( x11-proto/xproto x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/libXaw ) sqlite? ( dev-db/sqlite ) radius? ( net-dialup/freeradius-client ) virtual/libiconv virtual/pkgconfig virtual/pkgconfig
+DESCRIPTION=A highly configurable, drop-in replacement for sendmail
+EAPI=6
+HOMEPAGE=http://www.exim.org/
+IUSE=dane dcc +dkim dlfunc dmarc +dnsdb doc dovecot-sasl dsn exiscan-acl gnutls ipv6 ldap libressl lmtp maildir mbx mysql nis pam perl pkcs11 postgres +prdr proxy radius redis sasl selinux spf sqlite srs ssl syslog tcpd tpda X elibc_glibc
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/sed-4.0.5 >=sys-libs/db-3.2:= dev-libs/libpcre perl? ( dev-lang/perl:= ) pam? ( virtual/pam ) tcpd? ( sys-apps/tcp-wrappers ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) gnutls? ( net-libs/gnutls[pkcs11?] dev-libs/libtasn1 ) ldap? ( >=net-nds/openldap-2.0.7 ) nis? ( elibc_glibc? ( || ( <sys-libs/glibc-2.23 >=sys-libs/glibc-2.23[rpc] ) ) ) mysql? ( virtual/libmysqlclient ) postgres? ( dev-db/postgresql:= ) sasl? ( >=dev-libs/cyrus-sasl-2.1.26-r2 ) redis? ( dev-libs/hiredis ) spf? ( >=mail-filter/libspf2-1.2.5-r1 ) dmarc? ( mail-filter/opendmarc ) srs? ( mail-filter/libsrs_alt ) X? ( x11-proto/xproto x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/libXaw ) sqlite? ( dev-db/sqlite ) radius? ( net-dialup/freeradius-client ) virtual/libiconv !mail-mta/courier !mail-mta/esmtp !mail-mta/mini-qmail !<mail-mta/msmtp-1.4.19-r1 !>=mail-mta/msmtp-1.4.19-r1[mta] !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/opensmtpd !<mail-mta/ssmtp-2.64-r2 !>=mail-mta/ssmtp-2.64-r2[mta] !net-mail/mailwrapper >=net-mail/mailbase-0.00-r5 virtual/logger dcc? ( mail-filter/dcc ) selinux? ( sec-policy/selinux-exim )
+REQUIRED_USE=dane? ( !gnutls ) dmarc? ( spf dkim ) pkcs11? ( gnutls ) spf? ( exiscan-acl ) srs? ( exiscan-acl )
+SLOT=0
+SRC_URI=ftp://ftp.exim.org/pub/exim/exim4/exim-4.89.tar.bz2 mirror://gentoo/system_filter.exim.gz doc? ( ftp://ftp.exim.org/pub/exim/exim4/exim-pdf-4.89.tar.bz2 )
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=9357ebba536acb5711352147d207f183
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index 9e7b0318f51f..ef0986480b9a 100644
Binary files a/metadata/md5-cache/media-gfx/Manifest.gz and b/metadata/md5-cache/media-gfx/Manifest.gz differ
diff --git a/metadata/md5-cache/media-gfx/geeqie-1.3-r1 b/metadata/md5-cache/media-gfx/geeqie-1.3-r1
index 2acf9f59afe4..791a04fde1a8 100644
--- a/metadata/md5-cache/media-gfx/geeqie-1.3-r1
+++ b/metadata/md5-cache/media-gfx/geeqie-1.3-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A lightweight GTK image viewer forked from GQview
 EAPI=6
 HOMEPAGE=http://www.geeqie.org
 IUSE=debug doc exif gpu-accel gtk3 jpeg lcms lirc lua map tiff xmp
-KEYWORDS=~amd64 ~ppc x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
 RDEPEND=gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) virtual/libintl doc? ( app-text/gnome-doc-utils ) gpu-accel? ( media-libs/clutter-gtk ) jpeg? ( virtual/jpeg:0 ) lcms? ( media-libs/lcms:2 ) lirc? ( app-misc/lirc ) lua? ( >=dev-lang/lua-5.1:= ) map? ( media-libs/libchamplain:0.12 ) xmp? ( >=media-gfx/exiv2-0.17:=[xmp] ) !xmp? ( exif? ( >=media-gfx/exiv2-0.17:= ) ) tiff? ( media-libs/tiff:0 )
 REQUIRED_USE=gpu-accel? ( gtk3 ) map? ( gpu-accel )
 SLOT=0
 SRC_URI=http://www.geeqie.org/geeqie-1.3.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=5f0e868933359339344f91be4cf376fd
+_md5_=767c6b53ac0d0ccc87450abaf123dfdd
diff --git a/metadata/md5-cache/media-gfx/gscan2pdf-1.8.6 b/metadata/md5-cache/media-gfx/gscan2pdf-1.8.6
deleted file mode 100644
index 2ffbe566bf5c..000000000000
--- a/metadata/md5-cache/media-gfx/gscan2pdf-1.8.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=dev-lang/perl:=
-DESCRIPTION=Scan documents, perform OCR, produce PDFs and DjVus
-EAPI=6
-HOMEPAGE=http://gscan2pdf.sourceforge.net/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-perl/Config-General dev-perl/Date-Calc dev-perl/Data-UUID dev-perl/Filesys-Df dev-perl/glib-perl dev-perl/Goo-Canvas dev-perl/Gtk2-Ex-PodViewer dev-perl/Gtk2-Ex-Simple-List dev-perl/Gtk2-ImageView dev-perl/Gtk2 dev-perl/HTML-Parser dev-perl/Image-Sane dev-perl/Locale-gettext dev-perl/List-MoreUtils dev-perl/Log-Log4perl dev-perl/PDF-API2 dev-perl/Proc-ProcessTable dev-perl/Readonly dev-perl/Set-IntSpan dev-perl/Try-Tiny virtual/perl-Archive-Tar virtual/perl-Carp virtual/perl-Data-Dumper virtual/perl-File-Temp virtual/perl-Getopt-Long virtual/perl-threads virtual/perl-threads-shared media-gfx/gtkimageview media-gfx/imagemagick[png,tiff,perl] media-gfx/sane-backends media-libs/tiff dev-lang/perl:=
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://sourceforge/gscan2pdf/gscan2pdf-1.8.6.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=c0187de0f666dabd2d0c2e59278ea8cb
diff --git a/metadata/md5-cache/media-gfx/gscan2pdf-1.8.7 b/metadata/md5-cache/media-gfx/gscan2pdf-1.8.9
similarity index 95%
rename from metadata/md5-cache/media-gfx/gscan2pdf-1.8.7
rename to metadata/md5-cache/media-gfx/gscan2pdf-1.8.9
index 93db0a368e4a..185cbeb316f9 100644
--- a/metadata/md5-cache/media-gfx/gscan2pdf-1.8.7
+++ b/metadata/md5-cache/media-gfx/gscan2pdf-1.8.9
@@ -8,6 +8,6 @@ LICENSE=GPL-3
 RDEPEND=dev-perl/Config-General dev-perl/Date-Calc dev-perl/Data-UUID dev-perl/Filesys-Df dev-perl/glib-perl dev-perl/Goo-Canvas dev-perl/Gtk2-Ex-PodViewer dev-perl/Gtk2-Ex-Simple-List dev-perl/Gtk2-ImageView dev-perl/Gtk2 dev-perl/HTML-Parser dev-perl/Image-Sane dev-perl/Locale-gettext dev-perl/List-MoreUtils dev-perl/Log-Log4perl dev-perl/PDF-API2 dev-perl/Proc-ProcessTable dev-perl/Readonly dev-perl/Set-IntSpan dev-perl/Try-Tiny virtual/perl-Archive-Tar virtual/perl-Carp virtual/perl-Data-Dumper virtual/perl-File-Temp virtual/perl-Getopt-Long virtual/perl-threads virtual/perl-threads-shared media-gfx/gtkimageview media-gfx/imagemagick[png,tiff,perl] media-gfx/sane-backends media-libs/tiff dev-lang/perl:=
 RESTRICT=test
 SLOT=0
-SRC_URI=mirror://sourceforge/gscan2pdf/gscan2pdf-1.8.7.tar.xz
+SRC_URI=mirror://sourceforge/gscan2pdf/gscan2pdf-1.8.9.tar.xz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	toolchain-funcs	185a06792159ca143528e7010368e8af
 _md5_=148a7101560699cbe01deb70125216d3
diff --git a/metadata/md5-cache/media-gfx/librecad-2.0.3 b/metadata/md5-cache/media-gfx/librecad-2.0.3
deleted file mode 100644
index ae4d21333eea..000000000000
--- a/metadata/md5-cache/media-gfx/librecad-2.0.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=dev-cpp/muParser dev-qt/qtgui:4 dev-qt/qthelp:4 dev-qt/qtsvg:4 dev-libs/boost media-libs/freetype
-DESCRIPTION=Generic 2D CAD program
-EAPI=5
-HOMEPAGE=http://www.librecad.org/
-IUSE=debug doc tools
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=dev-cpp/muParser dev-qt/qtgui:4 dev-qt/qthelp:4 dev-qt/qtsvg:4 dev-libs/boost media-libs/freetype
-SLOT=0
-SRC_URI=https://github.com/LibreCAD/LibreCAD/archive/2.0.3.zip -> librecad-2.0.3.zip
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	qt4-r2	b7985a3197fbc3a22d059f19904e735b	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=988b668f745898ad7777abb9441f76e5
diff --git a/metadata/md5-cache/media-gfx/librecad-2.0.9-r1 b/metadata/md5-cache/media-gfx/librecad-2.0.9-r1
deleted file mode 100644
index c86288bc81e1..000000000000
--- a/metadata/md5-cache/media-gfx/librecad-2.0.9-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtsvg:4 dev-qt/qthelp:4 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qthelp:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 ) dev-libs/boost:= dev-cpp/muParser media-libs/freetype:2
-DESCRIPTION=Generic 2D CAD program
-EAPI=5
-HOMEPAGE=http://www.librecad.org/
-IUSE=3d debug doc tools qt4 +qt5
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtsvg:4 dev-qt/qthelp:4 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qthelp:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 ) dev-libs/boost:= dev-cpp/muParser media-libs/freetype:2
-REQUIRED_USE=|| ( qt4 qt5 )
-SLOT=0
-SRC_URI=https://github.com/LibreCAD/LibreCAD/archive/2.0.9.zip -> librecad-2.0.9.zip
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=a0a84ec0540e6397fa8cdd2c5ea01f37
diff --git a/metadata/md5-cache/media-gfx/librecad-2.1.1 b/metadata/md5-cache/media-gfx/librecad-2.1.1
deleted file mode 100644
index 05fa312cf8b5..000000000000
--- a/metadata/md5-cache/media-gfx/librecad-2.1.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtsvg:4 dev-qt/qthelp:4 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qthelp:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 ) dev-libs/boost:= dev-cpp/muParser media-libs/freetype:2
-DESCRIPTION=Generic 2D CAD program
-EAPI=5
-HOMEPAGE=http://www.librecad.org/
-IUSE=3d debug doc tools qt4 +qt5
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtsvg:4 dev-qt/qthelp:4 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qthelp:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 ) dev-libs/boost:= dev-cpp/muParser media-libs/freetype:2
-REQUIRED_USE=|| ( qt4 qt5 )
-SLOT=0
-SRC_URI=https://github.com/LibreCAD/LibreCAD/archive/2.1.1.zip -> librecad-2.1.1.zip
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=a1f320ebcb9dadb04b4fccdd05a0c1d7
diff --git a/metadata/md5-cache/media-gfx/librecad-2.1.3-r2 b/metadata/md5-cache/media-gfx/librecad-2.1.3-r2
new file mode 100644
index 000000000000..72ad289ad48a
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/librecad-2.1.3-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qthelp:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 ) dev-libs/boost:= dev-cpp/muParser media-libs/freetype:2
+DESCRIPTION=Generic 2D CAD program
+EAPI=5
+HOMEPAGE=http://www.librecad.org/
+IUSE=3d debug doc tools qt4 +qt5
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qthelp:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 ) dev-libs/boost:= dev-cpp/muParser media-libs/freetype:2
+REQUIRED_USE=qt5
+SLOT=0
+SRC_URI=https://github.com/LibreCAD/LibreCAD/archive/2.1.3.zip -> librecad-2.1.3.zip
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=6b0a264faf950bfb17e0801c4b2f4592
diff --git a/metadata/md5-cache/media-gfx/optipng-0.7.6-r1 b/metadata/md5-cache/media-gfx/optipng-0.7.6-r1
index a0167fdc80d1..ea2bfe262a51 100644
--- a/metadata/md5-cache/media-gfx/optipng-0.7.6-r1
+++ b/metadata/md5-cache/media-gfx/optipng-0.7.6-r1
@@ -3,10 +3,10 @@ DEPEND=sys-libs/zlib media-libs/libpng:0 sys-apps/findutils
 DESCRIPTION=Compress PNG files without affecting image quality
 EAPI=4
 HOMEPAGE=http://optipng.sourceforge.net/
-KEYWORDS=~alpha amd64 ~arm ppc ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=ZLIB
 RDEPEND=sys-libs/zlib media-libs/libpng:0
 SLOT=0
 SRC_URI=mirror://sourceforge/optipng/optipng-0.7.6.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=d3c7f71a8f0dca21d1b7add1559bd6ff
+_md5_=5f51031e7e737e044eb1ef7ddc2e44c0
diff --git a/metadata/md5-cache/media-gfx/pdf2svg-0.2.1 b/metadata/md5-cache/media-gfx/pdf2svg-0.2.1
index 513d65d6e0dd..f9f41b88cad5 100644
--- a/metadata/md5-cache/media-gfx/pdf2svg-0.2.1
+++ b/metadata/md5-cache/media-gfx/pdf2svg-0.2.1
@@ -2,11 +2,11 @@ DEFINED_PHASES=install prepare
 DEPEND=>=app-text/poppler-0.12.3-r3:=[cairo] >=x11-libs/cairo-1.2.6:=[svg] x11-libs/gtk+:2= virtual/pkgconfig
 DESCRIPTION=pdf2svg is based on poppler and cairo and can convert pdf to svg files
 EAPI=5
-HOMEPAGE=http://www.cityinthesky.co.uk/pdf2svg.html
+HOMEPAGE=http://www.cityinthesky.co.uk/opensource/pdf2svg/ https://github.com/dawbarton/pdf2svg/
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=app-text/poppler-0.12.3-r3:=[cairo] >=x11-libs/cairo-1.2.6:=[svg] x11-libs/gtk+:2=
 SLOT=0
 SRC_URI=http://www.cityinthesky.co.uk/files/pdf2svg-0.2.1.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=2c48b005386c05cf7e14f61994839f06
+_md5_=03dbb8e88ddb3999fbfb410494276a85
diff --git a/metadata/md5-cache/media-gfx/pdf2svg-0.2.2 b/metadata/md5-cache/media-gfx/pdf2svg-0.2.2
index e07e948b3c39..29e4dd8cb91c 100644
--- a/metadata/md5-cache/media-gfx/pdf2svg-0.2.2
+++ b/metadata/md5-cache/media-gfx/pdf2svg-0.2.2
@@ -2,11 +2,11 @@ DEFINED_PHASES=prepare
 DEPEND=>=app-text/poppler-0.12.3-r3:=[cairo] >=x11-libs/cairo-1.2.6:=[svg] x11-libs/gtk+:2= virtual/pkgconfig
 DESCRIPTION=pdf2svg is based on poppler and cairo and can convert pdf to svg files
 EAPI=5
-HOMEPAGE=http://www.cityinthesky.co.uk/opensource/pdf2svg/
+HOMEPAGE=http://www.cityinthesky.co.uk/opensource/pdf2svg/ https://github.com/dawbarton/pdf2svg/
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=app-text/poppler-0.12.3-r3:=[cairo] >=x11-libs/cairo-1.2.6:=[svg] x11-libs/gtk+:2=
 SLOT=0
 SRC_URI=http://www.cityinthesky.co.uk/wp-content/uploads/2013/10/pdf2svg-0.2.2.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=a8363f6e651cd122e4e67788813b6746
+_md5_=6a15086a2ac9028196bd0bc275305f6b
diff --git a/metadata/md5-cache/media-gfx/pdf2svg-0.2.3 b/metadata/md5-cache/media-gfx/pdf2svg-0.2.3
new file mode 100644
index 000000000000..3ce20d7fdca4
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/pdf2svg-0.2.3
@@ -0,0 +1,11 @@
+DEFINED_PHASES=prepare
+DEPEND=>=app-text/poppler-0.12.3-r3:=[cairo] >=x11-libs/cairo-1.2.6:=[svg] x11-libs/gtk+:2= virtual/pkgconfig
+DESCRIPTION=pdf2svg is based on poppler and cairo and can convert pdf to svg files
+EAPI=6
+HOMEPAGE=http://www.cityinthesky.co.uk/opensource/pdf2svg/ https://github.com/dawbarton/pdf2svg/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=app-text/poppler-0.12.3-r3:=[cairo] >=x11-libs/cairo-1.2.6:=[svg] x11-libs/gtk+:2=
+SLOT=0
+SRC_URI=https://github.com/dawbarton/pdf2svg/archive/v0.2.3.tar.gz -> pdf2svg-0.2.3.tar.gz
+_md5_=d21f781babe62bc4738fb4ba99d04de9
diff --git a/metadata/md5-cache/media-gfx/pycam-0.6_pre20130416-r1 b/metadata/md5-cache/media-gfx/pycam-0.6_pre20130416-r1
deleted file mode 100644
index 89ebc495af4a..000000000000
--- a/metadata/md5-cache/media-gfx/pycam-0.6_pre20130416-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/pygtk dev-python/pygtkglext dev-python/pyopengl python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Open Source CAM - Toolpath Generation for 3-Axis CNC machining
-EAPI=5
-HOMEPAGE=http://pycam.sourceforge.net/
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-python/pygtk dev-python/pygtkglext dev-python/pyopengl python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~slis/pycam-0.6_pre20130416.tar.gz
-_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=df3bc085b145e16e6432da4e1f192c07
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index ba29f5743a2c..40e6d12817b8 100644
Binary files a/metadata/md5-cache/media-libs/Manifest.gz and b/metadata/md5-cache/media-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/media-libs/libsidplay-1.36.59-r2 b/metadata/md5-cache/media-libs/libsidplay-1.36.59-r2
index 0a28b09fc287..8389012f4195 100644
--- a/metadata/md5-cache/media-libs/libsidplay-1.36.59-r2
+++ b/metadata/md5-cache/media-libs/libsidplay-1.36.59-r2
@@ -4,9 +4,9 @@ DESCRIPTION=C64 SID player library
 EAPI=6
 HOMEPAGE=http://critical.ch/distfiles/
 IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 ~hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd
+KEYWORDS=alpha amd64 ~hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd
 LICENSE=GPL-2
 SLOT=1
 SRC_URI=http://critical.ch/distfiles/libsidplay-1.36.59.tgz
 _eclasses_=libtool	0081a71a261724730ec4c248494f044d	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=2b9ceff95081b5763239e0041959eda5
+_md5_=bd53e4b3ece0e0073bea6983b890d3bc
diff --git a/metadata/md5-cache/media-libs/opencv-2.4.13 b/metadata/md5-cache/media-libs/opencv-2.4.13
deleted file mode 100644
index 52717c042845..000000000000
--- a/metadata/md5-cache/media-libs/opencv-2.4.13
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=app-arch/bzip2 sys-libs/zlib cuda? ( >=dev-util/nvidia-cuda-toolkit-5.5 ) ffmpeg? ( libav? ( media-video/libav:0= ) !libav? ( media-video/ffmpeg:0= ) ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( dev-libs/glib:2 x11-libs/gtk+:2 opengl? ( x11-libs/gtkglext ) ) java? ( >=virtual/jre-1.6:* ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/jasper:= ) ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 ) ipp? ( sci-libs/ipp ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr ) opengl? ( virtual/opengl virtual/glu ) png? ( media-libs/libpng:0= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) qt4? ( dev-qt/qtgui:4 dev-qt/qttest:4 opengl? ( dev-qt/qtopengl:4 ) ) qt5? ( dev-qt/qtgui:5 dev-qt/qttest:5 dev-qt/qtconcurrent:5 opengl? ( dev-qt/qtopengl:5 ) ) threads? ( dev-cpp/tbb ) tiff? ( media-libs/tiff:0 ) v4l? ( >=media-libs/libv4l-0.8.3 ) vtk? ( sci-libs/vtk[rendering] ) xine? ( media-libs/xine-lib ) virtual/pkgconfig eigen? ( dev-cpp/eigen:3 ) java? ( >=virtual/jdk-1.6 ) sys-devel/make >=dev-util/cmake-3.7.2 java? ( >=dev-java/java-config-2.2.0-r3 ) java? ( >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2 )
-DESCRIPTION=A collection of algorithms and sample code for various computer vision problems
-EAPI=6
-HOMEPAGE=https://opencv.org
-IUSE=cuda +eigen examples ffmpeg gstreamer gtk ieee1394 ipp jpeg jpeg2k libav opencl openexr opengl openmp pch png +python qt4 qt5 testprograms threads tiff v4l vtk xine python_targets_python2_7 elibc_FreeBSD java elibc_FreeBSD
-KEYWORDS=amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux
-LICENSE=BSD
-RDEPEND=app-arch/bzip2 sys-libs/zlib cuda? ( >=dev-util/nvidia-cuda-toolkit-5.5 ) ffmpeg? ( libav? ( media-video/libav:0= ) !libav? ( media-video/ffmpeg:0= ) ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( dev-libs/glib:2 x11-libs/gtk+:2 opengl? ( x11-libs/gtkglext ) ) java? ( >=virtual/jre-1.6:* ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/jasper:= ) ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 ) ipp? ( sci-libs/ipp ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr ) opengl? ( virtual/opengl virtual/glu ) png? ( media-libs/libpng:0= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) qt4? ( dev-qt/qtgui:4 dev-qt/qttest:4 opengl? ( dev-qt/qtopengl:4 ) ) qt5? ( dev-qt/qtgui:5 dev-qt/qttest:5 dev-qt/qtconcurrent:5 opengl? ( dev-qt/qtopengl:5 ) ) threads? ( dev-cpp/tbb ) tiff? ( media-libs/tiff:0 ) v4l? ( >=media-libs/libv4l-0.8.3 ) vtk? ( sci-libs/vtk[rendering] ) xine? ( media-libs/xine-lib ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=python? ( python_targets_python2_7 ) ?? ( qt4 qt5 )
-SLOT=0/2.4
-SRC_URI=https://github.com/Itseez/opencv/archive/2.4.13.zip -> opencv-2.4.13.zip
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=085cbabe4888cb5fe876d7dcb095842e
diff --git a/metadata/md5-cache/media-libs/opencv-2.4.13-r3 b/metadata/md5-cache/media-libs/opencv-2.4.13-r3
index 4b0aeb196f65..27169e9750a1 100644
--- a/metadata/md5-cache/media-libs/opencv-2.4.13-r3
+++ b/metadata/md5-cache/media-libs/opencv-2.4.13-r3
@@ -4,11 +4,11 @@ DESCRIPTION=A collection of algorithms and sample code for various computer visi
 EAPI=6
 HOMEPAGE=https://opencv.org
 IUSE=cuda +eigen examples ffmpeg gstreamer gtk ieee1394 ipp jpeg jpeg2k libav opencl openexr opengl openmp pch png +python qt5 testprograms threads tiff v4l vtk xine python_targets_python2_7 elibc_FreeBSD java elibc_FreeBSD
-KEYWORDS=amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux
+KEYWORDS=amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux
 LICENSE=BSD
 RDEPEND=app-arch/bzip2 sys-libs/zlib cuda? ( >=dev-util/nvidia-cuda-toolkit-5.5 ) ffmpeg? ( libav? ( media-video/libav:0= ) !libav? ( media-video/ffmpeg:0= ) ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( dev-libs/glib:2 x11-libs/gtk+:2 opengl? ( x11-libs/gtkglext ) ) java? ( >=virtual/jre-1.6:* ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/jasper:= ) ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 ) ipp? ( sci-libs/ipp ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr ) opengl? ( virtual/opengl virtual/glu ) png? ( media-libs/libpng:0= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) qt5? ( dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qttest:5 opengl? ( dev-qt/qtopengl:5 ) ) threads? ( dev-cpp/tbb ) tiff? ( media-libs/tiff:0 ) v4l? ( >=media-libs/libv4l-0.8.3 ) vtk? ( sci-libs/vtk[rendering] ) xine? ( media-libs/xine-lib ) java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=python? ( python_targets_python2_7 )
 SLOT=0/2.4
 SRC_URI=https://github.com/Itseez/opencv/archive/2.4.13.tar.gz -> opencv-2.4.13.tar.gz
 _eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=9d85c1597c65ee3ed1706df832cf2960
+_md5_=dbb0be6f401ffb448b480f2d5227dd4d
diff --git a/metadata/md5-cache/media-plugins/Manifest.gz b/metadata/md5-cache/media-plugins/Manifest.gz
index 5d1808b3774b..c2f0eb5d0cbc 100644
Binary files a/metadata/md5-cache/media-plugins/Manifest.gz and b/metadata/md5-cache/media-plugins/Manifest.gz differ
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-ladspa-1.12.3 b/metadata/md5-cache/media-plugins/gst-plugins-ladspa-1.12.3
new file mode 100644
index 000000000000..c81e3021cf39
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gst-plugins-ladspa-1.12.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=media-libs/ladspa-sdk >=media-libs/gstreamer-1.12:1.0 >=sys-apps/sed-4 >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.12.3:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=Ladspa elements for Gstreamer
+EAPI=6
+HOMEPAGE=https://gstreamer.freedesktop.org/
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=media-libs/ladspa-sdk >=media-libs/gstreamer-1.12:1.0 >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.12.3:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RESTRICT=test
+SLOT=1.0
+SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.12.3.tar.xz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	gstreamer	623bbf37a581925fc4022a0874d7a6e8	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=0a912b6c18c885ab6a0494697f43eb74
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index b0cd3ec0b3d5..0518a91dd443 100644
Binary files a/metadata/md5-cache/media-sound/Manifest.gz and b/metadata/md5-cache/media-sound/Manifest.gz differ
diff --git a/metadata/md5-cache/media-sound/mp3blaster-3.2.6 b/metadata/md5-cache/media-sound/mp3blaster-3.2.6
index a5ac65bf1eaa..f5fe502a2bc8 100644
--- a/metadata/md5-cache/media-sound/mp3blaster-3.2.6
+++ b/metadata/md5-cache/media-sound/mp3blaster-3.2.6
@@ -4,11 +4,11 @@ DESCRIPTION=Text console based program for playing audio files
 EAPI=6
 HOMEPAGE=http://www.mp3blaster.org/ http://mp3blaster.sourceforge.net/ https://github.com/stragulus/mp3blaster
 IUSE=lirc oss +sdl sid vorbis
-KEYWORDS=alpha amd64 arm ppc ppc64 ~sparc x86 ~x86-fbsd
+KEYWORDS=alpha amd64 arm ppc ppc64 sparc x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses:0= lirc? ( app-misc/lirc ) sdl? ( media-libs/libsdl ) sid? ( media-libs/libsidplay:1 ) vorbis? ( media-libs/libvorbis )
 REQUIRED_USE=|| ( oss sdl )
 SLOT=0
 SRC_URI=mirror://sourceforge/mp3blaster/mp3blaster-3.2.6.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=4d6d09f812da25b5a6725e0e3df8b7d5
+_md5_=4636a72c61df00d203f45699a058e428
diff --git a/metadata/md5-cache/media-sound/pulseeffects-3.0.8 b/metadata/md5-cache/media-sound/pulseeffects-3.0.8
new file mode 100644
index 000000000000..a0dd3b7879c8
--- /dev/null
+++ b/metadata/md5-cache/media-sound/pulseeffects-3.0.8
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst test
+DEPEND=python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_4? ( dev-python/configparser ) dev-python/setuptools[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygobject:3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pycairo[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/gst-python-1.12.0:1.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] media-plugins/swh-plugins >=x11-libs/gtk+-3.18:3 dev-python/numpy[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=sci-libs/scipy-0.18[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=media-libs/gstreamer-1.12.0:1.0 >=media-libs/gst-plugins-good-1.12.0:1.0 >=media-libs/gst-plugins-bad-1.12.0:1.0 >=media-plugins/gst-plugins-ladspa-1.12.0:1.0 >=media-plugins/gst-plugins-pulse-1.12.0:1.0 >=sys-apps/sed-4 >=dev-util/meson-0.40.0 >=dev-util/ninja-1.7.2
+DESCRIPTION=Limiter, compressor, reverberation, equalizer auto volume effects for Pulseaudio
+EAPI=6
+HOMEPAGE=https://github.com/wwmm/pulseeffects
+IUSE=python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~x86 ~amd64
+LICENSE=GPL-3
+RDEPEND=python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_4? ( dev-python/configparser ) dev-python/setuptools[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygobject:3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pycairo[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/gst-python-1.12.0:1.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] media-plugins/swh-plugins >=x11-libs/gtk+-3.18:3 dev-python/numpy[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=sci-libs/scipy-0.18[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=media-libs/gstreamer-1.12.0:1.0 >=media-libs/gst-plugins-good-1.12.0:1.0 >=media-libs/gst-plugins-bad-1.12.0:1.0 >=media-plugins/gst-plugins-ladspa-1.12.0:1.0 >=media-plugins/gst-plugins-pulse-1.12.0:1.0 media-sound/pulseaudio[equalizer]
+SLOT=0
+SRC_URI=https://github.com/wwmm/pulseeffects/archive/v3.0.8.tar.gz -> pulseeffects-3.0.8.tar.gz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	meson	0946ddca90e9c2d3e4687bb097dd9ed3	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=f5103b4955c2551f94b35152a9a6f62d
diff --git a/metadata/md5-cache/media-sound/pulseeffects-9999 b/metadata/md5-cache/media-sound/pulseeffects-9999
new file mode 100644
index 000000000000..221eda6e4872
--- /dev/null
+++ b/metadata/md5-cache/media-sound/pulseeffects-9999
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst test unpack
+DEPEND=python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_4? ( dev-python/configparser ) dev-python/setuptools[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygobject:3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pycairo[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/gst-python-1.12.0:1.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] media-plugins/swh-plugins >=x11-libs/gtk+-3.18:3 dev-python/numpy[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=sci-libs/scipy-0.18[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=media-libs/gstreamer-1.12.0:1.0 >=media-libs/gst-plugins-good-1.12.0:1.0 >=media-libs/gst-plugins-bad-1.12.0:1.0 >=media-plugins/gst-plugins-ladspa-1.12.0:1.0 >=media-plugins/gst-plugins-pulse-1.12.0:1.0 >=sys-apps/sed-4 >=dev-util/meson-0.40.0 >=dev-util/ninja-1.7.2 >=dev-vcs/git-1.8.2.1
+DESCRIPTION=Limiter, compressor, reverberation, equalizer auto volume effects for Pulseaudio
+EAPI=6
+HOMEPAGE=https://github.com/wwmm/pulseeffects
+IUSE=python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+LICENSE=GPL-3
+RDEPEND=python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_4? ( dev-python/configparser ) dev-python/setuptools[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygobject:3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pycairo[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/gst-python-1.12.0:1.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] media-plugins/swh-plugins >=x11-libs/gtk+-3.18:3 dev-python/numpy[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=sci-libs/scipy-0.18[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=media-libs/gstreamer-1.12.0:1.0 >=media-libs/gst-plugins-good-1.12.0:1.0 >=media-libs/gst-plugins-bad-1.12.0:1.0 >=media-plugins/gst-plugins-ladspa-1.12.0:1.0 >=media-plugins/gst-plugins-pulse-1.12.0:1.0 media-sound/pulseaudio[equalizer]
+SLOT=0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	git-r3	52a888802d25387c2c74cb845d1219bc	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	meson	0946ddca90e9c2d3e4687bb097dd9ed3	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=f5103b4955c2551f94b35152a9a6f62d
diff --git a/metadata/md5-cache/media-sound/tomahawk-0.9.0_pre20170808 b/metadata/md5-cache/media-sound/tomahawk-0.9.0_pre20170808
new file mode 100644
index 000000000000..3cfae4de6349
--- /dev/null
+++ b/metadata/md5-cache/media-sound/tomahawk-0.9.0_pre20170808
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/attica-5.37.0 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtsql-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwebkit-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 app-crypt/qca:2[qt5(+)] dev-cpp/lucene++ dev-cpp/sparsehash dev-libs/boost:= dev-libs/qtkeychain:=[qt5(+)] >=dev-libs/quazip-0.7.2[qt5(+)] >=media-libs/liblastfm-1.0.9-r1[qt5(+)] >=media-libs/taglib-1.8.0 media-video/vlc:=[flac,dvbpsi,ffmpeg,mp3] >=net-libs/gnutls-3.2:= x11-libs/libX11 hatchet? ( dev-cpp/websocketpp ) telepathy? ( >=net-libs/telepathy-qt-0.9.7-r1[qt5(+)] ) xmpp? ( >=net-libs/jreen-1.3.0[qt5(+)] ) >=dev-qt/designer-5.7.1:5 >=dev-qt/linguist-tools-5.7.1:5 >=dev-qt/qtconcurrent-5.7.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.37.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Multi-source social music player
+EAPI=6
+HOMEPAGE=https://www.tomahawk-player.org/
+IUSE=+hatchet telepathy xmpp debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3 BSD
+RDEPEND=>=kde-frameworks/attica-5.37.0 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtsql-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwebkit-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 app-crypt/qca:2[qt5(+)] dev-cpp/lucene++ dev-cpp/sparsehash dev-libs/boost:= dev-libs/qtkeychain:=[qt5(+)] >=dev-libs/quazip-0.7.2[qt5(+)] >=media-libs/liblastfm-1.0.9-r1[qt5(+)] >=media-libs/taglib-1.8.0 media-video/vlc:=[flac,dvbpsi,ffmpeg,mp3] >=net-libs/gnutls-3.2:= x11-libs/libX11 hatchet? ( dev-cpp/websocketpp ) telepathy? ( >=net-libs/telepathy-qt-0.9.7-r1[qt5(+)] ) xmpp? ( >=net-libs/jreen-1.3.0[qt5(+)] ) app-crypt/qca:2[ssl] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.37.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
+SLOT=0
+SRC_URI=https://github.com/tomahawk-player/tomahawk/archive/00f602e10203b76fc28b4615868c567e6bd4ced4.tar.gz -> tomahawk-0.9.0_pre20170808.tar.gz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	a979463dcce77e632a3dd7b92be69e67	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=4f42e77b90e858b152bd7d6d42d01b6f
diff --git a/metadata/md5-cache/media-sound/tomahawk-9999 b/metadata/md5-cache/media-sound/tomahawk-9999
deleted file mode 100644
index f7115c15844a..000000000000
--- a/metadata/md5-cache/media-sound/tomahawk-9999
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/attica-5.37.0 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtsql-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwebkit-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 app-crypt/qca:2[qt5] dev-cpp/lucene++ dev-cpp/sparsehash dev-libs/boost:= dev-libs/qtkeychain:=[qt5(+)] >=dev-libs/quazip-0.7.2[qt5] media-libs/liblastfm[qt5] >=media-libs/taglib-1.8.0 media-video/vlc:=[flac,dvbpsi,ffmpeg,mp3] >=net-libs/gnutls-3.2:= x11-libs/libX11 hatchet? ( dev-cpp/websocketpp ) telepathy? ( net-libs/telepathy-qt[qt5(+)] ) xmpp? ( net-libs/jreen[qt5] ) >=dev-qt/designer-5.7.1:5 >=dev-qt/linguist-tools-5.7.1:5 >=dev-qt/qtconcurrent-5.7.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-vcs/git-1.8.2.1 >=kde-frameworks/extra-cmake-modules-5.37.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils
-DESCRIPTION=Multi-source social music player
-EAPI=6
-HOMEPAGE=https://www.tomahawk-player.org/
-IUSE=+hatchet telepathy xmpp debug
-LICENSE=GPL-3 BSD
-RDEPEND=>=kde-frameworks/attica-5.37.0 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtsql-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwebkit-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 app-crypt/qca:2[qt5] dev-cpp/lucene++ dev-cpp/sparsehash dev-libs/boost:= dev-libs/qtkeychain:=[qt5(+)] >=dev-libs/quazip-0.7.2[qt5] media-libs/liblastfm[qt5] >=media-libs/taglib-1.8.0 media-video/vlc:=[flac,dvbpsi,ffmpeg,mp3] >=net-libs/gnutls-3.2:= x11-libs/libX11 hatchet? ( dev-cpp/websocketpp ) telepathy? ( net-libs/telepathy-qt[qt5(+)] ) xmpp? ( net-libs/jreen[qt5] ) app-crypt/qca:2[ssl] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.37.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
-SLOT=0
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	git-r3	52a888802d25387c2c74cb845d1219bc	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	a979463dcce77e632a3dd7b92be69e67	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=656eb8966a37ecf728e28cccc87b26be
diff --git a/metadata/md5-cache/media-tv/Manifest.gz b/metadata/md5-cache/media-tv/Manifest.gz
index 7e4ab1de7355..169a8ab702e3 100644
Binary files a/metadata/md5-cache/media-tv/Manifest.gz and b/metadata/md5-cache/media-tv/Manifest.gz differ
diff --git a/metadata/md5-cache/media-tv/dtv-scan-tables-0_p20171003 b/metadata/md5-cache/media-tv/dtv-scan-tables-0_p20171003
new file mode 100644
index 000000000000..793dfccd7b4c
--- /dev/null
+++ b/metadata/md5-cache/media-tv/dtv-scan-tables-0_p20171003
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile install
+DEPEND=>=media-tv/v4l-utils-1.4
+DESCRIPTION=Digital TV scan tables in v3 and v5 format
+EAPI=6
+HOMEPAGE=https://linuxtv.org/
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2 LGPL-2.1
+SLOT=0
+SRC_URI=https://linuxtv.org/downloads/dtv-scan-tables/dtv-scan-tables-2017-10-03-c1986d5148d8.tar.bz2
+_md5_=bec29735286ade3fbcdad5f081146585
diff --git a/metadata/md5-cache/media-tv/dtv-scan-tables-9999 b/metadata/md5-cache/media-tv/dtv-scan-tables-9999
new file mode 100644
index 000000000000..721dc43d682b
--- /dev/null
+++ b/metadata/md5-cache/media-tv/dtv-scan-tables-9999
@@ -0,0 +1,9 @@
+DEFINED_PHASES=compile install unpack
+DEPEND=>=media-tv/v4l-utils-1.4 >=dev-vcs/git-1.8.2.1
+DESCRIPTION=Digital TV scan tables in v3 and v5 format
+EAPI=6
+HOMEPAGE=https://linuxtv.org/
+LICENSE=GPL-2 LGPL-2.1
+SLOT=0
+_eclasses_=git-r3	52a888802d25387c2c74cb845d1219bc
+_md5_=bec29735286ade3fbcdad5f081146585
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index 9081c6c60702..c854dbc8a102 100644
Binary files a/metadata/md5-cache/net-analyzer/Manifest.gz and b/metadata/md5-cache/net-analyzer/Manifest.gz differ
diff --git a/metadata/md5-cache/net-analyzer/wireshark-99999999 b/metadata/md5-cache/net-analyzer/wireshark-99999999
index ad3c57ea9949..0e388c2a60ce 100644
--- a/metadata/md5-cache/net-analyzer/wireshark-99999999
+++ b/metadata/md5-cache/net-analyzer/wireshark-99999999
@@ -9,4 +9,4 @@ RDEPEND=>=dev-libs/glib-2.14:2 dev-libs/libgcrypt:0 netlink? ( dev-libs/libnl:3
 REQUIRED_USE=ciscodump? ( libssh ) sshdump? ( libssh )
 SLOT=0/99999999
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fcaps	e80204189039ecc03f24151c518375f0	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	git-r3	52a888802d25387c2c74cb845d1219bc	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	185a06792159ca143528e7010368e8af	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=82c1a7e6ba289f72a0c23ada27be4da7
+_md5_=9a2d5e14b337dcc3c7aabe12a0468572
diff --git a/metadata/md5-cache/net-dns/Manifest.gz b/metadata/md5-cache/net-dns/Manifest.gz
index 54982ad1f822..5c93e2c7d46a 100644
Binary files a/metadata/md5-cache/net-dns/Manifest.gz and b/metadata/md5-cache/net-dns/Manifest.gz differ
diff --git a/metadata/md5-cache/net-dns/libidn-1.33-r2 b/metadata/md5-cache/net-dns/libidn-1.33-r2
new file mode 100644
index 000000000000..c844b6192e7c
--- /dev/null
+++ b/metadata/md5-cache/net-dns/libidn-1.33-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=emacs? ( virtual/emacs ) mono? ( >=dev-lang/mono-0.95 ) nls? ( >=sys-devel/gettext-0.17 ) java? ( >=virtual/jdk-1.5 ) java? ( >=dev-java/java-config-2.2.0-r3 ) >=app-portage/elt-patches-20170422
+DESCRIPTION=Internationalized Domain Names (IDN) implementation
+EAPI=6
+HOMEPAGE=https://www.gnu.org/software/libidn/
+IUSE=doc emacs java mono nls static-libs elibc_FreeBSD java abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2 GPL-3 LGPL-3 java? ( Apache-2.0 )
+RDEPEND=emacs? ( virtual/emacs ) mono? ( >=dev-lang/mono-0.95 ) nls? ( >=virtual/libintl-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=virtual/jre-1.5 ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508-r5 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) java? ( >=dev-java/java-config-2.2.0-r3 )
+SLOT=0
+SRC_URI=mirror://gnu/libidn/libidn-1.33.tar.gz
+_eclasses_=elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	mono-env	1f24c032c78290b0d9a07d5b343051a7	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=b536594bf0e3f3857ce2c4aeaf04c70b
diff --git a/metadata/md5-cache/net-firewall/Manifest.gz b/metadata/md5-cache/net-firewall/Manifest.gz
index 1affa939d25a..c815ae3c8a57 100644
Binary files a/metadata/md5-cache/net-firewall/Manifest.gz and b/metadata/md5-cache/net-firewall/Manifest.gz differ
diff --git a/metadata/md5-cache/net-firewall/shorewall-5.1.9 b/metadata/md5-cache/net-firewall/shorewall-5.1.9
new file mode 100644
index 000000000000..07b866181102
--- /dev/null
+++ b/metadata/md5-cache/net-firewall/shorewall-5.1.9
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare pretend setup
+DEPEND=virtual/pkgconfig
+DESCRIPTION=A high-level tool for configuring Netfilter
+EAPI=6
+HOMEPAGE=http://www.shorewall.net/
+IUSE=doc +init +ipv4 ipv6 lite4 lite6 selinux
+KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=>=net-firewall/iptables-1.4.20 >=sys-apps/iproute2-3.8.0[-minimal] >=sys-devel/bc-1.06.95 ipv4? ( >=dev-lang/perl-5.16 virtual/perl-Digest-SHA ) ipv6? ( >=dev-perl/Socket6-0.230.0 >=net-firewall/iptables-1.4.20[ipv6] >=sys-apps/iproute2-3.8.0[ipv6] ) lite6? ( >=net-firewall/iptables-1.4.20[ipv6] >=sys-apps/iproute2-3.8.0[ipv6] ) init? ( >=sys-apps/coreutils-8.20 ) selinux? ( >=sec-policy/selinux-shorewall-2.20161023-r3 ) !net-firewall/shorewall-core !net-firewall/shorewall6 !net-firewall/shorewall-lite !net-firewall/shorewall6-lite !net-firewall/shorewall-init !<sys-apps/systemd-214
+REQUIRED_USE=ipv6? ( ipv4 ) || ( ipv4 lite4 lite6 )
+SLOT=0
+SRC_URI=http://www.shorewall.net/pub/shorewall/5.1/shorewall-5.1.9/shorewall-core-5.1.9.tar.bz2 ipv4? ( http://www.shorewall.net/pub/shorewall/5.1/shorewall-5.1.9/shorewall-5.1.9.tar.bz2 ) ipv6? ( http://www.shorewall.net/pub/shorewall/5.1/shorewall-5.1.9/shorewall6-5.1.9.tar.bz2 ) lite4? ( http://www.shorewall.net/pub/shorewall/5.1/shorewall-5.1.9/shorewall-lite-5.1.9.tar.bz2 ) lite6? ( http://www.shorewall.net/pub/shorewall/5.1/shorewall-5.1.9/shorewall6-lite-5.1.9.tar.bz2 ) init? ( http://www.shorewall.net/pub/shorewall/5.1/shorewall-5.1.9/shorewall-init-5.1.9.tar.bz2 ) doc? ( http://www.shorewall.net/pub/shorewall/5.1/shorewall-5.1.9/shorewall-docs-html-5.1.9.tar.bz2 )
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	7b6fb2fc216b101b5d97d171925a847c	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=21dcfc97397e82b7fc7f009315134955
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index 14fa1349fa9d..9b23eb3e75c5 100644
Binary files a/metadata/md5-cache/net-libs/Manifest.gz and b/metadata/md5-cache/net-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/net-libs/libmicrohttpd-0.9.55 b/metadata/md5-cache/net-libs/libmicrohttpd-0.9.55
index c747dc8e4201..d3daa56b1f9d 100644
--- a/metadata/md5-cache/net-libs/libmicrohttpd-0.9.55
+++ b/metadata/md5-cache/net-libs/libmicrohttpd-0.9.55
@@ -4,9 +4,9 @@ DESCRIPTION=Small C library to run an HTTP server as part of another application
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/libmicrohttpd/
 IUSE=epoll messages ssl static-libs test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=ssl? ( dev-libs/libgcrypt:0= net-libs/gnutls )
 SLOT=0/12
 SRC_URI=mirror://gnu/libmicrohttpd/libmicrohttpd-0.9.55.tar.gz
-_md5_=3203340d7bcb36e0a165829c84d40784
+_md5_=d315eaa11293c32c46fc06635b9616c0
diff --git a/metadata/md5-cache/net-libs/webkit-gtk-2.18.3 b/metadata/md5-cache/net-libs/webkit-gtk-2.18.3
index a463b9979575..0f228bb11c85 100644
--- a/metadata/md5-cache/net-libs/webkit-gtk-2.18.3
+++ b/metadata/md5-cache/net-libs/webkit-gtk-2.18.3
@@ -4,7 +4,7 @@ DESCRIPTION=Open source web browser engine
 EAPI=6
 HOMEPAGE=http://www.webkitgtk.org/
 IUSE=aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit libnotify nsplugin +opengl spell wayland +webgl X test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
 LICENSE=LGPL-2+ BSD
 RDEPEND=>=x11-libs/cairo-1.10.2:= >=media-libs/fontconfig-2.8.0:1.0 >=media-libs/freetype-2.4.2:2 >=dev-libs/libgcrypt-1.6.0:0= >=x11-libs/gtk+-3.22:3[aqua?,introspection?,wayland?,X?] >=media-libs/harfbuzz-1.3.3:=[icu(+)] >=dev-libs/icu-3.8.1-r1:= virtual/jpeg:0= >=net-libs/libsoup-2.48:2.4[introspection?] >=dev-libs/libxml2-2.8.0:2 >=media-libs/libpng-1.4:0= dev-db/sqlite:3= sys-libs/zlib:0 >=dev-libs/atk-2.8.0 media-libs/libwebp:= >=dev-libs/glib-2.40:2 >=dev-libs/libxslt-1.1.7 gnome-keyring? ( app-crypt/libsecret ) geolocation? ( >=app-misc/geoclue-2.1.5:2.0 ) introspection? ( >=dev-libs/gobject-introspection-1.32.0:= ) dev-libs/libtasn1:= >=dev-libs/libgcrypt-1.7.0:0= nsplugin? ( >=x11-libs/gtk+-2.24.10:2 ) spell? ( >=app-text/enchant-0.22:= ) gstreamer? ( >=media-libs/gstreamer-1.2.3:1.0 >=media-libs/gst-plugins-base-1.2.3:1.0 >=media-libs/gst-plugins-bad-1.10:1.0[opengl?,egl?] ) X? ( x11-libs/cairo[X] x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXrender x11-libs/libXt ) libnotify? ( x11-libs/libnotify ) dev-libs/hyphen egl? ( media-libs/mesa[egl] ) gles2? ( media-libs/mesa[gles2] ) opengl? ( virtual/opengl x11-libs/cairo[opengl] ) webgl? ( x11-libs/cairo[opengl] x11-libs/libXcomposite x11-libs/libXdamage )
 REQUIRED_USE=geolocation? ( introspection ) gles2? ( egl ) introspection? ( gstreamer ) nsplugin? ( X ) webgl? ( ^^ ( gles2 opengl ) ) !webgl? ( ?? ( gles2 opengl ) ) webgl? ( gstreamer ) wayland? ( egl ) || ( aqua wayland X )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=4/37
 SRC_URI=http://www.webkitgtk.org/releases/webkitgtk-2.18.3.tar.xz
 _eclasses_=check-reqs	bd050ce908e4637604ee604ed4b78e8f	cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pax-utils	4f95120230a315c8caaabeb2307b7eee	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ruby-single	7435c1687c234eb8cf5b212756f6381e	ruby-utils	f8a0644cb27ba724df27b2a20a739b53	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=18cb62b740d64b668f072f48d6d54032
+_md5_=277c331947303659e9c12e001e30a569
diff --git a/metadata/md5-cache/net-mail/Manifest.gz b/metadata/md5-cache/net-mail/Manifest.gz
index 1bdd002a3bc3..53b74c69c869 100644
Binary files a/metadata/md5-cache/net-mail/Manifest.gz and b/metadata/md5-cache/net-mail/Manifest.gz differ
diff --git a/metadata/md5-cache/net-mail/cyrus-imapd-3.0.4 b/metadata/md5-cache/net-mail/cyrus-imapd-3.0.4
index 0046fdce6554..6bcb978fb96d 100644
--- a/metadata/md5-cache/net-mail/cyrus-imapd-3.0.4
+++ b/metadata/md5-cache/net-mail/cyrus-imapd-3.0.4
@@ -4,11 +4,11 @@ DESCRIPTION=The Cyrus IMAP Server
 EAPI=6
 HOMEPAGE=http://www.cyrusimap.org/
 IUSE=afs backup calalarm caps clamav http jmap kerberos ldap lmdb mysql nntp pam perl postgres replication +server sieve snmp sphinx sqlite ssl static-libs tcpd test xapian ssl
-KEYWORDS=amd64 ~arm ~hppa ~ia64 ppc ppc64 ~sparc x86
+KEYWORDS=amd64 ~arm hppa ~ia64 ppc ppc64 ~sparc x86
 LICENSE=BSD-with-attribution
 RDEPEND=sys-libs/zlib dev-libs/libpcre >=dev-libs/cyrus-sasl-2.1.13 dev-libs/jansson dev-libs/icu:= afs? ( net-fs/openafs ) caps? ( sys-libs/libcap ) clamav? ( app-antivirus/clamav ) http? ( dev-libs/libxml2 dev-libs/libical ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) lmdb? ( dev-db/lmdb ) mysql? ( >=virtual/mysql-5.5 ) nntp? ( !net-nntp/leafnode ) pam? ( virtual/pam >=net-mail/mailbase-1 ) perl? ( dev-lang/perl:= ) postgres? ( dev-db/postgresql:* ) snmp? ( >=net-analyzer/net-snmp-5.2.2-r1 ) ssl? ( >=dev-libs/openssl-1.0.1e:0[-bindist] ) sqlite? ( dev-db/sqlite:3 ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 snmp? ( net-analyzer/net-snmp[tcpd=] ) ) xapian? ( >=dev-libs/xapian-1.4.0 ) !mail-mta/courier !net-mail/bincimap !net-mail/courier-imap !net-mail/uw-imap !net-mail/cyrus-imap-admin
 REQUIRED_USE=afs? ( kerberos ) backup? ( sqlite ) calalarm? ( http ) http? ( sqlite ) jmap? ( http xapian ) sphinx? ( mysql )
 SLOT=0
 SRC_URI=ftp://ftp.cyrusimap.org/cyrus-imapd/cyrus-imapd-3.0.4.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	ssl-cert	b5e85f9a834c71d8bd532de477fe4ce2	toolchain-funcs	185a06792159ca143528e7010368e8af	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=f31c48c48e8454243ba3ad92b7c70541
+_md5_=790839ee60b121504a2548bf67e37328
diff --git a/metadata/md5-cache/net-mail/dovecot-2.2.29.1 b/metadata/md5-cache/net-mail/dovecot-2.2.29.1
index 5471f09c77ca..582fff4ccd71 100644
--- a/metadata/md5-cache/net-mail/dovecot-2.2.29.1
+++ b/metadata/md5-cache/net-mail/dovecot-2.2.29.1
@@ -4,10 +4,10 @@ DESCRIPTION=An IMAP and POP3 server written with security primarily in mind
 EAPI=6
 HOMEPAGE=http://www.dovecot.org/
 IUSE=kerberos ldap mysql pam postgres sqlite vpopmail cydir imapc +maildir mbox mdbox pop3c sdbox bzip2 lzma lz4 zlib caps doc ipv6 libressl lucene managesieve selinux sieve solr +ssl static-libs suid tcpd textcat ssl
-KEYWORDS=alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 x86
+KEYWORDS=alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 ~sparc x86
 LICENSE=LGPL-2.1 MIT
 RDEPEND=bzip2? ( app-arch/bzip2 ) caps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) lucene? ( >=dev-cpp/clucene-2.3 ) lzma? ( app-arch/xz-utils ) lz4? ( app-arch/lz4 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] ) selinux? ( sec-policy/selinux-dovecot ) solr? ( net-misc/curl dev-libs/expat ) sqlite? ( dev-db/sqlite:* ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) tcpd? ( sys-apps/tcp-wrappers ) textcat? ( app-text/libexttextcat ) vpopmail? ( net-mail/vpopmail ) zlib? ( sys-libs/zlib ) virtual/libiconv dev-libs/icu:= net-mail/mailbase
 SLOT=0
 SRC_URI=https://dovecot.org/releases/2.2/dovecot-2.2.29.1.tar.gz sieve? ( https://pigeonhole.dovecot.org/releases/2.2/dovecot-2.2-pigeonhole-0.4.18.tar.gz ) managesieve? ( https://pigeonhole.dovecot.org/releases/2.2/dovecot-2.2-pigeonhole-0.4.18.tar.gz )
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ssl-cert	b5e85f9a834c71d8bd532de477fe4ce2	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	user	8bc2845510e2109af75e3eeac607ec81	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=f3904bcbcbc172315d2132addf2c941e
+_md5_=84457096535ed8ad28e9845de73abd76
diff --git a/metadata/md5-cache/net-mail/dovecot-2.2.32 b/metadata/md5-cache/net-mail/dovecot-2.2.32
index 5f66f79a5675..1b6eb4f7f4f6 100644
--- a/metadata/md5-cache/net-mail/dovecot-2.2.32
+++ b/metadata/md5-cache/net-mail/dovecot-2.2.32
@@ -4,11 +4,11 @@ DESCRIPTION=An IMAP and POP3 server written with security primarily in mind
 EAPI=6
 HOMEPAGE=http://www.dovecot.org/
 IUSE=kerberos ldap mysql pam postgres sqlite vpopmail bzip2 lzma lz4 zlib caps doc ipv6 libressl lucene managesieve selinux sieve solr +ssl static-libs suid tcpd textcat ssl
-KEYWORDS=alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 ~s390 x86
+KEYWORDS=alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 ~s390 ~sparc x86
 LICENSE=LGPL-2.1 MIT
 RDEPEND=bzip2? ( app-arch/bzip2 ) caps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) lucene? ( >=dev-cpp/clucene-2.3 ) lzma? ( app-arch/xz-utils ) lz4? ( app-arch/lz4 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] ) selinux? ( sec-policy/selinux-dovecot ) solr? ( net-misc/curl dev-libs/expat ) sqlite? ( dev-db/sqlite:* ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) tcpd? ( sys-apps/tcp-wrappers ) textcat? ( app-text/libexttextcat ) vpopmail? ( net-mail/vpopmail ) zlib? ( sys-libs/zlib ) virtual/libiconv dev-libs/icu:= net-mail/mailbase
 REQUIRED_USE=ssl
 SLOT=0
 SRC_URI=https://dovecot.org/releases/2.2/dovecot-2.2.32.tar.gz sieve? ( https://pigeonhole.dovecot.org/releases/2.2/dovecot-2.2-pigeonhole-0.4.20.tar.gz ) managesieve? ( https://pigeonhole.dovecot.org/releases/2.2/dovecot-2.2-pigeonhole-0.4.20.tar.gz )
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ssl-cert	b5e85f9a834c71d8bd532de477fe4ce2	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	user	8bc2845510e2109af75e3eeac607ec81	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=d4dfbfa2b894b15d7d39046964a06cc4
+_md5_=80c2d2c301e81c60bae2b7217ec3f0f2
diff --git a/metadata/md5-cache/net-mail/dovecot-2.2.33.2 b/metadata/md5-cache/net-mail/dovecot-2.2.33.2
index 67eb38137b70..77f12af1954e 100644
--- a/metadata/md5-cache/net-mail/dovecot-2.2.33.2
+++ b/metadata/md5-cache/net-mail/dovecot-2.2.33.2
@@ -4,11 +4,11 @@ DESCRIPTION=An IMAP and POP3 server written with security primarily in mind
 EAPI=6
 HOMEPAGE=http://www.dovecot.org/
 IUSE=kerberos ldap mysql pam postgres sqlite vpopmail bzip2 lzma lz4 zlib caps doc ipv6 libressl lucene managesieve selinux sieve solr +ssl static-libs suid tcpd textcat ssl
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
 LICENSE=LGPL-2.1 MIT
 RDEPEND=bzip2? ( app-arch/bzip2 ) caps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) lucene? ( >=dev-cpp/clucene-2.3 ) lzma? ( app-arch/xz-utils ) lz4? ( app-arch/lz4 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] ) selinux? ( sec-policy/selinux-dovecot ) solr? ( net-misc/curl dev-libs/expat ) sqlite? ( dev-db/sqlite:* ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) tcpd? ( sys-apps/tcp-wrappers ) textcat? ( app-text/libexttextcat ) vpopmail? ( net-mail/vpopmail ) zlib? ( sys-libs/zlib ) virtual/libiconv dev-libs/icu:= net-mail/mailbase
 REQUIRED_USE=ssl
 SLOT=0
 SRC_URI=https://dovecot.org/releases/2.2/dovecot-2.2.33.2.tar.gz sieve? ( https://pigeonhole.dovecot.org/releases/2.2/dovecot-2.2-pigeonhole-0.4.21.tar.gz ) managesieve? ( https://pigeonhole.dovecot.org/releases/2.2/dovecot-2.2-pigeonhole-0.4.21.tar.gz )
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ssl-cert	b5e85f9a834c71d8bd532de477fe4ce2	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	user	8bc2845510e2109af75e3eeac607ec81	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=2621f9fe18392d2e9124274a15556504
+_md5_=3de02d28acdd6d9c9655804258a7a3a9
diff --git a/metadata/md5-cache/net-mail/qprint-1.0 b/metadata/md5-cache/net-mail/qprint-1.0
deleted file mode 100644
index 21163531e87d..000000000000
--- a/metadata/md5-cache/net-mail/qprint-1.0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=compile install
-DESCRIPTION=MIME quoted-printable data encoding and decoding utility
-EAPI=0
-HOMEPAGE=http://www.fourmilab.ch/webtools/qprint/
-KEYWORDS=amd64 ppc x86 ~ppc-macos
-LICENSE=public-domain
-SLOT=0
-SRC_URI=http://www.fourmilab.ch/webtools/qprint/qprint-1.0.tar.gz
-_md5_=597ca44acbfceefe282d23ec2943160e
diff --git a/metadata/md5-cache/net-mail/qprint-1.1 b/metadata/md5-cache/net-mail/qprint-1.1
index b066873abbbe..325b25919b89 100644
--- a/metadata/md5-cache/net-mail/qprint-1.1
+++ b/metadata/md5-cache/net-mail/qprint-1.1
@@ -1,9 +1,9 @@
 DEFINED_PHASES=install
 DESCRIPTION=MIME quoted-printable data encoding and decoding utility
-EAPI=5
+EAPI=6
 HOMEPAGE=http://www.fourmilab.ch/webtools/qprint/
-KEYWORDS=~amd64 ~ppc ~x86 ~ppc-macos
+KEYWORDS=amd64 ppc x86 ~ppc-macos
 LICENSE=public-domain
 SLOT=0
 SRC_URI=http://www.fourmilab.ch/webtools/qprint/qprint-1.1.tar.gz
-_md5_=5705f26a5dd86bf12371fbf8ccb852b9
+_md5_=53b5b95c5aefdea14a2519ab317c4ec4
diff --git a/metadata/md5-cache/net-mail/randomsig-1.10.0 b/metadata/md5-cache/net-mail/randomsig-1.10.0
index 661b0848656b..d5c327ba8e9f 100644
--- a/metadata/md5-cache/net-mail/randomsig-1.10.0
+++ b/metadata/md5-cache/net-mail/randomsig-1.10.0
@@ -1,11 +1,11 @@
-DEFINED_PHASES=install unpack
+DEFINED_PHASES=install prepare
 DEPEND=dev-lang/perl
 DESCRIPTION=randomsig - perl script for generating random .signature files
-EAPI=0
+EAPI=6
 HOMEPAGE=http://suso.suso.org/programs/randomsig/
 KEYWORDS=~amd64 s390 sparc x86
 LICENSE=GPL-2
 RDEPEND=dev-lang/perl
 SLOT=0
 SRC_URI=http://suso.suso.org/programs/randomsig/downloads/randomsig-v1.10.0.tar.gz
-_md5_=e94e73d669157041efd82d7e7e8836b2
+_md5_=af28b4a897698842fdbcf364dead18b1
diff --git a/metadata/md5-cache/net-mail/signify-1.14 b/metadata/md5-cache/net-mail/signify-1.14
index b9c33fd4cf5c..aac62608ba39 100644
--- a/metadata/md5-cache/net-mail/signify-1.14
+++ b/metadata/md5-cache/net-mail/signify-1.14
@@ -1,11 +1,11 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=dev-lang/perl >=sys-apps/sed-4
+DEFINED_PHASES=install prepare
+DEPEND=dev-lang/perl
 DESCRIPTION=A (semi-)random e-mail signature rotator
-EAPI=0
+EAPI=6
 HOMEPAGE=http://signify.sf.net/
 KEYWORDS=ppc sparc x86 ~amd64
 LICENSE=public-domain
 RDEPEND=dev-lang/perl
 SLOT=0
 SRC_URI=mirror://debian/pool/main/s/signify/signify_1.14-1.tar.gz
-_md5_=e557f1051e3653e4ce31603d86f46c50
+_md5_=735efe307b39e115752ad0d64aeb4c66
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index 2cebf9b0d2d3..53c2c4bd48d6 100644
Binary files a/metadata/md5-cache/net-misc/Manifest.gz and b/metadata/md5-cache/net-misc/Manifest.gz differ
diff --git a/metadata/md5-cache/net-misc/curl-7.56.1 b/metadata/md5-cache/net-misc/curl-7.56.1
index d865021a2a94..ec2483957a9b 100644
--- a/metadata/md5-cache/net-misc/curl-7.56.1
+++ b/metadata/md5-cache/net-misc/curl-7.56.1
@@ -4,7 +4,7 @@ DESCRIPTION=A Client that groks URLs
 EAPI=6
 HOMEPAGE=https://curl.haxx.se/
 IUSE=adns http2 idn ipv6 kerberos ldap metalink rtmp samba ssh ssl static-libs test threads curl_ssl_axtls curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl elibc_Winnt abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( curl_ssl_axtls? ( net-libs/axtls:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/ca-certificates ) curl_ssl_gnutls? ( net-libs/gnutls:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/nettle:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/ca-certificates ) curl_ssl_libressl? ( dev-libs/libressl:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) curl_ssl_mbedtls? ( net-libs/mbedtls:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/ca-certificates ) curl_ssl_openssl? ( dev-libs/openssl:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) curl_ssl_nss? ( dev-libs/nss:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/ca-certificates ) ) http2? ( net-libs/nghttp2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) idn? ( net-dns/libidn2:0[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) adns? ( net-dns/c-ares:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) metalink? ( >=media-libs/libmetalink-0.1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rtmp? ( media-video/rtmpdump[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssh? ( net-libs/libssh2[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508-r13 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 REQUIRED_USE=curl_ssl_winssl? ( elibc_Winnt ) threads? ( !adns ) ssl? ( ^^ ( curl_ssl_axtls curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss curl_ssl_openssl curl_ssl_winssl ) )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://curl.haxx.se/download/curl-7.56.1.tar.bz2
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	prefix	7b6fb2fc216b101b5d97d171925a847c	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=d98ba304ebbc50d9c81b5db5c6fe9c83
+_md5_=184915014313b25b1950b43cd102349f
diff --git a/metadata/md5-cache/net-misc/networkmanager-1.10.0 b/metadata/md5-cache/net-misc/networkmanager-1.10.0
new file mode 100644
index 000000000000..a3fd4853b254
--- /dev/null
+++ b/metadata/md5-cache/net-misc/networkmanager-1.10.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
+DEPEND=>=sys-apps/dbus-1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/dbus-glib-0.100[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.37.6:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libnl-3.2.8:3=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] policykit? ( >=sys-auth/polkit-0.106 ) net-libs/libndp[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-misc/curl-7.24 net-misc/iputils sys-apps/util-linux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:0= >=virtual/libudev-175:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] audit? ( sys-process/audit ) bluetooth? ( >=net-wireless/bluez-5 ) connection-sharing? ( net-dns/dnsmasq[dbus,dhcp] net-firewall/iptables ) consolekit? ( >=sys-auth/consolekit-1.0.0 ) dhclient? ( >=net-misc/dhcp-4[client] ) dhcpcd? ( net-misc/dhcpcd ) elogind? ( >=sys-auth/elogind-219 ) gnutls? ( dev-libs/libgcrypt:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-libs/gnutls-2.12:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-0.10.3:= ) json? ( dev-libs/jansson[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) modemmanager? ( >=net-misc/modemmanager-0.7.991:0= ) ncurses? ( >=dev-libs/newt-0.52.15 ) nss? ( >=dev-libs/nss-3.11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ofono? ( net-misc/ofono ) ovs? ( dev-libs/jansson ) ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] ) resolvconf? ( net-dns/openresolv ) selinux? ( sys-libs/libselinux ) systemd? ( >=sys-apps/systemd-209:0= ) teamd? ( dev-libs/jansson >=net-misc/libteam-1.9 ) dev-util/gdbus-codegen dev-util/gtk-doc-am >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 >=sys-kernel/linux-headers-2.6.29 virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( || ( ( dev-lang/python:3.6 dev-python/pygobject:3[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( dev-lang/python:3.5 dev-python/pygobject:3[python_targets_python3_5(-),python_single_target_python3_5(+)] ) ( dev-lang/python:3.4 dev-python/pygobject:3[python_targets_python3_4(-),python_single_target_python3_4(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/pygobject:3[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) dev-lang/perl dev-libs/libxslt ) vala? ( || ( dev-lang/vala:0.36[vapigen(+)] dev-lang/vala:0.34[vapigen(+)] dev-lang/vala:0.32[vapigen(+)] ) ) test? ( || ( ( dev-lang/python:3.6 dev-python/dbus-python[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/pygobject:3[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( dev-lang/python:3.5 dev-python/dbus-python[python_targets_python3_5(-),python_single_target_python3_5(+)] dev-python/pygobject:3[python_targets_python3_5(-),python_single_target_python3_5(+)] ) ( dev-lang/python:3.4 dev-python/dbus-python[python_targets_python3_4(-),python_single_target_python3_4(+)] dev-python/pygobject:3[python_targets_python3_4(-),python_single_target_python3_4(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/dbus-python[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/pygobject:3[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) ) >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info virtual/pkgconfig test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) virtual/pkgconfig
+DESCRIPTION=A set of co-operative tools that make networking simple and straightforward
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager
+IUSE=audit bluetooth connection-sharing consolekit +dhclient dhcpcd elogind gnutls +introspection json kernel_linux +nss +modemmanager ncurses ofono ovs policykit +ppp resolvconf selinux systemd teamd test vala +wext +wifi test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2+
+RDEPEND=>=sys-apps/dbus-1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/dbus-glib-0.100[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.37.6:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libnl-3.2.8:3=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] policykit? ( >=sys-auth/polkit-0.106 ) net-libs/libndp[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-misc/curl-7.24 net-misc/iputils sys-apps/util-linux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:0= >=virtual/libudev-175:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] audit? ( sys-process/audit ) bluetooth? ( >=net-wireless/bluez-5 ) connection-sharing? ( net-dns/dnsmasq[dbus,dhcp] net-firewall/iptables ) consolekit? ( >=sys-auth/consolekit-1.0.0 ) dhclient? ( >=net-misc/dhcp-4[client] ) dhcpcd? ( net-misc/dhcpcd ) elogind? ( >=sys-auth/elogind-219 ) gnutls? ( dev-libs/libgcrypt:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-libs/gnutls-2.12:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-0.10.3:= ) json? ( dev-libs/jansson[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) modemmanager? ( >=net-misc/modemmanager-0.7.991:0= ) ncurses? ( >=dev-libs/newt-0.52.15 ) nss? ( >=dev-libs/nss-3.11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ofono? ( net-misc/ofono ) ovs? ( dev-libs/jansson ) ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] ) resolvconf? ( net-dns/openresolv ) selinux? ( sys-libs/libselinux ) systemd? ( >=sys-apps/systemd-209:0= ) teamd? ( dev-libs/jansson >=net-misc/libteam-1.9 ) || ( net-misc/iputils[arping(+)] net-analyzer/arping ) wifi? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] )
+REQUIRED_USE=modemmanager? ( ppp ) vala? ( introspection ) wext? ( wifi ) ^^ ( nss gnutls ) ?? ( consolekit elogind systemd )
+SLOT=0
+SRC_URI=mirror://gnome/sources/NetworkManager/1.10/NetworkManager-1.10.0.tar.xz
+_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81	vala	103e6885c83965507391cdc5b6fa0e67	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=eb2c79c2c1bc8e1083c460e3d1420b0b
diff --git a/metadata/md5-cache/net-p2p/Manifest.gz b/metadata/md5-cache/net-p2p/Manifest.gz
index 93e742f8b95c..2c305629932d 100644
Binary files a/metadata/md5-cache/net-p2p/Manifest.gz and b/metadata/md5-cache/net-p2p/Manifest.gz differ
diff --git a/metadata/md5-cache/net-p2p/gnut-0.4.28-r1 b/metadata/md5-cache/net-p2p/gnut-0.4.28-r1
index 706da7ec3e05..7638a936ab6b 100644
--- a/metadata/md5-cache/net-p2p/gnut-0.4.28-r1
+++ b/metadata/md5-cache/net-p2p/gnut-0.4.28-r1
@@ -1,10 +1,9 @@
-DEFINED_PHASES=install unpack
+DEFINED_PHASES=install
 DESCRIPTION=Text-mode gnutella client
-EAPI=0
+EAPI=6
 HOMEPAGE=http://www.gnutelliums.com/linux_unix/gnut/
 KEYWORDS=x86 ppc
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://alge.anart.no/ftp/pub/gnutella/gnut-0.4.28.tar.gz mirror://gentoo/gnut-0.4.28-patches.tar.bz2
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=5d43ec6d01b74731e97f745a5c45b764
+_md5_=5fc000ca69af0405f81a009c9c6619e8
diff --git a/metadata/md5-cache/net-print/Manifest.gz b/metadata/md5-cache/net-print/Manifest.gz
index e89358865acc..2d33e34c95ee 100644
Binary files a/metadata/md5-cache/net-print/Manifest.gz and b/metadata/md5-cache/net-print/Manifest.gz differ
diff --git a/metadata/md5-cache/net-print/hplip-3.17.10-r1 b/metadata/md5-cache/net-print/hplip-3.17.10-r1
new file mode 100644
index 000000000000..cf4cfc489959
--- /dev/null
+++ b/metadata/md5-cache/net-print/hplip-3.17.10-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst prepare setup
+DEPEND=net-print/cups virtual/jpeg:0 hpijs? ( net-print/cups-filters[foomatic] ) !minimal? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads,xml] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads,xml] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads,xml] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads,xml] ) >=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(+)?] sys-apps/dbus !libusb0? ( virtual/libusb:1 ) libusb0? ( virtual/libusb:0 ) scanner? ( media-gfx/sane-backends ) snmp? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) net-analyzer/net-snmp ) ) virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DESCRIPTION=HP Linux Imaging and Printing - Print, scan, fax drivers and service tools
+EAPI=6
+HOMEPAGE=http://hplipopensource.com/hplip-web/index.html
+IUSE=doc fax +hpcups hpijs kde libressl -libusb0 minimal parport policykit qt5 scanner +snmp static-ppds X 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=~amd64 ~arm ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=net-print/cups virtual/jpeg:0 hpijs? ( net-print/cups-filters[foomatic] ) !minimal? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads,xml] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads,xml] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads,xml] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads,xml] ) >=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(+)?] sys-apps/dbus !libusb0? ( virtual/libusb:1 ) libusb0? ( virtual/libusb:0 ) scanner? ( media-gfx/sane-backends ) snmp? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) net-analyzer/net-snmp ) ) app-text/ghostscript-gpl !minimal? ( >=dev-python/dbus-python-1.2.0-r1[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(+)?] python_single_target_python2_7? ( dev-python/pygobject:2[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] ) python_single_target_python3_4? ( dev-python/pygobject:3[python_targets_python3_4(-)?,python_single_target_python3_4(+)?,python_targets_python3_5(-)?,python_single_target_python3_5(+)?,python_targets_python3_6(-)?,python_single_target_python3_6(+)?] ) python_single_target_python3_5? ( dev-python/pygobject:3[python_targets_python3_4(-)?,python_single_target_python3_4(+)?,python_targets_python3_5(-)?,python_single_target_python3_5(+)?,python_targets_python3_6(-)?,python_single_target_python3_6(+)?] ) python_single_target_python3_6? ( dev-python/pygobject:3[python_targets_python3_4(-)?,python_single_target_python3_4(+)?,python_targets_python3_5(-)?,python_single_target_python3_5(+)?,python_targets_python3_6(-)?,python_single_target_python3_6(+)?] ) fax? ( dev-python/reportlab[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(+)?] ) kernel_linux? ( virtual/udev ) qt5? ( >=dev-python/PyQt5-5.5.1[dbus,gui,widgets,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(+)?] ) scanner? ( >=dev-python/reportlab-3.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(+)?] >=dev-python/pillow-3.1.1[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(+)?] X? ( || ( kde? ( kde-misc/skanlite ) media-gfx/xsane media-gfx/sane-frontends ) ) ) ) policykit? ( sys-auth/polkit )
+REQUIRED_USE=!minimal? ( ^^ ( 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=mirror://sourceforge/hplip/hplip-3.17.10.tar.gz https://dev.gentoo.org/~billie/distfiles/hplip-3.17.9-patches-1.tar.xz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	libtool	0081a71a261724730ec4c248494f044d	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	185a06792159ca143528e7010368e8af	udev	d91cac2c73b94629cad2daea66e0d182	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=e78e2175972fcddff5a1cb658b8ef9cc
diff --git a/metadata/md5-cache/net-vpn/Manifest.gz b/metadata/md5-cache/net-vpn/Manifest.gz
index 693ac73b569e..335bcfb9129a 100644
Binary files a/metadata/md5-cache/net-vpn/Manifest.gz and b/metadata/md5-cache/net-vpn/Manifest.gz differ
diff --git a/metadata/md5-cache/net-vpn/wireguard-0.0.20171122 b/metadata/md5-cache/net-vpn/wireguard-0.0.20171127
similarity index 98%
rename from metadata/md5-cache/net-vpn/wireguard-0.0.20171122
rename to metadata/md5-cache/net-vpn/wireguard-0.0.20171127
index 6727c6288f5a..3045fd1d17fc 100644
--- a/metadata/md5-cache/net-vpn/wireguard-0.0.20171122
+++ b/metadata/md5-cache/net-vpn/wireguard-0.0.20171127
@@ -8,6 +8,6 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh
 LICENSE=GPL-2
 RDEPEND=tools? ( net-libs/libmnl ) module? ( kernel_linux? ( virtual/modutils ) )
 SLOT=0
-SRC_URI=https://git.zx2c4.com/WireGuard/snapshot/WireGuard-0.0.20171122.tar.xz
+SRC_URI=https://git.zx2c4.com/WireGuard/snapshot/WireGuard-0.0.20171127.tar.xz
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	linux-info	ca370deef9d44125d829f2eb6ebc83e0	linux-mod	e77cdec133261f6bfa67560748277269	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=fe96341b970d5cc23c6fdbadc9cf47dc
diff --git a/metadata/md5-cache/sci-calculators/Manifest.gz b/metadata/md5-cache/sci-calculators/Manifest.gz
index 9e316bff430a..2aa7be4817a4 100644
Binary files a/metadata/md5-cache/sci-calculators/Manifest.gz and b/metadata/md5-cache/sci-calculators/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-calculators/units-2.16 b/metadata/md5-cache/sci-calculators/units-2.16
index 7b2a21ee17c5..774ccf957088 100644
--- a/metadata/md5-cache/sci-calculators/units-2.16
+++ b/metadata/md5-cache/sci-calculators/units-2.16
@@ -4,11 +4,11 @@ DESCRIPTION=Unit conversion program
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/units/units.html
 IUSE=+units_cur python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=FDL-1.3 GPL-3
 RDEPEND=sys-libs/readline:= units_cur? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] dev-python/future[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] )
 REQUIRED_USE=units_cur? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 ) 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 ) )
 SLOT=0
 SRC_URI=mirror://gnu/units/units-2.16.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=6f5a7696bf735b5c02ab0d7e6a951399
+_md5_=6711137761a8693f52210d09d5fdabcc
diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index 08345da1588c..6846d16bf8ab 100644
Binary files a/metadata/md5-cache/sci-libs/Manifest.gz and b/metadata/md5-cache/sci-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-libs/nanoflann-1.2.3 b/metadata/md5-cache/sci-libs/nanoflann-1.2.3
index 3750ab5182e1..5aaa6f3b60ec 100644
--- a/metadata/md5-cache/sci-libs/nanoflann-1.2.3
+++ b/metadata/md5-cache/sci-libs/nanoflann-1.2.3
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-cpp/eigen:* sys-devel/make >=dev-util/cmake-3.7.2
+DEPEND=dev-cpp/eigen:3 sys-devel/make >=dev-util/cmake-3.7.2
 DESCRIPTION=C++ header-only library for Nearest Neighbor (NN) search wih KD-trees
 EAPI=6
 HOMEPAGE=https://github.com/jlblancoc/nanoflann
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
-RDEPEND=dev-cpp/eigen:*
+RDEPEND=dev-cpp/eigen:3
 SLOT=0
 SRC_URI=https://github.com/jlblancoc/nanoflann/archive/v1.2.3.tar.gz -> nanoflann-1.2.3.tar.gz
 _eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=b8d3831ead8056035585d88c46cd85a0
+_md5_=0fd34bd9689c9ea457ede63164b8e258
diff --git a/metadata/md5-cache/sci-libs/nanoflann-9999 b/metadata/md5-cache/sci-libs/nanoflann-9999
index 115a8fb07d84..193efad540f3 100644
--- a/metadata/md5-cache/sci-libs/nanoflann-9999
+++ b/metadata/md5-cache/sci-libs/nanoflann-9999
@@ -1,10 +1,10 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-cpp/eigen:* sys-devel/make >=dev-util/cmake-3.7.2 >=dev-vcs/git-1.8.2.1
+DEPEND=dev-cpp/eigen:3 sys-devel/make >=dev-util/cmake-3.7.2 >=dev-vcs/git-1.8.2.1
 DESCRIPTION=C++ header-only library for Nearest Neighbor (NN) search wih KD-trees
 EAPI=6
 HOMEPAGE=https://github.com/jlblancoc/nanoflann
 LICENSE=BSD
-RDEPEND=dev-cpp/eigen:*
+RDEPEND=dev-cpp/eigen:3
 SLOT=0
 _eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	git-r3	52a888802d25387c2c74cb845d1219bc	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=ecb4aebe571c59a767e17ae4c4f32acd
+_md5_=0fd34bd9689c9ea457ede63164b8e258
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index e62f9702780d..74d019cdc130 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/clrngd-1.0.3 b/metadata/md5-cache/sys-apps/clrngd-1.0.3
index f249b5970c10..849ebf8e489f 100644
--- a/metadata/md5-cache/sys-apps/clrngd-1.0.3
+++ b/metadata/md5-cache/sys-apps/clrngd-1.0.3
@@ -1,10 +1,9 @@
-DEFINED_PHASES=compile install
-DEPEND=sys-devel/gcc
+DEFINED_PHASES=configure install
 DESCRIPTION=Clock randomness gathering daemon
-EAPI=0
+EAPI=6
 HOMEPAGE=http://echelon.pl/pubs/
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://echelon.pl/pubs/clrngd-1.0.3.tar.gz
-_md5_=5ea79809e16de7d73cc3cf7887b47a53
+_md5_=659494ea26234387a3dd3734f518f1f4
diff --git a/metadata/md5-cache/sys-apps/inxi-2.3.47 b/metadata/md5-cache/sys-apps/inxi-2.3.47
new file mode 100644
index 000000000000..96c32676db26
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/inxi-2.3.47
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DESCRIPTION=The CLI inxi collects and prints hardware and system information
+EAPI=6
+HOMEPAGE=https://github.com/smxi/inxi
+IUSE=bluetooth hddtemp opengl
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
+LICENSE=GPL-3
+RDEPEND=>=app-shells/bash-3.0 sys-apps/pciutils sys-apps/usbutils bluetooth? ( net-wireless/bluez ) hddtemp? ( app-admin/hddtemp ) opengl? ( x11-apps/mesa-progs )
+SLOT=0
+SRC_URI=https://github.com/smxi/inxi/tarball/0a9ac17c8ea0b0ab61ba0ad50b34c9a4765ed7a0 -> inxi-2.3.47.tar.gz
+_md5_=1be58759e95b00c4c8863cc0fad61bf2
diff --git a/metadata/md5-cache/sys-apps/lssbus-0.1 b/metadata/md5-cache/sys-apps/lssbus-0.1
index fdfc3eea7e92..6f5e964fcc69 100644
--- a/metadata/md5-cache/sys-apps/lssbus-0.1
+++ b/metadata/md5-cache/sys-apps/lssbus-0.1
@@ -1,9 +1,9 @@
 DEFINED_PHASES=install
 DESCRIPTION=Small utility for Linux/SPARC that list devices on SBUS
-EAPI=0
+EAPI=6
 HOMEPAGE=https://people.redhat.com/tcallawa/lssbus/
 KEYWORDS=-* sparc
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://people.redhat.com/tcallawa/lssbus/lssbus-0.1.tar.gz
-_md5_=a0e57735e100c739f9942b2e36ae1213
+_md5_=6c5f2929c259aef6dfa097a971d58bae
diff --git a/metadata/md5-cache/sys-apps/man-pages-4.14 b/metadata/md5-cache/sys-apps/man-pages-4.14
new file mode 100644
index 000000000000..e52848637437
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/man-pages-4.14
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install
+DESCRIPTION=A somewhat comprehensive collection of Linux man pages
+EAPI=5
+HOMEPAGE=https://www.kernel.org/doc/man-pages/
+IUSE=nls l10n_da l10n_de l10n_fr l10n_it l10n_ja l10n_nl l10n_pl l10n_ro l10n_ru l10n_zh-CN
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux
+LICENSE=man-pages GPL-2+ BSD
+PDEPEND=nls? ( l10n_da? ( app-i18n/man-pages-da ) l10n_de? ( app-i18n/man-pages-de ) l10n_fr? ( app-i18n/man-pages-fr ) l10n_it? ( app-i18n/man-pages-it ) l10n_ja? ( app-i18n/man-pages-ja ) l10n_nl? ( app-i18n/man-pages-nl ) l10n_pl? ( app-i18n/man-pages-pl ) l10n_ro? ( app-i18n/man-pages-ro ) l10n_ru? ( app-i18n/man-pages-ru ) l10n_zh-CN? ( app-i18n/man-pages-zh_CN ) ) sys-apps/man-pages-posix
+RDEPEND=virtual/man !<sys-apps/keyutils-1.5.9-r3 !<sys-apps/attr-2.4.47-r2 !<dev-libs/libaio-0.3.109-r2 !<dev-libs/libbsd-0.8.3-r1
+RESTRICT=binchecks
+SLOT=0
+SRC_URI=mirror://kernel/linux/docs/man-pages/Archive/man-pages-4.14.tar.xz mirror://kernel/linux/docs/man-pages/man-pages-4.14.tar.xz mirror://gentoo/man-pages-gentoo-2.tar.bz2 https://dev.gentoo.org/~cardoe/files/man-pages-gentoo-2.tar.bz2
+_md5_=d7537746aef460bef074fe760a3efd70
diff --git a/metadata/md5-cache/sys-auth/Manifest.gz b/metadata/md5-cache/sys-auth/Manifest.gz
index 351533fca2ec..bce17288cfc6 100644
Binary files a/metadata/md5-cache/sys-auth/Manifest.gz and b/metadata/md5-cache/sys-auth/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-auth/consolekit-1.1.2 b/metadata/md5-cache/sys-auth/consolekit-1.1.2
index f3d3d4be98ef..e6edb9201a53 100644
--- a/metadata/md5-cache/sys-auth/consolekit-1.1.2
+++ b/metadata/md5-cache/sys-auth/consolekit-1.1.2
@@ -4,10 +4,10 @@ DESCRIPTION=Framework for defining and tracking users, login sessions and seats
 EAPI=6
 HOMEPAGE=https://github.com/ConsoleKit2/ConsoleKit2 https://www.freedesktop.org/wiki/Software/ConsoleKit
 IUSE=acl cgroups debug doc evdev kernel_linux pam pm-utils policykit selinux test udev
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.40:2=[dbus] >=sys-devel/gettext-0.19 sys-apps/dbus sys-libs/zlib:= x11-libs/libX11:= acl? ( sys-apps/acl:= >=virtual/udev-200 ) cgroups? ( app-admin/cgmanager >=sys-libs/libnih-1.0.2[dbus] ) evdev? ( dev-libs/libevdev:= ) udev? ( virtual/libudev x11-libs/libdrm:= ) pam? ( virtual/pam ) policykit? ( >=sys-auth/polkit-0.110 ) selinux? ( sys-libs/libselinux ) kernel_linux? ( sys-apps/coreutils[acl?] ) pm-utils? ( sys-power/pm-utils ) selinux? ( sec-policy/selinux-consolekit )
 SLOT=0
 SRC_URI=https://github.com/ConsoleKit2/ConsoleKit2/releases/download/1.1.2/ConsoleKit2-1.1.2.tar.bz2
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	libtool	0081a71a261724730ec4c248494f044d	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=8dc6bcebfef69a9b8e2a21d75fe2269c
+_md5_=8633c33d9ac3f309977863e9a5fd478e
diff --git a/metadata/md5-cache/sys-auth/polkit-0.113-r4 b/metadata/md5-cache/sys-auth/polkit-0.113-r4
index 1ccca2f3cfe8..82929d0b7d34 100644
--- a/metadata/md5-cache/sys-auth/polkit-0.113-r4
+++ b/metadata/md5-cache/sys-auth/polkit-0.113-r4
@@ -4,7 +4,7 @@ DESCRIPTION=Policy framework for controlling privileges for system-wide services
 EAPI=6
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/polkit
 IUSE=elogind examples gtk +introspection jit kde nls pam selinux systemd test
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86
 LICENSE=LGPL-2
 PDEPEND=gtk? ( || ( >=gnome-extra/polkit-gnome-0.105 >=lxde-base/lxsession-0.5.2 ) ) kde? ( kde-plasma/polkit-kde-agent ) !systemd? ( !elogind? ( sys-auth/consolekit[policykit] ) )
 RDEPEND=dev-lang/spidermonkey:0/mozjs185[-debug] dev-libs/glib:2 dev-libs/expat elogind? ( sys-auth/elogind ) introspection? ( dev-libs/gobject-introspection ) pam? ( sys-auth/pambase virtual/pam ) systemd? ( sys-apps/systemd:0= ) selinux? ( sec-policy/selinux-policykit )
@@ -12,4 +12,4 @@ REQUIRED_USE=?? ( elogind systemd )
 SLOT=0
 SRC_URI=https://www.freedesktop.org/software/polkit/releases/polkit-0.113.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	pax-utils	4f95120230a315c8caaabeb2307b7eee	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c2b372d85ee37f373a94237c581632ff
+_md5_=5c7af19402cb4dc28291e07719c5b6c5
diff --git a/metadata/md5-cache/sys-auth/rtkit-0.11-r2 b/metadata/md5-cache/sys-auth/rtkit-0.11-r2
index e83739932b60..20bef336ab19 100644
--- a/metadata/md5-cache/sys-auth/rtkit-0.11-r2
+++ b/metadata/md5-cache/sys-auth/rtkit-0.11-r2
@@ -3,10 +3,10 @@ DEPEND=sys-apps/dbus sys-auth/polkit sys-libs/libcap virtual/pkgconfig >=app-por
 DESCRIPTION=Realtime Policy and Watchdog Daemon
 EAPI=6
 HOMEPAGE=http://0pointer.de/blog/projects/rtkit
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sh ~sparc x86
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sh sparc x86
 LICENSE=GPL-3 BSD
 RDEPEND=sys-apps/dbus sys-auth/polkit sys-libs/libcap
 SLOT=0
 SRC_URI=http://0pointer.de/public/rtkit-0.11.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	libtool	0081a71a261724730ec4c248494f044d	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	user	8bc2845510e2109af75e3eeac607ec81	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=a768c9ce313eff19d35535d3fee735f2
+_md5_=0de8351e53c44cdcca5e0c9a7648cb2c
diff --git a/metadata/md5-cache/sys-block/Manifest.gz b/metadata/md5-cache/sys-block/Manifest.gz
index 9927ed2f9402..fe7507a45634 100644
Binary files a/metadata/md5-cache/sys-block/Manifest.gz and b/metadata/md5-cache/sys-block/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-block/qla-fc-firmware-20101015 b/metadata/md5-cache/sys-block/qla-fc-firmware-20101015
index 4f19803831e8..46aafd8207f9 100644
--- a/metadata/md5-cache/sys-block/qla-fc-firmware-20101015
+++ b/metadata/md5-cache/sys-block/qla-fc-firmware-20101015
@@ -1,10 +1,10 @@
 DEFINED_PHASES=install
 DESCRIPTION=QLogic Linux Fibre Channel HBA Firmware for ql2xxx cards
-EAPI=0
+EAPI=6
 HOMEPAGE=ftp://ftp.qlogic.com/outgoing/linux/firmware/
 KEYWORDS=amd64 ppc ppc64 sparc x86
 LICENSE=qlogic-fibre-channel-firmware
 RDEPEND=!sys-kernel/linux-firmware
 SLOT=0
 SRC_URI=mirror://gentoo/qla-fc-firmware-20101015.tar.bz2
-_md5_=b2a389419a7a2f42b7797ea39a7a8054
+_md5_=0077beb8485864a2a278699d540121f8
diff --git a/metadata/md5-cache/sys-boot/Manifest.gz b/metadata/md5-cache/sys-boot/Manifest.gz
index 039d14989464..371f5d3664c3 100644
Binary files a/metadata/md5-cache/sys-boot/Manifest.gz and b/metadata/md5-cache/sys-boot/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-boot/milo-2.4.18 b/metadata/md5-cache/sys-boot/milo-2.4.18
index e8fd1322f576..507282559e8c 100644
--- a/metadata/md5-cache/sys-boot/milo-2.4.18
+++ b/metadata/md5-cache/sys-boot/milo-2.4.18
@@ -9,4 +9,4 @@ RDEPEND=sys-fs/mtools
 SLOT=0
 SRC_URI=http://www.suse.de/~stepan/source/milo-2.2-18.tar.bz2 mirror://kernel/linux/kernel/v2.2/linux-2.2.25.tar.bz2 https://dev.gentoo.org/~taviso/milo/ldmilo-patched-20010430 http://ftp.namesys.com/pub/reiserfs-for-2.2/linux-2.2.20-reiserfs-3.5.35.diff.bz2 https://dev.gentoo.org/~taviso/milo/linload.exe http://www.ibiblio.org/pub/Linux/docs/HOWTO/MILO-HOWTO
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=884a42303c4091356f1a879a90fee643
+_md5_=3e56b62f69ee24011e261068ff8b28d8
diff --git a/metadata/md5-cache/sys-cluster/Manifest.gz b/metadata/md5-cache/sys-cluster/Manifest.gz
index dbc0c589134f..6cea2d99f959 100644
Binary files a/metadata/md5-cache/sys-cluster/Manifest.gz and b/metadata/md5-cache/sys-cluster/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-cluster/glusterfs-3.12.3 b/metadata/md5-cache/sys-cluster/glusterfs-3.12.3
index 7a3e423f70bb..69cbd639090b 100644
--- a/metadata/md5-cache/sys-cluster/glusterfs-3.12.3
+++ b/metadata/md5-cache/sys-cluster/glusterfs-3.12.3
@@ -4,7 +4,7 @@ DESCRIPTION=GlusterFS is a powerful network/cluster filesystem
 EAPI=6
 HOMEPAGE=https://www.gluster.org/
 IUSE=bd-xlator crypt-xlator debug emacs +fuse +georeplication glupy infiniband +libtirpc qemu-block rsyslog static-libs +syslog systemtap test +tiering vim-syntax +xml python_targets_python2_7
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 x86
 LICENSE=|| ( GPL-2 LGPL-3+ )
 RDEPEND=bd-xlator? ( sys-fs/lvm2 ) !elibc_glibc? ( sys-libs/argp-standalone ) emacs? ( virtual/emacs ) fuse? ( >=sys-fs/fuse-2.7.0:0 ) georeplication? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) infiniband? ( sys-fabric/libibverbs:* sys-fabric/librdmacm:* ) libtirpc? ( net-libs/libtirpc:= ) !libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) ) qemu-block? ( dev-libs/glib:2 ) systemtap? ( dev-util/systemtap ) tiering? ( dev-db/sqlite:3 ) xml? ( dev-libs/libxml2 ) sys-libs/readline:= dev-libs/libaio dev-libs/openssl:=[-bindist] dev-libs/userspace-rcu:= net-libs/rpcsvc-proto sys-apps/util-linux
 REQUIRED_USE=georeplication? ( python_targets_python2_7 ) glupy? ( python_targets_python2_7 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://download.gluster.org/pub/gluster/glusterfs/3.12/3.12.3/glusterfs-3.12.3.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	user	8bc2845510e2109af75e3eeac607ec81	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=64b56ec34af3770a83c02406ab6bc202
+_md5_=4256593205ad1488ad9d5db1d3ca2bf7
diff --git a/metadata/md5-cache/sys-cluster/heat-8.0.4 b/metadata/md5-cache/sys-cluster/heat-8.0.4
deleted file mode 100644
index cf615d024744..000000000000
--- a/metadata/md5-cache/sys-cluster/heat-8.0.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pbr-1.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] app-admin/sudo python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=A CloudFormation-compatible openstack-native cloud orchistration engine.
-EAPI=6
-HOMEPAGE=https://launchpad.net/heat
-IUSE=+mysql +memcached postgres sqlite python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-1.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/Babel-2.3.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/croniter-0.3.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/cryptography-1.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/cryptography-1.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/debtcollector-1.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/eventlet-0.18.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/keystoneauth-2.18.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/keystonemiddleware-4.12.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/lxml-2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/lxml-3.7.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/netaddr-0.7.13[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/netaddr-0.7.16[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-cache-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-config-3.14.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-config-3.18.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-concurrency-3.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-context-2.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-db-4.15.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-i18n-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-log-3.11.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-messaging-5.14.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-middleware-3.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-policy-1.17.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-reports-0.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-serialization-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-service-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-utils-3.18.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/osprofiler-1.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-versionedobjects-1.17.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pastedeploy-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pycrypto-2.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/aodhclient-0.7.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-barbicanclient-4.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-ceilometerclient-2.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-cinderclient-1.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/python-cinderclient-1.7.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/python-cinderclient-1.7.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-designateclient-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-glanceclient-2.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-heatclient-1.6.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-keystoneclient-3.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-magnumclient-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-manilaclient-1.12.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-mistralclient-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-monascaclient-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-neutronclient-5.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-novaclient-6.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/python-novaclient-7.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-openstackclient-3.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-saharaclient-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-senlinclient-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-swiftclient-3.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-troveclient-2.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-zaqarclient-1.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pytz-2013.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pyyaml-3.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/requests-2.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/requests-2.12.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/tenacity-3.2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/routes-1.12.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/routes-2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/routes-2.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/routes-2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] sqlite? ( >=dev-python/sqlalchemy-1.0.10[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/sqlalchemy-1.1.0[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) mysql? ( >=dev-python/pymysql-0.7.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/pymysql-0.7.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/sqlalchemy-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) postgres? ( >=dev-python/psycopg-2.5.0 >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/sqlalchemy-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) >=dev-python/sqlalchemy-migrate-0.9.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/stevedore-1.17.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/webob-1.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/yaql-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( mysql postgres sqlite ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=https://tarballs.openstack.org/heat/heat-8.0.4.tar.gz https://dev.gentoo.org/~prometheanfire/dist/openstack/heat/heat.conf.sample.ocata -> heat.conf.sample-8.0.4
-_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	user	8bc2845510e2109af75e3eeac607ec81	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=09d29f911bb2cfc3f9e51befa6b909db
diff --git a/metadata/md5-cache/sys-cluster/heat-8.0.5 b/metadata/md5-cache/sys-cluster/heat-8.0.5
index ed3675b96859..ca1095451906 100644
--- a/metadata/md5-cache/sys-cluster/heat-8.0.5
+++ b/metadata/md5-cache/sys-cluster/heat-8.0.5
@@ -4,11 +4,11 @@ DESCRIPTION=A CloudFormation-compatible openstack-native cloud orchistration eng
 EAPI=6
 HOMEPAGE=https://launchpad.net/heat
 IUSE=+mysql +memcached postgres sqlite python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-1.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/Babel-2.3.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/croniter-0.3.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/cryptography-1.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/cryptography-1.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/debtcollector-1.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/eventlet-0.18.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/keystoneauth-2.18.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/keystonemiddleware-4.12.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/lxml-2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/lxml-3.7.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/netaddr-0.7.13[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/netaddr-0.7.16[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-cache-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-config-3.14.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-config-3.18.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-concurrency-3.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-context-2.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-db-4.15.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-i18n-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-log-3.11.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-messaging-5.14.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-middleware-3.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-policy-1.17.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-reports-0.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-serialization-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-service-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-utils-3.18.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/osprofiler-1.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-versionedobjects-1.17.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pastedeploy-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pycrypto-2.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/aodhclient-0.7.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-barbicanclient-4.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-ceilometerclient-2.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-cinderclient-1.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/python-cinderclient-1.7.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/python-cinderclient-1.7.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-designateclient-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-glanceclient-2.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-heatclient-1.6.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-keystoneclient-3.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-magnumclient-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-manilaclient-1.12.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-mistralclient-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-monascaclient-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-neutronclient-5.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-novaclient-6.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/python-novaclient-7.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-openstackclient-3.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-saharaclient-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-senlinclient-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-swiftclient-3.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-troveclient-2.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-zaqarclient-1.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pytz-2013.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pyyaml-3.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/requests-2.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/requests-2.12.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/tenacity-3.2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/routes-1.12.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/routes-2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/routes-2.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/routes-2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] sqlite? ( >=dev-python/sqlalchemy-1.0.10[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/sqlalchemy-1.1.0[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) mysql? ( >=dev-python/pymysql-0.7.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/pymysql-0.7.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/sqlalchemy-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) postgres? ( >=dev-python/psycopg-2.5.0 >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/sqlalchemy-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) >=dev-python/sqlalchemy-migrate-0.9.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/stevedore-1.17.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/webob-1.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/yaql-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( mysql postgres sqlite ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=https://tarballs.openstack.org/heat/heat-8.0.5.tar.gz https://dev.gentoo.org/~prometheanfire/dist/openstack/heat/heat.conf.sample.ocata -> heat.conf.sample-8.0.5
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	user	8bc2845510e2109af75e3eeac607ec81	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7aa68dcf4165788b8e904737e5fdc47d
+_md5_=09d29f911bb2cfc3f9e51befa6b909db
diff --git a/metadata/md5-cache/sys-cluster/heat-9.0.0 b/metadata/md5-cache/sys-cluster/heat-9.0.0
deleted file mode 100644
index 820cb0c0c7e4..000000000000
--- a/metadata/md5-cache/sys-cluster/heat-9.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/pbr-2.1.0 app-admin/sudo python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=A CloudFormation-compatible openstack-native cloud orchistration engine.
-EAPI=6
-HOMEPAGE=https://launchpad.net/heat
-IUSE=+mysql +memcached postgres sqlite python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/pbr-2.1.0 >=dev-python/Babel-2.3.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/Babel-2.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/croniter-0.3.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/cryptography-1.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/cryptography-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/debtcollector-1.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/eventlet-0.18.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/eventlet-0.20.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/eventlet-0.21.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/keystoneauth-3.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/keystonemiddleware-4.12.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/lxml-2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/lxml-3.7.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/netaddr-0.7.13[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/netaddr-0.7.16[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/openstacksdk-0.9.17[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-cache-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-config-4.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-config-4.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-config-4.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-concurrency-3.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-context-2.14.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-db-4.24.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-i18n-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-i18n-3.15.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-log-3.22.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-messaging-5.24.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-messaging-5.25.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-middleware-3.27.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-policy-1.23.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-reports-0.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-serialization-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-serialization-2.19.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-service-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-utils-3.20.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/osprofiler-1.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-versionedobjects-1.17.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pastedeploy-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pycrypto-2.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/aodhclient-0.7.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-barbicanclient-4.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/python-barbicanclient-4.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/python-barbicanclient-4.5.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-ceilometerclient-2.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-cinderclient-3.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-designateclient-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-glanceclient-2.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-heatclient-1.6.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-keystoneclient-3.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-magnumclient-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-manilaclient-1.12.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-mistralclient-3.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-monascaclient-1.7.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-neutronclient-6.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-novaclient-9.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-openstackclient-3.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/python-openstackclient-3.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-saharaclient-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-senlinclient-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-swiftclient-3.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-troveclient-2.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-zaqarclient-1.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-zunclient-0.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pytz-2013.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pyyaml-3.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/requests-2.14.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/tenacity-3.2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/routes-2.3.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] sqlite? ( >=dev-python/sqlalchemy-1.0.10[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.5[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.6[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.7[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.8[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) mysql? ( >=dev-python/pymysql-0.7.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/pymysql-0.7.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) postgres? ( >=dev-python/psycopg-2.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) >=dev-python/sqlalchemy-migrate-0.11.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/stevedore-1.20.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/webob-1.7.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/yaql-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( mysql postgres sqlite ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/heat/heat.conf.sample.pike -> heat.conf.sample-9.0.0 https://tarballs.openstack.org/heat/heat-9.0.0.tar.gz
-_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	user	8bc2845510e2109af75e3eeac607ec81	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=bc7f08eaee717f6c2dfe2abcc05adcba
diff --git a/metadata/md5-cache/sys-cluster/heat-9.0.1 b/metadata/md5-cache/sys-cluster/heat-9.0.1
index 00a10376fbbd..00060d82ee4a 100644
--- a/metadata/md5-cache/sys-cluster/heat-9.0.1
+++ b/metadata/md5-cache/sys-cluster/heat-9.0.1
@@ -4,11 +4,11 @@ DESCRIPTION=A CloudFormation-compatible openstack-native cloud orchistration eng
 EAPI=6
 HOMEPAGE=https://launchpad.net/heat
 IUSE=+mysql +memcached postgres sqlite python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/pbr-2.1.0 >=dev-python/Babel-2.3.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/Babel-2.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/croniter-0.3.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/cryptography-1.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/cryptography-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/debtcollector-1.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/eventlet-0.18.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/eventlet-0.20.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/eventlet-0.21.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/keystoneauth-3.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/keystonemiddleware-4.12.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/lxml-2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/lxml-3.7.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/netaddr-0.7.13[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/netaddr-0.7.16[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/openstacksdk-0.9.17[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-cache-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-config-4.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-config-4.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-config-4.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-concurrency-3.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-context-2.14.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-db-4.24.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-i18n-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-i18n-3.15.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-log-3.22.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-messaging-5.24.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-messaging-5.25.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-middleware-3.27.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-policy-1.23.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-reports-0.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-serialization-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-serialization-2.19.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-service-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-utils-3.20.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/osprofiler-1.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-versionedobjects-1.17.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pastedeploy-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pycrypto-2.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/aodhclient-0.7.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-barbicanclient-4.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/python-barbicanclient-4.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/python-barbicanclient-4.5.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-ceilometerclient-2.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-cinderclient-3.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-designateclient-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-glanceclient-2.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-heatclient-1.6.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-keystoneclient-3.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-magnumclient-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-manilaclient-1.12.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-mistralclient-3.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-monascaclient-1.7.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-neutronclient-6.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-novaclient-9.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-openstackclient-3.11.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-saharaclient-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-senlinclient-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-swiftclient-3.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-troveclient-2.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-zaqarclient-1.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-zunclient-0.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pytz-2013.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pyyaml-3.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/requests-2.14.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/tenacity-3.2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/routes-2.3.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] sqlite? ( >=dev-python/sqlalchemy-1.0.10[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.5[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.6[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.7[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.8[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) mysql? ( >=dev-python/pymysql-0.7.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/pymysql-0.7.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) postgres? ( >=dev-python/psycopg-2.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) >=dev-python/sqlalchemy-migrate-0.11.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/stevedore-1.20.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/webob-1.7.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/yaql-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( mysql postgres sqlite ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/heat/heat.conf.sample.pike -> heat.conf.sample-9.0.1 https://tarballs.openstack.org/heat/heat-9.0.1.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	user	8bc2845510e2109af75e3eeac607ec81	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=36e727f1f57a149d4ea8dbbebe7fa9c6
+_md5_=70ca5657faa26782d428b63aad9b1eaf
diff --git a/metadata/md5-cache/sys-cluster/openmpi-2.0.4 b/metadata/md5-cache/sys-cluster/openmpi-2.0.4
new file mode 100644
index 000000000000..c8ac13d6156c
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/openmpi-2.0.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install preinst prepare setup test
+DEPEND=!sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/nullmpi !sys-cluster/mpiexec >=dev-libs/libevent-2.0.22[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,threads] dev-libs/libltdl:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-apps/hwloc-2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,numa?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1 ) elibc_FreeBSD? ( dev-libs/libexecinfo ) openmpi_fabrics_ofed? ( sys-fabric/ofed:* ) openmpi_fabrics_knem? ( sys-cluster/knem ) openmpi_fabrics_psm? ( sys-fabric/infinipath-psm:* ) openmpi_rm_pbs? ( sys-cluster/torque ) openmpi_rm_slurm? ( sys-cluster/slurm ) openmpi_ofed_features_rdmacm? ( sys-fabric/librdmacm:* ) java? ( >=virtual/jdk-1.6 ) fortran? ( virtual/fortran ) java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=A high-performance message passing library (MPI)
+EAPI=6
+HOMEPAGE=http://www.open-mpi.org
+IUSE=cma cuda cxx elibc_FreeBSD fortran heterogeneous ipv6 java mpi-threads numa romio threads openmpi_fabrics_ofed openmpi_fabrics_knem openmpi_fabrics_psm openmpi_rm_pbs openmpi_rm_slurm openmpi_ofed_features_control-hdr-padding openmpi_ofed_features_connectx-xrc openmpi_ofed_features_udcm openmpi_ofed_features_rdmacm openmpi_ofed_features_dynamic-sl openmpi_ofed_features_failover elibc_FreeBSD java abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux
+LICENSE=BSD
+RDEPEND=!sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/nullmpi !sys-cluster/mpiexec >=dev-libs/libevent-2.0.22[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,threads] dev-libs/libltdl:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-apps/hwloc-2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,numa?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1 ) elibc_FreeBSD? ( dev-libs/libexecinfo ) openmpi_fabrics_ofed? ( sys-fabric/ofed:* ) openmpi_fabrics_knem? ( sys-cluster/knem ) openmpi_fabrics_psm? ( sys-fabric/infinipath-psm:* ) openmpi_rm_pbs? ( sys-cluster/torque ) openmpi_rm_slurm? ( sys-cluster/slurm ) openmpi_ofed_features_rdmacm? ( sys-fabric/librdmacm:* ) java? ( >=virtual/jre-1.6 ) fortran? ( virtual/fortran ) java? ( >=dev-java/java-config-2.2.0-r3 )
+REQUIRED_USE=openmpi_rm_slurm? ( !openmpi_rm_pbs ) openmpi_rm_pbs? ( !openmpi_rm_slurm ) openmpi_fabrics_psm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_control-hdr-padding? ( openmpi_fabrics_ofed ) openmpi_ofed_features_connectx-xrc? ( openmpi_fabrics_ofed ) openmpi_ofed_features_udcm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_rdmacm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_dynamic-sl? ( openmpi_fabrics_ofed ) openmpi_ofed_features_failover? ( openmpi_fabrics_ofed )
+SLOT=0
+SRC_URI=http://www.open-mpi.org/software/ompi/v2.0/downloads/openmpi-2.0.4.tar.bz2
+_eclasses_=cuda	626969678b9c5735753d8a380c6f295b	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	fortran-2	9e7f20c99213f0627ff7f873d4aaa25d	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=314b8ad2a81a578f7ec33f4100bbad47
diff --git a/metadata/md5-cache/sys-cluster/openmpi-2.0.3 b/metadata/md5-cache/sys-cluster/openmpi-3.0.0
similarity index 81%
rename from metadata/md5-cache/sys-cluster/openmpi-2.0.3
rename to metadata/md5-cache/sys-cluster/openmpi-3.0.0
index 1a8cd3b77139..4bdd4a3b2497 100644
--- a/metadata/md5-cache/sys-cluster/openmpi-2.0.3
+++ b/metadata/md5-cache/sys-cluster/openmpi-3.0.0
@@ -3,12 +3,12 @@ DEPEND=!sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/nullmpi !sys-cluster/
 DESCRIPTION=A high-performance message passing library (MPI)
 EAPI=6
 HOMEPAGE=http://www.open-mpi.org
-IUSE=cma cuda cxx elibc_FreeBSD fortran heterogeneous ipv6 java mpi-threads numa romio threads openmpi_fabrics_ofed openmpi_fabrics_knem openmpi_fabrics_psm openmpi_rm_pbs openmpi_rm_slurm openmpi_ofed_features_control-hdr-padding openmpi_ofed_features_connectx-xrc openmpi_ofed_features_udcm openmpi_ofed_features_rdmacm openmpi_ofed_features_dynamic-sl openmpi_ofed_features_failover elibc_FreeBSD java abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+IUSE=cma cuda cxx elibc_FreeBSD fortran heterogeneous ipv6 java numa romio openmpi_fabrics_ofed openmpi_fabrics_knem openmpi_fabrics_psm openmpi_rm_pbs openmpi_rm_slurm openmpi_ofed_features_control-hdr-padding openmpi_ofed_features_udcm openmpi_ofed_features_rdmacm openmpi_ofed_features_dynamic-sl elibc_FreeBSD java abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux
 LICENSE=BSD
 RDEPEND=!sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/nullmpi !sys-cluster/mpiexec >=dev-libs/libevent-2.0.22[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,threads] dev-libs/libltdl:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/hwloc-1.11.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,numa?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1 ) elibc_FreeBSD? ( dev-libs/libexecinfo ) openmpi_fabrics_ofed? ( sys-fabric/ofed:* ) openmpi_fabrics_knem? ( sys-cluster/knem ) openmpi_fabrics_psm? ( sys-fabric/infinipath-psm:* ) openmpi_rm_pbs? ( sys-cluster/torque ) openmpi_rm_slurm? ( sys-cluster/slurm ) openmpi_ofed_features_rdmacm? ( sys-fabric/librdmacm:* ) java? ( >=virtual/jre-1.6 ) fortran? ( virtual/fortran ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=openmpi_rm_slurm? ( !openmpi_rm_pbs ) openmpi_rm_pbs? ( !openmpi_rm_slurm ) openmpi_fabrics_psm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_control-hdr-padding? ( openmpi_fabrics_ofed ) openmpi_ofed_features_connectx-xrc? ( openmpi_fabrics_ofed ) openmpi_ofed_features_udcm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_rdmacm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_dynamic-sl? ( openmpi_fabrics_ofed ) openmpi_ofed_features_failover? ( openmpi_fabrics_ofed )
+REQUIRED_USE=openmpi_rm_slurm? ( !openmpi_rm_pbs ) openmpi_rm_pbs? ( !openmpi_rm_slurm ) openmpi_fabrics_psm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_control-hdr-padding? ( openmpi_fabrics_ofed ) openmpi_ofed_features_udcm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_rdmacm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_dynamic-sl? ( openmpi_fabrics_ofed )
 SLOT=0
-SRC_URI=http://www.open-mpi.org/software/ompi/v2.0/downloads/openmpi-2.0.3.tar.bz2
+SRC_URI=http://www.open-mpi.org/software/ompi/v3.0/downloads/openmpi-3.0.0.tar.bz2
 _eclasses_=cuda	626969678b9c5735753d8a380c6f295b	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	fortran-2	9e7f20c99213f0627ff7f873d4aaa25d	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=48f99f81801214abe23e4f672b074c9e
+_md5_=48b43136b01811cd5abf28fe9d7de29f
diff --git a/metadata/md5-cache/sys-cluster/slurm-16.05.11 b/metadata/md5-cache/sys-cluster/slurm-16.05.11
index b9fc4b3c1b01..8f39d5126257 100644
--- a/metadata/md5-cache/sys-cluster/slurm-16.05.11
+++ b/metadata/md5-cache/sys-cluster/slurm-16.05.11
@@ -8,8 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=!sys-cluster/torque !net-analyzer/slurm !net-analyzer/sinfo mysql? ( virtual/mysql ) munge? ( sys-auth/munge ) pam? ( virtual/pam ) ssl? ( dev-libs/openssl:0= ) lua? ( dev-lang/lua:0= ) !lua? ( !dev-lang/lua ) >=sys-apps/hwloc-1.1.1-r1 dev-libs/libcgroup dev-lang/perl:=
 REQUIRED_USE=torque? ( perl )
-RESTRICT=primaryuri
+RESTRICT=primaryuri test
 SLOT=0
 SRC_URI=https://www.schedmd.com/download/latest/slurm-16.05.11.tar.bz2
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	pam	3e788d86170dfcd5b06824d898315e18	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	toolchain-funcs	185a06792159ca143528e7010368e8af	user	8bc2845510e2109af75e3eeac607ec81	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=9167aff07f9d79dd8f3e308404bc9a62
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	pam	3e788d86170dfcd5b06824d898315e18	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	prefix	7b6fb2fc216b101b5d97d171925a847c	toolchain-funcs	185a06792159ca143528e7010368e8af	user	8bc2845510e2109af75e3eeac607ec81	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=b9eabbe65b963c52b44fa8641ca344bb
diff --git a/metadata/md5-cache/sys-cluster/slurm-17.02.9 b/metadata/md5-cache/sys-cluster/slurm-17.02.9
index 833764f260b2..5181c593dc8a 100644
--- a/metadata/md5-cache/sys-cluster/slurm-17.02.9
+++ b/metadata/md5-cache/sys-cluster/slurm-17.02.9
@@ -8,8 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=!sys-cluster/torque !net-analyzer/slurm !net-analyzer/sinfo mysql? ( virtual/mysql ) munge? ( sys-auth/munge ) pam? ( virtual/pam ) ssl? ( dev-libs/openssl:0= ) lua? ( dev-lang/lua:0= ) !lua? ( !dev-lang/lua ) >=sys-apps/hwloc-1.1.1-r1 dev-libs/libcgroup dev-lang/perl:=
 REQUIRED_USE=torque? ( perl )
-RESTRICT=primaryuri
+RESTRICT=primaryuri test
 SLOT=0
 SRC_URI=https://www.schedmd.com/download/latest/slurm-17.02.9.tar.bz2
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	pam	3e788d86170dfcd5b06824d898315e18	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	toolchain-funcs	185a06792159ca143528e7010368e8af	user	8bc2845510e2109af75e3eeac607ec81	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=cff0a8f93b6f9ecf25b57f8a1cd8f1fd
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	pam	3e788d86170dfcd5b06824d898315e18	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	prefix	7b6fb2fc216b101b5d97d171925a847c	toolchain-funcs	185a06792159ca143528e7010368e8af	user	8bc2845510e2109af75e3eeac607ec81	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=986e7d2ebbd4d4b56bedb301d5f0b7da
diff --git a/metadata/md5-cache/sys-freebsd/Manifest.gz b/metadata/md5-cache/sys-freebsd/Manifest.gz
index 49b58341b58c..17952b2ba525 100644
Binary files a/metadata/md5-cache/sys-freebsd/Manifest.gz and b/metadata/md5-cache/sys-freebsd/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-freebsd/freebsd-share-11.1 b/metadata/md5-cache/sys-freebsd/freebsd-share-11.1
index f9e210d8f218..0d2343400f74 100644
--- a/metadata/md5-cache/sys-freebsd/freebsd-share-11.1
+++ b/metadata/md5-cache/sys-freebsd/freebsd-share-11.1
@@ -11,4 +11,4 @@ RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://freebsd/releases/i386/11.1-RELEASE/src.txz -> freebsd-src-11.1.tar.xz
 _eclasses_=bsdmk	f76f6fc364f04987bc60c4ea3cad594c	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	freebsd	11f01cb2f2075a8c7bd1add8a60013a1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=554063da47d21b4b8390908b5c0be826
+_md5_=59e848a5801cad4fb8a90fee5d954357
diff --git a/metadata/md5-cache/sys-freebsd/freebsd-sources-11.1_p1 b/metadata/md5-cache/sys-freebsd/freebsd-sources-11.1_p2
similarity index 72%
rename from metadata/md5-cache/sys-freebsd/freebsd-sources-11.1_p1
rename to metadata/md5-cache/sys-freebsd/freebsd-sources-11.1_p2
index 6cb41df7c3d1..e187330460fc 100644
--- a/metadata/md5-cache/sys-freebsd/freebsd-sources-11.1_p1
+++ b/metadata/md5-cache/sys-freebsd/freebsd-sources-11.1_p2
@@ -9,6 +9,6 @@ LICENSE=BSD dtrace? ( CDDL ) zfs? ( CDDL )
 RDEPEND=dtrace? ( >=sys-freebsd/freebsd-cddl-9.2_rc1 ) =sys-freebsd/freebsd-mk-defs-11.1* !sys-freebsd/virtio-kmod !sys-fs/fuse4bsd !<sys-freebsd/freebsd-sources-9.2_beta1
 RESTRICT=strip binchecks
 SLOT=0
-SRC_URI=mirror://freebsd/releases/i386/11.1-RELEASE/src.txz -> freebsd-src-11.1.tar.xz https://security.freebsd.org/patches/EN-17:07/vnet.patch -> freebsd-sources-EN-1707-vnet.patch https://security.freebsd.org/patches/EN-17:08/pf.patch -> freebsd-sources-EN-1708-pf.patch
+SRC_URI=mirror://freebsd/releases/i386/11.1-RELEASE/src.txz -> freebsd-src-11.1.tar.xz https://security.freebsd.org/patches/SA-17:08/ptrace.patch -> freebsd-sources-SA-1708-ptrace.patch https://security.freebsd.org/patches/SA-17:10/kldstat.patch -> freebsd-sources-SA-1710-kldstat.patch https://security.freebsd.org/patches/EN-17:07/vnet.patch -> freebsd-sources-EN-1707-vnet.patch https://security.freebsd.org/patches/EN-17:08/pf.patch -> freebsd-sources-EN-1708-pf.patch
 _eclasses_=bsdmk	f76f6fc364f04987bc60c4ea3cad594c	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	freebsd	11f01cb2f2075a8c7bd1add8a60013a1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=d9b7721ddba742e4fcb4cb5a64e6d083
+_md5_=18e0a5a8cdb5137f7df0d79db2cb079f
diff --git a/metadata/md5-cache/sys-freebsd/freebsd-ubin-11.1 b/metadata/md5-cache/sys-freebsd/freebsd-ubin-11.1
index 36fc187c29c4..028b5d45a263 100644
--- a/metadata/md5-cache/sys-freebsd/freebsd-ubin-11.1
+++ b/metadata/md5-cache/sys-freebsd/freebsd-ubin-11.1
@@ -10,4 +10,4 @@ RDEPEND==sys-freebsd/freebsd-lib-11.1*[usb?,bluetooth?,abi_x86_32(-)?,abi_x86_64
 SLOT=0
 SRC_URI=mirror://freebsd/releases/i386/11.1-RELEASE/src.txz -> freebsd-src-11.1.tar.xz
 _eclasses_=bsdmk	f76f6fc364f04987bc60c4ea3cad594c	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	freebsd	11f01cb2f2075a8c7bd1add8a60013a1	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	pam	3e788d86170dfcd5b06824d898315e18	portability	2b88d3ecc35035a3b8ab628b49cafb0e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=0b500cdf6baff85ab71cf8922d78a00b
+_md5_=bdb173e81da5b44e4c9854b616aaecac
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index 021e6a6bf2ea..3a32b624614c 100644
Binary files a/metadata/md5-cache/sys-kernel/Manifest.gz and b/metadata/md5-cache/sys-kernel/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-kernel/genkernel-next-65 b/metadata/md5-cache/sys-kernel/genkernel-next-65
deleted file mode 100644
index 0e93fe6b18a9..000000000000
--- a/metadata/md5-cache/sys-kernel/genkernel-next-65
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=app-text/asciidoc sys-fs/e2fsprogs !sys-fs/eudev[-kmod,modutils] selinux? ( sys-libs/libselinux )
-DESCRIPTION=Gentoo automatic kernel building scripts, reloaded
-EAPI=6
-HOMEPAGE=https://www.gentoo.org/
-IUSE=cryptsetup dmraid gpg iscsi mdadm plymouth selinux
-KEYWORDS=~alpha amd64 ~arm ia64 ppc ppc64 x86
-LICENSE=GPL-2
-RDEPEND=app-text/asciidoc sys-fs/e2fsprogs !sys-fs/eudev[-kmod,modutils] selinux? ( sys-libs/libselinux ) !sys-kernel/genkernel cryptsetup? ( sys-fs/cryptsetup ) dmraid? ( >=sys-fs/dmraid-1.0.0_rc16 ) gpg? ( app-crypt/gnupg ) iscsi? ( sys-block/open-iscsi ) mdadm? ( sys-fs/mdadm ) plymouth? ( sys-boot/plymouth ) app-portage/portage-utils app-arch/cpio >=app-misc/pax-utils-0.6 !<sys-apps/openrc-0.9.9 sys-apps/util-linux sys-block/thin-provisioning-tools sys-fs/lvm2
-SLOT=0
-SRC_URI=https://github.com/Sabayon/genkernel-next/archive/v65.tar.gz -> genkernel-next-65.tar.gz
-_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=b0c91e8ad789ad74afb089cfc18a5e8f
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-4.11.12_p13 b/metadata/md5-cache/sys-kernel/rt-sources-3.18.82_p88
similarity index 63%
rename from metadata/md5-cache/sys-kernel/rt-sources-4.11.12_p13
rename to metadata/md5-cache/sys-kernel/rt-sources-3.18.82_p88
index eaa001aa810c..b9b20501d316 100644
--- a/metadata/md5-cache/sys-kernel/rt-sources-4.11.12_p13
+++ b/metadata/md5-cache/sys-kernel/rt-sources-3.18.82_p88
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
 DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
-DESCRIPTION=Full Linux 4.11 kernel sources with the CONFIG_PREEMPT_RT patch
+DESCRIPTION=Full Linux 3.18 kernel sources with the CONFIG_PREEMPT_RT patch
 EAPI=6
 HOMEPAGE=https://www.kernel.org/ https://www.gentoo.org/ https://www.kernel.org/pub/linux/kernel/projects/rt/ http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags
 IUSE=symlink build deblob
@@ -8,7 +8,7 @@ KEYWORDS=~amd64
 LICENSE=GPL-2 !deblob? ( freedist )
 RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
 RESTRICT=binchecks strip
-SLOT=4.11.12_p13
-SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.11.12.xz mirror://kernel/linux/kernel/v4.x/linux-4.11.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.11-gnu/deblob-4.11 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.11-gnu/deblob-check -> deblob-check-4.11 ) mirror://kernel/linux/kernel/projects/rt/4.11/patch-4.11.12-rt13.patch.xz mirror://kernel/linux/kernel/projects/rt/4.11/older/patch-4.11.12-rt13.patch.xz
+SLOT=3.18.82_p88
+SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.18.82.xz mirror://kernel/linux/kernel/v3.x/linux-3.18.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.18-gnu/deblob-3.18 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.18-gnu/deblob-check -> deblob-check-3.18 ) mirror://kernel/linux/kernel/projects/rt/3.18/patch-3.18.82-rt88.patch.xz mirror://kernel/linux/kernel/projects/rt/3.18/older/patch-3.18.82-rt88.patch.xz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	kernel-2	880361b861490d9503f47d4f16e05f2c	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=4cbe80675612d523b955d0c55fdc34f6
+_md5_=003f54fe0756b0ba387ee77c54b5ea27
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-4.1.46_p51 b/metadata/md5-cache/sys-kernel/rt-sources-4.1.46_p51
new file mode 100644
index 000000000000..0a40c9aea64a
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/rt-sources-4.1.46_p51
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
+DESCRIPTION=Full Linux 4.1 kernel sources with the CONFIG_PREEMPT_RT patch
+EAPI=6
+HOMEPAGE=https://www.kernel.org/ https://www.gentoo.org/ https://www.kernel.org/pub/linux/kernel/projects/rt/ http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags
+IUSE=symlink build deblob
+KEYWORDS=~amd64
+LICENSE=GPL-2 !deblob? ( freedist )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=4.1.46_p51
+SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.1.46.xz mirror://kernel/linux/kernel/v4.x/linux-4.1.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.1-gnu/deblob-4.1 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.1-gnu/deblob-check -> deblob-check-4.1 ) mirror://kernel/linux/kernel/projects/rt/4.1/patch-4.1.46-rt51.patch.xz mirror://kernel/linux/kernel/projects/rt/4.1/older/patch-4.1.46-rt51.patch.xz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	kernel-2	880361b861490d9503f47d4f16e05f2c	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=003f54fe0756b0ba387ee77c54b5ea27
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-4.11.12_p14 b/metadata/md5-cache/sys-kernel/rt-sources-4.13.13_p5
similarity index 63%
rename from metadata/md5-cache/sys-kernel/rt-sources-4.11.12_p14
rename to metadata/md5-cache/sys-kernel/rt-sources-4.13.13_p5
index 7573fb3f7230..5c8e38818cd5 100644
--- a/metadata/md5-cache/sys-kernel/rt-sources-4.11.12_p14
+++ b/metadata/md5-cache/sys-kernel/rt-sources-4.13.13_p5
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
 DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
-DESCRIPTION=Full Linux 4.11 kernel sources with the CONFIG_PREEMPT_RT patch
+DESCRIPTION=Full Linux 4.13 kernel sources with the CONFIG_PREEMPT_RT patch
 EAPI=6
 HOMEPAGE=https://www.kernel.org/ https://www.gentoo.org/ https://www.kernel.org/pub/linux/kernel/projects/rt/ http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags
 IUSE=symlink build deblob
@@ -8,7 +8,7 @@ KEYWORDS=~amd64
 LICENSE=GPL-2 !deblob? ( freedist )
 RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
 RESTRICT=binchecks strip
-SLOT=4.11.12_p14
-SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.11.12.xz mirror://kernel/linux/kernel/v4.x/linux-4.11.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.11-gnu/deblob-4.11 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.11-gnu/deblob-check -> deblob-check-4.11 ) mirror://kernel/linux/kernel/projects/rt/4.11/patch-4.11.12-rt14.patch.xz mirror://kernel/linux/kernel/projects/rt/4.11/older/patch-4.11.12-rt14.patch.xz
+SLOT=4.13.13_p5
+SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.13.13.xz mirror://kernel/linux/kernel/v4.x/linux-4.13.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.13-gnu/deblob-4.13 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.13-gnu/deblob-check -> deblob-check-4.13 ) mirror://kernel/linux/kernel/projects/rt/4.13/patch-4.13.13-rt5.patch.xz mirror://kernel/linux/kernel/projects/rt/4.13/older/patch-4.13.13-rt5.patch.xz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	kernel-2	880361b861490d9503f47d4f16e05f2c	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=4cbe80675612d523b955d0c55fdc34f6
+_md5_=003f54fe0756b0ba387ee77c54b5ea27
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-4.4.97_p110 b/metadata/md5-cache/sys-kernel/rt-sources-4.4.97_p110
new file mode 100644
index 000000000000..5288481d5ea0
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/rt-sources-4.4.97_p110
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
+DESCRIPTION=Full Linux 4.4 kernel sources with the CONFIG_PREEMPT_RT patch
+EAPI=6
+HOMEPAGE=https://www.kernel.org/ https://www.gentoo.org/ https://www.kernel.org/pub/linux/kernel/projects/rt/ http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags
+IUSE=symlink build deblob
+KEYWORDS=~amd64
+LICENSE=GPL-2 !deblob? ( freedist )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=4.4.97_p110
+SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.4.97.xz mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.4-gnu/deblob-4.4 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.4-gnu/deblob-check -> deblob-check-4.4 ) mirror://kernel/linux/kernel/projects/rt/4.4/patch-4.4.97-rt110.patch.xz mirror://kernel/linux/kernel/projects/rt/4.4/older/patch-4.4.97-rt110.patch.xz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	kernel-2	880361b861490d9503f47d4f16e05f2c	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=003f54fe0756b0ba387ee77c54b5ea27
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-4.9.61_p51 b/metadata/md5-cache/sys-kernel/rt-sources-4.9.61_p51
new file mode 100644
index 000000000000..5e5fde38bd12
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/rt-sources-4.9.61_p51
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
+DESCRIPTION=Full Linux 4.9 kernel sources with the CONFIG_PREEMPT_RT patch
+EAPI=6
+HOMEPAGE=https://www.kernel.org/ https://www.gentoo.org/ https://www.kernel.org/pub/linux/kernel/projects/rt/ http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags
+IUSE=symlink build deblob
+KEYWORDS=~amd64
+LICENSE=GPL-2 !deblob? ( freedist )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=4.9.61_p51
+SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.9.61.xz mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.9-gnu/deblob-4.9 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.9-gnu/deblob-check -> deblob-check-4.9 ) mirror://kernel/linux/kernel/projects/rt/4.9/patch-4.9.61-rt51.patch.xz mirror://kernel/linux/kernel/projects/rt/4.9/older/patch-4.9.61-rt51.patch.xz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	kernel-2	880361b861490d9503f47d4f16e05f2c	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=003f54fe0756b0ba387ee77c54b5ea27
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index 7bb77bf6e25c..7b192d9f222c 100644
Binary files a/metadata/md5-cache/sys-libs/Manifest.gz and b/metadata/md5-cache/sys-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-libs/libaal-1.0.5 b/metadata/md5-cache/sys-libs/libaal-1.0.5
deleted file mode 100644
index 8ec81e97af64..000000000000
--- a/metadata/md5-cache/sys-libs/libaal-1.0.5
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DESCRIPTION=library required by reiser4progs
-EAPI=0
-HOMEPAGE=https://www.kernel.org/pub/linux/utils/fs/reiser4/libaal/
-KEYWORDS=amd64 arm ppc ppc64 -sparc x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://kernel/linux/utils/fs/reiser4/libaal/libaal-1.0.5.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=c8cca6d90040c0b23780e9b9607c799e
diff --git a/metadata/md5-cache/sys-libs/libaal-1.0.5-r1 b/metadata/md5-cache/sys-libs/libaal-1.0.7
similarity index 71%
rename from metadata/md5-cache/sys-libs/libaal-1.0.5-r1
rename to metadata/md5-cache/sys-libs/libaal-1.0.7
index 1628ad8eb4b0..3fc9e81cadb3 100644
--- a/metadata/md5-cache/sys-libs/libaal-1.0.5-r1
+++ b/metadata/md5-cache/sys-libs/libaal-1.0.7
@@ -1,11 +1,12 @@
 DEFINED_PHASES=configure install prepare
+DEPEND=virtual/os-headers
 DESCRIPTION=library required by reiser4progs
-EAPI=4
+EAPI=6
 HOMEPAGE=https://sourceforge.net/projects/reiser4/
 IUSE=static-libs
 KEYWORDS=~amd64 ~arm ~ppc ~ppc64 -sparc ~x86
 LICENSE=GPL-2
 SLOT=0
-SRC_URI=mirror://sourceforge/reiser4/libaal-1.0.5.tar.gz
+SRC_URI=mirror://sourceforge/reiser4/libaal-1.0.7.tar.gz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=3371008eaca65d15e1520acc0a937cfb
+_md5_=24724df08edbc21084a53e527c2567bd
diff --git a/metadata/md5-cache/www-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz
index c71dc90a7884..d167c1a0533f 100644
Binary files a/metadata/md5-cache/www-client/Manifest.gz and b/metadata/md5-cache/www-client/Manifest.gz differ
diff --git a/metadata/md5-cache/www-client/vivaldi-1.13.1008.32_p1 b/metadata/md5-cache/www-client/vivaldi-1.13.1008.32_p1
index 0832676654ed..f998564b4d51 100644
--- a/metadata/md5-cache/www-client/vivaldi-1.13.1008.32_p1
+++ b/metadata/md5-cache/www-client/vivaldi-1.13.1008.32_p1
@@ -4,11 +4,11 @@ DESCRIPTION=A new browser for our friends
 EAPI=5
 HOMEPAGE=http://vivaldi.com/
 IUSE=+l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_en-US +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=-* ~amd64 ~x86
+KEYWORDS=-* amd64 x86
 LICENSE=Vivaldi
 RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss >=dev-libs/openssl-1.0.1:0 gnome-base/gconf:2 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype net-misc/curl net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/pango[X]
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=amd64? ( https://downloads.vivaldi.com/stable/vivaldi-stable_1.13.1008.32-1_amd64.deb -> vivaldi-1.13.1008.32_p1-amd64.deb ) x86? ( https://downloads.vivaldi.com/stable/vivaldi-stable_1.13.1008.32-1_i386.deb -> vivaldi-1.13.1008.32_p1-i386.deb )
 _eclasses_=chromium-2	fcd0e1c5eaae64392927ca67cdb13e0c	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e9c5190820b9806c131e465d0f169da2
+_md5_=c3ea0ad7748b651fafb53b8ded7abaac
diff --git a/metadata/md5-cache/www-misc/Manifest.gz b/metadata/md5-cache/www-misc/Manifest.gz
index b30569deff2b..99e1a9a88909 100644
Binary files a/metadata/md5-cache/www-misc/Manifest.gz and b/metadata/md5-cache/www-misc/Manifest.gz differ
diff --git a/metadata/md5-cache/www-misc/wsmake-0.6.4 b/metadata/md5-cache/www-misc/wsmake-0.6.4
index a25493404b54..11bb6b6d30d1 100644
--- a/metadata/md5-cache/www-misc/wsmake-0.6.4
+++ b/metadata/md5-cache/www-misc/wsmake-0.6.4
@@ -1,10 +1,10 @@
-DEFINED_PHASES=compile install unpack
+DEFINED_PHASES=install unpack
 DESCRIPTION=Website Pre-processor
-EAPI=0
+EAPI=6
 HOMEPAGE=http://www.wsmake.org/
+IUSE=examples
 KEYWORDS=x86
 LICENSE=GPL-2 Artistic
 SLOT=0
 SRC_URI=http://ftp.wsmake.org/pub/wsmake6/stable/wsmake-0.6.4.tar.bz2
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=e2f365c803c15f72e51ddbc1f4adf2da
+_md5_=dfeaf27c1cc37bf0962cc5b33861b3e4
diff --git a/metadata/md5-cache/x11-libs/Manifest.gz b/metadata/md5-cache/x11-libs/Manifest.gz
index d9530d3805e6..d6f5a5c8dbaf 100644
Binary files a/metadata/md5-cache/x11-libs/Manifest.gz and b/metadata/md5-cache/x11-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-libs/motif-2.2.3-r12 b/metadata/md5-cache/x11-libs/motif-2.2.3-r12
index e9e2f1bb1c29..b75d5ec8f474 100644
--- a/metadata/md5-cache/x11-libs/motif-2.2.3-r12
+++ b/metadata/md5-cache/x11-libs/motif-2.2.3-r12
@@ -10,4 +10,4 @@ RDEPEND=>=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,ab
 SLOT=2.2
 SRC_URI=ftp://ftp.ics.com/openmotif/2.2/2.2.3/src/openMotif-2.2.3.tar.gz mirror://gentoo/openmotif-2.2.3-patches-5.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=7825c65e1c88ff7a362d212933d19cf7
+_md5_=17c2d283c81e30801a1570d41f5e45f5
diff --git a/metadata/md5-cache/x11-libs/motif-2.3.7 b/metadata/md5-cache/x11-libs/motif-2.3.7
index e9ed6ac20fe8..1f00601d3cb4 100644
--- a/metadata/md5-cache/x11-libs/motif-2.3.7
+++ b/metadata/md5-cache/x11-libs/motif-2.3.7
@@ -4,10 +4,10 @@ DESCRIPTION=The Motif user interface component toolkit
 EAPI=6
 HOMEPAGE=https://sourceforge.net/projects/motif/ http://motif.ics.com/
 IUSE=examples jpeg +motif22-compatibility png static-libs unicode xft abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2.1+ MIT
 RDEPEND=>=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXmu-1.1.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXp-1.0.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXt-1.1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] jpeg? ( >=virtual/jpeg-0-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( >=media-libs/libpng-1.6.10:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) unicode? ( >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xft? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXft-2.3.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
 SRC_URI=mirror://sourceforge/project/motif/Motif%202.3.7%20Source%20Code/motif-2.3.7.tar.gz https://dev.gentoo.org/~ulm/distfiles/motif-2.3.6-patches-2.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=01093a6e2506cd2618a1f345582cd46e
+_md5_=9fbc88e6023934b6d430ad0da1308dd0
diff --git a/metadata/md5-cache/x11-libs/qscintilla-2.10.1 b/metadata/md5-cache/x11-libs/qscintilla-2.10.1
index 9eb3d2bc4fb0..94cf212f9bd3 100644
--- a/metadata/md5-cache/x11-libs/qscintilla-2.10.1
+++ b/metadata/md5-cache/x11-libs/qscintilla-2.10.1
@@ -4,11 +4,11 @@ DESCRIPTION=A Qt port of Neil Hodgson's Scintilla C++ editor class
 EAPI=6
 HOMEPAGE=https://www.riverbankcomputing.com/software/qscintilla/intro
 IUSE=designer doc +qt4 qt5
-KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3
 RDEPEND=qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 designer? ( dev-qt/designer:4 ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 designer? ( dev-qt/designer:5 ) )
 REQUIRED_USE=|| ( qt4 qt5 )
 SLOT=0/13
 SRC_URI=mirror://sourceforge/pyqt/QScintilla_gpl-2.10.1.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=40d62f8c4cd4bbbf2c505f57d262ca37
+_md5_=b038354220c6d12651bbe099a16b03a5
diff --git a/metadata/md5-cache/x11-libs/scw-0.4.7 b/metadata/md5-cache/x11-libs/scw-0.4.7
deleted file mode 100644
index b65b6a081d10..000000000000
--- a/metadata/md5-cache/x11-libs/scw-0.4.7
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=dev-libs/glib:2 x11-libs/gtk+:2 doc? ( dev-util/gtk-doc ) virtual/pkgconfig
-DESCRIPTION=A GTK+ widget set specifically designed for chat programs
-EAPI=3
-HOMEPAGE=http://scwwidgets.googlepages.com
-IUSE=doc
-KEYWORDS=~amd64 x86
-LICENSE=LGPL-2
-RDEPEND=dev-libs/glib:2 x11-libs/gtk+:2
-SLOT=0
-SRC_URI=http://scwwidgets.googlepages.com/scw-0.4.7.tar.gz
-_md5_=1eb63af1b716d37b53fc75e851a66c1b
diff --git a/metadata/md5-cache/x11-libs/scw-0.4.7-r1 b/metadata/md5-cache/x11-libs/scw-0.4.7-r1
index 4d14c3a63a1e..a8889dc8c44a 100644
--- a/metadata/md5-cache/x11-libs/scw-0.4.7-r1
+++ b/metadata/md5-cache/x11-libs/scw-0.4.7-r1
@@ -4,9 +4,9 @@ DESCRIPTION=A GTK+ widget set specifically designed for chat programs
 EAPI=6
 HOMEPAGE=http://scwwidgets.googlepages.com
 IUSE=doc
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=LGPL-2
 RDEPEND=dev-libs/glib:2 x11-libs/gtk+:2
 SLOT=0
 SRC_URI=http://scwwidgets.googlepages.com/scw-0.4.7.tar.gz
-_md5_=84c0c61e827315e5664d16faec213443
+_md5_=bcd440f0204c467110465ebf9af09b87
diff --git a/metadata/md5-cache/x11-libs/xapps-1.0.4 b/metadata/md5-cache/x11-libs/xapps-1.0.4
new file mode 100644
index 000000000000..46ed3770a1f4
--- /dev/null
+++ b/metadata/md5-cache/x11-libs/xapps-1.0.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst postrm prepare
+DEPEND=>=dev-libs/glib-2.37.3:2 dev-libs/gobject-introspection:0= gnome-base/libgnomekbd gnome-base/gnome-common x11-libs/cairo >=x11-libs/gdk-pixbuf-2.22.0:2[introspection?] >=x11-libs/gtk+-3.3.16:3[introspection?] x11-libs/libxkbfile sys-devel/gettext dev-util/gtk-doc dev-util/gtk-doc-am >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4
+DESCRIPTION=Cross-desktop libraries and common resources
+EAPI=6
+HOMEPAGE=https://github.com/linuxmint/xapps/
+IUSE=introspection static-libs
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=>=dev-libs/glib-2.37.3:2 dev-libs/gobject-introspection:0= gnome-base/libgnomekbd gnome-base/gnome-common x11-libs/cairo >=x11-libs/gdk-pixbuf-2.22.0:2[introspection?] >=x11-libs/gtk+-3.3.16:3[introspection?] x11-libs/libxkbfile
+SLOT=0
+SRC_URI=https://github.com/linuxmint/xapps/archive/1.0.4.tar.gz -> xapps-1.0.4.tar.gz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=7102ed32457a8507c0e14f3427c90ccf
diff --git a/metadata/md5-cache/x11-plugins/Manifest.gz b/metadata/md5-cache/x11-plugins/Manifest.gz
index 0c39964f4a54..f1a28c4a4dec 100644
Binary files a/metadata/md5-cache/x11-plugins/Manifest.gz and b/metadata/md5-cache/x11-plugins/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-plugins/fsviewer-0.2.6 b/metadata/md5-cache/x11-plugins/fsviewer-0.2.6
deleted file mode 100644
index 3839405ea3bc..000000000000
--- a/metadata/md5-cache/x11-plugins/fsviewer-0.2.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=x11-wm/windowmaker-0.95.2 x11-libs/libXft x11-libs/libXpm x11-libs/libX11 x11-proto/xproto nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=A file system viewer for Window Maker
-EAPI=5
-HOMEPAGE=http://www.bayernline.de/~gscholz/linux/fsviewer/
-IUSE=nls
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=>=x11-wm/windowmaker-0.95.2 x11-libs/libXft x11-libs/libXpm x11-libs/libX11
-SLOT=0
-SRC_URI=http://www.bayernline.de/~gscholz/linux/fsviewer/fsviewer-app-0.2.6.tar.bz2
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=392da154e7bc5df2124170d4c9ea3f47
diff --git a/metadata/md5-cache/x11-plugins/fsviewer-0.2.6-r1 b/metadata/md5-cache/x11-plugins/fsviewer-0.2.6-r1
deleted file mode 100644
index 34c929e2f9e9..000000000000
--- a/metadata/md5-cache/x11-plugins/fsviewer-0.2.6-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=x11-wm/windowmaker-0.95.2 x11-libs/libXft x11-libs/libXpm x11-libs/libX11 x11-proto/xproto nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=A file system viewer for Window Maker
-EAPI=5
-HOMEPAGE=http://www.bayernline.de/~gscholz/linux/fsviewer/
-IUSE=nls
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=>=x11-wm/windowmaker-0.95.2 x11-libs/libXft x11-libs/libXpm x11-libs/libX11
-SLOT=0
-SRC_URI=http://www.bayernline.de/~gscholz/linux/fsviewer/fsviewer-app-0.2.6.tar.bz2
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=01b28ed5f54024ef11051fd55e989020
diff --git a/metadata/md5-cache/x11-plugins/wmMatrix-0.2-r1 b/metadata/md5-cache/x11-plugins/wmMatrix-0.2-r1
index e0107c58560e..bad196b174f6 100644
--- a/metadata/md5-cache/x11-plugins/wmMatrix-0.2-r1
+++ b/metadata/md5-cache/x11-plugins/wmMatrix-0.2-r1
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile install unpack
 DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm x11-proto/xproto x11-proto/xextproto
 DESCRIPTION=WMaker DockApp: Slightly modified version of Jamie Zawinski's xmatrix screenhack
 EAPI=0
-HOMEPAGE=http://dockapps.windowmaker.org/file.php/id/10
+HOMEPAGE=http://www.dockapps.net/wmmatrix
 KEYWORDS=amd64 ppc ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm x11-misc/xscreensaver
 SLOT=0
-SRC_URI=http://dockapps.windowmaker.org/download.php/id/17/wmMatrix-0.2.tar.gz
+SRC_URI=http://www.dockapps.net/download/wmMatrix-0.2.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=856d69b727b46a9cedd78be8735ca01b
+_md5_=28f117d8268a62209cbcda1f065f76eb
diff --git a/metadata/md5-cache/x11-plugins/wmSun-1.03-r1 b/metadata/md5-cache/x11-plugins/wmSun-1.03-r1
deleted file mode 100644
index ecd2e38f4186..000000000000
--- a/metadata/md5-cache/x11-plugins/wmSun-1.03-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm x11-proto/xproto x11-proto/xextproto
-DESCRIPTION=dockapp which displays the rise/set time of the sun
-EAPI=0
-HOMEPAGE=http://dockapps.windowmaker.org/file.php/id/16
-KEYWORDS=amd64 ~mips ppc sparc x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm
-SLOT=0
-SRC_URI=http://dockapps.windowmaker.org/download.php/id/23/wmSun-1.03.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=364120f42a624302053e2ec582933661
diff --git a/metadata/md5-cache/x11-plugins/wmail-2.0-r4 b/metadata/md5-cache/x11-plugins/wmail-2.0-r4
index 9084bec49061..26ef5ad11fb1 100644
--- a/metadata/md5-cache/x11-plugins/wmail-2.0-r4
+++ b/metadata/md5-cache/x11-plugins/wmail-2.0-r4
@@ -2,11 +2,11 @@ DEFINED_PHASES=configure install prepare
 DEPEND=>=x11-libs/libdockapp-0.7:= >=sys-apps/sed-4.1.4-r1
 DESCRIPTION=Window Maker dock application showing incoming mail
 EAPI=5
-HOMEPAGE=http://dockapps.windowmaker.org/file.php/id/70
+HOMEPAGE=http://www.dockapps.net/wmail
 KEYWORDS=~amd64 ~ppc ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=>=x11-libs/libdockapp-0.7:=
 SLOT=0
-SRC_URI=http://www.minet.uni-jena.de/~topical/sveng/wmail/wmail-2.0.tar.gz
+SRC_URI=http://www.dockapps.net/download/wmail-2.0.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=6b11af463759e44519864d951bda204d
+_md5_=f74cfcf46a8ada52f3cf83e0e4ef8f51
diff --git a/metadata/md5-cache/x11-plugins/wmamixer-0.2 b/metadata/md5-cache/x11-plugins/wmamixer-0.2
new file mode 100644
index 000000000000..b7c7e4c2b6f9
--- /dev/null
+++ b/metadata/md5-cache/x11-plugins/wmamixer-0.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install
+DEPEND=x11-libs/libXpm x11-libs/libXext x11-libs/libX11 x11-proto/xproto
+DESCRIPTION=ALSA mixer dockapp, fork of wmsmixer
+EAPI=6
+HOMEPAGE=https://github.com/gryf/wmamixer
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=x11-libs/libXpm x11-libs/libXext x11-libs/libX11
+SLOT=0
+SRC_URI=https://github.com/gryf/wmamixer/archive/0.2.tar.gz -> wmamixer-0.2.tar.gz
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=ab7bd9ac4f134e22e25f29d6999cf172
diff --git a/metadata/md5-cache/x11-plugins/wmblob-1.0.3 b/metadata/md5-cache/x11-plugins/wmblob-1.0.3
index 8936caebbe80..c728204b6126 100644
--- a/metadata/md5-cache/x11-plugins/wmblob-1.0.3
+++ b/metadata/md5-cache/x11-plugins/wmblob-1.0.3
@@ -2,11 +2,11 @@ DEFINED_PHASES=prepare
 DEPEND=x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXpm x11-libs/libXext virtual/pkgconfig x11-proto/xextproto x11-libs/libXt >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=a fancy but useless dockapp with moving blobs
 EAPI=5
-HOMEPAGE=http://freshmeat.net/projects/wmblob
+HOMEPAGE=https://github.com/bbidulock/wmblob
 KEYWORDS=amd64 ppc sparc x86
 LICENSE=GPL-2
 RDEPEND=x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXpm x11-libs/libXext
 SLOT=0
-SRC_URI=mirror://debian/pool/main/w/wmblob/wmblob_1.0.3.orig.tar.gz
+SRC_URI=https://github.com/bbidulock/wmblob/releases/download/1.0.3/wmblob-1.0.3.tar.bz2
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=a6662dedf328260700026ac8695cec1a
+_md5_=7c7da6c305826455d5617f42f94fa961
diff --git a/metadata/md5-cache/x11-plugins/wmblob-1.0.4 b/metadata/md5-cache/x11-plugins/wmblob-1.0.4
new file mode 100644
index 000000000000..520ca05e099d
--- /dev/null
+++ b/metadata/md5-cache/x11-plugins/wmblob-1.0.4
@@ -0,0 +1,12 @@
+DEFINED_PHASES=prepare
+DEPEND=x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXpm x11-libs/libXext virtual/pkgconfig x11-libs/libXt >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=a fancy but useless dockapp with moving blobs
+EAPI=6
+HOMEPAGE=https://github.com/bbidulock/wmblob
+KEYWORDS=~amd64 ~ppc ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXpm x11-libs/libXext
+SLOT=0
+SRC_URI=https://github.com/bbidulock/wmblob/releases/download/1.0.4/wmblob-1.0.4.tar.bz2
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=c57c0b5ab8f115e1f920b502319b2cb5
diff --git a/metadata/md5-cache/x11-plugins/wmfire-1.2.4-r2 b/metadata/md5-cache/x11-plugins/wmfire-1.2.4-r2
index ffbfa344717d..05a10099993a 100644
--- a/metadata/md5-cache/x11-plugins/wmfire-1.2.4-r2
+++ b/metadata/md5-cache/x11-plugins/wmfire-1.2.4-r2
@@ -2,12 +2,12 @@ DEFINED_PHASES=configure install prepare
 DEPEND=x11-libs/gtk+:2 gnome-base/libgtop:2 x11-libs/libX11 x11-libs/libXext session? ( x11-libs/libSM x11-libs/libICE ) virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Load monitoring dockapp displaying dancing flame
 EAPI=4
-HOMEPAGE=http://www.swanson.ukfsn.org/#wmfire
+HOMEPAGE=http://www.improbability.net/#wmfire
 IUSE=session
 KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
 RDEPEND=x11-libs/gtk+:2 gnome-base/libgtop:2 x11-libs/libX11 x11-libs/libXext session? ( x11-libs/libSM x11-libs/libICE )
 SLOT=0
-SRC_URI=http://www.swanson.ukfsn.org/wmfire/wmfire-1.2.4.tar.gz
+SRC_URI=http://www.improbability.net/wmfire/wmfire-1.2.4.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=9b767c7ef41d30f2bdff6c3008301f08
+_md5_=c84afd555c0a200dfeedc3a1c9c3e1c5
diff --git a/metadata/md5-cache/x11-plugins/wminet-3.0.0 b/metadata/md5-cache/x11-plugins/wminet-3.0.0
deleted file mode 100644
index 422cbf8f4dcc..000000000000
--- a/metadata/md5-cache/x11-plugins/wminet-3.0.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm x11-proto/xextproto
-DESCRIPTION=dockapp for monitoring internet connections to and from your computer
-EAPI=0
-HOMEPAGE=http://www.swanson.ukfsn.org/#wminet
-KEYWORDS=amd64 ppc sparc x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm
-SLOT=0
-SRC_URI=http://www.swanson.ukfsn.org/wmdock/wminet-3.0.0.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=a9d14f960e18995ed20fedb12ae88b1a
diff --git a/metadata/md5-cache/x11-plugins/wminet-3.0.0-r1 b/metadata/md5-cache/x11-plugins/wminet-3.0.0-r1
index b57daaaa58e1..d26f113ca230 100644
--- a/metadata/md5-cache/x11-plugins/wminet-3.0.0-r1
+++ b/metadata/md5-cache/x11-plugins/wminet-3.0.0-r1
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile install prepare
 DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm x11-proto/xextproto
 DESCRIPTION=dockapp for monitoring internet connections to and from your computer
 EAPI=5
-HOMEPAGE=http://www.swanson.ukfsn.org/#wminet
+HOMEPAGE=http://www.improbability.net/#wminet
 KEYWORDS=amd64 ppc sparc x86
 LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm
 SLOT=0
-SRC_URI=http://www.swanson.ukfsn.org/wmdock/wminet-3.0.0.tar.gz
+SRC_URI=http://www.improbability.net/wmdock//wminet-3.0.0.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=159cd5ec209c62364dd3dafb0cb06d2b
+_md5_=d6c9c27f597ca78a1386211dcd56640f
diff --git a/metadata/md5-cache/x11-plugins/wmmp3-0.12 b/metadata/md5-cache/x11-plugins/wmmp3-0.12
index 6220646b1871..ae29dc9acf37 100644
--- a/metadata/md5-cache/x11-plugins/wmmp3-0.12
+++ b/metadata/md5-cache/x11-plugins/wmmp3-0.12
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile install postinst unpack
 DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm x11-proto/xextproto media-sound/mpg123
 DESCRIPTION=Mp3 player dock app for WindowMaker; frontend to mpg123
 EAPI=0
-HOMEPAGE=http://dockapps.windowmaker.org/file.php/id/60
+HOMEPAGE=http://www.dockapps.net/wmmp3
 KEYWORDS=~amd64 ppc sparc x86
 LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm
 SLOT=0
-SRC_URI=http://dockapps.windowmaker.org/download.php/id/91/wmmp3-0.12.tar.gz
+SRC_URI=http://www.dockapps.net/download/wmmp3-0.12.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=78d36066dd84c026c5f29e8c9a2701e1
+_md5_=22219963e25e56730316cbb693aba9f0
diff --git a/metadata/md5-cache/x11-plugins/wmmsg-1.0.1 b/metadata/md5-cache/x11-plugins/wmmsg-1.0.1
deleted file mode 100644
index ab40ef58e804..000000000000
--- a/metadata/md5-cache/x11-plugins/wmmsg-1.0.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=prepare
-DEPEND=x11-libs/gtk+:2 media-libs/imlib2 x11-libs/libXpm x11-libs/libXext x11-libs/libX11 virtual/pkgconfig x11-libs/libXt >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=universal visual notification dockapp
-EAPI=5
-HOMEPAGE=http://swapspace.net/~matt/wmmsg
-KEYWORDS=amd64 ppc ~sparc x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/gtk+:2 media-libs/imlib2 x11-libs/libXpm x11-libs/libXext x11-libs/libX11
-SLOT=0
-SRC_URI=http://swapspace.net/~matt/wmmsg/wmmsg-1.0.1.tar.gz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=db13e664455bf53451cc4b5ed7f2d021
diff --git a/metadata/md5-cache/x11-plugins/wmmsg-1.0.1-r1 b/metadata/md5-cache/x11-plugins/wmmsg-1.0.1-r1
deleted file mode 100644
index 861d17257b42..000000000000
--- a/metadata/md5-cache/x11-plugins/wmmsg-1.0.1-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=prepare
-DEPEND=x11-libs/gtk+:2 media-libs/imlib2 x11-libs/libXpm x11-libs/libXext x11-libs/libX11 virtual/pkgconfig x11-libs/libXt >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=universal visual notification dockapp
-EAPI=5
-HOMEPAGE=http://swapspace.net/~matt/wmmsg
-KEYWORDS=amd64 ~ppc ~sparc x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/gtk+:2 media-libs/imlib2 x11-libs/libXpm x11-libs/libXext x11-libs/libX11
-SLOT=0
-SRC_URI=http://swapspace.net/~matt/wmmsg/wmmsg-1.0.1.tar.gz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=c56f8105f75e554900b3297596cf10b0
diff --git a/metadata/md5-cache/x11-plugins/wmnet-1.06-r1 b/metadata/md5-cache/x11-plugins/wmnet-1.06-r1
index 4fbb5b6e3c7e..bb00c0453ac7 100644
--- a/metadata/md5-cache/x11-plugins/wmnet-1.06-r1
+++ b/metadata/md5-cache/x11-plugins/wmnet-1.06-r1
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile install unpack
 DEPEND=x11-libs/libX11 x11-libs/libXext x11-proto/xproto x11-proto/xextproto x11-misc/imake app-text/rman
 DESCRIPTION=WMnet is a dock.app network monitor
 EAPI=0
-HOMEPAGE=http://www.digitalkaos.net/linux/wmnet/
+HOMEPAGE=http://www.dockapps.net/wmnet
 KEYWORDS=x86 sparc alpha amd64 ppc
 LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 x11-libs/libXext
 SLOT=0
-SRC_URI=http://www.digitalkaos.net/linux/wmnet/download/wmnet-1.06.tar.gz mirror://gentoo/wmnet-1.06-misc.patch.bz2
+SRC_URI=http://www.dockapps.net/download/wmnet-1.06.tar.gz mirror://gentoo/wmnet-1.06-misc.patch.bz2
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=ecdddadd10cea068ea4669931d5d9a65
+_md5_=76caf39ec12417d651d51deeb4c2767f
diff --git a/metadata/md5-cache/x11-plugins/wmnetload-1.3-r4 b/metadata/md5-cache/x11-plugins/wmnetload-1.3-r4
index f601ed5505ac..d7101d49ce70 100644
--- a/metadata/md5-cache/x11-plugins/wmnetload-1.3-r4
+++ b/metadata/md5-cache/x11-plugins/wmnetload-1.3-r4
@@ -2,11 +2,11 @@ DEFINED_PHASES=install prepare
 DEPEND=>=x11-libs/libdockapp-0.7:= >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Network interface monitor dockapp
 EAPI=5
-HOMEPAGE=http://freshmeat.net/projects/wmnetload/
+HOMEPAGE=https://github.com/bbidulock/wmnetload
 KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=x11-libs/libdockapp-0.7:=
 SLOT=0
-SRC_URI=ftp://truffula.com/pub/wmnetload-1.3.tar.gz
+SRC_URI=https://github.com/bbidulock/wmnetload/releases/download/1.3/wmnetload-1.3.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=334223291c54391aebecdb6fa235ea1b
+_md5_=e3063ae0fc8b33c53f8e700f707a4347
diff --git a/metadata/md5-cache/x11-plugins/wmpinboard-1.0 b/metadata/md5-cache/x11-plugins/wmpinboard-1.0
index 1d870d5fccbc..386fa2642baa 100644
--- a/metadata/md5-cache/x11-plugins/wmpinboard-1.0
+++ b/metadata/md5-cache/x11-plugins/wmpinboard-1.0
@@ -2,11 +2,11 @@ DEFINED_PHASES=install unpack
 DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm x11-proto/xproto x11-proto/xextproto
 DESCRIPTION=Window Maker dock applet resembling a miniature pinboard
 EAPI=0
-HOMEPAGE=http://dockapps.windowmaker.org/file.php/id/93
+HOMEPAGE=https://github.com/bbidulock/wmpinboard
 KEYWORDS=x86 sparc alpha amd64 ppc
 LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm
 SLOT=0
-SRC_URI=http://dockapps.windowmaker.org/download.php/id/131/wmpinboard-1.0.tar.gz
+SRC_URI=https://github.com/bbidulock/wmpinboard/releases/download/1.0/wmpinboard-1.0.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=9357a8b40a0665d78ca9bccbc2cf3d39
+_md5_=f01c285d9ec80c75f08b2fa26b16f54f
diff --git a/metadata/md5-cache/x11-plugins/wmpinboard-1.0.1 b/metadata/md5-cache/x11-plugins/wmpinboard-1.0.1
new file mode 100644
index 000000000000..b9e359023656
--- /dev/null
+++ b/metadata/md5-cache/x11-plugins/wmpinboard-1.0.1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=-
+DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm x11-proto/xproto
+DESCRIPTION=Window Maker dock applet resembling a miniature pinboard
+EAPI=6
+HOMEPAGE=https://github.com/bbidulock/wmpinboard
+KEYWORDS=~alpha ~amd64 ~ppc ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm
+SLOT=0
+SRC_URI=https://github.com/bbidulock/wmpinboard/releases/download/1.0.1/wmpinboard-1.0.1.tar.gz
+_md5_=4af9240c8e198beaf88fd76c7c497396
diff --git a/metadata/md5-cache/x11-plugins/wmsmixer-0.5.1 b/metadata/md5-cache/x11-plugins/wmsmixer-0.5.1
index f0ca9c36c0dd..bc9c257339dc 100644
--- a/metadata/md5-cache/x11-plugins/wmsmixer-0.5.1
+++ b/metadata/md5-cache/x11-plugins/wmsmixer-0.5.1
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile install
 DEPEND=x11-libs/libXpm x11-libs/libXext x11-libs/libX11 x11-proto/xproto x11-proto/xextproto
 DESCRIPTION=fork of wmmixer adding scrollwheel support and other features
 EAPI=0
-HOMEPAGE=http://dockapps.windowmaker.org/file.php/id/63
+HOMEPAGE=http://www.dockapps.net/wmsmixer
 KEYWORDS=amd64 ~ppc ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=x11-libs/libXpm x11-libs/libXext x11-libs/libX11
 SLOT=0
-SRC_URI=http://dockapps.windowmaker.org/download.php/id/268/wmsmixer-0.5.1.tar.gz
+SRC_URI=http://www.dockapps.net/download/wmsmixer-0.5.1.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=e7325516cdb4b5a99b0f11bb957f71ca
+_md5_=e39d3b3e06ac2cc7860a5b7d90eff47b
diff --git a/metadata/md5-cache/x11-plugins/wmswallow-0.6.1-r1 b/metadata/md5-cache/x11-plugins/wmswallow-0.6.1-r1
index c9ee53a96e2b..5c9a91273644 100644
--- a/metadata/md5-cache/x11-plugins/wmswallow-0.6.1-r1
+++ b/metadata/md5-cache/x11-plugins/wmswallow-0.6.1-r1
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile install prepare
 DEPEND=x11-libs/libX11 x11-libs/libXext x11-proto/xproto
 DESCRIPTION=A dock applet to make any application dockable
 EAPI=5
-HOMEPAGE=http://burse.uni-hamburg.de/~friedel/software/wmswallow.html
+HOMEPAGE=http://www.dockapps.net/wmswallow
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 x11-libs/libXext
 SLOT=0
-SRC_URI=http://burse.uni-hamburg.de/~friedel/software/wmswallow/wmswallow.tar.Z
+SRC_URI=http://www.dockapps.net/downloaduuu/wmswallow.tar.Z
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=b60189aeadc85fa35956f418ce56702c
+_md5_=d0dee777f5cb2dcc0a2448d5794264da
diff --git a/metadata/md5-cache/x11-plugins/wmsystray-0.1.1 b/metadata/md5-cache/x11-plugins/wmsystray-0.1.1
index 67c1dd2a8b06..a1f67af9f082 100644
--- a/metadata/md5-cache/x11-plugins/wmsystray-0.1.1
+++ b/metadata/md5-cache/x11-plugins/wmsystray-0.1.1
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile install unpack
 DEPEND=x11-libs/libX11 x11-libs/libXpm
 DESCRIPTION=Window Maker dock app that provides a system tray for GNOME/KDE applications
 EAPI=0
-HOMEPAGE=http://kai.vm.bytemark.co.uk/~arashi/wmsystray/
+HOMEPAGE=https://github.com/bbidulock/wmsystray
 KEYWORDS=amd64 ppc ~sparc x86
 LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 x11-libs/libXpm
 SLOT=0
-SRC_URI=http://kai.vm.bytemark.co.uk/~arashi/wmsystray/release/wmsystray-0.1.1.tar.bz2
+SRC_URI=https://github.com/bbidulock/wmsystray/releases/download/0.1.1/wmsystray-0.1.1.tar.bz2
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=482c341634cdcc4e85040ed1bff19c14
+_md5_=22d8b53d6e25e90b580955fbf219a76e
diff --git a/metadata/md5-cache/x11-plugins/wmtime-1.0_beta2_p9 b/metadata/md5-cache/x11-plugins/wmtime-1.0_beta2_p9
deleted file mode 100644
index 94a4323429c4..000000000000
--- a/metadata/md5-cache/x11-plugins/wmtime-1.0_beta2_p9
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp x11-libs/libXpm x11-proto/xproto x11-proto/xextproto >=sys-apps/sed-4
-DESCRIPTION=applet which displays the date and time in a dockable tile
-EAPI=0
-HOMEPAGE=https://packages.qa.debian.org/w/wmtime.html
-KEYWORDS=~amd64 x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp x11-libs/libXpm
-SLOT=0
-SRC_URI=http://ftp.debian.org/debian/pool/main/w/wmtime/wmtime_1.0b2.orig.tar.gz http://ftp.debian.org/debian/pool/main/w/wmtime/wmtime_1.0b2-9.diff.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=e371302f1ab7c12f628f5cfe42d96f96
diff --git a/metadata/md5-cache/x11-plugins/wmtime-1.2 b/metadata/md5-cache/x11-plugins/wmtime-1.2
deleted file mode 100644
index ce9f8796f5aa..000000000000
--- a/metadata/md5-cache/x11-plugins/wmtime-1.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp x11-libs/libXpm x11-proto/xproto
-DESCRIPTION=applet which displays the date and time in a dockable tile
-EAPI=5
-HOMEPAGE=http://www.dockapps.net/wmtime
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp x11-libs/libXpm
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~voyageur/distfiles/wmtime-1.2.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=46e43fa3964ccc35769c854a236265fe
diff --git a/metadata/md5-cache/x11-plugins/wmtimer-2.92-r2 b/metadata/md5-cache/x11-plugins/wmtimer-2.92-r2
index d1c34e3bca9d..d074aa658c07 100644
--- a/metadata/md5-cache/x11-plugins/wmtimer-2.92-r2
+++ b/metadata/md5-cache/x11-plugins/wmtimer-2.92-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 ppc ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2 x11-libs/gtk+:2 x11-libs/libXpm x11-libs/libXext x11-libs/libX11
 SLOT=0
-SRC_URI=https://github.com/bbidulock/wmtimer/releases/download/vwmtimer/wmtimer-2.92.tar.gz
+SRC_URI=https://github.com/bbidulock/wmtimer/releases/download/v2.92/wmtimer-2.92.tar.gz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=1ef00c71f120e47fcc8736ac0d01e8d2
+_md5_=339519f9dadba9dc4d1b9b4391131842
diff --git a/metadata/md5-cache/x11-plugins/wmtop-0.85 b/metadata/md5-cache/x11-plugins/wmtop-0.85
index f5c07ab46fad..7cd34adc92e4 100644
--- a/metadata/md5-cache/x11-plugins/wmtop-0.85
+++ b/metadata/md5-cache/x11-plugins/wmtop-0.85
@@ -9,4 +9,4 @@ RDEPEND=>=x11-libs/libdockapp-0.7:= x11-libs/libX11 x11-libs/libXpm x11-libs/lib
 SLOT=0
 SRC_URI=http://www.dockapps.net/download/wmtop-0.85.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=9c7970710a91210d1c21351841715de7
+_md5_=48d63bb8b5a43b786668bfe15207884f
diff --git a/metadata/md5-cache/x11-wm/Manifest.gz b/metadata/md5-cache/x11-wm/Manifest.gz
index 45dbc6b294f2..653cac131182 100644
Binary files a/metadata/md5-cache/x11-wm/Manifest.gz and b/metadata/md5-cache/x11-wm/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-wm/muffin-3.6.0 b/metadata/md5-cache/x11-wm/muffin-3.6.0
new file mode 100644
index 000000000000..17ad8d497035
--- /dev/null
+++ b/metadata/md5-cache/x11-wm/muffin-3.6.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=x11-libs/pango-1.2[X,introspection?] >=x11-libs/cairo-1.14:=[X] x11-libs/gdk-pixbuf:2[introspection?] >=x11-libs/gtk+-3.9.12:3[X,introspection?] >=dev-libs/glib-2.37.3:2[dbus] >=gnome-extra/cinnamon-desktop-2.4:0=[introspection?] >=gnome-base/gsettings-desktop-schemas-3.3.0[introspection?] >=media-libs/clutter-1.14.3:1.0=[X,introspection?] >=media-libs/cogl-1.13.3:1.0=[introspection?] >=media-libs/libcanberra-0.26[gtk3] >=x11-libs/libXcomposite-0.3 >=x11-libs/startup-notification-0.7:= x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXrender virtual/opengl gnome-extra/zenity introspection? ( >=dev-libs/gobject-introspection-0.9.5:= ) xinerama? ( x11-libs/libXinerama ) >=app-text/gnome-doc-utils-0.8 sys-devel/gettext dev-util/gtk-doc dev-util/gtk-doc-am >=dev-util/intltool-0.35 virtual/pkgconfig test? ( app-text/docbook-xml-dtd:4.5 ) xinerama? ( x11-proto/xineramaproto ) x11-proto/xextproto x11-proto/xproto >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Compositing window manager forked from Mutter for use with Cinnamon
+EAPI=6
+HOMEPAGE=http://cinnamon.linuxmint.com/
+IUSE=+introspection test xinerama
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=x11-libs/pango-1.2[X,introspection?] >=x11-libs/cairo-1.14:=[X] x11-libs/gdk-pixbuf:2[introspection?] >=x11-libs/gtk+-3.9.12:3[X,introspection?] >=dev-libs/glib-2.37.3:2[dbus] >=gnome-extra/cinnamon-desktop-2.4:0=[introspection?] >=gnome-base/gsettings-desktop-schemas-3.3.0[introspection?] >=media-libs/clutter-1.14.3:1.0=[X,introspection?] >=media-libs/cogl-1.13.3:1.0=[introspection?] >=media-libs/libcanberra-0.26[gtk3] >=x11-libs/libXcomposite-0.3 >=x11-libs/startup-notification-0.7:= x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXrender virtual/opengl gnome-extra/zenity introspection? ( >=dev-libs/gobject-introspection-0.9.5:= ) xinerama? ( x11-libs/libXinerama ) !x11-misc/expocity
+SLOT=0
+SRC_URI=https://github.com/linuxmint/muffin/archive/3.6.0.tar.gz -> muffin-3.6.0.tar.gz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=5a805883641bedca1b7a58d8d39b637c
diff --git a/metadata/news/2007-05-04-paludis-0.24/2007-05-04-paludis-0.24.en.txt b/metadata/news/2007-05-04-paludis-0_24/2007-05-04-paludis-0_24.en.txt
similarity index 100%
rename from metadata/news/2007-05-04-paludis-0.24/2007-05-04-paludis-0.24.en.txt
rename to metadata/news/2007-05-04-paludis-0_24/2007-05-04-paludis-0_24.en.txt
diff --git a/metadata/news/2007-05-04-paludis-0.24/2007-05-04-paludis-0.24.en.txt.asc b/metadata/news/2007-05-04-paludis-0_24/2007-05-04-paludis-0_24.en.txt.asc
similarity index 100%
rename from metadata/news/2007-05-04-paludis-0.24/2007-05-04-paludis-0.24.en.txt.asc
rename to metadata/news/2007-05-04-paludis-0_24/2007-05-04-paludis-0_24.en.txt.asc
diff --git a/metadata/news/2009-10-02-xorg-server-1-6-libxcb-1.4/2009-10-02-xorg-server-1-6-libxcb-1.4.en.txt b/metadata/news/2009-10-02-xorg-server-1-6-libxcb-1_4/2009-10-02-xorg-server-1-6-libxcb-1_4.en.txt
similarity index 100%
rename from metadata/news/2009-10-02-xorg-server-1-6-libxcb-1.4/2009-10-02-xorg-server-1-6-libxcb-1.4.en.txt
rename to metadata/news/2009-10-02-xorg-server-1-6-libxcb-1_4/2009-10-02-xorg-server-1-6-libxcb-1_4.en.txt
diff --git a/metadata/news/2009-10-02-xorg-server-1-6-libxcb-1.4/2009-10-02-xorg-server-1-6-libxcb-1.4.en.txt.asc b/metadata/news/2009-10-02-xorg-server-1-6-libxcb-1_4/2009-10-02-xorg-server-1-6-libxcb-1_4.en.txt.asc
similarity index 100%
rename from metadata/news/2009-10-02-xorg-server-1-6-libxcb-1.4/2009-10-02-xorg-server-1-6-libxcb-1.4.en.txt.asc
rename to metadata/news/2009-10-02-xorg-server-1-6-libxcb-1_4/2009-10-02-xorg-server-1-6-libxcb-1_4.en.txt.asc
diff --git a/metadata/news/2010-03-25-python-3.1/2010-03-25-python-3.1.en.txt b/metadata/news/2010-03-25-python-3_1/2010-03-25-python-3_1.en.txt
similarity index 100%
rename from metadata/news/2010-03-25-python-3.1/2010-03-25-python-3.1.en.txt
rename to metadata/news/2010-03-25-python-3_1/2010-03-25-python-3_1.en.txt
diff --git a/metadata/news/2010-03-25-python-3.1/2010-03-25-python-3.1.en.txt.asc b/metadata/news/2010-03-25-python-3_1/2010-03-25-python-3_1.en.txt.asc
similarity index 100%
rename from metadata/news/2010-03-25-python-3.1/2010-03-25-python-3.1.en.txt.asc
rename to metadata/news/2010-03-25-python-3_1/2010-03-25-python-3_1.en.txt.asc
diff --git a/metadata/news/2010-10-22-perl-5.12-upgrade-procedure/2010-10-22-perl-5.12-upgrade-procedure.en.txt b/metadata/news/2010-10-22-perl-5_12-upgrade-procedure/2010-10-22-perl-5_12-upgrade-procedure.en.txt
similarity index 100%
rename from metadata/news/2010-10-22-perl-5.12-upgrade-procedure/2010-10-22-perl-5.12-upgrade-procedure.en.txt
rename to metadata/news/2010-10-22-perl-5_12-upgrade-procedure/2010-10-22-perl-5_12-upgrade-procedure.en.txt
diff --git a/metadata/news/2010-10-22-perl-5.12-upgrade-procedure/2010-10-22-perl-5.12-upgrade-procedure.en.txt.asc b/metadata/news/2010-10-22-perl-5_12-upgrade-procedure/2010-10-22-perl-5_12-upgrade-procedure.en.txt.asc
similarity index 100%
rename from metadata/news/2010-10-22-perl-5.12-upgrade-procedure/2010-10-22-perl-5.12-upgrade-procedure.en.txt.asc
rename to metadata/news/2010-10-22-perl-5_12-upgrade-procedure/2010-10-22-perl-5_12-upgrade-procedure.en.txt.asc
diff --git a/metadata/news/2011-02-13-libgphoto2-2.4.10/2011-02-13-libgphoto2-2.4.10.en.txt b/metadata/news/2011-02-13-libgphoto2-2_4_10/2011-02-13-libgphoto2-2_4_10.en.txt
similarity index 100%
rename from metadata/news/2011-02-13-libgphoto2-2.4.10/2011-02-13-libgphoto2-2.4.10.en.txt
rename to metadata/news/2011-02-13-libgphoto2-2_4_10/2011-02-13-libgphoto2-2_4_10.en.txt
diff --git a/metadata/news/2011-02-13-libgphoto2-2.4.10/2011-02-13-libgphoto2-2.4.10.en.txt.asc b/metadata/news/2011-02-13-libgphoto2-2_4_10/2011-02-13-libgphoto2-2_4_10.en.txt.asc
similarity index 100%
rename from metadata/news/2011-02-13-libgphoto2-2.4.10/2011-02-13-libgphoto2-2.4.10.en.txt.asc
rename to metadata/news/2011-02-13-libgphoto2-2_4_10/2011-02-13-libgphoto2-2_4_10.en.txt.asc
diff --git a/metadata/news/2014-03-16-ruby-1.8-removal/2014-03-16-ruby-1.8-removal.en.txt b/metadata/news/2014-03-16-ruby-1_8-removal/2014-03-16-ruby-1_8-removal.en.txt
similarity index 100%
rename from metadata/news/2014-03-16-ruby-1.8-removal/2014-03-16-ruby-1.8-removal.en.txt
rename to metadata/news/2014-03-16-ruby-1_8-removal/2014-03-16-ruby-1_8-removal.en.txt
diff --git a/metadata/news/2014-03-16-ruby-1.8-removal/2014-03-16-ruby-1.8-removal.en.txt.asc b/metadata/news/2014-03-16-ruby-1_8-removal/2014-03-16-ruby-1_8-removal.en.txt.asc
similarity index 100%
rename from metadata/news/2014-03-16-ruby-1.8-removal/2014-03-16-ruby-1.8-removal.en.txt.asc
rename to metadata/news/2014-03-16-ruby-1_8-removal/2014-03-16-ruby-1_8-removal.en.txt.asc
diff --git a/metadata/news/2014-07-17-dhcpcd_6.4.2_changes_defaults_for_ipv6/2014-07-17-dhcpcd_6.4.2_changes_defaults_for_ipv6.en.txt b/metadata/news/2014-07-17-dhcpcd_6_4_2_changes_defaults_for_ipv6/2014-07-17-dhcpcd_6_4_2_changes_defaults_for_ipv6.en.txt
similarity index 100%
rename from metadata/news/2014-07-17-dhcpcd_6.4.2_changes_defaults_for_ipv6/2014-07-17-dhcpcd_6.4.2_changes_defaults_for_ipv6.en.txt
rename to metadata/news/2014-07-17-dhcpcd_6_4_2_changes_defaults_for_ipv6/2014-07-17-dhcpcd_6_4_2_changes_defaults_for_ipv6.en.txt
diff --git a/metadata/news/2014-07-17-dhcpcd_6.4.2_changes_defaults_for_ipv6/2014-07-17-dhcpcd_6.4.2_changes_defaults_for_ipv6.en.txt.asc b/metadata/news/2014-07-17-dhcpcd_6_4_2_changes_defaults_for_ipv6/2014-07-17-dhcpcd_6_4_2_changes_defaults_for_ipv6.en.txt.asc
similarity index 100%
rename from metadata/news/2014-07-17-dhcpcd_6.4.2_changes_defaults_for_ipv6/2014-07-17-dhcpcd_6.4.2_changes_defaults_for_ipv6.en.txt.asc
rename to metadata/news/2014-07-17-dhcpcd_6_4_2_changes_defaults_for_ipv6/2014-07-17-dhcpcd_6_4_2_changes_defaults_for_ipv6.en.txt.asc
diff --git a/metadata/news/2017-02-10-upgrade-to-sys-libs_uclibc-ng-1.0.22/2017-02-10-upgrade-to-sys-libs_uclibc-ng-1.0.22.en.txt b/metadata/news/2017-02-10-upgrade-to-sys-libs_uclibc-ng-1_0_22/2017-02-10-upgrade-to-sys-libs_uclibc-ng-1_0_22.en.txt
similarity index 100%
rename from metadata/news/2017-02-10-upgrade-to-sys-libs_uclibc-ng-1.0.22/2017-02-10-upgrade-to-sys-libs_uclibc-ng-1.0.22.en.txt
rename to metadata/news/2017-02-10-upgrade-to-sys-libs_uclibc-ng-1_0_22/2017-02-10-upgrade-to-sys-libs_uclibc-ng-1_0_22.en.txt
diff --git a/metadata/news/2017-02-10-upgrade-to-sys-libs_uclibc-ng-1.0.22/2017-02-10-upgrade-to-sys-libs_uclibc-ng-1.0.22.en.txt.asc b/metadata/news/2017-02-10-upgrade-to-sys-libs_uclibc-ng-1_0_22/2017-02-10-upgrade-to-sys-libs_uclibc-ng-1_0_22.en.txt.asc
similarity index 100%
rename from metadata/news/2017-02-10-upgrade-to-sys-libs_uclibc-ng-1.0.22/2017-02-10-upgrade-to-sys-libs_uclibc-ng-1.0.22.en.txt.asc
rename to metadata/news/2017-02-10-upgrade-to-sys-libs_uclibc-ng-1_0_22/2017-02-10-upgrade-to-sys-libs_uclibc-ng-1_0_22.en.txt.asc
diff --git a/metadata/news/Manifest.files.gz b/metadata/news/Manifest.files.gz
index 729a65fc034a..c2cd9e727b4c 100644
Binary files a/metadata/news/Manifest.files.gz and b/metadata/news/Manifest.files.gz differ
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 5790559f51dd..71135410bff9 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Sun, 26 Nov 2017 07:09:18 +0000
+Mon, 27 Nov 2017 12:39:27 +0000
diff --git a/metadata/news/timestamp.commit b/metadata/news/timestamp.commit
index 29f7b9849f84..b4f790878a3a 100644
--- a/metadata/news/timestamp.commit
+++ b/metadata/news/timestamp.commit
@@ -1 +1 @@
-785a5931b71af3c397a35c18d907255eebcef6e9 1511345278 2017-11-22T10:07:58+00:00
+73ea3e03482e4ef950241de9e56acf1de7e3a90a 1511732866 2017-11-26T21:47:46+00:00
diff --git a/metadata/timestamp b/metadata/timestamp
index 61862fc56040..c524263aa1c7 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Sun Nov 26 07:09:18 UTC 2017
+Mon Nov 27 12:39:27 UTC 2017
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index b84f9df71b68..7621fb568321 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Sun, 26 Nov 2017 12:30:01 +0000
+Mon, 27 Nov 2017 13:00:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index f58023df692e..9e466f19246f 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-35852ca085323d42a5005c021ef9bc0821293ec9 1511678465 2017-11-26T06:41:05+00:00
+6d7f48fddea0bc8a66005d964c381372965a0eaa 1511785732 2017-11-27T12:28:52+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 6228e8f20ca2..0d77d4a4fd59 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1511680201 Sun 26 Nov 2017 07:10:01 AM UTC
+1511786401 Mon 27 Nov 2017 12:40:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 5790559f51dd..71135410bff9 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Sun, 26 Nov 2017 07:09:18 +0000
+Mon, 27 Nov 2017 12:39:27 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 02e22066e07d..c8aa317ffbbe 100644
Binary files a/net-analyzer/Manifest.gz and b/net-analyzer/Manifest.gz differ
diff --git a/net-analyzer/graphite-web/metadata.xml b/net-analyzer/graphite-web/metadata.xml
index 51189851a341..851f07a3b532 100644
--- a/net-analyzer/graphite-web/metadata.xml
+++ b/net-analyzer/graphite-web/metadata.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>grobian@gentoo.org</email>
-    <name>Fabian Groffen</name>
-  </maintainer>
-  <use>
-    <flag name="memcached">Enable memcached support</flag>
+	<maintainer type="person">
+		<email>grobian@gentoo.org</email>
+		<name>Fabian Groffen</name>
+	</maintainer>
+	<use>
+		<flag name="memcached">Enable memcached support</flag>
 		<flag name="carbon">Enable carbon support</flag>
-  </use>
-  <upstream>
-    <remote-id type="pypi">graphite-web</remote-id>
-  </upstream>
+	</use>
+	<upstream>
+		<remote-id type="pypi">graphite-web</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-analyzer/masscan/metadata.xml b/net-analyzer/masscan/metadata.xml
index ab58c05fdec9..0009b85ef1f3 100644
--- a/net-analyzer/masscan/metadata.xml
+++ b/net-analyzer/masscan/metadata.xml
@@ -1,26 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>robbat2@gentoo.org</email>
-  </maintainer>
-  <maintainer type="project">
-    <email>netmon@gentoo.org</email>
-    <name>Gentoo network monitoring and analysis project</name>
-  </maintainer>
-  <longdescription lang="en">
- This is the fastest Internet port scanner. It can scan the
- entire Internet in under 6 minutes, transmitting 10 million
- packets per second.
- 
- It produces results similar to nmap, the most famous port
- scanner. Internally, it operates more like scanrand,
- unicornscan, and ZMap, using asynchronous transmission.
- The major difference is that it's faster than these other
- scanners. In addition, it's more flexible, allowing
- arbitrary address ranges and port ranges.
+	<maintainer type="person">
+		<email>robbat2@gentoo.org</email>
+	</maintainer>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+	<longdescription lang="en">
+		This is the fastest Internet port scanner. It can scan the
+		entire Internet in under 6 minutes, transmitting 10 million
+		packets per second.
+
+		It produces results similar to nmap, the most famous port
+		scanner. Internally, it operates more like scanrand,
+		unicornscan, and ZMap, using asynchronous transmission.
+		The major difference is that it's faster than these other
+		scanners. In addition, it's more flexible, allowing
+		arbitrary address ranges and port ranges.
 	</longdescription>
-  <upstream>
-    <remote-id type="github">robertdavidgraham/masscan</remote-id>
-  </upstream>
+	<upstream>
+		<remote-id type="github">robertdavidgraham/masscan</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-analyzer/nethogs/metadata.xml b/net-analyzer/nethogs/metadata.xml
index 1b55544df345..03dae9d25e4b 100644
--- a/net-analyzer/nethogs/metadata.xml
+++ b/net-analyzer/nethogs/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
@@ -6,12 +6,12 @@
 		<name>Gentoo network monitoring and analysis project</name>
 	</maintainer>
 	<longdescription>
-NetHogs is a small 'net top' tool. Instead of breaking the traffic down
- per protocol or per subnet, like most tools do, it groups bandwidth by 
-process. NetHogs does not rely on a special kernel module to be loaded. 
-If there's suddenly a lot of network traffic, you can fire up NetHogs and 
-immediately see which PID is causing this. This makes it easy to indentify 
-programs that have gone wild and are suddenly taking up your bandwidth.
+		NetHogs is a small 'net top' tool. Instead of breaking the traffic down
+		per protocol or per subnet, like most tools do, it groups bandwidth by
+		process. NetHogs does not rely on a special kernel module to be loaded.
+		If there's suddenly a lot of network traffic, you can fire up NetHogs and
+		immediately see which PID is causing this. This makes it easy to indentify
+		programs that have gone wild and are suddenly taking up your bandwidth.
 	</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">nethogs</remote-id>
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index c15d386eaf91..8be664a29b23 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,2 +1,2 @@
-DIST wireshark-2.2.7.tar.bz2 32309420 SHA256 689ddf62221b152779d8846ab5b2063cc7fd41ec1a9f04eefab09b5d5486dbb5 SHA512 417836810eb895b3f2a6ac1cfd138fb0275382ea2edc60fc5f5e5f8ce433b56b8120aa8b58b4f77296986630fdf49e4c5c3859b2c2c5e26b1ce0651393b7d716 WHIRLPOOL 0361821da9c113a8de1339cc48cae0291be84bcffb1ba34b1fc3f457b22525329e954a2060f7eef25bca550d0ccdaf4a9e9587d35394b0abd9b0d38bc6023e44
-DIST wireshark-2.4.2.tar.xz 28791712 SHA256 d1acb24735fd35e18e9b7a0555ec58277c2b87da45a19ebeb8087c3dda55f47d SHA512 212964482a1e45af490ef78b3f2465384f84c007a76c3a99e8de0e2c37d933fb34b0da5631f4a36ca12d2fa7cc4376d3d405cbe7f7113791ea09dba7e5915417 WHIRLPOOL 245454643e138c61ccb380ae236482fea702cf4c0507de1c1d3d6dc9f7312809533db7b0fba585f95b8caf5b76affa4da23ad263b8f95174dfbb9c2ee3300177
+DIST wireshark-2.2.7.tar.bz2 32309420 BLAKE2B a4ec32fab15235c5bde9f03ceafc5760055a769dd40d96526a18ad16d5642e957f620fc58f42c3323745bd679d6ef7b006283e7b9ddc52ddadc2680789d957ea SHA512 417836810eb895b3f2a6ac1cfd138fb0275382ea2edc60fc5f5e5f8ce433b56b8120aa8b58b4f77296986630fdf49e4c5c3859b2c2c5e26b1ce0651393b7d716
+DIST wireshark-2.4.2.tar.xz 28791712 BLAKE2B 64a965f522478e2e5690a4439554764bd341c0b8017003af4b0d328094cf56a72462df9dfdb9c9318e4bfc1fe57e4caedc43e0d0c18c704c8342dbb3baa36d91 SHA512 212964482a1e45af490ef78b3f2465384f84c007a76c3a99e8de0e2c37d933fb34b0da5631f4a36ca12d2fa7cc4376d3d405cbe7f7113791ea09dba7e5915417
diff --git a/net-analyzer/wireshark/files/wireshark-99999999-androiddump.patch b/net-analyzer/wireshark/files/wireshark-99999999-androiddump.patch
index 124a9b8b00be..db1c560848ec 100644
--- a/net-analyzer/wireshark/files/wireshark-99999999-androiddump.patch
+++ b/net-analyzer/wireshark/files/wireshark-99999999-androiddump.patch
@@ -1,10 +1,10 @@
 --- a/extcap/Makefile.am
 +++ b/extcap/Makefile.am
-@@ -49,6 +49,7 @@
- androiddump_LDADD = \
+@@ -32,6 +32,7 @@
+ 	../ui/libui.a			\
  	../wiretap/libwiretap.la	\
  	../wsutil/libwsutil.la		\
 +	@PCAP_LIBS@ \
  	@GLIB_LIBS@
  
- if ENABLE_STATIC
+ randpktdump_SOURCES = \
diff --git a/net-analyzer/wireshark/wireshark-99999999.ebuild b/net-analyzer/wireshark/wireshark-99999999.ebuild
index 5d11c1bd60e1..f8b854c9dc0b 100644
--- a/net-analyzer/wireshark/wireshark-99999999.ebuild
+++ b/net-analyzer/wireshark/wireshark-99999999.ebuild
@@ -146,8 +146,6 @@ src_configure() {
 	use doc || export ac_cv_prog_HAVE_DOXYGEN=false
 	use doc-pdf || export ac_cv_prog_HAVE_FOP=false
 
-	# dumpcap requires libcap
-	# --disable-profile-build bugs #215806, #292991, #479602
 	econf \
 		$(use androiddump && use pcap && echo --enable-androiddump-use-libpcap=yes) \
 		$(use dumpcap && use_with pcap dumpcap-group wireshark) \
@@ -173,7 +171,7 @@ src_configure() {
 		$(use_with geoip) \
 		$(use_with gtk gtk 3) \
 		$(use_with kerberos krb5) \
-		$(use_with libssh ssh) \
+		$(use_with libssh) \
 		$(use_with libxml2) \
 		$(use_with lua) \
 		$(use_with nghttp2) \
@@ -192,7 +190,6 @@ src_configure() {
 		$(usex qt5 MOC=$(qt5_get_bindir)/moc '') \
 		$(usex qt5 RCC=$(qt5_get_bindir)/rcc '') \
 		$(usex qt5 UIC=$(qt5_get_bindir)/uic '') \
-		--disable-profile-build \
 		--disable-warnings-as-errors \
 		--sysconfdir="${EPREFIX}"/etc/wireshark \
 		${myconf[@]}
@@ -236,7 +233,6 @@ src_install() {
 		epan/dissectors/*.h \
 		epan/ftypes/*.h \
 		epan/wmem/*.h \
-		register.h \
 		wiretap/*.h \
 		ws_diag_control.h \
 		ws_symbol_export.h \
diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index c34b57632fc1..b8cfe6fe26ce 100644
Binary files a/net-dns/Manifest.gz and b/net-dns/Manifest.gz differ
diff --git a/net-dns/libidn/Manifest b/net-dns/libidn/Manifest
index 7cc057c769f9..8be52eeac649 100644
--- a/net-dns/libidn/Manifest
+++ b/net-dns/libidn/Manifest
@@ -1 +1 @@
-DIST libidn-1.33.tar.gz 3501056 SHA256 44a7aab635bb721ceef6beecc4d49dfd19478325e1b47f3196f7d2acc4930e19 SHA512 38dd459eaeda0c9e3cc2d24d967113515a499747550a2a9157f32357def90d71a3a3b52398e96a44a28cd5948dc353b0473c4ff0453a69720191c4cb49cac2c6 WHIRLPOOL 3b0c44742c2515e09eaf8f16f32f30bc37478a6273765d71dd9a9283f501998b6d85583cd38810bbdbd6103855e77831360010d707d29956798e3f5d066b0e82
+DIST libidn-1.33.tar.gz 3501056 BLAKE2B ce6319dc61dd825cf7ddb33f4279c178709e16ce2815c3d1a464bba6b5c6cc493107a10a686f349247a0d6023b1b834a650046e68da9f2f559870dba13a59384 SHA512 38dd459eaeda0c9e3cc2d24d967113515a499747550a2a9157f32357def90d71a3a3b52398e96a44a28cd5948dc353b0473c4ff0453a69720191c4cb49cac2c6
diff --git a/net-dns/libidn/files/libidn-1.33-CVE-2017-14062.patch b/net-dns/libidn/files/libidn-1.33-CVE-2017-14062.patch
index 2ddf3fdd6be2..5c2e0a91b2e3 100644
--- a/net-dns/libidn/files/libidn-1.33-CVE-2017-14062.patch
+++ b/net-dns/libidn/files/libidn-1.33-CVE-2017-14062.patch
@@ -30,3 +30,48 @@ index 86819a7..49250a1 100644
 -- 
 1.9.1
 
+From 6c8a9375641ca283b50f9680c90dcd57f9c44798 Mon Sep 17 00:00:00 2001
+From: =?utf8?q?Tim=20R=C3=BChsen?= <tim.ruehsen@gmx.de>
+Date: Wed, 4 Oct 2017 15:22:43 +0200
+Subject: [PATCH] lib/punycode.c (decode_digit): Really fix integer overflow
+
+The fix in commit e9e81b8063b095b02cf104bb992fa9bf9515b9d8
+was incomplete.
+
+Reported-by: Christian Weisgerber
+---
+ lib/punycode.c   | 4 ++--
+ tests/tst_idna.c | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/lib/punycode.c b/lib/punycode.c
+index 49250a1..d475b6d 100644
+--- a/lib/punycode.c
++++ b/lib/punycode.c
+@@ -91,8 +91,8 @@ enum
+ static unsigned
+ decode_digit (int cp)
+ {
+-  return (unsigned) cp - 48 < 10 ? cp - 22 : cp - 65 < 26 ? cp - 65 :
+-    cp - 97 < 26 ? cp - 97 : base;
++  return (unsigned) (cp - 48 < 10 ? cp - 22 : cp - 65 < 26 ? cp - 65 :
++    cp - 97 < 26 ? cp - 97 : base);
+ }
+ 
+ /* encode_digit(d,flag) returns the basic code point whose value      */
+diff --git a/tests/tst_idna.c b/tests/tst_idna.c
+index 4ac046f..7fb58b9 100644
+--- a/tests/tst_idna.c
++++ b/tests/tst_idna.c
+@@ -211,7 +211,7 @@ static const struct idna idna[] = {
+     'x', 'n', '-', '-', 'f', 'o', 0x3067},
+    IDNA_ACE_PREFIX "too long too long too long too long too long too "
+    "long too long too long too long too long ", 0,
+-   IDNA_CONTAINS_ACE_PREFIX, IDNA_PUNYCODE_ERROR}
++   IDNA_CONTAINS_ACE_PREFIX, IDNA_INVALID_LENGTH}
+ };
+ 
+ void
+-- 
+1.9.1
+
diff --git a/net-dns/libidn/files/libidn-1.33-parallel-make.patch b/net-dns/libidn/files/libidn-1.33-parallel-make.patch
new file mode 100644
index 000000000000..2d237f3e27b1
--- /dev/null
+++ b/net-dns/libidn/files/libidn-1.33-parallel-make.patch
@@ -0,0 +1,115 @@
+From 4709e64fef29ca8ddd5b0878e3126640bd1480c2 Mon Sep 17 00:00:00 2001
+From: =?utf8?q?Tim=20R=C3=BChsen?= <tim.ruehsen@gmx.de>
+Date: Wed, 4 Oct 2017 15:02:49 +0200
+Subject: [PATCH] * src/Makefile.am: Fix rule for parallel builds
+
+---
+ src/Makefile.am | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 6832c20..218d52e 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -35,7 +35,8 @@ libidn_cmd_la_SOURCES =  idn.ggo idn_cmd.c idn_cmd.h
+ libidn_cmd_la_LIBADD = ../gl/libgnu.la
+ libidn_cmd_la_CFLAGS =
+ 
+-idn_cmd.c idn_cmd.h: idn.ggo Makefile.am
++# pattern rule (%) needed for parallel make (-j)
++idn_cmd%c idn_cmd%h: idn.ggo
+ 	gengetopt --unamed-opts --no-handle-version --no-handle-help \
+ 		--set-package="idn" \
+ 		--input $^ --file-name idn_cmd
+-- 
+1.9.1
+
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -1,7 +1,7 @@
+-# Makefile.in generated by automake 1.14.1 from Makefile.am.
++# Makefile.in generated by automake 1.15.1 from Makefile.am.
+ # @configure_input@
+ 
+-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
++# Copyright (C) 1994-2017 Free Software Foundation, Inc.
+ 
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+@@ -34,7 +34,17 @@
+ 
+ 
+ VPATH = @srcdir@
+-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
++am__is_gnu_make = { \
++  if test -z '$(MAKELEVEL)'; then \
++    false; \
++  elif test -n '$(MAKE_HOST)'; then \
++    true; \
++  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
++    true; \
++  else \
++    false; \
++  fi; \
++}
+ am__make_running_with_option = \
+   case $${target_option-} in \
+       ?) ;; \
+@@ -99,8 +109,6 @@
+ host_triplet = @host@
+ bin_PROGRAMS = idn$(EXEEXT)
+ subdir = src
+-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+-	$(top_srcdir)/build-aux/depcomp $(dist_lisp_DATA)
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/lib/gl/m4/ctype.m4 \
+ 	$(top_srcdir)/lib/gl/m4/gnulib-comp.m4 \
+@@ -184,6 +192,8 @@
+ 	$(top_srcdir)/m4/wint_t.m4 $(top_srcdir)/configure.ac
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ 	$(ACLOCAL_M4)
++DIST_COMMON = $(srcdir)/Makefile.am $(dist_lisp_DATA) \
++	$(am__DIST_COMMON)
+ mkinstalldirs = $(install_sh) -d
+ CONFIG_HEADER = $(top_builddir)/config.h
+ CONFIG_CLEAN_FILES =
+@@ -294,6 +304,8 @@
+   done | $(am__uniquify_input)`
+ ETAGS = etags
+ CTAGS = ctags
++am__DIST_COMMON = $(srcdir)/Makefile.in \
++	$(top_srcdir)/build-aux/depcomp
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
+ ALLOCA = @ALLOCA@
+@@ -863,6 +875,7 @@
+ LT_AGE = @LT_AGE@
+ LT_CURRENT = @LT_CURRENT@
+ LT_REVISION = @LT_REVISION@
++LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+ MAKEINFO = @MAKEINFO@
+ MANIFEST_TOOL = @MANIFEST_TOOL@
+ MKDIR_P = @MKDIR_P@
+@@ -1200,7 +1213,6 @@
+ 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \
+ 	$(am__cd) $(top_srcdir) && \
+ 	  $(AUTOMAKE) --gnu src/Makefile
+-.PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ 	@case '$?' in \
+ 	  *config.status*) \
+@@ -1562,10 +1574,13 @@
+ 	pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
+ 	uninstall-binPROGRAMS uninstall-dist_lispDATA
+ 
++.PRECIOUS: Makefile
++
+ 
+ idn.c: $(BUILT_SOURCES)
+ 
+-idn_cmd.c idn_cmd.h: idn.ggo Makefile.am
++# pattern rule (%) needed for parallel make (-j)
++idn_cmd%c idn_cmd%h: idn.ggo
+ 	gengetopt --unamed-opts --no-handle-version --no-handle-help \
+ 		--set-package="idn" \
+ 		--input $^ --file-name idn_cmd
diff --git a/net-dns/libidn/libidn-1.33-r2.ebuild b/net-dns/libidn/libidn-1.33-r2.ebuild
new file mode 100644
index 000000000000..5e498c6299e0
--- /dev/null
+++ b/net-dns/libidn/libidn-1.33-r2.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit elisp-common java-pkg-opt-2 mono-env multilib-minimal libtool
+
+DESCRIPTION="Internationalized Domain Names (IDN) implementation"
+HOMEPAGE="https://www.gnu.org/software/libidn/"
+SRC_URI="mirror://gnu/libidn/${P}.tar.gz"
+
+LICENSE="GPL-2 GPL-3 LGPL-3 java? ( Apache-2.0 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc emacs java mono nls static-libs"
+
+DOCS=( AUTHORS ChangeLog FAQ NEWS README THANKS TODO )
+COMMON_DEPEND="
+	emacs? ( virtual/emacs )
+	mono? ( >=dev-lang/mono-0.95 )
+"
+DEPEND="${COMMON_DEPEND}
+	nls? (
+		>=sys-devel/gettext-0.17
+	)
+	java? (
+		>=virtual/jdk-1.5
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	nls? (
+		>=virtual/libintl-0-r1[${MULTILIB_USEDEP}]
+	)
+	java? (
+		>=virtual/jre-1.5
+	)
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-baselibs-20140508-r5
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+	)
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.33-CVE-2017-14062.patch
+	"${FILESDIR}"/${PN}-1.33-parallel-make.patch
+)
+
+pkg_setup() {
+	mono-env_pkg_setup
+	java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# bundled, with wrong bytecode
+	rm "${S}/java/${P}.jar" || die
+
+	# prevent triggering doc updates after punycode.c patch
+	touch doc/texi/punycode* doc/man/punycode* doc/libidn.info || die
+
+	elibtoolize  # for Solaris shared objects
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE=${S} GJDOC=javadoc \
+	econf \
+		$(multilib_native_use_enable java) \
+		$(multilib_native_use_enable mono csharp mono) \
+		$(use_enable nls) \
+		$(use_enable static-libs static) \
+		--disable-silent-rules \
+		--disable-valgrind-tests \
+		--with-lispdir="${EPREFIX}${SITELISP}/${PN}" \
+		--with-packager-bug-reports="https://bugs.gentoo.org" \
+		--with-packager-version="r${PR}" \
+		--with-packager="Gentoo"
+}
+
+multilib_src_compile() {
+	default
+
+	if multilib_is_native_abi; then
+		use emacs && elisp-compile "${S}"/src/*.el
+		use java && use doc && emake -C java/src/main/java javadoc
+	fi
+}
+
+multilib_src_test() {
+	# only run libidn specific tests and not gnulib tests (bug #539356)
+	emake -C tests check
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+
+	if multilib_is_native_abi && use java; then
+		java-pkg_newjar java/${P}.jar ${PN}.jar
+		rm -r "${ED}"/usr/share/java || die
+		use doc && java-pkg_dojavadoc "${S}"/doc/java
+	fi
+}
+
+multilib_src_install_all() {
+	if use emacs; then
+		# *.el are installed by the build system
+		elisp-install ${PN} "${S}"/src/*.elc
+		elisp-site-file-install "${FILESDIR}/50${PN}-gentoo.el"
+	else
+		rm -r "${ED}/usr/share/emacs" || die
+	fi
+
+	einstalldocs
+
+	if use doc ; then
+		dodoc -r doc/reference/html/
+	fi
+
+	prune_libtool_files
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/net-firewall/Manifest.gz b/net-firewall/Manifest.gz
index 98b41f5fd132..06fcf68586f0 100644
Binary files a/net-firewall/Manifest.gz and b/net-firewall/Manifest.gz differ
diff --git a/net-firewall/iptables/metadata.xml b/net-firewall/iptables/metadata.xml
index 92f454ba7f63..0b5f57f8bf89 100644
--- a/net-firewall/iptables/metadata.xml
+++ b/net-firewall/iptables/metadata.xml
@@ -1,29 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>base-system@gentoo.org</email>
-	<name>Gentoo Base System</name>
-</maintainer>
-<use>
-	<flag name="conntrack">Build against <pkg>net-libs/libnetfilter_conntrack</pkg> when enables the connlabel matcher</flag>
-	<flag name="netlink">Build against libnfnetlink which enables the nfnl_osf util</flag>
-	<flag name="nftables">Support nftables kernel interface</flag>
-	<flag name="pcap">Build against <pkg>net-libs/libpcap</pkg> which enables the nfbpf_compile util</flag>
-</use>
-<longdescription>
-  iptables is the userspace command line program used to set up, maintain, and
-  inspect the tables of IPv4 packet filter rules in the Linux kernel. It's a
-  part of packet filtering framework which allows the stateless and stateful
-  packet filtering, all kinds of network address and port translation, and is a
-  flexible and extensible infrastructure with multiple layers of API's for 3rd
-  party extensions. The iptables package also includes ip6tables. ip6tables is
-  used for configuring the IPv6 packet filter.
+	<maintainer type="project">
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
+	<use>
+		<flag name="conntrack">Build against <pkg>net-libs/libnetfilter_conntrack</pkg> when enables the connlabel matcher</flag>
+		<flag name="netlink">Build against libnfnetlink which enables the nfnl_osf util</flag>
+		<flag name="nftables">Support nftables kernel interface</flag>
+		<flag name="pcap">Build against <pkg>net-libs/libpcap</pkg> which enables the nfbpf_compile util</flag>
+	</use>
+	<longdescription>
+		iptables is the userspace command line program used to set up, maintain, and
+		inspect the tables of IPv4 packet filter rules in the Linux kernel. It's a
+		part of packet filtering framework which allows the stateless and stateful
+		packet filtering, all kinds of network address and port translation, and is a
+		flexible and extensible infrastructure with multiple layers of API's for 3rd
+		party extensions. The iptables package also includes ip6tables. ip6tables is
+		used for configuring the IPv6 packet filter.
 
-  Note that some extensions (e.g. imq and l7filter) are not included into
-  official kernel sources so you have to patch the sources before installation.
-</longdescription>
-<upstream>
- <remote-id type="cpe">cpe:/a:netfilter_core_team:iptables</remote-id>
-</upstream>
+		Note that some extensions (e.g. imq and l7filter) are not included into
+		official kernel sources so you have to patch the sources before installation.
+	</longdescription>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:netfilter_core_team:iptables</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index a6890552d1fd..699d17f63654 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -1,14 +1,21 @@
 DIST shorewall-5.1.7.2.tar.bz2 524263 SHA256 e7c4cde2d04894ddf6e8dd8a8f96e96e04574181807cfe9f78915fa0dfc836e4 SHA512 05599609b50189e300cd71eda6876ac5e8878a2d2ab7c1635afc1b79f1ab3c9bc92c1ac1758aa8996d10bb37783d1fa29c76adaa879ec93bc12669c3dbdbed9b WHIRLPOOL a2fcc48c9c51161c4a2ec692fa29215824a412056fdc15203892e6a9752c2239722462be89f26c4e7374ceb0131ba35df87847a3f16329438c57ec8f8dec0208
-DIST shorewall-5.1.8.1.tar.bz2 524305 SHA256 0ba4f22394d988a5714637444c248e542d5897e41ab5770907edf38e422fe2ff SHA512 3dfacf35134c4831db057bb11d11b10d0e8cd0eb0edf28f64a02a3970ebb33e9a2e2d1cc943432a14c7fa34779e812e704d43c8e6f1070bca30fcc470c7a215c WHIRLPOOL 0e549aa6d28d79ec8b9f448c2c5ef0a10a0ad930249d6be31e86ea9bf33501ac7ee544a628e408406018efaa5b80cdccd6e29f68ede9b506428fbf143deab733
+DIST shorewall-5.1.8.1.tar.bz2 524305 BLAKE2B a59b32d734bdbc62389d542ac8c6beb054266ec98f6d05a67126f3d85d1ff6143a55737a4cd38cabd581dd6df6fc2569e8bb9327d435debfbea5f0b03ded51a1 SHA512 3dfacf35134c4831db057bb11d11b10d0e8cd0eb0edf28f64a02a3970ebb33e9a2e2d1cc943432a14c7fa34779e812e704d43c8e6f1070bca30fcc470c7a215c
+DIST shorewall-5.1.9.tar.bz2 529237 BLAKE2B abf9b54ef6083d322bd2e4fc00f98c2058759b2bf0e30f4aeebbc3cbb0e943543c7c304c8fb3b00ed7fd60391d1afa7d713cb88040a76eb8db549426ba3450e3 SHA512 a29155d8d92e21b7fc6d3fb3ec0be5ff4a648237317ff83aac523ce6d04c863c2ff48a14d368130431c41897e15068a54a2c0d3d0d9867017c11ba50a14e02b5
 DIST shorewall-core-5.1.7.2.tar.bz2 80213 SHA256 c1f78229d9633ea6b35ec067c9724003e2929a39ae54ccd8e6875776d155cd70 SHA512 73c547d6985f17f5c2f2fe4a846a7db76fe514edbc03b7b2f191b437405ac6175cbe3dba615839bb46658031f7cd74ce26221cac42869818e5131b1836d43951 WHIRLPOOL e58a64514f50b375670908cea228610abab9bdb7a8300d04a3c728a70b662da144711e09124fa6149e61c941d165f93a65d162cedbc739eb670ddad4d86f76ff
-DIST shorewall-core-5.1.8.1.tar.bz2 81130 SHA256 0caca8dbd969e88f3f875789b3ac31985a19d39916efe15f69766a6ddd8d97ac SHA512 480003ff87da59ea64cabc3fc15e12bef44180fcc47b71f9a08c225484dc401080271ddf2834574ca46992973f9d3567ddd14d977b670c48a453eb435c356ab6 WHIRLPOOL 173dee8d7e3cc89d092c844a040f75924c860a2c8b9a97fda21cac20ee9160c98597c54c830061ecc866f51b3d22fd78513ce06f39e176662bbf26133ac2d421
+DIST shorewall-core-5.1.8.1.tar.bz2 81130 BLAKE2B 6cd8a434b9da66b264c5c4bd48009ff52c55693e9f749a150acea9b9790ac863ebab8fb75e8032edea0b6ccc75f259b65edf002912550c4d691da3e646685f80 SHA512 480003ff87da59ea64cabc3fc15e12bef44180fcc47b71f9a08c225484dc401080271ddf2834574ca46992973f9d3567ddd14d977b670c48a453eb435c356ab6
+DIST shorewall-core-5.1.9.tar.bz2 81533 BLAKE2B 5c47197c6dc6d43c63efef4806707948c0edfb39b237a214249522200a6b0429b0a2a0e8350af5cf448f28ca2b07a9258f91a88d8e9fb7112b2f265100fdc666 SHA512 633ac2f5bd25946f90d6351ea510976b01a61292616856f119602813510e1c24b55e8d86531a854fdbca03572d9eb2865a8e94a1566d36bf286c411e92182877
 DIST shorewall-docs-html-5.1.7.2.tar.bz2 4218919 SHA256 348e9bf9c97e97aa3f8f425e30da9f6c89d2b7c5a035a21ac4c3e792ef33ac95 SHA512 b9c85d228b65ecf6b9e29ba316b8cf878a06832bc94f62e2ca8793c02c95bae7be934dd45dc572b31d8e4cff00e1092c8c8681d7c1fc4759c5700a1b8f868f55 WHIRLPOOL 01c51b28a9bcbed7e9a8d257ef01ecc113ba0ad095fce02d6fc17b3b341fd5d340281dfe1db0699ae1ff81e990f9413436d9fa0920846ae9f4b4298a483bede3
-DIST shorewall-docs-html-5.1.8.1.tar.bz2 4212495 SHA256 cf7aafa3b9c990205ceda790ecb006a6b17c5d0aea4d223a8da708f34fd91bd1 SHA512 665cc93d62bff6e18517ef959990fea6608de8246068a09f3548b855cafe08a9a6a7722a92bf8a2890889a0041ec5cb0647abe4f3afcaec857e309f2d33d6fd4 WHIRLPOOL 36e6099e5bd2790dc3952ba06c8f8e84737f505557a912fa0b58b2d603d66ba75aa2a14c4e8611d7186a44650d689cbfb5ec4012e0069732130e2d602f2e0e9f
+DIST shorewall-docs-html-5.1.8.1.tar.bz2 4212495 BLAKE2B be7e0da12b87f7f839c6c956d80e6bd5cfa4fe3cd6c9e9a651b1dcdc5530726daa31adf30f87a6f98f7ea980ab30cce32973211057f99a9dc81e5cf8d9b387e2 SHA512 665cc93d62bff6e18517ef959990fea6608de8246068a09f3548b855cafe08a9a6a7722a92bf8a2890889a0041ec5cb0647abe4f3afcaec857e309f2d33d6fd4
+DIST shorewall-docs-html-5.1.9.tar.bz2 4279854 BLAKE2B 49a5285b19fd14a739090ebda718b936fe4be5222d32a23600c8acceb598ed7539c471ba02464c8c5e7aeb8944277d740dd05c99a09486b8d4933c8676e0f724 SHA512 38bfb3aa680c3e8eb2916aed63800396cd1ae1bac3e084e0d9aecf89ba457f10b578e1122a36d486095028a39f17bfaa1bc85e92fdf324e7d53b10fb5f3b61fe
 DIST shorewall-init-5.1.7.2.tar.bz2 35347 SHA256 f47900550045901a38a96fbcad6e401f86cc53ba0a94c44e1b3903b0e6358609 SHA512 9f295da51cbfe7c2fa3aab4029b18ff4bb9c4834d852e2a4cc3770fbed6eae79797000053ad7097ba831e01f710bf4c030d1f3b0cda93cb8da3dc3befa6ae0f4 WHIRLPOOL 1d47c4211959193334e921a82fe50b2cfb353ac6f3635bb96d1b8500a8dacaf2ddf2d62f96874dd3c2d9f4dd9d7e7f689fee4254b528bf1fe92a47fff5d8cca5
-DIST shorewall-init-5.1.8.1.tar.bz2 36268 SHA256 c2007f45efae58235c445e53cdab0ebef559adcdc6a84ac09125f1e57081c27d SHA512 67d9e7f7dda5615c826eae784c30ed36dfed0e7b0f7bd95088082f401998eb989ac9e39ab528300f075a1d6f4ad2eb3a7dcbfac5c785db79dc154821e2c5e86a WHIRLPOOL b82dab99fc44e27e6c1f420ea6512f4560f497f2df03d14e01d06c7661d8f6166539f2b6798ffa56ac85eec556411826c1ade182adeb9aea75ca60d56e7b6cfe
+DIST shorewall-init-5.1.8.1.tar.bz2 36268 BLAKE2B dabe010dde8df66a1ca25fda0cf7c0984d6358774ab5b3c8124c9ad36ca9c750e6f3377c49021383035e00e37f6dab0263620e207e8edafb8305ee4c52c0cba5 SHA512 67d9e7f7dda5615c826eae784c30ed36dfed0e7b0f7bd95088082f401998eb989ac9e39ab528300f075a1d6f4ad2eb3a7dcbfac5c785db79dc154821e2c5e86a
+DIST shorewall-init-5.1.9.tar.bz2 36834 BLAKE2B 6e8ebdda40e547e528df1faec4174f757b7922f7f06fae07dcc4a5c11005d2da5df387c900a9aa07715c9d99940b62f4fef28aed6b845b93f3172eca88e091fa SHA512 b7dd4394e4b48d225acff6f81d559b4020bca0f80447a179ad0a87536ce6a4c75af2f0bd9eca313bcede14c73d29c3a18a2c48cd230103b3ab656ed76747a95b
 DIST shorewall-lite-5.1.7.2.tar.bz2 41048 SHA256 e5f4f97031ef81ef599391279e18c26762f3db6dffc5fee33f3e93f37d92618c SHA512 385b072f93015259b6bb57a07c62815ac27c858c63254cd968240761a230e8b781207ee9f1cc9e6caab43e8f12c60e42cfcbaa6f938c964184b14e5d360bee83 WHIRLPOOL fe88d3f7df02164fe17f141dc1dfce9f082688ee133f93e8af63b4046981cf879560bff4a148fc21739f84d76bf3eda58906bf280fda81fc8bbec5f21f277535
-DIST shorewall-lite-5.1.8.1.tar.bz2 41954 SHA256 2efc424c1d4f737618f91864ba8e618328605514965e497660ee0ac9020b6048 SHA512 2e6716a8a7dc38e9b6b9abb85d14216b0ed4f63c8e360ac98ff5b40d0a9708cd0dbdc870c41693c135c959d1000f6880eabf7b0c4002ccd52c0e98f1ad3e1ccb WHIRLPOOL 7cc3ca69dd3aee3cc10bf85847d9d999e3539d4a31a029fb37e5c3f14c017f60b6a054c0eb41a799c02484cdb2ea8db193f14597f5bf7b31dce8bf15c45e5989
+DIST shorewall-lite-5.1.8.1.tar.bz2 41954 BLAKE2B 78d5e32bff3fa860caf258570ce5a98ff7f6484a6d4076dc4537cc1ea9b28d35f7d6f7bfbe93046a89ae83d56529763cc0a4783a4280460d420ddc04ffb35706 SHA512 2e6716a8a7dc38e9b6b9abb85d14216b0ed4f63c8e360ac98ff5b40d0a9708cd0dbdc870c41693c135c959d1000f6880eabf7b0c4002ccd52c0e98f1ad3e1ccb
+DIST shorewall-lite-5.1.9.tar.bz2 42487 BLAKE2B 6a8c41f87c0f60f7ec453ea61490560da7640a37839d0c6be004cad48aad53143e3ee327690a18cbbfbb9292a4d998ece2500fc5274a036a82d2406eb27cba1d SHA512 61eb359155fd261bf7aaf5ce03a04aead297a17e80ba9ab45a3a8e23cd0deadef780c18b2d39ffe19bce9eb0a81ad64abb9643e466af4a9e78f3464f27f95092
 DIST shorewall6-5.1.7.2.tar.bz2 192087 SHA256 8cddd2baafe71ebfd9aa691400bc320ab0672791f5d8f1e82067d91c3586deba SHA512 2ce5beb6be5ce9a5f9b1f116468f2834188938c5893ca2a9fdc7d76ab43ed487a7dd59cca5a8098ecee06274c1c359543ff57f2d3efa5e4ed8fc728702f6a689 WHIRLPOOL db5b3569689d3dd05e82316e9d7851f72e18b7df1a84b768bf6ceb546bf470843d31834a0e3d5a40e6c83597b65633efc9507eb75709a66f1c1d7223162792c2
-DIST shorewall6-5.1.8.1.tar.bz2 193412 SHA256 fde5b7a9eb0d4241ef3dfb8392b93f86a974c76cec8b05bd946bc12f509aca8e SHA512 9f4518444a8982eaaa9cd218742e4ab27b31e9b8799b4e483e30708bf13d68b444562f8cac6e98c170281d91c5bcb7730cb0f559146cd09e3b99a45dba68ef86 WHIRLPOOL 688e3f2a8538cc0a59d017a3e92c3a8d90a0372037bf8a0e7da2abb58d572fcb0b467f2149d330eb8eaa9d7fc8aefbe83411e55bd235ccd220601549392b097f
+DIST shorewall6-5.1.8.1.tar.bz2 193412 BLAKE2B fb32d234854afdc418d2d7aa95305042749b4aff9b0d6f445b2d88636db817720352ec7d295eb1c7bb2750d2363e7bd170872e2a3bdc553f82e27a8949cbb988 SHA512 9f4518444a8982eaaa9cd218742e4ab27b31e9b8799b4e483e30708bf13d68b444562f8cac6e98c170281d91c5bcb7730cb0f559146cd09e3b99a45dba68ef86
+DIST shorewall6-5.1.9.tar.bz2 194504 BLAKE2B d849470c9f737f16b47d4a0288767d7a5c6fcd48dacf4d2f51df434e43f34b9e71188a01e8b893ed64d84c1afc41a7d40e9f37ed2b6ad6b4b2b57e118ec28565 SHA512 e086dc8721865b2ddf891842838ed2ae6683154977ec1005d5c1327f76e7441b6056bd2bd53bb5ee9b95ff8dd50e5ae5b821ddbf8e5fe8f5543ff0028b7eda49
 DIST shorewall6-lite-5.1.7.2.tar.bz2 40737 SHA256 bf22e67559ebdeff464cd910b97578a4c82f5fcc87bc77aeeb9fb4a5ca2a71be SHA512 9125d4380b91f0bcaaedfef6bd5ba89ada0391bf322cd1a00deb239eebc2e818a994844a653daa2e8784bb21ad7ed51798fcaa129e28da08c66de4163fe13bdc WHIRLPOOL 12c5e8036ae08d312ee52af40157f7ad8c18e0ccc8475845b22a3ce7647a73105b8a2f9034851f3e547ed6c47b2a7f0ef566de6dc96a19a20b1da429cd90a170
-DIST shorewall6-lite-5.1.8.1.tar.bz2 41671 SHA256 7f1b99465df8f6bc47e0bc40e413b9323a5a9d0b2576709fd28366f0af5b852e SHA512 b10f503d179094095f8d5f1844c59ae678a304685fc9ed684dc92ba20f50416afba1da8a77bee1a15de4f328d1f3ffb977926361f814982737b6380e3dc6a1ec WHIRLPOOL d0994b703132e9909f75bfbbac194d901ad97d9d9b3147d900ec642dc69cfa815133c228215082def21d43c2d7707fbb554d65e6b410b0766dc419129d6c323a
+DIST shorewall6-lite-5.1.8.1.tar.bz2 41671 BLAKE2B 47e4e192d441098f3fb5c2c569e35a78ce3464e7b29c2a1e8a75b70c3306a89c6415100d392c80ea6f1877648bb32bb0775a32466c33854d52da8369b0bc4bce SHA512 b10f503d179094095f8d5f1844c59ae678a304685fc9ed684dc92ba20f50416afba1da8a77bee1a15de4f328d1f3ffb977926361f814982737b6380e3dc6a1ec
+DIST shorewall6-lite-5.1.9.tar.bz2 42198 BLAKE2B 7854a1f4221241c3e91ba2fa4ea40ee4f78e320fd251fe9f491c32b4847aa1608bc56f53ccf0e573f77240693881fa18a006b6e2d0dfd88971a83c0b292ed2fe SHA512 a3fefc75ad6cfe461943e9d3390b08f214c493724060d710e104dd44345c3913a3a2c9d28ce26288042329581a9e4630aeb3ae4db49e915e8c073dde48cdf975
diff --git a/net-firewall/shorewall/files/shorewall6-lite.confd-r1 b/net-firewall/shorewall/files/shorewall6-lite.confd-r1
deleted file mode 100644
index daef3054274a..000000000000
--- a/net-firewall/shorewall/files/shorewall6-lite.confd-r1
+++ /dev/null
@@ -1,19 +0,0 @@
-# Global start/restart/stop options
-#
-OPTIONS="-tvv"
-
-# Start options
-#
-STARTOPTIONS=""
-
-# Stop options
-#
-STOPOPTIONS=""
-
-# Reload options
-#
-RELOADOPTIONS=""
-
-# Restart options
-#
-RESTARTOPTIONS=""
diff --git a/net-firewall/shorewall/files/shorewall6-lite.initd-r1 b/net-firewall/shorewall/files/shorewall6-lite.initd-r1
deleted file mode 100644
index 9db79c334513..000000000000
--- a/net-firewall/shorewall/files/shorewall6-lite.initd-r1
+++ /dev/null
@@ -1,92 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-description='The Shoreline Firewall 6 Lite, more commonly known as "Shorewall6 Lite", is'
-description="${description} a high-level tool for configuring Netfilter."
-
-extra_commands="clear"
-extra_started_commands="reload reset"
-
-description_clear="Clear will remove all rules and chains installed by"
-description_clear="${description_clear} Shorewall6 Lite. The firewall is"
-description_clear="${description_clear} then wide open and unprotected."
-
-description_reload="Reload is similar to \"${RC_SERVICE} start\" except that it assumes"
-description_reload="${description_reload} that the firewall is already started."
-description_reload="${description_reload} Existing connections are maintained."
-
-description_reset="All the packet and byte counters in the firewall are reset."
-
-command="/usr/sbin/shorewall6-lite"
-
-depend() {
-	provide firewall
-	after ulogd
-}
-
-status() {
-	local _retval
-	${command} status 1>/dev/null
-	_retval=$?
-	if [ ${_retval} = '0' ]; then
-		einfo 'status: started'
-		mark_service_started "${SVCNAME}"
-		return 0
-	else
-		einfo 'status: stopped'
-		mark_service_stopped "${SVCNAME}"
-		return 3
-	fi
-}
-
-start() {
-	ebegin "Starting shorewall6-lite"
-	${command} ${OPTIONS} start ${STARTOPTIONS} 1>/dev/null
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping shorewall6-lite"
-	${command} ${OPTIONS} stop ${STOPOPTIONS} 1>/dev/null
-	eend $?
-}
-
-restart() {
-	# shorewall comes with its own control script that includes a
-	# restart function, so refrain from calling svc_stop/svc_start
-	# here.  Note that this comment is required to fix bug 55576;
-	# runscript.sh greps this script...  (09 Jul 2004 agriffis)
-
-	ebegin "Restarting shorewall6-lite"
-	${command} status 1>/dev/null
-	if [ $? != 0 ] ; then
-		svc_start
-	else
-		${command} ${OPTIONS} restart ${RESTARTOPTIONS} 1>/dev/null
-	fi
-	eend $?
-}
-
-clear() {
-	# clear will remove all the rules and bring the system to an unfirewalled
-	# state. (21 Nov 2004 eldad)
-
-	ebegin "Clearing all shorewall6-lite rules and setting policy to ACCEPT"
-	${command} ${OPTIONS} clear 1>/dev/null
-	eend $?
-}
-
-reload() {
-	ebegin "Reloading shorewall6-lite"
-	${command} ${OPTIONS} reload ${RELOADOPTIONS} 1>/dev/null
-	eend $?
-}
-
-reset() {
-	# reset the packet and byte counters in the firewall
-
-	ebegin "Resetting the packet and byte counters in shorewall6-lite"
-	${command} ${OPTIONS} reset 1>/dev/null
-	eend $?
-}
diff --git a/net-firewall/shorewall/files/shorewall6.confd-r1 b/net-firewall/shorewall/files/shorewall6.confd-r1
deleted file mode 100644
index daef3054274a..000000000000
--- a/net-firewall/shorewall/files/shorewall6.confd-r1
+++ /dev/null
@@ -1,19 +0,0 @@
-# Global start/restart/stop options
-#
-OPTIONS="-tvv"
-
-# Start options
-#
-STARTOPTIONS=""
-
-# Stop options
-#
-STOPOPTIONS=""
-
-# Reload options
-#
-RELOADOPTIONS=""
-
-# Restart options
-#
-RESTARTOPTIONS=""
diff --git a/net-firewall/shorewall/files/shorewall6.initd-r1 b/net-firewall/shorewall/files/shorewall6.initd-r1
deleted file mode 100644
index 43a7d1b1f410..000000000000
--- a/net-firewall/shorewall/files/shorewall6.initd-r1
+++ /dev/null
@@ -1,117 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-description='The Shoreline Firewall 6, more commonly known as "Shorewall6", is'
-description="${description} a high-level tool for configuring Netfilter."
-
-extra_commands="check clear"
-extra_started_commands="refresh reload reset"
-
-description_check="Checks if the configuration will compile or not."
-
-description_clear="Clear will remove all rules and chains installed by"
-description_clear="${description_clear} Shorewall6. The firewall is then"
-description_clear="${description_clear} wide open and unprotected."
-
-description_refresh="The mangle table will be refreshed along with the"
-description_refresh="${description_refresh} blacklist chain (if any)."
-
-description_reload="Reload is similar to \"${RC_SERVICE} start\" except that it assumes"
-description_reload="${description_reload} that the firewall is already started."
-description_reload="${description_reload} Existing connections are maintained."
-
-description_reset="All the packet and byte counters in the firewall are reset."
-
-command="/usr/sbin/shorewall6"
-
-depend() {
-	provide firewall
-	after ulogd
-}
-
-status() {
-	local _retval
-	${command} status 1>/dev/null
-	_retval=$?
-	if [ ${_retval} = '0' ]; then
-		einfo 'status: started'
-		mark_service_started "${SVCNAME}"
-		return 0
-	else
-		einfo 'status: stopped'
-		mark_service_stopped "${SVCNAME}"
-		return 3
-	fi
-}
-
-start() {
-	ebegin "Starting shorewall6"
-	${command} ${OPTIONS} start ${STARTOPTIONS} 1>/dev/null
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping shorewall6"
-	${command} ${OPTIONS} stop ${STOPOPTIONS} 1>/dev/null
-	eend $?
-}
-
-restart() {
-	# shorewall comes with its own control script that includes a
-	# restart function, so refrain from calling svc_stop/svc_start
-	# here.  Note that this comment is required to fix bug 55576;
-	# runscript.sh greps this script...  (09 Jul 2004 agriffis)
-
-	ebegin "Restarting shorewall6"
-	${command} status 1>/dev/null
-	if [ $? != 0 ] ; then
-		svc_start
-	else
-		${command} ${OPTIONS} restart ${RESTARTOPTIONS} 1>/dev/null
-	fi
-	eend $?
-}
-
-clear() {
-	# clear will remove all the rules and bring the system to an unfirewalled
-	# state. (21 Nov 2004 eldad)
-
-	ebegin "Clearing all shorewall rules and setting policy to ACCEPT"
-	${command} ${OPTIONS} clear 1>/dev/null
-	eend $?
-}
-
-reload() {
-	ebegin "Reloading shorewall6"
-	${command} ${OPTIONS} reload ${RELOADOPTIONS} 1>/dev/null
-	eend $?
-}
-
-reset() {
-	# reset the packet and byte counters in the firewall
-
-	ebegin "Resetting the packet and byte counters in shorewall6"
-	${command} ${OPTIONS} reset 1>/dev/null
-	eend $?
-}
-
-refresh() {
-	# refresh the rules involving the broadcast addresses of firewall
-	# interfaces, the black list, traffic control rules and
-	# ECN control rules
-
-	ebegin "Refreshing shorewall6 rules"
-	${command} ${OPTIONS} refresh 1>/dev/null
-	eend $?
-}
-
-check() {
-	# perform cursory validation of the zones, interfaces, hosts, rules
-	# and policy files. CAUTION: does not parse and validate the generated
-	# iptables commands.
-
-	ebegin "Checking shorewall6 configuration"
-	${command} ${OPTIONS} check 1>/dev/null
-	eend $?
-}
diff --git a/net-firewall/shorewall/shorewall-5.1.9.ebuild b/net-firewall/shorewall/shorewall-5.1.9.ebuild
new file mode 100644
index 000000000000..3b7545ca47d4
--- /dev/null
+++ b/net-firewall/shorewall/shorewall-5.1.9.ebuild
@@ -0,0 +1,456 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit linux-info prefix systemd versionator
+
+DESCRIPTION='A high-level tool for configuring Netfilter'
+HOMEPAGE="http://www.shorewall.net/"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="doc +init +ipv4 ipv6 lite4 lite6 selinux"
+
+MY_PV=${PV/_rc/-RC}
+MY_PV=${MY_PV/_beta/-Beta}
+MY_P=${PN}-${MY_PV}
+
+MY_MAJOR_RELEASE_NUMBER=$(get_version_component_range 1-2)
+MY_MAJORMINOR_RELEASE_NUMBER=$(get_version_component_range 1-3)
+
+# shorewall
+MY_PN_IPV4=Shorewall
+MY_P_IPV4=${MY_PN_IPV4/#S/s}-${MY_PV}
+
+# shorewall6
+MY_PN_IPV6=Shorewall6
+MY_P_IPV6=${MY_PN_IPV6/#S/s}-${MY_PV}
+
+# shorewall-lite
+MY_PN_LITE4=Shorewall-lite
+MY_P_LITE4=${MY_PN_LITE4/#S/s}-${MY_PV}
+
+# shorewall6-lite
+MY_PN_LITE6=Shorewall6-lite
+MY_P_LITE6=${MY_PN_LITE6/#S/s}-${MY_PV}
+
+# shorewall-init
+MY_PN_INIT=Shorewall-init
+MY_P_INIT=${MY_PN_INIT/#S/s}-${MY_PV}
+
+# shorewall-core
+MY_PN_CORE=Shorewall-core
+MY_P_CORE=${MY_PN_CORE/#S/s}-${MY_PV}
+
+# shorewall-docs-html
+MY_PN_DOCS=Shorewall-docs-html
+MY_P_DOCS=${MY_PN_DOCS/#S/s}-${MY_PV}
+
+# Upstream URL schema:
+# Beta:    $MIRROR/pub/shorewall/development/4.6/shorewall-4.6.4-Beta2/shorewall-4.6.4-Beta2.tar.bz2
+# RC:      $MIRROR/pub/shorewall/development/4.6/shorewall-4.6.4-RC1/shorewall-4.6.4-RC1.tar.bz2
+# Release: $MIRROR/pub/shorewall/4.6/shorewall-4.6.3/shorewall-4.6.3.3.tar.bz2
+
+MY_URL_PREFIX=
+MY_URL_SUFFIX=
+if [[ ${MY_PV} = *-Beta* ]] || [[ ${MY_PV} = *-RC* ]]; then
+	MY_URL_PREFIX='development/'
+
+	_tmp_last_index=$(($(get_last_version_component_index ${MY_PV})+1))
+	_tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${MY_PV})
+	if [[ ${_tmp_suffix} = *Beta* ]] || [[ ${_tmp_suffix} = *RC* ]]; then
+		MY_URL_SUFFIX="-${_tmp_suffix}"
+	fi
+
+	# Cleaning up temporary variables
+	unset _tmp_last_index
+	unset _tmp_suffix
+else
+	KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+SRC_URI="
+	http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-core-${MY_PV}.tar.bz2
+	ipv4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-${MY_PV}.tar.bz2 )
+	ipv6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-${MY_PV}.tar.bz2 )
+	lite4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-lite-${MY_PV}.tar.bz2 )
+	lite6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-lite-${MY_PV}.tar.bz2 )
+	init? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-init-${MY_PV}.tar.bz2 )
+	doc? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/${MY_P_DOCS}.tar.bz2 )
+"
+
+# - Shorewall6 requires Shorewall
+# - Installing Shorewall-init or just the documentation doesn't make any sense,
+#   that's why we force the user to select at least one "real" Shorewall product
+#
+# See http://shorewall.net/download.htm#Which
+REQUIRED_USE="
+	ipv6? ( ipv4 )
+	|| ( ipv4 lite4 lite6 )
+"
+
+# No build dependencies! Just plain shell scripts...
+DEPEND=""
+
+RDEPEND="
+	>=net-firewall/iptables-1.4.20
+	>=sys-apps/iproute2-3.8.0[-minimal]
+	>=sys-devel/bc-1.06.95
+	ipv4? (
+		>=dev-lang/perl-5.16
+		virtual/perl-Digest-SHA
+	)
+	ipv6? (
+		>=dev-perl/Socket6-0.230.0
+		>=net-firewall/iptables-1.4.20[ipv6]
+		>=sys-apps/iproute2-3.8.0[ipv6]
+	)
+	lite6? (
+		>=net-firewall/iptables-1.4.20[ipv6]
+		>=sys-apps/iproute2-3.8.0[ipv6]
+	)
+	init? ( >=sys-apps/coreutils-8.20 )
+	selinux? ( >=sec-policy/selinux-shorewall-2.20161023-r3 )
+	!net-firewall/shorewall-core
+	!net-firewall/shorewall6
+	!net-firewall/shorewall-lite
+	!net-firewall/shorewall6-lite
+	!net-firewall/shorewall-init
+	!<sys-apps/systemd-214
+"
+
+S=${WORKDIR}
+
+pkg_pretend() {
+	local CONFIG_CHECK="~NF_CONNTRACK"
+
+	local WARNING_CONNTRACK="Without NF_CONNTRACK support, you will be unable"
+	local WARNING_CONNTRACK+=" to run any shorewall-based firewall on the local system."
+
+	if use ipv4 || use lite4; then
+		CONFIG_CHECK="${CONFIG_CHECK} ~NF_CONNTRACK_IPV4"
+
+		local WARNING_CONNTRACK_IPV4="Without NF_CONNTRACK_IPV4 support, you will"
+		local WARNING_CONNTRACK_IPV4+=" be unable to run any shorewall-based IPv4 firewall on the local system."
+	fi
+
+	if use ipv6 || use lite6; then
+		CONFIG_CHECK="${CONFIG_CHECK} ~NF_CONNTRACK_IPV6"
+
+		local WARNING_CONNTRACK_IPV6="Without NF_CONNTRACK_IPV6 support, you will"
+		local WARNING_CONNTRACK_IPV6+=" be unable to run any shorewall-based IPv6 firewall on the local system."
+	fi
+
+	check_extra_config
+}
+
+pkg_setup() {
+	if [[ -n "${DIGEST}" ]]; then
+		einfo "Unsetting environment variable \"DIGEST\" to prevent conflicts with package's \"install.sh\" script ..."
+		unset DIGEST
+	fi
+}
+
+src_prepare() {
+	# We are moving each unpacked source from MY_P_* to MY_PN_*.
+	# This allows us to use patches from upstream and keeps epatch_user working
+
+	einfo "Preparing shorewallrc ..."
+	cp "${FILESDIR}"/shorewallrc-r1 "${S}"/shorewallrc.gentoo || die "Copying shorewallrc failed"
+	eprefixify "${S}"/shorewallrc.gentoo
+
+	# shorewall-core
+	mv "${S}"/${MY_P_CORE} "${S}"/${MY_PN_CORE} || die "Failed to move '${S}/${MY_P_CORE}' to '${S}/${MY_PN_CORE}'"
+	ebegin "Applying Gentoo-specific changes to ${MY_P_CORE} ..."
+	ln -s ../shorewallrc.gentoo ${MY_PN_CORE}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo"
+	eend 0
+
+	# shorewall
+	if use ipv4; then
+		mv "${S}"/${MY_P_IPV4} "${S}"/${MY_PN_IPV4} || die "Failed to move '${S}/${MY_P_IPV4}' to '${S}/${MY_PN_IPV4}'"
+		ebegin "Applying Gentoo-specific changes to ${MY_P_IPV4}"
+		ln -s ../shorewallrc.gentoo ${MY_PN_IPV4}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo"
+		cp "${FILESDIR}"/shorewall.confd-r1 "${S}"/${MY_PN_IPV4}/default.gentoo || die "Copying shorewall.confd-r1 failed"
+		cp "${FILESDIR}"/shorewall.initd-r2 "${S}"/${MY_PN_IPV4}/init.gentoo.sh || die "Copying shorewall.initd-r2 failed"
+		cp "${FILESDIR}"/shorewall.systemd "${S}"/${MY_PN_IPV4}/gentoo.service || die "Copying shorewall.systemd failed"
+		eend 0
+	fi
+
+	# shorewall6
+	if use ipv6; then
+		mv "${S}"/${MY_P_IPV6} "${S}"/${MY_PN_IPV6} || die "Failed to move '${S}/${MY_P_IPV6}' to '${S}/${MY_PN_IPV6}'"
+		ebegin "Applying Gentoo-specific changes to ${MY_P_IPV6}"
+		ln -s ../shorewallrc.gentoo ${MY_PN_IPV6}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo"
+		cp "${FILESDIR}"/shorewall.confd-r1 "${S}"/${MY_PN_IPV6}/default.gentoo || die "Copying shorewall.confd-r1 failed"
+		cp "${FILESDIR}"/shorewall.initd-r2 "${S}"/${MY_PN_IPV6}/init.gentoo.sh || die "Copying shorewall.initd-r2 failed"
+		cp "${FILESDIR}"/shorewall6.systemd "${S}"/${MY_PN_IPV6}/gentoo.service || die "Copying shorewall6.systemd failed"
+		eend 0
+	fi
+
+	# shorewall-lite
+	if use lite4; then
+		mv "${S}"/${MY_P_LITE4} "${S}"/${MY_PN_LITE4} || die "Failed to move '${S}/${MY_P_LITE4}' to '${S}/${MY_PN_LITE4}'"
+		ebegin "Applying Gentoo-specific changes to ${MY_P_LITE4}"
+		ln -s ../shorewallrc.gentoo ${MY_PN_LITE4}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo"
+		cp "${FILESDIR}"/shorewall-lite.confd-r1 "${S}"/${MY_PN_LITE4}/default.gentoo || die "Copying shorewall-lite.confd-r1 failed"
+		cp "${FILESDIR}"/shorewall-lite.initd-r2 "${S}"/${MY_PN_LITE4}/init.gentoo.sh || die "Copying shorewall-lite.initd-r2 failed"
+		cp "${FILESDIR}"/shorewall-lite.systemd "${S}"/${MY_PN_LITE4}/gentoo.service || die "Copying shorewall-lite.systemd failed"
+		eend 0
+	fi
+
+	# shorewall6-lite
+	if use lite6; then
+		mv "${S}"/${MY_P_LITE6} "${S}"/${MY_PN_LITE6} || die "Failed to move '${S}/${MY_P_LITE6}' to '${S}/${MY_PN_LITE6}'"
+		ebegin "Applying Gentoo-specific changes to ${MY_P_LITE6}"
+		ln -s ../shorewallrc.gentoo ${MY_PN_LITE6}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo"
+		cp "${FILESDIR}"/shorewall-lite.confd-r1 "${S}"/${MY_PN_LITE6}/default.gentoo || die "Copying shorewall-lite.confd-r1 failed"
+		cp "${FILESDIR}"/shorewall-lite.initd-r2 "${S}"/${MY_PN_LITE6}/init.gentoo.sh || die "Copying shorewall-lite.initd-r2 failed"
+		cp "${FILESDIR}"/shorewall6-lite.systemd "${S}"/${MY_PN_LITE6}/gentoo.service || die "Copying shorewall6-lite.systemd failed"
+		eend 0
+	fi
+
+	# shorewall-init
+	if use init; then
+		mv "${S}"/${MY_P_INIT} "${S}"/${MY_PN_INIT} || die "Failed to move '${S}/${MY_P_INIT}' to '${S}/${MY_PN_INIT}'"
+		ebegin "Applying Gentoo-specific changes to ${MY_P_INIT}"
+		ln -s ../shorewallrc.gentoo ${MY_PN_INIT}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo"
+		cp "${FILESDIR}"/shorewall-init.confd "${S}"/${MY_PN_INIT}/default.gentoo || die "Copying shorewall-init.confd failed"
+		cp "${FILESDIR}"/shorewall-init.initd "${S}"/${MY_PN_INIT}/init.gentoo.sh || die "Copying shorewall-init.initd failed"
+		cp "${FILESDIR}"/shorewall-init.systemd "${S}"/${MY_PN_INIT}/gentoo.service || die "Copying shorewall-init.systemd failed"
+		cp "${FILESDIR}"/shorewall-init.readme "${S}"/${MY_PN_INIT}/shorewall-init.README.Gentoo.txt || die "Copying shorewall-init.systemd failed"
+		eend 0
+
+		eprefixify "${S}"/${MY_PN_INIT}/init.gentoo.sh
+
+		cd "${S}"/${MY_PN_INIT} || die
+		eapply -p2 "${FILESDIR}"/shorewall-init-01_remove-ipset-functionality-r1.patch
+		cd "${S}" || die
+	fi
+
+	# shorewall-docs-html
+	if use doc; then
+		mv "${S}"/${MY_P_DOCS} "${S}"/${MY_PN_DOCS} || die "Failed to move '${S}/${MY_P_DOCS}' to '${S}/${MY_PN_DOCS}'"
+	fi
+
+	eapply_user
+}
+
+src_configure() {
+	:;
+}
+
+src_compile() {
+	:;
+}
+
+src_install() {
+	# shorewall-core
+	einfo "Installing ${MY_P_CORE} ..."
+	DESTDIR="${D%/}" ${MY_PN_CORE}/install.sh shorewallrc.gentoo || die "${MY_PN_CORE}/install.sh failed"
+	dodoc "${S}"/${MY_PN_CORE}/changelog.txt "${S}"/${MY_PN_CORE}/releasenotes.txt
+
+	# shorewall
+	if use ipv4; then
+		einfo "Installing ${MY_P_IPV4} ..."
+		keepdir /var/lib/shorewall
+		DESTDIR="${D%/}" ${MY_PN_IPV4}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV4}/install.sh failed"
+
+		if use doc; then
+			dodoc -r "${S}"/${MY_PN_IPV4}/Samples
+		fi
+	fi
+
+	# shorewall6
+	if use ipv6; then
+		einfo "Installing ${MY_P_IPV6} ..."
+		keepdir /var/lib/shorewall6
+		DESTDIR="${D%/}" ${MY_PN_IPV6}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV6}/install.sh failed"
+
+		if use doc; then
+			dodoc -r "${S}"/${MY_PN_IPV6}/Samples6
+		fi
+	fi
+
+	# shorewall-lite
+	if use lite4; then
+		einfo "Installing ${MY_P_LITE4} ..."
+		keepdir /var/lib/shorewall-lite
+		DESTDIR="${D%/}" ${MY_PN_LITE4}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE4}/install.sh failed"
+	fi
+
+	# shorewall6-lite
+	if use lite6; then
+		einfo "Installing ${MY_P_LITE6} ..."
+		keepdir /var/lib/shorewall6-lite
+		DESTDIR="${D%/}" ${MY_PN_LITE6}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE6}/install.sh failed"
+	fi
+
+	# shorewall-init
+	if use init; then
+		einfo "Installing ${MY_P_INIT} ..."
+		DESTDIR="${D%/}" ${MY_PN_INIT}/install.sh shorewallrc.gentoo || die "${MY_PN_INIT}/install.sh failed"
+		dodoc "${S}"/${MY_PN_INIT}/shorewall-init.README.Gentoo.txt
+
+		if [[ -f "${D}etc/logrotate.d/shorewall-init" ]]; then
+			# On Gentoo, shorewall-init will not create shorewall-ifupdown.log,
+			# so we don't need a logrotate configuration file for shorewall-init
+			einfo "Removing unused \"${D}etc/logrotate.d/shorewall-init\" ..."
+			rm -rf "${D}"etc/logrotate.d/shorewall-init || die "Removing \"${D}etc/logrotate.d/shorewall-init\" failed"
+		fi
+
+		if [[ -d "${D}etc/NetworkManager" ]]; then
+			# On Gentoo, we don't support NetworkManager
+			# so we don't need this folder at all
+			einfo "Removing unused \"${D}etc/NetworkManager\" ..."
+			rm -rf "${D}"etc/NetworkManager || die "Removing \"${D}etc/NetworkManager\" failed"
+		fi
+
+		if [[ -f "${D}usr/share/shorewall-init/ifupdown" ]]; then
+			# This script isn't supported on Gentoo
+			rm -rf "${D}"usr/share/shorewall-init/ifupdown || die "Removing \"${D}usr/share/shorewall-init/ifupdown\" failed"
+		fi
+	fi
+
+	if use doc; then
+		einfo "Installing ${MY_P_DOCS} ..."
+		docinto html && dodoc -r "${S}"/${MY_PN_DOCS}/*
+	fi
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		# This is a new installation
+
+		# Show first steps for shorewall/shorewall6
+		local _PRODUCTS=""
+		if use ipv4; then
+			_PRODUCTS="shorewall"
+
+			if use ipv6; then
+				_PRODUCTS="${_PRODUCTS}/shorewall6"
+			fi
+		fi
+
+		if [[ -n "${_PRODUCTS}" ]]; then
+			elog "Before you can use ${_PRODUCTS}, you need to edit its configuration in:"
+			elog ""
+			elog "  /etc/shorewall/shorewall.conf"
+
+			if use ipv6; then
+				elog "  /etc/shorewall6/shorewall6.conf"
+			fi
+
+			elog ""
+			elog "To activate your shorewall-based firewall on system start, please add ${_PRODUCTS} to your default runlevel:"
+			elog ""
+			elog "  # rc-update add shorewall default"
+
+			if use ipv6; then
+				elog "  # rc-update add shorewall6 default"
+			fi
+		fi
+
+		# Show first steps for shorewall-lite/shorewall6-lite
+		_PRODUCTS=""
+		if use lite4; then
+			_PRODUCTS="shorewall-lite"
+		fi
+
+		if use lite6; then
+			if [[ -z "${_PRODUCTS}" ]]; then
+				_PRODUCTS="shorewall6-lite"
+			else
+				_PRODUCTS="${_PRODUCTS}/shorewall6-lite"
+			fi
+		fi
+
+		if [[ -n "${_PRODUCTS}" ]]; then
+			if use ipv4; then
+				elog ""
+			fi
+
+			elog "Before you can use ${_PRODUCTS}, you need to provide a configuration, which you can"
+			elog "create using ${CATEGORY}/shorewall (with \"ipv4\" and or \"ipv6\" USE flag)."
+			elog ""
+			elog "To read more about ${_PRODUCTS}, please visit"
+			elog "  http://shorewall.net/CompiledPrograms.html"
+			elog ""
+			elog "To activate your shorewall-lite-based firewall on system start, please add ${PRODUCTS} to your default runlevel:"
+			elog ""
+
+			if use lite4; then
+				elog "  # rc-update add shorewall-lite default"
+			fi
+
+			if use lite6; then
+				elog "  # rc-update add shorewall6-lite default"
+			fi
+		fi
+
+		if use init; then
+			elog ""
+			elog "To secure your system on boot, please add shorewall-init to your boot runlevel:"
+			elog ""
+			elog "  # rc-update add shorewall-init boot"
+			elog ""
+			elog "and review \$PRODUCTS in"
+			elog ""
+			elog "  /etc/conf.d/shorewall-init"
+		fi
+
+	fi
+
+	local v
+	for v in ${REPLACING_VERSIONS}; do
+		if ! version_is_at_least ${MY_MAJOR_RELEASE_NUMBER} ${v}; then
+			# This is an upgrade
+
+			elog "You are upgrading from a previous major version. It is highly recommended that you read"
+			elog ""
+			elog "  - /usr/share/doc/shorewall*/releasenotes.tx*"
+			elog "  - http://shorewall.net/Shorewall-5.html#idp51151872"
+
+			if use ipv4; then
+				elog ""
+				elog "You can auto-migrate your configuration using"
+				elog ""
+				elog "  # shorewall update -A"
+
+				if use ipv6; then
+					elog "  # shorewall6 update -A"
+				fi
+
+				elog ""
+				elog "*after* you have merged the changed files using one of the configuration"
+				elog "files update tools of your choice (dispatch-conf, etc-update...)."
+
+				elog ""
+				elog "But if you are not familiar with the \"shorewall[6] update\" command,"
+				elog "please read the shorewall[6] man page first."
+			fi
+
+			# Show this elog only once
+			break
+		fi
+	done
+
+	if ! use init; then
+		elog ""
+		elog "Consider emerging ${CATEGORY}/${PN} with USE flag \"init\" to secure your system on boot"
+		elog "before your shorewall-based firewall is ready to start."
+		elog ""
+		elog "To read more about shorewall-init, please visit"
+		elog "  http://www.shorewall.net/Shorewall-init.html"
+	fi
+
+	if ! has_version "net-firewall/conntrack-tools"; then
+		elog ""
+		elog "Your Shorewall firewall can utilize \"conntrack\" from the \"net-firewall/conntrack-tools\""
+		elog "package. if you want to use this feature, you need to install \"net-firewall/conntrack-tools\"!"
+	fi
+
+	if ! has_version "dev-perl/Devel-NYTProf"; then
+		elog ""
+		elog "If you want to profile your Shorewall firewall you need to install \"dev-perl/Devel-NYTProf\"!"
+	fi
+}
diff --git a/net-fs/Manifest.gz b/net-fs/Manifest.gz
index 9197b051ad4d..b273d2de7790 100644
Binary files a/net-fs/Manifest.gz and b/net-fs/Manifest.gz differ
diff --git a/net-fs/autofs/metadata.xml b/net-fs/autofs/metadata.xml
index 9e93cdcfb23a..e91fd580a5fb 100644
--- a/net-fs/autofs/metadata.xml
+++ b/net-fs/autofs/metadata.xml
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>dlan@gentoo.org</email>
-    <name>Yixun Lan</name>
-  </maintainer>
-  <use>
-    <flag name="dmalloc">Enable debugging with the dmalloc library</flag>
-    <flag name="hesiod">Install hesiod module</flag>
-    <flag name="ldap">Install LDAP module</flag>
-    <flag name="libtirpc">Use TiRPC library instead of SunRPC</flag>
-    <flag name="mount-locking">
-		Enable locking to prevent corruption of /etc/mtab in the presence of
-		concurrent auto-mounting. If enabled, recursive auto-mounting (eg. using
-		autofs to bind or loop mount a filesystem which is itself auto-mounted)
-		is not possible.
-	</flag>
-    <flag name="sasl">Enable SASL support in the LDAP module</flag>
-  </use>
+	<maintainer type="person">
+		<email>dlan@gentoo.org</email>
+		<name>Yixun Lan</name>
+	</maintainer>
+	<use>
+		<flag name="dmalloc">Enable debugging with the dmalloc library</flag>
+		<flag name="hesiod">Install hesiod module</flag>
+		<flag name="ldap">Install LDAP module</flag>
+		<flag name="libtirpc">Use TiRPC library instead of SunRPC</flag>
+		<flag name="mount-locking">
+			Enable locking to prevent corruption of /etc/mtab in the presence of
+			concurrent auto-mounting. If enabled, recursive auto-mounting (eg. using
+			autofs to bind or loop mount a filesystem which is itself auto-mounted)
+			is not possible.
+		</flag>
+		<flag name="sasl">Enable SASL support in the LDAP module</flag>
+	</use>
 </pkgmetadata>
diff --git a/net-fs/netatalk/metadata.xml b/net-fs/netatalk/metadata.xml
index 22c8cf038f60..75b09776908d 100644
--- a/net-fs/netatalk/metadata.xml
+++ b/net-fs/netatalk/metadata.xml
@@ -1,30 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
-  <use>
-    <flag name="pgp">
-			Add support pgp authentication module
-		</flag>
-    <flag name="quota">
-			Add support for user quota on various filesystems.
-		</flag>
-    <flag name="shadow">
-			Add shadow support
-		</flag>
-    <flag name="tracker">
-			Add support for spotlight like tracker
-		</flag>
-    <flag name="utils">
-			Install afpstats script
-		</flag>
-    <flag name="ssl">
+	<!-- maintainer-needed -->
+	<use>
+		<flag name="pgp">Add support pgp authentication module</flag>
+		<flag name="quota">Add support for user quota on various filesystems</flag>
+		<flag name="shadow">Add shadow support</flag>
+		<flag name="tracker">Add support for spotlight like tracker</flag>
+		<flag name="utils">Install afpstats script</flag>
+		<flag name="ssl">
 			Use <pkg>dev-libs/openssl</pkg> to provide DHX User Access
 			Modules. These are not used with most recent versions of OS X
 			and can be kept disabled without risks.
 		</flag>
-  </use>
-  <upstream>
-    <remote-id type="sourceforge">netatalk</remote-id>
-  </upstream>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">netatalk</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-fs/s3fs/metadata.xml b/net-fs/s3fs/metadata.xml
index 9c8e07564542..ea9d9e2e2caf 100644
--- a/net-fs/s3fs/metadata.xml
+++ b/net-fs/s3fs/metadata.xml
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-        <maintainer type="person">
-                <email>rini17@gmail.com</email>
-				<name>Juraj Variny</name>
-        </maintainer>
-        <maintainer type="project">
-                <email>proxy-maint@gentoo.org</email>
-                <name>Proxy Maintainers</name>
-        </maintainer>
-        <use>
-                <flag name="openssl">Enable <pkg>dev-libs/openssl</pkg> crypto backend</flag>
-                <flag name="nss">Enable <pkg>dev-libs/nss</pkg> crypto backend</flag>
-                <flag name="gnutls">Enable <pkg>net-libs/gnutls</pkg> crypto backend</flag>
-                <flag name="nettle">Use <pkg>dev-libs/nettle</pkg> network functions with GnuTLS.</flag>
-        </use>
-        <upstream>
-                <remote-id type="github">s3fs-fuse/s3fs-fuse</remote-id>
-        </upstream>
+	<maintainer type="person">
+		<email>rini17@gmail.com</email>
+		<name>Juraj Variny</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<use>
+		<flag name="openssl">Enable <pkg>dev-libs/openssl</pkg> crypto backend</flag>
+		<flag name="nss">Enable <pkg>dev-libs/nss</pkg> crypto backend</flag>
+		<flag name="gnutls">Enable <pkg>net-libs/gnutls</pkg> crypto backend</flag>
+		<flag name="nettle">Use <pkg>dev-libs/nettle</pkg> network functions with GnuTLS.</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">s3fs-fuse/s3fs-fuse</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-fs/smbnetfs/metadata.xml b/net-fs/smbnetfs/metadata.xml
index 840694f05035..d3fcbbae2c7a 100644
--- a/net-fs/smbnetfs/metadata.xml
+++ b/net-fs/smbnetfs/metadata.xml
@@ -10,19 +10,15 @@
 		SMBNetFS is a Linux/FreeBSD FUSE filesystem that allow you to use samba/microsoft network.
 
 		Features:
-		 - Linux-2.6 and FreeBSD &gt;= 6.0 are supported (Linux-2.4 is not tested)
-		 - you can use Samba/Microsoft network as a regular unix filesystem
-		 - workgroup/computer/share entries are dynamically created
-		 - windows domain supported
-		 - user defined workgroup/link/hosts are supported
-		 - national character supported
-		 - in config files you can specify different user/password to access different
-		   network shares
-		 - command "cd mountpoint/username:password@computer_or_ip" allows you to
-		   access "computer_or_ip" as user "username" with password "password"
-		   (this is insecure, but usefull)
-		 - the program is multithreaded, so simultaneous access to a file/share
-		   is possible
+		- Linux-2.6 and FreeBSD &gt;= 6.0 are supported (Linux-2.4 is not tested)
+		- you can use Samba/Microsoft network as a regular unix filesystem
+		- workgroup/computer/share entries are dynamically created
+		- windows domain supported
+		- user defined workgroup/link/hosts are supported
+		- national character supported
+		- in config files you can specify different user/password to access different network shares
+		- command "cd mountpoint/username:password@computer_or_ip" allows you to access "computer_or_ip" as user "username" with password "password" (this is insecure, but usefull)
+		- the program is multithreaded, so simultaneous access to a file/share is possible
 	</longdescription>
 	<use>
 		<flag name="gnome">Use the <pkg>gnome-base/gnome-keyring</pkg> for password management.</flag>
diff --git a/net-ftp/Manifest.gz b/net-ftp/Manifest.gz
index 6313b82ff099..e4803d5578a7 100644
Binary files a/net-ftp/Manifest.gz and b/net-ftp/Manifest.gz differ
diff --git a/net-ftp/oftpd/metadata.xml b/net-ftp/oftpd/metadata.xml
index 59e5b15b00cb..3c3d5ced6412 100644
--- a/net-ftp/oftpd/metadata.xml
+++ b/net-ftp/oftpd/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>xmw@gentoo.org</email>
-	<name>Michael Weber</name>
-  </maintainer>
+	<maintainer type="person">
+		<email>xmw@gentoo.org</email>
+		<name>Michael Weber</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index 1a1002e4a4e3..c1590309a1d1 100644
Binary files a/net-im/Manifest.gz and b/net-im/Manifest.gz differ
diff --git a/net-im/jabber-base/metadata.xml b/net-im/jabber-base/metadata.xml
index ff5cd10b4329..1eebfe0ed7d2 100644
--- a/net-im/jabber-base/metadata.xml
+++ b/net-im/jabber-base/metadata.xml
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-  <email>chainsaw@gentoo.org</email>
-</maintainer>
-	<longdescription>Package that creats the users and directory's for jabber
-	related packages. See ebuild for more info </longdescription>
+	<maintainer type="person">
+		<email>chainsaw@gentoo.org</email>
+	</maintainer>
+	<longdescription>
+		Package that creats the users and directory's for jabber
+		related packages. See ebuild for more info.
+	</longdescription>
 </pkgmetadata>
diff --git a/net-im/vacuum/metadata.xml b/net-im/vacuum/metadata.xml
index 3f054b4c28bd..3cc79d8c7880 100644
--- a/net-im/vacuum/metadata.xml
+++ b/net-im/vacuum/metadata.xml
@@ -5,51 +5,51 @@
 		<email>maksbotan@gentoo.org</email>
 		<name>Maxim Koltsov</name>
 	</maintainer>
-  <use>
-    <flag name="adiummessagestyle">Use UI styles created for Adium</flag>
-    <flag name="annotations">Enable adding comments to the contacts in the roster</flag>
-    <flag name="autostatus">Change the status in accordance with the time of inactivity</flag>
-    <flag name="avatars">Enable assigning and displaying avatars</flag>
-    <flag name="birthdayreminder">Reminds about birthdays of your friends</flag>
-    <flag name="bitsofbinary">Allow other modules to receive or send a small amount of binary data in XMPP stanza</flag>
-    <flag name="bookmarks">Enable creating bookmarks of the Jabber conferences and Web pages</flag>
-    <flag name="captchaforms">Perform tests for humanity outside of Web browser</flag>
-    <flag name="chatstates">Post user's activity to the chat</flag>
-    <flag name="clientinfo">Enable sending and receiving peer's application version, local time and last activity info</flag>
-    <flag name="commands">Enable performing special commands provided by various services</flag>
-    <flag name="compress">Compress stream of messages</flag>
-    <flag name="console">Enable inspecting a raw XML stream</flag>
-    <flag name="dataforms">Allow other modules to process and display data forms intended for the user</flag>
-    <flag name="datastreamsmanager">Enable initiating a custom data stream between two XMPP entities</flag>
-    <flag name="emoticons">Enable using smiley images in messages</flag>
-    <flag name="filemessagearchive">Allows to save the history of conversations to local files</flag>
-    <flag name="filestreamsmanager">Enable transferring files between two XMPP entities</flag>
-    <flag name="filetransfer">Enable sending files to peers</flag>
-    <flag name="gateways">Simplify the interaction with gateways to other IM systems</flag>
-    <flag name="inbandstreams">Enable initiating in-band data stream between two XMPP enitites</flag>
-    <flag name="iqauth">Enable logging on Jabber servers withous SASL authentication support</flag>
-    <flag name="jabbersearch">Enable searching contacts in Jabber networks</flag>
-    <flag name="messagearchiver">Enable saving the communication history both locally and on the server</flag>
-    <flag name="messagecarbons">Allows to keep all user IM clients engaged in a conversation</flag>
-    <flag name="multiuserchat">Enable Jabber multi-user conferences</flag>
-    <flag name="pepmanager">Allows other plugins to recieve and publish PEP events</flag>
-    <flag name="privacylists">Enable blocking the undesirable contacts</flag>
-    <flag name="privatestorage">Allow other modules to store arbitrary data on the server</flag>
-	<flag name="recentcontacts">Displays a recently used contacts</flag>
-    <flag name="registration">Enable creating accounts in Jabber services</flag>
-    <flag name="remotecontrol">Allows to remotely control the client</flag>
-    <flag name="rosteritemexchange">Allows to exchange contact list items</flag>
-    <flag name="rostersearch">Allows to search for contacts in the roster</flag>
-    <flag name="servermessagearchive">Allows to save the history of communications on the server</flag>
-    <flag name="servicediscovery">Enable receiving information about Jabber entities</flag>
-    <flag name="sessionnegotiation">Enable initiating the session between two entities with setting the rules for XMPP stanzas exchange</flag>
-    <flag name="shortcutmanager">Allows to setup user defined shortcuts</flag>
-    <flag name="socksstreams">Enable initiating SOCKS5 data streams between two XMPP entities</flag>
-    <flag name="urlprocessor">Allows other plugins to load data from custom types of URLs</flag>
-    <flag name="vcard">Enable obtaining peer's personal contact information</flag>
-    <flag name="xmppuriqueries">Allow other plugins to handle XMPP URI queries</flag>
-    <flag name="aspell">Select <pkg>app-text/aspell</pkg> spell checker backend</flag>
-    <flag name="enchant">Select <pkg>app-text/enchant</pkg> spell checker backend</flag>
-    <flag name="hunspell">Select <pkg>app-text/hunspell</pkg> spell checker backend</flag>
-  </use>
+	<use>
+		<flag name="adiummessagestyle">Use UI styles created for Adium</flag>
+		<flag name="annotations">Enable adding comments to the contacts in the roster</flag>
+		<flag name="autostatus">Change the status in accordance with the time of inactivity</flag>
+		<flag name="avatars">Enable assigning and displaying avatars</flag>
+		<flag name="birthdayreminder">Reminds about birthdays of your friends</flag>
+		<flag name="bitsofbinary">Allow other modules to receive or send a small amount of binary data in XMPP stanza</flag>
+		<flag name="bookmarks">Enable creating bookmarks of the Jabber conferences and Web pages</flag>
+		<flag name="captchaforms">Perform tests for humanity outside of Web browser</flag>
+		<flag name="chatstates">Post user's activity to the chat</flag>
+		<flag name="clientinfo">Enable sending and receiving peer's application version, local time and last activity info</flag>
+		<flag name="commands">Enable performing special commands provided by various services</flag>
+		<flag name="compress">Compress stream of messages</flag>
+		<flag name="console">Enable inspecting a raw XML stream</flag>
+		<flag name="dataforms">Allow other modules to process and display data forms intended for the user</flag>
+		<flag name="datastreamsmanager">Enable initiating a custom data stream between two XMPP entities</flag>
+		<flag name="emoticons">Enable using smiley images in messages</flag>
+		<flag name="filemessagearchive">Allows to save the history of conversations to local files</flag>
+		<flag name="filestreamsmanager">Enable transferring files between two XMPP entities</flag>
+		<flag name="filetransfer">Enable sending files to peers</flag>
+		<flag name="gateways">Simplify the interaction with gateways to other IM systems</flag>
+		<flag name="inbandstreams">Enable initiating in-band data stream between two XMPP enitites</flag>
+		<flag name="iqauth">Enable logging on Jabber servers withous SASL authentication support</flag>
+		<flag name="jabbersearch">Enable searching contacts in Jabber networks</flag>
+		<flag name="messagearchiver">Enable saving the communication history both locally and on the server</flag>
+		<flag name="messagecarbons">Allows to keep all user IM clients engaged in a conversation</flag>
+		<flag name="multiuserchat">Enable Jabber multi-user conferences</flag>
+		<flag name="pepmanager">Allows other plugins to recieve and publish PEP events</flag>
+		<flag name="privacylists">Enable blocking the undesirable contacts</flag>
+		<flag name="privatestorage">Allow other modules to store arbitrary data on the server</flag>
+		<flag name="recentcontacts">Displays a recently used contacts</flag>
+		<flag name="registration">Enable creating accounts in Jabber services</flag>
+		<flag name="remotecontrol">Allows to remotely control the client</flag>
+		<flag name="rosteritemexchange">Allows to exchange contact list items</flag>
+		<flag name="rostersearch">Allows to search for contacts in the roster</flag>
+		<flag name="servermessagearchive">Allows to save the history of communications on the server</flag>
+		<flag name="servicediscovery">Enable receiving information about Jabber entities</flag>
+		<flag name="sessionnegotiation">Enable initiating the session between two entities with setting the rules for XMPP stanzas exchange</flag>
+		<flag name="shortcutmanager">Allows to setup user defined shortcuts</flag>
+		<flag name="socksstreams">Enable initiating SOCKS5 data streams between two XMPP entities</flag>
+		<flag name="urlprocessor">Allows other plugins to load data from custom types of URLs</flag>
+		<flag name="vcard">Enable obtaining peer's personal contact information</flag>
+		<flag name="xmppuriqueries">Allow other plugins to handle XMPP URI queries</flag>
+		<flag name="aspell">Select <pkg>app-text/aspell</pkg> spell checker backend</flag>
+		<flag name="enchant">Select <pkg>app-text/enchant</pkg> spell checker backend</flag>
+		<flag name="hunspell">Select <pkg>app-text/hunspell</pkg> spell checker backend</flag>
+	</use>
 </pkgmetadata>
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index a5fdba6376a2..acd1249c15f5 100644
Binary files a/net-libs/Manifest.gz and b/net-libs/Manifest.gz differ
diff --git a/net-libs/c-client/metadata.xml b/net-libs/c-client/metadata.xml
index ffe3eff9f30d..f6b5a260f999 100644
--- a/net-libs/c-client/metadata.xml
+++ b/net-libs/c-client/metadata.xml
@@ -1,15 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <maintainer type="project">
+	<maintainer type="project">
 		<email>net-mail@gentoo.org</email>
 		<name>Net-Mail</name>
-    </maintainer>
+	</maintainer>
 	<use>
 		<flag name="doc">Install RFCs related to IMAP</flag>
-		<flag name="topal">Enable support for net-mail/topal
-		for use with <pkg>mail-client/alpine</pkg></flag>
-		<flag name="chappa">Enable Eduardo Chappa's patches for use with
-		<pkg>mail-client/alpine</pkg> (mainly adds support for maildir)</flag>
+		<flag name="topal">Enable support for net-mail/topal for use with <pkg>mail-client/alpine</pkg></flag>
+		<flag name="chappa">Enable Eduardo Chappa's patches for use with <pkg>mail-client/alpine</pkg> (mainly adds support for maildir)</flag>
 	</use>
 </pkgmetadata>
diff --git a/net-libs/glib-networking/metadata.xml b/net-libs/glib-networking/metadata.xml
index c28b1613d4c5..a1db58dba3a7 100644
--- a/net-libs/glib-networking/metadata.xml
+++ b/net-libs/glib-networking/metadata.xml
@@ -1,14 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>gnome@gentoo.org</email>
-    <name>Gentoo GNOME Desktop</name>
-  </maintainer>
-  <use>
-    <flag name="libproxy">Use <pkg>net-libs/libproxy</pkg> for getting
-		the HTTP/HTTPS/SOCKS proxy configuration</flag>
-	<flag name="gnome">Extract HTTP/HTTPS/SOCKS proxy configuration
-		stored using GSettings</flag>
-  </use>
+	<maintainer type="project">
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
+	<use>
+		<flag name="libproxy">Use <pkg>net-libs/libproxy</pkg> for getting the HTTP/HTTPS/SOCKS proxy configuration</flag>
+		<flag name="gnome">Extract HTTP/HTTPS/SOCKS proxy configuration stored using GSettings</flag>
+	</use>
 </pkgmetadata>
diff --git a/net-libs/libbtbb/metadata.xml b/net-libs/libbtbb/metadata.xml
index 7e1cb0b65dbb..f8987771de3f 100644
--- a/net-libs/libbtbb/metadata.xml
+++ b/net-libs/libbtbb/metadata.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>zerochaos@gentoo.org</email>
-    <name>Rick Farina</name>
-  </maintainer>
-  <use>
-    <flag name="extras">Install pcapdump and btaptap tools</flag>
-	<flag name="pcap">Add support for network packet capture via <pkg>net-libs/libpcap</pkg></flag>
-    <flag name="wireshark-plugins">Build the wireshark plugins for bluetooth baseband sniffing</flag>
-  </use>
-  <upstream>
-    <remote-id type="github">greatscottgadgets/libbtbb</remote-id>
-    <remote-id type="sourceforge">libbtbb</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>zerochaos@gentoo.org</email>
+		<name>Rick Farina</name>
+	</maintainer>
+	<use>
+		<flag name="extras">Install pcapdump and btaptap tools</flag>
+		<flag name="pcap">Add support for network packet capture via <pkg>net-libs/libpcap</pkg></flag>
+		<flag name="wireshark-plugins">Build the wireshark plugins for bluetooth baseband sniffing</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">greatscottgadgets/libbtbb</remote-id>
+		<remote-id type="sourceforge">libbtbb</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-libs/libetpan/metadata.xml b/net-libs/libetpan/metadata.xml
index 2bdf901416e6..4161e28785b7 100644
--- a/net-libs/libetpan/metadata.xml
+++ b/net-libs/libetpan/metadata.xml
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>net-mail@gentoo.org</email>
-    <name>Net-Mail</name>
-  </maintainer>
-  <longdescription lang="en">
+	<maintainer type="project">
+		<email>net-mail@gentoo.org</email>
+		<name>Net-Mail</name>
+	</maintainer>
+	<longdescription lang="en">
 		libEtPan ! is a mail purpose library. It will be used for low-level mail
 		handling : network protocols (IMAP/NNTP/POP3/SMTP over TCP/IP and
 		SSL/TCP/IP, already implemented), local storage (mbox/MH/maildir),
 		message / MIME parser
 	</longdescription>
-  <use>
-    <flag name="liblockfile">Enable support for liblockfile library</flag>
-  </use>
-  <upstream>
-    <remote-id type="github">dinhviethoa/libetpan</remote-id>
-    <remote-id type="sourceforge">libetpan</remote-id>
-  </upstream>
+	<use>
+		<flag name="liblockfile">Enable support for liblockfile library</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">dinhviethoa/libetpan</remote-id>
+		<remote-id type="sourceforge">libetpan</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-libs/libisds/metadata.xml b/net-libs/libisds/metadata.xml
index 976189dae44d..4e1c72a7829f 100644
--- a/net-libs/libisds/metadata.xml
+++ b/net-libs/libisds/metadata.xml
@@ -1,22 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<longdescription>
-	A library for accessing ISDS (Informační systém datových schránek
-	/ Data Box Information System) SOAP services as defined in Czech ISDS Act
-	(300/2008 Coll.) and implied documents.
-</longdescription>
-<maintainer type="person">
-        <email>petr.pisar@atlas.cz</email>
-        <name>Petr Pisar</name>
-</maintainer>
-<maintainer type="project">
-	<email>proxy-maint@gentoo.org</email>
-</maintainer>
-<use>
-        <flag name="openssl">Use <pkg>dev-libs/openssl</pkg> as crypto backend
-          instead of <pkg>app-crypt/gpgme</pkg> and
-          <pkg>dev-libs/libgcrypt</pkg></flag>
-</use>
-
+	<maintainer type="person">
+		<email>petr.pisar@atlas.cz</email>
+		<name>Petr Pisar</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+	</maintainer>
+	<longdescription>
+		A library for accessing ISDS (Informační systém datových schránek
+		/ Data Box Information System) SOAP services as defined in Czech ISDS Act
+		(300/2008 Coll.) and implied documents.
+	</longdescription>
+	<use>
+		<flag name="openssl">Use <pkg>dev-libs/openssl</pkg> as crypto backend instead of <pkg>app-crypt/gpgme</pkg> and <pkg>dev-libs/libgcrypt</pkg></flag>
+	</use>
 </pkgmetadata>
diff --git a/net-libs/libmicrohttpd/libmicrohttpd-0.9.55.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-0.9.55.ebuild
index 345c5cd7e462..581ef5573f8b 100644
--- a/net-libs/libmicrohttpd/libmicrohttpd-0.9.55.ebuild
+++ b/net-libs/libmicrohttpd/libmicrohttpd-0.9.55.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/12"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
 IUSE="epoll messages ssl static-libs test"
 
 RDEPEND="ssl? (
diff --git a/net-libs/libproxy/metadata.xml b/net-libs/libproxy/metadata.xml
index 888eb2133a60..b692203a8492 100644
--- a/net-libs/libproxy/metadata.xml
+++ b/net-libs/libproxy/metadata.xml
@@ -1,19 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>freedesktop-bugs@gentoo.org</email>
-  </maintainer>
-  <use>
-    <flag name="gnome">Enable support for reading proxy settings from
-		GNOME</flag>
-    <flag name="kde">Enable support for reading proxy settings from KDE</flag>
-    <flag name="spidermonkey">Use libmozjs from
-			<pkg>dev-lang/spidermonkey</pkg> for PAC parsing</flag>
-    <flag name="webkit">Use libjavascriptcoregtk from
-			<pkg>net-libs/webkit-gtk</pkg> for PAC parsing</flag>
-  </use>
-  <upstream>
-    <remote-id type="github">libproxy/libproxy</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>freedesktop-bugs@gentoo.org</email>
+	</maintainer>
+	<use>
+		<flag name="gnome">Enable support for reading proxy settings from GNOME</flag>
+		<flag name="kde">Enable support for reading proxy settings from KDE</flag>
+		<flag name="spidermonkey">Use libmozjs from <pkg>dev-lang/spidermonkey</pkg> for PAC parsing</flag>
+		<flag name="webkit">Use libjavascriptcoregtk from <pkg>net-libs/webkit-gtk</pkg> for PAC parsing</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">libproxy/libproxy</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-libs/neon/metadata.xml b/net-libs/neon/metadata.xml
index b79ca1ecbc48..f1672aa4d847 100644
--- a/net-libs/neon/metadata.xml
+++ b/net-libs/neon/metadata.xml
@@ -1,28 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>arfrever.fta@gmail.com</email>
-  </maintainer>
-  <maintainer type="project">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
-  </maintainer>
-  <longdescription>
-	Neon is an HTTP and WebDAV client library for Unix systems, with a C
-	language API. It provides high-level interfaces to HTTP/1.1 and WebDAV
-	methods, and a low-level interface to HTTP request/response handling,
-	allowing new methods to be easily implemented.
+	<maintainer type="person">
+		<email>arfrever.fta@gmail.com</email>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription>
+		Neon is an HTTP and WebDAV client library for Unix systems, with a C
+		language API. It provides high-level interfaces to HTTP/1.1 and WebDAV
+		methods, and a low-level interface to HTTP request/response handling,
+		allowing new methods to be easily implemented.
 	</longdescription>
-  <longdescription lang="ja">
-	neon は Unix システムにおける HTTP 及び WebDAV クライアント・ライブラリ
-	であり、C言語 API です。HTTP/1.1 及び WebDAV のメソッドという高い視点
-	でのインターフェイス、HTTP リクエスト/レスポンス のハンドリングという
-	低い視点でのインターフェイス、簡単に実装できるようにした新しいメソッド
-	といったものを提供します。
+	<longdescription lang="ja">
+		neon は Unix システムにおける HTTP 及び WebDAV クライアント・ライブラリ
+		であり、C言語 API です。HTTP/1.1 及び WebDAV のメソッドという高い視点
+		でのインターフェイス、HTTP リクエスト/レスポンス のハンドリングという
+		低い視点でのインターフェイス、簡単に実装できるようにした新しいメソッド
+		といったものを提供します。
 	</longdescription>
-  <use>
-    <flag name="libproxy">Add support for <pkg>net-libs/libproxy</pkg></flag>
-    <flag name="pkcs11">Add support for PKCS#11 using <pkg>dev-libs/pakchois</pkg></flag>
-  </use>
+	<use>
+		<flag name="libproxy">Add support for <pkg>net-libs/libproxy</pkg></flag>
+		<flag name="pkcs11">Add support for PKCS#11 using <pkg>dev-libs/pakchois</pkg></flag>
+	</use>
 </pkgmetadata>
diff --git a/net-libs/onion/metadata.xml b/net-libs/onion/metadata.xml
index c10c1a61f399..4881e1d17b07 100644
--- a/net-libs/onion/metadata.xml
+++ b/net-libs/onion/metadata.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>aballier@gentoo.org</email>
-    <name>Alexis Ballier</name>
-  </maintainer>
-  <use>
-    <flag name="libev">Use <pkg>dev-libs/libev</pkg> as thread poller instead of Linux's epoll.</flag>
-    <flag name="libevent">Use <pkg>dev-libs/libevent</pkg> as thread poller instead of libev or Linux's epoll.</flag>
-    <flag name="boehm-gc">Add <pkg>dev-libs/boehm-gc</pkg> support for memory allocations.</flag>
-	<flag name="redis">Add support for redis sessions.</flag>
-  </use>
-  <upstream>
-    <remote-id type="github">davidmoreno/onion</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>aballier@gentoo.org</email>
+		<name>Alexis Ballier</name>
+	</maintainer>
+	<use>
+		<flag name="libev">Use <pkg>dev-libs/libev</pkg> as thread poller instead of Linux's epoll.</flag>
+		<flag name="libevent">Use <pkg>dev-libs/libevent</pkg> as thread poller instead of libev or Linux's epoll.</flag>
+		<flag name="boehm-gc">Add <pkg>dev-libs/boehm-gc</pkg> support for memory allocations.</flag>
+		<flag name="redis">Add support for redis sessions.</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">davidmoreno/onion</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-libs/opal/metadata.xml b/net-libs/opal/metadata.xml
index 1f2a52bbd602..237de9848980 100644
--- a/net-libs/opal/metadata.xml
+++ b/net-libs/opal/metadata.xml
@@ -1,39 +1,39 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
-  <use>
-    <flag name="celt">Enable CELT ultra-low delay audio codec</flag>
-    <flag name="dtmf">Enable DTMF encoding/decoding support</flag>
-    <flag name="fax">Enable T.38 FAX protocol</flag>
-    <flag name="h224">Enable H.224 real time control protocol</flag>
-    <flag name="h281">Enable H.281 Far-End Camera Control protocol</flag>
-    <flag name="h323">Enable H.323 protocol</flag>
-    <flag name="iax">Enable Inter-Asterisk eXchange protocol</flag>
-    <flag name="ivr">Enable Interactive Voice Response</flag>
-    <flag name="ilbc">Enable iLBC (RFC 3951) speech codec</flag>
-    <flag name="lid">Enable Line Interface Device</flag>
-    <flag name="plugins">Enable plugins support</flag>
-    <flag name="sbc">Enable the Bluetooth low-complexity, SubBand Codec
+	<!-- maintainer-needed -->
+	<use>
+		<flag name="celt">Enable CELT ultra-low delay audio codec</flag>
+		<flag name="dtmf">Enable DTMF encoding/decoding support</flag>
+		<flag name="fax">Enable T.38 FAX protocol</flag>
+		<flag name="h224">Enable H.224 real time control protocol</flag>
+		<flag name="h281">Enable H.281 Far-End Camera Control protocol</flag>
+		<flag name="h323">Enable H.323 protocol</flag>
+		<flag name="iax">Enable Inter-Asterisk eXchange protocol</flag>
+		<flag name="ivr">Enable Interactive Voice Response</flag>
+		<flag name="ilbc">Enable iLBC (RFC 3951) speech codec</flag>
+		<flag name="lid">Enable Line Interface Device</flag>
+		<flag name="plugins">Enable plugins support</flag>
+		<flag name="sbc">Enable the Bluetooth low-complexity, SubBand Codec
 		</flag>
-    <flag name="sip">Enable Session Initiation Protocol</flag>
-    <flag name="sipim">Enable SIP Instant Messages session</flag>
-    <flag name="srtp">Enable Secure Real-time Transport Protocol</flag>
-    <flag name="stats">Enable statistic reporting</flag>
-    <flag name="swig">Use swig to generate bindings</flag>
-    <flag name="video">Enable video support</flag>
-    <flag name="vpb">Enable Voicetronics VPB card support</flag>
-    <flag name="vxml">Enable VXML support</flag>
-    <flag name="wav">Enable WAVFILE support</flag>
-    <flag name="x264-static">Install x264 plugin statically linked with x264
+		<flag name="sip">Enable Session Initiation Protocol</flag>
+		<flag name="sipim">Enable SIP Instant Messages session</flag>
+		<flag name="srtp">Enable Secure Real-time Transport Protocol</flag>
+		<flag name="stats">Enable statistic reporting</flag>
+		<flag name="swig">Use swig to generate bindings</flag>
+		<flag name="video">Enable video support</flag>
+		<flag name="vpb">Enable Voicetronics VPB card support</flag>
+		<flag name="vxml">Enable VXML support</flag>
+		<flag name="wav">Enable WAVFILE support</flag>
+		<flag name="x264-static">Install x264 plugin statically linked with x264
 		</flag>
-    <!-- unused atm
+		<!-- unused atm
 		<flag name="g711plc">Enable G711 Packet Loss Concealment</flag>
 		<flag name="msrp">Enable Message Session Relay Protocol</flag>
 		<flag name="rfc4103">Enable RTP Payload for Text Conversation</flag>
 		-->
-  </use>
-  <upstream>
-    <remote-id type="sourceforge">opalvoip</remote-id>
-  </upstream>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">opalvoip</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-libs/phodav/metadata.xml b/net-libs/phodav/metadata.xml
index 805ad1db73c1..60f44adfbc68 100644
--- a/net-libs/phodav/metadata.xml
+++ b/net-libs/phodav/metadata.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-	  <email>gnome@gentoo.org</email>
-	  <name>Gentoo GNOME Desktop</name>
-  </maintainer>
-  <maintainer type="project">
-	  <email>virtualization@gentoo.org</email>
-	  <name>Gentoo Virtualization Project</name>
-  </maintainer>
-  <use>
-	  <flag name="spice">Install the spice-webdavd guest agent</flag>
-  </use>
+	<maintainer type="project">
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>virtualization@gentoo.org</email>
+		<name>Gentoo Virtualization Project</name>
+	</maintainer>
+	<use>
+		<flag name="spice">Install the spice-webdavd guest agent</flag>
+	</use>
 </pkgmetadata>
diff --git a/net-libs/pjproject/metadata.xml b/net-libs/pjproject/metadata.xml
index 42ac90f2199b..339310ecf077 100644
--- a/net-libs/pjproject/metadata.xml
+++ b/net-libs/pjproject/metadata.xml
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>chainsaw@gentoo.org</email>
-    <name>Tony Vroon</name>
-  </maintainer>
-  <use>
-	<flag name="amr">Inlcude AMR codec in the build</flag>
-	<flag name="v4l2">Include Video4Linux v2 support in the build</flag>
-    <flag name="epoll">Use /dev/epoll ioqueue on Linux (experimental)</flag>
-    <flag name="g711">Include G.711 codecs in the build</flag>
-    <flag name="g722">Include G.722 codec in the build</flag>
-    <flag name="g7221">Include G.722.1 codec in the build</flag>
-    <flag name="ilbc">Include iLBC codec in the build</flag>
-    <flag name="l16">Include Linear/L16 codec family in the build</flag>
-    <flag name="libyuv">Include libyuv in the build</flag>
-    <flag name="openh264">Include Open H.264 support in the build</flag>
-    <flag name="opus">Include OPUS support in the build</flag>
-    <flag name="resample">Include resampling implementations in the build</flag>
-    <flag name="silk">Include SILK support in the build</flag>
-    <flag name="webrtc">Enable WebRTC support</flag>
-  </use>
+	<maintainer type="person">
+		<email>chainsaw@gentoo.org</email>
+		<name>Tony Vroon</name>
+	</maintainer>
+	<use>
+		<flag name="amr">Inlcude AMR codec in the build</flag>
+		<flag name="v4l2">Include Video4Linux v2 support in the build</flag>
+		<flag name="epoll">Use /dev/epoll ioqueue on Linux (experimental)</flag>
+		<flag name="g711">Include G.711 codecs in the build</flag>
+		<flag name="g722">Include G.722 codec in the build</flag>
+		<flag name="g7221">Include G.722.1 codec in the build</flag>
+		<flag name="ilbc">Include iLBC codec in the build</flag>
+		<flag name="l16">Include Linear/L16 codec family in the build</flag>
+		<flag name="libyuv">Include libyuv in the build</flag>
+		<flag name="openh264">Include Open H.264 support in the build</flag>
+		<flag name="opus">Include OPUS support in the build</flag>
+		<flag name="resample">Include resampling implementations in the build</flag>
+		<flag name="silk">Include SILK support in the build</flag>
+		<flag name="webrtc">Enable WebRTC support</flag>
+	</use>
 </pkgmetadata>
diff --git a/net-libs/telepathy-qt/metadata.xml b/net-libs/telepathy-qt/metadata.xml
index 0bfa4d0b48ae..972f688e747a 100644
--- a/net-libs/telepathy-qt/metadata.xml
+++ b/net-libs/telepathy-qt/metadata.xml
@@ -7,9 +7,9 @@
 		<description>Proxy maintainer</description>
 	</maintainer>
 	<maintainer type="project">
-                <email>proxy-maint@gentoo.org</email>
-                <name>Proxy Maintainers</name>
-        </maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<maintainer type="project">
 		<email>qt@gentoo.org</email>
 		<name>Gentoo Qt Project</name>
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.18.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.18.3.ebuild
index 1173b43e82de..b05d77618c66 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.18.3.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.18.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
 
 IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit libnotify nsplugin +opengl spell wayland +webgl X"
 
diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index 8963ffbf1cae..eab86e9a89b8 100644
Binary files a/net-mail/Manifest.gz and b/net-mail/Manifest.gz differ
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.4.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.4.ebuild
index 013513de3487..96e20cb3c078 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.0.4.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="ftp://ftp.cyrusimap.org/cyrus-imapd/${MY_P}.tar.gz"
 
 LICENSE="BSD-with-attribution"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm hppa ~ia64 ppc ppc64 ~sparc x86"
 IUSE="afs backup calalarm caps clamav http jmap kerberos ldap lmdb \
 	mysql nntp pam perl postgres replication +server sieve snmp \
 	sphinx sqlite ssl static-libs tcpd test xapian"
diff --git a/net-mail/dovecot/dovecot-2.2.29.1.ebuild b/net-mail/dovecot/dovecot-2.2.29.1.ebuild
index 3bddce897e0a..8cfd8318a2dc 100644
--- a/net-mail/dovecot/dovecot-2.2.29.1.ebuild
+++ b/net-mail/dovecot/dovecot-2.2.29.1.ebuild
@@ -24,7 +24,7 @@ HOMEPAGE="http://www.dovecot.org/"
 
 SLOT="0"
 LICENSE="LGPL-2.1 MIT"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 x86"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 ~sparc x86"
 
 IUSE_DOVECOT_AUTH="kerberos ldap mysql pam postgres sqlite vpopmail"
 IUSE_DOVECOT_STORAGE="cydir imapc +maildir mbox mdbox pop3c sdbox"
diff --git a/net-mail/dovecot/dovecot-2.2.32.ebuild b/net-mail/dovecot/dovecot-2.2.32.ebuild
index f6397ad5adc5..88416afd785e 100644
--- a/net-mail/dovecot/dovecot-2.2.32.ebuild
+++ b/net-mail/dovecot/dovecot-2.2.32.ebuild
@@ -24,7 +24,7 @@ HOMEPAGE="http://www.dovecot.org/"
 
 SLOT="0"
 LICENSE="LGPL-2.1 MIT"
-KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 ~s390 x86"
+KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 ~s390 ~sparc x86"
 
 IUSE_DOVECOT_AUTH="kerberos ldap mysql pam postgres sqlite vpopmail"
 IUSE_DOVECOT_COMPRESS="bzip2 lzma lz4 zlib"
diff --git a/net-mail/dovecot/dovecot-2.2.33.2.ebuild b/net-mail/dovecot/dovecot-2.2.33.2.ebuild
index 350498e8c2f4..bb3ab33efa5a 100644
--- a/net-mail/dovecot/dovecot-2.2.33.2.ebuild
+++ b/net-mail/dovecot/dovecot-2.2.33.2.ebuild
@@ -24,7 +24,7 @@ HOMEPAGE="http://www.dovecot.org/"
 
 SLOT="0"
 LICENSE="LGPL-2.1 MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 
 IUSE_DOVECOT_AUTH="kerberos ldap mysql pam postgres sqlite vpopmail"
 IUSE_DOVECOT_COMPRESS="bzip2 lzma lz4 zlib"
diff --git a/net-mail/list-remote-forwards/metadata.xml b/net-mail/list-remote-forwards/metadata.xml
index 9ff09b22b666..1e5f533c5aa6 100644
--- a/net-mail/list-remote-forwards/metadata.xml
+++ b/net-mail/list-remote-forwards/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  	<maintainer type="person">
+	<maintainer type="person">
 		<email>mjo@gentoo.org</email>
 		<name>Michael Orlitzky</name>
 	</maintainer>
@@ -11,125 +11,125 @@
 	</maintainer>
 	<longdescription>
 		/Usage/:
-		
+
 		@
 		list-remote-forwards [OPTIONS]
 		@
-		
+
 		List all remote forwards for mail accounts stored in a SQL database.
-		
+
 		A list of local domains is supplied to the program (more or less)
 		through the @--domain-query@ option. Any addresses which
 		forward to another address not contained in this list of local domains
 		is considered a remote forward. Remote forwards can cause problems for
 		a number of reasons, the most common of which are,
-		
+
 		* If the sender has an SPF record authorizing his mail server to send
 		mail on his behalf, then when his message is forwarded by the
 		recipient's mail server, it will fail any subsequent SPF checks. This
 		will likely cause the message to be rejected, and the original
 		recipient's server will generate backscatter.
-		
+
 		* If any spam makes it through the filter on the recipient's mail
 		server, that spam will then be forwarded to a remote destination. The
 		remote destination will blame the forwarding server for the spam, and
 		that can impact its reputation and potentially lead to a blacklisting
 		even though the spam did not originate on the recipient's server.
-		
+
 		Whether or not these are an issue depends on the circumstances, but in
 		any case it is useful to know who is forwarding mail off-site.
-		
+
 		/Input:/
-		
+
 		None.
-		
+
 		/Output:/
-		
+
 		A list of addresses that are forwarded to remote domains.
-		
+
 		/Options/:
-		
+
 		@
 		\--database
 		@
-		
+
 		The name of the database (or file, if SQLite) to which we should
 		connect.
-		
+
 		Default: The name of the current user (Postgres only).
-		
+
 		@
 		\--domain-query
 		@
 		SQL query used to produce a list of local domains. This should return
 		the set of all domains (i.e one column) that are local to the
 		server. See the default value for an example.
-		
+
 		Default: \"SELECT domain FROM domain WHERE domain &lt;&gt; 'ALL' ORDER BY domain;\"
-		
+
 		@
 		\--exclude-mx, -e
 		@
-		
+
 		The name of a mail exchanger, the forwards of whose domains we should
 		ignore. For example, if one mail exchanger, mx1.example.com, has
 		strict spam filtering, it may be acceptable to have remote forwarding
 		for domains that have mx1.example.com as their sole mail exchanger (MX
 		record). In that case, you might want to exclude those domains from
 		the report by naming mx1.example.com here.
-		
+
 		A forward will be excluded from the report only if /all/ of its MX
 		records are contained in the given exclude list.
-		
+
 		This option can be repeated to add mail exchangers to the exclude list.
-		
+
 		Default: [] (empty)
-		
+
 		@
 		\--forward-query, -f
 		@
-		
+
 		SQL query used to produce a list of all forwards on the mail
 		system. This query should return the set of all (address, goto)
 		triples, where \"goto\" is the destination address; i.e. to where
 		the \"address\" forwards. The \"goto\" field may contain more
 		than one email address, separated by commas.
-		
+
 		Default: \"SELECT address,goto FROM alias ORDER BY address;\"
-		
+
 		@
 		\--host, -h
 		@
-		
+
 		Hostname where the database is located (Postgres-only).
-		
+
 		Default: None, a UNIX domain socket connection is attempted (Postgres only)
-		
+
 		@
 		\--password
 		@
-		
+
 		Password used to connect to the database (Postgres-only).
-		
+
 		Default: None (assumes passwordless authentication)
-		
+
 		@
 		\--port
 		@
 		Port number used to connect to the database (Postgres-only).
-		
+
 		Default: None, a UNIX domain socket connection is attempted (Postgres only)
-		
+
 		@
 		\--username, -u
 		@
-		
+
 		Username used to connect to the database (Postgres-only).
-		
+
 		Default: The current user
-		
+
 		/Examples/:
-		
+
 		@
 		$ list-remote-forwards --database=test/fixtures/postfixadmin.sqlite3
 		user1@example.com -&gt; user1@example.net
diff --git a/net-mail/mailbox-count/metadata.xml b/net-mail/mailbox-count/metadata.xml
index fb7f98befbe3..7660ec6aa1f9 100644
--- a/net-mail/mailbox-count/metadata.xml
+++ b/net-mail/mailbox-count/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  	<maintainer type="person">
+	<maintainer type="person">
 		<email>mjo@gentoo.org</email>
 		<name>Michael Orlitzky</name>
 	</maintainer>
@@ -11,107 +11,107 @@
 	</maintainer>
 	<longdescription>
 		/Usage/:
-		
+
 		@
 		mailbox-count [OPTIONS]
 		@
-		
+
 		Mailbox-count produces a simple count of mailboxes that exist
 		per-domain in some SQL database. The default queries are compatible
 		with the schema used by PostfixAdmin &lt;http://postfixadmin.sourceforge.net/&gt;,
 		but it is possible to supply your own queries via the @--summary-query@
 		and @--detail-query@ options.
-		
+
 		The summary report lists each domain, along with the number of
 		mailboxes owned by that domain. The order is determined by the summary
 		query, which lists the domains alphabetically by default.
-		
+
 		The default detail report shows the same, but also contains a list of
 		each individual mailbox (again in alphabetical order) belonging to the
 		domains.
-		
+
 		/Input/:
-		
+
 		None.
-		
+
 		/Output/:
-		
+
 		Either a summary, or detailed report (with @--detail@) of the
 		number of mailboxes per-domain contained in the database.
-		
+
 		/Options/:
-		
+
 		@
 		\--database
 		@
-		
+
 		The name of the database (or file, if SQLite) to which we should
 		connect.
-		
+
 		Default: The name of the current user (Postgres only).
-		
+
 		@
 		\--detail
 		@
-		
+
 		Produce a detailed report listing all mailboxes by domain.
-		
+
 		@
 		\--detail-query
 		@
-		
+
 		SQL query used to produce the detail report. This should return the
 		set of all (domain, username) pairs. See the default value for an
 		example.
-		
+
 		Default: \"SELECT domain,username FROM mailbox ORDER BY domain;\"
-		
+
 		@
 		\--host
 		@
-		
+
 		Hostname where the database is located (Postgres-only).
-		
+
 		Default: None, a UNIX domain socket connection is attempted (Postgres only)
-		
+
 		@
 		\--password
 		@
-		
+
 		Password used to connect to the database (Postgres-only).
-		
+
 		Default: None (assumes passwordless authentication)
-		
+
 		@
 		\--port
 		@
 		Port number used to connect to the database (Postgres-only).
-		
+
 		Default: None, a UNIX domain socket connection is attempted (Postgres only)
-		
+
 		@
 		\--summary-query
 		@
-		
+
 		SQL query used to produce the summary report. This should return
 		(domain, user count) pairs. See the default value for an
 		example.
-		
+
 		Default: \"SELECT domain,COUNT(username) FROM mailbox GROUP BY domain
 		ORDER BY domain;\"
-		
+
 		@
 		\--username
 		@
-		
+
 		Username used to connect to the database (Postgres-only).
-		
+
 		Default: The current user
-		
+
 		/Examples/:
-		
+
 		The default summary report:
-		
+
 		@
 		$ mailbox-count --database=postfixadmin.sqlite3
 		Summary (number of mailboxes per domain)
@@ -121,9 +121,9 @@
 		example.net:     2
 		example.org:     1
 		@
-		
+
 		The more detailed report:
-		
+
 		@
 		$ mailbox-count --detail --database=postfixadmin.sqlite3
 		Detail (list of all mailboxes by domain)
diff --git a/net-mail/mu/metadata.xml b/net-mail/mu/metadata.xml
index a337356d6d14..7b72a85abe33 100644
--- a/net-mail/mu/metadata.xml
+++ b/net-mail/mu/metadata.xml
@@ -2,15 +2,17 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-          <email>vikraman@gentoo.org</email>
-          <name>Vikraman Choudhury</name>
-        </maintainer>
+		<email>vikraman@gentoo.org</email>
+		<name>Vikraman Choudhury</name>
+	</maintainer>
 	<maintainer type="project">
-          <email>net-mail@gentoo.org</email>
-          <name>Net-Mail</name>
-        </maintainer>
-	<longdescription lang="en">'mu' is a set of command-line tools for Linux/Unix that enable you to quickly find the e-mails you
-are looking for, assuming that you store your e-mails in Maildirs.  It also includes an emacs based mail client mu4e.</longdescription>
+		<email>net-mail@gentoo.org</email>
+		<name>Net-Mail</name>
+	</maintainer>
+	<longdescription lang="en">
+		'mu' is a set of command-line tools for Linux/Unix that enable you to quickly find the e-mails you
+		are looking for, assuming that you store your e-mails in Maildirs.  It also includes an emacs based mail client mu4e.
+	</longdescription>
 	<use>
 		<flag name="gui">Build and install the experimental gui 'mug'.</flag>
 		<flag name="emacs">Install the mu4e mail client.</flag>
diff --git a/net-mail/popa3d/metadata.xml b/net-mail/popa3d/metadata.xml
index e58671dbb55a..616ebe507877 100644
--- a/net-mail/popa3d/metadata.xml
+++ b/net-mail/popa3d/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>net-mail@gentoo.org</email>
-	<name>Net-Mail</name>
-</maintainer>
-<longdescription>
-    A security oriented POP3 server.
-</longdescription>
+	<maintainer type="project">
+		<email>net-mail@gentoo.org</email>
+		<name>Net-Mail</name>
+	</maintainer>
+	<longdescription>
+		security oriented POP3 server.
+	</longdescription>
 </pkgmetadata>
diff --git a/net-mail/qprint/Manifest b/net-mail/qprint/Manifest
index 3691747d7424..9919b19cee18 100644
--- a/net-mail/qprint/Manifest
+++ b/net-mail/qprint/Manifest
@@ -1,2 +1 @@
-DIST qprint-1.0.tar.gz 248872 SHA256 a92f02f2b1c12e29895df7ce200bd8001ce6be9ef092ef14284f94918719bfa8 SHA512 2cba2e4c986e51485f26988173d16bfdbecbc9e84aeb7abbf3e77fba8f9d5ad442c0d61a8d17f4b715c0ec0b3ec25b948438fa5c88a0777d7aff7b6d99c40a31 WHIRLPOOL 09a51ae9579ed2b21d4c1d2bfef0711a1be775768bb4dd41a44e3f201f2d07309f1210cac046f9cd34c0070a2c42276039ae28391d676c7b915ecd2fe6c570e4
-DIST qprint-1.1.tar.gz 358575 SHA256 ffa9ca1d51c871fb3b56a4bf0165418348cf080f01ff7e59cd04511b9665019c SHA512 4748f52cc8cabf72a2685fba93ee9957a9a36658a8b0c9fc1994e1779aad59a94b942ed3dd2501c6a35636e7c75e24d512a5de5f95b0ba66ae40acee8bbe1cca WHIRLPOOL 846d89b7775cd2d913d98ba72277a6f5e3001f4d3006c41810707682e40cef0abee546e75a9eefa94aa09fcb6afb2b5849409978a5a124c18233357896e4e48e
+DIST qprint-1.1.tar.gz 358575 BLAKE2B 6c2a756b3e245584ed4ff81a072a63f29ee14cca5a61f7d376b8794a91c69e604fb33bbde310e870cc712d7fbeb2758eb5e649a7b153bf29807cbd891e3f4c1a SHA512 4748f52cc8cabf72a2685fba93ee9957a9a36658a8b0c9fc1994e1779aad59a94b942ed3dd2501c6a35636e7c75e24d512a5de5f95b0ba66ae40acee8bbe1cca
diff --git a/net-mail/qprint/qprint-1.0.ebuild b/net-mail/qprint/qprint-1.0.ebuild
deleted file mode 100644
index cd6d620d27c6..000000000000
--- a/net-mail/qprint/qprint-1.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-DESCRIPTION="MIME quoted-printable data encoding and decoding utility"
-HOMEPAGE="http://www.fourmilab.ch/webtools/qprint/"
-SRC_URI="http://www.fourmilab.ch/webtools/${PN}/${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~ppc-macos"
-IUSE=""
-
-DEPEND=""
-
-src_compile() {
-	econf || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	dodir /usr/bin
-	dodir /usr/share/man/man1
-	make DESTDIR=${D} install || die "make install failed"
-	dodoc COPYING INSTALL README *.html qprint.pdf qprint.w logo.gif
-}
diff --git a/net-mail/qprint/qprint-1.1.ebuild b/net-mail/qprint/qprint-1.1.ebuild
index 59789807acbe..abe9228eea65 100644
--- a/net-mail/qprint/qprint-1.1.ebuild
+++ b/net-mail/qprint/qprint-1.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 DESCRIPTION="MIME quoted-printable data encoding and decoding utility"
 HOMEPAGE="http://www.fourmilab.ch/webtools/qprint/"
@@ -9,12 +9,13 @@ SRC_URI="http://www.fourmilab.ch/webtools/${PN}/${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~ppc-macos"
+KEYWORDS="amd64 ppc x86 ~ppc-macos"
 IUSE=""
 
 src_install() {
 	dodir /usr/bin
 	dodir /usr/share/man/man1
-	emake DESTDIR="${D}" install
-	dodoc INSTALL README *.html qprint.pdf qprint.w logo.gif
+	local HTML_DOCS=( *.html )
+	default
+	dodoc qprint.pdf qprint.w logo.gif
 }
diff --git a/net-mail/randomsig/Manifest b/net-mail/randomsig/Manifest
index 0cc9f9ad79c2..859bf25456c3 100644
--- a/net-mail/randomsig/Manifest
+++ b/net-mail/randomsig/Manifest
@@ -1 +1 @@
-DIST randomsig-v1.10.0.tar.gz 24910 SHA256 2e01bfbbc7f5dfe4e1f773fbfa2209b1e7f4074997be42204abbc6bf045ef9c6 SHA512 eb47bd017dee819e7b7151a47f5aca03e688e3aa9a4b9bf4882a4df51c6fcc1880e382b02d68d0c1d3a773b1179d5abb0782ec4d6a7649be226151e9e2579408 WHIRLPOOL ddae4cf9101cfd0406945191c0565c5315775f8691b36007a5b6175ad1977ed1ee9755a326839965a72102e944f8a58050ea6fc6e6b63274415c20a6896ef167
+DIST randomsig-v1.10.0.tar.gz 24910 BLAKE2B 13bfbf39cea7c7d348f5a91dd5700a2e91a93e574e6f1c12afd86d72c7868fd1a89123f52c897d9fff0b765e968980bee69927435a1b24f7f15e81b5f6a025ab SHA512 eb47bd017dee819e7b7151a47f5aca03e688e3aa9a4b9bf4882a4df51c6fcc1880e382b02d68d0c1d3a773b1179d5abb0782ec4d6a7649be226151e9e2579408
diff --git a/net-mail/randomsig/randomsig-1.10.0.ebuild b/net-mail/randomsig/randomsig-1.10.0.ebuild
index f3b6f0000e80..7ef507fc5e15 100644
--- a/net-mail/randomsig/randomsig-1.10.0.ebuild
+++ b/net-mail/randomsig/randomsig-1.10.0.ebuild
@@ -1,34 +1,36 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 MY_P=${PN}-v${PV}
-S=${WORKDIR}/${MY_P}
+
 DESCRIPTION="randomsig - perl script for generating random .signature files"
 HOMEPAGE="http://suso.suso.org/programs/randomsig/"
-DEPEND="dev-lang/perl"
 SRC_URI="http://suso.suso.org/programs/randomsig/downloads/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 s390 sparc x86"
-IUSE=""
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	cp Makefile Makefile.orig
-	cp randomsig randomsig.orig
-	sed -e "s:/usr/local/bin:/usr/bin:" \
-		-e "s:/usr/local/etc:/etc:" \
-		Makefile.orig > Makefile
-
-	sed -e "s:/usr/local/etc:/etc:" \
-		randomsig.orig > randomsig
+
+RDEPEND="dev-lang/perl"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	default
+
+	sed -e "s:/usr/local/bin:${EPREFIX}/usr/bin:" \
+		-e "s:/usr/local/etc:${EPREFIX}/etc:" \
+		-i Makefile || die
+	sed -e "s:/usr/local/etc:${EPREFIX}/etc:" \
+		-i randomsig || die
 }
 
-src_install () {
+src_install() {
 	dobin randomsig
-	dodoc README BUGS LICENSE MANIFEST COPYING TODO
+	einstalldocs
 
 	insinto /etc/randomsig
 	doins .randomsigrc .sigquotes .sigcancel .sigread
diff --git a/net-mail/signify/Manifest b/net-mail/signify/Manifest
index cdc0ab92014a..f8b59e80e5ff 100644
--- a/net-mail/signify/Manifest
+++ b/net-mail/signify/Manifest
@@ -1 +1 @@
-DIST signify_1.14-1.tar.gz 13853 SHA256 8c1c19ead3c3dcb40e08a5ead4bba214c930d1e0e06cc18067d090b3d841cdd6 SHA512 4b94c6bae6d36b60610318625eca7856f63a578ed22cc1690ea5ffa1d823471c73729f3f404d5d944f3262004ca6a9dd8ece1ae2cfa1dc3fed0152614792f7e2 WHIRLPOOL 34329f60458755f53484daf385857ba1f8a80983c0d0e230fc570b7259ed56c788a9b9ebd8a5b71b537c694b5d0fc482349b0a717513f5e1c7a6c00b2fc865af
+DIST signify_1.14-1.tar.gz 13853 BLAKE2B 3bdf1cebfe4f4e88c5db94d2faad42c99f47a2bbc71374b65f5c576f25a26ed999e58cc0e1f8f084adab8e4ccc4bb6ea4cfe79c0c4b9b990d8abdc681f4118c0 SHA512 4b94c6bae6d36b60610318625eca7856f63a578ed22cc1690ea5ffa1d823471c73729f3f404d5d944f3262004ca6a9dd8ece1ae2cfa1dc3fed0152614792f7e2
diff --git a/net-mail/signify/signify-1.14.ebuild b/net-mail/signify/signify-1.14.ebuild
index f3ec72a5e459..b280797ec9a0 100644
--- a/net-mail/signify/signify-1.14.ebuild
+++ b/net-mail/signify/signify-1.14.ebuild
@@ -1,33 +1,31 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-S=${WORKDIR}/${PN}
+EAPI=6
 
 DESCRIPTION="A (semi-)random e-mail signature rotator"
-SRC_URI="mirror://debian/pool/main/s/${PN}/${PN}_${PV}-1.tar.gz"
 HOMEPAGE="http://signify.sf.net/"
+SRC_URI="mirror://debian/pool/main/s/${PN}/${PN}_${PV}-1.tar.gz"
 
-RDEPEND="dev-lang/perl"
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4"
-
-SLOT="0"
 LICENSE="public-domain"
+SLOT="0"
 KEYWORDS="ppc sparc x86 ~amd64"
-IUSE=""
 
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	sed -i 's/head -1/head -n1/' Makefile
-}
-src_compile() {
-	echo "Perl script!  Woohoo!  No need to compile!"
+RDEPEND="dev-lang/perl"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+	default
+	sed -i 's/head -1/head -n1/' Makefile || die
 }
 
 src_install() {
-	make PREFIX=${D}/usr/ MANDIR=${D}/usr/share/man install || die
-	dodoc COPYING README
+	emake PREFIX="${ED%/}"/usr MANDIR="${ED%/}"/usr/share/man install
+	einstalldocs
+
 	docinto examples
 	dodoc examples/{Columned,Complex,Simple,SimpleOrColumned}
+	docompress -x /usr/share/doc/${PF}/examples
 }
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index d08a883d471e..dbe11536f5a6 100644
Binary files a/net-misc/Manifest.gz and b/net-misc/Manifest.gz differ
diff --git a/net-misc/asterisk/metadata.xml b/net-misc/asterisk/metadata.xml
index 4617312494c9..7790ac2d905f 100644
--- a/net-misc/asterisk/metadata.xml
+++ b/net-misc/asterisk/metadata.xml
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>chainsaw@gentoo.org</email>
-    <name>Tony Vroon</name>
-  </maintainer>
-  <use>
-    <flag name="newt">Include additional tools that require redhats windowing toolkit</flag>
-    <flag name="dahdi">Support Digium compatible hardware (formerly known as Zaptel).</flag>
-    <flag name="span">Enable support for the spandsp codec</flag>
-    <flag name="samples">Install sample sound and configuration files (default: on)</flag>
-    <flag name="srtp">Enable support for encrypted voice transmission (secure RTP)</flag>
-    <flag name="gtalk">Enable support for Google Talk services</flag>
-    <flag name="osplookup">Support secure peering using the Open Settlement Protocol</flag>
-    <flag name="http">Enable embedded web server</flag>
-    <flag name="cluster">Enable high-availability support through the Corosync Cluster Engine</flag>
-    <flag name="ilbc">Enable the Internet Low Bitrate Codec (iLBC)</flag>
-	<flag name="pjproject">Enable support for pjproject (pjsip)</flag>
-  </use>
+	<maintainer type="person">
+		<email>chainsaw@gentoo.org</email>
+		<name>Tony Vroon</name>
+	</maintainer>
+	<use>
+		<flag name="newt">Include additional tools that require redhats windowing toolkit</flag>
+		<flag name="dahdi">Support Digium compatible hardware (formerly known as Zaptel).</flag>
+		<flag name="span">Enable support for the spandsp codec</flag>
+		<flag name="samples">Install sample sound and configuration files (default: on)</flag>
+		<flag name="srtp">Enable support for encrypted voice transmission (secure RTP)</flag>
+		<flag name="gtalk">Enable support for Google Talk services</flag>
+		<flag name="osplookup">Support secure peering using the Open Settlement Protocol</flag>
+		<flag name="http">Enable embedded web server</flag>
+		<flag name="cluster">Enable high-availability support through the Corosync Cluster Engine</flag>
+		<flag name="ilbc">Enable the Internet Low Bitrate Codec (iLBC)</flag>
+		<flag name="pjproject">Enable support for pjproject (pjsip)</flag>
+	</use>
 </pkgmetadata>
diff --git a/net-misc/curl/curl-7.56.1.ebuild b/net-misc/curl/curl-7.56.1.ebuild
index c4d51765f20c..fabca45feca4 100644
--- a/net-misc/curl/curl-7.56.1.ebuild
+++ b/net-misc/curl/curl-7.56.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://curl.haxx.se/download/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="adns http2 idn ipv6 kerberos ldap metalink rtmp samba ssh ssl static-libs test threads"
 IUSE+=" curl_ssl_axtls curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl"
 IUSE+=" elibc_Winnt"
diff --git a/net-misc/icecast/metadata.xml b/net-misc/icecast/metadata.xml
index 706360d136cc..fffe116b2fd0 100644
--- a/net-misc/icecast/metadata.xml
+++ b/net-misc/icecast/metadata.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>polynomial-c@gentoo.org</email>
-	<name>Lars Wendler</name>
-  </maintainer>
-  <use>
-    <flag name="kate">Add karaoke and text encapsulation support for Ogg files</flag>
-	<flag name="logrotate">Install support files for <pkg>app-admin/logrotate</pkg>?</flag>
-    <flag name="yp">Build support for yp public directory listings</flag>
-  </use>
+	<maintainer type="person">
+		<email>polynomial-c@gentoo.org</email>
+		<name>Lars Wendler</name>
+	</maintainer>
+	<use>
+		<flag name="kate">Add karaoke and text encapsulation support for Ogg files</flag>
+		<flag name="logrotate">Install support files for <pkg>app-admin/logrotate</pkg>?</flag>
+		<flag name="yp">Build support for yp public directory listings</flag>
+	</use>
 </pkgmetadata>
diff --git a/net-misc/ifenslave/metadata.xml b/net-misc/ifenslave/metadata.xml
index c57573a31def..35e7aadeca94 100644
--- a/net-misc/ifenslave/metadata.xml
+++ b/net-misc/ifenslave/metadata.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <maintainer type="person">
-        <email>robbat2@gentoo.org</email>
-        <name>Robin H. Johnson</name>
-    </maintainer>
+	<maintainer type="person">
+		<email>robbat2@gentoo.org</email>
+		<name>Robin H. Johnson</name>
+	</maintainer>
 	<maintainer type="person">
 		<email>prometheanfire@gentoo.org</email>
 	</maintainer>
diff --git a/net-misc/kafka-bin/metadata.xml b/net-misc/kafka-bin/metadata.xml
index 0cd421684a02..136eb2b1d753 100644
--- a/net-misc/kafka-bin/metadata.xml
+++ b/net-misc/kafka-bin/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-        <maintainer type="person">
-                <email>patrick@gentoo.org</email>
-        </maintainer>
+	<maintainer type="person">
+		<email>patrick@gentoo.org</email>
+	</maintainer>
 	<use>
 		<flag name="internal-zookeeper">Use bundled local zookeeper instance</flag>
 	</use>
diff --git a/net-misc/knock/metadata.xml b/net-misc/knock/metadata.xml
index 8d375f5d42e9..f7fb57167ee3 100644
--- a/net-misc/knock/metadata.xml
+++ b/net-misc/knock/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>xmw@gentoo.org</email>
-	<name>Michael Weber</name>
-  </maintainer>
-  <use>
-    <flag name="server">Installs the knockd server daemon.</flag>
-  </use>
+	<maintainer type="person">
+		<email>xmw@gentoo.org</email>
+		<name>Michael Weber</name>
+	</maintainer>
+	<use>
+		<flag name="server">Installs the knockd server daemon.</flag>
+	</use>
 </pkgmetadata>
diff --git a/net-misc/miniupnpd/metadata.xml b/net-misc/miniupnpd/metadata.xml
index c4e9cf4a54d8..1d5d87bb77ec 100644
--- a/net-misc/miniupnpd/metadata.xml
+++ b/net-misc/miniupnpd/metadata.xml
@@ -16,11 +16,11 @@
 	<longdescription>
 		MiniUPnP Internet Gateway Device Deamon, used to allow UPnP enabled clients to forward ports.
 	</longdescription>
-  <use>
-    <flag name="leasefile">Enable lease file.</flag>
-    <flag name="igd2">Build for IGDv2 instead of an IGDv1</flag>
-    <flag name="pcp-peer">Enable support for PCP-PEER to allow NAT-PMP clients to mangle their packets.</flag>
-    <flag name="portinuse">Check if a port is in use before allowing a NAT-PMP client to map it.</flag>
-    <flag name="strict">Be more strict regarding compliance with UPnP specifications.</flag>
-  </use>
+	<use>
+		<flag name="leasefile">Enable lease file.</flag>
+		<flag name="igd2">Build for IGDv2 instead of an IGDv1</flag>
+		<flag name="pcp-peer">Enable support for PCP-PEER to allow NAT-PMP clients to mangle their packets.</flag>
+		<flag name="portinuse">Check if a port is in use before allowing a NAT-PMP client to map it.</flag>
+		<flag name="strict">Be more strict regarding compliance with UPnP specifications.</flag>
+	</use>
 </pkgmetadata>
diff --git a/net-misc/mosh/metadata.xml b/net-misc/mosh/metadata.xml
index 5aa0beb6000a..5f24fe90f47e 100644
--- a/net-misc/mosh/metadata.xml
+++ b/net-misc/mosh/metadata.xml
@@ -18,12 +18,11 @@
 		<flag name="utempter">Include libutempter support</flag>
 	</use>
 	<longdescription>
-Mosh is a remote terminal application that supports:
-  - intermittent network connectivity,
-  - roaming to different IP address without dropping the connection, and
-  - intelligent local echo and line editing to reduce the effects
-    of "network lag" on high-latency connections.
-</longdescription>
+		Mosh is a remote terminal application that supports:
+		- intermittent network connectivity,
+		- roaming to different IP address without dropping the connection, and
+		- intelligent local echo and line editing to reduce the effects of "network lag" on high-latency connections.
+	</longdescription>
 	<upstream>
 		<bugs-to>https://github.com/keithw/mosh/issues</bugs-to>
 	</upstream>
diff --git a/net-misc/ndppd/metadata.xml b/net-misc/ndppd/metadata.xml
index 83f8029f254b..cb616d6c6e0a 100644
--- a/net-misc/ndppd/metadata.xml
+++ b/net-misc/ndppd/metadata.xml
@@ -1,14 +1,14 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>zx2c4@gentoo.org</email>
-    <name>Jason A. Donenfeld</name>
-  </maintainer>
-  <longdescription>
+	<maintainer type="person">
+		<email>zx2c4@gentoo.org</email>
+		<name>Jason A. Donenfeld</name>
+	</maintainer>
+	<longdescription>
 		ndppd, or NDP Proxy Daemon, is a daemon that proxies NDP (Neighbor Discovery Protocol) messages between interfaces.
-  </longdescription>
-  <upstream>
-    <remote-id type="github">DanielAdolfsson/ndppd</remote-id>
-  </upstream>
+	</longdescription>
+	<upstream>
+		<remote-id type="github">DanielAdolfsson/ndppd</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
index 75b97e081d24..329497411c0f 100644
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@@ -1,4 +1,5 @@
-DIST NetworkManager-1.4.4.tar.xz 3762664 SHA256 829378f318cc008d138a23ca6a9191928ce75344e7e47a2f2c35f4ac82133309 SHA512 a73e423e88b0e2694a46dc04f492a656d766796aa987b2e4644147a5939a6fdeb22ff5d8b36c723444bc0ab3d8740b80fa82c2f5e07f073998841695978d6e14 WHIRLPOOL d5e4ca3868c2aa8bceec2029c573b61ccc2fbc9f9a84cb8360ecf7d7503011f0501e9bffd54b163de8e84606ad7977b3c187adb78beed3a44bf2a3ee9821631f
-DIST NetworkManager-1.8.0.tar.xz 3811100 SHA256 fa5a5c6a36cdf95b12df34cc575bd61a74f297ede9be22cac4807a1aff3cf69e SHA512 1f261a9bbba1013ec7ac88672f2ebdfdb9447874eb711ccfa7383534f003f37aabbcddb51aa868e14cec1d76c33d33a99d681a3858ea6239112fe6fce81a9c6c WHIRLPOOL 3e94a50cd50582f9cad26937ee8d597fe275a857882b1fe7ee3a85e3a30cedf16f559064f92afcb00e1703c42b34c0438a0b798538dcedf8cd29da596390b93a
-DIST NetworkManager-1.8.2.tar.xz 3818844 SHA256 71a5efcd9e4c237ab57b2893ccc8f91f884ace3bec0e2bd4b31a4c9677ff1bf4 SHA512 7bebea66d8f494c052313224e9d5b1b4cf665482f07ee5d93defc3543f32296545a2d1097ab1fff27dbebb58e07a4bc47fbc0101163db92953ae66ac9b95524d WHIRLPOOL 5928c3d4c1a35dc9485c303f3ce7e7b33c3949a058bd566f8b779d5d6dfa11ee8fc365e1a7954a214cabea70f2239b0f6e2079a67616f5487abbd1d6053260a3
-DIST NetworkManager-1.8.4.tar.xz 3821500 SHA256 625e2eb36386dcae599075226200140d010f213b47f7202d83b3b1a202029212 SHA512 e9aa26e2abe4537c6cbba53e281493e32be8a9f0624d5323212848f286d1279ad2ab79a39de34ad0ea188c888b1b61c4ba4d4d053c4d227e68f9236955f69bb1 WHIRLPOOL 68d5721b06a978f4fa5db496f79eb5e56a007fe8966f4e083ed9f6140893e7fcbe0aedaa6357ed6f7fb4ceeae9c8b7aa8d92dd51c3ccd46048d1e1e5f62c1656
+DIST NetworkManager-1.10.0.tar.xz 3884396 BLAKE2B 62f6ce759188fe1c4337922d4c23145da5029ed6fa70eae1de122bd4ce00209b0f7a0d1fdf0b65083baa9a9b304471a6ec79de63ea8e79779f2e27c1cec26e19 SHA512 f1c479396fe50faaca9dfd90b165ec3158148a2fb5a2d7a71cd8d573597566520610d572d6a8ec2b1d27ac2e5409a2ba899f46f9f38c114c5b90f0431e370958
+DIST NetworkManager-1.4.4.tar.xz 3762664 BLAKE2B 430f5a15540c43d067c27927b627ecb1c7935f42566e9b14b82b6f70cf7dae3ed7398bb45647911e91d8ce14558b1eccc0f6ffa97eae852dd524219dcc536a90 SHA512 a73e423e88b0e2694a46dc04f492a656d766796aa987b2e4644147a5939a6fdeb22ff5d8b36c723444bc0ab3d8740b80fa82c2f5e07f073998841695978d6e14
+DIST NetworkManager-1.8.0.tar.xz 3811100 BLAKE2B ad8026891ed0f29e80d217d0cbc7965bdc67065462e88068cc6f8cd989ddbcec7095b5d98eab85d8e6fba4f5af5485b2ec0feecafcb6d8324c3ee3c257a0dd64 SHA512 1f261a9bbba1013ec7ac88672f2ebdfdb9447874eb711ccfa7383534f003f37aabbcddb51aa868e14cec1d76c33d33a99d681a3858ea6239112fe6fce81a9c6c
+DIST NetworkManager-1.8.2.tar.xz 3818844 BLAKE2B 97929ae1d071b3e88dbacf9bd1131840066edb031df2e2fe7e15ef5029029d0029efff8836df3f2cf857e95728bfd8f77f6a81cadf45ae8c76a986aba1649709 SHA512 7bebea66d8f494c052313224e9d5b1b4cf665482f07ee5d93defc3543f32296545a2d1097ab1fff27dbebb58e07a4bc47fbc0101163db92953ae66ac9b95524d
+DIST NetworkManager-1.8.4.tar.xz 3821500 BLAKE2B 7db1c95af5b8006cd3b7e1d960f9763c05caf5aadcc139bbe349a12ef996821afc38250afe4b078fd4d1953be19c1f16c6813562c5f4792e6c17f28ee0521c06 SHA512 e9aa26e2abe4537c6cbba53e281493e32be8a9f0624d5323212848f286d1279ad2ab79a39de34ad0ea188c888b1b61c4ba4d4d053c4d227e68f9236955f69bb1
diff --git a/net-misc/networkmanager/metadata.xml b/net-misc/networkmanager/metadata.xml
index 8d695c7325d3..c2122068c0f8 100644
--- a/net-misc/networkmanager/metadata.xml
+++ b/net-misc/networkmanager/metadata.xml
@@ -24,6 +24,7 @@
 			using <pkg>net-misc/modemmanager</pkg></flag>
 		<flag name="nss">Use <pkg>dev-libs/nss</pkg> for cryptography</flag>
 		<flag name="ofono">Use <pkg>net-misc/ofono</pkg> for telephony support.</flag>
+		<flag name="ovs">Enable OpenVSwitch support</flag>
 		<flag name="ppp">Enable support for mobile broadband and PPPoE
 			connections using <pkg>net-dialup/ppp</pkg></flag>
 		<flag name="resolvconf">Use <pkg>net-dns/openresolv</pkg> for managing
diff --git a/net-misc/networkmanager/networkmanager-1.10.0.ebuild b/net-misc/networkmanager/networkmanager-1.10.0.ebuild
new file mode 100644
index 000000000000..48b1dd56d0de
--- /dev/null
+++ b/net-misc/networkmanager/networkmanager-1.10.0.ebuild
@@ -0,0 +1,325 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME_ORG_MODULE="NetworkManager"
+GNOME2_LA_PUNT="yes"
+VALA_USE_DEPEND="vapigen"
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit bash-completion-r1 gnome2 linux-info multilib python-any-r1 systemd \
+	user readme.gentoo-r1 toolchain-funcs vala versionator virtualx udev multilib-minimal
+
+DESCRIPTION="A set of co-operative tools that make networking simple and straightforward"
+HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
+
+LICENSE="GPL-2+"
+SLOT="0" # add subslot if libnm-util.so.2 or libnm-glib.so.4 bumps soname version
+
+IUSE="audit bluetooth connection-sharing consolekit +dhclient dhcpcd elogind gnutls +introspection json kernel_linux +nss +modemmanager ncurses ofono ovs policykit +ppp resolvconf selinux systemd teamd test vala +wext +wifi"
+
+REQUIRED_USE="
+	modemmanager? ( ppp )
+	vala? ( introspection )
+	wext? ( wifi )
+	^^ ( nss gnutls )
+	?? ( consolekit elogind systemd )
+"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+# gobject-introspection-0.10.3 is needed due to gnome bug 642300
+# wpa_supplicant-0.7.3-r3 is needed due to bug 359271
+COMMON_DEPEND="
+	>=sys-apps/dbus-1.2[${MULTILIB_USEDEP}]
+	>=dev-libs/dbus-glib-0.100[${MULTILIB_USEDEP}]
+	>=dev-libs/glib-2.37.6:2[${MULTILIB_USEDEP}]
+	>=dev-libs/libnl-3.2.8:3=[${MULTILIB_USEDEP}]
+	policykit? ( >=sys-auth/polkit-0.106 )
+	net-libs/libndp[${MULTILIB_USEDEP}]
+	>=net-misc/curl-7.24
+	net-misc/iputils
+	sys-apps/util-linux[${MULTILIB_USEDEP}]
+	sys-libs/readline:0=
+	>=virtual/libudev-175:=[${MULTILIB_USEDEP}]
+	audit? ( sys-process/audit )
+	bluetooth? ( >=net-wireless/bluez-5 )
+	connection-sharing? (
+		net-dns/dnsmasq[dbus,dhcp]
+		net-firewall/iptables )
+	consolekit? ( >=sys-auth/consolekit-1.0.0 )
+	dhclient? ( >=net-misc/dhcp-4[client] )
+	dhcpcd? ( net-misc/dhcpcd )
+	elogind? ( >=sys-auth/elogind-219 )
+	gnutls? (
+		dev-libs/libgcrypt:0=[${MULTILIB_USEDEP}]
+		>=net-libs/gnutls-2.12:=[${MULTILIB_USEDEP}] )
+	introspection? ( >=dev-libs/gobject-introspection-0.10.3:= )
+	json? ( dev-libs/jansson[${MULTILIB_USEDEP}] )
+	modemmanager? ( >=net-misc/modemmanager-0.7.991:0= )
+	ncurses? ( >=dev-libs/newt-0.52.15 )
+	nss? ( >=dev-libs/nss-3.11:=[${MULTILIB_USEDEP}] )
+	ofono? ( net-misc/ofono )
+	ovs? ( dev-libs/jansson )
+	ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] )
+	resolvconf? ( net-dns/openresolv )
+	selinux? ( sys-libs/libselinux )
+	systemd? ( >=sys-apps/systemd-209:0= )
+	teamd? (
+		dev-libs/jansson
+		>=net-misc/libteam-1.9
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	|| (
+		net-misc/iputils[arping(+)]
+		net-analyzer/arping
+	)
+	wifi? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-util/gdbus-codegen
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.40
+	>=sys-devel/gettext-0.17
+	>=sys-kernel/linux-headers-2.6.29
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
+	introspection? (
+		$(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]')
+		dev-lang/perl
+		dev-libs/libxslt
+	)
+	vala? ( $(vala_depend) )
+	test? (
+		$(python_gen_any_dep '
+			dev-python/dbus-python[${PYTHON_USEDEP}]
+			dev-python/pygobject:3[${PYTHON_USEDEP}]')
+	)
+"
+
+python_check_deps() {
+	if use introspection; then
+		has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return
+	fi
+	if use test; then
+		has_version "dev-python/dbus-python[${PYTHON_USEDEP}]" &&
+		has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]"
+	fi
+}
+
+sysfs_deprecated_check() {
+	ebegin "Checking for SYSFS_DEPRECATED support"
+
+	if { linux_chkconfig_present SYSFS_DEPRECATED_V2; }; then
+		eerror "Please disable SYSFS_DEPRECATED_V2 support in your kernel config and recompile your kernel"
+		eerror "or NetworkManager will not work correctly."
+		eerror "See https://bugs.gentoo.org/333639 for more info."
+		die "CONFIG_SYSFS_DEPRECATED_V2 support detected!"
+	fi
+	eend $?
+}
+
+pkg_pretend() {
+	if use kernel_linux; then
+		get_version
+		if linux_config_exists; then
+			sysfs_deprecated_check
+		else
+			ewarn "Was unable to determine your kernel .config"
+			ewarn "Please note that if CONFIG_SYSFS_DEPRECATED_V2 is set in your kernel .config, NetworkManager will not work correctly."
+			ewarn "See https://bugs.gentoo.org/333639 for more info."
+		fi
+
+	fi
+}
+
+pkg_setup() {
+	if use connection-sharing; then
+		CONFIG_CHECK="~NF_NAT_IPV4 ~NF_NAT_MASQUERADE_IPV4"
+		linux-info_pkg_setup
+	fi
+	enewgroup plugdev
+	if use introspection || use test; then
+		python-any-r1_pkg_setup
+	fi
+}
+
+src_prepare() {
+	DOC_CONTENTS="To modify system network connections without needing to enter the
+		root password, add your user account to the 'plugdev' group."
+
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--disable-more-warnings
+		--disable-static
+		--localstatedir=/var
+		--disable-lto
+		--disable-config-plugin-ibft
+		# ifnet plugin always disabled until someone volunteers to actively
+		# maintain and fix it
+		--disable-ifnet
+		--disable-qt
+		--without-netconfig
+		--with-dbus-sys-dir=/etc/dbus-1/system.d
+		# We need --with-libnm-glib (and dbus-glib dep) as reverse deps are
+		# still not ready for removing that lib
+		--with-libnm-glib
+		--with-nmcli=yes
+		--with-udev-dir="$(get_udevdir)"
+		--with-config-plugins-default=keyfile
+		--with-iptables=/sbin/iptables
+		$(multilib_native_enable concheck)
+		--with-crypto=$(usex nss nss gnutls)
+		--with-session-tracking=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind $(multilib_native_usex consolekit consolekit no)))
+		--with-suspend-resume=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind consolekit))
+		$(multilib_native_use_with audit libaudit)
+		$(multilib_native_use_enable bluetooth bluez5-dun)
+		$(use_with dhclient)
+		$(use_with dhcpcd)
+		$(multilib_native_use_enable introspection)
+		$(use_enable json json-validation)
+		$(multilib_native_use_enable ppp)
+		--without-libpsl
+		$(multilib_native_use_with modemmanager modem-manager-1)
+		$(multilib_native_use_with ncurses nmtui)
+		$(multilib_native_use_with ofono)
+		$(multilib_native_use_enable ovs)
+		$(multilib_native_use_with resolvconf)
+		$(multilib_native_use_with selinux)
+		$(multilib_native_use_with systemd systemd-journal)
+		$(multilib_native_use_enable teamd teamdctl)
+		$(multilib_native_use_enable test tests)
+		$(multilib_native_use_enable vala)
+		--without-valgrind
+		$(multilib_native_use_with wext)
+		$(multilib_native_use_enable wifi)
+	)
+
+	if multilib_is_native_abi && use policykit; then
+		myconf+=( --enable-polkit=yes )
+	else
+		myconf+=( --enable-polkit=disabled )
+	fi
+
+	# Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986
+	if use ppp; then
+		local PPPD_VER=`best_version net-dialup/ppp`
+		PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR}
+		PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision
+		myconf+=( --with-pppd-plugin-dir=/usr/$(get_libdir)/pppd/${PPPD_VER} )
+	fi
+
+	# unit files directory needs to be passed only when systemd is enabled,
+	# otherwise systemd support is not disabled completely, bug #524534
+	use systemd && myconf+=( --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" )
+
+	if multilib_is_native_abi; then
+		# work-around man out-of-source brokenness, must be done before configure
+		ln -s "${S}/docs" docs || die
+		ln -s "${S}/man" man || die
+	fi
+
+	ECONF_SOURCE=${S} runstatedir="/run" gnome2_src_configure "${myconf[@]}"
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi; then
+		emake
+	else
+		local targets=(
+			libnm/libnm.la
+			libnm-util/libnm-util.la
+			libnm-glib/libnm-glib.la
+			libnm-glib/libnm-glib-vpn.la
+		)
+		emake "${targets[@]}"
+	fi
+}
+
+multilib_src_test() {
+	if use test && multilib_is_native_abi; then
+		python_setup
+		virtx emake check
+	fi
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		# Install completions at proper place, bug #465100
+		gnome2_src_install completiondir="$(get_bashcompdir)"
+	else
+		local targets=(
+			install-libLTLIBRARIES
+			install-libdeprecatedHEADERS
+			install-libnm_glib_libnmvpnHEADERS
+			install-libnm_glib_libnmincludeHEADERS
+			install-libnm_util_libnm_util_includeHEADERS
+			install-libnmincludeHEADERS
+			install-nodist_libnm_glib_libnmincludeHEADERS
+			install-nodist_libnm_glib_libnmvpnHEADERS
+			install-nodist_libnm_util_libnm_util_includeHEADERS
+			install-nodist_libnmincludeHEADERS
+			install-pkgconfigDATA
+		)
+		emake DESTDIR="${D}" "${targets[@]}"
+	fi
+}
+
+multilib_src_install_all() {
+	! use systemd && readme.gentoo_create_doc
+
+	newinitd "${FILESDIR}/init.d.NetworkManager-r1" NetworkManager
+	newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager
+
+	# Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts
+	keepdir /etc/NetworkManager/dispatcher.d
+
+	# Provide openrc net dependency only when nm is connected
+	exeinto /etc/NetworkManager/dispatcher.d
+	newexe "${FILESDIR}/10-openrc-status-r4" 10-openrc-status
+	sed -e "s:@EPREFIX@:${EPREFIX}:g" \
+		-i "${ED}/etc/NetworkManager/dispatcher.d/10-openrc-status" || die
+
+	keepdir /etc/NetworkManager/system-connections
+	chmod 0600 "${ED}"/etc/NetworkManager/system-connections/.keep* # bug #383765, upstream bug #754594
+
+	# Allow users in plugdev group to modify system connections
+	insinto /usr/share/polkit-1/rules.d/
+	doins "${FILESDIR}/01-org.freedesktop.NetworkManager.settings.modify.system.rules"
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	systemd_reenable NetworkManager.service
+	! use systemd && readme.gentoo_print_elog
+
+	if [[ -e "${EROOT}etc/NetworkManager/nm-system-settings.conf" ]]; then
+		ewarn "The ${PN} system configuration file has moved to a new location."
+		ewarn "You must migrate your settings from ${EROOT}/etc/NetworkManager/nm-system-settings.conf"
+		ewarn "to ${EROOT}etc/NetworkManager/NetworkManager.conf"
+		ewarn
+		ewarn "After doing so, you can remove ${EROOT}etc/NetworkManager/nm-system-settings.conf"
+	fi
+
+	# NM fallbacks to plugin specified at compile time (upstream bug #738611)
+	# but still show a warning to remember people to have cleaner config file
+	if [[ -e "${EROOT}etc/NetworkManager/NetworkManager.conf" ]]; then
+		if grep plugins "${EROOT}etc/NetworkManager/NetworkManager.conf" | grep -q ifnet; then
+			ewarn
+			ewarn "You seem to use 'ifnet' plugin in ${EROOT}etc/NetworkManager/NetworkManager.conf"
+			ewarn "Since it won't be used, you will need to stop setting ifnet plugin there."
+			ewarn
+		fi
+	fi
+
+	# NM shows lots of errors making nmcli neither unusable, bug #528748 upstream bug #690457
+	if grep -r "psk-flags=1" "${EROOT}"/etc/NetworkManager/; then
+		ewarn "You have psk-flags=1 setting in above files, you will need to"
+		ewarn "either reconfigure affected networks or, at least, set the flag"
+		ewarn "value to '0'."
+	fi
+}
diff --git a/net-misc/openntpd/metadata.xml b/net-misc/openntpd/metadata.xml
index 1354e55c3647..1db33088e0cf 100644
--- a/net-misc/openntpd/metadata.xml
+++ b/net-misc/openntpd/metadata.xml
@@ -20,8 +20,6 @@
 		local clock.
 	</longdescription>
 	<use>
-	    <flag name="libressl">Enable HTTPS TLS time constraint support using
-		    <pkg>dev-libs/libressl</pkg>
-	    </flag>
+		<flag name="libressl">Enable HTTPS TLS time constraint support using <pkg>dev-libs/libressl</pkg></flag>
 	</use>
 </pkgmetadata>
diff --git a/net-misc/rdesktop/metadata.xml b/net-misc/rdesktop/metadata.xml
index f1f3b0c0a220..905d0e56c9b9 100644
--- a/net-misc/rdesktop/metadata.xml
+++ b/net-misc/rdesktop/metadata.xml
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>voyageur@gentoo.org</email>
-    <name>Bernard Cafarelli</name>
-  </maintainer>
-  <longdescription>
-An open source client for Windows NT Terminal Server and Windows 2000/2003 Terminal Services, capable of natively speaking Remote Desktop Protocol (RDP) in order to present the user's NT desktop. Unlike Citrix ICA, no server extensions are required.
-</longdescription>
-  <use>
-    <flag name="kerberos">Enable CredSPP support + Kerberos authentication with <pkg>net-libs/libgssglue</pkg></flag>
-    <flag name="pcsc-lite">Enable smartcard support with <pkg>sys-apps/pcsc-lite</pkg> driver</flag>
-	<flag name="xrandr">Enable XRandR window extension support</flag>
-  </use>
-  <upstream>
-    <remote-id type="sourceforge">rdesktop</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>voyageur@gentoo.org</email>
+		<name>Bernard Cafarelli</name>
+	</maintainer>
+	<longdescription>
+		An open source client for Windows NT Terminal Server and Windows 2000/2003 Terminal Services, capable of natively speaking Remote Desktop Protocol (RDP) in order to present the user's NT desktop. Unlike Citrix ICA, no server extensions are required.
+	</longdescription>
+	<use>
+		<flag name="kerberos">Enable CredSPP support + Kerberos authentication with <pkg>net-libs/libgssglue</pkg></flag>
+		<flag name="pcsc-lite">Enable smartcard support with <pkg>sys-apps/pcsc-lite</pkg> driver</flag>
+		<flag name="xrandr">Enable XRandR window extension support</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">rdesktop</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-misc/sitecopy/metadata.xml b/net-misc/sitecopy/metadata.xml
index b03b823d1292..01ac751452b1 100644
--- a/net-misc/sitecopy/metadata.xml
+++ b/net-misc/sitecopy/metadata.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-  	<email>rogerx.oss@gmail.com</email>
-	<name>Roger Zauner</name>
-	<description>Maintainer. Assign bugs to him</description>
-  </maintainer>
-  <maintainer type="project">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
-  </maintainer>
-  <use>
-    <flag name="rsh">This allows the use of rsh (remote shell) and rcp (remote copy) for authoring websites. sftp is a much more secure protocol and is preferred.</flag>
-    <flag name="webdav">Enable WebDav (Web-based Distributed Authoring and Versioning) support. This system allows users to collaborate on websites using a web based interface. See the ebuild for an FAQ page. Enables neon as well to handle webdav support.</flag>
-  </use>
+	<maintainer type="person">
+		<email>rogerx.oss@gmail.com</email>
+		<name>Roger Zauner</name>
+		<description>Maintainer. Assign bugs to him</description>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<use>
+		<flag name="rsh">This allows the use of rsh (remote shell) and rcp (remote copy) for authoring websites. sftp is a much more secure protocol and is preferred.</flag>
+		<flag name="webdav">Enable WebDav (Web-based Distributed Authoring and Versioning) support. This system allows users to collaborate on websites using a web based interface. See the ebuild for an FAQ page. Enables neon as well to handle webdav support.</flag>
+	</use>
 </pkgmetadata>
diff --git a/net-misc/zsync/metadata.xml b/net-misc/zsync/metadata.xml
index ca294a5c6757..a35011bd04b5 100644
--- a/net-misc/zsync/metadata.xml
+++ b/net-misc/zsync/metadata.xml
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>robbat2@gentoo.org</email>
-  </maintainer>
-  <longdescription lang="en">
+	<maintainer type="person">
+		<email>robbat2@gentoo.org</email>
+	</maintainer>
+	<longdescription lang="en">
 		From the zsync web page:
 
-		"zsync is a file transfer program. It allows you to download a file from a 
-		remote web server, where you have a copy of an older version of the file on your 
-		computer already. zsync downloads only the new parts of the file. It uses the 
+		"zsync is a file transfer program. It allows you to download a file from a
+		remote web server, where you have a copy of an older version of the file on your
+		computer already. zsync downloads only the new parts of the file. It uses the
 		same algorithm as rsync.
 
-		zsync does not require any special server software or a shell account on the 
-		remote system (rsync, in comparison, requires that you have an rsh or ssh 
-		account, or that the remote system runs rsyncd). Instead, it uses a control file 
-		-- a .zsync file -- that describes the file to be downloaded and enables zsync to 
-		work out which blocks it needs. This file can be created by the admin of the web 
-		server hosting the download, and placed alongside the file to download -- it is 
-		generated once, then any downloaders with zsync can use it. Alternatively, 
-		anyone can download the file, make a .zsync and provide it to other users (this 
+		zsync does not require any special server software or a shell account on the
+		remote system (rsync, in comparison, requires that you have an rsh or ssh
+		account, or that the remote system runs rsyncd). Instead, it uses a control file
+		-- a .zsync file -- that describes the file to be downloaded and enables zsync to
+		work out which blocks it needs. This file can be created by the admin of the web
+		server hosting the download, and placed alongside the file to download -- it is
+		generated once, then any downloaders with zsync can use it. Alternatively,
+		anyone can download the file, make a .zsync and provide it to other users (this
 		is what I am doing for the moment)."
 	</longdescription>
 </pkgmetadata>
diff --git a/net-nds/Manifest.gz b/net-nds/Manifest.gz
index e893e3a9d4d8..0cebb8597b1f 100644
Binary files a/net-nds/Manifest.gz and b/net-nds/Manifest.gz differ
diff --git a/net-nds/gosa-plugin-mail/metadata.xml b/net-nds/gosa-plugin-mail/metadata.xml
index 023ca73fdb69..f908d52059f8 100644
--- a/net-nds/gosa-plugin-mail/metadata.xml
+++ b/net-nds/gosa-plugin-mail/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>dev-zero@gentoo.org</email>
-    <name>Tiziano Müller</name>
-  </maintainer>
-  <upstream>
-	  <changelog>http://oss.gonicus.de/pub/gosa/Changelog</changelog>
-  </upstream>
+	<maintainer type="person">
+		<email>dev-zero@gentoo.org</email>
+		<name>Tiziano Müller</name>
+	</maintainer>
+	<upstream>
+		<changelog>http://oss.gonicus.de/pub/gosa/Changelog</changelog>
+	</upstream>
 </pkgmetadata>
diff --git a/net-nds/gosa-plugin-samba/metadata.xml b/net-nds/gosa-plugin-samba/metadata.xml
index 023ca73fdb69..f908d52059f8 100644
--- a/net-nds/gosa-plugin-samba/metadata.xml
+++ b/net-nds/gosa-plugin-samba/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>dev-zero@gentoo.org</email>
-    <name>Tiziano Müller</name>
-  </maintainer>
-  <upstream>
-	  <changelog>http://oss.gonicus.de/pub/gosa/Changelog</changelog>
-  </upstream>
+	<maintainer type="person">
+		<email>dev-zero@gentoo.org</email>
+		<name>Tiziano Müller</name>
+	</maintainer>
+	<upstream>
+		<changelog>http://oss.gonicus.de/pub/gosa/Changelog</changelog>
+	</upstream>
 </pkgmetadata>
diff --git a/net-nds/gosa-plugin-systems/metadata.xml b/net-nds/gosa-plugin-systems/metadata.xml
index 023ca73fdb69..f908d52059f8 100644
--- a/net-nds/gosa-plugin-systems/metadata.xml
+++ b/net-nds/gosa-plugin-systems/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>dev-zero@gentoo.org</email>
-    <name>Tiziano Müller</name>
-  </maintainer>
-  <upstream>
-	  <changelog>http://oss.gonicus.de/pub/gosa/Changelog</changelog>
-  </upstream>
+	<maintainer type="person">
+		<email>dev-zero@gentoo.org</email>
+		<name>Tiziano Müller</name>
+	</maintainer>
+	<upstream>
+		<changelog>http://oss.gonicus.de/pub/gosa/Changelog</changelog>
+	</upstream>
 </pkgmetadata>
diff --git a/net-nds/openldap/metadata.xml b/net-nds/openldap/metadata.xml
index 4e5e2c49039f..6cea2f2e325f 100644
--- a/net-nds/openldap/metadata.xml
+++ b/net-nds/openldap/metadata.xml
@@ -1,19 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <maintainer type="project">
-        <email>ldap-bugs@gentoo.org</email>
-    </maintainer>
+	<maintainer type="project">
+		<email>ldap-bugs@gentoo.org</email>
+	</maintainer>
 	<use>
 		<flag name="experimental">Enable experimental backend options</flag>
 		<flag name="kinit">Enable support for kerberos init</flag>
 		<flag name="odbc">Enable ODBC and SQL backend options</flag>
 		<flag name="overlays">Enable contributed OpenLDAP overlays</flag>
-		<flag name="smbkrb5passwd">Enable overlay for syncing ldap, unix and
-			lanman passwords</flag>
-		<flag name="minimal">Build libraries &amp; userspace tools only. Does not install any server code.</flag>
+		<flag name="smbkrb5passwd">Enable overlay for syncing ldap, unix and lanman passwords</flag>
+		<flag name="minimal">Build libraries &amp; userspace tools only. Does not install any server code</flag>
 		<flag name="pbkdf2">Enable support for pbkdf2 passwords</flag>
-		<flag name="sha2">Enable support for pw-sha2 password hashes.</flag>
+		<flag name="sha2">Enable support for pw-sha2 password hashes</flag>
 	</use>
 	<upstream>
 		<remote-id type="cpe">cpe:/a:openldap:openldap</remote-id>
diff --git a/net-nds/tac_plus/metadata.xml b/net-nds/tac_plus/metadata.xml
index 04eed53a210d..d9a8fd6f07d1 100644
--- a/net-nds/tac_plus/metadata.xml
+++ b/net-nds/tac_plus/metadata.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-          <email>chainsaw@gentoo.org</email>
-          <name>Tony Vroon</name>
-  </maintainer>
-  <use>
-	  <flag name="finger">Adds support for checking user counts via fingering
-		  the NAS</flag>
-	  <flag name="maxsess">Enforce a limit on maximum sessions per user</flag>
-  </use>
+	<maintainer type="person">
+		<email>chainsaw@gentoo.org</email>
+		<name>Tony Vroon</name>
+	</maintainer>
+	<use>
+		<flag name="finger">Adds support for checking user counts via fingering the NAS</flag>
+		<flag name="maxsess">Enforce a limit on maximum sessions per user</flag>
+	</use>
 </pkgmetadata>
diff --git a/net-nntp/Manifest.gz b/net-nntp/Manifest.gz
index 136136950d15..c17e74aaee03 100644
Binary files a/net-nntp/Manifest.gz and b/net-nntp/Manifest.gz differ
diff --git a/net-nntp/sabnzbd/files/sabnzbd_at.service b/net-nntp/sabnzbd/files/sabnzbd_at.service
index e9fdc4a35de3..92c5eb91f171 100644
--- a/net-nntp/sabnzbd/files/sabnzbd_at.service
+++ b/net-nntp/sabnzbd/files/sabnzbd_at.service
@@ -3,8 +3,8 @@ Description=SABnzbd binary newsreader
 
 [Service]
 ExecStart=/usr/share/sabnzbd/SABnzbd.py --logging 1 --browser 0
-User=%I
-Group=%I
+User=sabnzbd
+Group=sabnzbd
 
 [Install]
 WantedBy=multi-user.target
diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz
index 09e831c59c22..1f817d3498fa 100644
Binary files a/net-p2p/Manifest.gz and b/net-p2p/Manifest.gz differ
diff --git a/net-p2p/classified-ads/metadata.xml b/net-p2p/classified-ads/metadata.xml
index 901f5cab888c..51fdc6e87f25 100644
--- a/net-p2p/classified-ads/metadata.xml
+++ b/net-p2p/classified-ads/metadata.xml
@@ -7,32 +7,29 @@
 		<description>proxy maintainer</description>
 	</maintainer>
 	<maintainer type="project">
-                <email>proxy-maint@gentoo.org</email>
-                <name>Proxy Maintainers</name>
-        </maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription lang="en">
-   Classified ads is an attempt to re-produce parts of the functionality
-   that went away when Usenet news ceased to exist. This attempt tries to
-   fix the problem of disappearing news-servers so that there is no servers
-   required and no service-providers needed for any operation ;
-   data storage is implemented inside client applications that
-   users are running. Features of the program currently include:
+		Classified ads is an attempt to re-produce parts of the functionality
+		that went away when Usenet news ceased to exist. This attempt tries to
+		fix the problem of disappearing news-servers so that there is no servers
+		required and no service-providers needed for any operation ;
+		data storage is implemented inside client applications that
+		users are running. Features of the program currently include:
 
- * Posting of ads online. Ads have a category ; there are some 
-   pre-defined categories but more can be invented just by typing 
-   over the suggested categories.
- * Replying to ads either in public or privately to operator.
- * (Small-sized) binary attachments to posts.
- * Providing basic data of operators - data that operator may enter 
-   himself, or leave blank.
- * Basic searching of content based on words.
+		* Posting of ads online. Ads have a category ; there are some pre-defined categories but more can be invented just by typing over the suggested categories.
+		* Replying to ads either in public or privately to operator.
+		* (Small-sized) binary attachments to posts.
+		* Providing basic data of operators - data that operator may enter himself, or leave blank.
+		* Basic searching of content based on words.
 	</longdescription>
 	<upstream>
-                <maintainer status="active">
-                        <email>antti.jarvinen@katiska.org</email>
-                        <name>Antti Järvinen</name>
-                </maintainer>
-                <changelog>https://github.com/operatornormal/classified-ads/commits/master</changelog>
+		<maintainer status="active">
+			<email>antti.jarvinen@katiska.org</email>
+			<name>Antti Järvinen</name>
+		</maintainer>
+		<changelog>https://github.com/operatornormal/classified-ads/commits/master</changelog>
 		<bugs-to>https://github.com/operatornormal/classified-ads/issues</bugs-to>
 		<remote-id type="github">operatornormal/classified-ads</remote-id>
 	</upstream>
diff --git a/net-p2p/gnut/Manifest b/net-p2p/gnut/Manifest
index 1c870139a352..f3abb1a80a2d 100644
--- a/net-p2p/gnut/Manifest
+++ b/net-p2p/gnut/Manifest
@@ -1,2 +1,2 @@
-DIST gnut-0.4.28-patches.tar.bz2 8663 SHA256 c9a4e06f79bea33542576132c44f69f5acc5b68a28fc3f3e1817d166bc2c5bbb SHA512 4ce1aece0e07e895731f96eb6274d7cc2ac3cd672a1a67c0a63781b51e5fd7d3f1c9e1cdcea59a9f5926f5256ff7a03cc490c4dfde857484fbe9cacd8e999048 WHIRLPOOL ee3efe7a22ef10b1b25fa3f48450a02587bf28ea3cc6c8449c06b243520ca5a315d7abb2152b8707aeab603926de62a5d03ba8f27e3018bb3caac08b86c1344e
-DIST gnut-0.4.28.tar.gz 333625 SHA256 f82aa6287c84376b2cb5fdabe6be2c27a0f72ed25672e277c2a9b521417f0fec SHA512 6287f01c83367e34f688300b346f02ec66765a0f9409a14265d345f9482ccab46358076b6d166652791d6e7c6fb0d70e8163544b88a0b199b1c36a54e943d4a2 WHIRLPOOL 077b4f76c00710b2a08a5d670560f7d8f46a0e67d995142e39ad3be3694db05b96df2acea127dda744735317f891277603f85382045e55c133964466333ebabd
+DIST gnut-0.4.28-patches.tar.bz2 8663 BLAKE2B 027df03261f7346cb3f03472d04567e71782e1f115f30f5dbec6967c213ca7a567bfb89d07753725a0b315d3d8fc38e07ba4ce39e1784f232a7c45949befeaa0 SHA512 4ce1aece0e07e895731f96eb6274d7cc2ac3cd672a1a67c0a63781b51e5fd7d3f1c9e1cdcea59a9f5926f5256ff7a03cc490c4dfde857484fbe9cacd8e999048
+DIST gnut-0.4.28.tar.gz 333625 BLAKE2B 8fc0de9fff016ad1b5eea520e40297a412fff283192ae320d2d9b9e3dde59e47c3d5818d85cce4c6dee416b8524d84c8c48b0eec5387797b56c48b78c6e6fb77 SHA512 6287f01c83367e34f688300b346f02ec66765a0f9409a14265d345f9482ccab46358076b6d166652791d6e7c6fb0d70e8163544b88a0b199b1c36a54e943d4a2
diff --git a/net-p2p/gnut/gnut-0.4.28-r1.ebuild b/net-p2p/gnut/gnut-0.4.28-r1.ebuild
index 7132dd862d5b..6eb6c8fb4866 100644
--- a/net-p2p/gnut/gnut-0.4.28-r1.ebuild
+++ b/net-p2p/gnut/gnut-0.4.28-r1.ebuild
@@ -1,27 +1,25 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-inherit eutils
+EAPI=6
 
 DESCRIPTION="Text-mode gnutella client"
-SRC_URI="http://alge.anart.no/ftp/pub/gnutella/${P}.tar.gz
-	mirror://gentoo/${P}-patches.tar.bz2"
 HOMEPAGE="http://www.gnutelliums.com/linux_unix/gnut/"
+SRC_URI="
+	http://alge.anart.no/ftp/pub/gnutella/${P}.tar.gz
+	mirror://gentoo/${P}-patches.tar.bz2"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86 ppc"
-IUSE=""
 
-src_unpack() {
-	unpack ${A}
-	epatch configure.patch
-	epatch src.patch
-}
+PATCHES=(
+	"${WORKDIR}"/configure.patch
+	"${WORKDIR}"/src.patch
+)
 
-src_install () {
-	make DESTDIR="${D}" install || die
-	dohtml doc/*.html
-	dodoc 	doc/TUTORIAL AUTHORS COPYING ChangeLog GDJ HACKING \
-		INSTALL NEWS README TODO
+src_install() {
+	local HTML_DOCS=( doc/*.html )
+	default
+	dodoc doc/TUTORIAL GDJ HACKING
 }
diff --git a/net-p2p/transmission/metadata.xml b/net-p2p/transmission/metadata.xml
index e49e57cc90d4..a5cf0e4c937c 100644
--- a/net-p2p/transmission/metadata.xml
+++ b/net-p2p/transmission/metadata.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>floppym@gentoo.org</email>
-    <name>Mike Gilbert</name>
-  </maintainer>
-  <use>
-    <flag name="lightweight">Optimize transmission for low-resource systems (smaller cache size, prefer unencrypted peer connections, etc.)</flag>
-	<flag name="mbedtls">Use mbed TLS instead of OpenSSL</flag>
-    <flag name="xfs">Enable XFS filesystem capabilities by using <pkg>sys-fs/xfsprogs</pkg> headers (in building of fdlimit(.c))</flag>
-  </use>
+	<maintainer type="person">
+		<email>floppym@gentoo.org</email>
+		<name>Mike Gilbert</name>
+	</maintainer>
+	<use>
+		<flag name="lightweight">Optimize transmission for low-resource systems (smaller cache size, prefer unencrypted peer connections, etc.)</flag>
+		<flag name="mbedtls">Use mbed TLS instead of OpenSSL</flag>
+		<flag name="xfs">Enable XFS filesystem capabilities by using <pkg>sys-fs/xfsprogs</pkg> headers (in building of fdlimit(.c))</flag>
+	</use>
 </pkgmetadata>
diff --git a/net-p2p/xnap/metadata.xml b/net-p2p/xnap/metadata.xml
index 0594a2ce64ed..c1b47035759d 100644
--- a/net-p2p/xnap/metadata.xml
+++ b/net-p2p/xnap/metadata.xml
@@ -3,10 +3,10 @@
 <pkgmetadata>
 	<!-- maintainer-needed -->
 	<longdescription>
- XNap provides a plugin enabled framework for peer-to-peer (P2P) applications and a client which is based on that framework. It is free software and licensed under the GNU Public License .
+		XNap provides a plugin enabled framework for peer-to-peer (P2P) applications and a client which is based on that framework. It is free software and licensed under the GNU Public License .
 
- XNap is purely written in Java. The client features a modern Swing based user interface and console support that will run nicely on every platform with a recent Java Runtime Environment (1.3 or higher). 
-</longdescription>
+		XNap is purely written in Java. The client features a modern Swing based user interface and console support that will run nicely on every platform with a recent Java Runtime Environment (1.3 or higher).
+	</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">xnap</remote-id>
 	</upstream>
diff --git a/net-print/Manifest.gz b/net-print/Manifest.gz
index 7dda665589a1..e6317e93bc1a 100644
Binary files a/net-print/Manifest.gz and b/net-print/Manifest.gz differ
diff --git a/net-print/hplip/Manifest b/net-print/hplip/Manifest
index 0885463b8b25..f2092b20bf18 100644
--- a/net-print/hplip/Manifest
+++ b/net-print/hplip/Manifest
@@ -1,4 +1,4 @@
 DIST hplip-3.16.2-patches-1.tar.xz 8188 SHA256 8a9a78e0caac1731eae79f047a6054b411c237c579fdfd07bc59d435db708705 SHA512 7eb03c093cfb9ef6b9a980ef5520575310d080c45ed13191933a5facaf9bbb04b38c8381762a3ecd33884ad582830e61e17b6c17f2ed7cdf910670e05eed2510 WHIRLPOOL 6721eac17977485eae0cb22b1702d0479003e3639e806ecd3c5888f1b5015a0bf904512104ebefee4b3d5f64abebd0608090e00310ec8d5b48f210c7e4a95e4e
 DIST hplip-3.16.3.tar.gz 22408596 SHA256 42d2302ee38bda41caa0f2f9524a91f531e3aa432814ffd45b3e5c396dc30194 SHA512 32d2f88c0983208e77592f73bf65cf2900cd6aa234d09220a18b45b5fc4bd0d10e9cfc8c7a10639e5a51ad5f5d0f8ed7bd477d08c86b89c633a1bbcd42682915 WHIRLPOOL b287ecf80c2e7b0da0de0afefcf60c507f9d42c74dbba1e745b4b43f253a5b0dedb6398a1f073e14d196296da47764e983138c0151e05bfc7a5dd416458662a0
-DIST hplip-3.17.10.tar.gz 23878364 SHA256 0f7344174672f63a98a22f3c109005b6eb89fe738b7d466316bf2c53d083476c SHA512 0c1c78730d269ec41f95bbde887a490aebb4c9c3dcb9784052a1c3b537c12093cbc426e1f79266c63dd5e7adecdda0735b9bf964ddc1307b2c6603f3fa0462a8 WHIRLPOOL d8bffafedcfa40686d4e076c9a74af461a0ea29fec2a2effb5324fba8e60d9c85b13a0e8f73bfaf014ccb7bf4eb4e0d1eeffcdecc0efc4d1f31dd065d4093090
-DIST hplip-3.17.9-patches-1.tar.xz 8484 SHA256 2ec368039a59e375bebf565bd679dd3bedb1e0c1ecfc103c5dcf9bb2701ba9d7 SHA512 125f9cfd1c3cad662ce33954b8ab9ab1898368b449c4ad78dfe99f29de8025183773272b9865cd22b976a30c502e38254ce0ac59d685299dff7f9314927d546a WHIRLPOOL 2354bd3b158733b668c731ea3fd605170dd4cc0df5ffebc327a69ad33995ec02166d34897567ed69d608a62e97b33bd12fc0066acb6c302677cc68830a2661cf
+DIST hplip-3.17.10.tar.gz 23878364 BLAKE2B 0165bcb00159572a16277624db0de4b2ca8421d5cf42418bf406548dd68a7d5087142a74a0e6ca332936b006f6ffeaa4d9202c5332fd1f971923bb142adb244f SHA512 0c1c78730d269ec41f95bbde887a490aebb4c9c3dcb9784052a1c3b537c12093cbc426e1f79266c63dd5e7adecdda0735b9bf964ddc1307b2c6603f3fa0462a8
+DIST hplip-3.17.9-patches-1.tar.xz 8484 BLAKE2B 3a1f25d0554af5597266eb5ed3ff9f594560671784a89ade6246e9287661bf17fa16c555391c3f685e59aec8c548560911065a9c4188906c2f00c755f503fe49 SHA512 125f9cfd1c3cad662ce33954b8ab9ab1898368b449c4ad78dfe99f29de8025183773272b9865cd22b976a30c502e38254ce0ac59d685299dff7f9314927d546a
diff --git a/net-print/hplip/hplip-3.17.10-r1.ebuild b/net-print/hplip/hplip-3.17.10-r1.ebuild
new file mode 100644
index 000000000000..b9500be12bd2
--- /dev/null
+++ b/net-print/hplip/hplip-3.17.10-r1.ebuild
@@ -0,0 +1,261 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_REQ_USE="threads,xml"
+
+inherit autotools linux-info python-single-r1 readme.gentoo-r1 udev
+
+DESCRIPTION="HP Linux Imaging and Printing - Print, scan, fax drivers and service tools"
+HOMEPAGE="http://hplipopensource.com/hplip-web/index.html"
+SRC_URI="mirror://sourceforge/hplip/${P}.tar.gz
+		https://dev.gentoo.org/~billie/distfiles/${PN}-3.17.9-patches-1.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+
+IUSE="doc fax +hpcups hpijs kde libressl -libusb0 minimal parport policykit qt5 scanner +snmp static-ppds X"
+
+# dependency on dev-python/notify-python dropped due to python 3 incompatibility
+# possible replacement notify2 (https://pypi.python.org/pypi/notify2/0.3) not in tree
+
+COMMON_DEPEND="
+	net-print/cups
+	virtual/jpeg:0
+	hpijs? ( net-print/cups-filters[foomatic] )
+	!minimal? (
+		${PYTHON_DEPS}
+		sys-apps/dbus
+		!libusb0? ( virtual/libusb:1 )
+		libusb0? ( virtual/libusb:0 )
+		scanner? ( media-gfx/sane-backends )
+		snmp? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:= )
+			net-analyzer/net-snmp
+		)
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+"
+RDEPEND="${COMMON_DEPEND}
+	app-text/ghostscript-gpl
+	!minimal? (
+		>=dev-python/dbus-python-1.2.0-r1[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/pygobject:2[${PYTHON_USEDEP}]' 'python2*')
+		$(python_gen_cond_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]' 'python3*')
+		fax? ( dev-python/reportlab[${PYTHON_USEDEP}] )
+		kernel_linux? ( virtual/udev )
+		qt5? ( >=dev-python/PyQt5-5.5.1[dbus,gui,widgets,${PYTHON_USEDEP}] )
+		scanner? (
+			>=dev-python/reportlab-3.2[${PYTHON_USEDEP}]
+			>=dev-python/pillow-3.1.1[${PYTHON_USEDEP}]
+			X? ( || (
+				kde? ( kde-misc/skanlite )
+				media-gfx/xsane
+				media-gfx/sane-frontends
+			) )
+		)
+	)
+	policykit? ( sys-auth/polkit )
+"
+
+REQUIRED_USE="!minimal? ( ${PYTHON_REQUIRED_USE} )"
+
+PATCHES=(
+	"${WORKDIR}/patches"
+)
+
+CONFIG_CHECK="~PARPORT ~PPDEV"
+ERROR_PARPORT="Please make sure kernel parallel port support is enabled (PARPORT and PPDEV)."
+
+#DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="
+For more information on setting up your printer please take
+a look at the hplip section of the gentoo printing guide:
+https://wiki.gentoo.org/wiki/Printing
+
+Any user who wants to print must be in the lp group.
+"
+
+pkg_setup() {
+	use !minimal && python-single-r1_pkg_setup
+
+	use scanner && ! use X && ewarn "You need USE=X for the scanner GUI."
+
+	if ! use hpcups && ! use hpijs ; then
+		ewarn "Installing neither hpcups (USE=-hpcups) nor hpijs (USE=-hpijs) driver,"
+		ewarn "which is probably not what you want."
+		ewarn "You will almost certainly not be able to print."
+	fi
+
+	if use minimal ; then
+		ewarn "Installing driver portions only, make sure you know what you are doing."
+		ewarn "Depending on the USE flags set for hpcups or hpijs the appropiate driver"
+		ewarn "is installed. If both USE flags are set hpijs overrides hpcups."
+	else
+		use parport && linux-info_pkg_setup
+	fi
+}
+
+src_prepare() {
+	default
+
+	if use !minimal ; then
+		python_export EPYTHON PYTHON
+		python_fix_shebang .
+	fi
+
+	# Make desktop files follow the specification
+	# Gentoo bug: https://bugs.gentoo.org/show_bug.cgi?id=443680
+	# Upstream bug: https://bugs.launchpad.net/hplip/+bug/1080324
+	sed -i -e '/^Categories=/s/Application;//' \
+		-e '/^Encoding=.*/d' hplip.desktop.in || die
+	sed -i -e '/^Categories=/s/Application;//' \
+		-e '/^Version=.*/d' \
+		-e '/^Comment=.*/d' hplip-systray.desktop.in || die
+
+	# Fix for Gentoo bug https://bugs.gentoo.org/show_bug.cgi?id=345725
+	# Upstream bug: https://bugs.launchpad.net/hplip/+bug/880847,
+	# https://bugs.launchpad.net/hplip/+bug/500086
+	local udevdir=$(get_udevdir)
+	sed -i -e "s|/etc/udev|${udevdir}|g" \
+		$(find . -type f -exec grep -l /etc/udev {} +) || die
+
+	# Force recognition of Gentoo distro by hp-check
+	sed -i \
+		-e "s:file('/etc/issue', 'r').read():'Gentoo':" \
+		installer/core_install.py || die
+
+	# Use system foomatic-rip for hpijs driver instead of foomatic-rip-hplip
+	# The hpcups driver does not use foomatic-rip
+	local i
+	for i in ppd/hpijs/*.ppd.gz ; do
+		rm -f ${i}.temp || die
+		gunzip -c ${i} | sed 's/foomatic-rip-hplip/foomatic-rip/g' | \
+			gzip > ${i}.temp || die
+		mv ${i}.temp ${i} || die
+	done
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf drv_build minimal_build
+
+	if use libusb0 ; then
+		myconf="${myconf} --enable-libusb01_build"
+	else
+		myconf="${myconf} --disable-libusb01_build"
+	fi
+
+	if use hpcups ; then
+		drv_build="$(use_enable hpcups hpcups-install)"
+		if use static-ppds ; then
+			drv_build="${drv_build} --enable-cups-ppd-install"
+			drv_build="${drv_build} --disable-cups-drv-install"
+		else
+			drv_build="${drv_build} --enable-cups-drv-install"
+			drv_build="${drv_build} --disable-cups-ppd-install"
+		fi
+	else
+		drv_build="--disable-hpcups-install"
+		drv_build="${drv_build} --disable-cups-drv-install"
+		drv_build="${drv_build} --disable-cups-ppd-install"
+	fi
+
+	if use hpijs ; then
+		drv_build="${drv_build} $(use_enable hpijs hpijs-install)"
+		if use static-ppds ; then
+			drv_build="${drv_build} --enable-foomatic-ppd-install"
+			drv_build="${drv_build} --disable-foomatic-drv-install"
+		else
+			drv_build="${drv_build} --enable-foomatic-drv-install"
+			drv_build="${drv_build} --disable-foomatic-ppd-install"
+		fi
+	else
+		drv_build="${drv_build} --disable-hpijs-install"
+		drv_build="${drv_build} --disable-foomatic-drv-install"
+		drv_build="${drv_build} --disable-foomatic-ppd-install"
+	fi
+
+	if use minimal ; then
+		if use hpijs ; then
+			minimal_build="--enable-hpijs-only-build"
+		else
+			minimal_build="--disable-hpijs-only-build"
+		fi
+		if use hpcups ; then
+			minimal_build="${minimal_build} --enable-hpcups-only-build"
+		else
+			minimal_build="${minimal_build} --disable-hpcups-only-build"
+		fi
+	fi
+
+	econf \
+		--disable-cups11-build \
+		--disable-lite-build \
+		--disable-foomatic-rip-hplip-install \
+		--disable-shadow-build \
+		--disable-qt3 \
+		--disable-qt4 \
+		--disable-udev_sysfs_rules \
+		--with-cupsbackenddir=$(cups-config --serverbin)/backend \
+		--with-cupsfilterdir=$(cups-config --serverbin)/filter \
+		--with-docdir=/usr/share/doc/${PF} \
+		--with-htmldir=/usr/share/doc/${PF}/html \
+		${myconf} \
+		${drv_build} \
+		${minimal_build} \
+		--enable-hpps-install \
+		$(use_enable doc doc-build) \
+		$(use_enable fax fax-build) \
+		$(use_enable !minimal gui-build) \
+		$(use_enable !minimal dbus-build) \
+		$(use_enable parport pp-build) \
+		$(use_enable policykit) \
+		$(use_enable qt5) \
+		$(use_enable scanner scan-build) \
+		$(use_enable snmp network-build)
+}
+
+src_install() {
+	# Disable parallel install
+	# Gentoo Bug: https://bugs.gentoo.org/show_bug.cgi?id=578018
+	emake -j1 DESTDIR="${D}" install
+	einstalldocs
+	# default
+
+	# Installed by sane-backends
+	# Gentoo Bug: https://bugs.gentoo.org/show_bug.cgi?id=201023
+	rm -f "${ED%/}"/etc/sane.d/dll.conf || die
+
+	# Remove desktop and autostart files
+	# Gentoo Bug: https://bugs.gentoo.org/show_bug.cgi?id=638770
+	use qt5 || {
+		rm -Rf "${ED}"/usr/share/applications "${ED}"/etc/xdg
+	}
+
+	rm -f "${ED%/}"/usr/share/doc/${PF}/{copyright,README_LIBJPG,COPYING} || die
+	rmdir --ignore-fail-on-non-empty "${ED%/}"/usr/share/doc/${PF}/ || die
+
+	# Remove hal fdi files
+	rm -rf "${ED%/}"/usr/share/hal || die
+
+	find "${D}" -name '*.la' -delete || die
+
+	if use !minimal ; then
+		python_export EPYTHON PYTHON
+		python_optimize "${ED%/}"/usr/share/hplip
+	fi
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/net-proxy/Manifest.gz b/net-proxy/Manifest.gz
index 92195b3c4830..30be41459be9 100644
Binary files a/net-proxy/Manifest.gz and b/net-proxy/Manifest.gz differ
diff --git a/net-proxy/haproxy/metadata.xml b/net-proxy/haproxy/metadata.xml
index ddb31ac2bb8b..017b2b8ad09c 100644
--- a/net-proxy/haproxy/metadata.xml
+++ b/net-proxy/haproxy/metadata.xml
@@ -6,17 +6,17 @@
 		<name>Christian Ruppert</name>
 	</maintainer>
 	<longdescription>
-HAProxy is a free, very fast and reliable solution offering high availability, load balancing, and proxying for TCP and HTTP-based applications. It is particularly suited for web sites crawling under very high loads while needing persistence or Layer7 processing. Supporting tens of thousands of connections is clearly realistic with todays hardware. Its mode of operation makes its integration into existing architectures very easy and riskless, while still offering the possibility not to expose fragile web servers to the Net.
+		HAProxy is a free, very fast and reliable solution offering high availability, load balancing, and proxying for TCP and HTTP-based applications. It is particularly suited for web sites crawling under very high loads while needing persistence or Layer7 processing. Supporting tens of thousands of connections is clearly realistic with todays hardware. Its mode of operation makes its integration into existing architectures very easy and riskless, while still offering the possibility not to expose fragile web servers to the Net.
 
-It can:
- - route HTTP requests depending on statically assigned cookies
- - spread the load among several servers while assuring server persistence through the use of HTTP cookies
- - switch to backup servers in the event a main one fails
- - accept connections to special ports dedicated to service monitoring
- - stop accepting connections without breaking existing ones
- - add/modify/delete HTTP headers both ways
- - block requests matching a particular pattern
-Its event-driven architecture allows it to easily handle thousands of simultaneous connections on hundreds of instances without risking the system's stability.
+		It can:
+		- route HTTP requests depending on statically assigned cookies
+		- spread the load among several servers while assuring server persistence through the use of HTTP cookies
+		- switch to backup servers in the event a main one fails
+		- accept connections to special ports dedicated to service monitoring
+		- stop accepting connections without breaking existing ones
+		- add/modify/delete HTTP headers both ways
+		- block requests matching a particular pattern
+		Its event-driven architecture allows it to easily handle thousands of simultaneous connections on hundreds of instances without risking the system's stability.
 	</longdescription>
 	<use>
 		<flag name="net_ns">Enable network namespace support (CONFIG_NET_NS)</flag>
diff --git a/net-proxy/nutcracker/metadata.xml b/net-proxy/nutcracker/metadata.xml
index a681c7f99620..4fca877b654e 100644
--- a/net-proxy/nutcracker/metadata.xml
+++ b/net-proxy/nutcracker/metadata.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>patrick@gentoo.org</email>
-    <name>Patrick Lauer</name>
-  </maintainer>
+	<maintainer type="person">
+		<email>patrick@gentoo.org</email>
+		<name>Patrick Lauer</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">twitter/twemproxy</remote-id>
 	</upstream>
diff --git a/net-proxy/shadowsocks-libev/metadata.xml b/net-proxy/shadowsocks-libev/metadata.xml
index cb44189bcda5..8771f7c6a926 100644
--- a/net-proxy/shadowsocks-libev/metadata.xml
+++ b/net-proxy/shadowsocks-libev/metadata.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>dlan@gentoo.org</email>
-    <name>Yixun Lan</name>
-  </maintainer>
-  <use>
-    <flag name="openssl">Use <pkg>dev-libs/openssl</pkg> as crypto backend</flag>
-    <flag name="mbedtls">Use <pkg>net-libs/mbedtls</pkg> as crypto backend</flag>
-	<flag name="system-libs">Use system libraries instead of the ones included in the upstream distribution</flag>
-  </use>
-  <upstream>
-    <remote-id type="github">shadowsocks/shadowsocks-libev</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>dlan@gentoo.org</email>
+		<name>Yixun Lan</name>
+	</maintainer>
+	<use>
+		<flag name="openssl">Use <pkg>dev-libs/openssl</pkg> as crypto backend</flag>
+		<flag name="mbedtls">Use <pkg>net-libs/mbedtls</pkg> as crypto backend</flag>
+		<flag name="system-libs">Use system libraries instead of the ones included in the upstream distribution</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">shadowsocks/shadowsocks-libev</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index fefd999f8591..2ffd6b7f9a2a 100644
Binary files a/net-vpn/Manifest.gz and b/net-vpn/Manifest.gz differ
diff --git a/net-vpn/badvpn/metadata.xml b/net-vpn/badvpn/metadata.xml
index e2a7803599c3..c1e45bb31821 100644
--- a/net-vpn/badvpn/metadata.xml
+++ b/net-vpn/badvpn/metadata.xml
@@ -7,25 +7,21 @@
 	</maintainer>
 	<upstream>
 		<maintainer status="active">
-                <email>ambrop7@gmail.com</email>
-                <name>Ambroz Bizjak</name>
-        </maintainer>
-        <doc lang="en">https://code.google.com/p/badvpn/w/list</doc>
+			<email>ambrop7@gmail.com</email>
+			<name>Ambroz Bizjak</name>
+		</maintainer>
+		<doc lang="en">https://code.google.com/p/badvpn/w/list</doc>
 		<bugs-to>https://github.com/ambrop72/badvpn/issues</bugs-to>
 		<remote-id type="github">ambrop72/badvpn</remote-id>
 		<remote-id type="google-code">badvpn</remote-id>
 	</upstream>
 	<use>
-		<flag name="client">Build the badvpn-client program, a daemon that
-			runs on endpoints of the VPN.</flag>
-		<flag name="server">Build the badvpn-server program, a central
-			server that manages the VPN network.</flag>
-		<flag name="ncd">Build NCD, a lightweight scripting language
-			especially suited for network configurations.</flag>
-		<flag name="tun2socks">Build tun2socks, a program which implements
-			a TUN device that forwards TCP traffic through a SOCKS5
-			server.</flag>
-        <flag name="udpgw">Build udpgw, a small daemon which allows tun2socks to forward UDP traffic.</flag>	</use>
+		<flag name="client">Build the badvpn-client program, a daemon that runs on endpoints of the VPN.</flag>
+		<flag name="server">Build the badvpn-server program, a central server that manages the VPN network.</flag>
+		<flag name="ncd">Build NCD, a lightweight scripting language especially suited for network configurations.</flag>
+		<flag name="tun2socks">Build tun2socks, a program which implements a TUN device that forwards TCP traffic through a SOCKS5 server.</flag>
+		<flag name="udpgw">Build udpgw, a small daemon which allows tun2socks to forward UDP traffic.</flag>
+	</use>
 	<longdescription lang="en">
 		BadVPN is an open-source peer-to-peer VPN system. It provides a
 		Layer 2 (Ethernet) network between the peers (VPN nodes). The peers
diff --git a/net-vpn/strongswan/metadata.xml b/net-vpn/strongswan/metadata.xml
index 9e6793b9791f..72eecce94d3b 100644
--- a/net-vpn/strongswan/metadata.xml
+++ b/net-vpn/strongswan/metadata.xml
@@ -1,109 +1,49 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>patrick@gentoo.org</email>
-    <name>Patrick Lauer</name>
-  </maintainer>
-  <maintainer type="person">
-    <email>gurligebis@gentoo.org</email>
-    <name>Bjarke Istrup Pedersen</name>
-  </maintainer>
-  <longdescription lang="en">
-    StrongSwan is direct descendant of the discontinued FreeS/WAN project.
-    As an IPsec based VPN solution which is focused on security and ease of
-    use, it fully implements the IKEv1/IKEv2 protocols, MOBIKE, NAT-Traversal
-    via UDP encapsulation (incl. port floating) and Dead Peer Detection. It
-    also fully supports the Linux 2.6 IPsec stack, IPv6, certificates/keys on
-    Smartcards and virtual IP address pools.
-  </longdescription>
-  <use>
-	<flag name="constraints">
-	  Enable advanced X.509 constraint checking plugin.
-	</flag>
-    <flag name="dhcp">
-      Enable server support for querying virtual IP addresses for clients
-      from a DHCP server. (IKEv2 only)
-    </flag>
-    <flag name="eap">
-      Enable support for the different EAP modules that is supported.
-    </flag>
-    <flag name="farp">
-      Enable faking of ARP responses for virtual IP addresses assigned to
-      clients. (IKEv2 only)
-    </flag>
-    <flag name="gcrypt">
-      Enable <pkg>dev-libs/libgcrypt</pkg> plugin which provides 3DES, AES,
-      Blowfish, Camellia, CAST, DES, Serpent and Twofish ciphers along with
-      MD4, MD5 and SHA1/2 hash algorithms, RSA and DH groups 1,2,5,14-18 and
-      22-24(4.4+). Also includes a software random number generator.
-    </flag>
-    <flag name="non-root">
-      Force IKEv1/IKEv2 daemons to normal user privileges. This might impose
-      some restrictions mainly to the IKEv1 daemon. Disable only if you really
-      require superuser privileges.
-    </flag>
-    <flag name="openssl">
-      Enable <pkg>dev-libs/openssl</pkg> plugin which is required for Elliptic
-      Curve Cryptography (DH groups 19-21,25,26) and ECDSA. Also provides 3DES,
-      AES, Blowfish, Camellia, CAST, DES, IDEA and RC5 ciphers along with MD2,
-      MD4, MD5 and SHA1/2 hash algorithms, RSA and DH groups 1,2,5,14-18 and
-      22-24(4.4+)
-      <pkg>dev-libs/openssl</pkg> has to be compiled with USE="-bindist".
-    </flag>
-    <flag name="pkcs11">
-      Enable pkcs11 support.
-    </flag>
-    <flag name="strongswan_plugins_led">
-      Enable support for the led plugin.
-    </flag>
-    <flag name="strongswan_plugins_lookip">
-      Enable support for the lookip plugin.
-    </flag>
-    <flag name="strongswan_plugins_systime-fix">
-      Enable support for the systime-fix plugin.
-    </flag>
-    <flag name="strongswan_plugins_unity">
-      Enable support for the unity plugin.
-    </flag>
-    <flag name="strongswan_plugins_vici">
-      Enable support for the vici plugin.
-    </flag>
-    <flag name="strongswan_plugins_blowfish">
-      Enable support for the blowfish plugin.
-    </flag>
-    <flag name="strongswan_plugins_ccm">
-      Enable support for the ccm plugin.
-    </flag>
-    <flag name="strongswan_plugins_ctr">
-      Enable support for the ctr plugin.
-    </flag>
-    <flag name="strongswan_plugins_gcm">
-      Enable support for the gcm plugin.
-    </flag>
-    <flag name="strongswan_plugins_ha">
-      Enable support for the ha plugin.
-    </flag>
-    <flag name="strongswan_plugins_ipseckey">
-      Enable support for the ipseckey plugin.
-    </flag>
-    <flag name="strongswan_plugins_ntru">
-      Enable support for the ntru plugin.
-    </flag>
-    <flag name="strongswan_plugins_padlock">
-      Enable support for the padlock plugin.
-    </flag>
-    <flag name="strongswan_plugins_rdrand">
-      Enable support for the rdrand plugin.
-    </flag>
-    <flag name="strongswan_plugins_unbound">
-      Enable support for the unbound plugin.
-    </flag>
-    <flag name="strongswan_plugins_whitelist">
-      Enable support for the whitelist plugin.
-    </flag>
-  </use>
-  <upstream>
-    <remote-id type="cpe">cpe:/a:strongswan:strongswan</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>patrick@gentoo.org</email>
+		<name>Patrick Lauer</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>gurligebis@gentoo.org</email>
+		<name>Bjarke Istrup Pedersen</name>
+	</maintainer>
+	<longdescription lang="en">
+		StrongSwan is direct descendant of the discontinued FreeS/WAN project.
+		As an IPsec based VPN solution which is focused on security and ease of
+		use, it fully implements the IKEv1/IKEv2 protocols, MOBIKE, NAT-Traversal
+		via UDP encapsulation (incl. port floating) and Dead Peer Detection. It
+		also fully supports the Linux 2.6 IPsec stack, IPv6, certificates/keys on
+		Smartcards and virtual IP address pools.
+	</longdescription>
+	<use>
+		<flag name="constraints">Enable advanced X.509 constraint checking plugin</flag>
+		<flag name="dhcp">Enable server support for querying virtual IP addresses for clients from a DHCP server. (IKEv2 only)</flag>
+		<flag name="eap">Enable support for the different EAP modules that are supported</flag>
+		<flag name="farp">Enable faking of ARP responses for virtual IP addresses assigned to clients (IKEv2 only)</flag>
+		<flag name="gcrypt">Enable <pkg>dev-libs/libgcrypt</pkg> plugin which provides 3DES, AES, Blowfish, Camellia, CAST, DES, Serpent and Twofish ciphers along with MD4, MD5 and SHA1/2 hash algorithms, RSA and DH groups 1,2,5,14-18 and 22-24(4.4+). Also includes a software random number generator.</flag>
+		<flag name="non-root">Force IKEv1/IKEv2 daemons to normal user privileges. This might impose some restrictions mainly to the IKEv1 daemon. Disable only if you really require superuser privileges.</flag>
+		<flag name="openssl">Enable <pkg>dev-libs/openssl</pkg> plugin which is required for Elliptic Curve Cryptography (DH groups 19-21,25,26) and ECDSA. Also provides 3DES, AES, Blowfish, Camellia, CAST, DES, IDEA and RC5 ciphers along with MD2, MD4, MD5 and SHA1/2 hash algorithms, RSA and DH groups 1,2,5,14-18 and 22-24(4.4+) <pkg>dev-libs/openssl</pkg> has to be compiled with USE="-bindist".</flag>
+		<flag name="pkcs11">Enable pkcs11 support</flag>
+		<flag name="strongswan_plugins_led">Enable support for the led plugin</flag>
+		<flag name="strongswan_plugins_lookip">Enable support for the lookip plugin</flag>
+		<flag name="strongswan_plugins_systime-fix">Enable support for the systime-fix plugin</flag>
+		<flag name="strongswan_plugins_unity">Enable support for the unity plugin</flag>
+		<flag name="strongswan_plugins_vici">Enable support for the vici plugin</flag>
+		<flag name="strongswan_plugins_blowfish">Enable support for the blowfish plugin</flag>
+		<flag name="strongswan_plugins_ccm">Enable support for the ccm plugin</flag>
+		<flag name="strongswan_plugins_ctr">Enable support for the ctr plugin</flag>
+		<flag name="strongswan_plugins_gcm">Enable support for the gcm plugin</flag>
+		<flag name="strongswan_plugins_ha">Enable support for the ha plugin</flag>
+		<flag name="strongswan_plugins_ipseckey">Enable support for the ipseckey plugin</flag>
+		<flag name="strongswan_plugins_ntru">Enable support for the ntru plugin</flag>
+		<flag name="strongswan_plugins_padlock">Enable support for the padlock plugin</flag>
+		<flag name="strongswan_plugins_rdrand">Enable support for the rdrand plugin</flag>
+		<flag name="strongswan_plugins_unbound">Enable support for the unbound plugin</flag>
+		<flag name="strongswan_plugins_whitelist">Enable support for the whitelist plugin</flag>
+	</use>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:strongswan:strongswan</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-vpn/wireguard/Manifest b/net-vpn/wireguard/Manifest
index 6892c8b927b1..d85e70320bcd 100644
--- a/net-vpn/wireguard/Manifest
+++ b/net-vpn/wireguard/Manifest
@@ -1 +1 @@
-DIST WireGuard-0.0.20171122.tar.xz 211324 BLAKE2B b665d945350080d98b0ab85a3fc56ae488936eb5b7b4f44593d7262419a768998d4e05195ddba09cfebb5ec9dbfb3430d29ed7ed8c209e90fce2a2b1338bce78 SHA512 5294fca416712c7e14d3b608d1fa3a550a50477ee81f105294d3016ffba46306a5a68730c1c34dabab77d479294ec8ae41d97a8fd57eb5c2c39fd376275df7e4
+DIST WireGuard-0.0.20171127.tar.xz 212408 BLAKE2B a79d04e77c04be96e5dd4c86e038bb43f33ffb8121688f7fbe4d747496feb675fae078c11bf450989472624d3cb56404da4cc9217c10fc75f77b3372d198f3b8 SHA512 31fb30f8a8eca96cee43d95b2ca10c05dd7f17f7f5695da6979e0d949735d5488065431529e580a881e3302cf78415c5132e116dc83ba1c40881de8b99627b95
diff --git a/net-vpn/wireguard/wireguard-0.0.20171122.ebuild b/net-vpn/wireguard/wireguard-0.0.20171127.ebuild
similarity index 100%
rename from net-vpn/wireguard/wireguard-0.0.20171122.ebuild
rename to net-vpn/wireguard/wireguard-0.0.20171127.ebuild
diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index 48493cf8bc71..cd7c6c559652 100644
Binary files a/net-wireless/Manifest.gz and b/net-wireless/Manifest.gz differ
diff --git a/net-wireless/blueberry/metadata.xml b/net-wireless/blueberry/metadata.xml
index 85b93305f552..77900a98ef0c 100644
--- a/net-wireless/blueberry/metadata.xml
+++ b/net-wireless/blueberry/metadata.xml
@@ -12,7 +12,7 @@
 	<maintainer type="project">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
-    </maintainer>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">linuxmint/blueberry</remote-id>
 	</upstream>
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 0953297aaf02..03528c8bc697 100644
Binary files a/profiles/Manifest.gz and b/profiles/Manifest.gz differ
diff --git a/profiles/arch/hppa/package.use.stable.mask b/profiles/arch/hppa/package.use.stable.mask
index bb7a033b84a4..72ccde4de631 100644
--- a/profiles/arch/hppa/package.use.stable.mask
+++ b/profiles/arch/hppa/package.use.stable.mask
@@ -17,6 +17,13 @@
 
 #--- END OF EXAMPLES ---
 
+# Hans de Graaff <graaff@gentoo.org> (26 Nov 2017)
+# Several packages no longer have stable keywords due
+# to bug 626682
+dev-ruby/bundler doc
+dev-ruby/rspec-core highlight test
+sys-block/thin-provisioning-tools test
+
 # Andreas Sturmlechner <asturm@gentoo.org> (29 Oct 2017)
 # dev-qt/* stabilisation timeout.
 app-text/poppler cairo-qt
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index e43d91dd3f99..fb6a5e7efdab 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -12,7 +12,7 @@
 =media-libs/freeverb3-3.1.2_pre20151102-r1 jack
 
 # Andreas Sturmlechner <asturm@gentoo.org> (29 Oct 2017)
-# Depends on deprecated x11-libs/qscintilla[qt4]/qt4, bug #634976
+# Depends on deprecated x11-libs/qscintilla[qt4]/qt4, bug #634972
 net-analyzer/linkchecker X
 
 # Andreas Sturmlechner <asturm@gentoo.org> (16 Oct 2017)
diff --git a/profiles/package.mask b/profiles/package.mask
index 9c5af58a579d..55e81d712e17 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -29,6 +29,12 @@
 
 #--- END OF EXAMPLES ---
 
+# Jonas Stein <jstein@gentoo.org> (26 Nov 2017)
+# The latest version of this LaTeX package is part of 
+# dev-texlive/texlive-latexextra (bug #421881)
+# Masked for removal on 2017-12-30
+dev-tex/isotope
+
 # Matt Turner <mattst88@gentoo.org> (25 Nov 2017)
 # Unmaintained upstream. Masked for removal in 30 days.
 # Bug #606132.
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index aede776ada9f..63f696b57226 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -1399,11 +1399,11 @@ dev-db/mysql-cluster:systemtap - Build support for profiling and tracing using d
 dev-db/mysql-cluster:test - Install upstream testsuites for end use.
 dev-db/mysql-cluster:yassl - Enable SSL connections and crypto functions using the bundled yaSSL
 dev-db/mysql-connector-c++:gcov - Build coverage support
-dev-db/oracle-instantclient:jdbc - Support for XA, Internationalization, and RowSet operations under JDBC.
-dev-db/oracle-instantclient:odbc - Libraries for enabling ODBC applications.
-dev-db/oracle-instantclient:sdk - Header files and an example makefile for developing Oracle applications.
-dev-db/oracle-instantclient:sqlplus - Libraries and executable for running SQL*Plus.
-dev-db/oracle-instantclient:tools - Workload Replay Client.
+dev-db/oracle-instantclient:jdbc - Support for XA, Internationalization, and RowSet operations under JDBC
+dev-db/oracle-instantclient:odbc - Libraries for enabling ODBC applications
+dev-db/oracle-instantclient:sdk - Header files and an example makefile for developing Oracle applications
+dev-db/oracle-instantclient:sqlplus - Libraries and executable for running SQL*Plus
+dev-db/oracle-instantclient:tools - Workload Replay Client
 dev-db/percona-server:embedded - Build embedded server (libmysqld)
 dev-db/percona-server:extraengine - Add support for alternative storage engines (Archive, CSV, Blackhole, Federated(X), Partition)
 dev-db/percona-server:jemalloc - Use dev-libs/jemalloc for allocations.
@@ -1713,9 +1713,9 @@ dev-haskell/shakespeare-js:test_roy - Test roy.
 dev-haskell/shelly:lifted - run the tests against Shelly.Lifted
 dev-haskell/shuffle:network-uri - Get Network.URI from the network-uri package.
 dev-haskell/simple-sendfile:allow-bsd - Allow use of BSD sendfile (disable on GNU/kFreeBSD)
-dev-haskell/skein:big-endian - When manually selecting the endianness, use big-endian (default is little-endian).
-dev-haskell/skein:force-endianness - Use a manually selected endian when compiling (see flag 'big-endian').
-dev-haskell/skein:reference - Use the reference implementation instead of the optimized one.
+dev-haskell/skein:big-endian - When manually selecting the endianness, use big-endian (default is little-endian)
+dev-haskell/skein:force-endianness - Use a manually selected endian when compiling (see flag 'big-endian')
+dev-haskell/skein:reference - Use the reference implementation instead of the optimized one
 dev-haskell/skylighting:executable - Build the skylighting executable.
 dev-haskell/snap-core:portable - No non-haskell unportable code.
 dev-haskell/snap-server:build-pong - Build a server that just returns "PONG"
@@ -1931,7 +1931,7 @@ dev-lang/php:xmlwriter - Enable XMLWriter support
 dev-lang/php:xslt - Enable the XSL extension
 dev-lang/php:zip - Enable ZIP file support
 dev-lang/php:zip-encryption - Enable ZIP file encryption from dev-libs/libzip
-dev-lang/polyml:portable - Build the portable interpreter version of Poly/ML instead of native.
+dev-lang/polyml:portable - Build the portable interpreter version of Poly/ML instead of native
 dev-lang/python:threads - Enable threading support. (DON'T DISABLE THIS UNLESS YOU KNOW WHAT YOU'RE DOING)
 dev-lang/python:wide-unicode - Enable wide Unicode implementation which uses 4-byte Unicode characters. Switching of this USE flag changes ABI of Python and requires reinstallation of many Python modules. (DON'T DISABLE THIS UNLESS YOU KNOW WHAT YOU'RE DOING)
 dev-lang/python:wininst - Install Windows executables required to create an executable installer for MS Windows.
@@ -2192,10 +2192,10 @@ dev-libs/openct:debug - Add debug output to the driver library for pcsc-lite.
 dev-libs/openct:pcsc-lite - Build a driver library for sys-apps/pcsc-lite, providing PC/SC API access to devices supported by OpenCT.
 dev-libs/openct:udev - Install rules for sys-fs/udev to auto-start openct.
 dev-libs/openobex:irda - Enable IrDA support
-dev-libs/opensc:ctapi - Use CT-API for accessing Smartcard hardware.
-dev-libs/opensc:openct - Use dev-libs/openct (and CT-API) for accessing Smartcard hardware.
-dev-libs/opensc:pcsc-lite - Use sys-apps/pcsc-lite (and PC/SC API) for accessing Smartcard hardware.
-dev-libs/opensc:secure-messaging - Enable secure messaging.
+dev-libs/opensc:ctapi - Use CT-API for accessing Smartcard hardware
+dev-libs/opensc:openct - Use dev-libs/openct (and CT-API) for accessing Smartcard hardware
+dev-libs/opensc:pcsc-lite - Use sys-apps/pcsc-lite (and PC/SC API) for accessing Smartcard hardware
+dev-libs/opensc:secure-messaging - Enable secure messaging
 dev-libs/openssl:asm - Support assembly hand optimized crypto functions (i.e. faster run time)
 dev-libs/openssl:bindist - Disable/Restrict EC algorithms (as they seem to be patented) -- note: changes the ABI
 dev-libs/openssl:rfc3779 - Enable support for RFC 3779 (X.509 Extensions for IP Addresses and AS Identifiers)
@@ -2760,7 +2760,7 @@ dev-ruby/faraday_middleware:oauth - Include FaradayMiddleware::OAuth
 dev-ruby/faraday_middleware:parsexml - Include FaradayMiddleware::ParseXml
 dev-ruby/faraday_middleware:rashify - Include FaradayMiddleware::Rashify
 dev-ruby/maruku:highlight - Enable source code highlighting via dev-ruby/syntax
-dev-ruby/net-ssh:sodium - Use dev-libs/libsodium via dev-ruby/rbnacl for Ed25519 support.
+dev-ruby/net-ssh:sodium - Use dev-libs/libsodium via dev-ruby/rbnacl for Ed25519 support
 dev-ruby/rails:asset-pipeline - Also install the default components for the asset pipeline. These are not required but they are activated automatically in new Rails projects by default.
 dev-ruby/rrdtool-bindings:graph - Enable support for graphing functions
 dev-ruby/rspec-core:highlight - Enable source code highlighting via dev-ruby/coderay
@@ -2933,12 +2933,12 @@ dev-util/mingw64-runtime:idl - Install idl files.
 dev-util/mingw64-runtime:libraries - Build extra libraries.
 dev-util/mingw64-runtime:tools - Build extra tools.
 dev-util/molecule:plugins - Add plugins provided by dev-util/molecule-plugins
-dev-util/nemiver:memoryview - Enable the optional hexadecimal memory inspection with app-editors/ghex.
-dev-util/nvidia-cuda-sdk:cuda - Build CUDA binaries.
-dev-util/nvidia-cuda-sdk:opencl - Build OpenCL binaries.
-dev-util/nvidia-cuda-toolkit:debugger - Installs the CUDA debugger.
+dev-util/nemiver:memoryview - Enable the optional hexadecimal memory inspection with app-editors/ghex
+dev-util/nvidia-cuda-sdk:cuda - Build CUDA binaries
+dev-util/nvidia-cuda-sdk:opencl - Build OpenCL binaries
+dev-util/nvidia-cuda-toolkit:debugger - Installs the CUDA debugger
 dev-util/nvidia-cuda-toolkit:eclipse - Install plugins for eclipse
-dev-util/nvidia-cuda-toolkit:profiler - Installs the NVIDIA CUDA visual profiler.
+dev-util/nvidia-cuda-toolkit:profiler - Installs the NVIDIA CUDA visual profiler
 dev-util/perf:demangle - Enable C++ symbol name demangling, using libbfd from sys-devel/binutils. When this flag is enabled, the package will have to be rebuilt after every version bump of binutils.
 dev-util/perf:doc - Build documentation and man pages. With this USE flag disabled, the --help parameter for perf and its sub-tools will not be available. This is optional because it depends on a few documentation handling tools that are not always welcome on user systems.
 dev-util/perf:numa - Enable NUMA support
@@ -3262,9 +3262,9 @@ games-rpg/daimonin-client:music - Install extra music
 games-rpg/drascula:sound - Install optional audio files
 games-rpg/dreamweb:doc - High-resolution scans of the written material in the original UK game box
 games-rpg/dungeon-defenders:bundled-libs - Use the upstream provided bundled libraries.
-games-rpg/eternal-lands-data:bloodsuckermaps - Will install Bloodsucker's Maps in place of the official map files.
-games-rpg/eternal-lands-data:music - Adds in-game music.
-games-rpg/eternal-lands-data:sound - Adds in-game sound effects.
+games-rpg/eternal-lands-data:bloodsuckermaps - Will install Bloodsucker's Maps in place of the official map files
+games-rpg/eternal-lands-data:music - Enables in-game music
+games-rpg/eternal-lands-data:sound - Enables in-game sound effects
 games-rpg/grimrock:bundled-libs - Use bundled libraries.
 games-rpg/kqlives:cheats - Enable cheating mode
 games-rpg/manaplus:mumble - Enable support for voice chat
@@ -4469,7 +4469,7 @@ media-sound/audacity:soundtouch - Enables soundtouch library support for pitch a
 media-sound/audacity:twolame - Enables twolame support (MPEG Audio Layer 2 encoder)
 media-sound/audacity:vamp - Enables vamp plugins support (Audio analysing plugins)
 media-sound/audacity:vst - Enable VST plugin support
-media-sound/beets:badfiles - Validate MP3 & FLAC files.
+media-sound/beets:badfiles - Validate MP3 & FLAC files
 media-sound/beets:bpd - Enable support for media-sound/mpd server emulation
 media-sound/beets:chroma - Enable support for acoustic fingerprinting plugin using media-libs/chromaprint
 media-sound/beets:convert - Enable support for the convert plugin which makes it possible to transcode files
@@ -5568,7 +5568,7 @@ net-fs/cvmfs:preload - Install the cvmfs cache preloader for distributed file sy
 net-fs/cvmfs:server - Install the cvmfsd program and init script
 net-fs/cvmfs:test-programs - Install unit test programs
 net-fs/netatalk:pgp - Add support pgp authentication module
-net-fs/netatalk:quota - Add support for user quota on various filesystems.
+net-fs/netatalk:quota - Add support for user quota on various filesystems
 net-fs/netatalk:shadow - Add shadow support
 net-fs/netatalk:ssl - Use dev-libs/openssl to provide DHX User Access Modules. These are not used with most recent versions of OS X and can be kept disabled without risks.
 net-fs/netatalk:tracker - Add support for spotlight like tracker
@@ -6437,6 +6437,7 @@ net-misc/networkmanager:json - Enable JSON validation via dev-libs/jansson in li
 net-misc/networkmanager:modemmanager - Enable support for mobile broadband devices using net-misc/modemmanager
 net-misc/networkmanager:nss - Use dev-libs/nss for cryptography
 net-misc/networkmanager:ofono - Use net-misc/ofono for telephony support.
+net-misc/networkmanager:ovs - Enable OpenVSwitch support
 net-misc/networkmanager:ppp - Enable support for mobile broadband and PPPoE connections using net-dialup/ppp
 net-misc/networkmanager:resolvconf - Use net-dns/openresolv for managing DNS information
 net-misc/networkmanager:teamd - Enable Teamd control support
@@ -6603,11 +6604,11 @@ net-nds/nsscache:nsscache - Depend on sys-auth/libnss-cache to handle flat files
 net-nds/nsscache:nssdb - Depend on sys-libs/libnss_db to handle dbm files.
 net-nds/openldap:experimental - Enable experimental backend options
 net-nds/openldap:kinit - Enable support for kerberos init
-net-nds/openldap:minimal - Build libraries & userspace tools only. Does not install any server code.
+net-nds/openldap:minimal - Build libraries & userspace tools only. Does not install any server code
 net-nds/openldap:odbc - Enable ODBC and SQL backend options
 net-nds/openldap:overlays - Enable contributed OpenLDAP overlays
 net-nds/openldap:pbkdf2 - Enable support for pbkdf2 passwords
-net-nds/openldap:sha2 - Enable support for pw-sha2 password hashes.
+net-nds/openldap:sha2 - Enable support for pw-sha2 password hashes
 net-nds/openldap:smbkrb5passwd - Enable overlay for syncing ldap, unix and lanman passwords
 net-nds/rpcbind:warmstarts - Enables rpcbind to cache configuration for warm restarts
 net-nds/tac_plus:finger - Adds support for checking user counts via fingering the NAS
@@ -6833,30 +6834,30 @@ net-vpn/openvpn:mbedtls - Use mbed TLS instead of OpenSSL
 net-vpn/openvpn:pkcs11 - Enable PKCS#11 smartcard support
 net-vpn/openvpn:plugins - Enable the OpenVPN plugin system
 net-vpn/pptpd:gre-extreme-debug - Log all GRE accepted packages when in debug mode (required if you want upstream support)
-net-vpn/strongswan:constraints - Enable advanced X.509 constraint checking plugin.
+net-vpn/strongswan:constraints - Enable advanced X.509 constraint checking plugin
 net-vpn/strongswan:dhcp - Enable server support for querying virtual IP addresses for clients from a DHCP server. (IKEv2 only)
-net-vpn/strongswan:eap - Enable support for the different EAP modules that is supported.
-net-vpn/strongswan:farp - Enable faking of ARP responses for virtual IP addresses assigned to clients. (IKEv2 only)
+net-vpn/strongswan:eap - Enable support for the different EAP modules that are supported
+net-vpn/strongswan:farp - Enable faking of ARP responses for virtual IP addresses assigned to clients (IKEv2 only)
 net-vpn/strongswan:gcrypt - Enable dev-libs/libgcrypt plugin which provides 3DES, AES, Blowfish, Camellia, CAST, DES, Serpent and Twofish ciphers along with MD4, MD5 and SHA1/2 hash algorithms, RSA and DH groups 1,2,5,14-18 and 22-24(4.4+). Also includes a software random number generator.
 net-vpn/strongswan:non-root - Force IKEv1/IKEv2 daemons to normal user privileges. This might impose some restrictions mainly to the IKEv1 daemon. Disable only if you really require superuser privileges.
 net-vpn/strongswan:openssl - Enable dev-libs/openssl plugin which is required for Elliptic Curve Cryptography (DH groups 19-21,25,26) and ECDSA. Also provides 3DES, AES, Blowfish, Camellia, CAST, DES, IDEA and RC5 ciphers along with MD2, MD4, MD5 and SHA1/2 hash algorithms, RSA and DH groups 1,2,5,14-18 and 22-24(4.4+) dev-libs/openssl has to be compiled with USE="-bindist".
-net-vpn/strongswan:pkcs11 - Enable pkcs11 support.
-net-vpn/strongswan:strongswan_plugins_blowfish - Enable support for the blowfish plugin.
-net-vpn/strongswan:strongswan_plugins_ccm - Enable support for the ccm plugin.
-net-vpn/strongswan:strongswan_plugins_ctr - Enable support for the ctr plugin.
-net-vpn/strongswan:strongswan_plugins_gcm - Enable support for the gcm plugin.
-net-vpn/strongswan:strongswan_plugins_ha - Enable support for the ha plugin.
-net-vpn/strongswan:strongswan_plugins_ipseckey - Enable support for the ipseckey plugin.
-net-vpn/strongswan:strongswan_plugins_led - Enable support for the led plugin.
-net-vpn/strongswan:strongswan_plugins_lookip - Enable support for the lookip plugin.
-net-vpn/strongswan:strongswan_plugins_ntru - Enable support for the ntru plugin.
-net-vpn/strongswan:strongswan_plugins_padlock - Enable support for the padlock plugin.
-net-vpn/strongswan:strongswan_plugins_rdrand - Enable support for the rdrand plugin.
-net-vpn/strongswan:strongswan_plugins_systime-fix - Enable support for the systime-fix plugin.
-net-vpn/strongswan:strongswan_plugins_unbound - Enable support for the unbound plugin.
-net-vpn/strongswan:strongswan_plugins_unity - Enable support for the unity plugin.
-net-vpn/strongswan:strongswan_plugins_vici - Enable support for the vici plugin.
-net-vpn/strongswan:strongswan_plugins_whitelist - Enable support for the whitelist plugin.
+net-vpn/strongswan:pkcs11 - Enable pkcs11 support
+net-vpn/strongswan:strongswan_plugins_blowfish - Enable support for the blowfish plugin
+net-vpn/strongswan:strongswan_plugins_ccm - Enable support for the ccm plugin
+net-vpn/strongswan:strongswan_plugins_ctr - Enable support for the ctr plugin
+net-vpn/strongswan:strongswan_plugins_gcm - Enable support for the gcm plugin
+net-vpn/strongswan:strongswan_plugins_ha - Enable support for the ha plugin
+net-vpn/strongswan:strongswan_plugins_ipseckey - Enable support for the ipseckey plugin
+net-vpn/strongswan:strongswan_plugins_led - Enable support for the led plugin
+net-vpn/strongswan:strongswan_plugins_lookip - Enable support for the lookip plugin
+net-vpn/strongswan:strongswan_plugins_ntru - Enable support for the ntru plugin
+net-vpn/strongswan:strongswan_plugins_padlock - Enable support for the padlock plugin
+net-vpn/strongswan:strongswan_plugins_rdrand - Enable support for the rdrand plugin
+net-vpn/strongswan:strongswan_plugins_systime-fix - Enable support for the systime-fix plugin
+net-vpn/strongswan:strongswan_plugins_unbound - Enable support for the unbound plugin
+net-vpn/strongswan:strongswan_plugins_unity - Enable support for the unity plugin
+net-vpn/strongswan:strongswan_plugins_vici - Enable support for the vici plugin
+net-vpn/strongswan:strongswan_plugins_whitelist - Enable support for the whitelist plugin
 net-vpn/tinc:gui - Add GUI support, using dev-python/wxpython
 net-vpn/tinc:uml - Enable support for User Mode Linux Sockets
 net-vpn/tinc:vde - Enable Virtual Distributed Ethernet (VDE) based networking
@@ -7929,7 +7930,7 @@ sys-devel/llvm:sanitize - Build compiler-rt's sanitizers
 sys-devel/llvm:static-analyzer - Install the Clang static analyzer (requires USE=clang)
 sys-devel/sparse:gtk - Build the test-inspect utility (requires x11-libs/gtk+ version 2)
 sys-devel/sparse:llvm - Build the sparse-llvm utility
-sys-devel/sparse:xml - Build the c2xml utility (requires dev-libs/libxml2).
+sys-devel/sparse:xml - Build the c2xml utility (requires dev-libs/libxml2)
 sys-fabric/ofed:dapl - Add support for DAPL abstraction layer
 sys-fabric/ofed:diags - Add dignostic tools for infiniband
 sys-fabric/ofed:ibacm - Add support for userspace pre-connection services
@@ -7972,8 +7973,8 @@ sys-freebsd/freebsd-sources:build-kernel - Build and install a kernel (recommend
 sys-freebsd/freebsd-sources:dtrace - Enable DTrace support.
 sys-freebsd/freebsd-sources:zfs - Enable ZFS support.
 sys-freebsd/freebsd-ubin:ar - Build FreeBSD's ar and ranlib replacements based on libarchive. The toolchain will still use binutils' version but you can play with it. They have been renamed to freebsd-ar and freebsd-ranlib not to collide with binutils.
-sys-freebsd/freebsd-ubin:audit - Build auditing tools.
-sys-freebsd/freebsd-ubin:netware - Build libraries and tools to work with NetWare protocols (IPX and NCP).
+sys-freebsd/freebsd-ubin:audit - Build auditing tools
+sys-freebsd/freebsd-ubin:netware - Build libraries and tools to work with NetWare protocols (IPX and NCP)
 sys-freebsd/freebsd-ubin:zfs - Enable ZFS support (for fstat actually).
 sys-freebsd/freebsd-usbin:audit - Build auditing tools.
 sys-freebsd/freebsd-usbin:floppy - Enable floppy disk utilities (fdcontrol, fdformat, fdread, fdwrite).
@@ -8144,7 +8145,7 @@ sys-libs/uclibc:wordexp - Add support for word expansion (wordexp.h)
 sys-libs/uclibc-ng:rpc - Enable sun nis/rpc support (you should use libtirpc though)
 sys-libs/uclibc-ng:symlink-compat - Explicitly add sym links for libdl.so.0, libm.so.0, and friends for backward compatibility with sys-libs/uclibc-ng-1.0.17 and earlier
 sys-libs/zlib:minizip - include the minizip library for quick and dirty zip extraction
-sys-power/apcupsd:modbus - enable MODBUS support over USB
+sys-power/apcupsd:modbus - Enable MODBUS support over USB
 sys-power/cpupower:cpufreq_bench - Build and install the cpufreq_bench binary
 sys-power/nut:ipmi - Support IPMI-based UPSes.
 sys-power/nut:ups_drivers_al175 - Driver for Eltek UPS models with AL175 alarm module
@@ -8370,12 +8371,12 @@ www-client/seamonkey:ipc - Use inter-process communication between tabs and plug
 www-client/seamonkey:jemalloc - Enable or disable jemalloc
 www-client/seamonkey:roaming - Build roaming extension support (default on)
 www-client/seamonkey:skia - Enable the SKIA engine for 2D rendering as an alternative to cairo
-www-client/seamonkey:system-cairo - Use the system-wide x11-libs/cairo instead of bundled.
-www-client/seamonkey:system-harfbuzz - Use the system-wide media-libs/harfbuzz instead of bundled.
-www-client/seamonkey:system-icu - Use the sytem-wide dev-libs/icu instead of bundled.
-www-client/seamonkey:system-jpeg - Use the system-wide media-libs/libjpeg-turbo instead of bundled.
-www-client/seamonkey:system-libevent - Use the system-wide dev-libs/libevent instead of bundled.
-www-client/seamonkey:system-libvpx - Use the system-wide media-libs/libvpx instead of bundled.
+www-client/seamonkey:system-cairo - Use the system-wide x11-libs/cairo instead of bundled
+www-client/seamonkey:system-harfbuzz - Use the system-wide media-libs/harfbuzz instead of bundled
+www-client/seamonkey:system-icu - Use the sytem-wide dev-libs/icu instead of bundled
+www-client/seamonkey:system-jpeg - Use the system-wide media-libs/libjpeg-turbo instead of bundled
+www-client/seamonkey:system-libevent - Use the system-wide dev-libs/libevent instead of bundled
+www-client/seamonkey:system-libvpx - Use the system-wide media-libs/libvpx instead of bundled
 www-client/seamonkey:system-sqlite - Use the system-wide dev-db/sqlite installation with secure-delete enabled
 www-client/surf:savedconfig - Without a saved config.h, this package depends on net-misc/curl and x11-terms/st for a default download mechanism
 www-client/uget:aria2 - Enable support for net-misc/aria2 through xmlrpc. You'll find the plugin in the app's settings.
diff --git a/sci-calculators/Manifest.gz b/sci-calculators/Manifest.gz
index bc6459be601a..e37fe4f96503 100644
Binary files a/sci-calculators/Manifest.gz and b/sci-calculators/Manifest.gz differ
diff --git a/sci-calculators/units/Manifest b/sci-calculators/units/Manifest
index 57f84dcc73b7..51e3fbc0c98f 100644
--- a/sci-calculators/units/Manifest
+++ b/sci-calculators/units/Manifest
@@ -1,3 +1,3 @@
-DIST units-2.14.tar.gz 1177024 SHA256 9d33893d82f3ddd831d5822992007c40bcd0826ae67d3cbc96539951fb0a82e8 SHA512 3cd09a76fb1cccbafaa3e023c791740738c8347425b2645cad1fa768dee3ebde917602cf65988ee8922fed512ec0bc2367f68545450789fc6bf1a79f066a6986 WHIRLPOOL ae4c0297387e9d3e42ae556a5f528f9c6f1b6a75f5f90580c5b9729ccdea011962d0e891c13ed583a97167bb62d5d074ab3b695ffdd23304f72a62098ce87821
-DIST units-2.15.tar.gz 1178099 SHA256 25d6334fafc801e15b3b0388e207e1efc5d4ae88af6dc7b17d3913de6441f47c SHA512 3fd60acd12142ea3c20bf39184394f300a8284a8946beaf89a8bf2f87c77d8a1ab02189c8a2fd3f93d64517945136fe4ea671edd2d48ea9bae55f9a87b30423f WHIRLPOOL ce17241a949c32a602f1a90683a82af973d51bb2ffdea35d9e7d2f23857271aa05519ee4c22eff9c4df9db590115dfd097b1637c4ce58762eebc8afd5e493c95
-DIST units-2.16.tar.gz 1178197 SHA256 dcf3f78482a13b150fc6bf0f8d611510816a3424bc2b26229b85b1cadeb81686 SHA512 afca2bf313208db2d0a3f4e96fed7bb86a3e96030b420e1cfa68a140499b9a8f2ef8c166c1d608d03c9ca6260199569a67c67c623d8c6a4b8d52e9d5cb6e3091 WHIRLPOOL c3d483e9f1b9343716f3a1c041e4bf9cb4f75c088664c14dde96ec9cbed2add9bec1f448d1f0a9767c7e0d66e9eac6c306b2afe614d05dc845b5b213a162af5d
+DIST units-2.14.tar.gz 1177024 BLAKE2B e129e018e79e60eb3bd8f5c1afa693021ea7c4bfaa330fd0fc94046a5defc5d6f52faeb38b898cc95a7b6626fc6e97f5091d84c7c310842b68dc7f1b4b6c781d SHA512 3cd09a76fb1cccbafaa3e023c791740738c8347425b2645cad1fa768dee3ebde917602cf65988ee8922fed512ec0bc2367f68545450789fc6bf1a79f066a6986
+DIST units-2.15.tar.gz 1178099 BLAKE2B 4f7f7412e21b163302c03d0aa3963acb6cd7fc8e197ce39380ae6cf46d2f1520a73dc3003162831bec5ef2b9fcaaa3ce9b375cab75db353dbef46ae4ba32edb1 SHA512 3fd60acd12142ea3c20bf39184394f300a8284a8946beaf89a8bf2f87c77d8a1ab02189c8a2fd3f93d64517945136fe4ea671edd2d48ea9bae55f9a87b30423f
+DIST units-2.16.tar.gz 1178197 BLAKE2B 6de569cd70c8067be053c5acb0885f898b76252bf6bafbea5f8b4972eca0acb13adfb4b2bc70ef0a3df747ee31084076fea3d3199922f0c44fc8c6d08232192b SHA512 afca2bf313208db2d0a3f4e96fed7bb86a3e96030b420e1cfa68a140499b9a8f2ef8c166c1d608d03c9ca6260199569a67c67c623d8c6a4b8d52e9d5cb6e3091
diff --git a/sci-calculators/units/units-2.16.ebuild b/sci-calculators/units/units-2.16.ebuild
index 464c0c2fbaf5..2258f3aafd52 100644
--- a/sci-calculators/units/units-2.16.ebuild
+++ b/sci-calculators/units/units-2.16.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="FDL-1.3 GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="+units_cur"
 REQUIRED_USE="units_cur? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index ac28ea97b516..11b581a5dbbf 100644
Binary files a/sci-libs/Manifest.gz and b/sci-libs/Manifest.gz differ
diff --git a/sci-libs/nanoflann/Manifest b/sci-libs/nanoflann/Manifest
index 09abb93da95d..231a10156246 100644
--- a/sci-libs/nanoflann/Manifest
+++ b/sci-libs/nanoflann/Manifest
@@ -1 +1 @@
-DIST nanoflann-1.2.3.tar.gz 1157793 SHA256 5ef4dfb23872379fe9eb306aabd19c9df4cae852b72a923af01aea5e8d7a59c3 SHA512 01d5226fb669c9ef21e1bd36bddb07c7bf8bbbf9798e90bfa7966de4ae01e05c669c33a73d37340c41c79fcab81c91c3991077d799a211985b2d0a2a365a8878 WHIRLPOOL 2a1c9a21dbd7571e4c680a2b5e3636086df4e06142d885b390983228a3cf3d36f01d0389fe712f1d9a9106a55887353a1ea7c057a289c727e98b9bf5308c1b20
+DIST nanoflann-1.2.3.tar.gz 1157793 BLAKE2B e6b3947c5c99689da5d3759e0217deca691bada8089cdd1e3cd41902b0db2533908fab1ff5474851064d3f2ab6a5a70429320bbf432a0381df4aec0139a6b2f4 SHA512 01d5226fb669c9ef21e1bd36bddb07c7bf8bbbf9798e90bfa7966de4ae01e05c669c33a73d37340c41c79fcab81c91c3991077d799a211985b2d0a2a365a8878
diff --git a/sci-libs/nanoflann/nanoflann-1.2.3.ebuild b/sci-libs/nanoflann/nanoflann-1.2.3.ebuild
index e82a84965d8b..4db99558405a 100644
--- a/sci-libs/nanoflann/nanoflann-1.2.3.ebuild
+++ b/sci-libs/nanoflann/nanoflann-1.2.3.ebuild
@@ -7,27 +7,29 @@ inherit cmake-utils
 
 DESCRIPTION="C++ header-only library for Nearest Neighbor (NN) search wih KD-trees"
 HOMEPAGE="https://github.com/jlblancoc/nanoflann"
-SRC_URI="https://github.com/jlblancoc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+if [[ ${PV} = *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="git://github.com/jlblancoc/nanoflann.git"
+else
+	SRC_URI="https://github.com/jlblancoc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND="dev-cpp/eigen:*"
+RDEPEND="dev-cpp/eigen:3"
 DEPEND="${RDEPEND}"
 
 src_prepare() {
-	eapply_user
+	cmake-utils_src_prepare
 
 	# do not compile examples
-	sed -ie 's/add_subdirectory(examples)//g' CMakeLists.txt || die "sed failed"
+	cmake_comment_add_subdirectory examples
 }
 
 src_test() {
-	cd "${BUILD_DIR}" && emake -j1 test
-}
-
-src_compile() {
-	:
+	"${CMAKE_MAKEFILE_GENERATOR}" -C "${BUILD_DIR}" -j1 test
 }
diff --git a/sci-libs/nanoflann/nanoflann-9999.ebuild b/sci-libs/nanoflann/nanoflann-9999.ebuild
index 2c8467c00469..4db99558405a 100644
--- a/sci-libs/nanoflann/nanoflann-9999.ebuild
+++ b/sci-libs/nanoflann/nanoflann-9999.ebuild
@@ -8,11 +8,9 @@ inherit cmake-utils
 DESCRIPTION="C++ header-only library for Nearest Neighbor (NN) search wih KD-trees"
 HOMEPAGE="https://github.com/jlblancoc/nanoflann"
 
-if [[ ${PV} = *9999* ]]; then
+if [[ ${PV} = *9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="git://github.com/jlblancoc/nanoflann.git"
-	SRC_URI=""
-	KEYWORDS=""
 else
 	SRC_URI="https://github.com/jlblancoc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
@@ -22,20 +20,16 @@ LICENSE="BSD"
 SLOT="0"
 IUSE=""
 
-RDEPEND="dev-cpp/eigen:*"
+RDEPEND="dev-cpp/eigen:3"
 DEPEND="${RDEPEND}"
 
 src_prepare() {
-	eapply_user
+	cmake-utils_src_prepare
 
 	# do not compile examples
-	sed -ie 's/add_subdirectory(examples)//g' CMakeLists.txt || die "sed failed"
+	cmake_comment_add_subdirectory examples
 }
 
 src_test() {
-	cd "${BUILD_DIR}" && emake -j1 test
-}
-
-src_compile() {
-	:
+	"${CMAKE_MAKEFILE_GENERATOR}" -C "${BUILD_DIR}" -j1 test
 }
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 261922012e2e..fe13beabdad9 100644
Binary files a/sys-apps/Manifest.gz and b/sys-apps/Manifest.gz differ
diff --git a/sys-apps/adjtime/metadata.xml b/sys-apps/adjtime/metadata.xml
index f1525a5b549b..c73e68a6a643 100644
--- a/sys-apps/adjtime/metadata.xml
+++ b/sys-apps/adjtime/metadata.xml
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>ppc@gentoo.org</email>
-	<name>Gentoo Linux PowerPC Development</name>
-</maintainer>
-<longdescription>A perl script to adjust the tick on the Kurobox and 
- LinkStation hardware clock (required to keep an accurate clock).
- Should work on most hardware platforms.
-</longdescription>
+	<maintainer type="project">
+		<email>ppc@gentoo.org</email>
+		<name>Gentoo Linux PowerPC Development</name>
+	</maintainer>
+	<longdescription>
+		A perl script to adjust the tick on the Kurobox and
+		LinkStation hardware clock (required to keep an accurate clock).
+		Should work on most hardware platforms.
+	</longdescription>
 </pkgmetadata>
diff --git a/sys-apps/clrngd/Manifest b/sys-apps/clrngd/Manifest
index 41066c363957..8ce9a0eef64f 100644
--- a/sys-apps/clrngd/Manifest
+++ b/sys-apps/clrngd/Manifest
@@ -1 +1 @@
-DIST clrngd-1.0.3.tar.gz 97283 SHA256 9432765248548e2054389994ba44c87348a3a027f881ebeef2d2d2f73808388a SHA512 d752ddb2c8d902d3b8d24e02467eed8488f1349e08229dd396b2aca8e326db4bda9ed68def586d9c429b7a7b2fb1f1fbeae9eb354910e0ba4b29100b1bb512ac WHIRLPOOL 95d50813347d32f4cc044165b7092845e8f5e0999fdd5a619d0a3e858301b28bbb1f87ea663c88aa89abd038258a446a0e9d85fc1d66decdbb87076b23501ff7
+DIST clrngd-1.0.3.tar.gz 97283 BLAKE2B cafbe30d533cb5103bf64fb4991f1547ded634b3b1ea0702e6a6afb6df90b2ea443e927566bfecaf79bccdab70d15e49e1b8252d2f502ed4f1ebbcc5728aa5b3 SHA512 d752ddb2c8d902d3b8d24e02467eed8488f1349e08229dd396b2aca8e326db4bda9ed68def586d9c429b7a7b2fb1f1fbeae9eb354910e0ba4b29100b1bb512ac
diff --git a/sys-apps/clrngd/clrngd-1.0.3.ebuild b/sys-apps/clrngd/clrngd-1.0.3.ebuild
index eac515a1ff3c..6cc2a27825b2 100644
--- a/sys-apps/clrngd/clrngd-1.0.3.ebuild
+++ b/sys-apps/clrngd/clrngd-1.0.3.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 DESCRIPTION="Clock randomness gathering daemon"
 HOMEPAGE="http://echelon.pl/pubs/"
 SRC_URI="http://echelon.pl/pubs/${P}.tar.gz"
@@ -8,19 +10,14 @@ SRC_URI="http://echelon.pl/pubs/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="sys-devel/gcc"
-RDEPEND=""
 
-src_compile() {
-	econf --bindir=/usr/sbin || die
-	emake || die
+src_configure() {
+	econf --bindir="${EPREFIX}"/usr/sbin
 }
 
 src_install() {
-	make DESTDIR=${D} install || die "make install failed"
-	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README
-	newinitd ${FILESDIR}/clrngd-init.d clrngd
-	newconfd ${FILESDIR}/clrngd-conf.d clrngd
+	default
+
+	newinitd "${FILESDIR}"/${PN}-init.d ${PN}
+	newconfd "${FILESDIR}"/${PN}-conf.d ${PN}
 }
diff --git a/sys-apps/flashrom/metadata.xml b/sys-apps/flashrom/metadata.xml
index fbc371b02ad6..c8b0250d3ca5 100644
--- a/sys-apps/flashrom/metadata.xml
+++ b/sys-apps/flashrom/metadata.xml
@@ -50,17 +50,17 @@
 		<flag name="wiki">Enable wiki informations, like supported devices etc.</flag>
 	</use>
 	<longdescription lang="en">
-flashrom is a utility for identifying, reading, writing, verifying and erasing flash chips. It is designed to flash BIOS/EFI/coreboot/firmware/optionROM images on mainboards, network/graphics/storage controller cards, and various other programmer devices.
+		flashrom is a utility for identifying, reading, writing, verifying and erasing flash chips. It is designed to flash BIOS/EFI/coreboot/firmware/optionROM images on mainboards, network/graphics/storage controller cards, and various other programmer devices.
 
-    Supports more than 380 flash chips, 260 chipsets, 450 mainboards, 50 PCI devices, 12 USB devices and various parallel/serial port-based programmers.
-    Supports parallel, LPC, FWH and SPI flash interfaces and various chip packages (DIP32, PLCC32, DIP8, SO8/SOIC8, TSOP32, TSOP40, TSOP48, BGA and more)
-    No physical access needed, root access is sufficient (not needed for some programmers).
-    No bootable floppy disk, bootable CD-ROM or other media needed.
-    No keyboard or monitor needed. Simply reflash remotely via SSH.
-    No instant reboot needed. Reflash your chip in a running system, verify it, be happy. The new firmware will be present next time you boot.
-    Crossflashing and hotflashing is possible as long as the flash chips are electrically and logically compatible (same protocol). Great for recovery.
-    Scriptability. Reflash a whole pool of identical machines at the same time from the command line. It is recommended to check flashrom output and error codes.
-    Speed. flashrom is often much faster than most vendor flash tools.
-    Portability. Supports DOS, Linux, FreeBSD, NetBSD, OpenBSD, DragonFly BSD, Solaris, Mac OS X, and other Unix-like OSes. Partial Windows support is available (no internal programmer support at the moment, hence no "BIOS flashing").
+		Supports more than 380 flash chips, 260 chipsets, 450 mainboards, 50 PCI devices, 12 USB devices and various parallel/serial port-based programmers.
+		Supports parallel, LPC, FWH and SPI flash interfaces and various chip packages (DIP32, PLCC32, DIP8, SO8/SOIC8, TSOP32, TSOP40, TSOP48, BGA and more)
+		No physical access needed, root access is sufficient (not needed for some programmers).
+		No bootable floppy disk, bootable CD-ROM or other media needed.
+		No keyboard or monitor needed. Simply reflash remotely via SSH.
+		No instant reboot needed. Reflash your chip in a running system, verify it, be happy. The new firmware will be present next time you boot.
+		Crossflashing and hotflashing is possible as long as the flash chips are electrically and logically compatible (same protocol). Great for recovery.
+		Scriptability. Reflash a whole pool of identical machines at the same time from the command line. It is recommended to check flashrom output and error codes.
+		Speed. flashrom is often much faster than most vendor flash tools.
+		Portability. Supports DOS, Linux, FreeBSD, NetBSD, OpenBSD, DragonFly BSD, Solaris, Mac OS X, and other Unix-like OSes. Partial Windows support is available (no internal programmer support at the moment, hence no "BIOS flashing").
 	</longdescription>
 </pkgmetadata>
diff --git a/sys-apps/inxi/Manifest b/sys-apps/inxi/Manifest
index ca0dc22bf90a..234896d8854b 100644
--- a/sys-apps/inxi/Manifest
+++ b/sys-apps/inxi/Manifest
@@ -1,5 +1,6 @@
 DIST inxi-2.3.34_p20170805.tar.gz 449836 SHA256 c051cea0f6f1113406e3b2a776c841649d4c8cfbbdaf4a568a25bbb497447e44 SHA512 c3b2a5d91a0fa0840ad602e6a147bc65dec83c966c8fc2a72e39fe6737ef4e0d57edcb5e47602311a8eedd2fb6d51619f4e44ad2be4ce8b5e259049e2c238a18 WHIRLPOOL 211d0ed25c061e7cacd09a6750dde8c0ca03999cf33ee35c4423bd892e5e363564307f4ce61a40948706da3a4e2b232a53e379a5c78ba62b891b0f45b895c98d
 DIST inxi-2.3.36_p20170816.tar.gz 452116 SHA256 d5648d2b6a32da364bf5d9f9eb3b275a1512a2143f13433caace97b6b42e1fde SHA512 9326fd8787449c6b52fad3188086a59deb2614100ccf8c49023c78d21ff4ab08a434ba1b95bc48f8867499e30179df602ff53934611bbe952b223c8bdadc40bf WHIRLPOOL 85952282335221856aeb6f2b844df89fc0c7a852a2676aad333bd13a42d48ef1bf06da1a3309bb93355221b0e976679ab8b5076da6cae9d57ce6009c1af05a00
 DIST inxi-2.3.37.tar.gz 454862 SHA256 5c728fefbe33800ab7ce8d5536f52fbb0aff560f48ba525f148fc48e034fe1c1 SHA512 0a47cd920e80c518d6d6987945eb9526ee1ce7f6bf62754196e05736db44fbced615d29b6e12787bf55f769ed9963dff0088c96f9dbe13dae7f57744b0172802 WHIRLPOOL e4271b8d6493e4d48ad15fc8d5d4bb86fd3251bb1fc8b2292c2f538076f29b53aef156f97233bbbb0a9acae52fa987672797832fe33f29fd6a8b40b154608de5
-DIST inxi-2.3.43.tar.gz 457941 SHA256 b2f5c9b751d6cc92fb035a91ad0249d22936862eaa8786db2dc314625e973298 SHA512 33c9ae788ab139f5a2511a3b5bd51276dafb3b847920345b02ad717e1da71f9a78fffc9e55b1085c91d014c2da940b1c64f72db9b59f7bb8d7e442bbbc0bd947 WHIRLPOOL 2debec1c84f0a97b05c0e93e098716816377c4bb7ed4b1a3ce3caad76665d71d8f13ebbee6403a333121d7ae7a8a8d3e3d9e93314eb3d07da716b542c86c28d2
+DIST inxi-2.3.43.tar.gz 457941 BLAKE2B cbcdb3061643ba3516c93dc13e5e0e25d0740e4aa39519643467b03913a10e4ad1eed9cd52f62e7dd344b70f41124f248e48e7d1abacd55dbcb1401b07b1a88b SHA512 33c9ae788ab139f5a2511a3b5bd51276dafb3b847920345b02ad717e1da71f9a78fffc9e55b1085c91d014c2da940b1c64f72db9b59f7bb8d7e442bbbc0bd947
+DIST inxi-2.3.47.tar.gz 462826 BLAKE2B c825b80b5b05fabfad22cbcee685d5c5caa7835493555f1e930dfc11aac35fbe7529fa4738d41dfaae4c6130211d42f576d77ba9f764864bfe89b70a4c0d602a SHA512 be2e0f1880e1b7604acd1f7b8f6595536e12fbe0998f85a195e0892bf1b9942c08f791779f99526a337d097259ea8d3cd0b04da465f8deb1b30bbba9fea4dc4e
 DIST inxi-2.3.8_p20170114.tar.gz 422139 SHA256 ecad1522c786555c7b11d3066878f94fc276b205fb63faad06c9ff6f708bf558 SHA512 400d6cceb9282f46f1de30d436f334813d725867e0614a0ef694dc33066139dd7daf4730c007186b7037705f5debb72fa0ad9357619cdbc93152b4d585ba17e6 WHIRLPOOL 0734dc38929c404c2ef08017606558aa55ccdc8c290adec8640db30e800d0ba4b1c8c89d3f9c221b5ea6e02f1f0ca8c429326fe8bec57e5c7a75999c95b24a23
diff --git a/sys-apps/inxi/inxi-2.3.47.ebuild b/sys-apps/inxi/inxi-2.3.47.ebuild
new file mode 100644
index 000000000000..948a5917d27a
--- /dev/null
+++ b/sys-apps/inxi/inxi-2.3.47.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_COMMIT="0a9ac17c8ea0b0ab61ba0ad50b34c9a4765ed7a0"
+# ^^ because upstream refuses to tag commits with version numbers
+
+DESCRIPTION="The CLI inxi collects and prints hardware and system information"
+HOMEPAGE="https://github.com/smxi/inxi"
+SRC_URI="https://github.com/smxi/${PN}/tarball/${MY_COMMIT} -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="bluetooth hddtemp opengl"
+
+DEPEND=""
+RDEPEND=">=app-shells/bash-3.0
+	sys-apps/pciutils
+	sys-apps/usbutils
+	bluetooth? ( net-wireless/bluez )
+	hddtemp? ( app-admin/hddtemp )
+	opengl? ( x11-apps/mesa-progs )
+	"
+
+S="${WORKDIR}/smxi-${PN}-${MY_COMMIT:0:7}"
+
+src_install() {
+	dobin ${PN}
+	unpack ./${PN}.1.gz
+	doman ${PN}.1
+}
diff --git a/sys-apps/lomoco/metadata.xml b/sys-apps/lomoco/metadata.xml
index c7bb54273d0f..513ab2ac015b 100644
--- a/sys-apps/lomoco/metadata.xml
+++ b/sys-apps/lomoco/metadata.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>blshkv@pentoo.ch</email>
-	<name>Anton Bolshakov</name>
-	<description>Proxy maintainer. Assign bugs to him</description>
-  </maintainer>
-<maintainer type="project">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
-  </maintainer>
+	<maintainer type="person">
+		<email>blshkv@pentoo.ch</email>
+		<name>Anton Bolshakov</name>
+		<description>Proxy maintainer. Assign bugs to him</description>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/sys-apps/lssbus/Manifest b/sys-apps/lssbus/Manifest
index a6d70d8c6d4c..6f33d007cf49 100644
--- a/sys-apps/lssbus/Manifest
+++ b/sys-apps/lssbus/Manifest
@@ -1 +1 @@
-DIST lssbus-0.1.tar.gz 13576 SHA256 d88a03ecfeef505cfbe4444013ea46832cf0a3297c34b87e78c494b0e31896e0 SHA512 1eb294329b628463e8914303a60454221ed17554c94a37bf836b1b0ea797b88abc4853e74a0def50e95bc59fefd85f6acd416a5dd06833cf2049a8ee98bd7e80 WHIRLPOOL 1dfb35ed7b17956d6abdb36ecce88db8a33c25d2a75d0e9452cda495ebe8d50e7fc121aa19f36435d56d1993f526b9db7a8f2df85a6b69470d8437ac780bd6c2
+DIST lssbus-0.1.tar.gz 13576 BLAKE2B ee30ac6463355ce1f8a402af464ad2d6e07070f9227fa9efb9cf7427a6c00b009dce113dbce4955d28a876edaf2f70c0d562ea90cd3b354736dde3c95faaba15 SHA512 1eb294329b628463e8914303a60454221ed17554c94a37bf836b1b0ea797b88abc4853e74a0def50e95bc59fefd85f6acd416a5dd06833cf2049a8ee98bd7e80
diff --git a/sys-apps/lssbus/lssbus-0.1.ebuild b/sys-apps/lssbus/lssbus-0.1.ebuild
index bbed46cf60e0..76bb56f21acf 100644
--- a/sys-apps/lssbus/lssbus-0.1.ebuild
+++ b/sys-apps/lssbus/lssbus-0.1.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 DESCRIPTION="Small utility for Linux/SPARC that list devices on SBUS"
 HOMEPAGE="https://people.redhat.com/tcallawa/lssbus/"
 SRC_URI="https://people.redhat.com/tcallawa/lssbus/${P}.tar.gz"
@@ -15,5 +17,5 @@ RDEPEND=""
 
 src_install() {
 	dosbin lssbus
-	dodoc COPYING README
+	einstalldocs
 }
diff --git a/sys-apps/man-pages/Manifest b/sys-apps/man-pages/Manifest
index 3c72e7f6057e..26ae38157f5f 100644
--- a/sys-apps/man-pages/Manifest
+++ b/sys-apps/man-pages/Manifest
@@ -1,6 +1,7 @@
-DIST man-pages-4.09.tar.xz 1521560 SHA256 a574a08e4a62a24dc639cb4ee3e7aa68e7cd8ef2c14a5d54b90d09ac137e809c SHA512 695f90b9f4721d041de0441e240afce88e49f4ea5ffea855262da3cdd0f3f2b6401f2728786da3afa2245aef84d41c0c449415e7e78e408b69c9214ddb4c74ad WHIRLPOOL 6b937d95cbefddf94658a54ec8cc820f7a970830ecc0857cc36577946586084a13fadc7cbcf48c5eddc31b6cc9b2f3b08509b33b1b96e023f0e07927d8c9ec97
+DIST man-pages-4.09.tar.xz 1521560 BLAKE2B a1a8e9e926940b48cdf17d682b38ff761cb3e5a5799bb192fba3f8715b7094551d1dca02d4fa9c70b1c6a198a5d9308a4435b80291130ffb9485e55b79cfe231 SHA512 695f90b9f4721d041de0441e240afce88e49f4ea5ffea855262da3cdd0f3f2b6401f2728786da3afa2245aef84d41c0c449415e7e78e408b69c9214ddb4c74ad
 DIST man-pages-4.10.tar.xz 1556948 SHA256 7395dfc391d545385a998d23df9accb60f2020451c53940eaf8a07b6ea8a63fa SHA512 6c5b8e1339a02054a5346ca3ff665c414ef178e69fe0d064d4ad7dc372ba364df2753bf605a682cc366c12661c42b9fd17567c72a0f24173f9b086d79cf354d4 WHIRLPOOL d15515e5525797bb40b9d640ad130e82998d2a07e8464231ad422f5b2e38228c60616223cdb8bbb208edef6eed509374efe10db8ec414ca7157168836a1bbc0a
-DIST man-pages-4.11.tar.xz 1574380 SHA256 adde80495f5efb26d077f4e5309bafdc4859e080b7529263720f7cb5f403f524 SHA512 cc1282467255d5c078b099ab6dbc407c5f56fa66fb3f5789286bc66c98b229cae88bf8afdafa7c9609a37c87cdb1401bb381cec25c64690ab69faf4d00787187 WHIRLPOOL 31fb2e76223861fe03d2c00a25d161716c0b603dff41731ee8665856ecc6625e8b5d568e17e40453ac12ca7ee1ac9b68b01a5394c4c61b0f2b104280d4cd1b23
-DIST man-pages-4.12.tar.xz 1583664 SHA256 6f6d79d991fed04e16e7c7a15705304b0b9d51de772c51c57428555039fbe093 SHA512 03ab6fb4d3136ef31add16859706f965f954249bd0a44250c8a081b3e1260dce74d50112f1f56af079c08c46049aeaa71b48ccb7d1a3e57a1fc4a495c38647ce WHIRLPOOL 698112ec2b53922bdae7055f72c68310466d1541da6ae111be400a09c5c6c43bc6fecbc2ec25390160dfe8d788e51fbe5aad8d535f9570ce2f75dfbe82bee399
+DIST man-pages-4.11.tar.xz 1574380 BLAKE2B 52f55bda9452d7c1f5217b977fb37739c6e33d0301683d40e1274013604ba55c00e1f64a1404c8790f41cf07fd6c00885bb25a9f1ce0ab21a99efe1f354e10b4 SHA512 cc1282467255d5c078b099ab6dbc407c5f56fa66fb3f5789286bc66c98b229cae88bf8afdafa7c9609a37c87cdb1401bb381cec25c64690ab69faf4d00787187
+DIST man-pages-4.12.tar.xz 1583664 BLAKE2B 424126b2822e3a61ca7bdcae85af85ccb901284e71cb245806cc48261016af03d9d4397a9af130fe155409ff028fcc2acc37ae210343a7cfe8d3f4403c231738 SHA512 03ab6fb4d3136ef31add16859706f965f954249bd0a44250c8a081b3e1260dce74d50112f1f56af079c08c46049aeaa71b48ccb7d1a3e57a1fc4a495c38647ce
 DIST man-pages-4.13.tar.xz 1593424 SHA256 d5c005c5b653248ab6680560de00ea8572ff39e48a57bd5be1468d986a0631bf SHA512 86479372cbe2ba5fcad3e2049f52ec788a4aa2d8056cadf7b248eaa776064e1c9387a42d0a77f4bde4385214c11aac117b1e99745459260ca639c656c01698b7 WHIRLPOOL 6d2180f32d31d52eba2d82768edf384593a85c831892ce195f1e3f4b32ff047b6ab1dee927f61b942486b9e83c435e774773d7618dfc96b5736bfea0aae2f11e
-DIST man-pages-gentoo-2.tar.bz2 5141 SHA256 b7d9423c2069e587deb7671273d4a1ffed7d31b9f95a689b128a759d636762f0 SHA512 6e6524b8ad6f1b8c9b147665ee32af49e05603dac61d433acd6b4f1164adef27cd542898f272b07d8659725013dac59c7f34a858968cc054a4785c945e14a770 WHIRLPOOL dcacb319a54ccd2a965786c816684de286581dee6f7b3f8ba4c97cc368e2e50abc92aad403dbdb7b0c15764accb06cd562046bcf14229ad12be242bb2bc7f651
+DIST man-pages-4.14.tar.xz 1611348 BLAKE2B d06d6d5bf67f5a17ca685bb1a6742a4d300791c1ed715372fa9bacf3006cd73c4b43434ff7c0a21e3a15082ca1bee91c8559751225eed2946da23c6f4d66e71d SHA512 d7163aacc6c3da914182d685d459d24ad60182e2cc528d72b08b565a9e2901ec319c8b44aef9b7e20838e146e159834482c62ba1b65823d5a06794283ebef41f
+DIST man-pages-gentoo-2.tar.bz2 5141 BLAKE2B c5c7956ab47c8a473e258b1902d5d19d9eb2e9d01786e907d9c3ba691c2a506834ed96cd1f54e8d8415e65d4fea0056659537f0faffe68fcbed33aa728a5e61e SHA512 6e6524b8ad6f1b8c9b147665ee32af49e05603dac61d433acd6b4f1164adef27cd542898f272b07d8659725013dac59c7f34a858968cc054a4785c945e14a770
diff --git a/sys-apps/man-pages/man-pages-4.14.ebuild b/sys-apps/man-pages/man-pages-4.14.ebuild
new file mode 100644
index 000000000000..257d28c42577
--- /dev/null
+++ b/sys-apps/man-pages/man-pages-4.14.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+GENTOO_PATCH=2
+
+DESCRIPTION="A somewhat comprehensive collection of Linux man pages"
+HOMEPAGE="https://www.kernel.org/doc/man-pages/"
+SRC_URI="mirror://kernel/linux/docs/man-pages/Archive/${P}.tar.xz
+	mirror://kernel/linux/docs/man-pages/${P}.tar.xz
+	mirror://gentoo/man-pages-gentoo-${GENTOO_PATCH}.tar.bz2
+	https://dev.gentoo.org/~cardoe/files/man-pages-gentoo-${GENTOO_PATCH}.tar.bz2"
+
+LICENSE="man-pages GPL-2+ BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+IUSE_L10N=" da de fr it ja nl pl ro ru zh-CN"
+IUSE="nls ${IUSE_L10N// / l10n_}"
+RESTRICT="binchecks"
+
+# Block packages that used to install colliding man pages #341953 #548900 #612640 #617462
+RDEPEND="virtual/man
+	!<sys-apps/keyutils-1.5.9-r3
+	!<sys-apps/attr-2.4.47-r2
+	!<dev-libs/libaio-0.3.109-r2
+	!<dev-libs/libbsd-0.8.3-r1"
+PDEPEND="nls? (
+	l10n_da? ( app-i18n/man-pages-da )
+	l10n_de? ( app-i18n/man-pages-de )
+	l10n_fr? ( app-i18n/man-pages-fr )
+	l10n_it? ( app-i18n/man-pages-it )
+	l10n_ja? ( app-i18n/man-pages-ja )
+	l10n_nl? ( app-i18n/man-pages-nl )
+	l10n_pl? ( app-i18n/man-pages-pl )
+	l10n_ro? ( app-i18n/man-pages-ro )
+	l10n_ru? ( app-i18n/man-pages-ru )
+	l10n_zh-CN? ( app-i18n/man-pages-zh_CN )
+	)
+	sys-apps/man-pages-posix"
+
+src_configure() { :; }
+
+src_compile() { :; }
+
+src_install() {
+	emake install prefix="${EPREFIX}/usr" DESTDIR="${D}"
+	dodoc man-pages-*.Announce README Changes*
+
+	# Override with Gentoo specific or additional Gentoo pages
+	cd "${WORKDIR}"/man-pages-gentoo
+	doman */*
+	dodoc README.Gentoo
+}
diff --git a/sys-apps/secilc/metadata.xml b/sys-apps/secilc/metadata.xml
index caa92457aea0..a2b6537d80f6 100644
--- a/sys-apps/secilc/metadata.xml
+++ b/sys-apps/secilc/metadata.xml
@@ -6,8 +6,8 @@
 		<name>SELinux Team</name>
 	</maintainer>
 	<longdescription>
-        The SELinux CIL Compiler is a compiler that converts the CIL language as
-        described on the CIL design wiki into a kernel binary policy file.
+		The SELinux CIL Compiler is a compiler that converts the CIL language as
+		described on the CIL design wiki into a kernel binary policy file.
 	</longdescription>
 	<upstream>
 		<remote-id type="github">SELinuxProject/selinux</remote-id>
diff --git a/sys-auth/Manifest.gz b/sys-auth/Manifest.gz
index 6aac0c4f71f1..40d80136db00 100644
Binary files a/sys-auth/Manifest.gz and b/sys-auth/Manifest.gz differ
diff --git a/sys-auth/consolekit/Manifest b/sys-auth/consolekit/Manifest
index c320c5cc6f75..4dd2f7ee0795 100644
--- a/sys-auth/consolekit/Manifest
+++ b/sys-auth/consolekit/Manifest
@@ -1,5 +1,5 @@
-DIST ConsoleKit-0.4.6.tar.xz 366572 SHA256 b41d17e06f80059589fbeefe96ad07bcc564c49e65516da1caf975146475565c SHA512 54955e3e83778a9216846104da8762fd50a37190e209127dd5d211e2227da617e14f6f5c1359905396d299656e526d14e1187b28eaff7d0ae1d7563dc8d9b46d WHIRLPOOL ebf36b109b4c646d0b874f6b8e2ae9e2d190022ee9b6feff6cbb6b9203c80401c538cc3ca674fa7bde4f07e658d5460864e9784c1e0249d49b4784725a4e05c7
-DIST ConsoleKit2-1.1.0.tar.bz2 630178 SHA256 a40d92358aca9f627a224dca674090e310423b00ed63fc06482997611661b69b SHA512 14ded07d4140e7a31132de21e84c2878475676b8c98f72b42340708972ed384abb9ba9380d74719718fc220c001387c788cf709cd15f8b19d598467dfe8a57df WHIRLPOOL 8f08d81576b5121b2da6cd94b3b5675ea55dce17997b035d0ba451c011b101f9e315e983b20610ee022ee286b50a7b13e2508584b9c08dba0c6cda20b8801a63
+DIST ConsoleKit-0.4.6.tar.xz 366572 BLAKE2B ab4c277fd47b8f99ce8c5a67de86e89b1bdd8d6a5a8682dd436feefec76f7902e71c05d9d22d52c297d3294a945f057d53f18c9c9b7d29c84aa7c26665b05fee SHA512 54955e3e83778a9216846104da8762fd50a37190e209127dd5d211e2227da617e14f6f5c1359905396d299656e526d14e1187b28eaff7d0ae1d7563dc8d9b46d
+DIST ConsoleKit2-1.1.0.tar.bz2 630178 BLAKE2B 20d1994a19fbe03d411ac5437f77b75571fbdc19478100676e51e2a1232c643f4b0c86125b5bf1d42aeb5cfb7c8b34601221d674ac27d9bf3112fcd8a83afacb SHA512 14ded07d4140e7a31132de21e84c2878475676b8c98f72b42340708972ed384abb9ba9380d74719718fc220c001387c788cf709cd15f8b19d598467dfe8a57df
 DIST ConsoleKit2-1.1.2.tar.bz2 1125567 SHA256 f4b26b45edf7416ed76052b8f85ea05b7b560c744edee8042575667528bc1f24 SHA512 fadca85e05c176b06ead40fba5c068d497bf69bcc322287363d0c27cdd6627b758295db1ef534b908c0e6240486430d8cb36660b4d71216a60d19a52d6d0db39 WHIRLPOOL b9655418498cb2b63a30d6d1a56f6afe0adf8f6ae3a6aa97fc55da8288fae588deea04ab868f0ef524e185696ad87a35aca6de8eb4e6cb32bc4ba729040e0cbb
 DIST ConsoleKit2-1.2.0.tar.bz2 1125402 SHA256 d6ea13b306557a76519388de39bf7f1a1ea9010af147fad4fb3131ce634bd8b3 SHA512 c0f6e629b7229c2ffaafe8da899970b48c8372402447af18560fffd8804d9ab91a4ad2eb82c8f648a14807f8ccc5fb1ab4366de14faa8a2d5fb3767a6a4253f7 WHIRLPOOL 46c463fbfafd188dcaecc61f3ce83599a746e18b4c3ea129a205fec24927cc80958decf95913de679ddded0120e15fb631dcdeb08fd09a0029350b70b8b8ecd9
-DIST consolekit_0.4.6-4.debian.tar.gz 12192 SHA256 6d4dd5e13a76454b4bab27ab6b407718cd77616afd2b1af7cb8d947c1323b802 SHA512 f7fc5965b1f495d16a8ca167940431bc2569e9bde9e4a356b9c9ed00c2825db61da7b6db3d434d977fff72b3aaef30c455a365b9eba282a887a523753613b58f WHIRLPOOL 961a918c21259e24c68c7a5bf93964825b891ea207c088fecab61f81434012dc8925fca83b74518cfc9cf42f2c4a87eba7518c0829f663716ca0e11e38c856c9
+DIST consolekit_0.4.6-4.debian.tar.gz 12192 BLAKE2B e88ed907ea3ceecb9ac399618614b1aa5d7eb2c46a706451d78e4ec1598dee5a02d6c5a1b0dd678f6bed4c25277884ec6969a23f8181ef3d8ede94452b6570db SHA512 f7fc5965b1f495d16a8ca167940431bc2569e9bde9e4a356b9c9ed00c2825db61da7b6db3d434d977fff72b3aaef30c455a365b9eba282a887a523753613b58f
diff --git a/sys-auth/consolekit/consolekit-1.1.2.ebuild b/sys-auth/consolekit/consolekit-1.1.2.ebuild
index cac339fbcb5f..cbdca3a88c81 100644
--- a/sys-auth/consolekit/consolekit-1.1.2.ebuild
+++ b/sys-auth/consolekit/consolekit-1.1.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${MY_PN}/${MY_PN}/releases/download/${PV}/${MY_P}.ta
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="acl cgroups debug doc evdev kernel_linux pam pm-utils policykit selinux test udev"
 
 COMMON_DEPEND=">=dev-libs/glib-2.40:2=[dbus]
diff --git a/sys-auth/nss_ldap/metadata.xml b/sys-auth/nss_ldap/metadata.xml
index 49fcdac51aec..a0a614c93aad 100644
--- a/sys-auth/nss_ldap/metadata.xml
+++ b/sys-auth/nss_ldap/metadata.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-  <email>ldap-bugs@gentoo.org</email>
-  <name>Please assign bugs to this mail alias.</name>
-</maintainer>
-<maintainer type="person">
-  <email>robbat2@gentoo.org</email>
-  <name>Robin H. Johnson</name>
-</maintainer>
-<maintainer type="person">
-	<email>prometheanfire@gentoo.org</email>
-</maintainer>
+	<maintainer type="project">
+		<email>ldap-bugs@gentoo.org</email>
+		<name>Please assign bugs to this mail alias.</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>robbat2@gentoo.org</email>
+		<name>Robin H. Johnson</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>prometheanfire@gentoo.org</email>
+	</maintainer>
 </pkgmetadata>
diff --git a/sys-auth/pam_passwdqc/metadata.xml b/sys-auth/pam_passwdqc/metadata.xml
index 6d9cd6a9f8eb..a90add5acf32 100644
--- a/sys-auth/pam_passwdqc/metadata.xml
+++ b/sys-auth/pam_passwdqc/metadata.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-<email>pam-bugs@gentoo.org</email>
-</maintainer>
-<longdescription>
-   Password strength checking for PAM aware password changing programs. This is an alternative to the default cracklib.
-</longdescription>
-<longdescription lang="ja">
-	パスワード変更プログラムに反応する PAM のパスワード強度検査機能です。これはデフォルトの cracklib の代替です。
-</longdescription>
+	<maintainer type="project">
+		<email>pam-bugs@gentoo.org</email>
+	</maintainer>
+	<longdescription>
+		Password strength checking for PAM aware password changing programs. This is an alternative to the default cracklib.
+	</longdescription>
+	<longdescription lang="ja">
+		パスワード変更プログラムに反応する PAM のパスワード強度検査機能です。これはデフォルトの cracklib の代替です。
+	</longdescription>
 </pkgmetadata>
diff --git a/sys-auth/polkit/Manifest b/sys-auth/polkit/Manifest
index 6b6923d42fd4..39836f8aa1a1 100644
--- a/sys-auth/polkit/Manifest
+++ b/sys-auth/polkit/Manifest
@@ -1 +1 @@
-DIST polkit-0.113.tar.gz 1448865 SHA256 e1c095093c654951f78f8618d427faf91cf62abdefed98de40ff65eca6413c81 SHA512 ab177c89a20eeb2978ddbe28afb205d3619f9c5defe833eb68a85e71a0f2c905367f1295cbbfb85da5eafdd661bce474d5d84aca9195cd425a18c9b4170eb5f9 WHIRLPOOL 106db7e6085a4ce49da44929138671eff2fd6007c80533518abe2d91ede9242b1e3cd0a1801190eeac5d4d5c1e978a30a18e47a6b604497b38853fa60c935a81
+DIST polkit-0.113.tar.gz 1448865 BLAKE2B 93cb6abf03d0de193e9f64b953bee40faf3bd07cf6f86beb4f84edd740dedc0bcf7a1ffd6b3a1a816e5adad0ee59536dacae3d991add4c4965cc6a98566b7470 SHA512 ab177c89a20eeb2978ddbe28afb205d3619f9c5defe833eb68a85e71a0f2c905367f1295cbbfb85da5eafdd661bce474d5d84aca9195cd425a18c9b4170eb5f9
diff --git a/sys-auth/polkit/polkit-0.113-r4.ebuild b/sys-auth/polkit/polkit-0.113-r4.ebuild
index b2be07dae961..edea2465225e 100644
--- a/sys-auth/polkit/polkit-0.113-r4.ebuild
+++ b/sys-auth/polkit/polkit-0.113-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.freedesktop.org/software/${PN}/releases/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
 IUSE="elogind examples gtk +introspection jit kde nls pam selinux systemd test"
 
 REQUIRED_USE="?? ( elogind systemd )"
diff --git a/sys-auth/rtkit/Manifest b/sys-auth/rtkit/Manifest
index fa3e050092d3..93133abc2da0 100644
--- a/sys-auth/rtkit/Manifest
+++ b/sys-auth/rtkit/Manifest
@@ -1 +1 @@
-DIST rtkit-0.11.tar.xz 126748 SHA256 68859108cff6410901502b58365eb7607da37110a06b837762f771735f58acd0 SHA512 4641af965dc64c0f498ae469fbee1ceb337204fa7d778fbbb41f2b5c5e88947e633c7e9ad037274fdd778c3c097a4a1dbb0b2add287d74eccbcd2d357cb2da22 WHIRLPOOL 7036f2811aeef28dd7680f24fcf16e2cf8708937d86a0dfcd1411fcae469be3fe673b12dc640f9cda9be951ab2879f2b7ec2374577e7a0b532c59d8abde176b5
+DIST rtkit-0.11.tar.xz 126748 BLAKE2B e989f1fb9e33c2e06d7eedbe0aab45982d458b6a80aa8ba9b05ae94ed048ef1351d30f8800859a08d8bb0a53891e7b63f6bda6308b4521da10a61182ca3921f9 SHA512 4641af965dc64c0f498ae469fbee1ceb337204fa7d778fbbb41f2b5c5e88947e633c7e9ad037274fdd778c3c097a4a1dbb0b2add287d74eccbcd2d357cb2da22
diff --git a/sys-auth/rtkit/rtkit-0.11-r2.ebuild b/sys-auth/rtkit/rtkit-0.11-r2.ebuild
index 3558c4d3271f..96647b3425dc 100644
--- a/sys-auth/rtkit/rtkit-0.11-r2.ebuild
+++ b/sys-auth/rtkit/rtkit-0.11-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://0pointer.de/public/${P}.tar.xz"
 
 LICENSE="GPL-3 BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sh ~sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sh sparc x86"
 IUSE=""
 
 RDEPEND="
diff --git a/sys-auth/sssd/metadata.xml b/sys-auth/sssd/metadata.xml
index 7c6b99de0663..aece62d44f65 100644
--- a/sys-auth/sssd/metadata.xml
+++ b/sys-auth/sssd/metadata.xml
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-  <email>hwoarang@gentoo.org</email>
-  <name>Markos Chandras</name>
-</maintainer>
-<use>
-	<flag name="acl"> Build and use the cifsidmap plugin</flag>
-	<flag name="augeas">Build internal configuration library</flag>
-	<flag name="locator">Install sssd's Kerberos plugin</flag>
-	<flag name="netlink">Add support for netlink protocol via <pkg>dev-libs/libnl</pkg></flag>
-	<flag name="nfsv4">Add support for the nfsv4 idmapd plugin provided by <pkg>net-libs/libnfsidmap</pkg></flag>
-	<flag name="manpages">Build man pages with <pkg>dev-libs/libxslt</pkg></flag>
-	<flag name="autofs">Build helper to let <pkg>net-fs/autofs</pkg> use sssd provided information</flag>
-	<flag name="ssh">Build helper to let <pkg>net-misc/openssh</pkg> use sssd provided information</flag>
-	<flag name="sudo">Build helper to let <pkg>app-admin/sudo</pkg> use sssd provided information</flag>
-</use>
+	<maintainer type="person">
+		<email>hwoarang@gentoo.org</email>
+		<name>Markos Chandras</name>
+	</maintainer>
+	<use>
+		<flag name="acl"> Build and use the cifsidmap plugin</flag>
+		<flag name="augeas">Build internal configuration library</flag>
+		<flag name="locator">Install sssd's Kerberos plugin</flag>
+		<flag name="netlink">Add support for netlink protocol via <pkg>dev-libs/libnl</pkg></flag>
+		<flag name="nfsv4">Add support for the nfsv4 idmapd plugin provided by <pkg>net-libs/libnfsidmap</pkg></flag>
+		<flag name="manpages">Build man pages with <pkg>dev-libs/libxslt</pkg></flag>
+		<flag name="autofs">Build helper to let <pkg>net-fs/autofs</pkg> use sssd provided information</flag>
+		<flag name="ssh">Build helper to let <pkg>net-misc/openssh</pkg> use sssd provided information</flag>
+		<flag name="sudo">Build helper to let <pkg>app-admin/sudo</pkg> use sssd provided information</flag>
+	</use>
 </pkgmetadata>
diff --git a/sys-block/Manifest.gz b/sys-block/Manifest.gz
index 06fd6c280248..9df26b767d4c 100644
Binary files a/sys-block/Manifest.gz and b/sys-block/Manifest.gz differ
diff --git a/sys-block/qla-fc-firmware/Manifest b/sys-block/qla-fc-firmware/Manifest
index 8136783cfd5c..bfb03dc085e1 100644
--- a/sys-block/qla-fc-firmware/Manifest
+++ b/sys-block/qla-fc-firmware/Manifest
@@ -1 +1 @@
-DIST qla-fc-firmware-20101015.tar.bz2 3237889 SHA256 e2951f8a130350ca38990afb60d16c4ea3262de5f9a7d9a75c88db04095bb6cb SHA512 19cd38a2a146cc3147840a2c87c0f44996896ff1b1961d1d858d054db890d6808c89bfe93e82a54536933180da3b8cc8e54a5f57d9c9edcb3129a11dbd394342 WHIRLPOOL 02e523b03e193b8473f89eab3de1914a92e67a4ddea324629b0ccf14fd0227b66d17587567f821262a2d535ca49e612b503eebdc198429eaa39b201669c6eb56
+DIST qla-fc-firmware-20101015.tar.bz2 3237889 BLAKE2B cc20a4fcebd851ef3aac09a89f431be0852cf10ec736a09cede0e96632c9282dffe23c230a718e3864bef86fbf15772c3e513746126df2ecda0366833ee91eea SHA512 19cd38a2a146cc3147840a2c87c0f44996896ff1b1961d1d858d054db890d6808c89bfe93e82a54536933180da3b8cc8e54a5f57d9c9edcb3129a11dbd394342
diff --git a/sys-block/qla-fc-firmware/qla-fc-firmware-20101015.ebuild b/sys-block/qla-fc-firmware/qla-fc-firmware-20101015.ebuild
index 67ef202859f6..520977c3787e 100644
--- a/sys-block/qla-fc-firmware/qla-fc-firmware-20101015.ebuild
+++ b/sys-block/qla-fc-firmware/qla-fc-firmware-20101015.ebuild
@@ -1,9 +1,12 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 DESCRIPTION="QLogic Linux Fibre Channel HBA Firmware for ql2xxx cards"
 HOMEPAGE="ftp://ftp.qlogic.com/outgoing/linux/firmware/"
 SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
 LICENSE="qlogic-fibre-channel-firmware"
 SLOT="0"
 KEYWORDS="amd64 ppc ppc64 sparc x86"
@@ -13,8 +16,6 @@ IUSE=""
 DEPEND=""
 RDEPEND="!sys-kernel/linux-firmware"
 
-FW_BASENAME="ql2100_fw.bin ql2200_fw.bin ql2300_fw.bin ql2322_fw.bin ql2400_fw.bin ql2500_fw.bin ql6312_fw.bin"
-
 src_install() {
 	# We must install this, say QLogic's people.
 	# They have claimed to me that the /license/ directory isn't sufficient, as
@@ -31,9 +32,10 @@ src_install() {
 	# Please see README.* as to why we do not use the MID/MIDX versions by
 	# default if they are newer.
 	# TODO: Provide a means to get them for people that really want them.
-	for f in ${FW_BASENAME} ; do
-		doins ${f}.*
-		latest_f="$(ls ${f}.* |grep -v MID | sort -n | tail -n1)"
-		dosym ${latest_f} /lib/firmware/${f}
+	local f fw_basename=( ql2100_fw.bin ql2200_fw.bin ql2300_fw.bin ql2322_fw.bin ql2400_fw.bin ql2500_fw.bin ql6312_fw.bin )
+	for f in "${fw_basename[@]}"; do
+		doins "${f}".*
+		latest_f="$(ls ${f}.* | grep -v MID | sort -n | tail -n1)"
+		dosym "${latest_f}" /lib/firmware/"${f}"
 	done
 }
diff --git a/sys-boot/Manifest.gz b/sys-boot/Manifest.gz
index 763f1060d699..c3f54f5a0917 100644
Binary files a/sys-boot/Manifest.gz and b/sys-boot/Manifest.gz differ
diff --git a/sys-boot/milo/milo-2.4.18.ebuild b/sys-boot/milo/milo-2.4.18.ebuild
index 9c58de22f09c..13fc8aca315c 100644
--- a/sys-boot/milo/milo-2.4.18.ebuild
+++ b/sys-boot/milo/milo-2.4.18.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 inherit flag-o-matic eutils
@@ -213,7 +213,7 @@ src_install() {
 
 	cd ${S}/Documentation
 
-	dodoc ChangeLog filesystem Nikita.Todo README.milo Todo LICENSE README.BSD Stuff WhatIsMilo \
+	dodoc ChangeLog filesystem Nikita.Todo README.milo Todo README.BSD Stuff WhatIsMilo \
 		${FILESDIR}/README-gentoo ${FILESDIR}/mkserial_no.c ${DISTDIR}/MILO-HOWTO
 
 }
diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index e6acee0bea36..d7c50405d99a 100644
Binary files a/sys-cluster/Manifest.gz and b/sys-cluster/Manifest.gz differ
diff --git a/sys-cluster/drbd-utils/metadata.xml b/sys-cluster/drbd-utils/metadata.xml
index 19706db7b3c0..82f50565f990 100644
--- a/sys-cluster/drbd-utils/metadata.xml
+++ b/sys-cluster/drbd-utils/metadata.xml
@@ -2,16 +2,16 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
-  		<email>cluster@gentoo.org</email>
-  		<name>Gentoo Cluster Project</name>
+		<email>cluster@gentoo.org</email>
+		<name>Gentoo Cluster Project</name>
 	</maintainer>
 	<use>
-  		<flag name="xen">Enable Xen integration</flag>
+		<flag name="xen">Enable Xen integration</flag>
 		<flag name="pacemaker">Enable Pacemaker integration</flag>
 		<flag name="heartbeat">Enable Heartbeat integration</flag>
 	</use>
 	<longdescription>
-		The user space tools to control, configure the DRBD driver, as well as integration programs and scripts 
+		The user space tools to control, configure the DRBD driver, as well as integration programs and scripts
 		that glues the DRBD system to cluster management software and other system components.
 	</longdescription>
 </pkgmetadata>
diff --git a/sys-cluster/drbd/metadata.xml b/sys-cluster/drbd/metadata.xml
index 19706db7b3c0..82f50565f990 100644
--- a/sys-cluster/drbd/metadata.xml
+++ b/sys-cluster/drbd/metadata.xml
@@ -2,16 +2,16 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
-  		<email>cluster@gentoo.org</email>
-  		<name>Gentoo Cluster Project</name>
+		<email>cluster@gentoo.org</email>
+		<name>Gentoo Cluster Project</name>
 	</maintainer>
 	<use>
-  		<flag name="xen">Enable Xen integration</flag>
+		<flag name="xen">Enable Xen integration</flag>
 		<flag name="pacemaker">Enable Pacemaker integration</flag>
 		<flag name="heartbeat">Enable Heartbeat integration</flag>
 	</use>
 	<longdescription>
-		The user space tools to control, configure the DRBD driver, as well as integration programs and scripts 
+		The user space tools to control, configure the DRBD driver, as well as integration programs and scripts
 		that glues the DRBD system to cluster management software and other system components.
 	</longdescription>
 </pkgmetadata>
diff --git a/sys-cluster/glusterfs/glusterfs-3.12.3.ebuild b/sys-cluster/glusterfs/glusterfs-3.12.3.ebuild
index 6134e78493da..04036b762ed8 100644
--- a/sys-cluster/glusterfs/glusterfs-3.12.3.ebuild
+++ b/sys-cluster/glusterfs/glusterfs-3.12.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://download.gluster.org/pub/gluster/${PN}/$(get_version_component_
 
 LICENSE="|| ( GPL-2 LGPL-3+ )"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
 IUSE="bd-xlator crypt-xlator debug emacs +fuse +georeplication glupy infiniband +libtirpc qemu-block rsyslog static-libs +syslog systemtap test +tiering vim-syntax +xml"
 
 REQUIRED_USE="georeplication? ( ${PYTHON_REQUIRED_USE} )
diff --git a/sys-cluster/heat/Manifest b/sys-cluster/heat/Manifest
index 2130028df14b..cd8bed79f42e 100644
--- a/sys-cluster/heat/Manifest
+++ b/sys-cluster/heat/Manifest
@@ -1,10 +1,6 @@
-DIST heat-8.0.4.tar.gz 2304762 SHA256 7997dac0f35ad7fb236536959a46e843dab56dbce5694849585cb97affbbb198 SHA512 9846114813b743ba9abfb4ce6e9d3cdcddfb81a242fda83a9d22a9fc30017fec2464f3b75364d9be38d50218e79485f3405e429fac1830d163c50737b07c2865 WHIRLPOOL 8420bffb6e2b86528d9104abb981368fa2fe36b33057b0e02f1fcf9e9106a4cd58bdb833e459e38a64bd47b2f4955e15f589673b57442184e3bcd60894feab4b
-DIST heat-8.0.5.tar.gz 2309642 SHA256 8f17e09740ca1aafed4af3302b49fa425ad5a83c5ffa51de1b0aaa1b695578b6 SHA512 5ddb9a18ea0ce727b1900015d5690028bc92fe98e42dff3d609b504e5147608e3eefa54e7058ec0e8f6eefbcd3c92bb61eee29e604ce327a5b51250c6f68a1ad WHIRLPOOL 078b53006b75564230315729aa0a7d5f1ca0a790d30fd2e2ec3182f0f7357e6a45d239c7737b4c8370b1056e1f87d10c66367877917d563cb0f62aa9ca47cd89
-DIST heat-9.0.0.tar.gz 2359104 SHA256 36dbb46b72bf7b495ba8812804da7d4e9bb59481743e6e0499e904efdf4ee7be SHA512 d60cfd69807af5a51da6d236e5ccf482a5fd65f8bb2e5e8287eca587f27d0af570979b554a311037904a7c01cd8dcba43a5ef577261fb7f12a557ba6ff2ec58e WHIRLPOOL 43f9afaa57e84e7e29bba4754d3b7499afece40961891dafd6bf75da3032f79806dee6d4de91e0afd24ad53b97cf615e91df46646ed39b2df05fa53d36a31527
-DIST heat-9.0.1.tar.gz 2356475 SHA256 9d1facef9eb10e5236ad01a5249a774c58a2086db2f8a57ef97425e2ccc08dd8 SHA512 93c813bf9b7948ab5d1d261ae67cb942e35ee2cec37f8e3bfc534659725cc4aff97c731e230c1acff9308451cba64295ea47b1aae3df4b392834faf42397c0f1 WHIRLPOOL a20352592d218985e1619583cd4975e47c2b9e0bd9c4bcbbccde4608f8f137c94ffee4ca75c5941bf2c9ef798659d1e1378f54e4230477f90c98bf98f323e32f
-DIST heat.conf.sample-2017.1.9999 88798 SHA256 688a6fd65df3b9f004345c8cf739c5a553b6806213c399ac25846d1ad248e963 SHA512 5ea23f33ddc2b34414371a612041abd075694a7d63bb55efd1e75f313b4e9f35e0d68b420536bc474cd4896b0295d8763bdecbb07c71d29c462c14183159e560 WHIRLPOOL 9a91069136dcbf15d47a4b5df6521ca2740eb1a88feab57b28f2f921e517ae7557125b5ea877d4c9ed5314321c8de551270722809d270c1b8ae0245d2a75b515
-DIST heat.conf.sample-2017.2.9999 88901 SHA256 cb46fbbfa0e8ccccdc84c4637312f0d21b0c95037d2b3404623653c1b5eb0a92 SHA512 f62feaa4a0d27866876aed9f78099501247ae4b7deaefd04d77b1f4b2a1d1c991e6f3e68d9f82e3b6a4358c99fbffd90f14a05ff98105df0ef0db68ef8bc6932 WHIRLPOOL 284ad592883c8e42518872d603d097672056ba25a194569f31ee9244d1095f640f02097fda0a6539b47247ba580929d79ec173f1847bfc5e19bf45fb8cbe4720
-DIST heat.conf.sample-8.0.4 88798 SHA256 688a6fd65df3b9f004345c8cf739c5a553b6806213c399ac25846d1ad248e963 SHA512 5ea23f33ddc2b34414371a612041abd075694a7d63bb55efd1e75f313b4e9f35e0d68b420536bc474cd4896b0295d8763bdecbb07c71d29c462c14183159e560 WHIRLPOOL 9a91069136dcbf15d47a4b5df6521ca2740eb1a88feab57b28f2f921e517ae7557125b5ea877d4c9ed5314321c8de551270722809d270c1b8ae0245d2a75b515
-DIST heat.conf.sample-8.0.5 88798 SHA256 688a6fd65df3b9f004345c8cf739c5a553b6806213c399ac25846d1ad248e963 SHA512 5ea23f33ddc2b34414371a612041abd075694a7d63bb55efd1e75f313b4e9f35e0d68b420536bc474cd4896b0295d8763bdecbb07c71d29c462c14183159e560 WHIRLPOOL 9a91069136dcbf15d47a4b5df6521ca2740eb1a88feab57b28f2f921e517ae7557125b5ea877d4c9ed5314321c8de551270722809d270c1b8ae0245d2a75b515
-DIST heat.conf.sample-9.0.0 88901 SHA256 cb46fbbfa0e8ccccdc84c4637312f0d21b0c95037d2b3404623653c1b5eb0a92 SHA512 f62feaa4a0d27866876aed9f78099501247ae4b7deaefd04d77b1f4b2a1d1c991e6f3e68d9f82e3b6a4358c99fbffd90f14a05ff98105df0ef0db68ef8bc6932 WHIRLPOOL 284ad592883c8e42518872d603d097672056ba25a194569f31ee9244d1095f640f02097fda0a6539b47247ba580929d79ec173f1847bfc5e19bf45fb8cbe4720
-DIST heat.conf.sample-9.0.1 88901 SHA256 cb46fbbfa0e8ccccdc84c4637312f0d21b0c95037d2b3404623653c1b5eb0a92 SHA512 f62feaa4a0d27866876aed9f78099501247ae4b7deaefd04d77b1f4b2a1d1c991e6f3e68d9f82e3b6a4358c99fbffd90f14a05ff98105df0ef0db68ef8bc6932 WHIRLPOOL 284ad592883c8e42518872d603d097672056ba25a194569f31ee9244d1095f640f02097fda0a6539b47247ba580929d79ec173f1847bfc5e19bf45fb8cbe4720
+DIST heat-8.0.5.tar.gz 2309642 BLAKE2B 77e574368268fa1fc3c639266a4fba6c71901e7b5e4f50cf8e4fc5ec5f809fc5599345b4b8ff0d66969381d6ea17fc92a2e7002c083aabf8e45ca0289dc74012 SHA512 5ddb9a18ea0ce727b1900015d5690028bc92fe98e42dff3d609b504e5147608e3eefa54e7058ec0e8f6eefbcd3c92bb61eee29e604ce327a5b51250c6f68a1ad
+DIST heat-9.0.1.tar.gz 2356475 BLAKE2B 1af0565b9462b095a9c9c2c7a20350c049eac6cd07b623c575118d339ec7d918bb7455530e99057615287f09e594d657cf72d429e89b1366c0391ccfbafe9d07 SHA512 93c813bf9b7948ab5d1d261ae67cb942e35ee2cec37f8e3bfc534659725cc4aff97c731e230c1acff9308451cba64295ea47b1aae3df4b392834faf42397c0f1
+DIST heat.conf.sample-2017.1.9999 88798 BLAKE2B 5cfd2a466ba86dffffaa98bb9ab5793fa5315a1302e9e9d7c8f73549f1794971bf2ed3169c80e471a987658def9f706ea6246519a855e1cf623b7b89fe6b5e1d SHA512 5ea23f33ddc2b34414371a612041abd075694a7d63bb55efd1e75f313b4e9f35e0d68b420536bc474cd4896b0295d8763bdecbb07c71d29c462c14183159e560
+DIST heat.conf.sample-2017.2.9999 88901 BLAKE2B 050cfaacb46a8d9b79a17b7406acf6bca9be27a21f8278194021cadc69fb364c630ca0f0e7a320dfe9d46303d779eb8b5c31efaa9c25d3695caf70cab18b1b4d SHA512 f62feaa4a0d27866876aed9f78099501247ae4b7deaefd04d77b1f4b2a1d1c991e6f3e68d9f82e3b6a4358c99fbffd90f14a05ff98105df0ef0db68ef8bc6932
+DIST heat.conf.sample-8.0.5 88798 BLAKE2B 5cfd2a466ba86dffffaa98bb9ab5793fa5315a1302e9e9d7c8f73549f1794971bf2ed3169c80e471a987658def9f706ea6246519a855e1cf623b7b89fe6b5e1d SHA512 5ea23f33ddc2b34414371a612041abd075694a7d63bb55efd1e75f313b4e9f35e0d68b420536bc474cd4896b0295d8763bdecbb07c71d29c462c14183159e560
+DIST heat.conf.sample-9.0.1 88901 BLAKE2B 050cfaacb46a8d9b79a17b7406acf6bca9be27a21f8278194021cadc69fb364c630ca0f0e7a320dfe9d46303d779eb8b5c31efaa9c25d3695caf70cab18b1b4d SHA512 f62feaa4a0d27866876aed9f78099501247ae4b7deaefd04d77b1f4b2a1d1c991e6f3e68d9f82e3b6a4358c99fbffd90f14a05ff98105df0ef0db68ef8bc6932
diff --git a/sys-cluster/heat/heat-8.0.4.ebuild b/sys-cluster/heat/heat-8.0.4.ebuild
deleted file mode 100644
index 450961936893..000000000000
--- a/sys-cluster/heat/heat-8.0.4.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
-
-inherit distutils-r1 eutils linux-info user
-
-DESCRIPTION="A CloudFormation-compatible openstack-native cloud orchistration engine."
-HOMEPAGE="https://launchpad.net/heat"
-SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz
-	https://dev.gentoo.org/~prometheanfire/dist/openstack/heat/heat.conf.sample.ocata -> heat.conf.sample-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="+mysql +memcached postgres sqlite"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	app-admin/sudo"
-
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
-	>=dev-python/croniter-0.3.4[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-1.0.0[${PYTHON_USEDEP}]
-	!~dev-python/cryptography-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-2.18.0[${PYTHON_USEDEP}]
-	>=dev-python/keystonemiddleware-4.12.0[${PYTHON_USEDEP}]
-	>=dev-python/lxml-2.3[${PYTHON_USEDEP}]
-	!~dev-python/lxml-3.7.0[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.13[${PYTHON_USEDEP}]
-	!~dev-python/netaddr-0.7.16[${PYTHON_USEDEP}]
-	>=dev-python/oslo-cache-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-3.14.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-config-3.18.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.9.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-db-4.15.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.11.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-messaging-5.14.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-middleware-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-policy-1.17.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-reports-0.6.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-service-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.18.0[${PYTHON_USEDEP}]
-	>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-versionedobjects-1.17.0[${PYTHON_USEDEP}]
-	>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
-	>=dev-python/aodhclient-0.7.0[${PYTHON_USEDEP}]
-	>=dev-python/python-barbicanclient-4.0.0[${PYTHON_USEDEP}]
-	>=dev-python/python-ceilometerclient-2.5.0[${PYTHON_USEDEP}]
-	>=dev-python/python-cinderclient-1.6.0[${PYTHON_USEDEP}]
-	!~dev-python/python-cinderclient-1.7.0[${PYTHON_USEDEP}]
-	!~dev-python/python-cinderclient-1.7.1[${PYTHON_USEDEP}]
-	>=dev-python/python-designateclient-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/python-glanceclient-2.5.0[${PYTHON_USEDEP}]
-	>=dev-python/python-heatclient-1.6.1[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/python-magnumclient-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/python-manilaclient-1.12.0[${PYTHON_USEDEP}]
-	>=dev-python/python-mistralclient-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/python-monascaclient-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/python-neutronclient-5.1.0[${PYTHON_USEDEP}]
-	>=dev-python/python-novaclient-6.0.0[${PYTHON_USEDEP}]
-	!~dev-python/python-novaclient-7.0.0[${PYTHON_USEDEP}]
-	>=dev-python/python-openstackclient-3.3.0[${PYTHON_USEDEP}]
-	>=dev-python/python-saharaclient-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/python-senlinclient-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/python-swiftclient-3.2.0[${PYTHON_USEDEP}]
-	>=dev-python/python-troveclient-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/python-zaqarclient-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.10.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.10.0[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.12.2[${PYTHON_USEDEP}]
-	>=dev-python/tenacity-3.2.1[${PYTHON_USEDEP}]
-	>=dev-python/routes-1.12.3[${PYTHON_USEDEP}]
-	!~dev-python/routes-2.0[${PYTHON_USEDEP}]
-	!~dev-python/routes-2.1[$(python_gen_usedep 'python2_7')]
-	!~dev-python/routes-2.3[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	sqlite? (
-		>=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
-		<dev-python/sqlalchemy-1.1.0[sqlite,${PYTHON_USEDEP}]
-	)
-	mysql? (
-		>=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
-		!~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-		<dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
-	)
-	postgres? (
-		>=dev-python/psycopg-2.5.0
-		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-		<dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
-	)
-	>=dev-python/sqlalchemy-migrate-0.9.6[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.17.1[${PYTHON_USEDEP}]
-
-	>=dev-python/webob-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/yaql-1.1.0[${PYTHON_USEDEP}]"
-
-PATCHES=(
-)
-
-pkg_setup() {
-	enewgroup heat
-	enewuser heat -1 -1 /var/lib/heat heat
-}
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	diropts -m0750 -o heat -g heat
-	keepdir /etc/heat
-	dodir /etc/heat/environment.d
-	dodir /etc/heat/templates
-
-	for svc in api api-cfn engine; do
-		newinitd "${FILESDIR}/heat.initd" heat-${svc}
-	done
-
-	insinto /etc/heat
-	insopts -m0640 -o heat -g heat
-	newins "${DISTDIR}/heat.conf.sample-${PV}" "heat.conf.sample"
-	doins "etc/heat/api-paste.ini"
-	doins "etc/heat/policy.json"
-	insinto /etc/heat/templates
-	doins "etc/heat/templates/"*
-	insinto /etc/heat/environment.d
-	doins "etc/heat/environment.d/default.yaml"
-
-	dodir /var/log/heat
-	fowners heat:heat /var/log/heat
-}
diff --git a/sys-cluster/heat/heat-8.0.5.ebuild b/sys-cluster/heat/heat-8.0.5.ebuild
index ea586ee6ec43..450961936893 100644
--- a/sys-cluster/heat/heat-8.0.5.ebuild
+++ b/sys-cluster/heat/heat-8.0.5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="+mysql +memcached postgres sqlite"
 REQUIRED_USE="|| ( mysql postgres sqlite )"
 
diff --git a/sys-cluster/heat/heat-9.0.0.ebuild b/sys-cluster/heat/heat-9.0.0.ebuild
deleted file mode 100644
index 09f2d28a2330..000000000000
--- a/sys-cluster/heat/heat-9.0.0.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
-
-inherit distutils-r1 eutils linux-info user
-
-DESCRIPTION="A CloudFormation-compatible openstack-native cloud orchistration engine."
-HOMEPAGE="https://launchpad.net/heat"
-SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/heat/heat.conf.sample.pike -> heat.conf.sample-${PV}
-	https://tarballs.openstack.org/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="+mysql +memcached postgres sqlite"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	app-admin/sudo"
-
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
-	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/croniter-0.3.4[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-1.6.0[${PYTHON_USEDEP}]
-	!~dev-python/cryptography-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
-	!~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
-	<dev-python/eventlet-0.21.0[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.1.0[${PYTHON_USEDEP}]
-	>=dev-python/keystonemiddleware-4.12.0[${PYTHON_USEDEP}]
-	>=dev-python/lxml-2.3[${PYTHON_USEDEP}]
-	!~dev-python/lxml-3.7.0[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.13[${PYTHON_USEDEP}]
-	!~dev-python/netaddr-0.7.16[${PYTHON_USEDEP}]
-	>=dev-python/openstacksdk-0.9.17[${PYTHON_USEDEP}]
-	>=dev-python/oslo-cache-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-4.0.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-config-4.3.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-config-4.4.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.14.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-db-4.24.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-i18n-3.15.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.22.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-messaging-5.24.2[${PYTHON_USEDEP}]
-	!~dev-python/oslo-messaging-5.25.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-middleware-3.27.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-policy-1.23.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-reports-0.6.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-service-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.20.0[${PYTHON_USEDEP}]
-	>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-versionedobjects-1.17.0[${PYTHON_USEDEP}]
-	>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
-	>=dev-python/aodhclient-0.7.0[${PYTHON_USEDEP}]
-	>=dev-python/python-barbicanclient-4.0.0[${PYTHON_USEDEP}]
-	!~dev-python/python-barbicanclient-4.5.0[${PYTHON_USEDEP}]
-	!~dev-python/python-barbicanclient-4.5.1[${PYTHON_USEDEP}]
-	>=dev-python/python-ceilometerclient-2.5.0[${PYTHON_USEDEP}]
-	>=dev-python/python-cinderclient-3.1.0[${PYTHON_USEDEP}]
-	>=dev-python/python-designateclient-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/python-glanceclient-2.8.0[${PYTHON_USEDEP}]
-	>=dev-python/python-heatclient-1.6.1[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/python-magnumclient-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/python-manilaclient-1.12.0[${PYTHON_USEDEP}]
-	>=dev-python/python-mistralclient-3.1.0[${PYTHON_USEDEP}]
-	>=dev-python/python-monascaclient-1.7.0[${PYTHON_USEDEP}]
-	>=dev-python/python-neutronclient-6.3.0[${PYTHON_USEDEP}]
-	>=dev-python/python-novaclient-9.0.0[${PYTHON_USEDEP}]
-	>=dev-python/python-openstackclient-3.3.0[${PYTHON_USEDEP}]
-	!~dev-python/python-openstackclient-3.10.0[${PYTHON_USEDEP}]
-	>=dev-python/python-saharaclient-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/python-senlinclient-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/python-swiftclient-3.2.0[${PYTHON_USEDEP}]
-	>=dev-python/python-troveclient-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/python-zaqarclient-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/python-zunclient-0.2.0[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.10.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/tenacity-3.2.1[${PYTHON_USEDEP}]
-	>=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	sqlite? (
-		>=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.5[sqlite,${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.6[sqlite,${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.7[sqlite,${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.8[sqlite,${PYTHON_USEDEP}]
-	)
-	mysql? (
-		>=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
-		!~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
-	)
-	postgres? (
-		>=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
-	)
-	>=dev-python/sqlalchemy-migrate-0.11.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
-	>=dev-python/yaql-1.1.0[${PYTHON_USEDEP}]"
-
-PATCHES=(
-)
-
-pkg_setup() {
-	enewgroup heat
-	enewuser heat -1 -1 /var/lib/heat heat
-}
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	diropts -m0750 -o heat -g heat
-	keepdir /etc/heat
-	dodir /etc/heat/environment.d
-	dodir /etc/heat/templates
-
-	for svc in api api-cfn engine; do
-		newinitd "${FILESDIR}/heat.initd-2" heat-${svc}
-	done
-
-	insinto /etc/heat
-	insopts -m0640 -o heat -g heat
-	newins "${DISTDIR}/heat.conf.sample-${PV}" "heat.conf.sample"
-	doins "etc/heat/api-paste.ini"
-	doins "etc/heat/policy.json"
-	insinto /etc/heat/templates
-	doins "etc/heat/templates/"*
-	insinto /etc/heat/environment.d
-	doins "etc/heat/environment.d/default.yaml"
-
-	dodir /var/log/heat
-	fowners heat:heat /var/log/heat
-}
diff --git a/sys-cluster/heat/heat-9.0.1.ebuild b/sys-cluster/heat/heat-9.0.1.ebuild
index 82f683093c85..782daec4a31b 100644
--- a/sys-cluster/heat/heat-9.0.1.ebuild
+++ b/sys-cluster/heat/heat-9.0.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/heat/heat.conf.sa
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="+mysql +memcached postgres sqlite"
 REQUIRED_USE="|| ( mysql postgres sqlite )"
 
diff --git a/sys-cluster/openmpi/Manifest b/sys-cluster/openmpi/Manifest
index 8eb2971ce6c5..7f00f19cdd54 100644
--- a/sys-cluster/openmpi/Manifest
+++ b/sys-cluster/openmpi/Manifest
@@ -7,5 +7,6 @@ DIST openmpi-1.8.4.tar.bz2 13488749 SHA256 23158d916e92c80e2924016b746a93913ba7f
 DIST openmpi-1.8.7.tar.bz2 13228742 SHA256 da629e9bd820a379cfafe15f842ee9b628d7451856085ccc23ee75ab3e1b48c7 SHA512 953e007b00c9753bafc05d13e6f686c9aa47f76f55fcc4eda565174d410de059e07862b7e667d15df13afb80418661d9a8d5ee17fdcc211d3e044992cd9ceede WHIRLPOOL 374edbca97262217dfe405414deff2f6a3cacc06daec56e3356ea76f27804ef3caa3f37050dc8a81f257b83c1ced49fd5f66647c2cba4892fbe4ec9746a6f84e
 DIST openmpi-1.8.8.tar.bz2 13231433 SHA256 a28382d1e6a36f4073412dc00836ff2524e42b674da9caf6ca7377baad790b94 SHA512 8ca2e3ebb9d9ba0f33faba9bef76fe95293721b73619cbc18176611074a56c277e9ab6cae7fa6c87ace11f16151c1bc495b2a8dbc8ad064d5a8f89f5d431a660 WHIRLPOOL e36186452978ba7a368c83b84b8b089f6995450fa866b7b8300d32eec7e64a816abf5f301dc716bf25b3b45b987489952ffc4b7057f4407677f2a2df5ee67cdd
 DIST openmpi-2.0.2.tar.bz2 8311215 SHA256 cae396e643f9f91f0a795f8d8694adf7bacfb16f967c22fb39e9e28d477730d3 SHA512 87dc3c23db4b9cb92dbacc9b384b21ce8c4288fe4edc204fbf4a3bef70d8ac4329269e777ed190fa87933d78b73b9e5550ea3b925b2039599cfef3953567232a WHIRLPOOL 9403135fbf1682597c211b1ca0d1e300bd6f49294e9a70bf21f030c48a54f85d2d7ce8de8693dccaf81e2b46fbfd9a43a817bf598dc1f96e122b3f6ea6ffc3c6
-DIST openmpi-2.0.3.tar.bz2 8285131 SHA256 b52c0204c0e5954c9c57d383bb22b4181c09934f97783292927394d29f2a808a SHA512 158f90e3fac41540036d0c9cbcbf6abfe3f420c9f295d50a28f00e98181367769167dc3a59bb47ea34bdcd5a1c5a43bd2e77dad5b0c8b08d91f65340ff2b8547 WHIRLPOOL 07740f47814279f239aab0ef52f97fdd2c4a3ed5eb643ec5e9cf8b09d2096cbb8039f60d02153002c1035fc3514f7029b525b1fceb50bdbe05ec307c06fb7501
-DIST openmpi-2.1.2.tar.bz2 8278459 SHA256 3cc5804984c5329bdf88effc44f2971ed244a29b256e0011b8deda02178dd635 SHA512 8a27a67cab384f9f03efe69bfdd51a8e8790f47a156e3a7e34f26a29d033889653070981c0105f142a96f00293fc069536bd020ae28a97afb564eab747e60457 WHIRLPOOL 9dbae8a3b0a35a761a8436bc30a4af36ea3492914f726a0334b39efe3e053e430d85723745ad33ca56d82f2884722532d408b809c25ea478b54c27f52fa99276
+DIST openmpi-2.0.4.tar.bz2 8272983 BLAKE2B 7d0a392fbc8c896cdccefb9bf0ff83fbd8db8a42d17f06cb23ac88ba896e2c75e1b1b7a79559d0ce3c2b881f197f54ce1bd8967c889bafe2b97f95fb6b957501 SHA512 2cccb83847d44f6282ec24f7bc12ab51b84dc5ac1a2a919ef0761847ff7cdcb31cfb1f38dca33df7063a98c27a64575a108002716d207cbba3a54773b999e6c5
+DIST openmpi-2.1.2.tar.bz2 8278459 BLAKE2B 83f6617322baad4fb13d399fa6a491d1d8dec1a5862974552a5f0cb033ab2a27eb0a44055e2670e3fbe79dbac68ed0130bdfec057cad48e474b814ccd56e59e6 SHA512 8a27a67cab384f9f03efe69bfdd51a8e8790f47a156e3a7e34f26a29d033889653070981c0105f142a96f00293fc069536bd020ae28a97afb564eab747e60457
+DIST openmpi-3.0.0.tar.bz2 9267606 BLAKE2B 9ee569a9c5f5918bb3d389a2945a2e7a5d98464afbd111eb2426a4e8296a23cf6d5b558554ce8126b13f910bd59acbb77e93ac297f3cf222c4bc764836b39ee6 SHA512 7e37eacf959a803d6d89dff4291b64a1f3d83bc7941b778a2fb13d12be0f205cb904e4a807d79676ad1e31fd99ffb15f255c8a227e830673455abb144f14616a
diff --git a/sys-cluster/openmpi/openmpi-2.0.3.ebuild b/sys-cluster/openmpi/openmpi-2.0.4.ebuild
similarity index 99%
rename from sys-cluster/openmpi/openmpi-2.0.3.ebuild
rename to sys-cluster/openmpi/openmpi-2.0.4.ebuild
index a711f2778004..e1517dff800c 100644
--- a/sys-cluster/openmpi/openmpi-2.0.3.ebuild
+++ b/sys-cluster/openmpi/openmpi-2.0.4.ebuild
@@ -54,7 +54,7 @@ CDEPEND="
 	!sys-cluster/mpiexec
 	>=dev-libs/libevent-2.0.22[${MULTILIB_USEDEP},threads]
 	dev-libs/libltdl:0[${MULTILIB_USEDEP}]
-	>=sys-apps/hwloc-1.11.2[${MULTILIB_USEDEP},numa?]
+	<sys-apps/hwloc-2[${MULTILIB_USEDEP},numa?]
 	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
 	cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1 )
 	elibc_FreeBSD? ( dev-libs/libexecinfo )
diff --git a/sys-cluster/openmpi/openmpi-3.0.0.ebuild b/sys-cluster/openmpi/openmpi-3.0.0.ebuild
new file mode 100644
index 000000000000..b50c4f2ad163
--- /dev/null
+++ b/sys-cluster/openmpi/openmpi-3.0.0.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+FORTRAN_NEEDED=fortran
+
+inherit cuda flag-o-matic fortran-2 java-pkg-opt-2 toolchain-funcs versionator multilib-minimal
+
+MY_P=${P/-mpi}
+S=${WORKDIR}/${MY_P}
+
+IUSE_OPENMPI_FABRICS="
+	openmpi_fabrics_ofed
+	openmpi_fabrics_knem
+	openmpi_fabrics_psm"
+
+IUSE_OPENMPI_RM="
+	openmpi_rm_pbs
+	openmpi_rm_slurm"
+
+IUSE_OPENMPI_OFED_FEATURES="
+	openmpi_ofed_features_control-hdr-padding
+	openmpi_ofed_features_udcm
+	openmpi_ofed_features_rdmacm
+	openmpi_ofed_features_dynamic-sl"
+
+DESCRIPTION="A high-performance message passing library (MPI)"
+HOMEPAGE="http://www.open-mpi.org"
+SRC_URI="http://www.open-mpi.org/software/ompi/v$(get_version_component_range 1-2)/downloads/${MY_P}.tar.bz2"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux"
+IUSE="cma cuda cxx elibc_FreeBSD fortran heterogeneous ipv6 java numa romio
+	${IUSE_OPENMPI_FABRICS} ${IUSE_OPENMPI_RM} ${IUSE_OPENMPI_OFED_FEATURES}"
+
+REQUIRED_USE="openmpi_rm_slurm? ( !openmpi_rm_pbs )
+	openmpi_rm_pbs? ( !openmpi_rm_slurm )
+	openmpi_fabrics_psm? ( openmpi_fabrics_ofed )
+	openmpi_ofed_features_control-hdr-padding? ( openmpi_fabrics_ofed )
+	openmpi_ofed_features_udcm? ( openmpi_fabrics_ofed )
+	openmpi_ofed_features_rdmacm? ( openmpi_fabrics_ofed )
+	openmpi_ofed_features_dynamic-sl? ( openmpi_fabrics_ofed )"
+
+# dev-util/nvidia-cuda-toolkit is always multilib
+CDEPEND="
+	!sys-cluster/mpich
+	!sys-cluster/mpich2
+	!sys-cluster/nullmpi
+	!sys-cluster/mpiexec
+	>=dev-libs/libevent-2.0.22[${MULTILIB_USEDEP},threads]
+	dev-libs/libltdl:0[${MULTILIB_USEDEP}]
+	>=sys-apps/hwloc-1.11.2[${MULTILIB_USEDEP},numa?]
+	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1 )
+	elibc_FreeBSD? ( dev-libs/libexecinfo )
+	openmpi_fabrics_ofed? ( sys-fabric/ofed:* )
+	openmpi_fabrics_knem? ( sys-cluster/knem )
+	openmpi_fabrics_psm? ( sys-fabric/infinipath-psm:* )
+	openmpi_rm_pbs? ( sys-cluster/torque )
+	openmpi_rm_slurm? ( sys-cluster/slurm )
+	openmpi_ofed_features_rdmacm? ( sys-fabric/librdmacm:* )"
+
+RDEPEND="${CDEPEND}
+	java? ( >=virtual/jre-1.6 )"
+
+DEPEND="${CDEPEND}
+	java? ( >=virtual/jdk-1.6 )"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/mpi.h
+	/usr/include/openmpi/ompi/mpi/java/mpiJava.h
+)
+
+pkg_setup() {
+	fortran-2_pkg_setup
+	java-pkg-opt-2_pkg_setup
+
+	elog
+	elog "OpenMPI has an overwhelming count of configuration options."
+	elog "Don't forget the EXTRA_ECONF environment variable can let you"
+	elog "specify configure options if you find them necessary."
+	elog
+}
+
+src_prepare() {
+	default
+
+	# Necessary for scalibility, see
+	# http://www.open-mpi.org/community/lists/users/2008/09/6514.php
+	echo 'oob_tcp_listen_mode = listen_thread' \
+		>> opal/etc/openmpi-mca-params.conf || die
+}
+
+multilib_src_configure() {
+	if use java; then
+		# We must always build with the right -source and -target
+		# flags. Passing flags to javac isn't explicitly supported here
+		# but we can cheat by overriding the configure test for javac.
+		export ac_cv_path_JAVAC="$(java-pkg_get-javac) $(java-pkg_javac-args)"
+	fi
+
+	ECONF_SOURCE=${S} econf \
+		--sysconfdir="${EPREFIX}/etc/${PN}" \
+		--enable-pretty-print-stacktrace \
+		--enable-orterun-prefix-by-default \
+		--with-hwloc="${EPREFIX}/usr" \
+		--with-libltdl="${EPREFIX}/usr" \
+		--with-libevent="${EPREFIX}/usr" \
+		--enable-mpi-fortran=$(usex fortran all no) \
+		$(use_enable cxx mpi-cxx) \
+		$(use_with cma) \
+		$(use_with cuda cuda "${EPREFIX}"/opt/cuda) \
+		$(use_enable romio io-romio) \
+		$(use_enable heterogeneous) \
+		$(use_enable ipv6) \
+		$(multilib_native_use_enable java) \
+		$(multilib_native_use_enable java mpi-java) \
+		$(multilib_native_use_with openmpi_fabrics_ofed verbs "${EPREFIX}"/usr) \
+		$(multilib_native_use_with openmpi_fabrics_knem knem "${EPREFIX}"/usr) \
+		$(multilib_native_use_with openmpi_fabrics_psm psm "${EPREFIX}"/usr) \
+		$(multilib_native_use_enable openmpi_ofed_features_control-hdr-padding openib-control-hdr-padding) \
+		$(multilib_native_use_enable openmpi_ofed_features_rdmacm openib-rdmacm) \
+		$(multilib_native_use_enable openmpi_ofed_features_udcm openib-udcm) \
+		$(multilib_native_use_enable openmpi_ofed_features_dynamic-sl openib-dynamic-sl) \
+		$(multilib_native_use_with openmpi_rm_pbs tm) \
+		$(multilib_native_use_with openmpi_rm_slurm slurm)
+}
+
+multilib_src_test() {
+	# Doesn't work with the default src_test as the dry run (-n) fails.
+	emake -j1 check
+}
+
+multilib_src_install() {
+	default
+
+	# fortran header cannot be wrapped (bug #540508), workaround part 1
+	if multilib_is_native_abi && use fortran; then
+		mkdir "${T}"/fortran || die
+		mv "${ED}"usr/include/mpif* "${T}"/fortran || die
+	else
+		# some fortran files get installed unconditionally
+		rm \
+			"${ED}"usr/include/mpif* \
+			"${ED}"usr/bin/mpif* \
+			"${ED}"usr/bin/oshfort \
+			"${ED}"usr/bin/shmemfort \
+			|| die
+	fi
+}
+
+multilib_src_install_all() {
+	# fortran header cannot be wrapped (bug #540508), workaround part 2
+	if use fortran; then
+		mv "${T}"/fortran/mpif* "${ED}"usr/include || die
+	fi
+
+	# Remove la files, no static libs are installed and we have pkg-config
+	find "${ED}" -name '*.la' -delete || die
+
+	if use java; then
+		local mpi_jar="${ED}"usr/$(get_libdir)/mpi.jar
+		java-pkg_dojar "${mpi_jar}"
+		# We don't want to install the jar file twice
+		# so let's clean after ourselves.
+		rm "${mpi_jar}" || die
+	fi
+
+	einstalldocs
+}
diff --git a/sys-cluster/pacemaker/metadata.xml b/sys-cluster/pacemaker/metadata.xml
index c486adbd93a7..0d3bda39fd28 100644
--- a/sys-cluster/pacemaker/metadata.xml
+++ b/sys-cluster/pacemaker/metadata.xml
@@ -1,21 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>cluster@gentoo.org</email>
-    <name>Gentoo Cluster Project</name>
-  </maintainer>
-  <longdescription>Pacemaker is a cluster resource manager.
-	  It achieves maximum availability for your cluster services (aka. resources) by detecting and 
-	  recovering from node and resource-level failures by making use of the messaging and membership 
-	  capabilities provided by your preferred cluster infrastructure (either OpenAIS or Heartbeat).
-   </longdescription>
-  <use>
-    <flag name="cman">Enable <pkg>sys-cluster/cman</pkg> support.</flag>
-    <flag name="heartbeat">Enable <pkg>sys-cluster/heartbeat</pkg> support.</flag>
-    <flag name="smtp">Enable SMTP support via <pkg>net-libs/libesmtp</pkg></flag>
-  </use>
-  <upstream>
-    <remote-id type="github">ClusterLabs/pacemaker</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>cluster@gentoo.org</email>
+		<name>Gentoo Cluster Project</name>
+	</maintainer>
+	<longdescription>
+		Pacemaker is a cluster resource manager.
+		It achieves maximum availability for your cluster services (aka. resources) by detecting and
+		recovering from node and resource-level failures by making use of the messaging and membership
+		capabilities provided by your preferred cluster infrastructure (either OpenAIS or Heartbeat).
+	</longdescription>
+	<use>
+		<flag name="cman">Enable <pkg>sys-cluster/cman</pkg> support.</flag>
+		<flag name="heartbeat">Enable <pkg>sys-cluster/heartbeat</pkg> support.</flag>
+		<flag name="smtp">Enable SMTP support via <pkg>net-libs/libesmtp</pkg></flag>
+	</use>
+	<upstream>
+		<remote-id type="github">ClusterLabs/pacemaker</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sys-cluster/slurm/slurm-16.05.11.ebuild b/sys-cluster/slurm/slurm-16.05.11.ebuild
index 3438722b95d5..6f935a075773 100644
--- a/sys-cluster/slurm/slurm-16.05.11.ebuild
+++ b/sys-cluster/slurm/slurm-16.05.11.ebuild
@@ -22,7 +22,7 @@ else
 	S="${WORKDIR}/${MY_P}"
 fi
 
-inherit autotools eutils pam perl-module user ${INHERIT_GIT}
+inherit autotools eutils pam perl-module prefix user ${INHERIT_GIT}
 
 DESCRIPTION="SLURM: A Highly Scalable Resource Manager"
 HOMEPAGE="https://www.schedmd.com"
@@ -50,7 +50,7 @@ REQUIRED_USE="torque? ( perl )"
 LIBSLURM_PERL_S="${WORKDIR}/${P}/contribs/perlapi/libslurm/perl"
 LIBSLURMDB_PERL_S="${WORKDIR}/${P}/contribs/perlapi/libslurmdb/perl"
 
-RESTRICT="primaryuri"
+RESTRICT="primaryuri test"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-disable-sview.patch
diff --git a/sys-cluster/slurm/slurm-17.02.9.ebuild b/sys-cluster/slurm/slurm-17.02.9.ebuild
index 3f6085571b02..f4c3c841d3f7 100644
--- a/sys-cluster/slurm/slurm-17.02.9.ebuild
+++ b/sys-cluster/slurm/slurm-17.02.9.ebuild
@@ -22,7 +22,7 @@ else
 	S="${WORKDIR}/${MY_P}"
 fi
 
-inherit autotools eutils pam perl-module user ${INHERIT_GIT}
+inherit autotools eutils pam perl-module prefix user ${INHERIT_GIT}
 
 DESCRIPTION="A Highly Scalable Resource Manager"
 HOMEPAGE="https://www.schedmd.com"
@@ -50,7 +50,7 @@ REQUIRED_USE="torque? ( perl )"
 LIBSLURM_PERL_S="${WORKDIR}/${P}/contribs/perlapi/libslurm/perl"
 LIBSLURMDB_PERL_S="${WORKDIR}/${P}/contribs/perlapi/libslurmdb/perl"
 
-RESTRICT="primaryuri"
+RESTRICT="primaryuri test"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-disable-sview.patch
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index ebd7cc149889..1b3d43fbee66 100644
Binary files a/sys-devel/Manifest.gz and b/sys-devel/Manifest.gz differ
diff --git a/sys-devel/distcc/metadata.xml b/sys-devel/distcc/metadata.xml
index 9cccb613be75..cae1134187b6 100644
--- a/sys-devel/distcc/metadata.xml
+++ b/sys-devel/distcc/metadata.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>cluster@gentoo.org</email>
-    <name>Gentoo Cluster Project</name>
-  </maintainer>
-  <longdescription lang="en">
+	<maintainer type="project">
+		<email>cluster@gentoo.org</email>
+		<name>Gentoo Cluster Project</name>
+	</maintainer>
+	<longdescription lang="en">
 		Distcc is a program to distribute compilation of C code across several
 		machines on a network.
 	</longdescription>
-  <use>
-    <flag name="crossdev">Enable support for <pkg>sys-devel/crossdev</pkg></flag>
-    <flag name="gssapi">Enable support for <pkg>net-libs/libgssglue</pkg></flag>
-  </use>
+	<use>
+		<flag name="crossdev">Enable support for <pkg>sys-devel/crossdev</pkg></flag>
+		<flag name="gssapi">Enable support for <pkg>net-libs/libgssglue</pkg></flag>
+	</use>
 </pkgmetadata>
diff --git a/sys-devel/sparse/metadata.xml b/sys-devel/sparse/metadata.xml
index b07d40e90439..58fef00ea442 100644
--- a/sys-devel/sparse/metadata.xml
+++ b/sys-devel/sparse/metadata.xml
@@ -1,18 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>toolchain@gentoo.org</email>
-    <name>Gentoo Toolchain Project</name>
-  </maintainer>
-  <use>
-    <flag name="gtk">
-      Build the test-inspect utility (requires
-      <pkg>x11-libs/gtk+</pkg> version 2)
-    </flag>
-	<flag name="llvm">Build the sparse-llvm utility</flag>
-    <flag name="xml">
-      Build the c2xml utility (requires <pkg>dev-libs/libxml2</pkg>).
-    </flag>
-  </use>
+	<maintainer type="project">
+		<email>toolchain@gentoo.org</email>
+		<name>Gentoo Toolchain Project</name>
+	</maintainer>
+	<use>
+		<flag name="gtk">Build the test-inspect utility (requires <pkg>x11-libs/gtk+</pkg> version 2)</flag>
+		<flag name="llvm">Build the sparse-llvm utility</flag>
+		<flag name="xml">Build the c2xml utility (requires <pkg>dev-libs/libxml2</pkg>)</flag>
+	</use>
 </pkgmetadata>
diff --git a/sys-fabric/Manifest.gz b/sys-fabric/Manifest.gz
index 3b195ed84ef7..8d9ef0895ba5 100644
Binary files a/sys-fabric/Manifest.gz and b/sys-fabric/Manifest.gz differ
diff --git a/sys-fabric/ofed/metadata.xml b/sys-fabric/ofed/metadata.xml
index 993d84db31f4..09006c9299cd 100644
--- a/sys-fabric/ofed/metadata.xml
+++ b/sys-fabric/ofed/metadata.xml
@@ -2,8 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
-    	<email>cluster@gentoo.org</email>
-    	<name>Gentoo Cluster Project</name>
+		<email>cluster@gentoo.org</email>
+		<name>Gentoo Cluster Project</name>
 	</maintainer>
 	<use>
 		<flag name="dapl">Add support for DAPL abstraction layer</flag>
@@ -14,6 +14,6 @@
 		<flag name="perftest">Add perftest utils</flag>
 		<flag name="qperf">Add rdma tests</flag>
 		<flag name="srp">Suport for userspace part for srp initiator</flag>
-    	<flag name="rds">Tools to manage rds sockets</flag>
-  </use>
+		<flag name="rds">Tools to manage rds sockets</flag>
+	</use>
 </pkgmetadata>
diff --git a/sys-firmware/Manifest.gz b/sys-firmware/Manifest.gz
index c689d441bf57..7c5074d6845b 100644
Binary files a/sys-firmware/Manifest.gz and b/sys-firmware/Manifest.gz differ
diff --git a/sys-firmware/iwl8000-ucode/metadata.xml b/sys-firmware/iwl8000-ucode/metadata.xml
index 9a572fd1c358..8eb4974ce5ed 100644
--- a/sys-firmware/iwl8000-ucode/metadata.xml
+++ b/sys-firmware/iwl8000-ucode/metadata.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>nicolasbock@gentoo.org</email>
-	<description>
-		Feel free to bump and add yourself to the maintainer list.
-	</description>
-  </maintainer>
+	<maintainer type="person">
+		<email>nicolasbock@gentoo.org</email>
+		<description>
+			Feel free to bump and add yourself to the maintainer list.
+		</description>
+	</maintainer>
 </pkgmetadata>
diff --git a/sys-firmware/tt-s2-6400-firmware/metadata.xml b/sys-firmware/tt-s2-6400-firmware/metadata.xml
index 18b2e396af49..984a01fab265 100644
--- a/sys-firmware/tt-s2-6400-firmware/metadata.xml
+++ b/sys-firmware/tt-s2-6400-firmware/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
+	<maintainer type="project">
 		<email>vdr@gentoo.org</email>
 		<name>Gentoo VDR Project</name>
-    </maintainer>
+	</maintainer>
 </pkgmetadata>
diff --git a/sys-freebsd/Manifest.gz b/sys-freebsd/Manifest.gz
index f105f38779d3..af4d8ae992a2 100644
Binary files a/sys-freebsd/Manifest.gz and b/sys-freebsd/Manifest.gz differ
diff --git a/sys-freebsd/freebsd-share/Manifest b/sys-freebsd/freebsd-share/Manifest
index 1d6859878047..afb3a9d0b073 100644
--- a/sys-freebsd/freebsd-share/Manifest
+++ b/sys-freebsd/freebsd-share/Manifest
@@ -1,21 +1,21 @@
 DIST freebsd-bin-8.2.tar.bz2 415900 SHA256 fb31b7fab259bda8396e615246f85dc99c3c9f7e98f4e4a613e20b6a394c4921 SHA512 c39b26f75f7d812f46e907acabd8dfaf45c97adf4488bcafa35fd46c805d821e177609d403cf5e677f3674020290199ac97059a0609f7705bce58a7aab3ee8e3 WHIRLPOOL 49e70b1c09c4b72b3f23850e8c9873556571ec02d70ade8f18f683eff6fa92dc8f6d02d58473fe7b4d8d1f3de96c63df41150b2091caafbc9a0e92e6055b43fd
 DIST freebsd-bin-9.1.tar.bz2 385664 SHA256 0a9524d75a8cb4c9c2654f2f9843087b09e8599bba97b9b59f00bc2e92b87e00 SHA512 fa0571a705befe1cb9c07285d3df55c9b5f4f295760511d668d80fec8cd4d59b70c676f07164f2aa44911decef0fb54fa6d78405ac2ceec822b6b8920abc5ca8 WHIRLPOOL 6f2bfe17604339e8260c49582bc941d255932b5c0a7b604e58187626a3a38766cd1e4aed9fc93a737ec9b4fa661f88aac23769b3542f35eb20da8b260216e985
 DIST freebsd-contrib-8.2.tar.bz2 40931651 SHA256 8b9cb688e81c2980b3fc66411d00ab277a24dadd50d5bdd5e0e6c63ac687b9b6 SHA512 4f7bf825b579fbb88f2aac531d07e531474179c63fa0b66c4e80821290a8c94bf611bb4dcaef51b762aacd25b11dfae798a4ec3bad3b9e3f6b3490ebfaa72476 WHIRLPOOL edd3d9e26e8d22d9028082e107ec1a44402e206dab8722f34b445676959305996c3f699152af42ace249b7f58498492787823b172fb6bcb273119c6bb50a35f0
-DIST freebsd-contrib-9.1.tar.bz2 54751432 SHA256 e7ffa056d4050ce03ee8e23e276e2a9a494326a98d60c43bee2afcc59576deb8 SHA512 71be13049258c6e6b5e4f63cc16da5d349a89d68f04d87446e4ad33ae8bf2a93ea67d9c256b7bec60b61e65db0487268070cfb77a484c3ac0f8ba368b48c2438 WHIRLPOOL a2a84423175499208d34809e802284d6ba649f317c3a9ad8b7312fa19efe142ebadab0048bac0db8e988e59f9a7468ac7c5d0d25e78b82bdb269a20d18153cee
+DIST freebsd-contrib-9.1.tar.bz2 54751432 BLAKE2B 8a30e78021e6388d679637d2dbe0ed3f4896d3902064baaafa79de9c328171cbcb895b0ffd3d0d0cd3ca25c93a73584ed4900b45bd672a73b15b75721de59de5 SHA512 71be13049258c6e6b5e4f63cc16da5d349a89d68f04d87446e4ad33ae8bf2a93ea67d9c256b7bec60b61e65db0487268070cfb77a484c3ac0f8ba368b48c2438
 DIST freebsd-etc-8.2.tar.bz2 188629 SHA256 6bc745fa259f9fa2b65df865d45443a7b23c24445195e33a4ac50bf1040ae238 SHA512 3e5c106754a6a1ac806bd46b711fba7ee9cb31a4eab5262c995a5d59dbeb02f756dd8b495640dda94189d204a5d2c5218de2bd23467172d6a4ebe1048986e89c WHIRLPOOL 23b658a214f1a64c43420351020e32b1182e9aac3ed5253f49ee86f9cee9166ce32bd556cd2a2b3c0e60a165462a8700f37dea19e57ad5716415e17f61da912e
-DIST freebsd-etc-9.1.tar.bz2 207776 SHA256 a317bf85532d6192f5506e8d7bd5d5c201fe24017700e3a974a7712c2c69cdb8 SHA512 4fbe56fde519cf2f44e39a8869efa26c34f703cf540f4a83389da8d170873d7c6fb18e4010e643b8d793cfc5c55d15eeb198057a5b2a8da9d9e8f791801bf314 WHIRLPOOL 0c27019fe140fe96f870697acbaa89ac2f281f55b892c5791b08abf1cfa4da94d9d42a1df1c2091317573ed7234253857aecb797065f911a0a5d57bbf64349a5
+DIST freebsd-etc-9.1.tar.bz2 207776 BLAKE2B 61fbfa11dfcd24c007c20940a4b7cc802dfb9a991e41433840c57f113eaaa9e2b833a15f48d60c706e55d941b0a999baabd0c33197cffd522b67c57eaa9460f1 SHA512 4fbe56fde519cf2f44e39a8869efa26c34f703cf540f4a83389da8d170873d7c6fb18e4010e643b8d793cfc5c55d15eeb198057a5b2a8da9d9e8f791801bf314
 DIST freebsd-gnu-8.2.tar.bz2 815379 SHA256 34be1326b8e188427ea4a59de5dd24049f99adb5e172d61a645db1b7124f7876 SHA512 8b278e386b22b22658eef18341073c1c757b86ecdef5c5b543fb781cfee295d71cef599544eda5f8cf273fc22d28a1ab14d912086ff8398c36ee2b71281617d4 WHIRLPOOL aaf91562f147095e09a9f6aa2d4c33494f430cbe7340377edff1b8a44cc60edfe4af7ef90350018f0c80e82f5518110689cb582bb227d2360488dfbdd7bcb7c8
-DIST freebsd-gnu-9.1.tar.bz2 795778 SHA256 3b99c1fa1087bf69549e0990a0d7997954533ac9d7938c4760ec2b01aa509a5f SHA512 b05f2a5a10bdaeef19dfd0e962bc09f1571288a831e9345f404b920037f47db5c0ca3d620d1cbdd138b18bca1c3feab5b211b57e3041727341e5238cb9feb4fd WHIRLPOOL 4f776b99296c4fcc0d6f4d30a12b0773f6704292e1361826b260ce34dcc8e537ef7eb7c6332c4988e0e03bc84ca07fb18e6b2785fe4c6f175c08865b72d6bb0b
+DIST freebsd-gnu-9.1.tar.bz2 795778 BLAKE2B a922a8bd2c8a7ddbac757e7db900109918bf214a34988adb45bdb11e5c829445cac9b13b0ed27ec62603aeae1e3230af362682182494db0ec95ff47cbfd7d927 SHA512 b05f2a5a10bdaeef19dfd0e962bc09f1571288a831e9345f404b920037f47db5c0ca3d620d1cbdd138b18bca1c3feab5b211b57e3041727341e5238cb9feb4fd
 DIST freebsd-lib-8.2.tar.bz2 3323878 SHA256 e3590c12794fcb5ba8eb7a1f58b497587cf19f9200b3254c194a793da3b5bfb0 SHA512 c059cfdd1099bb519b2a5c43fb7e7104c500ef8906229ed7eb9e420cb3a217cdaf8655e9e7a9f45cfadc5491f8115e0e738fd49251d9f0c3a83780845b09f007 WHIRLPOOL 95f98a372f44a89bc8ac3029ec065dbbfec338e6f889d057d75644bfcdfb9d27fdc0421d7e392cad5a823712b97f0857297ec3d321580254c63032c22b95792e
-DIST freebsd-lib-9.1.tar.bz2 3206685 SHA256 f31fa8107b4de711c548f6d0c1bb1f81d09f51bcc3b14a1e9e90bb0e7cc4a35d SHA512 40d0c36b6b889c404fa0e0afa38ba4e84a55bc88ffa2f98a70afbd7a32c4f32c158617ba770567d082a986d62c09b3ec8db3dc5ab853ee1c9bbe0b90bb82396e WHIRLPOOL 581878bf9c43184b043b4293409b85901c9ed1f9bd279e965414aca41ba50950848ebda3ee10a503a028135dfd2765e95a11acd4e62a11c528e104392bbbd8d0
+DIST freebsd-lib-9.1.tar.bz2 3206685 BLAKE2B 67f93b7951fc03e877ee525d53b81ba49c8c1a70041c30aac97665d5dab7b3f2817fdb3bbb1475be66c33a7f996309e9020f1a3d1154fab8e2f6789f5ae0bb18 SHA512 40d0c36b6b889c404fa0e0afa38ba4e84a55bc88ffa2f98a70afbd7a32c4f32c158617ba770567d082a986d62c09b3ec8db3dc5ab853ee1c9bbe0b90bb82396e
 DIST freebsd-sbin-8.2.tar.bz2 1211665 SHA256 8b7e21a66b4696e8763d29b8b02b2d35f29fc51820a194d1e469e7cace84c527 SHA512 c6643c29ab62344c98d8991708798730ee1c17e6478071718beeaa79788300a1f4ed2e6aeb8e39e3c216877d4ed2ac85b2a9531d534f1ac5125a508927898959 WHIRLPOOL 2a21cd0f15f95d66718031680ac87f1fe73f1e1b03cb012e1db1dd1bd2fe2bb7897457a8ba2f5a28c8806775611dca542cbadec16566c47ab9efa673e2cb53f3
 DIST freebsd-sbin-9.1.tar.bz2 1273913 SHA256 45008b0733b232ef03707ef5fa3e5c889e3b3728393d736bd9a869ea83be6447 SHA512 9f186602b7de96f268c352ca386986652fddf5570e7eca1afa8c0d2bdc83b57df1198efe47f36dd5c7a6abf4f9c935f1c8207a4a12a6b2153bd6c3c6292719dc WHIRLPOOL 20920dfa9607a0ce854319cef29bbd77fb1b31f6f6cfd5ac60cbd678169e43929e215743fe636d0c224443f3e6149a8f07c292d647f7f901592795ac292699f9
 DIST freebsd-share-8.2.tar.bz2 3797560 SHA256 dd082c6ddbf8e08ec91d9810d51af4111339bed912b0f74d05be283780292ba0 SHA512 b3f964253f80e58cde12f26e48a23aa75c17b9ab2810f91a4bd2d7efbe902af7c73c219f8373a4fc97ee0a35d25627b8815c79c136ef18620acc8bd0ee5bd6c4 WHIRLPOOL 42326ad6139feadf80509f5e810f6a86009ad3a69aad9550c6355389773c28d5b2f7930eaa852f8442808485d13e5b758ed3420e39048bb3966785e6953119ea
 DIST freebsd-share-9.1.tar.bz2 6733003 SHA256 2bbd8aa05d52b18a1780772a8518d79d375c1eeae98f52fb6aded233ac2491d7 SHA512 9665e3d5253f49a55921012bd21a8688210a1993ba6be4ad17b5ba5619104a50f3199d49a0eb83cf29db5a06c407beb15616bfe71338c680fe34ec47564c4b43 WHIRLPOOL 7d15596888ac42af1a0c125591283524ff794dccbf9f6592963602f046a45ca073b10bda43c2d0d662fd3414753de64c05293788e03c4eea67de55d9bc083c11
 DIST freebsd-src-10.3.tar.xz 126900216 SHA256 f50763dcac88e9b7ec616b77d537bf338f470350e2c85e0cc7decfcc8372b54d SHA512 a0c95fc4bbc5ad7599d0a83651a497e85cd85a5c433e5e175c57480b466c9eb5aa0390804d6336da8301c75ad499484399d39b8f7efbcfda8cafb09b1aa12d8f WHIRLPOOL bf5320bc506fb73a63d0fb324b60667a196ca2fef5d0215637a657c613f2052d76d002deb205e258f6d4e2aaea15490b26679e59a102606a34b58ab1f6b755ad
-DIST freebsd-src-11.0.tar.xz 140252356 SHA256 0725a7f1d3e8985f4b2e31a2ad714334463a5016b203073a8fc196649f3d5a27 SHA512 ee1271bb38ee46fbab3d49b33f5b5afd76f9402b2e792581d63f02272df8e2a4011fac97ad550434f0c2fc5fe241940276629bde55e75f8638896a81339870cd WHIRLPOOL e1cda77189990c1d2187ab2d9e842ff3c619d8235f1ade56819fadc52f680a871de17cf05f8119614557c615ad19d41d1b6080c4b3768e7252889546b865d827
+DIST freebsd-src-11.0.tar.xz 140252356 BLAKE2B 78c9e446111034f2d334597b261deeab489af1841f411e8ee8b7d39ebff6965698dfbefca3f41034cb03760f55cbc36e9e134bc935e925b2109005c21e4a4c86 SHA512 ee1271bb38ee46fbab3d49b33f5b5afd76f9402b2e792581d63f02272df8e2a4011fac97ad550434f0c2fc5fe241940276629bde55e75f8638896a81339870cd
 DIST freebsd-src-11.1.tar.xz 147661560 SHA256 7e1186c2b3f6d070995b88bef5aded34089fed227c7b584c30b28cecaf428154 SHA512 b97707ec7a601ca6bcb682c45f6d94a38484301ac24630d7285eff6f88b027ce6900c93fc62f8ce36e0cf32c91f73a9d1c999db397b7f8782fd74a8551a03aca WHIRLPOOL 3f88b15153c25c7878d1a730213e5bc8c200c05427895ae97280c4412680bb8e67cf4f8170f9e2b0f21d63ec42365f44f7d5eafe614e9b8726f4bc3cc3825202
 DIST freebsd-ubin-8.2.tar.bz2 1808012 SHA256 6b99554f3ad6ee052069b347eb6e6219b71598d7b222acb90a24cbfc805c7b68 SHA512 48d0103323e820c431aa4f62d3be40cb3b200fb62e3de01f36c88760395bf2ba3367c51f3fa72da4dbccc2812176a051a12ca5cb7e84125c3e0fc78d4cab2c29 WHIRLPOOL ea8f3a29a37b42c2b5bcc0f2c343fa1538522157ef075363c94606a4620a590e9a03f856ce2494e3e727935b62431991d0aa9fde71de699e78b4fe225bdf1c2c
 DIST freebsd-ubin-9.1.tar.bz2 1910472 SHA256 ff6e586f213534b6ec2e65002c0dee64063d76ddad515c12221b1a80a1815e48 SHA512 74ae0aceec8597aa66c3f1ab313f0685a3c63d7273c36ae7baf8794275ad9bca241c60c3f6281cccf6d531d250d7611099977d3b1a27279cef3586401b6af05e WHIRLPOOL c85a3c9cf2bceff2c60ff03556bcc81d3aca22b0bce3c9538990071ac0a907236eee5ae7743ad22c5fd309b047ebf392aaaf2fe177ef5790ea869aff3da7e2fe
 DIST freebsd-usbin-8.2.tar.bz2 2443024 SHA256 aa7cabf10f5c3a9daabea32e4de24d04ec312247842981476da666eff5054603 SHA512 bcb8ff3df54848b9107bbb52e5ced7a91e24bb181f06769b6997221729b8064ec17652eaf7500de3268cbcb63ff5760beb54d15fc78c27b02687b5b1067c74a6 WHIRLPOOL 20f5278e2a1dd387a75b44f10507958d6c0e84a2faa1bddbf808c14ab86d8dd14a956192911bbc1880f5f5f7bd05972dcbb4aec85d241f0dcf91bf4246883f0a
-DIST freebsd-usbin-9.1.tar.bz2 2670916 SHA256 b938c20b8c09aa9a610e13b69b9afeea72f561ab3636a59fba2bdac290f4db75 SHA512 21c234312f70eb35cd2926519efc1f61592892f5d0940786dbeb959c3c5ec7819a51ae95c6e8a1a06aa01f669350fe0fd3dd7c4ec8a84dd6b90f24cb192356ca WHIRLPOOL 7f6ad2eb5410cc5e685881654a788807848af026b1277a974682755ab7c9db28f576bfd1576441ea10c5f1e9edb7d30a4a23fb8eccd6d69d86ecc9ce4c9adc7e
+DIST freebsd-usbin-9.1.tar.bz2 2670916 BLAKE2B 353c7e641c0cccf25b99cb454368bd3001cd6b85a15956b1ee2de1ab240c420602e04bf6d0389aca0bdd4f7d1206a6848516e58a17eda4881d849f078b71a139 SHA512 21c234312f70eb35cd2926519efc1f61592892f5d0940786dbeb959c3c5ec7819a51ae95c6e8a1a06aa01f669350fe0fd3dd7c4ec8a84dd6b90f24cb192356ca
diff --git a/sys-freebsd/freebsd-share/freebsd-share-11.1.ebuild b/sys-freebsd/freebsd-share/freebsd-share-11.1.ebuild
index 13169051c085..a579de545050 100644
--- a/sys-freebsd/freebsd-share/freebsd-share-11.1.ebuild
+++ b/sys-freebsd/freebsd-share/freebsd-share-11.1.ebuild
@@ -97,7 +97,7 @@ src_compile() {
 	export ESED="/usr/bin/sed"
 
 	# libiconv support.
-	if has_version ">=sys-freebsd/freebsd-lib-9.1-r11" ; then
+	if ! has_version "<sys-freebsd/freebsd-lib-9.1-r11" ; then
 		# i18n/csmapper/APPLE requires mkcsmapper_static
 		# i18n/esdb/APPLE requires mkesdb_static
 		for pkg in mkcsmapper_static mkesdb_static
diff --git a/sys-freebsd/freebsd-share/metadata.xml b/sys-freebsd/freebsd-share/metadata.xml
index 9a9053ff2d30..30006739b84a 100644
--- a/sys-freebsd/freebsd-share/metadata.xml
+++ b/sys-freebsd/freebsd-share/metadata.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>bsd@gentoo.org</email>
-    <name>BSD Project</name>
-  </maintainer>
-  <use>
-	<flag name="isdn">Enable ISDN support</flag>
-    <flag name="zfs">Enable ZFS support.</flag>
-  </use>
+	<maintainer type="project">
+		<email>bsd@gentoo.org</email>
+		<name>BSD Project</name>
+	</maintainer>
+	<use>
+		<flag name="isdn">Enable ISDN support</flag>
+		<flag name="zfs">Enable ZFS support.</flag>
+	</use>
 </pkgmetadata>
diff --git a/sys-freebsd/freebsd-sources/Manifest b/sys-freebsd/freebsd-sources/Manifest
index 5824822aed13..b9f00f4753e8 100644
--- a/sys-freebsd/freebsd-sources/Manifest
+++ b/sys-freebsd/freebsd-sources/Manifest
@@ -15,8 +15,10 @@ DIST freebsd-sources-SA-1618-atkbd.patch 352 SHA256 63e159fc9000df20dfb626e0bdaa
 DIST freebsd-sources-SA-1619-sendmsg.patch 247 SHA256 d847e42634e26e29b3ce1d68d28b7a687863070a4c1e3e51e7663785e2f6a7f0 SHA512 878e2b283358c050603cc32241077b25987696232bce3b9d41373c1186f5dbeb41881adc69e8754804054a57fffa71cad930b82ad8d5abd458779d5a3bd61978 WHIRLPOOL f077a1ba62110a5492d13413a1223b6b4b60553a0093a7344b5c7692b443cb5926c648ec151f6a566f1d099cc32df0c1ac0d29478843903e3cb8b221951d4e85
 DIST freebsd-sources-SA-1620-linux.patch 492 SHA256 a62f5402b2a3d2b73b684854eaed45864dade33f7b04d6469b556776866380a9 SHA512 1fb28b25ac5f89e2f7fa9a1f74ba83b4c949f2175217b669b5fcd2062c54307dcb50ad072acbe18162272b9bc29ba40ac4e19db1564a2959e885ac826a332ae5 WHIRLPOOL 7ba8da63513a495418a7e6433c4814eedb43e0305ada423057d2df27e90a51ce8b3caa7a06665fe114185c6335426ed12dbb346ef2a2c2c0d168a04707aa6395
 DIST freebsd-sources-SA-1621-stat.patch 223 SHA256 dd924b1f983ff653edb6676cb5f02621309c3493501c9741a35a2cbcc021cbbf SHA512 501244c0831d2aeb37c8a8aaa762cc6c8c39929355e6695df23dc83c78d6bb499dcb903f50c17e3f7774306d53836a0633d65e284167590c015aa1f8e10e5e4a WHIRLPOOL cd17cd613a2bb234224a21b491d4bfee6e9d9c43126689a8600f9d46eccf835661078fc926fd8a73599d30db770cb9fa0baa2817dcfb6ab3b06c1e39374bd946
+DIST freebsd-sources-SA-1708-ptrace.patch 696 BLAKE2B d040de29c3aca8fbc5d837c574e5ee81196ba41f1a90720579e854ba4e9786e23545547892d4e6d90c850161a53aaef7de014cbb918c45a261aea56b02cd2d7b SHA512 973bfe4e594fe34340ae723b3451a1b84a9877b51e1e14e8cd0a9944bec5bc4efec6ff39ba61998c1da1f2c2df0fe17272b3dad2e2cc3880cfa0ff6017d2730e
+DIST freebsd-sources-SA-1710-kldstat.patch 2155 BLAKE2B e2c47d72a4a497283d7def916cdf0991b5ec791f545736474db18301866362b3c96f0a4ac5e7c1c2a91535961ac048e5e1c1e7ad10d10ced3dba954453a04ef5 SHA512 a5cc0acfcac8401fb4066fd5bfbaa1c5718a38f05877b8fb1c5a9cce1df9af4a82bd1c263c80c2b58ad058349753dcec9c4aa13bdb178f3b80493785badc65a4
 DIST freebsd-src-10.3.tar.xz 126900216 SHA256 f50763dcac88e9b7ec616b77d537bf338f470350e2c85e0cc7decfcc8372b54d SHA512 a0c95fc4bbc5ad7599d0a83651a497e85cd85a5c433e5e175c57480b466c9eb5aa0390804d6336da8301c75ad499484399d39b8f7efbcfda8cafb09b1aa12d8f WHIRLPOOL bf5320bc506fb73a63d0fb324b60667a196ca2fef5d0215637a657c613f2052d76d002deb205e258f6d4e2aaea15490b26679e59a102606a34b58ab1f6b755ad
-DIST freebsd-src-11.0.tar.xz 140252356 SHA256 0725a7f1d3e8985f4b2e31a2ad714334463a5016b203073a8fc196649f3d5a27 SHA512 ee1271bb38ee46fbab3d49b33f5b5afd76f9402b2e792581d63f02272df8e2a4011fac97ad550434f0c2fc5fe241940276629bde55e75f8638896a81339870cd WHIRLPOOL e1cda77189990c1d2187ab2d9e842ff3c619d8235f1ade56819fadc52f680a871de17cf05f8119614557c615ad19d41d1b6080c4b3768e7252889546b865d827
+DIST freebsd-src-11.0.tar.xz 140252356 BLAKE2B 78c9e446111034f2d334597b261deeab489af1841f411e8ee8b7d39ebff6965698dfbefca3f41034cb03760f55cbc36e9e134bc935e925b2109005c21e4a4c86 SHA512 ee1271bb38ee46fbab3d49b33f5b5afd76f9402b2e792581d63f02272df8e2a4011fac97ad550434f0c2fc5fe241940276629bde55e75f8638896a81339870cd
 DIST freebsd-src-11.1.tar.xz 147661560 SHA256 7e1186c2b3f6d070995b88bef5aded34089fed227c7b584c30b28cecaf428154 SHA512 b97707ec7a601ca6bcb682c45f6d94a38484301ac24630d7285eff6f88b027ce6900c93fc62f8ce36e0cf32c91f73a9d1c999db397b7f8782fd74a8551a03aca WHIRLPOOL 3f88b15153c25c7878d1a730213e5bc8c200c05427895ae97280c4412680bb8e67cf4f8170f9e2b0f21d63ec42365f44f7d5eafe614e9b8726f4bc3cc3825202
 DIST freebsd-sys-8.2.tar.bz2 25835329 SHA256 0c6c7b61aae94db2931f985d5899f3bca78fc8ffab6b598fbaa158142d676f16 SHA512 6ea4516a5c52e25c4f993f7acb875463a5caea93dbdf250c5d48eee95fff226956e9f030cab7e341b5e6a132325bc3dbf93dcb4b1185acb011918e50b1a22be3 WHIRLPOOL 870deeff877c6b9fc812a4260e4fdbb6715a5dc2065cab3bfbf2a42d876f6654703ccb124275a4e2c410cef48f3db02b63cc76059eccf9cf90244826f35b7a15
-DIST freebsd-sys-9.1.tar.bz2 32588103 SHA256 b93a7ac8334ac16cc9f60665048e5ef812c0a6c62f10d0b0a674aec3f56516a8 SHA512 7dc9d9e00dde8f592bb171f4386d02b655b73cb4f153fe5ec063d010a148ef0639eae0dcdb3eeb09ecd1e3653c69e49a2d261329fa6d0381d2ddabe258ddde6d WHIRLPOOL c8348344dfb14bad64bd3a78ee615ddd29203175b292233254f8ba175e7a3fb7218af6f95f7b4dbf394c0354bafe9d8bb0c21cdf0ceaeb697214964b280469b3
+DIST freebsd-sys-9.1.tar.bz2 32588103 BLAKE2B 7f94a4735c6a17b39a86fa0fda0682924b18e4b466dc6319a5df889522aaeaffaa87e1b76582c48ae034df8c20169c8cea93bbd3d6e7abd0526716686f88dfe8 SHA512 7dc9d9e00dde8f592bb171f4386d02b655b73cb4f153fe5ec063d010a148ef0639eae0dcdb3eeb09ecd1e3653c69e49a2d261329fa6d0381d2ddabe258ddde6d
diff --git a/sys-freebsd/freebsd-sources/freebsd-sources-11.1_p1.ebuild b/sys-freebsd/freebsd-sources/freebsd-sources-11.1_p2.ebuild
similarity index 98%
rename from sys-freebsd/freebsd-sources/freebsd-sources-11.1_p1.ebuild
rename to sys-freebsd/freebsd-sources/freebsd-sources-11.1_p2.ebuild
index 4c48fd28a2c5..9e5d7d77934f 100644
--- a/sys-freebsd/freebsd-sources/freebsd-sources-11.1_p1.ebuild
+++ b/sys-freebsd/freebsd-sources/freebsd-sources-11.1_p2.ebuild
@@ -12,7 +12,9 @@ LICENSE="BSD dtrace? ( CDDL ) zfs? ( CDDL )"
 IUSE="+build-kernel debug dtrace zfs"
 
 # Security Advisory and Errata patches.
-UPSTREAM_PATCHES=( "EN-17:07/vnet.patch"
+UPSTREAM_PATCHES=( "SA-17:08/ptrace.patch"
+	"SA-17:10/kldstat.patch"
+	"EN-17:07/vnet.patch"
 	"EN-17:08/pf.patch" )
 
 if [[ ${PV} != *9999* ]]; then
diff --git a/sys-freebsd/freebsd-ubin/Manifest b/sys-freebsd/freebsd-ubin/Manifest
index e57a351bfcc1..7e3ba527a9f9 100644
--- a/sys-freebsd/freebsd-ubin/Manifest
+++ b/sys-freebsd/freebsd-ubin/Manifest
@@ -3,18 +3,18 @@ DIST freebsd-bin-9.1.tar.bz2 385664 SHA256 0a9524d75a8cb4c9c2654f2f9843087b09e85
 DIST freebsd-cddl-8.2.tar.bz2 823706 SHA256 6d2b2362ce60538bcba4afa47bd6baa98b05292babae4b20d6ba08592ce98698 SHA512 9f9728d9bf0f9fb320a0378186b29133e5e9276494f57ac3cffa9917ec94d3b886708406990107f2fbf742c255f9ac716f35ea14f6a6a835712eb55581421721 WHIRLPOOL 0150d972fc5200efcf22b5baded0bc7d826f03420a8328bc9ce1f53f39d1f3cd07dc367fcb3b0c8bdcc3b33bc9045f262928d76532c91820fd3c6bc8c9ee57c9
 DIST freebsd-cddl-9.1.tar.bz2 899348 SHA256 bcc79fb002052128e9e91b16beb3083ee152be0936494715c6c159bfc8d2ca3a SHA512 ae0a969e710785bbcf36a2ec22cc5b1dcdb25398be951e047a1237d0c977e38fc9e05504db51f8bf9ed83bc1f68b04fc88ce18fc48a93f785b8a3f8ef481bacd WHIRLPOOL 2c4a5baf162dbb698af45b9262f104e27c05e6a2630c3e7b1765e76c8987a330c315f741df69c8771d2509708d2934db2a07f2e0218aa59d0100dfc3f952bf72
 DIST freebsd-contrib-8.2.tar.bz2 40931651 SHA256 8b9cb688e81c2980b3fc66411d00ab277a24dadd50d5bdd5e0e6c63ac687b9b6 SHA512 4f7bf825b579fbb88f2aac531d07e531474179c63fa0b66c4e80821290a8c94bf611bb4dcaef51b762aacd25b11dfae798a4ec3bad3b9e3f6b3490ebfaa72476 WHIRLPOOL edd3d9e26e8d22d9028082e107ec1a44402e206dab8722f34b445676959305996c3f699152af42ace249b7f58498492787823b172fb6bcb273119c6bb50a35f0
-DIST freebsd-contrib-9.1.tar.bz2 54751432 SHA256 e7ffa056d4050ce03ee8e23e276e2a9a494326a98d60c43bee2afcc59576deb8 SHA512 71be13049258c6e6b5e4f63cc16da5d349a89d68f04d87446e4ad33ae8bf2a93ea67d9c256b7bec60b61e65db0487268070cfb77a484c3ac0f8ba368b48c2438 WHIRLPOOL a2a84423175499208d34809e802284d6ba649f317c3a9ad8b7312fa19efe142ebadab0048bac0db8e988e59f9a7468ac7c5d0d25e78b82bdb269a20d18153cee
+DIST freebsd-contrib-9.1.tar.bz2 54751432 BLAKE2B 8a30e78021e6388d679637d2dbe0ed3f4896d3902064baaafa79de9c328171cbcb895b0ffd3d0d0cd3ca25c93a73584ed4900b45bd672a73b15b75721de59de5 SHA512 71be13049258c6e6b5e4f63cc16da5d349a89d68f04d87446e4ad33ae8bf2a93ea67d9c256b7bec60b61e65db0487268070cfb77a484c3ac0f8ba368b48c2438
 DIST freebsd-etc-8.2.tar.bz2 188629 SHA256 6bc745fa259f9fa2b65df865d45443a7b23c24445195e33a4ac50bf1040ae238 SHA512 3e5c106754a6a1ac806bd46b711fba7ee9cb31a4eab5262c995a5d59dbeb02f756dd8b495640dda94189d204a5d2c5218de2bd23467172d6a4ebe1048986e89c WHIRLPOOL 23b658a214f1a64c43420351020e32b1182e9aac3ed5253f49ee86f9cee9166ce32bd556cd2a2b3c0e60a165462a8700f37dea19e57ad5716415e17f61da912e
-DIST freebsd-etc-9.1.tar.bz2 207776 SHA256 a317bf85532d6192f5506e8d7bd5d5c201fe24017700e3a974a7712c2c69cdb8 SHA512 4fbe56fde519cf2f44e39a8869efa26c34f703cf540f4a83389da8d170873d7c6fb18e4010e643b8d793cfc5c55d15eeb198057a5b2a8da9d9e8f791801bf314 WHIRLPOOL 0c27019fe140fe96f870697acbaa89ac2f281f55b892c5791b08abf1cfa4da94d9d42a1df1c2091317573ed7234253857aecb797065f911a0a5d57bbf64349a5
+DIST freebsd-etc-9.1.tar.bz2 207776 BLAKE2B 61fbfa11dfcd24c007c20940a4b7cc802dfb9a991e41433840c57f113eaaa9e2b833a15f48d60c706e55d941b0a999baabd0c33197cffd522b67c57eaa9460f1 SHA512 4fbe56fde519cf2f44e39a8869efa26c34f703cf540f4a83389da8d170873d7c6fb18e4010e643b8d793cfc5c55d15eeb198057a5b2a8da9d9e8f791801bf314
 DIST freebsd-include-8.2.tar.bz2 138992 SHA256 fade90621a8e4880c9583c1ee49965400c88e53ac6c07cb5dcf320e4f069271d SHA512 6bc820dde866589ef75f9f0d1c469d815439bdd4c79f0e1a2482ec58f938b638cb9106969b321aa72492f933c95c76895ce489727a5e265798c93adc75dd64e3 WHIRLPOOL 64d3160c4ac46a62f5969058e07bd160c92284f08805ed917f2073ba1cb5907cfca16c5893daf30254d39b4fcdf641ab6afb9817607f65e7789d3049e8103947
-DIST freebsd-include-9.1.tar.bz2 146881 SHA256 861dce3f39e6806762b102361017cbe148f0e2b768b3fca152f8426f44a2942f SHA512 779c8315ce2b10b343bb62e331525d510b0d68ce5d665a1672bd6f4d1eff6445bc6b7a0f178b319828aa203c4e4c04c561ce793052703f4f936ce9711280a0c9 WHIRLPOOL e16ba45d380591ba007ca59579d45f61ffc1aa1a4c08fc11ed2794979b0a189a346c81b4f70a44ee199d50a72024930f28587ad62a9cd6854fc937eb466ec115
+DIST freebsd-include-9.1.tar.bz2 146881 BLAKE2B 3db8570a8c841ec1c9ceff479bd0ef9b146b2a343d6596892c9d8a9f9193404f6c62712cb96d7416c6e5cc4c46e7fb942421c47e1bc2c707dde534e2050be442 SHA512 779c8315ce2b10b343bb62e331525d510b0d68ce5d665a1672bd6f4d1eff6445bc6b7a0f178b319828aa203c4e4c04c561ce793052703f4f936ce9711280a0c9
 DIST freebsd-lib-8.2.tar.bz2 3323878 SHA256 e3590c12794fcb5ba8eb7a1f58b497587cf19f9200b3254c194a793da3b5bfb0 SHA512 c059cfdd1099bb519b2a5c43fb7e7104c500ef8906229ed7eb9e420cb3a217cdaf8655e9e7a9f45cfadc5491f8115e0e738fd49251d9f0c3a83780845b09f007 WHIRLPOOL 95f98a372f44a89bc8ac3029ec065dbbfec338e6f889d057d75644bfcdfb9d27fdc0421d7e392cad5a823712b97f0857297ec3d321580254c63032c22b95792e
-DIST freebsd-lib-9.1.tar.bz2 3206685 SHA256 f31fa8107b4de711c548f6d0c1bb1f81d09f51bcc3b14a1e9e90bb0e7cc4a35d SHA512 40d0c36b6b889c404fa0e0afa38ba4e84a55bc88ffa2f98a70afbd7a32c4f32c158617ba770567d082a986d62c09b3ec8db3dc5ab853ee1c9bbe0b90bb82396e WHIRLPOOL 581878bf9c43184b043b4293409b85901c9ed1f9bd279e965414aca41ba50950848ebda3ee10a503a028135dfd2765e95a11acd4e62a11c528e104392bbbd8d0
+DIST freebsd-lib-9.1.tar.bz2 3206685 BLAKE2B 67f93b7951fc03e877ee525d53b81ba49c8c1a70041c30aac97665d5dab7b3f2817fdb3bbb1475be66c33a7f996309e9020f1a3d1154fab8e2f6789f5ae0bb18 SHA512 40d0c36b6b889c404fa0e0afa38ba4e84a55bc88ffa2f98a70afbd7a32c4f32c158617ba770567d082a986d62c09b3ec8db3dc5ab853ee1c9bbe0b90bb82396e
 DIST freebsd-src-10.3.tar.xz 126900216 SHA256 f50763dcac88e9b7ec616b77d537bf338f470350e2c85e0cc7decfcc8372b54d SHA512 a0c95fc4bbc5ad7599d0a83651a497e85cd85a5c433e5e175c57480b466c9eb5aa0390804d6336da8301c75ad499484399d39b8f7efbcfda8cafb09b1aa12d8f WHIRLPOOL bf5320bc506fb73a63d0fb324b60667a196ca2fef5d0215637a657c613f2052d76d002deb205e258f6d4e2aaea15490b26679e59a102606a34b58ab1f6b755ad
-DIST freebsd-src-11.0.tar.xz 140252356 SHA256 0725a7f1d3e8985f4b2e31a2ad714334463a5016b203073a8fc196649f3d5a27 SHA512 ee1271bb38ee46fbab3d49b33f5b5afd76f9402b2e792581d63f02272df8e2a4011fac97ad550434f0c2fc5fe241940276629bde55e75f8638896a81339870cd WHIRLPOOL e1cda77189990c1d2187ab2d9e842ff3c619d8235f1ade56819fadc52f680a871de17cf05f8119614557c615ad19d41d1b6080c4b3768e7252889546b865d827
+DIST freebsd-src-11.0.tar.xz 140252356 BLAKE2B 78c9e446111034f2d334597b261deeab489af1841f411e8ee8b7d39ebff6965698dfbefca3f41034cb03760f55cbc36e9e134bc935e925b2109005c21e4a4c86 SHA512 ee1271bb38ee46fbab3d49b33f5b5afd76f9402b2e792581d63f02272df8e2a4011fac97ad550434f0c2fc5fe241940276629bde55e75f8638896a81339870cd
 DIST freebsd-src-11.1.tar.xz 147661560 SHA256 7e1186c2b3f6d070995b88bef5aded34089fed227c7b584c30b28cecaf428154 SHA512 b97707ec7a601ca6bcb682c45f6d94a38484301ac24630d7285eff6f88b027ce6900c93fc62f8ce36e0cf32c91f73a9d1c999db397b7f8782fd74a8551a03aca WHIRLPOOL 3f88b15153c25c7878d1a730213e5bc8c200c05427895ae97280c4412680bb8e67cf4f8170f9e2b0f21d63ec42365f44f7d5eafe614e9b8726f4bc3cc3825202
 DIST freebsd-sys-8.2.tar.bz2 25835329 SHA256 0c6c7b61aae94db2931f985d5899f3bca78fc8ffab6b598fbaa158142d676f16 SHA512 6ea4516a5c52e25c4f993f7acb875463a5caea93dbdf250c5d48eee95fff226956e9f030cab7e341b5e6a132325bc3dbf93dcb4b1185acb011918e50b1a22be3 WHIRLPOOL 870deeff877c6b9fc812a4260e4fdbb6715a5dc2065cab3bfbf2a42d876f6654703ccb124275a4e2c410cef48f3db02b63cc76059eccf9cf90244826f35b7a15
-DIST freebsd-sys-9.1.tar.bz2 32588103 SHA256 b93a7ac8334ac16cc9f60665048e5ef812c0a6c62f10d0b0a674aec3f56516a8 SHA512 7dc9d9e00dde8f592bb171f4386d02b655b73cb4f153fe5ec063d010a148ef0639eae0dcdb3eeb09ecd1e3653c69e49a2d261329fa6d0381d2ddabe258ddde6d WHIRLPOOL c8348344dfb14bad64bd3a78ee615ddd29203175b292233254f8ba175e7a3fb7218af6f95f7b4dbf394c0354bafe9d8bb0c21cdf0ceaeb697214964b280469b3
+DIST freebsd-sys-9.1.tar.bz2 32588103 BLAKE2B 7f94a4735c6a17b39a86fa0fda0682924b18e4b466dc6319a5df889522aaeaffaa87e1b76582c48ae034df8c20169c8cea93bbd3d6e7abd0526716686f88dfe8 SHA512 7dc9d9e00dde8f592bb171f4386d02b655b73cb4f153fe5ec063d010a148ef0639eae0dcdb3eeb09ecd1e3653c69e49a2d261329fa6d0381d2ddabe258ddde6d
 DIST freebsd-ubin-8.2.tar.bz2 1808012 SHA256 6b99554f3ad6ee052069b347eb6e6219b71598d7b222acb90a24cbfc805c7b68 SHA512 48d0103323e820c431aa4f62d3be40cb3b200fb62e3de01f36c88760395bf2ba3367c51f3fa72da4dbccc2812176a051a12ca5cb7e84125c3e0fc78d4cab2c29 WHIRLPOOL ea8f3a29a37b42c2b5bcc0f2c343fa1538522157ef075363c94606a4620a590e9a03f856ce2494e3e727935b62431991d0aa9fde71de699e78b4fe225bdf1c2c
 DIST freebsd-ubin-9.1.tar.bz2 1910472 SHA256 ff6e586f213534b6ec2e65002c0dee64063d76ddad515c12221b1a80a1815e48 SHA512 74ae0aceec8597aa66c3f1ab313f0685a3c63d7273c36ae7baf8794275ad9bca241c60c3f6281cccf6d531d250d7611099977d3b1a27279cef3586401b6af05e WHIRLPOOL c85a3c9cf2bceff2c60ff03556bcc81d3aca22b0bce3c9538990071ac0a907236eee5ae7743ad22c5fd309b047ebf392aaaf2fe177ef5790ea869aff3da7e2fe
 DIST freebsd-ubin-EN-1621-localedef.patch 1958 SHA256 4cc2fe1bed57c303f919c1824b8754d7804dcf96bc2c349b5051995995e3a878 SHA512 191661a189dbb33979de04f68cac1701ee0f3af52921be1e0566590b462e475e5883cd0495b001c42b7bfdaf60e0360ea53ddc2ea729cc1bc13cbf228aaa284a WHIRLPOOL 73fa520f2f24fce7dfdefc8b7306e9802936f37296d1dab6339cb86c51a917f1acc60e14070ff71e96d5234fc186a1112c6f7f2196265e367f04a496b739c1bd
diff --git a/sys-freebsd/freebsd-ubin/freebsd-ubin-11.1.ebuild b/sys-freebsd/freebsd-ubin/freebsd-ubin-11.1.ebuild
index b731c32e8f4d..0aa366c68d63 100644
--- a/sys-freebsd/freebsd-ubin/freebsd-ubin-11.1.ebuild
+++ b/sys-freebsd/freebsd-ubin/freebsd-ubin-11.1.ebuild
@@ -100,7 +100,7 @@ pkg_setup() {
 	use ssl || mymakeopts="${mymakeopts} WITHOUT_OPENSSL= "
 	use usb || mymakeopts="${mymakeopts} WITHOUT_USB= "
 	use zfs || mymakeopts="${mymakeopts} WITHOUT_CDDL= "
-	mymakeopts="${mymakeopts} WITHOUT_CLANG= WITHOUT_LZMA_SUPPORT= WITHOUT_SVN= WITHOUT_SVNLITE= WITHOUT_OPENSSH= WITHOUT_LDNS_UTILS= WITHOUT_MANDOCDB= WITHOUT_GPL_DTC= "
+	mymakeopts="${mymakeopts} WITHOUT_CLANG= WITHOUT_LZMA_SUPPORT= WITHOUT_SVN= WITHOUT_SVNLITE= WITHOUT_OPENSSH= WITHOUT_LDNS_UTILS= WITHOUT_MANDOCDB= "
 }
 
 pkg_preinst() {
diff --git a/sys-freebsd/freebsd-ubin/metadata.xml b/sys-freebsd/freebsd-ubin/metadata.xml
index a7fa78a99dc3..ef58187231a3 100644
--- a/sys-freebsd/freebsd-ubin/metadata.xml
+++ b/sys-freebsd/freebsd-ubin/metadata.xml
@@ -1,24 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>bsd@gentoo.org</email>
-    <name>BSD Project</name>
-  </maintainer>
-  <use>
-    <flag name="audit">
-      Build auditing tools.
-    </flag>
-    <flag name="netware">
-      Build libraries and tools to work with NetWare protocols (IPX
-      and NCP).
-    </flag>
-	<flag name="ar">
-	  Build FreeBSD's ar and ranlib replacements based on libarchive. The
-	  toolchain will still use binutils' version but you can play with it.
-	  They have been renamed to freebsd-ar and freebsd-ranlib not to collide
-	  with binutils.
-	</flag>
-    <flag name="zfs">Enable ZFS support (for fstat actually).</flag>
-  </use>
+	<maintainer type="project">
+		<email>bsd@gentoo.org</email>
+		<name>BSD Project</name>
+	</maintainer>
+	<use>
+		<flag name="audit">Build auditing tools</flag>
+		<flag name="netware">Build libraries and tools to work with NetWare protocols (IPX and NCP)</flag>
+		<flag name="ar">
+			Build FreeBSD's ar and ranlib replacements based on libarchive. The
+			toolchain will still use binutils' version but you can play with it.
+			They have been renamed to freebsd-ar and freebsd-ranlib not to collide
+			with binutils.
+		</flag>
+		<flag name="zfs">Enable ZFS support (for fstat actually).</flag>
+	</use>
 </pkgmetadata>
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index 5c4d860f9b02..4c115fa7bfe3 100644
Binary files a/sys-kernel/Manifest.gz and b/sys-kernel/Manifest.gz differ
diff --git a/sys-kernel/genkernel-next/Manifest b/sys-kernel/genkernel-next/Manifest
index 0950d7d48c0f..12fb8a289ad9 100644
--- a/sys-kernel/genkernel-next/Manifest
+++ b/sys-kernel/genkernel-next/Manifest
@@ -1,3 +1,2 @@
-DIST genkernel-next-65.tar.gz 2402179 SHA256 f12f4291f75b9078d1d81cfa047efb3d60ea42dc5e956a20c701c6a9e0f271d3 SHA512 a65770f122617a5e15bd1eefee7b72fee1ad6468d3d51195b1798e48d507b27088b6fa2bb719f579847c73a639be066170b497c3d8d86d2738236a6981188bbc WHIRLPOOL 42a754b1d21dc651955d6533e66555824a2a431c5ddd1c19983a8993841fc7e73b1955e83e0cc2321a91b354f69aff2bb4e6785e56302c96f99cf2f2153c4d5d
 DIST genkernel-next-66.tar.gz 2402393 SHA256 63c54e0319f2b8463e3b6cf3aefefc1199cc1899c2e1a326977cbaaf24dac080 SHA512 c4c1ef8b389da6db87a00179139d677137938ac20718865b876026213b3a4c650db2e856517418bc5aae7c96657d9eab9ef2bfbdef9257bf2b7623c387ea8d87 WHIRLPOOL ccdac0f0e444e54dacaa854fa95dd8315c62c13538113ff4ecf9a8ad6ed6f04dded8231d33c6e605201875ba690bb3a2a9f1d05cc7bdece57e1331df10e6979f
-DIST genkernel-next-68.tar.gz 2402773 SHA256 f4c1bd755b24bf1c6a0d37d35390eff648268742c4af5005ce66f38bf149937b SHA512 7802fa57727dce664ff0354980132490bf55ccdd514c8fe4550eb5aa4a2a3c55663970ba67173878891f1b2b5272d529141b963067949e650b914c10e7801a28 WHIRLPOOL 0f3347a8e3f6b2e537285d6c52bf6bb9fb3637ed2951471d348647c4e4642e4daf3767aa9d2fc2c28f0e1e7f3d076e35fe9315f06439b665b91618d3786b0832
+DIST genkernel-next-68.tar.gz 2402773 BLAKE2B 980689aeb6a02401d0f4294062e0d30f1b3c6823bddc746c0b4eafa28862df1301d05448d07d79d76e700d6eded8b0f37b03985882283aff37567b5fe9f72ae3 SHA512 7802fa57727dce664ff0354980132490bf55ccdd514c8fe4550eb5aa4a2a3c55663970ba67173878891f1b2b5272d529141b963067949e650b914c10e7801a28
diff --git a/sys-kernel/genkernel-next/genkernel-next-65.ebuild b/sys-kernel/genkernel-next/genkernel-next-65.ebuild
deleted file mode 100644
index ee350d721179..000000000000
--- a/sys-kernel/genkernel-next/genkernel-next-65.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SRC_URI="https://github.com/Sabayon/genkernel-next/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~alpha amd64 ~arm ia64 ppc ppc64 x86"
-inherit bash-completion-r1
-
-DESCRIPTION="Gentoo automatic kernel building scripts, reloaded"
-HOMEPAGE="https://www.gentoo.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="cryptsetup dmraid gpg iscsi mdadm plymouth selinux"
-DOCS=( AUTHORS )
-
-DEPEND="app-text/asciidoc
-	sys-fs/e2fsprogs
-	!sys-fs/eudev[-kmod,modutils]
-	selinux? ( sys-libs/libselinux )"
-RDEPEND="${DEPEND}
-	!sys-kernel/genkernel
-	cryptsetup? ( sys-fs/cryptsetup )
-	dmraid? ( >=sys-fs/dmraid-1.0.0_rc16 )
-	gpg? ( app-crypt/gnupg )
-	iscsi? ( sys-block/open-iscsi )
-	mdadm? ( sys-fs/mdadm )
-	plymouth? ( sys-boot/plymouth )
-	app-portage/portage-utils
-	app-arch/cpio
-	>=app-misc/pax-utils-0.6
-	!<sys-apps/openrc-0.9.9
-	sys-apps/util-linux
-	sys-block/thin-provisioning-tools
-	sys-fs/lvm2"
-
-src_prepare() {
-	default
-	sed -i "/^GK_V=/ s:GK_V=.*:GK_V=${PV}:g" "${S}/genkernel" || \
-		die "Could not setup release"
-}
-
-src_install() {
-	default
-
-	doman "${S}"/genkernel.8
-
-	newbashcomp "${S}"/genkernel.bash genkernel
-}
diff --git a/sys-kernel/rt-sources/Manifest b/sys-kernel/rt-sources/Manifest
index 7c71a34c846d..76c3ecd89b83 100644
--- a/sys-kernel/rt-sources/Manifest
+++ b/sys-kernel/rt-sources/Manifest
@@ -1,34 +1,42 @@
 DIST deblob-3.18 127087 SHA256 c720eabb3911f8dfa4398c4250853df4633018abebc01a509ee4a283c3e00941 SHA512 6fe33762ba19aad7ff891b7b805cc26f6e2926f5e40c92fa45bc7f31bdeb5c8fc42b97e5d37d71b9422da239c7c54abd25f1fa2fa1e5733c6053abbf4c9e9011 WHIRLPOOL c351a3ae15c59081fca69c1b5d9b9de10f024eb01f1426722a0d6ccb7caa34330be42897cd85cf19b22ff876352b0cec1c19707edc81c4cb01ad9c1df2e3d831
 DIST deblob-4.1 130695 SHA256 2888a5a3b5e8e9ec242e4d702582fa1d739a1274fcd94643a9fb3516a210a8a7 SHA512 b861b9b53f9295e5e993784031ce57cf8cddc418184ec00c28ed92c9e7660406e0ede581a93d0def36e7847b8e068c8ca6c4dfdd65c15cb174d6c5803c16214a WHIRLPOOL b90f55dd8702eb254968ed7689b50859833ed362e9aa1720ade96aa1f6f84e8f90f5d1eee034c8535e8bf767c0b5f8b0bc559219e8d81d4c6ed53bd5cfe5e65e
 DIST deblob-4.11 148749 SHA256 4c31a9e39d302a7dfe4ba2bf550dc49312db5949a611dda343575e6ca3b8f06c SHA512 e560c76cf340d88930e1b2ff1cd86ced028922faa30a0ae6ade34eb92dc8ca916917b62d84c33be5030c697326bc8808fd1fa259a6767eec83227a06df646199 WHIRLPOOL 37b8c818b9073affda24c481928bb4d606a47a72bdba70d1148669c368e417785149bd5d6e5f303b25ebfcfb1b021b52bc01c89a8120963a29c2e0cddba4752b
-DIST deblob-4.13 153698 SHA256 fffae6f02f5c02dfbbbe0320954c19c5d68011c120aa0852860e48b26c418131 SHA512 e69a95ac3cdfccb042cd9a987d789a4d17e2b1f253bf724023896c936a2e36e3c205ca28064d96ba8bbdf8946822099e70da573ac99d881a837c91e55e8c7970 WHIRLPOOL 198b47b73b9f7cc5d5a9cab7997fd007d4ee791bf3e39023bc740dfcd4602376128f8ad4564e3b996cbc0a51bec7711f7afdcf5f1e85d57cc1c50d45ec02b778
+DIST deblob-4.13 153698 BLAKE2B 92589ffb1a26bcd4ef80557d9eb7302d8d64175f9f77970bb5ee6545e766af130139bcbf0dfd91b176a001534fd66606f22887295a3dc9b68b96e02ca33594c7 SHA512 e69a95ac3cdfccb042cd9a987d789a4d17e2b1f253bf724023896c936a2e36e3c205ca28064d96ba8bbdf8946822099e70da573ac99d881a837c91e55e8c7970
 DIST deblob-4.4 137370 SHA256 7cf11c8594db0d2a10a1b02390c9ff8916f1d2a1fe9d59058ca45485500c5274 SHA512 ea5f2f2cdbc97bdc90c2131f846761dc1630a53986db10d8e9d07d1ddee12a9d878c57790edd3ecc75ed9792d479b7b726c39d688a3926e850608c81b1b78a3a WHIRLPOOL bedd494be2032ce4b8911f25df906055d019af31ea6548b885482f870cd5313e09e7fb544fc8db268b3498cc18c199ae5701023839c972b48dbd8128239eeb75
 DIST deblob-4.9 146273 SHA256 af4214b851928a53ef470ed8729122b9db910a6c0769d5d46a5de0b3e96f74f3 SHA512 3654b28e72b343bafdb38de10ef0c3621db0539bc0e7434bc99bb8f8ed911d4c9e53ca4785fd193fcfec369328f014fa5c6f3bda51b6f1a8f98b8c37ece119a6 WHIRLPOOL 7b5ddba1469b6515d03d2e0e91a643ab0252803fde271ca710978186582a2f1a3b01deab9718c194bcdae0a79887636b6e98e604305402c9051b15a89fd393df
 DIST deblob-check-3.18 654232 SHA256 30f22602b6ddf2cbccc16ef25fdc4d92755f3972e1c671d7cab8b9d6865eb155 SHA512 2cff9abef479a55dd6a0699371be8227ba63b18da1fb153d5df382e0a5e4f1b745b7de256a367a36efa9d12e2aad5622cc288efef009feebf81c108dbef4fe16 WHIRLPOOL e92927ad1565e80ce87e8bda372f8f7eb42bc0f47ad9b19fe5cf737903b2021fd6e3756e8d22b70f3037a46c254fec8b7285b37beb10795ccb4ca99d38876f8c
 DIST deblob-check-4.1 674781 SHA256 54aa33e23a31ead6f982b830be86003c306b88f0d0a9f96c7dc66fe7cd274acb SHA512 51fe9d70d723992aaf70f8bfcfcc12ecfedd7a039402ddae07858fb087693b00cd80d1e0e1a5053e049f2a2b8c58ed23e4598e2dae902c4999999c08bc2eeb33 WHIRLPOOL d2c22280e12863793f8e866b126be53ee10d564373addfe9399b2afe22dd7584513c050f334ea08e6d63dd27a1574f2754456bad9d0a42e8c8d9995eec27aed0
 DIST deblob-check-4.11 734493 SHA256 39312ac206c249257018e85d4c3455f9bcad0205b4bd18eef28971492090fb43 SHA512 f3ae2b80ac16f223349c741877c64d619fda2be9ce5a28741cfaf626cb2104547f0f638e6d56afa524054b4ec4ccc8f720515c8518ab333d95bfd29cd8ad056d WHIRLPOOL c2b0289118d4db9972c25e08a4268b89d7b9ea54ba32adb5da06929823ddd852a4b5538b9e8953ff91967645b3089e8a8123ae5fc6411e24500f11f4e034c301
-DIST deblob-check-4.13 748983 SHA256 3263301b10c9908dd7cf1d968c86e7a050fd45c4f48de9b76c8b25a42f1b6077 SHA512 83042d108418b5bc423c98a21c5aa6f022bcd7dc4aae0bf4c9703ee4d383019487af69529a7d381003ede6a706ff4ca7eea35e11d1aab6e23b029c02ab7ac662 WHIRLPOOL 152880098935ec974cf9aa5ccd6a85e6659f6d7c68375969b598197215f48ca862e6034da24b4281f8cf80f9b688cb0a879207c7e4f26bcce9b47f52e13ff1c1
+DIST deblob-check-4.13 748983 BLAKE2B 6aeafbb878105a50f68afc321dd57faf387c2fd40f240abe7fa0eddf70f7340233178d9d4ba26592c69d3ec9bea25e87dacd88d9cf4a80c23007dae6a7bafd3d SHA512 83042d108418b5bc423c98a21c5aa6f022bcd7dc4aae0bf4c9703ee4d383019487af69529a7d381003ede6a706ff4ca7eea35e11d1aab6e23b029c02ab7ac662
 DIST deblob-check-4.4 694225 SHA256 e142bafdd5a05280d5280fbf109aadab3af9ce71152ab2d27ad41e96766e0c3e SHA512 6554ae567566da4d30e94a37622f88343b8e96ab39a9204fee34de4ddb5dac8c4906b25843b63c2388d03a4441821c25d395b3c39fc875c498a69e677a4f0cb5 WHIRLPOOL 414f60a64a2c14f01eedebc84f5adfabf0562bcf76545a57e757cb6ac914ffc49c90c329eedd1aafb1ee752bfc082fd4f6af173774f4f853ddd637525fbeeb9b
 DIST deblob-check-4.9 717834 SHA256 4599c6eabd53bb352e9b536d574152e72467548add19757fc6b8e34355928d6b SHA512 46258698f1c574b44a8c5c78cc2b7fdbaca746976266974ee0f6787904531754b17ad15d542b68e07d4633ee91a8e2d9c32a991ea214292ac072c4f26deed9c9 WHIRLPOOL f1afe1f8d8bcd6fc43a01da5eb012d117687418f049212fe20fe7ea88700c482bc6fd3e917102ff9d12baf11e678a40355877a7d214da8b3cbf2b585a51a012e
-DIST linux-3.18.tar.xz 80934708 SHA256 becc413cc9e6d7f5cc52a3ce66d65c3725bc1d1cc1001f4ce6c32b69eb188cbd SHA512 2f0b72466e9bc538a675738aa416573d41bbbd7e3e2ffd5b5b127afde609ebc278cec5a3c37e73479607e957c13f1b4ed9782a3795e0dcc2cf8e550228594009 WHIRLPOOL 81634af631b7d30ccd1f4798f96f44d9aa0ba6609b73f2747eb6aebaf7a99487fb2dbd45767605186182533cb222bfd9236e8dd5e11a04fdb67c211e4e0a91d6
-DIST linux-4.1.tar.xz 83017828 SHA256 caf51f085aac1e1cea4d00dbbf3093ead07b551fc07b31b2a989c05f8ea72d9f SHA512 168ef84a4e67619f9f53f3574e438542a5747f9b43443363cb83597fcdac9f40d201625c66e375a23226745eaada9176eb006ca023613cec089349e91751f3c0 WHIRLPOOL 85fcfdb67ea7f865272a85d3b4c3ec1f5a1267f4664bf073c562bb3875e9d96ad68486259d8866a9aced98c95de16840ec531d89745aec75b7315a64ebe650b8
-DIST linux-4.11.tar.xz 95447768 SHA256 b67ecafd0a42b3383bf4d82f0850cbff92a7e72a215a6d02f42ddbafcf42a7d6 SHA512 6610eed97ffb7207c71771198c36179b8244ace7222bebb109507720e26c5f17d918079a56d5febdd8605844d67fb2df0ebe910fa2f2f53690daf6e2a8ad09c3 WHIRLPOOL f577b7c5c209cb8dfef2f1d56d77314fbd53323743a34b900e2559ab0049b7c2d6262bda136dd3d005bc0527788106e0484e46558448a8720dac389a969e5886
-DIST linux-4.13.tar.xz 100579888 SHA256 2db3d6066c3ad93eb25b973a3d2951e022a7e975ee2fa7cbe5bddf84d9a49a2c SHA512 a557c2f0303ae618910b7106ff63d9978afddf470f03cb72aa748213e099a0ecd5f3119aea6cbd7b61df30ca6ef3ec57044d524b7babbaabddf8b08b8bafa7d2 WHIRLPOOL d3d332e02cd3c5056c76c28cf1f81504c6f7b8f2caed7238e7dd7866747fb03154b88d8d7aec4d0eddf5760624bc7d6c5485fb52a3e32d098a2742eba96c0d05
-DIST linux-4.4.tar.xz 87295988 SHA256 401d7c8fef594999a460d10c72c5a94e9c2e1022f16795ec51746b0d165418b2 SHA512 13c8459933a8b80608e226a1398e3d1848352ace84bcfb7e6a4a33cb230bbe1ab719d4b58e067283df91ce5311be6d2d595fc8c19e2ae6ecc652499415614b3e WHIRLPOOL 02abc203d867404b9934aaa4c1e5b5dcbb0b0021e91a03f3a7e7fd224eed106821d8b4949f32a590536db150e5a88c16fcde88538777a26d0c17900f0257b1bc
-DIST linux-4.9.tar.xz 93192404 SHA256 029098dcffab74875e086ae970e3828456838da6e0ba22ce3f64ef764f3d7f1a SHA512 bf67ff812cc3cb7e5059e82cc5db0d9a7c5637f7ed9a42e4730c715bf7047c81ed3a571225f92a33ef0b6d65f35595bc32d773356646df2627da55e9bc7f1f1a WHIRLPOOL 072505b29972ad120eb25a074217847c9c2813416c4903e605a0433574f5f87616dbea0b1454e4b19acc48107f11274b682958b1d773373156e99f8163e6606a
-DIST patch-3.18.69-rt75.patch.xz 173580 SHA256 374d1b20fb84024a9738034346d1761181afc1c988b8fc9ac475673f6e5f7c46 SHA512 50aff123705223689a59da8d931b6a42434391c0e87c68636d8ced6556e98482b9ac68ddfefd923ee37625642a7da860c15719190637b700505a869678374dbc WHIRLPOOL 501711c834e75d8fe1fe58f458fabec15c943a2faa4b84109cf37d349ecf0caf0bcc75f466520898c0d76fa3b5703895c8e57117ddf02038eba30da979ecb1d1
-DIST patch-3.18.69.xz 1291180 SHA256 20174224a5b5482ff238151fb8994401be4feba580802b2737479bb0a5342bca SHA512 b6d3f52f219941752d0344a15c21a76ca2c7435c075d9f1cc3ac2ef70ab1f5da55cbcbe48c232e03d48dbc7b18e465e8a34d547b6fea82cc2b51e5462e773d93 WHIRLPOOL 0297ac817d3383bea22a66c10d42d753ce2bdc5bd14b461a43139c8b1b27962581216f7224b64f4a1803418a4a423ae0f1f6ed12fa80948a20a7eac089d1a7cf
-DIST patch-4.1.42-rt50.patch.xz 190032 SHA256 9fb6d43eb202ec3ba94b5f659be61abb5050625ca3475f6996c82a61f608f940 SHA512 a8bc66d368176e5d02bdc54b9a5a1eb9865b277d89fe6f43e2e212832bb0d3b435a510ba8e03a64e1f8d94cf5a870076405b2687c51558b1d47586c0f5738d2a WHIRLPOOL 1e002b9892837fdeccaa8c02994b113434e3321a36daad5865997a41998fc47f14bffb8c6f92bcb4d3a62c473c53d608dd771978ea4f86d37f433e6c5683bb05
-DIST patch-4.1.42.xz 1109816 SHA256 da32978d452526c91bf71aceac83bc33b1ba5aff30d00603dfb6529f014521fd SHA512 a3b4e29e7cb613a72b8176edfe2cb5da0aa4e6064bb717c1bd5caa9463563cdb66a4bebe6256a8eddd58f32ae6f658fdbb66a3e4337a91def9d08b7c0e23fb2d WHIRLPOOL e461b48ca523a9f4718286648b1544374b0a6c2470ccecdb735849ae0e02241c6a63e06cf342130824e42e68ebe1526249e4736c8ebca3d4ec44e42397476c80
-DIST patch-4.11.12-rt13.patch.xz 228308 SHA256 d7a0e66fd187142cd65034c5b37a5c80268aabf7a88f1c37fb02116269045878 SHA512 cb82e29088a1e17859feafa054c83950b2c68262da2b501290405335210f2efaad29af5a0c0f7520f0f5874c4a15eb1bddbaa0dd330e8fcfc88d201bfc176f97 WHIRLPOOL b2a3e6d43dcfd012345edf9c9b2f37f3dad4468aa0d352472b785d9001a07e8d801555e759b41c7e59f0f4d06cfcbdd2b986b17a5be541c20bccaa5ed7587983
-DIST patch-4.11.12-rt14.patch.xz 230380 SHA256 0ba8106cea3808d40966ba687df844e83f966a5daf4d4d9b527c2932b8eb007e SHA512 7ff8a20b459119e2d42c8a314a3fabc7366268a81b5ab47b98b4d3a259a270586b368f4e7a548c5670212b27fcb1113a8dcc8b908a13b9ad640dabea9bcd610c WHIRLPOOL 9734b8c70f797f86d183e5716f5e94a3d6419b76104e90d28caa35c1311382a7f1a19d65b845065aef51c9b88284e1ea329fd68711e6f67ea3dbeceb17bc16e2
-DIST patch-4.11.12-rt16.patch.xz 232408 SHA256 70722af7de04aa9582fcca7a5a72bb0a664d5c1979bb83a55f133b7bee5e36bd SHA512 1ef1324210e0c3d308cbededd3e7da41e47c972563858a21ae8178d060906cf24249f48dd0f8667d528be29d50755feaf1ede4fe35e662f89195ee91355a8ced WHIRLPOOL cbcf7250e47159d262b2fcd242a5fef36d7460945b276a21f31608846689589cbc9fd4c9def72b871fca7259094d65630e8edf190be42c681d034bee55ca874d
-DIST patch-4.11.12.xz 298784 SHA256 707c5f18dfb795761b0b7ac6f946f03774f9f99317306fd54d8724d17d9c7729 SHA512 ee9c5ac45896d84739c679834fcd15dfc46f9e939dcefd54ba049ac47168d71f0af680153615de002a2073ba79e44a9214f74af17ed16aa97d85e6df157fc6e8 WHIRLPOOL 4967292c175128adbd8a33f25a3cd1fdc94605ae0fda2b108105e740ddff48cc7bb08c44dd669562fb33056398a8eeadf396cc682305c7ee0a34fe5adee61f90
-DIST patch-4.13.10-rt3.patch.xz 200756 SHA256 4e8116ca0e25e376a9cb576d38dbe80d5bce57e1d375f933fe00e217861ea4ef SHA512 560e1c7575db3dac623fd196dcf2d35a2ad936c732426a07c6c4bfe795e8a922d0cc820dfa7ba6ad08e5d245831faa1e2dbea3344a76d596ee243de458018335 WHIRLPOOL edb7ec69ef0b3e6745ffc8b4c44e857a9f6af3d4f2ac91a57bc560a995cbb7b2308b292f23228e0f386902e47ff554a183821ae002a6f39787937b86509a8b24
-DIST patch-4.13.10.xz 212680 SHA256 b9efa9c6375f79f6a041a5f0666d4ced1a49bfe8c4662d26517a6b4cfd9bf2f6 SHA512 634d81ea509aac5555d8d11631babe9bb04ea771c873f084cea7067313a566d5cad291b0c311002ae8d1d6dd498a93a9a43517923aa449eebb405fb4c1e34753 WHIRLPOOL f033d0bd9e6b95cdcb356a69ee4ea3054b96f991973445e94aeba664f3e91dcadd46a6c0620ad4f044503ccfa28a6deb2ed20890ef0c65b34f27a83b1847b8b1
-DIST patch-4.13.7-rt1.patch.xz 199252 SHA256 5ff4910e3fa7f7fbd1c9023c487758f27d66c21c8ca16a20be2a05e78de7bc4a SHA512 efffccb597b53d096bcfde6d32688e175c975ef194093ccf165a03d2ca985165589dbc10b62e81f816f1264ab932563b23d20eab41c1a20214a11a940c02499d WHIRLPOOL fe1cc022ef6a45a03d601b0540766f92d02a10d8975083dd6493d94b9f150c6aa0d69999e23344dba084b62e24d3e308435bd412904b261348cdef0e90d5e38d
-DIST patch-4.13.7.xz 165784 SHA256 0fe89c96e956efbded576214eef0c8e43cabe41dfca245e3ebb79fff9bc8715d SHA512 4d96c655ca4c720b872e1a88ba9989a419880cb5fec2a4a9190077588066f205c5dce2591a76f26375f6f50001334ceb7631d489d3b24ca443d10e1e6879ed54 WHIRLPOOL fb192f3acb9d3a249a2ecaf6b7d6c6eca0ac684c17c01226ed1ca69f5aafefa782aeb80000bfae5753672e2d8bb93b07377e8d1c0ca66b5dbdb1332d77ae38a9
-DIST patch-4.4.86-rt99.patch.xz 191740 SHA256 4908b67e505f9499e405e829f4d755b7ff5d710d9e78d741015e0bd09cbca024 SHA512 253b31069748dad1758b68a6afb1c5af1d42652185f80521b48f52f43b26fe846e0c5433ed66db337a54a4e62abb88f64fd8d98dd694870e3c2b68a66fac7e30 WHIRLPOOL 1b37335541dbbcf61ba1f2b970bab1f375248e624716a91748f766bf26c5861cbce3c57539005de7b133be386d4a9c4626e89410700df8dca83c860b16a81952
-DIST patch-4.4.86.xz 1322684 SHA256 219964ff4de7f00acdaf85cabfa2adc9d398d19d9e9c6e2e967c3557bb27449e SHA512 c8d97bbe5ac83801272ed2c33f003cfb2a3e8f56a022dc8965bc540bd9ce691b3eb91268c4ba6f7226c2e23470f983e37cbb735d382f547a66086af06161ae7d WHIRLPOOL d601c0771b935e255770f088e3785221793c429d5c839a4627d84429a27633dcefa712c62fd43756bbb194d937b5249a1edd2ca2ca51cd3a200c5fc2351be23f
-DIST patch-4.9.47-rt37.patch.xz 171208 SHA256 efb772f6cee20764a5d4012683810edd0a46e058dd6f26b2d129ec8bbf77a0cb SHA512 b41e77788f29f825d7de923b9601668a27298ed21c6ca44576f67c0db48795b8b22f32bcdb713eb79792e4d1b286dce1387faa3418a306034516023943047609 WHIRLPOOL fb7366fa6569b241dc5ce6a1ee3c65274e3583dd7de2b6396843e475449715d8cc1152eff1edc9710259234d022f2df4de4dc3e898bd85f6873c0dce14afa069
-DIST patch-4.9.47.xz 937408 SHA256 bdbc18434c6891c126adb2982b0ff9f954783f2e381ab06cfbdeeaef74a0d3c6 SHA512 1444676c9bdff6133191db4885fb6ddfb989e355c7f16ddc42ff1ed9415917f06c8147cd69346525624da8547204a68303d5002417b40e11c0174341f55cfc09 WHIRLPOOL 624f7e0a87e9631cb845b814427e4d2a0c92fc443ac96bc0a0f729ff04a2859af8413f1ef381219183ee06b908e968ce3e6cc03a835918019f42801e4bb5b1f5
+DIST linux-3.18.tar.xz 80934708 BLAKE2B cf796fa1eb24276470b51bd3754f02932e57c6469e45959893b3714457ba33f0081ff04137990f228e1aae6d42a05073478a3ef932df468af7cd02bf8c8836c4 SHA512 2f0b72466e9bc538a675738aa416573d41bbbd7e3e2ffd5b5b127afde609ebc278cec5a3c37e73479607e957c13f1b4ed9782a3795e0dcc2cf8e550228594009
+DIST linux-4.1.tar.xz 83017828 BLAKE2B d1dc4e458db191f16306b3d2d7eb60ef5e04307406c769cccdd88beb407f8de228ab1f095a44d6e992b06d01cd896fda31dec1cdf16667f4ca0b628da594aee3 SHA512 168ef84a4e67619f9f53f3574e438542a5747f9b43443363cb83597fcdac9f40d201625c66e375a23226745eaada9176eb006ca023613cec089349e91751f3c0
+DIST linux-4.11.tar.xz 95447768 BLAKE2B 5e6000e771f58baac2c4484fc8b9f83079aafdac03ea4f2a641bc025a0c79e789820f03b66ec852e28eba9bf3c5c9497a5a6b2e2aca13017fbd82d44ece97e02 SHA512 6610eed97ffb7207c71771198c36179b8244ace7222bebb109507720e26c5f17d918079a56d5febdd8605844d67fb2df0ebe910fa2f2f53690daf6e2a8ad09c3
+DIST linux-4.13.tar.xz 100579888 BLAKE2B 2f8be07d403071b097b019c43fa332bc7d4805dee633a6fdffe5a99d5475015ca9e4881e7f4cbfd36f8c451bacf423436364ea3d9f25b8723a29a178dededb2b SHA512 a557c2f0303ae618910b7106ff63d9978afddf470f03cb72aa748213e099a0ecd5f3119aea6cbd7b61df30ca6ef3ec57044d524b7babbaabddf8b08b8bafa7d2
+DIST linux-4.4.tar.xz 87295988 BLAKE2B f260f1858994f5d481fd078c86e51bddbc958f7c5d1586f60dced772e1b1107ecf3aae0558c3e6f39c36f7d3aa1e6cd1e5c64ec9d6f2218f47b98413da6466fb SHA512 13c8459933a8b80608e226a1398e3d1848352ace84bcfb7e6a4a33cb230bbe1ab719d4b58e067283df91ce5311be6d2d595fc8c19e2ae6ecc652499415614b3e
+DIST linux-4.9.tar.xz 93192404 BLAKE2B 83ae310b17d47f1f18d6d28537c31e10f3e60458c5954c4611158ca99e71cc0da2e051272eabf27d5887df4a7cb4a5dd66ff993077c11d2221e92d300a0b48d7 SHA512 bf67ff812cc3cb7e5059e82cc5db0d9a7c5637f7ed9a42e4730c715bf7047c81ed3a571225f92a33ef0b6d65f35595bc32d773356646df2627da55e9bc7f1f1a
+DIST patch-3.18.69-rt75.patch.xz 173580 BLAKE2B fb0fa6c7bb72a1a9754d837f7ae532c4837f3fac17d803c1d6634758190210d7f717a8ef8744413cffaf79e36ae361a6af4deb0663b76bedffe0fa024a3d2f33 SHA512 50aff123705223689a59da8d931b6a42434391c0e87c68636d8ced6556e98482b9ac68ddfefd923ee37625642a7da860c15719190637b700505a869678374dbc
+DIST patch-3.18.69.xz 1291180 BLAKE2B d246320a43de0d3ec3bafa241877d3f1490e7ae67fcafb1e327bbaaea7df7246bb8c90e5fd3c9608863091ef158ac02f4641535853e8db126247f9c202c3ec8d SHA512 b6d3f52f219941752d0344a15c21a76ca2c7435c075d9f1cc3ac2ef70ab1f5da55cbcbe48c232e03d48dbc7b18e465e8a34d547b6fea82cc2b51e5462e773d93
+DIST patch-3.18.82-rt88.patch.xz 173608 BLAKE2B 6f0097ab5ffd318e9c519fd1da2a8e978111308c1d1a9a4ff141014f3926a564d78528fe228dfde124393bb19f5eee7f17e1487e390cedfc0ddb08a10f2068e8 SHA512 2771a9c8c45b94c82bfda77a3a2ddb07d500b3727139bb929209cb7ee63f5cfa104db1ceee824d1cecdc3cb95937a86e2434d77f60dabb131d4b12a7d5ae188f
+DIST patch-3.18.82.xz 1354196 BLAKE2B c5cc3bc681ec835087355998a18cd61755331d14331e5a8c5bb3f649ae60725972df15164edbf903a1ba277b55611031bafa3264ab15f06e07ae4b0b5616baae SHA512 c4947315e4ab58bad7b393af2f42709c5b0f43dbce37676e8dcbd7058b7faa38c32a58207de5d7f15c078e3ca1dca25f0c4ca05b2ac6804d14bb628d46ca1d46
+DIST patch-4.1.42-rt50.patch.xz 190032 BLAKE2B b1723b4dd1ac49c85a962c09b5aac4bdf49f1798fea3b312289d7d875b5ca8e2cdd37e313c80e7decd94f0f80aeefbd7305d3883a6f50a33102f2c5886c0b2f5 SHA512 a8bc66d368176e5d02bdc54b9a5a1eb9865b277d89fe6f43e2e212832bb0d3b435a510ba8e03a64e1f8d94cf5a870076405b2687c51558b1d47586c0f5738d2a
+DIST patch-4.1.42.xz 1109816 BLAKE2B b01888185a28df8c12f4f1cee4e6a417e656fcf0f09ee2179840a3d5f255650451a89e133d2bb628bbd645d9235cad147ba2e8a45efcaeeeace3d75a49f10b6e SHA512 a3b4e29e7cb613a72b8176edfe2cb5da0aa4e6064bb717c1bd5caa9463563cdb66a4bebe6256a8eddd58f32ae6f658fdbb66a3e4337a91def9d08b7c0e23fb2d
+DIST patch-4.1.46-rt51.patch.xz 189892 BLAKE2B 3800f353d42b4c01461d9781dbf822fa6c14e408eec0c7158da8dd24673d33fea26d6241a8ec335fc7cf21e392be85543f88896cfa82b9a3aa8e5c08c5c214e4 SHA512 f009602913cfb22ae23943c452900b646d192146002b58517b591a874306b138e2e680170a70e1ead06ba38b76fc2e3fc55f83164dc5ef0b8dae5bdc30a54d8a
+DIST patch-4.1.46.xz 1236640 BLAKE2B 0c4305e3a3d2da4dfb8f23e0837d27d7916830170a0f10e9108d7517c69fca89bfccf35455a12f6e944f4c0527041172b072ea93978b19410daa2e9ec0b9f43d SHA512 c6b50ddd848c949119dfe1ebe45542a53c8116718e09345e8b47b300f057d4396f0991de51a6ce0ae1ea88502e53339573c8873126bfe202c742a09455b00519
+DIST patch-4.11.12-rt16.patch.xz 232408 BLAKE2B 2c16730105c645a4f73bbf0dc59ed37ef9440bcd118f3a1d0f79822dbddf411abdece9bd5e859aefb38402f6b02d430350d056769eb8810be31fce5cc4db11f1 SHA512 1ef1324210e0c3d308cbededd3e7da41e47c972563858a21ae8178d060906cf24249f48dd0f8667d528be29d50755feaf1ede4fe35e662f89195ee91355a8ced
+DIST patch-4.11.12.xz 298784 BLAKE2B 7e494b92a44fd2320ae91dd3a4860c37fe8ad543479e18607ad18142c3cbcda8b97ad11ad1a4452c9e1d239e71ca25d8565e237556abf7e72b21630a2852fb24 SHA512 ee9c5ac45896d84739c679834fcd15dfc46f9e939dcefd54ba049ac47168d71f0af680153615de002a2073ba79e44a9214f74af17ed16aa97d85e6df157fc6e8
+DIST patch-4.13.10-rt3.patch.xz 200756 BLAKE2B ded34c73a82eb0a9b9f9a215bde7d721000bf121e20c3c1274a7d6c142489f769378f579d1577ed0f060912a9199c6f96718a65d0188f3b6610d6af6d7ea5330 SHA512 560e1c7575db3dac623fd196dcf2d35a2ad936c732426a07c6c4bfe795e8a922d0cc820dfa7ba6ad08e5d245831faa1e2dbea3344a76d596ee243de458018335
+DIST patch-4.13.10.xz 212680 BLAKE2B f20177d79b7ebce15ab91cf36d2c2d6a408c4d10a2ca3167e1c69cba5effaeaf6c19b1b5d817bc19602d8a409ca8a0a95f0158203eb9693fbcbf3fd2d0892291 SHA512 634d81ea509aac5555d8d11631babe9bb04ea771c873f084cea7067313a566d5cad291b0c311002ae8d1d6dd498a93a9a43517923aa449eebb405fb4c1e34753
+DIST patch-4.13.13-rt5.patch.xz 201552 BLAKE2B 0a16b41f9f39340105ae62d2d04201f3836f31dea9b44e4f7a6cd09e19885946353dd9266ff36a197e26f14290bc44e95c3d918a1c4a675567e494ccd226622b SHA512 15a776bbc6eb26aee343ad59f4671cd35d0bcac1c9ea09ccf64bd6d2f2f3146df938ba092a70875d660373b2e29621d9173a1be33712ccaef146e741b4a9e768
+DIST patch-4.13.13.xz 245028 BLAKE2B 893a465c988e09f8b9c1f5dd301e09507257f39a52180a805e2caa996b6a6776b86d9920428a261358faa5426660637ec8e987cd2ae072ca78f277b34b61ae68 SHA512 27966bedc01ef5e2d023ee0b91224ca5ab3c5019f431305a9daa62b3acddf80e4e4c201ec47ca06243aba7778810d5ecb95e9d115e15935153a4a5d061af3fac
+DIST patch-4.13.7-rt1.patch.xz 199252 BLAKE2B fdb11597557fc59b046559716e8af10e61bdd7e57b7f6db85861d67c347be8ec11cc15ba81ed566d2b1e0d007aab6075af29d0b20130ce2c61aae739ce8adf4a SHA512 efffccb597b53d096bcfde6d32688e175c975ef194093ccf165a03d2ca985165589dbc10b62e81f816f1264ab932563b23d20eab41c1a20214a11a940c02499d
+DIST patch-4.13.7.xz 165784 BLAKE2B 72fa2862168d5ad038a90d9bf8d234b21ee51d7835bc31def66396dfe14c42443c5525bc6a549146ba6107e2bff735997895b5f7583abc05f5e85dacf94e60bb SHA512 4d96c655ca4c720b872e1a88ba9989a419880cb5fec2a4a9190077588066f205c5dce2591a76f26375f6f50001334ceb7631d489d3b24ca443d10e1e6879ed54
+DIST patch-4.4.86-rt99.patch.xz 191740 BLAKE2B 7e0627722dab7d34e2fefa0ebbaa9e433a65202c8fc67095a5d95a5150aebe39453ef9f0ecfb1d8c4e5be6b0b59801547f551c348aa8e0a7660791b4c24f45ae SHA512 253b31069748dad1758b68a6afb1c5af1d42652185f80521b48f52f43b26fe846e0c5433ed66db337a54a4e62abb88f64fd8d98dd694870e3c2b68a66fac7e30
+DIST patch-4.4.86.xz 1322684 BLAKE2B ec213137276e5b34086e92b0f59c38e39fc922e7e6034a80aa8c0d9f2221ee2799cbcd8ab942bff9d439850946227147247e94201121da225eb7c089bb743b53 SHA512 c8d97bbe5ac83801272ed2c33f003cfb2a3e8f56a022dc8965bc540bd9ce691b3eb91268c4ba6f7226c2e23470f983e37cbb735d382f547a66086af06161ae7d
+DIST patch-4.4.97-rt110.patch.xz 191772 BLAKE2B 9ce80852c224589df2b661d13e6369066657b27c4b1bfd3a8d1d588e2f6711f3931b0a690684ce6a5bf8d0ee2d46a0ec179699074d13041aad177e7a0920bf3e SHA512 26521e1025abe5e5e363daaf3cb6261d43d90f83808b3843fd3c3a4c0908a4066d8468df20a1cee7c7a07df20fe35e37b93907b3833539181ffb229a129b86c3
+DIST patch-4.4.97.xz 1410480 BLAKE2B 8dbd15938cb6fd5825db7eee3ad1fd2a7b4652245672b895584cd1a066826e012111cadc03ed6035f60ad2957310cca6e826dbb8ccce9d28dadd99fcd0861a44 SHA512 1364bffd4deffa37f515864538e00dc3c77f129f54fc97c65aa7e78553c200437ac9d244d50390c0d816cf0ffaf008757126e227b4f4fb25a3ba58319e64699e
+DIST patch-4.9.47-rt37.patch.xz 171208 BLAKE2B 124341097e524fdb711a16175108168c9378eccb109198721bb3b206b97c27596fd598ad71a68566677de3651083f5637a4e8cdbbd313994cfb5377179db8e58 SHA512 b41e77788f29f825d7de923b9601668a27298ed21c6ca44576f67c0db48795b8b22f32bcdb713eb79792e4d1b286dce1387faa3418a306034516023943047609
+DIST patch-4.9.47.xz 937408 BLAKE2B f81827ccdedcdb34b1d8f18b73674bf7ea19d83bb16c5f9f3c76909ec0a0561fcfda37da40ad410c74c1c7c00716a43540db5af50e8261f394a3253a2295df03 SHA512 1444676c9bdff6133191db4885fb6ddfb989e355c7f16ddc42ff1ed9415917f06c8147cd69346525624da8547204a68303d5002417b40e11c0174341f55cfc09
+DIST patch-4.9.61-rt51.patch.xz 171084 BLAKE2B accaafb5afa9b3f4e3f5d3c9bd2e52926b727ef9b81b2f45279ee9b23a0e03d0b6b1da3d1aa5d72051a8ed36a63e1123babe2a2d06622c6027793de7f0393f07 SHA512 d5dbfa5f0802365b5547efbccd3e3e3e00d7d7e9ea5ce9ecc60a11438854384df9de333d348ac4237c315c5c3a0f69487e99ade3afaafd26e098399abde73289
+DIST patch-4.9.61.xz 1113680 BLAKE2B 6616fd0676cad33aedad73fd3d6f2f1afab70d02830ec97ed50b3e1e39bd24930662eb9b861a4a099a26e704b3d3944aca6c101ce4810080a2c0b8943f6377ea SHA512 2b558fd3f5f7c70a1dde7a39ef3dd6bef621e5001d24f9945b887d58a4d640e58fbc0eecf77d845e4ca5815b507ee03f64e0db03a38c7d8e283eacae3d7dfb6a
diff --git a/sys-kernel/rt-sources/rt-sources-4.11.12_p14.ebuild b/sys-kernel/rt-sources/rt-sources-3.18.82_p88.ebuild
similarity index 95%
rename from sys-kernel/rt-sources/rt-sources-4.11.12_p14.ebuild
rename to sys-kernel/rt-sources/rt-sources-3.18.82_p88.ebuild
index 8f5a060bc499..3b5bc7251fce 100644
--- a/sys-kernel/rt-sources/rt-sources-4.11.12_p14.ebuild
+++ b/sys-kernel/rt-sources/rt-sources-3.18.82_p88.ebuild
@@ -31,10 +31,6 @@ S="${WORKDIR}/linux-${KV_FULL}"
 UNIPATCH_LIST="${DISTDIR}/${RT_FILE}"
 UNIPATCH_STRICTORDER="yes"
 
-PATCHES=(
-	"${FILESDIR}"/rt-sources-posix-printf.patch # 627068
-)
-
 src_prepare() {
 	default
 
diff --git a/sys-kernel/rt-sources/rt-sources-4.11.12_p13.ebuild b/sys-kernel/rt-sources/rt-sources-4.1.46_p51.ebuild
similarity index 95%
rename from sys-kernel/rt-sources/rt-sources-4.11.12_p13.ebuild
rename to sys-kernel/rt-sources/rt-sources-4.1.46_p51.ebuild
index 8f5a060bc499..3b5bc7251fce 100644
--- a/sys-kernel/rt-sources/rt-sources-4.11.12_p13.ebuild
+++ b/sys-kernel/rt-sources/rt-sources-4.1.46_p51.ebuild
@@ -31,10 +31,6 @@ S="${WORKDIR}/linux-${KV_FULL}"
 UNIPATCH_LIST="${DISTDIR}/${RT_FILE}"
 UNIPATCH_STRICTORDER="yes"
 
-PATCHES=(
-	"${FILESDIR}"/rt-sources-posix-printf.patch # 627068
-)
-
 src_prepare() {
 	default
 
diff --git a/sys-kernel/rt-sources/rt-sources-4.13.13_p5.ebuild b/sys-kernel/rt-sources/rt-sources-4.13.13_p5.ebuild
new file mode 100644
index 000000000000..3b5bc7251fce
--- /dev/null
+++ b/sys-kernel/rt-sources/rt-sources-4.13.13_p5.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+KEYWORDS="~amd64"
+
+HOMEPAGE="https://www.kernel.org/pub/linux/kernel/projects/rt/"
+
+inherit versionator
+
+CKV="$(get_version_component_range 1-3)"
+K_SECURITY_UNSUPPORTED="1"
+K_DEBLOB_AVAILABLE="1"
+RT_PATCHSET="${PV/*_p}"
+
+inherit kernel-2
+detect_version
+
+K_BRANCH_ID="${KV_MAJOR}.${KV_MINOR}"
+RT_FILE="patch-${K_BRANCH_ID}.${KV_PATCH}-rt${RT_PATCHSET}.patch.xz"
+RT_URI="mirror://kernel/linux/kernel/projects/rt/${K_BRANCH_ID}/${RT_FILE} \
+		mirror://kernel/linux/kernel/projects/rt/${K_BRANCH_ID}/older/${RT_FILE}"
+
+DESCRIPTION="Full Linux ${K_BRANCH_ID} kernel sources with the CONFIG_PREEMPT_RT patch"
+SRC_URI="${KERNEL_URI} ${RT_URI}"
+
+KV_FULL="${PVR/_p/-rt}"
+S="${WORKDIR}/linux-${KV_FULL}"
+
+UNIPATCH_LIST="${DISTDIR}/${RT_FILE}"
+UNIPATCH_STRICTORDER="yes"
+
+src_prepare() {
+	default
+
+	# 627796
+	sed \
+		"s/default PREEMPT_NONE/default PREEMPT_RT_FULL/g" \
+		-i "${S}/kernel/Kconfig.preempt"
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	ewarn
+	ewarn "${PN} are *not* supported by the Gentoo Kernel Project in any way."
+	ewarn "If you need support, please contact the RT project developers directly."
+	ewarn "Do *not* open bugs in Gentoo's bugzilla unless you have issues with"
+	ewarn "the ebuilds."
+	ewarn
+}
+
+K_EXTRAEINFO="For more info on rt-sources and details on how to report problems, see: \
+${HOMEPAGE}."
diff --git a/sys-kernel/rt-sources/rt-sources-4.4.97_p110.ebuild b/sys-kernel/rt-sources/rt-sources-4.4.97_p110.ebuild
new file mode 100644
index 000000000000..3b5bc7251fce
--- /dev/null
+++ b/sys-kernel/rt-sources/rt-sources-4.4.97_p110.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+KEYWORDS="~amd64"
+
+HOMEPAGE="https://www.kernel.org/pub/linux/kernel/projects/rt/"
+
+inherit versionator
+
+CKV="$(get_version_component_range 1-3)"
+K_SECURITY_UNSUPPORTED="1"
+K_DEBLOB_AVAILABLE="1"
+RT_PATCHSET="${PV/*_p}"
+
+inherit kernel-2
+detect_version
+
+K_BRANCH_ID="${KV_MAJOR}.${KV_MINOR}"
+RT_FILE="patch-${K_BRANCH_ID}.${KV_PATCH}-rt${RT_PATCHSET}.patch.xz"
+RT_URI="mirror://kernel/linux/kernel/projects/rt/${K_BRANCH_ID}/${RT_FILE} \
+		mirror://kernel/linux/kernel/projects/rt/${K_BRANCH_ID}/older/${RT_FILE}"
+
+DESCRIPTION="Full Linux ${K_BRANCH_ID} kernel sources with the CONFIG_PREEMPT_RT patch"
+SRC_URI="${KERNEL_URI} ${RT_URI}"
+
+KV_FULL="${PVR/_p/-rt}"
+S="${WORKDIR}/linux-${KV_FULL}"
+
+UNIPATCH_LIST="${DISTDIR}/${RT_FILE}"
+UNIPATCH_STRICTORDER="yes"
+
+src_prepare() {
+	default
+
+	# 627796
+	sed \
+		"s/default PREEMPT_NONE/default PREEMPT_RT_FULL/g" \
+		-i "${S}/kernel/Kconfig.preempt"
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	ewarn
+	ewarn "${PN} are *not* supported by the Gentoo Kernel Project in any way."
+	ewarn "If you need support, please contact the RT project developers directly."
+	ewarn "Do *not* open bugs in Gentoo's bugzilla unless you have issues with"
+	ewarn "the ebuilds."
+	ewarn
+}
+
+K_EXTRAEINFO="For more info on rt-sources and details on how to report problems, see: \
+${HOMEPAGE}."
diff --git a/sys-kernel/rt-sources/rt-sources-4.9.61_p51.ebuild b/sys-kernel/rt-sources/rt-sources-4.9.61_p51.ebuild
new file mode 100644
index 000000000000..3b5bc7251fce
--- /dev/null
+++ b/sys-kernel/rt-sources/rt-sources-4.9.61_p51.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+KEYWORDS="~amd64"
+
+HOMEPAGE="https://www.kernel.org/pub/linux/kernel/projects/rt/"
+
+inherit versionator
+
+CKV="$(get_version_component_range 1-3)"
+K_SECURITY_UNSUPPORTED="1"
+K_DEBLOB_AVAILABLE="1"
+RT_PATCHSET="${PV/*_p}"
+
+inherit kernel-2
+detect_version
+
+K_BRANCH_ID="${KV_MAJOR}.${KV_MINOR}"
+RT_FILE="patch-${K_BRANCH_ID}.${KV_PATCH}-rt${RT_PATCHSET}.patch.xz"
+RT_URI="mirror://kernel/linux/kernel/projects/rt/${K_BRANCH_ID}/${RT_FILE} \
+		mirror://kernel/linux/kernel/projects/rt/${K_BRANCH_ID}/older/${RT_FILE}"
+
+DESCRIPTION="Full Linux ${K_BRANCH_ID} kernel sources with the CONFIG_PREEMPT_RT patch"
+SRC_URI="${KERNEL_URI} ${RT_URI}"
+
+KV_FULL="${PVR/_p/-rt}"
+S="${WORKDIR}/linux-${KV_FULL}"
+
+UNIPATCH_LIST="${DISTDIR}/${RT_FILE}"
+UNIPATCH_STRICTORDER="yes"
+
+src_prepare() {
+	default
+
+	# 627796
+	sed \
+		"s/default PREEMPT_NONE/default PREEMPT_RT_FULL/g" \
+		-i "${S}/kernel/Kconfig.preempt"
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	ewarn
+	ewarn "${PN} are *not* supported by the Gentoo Kernel Project in any way."
+	ewarn "If you need support, please contact the RT project developers directly."
+	ewarn "Do *not* open bugs in Gentoo's bugzilla unless you have issues with"
+	ewarn "the ebuilds."
+	ewarn
+}
+
+K_EXTRAEINFO="For more info on rt-sources and details on how to report problems, see: \
+${HOMEPAGE}."
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index 646f335eda7d..55a27f7572bb 100644
Binary files a/sys-libs/Manifest.gz and b/sys-libs/Manifest.gz differ
diff --git a/sys-libs/libaal/Manifest b/sys-libs/libaal/Manifest
index e7a1c643dce1..994f6fffe8d2 100644
--- a/sys-libs/libaal/Manifest
+++ b/sys-libs/libaal/Manifest
@@ -1,2 +1,2 @@
-DIST libaal-1.0.5.tar.gz 336052 SHA256 ff1adb7aa7b917010d827f2e451fad8cb65ce981877d762b48baf20e89212e81 SHA512 1e4076ce4228a7947074ce2764da63f48cbeb4086cf6ab75b882ecd4ff07d4de3a6f5411c5c0b9cdd1c279b3bb98f92f5da3892e5479b7112b67703fddc102be WHIRLPOOL 805ffefdf22b6df05e57d0f836940c4f5748dba8fa5d6933bf07f410ae85f3914353d0697eb33dbc7a927e6d367bd9ab1e85caa1c1be94f710d0395f52854432
 DIST libaal-1.0.6.tar.gz 345894 SHA256 b1a1547746438b156156f82332557b05442e6d6c39fa9fe0d8dd47a3ad16ce9c SHA512 9b13096abcb90e75fff607ffd7b11ed8b100f349800b726acb01aca12f54abe784adb9912916fe8ed0751ebf367ecced04ab058e1e8b947f4209a5e6c390f123 WHIRLPOOL 7d93c3dc6eb62712a460f37bc933588c0b71d17472c64104a5cba939324af801ca0ba37063cd020caf8aa0d352a21b5222f838b427fbba0c03144b89d64e98c6
+DIST libaal-1.0.7.tar.gz 376068 BLAKE2B 2fb7802401721a64b17c0409f3ff668524399efc03b4bda4b4523af2cce204fdb5cf41bb2b2a6af5cbda34ee88cbb4703eec9bb76774d705b1759c91a33b1e34 SHA512 9b39a8cd3f49257ea912bb0e463c0c63ad06914e8a310deb4d4dce544d3ee34f492203c7321f971af71dddc1eb85f207082a4791b19bd4fad3f7dab516513b3d
diff --git a/sys-libs/libaal/libaal-1.0.5.ebuild b/sys-libs/libaal/libaal-1.0.5.ebuild
deleted file mode 100644
index 23f7867dfa69..000000000000
--- a/sys-libs/libaal/libaal-1.0.5.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit toolchain-funcs
-
-DESCRIPTION="library required by reiser4progs"
-HOMEPAGE="https://www.kernel.org/pub/linux/utils/fs/reiser4/libaal/"
-SRC_URI="mirror://kernel/linux/utils/fs/reiser4/libaal/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ppc ppc64 -sparc x86"
-IUSE=""
-
-DEPEND=""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	# remove stupid CFLAG hardcodes
-	sed -i \
-		-e "/GENERIC_CFLAGS/s:-O3::" \
-		-e "/^CFLAGS=/s:\"\":\"${CFLAGS}\":" \
-		configure || die "sed"
-	cat <<-EOF > run-ldconfig
-		#!/bin/sh
-		true
-	EOF
-}
-
-src_compile() {
-	econf \
-		--enable-libminimal \
-		--enable-memory-manager \
-		|| die "configure failed"
-	emake || die "make failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	dodoc AUTHORS BUGS CREDITS ChangeLog NEWS README THANKS TODO
-
-	# move shared libs to /
-	dodir /$(get_libdir)
-	mv "${D}"/usr/$(get_libdir)/lib*.so* "${D}"/$(get_libdir)/ || die
-	gen_usr_ldscript libaal.so libaal-minimal.so
-}
diff --git a/sys-libs/libaal/libaal-1.0.5-r1.ebuild b/sys-libs/libaal/libaal-1.0.7.ebuild
similarity index 70%
rename from sys-libs/libaal/libaal-1.0.5-r1.ebuild
rename to sys-libs/libaal/libaal-1.0.7.ebuild
index ae2314925de7..78fb9df4d93b 100644
--- a/sys-libs/libaal/libaal-1.0.5-r1.ebuild
+++ b/sys-libs/libaal/libaal-1.0.7.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
+EAPI=6
 
 inherit toolchain-funcs
 
@@ -14,20 +14,26 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 -sparc ~x86"
 IUSE="static-libs"
 
+DEPEND="virtual/os-headers"
+
 src_prepare() {
+	default
+
 	# remove stupid CFLAG hardcodes
 	sed -i \
 		-e "/GENERIC_CFLAGS/s:-O3::" \
 		-e "/^CFLAGS=/s:\"\":\"${CFLAGS}\":" \
-		configure || die "sed"
-	printf '#!/bin/sh\n:\n' > run-ldconfig
+		configure || die
+	printf '#!/bin/sh\n:\n' > run-ldconfig || die
 }
 
 src_configure() {
-	econf \
-		--enable-libminimal \
-		--enable-memory-manager \
+	local myeconfargs=(
+		--enable-libminimal
+		--enable-memory-manager
 		$(use_enable static-libs static)
+	)
+	econf "${myeconfargs[@]}"
 }
 
 src_install() {
diff --git a/sys-libs/uclibc/metadata.xml b/sys-libs/uclibc/metadata.xml
index cd311b1b4b49..9de4d50e5d41 100644
--- a/sys-libs/uclibc/metadata.xml
+++ b/sys-libs/uclibc/metadata.xml
@@ -1,33 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>vapier@gentoo.org</email>
-    <description>Primary Maintainer</description>
-  </maintainer>
-  <maintainer type="person">
-    <email>blueness@gentoo.org</email>
-    <name>Anthony G. Basile</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>embedded@gentoo.org</email>
-    <name>Embedded Gentoo</name>
-  </maintainer>
-  <longdescription>
-uClibc pronounced yew-see-lib-see is a C library for developing embedded Linux 
-systems. It is much smaller than the GNU C Library, but nearly all applications supported 
-by glibc also work perfectly with uClibc. Porting applications from glibc to uClibc 
-typically involves just recompiling the source code. uClibc even supports shared libraries 
-and threading. It currently runs on standard Linux and MMU-less (also known as uClinux) 
-systems with support for alpha, ARM, cris, i386, i960, h8300, m68k, mips/mipsel, PowerPC, 
-SH, SPARC, and v850 processors.
-</longdescription>
-<use>
-	<flag name="rpc">Enable sun nis/rpc support (you should use libtirpc though)</flag>
-	<flag name="ssp">Force the use of ssp to be built into a hardened uclibc setup</flag>
-	<flag name="savedconfig">Adds support for user defined configs</flag>
-	<flag name="uclibc-compat">Build uclibc with backwards compatible
-		options</flag>
-	<flag name="wordexp">Add support for word expansion (wordexp.h)</flag>
-</use>
+	<maintainer type="person">
+		<email>vapier@gentoo.org</email>
+		<description>Primary Maintainer</description>
+	</maintainer>
+	<maintainer type="person">
+		<email>blueness@gentoo.org</email>
+		<name>Anthony G. Basile</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>embedded@gentoo.org</email>
+		<name>Embedded Gentoo</name>
+	</maintainer>
+	<longdescription>
+		uClibc pronounced yew-see-lib-see is a C library for developing embedded Linux
+		systems. It is much smaller than the GNU C Library, but nearly all applications supported
+		by glibc also work perfectly with uClibc. Porting applications from glibc to uClibc
+		typically involves just recompiling the source code. uClibc even supports shared libraries
+		and threading. It currently runs on standard Linux and MMU-less (also known as uClinux)
+		systems with support for alpha, ARM, cris, i386, i960, h8300, m68k, mips/mipsel, PowerPC,
+		SH, SPARC, and v850 processors.
+	</longdescription>
+	<use>
+		<flag name="rpc">Enable sun nis/rpc support (you should use libtirpc though)</flag>
+		<flag name="ssp">Force the use of ssp to be built into a hardened uclibc setup</flag>
+		<flag name="savedconfig">Adds support for user defined configs</flag>
+		<flag name="uclibc-compat">Build uclibc with backwards compatible options</flag>
+		<flag name="wordexp">Add support for word expansion (wordexp.h)</flag>
+	</use>
 </pkgmetadata>
diff --git a/sys-power/Manifest.gz b/sys-power/Manifest.gz
index 9d7f56d6ff16..1bf4bd3ad067 100644
Binary files a/sys-power/Manifest.gz and b/sys-power/Manifest.gz differ
diff --git a/sys-power/apcupsd/metadata.xml b/sys-power/apcupsd/metadata.xml
index 275b13d12ab3..7254904a446d 100644
--- a/sys-power/apcupsd/metadata.xml
+++ b/sys-power/apcupsd/metadata.xml
@@ -13,23 +13,21 @@
 		<email>base-system@gentoo.org</email>
 		<name>Gentoo Base System</name>
 	</maintainer>
-<longdescription lang="en">
-Apcupsd can be used for power mangement and controlling most of 
-APC's UPS models on Unix and Windows machines. Apcupsd works with 
-most of APC's Smart-UPS models as well as most simple signalling 
-models such a Back-UPS, and BackUPS-Office. During a power failure, 
-apcupsd will inform the users about the power failure and that a 
-shutdown may occur. If power is not restored, a system shutdown 
-will follow when the battery is exhausted, a timeout (seconds) 
-expires, or runtime expires based on internal APC calculations 
-determined by power consumption rates.
-</longdescription>
-<upstream>
-	<remote-id type="sourceforge">apcupsd</remote-id>
-</upstream>
-<use>
-	<flag name="modbus">
-	  enable MODBUS support over USB
-	</flag>
-</use>
+	<longdescription lang="en">
+		Apcupsd can be used for power mangement and controlling most of
+		APC's UPS models on Unix and Windows machines. Apcupsd works with
+		most of APC's Smart-UPS models as well as most simple signalling
+		models such a Back-UPS, and BackUPS-Office. During a power failure,
+		apcupsd will inform the users about the power failure and that a
+		shutdown may occur. If power is not restored, a system shutdown
+		will follow when the battery is exhausted, a timeout (seconds)
+		expires, or runtime expires based on internal APC calculations
+		determined by power consumption rates.
+	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">apcupsd</remote-id>
+	</upstream>
+	<use>
+		<flag name="modbus">Enable MODBUS support over USB</flag>
+	</use>
 </pkgmetadata>
diff --git a/sys-power/iasl/metadata.xml b/sys-power/iasl/metadata.xml
index f56b9a3ecad3..167335954d22 100644
--- a/sys-power/iasl/metadata.xml
+++ b/sys-power/iasl/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <maintainer type="person">
-	<email>robbat2@gentoo.org</email>
-    </maintainer>
-    <maintainer type="person">
-	<email>polynomial-c@gentoo.org</email>
-	<name>Lars Wendler</name>
-    </maintainer>
+	<maintainer type="person">
+		<email>robbat2@gentoo.org</email>
+	</maintainer>
+	<maintainer type="person">
+		<email>polynomial-c@gentoo.org</email>
+		<name>Lars Wendler</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/sys-power/nut/metadata.xml b/sys-power/nut/metadata.xml
index bfe6c7469998..d9ab89aeb368 100644
--- a/sys-power/nut/metadata.xml
+++ b/sys-power/nut/metadata.xml
@@ -1,65 +1,65 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>robbat2@gentoo.org</email>
-    <name>Robin H. Johnson</name>
-  </maintainer>
+	<maintainer type="person">
+		<email>robbat2@gentoo.org</email>
+		<name>Robin H. Johnson</name>
+	</maintainer>
 	<maintainer type="person">
 		<email>prometheanfire@gentoo.org</email>
 	</maintainer>
-  <use>
-    <flag name="ipmi">Support IPMI-based UPSes.</flag>
-	<flag name="ups_drivers_al175">Driver for Eltek UPS models with AL175 alarm module</flag>
-	<flag name="ups_drivers_bcmxcp">Driver for UPSes supporting the serial BCM/XCP protocol</flag>
-	<flag name="ups_drivers_belkin">Driver for Belkin serial UPS equipment</flag>
-	<flag name="ups_drivers_belkinunv">Driver for Belkin "Universal UPS" and compatible</flag>
-	<flag name="ups_drivers_bestfcom">Driver for Best Power Fortress/Ferrups</flag>
-	<flag name="ups_drivers_bestfortress">Driver for old Best Fortress UPS equipment</flag>
-	<flag name="ups_drivers_bestuferrups">Driver for Best Power Micro-Ferrups</flag>
-	<flag name="ups_drivers_bestups">Driver for Best Power / SOLA (Phoenixtec protocol) UPS equipment</flag>
-	<flag name="ups_drivers_dummy-ups">Driver for multi-purpose UPS emulation</flag>
-	<flag name="ups_drivers_etapro">Driver for ETA UPS equipment</flag>
-	<flag name="ups_drivers_everups">Driver for Ever UPS models</flag>
-	<flag name="ups_drivers_gamatronic">Driver for Gamatronic UPS equipment</flag>
-	<flag name="ups_drivers_genericups">Driver for contact-closure UPS equipment</flag>
-	<flag name="ups_drivers_isbmex">Driver for ISBMEX UPS equipment</flag>
-	<flag name="ups_drivers_liebert">Driver for Liebert contact-closure UPS equipment</flag>
-	<flag name="ups_drivers_liebert-esp2">Driver for Liebert UPS, using the ESP-II serial protocol</flag>
-	<flag name="ups_drivers_masterguard">Driver for Masterguard UPS equipment</flag>
-	<flag name="ups_drivers_metasys">Driver for Meta System UPS equipment</flag>
-	<flag name="ups_drivers_mge-utalk">Driver for MGE UPS SYSTEMS UTalk protocol equipment</flag>
-	<flag name="ups_drivers_microdowell">Driver for Microdowell Enterprise UPS series</flag>
-	<flag name="ups_drivers_mge-shut">Driver for SHUT Protocol UPS equipment</flag>
-	<flag name="ups_drivers_oldmge-shut">Driver for SHUT Protocol UPS equipment (older implementation)</flag>
-	<flag name="ups_drivers_oneac">Driver for Oneac UPS equipment</flag>
-	<flag name="ups_drivers_optiups">Driver for Opti-UPS (Viewsonic) UPS and Zinto D (ONLINE-USV) equipment</flag>
-	<flag name="ups_drivers_powercom">UPS driver for serial Powercom/Trust/Advice UPS equipment</flag>
-	<flag name="ups_drivers_rhino">Driver for Brazilian Microsol RHINO UPS equipment</flag>
-	<flag name="ups_drivers_safenet">Driver for SafeNet compatible UPS equipment</flag>
-	<flag name="ups_drivers_solis">Driver for Brazilian Microsol SOLIS UPS equipment</flag>
-	<flag name="ups_drivers_tripplite">Driver for Tripp-Lite SmartPro UPS equipment</flag>
-	<flag name="ups_drivers_tripplitesu">Driver for Tripp-Lite SmartOnline (SU) UPS equipment</flag>
-	<flag name="ups_drivers_upscode2">Driver for UPScode II compatible UPS equipment</flag>
-	<flag name="ups_drivers_victronups">Driver for IMV/Victron UPS unit Match, Match Lite, NetUps</flag>
-	<flag name="ups_drivers_powerpanel">Driver for PowerPanel Plus compatible UPS equipment</flag>
-	<flag name="ups_drivers_blazer_ser">Driver for Megatec/Q1 protocol serial based UPS equipment</flag>
-	<flag name="ups_drivers_clone">Fake driver to clone outlets for device grouping</flag>
-	<flag name="ups_drivers_clone-outlet">Fake driver to clone outlets for device grouping</flag>
-	<flag name="ups_drivers_ivtscd">driver for the IVT Solar Controller Device</flag>
-	<flag name="ups_drivers_apcsmart">Driver for American Power Conversion Smart Protocol UPS equipment</flag>
-	<flag name="ups_drivers_apcsmart-old">Driver for American Power Conversion Smart Protocol UPS equipment</flag>
-	<flag name="ups_drivers_apcupsd-ups">Driver for apcupsd client access</flag>
-	<flag name="ups_drivers_riello_ser">Driver for Riello UPS Protocol UPS equipment</flag>
-	<flag name="ups_drivers_nutdrv_qx">Driver for Q* protocol serial and USB based UPS equipment</flag>
-	<flag name="ups_drivers_usbhid-ups">Driver for USB/HID UPS equipment</flag>
-	<flag name="ups_drivers_bcmxcp_usb">Experimental driver for UPSes supporting the BCM/XCP protocol over USB</flag>
-	<flag name="ups_drivers_tripplite_usb">Driver for older Tripp Lite USB UPSes (not PDC HID)</flag>
-	<flag name="ups_drivers_blazer_usb">Driver for Megatec/Q1 protocol USB based UPS equipment</flag>
-	<flag name="ups_drivers_richcomm_usb">Driver UPS equipment using Richcomm dry-contact to USB solution</flag>
-	<flag name="ups_drivers_riello_usb">Driver for Riello UPS Protocol UPS equipment via USB</flag>
-	<flag name="ups_drivers_netxml-ups">Driver for Eaton / MGE Network Management Card / Proxy (XML/HTTP Protocol) equipment</flag>
-	<flag name="ups_drivers_snmp-ups">Multi-MIB Driver for SNMP UPS equipment</flag>
-	<flag name="ups_drivers_nut-ipmipsu">Driver for IPMI Power Supply Units (PSU)</flag>
-  </use>
+	<use>
+		<flag name="ipmi">Support IPMI-based UPSes.</flag>
+		<flag name="ups_drivers_al175">Driver for Eltek UPS models with AL175 alarm module</flag>
+		<flag name="ups_drivers_bcmxcp">Driver for UPSes supporting the serial BCM/XCP protocol</flag>
+		<flag name="ups_drivers_belkin">Driver for Belkin serial UPS equipment</flag>
+		<flag name="ups_drivers_belkinunv">Driver for Belkin "Universal UPS" and compatible</flag>
+		<flag name="ups_drivers_bestfcom">Driver for Best Power Fortress/Ferrups</flag>
+		<flag name="ups_drivers_bestfortress">Driver for old Best Fortress UPS equipment</flag>
+		<flag name="ups_drivers_bestuferrups">Driver for Best Power Micro-Ferrups</flag>
+		<flag name="ups_drivers_bestups">Driver for Best Power / SOLA (Phoenixtec protocol) UPS equipment</flag>
+		<flag name="ups_drivers_dummy-ups">Driver for multi-purpose UPS emulation</flag>
+		<flag name="ups_drivers_etapro">Driver for ETA UPS equipment</flag>
+		<flag name="ups_drivers_everups">Driver for Ever UPS models</flag>
+		<flag name="ups_drivers_gamatronic">Driver for Gamatronic UPS equipment</flag>
+		<flag name="ups_drivers_genericups">Driver for contact-closure UPS equipment</flag>
+		<flag name="ups_drivers_isbmex">Driver for ISBMEX UPS equipment</flag>
+		<flag name="ups_drivers_liebert">Driver for Liebert contact-closure UPS equipment</flag>
+		<flag name="ups_drivers_liebert-esp2">Driver for Liebert UPS, using the ESP-II serial protocol</flag>
+		<flag name="ups_drivers_masterguard">Driver for Masterguard UPS equipment</flag>
+		<flag name="ups_drivers_metasys">Driver for Meta System UPS equipment</flag>
+		<flag name="ups_drivers_mge-utalk">Driver for MGE UPS SYSTEMS UTalk protocol equipment</flag>
+		<flag name="ups_drivers_microdowell">Driver for Microdowell Enterprise UPS series</flag>
+		<flag name="ups_drivers_mge-shut">Driver for SHUT Protocol UPS equipment</flag>
+		<flag name="ups_drivers_oldmge-shut">Driver for SHUT Protocol UPS equipment (older implementation)</flag>
+		<flag name="ups_drivers_oneac">Driver for Oneac UPS equipment</flag>
+		<flag name="ups_drivers_optiups">Driver for Opti-UPS (Viewsonic) UPS and Zinto D (ONLINE-USV) equipment</flag>
+		<flag name="ups_drivers_powercom">UPS driver for serial Powercom/Trust/Advice UPS equipment</flag>
+		<flag name="ups_drivers_rhino">Driver for Brazilian Microsol RHINO UPS equipment</flag>
+		<flag name="ups_drivers_safenet">Driver for SafeNet compatible UPS equipment</flag>
+		<flag name="ups_drivers_solis">Driver for Brazilian Microsol SOLIS UPS equipment</flag>
+		<flag name="ups_drivers_tripplite">Driver for Tripp-Lite SmartPro UPS equipment</flag>
+		<flag name="ups_drivers_tripplitesu">Driver for Tripp-Lite SmartOnline (SU) UPS equipment</flag>
+		<flag name="ups_drivers_upscode2">Driver for UPScode II compatible UPS equipment</flag>
+		<flag name="ups_drivers_victronups">Driver for IMV/Victron UPS unit Match, Match Lite, NetUps</flag>
+		<flag name="ups_drivers_powerpanel">Driver for PowerPanel Plus compatible UPS equipment</flag>
+		<flag name="ups_drivers_blazer_ser">Driver for Megatec/Q1 protocol serial based UPS equipment</flag>
+		<flag name="ups_drivers_clone">Fake driver to clone outlets for device grouping</flag>
+		<flag name="ups_drivers_clone-outlet">Fake driver to clone outlets for device grouping</flag>
+		<flag name="ups_drivers_ivtscd">driver for the IVT Solar Controller Device</flag>
+		<flag name="ups_drivers_apcsmart">Driver for American Power Conversion Smart Protocol UPS equipment</flag>
+		<flag name="ups_drivers_apcsmart-old">Driver for American Power Conversion Smart Protocol UPS equipment</flag>
+		<flag name="ups_drivers_apcupsd-ups">Driver for apcupsd client access</flag>
+		<flag name="ups_drivers_riello_ser">Driver for Riello UPS Protocol UPS equipment</flag>
+		<flag name="ups_drivers_nutdrv_qx">Driver for Q* protocol serial and USB based UPS equipment</flag>
+		<flag name="ups_drivers_usbhid-ups">Driver for USB/HID UPS equipment</flag>
+		<flag name="ups_drivers_bcmxcp_usb">Experimental driver for UPSes supporting the BCM/XCP protocol over USB</flag>
+		<flag name="ups_drivers_tripplite_usb">Driver for older Tripp Lite USB UPSes (not PDC HID)</flag>
+		<flag name="ups_drivers_blazer_usb">Driver for Megatec/Q1 protocol USB based UPS equipment</flag>
+		<flag name="ups_drivers_richcomm_usb">Driver UPS equipment using Richcomm dry-contact to USB solution</flag>
+		<flag name="ups_drivers_riello_usb">Driver for Riello UPS Protocol UPS equipment via USB</flag>
+		<flag name="ups_drivers_netxml-ups">Driver for Eaton / MGE Network Management Card / Proxy (XML/HTTP Protocol) equipment</flag>
+		<flag name="ups_drivers_snmp-ups">Multi-MIB Driver for SNMP UPS equipment</flag>
+		<flag name="ups_drivers_nut-ipmipsu">Driver for IPMI Power Supply Units (PSU)</flag>
+	</use>
 </pkgmetadata>
diff --git a/sys-process/Manifest.gz b/sys-process/Manifest.gz
index d095c57c59ad..d1f0304e1c61 100644
Binary files a/sys-process/Manifest.gz and b/sys-process/Manifest.gz differ
diff --git a/sys-process/audit/metadata.xml b/sys-process/audit/metadata.xml
index 856de3a78717..4d7881556dac 100644
--- a/sys-process/audit/metadata.xml
+++ b/sys-process/audit/metadata.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>robbat2@gentoo.org</email>
-  </maintainer>
-<use>
-	<flag name="gssapi">Enable GSSAPI support</flag>
-</use>
+	<maintainer type="person">
+		<email>robbat2@gentoo.org</email>
+	</maintainer>
+	<use>
+		<flag name="gssapi">Enable GSSAPI support</flag>
+	</use>
 </pkgmetadata>
diff --git a/sys-process/fcron/metadata.xml b/sys-process/fcron/metadata.xml
index 0a8d8d7a3e54..1eeec4c614d4 100644
--- a/sys-process/fcron/metadata.xml
+++ b/sys-process/fcron/metadata.xml
@@ -11,24 +11,24 @@
 	</maintainer>
 	<use>
 		<flag name="debug">
-      Enable debug code and output. Since version 3.0.5 this will no
-      longer force foreground execution, and fcron will be able to run
-      as a service properly.
-    </flag>
+			Enable debug code and output. Since version 3.0.5 this will no
+			longer force foreground execution, and fcron will be able to run
+			as a service properly.
+		</flag>
 		<flag name="mta">
-      Enable mta support for sending emails from fcron
-    </flag>
+			Enable mta support for sending emails from fcron
+		</flag>
 		<flag name="pam">
-      Enable PAM support for fcron. This means that fcron will pass
-      through the "fcron" stack before executing the jobs, and
-      fcrontab will use the "fcrontab" stack to authenticate the user
-      before editing its crontab file.
-    </flag>
+			Enable PAM support for fcron. This means that fcron will pass
+			through the "fcron" stack before executing the jobs, and
+			fcrontab will use the "fcrontab" stack to authenticate the user
+			before editing its crontab file.
+		</flag>
 		<flag name="system-crontab">
-      Set up fcron to respect /etc/crontab and /etc/cron.d. If this
-      flag is disabled, /etc/cron.d and /etc/crontab will be ignored,
-      but /etc/cron.{hourly,daily,weekly,monthly} will still be
-      respected.
-    </flag>
+			Set up fcron to respect /etc/crontab and /etc/cron.d. If this
+			flag is disabled, /etc/cron.d and /etc/crontab will be ignored,
+			but /etc/cron.{hourly,daily,weekly,monthly} will still be
+			respected.
+		</flag>
 	</use>
 </pkgmetadata>
diff --git a/sys-process/minit/metadata.xml b/sys-process/minit/metadata.xml
index e4a4ebd1d0b1..257fae54f708 100644
--- a/sys-process/minit/metadata.xml
+++ b/sys-process/minit/metadata.xml
@@ -1,29 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-		<maintainer type="person">
-			<email>aw-gentoo@instandbesetzt.net</email>
-			<name>Andreas Wiese</name>
-		</maintainer>
-<maintainer type="project">
-			<email>proxy-maint@gentoo.org</email>
-			<name>Proxy Maintainers</name>
-		</maintainer>
-<longdescription>
-minit - a small yet feature-complete init
+	<maintainer type="person">
+		<email>aw-gentoo@instandbesetzt.net</email>
+		<name>Andreas Wiese</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription>
+		minit - a small yet feature-complete init
 
-What works so far
-    * It can start services and take dependencies into account.
-    * It can restart services
-    * It can start services in sync mode (i.e. wait until they 
-terminate, to get around race conditions for static initializations)
-    * There is a companion utility "msvc" that can be used much in the 
-same way as the svc from daemontools. Communication works over two 
-fifos, /etc/minit/in and /etc/minit/out. Those have to exist before 
-minit is started and they should be owned by root and have mode 600.
-    * There is a companion utility "pidfilehack" that can be used to do 
-stuff like run ssh, wait a while, read the PID off /var/run/sshd.pid and 
-tell minit this PID so it will know when sshd exits and can restart it.
-    * It can pipe stdout to a dedicated log process.
-</longdescription>
+		What works so far
+		* It can start services and take dependencies into account.
+		* It can restart services
+		* It can start services in sync mode (i.e. wait until they terminate, to get around race conditions for static initializations)
+		* There is a companion utility "msvc" that can be used much in the same way as the svc from daemontools. Communication works over two fifos, /etc/minit/in and /etc/minit/out. Those have to exist before minit is started and they should be owned by root and have mode 600.
+		* There is a companion utility "pidfilehack" that can be used to do stuff like run ssh, wait a while, read the PID off /var/run/sshd.pid and tell minit this PID so it will know when sshd exits and can restart it.
+		* It can pipe stdout to a dedicated log process.
+	</longdescription>
 </pkgmetadata>
diff --git a/virtual/Manifest.gz b/virtual/Manifest.gz
index 1013c5416364..302b33f5dfb3 100644
Binary files a/virtual/Manifest.gz and b/virtual/Manifest.gz differ
diff --git a/virtual/commonlisp/metadata.xml b/virtual/commonlisp/metadata.xml
index ffa67744d44b..f3b41b1e33eb 100644
--- a/virtual/commonlisp/metadata.xml
+++ b/virtual/commonlisp/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-	  <email>common-lisp@gentoo.org</email>
-	  <name>Gentoo Common Lisp Project</name>
-  </maintainer>
+	<maintainer type="project">
+		<email>common-lisp@gentoo.org</email>
+		<name>Gentoo Common Lisp Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/www-apache/Manifest.gz b/www-apache/Manifest.gz
index 95e7cea5e2f9..96b6ca28c98e 100644
Binary files a/www-apache/Manifest.gz and b/www-apache/Manifest.gz differ
diff --git a/www-apache/mod_gnutls/metadata.xml b/www-apache/mod_gnutls/metadata.xml
index aaae44841a8d..95aa13f6c5ef 100644
--- a/www-apache/mod_gnutls/metadata.xml
+++ b/www-apache/mod_gnutls/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <maintainer type="person">
-	<email>polynomial-c@gentoo.org</email>
-	<name>Lars Wendler</name>
-    </maintainer>
+	<maintainer type="person">
+		<email>polynomial-c@gentoo.org</email>
+		<name>Lars Wendler</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/www-apache/mod_limitipconn/metadata.xml b/www-apache/mod_limitipconn/metadata.xml
index 675939a7cec5..06a71473cacf 100644
--- a/www-apache/mod_limitipconn/metadata.xml
+++ b/www-apache/mod_limitipconn/metadata.xml
@@ -3,8 +3,8 @@
 <pkgmetadata>
 	<!-- maintainer-needed -->
 	<longdescription>
-	  Apache module to limit the maximum number of simultaneous
-	  connections per IP address. Allows inclusion and exclusion of files
-	  based on MIME type.
+		Apache module to limit the maximum number of simultaneous
+		connections per IP address. Allows inclusion and exclusion of files
+		based on MIME type.
 	</longdescription>
 </pkgmetadata>
diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index 7d95a4ff23e8..e84b3537d57b 100644
Binary files a/www-apps/Manifest.gz and b/www-apps/Manifest.gz differ
diff --git a/www-apps/cgisysinfo/metadata.xml b/www-apps/cgisysinfo/metadata.xml
index a20bd0a500ad..94d26d8201c4 100644
--- a/www-apps/cgisysinfo/metadata.xml
+++ b/www-apps/cgisysinfo/metadata.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>rafaelmartins@gentoo.org</email>
-    <name>Rafael G. Martins</name>
-  </maintainer>
-  <longdescription lang="en">
-    cgisysinfo is a small CGI utility to show basic system information on Linux
-	machines.
+	<maintainer type="person">
+		<email>rafaelmartins@gentoo.org</email>
+		<name>Rafael G. Martins</name>
+	</maintainer>
+	<longdescription lang="en">
+		cgisysinfo is a small CGI utility to show basic system information on Linux
+		machines.
 
-	cgisysinfo is useful for machines that run a webserver but not PHP, and was
-	tested with nginx + fcgiwrap. It should works with any CGI-capable web
-	server.
-  </longdescription>
+		cgisysinfo is useful for machines that run a webserver but not PHP, and was
+		tested with nginx + fcgiwrap. It should works with any CGI-capable web
+		server.
+	</longdescription>
 </pkgmetadata>
diff --git a/www-apps/guacamole/metadata.xml b/www-apps/guacamole/metadata.xml
index a86d47c73c59..19457e20ff52 100644
--- a/www-apps/guacamole/metadata.xml
+++ b/www-apps/guacamole/metadata.xml
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>nativemad@gentoo.org</email>
-    <name>Andreas Schuerch</name>
-  </maintainer>
-  <longdescription>
-	Guacamole is an HTML5 web application that provides access to desktop
-	environments using remote desktop protocols such as VNC or RDP. 
-	A centralized server acts as a tunnel and proxy, allowing access to 
-	multiple desktops through a web browser. No plugins are needed: 
-	the client requires nothing more than a web browser supporting 
-	HTML5 and AJAX.
-    </longdescription>
-  <use>
-    <flag name="noauth">enable support for leaving out any authentication on the webinterface</flag>
-  </use>
-  <upstream>
-    <remote-id type="sourceforge">guacamole</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>nativemad@gentoo.org</email>
+		<name>Andreas Schuerch</name>
+	</maintainer>
+	<longdescription>
+		Guacamole is an HTML5 web application that provides access to desktop
+		environments using remote desktop protocols such as VNC or RDP.
+		A centralized server acts as a tunnel and proxy, allowing access to
+		multiple desktops through a web browser. No plugins are needed:
+		the client requires nothing more than a web browser supporting
+		HTML5 and AJAX.
+	</longdescription>
+	<use>
+		<flag name="noauth">enable support for leaving out any authentication on the webinterface</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">guacamole</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/www-apps/otrs/metadata.xml b/www-apps/otrs/metadata.xml
index 38448c9a8c7e..8bdf83b248a2 100644
--- a/www-apps/otrs/metadata.xml
+++ b/www-apps/otrs/metadata.xml
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-	<email>lists@xunil.at</email>
-	<name>Stefan Weichinger</name>
-	<description>Proxy maintainer</description>
-  </maintainer>
-  <maintainer type="project">
-  <email>web-apps@gentoo.org</email>
-  <name>Gentoo Webapps</name>
-  </maintainer>
-  <maintainer type="project">
-  <email>proxy-maint@gentoo.org</email>
-  <name>Proxy Maintainers</name>
-  </maintainer>
-  <use>
-	<flag name="mod_perl">Provide all dependencies for use of mod_perl instead of cgi</flag>
-  </use>
+	<maintainer type="person">
+		<email>lists@xunil.at</email>
+		<name>Stefan Weichinger</name>
+		<description>Proxy maintainer</description>
+	</maintainer>
+	<maintainer type="project">
+		<email>web-apps@gentoo.org</email>
+		<name>Gentoo Webapps</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<use>
+		<flag name="mod_perl">Provide all dependencies for use of mod_perl instead of cgi</flag>
+	</use>
 </pkgmetadata>
diff --git a/www-apps/tt-rss/metadata.xml b/www-apps/tt-rss/metadata.xml
index 4c4d366632e2..388039cd655b 100644
--- a/www-apps/tt-rss/metadata.xml
+++ b/www-apps/tt-rss/metadata.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-     <email>chewi@gentoo.org</email>
-     <name>James Le Cuirot</name>
-     <description>Maintainer</description>
-</maintainer>
-<use>
-	<flag name="daemon">Install additional init scripts for automated RSS updates</flag>
-</use>
+	<maintainer type="person">
+		<email>chewi@gentoo.org</email>
+		<name>James Le Cuirot</name>
+		<description>Maintainer</description>
+	</maintainer>
+	<use>
+		<flag name="daemon">Install additional init scripts for automated RSS updates</flag>
+	</use>
 </pkgmetadata>
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index a701c288b869..b433529fee06 100644
Binary files a/www-client/Manifest.gz and b/www-client/Manifest.gz differ
diff --git a/www-client/seamonkey/metadata.xml b/www-client/seamonkey/metadata.xml
index 55f5ffc68186..cd4713cbfef7 100644
--- a/www-client/seamonkey/metadata.xml
+++ b/www-client/seamonkey/metadata.xml
@@ -12,30 +12,20 @@
 	<use>
 		<flag name="calendar">Build Mozilla's calendar</flag>
 		<flag name="chatzilla">Build Mozilla's IRC client (default on)</flag>
-		<flag name="custom-optimization">Build with user-specified compiler optimizations
-			(-Os, -O0, -O1, -O2, -O3) from CFLAGS (unsupported)</flag>
-		<flag name="gmp-autoupdate">Allow Gecko Media Plugins (binary blobs) to be automatically
-			downloaded and kept up-to-date in user profiles</flag>
+		<flag name="custom-optimization">Build with user-specified compiler optimizations (-Os, -O0, -O1, -O2, -O3) from CFLAGS (unsupported)</flag>
+		<flag name="gmp-autoupdate">Allow Gecko Media Plugins (binary blobs) to be automatically downloaded and kept up-to-date in user profiles</flag>
 		<flag name="gtk3">Use the cairo-gtk3 rendering engine</flag>
 		<flag name="force-gtk3">Use the cairo-gtk3 rendering engine</flag>
-		<flag name="ipc">Use inter-process communication between tabs and plugins.
-			Allows for greater stability in case of plugin crashes</flag>
+		<flag name="ipc">Use inter-process communication between tabs and plugins. Allows for greater stability in case of plugin crashes</flag>
 		<flag name="jemalloc">Enable or disable jemalloc</flag>
 		<flag name="roaming">Build roaming extension support (default on)</flag>
 		<flag name="skia">Enable the SKIA engine for 2D rendering as an alternative to cairo</flag>
-		<flag name="system-cairo">Use the system-wide <pkg>x11-libs/cairo</pkg>
-			instead of bundled.</flag>
-		<flag name="system-harfbuzz">Use the system-wide <pkg>media-libs/harfbuzz</pkg>
-			instead of bundled.</flag>
-		<flag name="system-icu">Use the sytem-wide <pkg>dev-libs/icu</pkg>
-			instead of bundled.</flag>
-		<flag name="system-jpeg">Use the system-wide <pkg>media-libs/libjpeg-turbo</pkg>
-	    		instead of bundled.</flag>
-		<flag name="system-libevent">Use the system-wide <pkg>dev-libs/libevent</pkg>
-			instead of bundled.</flag>
-		<flag name="system-libvpx">Use the system-wide <pkg>media-libs/libvpx</pkg>
-			instead of bundled.</flag>
-		<flag name="system-sqlite">Use the system-wide <pkg>dev-db/sqlite</pkg>
-			installation with secure-delete enabled</flag>
+		<flag name="system-cairo">Use the system-wide <pkg>x11-libs/cairo</pkg> instead of bundled</flag>
+		<flag name="system-harfbuzz">Use the system-wide <pkg>media-libs/harfbuzz</pkg> instead of bundled</flag>
+		<flag name="system-icu">Use the sytem-wide <pkg>dev-libs/icu</pkg> instead of bundled</flag>
+		<flag name="system-jpeg">Use the system-wide <pkg>media-libs/libjpeg-turbo</pkg> instead of bundled</flag>
+		<flag name="system-libevent">Use the system-wide <pkg>dev-libs/libevent</pkg> instead of bundled</flag>
+		<flag name="system-libvpx">Use the system-wide <pkg>media-libs/libvpx</pkg> instead of bundled</flag>
+		<flag name="system-sqlite">Use the system-wide <pkg>dev-db/sqlite</pkg> installation with secure-delete enabled</flag>
 	</use>
 </pkgmetadata>
diff --git a/www-client/vivaldi/vivaldi-1.13.1008.32_p1.ebuild b/www-client/vivaldi/vivaldi-1.13.1008.32_p1.ebuild
index 83d658c050df..be50c11e15d7 100644
--- a/www-client/vivaldi/vivaldi-1.13.1008.32_p1.ebuild
+++ b/www-client/vivaldi/vivaldi-1.13.1008.32_p1.ebuild
@@ -24,7 +24,7 @@ SRC_URI="
 
 LICENSE="Vivaldi"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 RESTRICT="bindist mirror"
 
 DEPEND="
diff --git a/www-misc/Manifest.gz b/www-misc/Manifest.gz
index d7e3f2a1bc89..3b8e32342a02 100644
Binary files a/www-misc/Manifest.gz and b/www-misc/Manifest.gz differ
diff --git a/www-misc/gurlchecker/metadata.xml b/www-misc/gurlchecker/metadata.xml
index 407bd35a3d8d..1948827bbc94 100644
--- a/www-misc/gurlchecker/metadata.xml
+++ b/www-misc/gurlchecker/metadata.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
-<use>
-	<flag name="json">Enable support for parsing Google Chrome and derivatives bookmarks.</flag>
-	<flag name="sqlite">Enable support for parsing Firefox and derivatives bookmarks.</flag>
-</use>
-<longdescription>
-  gURLChecker is a graphical web links checker for GNU/Linux and
-  other POSIX OS. It can work on a whole site, a single local page
-  or a browser bookmarks file.
-</longdescription>
+	<!-- maintainer-needed -->
+	<use>
+		<flag name="json">Enable support for parsing Google Chrome and derivatives bookmarks.</flag>
+		<flag name="sqlite">Enable support for parsing Firefox and derivatives bookmarks.</flag>
+	</use>
+	<longdescription>
+		gURLChecker is a graphical web links checker for GNU/Linux and
+		other POSIX OS. It can work on a whole site, a single local page
+		or a browser bookmarks file.
+	</longdescription>
 </pkgmetadata>
diff --git a/www-misc/wsmake/Manifest b/www-misc/wsmake/Manifest
index 9910f5607ec6..8b30b6ff26f3 100644
--- a/www-misc/wsmake/Manifest
+++ b/www-misc/wsmake/Manifest
@@ -1 +1 @@
-DIST wsmake-0.6.4.tar.bz2 351688 SHA256 884ca4e635d454776888526cf94f6af6639f76b317aa10f9f6d651d9208188d6 SHA512 0f5d125053222c624f9c19f4147f0d97311acb11050e09112ae7b13175ea64d0ba75942c5772e2ffe12d2913cea370ed663d7cb649eef67e0f8379775a3459c4 WHIRLPOOL a72eae2811936ed27cbdc63fec9bbf25999dbfdc95d0cdf81e357fc5bb130b10571332520e6aae2537707c0a40d08aff6995276487eb4d0b66e70014a44db5ab
+DIST wsmake-0.6.4.tar.bz2 351688 BLAKE2B 4e810b1b5f697bc8a7bbb27a4023ff50f90fbcab5f9bf7890277ebb95d5fbf90cfaad51f181c4a76bd532f802fd4eaf07dbab6757a15ee242f80dbef19ce0b08 SHA512 0f5d125053222c624f9c19f4147f0d97311acb11050e09112ae7b13175ea64d0ba75942c5772e2ffe12d2913cea370ed663d7cb649eef67e0f8379775a3459c4
diff --git a/www-misc/wsmake/files/wsmake-0.6.4-bv.diff b/www-misc/wsmake/files/wsmake-0.6.4-bv.diff
index d10aa5769c2d..15cdf05f5d25 100644
--- a/www-misc/wsmake/files/wsmake-0.6.4-bv.diff
+++ b/www-misc/wsmake/files/wsmake-0.6.4-bv.diff
@@ -1,5 +1,5 @@
---- libwsmake/wsUtil.cpp.orig	Sat Sep  1 22:09:13 2001
-+++ libwsmake/wsUtil.cpp	Tue Sep  3 20:19:04 2002
+--- a/libwsmake/wsUtil.cpp
++++ b/libwsmake/wsUtil.cpp
 @@ -714,7 +714,8 @@
    if(__wsmake_quiet) return;
  
diff --git a/www-misc/wsmake/files/wsmake-0.6.4-fix-const-va_list.patch b/www-misc/wsmake/files/wsmake-0.6.4-fix-const-va_list.patch
new file mode 100644
index 000000000000..420bbb61b030
--- /dev/null
+++ b/www-misc/wsmake/files/wsmake-0.6.4-fix-const-va_list.patch
@@ -0,0 +1,29 @@
+--- a/libwsmake/wsUtil.cpp
++++ b/libwsmake/wsUtil.cpp
+@@ -710,13 +710,13 @@
+   }
+ }
+ 
+-void std::__wsmake_print_it(FILE *out, const char *output, const va_list *ap)
++void std::__wsmake_print_it(FILE *out, const char *output, va_list *ap)
+ {
+   if(__wsmake_quiet) return;
+ 
+   vfprintf(out,output,*ap);
+   //BV: this does not compile:  va_end((void*&)*ap);
+-  va_end((char*&)*ap);
++  va_end(*ap);
+ }
+ 
+ #ifdef DEBUG
+--- a/libwsmake/wsUtil.h
++++ b/libwsmake/wsUtil.h
+@@ -77,7 +77,7 @@
+   void __wsmake_print_error(const char *, ...);
+   void __wsmake_print(const char *, ...);
+   void __wsmake_print(int, const char *, ...);
+-  void __wsmake_print_it(FILE *, const char *, const va_list *);
++  void __wsmake_print_it(FILE *, const char *, va_list *);
+ }
+ 
+ #endif /* __WSUTIL_H__ */
diff --git a/www-misc/wsmake/files/wsmake-0.6.4-gcc43.patch b/www-misc/wsmake/files/wsmake-0.6.4-gcc43.patch
index 0ecfe62003f5..9028c0695546 100644
--- a/www-misc/wsmake/files/wsmake-0.6.4-gcc43.patch
+++ b/www-misc/wsmake/files/wsmake-0.6.4-gcc43.patch
@@ -1,8 +1,8 @@
 https://bugs.gentoo.org/show_bug.cgi?id=251745
 https://sourceforge.net/tracker/index.php?func=detail&aid=2520894&group_id=5982&atid=105982
 
---- libwsmake/wsSubTag.cpp
-+++ libwsmake/wsSubTag.cpp.new
+--- a/libwsmake/wsSubTag.cpp
++++ b/libwsmake/wsSubTag.cpp
 @@ -22,6 +22,7 @@
   ***********************************************************************/
  #include <cstdio>
@@ -11,8 +11,8 @@ https://sourceforge.net/tracker/index.php?func=detail&aid=2520894&group_id=5982&
  
  #include <unistd.h>
  #ifdef HAVE_SYS_WAIT_H
---- libwsmake/wsWebPage.cpp
-+++ libwsmake/wsWebPage.cpp.new
+--- a/libwsmake/wsWebPage.cpp
++++ b/libwsmake/wsWebPage.cpp
 @@ -23,6 +23,7 @@
  #include <cassert>
  #include <cerrno>
@@ -21,8 +21,8 @@ https://sourceforge.net/tracker/index.php?func=detail&aid=2520894&group_id=5982&
  
  #include "wsmake.h"
  
---- libwsmake/wsUtil.cpp
-+++ libwsmake/wsUtil.cpp.new
+--- a/libwsmake/wsUtil.cpp
++++ b/libwsmake/wsUtil.cpp
 @@ -28,6 +28,7 @@
  #include <cassert>
  #include <cerrno>
diff --git a/www-misc/wsmake/wsmake-0.6.4.ebuild b/www-misc/wsmake/wsmake-0.6.4.ebuild
index 7299d6dc862b..83c599488943 100644
--- a/www-misc/wsmake/wsmake-0.6.4.ebuild
+++ b/www-misc/wsmake/wsmake-0.6.4.ebuild
@@ -1,33 +1,37 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-inherit eutils
+EAPI=6
 
 DESCRIPTION="Website Pre-processor"
 HOMEPAGE="http://www.wsmake.org/"
-SRC_URI="http://ftp.wsmake.org/pub/wsmake6/stable/wsmake-0.6.4.tar.bz2"
+SRC_URI="http://ftp.wsmake.org/pub/wsmake6/stable/${P}.tar.bz2"
 
-KEYWORDS="x86"
 LICENSE="GPL-2 Artistic"
 SLOT="0"
-IUSE=""
+KEYWORDS="x86"
+IUSE="examples"
 
-src_unpack () {
-	unpack ${A} && cd "${S}"
-	epatch "${FILESDIR}"/${P}-bv.diff
-	epatch "${FILESDIR}"/${P}-gcc43.patch	# 251745
-}
+PATCHES=(
+	"${FILESDIR}"/${P}-bv.diff
+	"${FILESDIR}"/${P}-gcc43.patch	# 251745
+	"${FILESDIR}"/${P}-fix-const-va_list.patch
+)
 
-src_compile () {
-	econf || die "econf failed"
-	emake || die "emake failed"
-	cd doc
+src_unpack() {
+	default
+
+	cd "${S}"/doc || die
 	tar -cf examples.tar examples || die
 }
 
-src_install () {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS COPYING ChangeLog* DEVELOPERS LICENSE NEWS README TODO
-	cd doc
-	dodoc manual.txt examples.tar
+src_install() {
+	default
+	dodoc doc/manual.txt
+
+	if use examples; then
+		rm -r doc/examples/CVS || die
+		dodoc -r doc/examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
 }
diff --git a/www-plugins/Manifest.gz b/www-plugins/Manifest.gz
index 1b48bd19f7fe..f38333b790a0 100644
Binary files a/www-plugins/Manifest.gz and b/www-plugins/Manifest.gz differ
diff --git a/www-plugins/gnash/metadata.xml b/www-plugins/gnash/metadata.xml
index 31d30161df28..66ccd5f77743 100644
--- a/www-plugins/gnash/metadata.xml
+++ b/www-plugins/gnash/metadata.xml
@@ -2,19 +2,19 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-	  <email>chithanh@gentoo.org</email>
-	  <name>Chí-Thanh Christopher Nguyễn</name>
+		<email>chithanh@gentoo.org</email>
+		<name>Chí-Thanh Christopher Nguyễn</name>
 	</maintainer>
 	<use>
-	  <flag name="agg">Rendering based on the Anti-Grain Geometry Rendering Engine library</flag>
-	  <flag name="cygnal">Enable building of the cygnal server</flag>
-	  <flag name="dump">Enable dump output module for creating video from SWF</flag>
-	  <flag name="egl">Enable EGL support for the OpenVG, OpenGL and X11 renderers</flag>
-	  <flag name="harden">Enable upstream recommended hardening build flags (may conflict with system ones)</flag>
-	  <flag name="jemalloc">Use dev-libs/jemalloc for allocations</flag>
-	  <flag name="openvg">Rendering based on the OpenVG graphics acceleration API</flag>
-	  <flag name="sdl-sound">Enable SDL audio output for the standalone player</flag>
-	  <flag name="ssh">Enable using SSH for network authentication in libnet</flag>
-	  <flag name="ssl">Enable directly using OpenSSL in libnet (not needed for nsplugin ssl support)</flag>
+		<flag name="agg">Rendering based on the Anti-Grain Geometry Rendering Engine library</flag>
+		<flag name="cygnal">Enable building of the cygnal server</flag>
+		<flag name="dump">Enable dump output module for creating video from SWF</flag>
+		<flag name="egl">Enable EGL support for the OpenVG, OpenGL and X11 renderers</flag>
+		<flag name="harden">Enable upstream recommended hardening build flags (may conflict with system ones)</flag>
+		<flag name="jemalloc">Use dev-libs/jemalloc for allocations</flag>
+		<flag name="openvg">Rendering based on the OpenVG graphics acceleration API</flag>
+		<flag name="sdl-sound">Enable SDL audio output for the standalone player</flag>
+		<flag name="ssh">Enable using SSH for network authentication in libnet</flag>
+		<flag name="ssl">Enable directly using OpenSSL in libnet (not needed for nsplugin ssl support)</flag>
 	</use>
 </pkgmetadata>
diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index 369c2dd63d79..7508c2b67b40 100644
Binary files a/www-servers/Manifest.gz and b/www-servers/Manifest.gz differ
diff --git a/www-servers/gunicorn/metadata.xml b/www-servers/gunicorn/metadata.xml
index 2461e1cdf801..96e0eb804f85 100644
--- a/www-servers/gunicorn/metadata.xml
+++ b/www-servers/gunicorn/metadata.xml
@@ -5,10 +5,12 @@
 		<email>rafaelmartins@gentoo.org</email>
 		<name>Rafael G. Martins</name>
 	</maintainer>
-	<longdescription lang="en">Gunicorn 'Green Unicorn' is a Python WSGI HTTP Server for UNIX. It's a
-    pre-fork worker model ported from Ruby's Unicorn project. The Gunicorn
-    server is broadly compatible with various web frameworks, simply
-    implemented, light on server resources, and fairly speedy. </longdescription>
+	<longdescription lang="en">
+		Gunicorn 'Green Unicorn' is a Python WSGI HTTP Server for UNIX. It's a
+		pre-fork worker model ported from Ruby's Unicorn project. The Gunicorn
+		server is broadly compatible with various web frameworks, simply
+		implemented, light on server resources, and fairly speedy.
+	</longdescription>
 	<upstream>
 		<remote-id type="pypi">gunicorn</remote-id>
 		<remote-id type="github">benoitc/gunicorn</remote-id>
diff --git a/www-servers/pound/metadata.xml b/www-servers/pound/metadata.xml
index 3b154386945a..5abcc6461591 100644
--- a/www-servers/pound/metadata.xml
+++ b/www-servers/pound/metadata.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-                <email>patrick@gentoo.org</email>
-                <name>Patrick Lauer</name>
-</maintainer>
-<longdescription lang="en">The Pound program is a reverse proxy, load balancer
-  and HTTPS front-end for Web server(s). Pound was developed to enable
-  distributing the load among several Web-servers and to allow for a convenient
-  SSL wrapper for those Web servers that do not offer it natively. Pound is
-  distributed under the GPL - no warranty, it's free to use, copy and give away.
-</longdescription>
-<use>
-	  <flag name="dynscaler">Enable dynamic rescaling of back-end
-		  priorities</flag>
-</use>
+	<maintainer type="person">
+		<email>patrick@gentoo.org</email>
+		<name>Patrick Lauer</name>
+	</maintainer>
+	<longdescription lang="en">
+		The Pound program is a reverse proxy, load balancer
+		and HTTPS front-end for Web server(s). Pound was developed to enable
+		distributing the load among several Web-servers and to allow for a convenient
+		SSL wrapper for those Web servers that do not offer it natively. Pound is
+		distributed under the GPL - no warranty, it's free to use, copy and give away.
+	</longdescription>
+	<use>
+		<flag name="dynscaler">Enable dynamic rescaling of back-end priorities</flag>
+	</use>
 </pkgmetadata>
diff --git a/www-servers/resin/metadata.xml b/www-servers/resin/metadata.xml
index d0b51e930c61..42183598824f 100644
--- a/www-servers/resin/metadata.xml
+++ b/www-servers/resin/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-	  <email>java@gentoo.org</email>
-	  <name>Java</name>
-  </maintainer>
-  <use>
-	  <flag name="admin">Enable Resin admin webapp</flag>
-  </use>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<use>
+		<flag name="admin">Enable Resin admin webapp</flag>
+	</use>
 </pkgmetadata>
diff --git a/www-servers/spawn-fcgi/metadata.xml b/www-servers/spawn-fcgi/metadata.xml
index 27f1ebb9d05d..159337857101 100644
--- a/www-servers/spawn-fcgi/metadata.xml
+++ b/www-servers/spawn-fcgi/metadata.xml
@@ -2,13 +2,13 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
-	<longdescription lang="en">spawn-fcgi is used to spawn FastCGI applications
+	<longdescription lang="en">
+		spawn-fcgi is used to spawn FastCGI applications
 
-  Features
-  --------
-  - binds to IPv4 and Unix domain sockets
-  - supports privilege separation: chmod/chown socket, drop to uid/gid
-  - supports chroot
-  - supports daemontools supervise
+		Features:
+		- binds to IPv4 and Unix domain sockets
+		- supports privilege separation: chmod/chown socket, drop to uid/gid
+		- supports chroot
+		- supports daemontools supervise
 	</longdescription>
 </pkgmetadata>
diff --git a/www-servers/xsp/metadata.xml b/www-servers/xsp/metadata.xml
index 93662ee6a09d..fd8812bf8d60 100644
--- a/www-servers/xsp/metadata.xml
+++ b/www-servers/xsp/metadata.xml
@@ -2,8 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
-                <email>dotnet@gentoo.org</email>
-                <name>Gentoo Dotnet Project</name>
+		<email>dotnet@gentoo.org</email>
+		<name>Gentoo Dotnet Project</name>
 	</maintainer>
 	<longdescription lang="en">
 		XSP is a standalone web server written in C# that can be used to run
@@ -11,9 +11,9 @@
 	</longdescription>
 	<use>
 		<flag name="developer">creates .mdb files for either Release and Debug</flag>
-                <flag name="net35">use .NET 3.5 Framework</flag>
-                <flag name="net40">use .NET 4.0 Framework</flag>
-                <flag name="net45">use .NET 4.5 Framework</flag>
+		<flag name="net35">use .NET 3.5 Framework</flag>
+		<flag name="net40">use .NET 4.0 Framework</flag>
+		<flag name="net45">use .NET 4.5 Framework</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">mono/xsp</remote-id>
diff --git a/x11-drivers/Manifest.gz b/x11-drivers/Manifest.gz
index 9951d4d9eb43..e32ec067155d 100644
Binary files a/x11-drivers/Manifest.gz and b/x11-drivers/Manifest.gz differ
diff --git a/x11-drivers/nvidia-drivers/metadata.xml b/x11-drivers/nvidia-drivers/metadata.xml
index 8de5b844b79d..9949b7e95257 100644
--- a/x11-drivers/nvidia-drivers/metadata.xml
+++ b/x11-drivers/nvidia-drivers/metadata.xml
@@ -1,26 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
- <email>jer@gentoo.org</email>
-</maintainer>
-<maintainer type="project">
- <email>hardened@gentoo.org</email>
-</maintainer>
-<longdescription>
-Nvidia provides different branches of its drivers for different batches of its
-hardware. When maintaining these ebuilds or other ebuilds depending on them,
-you will need to keep in mind that the major versions represent these different
-branches.
-</longdescription>
-<use>
-	<flag name="compat">Install non-GLVND libGL for backwards compatibility</flag>
-	<flag name="driver">Install the kernel driver module</flag>
-	<flag name="X">Install the X.org driver, OpenGL libraries, XvMC libraries, and VDPAU libraries</flag>
-	<flag name="gtk3">Install nvidia-settings with support for GTK+ 3</flag>
-	<flag name="kms">Enable support for kernel mode setting (KMS)</flag>
-	<flag name="pax_kernel">PaX patches from the PaX project</flag> 
-	<flag name="tools">Install additional tools such as nvidia-settings</flag>
-	<flag name="uvm">Install the Unified Memory kernel module (nvidia-uvm) for sharing memory between CPU and GPU in CUDA programs</flag>
-</use>
+	<maintainer type="person">
+		<email>jer@gentoo.org</email>
+	</maintainer>
+	<maintainer type="project">
+		<email>hardened@gentoo.org</email>
+	</maintainer>
+	<longdescription>
+		Nvidia provides different branches of its drivers for different batches of its
+		hardware. When maintaining these ebuilds or other ebuilds depending on them,
+		you will need to keep in mind that the major versions represent these different
+		branches.
+	</longdescription>
+	<use>
+		<flag name="compat">Install non-GLVND libGL for backwards compatibility</flag>
+		<flag name="driver">Install the kernel driver module</flag>
+		<flag name="X">Install the X.org driver, OpenGL libraries, XvMC libraries, and VDPAU libraries</flag>
+		<flag name="gtk3">Install nvidia-settings with support for GTK+ 3</flag>
+		<flag name="kms">Enable support for kernel mode setting (KMS)</flag>
+		<flag name="pax_kernel">PaX patches from the PaX project</flag>
+		<flag name="tools">Install additional tools such as nvidia-settings</flag>
+		<flag name="uvm">Install the Unified Memory kernel module (nvidia-uvm) for sharing memory between CPU and GPU in CUDA programs</flag>
+	</use>
 </pkgmetadata>
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index f0ac3f917478..0c25b98c7639 100644
Binary files a/x11-libs/Manifest.gz and b/x11-libs/Manifest.gz differ
diff --git a/x11-libs/cairo/metadata.xml b/x11-libs/cairo/metadata.xml
index 38e0470af0c2..7c19663b4c4b 100644
--- a/x11-libs/cairo/metadata.xml
+++ b/x11-libs/cairo/metadata.xml
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-	<email>tetromino@gentoo.org</email>
-	<name>Alexandre Rostovtsev</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>x11@gentoo.org</email>
-    <name>X11</name>
-  </maintainer>
-  <use>
-    <flag name="opengl" restrict="&gt;=x11-libs/cairo-1.10.0">Build the OpenGL backend</flag>
-    <flag name="gles2">Build the OpenGL ES 2 backend</flag>
-    <flag name="glib">Compile with GLib Object System support</flag>
-    <flag name="utils">Build support for Cairo script and trace utilities</flag>
-    <flag name="valgrind">Built-in support to mark memory regions</flag>
-  </use>
-  <upstream>
-    <remote-id type="cpe">cpe:/a:cairographics:cairo</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>tetromino@gentoo.org</email>
+		<name>Alexandre Rostovtsev</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>x11@gentoo.org</email>
+		<name>X11</name>
+	</maintainer>
+	<use>
+		<flag name="opengl" restrict="&gt;=x11-libs/cairo-1.10.0">Build the OpenGL backend</flag>
+		<flag name="gles2">Build the OpenGL ES 2 backend</flag>
+		<flag name="glib">Compile with GLib Object System support</flag>
+		<flag name="utils">Build support for Cairo script and trace utilities</flag>
+		<flag name="valgrind">Built-in support to mark memory regions</flag>
+	</use>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:cairographics:cairo</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/x11-libs/gl2ps/metadata.xml b/x11-libs/gl2ps/metadata.xml
index dd1e3ccd3a3f..6577818b4308 100644
--- a/x11-libs/gl2ps/metadata.xml
+++ b/x11-libs/gl2ps/metadata.xml
@@ -6,12 +6,12 @@
 		<name>Gentoo Science Project</name>
 	</maintainer>
 	<longdescription lang="en">
-  GL2PS is a C library providing high quality vector output for any
-  OpenGL application. The main difference between GL2PS and other
-  similar libraries is the use of sorting algorithms
-  capable of handling intersecting and stretched polygons, as well as
-  non manifold objects. GL2PS provides advanced smooth shading and
-  text rendering, culling of invisible primitives, mixed vector/bitmap
-  output, and much more.
-</longdescription>
+		GL2PS is a C library providing high quality vector output for any
+		OpenGL application. The main difference between GL2PS and other
+		similar libraries is the use of sorting algorithms
+		capable of handling intersecting and stretched polygons, as well as
+		non manifold objects. GL2PS provides advanced smooth shading and
+		text rendering, culling of invisible primitives, mixed vector/bitmap
+		output, and much more.
+	</longdescription>
 </pkgmetadata>
diff --git a/x11-libs/motif/Manifest b/x11-libs/motif/Manifest
index 4ff2ba3b9418..9bfca1ff53bc 100644
--- a/x11-libs/motif/Manifest
+++ b/x11-libs/motif/Manifest
@@ -1,5 +1,5 @@
-DIST motif-2.3.6-patches-2.tar.xz 1600 SHA256 03478b2ef5c49b9854534ac4615f56d93e589daf50d9056c1abba372e157c947 SHA512 09c857f7f2ec0d48660e6fff8afddec99416084e2b80a8793401e7641a3669fbe4eb10811e60f3d9dc106c828a87324dfdd27cc91a62bf3dedbd9154542c7619 WHIRLPOOL 2d59ea61e646a827b0da3d6b44b72a7d42b8e60f1defcfc00c8c9689a97c6789cfd6f91ff858ee1b8cc8443c5510507ef14d37efd4e24928c0d9dc54f87a2b8f
-DIST motif-2.3.6.tar.gz 5725456 SHA256 fa810e6bedeca0f5a2eb8216f42129bcf6bd23919068d433e386b7bfc05d58cf SHA512 65c2d7666a916ab38878008915072317752ee2657ebaff869d274f9f9d9fba3ebfbb82c26d2517f3b9035e059ac99a9bf46d4be8d123115e3b23589517d28e60 WHIRLPOOL 88a88dbdeefce4ff01a5018f16cc687e9ac86af67344c5c292d0508abcada17d8dc7d65df2c2e6e4904d6c8524552e2607f1a926a745fe3196f866d9c5f93294
-DIST motif-2.3.7.tar.gz 5715478 SHA256 8f7aadbb0f42df2093d4690735a2b9a02ea2bf69dfb15ae0a39cae28f1580d14 SHA512 2485f6e111139d6815e8ac38630d082ac73474b033818b4a92b46f5e2213fa85030ef8095672b2e31b1ed5c207d3baf58f01ec5deec0cd3bd9527cb341f741f8 WHIRLPOOL f94a384ffdcbcd6fd289d31225822101a0cbfdf147a49e925c0b5d12fb57548177746e6da511f2f096aa1cf72b07f3a3930f5037715c784857e0679a005b4a02
-DIST openMotif-2.2.3.tar.gz 5149785 SHA256 12fc0d1de53ff30307603e31826db9b63a442f6f743451aed2cb7cedb038d3d9 SHA512 322381faf50bde6bbd2253f1b52a25e5471df87a2b01fba4de7e0d1bb4c1267e2b0d358e13e1b924a60d9e85316959fa6b2be5a458964d03f47a936bb618eae8 WHIRLPOOL 970f3f20eefde787af9fa932dcbf77e870ca6ba248e2632c358bbb7d149c2c4fef31a33a64888bc2b2e891f1c66a803a12e1121378539a94599e0be753c04bad
-DIST openmotif-2.2.3-patches-5.tar.xz 19972 SHA256 69e1b1e37023ce0aa65c1aa8bdb60a6b2ead3472df26f1d10bffae7386b24c35 SHA512 62c0489d1bda83952e1c8d39e8c8fe0ee5a4d2927f9139227cb80b2c58751d63d95b70fff3eb165219e75cdfdc299f92d90482124e6334a28781a13b174786c9 WHIRLPOOL e2f8abc439d25d631b8489e1007788e931ea4982957d50e0e3e1062b76a3d37b279140f30bac95ab378a76cc33d5a49c1c217a66c441959510d9a96d7409d4af
+DIST motif-2.3.6-patches-2.tar.xz 1600 BLAKE2B 03ef74773c581d09ad89f35f26e9d01ed01ec8b40344cd4d6aba106de80bfe0ce69d65551aafb4c53daf61cc31d1e703c9762c2b4a60729c73783b649a00e6c3 SHA512 09c857f7f2ec0d48660e6fff8afddec99416084e2b80a8793401e7641a3669fbe4eb10811e60f3d9dc106c828a87324dfdd27cc91a62bf3dedbd9154542c7619
+DIST motif-2.3.6.tar.gz 5725456 BLAKE2B 40f1af89e267de8d7603a7db81390286d52d1fd1ae1a7f45dae82b6d11f6a7c35e4214b9df0f3901781a9249632d40aff360b9d97cffc3218ca2d251693d9ae2 SHA512 65c2d7666a916ab38878008915072317752ee2657ebaff869d274f9f9d9fba3ebfbb82c26d2517f3b9035e059ac99a9bf46d4be8d123115e3b23589517d28e60
+DIST motif-2.3.7.tar.gz 5715478 BLAKE2B 594aec6674c60e6c8f0e8abc830b934a11b7274fd5eb2d344943ceea9096caf047107523dc4429fed0023935935979e6af5a26b2481a593f3090807ad3fcd8ef SHA512 2485f6e111139d6815e8ac38630d082ac73474b033818b4a92b46f5e2213fa85030ef8095672b2e31b1ed5c207d3baf58f01ec5deec0cd3bd9527cb341f741f8
+DIST openMotif-2.2.3.tar.gz 5149785 BLAKE2B 60d1f4775f7a2a3477f005d713c75fbe093cbe50f9c7a632c618b81b90a9761cb06a944f15378673f22419e5e71ed975d18f95ba05ad366f88ddbca898dc08a6 SHA512 322381faf50bde6bbd2253f1b52a25e5471df87a2b01fba4de7e0d1bb4c1267e2b0d358e13e1b924a60d9e85316959fa6b2be5a458964d03f47a936bb618eae8
+DIST openmotif-2.2.3-patches-5.tar.xz 19972 BLAKE2B b237ff27f0bf363f2f46a5b81c50a3662ca39e4729e190fc989d9521b5770de8afe860f3a04efa1901b4f381d2bed1117d6b13c65a42fea77e6ac96145ac0d00 SHA512 62c0489d1bda83952e1c8d39e8c8fe0ee5a4d2927f9139227cb80b2c58751d63d95b70fff3eb165219e75cdfdc299f92d90482124e6334a28781a13b174786c9
diff --git a/x11-libs/motif/motif-2.2.3-r12.ebuild b/x11-libs/motif/motif-2.2.3-r12.ebuild
index c511707f1a96..feb4e6b11620 100644
--- a/x11-libs/motif/motif-2.2.3-r12.ebuild
+++ b/x11-libs/motif/motif-2.2.3-r12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -40,6 +40,7 @@ src_prepare() {
 	sed -i -e '/^SUBDIRS/{:x;/\\$/{N;bx;};s/=.*/= lib clients/;}' Makefile.am
 	sed -i -e '/^SUBDIRS/{:x;/\\$/{N;bx;};s/=.*/= uil/;}' clients/Makefile.am
 
+	mv configure.in configure.ac || die
 	AM_OPTS="--force-missing" eautoreconf
 
 	# get around some LANG problems in make (#15119)
diff --git a/x11-libs/motif/motif-2.3.7.ebuild b/x11-libs/motif/motif-2.3.7.ebuild
index ec09b0590406..b727e2b024c3 100644
--- a/x11-libs/motif/motif-2.3.7.ebuild
+++ b/x11-libs/motif/motif-2.3.7.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/project/motif/Motif%20${PV}%20Source%20Code/${P}.t
 
 LICENSE="LGPL-2.1+ MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="examples jpeg +motif22-compatibility png static-libs unicode xft"
 
 RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
diff --git a/x11-libs/qscintilla/qscintilla-2.10.1.ebuild b/x11-libs/qscintilla/qscintilla-2.10.1.ebuild
index bf85437f8fcd..34580af5018c 100644
--- a/x11-libs/qscintilla/qscintilla-2.10.1.ebuild
+++ b/x11-libs/qscintilla/qscintilla-2.10.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/pyqt/${MY_P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0/13"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="designer doc +qt4 qt5"
 
 REQUIRED_USE="|| ( qt4 qt5 )"
diff --git a/x11-libs/qwtplot3d/metadata.xml b/x11-libs/qwtplot3d/metadata.xml
index 2725f60bd4c3..a63bd8a60d8b 100644
--- a/x11-libs/qwtplot3d/metadata.xml
+++ b/x11-libs/qwtplot3d/metadata.xml
@@ -6,9 +6,9 @@
 		<name>Gentoo Science Project</name>
 	</maintainer>
 	<longdescription>
-    QwtPlot3D isa feature-rich Qt/OpenGL-based C++ programming library,
-	providing essentially a  bunch of 3D-widgets for programmers.
-  </longdescription>
+		QwtPlot3D isa feature-rich Qt/OpenGL-based C++ programming library,
+		providing essentially a  bunch of 3D-widgets for programmers.
+	</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">qwtplot3d</remote-id>
 	</upstream>
diff --git a/x11-libs/scw/scw-0.4.7-r1.ebuild b/x11-libs/scw/scw-0.4.7-r1.ebuild
index c1868e7ecc57..732ab3fd45b3 100644
--- a/x11-libs/scw/scw-0.4.7-r1.ebuild
+++ b/x11-libs/scw/scw-0.4.7-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://scwwidgets.googlepages.com/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="doc"
 
 RDEPEND="
diff --git a/x11-libs/scw/scw-0.4.7.ebuild b/x11-libs/scw/scw-0.4.7.ebuild
deleted file mode 100644
index d31965b84bcf..000000000000
--- a/x11-libs/scw/scw-0.4.7.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=3
-
-DESCRIPTION="A GTK+ widget set specifically designed for chat programs"
-HOMEPAGE="http://scwwidgets.googlepages.com"
-SRC_URI="http://scwwidgets.googlepages.com/${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 x86"
-IUSE="doc"
-
-RDEPEND="dev-libs/glib:2
-	x11-libs/gtk+:2"
-DEPEND="${RDEPEND}
-	doc? ( dev-util/gtk-doc )
-	virtual/pkgconfig"
-
-src_configure() {
-	econf $(use_enable doc gtk-doc)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
-	dodoc AUTHORS ChangeLog NEWS README
-}
diff --git a/x11-libs/xapps/Manifest b/x11-libs/xapps/Manifest
index ace91cf8306f..d607702329a0 100644
--- a/x11-libs/xapps/Manifest
+++ b/x11-libs/xapps/Manifest
@@ -1,2 +1,3 @@
 DIST xapps-1.0.2.tar.gz 109067 SHA256 1443e9f319763f8b90749ea9669880005f315af060f7bbaa2b4241b4c4ca49a4 SHA512 59426a8e39af48eb6435cb649fd88601a1a324d284ed9d222f12b7e52e70a0b250235b5924af1ecb7d6f3abd6c8e53e0cf38672c94dff44193f01dbc90c35646 WHIRLPOOL 6e4f01f17c7450b246dbfbed3fa229315166f5223c051422be7fd8510df376d6e916ab5e9eaac645abd57e055ac89da81291aa73de38af6a9129497f1994201d
 DIST xapps-1.0.3.tar.gz 121490 SHA256 bb1b89b586eec67fc109140de791710c5b4ec488b01ef3ac261e288a27b4797e SHA512 1182062153fc7344f94e9a25e98a457237b54c4841e425d202f8b57751f288e460423ca7408a888aff7a2b162acd194efda332b6acbd0a5cc2c12ae9414ea3c3 WHIRLPOOL 43784ca1328d810f38a3843eb0ef9bc9ac9a30c4bbc524c4898e0f7f3c0e6bbe3ceb507be4d48e962f06be8a652ffbc4a80ac3ed76d0807cce80d1d86f87c211
+DIST xapps-1.0.4.tar.gz 129497 BLAKE2B d668ff840fa83b4a037c4b0f1c502e1851236d7998c4e5c7161a779e170eee6f6f47a2a17e71f332edf3f42f6ccb88c20379ad3b12847277f5e57a3b3765f2ef SHA512 1b735167f8edf15be1093255691c67ee1ae99664a714b75d46b1b782b00a6d1da72befc484ee66f070a829b6b8fd4dfa50bec5033220f66a1a4b577363b673b7
diff --git a/x11-libs/xapps/xapps-1.0.4.ebuild b/x11-libs/xapps/xapps-1.0.4.ebuild
new file mode 100644
index 000000000000..c72b5f1df5d4
--- /dev/null
+++ b/x11-libs/xapps/xapps-1.0.4.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools gnome2-utils xdg-utils
+
+DESCRIPTION="Cross-desktop libraries and common resources"
+HOMEPAGE="https://github.com/linuxmint/xapps/"
+LICENSE="GPL-3"
+
+SRC_URI="https://github.com/linuxmint/xapps/archive/${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64 ~x86"
+
+SLOT="0"
+IUSE="introspection static-libs"
+
+RDEPEND="
+	>=dev-libs/glib-2.37.3:2
+	dev-libs/gobject-introspection:0=
+	gnome-base/libgnomekbd
+	gnome-base/gnome-common
+	x11-libs/cairo
+	>=x11-libs/gdk-pixbuf-2.22.0:2[introspection?]
+	>=x11-libs/gtk+-3.3.16:3[introspection?]
+	x11-libs/libxkbfile
+"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	dev-util/gtk-doc
+	dev-util/gtk-doc-am
+"
+
+src_prepare() {
+	xdg_environment_reset
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--enable-gtk-doc \
+		--enable-gtk-doc-html \
+		$(use_enable introspection) \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	rm -rf "${ED%/}"/usr/bin || die
+
+	# package provides .pc files
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/x11-libs/xbae/metadata.xml b/x11-libs/xbae/metadata.xml
index a1dd8627a079..ff903b86644f 100644
--- a/x11-libs/xbae/metadata.xml
+++ b/x11-libs/xbae/metadata.xml
@@ -6,18 +6,18 @@
 		<name>Gentoo Science Project</name>
 	</maintainer>
 	<longdescription lang="en">
-  XbaeMatrix is a free Motif(R) table widget (also compatible with the free 
-  LessTif) which presents an editable array of string data to the user in a 
-  scrollable table similar to a spreadsheet. The rows and columns of the Matrix 
-  may optionally be labelled. A number of "fixed" and "trailing fixed" rows 
-  or columns may be specified.
-  
-  The XbaeCaption widget is a simple Motif manager widget that associates 
-  a label with a child.
-  
-  In addition the XbaeInput widget is being distributed, a text input field 
-  that provides generic customised data entry and formatting for strings.
-</longdescription>
+		XbaeMatrix is a free Motif(R) table widget (also compatible with the free
+		LessTif) which presents an editable array of string data to the user in a
+		scrollable table similar to a spreadsheet. The rows and columns of the Matrix
+		may optionally be labelled. A number of "fixed" and "trailing fixed" rows
+		or columns may be specified.
+
+		The XbaeCaption widget is a simple Motif manager widget that associates
+		a label with a child.
+
+		In addition the XbaeInput widget is being distributed, a text input field
+		that provides generic customised data entry and formatting for strings.
+	</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">xbae</remote-id>
 	</upstream>
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index b1787ceea672..7158b5abbf9c 100644
Binary files a/x11-misc/Manifest.gz and b/x11-misc/Manifest.gz differ
diff --git a/x11-misc/obconf/metadata.xml b/x11-misc/obconf/metadata.xml
index 92696b72e60a..18e140956483 100644
--- a/x11-misc/obconf/metadata.xml
+++ b/x11-misc/obconf/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-  	<email>hwoarang@gentoo.org</email>
-	<name>Markos Chandras</name>
-  </maintainer>
+	<maintainer type="person">
+		<email>hwoarang@gentoo.org</email>
+		<name>Markos Chandras</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/x11-misc/py3status/metadata.xml b/x11-misc/py3status/metadata.xml
index afc1f98f7b9c..ca06ced2e0e4 100644
--- a/x11-misc/py3status/metadata.xml
+++ b/x11-misc/py3status/metadata.xml
@@ -5,8 +5,9 @@
 		<email>ultrabug@gentoo.org</email>
 		<name>Alexys Jacob</name>
 	</maintainer>
-	<longdescription lang="en">py3status is an extensible
- i3status wrapper written in python</longdescription>
+	<longdescription lang="en">
+		py3status is an extensible i3status wrapper written in python.
+	</longdescription>
 	<upstream>
 		<remote-id type="pypi">py3status</remote-id>
 		<remote-id type="github">ultrabug/py3status</remote-id>
diff --git a/x11-misc/viewglob/metadata.xml b/x11-misc/viewglob/metadata.xml
index bf53ae30f04a..d35fe20ba4c7 100644
--- a/x11-misc/viewglob/metadata.xml
+++ b/x11-misc/viewglob/metadata.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>shell-tools@gentoo.org</email>
-    <name>Gentoo Shell Tools Project</name>
-  </maintainer>
-  <longdescription lang="en">
+	<maintainer type="project">
+		<email>shell-tools@gentoo.org</email>
+		<name>Gentoo Shell Tools Project</name>
+	</maintainer>
+	<longdescription lang="en">
 		Viewglob is a package that graphically displays the results of a shell
 		glob, helping beginners of shell usage become acclimitised to filename
 		generation. In addition, it acts as a basic replacement for ls, by
 		tracking shell directory changes. It is compatible with zsh and bash,
 		and helper files and documentation are provided.
 	</longdescription>
-  <upstream>
-    <remote-id type="sourceforge">viewglob</remote-id>
-  </upstream>
+	<upstream>
+		<remote-id type="sourceforge">viewglob</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/x11-misc/wmctrl/metadata.xml b/x11-misc/wmctrl/metadata.xml
index de4a42db7c4a..d8d016215398 100644
--- a/x11-misc/wmctrl/metadata.xml
+++ b/x11-misc/wmctrl/metadata.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
-<longdescription>
-		 The wmctrl program is a command line tool to interact with an 
-		 EWMH/NetWM compatible X Window Manager. It provides command line 
-		 access to almost all the features defined in the EWMH specification.
-		 Using it, it's possible to, for example, obtain information about the
-		 window manager, get a detailed list of desktops and managed windows, 
-		 switch and resize desktops, change number of desktops, make windows 
-		 full-screen, always-above or sticky, and activate, close, move, 
-		 resize, maximize and minimize them. 
-	</longdescription>	
+	<!-- maintainer-needed -->
+	<longdescription>
+		The wmctrl program is a command line tool to interact with an
+		EWMH/NetWM compatible X Window Manager. It provides command line
+		access to almost all the features defined in the EWMH specification.
+		Using it, it's possible to, for example, obtain information about the
+		window manager, get a detailed list of desktops and managed windows,
+		switch and resize desktops, change number of desktops, make windows
+		full-screen, always-above or sticky, and activate, close, move,
+		resize, maximize and minimize them.
+	</longdescription>
 </pkgmetadata>
diff --git a/x11-misc/xdesktopwaves/metadata.xml b/x11-misc/xdesktopwaves/metadata.xml
index 5e3210314f13..678112183b91 100644
--- a/x11-misc/xdesktopwaves/metadata.xml
+++ b/x11-misc/xdesktopwaves/metadata.xml
@@ -10,7 +10,7 @@
 		X Windows desktop under water. Windows and mouse are like ships on the
 		sea. Each movement of these ends up in moving water waves. You can even
 		have rain and/or storm stirring up the water.
-  </longdescription>
+	</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">xdesktopwaves</remote-id>
 	</upstream>
diff --git a/x11-misc/xmonad-log-applet/metadata.xml b/x11-misc/xmonad-log-applet/metadata.xml
index d916bff47cc2..5991f7685607 100644
--- a/x11-misc/xmonad-log-applet/metadata.xml
+++ b/x11-misc/xmonad-log-applet/metadata.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>haskell@gentoo.org</email>
-  </maintainer>
-  <maintainer type="person">
-    <email>flo@geekplace.eu</email>
-    <description>Maintainer, CC him on bugs</description>
-  </maintainer>
-  <longdescription>
-	xmonad-log-applet is for Xmonad users who find the GNOME, MATE, or Xfce panel useful. The applet will show the active workspaces, the title of the selected window or whatever information you send it from your xmonad.hs.
-</longdescription>
-  <upstream>
-    <remote-id type="github">alexkay/xmonad-log-applet</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+	</maintainer>
+	<maintainer type="person">
+		<email>flo@geekplace.eu</email>
+		<description>Maintainer, CC him on bugs</description>
+	</maintainer>
+	<longdescription>
+		xmonad-log-applet is for Xmonad users who find the GNOME, MATE, or Xfce panel useful. The applet will show the active workspaces, the title of the selected window or whatever information you send it from your xmonad.hs.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">alexkay/xmonad-log-applet</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/x11-plugins/Manifest.gz b/x11-plugins/Manifest.gz
index 14b657327ece..a315e94a85f5 100644
Binary files a/x11-plugins/Manifest.gz and b/x11-plugins/Manifest.gz differ
diff --git a/x11-plugins/docker/metadata.xml b/x11-plugins/docker/metadata.xml
index 775ce9559c30..c691b64fc49f 100644
--- a/x11-plugins/docker/metadata.xml
+++ b/x11-plugins/docker/metadata.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>voyageur@gentoo.org</email>
-	<name>Bernard Cafarelli</name>
-</maintainer>
-
-<longdescription>
-  Openbox app which acts as a system tray for KDE and GNOME2.
-</longdescription>
+	<maintainer type="person">
+		<email>voyageur@gentoo.org</email>
+		<name>Bernard Cafarelli</name>
+	</maintainer>
+	<longdescription>
+		Openbox app which acts as a system tray for KDE and GNOME2.
+	</longdescription>
 </pkgmetadata>
diff --git a/x11-plugins/fsviewer/fsviewer-0.2.6-r1.ebuild b/x11-plugins/fsviewer/fsviewer-0.2.6-r1.ebuild
deleted file mode 100644
index 31bd54604bf4..000000000000
--- a/x11-plugins/fsviewer/fsviewer-0.2.6-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils multilib
-
-MY_P=${PN}-app-${PV}
-
-DESCRIPTION="A file system viewer for Window Maker"
-HOMEPAGE="http://www.bayernline.de/~gscholz/linux/fsviewer/"
-SRC_URI="http://www.bayernline.de/~gscholz/linux/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="nls"
-
-RDEPEND=">=x11-wm/windowmaker-0.95.2
-	x11-libs/libXft
-	x11-libs/libXpm
-	x11-libs/libX11"
-DEPEND="${RDEPEND}
-	x11-proto/xproto
-	nls? ( sys-devel/gettext )"
-
-S=${WORKDIR}/${MY_P}
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-configure.patch
-	epatch "${FILESDIR}"/${P}-wmaker-0.95_support.patch
-	epatch "${FILESDIR}"/${P}-fix_title_bar.patch
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable nls) \
-		--with-appspath=/usr/$(get_libdir)/GNUstep
-}
-
-src_install() {
-	default
-	dosym /usr/$(get_libdir)/GNUstep/FSViewer.app/FSViewer /usr/bin/FSViewer
-}
diff --git a/x11-plugins/fsviewer/fsviewer-0.2.6.ebuild b/x11-plugins/fsviewer/fsviewer-0.2.6.ebuild
deleted file mode 100644
index a7a568e38208..000000000000
--- a/x11-plugins/fsviewer/fsviewer-0.2.6.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils multilib
-
-MY_P=${PN}-app-${PV}
-
-DESCRIPTION="A file system viewer for Window Maker"
-HOMEPAGE="http://www.bayernline.de/~gscholz/linux/fsviewer/"
-SRC_URI="http://www.bayernline.de/~gscholz/linux/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="nls"
-
-RDEPEND=">=x11-wm/windowmaker-0.95.2
-	x11-libs/libXft
-	x11-libs/libXpm
-	x11-libs/libX11"
-DEPEND="${RDEPEND}
-	x11-proto/xproto
-	nls? ( sys-devel/gettext )"
-
-S=${WORKDIR}/${MY_P}
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-wmaker-0.95_support.patch
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable nls) \
-		--with-appspath=/usr/$(get_libdir)/GNUstep
-}
-
-src_install() {
-	default
-	dosym /usr/$(get_libdir)/GNUstep/FSViewer.app/FSViewer /usr/bin/FSViewer
-}
diff --git a/x11-plugins/pidgin-bot-sentry/metadata.xml b/x11-plugins/pidgin-bot-sentry/metadata.xml
index 0171dd0ebc91..fedb7369b097 100644
--- a/x11-plugins/pidgin-bot-sentry/metadata.xml
+++ b/x11-plugins/pidgin-bot-sentry/metadata.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>chutzpah@gentoo.org</email>
-    <name>Patrick McLean</name>
-  </maintainer>
-  <longdescription lang="en">
-	Bot Sentry is a Pidgin (libpurple) plugin to prevent Instant Message (IM)
-	spam. It allows you to ignore IMs unless the sender is in your Buddy List,
-	the sender is in your Allow List, or the sender correctly answers a question
-	you have predefined. 
-</longdescription>
-  <upstream>
-    <remote-id type="sourceforge">pidgin-bs</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>chutzpah@gentoo.org</email>
+		<name>Patrick McLean</name>
+	</maintainer>
+	<longdescription lang="en">
+		Bot Sentry is a Pidgin (libpurple) plugin to prevent Instant Message (IM)
+		spam. It allows you to ignore IMs unless the sender is in your Buddy List,
+		the sender is in your Allow List, or the sender correctly answers a question
+		you have predefined.
+	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">pidgin-bs</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/x11-plugins/wmMatrix/Manifest b/x11-plugins/wmMatrix/Manifest
index d86635a8ef99..6287794ad8ad 100644
--- a/x11-plugins/wmMatrix/Manifest
+++ b/x11-plugins/wmMatrix/Manifest
@@ -1 +1 @@
-DIST wmMatrix-0.2.tar.gz 225343 SHA256 ce7b18b1046985237388846332234fd5aaae7b6ba2476ba465e4e57208b75053 SHA512 4cc65c90e5279645163833f6c8a57bce0d81428c1e5106a98dd74c1b0d693f2dfd3b230e49f9ce710ecc8073477750db94dd9b3c2b96ee026ef0c666f4bc3c4c WHIRLPOOL 49290e6aa357a32e414509aa806f2b51664fb93f980fe6f86b0c85195b6b071d2239c86c21b8ac86b4834a7a82520f40acd8e902e91dd5522107b7c30cf97831
+DIST wmMatrix-0.2.tar.gz 225343 BLAKE2B 4d649ac8e9691a75c7e9a32266074a5624ef83e4f91a6474bfef67df1e3d5b653b63b5909a5bb5460312b36ea661404aa843e2d7ba56a39e43b9a815e734d121 SHA512 4cc65c90e5279645163833f6c8a57bce0d81428c1e5106a98dd74c1b0d693f2dfd3b230e49f9ce710ecc8073477750db94dd9b3c2b96ee026ef0c666f4bc3c4c
diff --git a/x11-plugins/wmMatrix/wmMatrix-0.2-r1.ebuild b/x11-plugins/wmMatrix/wmMatrix-0.2-r1.ebuild
index 7599c92c13b9..6ab6d1bf039e 100644
--- a/x11-plugins/wmMatrix/wmMatrix-0.2-r1.ebuild
+++ b/x11-plugins/wmMatrix/wmMatrix-0.2-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 inherit eutils toolchain-funcs multilib
 
 DESCRIPTION="WMaker DockApp: Slightly modified version of Jamie Zawinski's xmatrix screenhack"
-SRC_URI="http://dockapps.windowmaker.org/download.php/id/17/${P}.tar.gz"
-HOMEPAGE="http://dockapps.windowmaker.org/file.php/id/10"
+HOMEPAGE="http://www.dockapps.net/wmmatrix"
+SRC_URI="http://www.dockapps.net/download/${P}.tar.gz"
 
 CDEPEND="x11-libs/libX11
 	x11-libs/libXext
diff --git a/x11-plugins/wmSun/Manifest b/x11-plugins/wmSun/Manifest
index b30e46e8da46..c71a745e22c1 100644
--- a/x11-plugins/wmSun/Manifest
+++ b/x11-plugins/wmSun/Manifest
@@ -1,2 +1 @@
-DIST wmSun-1.03.tar.gz 49744 SHA256 a46e11680d4625589d4d91030e17916c02405451e60d366340668a01597c4ea2 SHA512 d12eb1ed1e409bb9470d9e504f2b1a8319cba7724ac0ce09d0f9a4faa7967b4a546d614a6b20ccfe67929799cd93e7c9ddda5011b40923e4dda817c33482ed53 WHIRLPOOL 1e81176b48f79ec44548478a4a5474103a774dae3cf471abdb4cc82c9186079837e7123a7992dd08ffe62783270702993ac46db9cb2c5a556b72c009a744010a
 DIST wmsun-1.05.tar.gz 20680 SHA256 c70429aa8c201f3135bcea1c6ab441d3441bda399d8766824b9e506e9c85db69 SHA512 baa610db04ba67ca09112765e28c0fa945a98a61b642925dbaaa56a5b3e7da7424d8dd15097dcec932e3b603219d1f8806c0e50c025370226a157791f16911da WHIRLPOOL 2002a90c39369fec6a5567e32c4445d50f9fc5b5b07b70a2de6bb7f720ea68480249587346a519316dc96925b794273d9662f72815d7ab04cc8e748e5bc3244c
diff --git a/x11-plugins/wmSun/files/wmSun-1.03-makefile.patch b/x11-plugins/wmSun/files/wmSun-1.03-makefile.patch
deleted file mode 100644
index c12f6771e4db..000000000000
--- a/x11-plugins/wmSun/files/wmSun-1.03-makefile.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- Makefile.orig	1999-01-06 03:28:39.000000000 +0100
-+++ Makefile	2008-01-28 14:58:36.000000000 +0100
-@@ -1,8 +1,9 @@
--CC     = gcc
--CFLAGS = -O2 -Wall
--INCDIR = -I/usr/X11R6/include/X11
--DESTDIR= /usr/X11R6
--LIBDIR = -L/usr/X11R6/lib
-+CC     ?= gcc
-+CFLAGS += -Wall
-+INCDIR = -I/usr/include/X11
-+PREFIX = /usr
-+LIBDIR ?= /usr/lib
-+MANDIR = $(PREFIX)/share/man
- 
- 
- 
-@@ -22,14 +23,14 @@
- 
- 
- .c.o:
--	$(CC) $(COPTS) -D$(shell echo `uname -s`) -c $< -o $*.o $(INCDIR)
-+	$(CC) $(CFLAGS) -D$(shell echo `uname -s`) -c $< -o $*.o $(INCDIR)
- 
- 
- all:	wmSun.o wmSun
- 
- wmSun.o: wmSun_master.xpm wmSun_mask.xbm 
- wmSun:	$(OBJS) 
--	$(CC) $(COPTS) $(SYSTEM) -lm -o wmSun $^ $(INCDIR) $(LIBDIR) $(LIBS)
-+	$(CC) $(CFLAGS) -o wmSun $^ $(INCDIR) -L$(LIBDIR) $(LDFLAGS) $(LIBS) -lm
- 
- clean:
- 	for i in $(OBJS) ; do \
-@@ -38,6 +39,8 @@
- 	rm -f wmSun
- 
- install:: wmSun
--	install -s -m 0755 wmSun $(DESTDIR)/bin
--	install    -m 0644 wmSun.1 $(DESTDIR)/man/man1 
-+	install -d $(DESTDIR)$(PREFIX)/bin
-+	install -m 0755 wmSun $(DESTDIR)$(PREFIX)/bin
-+	install -d $(DESTDIR)$(MANDIR)/man1
-+	install    -m 0644 wmSun.1 $(DESTDIR)$(MANDIR)/man1 
- 
diff --git a/x11-plugins/wmSun/wmSun-1.03-r1.ebuild b/x11-plugins/wmSun/wmSun-1.03-r1.ebuild
deleted file mode 100644
index f3fdc46d24bd..000000000000
--- a/x11-plugins/wmSun/wmSun-1.03-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="dockapp which displays the rise/set time of the sun"
-HOMEPAGE="http://dockapps.windowmaker.org/file.php/id/16"
-SRC_URI="http://dockapps.windowmaker.org/download.php/id/23/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ~mips ppc sparc x86"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXpm"
-DEPEND="${RDEPEND}
-	x11-proto/xproto
-	x11-proto/xextproto"
-
-S="${WORKDIR}/${P}/${PN}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-makefile.patch
-}
-
-src_compile() {
-	emake clean || die "make clean failed"
-	emake CC="$(tc-getCC)" LIBDIR="/usr/$(get_libdir)" || die "parallel make failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-	dodoc README ../{BUGS,TODO}
-}
diff --git a/x11-plugins/wmail/Manifest b/x11-plugins/wmail/Manifest
index 9df7f23a6474..0c20b13be6df 100644
--- a/x11-plugins/wmail/Manifest
+++ b/x11-plugins/wmail/Manifest
@@ -1 +1 @@
-DIST wmail-2.0.tar.gz 46468 SHA256 edcf77bf6a638b96dbd78efe4802d260a68385ab2deb6d6774e325ea0cd3d245 SHA512 62ca761619af006221ac64003246b8d7b0dacee65cd4dd6a5c31e6fc152f9f97646ceb7e757bd81333a792c73280479591dc24bb29f9da2023f2927ec2827039 WHIRLPOOL e10e5a06570de6eb725045ed2e72d07db39791433b0d454b6796cb452170add4aa9781eea3bc73fe53294d4e5f6e58dfcde019c830f154a9235dce16f1656c91
+DIST wmail-2.0.tar.gz 46468 BLAKE2B 316743065f72e14339e4c7d9bc1d394d0f5ccfa5772efd94856bef184fa3a60a1892c510f07655dacbf0b470492e085e413dcb29e3ec166c5d1a1f03d388636e SHA512 62ca761619af006221ac64003246b8d7b0dacee65cd4dd6a5c31e6fc152f9f97646ceb7e757bd81333a792c73280479591dc24bb29f9da2023f2927ec2827039
diff --git a/x11-plugins/wmail/wmail-2.0-r4.ebuild b/x11-plugins/wmail/wmail-2.0-r4.ebuild
index 05aa49412753..945197456b8a 100644
--- a/x11-plugins/wmail/wmail-2.0-r4.ebuild
+++ b/x11-plugins/wmail/wmail-2.0-r4.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 inherit eutils
 
 DESCRIPTION="Window Maker dock application showing incoming mail"
-HOMEPAGE="http://dockapps.windowmaker.org/file.php/id/70"
-SRC_URI="http://www.minet.uni-jena.de/~topical/sveng/wmail/${P}.tar.gz"
+HOMEPAGE="http://www.dockapps.net/wmail"
+SRC_URI="http://www.dockapps.net/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/x11-plugins/wmamixer/Manifest b/x11-plugins/wmamixer/Manifest
new file mode 100644
index 000000000000..3d115b6e420c
--- /dev/null
+++ b/x11-plugins/wmamixer/Manifest
@@ -0,0 +1 @@
+DIST wmamixer-0.2.tar.gz 93067 BLAKE2B 9e888b9b3214eee6c8e59da564e36e8f7c1e55df711ebeaaf73300b27b934840994177d003f2be14f40b5e30321c572e82888e030534ccc7cbe0ff12109231d4 SHA512 94f971ac59134f926b637c6c4ef80be1e082b9b81d2e744b921562140e610e958233645c0ee12310086f1aaa3bbb20622c6c92666dac51df3a963e725374583c
diff --git a/x11-plugins/wmamixer/metadata.xml b/x11-plugins/wmamixer/metadata.xml
new file mode 100644
index 000000000000..c8826bfc6573
--- /dev/null
+++ b/x11-plugins/wmamixer/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>voyageur@gentoo.org</email>
+	<name>Bernard Cafarelli</name>
+</maintainer>
+
+<longdescription>
+Wmamixer is a fork of wmsmixer and is an ALSA mixer dockapp for Window Maker.
+
+The code for the ALSA part was taken and adapted from amixer and alsamixer programs from alsa-utils package.
+</longdescription>
+</pkgmetadata>
diff --git a/x11-plugins/wmamixer/wmamixer-0.2.ebuild b/x11-plugins/wmamixer/wmamixer-0.2.ebuild
new file mode 100644
index 000000000000..a684fbdad792
--- /dev/null
+++ b/x11-plugins/wmamixer/wmamixer-0.2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit toolchain-funcs
+
+DESCRIPTION="ALSA mixer dockapp, fork of wmsmixer"
+HOMEPAGE="https://github.com/gryf/wmamixer"
+SRC_URI="https://github.com/gryf/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="x11-libs/libXpm
+	x11-libs/libXext
+	x11-libs/libX11"
+DEPEND="${RDEPEND}
+	x11-proto/xproto"
+
+DOCS=( README.rst )
+src_compile() {
+	$(tc-getCC) ${CFLAGS} -c -o wmamixer.o wmamixer.c
+	$(tc-getCC) ${LDFLAGS} -o wmamixer wmamixer.o -lm -lXpm -lXext -lX11 -lasound
+}
+
+src_install() {
+	dobin wmamixer
+	einstalldocs
+}
diff --git a/x11-plugins/wmblob/Manifest b/x11-plugins/wmblob/Manifest
index d215fc1bf27c..cdc2ee8d0de6 100644
--- a/x11-plugins/wmblob/Manifest
+++ b/x11-plugins/wmblob/Manifest
@@ -1 +1,2 @@
-DIST wmblob_1.0.3.orig.tar.gz 180039 SHA256 d26850fe15e444817ed9996663427bd933a74d4e5591008a5a7c39d21e2583b2 SHA512 0af749349928cb2a2dc0e51b7e299305e51ddfdf42b320d7462acf5e3d6c92674d6c54fdace6fc3a1c5256540887ae50da9b82218753d3f954f4c7d69a5703fc WHIRLPOOL 2c5391af1172fb7e453fd617d70853f50b8b5a5c6918cd6c4162174caad93ce0ee4357644a74d1a52984f54ac68641c088f483de41326622e3f9d09d4bd7f6be
+DIST wmblob-1.0.3.tar.bz2 160657 BLAKE2B e36f7b8c6dd38466da490bd85d03ff2f378caced8d5908b00422428223aaa1fc3754bfd35dcacb2f162b0d44c8c04b509cf5c00d678d687e5b90cad886ce98a6 SHA512 4d8c7e30218d9ec7dc965c69e69b0fb5839c468f695ec2cc9fd9bb0b8fbc89b1386122e11b75906169bb16d13dae16cd8287c5bcf8bd28ccbbad4d4f057b3414
+DIST wmblob-1.0.4.tar.bz2 179284 BLAKE2B 79025a4d80c05bd8f9d1a962762680e24ae0eb09c8bf961833f4f4c59b086ecc8563ef71c28678c969da75f1f074c691c9fd6a6919358886e64f7fcb814611a3 SHA512 d325711e6c6c865a97386793a7c3f0e0833044001ccc336f2a4e9974799e5ff00936b0d90a0dc4a3280ba27a8d1f97239ba51d61e6e5b104e7cf82c8aeed5ec1
diff --git a/x11-plugins/wmblob/wmblob-1.0.3.ebuild b/x11-plugins/wmblob/wmblob-1.0.3.ebuild
index fe7b4768397e..188ec7aa803f 100644
--- a/x11-plugins/wmblob/wmblob-1.0.3.ebuild
+++ b/x11-plugins/wmblob/wmblob-1.0.3.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 inherit autotools multilib
 
 DESCRIPTION="a fancy but useless dockapp with moving blobs"
-HOMEPAGE="http://freshmeat.net/projects/wmblob"
-SRC_URI="mirror://debian/pool/main/w/${PN}/${PN}_${PV}.orig.tar.gz"
+HOMEPAGE="https://github.com/bbidulock/wmblob"
+SRC_URI="https://github.com/bbidulock/wmblob/releases/download/${PV}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/x11-plugins/wmblob/wmblob-1.0.4.ebuild b/x11-plugins/wmblob/wmblob-1.0.4.ebuild
new file mode 100644
index 000000000000..a1a61a71f9fd
--- /dev/null
+++ b/x11-plugins/wmblob/wmblob-1.0.4.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools multilib
+
+DESCRIPTION="a fancy but useless dockapp with moving blobs"
+HOMEPAGE="https://github.com/bbidulock/wmblob"
+SRC_URI="https://github.com/bbidulock/wmblob/releases/download/${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+RDEPEND="x11-libs/gtk+:2
+	x11-libs/libX11
+	x11-libs/libXpm
+	x11-libs/libXext"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	x11-libs/libXt"
+
+DOCS="AUTHORS ChangeLog NEWS README doc/how_it_works"
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e "s:-O2:${CFLAGS}:g" \
+		-e "s:\$x_libraries:/usr/$(get_libdir):" \
+		configure.ac || die
+
+	eautoreconf
+}
diff --git a/x11-plugins/wmfire/Manifest b/x11-plugins/wmfire/Manifest
index d621bdae8aa2..340e11e0a071 100644
--- a/x11-plugins/wmfire/Manifest
+++ b/x11-plugins/wmfire/Manifest
@@ -1 +1 @@
-DIST wmfire-1.2.4.tar.gz 91144 SHA256 e38b508519faf132273a9eaf75db56f1b14a5912667dd6843fc902d4a0ca2f80 SHA512 391a76c5f7292751591becebdb6267c29270e24cf9faff7e748431ffa51e74806a7b407a6493f9d4cfdc7865e4d8e8b803567b0a54caddb9b42f82160938c82b WHIRLPOOL 0b2ea82d4af5408b8ec6c0724f766f86958ba5758306bdb17a940580cbbf699150874e8f15bcaeccc642d70ed825fe8aa6377479fdff62c2ffd75849746e589c
+DIST wmfire-1.2.4.tar.gz 91144 BLAKE2B b51595dfbafefb26cfb28c729683e01e8eee5683c0379bc831fd5c9172576c4375b3262da9a167ce157a67317e15d25179d6fba067c70d04ebe3e362fc3db315 SHA512 391a76c5f7292751591becebdb6267c29270e24cf9faff7e748431ffa51e74806a7b407a6493f9d4cfdc7865e4d8e8b803567b0a54caddb9b42f82160938c82b
diff --git a/x11-plugins/wmfire/wmfire-1.2.4-r2.ebuild b/x11-plugins/wmfire/wmfire-1.2.4-r2.ebuild
index b471cbf67420..94ff738a9e47 100644
--- a/x11-plugins/wmfire/wmfire-1.2.4-r2.ebuild
+++ b/x11-plugins/wmfire/wmfire-1.2.4-r2.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
 inherit autotools eutils
 
 DESCRIPTION="Load monitoring dockapp displaying dancing flame"
-HOMEPAGE="http://www.swanson.ukfsn.org/#wmfire"
-SRC_URI="http://www.swanson.ukfsn.org/${PN}/${P}.tar.gz"
+HOMEPAGE="http://www.improbability.net/#wmfire"
+SRC_URI="http://www.improbability.net/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/x11-plugins/wminet/Manifest b/x11-plugins/wminet/Manifest
index 5bd98def67d1..ef81a698d880 100644
--- a/x11-plugins/wminet/Manifest
+++ b/x11-plugins/wminet/Manifest
@@ -1 +1 @@
-DIST wminet-3.0.0.tar.gz 47576 SHA256 013e0e290d790da577da5439b07a691eadf421b87a21b5f9f61e1e80b9783461 SHA512 594d4a2019e424b27e717d3ffd64071f7888b40bf9b31332a877e71d85c0eb89f65490268276def30f530f187f3796a14c5e412af8cb461311e3f1e0a6478e51 WHIRLPOOL fb79e6613f59686e35426bedbde3426dca39a2c4ef7700e508f499a9dd6a29b6f32fd631abd29796ad9064cec3d7d53406c43040c0d63de7e74e154f6573bcb5
+DIST wminet-3.0.0.tar.gz 47576 BLAKE2B 318a180998f815e4ac274b98fdc14914f2d69eac1a5bf6c4382b0f8b01594d56dece8f168a069fd45cb6be373f1c3507aa0a0e5fd27ab571ee21912d0c02e5e6 SHA512 594d4a2019e424b27e717d3ffd64071f7888b40bf9b31332a877e71d85c0eb89f65490268276def30f530f187f3796a14c5e412af8cb461311e3f1e0a6478e51
diff --git a/x11-plugins/wminet/wminet-3.0.0-r1.ebuild b/x11-plugins/wminet/wminet-3.0.0-r1.ebuild
index 7d01177f2512..aa8802b5c5b7 100644
--- a/x11-plugins/wminet/wminet-3.0.0-r1.ebuild
+++ b/x11-plugins/wminet/wminet-3.0.0-r1.ebuild
@@ -5,8 +5,8 @@ EAPI=5
 inherit eutils toolchain-funcs
 
 DESCRIPTION="dockapp for monitoring internet connections to and from your computer"
-HOMEPAGE="http://www.swanson.ukfsn.org/#wminet"
-SRC_URI="http://www.swanson.ukfsn.org/wmdock/${P}.tar.gz"
+HOMEPAGE="http://www.improbability.net/#wminet"
+SRC_URI="http://www.improbability.net/wmdock//${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/x11-plugins/wminet/wminet-3.0.0.ebuild b/x11-plugins/wminet/wminet-3.0.0.ebuild
deleted file mode 100644
index a2200cb360fa..000000000000
--- a/x11-plugins/wminet/wminet-3.0.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit toolchain-funcs
-
-DESCRIPTION="dockapp for monitoring internet connections to and from your computer"
-HOMEPAGE="http://www.swanson.ukfsn.org/#wminet"
-SRC_URI="http://www.swanson.ukfsn.org/wmdock/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXpm"
-DEPEND="${RDEPEND}
-	x11-proto/xextproto"
-
-src_compile() {
-	tc-export CC
-	econf
-	emake LDFLAGS="${LDFLAGS}" || die "emake failed."
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
-	dodoc AUTHORS ChangeLog NEWS README wminetrc
-}
diff --git a/x11-plugins/wmmp3/Manifest b/x11-plugins/wmmp3/Manifest
index 12ca2067d3a2..534f34750df8 100644
--- a/x11-plugins/wmmp3/Manifest
+++ b/x11-plugins/wmmp3/Manifest
@@ -1 +1 @@
-DIST wmmp3-0.12.tar.gz 43977 SHA256 babbb158f83befd0e8eab9d794c8353ea536a477cb8b3e500be389cf658941c3 SHA512 6cc06f109d6ab6c69ed3b8175010a2f38053138291f02e59780fc7394c35cc629ddd6b982bd5069e20a3cb81d81b3d08b9e10d1f7984f783f22c9b012c933740 WHIRLPOOL c8199106c502c5c2bea9f5e2c981bd96720bce607d3714c8a91b289d1c708b76a4315338c6cbec0a8340bdca3d1e9ebb1b2d3214a90e58140864eca1aa155a31
+DIST wmmp3-0.12.tar.gz 43977 BLAKE2B bde74194020e65dfea27e94f5a4e937e0811da12c3af28b8d7902c3d08adc27499cd5414ee4826e6f5b25709bf784e6b27d1df07e8079953ec2a602b332b17bf SHA512 6cc06f109d6ab6c69ed3b8175010a2f38053138291f02e59780fc7394c35cc629ddd6b982bd5069e20a3cb81d81b3d08b9e10d1f7984f783f22c9b012c933740
diff --git a/x11-plugins/wmmp3/wmmp3-0.12.ebuild b/x11-plugins/wmmp3/wmmp3-0.12.ebuild
index 7afeb68a8f38..9fba02a88ff8 100644
--- a/x11-plugins/wmmp3/wmmp3-0.12.ebuild
+++ b/x11-plugins/wmmp3/wmmp3-0.12.ebuild
@@ -1,17 +1,16 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 inherit eutils
 
-IUSE=""
-
 DESCRIPTION="Mp3 player dock app for WindowMaker; frontend to mpg123"
-HOMEPAGE="http://dockapps.windowmaker.org/file.php/id/60"
-SRC_URI="http://dockapps.windowmaker.org/download.php/id/91/${P}.tar.gz"
+HOMEPAGE="http://www.dockapps.net/wmmp3"
+SRC_URI="http://www.dockapps.net/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ppc sparc x86"
+IUSE=""
 
 RDEPEND="x11-libs/libX11
 	x11-libs/libXext
diff --git a/x11-plugins/wmmsg/wmmsg-1.0.1-r1.ebuild b/x11-plugins/wmmsg/wmmsg-1.0.1-r1.ebuild
deleted file mode 100644
index ad4fa1fe3800..000000000000
--- a/x11-plugins/wmmsg/wmmsg-1.0.1-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils
-
-DESCRIPTION="universal visual notification dockapp"
-HOMEPAGE="http://swapspace.net/~matt/wmmsg"
-SRC_URI="http://swapspace.net/~matt/wmmsg/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc x86"
-IUSE=""
-
-RDEPEND="x11-libs/gtk+:2
-	media-libs/imlib2
-	x11-libs/libXpm
-	x11-libs/libXext
-	x11-libs/libX11"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	x11-libs/libXt"
-
-DOCS="AUTHORS ChangeLog README wmmsgrc"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-use_gtk2.patch \
-		"${FILESDIR}"/${P}-alt-desktop.patch \
-		"${FILESDIR}"/${P}-list.patch
-
-	eautoreconf
-}
diff --git a/x11-plugins/wmmsg/wmmsg-1.0.1.ebuild b/x11-plugins/wmmsg/wmmsg-1.0.1.ebuild
deleted file mode 100644
index 7d2b2096b4df..000000000000
--- a/x11-plugins/wmmsg/wmmsg-1.0.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils
-
-DESCRIPTION="universal visual notification dockapp"
-HOMEPAGE="http://swapspace.net/~matt/wmmsg"
-SRC_URI="http://swapspace.net/~matt/wmmsg/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ~sparc x86"
-IUSE=""
-
-RDEPEND="x11-libs/gtk+:2
-	media-libs/imlib2
-	x11-libs/libXpm
-	x11-libs/libXext
-	x11-libs/libX11"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	x11-libs/libXt"
-
-DOCS="AUTHORS ChangeLog README wmmsgrc"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-use_gtk2.patch
-
-	eautoreconf
-}
diff --git a/x11-plugins/wmnet/Manifest b/x11-plugins/wmnet/Manifest
index 81760cd01e53..45219471f65f 100644
--- a/x11-plugins/wmnet/Manifest
+++ b/x11-plugins/wmnet/Manifest
@@ -1,2 +1,2 @@
-DIST wmnet-1.06-misc.patch.bz2 11327 SHA256 d1faab4600efa1d6a6973dfc05d451fb0fabf417a58f32bc1d4f21a0d7d7cbc9 SHA512 34d08676cfa9415c1cc182b148364143589b13c6b060c55b4047fa417146b1939b84fa5e32fc86da92cd92c10a5f5f0abb602c9ba943ed077bc6529c0dbf0ea3 WHIRLPOOL 84fa13179e317f1c491c5bf18a4a3ca0ed3944ce90c566c13ba4a9abb1f79b4537a9f7c30f404711c92b4f74fd0f403f723657fe9c2259d4c2194f11ec973cac
-DIST wmnet-1.06.tar.gz 27506 SHA256 79c6ef93126d2a4928818391c0aa20638d47cd9dca12d999e774591f9b2d365d SHA512 1e62db5e7e3b843d47459fcfa9cc932ba3df8f8498d1b24dcb77602a334d528b90e9c93886b8b330ac7bd5baa4ad1cd3bc94e96c14a841fba8bb9172f624e10a WHIRLPOOL 068ac75bead3de56a33913b63c270bbe4ae7483601e769c8bba13c4c0dbf204cbc992c579395def4cf01ff0acf5f8067238a9cedeca49d9080758e7a6b3f6cdf
+DIST wmnet-1.06-misc.patch.bz2 11327 BLAKE2B c03f25270c37e9a54731547a51c00983df802b5f4278d02b7051571de45bd326bb5eda330bbba8e09be6bcb4b3afca111956d6506e73c13f955afd40b9c967ea SHA512 34d08676cfa9415c1cc182b148364143589b13c6b060c55b4047fa417146b1939b84fa5e32fc86da92cd92c10a5f5f0abb602c9ba943ed077bc6529c0dbf0ea3
+DIST wmnet-1.06.tar.gz 27506 BLAKE2B 9cd5cb626406238e5dc20ff58f26b13389c5b8bff9569e3cc8fc4f083422d213702fc387521bffc003339ef4e0c6223f5cfcec8617ba3e71b516786c6950cdf8 SHA512 1e62db5e7e3b843d47459fcfa9cc932ba3df8f8498d1b24dcb77602a334d528b90e9c93886b8b330ac7bd5baa4ad1cd3bc94e96c14a841fba8bb9172f624e10a
diff --git a/x11-plugins/wmnet/wmnet-1.06-r1.ebuild b/x11-plugins/wmnet/wmnet-1.06-r1.ebuild
index eb5be2cb6e0a..4e523d9525db 100644
--- a/x11-plugins/wmnet/wmnet-1.06-r1.ebuild
+++ b/x11-plugins/wmnet/wmnet-1.06-r1.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 inherit eutils
 
 IUSE=""
 DESCRIPTION="WMnet is a dock.app network monitor"
-SRC_URI="http://www.digitalkaos.net/linux/wmnet/download/${P}.tar.gz
+SRC_URI="http://www.dockapps.net/download/${P}.tar.gz
 	mirror://gentoo/${P}-misc.patch.bz2"
-HOMEPAGE="http://www.digitalkaos.net/linux/wmnet/"
+HOMEPAGE="http://www.dockapps.net/wmnet"
 
 RDEPEND="x11-libs/libX11
 	x11-libs/libXext"
diff --git a/x11-plugins/wmnetload/Manifest b/x11-plugins/wmnetload/Manifest
index f91e5f57549d..4a996ab437d5 100644
--- a/x11-plugins/wmnetload/Manifest
+++ b/x11-plugins/wmnetload/Manifest
@@ -1 +1 @@
-DIST wmnetload-1.3.tar.gz 105588 SHA256 c2dcfb5075dd56fbdba9e92abc7854bd01c2652fc914490f9f7df07625275e64 SHA512 67f28100fefea54a21f82be3acde9a457779b2dd1eb1c2f0c074c0a956a8f7b43a6c7ed39b97f8bdd1f51adfc1c21d197c1a7dfd84d8aeb562e46d58fd06b3f7 WHIRLPOOL 185a55e2fae71791a22da969ec25baebde7e4981d05ab2091e168e4977980c4ee98a8161da3035b5c66c09d1aad057e89e4a37269fe5f601d8cad675f7dbf309
+DIST wmnetload-1.3.tar.gz 105588 BLAKE2B 21c56ef3d6b9e13f9e7d7a1eeb4ad79693134a74d7b864a45f76e174a8f8fef46efc0444bce9a5422d698b8b966768914fe6fb9fb4eda29c8e0dd6f6892daf40 SHA512 67f28100fefea54a21f82be3acde9a457779b2dd1eb1c2f0c074c0a956a8f7b43a6c7ed39b97f8bdd1f51adfc1c21d197c1a7dfd84d8aeb562e46d58fd06b3f7
diff --git a/x11-plugins/wmnetload/wmnetload-1.3-r4.ebuild b/x11-plugins/wmnetload/wmnetload-1.3-r4.ebuild
index cf1f2d1bbaae..5f77eb525054 100644
--- a/x11-plugins/wmnetload/wmnetload-1.3-r4.ebuild
+++ b/x11-plugins/wmnetload/wmnetload-1.3-r4.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 inherit autotools eutils
 
 DESCRIPTION="Network interface monitor dockapp"
-HOMEPAGE="http://freshmeat.net/projects/wmnetload/"
-SRC_URI="ftp://truffula.com/pub/${P}.tar.gz"
+HOMEPAGE="https://github.com/bbidulock/wmnetload"
+SRC_URI="https://github.com/bbidulock/wmnetload/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/x11-plugins/wmpinboard/Manifest b/x11-plugins/wmpinboard/Manifest
index 48183ceed214..60ade195d2c7 100644
--- a/x11-plugins/wmpinboard/Manifest
+++ b/x11-plugins/wmpinboard/Manifest
@@ -1 +1,2 @@
-DIST wmpinboard-1.0.tar.gz 133290 SHA256 a0268bf1c6c0c9c7ac4167031970e17a298f0ab5a85bf6ef166ae454f205137c SHA512 486509e50e58c14866932a89706d98ebc4391af608acd95670b190eebe9069d254e11834e291ee2bc3c9e3e77e75ece7ab3f73dc7f097dfba5ca25fc888773fd WHIRLPOOL ce61f41de1aee421f3c41782773865e8b6da9b5d078ba19d6fc36761c95c9951e03ef289b684d77b09327c4b2d9b9f645cf0e98b408f7860f5052432002ff8ff
+DIST wmpinboard-1.0.1.tar.gz 195782 BLAKE2B f88368b61645c91958d81161e9f5e8523d09b7ef825476afebb2b4318c8cf04f11319b3eaf9b152fe97a4dea2dac6147e9b70eb70cd9cddbc1f45960df6529e5 SHA512 5728aa8a040ba81a814a0851f5bed2d5fbf933b400bdafd2b92deef8eb35d62a050293bdb98d71c6a8db058223e5ae64de932dcf971fd244aea8f48f8832aa36
+DIST wmpinboard-1.0.tar.gz 133290 BLAKE2B 06ed6c09d12556adf8af9a69c86ae6e60450cc6dfd3e9d0b45bf8650c057fdf54434280b36822965d5f0c0586956a84098285aa0a976090a83fd9077ada481a0 SHA512 486509e50e58c14866932a89706d98ebc4391af608acd95670b190eebe9069d254e11834e291ee2bc3c9e3e77e75ece7ab3f73dc7f097dfba5ca25fc888773fd
diff --git a/x11-plugins/wmpinboard/wmpinboard-1.0.1.ebuild b/x11-plugins/wmpinboard/wmpinboard-1.0.1.ebuild
new file mode 100644
index 000000000000..884ccdd4b4cc
--- /dev/null
+++ b/x11-plugins/wmpinboard/wmpinboard-1.0.1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Window Maker dock applet resembling a miniature pinboard"
+HOMEPAGE="https://github.com/bbidulock/wmpinboard"
+SRC_URI="https://github.com/bbidulock/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXpm"
+DEPEND="${RDEPEND}
+	x11-proto/xproto"
diff --git a/x11-plugins/wmpinboard/wmpinboard-1.0.ebuild b/x11-plugins/wmpinboard/wmpinboard-1.0.ebuild
index c61c4996c8b4..1a8d9d0105c0 100644
--- a/x11-plugins/wmpinboard/wmpinboard-1.0.ebuild
+++ b/x11-plugins/wmpinboard/wmpinboard-1.0.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 inherit eutils
 
 IUSE=""
 DESCRIPTION="Window Maker dock applet resembling a miniature pinboard"
-SRC_URI="http://dockapps.windowmaker.org/download.php/id/131/${P}.tar.gz"
-HOMEPAGE="http://dockapps.windowmaker.org/file.php/id/93"
+SRC_URI="https://github.com/bbidulock/${PN}/releases/download/${PV}/${P}.tar.gz"
+HOMEPAGE="https://github.com/bbidulock/wmpinboard"
 
 RDEPEND="x11-libs/libX11
 	x11-libs/libXext
diff --git a/x11-plugins/wmsmixer/Manifest b/x11-plugins/wmsmixer/Manifest
index 80e7b495a366..b4fa7c3b7ad8 100644
--- a/x11-plugins/wmsmixer/Manifest
+++ b/x11-plugins/wmsmixer/Manifest
@@ -1 +1 @@
-DIST wmsmixer-0.5.1.tar.gz 33350 SHA256 eee60a40ba92e4c2c9a038c6e51cd3bd62b24b38a096d091dc60dfd26f0c5daa SHA512 2731645addb9888b30cbfcaa1f9609c036855d3ee864628535fc5a0dd4c005d01b111bac3dd7f9d11f4794f55f22be65564ccafe598f098b13abdfa9277da299 WHIRLPOOL 0cf89b38c4473fa8e162cc52021f5e50c1a9da80e6c6146a271f10f2b82049cc1da33e3850b36ca47e020c80af7d8393baaf3bdeaf3070b02361340e475ea949
+DIST wmsmixer-0.5.1.tar.gz 33350 BLAKE2B 9f80e0680834b0c8537baececa1a80708ef249db3b58cd77d8d5ab2d13a96959d55f016b38bc5975f8c3decf7569a3a356e5c09cb27c2b5a662dc2fe00766962 SHA512 2731645addb9888b30cbfcaa1f9609c036855d3ee864628535fc5a0dd4c005d01b111bac3dd7f9d11f4794f55f22be65564ccafe598f098b13abdfa9277da299
diff --git a/x11-plugins/wmsmixer/wmsmixer-0.5.1.ebuild b/x11-plugins/wmsmixer/wmsmixer-0.5.1.ebuild
index 167672d34733..1313463d65a6 100644
--- a/x11-plugins/wmsmixer/wmsmixer-0.5.1.ebuild
+++ b/x11-plugins/wmsmixer/wmsmixer-0.5.1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 inherit eutils
 IUSE=""
 DESCRIPTION="fork of wmmixer adding scrollwheel support and other features"
-HOMEPAGE="http://dockapps.windowmaker.org/file.php/id/63"
-SRC_URI="http://dockapps.windowmaker.org/download.php/id/268/${P}.tar.gz"
+HOMEPAGE="http://www.dockapps.net/wmsmixer"
+SRC_URI="http://www.dockapps.net/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/x11-plugins/wmswallow/Manifest b/x11-plugins/wmswallow/Manifest
index 052711d1b902..ed945a89292c 100644
--- a/x11-plugins/wmswallow/Manifest
+++ b/x11-plugins/wmswallow/Manifest
@@ -1 +1 @@
-DIST wmswallow.tar.Z 28567 SHA256 7d7a3dc64b89eeb388bb2f66815fc94cb551d0899f0e41d204f367109a2cda02 SHA512 24ef61a4084bda49afd6a7168600d99c60fe85daab6d16733fd208a905966433ca3d031a1d991676f3e73cb8a3a552c49fe69cfb4e1271e7c9a09d9247c21cdc WHIRLPOOL 1d6d6e19075b9a8daba03f99ef04357fc48bdb71e2373386f29a2636611ae20b56398b1871c8b163d069fbb4ee07c98cf1b27fd6bd5178a7756a011cd4d44be8
+DIST wmswallow.tar.Z 28567 BLAKE2B 3fb5c39fd07c4cce329f0b60abea72d0c42203bedd36f55994bc16f36412843aef81bc985a6acb9cea0b279f900f84ffc99bc088b5343e2997f6d3951bca4bba SHA512 24ef61a4084bda49afd6a7168600d99c60fe85daab6d16733fd208a905966433ca3d031a1d991676f3e73cb8a3a552c49fe69cfb4e1271e7c9a09d9247c21cdc
diff --git a/x11-plugins/wmswallow/wmswallow-0.6.1-r1.ebuild b/x11-plugins/wmswallow/wmswallow-0.6.1-r1.ebuild
index cb3f20011291..8652e66d653c 100644
--- a/x11-plugins/wmswallow/wmswallow-0.6.1-r1.ebuild
+++ b/x11-plugins/wmswallow/wmswallow-0.6.1-r1.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 inherit eutils toolchain-funcs
 
 DESCRIPTION="A dock applet to make any application dockable"
-HOMEPAGE="http://burse.uni-hamburg.de/~friedel/software/wmswallow.html"
-SRC_URI="http://burse.uni-hamburg.de/~friedel/software/wmswallow/${PN}.tar.Z"
+HOMEPAGE="http://www.dockapps.net/wmswallow"
+SRC_URI="http://www.dockapps.net/downloaduuu/${PN}.tar.Z"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/x11-plugins/wmsystray/Manifest b/x11-plugins/wmsystray/Manifest
index 971919b5668e..1636d7454591 100644
--- a/x11-plugins/wmsystray/Manifest
+++ b/x11-plugins/wmsystray/Manifest
@@ -1 +1 @@
-DIST wmsystray-0.1.1.tar.bz2 18261 SHA256 d24a9cb25f4394eecb6e9215b88dde0d9debf203fbf1e501fb02e3e0571c37f7 SHA512 a28d8cb6a3e74909a1467459f81a853dae2d74c28db166be15f398f00bc8066fbb1caa0e982fb3874279a7edd376ab892499e8981d2c2126eed591ef52f8d604 WHIRLPOOL 4b6032663f5cd4c236bce79cd77626a1e15cd057c96c27080587ae4f6cc506b8c10082e13a215bba0d673373d45d1f07f445802218aa7df2920469f2505fdeff
+DIST wmsystray-0.1.1.tar.bz2 18261 BLAKE2B d232dcfd3077760d7990ec8e22249aafa9dacf415e71b6a662a1a32464e233cd5460f9b99d6e1c478ce69c6ad0e9973febfce2292992d5619792d4bf4dcc1d7c SHA512 a28d8cb6a3e74909a1467459f81a853dae2d74c28db166be15f398f00bc8066fbb1caa0e982fb3874279a7edd376ab892499e8981d2c2126eed591ef52f8d604
diff --git a/x11-plugins/wmsystray/wmsystray-0.1.1.ebuild b/x11-plugins/wmsystray/wmsystray-0.1.1.ebuild
index bb4e1db54854..cad9da31487e 100644
--- a/x11-plugins/wmsystray/wmsystray-0.1.1.ebuild
+++ b/x11-plugins/wmsystray/wmsystray-0.1.1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 inherit eutils
 
 DESCRIPTION="Window Maker dock app that provides a system tray for GNOME/KDE applications"
-SRC_URI="http://kai.vm.bytemark.co.uk/~arashi/wmsystray/release/${P}.tar.bz2"
-HOMEPAGE="http://kai.vm.bytemark.co.uk/~arashi/wmsystray/"
+HOMEPAGE="https://github.com/bbidulock/wmsystray"
+SRC_URI="https://github.com/bbidulock/wmsystray/releases/download/${PV}/${P}.tar.bz2"
 
 RDEPEND="x11-libs/libX11
 	x11-libs/libXpm"
diff --git a/x11-plugins/wmtime/Manifest b/x11-plugins/wmtime/Manifest
index 47be37e79a75..60b51126ae32 100644
--- a/x11-plugins/wmtime/Manifest
+++ b/x11-plugins/wmtime/Manifest
@@ -1,4 +1 @@
-DIST wmtime-1.2.tar.gz 23219 SHA256 ff39675d2c51e1d0774bdc181f27966fcf8f063bb0a4c8cfda9c83d9978a0b1a SHA512 d81be07012a9efd93a51219d6b63a76d88c8916af0b3ed990c3005621f643c70fadc31ebc8fef11c1605f303bc3e036c2014809c5368f4acaff8b7a1c1665c15 WHIRLPOOL 18067140573474c6b5ad3d01c00b353b55e6caee05cf474e0daf9483b9cab58df4d6dfcecbca53cc6015417f122f8ae920277359de682c7b9943ed09e8368b55
 DIST wmtime-1.4.tar.gz 19200 SHA256 6a112a2c7e22002b2c9d69479b95d4bae0ea29b310da71e612f540300c6def04 SHA512 46e35ffe41aaa55a651fa2a4002ab83fd45f901dc12ce1e0ed981666b9b620aa11666920f595fc3a782c54cc036491e0c676fb760a38cd6f6b24e264723b87fb WHIRLPOOL a8a300e5110ca0ae24d725c0c40d0b893047d5d450ba2d861898c7a47063efc9756fe2f32c7e5850d56f81653b07806a3ce6bf223d7dd01c8cc681eff06081ee
-DIST wmtime_1.0b2-9.diff.gz 8234 SHA256 189512286950bd5f8ab41d41c3ccbeee8811be95519ef9b03b12aeadded8312d SHA512 1ee089138bd4b94affbab8e089d5c59ab49d712be5f44132c69d0da44ae36ace879b51fe7c52174d0f60c7acdd2913ffeadcada55bbd166a0c7e74714711d76b WHIRLPOOL 57c49476424db9b9f0cb1d0c1faed54ead7540a42f52d7568208cd879ddfaa53812b6aac4e7ccdb0d356e88542cde16fa7be3f159e2ce7932d48c3dba1d060d7
-DIST wmtime_1.0b2.orig.tar.gz 20483 SHA256 a526b95a16b8451ee9a05b57d97251e3d9efd5e7b7143d3592767b87a3941375 SHA512 944f3238379dce8de8a0b91e642e7f9ae3e9866fdcbb99a0c73b9ee91c072ab9b89526814c8441e873b77c83557c3cd06cc7156ac8b31ab5098caf97657f2cff WHIRLPOOL 15979baae28ede82a696a8f51cb4318f675dae0533048cede7398632ca34b7138e6fe3a7e227ef30c7992e305a4bc5aeb8fc6c508986a39698004929aca78bbd
diff --git a/x11-plugins/wmtime/wmtime-1.0_beta2_p9.ebuild b/x11-plugins/wmtime/wmtime-1.0_beta2_p9.ebuild
deleted file mode 100644
index 3a15f2b62dc6..000000000000
--- a/x11-plugins/wmtime/wmtime-1.0_beta2_p9.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit eutils versionator
-
-MY_PV="$(get_version_component_range 1-2)"
-MY_PL="$(get_version_component_range 3)"
-MY_PL="${MY_PL/beta/b}"
-MY_PV="${MY_PV}${MY_PL}"
-MY_PL="$(get_version_component_range 4)"
-MY_PL="${MY_PL/p/}"
-
-IUSE=""
-
-DESCRIPTION="applet which displays the date and time in a dockable tile"
-SRC_URI="http://ftp.debian.org/debian/pool/main/w/wmtime/wmtime_${MY_PV}.orig.tar.gz
-	http://ftp.debian.org/debian/pool/main/w/wmtime/wmtime_${MY_PV}-${MY_PL}.diff.gz"
-HOMEPAGE="https://packages.qa.debian.org/w/wmtime.html"
-
-SLOT="0"
-KEYWORDS="~amd64 x86"
-LICENSE="GPL-2"
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXau
-	x11-libs/libXdmcp
-	x11-libs/libXpm"
-DEPEND="${RDEPEND}
-	x11-proto/xproto
-	x11-proto/xextproto
-	>=sys-apps/sed-4"
-
-S="${WORKDIR}/${PN}-${MY_PV}.orig/${PN}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${WORKDIR}"
-
-	# apply debian patch
-	epatch "${PN}_${MY_PV}-${MY_PL}.diff"
-
-	# honour Gentoo LDFLAGS, bug #335799
-	sed -i "s/-o wmtime/\$(LDFLAGS) -o wmtime/" "${S}/Makefile"
-}
-
-src_compile() {
-	emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" || die "emake failed"
-}
-
-src_install () {
-	dobin wmtime
-	doman wmtime.1
-
-	cd ..
-	dodoc BUGS CHANGES HINTS README TODO
-
-	# install sample config file, too
-	dodoc debian/wmtimerc
-}
diff --git a/x11-plugins/wmtime/wmtime-1.2.ebuild b/x11-plugins/wmtime/wmtime-1.2.ebuild
deleted file mode 100644
index eae82c6c4ccc..000000000000
--- a/x11-plugins/wmtime/wmtime-1.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit toolchain-funcs
-
-DESCRIPTION="applet which displays the date and time in a dockable tile"
-HOMEPAGE="http://www.dockapps.net/wmtime"
-SRC_URI="https://dev.gentoo.org/~voyageur/distfiles/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXau
-	x11-libs/libXdmcp
-	x11-libs/libXpm"
-DEPEND="${RDEPEND}
-	x11-proto/xproto"
-
-S=${WORKDIR}/dockapps
-
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
-}
-
-src_install () {
-	emake DESTDIR="${D}" PREFIX=/usr install
-
-	dodoc BUGS CHANGES HINTS README TODO
-}
diff --git a/x11-plugins/wmtimer/Manifest b/x11-plugins/wmtimer/Manifest
index 08ed13620854..2218df1c7ec6 100644
--- a/x11-plugins/wmtimer/Manifest
+++ b/x11-plugins/wmtimer/Manifest
@@ -1 +1 @@
-DIST wmtimer-2.92.tar.gz 22091 SHA256 3726c0e0a0a95ce7c4c9dd8088b3f050d5268f70fef9341452f5449cef8c0cd4 SHA512 d00e2eff92c89b1a848d2319f62b2f060f4ced1299440aa20ca4288b5bdd16f7cff625907f6587514a1618fec74e5be34fb6c923cec51a663cd9efc86c6f0a07 WHIRLPOOL 203bd12691f1a6f9cda7966f6828adac653ae59f3c5878dbd9de15026e64d8a8025063d3bac4c8d35c5a45c2b77d52fcdafbe0f570cdf41f29c1bff8127bd582
+DIST wmtimer-2.92.tar.gz 22091 BLAKE2B 7e8f598708a70168233aa4545fc9978fab9ea6891a02f618f1bdafa08bbc3ed077183c19f467c70637b07fa501f40bd2409bdb3e60034888296895b9ff3f35f1 SHA512 d00e2eff92c89b1a848d2319f62b2f060f4ced1299440aa20ca4288b5bdd16f7cff625907f6587514a1618fec74e5be34fb6c923cec51a663cd9efc86c6f0a07
diff --git a/x11-plugins/wmtimer/files/wmtimer-counter-fix.patch b/x11-plugins/wmtimer/files/wmtimer-counter-fix.patch
deleted file mode 100644
index 62f2a5a82795..000000000000
--- a/x11-plugins/wmtimer/files/wmtimer-counter-fix.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- wmtimer.c.orig	2004-01-29 02:45:48.000000000 +0000
-+++ wmtimer.c	2008-10-17 20:49:05.000000000 +0100
-@@ -128,7 +128,8 @@
-     switch (mode)
-     {
-       case TIMER:
--	if (prevSec < thisTime->tm_sec) 
-+	if (   (prevSec < thisTime->tm_sec) 
-+        || ((prevSec == 59) && (thisTime->tm_sec == 0)))
- 	{
- 	  decrementTimer();
- 	  updateACT();
-@@ -138,7 +139,8 @@
- 	prevSec = thisTime->tm_sec;
- 	break;
-       case CHRONO:
--	if (prevSec < thisTime->tm_sec)
-+	if (   (prevSec < thisTime->tm_sec)
-+        || ((prevSec == 59) && (thisTime->tm_sec == 0)))
- 	{
- 	  incrementTimer();
- 	  updateACT();
diff --git a/x11-plugins/wmtimer/wmtimer-2.92-r2.ebuild b/x11-plugins/wmtimer/wmtimer-2.92-r2.ebuild
index 81c87ccf1d1f..361f2745af0f 100644
--- a/x11-plugins/wmtimer/wmtimer-2.92-r2.ebuild
+++ b/x11-plugins/wmtimer/wmtimer-2.92-r2.ebuild
@@ -2,12 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-
 inherit multilib toolchain-funcs
 
 DESCRIPTION="Dockable clock which can run in alarm, countdown timer or chronograph mode"
 HOMEPAGE="https://github.com/bbidulock/wmtimer"
-SRC_URI="https://github.com/bbidulock/wmtimer/releases/download/v${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/bbidulock/wmtimer/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/x11-plugins/wmtop/wmtop-0.85.ebuild b/x11-plugins/wmtop/wmtop-0.85.ebuild
index 5242a13685cc..a9860141ef5d 100644
--- a/x11-plugins/wmtop/wmtop-0.85.ebuild
+++ b/x11-plugins/wmtop/wmtop-0.85.ebuild
@@ -20,6 +20,9 @@ RDEPEND=">=x11-libs/libdockapp-0.7:=
 DEPEND="${RDEPEND}
 	x11-proto/xproto"
 
+# Incorrect path in this tarball version
+S=${WORKDIR}/dockapps-be3f170
+
 src_prepare() {
 	eapply_user
 
diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz
index ed392dafd481..08eee5e2d448 100644
Binary files a/x11-terms/Manifest.gz and b/x11-terms/Manifest.gz differ
diff --git a/x11-terms/terminator/metadata.xml b/x11-terms/terminator/metadata.xml
index e41086ce9c48..c129c91cdf5c 100644
--- a/x11-terms/terminator/metadata.xml
+++ b/x11-terms/terminator/metadata.xml
@@ -1,17 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <longdescription>
-	Much of the behaviour of Terminator is based on GNOME Terminal, and 
-	we are adding more features from that as time goes by, but we also 
-	want to extend out in different directions with useful features for 
-	sysadmins and other users. If you have any suggestions, please file 
-	wishlist bugs! (see below for the address)
-</longdescription>
-  <use>
-    <flag name="libnotify">Enables desktop notifications via<pkg>dev-python/notify-python</pkg></flag>
-  </use>
-  <upstream>
-    <remote-id type="launchpad">terminator</remote-id>
-  </upstream>
+	<!-- maintainer-needed -->
+	<longdescription>
+		Much of the behaviour of Terminator is based on GNOME Terminal, and
+		we are adding more features from that as time goes by, but we also
+		want to extend out in different directions with useful features for
+		sysadmins and other users. If you have any suggestions, please file
+		wishlist bugs! (see below for the address)
+	</longdescription>
+	<use>
+		<flag name="libnotify">Enables desktop notifications via<pkg>dev-python/notify-python</pkg></flag>
+	</use>
+	<upstream>
+		<remote-id type="launchpad">terminator</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/x11-themes/Manifest.gz b/x11-themes/Manifest.gz
index ffcbbf298c34..1f7694fccdab 100644
Binary files a/x11-themes/Manifest.gz and b/x11-themes/Manifest.gz differ
diff --git a/x11-themes/commonbox-styles-extra/metadata.xml b/x11-themes/commonbox-styles-extra/metadata.xml
index 34fa44f89fb1..6f1575e7c376 100644
--- a/x11-themes/commonbox-styles-extra/metadata.xml
+++ b/x11-themes/commonbox-styles-extra/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>pchrist@gentoo.org</email>
-	<name>Panagiotis Christopoulos</name>
-</maintainer>
-  <longdescription>
-  A selection of even more styles for *box window managers.
-  </longdescription>
+	<maintainer type="person">
+		<email>pchrist@gentoo.org</email>
+		<name>Panagiotis Christopoulos</name>
+	</maintainer>
+	<longdescription>
+		A selection of even more styles for *box window managers.
+	</longdescription>
 </pkgmetadata>
diff --git a/x11-themes/commonbox-styles/metadata.xml b/x11-themes/commonbox-styles/metadata.xml
index 9354a1f6c217..0f9619d05de0 100644
--- a/x11-themes/commonbox-styles/metadata.xml
+++ b/x11-themes/commonbox-styles/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>pchrist@gentoo.org</email>
-	<name>Panagiotis Christopoulos</name>
-</maintainer>
-  <longdescription>
-  A selection of styles for *box window managers.
-  </longdescription> 
+	<maintainer type="person">
+		<email>pchrist@gentoo.org</email>
+		<name>Panagiotis Christopoulos</name>
+	</maintainer>
+	<longdescription>
+		A selection of styles for *box window managers.
+	</longdescription>
 </pkgmetadata>
diff --git a/x11-themes/kfaenza/metadata.xml b/x11-themes/kfaenza/metadata.xml
index 8deff4312a47..4766578b8c3c 100644
--- a/x11-themes/kfaenza/metadata.xml
+++ b/x11-themes/kfaenza/metadata.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-  <email>maksbotan@gentoo.org</email>
-  <name>Maxim Koltsov</name>
-</maintainer>
-<maintainer type="project">
-  <email>kde@gentoo.org</email>
-  <name>Gentoo KDE Project</name>
-</maintainer>
-<use>
-	<flag name="additional">Install additional KFaenza icons. See third homepage for details</flag>
-</use>
+	<maintainer type="person">
+		<email>maksbotan@gentoo.org</email>
+		<name>Maxim Koltsov</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
+	<use>
+		<flag name="additional">Install additional KFaenza icons. See third homepage for details</flag>
+	</use>
 </pkgmetadata>
diff --git a/x11-themes/skinenigmang-logos/metadata.xml b/x11-themes/skinenigmang-logos/metadata.xml
index 73d86c89e579..e62650c54a53 100644
--- a/x11-themes/skinenigmang-logos/metadata.xml
+++ b/x11-themes/skinenigmang-logos/metadata.xml
@@ -2,11 +2,10 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
-  			<email>vdr@gentoo.org</email>
-			<name>Gentoo VDR Project</name>
-		</maintainer>
-		<use>
-			<flag name="dxr3">Install logos for lower osd color depth on dxr3
-				cards</flag>
-		</use>
+		<email>vdr@gentoo.org</email>
+		<name>Gentoo VDR Project</name>
+	</maintainer>
+	<use>
+		<flag name="dxr3">Install logos for lower osd color depth on dxr3 cards</flag>
+	</use>
 </pkgmetadata>
diff --git a/x11-themes/vdr-channel-logos/metadata.xml b/x11-themes/vdr-channel-logos/metadata.xml
index fd3086d89d1e..984a01fab265 100644
--- a/x11-themes/vdr-channel-logos/metadata.xml
+++ b/x11-themes/vdr-channel-logos/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
-  			<email>vdr@gentoo.org</email>
-			<name>Gentoo VDR Project</name>
-		</maintainer>
+		<email>vdr@gentoo.org</email>
+		<name>Gentoo VDR Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/x11-themes/wm-icons/metadata.xml b/x11-themes/wm-icons/metadata.xml
index 08abffbf3b2c..85146c675c97 100644
--- a/x11-themes/wm-icons/metadata.xml
+++ b/x11-themes/wm-icons/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <!-- maintainer-needed -->
-    <longdescription>
-	A hugely varied assortment of themed icons for use in X, created with FVWM in mind but works well in lots of other things too!
-    </longdescription>
-    <upstream>
-        <remote-id type="sourceforge">wm-icons</remote-id>
-    </upstream>
+	<!-- maintainer-needed -->
+	<longdescription>
+		A hugely varied assortment of themed icons for use in X, created with FVWM in mind but works well in lots of other things too!
+	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">wm-icons</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index c48400759397..a6ebbca1b794 100644
Binary files a/x11-wm/Manifest.gz and b/x11-wm/Manifest.gz differ
diff --git a/x11-wm/blackbox/metadata.xml b/x11-wm/blackbox/metadata.xml
index eb1e7094d54f..5d2ee1af2e01 100644
--- a/x11-wm/blackbox/metadata.xml
+++ b/x11-wm/blackbox/metadata.xml
@@ -3,10 +3,10 @@
 <pkgmetadata>
 	<!-- maintainer-needed -->
 	<longdescription>
-	 Blackbox is that fast, light window manager you have been looking for 
-	 without all those annoying library dependencies. If you have a C++ 
-	 compiler and the X Window System you can compile and use it.
-	 </longdescription>
+		Blackbox is that fast, light window manager you have been looking for
+		without all those annoying library dependencies. If you have a C++
+		compiler and the X Window System you can compile and use it.
+	</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">blackboxwm</remote-id>
 	</upstream>
diff --git a/x11-wm/fvwm/metadata.xml b/x11-wm/fvwm/metadata.xml
index 434919c67111..63c21e06e5f1 100644
--- a/x11-wm/fvwm/metadata.xml
+++ b/x11-wm/fvwm/metadata.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
-  <longdescription lang="en">
+	<!-- maintainer-needed -->
+	<longdescription lang="en">
 		fvwm is an ICCCM-compliant X window manager providing a 3D look for
 		window decorations, multiple discontiguous virtual desktops, a high
 		degree of configurability, and an external module interface for
 		implementing functional extensions.
 	</longdescription>
-  <use>
-    <flag name="gtk2-perl">Enable GTK2 Perl bindings</flag>
-    <flag name="lock">Enable screen locking</flag>
-    <flag name="netpbm">Enable NetPBM support (used by FvwmScript-ScreenDump)</flag>
-    <flag name="rplay">Enable rplay support</flag>
-    <flag name="stroke">Mouse Gesture support</flag>
-  </use>
+	<use>
+		<flag name="gtk2-perl">Enable GTK2 Perl bindings</flag>
+		<flag name="lock">Enable screen locking</flag>
+		<flag name="netpbm">Enable NetPBM support (used by FvwmScript-ScreenDump)</flag>
+		<flag name="rplay">Enable rplay support</flag>
+		<flag name="stroke">Mouse Gesture support</flag>
+	</use>
 </pkgmetadata>
diff --git a/x11-wm/muffin/Manifest b/x11-wm/muffin/Manifest
index 650783b8bafe..5436112bf8ed 100644
--- a/x11-wm/muffin/Manifest
+++ b/x11-wm/muffin/Manifest
@@ -2,4 +2,5 @@ DIST muffin-2.8.5.tar.gz 2715965 SHA256 0ae19de74111f222b44f7bf8d159437a83c6ae2e
 DIST muffin-3.0.5.tar.gz 2717820 SHA256 11c27abedad6952aaa446d37ad23e910c3c51dc0dd8d29298cfae2c3ad917e64 SHA512 2d4d37099e33ee5b0817970f5f7e264d679752ef5a256916e54a7072419e8c75a67d8609c541238bd76c462a85c9841167e051b3ced968a557aa4a90f41b2d5c WHIRLPOOL e57f4ab9970cabae7039bdedeb3f02abfb1b4311824af39eb8022cff694f3c34d19183b133f81cc0663e195ea66b32602462e145f1ecb77c63d17d4ce2b065e7
 DIST muffin-3.2.0.tar.gz 2718913 SHA256 061966c2c8520804e1338de0dd499672a7f054aa7ae32b2fd98e49e656ad9a21 SHA512 f1c17fdaf4d8f32ae9e62a60811a24c120413ad2a1e824ee412527a2c3336c2523596cb06fcad01a2f1fbf1a09a78cc30a5769b1cb860ce26d96690a8c3c4043 WHIRLPOOL 14ca0f448f22cabde6aebde70438bba783c26f5b488b7691bf54c26cabd97eabdaf083cb5988f76f0a8bb13dd190d6ffd32214bc425e0234ec34eae40723e47e
 DIST muffin-3.4.0.tar.gz 2719701 SHA256 bbfd8997ad0f03d029f804c4927f464e89276ce384aef5aa6787dddc04e6ef85 SHA512 27c800dbd433f5eac19aa7db51994311acad347630f1f8b86f71846723f1b7d89929a1c900e6f8766b86ab078ed6b766554fe65dc12d81a61925e0396095e51d WHIRLPOOL 18c0e77aa3766528ea93c2eb88812f4bdb9d4360015799edff12c8a1b6951f61ff31767e61ab7dabcd3b20ec3f8097cfb84726f70bd77600a96beae0c8af7992
-DIST muffin-3.4.1.tar.gz 2720297 SHA256 f051c9bb1291381c9e32bf06ef829cb2ee894e8d6293a4d2738c8655d3643c26 SHA512 896dcb9c51d4aee28dcf16fbf721c1b3f581bc2a0f5344eb360655339e78f34ee89120c7a9b4ee3ffe55243c7c300f20140b76bfff52a7a9a9f292de33b9488c WHIRLPOOL 9e9e4e646d64d416f88baf5bd245c22768ce71267fb2e8fe7709d8377a495beb6ab3fcf59f9a282800c6251211bbde9844474ddb6e847e1b71df7e7205f736bc
+DIST muffin-3.4.1.tar.gz 2720297 BLAKE2B 94b628bccd6542aa46d950fe6b2818baa8c429f7f116378267b38f302b99b9ff589eb7d95e303ca30f37d5d4a5c3af8d4a50d819a06db3584366892b819e81a3 SHA512 896dcb9c51d4aee28dcf16fbf721c1b3f581bc2a0f5344eb360655339e78f34ee89120c7a9b4ee3ffe55243c7c300f20140b76bfff52a7a9a9f292de33b9488c
+DIST muffin-3.6.0.tar.gz 2720809 BLAKE2B 9d1b92907d545990b409c15f9e9e3bf7b3871cc545d02234296efcb15f0082fc630c3a06849789c5e5aed4af9253e6893cc29feb7590aaaaaf2eb38843591c8d SHA512 d077f1310d7600754c9b4f77fc2a82377aec43f9a1cc0b95e28118764741922a58f2348418bee309d8c7fd1484b97ddc898d0105fa1a3fcd855d2fcc68f3679e
diff --git a/x11-wm/muffin/metadata.xml b/x11-wm/muffin/metadata.xml
index 658465f83128..7b5976166a10 100644
--- a/x11-wm/muffin/metadata.xml
+++ b/x11-wm/muffin/metadata.xml
@@ -2,8 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
-        <email>cinnamon@gentoo.org</email>
-        <name>Cinnamon Project</name>
+		<email>cinnamon@gentoo.org</email>
+		<name>Cinnamon Project</name>
 	</maintainer>
 	<upstream>
 		<remote-id type="github">linuxmint/muffin</remote-id>
diff --git a/x11-wm/muffin/muffin-3.6.0.ebuild b/x11-wm/muffin/muffin-3.6.0.ebuild
new file mode 100644
index 000000000000..54cfd8ecf95d
--- /dev/null
+++ b/x11-wm/muffin/muffin-3.6.0.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools eutils gnome2
+
+DESCRIPTION="Compositing window manager forked from Mutter for use with Cinnamon"
+HOMEPAGE="http://cinnamon.linuxmint.com/"
+SRC_URI="https://github.com/linuxmint/muffin/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="+introspection test xinerama"
+KEYWORDS="~amd64 ~x86"
+
+COMMON_DEPEND="
+	>=x11-libs/pango-1.2[X,introspection?]
+	>=x11-libs/cairo-1.14:=[X]
+	x11-libs/gdk-pixbuf:2[introspection?]
+	>=x11-libs/gtk+-3.9.12:3[X,introspection?]
+	>=dev-libs/glib-2.37.3:2[dbus]
+	>=gnome-extra/cinnamon-desktop-2.4:0=[introspection?]
+	>=gnome-base/gsettings-desktop-schemas-3.3.0[introspection?]
+	>=media-libs/clutter-1.14.3:1.0=[X,introspection?]
+	>=media-libs/cogl-1.13.3:1.0=[introspection?]
+	>=media-libs/libcanberra-0.26[gtk3]
+	>=x11-libs/libXcomposite-0.3
+	>=x11-libs/startup-notification-0.7:=
+
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	virtual/opengl
+
+	gnome-extra/zenity
+
+	introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
+	xinerama? ( x11-libs/libXinerama )
+"
+# needs gtk-doc, not just -am, for gtk-doc.make
+DEPEND="${COMMON_DEPEND}
+	${PYTHON_DEPS}
+	>=app-text/gnome-doc-utils-0.8
+	sys-devel/gettext
+	dev-util/gtk-doc
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.35
+	virtual/pkgconfig
+	test? ( app-text/docbook-xml-dtd:4.5 )
+	xinerama? ( x11-proto/xineramaproto )
+	x11-proto/xextproto
+	x11-proto/xproto
+"
+RDEPEND="${COMMON_DEPEND}
+	!x11-misc/expocity
+"
+
+src_prepare() {
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README* *.txt doc/*.txt"
+	gnome2_src_configure \
+		--disable-static \
+		--enable-shape \
+		--enable-sm \
+		--enable-startup-notification \
+		--enable-xsync \
+		--enable-verbose-mode \
+		--with-libcanberra \
+		$(use_enable introspection) \
+		$(use_enable xinerama)
+}
diff --git a/x11-wm/openbox/metadata.xml b/x11-wm/openbox/metadata.xml
index 03e0a0449e0d..4c8dd2cb3bd2 100644
--- a/x11-wm/openbox/metadata.xml
+++ b/x11-wm/openbox/metadata.xml
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-  	<email>hwoarang@gentoo.org</email>
-	<name>Markos Chandras</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>lxde@gentoo.org</email>
-    <name>Gentoo LXDE Project</name>
-  </maintainer>
-  <use>
- 	 <flag name="session">Enables support for session managers</flag>
-	 <flag name="xdg">Install the python xdg files for xdg autostart</flag>
-  </use>
-  <upstream>
-    <maintainer status="active">
-      <email>danakj@orodu.net</email>
-      <name>Dana Jansens</name>
-    </maintainer>
-    <changelog>http://openbox.org/wiki/Openbox:News</changelog>
-    <doc>http://openbox.org/wiki/Help:Contents</doc>
-    <bugs-to>http://openbox.org/wiki/Openbox:Contribute</bugs-to>
-  </upstream>
+	<maintainer type="person">
+		<email>hwoarang@gentoo.org</email>
+		<name>Markos Chandras</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>lxde@gentoo.org</email>
+		<name>Gentoo LXDE Project</name>
+	</maintainer>
+	<use>
+		<flag name="session">Enables support for session managers</flag>
+		<flag name="xdg">Install the python xdg files for xdg autostart</flag>
+	</use>
+	<upstream>
+		<maintainer status="active">
+			<email>danakj@orodu.net</email>
+			<name>Dana Jansens</name>
+		</maintainer>
+		<changelog>http://openbox.org/wiki/Openbox:News</changelog>
+		<doc>http://openbox.org/wiki/Help:Contents</doc>
+		<bugs-to>http://openbox.org/wiki/Openbox:Contribute</bugs-to>
+	</upstream>
 </pkgmetadata>
diff --git a/x11-wm/plwm/metadata.xml b/x11-wm/plwm/metadata.xml
index 956d8e2ed88f..d646a8a2cb4a 100644
--- a/x11-wm/plwm/metadata.xml
+++ b/x11-wm/plwm/metadata.xml
@@ -5,9 +5,9 @@
 		<email>axs@gentoo.org</email>
 	</maintainer>
 	<longdescription>
-		 PLWM is a Python package, containing classes suitable for 
-		 implementing a window manager. PLWM is also a window manager, 
-		 using the PLWM package.
+		PLWM is a Python package, containing classes suitable for
+		implementing a window manager. PLWM is also a window manager,
+		using the PLWM package.
 	</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">plwm</remote-id>
diff --git a/xfce-extra/Manifest.gz b/xfce-extra/Manifest.gz
index c186c3dbbd4f..2c293611426c 100644
Binary files a/xfce-extra/Manifest.gz and b/xfce-extra/Manifest.gz differ
diff --git a/xfce-extra/xfce4-playercontrol-plugin/metadata.xml b/xfce-extra/xfce4-playercontrol-plugin/metadata.xml
index 151ee16c6436..369fefa250b4 100644
--- a/xfce-extra/xfce4-playercontrol-plugin/metadata.xml
+++ b/xfce-extra/xfce4-playercontrol-plugin/metadata.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>xfce@gentoo.org</email>
-    <name>XFCE Team</name>
-  </maintainer>
-  <use>
-  	<flag name="audacious">Enable Audacious support</flag>
-    <flag name="mpd">Enable Music Player Daemon support</flag>
-  </use>
+	<maintainer type="project">
+		<email>xfce@gentoo.org</email>
+		<name>XFCE Team</name>
+	</maintainer>
+	<use>
+		<flag name="audacious">Enable Audacious support</flag>
+		<flag name="mpd">Enable Music Player Daemon support</flag>
+	</use>
 </pkgmetadata>
diff --git a/xfce-extra/xfce4-taskmanager/metadata.xml b/xfce-extra/xfce4-taskmanager/metadata.xml
index 525363dc9b20..3211925b8a90 100644
--- a/xfce-extra/xfce4-taskmanager/metadata.xml
+++ b/xfce-extra/xfce4-taskmanager/metadata.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>xfce@gentoo.org</email>
-    <name>XFCE Team</name>
-  </maintainer>
-  <use>
-	  <flag name="gksu">Build against <pkg>x11-libs/libgksu</pkg> to provide "Run as root" option in the application's menu</flag>
-	  <flag name="gtk3">Use GTK+3 instead of GTK+2</flag>
-  </use>
+	<maintainer type="project">
+		<email>xfce@gentoo.org</email>
+		<name>XFCE Team</name>
+	</maintainer>
+	<use>
+		<flag name="gksu">Build against <pkg>x11-libs/libgksu</pkg> to provide "Run as root" option in the application's menu</flag>
+		<flag name="gtk3">Use GTK+3 instead of GTK+2</flag>
+	</use>
 </pkgmetadata>