gentoo resync : 25.03.2018

1777 files changed, 5944 insertions, 11841 deletions

diff --git a/Manifest b/Manifest
index 5c9a38385765..4ecaf4f022a5 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 28811 BLAKE2B 36b91cbaa3d1ae2bf2a8058ba8c84ca7c076f049cebee732cf7f2f370580b353d42207eff45bf51d91ccc88c7094edcd403142abf01ac3eaaa106728be6e2ec9 SHA512 eb7b49b83b25b541b6a6e27120ac52e28da85c8da0d98a319ca2e763e3c99ee6f39c7889bf3f8836582dec942e9bbf370d1734370420873762ddd6fdc9823c58
-TIMESTAMP 2018-03-24T09:38:28Z
+MANIFEST Manifest.files.gz 28829 BLAKE2B 5e41ab2e6ed4b6deca7147795d4a06bb98e6757e86b19a34660725b480cf2e0e0403381e081eb2ea4105324629405e3c57ec466f86a242a25b3d1c362e746142 SHA512 48f4975041c15c0a1b874271f02a6c3507d2addf7c11ef6c2f06067b2b8e00aab68f1633216e970251526b07822ba7a901429ebb18c248adbdfc7e004ad4283c
+TIMESTAMP 2018-03-25T17:38:31Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlq2HJRfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlq33pdfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klC2Bg/9GCsz9kxMZBzqIhlqWnsoESvaCOk2cEPFqxABrfYVZwkYfduzdyjAaSOw
-trZQwtBvfg2XF8XAQCBaiqAOnVZc0xqPLR7YD4CRuDPP6AZCJrvGIx7U5Oxr2CDv
-E81ewP407lHDEEGeCJeRt8rgTx00I1mz4sz+KbqETveumogtSHrI29alJoZexY4s
-O/gPzc2c7/ZnVUT7mzmVfQz1U7ASrE/2wLvouPdPpjCZ+r2SLeWe0fuyXCuMBLui
-no0B+mqdNZcWgQUXmruv0cfFj8WmUZEYVczyKK3YmbPIhG5gUDdQjlSLqHQSNLaR
-EqpcHdybzC0IWb6Dc57yfk6mm5i9MTnfEQR9LaFgdgu+lDwQ2VSNbGmTGtDDKx03
-kx5a3jPcAlbM4QBsLEIVcVFmU8hZvE/tZmkr4oqzsv9dHJvhyAyg1xioOjrvD0jo
-c90EOslVEh83eJg8a3CMzepzOIiE/Wbdulw9GxvoIJb+hU/TAhpRyriW8ETRHMYW
-VbzXUT4PQl3HM8F8ELp8uRANlfjwUGzE6u8/zGxYBY4wEE/LQfGvjmiD5tbXB3v9
-yGIIWi8f+4hsw0cgG5fo7ojn2DjYH83akb9RjUR3zIprlp1tpcvyWzs9Sbwk43So
-RBDBkT1jclpSQyDlhF5bwRDUZt4zbbPeAbWgzLGGQDc2iQKrffc=
-=Bgmy
+klCmpA//b9fXaV2wszSB8lnAgj/j8hkUX3V+ewqRBG4RQ5KJcIkirxY71GBWWD80
+eduaEVbP8hFR9YXpjJqhd8UlqteyRkOwGeym0EjETCPXet+Z6+tt4tTqltA3uGbu
+3EZA2Ccl8r5ZZwBNcmDu7kZt5xWuVnRn5J5lCULIrvjWV8iEVxa6MBbnhwVYiEOC
+kWjM4vnsEqVOCU3ZVtEA2e6MULfpUD8O8fqQOzGUffm9uEZKkKqyKwoi+u0siSV0
+sIPPCPumUudNOvW7NPXfZR2NMha45H1shSp3lGOEs/PboTw1Mwh5TyJ47sN1uVAg
+Wl5gu86wXKPRD2cJAprsXupWK2i9cVC0ZRcMhZ7zjoiHlukFk7QaG5P/WE5aRzPh
+Q/V/kMmrmCwi5dpEpM7nZSCwRUMSgTUdQbCdaRwybXSmbCEJS+PMjbMadyijh8i3
+5aFIx7znuTFxw99Pa1TnXrIN7SXQloX08O2Pql+lzTvox86fdZVJPRU7rVKAU1zk
+VnD2rz1X0/rV89EYxhAhLNrb2akEHA/TpDNgf9EjT1VcvTDdg3aWrltkrak5KIz7
+gYeRAyh3DIzxJvs3fQcuW8W1V7/KkAtvxvEG4rdsluMd1G7FEjltZJRJ0+Tu4Pnw
+TzjT6F1NafHdMwIpK+4HcFAOzKuat4yXsGabeuNUlvRuB7v4KYc=
+=ywTY
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index ec29140ad74d..cb784e20dd45 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index ea402b820914..9134eebc2071 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/xarchiver/Manifest b/app-arch/xarchiver/Manifest
index 9a49db35c4dc..527810eef44f 100644
--- a/app-arch/xarchiver/Manifest
+++ b/app-arch/xarchiver/Manifest
@@ -1,12 +1,5 @@
-AUX xarchiver-0.5.3-add-mime-types.patch 1436 BLAKE2B 48561a6c0a618136c12cf1609660749d1b10dea8077c486aa41cb74a98b70181aef175d723bd83b5193fe88476d1cc77e6241387db8d0dcc273f5f9f27efd7c5 SHA512 a11bedb1ddd28571cca950d6b61a1f292d01c44f4077401c5a2f75cc99cb7a311b3593c1b1da6355a988aceeb35fb13714ad28ad3b707dd1b26f4a0e9d14b136
-AUX xarchiver-0.5.3-fix-password-protected.patch 1213 BLAKE2B 74cf2cf4fa5a1a89385d7ad290be3b772e14303d59269dba85c3bcf860d93184935c527b1a385e866f7cb5e35c7665d4fc9d5fc30e1842d612b71f0f869068a8 SHA512 bd38943d8afdc0e023195c31c8bee78a7fdd5ec6a276c3f66c395dc41779b18bf829356dea4d794329abc0bd8ac81a58bbd961283b95f74a9008006826be9a75
-AUX xarchiver-0.5.3-fix-rpm-support.patch 3291 BLAKE2B ef93bf2403366723ee2626cf0cbe2308e5449d4638fefc984842b2416223b3e700cccbabaa86899968f463b3356c82eee848124b8c736ee46d59792963756829 SHA512 4ea64799b765ceadb34d4ea48df8f1e1748749a128a3b734265c7e9aa414bbc4a443007d3ae2b767cb3d6c3cae6b6bfb3866f76584cbbf66b8cc4afa34a76ebd
-DIST xarchiver-0.5.4.11_p20170629.tar.gz 1052723 BLAKE2B c4f0b0ae634b6c11ea15d9231a2e55e91ecb4f41b571611f42c046f2d70f0598711ac80516a5130a03ae091a9c2477d12e17ba7c22092437a4013b0afdfe1273 SHA512 e63e9ddd98c5ec5708b74e993cb1901835c133e220ba95aa5a07cca01660fab5894533c57b39223db6155e2fc0ea014ce6eede853ebaf067de27f1e77c5e023f
 DIST xarchiver-0.5.4.12.tar.gz 1074764 BLAKE2B 65d8968a470f7ea607fcbb1e2ff3b6c54ff8e521df1ca0cd29d3b7fc7b84d2ad5e2b9987bfb482979c7099d62287c463317d524cadc4a03d6b80ae61d28bfcc2 SHA512 18d177efed810576ee4dc4bc379817cbff390bcbfc541652d8288545bbb4a0e29b2136364e8675814a2780d06e2c5537ca4451a1c73a6becd45e1c0de7ba4554
 DIST xarchiver-0.5.4.13.tar.gz 1079259 BLAKE2B c824e81182a6105d24fe85d148fb7e71c2ae761948421bacf7af240e4b2a381582ab5db46c29ee3b2daf01f710696ee53a93a0a2923923083c177e9473bee4f1 SHA512 ace6b3bade20f517c63a035022944d092868e4c000976ef388a3ee70ef8a28177ee20cfb089d0984e9274722c4ec13d129fd7a4ef542e7b5cd4423c26ad5b849
-DIST xarchiver-0.5.4.tar.bz2 1003045 BLAKE2B 6f1303c1d1b09a60616977c04c771cac78a25c756fbac538401e22e4fe3a808f990848d83041d5c5ceb667e30b5bb1d694318f0d21953201047fefdfc9afeb2c SHA512 3b767c2601d94104e2fc72aa8d168afa5a154b5747a9b0518d1c348417e56e4c19d872a0029fb78decc897e0f3bc9573e17d0317b85f584e7275b0e519f5f30d
-EBUILD xarchiver-0.5.4.11_p20170629.ebuild 1420 BLAKE2B facfe37669671309ece170cbab8f29887bf84b4180aaec7e4cafe80c7a8e975a10430d7b573037bbb46e817cea9cea2314433684b43406736f9f7c63eb5c04dc SHA512 0030d3bce1e6dc695b90d15a97c7d66910d9e90bc9f0743e4b942eb3a59cf194ae6b82dd095255fc8eb2ec8b2b3c409f60aafbdf9ee2cb0c1b6b22b5e4a2267f
 EBUILD xarchiver-0.5.4.12.ebuild 1320 BLAKE2B 1f9b40a82529f4764fc56a123a6176bc4b65633cab5fc5710ae76b3b102b88c5cfe20d8f46f69447cce2324a3819a52641e504a528327fada0c476ae8036291f SHA512 848307a17c6aa0aefdf1eff7a516173f4f77fd774950ca03708251f70acea85ff3556f7d69af63f242afa126b356faf10960087d22dd1f37ca970a9c35d97a46
 EBUILD xarchiver-0.5.4.13.ebuild 1327 BLAKE2B 2eb437ed5a3c8bfc85fd8f68cf7d6e7d2ad4c67ae76462a65e4bc55441e4349853bd9d4f46c31cceade4c4f9f03f6db13dc5ab43a099fa679362be2df11735ec SHA512 60aa5577d9c758a1cdc9ec643296e3dc544bd81f1dd7a9b1d3ea52b4dffb323b892eda314a23fc1a70babc5777434f3bb45447e2fabd3228d9bc0b552e554e5d
-EBUILD xarchiver-0.5.4.ebuild 1328 BLAKE2B 76286bbf89e4782fd113168a8bd6b6b02def8827ca86805e166c9d5a3d50032ad87d9e6d2529b29a06e4fa4c2ed25b3ae95373e2f99c8c36a98efedcd7398417 SHA512 ed25ddd86d9c9d048f8a6cb155fd79c0c45d380b91f587bd8364ac3d455fc0a75d9eed271b64f7b42d293c762c57747c52608a30f2a1899ee935b091c9a0258e
 MISC metadata.xml 447 BLAKE2B 3ac670facb7c0034e1f079622c8c14e04a131e359e1cdbbc18b7cdd111a673651a97a7e35a430d13d80c1cf35e87f4aec0738836b60dd2837e4a77ff4e9485a3 SHA512 ccccc741a75658963153a71810ea9d8c25bfe49765f90a4aa5558ef8fef2abdd1e17d1c9ffb604a78deafeda1e5032b671c8f85a8189e6c89cf3f057dfec9a4a
diff --git a/app-arch/xarchiver/files/xarchiver-0.5.3-add-mime-types.patch b/app-arch/xarchiver/files/xarchiver-0.5.3-add-mime-types.patch
deleted file mode 100644
index ec427b99aeee..000000000000
--- a/app-arch/xarchiver/files/xarchiver-0.5.3-add-mime-types.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -Naur xarchiver-0.5.3.orig/xarchiver.desktop.in xarchiver-0.5.3/xarchiver.desktop.in
---- xarchiver-0.5.3.orig/xarchiver.desktop.in	2014-05-12 01:08:12.159131913 +0000
-+++ xarchiver-0.5.3/xarchiver.desktop.in	2014-05-12 01:09:02.585526393 +0000
-@@ -4,11 +4,11 @@
- _Name=Xarchiver
- _Comment=A GTK+2 only archive manager
- _GenericName=Archive manager
--Exec=xarchiver
-+Exec=xarchiver %f
- Icon=xarchiver
- Terminal=false
- Type=Application
- X-MultipleArgs=false
- Categories=GTK;Archiving;Utility;
- StartupNotify=true
--MimeType=application/x-arj;application/arj;application/x-bzip;application/x-bzip-compressed-tar;application/x-gzip;application/x-rar;application/x-rar-compressed;application/x-tar;application/x-zip;application/x-zip-compressed;application/zip;multipart/x-zip;application/x-7z-compressed;application/x-compressed-tar;application/x-bzip2;application/x-bzip2-compressed-tar;
-+MimeType=application/x-arj;application/arj;application/x-bzip;application/x-bzip-compressed-tar;application/x-gzip;application/x-rar;application/x-rar-compressed;application/x-tar;application/x-zip;application/x-zip-compressed;application/zip;application/x-7z-compressed;application/x-compressed-tar;application/x-bzip2;application/x-bzip2-compressed-tar;application/x-lzma;application/x-lzma-compressed-tar;application/x-lzop;application/x-lzop-compressed-tar;application/x-xz;application/x-xz-compressed-tar;application/x-deb;application/x-rpm;
diff --git a/app-arch/xarchiver/files/xarchiver-0.5.3-fix-password-protected.patch b/app-arch/xarchiver/files/xarchiver-0.5.3-fix-password-protected.patch
deleted file mode 100644
index 00969349db01..000000000000
--- a/app-arch/xarchiver/files/xarchiver-0.5.3-fix-password-protected.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -Naur xarchiver-0.5.3.orig/src/window.c xarchiver-0.5.2/src/window.c
---- xarchiver-0.5.3.orig/src/window.c	2014-01-24 08:10:09.305990000 +0100
-+++ xarchiver-0.5.3/src/window.c	2014-01-24 08:42:45.110729290 +0100
-@@ -1694,7 +1694,7 @@
- 		{
- 			if (archive->passwd == NULL)
- 			{
--				archive->passwd = xa_create_password_dialog(NULL);
-+				archive->passwd = xa_create_password_dialog(archive);
- 				if ( archive->passwd == NULL)
- 				{
- 					gtk_drag_finish (dc,FALSE,FALSE,t);
-@@ -2702,9 +2702,12 @@
- 
- 	if (entry->is_encrypted)
- 	{
--		archive[idx]->passwd = xa_create_password_dialog(archive[idx]);
- 		if (archive[idx]->passwd == NULL)
--			return;
-+		{
-+			archive[idx]->passwd = xa_create_password_dialog(archive[idx]);
-+			if (archive[idx]->passwd == NULL)
-+				return;
-+		}
- 	}
- 	filename = g_strconcat(archive[idx]->tmp,"/",entry->filename,NULL);
- 	if (g_file_test(filename,G_FILE_TEST_EXISTS))
-@@ -2768,8 +2771,12 @@
- 	{
-		if (entry->is_encrypted)
-		{
--		  if (archive->passwd == NULL)
--		     return;
-+			if (archive->passwd == NULL)
-+			{
-+				archive->passwd = xa_create_password_dialog(archive);
-+				if (archive->passwd == NULL)
-+					return;
-+			}
-		}
- 	   	if (archive->extraction_path)
- 	   	{
diff --git a/app-arch/xarchiver/files/xarchiver-0.5.3-fix-rpm-support.patch b/app-arch/xarchiver/files/xarchiver-0.5.3-fix-rpm-support.patch
deleted file mode 100644
index cf17ff7385cb..000000000000
--- a/app-arch/xarchiver/files/xarchiver-0.5.3-fix-rpm-support.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-diff -Naur xarchiver-0.5.3.orig/src/rpm.c xarchiver-0.5.3/src/rpm.c
---- xarchiver-0.5.3.orig/src/rpm.c	2014-02-09 16:26:24.000000000 +0100
-+++ xarchiver-0.5.3/src/rpm.c	2014-02-19 07:54:27.744136749 +0100
-@@ -23,8 +23,11 @@
- 
- void xa_open_rpm (XArchive *archive)
- {
-+	unsigned char bytes[8];
- 	unsigned short int i;
--    int response;
-+    int dl,il,sigsize,offset,response;
-+    gchar *ibs,*executable;
-+    gchar *gzip_tmp = NULL;
- 	GSList *list = NULL;
- 	FILE *stream;
- 	gboolean result;
-@@ -53,14 +56,68 @@
- 		archive->column_types[i] = types[i];
- 
- 	xa_create_liststore (archive,names);
-+    if (fseek ( stream, 104 , SEEK_CUR ) )
-+    {
-+        fclose (stream);
-+        response = xa_show_message_dialog (GTK_WINDOW (xa_main_window),GTK_DIALOG_MODAL,GTK_MESSAGE_ERROR,GTK_BUTTONS_OK,_("Can't fseek to position 104:"),g_strerror(errno));
-+        return;
-+    }
-+    if ( fread ( bytes, 1, 8, stream ) == 0 )
-+	{
-+		fclose ( stream );
-+		response = xa_show_message_dialog (GTK_WINDOW (xa_main_window),GTK_DIALOG_MODAL,GTK_MESSAGE_ERROR,GTK_BUTTONS_OK,_("Can't read data from file:"),g_strerror(errno));
-+		return;
-+    }
-+    il = 256 * ( 256 * ( 256 * bytes[0] + bytes[1]) + bytes[2] ) + bytes[3];
-+    dl = 256 * ( 256 * ( 256 * bytes[4] + bytes[5]) + bytes[6] ) + bytes[7];
-+    sigsize = 8 + 16 * il + dl;
-+    offset = 104 + sigsize + ( 8 - ( sigsize % 8 ) ) % 8 + 8;
-+    if (fseek ( stream, offset  , SEEK_SET ) )
-+    {
-+        fclose (stream);
-+        response = xa_show_message_dialog (GTK_WINDOW (xa_main_window),GTK_DIALOG_MODAL,GTK_MESSAGE_ERROR,GTK_BUTTONS_OK,_("Can't fseek in file:"),g_strerror(errno));
-+        return;
-+    }
-+    if ( fread ( bytes, 1, 8, stream ) == 0 )
-+	{
-+		fclose ( stream );
-+		response = xa_show_message_dialog (GTK_WINDOW (xa_main_window),GTK_DIALOG_MODAL,GTK_MESSAGE_ERROR,GTK_BUTTONS_OK,_("Can't read data from file:"),g_strerror(errno));
-+		return;
-+    }
-+    il = 256 * ( 256 * ( 256 * bytes[0] + bytes[1]) + bytes[2] ) + bytes[3];
-+    dl = 256 * ( 256 * ( 256 * bytes[4] + bytes[5]) + bytes[6] ) + bytes[7];
-+	sigsize = 8 + 16 * il + dl;
-+	offset = offset + sigsize;
-+	fclose (stream);
- 
- 	/* Create a unique temp dir in /tmp */
- 	result = xa_create_temp_directory (archive);
- 	if (!result)
- 		return;
- 
-+	gzip_tmp = g_strconcat (archive->tmp,"/file.gz_bz",NULL);
-+	ibs = g_strdup_printf ( "%u" , offset );
-+
- 	/* Now I run dd to have the bzip2 / gzip compressed cpio archive in /tmp */
--	gchar *command = g_strconcat ( "sh -c \"rpm2cpio ",archive->escaped_path," > ",archive->tmp, "/file.cpio\"",NULL);
-+	gchar *command = g_strconcat ( "dd if=",archive->escaped_path," ibs=",ibs," skip=1 of=",gzip_tmp,NULL);
-+	g_free (ibs);
-+	list = g_slist_append(list,command);
-+	batch_mode = TRUE;
-+	result = xa_run_command (archive,list);
-+	if (result == FALSE)
-+	{	
-+		g_free (gzip_tmp);
-+		return;
-+	}
-+	if (xa_detect_archive_type (gzip_tmp) == XARCHIVETYPE_GZIP)
-+		executable = "gzip -dc ";
-+	else if (xa_detect_archive_type (gzip_tmp) == XARCHIVETYPE_BZIP2)
-+		executable = "bzip2 -dc ";
-+	else
-+		executable = "xz -dc ";
-+
-+	command = g_strconcat("sh -c \"",executable,gzip_tmp," > ",archive->tmp,"/file.cpio\"",NULL);
-+	g_free(gzip_tmp);
- 	list = NULL;
- 	list = g_slist_append(list,command);
- 	result = xa_run_command (archive,list);
diff --git a/app-arch/xarchiver/xarchiver-0.5.4.11_p20170629.ebuild b/app-arch/xarchiver/xarchiver-0.5.4.11_p20170629.ebuild
deleted file mode 100644
index 371df75ee5bb..000000000000
--- a/app-arch/xarchiver/xarchiver-0.5.4.11_p20170629.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 autotools gnome2-utils xdg-utils
-
-MY_COMMIT=79a73d46b782cf8bb93d058d00d2cb81a9b3df8a
-DESCRIPTION="A GTK+ archive manager that can be used with Thunar"
-HOMEPAGE="https://github.com/ib/xarchiver"
-SRC_URI="https://github.com/ib/xarchiver/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="doc"
-
-RDEPEND=">=dev-libs/glib-2:=
-	x11-libs/gtk+:3="
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig
-	doc? (
-		app-text/docbook-xml-dtd
-		app-text/docbook-xsl-stylesheets
-		dev-libs/libxml2
-		dev-libs/libxslt
-	)"
-
-S="${WORKDIR}"/${PN}-${MY_COMMIT}
-
-src_prepare() {
-	sed -e '/COPYING/d' -e '/NEWS/d' -i doc/Makefile.am || die
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		$(use_enable doc)
-	)
-	econf "${myconf[@]}"
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-
-	elog "You need external programs for some formats, including:"
-	elog "7zip - app-arch/p7zip"
-	elog "arj - app-arch/unarj app-arch/arj"
-	elog "lha - app-arch/lha"
-	elog "lzop - app-arch/lzop"
-	elog "rar - app-arch/unrar app-arch/rar"
-	elog "zip - app-arch/unzip app-arch/zip"
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
diff --git a/app-arch/xarchiver/xarchiver-0.5.4.ebuild b/app-arch/xarchiver/xarchiver-0.5.4.ebuild
deleted file mode 100644
index d318b747671a..000000000000
--- a/app-arch/xarchiver/xarchiver-0.5.4.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit xfconf
-
-DESCRIPTION="a GTK+ based and advanced archive manager that can be used with Thunar"
-HOMEPAGE="http://xarchiver.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-RDEPEND=">=dev-libs/glib-2
-	>=x11-libs/gtk+-2.24:2"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-pkg_setup() {
-	PATCHES=(
-		"${FILESDIR}"/${PN}-0.5.3-add-mime-types.patch
-		"${FILESDIR}"/${PN}-0.5.3-fix-password-protected.patch
-		"${FILESDIR}"/${PN}-0.5.3-fix-rpm-support.patch
-		)
-
-	XFCONF=(
-		$(xfconf_use_debug)
-		)
-
-	DOCS=( AUTHORS ChangeLog README TODO )
-}
-
-src_prepare() {
-	sed -e '/COPYING/d' -e '/NEWS/d' -i doc/Makefile.in || die
-	xfconf_src_prepare
-}
-
-src_install() {
-	xfconf_src_install DOCDIR="${ED}/usr/share/doc/${PF}"
-}
-
-pkg_postinst() {
-	xfconf_pkg_postinst
-	elog "You need external programs for some formats, including:"
-	elog "7zip - app-arch/p7zip"
-	elog "arj - app-arch/unarj app-arch/arj"
-	elog "lha - app-arch/lha"
-	elog "lzop - app-arch/lzop"
-	elog "rar - app-arch/unrar app-arch/rar"
-	elog "zip - app-arch/unzip app-arch/zip"
-}
diff --git a/app-cdr/Manifest.gz b/app-cdr/Manifest.gz
index 19ed0ac9d4a1..d533367044af 100644
--- a/app-cdr/Manifest.gz
+++ b/app-cdr/Manifest.gz
diff --git a/app-cdr/xfburn/Manifest b/app-cdr/xfburn/Manifest
index 3f145f318972..d1e4c99256c2 100644
--- a/app-cdr/xfburn/Manifest
+++ b/app-cdr/xfburn/Manifest
@@ -1,6 +1,3 @@
-DIST xfburn-0.5.4.tar.bz2 773300 BLAKE2B f2ab2cfe344c9643036ae0be2c315ea16a993dca325c6adfcc7047367fb0306335aa1fbcdbf308ea7480cc98ee8fa356b4e601c4e88d3215e25046d3233e66cc SHA512 66bd82aa80fcd53d5d505b01a33cdbffdcf547a05a11bdbe688387420ee682a28564397acaf85a52852625909648c01cc18f289736ac54d2806725f46c875481
 DIST xfburn-0.5.5.tar.bz2 819546 BLAKE2B 180f50e9dc8e9bb2372ac7335374b09eade93b6477e557b4282ee65705e55d1f391578343e3473061921cfe296e0da9dae0ddb8823fc5daadc673537331f3085 SHA512 37574aa7dcec65c26a8fd5019c3776196763fa1ebb0f531002f5bcb72a6eb0ec19ed994dd14726988766d890ef257c39c26e64ca3f5944386c03d9b54c26a90a
-EBUILD xfburn-0.5.4-r1.ebuild 1078 BLAKE2B dccfb90703ec234dc293692d91853edfa38aaa580348185eab85aab3e88cde5787c24bf14caf4f6a45e7f0eeb6dae2a9b9cf417194f5eaf7ae7a508c5003ed87 SHA512 ddabe0de2b0ad76d3bbbaf4e300ad623372e3fe6d201782786685ae2808e226ef3e9235256d5ee5b0e6699cde2ff52bdd9eb79b481b7e499ac9cf083af687986
-EBUILD xfburn-0.5.4.ebuild 906 BLAKE2B a3c92c9d02623f7820b8ec53032c1e16b5fb6b05d0a63de04861220d5b6f55dd7b2c74f88fdd46e617d4319641023708a945ea2e082cab6491fcabea00f133a0 SHA512 cb57838c9d4f135b77df6488a2c5996495b37fa907f3991d8e70ac4f29f7e7c44cb0b1b7a21f55f953683afce1792b4a337ca774a9c4c724cf763ea32c3ce1b6
 EBUILD xfburn-0.5.5.ebuild 1029 BLAKE2B ed264440ee935df959cf7e1ea403c6540877d0494e368402fd45a5fb4145fb0e89038535f30992b4568dee92294ced232d73e70697a4e998f643296a32582803 SHA512 0a5be254ab6ae90de719b9d5df11a18af23f9e9b5f36848104571bd478fdc17d9d1aa2096ce103dc920bad78f90a1cfc162a2c09edbe17083a6eed9f496d5aa3
 MISC metadata.xml 481 BLAKE2B 336b6da9e50fab974d5d320a93ffa10e24cb4621f13835e6a0fa86a95067b28e26fc3c9ca2e17eeecc69f0c842f98bdcebc273bc164cb26baa6b87f39f7c85ca SHA512 1ef204c9fe28b54edffac8132485e3bc326b0452a3014f7be50378be871621e62771f53810b441e4db18b657707e875b67fd2e1231609f62534adbfee2270fc4
diff --git a/app-cdr/xfburn/xfburn-0.5.4-r1.ebuild b/app-cdr/xfburn/xfburn-0.5.4-r1.ebuild
deleted file mode 100644
index 561783727be0..000000000000
--- a/app-cdr/xfburn/xfburn-0.5.4-r1.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
-
-inherit gnome2-utils xdg-utils
-
-DESCRIPTION="GTK+ based CD and DVD burning application"
-HOMEPAGE="https://goodies.xfce.org/projects/applications/xfburn"
-SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
-IUSE="gstreamer +udev"
-
-RDEPEND=">=dev-libs/glib-2.32:=
-	>=dev-libs/libburn-0.4.2:=
-	>=dev-libs/libisofs-0.6.2:=
-	>=x11-libs/gtk+-2.24:2=
-	>=xfce-base/exo-0.6:=
-	>=xfce-base/libxfce4ui-4.10:=
-	gstreamer? (
-		media-libs/gstreamer:1.0=
-		media-libs/gst-plugins-base:1.0= )
-	udev? ( virtual/libgudev:= )"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog NEWS README TODO )
-
-src_configure() {
-	local myconf=(
-		$(use_enable udev gudev)
-		$(use_enable gstreamer)
-		)
-
-	econf "${myconf[@]}"
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/app-cdr/xfburn/xfburn-0.5.4.ebuild b/app-cdr/xfburn/xfburn-0.5.4.ebuild
deleted file mode 100644
index e0189575899f..000000000000
--- a/app-cdr/xfburn/xfburn-0.5.4.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit xfconf
-
-DESCRIPTION="GTK+ based CD and DVD burning application"
-HOMEPAGE="https://goodies.xfce.org/projects/applications/xfburn"
-SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ~ppc x86"
-IUSE="debug gstreamer +udev"
-
-RDEPEND=">=dev-libs/glib-2.32:=
-	>=dev-libs/libburn-0.4.2:=
-	>=dev-libs/libisofs-0.6.2:=
-	>=x11-libs/gtk+-2.24:2=
-	>=xfce-base/exo-0.6:=
-	>=xfce-base/libxfce4ui-4.10:=
-	gstreamer? (
-		media-libs/gstreamer:1.0=
-		media-libs/gst-plugins-base:1.0= )
-	udev? ( virtual/libgudev:= )"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-pkg_setup() {
-	XFCONF=(
-		$(use_enable udev gudev)
-		$(use_enable gstreamer)
-		$(xfconf_use_debug)
-		)
-
-	DOCS=( AUTHORS ChangeLog NEWS README TODO )
-}
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index f4119cc759af..b9db307b5681 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/moolticute/Manifest b/app-crypt/moolticute/Manifest
index 1d7590eeff70..e6029653f6fc 100644
--- a/app-crypt/moolticute/Manifest
+++ b/app-crypt/moolticute/Manifest
@@ -1,6 +1,6 @@
 AUX 50-mooltipass.rule 84 BLAKE2B 574568b60d33216a8de4a90866f2dd4a53d5369fb7e112c6125b8492e8cdaff51067dffe4e36e07fa24cf8a9aaaa77a388f3217ad039a51d7ba0781239020a43 SHA512 26f8a9f2c5fb2f3a87a486f91d5fae7069955dc528eacb8a37a833d393be38b70e3a9784024287cdfeb93a90abad83400395bb803e82a091100bd44cb7b2c28d
 AUX moolticuted.init 309 BLAKE2B 1f967b7e497e7e2d5547baf3e1b18127590997d8221ed34da1b4b4b2843bb1590fbb0c4153cb89d7f68b4fc0852e66f38879362fdd482414e4b6ba6862f06e30 SHA512 bbb80cf14d3adf744538f03513b461eb8bd2b633ef314f9e935e919f288f629aa8d84ff856e3aa104a2933e16143fbdbff90d9df8651473c39907f5aff580ed0
-DIST moolticute-0.11.11_beta.tar.gz 5363395 BLAKE2B 0d37c3af1fb79510a7203951d28426897ee6ed4ddf53d8ac84013ca1eb939a90b4ab6008a47a2d8974588dcc0fc7109e3a7e5770783c9312ed4335e14a016b18 SHA512 5b9fd72c52eec6755474a187dcd7af9ead89e2c08504d25ab6e4ab36991e032699cb8a9e02f402f7e5e551238bcfd225d2b5415945df07ec2bde7625c7041659
-EBUILD moolticute-0.11.11_beta.ebuild 1221 BLAKE2B 1543d9255677160ebb05eb0b169c8fce07e3de2e636c74989528011d01d003e6c2bb6c175311968e2e984cb27d17c49916380225a40ecbebcbc734d157f3271d SHA512 cf7759c9cb9e12daadc144cd1c75bc4cdbedc05ef5d751770e2f6f2fa4febc8f24162159fc46d19c295d4c32d1f0a144f8a340267bb6c8b0ce985abd2f175ad2
+DIST moolticute-0.12.7.tar.gz 5364075 BLAKE2B a85a18264e5658a96454d4b934cca1b62b63b2d1b90352fe750f973e28dd2da78d0a95d3103d4e213d9bb96b76d28c79d6d77127a6c85078036b63e61889afe0 SHA512 f7db56c9bdf6d3f8d1ad573f37f0c394b53fd2acc1f257f2f8b113af1c1a050f40a3cdbf7d559cb45eb5e61533bae084f0b574db43da1598bfd056131df8edd9
+EBUILD moolticute-0.12.7.ebuild 1221 BLAKE2B 1543d9255677160ebb05eb0b169c8fce07e3de2e636c74989528011d01d003e6c2bb6c175311968e2e984cb27d17c49916380225a40ecbebcbc734d157f3271d SHA512 cf7759c9cb9e12daadc144cd1c75bc4cdbedc05ef5d751770e2f6f2fa4febc8f24162159fc46d19c295d4c32d1f0a144f8a340267bb6c8b0ce985abd2f175ad2
 EBUILD moolticute-9999.ebuild 1221 BLAKE2B d7846f6ffdf9461819bd57cdf6d800c2d3cbee5f62f8bfc4f8cf38b4001c79c9637d329a1ad0efb27d006cfb27b29ce838ac88065619b60ebe06f27203da2558 SHA512 8c60b98f38e898ba74aacc00bf0bc58bb9cebb701e3beaca6f4ec934c2041ce5132ae96c73e644348582a00e44012d9a1a5e05b3f0741e378edcdb67f04ca1c7
 MISC metadata.xml 530 BLAKE2B ab8901536d9ea0b2841cc0cb604cb7e0eab2765079d1964e561bcc61d10ba780cbce831eec8532cc5ed6866df98d0580ff9294ff10d571910bb67d10f065947c SHA512 8551a8d709f3a2fd054a948839518383d3d8f7187b507bcc275d5daa601e53fe1cc1cf3eb7c13c61f6318055964a0a1afba525726e65cd1e3f025b0266997d0e
diff --git a/app-crypt/moolticute/moolticute-0.11.11_beta.ebuild b/app-crypt/moolticute/moolticute-0.12.7.ebuild
index b5153ad45a3e..b5153ad45a3e 100644
--- a/app-crypt/moolticute/moolticute-0.11.11_beta.ebuild
+++ b/app-crypt/moolticute/moolticute-0.12.7.ebuild
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 267bb43695a3..76a9aca8fece 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/virt-manager/Manifest b/app-emulation/virt-manager/Manifest
index dc944f1ef097..67521a8c3c02 100644
--- a/app-emulation/virt-manager/Manifest
+++ b/app-emulation/virt-manager/Manifest
@@ -2,5 +2,5 @@ DIST virt-manager-1.4.3.tar.gz 2765924 BLAKE2B fa888dc78bb8ab27ff5a507829c5ace5d
 DIST virt-manager-1.5.0.tar.gz 2797380 BLAKE2B 45ef8c2b98fa1d6f7c4b4fe45bca74e27d595eb4d2e7c80c4e7671c445d8e523b8a4c21eaffc02dea756b7a93f5b3c7f3bdc795a0cf6ef99230bcf0c5683c81b SHA512 b375927776b9132fbd9dacd8223b6c94b89c32d6812394ec7e18df7c66f7e6dec853885e85e2b4b4ffd283e8afe0dd2526bafeac4b55511a4a115ef5798f97da
 EBUILD virt-manager-1.4.3.ebuild 2406 BLAKE2B b18ed780d146def605866e8468edf5505cee6913169381fa591a804bd25ce6b6ec4b09801ee42827871f6b08d9bd8aaa621ba819bbec682f6731fbaa8e984411 SHA512 0db0e050d64b2b6cf820c4dfa2a21c1154ee7a3bc124b38b78bbd5e6ab18239a5cdff49838597daeb3a1fe71b2b4ee167c685f2217087404fe7d6bcf9fa82c44
 EBUILD virt-manager-1.5.0.ebuild 2408 BLAKE2B eae4524fbacfa095a48dda0fd3e4cac44281ce5d7df862990cb8fe8ab72049185aaad886b3ccb4a957fe0367e1d587b62304a94065146f1b5e3d27ed90c80108 SHA512 960693352f33803ffb0049790e944482b6f7272a040137e25f78f4e0ef7015d0fb4a0fde922110aa6f90dcea9c35d075425d851a0550821b200834275666cf04
-EBUILD virt-manager-9999.ebuild 2442 BLAKE2B 7783010edf8e1e41eda8c74d5780f8e4b3246066b7b6ac97f89a85f61d79239e4425037131bc87bcc145d5165344720ec20c83d0e638d0941a89d03b75f834d7 SHA512 e0424714069d08b0e0de868d72e45d57953c3ea2dd0910b683c3bdb2b73ca0274a7444661c8df212cca0fe47d10c0aea5c455ecddc8d033b89c88590118b30e6
+EBUILD virt-manager-9999.ebuild 2355 BLAKE2B 56d4f90d91ab55ec2d0388cc49d238e3d3b314f16738734bf21f22283496243085ebc5a2828e34a66c0f03856f743edb335dd828dc9197de8c30ffeced9db5b9 SHA512 55fc8f98599d38c5f676104ecc6ec6085ad619f1ec47dc95a89406bd24669b65d65c233fc33492eb0b871cb67d9c4c6768a97d46ccf554488c2331aefa8e88ae
 MISC metadata.xml 662 BLAKE2B 4ddc8ee05f0679380316f8c175194b325d931967c9faee576f042fa42e0c7d6f8aa6b688464c1a839b8b20e184646d6e356095ffad136141c6c1fc7aa5d4f4f6 SHA512 7aaac81b00bb77562616d6ba9442c2e37d7cdd1142af090e3fe07be36315b5179bdb9cf78073c3f901e9a924c089ba00474e3c7121d785b6622b60be1fce682a
diff --git a/app-emulation/virt-manager/virt-manager-9999.ebuild b/app-emulation/virt-manager/virt-manager-9999.ebuild
index a3b8ec6f3540..9a719e6ef546 100644
--- a/app-emulation/virt-manager/virt-manager-9999.ebuild
+++ b/app-emulation/virt-manager/virt-manager-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_{4,5,6} )
 DISTUTILS_SINGLE_IMPL=1
 
 inherit gnome2 distutils-r1
@@ -69,9 +69,6 @@ src_install() {
 	local mydistutilsargs=( --no-update-icon-cache --no-compile-schemas )
 
 	distutils-r1_src_install
-
-	python_fix_shebang \
-		"${ED}"/usr/share/virt-manager/virt-{clone,convert,install,manager}
 }
 
 pkg_preinst() {
diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index 79034ead944c..38fbf997977d 100644
--- a/app-i18n/Manifest.gz
+++ b/app-i18n/Manifest.gz
diff --git a/app-i18n/unicode-data/Manifest b/app-i18n/unicode-data/Manifest
index a26a3464e48d..51c667f7b268 100644
--- a/app-i18n/unicode-data/Manifest
+++ b/app-i18n/unicode-data/Manifest
@@ -2,6 +2,6 @@ DIST unicode-data-10.0.0-UCD.zip 5991193 BLAKE2B 4724c6f11156b8d97c924c1e08232d2
 DIST unicode-data-10.0.0-Unihan.zip 6632227 BLAKE2B 2bd290b083c87752c3462b8fe7a8c13e3943c69083ba7fbbcc659ca40476e984de1d49a102648d0a669bdaac81babb4c15d0ccba7769e3e4eb1db9efba778f67 SHA512 377f53ddc9ae514e8866c0e6b79f9b1d3613fad5a7e29c57a06baf8be84cbada0703b1c660401e7dbd2bb861b09fa9159b77322f42b34f5a0dc0d8f70ac4db12
 DIST unicode-data-9.0.0-UCD.zip 5655592 BLAKE2B bacfd82142e2327d5633a927d6283d1bf3d43d0476b43ca5b23190abafba5aec3f29a59f096a651acc320a7bbf5f511aaa39e1f09b9fe24e96b0623610bec6a0 SHA512 e9bdf8ed6647b4d0bd83c6fcd885cb450fddbf84dac376e9771bddbb7ee1e8ea1ca8c2ca79e23832c26a4819dd62f86fcfa6eb6a1fcc7294185f5bc78be8fa2a
 DIST unicode-data-9.0.0-Unihan.zip 6558824 BLAKE2B 18900bacb9ec84eef99758a1647f657685f2fc40d705b7cd8f88ea727d9494aab38cf4d40829d52afca7c11087e6b2b2c03547c14980b7d206ba241bff3d3e47 SHA512 9856d30afe5d7b0b088bde36c12431eae267992b315944ca8a7ddb3559adee7474fedd2d0d6b22716439f9cddad573a4bb45c6209036b0066a85fbd19412852e
-EBUILD unicode-data-10.0.0.ebuild 808 BLAKE2B 33cfd76fe8387e9d3b453281e92a286044459f7810add1639ca2b87d4b39218665a0feb655e6694e2d1b383cb04da603da17f1590b1fa780396cd0d925f4ba31 SHA512 a110ccc222e1440826432390941f8614bd9704202b8931ba345e382eb657bc79d1f5cd20f19b4fa8c43221cf7aaed2520a6eacabb95a6e9d9af327cb1e291e17
+EBUILD unicode-data-10.0.0.ebuild 807 BLAKE2B 69f3221f843a059dc00e9941347682d0e4356f3136151909340410a5585c63a3c1411e595ac8a76c7e9a7d2dd344ee9826a5763bef851e25e6163d6f084a9e34 SHA512 49e08361ecb124e4ced0256ae2dd346fbe99d1a4d62d96ea94599eb88a6e4802072277f46b5573b70547dc803f59979fb6a3ce709dcbb4e9b8a90dd8f5e60891
 EBUILD unicode-data-9.0.0.ebuild 800 BLAKE2B d031a95a58bf1d2253c6316e87835f22a7e2dd8fa0ab825e62cc8780c92892bed91c5271660688291cd50a451b9c31962b01cfa28a4a74838b6f73e882702274 SHA512 e47297daa5421946234c9878839dda124ac8b9c825c0c51b1594e9b683c1a0de74d8f96347a085e87b89fd571d0e3598493c7440e67ec582d866c6b01ec170e7
 MISC metadata.xml 238 BLAKE2B 17d20fcdaa0f86ce589db9b1e55e6fffbe693f41d7a05bde4a82faa8f6b5e237bc754e02e67d8116a9e5053c5164dc47edb679c086bce8a866dc224728ef4a52 SHA512 5ecba42349e9c39d750f007ac73f6100b85cf54174805a6673b0373434ea83c0f2b64c8a5b167e1fdd5a6c55d366f50cb9ba5a367b9d6dd8d53d797b8839fd5e
diff --git a/app-i18n/unicode-data/unicode-data-10.0.0.ebuild b/app-i18n/unicode-data/unicode-data-10.0.0.ebuild
index b423a0debd99..e64072b7b617 100644
--- a/app-i18n/unicode-data/unicode-data-10.0.0.ebuild
+++ b/app-i18n/unicode-data/unicode-data-10.0.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.unicode.org/Public/zipped/${PV}/UCD.zip -> ${P}-UCD.zip
 
 LICENSE="unicode"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 DEPEND="app-arch/unzip"
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 0bac94e7ae69..3802cd17ae10 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/calendar/Manifest b/app-misc/calendar/Manifest
index a5e816dea8b3..17b608582890 100644
--- a/app-misc/calendar/Manifest
+++ b/app-misc/calendar/Manifest
@@ -1,4 +1,3 @@
 DIST calendar-0.9.1.tar.bz2 65225 BLAKE2B b8ee591005d57fdb3e18412c9665ee3447f607224efad261ca0cf7a3dc88e94e8bfb8309b19996e38e7e18c26bafcaddc9ebf7d612ed25d7d1d159b63b7b6827 SHA512 c8f373ad06265720ab6ba1edb9066cb5474806d023bf0cb3a35876c5bad72de8bac8ab58c2b6d3a9f418d20d04b1811e256abce9296c9c8547c9b7f8005adfb3
 EBUILD calendar-0.9.1-r1.ebuild 632 BLAKE2B 3aab9f756c907ecb0afcc68f130b28aa60239f570b7c91393a79197d731a0fddcf940627c00d7acf3dd8e60bb587cfcc596b74285f8e4480338f13b4924061cb SHA512 23cc641518bf0ad3f674e16523a70a24051a0708d10e691c2c9a535be254586eeb1eab16cb5620b2178f7b130aabbf7a4683a678752f1d94deb9c4152867161f
-EBUILD calendar-0.9.1.ebuild 641 BLAKE2B 194b76a151bc43eb13e99f2ffa6cb0b3538f96b5aa3c79b52c1bc6f271c26492dc7cc7be4358f7138bfc5ea0819cdcb725e38788dc4ff69bb36c7b77059dd67b SHA512 24d3ca5ae255af3344c3ca2f9ff02af292ca388c7377d2f585e5be00ef6c4753f1ed2e81077138183be9b86eab087fe0861254fa1d3d651f9e4c42e2fc1d7651
 MISC metadata.xml 346 BLAKE2B 365bbcf4fca5fb793b4b9499b021c028eb13d1634d21a1c1627cd528c0fe77c195f7f789ee7cce987297ed8e8e20cc9937e83f6d5292b3878a25426488a3d691 SHA512 9fb15d47c1b5ea5eba7614339ed44e8812550589416f8fdb5aa02dfc899c95b782526577f97a24e024c0298e09af634b8a3dc27474755728d81866100c8d066d
diff --git a/app-misc/calendar/calendar-0.9.1.ebuild b/app-misc/calendar/calendar-0.9.1.ebuild
deleted file mode 100644
index 70fdb97478fe..000000000000
--- a/app-misc/calendar/calendar-0.9.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit toolchain-funcs
-
-DESCRIPTION="Standard unix calendar program for Linux, ported from OpenBSD"
-HOMEPAGE="http://bsdcalendar.sourceforge.net/"
-SRC_URI="http://bsdcalendar.sourceforge.net/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
-IUSE=""
-
-src_compile() {
-	tc-export CC
-	emake || die "emake failed"
-}
-
-src_install() {
-	dodoc README || die
-	cp -R "${S}/calendars" "${D}/usr/share/calendar" || die "cp failed"
-	dobin calendar || die "dobin failed"
-	doman calendar.1 || die
-}
diff --git a/app-misc/gramps/Manifest b/app-misc/gramps/Manifest
index ee9537a9d222..4919f72b86b8 100644
--- a/app-misc/gramps/Manifest
+++ b/app-misc/gramps/Manifest
@@ -1,3 +1,6 @@
+AUX gramps-4.2.8-uncompressed-docs.patch 1261 BLAKE2B 48ebdddf13e9f29f01a3f5456686fce3d93e89437264c96918b39800f95a0bf65ed05802a74c6061aa3a375d710fdfe484c8a8afffd4a6805487453f4ebc96b7 SHA512 422338a2b6aa7865c59c5238728be95e7852097a464d328fc5d75c93305c05a1a05dc077c0a20838d66d67984d1cb9d9482fc92763f022f08a88d2dc414c5b0d
 DIST gramps-4.2.5.tar.gz 18694912 BLAKE2B f91bc665ab4a970e7de193ba3bea4250e99b692cb92e76fae4a37cfa2c46280e6a45ff6712c7a68213735b6e7016f2caa3180971976c92aaa7e61d73ad2e3d5a SHA512 20a8ebff7ea2e3a80248830e55d58ebe0b5a350e1ac31efb3f2b900af38c134037bae91a58fb441be54f9fac8226555a3f5771cc358d3a4a92e89af911433b9c
+DIST gramps-4.2.8.tar.gz 18704769 BLAKE2B 795febcc2c93a0c9b72aceeba1ac4c4f10953c2bf3b23dd8d38f662a231e21967e6f263e14d2344ef2f422e170617b7b80be4fafc2cb20c4a659366836b0e641 SHA512 c814914eb3a650dd5753d83e492d91d5db11b55321f63bd460e4eb8d80a36dd727a3792a203e3061dfaa89fd13549f51809bb83cc65b2a494c1fb8f42dcb4b8f
 EBUILD gramps-4.2.5.ebuild 1336 BLAKE2B fbf43f646f953dc31e245f29e2efb6c0cbccceac8272162819aaab5363d284a821ec7220c022563085e3540c2ff23e57e766a88e74bf0dece8e7188fd5b3b4b8 SHA512 4eb326bcf7909cdf56ed57d0d97203003b34472e4c6a5c774c8b55f09afcec64ef1e3ae93acb21fff40343e78179cf5fafaa6b7d3e587636b4dfca481435cb27
-MISC metadata.xml 5429 BLAKE2B 209ad6b0c16a2f0ed6322f08b11c211cd66b92395307ba08aad2271a84c14a8b879dff16526a3c3564ef11cb2a7590b7ab9b51a58430829090552283f2f70b13 SHA512 f81987adcf502d7b080016f22dcb3a9cda2b05f77d9e85b55f58db71f5ab2506c7782c9e6a7056f1d35c52f867fcff87e01f9c7fd2d936ea8f1fb8d8c9d75485
+EBUILD gramps-4.2.8.ebuild 1606 BLAKE2B c5ff1821b187c8db3eba5a6d13835aa25121d936f5a2eca97679db374509fd141e573085af7df3a0318e64cb8f7ca6ce2f70ce90dd687196ed48d4b7f33bcef3 SHA512 5a7288e37ad2a37d9e3e30dad2e7e8dcab5f0711a6e8d8378081e8b2c52675f7db70f54817d6421d447c33424117ad14b5f1f84f61df712e58a14a2f9c903f58
+MISC metadata.xml 5730 BLAKE2B 0f0915a541ef3aebaa124fcd3914db315b0d0ab72ed50af26fa9010a28b5bf5f8514dfe280041d4c7fb7aecc904ccf6d32708074048e05f68efc75c2c7dc7163 SHA512 2b5bdbffe1c49e83a5df03d2158dfe3bce9a746c1ac07b15f6421c3c18ee6a5b24998e59b942482ce788820afc9f508d956f06a1472b65cebb36044dd648e48d
diff --git a/app-misc/gramps/files/gramps-4.2.8-uncompressed-docs.patch b/app-misc/gramps/files/gramps-4.2.8-uncompressed-docs.patch
new file mode 100644
index 000000000000..8d43447027dc
--- /dev/null
+++ b/app-misc/gramps/files/gramps-4.2.8-uncompressed-docs.patch
@@ -0,0 +1,33 @@
+diff --git a/setup.py b/setup.py
+index 0177ce7..7aaa681 100644
+--- a/setup.py
++++ b/setup.py
+@@ -160,27 +160,8 @@ def build_man(build_cmd):
+             subst_vars = (('@VERSION@', VERSION), )
+             substitute_variables(filename, newfile, subst_vars)
+ 
+-            import gzip
+-            man_file_gz = os.path.join(newdir, 'gramps.1.gz')
+-            if os.path.exists(man_file_gz):
+-                if newer(filename, man_file_gz):
+-                    os.remove(man_file_gz)
+-                else:
+-                    filename = False
+-                    os.remove(newfile)
+-
+-            if filename:
+-                #Binary io, so open is OK
+-                with open(newfile, 'rb') as f_in,\
+-                        gzip.open(man_file_gz, 'wb') as f_out:
+-                    f_out.writelines(f_in)
+-                    log.info('Compiling %s >> %s', filename, man_file_gz)
+-
+-                os.remove(newfile)
+-                filename = False
+-
+             lang = man_dir[8:]
+-            src = build_cmd.build_base  + '/data/man/' + lang  + '/gramps.1.gz'
++            src = build_cmd.build_base  + '/data/man/' + lang  + '/gramps.1'
+             target = 'share/man/' + lang + '/man1'
+             data_files.append((target, [src]))
+ 
diff --git a/app-misc/gramps/gramps-4.2.8.ebuild b/app-misc/gramps/gramps-4.2.8.ebuild
new file mode 100644
index 000000000000..d9142b2bb5c8
--- /dev/null
+++ b/app-misc/gramps/gramps-4.2.8.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{4,5} )
+
+DISTUTILS_SINGLE_IMPL=1
+inherit distutils-r1 xdg-utils
+
+DESCRIPTION="Genealogical Research and Analysis Management Programming System"
+HOMEPAGE="https://gramps-project.org/"
+SRC_URI="https://github.com/gramps-project/${PN}/archive/v${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+rcs +reports exif geo postscript spell"
+
+RDEPEND="
+	dev-python/bsddb3[${PYTHON_USEDEP}]
+	dev-python/pycairo[${PYTHON_USEDEP}]
+	>=dev-python/pygobject-3.12:3[cairo,${PYTHON_USEDEP}]
+	dev-python/pyicu[${PYTHON_USEDEP}]
+	gnome-base/librsvg:2
+	>x11-libs/gtk+-3.14.8:3[introspection]
+	x11-libs/pango[introspection]
+	x11-misc/xdg-utils
+	reports? ( media-gfx/graphviz[postscript?] )
+	exif? ( >=media-libs/gexiv2-0.5[${PYTHON_USEDEP},introspection] )
+	geo? ( >=sci-geosciences/osm-gps-map-1.1.0 )
+	spell? ( app-text/gtkspell:3[introspection] )
+	rcs? ( dev-vcs/rcs )
+"
+
+python_prepare_all() {
+	# Install documentation to the proper location. This can't be done
+	# easily with a patch because we substitute in the $PF variable,
+	# and that changes with every revision.
+	sed -i "s:share/doc/gramps:share/doc/${PF}:g" setup.py || die
+	eapply "${FILESDIR}/${P}-uncompressed-docs.patch"
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	mydistutilsargs=( --resourcepath=/usr/share )
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/app-misc/gramps/metadata.xml b/app-misc/gramps/metadata.xml
index 38431e0f9674..f7eab38a8930 100644
--- a/app-misc/gramps/metadata.xml
+++ b/app-misc/gramps/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>herb@hlmjr.com</email>
+		<name>Herb Miller Jr. (herbmillerjr)</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription lang="en">
 		GRAMPS helps you track your family tree. It allows you to store, edit,
 		and research genealogical data. GRAMPS attempts to provide all of the
@@ -87,6 +94,7 @@
 	<use>
 		<flag name="geo">Enable rendering of geographical data using <pkg>sci-geosciences/osm-gps-map</pkg></flag>
 		<flag name="reports">All external software that is needed for graphical reports will be installed</flag>
+		<flag name="rcs">Adds support for family tree archives via <pkg>dev-vcs/rcs</pkg></flag>
 	</use>
 	<upstream>
 		<remote-id type="sourceforge">gramps</remote-id>
diff --git a/app-misc/pax-utils/Manifest b/app-misc/pax-utils/Manifest
index d062a1fd2756..832d34e14dd1 100644
--- a/app-misc/pax-utils/Manifest
+++ b/app-misc/pax-utils/Manifest
@@ -7,5 +7,5 @@ DIST pax-utils-1.2.3.tar.xz 661828 BLAKE2B 4764c47b7a31e7470a454127b9db3b5b27c70
 EBUILD pax-utils-1.1.7.ebuild 1472 BLAKE2B ac8f899442a870fe81f1d5c80bd3ccf24082ecb029de9520bd45cf1efccf6e0ced8685af3c16ae25c9d57733a3e2bf57bb5d0e543e7f1e43244867807b35bd2a SHA512 7e166188a86da296040f1407377526f444af689e2aeead564f28089b996b5f34d658b3197b881ef84b3aa7600309f71d54cbbd86fdc61ce71706a64f8bb12368
 EBUILD pax-utils-1.2.2-r2.ebuild 1627 BLAKE2B 4cb00aa04ebbca333f1b1cc3c5db6580f592bd3a7dab1c87a8aa7eaa4250ca1f261442f0d662960e41fc659048672487d5674f930be972732239fe6e48bc4646 SHA512 ef06d06f27ed726e14e196ead496fc72c0f7426d45f35839527ed1fb8c5ebfc3ecca4aa8bf41cc5e35d00cbbe01d77aa45a1dbf8dccf88d72610098fa2e9257c
 EBUILD pax-utils-1.2.3-r1.ebuild 1698 BLAKE2B 3377c2719fbd8e49d50c166d7a10655570197c84bb42c2a57fc0bdc4ea33c4ce29a4094da408189e5fb9ae0ffe830f39aba1e5fc0c5d04679095f81e9b04d05a SHA512 04678abb457a3206152a37e4c563f424ee551038e10e3dd00149eed4503edf27a370e7d1665fff6fdb60a43ff2492a631f8fed2f53cf3e48e03f21ea62ca7c16
-EBUILD pax-utils-1.2.3.ebuild 1487 BLAKE2B d1fc6f13abbc2f25ddfdcb763bb35409cac1b1596a491d211bd753f1ae03650fa2f3b185d815e3750f7db0d6fa5a9eabcc8fcdbc0fd117b51fd2675440d76da6 SHA512 cbf436d325442d5c794901326d83f4169924d2a03f220ab78198cfe51a06984fd0cfaba2553d7464b917de7c76e1af180630bd1f37c1f5b0b52d40e9eb7e0270
+EBUILD pax-utils-1.2.3.ebuild 1485 BLAKE2B 89a425ff1ad32b42b88c2d7e27c11e1c377d964bbf12ebf9e7b60a3a89aa2cfbcbd7130d0c2530317db5951ba4a1e55817ba6fb46b67d25b91eb795a3d6531f0 SHA512 b455dc32000fde7a9a4b081ec9bbebc2aa89711de039c450353ebbca5fc792ee7b104f7a216084b1eabbe24c0fbe2e99752bef4c9b8a8f5fce9dcd46d99c3af9
 MISC metadata.xml 706 BLAKE2B 1660bd83c0164ecb4c187d6271cd1f27a8140906bef315bcfc4be37594f91a79cfa9da8fb9dfd1af66c6c7028ed4d40ef891b025fb12b9486b7ee366a3e5c354 SHA512 3691bf431cb24ad3498b137f0e264562451db583201e1cae327ed201f36d838f01dfe78e3569a2d24593c67f747dff17eec645bacf0855148c72354ebeaa26f1
diff --git a/app-misc/pax-utils/pax-utils-1.2.3.ebuild b/app-misc/pax-utils/pax-utils-1.2.3.ebuild
index e20193b9c3ad..5e84f564e467 100644
--- a/app-misc/pax-utils/pax-utils-1.2.3.ebuild
+++ b/app-misc/pax-utils/pax-utils-1.2.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="caps debug python seccomp"
 
 RDEPEND="caps? ( >=sys-libs/libcap-2.24 )
diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index 670f4018a4f1..9bbe20e81805 100644
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
diff --git a/app-office/auto-multiple-choice/Manifest b/app-office/auto-multiple-choice/Manifest
index 6370e8d323af..03eb77105788 100644
--- a/app-office/auto-multiple-choice/Manifest
+++ b/app-office/auto-multiple-choice/Manifest
@@ -1,5 +1,5 @@
 AUX auto-multiple-choice-1.3.0-conf.patch 1889 BLAKE2B aa39f1525f6067e8025094b3c7437f72c11eec7cb5b0fcbbe68388b80c1ff01050f2fc224671e1a6901f52d51e761f2702d17ce0e75f5ca67ffc8d721ef37cb6 SHA512 6c7cce8383dbbb23646b96785b69dd75f6d3e842d6712b3b5741a5151f7dde5a9ee05bd35e3dee374641f453128e8008304cc6001d9a1db707528ecb7b1ba496
 AUX auto-multiple-choice-1.3.0-desktop.patch 637 BLAKE2B bf06b2761d35b669b88a0915a273022045e169e09dd76ca4ae40723d44d57fabb518dec83f811124421cfc82a53cd1435c60c6763b534d6a3ae4449b2bc00de6 SHA512 b1eec21b2f640bfdf7a4d7d956a71b2fa9889a6d5428cc7eedc1352e845477c3a81607d0c1502b4f57967264384aff5dcc2162bb552544b962c383dc7f978ffa
 DIST auto-multiple-choice_1.3.0_sources.tar.gz 4328255 BLAKE2B 7c6337cfa0a12d8dcd9fa640e636c300234ba7e7a34e95a523c5f9836f934da336f6ce792932fffb97b28ae02c577166a3d4d3ea4fd6959786a5c60510b454a2 SHA512 fcfacd071072f5773556c706b6fa0aea4ff3f3752f3a1f40c9e6de7ec870e939adc57e6bd4c90cac80241cc798e02a71c9fc80d9ccf25ad3a10752f937d06da5
-EBUILD auto-multiple-choice-1.3.0-r1.ebuild 2492 BLAKE2B 7e1a401b2d055c334c2f606f38e3ece39ed30999a5719b2679937ee2d7e8c110e677e939bc8c78bdc7da4c94639baf13d7c4b57e6f6b2db22bb4dd1c5103e9b0 SHA512 d7d29544cd7608021c8706bd2d15cbf75c7ba59306be20fe8ae3027f57c11acfa2930b0137ce94eb008ce599c182762b3befc82cc7c48e3a62caae452558f505
+EBUILD auto-multiple-choice-1.3.0-r1.ebuild 2486 BLAKE2B 1c4b23c10a1a39156a08b0b35d8711da08bbf0d2f8964bb1740ecad9eed2fc470ad3011d5456b8f709557a8c06880fc8996c7986d0f512fc1a7075601e7b52bc SHA512 dbbb20f11e87687a7effe92cb50fc0e1362bab557d1fbe76a34ee9c3d60f100e79e8bdae1f53792dab3264bb6cb8ce05299b2e56a0044afe0fe0043616ad5535
 MISC metadata.xml 501 BLAKE2B c68be06e9c151e4a61fea79f981c1e62a74ca9f5d5b8e172313f05466476528cd45b95e58a7dc55ccbe01fc533502a3c190272ea58548ac2e62b4b4116b04a5b SHA512 d779df58826ceda811954becb0c8862bd6da1d99f19726d00ecbbb14e2080aa6afa7a01d8c7fc8af12e7071247528186e7eb94547c718ea97acdf766bc60d768
diff --git a/app-office/auto-multiple-choice/auto-multiple-choice-1.3.0-r1.ebuild b/app-office/auto-multiple-choice/auto-multiple-choice-1.3.0-r1.ebuild
index 925afe07ad38..a3734539e03f 100644
--- a/app-office/auto-multiple-choice/auto-multiple-choice-1.3.0-r1.ebuild
+++ b/app-office/auto-multiple-choice/auto-multiple-choice-1.3.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -22,7 +22,7 @@ for lala in ${LANGS}; do
 done
 
 CDEPEND="
-	app-text/texlive[dvi2tty,extra,graphics,png,pstricks,science,truetype,xml,X,luatex,xetex,humanities,omega,publishers]
+	app-text/texlive[dvi2tty,extra,graphics,png,pstricks,science,truetype,xml,X,luatex,xetex,humanities,publishers]
 	app-text/poppler:=
 	dev-perl/XML-LibXML
 	media-libs/netpbm
diff --git a/app-office/gnucash/Manifest b/app-office/gnucash/Manifest
index 0a94c6a157ba..c30840fb4f94 100644
--- a/app-office/gnucash/Manifest
+++ b/app-office/gnucash/Manifest
@@ -1,12 +1,10 @@
 AUX gnucash-2.7.4-double_free.patch 553 BLAKE2B 3c59299aaf868e52834a8b7c594afedcfde35b7e6058fbe87a8fce57f2773d914b971566c831ae0a998680a3cfc69c5b1c75664087abaf1023e84fd650751592 SHA512 458bf645e16cb88e7ab37b218b442a11b02f6d3eb95fd1c4ae368813bff08bb3455666942c719f17df5348a5c775bc7e0e14507825896463624252aa24a056c9
 AUX gnucash-2.7.4-fix-tests-for-32bit-platforms.patch 1840 BLAKE2B 4de54cb147d563686febad739dddbc7e7e4f1cf92a5f1961fe4ccf452e8e2c495e7a4773a615a77835f4f1ef99d0f5d22c871c1643ada67bec216ae96dff3ce2 SHA512 f89f560e3e6d594836a431831a4a384301e405be49fccece0a761f1d2c17340a68f71ddc8cde4f7e99a2e05e2d3ddc6bda5b59e54ca0baa3a76ac63f7399d48b
-DIST gnucash-2.6.19.tar.bz2 13612124 BLAKE2B cc66e4d7994274bb2ad97437333dbe62b0e9228e20e05e01fc7861bc45a8f07bc56d2a69850eda301d5e7f679d96a9d28c24c56a4860cff6727b66867482deae SHA512 0a979caf48ba96d6f37a929036e7172855cfb03af8832f479966bce72fad3400903925134d33aaa31eb6b36a2041f5e0d3f74b88e95b83c7d76e96b1503bec13
 DIST gnucash-2.7.4.tar.bz2 13364512 BLAKE2B 0a552efe5a4f024517c054516eb25b51abb2f934e6fc904afd4b0fb48283f9ebb89583b83b0efefba66d014df16c8997c413d05278d4290c44e4fa2278564b61 SHA512 d096ec2a3907dcd09c936f0a49ef6fb5028a17d2e0ade9e68eae7303530480ce19e08c1864efd862d363fda9ef6343260396b794b3c4ac74544baa2628a310eb
 DIST gnucash-2.7.5.tar.bz2 13330271 BLAKE2B e06328050a2dd8e80e224cf13f51c1c7151e73f9a1c9f14581f33bfcf8bf07b273962620b7281637101eab8c5eff67a3e5e8e34d81f0c8d263ac33bf6d1eb40c SHA512 68cd6e6f61a43b8837e9efe693d22f62ebe10a8bb7d593814fb6a12d035d74ec1e444f53010ad53c6b1adf28c75aa482403c06052314a91636c2a8baa30e09af
 DIST gnucash-2.7.7.tar.bz2 13368946 BLAKE2B 06e6815af713235ea31859532911303db4fa5e8dcd50b9111aa513795963eaca29a612eeced27399441f43563753d977468dfd901a49dfa689b5d36e7b985ebf SHA512 b7d91e87c4bc4e604560f4502a86deaafa4f636e9fe2af26db53b11da9f48986c970ba0ed08cb7172ca08a5fb2da451d26976963241206c388a33555c80f28fe
 DIST gtest-1.8.0.tar.gz 1281617 BLAKE2B ac052b4d0eb0d8ded03a8c7dff05177818627b8a51f2dbc2c162b2ee2a5d1323539e7d0d02236d9ebb799995e018f0171c2fdaeb4de3bb339548265e50de79e6 SHA512 1dbece324473e53a83a60601b02c92c089f5d314761351974e097b2cf4d24af4296f9eb8653b6b03b1e363d9c5f793897acae1f0c7ac40149216035c4d395d9d
-EBUILD gnucash-2.6.19.ebuild 3331 BLAKE2B 67b53dbb60ab5b8160c0e73d3135a200e41f21fd5cfceb7e7f652967af5fcf0381bcd5436f9120fb025bf4ab22a4bd4eae94ac9dacfcdfcda9efec5375fd52d4 SHA512 3c928dd6a952c570f744bae0d843b5dfd48548e12b40c15f73cc4651e49d81989eb845643ec99b175b3eaf01a042f8bf5ceadb02917ea2e998595db0b3e68b8b
 EBUILD gnucash-2.7.4-r1.ebuild 3952 BLAKE2B 011a368e9bf441c05aaaf3681ed666151ad7a68fb849c2ceca50079f47b91265f9ef10b2cf10367393f3df5243bd59e76c7a2362c3ff498c855058412112c977 SHA512 9cdf9f7b57fa0eda3d5d3d154b194bb869fc360fdac5049e327eedb9b27d91a2e4022a3388d1c372a6d84f337c7d1be96722603e05ac4028073e6a9b7baaadc2
 EBUILD gnucash-2.7.5.ebuild 3922 BLAKE2B 072fd6a6232473c97276a2a1b1988b8f3f69b6c9de963c2429150e39a444b3035e5b33fb4417bf9cea906487165bd54bcab3dd3332d429c33c411edde499cb1c SHA512 1a57b87c6c4d894e1ca4a3948916b613756e6797b1c0eafff0dea3ba380c7c28dbd53d849eae08f80522496ed710e9578ad3c48ca69a1b4f5b349abefc4a588c
-EBUILD gnucash-2.7.7.ebuild 3932 BLAKE2B 6ee11719030dd3f9c727d69d491578fcb805be530823b7e9f97869a13cc860fd6448f39d20cd9878f163977c077c7dae12934d754cf1818e37f8fb5f6f91b219 SHA512 c2b4b6067554594c2e5a7af7d495b78f7dfd74a2cefeb4c962dad2ef14f3ce2ae5a5496e4de70edbd78c5916f464a1709e6783ec0700e4f01f3e3d6605f56e5a
-MISC metadata.xml 842 BLAKE2B 32276a0205e3726e5dc547bbac615cb04f1137cf9f34389810921ec6fe55312af21f31732cbfd998a2f1678b06b8f54a16601d0b02e580e3c4a609159f0628dd SHA512 ef6c9aacda5849e8d6a8bc03ff9266fbf38b2256f085b4e4cd3c4a91007f3a4a81740417f18d7f5f437fbf4167de4ffbdb4742e381ded06b12a8433b550ed542
+EBUILD gnucash-2.7.7-r1.ebuild 3938 BLAKE2B caeec758f850e9bf89d6baad7e2884cf9fefa3892dbaf0dbab63be92d28664dcac46122a3f5a00bcee2b7a88cd788e611e8823da3dcc5a3ee12cf066fce2da52 SHA512 0025632752b6f45f7ec5259560ff9b7998bb8247be8ead416db1c281efded6da014770b23718e067cf54e7044537b7cbf6343d8c016ef6e1230041ea0cf123cb
+MISC metadata.xml 766 BLAKE2B 8da7802829c98dfc8a219d6ad339081af2ed5506668e0331ce944e61a69eb7c9bfb5ac2b7a27616cf2b59081aee348654774937336b5540bab8f2333c1d577c5 SHA512 5e64d4d0a7e9570bb12793d983852deacf8a94a79a153c18e490109d68f1275f82dc584d0bda4b5e3df119660cba90c7c03852ee046a7c7a29626c05cdea6784
diff --git a/app-office/gnucash/gnucash-2.6.19.ebuild b/app-office/gnucash/gnucash-2.6.19.ebuild
deleted file mode 100644
index b9f08f0f1f42..000000000000
--- a/app-office/gnucash/gnucash-2.6.19.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools gnome2 python-single-r1
-
-DESCRIPTION="A personal finance manager"
-HOMEPAGE="http://www.gnucash.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="chipcard debug +doc gnome-keyring hbci mysql ofx postgres python quotes sqlite"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-# README.dependencies mentions qof, but ${PN} has their own fork in the
-# source code that appears to have deviated from that project.
-#
-# libdbi version requirement for sqlite taken from bug #455134
-RDEPEND="
-	>=dev-libs/glib-2.32.0:2
-	>=dev-libs/libxml2-2.5.10:2
-	>=dev-libs/popt-1.5
-	>=dev-scheme/guile-1.8.5:12=[deprecated,regex]
-	<dev-scheme/guile-2.2
-	>=net-libs/webkit-gtk-1.2:2
-	>=sys-libs/zlib-1.1.4
-	>=x11-libs/goffice-0.7.0:0.8[gnome]
-	>=x11-libs/gtk+-2.24:2
-	dev-libs/libxslt
-	dev-scheme/guile-www
-	gnome-base/dconf
-	gnome-base/libgnomecanvas
-	x11-libs/pango
-	gnome-keyring? ( >=app-crypt/libsecret-0.18 )
-	hbci? (
-		>=net-libs/aqbanking-5[gtk,ofx?]
-		sys-libs/gwenhywfar[gtk]
-		chipcard? ( sys-libs/libchipcard )
-	)
-	mysql? (
-		dev-db/libdbi
-		dev-db/libdbi-drivers[mysql]
-	)
-	ofx? ( >=dev-libs/libofx-0.9.1 )
-	postgres? (
-		dev-db/libdbi
-		dev-db/libdbi-drivers[postgres]
-	)
-	python? ( ${PYTHON_DEPS} )
-	quotes? (
-		>=dev-perl/Finance-Quote-1.11
-		dev-perl/Date-Manip
-		dev-perl/HTML-TableExtract
-	)
-	sqlite? (
-		>=dev-db/libdbi-0.9.0
-		>=dev-db/libdbi-drivers-0.9.0[sqlite]
-	)
-"
-
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	gnome-base/gnome-common
-	sys-devel/libtool
-	virtual/pkgconfig
-"
-
-PDEPEND="doc? (
-	~app-doc/gnucash-docs-${PV}
-	gnome-extra/yelp
-)"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Skip test that needs some locales to be present
-	sed -i -e '/test_suite_gnc_date/d' src/libqof/qof/test/test-qof.c || die
-
-	# We need to run eautoreconf to prevent linking against system libs,
-	# this can be noticed, for example, when updating an old version
-	# compiled against guile-1.8 to a newer one relying on 2.0
-	# https://bugs.gentoo.org/show_bug.cgi?id=590536#c39
-	# https://bugzilla.gnome.org/show_bug.cgi?id=775634
-	eautoreconf
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	local myconf
-
-	DOCS="doc/README.OFX doc/README.HBCI"
-
-	if use sqlite || use mysql || use postgres ; then
-		myconf+=" --enable-dbi"
-	else
-		myconf+=" --disable-dbi"
-	fi
-
-	# gtkmm is experimental and shouldn't be enabled, upstream bug #684166
-	gnome2_src_configure \
-		--disable-doxygen \
-		--disable-error-on-warning \
-		--disable-gtkmm \
-		--enable-locale-specific-tax \
-		$(use_enable debug) \
-		$(use_enable gnome-keyring password-storage) \
-		$(use_enable hbci aqbanking) \
-		$(use_enable ofx) \
-		$(use_enable python) \
-		${myconf}
-}
-
-src_install() {
-	# Parallel installation fails from time to time, bug #359123
-	# Usually reproducible after removing any gnucash installed copy
-	MAKEOPTS="${MAKEOPTS} -j1" GNC_DOC_INSTALL_DIR=/usr/share/doc/${PF} \
-	gnome2_src_install
-
-	rm -rf "${ED}"/usr/share/doc/${PF}/{examples/,COPYING,INSTALL,*win32-bin.txt,projects.html}
-	mv "${ED}"/usr/share/doc/${PF} "${T}"/cantuseprepalldocs || die
-	dodoc "${T}"/cantuseprepalldocs/*
-}
diff --git a/app-office/gnucash/gnucash-2.7.7.ebuild b/app-office/gnucash/gnucash-2.7.7-r1.ebuild
index 11fc957fcffb..5b5dde99e048 100644
--- a/app-office/gnucash/gnucash-2.7.7.ebuild
+++ b/app-office/gnucash/gnucash-2.7.7-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 # google{test,mock} version
 GV="1.8.0"
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_{4,5,6} )
 
 inherit cmake-utils gnome2-utils python-single-r1 xdg-utils
 
diff --git a/app-office/gnucash/metadata.xml b/app-office/gnucash/metadata.xml
index 4c84c7d43e6d..f0b8ab6233e1 100644
--- a/app-office/gnucash/metadata.xml
+++ b/app-office/gnucash/metadata.xml
@@ -10,11 +10,12 @@
 		<name>Gentoo GNOME Desktop</name>
 	</maintainer>
 	<use>
-		<flag name="aqbanking">Connect to some internet banks via AqBanking</flag>
-		<flag name="chipcard">Enable support for chipcard reading and
-		processing.</flag>
-		<flag name="hbci">Enable HBCI support, for connecting to some internet
-		banks</flag>
+		<flag name="aqbanking">
+			Connect to some internet banks via AqBanking
+		</flag>
+		<flag name="chipcard">
+			Enable support for chipcard reading and processing.
+		</flag>
 		<flag name="quotes">Enable Online Stock Quote retrieval</flag>
 		<flag name="register2">Use the new register (Experimental)</flag>
 	</use>
diff --git a/app-office/orage/Manifest b/app-office/orage/Manifest
index cda82b087f6a..23f6f77f97bc 100644
--- a/app-office/orage/Manifest
+++ b/app-office/orage/Manifest
@@ -1,4 +1,3 @@
 DIST orage-4.12.1.tar.bz2 2590788 BLAKE2B 0f00b5704e11923c2ceaac81f0956457402a90f65709c165c98b6942745ea3adee176691555a18548ead258951693187e1b3ce9a718abb3b13c2a1c2a4754e7e SHA512 3fec0201171140586cdc9bcf151450a7086515e18b5815afe4fe4c4726ba554c50582b0479e52985b330140c51b7233ef81f678f986f848afbeee74c66b2d196
 EBUILD orage-4.12.1-r1.ebuild 1540 BLAKE2B 32e995bf7b5a3518a30f3dddb2a1ccb74f45fd5c249605dcf168ce9bc6e9cac557cae37d927f1754faa6aacf6b04b48c384a491c4ff941a21d8722f5781c6530 SHA512 43a08917b88afe4b324975dd098fa7046353fe42734d1a4ec156955622800397f4154581a4c70fa67b8328077ab926db8a93db866c3e84f6875f526f6a409b2b
-EBUILD orage-4.12.1.ebuild 1606 BLAKE2B 9615f3a1c20a94c697ef5ee6225deedcd5089e40a1fb7d7257ad46b8a3bc69e0f32d51e1c4407424d9124534e78bb3e942e7ea4e78fc896cc3453dcb7546ad3f SHA512 465baef549d375d3a9105f10f8b638e16e6a7aa681aec26da41895e09ada76fab153f127c3266eba7d177a5a8f95bb1b214effb5895499cdda76d65ad7ea3cd1
 MISC metadata.xml 355 BLAKE2B 4ddbf38a80be81b7e131d7c616dfb88dff1e900952c17c4cc4dd26711e720351177d92d8225825dd57354399ecdb8b7bccd18f883fcd927846e8614dd4ac4a99 SHA512 a5d3f875ac31caa10ca77ce8eb38449b3007094d1b9d7d307bd15ee29644c09530d44ac6a4953e10adfa3bd45b6a3fe44dbbb3b80ab7d0c8572c48523ef287eb
diff --git a/app-office/orage/orage-4.12.1.ebuild b/app-office/orage/orage-4.12.1.ebuild
deleted file mode 100644
index b8aee6929704..000000000000
--- a/app-office/orage/orage-4.12.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit multilib xfconf
-
-DESCRIPTION="A time managing application (and panel plug-in) for the Xfce desktop environment"
-HOMEPAGE="https://git.xfce.org/apps/orage/"
-SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="berkdb dbus debug libnotify +xfce_plugins_clock"
-
-RDEPEND=">=dev-libs/libical-0.48:=
-	dev-libs/popt:=
-	>=x11-libs/gtk+-2.10:2=
-	berkdb? ( >=sys-libs/db-4:= )
-	dbus? ( >=dev-libs/dbus-glib-0.100:= )
-	libnotify? ( >=x11-libs/libnotify-0.7:= )
-	xfce_plugins_clock? ( >=xfce-base/xfce4-panel-4.10:= )"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	>=sys-devel/libtool-2.2.6
-	virtual/pkgconfig"
-
-pkg_setup() {
-	XFCONF=(
-		--libexecdir="${EPREFIX}/usr/$(get_libdir)"
-		--docdir="${EPREFIX}"/usr/share/doc/${PF}/html
-		$(use_enable xfce_plugins_clock libxfce4panel)
-		$(use_enable dbus)
-		$(use_enable libnotify)
-		$(use_with berkdb bdb4)
-		$(xfconf_use_debug)
-		)
-
-	DOCS=( AUTHORS ChangeLog NEWS README TODO )
-
-	# PM doesn't let directory to be replaced by a symlink, see src_install()
-	rm -rf "${EROOT}"/usr/share/${PN}/doc
-}
-
-src_install() {
-	xfconf_src_install \
-		docdir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		imagesdir="${EPREFIX}"/usr/share/doc/${PF}/html/images
-
-	# Create compability symlink for retarded path hardcoding in src/{mainbox,parameters}.c
-	dosym /usr/share/doc/${PF}/html /usr/share/${PN}/doc/C
-}
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index ba94a09c01ce..6b80d68e3915 100644
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
diff --git a/app-portage/portage-utils/Manifest b/app-portage/portage-utils/Manifest
index fec29f419701..2404fa90975d 100644
--- a/app-portage/portage-utils/Manifest
+++ b/app-portage/portage-utils/Manifest
@@ -9,6 +9,6 @@ DIST portage-utils-0.65.tar.xz 542804 BLAKE2B bddc1a0ffa52a8d871547e5f4cbbca254e
 EBUILD portage-utils-0.62.ebuild 2243 BLAKE2B 383eb4fa9791b2f9f99b6a71004a410342b1751b5e987f698f8a70df90fa1186ed6f91050788cfb68f983df5fece3be98da5b65cd7aa62678f1b534554e09736 SHA512 b6f941532e77f9670b7ccfcfb2fa8ef039335e88ccaeb6d32370aab032674435e1acfbc633a22ce98f736626351df77d8e2ee9bf6e5bdb37f0c6427c4fdc317b
 EBUILD portage-utils-0.63.ebuild 1190 BLAKE2B bc78f2a5ec957e2bb6a60f9377028579ca6fffffd4b46803d977dc463ea3e4dace74de224e5d88262a92e46b81882c6ded1bdb38595a5cbdf62ba4754bae5e3c SHA512 dcc3384a68e6f44066eb9eaa35909cca3076724939d38800d8a3290354dcf11809c19274605acf5f88423418ec76b9a0e8b7e1dcce2b19ef8f1e61f1dbab3a0f
 EBUILD portage-utils-0.64-r1.ebuild 1156 BLAKE2B f48b8b7f8022efc4139a3fef3e4972bc60bae01d1fe1406ed9fe28ed2ec57c0a3474be929f98d70fc0e063f5a9cd9bea5ae4b5427e54ba75fa1ed4e8fdbfb33d SHA512 f844f217e2e3c516813c53b1193af4f81c91c574a4bd29dacc66eb39eca52a4f63c94c607b191ff8285ef659f5fa353115271f01744106ee7030909533645f56
-EBUILD portage-utils-0.64.ebuild 1077 BLAKE2B 2de3751b36fc3020734f9b212bb2b5fb0957b194de836c71884c1a2315c58bb49b864885b598134fffd8e513b6b94325454ba7bb259872a8d8759b14944cfea2 SHA512 8a0a68ceacbbcf3d2430154de855999fef1a3f867127c704d7a33c634fa249f344c04412719e7810dc4289c3b0611bd8227b7ba37220933ab1858c73eb835bcb
+EBUILD portage-utils-0.64.ebuild 1076 BLAKE2B 7c628f6982c03850ce60c99d49dca418c5f64ab41461fff8a88fe591411d36b74e0f2a8b4044e9d09afd79b40836a26e86c5c8655c9b8a9d2ab8a0af47c0568a SHA512 3987f4f6fff46cfa493cfd18dcd76ef375625abc90de44031b42ba920c49c8c780a8c4e5f0ba5e75481db0beb466230664ed46bdcf9751a9dac7d47de181079d
 EBUILD portage-utils-0.65.ebuild 1092 BLAKE2B dc0f835b1e8e2065b6068fd011f2e6a953f046d366f46053dd534a3621379c68707b4612cbce46f74923a5535b280388c4cd3cc4b691826c08bb87d7c6b00ee6 SHA512 1b4a097f7408ebb6634d4b232ad3dc407b444c4dbb73b8d3b1c6b904cabddf0c3c53b4c51cd008355e7586f248fe663beff3a853dbfb847e29c7ab82c16ed390
 MISC metadata.xml 248 BLAKE2B 60e4295b22f6f36039547e98305ae072755044f6516df2e29e65768732900ffc93dac9cbcf1da9e6c731403a62cf272f2f378d0641bd466974f8a234235c862a SHA512 f6fee7363592cb9dcd666011806321b791fb84bf0719fb2454d1f3ceb738650184286c17a13684c077bacd1a93581a71accfe9cef74adcaf40dfda7d8a167d13
diff --git a/app-portage/portage-utils/portage-utils-0.64.ebuild b/app-portage/portage-utils/portage-utils-0.64.ebuild
index 9fae38417f20..b56d5c2a0f0e 100644
--- a/app-portage/portage-utils/portage-utils-0.64.ebuild
+++ b/app-portage/portage-utils/portage-utils-0.64.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${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 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls static"
 
 RDEPEND="dev-libs/iniparser:0"
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index a1e31f3c8877..b24e42dfe064 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/enchant/Manifest b/app-text/enchant/Manifest
index 0293578e5b98..18d5c967f920 100644
--- a/app-text/enchant/Manifest
+++ b/app-text/enchant/Manifest
@@ -1,12 +1,9 @@
-AUX enchant-1.6.0-hunspell140_fix.patch 372 BLAKE2B 5b69bfb93d411ea5fec0db3e045c240d9ed31a5f503bf28223995436e41ae86e90e74d9f84aa0da42a219b6084b8c360d08ef33a827c7e2469dce0059203b50f SHA512 94dd08fe828ba1fb7f043a0a277855988d3efb4f9ddd00da839833582f79986f09f7aec66a980641737dbce1b7302b6f6f7bfee7ac80db66dafdd5fcbf74c3fd
 AUX enchant-1.6.0-hunspell150_fix.patch 577 BLAKE2B dc57f0fd5a90ba36abe174949060b20c709f920aa7ef29e1560f4a194d744064f59ae7c812cc27debe30c1082a9f76d3eac8723f850803c5eb06c213fe39e91d SHA512 893620f45a1dd7956aef9f3517186a9226c00e6b85df4770d6ea388fc08854e7884143fe3c7a064c7ec4f8353a9b9571d0c07da22df5c6ee41fc4c6bbce5874f
 AUX enchant-2.1.0-hunspell150_fix.patch 783 BLAKE2B 514f18e5c6138ef069e668c3af554ec64f2087b1226ea6fa9912bb68fe84c26cee47b46ababbd55da1e5a371d889620a886fffeb14a5d4fb87facb4b4d98c943 SHA512 a8406777511f458f47a97c2c8246445abd05d611413beb0c9ad6e756418e5930f8516857c58193a14b700f1f539feb5c819881ea97d71d07839ebca0d3576994
-DIST enchant-1.6.0.tar.gz 607018 BLAKE2B 623473ddc9fdddbfd7ce4861ec22ab8d4d4f790ee29b189056a809783fbd2a4f42c45ac3865a5533d9ea8be26a6825bc7ae957ee6e8a04db693791d1a9070a30 SHA512 0ca1634bb783df51512df4abecc89abdadee6baf7330d6e5f90cc15d10779896a3521a1c079ecc07e4df4f7a018ce398cca9d0125a7845a314a059840ebc9137
 DIST enchant-1.6.1.tar.gz 642124 BLAKE2B d41aa9b313e7fe8b0887728b55f3c5218e270c7359b4edcdc8d9180af68687230bcc9f7d1abb9f85ac673478530e5674366c9bc7d08b983e7226725b2cdd73d3 SHA512 26c62dfa89ee40150db502651a2f876fba00569b7015f205dae27a029557effacff335bbe36124dbe6686537da2305bcab02592179d03e95fdf9741d54b98036
 DIST enchant-2.1.0.tar.gz 962857 BLAKE2B f1ee729f20f06c14cbe81c27eeff5ff3bfe9e815bdf278c0c5e27ab48a78301e0731cfc2a55d065cfc702b5939623e352817a3fa6102636bca6779a8903ce537 SHA512 5dee7c5693ffc4ca0933e0881ca6e1f6bab1553af79cadf29733589790c6626db524cf33b0008b3de4c48e122ed93929478cce35608d9a52ab71edb51f598f27
 DIST enchant-2.1.1.tar.gz 961821 BLAKE2B 1aaedc16e2108a382390c9401233d6a77dcff8732fb0af1a35816993b8eb127f22f9e6f4359b997f6793f53dd37c50c1c69d2aa09cf53bb5c47baa47277e044e SHA512 5cb57198ea826da6d9ed9042edca87fcca9b811e8e75b382ed1568c5b1d8d4f8d6ba732a167c8d52261cfce540f23f84bd4d2889a4beafd2db1d8509c0b6bc15
 DIST enchant-2.1.2.tar.gz 963236 BLAKE2B 3adaf9d96c7e2d7c5e31fe31ac426230f2e88b1cd6f68157e11f13c30fc5c161723d5a5b40bbe158307ce7352e098cd22272f4a75786854f7d82a0c5694b0f2b SHA512 6cb2eeccc617c005998b16ebc33a84a05cec116b26fd679fc1416110821a85a16605c8564672e1168ac6c865cfcca6680005d1219aa615ca1c2393bd523ae0c4
-EBUILD enchant-1.6.0.ebuild 1560 BLAKE2B 0162350ad36f2da271759e69c9acc0bbd8f793ef00069406a35320673991a644ed4171a32b73e01e2c243054fe9c38768f008e8bd30c6c0fdaf5aecd5cf46420 SHA512 e800eb39c1df85310236f1a760a218539622dc6670856482009efd2d7609b748e79f2a0aeb4fa565a17420226ebc7c7c87a4860e6e749b2b6d677ae308fa695f
 EBUILD enchant-1.6.1.ebuild 1617 BLAKE2B 0e415614ffc9ef2409e3af37139d526a4aea13ab6bcfcbf2ef72895d48702848ba4f5127a5fcc83352ff54aed1ad2581c62d3f92c12d13028a394416a1c2f90f SHA512 488c7f69923514abdd294544710f69abc3bcef748a700b88209946e406ee61db7e26d1569a273a199d0d8d89a811199931af24f1f98a4f2a4a10956e80c0a58a
 EBUILD enchant-2.1.0.ebuild 1432 BLAKE2B b8b7276367b64a99e7010f7f4fcde09a050b3dc9a153349621df459dc5aefda583ab6a91898c247b57a5f75602970f9fa802cacb6727a788adde2b89862b3722 SHA512 4131394259cc3280717fb1f6ebd7334289c0209d21af7659ce412f4124a537d7b920e2d4b6f72e1ec6303e5e53238209ad5dfd37e5c011ffe32c9557084ceaf1
 EBUILD enchant-2.1.1.ebuild 1291 BLAKE2B 5292cda24db259c234bd3f2f7b7d30b5c64a1f36bf0031aa4a4359d061f371669e860b8879036f40af48d2fb2198576cfcfe6e2f1682667e16315499a7030c24 SHA512 f5ceb6c6114864facef4a56da39a17324a86880c680fae23acc0617e97223ab9ac36996f2aae55bfbfb5f0861263c272969f93dae17f82bfe61601b232b26266
diff --git a/app-text/enchant/enchant-1.6.0.ebuild b/app-text/enchant/enchant-1.6.0.ebuild
deleted file mode 100644
index 5a4e593dc79c..000000000000
--- a/app-text/enchant/enchant-1.6.0.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 autotools
-
-DESCRIPTION="Spellchecker wrapping library"
-HOMEPAGE="http://www.abisource.com/enchant/"
-SRC_URI="http://www.abisource.com/downloads/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-
-IUSE="aspell +hunspell static-libs zemberek"
-REQUIRED_USE="|| ( hunspell aspell zemberek )"
-
-COMMON_DEPENDS="
-	dev-libs/glib:2
-	aspell? ( app-text/aspell )
-	hunspell? ( >=app-text/hunspell-1.2.1:0= )
-	zemberek? ( dev-libs/dbus-glib )
-"
-RDEPEND="${COMMON_DEPENDS}
-	zemberek? ( app-text/zemberek-server )
-"
-DEPEND="${COMMON_DEPENDS}
-	virtual/pkgconfig
-"
-
-DOCS="AUTHORS BUGS ChangeLog HACKING MAINTAINERS NEWS README TODO"
-
-PATCHES=(
-	# http://bugzilla.abisource.com/show_bug.cgi?id=13772
-	"${FILESDIR}/${P}-hunspell140_fix.patch"
-	"${FILESDIR}/${P}-hunspell150_fix.patch"
-)
-
-src_prepare() {
-	default
-	sed -i \
-		-e 's:noinst_PROGRAMS:check_PROGRAMS:' \
-		tests/Makefile.am || die
-	mv configure.in configure.ac || die
-	AT_M4DIR=ac-helpers eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable aspell) \
-		$(use_enable hunspell myspell) \
-		$(use_with hunspell system-myspell) \
-		$(use_enable static-libs static) \
-		$(use_enable zemberek) \
-		--disable-ispell \
-		--with-myspell-dir="${EPREFIX}"/usr/share/myspell/
-}
-
-src_install() {
-	default
-	prune_libtool_files --modules
-}
diff --git a/app-text/enchant/files/enchant-1.6.0-hunspell140_fix.patch b/app-text/enchant/files/enchant-1.6.0-hunspell140_fix.patch
deleted file mode 100644
index 5d58ab7f540c..000000000000
--- a/app-text/enchant/files/enchant-1.6.0-hunspell140_fix.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-https://bugs.gentoo.org/583486
-http://bugzilla.abisource.com/show_bug.cgi?id=13772
-
---- enchant-1.6.0/src/myspell/myspell_checker.cpp
-+++ enchant-1.6.0/src/myspell/myspell_checker.cpp
-@@ -148,6 +148,10 @@
- 		g_iconv_close(m_translate_out);
- }
- 
-+#ifndef MAXWORDLEN
-+#   define MAXWORDLEN 100
-+#endif
-+
- bool
- MySpellChecker::checkWord(const char *utf8Word, size_t len)
- {
diff --git a/app-text/texlive-core/Manifest b/app-text/texlive-core/Manifest
index d37b67519f81..1c5e59b5e126 100644
--- a/app-text/texlive-core/Manifest
+++ b/app-text/texlive-core/Manifest
@@ -443,5 +443,5 @@ EBUILD texlive-core-2015-r1.ebuild 10925 BLAKE2B 85715b6526c34cb996854834f70687c
 EBUILD texlive-core-2016-r5.ebuild 11555 BLAKE2B a518636f0d5ab05d7e76a5200e2ba94bb8a0c8d76c37193b31789c8176b32bb2142cf5616c5a278732c110914be82636f0598e3e4c9234187d38f049f4cc68e6 SHA512 8d17485bea8ed2f0da0b5a3443c38f8e1d78daba639033042464c609432f42a574264920b673e732193efc6a9522c015c8ca9a1529577b5c6a01551a39864237
 EBUILD texlive-core-2016-r6.ebuild 11559 BLAKE2B 62eb372349d8fc877bb190cf3439b9cc3f3585167847fac7a744ccfa18a64eb801c6861c59eab11197992f0507a1691ec76ddf250275b73aee2e6dfa17e42686 SHA512 0c8c4ec5898b29cabdba2b7c4cbf9c209de9caa23ce465d7586466e2656d460ab205f8f3295df8799b5c50cae1a83a0adec9416bd58bed976ded0d2236437f62
 EBUILD texlive-core-2017-r2.ebuild 11637 BLAKE2B d2b7e0b062a14232492e21e7a7c2d747e054888091da79786d03898d7ab0eda2410ffe9fc9533c79b844c1ec4dd96cc8ac8610ad3428a9e16d1bcaff8421ac15 SHA512 2298ae898b67362cc5bb3c56bec13f105f0124980e26da8aaaca2ffc21edc04eac6cf7a755f1867f85835a98c00865656f9b97e741bea8dec22aac841e2e727c
-EBUILD texlive-core-2017-r3.ebuild 11600 BLAKE2B a59a60e3b74ecc65d4302e67620086d674eabc2e0793717624f8b030d1f4f8265dd6e9f7f6bb78f6f14b54ee90ea2010f5883b44c89ca27e93254b0c6c10599f SHA512 c91fcd999d05fdffee29d52decfce3a5f8fb5c99712301b1d111c11a63068dd3287849787eacf003fad1b5f20478a512b6f733f3caffcf27d63fb1e34b18584d
+EBUILD texlive-core-2017-r3.ebuild 11599 BLAKE2B 39dd15fbf589a2bcc200f2b8812450e7116c9e0267212d67d2d8f671a3c0552b7ed6fcafaf357fe40db612932721c704f1c1bc230c801d68f10ad235bb9596bd SHA512 4bdf294aa199ea14b9dfd43c5bb151022d81b33790a3fa309c76735d0b1a7918cd05658543f3b87bc065506a98f1b5535d2faee849002486f80747e8f3d10e99
 MISC metadata.xml 661 BLAKE2B 23fd3817c5a9861b9adec9a78b6dcae0a23743cf685560a86a991896ed8f102fe66aa15a416939829c0c085cdfee24668f7a07631b3f4aeee469002f35b481e6 SHA512 c00ae9537fced06990a4ffff5fbe5101670ce1d84c879c0e9eeaf5c979107dd6a1f92f8f8271731b6c4818abead15b759fc9958ece317e554effbd3cb23fd2b9
diff --git a/app-text/texlive-core/texlive-core-2017-r3.ebuild b/app-text/texlive-core/texlive-core-2017-r3.ebuild
index b457a81d498d..47ea8a2715fe 100644
--- a/app-text/texlive-core/texlive-core-2017-r3.ebuild
+++ b/app-text/texlive-core/texlive-core-2017-r3.ebuild
@@ -74,7 +74,7 @@ for i in ${TL_CORE_EXTRA_SRC_MODULES}; do
 done
 SRC_URI="${SRC_URI} )"
 
-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 ~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 ~x64-solaris ~x86-solaris"
 IUSE="cjk X doc source tk +luajittex xetex"
 
 TEXMF_PATH=/usr/share/texmf-dist
diff --git a/app-text/texlive/Manifest b/app-text/texlive/Manifest
index 462dc54eaee5..15064d224d08 100644
--- a/app-text/texlive/Manifest
+++ b/app-text/texlive/Manifest
@@ -1,3 +1,2 @@
-EBUILD texlive-2016.ebuild 7545 BLAKE2B e6924aa445756dbd686f8f87cb717bcc444fbc39ecbebd4828efcae10f25a88fddcf8a9649a97b485996fb8df54fda0556de9cbe38d1a9e631f1bd07e0a5f4c1 SHA512 f5306d3c4031cd7095e27e41990f57dd8f8a5bc4045ab4ef4ed40f9ab7b3bfe656ab8d531c1aa527f316895eadc774dcb3ccc81724b176794e89dcce726b100b
-EBUILD texlive-2017.ebuild 7399 BLAKE2B 85e8eefc6c9ac47ac454c1af537056938d48d8e747aa3a81bb0c9af69c777d3a40cce2c036e7034f57bab2352a6df10bd709658fb625ad09d597d7de8a2505cf SHA512 8ab987de9562f1088676e147f44026d7115aee978f2e2d99655debbf7100d135e849fa4afa84a8ee0c8b5a723aa09c0d203985c3bfdbe5e1dc36d2bb23209e04
-MISC metadata.xml 2501 BLAKE2B 973dc4c6f9f8bcd51246dc345a9462708c0272604f95e38789f2583c25fc1305fc38a602389bf41d821d5b9aafb7e5ca25cd0554741d0121c8c62446842ea39b SHA512 0a7fc544e4e52ce62503217fa1257813694701dfd4b4e170b19e3bcff698e87f97e586e7a6c4879fba8f27c8478efc211e538eefaf19a46488b4f1ddbd8312e0
+EBUILD texlive-2017.ebuild 7398 BLAKE2B 4c5ac79bcbcd2040173c421b393f68cbb7ab04dbfc6645d3f16045eecde200fa51823cedf18cfc59c39b2e846947709032291f244222edef88c3f917e721577c SHA512 ba2b1ba89b6bf8057c2c76f043787388366db257fc3ada906e335cfb777535263efd2b2b6f0a03210406266a6ffe14e872b91565887b1943891a2b20ff1a271e
+MISC metadata.xml 2415 BLAKE2B 1fb6dabb9b4088f40a28a72fdede6881207e88cbce65cb460cd5f54fd502f81ce9c4debc713ee4cfd70f5ff78cc3287684cb33e921daaab183a6ff6e58c3904e SHA512 953558d744b62e19cc82426ae1ec16d2b659cf504c3ae9903d51a66e716ba74d91202c100c79d0db8fa411e3492f4ae952a975bfad93ab3c21a5ff86b391b75f
diff --git a/app-text/texlive/metadata.xml b/app-text/texlive/metadata.xml
index f6b35288f4e7..b5f97187a8d3 100644
--- a/app-text/texlive/metadata.xml
+++ b/app-text/texlive/metadata.xml
@@ -18,7 +18,6 @@
 		<flag name="luatex">Add extra support for luatex</flag>
 		<flag name="metapost">Add support for metapost: A tool for creating graphics in scalable PostScript</flag>
 		<flag name="music">Add support for music typesetting (<pkg>dev-texlive/texlive-music</pkg>)</flag>
-		<flag name="omega">Add omega packages (<pkg>dev-texlive/texlive-omega</pkg>)</flag>
 		<flag name="pdfannotextractor">Add <pkg>dev-tex/pdfannotextractor</pkg> support, for extracting annotations from PDF files</flag>
 		<flag name="pstricks">Add pstricks packages (<pkg>dev-texlive/texlive-pstricks</pkg>)</flag>
 		<flag name="publishers">Add support for publishers (<pkg>dev-texlive/texlive-publishers</pkg>)</flag>
diff --git a/app-text/texlive/texlive-2016.ebuild b/app-text/texlive/texlive-2016.ebuild
deleted file mode 100644
index 6558dfacd64a..000000000000
--- a/app-text/texlive/texlive-2016.ebuild
+++ /dev/null
@@ -1,168 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-DESCRIPTION="A complete TeX distribution"
-HOMEPAGE="http://tug.org/texlive/"
-SRC_URI=""
-
-LICENSE="metapackage"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="cjk context detex dvi2tty extra epspdf games graphics
-humanities jadetex luatex metapost music omega pdfannotextractor png pstricks publishers
-science tex4ht texi2html truetype xetex xindy xml X"
-
-LANGS="af ar as bg bn br ca cs cy da de el en en-GB eo es et eu fa fi fr ga gl
-	gu he hi hr hsb hu hy ia id is it ja ko kn la lo lt lv ml mn mr nb nl nn no
-	or pa pl pt rm ro ru sa sco sk sl sq sr sv ta te th tk tr uk vi zh"
-
-for X in ${LANGS}; do
-	IUSE="${IUSE} l10n_${X}"
-done
-
-TEXLIVE_CAT="dev-texlive"
-
-DEPEND=">=app-text/texlive-core-${PV}"
-RDEPEND="${DEPEND}
-	app-text/psutils
-	>=${TEXLIVE_CAT}/texlive-fontutils-${PV}
-	media-gfx/sam2p
-	texi2html? ( app-text/texi2html )
-	sys-apps/texinfo
-	app-text/t1utils
-	>=app-text/lcdf-typetools-2.92[kpathsea]
-	truetype? ( >=app-text/ttf2pk2-2.0_p20150521 )
-	detex? ( dev-tex/detex )
-	app-text/ps2eps
-	dvi2tty? ( dev-tex/dvi2tty )
-	png? ( app-text/dvipng )
-	X? ( >=app-text/xdvik-22.87 )
-	>=${TEXLIVE_CAT}/texlive-basic-${PV}
-	>=${TEXLIVE_CAT}/texlive-fontsrecommended-${PV}
-	>=${TEXLIVE_CAT}/texlive-latex-${PV}
-	luatex? ( >=${TEXLIVE_CAT}/texlive-luatex-${PV} )
-	>=${TEXLIVE_CAT}/texlive-latexrecommended-${PV}
-	>=dev-tex/xcolor-2.11
-	>=dev-tex/latex-beamer-3.36
-	metapost? (
-		>=${TEXLIVE_CAT}/texlive-metapost-${PV}
-			dev-tex/feynmf
-	)
-	>=${TEXLIVE_CAT}/texlive-genericrecommended-${PV}
-	pdfannotextractor? ( dev-tex/pdfannotextractor )
-	extra? (
-		dev-tex/chktex
-		app-text/dvisvgm
-		dev-tex/latexdiff
-		>=dev-tex/latexmk-418
-		>=app-text/pdfjam-2.02
-		>=${TEXLIVE_CAT}/texlive-bibtexextra-${PV}
-		>=${TEXLIVE_CAT}/texlive-fontsextra-${PV}
-		>=${TEXLIVE_CAT}/texlive-formatsextra-${PV}
-		>=${TEXLIVE_CAT}/texlive-genericextra-${PV}
-		>=${TEXLIVE_CAT}/texlive-latexextra-${PV}
-			>=dev-tex/glossaries-2.07
-			>=dev-tex/leaflet-20041222
-			>=dev-tex/currvita-0.9i-r1
-			>=dev-tex/g-brief-4.0.2
-			>=dev-tex/envlab-1.2-r1
-			>=dev-tex/europecv-20060424-r1
-			>=dev-tex/svninfo-0.7.3-r1
-		>=${TEXLIVE_CAT}/texlive-plainextra-${PV}
-	)
-	xetex? ( >=${TEXLIVE_CAT}/texlive-xetex-${PV} )
-	graphics? ( >=${TEXLIVE_CAT}/texlive-pictures-${PV}
-		dev-tex/dot2texi )
-	epspdf? ( app-text/epspdf )
-	science? ( >=${TEXLIVE_CAT}/texlive-mathscience-${PV} )
-	publishers? ( >=${TEXLIVE_CAT}/texlive-publishers-${PV} )
-	music? ( >=${TEXLIVE_CAT}/texlive-music-${PV} )
-	pstricks? ( >=${TEXLIVE_CAT}/texlive-pstricks-${PV} )
-	omega? ( >=${TEXLIVE_CAT}/texlive-omega-${PV} )
-	context? ( >=${TEXLIVE_CAT}/texlive-context-${PV} )
-	games? ( >=${TEXLIVE_CAT}/texlive-games-${PV} )
-	humanities? ( >=${TEXLIVE_CAT}/texlive-humanities-${PV} )
-	tex4ht? ( >=dev-tex/tex4ht-20090611_p1038-r3 )
-	xml? (
-		>=dev-tex/xmltex-1.9-r2
-		app-text/passivetex
-	)
-	jadetex? ( >=app-text/jadetex-3.13-r2 )
-	l10n_af?    ( >=${TEXLIVE_CAT}/texlive-langafrican-${PV}
-	              >=${TEXLIVE_CAT}/texlive-langother-${PV} )
-	l10n_ar?    ( >=${TEXLIVE_CAT}/texlive-langarabic-${PV} )
-	l10n_fa?    ( >=${TEXLIVE_CAT}/texlive-langarabic-${PV} )
-	l10n_hy?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	cjk? ( >=${TEXLIVE_CAT}/texlive-langcjk-${PV}
-		   >=dev-tex/cjk-latex-4.8.4 )
-	l10n_hr?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	l10n_bg?    ( >=${TEXLIVE_CAT}/texlive-langcyrillic-${PV} )
-	l10n_br?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	l10n_ru?    ( >=${TEXLIVE_CAT}/texlive-langcyrillic-${PV} )
-	l10n_uk?    ( >=${TEXLIVE_CAT}/texlive-langcyrillic-${PV} )
-	l10n_cs?    ( >=${TEXLIVE_CAT}/texlive-langczechslovak-${PV}
-	              >=app-text/vlna-1.3 )
-	l10n_sk?    ( >=${TEXLIVE_CAT}/texlive-langczechslovak-${PV} )
-	l10n_da?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	l10n_nl?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	l10n_en?    ( >=${TEXLIVE_CAT}/texlive-langenglish-${PV} )
-	l10n_en-GB? ( >=${TEXLIVE_CAT}/texlive-langenglish-${PV} )
-	l10n_fi?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	l10n_eu?    ( >=${TEXLIVE_CAT}/texlive-langfrench-${PV} )
-	l10n_fr?    ( >=${TEXLIVE_CAT}/texlive-langfrench-${PV} )
-	l10n_de?    ( >=${TEXLIVE_CAT}/texlive-langgerman-${PV} )
-	l10n_el?    ( >=${TEXLIVE_CAT}/texlive-langgreek-${PV} )
-	l10n_he?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
-	l10n_hu?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	l10n_as?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
-	l10n_bn?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
-	l10n_gu?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
-	l10n_hi?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
-	l10n_kn?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
-	l10n_ml?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
-	l10n_mr?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
-	l10n_or?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
-	l10n_pa?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
-	l10n_sa?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
-	l10n_ta?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
-	l10n_te?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
-	l10n_it?    ( >=${TEXLIVE_CAT}/texlive-langitalian-${PV} )
-	l10n_ja?    ( >=${TEXLIVE_CAT}/texlive-langjapanese-${PV} )
-	l10n_ko?    ( >=${TEXLIVE_CAT}/texlive-langkorean-${PV} )
-	l10n_la?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	l10n_lt?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	l10n_lv?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	l10n_mn?    ( >=${TEXLIVE_CAT}/texlive-langcyrillic-${PV} )
-	l10n_nb?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	l10n_nn?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	l10n_no?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	l10n_cy?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	l10n_eo?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
-	l10n_et?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	l10n_ga?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	l10n_rm?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	l10n_hsb?   ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
-	l10n_ia?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
-	l10n_id?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
-	l10n_is?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	l10n_lo?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
-	l10n_ro?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	l10n_sq?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	l10n_sr?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV}
-	              >=${TEXLIVE_CAT}/texlive-langcyrillic-${PV} )
-	l10n_sl?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	l10n_tr?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	l10n_pl?    ( >=${TEXLIVE_CAT}/texlive-langpolish-${PV} )
-	l10n_pt?    ( >=${TEXLIVE_CAT}/texlive-langportuguese-${PV} )
-	l10n_ca?    ( >=${TEXLIVE_CAT}/texlive-langspanish-${PV} )
-	l10n_gl?    ( >=${TEXLIVE_CAT}/texlive-langspanish-${PV} )
-	l10n_es?    ( >=${TEXLIVE_CAT}/texlive-langspanish-${PV} )
-	l10n_sco?   ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	l10n_sv?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	l10n_tk?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	l10n_vi?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
-	l10n_zh?    ( >=${TEXLIVE_CAT}/texlive-langchinese-${PV} )
-	xindy? ( app-text/xindy )
-"
diff --git a/app-text/texlive/texlive-2017.ebuild b/app-text/texlive/texlive-2017.ebuild
index f29ab23a5578..7348bdfa473e 100644
--- a/app-text/texlive/texlive-2017.ebuild
+++ b/app-text/texlive/texlive-2017.ebuild
@@ -9,7 +9,7 @@ SRC_URI=""
 
 LICENSE="metapackage"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~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 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="cjk context detex dvi2tty extra epspdf games graphics
 humanities jadetex luatex metapost music pdfannotextractor png pstricks publishers
 science tex4ht texi2html truetype xetex xindy xml X"
diff --git a/app-text/xfbib/Manifest b/app-text/xfbib/Manifest
index e439829cc5d1..9bafc32ea749 100644
--- a/app-text/xfbib/Manifest
+++ b/app-text/xfbib/Manifest
@@ -1,6 +1,4 @@
-AUX xfbib-0.0.2-libxfce4ui.patch 2662 BLAKE2B 261e9de735f6872ad30675af2073a6535776847a110ad9d752e71d030820bb2181a893be674b10c585634f62d81c304afb2b52d6bd97b3ab62f240548c7e69ec SHA512 0fadc92daf23de69e8074870933a98c60dfd91d1d505299fbcd0c774a01cce4c81b00b0c08c37f8609a85897cf9b4d3ace5b08c5694ea246baa46bfc70394d2b
 AUX xfbib-0.0.2-validate.patch 349 BLAKE2B 282c326fe8f80039a10930777a063bd556447617c74dcd7ccee8ab0572169521029246e4ac2728b8188c19dff41d5c4df0027d338f454fdf0f66f625f819d1de SHA512 fffd683dc018889793dc9371c756ec89c89d7de0a1c863aba9bac3fad8660baf16688b02831f83c07642de401c134ed86b62e34c95018c8836c714ad2fe89035
 DIST xfbib-0.0.2.tar.bz2 340703 BLAKE2B 4f15fb39fc55e06b5cde8961db27661f3f2f2e954e52e809105fb7f3326f54c63e63acb6fa21585da8a5aa340eafd4bc33df73822fe9f6ac7a04e67d95db6e0a SHA512 7f6f812bfdb6b95574f66b63e51fb1a70ce20fd795b6070b055cdc8e753656a266237be92a7e60865d9f1e5fa750be0af3404ecf219a8a5d89dde505c759aebc
-EBUILD xfbib-0.0.2-r1.ebuild 926 BLAKE2B 2f972986b3b315c28ef6eefa1a40137525501dd0b7c5c112378b3ff0ef6d9c8a291a2d1897aebb794473fb444ac18e2315ae6c5e32c6cd519c9952be323d4f2c SHA512 b41007e3fe8929163c416b1ef13ecfb90dbecd270005f47d7a756861a9ad23a82686ff94a665390f6bd061f3b80fdbafbe43b494413e025f7889245fd8673fee
 EBUILD xfbib-0.0.2-r2.ebuild 859 BLAKE2B ac797067144696fbb734d69018fdd6aafbe93c108ab7c084a4bc72166d154e2ca0ee5ba2681e4ef348ba6a179b21ba06d9ca1f4499a76004d70fbb9df14b3cfa SHA512 117d12c679e6fa9e6b1f9c730deafdcbf81d210e2d82f104f116f141016527239b7b387d45b0bcb66742a4f63a2adf916fb497e3f7a26e8226a9961813010f66
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/app-text/xfbib/files/xfbib-0.0.2-libxfce4ui.patch b/app-text/xfbib/files/xfbib-0.0.2-libxfce4ui.patch
deleted file mode 100644
index 0759dbf4e61d..000000000000
--- a/app-text/xfbib/files/xfbib-0.0.2-libxfce4ui.patch
+++ /dev/null
@@ -1,106 +0,0 @@
-http://bugzilla.xfce.org/show_bug.cgi?id=9568
-
---- src/entry_edit_dialog.c
-+++ src/entry_edit_dialog.c
-@@ -17,7 +17,7 @@
- #include <stdlib.h>
- #include <string.h>
- #include <config.h>
--#include <libxfcegui4/libxfcegui4.h>
-+#include <libxfce4ui/libxfce4ui.h>
- 
- #include "entry_edit_dialog.h"
- #include "entry.h"
-@@ -589,11 +589,13 @@
- 			key = (char *) gtk_entry_get_text(GTK_ENTRY(key_entry));
- 			if ((type = gtk_combo_box_get_active_text(GTK_COMBO_BOX(combobox))) == NULL) {
- 				_DEBUG(("No type selected"));
--				xfce_warn(_("No type was selected"));
-+				/* xfce_warn(_("No type was selected")); */
-+				xfce_dialog_show_warning(NULL,NULL,_("No type was selected"));
- 				continue;
- 			} else if (strcmp(key, "") == 0) {
- 				_DEBUG(("No key selected"));
--				xfce_warn(_("No key was selected"));
-+				/* xfce_warn(_("No key was selected")); */
-+				xfce_dialog_show_warning(NULL,NULL,_("No key was selected"));
- 				continue;
- 			} else {
- 				if (selected == NULL) {
---- src/menubar.c
-+++ src/menubar.c
-@@ -15,7 +15,7 @@
-  */
- 
- #include <gtk/gtk.h>
--#include <libxfcegui4/libxfcegui4.h>
-+#include <libxfce4ui/libxfce4ui.h>
- #include <libintl.h>
- #include <config.h>
- 
---- src/open.c
-+++ src/open.c
-@@ -14,7 +14,7 @@
-  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-  */
- 
--#include <libxfcegui4/libxfcegui4.h>
-+#include <libxfce4ui/libxfce4ui.h>
- #include <config.h>
- #include <string.h>
- #include <stdlib.h>
---- src/open_dialog.c
-+++ src/open_dialog.c
-@@ -14,7 +14,7 @@
-  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-  */
- 
--#include <libxfcegui4/libxfcegui4.h>
-+#include <libxfce4ui/libxfce4ui.h>
- #include <libintl.h>
- #include <string.h>
- #include <stdlib.h>
---- src/save_dialog.c
-+++ src/save_dialog.c
-@@ -15,7 +15,7 @@
-  */
- 
- #include <libintl.h>
--#include <libxfcegui4/libxfcegui4.h>
-+#include <libxfce4ui/libxfce4ui.h>
- #include <config.h>
- 
- #include "xfbib.h"
---- src/string_edit_dialog.c
-+++ src/string_edit_dialog.c
-@@ -15,7 +15,7 @@
-  */
- 
- #include <gtk/gtk.h>
--#include <libxfcegui4/libxfcegui4.h>
-+#include <libxfce4ui/libxfce4ui.h>
- 
- #include "debug.h"
- #include "strings.h"
---- src/treeview.c
-+++ src/treeview.c
-@@ -14,7 +14,7 @@
-  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-  */
- 
--#include <libxfcegui4/libxfcegui4.h>
-+#include <libxfce4ui/libxfce4ui.h>
- #include <libintl.h>
- #include <config.h>
- #include <string.h>
---- src/xfbib.c
-+++ src/xfbib.c
-@@ -20,7 +20,7 @@
- 
- #include <gtk/gtk.h>
- #include <stdlib.h>
--#include <libxfcegui4/libxfcegui4.h>
-+#include <libxfce4ui/libxfce4ui.h>
- #include <libintl.h>
- 
- #include "window.h"
diff --git a/app-text/xfbib/xfbib-0.0.2-r1.ebuild b/app-text/xfbib/xfbib-0.0.2-r1.ebuild
deleted file mode 100644
index 2447fd8df262..000000000000
--- a/app-text/xfbib/xfbib-0.0.2-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit xfconf
-
-DESCRIPTION="a lightweight BibTeX editor"
-HOMEPAGE="https://goodies.xfce.org/projects/applications/xfbib"
-SRC_URI="https://goodies.xfce.org/releases/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2.12
-	>=x11-libs/gtk+-2.10:2
-	>=xfce-base/libxfce4ui-4.8
-	>=xfce-base/libxfce4util-4.8"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-pkg_setup() {
-	PATCHES=(
-		"${FILESDIR}"/${P}-validate.patch
-		"${FILESDIR}"/${P}-libxfce4ui.patch
-		)
-
-	DOCS=( AUTHORS ChangeLog NEWS README TODO )
-}
-
-src_prepare() {
-	# This is to prevent eautoreconfigure:
-	sed -i -e 's:libxfcegui4-1.0:libxfce4ui-1:' configure || die
-	sed -i -e 's:$(LIBXFCE4UTIL_CFLAGS):& $(LIBXFCEGUI4_CFLAGS):' src/Makefile.in || die
-
-	xfconf_src_prepare
-}
diff --git a/app-vim/Manifest.gz b/app-vim/Manifest.gz
index ab9a86fc7334..22be512d3e25 100644
--- a/app-vim/Manifest.gz
+++ b/app-vim/Manifest.gz
diff --git a/app-vim/airline/Manifest b/app-vim/airline/Manifest
index 06462fcd2228..9910c89e4d3f 100644
--- a/app-vim/airline/Manifest
+++ b/app-vim/airline/Manifest
@@ -1,4 +1,6 @@
 DIST airline-0.8.tar.gz 52767 BLAKE2B 908489fca1fb31d0ee41f279b146046d50c9069055bb13645b049c4333984f0ca180315e50fe3fda13e36780dffa0b213719babbbcd2b27defd60470a05dbc2f SHA512 51ae20f7e5b869f714e9c21ab6ab8af4d2de31b3cf4fe9f6bd64e75e87e7796184d41ddd9536f3e41dcc93e9ca6aad684b286df6e5d8d6eae202f91ed8851292
+DIST airline-0.9.tar.gz 72660 BLAKE2B d6c9762d8140b2a88a001b9ea3ae62c3c9147ccf3db90146d7fded8dcbc6062bf97c0725baa79db9d7bfe0eeaa5dc00ddfabde8ed1b9aec7f5aa24c41b11d1f2 SHA512 f3fd03c7ab6603eee6e892a1b88888d72fc43cf0a8582ad7e65152cddebb0d14be3a805529fa5467fc82e040cce2616f1693bf294c892c0849d9fb51cbbd04ec
 EBUILD airline-0.8.ebuild 751 BLAKE2B 8be15c3264b648a0b319e9d716d98bb8cab064c50afcc7b13262b59fb620ae9421df11a6ab096e506f9aad84d95c7a79bcf12d6ae4d412137c2afc75e62dbc71 SHA512 b394b5a818dfb48ef8564b30b4c16bd6fa786f0975bb7bd5a3c8698d8f3138dc18191c78cc3e2f0581154927d8aafdb3ba7381f7c02f70eaf0e6df0543ed5ce9
-EBUILD airline-9999.ebuild 750 BLAKE2B 620145a57cca1495b5b7684adcb2f44ea61fad984d6a13e8514a77eb726c412c3069b1dd1c945d471f0ec80c4ca7d95fadd57f6db66d205978d6950cb0334e6c SHA512 be985fceda4bfb738887e6139fb4d21a984ef21959080566f4d269efa8602271e9dd96eec6e29fdbbb64837bf641610efb9a766d3afaba8816a406e9eeddc9ea
+EBUILD airline-0.9.ebuild 761 BLAKE2B 8765adadb622edda9254aa516563a3230f1088a811a610ce6d9571092cfb3b29c5f2b082ea3adba859b6685a29a0b8c93c52618ba1d8a0ddd21534ae587c8afe SHA512 f3cc5f2451af1779c231ce82d955ac6a44fad7d5819e305353d1f1f8f2094207b3e2c6b0a7f6cf7403eac9456761151b414acb74967848e9bb02e9920ce621da
+EBUILD airline-9999.ebuild 751 BLAKE2B 89604ccbf2b4938134a3b7174355ef8e553b1454659d5e368d6d8fb1c57d67ba4982c5bae2e94a2b89652039bb86f6deb6b5e6be754675f277c67760b611e254 SHA512 9d8dcdd96b4e739fbe0ee3b1400017110d3a5f3d69e29e4780228461f335e326931b6eae2656d3cd933ad9dd89012c02eabbf3cbfded6d6df3a866e319b680bc
 MISC metadata.xml 341 BLAKE2B 773326b7103bbac0a5d028d4269187e8acd4a7c0603cb1ccdb129c2d3cffed385e87f47fadd5fd8d68dcf5271521ccddc43412b7f8b7ab41dd7618c65f56c849 SHA512 90eec982571c778fff57d1e8a604fd994d249149846544223c2cb0c244c16632fb320fce1eda35641bc0a914cc2a9031bd2e73a1444412119690a2d3729c541a
diff --git a/app-vim/airline/airline-0.9.ebuild b/app-vim/airline/airline-0.9.ebuild
new file mode 100644
index 000000000000..2b0d045e241b
--- /dev/null
+++ b/app-vim/airline/airline-0.9.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+if [[ ${PV} != 9999* ]] ; then
+	MY_PN=vim-${PN}
+	MY_P=${MY_PN}-${PV}
+	SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S=${WORKDIR}/${MY_P}
+else
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/vim-airline/vim-airline.git"
+fi
+
+DESCRIPTION="vim plugin: lean & mean statusline for vim that's light as air"
+HOMEPAGE="https://github.com/vim-airline/vim-airline/ https://www.vim.org/scripts/script.php?script_id=4661"
+LICENSE="MIT"
+VIM_PLUGIN_HELPFILES="${PN}.txt"
+
+src_prepare() {
+	default
+
+	# remove unwanted files
+	rm -r t Gemfile Rakefile LICENSE README* || die
+}
diff --git a/app-vim/airline/airline-9999.ebuild b/app-vim/airline/airline-9999.ebuild
index 248f1fbb3ed7..8f8c09743034 100644
--- a/app-vim/airline/airline-9999.ebuild
+++ b/app-vim/airline/airline-9999.ebuild
@@ -1,7 +1,8 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
+
 inherit vim-plugin
 
 if [[ ${PV} != 9999* ]] ; then
diff --git a/app-vim/dbext/Manifest b/app-vim/dbext/Manifest
index 65c1159140aa..c20764d8e8ec 100644
--- a/app-vim/dbext/Manifest
+++ b/app-vim/dbext/Manifest
@@ -1,5 +1,3 @@
-DIST dbext-25.0.tar.bz2 108580 BLAKE2B 858d9828348acbeeeeb2094f127ef4184a124443ac2b8a0a5bffe013259536c99594df8fa9284976f4528ba15e6e8e8e043103028e3bd93be693ea8fee958cfd SHA512 715d9d41be46f691ea5e635bf564c4f16d16a74e5b65d9ae12f794406a2a7815df836e34d0c415e8696847e8f36f2ceed1fda4bc688ebe0db8826dc3f0493340
 DIST dbext-26.00.tar.bz2 109724 BLAKE2B 01f1378514836ac43cbdf9ca6087377ce83118b95fba04d530854a268f22dc2dc78a5f163c75c35ed9bf76514b3889c5f420b704f105dbd88bffc17f3d3c1bd3 SHA512 02d0f75443d91d32f8a6423712fb7eebde7659b986fcca2ddfef6458a5fd5caea3c73ba21ecd7a0fd57793f0a6fbc71d81c2ee6db3b82a9d98fd84572b1df18b
-EBUILD dbext-25.0.ebuild 332 BLAKE2B 1ef70306c946cb18d2fd8a82ff1863647b640e2b5aff7d5f4c6544a4ef002db8187c3649bb6abf8c1a83bdd2040a5c480dc9f8382fbc11271d7c7897ceb64967 SHA512 b3fcc20e340b19227b1c1dc95a6780266468cb2da0a5d54beedf2f8e68c0aaf600f3d987460d1c95f1153a2edfeec1094eac0ff67a16315d0c27f50bbd735f0c
-EBUILD dbext-26.00.ebuild 335 BLAKE2B 7dd4e41963ee2a293bdc6109b0c6edd7e6ea64d3c370cbf363e8e912f551976e49d76aded845f2453e4c4d36a61864a829caa7580e4447e69b2eb2f28a1fc4b8 SHA512 08464bfd45f4b7f31eb661b1c982fac03f9f5bb97ad12c45b5a6c8328dbdcae9f2a07ad42fe602bdfc7e22ab11e5b834bebeb3b5e469140403b1547f87037fac
+EBUILD dbext-26.00.ebuild 332 BLAKE2B 1ef70306c946cb18d2fd8a82ff1863647b640e2b5aff7d5f4c6544a4ef002db8187c3649bb6abf8c1a83bdd2040a5c480dc9f8382fbc11271d7c7897ceb64967 SHA512 b3fcc20e340b19227b1c1dc95a6780266468cb2da0a5d54beedf2f8e68c0aaf600f3d987460d1c95f1153a2edfeec1094eac0ff67a16315d0c27f50bbd735f0c
 MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/dbext/dbext-25.0.ebuild b/app-vim/dbext/dbext-25.0.ebuild
deleted file mode 100644
index 90f05bddfff0..000000000000
--- a/app-vim/dbext/dbext-25.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit vim-plugin
-
-DESCRIPTION="vim plugin: easy access to databases"
-HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=356"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ~mips ppc x86"
-
-VIM_PLUGIN_HELPFILES="${PN}.txt"
diff --git a/app-vim/dbext/dbext-26.00.ebuild b/app-vim/dbext/dbext-26.00.ebuild
index 6f66ec1f03b9..90f05bddfff0 100644
--- a/app-vim/dbext/dbext-26.00.ebuild
+++ b/app-vim/dbext/dbext-26.00.ebuild
@@ -8,6 +8,6 @@ inherit vim-plugin
 DESCRIPTION="vim plugin: easy access to databases"
 HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=356"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~mips ~ppc ~x86"
+KEYWORDS="amd64 ~mips ppc x86"
 
 VIM_PLUGIN_HELPFILES="${PN}.txt"
diff --git a/app-vim/gitgutter/Manifest b/app-vim/gitgutter/Manifest
index e2ae7fd57a0c..02d1fc21f979 100644
--- a/app-vim/gitgutter/Manifest
+++ b/app-vim/gitgutter/Manifest
@@ -1,6 +1,6 @@
-DIST gitgutter-20170222.tar.bz2 41819 BLAKE2B eb9e381c06aaf7136bcc40029cbee98f62be6eda66dcd63ef368bcaa9a6fe01476e90ebf0a99133bc341a129c603695cdf8173b6dfb710f224b8da9297c8a13b SHA512 970a956a839c2eaa05b699e8507b239d36ad623c40d3d05d9ce82320ec93ae733de2d40619898c5ff43074e2c8f95611b94879424767fac4f2b1fe2747611f4e
 DIST gitgutter-20171101.tar.gz 43534 BLAKE2B cb0b935c1b2d16a50bbecc73f4f8c657a9087bef56bef36af8ff52a7ff09d39293296eaf49507015eaeac7f4faba2a26a09a49296c28237029110068cb9f6048 SHA512 24d8ad740931df17c2c67e2a2a13e3bba7c1205ba5543f5c11353e639876f4a54e69170dc0a946660ee2e3a23a110c90f4195fa9a1ddfff19163f00d88528219
-EBUILD gitgutter-20170222.ebuild 576 BLAKE2B 2f99f6540fe82c0fe22e6e309d208a8312ee30bba2d24ac52ab3c9bc73a090dac6d65ef07bc18c3d5dedec0d4b0e9e59fa7039153564560ee97cc868260e57f0 SHA512 f6b6f1fc620034b9e573fc826984ec8c520a32d656ffbbbb7657fd363d20245586c28e33066d711a8e46979da0b944df530e24b89a3a5bd5e57f2904c7300691
-EBUILD gitgutter-20171101.ebuild 754 BLAKE2B 177e47037f1006405b63200abf1586e26afad8798c46a264b407867cc0fee30e2fd06c4a4128b2c818d05194e1bc2307188199d83862a7fbae59a9a584e08e5a SHA512 b6aff8af940b2e9a91b61b60cee08b3d23bdc7b4747cea31b13e3a42684b067ae892d6fd3202dc7a0a0ebebc647315fb29c5da581c3388465d7011fbf415539a
-EBUILD gitgutter-99999999.ebuild 754 BLAKE2B 177e47037f1006405b63200abf1586e26afad8798c46a264b407867cc0fee30e2fd06c4a4128b2c818d05194e1bc2307188199d83862a7fbae59a9a584e08e5a SHA512 b6aff8af940b2e9a91b61b60cee08b3d23bdc7b4747cea31b13e3a42684b067ae892d6fd3202dc7a0a0ebebc647315fb29c5da581c3388465d7011fbf415539a
+DIST gitgutter-20180316.tar.gz 46344 BLAKE2B f981753a0f8d066b7cb5c16c49cfdd1a1aac1c6623b4645b8b1abd5719470ac181e09c8b736f8b8a14e6098b60cb8f97b114dc5c2a587b6d1875fcf27b4b12cf SHA512 15873b2cccc49f8aec9de312efedc615d6fa822b45ca8ce53cc6cc878fcaf3a6ab3f02eb5d082ff329528cce1b48358846b0aba3f9d3bc8aadd29aa57d3b1a30
+EBUILD gitgutter-20171101.ebuild 752 BLAKE2B 02fecaa88d65823737070954f3a392036694794537c1953ea218d16952a659ad5813e6e67e348c9d56e70b392e10f954dd2c31ad95fb95833e7901cc7b1d3eb1 SHA512 8ce0c16f4f4942f8e0b33790601d42b2652d8310a496bb8d2f61713c612d210a93ac9be1aa9ed88bc99da088feafc9da9967285528d55701437465bcbb06ebfd
+EBUILD gitgutter-20180316.ebuild 791 BLAKE2B 1765bd9bdeb6234d90d831181bdf2ad0ef975edcfa959e7ea309c5522bdb6779163d1e5850a6715bcc8471db15c922125e80ec248d0ad822986657984475d4c8 SHA512 5b7fab9be3eabfe64a67535937883939ea3d1ba62184f55f25f18384ddf1d24416b22d1f88d6025d0b98249536984c6f8b6d0e9b7f0c467a64c14f34dfafde11
+EBUILD gitgutter-99999999.ebuild 791 BLAKE2B 1765bd9bdeb6234d90d831181bdf2ad0ef975edcfa959e7ea309c5522bdb6779163d1e5850a6715bcc8471db15c922125e80ec248d0ad822986657984475d4c8 SHA512 5b7fab9be3eabfe64a67535937883939ea3d1ba62184f55f25f18384ddf1d24416b22d1f88d6025d0b98249536984c6f8b6d0e9b7f0c467a64c14f34dfafde11
 MISC metadata.xml 346 BLAKE2B 89acd12a36beb7b027e42b7f094bba4e229e345ad6f0024bbd3e550784459975aff10e88f5de53de3f2150000b7349ee97348723110a43130b213404292b562a SHA512 4ada20b8f4f308445854b0e0ab229271a603e38370675691790dce0303ca4c2a7f00b247363b0f13bcebe78397fd3ebbbd157403260664171b548b8964da7a0a
diff --git a/app-vim/gitgutter/gitgutter-20171101.ebuild b/app-vim/gitgutter/gitgutter-20171101.ebuild
index 0cb5b2aebcc9..2dada9f85e8b 100644
--- a/app-vim/gitgutter/gitgutter-20171101.ebuild
+++ b/app-vim/gitgutter/gitgutter-20171101.ebuild
@@ -11,7 +11,7 @@ else
 	inherit vcs-snapshot
 	COMMIT_HASH="1e60667322b7cd1bfcba98762fbba746a888d21a"
 	SRC_URI="https://github.com/airblade/vim-gitgutter/archive/${COMMIT_HASH}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 DESCRIPTION="vim plugin: shows a git diff in the sign column and stages/reverts hunks"
diff --git a/app-vim/gitgutter/gitgutter-20170222.ebuild b/app-vim/gitgutter/gitgutter-20180316.ebuild
index 0a08a4ac7e70..002f6583087d 100644
--- a/app-vim/gitgutter/gitgutter-20170222.ebuild
+++ b/app-vim/gitgutter/gitgutter-20180316.ebuild
@@ -8,7 +8,10 @@ if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/airblade/vim-gitgutter.git"
 	inherit git-r3
 else
-	KEYWORDS="amd64 x86"
+	inherit vcs-snapshot
+	COMMIT_HASH="37bdd03d176c5e182c7e8dbdc79c3f71d2a04898"
+	SRC_URI="https://github.com/airblade/vim-gitgutter/archive/${COMMIT_HASH}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
 fi
 
 DESCRIPTION="vim plugin: shows a git diff in the sign column and stages/reverts hunks"
@@ -20,6 +23,8 @@ RDEPEND="dev-vcs/git"
 
 src_prepare() {
 	default
-	rm LICENCE README* screenshot.png || die
-	rm -rf test || die
+
+	# remove unwanted files
+	rm LICENCE README* screenshot.png unplace.vim || die
+	rm -r test || die
 }
diff --git a/app-vim/gitgutter/gitgutter-99999999.ebuild b/app-vim/gitgutter/gitgutter-99999999.ebuild
index 0cb5b2aebcc9..002f6583087d 100644
--- a/app-vim/gitgutter/gitgutter-99999999.ebuild
+++ b/app-vim/gitgutter/gitgutter-99999999.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
 else
 	inherit vcs-snapshot
-	COMMIT_HASH="1e60667322b7cd1bfcba98762fbba746a888d21a"
+	COMMIT_HASH="37bdd03d176c5e182c7e8dbdc79c3f71d2a04898"
 	SRC_URI="https://github.com/airblade/vim-gitgutter/archive/${COMMIT_HASH}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
 fi
@@ -23,6 +23,8 @@ RDEPEND="dev-vcs/git"
 
 src_prepare() {
 	default
-	rm LICENCE README* screenshot.png || die
-	rm -rf test || die
+
+	# remove unwanted files
+	rm LICENCE README* screenshot.png unplace.vim || die
+	rm -r test || die
 }
diff --git a/app-vim/gundo/Manifest b/app-vim/gundo/Manifest
index 4ab49a03c174..df9979976a02 100644
--- a/app-vim/gundo/Manifest
+++ b/app-vim/gundo/Manifest
@@ -1,5 +1,3 @@
-DIST gundo-2.6.1.tar.gz 153125 BLAKE2B c08016986dee222bd1f508776765f2f94fcef76178c5d9eea92e789b359e95d699b5540f5646b5825879f725c9ad91b7034192f807f923fde9e6d4314cbb7b5b SHA512 c8b9b20ff8ef24bd94b0adc18b2cf912cbd0a07c5a70df11be39fbe69d81306027b73d9a60c9127c658c913602a819774c7b1202a8db704677da59cb9916532b
 DIST gundo-2.6.2.tar.bz2 144107 BLAKE2B 7915a60a77e07e49cc1a214c6e250028e61ff33e6f085960836a3e49c1562f4ff713ff4c57125f677d352ae3477bb514fd94d636ee5ba9afac5d23c4ecd70029 SHA512 e03450a1bfb0a7f5013c1493f1b25b963c2bbb37fc8fa24c1b85237bd12847c3edd7b9465caae7bdadf8923dbdcdb24930b160d7824f835417bf30725fa910b4
-EBUILD gundo-2.6.1.ebuild 719 BLAKE2B 9c9b9d69cfc9d616e48506b8b85508fa4b9e215ce4ab43db69a1167562f4f7c53a05a71fa7175a5a812e3d30445a73b216ba4996b45101e500a274d96f13e70a SHA512 637fef965a372b43d41ae6b027682512c3c70d2ccfcfc7125ae70ae859c7a8d830b5df5f0ec51e3949817179f9b2b8663e52f69be571255fa3862f8748e3d5c2
-EBUILD gundo-2.6.2.ebuild 728 BLAKE2B d1641234ee33ffd91b8fd950a5b210e9ea05b7fef715cb4ce942c2fc40e75ddcf0bcf73236eeda3f2acb5dd760ba8b731d6275788327f574e240327a267d3e7e SHA512 028e89fc1572ff43baf89abd1768c667ea9a81098785cefa2397c12577494afcbbfcd7194f05baed2bbefcf637bf3a7ca3fde26797b6a32bdd00d8a745e4fd31
+EBUILD gundo-2.6.2.ebuild 726 BLAKE2B 67919bb9e15cbd444ac7732b8eb9c8bd52929b589693ad252106e376698a6a5b70b9885a5976c07fc53f0f8f5386f1adfe4434e03ff8e672fe9d1d7ee95b725e SHA512 4f5e6929413654e8cf8d11e0f6cf316c82e89763b63940f0d67b95968382a85080bc5668373fc8183d0a8a70358ab93a19bce4e529071efa6bf88a729d5baa83
 MISC metadata.xml 337 BLAKE2B 08b3c90ab9c289b83c58c3c67fa09f3306082e9d660b8ac81e75f14a44d434fec2657ca4f21ef6660ae46923abe92053a22b404ee9fd443b34775191a999a7e8 SHA512 14459476fa97a611646909941de602646af184e1de555dfff407e71b8fa935c23b5f863b58432be84c31378badabecf8893eafd454d06f8c57759a3bb8035854
diff --git a/app-vim/gundo/gundo-2.6.1.ebuild b/app-vim/gundo/gundo-2.6.1.ebuild
deleted file mode 100644
index 86515acdeb8d..000000000000
--- a/app-vim/gundo/gundo-2.6.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit vim-plugin python-single-r1
-
-DESCRIPTION="vim plugin: visualize your vim undo tree"
-HOMEPAGE="https://sjl.bitbucket.io/gundo.vim/"
-SRC_URI="https://github.com/sjl/gundo.vim/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-KEYWORDS="amd64 x86 ~x64-macos"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	|| (
-		app-editors/vim[python,${PYTHON_USEDEP}]
-		app-editors/gvim[python,${PYTHON_USEDEP}]
-	)
-	${PYTHON_DEPS}"
-
-S=${WORKDIR}/${PN}.vim-${PV}
-
-VIM_PLUGIN_HELPFILES="${PN}.txt"
-
-src_prepare() {
-	rm -r .gitignore .hg* package.sh README* site tests || die
-}
diff --git a/app-vim/gundo/gundo-2.6.2.ebuild b/app-vim/gundo/gundo-2.6.2.ebuild
index 28f68459e8e2..6822904f1e76 100644
--- a/app-vim/gundo/gundo-2.6.2.ebuild
+++ b/app-vim/gundo/gundo-2.6.2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://sjl.bitbucket.io/gundo.vim/"
 SRC_URI="https://bitbucket.org/sjl/gundo.vim/get/v${PV}.tar.bz2 -> ${P}.tar.bz2"
 
 LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~x86 ~x64-macos"
+KEYWORDS="amd64 x86 ~x64-macos"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
diff --git a/app-vim/nerdcommenter/Manifest b/app-vim/nerdcommenter/Manifest
index 6325794824fd..2eac4cd5796b 100644
--- a/app-vim/nerdcommenter/Manifest
+++ b/app-vim/nerdcommenter/Manifest
@@ -1,4 +1,6 @@
 DIST nerdcommenter-2.5.0.tar.gz 36834 BLAKE2B 517988392e0ac508f18819a088588d3ede50b634268109ec2c67907c663fb6713b55f45cd2562236c481dea86793ab5999a480f2be309e12cb43b5ccbb34d552 SHA512 8616f56d90dfe2fece0a82b888700c4c762c75b7d1cd30e32a3294d1fe7b65d506a13cfead534ae0f11a2384593d246a723e9a0042421691a5d6fb44969e7ead
+DIST nerdcommenter-2.5.1.tar.gz 36889 BLAKE2B 997fa853ea3b6950de864afc1bd7777a71085154dee484ad07b03e8d0da101151f5df5c4ffc4404714c95c7632ac7678e18eb0ef72d238403c708f7faed8aff2 SHA512 84638a3b216f7bc1535030eed8d766c30d5d7de7f6339fdb9bde65561abfa7f1f660cfa81dc057ee2d146af6df26076880b057a7ff7868e9bc55ab53291e9445
 EBUILD nerdcommenter-2.5.0.ebuild 700 BLAKE2B ce6a3b2077cc5af0638b6b9b3f85b26ee87c6797e45f43d1966c94cdd8a5739d12717bddaeea96935a546ebcf9398caae8bee9d87aff7b912026c86d7adf81a3 SHA512 ec7d771ebc2e4a446a1698ae1e145bea999a7d1969f2052a081dc41792267a55e0df334ec67db20af70815560c4966564bd1a876c89468dcc2cd30e20e95646e
+EBUILD nerdcommenter-2.5.1.ebuild 702 BLAKE2B 23d6be5ab27752b61d4e05683a7ee75b2215e4634fa19cfc168ada658e9bd9dd9ad13a2f195fcde897c5b90bc3f6ccdd2ad6a47b50141b3c6088342ae1f55671 SHA512 d40dffb035f647352c2027e0a02324c061432d869a87801e303adef3b3eaa83d259cb803541ff44da16eb2e6c69f7f470e6a73a0e3953345741310446ad070f6
 EBUILD nerdcommenter-9999.ebuild 702 BLAKE2B 23d6be5ab27752b61d4e05683a7ee75b2215e4634fa19cfc168ada658e9bd9dd9ad13a2f195fcde897c5b90bc3f6ccdd2ad6a47b50141b3c6088342ae1f55671 SHA512 d40dffb035f647352c2027e0a02324c061432d869a87801e303adef3b3eaa83d259cb803541ff44da16eb2e6c69f7f470e6a73a0e3953345741310446ad070f6
 MISC metadata.xml 338 BLAKE2B 654c3b28cc5544f0f9b62d9b6c75f5e3a87e6e13e775ab2d4d0c65a276403c1b8cb0c3e49c72aed4564c39561a395d2dc621efbfb158caa1c28b1cdb79cc7800 SHA512 fd7585ceac792841d94bd11039d0f2367ecbb2a5d297213b6679aecd22a3f64d64f627421e3447ae6f01035bfb1ab7208b5d0c53a9d402085c9c5bf48b43eedc
diff --git a/app-vim/nerdcommenter/nerdcommenter-2.5.1.ebuild b/app-vim/nerdcommenter/nerdcommenter-2.5.1.ebuild
new file mode 100644
index 000000000000..e698dd51a16b
--- /dev/null
+++ b/app-vim/nerdcommenter/nerdcommenter-2.5.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/scrooloose/nerdcommenter.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/scrooloose/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86 ~x86-linux ~x86-macos ~sparc64-solaris"
+fi
+
+DESCRIPTION="vim plugin: easy commenting of code for many filetypes"
+HOMEPAGE="https://github.com/scrooloose/nerdcommenter https://www.vim.org/scripts/script.php?script_id=1218"
+LICENSE="WTFPL-2 "
+
+VIM_PLUGIN_HELPFILES="NERD_commenter.txt"
+
+src_prepare() {
+	default
+	rm README.md Rakefile || die
+}
diff --git a/app-vim/vimtex/Manifest b/app-vim/vimtex/Manifest
index 7562b1779e3b..69aaf348dd74 100644
--- a/app-vim/vimtex/Manifest
+++ b/app-vim/vimtex/Manifest
@@ -1,3 +1,6 @@
 DIST vimtex-20160324.tar.bz2 95040 BLAKE2B a6ea2c0ace2aea108545347e0dd624dd838005d752d3e823d230f6fff04ba37f82c98ff472b06b6b5b58a8481824ba1ffad3c756d50a96ea9c79e8e506783131 SHA512 0c0d2a95f3b62239f47113f5b8876728d6d9fddf7e526477e92ef1f09317cb607ddd3b2aa07f6e8bebd357308adf21e4c353795952dc30372b493963bd0554ff
+DIST vimtex-20180324.tar.gz 684092 BLAKE2B 4472c9e62c5795b621a9230fbd7ea1f018c6df440f58065e7b439f64ae67f4064b158094c8d0b8a6eba6202bc9e6729b792fced02ea9deeaf400f0240537795d SHA512 59038aff6ec761a9f73db7d638a70e9ea5ba4d3ef4bd9283f3a62beb5e412f1a3c752dd0d739dc4c9c5e33e4a00a84a91da56e8fea2b8113b7ef73d219997409
 EBUILD vimtex-20160324.ebuild 427 BLAKE2B 54ac66daf12d36f6311b0afe67b4c4e3b754c1327af576c01a7b2d6968229b2804ed716216e973deca59d294e5502a79bf7ee935f26cb8093c810ea5dc09c26f SHA512 6445a566b4cee4841ce7c40b96610d4b3e5e3f60e4eb35aac6e525c2d1b7ef9d79c6281e00f2e5fbb7d0f230fc5109e221d35769d4a957f21cf36d95767a379b
+EBUILD vimtex-20180324.ebuild 777 BLAKE2B f8d569e8e090bf9ba22ff28ad2f4a41098cd3eead7207f1c3c117c3c7ba366b0bd51623c2d96a4c21b55c19d84e8953c2f4a2a9ef74c56eb0eb33bf92cfbdfca SHA512 15f6d678fd0f06df76e0e6a59d483e57a22c7b4c25d707bdaabf5fe4750da076daec9a4e674fa70e4b76e40d7fb44c1b375371a88974c677d9e4c85f490f7a87
+EBUILD vimtex-99999999.ebuild 777 BLAKE2B f8d569e8e090bf9ba22ff28ad2f4a41098cd3eead7207f1c3c117c3c7ba366b0bd51623c2d96a4c21b55c19d84e8953c2f4a2a9ef74c56eb0eb33bf92cfbdfca SHA512 15f6d678fd0f06df76e0e6a59d483e57a22c7b4c25d707bdaabf5fe4750da076daec9a4e674fa70e4b76e40d7fb44c1b375371a88974c677d9e4c85f490f7a87
 MISC metadata.xml 337 BLAKE2B 7cdee52f7b90fb4f600900bf2766b17b00992c1f947bb590a95d17a83ea6d3a9d48d7da4dfef2de1b2101118729ea95298fab28798dee7ec77977fdb659a3e27 SHA512 d2be801e0e552815e32e818ed13172288ebaa4505d6074dcabfaac760fab3227d019e4ddb8610062ceb5680e8b0cd543bd169333eefc80cefc6f5bf790801a0f
diff --git a/app-vim/vimtex/vimtex-20180324.ebuild b/app-vim/vimtex/vimtex-20180324.ebuild
new file mode 100644
index 000000000000..d4031034c014
--- /dev/null
+++ b/app-vim/vimtex/vimtex-20180324.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+if [[ ${PV} == 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/lervag/vimtex.git"
+	inherit git-r3
+else
+	inherit vcs-snapshot
+	COMMIT_HASH="17d809706edcb277f1ee7fa5e33aff3619926fe4"
+	SRC_URI="https://github.com/lervag/vimtex/archive/${COMMIT_HASH}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="vim plugin: a modern vim plugin for editing LaTeX files"
+HOMEPAGE="https://github.com/lervag/vimtex"
+LICENSE="MIT"
+
+VIM_PLUGIN_HELPFILES="${PN}"
+
+RDEPEND="
+	!app-vim/vim-latex
+	!app-vim/automatictexplugin
+	virtual/latex-base
+	dev-tex/latexmk
+"
+
+src_prepare() {
+	default
+
+	# remove unwanted files
+	rm -r *.md media test || die
+}
diff --git a/app-vim/vimtex/vimtex-99999999.ebuild b/app-vim/vimtex/vimtex-99999999.ebuild
new file mode 100644
index 000000000000..d4031034c014
--- /dev/null
+++ b/app-vim/vimtex/vimtex-99999999.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+if [[ ${PV} == 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/lervag/vimtex.git"
+	inherit git-r3
+else
+	inherit vcs-snapshot
+	COMMIT_HASH="17d809706edcb277f1ee7fa5e33aff3619926fe4"
+	SRC_URI="https://github.com/lervag/vimtex/archive/${COMMIT_HASH}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="vim plugin: a modern vim plugin for editing LaTeX files"
+HOMEPAGE="https://github.com/lervag/vimtex"
+LICENSE="MIT"
+
+VIM_PLUGIN_HELPFILES="${PN}"
+
+RDEPEND="
+	!app-vim/vim-latex
+	!app-vim/automatictexplugin
+	virtual/latex-base
+	dev-tex/latexmk
+"
+
+src_prepare() {
+	default
+
+	# remove unwanted files
+	rm -r *.md media test || die
+}
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index faf8806f3bd5..cdd807c0e7ef 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/bff/Manifest b/dev-lang/bff/Manifest
index 02984af20670..f25d593c11dc 100644
--- a/dev-lang/bff/Manifest
+++ b/dev-lang/bff/Manifest
@@ -2,5 +2,5 @@ DIST bff-1.0.3.1.tar.gz 2617 BLAKE2B 30a23882fe0d7740bfe0a3e2d75e91130feb4b3da69
 DIST bff-1.0.5.tar.gz 4833 BLAKE2B 9e3b44da9cd001552119e25764b171c86027755583f79a13b1d1035ecbab134df0aa31234c1479370599dd56a76a7f1c67eff61d2c1189430bab6a9a22f629d8 SHA512 78e481f6f371421ce6f046041fe6d48be2e11000ddda82f60244c0100665469c4aff4f151d297bb533140d723f68d5a3844e0c29a256b022ac93cafbd2abe9fd
 DIST mandelbrot.b 11669 BLAKE2B 7f128f7a30faa7d445353da5305424b7a6fa8f8048c955680411bbfda136796721111bd0824e72f679ec83d22c3865866c57b5b272440b5318b090facdb35706 SHA512 3a1950f8be61fd33e563fe17dbc1297deae3ec2d276a6895e4bbb7d55c5bcf33ec7e9024d9776ad5c9c29b25c55bd08dea71403a60f9478fb3b80c22303d0862
 EBUILD bff-1.0.3.1.ebuild 905 BLAKE2B fd4899726df5982a0eeff7d831607723cab50a234fcc3434143e167325fc53e626f5b3f905d1349b4241aed891b929965644ff2b71dbaa274fe4d30a87f9274c SHA512 c4bdf46d22a9cb2fd36b90da74a5b5d79f5ed11f226bdb209de7641f6732626d46ad00906f49277b7b29eac9805593096e0c9e5289b30ace894731064f4b4862
-EBUILD bff-1.0.5.ebuild 793 BLAKE2B e643daba3f482d54dbc4e03c9e3271a456ed296ac29478b8e258538a510d7a924d2289ced56aae05d807e87bd13be886ca34a4e60df3c01794e206eac85e90cb SHA512 b107dcddd5e2ff2e37add5e0c744e6d00901fb9f51379c07d8101ba08660fd4024e1dc153676511a0fbf31b7cc0a2b6d7244376f9333ec71bbf2f401bae387c0
+EBUILD bff-1.0.5.ebuild 792 BLAKE2B 1b5a2a171666e29a622c371b078ffe5bbf417fc4f0349754b89856fe85918bc079e65af5b7fc58ea2f6ad27609cec4617b9c720824c929170c164929d8307084 SHA512 667fe0c8b0eda79f6ef93433fb9b59713f7038d1dfcdbc639befcec1221bc3024e98d065abb8e74b0b4c199d5cad23dc116cd4ef7fa3a3f383a2cfabeb391daf
 MISC metadata.xml 358 BLAKE2B 475e8fa2af079096f259abc30d2f886eb2b568182394c5fa3a1c081754be7d151a3d10564315d6006232d6f2e7e68103337377db045c13a4fca1e05723d5ff0d SHA512 dc6a26609f65e38ec703c857c686e555170ad4021a994c3a39af131a9f3a38d6207a70558aae46dc5927dda8a9f735795d879a1ac4088ffeac5d09a068627f9c
diff --git a/dev-lang/bff/bff-1.0.5.ebuild b/dev-lang/bff/bff-1.0.5.ebuild
index b0504e8a5fee..3e9627039d05 100644
--- a/dev-lang/bff/bff-1.0.5.ebuild
+++ b/dev-lang/bff/bff-1.0.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/apankrat/bff"
 SRC_URI="https://github.com/apankrat/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~x86"
 IUSE="test"
 
 DEPEND=""
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index ef6aa230fd62..bb331f78b3a1 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/check/Manifest b/dev-libs/check/Manifest
index a45a1d991747..dfad60f5014c 100644
--- a/dev-libs/check/Manifest
+++ b/dev-libs/check/Manifest
@@ -1,5 +1,5 @@
 DIST check-0.10.0.tar.gz 769119 BLAKE2B d5e256bef4aa010322844ce748e620ce884658d74b14e1ea5b0e1bbd4565ef7b0cb7b86d315a36f7a5e4d225e40f242ff9730790bd55fc036757b4296396d153 SHA512 82103a98382c41cf16f172ded66c0399d3da6eceb6728aab11120c028e8796f6d545a98dc4aa5f76ee68c0bfd1f842a4dd371f5d670c8ba84ce4209812bf1ac5
 DIST check-0.12.0-github.tar.gz 281127 BLAKE2B d7dc89c10022594a37e9a4bc6b9fe1e8f355af864a5012c292cc3f1152e9e3e9be01fa34b39e5168f65650e540f36dbc8195952908a871d1c111283429f2f538 SHA512 f7b6452b69f999a90e86a8582d980c0c1b74ba5629ee34455724463ba62bfe3501ad0415aa771170f5c638a7a253f123bf87cbef25aadc6569a7a3a4d10fce90
 EBUILD check-0.10.0-r1.ebuild 1810 BLAKE2B 106168f6f135594653ce061d0dff535ba56d4d9de205d994d6e3dd91405496fcbc6d3c3835c3bf886a8cb29b7775fc8001024dce3e732028b9e6c5367da14d45 SHA512 9ce0cd9f3b3809823f4bdd5441351528ee04f4e470ca2b4f7f2622e5c4c22892870008fc6e9179e3d03225d709055c995e44767d5b07367d39e42bc07dbd0d56
-EBUILD check-0.12.0.ebuild 1701 BLAKE2B 7117ed5d184096d565a92976dd7c8173bd5ed7e33dd868624539bddaf9d40f0c5b08d877c8ac6f4a30a221d9f7d4d4f07a55e2378cb647ee9d2d3fee38c794cf SHA512 c8de5d14955233465c2fd1ee4f097136e4871457a0e15dfbe73eed2d83230bd5e144ef3d35cc99e03a1908d40c7c4828bd13e6763fc5f867f9f6e0703eb48962
+EBUILD check-0.12.0.ebuild 1700 BLAKE2B 837c75bcbc9291d17bf5c5aa6d868c3baa62e778320039124356a6a5d53d027797feae2c4dd6f386b5c0e6ae6da92d1f7f8454624d19eb21594fcf90c44bcdf1 SHA512 da5dcd508dbc921ffa01875788710adedc41fb2242daa1c419a74c326007e3e4b4fefc133e7b627c1bd3a8a3aefbcbf9efef91ae47181756308dd6b710b4b05e
 MISC metadata.xml 363 BLAKE2B 5cdadc9ead8f98c8a417954ff38f8c32a79ee2d0b12171204239305d66e69247758ed237b45e369cb6aa40e4bd56777f74296baecee6eb571801f61e3ddf730c SHA512 b025f88785c7d2f4eb01ccc5f9730c2ef81171fc94a01802f7832088eb20aae42aff7cf4ecd89c3de6e87cf583f873fe5ed9dc4c7fab9f124ce3ebc8441ccfaa
diff --git a/dev-libs/check/check-0.12.0.ebuild b/dev-libs/check/check-0.12.0.ebuild
index 872612ff9403..acde41e304b1 100644
--- a/dev-libs/check/check-0.12.0.ebuild
+++ b/dev-libs/check/check-0.12.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/lib${PN}/${PN}/archive/${PV}.tar.gz -> ${P}-github.t
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs subunit"
 
 RDEPEND="
diff --git a/dev-libs/cyrus-sasl/Manifest b/dev-libs/cyrus-sasl/Manifest
index 29cf0fda87d7..229394fe93b3 100644
--- a/dev-libs/cyrus-sasl/Manifest
+++ b/dev-libs/cyrus-sasl/Manifest
@@ -22,7 +22,7 @@ AUX saslauthd.pam-include 160 BLAKE2B a715cd6e780fd6db773920231f6010c35f8998d563
 AUX saslauthd.service 277 BLAKE2B cf80eaa1e3f7ef854978a458e4b026f3f47891620ac63e7fd1b76d7ba6c9d2eeb3690542c416f1c316f4342f0c7316cce8992f46b32bc984ea2baaa43301185d SHA512 fa318aefec6f802badd72a4baf33875bc0021fc4889578877880971470d84bf645ad3c34dd10c582d8cc06ea512e3d56984902efaf09e2806a27feade5fc971c
 AUX saslauthd2.rc7 411 BLAKE2B 7cda36ea03aeea5f8e32c2fd0319a483dae78080fa213fb423bd1545e9d29193ebe077ebe5d15ab5940b2d805cb46a25ad2629757f55d2c40c4acc3f0adfa355 SHA512 1d5942a94ffbc15774443d60a88d4c89c7c3c6ea68b041d304f0110f6ec3aa2a812f59021cddc78de6f51a25bb00955e4e56d769e766a9d856f13774dd37ce83
 DIST cyrus-sasl-2.1.26.tar.gz 5220231 BLAKE2B 08fe5c1624e7cccb4b5e562f6987fddd047e1221b671cedbbb684d5a2f39e09a438ad14ffcedb5f398c203ca0b6e23574106c87f43a632028d50a69619c54970 SHA512 78819cb9bb38bea4537d6770d309deeeef09ff44a67526177609d3e1257ff4334d2b5e5131d5a1e4dea7430d8db1918ea9d171f0dee38b5e8337f4b72ed068f0
-EBUILD cyrus-sasl-2.1.26-r10.ebuild 7749 BLAKE2B 160eb1322871153af3d6cad1439f978f08ed5d39f536b759c0744559c64736d44d517968e75c3b0d610b76604e1db977902b6f205ac5a014f6a02b40f1984bb7 SHA512 59e6cc85b7556fd361a3fc2b4c2b8694296a0550f1d5e1a02d69bc95fe95e2a713958145fddc77423b72a8693fe07290401dd4b68457964449e43e531f65b3ae
+EBUILD cyrus-sasl-2.1.26-r10.ebuild 7748 BLAKE2B 8abc8b39e91b5365a8600a9a816cef1bd672cc8bff6d5ac323eaab4b5ee8224f42e7fa0dd73c5db04377c8353035796a0813089006e643fccdbdc4059774a759 SHA512 0f6b65a025f71284512d26f6b690e593ede4c3b9b2ef4ddd8e3aa0ec6f509797ab27079c3ea8be37a2c8f9ecf7f5d3bc2ecc190e8820d1985e92afd4bfe56ecf
 EBUILD cyrus-sasl-2.1.26-r11.ebuild 8396 BLAKE2B 65825008f1e4716dd5ba1326368460d9140413cd49fe4686f897e81dd95f071146dacf337a68f0e6fb85378c7a8ef59a30dd9e905b08b0abd82bb30a7d3e1e93 SHA512 844c7b5dd20fb1784bbce69daeb8c795e6e13195afd944cf10a795457cf2d2b7482ad53b4e54d7a0cad19d9eef73ca12e855a263d0392a1da26b7474b27dba08
 EBUILD cyrus-sasl-2.1.26-r9.ebuild 7655 BLAKE2B 1a5e6fc14b7b983d78d91f2846cc38bef0ad6e37dbd2f5659a3a3f1fc8b321024454a6e0de6dd2f4e5a0fcdc9ca18eff9b7fedd663c15da08cb293ee571caa23 SHA512 8026e9e7b2d58892a4405b1965a7080cbef7eb95e4fd57642197a625dc27bc04b9c41f01145f89c0fb82e999cef49897596cacc52194f1ff27dbc02987b9e5d3
 MISC metadata.xml 706 BLAKE2B a5682e5daac9c1a7a3a021989ae9ca856bb08c9eb0ba3a71070b7150cccc7ddfcd1d3d0fe1df33e688d0223ab7fb760ae028e4753523b28a4cedcb625c899d73 SHA512 1e7495deff4727296d29b25b7af535c0b36054b9172763ca8634b40f324dbc33697424a7e5565791c3131def3708c9ffb7e3e2362cbd8b334d650921fc2291ce
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r10.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r10.ebuild
index 15bbac302ccd..187a24db1055 100644
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r10.ebuild
+++ b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r10.ebuild
@@ -13,7 +13,7 @@ SRC_URI="ftp://ftp.cyrusimap.org/cyrus-sasl/${P}.tar.gz"
 
 LICENSE="BSD-with-attribution"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="authdaemond berkdb gdbm kerberos ldapdb libressl openldap mysql pam postgres sample selinux sqlite
 srp ssl static-libs urandom"
 
diff --git a/dev-libs/dotconf/Manifest b/dev-libs/dotconf/Manifest
index ff64de2dd95d..f2917a3180af 100644
--- a/dev-libs/dotconf/Manifest
+++ b/dev-libs/dotconf/Manifest
@@ -1,4 +1,3 @@
 DIST dotconf-1.3.tar.gz 333301 BLAKE2B df3f4c9bc4539ed5b21bd4d6059bd911bb319d9dbe4f48c6d45c34559eaaa646abea847f6d0b35678c12d9b5e89e2f112047557d458be608215d76bb50af004c SHA512 ced0e66f70d11a309e77add1bfac1da8e85dcbe193633bd4bd1ae4bfd043b66880406e93ec18327b8c5d3de8d4bfc5278db6e5cb39b030ee1dabfa1ce267a98e
-EBUILD dotconf-1.3-r1.ebuild 596 BLAKE2B ebea041bbf27db2f416ba1112bd55045cac5c388446191f35282b799f68c5c5e206f5c05b803ed547e81c366245fcb567b9de53ce16aeacf8d8fc9dd7e93c5af SHA512 46885bd23840184b1518ccb652819cbf3601d3baad6ae061887d8e36d93b9ec508aa893939d9d24fd256fe0e73af12bf6e3b140dc47810100921692fb1c6da02
-EBUILD dotconf-1.3.ebuild 650 BLAKE2B 2f8da66670f02a809ab4c861aefac4a275fd7de30f20fdc7c894c7ca7308d88be12a8791f2334aa871116c05c2f591021d3e2de348b2df7be64acf6eb98b6c06 SHA512 81c1595f0382bbd0f90648b02fd030c9aeacfd1b146786f0f3fa3aefa5901114311ada7de8f692dd696021d77095acc58108de6788254dfe44f08c48efc819b2
+EBUILD dotconf-1.3-r1.ebuild 594 BLAKE2B 6891826d1397b644032b2eae57d9c5f76193874fd2d46e0a7531f8ef770aa0e1e8b6fa4ddbbaf832c9ea9a0686ccc44d1d2aa3d1b38cb25e24cfa2baf8656d29 SHA512 4a9fab7d2477fac6385574ee5ac7c208cb2495ee480ca773cff563bc053526ad9b2d1b565e6e83141b1533485af2f620940dc22e5d4af5e756dc1ef512ebcfa3
 MISC metadata.xml 444 BLAKE2B 32e2f3c775e22987798a07050c3e2446d658f9124ae02b8edf60d05cf65b14b68b912987838930518e100e8e09b914b493ae71a1e60aaee758517799ec065ed8 SHA512 cf7e9367f5c1184b089375d0922a60e01bf985b215c59b2272dae535c948d5d1044de614013cd38978a28a59b28d86cc6d60085d5c39f59ea6b714309c8fba86
diff --git a/dev-libs/dotconf/dotconf-1.3-r1.ebuild b/dev-libs/dotconf/dotconf-1.3-r1.ebuild
index e397f07138a4..ca952cd3a5d5 100644
--- a/dev-libs/dotconf/dotconf-1.3-r1.ebuild
+++ b/dev-libs/dotconf/dotconf-1.3-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 DEPEND=">=sys-devel/autoconf-2.58"
diff --git a/dev-libs/dotconf/dotconf-1.3.ebuild b/dev-libs/dotconf/dotconf-1.3.ebuild
deleted file mode 100644
index d425ce627c05..000000000000
--- a/dev-libs/dotconf/dotconf-1.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="3"
-
-inherit eutils
-
-DESCRIPTION="dot.conf configuration file parser"
-HOMEPAGE="https://github.com/williamh/dotconf"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-LICENSE="LGPL-2.1"
-
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-DEPEND=">=sys-devel/autoconf-2.58"
-RDEPEND=""
-
-src_compile() {
-	emake CC=$(tc-getCC) || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-}
-
-pkg_postinst() {
-	ewarn 'This version requires that you run revdep-rebuild after'
-	ewarn 'the upgrade.'
-}
diff --git a/dev-libs/libbsd/Manifest b/dev-libs/libbsd/Manifest
index 89206da8ebfb..359d90e4a18b 100644
--- a/dev-libs/libbsd/Manifest
+++ b/dev-libs/libbsd/Manifest
@@ -1,8 +1,6 @@
 AUX libbsd-0.8.6-sparc.patch 832 BLAKE2B d02e16c7d338239ab56c6a1ce88cbf0e0c6736208ac40bf2272fbae5ddf16f10f89701515c69d81d541286012b3b9ce8fe0322197331f9c9b6293aa8454e53c1 SHA512 5b476340a35a02a15706ab7704f4e78b5f78f87e471a0749624ad4f37f9459e2d90c35fbe7984a226f247f26a4809c6a79d1c792e6c1ed64d2a9b4b984513055
-DIST libbsd-0.8.3.tar.xz 356772 BLAKE2B 7f45f0300e170f02a0c7d4d0e8d3b56b10035af5a0c5749695978fff549c11ae2d13fa8c85e07b059dc30f458d6b0f7fe36129c934070a77ae185f8be0a4e0c3 SHA512 155b895d6bd62b180718d65a2cda7484946c492d52735a57b51005705dfe4528b6a72e8745acea47b01fe68e3bbbe3c036c5e9998a8d06fc79efe2b96a04767f
 DIST libbsd-0.8.6.tar.xz 371112 BLAKE2B adab6c17267e0cff128351efccf5c1225b7dd85dc61dd8168bf212ba5aff8d726fa5be687c041821af9a427ddad9dfcd3630cac9134b9e81c86ab2599e43aef9 SHA512 ece01ced324f840c2cee6321c7dcf97ff123d55ea9f203c1ce35e1b46643dc7b34ef6dc6c8d128252b36848624850b40823411cc96b99a66a401eb1e9d8cea6b
 DIST libbsd-0.8.7.tar.xz 371772 BLAKE2B aa4aa1c19872edf9e7e6ed270275199366345531a48ee28c25e209f17c5403a22269b91ab1c806cb1b54ba33a8464f4b035fe7ee2bc5dddd0a4fda09c540b058 SHA512 605a14eb5d33c0e45c3bd29e585ebc15832e2ed1efa9356291a0562622168da96db1a20766e9dae8910ea0c1516429f43905edc8d4f2a40a5a341a689d08fcc3
-EBUILD libbsd-0.8.3.ebuild 1156 BLAKE2B f217031f7319057cc0a9b3ef7b8940812f9e149f58fd9484a1e6271b13f3b6514a33c0045a0523562038bcfee8b944061e039e299847a53f3716e126888ead85 SHA512 58344f547ce2e835a9f01c44c31f364f162a1ecfbb54a5b056996e9f4b6abce777d7699b6224a5b0642d4d9b12545d269418129acc7c7b392ff03d9ea3287f40
 EBUILD libbsd-0.8.6.ebuild 1222 BLAKE2B 35e69a9e63aa708d91771a6c61c445d7845fd2210674b9a65ad3a57ae03d25e341815cdc12ee55c35dd08946ab5ce5d047bd2bb81461485dc9e426fa931bbc71 SHA512 2749abfd46ea431b13dd18678b124d1bf8d320957ec6d757f0671c0cfb0d2811418b798bae20efca7eb86bb2cfd5adf568995657b931032a6d8cb61850729110
 EBUILD libbsd-0.8.7.ebuild 1232 BLAKE2B d30cbbad96b19726f36e83d9fb8c69d14f53702c74f0401ce9abee5b7f7cddbd0f90da75d02833535e12fc1d9f4dbf202305466d8ef712fe892c08c707b94fc3 SHA512 1967086f1067249a65c99a6c68fe0e3238b120ad15d6dc5d6a9ebed7105ae3e4cd86b6c51aa4e1bfbd2ce5b3b0597ae20cfd6326c14d6a06f38d6406e1ad30f2
 MISC metadata.xml 276 BLAKE2B 889856a4e8b234e03eb27d32a4bce748a561f98ca0faa36de124e58e3832d804d1492f59db1154c4ec0e2e0e46c7d9cf38d9911ee83dd0863699581000610f31 SHA512 673180ba375ea401c0a8f197d516417b3f9361b11943c71bac88b0d0b1407b0bc657f5763c6fb6e429cc6ee112869a2247083fe56743e9ce918855c0ea929e59
diff --git a/dev-libs/libbsd/libbsd-0.8.3.ebuild b/dev-libs/libbsd/libbsd-0.8.3.ebuild
deleted file mode 100644
index 920b765cd2b6..000000000000
--- a/dev-libs/libbsd/libbsd-0.8.3.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils multilib-minimal
-
-DESCRIPTION="An library to provide useful functions commonly found on BSD systems"
-HOMEPAGE="https://libbsd.freedesktop.org/wiki/"
-SRC_URI="https://${PN}.freedesktop.org/releases/${P}.tar.xz"
-
-LICENSE="BSD BSD-2 BSD-4 ISC"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs"
-
-DEPEND=">=sys-kernel/linux-headers-3.17"
-RDEPEND=""
-
-pkg_setup() {
-	local f="${EROOT}/usr/$(get_libdir)/${PN}.a"
-	local m="You need to remove ${f} by hand or re-emerge sys-libs/glibc first."
-	if ! has_version ${CATEGORY}/${PN}; then
-		if [[ -e ${f} ]]; then
-			eerror "${m}"
-			die "${m}"
-		fi
-	fi
-}
-
-multilib_src_configure() {
-	# The build system will install libbsd-ctor.a despite of USE="-static-libs"
-	# which is correct, see:
-	# https://cgit.freedesktop.org/libbsd/commit/?id=c5b959028734ca2281250c85773d9b5e1d259bc8
-	ECONF_SOURCE="${S}" econf $(use_enable static-libs static)
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-	prune_libtool_files
-}
diff --git a/dev-libs/libgames-support/Manifest b/dev-libs/libgames-support/Manifest
deleted file mode 100644
index 69084ce4350e..000000000000
--- a/dev-libs/libgames-support/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST libgames-support-1.0.2.tar.xz 302064 BLAKE2B 1ae14d49df0ee44f3364df10eb43d071db6c251d5101662266d399c153bb0c963f3529a56be77741af4b00c944b5b154154c5ae1486e2048bb300f6ff2b34399 SHA512 b96329be3a5fe9ef5a0e9fc0a5089028347591988b8eb16fb0bac1633d4f94b2e95c0b4e7a06b4b066d6c88a77b9510980ca38852c1b8d1076367b29b0bab0dd
-EBUILD libgames-support-1.0.2.ebuild 559 BLAKE2B 12a51a14f07efc35d6744a67eaa31be05eba636dc18d535d45899c8e8a54b606901819e0c369863623bc82eaa1db63150a0386aacc2ef8cb08747adf5b033f0f SHA512 786d59fdd4c16e3d75d0f9d0d4b1c9c6e7cc1e5611e5516dc46a835c2d7264f865263f8dac14134dfb41aa3ec9138c3209f49df40296f1576d594c997071c1dc
-MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-libs/libgames-support/libgames-support-1.0.2.ebuild b/dev-libs/libgames-support/libgames-support-1.0.2.ebuild
deleted file mode 100644
index f8a5d7f563d0..000000000000
--- a/dev-libs/libgames-support/libgames-support-1.0.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VALA_MIN_API_VERSION="0.24"
-
-inherit gnome2 vala
-
-DESCRIPTION="Library for code commong to Gnome games"
-HOMEPAGE="https://git.gnome.org/browse/libgames-support/"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-libs/glib-2.40:2
-	>=x11-libs/gtk+-3.19.2:3
-	dev-libs/libgee:0.8=
-"
-DEPEND="${DEPEND}
-	$(vala_depend)
-	>=dev-util/intltool-0.50.2
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	gnome2_src_prepare
-	vala_src_prepare
-}
diff --git a/dev-libs/libgames-support/metadata.xml b/dev-libs/libgames-support/metadata.xml
deleted file mode 100644
index 39980802b1da..000000000000
--- a/dev-libs/libgames-support/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?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>
-</pkgmetadata>
diff --git a/dev-libs/libressl/Manifest b/dev-libs/libressl/Manifest
index 5250c2b522ae..fedfb7803f4d 100644
--- a/dev-libs/libressl/Manifest
+++ b/dev-libs/libressl/Manifest
@@ -9,6 +9,7 @@ DIST libressl-2.6.2.tar.gz 3229140 BLAKE2B 65ee69ac9d5754a153ed8e9ca20240cf6d584
 DIST libressl-2.6.3.tar.gz 3228661 BLAKE2B 01d1e09a5c4541e1d6b35d0a1cd9246671a7cda404c9818885cce55897dd405585a656b748ca6c959224b7d6155c20700fb4a92c37af42429959162a7ad8fb87 SHA512 5c0a0f86ecad1226c2d9a3a8a2e6f412ac0941d402c213ae1d293cd90c6a684198410db8c5250f83b8e2b00968a089afc39e90e053669fc27f82a4eb7c65f5c9
 DIST libressl-2.6.4.tar.gz 3227935 BLAKE2B 48e865448a9e5b0b604b06060091073276aebd376506de73773a5eb9cb0bb4c5b93aa16353b4892abaee97ec933ad77e89775c3f52263d77bb17c68e481b4f70 SHA512 181761da573ff392aaee17dd3dde416d7cbb299ab3e07b49c97e279ceb3f619e78d1dc9ec4c59b0af024f0a8270ff31fe37f8282d0392be34c3143c9647cd246
 DIST libressl-2.7.0.tar.gz 3286436 BLAKE2B 883f24f70dc39c0547d63b852274ce12e03910d5b8eced70dbcffb062d236ad03b3e7dc0c265277f33666616f682b454130be18fb2f8112d42aabcaab8882a69 SHA512 d0e51fa7143f71266e9193fbda151c6e65ba403fa93b4030edcfd4909f5905b03586cc5605e58a62a190d46e9caf7191b6572106b8e92bc5400b2e1b6b7e025e
+DIST libressl-2.7.1.tar.gz 3362461 BLAKE2B 48b62160298ea7628c6671271b7ae9249cc3355cf6e504b504f7fef4ce62337f07e0a8117eef88fee7ae2a0517859f83e8540003dfd2c577f10841088d9eb180 SHA512 b7adc4250ba3fa5a3db20890aacb6b40dc9fbc29cc470c55dc9742430b9ba10ec122e6edf6f1671d77dea6347be1a23dc3d81b3b70f9b6e722212f356c36dfbc
 EBUILD libressl-2.3.10.ebuild 1286 BLAKE2B 454ea3e8e767045374f96d2f3883ba26f93013d78f62564fa8ea9d52f17d5ee75a6dc8b0d87b29134d34e44b3aec519ee378d294bd1d3ee84c4dffa28e9c74d0 SHA512 76484d1bb29bb2e0bef2e6c536b3083229087ebd7dc23572e747bd130e5a86aa71ea4aabdc1bccb837dc0871f9122c560fc6d7f71f0bcea85ed28030c1599836
 EBUILD libressl-2.4.5.ebuild 1286 BLAKE2B 2f6b5a35ccfed733987dad53c844fa19980280f9cb2f4409b9ceed29ab24b6c6abe17cd70c96a0fb1104b8f00f1bb9418b9f1a4f21bd4fa65c0df79337666680 SHA512 b623271bfd541eee7eb7dc9931f3bf32f065d6eb812070809a44367b39cf970c388481e5cf7a50395c545bd41052ea87a24e29ed8fe26fc632f460fe2685866c
 EBUILD libressl-2.5.0.ebuild 1293 BLAKE2B 2f803f7f397babb90638990842bb85d8eac8f8be788019b16a0a461fc431dd38cc2a0b28fbd9ab1f61e546a41ed125b413ddc90764f07955abab5fe6e1862cdc SHA512 cf663c2b97f4a3ecd2084861258f382333ca471a84cd767aab5e17c69d42693d946757348ee5b6cccd24ff380d70eb49504a70dec4461afbffb943d8282fc277
@@ -20,4 +21,5 @@ EBUILD libressl-2.6.2.ebuild 1306 BLAKE2B 77f16da66a78d313522552746f48e0f6818b4a
 EBUILD libressl-2.6.3-r2.ebuild 1313 BLAKE2B a2cfcdf23e0c2f983657942c11cf2ab7eb790f92e7e190408883394ace23ea376764c0566cd2b7b84a1f1911926e0482237bca32395e4d9554c6079df6cb61b7 SHA512 2ccfa381cb77ff46ec2753ba33e927e07730bf567395ebbe39c6b396e9c9d5ea9b56e7c26aafea4383fd24d2e0583e63c7ecd4f2a26841346066a97911f6fc8a
 EBUILD libressl-2.6.4.ebuild 1313 BLAKE2B a2cfcdf23e0c2f983657942c11cf2ab7eb790f92e7e190408883394ace23ea376764c0566cd2b7b84a1f1911926e0482237bca32395e4d9554c6079df6cb61b7 SHA512 2ccfa381cb77ff46ec2753ba33e927e07730bf567395ebbe39c6b396e9c9d5ea9b56e7c26aafea4383fd24d2e0583e63c7ecd4f2a26841346066a97911f6fc8a
 EBUILD libressl-2.7.0.ebuild 1326 BLAKE2B 895de6f69483f53e1e8d907e0628efb842b29f0070ed046cef29ef4944bf2ee9ad3e4f6ac77f3dcdcef7c73d7725f5e17ed65bac7d27b2c56d5c82a6a2cbae20 SHA512 661d6e830ec2ba554375c11e6259df45c915fee20e894a82763042f7ad7270191f63e4ea1d77e97965b902deb2159dc2a17f65fffc6df777ffa8caa9171fb9a9
+EBUILD libressl-2.7.1.ebuild 1326 BLAKE2B 895de6f69483f53e1e8d907e0628efb842b29f0070ed046cef29ef4944bf2ee9ad3e4f6ac77f3dcdcef7c73d7725f5e17ed65bac7d27b2c56d5c82a6a2cbae20 SHA512 661d6e830ec2ba554375c11e6259df45c915fee20e894a82763042f7ad7270191f63e4ea1d77e97965b902deb2159dc2a17f65fffc6df777ffa8caa9171fb9a9
 MISC metadata.xml 986 BLAKE2B 1c3f46d2694b17352ec02e1f2c331aae79c677ea638ed6290c51076961ac81f1b472576000fc162115f0ea1f037ac1c6ed0ea80c4603ef6a283e0ac4915fadad SHA512 bd38bf852aebe8dbac58fa324524f2fbbc0da5d22a673f5fa83dafeeee599f4022a46687d10f3d159b0953a0d4b0f1ea88156f7d04c2f1db864569dd29f3e4fe
diff --git a/dev-libs/libressl/libressl-2.7.1.ebuild b/dev-libs/libressl/libressl-2.7.1.ebuild
new file mode 100644
index 000000000000..e57761f47fe3
--- /dev/null
+++ b/dev-libs/libressl/libressl-2.7.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils multilib-minimal
+
+DESCRIPTION="Free version of the SSL/TLS protocol forked from OpenSSL"
+HOMEPAGE="http://www.libressl.org/"
+SRC_URI="http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/${P}.tar.gz"
+
+LICENSE="ISC openssl"
+# Reflects ABI of libcrypto.so and libssl.so.  Since these can differ,
+# we'll try to use the max of either.  However, if either change between
+# versions, we have to change the subslot to trigger rebuild of consumers.
+SLOT="0/45"
+#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS=""
+IUSE="+asm static-libs"
+
+RDEPEND="!dev-libs/openssl:0"
+DEPEND="${RDEPEND}"
+PDEPEND="app-misc/ca-certificates"
+
+src_prepare() {
+	touch crypto/Makefile.in
+
+	sed -i \
+		-e '/^[ \t]*CFLAGS=/s#-g ##' \
+		-e '/^[ \t]*CFLAGS=/s#-g"#"#' \
+		-e '/^[ \t]*CFLAGS=/s#-O2 ##' \
+		-e '/^[ \t]*CFLAGS=/s#-O2"#"#' \
+		-e '/^[ \t]*USER_CFLAGS=/s#-O2 ##' \
+		-e '/^[ \t]*USER_CFLAGS=/s#-O2"#"#' \
+		configure || die "fixing CFLAGS failed"
+
+	eapply_user
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		$(use_enable asm) \
+		$(use_enable static-libs static)
+}
+
+multilib_src_test() {
+	emake check
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	prune_libtool_files
+}
diff --git a/dev-libs/libusb/Manifest b/dev-libs/libusb/Manifest
index 698add4a79e6..0607c3b824ef 100644
--- a/dev-libs/libusb/Manifest
+++ b/dev-libs/libusb/Manifest
@@ -1,7 +1,9 @@
 DIST libusb-1.0.19.tar.bz2 521496 BLAKE2B 9f38dcb8f053019511dc2eed93772183c5487917794abd2839e981924bf05e39aba5cee4fb9a366b78e4d265fb16a921fb64c9a083323993ce21543d37073720 SHA512 f42f0187bfec16ebabad64efef7a7651ee85dcf2af1b7cbe543b7de615f9c6432f7eea5fcc6b23335591dcad287c905eb9bd56199cc5d3b47435027ad678f2c1
 DIST libusb-1.0.20.tar.bz2 795247 BLAKE2B 9b3b4b9e372487ca355611917eb00a41d439df391796edf0b4fea28fcd88ca92214d05c4beb8eaf918028d833544e385e59ca38426880c293e070c5f1fc64647 SHA512 4230047dbc18db402f399a6b228f70da37ce4f9da9d57203e5c31cf0edec5ddd664865b4f16038a2ae72c26097e713b709b9e882a11b65a274e84993d617c765
 DIST libusb-1.0.21.tar.bz2 607417 BLAKE2B c76352a19f416ad27b8940e99f38878e248cdbc04ef97752f8c8468ab0391869ab611197e3e143d69e0e23563da59f1691c14fce72958fdf28ebf10dd8c1521b SHA512 015ca07bdb559aa40af5db1302ab0b1c8a30d593699fe2f3c9f45162673dc7b608cecc58d60fde8f3bde2a68370794a045e8efa48fc55402eece11261e525762
+DIST libusb-1.0.22.tar.bz2 598833 BLAKE2B 38d01c1dd1837434c24008151a27cdfb2b2e9aab30fe95e4403bad613a0147a13b9b029814e15520bcfc2c181b00e3c5cc1ffdc3a586a604190bf441d3c89318 SHA512 2a93ba48bb66b9775838c16d74f7269348d9bc163f94ccf2842d1108d95a41cf79f8c8065233bea410fb94261a462dbb08ecfa1a9b6d3ddf4a5980e6043f74f4
 EBUILD libusb-1.0.19-r1.ebuild 1640 BLAKE2B b772c5fc3e9b8c7dfb4923da67d1eea3f8c8358f0784643f42ddb2414423daa9f922b650d06c4fa9e6457018e77f450376a81cae98e9ce1c22375317602194b6 SHA512 141aee9763ccc76e11ce4d074cece02369c7f65fda639a3c754e548b9ff1bd7ac00f3244cc1a04d8f2a5ca4507a5a8192eb11e8f30908ca239700012c982239a
 EBUILD libusb-1.0.20.ebuild 1733 BLAKE2B a0281c5ce42922e235c7ad7b78bf76d62dd5441fff8e7cd7b98f334c5e0906de32c284067d5bbcfd92b7b1c3a82041bcf411bf9ec53159516fa74933025dbfbe SHA512 5f926dcca1eb2e7bc614626fe1a751a2632e88abcf4b9152781e23ffb77a4d1a72971ea5a0bd5f4e7679d348eba294db30d18c55298860a9d09555e0126d0eea
 EBUILD libusb-1.0.21.ebuild 1577 BLAKE2B 4e51f54f8c8b10b0a21ea9f5ea3111c2df9e14a32ca387ce96a3f3b5e26da63baf8ffd26d69deee04b55c50cc351024e719d3fc52d0b3a54c3301272ca21ac1d SHA512 0e42d007ce9ad04d9de74737eb9ff417ea9725cdedcbc0a5410722bf648ea3255f8e08cf0b8d4126d5bb48d3f543e082574fb551402d62255813c1cd4fd5a8ec
+EBUILD libusb-1.0.22.ebuild 1586 BLAKE2B 977c9b824b037a5f667547ed24e0a3628f30c1023f69e01e371f7afe24876c8a404d903544da6d0053f00974f9bbb8c5205e29e8ea68762315bbd66cce1a0f1b SHA512 43174dbbfc73f2db901de5670d8abb67dcf431b205cff0b03fedadd463d017411a332b5610944964a2cbd905867b0d7dcdbe35503885c400b4402fcb9e8fe359
 MISC metadata.xml 437 BLAKE2B 19a1ea2b26db27c6441a15502f61ca4240b1180b9aaaaf3942ce5b8cce5ee45724385401ec067901e31a0da785a636ca2e2a9d27efe231094d3952288374d169 SHA512 a67b2294e73782a948e338bc8820bc023e39ad612319a38387b3ee15e63903687ce4d90d8246df93cf2ea498c5c8dab25cb760c3f333d6dffc5d4d7b8c77a0a0
diff --git a/dev-libs/libusb/libusb-1.0.22.ebuild b/dev-libs/libusb/libusb-1.0.22.ebuild
new file mode 100644
index 000000000000..9790ec477e27
--- /dev/null
+++ b/dev-libs/libusb/libusb-1.0.22.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit ltprune toolchain-funcs multilib-minimal
+
+DESCRIPTION="Userspace access to USB devices"
+HOMEPAGE="http://libusb.info/ https://github.com/libusb/libusb"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 -x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="debug doc examples static-libs test udev"
+
+RDEPEND="udev? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP},static-libs?] )"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )
+	!udev? ( virtual/os-headers )"
+
+multilib_src_configure() {
+	ECONF_SOURCE=${S} \
+	econf \
+		$(use_enable static-libs static) \
+		$(use_enable udev) \
+		$(use_enable debug debug-log) \
+		$(use_enable test tests-build)
+}
+
+multilib_src_compile() {
+	emake
+
+	if multilib_is_native_abi; then
+		use doc && emake -C doc docs
+	fi
+}
+
+multilib_src_test() {
+	emake check
+
+	# noinst_PROGRAMS from tests/Makefile.am
+	tests/stress || die
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+
+	if multilib_is_native_abi; then
+		gen_usr_ldscript -a usb-1.0
+
+		use doc && dodoc -r doc/html
+	fi
+}
+
+multilib_src_install_all() {
+	prune_libtool_files
+
+	dodoc AUTHORS ChangeLog NEWS PORTING README TODO
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins examples/*.{c,h}
+		insinto /usr/share/doc/${PF}/examples/getopt
+		doins examples/getopt/*.{c,h}
+	fi
+}
diff --git a/dev-libs/uthash/Manifest b/dev-libs/uthash/Manifest
index c5071c1ed0af..7067ec7640fe 100644
--- a/dev-libs/uthash/Manifest
+++ b/dev-libs/uthash/Manifest
@@ -1,5 +1,8 @@
+AUX uthash-2.0.2-cflags.patch 250 BLAKE2B fc632cc23ffb5ddc89e3d91ea753f0a8f2803890203c7227a01b694603842490027e411e304e3db3960b0920f53f1390010f570bffa38d94a449864cbec938eb SHA512 d87dfbc7be1df49d5c6f06c413800693491f2bc4d0b4b0bddff5f1519a7de4d4ab95d3642e15273d6ddca6a19a9d511859ec999aebf81c8739bab4a7caaebfc3
 DIST uthash-1.9.7.tar.bz2 373059 BLAKE2B 59e24e42a935e44da840ef7a204b43c19bc837b6a5c87ed464143b67608021661603af4f76d143ac5454082f4e391bccc2fd5b443cf23527ca6ef9b530751de0 SHA512 8c02f9ac846a6bfd7292724a3683ae360ff37bba8e3ca98fca106da84976cac9c61766069989ee2c633b20bf82b64658400687a7cfbccab5e98e5fb6cb2e5caa
 DIST uthash-1.9.9.tar.gz 225620 BLAKE2B 4c23cc11c54ac2c8af96522455126a5fdfb1f533078f3f8259b33376d9e08ee6a347edc16951a732ab5c1100e302f81b6f7c7477da1ab0d36b794ce5a3400583 SHA512 40b888529db6baba7bdb0a11c3f782719c40470f6b8e4d75ed480c4c465606e990abf65786156a93f4e2f9c8805cbc098550cc3c62e33b7345fa5bf6d146a8c4
+DIST uthash-2.0.2.tar.gz 191173 BLAKE2B a4a2ddb19fcc9af1105bc07deb8ccbe9c3f04518b609f7cfd16f0a05ec3e16ffb25fb5f0a5f258413f9f52facaa26adf4ea0683415416c12ab36bf11883976ae SHA512 0c2e686eb5a1d6a03a6fa1d42e803fca4e9b60b2d965c635a5a33d487c8d115f1f8155ff99a0e1874b69f6b66c04ea7d8866472a39abe5d1a23ae73f6fa956d7
 EBUILD uthash-1.9.7.ebuild 673 BLAKE2B b0ccbafc68e7a3bd4cd20f18aec6979068f789a830e578c99a4e80c1a7a9988da8b34ebf7141e61377df693ce7c5044f4d958a4e0069a99bb29fd3ecf4191220 SHA512 c8fd82b22f09ab684a8c594e968f1ee95086bbfcfa52b2d07b902a3f7ab8e77f082f5e90e28996c983874e59a8176a39640f6b4de4f802a35eb923d9c0a39518
 EBUILD uthash-1.9.9.ebuild 707 BLAKE2B 99347104c2e53f8e4c6b969508749d3e9ad58243faf5ef49332f7e7b351876b082f4b6562fdd6e8b3271f6accc372776169cd1ed9ac8c4fe56c2be4cf62d48e2 SHA512 47a6d8963b4f1eb2b9716f42c10fcf9f71afb5c1ed92796e920365add71601a63433c33866f8c0ab142ae15e026b199e468c3e5379687dc6b0d4579827fe6eca
-MISC metadata.xml 308 BLAKE2B ed871419ec87578e344968fd3699cf42389560c3d3830f96d7105d9f7b7d43f1a64f58f14192a94aa556aff31b4c69d7014d4de732644277afac062e8a0567e5 SHA512 42a39e288a9a0b85efe970ff9386b89982b52b12bc68c1162b43600406d580d48eb567dbf56fa5128938625b91ab1af7e8ac915af6d59035a3ac090091d82183
+EBUILD uthash-2.0.2.ebuild 637 BLAKE2B 7cabdd353066e4b5c0e076ed27ce67977cf79ea58441942f6d0fd2cbcd1444ed80e465d76138468a13d342c31a9fc7b535bc253a94bcde1571c7cf44df448209 SHA512 5e67fe483ae3ae421cee8182691f8c0dd665a0d64ab797bb8f24f27ff271ad2ecb081b09b422be4617c9737cc5827d2460f8213f33b7a6219f898d1d6c095216
+MISC metadata.xml 255 BLAKE2B ab14729a41f74f763ae36bef2284978ccc3d74ac40ed604ff797c16ea13029db8add12376bdc72c944356971a31e17a0f8fba2f08a822cf2f69de7792ace0423 SHA512 e251c1de46006091df4d8a908a540cf1251d4e3b0f4f8c3710221e25d9d822a66d9486b3972fb06cfcfeb1f488c351b38b0aa7fab54433f70d63de7ca9dcf479
diff --git a/dev-libs/uthash/files/uthash-2.0.2-cflags.patch b/dev-libs/uthash/files/uthash-2.0.2-cflags.patch
new file mode 100644
index 000000000000..e71506bce15b
--- /dev/null
+++ b/dev-libs/uthash/files/uthash-2.0.2-cflags.patch
@@ -0,0 +1,11 @@
+--- uthash-2.0.2/tests/Makefile
++++ uthash-2.0.2/tests/Makefile
+@@ -18,7 +18,7 @@
+ CFLAGS += -I$(HASHDIR)
+ #CFLAGS += -DHASH_BLOOM=16
+ #CFLAGS += -O2
+-CFLAGS += -g
++#CFLAGS += -g
+ #CFLAGS += -Wstrict-aliasing=2
+ CFLAGS += -Wall 
+ #CFLAGS += -Wextra 
diff --git a/dev-libs/uthash/metadata.xml b/dev-libs/uthash/metadata.xml
index d06a284b1eb4..ce8a4ddcbac6 100644
--- a/dev-libs/uthash/metadata.xml
+++ b/dev-libs/uthash/metadata.xml
@@ -4,6 +4,5 @@
   <!-- maintainer-needed -->
   <upstream>
     <remote-id type="github">troydhanson/uthash</remote-id>
-    <remote-id type="sourceforge">uthash</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-libs/uthash/uthash-2.0.2.ebuild b/dev-libs/uthash/uthash-2.0.2.ebuild
new file mode 100644
index 000000000000..3800e6d66a65
--- /dev/null
+++ b/dev-libs/uthash/uthash-2.0.2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="An easy-to-use hash implementation for C programmers"
+HOMEPAGE="https://troydhanson.github.io/uthash/index.html"
+SRC_URI="https://github.com/troydhanson/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+
+DEPEND="test? ( dev-lang/perl )"
+RDEPEND=""
+
+PATCHES=( "${FILESDIR}"/${P}-cflags.patch )
+
+src_test() {
+	cd tests || die
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	doheader src/*.h
+	dodoc doc/*.txt
+}
diff --git a/dev-lisp/Manifest.gz b/dev-lisp/Manifest.gz
index bbba4d6108f3..081dbd6072eb 100644
--- a/dev-lisp/Manifest.gz
+++ b/dev-lisp/Manifest.gz
diff --git a/dev-lisp/clisp/Manifest b/dev-lisp/clisp/Manifest
index 175553c74289..b88d320f9d08 100644
--- a/dev-lisp/clisp/Manifest
+++ b/dev-lisp/clisp/Manifest
@@ -7,5 +7,5 @@ DIST clisp-2.49.90.tar.bz2 8921458 BLAKE2B 3be7cfe41038f42d8844d500877fa5c20e5c2
 DIST clisp-2.49.tar.bz2 8091011 BLAKE2B e034c581b8100837b34d0adf1ef45bd667272d062945875175958178b4ef5b11e899dfb76505eb8cb51fca6101c11a9f21fb2cc9a78a3c0f82b06166211434f7 SHA512 eef66fc85199a2c283b616db61bf67ff103eeb0f19fa907da48994dc790b6f5f8d0c74fb3bd723c6b827c0ff3cfd89fa6ba67934fc669ed5d5249044b5140d81
 EBUILD clisp-2.48-r1.ebuild 4949 BLAKE2B 7710e82e84d2dffe50f4301218fe0f0083f0b57d92558645f938c271a299746a39006b6afc205b79c80eecd64a0f63355a5872312cd18916045ed9dfe75b777f SHA512 4075d6d80ebf2489375796ed5ebca38a7051a11eff84e73ca47aa485d122e8a3c61d0b9204de999247f666263a363a1adbc0960d7388b0ea307d5c6680fb64fe
 EBUILD clisp-2.49-r9.ebuild 4498 BLAKE2B e70568c46e9c8b1a5987295e9a67fd4bdabc9eba785799de3ec7bbf3ac9046db6947581bc1d9a795ff966c7e1ae30f354c44ccf25b79b7c3e7149a2625956193 SHA512 f2a7692c5427c871fa027eb6674a1d41ed834184f9fc1dcceffa729cc270d4aba434997741735ff5b8fcf5d7d166548311648a42d22534065dc2bf6b95906630
-EBUILD clisp-2.49.90.ebuild 4302 BLAKE2B cec116cdf761ffe572f040fc58b4d73b14b1ae87652354abea37bfe11778d5e6c23933ea22b1871d6a50a86624cabce84f28a994208fc84ac435ac8b6bbbe987 SHA512 82fe3ef5cc85057b8bb640b3e68db2cf6093a1d808825e37f440c43309b575f6504ba076808b5c7450dcb75f3ca73bac274b9378572293746dd2939363f9ba9b
+EBUILD clisp-2.49.90.ebuild 4308 BLAKE2B 30048d6fac560dba2431371177f1833015baee15fd113d93ef10fa5abc420d3aca4ba409abafb056df933df726e8a47d46233bf159facb657e570c7516940dd6 SHA512 98a954496021d9661808c203b0420ac0c142501662e5f905f56c8665ed6128195a2cc0142674f73399d1e52d7a7af45c26a52929952f67d47e0963cbabe7a08d
 MISC metadata.xml 1451 BLAKE2B 6310ef5f37288b2b3a156c9d4557c3925a6e1f7ea3622c801f4acc5832159dd32db7d7f174752b69f0b1d0eee2825b0e8e86616fa34074fc3aabdf7fc4275559 SHA512 b475d35af6509939c05d9200fa61616e38817e0c49622b82cff322f09780755c2361fcbba2e839f627e77cad558ecae2cf7f02f8010d595e74b451e5307f38aa
diff --git a/dev-lisp/clisp/clisp-2.49.90.ebuild b/dev-lisp/clisp/clisp-2.49.90.ebuild
index 9168ff8785d8..8aa62e9f5046 100644
--- a/dev-lisp/clisp/clisp-2.49.90.ebuild
+++ b/dev-lisp/clisp/clisp-2.49.90.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://haible.de/bruno/gnu/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="2/8"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86"
 IUSE="hyperspec X berkdb dbus fastcgi gdbm gtk pari +pcre postgres +readline svm -threads +unicode +zlib"
 # "jit" disabled ATM
 
diff --git a/dev-perl/Manifest.gz b/dev-perl/Manifest.gz
index 7ce4fa54cb2b..8a220aa4f628 100644
--- a/dev-perl/Manifest.gz
+++ b/dev-perl/Manifest.gz
diff --git a/dev-perl/Template-DBI/Manifest b/dev-perl/Template-DBI/Manifest
index a54ad82d5c04..c95abc074897 100644
--- a/dev-perl/Template-DBI/Manifest
+++ b/dev-perl/Template-DBI/Manifest
@@ -1,5 +1,5 @@
 AUX Template-DBI-2.65-no-dot-inc.patch 1147 BLAKE2B 596c41017d8f737626144020761d5fc04f5e4cc9c0f9817d016f70463dfab28f92ab6e4743e7538eea6940a6e9f24312a922b2a77055c269f2db78f79eaf9372 SHA512 27f519bf33c1741db9de6400b24cb2f32341803ef7bfb115b0fc0dd38b01e17bded6ea34ed03366616505610cb8b419d1e051f29f3b0c930da8bc95fe338a187
 DIST Template-DBI-2.65.tar.gz 15681 BLAKE2B 43c4b7219c34dc59e54463f78afeb5c2152de0a71f1c5b0640364b7b46a6d62819022156b116b38a5c9630ae7fd41b9be6557ec368b15030320ce923e183d985 SHA512 8abbba6e799ee75a62d9f6d72f6314a4044ada849cb47a10bac204aa40f67d62ef41fac44f7fcc17f0a608fc24a3c0baeb9b4955a2d589008283b9eaae06aca6
 EBUILD Template-DBI-2.650.0-r1.ebuild 481 BLAKE2B d0127b72d6e8857631e3919c72e401ed65c403aea42133eb5d0b710c8f01cebac8261da5ed7577771bcd10120d3e258f823ddce6405004cbe4880e015a267a56 SHA512 d01610b98e95c4bde8b1199ec2993d870dca04fddcea821a99415c7ea4cdec1c5e9e83325fec2b29b384214d17ad13737aaff5ffd0c583d226939bc3152c27eb
-EBUILD Template-DBI-2.650.0-r2.ebuild 521 BLAKE2B 04078e25d9fb7a3cb3fa2b6e4b45ac2bb6a6864d0cf0c9583ddc3b422414185b457fc10deee33d37fcf932751bda06f4435465e129700775ca17852b256a8f9f SHA512 517fcddacae956e8c527bbf12308bf574e4aa4f3f89c1b575246305f84fb54690bab895c195bd9b813fe9b5fbc19dcc8268a0faeb902ee80d952883d802f2a2e
+EBUILD Template-DBI-2.650.0-r2.ebuild 517 BLAKE2B c83e461652c81976d28e13c51f028c23aafbb5df8b33d1cb5fd8ec3ee5b2e73b864e06db4bed9ab4c7cb2e6bb0b5070654481b561350317cdee3c6f188b5751b SHA512 535950aed48027c4bf0dc0e33e8b5845021cdb854a849ec988d14d58fe856cd9153274746ae7cbcd270ed4cb12cf064a4ad7dfd852eb0fa0b6d6ccfef92d748e
 MISC metadata.xml 557 BLAKE2B ca9c0e53baf009d00ab913ecd10f6b26af78078d0951af357aff6680ec4bf3b59c938d3dd4d9737cbe27b638fc3ead9035f949f8de45d628ddaf70359022b562 SHA512 0fd6e8cd645742b786a40a8218725f6df39b14a8363e3d9c3bdb3db20bd8c0995c2911094d24701e15c23852d1a861de599254991a622e72ba156892afab3114
diff --git a/dev-perl/Template-DBI/Template-DBI-2.650.0-r2.ebuild b/dev-perl/Template-DBI/Template-DBI-2.650.0-r2.ebuild
index 6f9f1eb9648b..7927b05f8bef 100644
--- a/dev-perl/Template-DBI/Template-DBI-2.650.0-r2.ebuild
+++ b/dev-perl/Template-DBI/Template-DBI-2.650.0-r2.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="DBI plugin for the Template Toolkit"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~ppc-aix ~x86-fbsd ~x86-solaris"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~ppc-aix ~x86-fbsd ~x86-solaris"
 IUSE="test"
 
 RDEPEND=">=dev-perl/DBI-1.612
diff --git a/dev-perl/XML-DOM/Manifest b/dev-perl/XML-DOM/Manifest
index c900fc936327..3c575eb3c7e1 100644
--- a/dev-perl/XML-DOM/Manifest
+++ b/dev-perl/XML-DOM/Manifest
@@ -1,5 +1,7 @@
+AUX XML-DOM-1.46-nodotinc.patch 4213 BLAKE2B ff995ec9374859789db0283818d942b24dfec33f949ccb90085b86cbfd9397fa3166f355d8c2934033edacf921155e61e367b1488812da484015804d588d3810 SHA512 72390cd8cc2aa9d1bb4f397006db37ff32ca16b4d5324265b5f7ff20234819fb65eadd89ef849bafccf732a7b91fe44fb79aa5da7561061b3a34d5c57d2e67c7
 DIST XML-DOM-1.45.tar.gz 116855 BLAKE2B 5374e69925fb1afe835447655493d4292533252d5d1ee461ad8578e1651aaea9c028be2766c7617560214d0c50e38d94a9e9bee8a20fa6be66fd4f50b53eaa52 SHA512 559082f36d96dee28fd8ade7867b56abbd904e8fd6f585a4a2b348b2a6ae7e7892a2974b3d1983a296044e08ce346fdd006999aab364638d8c998dcee441fccf
 DIST XML-DOM-1.46.tar.gz 117291 BLAKE2B 5cceeb851a052289d4eec061703c6467d0500e5d231c8652e9b3763773c6468ee41fae0aa0308e7db61ba14635bea09ebe866753710c781c89d9573e64f7aaee SHA512 0fc96571996262bb0a99bd5f85e5d9e0f9c71c604c46c74129f0f560aa2749f7b945c591bfc13b9178d2b8d83826d5306f4ac71db33b51c55ce4d76398bab13d
 EBUILD XML-DOM-1.450.0.ebuild 597 BLAKE2B 85cf2177fffcfb180ee6fae58ad12d109d8b2c1fdf7c835ea856d54438ff0c30b26090db7cc1c22848bf9a7fa0f80246300d572873be03116bda49d6f5ddc8b9 SHA512 97904e157db27851cad3254492779cd5d319ae6d03153f70fea2ac6040ecf1ca188071fb69ddc3f075f1b6cecdd713bbb77a23e9d605924469be9854dd5f1ad3
+EBUILD XML-DOM-1.460.0-r1.ebuild 669 BLAKE2B ee5dfc13fb25ad616bc66ab05535881d742674d578c9912ecae7e214f443fa435635336a5f93a1512e7b0df0e23264b8cc65c6fccba3e9c929d2de48943c7e74 SHA512 c92bc10cc5391d153a7b738c59dcd1485662dc3e5f2e6fd05b8bef007258192463bf7ea919d949624eaa82df42889afa2341a7eeb0cdc5584febb662df60e003
 EBUILD XML-DOM-1.460.0.ebuild 619 BLAKE2B 85f5252bb017dd9b012607fe1f541c205ef9e73f114726ac54458624c4685b99074ba1d13a1f516a5bd5ff154bbf07787f66f4dbd87b8fe3bcc64dcf49ef2b3f SHA512 50bad054ef445aacadd5f21183b01c5bb696ae113207397f11518eac0a04d9b4164d21a327ca62222c05d447c7fcb1a20c3c7fcf29ee29033dea0d6d75c1b711
 MISC metadata.xml 2325 BLAKE2B 5a5fd11575ca8146cb7798ae8852a0290d29f2d33168e04de8fbdd13cd3104d21b7ab14621eff9e5d14331a6c9a3f14cc0bf4d8ee2354c853d743fdaa9a48359 SHA512 80b933f9a5569530b77d63f9e710e6fd5011dc0c9227fa574e2a41c0880c65f8a1f030efe6684a6f6b2f8b7586ab864d3311aa71724ac4fea15876a2fd3905d3
diff --git a/dev-perl/XML-DOM/XML-DOM-1.460.0-r1.ebuild b/dev-perl/XML-DOM/XML-DOM-1.460.0-r1.ebuild
new file mode 100644
index 000000000000..93154976695e
--- /dev/null
+++ b/dev-perl/XML-DOM/XML-DOM-1.460.0-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=TJMATHER
+DIST_VERSION=1.46
+inherit perl-module
+
+DESCRIPTION="A Perl module for an DOM Level 1 compliant interface"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="test"
+
+RDEPEND="
+	dev-perl/libwww-perl
+	>=dev-perl/XML-Parser-2.300.0
+	dev-perl/XML-RegExp
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		>=dev-perl/libxml-perl-0.70.0
+	)
+"
+PATCHES=("${FILESDIR}/${PN}-1.46-nodotinc.patch")
diff --git a/dev-perl/XML-DOM/files/XML-DOM-1.46-nodotinc.patch b/dev-perl/XML-DOM/files/XML-DOM-1.46-nodotinc.patch
new file mode 100644
index 000000000000..3d2078aba68b
--- /dev/null
+++ b/dev-perl/XML-DOM/files/XML-DOM-1.46-nodotinc.patch
@@ -0,0 +1,156 @@
+From 6618c46e46be864dc7f13b217e2912c79bd4b61b Mon Sep 17 00:00:00 2001
+From: Kent Fredric <kentnl@gentoo.org>
+Date: Sun, 25 Mar 2018 22:48:44 +1300
+Subject: Patch test suite for '.' in @INC removal in 5.26 and greater.
+
+Bug: https://bugs.gentoo.org/623186
+---
+ MANIFEST                                     | 4 ++--
+ t/dom_astress.t                              | 1 +
+ t/dom_attr.t                                 | 1 +
+ t/dom_cdata.t                                | 1 +
+ t/dom_encode.t                               | 1 +
+ t/dom_jp_astress.t                           | 1 +
+ t/dom_jp_attr.t                              | 1 +
+ t/dom_jp_cdata.t                             | 1 +
+ t/dom_jp_modify.t                            | 1 +
+ t/dom_modify.t                               | 1 +
+ CheckAncestors.pm => t/lib/CheckAncestors.pm | 0
+ CmpDOM.pm => t/lib/CmpDOM.pm                 | 0
+ 12 files changed, 11 insertions(+), 2 deletions(-)
+ rename CheckAncestors.pm => t/lib/CheckAncestors.pm (100%)
+ rename CmpDOM.pm => t/lib/CmpDOM.pm (100%)
+
+diff --git a/MANIFEST b/MANIFEST
+index fe947b3..72eeb85 100644
+--- a/MANIFEST
++++ b/MANIFEST
+@@ -1,7 +1,7 @@
+ BUGS
+ Changes
+-CheckAncestors.pm		Used by test cases in t/
+-CmpDOM.pm			Used by test cases in t/
++t/lib/CheckAncestors.pm		Used by test cases in t/
++t/lib/CmpDOM.pm			Used by test cases in t/
+ FAQ.xml
+ MANIFEST			This file.
+ Makefile.PL
+diff --git a/t/dom_astress.t b/t/dom_astress.t
+index 2bc7a6a..ac11c96 100644
+--- a/t/dom_astress.t
++++ b/t/dom_astress.t
+@@ -9,6 +9,7 @@
+ BEGIN {print "1..4\n";}
+ END {print "not ok 1\n" unless $loaded;}
+ use XML::DOM;
++use lib 't/lib';
+ use CmpDOM;
+ $loaded = 1;
+ print "ok 1\n";
+diff --git a/t/dom_attr.t b/t/dom_attr.t
+index afbea05..683f727 100644
+--- a/t/dom_attr.t
++++ b/t/dom_attr.t
+@@ -1,6 +1,7 @@
+ BEGIN {print "1..23\n";}
+ END {print "not ok 1\n" unless $loaded;}
+ use XML::DOM;
++use lib 't/lib';
+ use CheckAncestors;
+ use CmpDOM;
+ $loaded = 1;
+diff --git a/t/dom_cdata.t b/t/dom_cdata.t
+index 3f4a47b..a7692df 100644
+--- a/t/dom_cdata.t
++++ b/t/dom_cdata.t
+@@ -1,6 +1,7 @@
+ BEGIN {print "1..3\n";}
+ END {print "not ok 1\n" unless $loaded;}
+ use XML::DOM;
++use lib 't/lib';
+ use CheckAncestors;
+ use CmpDOM;
+ $loaded = 1;
+diff --git a/t/dom_encode.t b/t/dom_encode.t
+index 71519a4..60abfca 100644
+--- a/t/dom_encode.t
++++ b/t/dom_encode.t
+@@ -1,6 +1,7 @@
+ BEGIN {print "1..3\n";}
+ END {print "not ok 1\n" unless $loaded;}
+ use XML::DOM;
++use lib 't/lib';
+ use CheckAncestors;
+ use CmpDOM;
+ $loaded = 1;
+diff --git a/t/dom_jp_astress.t b/t/dom_jp_astress.t
+index 04c66b6..19c1b21 100644
+--- a/t/dom_jp_astress.t
++++ b/t/dom_jp_astress.t
+@@ -1,6 +1,7 @@
+ BEGIN {print "1..4\n";}

+ END {print "not ok 1\n" unless $loaded;}

+ use XML::DOM;

++use lib 't/lib';

+ use CmpDOM;

+ $loaded = 1;

+ print "ok 1\n";

+diff --git a/t/dom_jp_attr.t b/t/dom_jp_attr.t
+index 4ecca27..eb37091 100644
+--- a/t/dom_jp_attr.t
++++ b/t/dom_jp_attr.t
+@@ -1,6 +1,7 @@
+ BEGIN {print "1..23\n";}
+ END {print "not ok 1\n" unless $loaded;}
+ use XML::DOM;
++use lib 't/lib';
+ use CheckAncestors;
+ use CmpDOM;
+ use utf8;
+diff --git a/t/dom_jp_cdata.t b/t/dom_jp_cdata.t
+index e512fc5..7c4dcb1 100644
+--- a/t/dom_jp_cdata.t
++++ b/t/dom_jp_cdata.t
+@@ -1,6 +1,7 @@
+ BEGIN {print "1..3\n";}
+ END {print "not ok 1\n" unless $loaded;}
+ use XML::DOM;
++use lib 't/lib';
+ use CheckAncestors;
+ use CmpDOM;
+ use utf8;
+diff --git a/t/dom_jp_modify.t b/t/dom_jp_modify.t
+index a749c42..049dfa1 100644
+--- a/t/dom_jp_modify.t
++++ b/t/dom_jp_modify.t
+@@ -1,6 +1,7 @@
+ BEGIN {print "1..16\n";}
+ END {print "not ok 1\n" unless $loaded;}
+ use XML::DOM;
++use lib 't/lib';
+ use CheckAncestors;
+ use utf8;
+ $loaded = 1;
+diff --git a/t/dom_modify.t b/t/dom_modify.t
+index ba74475..42058a6 100644
+--- a/t/dom_modify.t
++++ b/t/dom_modify.t
+@@ -1,6 +1,7 @@
+ BEGIN {print "1..16\n";}
+ END {print "not ok 1\n" unless $loaded;}
+ use XML::DOM;
++use lib 't/lib';
+ use CheckAncestors;
+ $loaded = 1;
+ print "ok 1\n";
+diff --git a/CheckAncestors.pm b/t/lib/CheckAncestors.pm
+similarity index 100%
+rename from CheckAncestors.pm
+rename to t/lib/CheckAncestors.pm
+diff --git a/CmpDOM.pm b/t/lib/CmpDOM.pm
+similarity index 100%
+rename from CmpDOM.pm
+rename to t/lib/CmpDOM.pm
+-- 
+2.16.2
+
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index b059cea2743c..58069eb2aac3 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/attrs/Manifest b/dev-python/attrs/Manifest
index 15eaff24b096..c057655b5afd 100644
--- a/dev-python/attrs/Manifest
+++ b/dev-python/attrs/Manifest
@@ -1,10 +1,6 @@
 AUX test_funcs-too-slow.patch 735 BLAKE2B b0806002c957f951c6c08a9c2caa9331d4524bd0a19edb6d61c4677ce42b3961e901c37632ae941471821d328563e92961c67e3d38bc8e5395621e78d9049922 SHA512 b6fee394c95a9c46dd822c8f36261b909a3a3de905e5b057d5026b9d204c01edc01f566336f3c06ee4f5b85da32f2dcd30fc73849d454c6446c63a0b08413140
 DIST attrs-16.3.0.tar.gz 57512 BLAKE2B e00c825034b21cb4d5a9eb9ca3ffb92193b8d793ebaeb8cb5e69b07c326738da4efd98ebc6e79903017276b6b501c56a8e0b37f6b0d13d8461b8ea4e5cb72b08 SHA512 1a91e6f27ecaf20c409c3abf88ffed5c6cfdbba8cff44637399b713271ff838a054f5859dd29440b2780d81b40673033e3f8e43dd491bece72e0a4f08c4ef688
-DIST attrs-17.2.0.tar.gz 73733 BLAKE2B 898f219ff73b73200b590f8e8011fd605d68fa68b94f1b59ae6dacdc6ef5185e4858702ac0e816bed33a07450676cfe1bc6040e0918f94adb04fc3552882efbf SHA512 02243e59ff417deddb330e841d42c0f43d3bea4435f114d3a9a8f4c3bd424c2ef565c630d179db7b3687d22091bf6e619de661171248c0ff0a0e5ec5f9bf7e21
-DIST attrs-17.3.0.tar.gz 89046 BLAKE2B 32ac348b57a5ce5b69e099c3f13e11af51a95a797bfc21eecdb8eca9e9785e5e205c5f0778d59c268f4f1ed8f50b86df0765c7c82ea91a1177683bfad0069962 SHA512 69a104a0a00c13946ca61c5e21a6acd4e75a43c775d54f270c9da3fd9475df54997c32a25a5c47a24012daac2f525457b1727fb2bb7291afb90627bf87d818ee
 DIST attrs-17.4.0.tar.gz 97071 BLAKE2B f755abe89cedbf1ced003087fb106fae7c38dbdf0614ec0c525629ae09b3b790a7e0912da887dad4c5686afe7fb0df8123fea42e08e4e6718cdaf477edafcb2a SHA512 b631cd5af1be7c78175230363a3cf9d37cb0237d87b24f994812b5734985d114708d5bf7ee5d92b8b13c6b8daa313efde4a9f60f0630df0b62bbcf4928a016ff
 EBUILD attrs-16.3.0-r1.ebuild 873 BLAKE2B 7fcd8572f436e95630009878730261035f129198e98c907d4fc82150256090ef3bc295907482af7f7e69a5d190e339df0634ab0f5066651993e9b81b22bb63bd SHA512 9d6c4bf2906ed2bd07215634d831c963881ef36e4aa375d52dd0bb842f3e9c3d2a6323b080e08986bec85fb08d8f585ccd5e35ae85f53347b0054b58b5c400c3
-EBUILD attrs-17.2.0.ebuild 860 BLAKE2B cedbd1cda427752e53b88498275f5317c32358095d792e988fcfe1de400d225847bba12f665cc7b9106825a95967ab49671a4ac8dcd07772da5cc90532af77ec SHA512 a89e3110adc32b162d20e6f4d26d4cc784873069937f179503e1025935e4160b9e1120fc9febd5ed5a55328a161c62d265b2b4b0b2189487f4bcfbef4e2f5b25
-EBUILD attrs-17.3.0.ebuild 877 BLAKE2B a4d28f69fb50128341eac08a0d3d10596c36ac4b2d3d5cf9bf4bcbd076fab2db03b4594b49edcd7237190e8edc7d5e6d0c0909af638968f0e520fb901be1d482 SHA512 d6b3c667c32b768a0e859a77e9884ccb85605e3b51b2a3aa2a670d26bbe91a37c17623379eedc9434b7864a115a93c58fa3801ca523e393ab2fc858dab8b664e
-EBUILD attrs-17.4.0.ebuild 877 BLAKE2B a4d28f69fb50128341eac08a0d3d10596c36ac4b2d3d5cf9bf4bcbd076fab2db03b4594b49edcd7237190e8edc7d5e6d0c0909af638968f0e520fb901be1d482 SHA512 d6b3c667c32b768a0e859a77e9884ccb85605e3b51b2a3aa2a670d26bbe91a37c17623379eedc9434b7864a115a93c58fa3801ca523e393ab2fc858dab8b664e
+EBUILD attrs-17.4.0.ebuild 883 BLAKE2B 73161bf396917835fe610909ca06a18cfeef833c1cc55f4f7c5942ddb09ae9a418f705d1d37d9bfd1731d2f50e25ba1db96b312895877fd1569be615996e3060 SHA512 c623092e6e3bda57d7a953d061e00e1f9b1afb18010069f68880f9217b7f854a926e8cfd080649a098df9129b59e095289d62341a4b0f178bea6f3ba834c1407
 MISC metadata.xml 488 BLAKE2B 808447388863096af88f90f97c58025508d5b4cd1ecd760c59dd8af1fa664e16756029e3d5d6b233578b9c0d7be9c8469761c9a89f222ae9f47556b6ee983fc0 SHA512 d8336a60cb0b2b8d51a9833c0ba3d47acb29ec4942b2f03b750d407bcbb65461d867470226bee962a8e585cfd4ff11bfff67b66ed2270f9efbf35d3c46bbdda1
diff --git a/dev-python/attrs/attrs-17.2.0.ebuild b/dev-python/attrs/attrs-17.2.0.ebuild
deleted file mode 100644
index 5e9fdd7f33f5..000000000000
--- a/dev-python/attrs/attrs-17.2.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
-
-inherit distutils-r1
-
-DESCRIPTION="Attributes without boilerplate"
-HOMEPAGE="
-	https://github.com/hynek/attrs
-	https://attrs.readthedocs.org/
-	https://pypi.python.org/pypi/attrs"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="dev-python/zope-interface[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-lang/python[sqlite]
-		>=dev-python/hypothesis-3.6.0[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	py.test -v || die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/attrs/attrs-17.3.0.ebuild b/dev-python/attrs/attrs-17.3.0.ebuild
deleted file mode 100644
index 08e27b3718ae..000000000000
--- a/dev-python/attrs/attrs-17.3.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 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} )
-
-inherit distutils-r1
-
-DESCRIPTION="Attributes without boilerplate"
-HOMEPAGE="
-	https://github.com/hynek/attrs
-	https://attrs.readthedocs.org/
-	https://pypi.python.org/pypi/attrs"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~amd64-fbsd"
-IUSE="test"
-
-RDEPEND="
-	dev-python/zope-interface[${PYTHON_USEDEP}]"
-
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-lang/python[sqlite]
-		>=dev-python/hypothesis-3.6.0[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	py.test -v || die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/attrs/attrs-17.4.0.ebuild b/dev-python/attrs/attrs-17.4.0.ebuild
index 08e27b3718ae..d3fb2ff39a35 100644
--- a/dev-python/attrs/attrs-17.4.0.ebuild
+++ b/dev-python/attrs/attrs-17.4.0.ebuild
@@ -26,7 +26,7 @@ DEPEND="
 	${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
-		dev-lang/python[sqlite]
+		$(python_gen_impl_dep sqlite)
 		>=dev-python/hypothesis-3.6.0[${PYTHON_USEDEP}]
 		dev-python/pytest[${PYTHON_USEDEP}]
 	)"
diff --git a/dev-python/cliapp/Manifest b/dev-python/cliapp/Manifest
index edd055181797..ea680cb78bb3 100644
--- a/dev-python/cliapp/Manifest
+++ b/dev-python/cliapp/Manifest
@@ -5,5 +5,5 @@ DIST python-cliapp_1.20140315.orig.tar.gz 51107 BLAKE2B 3ff4b1203041fbc5ff0ad67a
 EBUILD cliapp-1.20140315.ebuild 619 BLAKE2B bb2d6ab798d93d38d31be45d4ba0d5e986a4ed2ba0fe9fed8ebab3fdc3c924347c1603ed5f0b1dc1bfd23482b16887f1d338eb62d6b2b48050dc42be67feafc8 SHA512 1c1d1e3b682ae148e5111004fddc77dbf8ee710165409e484a7cad2e9d086334a7d17d601c68d294c3c2ba28b6adda6a3df8b1ee26b46287dfde7102be2a2a76
 EBUILD cliapp-1.20150305.ebuild 605 BLAKE2B 823c4863996f55a48074590d0c2d910d9255fba57bdc325480d720a0f4e79fa4eb641daa4bcbf6a7ef507aec6fbd1459cfb7ba4d9e672d58ce6d3a625aecb152 SHA512 64d7a3a2f2af67354eab0d78a092e04fb9b7d9640e587d76681578f13d9feab832b567328c30f92ec8653d7d4759cdca37f9c39fa899f130348d28348aab61f3
 EBUILD cliapp-1.20160724-r1.ebuild 732 BLAKE2B 1e5428927cb789cf7bc6b71c89a6e737beb4243d7179ed5f30a945969df818f7eae2e7ae806c4235fde69b1d1ad5732f4f21d8d1565806cb800ba25ad2376427 SHA512 4d2221382e5484e5f65723f05f4081975d603e11d2ac44186bfd800fa160d49c444134cbb7c0781f422006d630685879a58ec0d8e2f206c998e6c831f475783d
-EBUILD cliapp-1.20170823.ebuild 678 BLAKE2B 0f152283edacce69a61d8be152558d3605b2852421e50776e7cca9d0cd46c6634352b28862a993f62e57e10d0ee06212d939e468e25d1ef8cc982e5e84e68ef5 SHA512 4787e19f1e6b1a6ec13cf7f8889fc703474a96c7de30e79ac0c130b4412afd1f3a6215816c9a9ef4916d4e2be5decbf3c0752477e19542e70b8c7d4d6f49a285
+EBUILD cliapp-1.20170823.ebuild 677 BLAKE2B 7df51b212cab73bec4ed27f0b45d2a4b299c131b82699f37db3179ddc5fb6629558df4accbeb1555e635172ece424818d72372dd952c2cc9f9819bd20589d41b SHA512 055f0484ad2e7ba1161fdf9aca3d226ef2e82eadab6bde1cf41e3c6b4fa1de19ced902112afcf708b582967bc782f22598a7a52af2a4aa6fabf051203e8d3e86
 MISC metadata.xml 250 BLAKE2B fef48a48388f26a915c53bca9aa9cab62fb73ec006736542afb4cbbe0c7b81d23afe2884f52433c7d390fc38ac32f957a6f6efe285ee1cafaed76407a964cf9b SHA512 924271cfb32ceafc4134e19b53fbeed96f2e9056addc3c2cbdec28890254abf5f0714979a3ab698ca046e41ef5c2cca2932350830bd8bd3a8e214d99123c12de
diff --git a/dev-python/cliapp/cliapp-1.20170823.ebuild b/dev-python/cliapp/cliapp-1.20170823.ebuild
index 9f455e0883db..576cbbb9f182 100644
--- a/dev-python/cliapp/cliapp-1.20170823.ebuild
+++ b/dev-python/cliapp/cliapp-1.20170823.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://git.liw.fi/cgi-bin/cgit/cgit.cgi/cliapp/snapshot/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd"
 IUSE=""
 
 RDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]"
diff --git a/dev-python/freezegun/Manifest b/dev-python/freezegun/Manifest
index b318ceafc111..c35cda78dc24 100644
--- a/dev-python/freezegun/Manifest
+++ b/dev-python/freezegun/Manifest
@@ -1,3 +1,5 @@
+DIST freezegun-0.3.10.tar.gz 20398 BLAKE2B 971f4f3de565878b8a1e4671160f41cc7c558f5c848f5c79dfc48e3f3e3cb71ff9c71090705167d4252edbfee040ef52a7eafd33073011c07337311a7e0ec366 SHA512 64364459dc72484e2124a20a0a84d2b88617efd0578fba687adb51635d578a1e36a00cb119998082610c608e7b6c3589bff5424e38845bad026e85449c8065a5
 DIST freezegun-0.3.9.tar.gz 18118 BLAKE2B 7382646acf0ca8100680cd44d22de3263541031686e05f7957023eaf22f2a1dea370c98f8b6af89a5075aa5636c304e6e7d5a1c64285aa221a73c732bfc5e0c6 SHA512 1aba8ffacc8b9ebdf810253181418bacb75c04222dc59a5e1e526a9f2d97573944926b1b9fcb6c6e6971a7958acaf9b7522c5582190ae6be448c043b6f908c17
+EBUILD freezegun-0.3.10.ebuild 870 BLAKE2B aa80183292882defdd403dc057ef6602f6be60f9ba8da775ebd2388d881e1b654db90e5aeb043a67a2f88061d2101fe9a11de1531db5091041d464e0a82e0cef SHA512 fb8f25c1b29d0c0192e51da335a27b5881411cf7c74467a39ac0a693e1d2d06bce5173f5f8e365844e5069320bdf90be3fa2b3399e37d75088eb15fc4bf5d6c1
 EBUILD freezegun-0.3.9.ebuild 655 BLAKE2B 4c2cb2e79de6feae14becdcdf141655396733db5ab58d033af8606aa6096af216ddb82add6403cb5b4f47ce6d0c14b9eac539281510bc023eed9a5c10e285b80 SHA512 4f41246dbf768e9c8dfd8b3c79f4761e231f76d0c5af8c142cd9b2cc76bf23ff6ff9783d68a5cf8e66daf6c0738779871c37cb4e9edc0e6ce0028f102a8d4bd6
 MISC metadata.xml 368 BLAKE2B fb6f96314188337bb64e24955ca9c4830ef82b11443779d2daca5dd124156db58efc27d6f28f8497b4308526459634cd3d32d7e1698cfdf943d987f493f5e636 SHA512 5d268015dd8be027059e5d405c47c0bf48ca8ead3103031e29748e63a9aa132321257b8f9963e557829a3602fe078933613e70b07b8291d32b7ce2da14b6bccd
diff --git a/dev-python/freezegun/freezegun-0.3.10.ebuild b/dev-python/freezegun/freezegun-0.3.10.ebuild
new file mode 100644
index 000000000000..c9305c43c92e
--- /dev/null
+++ b/dev-python/freezegun/freezegun-0.3.10.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 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{,3} )
+
+inherit distutils-r1
+
+DESCRIPTION="Let your Python tests travel through time"
+HOMEPAGE="https://github.com/spulec/freezegun"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="test"
+
+RDEPEND="
+	>dev-python/python-dateutil-2.0
+	dev-python/six
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		$(python_gen_impl_dep sqlite)
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+	)
+"
+
+python_test() {
+	nosetests -v || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/paste/Manifest b/dev-python/paste/Manifest
index 59dd2ea50222..23cec8f8bafa 100644
--- a/dev-python/paste/Manifest
+++ b/dev-python/paste/Manifest
@@ -1,4 +1,4 @@
 AUX paste-2.0.3-unbundle-tempita.patch 1260 BLAKE2B eee8a9ede07730cc6af7de910a0298bfac23f6d2b31467101375720782920d878716bf91a031ba651e00a61f3a7201708e94ecd8b78f1bd6a52c50ef2826f8d5 SHA512 f21894596c81d984bd7820876e7dfc614728beba107294fecbab084ae1e023428d4d86bde31e428c2f0aa78647636d19f476129ff319dd2c90052218cf428c98
 DIST Paste-2.0.3.tar.gz 643935 BLAKE2B 140f88cbab40728713a052e5aca0c7f14336d526a2c7bcd6a279fcdd13b14ed83938f69997182b43d2a83a76f51586c3b9132428f0f9c9e9ba08b6ff820827b9 SHA512 174b06d77bc6e1d4079e8de7df40412ffda098364efd4e3f915f858be1188c8a6fb546fe4ab981ccc067ec77b7171083b2469e7db6fc3b777d5a24151c928362
-EBUILD paste-2.0.3-r1.ebuild 1872 BLAKE2B edb9ed5ec02748f7674de1fcdcc09318e908860118b82dd332ca187ea2f1daee9ce3cbdc8102974737b6d5ccab7f2e84eb68459e9b08d0e96f2e156410bcb362 SHA512 cdc63f9e497b9434e7b0d62adaaf92b3ad8da6a93acbef85f858e4e1383e81b5c0101261af7dba7902091014c7104d0e973783dcfbbaec72aa2f06c2af229fd3
+EBUILD paste-2.0.3-r1.ebuild 1849 BLAKE2B 26032eb336b4e824cf3ab832ffd194d0556f08ed6483ac970e475878afe18a04449328342b1bcd00070046469f7553ae2a69bd2a74f95d9e0b174fbabb83a9ae SHA512 cd239d7e9e5fdfe413991f68b0b7adb28fee3a6e4f9489c75e82befcef8f86b0015d93df1000745e9aa930a4585b21e3bccdc38ab0e5a3c31f185755c0c40877
 MISC metadata.xml 778 BLAKE2B 74d5474ab918861e65f330eff278a319f8b197c6f95e65c862e55bd19d84534c447e348df82ddc68558dd089f8ac81785c16de38e3fdc70f706d4e5b870243fc SHA512 86b244a3dd365e74dfc12dfc283809840352cbe210b34c34ffda1929db29362d1e02b246920d8461cde70b087020d15cecd3ec5cfe0f168fb69fa45cdb66015a
diff --git a/dev-python/paste/paste-2.0.3-r1.ebuild b/dev-python/paste/paste-2.0.3-r1.ebuild
index 743362b034d6..6afaee26ffa2 100644
--- a/dev-python/paste/paste-2.0.3-r1.ebuild
+++ b/dev-python/paste/paste-2.0.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ MY_PN="Paste"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Tools for using a Web Server Gateway Interface stack"
-HOMEPAGE="http://pythonpaste.org https://pypi.python.org/pypi/Paste"
+HOMEPAGE="https://pypi.python.org/pypi/Paste"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/pastedeploy/Manifest b/dev-python/pastedeploy/Manifest
index 162e93ad3729..0dd785cc2897 100644
--- a/dev-python/pastedeploy/Manifest
+++ b/dev-python/pastedeploy/Manifest
@@ -1,6 +1,6 @@
 AUX pastedeploy-1.5.2-py3-tests.patch 606 BLAKE2B 8f7d5a9f8c517e14a1ecdcbfa040977ab9d3c8e7a072eef3c31d50ac74c02b377ea25fa965d36a89f3c9e0fbfed63364447cfe5525468766df976445d9cebe9c SHA512 0301653864071de976bae24a945ba6d8499aaf21d41c5117ad922254055ee8a3b975cdadc6590677cd458a233ad115647a01a05d52feb0dd40d16bcf4de8f5cc
 DIST PasteDeploy-1.5.2.tar.gz 24006 BLAKE2B 1088d5cdafc80402b44c6c0e62829d1efe666d9ef8c84409125173ce927aecb8ed3ec4283b9821a42cc614d27e74e43e79407554fabfd79f6a913f9742532c72 SHA512 03147b2e735f4504b928066d35f46e7d19a49b85afc506b793fba69c8827a4d5b8185074bdd4a963ac392cc104f5a608d1db9a3538d7d3239da5febcbff4ccab
 DIST pastedeploy-1.5.2-r1.tar.gz 29528 BLAKE2B 0c36f24e51eb66b9a2176083d42726be5be8e7eb9b7d73972bcb5a2b0094beb1c88f3eea9ce94bfccaf688b6f5fdbf18e43e38694b91107a141ac0acf0576ed6 SHA512 5d9f648d4bddb4fa0b018f5e1c100d0899ff9e6a429a0a54aede69800fa13b7bb0d606ff454c516b36c3b056320bbda4581de9d57a154e71493a8bd6208fb3ce
-EBUILD pastedeploy-1.5.2-r1.ebuild 1054 BLAKE2B 825950578727f195b9ca66ade8372f7968d41cf2983cc06d1716ef43f61f14d1faeeb402f5bc4c48d150866fa7e0e9f55e03f1d254358f99577fc40488d6fea4 SHA512 41ce2c0b6a0815e4b18a100c19c737368b5998f15133e9ee828dda4907a5ee07894110baa6070af93292ee611a9382e41353e7716620848e1d72086735f0866f
-EBUILD pastedeploy-1.5.2.ebuild 756 BLAKE2B b3120edf4162540cad0940cc076b7edbfe426bbc383d6ca62510aa9b354fd1789c0280b94d56fbe4e81f90edf062daa98b513fdcead777e464fa8b8e9ffe5c38 SHA512 d8dfb64442a57535b875302f9e0d7d95a81353c7cc3909c92160842648c08a27e3cb4ddbb62ed4dc3454d30033f9d4c537e6884e0cc7f3fa2c25ade913d51032
+EBUILD pastedeploy-1.5.2-r1.ebuild 1023 BLAKE2B ceca76c1c85f6fc187c2466b81e6ff52fc2e0e29b341ff9503750673f177f3331aee4e6e139ec12f73646ebd4248ab350ab8f9df1936c22e1676f8ecf999755c SHA512 ac1e10da58c4207d4f3cf8dd488bc8028e01337d13e9c65f1efe3e838db2beb6f970c772dd3e6bf09b997beb34614b5933ba94bd45baec966be2efda5641aa46
+EBUILD pastedeploy-1.5.2.ebuild 725 BLAKE2B f4f719c44f80f0fa17674cb2e93aeb0c05ecd5190b3d35494edc83832a43487483b02528f4894e0f7e617f88a5af96b683a7d28b480f5b3f3dccce6768a21392 SHA512 145818e7670601acc91d262a9adce1cc4af909e62cf3af9933597937100d3a67cbe5951beb874b0f46482e249a6118aa34c21a699ecb21e0a9fe6a114348b2d7
 MISC metadata.xml 806 BLAKE2B f945ec7a43dac81abc59fa63d078872fe4bbd9bf3945ca0f03b4d78bb2511bbe137ef8d01424c5c54a55b73f22778dbd9efa009ab64ef41a20d55bd71bb15e99 SHA512 da770a4fe1f5918391fa4861dab525dcee34d5aeb362a464307c6c8b32edb4731effd22339056f01d77eea8d3729d3ca57572d1d95ebab8b786cad9029250f7d
diff --git a/dev-python/pastedeploy/pastedeploy-1.5.2-r1.ebuild b/dev-python/pastedeploy/pastedeploy-1.5.2-r1.ebuild
index 499695d5e84e..91a8cd278033 100644
--- a/dev-python/pastedeploy/pastedeploy-1.5.2-r1.ebuild
+++ b/dev-python/pastedeploy/pastedeploy-1.5.2-r1.ebuild
@@ -10,7 +10,7 @@ MY_PN="PasteDeploy"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Load, configure, and compose WSGI applications and servers"
-HOMEPAGE="http://pythonpaste.org/deploy/ https://pypi.python.org/pypi/PasteDeploy"
+HOMEPAGE="https://pypi.python.org/pypi/PasteDeploy"
 # pypi tarball does not include tests
 SRC_URI="https://bitbucket.org/ianb/pastedeploy/get/${PV}.tar.gz -> ${P}-r1.tar.gz"
 
diff --git a/dev-python/pastedeploy/pastedeploy-1.5.2.ebuild b/dev-python/pastedeploy/pastedeploy-1.5.2.ebuild
index 77a24a3f5276..2307b8a9045d 100644
--- a/dev-python/pastedeploy/pastedeploy-1.5.2.ebuild
+++ b/dev-python/pastedeploy/pastedeploy-1.5.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,7 +10,7 @@ MY_PN="PasteDeploy"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Load, configure, and compose WSGI applications and servers"
-HOMEPAGE="http://pythonpaste.org/deploy/ https://pypi.python.org/pypi/PasteDeploy"
+HOMEPAGE="https://pypi.python.org/pypi/PasteDeploy"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/pastescript/Manifest b/dev-python/pastescript/Manifest
index b02e3f81080c..788c10aebc6a 100644
--- a/dev-python/pastescript/Manifest
+++ b/dev-python/pastescript/Manifest
@@ -1,3 +1,3 @@
 DIST PasteScript-2.0.2.tar.gz 117521 BLAKE2B 2de72050ee7f5b7037b99f9661b5445e523607afc84a8846f0e5d9e89196e302627f552825ce0e4f821b7ed9ed2713c87d7b504a4e2abf092f1e8fa014c40c4b SHA512 2f093eb982972fed354219c75c2e008931cea553960cea8aaafbe57cde8556de5626e7eb9bb3b9b7328bad3b7d9899f11fc9773a65380396dae506e7531516de
-EBUILD pastescript-2.0.2-r1.ebuild 1321 BLAKE2B 9608713377895d8ba19c9f30eb5116abc3f53a96769973c53e88341d3ea8cfb85527db81ec27b88b93bb991c8022b001b90a93dc5afb3275db8527b436b27ad0 SHA512 3feca93a4d9cf5712c874eca4f43c5ad3d937a9fc12f7c37be5e3118cec2ce1d0f8aa8c62e4c1f4e419e74c02f4177a088aae2d572256e3210b5c259b10bee0f
+EBUILD pastescript-2.0.2-r1.ebuild 1290 BLAKE2B 2cbc33e61252b1134718fd56fdb3d3264c906c6b98ece0c74c726251c4073f53bf4d4d309a38f108a28c98aa097228875361087658cccd58f0b11ea0ad402286 SHA512 8e42d6e1687bdcdc88c72627fef0ec85aed675b14162e1323f4aa762419ce6953366061940dbe8ce805aa67f334321d1c95d0153cadd32d07ac95823afda1f22
 MISC metadata.xml 324 BLAKE2B ef67daa0f9e2595c0b35ed1b919c98129443d224c81a7ea6bd0ef919845339dd9cd45ea96ff4a4aa0176b24c61a57bc2cf8ee2f0c2d10386dbae1c904d5426ab SHA512 48a93ec635e32513438b44cb67bd7302c6bc55c72281d253ee4cd4b0a7d4c25ec61b028d861fa1acd2b40f22479fc0a1f726d3334c8a2970ad2b45729279ec47
diff --git a/dev-python/pastescript/pastescript-2.0.2-r1.ebuild b/dev-python/pastescript/pastescript-2.0.2-r1.ebuild
index 328f1c65c2d6..79e5abae6812 100644
--- a/dev-python/pastescript/pastescript-2.0.2-r1.ebuild
+++ b/dev-python/pastescript/pastescript-2.0.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ MY_PN="PasteScript"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="A pluggable command-line frontend, including commands to setup package file layouts"
-HOMEPAGE="http://pythonpaste.org/script/ https://pypi.python.org/pypi/PasteScript"
+HOMEPAGE="https://pypi.python.org/pypi/PasteScript"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/pyfakefs/Manifest b/dev-python/pyfakefs/Manifest
index 9c461e67172b..7a21e17848c3 100644
--- a/dev-python/pyfakefs/Manifest
+++ b/dev-python/pyfakefs/Manifest
@@ -1,4 +1,7 @@
 AUX pyfakefs-3.3-sandbox-tests.patch 1277 BLAKE2B 2ba11e2b2f5160dda4876b62723b965a6a38c8a96b8f56eaaa964a7ec038f61f3410a3a4c968bc06fa5f2e5468cad20a7d210d4288d328a9f4ae937e3cb50c5c SHA512 1ff58be274dc1380763149169b903ac10847a1b258191d3f0a3b90d0d45b169f9cd858396704d1410658cc32d9fd17cdbeafdcd34dce169d512dd7edbe9b83c3
+AUX pyfakefs-3.4.1-tests.patch 1734 BLAKE2B 3461bbbae5ebbcd4e349434d8fe429ef16b9ef21ab5f915d499f9bbc695cc5c71b17278c8843fab03a99a5cc7af1e28a02600dfe462e66e513fe9c8e25268de1 SHA512 752fe84adcb017efa523a746b82a70af41873017f3d5e6496900dfbaee09ede04a4b95a8928032d5e8305766953b69214a0b6660ee61baa18be58b93f0111c0c
 DIST pyfakefs-3.3.tar.gz 141704 BLAKE2B f805146024d9886ce6cb25b23f6f818bb37cac00a51528375b3da3e728515cb5ffd292352888861ff2b434ff71dd730bfbd84874fee0ae1f4d2cfca974f73771 SHA512 0044643964a4f2329d777476940b38d2d63c6de8f854992b4fba7b7e49f1186e7ce9811f83c9870655cbe33b7dda816c1aa1ce685e800e55c06d175c281748b7
+DIST pyfakefs-3.4.1.tar.gz 151662 BLAKE2B cbfdd7ab4c2936d484b5ff1e22852438c5c653e8875b7d363324e0a1aed0bfc5c492c2cd5c64a47052fcb4d043f567819f32067527b870ab42da8cfd92d40be3 SHA512 1be0254455f6046f1d28bf4377d17e0fb943b4b0db09e933c114f587f3d917877b23ee1610cf83a6330b406bb9ae66fe79dea31a6bf75c0b9c2b79a88d07e753
 EBUILD pyfakefs-3.3.ebuild 723 BLAKE2B e63aa94da702ec25f0d3e7f3cebfd829b8870ef526ae91fb04eb15649b56ab08b2919db051d4413de5afd912cad3e644a853e365842c389d661f847532a6ed2c SHA512 0ac708dae39b0a7dd970f807092110b45b26454febb4382d254da6476de44d3943696220a68eeef568106568ddb5bc37d33801d94085189c390817350219a255
+EBUILD pyfakefs-3.4.1.ebuild 721 BLAKE2B e025eae3b3373cc8661ab27fc1ca29f69c5ff33aaa813a27007a854ccb7572b76c18e564177e2cce88b87f5a859726f50c5d4e39751b2789872deb2424385160 SHA512 1da76c90158f959632b1e9b9283defe69553455d859759c8b27aa5469ae5ffc94f0cc03a896e40ca528552de22a3e89f73fae03a6271fa384b579d1ef3458b98
 MISC metadata.xml 370 BLAKE2B 9111da9b75b84d43a287c2d902b6b83b77b3c0e0a0f650fb73a904022304028678abb75f5620e93d15b0cac474b731c2c39ae2589a77e6dc96e1797253062e0f SHA512 674874289f039549b14d81863c992ab20053777049a25f3f9ba1f596cf345a7e463db7516738d35e78a5079f660fb63ec24e9029963ef0702d6c268eca384d8f
diff --git a/dev-python/pyfakefs/files/pyfakefs-3.4.1-tests.patch b/dev-python/pyfakefs/files/pyfakefs-3.4.1-tests.patch
new file mode 100644
index 000000000000..d893a3adcb7a
--- /dev/null
+++ b/dev-python/pyfakefs/files/pyfakefs-3.4.1-tests.patch
@@ -0,0 +1,40 @@
+Drop checks that fail due to sandboxing and skip failing tell check.
+
+--- pyfakefs-3.4.1/tests/fake_os_test.py
++++ pyfakefs-3.4.1/tests/fake_os_test.py
+@@ -449,7 +449,6 @@
+         self.os.chdir(directory)
+         self.assert_raises_os_error(dir_error, self.os.remove, dir_path)
+         self.assertTrue(self.os.path.exists(dir_path))
+-        self.assert_raises_os_error(errno.ENOENT, self.os.remove, '/plugh')
+ 
+     def test_remove_dir_linux(self):
+         self.check_linux_only()
+@@ -963,6 +962,8 @@
+             self.assertEqual(b'\0\0abcde', f.read())
+ 
+     def test_append_mode_tell_linux_windows(self):
++        # skipping real fs test - python2 on the actual filesystem is also 7
++        self.skip_real_fs()
+         self.check_linux_and_windows()
+         tell_result = 5 if self.is_python2 else 7
+         self.check_append_mode_tell_after_truncate(tell_result)
+@@ -1885,8 +1886,8 @@
+         # trying to create a link from a non-existent file should fail
+         self.skip_if_symlink_not_supported()
+         self.assert_raises_os_error(errno.ENOENT,
+-                                    self.os.link, '/nonexistent_source',
+-                                    '/link_dest')
++                                    self.os.link, 'nonexistent_source',
++                                    'link_dest')
+ 
+     def test_link_delete(self):
+         self.skip_if_symlink_not_supported()
+@@ -2233,7 +2234,6 @@
+         self.os.chdir(directory)
+         self.assert_raises_os_error(dir_error, self.os.remove, dir_path)
+         self.assertTrue(self.os.path.exists(dir_path))
+-        self.assert_raises_os_error(errno.ENOENT, self.os.remove, '/Plugh')
+ 
+     def test_remove_dir_mac_os(self):
+         self.check_macos_only()
diff --git a/dev-python/pyfakefs/pyfakefs-3.4.1.ebuild b/dev-python/pyfakefs/pyfakefs-3.4.1.ebuild
new file mode 100644
index 000000000000..36f46d577c56
--- /dev/null
+++ b/dev-python/pyfakefs/pyfakefs-3.4.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 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{,3} )
+DISTUTILS_IN_SOURCE_BUILD=1
+
+inherit distutils-r1
+
+DESCRIPTION="a fake file system that mocks the Python file system modules"
+HOMEPAGE="https://github.com/jmcgeheeiv/pyfakefs/ https://pypi.python.org/pypi/pyfakefs"
+SRC_URI="https://github.com/jmcgeheeiv/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
+
+PATCHES=( "${FILESDIR}"/${P}-tests.patch )
+
+python_test() {
+	"${PYTHON}" tests/all_tests.py || die "tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/python-daap/Manifest b/dev-python/python-daap/Manifest
index dccc0c938162..d3445068ce14 100644
--- a/dev-python/python-daap/Manifest
+++ b/dev-python/python-daap/Manifest
@@ -1,3 +1,3 @@
 DIST PythonDaap-0.7.1.tar.gz 25944 BLAKE2B b8ceab556c2be488f0e9c768b31da193d6acede65bc41f87d45c3cb7d9fcea5885a546ad682b7a272e098d590066c83535fb914573690f584ed46a8ab98c9d39 SHA512 9ed6f1964fa0b357ee2d1e81dbdf79303f12feb1e753e6e8c987f28212a2eb3041fe1f443a4e5e43c196808192f116d045b0ea6d42dc76020ff4f252d423eca8
-EBUILD python-daap-0.7.1-r1.ebuild 671 BLAKE2B cacb00ba0070ce14f5647b1df01a217fe7705dfd4ba4e8f963a9b61648d3332b03f8f6497ffe3a29d3686c69c7e6e7a8989d5075974ea02e1719f6d9dad04467 SHA512 a3ed55833c2bb00ab50f1a49c5ce236b6c32f30c23d18b4c01cf28fe356e8f8fbfa8ba7307689030b96e869bab77a26ffba61019cfbaca6572411600922a2295
+EBUILD python-daap-0.7.1-r1.ebuild 712 BLAKE2B d6e88d418b45bdd85d68c87083f839353357155aa5f44668dfcf24909a04fc3decc8b6a256bca6995884bb89d5c12be94b5f3f4b788287f2f4778cc4834c3477 SHA512 ab2a794b71e1e3d2d162acec522f9b6a823a4a26e6233f86352e13564aa8cdc189e5343b9aa2c9683fd71a459e65a329ee4c226d5fbc9304398552681bdffed3
 MISC metadata.xml 353 BLAKE2B 936234dca3e9cd646ab403b630c1dd05eb56bc3648bfdbda6fa31b6609334dbf04622760ea00d78f3c9b2bb37ab3c3d8e992db3210bcaffdaecbd5bc3e538fa0 SHA512 5d9b0061aaffcdcaa374f9ebe83ac47d7d6acdd28a51452f68d3f43a5e7b866639b9edebd82c20a440fe4e7f54a93567219a91cbf524218276c6c17df8b605c1
diff --git a/dev-python/python-daap/python-daap-0.7.1-r1.ebuild b/dev-python/python-daap/python-daap-0.7.1-r1.ebuild
index 57fde7244ee8..a450131628c6 100644
--- a/dev-python/python-daap/python-daap-0.7.1-r1.ebuild
+++ b/dev-python/python-daap/python-daap-0.7.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,7 +10,8 @@ inherit distutils-r1 flag-o-matic
 MY_P="PythonDaap-${PV}"
 
 DESCRIPTION="PyDaap is a DAAP client implemented in Python, based on PyTunes"
-HOMEPAGE="http://jerakeen.org/code/pythondaap"
+HOMEPAGE="https://movieos.org/code/pythondaap/
+	https://github.com/tominsam/pythondaap"
 SRC_URI="http://jerakeen.org/files/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/dev-python/python-dateutil/Manifest b/dev-python/python-dateutil/Manifest
index 2d80442e5330..48522c21c2aa 100644
--- a/dev-python/python-dateutil/Manifest
+++ b/dev-python/python-dateutil/Manifest
@@ -1,3 +1,5 @@
 DIST python-dateutil-2.6.1.tar.gz 241428 BLAKE2B 93b1d43dacdfbf528b085864b04231c1a34b37b23bc64a58a0733f53ace0f7e0258ca58fbc725dc2aae15eebe8ed1f555b02862a4dfd360014e7ee9aa8d6a9f9 SHA512 f16dd29fc975629f594dd2683a525e2a86acb020bf8962558d19040b14ac6f19d4ab07a910d6bb55c9db3cc02b5472774a3a05ccc86cf624ca5e5144463646db
+DIST python-dateutil-2.7.1.tar.gz 298061 BLAKE2B a6bc2a3bf83ff234ddc53db5a3353b19303dd9e0c6d2d702537643e134508f96ccc69b962fd957d4cc754b07cd24b3c3c2ce07becc0add7db925b841d6a32b5d SHA512 3dbadeac3dd22bf51279c4237df96a925ed4063384a82e756a41e314c216751f2c90f8909a20ba96fdb065966034e9c7e40c1ea152876ca733a2176893c4deb2
 EBUILD python-dateutil-2.6.1.ebuild 949 BLAKE2B b0d7a198e984aa896a468c183f24a3519e8a75ddbd65f4caa2fc1727844c2afa84f9934a1808897c025870c52269706aca12f283334ae63479f224ef20f1d51d SHA512 814b96cb5cd4544dc92ae1c93b7d8edfb0f3357beafd5ccbd70e3180cdbe7f98146a2083717e86db14b6f596deeadf381cb38706daa4085e4e092a8c0abce506
+EBUILD python-dateutil-2.7.1.ebuild 1135 BLAKE2B 1c4ebd9cea2c6178072e1a1f1b04eddaed6445952e26da22d45b31f9cbc03dfa689d9993821efa208077552c7106d6dcd1bb351c168630aa5cbab802e727f995 SHA512 628d6079c0dab76ef8c045c5ae424f2bc3e525e4af4b679557abb30fc3371c03a66852158aad108e348c4e55733f649d67a6628eae8e0b7c03faae6e5f89af00
 MISC metadata.xml 603 BLAKE2B 1bf49feeeec3ffc2f767228a84b3f9edf53cf44d8a1df3fa8f85798c0d3ea8f448d6113d425baa6b4b342b88746133d2770b951488d602dbb175f5ff9a99ea36 SHA512 87f5ea8b8918e72b57b91d32ed103d88f93ad9fbbe0a8f3f8b8ea72627d82e5cac25246553a0cb6988af26c30841ca5a3ddccf7f957603283a1b4e455a7c6439
diff --git a/dev-python/python-dateutil/python-dateutil-2.7.1.ebuild b/dev-python/python-dateutil/python-dateutil-2.7.1.ebuild
new file mode 100644
index 000000000000..8ccb00532b22
--- /dev/null
+++ b/dev-python/python-dateutil/python-dateutil-2.7.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Extensions to the standard Python datetime module"
+HOMEPAGE="
+	https://dateutil.readthedocs.org/
+	https://pypi.python.org/pypi/python-dateutil
+	https://github.com/dateutil/dateutil/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/six-1.5[${PYTHON_USEDEP}]
+	sys-libs/timezone-data
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/freezegun[${PYTHON_USEDEP}]
+	)
+"
+
+python_prepare_all() {
+	# don't install zoneinfo tarball
+	sed -i '/package_data=/d' setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	py.test -v || die "Tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/python-memcached/Manifest b/dev-python/python-memcached/Manifest
index f257f243c71b..5c1479662165 100644
--- a/dev-python/python-memcached/Manifest
+++ b/dev-python/python-memcached/Manifest
@@ -1,5 +1,5 @@
 DIST python-memcached-1.53.tar.gz 35025 BLAKE2B 40d30ba35b8dc5d33c27a8a02d66ef7714c2851a3bb109b0cd4456f14408579e51baef8a6020ee75a21bfba468f6524c5163f4161676fc86788186832ff2ec4d SHA512 33ffd2778025a8e15beddf1660c4b5c9f1ba144adab5c36fd679e15508015c00e3e1185b5cc179cfcfc556b7c3ab44ed9914089e5ce9db66a04d0a658dd38bb3
 DIST python-memcached-1.58.tar.gz 30562 BLAKE2B 928aeca2b0d6d99fb16ee8c8c970ccc41aabb4c6385d962cb4208878f4f0eb1b1114c103118fc4ce6020e01d2260b9ffa83e96b2aba719cad6820e39d9fcfe3c SHA512 48f933f095751b476c122473fa1d9767cfe5c6c339a9ba71825a50cec23cbfc7b6493716458bfb1f2451c634c517519152105a2000be66bd0d389f94ea312138
-EBUILD python-memcached-1.53-r1.ebuild 1214 BLAKE2B a59ed4a93a1b61f057e1fe14760209a7bee14f765045e7593e4804a8afd8f06bcbf8cdbf148919611dd6a5443acc5fd7d3435097bb0d956b12c9c0415bd3ea7e SHA512 84754ac72f0e7236dba7603f519b8367d2c992fcae59624ebf64359c83ffa7fb5ec52f5200a4810a25f90b133ecaaa8c13d4b46eae16a4a5c5ea3ac73328e225
-EBUILD python-memcached-1.58.ebuild 1289 BLAKE2B 81f1c46c0d3ca3503cdc2cc4d2f174bb464e36efe680b24e90b3a6564c5beab9ad788c6dca2baf7a07c6301b31a07e0dd23efdde31d09b59749b821b690b00a9 SHA512 84477ec80581050699080113a1b919fd2c021f6dea039ed47a489ad4be44c0e8e6513d62e87bb663008280a7342ab996630882e522fa0aa69e09b99488480468
+EBUILD python-memcached-1.53-r1.ebuild 1216 BLAKE2B 81f5f989ad0c25e334f5a05f9029cb5cae53137834bbdec94d0c53fb6bdd44df9be32238db82b0787902a68c0e3eabe47a63886ad6798c3d314b6e916f5d4da6 SHA512 2225033958247db424569875f20b2088421c70eb3c6a425bc0c82d4ca9c8db30049ec959c0cdda7e7c8a11b432d0c29bde64488660cd7264f00fe6ac5d778f93
+EBUILD python-memcached-1.58.ebuild 1290 BLAKE2B 950efe61660a01794d51f2dab3ee3cb85205798a417723c8f8fc83fb9f6dba1bedaeaf264c3600d762b4dce6e38d6c70b341bbc3cf1898425e29cdebe80fef6b SHA512 5f971dea09a24509aae5c6a96132d738d4e3ffdb69448d98a380477024c0112c858f38fbe4a5071e1dba1436b8a010d39330d38576bfe21cf3c11d86e6ee1412
 MISC metadata.xml 611 BLAKE2B fa7a75bea6b08f6ab65ff4b5d4d8e3022912ba8cb86c6dd3fd2d8f5bb224f89ae9db977c2197a39e6541193ed41366c4bdaa404138a18b2d31afc412b967cacc SHA512 9070f42bf5f3fb721f41309c7a24f29168f1179f9327f1334dcd5bd7b38ae98bbc682c2f0cfb7874c8e20e92ce25bffdc5d3f21870316c6d35cd57e1049f8d90
diff --git a/dev-python/python-memcached/python-memcached-1.53-r1.ebuild b/dev-python/python-memcached/python-memcached-1.53-r1.ebuild
index d5b2923582c0..a14809eda6ad 100644
--- a/dev-python/python-memcached/python-memcached-1.53-r1.ebuild
+++ b/dev-python/python-memcached/python-memcached-1.53-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,7 +8,8 @@ PYTHON_COMPAT=( python2_7 pypy )
 inherit distutils-r1
 
 DESCRIPTION="Pure python memcached client"
-HOMEPAGE="http://www.tummy.com/Community/software/python-memcached/ https://pypi.python.org/pypi/python-memcached"
+HOMEPAGE="https://www.tummy.com/Community/software/python-memcached/
+	https://pypi.python.org/pypi/python-memcached"
 SRC_URI="ftp://ftp.tummy.com/pub/python-memcached/old-releases/${P}.tar.gz"
 
 LICENSE="OSL-2.0"
diff --git a/dev-python/python-memcached/python-memcached-1.58.ebuild b/dev-python/python-memcached/python-memcached-1.58.ebuild
index 979976df4e01..7b8cf80ce499 100644
--- a/dev-python/python-memcached/python-memcached-1.58.ebuild
+++ b/dev-python/python-memcached/python-memcached-1.58.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -9,7 +9,7 @@ inherit distutils-r1
 
 DESCRIPTION="Pure python memcached client"
 HOMEPAGE="
-	http://www.tummy.com/Community/software/python-memcached/
+	https://www.tummy.com/Community/software/python-memcached/
 	https://pypi.python.org/pypi/python-memcached"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
diff --git a/dev-python/python-nss/Manifest b/dev-python/python-nss/Manifest
index db4922cf9b37..8319378b7a82 100644
--- a/dev-python/python-nss/Manifest
+++ b/dev-python/python-nss/Manifest
@@ -1,3 +1,3 @@
 DIST python-nss-0.16.0.tar.bz2 208535 BLAKE2B 99afa955c56862a10da950ddb638730762f12de47c347128373d2bdfa374af15f8df810433e60ef6200c3e2b296e1c057880d0ee91cb8ade2dea36a0fa4bbfdf SHA512 3ff7d29f10942f4d36be8e223b518e046b5502f15029aa684b925cbd131bbc2041f7860abd50ec1344479b6e5594735cc9b7fcd801d7c4d1025f68e11a57cc3f
-EBUILD python-nss-0.16.0.ebuild 1720 BLAKE2B b374a35c253aefb854fce03fbc5ae642cacb424e3c39385621d0b6c55c4726d59bce1725c09e80d11ecfcb897a4f6a2318383bc6d38582dce73b581e822af623 SHA512 cb5da9da5b6e199559b3a1ca6c2703434ba7745720c2c3e0e430aa4f2aed217f224c54e5b59fe954c1b51ef7f86d0bbe960be04f5dd14d75c258ce2054dbcc9a
+EBUILD python-nss-0.16.0.ebuild 1748 BLAKE2B fca3be894e9536c90f78fb151693e82e83fb6e48a97a262b772744a02470dff2f3c55596b56b0e96ee6586431dff103b3bb6eb48ac26d3c916950e4d02e5a11f SHA512 a9f0eafaba59c27dfc08e02d7cd2a7c460579bc990bc6454a8872e3a314f8decf746cd6d81ed0f12d0ea49cbf4ee0612deaaa8e582702a6c1da105f53a1d7fd3
 MISC metadata.xml 505 BLAKE2B 6dbaf8d336138a9baf33e62ea3ba72073e9bfeeee4862875652bd1c6b4c335f5e014a2c6c3b455e01d62554262110c11eea28133240fa0d13bcfb4aece853a75 SHA512 9b4ae01e2612f9e20b48b279a55b50e98edeca8fd0a22edae789f24e7ac02c31a44986cf281f5acae7d18a443742019011f62151f5eb85ee1de5dd0e22b771b1
diff --git a/dev-python/python-nss/python-nss-0.16.0.ebuild b/dev-python/python-nss/python-nss-0.16.0.ebuild
index 2b7efd1e755a..96a715862032 100644
--- a/dev-python/python-nss/python-nss-0.16.0.ebuild
+++ b/dev-python/python-nss/python-nss-0.16.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -9,7 +9,7 @@ inherit distutils-r1 flag-o-matic versionator
 
 MY_PV="$(replace_all_version_separators  '_' )"
 DESCRIPTION="Python bindings for Network Security Services (NSS)"
-HOMEPAGE="http://www.mozilla.org/projects/security/pki/python-nss/"
+HOMEPAGE="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/Python_binding_for_NSS"
 SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/security/${PN}/releases/PYNSS_RELEASE_${MY_PV}/src/${P}.tar.bz2"
 
 LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2 )"
diff --git a/dev-python/pyzor/Manifest b/dev-python/pyzor/Manifest
index 7b15a58e96de..9284eb46e3c6 100644
--- a/dev-python/pyzor/Manifest
+++ b/dev-python/pyzor/Manifest
@@ -1,5 +1,6 @@
-AUX read-stdin-as-binary-in-get_input_msg.patch 1702 BLAKE2B 96c64d79036e094418eb75251ff0d512122d7ec1300f4dccfba8c49e0ede6cfd76d314fb58b2f70e45ab99e3a87f1d8e0db042fdfbed66d43a0bbbdc70b0c839 SHA512 d47c20baf7875f717e81bc6ec09b2ca80f0dc498a021db6d7bd0942df016f884efdc6c183acbc07d2ecb6998989d23fec624589e5b3bcd8b26e16684ebb4494e
+AUX read-stdin-as-binary-in-get_input_msg.patch 2751 BLAKE2B c348d28eeb703ff9b257c915ba6c6ac62e95a1f389173ff2fcd034dbcfdf8b9d9fd075365b9033fe13a3f5ec6a24dad5110c468f54dc5417241cf5cb95e5933f SHA512 424d7b640e4f297bde5e98c92b7fec48c79998b07a710f685f786c673ef10981efc71647973fdd05ac84879387ab5eb97d5c734bf5b03827dd998cf292948d5b
+AUX unfix-configparser-compat-for-2to3.patch 1210 BLAKE2B 1ad8b2528cbf723d46d18c25163f68738281c48638b86c8809b5dab8f6f3c0058f17b1e2232d7c704b4aa777aaaf43c63170478da95272e75492bbbaec696789 SHA512 d9f5308d1f9280db5a0556fcaf3927e261b6cd1d01ff42c05a912335c6f9343f78096eed645aab5c741c221adf5ece00137aa3ae6f950cafbeb77db1908949b9
 DIST pyzor-1.0.0.tar.gz 126276 BLAKE2B c60f26c53bf118c88dacbc49ddd414473748af1868b383a9c937ecf3cfe426ecdd60f64388fe7e555bd4641ef445769600e40879279dd544ef9ea32bd0dab6b9 SHA512 b3fb8b2c5261e187a2ab3a5a3b12d221df7de08766c6bb2ad9990c0f23517534871ecc9d5ad529e79b0d0aef8b2b800728320c57435a8c0d8c3f80a4ba0f7e4a
-EBUILD pyzor-1.0.0-r1.ebuild 2083 BLAKE2B bf4ba2210ac60205f9052add4b9073edcee002ab715a526438352a612836aa979a008d3a971b23ff5417a4608e29191350c86156135defeeb5699c1c1b17fb21 SHA512 2e9acfa976a6f01ca69b0b92980e001d223533b183e46da98235c04235eaf7a559d7eb1a5670eaa8b00d6d2a956632e2b385451a4b2882b188f2706630e02610
+EBUILD pyzor-1.0.0-r1.ebuild 2140 BLAKE2B a9d5c8f734283120563234a6cf8ceb0b931ccc34cfa513a25d0750fccb7376f6ed6e2741b5b1efcfa3748ccd5b6449e402ff446d8dff0b1215e47b6a7761ed60 SHA512 ee4ab225b8b8d6b8d6af0127400b6ac149104689dc4e86dbafaca661d4900a4843e42a398b916d9e15a32c84ca36308792149a262b3af17c96b49e22c1ca1012
 EBUILD pyzor-1.0.0.ebuild 1797 BLAKE2B 9e3cd862816d96ecb273cd796271c27ac74d95ddaa31f572b450528c52275af3ac396f1e6d8c58e7542a3116a3436e37e9543374d8db74a78eac49a2ad146e41 SHA512 08044189249d9c0530d5007424b9ec6e9a5b92f3ef518c80e41779612ae00195cfddaf54406c8ac667bfc7ba4e1424391a7c58bfaac98d6377730f94119f25a1
 MISC metadata.xml 1061 BLAKE2B d2ad7e863f055f46e4ab2048cd8cf042444476da9423743c246ede1f6b3f2b8be4b9f980da10e741726ae25625af09a8ce6eeb7710c2f5a8ceb4cc4f915d2e61 SHA512 58d18a197dd3575d7644f0e9f446344ccfcc321d33493fadfd89f7f233a1dc58e0c899b42a3ae72b219dc1327e2de6eeaf90a8de3735fdc0dc1f6c67c5cc8722
diff --git a/dev-python/pyzor/files/read-stdin-as-binary-in-get_input_msg.patch b/dev-python/pyzor/files/read-stdin-as-binary-in-get_input_msg.patch
index 81668e369377..03031a976690 100644
--- a/dev-python/pyzor/files/read-stdin-as-binary-in-get_input_msg.patch
+++ b/dev-python/pyzor/files/read-stdin-as-binary-in-get_input_msg.patch
@@ -1,45 +1,85 @@
-From 6332a429ed415187599ecce7d8a169ee19f0bbe5 Mon Sep 17 00:00:00 2001
+From 66225b32d2774cf37fa7f702f7eb26cd94094482 Mon Sep 17 00:00:00 2001
 From: Michael Orlitzky <michael@orlitzky.com>
-Date: Sun, 4 Mar 2018 17:34:33 -0500
-Subject: [PATCH 1/1] scripts/pyzor: read stdin as binary in _get_input_msg().
+Date: Sun, 4 Mar 2018 17:27:01 -0500
+Subject: [PATCH 1/1] scripts/pyzor: replace the client with the git (+ issue
+ 64 fix) version.
 
-Reading stdin in python-3.x is done as text, with a best-guess
-encoding. But this can go awry: for example, if an iso-8859-1 message
-is passed in and if python guesses the "utf-8" encoding, then read()
-will fail with a UnicodeDecodeError on non-ASCII characters. For
-example, the "copyright" symbol is a single byte 0xa9 in iso-8859-1,
-and the utf-8 decoder can't handle it:
-
-  UnicodeDecodeError: 'utf-8' codec can't decode byte 0xa9... invalid
-  start byte
-
-Instead -- and as was done in python-2.x -- we can read stdin as
-binary using the new get_binary_stdin() function. Afterwards, we use
-email.message_from_bytes() instead of the email.message_from_file()
-constructor to parse the byte data. The resulting function is able to
-correctly parse these messages.
-
-Closes: https://github.com/SpamExperts/pyzor/issues/64
 ---
- scripts/pyzor | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
+ scripts/pyzor | 33 +++++++++++++++++++++++++++------
+ 1 file changed, 27 insertions(+), 6 deletions(-)
 
 diff --git a/scripts/pyzor b/scripts/pyzor
-index 567a7f9..1ba632f 100755
+index 19b1d21..86c6f7d 100755
 --- a/scripts/pyzor
 +++ b/scripts/pyzor
-@@ -171,7 +171,10 @@ def _get_input_digests(dummy):
+@@ -17,9 +17,9 @@ import tempfile
+ import threading
+ 
+ try:
+-    import ConfigParser
+-except ImportError:
+     import configparser as ConfigParser
++except ImportError:
++    import ConfigParser
+ 
+ import pyzor.digest
+ import pyzor.client
+@@ -110,7 +110,7 @@ def load_configuration():
+     config = ConfigParser.ConfigParser()
+     # Set the defaults.
+     config.add_section("client")
+-    for key, value in defaults.iteritems():
++    for key, value in defaults.items():
+         config.set("client", key, value)
+     # Override with the configuration.
+     config.read(os.path.join(options.homedir, "config"))
+@@ -171,14 +171,35 @@ def _get_input_digests(dummy):
  
  
  def _get_input_msg(digester):
 -    msg = email.message_from_file(sys.stdin)
-+    # Read and process stdin as bytes because we don't know its
-+    # encoding. Python-3.x will try to guess -- and can sometimes
-+    # guess wrong -- leading to decoding errors in read().
 +    msg = email.message_from_bytes(get_binary_stdin().read())
      digested = digester(msg).value
      yield digested
  
+ 
++def _is_binary_reader(stream, default=False):
++    try:
++        return isinstance(stream.read(0), bytes)
++    except Exception:
++        return default
++
++
++def get_binary_stdin():
++    # sys.stdin might or might not be binary in some extra cases.  By
++    # default it's obviously non binary which is the core of the
++    # problem but the docs recommend changing it to binary for such
++    # cases so we need to deal with it.
++    is_binary = _is_binary_reader(sys.stdin, False)
++    if is_binary:
++        return sys.stdin
++    buf = getattr(sys.stdin, 'buffer', None)
++    if buf is not None and _is_binary_reader(buf, True):
++        return buf
++    raise RuntimeError('Did not manage to get binary stdin')
++
++
+ def _get_input_mbox(digester):
+     tfile = tempfile.NamedTemporaryFile()
+-    tfile.write(sys.stdin.read().encode("utf8"))
++    tfile.write(get_binary_stdin().read())
+     tfile.seek(0)
+     mbox = mailbox.mbox(tfile.name)
+     for msg in mbox:
+@@ -372,7 +393,7 @@ def genkey(client, servers, config, hash_func=hashlib.sha1):
+         return False
+     # pylint: disable-msg=W0612
+     salt = "".join([chr(random.randint(0, 255))
+-                    for unused in xrange(hash_func(b"").digest_size)])
++                    for unused in range(hash_func(b"").digest_size)])
+     if sys.version_info >= (3, 0):
+         salt = salt.encode("utf8")
+     salt_digest = hash_func(salt)
 -- 
 2.13.6
 
diff --git a/dev-python/pyzor/files/unfix-configparser-compat-for-2to3.patch b/dev-python/pyzor/files/unfix-configparser-compat-for-2to3.patch
new file mode 100644
index 000000000000..93d0f07a2579
--- /dev/null
+++ b/dev-python/pyzor/files/unfix-configparser-compat-for-2to3.patch
@@ -0,0 +1,41 @@
+From e4f06e21f697b863fa45a50e535ff0c6e3621a60 Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Sun, 25 Mar 2018 10:14:21 -0400
+Subject: [PATCH 1/1] scripts/pyzor: undo ConfigParser python-3.x
+ compatibility.
+
+The build system for pyzor-1.0.0 still runs the 2to3 utility on the
+scripts to be installed. As an unintended side-effect, the python-3.x
+"try... import... except" compatibility block for the ConfigParser <->
+configparser module gets modified (the module name gets mistakenly
+lowercased).
+
+This commit puts back the python-2.x "import ConfigParser" line
+unconditionally, and we'll have to rely on 2to3 to fix it when run
+under python-3.x. In newer versions of pyzor, the automatic 2to3 will
+not happen.
+
+Bug: https://bugs.gentoo.org/643692
+---
+ scripts/pyzor | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/scripts/pyzor b/scripts/pyzor
+index 86c6f7d..2750d92 100755
+--- a/scripts/pyzor
++++ b/scripts/pyzor
+@@ -16,10 +16,7 @@ import optparse
+ import tempfile
+ import threading
+ 
+-try:
+-    import configparser as ConfigParser
+-except ImportError:
+-    import ConfigParser
++import ConfigParser
+ 
+ import pyzor.digest
+ import pyzor.client
+-- 
+2.16.1
+
diff --git a/dev-python/pyzor/pyzor-1.0.0-r1.ebuild b/dev-python/pyzor/pyzor-1.0.0-r1.ebuild
index 14e1ee840724..ce7d0e7b5cf1 100644
--- a/dev-python/pyzor/pyzor-1.0.0-r1.ebuild
+++ b/dev-python/pyzor/pyzor-1.0.0-r1.ebuild
@@ -39,7 +39,10 @@ REQUIRED_USE="pyzord? ( || ( gdbm mysql redis ) )
 	test? ( gdbm mysql redis )"
 S="${WORKDIR}/${PN}-release-${MY_PV}"
 
-PATCHES=( "${FILESDIR}/read-stdin-as-binary-in-get_input_msg.patch" )
+PATCHES=(
+	"${FILESDIR}/read-stdin-as-binary-in-get_input_msg.patch"
+	"${FILESDIR}/unfix-configparser-compat-for-2to3.patch"
+)
 
 python_test() {
 	# The suite is py2 friendly only
diff --git a/dev-python/sancho/Manifest b/dev-python/sancho/Manifest
index f358150a6392..1d82060cc0a9 100644
--- a/dev-python/sancho/Manifest
+++ b/dev-python/sancho/Manifest
@@ -1,3 +1,3 @@
 DIST Sancho-2.4.tar.gz 7962 BLAKE2B 10e57286834276c6ca37638f4e550d676f5a31f2fa7fb567dfcceb492111c92ffa5aa313886f1d0803048f612aad905f0fd4ebcbcb41838942af083ea1dec2c7 SHA512 49230ee8a05dbc5bf3d7b3900504f47a3a47f013878e75f93c277610e4d22f9714b9a58a41a779e25b0ddb9c24ff351508c0b72c78fe146b8371024345629e21
-EBUILD sancho-2.4-r1.ebuild 1076 BLAKE2B f62991d0d79ecc10b419f2b4c189bd7cd0c61caa3d0bcbffbee26a77cbeb4ddf80d9f57d78d321fa8c36c2225da80472027710832016b3b0fc6ed3f322dd7f72 SHA512 504ddcb48fd25ddec2bb7fe3ca38361969240c256c3dc290f4cf74c970e969c7de313badba9ea17257f59dde1c2ef50d97a11167df56ea2cde7c91fdfba31e24
+EBUILD sancho-2.4-r1.ebuild 1078 BLAKE2B ccf4104ab78a38dba0a064c442123a5c2697977003d14bae6c1d4b1c4c0a697fc4ae746f8d6f4a1d6eac067bc9173f1c8d8a630bd5f7cbdac295ddf9168459ba SHA512 60e44923fee2028ce42616e6959c785fa2aebf1bf196b60ba2f0f66175cab2ea885afc79192f9332a4e8043f84cf57643c9daf79c7f8cbf627ada6e5561dd8c4
 MISC metadata.xml 312 BLAKE2B 99dcf5669889a8657e61ef5d89d2f7a34b29d4b5454f078537085e8a44456a2d26a0d8407ea66a796ba76c36d21f64d9e1ac85a6076abfbe9ceefc6d40a70479 SHA512 088e74f48915eaf8bab9d7a17ba2f4ffa4696b6c93ec291c13406f48665b344dae925cc46468c9d99523eaa848c0aa6fef54bf6a7bee752f4fadbe149bcda59f
diff --git a/dev-python/sancho/sancho-2.4-r1.ebuild b/dev-python/sancho/sancho-2.4-r1.ebuild
index 3ae77d7de0e7..38d99a97417d 100644
--- a/dev-python/sancho/sancho-2.4-r1.ebuild
+++ b/dev-python/sancho/sancho-2.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -9,8 +9,8 @@ inherit distutils-r1
 MY_P="Sancho-${PV}"
 
 DESCRIPTION="Sancho is a unit testing framework"
-HOMEPAGE="http://www.mems-exchange.org/software/sancho/"
-SRC_URI="http://www.mems-exchange.org/software/files/${PN}/${MY_P}.tar.gz"
+HOMEPAGE="https://www.mems-exchange.org/software/sancho/"
+SRC_URI="https://www.mems-exchange.org/software/files/${PN}/${MY_P}.tar.gz"
 
 LICENSE="CNRI"
 SLOT="0"
diff --git a/dev-python/scripttest/Manifest b/dev-python/scripttest/Manifest
index 2a5cdd89241a..bd8863df8bf3 100644
--- a/dev-python/scripttest/Manifest
+++ b/dev-python/scripttest/Manifest
@@ -1,5 +1,5 @@
 DIST ScriptTest-1.2.tar.gz 7208 BLAKE2B 07e63e636ca88b47c0cb9129cf4fc02838287b4ea1cc6b2ae47eec1320ad200179d4a6b8f59860aaa24aac75edbe1d55e45da2de91ef222e621f74667ea79c49 SHA512 0dc09e6af5554f38aca6ee45b9afad2fa4c1c53a4d3c43edff95bbd6ea8d57e94bf6b7bdcfd26afff6bf2b10690795bd2816013801911f726c67e8171546cad2
 DIST scripttest-1.3.0.tar.gz 14885 BLAKE2B 1984bb175b49248bd369d2d2ed6f70051113285b6870bce67e0c2203d29b4c5b2735fa96dfef7ee11aa38db74e9beb026bbc946c8549b2810f6b90e896bcae0e SHA512 038bfb1726bff85b6e3675be51db829d3519b47665266f6ae1d3c5c6f4f06e7b16742262ca1ba240544e9bd39ae96c1be0bd5e8583736f72bb04241a1bb8acf6
-EBUILD scripttest-1.2-r1.ebuild 545 BLAKE2B 7ad0cc6da4577f0e9741688cd0057b1d7ea34c68d776b8a37670d025bfe8519c137ebd9eddc9f5a9f03e00e20e55f056e79f841b76d97255a925acc124e38609 SHA512 cb688fbe63f34ac59d7d390bf26829a68a9716c7249d63f4c2b758efc0d5eb786c27a97a82b33471c41acf6a03a7cf8bdf54016c35de5ff81a6d59e7c479fe97
-EBUILD scripttest-1.3.0.ebuild 639 BLAKE2B 5ecec3f8205758d8d22f9f8f2b624f1f91590d16253ef1b5a5b74f5a509d582e6ce858ee76d23f6a4ad534d785393e6b40c324cf39f59891897498f353aa7c6e SHA512 07170b9de981afda7583499e74923ab47f228652eb7791f5fc3ceb5ccc0f01b8e9814f3d1c0c0e0193cfdfcbf54bc4d46ce6815914285b0d508b7dd903bde49b
+EBUILD scripttest-1.2-r1.ebuild 546 BLAKE2B 26bc89c20ea02355a242a754799a28ebaba7d3858b5c1bec240491e365b5d94540f7e0f19734866672e7cdcb290aad724a57243b41f00c69de8424d823f06caf SHA512 ef7f01d19d879055e3184f430e7c75a19ba82294261214f328fe66c03a1425d42fa83705df8be14510acb519d8990fdc6216e890c87bc708cd7c1f196c091261
+EBUILD scripttest-1.3.0.ebuild 640 BLAKE2B 50a46daffc28a476559a6675976a0e18a9a17fbcc52b8b33a19337b43d2f0690f7a2af0ad63a01695faf6ab8124fb769a0b5675e759a2e0cfa297597e5923e91 SHA512 51a74d11522712952dfd00896e8171223b03e5d357716085efe31c890d095cb5edddaea478c422a994cc1f9d6de52231fa7c41835070217668cbbc9fcc123da3
 MISC metadata.xml 313 BLAKE2B 70bc88a2b745b46e0da17a41ef420dd6b0ae2fcb3f444ed6be3d6bcdea63a4b0019790e0dba51b46c3a5d82c93f667f25b116793623604edad4d01841af723f5 SHA512 ae1c2257d3367ea3bdba8e040c0efd98674fe833f7a025c1b554e8cae6e1a41de6867e63c3d792593fa2f4baab158b046d2efaa08d6c8376f8ec749cdc7d4ff9
diff --git a/dev-python/scripttest/scripttest-1.2-r1.ebuild b/dev-python/scripttest/scripttest-1.2-r1.ebuild
index fa3fb17e8f0e..4c51de9f7773 100644
--- a/dev-python/scripttest/scripttest-1.2-r1.ebuild
+++ b/dev-python/scripttest/scripttest-1.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,7 +10,8 @@ MY_PN="ScriptTest"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="A very small text templating language"
-HOMEPAGE="http://pythonpaste.org/scripttest/ https://pypi.python.org/pypi/ScriptTest"
+HOMEPAGE="https://pypi.python.org/pypi/ScriptTest
+	https://github.com/pypa/scripttest"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/scripttest/scripttest-1.3.0.ebuild b/dev-python/scripttest/scripttest-1.3.0.ebuild
index 89c29e8fb7f9..a8e4544b5583 100644
--- a/dev-python/scripttest/scripttest-1.3.0.ebuild
+++ b/dev-python/scripttest/scripttest-1.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -7,7 +7,8 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
 inherit distutils-r1
 
 DESCRIPTION="A very small text templating language"
-HOMEPAGE="http://pythonpaste.org/scripttest/ https://pypi.python.org/pypi/ScriptTest"
+HOMEPAGE="https://pypi.python.org/pypi/ScriptTest
+	https://github.com/pypa/scripttest"
 # pypi tarball lacks tests
 SRC_URI="https://github.com/pypa/scripttest/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
diff --git a/dev-python/sip/Manifest b/dev-python/sip/Manifest
index 7a6b919bff3e..4b23ee7f509d 100644
--- a/dev-python/sip/Manifest
+++ b/dev-python/sip/Manifest
@@ -4,6 +4,6 @@ DIST sip-4.19.7.tar.gz 1022209 BLAKE2B 51b29bd436ce7af2d4a3b45ace100075bd257c239
 DIST sip-4.19.8.tar.gz 1024548 BLAKE2B e43dfe542061db9f1d5981d0cc172d9c8420c4e66c282c52974ab28314c33bd28e6056b61f74b04680c1735c9bd2c4656e1a541f4bae94c858d18713f6222914 SHA512 9c0a9722a9a9dd23e2eabe751d622cdd31b376b7987b2c991f5ef4a8d11853c5c6e9f1c24a0d2d864d3990e2a45c2a159ca8511efd4a7e156a14937ef3c680f7
 EBUILD sip-4.19.3.ebuild 2120 BLAKE2B 83b365b259bb57a09a645afaf1def7a57096cbcd6d5aa56eb066b9f680746a49d0528c364fb3aac4d73050bf570caa3ec2a70361f0561f28fec49bafb003bd41 SHA512 de1ff1f0dd2701e4e40b12aa0ffb5fba5f2cd380439eaf292a835812a08a449517769bfbe9d74374b18a0122390ee5449b9fb135797782344aac824e56f1ee23
 EBUILD sip-4.19.7.ebuild 2776 BLAKE2B 787ad402476cc19ed1a690d0c2fcf748b7c12429f9f61f6a2008dd772c21853745c2f110a3d1f4c57bfac8116636301ab1481fd54652d76b8fbc3c0b257e1f5b SHA512 a82ee1ad2f33b3b4df3b2816f0839a9ead6d52c55c23f9fdc0e79e68319e982d8827db3aa51c9334852e9ae5ae948fb692174e2234541d6c5d2d67f851c63f1d
-EBUILD sip-4.19.8.ebuild 2773 BLAKE2B de0f30edccb4cb5bf042308b7625838f9412cce433ec2f44a622a0cd86e96c473c3243acb079a4d5c3a65152434cf6c84fe04a4d86de0c53bab2dbf76fd09647 SHA512 e1024ac4438826589567afd1c902a64b8070f774ce1b38c819dfc0fd00f8ff9a7be76bf88293867dee651722110e5509da149b8465ed5d0e3bc6f8cf6e3e3197
+EBUILD sip-4.19.8.ebuild 2772 BLAKE2B e3233c3914581665ee6697572c77609cc4675914374be2580c9bea0e4b16f85bc4e29aab7a45bec374616a296cc1530a31302783e0f8be42789969360627e736 SHA512 07f12d27f8c2375cc69594e8b98102e0b0f6faa4537bc78a941c8ce78338175a854934df714e23f62a372e6f50805ce647ba5179c850f7097c4528c4ea44ecbd
 EBUILD sip-4.9999.ebuild 2648 BLAKE2B 8e7fdbfc969f73f30cf5c26282f06439be6e7d01e9ee087e0377d946aced09295c01ed685e4988a09967c604c3d378e2716552076ca509f6d808fe3a02d470bc SHA512 be5b35c951f7a93d8fe1dd751d4b27132f0249a052cedc4877a3ea7bc56b646744a174a4e0796b127ab0c0082fbb2bfbb1dcb8ef4fd02ff5c10059b44eaf8ae7
 MISC metadata.xml 593 BLAKE2B 3c4b5ccd30162027c913070a54eb9b836a7add04532e1c5b03dd83f0e4e58da0d2e19aee90f1fa4a97db0008a06575a5b0fe33986e1b0c9d473e4adff056afdd SHA512 91f8918bffb715bfb1def9aa6717a8c4149b36e6a1f79e7e3d4c56e0edc51a6585dad3a93698e956f1ff0e659c1f975c3f23be5a498479fc5052369840ac83d5
diff --git a/dev-python/sip/sip-4.19.8.ebuild b/dev-python/sip/sip-4.19.8.ebuild
index 79f92e130626..daecca774b9d 100644
--- a/dev-python/sip/sip-4.19.8.ebuild
+++ b/dev-python/sip/sip-4.19.8.ebuild
@@ -24,7 +24,7 @@ fi
 # 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/sphinxcontrib-httpdomain/Manifest b/dev-python/sphinxcontrib-httpdomain/Manifest
index f89579924f84..75d3f452ca33 100644
--- a/dev-python/sphinxcontrib-httpdomain/Manifest
+++ b/dev-python/sphinxcontrib-httpdomain/Manifest
@@ -1,5 +1,5 @@
 DIST sphinxcontrib-httpdomain-1.4.0.tar.gz 12192 BLAKE2B e4250a3814448d87255a6cef4fafb9be86bec1d7670fd30d2988cdc0c8d6db67fd18a1e9e02588754bd03ae7261806ce1d79d7bb8d94f47f2e2086a6897a67cb SHA512 85d4d0898a1703a1742755814200253b875795b5f267b08adb00c7d8d7c15c434718ce0f93656e7b698df89c958a9f6f3f3403bdc6d08f6df322fd80371f1d70
 DIST sphinxcontrib-httpdomain-1.5.0.tar.gz 13981 BLAKE2B ca08a5cdc22d9898c6972ce8b7585fc4f185e3a0c8e49302bfafbfc88b4bb69d9d3deaf15cca2dfcd2f218199f509023aeb542129fea2003cecb2e8ef8215fd4 SHA512 e393690314cb7a7b81207ee42826eb5360ca6cfa8ad1b57c9a8dd5897ed1ed97bad4a46d8348aad9d5f6b6145e5456af629b14973ad2561d5b90b2f8dbf2163a
-EBUILD sphinxcontrib-httpdomain-1.4.0.ebuild 631 BLAKE2B f2a086a1cf66aae435920c98303d7f7bdc3e2afafa3e0c976fee44817a674f2bc966e925a1fb4b968e9ec178ff8ca4f9c4c413a52194146d6ca7a0cea2305ae3 SHA512 304d9d37c3cab1feaa437bca7126db6ab17d4d0786bf0781368f7f84e193b3a36b06d5cb5e35d374bbfc385ac3448364e10b492edf84bee90fb1fd32b1b09d8b
-EBUILD sphinxcontrib-httpdomain-1.5.0.ebuild 755 BLAKE2B 74c80e9613f99cb2f409680acc7d8bcc4cb467edba1e25550a1a37bc9e343544b3cce5576c8d946865e67e041e33feb1f0c8a9fc44f5682f69e63eb6935bc09d SHA512 130ad3482d513abbd3c74f4d244d1311dbe715e7a224ff6d75c5e09608fe1a3b65b859793bf64455ccbb4c101d8c7c8679a78124711001af0e46ce3e09ff71b1
+EBUILD sphinxcontrib-httpdomain-1.4.0.ebuild 635 BLAKE2B 7ff1482e4a3cdd2b3ce688f204df3b2004fbdaa5fe2df38e44b5736df7c6099488db31c0687663ae4db4de48c94dd9006a5ae57664fa95d551026e091cdf9c06 SHA512 6f6d76770211508f9f2ea5a8a31bde0b238cd1c1644415b6e982bd85bb884703ca45a463eac2fa2108e5f359f7123f8984f163a2a7e203baa0b6471d6d5b60db
+EBUILD sphinxcontrib-httpdomain-1.5.0.ebuild 811 BLAKE2B f1738bab2b5bd8d86d541f5780315fa94d8d2938355c3fee91dea7ebefc0f7f11d9bdc856746fc514974bc6f7dd28213cc2e0a4261c2d28956165471abb8a8cc SHA512 7a33707db9ef577791add8150af8f5ce767cee6908e4d05ff71f8ef85443148a6107ac71a2d8325c3a267c17a5caf11c1770e249a6df79e89409c354b98b678b
 MISC metadata.xml 407 BLAKE2B cf0e92bcd492b79892ebc97b7639c016b4d1853a87bed8fcd1e367a9f6cbadce01015895d22011425aba76a4895b245bee0e5536fc959224a6bed08daef74a88 SHA512 155696e449933084fbe56dd900e15d17e12d52d6af29eb4fcb6c05ddfe8c6fa716974fa27085c34ae2e1af0d1739dba2616eb12092c606b2645f2008e51d64a3
diff --git a/dev-python/sphinxcontrib-httpdomain/sphinxcontrib-httpdomain-1.4.0.ebuild b/dev-python/sphinxcontrib-httpdomain/sphinxcontrib-httpdomain-1.4.0.ebuild
index 670e1c924e27..6ca21707ccec 100644
--- a/dev-python/sphinxcontrib-httpdomain/sphinxcontrib-httpdomain-1.4.0.ebuild
+++ b/dev-python/sphinxcontrib-httpdomain/sphinxcontrib-httpdomain-1.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -7,8 +7,8 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
 inherit distutils-r1
 
 DESCRIPTION="Extension providing a Sphinx domain for describing RESTful HTTP APIs"
-HOMEPAGE="https://bitbucket.org/birkenfeld/sphinx-contrib/ \
-	http://packages.python.org/sphinxcontrib-httpdomain/"
+HOMEPAGE="https://bitbucket.org/birkenfeld/sphinx-contrib/
+	https://sphinxcontrib-httpdomain.readthedocs.io/en/stable/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
diff --git a/dev-python/sphinxcontrib-httpdomain/sphinxcontrib-httpdomain-1.5.0.ebuild b/dev-python/sphinxcontrib-httpdomain/sphinxcontrib-httpdomain-1.5.0.ebuild
index 10e5eef85a82..632c15f40f81 100644
--- a/dev-python/sphinxcontrib-httpdomain/sphinxcontrib-httpdomain-1.5.0.ebuild
+++ b/dev-python/sphinxcontrib-httpdomain/sphinxcontrib-httpdomain-1.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,8 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
 inherit distutils-r1
 
 DESCRIPTION="Extension providing a Sphinx domain for describing RESTful HTTP APIs"
-HOMEPAGE="http://packages.python.org/sphinxcontrib-httpdomain/"
+HOMEPAGE="https://bitbucket.org/birkenfeld/sphinx-contrib/
+	https://sphinxcontrib-httpdomain.readthedocs.io/en/stable/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
diff --git a/dev-python/tempita/Manifest b/dev-python/tempita/Manifest
index 620d26b55b49..5550abdb93e0 100644
--- a/dev-python/tempita/Manifest
+++ b/dev-python/tempita/Manifest
@@ -1,3 +1,3 @@
 DIST tempita-0.5.3.tar.gz 12707 BLAKE2B 921087bf09454506db8cab7b37c780bba5298b206113e246b710367b92364f03055afda6b826ca3008e34e4ea8821c6aabf045a735ac0887db1ba8a82e048ddb SHA512 43bafd42ab0c07bec636d637bfcd42053559d188e13bccc66527dc5f735fd9c3ec30fcf29f3e650d88315fe8f2eb2c5af280f51d2c64db099e08d8a70969a1c4
-EBUILD tempita-0.5.3-r1.ebuild 647 BLAKE2B 1b1eabc5c30f073da7e4618553d2e0b172d9cf2abbbc6283c3d9a67f0218356f34c1662475b5274f7faa2421703e179a1cef4fe51f3fe09dc8e100cf63bcea2c SHA512 1716fa8a219bc2a3eaf114e5e9281299d9927195cdeda57911f65010b6c9719c88e4fe73137fc20b7cc3b6c3b81c57b6c560e538e09a17f4ffdbe7b2929b6c59
+EBUILD tempita-0.5.3-r1.ebuild 616 BLAKE2B d79881a801c0a676606e698388c63a5f304d66fff2403ef1539b9fb5b6d2e6be9e6e14ff7d6dae9dc00638a5682144c7a777b721f6142d56a4c9845397030387 SHA512 e646ab27894a36a3c4681c1afb8ed4793de88a0889636807b5a645012cac78bb0d4ba76ee5c18eb51a54e40ad03d9480f986446f74a15eeea27e5ef4d309a84c
 MISC metadata.xml 320 BLAKE2B d26cd9d2555b7d1a56ad44c86fb280a249a4f2d45c3f320cbb9a98de249e826701d49b814c209e6270d183084b8955e177fdac69af0136a7432cc5370b70fb3a SHA512 44f0ea2e06ab198180db9be4533b29c56e7cd0f3af9f522188e063cf787ad1eb1eff9fe2e09debe97be85769a09375385c1f838a7eedc2bc92835e846320f109
diff --git a/dev-python/tempita/tempita-0.5.3-r1.ebuild b/dev-python/tempita/tempita-0.5.3-r1.ebuild
index 4cb6f4d0d6a2..eb02f1953565 100644
--- a/dev-python/tempita/tempita-0.5.3-r1.ebuild
+++ b/dev-python/tempita/tempita-0.5.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ MY_PN="Tempita"
 MY_P="${MY_PN}-${PV}dev"
 
 DESCRIPTION="A very small text templating language"
-HOMEPAGE="http://pythonpaste.org/tempita https://pypi.python.org/pypi/Tempita"
+HOMEPAGE="https://pypi.python.org/pypi/Tempita"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/thunarx-python/Manifest b/dev-python/thunarx-python/Manifest
index 4ad3ec3862b7..8571114d4b8d 100644
--- a/dev-python/thunarx-python/Manifest
+++ b/dev-python/thunarx-python/Manifest
@@ -1,10 +1,5 @@
 DIST thunarx-python-0.3.0.tar.bz2 303035 BLAKE2B af0193a3bc97c859ba98f52c612d5af81c5b7a0d8142a8283cf2b308fa183ac57ac1a2163cd882749b6fd33e0529f20f1f9e2db2dcc1aed26cb40cd5995780fb SHA512 9be3e8b50cd668e0b63fbf54da5dec3685dde40528067b35bd1cfa87db7e037962baafce3059818a7de76101472a2b07ae209c590f2f143dbc71646e8addb28f
-DIST thunarx-python-0.4.0.tar.bz2 332620 BLAKE2B 768a2a236e12d298efb3abc86f4a339548248f5f88366ec7d956249c028474612b15c340976ac2c2ced806a89517278c70b50069d76b2eee6af6dd097789e275 SHA512 fb54f83c11857ec2236a249895954efc29446120c192b8d19794b7e8145836969f87d1efa524bfaa4c9d31ee08a2c17a57d7210ce4a3a4982780d128839d02b1
-DIST thunarx-python-0.5.0.tar.bz2 334305 BLAKE2B f62e2e7c1faf9c218398d920c1079e82c72253e9ee547892e064f85a2ddb01ac84007ef0fbf4fd7e2bd39a80f74273a96604618f0ec4238f1cb292c97a550a8d SHA512 69350fb76e972fdbf63217e7a200642088816b803e637d3d7a1a909632115f5664cfe6e6bb90b640ed947416e0a0ab2761932a0c0219ccb7bcad767e6e07e7fe
 DIST thunarx-python-0.5.1.tar.bz2 334426 BLAKE2B 59f8e625b10ceeaefffa4b6dde150c32023365e76854c6e77ae2f222b509856353c8d62de26ba4e7b967cfcce1219205923938389fd1714a420bc9e1ac2b12b2 SHA512 0c1d8f20b74a3eb87b3c2c181c6438bc059dff75afdc26cfea19dffb7efe1f14e6a880689f73afcbbcb5922312741df72018e3b9980c4a45426e7a7d4651177f
-EBUILD thunarx-python-0.3.0-r1.ebuild 945 BLAKE2B 6e21b84d4696ef1a37125ffe6faf0a99747d4a86a4e8632fd46c567240dba91500d7dfe1fc2248e454f0451cda3de091efd5551b3be7115facab3cbf5d4d9ab0 SHA512 aedb93000543f01385a0044f5c1af7b95240bb7131c6239e1297f31ef3a8d8b23c271d1011371c603c260f26b5c46eb4eb519377441f646cbbd4a187b1201781
 EBUILD thunarx-python-0.3.0-r2.ebuild 770 BLAKE2B 9fea60857af9d2a66dbfdd4ef55af839aba770f05e204a9b5aec7e8639310dda1e5a3bb8d15bfa4b3c1373b072ec05202606fa4de1e23ea9a6733f37f3e7d835 SHA512 d7127dfaa7180fedcc64734c987555d6e01ece467ab998ec472ff0d66a5e46cc83b10d3c3b85b9ce710a28ac2b7ef87f4fdd5fc92a4c054f1d868030f87f2b42
-EBUILD thunarx-python-0.4.0.ebuild 753 BLAKE2B 271f58f98f3b0487625d72e037cd5fd6470ca5fc282ad510e89e75e9fbb970101faf830c0801be1b3113e0bc7cc6b99eb07fd0d6195a267d45029e79727bc403 SHA512 c054426c2f48de127413768a92774c8da2ead3a66c111863e71b7a14853190b3af7bae4d33db26aac18e0d935bfc86c78c05392e4834f5f9ad6fee19b7997f72
-EBUILD thunarx-python-0.5.0.ebuild 725 BLAKE2B e79c7d63dafd5dead64a3f09c122a0834fd3d839cb2d31585ed166d1dea15f46c03d46aac2796c8e3ed9f39ce16bb7d51c2d8899512d9bc20932d9af110a02c0 SHA512 815c6b5b061a19b1cca054343a115644ba60736eaef2c5ff01cbdacb071c30c9b58b74422db443ef49bd30b3d6dadbd508317db32e94cf778130b9462842fe0a
 EBUILD thunarx-python-0.5.1.ebuild 725 BLAKE2B b9f2c25fafb17f96bc28a4ed02a2fae489433b0f62868a458da814c0f1c689b89e05027c7681648546e9724fd0d003484e11a0f38a4252df2b099af2eeb958b3 SHA512 e04e2170128b53c6d2ee43cc2ad46b0a3725cb164457b8197beb427a27e9c7843d4ae7c64b949525e8d53acbbe17338aa942968cd26768770d00e4fcf2a62ced
 MISC metadata.xml 357 BLAKE2B 48cf41f710ba774f8adaea9825d2b72803e19e55a76afea97cec934449c0723d7ca411ee20297652179abd621bd6bbf533aaed3ebe0d6601b13ad26840d225c9 SHA512 f707818cf1217c314e8c0a18c990f4b1e65b358e7fefe68490d59956c97aa40a2f2b0130d89a54a658dc2caea11e0c5a01f04553faab53dd32513bc299e90b58
diff --git a/dev-python/thunarx-python/thunarx-python-0.3.0-r1.ebuild b/dev-python/thunarx-python/thunarx-python-0.3.0-r1.ebuild
deleted file mode 100644
index f9504d17cdfa..000000000000
--- a/dev-python/thunarx-python/thunarx-python-0.3.0-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-single-r1 xfconf
-
-DESCRIPTION="Python bindings for the Thunar file manager"
-HOMEPAGE="https://goodies.xfce.org/projects/bindings/thunarx-python"
-SRC_URI="mirror://xfce/src/bindings/${PN}/0.3/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug"
-
-RDEPEND="${PYTHON_DEPS}
-	x11-libs/gtk+:2
-	dev-libs/glib:2
-	>=dev-python/pygobject-2.16:2[${PYTHON_USEDEP}]
-	dev-python/pygtk:2[${PYTHON_USEDEP}]
-	>=xfce-base/thunar-1.1.0"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-pkg_setup() {
-	XFCONF=(
-		--disable-dependency-tracking
-		$(xfconf_use_debug)
-		)
-
-	DOCS=( AUTHORS ChangeLog NEWS README )
-
-	python-single-r1_pkg_setup
-}
-
-src_install() {
-	xfconf_src_install \
-		docsdir=/usr/share/doc/${PF} \
-		examplesdir=/usr/share/doc/${PF}/examples
-}
diff --git a/dev-python/thunarx-python/thunarx-python-0.4.0.ebuild b/dev-python/thunarx-python/thunarx-python-0.4.0.ebuild
deleted file mode 100644
index 5f2803170adc..000000000000
--- a/dev-python/thunarx-python/thunarx-python-0.4.0.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=( python2_7 )
-
-inherit python-single-r1
-
-DESCRIPTION="Python bindings for the Thunar file manager"
-HOMEPAGE="https://goodies.xfce.org/projects/bindings/thunarx-python"
-SRC_URI="mirror://xfce/src/bindings/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="${PYTHON_DEPS}
-	>=x11-libs/gtk+-3.20:3
-	>=dev-libs/glib-2.30:2
-	>=dev-python/pygobject-3.20:3[${PYTHON_USEDEP}]
-	>=xfce-base/thunar-1.7.0"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-DOCS=( AUTHORS ChangeLog NEWS README )
-
-src_install() {
-	default
-
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-python/thunarx-python/thunarx-python-0.5.0.ebuild b/dev-python/thunarx-python/thunarx-python-0.5.0.ebuild
deleted file mode 100644
index c6d768652260..000000000000
--- a/dev-python/thunarx-python/thunarx-python-0.5.0.ebuild
+++ /dev/null
@@ -1,31 +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,5,6}} )
-
-inherit python-single-r1
-
-DESCRIPTION="Python bindings for the Thunar file manager"
-HOMEPAGE="https://goodies.xfce.org/projects/bindings/thunarx-python"
-SRC_URI="mirror://xfce/src/bindings/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="${PYTHON_DEPS}
-	>=x11-libs/gtk+-3.20:3
-	>=dev-libs/glib-2.30:2
-	>=dev-python/pygobject-3.20:3[${PYTHON_USEDEP}]
-	>=xfce-base/thunar-1.7.0"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-src_install() {
-	default
-
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-python/ttystatus/Manifest b/dev-python/ttystatus/Manifest
index dd29ffb6e5ba..a02d4f3f5581 100644
--- a/dev-python/ttystatus/Manifest
+++ b/dev-python/ttystatus/Manifest
@@ -5,5 +5,5 @@ DIST ttystatus-0.35.tar.gz 34144 BLAKE2B 92a11676525f2db5b3bc09786ddb3651f72202e
 EBUILD ttystatus-0.22.ebuild 480 BLAKE2B 030f109e34d4554372ddb24a354681aa5fb276b156be9f74799e6dd4b10baae6aa9382bf0089fa1b86a0fa76e0bbe08d8d2d7323112356ff1e240c1c92ad34d2 SHA512 a630abd0fe622181bb23db23c8e52b01bdb24fe4a414414070632710b0763039b592bd1a8145e0f3521295dde51ee08072b3a0df0d89803d8b9b63d90c55abd1
 EBUILD ttystatus-0.23.ebuild 489 BLAKE2B 9e320dac4060af471dd967728883d013ee4c3b8c056bef0bfba467bde3a10ec77ebda6098d2a47196ced3b06df5032e7e83706e4cfe2ac8c4213523f300de0c3 SHA512 9077281c7c4ee294c290952a5a50e37dbd89a1c7793bdf9a3c5eca922f6501df644fc145f9dde228d8a1c69518992ac19bdff0dfee6c0061eb16449d61fdc7e0
 EBUILD ttystatus-0.32.ebuild 483 BLAKE2B dccb177d2f734037efef5020259ae9aeedbe5f85a1d3b7474f126c54752c271a45431e505a829bcbf3466757e413f40b37419b02db9982e94721648869a152aa SHA512 7b107179d287c56fa9bffc3057d9988cf179e49aa4b4a92edcdc31dc7bdeb7fd69b37e1932a56fee7905e2e305787320aaf1c62fccf4194648def62f4bcb40c6
-EBUILD ttystatus-0.35.ebuild 547 BLAKE2B 4454fc4ef75965ab5068a53dc7d17fdea4ab20da6f7e138334caa2fd38574be7e0268d8d030ca5069ff134ae7b50c1749b708ad7d9d012609d5bd102514ce220 SHA512 ede3de94077d49dea35010f042a7aa0e3b010767e5da0d6f68a9d48f283d0b0fb397b16663d153fa3af33d0dc5e3d7221bf70a679eaaaa5ed1b75f668ac10078
+EBUILD ttystatus-0.35.ebuild 546 BLAKE2B c8e695b3a7d4780814cdb70a3fe01fb5fb38380b1fe44de1fd73713774f1a3a957cc73027c07cf842e1bb1a92a94f34ff160713a4d3c823f360bc3ff9a884e21 SHA512 3f59da4728fd460e8b04e0871977117ecf378409b19bf89e30bff766037a92fbd13448eb25688b3abe69f8e3bbfee31983074180de0785652c6c0d876c06d5fd
 MISC metadata.xml 250 BLAKE2B fef48a48388f26a915c53bca9aa9cab62fb73ec006736542afb4cbbe0c7b81d23afe2884f52433c7d390fc38ac32f957a6f6efe285ee1cafaed76407a964cf9b SHA512 924271cfb32ceafc4134e19b53fbeed96f2e9056addc3c2cbdec28890254abf5f0714979a3ab698ca046e41ef5c2cca2932350830bd8bd3a8e214d99123c12de
diff --git a/dev-python/ttystatus/ttystatus-0.35.ebuild b/dev-python/ttystatus/ttystatus-0.35.ebuild
index 6fc99b15fd42..230ad845ebf0 100644
--- a/dev-python/ttystatus/ttystatus-0.35.ebuild
+++ b/dev-python/ttystatus/ttystatus-0.35.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://git.liw.fi/cgi-bin/cgit/cgit.cgi/${PN}/snapshot/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd"
 IUSE=""
 
 python_test() {
diff --git a/dev-python/virtualenv/Manifest b/dev-python/virtualenv/Manifest
index a9c5ea020c18..81defafe45a7 100644
--- a/dev-python/virtualenv/Manifest
+++ b/dev-python/virtualenv/Manifest
@@ -1,4 +1,4 @@
 AUX virtualenv-12.1.1-skip-broken-test.patch 542 BLAKE2B 8c924cafcc0ee78b3101d55a58db8f352f793fb873a2d82b00b13a41fea9b556d90613a8df1b4a86939b22573542d2187366a9e551ed3090c62d6bc4566779c7 SHA512 9517f2efccb3cd177370cf66ea12244a39e762aae64e9bd412fc05af087648066deaf62d381b52a0eee1487c82109df4bd463599eaa641890c32eec48b694f25
 DIST virtualenv-15.1.0.tar.gz 1865011 BLAKE2B aa460d9188189bf44557417a3a878f4f58d6c4a66fda2da5dd9a69e2ec04a8be6b5cf125160b1f00b4a32803dbf8231a006974499e9110101cac5e522d82eaae SHA512 46c313fe855483cf42def0ddb319df7513bb00ea2c1570efaf1236b4e0074df40d574f3858a3d3760db988b9021ca2046c40a355cc5a3ae32a2802d6120bf255
-EBUILD virtualenv-15.1.0.ebuild 1227 BLAKE2B 35a997539198b963676b342703cc574e8e68a5f7f229aa7e06069605a8e190b8c20c7dde0ddb3fe4b6c3c8129544b7e474ab0bc9aaa9fae258b51f878cc4bd4b SHA512 d41946eb0379879d8f9f32c47664bd49fde90615c4ed62c795220cf40ef2dfebf7709b298606fe993fc13e2b5d5b63e0578e65e86a3accea8bb23b1a8a06d504
+EBUILD virtualenv-15.1.0.ebuild 1238 BLAKE2B 0c8169860c00acb69b7283f6f0786835a3a1b32ffafa2a09dc353cb3bcd62f9a2ab74e525565939b942d3e548943b898dbc4032fccc88f0d952a6233d745419e SHA512 42bee8f479f10083aefca3c877bf5ce83c0ba6326fd9d55ad76fc2917687fd3ab09e4038e542a77ba913ec4bffdcaeeed745669e459bc68ab99c5b9816729a03
 MISC metadata.xml 380 BLAKE2B 9a15805179f82d4e5c60aeb56191e690f9fe9260e34d9b4e0b893a51522fdc61246f02b20c1b55084709e06d6ce53b2e6436947aa178e2d413a923102d7ee125 SHA512 b6385fef70c6988548a00e6987bf5004979d139ad6c501d3f7b739bacef06eafa39a40bee8cc2d1164e01bb425f131aeea13f4b58ed6e75d66773a4f1c1df824
diff --git a/dev-python/virtualenv/virtualenv-15.1.0.ebuild b/dev-python/virtualenv/virtualenv-15.1.0.ebuild
index 74fd73ea467c..493ae2140524 100644
--- a/dev-python/virtualenv/virtualenv-15.1.0.ebuild
+++ b/dev-python/virtualenv/virtualenv-15.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ inherit distutils-r1
 
 DESCRIPTION="Virtual Python Environment builder"
 HOMEPAGE="
-	http://www.virtualenv.org/
+	https://virtualenv.pypa.io/en/stable/
 	https://pypi.python.org/pypi/virtualenv
 	https://github.com/pypa/virtualenv/
 "
diff --git a/dev-python/virtualenvwrapper/Manifest b/dev-python/virtualenvwrapper/Manifest
index 3398a605834a..36b9b1ea5f75 100644
--- a/dev-python/virtualenvwrapper/Manifest
+++ b/dev-python/virtualenvwrapper/Manifest
@@ -1,5 +1,5 @@
 DIST virtualenvwrapper-4.7.1.tar.gz 89930 BLAKE2B 8e101f04e365dbb6244bc787f853dd90b15d7b33a44725ac1e047cfa74845b9fe11ca100c8437536d80943f29be1dbe10920eef2ce9766bd95ec05cd96951eba SHA512 f972179992728b8b600388b34562fa9de355f526e4ee25ea88840700a57f196a60eba91ac3137e7d826925c7a8ade7479af383bcbfb8b9b837d0a374b8b3c4fd
 DIST virtualenvwrapper-4.8.2.tar.gz 91331 BLAKE2B a01a971ccfdf1822d65fe6d2f3ae09fde2646c8a6246f54316afb6e5d5068078e77732fed3a9805371fefeed7a4357c27b52eed24e9bd03492965779d6a50836 SHA512 53d92f653b988873da5a46e316a40ef767d97f75072e311aa4a8ae45c8aabb49569e36cc35597f9bdfc1f883a51eb648d5f01f4ea8b3237fae30a21dca67d7bc
-EBUILD virtualenvwrapper-4.7.1.ebuild 1038 BLAKE2B 61ce55312ea52ea9e0f6e67f09f86a88ab8aec334072433e7076332c64f066ce4fe84a1b9a79862f0d97496a808cedf54da9ecd18930ab147d8394d8aee6dcb6 SHA512 a5c1db1843a440cf3069dd32d1a7fe0b4335be16cb8f38cc6c8832105ff43741a76445195c27479187edb7538d1b55a7cef1ad0bae39a7435c3d032dccf59de8
-EBUILD virtualenvwrapper-4.8.2.ebuild 899 BLAKE2B d67c157c549cf64f9245de940a725436afb0b841c67bb6eb7df59983874714552bf2e17e1a602a3b07e4caad78b768bb7385019e95d73ccc8fa7d7ad29317f81 SHA512 93566cc41375173c5e233fe507e851216f79a0f2c882420e66141c4501a16e7838ff3cdeb1cfca13fb58e7960e4f2c5efca9cdad945e56a9d11765f070f83635
+EBUILD virtualenvwrapper-4.7.1.ebuild 1036 BLAKE2B 8baa9a470b636cc32183430448082365986e0e498ae6f9c86677c6e5c587f92b47eff20d659dae9829fe83706f865574534569ab7fb67899f441a60b5ef1424f SHA512 9aeec008743529c185314614b508b0b0b3567315be0790c80e860edb5e3b9aeec2c08db76fe7c731b2fcb8333d918ab4b689105c00140e2a4e05109c24bd5d87
+EBUILD virtualenvwrapper-4.8.2.ebuild 892 BLAKE2B 41d181d996e3acb8421107635499276215b2bbff7a22b90af486ce5f98c9bb2e315fb210ffe4b43b04250ff5ce10aa9bd066b1d567f881f000ff1074c9ced1e6 SHA512 55bbd23e463c3f8891fe0baaebbc2a853fd4cddb246f3155e768344d4ea0ed0305ac110da1e094d6706c97ea24923b5b9ef56619edd86e4fab2cd01b7c4cbd90
 MISC metadata.xml 320 BLAKE2B b3b2f48545985da37bc3f4cd0a6f9fb8540a320cb6cc6e0be1cded9fc77862e47f0f30de3dbb683e9d7001cf05e221cb45f922013c155d5bf418d740ad3ef543 SHA512 dd5556b6b8cc96882032b3b00de65e2ca95cc0ee93c00639f1537e4abd31cc14022e2b61cb04f12b53480c273ef9be269128c4b683a9774590b1cdd552582386
diff --git a/dev-python/virtualenvwrapper/virtualenvwrapper-4.7.1.ebuild b/dev-python/virtualenvwrapper/virtualenvwrapper-4.7.1.ebuild
index 6e8c82709c56..bcc98199cd42 100644
--- a/dev-python/virtualenvwrapper/virtualenvwrapper-4.7.1.ebuild
+++ b/dev-python/virtualenvwrapper/virtualenvwrapper-4.7.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,8 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} )
 inherit distutils-r1
 
 DESCRIPTION="Set of extensions to Ian Bicking's virtualenv tool"
-HOMEPAGE="
-	http://www.doughellmann.com/projects/virtualenvwrapper
+HOMEPAGE="http://www.doughellmann.com/projects/virtualenvwrapper
 	https://pypi.python.org/pypi/virtualenvwrapper"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
diff --git a/dev-python/virtualenvwrapper/virtualenvwrapper-4.8.2.ebuild b/dev-python/virtualenvwrapper/virtualenvwrapper-4.8.2.ebuild
index 3cf33e1ade92..b2229273737b 100644
--- a/dev-python/virtualenvwrapper/virtualenvwrapper-4.8.2.ebuild
+++ b/dev-python/virtualenvwrapper/virtualenvwrapper-4.8.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,8 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="Set of extensions to Ian Bicking's virtualenv tool"
-HOMEPAGE="
-	http://www.doughellmann.com/projects/virtualenvwrapper
+HOMEPAGE="https://bitbucket.org/dhellmann/virtualenvwrapper
 	https://pypi.python.org/pypi/virtualenvwrapper"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
diff --git a/dev-python/webhelpers/Manifest b/dev-python/webhelpers/Manifest
index 8b929f693522..6ae8d98954a9 100644
--- a/dev-python/webhelpers/Manifest
+++ b/dev-python/webhelpers/Manifest
@@ -1,4 +1,4 @@
 AUX mime9ad434b.patch 827 BLAKE2B 7718339e6b099a18bd8abf4be75342e7474444381b04b73a30ae426bdac19dfe7662d0eba4d5eb343c0656c6f694a2045b6560ab8dd163c212faef3d5b0ddcd0 SHA512 98ee96b72152d1c644ce398c9bd52e6e1ba45de1c93c739fbbc0e81fafb5387dfb41551c7752c251e24003abeaba1ff16b6d3367a5e441a1a864b698638c4af5
 DIST WebHelpers-1.3.tar.gz 729963 BLAKE2B 98a51d39f0ea8aaca894ffed1fb21fd05305fc70c9c07062231da16091b7b81fa425725b915fe36b09f7c2943633e9b0e6e326031b1e50c84676b567b2ffe762 SHA512 ff1f19c5b878bdcb05664523d16fce1abb012957f00a97c06b3b5db581c6a361a2db5516b47a0e2b107bc9ba73270ccb323afb240cc67a34d6f15ce9462fad77
-EBUILD webhelpers-1.3-r1.ebuild 1511 BLAKE2B c3f4bf3b7ba76c49762bf3d190aa675d8b5bbe14b9821c82b341446690671504a49874b635e3a8c38c5e7314b20da401dde7af37d3c284e57e065c4da160dc3c SHA512 0ecc8011d2c35d153a3d35b13d91fe41e9408954ff11e9903deb3b437d52496b4030817bf0788b6e181310e7686572779a092fb75400be5553eb370aa1e202d1
+EBUILD webhelpers-1.3-r1.ebuild 1543 BLAKE2B b1afc188a57d04625ea49a7ef3b8ec93af7d3bbc9ff64d3a669a3634aeb4bd35be6904ab806c56cf8daa03a5aca69aebacda193522f0e63331408cc76a12aa28 SHA512 19ac73b9c171385d04661039d9c2bd090ada4dd4f36fb742d7c6f4c73c04fbec54d9ac9e1f49a4b609b9fd933e73c613298909b654a59eb220da1f34ee3fa5b7
 MISC metadata.xml 313 BLAKE2B 39c2abc44dfcfb8c079f665ac17e7bc66fcf4ef09955bddebd6c9442bdb7ddf2e6c7b02cadfe024b671882a447c4045657a12b91db6d4182e3c44fd2e989ec64 SHA512 d3f3cb56d4fbc3690545df372cd447b9f34a613044372211037b9366dd0ae91168d0c465c80008b0d1e9ca78384d186b3a8dfa2516ccc7ddfa5b09b4e14009ec
diff --git a/dev-python/webhelpers/webhelpers-1.3-r1.ebuild b/dev-python/webhelpers/webhelpers-1.3-r1.ebuild
index 2a3ebb4d71d4..5e0c9ea81ae3 100644
--- a/dev-python/webhelpers/webhelpers-1.3-r1.ebuild
+++ b/dev-python/webhelpers/webhelpers-1.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,7 +10,8 @@ MY_PN="WebHelpers"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Web Helpers"
-HOMEPAGE="http://webhelpers.groovie.org/ https://pypi.python.org/pypi/WebHelpers"
+HOMEPAGE="https://docs.pylonsproject.org/projects/webhelpers/en/latest/
+	https://pypi.python.org/pypi/WebHelpers"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/webtest/Manifest b/dev-python/webtest/Manifest
index 41016bb19a3a..72b60d05903d 100644
--- a/dev-python/webtest/Manifest
+++ b/dev-python/webtest/Manifest
@@ -1,5 +1,5 @@
 DIST WebTest-2.0.21.tar.gz 66866 BLAKE2B d2830fcce7fb4b91029838806952e3e9c6916c3b292c7142138f30486d936b4a1f0c2d28a5973b0c351c64e499f343f3711296c6e37c38548e3a81b108163a17 SHA512 21f58ee9192fd0eb0eb2d88179ffc015aa5cf04c8004db251bd65d13d54c34b9e6b5fc9fdd8e9fcbbc18fcfb2be714c0691b2ef034318861262f8705b4a44610
 DIST WebTest-2.0.29.tar.gz 74620 BLAKE2B 7fc68f1178b1abb0a0f126112b846853762ad78cb060718bc340f5ba17517180b7283f384503ff77a2c7396645ebe2d5528dbc0f027c5d44beb002c4204bf894 SHA512 319700d1444f6a681f8ed8a4ee8661ba0462b3f4bfeb7510232f58be92e017066da3bac494ebe1a3c5b9f2d06c025e08e6193277e13c6113e9485108d4ccd2d2
-EBUILD webtest-2.0.21.ebuild 1841 BLAKE2B b38938e9aa5ffbcff77672e6aa1ea357fcdcbcf70c889e8130bd3d0fd9d8beed272968744b3b3a05b6000b87f668831b8e073ee2af6ed852a24da3ab766e4f62 SHA512 1c0201d485c7cc3a00e3f2f6c3ed7c54f3eccba4c3404365139699a432fe751e94dd070ebb2fd3de7de52b6e2cd5c102aa7f5d297dfaa92c922b5b15b015299f
-EBUILD webtest-2.0.29.ebuild 1813 BLAKE2B ebb2ec45046fcc92f49f263278dbcc038a7533d54e167005774b0e7a544b5a0b575c9108ded4b1b08ebe839a6d957d5dfc83085cc1dac2a56cdcc96a9f157ef8 SHA512 f20fc44c398302565efd52a0b26717063d2eca18a2e0fa292a0d82ad8138c4417f036af7bf9a93169c4ca4da672f86801e2bc967c5f90bff15eecd8e3196cc49
+EBUILD webtest-2.0.21.ebuild 1809 BLAKE2B d8d055572c11fefb4ee45b77b78824f7e83b08e9afef65dff29ab1b4b9eeba732270eb96b3b7cd3e923520d8f1410e0e6f49cdc40bdd4e356d1ac05c64d0eada SHA512 b15ae56321a6202bbf1043349f52ab2440ce755cf04c634bc1d5a4181f14c85702b4d7187024e0bfebdbd8c7c513cea01e961f147efe82560322491a4acc0700
+EBUILD webtest-2.0.29.ebuild 1781 BLAKE2B 2d6a197825c7a15d2477482bf34a3886f43c27dc336c79c603851794358281a8592067aeb0667b63f0fa181d13fa42abbaac4511ae3343c3e46b15cc926a370f SHA512 402f445f9657b263f26edd4760a5b7788f6ede34cddc45689344020085b6399c8596a336aaa8c6d3907693e3af132d0cb027427587ba69a9d9c15bb935217381
 MISC metadata.xml 310 BLAKE2B 34f814fb04671947a228986ee91f8eaafec5a2931cdb87c63b8e135130dc60eff1a2fc2d15f0aba767fac07d853ffcdc339dfdd02495ccc40830b5452b6173d1 SHA512 0fb6e471cf00fcbea309bdb63d23c5917250f2de2e3e245a91d6ccf1258123ee6f0a8c3f311c526b7f9062c6ed93df1c89f44abf16879440dd1dc81c7fba2743
diff --git a/dev-python/webtest/webtest-2.0.21.ebuild b/dev-python/webtest/webtest-2.0.21.ebuild
index a5fba1176103..3e49691c6db6 100644
--- a/dev-python/webtest/webtest-2.0.21.ebuild
+++ b/dev-python/webtest/webtest-2.0.21.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ MY_PN="WebTest"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Helper to test WSGI applications"
-HOMEPAGE="http://pythonpaste.org/webtest/ https://pypi.python.org/pypi/WebTest"
+HOMEPAGE="https://pypi.python.org/pypi/WebTest"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/webtest/webtest-2.0.29.ebuild b/dev-python/webtest/webtest-2.0.29.ebuild
index b30ffa8e4a34..179c42060fc0 100644
--- a/dev-python/webtest/webtest-2.0.29.ebuild
+++ b/dev-python/webtest/webtest-2.0.29.ebuild
@@ -11,7 +11,7 @@ MY_PN="WebTest"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Helper to test WSGI applications"
-HOMEPAGE="http://pythonpaste.org/webtest/ https://pypi.python.org/pypi/WebTest"
+HOMEPAGE="https://pypi.python.org/pypi/WebTest"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/wsgiproxy2/Manifest b/dev-python/wsgiproxy2/Manifest
index aad2b33eaa1a..a3dd11f44505 100644
--- a/dev-python/wsgiproxy2/Manifest
+++ b/dev-python/wsgiproxy2/Manifest
@@ -1,5 +1,5 @@
 DIST WSGIProxy2-0.4.2.zip 18817 BLAKE2B 90334926b726024c1a16b066d11cfe579ad80515861811766753aa772fa97e521466bce0a08c028a965e51ec40b977feb1f4b59aa6c023ca6a431deb63668ed5 SHA512 3dd750263485ceb644373d8ea9692c9a46126a1ed7cd640feba7d42b0fe618e290dcae2f76dc83be77de34211ac473f5a1496a8309e3fcc64982e9642af786fb
 DIST WSGIProxy2-0.4.4.tar.gz 16475 BLAKE2B 8cc91e8364204a03fb8f80abb926e69112c2224b595c695d25e2fa54553fe9c82e3420f68b58f266d04450dd49a6dbf9257c190da8645dfeee976ae101fc708b SHA512 6ae9fca65fe80f52924f42b26b447631e8c278f517ababc23d26e5f8598d6d9b7975197ec74faf64f2e051824366ac14c5db5727a014a187c70a1b4604105b42
-EBUILD wsgiproxy2-0.4.2.ebuild 1298 BLAKE2B 52cb17b169e568968c6b04d6000d7292c83ab746e555f60ae8d42fb6d1c7ca209f78b32c5f434d379249eaf2eaf616f62189fbf776a6cf147eb284b82374eece SHA512 646b476e6b55e1af716c967556e6c6f2227f847ab973eb2353d3f7e448dfc29cd15c7839908e8a6b9e6855e4ad0a576bc726507082461107388e0f518c30d429
-EBUILD wsgiproxy2-0.4.4.ebuild 1309 BLAKE2B b9d7900b21f3e3209789351b055ee056c5ba6956f1e3d8c9c6d4d6184bb8666bc72371bc8743846406e38f0f729ef1b0904bd9e9447d9141e64c2d2facc7898e SHA512 cd14b57474021e35c1012e983da2404273aae37f979395ed95e44916877026d5d684a7b33cc506c4a55dba43d3a87b07d0937012ab002cbcee5eb8f3e99172b9
+EBUILD wsgiproxy2-0.4.2.ebuild 1304 BLAKE2B 9c9b930130390d0d1000b4a91d5463e877d07f5412d00fde8f7a119235f0f5fd46e3d9529e17f21062fefe6963e538069b108fe84df91a111a04e433907df699 SHA512 e87ec2fdc3882205097415e83eb94d0b096454a103fd136d905ec60cc4c3747d78c4d93c6921519fbabe65786c391f5cdd78f56ad0cbc8458eb77446befc6247
+EBUILD wsgiproxy2-0.4.4.ebuild 1315 BLAKE2B ae3dc335ae81e97ee8e48fe2bd63cdeeb308c7346625512b1600dcff65ba04c443aa7eb3fc6459e7b561b3ba51c03fdb09e9fb4ae191ca1cb78f1590545607f4 SHA512 94f7337e71e082cd671df481b6c022f44ffb2b39e3fdbc07bec6abe5d9b025abeb0a413a12797ab2a553810ba9cf8519a700e96bb46025d8f127ea331284bb74
 MISC metadata.xml 313 BLAKE2B 45cd2545e5d5b03206c8c3f2db35c0a95ce08f6c29503c19deee7ebc90f578a8a68bc9ca98a504661d09866ccc0217067643efb84e99cda9d1678231ce01a79e SHA512 147915d551dc542cb68d4cab97a3b187ef698dc450cb730c80eec846e4d4debc954b68d04f76e1df835fcc4d179d705ee95379b38c7d39d0f1ffce809941a7c4
diff --git a/dev-python/wsgiproxy2/wsgiproxy2-0.4.2.ebuild b/dev-python/wsgiproxy2/wsgiproxy2-0.4.2.ebuild
index bf48cd474a38..3f8ed4a71872 100644
--- a/dev-python/wsgiproxy2/wsgiproxy2-0.4.2.ebuild
+++ b/dev-python/wsgiproxy2/wsgiproxy2-0.4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,7 +10,7 @@ inherit distutils-r1
 MY_PN="WSGIProxy2"
 
 DESCRIPTION="HTTP proxying tools for WSGI apps"
-HOMEPAGE="http://pythonpaste.org/wsgiproxy/"
+HOMEPAGE="https://pypi.python.org/pypi/WSGIProxy2"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.zip"
 
 LICENSE="MIT"
diff --git a/dev-python/wsgiproxy2/wsgiproxy2-0.4.4.ebuild b/dev-python/wsgiproxy2/wsgiproxy2-0.4.4.ebuild
index 1756e680ae96..6f8278604c1b 100644
--- a/dev-python/wsgiproxy2/wsgiproxy2-0.4.4.ebuild
+++ b/dev-python/wsgiproxy2/wsgiproxy2-0.4.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,7 +10,7 @@ inherit distutils-r1
 MY_PN="WSGIProxy2"
 
 DESCRIPTION="HTTP proxying tools for WSGI apps"
-HOMEPAGE="http://pythonpaste.org/wsgiproxy/"
+HOMEPAGE="https://pypi.python.org/pypi/WSGIProxy2"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-ros/Manifest.gz b/dev-ros/Manifest.gz
index b7136c66cbc1..4194acf3ea6b 100644
--- a/dev-ros/Manifest.gz
+++ b/dev-ros/Manifest.gz
diff --git a/dev-ros/amcl/Manifest b/dev-ros/amcl/Manifest
index c5637f4f71ba..3733a3592fd4 100644
--- a/dev-ros/amcl/Manifest
+++ b/dev-ros/amcl/Manifest
@@ -1,4 +1,6 @@
 DIST navigation-1.15.1.tar.gz 346480 BLAKE2B 29f9a0b6f2c62bd21a7cb87a64b490c845bb7db4af338fd094744abb22402df7eedc8c164b64f93f2d67dabaff99ca3b946b45e93173bed74834d9e3668726ad SHA512 25c5093bf7acca9d15d46bb2d0ae7e4ce0fa45f18b32d1626668dcbd33732317e8535b978e7225d86391472c517f05acb7736f31a7c511c8736ab8a22c7af4b0
+DIST navigation-1.15.2.tar.gz 348985 BLAKE2B 866779425828b1e4c3a044654ae41f33643646ca70cf6841f23bce265add2c420bf0934a41a6b29fa65fc421228a31dc15e9fb0f6cc4295ce12adbbb627b43d4 SHA512 582422756b31b4d83e929e3c723e7205e772b9775fcf618c9bd5d3c54af1f20e9bc8a0143626750c0c3cffeb0cbea8f8706b7e66f62dc037cfe12b05f23ee142
 EBUILD amcl-1.15.1.ebuild 657 BLAKE2B 48a7b3dd960378c66bd8628d2d559c9bcbce578053d1856da42639e1956b57f01a170b1fac6ca4fb27d6c666fdc58b80d28b83e8a295f498a31015f602d1b95d SHA512 1c99e1d77f77d79f12bff720a77b2a329efc8cfacc8922a0de7a9d618568c2069b913862691b28015330c46424accc8a2f51366f6c40af66477f5061ed2d5755
+EBUILD amcl-1.15.2.ebuild 657 BLAKE2B 5aecfb8b64979e21f025ac3695cb0bc172b35a2858bf9993c748ffb2ed8655b7e62ef4575bcb9ffc5d3602ca16343fee461f92fac4bd9d8cfbcddef0914ef8d9 SHA512 47deaa10c46180787acf45a816b70e6ee8229349275e65d438e8d1acea273f3508d15cd08b207c2b2ce87bf283d3443308d29b50326030a6796556612048c3a5
 EBUILD amcl-9999.ebuild 657 BLAKE2B 8efecacb911e01f6700c10ab92ba4f5d6a896a8e13970f2d785556ccf47df82da8869dcae6c03fb0d322f6c8424fd7c1fdfe256e7777ae3ba9dd1242e1ffd534 SHA512 f82a8164511279305657f6b42a8e2df42ee792b6e7c8bf5c71643693b0ac7692174d808cab1a9fdd6097cd91bc4dc2c614d4bca1ceeee2e8942f015dd3ed35bd
 MISC metadata.xml 337 BLAKE2B ecfbf3d0b63a1b876065d04b3d52daa0442e3bcaf060836731012a1e698b3aea06ff292d892035feb2fb0fc257d6d8462d013ccc67f2650177c9cdba4d051d44 SHA512 f5df7464100fa15a3d2ad11cc620007500a5cb5ea7be67ac45819a541dd4ae53ce476231d475acf4dfe7e7bf0c31281325dc4e003867d1cc01a29353bb5ea09e
diff --git a/dev-ros/amcl/amcl-1.15.2.ebuild b/dev-ros/amcl/amcl-1.15.2.ebuild
new file mode 100644
index 000000000000..ba3fb6c7cc39
--- /dev/null
+++ b/dev-ros/amcl/amcl-1.15.2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-planning/navigation"
+ROS_SUBDIR=${PN}
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="Probabilistic localization system for a robot moving in 2D"
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/roscpp
+	dev-ros/tf
+	dev-ros/rosbag
+	dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
+	dev-libs/boost:=
+	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? ( dev-ros/rostest[${PYTHON_USEDEP}] )
+"
diff --git a/dev-ros/base_local_planner/Manifest b/dev-ros/base_local_planner/Manifest
index bade68280038..84296934cf83 100644
--- a/dev-ros/base_local_planner/Manifest
+++ b/dev-ros/base_local_planner/Manifest
@@ -1,4 +1,6 @@
 DIST navigation-1.15.1.tar.gz 346480 BLAKE2B 29f9a0b6f2c62bd21a7cb87a64b490c845bb7db4af338fd094744abb22402df7eedc8c164b64f93f2d67dabaff99ca3b946b45e93173bed74834d9e3668726ad SHA512 25c5093bf7acca9d15d46bb2d0ae7e4ce0fa45f18b32d1626668dcbd33732317e8535b978e7225d86391472c517f05acb7736f31a7c511c8736ab8a22c7af4b0
+DIST navigation-1.15.2.tar.gz 348985 BLAKE2B 866779425828b1e4c3a044654ae41f33643646ca70cf6841f23bce265add2c420bf0934a41a6b29fa65fc421228a31dc15e9fb0f6cc4295ce12adbbb627b43d4 SHA512 582422756b31b4d83e929e3c723e7205e772b9775fcf618c9bd5d3c54af1f20e9bc8a0143626750c0c3cffeb0cbea8f8706b7e66f62dc037cfe12b05f23ee142
 EBUILD base_local_planner-1.15.1-r1.ebuild 825 BLAKE2B ff31bd17f30f5765222382e4ea78249ab240047035f6b4e3e0052bdb4ff367d9241325b09e520adad1e1477a375c300a4a0e7053e0a6806c3e77038def46be9c SHA512 bf994cf2b4d063044fa89d54d59e247e42b53294ae9a201efe25dcb66dfda799173ae6b31a2894aafec2e4f7791ba7bc8e03c7fda32791b34e3bea48fe1c3878
+EBUILD base_local_planner-1.15.2.ebuild 825 BLAKE2B 9e57b6d8f514fb91f4b3c27f0d0ce91df5cd30464c3b4d4fc899399251fef895cc9c02a88b3d9c48d2b00e61f65043462514cebec2ea0efd266b2b6f8219995f SHA512 dbb12ee0a08642ea6a209f7259292de6934e9ae96ca6babf7ff09d4d2f566baa4bf1f8060575e9b7c01e791e1a2828c2ad20e25c38654ed471c2d7444f2f0480
 EBUILD base_local_planner-9999.ebuild 825 BLAKE2B ff31bd17f30f5765222382e4ea78249ab240047035f6b4e3e0052bdb4ff367d9241325b09e520adad1e1477a375c300a4a0e7053e0a6806c3e77038def46be9c SHA512 bf994cf2b4d063044fa89d54d59e247e42b53294ae9a201efe25dcb66dfda799173ae6b31a2894aafec2e4f7791ba7bc8e03c7fda32791b34e3bea48fe1c3878
 MISC metadata.xml 337 BLAKE2B ecfbf3d0b63a1b876065d04b3d52daa0442e3bcaf060836731012a1e698b3aea06ff292d892035feb2fb0fc257d6d8462d013ccc67f2650177c9cdba4d051d44 SHA512 f5df7464100fa15a3d2ad11cc620007500a5cb5ea7be67ac45819a541dd4ae53ce476231d475acf4dfe7e7bf0c31281325dc4e003867d1cc01a29353bb5ea09e
diff --git a/dev-ros/base_local_planner/base_local_planner-1.15.2.ebuild b/dev-ros/base_local_planner/base_local_planner-1.15.2.ebuild
new file mode 100644
index 000000000000..a093f607b110
--- /dev/null
+++ b/dev-ros/base_local_planner/base_local_planner-1.15.2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-planning/navigation"
+CATKIN_HAS_MESSAGES=yes
+ROS_SUBDIR=${PN}
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python2_7 )
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Trajectory Rollout and Dynamic Window approaches to local robot navigation on a plane"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/roscpp
+	dev-ros/tf
+	dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
+	dev-ros/nav_core
+	dev-ros/pcl_conversions
+	dev-ros/rostest
+	dev-ros/costmap_2d
+	dev-ros/pluginlib
+	dev-ros/angles
+	dev-libs/boost:=[threads]
+	dev-cpp/eigen:3
+	sci-libs/pcl
+	dev-libs/console_bridge:=
+"
+DEPEND="${RDEPEND}
+	dev-ros/cmake_modules
+	test? ( dev-cpp/gtest )
+"
diff --git a/dev-ros/carrot_planner/Manifest b/dev-ros/carrot_planner/Manifest
index 33bc396e0d62..b79af5c507b2 100644
--- a/dev-ros/carrot_planner/Manifest
+++ b/dev-ros/carrot_planner/Manifest
@@ -1,4 +1,6 @@
 DIST navigation-1.15.1.tar.gz 346480 BLAKE2B 29f9a0b6f2c62bd21a7cb87a64b490c845bb7db4af338fd094744abb22402df7eedc8c164b64f93f2d67dabaff99ca3b946b45e93173bed74834d9e3668726ad SHA512 25c5093bf7acca9d15d46bb2d0ae7e4ce0fa45f18b32d1626668dcbd33732317e8535b978e7225d86391472c517f05acb7736f31a7c511c8736ab8a22c7af4b0
+DIST navigation-1.15.2.tar.gz 348985 BLAKE2B 866779425828b1e4c3a044654ae41f33643646ca70cf6841f23bce265add2c420bf0934a41a6b29fa65fc421228a31dc15e9fb0f6cc4295ce12adbbb627b43d4 SHA512 582422756b31b4d83e929e3c723e7205e772b9775fcf618c9bd5d3c54af1f20e9bc8a0143626750c0c3cffeb0cbea8f8706b7e66f62dc037cfe12b05f23ee142
 EBUILD carrot_planner-1.15.1-r1.ebuild 541 BLAKE2B 7020abbceb184d865ec76725b26d9cff22a1275b4b69657ad0283c56eb3e1bea75d04cb077457fe01f4b1406722c32e9d4a4ebe419d170ab9d494a9166256437 SHA512 e2a009858721c857e397112f235349807262897a34e91c7651972d1a7384e103704e80fa24a90b351eb2579373052ed9d29415b80cbf7042675409a5ef87c7d7
+EBUILD carrot_planner-1.15.2.ebuild 541 BLAKE2B 5d89690fc8f307ba8da75ad866ca06df0f401119de9322318bd32061969d54429dec6d971e5016b968d01a2506b94f253c3737fa3219ef1d7d43fdfb980b42ea SHA512 53b8e7a89844cc5dcb60863110b2dc097696ccd7a663c796d135b5912eb89c4c0747cc3afdf4358a6e464b5c7c1d4a1d7cda4fae2470cb9643a48512cc03d9a6
 EBUILD carrot_planner-9999.ebuild 541 BLAKE2B 7020abbceb184d865ec76725b26d9cff22a1275b4b69657ad0283c56eb3e1bea75d04cb077457fe01f4b1406722c32e9d4a4ebe419d170ab9d494a9166256437 SHA512 e2a009858721c857e397112f235349807262897a34e91c7651972d1a7384e103704e80fa24a90b351eb2579373052ed9d29415b80cbf7042675409a5ef87c7d7
 MISC metadata.xml 337 BLAKE2B ecfbf3d0b63a1b876065d04b3d52daa0442e3bcaf060836731012a1e698b3aea06ff292d892035feb2fb0fc257d6d8462d013ccc67f2650177c9cdba4d051d44 SHA512 f5df7464100fa15a3d2ad11cc620007500a5cb5ea7be67ac45819a541dd4ae53ce476231d475acf4dfe7e7bf0c31281325dc4e003867d1cc01a29353bb5ea09e
diff --git a/dev-ros/carrot_planner/carrot_planner-1.15.2.ebuild b/dev-ros/carrot_planner/carrot_planner-1.15.2.ebuild
new file mode 100644
index 000000000000..3f5f3f231f33
--- /dev/null
+++ b/dev-ros/carrot_planner/carrot_planner-1.15.2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-planning/navigation"
+ROS_SUBDIR=${PN}
+KEYWORDS="~amd64 ~arm"
+
+inherit ros-catkin
+
+DESCRIPTION="Attempts to find a legal place to put a carrot for the robot to follow"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/roscpp
+	dev-ros/tf
+	dev-ros/nav_core
+	dev-ros/costmap_2d
+	dev-ros/base_local_planner
+	dev-ros/pluginlib
+	dev-libs/boost:=
+	dev-libs/console_bridge:=
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/clear_costmap_recovery/Manifest b/dev-ros/clear_costmap_recovery/Manifest
index f69a00ab937b..7a87558745b5 100644
--- a/dev-ros/clear_costmap_recovery/Manifest
+++ b/dev-ros/clear_costmap_recovery/Manifest
@@ -1,4 +1,6 @@
 DIST navigation-1.15.1.tar.gz 346480 BLAKE2B 29f9a0b6f2c62bd21a7cb87a64b490c845bb7db4af338fd094744abb22402df7eedc8c164b64f93f2d67dabaff99ca3b946b45e93173bed74834d9e3668726ad SHA512 25c5093bf7acca9d15d46bb2d0ae7e4ce0fa45f18b32d1626668dcbd33732317e8535b978e7225d86391472c517f05acb7736f31a7c511c8736ab8a22c7af4b0
+DIST navigation-1.15.2.tar.gz 348985 BLAKE2B 866779425828b1e4c3a044654ae41f33643646ca70cf6841f23bce265add2c420bf0934a41a6b29fa65fc421228a31dc15e9fb0f6cc4295ce12adbbb627b43d4 SHA512 582422756b31b4d83e929e3c723e7205e772b9775fcf618c9bd5d3c54af1f20e9bc8a0143626750c0c3cffeb0cbea8f8706b7e66f62dc037cfe12b05f23ee142
 EBUILD clear_costmap_recovery-1.15.1-r1.ebuild 647 BLAKE2B c1d826027317640624ab0b1b65aa668eb90cdbedd36c5b6cf823b2ee0ebd0ba18869ba6ce0ea10b357412ca3a3e7c724212df063a52286ce88688771b6a1e258 SHA512 7561452bb3b29978c9984949b5c029b15cb5f22ff4356d212a765e921ae0b8780af4fa56fc32811f8f31c065254d68be2729e57575f968d1f0902d9d2617e23a
+EBUILD clear_costmap_recovery-1.15.2.ebuild 647 BLAKE2B 51836b3e628ad4602a74cd62e111b983ee0cfb1b65c906d8e3d695d13c594c7bc12933e2949f997448b11f97e9605c3faba834e039d8e55c7291fe7264621dff SHA512 7d484771d638a0be5c45d7f4409dc50d994dc7f3b91d8cd1c8ebc4afe176662650d4b982b36eb3b41bae41d173dbc054bcdcffd9d701548db1d326c99263755a
 EBUILD clear_costmap_recovery-9999.ebuild 647 BLAKE2B c1d826027317640624ab0b1b65aa668eb90cdbedd36c5b6cf823b2ee0ebd0ba18869ba6ce0ea10b357412ca3a3e7c724212df063a52286ce88688771b6a1e258 SHA512 7561452bb3b29978c9984949b5c029b15cb5f22ff4356d212a765e921ae0b8780af4fa56fc32811f8f31c065254d68be2729e57575f968d1f0902d9d2617e23a
 MISC metadata.xml 337 BLAKE2B ecfbf3d0b63a1b876065d04b3d52daa0442e3bcaf060836731012a1e698b3aea06ff292d892035feb2fb0fc257d6d8462d013ccc67f2650177c9cdba4d051d44 SHA512 f5df7464100fa15a3d2ad11cc620007500a5cb5ea7be67ac45819a541dd4ae53ce476231d475acf4dfe7e7bf0c31281325dc4e003867d1cc01a29353bb5ea09e
diff --git a/dev-ros/clear_costmap_recovery/clear_costmap_recovery-1.15.2.ebuild b/dev-ros/clear_costmap_recovery/clear_costmap_recovery-1.15.2.ebuild
new file mode 100644
index 000000000000..b1e48acec00b
--- /dev/null
+++ b/dev-ros/clear_costmap_recovery/clear_costmap_recovery-1.15.2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-planning/navigation"
+ROS_SUBDIR=${PN}
+KEYWORDS="~amd64 ~arm"
+
+inherit ros-catkin
+
+DESCRIPTION="Recovery behavior that attempts to clear space by reverting the costmaps to the static map"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	>=dev-ros/costmap_2d-1.13.1
+	dev-ros/nav_core
+	dev-ros/pluginlib
+	dev-ros/roscpp
+	dev-ros/tf
+	dev-cpp/eigen:3
+	sci-libs/pcl
+	dev-libs/boost:=[threads]
+	dev-libs/console_bridge:=
+"
+DEPEND="${RDEPEND}
+	dev-ros/cmake_modules
+	test? ( dev-ros/rostest dev-cpp/gtest )
+"
diff --git a/dev-ros/costmap_2d/Manifest b/dev-ros/costmap_2d/Manifest
index fda1d5afe29d..66a135740574 100644
--- a/dev-ros/costmap_2d/Manifest
+++ b/dev-ros/costmap_2d/Manifest
@@ -1,4 +1,6 @@
 DIST navigation-1.15.1.tar.gz 346480 BLAKE2B 29f9a0b6f2c62bd21a7cb87a64b490c845bb7db4af338fd094744abb22402df7eedc8c164b64f93f2d67dabaff99ca3b946b45e93173bed74834d9e3668726ad SHA512 25c5093bf7acca9d15d46bb2d0ae7e4ce0fa45f18b32d1626668dcbd33732317e8535b978e7225d86391472c517f05acb7736f31a7c511c8736ab8a22c7af4b0
+DIST navigation-1.15.2.tar.gz 348985 BLAKE2B 866779425828b1e4c3a044654ae41f33643646ca70cf6841f23bce265add2c420bf0934a41a6b29fa65fc421228a31dc15e9fb0f6cc4295ce12adbbb627b43d4 SHA512 582422756b31b4d83e929e3c723e7205e772b9775fcf618c9bd5d3c54af1f20e9bc8a0143626750c0c3cffeb0cbea8f8706b7e66f62dc037cfe12b05f23ee142
 EBUILD costmap_2d-1.15.1-r1.ebuild 1007 BLAKE2B 9b8b2fa26faf207a3d16dbf2562ea3b07377576a37da86d8c996a4a29d344ab111107f72411b7d5dce788e0410b5893f9154589fcfcd226600843a9a0cc99712 SHA512 e3098b94f091436dcb0e730da4046493152307822b25504a833a3fc4088f77f37cd46fec9e2d232f0b88579699ad0e0939bbf1f1c3ec7be358ebb0a59e403530
+EBUILD costmap_2d-1.15.2.ebuild 1007 BLAKE2B aae47e6fb1d3b1bd4bce8e2c8ca1a07a9676ba7119bd137a6e59417a5ce15a3b77351e98dbfee724278762330bf4906e2a279eb294d5a69cb97ded57a056291d SHA512 011232bd8d618e6efbefc4db9e55f19ae22da2d1a79a5a906df30e36d0b75a030b280bd1d5227fc90a6df6a8b31b6ef7c90856c335fddcbbb97517e8c1715358
 EBUILD costmap_2d-9999.ebuild 1007 BLAKE2B 9b8b2fa26faf207a3d16dbf2562ea3b07377576a37da86d8c996a4a29d344ab111107f72411b7d5dce788e0410b5893f9154589fcfcd226600843a9a0cc99712 SHA512 e3098b94f091436dcb0e730da4046493152307822b25504a833a3fc4088f77f37cd46fec9e2d232f0b88579699ad0e0939bbf1f1c3ec7be358ebb0a59e403530
 MISC metadata.xml 337 BLAKE2B ecfbf3d0b63a1b876065d04b3d52daa0442e3bcaf060836731012a1e698b3aea06ff292d892035feb2fb0fc257d6d8462d013ccc67f2650177c9cdba4d051d44 SHA512 f5df7464100fa15a3d2ad11cc620007500a5cb5ea7be67ac45819a541dd4ae53ce476231d475acf4dfe7e7bf0c31281325dc4e003867d1cc01a29353bb5ea09e
diff --git a/dev-ros/costmap_2d/costmap_2d-1.15.2.ebuild b/dev-ros/costmap_2d/costmap_2d-1.15.2.ebuild
new file mode 100644
index 000000000000..afb1c245ae4e
--- /dev/null
+++ b/dev-ros/costmap_2d/costmap_2d-1.15.2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-planning/navigation"
+ROS_SUBDIR=${PN}
+KEYWORDS="~amd64 ~arm"
+CATKIN_HAS_MESSAGES=yes
+PYTHON_COMPAT=( python2_7 )
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs dev-ros/map_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Creates a 2D costmap from sensor data"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+REQUIRED_USE="ros_messages_cxx"
+
+RDEPEND="
+	dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
+	dev-ros/laser_geometry
+	dev-ros/message_filters
+	dev-ros/nav_msgs
+	dev-ros/pcl_conversions
+	dev-ros/pcl_ros
+	dev-ros/pluginlib
+	dev-ros/roscpp
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/tf
+	dev-ros/voxel_grid
+	dev-cpp/eigen:3
+	sci-libs/pcl:=
+	dev-libs/boost:=[threads]
+	dev-libs/tinyxml2:=
+"
+DEPEND="${RDEPEND}
+	dev-ros/cmake_modules
+	test? ( dev-ros/rostest[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/dwa_local_planner/Manifest b/dev-ros/dwa_local_planner/Manifest
index e54a212c6218..14f197943e1b 100644
--- a/dev-ros/dwa_local_planner/Manifest
+++ b/dev-ros/dwa_local_planner/Manifest
@@ -1,4 +1,6 @@
 DIST navigation-1.15.1.tar.gz 346480 BLAKE2B 29f9a0b6f2c62bd21a7cb87a64b490c845bb7db4af338fd094744abb22402df7eedc8c164b64f93f2d67dabaff99ca3b946b45e93173bed74834d9e3668726ad SHA512 25c5093bf7acca9d15d46bb2d0ae7e4ce0fa45f18b32d1626668dcbd33732317e8535b978e7225d86391472c517f05acb7736f31a7c511c8736ab8a22c7af4b0
+DIST navigation-1.15.2.tar.gz 348985 BLAKE2B 866779425828b1e4c3a044654ae41f33643646ca70cf6841f23bce265add2c420bf0934a41a6b29fa65fc421228a31dc15e9fb0f6cc4295ce12adbbb627b43d4 SHA512 582422756b31b4d83e929e3c723e7205e772b9775fcf618c9bd5d3c54af1f20e9bc8a0143626750c0c3cffeb0cbea8f8706b7e66f62dc037cfe12b05f23ee142
 EBUILD dwa_local_planner-1.15.1-r1.ebuild 720 BLAKE2B 336ea8187d60da9b4e50bbed3a7df2f898b82a4a0047ebf9ca146d2ededc71ba6c29f1539175927db241ee730bf5671f789ca3e332c19529fac742e4e70564f4 SHA512 e989c571520d4ce5b3d9fe9e1890ac3af91c013f9a660a8c127ae3b3de1f05b5332a85cc9ced1ad6b1bb1ed6f497a8e6c8f693b42e32d3373f3de5df4473cdcc
+EBUILD dwa_local_planner-1.15.2.ebuild 720 BLAKE2B 803c03ed98d8c86e06d23ba8038932325367bf4bde1c72508416d80ed489a49633fd53fae04e0b3d21f755dc670dee36187efc722e205d05959b9629b336b0e2 SHA512 2ac5793df00143b8a44832f14ca7eadbc989fa0c1c851abf1064030e873661013130b0d2b3a2408918693622d4d7d5ed78e78959b11e3e39b2ef3042d883b09a
 EBUILD dwa_local_planner-9999.ebuild 720 BLAKE2B 336ea8187d60da9b4e50bbed3a7df2f898b82a4a0047ebf9ca146d2ededc71ba6c29f1539175927db241ee730bf5671f789ca3e332c19529fac742e4e70564f4 SHA512 e989c571520d4ce5b3d9fe9e1890ac3af91c013f9a660a8c127ae3b3de1f05b5332a85cc9ced1ad6b1bb1ed6f497a8e6c8f693b42e32d3373f3de5df4473cdcc
 MISC metadata.xml 337 BLAKE2B ecfbf3d0b63a1b876065d04b3d52daa0442e3bcaf060836731012a1e698b3aea06ff292d892035feb2fb0fc257d6d8462d013ccc67f2650177c9cdba4d051d44 SHA512 f5df7464100fa15a3d2ad11cc620007500a5cb5ea7be67ac45819a541dd4ae53ce476231d475acf4dfe7e7bf0c31281325dc4e003867d1cc01a29353bb5ea09e
diff --git a/dev-ros/dwa_local_planner/dwa_local_planner-1.15.2.ebuild b/dev-ros/dwa_local_planner/dwa_local_planner-1.15.2.ebuild
new file mode 100644
index 000000000000..17fe8f46f533
--- /dev/null
+++ b/dev-ros/dwa_local_planner/dwa_local_planner-1.15.2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-planning/navigation"
+ROS_SUBDIR=${PN}
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="Dynamic Window Approach to local robot navigation on a plane"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/base_local_planner
+	dev-ros/costmap_2d
+	dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
+	dev-ros/nav_core
+	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/pluginlib
+	dev-ros/pcl_conversions
+	dev-ros/roscpp
+	dev-ros/tf
+	dev-cpp/eigen:3
+	sci-libs/pcl
+	dev-libs/boost:=[threads]
+	dev-libs/console_bridge:=
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/fake_localization/Manifest b/dev-ros/fake_localization/Manifest
index 972e32b46aa3..00c0f05eb3fb 100644
--- a/dev-ros/fake_localization/Manifest
+++ b/dev-ros/fake_localization/Manifest
@@ -1,8 +1,10 @@
 DIST navigation-1.14.0.tar.gz 340196 BLAKE2B 9338af98d1eb88e6bd79aa4f4c186ac6dc1c52b0f024286264f62e487f8e2236cff81397ccb8b828e4e000c0d05bc93963c979975089220b49cf980f465b643d SHA512 8ac2048be6d06be1f137aab2e73c5c724e794b9e6125fa70e2283df3790200f7b5203bae12c46e0796523ae58a4f8ede79fd0c1afc09a306a99f450576c7b11a
 DIST navigation-1.14.2.tar.gz 345166 BLAKE2B 4c54f975088e3f99102f7bb1ef500909b16218e48db97a875f8b980dfe1bfd51d51eccab308ba7a3d5bee444de7d9e9fdf7d6477583739740ad13e7f0c35d1ea SHA512 6477104a330a20722fde1634a0d51b1706c9705b4b9415aa9703c99a61d2ce3de97caba24a6b667897e842490c15a6bf2cdbb2f51341febf29d0475b4c0f384b
 DIST navigation-1.15.1.tar.gz 346480 BLAKE2B 29f9a0b6f2c62bd21a7cb87a64b490c845bb7db4af338fd094744abb22402df7eedc8c164b64f93f2d67dabaff99ca3b946b45e93173bed74834d9e3668726ad SHA512 25c5093bf7acca9d15d46bb2d0ae7e4ce0fa45f18b32d1626668dcbd33732317e8535b978e7225d86391472c517f05acb7736f31a7c511c8736ab8a22c7af4b0
+DIST navigation-1.15.2.tar.gz 348985 BLAKE2B 866779425828b1e4c3a044654ae41f33643646ca70cf6841f23bce265add2c420bf0934a41a6b29fa65fc421228a31dc15e9fb0f6cc4295ce12adbbb627b43d4 SHA512 582422756b31b4d83e929e3c723e7205e772b9775fcf618c9bd5d3c54af1f20e9bc8a0143626750c0c3cffeb0cbea8f8706b7e66f62dc037cfe12b05f23ee142
 EBUILD fake_localization-1.14.0-r1.ebuild 720 BLAKE2B e4d112bd7c6fc535d971dc47bbd457637ab84bf7f20dd0708d3acfda5a7adf09565aa835897793d298e1c202f2dfd1b09a8e5196a517bf7be23c3d35f14dfd35 SHA512 caf71984e534efe92a0935cf94e27d1034b2114f2a18c2aa73614b71f618e7692f71711a29fa361c131bde373e15ecee6f21855c79c4e7a4369d060c5cef5624
 EBUILD fake_localization-1.14.2.ebuild 720 BLAKE2B 3e2f0a57fd6d3cd3348b79667c15219e4ffe0f568ab74706afa533b285ad7abda3affb6ab37a93316417f2ea5c6fd488ae07ee05575638878ca87495c4648847 SHA512 e9998bef7a6b03db483285780a0fca7dce160838b327ae954802ecf168330f2b2f8d2d28d9a159d30f9be2fdc611de724e6b966e8127b4649a17dbc1f169aaf0
 EBUILD fake_localization-1.15.1.ebuild 720 BLAKE2B 3e2f0a57fd6d3cd3348b79667c15219e4ffe0f568ab74706afa533b285ad7abda3affb6ab37a93316417f2ea5c6fd488ae07ee05575638878ca87495c4648847 SHA512 e9998bef7a6b03db483285780a0fca7dce160838b327ae954802ecf168330f2b2f8d2d28d9a159d30f9be2fdc611de724e6b966e8127b4649a17dbc1f169aaf0
+EBUILD fake_localization-1.15.2.ebuild 720 BLAKE2B c908c0cd83c2103307dda8033ca003cc748f56a8a391f3285eac49be401d182d6eaed1f682379b861edca5b7be2c7f3d671bad838e9ac7c665f6ef7b658349cc SHA512 4bfe514a438cc5475255f4bb1a807d4a5325271b9c17536b17b3ee0f1cadd8d3090006ff6342fc049c908c97de470aeb44605f48986ea479902b071aab34a67c
 EBUILD fake_localization-9999.ebuild 720 BLAKE2B e4d112bd7c6fc535d971dc47bbd457637ab84bf7f20dd0708d3acfda5a7adf09565aa835897793d298e1c202f2dfd1b09a8e5196a517bf7be23c3d35f14dfd35 SHA512 caf71984e534efe92a0935cf94e27d1034b2114f2a18c2aa73614b71f618e7692f71711a29fa361c131bde373e15ecee6f21855c79c4e7a4369d060c5cef5624
 MISC metadata.xml 337 BLAKE2B ecfbf3d0b63a1b876065d04b3d52daa0442e3bcaf060836731012a1e698b3aea06ff292d892035feb2fb0fc257d6d8462d013ccc67f2650177c9cdba4d051d44 SHA512 f5df7464100fa15a3d2ad11cc620007500a5cb5ea7be67ac45819a541dd4ae53ce476231d475acf4dfe7e7bf0c31281325dc4e003867d1cc01a29353bb5ea09e
diff --git a/dev-ros/fake_localization/fake_localization-1.15.2.ebuild b/dev-ros/fake_localization/fake_localization-1.15.2.ebuild
new file mode 100644
index 000000000000..831e3177e5e2
--- /dev/null
+++ b/dev-ros/fake_localization/fake_localization-1.15.2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-planning/navigation"
+ROS_SUBDIR=${PN}
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="A ROS node that simply forwards odometry information"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-libs/boost:=
+	dev-ros/angles
+	dev-ros/roscpp
+	dev-ros/rospy[${PYTHON_USEDEP}]
+	dev-ros/rosconsole
+	dev-ros/nav_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP},${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP},${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/tf[${PYTHON_USEDEP}]
+	dev-ros/message_filters
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/global_planner/Manifest b/dev-ros/global_planner/Manifest
index 2872279e4f5e..771cd83830bd 100644
--- a/dev-ros/global_planner/Manifest
+++ b/dev-ros/global_planner/Manifest
@@ -1,4 +1,6 @@
 DIST navigation-1.15.1.tar.gz 346480 BLAKE2B 29f9a0b6f2c62bd21a7cb87a64b490c845bb7db4af338fd094744abb22402df7eedc8c164b64f93f2d67dabaff99ca3b946b45e93173bed74834d9e3668726ad SHA512 25c5093bf7acca9d15d46bb2d0ae7e4ce0fa45f18b32d1626668dcbd33732317e8535b978e7225d86391472c517f05acb7736f31a7c511c8736ab8a22c7af4b0
+DIST navigation-1.15.2.tar.gz 348985 BLAKE2B 866779425828b1e4c3a044654ae41f33643646ca70cf6841f23bce265add2c420bf0934a41a6b29fa65fc421228a31dc15e9fb0f6cc4295ce12adbbb627b43d4 SHA512 582422756b31b4d83e929e3c723e7205e772b9775fcf618c9bd5d3c54af1f20e9bc8a0143626750c0c3cffeb0cbea8f8706b7e66f62dc037cfe12b05f23ee142
 EBUILD global_planner-1.15.1-r1.ebuild 665 BLAKE2B 2f62de5934ed9a91e6a1e56e8028e2bb09e3166688530461b25cb9a3de23213bcd80b39c8c7ecaffd48b848f6cbaa79d429fabc344cb402e7ea1e1ab0df70ce6 SHA512 12c07e61b53c227e1ba6b4d8866a9e2addaac4bc156b7d4cb5520b07aeb0726f7a7b492cc222f9152d341de11a0f5fc2f9fef600b539ea4227afb2b37ab506a7
+EBUILD global_planner-1.15.2.ebuild 665 BLAKE2B 63ee38169ee7c4305119341480e3cb7e654fa060a1f7ef7e0d3260e3f116027cea6810d8e5c1ed90e7df16dc989af05a00a1fe4eb3a8ccbdd1ccb9525485b21a SHA512 695a3bc09081066c1535a42fca547b0367b3c0ebcdba1ba0a0a6e904353ad723d07a9762370103e9c16071b44f8ff5ed2ccefa1536d777097c78efa673516f7b
 EBUILD global_planner-9999.ebuild 665 BLAKE2B 2f62de5934ed9a91e6a1e56e8028e2bb09e3166688530461b25cb9a3de23213bcd80b39c8c7ecaffd48b848f6cbaa79d429fabc344cb402e7ea1e1ab0df70ce6 SHA512 12c07e61b53c227e1ba6b4d8866a9e2addaac4bc156b7d4cb5520b07aeb0726f7a7b492cc222f9152d341de11a0f5fc2f9fef600b539ea4227afb2b37ab506a7
 MISC metadata.xml 337 BLAKE2B ecfbf3d0b63a1b876065d04b3d52daa0442e3bcaf060836731012a1e698b3aea06ff292d892035feb2fb0fc257d6d8462d013ccc67f2650177c9cdba4d051d44 SHA512 f5df7464100fa15a3d2ad11cc620007500a5cb5ea7be67ac45819a541dd4ae53ce476231d475acf4dfe7e7bf0c31281325dc4e003867d1cc01a29353bb5ea09e
diff --git a/dev-ros/global_planner/global_planner-1.15.2.ebuild b/dev-ros/global_planner/global_planner-1.15.2.ebuild
new file mode 100644
index 000000000000..5e101fb3111b
--- /dev/null
+++ b/dev-ros/global_planner/global_planner-1.15.2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-planning/navigation"
+ROS_SUBDIR=${PN}
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="Path planner library and node"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/costmap_2d
+	dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
+	dev-ros/nav_core
+	dev-ros/navfn
+	dev-ros/pluginlib
+	dev-ros/roscpp
+	dev-ros/tf
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-libs/boost:=
+	dev-libs/console_bridge:=
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/map_server/Manifest b/dev-ros/map_server/Manifest
index 8a0a4463720b..2b10cf45bb1f 100644
--- a/dev-ros/map_server/Manifest
+++ b/dev-ros/map_server/Manifest
@@ -1,4 +1,6 @@
 DIST navigation-1.15.1.tar.gz 346480 BLAKE2B 29f9a0b6f2c62bd21a7cb87a64b490c845bb7db4af338fd094744abb22402df7eedc8c164b64f93f2d67dabaff99ca3b946b45e93173bed74834d9e3668726ad SHA512 25c5093bf7acca9d15d46bb2d0ae7e4ce0fa45f18b32d1626668dcbd33732317e8535b978e7225d86391472c517f05acb7736f31a7c511c8736ab8a22c7af4b0
+DIST navigation-1.15.2.tar.gz 348985 BLAKE2B 866779425828b1e4c3a044654ae41f33643646ca70cf6841f23bce265add2c420bf0934a41a6b29fa65fc421228a31dc15e9fb0f6cc4295ce12adbbb627b43d4 SHA512 582422756b31b4d83e929e3c723e7205e772b9775fcf618c9bd5d3c54af1f20e9bc8a0143626750c0c3cffeb0cbea8f8706b7e66f62dc037cfe12b05f23ee142
 EBUILD map_server-1.15.1-r1.ebuild 568 BLAKE2B 0982353d43d04acac64d9e256b7137a0873a6b678ca879bf8eeee0bd4a3af7ca38b461a0eb03328da6f29c087b37f21598b55718f48c6972486c19742ae63538 SHA512 a759f66177862c92e0151cf6c25a670c101e0ff1e9f05614b222ad86c4f0c0fc7916f21acd3d9f154502bec0c85aa0f168ad4a6e79d5041b56d19b54aab9c449
+EBUILD map_server-1.15.2.ebuild 568 BLAKE2B 0982353d43d04acac64d9e256b7137a0873a6b678ca879bf8eeee0bd4a3af7ca38b461a0eb03328da6f29c087b37f21598b55718f48c6972486c19742ae63538 SHA512 a759f66177862c92e0151cf6c25a670c101e0ff1e9f05614b222ad86c4f0c0fc7916f21acd3d9f154502bec0c85aa0f168ad4a6e79d5041b56d19b54aab9c449
 EBUILD map_server-9999.ebuild 568 BLAKE2B 0982353d43d04acac64d9e256b7137a0873a6b678ca879bf8eeee0bd4a3af7ca38b461a0eb03328da6f29c087b37f21598b55718f48c6972486c19742ae63538 SHA512 a759f66177862c92e0151cf6c25a670c101e0ff1e9f05614b222ad86c4f0c0fc7916f21acd3d9f154502bec0c85aa0f168ad4a6e79d5041b56d19b54aab9c449
 MISC metadata.xml 337 BLAKE2B ecfbf3d0b63a1b876065d04b3d52daa0442e3bcaf060836731012a1e698b3aea06ff292d892035feb2fb0fc257d6d8462d013ccc67f2650177c9cdba4d051d44 SHA512 f5df7464100fa15a3d2ad11cc620007500a5cb5ea7be67ac45819a541dd4ae53ce476231d475acf4dfe7e7bf0c31281325dc4e003867d1cc01a29353bb5ea09e
diff --git a/dev-ros/map_server/map_server-1.15.2.ebuild b/dev-ros/map_server/map_server-1.15.2.ebuild
new file mode 100644
index 000000000000..8ed4e749308a
--- /dev/null
+++ b/dev-ros/map_server/map_server-1.15.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-planning/navigation"
+ROS_SUBDIR=${PN}
+KEYWORDS="~amd64 ~arm"
+
+inherit ros-catkin
+
+DESCRIPTION="Offers map data as a ROS service"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/roscpp
+	dev-ros/tf
+	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-libs/boost:=
+	media-libs/sdl-image
+	>=dev-cpp/yaml-cpp-0.5
+	sci-physics/bullet:=
+"
+DEPEND="${RDEPEND}
+	test? ( dev-ros/rostest dev-cpp/gtest )
+	virtual/pkgconfig"
diff --git a/dev-ros/move_base/Manifest b/dev-ros/move_base/Manifest
index 2972844bc3ad..b333b1fc150f 100644
--- a/dev-ros/move_base/Manifest
+++ b/dev-ros/move_base/Manifest
@@ -1,4 +1,6 @@
 DIST navigation-1.15.1.tar.gz 346480 BLAKE2B 29f9a0b6f2c62bd21a7cb87a64b490c845bb7db4af338fd094744abb22402df7eedc8c164b64f93f2d67dabaff99ca3b946b45e93173bed74834d9e3668726ad SHA512 25c5093bf7acca9d15d46bb2d0ae7e4ce0fa45f18b32d1626668dcbd33732317e8535b978e7225d86391472c517f05acb7736f31a7c511c8736ab8a22c7af4b0
+DIST navigation-1.15.2.tar.gz 348985 BLAKE2B 866779425828b1e4c3a044654ae41f33643646ca70cf6841f23bce265add2c420bf0934a41a6b29fa65fc421228a31dc15e9fb0f6cc4295ce12adbbb627b43d4 SHA512 582422756b31b4d83e929e3c723e7205e772b9775fcf618c9bd5d3c54af1f20e9bc8a0143626750c0c3cffeb0cbea8f8706b7e66f62dc037cfe12b05f23ee142
 EBUILD move_base-1.15.1-r2.ebuild 882 BLAKE2B c68f44cfe1582a8a66fee799f3a844daf4e507555510b565773c9741e489637bd5ed07b20538647b2599c4e842ffb2c28460e44baa2440c83549d80fefa16bc6 SHA512 80bd499cba6b095210a0d424ced28d65e5ebcece7d61b857db8eb0a78644f39099b22f2e82b9d14694963f58d51cca74509898c3038f8092f8fe958caed84b0b
+EBUILD move_base-1.15.2.ebuild 882 BLAKE2B c68f44cfe1582a8a66fee799f3a844daf4e507555510b565773c9741e489637bd5ed07b20538647b2599c4e842ffb2c28460e44baa2440c83549d80fefa16bc6 SHA512 80bd499cba6b095210a0d424ced28d65e5ebcece7d61b857db8eb0a78644f39099b22f2e82b9d14694963f58d51cca74509898c3038f8092f8fe958caed84b0b
 EBUILD move_base-9999.ebuild 882 BLAKE2B c68f44cfe1582a8a66fee799f3a844daf4e507555510b565773c9741e489637bd5ed07b20538647b2599c4e842ffb2c28460e44baa2440c83549d80fefa16bc6 SHA512 80bd499cba6b095210a0d424ced28d65e5ebcece7d61b857db8eb0a78644f39099b22f2e82b9d14694963f58d51cca74509898c3038f8092f8fe958caed84b0b
 MISC metadata.xml 337 BLAKE2B ecfbf3d0b63a1b876065d04b3d52daa0442e3bcaf060836731012a1e698b3aea06ff292d892035feb2fb0fc257d6d8462d013ccc67f2650177c9cdba4d051d44 SHA512 f5df7464100fa15a3d2ad11cc620007500a5cb5ea7be67ac45819a541dd4ae53ce476231d475acf4dfe7e7bf0c31281325dc4e003867d1cc01a29353bb5ea09e
diff --git a/dev-ros/move_base/move_base-1.15.2.ebuild b/dev-ros/move_base/move_base-1.15.2.ebuild
new file mode 100644
index 000000000000..2905e24c89be
--- /dev/null
+++ b/dev-ros/move_base/move_base-1.15.2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-planning/navigation"
+ROS_SUBDIR=${PN}
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="Given a goal in the world, will attempt to reach it with a mobile base"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	>=dev-ros/costmap_2d-1.15.1
+	dev-ros/roscpp
+	dev-ros/pluginlib
+		dev-libs/tinyxml2:=
+	dev-ros/actionlib
+	dev-ros/base_local_planner
+	dev-ros/clear_costmap_recovery
+	dev-ros/navfn
+	dev-ros/rotate_recovery
+	dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
+	dev-ros/nav_core
+	dev-ros/tf
+	dev-ros/move_base_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-cpp/eigen:3
+	dev-libs/boost:=
+	dev-libs/console_bridge:=
+"
+DEPEND="${RDEPEND}
+	dev-ros/cmake_modules"
diff --git a/dev-ros/move_slow_and_clear/Manifest b/dev-ros/move_slow_and_clear/Manifest
index 00d21c2f5999..8642bada70a7 100644
--- a/dev-ros/move_slow_and_clear/Manifest
+++ b/dev-ros/move_slow_and_clear/Manifest
@@ -1,4 +1,6 @@
 DIST navigation-1.15.1.tar.gz 346480 BLAKE2B 29f9a0b6f2c62bd21a7cb87a64b490c845bb7db4af338fd094744abb22402df7eedc8c164b64f93f2d67dabaff99ca3b946b45e93173bed74834d9e3668726ad SHA512 25c5093bf7acca9d15d46bb2d0ae7e4ce0fa45f18b32d1626668dcbd33732317e8535b978e7225d86391472c517f05acb7736f31a7c511c8736ab8a22c7af4b0
+DIST navigation-1.15.2.tar.gz 348985 BLAKE2B 866779425828b1e4c3a044654ae41f33643646ca70cf6841f23bce265add2c420bf0934a41a6b29fa65fc421228a31dc15e9fb0f6cc4295ce12adbbb627b43d4 SHA512 582422756b31b4d83e929e3c723e7205e772b9775fcf618c9bd5d3c54af1f20e9bc8a0143626750c0c3cffeb0cbea8f8706b7e66f62dc037cfe12b05f23ee142
 EBUILD move_slow_and_clear-1.15.1-r1.ebuild 619 BLAKE2B d221a6ccfd5a1e7c9419fa0dc9acc36d93d68599bbe7a12ce70713034f2346508774df8bbc441ce5ccd07dd5da84b0fa8ec4b469fa2cf13deb292edcb37ce513 SHA512 db86326e93bb0f924e80b5f814861e799129fcd80fefb6fbe7bdfdd3937154a58168e2b0c46977b38f85e9a19f903092c96750a36e630d189b576459b2a01ff9
+EBUILD move_slow_and_clear-1.15.2.ebuild 619 BLAKE2B 852f5ced78820d426ec6561be0dfe80926dc7f8e2443f9e4af144bdd100998170d81cca47aa342c61b47e391ae9d428cee9055a0ee62cc8129a066c19849480e SHA512 a3631f988a575ae31b78f7d68968d9af980432eb6cb1a175960b1698290bdea45467aba104b71828b6dee538e4223e6e4a254af492c09a0d98c52848e309b601
 EBUILD move_slow_and_clear-9999.ebuild 619 BLAKE2B d221a6ccfd5a1e7c9419fa0dc9acc36d93d68599bbe7a12ce70713034f2346508774df8bbc441ce5ccd07dd5da84b0fa8ec4b469fa2cf13deb292edcb37ce513 SHA512 db86326e93bb0f924e80b5f814861e799129fcd80fefb6fbe7bdfdd3937154a58168e2b0c46977b38f85e9a19f903092c96750a36e630d189b576459b2a01ff9
 MISC metadata.xml 337 BLAKE2B ecfbf3d0b63a1b876065d04b3d52daa0442e3bcaf060836731012a1e698b3aea06ff292d892035feb2fb0fc257d6d8462d013ccc67f2650177c9cdba4d051d44 SHA512 f5df7464100fa15a3d2ad11cc620007500a5cb5ea7be67ac45819a541dd4ae53ce476231d475acf4dfe7e7bf0c31281325dc4e003867d1cc01a29353bb5ea09e
diff --git a/dev-ros/move_slow_and_clear/move_slow_and_clear-1.15.2.ebuild b/dev-ros/move_slow_and_clear/move_slow_and_clear-1.15.2.ebuild
new file mode 100644
index 000000000000..1688c0e60047
--- /dev/null
+++ b/dev-ros/move_slow_and_clear/move_slow_and_clear-1.15.2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-planning/navigation"
+ROS_SUBDIR=${PN}
+KEYWORDS="~amd64 ~arm"
+
+inherit ros-catkin
+
+DESCRIPTION="Move slow and clear"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/roscpp
+	dev-ros/nav_core
+	dev-ros/costmap_2d
+	dev-ros/actionlib_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/pluginlib
+	dev-libs/boost:=[threads]
+	dev-cpp/eigen:3
+	sci-libs/pcl
+	dev-libs/console_bridge:=
+"
+DEPEND="${RDEPEND}
+	dev-ros/cmake_modules
+
+"
diff --git a/dev-ros/nav_core/Manifest b/dev-ros/nav_core/Manifest
index 9888d468a5e3..42e280d16df2 100644
--- a/dev-ros/nav_core/Manifest
+++ b/dev-ros/nav_core/Manifest
@@ -3,10 +3,12 @@ DIST navigation-1.13.1.tar.gz 335568 BLAKE2B 77177dee95744ef327156bcda3fcb59bd2a
 DIST navigation-1.14.0.tar.gz 340196 BLAKE2B 9338af98d1eb88e6bd79aa4f4c186ac6dc1c52b0f024286264f62e487f8e2236cff81397ccb8b828e4e000c0d05bc93963c979975089220b49cf980f465b643d SHA512 8ac2048be6d06be1f137aab2e73c5c724e794b9e6125fa70e2283df3790200f7b5203bae12c46e0796523ae58a4f8ede79fd0c1afc09a306a99f450576c7b11a
 DIST navigation-1.14.2.tar.gz 345166 BLAKE2B 4c54f975088e3f99102f7bb1ef500909b16218e48db97a875f8b980dfe1bfd51d51eccab308ba7a3d5bee444de7d9e9fdf7d6477583739740ad13e7f0c35d1ea SHA512 6477104a330a20722fde1634a0d51b1706c9705b4b9415aa9703c99a61d2ce3de97caba24a6b667897e842490c15a6bf2cdbb2f51341febf29d0475b4c0f384b
 DIST navigation-1.15.1.tar.gz 346480 BLAKE2B 29f9a0b6f2c62bd21a7cb87a64b490c845bb7db4af338fd094744abb22402df7eedc8c164b64f93f2d67dabaff99ca3b946b45e93173bed74834d9e3668726ad SHA512 25c5093bf7acca9d15d46bb2d0ae7e4ce0fa45f18b32d1626668dcbd33732317e8535b978e7225d86391472c517f05acb7736f31a7c511c8736ab8a22c7af4b0
+DIST navigation-1.15.2.tar.gz 348985 BLAKE2B 866779425828b1e4c3a044654ae41f33643646ca70cf6841f23bce265add2c420bf0934a41a6b29fa65fc421228a31dc15e9fb0f6cc4295ce12adbbb627b43d4 SHA512 582422756b31b4d83e929e3c723e7205e772b9775fcf618c9bd5d3c54af1f20e9bc8a0143626750c0c3cffeb0cbea8f8706b7e66f62dc037cfe12b05f23ee142
 EBUILD nav_core-1.13.0.ebuild 503 BLAKE2B 851ae866972e8722a14f9c65016f8ab8325374bef26cb37dc6d7497a6a946bfd8ab4f8cc5fe3cf6d786417e0d8dd6281c8be0ccf0241d5731acfaaab9351b453 SHA512 3569c2601fee21366180d0d6030af45b9e678dd8a3fd89a8eef98c43d88724627fe498e4582319efe6c6e0e81ec6026560b39133f4bea2e88be7ffa08062c523
 EBUILD nav_core-1.13.1.ebuild 503 BLAKE2B 851ae866972e8722a14f9c65016f8ab8325374bef26cb37dc6d7497a6a946bfd8ab4f8cc5fe3cf6d786417e0d8dd6281c8be0ccf0241d5731acfaaab9351b453 SHA512 3569c2601fee21366180d0d6030af45b9e678dd8a3fd89a8eef98c43d88724627fe498e4582319efe6c6e0e81ec6026560b39133f4bea2e88be7ffa08062c523
 EBUILD nav_core-1.14.0.ebuild 503 BLAKE2B 6159117e0bce913017f43f1fd18fc0b274962a6570511581d842ee500a8c9e1df3d6c2fb5f154039b215f633ff6234ebe3fb812d7cd39df5449bf8fea47b3cde SHA512 bbf731a9bb5198790347d2299e85174a007867983150ef6ade31aafa6c5a4015cd108475ef726440a2f98dad4c641e8539ebf317a68388bee4771b96231287bf
 EBUILD nav_core-1.14.2.ebuild 503 BLAKE2B f629479c133998c7abfedf09e41dca4559d2324aade9d92e786c89260c8590dee8b52ae05ec40f7d6199bbd55d6613bd2cc8842c2f1cbbaaaf116db3851cbbf4 SHA512 68bd8c9a227ce8e19fd08b9ceaabc6b615e6805652cc66469dd95e659209b2c592061dc0ea104effa99a1952e06b42da5e9a0272d6b282cf0e5125cd6fcec857
 EBUILD nav_core-1.15.1.ebuild 503 BLAKE2B f629479c133998c7abfedf09e41dca4559d2324aade9d92e786c89260c8590dee8b52ae05ec40f7d6199bbd55d6613bd2cc8842c2f1cbbaaaf116db3851cbbf4 SHA512 68bd8c9a227ce8e19fd08b9ceaabc6b615e6805652cc66469dd95e659209b2c592061dc0ea104effa99a1952e06b42da5e9a0272d6b282cf0e5125cd6fcec857
+EBUILD nav_core-1.15.2.ebuild 503 BLAKE2B 0d65bb8980f5b01daf85b3b64fe327110859c46da94def8f94b348919b4c23aae46e2705690c8a51548f9f10333271839929595eb2883cf0da1f878dad3813b6 SHA512 e408c2e3a83ab1f1551e387056e4203a14c810c29203528363fdad39a5e9bf30af06351d15075a15b1ce7683f086c31bc82e2bf5f27786f521047768a64736c7
 EBUILD nav_core-9999.ebuild 503 BLAKE2B 851ae866972e8722a14f9c65016f8ab8325374bef26cb37dc6d7497a6a946bfd8ab4f8cc5fe3cf6d786417e0d8dd6281c8be0ccf0241d5731acfaaab9351b453 SHA512 3569c2601fee21366180d0d6030af45b9e678dd8a3fd89a8eef98c43d88724627fe498e4582319efe6c6e0e81ec6026560b39133f4bea2e88be7ffa08062c523
 MISC metadata.xml 337 BLAKE2B ecfbf3d0b63a1b876065d04b3d52daa0442e3bcaf060836731012a1e698b3aea06ff292d892035feb2fb0fc257d6d8462d013ccc67f2650177c9cdba4d051d44 SHA512 f5df7464100fa15a3d2ad11cc620007500a5cb5ea7be67ac45819a541dd4ae53ce476231d475acf4dfe7e7bf0c31281325dc4e003867d1cc01a29353bb5ea09e
diff --git a/dev-ros/nav_core/nav_core-1.15.2.ebuild b/dev-ros/nav_core/nav_core-1.15.2.ebuild
new file mode 100644
index 000000000000..3461f7166e3d
--- /dev/null
+++ b/dev-ros/nav_core/nav_core-1.15.2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-planning/navigation"
+ROS_SUBDIR=${PN}
+KEYWORDS="~amd64 ~arm"
+
+inherit ros-catkin
+
+DESCRIPTION="Common interfaces for navigation specific robot actions"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/tf
+	dev-ros/costmap_2d
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/navfn/Manifest b/dev-ros/navfn/Manifest
index 12fb8bee8f97..37f04f6d11b1 100644
--- a/dev-ros/navfn/Manifest
+++ b/dev-ros/navfn/Manifest
@@ -1,5 +1,7 @@
 AUX pgm_h_location.patch 900 BLAKE2B 2816bc6803bce70d14f5fcf10161316961ffd265d94a36e90f7d98bd381a4966bd924e352cda2f859e07ea25547e62e0d6381afa1fa3b488364634b20730830c SHA512 4c3286e18d922d292858e8fc574cc440c344ae182133539efca93cb25e16dc78149efe521499024751a46f2b4d1b63516276f1e0510028114357520d4a560d81
 DIST navigation-1.15.1.tar.gz 346480 BLAKE2B 29f9a0b6f2c62bd21a7cb87a64b490c845bb7db4af338fd094744abb22402df7eedc8c164b64f93f2d67dabaff99ca3b946b45e93173bed74834d9e3668726ad SHA512 25c5093bf7acca9d15d46bb2d0ae7e4ce0fa45f18b32d1626668dcbd33732317e8535b978e7225d86391472c517f05acb7736f31a7c511c8736ab8a22c7af4b0
+DIST navigation-1.15.2.tar.gz 348985 BLAKE2B 866779425828b1e4c3a044654ae41f33643646ca70cf6841f23bce265add2c420bf0934a41a6b29fa65fc421228a31dc15e9fb0f6cc4295ce12adbbb627b43d4 SHA512 582422756b31b4d83e929e3c723e7205e772b9775fcf618c9bd5d3c54af1f20e9bc8a0143626750c0c3cffeb0cbea8f8706b7e66f62dc037cfe12b05f23ee142
 EBUILD navfn-1.15.1-r1.ebuild 913 BLAKE2B 9d84a8b7bc87825f8593a325f2d39ae0146edd6d299d0b4f5151e3f7f4486d837fb4c577162efa08a92e43fd6d0041b87ec403fe00b309554d97d74eee7a72c4 SHA512 f6cfd0c8a4abf07ee4440fa5bb399d6ac6295427356f2dace3728b87c01e0e359917900218b3723ee60fad37672e41b328a9c5109cff4b640a58b16b27108f54
+EBUILD navfn-1.15.2.ebuild 913 BLAKE2B 9d405dcad1e3e9e79d050bc26ece8b81e8a8d67baa7c218abbde2317ba59d87ece1f318b327014caca5e437e0a93ebd66b9c970e154da4f3e34c04faafd5b42b SHA512 b0a6c3bc2afebd03b7ecf7618396dbc29c968b91ab1b1c2c6fb937c7607e05269ed72221655a64c71c717560f68219b180139072ac3a67f49a7abc4314af8e83
 EBUILD navfn-9999.ebuild 913 BLAKE2B 9d84a8b7bc87825f8593a325f2d39ae0146edd6d299d0b4f5151e3f7f4486d837fb4c577162efa08a92e43fd6d0041b87ec403fe00b309554d97d74eee7a72c4 SHA512 f6cfd0c8a4abf07ee4440fa5bb399d6ac6295427356f2dace3728b87c01e0e359917900218b3723ee60fad37672e41b328a9c5109cff4b640a58b16b27108f54
 MISC metadata.xml 337 BLAKE2B ecfbf3d0b63a1b876065d04b3d52daa0442e3bcaf060836731012a1e698b3aea06ff292d892035feb2fb0fc257d6d8462d013ccc67f2650177c9cdba4d051d44 SHA512 f5df7464100fa15a3d2ad11cc620007500a5cb5ea7be67ac45819a541dd4ae53ce476231d475acf4dfe7e7bf0c31281325dc4e003867d1cc01a29353bb5ea09e
diff --git a/dev-ros/navfn/navfn-1.15.2.ebuild b/dev-ros/navfn/navfn-1.15.2.ebuild
new file mode 100644
index 000000000000..51db8c953072
--- /dev/null
+++ b/dev-ros/navfn/navfn-1.15.2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-planning/navigation"
+ROS_SUBDIR=${PN}
+KEYWORDS="~amd64 ~arm"
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs dev-ros/nav_msgs"
+CATKIN_HAS_MESSAGES=yes
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="Fast interpolated navigation function that can be used to create plans for a mobile base"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/costmap_2d
+	dev-ros/nav_core
+	dev-ros/pcl_conversions
+	dev-ros/pcl_ros
+	dev-ros/pluginlib
+	dev-ros/roscpp
+	dev-ros/tf
+	dev-ros/visualization_msgs
+	dev-cpp/eigen:3
+	sci-libs/pcl
+	x11-libs/fltk
+	media-libs/netpbm
+	dev-libs/boost:=[threads]
+	dev-libs/console_bridge:=
+"
+DEPEND="${RDEPEND}
+	test? ( dev-cpp/gtest )
+	dev-ros/cmake_modules"
+
+PATCHES=( "${FILESDIR}/pgm_h_location.patch" )
diff --git a/dev-ros/robot_pose_ekf/Manifest b/dev-ros/robot_pose_ekf/Manifest
index ee60b4e6b865..2db0f4c34713 100644
--- a/dev-ros/robot_pose_ekf/Manifest
+++ b/dev-ros/robot_pose_ekf/Manifest
@@ -1,8 +1,10 @@
 DIST navigation-1.14.0.tar.gz 340196 BLAKE2B 9338af98d1eb88e6bd79aa4f4c186ac6dc1c52b0f024286264f62e487f8e2236cff81397ccb8b828e4e000c0d05bc93963c979975089220b49cf980f465b643d SHA512 8ac2048be6d06be1f137aab2e73c5c724e794b9e6125fa70e2283df3790200f7b5203bae12c46e0796523ae58a4f8ede79fd0c1afc09a306a99f450576c7b11a
 DIST navigation-1.14.2.tar.gz 345166 BLAKE2B 4c54f975088e3f99102f7bb1ef500909b16218e48db97a875f8b980dfe1bfd51d51eccab308ba7a3d5bee444de7d9e9fdf7d6477583739740ad13e7f0c35d1ea SHA512 6477104a330a20722fde1634a0d51b1706c9705b4b9415aa9703c99a61d2ce3de97caba24a6b667897e842490c15a6bf2cdbb2f51341febf29d0475b4c0f384b
 DIST navigation-1.15.1.tar.gz 346480 BLAKE2B 29f9a0b6f2c62bd21a7cb87a64b490c845bb7db4af338fd094744abb22402df7eedc8c164b64f93f2d67dabaff99ca3b946b45e93173bed74834d9e3668726ad SHA512 25c5093bf7acca9d15d46bb2d0ae7e4ce0fa45f18b32d1626668dcbd33732317e8535b978e7225d86391472c517f05acb7736f31a7c511c8736ab8a22c7af4b0
+DIST navigation-1.15.2.tar.gz 348985 BLAKE2B 866779425828b1e4c3a044654ae41f33643646ca70cf6841f23bce265add2c420bf0934a41a6b29fa65fc421228a31dc15e9fb0f6cc4295ce12adbbb627b43d4 SHA512 582422756b31b4d83e929e3c723e7205e772b9775fcf618c9bd5d3c54af1f20e9bc8a0143626750c0c3cffeb0cbea8f8706b7e66f62dc037cfe12b05f23ee142
 EBUILD robot_pose_ekf-1.14.0.ebuild 810 BLAKE2B cbec5daff9b223751d5177004e34afe252d36514ac802ccb8a913382f8886adacf8d2f8cbbcce46a4117efb5341e7f5eb6a25ce39ced90b04275296d8f23a1b1 SHA512 56699009441996b2a9115c10dc9b84bf15425cb97333434a30b0e3b9e5ffed7a959e183e595fcb685d400c8f1ac0cfdb51d39dd4e67a338f96fc1f4e53763181
 EBUILD robot_pose_ekf-1.14.2.ebuild 810 BLAKE2B 88a46cea97ef3dfca272e66601315b857759acd6877575aaeecbc2f287a040b36de915f940dda5750eaf5290939e883112f3cdacaf6c30dafb0bc10c2f885465 SHA512 e33865e5a3e2604ce306b666ab4e5daf19d90f3f50c77a798f980a88c7c7595f4528725240b9834ec6c3593b3804aa819abb99dcd36fecb590f20fc5792bf029
 EBUILD robot_pose_ekf-1.15.1.ebuild 810 BLAKE2B 88a46cea97ef3dfca272e66601315b857759acd6877575aaeecbc2f287a040b36de915f940dda5750eaf5290939e883112f3cdacaf6c30dafb0bc10c2f885465 SHA512 e33865e5a3e2604ce306b666ab4e5daf19d90f3f50c77a798f980a88c7c7595f4528725240b9834ec6c3593b3804aa819abb99dcd36fecb590f20fc5792bf029
+EBUILD robot_pose_ekf-1.15.2.ebuild 810 BLAKE2B b5137c2f505b5b7a600de0a1404f78c7a7f5a0578e3d54557e697e697ba5e6eadf7433640cedcaf068dee07ce51afb3d10e122e7bdc9d43f4ab9029432a98575 SHA512 b4518b01c02e137b8dc1599b63f6294595a412415902437da0efaffcd39eec9d42546c24f409284226a590adb636ab3e92ee3def642b7c9a67c1e4e0a2f3e9cb
 EBUILD robot_pose_ekf-9999.ebuild 810 BLAKE2B cbec5daff9b223751d5177004e34afe252d36514ac802ccb8a913382f8886adacf8d2f8cbbcce46a4117efb5341e7f5eb6a25ce39ced90b04275296d8f23a1b1 SHA512 56699009441996b2a9115c10dc9b84bf15425cb97333434a30b0e3b9e5ffed7a959e183e595fcb685d400c8f1ac0cfdb51d39dd4e67a338f96fc1f4e53763181
 MISC metadata.xml 337 BLAKE2B ecfbf3d0b63a1b876065d04b3d52daa0442e3bcaf060836731012a1e698b3aea06ff292d892035feb2fb0fc257d6d8462d013ccc67f2650177c9cdba4d051d44 SHA512 f5df7464100fa15a3d2ad11cc620007500a5cb5ea7be67ac45819a541dd4ae53ce476231d475acf4dfe7e7bf0c31281325dc4e003867d1cc01a29353bb5ea09e
diff --git a/dev-ros/robot_pose_ekf/robot_pose_ekf-1.15.2.ebuild b/dev-ros/robot_pose_ekf/robot_pose_ekf-1.15.2.ebuild
new file mode 100644
index 000000000000..bd8c4644ddb8
--- /dev/null
+++ b/dev-ros/robot_pose_ekf/robot_pose_ekf-1.15.2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-planning/navigation"
+ROS_SUBDIR=${PN}
+KEYWORDS="~amd64 ~arm"
+CATKIN_HAS_MESSAGES=yes
+PYTHON_COMPAT=( python2_7 )
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Estimate the 3D pose of a robot, based on (partial) pose measurements coming from different sources"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/roscpp
+	dev-ros/tf
+	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	sci-libs/orocos-bfl
+	dev-libs/boost:=[threads]
+"
+DEPEND="${RDEPEND}
+	test? ( dev-ros/rostest[${PYTHON_USEDEP}] )
+	virtual/pkgconfig"
diff --git a/dev-ros/rotate_recovery/Manifest b/dev-ros/rotate_recovery/Manifest
index 4b168d211e14..b02b0d13b384 100644
--- a/dev-ros/rotate_recovery/Manifest
+++ b/dev-ros/rotate_recovery/Manifest
@@ -1,4 +1,6 @@
 DIST navigation-1.15.1.tar.gz 346480 BLAKE2B 29f9a0b6f2c62bd21a7cb87a64b490c845bb7db4af338fd094744abb22402df7eedc8c164b64f93f2d67dabaff99ca3b946b45e93173bed74834d9e3668726ad SHA512 25c5093bf7acca9d15d46bb2d0ae7e4ce0fa45f18b32d1626668dcbd33732317e8535b978e7225d86391472c517f05acb7736f31a7c511c8736ab8a22c7af4b0
+DIST navigation-1.15.2.tar.gz 348985 BLAKE2B 866779425828b1e4c3a044654ae41f33643646ca70cf6841f23bce265add2c420bf0934a41a6b29fa65fc421228a31dc15e9fb0f6cc4295ce12adbbb627b43d4 SHA512 582422756b31b4d83e929e3c723e7205e772b9775fcf618c9bd5d3c54af1f20e9bc8a0143626750c0c3cffeb0cbea8f8706b7e66f62dc037cfe12b05f23ee142
 EBUILD rotate_recovery-1.15.1-r1.ebuild 606 BLAKE2B 73f5ab04b5649cb806a00032935bda90516a782879bd554194a066bb9b97328affb91340b355528ac6c876688b90e14019b8618bfe70e5bb126abf777ba37644 SHA512 bb82c834a6b960be12782707a845485e18e56c29a92f68425e6b40d3d7d4ce212f4b5fadb70abe69aa4f36cfc19c5df651b7f89db3948219a2cf1d185ad42167
+EBUILD rotate_recovery-1.15.2.ebuild 606 BLAKE2B 2070356def81d0003474a0405ffd5466922e6aa5421af7b5d65ef451bf955e025f54cca1d8e1a10b18cc8c4bfc35d070a11172049fcfc211b3bb8be8148d165a SHA512 959150d508d21f213ac70df41e12ad9e1cf4a0e8f147610d12feeeee7b211405eaf17ed58afe932e8506fc271d53aebb83aa7c79a87b5db5f04fcad2e7fc8a5d
 EBUILD rotate_recovery-9999.ebuild 606 BLAKE2B 73f5ab04b5649cb806a00032935bda90516a782879bd554194a066bb9b97328affb91340b355528ac6c876688b90e14019b8618bfe70e5bb126abf777ba37644 SHA512 bb82c834a6b960be12782707a845485e18e56c29a92f68425e6b40d3d7d4ce212f4b5fadb70abe69aa4f36cfc19c5df651b7f89db3948219a2cf1d185ad42167
 MISC metadata.xml 337 BLAKE2B ecfbf3d0b63a1b876065d04b3d52daa0442e3bcaf060836731012a1e698b3aea06ff292d892035feb2fb0fc257d6d8462d013ccc67f2650177c9cdba4d051d44 SHA512 f5df7464100fa15a3d2ad11cc620007500a5cb5ea7be67ac45819a541dd4ae53ce476231d475acf4dfe7e7bf0c31281325dc4e003867d1cc01a29353bb5ea09e
diff --git a/dev-ros/rotate_recovery/rotate_recovery-1.15.2.ebuild b/dev-ros/rotate_recovery/rotate_recovery-1.15.2.ebuild
new file mode 100644
index 000000000000..f66e208f7dfe
--- /dev/null
+++ b/dev-ros/rotate_recovery/rotate_recovery-1.15.2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-planning/navigation"
+ROS_SUBDIR=${PN}
+KEYWORDS="~amd64 ~arm"
+
+inherit ros-catkin
+
+DESCRIPTION="Recovery behavior that attempts to clear space by performing a 360 degree rotation of the robot"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/roscpp
+	dev-ros/tf
+	dev-ros/costmap_2d
+	dev-ros/nav_core
+	dev-ros/pluginlib
+	dev-ros/base_local_planner
+	dev-cpp/eigen:3
+	dev-libs/boost:=
+	dev-libs/console_bridge:=
+"
+DEPEND="${RDEPEND}
+	dev-ros/cmake_modules"
diff --git a/dev-ros/voxel_grid/Manifest b/dev-ros/voxel_grid/Manifest
index d0eb84e21f3f..f1097a9333b1 100644
--- a/dev-ros/voxel_grid/Manifest
+++ b/dev-ros/voxel_grid/Manifest
@@ -3,10 +3,12 @@ DIST navigation-1.13.1.tar.gz 335568 BLAKE2B 77177dee95744ef327156bcda3fcb59bd2a
 DIST navigation-1.14.0.tar.gz 340196 BLAKE2B 9338af98d1eb88e6bd79aa4f4c186ac6dc1c52b0f024286264f62e487f8e2236cff81397ccb8b828e4e000c0d05bc93963c979975089220b49cf980f465b643d SHA512 8ac2048be6d06be1f137aab2e73c5c724e794b9e6125fa70e2283df3790200f7b5203bae12c46e0796523ae58a4f8ede79fd0c1afc09a306a99f450576c7b11a
 DIST navigation-1.14.2.tar.gz 345166 BLAKE2B 4c54f975088e3f99102f7bb1ef500909b16218e48db97a875f8b980dfe1bfd51d51eccab308ba7a3d5bee444de7d9e9fdf7d6477583739740ad13e7f0c35d1ea SHA512 6477104a330a20722fde1634a0d51b1706c9705b4b9415aa9703c99a61d2ce3de97caba24a6b667897e842490c15a6bf2cdbb2f51341febf29d0475b4c0f384b
 DIST navigation-1.15.1.tar.gz 346480 BLAKE2B 29f9a0b6f2c62bd21a7cb87a64b490c845bb7db4af338fd094744abb22402df7eedc8c164b64f93f2d67dabaff99ca3b946b45e93173bed74834d9e3668726ad SHA512 25c5093bf7acca9d15d46bb2d0ae7e4ce0fa45f18b32d1626668dcbd33732317e8535b978e7225d86391472c517f05acb7736f31a7c511c8736ab8a22c7af4b0
+DIST navigation-1.15.2.tar.gz 348985 BLAKE2B 866779425828b1e4c3a044654ae41f33643646ca70cf6841f23bce265add2c420bf0934a41a6b29fa65fc421228a31dc15e9fb0f6cc4295ce12adbbb627b43d4 SHA512 582422756b31b4d83e929e3c723e7205e772b9775fcf618c9bd5d3c54af1f20e9bc8a0143626750c0c3cffeb0cbea8f8706b7e66f62dc037cfe12b05f23ee142
 EBUILD voxel_grid-1.13.0.ebuild 395 BLAKE2B aaa80f5692268540023d6b98161e92fd5f9376e2835f40699601cc08873412c38586c3a7d70d717680ef70976f22f1542a9fdc2c3660c66183c21e18a9905b36 SHA512 d79c9dbd9f28164ccd0945f2dd8a53e317369a372d254dadefe8e4b72867474b5b9a708fe78950ca469b69e90497c68dcb54d575df9acfa93412cad351dce8cf
 EBUILD voxel_grid-1.13.1.ebuild 395 BLAKE2B aaa80f5692268540023d6b98161e92fd5f9376e2835f40699601cc08873412c38586c3a7d70d717680ef70976f22f1542a9fdc2c3660c66183c21e18a9905b36 SHA512 d79c9dbd9f28164ccd0945f2dd8a53e317369a372d254dadefe8e4b72867474b5b9a708fe78950ca469b69e90497c68dcb54d575df9acfa93412cad351dce8cf
 EBUILD voxel_grid-1.14.0.ebuild 395 BLAKE2B 8333e6aed91f947c3a5d2492f8d67f3ea08605aa039a1390be38894f4de69b03d650e95ee1c26ca5805ff5a509a4ca8de0a4e4aeb047332560c55b76e193c7f5 SHA512 a53fdde3f3907baa186ea8bd4665e1ece543a268b65f0b7bd9333bfaa38610c853d8142f6d43168a2927a0c26c2c6ced9dd1ae03c78f38c226c20846537a9c42
 EBUILD voxel_grid-1.14.2.ebuild 395 BLAKE2B 415ad18cfa6421e70fe2e7ad9313285931eb2eeb298918fcb295d807ccc40a19c3422e76cc032154b245e4c9ef3aa795b4c6b090854bc0e4aae41845f48577d7 SHA512 6d556b4b31459161b0bc9ae9b8636ec76c3f02ac39c4db8601140dbd910a2894c1f625b9f84ef1debbf5a5721de1dc2eed6d7565f9bc71fee39ebcbd36ee2233
 EBUILD voxel_grid-1.15.1.ebuild 395 BLAKE2B 415ad18cfa6421e70fe2e7ad9313285931eb2eeb298918fcb295d807ccc40a19c3422e76cc032154b245e4c9ef3aa795b4c6b090854bc0e4aae41845f48577d7 SHA512 6d556b4b31459161b0bc9ae9b8636ec76c3f02ac39c4db8601140dbd910a2894c1f625b9f84ef1debbf5a5721de1dc2eed6d7565f9bc71fee39ebcbd36ee2233
+EBUILD voxel_grid-1.15.2.ebuild 395 BLAKE2B 83874df4d5d10255cc78efa4b0df9f0ee182acf21a166b7ec1897fd271b14c5f8971eee84358a1bd5a0720e582476f28b3794d21be37417bf028697d5406e34f SHA512 9fff1d5091009da26d447f633bb30e7dce527481ec506500546ea55579d17d37bd1e597a39e658829694fdccbeb0500e2f08b2c9af34ad2bd2e9ee4f0758e05e
 EBUILD voxel_grid-9999.ebuild 395 BLAKE2B aaa80f5692268540023d6b98161e92fd5f9376e2835f40699601cc08873412c38586c3a7d70d717680ef70976f22f1542a9fdc2c3660c66183c21e18a9905b36 SHA512 d79c9dbd9f28164ccd0945f2dd8a53e317369a372d254dadefe8e4b72867474b5b9a708fe78950ca469b69e90497c68dcb54d575df9acfa93412cad351dce8cf
 MISC metadata.xml 337 BLAKE2B ecfbf3d0b63a1b876065d04b3d52daa0442e3bcaf060836731012a1e698b3aea06ff292d892035feb2fb0fc257d6d8462d013ccc67f2650177c9cdba4d051d44 SHA512 f5df7464100fa15a3d2ad11cc620007500a5cb5ea7be67ac45819a541dd4ae53ce476231d475acf4dfe7e7bf0c31281325dc4e003867d1cc01a29353bb5ea09e
diff --git a/dev-ros/voxel_grid/voxel_grid-1.15.2.ebuild b/dev-ros/voxel_grid/voxel_grid-1.15.2.ebuild
new file mode 100644
index 000000000000..8ced333d52ee
--- /dev/null
+++ b/dev-ros/voxel_grid/voxel_grid-1.15.2.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-planning/navigation"
+ROS_SUBDIR=${PN}
+KEYWORDS="~amd64 ~arm"
+
+inherit ros-catkin
+
+DESCRIPTION="Implementation of an efficient 3D voxel grid"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="dev-ros/roscpp"
+DEPEND="${RDEPEND}
+	test? ( dev-cpp/gtest )"
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 14817ac6e1ce..1eda873973b9 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/actionmailer/Manifest b/dev-ruby/actionmailer/Manifest
index 5e9755933373..44dc1bbbf196 100644
--- a/dev-ruby/actionmailer/Manifest
+++ b/dev-ruby/actionmailer/Manifest
@@ -10,6 +10,6 @@ EBUILD actionmailer-5.0.6.ebuild 1341 BLAKE2B 2a17605f8210edb2253fe3914d267f32c1
 EBUILD actionmailer-5.1.1.ebuild 1307 BLAKE2B 3a57abf2c24403a3e3e3aa8b218d037f5d10a1e251e6839e6fd070dcd5d1f3bd32059bf96c1c9b50c0635dfb658a818849fabd8713007b579ce47dade587bb5e SHA512 8dea2f655ac10ca30cd49487d43bfbd5eea2b2791ed7252fbea6877ede7a1f134db57eeb8949e8cee88ad0421ea6b320b64b4f66b5a0c3ef62d2d4c6496ad0a6
 EBUILD actionmailer-5.1.2.ebuild 1309 BLAKE2B 20c4261735aa39b813468d126f89cfba4f5c98e2c45535005e3a91ec569c0d042aa2f3b20438328f57829fce081e67a8a82391dbddaa4116194f874d1683b2e9 SHA512 264bc323149953ef8306f4fa862604cc940c28cb80d31fac7709b54641b27e07fa389da403b9d851bea79eb81708eef0672c2c0f68cdabc28835c0e8e303f601
 EBUILD actionmailer-5.1.3.ebuild 1309 BLAKE2B 20c4261735aa39b813468d126f89cfba4f5c98e2c45535005e3a91ec569c0d042aa2f3b20438328f57829fce081e67a8a82391dbddaa4116194f874d1683b2e9 SHA512 264bc323149953ef8306f4fa862604cc940c28cb80d31fac7709b54641b27e07fa389da403b9d851bea79eb81708eef0672c2c0f68cdabc28835c0e8e303f601
-EBUILD actionmailer-5.1.4.ebuild 1316 BLAKE2B 5db2ba816f968743999bc0e6dc6eb12b64f35860ffd223f1d28f21a0a1102c133fdaa334c8c6ccac0009fda3343cddacff02263a0d34d7ebf0a69fae7ab69903 SHA512 3194e54c46d5f89d52caf6ffc61b65b9f9f14f30e2ab2d2a722a4973a153bdf68da74a89c990a093724950484ef1db0e2ca1d081a0182e3e370e2243679e3336
-EBUILD actionmailer-5.1.5.ebuild 1316 BLAKE2B 5db2ba816f968743999bc0e6dc6eb12b64f35860ffd223f1d28f21a0a1102c133fdaa334c8c6ccac0009fda3343cddacff02263a0d34d7ebf0a69fae7ab69903 SHA512 3194e54c46d5f89d52caf6ffc61b65b9f9f14f30e2ab2d2a722a4973a153bdf68da74a89c990a093724950484ef1db0e2ca1d081a0182e3e370e2243679e3336
+EBUILD actionmailer-5.1.4.ebuild 1321 BLAKE2B a1225fd8d4433c84dbd412ca2a9d763791ea9bb13c1b7064490743156238fc7291494419837cd0843d82ca7e67dbd4ac660185258ec78922abc4eb7c57d88f7d SHA512 11568b63575505388731bc9db9240b24b3b260fa5e2883fc72b00aca5729e12543b9bb93ba7c7331eba7ff5053ffae0f1b9ca1de21b353a9ec66b1baa9f2a909
+EBUILD actionmailer-5.1.5.ebuild 1321 BLAKE2B a1225fd8d4433c84dbd412ca2a9d763791ea9bb13c1b7064490743156238fc7291494419837cd0843d82ca7e67dbd4ac660185258ec78922abc4eb7c57d88f7d SHA512 11568b63575505388731bc9db9240b24b3b260fa5e2883fc72b00aca5729e12543b9bb93ba7c7331eba7ff5053ffae0f1b9ca1de21b353a9ec66b1baa9f2a909
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/actionmailer/actionmailer-5.1.4.ebuild b/dev-ruby/actionmailer/actionmailer-5.1.4.ebuild
index ee366fa61a7d..eb97299a0c6f 100644
--- a/dev-ruby/actionmailer/actionmailer-5.1.4.ebuild
+++ b/dev-ruby/actionmailer/actionmailer-5.1.4.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 
 LICENSE="MIT"
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
diff --git a/dev-ruby/actionmailer/actionmailer-5.1.5.ebuild b/dev-ruby/actionmailer/actionmailer-5.1.5.ebuild
index ee366fa61a7d..eb97299a0c6f 100644
--- a/dev-ruby/actionmailer/actionmailer-5.1.5.ebuild
+++ b/dev-ruby/actionmailer/actionmailer-5.1.5.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 
 LICENSE="MIT"
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
diff --git a/dev-ruby/actionpack/Manifest b/dev-ruby/actionpack/Manifest
index 729ddf3a5e8b..935bb9e65396 100644
--- a/dev-ruby/actionpack/Manifest
+++ b/dev-ruby/actionpack/Manifest
@@ -10,6 +10,6 @@ EBUILD actionpack-5.0.6.ebuild 2095 BLAKE2B 90e1cc87ff932dcb868e0c75479adce4137e
 EBUILD actionpack-5.1.1.ebuild 1971 BLAKE2B 03c27bf7d7c685639cd1fa15a1f9810d66f1f9a6caa188f24be94317fe9e48c2da3d8ad7e07caa1c20f9eec3fb7ac3ed68e00e222f101193568e8b2eac52dff0 SHA512 eaf9aaa533ac9697a2664a3c88c84646afdb3eec2846526bacff9e08b699d92199d4ac03f53307ac30fd03af666eed173e6f34b5269c315a4e39352f292c55f6
 EBUILD actionpack-5.1.2.ebuild 2021 BLAKE2B efbe5e27ee6b7ad0fb9b6bcce11f0d420db95e83853b252c363a52118f4619d70180f581b694518fbbd887f3e850ac3f8cf6397f9c03de5e50da2d0691a9e22a SHA512 56d85e4644c3ed1749ae4b9a3b7135dc9e9641afa90f2c23d01a427c9714ca0b8e3881622f4eb829ae4c4de74a0380ceab95f2ed22a7935e9d7bb9af2269e311
 EBUILD actionpack-5.1.3.ebuild 1659 BLAKE2B c4897ef9daf0b7bd4730e80bb4533343a993d63c81e8bc79929041f8def6930128f4c00595f3a58405b2176d026dcb512733cdf395a354689dfd0ef7f5be0f51 SHA512 263ebcd5d8993e29b3d2be7a5040ba7d5a1ff02012f0d0bdd25181faf4255877a7b4b9ee067de51128c42ed88198ad64568d20daf69679a4f6622ca449fe1d55
-EBUILD actionpack-5.1.4.ebuild 1665 BLAKE2B acb93d68b88fdb33e76c90e8af81271e866db8f22b4f8afffaa8c3dc63fa71853b592793756ff84b2507d11e4fc3fefdd6b5b805f0cf987d761275255d24a468 SHA512 4ca7f6d54c17a9908332b72d250813796f71b6d9fe0ddf98a886c0e997679c0fd6168b6d40540bb38c5df5166ee9ead74afc47807294a665541a520e94074cdc
-EBUILD actionpack-5.1.5.ebuild 1666 BLAKE2B 5465efa9f5aa425204cfce0bf0d6367b9ea8e09e5f3b5c6f03b2cc3db4780f3bb45f2a7aa483f3489feb9589821c5cbc77eba23387cf983ac6b9bd4f2d296c21 SHA512 3cc30a5d4272b0cdae6c5646ef6dd554eb0259229a328d8be891dd75c97957836db28e286f4e2e7827fd48963e0fb5c6b77a5d71eaf4d3aa233f7c9c0daffc6c
+EBUILD actionpack-5.1.4.ebuild 1670 BLAKE2B b2b115ec16dbee477649e0068b6407f5097fda63bc746e6451a5eb8d8a0cc3ac6e58a5d3ab761789b3acda4708e1bc0e822b8ba9334f26e29cabd0d3c53c40f9 SHA512 d757de769ecae219fc268fbcb98b046117a3d880116ac7a309278e778fff575d3d34f53d8bba98c306a678c94e6d7518fbae2aa00046701ea48921055891abe2
+EBUILD actionpack-5.1.5.ebuild 1671 BLAKE2B 4f9741a6208682c3c3dc86b92e23cf1578950f64f7991e9ac69faa3d3ca375691a40c717e475bf3d4d92c77c164dc33ce15b8b904487fc4520cdb5e34ada2217 SHA512 7bc54a749625c4ed9b8e8d2cc54f9a9f0ac0338c647138a9e8187578e5583dec1e023c7d5fa1b4d1009ebe9d1fdf6d21c679cdb3d359fbc23650f7fe2d013f1d
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/actionpack/actionpack-5.1.4.ebuild b/dev-ruby/actionpack/actionpack-5.1.4.ebuild
index d9f2139f34ef..e4aa33162499 100644
--- a/dev-ruby/actionpack/actionpack-5.1.4.ebuild
+++ b/dev-ruby/actionpack/actionpack-5.1.4.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 
 LICENSE="MIT"
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
diff --git a/dev-ruby/actionpack/actionpack-5.1.5.ebuild b/dev-ruby/actionpack/actionpack-5.1.5.ebuild
index 2b813189e5c3..a6ccce8788de 100644
--- a/dev-ruby/actionpack/actionpack-5.1.5.ebuild
+++ b/dev-ruby/actionpack/actionpack-5.1.5.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 
 LICENSE="MIT"
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
diff --git a/dev-ruby/actionview/Manifest b/dev-ruby/actionview/Manifest
index d6654880fea3..097eac28357a 100644
--- a/dev-ruby/actionview/Manifest
+++ b/dev-ruby/actionview/Manifest
@@ -10,6 +10,6 @@ EBUILD actionview-5.0.6.ebuild 1839 BLAKE2B 766842730ddb8927b3be2fb39382ec1689e5
 EBUILD actionview-5.1.1.ebuild 1743 BLAKE2B 70b25dd16e79a8f9bc13197d1921c6d5f884b0d05be26f6f82667af509dac76fdd508ee2e44cfd9a0bd3e4f7b66b471e9f0a4558999f42ae47accf1e3402e61f SHA512 fcec147a89d1749123440699adee343b81533aa2ff37d39f195ced9a4662abd35845c49a1f781c527f64760b00993cf4db0aff1db6c1d1fc9e09bc9537695dc9
 EBUILD actionview-5.1.2.ebuild 1745 BLAKE2B ba67d1f27b76685bc5a42c1824d06a55faf339346fea21574474d79eba838e1f047a122cf2e494e0830e8c470c649ac88487d88057b36f8cd0932188b242040c SHA512 05603a60324dd3c46a3c8f0d7b33a0f6d1c75973c30be7edc1494a3bdceccf78a7be534819220ae6d74788abd7ac1217523544d91fd2bc3bbe7852581dffbaaa
 EBUILD actionview-5.1.3.ebuild 1745 BLAKE2B ba67d1f27b76685bc5a42c1824d06a55faf339346fea21574474d79eba838e1f047a122cf2e494e0830e8c470c649ac88487d88057b36f8cd0932188b242040c SHA512 05603a60324dd3c46a3c8f0d7b33a0f6d1c75973c30be7edc1494a3bdceccf78a7be534819220ae6d74788abd7ac1217523544d91fd2bc3bbe7852581dffbaaa
-EBUILD actionview-5.1.4.ebuild 1751 BLAKE2B 99a60f5f96edde0e56390a3c2fc219b958efb61fce9031c9c23867bf769e7a40195dd7ad7c1a68b480af62330d49421ec28bea25ee49c81a66bedf2193fd7e0e SHA512 076864d830c7d4097998a13f786a2f03fc30e71607dc920e9644100795b0cff052779c2447fc65bdc30444155ff7df4c3da4733151fd765a70c97a491eb47b21
-EBUILD actionview-5.1.5.ebuild 1752 BLAKE2B cb46eaed5f2826fe70b9e4c4dd07409667f6aefd3e6467fa3f54b2043ba2bd5f8737212be88723c5dc1a1e60d9d1bc0ae0c43716864505ac761faccb24b09ba8 SHA512 c6f647ac8cbe9d90da015d9f773a310226914cbbbb68ea646833ca7541ae63e5a40209cc431dae4c10a5a7e20930c55cf18d691b6f164ab88e50519bb1c5b353
+EBUILD actionview-5.1.4.ebuild 1756 BLAKE2B c154d68ac1efe85f9fe58d4605915ac457d23201447284c070e4e376c8161d81c7f7cde71b8090b88c19efe14d619cce54985ad42374da9ae2f6301a0737c4dc SHA512 7d21a6d903260203b96f7ea725bb2d9a72a25ae90a4ff84d7a5d302f349a4f85c6735bdad874fafa39f7988ce15100cbca634ea73bb7ec80845ea90b7ce7a084
+EBUILD actionview-5.1.5.ebuild 1757 BLAKE2B 186d24cfa202cb32fc97791e9d957c69f09e9af8293fd6ce09dbb70dea96835a337b7eea36f4a5757aaf2900dfa8e6844007f907f1d12dfc144aa404ed20b67a SHA512 45daa6fe7a74262b1aedabcf5280786f3282ddf5d29dc646092c82b6754b05014e1a81f768bde5661f5fbef248ff5c964267e150b85055d78ce3249afa3e3285
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/actionview/actionview-5.1.4.ebuild b/dev-ruby/actionview/actionview-5.1.4.ebuild
index fafc9b44756b..db4ce24785ad 100644
--- a/dev-ruby/actionview/actionview-5.1.4.ebuild
+++ b/dev-ruby/actionview/actionview-5.1.4.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 
 LICENSE="MIT"
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
diff --git a/dev-ruby/actionview/actionview-5.1.5.ebuild b/dev-ruby/actionview/actionview-5.1.5.ebuild
index e35e2863b78e..a8a2e7bf010c 100644
--- a/dev-ruby/actionview/actionview-5.1.5.ebuild
+++ b/dev-ruby/actionview/actionview-5.1.5.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 
 LICENSE="MIT"
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
diff --git a/dev-ruby/activejob/Manifest b/dev-ruby/activejob/Manifest
index 10f92fb35dea..481fd260fa9a 100644
--- a/dev-ruby/activejob/Manifest
+++ b/dev-ruby/activejob/Manifest
@@ -10,6 +10,6 @@ EBUILD activejob-5.0.6.ebuild 1059 BLAKE2B be868a59498580fde255d69be0810c0167799
 EBUILD activejob-5.1.1.ebuild 1088 BLAKE2B ae03713d8c31b61d86e422bd7a2c848033f6da1befaab69cafe81ce2726d6cb2dc8094414e1d5d46042698535ec268a891c5f0b1626fe5c4a883327782c8bfb2 SHA512 1122a697c93229593c07e2cf91598e9884af9acb5ac53ea332e4d18e4c84b639ea08a9684adde09fa22d7057fc8f76b8e4eeb215f8a1087d3ea406ad8468cd0d
 EBUILD activejob-5.1.2.ebuild 1090 BLAKE2B 7ee757bd7a4fd85fe1d53822abe9a4f8978a422ce23a7ce63bc679e4ab6daffb6d0df9e3091db274e3727577370d99d248d904ff880f5995035a5464172b622f SHA512 c4f4ebadcb98af76a54c88a25c5cd16851760a7ee6134369b8608392375c8aa03cdfdb84092c3797a87abc66eb19bbd01a17bdf238ef57d4b3bcf10faed4d913
 EBUILD activejob-5.1.3.ebuild 1090 BLAKE2B 7ee757bd7a4fd85fe1d53822abe9a4f8978a422ce23a7ce63bc679e4ab6daffb6d0df9e3091db274e3727577370d99d248d904ff880f5995035a5464172b622f SHA512 c4f4ebadcb98af76a54c88a25c5cd16851760a7ee6134369b8608392375c8aa03cdfdb84092c3797a87abc66eb19bbd01a17bdf238ef57d4b3bcf10faed4d913
-EBUILD activejob-5.1.4.ebuild 1097 BLAKE2B 68b8acffa01d7055b19e247a9e2120b029f50105a54ba02cae30f3cee411ad8e3d14326f9302ec52ad6f9b03e6d055c8ce4c49c68a31c38446437aa1afcc83d4 SHA512 61c4391ce80f511db7a4568c240e02e3cfa6f762f2122ceb7b534cc73e7146aeabef08e8277e268056f1f2c3586e03eb4f9b6d20ae5bab26a25766f8e29b9804
-EBUILD activejob-5.1.5.ebuild 1097 BLAKE2B 68b8acffa01d7055b19e247a9e2120b029f50105a54ba02cae30f3cee411ad8e3d14326f9302ec52ad6f9b03e6d055c8ce4c49c68a31c38446437aa1afcc83d4 SHA512 61c4391ce80f511db7a4568c240e02e3cfa6f762f2122ceb7b534cc73e7146aeabef08e8277e268056f1f2c3586e03eb4f9b6d20ae5bab26a25766f8e29b9804
+EBUILD activejob-5.1.4.ebuild 1102 BLAKE2B cea04c003777a5c731ae3bcd33ae2e2feba2d4d8b723236413788ea313519ea109f6825fadf9e3c46e47a1dafb999dc62a7bbf16c3ab7aab54a3870dd38f9d1c SHA512 96b0ccd5572ca46e69264e7ef96dff7dd538f566d38b823c14e57e08427bb3dab5902d94251ab0ec3dbc314d0591e0bf1afcc8169ba715931a4b4eb660af23de
+EBUILD activejob-5.1.5.ebuild 1102 BLAKE2B cea04c003777a5c731ae3bcd33ae2e2feba2d4d8b723236413788ea313519ea109f6825fadf9e3c46e47a1dafb999dc62a7bbf16c3ab7aab54a3870dd38f9d1c SHA512 96b0ccd5572ca46e69264e7ef96dff7dd538f566d38b823c14e57e08427bb3dab5902d94251ab0ec3dbc314d0591e0bf1afcc8169ba715931a4b4eb660af23de
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/activejob/activejob-5.1.4.ebuild b/dev-ruby/activejob/activejob-5.1.4.ebuild
index 20cb6570c1a3..16102b24c9da 100644
--- a/dev-ruby/activejob/activejob-5.1.4.ebuild
+++ b/dev-ruby/activejob/activejob-5.1.4.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 
 LICENSE="MIT"
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
diff --git a/dev-ruby/activejob/activejob-5.1.5.ebuild b/dev-ruby/activejob/activejob-5.1.5.ebuild
index 20cb6570c1a3..16102b24c9da 100644
--- a/dev-ruby/activejob/activejob-5.1.5.ebuild
+++ b/dev-ruby/activejob/activejob-5.1.5.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 
 LICENSE="MIT"
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
diff --git a/dev-ruby/activemodel/Manifest b/dev-ruby/activemodel/Manifest
index f12e74aa11dc..adaf12ac3cee 100644
--- a/dev-ruby/activemodel/Manifest
+++ b/dev-ruby/activemodel/Manifest
@@ -10,6 +10,6 @@ EBUILD activemodel-5.0.6.ebuild 1049 BLAKE2B c9c18543ca2671932e46098cd7baf12b290
 EBUILD activemodel-5.1.1.ebuild 1059 BLAKE2B f6249bca0f66375c3e40910840d2c6de6965f7210eaa570168d7b7e581d14ef392330b498f770a19ef9d2b95bf9d53c69b949e84e1cb6550e3b5e007b04c901d SHA512 d0e657358dd3b88b5b5a305cc0b1f0db07b5bf6b40abadd035142806d31c8075996fba1aae733b896ee124f5bf6d75897eb8d2775ed76e3e6d15cf651e8c5055
 EBUILD activemodel-5.1.2.ebuild 1061 BLAKE2B 46b8b07e4d0da5276b99c64099f7abc97d7434d2821b035010775b109c5288aeec7110c18697adc8b2b5f269c2c735f19802e3fc9bb24289f0e4b57abacaef18 SHA512 884f853f22b7cf3da810eb682a5b81cf807c5559abbbb344bfc4e70530604fd900654039fb54d16556109fa3d14372524d79c1c3512e0f56df24cd2db0011c7f
 EBUILD activemodel-5.1.3.ebuild 1061 BLAKE2B 46b8b07e4d0da5276b99c64099f7abc97d7434d2821b035010775b109c5288aeec7110c18697adc8b2b5f269c2c735f19802e3fc9bb24289f0e4b57abacaef18 SHA512 884f853f22b7cf3da810eb682a5b81cf807c5559abbbb344bfc4e70530604fd900654039fb54d16556109fa3d14372524d79c1c3512e0f56df24cd2db0011c7f
-EBUILD activemodel-5.1.4.ebuild 1067 BLAKE2B db436de3e3c686cf2ba01d00bc090844321909faedb8eaf71d3d71d355015f852399f8a7d2ff25f0d65ee70c8d9549ddc918e9ceca884725d34a41773b2eb7e0 SHA512 02847b07f98235c55dfb1e052c35bbc38430ce4f4a2310c2599f89c1ccfd9fe178087b05744e691361cbd215cc49ce283cbeeea7a6f1f6237da5ce686562efd8
-EBUILD activemodel-5.1.5.ebuild 1068 BLAKE2B d679b2423985d2cd0694220db587619259912f0cafdf0dc06a2f170b43733745a27eb5d9e040722b4d568b5e6f87574265f4b53ec586c55b3a00abddb2276c46 SHA512 545a662e02f970ccef9d2bd504f4d5d4a58cb8969d0c61ec39bf50fe303a28eb91d6dddacbdfc23d380694811004e17ea85b3613efdd0253f47d5193501d782b
+EBUILD activemodel-5.1.4.ebuild 1072 BLAKE2B dee7ef7b1c90455a737cde502105ec1a9b5b4b6362dc115d4f5fa2f4057bd19bf2ba2c79ccd1ce81cf5fe74a3399efd9e511a3e60034bc20f8d04321a7392080 SHA512 d39122a4323f0ad9ac1ddbebfd5c7c579c216682e7676f5f3025ab11a44d8a9366671c2c7f860bef1ed721a630a36a37fb0649897c6b7e9935eb61707151490b
+EBUILD activemodel-5.1.5.ebuild 1073 BLAKE2B 2f5781d6165bdd88e801cd598dbcfb123f99bbfbc68428fe3aac48b5dba83d4a4e7820c2ce588ae2452dca2db0d4e40fb02b41a133bb00ad5b84989759acca06 SHA512 afb9244e7d717cf10c681ca2a3b62fae982d58b91f0dcf60be9854b580e7ad787bff501c52adf7cb27e72969bef2fc2574aa61c468f727f1b2641ac13790036a
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/activemodel/activemodel-5.1.4.ebuild b/dev-ruby/activemodel/activemodel-5.1.4.ebuild
index 395519a45876..7f97f6384ffd 100644
--- a/dev-ruby/activemodel/activemodel-5.1.4.ebuild
+++ b/dev-ruby/activemodel/activemodel-5.1.4.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 
 LICENSE="MIT"
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
diff --git a/dev-ruby/activemodel/activemodel-5.1.5.ebuild b/dev-ruby/activemodel/activemodel-5.1.5.ebuild
index 782c47b12f26..a0b573ba9df5 100644
--- a/dev-ruby/activemodel/activemodel-5.1.5.ebuild
+++ b/dev-ruby/activemodel/activemodel-5.1.5.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 
 LICENSE="MIT"
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
diff --git a/dev-ruby/activerecord/Manifest b/dev-ruby/activerecord/Manifest
index 5a3572fe284a..4a2ba9929547 100644
--- a/dev-ruby/activerecord/Manifest
+++ b/dev-ruby/activerecord/Manifest
@@ -10,6 +10,6 @@ EBUILD activerecord-5.0.6.ebuild 2732 BLAKE2B 52ff7f3e27a3c9bfbdb82884c6a70408e3
 EBUILD activerecord-5.1.1.ebuild 2636 BLAKE2B d02f4fcfd4af2137c8cf0aaa0b683b6148f2ba24c3cdbcc17e88e64d00701a0ecc0584dd0028b2a2819319451a03cb63418cc39de102102ef00a57ec6bd478d5 SHA512 72f933331e4c0e638952922014ec44f5a30e32fce02fc9d8cbc533f358d459f573a70885dc98c443a1e6fc0cdc43d38fc81d6070a5972cf1c01f65623743b3c6
 EBUILD activerecord-5.1.2.ebuild 2640 BLAKE2B 15095dcfd316ba40f377eae9a4302dc822fb6b8767fc0563496d6865e9ab279084a655265f485cbeb02d4d360237bd7414666c3c432a3bf679d6d1ebbca17054 SHA512 8420dd54cbe4475924eaeb51b1f14b5ff27b0a26895d43ab9ca3e2e70bd3697a4961dc64cee5839e6910c28084ca7bc68aa409358ea1f7f0534bd539a068535e
 EBUILD activerecord-5.1.3.ebuild 2640 BLAKE2B 15095dcfd316ba40f377eae9a4302dc822fb6b8767fc0563496d6865e9ab279084a655265f485cbeb02d4d360237bd7414666c3c432a3bf679d6d1ebbca17054 SHA512 8420dd54cbe4475924eaeb51b1f14b5ff27b0a26895d43ab9ca3e2e70bd3697a4961dc64cee5839e6910c28084ca7bc68aa409358ea1f7f0534bd539a068535e
-EBUILD activerecord-5.1.4.ebuild 2647 BLAKE2B 8f447f7a05c5ebfe1c5d6fc970abdae57ef4e69194dd588bb415e62f839dd71589327a245c89bd2a0ded59869e831f4b633ec7871de80140174a55af6b84ca37 SHA512 93d13648de48d180ebd971dc2dfe0e2edcdbd6ff3de69785ea4196702b7dbcf70e4609f5c12233d41c9c55da33aca96cb415a1deb53ccc2d5b57cc03824cc245
-EBUILD activerecord-5.1.5.ebuild 2647 BLAKE2B 8f447f7a05c5ebfe1c5d6fc970abdae57ef4e69194dd588bb415e62f839dd71589327a245c89bd2a0ded59869e831f4b633ec7871de80140174a55af6b84ca37 SHA512 93d13648de48d180ebd971dc2dfe0e2edcdbd6ff3de69785ea4196702b7dbcf70e4609f5c12233d41c9c55da33aca96cb415a1deb53ccc2d5b57cc03824cc245
+EBUILD activerecord-5.1.4.ebuild 2652 BLAKE2B 399413789bf9faf2fbe4116ca0d821841f5b758c990aeb5d041a0e5c6c265dd025e55337f6538aa65edb388ed6bf8e98a98b0e60f3bf839be71089ddb20457b0 SHA512 9c0d204f106e22b8a8cd8abd2e5407ef8ef64b3ef854613c53a63187137e587f16dbd3e784c099d71baac62b3a8b8e06f86e93c29d30926c18931183d8f55ce7
+EBUILD activerecord-5.1.5.ebuild 2652 BLAKE2B 399413789bf9faf2fbe4116ca0d821841f5b758c990aeb5d041a0e5c6c265dd025e55337f6538aa65edb388ed6bf8e98a98b0e60f3bf839be71089ddb20457b0 SHA512 9c0d204f106e22b8a8cd8abd2e5407ef8ef64b3ef854613c53a63187137e587f16dbd3e784c099d71baac62b3a8b8e06f86e93c29d30926c18931183d8f55ce7
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/activerecord/activerecord-5.1.4.ebuild b/dev-ruby/activerecord/activerecord-5.1.4.ebuild
index afc6abcadc54..cf6edd4bce89 100644
--- a/dev-ruby/activerecord/activerecord-5.1.4.ebuild
+++ b/dev-ruby/activerecord/activerecord-5.1.4.ebuild
@@ -22,7 +22,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 
 LICENSE="MIT"
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
 IUSE="mysql postgres sqlite"
 
 RUBY_S="rails-${PV}/${PN}"
diff --git a/dev-ruby/activerecord/activerecord-5.1.5.ebuild b/dev-ruby/activerecord/activerecord-5.1.5.ebuild
index afc6abcadc54..cf6edd4bce89 100644
--- a/dev-ruby/activerecord/activerecord-5.1.5.ebuild
+++ b/dev-ruby/activerecord/activerecord-5.1.5.ebuild
@@ -22,7 +22,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 
 LICENSE="MIT"
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
 IUSE="mysql postgres sqlite"
 
 RUBY_S="rails-${PV}/${PN}"
diff --git a/dev-ruby/activesupport/Manifest b/dev-ruby/activesupport/Manifest
index f0ada7d3398a..154ade9d82fb 100644
--- a/dev-ruby/activesupport/Manifest
+++ b/dev-ruby/activesupport/Manifest
@@ -10,6 +10,6 @@ EBUILD activesupport-5.0.6.ebuild 2561 BLAKE2B d347c2de1f244bd869eb010a759d89a52
 EBUILD activesupport-5.1.1.ebuild 2202 BLAKE2B 77ef796d8afc9ca3d94f10a55dbaa74a55b20976b566396a4b5f91cdb09b898569b36bd9f8520c625254e5c9a12c27f53e2d3a586ec5bf0adc134dc4d40c0a35 SHA512 cf29ff2bc2ca3328e0c94c5ab6569b6effc4a17ce3e7f82e6455bdd1b605a8915a66f9e0c737cc00a1e0f86ac0676d300f580a5b6ddc73c492c21d8d22604c5e
 EBUILD activesupport-5.1.2.ebuild 2197 BLAKE2B 12708195a41fc95dd921d8c08dbce1307ebec15e771011ccd47fd61ad919b9e57f7148dc9a3e70c48155df9c69863d942759dcea4a40a1db52bca880e8c877ae SHA512 e548c5d968fc502b520e895c7e7bd44a404c670ca8e71f7acf806ff2da1d95eabc88ebb98aa34e648f64ab5014c45150a1e1c8c72ac11e7d38187458bf459573
 EBUILD activesupport-5.1.3.ebuild 2197 BLAKE2B 12708195a41fc95dd921d8c08dbce1307ebec15e771011ccd47fd61ad919b9e57f7148dc9a3e70c48155df9c69863d942759dcea4a40a1db52bca880e8c877ae SHA512 e548c5d968fc502b520e895c7e7bd44a404c670ca8e71f7acf806ff2da1d95eabc88ebb98aa34e648f64ab5014c45150a1e1c8c72ac11e7d38187458bf459573
-EBUILD activesupport-5.1.4.ebuild 2203 BLAKE2B ad57904a0491c25dc3413e6d86ea1fcac46463731a7afa966f5439c0262716cfa33e167adab82fc42c4b604a65f619cff25dbc793acaeba3b4caf308f8192908 SHA512 535f6e3f83f0706acb40f446d1fd209afdb7a08f0e913fd823b5fb475d7060d26c28342cc10266a642a3fd12068480220af6c4ad4a4060d09abea65be2002a11
-EBUILD activesupport-5.1.5.ebuild 2204 BLAKE2B 5b81049930f65f503b2bca870d676a777ee90ea1694e4b15a5ad278e312aa5d8ccea57b7e61c2a9ca2981c6ed8213652ea3f1f8fe763800bc06c109599f5eb0e SHA512 f56edb634cc78e0dc2843f287383238c75f3bd9c5b82434addd2474b690cab5ba8e2c48dbdb7db89a513be680aea696ef66500312de577b66b01d5ff9f640dbd
+EBUILD activesupport-5.1.4.ebuild 2208 BLAKE2B 4234dd53400445c24d8f3cfa90871f7ca0948292d2a2199bca3fb20d5e1d04fb297d740b2d618f6656b1782b0748216e51477db2f0e02248e98e1e63f6b22eb5 SHA512 c193e61019894836c20ff9999b6576b4d72d6f85e6f7ccc53ccf3319f41138e2caf0b66a2ff5fe4bc058efc29c4547aac6dc63bc3c95233827158a66b31b9747
+EBUILD activesupport-5.1.5.ebuild 2209 BLAKE2B 1d361b7f696c164de120a4fb20627f2061a1eb2c9b60060f535daea82629340bae081c2d55e3ecee42e57278ddc01f74c69f74f4f04a1250278095ffe35c04f6 SHA512 4936aec39921e2fba86d91d4382efb94a9687ea72423fb6eddec9115e3addca308acd07cf21fa4d852555c5d08f080a2f04c191669bf5ededa68cc4709a9007f
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/activesupport/activesupport-5.1.4.ebuild b/dev-ruby/activesupport/activesupport-5.1.4.ebuild
index 2035dbdebbfb..f453da60d8b7 100644
--- a/dev-ruby/activesupport/activesupport-5.1.4.ebuild
+++ b/dev-ruby/activesupport/activesupport-5.1.4.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 
 LICENSE="MIT"
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
diff --git a/dev-ruby/activesupport/activesupport-5.1.5.ebuild b/dev-ruby/activesupport/activesupport-5.1.5.ebuild
index 773f52432ed2..df2fb3822f25 100644
--- a/dev-ruby/activesupport/activesupport-5.1.5.ebuild
+++ b/dev-ruby/activesupport/activesupport-5.1.5.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 
 LICENSE="MIT"
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
diff --git a/dev-ruby/bcat/Manifest b/dev-ruby/bcat/Manifest
index 10ac3b163649..c1e49a7a4a4b 100644
--- a/dev-ruby/bcat/Manifest
+++ b/dev-ruby/bcat/Manifest
@@ -1,3 +1,4 @@
 DIST bcat-0.6.2.gem 22016 BLAKE2B abfaec6d9db25990838019d0e9f4dde918f260c01340e34ab272f8a2e02155674ca38bf91843925df31102982cba02ada69abbf7e9ec4b91d4f2cb87b27be339 SHA512 142f853ca0931e5ba300276b1db0977fa275b9b13602940fbaca2c5d32ff881fe753dee25632526a348d71cf71eb6e390aed821b4ba1f48e380d6369ad87ead7
 EBUILD bcat-0.6.2-r2.ebuild 1151 BLAKE2B ea09e5effd9737b7d13c8e4ceef47e733396b39b57d55abb781aecb7628a9e56767c7ab9b58494177e8a481c029987affec7d0533fb82301d807afb2c742bfae SHA512 029b9def0b3601517184d45c383c996a22b6a455aa19bd88bd7c5a2f6caacf647b282df7cdaff95372cc500d033b37519e3499343d26d99bba6ffea1e30fd333
+EBUILD bcat-0.6.2-r3.ebuild 1148 BLAKE2B 9a1a8e6e29cf540d112b1c632a903e84900261e84f65cbff4e1b70c8349f4b464105e2a06db009c640c9b7e858f18670200bac0776601a5062ebf83e9ecc40ec SHA512 ef4eb227a9a01fabf70eb4a2f66ee74d7e7a477df2d29992cdcb58270f39022b7a48a76c5480293958e4c4d5151caaed1828be5ff49e3b3d4ca8514e59cdffdf
 MISC metadata.xml 339 BLAKE2B 747035022afc3a66f3a64ab7614290ebff948570e77f0a184eee2cdf20f838e92a6608569714b0c3672660019b1e6002ee65afa3d88e5fc497e147c59cdd2f37 SHA512 e128341196b2b542a7d3a7cdbe576e667ec176b3e231a627cedafbaadac4ede41fd6710722ca880551cf9635e9a8768cf273a6784b276647cf4db250404521dc
diff --git a/dev-ruby/bcat/bcat-0.6.2-r3.ebuild b/dev-ruby/bcat/bcat-0.6.2-r3.ebuild
new file mode 100644
index 000000000000..122fdba3d69a
--- /dev/null
+++ b/dev-ruby/bcat/bcat-0.6.2-r3.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+USE_RUBY="ruby22 ruby23 ruby24"
+
+RUBY_FAKEGEM_TASK_DOC="man"
+RUBY_FAKEGEM_EXTRADOC="README"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Pipe to browser utility for use at the shell and within editors"
+HOMEPAGE="https://github.com/rtomayko/bcat"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+IUSE=""
+
+# Collides on /usr/bin/bcat, bug 418301
+RDEPEND="${RDEPEND} !!<app-accessibility/speech-tools-2.1-r3"
+
+ruby_add_bdepend "doc? ( app-text/ronn )
+	test? ( dev-ruby/test-unit:2 )"
+
+ruby_add_rdepend "=dev-ruby/rack-1*:*"
+
+each_ruby_prepare() {
+	sed -i -e "s/a2h/#{ENV['RUBY']} -S a2h/" test/test_bcat_a2h.rb || die
+}
+
+each_ruby_test() {
+	# The Rakefile uses weird trickery with load path that causes gems
+	# not to be found. Run tests directly instead and do the trickery
+	# here to support popen calls for the bins in this package.
+	RUBY=${RUBY} RUBYLIB=lib:${RUBYLIB} PATH=bin:${PATH} ${RUBY} -S testrb-2 test/test_*.rb || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	doman man/*.1
+}
diff --git a/dev-ruby/certificate_authority/Manifest b/dev-ruby/certificate_authority/Manifest
index 6db1f0b37f49..029194cd4bbd 100644
--- a/dev-ruby/certificate_authority/Manifest
+++ b/dev-ruby/certificate_authority/Manifest
@@ -1,4 +1,4 @@
 DIST certificate_authority-0.1.6.gem 22528 BLAKE2B 85b229c7506b787b85b734883967dd8e6fc4ceece57dec2b2b8c29fffbaec2d95931af5412d61ef9935e547b68b14213e5cc6971f94ad6294476cc653684742b SHA512 d1471171aa01956ca216bdb8515e9f6fafc9720827e7351b14c7c38907e87b66a3299d9ee0322fb51b8edd1cbc4f4a73a2aa4b54ff5ca4c8bc602ced5e035a59
 EBUILD certificate_authority-0.1.6-r1.ebuild 759 BLAKE2B 52e03407607493d4ac465d62812103327876c5687a6a5ad8a0c3065a377226736c6adbdf24d188dc68653267d6f1b3c0c828a3aa6c39939c066d1d867b09826d SHA512 28692a715090e2bf8b3db4f568c9983b91be366551e38144ff490f32630e7481b43f9b9650f2b922072b42b7d0cc18c34a357be6f438d7c0ce4765c693deb446
-EBUILD certificate_authority-0.1.6-r2.ebuild 760 BLAKE2B bbe0179cc3861e0ff7f01e2d4d528dd0061b5b73f054439910e82a64f9523a67738afa01053b54da3d2e9f30a090e90e8f94ba551edb84bccdab01c35fe42442 SHA512 a5cec5c9d91c13797916e6fa2537b8c061862562e740afdc6e4fb8f8258ea1520e207376fb4085698ec145de4d2ed870ecf77aed7fed0b8e9bb9289753c05d8c
+EBUILD certificate_authority-0.1.6-r2.ebuild 765 BLAKE2B 01cc05f86f53c4995de22bbf7bbb899eeab2e8a825b8530809de39d1d237f811f5c8ca1506b4e6b6b0224301165f17c2ff8422a9602653ae37d0d0059698a69c SHA512 a9a4d3168cc8519afca4401ff435c87874ab47c5b503b999e28d28bd674472d509c00b6b47bf7cede153098bdb80915e53a81b60490a613863d7dfd1fa0ed8aa
 MISC metadata.xml 357 BLAKE2B 5e69b9b9001e7dcc322333c2cc3f451afded531e07b9942eac2dc59a6c61ceba864f2799487345cee4b5b0540b5952c7c312dfaa9e20f9b1373c4bbeac57c33c SHA512 e0e2a1493426c800a142ccf475ab1d0ab60511b30c28fd6bc927d9672281f6377eaa607596acb6b9b1fd2b949231b4a1b01ce8137725f5f4632ffaf7b62eb932
diff --git a/dev-ruby/certificate_authority/certificate_authority-0.1.6-r2.ebuild b/dev-ruby/certificate_authority/certificate_authority-0.1.6-r2.ebuild
index 319ff73f1d1f..0e63ad3ac9a0 100644
--- a/dev-ruby/certificate_authority/certificate_authority-0.1.6-r2.ebuild
+++ b/dev-ruby/certificate_authority/certificate_authority-0.1.6-r2.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/cchandler/certificate_authority"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
 IUSE=""
 
 ruby_add_rdepend ">=dev-ruby/activemodel-3.0.6:*"
diff --git a/dev-ruby/cliver/Manifest b/dev-ruby/cliver/Manifest
index f065ff821af0..6286be537060 100644
--- a/dev-ruby/cliver/Manifest
+++ b/dev-ruby/cliver/Manifest
@@ -1,3 +1,3 @@
 DIST cliver-0.3.2.gem 16384 BLAKE2B a96637b5da20ebc28a29479bda76100b2ce7dac1c3620509c2891ffad8f195a54dcb381190a22abc02d1e3df1d69bf9ffa194e19c836115a70232fa7a783ecb8 SHA512 db0eff5119b84b4390f0c2f3e68cab891daedbf06eae55267c798787172734d3355cd82f2b6775e54fca26ed54c6ad4688743af588c76aa0ec6507a77443362f
-EBUILD cliver-0.3.2.ebuild 400 BLAKE2B 1612cbaef8599b54761b0e430aa8c0477920e00a01e4f24be50dfdb88319f19e6365694a0b5c71daf3da86befa211d9f35563cb9578a8687a24c266a68dc0d32 SHA512 4db328c65c1c0602e725bf426adb64e2a24b2c82e39d88f3b9edfb410bac71a5b80e2b4ea9de61a13005c3a7bb492ccaa7a4528d71e5e08ee442c4f5ba0c0d66
+EBUILD cliver-0.3.2.ebuild 400 BLAKE2B dbf137755229cc4acca679933adbeed7e44b6230db248ed08436b3cffedd9df86490bd465c6db28db49879bc5e316a267241b26a836cd1592c2b417e46ef0b3f SHA512 6e26fc6533b8a80e53a939490e248d494da692a8848e4eede6fac64ae6d525c677624668d01b2da9c4295b00676ae3787f636959dad3024010aa6760d3615d85
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/cliver/cliver-0.3.2.ebuild b/dev-ruby/cliver/cliver-0.3.2.ebuild
index e25206853037..c8e2cb7e7012 100644
--- a/dev-ruby/cliver/cliver-0.3.2.ebuild
+++ b/dev-ruby/cliver/cliver-0.3.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec"
 
diff --git a/dev-ruby/daemons/Manifest b/dev-ruby/daemons/Manifest
index e5376f15c5a4..79cd1e995b6b 100644
--- a/dev-ruby/daemons/Manifest
+++ b/dev-ruby/daemons/Manifest
@@ -1,5 +1,5 @@
 DIST daemons-1.2.3.gem 24576 BLAKE2B 23cd623c2f9c84ba182b0d1eeb5bdccf9273dc5f0d41cd51377abe7fe1c29e6c7bd342afa9891a54638aefaa4bd1353a3183516bb4355eb93772de633e2db05a SHA512 05acecc07bc3f760472453dd11eb0231b9e7f2e04a783ab44dacecf9c666d01122d27fdb782d9973f475bc378e0e3e51795ad58e221f29b201b1ba5e0de1e277
 DIST daemons-1.2.6.tar.gz 27557 BLAKE2B 7c08b637ab37f764309fd260c4ea6c11402b89ea327eb47ea0af3860397ece795467a11c4ae5d8577972f5d8e2c6590f4d8112027f06db941b7181e33c158736 SHA512 8276685a684093252bf136c552a613a5208f4ab34f178be9425c62ea59fe1eebe671a7dd6c57d30744187b9ae58d7a7f1ebf58468e988565a30ca4417f2a90ea
 EBUILD daemons-1.2.3.ebuild 689 BLAKE2B b6481ed945f1d6d35089f5d0b630cae361da7e3bcf4ce39dca45540aef6ba93e87196abae160d7b9061d5d689270349b3de0260a6c0fbb194913287819e13383 SHA512 888620fe4d6e4d073b48028fae6d211e1c51fb81cb5556a8d49227f8d7fc42f21e77181da4b3396cf575cd90fea879416be3f773120df4c7a2a2d57e20a84e5d
-EBUILD daemons-1.2.6.ebuild 880 BLAKE2B 1bb114126b95b5b5cf62390276083123aab210040ee47c0d85b8807fe25fae3546fa27a6d5707d6874ba620e0cc253e7b72c6e33720d09d64d9d50da4af858bb SHA512 d6903e999e7df2ab9df9f01bf396a50366e8bbb83a7875aa36f6e259d7e797ba55e77f2766363c53390208e2bd01e8db68326e23acc3a4e7656f43a5f0af6eab
+EBUILD daemons-1.2.6.ebuild 879 BLAKE2B 75e23d9082bc83ccd4aae8eaea00f16b2d8dc2e20e4dae0a8884efdf0e7814d0d3a828040812713d44271c7f3b8dc6ce1cac4d6d24c9856452c81dd5171ae70c SHA512 d50124d5844a92190d5b76665918029fa488b716343f948d4a337c2754792d351c42027508b64c3adb9c6434b4ef1cea0f1faeb55efc2a9b1dfb7fe89da56bc6
 MISC metadata.xml 345 BLAKE2B 7e783ce974aa702ba94e5d1d1b17646297e1db1c51d4dad02408e678092afb21647d8a21f0beca7d8e03f4c5271e3f63f643e3d113bd1d89ca927110b9d447f6 SHA512 c6e30f1117d3ebc21e91cf49a6e4952f3cadef673c1a624f9b5cdd4bcf036f1a4d25120799ff72896b2bd38386fe251e72b27028e2a31551716f21bc90217cec
diff --git a/dev-ruby/daemons/daemons-1.2.6.ebuild b/dev-ruby/daemons/daemons-1.2.6.ebuild
index 8ae039f5336f..7ef3a71dc048 100644
--- a/dev-ruby/daemons/daemons-1.2.6.ebuild
+++ b/dev-ruby/daemons/daemons-1.2.6.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/thuehlinger/daemons/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="examples"
 
 all_ruby_prepare() {
diff --git a/dev-ruby/fakefs/Manifest b/dev-ruby/fakefs/Manifest
index feb352e8d4cc..3867279e9d0b 100644
--- a/dev-ruby/fakefs/Manifest
+++ b/dev-ruby/fakefs/Manifest
@@ -3,7 +3,7 @@ DIST fakefs-0.12.0.tar.gz 45573 BLAKE2B 8fabed4ae113da67a3e7b61c6b4c400d1e20509a
 DIST fakefs-0.13.0.tar.gz 45866 BLAKE2B 0c31b6672aed70d00b5372a6b43045ebc1037126b81fe8cae8b139c1298fe833b42b09255f3c64148a6073d0205759786e401c6c34cdb5054295a2f654ba2584 SHA512 9df14a3d7ec2cdd92126eedf7663460caf21ad017f5db8a941fe8489ca3e3d16b8dd5fcb41d92b45a2895d18e18c9dd705d70e9b2d7895edb2f4430be7e6a0fa
 DIST fakefs-0.13.2.tar.gz 45978 BLAKE2B 7657904f7732f398fbea8eaffc7fed375316be8827d015121215383f93524d683dd2f957b067e796a795b97e3c697b95ed1f317743d3b111e0ae9b6afe1d5740 SHA512 9d1aec7c750a70b8c27543481aa431c42df1436d1cd59af5feb0cde4bdb7491907ed856ffb991d4ca8a8147a521cb35910f8f9de9d80426ee4432a20090003b2
 DIST fakefs-0.9.2.tar.gz 42792 BLAKE2B dc2037960f9aa05f62e09f8fb98f7b115c6f63af56436573ce88bc66fee2cb42f1e362ceb2de7f17b21701b884ad8bc7c6ef5170a7441fcc16fb16977cbb1b4f SHA512 ba68f9d240d54379ba8b16dcb3e375b586c50f78a081a916151d21af2d6d8b61471fdc842ad91d1390e8dcf54b0744e95ba4794a5ebc915858886ec47f9dbb8a
-EBUILD fakefs-0.11.3.ebuild 1103 BLAKE2B e3c86d6caf7e25da8bd2c09e22ac6bb4436af4146b1fdb8680742dcacbbb170e862d47f31a5fae031d42ba426a66f819da8562982e074521b4a56efbd7b924b6 SHA512 cc4f97cb868744213337d86970aabcb0f3225471a4a33276d70aeda882619cd1a012b648f6b96eb51e90acdc6fc5aa9af88728a730aa2c9653df142b6442d642
+EBUILD fakefs-0.11.3.ebuild 1102 BLAKE2B 51bf2df0f8b61dcba12a0e1cd69313c36c97572646dfa55b1fdeeae6ebfbaa3da15d4ebc86022062d560358cc3584aea26524057799551ff31448c84a9acdad3 SHA512 a10d8ee3dc393cdbbcd45d0f744310705ffb83acf22e36d2d25123e4a6f505a2c9502cff99043cb88ece02ba58ee39a0599862301b72b58d8608c59709597d6c
 EBUILD fakefs-0.12.0.ebuild 1104 BLAKE2B d0a7970702ab9fef9e3666d69709e06c7241e0c9d81f4fde6533a44fe1e001bd97846646641c72f5b3e21f3e87d5b3abcf0d3ea8bcca6ca85c93ed3ce0a541b8 SHA512 9819ba0565b28adfc23239f4199a6643814fbef45f28f080e3d48e7cdd21f395dc84556265513f0e81dfe421ac0ff2852a422292f65d5b45bee814ae1f0cb69e
 EBUILD fakefs-0.13.0.ebuild 1104 BLAKE2B d0a7970702ab9fef9e3666d69709e06c7241e0c9d81f4fde6533a44fe1e001bd97846646641c72f5b3e21f3e87d5b3abcf0d3ea8bcca6ca85c93ed3ce0a541b8 SHA512 9819ba0565b28adfc23239f4199a6643814fbef45f28f080e3d48e7cdd21f395dc84556265513f0e81dfe421ac0ff2852a422292f65d5b45bee814ae1f0cb69e
 EBUILD fakefs-0.13.2.ebuild 1104 BLAKE2B d0a7970702ab9fef9e3666d69709e06c7241e0c9d81f4fde6533a44fe1e001bd97846646641c72f5b3e21f3e87d5b3abcf0d3ea8bcca6ca85c93ed3ce0a541b8 SHA512 9819ba0565b28adfc23239f4199a6643814fbef45f28f080e3d48e7cdd21f395dc84556265513f0e81dfe421ac0ff2852a422292f65d5b45bee814ae1f0cb69e
diff --git a/dev-ruby/fakefs/fakefs-0.11.3.ebuild b/dev-ruby/fakefs/fakefs-0.11.3.ebuild
index e0c66f739dea..f84d3dc12733 100644
--- a/dev-ruby/fakefs/fakefs-0.11.3.ebuild
+++ b/dev-ruby/fakefs/fakefs-0.11.3.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/defunkt/fakefs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 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"
+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 "
diff --git a/dev-ruby/globalid/Manifest b/dev-ruby/globalid/Manifest
index e57f9543865d..554205c3e1a7 100644
--- a/dev-ruby/globalid/Manifest
+++ b/dev-ruby/globalid/Manifest
@@ -2,5 +2,5 @@ DIST globalid-0.4.0.tar.gz 18087 BLAKE2B f720a5b760d5a82726155b67ea82977ffcacc10
 DIST globalid-0.4.1.tar.gz 17924 BLAKE2B 6657c916049f841f472f6320868287451d061f96501f5a2b4df8fd71512f5752d5568185c8166344494fa3f6829ec0047f54235c8ea4e01b040653b8699d0484 SHA512 da484c6c7e8155416d008d650929c6b72981d2ae2d1654eb02e414838a065dad9b4ba3c6e275abb008a0d9cad1e2d4d5295d90807c7d7fc73e55b7071c0fd657
 EBUILD globalid-0.4.0-r1.ebuild 705 BLAKE2B b2d0a9eece761b2c09af255625e25706bdcd8245cbb2961b27f2aa11f1b19e264a3a3373153a66b92db4e770820a509adfca0311de4fe3fd285d5536441eefba SHA512 ad8d7fdf4fbcd64a6aa343703a063d65df3e519654c6eb974995f2cd29458cc8d4db2c664bacadfcbf512a7d09e82062a90dde1313954795ac83b6aaade32fba
 EBUILD globalid-0.4.0.ebuild 703 BLAKE2B 5667cd38122c0a647a90ae43ae4f497daa5fa95240f943ca348d8a605d6c8158d810410390f581e5fa290286bcaca5f6fbd16df850cd5049d8f77b209c74f218 SHA512 df8b066f1e9f51daf813523fd8217f401ccbe7e13e9351f05cf438c636717fd3e2723893696bcdf75bd7085633b7bea87782f1b3e699d1179aae7df1c6052316
-EBUILD globalid-0.4.1.ebuild 698 BLAKE2B 6fc00915869b413ad4024fc8fa2d0c2bf85f10da5d14fc1eed1a9b7ee1566ed9cb504c9bf63a321975d9fa013b4028576b36dffe3a043a81feca585f42d32f74 SHA512 f29d2a66429e5516edb41800144bca38097ed2e592f706ab6c3546ace347b61be17c9feb3b8ffe76f286a8d259b8f8135ef1775772eb960478014cf3e1724e36
+EBUILD globalid-0.4.1.ebuild 703 BLAKE2B fd21fe8350e7444a11b9032a92cb6701b0026bc82f087713f83b1520fd4da7d97f2e3bb550b143514c5cd067e3735c6314b13ed185e56a86c1e3647359e3c771 SHA512 a79bf27852fd144611169cb8435bbb009a520651d7d9d0f1b30079809207819002a8cbf1d0b28598b48228be6e0cd3b888850a2b25bade03054441f9f52dc9b2
 MISC metadata.xml 340 BLAKE2B c8aa9febd2a1238630c8d42d1670d1333a9c9b8ad8a1195bc49518b4b90e0c5238e8d3859a71a304629c8931b7fa286f805b4eabd1b0782263c689888d168546 SHA512 31207f04b56e2be06ebe5367d496e8f7e9c73732cd0fa852d19bb49cfdb7b53ff30d23131a53ec9a9ca8c7aee8f8d0b4d74cd896c7e407a8b6aead17f06e106e
diff --git a/dev-ruby/globalid/globalid-0.4.1.ebuild b/dev-ruby/globalid/globalid-0.4.1.ebuild
index 0a0553c192d3..fc9841d9a3a8 100644
--- a/dev-ruby/globalid/globalid-0.4.1.ebuild
+++ b/dev-ruby/globalid/globalid-0.4.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/rails/globalid/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
 IUSE=""
 
 ruby_add_bdepend "test? ( dev-ruby/bundler >=dev-ruby/activemodel-4.2.0 >=dev-ruby/railties-4.2.0 )"
diff --git a/dev-ruby/hashdiff/Manifest b/dev-ruby/hashdiff/Manifest
index 0336eefb1c61..309ba6cc7627 100644
--- a/dev-ruby/hashdiff/Manifest
+++ b/dev-ruby/hashdiff/Manifest
@@ -3,5 +3,5 @@ DIST hashdiff-0.3.6.gem 18432 BLAKE2B cb7fc00fc39099ca624177d82129f27ab51a660a03
 DIST hashdiff-0.3.7.gem 18944 BLAKE2B b7d39375a0c688e4fe2672701d87148b6ff6ee18fcc58b68f71a4c449613c124022538a04ae9a995d2d20e9d40e0ab263664f1085dc205286a3bd3595c83c760 SHA512 62cbbd1631127f98be214ab5c849d4a78c9f9aa762e372412a68f843df09caa9bb3b8ff096952ff4fe5b401dc8fefff7e42c2d1beb7e647ed9216550ecd06d93
 EBUILD hashdiff-0.3.5.ebuild 642 BLAKE2B c214db22967099a62f40716869e84e8f8b2746b07528494f1851c9a6b413dbf84cf06f5e56261accebd7143cd6fcda182f23700c45a31e1afdc3af6367d26007 SHA512 b70af5ac0b9879d0c8fa165dfd9d642d80ea8e6a7f43823e2b65ff3bfdf221c00434ccaffaa0012a93f0149cbed100a31192568742393145ca517ea46d9a144b
 EBUILD hashdiff-0.3.6.ebuild 643 BLAKE2B 46f56cc3cadc6a62b12ff6d35843331b8d9788fdd5fc27530316fd8ab92457f0b1060b8c43f70e8aedb6e3305cfb95ee77e0557aa12d7106e0a98986c6714a87 SHA512 b20e150e15577224de50d73c4427110a38986d45b942486aea13f01cb9bbd96063206a7e7503bcec260602aaab341f7b975abfc7e14d5d7e8fb4d28acdb125dc
-EBUILD hashdiff-0.3.7.ebuild 654 BLAKE2B 7990341634845c2e70816a203d6d7f1caf6095fe67c25d7434d8453f9f04265856953fbb2af95e71d9165af6b83e153f931e19e28c3749ae51300b7898163483 SHA512 78d1f8b5aff1c94383e00a9ce550f7417e1c033fb34747fe0390bb0f7603d39a2bc66e2dc6adcaf91fd797a756adc652a08dff1bcb02133a91fedddb54bfb77f
+EBUILD hashdiff-0.3.7.ebuild 659 BLAKE2B a9b6fec64bc65d8596e4f568097c8ba91743f8e4572ab4b877df1aff386e467643b3a76c6e27eb6fd14cf245ed60b955194a20259fe0b2b02d5ff638d9dddb3a SHA512 d70f477f5e9540a7b6550544cb3490e6a383cdcbdc96cbac69c7cfa5e7152350cedc082cd9bacbc29e5723c9e7c368cd2312502bbaab706087a1544f73f5485c
 MISC metadata.xml 345 BLAKE2B 32c55c352e09a4cee12f02ca321e7581b56faf759bd3cf95afc684633c7324bd10c19fb832a1d7cb3e96787721eae0f0bd85428fccead003ba72fca53882ba65 SHA512 f241e4bd08fb29d4a2538d5b548597c5869c0bdf332e3453e55c625093bde7c52b35e7a7bcd691b9f5b2bf2cd1c90ef244d23e343cf7800f9fda4de73f6a4cbd
diff --git a/dev-ruby/hashdiff/hashdiff-0.3.7.ebuild b/dev-ruby/hashdiff/hashdiff-0.3.7.ebuild
index 36e1632676ae..5fb314398050 100644
--- a/dev-ruby/hashdiff/hashdiff-0.3.7.ebuild
+++ b/dev-ruby/hashdiff/hashdiff-0.3.7.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/liufengyun/hashdiff"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 all_ruby_prepare() {
diff --git a/dev-ruby/http/Manifest b/dev-ruby/http/Manifest
index 694bcb0b9a55..50e0350a8abc 100644
--- a/dev-ruby/http/Manifest
+++ b/dev-ruby/http/Manifest
@@ -6,9 +6,9 @@ DIST http-2.2.2.gem 67072 BLAKE2B d2aa0f155085b60c3a65af6e5cda58632708f1aae000d9
 DIST http-3.0.0.gem 69632 BLAKE2B e02ddc7e7f2747c2b20fc90b38c1c16c315eda8b800d93148aa0cb1ac0194c2fd5742fa346b18a8f60d4814db7d9e0200ad55c94fd2f8f2cb2bf29d50a22da8e SHA512 ef8c4148b68838e0669d5012c3548d373ef99d9273eb2ea25e7e0237027c766ffdbcdede766eb890f042b7211c2ed953688a372c46b120bf0bbd045c06b8aec3
 EBUILD http-0.6.3-r1.ebuild 669 BLAKE2B 3ad469ee00e4385526f74a1bcd4f885e9fe27080eb639e46f10336a9c19e2fd1e8c5d74d04e9e5e77e251f335ae19355d193b54502edcfde0693c1f1b092bec8 SHA512 5bb6b432c6aafcaef4175ea63cc7e7ddf957d841d5504a98f22f82247b5f5ec6e707ca8f0d93544793d7844c9ae40996547dad84b62bd397fff5618b1a2288b9
 EBUILD http-0.9.8-r1.ebuild 1080 BLAKE2B 07d3edeacac51f80a0d0c578069c8efc0d2c296564297a662a04fce5297bc74db8200cb229a3065c30e492cb38fb866a7b0ce900f9f39d9c5aac8cfbcb5174a6 SHA512 5356640951e4d5cc165269cc93f11dc487e41df050ced3381086db094f86685e9549fe3e39e46946e9bff1e6e03a11df35f15270d3e0cbf58b2c5bd30978845e
-EBUILD http-0.9.8-r2.ebuild 1074 BLAKE2B 510409a747bd730f24b80ecb9694403809db8115c79cab409f7d5a439e48d8b605f5745dce577544a78384484d46660b33222a8368ca31caf08b87b8316d752a SHA512 e2da0eef8f8a73bc937d87d1978357fc43e5ed862e6330af33e463b9ccb4309fae749a2d90e24d2e49195c2b1f0c01fcd0fecff0b56c661e2af4afc54f6106ad
+EBUILD http-0.9.8-r2.ebuild 1079 BLAKE2B 0a6e4c30901542b3ca659b19a7308eab8b7dc6aa63dddaa111fe922b14c0db408d1c9c4d22c821038376100b329a3ac2c298e5ed6a036481464bbd49e8d6a715 SHA512 bf9e8e66f026a7fe1a82536fd21d3607d070e58c9d657bee9a3f58ce30b0e3f0aca3ad6445eac61128deafa3eae5a1a2452646cd3d66631769dd64f336172267
 EBUILD http-1.0.2.ebuild 1066 BLAKE2B 8254d2606eefeb6f3088fbcd8a3b40bf5c81f19b8e70c45ae246af3c517ae33041ebda64c7838186842f0ab3146e0d60f7e88abe70a4708dc97ea74eab6ed7c7 SHA512 61835402afb957f5e5d0659edbf7fd7457c2801cd2c9f151e87de4bf3ca57bd0a21729e1ba2ebf0490c8586c472311fe299d54f478d03cc6dfb9ee0f72d67a39
 EBUILD http-2.2.1.ebuild 1227 BLAKE2B e0ae3652c9754f7ade9fe1ef6f4b95efd1ef51c741a337eefbd200c264931963f11f0501400936eb11d7790866b67a1776d4b1e3975d2c9ae01c220f966a64ea SHA512 4aba63dd64f40a6e8a6dd2acf6030534941d04caee3e7758efd638cabd7b1fa3f23e98071d08b1ce7c9eb7ce2b90dc99a1708dd8f53e200b531ed82a9d7eafe0
 EBUILD http-2.2.2.ebuild 1232 BLAKE2B c15bb91342baa306872e609cae8546b30ebedaa8c0388859f94c597b3a3fdfb08f50cb60e14cbe8df34cb8c0389a283f60a0beaf303068fc38417e62ef2e7222 SHA512 e24e112a1ab81d744c8046561c1314b57439c67654250542cae7921e7fefbf716610e1bd3775936fdcfe8db0c9c72b56c8b12a4229c5ae342d1a916675c3d3a6
-EBUILD http-3.0.0.ebuild 1223 BLAKE2B 36d5850c7579c700e92fa0389ff2aa231cdb9172a81cb0e78a4f75fe67def4b31c5f264bfcf1dcb3df57ce0452a17a2794579b6760067e26b618e683dd1dbfa5 SHA512 bf3aa92616db3233f59e1e1b9adf99b44bb8f4fcc8e9a595430ba7cd203c7f8f0c544508851c2f6150eb20f9f2d9a9fb2de53ac09cd2cc3639477c34ce97cb95
+EBUILD http-3.0.0.ebuild 1228 BLAKE2B 581bea6ff67449d0bacb2eb8038b38405ed97cebae6be2108a8194eec267932ee9f6014743eddfcc9138076bf507a36f0eca4d64577dda7100f83146697d3f52 SHA512 4ab960efe6d5b79b49af267d9a26e233d49d278fb3f839a9c9052ffe74bbfb96976bcdd5c00302b0c7cc4399a78c25867f4c7a548b8ad903c4700387d7ecc97d
 MISC metadata.xml 339 BLAKE2B 2508769568914caafa01e9e8e6517a7cf9c1733c772b3c605c8dbb056efb8dca3be9525e1ba2ac610bd6d5b5dc02b7625f3569dce0597444240bc2ed8d8449c2 SHA512 9b43a2f61eea32941c251429694bcfe432f284527c332efdaf4187c9ad8c6f53cd924421ca9d56cefce75cbaff104d4f7579790fe09b45a4cced06bedc44d1c1
diff --git a/dev-ruby/http/http-0.9.8-r2.ebuild b/dev-ruby/http/http-0.9.8-r2.ebuild
index eb1d54271b80..f37b18283969 100644
--- a/dev-ruby/http/http-0.9.8-r2.ebuild
+++ b/dev-ruby/http/http-0.9.8-r2.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/tarcieri/http"
 
 LICENSE="MIT"
 SLOT="0.8"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
 IUSE=""
 
 ruby_add_rdepend "
diff --git a/dev-ruby/http/http-3.0.0.ebuild b/dev-ruby/http/http-3.0.0.ebuild
index 4a7cdf3e37ea..290fe8f716ff 100644
--- a/dev-ruby/http/http-3.0.0.ebuild
+++ b/dev-ruby/http/http-3.0.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/tarcieri/http"
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
 IUSE=""
 
 ruby_add_rdepend "
diff --git a/dev-ruby/listen/Manifest b/dev-ruby/listen/Manifest
index 05e56d2c3ade..cac384df2a17 100644
--- a/dev-ruby/listen/Manifest
+++ b/dev-ruby/listen/Manifest
@@ -3,6 +3,6 @@ DIST listen-1.3.1-git.tgz 35521 BLAKE2B 6b93daff2b3ba221d0c0f196c67353963e983610
 DIST listen-3.1.5.tar.gz 51250 BLAKE2B 8ed941ed72293fad3327f2fb939920f82b02a9c0f25e8b1273961d9bff64830d619e9e97c184e353b69a78fe38be01a2fd2f0453cf94d3ca9fff66e40d18f59d SHA512 132266485d70002da5bd1e680530331db6b74e8ea12011d60a6ba7df0ec045459b5b3a6305bb2ea6a80ff6a4a1244ef935a4143f6c8709df7a176d6db69da08a
 EBUILD listen-0.7.3-r2.ebuild 900 BLAKE2B c31f15ac9a432bddf88e9520c056e8f934f0c5179842f316af808eb64928d25534fb39cf97308f7edec2cb991545482246adf184c2dd5891c2af7b72fa1d08af SHA512 5e0a224f8e5063de13511228857563e11ed3c15a62dccf2b0ce3d3115222e753e003dcd793c21969c4587ec1182c2c4e4fc1f46ea33908af9940f6e40b77c11e
 EBUILD listen-1.3.1-r4.ebuild 983 BLAKE2B 09cac0e3c1892b3c1dd8f3ce7f79390f5f40c7f208bdd92accd5f565ef6fabe36d4076a55bd3805bac6d24ffd6034e9d903eaa46e4433badc57050095f59758e SHA512 ac741414257a549dec77ef8778589ad2e6760eb2f78cb9a8aef885b7dba1aa5cf541eb488c6432b4ca73fa95d1439214a6012530f26c7728608cc828412aec0f
-EBUILD listen-3.1.5-r1.ebuild 1234 BLAKE2B 70509219624ac7451d93518662d6dc3a442380f04b07a0c75d7393d5923e3f7c4ec69abd1fa7e59e6b362e8f85e24ca320355018c4d9334d3a64062bee4c0b49 SHA512 39877362ac4aa1ad7d9a6bef32a0ddb61ef52db9057f70d755462a71ae228072efb2ae98a3b51d09512a17618a89c45c8599323a821147d80551b99c45c5f9b2
+EBUILD listen-3.1.5-r1.ebuild 1239 BLAKE2B 7b99f34669fbd30d271f16269f888cf50db70099b88739cf90256ac14b4daa3b3c9c510f491f17c08d6e09bf2114172c25372554060c4d9bbb6c5ed76fb39208 SHA512 b0e53cc835926b8a7dd3d78301193abbe653d1494e999e072fc56e8857f2a5f5c7971e6ff61aceeec1849f4e77b249792c7df761161d0580bcedccc2b3704144
 EBUILD listen-3.1.5.ebuild 1240 BLAKE2B 05dff2609fffff83d14cac7e29d0db5d766ccd2ee0d1d83d5b1164c8a743c120718167c921136fade76940dab1756acba6c310489c6ca632b0b158b1b74750ce SHA512 aa7a3d783f4a9b3df163a80c7ee957bcdf5d3e6c36b52d1091d1eb94f33729a5448777d7d7fd4f7eea48066bb2d4facc5e4de33236cf0ce01e453d01a8ef1d62
 MISC metadata.xml 338 BLAKE2B aa66734c1150c6a7b21e1c018d4303311955fb6e1eadcdfe16c3ca514b3aad663e4c16399a75b091e614ed87a86b6958577771e040700e01590447d33bd77dab SHA512 f4035107afc1bcbab797e116a0f39e49c9a4034f838878ad448efea9eba8d2fbc4db074db73871550a42c175c9e36a220877d2ed50580828c3180fcc50913288
diff --git a/dev-ruby/listen/listen-3.1.5-r1.ebuild b/dev-ruby/listen/listen-3.1.5-r1.ebuild
index b4d99466a89d..eb1da42ebcaa 100644
--- a/dev-ruby/listen/listen-3.1.5-r1.ebuild
+++ b/dev-ruby/listen/listen-3.1.5-r1.ebuild
@@ -20,7 +20,7 @@ HOMEPAGE="https://github.com/guard/listen"
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
 IUSE="test"
 
 # Block on other packages trying to install a /usr/bin/listen
diff --git a/dev-ruby/parser/Manifest b/dev-ruby/parser/Manifest
index 10c4c037ac31..426dbe0c6468 100644
--- a/dev-ruby/parser/Manifest
+++ b/dev-ruby/parser/Manifest
@@ -1,7 +1,9 @@
 DIST parser-2.4.0.2.gem 591360 BLAKE2B 77a832e444e70853fe2aab27c0dfc99536aeafac78e3b4f36d3b1863d5498b656ccf62c55481e9fed763828bd4212b1688f06d77c01cb216653a925081f45cf2 SHA512 6ad62084437556bfa3bdb862bb031646e25ec733ab0e34432580351562a72a71507e454da9fd4f53e590163ea9d666c8076ecb7c92a7f5bf5579ca46cbb28a55
 DIST parser-2.5.0.0.gem 601600 BLAKE2B d863de5b898e1110f3b1121afd83aa11b5c116c494a45c4ba4fba82a89605acbbf0e52db6f7dd9b7d65c49ddd00a3af8c716f2f348a7bfe50b39c55a95dd7adf SHA512 51ad3b7d56d0f25385ab6ff8510857b7c8a689c65087be68441a4699a12371717de9360f568804fc818c0fde8535f1c92067532ef7a4d751b183d61aac3ddfe2
 DIST parser-2.5.0.2.gem 604672 BLAKE2B ec4a20218e0707a9791b173a7b7b1f33845e20b23c591bb9d5a51883f9b105fff136ae3808f62fddbf43ce57b0b6b13c0fe80af5496dda655074900a3790b108 SHA512 5ea67f986af8b31eca601fc812d64edfde14843f92cc79d72333cd581d20f53661f621ac513e71db6320ede8ac696778266138e66cddb3cbfe1b61684538953d
+DIST parser-2.5.0.5.gem 605184 BLAKE2B 2847079ee7195f47f7d18519cdd9e52b1ab9e9371fd3593d78ab841d8b38d985609ec326a0e75688012d583569cf311428ec39f8e2b52725943966c848693487 SHA512 e3c2aa9026d45dde45923f215b2de4f3f588e779bdfac30c334b6c1bf2c54c44858179cba34cfb46d0353714c813d03da10f33ec660a1c4c0b06df9ec8a1efe6
 EBUILD parser-2.4.0.2.ebuild 726 BLAKE2B 22565d48789c7a626bd3d94c44444052358d6d265f7b397e4b71bc16ffede9c21879d30eebeac4faef30ed0ab9f93dcc54e9305150f21425e266dcb73d8eece7 SHA512 183978bc420a988967be08320546002e5d2bb69b1b22c3cbed49beef1c010c59bb02f4cf6325107f4e2ed7efe03b5392dd1ffdb359abaaf9748943f34478d9c3
 EBUILD parser-2.5.0.0.ebuild 724 BLAKE2B 14410ef36bd1ceec5e3c9292be6731141005d279741ef5c9671591fbaf2147980c9ea6b1e0ce0faf3d7f963520886380118ed8b3b6d8a3064e5744f1b9b17ec5 SHA512 dace08c61adc85a283636b3946007b6301e96de432b70afd3455abed067d0fe9e48ab6d0db6285b9a8f978171c00aa4e658f5b24238f07873263cdb674d7e355
 EBUILD parser-2.5.0.2.ebuild 724 BLAKE2B 14410ef36bd1ceec5e3c9292be6731141005d279741ef5c9671591fbaf2147980c9ea6b1e0ce0faf3d7f963520886380118ed8b3b6d8a3064e5744f1b9b17ec5 SHA512 dace08c61adc85a283636b3946007b6301e96de432b70afd3455abed067d0fe9e48ab6d0db6285b9a8f978171c00aa4e658f5b24238f07873263cdb674d7e355
+EBUILD parser-2.5.0.5.ebuild 724 BLAKE2B 14410ef36bd1ceec5e3c9292be6731141005d279741ef5c9671591fbaf2147980c9ea6b1e0ce0faf3d7f963520886380118ed8b3b6d8a3064e5744f1b9b17ec5 SHA512 dace08c61adc85a283636b3946007b6301e96de432b70afd3455abed067d0fe9e48ab6d0db6285b9a8f978171c00aa4e658f5b24238f07873263cdb674d7e355
 MISC metadata.xml 343 BLAKE2B 7da9e267560e7a67c7a8afd5c283389dea1d4db2cb0ca65e4fda61a576036bb8068005b5e31ba9cc8fe7b68b8f8af5f93bd104e6d63412842dd7d0030b83fbd5 SHA512 f8dccc996237113d4add61dcc46e1407ea6edf156b001994e31d920f688dfcf9efe8d3d991ef31dc0084b7695b57b5d51471c57e9e945308279dec7909c69517
diff --git a/dev-ruby/parser/parser-2.5.0.5.ebuild b/dev-ruby/parser/parser-2.5.0.5.ebuild
new file mode 100644
index 000000000000..57a57952cc4f
--- /dev/null
+++ b/dev-ruby/parser/parser-2.5.0.5.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby22 ruby23 ruby24"
+
+RUBY_FAKEGEM_RECIPE_DOC="yard"
+RUBY_FAKEGEM_TASK_TEST="test"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_VERSION="${PV/_pre/.pre.}"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A production-ready Ruby parser written in pure Ruby"
+HOMEPAGE="https://github.com/whitequark/parser"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_bdepend "test? (
+	dev-ruby/minitest:5
+	dev-ruby/racc
+	dev-ruby/cliver )"
+ruby_add_rdepend "=dev-ruby/ast-2.4*"
+
+all_ruby_prepare() {
+	sed -i -e "/[Bb]undler/d" Rakefile || die
+	sed -i -e "/simplecov/,+35d" test/helper.rb || die
+}
diff --git a/dev-ruby/railties/Manifest b/dev-ruby/railties/Manifest
index 67befcf05f89..fcea87ca35bf 100644
--- a/dev-ruby/railties/Manifest
+++ b/dev-ruby/railties/Manifest
@@ -10,6 +10,6 @@ EBUILD railties-5.0.6.ebuild 1847 BLAKE2B cde912bbfe97eb8897785c6e7d1767b3ee6132
 EBUILD railties-5.1.1.ebuild 1657 BLAKE2B c2e9911388c7a86b44a338a6def27f1facfbfde67ce6ad9e441c1197b868196c34dc75e12bf5e8d46f8d8179963beeb8a7d98f68f1dfb9bef4ff8acde2a2ffc4 SHA512 12288eb333550596cc1ba9de9eabc2cfd1fdb0f032a59725e6e507b3053db53d0feb06adbc2e6c1eb64e7cd58ce68848263b66b3f3e592c8112836afaaaca79b
 EBUILD railties-5.1.2.ebuild 1659 BLAKE2B 6766874a3ef38abcaf6836e24ea7f061c2bbdbe1e25cb9c8773cfc9c89d6754a65f904209e212f8e749f8b6af7b783e1ca45c7398b2c5b50d127749a4312fc14 SHA512 b4e966412bb95c62aa1aeab4e73a63d5942c0e3c4496a4b024ca7f99632c383cfa0c298399fcf22a0b04635bc12b084fec9782325ea14847c3db7d39a3339069
 EBUILD railties-5.1.3.ebuild 1659 BLAKE2B 6766874a3ef38abcaf6836e24ea7f061c2bbdbe1e25cb9c8773cfc9c89d6754a65f904209e212f8e749f8b6af7b783e1ca45c7398b2c5b50d127749a4312fc14 SHA512 b4e966412bb95c62aa1aeab4e73a63d5942c0e3c4496a4b024ca7f99632c383cfa0c298399fcf22a0b04635bc12b084fec9782325ea14847c3db7d39a3339069
-EBUILD railties-5.1.4.ebuild 1665 BLAKE2B f37704d4d85ce23923bab1929835f228001b6071457036966f87c1b309132ddd620f570fd207591a6f1027c5631969d0428edccb27efeca8832bebde4d46b2ab SHA512 2ae2bea7eabcd9d090e107155d1322a2d68ecc51d1d939fd05942c5b73cad1b5982ecd8757f8d1f85257745841d829f66b8e9d4b285a587c8beb1993dd211dd4
-EBUILD railties-5.1.5.ebuild 1666 BLAKE2B 07c78468b5a540a23f59c37feeeb2804f8e50050865c18435fd87374173f71faf300ad704b1c663318bfeb4508afa5f9d59acc070939ba81d19b4c1852a10b3d SHA512 a90e989a68a6f1604eee35a78378dae13fd1aba1ed797e9575f04922f07d6cadc8c9817a37192377ac3cbcdcabfebce66fd1cd8695f980fff824eb728d4b282e
+EBUILD railties-5.1.4.ebuild 1670 BLAKE2B 7d953780b258c60f033f5bd5c6e6b453687aca3de51805a745f08c032d2386a6b06af4cac2d2169aff145cf64ed2ef35057b0e466684cf878f1ae2b20b90ec81 SHA512 add35da11cf530b55e60d7382b0129ef43c75794b586e0c9b42a7e19a34969ab233672727b4d3397bcb67f44c969a409833ce6408e71f4626ceb2ef91148080f
+EBUILD railties-5.1.5.ebuild 1671 BLAKE2B 89d54e60f7fc09216c7c31cb44221a5e126e75ace5c6e2eec2a094328355044c09e764c6ed395b3058e4473fec24b89c101b555ed3af0d28024850d6ff35acae SHA512 10b0a2da5a63d928e84653dd50561ea9a7421f2cd8f0ab2f192c5d423441954ab9c17cd5d11d39f41a195ff2f7751b156f3e21c3eed3ec93ee745e06d064326e
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/railties/railties-5.1.4.ebuild b/dev-ruby/railties/railties-5.1.4.ebuild
index 5321febc0c63..e7b02135521b 100644
--- a/dev-ruby/railties/railties-5.1.4.ebuild
+++ b/dev-ruby/railties/railties-5.1.4.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 
 LICENSE="MIT"
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
diff --git a/dev-ruby/railties/railties-5.1.5.ebuild b/dev-ruby/railties/railties-5.1.5.ebuild
index 39bbb70c96c5..45ce9539c7b0 100644
--- a/dev-ruby/railties/railties-5.1.5.ebuild
+++ b/dev-ruby/railties/railties-5.1.5.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 
 LICENSE="MIT"
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
diff --git a/dev-ruby/rdoc/Manifest b/dev-ruby/rdoc/Manifest
index e23cc3bcbf89..5d259fefd59e 100644
--- a/dev-ruby/rdoc/Manifest
+++ b/dev-ruby/rdoc/Manifest
@@ -1,14 +1,10 @@
 AUX rdoc-3.0.1-bin-require.patch 632 BLAKE2B 9835233574b78ddf5c9e1d60aa4a755928854ade5076141696ebc046ecbfb0ed1a83754454e7cdd6accd42a49bad6cbd23258cd8e4e14a280463fa0e368d62ed SHA512 d8840d320582f1b744597a4a48008508dfcfe7537b24570e977f7e10f1bc6e5955cf9319182d2546db23d96fa31a55320bf54f49d127623c9d9cac9d639c572f
 DIST rdoc-4.2.0.gem 735232 BLAKE2B 86bcfe63dcdec62a2297e1fd61c16e5930d920a44551d2c952dd7eee0c5fcc0f69a56f031b272463521928a77085e7c5e6258a95cdd56c9f8a46abf43faa9e8a SHA512 d58aebd7969fa8ea795fd4a2b35ba92d0f7368526ae0fc7fa64956db4e3d80c1b61f472384fe7e5eaa628e9c1ee637c967caf1a52362422cb7c2757e486594de
 DIST rdoc-4.3.0.gem 738816 BLAKE2B f705b4fed5a9a7e3a850cacc17b7df3f8fdeb163938ed7d2d29979337cb24bca4a66695643ecc62f811d8e49a931296e1972d5d13366685315649e0ec44ebef7 SHA512 7ec5c8055262300c159ff2dbca3bcd09e169002acad8602db89086d2b9409a096209a1152dca68c79dcd1b5e3c1fdf55e7f89d82b33fa2ce65c816695350b029
-DIST rdoc-5.0.0.tar.gz 701335 BLAKE2B 6fb6fe6bd6c00886229613f2d49e3f9bd1b7158c16ffa75b2ba8db73dad373b09cf8460ec81f54e555d15ca5b7f7f9703eabf3d088944de6922acc8c8778e189 SHA512 922c1fc36a3186eb2784754297930306b420a27ed2dcae879ed34b9325158e1e9c4e0721a44a027805c3e921f9b975b69009ffbf734173d668ba9df1d959c061
 DIST rdoc-5.1.0.tar.gz 702376 BLAKE2B 733d77a341ddad10f5b648b6bb492e0f79daa392e2ca371d38236e4c85a1c409699e35dd3f5bc8bc48551b399603bb0a747cb3c5f7f1fbf4765aabffaad575aa SHA512 cd2ed37e8502a3e9093c88c258ac5e39542a23c3dcaedb9b5eb48ce391a694e5b35fbcfd62f01ec6353ac9c40a4b7043b2ff11bbc403d2e03de9a84c52bcefe7
-DIST rdoc-6.0.0.tar.gz 696677 BLAKE2B d12ce5a22462b797252182244bbd2d1089c557a77f901224b06bc75bbffc9c50055ea0de5808a2055293730e0e79632bd2361a814eb5370b05c33a225c2e0d2a SHA512 18669123b3d712f73f901599a3ae903914369dc3c985651b7bc7ff6e1893a834e6c5688ced97ea6324e6af13050d151bee5d62f44e7a4a1cb8d314acac77b50d
 DIST rdoc-6.0.1.tar.gz 697323 BLAKE2B 7af4a3189c6680ae3d92b7a0b7764e73a104017b49442d89ffa0e2da2d504e7493b6842a3b5b60326e8f633a10447e2e6efb17ff61da7b6e4e55b52d973fa523 SHA512 43812f068b430d4462821098bca1a1f0fc2adc63c6f358a48b4af94aafb76d33eb494ef06f91aa72065f128fb0d34f53a05cb246f0c4fcc31ce9c1b31658d108
 EBUILD rdoc-4.2.0.ebuild 2796 BLAKE2B 514132cad27ecb546f55be2b14f9904ec09306eff42afc836aaaf61a8a2e056db6337d6cd2bd7769580961fef39bb35c570d0d190c0543fc03177ebadf34ec00 SHA512 02f126f26d26b4d033e4dfd35cf9d5ea623b9af10f230ca8a1c1dba9f0e7c72c9e41ee261350680ae5ea666dad842d156c103b123c661cd1a58665547a031952
 EBUILD rdoc-4.3.0.ebuild 2699 BLAKE2B b3e712ca11a26a7bd27cf7244d851039022094071f411344f212f4c7b4bbe245d9c7f643d505a9968e3874c9aef2c979ab8f70c325f355a9b0e4be778a8ec376 SHA512 2a9fcfd4aadf9b05ff9ad4b1ae7d91347843d1abd29aba37ca522b1c5ef33961a8a05523e632898dccf16925b3bd289dec3777e23a4388213d178ea913159e2e
-EBUILD rdoc-5.0.0-r3.ebuild 2484 BLAKE2B 31647ada85763217c1f1d5dde63a26dcd3d31bf2d08dd6ef81c9b6611bf8a1a1e038ca67d20d8a64ab1027156667586c9a8007f96451a9c161b8ba8a761dc86c SHA512 1f5e26c651945069ba5e20ba7b1941b44a39d93253a57c36974ef2e486e1f5f60be9b134e80b83d9a661e90b12083045778a231751436188fde1f2b8bb401d52
 EBUILD rdoc-5.1.0.ebuild 2575 BLAKE2B 3c3c26b0395e376710b616112c1e4fc476582fb6c1d01ab3aee9b3b316e76bf691a9acde559c26ce5b1b9d098c661999de883385a9e277a3531f8a036a7fa99f SHA512 3e2ad90adcd556d8c834878c2ae82de6b7a52c8849f74712fed888e2663c1285e32c25c025477e3cbd833e311c4705ac3c064371ebb8c2d51ed6e2bcf2f79881
-EBUILD rdoc-6.0.0.ebuild 2526 BLAKE2B e1d77770cb608be2408df290838585bb7694c2d90a6406717d0bd280349173eb1e13407fefd9f9289a30f4a6d62f1280542d64934be6a0a3752c3d232d317d57 SHA512 97b278f2d205b5041c2af33fdc934f17605cf6e4a6cb2aa46f99147f73d8462a84b636d1ed1dd6cb3dbb3cd0e113060a579d73d68acaaec17bc8961a58dbd0fa
 EBUILD rdoc-6.0.1.ebuild 2552 BLAKE2B 860afb1a772ef627268b8e5a14a4973aeec66177906d8e8df2a44330e8596b46d918efd2c47591315daab77f89d435afc2d3830bf8992b310b7dadbbb9274f9d SHA512 1095d207941d3c035bf0d70432703e8361b4ddf80d946fe5dafc8babc5ff72240e92d2a737bc75f967a1e479e4349d13464797d0397437e01676c8f281791c4a
 MISC metadata.xml 335 BLAKE2B 835d498407155ac5295c70af8a671114c777e5f9371b3d47f9f92a6b102b8e1d58755df0737c34820630464772dc001163e83b5d319707a1c630f4cf2f9ef8de SHA512 3421081016cb99570f9ce9f775097669cd40a709efbbb3c76a20947717bc40d886195a5fda889407d1c436a387c126e07def1eeae01edff53c490ea9c630e992
diff --git a/dev-ruby/rdoc/rdoc-5.0.0-r3.ebuild b/dev-ruby/rdoc/rdoc-5.0.0-r3.ebuild
deleted file mode 100644
index c4bc18e4b19e..000000000000
--- a/dev-ruby/rdoc/rdoc-5.0.0-r3.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="History.rdoc README.rdoc RI.rdoc TODO.rdoc"
-
-RUBY_FAKEGEM_BINWRAP=""
-RUBY_FAKEGEM_BINDIR="exe"
-
-inherit ruby-fakegem eutils
-
-DESCRIPTION="An extended version of the RDoc library from Ruby 1.8"
-HOMEPAGE="https://github.com/rdoc/rdoc/"
-SRC_URI="https://github.com/rdoc/rdoc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Ruby MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-SLOT="0"
-IUSE=""
-
-RDEPEND+=">=app-eselect/eselect-ruby-20161226"
-
-ruby_add_bdepend "
-	dev-ruby/kpeg
-	dev-ruby/racc
-	test? (
-		>=dev-ruby/minitest-5.8:5
-	)"
-
-ruby_add_rdepend "dev-ruby/json:2"
-
-all_ruby_prepare() {
-	# Other packages also have use for a nonexistent directory, bug 321059
-	sed -i -e 's#/nonexistent#/nonexistent_rdoc_tests#g' test/test_rdoc*.rb || die
-
-	# Avoid unneeded dependency on bundler, bug 603696
-	sed -i -e '/bundler/ s:^:#:' \
-		-e 's/Bundler::GemHelper.gemspec.full_name/"rdoc"/' Rakefile || die
-
-	# Remove test that is depending on the locale, which we can't garantuee.
-	sed -i -e '/def test_encode_with/,/^  end/ s:^:#:' test/test_rdoc_options.rb || die
-
-	# Remove test depending on FEATURES=userpriv, bug 361959
-	sed -i -e '/def test_check_files/,/^  end/ s:^:#:' test/test_rdoc_options.rb || die
-
-	# Remove tests for code that is not included and not listed in Manifest.txt
-	rm -f test/test_rdoc_i18n_{locale,text}.rb \
-	   test/test_rdoc_generator_pot* || die
-}
-
-all_ruby_compile() {
-	all_fakegem_compile
-
-	if use doc ; then
-		ruby -Ilib -S exe/rdoc || die
-	fi
-}
-
-each_ruby_compile() {
-	${RUBY} -S rake generate || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:. -e 'gem "json", "~>2.0"; Dir["test/test_*.rb"].each{|f| require f}' || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	for bin in rdoc ri; do
-		ruby_fakegem_binwrapper $bin /usr/bin/$bin-2
-
-		for version in ${USE_RUBY}; do
-			version=`echo ${version} | cut -c 5-`
-			if use ruby_targets_ruby${version}; then
-				ruby_fakegem_binwrapper $bin /usr/bin/${bin}${version}
-				sed -i -e "1s/env ruby/ruby${version}/" \
-					"${ED}/usr/bin/${bin}${version}" || die
-			fi
-		done
-	done
-}
-
-pkg_postinst() {
-	if [[ ! -n $(readlink "${ROOT}"usr/bin/rdoc) ]] ; then
-		eselect ruby set $(eselect --brief --colour=no ruby show | head -n1)
-	fi
-}
diff --git a/dev-ruby/rdoc/rdoc-6.0.0.ebuild b/dev-ruby/rdoc/rdoc-6.0.0.ebuild
deleted file mode 100644
index a2fd6a5a44d6..000000000000
--- a/dev-ruby/rdoc/rdoc-6.0.0.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="History.rdoc README.rdoc RI.rdoc TODO.rdoc"
-
-RUBY_FAKEGEM_BINWRAP=""
-RUBY_FAKEGEM_BINDIR="exe"
-
-inherit ruby-fakegem eutils
-
-DESCRIPTION="An extended version of the RDoc library from Ruby 1.8"
-HOMEPAGE="https://github.com/ruby/rdoc/"
-SRC_URI="https://github.com/ruby/rdoc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Ruby MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-IUSE=""
-
-RDEPEND+=">=app-eselect/eselect-ruby-20161226"
-
-ruby_add_bdepend "
-	dev-ruby/kpeg
-	>dev-ruby/racc-1.4.10
-	test? (
-		>=dev-ruby/minitest-5.8:5
-	)"
-
-all_ruby_prepare() {
-	# Other packages also have use for a nonexistent directory, bug 321059
-	sed -i -e 's#/nonexistent#/nonexistent_rdoc_tests#g' test/test_rdoc*.rb || die
-
-	# Avoid unneeded dependency on bundler, bug 603696
-	sed -i -e '/bundler/ s:^:#:' \
-		-e 's/Bundler::GemHelper.gemspec.full_name/"rdoc"/' Rakefile || die
-
-	# Remove test that is depending on the locale, which we can't garantuee.
-	sed -i -e '/def test_encode_with/,/^  end/ s:^:#:' test/test_rdoc_options.rb || die
-
-	# Remove test depending on FEATURES=userpriv, bug 361959
-	sed -i -e '/def test_check_files/,/^  end/ s:^:#:' test/test_rdoc_options.rb || die
-
-	# Remove tests for code that is not included and not listed in Manifest.txt
-	rm -f test/test_rdoc_i18n_{locale,text}.rb \
-	   test/test_rdoc_generator_pot* || die
-}
-
-all_ruby_compile() {
-	all_fakegem_compile
-
-	if use doc ; then
-		ruby -Ilib -S exe/rdoc || die
-	fi
-}
-
-each_ruby_compile() {
-	${RUBY} -S rake generate || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:. -e 'Dir["test/test_*.rb"].each{|f| require f}' || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	for bin in rdoc ri; do
-		ruby_fakegem_binwrapper $bin /usr/bin/$bin-2
-
-		for version in ${USE_RUBY}; do
-			version=`echo ${version} | cut -c 5-`
-			if use ruby_targets_ruby${version}; then
-				ruby_fakegem_binwrapper $bin /usr/bin/${bin}${version}
-				sed -i -e "1s/env ruby/ruby${version}/" \
-					"${ED}/usr/bin/${bin}${version}" || die
-			fi
-		done
-	done
-}
-
-pkg_postinst() {
-	if [[ ! -n $(readlink "${ROOT}"usr/bin/rdoc) ]] ; then
-		eselect ruby set $(eselect --brief --colour=no ruby show | head -n1)
-	fi
-}
diff --git a/dev-ruby/rrdtool-bindings/Manifest b/dev-ruby/rrdtool-bindings/Manifest
index 04e8b3a10bf8..a5624d61b75d 100644
--- a/dev-ruby/rrdtool-bindings/Manifest
+++ b/dev-ruby/rrdtool-bindings/Manifest
@@ -1,6 +1,6 @@
 AUX rrdtool-bindings-1.4.8-graph-ruby.patch 1857 BLAKE2B 4a36c4dee4e755bd39851c5c333fddacdddb53324017290f15345687b577caf9efb41d97ce55cc0bcd57554746e1a90d9a2d9fd92c0acd48b405eb02957e491c SHA512 1803247c9949a6d28d7027242604b5d61bc9da38ff22ff9d6302ca69743e49328372b4e51554c868b19a459c4341fa6d1291d09d62ea6a414a81d4558a7ef66d
 DIST rrdtool-1.6.0.tar.gz 2186538 BLAKE2B b56ef79b9d45a65cacd7c1d8da2158dcaaff3ebc2ffc0640081cdc2fa3ac643be1ce48a2cac60427a836dc3e457ddb042c95533d0ffbcdefa2978f5659150391 SHA512 45a8f16a2bda9d497c5f39de80236adb7a5bd054a14755c4d130f21cd6430bd0a76caef9632994be56fd1ea2364eb218687ea8ebf945a71ca411221c248f3ebd
 DIST rrdtool-1.7.0.tar.gz 2849994 BLAKE2B f7a91fa661728850af55356a69b61ea1d4343c79579823e025e0a0757d1dab0d2cda6387197ece20e07f33a657743350cadfaf6504500f13be472d18e8826a3f SHA512 36d979561601135d74622eaf183701de15cba5e25118f7a308926a695ba84ecb33c3d16511bf4bc80cff055853e2eb85065bc4ed8aef19fc0277c6430ecd319f
-EBUILD rrdtool-bindings-1.6.0.ebuild 1349 BLAKE2B 7a1d4c472ae68710e855c64e61ba52391c589c215cfab9b62c9c775610a4077bc9e699aa9b109bfc1d983b2af63f85df6ebf3c09767b4b47b14f821e7dbdab7b SHA512 2da3fcf476992b3b1ccfe8707a899b17a411f3c09b4fd1f7cb5422f36b0c855c25be0df86d1c9c47f18d4076f87411bdc44ff1ab000188a364543d8cc711bcb4
-EBUILD rrdtool-bindings-1.7.0.ebuild 1346 BLAKE2B 58ca60200362aa5a3d76eb8ff0ab21e507ccb728eb3e4e64b77f024b8636365f88f0bd632329c79c8270ed54c1e66e1083996df0a94d33e037eae2f93268bfd9 SHA512 8a1e7f84f3fbb08fb42454fd74d5df63f0977545689170a9036890e1ef6303e806dc6a5f37aedce24cf25ded1931cc45798163ab4c0958ee0e19bb4c37743d84
+EBUILD rrdtool-bindings-1.6.0.ebuild 1331 BLAKE2B d80bc44d9f5e9834e0a9b490fe497dbe75750b4e1d3bdf7f7b5e63c993a137a0a150f5af6351255c87e249aa661104a58514d0a8b083abb198dacceac84f6af3 SHA512 a0de3b92a83babe5418800d8745cab423f2982984b3abbe16959b3966dfbf239e2d2b9f2eedbff81164d43d92459ddfe64c6956cc6a9cb11e78afad6a1c39f63
+EBUILD rrdtool-bindings-1.7.0.ebuild 1328 BLAKE2B aee64f818c7c9657755ef609043cc61b2687c0039dfd91af1b46bf6789ca6b5c0e31f49b8e37ce0cf64623047394fc7fd9a9c212f72bcb96b61125bcfd18dbc0 SHA512 a01a718ffa2aa81e66237cd45fd51fecb9b3fd66106d019c06747887adcb31cc2ad41c22636188e63dba6938a6308b521c29f1139d51aef813e56d061c32a856
 MISC metadata.xml 463 BLAKE2B edb3b1f3703163a7f6c28ea7d16a79158d108721a2a775e30967885fb6b7b31d6074585951cc5b1c7b640c88b0694b95f0aaf62b71df43a8d6d6a0d6f78e07c9 SHA512 60732861cde4604b50875b6bbba205f232a52c4d91e6e21bce49a46bcef824bc542140e73b07ce4c18518a366ff8c9bd34569895741b0ac292124f43b0f02aa1
diff --git a/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.6.0.ebuild b/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.6.0.ebuild
index 10cc56f3de12..b3cde4fb92b4 100644
--- a/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.6.0.ebuild
+++ b/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.6.0.ebuild
@@ -13,8 +13,8 @@ MY_P=${P/-bindings}
 MY_P=${MY_P/_/-}
 
 DESCRIPTION="Ruby bindings for rrdtool"
-HOMEPAGE="http://oss.oetiker.ch/rrdtool/"
-SRC_URI="http://oss.oetiker.ch/rrdtool/pub/${MY_P}.tar.gz"
+HOMEPAGE="https://oss.oetiker.ch/rrdtool/"
+SRC_URI="${HOMEPAGE}pub/${MY_P}.tar.gz"
 RUBY_S="$MY_P"/bindings/ruby
 
 LICENSE="GPL-2"
diff --git a/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.7.0.ebuild b/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.7.0.ebuild
index 757f39e2c9f5..a59a70f1a6ba 100644
--- a/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.7.0.ebuild
+++ b/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.7.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,8 +10,8 @@ MY_P=${P/-bindings}
 MY_P=${MY_P/_/-}
 
 DESCRIPTION="Ruby bindings for rrdtool"
-HOMEPAGE="http://oss.oetiker.ch/rrdtool/"
-SRC_URI="http://oss.oetiker.ch/rrdtool/pub/${MY_P}.tar.gz"
+HOMEPAGE="https://oss.oetiker.ch/rrdtool/"
+SRC_URI="${HOMEPAGE}pub/${MY_P}.tar.gz"
 RUBY_S="$MY_P"/bindings/ruby
 
 LICENSE="GPL-2"
diff --git a/dev-ruby/thor/Manifest b/dev-ruby/thor/Manifest
index 5318def0ea92..b8836f4557e6 100644
--- a/dev-ruby/thor/Manifest
+++ b/dev-ruby/thor/Manifest
@@ -2,6 +2,6 @@ DIST thor-git-0.19.1.tgz 86389 BLAKE2B e5fdadf13639c93cf36d8ce3c0124eed5bdfc7385
 DIST thor-git-0.19.4.tgz 88733 BLAKE2B 8be54310cc4bf4a0308e6b103832831b89285003bb22a679986cd02636aaee57a25aa606f3e99bf532961a4e1d3625c46bfdb874a09f66cab85a21e5f7ed22d6 SHA512 a5cc52b23806e6104b12f924324960f2567bcd6c73b72ad47c33da222201b0377e7677b996698774de8adf3eff551926393785323ecf46cb59d72eb0e5b05aa0
 DIST thor-git-0.20.0.tgz 91758 BLAKE2B 86e4079a86a9c65852e710e40e49e915afe5522512f061ecc62aed48acc08a5397cc82d45cff7c4b1dd549ec57d8699b9afe7c391ac9ab838d1ba9100f1f058a SHA512 aa5344c94cad7c33dd0582409dbcf9bd109bf97b37131357a4cc8a66317acf8781460e8fe5532b301a74521010be59bb34ac1c68bc01ad3140bfe73fedc2a451
 EBUILD thor-0.19.1.ebuild 1667 BLAKE2B 0fc80a8a6951191c3c109f0bce1c9c1ac9ebc920f02d0749aa03e245100ce061c8aa4ec2e5cde3497ac8e351d092787b49a814624677ad943203e23689822441 SHA512 5c18689a805e35e6629bf4e1c8d02ce934502856f0a9d9ec4da166f14818880b28a83cb344805c25cea29c930cb22c6eda0224ce16fd50624dc727de7cc402eb
-EBUILD thor-0.19.4.ebuild 1143 BLAKE2B 04647654e7627054d73345870bbd1bc8e93784f25d1fa41519891d2501501dc1886e87ee9428b248275aa4cba284aff5e58f4b67efeb70958dc1d5b30d4699c2 SHA512 5dd4e1c31c7046075c9a9c0fa7967f761518a58756faeb99713456d00c0dc85d67d7d9a8e69093ea71d4add08c7fb5f5ed62266f471620af792fcdc9dacd9a49
-EBUILD thor-0.20.0.ebuild 1432 BLAKE2B 893445c5ed6ce14ef9ec8fe5a3a35f64421c950deb607dc14412701e1e0bce896af66746a4f666a7d3b772cfb129938f2dcf37cda2e8e64e854de583622a5bc4 SHA512 b4a60e72e8d61c6a75f0ac03d9e884553ac362c29aec695509a5792343cef1875ff70a31718852e2bbcb868c45cf27dffc240759444094223fd3637368b220ca
+EBUILD thor-0.19.4.ebuild 1148 BLAKE2B 4f305e138f028d7640fbd0c5bc3e6ca8eb3a281862e076cdb2e1af1857fec73a9b328912b85d84580994c307d740ad9be11a534d59c300e403ff67d153b8bc93 SHA512 61ed1d8bdbfbc3ddc2ee33956ab2f17cf262aa75983696248a39dbce50010c2efd161138a825d8f90d2f861c36c02d1b4f81a1f049f8ea703ae2a1d586296cee
+EBUILD thor-0.20.0.ebuild 1437 BLAKE2B b3efe2309b6836fde0bac541cde33859614d2fc2c2c771e9e3d9eecb9339736303fffaf796fc35bdc1fb30fa3b9efdf08eba86118c63ae73cd2adb44b40f44a2 SHA512 ee77875367e750a3752a1102e565142968bec7016f20bb7090e775249d510bf5ae4df02b886d19780c264f2e3745201a49645af67417b35d57388e7fd5ec052b
 MISC metadata.xml 680 BLAKE2B d4b03ac058de229b055e01ee99da7745a8fc67200979f626b55d6156d573269bb260c42ef44d6dd3b391a3e06d46844ef3fcd7cdd1f0d4053957c00bcfb1fd27 SHA512 d4938ad6ec003fe17d09274f39a2526c84d69d447b1e8063e9301000b776496fb3f8fd6d7e596791d9f8d05714e856d6a6d8df2c5c4747420e3221edf48ab264
diff --git a/dev-ruby/thor/thor-0.19.4.ebuild b/dev-ruby/thor/thor-0.19.4.ebuild
index 738bf2fa4c1d..c1e11304fac7 100644
--- a/dev-ruby/thor/thor-0.19.4.ebuild
+++ b/dev-ruby/thor/thor-0.19.4.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/erikhuda/${PN}/archive/v${PV}.tar.gz -> ${PN}-git-${
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
 IUSE="doc"
 
 all_ruby_prepare() {
diff --git a/dev-ruby/thor/thor-0.20.0.ebuild b/dev-ruby/thor/thor-0.20.0.ebuild
index 2d4022dbaff1..9d282c48b682 100644
--- a/dev-ruby/thor/thor-0.20.0.ebuild
+++ b/dev-ruby/thor/thor-0.20.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/erikhuda/${PN}/archive/v${PV}.tar.gz -> ${PN}-git-${
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
 IUSE="doc"
 
 USE_RUBY="ruby21 ruby22 ruby23" ruby_add_bdepend "
diff --git a/dev-ruby/webmock/Manifest b/dev-ruby/webmock/Manifest
index c4a3530f5709..a10f33710ed2 100644
--- a/dev-ruby/webmock/Manifest
+++ b/dev-ruby/webmock/Manifest
@@ -5,7 +5,7 @@ DIST webmock-3.0.1.gem 112640 BLAKE2B 61d74bbc099bdec25e919c07a12824a3bc0761c2b4
 DIST webmock-3.3.0.gem 114688 BLAKE2B 8306e96cfccbee598f275534effd119e75e3e1729b85936f29b4d4dc118f58c5ed39aa61553cb4c4a7389d704f57e55347d1f54f3cd392610a84683df993cd3b SHA512 589d96c21c1afd05e11f4adc6325d277bbc9a2d25f1ed6176a7b7db88cf94413f470b75fd245faa73ef0a9cb037f52751826b5047f77b41bd03ac72860277902
 EBUILD webmock-1.20.3.ebuild 1660 BLAKE2B b3767cb74310f20c353dc334db87ed92e1e493c253192eed2ff9b6fb6bd686f5f6414150f403a79d59a4ca27e46c151dc24b245a33fbb70035e0fef07cc8ec4b SHA512 37a6e9e64f09e4da7f0728ece05333d7f4f4f23e720b2c038ed0f5595ea8b2c5af5496c204566c543e8a7f4319aeb31e14839b9499e2c038910e6e88579f6eaf
 EBUILD webmock-1.24.6.ebuild 1461 BLAKE2B 95666310b22d4b4ba399af86745c9b1f339c756e9b43d53afbeeca19ebb9ffdf799d1c74dc5529bfaeffe02afdba51f6a8e0e3a5ca6c6ee5231a9e86fbe5bfd9 SHA512 09e711230c9b458ee33718ad719dad8147469034a28cd3e1b0c991dba614f6814380d91275aab7accfb88ca5a60ae644a40a3bbd3f243dbe9dba027e568e5c47
-EBUILD webmock-2.3.2.ebuild 1871 BLAKE2B dffcd3510982bee2c7919ef69690f1f3b246829fb2c84f199f4b64c171606b38ea2f0165e8aafc7794415b68eb63e08b64d92f7b0ac7f210b9f1f48f5d584f50 SHA512 ada35b6138f5fe619416648a4bb463a831d202cc0ac9927a85c37466eb292e1f565d0713a67d374db23f08ed49d0577fbe66511ef08a385863c1fcd86ee47f4b
+EBUILD webmock-2.3.2.ebuild 1876 BLAKE2B 59c17e28ca3b879879cbedd6a11d1dd14580d4cb0b2c481189a1de343f800f8b9fae0c3e273da513d0ddcb8ebc43aea124c5ad439d780a01be554ffa5577c4ef SHA512 0593f9144675aeb4403f45ab77c9a74aac661389de88954a86261080380063b6fd4e9b01bfc4dc6ff9f8728142c1569a4b29de6ce8a47318487ea749e73ff684
 EBUILD webmock-3.0.1.ebuild 1878 BLAKE2B fd52728f41d41dc1e844fd3a5eea88448d0460e08ed78c94a571bbc2795a0dda3525acc027bc4202f5e7db4bea600f7882818cfe135aca95d54b479ae27d12a4 SHA512 8a5ab7d0a9b845268ce421a6dc3ef0a92262ed2023941d772ee71dfb74ddf2d3cb76d9f25a4bfdd7031269d073364ae95889f7b7e0a52feb748a22000a570cf5
-EBUILD webmock-3.3.0.ebuild 1884 BLAKE2B 973460f3693d97ab38765b9e0784ae1409a9a369084c845b92b4d8bea5cf4becf142c6fe65502e4e382820820c2daa590e2e23237c087ce15b73ecdd787b1d74 SHA512 808e14a6478e78c594e0ef047e4dd3407c205a03c3de0f01173b17ece4bf45597b058ba1733e0cc2c18639839019faf27a42f97faf4e0f92db361152d9c5356f
+EBUILD webmock-3.3.0.ebuild 1889 BLAKE2B 9463738e0873db97441cd0388b5cab90be18a6c7f8bc5a69c4845c7eee34329e67d5d53e469037d6e4bcafddba8226cfd05a80b0f245f354013cc91b8df8834a SHA512 775047e6a7a246aac81a22222254b764b61121cfe7f055562197e74b2a77cbec443195edf51feef3b5d34a11f22cb1cdd0e44809d7902e903e56fcd4e43b4c73
 MISC metadata.xml 341 BLAKE2B 75a7b957f0aa060ff3c632620c1b8eac9344b37566c9205bdfaff70fdcbc8cd391dc7296317bde0e8ce1e1ea3cb7540446267112eac00571beda686f5a592130 SHA512 66c55ee845168bbdd2b792d90cfbe116a09ff3bc00861164e82b68355ed585e87b58b7c0ab21da37dd984b680ea4841e7a2cd0c8bea1a081b1adb4c5b9885b73
diff --git a/dev-ruby/webmock/webmock-2.3.2.ebuild b/dev-ruby/webmock/webmock-2.3.2.ebuild
index 71a8ab4b29f8..40aee18ba477 100644
--- a/dev-ruby/webmock/webmock-2.3.2.ebuild
+++ b/dev-ruby/webmock/webmock-2.3.2.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/bblimke/webmock"
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_rdepend ">=dev-ruby/addressable-2.3.6 >=dev-ruby/crack-0.3.2 dev-ruby/hashdiff"
diff --git a/dev-ruby/webmock/webmock-3.3.0.ebuild b/dev-ruby/webmock/webmock-3.3.0.ebuild
index 020da3fa46da..c8012a63170d 100644
--- a/dev-ruby/webmock/webmock-3.3.0.ebuild
+++ b/dev-ruby/webmock/webmock-3.3.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/bblimke/webmock"
 
 LICENSE="GPL-2"
 SLOT="3"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_rdepend ">=dev-ruby/addressable-2.3.6 >=dev-ruby/crack-0.3.2 dev-ruby/hashdiff"
diff --git a/dev-texlive/Manifest.gz b/dev-texlive/Manifest.gz
index 6e16ef6332ac..ae707e3f2c8a 100644
--- a/dev-texlive/Manifest.gz
+++ b/dev-texlive/Manifest.gz
diff --git a/dev-texlive/texlive-basic/Manifest b/dev-texlive/texlive-basic/Manifest
index f38b25592096..d3cc6a6b9784 100644
--- a/dev-texlive/texlive-basic/Manifest
+++ b/dev-texlive/texlive-basic/Manifest
@@ -177,5 +177,5 @@ DIST texlive-module-updmap-map-2016.tar.xz 147188 BLAKE2B 0cf7ab46c73b17c4218ca1
 DIST texlive-module-updmap-map-2017.tar.xz 161664 BLAKE2B e367003b3e9332662d241aef145bc9bbf97213aa626711a5b9a6aba9d5715f03e51bec4f14db85b5355611795e871d5f8bc04aa7096c2f2e5e54b0d7d47f15f7 SHA512 0395c1f7cbc6b9b130af08de0bcc3743a66ad5b81a87c92356cd82dadddafdffbdb67fe92a83ad06e01db32f12b73b1aaa7d8c6d735291e38687f50d46b559c1
 EBUILD texlive-basic-2015.ebuild 1722 BLAKE2B 08620f418a40d45fc413361520df51f35fec6d2eb80d74fbf01acd9678e9948881e7a2c4d5d878f6a29ffe0104ef7f82cf00dee0bf28fac25f29f0c18a50ecaa SHA512 d42b475db6259196281a09eb2e4ab9d058aa49ca1639131e5371388812a0cc839a9ec79cae2ea21b02d08f7097b2a7997925ca56704a6cb5654cec10cf153a09
 EBUILD texlive-basic-2016.ebuild 3224 BLAKE2B 3bceb6a883a0e125c48c49e6471729650fe8dc1c22fdc32cba5a7583a7b2f29796b0881f38484143a8d98afd602e72183763c8edfbf657f68b253532eb56e8e1 SHA512 da7416cbd7f4efd0efbff5315a9e5c91d11ee4d42a817d674b58c320a5c1dfd141700365ff9ef604fd379d302d2eec084e51d76c1eeca599cf6ca31e98c4788c
-EBUILD texlive-basic-2017-r1.ebuild 3220 BLAKE2B e4ef142e51f00b4ec66039601bd8d44f943871b9541531fd85d0a371cadef6a8f6bf473143510f574ffbd3ca3b96f70e4a425381f4d303b5224ac4d1135487b1 SHA512 4e40e5090bbcc645a9419f84cb40befe88e8100e512ee17e7511d3e13a769c44601b8d76460fdf7057c960e5893846f4da13ed31c66c5267117a073d64ace56b
+EBUILD texlive-basic-2017-r1.ebuild 3219 BLAKE2B 9a9b6db5f8fa82b0470026616787c88e5a3e6994d783df24e71689a1a905d31f426088ef99747d7658bbf2692f11e0eec71483367483691dbd050073df054f8b SHA512 861aad9ea77306f9748680ee2e9f3835e8168e793bc4b4f680bf03ecf6ca1949cf41288ee46e56ad1a3f87a5fe92265dfe2ee2c1f98151600abba76da3d2e5c4
 MISC metadata.xml 688 BLAKE2B aa7b007f62d5b0a2abbf20faf44b53118960ba7cd36777fcd168ee50b41256a6cb46838e0b3757bb45f0e5c7fc5cb1b9ee3a53bbe9c23f2563cb852a24a810f9 SHA512 59ed72f217730364d768f0240839d7dea3ad2e6f01c9b24658e999f7e3415711ef1783e3260391bcfc9d396528d2fc7eb8d28ef96c7c19731f123574a2c64f69
diff --git a/dev-texlive/texlive-basic/texlive-basic-2017-r1.ebuild b/dev-texlive/texlive-basic/texlive-basic-2017-r1.ebuild
index 378ec96cfd92..9a0e050792cb 100644
--- a/dev-texlive/texlive-basic/texlive-basic-2017-r1.ebuild
+++ b/dev-texlive/texlive-basic/texlive-basic-2017-r1.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive Essential programs and files"
 
 LICENSE=" GPL-1 GPL-2 LPPL-1.3 OFL public-domain TeX TeX-other-free "
 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 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND="!<dev-texlive/texlive-latex-2009
 !<dev-texlive/texlive-latexrecommended-2009
diff --git a/dev-texlive/texlive-bibtexextra/Manifest b/dev-texlive/texlive-bibtexextra/Manifest
index fa6fe0fd4754..a0f4dbdb48ae 100644
--- a/dev-texlive/texlive-bibtexextra/Manifest
+++ b/dev-texlive/texlive-bibtexextra/Manifest
@@ -742,5 +742,5 @@ DIST texlive-module-xcite.source-2016.tar.xz 3112 BLAKE2B 7daffdcd5a43e961c42618
 DIST texlive-module-xcite.source-2017.tar.xz 3108 BLAKE2B 805e383e43bb27febc97f160cd4ae34149fa33c55e16db672fcc30877a37e9b5ada8fa2d94a5e87b6d8607bb503cf9c7d4c1ffb357699f772079504f85d6be20 SHA512 f99d309c7939d864be018f8b33833534d15981a84307aa77249ce3ee259c4649d509ab1322be6318a4cbae85b753b37b594694b39beb628f6cbafbd6f688a151
 EBUILD texlive-bibtexextra-2015.ebuild 4240 BLAKE2B 92244bad9860483ab5145e3f40cdb3b4818b5af573a4096c236846f9a59a5a0691448ced86ff9ac9edb82b9be99f8e45b3a0626d0f9a44966b3ad904c6f20932 SHA512 884a45704da1da1485ad6de484e85fccf8e39897ae0ee58c3734a52f3c95f713efe1a18ef337256b261f481b3f168c93b1a4d968d63f82fc813e4c55d4661aba
 EBUILD texlive-bibtexextra-2016.ebuild 4903 BLAKE2B 3398edfbf07efb51fbe639aa681cb31cad95545bb58fc7acbb673c566b022f598005e5e36612a146cac6403c1cf3bf016bc737352c54d1b9bebe8d3d24b97ccc SHA512 2830a1975cbd7c64243bcb789792bf52bafa64b14b580626d803b8c13265f90315a7c304adad4d3a5448d3ad9839712b792ede2dc4f1131d10ba2cca8933d328
-EBUILD texlive-bibtexextra-2017.ebuild 5181 BLAKE2B 2544bf4d32ded0c0d56f3c650d0d0d34501ccb4ffa19c96a2cf46bf742079c5d9a9aef94060312657d48d9c86ab8ac56386ee902f5c831104d0070a68de2d07c SHA512 5f22f7d81617a9e075b1b80cc67a8b1b5f6b7257b312917c5cc35af5a0e84bb716f8e4db6cd3ec58c004248232941ed2dd99c3d7d60e88fdeba230007169a77d
+EBUILD texlive-bibtexextra-2017.ebuild 5180 BLAKE2B 2dd4023fd008ac76fc554a0e0371eaa48f912e24742a9ae2f6abe4bf1a851b579539e6549f8e7b48a666dde1c3b77d9c36c969399c6d62fd56ca6181b6b8e7a0 SHA512 859babd6c68934ebd07c88ef4f044deb56bfa42152b3f9aa4f01105401d230e6960f30a89789fd7c5278b3ccbd20187ccad1bd8e0440c180be21b139eb020d5a
 MISC metadata.xml 495 BLAKE2B eaf4c29c2686caa7d176ca20cb28e092a895c5d1ba17b2023f5f59b7a01383e106582ad1ecd5c2f0fc3d8912a53311db98791b8799a4e52b4eab01c4cda2b003 SHA512 1209d61abc60dcffd50bd8e460b9f6130afd00da9d350d4a53a287ddda6a78140129c7ff036aeca4f008f33d9eedfb0eb3d7fd839196eb14cd4ee46da92d2429
diff --git a/dev-texlive/texlive-bibtexextra/texlive-bibtexextra-2017.ebuild b/dev-texlive/texlive-bibtexextra/texlive-bibtexextra-2017.ebuild
index 3405b2549fe0..138fa0ebd5aa 100644
--- a/dev-texlive/texlive-bibtexextra/texlive-bibtexextra-2017.ebuild
+++ b/dev-texlive/texlive-bibtexextra/texlive-bibtexextra-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive BibTeX additional styles"
 
 LICENSE=" Artistic GPL-1 GPL-2 GPL-3 LPPL-1.2 LPPL-1.3 LPPL-1.3c public-domain TeX TeX-other-free "
 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 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-latex-2017
 !=dev-texlive/texlive-latexextra-2007*
diff --git a/dev-texlive/texlive-context/Manifest b/dev-texlive/texlive-context/Manifest
index 92c8bc0ecda5..8727bfd39022 100644
--- a/dev-texlive/texlive-context/Manifest
+++ b/dev-texlive/texlive-context/Manifest
@@ -209,5 +209,5 @@ DIST texlive-module-jmn-2016.tar.xz 40024 BLAKE2B 5b4999cbaa4583e37af40b40ee82b7
 DIST texlive-module-jmn-2017.tar.xz 40024 BLAKE2B 5b4999cbaa4583e37af40b40ee82b71e8483ea5689a72c63f1cbcd4962ccd5eb737ebb77b665b56843827809d644bda24574ea1c2de1fa6d52ee159d890afb0b SHA512 cdf252d2e61f53444be69c4b6c9ab1cdafd865365f1d59f0c7d428825858153f213a86a5871e93bb3bb261ac4afa9c5391b2adb21f1c59d81bc6592711aeef38
 EBUILD texlive-context-2015.ebuild 3331 BLAKE2B 0f01efd1cdd744c56214a322de4462f1c0ef03fbf1e73052b1ed5f4e529835257fcfd0bd72f87c641419458a251c3a2a61e70a5a1ead441e8ced52ae48a15787 SHA512 a0e41acd624e8f0c2b2cf0c57a7d171642b6f34c96697c6fba89526f46b6335c43084fb0ffa85f5ed4975f74eeb3a3b55dbb5081eee2fe90ec6ec0117c01853a
 EBUILD texlive-context-2016.ebuild 3390 BLAKE2B 6763b062145c1ff60d8064a199c9b007da5a3348e3d69fd433f2ec462c66e06b381eae77379a4cb9a90b766358a338d6f6b5a7944f2ca39449dbad3a8176ac24 SHA512 29bd33b405090ec461ca6ecb76ad38130838bdc8a3e82529f7de67eda88cd23b0960f84039e54d3db520ffde08616b9fd9262c87b7681adeb289e620fe211369
-EBUILD texlive-context-2017.ebuild 3396 BLAKE2B 6e7d18bad61505a265c7f774b67dfa17352626debba95a888793cbeaabec1cec70dee3c73b8c68b5ac836c6c3f88a440f216b2064946ac3580508a443e325245 SHA512 b9dcd292fd282ee0c5f496a89a65d41ccce53bdf69f3acbfe5673b8d012cb30c1a8929414585c34315853b1edb081cf28663ff60aacd6d682f496761851eccf2
+EBUILD texlive-context-2017.ebuild 3395 BLAKE2B 399c8276b634c4a81876ef4148317cf80085a90fcc2e6352183ab18d2958cdc98e96f637db3f43d1f40d09ff90d14df738079c643c557b1be15a6025ba9978a0 SHA512 2e69c5aa4c3db705bc88d30d12b96af99418712dabcfba9aa8dd0aba278c4b647858563c5a5a75aaf544bcaab561f4fef507936ab8707eab2689dc51b0f3b9f3
 MISC metadata.xml 517 BLAKE2B 18bea3fc4db71d01c85ed3d254367f5cc9be257dbbb6d524c2fdaf87215efb617bc2268bd598f3c69bb8bd3b1bb1cf529268db118305fc6394bec447504c72b3 SHA512 6a05b0aa2626563c21edc01c8d842ac54e7533420e86d41d91a2f6730ef1dabcaf96bc2d68088a9ddf89fae4a932b9bee5dff998b75c1824d789cf6937995311
diff --git a/dev-texlive/texlive-context/texlive-context-2017.ebuild b/dev-texlive/texlive-context/texlive-context-2017.ebuild
index 667e8febc09d..2989fd174ff8 100644
--- a/dev-texlive/texlive-context/texlive-context-2017.ebuild
+++ b/dev-texlive/texlive-context/texlive-context-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive ConTeXt and packages"
 
 LICENSE=" BSD GPL-1 GPL-2 GPL-3 public-domain TeX-other-free "
 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 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2017
 >=dev-texlive/texlive-latex-2010
diff --git a/dev-texlive/texlive-fontsextra/Manifest b/dev-texlive/texlive-fontsextra/Manifest
index a8448c82b5db..e8c69355d5bb 100644
--- a/dev-texlive/texlive-fontsextra/Manifest
+++ b/dev-texlive/texlive-fontsextra/Manifest
@@ -1664,5 +1664,5 @@ DIST texlive-module-zlmtt.doc-2016.tar.xz 53496 BLAKE2B 21c8fb0408a61ac64efb5437
 DIST texlive-module-zlmtt.doc-2017.tar.xz 53516 BLAKE2B 58c88b219e36bb4ee1379468b2995713c729edde8f36f18c1f6209b74cf8122997caf27f24d3bc8072ee0ece2ada0542e37816bb56c2de20d658739f0c4ff246 SHA512 834220fc28cda484b15cca0b896124a98f3664686582490c19582644524cdedd111e0ec500cdb4fbd45dd0a4c3ec9d647ee4a5a4de699f6b6ed16a67e7221312
 EBUILD texlive-fontsextra-2015.ebuild 6636 BLAKE2B 3989b0191b27a60d3d21e1f63eae24691491380d8db26e5df29ead531b89b8010dce36a97f58191a67d32ebb8c0c205fc37ab5889b213aac032c707702e54743 SHA512 55f849a5f5404b150a5ab657ee4a8f8fb3a83187b9fc19e7cb8d73897777549be70b556ab105ed35b41802907cbed8ccb52d5bcfaa736b9ded8de96c33ad799c
 EBUILD texlive-fontsextra-2016.ebuild 7447 BLAKE2B b28ea9f6ac33e106121cc6ea9810a269e1a88774cdf3de93accde179373f6a28ee4e0363facf55dd851c3382d61e2022dca9e48debd0c157f4a82325cccce27c SHA512 cf782c23daf034de2537aa5262708b7f8e46e9fc58bcfe30a485e7665273211f6db3cad7c67b57f3bb840dae3c14845256d22ecf019dce5b83a4a7e9f0ab032c
-EBUILD texlive-fontsextra-2017.ebuild 7502 BLAKE2B 6a29267be9dbae9b717b4975ebe96d0f90034344f0989f2af802581253367cf75d782919cc935f85fce420705b49cf23ac1c108cc85e3b286213474bd9f920ae SHA512 dcd9a20dc8dacd1397366dcb8390d0618093a5426b54d923cce10f6479aea3b1e31ad9e33bf1203eacd2cdac9be7ad7a3eaefe85b5c1699a441b44b73ac8ea36
+EBUILD texlive-fontsextra-2017.ebuild 7501 BLAKE2B cc5106c5df80e75a1f39179af24e90eea6f6d58cc41ef152072d4134c5cb9905ad62e6d159ef758b38b90359748c17619d5265448f1ff3de7c702c47d51be0ec SHA512 467450dbc81646fe26381cc8ffc3e65f572a29ccb278bb061f7eebbbc76891e71580eb091e61f813a5c053d5c727c991bba6089e6c335ea48dd599c444e93f0f
 MISC metadata.xml 359 BLAKE2B 8b3bf3704460503fb9f60ef92d86e7631912398637de4ce55933ad5edf272acf8401bd49f9f47c176c6580ea58e58f93532bac040e583f45674c8eca39664a1d SHA512 f6decb141c5a9c40ead9e20dce2c1d9c030c1c03d69ec36ea41dc791b51c97153647d8d3680a0a87592da09e7a369bb9f2ec5c80796022d029fee6a1b9924e2c
diff --git a/dev-texlive/texlive-fontsextra/texlive-fontsextra-2017.ebuild b/dev-texlive/texlive-fontsextra/texlive-fontsextra-2017.ebuild
index a8574d02ef87..9f78aa3a3618 100644
--- a/dev-texlive/texlive-fontsextra/texlive-fontsextra-2017.ebuild
+++ b/dev-texlive/texlive-fontsextra/texlive-fontsextra-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Additional fonts"
 
 LICENSE=" Apache-2.0 BSD GPL-1 GPL-2 GPL-3 LPPL-1.2 LPPL-1.3 MIT OFL public-domain TeX TeX-other-free "
 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 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2017
 !=dev-texlive/texlive-langpolish-2007*
diff --git a/dev-texlive/texlive-fontsrecommended/Manifest b/dev-texlive/texlive-fontsrecommended/Manifest
index 42cf8ae2a9b5..841ea7b5db77 100644
--- a/dev-texlive/texlive-fontsrecommended/Manifest
+++ b/dev-texlive/texlive-fontsrecommended/Manifest
@@ -191,5 +191,5 @@ DIST texlive-module-zapfding-2016.tar.xz 46960 BLAKE2B 47d0c14c5d540178ee2639a2b
 DIST texlive-module-zapfding-2017.tar.xz 46916 BLAKE2B d9aa25802f203bd2b08dc503c8e163dc0a404dd0629aa5a7a1e28543c85f3b59695d480789eb0b11408490aa72d8e8716ab9fed413641cfdd4106ec7878f99bf SHA512 d7efd293f6e0616d1a633615f9bb79970c829fb99a7d5c1b6c217058ee74f29492fbc303a35951140a135d7742b58609c693df4eeb1ecdc5f63cd9fcdb177d11
 EBUILD texlive-fontsrecommended-2015.ebuild 1390 BLAKE2B 0611474b755f436a3a346da7bb4a06c789e873405713d749599d77a76c875b7aadb2331ce0d19bbe96ebc7e71f0a5e380074b2c7de54d860717b799bb18be97e SHA512 83303017badad9096a7f724c58dec81169d63ced6ac8eafcb36f66b7147b146e51679fea0b6271758558fb76ebc375557bd4e3a5ae05d361c9fdd30f0244c6c4
 EBUILD texlive-fontsrecommended-2016.ebuild 1429 BLAKE2B d1e173c6a3444ba682cccf349829218469bf161f0181da39c19fad0f854f6fb629e7e9e626ad21e3949533ce8ab92ff621fe6220ad1f09fadd236a034087caa3 SHA512 e09f522f15d8b033a149e0bd07dadefb9fa7194a1cff1bf38ecf6fd6bb2fafb64397fe2d1f8a78de61e3799b1bbc211210d910e8a9eac233e008122c27db082d
-EBUILD texlive-fontsrecommended-2017.ebuild 1392 BLAKE2B 3a99da6eb3ca6a241346d0c6f229e5708f00874d2c21ff7fdbce7c7b96b6018ad479c47119db9e9cb3fb1f54d431d0bef70b9663c0af9f09f9984af7e54936e5 SHA512 362e135ad3350e4bde93b496185aa59a387bd865f7381721fce07da767428978be00d5cc837d445afe7f7771dbd1b12723eb21e0c5483ba4e33d2cffe06cd7f2
+EBUILD texlive-fontsrecommended-2017.ebuild 1391 BLAKE2B d9ea03fdb166fb1b878108979b92d554041bbb9e7e05ae384904cf023013a644592e3f4cd4bcb50776f349987a9c7d9086663c5ce22d28748059fd1d3db32fd7 SHA512 3578efe920242cd7e633624f54de568db4ba759bb197436d21e4a27cb675701198606c10f6a1587f2df25411b13cb6b35e62741673d4a30ff8d5554654db1aff
 MISC metadata.xml 569 BLAKE2B ae2ca0d4582cf74769c8537a954af064ea8e615318b8aa1d23f8ada27e6c8c41dc177654bf60ad9ee99fd29e14472ee79d8859de134bf50100aa384a10a69dba SHA512 0753e724c31d9af811afffb43e2317076a8f83211d5a45eee3f5002d8bcc5e424af95b5582d6b556cd2f42133984f5e0979a399d812f3844def897643344b101
diff --git a/dev-texlive/texlive-fontsrecommended/texlive-fontsrecommended-2017.ebuild b/dev-texlive/texlive-fontsrecommended/texlive-fontsrecommended-2017.ebuild
index 3f7cc9b3ce8b..090ca559981f 100644
--- a/dev-texlive/texlive-fontsrecommended/texlive-fontsrecommended-2017.ebuild
+++ b/dev-texlive/texlive-fontsrecommended/texlive-fontsrecommended-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Recommended fonts"
 
 LICENSE=" BSD GPL-1 GPL-2 LPPL-1.3 OFL public-domain TeX TeX-other-free "
 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 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2017
 !=dev-texlive/texlive-basic-2007*
diff --git a/dev-texlive/texlive-fontutils/Manifest b/dev-texlive/texlive-fontutils/Manifest
index 683a5d41d1cf..a6382dd36eef 100644
--- a/dev-texlive/texlive-fontutils/Manifest
+++ b/dev-texlive/texlive-fontutils/Manifest
@@ -96,5 +96,5 @@ DIST texlive-module-t1utils.doc-2016.tar.xz 95856 BLAKE2B 7eb77e6f98b472001b4d34
 DIST texlive-module-t1utils.doc-2017.tar.xz 95856 BLAKE2B 7eb77e6f98b472001b4d3484840b30002ab079cff6066759e38a6635abff28b490ca6bf4d80f483a6237e195b20e4f00144a184c839ce92c0a070343cbf8c74c SHA512 59f3c52154ad0e443f35b5ed90cdecc201295ccad18dc919e8b41e9c5ac636502332e50a00febc0716702606eb98f2b8ae9438f3f881cb93fb81b91c5150451b
 EBUILD texlive-fontutils-2015.ebuild 1623 BLAKE2B ba8173335c3e0cccfc7e16b7cf15c89a053f70918a184c47a44ba1e98bbed4337891dc087baf19087206e2416c270a1cfbf9bb7d6f2d97aa4b25ab545a2426a0 SHA512 1bf8ed4c31a3e75a208d4fbcf71c5eded16b8c3ae0ad0b60766b92fbc7141533670984728419f26423740e357b98b25d685b30bf5228efa0ac9ecab8f3f9b5fd
 EBUILD texlive-fontutils-2016.ebuild 1641 BLAKE2B 99ecfc5d05050363cd18b273307b7dd79116c58417329751d587e461bb5e2398bc84991f4c08317a2350c26901dc6957af1eca345d71f4ef986534416e3f84b0 SHA512 a7e3f93f0a9cda43669fd347051f4350c6c513bddf1754854b894e8ec71115a23d6f3f2aadb053b4a5d46c8091d30454c3a90738cdd40bce26b9257b414586d5
-EBUILD texlive-fontutils-2017.ebuild 1642 BLAKE2B e4ffb283740cef405afe06cf2031d1fadaf5773b8907cefd9a67c69530c97d253e21e26a3ea3fd2c88de9a6a1c0659f8b2602e322ba2ba06783365ea0fb99978 SHA512 c2118aeaf1edb6766c44b44cae984b86019ba3e4b440ab2246e09d09b133359cb297f0958d6b9c94a30853d8eab9857f2f5224728a2bedb85060caa111f58332
+EBUILD texlive-fontutils-2017.ebuild 1641 BLAKE2B 0b688858aee7a94d85c3c1153a780a7ea8de1ada2d9204c5f6bdc7730fd8861a1f6f634d4095ac68357ffff935356cfdf2ea20e9a252160242482c8efbcd508b SHA512 a3f35a55dcd62c5a5e16a4b15f4847ff0b700de6badf0961c361b0fe9ccf99142c35e1213da7cc9dc4dbc4ce1838b73668b95591b3a1c69898ad2fb93a4cc30e
 MISC metadata.xml 638 BLAKE2B 309dd88d7961480feda8e50f7c6c2f63274d24fd2beaf6c751cff8224243fbb25f23c176c92df85f0d09dccc8f6a90c9f63a301bb2c8527827aff6c97df85410 SHA512 c2ae5eb56b99612125ed6063f369979c8888a6b253a3a47bb4f125f45a8923207f13d5eacba69ef6af3717017a50e1603e17701cad95b484270c5715cf2c56ff
diff --git a/dev-texlive/texlive-fontutils/texlive-fontutils-2017.ebuild b/dev-texlive/texlive-fontutils/texlive-fontutils-2017.ebuild
index 911e450f3553..7c507e61b283 100644
--- a/dev-texlive/texlive-fontutils/texlive-fontutils-2017.ebuild
+++ b/dev-texlive/texlive-fontutils/texlive-fontutils-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Graphics and font utilities"
 
 LICENSE=" Artistic GPL-1 GPL-2 LPPL-1.3 public-domain TeX-other-free "
 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 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2017
 !dev-texlive/texlive-psutils
diff --git a/dev-texlive/texlive-formatsextra/Manifest b/dev-texlive/texlive-formatsextra/Manifest
index 8af1b73fc9b4..a80b034aca58 100644
--- a/dev-texlive/texlive-formatsextra/Manifest
+++ b/dev-texlive/texlive-formatsextra/Manifest
@@ -73,5 +73,5 @@ DIST texlive-module-texsis.doc-2017.tar.xz 130016 BLAKE2B c64cf692a8582dcea4ddcf
 DIST texlive-module-xmltexconfig-2017.tar.xz 460 BLAKE2B 48985abdf4e6211a630fc928184d1bf4a93b1400c4fd7b9964e64ee9245e1e9357bff437351bf96abf0c20b8c835def9549f4af47eac50d53dc0d46e300a1957 SHA512 20d6c529e0772be2c31b1f47d353f19981c0c0c1790a7e025290f2715b747fdd189f6cb51f6cb9faaa990461e9a30d829854cdfedefb1b20cd1d362e13323c8b
 EBUILD texlive-formatsextra-2015.ebuild 855 BLAKE2B 4caeb81ac40eff97ac794179c4ab1133b4bc7da411bd0f27ac61cf91769938852ff6e4540f2aafc960f2331e99f1b2dcb1717f59418c84df19a4cd8b3c92a43e SHA512 6609dab2676c3f2d6ad28a96bfeecb8a97a40ac45678eefebe46163589ba8c5c3b7349df45a28bae4080fd67932fffe3273285317e345a7d825eda4bb39d49f7
 EBUILD texlive-formatsextra-2016.ebuild 866 BLAKE2B 52fbfe70db78a94d37f3438aa5e6090cd6f92145ae1881972736b0e2e0e3167bc2c4be23cef35eb832bd173884cebd6c6eb575574a256cc0690b09ef42e359d9 SHA512 307a695dfc9c40a722b2f7bda478c888d0f4777c85c0531c5c34b102c3203f8f65f1cdc44d8a258139599370091129664c194b5d7961c6b07a3b49409b7b5bc1
-EBUILD texlive-formatsextra-2017.ebuild 1213 BLAKE2B 2b881a7ffaceca71e20a30772e5c216feef6ee16ca3412817dd6a59bfe54a7ef91b540e6ceedeb728f908a311acf7e83f4485d72eee83239937dd744e3c3c86d SHA512 7a1f18e694efdfa3f7380d5ab18a6303a23089f90bd52db382ff7352a99a5664398b67b094156ef8b99e3aa10a70bcb30d6344147e30cbf5153a7e74b85e89df
+EBUILD texlive-formatsextra-2017.ebuild 1212 BLAKE2B 44a8d3b7f43dc0880976ae205491c7bac85b93d95c07647c66044838355e2979535ad7f46666a801fc0719b0a3a7225f10ad2b204995165bf5afb798c841e53e SHA512 49620da98ec783ddb31757d7bf405cb891368f8aa5494bbe1597f02af4e2d24a4c13454056d1fd8c50e232ab6bd4146488ccfb4e09cc426e0a3c1de3d1a1f391
 MISC metadata.xml 683 BLAKE2B d76a08b76354e21ad30a29835dc19c8c280313b330106276ff74f9221265472565ae8dc5582cab4963450482513f48a281af0adf7e2ebaa9adc7de2a14274975 SHA512 044d70fc0c48a776f9d169e0c5abd41c29ffc2508f05c175f301833cbc64f39f841effa2dab8a3b8c7ca94d487c25f3412593d3b173914c826874236e66db556
diff --git a/dev-texlive/texlive-formatsextra/texlive-formatsextra-2017.ebuild b/dev-texlive/texlive-formatsextra/texlive-formatsextra-2017.ebuild
index 1eeb53e90403..a4ec9153e7e0 100644
--- a/dev-texlive/texlive-formatsextra/texlive-formatsextra-2017.ebuild
+++ b/dev-texlive/texlive-formatsextra/texlive-formatsextra-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Additional formats"
 
 LICENSE=" GPL-1 GPL-2 GPL-3 LPPL-1.3 public-domain TeX "
 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 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2017
 >=dev-texlive/texlive-latex-2017
diff --git a/dev-texlive/texlive-games/Manifest b/dev-texlive/texlive-games/Manifest
index 04b52e8870f9..115a7d2056fe 100644
--- a/dev-texlive/texlive-games/Manifest
+++ b/dev-texlive/texlive-games/Manifest
@@ -228,5 +228,5 @@ DIST texlive-module-xskak.source-2016.tar.xz 14252 BLAKE2B fe640843de6ee3a74bde1
 DIST texlive-module-xskak.source-2017.tar.xz 14244 BLAKE2B ef03e62fd8031626ba3678f8812b13eaa416252ac287233bd696679d31abd661b5a2ed88b8b4624fac0ba9b7ccabee9cb9e32c38dd7c7bd1f1e4f2787cb04169 SHA512 91f482e0ac3d798507583729fde18a1a014c6f5e71507fb10f4c893613661488953529f78496bac476a6dab9d3d896d0b6eb902eb166b77b78c90148afad0375
 EBUILD texlive-games-2015.ebuild 1641 BLAKE2B c6df36330b7f4c8197a61399b75a2e44c55b69f63863ef4ee9f77ecf3713d002b25a18cff01ac2f41bb40bae0c581828ffc184575605e0a24baf073dde9fa7e2 SHA512 a2f2c66788974f68e16d0e6886a491628811c5e27598ec3ca1c7859079fe93190ec883f47fac696b4e228a7753b0e4480b76aff5ae0c1c011b4904a69e746b99
 EBUILD texlive-games-2016.ebuild 1679 BLAKE2B de35db32c8b09cfa753c54a8486487dcd3a58a5b738033ff96e4fe062c6762978ab06d0d90b4d4a2761da3f4fd248e1b3cb6c9428de503602aa0a57190b3481a SHA512 40edce778f8ac4e22b05258667c42be1fd6422b99f4334b1e3beefbf62dd5bf0d8f683f44a0dabbb5f4a3d0c67d0010a0c3af5558f0c76d8b0a5a3cbd451d1d5
-EBUILD texlive-games-2017.ebuild 1686 BLAKE2B ed888440bb4ec42461e6ca7abe78cd0d7da610f7f7e6acc79611aa75872734a2db8f8d41870a0e4a852f6bf9f3f5cc72c35b09165b31f99ee81be6eb2564bf60 SHA512 b7dad17d0007a22c48c1a54c137d9a384ab1ce62b52248b5f97e204217551809d1123dd8d52ba5d12c19ef0b3775f5622166e188dce29b669c3bf5ae00c05abd
+EBUILD texlive-games-2017.ebuild 1685 BLAKE2B 8850e7ef5628728a55c693c2ac79aaf0d7e46864bc43bd651871252d1e3f3cb5fe2b3565d9f9dd4052a1227bd29f03e1fb087dab38745007d4e9a6d7fb43c1e8 SHA512 fcec7495ca912abf1490cd4c037d784cc22ddca9b42cd74f78ab500124799631eec9d707cd8ea110b6afe6fca46a7fc34a1b4a40fb1b244d7d23f0f22063e53e
 MISC metadata.xml 465 BLAKE2B 3de0cdbc6aa2d82d9014a125adea187b4c28e22ce8da0eae7b50d4a7507beb618869f282d8a5a7258edacb43e26038f9704da1d61a86ccf86baabfeccc3f3d99 SHA512 026164fc27101f4b41d1a2b5a979762d3f75f1b0f13d74b7d3aa617ebe24d92708c3f68c7d4d12887c821b3f799cc0528f38f0a20507f5ceb1e427f300d094c2
diff --git a/dev-texlive/texlive-games/texlive-games-2017.ebuild b/dev-texlive/texlive-games/texlive-games-2017.ebuild
index f0d4e9a595f9..d11e2ec20c8e 100644
--- a/dev-texlive/texlive-games/texlive-games-2017.ebuild
+++ b/dev-texlive/texlive-games/texlive-games-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Games typesetting"
 
 LICENSE=" GPL-1 GPL-2 LPPL-1.2 LPPL-1.3 public-domain TeX-other-free "
 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 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-latex-2017
 !<dev-texlive/texlive-latexextra-2009
diff --git a/dev-texlive/texlive-humanities/Manifest b/dev-texlive/texlive-humanities/Manifest
index ad5f4ff0889c..4a424b2ae02c 100644
--- a/dev-texlive/texlive-humanities/Manifest
+++ b/dev-texlive/texlive-humanities/Manifest
@@ -375,5 +375,5 @@ DIST texlive-module-xyling.doc-2016.tar.xz 148336 BLAKE2B c5713dfb4cfcbb53358573
 DIST texlive-module-xyling.doc-2017.tar.xz 148336 BLAKE2B c5713dfb4cfcbb533585738d9f84ebf906f3b86b207cf846261ad89e279ededaf9ecd418a8f2af882ad26a1af11a5a9264f4b497a4c2096262e78e0c666ffa51 SHA512 66da3f3cd34f67c078102731dbbe218fb000e96727a244c70cab046836e85af89fbb3987ec2696bac85885ed277a6e33ac955214924265be639ff228382a8ee9
 EBUILD texlive-humanities-2015.ebuild 1984 BLAKE2B 678d593214418f3e09d8edcc52525594de0d621ac11369535f724bb380213456fe9cc76a4d925fcb92893943c5d81e0da2a117949b3d4085498d202f1c4eaeaf SHA512 90194819949102591cb8f378da050701ed766865e1cb167fa724d38822b07c45141d20bbc4fc90ef8a5fc6683229c30397c6ddcae1ccb691ca10f24ae9a412bd
 EBUILD texlive-humanities-2016.ebuild 2168 BLAKE2B 1b08839cccc0590ee88549bf1fc5ff14450a86996ee6483e85227e62bac219880bf0b9067f65365112873adbad1be55043d0bdd47fd039a5794c3dcb3771c850 SHA512 33cfe4d2f7ea9d94a198a69b2cf23b77d90da98b03309f1727d86dd25be315c90062235529b2fabae3e48dcdd142a6817d23effd050c2a00af3b0924f4b33ce0
-EBUILD texlive-humanities-2017.ebuild 2175 BLAKE2B 7e6e45ac1353ea9cf7a2a87f649ebffbad3d22afe1e221dd82224276202307c65764fc7e58e2d518ededcd690d41a6844c6752e4904277cab652cb029478bcae SHA512 520db5aebe92c2e4b2c734563ede605dc18809b0ab3bc5d497df501e3d93d8e094b616c5459f6028c847de09ccf94d56ebca36fb14b850e19cdb6f82bcb330cb
+EBUILD texlive-humanities-2017.ebuild 2174 BLAKE2B a85f26393409babf09fe38250b74915b17e9b4858c1c1e17224b6b3228037cda22eedca99d649e28abf2a2aaa25bfaa50014500249c63b5d70eaf34e9a7a57b0 SHA512 0ba42202e41fea2446537e9ee13eb4de127e7e6715ad6dc964c34ca2a1a8ead9d8a437a93cb493308572b137726610c1fc47dbcdb8774eaa8032c8962793f8fe
 MISC metadata.xml 475 BLAKE2B 2142cba5684575516bfc39a7ce98a7f5a496cb309e7d21d6f90f13d5d9999291e29cc3d85f4b4242acacedcee02f0d224e27d6ace55e69c7a0e0fae38360b278 SHA512 32785127247aaffa27bc13a63d6d39b50084b437895ae3eab812e9a047efbda0e59ff3bb8281654148f6c3d4fccbd2223c984b92b7a38825efdb19083296567c
diff --git a/dev-texlive/texlive-humanities/texlive-humanities-2017.ebuild b/dev-texlive/texlive-humanities/texlive-humanities-2017.ebuild
index e9ac37929a6e..153ffe0ba9f6 100644
--- a/dev-texlive/texlive-humanities/texlive-humanities-2017.ebuild
+++ b/dev-texlive/texlive-humanities/texlive-humanities-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Humanities packages"
 
 LICENSE=" GPL-1 GPL-2 LPPL-1.2 LPPL-1.3 "
 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 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-latex-2017
 !dev-tex/lineno
diff --git a/dev-texlive/texlive-langarabic/Manifest b/dev-texlive/texlive-langarabic/Manifest
index bd8bac29cf98..860db287d845 100644
--- a/dev-texlive/texlive-langarabic/Manifest
+++ b/dev-texlive/texlive-langarabic/Manifest
@@ -102,5 +102,5 @@ DIST texlive-module-xepersian.source-2016.tar.xz 71732 BLAKE2B ae89d5f706af05451
 DIST texlive-module-xepersian.source-2017.tar.xz 70908 BLAKE2B f2e1a6422ff0faa994c0b38a391786cac7b4c416dfd66c3586a15e61de62cc84f3165f93871a1cc4c61485b2870d1d76fd9058c344b168e079ab121ea19a274a SHA512 be7fb30ad51937d2c500ddc48bff37bd8b8d109b08c7118f913e6ed145d8c7a1fd327b0f1af98b039f0587c455d1d70bc9d27f3527ae8b2709e87fab3008e3f3
 EBUILD texlive-langarabic-2015.ebuild 1061 BLAKE2B 7420181b852bc970b4f0b1da994063bd3680b34b70568114227a71e7911f094487517947b546f0618597839f2639c1b00e8b9659934defdcea030ce02a2baafc SHA512 3866788553d62879b1c639ea0ec2ec2692bb208dbaade1b64e184501f1ac1b2c545ea334e40e5533c29609a3a866201efc9d1db119e7b88bbc989ed3563ee7d8
 EBUILD texlive-langarabic-2016.ebuild 1204 BLAKE2B 5c7bd475b696ef312b9dc3dc35acdc5bd07efc4191de4c90d42c0a55f24ba36573d99bb94ce03b5e5519f8b98ded1505dada515b2519ab2802c5d49c0ce08cf4 SHA512 827155b4be0245106d23b678404d6a179905fd90b3c95aa1af3752e8018c20e03709d4ae500906d949915d678523c21a7140e1c588f640919d8547c0815ea02d
-EBUILD texlive-langarabic-2017.ebuild 1228 BLAKE2B 04b55ca624c76f3ca2c78f4d9d915bc439e7ed5185024ea14863e3b00665512e5fe276752091c8e01cc22ec199bcbfacf51bb3e31de2097bc23027bd1433e444 SHA512 d67e9e116b9bace0be03825144548890b7e3a80ec1db44749e57d0f8249f758f8471c625813944238c143ce9435cbb4c5ef5890c15cce509014ca6cd30b84ab9
+EBUILD texlive-langarabic-2017.ebuild 1227 BLAKE2B 245f33de352636921707b1a227f32932ba6b14c25d8ae993a8c92de41b26c789a6da4b2794af6cc81af02061aa814fc50c34f6526cf0a473336dba263d1965e3 SHA512 a7582ca9dcaeb2305435bb2a5cda8c92e9b11a40a10ee8124e9cb2edd4be22de8d53b69a3e0f88c193c5e97d9fc33b4c8929657c4aaeca6a38d52f999652f2ae
 MISC metadata.xml 442 BLAKE2B 736ea2f06e692dd1cb0b4438d8387f401012d78d427da16aa300d9e875fe9f531ab1cf7837d07e131f93a40868af960925fbc300de440b3b0c870d7f444edc19 SHA512 152893abd014e6d0faade3d41cc1664b3a875f0bfcfc5788e52ede435a7b6aaf7a1f7b717dbe52347c515740071353f160187961d5dc80e58773870d42115b9d
diff --git a/dev-texlive/texlive-langarabic/texlive-langarabic-2017.ebuild b/dev-texlive/texlive-langarabic/texlive-langarabic-2017.ebuild
index d54ab1aa3e29..60215acf63bc 100644
--- a/dev-texlive/texlive-langarabic/texlive-langarabic-2017.ebuild
+++ b/dev-texlive/texlive-langarabic/texlive-langarabic-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Arabic"
 
 LICENSE=" CC-BY-SA-4.0 GPL-2 GPL-3+ LPPL-1.3 LPPL-1.3c OFL public-domain "
 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 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2017
 !dev-texlive/texlive-langarab
diff --git a/dev-texlive/texlive-langchinese/Manifest b/dev-texlive/texlive-langchinese/Manifest
index e1ba8f05eb0c..df7773ff2664 100644
--- a/dev-texlive/texlive-langchinese/Manifest
+++ b/dev-texlive/texlive-langchinese/Manifest
@@ -126,5 +126,5 @@ DIST texlive-module-zhspacing.doc-2016.tar.xz 169376 BLAKE2B 45808ff96133386df78
 DIST texlive-module-zhspacing.doc-2017.tar.xz 169380 BLAKE2B 2576e25d7f1d1fbe8d6c79267296473396bde0e88fa5072f0a0e47c6ad43da60170f44c9ae0c2ef4016abdaa915fcc52768051af0e97378a60f356b5f5218508 SHA512 0232956c6b105b02dcc036be0fb5bf761dd99119ed9a339db2c882bdff9ddc5ed17b351cdb0dd297c76760b298306db268794f73567873c62d7eb361a60e0fd7
 EBUILD texlive-langchinese-2015.ebuild 1330 BLAKE2B 041767732d0432a9f2e3e94812112cf4edc87e2636405bfbc4637dd462c556461ec01d336dc2e3049efef08c7c8b59326964b58c738b0f0958c1f9597c9d331e SHA512 ff6c43158d33da0115af1dcdbbec5fbb72a101e95ef61387d42e9ccc81368427d949a50c8e09e770a04dd2b45a62aee7e83a427e87fef7acc12ee70ed31d1a15
 EBUILD texlive-langchinese-2016.ebuild 1472 BLAKE2B 0b97940fae8153ca85373518010b8f173ad73b3df297604b4e5f1fef990453b055da6069092801beab766172d2b24e5057f7ba80c444feba819304879a7010ae SHA512 7bbd67fd50f2392f41cf9113fcb9ffcf7bc3f40a1d664ac92802ed63bb55a9b38e942d1620cebcceeb0307f8271612c595d50a90b9a9bda677f9bd37fa8673de
-EBUILD texlive-langchinese-2017.ebuild 1472 BLAKE2B bab5d281062e570abd409906027fa6f72d956d623d1199a6542fd4d243f8f2c4b8726de4c943433afa167a506dc093696f6678ecaeb4219ba60c747a40028e3e SHA512 b8e8293e223df438bbc8b0a078635ea4db8c7343f506450e1a93ee32f0ad7ecc429623cc3cfea0ca64efac4c16b91f1bf1976845a9fbb1ba70718d6b3e7f27ed
+EBUILD texlive-langchinese-2017.ebuild 1471 BLAKE2B a29e24349653c97d7156fa3b7851793b5427544a3e96e8cd39e66f9d93731f92491df2c766d345965b0fbd95aee44e956b607ff18b5be28117467b9125779919 SHA512 dd65f219d79592e79dc81cc4615ba1c77a77cd649ab5f1e2a50185fc98174cfa65c77d580d3e83bc57011d2753fa3560cb419d95df81e9b23f518466d2623114
 MISC metadata.xml 474 BLAKE2B 747a030b403eeaf6d99ce9fdf27b18216b5d4f22d07d93360e4055a25e7aa0927d4d2ee9df26afdf67838027cd2bf4033a9bbb2efa2a8cfce5c9894bfa6eadc4 SHA512 4916435018bf6a3a3a4ed6e2b140c6970bcdb9a97dd0fc55e1572436a1d58ce0063c0d48de606fb266fccd470882d7643ead61a37e4cce6cf5d326ea39526aae
diff --git a/dev-texlive/texlive-langchinese/texlive-langchinese-2017.ebuild b/dev-texlive/texlive-langchinese/texlive-langchinese-2017.ebuild
index 997dfe79478a..e7d3094243fc 100644
--- a/dev-texlive/texlive-langchinese/texlive-langchinese-2017.ebuild
+++ b/dev-texlive/texlive-langchinese/texlive-langchinese-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Chinese"
 
 LICENSE=" FDL-1.1 GPL-1 GPL-2 LGPL-2 LPPL-1.3 TeX-other-free "
 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 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-langcjk-2017
 !<dev-texlive/texlive-langcjk-2014
diff --git a/dev-texlive/texlive-langcyrillic/Manifest b/dev-texlive/texlive-langcyrillic/Manifest
index d6f83b50ea1f..d35b07f62076 100644
--- a/dev-texlive/texlive-langcyrillic/Manifest
+++ b/dev-texlive/texlive-langcyrillic/Manifest
@@ -270,5 +270,5 @@ DIST texlive-module-ukrhyph.doc-2016.tar.xz 160948 BLAKE2B 7844b1c9d0efcaedbd77f
 DIST texlive-module-ukrhyph.doc-2017.tar.xz 160948 BLAKE2B 7cb5ecffd21eb994dec06bd9666138913a429895d5acb5a643e1e388c0b94eeafcc57868816acd8432fd198e92e54b23455336424207f799c8f5934f4e749207 SHA512 6e426ed9bdfd97145613330d613d7c43c15c40e2c7524938f569004e2ba67adc8622a5ae3b58f51e868d74b83618651d107e7f5e52f4077c21e66e0468497a8c
 EBUILD texlive-langcyrillic-2015.ebuild 2281 BLAKE2B e3b4467b62f304f6a62c782576aee7311d8fd223d62bf447b4d4d7e79392b84ba20dae72463760894fc8e5d7d92bce334e5788014c412efab1342ca155408cd0 SHA512 dfaf50fbf9cb0a2e68f7b5520a188ffed47bb2e645fa12995b1e5b8022975488facd2fe00e8d188b2b5d30e897176fea20de7d66ad19eb6fd2d1cee1d755e5c9
 EBUILD texlive-langcyrillic-2016.ebuild 2479 BLAKE2B 8b51434a007652fcacb0bf389dc65beddf872a33804a931f6e527db8eda61302f43fbcfcec99c0906bc104a59a6e7f18c402c54731f5f7f1e7bbb216a3b29749 SHA512 03307bef68df6061ff2d815d3683e5dbdfe148d91a045a24c46c0351a0cca97843681242bb5239e0480b093fbcf0ef7488a2a1b74d4c8611db505674a9ae72e9
-EBUILD texlive-langcyrillic-2017.ebuild 2497 BLAKE2B a223d4bbde6136340959b0cfb332a42f9f818ef38ecdec4316f4c20d6afd376ebe87fda9d75b0ffd15ef44aec5d852101f8d6be905fa3bebdf10308721ab889e SHA512 96677f2bb06bc4d603898a1b752c706ac59d47ed60ba0cbce7b828362e939c5232403dfd84d6566670f367c6c28fe3787e7fa9ff4c7ae1b1340b54b321d4044b
+EBUILD texlive-langcyrillic-2017.ebuild 2496 BLAKE2B 2c2730549a39d024e51d6a56ae92e8d1a4fdcfd3e53ffdd64a796c2e46046e5684ac384b34c4318b2e3ffc830f3381da039f8a5e59ee85e83062cd079d102b90 SHA512 5bc6514014e18a7308bc772a99361f2f2fc4ea8d69b329342366b8c3f7ec6ffd906973280862c2d9eedb8be9d1a6d9fc4acf62befefec6c1fecf06b5913581ef
 MISC metadata.xml 525 BLAKE2B c1d2a5c32b236c45931436789390fbb09eb05a21874a13c607ebeae2b722fcf4d317a5df44fe243aed230089354fe17ff7f8681e3b75fe03ec48ff0df6886113 SHA512 3ce96ce9895df4195578f5e0859a103fb64332cc6716bf5321751fdbfdf30ab19d32ca82aafd2d9942c2a410a17cf35a970f3ec15743a5b097b42706e4ef5fe3
diff --git a/dev-texlive/texlive-langcyrillic/texlive-langcyrillic-2017.ebuild b/dev-texlive/texlive-langcyrillic/texlive-langcyrillic-2017.ebuild
index 4a9844ff66fa..11351084f7cb 100644
--- a/dev-texlive/texlive-langcyrillic/texlive-langcyrillic-2017.ebuild
+++ b/dev-texlive/texlive-langcyrillic/texlive-langcyrillic-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Cyrillic"
 
 LICENSE=" GPL-1 GPL-2 LPPL-1.3 MIT public-domain TeX-other-free "
 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 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2017
 >=dev-texlive/texlive-latex-2017
diff --git a/dev-texlive/texlive-langczechslovak/Manifest b/dev-texlive/texlive-langczechslovak/Manifest
index 3fb800ff0ab4..b9d0a08ce35b 100644
--- a/dev-texlive/texlive-langczechslovak/Manifest
+++ b/dev-texlive/texlive-langczechslovak/Manifest
@@ -1,79 +1,27 @@
-DIST texlive-module-babel-czech-2015.tar.xz 4872 BLAKE2B 0bcd9f51f0ffd0aad9b3d96b136ec827d4d819b59c5983feb0721b1a3ebf726a1a44e9c99c935c9aa0f1d4f5884b0140aa05f22960bc92b5c3659edea6f39f46 SHA512 14cc5701540b8ff2a5e7af88ca2a35009d5ae1c4f361b755323679db0c4a0a0cef595da1f10e5bc02e6652cf65253acdf4ac0a24a8729c774ba64b1afdaa79cd
-DIST texlive-module-babel-czech-2016.tar.xz 4880 BLAKE2B f69224f45cdffa2e6e5552a96242e1be5ff03bb7d2b50fd1c6c11d92c347d6dc884cc1cfccd78296c4288c3682e3c225395a6d40142e30f7d440ffd60fed28ef SHA512 8e596ffc9b44d3e42ad459ff45e95f8d5c0538df95d6de66c5ae5ebb78f8427046213f05f7457160df0b3d5965825c331e6b3a79515b3e393e7728d3b3089e2a
 DIST texlive-module-babel-czech-2017.tar.xz 4880 BLAKE2B f69224f45cdffa2e6e5552a96242e1be5ff03bb7d2b50fd1c6c11d92c347d6dc884cc1cfccd78296c4288c3682e3c225395a6d40142e30f7d440ffd60fed28ef SHA512 8e596ffc9b44d3e42ad459ff45e95f8d5c0538df95d6de66c5ae5ebb78f8427046213f05f7457160df0b3d5965825c331e6b3a79515b3e393e7728d3b3089e2a
-DIST texlive-module-babel-czech.doc-2015.tar.xz 188640 BLAKE2B a472cdb84ff1f6c99de029b64b206128a1ae9933aa004e1bf66d9c1cbe816837f391dfb2eb8f318e16e0af4802bc0b403c2ead8c6e70a5f2f6640fbff49a57aa SHA512 045accc944c5d60e35c96524469ebc729845ee08e1d1fa5ecc573081b656c3fb9aa2ab272dc5b9bc12e2606c39d6f8ba14d5183c9349e606110fdcf5b06d36ce
-DIST texlive-module-babel-czech.doc-2016.tar.xz 188640 BLAKE2B 828fce5ba28f228c43303c028ebbc64bcb36de799f894ffb962035687c2faf0887fff4f2550b6a3b8217c0b856969181f2d30c339eed459728343d751505579c SHA512 1e211d0e835db2d9b535c6bf81425a66c10873ae8ea99debf3c12fbfee90bed326c6e3c40990836a15372a31a1f8db2e591180bffab88b84f00f11dd2f28c363
 DIST texlive-module-babel-czech.doc-2017.tar.xz 188640 BLAKE2B 828fce5ba28f228c43303c028ebbc64bcb36de799f894ffb962035687c2faf0887fff4f2550b6a3b8217c0b856969181f2d30c339eed459728343d751505579c SHA512 1e211d0e835db2d9b535c6bf81425a66c10873ae8ea99debf3c12fbfee90bed326c6e3c40990836a15372a31a1f8db2e591180bffab88b84f00f11dd2f28c363
-DIST texlive-module-babel-czech.source-2015.tar.xz 12548 BLAKE2B ab5dd52ce6d88b21873613fb0444b4c8d1c845ebf7e9f84a34e43387f62b2a9f24226ceedf59bd6fb6a0ef8774d97385ca788cd42af8d3c875867f3c43c23577 SHA512 a4961f4115f0a0e084a317c101fe971096bfd778c5bcd6161d5baaa1c8f85a7927da23d729a0cb07f59475b7615622b341a86299d17e78d4ee67a522187b3f8e
-DIST texlive-module-babel-czech.source-2016.tar.xz 12548 BLAKE2B e8c1b6b9a7cc8deb62babf3bc530f0e54cf58c82992f36eafa6a2550e889244585b237bc47d873e24d0f8a6271b1d7c33d3b77c57051402a411fca8ffac98e2d SHA512 0e1577c819be0151ac7aefc87f5287108840af643c3dbea36e4d9eedab93da4525c0e316893618889b2926cc507591e1e0bb4a6263f385eb158d0c1a003bce5e
 DIST texlive-module-babel-czech.source-2017.tar.xz 12548 BLAKE2B e8c1b6b9a7cc8deb62babf3bc530f0e54cf58c82992f36eafa6a2550e889244585b237bc47d873e24d0f8a6271b1d7c33d3b77c57051402a411fca8ffac98e2d SHA512 0e1577c819be0151ac7aefc87f5287108840af643c3dbea36e4d9eedab93da4525c0e316893618889b2926cc507591e1e0bb4a6263f385eb158d0c1a003bce5e
-DIST texlive-module-babel-slovak-2015.tar.xz 5412 BLAKE2B 3e944d66520c91cc53e53141626ad1298c98df52915109eb629b20feeeefe9f3008f9a62812cce9545ec31304197f8225e34422788f67b61fe6f91e44ca7f3d7 SHA512 8d0c716d0cab6a7c81a72fb3bf8e813848d6d5a68de5d1edf3a5516b596560d7fd825a91c719fd1ae8650508e8f8347584942e4ffab84b7d7aa6ff0b167107ad
-DIST texlive-module-babel-slovak-2016.tar.xz 5436 BLAKE2B 96b3deacb6a13aeeba0fdf29a7d95ccdca67507e42b2097cc5b4f012a21e01db34dad18a1b5df06f544ca78b92a7bc6130ac2a41d6148b4bd23f8fcfb7022540 SHA512 1587e7f3a2bfd212283ae8359543476cf6562aa847c549eead1ca99677cd8a5fe13c726aa1ab142696c73d6cb304c24b563353a66d8e1a67bf35e785b7bd25ff
 DIST texlive-module-babel-slovak-2017.tar.xz 5436 BLAKE2B 96b3deacb6a13aeeba0fdf29a7d95ccdca67507e42b2097cc5b4f012a21e01db34dad18a1b5df06f544ca78b92a7bc6130ac2a41d6148b4bd23f8fcfb7022540 SHA512 1587e7f3a2bfd212283ae8359543476cf6562aa847c549eead1ca99677cd8a5fe13c726aa1ab142696c73d6cb304c24b563353a66d8e1a67bf35e785b7bd25ff
-DIST texlive-module-babel-slovak.doc-2015.tar.xz 195276 BLAKE2B 9235e518aab592752df6a7ffe57bf7412c0c7e1f6f95c831f418f80d54aac82cfc56a5526661671f25dc90f766d0286eb6710f77372fc7d235751ce5320b7f5c SHA512 9b4cdbddeca935ada620b9691eab2578eb2caa8703bd87f2807e3e0ec739cc1b04d42747e2a2441f9354329cb0be466c236209f1f43c7db1d1fb891312a9407f
-DIST texlive-module-babel-slovak.doc-2016.tar.xz 195276 BLAKE2B 204ea9a8ec5a521d53c4ea9f588d4ca61b6e5eee95a912491c4cf36d99d26a5bdeb56b45b781cfaf5deb3512d05ed7349699d9cb9f4a162a2371648736957009 SHA512 d24171958681d5a370ce3de1655b73306f0d2eb6fa712a293e5631857c6c136727ad85e949cf832f6628345215817508d13770dfb37a58e003df127819767071
 DIST texlive-module-babel-slovak.doc-2017.tar.xz 195280 BLAKE2B 6e717bde7a33e0e10597d7af1b886fd0c06ec7e2e19e97903fb37e0278421809f64f36febfd2b32113ef2a509ac81607a69d5b9595a0f1d726bc0f27a1429b43 SHA512 68631570c6b1d545e2011680adef6fe7ff8907449e0b4fd89485813ecc0d685ce465df2b1214a554b7cb540245e897f049ff98e93da5e28e29136dc59f4c3ec4
-DIST texlive-module-babel-slovak.source-2015.tar.xz 13920 BLAKE2B 204d7ce3c9c3d2d56c9f553057e678f96e8f06861fdb4bf285af71e690dc106e4f2757a8566827f96d2ba18f98517472715ecfd5fcd32d5a1239b46982579109 SHA512 31a384d92dbbd29a85ee3e26940ddf1527d4f12cc1971a6bdb887c15bbb3ec8e5bdde297fb34754a9f96e359f1fb29e22fe0a380e28603231d54054da5d50038
-DIST texlive-module-babel-slovak.source-2016.tar.xz 13920 BLAKE2B 186c14ae4db9078fceedb0c45e870e9d6d1a29bdb8c5fab3b9184f35095c85124f3db8e1c4243d23efb6ec81164847e1b9cd4d964517abe90b14349320e663e9 SHA512 4f6298843258735ce79b8d24ae78869660edd4a4c39232400876b99b7a09d1c8aee98c130e04b7c642f8af810550404e69ef41506b15ea8a437c4c58c158a97d
 DIST texlive-module-babel-slovak.source-2017.tar.xz 13920 BLAKE2B 186c14ae4db9078fceedb0c45e870e9d6d1a29bdb8c5fab3b9184f35095c85124f3db8e1c4243d23efb6ec81164847e1b9cd4d964517abe90b14349320e663e9 SHA512 4f6298843258735ce79b8d24ae78869660edd4a4c39232400876b99b7a09d1c8aee98c130e04b7c642f8af810550404e69ef41506b15ea8a437c4c58c158a97d
-DIST texlive-module-cnbwp-2015.tar.xz 9912 BLAKE2B d8434e5a2f41717276e099dfb65991edf1bbaaa3580b59e92841d82953a967169f1942a4ecc5954ad40f75a852415bee3a488781e40fec52d5b145e1d880c934 SHA512 56232e339c958bbd2fb43217c4fa89bb97c0f31de1f6c0fc10624a053d4d59d6ce74fdf54bc1b516fd6f4b6cd4175fdae7e52797465e0602f0570f7721bfa906
-DIST texlive-module-cnbwp-2016.tar.xz 9920 BLAKE2B 98157832258210dc819a8bf896fbb0bd10d2bd40ab8b40febb171f0da80ecf55b77c00635f570b25050c35c256e81f5601faad991054d5c2063de5f4aaf90f3a SHA512 b750e0bc64057cb7507f799c1e3a128edbe762a5180abb016e77152a6a7cd89cf43f3e3efabafb69b056e95de0660eb6176e35713841736b40f42e2fd811d2be
 DIST texlive-module-cnbwp-2017.tar.xz 9920 BLAKE2B 98157832258210dc819a8bf896fbb0bd10d2bd40ab8b40febb171f0da80ecf55b77c00635f570b25050c35c256e81f5601faad991054d5c2063de5f4aaf90f3a SHA512 b750e0bc64057cb7507f799c1e3a128edbe762a5180abb016e77152a6a7cd89cf43f3e3efabafb69b056e95de0660eb6176e35713841736b40f42e2fd811d2be
-DIST texlive-module-cnbwp.doc-2015.tar.xz 684304 BLAKE2B b78fdbd6bb65d03064782a2cd7bdf5fdfa23be7ae057a464242c05fd35b47c50e0ca8476ae6167bf6ba8bf0f3cb9cb9cd842f7bbde786116dc035a12af2635aa SHA512 a7db2079cc35453bb590cee82466708c165d78f2169b23ce61ffe90f08a76c4deb6bee78652d8991c7ec7d5e774dddb99b6a13171ce11cf3a46c8e04c7004fed
-DIST texlive-module-cnbwp.doc-2016.tar.xz 684304 BLAKE2B 6d4bdd40ac8e96239d2f364ac3e63e995435bd83eb908a372621df0d211170a1a58cc593dc81a9c75a1814e3825abdd3dd14e2a44744bbdd7127920acc45edb9 SHA512 2aa305a1eba8a0a22153bb0c0543730e3a90fa7261985a9f3a4deadbf0005a7592b9eca9dabc81ff86bf29789da89efdc7bc6926b9b2a348f218067bccde4d3e
 DIST texlive-module-cnbwp.doc-2017.tar.xz 684300 BLAKE2B b28e548c16318aa70b4cfdaeacaffd2cda33b8c72a8cac90ae33ad6eb64b8d14f2a14b003afdc29a7d728ebdfe8a8941079ea0d86c21296f3e52b53bc070b519 SHA512 5bc70d4d8b8ff2d579a310e5b5f949b32221168c16b108db195532bbc5efcd664fe4556ee61116a1c897042531170497015710f9c65fad5aad22b143be29c1bb
-DIST texlive-module-collection-langczechslovak-2015.tar.xz 372 BLAKE2B 655d2f5acbe21dbc0b07b10c7557f42e94ad595f75759d6cf0a0db518d4b85a480a34eee08aeb7d24c864dfe12de07e827cf75693971da2b37720ae4797d61aa SHA512 834fc230095d002d45ee92c27a03e95c3e5a5afcbf384d299084624971b34c8c4303ea82a439c0d3854df916995eb70a9cf4db46e84b6d6c5b1ee59b78eb6396
-DIST texlive-module-collection-langczechslovak-2016.tar.xz 372 BLAKE2B 033a1c55c17844be5887b1d9d973a9325572817980465a658968d0d686ec03eff04d1369f7e86b42203d4ea8159f94d4edfedf0f51004017bd4cb3026bc0206a SHA512 c5cc55ebce792c575b5ab0da9a485b58a35dcee41df3b24f40e8eb89861248022e18185070808e3f81759e8459d3591d23514d76345ed9be136fbb6d4b8de79e
 DIST texlive-module-collection-langczechslovak-2017.tar.xz 372 BLAKE2B 626de1a192702b338ef3541f40032858a89c29e7eeddc12f11986a70cc74f0e2c64a9ac5fad94339d9cc2f1e26d7bacc9c78bfca0523cbefccc9fc85cc77f483 SHA512 8438ad9bb0ef9e65ba7a15aa55aee12598d5a1bf080c44ea6aad9626974bb410dad0248f3006ced490a3958e9b65c175e1518907bd77a57b22b3c719135ff9b2
-DIST texlive-module-cs-2015.tar.xz 1798396 BLAKE2B d4476a74e0e47e666b23a1b6034e3e773c6b7f75be4907429c5496ed1b083250a1a599fef2c70112ee1ca7a7746af18ff39893702ee783a0c26482b35a067040 SHA512 537038d76ad7f0d6a2c72cddb1717a582a1a97ac0ce99b380d7245f701287e16166a270494d97451e8d18a37b068353a47bea21694627e06af9cb035af618970
-DIST texlive-module-cs-2016.tar.xz 1798752 BLAKE2B 3f4502d65013d670a3acef3aba5e97cde726137c74f73b1592f8e834ea569babc06bdb4e71b0d15d28119f0bb25e5d40b5f8bd0c088ffc620ee9facda62f9d5f SHA512 62afa172f42518fadd2a26d1328503f237a3e6b048c47c8e07cd408903b20ff909457c7592baa1ff6591fd5a84667005ffb1247d3038d0317b48d19714c89770
 DIST texlive-module-cs-2017.tar.xz 1798564 BLAKE2B b09c1bc6b830e7a2faa5c552224084dd1f51ca71e5ab330afb603fa811dc09e9808e25609d037b587a0a813b95cac39f844539291ebf81f68ee6fa42fdfe94aa SHA512 9b004bc7e0dbfd1d3317ce9cbd8aab56a2a7f0a1b7fc1f7bfeecd0a4f91e6ed749300cfaaeda46302133789465c7dd9ebf8177249cb1142b17620c1dd2991c4f
-DIST texlive-module-csbulletin-2015.tar.xz 6204 BLAKE2B 699e3c4898a1e09f9f24ac63177f6ca7b46bf3ab3ecf45a13336cd25129378fa2da36bb68a2b95d73255920d267e306f8cc04ba013be47ebab4cfc1bd5c09fc2 SHA512 bc567977047a07f5dc0ec3a2fec8520b843bafcaecf11ba656d5c15da1e965554a82475df21cc9a9ea196a66d3e71ce8828cba61eed47728407e94adca194ef8
-DIST texlive-module-csbulletin-2016.tar.xz 6212 BLAKE2B b98dce63e4e0832982e458d9bd724bfb1dc8188f0664a644966f11806134278b6cd51e541b836ad803a37a4b35e8c3ff8070b62d47d8d5647b62603d18e36b87 SHA512 639eafee60bdf33dacad108301620d50d1c4d5005adf2780fef3504d853c3cc91d465eb0a70461e638860de07f9c7f3faf1c5ef399fe2ad83c087aa4bb5af98f
 DIST texlive-module-csbulletin-2017.tar.xz 6852 BLAKE2B c638460d52b82db65324d146dcb89df27387cd6103b3474d75d15c299fd1424c332e5def2a20369118bc4855bd46654be516f085b31ec4603b60398eb7923b31 SHA512 106b8cbd8ffc058e9dfdcaa348d984da4dada8906f7f71f0f10f59b5905f49450e67025ae4c0664bdee3c39b6ee903cdbad4e77568d3653a795decb1ffb3e213
-DIST texlive-module-csbulletin.doc-2015.tar.xz 243648 BLAKE2B 233a00b77bf677a393d5411bbe827021d1d1b674613994ba53ab0f9ecb36858857160e83aad0a2d2d11ef47b2ebd231b0991c319f97a05939ce62370fe94d794 SHA512 aa800d04dd1e221cdf54b958a662c497c4816b7e1410a68aff50c43c16da3066b4657dbfbb151765379410efd66b47a36eaefbc7043b664575270637f10901fa
-DIST texlive-module-csbulletin.doc-2016.tar.xz 243648 BLAKE2B 2d132a92195edfc3e3d1dfd9baf136b62e6aba618607107aaa45b0a175dd1d018bc3011d9dc93a884219803afab1b5f6831be8f3a5f515ee97f9869e85e47f44 SHA512 2e1f50d7d301ab3ebf434449259c87e1ca76c5d5b2e2ccd8b0c9637b8b6fb0985e0e93dd4d21ada1877d46c3459b5474480cdec5fa7bf9a58cf72668adeb8502
 DIST texlive-module-csbulletin.doc-2017.tar.xz 269632 BLAKE2B 7d7ffd558e608ad5d6d9e1fe0794274eae39ed03658da50e00b754cad039a5fab62a6f34c1035092861d837a2c14fe96bdc5a179914625747b614e70c7d946af SHA512 e66bb6041b0df2e450cd43193dc0ba10f1262be889870a14118908b63a27e3415936dffd0d2eaddc33e5ec3c5416dc7ba68d8ee5fd86745607b4b51a0852627b
-DIST texlive-module-cslatex-2015.tar.xz 12596 BLAKE2B 590e449ed8cf83da8fbcd43bd7707e3c6bd6cc8526e8aeddca40a0a0f5907f36de5a7340af556d5bf56d87f0e3dc510f3ff6c787216ebb82da5a1f362d8b0a13 SHA512 c572e467db8bf6f7ee0d87e3514a39b8e560f76d254651d1875a175ef976236e47a5538e247e8dc4db7d4aaddb4b3a33eb1f45839fb18f7f77312fdc8e16a995
-DIST texlive-module-cslatex-2016.tar.xz 12652 BLAKE2B ac6197d0f5860b976e2944d09c852d59a5b155e31f66566754eb26d5a2beb1e557f51df913d4b54fd53fd69024ae8893ad061bad1bdd4e0045e264e3adbb72dc SHA512 6449b5c8ad39f946d33db1cf4f99efbbf620fb8aad55f818773fb1fc1f901bd9a5b105d1050a1b2a60cee9b3ca558a9b24cc7faafe4a274be86b4c58b0069108
 DIST texlive-module-cslatex-2017.tar.xz 12668 BLAKE2B 78b9f150f12fbf8a57a29c34d5eaac0ad02ffdb542f18c12c2be57bebdc2fd07f923ce4b1d85a6939ab3b7415877a5ea8fccae832162cf87fcf2a94cfbf659a1 SHA512 b9e7df64513881cefdf880b575329c57eee2607cb37c9e703f22c8782bb09ddcdf57f7bb844cee80242e21c9660a5a401b51c5ca39b20789c8168c161d9bbc37
-DIST texlive-module-cslatex.source-2015.tar.xz 24036 BLAKE2B 76378a3fb13d3feec87cabdce94416223c13e9ace6c4580e0454a9c9ad6766bbf5c03a89d1dcfd8ed00cfe0995b6b34a8f5debe8622853c22a514012b54e35ba SHA512 fb8b159ecac6acad8158a0264603378bf5ded95aed0215405d9beabf52da7d2fbbf4046123d9a3cf51ebdbdb93d1f1b958427e0c7961e4e20663853b4adade35
-DIST texlive-module-cslatex.source-2016.tar.xz 24036 BLAKE2B 318714cb43c6a0ba160e9b5476b58a0b966865463f2bdc42f141cae4a3728921b939ae3212158b5c1c5a6d39c43d4d2674892c7670884f4f785d0c5c97df8a13 SHA512 ae790aac6c5368699ea48dd7f01393e740aba546db0aa63753eb4cedb5be9b8a4a8b13c75acdac4c904bf8f484705003cd9532c22cb2df3f61c6ec5db45ff10a
 DIST texlive-module-cslatex.source-2017.tar.xz 24016 BLAKE2B 502ed3ce639a201caad35daa98a97e26dbfd7a60a7ee568de283cadfb22d07956cd16ccc3c2f0c36ec5fe13b70ecf54c7e8e1d1ab5517c9bbda9f708e1318cd1 SHA512 07d8252d04a70b556fcf65623b7f055860532d044e2e6c519eab5dd41f0fa534795676ecd115b2e8bb353659f1c235c135d42b31f0e066c709c2b7439edf98b6
-DIST texlive-module-csplain-2015.tar.xz 95596 BLAKE2B d3c57202f5aa1abe08c7c6eda405efc8700c94cb0a53ca2e70468401312b48a930cf978372271abb5a000d0ecf0892dbb18d4e8c540173ee8fd683b3cc90183b SHA512 e37202b9d27ff04de254ff23b476157b0ba3f90e85297ea96eb85dc4c2bb78955a3a313effd7297fff00168ef53ecb849882465c0c655f071f84207b944ab8c1
-DIST texlive-module-csplain-2016.tar.xz 116908 BLAKE2B ceb15ea7731aed4f121a8f26602253272f2aba69d0631fce0ae408757ec87b079c121c42de3b8ea01a86bfee994c77225d96d87c7bdbfb38a90bfd0e6e381a85 SHA512 72c815997b5af1360613293d4fac228cdb8fa76c6651a5ba58f8744090b6e63b8c97cb2246b011eb891d8a30cbc73747bc826aa705334e217e9bc2e574976064
 DIST texlive-module-csplain-2017.tar.xz 116908 BLAKE2B ceb15ea7731aed4f121a8f26602253272f2aba69d0631fce0ae408757ec87b079c121c42de3b8ea01a86bfee994c77225d96d87c7bdbfb38a90bfd0e6e381a85 SHA512 72c815997b5af1360613293d4fac228cdb8fa76c6651a5ba58f8744090b6e63b8c97cb2246b011eb891d8a30cbc73747bc826aa705334e217e9bc2e574976064
-DIST texlive-module-cstex-2015.tar.xz 488 BLAKE2B 4b1d4f74ff1c2c55904f2b13687b2b75ba02a5faf5ce58db2bb363805a9183bab459042825d616383d50b4df934fd897084c77697e90fd3d352e747646cec5d0 SHA512 57aea66eb7248957e655ff46c997174bba89e072dd9e7e082dbffef7bf02feb3d1f323165e0f884fc5456c27548565d1b3ef65368aff47ab6096f2f8ddc114ea
-DIST texlive-module-cstex-2016.tar.xz 508 BLAKE2B 0c2ca68174fce2f6adf99b66be6e53370d13976b36b30a1b39a8b69cb40b0645ae88908a9d2435b6b1cabc538046b719e3c82a3748e21ab839bd58aba5e2d71b SHA512 c6f2cf72a53b308c10e7b28cb4794052aa0990b9ac3777e29bca029711c29a3a8578a552ecfa974f54e2ec5e945d66e9ffb8ad0e289eb2fc99a0b760b6094b52
 DIST texlive-module-cstex-2017.tar.xz 508 BLAKE2B 0c2ca68174fce2f6adf99b66be6e53370d13976b36b30a1b39a8b69cb40b0645ae88908a9d2435b6b1cabc538046b719e3c82a3748e21ab839bd58aba5e2d71b SHA512 c6f2cf72a53b308c10e7b28cb4794052aa0990b9ac3777e29bca029711c29a3a8578a552ecfa974f54e2ec5e945d66e9ffb8ad0e289eb2fc99a0b760b6094b52
-DIST texlive-module-cstex.doc-2015.tar.xz 3915124 BLAKE2B 932132c02cab8ba629446d55bd1043367bb34df74ae436ef4c9fe2f7ccdc73d24c8a453a9bf0c152e8cff975fcc3c40ebd8c20d891df4eb6e1299c6f7a9fe237 SHA512 5643f93830e88d3dfdf985781bf0900f4295b540610d650173275b4f7d8dc4eae5a61c0a1f7646f44fe6a7eac93e581522db75558b9dbee36d2359641bdc17d6
-DIST texlive-module-cstex.doc-2016.tar.xz 3948452 BLAKE2B 15495c97358a9cdce223f4ec3d2603c5cda766eee53d241f6da9a047c3b597b1789232faeb996714f4a0b9106a7b2192280fdac6214a413a3bef27f499124254 SHA512 0185fecbbaac515cc7711f5a8eb14bab3872afb9341e23e7b80e03595a6cd7e5012163b16c7a23d42afcfc3a3ef98ed6bbe52c08c10aad6f3a4be3ab57152690
 DIST texlive-module-cstex.doc-2017.tar.xz 3948400 BLAKE2B 23cc95fe3b505151621bebb143967c3369660f810f433a18c2d5550c3dd66d6950dfc238eecf981ee66b6f38e25344977a491541a1f205805339f3ec36b6d92e SHA512 85048d74d582b3d5b55cede0d2d9832ce600b09b37acec78fb758bf01d0005270d9ec35e51f75e22dd8036a3750031d8dbd85124095432dc15b33ce0ded27fab
-DIST texlive-module-hyphen-czech-2015.tar.xz 492 BLAKE2B 0e3005328a660d9ac978a8e542d2b4dc541cbd8a4058842681a71ca9304887af97d9a9dc47089e9cd9dab51d6e0ea76f8d7c39a29371c754ea983bfd3d240ec1 SHA512 3cca17a5eb6f35e05a3ab859c5b2f9caa080b3824553a43fe31bf8b776fb9fe04485b6e84013b8692c3cdf1cfbb1bb2ed31dcc9d377b7e5ffd880073254055b6
-DIST texlive-module-hyphen-czech-2016.tar.xz 16212 BLAKE2B 71e0794958b5835c0755270fa8a8acc963b9446cb1d3f36cde87212ba2c749d714798f7642d09a5d925f5b8d6a0ee9f7f366430640634f707b815a385cf6d3bb SHA512 91355f7d6c27cd1df035e7a0d0fdcac8611fb8353e72a108ca63d27f4e0db0dfffdfca411d4bdce7ca21df6154b866a9e782216728028cf39528aa4660494aa5
 DIST texlive-module-hyphen-czech-2017.tar.xz 16204 BLAKE2B d63033ae1dba21ffc050e7bc073da9ec194355c8a5587ffee2eee08e0f87fe697a8d0590b29f27acded244bc75485a7b878b7279a25cbebfa3104c1150a2223d SHA512 21780a8068778c0c079e182dba2495a52598a330ce9e52026aabd37bb97621aa8e683a5bcd0085769326b37ab5ec6145b63cf7c64593af3ad17130e3648a9eae
-DIST texlive-module-hyphen-slovak-2015.tar.xz 488 BLAKE2B 0f56c4b1d56c81a9380aafc4b797a704266667d8fb338f0226af968b383ff052aa32e5e5818626cb1b2aefc8355567864cc57486ffacad64f8dd23afba1d4bde SHA512 1fb2e1631dfb7b830d38292ce62169113064d21af6430753dba25386ea768e745262af2a0770a385b4d87e873e1f9d4e8007a8fb528fdd68da4acfb91b6a0eca
-DIST texlive-module-hyphen-slovak-2016.tar.xz 11308 BLAKE2B 81f3f428ddc70e764510e0ed8f50e585c581fd19fc58a36f7775ce46ed37ca5b3b6febc1f0f18e3d92c66e15dfa69e70d7578c42c4760b85b528a1291e3f35b3 SHA512 a844cb1041489e938b5b71ae9445a313bb9c711e2b85a50a54f62beef5194cf4563e5220255e17296ce4209b952aaea605b4e0921fca54812542dd915cebb276
 DIST texlive-module-hyphen-slovak-2017.tar.xz 11284 BLAKE2B 82deaf09dd89cf34d1a6cb9fe4b007c8e88f5a173dd1f35ce592c6490b5a91edfc892cb65090f70833a2323927a03896df340c501c62ea4f622de5a36f9e9801 SHA512 fdf0d487f05c56f4978ffd7a36be32771ac76651f9629da780a22991d740ab5341e33ff8ed7366a6c2dcf773b98912b6f0d382979d6e78fc1885783ca7749537
-DIST texlive-module-lshort-czech-2015.tar.xz 388 BLAKE2B 521e294f55cdd7425a464bf16b1a6368e06f196bd17a424391b766ee011bea1c72d2cc48b5d9ab1ebb66f82872cb4c63544e4a479a026a729daed13715433511 SHA512 c451d8e320f7f5d6085cd1854e3dd739686a122bf46b0cd4c09eb431feb28f8c57480731101566127fd2c0997b2ab36d144a82121bde901a1754e7cacf530ab3
-DIST texlive-module-lshort-czech-2016.tar.xz 412 BLAKE2B 0314e93dc3bcd572f6b58df5c24ddfb32fe2f6eaebe0518cf74461296ddda3086e290f0d453c6ceb22dbb14eed8b6505c01342b2d8b122e3a3bf6924f968b48e SHA512 efbfafa815d470d24ba6a2eb031365ba8e2a0191c16b2ea71d25c50c7e42abb1c0d224d828ef96d9e28acc95d04f55278eecbe2ae04bed70f0947829d9f8e691
 DIST texlive-module-lshort-czech-2017.tar.xz 412 BLAKE2B 99f41e8b2ec644d4d54483d1a920fe0e64a200e29a87c00a085bc43e1a6b2364d7bf80f8446b2b85e43820b163c3151605536f901ca6970ec8068e22fd16c425 SHA512 18ff9db89f45c825533f73e69f6c89cb56620b36f7f33572f9d49fd8b6abe9430c7e5e1fe3b863ee5e31dcc15306d0cd006bb830998ec4f8cc919dceb925ece7
-DIST texlive-module-lshort-czech.doc-2015.tar.xz 1644620 BLAKE2B 6c46a66af6ca67c7a23eda01b7b0270712810e1c637fc0620540560f0be8aa22f5daec3d5f52bda3c5440cf6bccdcc2b2ec219cc8cffa92c8ec4592ad71d9f3a SHA512 f4c32114f4fc39f1492952bea7f217b52bef42de07d8047d3adcc0593bb9ecf956a7e362950925e3ed8b9b0d877be698324852f7902a556fe278a3314b6f944a
-DIST texlive-module-lshort-czech.doc-2016.tar.xz 1644620 BLAKE2B cb59698ddf43d0f74c0f2c113c9e58cc2647b96a46ff3e85ab10273bf2718c74e0253e01252716242a0cbfcd3c26e598f9bddc7e92510fc49c527c1610f38f1f SHA512 5cf1839717410dc94d5ff2356273d6837bd4ff506d719488db3c3a7ff50a879e2caa0e76a04d14cb8f0b31ba9979f0d9f75e5d3d6c01ce958372fa4cdb0412cd
 DIST texlive-module-lshort-czech.doc-2017.tar.xz 1644592 BLAKE2B bb292d82644b36f5c164340da34fbefe3993cbcd7d7c999cb46aaad04a40ab6177caa76a338935c34537cdec62cd7d197cb7d130f4568f5e37ba28927ebfdcea SHA512 7f70f63f9a4262cb37bb2c8259865254d0bee1cd1ba2cfafb6002fb7801711c832143178a6903e7d03625ae92041ec820eb4d1109a98fed28d9ad7ed79c1150d
-DIST texlive-module-lshort-slovak-2015.tar.xz 372 BLAKE2B 1b66e9d846dd751c85b16fc038b0801d306d1f4fbd4e52b2b8add23908b497edcf1cc96f39cbb0f85ed30cfa0f8ac65c9066d0573ffa99b5d47fc6a591662957 SHA512 7d71865bd731390958f255a787a17bb0e99a661dfbefd21052aefc1eb18239ce80cee8fd566b7756619ac1d00339ecd2c2b37f2a4854e42ce3c783176dd9f109
-DIST texlive-module-lshort-slovak-2016.tar.xz 392 BLAKE2B ca8e04244379459abb4cb95b437e117366e40604eb5f3e3c758c081be625368e0d54bd9ba3468722afce2f53eda30c0a078fe67e31f915fa0a0c4d611be7972b SHA512 fa9bde8bffc547c49a2927345832ee6cf00f913d35c9ae35f4706e5642ef9bcb5d84707e0452e79dbd179342bd92782993e5e30a787ea7f1f9460e5537ce97ba
 DIST texlive-module-lshort-slovak-2017.tar.xz 392 BLAKE2B a93fa2fe47cd2daab8d5d56a071bc8ed2e756f7e0e7b24d6cf10068affa380d43bdcab33c470c9725b133962b6101d00feedc2324f7e69705091c0c0091ccb94 SHA512 90545f5f8d48fcf81668a39d2daef68439cd658387193c89ec280e54d5f5ca74cd428d5c92bcd527a5f50151fe22d031ca4200ad258f2ea00250ff1b53b42bd5
-DIST texlive-module-lshort-slovak.doc-2015.tar.xz 708844 BLAKE2B af6bec6f8e02acb61aa7d04adf77e9a9d337f9fe75e923c9df7d2833c8e7479b06fb3253cad325ee5789a3c7583370ccef1dcf4e8da035e8ac8ee527315ffc5f SHA512 602e18a7f4c1896b54b94d33755ce20d8e48ced2f5e3f41927a44b1fd8c0979758fd2325471e43326718aff45d54376abb8e8e411d638e933333c1b7b60b91c2
-DIST texlive-module-lshort-slovak.doc-2016.tar.xz 708844 BLAKE2B 7786981b75c46568a48ee0567cfdf21a75e934a266f91e8ad533062f3d87938e383591db7434412452ae5ee42327690c504abfc3e72363bd0c84fb8a2fa85d0f SHA512 f50d192c4999dca81e08f7eeeaa623a357d177135a2685a3b6e938efd05e24ca4e2b6070f377f42f680275fb70158b3133fe9e0da5e24606b05ffd0b71d29e49
 DIST texlive-module-lshort-slovak.doc-2017.tar.xz 708852 BLAKE2B 35889022239156a53c8561b5784a86f7b177716018cd9213ca3afbce52c03109c933e5bf72f6215e2cf5482be249a67770c1646219515043a5066694504e619c SHA512 a783ab895d6f13aee097eda3546fa09a89f2c82add3d9bcf3965f2c3aa6c2d079f56a6f78432bdff1c9638e748d88d99bdea7facf8aafa34418972f84224c114
-DIST texlive-module-texlive-cz-2015.tar.xz 280 BLAKE2B fbafcc54186e8f19cd847dca03cf51a1a7e2a5dbbd394c359ddb6c84d423101c5bee7ec181b50819bda8ae3653e65c7b2d36c4c1bd09ea57982a60a1ad98f6be SHA512 6819b3eb8e15bcd801e25b548c638a6580a5a17cd78f1c2fb86d392212ecf20ffc12b9a2595d28ad16cf0aeb5d8f1e32c6127ed052f3d5fbee57a6b1bbb961a5
-DIST texlive-module-texlive-cz-2016.tar.xz 280 BLAKE2B d3ed2e9f8d3ef9ce527c2db3b9ea9f644c2cdd7d60ebc3555f80b711c96774374d67ed065c00cd55b0e4e5e0e7dd86cf2e66615373dd670de7ab5f4f5682ec91 SHA512 f4128ac1e1d985cd5042c7944ec51b85398f09cd248a3db5244ec91e4aae66e5b04faa2cba556a64d85fe8ea5efbcc8eebd9155da2b60330ce8954eb8b19d075
 DIST texlive-module-texlive-cz-2017.tar.xz 280 BLAKE2B d3ed2e9f8d3ef9ce527c2db3b9ea9f644c2cdd7d60ebc3555f80b711c96774374d67ed065c00cd55b0e4e5e0e7dd86cf2e66615373dd670de7ab5f4f5682ec91 SHA512 f4128ac1e1d985cd5042c7944ec51b85398f09cd248a3db5244ec91e4aae66e5b04faa2cba556a64d85fe8ea5efbcc8eebd9155da2b60330ce8954eb8b19d075
-DIST texlive-module-texlive-cz.doc-2015.tar.xz 975024 BLAKE2B f01aa637c71bc4c85611cc5a63fbf569c439d042cc63bccd920bd525652439abfd4ac7a68326a710002ec2a2a62f5d9ea860b21d551630776423748ccdf4ffae SHA512 01b32fbe2cd963170d384cdf4a26225b74ffa543596b57c83605482860e52f4e576f79ed7fea537e2db72a370aa1f68442e2539a023e501be1fe136c33ce3336
-DIST texlive-module-texlive-cz.doc-2016.tar.xz 1029148 BLAKE2B c941abdc2dac11b68cdd78fc02a2125d8cbab37a61775639488e148b87cbda7b2c40bfcdb889362c425771286083bb0e9aedda449379e45e1e1cf378e9a71a2a SHA512 3394dc8e9ffed98de76a22f38f7cb6d06b4cb70585fdbfae1cd5da45dd4d800593fdfb35a4dfe22be628eecf6bb6cba6d7a43e9ee8624c830d6bb50f407b893a
 DIST texlive-module-texlive-cz.doc-2017.tar.xz 918152 BLAKE2B e258fec9292ed957e9603e7fe525427e894b6f1c5b9da47143a99e96c8c46f39eb3db1e16315e4e80834da5c611efeb97bd4e6ad3bb27b228cf80729256d2341 SHA512 914b96890fe0d136ebe7939e3659b9b93faa0f226ecef2a6bc06d058680a1ad48318ef09e6093eeb48073dfb32b65d141b80f36f631acaa9858d6ac72279e1bf
-EBUILD texlive-langczechslovak-2015-r1.ebuild 1026 BLAKE2B 68dbdd932989d2b1496ebdfc2611b1296c5a70e4c5cacd68832b998e0ed22032a312b68e86aff273cf9b14423707ad9bf33b3a7d256d8d8d98fa59f566a1f4ad SHA512 425b4f393c60bf59cd7610596f1693298ce274b8debd37a51b7d4523304819f63328698e3f2ad0475f5631cdca28a1d30d348731f7f6eac8b48838e4f2db9a44
-EBUILD texlive-langczechslovak-2016.ebuild 1111 BLAKE2B 9f4ef99e1e0cda3ad5701c27e48c03c03420bbd8e91848b4b90abf8fe15f4800bca7e79d55ef0f409ee5d782785a109a38414cd7f173ad5ea3478f777c7fadd2 SHA512 dfa07cf40853f59a8c85388ce0f66d34f730f34df0efc68a90260fa8db5965833305e165669565cc33415a8e5e67ef7b9997af35aa437be5d56333e2de4c9c96
-EBUILD texlive-langczechslovak-2017.ebuild 1111 BLAKE2B 673bd2ba84825a5fa703ff4f3e106fa2432a6544306f0680a11ecec8f0542260386c3a35d0702ea53a21d06caf266d553faf049be4c4a9e83a7fea1a82167e5c SHA512 76dda20487969a409daafafc2f418c6287310e684f4581c9d51a1a41337e241b9b0fd89bd7fa59dc8a611176ad0f8eb3ceb5dc678bdb291ae69c4cdab3e13c77
+EBUILD texlive-langczechslovak-2017.ebuild 1110 BLAKE2B ca6a69780cddfdad53069652292f83602b6466d5a46d8e96523507540b066119c4650d2f189f3fe4dc1589408d89bff7baaab4726a85ddc281d5245330d2439d SHA512 401df08a2ba44aa5150f1954b194b410ef6329111e926ec01e4530303cff06f1afc4495dd5a8b20e81e47fbd3becc457c6fc6b23f7d1be972593609f7d8b8261
 MISC metadata.xml 436 BLAKE2B 3c6031ea7696419b6d259418d4093bb41cc1562bb07e35cba24485550c806a1ba2b741530ea2c7a1168d3844baa2a7fbb55be69a69911cda4fb0e955209e7983 SHA512 6db7969532a5e09e517223fe972926798a8221d2921d5d11d3f2fba86dd6283e62e782f8273151c7fa05f9eb3dbf43e8f53179e049a16f975052b22993f494b2
diff --git a/dev-texlive/texlive-langczechslovak/texlive-langczechslovak-2015-r1.ebuild b/dev-texlive/texlive-langczechslovak/texlive-langczechslovak-2015-r1.ebuild
deleted file mode 100644
index 519d46f55378..000000000000
--- a/dev-texlive/texlive-langczechslovak/texlive-langczechslovak-2015-r1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-TEXLIVE_MODULE_CONTENTS="babel-czech babel-slovak cnbwp cs csbulletin cslatex csplain cstex hyphen-czech hyphen-slovak lshort-czech lshort-slovak texlive-cz collection-langczechslovak
-"
-TEXLIVE_MODULE_DOC_CONTENTS="babel-czech.doc babel-slovak.doc cnbwp.doc csbulletin.doc cstex.doc lshort-czech.doc lshort-slovak.doc texlive-cz.doc "
-TEXLIVE_MODULE_SRC_CONTENTS="babel-czech.source babel-slovak.source cslatex.source "
-inherit  texlive-module
-DESCRIPTION="TeXLive Czech/Slovak"
-
-LICENSE=" GPL-1 GPL-2 LPPL-1.3 TeX-other-free "
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ~mips ppc ppc64 ~s390 ~sh x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-DEPEND=">=dev-texlive/texlive-basic-2015
->=dev-texlive/texlive-latex-2015
-!dev-texlive/texlive-documentation-czechslovak
->=app-text/texlive-core-2014[xetex]
-"
-RDEPEND="${DEPEND} "
diff --git a/dev-texlive/texlive-langczechslovak/texlive-langczechslovak-2016.ebuild b/dev-texlive/texlive-langczechslovak/texlive-langczechslovak-2016.ebuild
deleted file mode 100644
index 6fe392b8bd81..000000000000
--- a/dev-texlive/texlive-langczechslovak/texlive-langczechslovak-2016.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-TEXLIVE_MODULE_CONTENTS="babel-czech babel-slovak cnbwp cs csbulletin cslatex csplain cstex hyphen-czech hyphen-slovak lshort-czech lshort-slovak texlive-cz collection-langczechslovak
-"
-TEXLIVE_MODULE_DOC_CONTENTS="babel-czech.doc babel-slovak.doc cnbwp.doc csbulletin.doc cstex.doc lshort-czech.doc lshort-slovak.doc texlive-cz.doc "
-TEXLIVE_MODULE_SRC_CONTENTS="babel-czech.source babel-slovak.source cslatex.source "
-inherit  texlive-module
-DESCRIPTION="TeXLive Czech/Slovak"
-
-LICENSE=" GPL-1 GPL-2 LPPL-1.3 TeX-other-free "
-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 ~x64-solaris ~x86-solaris"
-IUSE=""
-DEPEND=">=dev-texlive/texlive-basic-2016
->=dev-texlive/texlive-latex-2016
-!dev-texlive/texlive-documentation-czechslovak
->=app-text/texlive-core-2014[xetex]
-!<dev-texlive/texlive-basic-2016
->=dev-texlive/texlive-luatex-2016
-"
-RDEPEND="${DEPEND} "
diff --git a/dev-texlive/texlive-langczechslovak/texlive-langczechslovak-2017.ebuild b/dev-texlive/texlive-langczechslovak/texlive-langczechslovak-2017.ebuild
index a91b0a3b9818..279a2db44432 100644
--- a/dev-texlive/texlive-langczechslovak/texlive-langczechslovak-2017.ebuild
+++ b/dev-texlive/texlive-langczechslovak/texlive-langczechslovak-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Czech/Slovak"
 
 LICENSE=" GPL-1 GPL-2 LPPL-1.3 TeX-other-free "
 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 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2017
 >=dev-texlive/texlive-latex-2017
diff --git a/dev-texlive/texlive-langenglish/Manifest b/dev-texlive/texlive-langenglish/Manifest
index ee4d098a68c0..8af79e31a673 100644
--- a/dev-texlive/texlive-langenglish/Manifest
+++ b/dev-texlive/texlive-langenglish/Manifest
@@ -1,362 +1,124 @@
-DIST texlive-module-FAQ-en-2015.tar.xz 504 BLAKE2B 0b36236323b5b18c9d78ea3bc48d38e9be3e865a2eb81843f350880845543d3b9d0c8e362ace66a50bd4f2fa604f0257940f7223ffcebec536b77e4795e8e1fd SHA512 b478ef21c8f752e01b9827a344235c2460337a312f2818f80c34314b66e90448077bcd9be51d4619edb0663d833e8214b6023231c59376eb00095513ab2ca56d
-DIST texlive-module-FAQ-en-2016.tar.xz 524 BLAKE2B d4dccad9c1180f1c0b118d321d518318b0f17509041c1055fceb16ad8c5cc306a128637ed5a80f6ce866a351019188e126b23c96635eab5b9d76d66d8425082d SHA512 79aa9d6bad45be9c2d890255cd6d29e4a89d83c042538c69cadb14f0dafe81a241a7901e5d3639b3b50bfca5fe677f2bad36617c0154d60c610ceda77c6d17f2
 DIST texlive-module-FAQ-en-2017.tar.xz 524 BLAKE2B d4dccad9c1180f1c0b118d321d518318b0f17509041c1055fceb16ad8c5cc306a128637ed5a80f6ce866a351019188e126b23c96635eab5b9d76d66d8425082d SHA512 79aa9d6bad45be9c2d890255cd6d29e4a89d83c042538c69cadb14f0dafe81a241a7901e5d3639b3b50bfca5fe677f2bad36617c0154d60c610ceda77c6d17f2
-DIST texlive-module-FAQ-en.doc-2015.tar.xz 5089052 BLAKE2B 9d21913c8b9ef7f1726093449317f63027fba894295618caf594f754bdd4333aa667350a1c066dd410a9af4c398071410e5efd7594485bfec2cac76b2da1f4e3 SHA512 4fcac29adc3e24e0326ae8a63c4064be69958900de9ea5c8be4114c24d7ee4671f8b87af03c69d6a79089031a72c3329ada732880c14a74272ebbca86781429b
-DIST texlive-module-FAQ-en.doc-2016.tar.xz 5089052 BLAKE2B 222933d6553f4d630057bbd8102b6c24e7a4cd50bd82a3b9f360a0c9602143d2de4aee42d97e8af97ee2d2a4f45cfbfaf1ea2e060fb59d1527b3eebd0c4635d5 SHA512 1321e2c0986ad548b3b6383607ac41fc7d164a330145900ece07a83490f211783f31670653bdb315bbe837ed01a7e98844c6d5ada77b7631f9fff4875e75d2d5
 DIST texlive-module-FAQ-en.doc-2017.tar.xz 5088956 BLAKE2B 41a6eb912e15e454fcd1f8e689b48672e659e37440aab2e57d20f5d7531c9ee2330b0d985d6f4b6f8ae2d1bd1b097be5f3c1a3ffe9c53a6ca2459c9107ca7aab SHA512 4854873a89d02d135256ca35a26093fa45e540306fcde2fef7e92cf12e5345000230784e7e6be1b1075e052a7f666edc49b5a5be5c2b9cfefa3c9dd4e507303b
-DIST texlive-module-MemoirChapStyles-2015.tar.xz 596 BLAKE2B 55f697500b423facdfa3a79b5aec7447ba1d67c8751fd2b6de7353e67d3770283ea9ea53b1052d8e08645d1a63ba765cf92f1ef7c3a488f8c13920909ad4cf3d SHA512 666b857a549012c79b39a6f2d9227ebb3f55c853b897d467a22facb218e328ccf95e63a569c1fbbfc3af483cf1f0677f69d71c56ff77a8ef17248207b73d4ea6
-DIST texlive-module-MemoirChapStyles-2016.tar.xz 604 BLAKE2B 271bab71467b73ebc035e22c6c1bb3e0e9e851b75cf508b6805041645ac883f5e6e33fff4867a38e4e1981879c42298a9d5963a5789adeb3fbdbf4de3db6bd02 SHA512 b895b27eecaa075895ae82fd39e337dfe9e9638b69056df5f7d501c36907eba8acd1e7de9b86945377de088c734e64779b534c86027378c1e5c212725eedb1af
 DIST texlive-module-MemoirChapStyles-2017.tar.xz 604 BLAKE2B 271bab71467b73ebc035e22c6c1bb3e0e9e851b75cf508b6805041645ac883f5e6e33fff4867a38e4e1981879c42298a9d5963a5789adeb3fbdbf4de3db6bd02 SHA512 b895b27eecaa075895ae82fd39e337dfe9e9638b69056df5f7d501c36907eba8acd1e7de9b86945377de088c734e64779b534c86027378c1e5c212725eedb1af
-DIST texlive-module-MemoirChapStyles.doc-2015.tar.xz 755416 BLAKE2B 9757136389598cee950802e135e738bc1393d16580c32c1b4b50a7b2ea288e7e1e053ec03a763da44aa8a7eaec2b83a5ead3d9af624bba823f9421ac4f6ab854 SHA512 588b1d90bd6c773a2852559dcb6e01642c914a8f3bfe3718dfd7b928ce0e44241717842f0c95be0e6b1674d3d5fd152b57af366d060171de7d6415235601e5a4
-DIST texlive-module-MemoirChapStyles.doc-2016.tar.xz 755412 BLAKE2B 8d9d0a78b239972c4e6b0dba65cca1ace6d58f1534748deefc6b0aa818cdbf3dff1ea80d8e255e2eca2c42744092c7a59dbacecce71448590ded8d36bc4b9f48 SHA512 12459b27b570adcf3f7088a4647efefbd8aa2ddc5333d9b2177c6643b16d3bef94fcbd2950213f3a7760f7c9a72000380a2107692234f306e36430d5f0ab8d7e
 DIST texlive-module-MemoirChapStyles.doc-2017.tar.xz 755412 BLAKE2B 7159ab03ded7f4fbacf76ad2b04ed348e714821ab529562837235a39f6f311ddb2b37fe3790cda956d6e56e15cf47c1977c54a7944f2e83c360c288cd5601432 SHA512 24fc346c3393b92675c5943e8cd677d2110bdee39d455152fbc865fe20462ec3b07f2c72ca326e521d45fe0fd910ac8a88332a85b2e27733ad0a250553954cc1
-DIST texlive-module-Type1fonts-2015.tar.xz 580 BLAKE2B 92706da1c4687c3bd9364b31c354dcf69e9feabf1099fb981cf5a870824b3e16f1c0e48a85a4957ebbd913803c8b42df61bac79c898f0fa4a13ad29335aad338 SHA512 0fd5ba72694452966a5f74354426e4497f1508e7a0795768e1d64ce2b2e76963808697cc0eb2f04255ae846f92dda6518643d26a7bf4538216066d85a62a4bed
-DIST texlive-module-Type1fonts-2016.tar.xz 592 BLAKE2B 51b3830fd0eaa8c913527744ab34ac83dbbc93c6ba4126b8fd2bf8fcabb5dfa0004828100aefcfcc27d73a0812e4f0e28a455a0d791285bc76c7f5d12a6a3455 SHA512 c91168e0cf994b309c09e354991f7e025217cdaf1e0d753c750c11819d8dbdad38a438e3e66912924349cbc532f44f70d0850877e6e5941a9cbbc0d90f61d68d
 DIST texlive-module-Type1fonts-2017.tar.xz 592 BLAKE2B 51b3830fd0eaa8c913527744ab34ac83dbbc93c6ba4126b8fd2bf8fcabb5dfa0004828100aefcfcc27d73a0812e4f0e28a455a0d791285bc76c7f5d12a6a3455 SHA512 c91168e0cf994b309c09e354991f7e025217cdaf1e0d753c750c11819d8dbdad38a438e3e66912924349cbc532f44f70d0850877e6e5941a9cbbc0d90f61d68d
-DIST texlive-module-Type1fonts.doc-2015.tar.xz 527328 BLAKE2B bf0d9808a17143ed0b3f73a9a6ef22af2a9f9bdf9dd537ee7e0f2efc10c8f7e86ae60b8a67c9d35f259767adc7fc611fbd6a788197b4f9c4d4dec5fbe3daacb5 SHA512 53ac6b82b5985fd736fbdfe5a4c1c689b9972330d6d2ba06019eb0ac64391175bdad242410bbf32d848aebd09f4035458a3cd7af5325de081e8356e6afe6b67a
-DIST texlive-module-Type1fonts.doc-2016.tar.xz 527328 BLAKE2B 509458bd4cb41617a10d8c4a898b8f520a65f520469af45825be31084a2524e67b0d179890605f4913fbc9051fe5253fb0f8afc8b51dc1fafca3014e4a4bbe9f SHA512 0de373db9da88c5fb02095e27d6a110542abec2f7f77a724f48e34258b5a64294a8b318a54029b5158be513abf8fb7940cb472607659e5b800b9ea97be7db540
 DIST texlive-module-Type1fonts.doc-2017.tar.xz 527328 BLAKE2B 509458bd4cb41617a10d8c4a898b8f520a65f520469af45825be31084a2524e67b0d179890605f4913fbc9051fe5253fb0f8afc8b51dc1fafca3014e4a4bbe9f SHA512 0de373db9da88c5fb02095e27d6a110542abec2f7f77a724f48e34258b5a64294a8b318a54029b5158be513abf8fb7940cb472607659e5b800b9ea97be7db540
-DIST texlive-module-amslatex-primer-2015.tar.xz 652 BLAKE2B 0033599386cc4fc631dc6267800b7f575f00fb4c5e972ad8c475dec06c848408938e42d1157dcf90f3b348fc6c738876c46f7f781ebbbd41faaff52e6b96a13e SHA512 f2906358c7d87edf6ae15aec22eb7b32b3bb1f2ce6b5ff01f584c0655a4c4aee75c70525d2603c6bddd869f8e7bc4c932209fab190fa115db10dd901880afc53
-DIST texlive-module-amslatex-primer-2016.tar.xz 664 BLAKE2B 4e4df51b2ac7679a1cf0bdd62dfee001b13366fc3469d0855ccb0501e46b4f1a64ea4471d6f9cce807ec73391f32a59511fed9a7836aed271a008ac57fdef964 SHA512 1bec3afffa84f4ff0a32fd484e798895105009736518360607adc4f43f7b4e5a99bcb826e66993eac6176b89d1d7d8ba5b2d920102838c22a1d816f884b336a7
 DIST texlive-module-amslatex-primer-2017.tar.xz 664 BLAKE2B 4e4df51b2ac7679a1cf0bdd62dfee001b13366fc3469d0855ccb0501e46b4f1a64ea4471d6f9cce807ec73391f32a59511fed9a7836aed271a008ac57fdef964 SHA512 1bec3afffa84f4ff0a32fd484e798895105009736518360607adc4f43f7b4e5a99bcb826e66993eac6176b89d1d7d8ba5b2d920102838c22a1d816f884b336a7
-DIST texlive-module-amslatex-primer.doc-2015.tar.xz 566748 BLAKE2B a90cb863643ca23f848a3c201f9b22d5a766f3d257e900311e5e2530472479aea455e3b40f2477cb04856077260ec477c2166227893d7f6a973972add3b6815a SHA512 5d55e8b9c03d8779de019cb324d4d055dd9f8d9c47d63143506cb6e5b052dfdb6931445af1ef0a7ae70031304359e09c93ac21708e6664b2eeb35d72c4ee0481
-DIST texlive-module-amslatex-primer.doc-2016.tar.xz 566748 BLAKE2B 7a3006ebae247961e65ff42cc8ccbd96353049eace0c6b9b3831e78416cd72a623b12263bee9cd3ba8b562bde4f27193ebeb57d36838fba6ec60148cad182ac8 SHA512 ef23f3e252a969691999c6a01364eb2b4a658e9a6a4f1aeb7065bc7aed41cf0cd98f0b8f8943ae67f2aae1f481dbf4d4f52ac138a14bfa57108481d8af364a01
 DIST texlive-module-amslatex-primer.doc-2017.tar.xz 566748 BLAKE2B 7a3006ebae247961e65ff42cc8ccbd96353049eace0c6b9b3831e78416cd72a623b12263bee9cd3ba8b562bde4f27193ebeb57d36838fba6ec60148cad182ac8 SHA512 ef23f3e252a969691999c6a01364eb2b4a658e9a6a4f1aeb7065bc7aed41cf0cd98f0b8f8943ae67f2aae1f481dbf4d4f52ac138a14bfa57108481d8af364a01
-DIST texlive-module-around-the-bend-2015.tar.xz 464 BLAKE2B 75d6f5ccf77f3ed7c14bfb804f2e78bc5f2f57f876b0880257823d598b40a707c77e99fe7698324329ef564ebfb31965f23e627457770591198d2b07deb06d9c SHA512 176b811f84b8f4d1812db46624a1fec4e93941216ec78057568d70c85628bce20eab20b9e25a1286fae6245c207097a954cee803640663bf26cf6c14abbd69c1
-DIST texlive-module-around-the-bend-2016.tar.xz 476 BLAKE2B fdba4b35b4fb0bf17450629b3266b219845fd77ba65f3c758918eebe3e42c1a7555c5c3562616de4090173c756a8aa899934a642494fd22e9600d6df069f63cf SHA512 62e6c51dcac28a21b7e726e21a1991ea973f89472d62dc8f2be1b29299ec4d7273b3ec92d446dc4139f0aeac07049041b41c7dbf9d99b5dd71474c6172a72494
 DIST texlive-module-around-the-bend-2017.tar.xz 476 BLAKE2B fdba4b35b4fb0bf17450629b3266b219845fd77ba65f3c758918eebe3e42c1a7555c5c3562616de4090173c756a8aa899934a642494fd22e9600d6df069f63cf SHA512 62e6c51dcac28a21b7e726e21a1991ea973f89472d62dc8f2be1b29299ec4d7273b3ec92d446dc4139f0aeac07049041b41c7dbf9d99b5dd71474c6172a72494
-DIST texlive-module-around-the-bend.doc-2015.tar.xz 450492 BLAKE2B 47c0f6573afa411bb84416d1c1eec0407a3f8eb35a1fd86aeda9471fbf84be67a63a2a869d2256a5ffcb52ed501de7f7ca2e5c90f3cf4d0270b0fac497629847 SHA512 ad93b5c33d38d644446662fdc6df6ad46268873e0a26ecf97f74c97a83740b2990f7030a6e1c7faf629aa9ee437dbbe70a0d581e3ecedfbbc2e0a42bce20ef51
-DIST texlive-module-around-the-bend.doc-2016.tar.xz 450492 BLAKE2B b3b24175a162026e869f1b285f68003018b15488dbc2c6538efba2c53284b6f4222a3c66872f8029b9b1875c2ece9788cac467f8c7b630864f0e5491a04863f2 SHA512 86c7ace6f1206410c9400f661150274cb238116dff47af45bf9817df966bcc2a7290aa1e23e10f99211047bafdefb522c315845b551c759a3b225edc13032e90
 DIST texlive-module-around-the-bend.doc-2017.tar.xz 450492 BLAKE2B b3b24175a162026e869f1b285f68003018b15488dbc2c6538efba2c53284b6f4222a3c66872f8029b9b1875c2ece9788cac467f8c7b630864f0e5491a04863f2 SHA512 86c7ace6f1206410c9400f661150274cb238116dff47af45bf9817df966bcc2a7290aa1e23e10f99211047bafdefb522c315845b551c759a3b225edc13032e90
-DIST texlive-module-ascii-chart-2015.tar.xz 404 BLAKE2B ca6961308fe3a69b99fb7130978eb799028442fa4377e74059bf2202f9db8161e650a172106512d9a315dd23ae3bf167cd793280c5c9fdd6b6ff63a351d91397 SHA512 e9a5aaef3a8859ae9294e91c186343643368a0e1dc256447daaf2f8860dc6c4150f76d5f8aefb4ae303a17ad45b7ee90c7be8fb601416752ff9f7306620a4ad5
-DIST texlive-module-ascii-chart-2016.tar.xz 416 BLAKE2B 567070a1c62a2f792c544f0a776770aa8bc9e2c6245bd2e48268bc118dbebfd262d3ccce764a730394fe77c2ef1e01525e41d06e32ce0908635db615de0c5b79 SHA512 6fa2afc9341bf9180b9cff1f750a969e59fd49e4db7cc0cfc2181ec9f8549622217f91e301d9e8ab8619709d9718a64e554ceaf75b0dfc41699092d2ba6abb64
 DIST texlive-module-ascii-chart-2017.tar.xz 416 BLAKE2B 567070a1c62a2f792c544f0a776770aa8bc9e2c6245bd2e48268bc118dbebfd262d3ccce764a730394fe77c2ef1e01525e41d06e32ce0908635db615de0c5b79 SHA512 6fa2afc9341bf9180b9cff1f750a969e59fd49e4db7cc0cfc2181ec9f8549622217f91e301d9e8ab8619709d9718a64e554ceaf75b0dfc41699092d2ba6abb64
-DIST texlive-module-ascii-chart.doc-2015.tar.xz 26072 BLAKE2B 4b9c48304a9fc9f220fa0566ee0d11235dd958349d4ff1a07ab3c7679923c7f888c96f31c80853c962a0f9202d51db8169ecf30495b02c010c5662afd52fb947 SHA512 f96d95ee0535102045b4e4283b3079574cdd43cb803cdad378220d4190a106883aa754538293decedbf0ac6ef968a938f43b1b2e406c0056f43712b40cf420fc
-DIST texlive-module-ascii-chart.doc-2016.tar.xz 26068 BLAKE2B 19d093b3b9e6de94cf6ddca255c73a17f23eaeb8476ceebf335680a3e8f8442325c6108a1838507fc717073c148a75cc97b1f58a7349478eca8b8952bf380d70 SHA512 d8bb95977962d8368796af09ec49f3d03549cc26e4b0df2690836697921f36d2bd22fa41e7566bcec5210ca45adc65876faf51459f02d99bcd63a9416cb72925
 DIST texlive-module-ascii-chart.doc-2017.tar.xz 26068 BLAKE2B 19d093b3b9e6de94cf6ddca255c73a17f23eaeb8476ceebf335680a3e8f8442325c6108a1838507fc717073c148a75cc97b1f58a7349478eca8b8952bf380d70 SHA512 d8bb95977962d8368796af09ec49f3d03549cc26e4b0df2690836697921f36d2bd22fa41e7566bcec5210ca45adc65876faf51459f02d99bcd63a9416cb72925
 DIST texlive-module-biblatex-cheatsheet-2017.tar.xz 436 BLAKE2B 7bd292f966be99e5550f2c46e471fcf4e047752747796a7e7b6cb7c365ef3e4423c5efeca0b67837fe7d5222dd0aebb55a76154041b509e43bf2d3dbce68d84f SHA512 808dbe4f2c26ed79c9e8ea26a301b5f58eafdfdf4f70792bf6177eb20d116b632f274c28c14621bde66ee909749b8e9b5895cebb079415bb41e04c45bf9133ab
 DIST texlive-module-biblatex-cheatsheet.doc-2017.tar.xz 323056 BLAKE2B 82d4be1ffb8d9ce1081e67a18a88562265da7a1b72d17c88d85b9b1aff5661da2ee1abf95d230b89b9e76148b3020d84278e859e4e07a73315f745d071674726 SHA512 6fef9063af9b323058fb4069028ecee8fca91a060a25d9a7525aeacbc75743ca2640af6db02ac8b62f7bd37835f676c517a4cb84e126197f55be6e0bc0b6be9f
-DIST texlive-module-collection-langenglish-2015.tar.xz 792 BLAKE2B 8dbb51a2838b4afc363cd377cf640b3940809d6522c03ee2b8b4b2e1d99cbbb5ce66d177bcdfdf3b14269b0b922a6f0de9068bda31becc03a85f199bae0610f3 SHA512 fb04c7fa8395d9f1b6fc3278ab44c71b7054694f182b962e13b0fda1c666699be907302cc3a2f91a021f8ca491397417bb2424a1e4f4733c39b8af97a09b388c
-DIST texlive-module-collection-langenglish-2016.tar.xz 796 BLAKE2B a09b1e530b322dd2266719d219c22e86bacde1526955b80395011948d3787264ebc616d9896fa54a4bd1a79093a4fef0fb16a81ef181e44a1f314ddd883343bc SHA512 567a8405b7e0daaaf033e1630a016c0bbc3b17974edc06efdb4e92cd231919682f32f6ce47c484612cee471bf9be01c6ba0aee65123e1c5b41c98981d1451cb9
 DIST texlive-module-collection-langenglish-2017.tar.xz 808 BLAKE2B 546475d5195f06b6ba16ccfbb2a2c10e4871abf3ca8ed313f2a931c80649b6ae0498f923bf0f726e2af1f77e9874a3fd7a68f38998b62eda37336bbf708b5c96 SHA512 35bffe970ae52cf3a8f98f172b1c4ad7946fb35ca661dd4de303f09b5ba3296f62e57b74f6be0f2be1edc811242e71f74133abe7010088161f89b02c65d58e53
-DIST texlive-module-components-of-TeX-2015.tar.xz 380 BLAKE2B 9b3766c5cee259ffa64eba8793cf008524cc29fb703ddc805f625f6cba1fe8e35a3d93ae572d92a0461765e35d08640464c18291fd08e7cd84ae6a4a10560aa4 SHA512 ebd387d1b7ae72052d7a87ce2224766fbedf5827b3af7e6d52d3798124b4beb0649ef41e9ba0ee05359ca2f2c9634feaf65e5d7dcbab56a31d10dbb88decdc9f
-DIST texlive-module-components-of-TeX-2016.tar.xz 392 BLAKE2B 31d8eb0153906bbd160f98be0bfe18dab50f32fd585d398efc3655b096fe7e940f8242a4140a069b367f35e2bb2ba538c20edd19d7caf24170cadc59a4307cee SHA512 0b463c0aa6f477173b87fea0c51832116ffc20845e83a9becca2c09d380a1d473749767253b1a6aed656be246de860646ee3c00392e8dd1dbad521f60f40b0bc
 DIST texlive-module-components-of-TeX-2017.tar.xz 392 BLAKE2B 31d8eb0153906bbd160f98be0bfe18dab50f32fd585d398efc3655b096fe7e940f8242a4140a069b367f35e2bb2ba538c20edd19d7caf24170cadc59a4307cee SHA512 0b463c0aa6f477173b87fea0c51832116ffc20845e83a9becca2c09d380a1d473749767253b1a6aed656be246de860646ee3c00392e8dd1dbad521f60f40b0bc
-DIST texlive-module-components-of-TeX.doc-2015.tar.xz 11060 BLAKE2B c397ede00765fe0b77ba812cf01637b11cbefbf7e3df31c21b4512968b08a230c5a40611b440589db36a2c0d8aacc6c4198b7e5cc8e4ecaa3251723cc35b9f96 SHA512 a93fc29540eff50eb2e687eb54887e0aad6ffe001bacd55b6354da02a6260621968418cd024a84f985f94379e23d95585d3b1af8a84ef06fd4c60ddd9eb6ba9f
-DIST texlive-module-components-of-TeX.doc-2016.tar.xz 11056 BLAKE2B d024d0064976f69d606b21b55e06c51d75512cf59af003f89b2953f2dcdc2ab72c209801d50dba511f3de5c9a5e76ac50f5ef5ad2938d1fa5fa524e99ad91981 SHA512 c2e0ae08ec6982cdfc11723dea1d88512791ff0562e7b8c5a53d321f97a5f3cc23c39d507d54a5fd11afd7d5e602c4ed07a040d557da24757b007f39a255c8df
 DIST texlive-module-components-of-TeX.doc-2017.tar.xz 11052 BLAKE2B c851e5be7b7424fc65734ce7f1a96c26d022d93d5713863729f4349620ec7328cdc3e17e9affc248dce1fc3f05a5f3eb59fe81f5fda2b9a618fd76e4c97c9685 SHA512 8bea01596f3381457ccf9f3085b587ae60f2517e8b80310ec2fef1c32758a463734caa04a0ee4c37c118a71b2b2895630fd45d067f02bc69d2bf250c0c836f56
-DIST texlive-module-comprehensive-2015.tar.xz 500 BLAKE2B 627c0664cb529a8c714b6f183992160964114e8df759ce4c66d69a863ae9b37f30f30a8a5fc9fb4c5c97562875d07d16f45c88c1daf5d26ae58ec6ccb53e1d76 SHA512 15e085141a840cd0ad6598015f33546f950c84cb2e00b5e6b5a0033604714cad6ee5470d343c505da7b5593e31f3bd9c0417f367cce054db651c4747c778b25d
-DIST texlive-module-comprehensive-2016.tar.xz 516 BLAKE2B dd63157c2e4869191af1041deb0aad9a5788ec018935ad87e009c348059f7f667a9677fb77be21c674b9002e841dd703658fcb589a3b3daa71ad85937072e382 SHA512 1a97c673732772a3aae304718b5640b68b1cfe9a0746e2c36af99224071ffb15e9b872c0ef0e288375949eb024675f874ae4ed50d698e06aa7a722ee0f8ec19d
 DIST texlive-module-comprehensive-2017.tar.xz 524 BLAKE2B 4912014451e6a99a4830a0cf34665441501833542f22935916b2e081b12625e77995358adb87e4e8667e47ed5921a47bec6c8c7a619a3f8c8c3c337f265f78c6 SHA512 94056d945010254c71d4fb22973d620c12f37e84299b620586d3cf9d5d8b198ec950ed90d1579b2e2fd5e898afa1ba461a2226c7028d4bbfd2fe3c7c979b49ee
-DIST texlive-module-comprehensive.doc-2015.tar.xz 5207128 BLAKE2B e8932eb70aad3b2ebc7a418cc7ea2ad956c6fe4d4ef256d48c883fd105ef6f7ab7c47edec6acdc62fb1cb549c6ff89ff2e4bfded9613d63bb98e2f4d587a4bb9 SHA512 c414889a21637fd0a5e946ecee90d5f7c098bc9b0e88562ad30aef3d57c6a0683be351f8dfd819553aac57cbe08c1e0d84b469d1104cbb10f7569fe68e693c8c
-DIST texlive-module-comprehensive.doc-2016.tar.xz 31515360 BLAKE2B e195e2fe5dfe54e59854d7c7e2a7c2e80201c60f060ad54cfe379fdd08fa3bf9e184de1e386a7f514bf6fc0c42b5f777065a8032a13b656687e907f936633c5e SHA512 edbcbb1ea19034cf99962851f092da9381b4b0eb85a1c3f0d24657f88ed39d436f9bf9cdb190fe946979a5361f2d374c18cb44cef27a8dce4b0aac0ad449b41b
 DIST texlive-module-comprehensive.doc-2017.tar.xz 32977624 BLAKE2B a72897185b8efd22485a1c919c521f95572ae9f2db2677784c1f1c5322aa828da80d1fae0d2f7322f771ac1b88a5a5058c2bcb358251baff7e288b264a63b989 SHA512 a32326299fb26503bd7f8813f1ae62f6d5a7a8eb58c6aee3eea6e90df2cc7b5c58452cc35fcafd0b9f361148fa39f059088a268ca00d79e98305af1c8caae6e2
-DIST texlive-module-dickimaw-2015.tar.xz 720 BLAKE2B 4d368b3a12f296fb345ea615c948e54b97de2bb242a55f88209faad9254b550597090c6909ba0667a5960a5b6d313e035da8f1018481cb17934287d00d228ba2 SHA512 8f2761ce9e9b1c685539a9b9aa10451eb8a13c399526e3c13355b3bba78058a8c9d7ecf005cda4c7ce82d3f4b2b82b2718038c061f3bcc4eea1d6294d16cba9c
-DIST texlive-module-dickimaw-2016.tar.xz 740 BLAKE2B 290ca15dd7e36632156250530e70953ff4db069929dadd5be3c9681a68497b5354dcecf3b7ffee08d4f294edc47551f557261441dcb4379746581adceab7276b SHA512 d441c004d9f93127186813fbe26956e309fe3bde678b67e1d44b1c37bb86b536856f5ea6c90e355f45b28b184e950e91d28593d96758d58b47256d1497260cc6
 DIST texlive-module-dickimaw-2017.tar.xz 740 BLAKE2B 62a2d68b39af183f25445ff346fb4329e31f3fd5f2b8720ec16815d7998072e10604d1006048c416fecc420618da94092bfe0f7209669bca6fcbd97023a4de9f SHA512 74d0847619aa5c9600b1b4c0912ecc4d30eb21be43ab261122f46ad542f5d937887e5977afb315de2f45dfb69654d70bd2fd699f79fc5f77f660b6837e1588b4
-DIST texlive-module-dickimaw.doc-2015.tar.xz 6684416 BLAKE2B 97d0404b28c4eda61558317ec43f577339a995f2c624aa1c925085b8790d33ce2d1437151c6e0090b222c0010a9a8f5dd71033a524fbbcc9181789758935dbcb SHA512 385c43f98f3b4fdeb766e1032b64cbf95495a008a186d6172540a0f5b934cbb2ee82b90fcb8e62fe216b2dca86867cdf8cf1b9ba69e402fc27028710148459a5
-DIST texlive-module-dickimaw.doc-2016.tar.xz 6684412 BLAKE2B 8ca964b107a883c89d52b247e2d0aa67a4818374d8cc62ca056b599703d2705fa6f1859e9f4918940e3f07af9005471b105f12d824b5ec44b651b3a1277237ab SHA512 4ee5c2e502d2367a214106f9ac6a6a05015c1004676449e49667cbda6520f13bda5a2c6812536644a46c905a5a53099a32d9de955943145f2e188f03c57050c7
 DIST texlive-module-dickimaw.doc-2017.tar.xz 6684316 BLAKE2B 18d364ed3f787283b48ea89dba7456d336109a39676ce7b54b30bee5af60441ecccb612e688b086c272f40f2ccacffa8279f2fe1ca87e4014e7586e8e4453e88 SHA512 39cfbeaee99bb4fd990c1e5d65d7689ed55511fdac98bd7f4a67fdf133f8db9f2eb390a614123cc7d4612f88fd30be380d210af3061fddc27c3ad499874fd59b
 DIST texlive-module-docsurvey-2017.tar.xz 524 BLAKE2B c9400d2d00378a5595b002e136c2c3ee3814cba6b12f69468a385954bd212f89c53dd001e1d14a9b3ae4c3cac9171324e3cdb4232d06573c9b75a68116b1763a SHA512 ff7942bc778f0b0eb07ef232ae0c638204ab99aae3a1cc99ee7fe4cc6e458c651b5acdd862449049d022f1f1fd24367eab063c1260fba38bb65c4284f7e7db0f
 DIST texlive-module-docsurvey.doc-2017.tar.xz 264072 BLAKE2B 6859d425633f083000f143a8d385e0cf41de9bb833c1f2c572bc28afc23eef774843b5cc3ad0f0cfac82581671b48e6f80478796a1116bee09400e5bb5f0ac3d SHA512 4bbb6abecf9d710c6a2a8759d4fb03ddeb89283a3306f44d06ab545171b3977b41d8da98257d06696b8b328db1d4a2c5d69bb4b458372b49384d31ed410408cb
-DIST texlive-module-dtxtut-2015.tar.xz 444 BLAKE2B 8b44995a064d61fdd0b36ea828fc56f030c04a94ec9bed4e220d91f9aaac4cfdb6b77c64d3c02f6d049ba3cb30a63cadbb525ec6122ebb6ae5eeb4a3b14ec758 SHA512 ff8e31ad7552bcc4d33221617e233170971c3f210f5738edc12dbfc11d71f1cc6d82a34e6637a628e19cad83b8005be816f2dcd4d0f0ba73481fa62ba26d9325
-DIST texlive-module-dtxtut-2016.tar.xz 484 BLAKE2B 59a2b32d44cafde06fb0cd492a7f79e55bf095b0763e21e4194abaf919a21dcf0dd88d58342ad1ac6325428478632d7f58d7a11ae1eb2adbe4d71891cbdcec9f SHA512 a12f21579f0d3b051a734573437746e087d54bf0e23c4773fad84b4935f6671d770caace1ae3ab9ec61a3bbeb487ce1c3dcf22f3ee37c19128e2e0319d4691d5
 DIST texlive-module-dtxtut-2017.tar.xz 492 BLAKE2B 96edfaff32649589d4a03c43ef650f0fd2cb124024cffdb71071952baef925c3c52c6eae74369e1a42a0ac749a3488c8d7e3462aae12f2261485969dedb87500 SHA512 e460c100074fbe7f5cfa6e6071c4a37c0de4ba9f29cc3aeef7bcda547e856bccdad3e7fc242609914b130c5095e5a9381c3514e2d33f584e9b788a908ce447ab
-DIST texlive-module-dtxtut.doc-2015.tar.xz 199744 BLAKE2B 0784829161f6410d7129cc43479dc28d4ee57b11770578f1b14644b62c26a668c169835305a96d65a431465645a12c7349187ac3109646879e89213495c0c836 SHA512 5a3ff47e0a23a789b1d034653ac32fa433949b44fe08bc27854c4bda8c71d5a0dde1740a27280d16edc4c50733a08e066a446520792512255b1a4dc157bb9f0c
-DIST texlive-module-dtxtut.doc-2016.tar.xz 313120 BLAKE2B e9b9b4c4791afcb0aa12432ade55ed2ae5bfcb35a4c779637c4cf34cc47c906f618b85447e7f6e7061ebf519406a14f5781daf3ac94c9167a926da09050a725e SHA512 1e363eb340921d4c93595d9301d2d9fd0bfd9c5ecf5615cbed01ed17cc3499016d959d71efc49df373064fb64dc83c244fd41c227b0e3d9af4aeeea070890498
 DIST texlive-module-dtxtut.doc-2017.tar.xz 313120 BLAKE2B e9b9b4c4791afcb0aa12432ade55ed2ae5bfcb35a4c779637c4cf34cc47c906f618b85447e7f6e7061ebf519406a14f5781daf3ac94c9167a926da09050a725e SHA512 1e363eb340921d4c93595d9301d2d9fd0bfd9c5ecf5615cbed01ed17cc3499016d959d71efc49df373064fb64dc83c244fd41c227b0e3d9af4aeeea070890498
-DIST texlive-module-first-latex-doc-2015.tar.xz 488 BLAKE2B c152b3cf7e517080deb9ac532c32bed73d21d7764415e4f9b072f971d84bf793dafa2f75358364a2d866ed4d0a9bd2e56e4cf4aa39ef391570c8ff60fb0d0797 SHA512 551264783ffdc0385bb9536162467868c569e08bdabd4655e39d797a71607caf33204d8bb99c665530f14a6873ee1b234210a0f55d6053c879a62441cbfc5171
-DIST texlive-module-first-latex-doc-2016.tar.xz 500 BLAKE2B f0282c4c1a93c2d095d6cbc936574a2a5b465b5572e8eeef50b2c6846eae3fe7b92bbab554ea895d52deb2cb8bd47af5d00390d0facc62d22e219cd0c88a7caf SHA512 2cdc0195b1fa0522221ef519547fe7202281bcda1f83b1d980e8b568cd4e06411e36362325489a718c3c262caf45784b6fd3b351a8cb027dc52a5583a8e197f2
 DIST texlive-module-first-latex-doc-2017.tar.xz 500 BLAKE2B 45884d3063d092955e80d32b94ebaee8aa7500f706404c7dda90fa83a2e65c5ddfe2406de5778fafeb0de38ca406af5dce47c3712a4ff882ab5978265a4d0474 SHA512 01b1c544fc1faedddbbf1eb43bb507d52982329744d51eb88df641e68b3f2a3ceea9b768ab7c7cb55640666a4014f2d6ce73c787a04051da455901b60564358c
-DIST texlive-module-first-latex-doc.doc-2015.tar.xz 503816 BLAKE2B faf06eb19c33c0041d010d37dab83de24f0c62e400b4b64c379023ab87227ddeaac63aa1f806edbd04c7405582760649106c69b396fa70530af6559ae84d804f SHA512 f5776a1e43a062fbcef2bf584f5cbf6a36fd68847e21d7ee6fdae2384482179770b7c85f0a7c605966941639bc6af82ef66673971e6abdacccde3880875669b5
-DIST texlive-module-first-latex-doc.doc-2016.tar.xz 503812 BLAKE2B e99eabda3e136167bef1a77c7c8ec8f0ceac04418d7a398d3011cefe9093685c963e7295c6d7ded45eabd1a95fe823dabdd2ff6e619186d93a4e1fd0d879b874 SHA512 a18769ba30abc0d18c3975609092b665f8ae03dee808fd8f0dc3fc5277d624dd600f0d8b54b84e4e525a6befbf27b1263a28716a0696a7b181091a1ddcc1daba
 DIST texlive-module-first-latex-doc.doc-2017.tar.xz 503824 BLAKE2B b4061295358d255a403ab30637ae34b1af0bcda50ae96b961d0a21f5ec524345f46f5be2a7f71504d3539f7ef750b8f3fd28a81bbcb70da3c2475c2dfbf31ced SHA512 1883271b4a4ac0f5dc3786ffe30799f70a26e676a9115c3d5737bdbb8d0d806d4f2688f99e5fe1b8eb111bb767f2c978f6ee71eec5eacd74f4e7867015d5da16
-DIST texlive-module-forest-quickstart-2016.tar.xz 496 BLAKE2B 718f84a925a7f6862704acd1597632d6a3fb5c3a14bd5f11309b8999478c521f50b74675c9324067effbcca61ae5eeab5ede05e9010a6bc6503644b7e151d379 SHA512 09279d28e903f6c941eec848360a9dec71108932cca9bd7bd9bcb7caddc059e1542e610affe12904dd476eaff6834bb77a94816826172081e2e969dc6af1a46c
 DIST texlive-module-forest-quickstart-2017.tar.xz 496 BLAKE2B 718f84a925a7f6862704acd1597632d6a3fb5c3a14bd5f11309b8999478c521f50b74675c9324067effbcca61ae5eeab5ede05e9010a6bc6503644b7e151d379 SHA512 09279d28e903f6c941eec848360a9dec71108932cca9bd7bd9bcb7caddc059e1542e610affe12904dd476eaff6834bb77a94816826172081e2e969dc6af1a46c
-DIST texlive-module-forest-quickstart.doc-2016.tar.xz 502852 BLAKE2B dfcbe79a892c0998856a575b749dceded6be573dcadc56395f1c63dfbbbbbbfdf6bfead759f397b9cfae64c877f3e2cfc564e11df1055d790af382a9fe14c8a9 SHA512 ad811173d1aee5082a56c0daa1a00179e85389d92f95e1dced1102c2291fceef892a310bf1dabd422f40e584270f7ed32d2d09c527b5008e5f9b616d5f446df9
 DIST texlive-module-forest-quickstart.doc-2017.tar.xz 502852 BLAKE2B dfcbe79a892c0998856a575b749dceded6be573dcadc56395f1c63dfbbbbbbfdf6bfead759f397b9cfae64c877f3e2cfc564e11df1055d790af382a9fe14c8a9 SHA512 ad811173d1aee5082a56c0daa1a00179e85389d92f95e1dced1102c2291fceef892a310bf1dabd422f40e584270f7ed32d2d09c527b5008e5f9b616d5f446df9
-DIST texlive-module-gentle-2015.tar.xz 400 BLAKE2B b70175f64fa5efc7329b788d7cf11e079725811b74758c75af592942196dec83a541703a552a1033535fe21b05c8c55015cb1b9e444b066bd207290fdd79099b SHA512 9cdddcbe0d5083c975a574e75bb9075af5cc52f5556aec83adf3c41cf13067fd64c4f19e9ffee699752820f6cff98374c55057b414b8c791f3b3579525dc584e
-DIST texlive-module-gentle-2016.tar.xz 428 BLAKE2B 2e08ed21f67aeedc8c911024bf641706a383f9bd3761a2a7a732654f4f11cc13b2ec6faa124b1443248894819b67cc69958865c9ec46e8804011f31cbd6a8edf SHA512 2810204196e637c14aa672911514755721eb4f13e5d771bcab7c7087ab15d5eb95c3c65938ab98f62d02e72d4b0dd10718bd7a8c407a245977fe1b0aa8f633e4
 DIST texlive-module-gentle-2017.tar.xz 428 BLAKE2B 2e08ed21f67aeedc8c911024bf641706a383f9bd3761a2a7a732654f4f11cc13b2ec6faa124b1443248894819b67cc69958865c9ec46e8804011f31cbd6a8edf SHA512 2810204196e637c14aa672911514755721eb4f13e5d771bcab7c7087ab15d5eb95c3c65938ab98f62d02e72d4b0dd10718bd7a8c407a245977fe1b0aa8f633e4
-DIST texlive-module-gentle.doc-2015.tar.xz 394792 BLAKE2B 21f3ecb50aa28e623948b05b13ba810b16aefc4a2203bfde6d1050efcf2e3055d28bfbfe665fd28e3e01c282902c1df17e22c2e8706e7123cdf479e304343be9 SHA512 c71fb02baf3890bdf57481ad055c4d26a64ebb94d663973df03b3b566b7b4ab0b88b79780d49ed4194a3f002885ce52118ea1b8bc1087fbf2a8a04230ead4a98
-DIST texlive-module-gentle.doc-2016.tar.xz 394792 BLAKE2B 084b1a6c1cd672cb09b1faa9fce98c4fd0ef0810ba88523eca874a546f481cbe1f367d29944e3f2afa2aa4c2fe46a35cfae2ccc613df111dbcce816c035bc9cf SHA512 c79fa35c8411205ee29b93d43dad0ff0da7e6059267f8d009500b9f632889ad7a9b5c51645c9fbf83a0e87bf481fe7417accd46e3a85601c2eb7df897c5b77e4
 DIST texlive-module-gentle.doc-2017.tar.xz 394816 BLAKE2B fc74fad4568afcc4592bbad79f235ec1d99bc95e6960df49f40db0d156f6857189e4abc26123138bd7458563c6472820287432604f0c077b34ddb39d276423bd SHA512 58959c3fa8b4ace137abc1dbc95d310db820783315f31b05fb6985353c8f7c058d804b06e092b9f97cf3157374afccb3ce225d37e053225edd01bde3d6b3487f
-DIST texlive-module-guide-to-latex-2015.tar.xz 244 BLAKE2B 18f8c83f906cbefa8db1bef3c22ed5e4a1f9c492832794c43dab8f53bf56b2f2961e949fa0de1f145dab7b8b91d53080e4b2a2f3fbe09d2ff4648f2274d30bb9 SHA512 510bd2e4f389f2e3a190bf84dec05f5150253a823e26a4c30ef4d3c3f84599bb196199e4a8582b5eb91203c366ab37e2247d15f67be3c54cf9e83274e7539d00
-DIST texlive-module-guide-to-latex-2016.tar.xz 248 BLAKE2B 381771309d147219daf237ab8f88196dafe02c3113b86b0a0822969b88313383928b5ffc0c26acafb96fec63b65d48da95305df1dd463b4b34a84ca62000c0ad SHA512 16f89eeedd8431dde6b537025dd51d9a83057f54d956fe8323a5718dbe3de9d3d267e3cc7dff3ad4bc485460ca61ea87422088aca78ceed427f186cd48dddf91
 DIST texlive-module-guide-to-latex-2017.tar.xz 248 BLAKE2B 381771309d147219daf237ab8f88196dafe02c3113b86b0a0822969b88313383928b5ffc0c26acafb96fec63b65d48da95305df1dd463b4b34a84ca62000c0ad SHA512 16f89eeedd8431dde6b537025dd51d9a83057f54d956fe8323a5718dbe3de9d3d267e3cc7dff3ad4bc485460ca61ea87422088aca78ceed427f186cd48dddf91
-DIST texlive-module-guide-to-latex.doc-2015.tar.xz 174484 BLAKE2B 98a5b2948cc970eb947d328e1eb3782196b5cfb27f0db23ed52d21d99da63d15cc47eeff9c0953d5d0b02878b8874cc929aa1549bf1626f97cc70f0abc62a924 SHA512 96fd9410e03608d91b5e9db192e5cc75e437b8c9bfd2c3fc209dd7f873c1890812419f55be901bfdcddbb62cb0a322231c11780eac97a39c2d3fb366b0b7d884
-DIST texlive-module-guide-to-latex.doc-2016.tar.xz 174488 BLAKE2B 6af7f161313e4ce6d5179ca34049f3e02195e645cd2bd01c1fe308e942da48a0089035fc3668c6435873f051abcbd894e930cde0fcba1cba1661f55b28266efe SHA512 d2941d22e9e0f3bc6840fa5f147f2b13424c6369f74e8dc123b62ede5c72fe02815813711fa7d1167cbc4476e120240993d401fccce9a58e7e8bcc99068382c2
 DIST texlive-module-guide-to-latex.doc-2017.tar.xz 174436 BLAKE2B 5ccc46fe14a6ed3ad4a7b3ce7baaed1c8e2daa27ec347495703d419f01a8537f63847085969ac67392931b88f326ee1ef21320f9838c89a64282fdd62139b523 SHA512 36f0680f0d8f47fc6fc9210b230d1a71eb4c8c25a5554326129dae3288f7db1072d402af90d8bf1febc7d84b63ec4b7a3f71395f0f2226e40e0e31246824a0c7
-DIST texlive-module-happy4th-2015.tar.xz 420 BLAKE2B 782b3c826a4d995119051d754fbe5b58ad82edfeecc2b2a6f522ebd1bfb0ae023b129c6a23166f1a17e2d964d3a0b153c3e5ac5f722740684b5002e512574d71 SHA512 2a9d27d0ea99d7f4a106c13ab157ff04a0f147c16b7c2a5b8a7945a78f347811e6957287c65d19c518c4cf624eab1482c2231e2726166434437514d3eb5968f0
-DIST texlive-module-happy4th-2016.tar.xz 440 BLAKE2B e9420b98c4f7e553fd98c526e0064754be83b3f27a7c36b3b3c7f2583de4d67f0be756985a8af2d543a02f4db34d7b4336021f125785f76298c14705bfefd309 SHA512 57e153f0763597e6b3f0841f90543fe42ed9ffba1362df44a67e2afb57294b6a5824323b5104dcf39a382a98c4120a7f9cee74386cad51e05c80507daf4b0e35
 DIST texlive-module-happy4th-2017.tar.xz 440 BLAKE2B e9420b98c4f7e553fd98c526e0064754be83b3f27a7c36b3b3c7f2583de4d67f0be756985a8af2d543a02f4db34d7b4336021f125785f76298c14705bfefd309 SHA512 57e153f0763597e6b3f0841f90543fe42ed9ffba1362df44a67e2afb57294b6a5824323b5104dcf39a382a98c4120a7f9cee74386cad51e05c80507daf4b0e35
-DIST texlive-module-happy4th.doc-2015.tar.xz 52364 BLAKE2B a500fae8f2d1a0f4a05863e6c92bc08a982ea6f850391400f90bc1c1993f96951a11f9ef6b60f035db9d2ebf20da5e74ed0bc0847b97cef8deef7ab11aa0375b SHA512 2e1c5283ffb16b058d700e8eadde7bae32c53971bf441c4474812bb445fb67dd952dc9839014f505f6be8b74efefbdfe3c6d872caf2f5d82decf249b90236d39
-DIST texlive-module-happy4th.doc-2016.tar.xz 52364 BLAKE2B 84a8c32505193e27913ff086be11cdc93f96d01a43e400d4091883dfa3a2b28c78bbef413493a3d48274cfebbca7f61716efc051de52635cca325108a0e9b18a SHA512 8daba24c655daf3f6984965ebbca5a3eb5d3879743275e9bc4fb1fe95cdb42ce133adf58da623fc4c480e48a81e825d6fcc44338f3003acb78d8ebcbf062bce7
 DIST texlive-module-happy4th.doc-2017.tar.xz 52364 BLAKE2B 84a8c32505193e27913ff086be11cdc93f96d01a43e400d4091883dfa3a2b28c78bbef413493a3d48274cfebbca7f61716efc051de52635cca325108a0e9b18a SHA512 8daba24c655daf3f6984965ebbca5a3eb5d3879743275e9bc4fb1fe95cdb42ce133adf58da623fc4c480e48a81e825d6fcc44338f3003acb78d8ebcbf062bce7
-DIST texlive-module-hyphen-english-2015.tar.xz 580 BLAKE2B 1e2650acc03808b635ac9c6c9d7f2f7e7cd13103ed4bcadac08a5884359b675c18c1fda73af5db99b58af64e0b228082472eefe23b2393f7d9ff0f471db59562 SHA512 7938bbadbc3babe49be28e8c37a6cf17c4987a0ab507488314502d4b43d17d354941f696b0d31d28e823800bdc53cbf3fe2b42d093ce589b3b7d3c532e033693
-DIST texlive-module-hyphen-english-2016.tar.xz 41000 BLAKE2B 971b59fd05b7dd4ceaf4496a047bf4753f2ba5e870ea4af9a474f7613a2809a31eafb4f5249615891ca00025004d0f77cba5a841fcb588185fdd27a695b89b74 SHA512 ad63a021a80313f7da414e08270a8c25f5c0a8cfe463fea0305f1e15b43096b929fd903736d14877aa68967ee821712c85a260ca8169088f7823c3ffe6b43496
 DIST texlive-module-hyphen-english-2017.tar.xz 41000 BLAKE2B 971b59fd05b7dd4ceaf4496a047bf4753f2ba5e870ea4af9a474f7613a2809a31eafb4f5249615891ca00025004d0f77cba5a841fcb588185fdd27a695b89b74 SHA512 ad63a021a80313f7da414e08270a8c25f5c0a8cfe463fea0305f1e15b43096b929fd903736d14877aa68967ee821712c85a260ca8169088f7823c3ffe6b43496
-DIST texlive-module-impatient-2015.tar.xz 428 BLAKE2B a8cf07a796bf374cb86f284e1eb8894894a044ca8b69922c95aef76d138cea5c75af073bbeb7c721469a84841c3481e118ba6fa7a01822e17c331145e33fd4c4 SHA512 8fa18fabca66efefe3407a129f7cabaf7f0e0a097b8a808246e7e4b0a1024126458c2a586aa26402b4e3fff94fbffc21b5657842a21ffbbbad99ec4b09937faf
-DIST texlive-module-impatient-2016.tar.xz 448 BLAKE2B 9c154fe6f61e3b6861f71bcd294ecf887db4edfd2f81ebf4af350cc569e7d56f8738d403990d112eee18023591926b0734d259136f9bf4d1edd7580f91cd9902 SHA512 009b8b22d533a3437c58b03abd65b406ed151328bfe9ab049c1782746bf4b5db56f40411b4f6e93bb0cd242cfacdb2e1475de86a9bd7490fa6853c22e95ee1ba
 DIST texlive-module-impatient-2017.tar.xz 448 BLAKE2B 9c154fe6f61e3b6861f71bcd294ecf887db4edfd2f81ebf4af350cc569e7d56f8738d403990d112eee18023591926b0734d259136f9bf4d1edd7580f91cd9902 SHA512 009b8b22d533a3437c58b03abd65b406ed151328bfe9ab049c1782746bf4b5db56f40411b4f6e93bb0cd242cfacdb2e1475de86a9bd7490fa6853c22e95ee1ba
-DIST texlive-module-impatient.doc-2015.tar.xz 1562772 BLAKE2B bcffd4523fc951938d7548142c67fc9afe90f0c6eb68b6e2baa0e7533914f5ee6dbcfd943119b6b1e8c8bdc58ba7a1cc3af61363da2b4437a142e0308af49c48 SHA512 93b2bcc9ae6acf24e5c8bd40c75c608e9b83a85b5ee9577198b1d3235223d2b29087dcd65565387817fd18805314b5b03d288c7856bd777d63b09de0b8dfcff1
-DIST texlive-module-impatient.doc-2016.tar.xz 1562772 BLAKE2B a50ed7967eeb904920f06c9cb399609556d9c5283f302997f31f55ca77b5b53b84cc99a9d95d6346048b72cca153bc7a9c66f3e163f325cc0113e5d77b5b4566 SHA512 cb91f306a7e577cf67b9820ddc22f8ed26802963bc08a70b290026f0593863eefdec942c33e3a472718ed044fd286b801c3a4f0b5bc562140131ab6cabce13b8
 DIST texlive-module-impatient.doc-2017.tar.xz 1562772 BLAKE2B 2c098dd3874398f12c2b937f36bf81e2123283f258341a48944ae50ab452670fdd743f59ea5c43f03b5f27aed77a7351064a6fb8237b3c51c2617ae57ddf47c2 SHA512 55f7b776f3f2468df564564df6d3ac09fb5940b5d32532b9123c9353d2d445cbe9b879ba920d396a17d2abb11e14c9f6bf4d803b1943edbc997016cf31de04fa
-DIST texlive-module-intro-scientific-2015.tar.xz 528 BLAKE2B 464614bab5db2e4cd555f76fec08a05a2a5169c1732567d72f4265c9d63b1e8ff8bab54444055470ac3b54d5f32391ba6716855673b1c64eb89cb6bbf705c64e SHA512 73163653b8181c0ff70475f2be14853efe6a547262be40698d8cdf02a6b7937016e9858dfc08de329e2209e7c7fc02b03912a9c9e75e605fbed7fe6224f0c730
-DIST texlive-module-intro-scientific-2016.tar.xz 540 BLAKE2B 713b6f695447a499cb691d63ec656afc3c0195de621199d82743629393143ff6050b2da6333bbf09fdd232dc49bf6d1cdfa4d0b74d66449cd86408c72f58ec34 SHA512 f6f8fac4a241521fe16c7e38a9b49ba556551e82309866cd562ab207878c805838bc59a29641a109cb9460090a7f3aef589a41277cef91d983da56548b72fdfd
 DIST texlive-module-intro-scientific-2017.tar.xz 540 BLAKE2B 071ab1386ef31f8a5f69917cc392ea3c517d114d3bebee3788c06bfb064fb7b7e4bd0aa993b1be9c6951672bb2db68f500ed05c55cc740a8f4326e3fe9ec72e5 SHA512 98205a648a218306964fa141633ec54113591d0077dfe7905e108ee1fb8be80cf22661375e34e3ce1eb275e5ce8f2a14bef3382cb98024635ac45df5532d4a1f
-DIST texlive-module-intro-scientific.doc-2015.tar.xz 274748 BLAKE2B e1f0b5c009b25c6c2376498ef1231d16c785da041fa1163aab6e78859241c0e0f932c18c26b1c004128d8f6c881ff0c2bd251de6d7a17882ce0298804cfdca6a SHA512 94bd12db094eb35a611b8fdac47384580b546c5510adba36b5d0a2079b22b277a81d321b0021e29053b90ec34dac6b62f04c8ca7d5c26c7fad40609535142ddb
-DIST texlive-module-intro-scientific.doc-2016.tar.xz 274748 BLAKE2B 6b7ebbbce5d794a44608f56f9d95f523b6299e9b5901caf3aa037eb9bb75ce1e37f14eedf688bdf97de0c167cc9960406ed6328f726264b436cbb3bb53e8a59e SHA512 05852f23187a9a6ca80b15019e22b5a90a2d49281376ff7fec81a2e801d1e893b1b0ccfdc937409d8c1c63917f51f77f3c4c82e193babf8d93b9c6970f680af3
 DIST texlive-module-intro-scientific.doc-2017.tar.xz 274776 BLAKE2B 6005a59c18afc218b22b65fe58f7e27e10c59b689c56445c3235b0e11b4d586708732b5f37a1aabc090430427ea8ff7d8aeee223db688b17453f7ce80d1a467e SHA512 f75b2e1c029d18cda0f1e955c5994d9d0e1220e2468615ebffe76dd4c9aac2e7257e8a0b5ededac4c946b045461b20699e3f805b57af2d42f8fdd39b35f820c6
-DIST texlive-module-knuth-2015.tar.xz 464 BLAKE2B 3a750b1b28689c3b716b42397de7b67de971cc90b5257034b7d1e5658d2ecb4dc5cc6ac26d21920336eccfaf59c02f779f9962d44034a416cc65fc40b1ae6945 SHA512 85f0aee4cb43469a2d5a821ee831992e536ccb9936d900c94c9d75d1cebcd12e31895c8767813b21273b371dfc952793f2f1bea7f1c5e4f8aff76b44705a5a9f
-DIST texlive-module-knuth-2016.tar.xz 472 BLAKE2B 829aa7368fbab7bcdce143a571260680659be5684d5a6ec6e53c4e3fd21831d2a72d54912bf90da72b945e0ec27714ab40cb513f791cf31d8889d0c37add2a49 SHA512 a87f16823b0ea891d89961b17934a3684f941919c6d219ec6440f8246d9ef39d8559c78aa38ca0c680e58fa04d09db7d65ac5c679b07683c098e4d468acc7794
 DIST texlive-module-knuth-2017.tar.xz 472 BLAKE2B 773bfe1f5d298b7c798c9ae13311d60ba512bb61906791c1540229f3c073c473e8b8c31761ae0ac774b242a9273a507076e7f6997d9a80fd36ff051a9a6d0781 SHA512 d88c54cba55a90032074a8c9cd0d254f4d266b2e4c29df041e94f02e213e3cdc0ea4b9b54b15103a567c3c079a8ba97af1db8bb16a2d348df98b812a601b78d7
-DIST texlive-module-knuth.doc-2015.tar.xz 14024512 BLAKE2B 4fa65257d31e6872913f930bedf6d331c226acb76e0f14fd93c97f87f734bcd1affba926a9f452bdb0414183bfcf298a164d9622fb88f5dcd5684b2da337dc51 SHA512 e2478ea5866fbca8e16303554263c7a9298c870e9096bb1c6876a7525c787f277ba0e7bfd77112e3bcefcdeb8ded536c698e6ae26cf97f789bee50bc672e44ff
-DIST texlive-module-knuth.doc-2016.tar.xz 14024508 BLAKE2B c24c44babbee858bcd831ba52fdfae81b3d16ee40c2920cfee8ebca0160c554c4060bf9726040cf7c5eeb120fe5214bfca2a4618dc7000ec1ec3c19826032757 SHA512 f6d01f802f89ee4a29e133105e5dbc6eb2245c314b531aa7e1d960765bf591736ab9c66043b393ac7f5440737244895bb098c5788e6b7e9ed6c5eb879db94f05
 DIST texlive-module-knuth.doc-2017.tar.xz 14024508 BLAKE2B c24c44babbee858bcd831ba52fdfae81b3d16ee40c2920cfee8ebca0160c554c4060bf9726040cf7c5eeb120fe5214bfca2a4618dc7000ec1ec3c19826032757 SHA512 f6d01f802f89ee4a29e133105e5dbc6eb2245c314b531aa7e1d960765bf591736ab9c66043b393ac7f5440737244895bb098c5788e6b7e9ed6c5eb879db94f05
-DIST texlive-module-knuth.source-2015.tar.xz 171424 BLAKE2B ec0608379830005b0b2ae5ff205905ba33b101bb7e5306c50e0e3f0cd90e43fbc4059eb849429cb0a70760e97d5b2dccfc20cfe7ff0f315e92e9ae259dba8aee SHA512 e4a378ce47c0f4eed1de087e3faa20856d392820f41baf90b22d9774d5f945b8800cbbf70314c739d067c1b2c3d04c7e28c31c5f6e7344fed538cf5edaa30125
-DIST texlive-module-knuth.source-2016.tar.xz 171424 BLAKE2B 1937912d67430d63100c2e2efd548c260a9d9d208f10a71a42bdf954b137f3221dc69746d714e4d51afb2b5a42d31520cebf7a43b48e9e3a9e6a91537a650075 SHA512 fedfe46b3e5b7274e729b267065973ecddbd8c7779cfef9bde779978db9e46cde8c261a83c9d8717684ce9444aabb6febf07741fb73b98bbae2d3f05c3810d18
 DIST texlive-module-knuth.source-2017.tar.xz 171456 BLAKE2B bacacf79799f23655385bfbd1463be0c749eee6816996072093cea12b09ee56a84cf3e4debaa00b17e4851bd063ebf539e4bc5fecc4da83fd2b76ca806be2bbb SHA512 d28eed39420d4ee39d1cef128aa53ef30fec76ecca66d690b08407d88d0ea4366c510ef7251eecce566bd0e256205084f762e2266a54fc8894d53bff5ffa96ed
-DIST texlive-module-l2tabu-english-2015.tar.xz 428 BLAKE2B 5477dae25238b24bcdc8d70be120d0069328423b0973069a27e0ad1f57544b4c86fb43cbf7c6a0b7277c52281d3a54d86036af16c34136e09abb43d9a121af3d SHA512 a9f711c139d01eca892914daf2e62821c1d9f194628ca804cd69111f6b93ea283e841c1d1876c7063f81cc3d15db2376dab9d101307462fe4b3400265d0713c4
-DIST texlive-module-l2tabu-english-2016.tar.xz 440 BLAKE2B 53308113fc3af76c2047ed76bbbd038d1f19ac77441a313378466f0673b8437420f382d12aa0a18537b3f68ee7f5b111e384540cd2c4f043e7de078d204ee1bd SHA512 f83814cbdc724fbdd37bd6a950bdf5797b7c139f2dc347828eded86d0c4a6ab5cac67c9c5a782f495911b5a755b7035775846c05633166cc762a738a29712819
 DIST texlive-module-l2tabu-english-2017.tar.xz 440 BLAKE2B 53308113fc3af76c2047ed76bbbd038d1f19ac77441a313378466f0673b8437420f382d12aa0a18537b3f68ee7f5b111e384540cd2c4f043e7de078d204ee1bd SHA512 f83814cbdc724fbdd37bd6a950bdf5797b7c139f2dc347828eded86d0c4a6ab5cac67c9c5a782f495911b5a755b7035775846c05633166cc762a738a29712819
-DIST texlive-module-l2tabu-english.doc-2015.tar.xz 266556 BLAKE2B ea6d2ffdd3bc7bbd0033930fa8334fa8e9b577b3c7c2728c3aef78a917b13f8e34abe397f627c15d9fe6f5ae7040bd76e2d8cc97cc987c6d5bd28245ed5688a1 SHA512 75558418230e3879e275507553f8d693e695ffabe865eb962026d1af86e49d6cc853d1f68e0e6e0cf7b841714197182dedc0139f6f160e1fd24b8e47ff664421
-DIST texlive-module-l2tabu-english.doc-2016.tar.xz 266556 BLAKE2B f130f6846df8bee03140e50efe3bae3dcea0a081f8f852d4c7388cd9bad3d81601029c3dbfe2788fcf4632ad4919eec5c4c4265d10086ba365d83f294a87be99 SHA512 59396dcf1d8f7b90d63c8f5eb272af07fd881c86aa2ee1e47639e1ea9befeed0988abea10c933facabde402bd3163e381c2b6d834447fc5c423f09fc56eff673
 DIST texlive-module-l2tabu-english.doc-2017.tar.xz 266556 BLAKE2B f130f6846df8bee03140e50efe3bae3dcea0a081f8f852d4c7388cd9bad3d81601029c3dbfe2788fcf4632ad4919eec5c4c4265d10086ba365d83f294a87be99 SHA512 59396dcf1d8f7b90d63c8f5eb272af07fd881c86aa2ee1e47639e1ea9befeed0988abea10c933facabde402bd3163e381c2b6d834447fc5c423f09fc56eff673
-DIST texlive-module-latex-brochure-2015.tar.xz 476 BLAKE2B e23809615cce2f575829b8b28ae9f6a35f9c6c0b9cfa10d60b4fb0cc6490ab84a504736779ca3df7af952a131804c9085dbd0b793b99e8b4ce422db0fbae1d41 SHA512 f104a17e38d754327e9d013831d68574f8e6badd511302bca980e01a2a86a067895a11e66f03aa08f24c22d0ec593989a45d295df3f06feaa5c286777a6446d3
-DIST texlive-module-latex-brochure-2016.tar.xz 504 BLAKE2B 10d35fe9cc6a218901b07d90abb8a578209b7bb54f97254b87ac0bfa6741a4b6d7d45f58e37b8d71607ea77e531b6fbcdf69300e7bc05c086f3a648c71e24e29 SHA512 bcdc54b1817b13dde78f95243eaee81a20f54193b92121a52632d6477e80f54fcda4db3c540258749fdc834f69581bde5ad06bde86fbb44cdc5f2ed6802552db
 DIST texlive-module-latex-brochure-2017.tar.xz 500 BLAKE2B 9fe273ca05f71d0783bbb14718f2a0ed6054434c3ae3074572a23d3a125314b4b34ff2bfd218445f51c03a96d510befd6f25b5a1525781a5d26587277fa665c6 SHA512 c1aa37b1fb90bcf741a9f58fa1303e6099cc83b393068bb74b3ca6381ea299bcd1cba22b2140bafd5b328680bf0bbe57c17da9f4dec7769923c1261eee264fa6
-DIST texlive-module-latex-brochure.doc-2015.tar.xz 6199992 BLAKE2B 843012cbd88f9522c4fe247870c3bc21a5b21a1c4d1ef90b6241b7d156992cdf3c9d1e78793dec3c48591a3a79116d5670a7eaa8c25ac6d7334eeee9a7b5c100 SHA512 2d784e8b87889f730ace000a5a3a37d9b36e0a7ce04b565d5c40e7fe8b9a648a997c547ba1a961a3277d9ecbf2e038f734251cf598e77cc7838ad455d94e5f81
-DIST texlive-module-latex-brochure.doc-2016.tar.xz 6199988 BLAKE2B 208d46abb21afee262b9546cfabf17bd18096006ce1658d65fec83558f88c7105610d73ed9367f7958d86391e0515646cd48198473293d3b25242448809d3833 SHA512 96270d5171591b269d9780d47fdfeaf9ae85b062b2b4b956f05d2126cdb5a3b81f402d88eb892644f0498e051d6d9a63f3291fac9de9fbd493c6d85da09e384a
 DIST texlive-module-latex-brochure.doc-2017.tar.xz 6200604 BLAKE2B 9cfb89e3428a007e6a8188a4701e6500953d6338ea2603b81b8f7150353f6eac651ddb0442c9a544fcfe917ff48f93e0bef0e57e1876ac2292786aaec50f7772 SHA512 1df4b84c14e87414a7db850546dfd5dbcd82373cacfd61a30bf851e1bcb5acb7b9bb40fcb4026c9ec1873ed6bfff186ff57b2b9183a3411bf9744eb496a1649e
-DIST texlive-module-latex-course-2015.tar.xz 496 BLAKE2B 8e52751c90802b416a90088154750c16634688547fac4adbf5b9e658d358634d8d6fe9a71ca6b8e859dc32f0cd240bb9e8f25cb92c21f0061c11338bb742e4a9 SHA512 4e2da7348758e02cd34a64e47781c8990ab9426f36840b7282d400d78dc034b4c145a95475948bc16e3150cfb9a98d2cc6f12c76562a55608470c06c1f003d2a
-DIST texlive-module-latex-course-2016.tar.xz 508 BLAKE2B 4839e873b7a8ece3670a596c11af3fb93eab7c445b9ab3132ef603d0104caacd3463db1636cdd8dc3c9fe6227462f338a5cd4534cebc83fe2055f03111a17ae6 SHA512 188ef2b8329dd5a428e4aa9f5e704cb2979907e6919666b8f6c81ebc07367d7fd56f935ae5bc69e9310d03d9f3016e125e351fe52dd43db7a786741dae09098d
 DIST texlive-module-latex-course-2017.tar.xz 508 BLAKE2B 4839e873b7a8ece3670a596c11af3fb93eab7c445b9ab3132ef603d0104caacd3463db1636cdd8dc3c9fe6227462f338a5cd4534cebc83fe2055f03111a17ae6 SHA512 188ef2b8329dd5a428e4aa9f5e704cb2979907e6919666b8f6c81ebc07367d7fd56f935ae5bc69e9310d03d9f3016e125e351fe52dd43db7a786741dae09098d
-DIST texlive-module-latex-course.doc-2015.tar.xz 600120 BLAKE2B 7bb6e4aca2b2955ed37f84071cd7a74845033366fe848d4c845e2b747b6bf9385020a0bff5a564c0a7ff6193ddfd3486c6bc6cc214248e99794aa958d94e0e23 SHA512 5ace5b1860053cd3c2b59bfb02d2e5f5d8a14172903971da8130dc10c0fa911f00da5b9b6ceb0b018d5199c369ba154b8f8d1f4890f03aa4f2ef662378afd3ac
-DIST texlive-module-latex-course.doc-2016.tar.xz 600120 BLAKE2B 02f295d80e1c38a3432d76d6c93d03b1fceca2ef29030745c17f678d5a6c2f7da6e0752d9aefab635c8150586c3c606896e010eea0987151420d558c42e9b892 SHA512 17f70e5ec6c39dd4f1503b18ba46b4bedce0b0ef0d7ce2847bb65c96f1bcedf1b30e70276d9a37f4774946931ce451da3abac8d2ab4f1a9176b968692d8b5759
 DIST texlive-module-latex-course.doc-2017.tar.xz 600096 BLAKE2B b26587d4562f9693963dd513e6f93c817b50f67cfd4200272295874e7656d239e16681ffaf74d849c8d7a0556e91030e5366425712c440cfeac4dfb5986371cd SHA512 5dfb3e2301e002a18b758e13f1cedc776c5ee7b3a6313aa8ddaef1bad3566d6cceb6b6596a97acbd927323dbd52977e0375c35991602d8cf8391d7846b62f7ef
-DIST texlive-module-latex-doc-ptr-2015.tar.xz 492 BLAKE2B 962e3d0384cae545b538f15721154e75bb382cba1178d852cba89a8586131e39a9809bc50f74c877b97e65c18f7089a4a5dfd06ca6cf53b1b8a880c2e516687d SHA512 604963c6d033a7c7ab6342dd4a5bcec5a661d52228daa1a37e5f553dd9229ee2ed85bf7c782fa6a46cd11698dd1eef27319f60f979c6937c70c604932d03ab44
-DIST texlive-module-latex-doc-ptr-2016.tar.xz 500 BLAKE2B e37f23c141f5aefa8a0ac87d398543bd1e3763eeaefecaee6b265a0cceb7601a4b995485a1a028c7832812638e9cde8572b67e956bb3cadd2f027e9fa7760a6a SHA512 a16f7e7782027fe395737e5b19b5d02cff6efbf4ce5b65893a46ad3a5f050370034721ec90ac52426e693ad29c1b578009a8f56d3ba53d71d6578c07b966347b
 DIST texlive-module-latex-doc-ptr-2017.tar.xz 500 BLAKE2B e37f23c141f5aefa8a0ac87d398543bd1e3763eeaefecaee6b265a0cceb7601a4b995485a1a028c7832812638e9cde8572b67e956bb3cadd2f027e9fa7760a6a SHA512 a16f7e7782027fe395737e5b19b5d02cff6efbf4ce5b65893a46ad3a5f050370034721ec90ac52426e693ad29c1b578009a8f56d3ba53d71d6578c07b966347b
-DIST texlive-module-latex-doc-ptr.doc-2015.tar.xz 130640 BLAKE2B 5176151ead0535ae18021ed775a92b391131024d6375409827f5b1b057367939acbba3905b5fc9005ab03ee9f0c68e5d7f37749e14d4271a9862e3588e9136d3 SHA512 7dc1bce400c853161ca95b58c3844fda799e44c5fc8906c847f1770d618b275e57475348755b27eca8c17b8e0cd320ca36753439accb2303d2e28e74abeb1dec
-DIST texlive-module-latex-doc-ptr.doc-2016.tar.xz 130636 BLAKE2B 9ed82171500aa8782486c43cb6529ab51d2ccc1c64bc3a53c142a2efd129384f199d9c52964306cb2de6a6460e8d12a534bc9f9235d9945786ab020f81861d18 SHA512 c60d8aa79c728738e4d3c623bcd74bf795a548f849292d03c935ffb1cd4c29d6cb17a30257a395e63941d71ea91ccc0548766209ac73d29988dc9c1ffbd58a34
 DIST texlive-module-latex-doc-ptr.doc-2017.tar.xz 130620 BLAKE2B f13e0067a51404765fec8acdf186aadc573d0b1629fc20407524f51ed7e34bd92550bd866cf5667d99487f6366a80402108c2f7edabbbd053a103c57f072f38d SHA512 32f908df14518d086baef7d2690385ff975317e9529fe1e0037e59bcd787a55f43aaf909d62d1bccea0ddc07e09161a930a4db55a99361b4ee0b78140c308809
-DIST texlive-module-latex-graphics-companion-2015.tar.xz 424 BLAKE2B aa58d5cd93a0153e301aa7772b092f48de0d55a53d3edbd7b66e2b588d5d7c6e0647f09ae64c05f2f4abb12dfaeaa90df6734246d2890ba927da074bead871ea SHA512 262c1207fdf17d6fc89871169821adf19549a0b67f7b94bb19294fa21450965fb61d861c10a5beb0fe98bc7496e914adfe515ef2cd326aca872b9022f80b00d1
-DIST texlive-module-latex-graphics-companion-2016.tar.xz 436 BLAKE2B aefa3735dc7b67f56e2cd2836aa70d86bae7debc1cb497ac6586fc9a92c81405cb78fedd95d3583745d8e82c52c3c1f8cbefab817aeac0a91f752fae6cccbf89 SHA512 15353c2278633554ff3114015b2a1b46fcc9dd0182ceaa0c968dcfcb6e5fb12561004852f6875e41ce705d243ab3a45416d142fe9fc006b3d595ee4f854d4d22
 DIST texlive-module-latex-graphics-companion-2017.tar.xz 436 BLAKE2B aefa3735dc7b67f56e2cd2836aa70d86bae7debc1cb497ac6586fc9a92c81405cb78fedd95d3583745d8e82c52c3c1f8cbefab817aeac0a91f752fae6cccbf89 SHA512 15353c2278633554ff3114015b2a1b46fcc9dd0182ceaa0c968dcfcb6e5fb12561004852f6875e41ce705d243ab3a45416d142fe9fc006b3d595ee4f854d4d22
-DIST texlive-module-latex-graphics-companion.doc-2015.tar.xz 61484 BLAKE2B 2cc10320fe344c4f1f72d2258aaf5cffb0e53644bbf3fb51b481c26b5f7504bf3b06c5fb615b7681764fb319b6ed268cdbc4d74de7c892175b4139ad6bfcc450 SHA512 c1b2588639d14d1655f3a339bee4fbbe3663a276b2eb06f9c7787b8a8eb3127fac1ff840a792fb282cd3fd390364dd8d1ca25b694e2be5cf321905148aed7a27
-DIST texlive-module-latex-graphics-companion.doc-2016.tar.xz 61484 BLAKE2B 849f9dcf5c2d1066a4eeac8fee4b2583844d1c8287b0b2ded1b7e9968de35334c1a0cb75762349b8634dae681e998200d95296b314a52a74272360da0e382835 SHA512 4ad8752d9f2b0feaa81fdc6df972470cf9435ccb1de6697403b36ed4fc46078b32bfb22463c92c47d4e744e8842a8156ffaa91c63cfc12e3f3f6eb0d622fd937
 DIST texlive-module-latex-graphics-companion.doc-2017.tar.xz 61428 BLAKE2B eaa09edf5f540ce3e3880e6903d79c65101ac5d4ebd97a1d5efc1aaad4889111446e241f08f3de466f9b7b204ade4fe41b738f009e63908d085a57719ccbfe3b SHA512 3a59948140a640aa356332999cc8cd5fc00c6df69a1f1f9b23e3ce7e14bcf283c6e9b2594e62178289f7d1b76f00b2bf13a982993921f9e56ebe4eca844b5325
-DIST texlive-module-latex-veryshortguide-2015.tar.xz 496 BLAKE2B a5533f9fe84faf8083dacd6bb0c98cf45f1a3a5eed59714d62b0601afb4d0a6f2a50298156d07eef869e42fddaaab7bc3c86ee8003788c33063120598d3d0e93 SHA512 d5240c36ce9fca8a735aada836b0ffef9254c689a05acc95883df87af35ad44390b2d3b7add3f1536eb6b7ec2982f0f0120d0684534e6154fba5c2e1f8e80866
-DIST texlive-module-latex-veryshortguide-2016.tar.xz 544 BLAKE2B a93d424455cb51a3de38a13f1d557b1da0767aa7a6a61c7a2d0878c24fd6597ec3cfbd642bf3bf2d63beaf7abc622c1d8bdd5cbbc238f8b037b1af0149d4e7ec SHA512 e29185f0354be13099f8e11a0dc682ae23755cee4d4b0bec9c6dfc37756a1dd3b31f09d25c4b830e60d3924b36a06f9c76b835e4b318eb4b57eaaa9186ad93e0
 DIST texlive-module-latex-veryshortguide-2017.tar.xz 544 BLAKE2B a93d424455cb51a3de38a13f1d557b1da0767aa7a6a61c7a2d0878c24fd6597ec3cfbd642bf3bf2d63beaf7abc622c1d8bdd5cbbc238f8b037b1af0149d4e7ec SHA512 e29185f0354be13099f8e11a0dc682ae23755cee4d4b0bec9c6dfc37756a1dd3b31f09d25c4b830e60d3924b36a06f9c76b835e4b318eb4b57eaaa9186ad93e0
-DIST texlive-module-latex-veryshortguide.doc-2015.tar.xz 1597228 BLAKE2B 8c61b83ea98edc9a2b8e9ceb6db3392cc1cb13811d7b541e359837dea6a1f7df8e07e209d5f63096f9e060ed4bcfd5959f32354739ed1906ecee4d5f39c02150 SHA512 853c7c80d9b7fca8bde7f1d5f2bf11add3a8f9005fc725ff3c3b042c284869b0d5f273cda30c7c5a75bc5ea9f6d3a9016b891a8c0cd0d51f4f9a622ce3248804
-DIST texlive-module-latex-veryshortguide.doc-2016.tar.xz 975444 BLAKE2B 4a451a0d1c4e04651e09aca1c1c15566d53350ca308f318da98337aa2b5e6f324da00897ab8ab1c219d7a219f92743d9013b4536e9d7debae4c4744ead7ddbbd SHA512 cb0d3017d2d59bcba3613fae4d24f8c922de9e2677cbd5c80325768fda0332a03bfe7a5ddd1d46b65e62069c8b8380f63ac9595fa080998122a54a64d0f18a45
 DIST texlive-module-latex-veryshortguide.doc-2017.tar.xz 975132 BLAKE2B 4b8156ca80218c8b5562e74c502cd07eccddeb7a26c4831a7aac14833639234f3677673965e9cb6316005d82502da1f9e4830591f730f399fc2681983ff45fad SHA512 f745de3348e570e4efd2ed2f38f1c4a7a71239a9caafde5fbaf151595fd2c495c96c95f6b135573453037fb2428e0bc3b857424b21766fb0528de71c4ea25133
-DIST texlive-module-latex-web-companion-2015.tar.xz 424 BLAKE2B a1e61ade7c52b6a94730d99adac85f3da47ee84ead8f5db85e48f36a64021fae17c5cb3d655d749154e768ec9afb11fee2a06fcb51897eaf72fd871444a78ddb SHA512 bb670b5fb4cc6093b53ce35c9487b7f88308e054113ddff0d337b1968977d88630fa30412254f6a2eb8b7d3fd408e49071b29128b3ac19a711717ecba2af75c3
-DIST texlive-module-latex-web-companion-2016.tar.xz 432 BLAKE2B 6bceb86b6acb7928b88d08ed51e9bf4afbbd56c3ec03013dbcbaa6d4f4e89b05fe381e90df550eef87c17e0abdcffed88ea41158b8358d45c6e9959f76fee055 SHA512 faee34c36ba1ddb63daa574fc6da0c38e10bf4fa7124cfd5462f0241cce2197bda7153fd58029d59a564f18a0eeb596c38baf97104e3eadda8d325b2f4de80ef
 DIST texlive-module-latex-web-companion-2017.tar.xz 432 BLAKE2B 714fe8ec4e5699a0b506db626d37508d6472d1d929b9bec6547562ab60296b67a9c20b2dbb55e1d640fd9a06f7507c3fa4335a0784e38bb564c1f49f364983ae SHA512 e2f87ef2bf0b5f2091dccaee53928f7407300801b9d08ec66793b5276d285b792c2b99a8c447652a48fda227df56c9435d92b976eda4fdcbae0f93bdd6a29b60
-DIST texlive-module-latex-web-companion.doc-2015.tar.xz 272788 BLAKE2B 79c4f4a22cb1882bed91b985679e172eded132df6b854e42ec211c4a71cf2e4e7f4d0fea1b75666cfa34347a157e021f146afc9458ab8073ea165a9d6d467a3e SHA512 25b575f15080416a8be75b7f4832fede99362c8ce89e82345999252bf30bbea7b03a5d73f66e15c9597ec1dc7c74eb00a12452273104cf4910b6049d36da0a7d
-DIST texlive-module-latex-web-companion.doc-2016.tar.xz 272788 BLAKE2B a519903507bd9fad1f5c7fabb81d39e82f5f4a3390e0bcdd598530f7010a33fb90425a9db20c90f0e4887583a04f68d68e6232ee643a080b4d52872689470006 SHA512 afa33c26590b2ac89b2df0772aaee3165762d21e42defc2ccda8885eacb1e92a9a014a108153993f46137b99806f3377ee15367d87858facc25700932cc32802
 DIST texlive-module-latex-web-companion.doc-2017.tar.xz 272788 BLAKE2B a519903507bd9fad1f5c7fabb81d39e82f5f4a3390e0bcdd598530f7010a33fb90425a9db20c90f0e4887583a04f68d68e6232ee643a080b4d52872689470006 SHA512 afa33c26590b2ac89b2df0772aaee3165762d21e42defc2ccda8885eacb1e92a9a014a108153993f46137b99806f3377ee15367d87858facc25700932cc32802
-DIST texlive-module-latex2e-help-texinfo-2015.tar.xz 588 BLAKE2B b96b5d5cd480b886d231d5bb0ab8b75dc9b0fdba3fdce88902c77362045c4f2eba1a6fbe5c4c6c14b4a5a2cf0c31a18ad7845183bacbd6809a3534a3d3fb6fe5 SHA512 ef064de0bcc9ee4d3d6e75e7be5719bdb68519b86fe876b1d4ef8c33f40222b76a2e52b1e095a6b0a931ff09ff1b03628143d791439858ee9a2a56f7988b1f4c
-DIST texlive-module-latex2e-help-texinfo-2016.tar.xz 608 BLAKE2B 58b532fd7efbe2c86496edeeeec9e74ae000982d0aa99125b9c8a8c20e52c36949b9e55a0395a5a1a63be148b2bcd7109fd117319c8445c6d0183724d4d68029 SHA512 82dd5c671b051620ed9d8646a1c5f6711c00f864acaec7aece2625197b2b03721771e20130aa21d6aa9a4d8be1f5da61cd2e83a5313694428ff9380445121001
 DIST texlive-module-latex2e-help-texinfo-2017.tar.xz 608 BLAKE2B 58b532fd7efbe2c86496edeeeec9e74ae000982d0aa99125b9c8a8c20e52c36949b9e55a0395a5a1a63be148b2bcd7109fd117319c8445c6d0183724d4d68029 SHA512 82dd5c671b051620ed9d8646a1c5f6711c00f864acaec7aece2625197b2b03721771e20130aa21d6aa9a4d8be1f5da61cd2e83a5313694428ff9380445121001
-DIST texlive-module-latex2e-help-texinfo.doc-2015.tar.xz 910120 BLAKE2B 37f25fb9e6c9c97f9f95f548c2f7d8edd3e6f41ec573c4cbd061945818f8e644a78b309ffd0af17c1033a8824c3a2b63fbeca4978c44903c77f61c09c39aa43e SHA512 bed653780268c56c6100ca1008d5812013f62b5602df120365106f21cb5ad161860b48dca5772b260b4b9056e465be94e4a402381c247edadf4b33d0cada2afe
-DIST texlive-module-latex2e-help-texinfo.doc-2016.tar.xz 1068776 BLAKE2B 103491a1d0311cd829943dae62af6b4d75e3df110e2c21871320e3d3856f398825fdd9b37f8025bbc73496b01298918113fb998fa3cf62c95320434f9f990a50 SHA512 80d966ca66d3d4206e2e4c66b7e1d9f7a484082924828275bd3350f5ece3fa83465b1cdfc068dffe62f36dba1d342f9d4c0532cd7c248e7a981bbebf59b6aada
 DIST texlive-module-latex2e-help-texinfo.doc-2017.tar.xz 1068840 BLAKE2B 13c49b3262d96f877030f7c21fa9117eb3c98f8bf5f3aa212fbb52a3262c437db804ee8ddc6ff10eb8a27de6909d585fc4bd81f44df6ed51a12c6e1ada972ba2 SHA512 3a11a0a25911156866b4a1b178365906e83a7f1cb75800ecc5ceb61fb7eafef22ff15d807e2c2234bdf1ecc36898f96472fc0ded83334dc39f719771192299d0
-DIST texlive-module-latex4wp-2015.tar.xz 480 BLAKE2B 5a532e49af6482a4f65a7b8e30e6aa14816529105ea0d9697c366818183b4662d8866aac6642b84cc9865567ea468b6df3656fe41872abd22ef6345baa147cef SHA512 c88f37500ca8b0bcc3732ab80e6f77a66d3c354036734dfb70a1db8998b272d740e9d1ae5ac4eeef621153419d7f507a0cb6670004d0d24a08f653b437d10194
-DIST texlive-module-latex4wp-2016.tar.xz 504 BLAKE2B fcd3ab878f515c7630087f0f3c809cbd9ffd3a1d9de568dab98c01d9d9829c0c9a75e56b86bea7b5e1973e1049587f4960465a0ed5c78c587d0fed144cc05c70 SHA512 0d53302b1e04471b7e5bdd5e8186333a9793f8ec48b20f12142ba6062520699e774e6eaf82a99e24c997fff1683f3e5b172abc9df1b0932e2c94bc44b476ed65
 DIST texlive-module-latex4wp-2017.tar.xz 504 BLAKE2B ceb34946f2584b9f55e6687e0b1d54e0936774ef1ba8bbf204cb6466126630b830a6bf449a364015e2feda8e2fc4d8395831668e722f56fb8c1a03fba3b55de7 SHA512 25b4d07eb6ecfce58a5fa0c9db1a4d6002e661b93b84e232530d0e83d9cdaff1db551fc8168e0513602ec073b72b686f303cd0948293f8a903a60c14ab7e3545
-DIST texlive-module-latex4wp.doc-2015.tar.xz 785532 BLAKE2B b7e4370e37d19e82037dc463646ce4f5420de15188431c96aca516cad97920dd0b39ceb8575fcfcebd0edad0493eb163e15030d3bea67d7bcb52cce5bbf23102 SHA512 528a64c8bfeeee8b44262c1b2fa447987c143adfb55fd2c1a64f318480549e4929edb30881afa0b12af85346334abce4ce719b8f4c1d5547a080aed7b63eb005
-DIST texlive-module-latex4wp.doc-2016.tar.xz 785532 BLAKE2B 8221600f46532984fda629878e77b585fa914d04324c6bd56326c3fb9a3248b1cc8315bf71e5caff9b354323d2cd03e9cbd19b5f3b981a1a181d025839b1ccd9 SHA512 eae1f610c2d6e74cfdc0ac438a282d91768ca13b84099eff47db847cfe402ca128d14b0be2d518fd7b09a4d05dc4aefd75b1acb2859ee09f353121ab1dfdf57f
 DIST texlive-module-latex4wp.doc-2017.tar.xz 785532 BLAKE2B 8221600f46532984fda629878e77b585fa914d04324c6bd56326c3fb9a3248b1cc8315bf71e5caff9b354323d2cd03e9cbd19b5f3b981a1a181d025839b1ccd9 SHA512 eae1f610c2d6e74cfdc0ac438a282d91768ca13b84099eff47db847cfe402ca128d14b0be2d518fd7b09a4d05dc4aefd75b1acb2859ee09f353121ab1dfdf57f
-DIST texlive-module-latexcheat-2015.tar.xz 460 BLAKE2B d0855fdcee7070afb6ecbbfa21d01e3d2d2535cb6e9aa7119b134d7b1d07ff00ddd888c2ce33749861f2d768c1c2c735226bbb03922ac209fe9e131353eebd8c SHA512 721ad4ace7c89065f5f3b434fe868cafcc5448beb6cd946ba093e44d52b1d1ed4a16301bd88b8611b7459456f370f4fe82d44d48625efbdd2844369f6ceccda6
-DIST texlive-module-latexcheat-2016.tar.xz 464 BLAKE2B 1af967ea06229d4128833377cbcdcccb35e1f50f778c67f98f2572a67b2539aab7aeb65fd53f10c0b51bfdc2ce133a07fb2310fc96b871781abb94464bbae33f SHA512 61dcb20ef7245b8d0790707717ab11299a7ba5cb8783f7cedd215624037b321c104683a1e283183eab0a65350df97b357634d8e4b0326cc4faee29c86ae2b1f3
 DIST texlive-module-latexcheat-2017.tar.xz 464 BLAKE2B 5edab7e60a21b61aabffdb0821d3fcd045e2381518cd0bc3efcfa83b838687d3c78f022cc02873f43a5f712811cc715ae28507ae9bcebbd46a21351585065a04 SHA512 399ffa445cca613e6b84b7832296dca9cdbc7681b81cd709811bdf1ea283f833b795bfff87818298033202d6ae77c0b161be73fe0dec9687f41a80e2d0d42b7f
-DIST texlive-module-latexcheat.doc-2015.tar.xz 155816 BLAKE2B 4d32fd96a1fe7010b24a0ed408403ecd35a802dc68b6ed606795bc36a7780c00e81a512aeacbdf09b7ff06695357ffce9334536c364a8ad21810d32d894c31dd SHA512 2109879f43f4f4873340484a6d438c1162570e7b8e1c779878ee031970646c5dd1468be1766e0b9fcfce3eb42d5601d59032f3397433927bd946f92e81ed2379
-DIST texlive-module-latexcheat.doc-2016.tar.xz 155816 BLAKE2B 39d6dfe00a28151cdd109d1bebf5a75eb96ea8058ac67539f0fd9fd14289043e2ca3318ba8d4b75882293e2e9f0f20bffa6b644eb128ad7b7c22e292b87c22b7 SHA512 7ae00503371c97e6414c6dd58ae08ac0788842edb172aab9ba9505d80b69efc7b21f8633a58783e371f14103674dae60affd6dd2de4cd0a2b135ffd94ebf724d
 DIST texlive-module-latexcheat.doc-2017.tar.xz 155808 BLAKE2B 3f05aa507a0f0aa33dddc14eda6ca9852a9ef0a915ebbf3c4848746bfea2447a5d0b418c5062a1f792ba6199aa81ac6180eb7bfc6e8e54e770e9768810087314 SHA512 e45b46e6a0244bca6b5a17b5eb681f172b2610b499bdc927d140faaf18111dd95e228bd621460f72a2b966a4593c963a123c7d3737ffafb3729704e924b43e7c
-DIST texlive-module-latexcourse-rug-2015.tar.xz 452 BLAKE2B 30412a72d61a6553d74fc53bfc8858f7a8fc0e46c77e1b82a7def1f15b6db753589b1525502c6134bd7cd436ade31bee89495999f54d697145684310b36bf82f SHA512 c16c25fed35ae8e108360d759bbae17540f2bfc12b3de3230f337f07194011cda212c481b6927b5464ea6f77ca66b63a6f8525e36df9b23930c0a0fb9add4b3f
-DIST texlive-module-latexcourse-rug-2016.tar.xz 464 BLAKE2B 91efc5a926dc8caecc1a179ed594a4b42397d9c4fba6cc3098975d762642a9143d84a0ead9a5ad8b4810a0e0b5e100880db95d79adfc9e6e7fe148fb23e5b7c2 SHA512 f34e3030636423e3b36982a513b28042483f79eb6c5755f45d1f2dbaa9e1d2ea1ab76608a8f38ced53b9d0e10b151eba0db2f19b6d81daff9c9e94ce39a98eb0
 DIST texlive-module-latexcourse-rug-2017.tar.xz 464 BLAKE2B 91efc5a926dc8caecc1a179ed594a4b42397d9c4fba6cc3098975d762642a9143d84a0ead9a5ad8b4810a0e0b5e100880db95d79adfc9e6e7fe148fb23e5b7c2 SHA512 f34e3030636423e3b36982a513b28042483f79eb6c5755f45d1f2dbaa9e1d2ea1ab76608a8f38ced53b9d0e10b151eba0db2f19b6d81daff9c9e94ce39a98eb0
-DIST texlive-module-latexcourse-rug.doc-2015.tar.xz 4517740 BLAKE2B fef2eafc205a18d43a7f71cd137201332452abb0e30dff3a1be7e18f514b7319119175c5aa347c16a98108326991d4fb1ae25a6033ec2dacef1fa67113032ff5 SHA512 fba6e78eeaed45741f25a98611774c006f3b978300fd9296b03d429228f972fdd4aff13ccd45c58f1d2d1f7d5e38431e1b1fa3790e80fa39ec037d52fa92af85
-DIST texlive-module-latexcourse-rug.doc-2016.tar.xz 5200396 BLAKE2B 627e08a9724a63f54c8f76fb91f56ce8865c921300cdf50abdd71480b7e12bd26a9de33e4d9203117f716942497fe575620ac6f5298549f239b6bd78ad6d7a8f SHA512 1ac76e0a197d0cd0bd44794552ef942f885c2a76068c62c9ec54695ebe9ce93d60a0447e33b201c8c1927c896b1d2ab48b6fec9fa4523321679e7c6bd4aa849c
 DIST texlive-module-latexcourse-rug.doc-2017.tar.xz 5200432 BLAKE2B be8041ff41ef128594fc8ab3851bd9535f1b4dee0d6325736ac8b463a3ae7bf8b549c9063a6cce7fe65434ecaa977971b8d9fe23ef785d1b1e64c6e420c1b919 SHA512 bb44dab682a6a6c47bb61ad47ab2d0e2a20ef157bd89dfc9b475e538e814405055fc529ff6ede698e2f3673485e99fea67bff5710f448fe1265504ca6cd1aaaa
-DIST texlive-module-latexfileinfo-pkgs-2015.tar.xz 792 BLAKE2B 1166104959d5702f5c0552067d247a1cd6d3fa53d63822b001a841be4b4c129f80f8d5295fe71274bb1d870b90990234aec333bce7058f8ae71020975abbd24f SHA512 75638197805396cef838c877348030930bac962ef439edbad7dd420d6c64d30895ed6b2a56c463bb04b362fd294fbe6dc6e9bb2f8023a01c3974d17e5b03d7bd
-DIST texlive-module-latexfileinfo-pkgs-2016.tar.xz 808 BLAKE2B 76fe776f90c9920abb5a660ec153e95ef9d6056d5691bdac7e449352faa1e2eecf32d56cc3b88e6a44f888f3b0107a8d28bb2ecb1db253104bb3fd476ec1b7df SHA512 5ca22f0c6e99d0bb40f7f5121aedbd7ebecc5a46df7a74eeddf38cd70822d9814425292e95af748b308399bc9144fe37bdc2570b7091c93c4ee7e04af5f5c134
 DIST texlive-module-latexfileinfo-pkgs-2017.tar.xz 808 BLAKE2B 76fe776f90c9920abb5a660ec153e95ef9d6056d5691bdac7e449352faa1e2eecf32d56cc3b88e6a44f888f3b0107a8d28bb2ecb1db253104bb3fd476ec1b7df SHA512 5ca22f0c6e99d0bb40f7f5121aedbd7ebecc5a46df7a74eeddf38cd70822d9814425292e95af748b308399bc9144fe37bdc2570b7091c93c4ee7e04af5f5c134
-DIST texlive-module-latexfileinfo-pkgs.doc-2015.tar.xz 8012 BLAKE2B 07bc162ae3b1f967ac8e60cc27d7a3d5b2a16c004358d6bee349e330773688ef9b54756142aa06f275faf17cd59a9d3b1be277b6dd715d6b02ed7e399457902c SHA512 5c37932439c6a327b7193de5b751447f84dd7bb4ec1693bfbbdeddb22265893208fab86d67b12b0989145c0e651226926aa0cbaa6338134bea258e617554fe3d
-DIST texlive-module-latexfileinfo-pkgs.doc-2016.tar.xz 8008 BLAKE2B b8f1130c0052ccbbb576352ed38963cec46a5fe821f35570a46592c059f2a51482be30d629d9e4561e1553058b6fabd937f53c90ae689854dea964f5e2e73d2a SHA512 f3548d283604d5ea1da9ea734807b056aafd7e180c4aec7fce2074000617649abe3da2c43ece273f2fa69e21e447822d67d2c46b1ba6c81a1946d36049dc1ea4
 DIST texlive-module-latexfileinfo-pkgs.doc-2017.tar.xz 8008 BLAKE2B b8f1130c0052ccbbb576352ed38963cec46a5fe821f35570a46592c059f2a51482be30d629d9e4561e1553058b6fabd937f53c90ae689854dea964f5e2e73d2a SHA512 f3548d283604d5ea1da9ea734807b056aafd7e180c4aec7fce2074000617649abe3da2c43ece273f2fa69e21e447822d67d2c46b1ba6c81a1946d36049dc1ea4
-DIST texlive-module-latexfileinfo-pkgs.source-2015.tar.xz 8124 BLAKE2B 6b88b9be8faee5fe5335e98efa051b7b9eedbff6d9b2b50106327b91d54f499f901f0ad4e0612758fc7c3dbbfa6ce76a56f335995e856277b151ad94a6420b9f SHA512 4b119717a12eb2c189c0c8c68ebb4c41bfa0eaa55cc2077ad1d925a5b112b64fe5ba911c16863185bdbd68a456794cb2bd8b5aa10a5d53921d8ba78c46200164
-DIST texlive-module-latexfileinfo-pkgs.source-2016.tar.xz 8120 BLAKE2B 28fcaccb76a74ecafe5586278ff8e6766a47c0b34c0d2193f7c68d236a95a6f6da0b25625c1348c76e13d3d63c807e3bef974d25da6dda847d0225be5d9d6677 SHA512 6bf6caf2977fbca4caf4bdb5191d9af39529d1c846dd72fe9efd5b5da88d155cfe656e21b9d3bd5b7c8c78684a756ed5c6d49baa0aed87a2c4abed6535e4b0c9
 DIST texlive-module-latexfileinfo-pkgs.source-2017.tar.xz 8120 BLAKE2B 28fcaccb76a74ecafe5586278ff8e6766a47c0b34c0d2193f7c68d236a95a6f6da0b25625c1348c76e13d3d63c807e3bef974d25da6dda847d0225be5d9d6677 SHA512 6bf6caf2977fbca4caf4bdb5191d9af39529d1c846dd72fe9efd5b5da88d155cfe656e21b9d3bd5b7c8c78684a756ed5c6d49baa0aed87a2c4abed6535e4b0c9
-DIST texlive-module-lshort-english-2015.tar.xz 520 BLAKE2B 4bf5386d7792426f3ecfb3cb1376f02d5bea2b28f36503af2c707cc22b0ea5da57a1ae94f9ee997da4779e50682dc23d10a858fe0edc79e199ba499f64867fbb SHA512 fc64328823009e638dc135534b83f2b525c2190b8c2e6b2e83b742adc05e072628ac009290671d886e4ea3ec560cf8f26933662e4d5088753522c16592a85ee1
-DIST texlive-module-lshort-english-2016.tar.xz 540 BLAKE2B 4c3f173529fe3bd0bace92c65c470b4d7616688df46638ba41780afe68bf330978e6bef0776433bec5f1e6d9c7ee5fda4247ff4645182da0e7db6ed7a0769c7c SHA512 d46927bb0cb324b7e9f66f10f123dc8ca02070445c8de6d287248ef636694894ca84684c22d2f429cf568fc67588832c8dfa1267cd7041579f1874ed63dbe99b
 DIST texlive-module-lshort-english-2017.tar.xz 540 BLAKE2B 4c3f173529fe3bd0bace92c65c470b4d7616688df46638ba41780afe68bf330978e6bef0776433bec5f1e6d9c7ee5fda4247ff4645182da0e7db6ed7a0769c7c SHA512 d46927bb0cb324b7e9f66f10f123dc8ca02070445c8de6d287248ef636694894ca84684c22d2f429cf568fc67588832c8dfa1267cd7041579f1874ed63dbe99b
-DIST texlive-module-lshort-english.doc-2015.tar.xz 1873104 BLAKE2B 168dea134d660157e0685545c1d262797c3b4ea65c4a487e64d55d57509b62b8d88f650f35947127012772db76ad707d3e13f7f585b4646e29800ee617090180 SHA512 fa5cd6112b53a67268651086aec068979ea26a0dcfad07a96d473123387eeafb073ec6286c1e0e888b282edce8df5ad481ee2f8e3be61c3ce1f352ba0a51b2cb
-DIST texlive-module-lshort-english.doc-2016.tar.xz 1863784 BLAKE2B fe2c9edb337a30cce76b44d4649b4ce5c57860efca9f403fe25bb5b05533dc7137a81522b79e615d35182037fd5e25db81a8cc44cff790bcd007fa8a7cf20dfd SHA512 24eec1b471f430fa52f70b031125332dc3beddf0749d802eae8a15ef9379343e047f1e3b855fe479d5d556f0bec36f36316112b346a64fd871cc865f8e7f2146
 DIST texlive-module-lshort-english.doc-2017.tar.xz 1863772 BLAKE2B fb8e9446afacb805147e14299bc5114f07a40880d8b8ba2273767e4679d10e2ff1dee4808d9b030dc1dc1351bc1319e8ae743539ae144d3c55307d5e62f54ac6 SHA512 f497f32ae752f1c6d3f91ecce3f3a3b3159cdf69a396e03ecc91992afcd9afb7d46f2dfdd4849faf85a18fa84a6a69cf340b88f79d7e6062c54ad952ad6eeecc
-DIST texlive-module-macros2e-2015.tar.xz 556 BLAKE2B 4558827a4af655a5f662524722e3cab28cad952695fbb620867e3542ec2fb301b4e01bbc9cd864e4276b63abfece085d74efe15cdba78bcb9372764a5bd11279 SHA512 12de6ac2f21295f2351206d7edf9d0fbcd3c4e7bd5cc1911e77c5928da8b9427e44dca427e16790fea7aad44ad502f9784b69e5d1c6dbbd7b4c48a3b7fe6daa3
-DIST texlive-module-macros2e-2016.tar.xz 568 BLAKE2B d3dfb417a79f59e8979d678549162f79efd4f33e82c912a78454996bb0016b6ff4dc6432f0dae2336cc52c124edd165428beffde5b8ea5055a76658f5662277e SHA512 9a4b0cf1a8d9d6eb6c15da9675b037a163541add4904e827fcc5ad23b314665f60e33ada43ab3a231d5e20b5fc790a9d550d281cfbb79876883364175f2f3204
 DIST texlive-module-macros2e-2017.tar.xz 568 BLAKE2B eac53e6edc292c778c0524a5eb3b6585bec1850c72c916e18f0e27f23442666e8322a8300b53b825424c43c2c64af696103550e38c7586a58c9fde184d1895a0 SHA512 f1d0bba1ddc103df8cdccfb8a2ab1f164bbbe0ac9b7ad7ef0ca2648cb6c70eea41069a8948fb2c46512b57f9674d7108692c12d3be9a3cac9a6996506b800e8a
-DIST texlive-module-macros2e.doc-2015.tar.xz 185468 BLAKE2B 4c6d4dfae2c914c13b7e30e5a274d8a14ab62ee812d3bf47214b01d116539b1b5c69aa34a66902dedc78907b8e0c4b57b7860f9b1d04432067d79ce28c9aca2d SHA512 7eb793437a3649fbb87d4dd6b00f42edfd64bf51c53adcf030627605b1421345d80012ac2b93356d12cd84f28eeab99d664497c4976dbbe38704cced85ee53de
-DIST texlive-module-macros2e.doc-2016.tar.xz 185468 BLAKE2B 62a7c0eb3e0aff565d125edf7fbca7f35e69e5fffef72357bbf035209250545b5916efd161fe35895b2adb84d8ed2e915cbe127bcdda1bbc183cbea7a4f884e0 SHA512 5d67b61c4cd208e79040addb06c21e8e683b8874d141096d2e0e30523e2f46af2682da928fabc6203f95db7750b7b6a39647b264383aca1c03a1372600a79233
 DIST texlive-module-macros2e.doc-2017.tar.xz 185488 BLAKE2B d4838b52ba5ad5204fe7b06b5ad24289f7e071eb6aa94075a759950cb6850ee75388709e6567b76cc891036d31e5cbb0720ec7704bd7b5d645ff6a4d67a7d2c6 SHA512 4c4466fb4316b89f0a9917a34a5ff375bc96e47ccdc22c7a10b2771966621945cd168c1f7c04daf19ba75e9800641b74c1ccc6a0c48fd362d53dfdd99d8d5018
-DIST texlive-module-math-e-2015.tar.xz 488 BLAKE2B 00888c5ba7c4a0368f71eceb1831459ba6ffb2eaab799ed2519e1910c4660c7d03e58724c59d608775d40bf28d5827fd7cfbfe2830c334b1001008af1cc1307d SHA512 8e0ad38562c53c94b896bed705f3be6e411955bb281882015ff3e2db14664c4129fb164df6f729ed44416186fbf04207abe964e8c05051866f98350b92549688
-DIST texlive-module-math-e-2016.tar.xz 496 BLAKE2B cfc47f8b5743adfd16ca6eb007df7e0a0357d94e75a6ba1e6dd089a3fc120be2148928e899a4caf654e7174a735664ff90d3edcb0dd0e84632adca2eec4a4ef7 SHA512 afe1fd8c2a195a605a72a03b864190e3bd7e5eb34cb208c2bbad32d68c762c3ad66984a8ada827e69c942801b0007816549407850bc0c890f4db4e9e77d2caef
 DIST texlive-module-math-e-2017.tar.xz 496 BLAKE2B cfc47f8b5743adfd16ca6eb007df7e0a0357d94e75a6ba1e6dd089a3fc120be2148928e899a4caf654e7174a735664ff90d3edcb0dd0e84632adca2eec4a4ef7 SHA512 afe1fd8c2a195a605a72a03b864190e3bd7e5eb34cb208c2bbad32d68c762c3ad66984a8ada827e69c942801b0007816549407850bc0c890f4db4e9e77d2caef
-DIST texlive-module-math-e.doc-2015.tar.xz 52572 BLAKE2B 97c29bfc44fa6ee4f51cc082b730eb0b649739b6ace8fb671bb1631542a02ed4c98a59c6043d9b5cee01490ad35d6cfd2febd52ded27b509cead23a586937753 SHA512 5d962794c842c185a9c270909923cbc0ce8d94b3a8105d1c802abe249ed607cad08a4dfdaa4703db2e9c6e0db14ca31e5df1ec6e70feb50fd3e61ac7587c48ab
-DIST texlive-module-math-e.doc-2016.tar.xz 52576 BLAKE2B 087286507026a8865216e9851c73304228a24b257e470e2295fe408a656fae5704a92c4881dc2114c2fcacf28f12dc845f03d84c7fa77281a82ce82f5da06fc9 SHA512 8528e703b267ea35049ae77ccf1d0d2c0ad01142aab1b82cc6b56b153698e03147cfc48292237ba444d404bc42ca2e86400c5e88b3c2aa1a04d575437544f47c
 DIST texlive-module-math-e.doc-2017.tar.xz 52576 BLAKE2B 087286507026a8865216e9851c73304228a24b257e470e2295fe408a656fae5704a92c4881dc2114c2fcacf28f12dc845f03d84c7fa77281a82ce82f5da06fc9 SHA512 8528e703b267ea35049ae77ccf1d0d2c0ad01142aab1b82cc6b56b153698e03147cfc48292237ba444d404bc42ca2e86400c5e88b3c2aa1a04d575437544f47c
-DIST texlive-module-math-into-latex-4-2016.tar.xz 548 BLAKE2B 3e86b493c6169d483d3ddbce9ad7006252cbd74bb22677b77a9575ad7f6265485c9a346f27178531a13d387205763555891d225762266e1aff879e5f58c4d53c SHA512 f947f783a677871dd533f62ca3dca53b7505bd158aa59876fe62c2865685ef7a6bdcd19c476f60abf32f0f21e9c9d02cc1da674a7a42628fe4f7a0352ced3349
 DIST texlive-module-math-into-latex-4-2017.tar.xz 548 BLAKE2B e4284ea3135a7eada6f60a719c5b5fbfbab74657fb61ead9c1663e8fb5f1e27c290bbb44c9672988586f7de49cd2f6a1959fd4a8c6cc4512f87f773e8d233fa0 SHA512 327b80898de9666abb9c31db3af31b6ce6a4321dc057a4076cee7dd7aa05288e21c9a9837f2bcb7fa00643bc02e105775dcb2be44146032d856545f9badb97ad
-DIST texlive-module-math-into-latex-4.doc-2016.tar.xz 1649964 BLAKE2B a9eb4e34c4ad7f4bc1732a6605db6d59936462f40faa11219be60f9d0f53ab628f65831aea84a3ee6b31b56d487f5ab6ee804d71916bcec29f48c633e3922da8 SHA512 33da16e9e0fb59522d92dc6eb379039007c920d3328a52ba6842fbb694cf322e44d2f86ab94950f60ed039d670a214cc8ba0e0b879946f20379e7871d2966e71
 DIST texlive-module-math-into-latex-4.doc-2017.tar.xz 1649968 BLAKE2B 91901d564d6746bb0412e85cad599b37a7441a82a3916b60113fabe6fdc546d0f43beec8c0b3c332940e6ce2d49f6aab6f0fad239359313e2b9987ffa05c27c6 SHA512 2bc8ed0fe89f656bdbf4c9e28d45bafdc9e89cbfb24186fcf2140738dc191b1553eb94f48d70bcf9fd512ca55dede0dfcd660717a74d8752b01858c183cc9c1e
-DIST texlive-module-maths-symbols-2015.tar.xz 464 BLAKE2B c621bf088d23e9054820d998a27b6a4e6b11dc204728e9e61d6fba1744e3b3dbdc0f5964a174a4be2d6fca1be6d6c7063b0de3f9bac26fc53a7f145f1ce192a0 SHA512 df9621d78e79fb9030a2145019c1250735082c5ac85f035ba48e4fb9ee3fe4a27728810a6741438bfffaabe47c62c3470e1ca77c8fa6da866a444cbd46d4f208
-DIST texlive-module-maths-symbols-2016.tar.xz 464 BLAKE2B 6e1bb91fc514705b30f40bc7bbf32c636973f4f44c40d85af7c50d30961932906daf7b0d1c5cdf0972bcf0943f02d691d7621013ddb008d607992175e40f2f0d SHA512 8629d5414cf3d39fdfb2e7f3918690067611403932d4eab7bba02afb1df6203591d12d890c5a625c63aff1aee36e5dbbea98ab591e2d24ada450c36b25d0e34c
 DIST texlive-module-maths-symbols-2017.tar.xz 464 BLAKE2B 6e1bb91fc514705b30f40bc7bbf32c636973f4f44c40d85af7c50d30961932906daf7b0d1c5cdf0972bcf0943f02d691d7621013ddb008d607992175e40f2f0d SHA512 8629d5414cf3d39fdfb2e7f3918690067611403932d4eab7bba02afb1df6203591d12d890c5a625c63aff1aee36e5dbbea98ab591e2d24ada450c36b25d0e34c
-DIST texlive-module-maths-symbols.doc-2015.tar.xz 348784 BLAKE2B 4fa91c0ca8b661fa48c52f055dea5a362f65c7c6ade7e1ca7a6a78e4a8c7f41cf03aec6b0bbfde2a64fec6943520ee43f1f217ef7971c6d27660c850fecae9ea SHA512 99d6adfce15aa05ed2606ea8cac2deb1b19fcc8eda20cc3ea088a7c59cd062b6d2f00aba66be3cc8506ce52882dadf290962fbb0fd688d971875e4ce65c1dfc0
-DIST texlive-module-maths-symbols.doc-2016.tar.xz 348784 BLAKE2B 0b23a25c5606ce08bd31ddcf57fc2120c4d29d80dd7a2deb7d461cc4b5eadd1ff78d52fe33ca9cdd717ab1e8df7c8476cb0ca2714cf9d72ae52e992f5ab76f92 SHA512 df3552f9896122fc19bce707ee2306e4b63b5e3b2c952fe231b2b483b92ead2c7f8f60eeb0c1c94a031bc33ce0d544b6e404d1a9d36f6ef9b10388efd3ebdc9f
 DIST texlive-module-maths-symbols.doc-2017.tar.xz 348780 BLAKE2B 2de08254f6632cfa83bf0a5af671480e1ef47de999cb6d33d35853e870a651c0c6bd4d4a1c078a14aefd23c85123e6ada2c0350b8c15ad60f9ac78b02575adcb SHA512 87e8b4d7890570b6c54dc7772d1a83f662d33a5356eca01e77f69bca672d3aa096e175b13d0fcc63605a30394ed2e168bf6a40a8192226a8aa5a0fe321a6875b
-DIST texlive-module-memdesign-2015.tar.xz 548 BLAKE2B 7dc94d82cec462c32ed9864be9e5cbd6b9af1de707c310534ed5c7767209f9a0c1688677bf3c7125f173e33a11a8eb866c6ea2fec318322ee61d1176788d03ce SHA512 15e80e5638a6c8931416a5017f55399dd965b8482daad1d80ac11db9e42010b57db11526a717b0ff11abb8d2957b5999569cda17493da4f8eef12ff53b9baade
-DIST texlive-module-memdesign-2016.tar.xz 564 BLAKE2B ae9fcd7f18af1997b8b5968877879601c7e5c4ec648ad36b77d0d2332a3222dc57806167cbee8734114efc076f2aa3fb90e21105171df5988224f76a9867474d SHA512 d7f78b5a6c50453a9e6731e723b235a4e234047f5297311765a7e3f465a8cc4df87dabcb76033b57938de6e66b4bf948efc4e58df1bab8aca669987b30314053
 DIST texlive-module-memdesign-2017.tar.xz 564 BLAKE2B ae9fcd7f18af1997b8b5968877879601c7e5c4ec648ad36b77d0d2332a3222dc57806167cbee8734114efc076f2aa3fb90e21105171df5988224f76a9867474d SHA512 d7f78b5a6c50453a9e6731e723b235a4e234047f5297311765a7e3f465a8cc4df87dabcb76033b57938de6e66b4bf948efc4e58df1bab8aca669987b30314053
-DIST texlive-module-memdesign.doc-2015.tar.xz 1733224 BLAKE2B d1469aab467969c19acf34b14cab4f01f7f8fa485c9cfd8519bff599258d39df33e25626c4338001d7d7b70b8e364b3ce8b8f0bf2c2a37aa73bb1add96287bb5 SHA512 46f47125797c7e563ff3666615553938137ae8092b9776ebba023238dfe33167dfdc76a8c8afa00ade8f878a25ec4f000a08af10001d735d7d71ca933a2d3e47
-DIST texlive-module-memdesign.doc-2016.tar.xz 1733224 BLAKE2B ccab2bcc46658c3217ba3546f22ea44bfce57888537a6b9daab6c5fbe524dc3bb1d7d2062d8244cfa74aa4c0efb238c74155ec7b91ce5e769c643e01c20e1baa SHA512 186525a82b9037b2803581efc6ef6e670f902a69b37edc875c8b224c20af9e4dd590e01b1e15a6b4f379a60da1469b8277af48919265c0d71252fc52e21c4269
 DIST texlive-module-memdesign.doc-2017.tar.xz 1733200 BLAKE2B 8dbb945780977fc7cc06f07ee369e8720243cb63b77fe41e5e013c81532cb91964d6f32f71dfacb10fd837ce0f4325fdc031507e6f316f4b6cc7324e67ea5988 SHA512 a6071526a6480d733228f0a450c9165d12100690f5e029202006e7a97e5410fff444b58ac512d3a999206848608653a4a7b5fd8c9ac53be31f44f3ae008cc872
-DIST texlive-module-metafont-beginners-2015.tar.xz 484 BLAKE2B 8691e7234160d0ad7c6fcd3498cf73512c295c6869c952ffe70a57e7be2092b286179c39493054814cf03cbe50e7e40b3aaad897d747372974b852c16e3ad3a0 SHA512 e10ad2cb83f95d0cc7dbd87340726dcdf28266750242b2877cd2987f22819e3de8702b34a21dcf40b8fcc4b65f94ab02a70b77c954cd9deba51262cb88e1260e
-DIST texlive-module-metafont-beginners-2016.tar.xz 496 BLAKE2B d29dacd12acb8823ba8374f32de5415c7cb4379fd62350f81782f742c7e618a31ca457621b99c45e322e60436766c43a1848928eb5c01d83a488f0e122512c1c SHA512 1d47ba7040402c92e81bbc0d7c3d587d454584e79b5d1267371c9d9bfb2ab5b7a66fafe9699dfaa38d6ec049dfddb50481e3aee64360787c75674400dc8fbd08
 DIST texlive-module-metafont-beginners-2017.tar.xz 496 BLAKE2B d29dacd12acb8823ba8374f32de5415c7cb4379fd62350f81782f742c7e618a31ca457621b99c45e322e60436766c43a1848928eb5c01d83a488f0e122512c1c SHA512 1d47ba7040402c92e81bbc0d7c3d587d454584e79b5d1267371c9d9bfb2ab5b7a66fafe9699dfaa38d6ec049dfddb50481e3aee64360787c75674400dc8fbd08
-DIST texlive-module-metafont-beginners.doc-2015.tar.xz 178912 BLAKE2B 4c0e616d9526d4afccc21b6aa5a2e90715f5d836f836a1fafbf2b65a55e6a4fd7bd0ac3ca40c5e93017cbb381a9135d6d6c2687acc9d05aa75e3647db3726550 SHA512 398fdd473ba8b17a3d8b2370602904d9fec98a7cc866eb5aeb652110a55d4f4714e3f297a4f2fe5514d6358c3788b0395df09a6e9c78cdf1544f286115607684
-DIST texlive-module-metafont-beginners.doc-2016.tar.xz 178912 BLAKE2B 4c767e972adb691062a396ae5f1c9ffb63ba039e4180ccb575489f400cf9d7d1c059e776ca134837860fa93d4a4a88f246fac85d6dd6cee17a724ea1fee77c19 SHA512 669ff200fce1f30921af594cde065d785ddaf57111c593838919fcbb74295c508e8dcc8357f04e3c95ddb8c7a6366d328e0a92588bfb5c18ef40f0bbe65cfe93
 DIST texlive-module-metafont-beginners.doc-2017.tar.xz 178912 BLAKE2B 4c767e972adb691062a396ae5f1c9ffb63ba039e4180ccb575489f400cf9d7d1c059e776ca134837860fa93d4a4a88f246fac85d6dd6cee17a724ea1fee77c19 SHA512 669ff200fce1f30921af594cde065d785ddaf57111c593838919fcbb74295c508e8dcc8357f04e3c95ddb8c7a6366d328e0a92588bfb5c18ef40f0bbe65cfe93
-DIST texlive-module-metapost-examples-2015.tar.xz 480 BLAKE2B 8bb89b6eef5f8fb2d63293fe5c6227c7b11760af1f8b6639cd75faea9ab5c81f9e838fd26181fe57e40a7abe3f2ed0f077a41bd019477dde1fdbbf5e06c1237b SHA512 69f4182e31e09e8bc0fe1d0805c21d8fb8a9f8db4a4ce626254ffda9f0795553e3c91b0d6d33618e15ea33359d78622064c31b446ee513462caaf561bb71465e
-DIST texlive-module-metapost-examples-2016.tar.xz 492 BLAKE2B 07f89e6f3d6b15fcff9a8750044784533bafaac0a0138baf4949d6a5a2b3503c24f2c8e4952f086ceafaedda96d6d49ce6a83d19127be78828c87196492a09b9 SHA512 1e6ecb59ea9eb0dde4b421eb8bd926ffb78c9db3dd84d9da207da563dc6bf262fbd231d83f5c6e60d3f1da9e1016d47030c38260233acadc67b7a7fa48f71520
 DIST texlive-module-metapost-examples-2017.tar.xz 488 BLAKE2B a9240f8fdd0cd322d35f2e1c790ab2c6b043c5a93d9dc2765d8a5c0c7fde3eabd3ded6de708efc4f1a17d1d310a7a8ea7ed1acd7e34bacc87b0fbb30b9b06a55 SHA512 4239020ddd1182a083fc616b78cb32e447f78fdaaa0c16b78a3457a764365404c07d03ae37970351ae3b3af934da7e9d3c935833d97844d65470a482b3b00725
-DIST texlive-module-metapost-examples.doc-2015.tar.xz 21256 BLAKE2B 5391ac62d0f8b2aea40acbd527a14f0bd0c97aed2ff8398168ec7a0b6829a1369534c4c9e48e875a7b9f7289ab100e4ff452d74d2d07963b8593b9727fa64fdb SHA512 8e184b5bcd05c1901cbfd4ebc124585069678e18a3998875507ee68718cbb51374f66ad71d1be97cdca07afeb081bd3d8fcfa746f5fde80bc813da0977b578f6
-DIST texlive-module-metapost-examples.doc-2016.tar.xz 21256 BLAKE2B 83ab7beea8b6741d0108667fd558a53b4dab95c75bc1844d1ec505c2767d703ce9bc75573a98906313f8c9a39356bc6d2997ef1634589b40f906616cc0b848b6 SHA512 cef9ea2f97062205bd1370e397c29937603cc8f1a66118fb142be4dcad6215899027eb6dbfe15042826a7cb7a78b7ca350eca0f632632a7258812b9e513f5567
 DIST texlive-module-metapost-examples.doc-2017.tar.xz 21252 BLAKE2B 10d4ac6a2a6206f0e288ea20bd11b5a02064ccb5b3e2b31a3155a5a94b91be62ca7bab335ab9857a299907af092c69de11ca3fa16ccd7e6ae0867a56e1a71feb SHA512 cffef78020a5d9ccf521ad49dd0345a23b6593a634d2a5fc2c3369af426d00ea6920893bfdac87d8f2fde7c463ab73fa4d664ace8e82a9d88e672e47d4847fdd
-DIST texlive-module-mil3-2015.tar.xz 396 BLAKE2B 29375744f5538b2d443e8c969a0e15c91feb7017e8c3831fdea4d5f7c0482dd9b4d1f2fec7cf8010d3c85c4d4f732e00299c4f1b1facc40dc3c3ffa9bb3fa01e SHA512 60143f7e8e07fcbd5bb7b87a715b6784cbb1a84553c4f16e08be62db87f738dba5fc815c95faeef5592d7d211306b444292d3827fdeaec63e7b073419b62bf06
-DIST texlive-module-mil3.doc-2015.tar.xz 35664 BLAKE2B a59b59312922575b121f2706a983b658e9db5ac24bd502b0c392798011ac9383c2d74e4edbc02f516855a2f9c7a1e806b5f0e2d560e9ea640e007c160798b724 SHA512 1e0e807801ddc263abc9e56afba73078a22c041ca5d9f40b745607ee6318ef007a5aaa2ce05f7dfe408bfc96ac24e7191346505b5bf9dc144bf191b21e497a98
-DIST texlive-module-patgen2-tutorial-2015.tar.xz 404 BLAKE2B 90504bfbc6d813dd46f14d1fe6ff461f40d974797723c433dd3fb1bbca378d247cb47bc000499f03a243d945a1ee3bd8d0a0955beed57ccfd6fa4062444f8834 SHA512 b7d21f1d20aa9c3a4eb76655b32d96d01129f00f5cec4481c081938899bd9bd0a9f6ae2ffd55db186b4b816f4d5b60a2ed5602f47829b8ed16b670e24ef819a1
-DIST texlive-module-patgen2-tutorial-2016.tar.xz 412 BLAKE2B a5c14bf38e2a767d20a0f16ea3aefe77850798de593f1385ae8d978ad315795b04879adfe5a2d0dd8c3416659619333dcf5ea793f0465680c09b3625221f0789 SHA512 a480a602a63dab551427911ef3895ed60301bb9af77caf6361f3a12b2059b77c8be626d42ed26e6345ac91fb281f0ba44bc13b23470845d2dd2db7831061cae8
 DIST texlive-module-patgen2-tutorial-2017.tar.xz 412 BLAKE2B ac065021b2bbcf3d28da44cf8412d11470c35dd3c504fc40e7707ddcfcfb3504fcc00a50bf44966e503afb3a01a81e8b49c9dbeab2a3f80c834e2c11270713c0 SHA512 5c935ab21860d4392256354d7f1648f93558a62f185589fd9353fe61837e09e98e8d8f7c73dd4aa9215e348ea1a667817a4bf5600c4a03b57ab5f3e0de6b13b5
-DIST texlive-module-patgen2-tutorial.doc-2015.tar.xz 61632 BLAKE2B 2e8f590d88e8cae39c44997dc446ea1fae233e9bdc86db95d87d7c99e5e81aafa77739583a59f7037ced84f71f4135f5317415a98662adccebc6fa4f4bb296ab SHA512 b8acdfff47652af53327eecc3ffd044eb2806f0100bfed3c3f293d1c3bab1a099be8f062078b54c591b2e308f406184b03b0581237e9bac4876f03e518aca158
-DIST texlive-module-patgen2-tutorial.doc-2016.tar.xz 61632 BLAKE2B f21c45ec5110c58f287b1b89fc3df6a64f338e5257105a44432bef04612e223adcb4e263757f6a7ab3c0af3eaaa0e39588895c95873d060add0f5506168836c7 SHA512 c3b0b38f9a8a007edcd9a9d713b2994d5f5d13ea23804d3b01973eddad2bc43a685d49859a081ab493f7e794a5aee523678c32c464b0cf1436e8dadb8e1886e6
 DIST texlive-module-patgen2-tutorial.doc-2017.tar.xz 61640 BLAKE2B d498064d656f327cd76d77da37791a994f7c2a32a46ac242b08addbc6c7c775b47076dee0f93b5878d014a7cbe37570c2eed66098da75dcd50be1e92308daed9 SHA512 11e2dac6af84260c54b7e8ef7112094ef5c183b7a4712a722764a5d56803d74d04e7573d7aa023ef7b35c9f76814243869e4eba906ef9de1820c747b8ed0f591
-DIST texlive-module-pictexsum-2015.tar.xz 480 BLAKE2B a984ae7a4f092b486c37116fe708d8ded1afada088b8b308108661f95a3ebc24b833d35e6a218204541ce501e9adfe3fbeef34f30b60871db5a0609361e24edc SHA512 cb1ecc91987dbda6d3b92191a9e742333e97c6223baf829498c566f6e2c9c618494c9814c67862b20d3fdb5b794d4834d8f15902adc6d3861ae9441848a27413
-DIST texlive-module-pictexsum-2016.tar.xz 488 BLAKE2B 5b09592c5e8211cf8ce4a7d2a715f36a5e9f48a14bfc4b522f550e201511799d1d9d5b2c9d7cf5e46e2faec1836f8594141004e7b3f79fbb9bd6dfbbf5146be0 SHA512 ba14dfe15b44dce77e71534b2473a242d6ad86c5abab7bae6e05510433b4649f0615a9bca85667ac425e7658ac91f30c562763db93530262ddd150dc18931728
 DIST texlive-module-pictexsum-2017.tar.xz 488 BLAKE2B 5b09592c5e8211cf8ce4a7d2a715f36a5e9f48a14bfc4b522f550e201511799d1d9d5b2c9d7cf5e46e2faec1836f8594141004e7b3f79fbb9bd6dfbbf5146be0 SHA512 ba14dfe15b44dce77e71534b2473a242d6ad86c5abab7bae6e05510433b4649f0615a9bca85667ac425e7658ac91f30c562763db93530262ddd150dc18931728
-DIST texlive-module-pictexsum.doc-2015.tar.xz 192372 BLAKE2B daec52e6e1b1b95d33ade35ef7af37dd7728be92578012b3dfc56191ae7fda4bacab1f6848d0e0a21af99862a6ef6562b91524860d869701e89a6ded9133792d SHA512 275e152e7f5e62b108364e63b667db919c997bfd5d3c635252eb952bca7a74424f22ca1f5b83e6fe285a9766ef6845979286e139a5d1980e1cae310079156026
-DIST texlive-module-pictexsum.doc-2016.tar.xz 192376 BLAKE2B f29935d8d266f338953def311a3993993c80e7588a69be1c8501011b1007b02e0388646a2e2ccbc7f282de4b6522dd5bbc4fb9cb0da2fd6e4fbd10c0a6b69b57 SHA512 ba2bbee973cf1e24812fa5e6e03916f9b2c049eee4265632cc8725da9a2a55547a96c33bfaf0f7d4952dde0102ec478b38bfa00d04fa024a424f9430a6d5251f
 DIST texlive-module-pictexsum.doc-2017.tar.xz 192376 BLAKE2B f29935d8d266f338953def311a3993993c80e7588a69be1c8501011b1007b02e0388646a2e2ccbc7f282de4b6522dd5bbc4fb9cb0da2fd6e4fbd10c0a6b69b57 SHA512 ba2bbee973cf1e24812fa5e6e03916f9b2c049eee4265632cc8725da9a2a55547a96c33bfaf0f7d4952dde0102ec478b38bfa00d04fa024a424f9430a6d5251f
-DIST texlive-module-plain-doc-2015.tar.xz 476 BLAKE2B a3657803f087e0c563a26bc06cedb6a9f4b0110b45fadf07b4b93bed55a08155441181e935ca48a85b7bf7d036d856aeedf93ad552ba638576e99ce8bd467b90 SHA512 1038ccdc59f455fd62d402a54820a2dc4759fef52053938ab43d0d9b8fe826773d2d326ce0e90cbb132121b5e4e135b683ef2b0dc57a087d07a82446eda2ade6
-DIST texlive-module-plain-doc-2016.tar.xz 488 BLAKE2B 6edae5eeb8bd1b92fabd112f9792d966496cae7db287f92ebe19bf1e94fca12f52ca8d97402725dcef87ac85a1f441f5f45683f13d8edaa67ce8a06c756b4dda SHA512 3694a08bf061e9e722ba799f627d1980cb4618765911e0822c8fce1fc6fbab6e5b72d10b8ae1e43b6bef40cc0903f1214fa7485185ac6944cf5b226b94e93335
 DIST texlive-module-plain-doc-2017.tar.xz 488 BLAKE2B a13a02efa711015b416effdbf1e7ac234e63337afdba6347f11e1c879a0b356918583f6663711cdb486ea8588e4c265b17ff070a72add5f4bffef1bb90376a20 SHA512 f8f9fb01c3d0477819bfb7fb5606c66b3067bece12ff072b26729db420419aefb8d20cbe5dc0d831f40a301c69b9e2a385acf4e9ea752ce5817aff2f390a8a2b
-DIST texlive-module-plain-doc.doc-2015.tar.xz 4176 BLAKE2B ec104a00e369ac280ed9879a467156fc79fc814bdf841dbabc6256bc064e156e12601f1147adb5c2d28588c732db6f5488a69674839cebaed72af38e40ebcacc SHA512 1b5fc5846931ece7aaae828c410ab8a5c8dff6fa166333de6497340f4c5d62196e1ea15c4ddd1f8110edd5007242667a4def0d2a3ab09bea0092a8e808ceee9e
-DIST texlive-module-plain-doc.doc-2016.tar.xz 4176 BLAKE2B 08861df8c7645b64a0f3018e1b464a1e15d0b0334993523ff6433e58210dbb6cdac621055e7e295bd5727222ba04677506cca0c3ea96f9810ac70118791f0698 SHA512 8ff3d5b1a5897ccbb37899d84790803502ccaedee859ef13969f3af64870e6856c97abcbb8cbda61faa0d400a0b7b456e2c965ccaa9fab00663e03540ba4daa7
 DIST texlive-module-plain-doc.doc-2017.tar.xz 4176 BLAKE2B 08861df8c7645b64a0f3018e1b464a1e15d0b0334993523ff6433e58210dbb6cdac621055e7e295bd5727222ba04677506cca0c3ea96f9810ac70118791f0698 SHA512 8ff3d5b1a5897ccbb37899d84790803502ccaedee859ef13969f3af64870e6856c97abcbb8cbda61faa0d400a0b7b456e2c965ccaa9fab00663e03540ba4daa7
-DIST texlive-module-presentations-en-2015.tar.xz 464 BLAKE2B 9a822cf78a045c9f2e4cdf9150527a91657a50236e7a5b6ba0b3df051cae685fa45d91b8097b24959cf13929b603e5e7179ef7a32e6526d36bbf2247306be3b9 SHA512 b69f0a91ce6e6fd641fcb28c4034209dbc1cb610e42eb32e8e4b10c0bcf4b47531012d3d13d0777839d2dd51f2d05d73e43ad9f0de1cc81a362664fbb7c67cd8
-DIST texlive-module-presentations-en-2016.tar.xz 488 BLAKE2B 58ef44116582fea18b671d2377b6d3ccd95ad3d3971e804ab2e19f644af3b9238b45e5143c408b5d206fbcc481a2a5ff5b55147bc7bed9abfd7d33d9ca9cd3f1 SHA512 7e19bb808a97ce3fd862b30754f068cbe0ee457edfdc565593ec604f4b4a5c032331cbc761cce1cf87420c6069f3114e944f4a26f1359152994c7ebe158b47d9
 DIST texlive-module-presentations-en-2017.tar.xz 484 BLAKE2B 2e089e7c9e7a023ef7305c8d7668b82ef0735ac2909c4e779158e0295b2a13bf3ff90d7409db10c5137061ea9e1536ddf5cefb19915540686e2e5b99f83d62f9 SHA512 eaa6f51b1aa1fa6adb18305507d4f60ccd72ad4ff4242b584ed73d8e49a04029048d26d6438b402fb321e58441c9036873a29b9109be7d0a127fdb7af952739e
-DIST texlive-module-presentations-en.doc-2015.tar.xz 830640 BLAKE2B 5dffedbc9a95befd06732e9004288285abf7a4821b8bc38345afb55b442d5cd89caec344802ddb4a00341671aa24fef98455697764123e1f459214a7f9f01c69 SHA512 9e24864402c210260dd0e2698a35d57ca07128a62ae319cd9721b08837ea51e2ea2384edb6df15ee6514d6a9b38997dec750ca541328272458bf0b730612241a
-DIST texlive-module-presentations-en.doc-2016.tar.xz 830640 BLAKE2B 609fbd27de8a81bfe027acc35712884dd5fadb4a36f11313b5943c7d95a795df9fcdc5783c62336bb204bc441aa2e951600ed83dd2cb8c2b009f652df30f1b4d SHA512 5fc2150030daf77551dd3d03750478df7705ce7a0ffebe683dd0d6418ca660b52f4de6f18c3be1f944c51c0b9bc8b4f348bcb4563b8687a0fb9ce21e98abe9f9
 DIST texlive-module-presentations-en.doc-2017.tar.xz 830616 BLAKE2B 6a890c277301cc4b09c8ac775355eef5af667d77013625efffdbe4707eeabb410cf9c9975fc4528e669e8dc40b78af6afa89447f0d611a5ea29a383b63759d1f SHA512 296d8240ef223259b8f0466ffc3fee9d58d8799a6480415de38ba092eb80f6569f1973d73911543f573ed989c9995bf353edb019b2cda403fc9a59619b238f68
-DIST texlive-module-pstricks-examples-en-2015.tar.xz 424 BLAKE2B f7c53fa13ad0cb91fab44aa22bd091be9757dd9ced01fd9cf894fd326c1666735222759fbe905bddf2b7c6bd19a82246a213440114513a4cfa8adb9ea511dae0 SHA512 e63315e4314ba6e761ddec94b365527a53eddf24132c13105022ae92439871e672be11a72369029449292aa6e9ba54d623b1e2b17a0b9705f112b86beb965569
-DIST texlive-module-pstricks-examples-en.doc-2015.tar.xz 594412 BLAKE2B 7e32540ddddfa8f61a3528fe75dedec674795e9409d356985ec8900918a5430e00d059a0e92540cef54d041e445ec981f92598a240b2d616fc917655878b7447 SHA512 d2f3690c6929a7f7b0bd93987aebeffac7ee56c39ffb401b74c2bade37dba870eb8e8ef3a0b848ed499899a844b788cd68e8a67d9f9654998838aebc00aac3a9
-DIST texlive-module-simplified-latex-2015.tar.xz 372 BLAKE2B d68376c569ee74402f2bdc515192ad6b18fd3bdc2f548f38f6436aef12924252ced069c77bfc377a7e45127d67bc5efae55f7ec3c1301460e27800b903fe059c SHA512 5e7aa4a52d07b76a4baf3c2ea0f623f609f6579043eddfa9a8f1be9e512b3d5e9d0c2dd67f839ff78203d75e473575bbc36b2345333ed5f3c10afc1c1c20d288
-DIST texlive-module-simplified-latex-2016.tar.xz 380 BLAKE2B 10943d20678337744c659f1a94113d17a866bc23ac06d9a739f84fb1b6d6954f3ad4e2e4fa58633f768e007cdf9862bca1791767305ff38ed7eef0a4a4cf3b81 SHA512 e5a965f0c01e62cfec86febbb503a7cb89801959a86bdbb62ba2a520ccc7cff88d8b15d4fb75d09aa75bbb97a6704398293594a7904f6f469e817cd846b63ab4
 DIST texlive-module-simplified-latex-2017.tar.xz 380 BLAKE2B 034003d65fe00f25b13b253950596e0b0d78e588004ced3c37f24b54bd67b5758b7f74ec6a0cf4f281c836579fe9c1e65cf9a80b1188cd3deba2870a2804e411 SHA512 5974bd32f99812ded4fbb8d915a2d211502a9a7e9ed30bd63ae7884dce47984498317c3c22a3630931c8da5e08d0467ed1601c52ace234bf5778f0df3eb9ef63
-DIST texlive-module-simplified-latex.doc-2015.tar.xz 942836 BLAKE2B f5137645e54dbb8b49b9a2bc25167d5c8450459ca32d6a654c05f172abf6a15886b5e8b0f05851d87c0b9e538b58c71abeb9a00d475ef7ef0533ec233e73a7d9 SHA512 9e241c234c86143c4801d8f3d1be03e99100295fb8203947a793701f91f03e45c523a6775b09af9b9fba195af501c8ada4d158b8e2cd0504c04810d1e5bd5cac
-DIST texlive-module-simplified-latex.doc-2016.tar.xz 942840 BLAKE2B fc7ca5079d70fcb7d027e92896f5d8986badafc9b1b3d4fb560685910a21395ff840f7068683b3abb016595334a9e4b53413f0e1410fdff1fd0f1d72e093f92a SHA512 35267d7a4ab3be6ceded89b166845140fdaedc00c90a1ae33e3d591d319e15c0b147c66d0add67cc36a18ead9985c8c00e8f74caaeb128cd8163149212c38829
 DIST texlive-module-simplified-latex.doc-2017.tar.xz 942832 BLAKE2B b8fa49a33603be546c85c785405063699d19458622551a2b7751c17f089ef637a53357a55aa10bd71090d1ea113f89150fad4f0172b69dfa9691cf427fa52d37 SHA512 b65c32ef48f50382dee8892fb0a550e7b5728971d26b01bf241039ad6a3c4361279c48071bf73986b7b44fd9bec556bb1b14732de4905ed9e31903fb10b19a59
-DIST texlive-module-svg-inkscape-2015.tar.xz 624 BLAKE2B bcee502f4e27a0e912cf8c25f49c9b20616faea6441ada6def5766ae78f425d3383396772fbef8d9041f7bfaad258d1d0153602cae9cd9bf40ccffb55cefd8eb SHA512 3e7405779b8e611935bb73de384430df551ce3a7534ba8650b8b8b3da7e39b035d1ea0261c2e7505991ed6122ee6d8b04cc51ab2c96cc08dc46ee0344f6edf2a
-DIST texlive-module-svg-inkscape-2016.tar.xz 648 BLAKE2B 4ef49714adea9f240ad55a38b02990b58b677617c31d000dce492726facfc83556efb0530c347b9d4d901aa22ff9dfb24900d177c6027ba056bbef4eca54f2a3 SHA512 3914fbabb78d7e8a97e4bd8f26584ccbb3fbfae861f0837c3eba19fa5d48be5da274f3c5afe85f646b18aa1de78ddc8386e17a0917e01fcfb599116dddf4bd47
 DIST texlive-module-svg-inkscape-2017.tar.xz 648 BLAKE2B 4ef49714adea9f240ad55a38b02990b58b677617c31d000dce492726facfc83556efb0530c347b9d4d901aa22ff9dfb24900d177c6027ba056bbef4eca54f2a3 SHA512 3914fbabb78d7e8a97e4bd8f26584ccbb3fbfae861f0837c3eba19fa5d48be5da274f3c5afe85f646b18aa1de78ddc8386e17a0917e01fcfb599116dddf4bd47
-DIST texlive-module-svg-inkscape.doc-2015.tar.xz 197216 BLAKE2B abd079fdb4871bb19f7b6a45039e4875bf3480658b3f5bba6f7e1d40bf8337778958b0c380bd4c4923e0618acb7d03b806e18e1c19f0a7f75eee2d4eb98c1b2e SHA512 f0dcddd85bd5f8b9051a9416b6c9db18fb62410977c3bc918383c5f3354ace1fc0b74a8c4a4b1019353d58ed0cbabda443ddc94a91faa5474cd81afdd95a9d5b
-DIST texlive-module-svg-inkscape.doc-2016.tar.xz 197212 BLAKE2B 34ad442404ea29468949fb69ce299a1d891ffae492d2f88f4e6b9fb5da5afb170ec7a701fdf49a623a6caeb13b58d307161c79885c8638871af132cafcfc0dfc SHA512 0269a6d388ade81620e7fb119ced839d574ac386c92df73a3237620098b8039b539cd38d21d8a12159f85d756c3a64512884e56b225cf004d67b87732419d475
 DIST texlive-module-svg-inkscape.doc-2017.tar.xz 197196 BLAKE2B e618937ae38526c86f2b16549aabadef721467945eaf33ac6d241937a8fd5c8ce95e037d39373a94e5ba855ff55daae919631a6c9dd3f384063d39a024369c8f SHA512 0c056161bde899e4dde0b3edf5015d7da69dcd55f86fbb1a83f6665f2497125fb3593adda154ed3bbc97b11e822b29806032b496c2f1ebbd6b2ef2f629baa2fc
-DIST texlive-module-tabulars-e-2015.tar.xz 436 BLAKE2B a2b46dcb7b6e82f971e1f221ff04273bb8ff5825740acaf992c7d3f68c8c37757b99a4a2e4973736d0e29e3e4c9cb0051a1d9a7875de8cfcb246b29c276ad784 SHA512 b14ef938eed00caa338cd0d64cddb4d9b7828cc7ef5005d8760fe1ee422b9f12d3697677f376e2126e941f6fafa0d3be007c813cf97cc1420cf52166cc89f014
-DIST texlive-module-tabulars-e-2016.tar.xz 448 BLAKE2B 46fed6a7b954e6100b4fdaced0088a05855c89e9ac09e58e76a455bf7d1f7df58cd9e1496c423d323fd92c8eaaec59eb0183ba150cd8d084e22d5af6244cf78c SHA512 8c7e82261bb79e78e7bd3dd8a029e3cf16ffd78ddae68e28747d0918cf97362016a429077b37d7d0a5dd6622624145b3f44d97202407c47b115ce2c5aa7fd283
 DIST texlive-module-tabulars-e-2017.tar.xz 448 BLAKE2B 46fed6a7b954e6100b4fdaced0088a05855c89e9ac09e58e76a455bf7d1f7df58cd9e1496c423d323fd92c8eaaec59eb0183ba150cd8d084e22d5af6244cf78c SHA512 8c7e82261bb79e78e7bd3dd8a029e3cf16ffd78ddae68e28747d0918cf97362016a429077b37d7d0a5dd6622624145b3f44d97202407c47b115ce2c5aa7fd283
-DIST texlive-module-tabulars-e.doc-2015.tar.xz 48224 BLAKE2B a7ba45520f844cd4c5386946a3c4a1dd76e645e08c701cae64f3ab70bf5799090da5cf1635285bda62a79942e3680f776c5d3cdbbb34ed296ed21997d2bff961 SHA512 fbe5707b9f076b3d91b8f16001ed4ba0072aedf73a18798e1313460b4b4365411e590a63675d2499551c5b8fdf46ff7ee33eab4f63b2bb9fc03ab8f142757dfb
-DIST texlive-module-tabulars-e.doc-2016.tar.xz 48232 BLAKE2B 64c163d42384e364e8ae19fc66b7cd56f16eb9beaa153b2fa910803cf19dfdb2cd69237b7444e79532a196878c5db14c8d40e75ac99843b76498c6164619f202 SHA512 730cb8234683831e66523bb86a4cab5a90cdf4ceb822f34afafadf3f4f47964247723d847b8ef23f73b02c77c676ada2aacb89a8bac597c7572f2d80f035d654
 DIST texlive-module-tabulars-e.doc-2017.tar.xz 48228 BLAKE2B c778fe480e8819abc84094e36822b0f8d5c4b0b8820f9b557c35bee03b2c24bbc43fd3fc6856cecc40dac0e9c0720814c579288e8b544bada2599ebcb0e50d5d SHA512 82b7381394ee4aa82b59080d65011ad0ed94e88874b87bb0aa2312adfab2515ff6ae0adc45e0e5d000dc7b1fb91368f681a806893777ccc97db3f9a3fa0ae48e
-DIST texlive-module-tamethebeast-2015.tar.xz 424 BLAKE2B 41f060a020ddc0421f597256bfc259bd8d86e6b3005807ffca8b7ae6b1b1fa7e5949bd8d0f472edd4961e8115827f75c194ae977c8a018d5d5f52ffdaa0d9ab0 SHA512 c4ded8c29ff6fab8b5a4c04236d94b9ba00850ec295c39e2135ebe09a58b2255db12c0b5547e0c42cae6a709a4933d66f514c2e49185b48d201ff5146c4c82c1
-DIST texlive-module-tamethebeast-2016.tar.xz 436 BLAKE2B b3de8efe12d88ed0c464389a71047582f6e7ebdffbef937d799d62a3d76078eb4855dfc9ae93faba10d4c32b1c849c3826447b06d0947a73414e9c19c427395b SHA512 ea7419b69b4cc1f616d7a6ebb8d2d9706d3fa91e15bc4a57c5fc29f97825ed1c5a522d5dce0750a3b5a5068bdacc5501b13f0c935bd482f100269d0a1b66906a
 DIST texlive-module-tamethebeast-2017.tar.xz 436 BLAKE2B 3fb6e6e9954e151297e912dcd0f84d408d49700dd98154e8d090090b463a81aabb3449315ee2f402f1a709e4caf3ddf6a0c6e8fa066c255e6f450bcabc600f61 SHA512 4e8088eef8dc927fb5ee906a1a115e0440322a471f0e1495d011c17279b16165fd8d9499235dcf988460afcf37f188e5b08ef163a303b4a1094b0ec4ad5e5816
-DIST texlive-module-tamethebeast.doc-2015.tar.xz 811128 BLAKE2B b2fc5883aa8e68763ae055ca89fadc9daac517f46a73a0b05a99ed22cc3c2f9b1b4dd46d97e87ae267f8428a0e2a4db20a809ecf92d57541cb72b68f28327747 SHA512 9400a8c80f509cb6f891b202646b0f35519d5796f846b7c0c7f1b0a82cccc17eb836fcf85eb86cba27e79cb4569693438a5c26a12b69e777de3e390eda92a1b9
-DIST texlive-module-tamethebeast.doc-2016.tar.xz 811128 BLAKE2B 09e79fe150c9b2a0f83661b77d430a9c722eab89a6128958fc9686b95e7448c666c1728d815c030d49dc27cf6ccb70122afda0de5ec1531e44f567b8669673ca SHA512 f7991e7cd4223a4942137f3116ea507596c0e0c323245283eb027e712a7214950929941a092c1c160fb57ae32ae62b60091fd6e9100149aa59844a5af02135dd
 DIST texlive-module-tamethebeast.doc-2017.tar.xz 811084 BLAKE2B f7f3823452ebee359bb1eea373429ac287364a9d9affce9f6e32452a7861a774a6cfcf996cc95b988978ed0d3ce74c30d3b427e24f68e56214dab46e9a42d594 SHA512 43dfa79518ca5e787ba033489e1df3c46d38a8831669c9efc7abf626f22e9c4d24c68ddd17b2f5a8588c9a932960aca1d7a651155512d60078ca8e3b7bad871b
-DIST texlive-module-tds-2015.tar.xz 448 BLAKE2B 91aa399c52ae9fd92f40889bf0593a5d4914c208e9530148db74398768f7b49aab554189d2fff459857c0fdaee5453d709ffca91c124d9a6db22ae1af319bf77 SHA512 e6e7e3248c2051697c79b46770a8f3940e26aae372f80323531c70e6551ee5669981af6f3cfcf8bc18b5295dd056adca0c1030f0b9d53dc669b8eaac8a987975
-DIST texlive-module-tds-2016.tar.xz 464 BLAKE2B 61432e5a52d801497c9be2268fb7e747ff48de170ff24b930dbbbd80348143dd67614509bb129ce8e94e818c713ea1f5ee08fbd57bd613a7dab26cb9ff5afe27 SHA512 4786f6d8ebb7a1c4aa8d6e92cc391fa51fa3065bd217471e766e1e3fdc61c45117622a7c83911bfe2fe76a4c77d7528664c025a40179dec0ab35ff480bdf0954
 DIST texlive-module-tds-2017.tar.xz 464 BLAKE2B 525bbf79b7483d9287f6f53d7d2a62fb8f6a1cedc4837bd9185f3c2cdd39c2d80bb657c19ff295690be88fc0e25bed90bbaa36bbc4172cd72dc859a44be553b4 SHA512 6cd44c702a862dcaf9659cf25695df35c00d2128ed4c47745c768067aaf1950c4012a519670f207449df599de83929ce27696fe677c479a85c6a7480c828d5ca
-DIST texlive-module-tds.doc-2015.tar.xz 232652 BLAKE2B a8d958c31f9a33aefe9dc023b534ebd87bd70991aeabb60bafd0e92f96b5b0adb2b95a9e0e8988e9a6a588f0503b216b6da90e77316350d7273b9b3a8d037ab0 SHA512 d452463ff399153341ff8e226b50a4c6050253fe62349bc826b832ba0909534e5a76ef8119d4a29f4ad719e9810f720ae15a0ad725694158b2ff83ba24a998a3
-DIST texlive-module-tds.doc-2016.tar.xz 232656 BLAKE2B 64ac97553cd4db79c457a3015446a4ba32216e9771aa9cadc3bf40adedc48771f34a5fe403d42863af924f243c6b1015d79fb969ec51e983bd65105c234f0734 SHA512 57b4b2351ee87ae4fd874a05caecbd7e8dbf7bbf9ce113dd4675d9362b7316bd1edc8ed2c0f0f1f865982e0a9ca48b284fda96dd2351e85eb0b16499dd85c06d
 DIST texlive-module-tds.doc-2017.tar.xz 232672 BLAKE2B 09eec02679a991daad6c5ab7b98f72dcb8fa77cf24ff0e6c053959ec97524abbfa73aa5554a69706c774a4f3073deec0e403f4b807f8f7cfd3dc688a8c1411c3 SHA512 4dffe286cff8285742131d7db2fd67aa6e47ec211fdf5cff02b24a7e97f829121310a65b26e4cace6dbca32b7482e56f83a934de27e7ab459e5f62a40e74a4c3
-DIST texlive-module-tex-font-errors-cheatsheet-2015.tar.xz 508 BLAKE2B 6c50950d551b3ecd3527e661ae883fc94556a3860b78c77a0394e803b3f775b9f701e0ec09f5e3399803a893fda866d23e7df5699d9a8e597a26d308884c44d5 SHA512 d059161ccc62874ef39540c58e9d1fd73744ef3456293546cafa6ff1319f0fdf34066397c250156c259c2a183a47d166db25be9bd3445aadb0e452ceae5dfdaa
-DIST texlive-module-tex-font-errors-cheatsheet-2016.tar.xz 520 BLAKE2B 1ce1ed9967ae2aa2f11296df25a8f4ad24c30f1008a468fb37fee003e79dd059d4747dbe664ac00b8c326c6dedbbb0551c704d490a53d87e909d8dda774d140b SHA512 c5f3e9237bb7d8241eb43875a2a3d389c6237857078369f28861da3ca6cb4ff18ca9cc3632146abb1d8815e6c5d689a88ecfa3ef263ee1e41e1b9304c67556af
 DIST texlive-module-tex-font-errors-cheatsheet-2017.tar.xz 520 BLAKE2B 12a77a8f8afe421f408774ce893aff369bbfeaad5adf1be8f6c3491b709e9ec7680c41f948871816cfa94c21c3f78209386649b06954c5753e2bc516f2e60b16 SHA512 2b646035587288f37df57388e83e69c00c334b75a7b66db8d610cd9f0a504567e79bb7b09d86ed98070305ceee7e5ffbc63f9a8ac2914ddf897f6e8c120b7d1e
-DIST texlive-module-tex-font-errors-cheatsheet.doc-2015.tar.xz 219320 BLAKE2B c8096ffb435fdbacbeabecfcfa0a3b4b5f005207b71cc184c9c94acb0ae56ceb7118f287867be2fdca0a40c06803301d98db53b2919b20da49cc79aa246b0fba SHA512 3ebd166489bc9e946531bead4a5911f1212f84cb047933e1dddd1d1d7e5d9567c8e5bf93323da12ae6002a93a5f374e8d00bfcd7036e01f5a5df120e8a81552e
-DIST texlive-module-tex-font-errors-cheatsheet.doc-2016.tar.xz 219320 BLAKE2B af0f724c922bb724735f07f143954e3830f973d45c3003b28bcd2f15c078c2597c4c0186b953ffccea4aa05172ec322d45ac5539119503b0dcada5995573f4e8 SHA512 c510819b2af70b1329cf2fc8d984262efd74c00d08271e400d1464f65675578f1fa3e18b929fbbf1e7a6a896641d54f53cad4851743d016567089ce3b7c00a73
 DIST texlive-module-tex-font-errors-cheatsheet.doc-2017.tar.xz 219320 BLAKE2B af0f724c922bb724735f07f143954e3830f973d45c3003b28bcd2f15c078c2597c4c0186b953ffccea4aa05172ec322d45ac5539119503b0dcada5995573f4e8 SHA512 c510819b2af70b1329cf2fc8d984262efd74c00d08271e400d1464f65675578f1fa3e18b929fbbf1e7a6a896641d54f53cad4851743d016567089ce3b7c00a73
-DIST texlive-module-tex-overview-2015.tar.xz 420 BLAKE2B 94105383ab97d2a248fda35937b2615790f1539571bad4d69bf487b1afe5aec7cd31dfad9971631fd9f8827ae7a7649435ffbfb6dfe4d0c88f4fcb896e16d5c4 SHA512 81b830dcdba75a28222d3d48cd1d0e8722975fc0a24e86502de5542c777989208b47a02681806170d6dc97182c50347781b9390268bb0d292cd21d7b13b9f47b
-DIST texlive-module-tex-overview-2016.tar.xz 428 BLAKE2B 29e61dfddcb3298fe5cf70ae0588577588f270e783100ff2a962cb56bdd7afa8fe5d9d05c6477569c48c23d6a12354c541f30b6d5d08e1dbcf4b5930e1d0ceef SHA512 c32846353736a6d16f573965df841f5bc6ed57f6e9d31462c58956fa9767b1540091fe262c09029d5b8d6afdabbc5decaac79e305e65174df408bcc5e5affa07
 DIST texlive-module-tex-overview-2017.tar.xz 432 BLAKE2B 426eacd502abb5769552a4bdca87c6323d9c27a81dde58e9fd257b0cb579e8710c130be80e56616d0333b6a5cab3bce03394b9192c81cabbfc92c99d30e5e0d4 SHA512 016d31cfb40fb481261645a45f4eb8351b7ca716d6684f7521b1bbe3fa25519e3fbce8f5da6425f3211dff071ce365946ba6a64f88f5776e06cf866786eb4f43
-DIST texlive-module-tex-overview.doc-2015.tar.xz 276648 BLAKE2B 2e0c6cc5bca6cbae87dd700fc3f85598d695242a346c563bdbfa11bd2504681f3728774ae1f824c0249508029e7e25f768f18e41b2adbe4a90f868b93c38fa9d SHA512 9031f96e6ed8737097839822e11da93a2cbb9eda1781bb168c951f51ac0e4dc6cdfe91b624e9c7bf9d9df054706943a95f6136b0718db1475c0f114245ef7c43
-DIST texlive-module-tex-overview.doc-2016.tar.xz 260424 BLAKE2B 4342d2952fa22f49e45dce25d22b564e5eea231c32c11ae3c6483a4413492caaea0127a9b848e2902d76989785cefb849609a5528f3d8d711c2ff591dbf44a4a SHA512 7ff0e374aef3cca3ad1ff02889509ab617b8f60b67bc2bdbe541fa636217ea4ab6be22441aa4481f037f0bc90e470d678b447a6727aca26de2b5e08dca33c993
 DIST texlive-module-tex-overview.doc-2017.tar.xz 260416 BLAKE2B 20c566245abd4f88811436867fbb1dedd32aa5c6390906f53da7a1c200e1502939b2a2cf281fca8856dc08194af975544fa6718f35d2a4a94668d80ba316cd17 SHA512 bd4b06202a98eb90486138b6fc98613055667632ff188ae7322fdd348c850ba862fe76f46488c21b5b4dd03e154d005acc0c6af3e5ba49e469eb9f4e34f9e092
-DIST texlive-module-tex-refs-2015.tar.xz 496 BLAKE2B e6ed0afb60c305a7fd1b1c58a6f8c508f9e1bc36985de135dc20b6ead10bf7c49414948777b8200f76eb6fba924530ab6dcd1135d9ab1b4c33f7825cc187288b SHA512 66d9d5447559a50e6cf568be1c388a6dd79970d25bac472dff64729fe9a9aac834fd2f12e3b6e0fbb7e0826e1c4d8fb498ea053dd67f745445808e3b3c0162d4
-DIST texlive-module-tex-refs-2016.tar.xz 512 BLAKE2B 879d4967c8704f4e43d10e14dce47e4ee1356b43328eac8ce5113bd90c78afc512db1e94e6712d936f15531070cb60b691c7e28cfa0631683b6cdcd126386875 SHA512 eff40c33f97d4c89cb0844c07dd5ccd5cb7ba71a2798808722df8f732b1d841e8537b9285ebb2ef9f475accb0fdba623bf5d4a7c0e668111e3c55a1b74f8a0c1
 DIST texlive-module-tex-refs-2017.tar.xz 512 BLAKE2B 879d4967c8704f4e43d10e14dce47e4ee1356b43328eac8ce5113bd90c78afc512db1e94e6712d936f15531070cb60b691c7e28cfa0631683b6cdcd126386875 SHA512 eff40c33f97d4c89cb0844c07dd5ccd5cb7ba71a2798808722df8f732b1d841e8537b9285ebb2ef9f475accb0fdba623bf5d4a7c0e668111e3c55a1b74f8a0c1
-DIST texlive-module-tex-refs.doc-2015.tar.xz 423940 BLAKE2B 5f898e65e27241b9e0d4e02eead2480a2ffe596c0d90be5dd5902b2a6e5422374db315485eaabd221e147202deb1c8d43430b2d64fe02b66a2573d85b6506182 SHA512 132e752b8fe94cd4576123b0dd3978e3bf57b3c21da403a628f64baaa8354b0017c4cce498a3f836857ec4f579126022548b9f465c912f8bf9acffe9141b4830
-DIST texlive-module-tex-refs.doc-2016.tar.xz 423940 BLAKE2B 89aa1413d6cb0d45e4da92dac9e8d2ba133f0125dc5781b29c7e5c9018e79a121a3c76e90969905ab5f13bc0f5c71091c6c017c18898348abd7bf5d578462e1b SHA512 90166570f5425496c376eef121bbeac122e9a26b882b2148e6ae18fee4963a43296cde0f3fa91ad30fce859e72c74c3118949cad20804369aa41d2d1adaf9735
 DIST texlive-module-tex-refs.doc-2017.tar.xz 423868 BLAKE2B 9880ea453a8a7455c867b0d8c33f237c4314525a5aaa7395d2a2e044d4026e375861d5dada569913d23f59a9bfead40e9aed4dc44a7aac22d8b12172bb5e88fa SHA512 e1ef14f3be791e2cd87e13e5fad7d5f8e41ea85cb2f4adc0255298c5b17ad8c822e4642176c969a3bf9e8ece27a595284061ae4940db9a6cac1946f75efa33f4
-DIST texlive-module-texbytopic-2015.tar.xz 624 BLAKE2B 28823f68f7bba126e5b90cd704c7612b692883cdddfc7cd8f31b5dc592d47d2da51012480009f532ce4938d5931652e82ae812ec6d0f8db783764106792c8fc0 SHA512 c0d08554d21330c748c09182f063cd768b1ad05ee6f7080f6eb1e43e7fa3b93173fb24138d55a89fd8f7a3cf1f38b143f422e2549d5420916355f17c3542954e
-DIST texlive-module-texbytopic-2016.tar.xz 640 BLAKE2B 51de4be304bfd0e52ff486a16babe5988f9284aa603bfb7a75e7d4384c99ad793813f40a8b572e9d786fefe60bc22c2a493e4e55b2a2db80355916640242e7a0 SHA512 d83e18b7bf4465609760d1b34976f76e109dc7701952d5861e6528ea981af7d9e6280911372d3f74e57f0ab84aee7f4919ec4e6f9ba32b1c6dab95addd470d5c
 DIST texlive-module-texbytopic-2017.tar.xz 640 BLAKE2B 51de4be304bfd0e52ff486a16babe5988f9284aa603bfb7a75e7d4384c99ad793813f40a8b572e9d786fefe60bc22c2a493e4e55b2a2db80355916640242e7a0 SHA512 d83e18b7bf4465609760d1b34976f76e109dc7701952d5861e6528ea981af7d9e6280911372d3f74e57f0ab84aee7f4919ec4e6f9ba32b1c6dab95addd470d5c
-DIST texlive-module-texbytopic.doc-2015.tar.xz 1132796 BLAKE2B 5524e6aabb4e68200a98221aa4b83bbcaca66673417d5793ed2d37effb37fd77ce66f6c40bc23f3a24449ae98b1a0bc0da838821d3c095b64c9cefa0a056e1d9 SHA512 979a614043523f72b2860c92bc565eadb47cc2f4e146cd721c41bb32c03cf66b01b51d92c557b03ce24cc69edf9893f85873bbbaf0a1a5a7ff08544df382b980
-DIST texlive-module-texbytopic.doc-2016.tar.xz 1132796 BLAKE2B d9fc842d8ddff619baf2e4c23972519e0735b1210671455abb9cc3056d7a15ab79f7df5b29c42043fb9fb976789fae1f38bd1a3ce488c0d46174590c6446cbec SHA512 8860c42fb4d75f9de1f72387424069e70876ad1ce1a5e96e0bbee37819386defbf66977312553cc583d2fa5f38c1a596769f020407ef0f6144119911cd1bc99d
 DIST texlive-module-texbytopic.doc-2017.tar.xz 1132876 BLAKE2B c07e7dbb2ce955bfb37afff0101dfd7fad2032f90c1ace79f907fa0a8dacc55cd302cbe5a743df592bf878686be1e8718c60e9d89a2f937a6e38ddef020d903d SHA512 c387d58ee1e5941ca2fd0d39d953b3630f77d60be0a0fe56345047768a836dbf009910fd0d3a89310271262847d46536419cf363f87b3730bbe966b051847d57
-DIST texlive-module-titlepages-2015.tar.xz 464 BLAKE2B 2b2dafa5bf2d405b4a5f045f8dd5fb3e809407da6eafe01140174a229d68a70268025f6e1b3c8ebf6acaec5394a297d9d81b26662d2f93c228e1477eaba5f4e4 SHA512 0fc06bae3a51bdee6ce2ee2675a2d64c98f89b3073afaa80653061268703d30b877fe20637c328ad83ec3c781f214894afb7318c6a9137ed387f9582c48238d9
-DIST texlive-module-titlepages-2016.tar.xz 480 BLAKE2B 8b69799127cda9e6fe800110234c18761787aa8ff6999f62c06d4739fb22e19474bca04ffd094e1e717c417396c27743212698391c24495055334530327e85cb SHA512 5e40af67467d66b1fa0bb2246c4a57b373c5e8ba1e2fbf9069bd3fe4259bbd3d18ae7d1cf88c74de0aec715dc2baff1ca6f2e585e7d7c9f3d1ede14d8043eedb
 DIST texlive-module-titlepages-2017.tar.xz 480 BLAKE2B 38b59c4e1a184c3b7aebce55b56ddb922c47a0f2e186aa2ab8ea5fe49d306f0e351ebcf9b86b0f3448fb76b246cc0e60c63823643d66ee65f34ad150d74110fe SHA512 ca88d856ce88b7544ffea94bdfe5b8ae8dd0aedee262a5d5c4fc923b20c74c7d4c3bc78e2236cc04c4f1ec85da3d9fe06aa09a73f412330217dd413778c14606
-DIST texlive-module-titlepages.doc-2015.tar.xz 887320 BLAKE2B 1751327ab6c59631bcd57c04a4c07c1bb96fd9ae46495de438d4741ad9481cfc2c61b983045df21df715a9da482d156402364dc7a554713cee9d541e8480e17a SHA512 bad5c70278976410a70063de7321e921ea3bb1e88f94ada55d127a183faf61c62a373e1212ec4fd2fde95e8b848d447b48657e48074cde3184aea1cfc6f67b0a
-DIST texlive-module-titlepages.doc-2016.tar.xz 887316 BLAKE2B ea8bea3af4ffc22ecb8082ef8c0510ff4c34b411ff56fbbc07ec0a3a9000b76bd507b978ce9423fe21c42c94ed20d201c509e0f92ccd3771ad68de5dbc545ff9 SHA512 3a9cda8586cf61f9cfb42cb70a963f9f5278a040ad244304bf7902ca1a89a4ae61384076dbcfec38aa318e8d492edc619a3f5329f17cbae4d23ed06a32686c16
 DIST texlive-module-titlepages.doc-2017.tar.xz 887304 BLAKE2B 479c5392ee56789d4a1ba4aceab432ab2f16b299520bb2d57c928f57906a19170fd1da6ae4582e2c7d93cb53bacf536dcee45896c33b4669423218b5b12a93dd SHA512 c5a131f9a63f2f453e60560729852f0c5b5ca09191715decce9d66b09da3c944280c463a131a88a59f5daea8f0fdfd6c035432111a7164a6fb2fb5e712cf3cc2
-DIST texlive-module-tlc2-2015.tar.xz 476 BLAKE2B 25c38b3537170bc49c908d431fcae26d98ed46ebb21d6c75cc00a27de8d5aff279b355ba8bd3219ff7c3313fe7ef3ad4bd09a7ffa622d524b4d905d5d1e3b21f SHA512 54971f8cba5e259c230f14a979df91e9313325e005f3a67505968121af63a1c94b091aed8733431c47750833c5a1f312882cd51a84d33a4d5a767eb4f4e5218f
-DIST texlive-module-tlc2-2016.tar.xz 484 BLAKE2B 0f7b190757892eba3c8221265dbc5d5b9404a63006172bbeaf72cd112d95f1dbe03f0707ea2361d5b149029c0283be4d0c4c57c6ced275d343e3fa42a926b5fa SHA512 a6bb63ed8d91dd0c5187359ed41b98d3885f334990fdde9ee902e15ace943d753087a71350166c77f302d022ceef222b0810b15f8fa54df2f16a9713543091a0
 DIST texlive-module-tlc2-2017.tar.xz 488 BLAKE2B 862dde6c336013af5f0d1f3ab54c91cdd87322f88312e28e5f8e469822f35bed5aaaff4b146ae6d5269f41a6b2c4048739f6265dd36939867513ce60434e9b56 SHA512 92c91144df78677b5942d52f7c28e644e0955de9817d032ad173430a04dfaceef1a04082f7488125832c6fce313fe64117864a53fbfaa7f245b98d8df10c88a8
-DIST texlive-module-tlc2.doc-2015.tar.xz 114660 BLAKE2B 2750a0da704fc6d8556ccd317c238911aa96cd2c20783f70ccc6178e76a600e19b0e8f1b01447cf12f733185dbb62855cdaa9fe53056431c81b0706f9fadd82e SHA512 0c4c18aa34ae6c8219e26a757261ab208b469e0f3f150210000d7ef55177c5f3ec12a8625009ee4a61d7a90fda0ae6ba06824d16092eca6b8f588ebf1b5345c3
-DIST texlive-module-tlc2.doc-2016.tar.xz 114656 BLAKE2B 382dd7eca5e7a24f51c781f52ff95f3088bb03312c5cba51ec78f5b78d1cf4b37da8a6f3627a6465340e16fe60851ede10afa20457a23a135d2ddfa7bf06fcb2 SHA512 cc537168f73aa4e5ee615bbf682f8ee6400aad59091b146a8e75db503cf37e7e84100d544c5addea030751c6f42decfdce339b33543a0ce99d0302c3355fceeb
 DIST texlive-module-tlc2.doc-2017.tar.xz 114708 BLAKE2B 5b3830159507cd572316f6a8468a42f04b736ddebf75bd7625e9363a42ca7db704c52066f2b0aae7574fdad43710ef4e7a1120c6cfcc641a2f631f4d8544568a SHA512 cd5d281e9727911b28b9e4444183d4ab11eb064adefbb0ddbbe652f434779845833b32eaceb6fd551a9c1bdd45c1d50d1d1a97a89f419c6a785e66390823dc7f
-DIST texlive-module-undergradmath-2016.tar.xz 424 BLAKE2B aab9674982d67da81903de5125291d225e4249c06b36f5bdbfb5a7289037eae33e47bcb1fa66b71a6629c803e20d4497d08e1ae7765a983481635684ddf4a858 SHA512 22ae88e15270c90a0368465947fbe976995725311da616115d51b679d040f927e5f08229d28d7033598f7d1cb2ee8681184d4a3e13ca5a47638e75a9f1937c88
 DIST texlive-module-undergradmath-2017.tar.xz 424 BLAKE2B aab9674982d67da81903de5125291d225e4249c06b36f5bdbfb5a7289037eae33e47bcb1fa66b71a6629c803e20d4497d08e1ae7765a983481635684ddf4a858 SHA512 22ae88e15270c90a0368465947fbe976995725311da616115d51b679d040f927e5f08229d28d7033598f7d1cb2ee8681184d4a3e13ca5a47638e75a9f1937c88
-DIST texlive-module-undergradmath.doc-2016.tar.xz 1479984 BLAKE2B 6b4a53de02bb41cc62955314c7ba6bf072a77bc0611f4f54fa3131fa5ff910b8dca390f09612bf6517530566fbe4fdb3218ab549e3e3d608cc59c5725aeef148 SHA512 ea96cd4af078aab3458df71cc7d10f7530fe32ee3e21af56748e382d7aae23792fd1f7956ee87287a757eb2ea90b9efbaab75722c176222c0dcf8f199985c627
 DIST texlive-module-undergradmath.doc-2017.tar.xz 1479988 BLAKE2B 4e2148fc2bb5cf4b75b860dac0f72eeccddad2cbb02e98c2db3718093ee556fcdf471469818cdfdfc8541d282d5af5445e9323f34a050c7572149e09e556eed1 SHA512 1fc9fd60be499675c466a27e91f625c586e1cefa2603014398ce2b7f568a966e586c57ba55fc484843931ad7a42917b19e849541c6ca0e4ca461f814fae6a7f1
-DIST texlive-module-visualfaq-2015.tar.xz 556 BLAKE2B c4f0e4b14a8f14e468934e00dea28627a127d49bc9ff79f9f00876e5a4443f32c69c2b37d1435bf1f860e62a2d585f71e7bbe53815c19984239560170ae6398e SHA512 60954eaa3762748354e58936ac2aba5bbb68e5963cb160d2d4b6e4b251c69ce0ac11313510adf44fa3c49adbac40c1b00a981b0eadfe5d6f1337cb35a620587f
-DIST texlive-module-visualfaq-2016.tar.xz 560 BLAKE2B 06cc0bab2d1d9da5bf4c2022fa3b43468267bc968518efd652246d610cf92faf4bf27e46c5461ff60245db17b98f0794aa430be3a9b89ec24ab97a9c27bfb653 SHA512 2312b37316bef16d33bfc317e3061a920e2d6a15a2829b3e25dc4ae2dded2a4dd2b620b1c8daa56d7e75118b93d039daaf54fd5a55a1115943c38d8c40661c6a
 DIST texlive-module-visualfaq-2017.tar.xz 560 BLAKE2B 06cc0bab2d1d9da5bf4c2022fa3b43468267bc968518efd652246d610cf92faf4bf27e46c5461ff60245db17b98f0794aa430be3a9b89ec24ab97a9c27bfb653 SHA512 2312b37316bef16d33bfc317e3061a920e2d6a15a2829b3e25dc4ae2dded2a4dd2b620b1c8daa56d7e75118b93d039daaf54fd5a55a1115943c38d8c40661c6a
-DIST texlive-module-visualfaq.doc-2015.tar.xz 1672892 BLAKE2B 9d4f368b19ce27b41e546ff0e641662c4e38644368de13c0c3669d560140b1d1325017583f4011554b5c12912571e397d334ada21619b5d78633e961a656aa4e SHA512 8e826e8afbae3015dd57fbb950b0d2d969f12f11c236f34f7ba7dc52fed9f11d4701f1f61b77fc17123ff22574f068e27ca453e4d574796078c451429ae0ee11
-DIST texlive-module-visualfaq.doc-2016.tar.xz 5246880 BLAKE2B 2095d61b9a62a082c85661c34c8485d70ee5e9f1ef8e8f26dc42f9c1da11b159812e1f4e6f8f31875c7cc217f2cca6a4ab0b68e11db74aa7d9391cd7589acd2d SHA512 68cbc0db5ada4e13ea078b678aa93dc83e4f4abe104339db64611f6d909993254bf006c2fbf19c6f6775dbfb34705d1af1f425e4cfff1b09bbaa10d3c943a7ce
 DIST texlive-module-visualfaq.doc-2017.tar.xz 5246880 BLAKE2B 2095d61b9a62a082c85661c34c8485d70ee5e9f1ef8e8f26dc42f9c1da11b159812e1f4e6f8f31875c7cc217f2cca6a4ab0b68e11db74aa7d9391cd7589acd2d SHA512 68cbc0db5ada4e13ea078b678aa93dc83e4f4abe104339db64611f6d909993254bf006c2fbf19c6f6775dbfb34705d1af1f425e4cfff1b09bbaa10d3c943a7ce
-DIST texlive-module-voss-mathmode-2015.tar.xz 496 BLAKE2B c0d813e734492031438850ba9e6d3e06bba20eb459d5f3e063a8da98bd79c3e60e8a59fb2ba150518613499f280695d52b73203654c36fc91e3c05fa1aad303a SHA512 dd1e09f89816ef40ce435d1ba02eeb6ac80b7970f4c9c4e197f0f126f27bd90a0f735fafc5b4d9f9ded05ce8274123dc4f56aaa8d54a8872e4c641126e930d02
-DIST texlive-module-voss-mathmode.doc-2015.tar.xz 2072184 BLAKE2B 91b1ac37092da89906d12c41ac5e3d78fdcece493c75ea3ea292c7c4780d9af393b45e953b7f79a28954510032d286528499237cd770978197e9a29f764df464 SHA512 2d252c8dd0ba9ed73b911805a04be531a523ee433f19b781cb732dba9e5154696f83d946e56853377aec3322b2ee2e8e30a6557346cdce257c2605db28f869aa
-DIST texlive-module-webguide-2015.tar.xz 440 BLAKE2B 707ef00e512d2785ad12ec38630947ea6154a09ab0bb97fce4bc0c4f3e3227935027e3d45f6818b4e711f4242c186fd9944d1b2ccb4e6e95f3fb71a7823ec83c SHA512 b38eef33498c292d9a727fe04ff911b01ef02c18bf4133de6dc65ede452b932de98c175fc3b1eff5bc001928a1e7161efb5bc063d14ff3b2143d0190c85aa815
-DIST texlive-module-webguide-2016.tar.xz 456 BLAKE2B 58ebc29846c6f6f3e2dc05d44e3fffbfc5ae9a9ac2b6e8a41f83e2a522d3a5b180718cc199c389f39f01f7f368fbb6db24abaea7c2c52fbb0187a4eea0095bec SHA512 b3d4fc85ef4b64359b82fbc4a67e297108faa74fb66739007f0b753dd242e6609079f43dd748f03535f41583ea9638ca52ced4d0cc60814e5dcd17f90fd02cd4
 DIST texlive-module-webguide-2017.tar.xz 456 BLAKE2B 58ebc29846c6f6f3e2dc05d44e3fffbfc5ae9a9ac2b6e8a41f83e2a522d3a5b180718cc199c389f39f01f7f368fbb6db24abaea7c2c52fbb0187a4eea0095bec SHA512 b3d4fc85ef4b64359b82fbc4a67e297108faa74fb66739007f0b753dd242e6609079f43dd748f03535f41583ea9638ca52ced4d0cc60814e5dcd17f90fd02cd4
-DIST texlive-module-webguide.doc-2015.tar.xz 145664 BLAKE2B 83bb8c89b6ca1d43c0df9338e795369f5aaa368ab0f1d853cac30732e3fb2c8702a15b36df5dc750f0fefb7fe57e247dc48c1eb695021207b5c730783c9af12c SHA512 81898c1e53ca9e319760b1a1ec1416e15ba1bf067f341b6cb0c5cad6e6b00c1b829bfc025421ced68d3543d993f70c81b87335392bedb4f560f37048eb7ae805
-DIST texlive-module-webguide.doc-2016.tar.xz 145664 BLAKE2B df3fc46f688dcc0e28edf2a434a79c9024a2b9df40c307799bd4c60def559fad919b46921fd7ae5f6ac4084664419d83dde6734c7231dff0ed0a152598def749 SHA512 d2cea2528f28cc0eb41d3386042b25567d59555b470aa958b093f55b87c56bf7c4f654d383cc6e481080f237313c92b6584e0c547b7080159be0d882595b6786
 DIST texlive-module-webguide.doc-2017.tar.xz 145656 BLAKE2B 0469b0adee8a60826a7b20754632f7c756ee65624680bb4cdad75391b98da1343dffa95d7af62e07301fbdc3d317529d7ab9626ec54611ec66a1ad9ffdd8d564 SHA512 8d96176da1fe74c2e2a6c3ad0596241eb86a94cad68235d0a710488e4eddabd7195ffefc7fede969f00e2d51be9c555328441e570596a2407a2b742c8d587bf1
-DIST texlive-module-xetexref-2015.tar.xz 388 BLAKE2B 0ee7db71267d1e2e1f58dcbbb4ead26012bf160e52c235cfe04310d420df28d9f0040ad5f3a321b2ee17c4c90ec4dbe48256252715b956044f7b7de825ed64a3 SHA512 49207abf73441c8b4397b6914361279e4eaf7be349ed3e06e305e1ad926ae5ee077ac4abbcefe8549f87f0da15e3a3b6c77cd8c9ee971bb1067b741adb9225b5
-DIST texlive-module-xetexref-2016.tar.xz 396 BLAKE2B ad6d6821ec2f724b868d583c637c6b0c2d9b23e073fd9fc4138f54d32ddc1733acea53360db3c629cae0ee25ae54f1588cde93ee63783595232f4c7022150bfb SHA512 86dcd0862592a70d5d540a914637903ac744507335c8a5332b632ca1d1c1fcebe3c54e5957c4001c42eaf24b9a7f2857b4639da2b587089a9e5470194f3412d0
 DIST texlive-module-xetexref-2017.tar.xz 396 BLAKE2B 988f1b997a28b941cf40161b1146acbce77b3b90105d9568ab574076b86c6212eb80694d25e3aefd08abbe39436e5faa2e162eb54dd6bdf7a0a31547975d80aa SHA512 8cfd6cf7f5e528400591c4a4662b77610aa66b29d0098286b1b138724b8be3b081745813e9e6d31633e96d546e5f9d69c831efc88e23630a1e7356d868e57592
-DIST texlive-module-xetexref.doc-2015.tar.xz 174672 BLAKE2B 9256db9cdb672f6393d66822834f7f60369610df8cee6dc7556fc2849cdb4b35975070e5014c95c9b6b876c6a8fcb7cafe2312ff9b934ee2ca5407d2c05e7f69 SHA512 3e24762abaeb9c3c1be777494cade2f5a90aea2aac8a259640da6efccd3f2c71d36f3ac40263de1fdf36f763175dbd7ad55e582e01a4e5c208c5c91f3c02c577
-DIST texlive-module-xetexref.doc-2016.tar.xz 174672 BLAKE2B b014ac92ef2ce4994c58d45009e16e844d1fdb8bbc1af7bbdb97ea0cad1fc8cca76abdd29a4c0a5d85e26d228e7c3112da3864692f8b876a962701db113e7043 SHA512 01e1fb297dd856708493023950f6dd6ed403b9c308410f1ae8e5877109fa11a08c1a59032b6f4d1a6776e628b60894e1db89403276856392c3f601e3d021b2f5
 DIST texlive-module-xetexref.doc-2017.tar.xz 174648 BLAKE2B bf126a0056264985fa1e3b54d94e577c81c7e278b578fc45e13dda76eefcee37bfeb4a773c73b7022ea43ff62eb8d3d985b66bfa613188055b6bd08a1f33a29b SHA512 f5db9bde0d0370f56164c5054f1dadc983f84a26f16d3d35d76b738e542db3a63a737a529c250cb282f6389284a9ab10c564b25ccbf09f64fe96559e0752351e
-EBUILD texlive-langenglish-2015.ebuild 2470 BLAKE2B b3de439067bc9662dbddc9f44fc834e716b5da5ab857bb1531877962b72fdc8d95af479b4311f1ef69e9660c616a9703b4fb258e1db8f5a331840260294fe030 SHA512 ef60a5aff5246aa8132c3d80a33496d3dea69a69d1e725b7fca2a8dbb2dbccde23609856abe16c1986f9a1a23e4ceebe9f9b19a984a42b3020727cefdf383887
-EBUILD texlive-langenglish-2016.ebuild 2542 BLAKE2B 2e4b55602cb7fe4f3b9db9ee50647046f792d51547987d6d95cb4c76d93cdc8098c27397e7856bb8d770add63804f806f164195f4d6394f7e3a5b37e06b8fd46 SHA512 b0947fff8c0aaf724850516524a4445af1c539137278419048f4a438716f7b6898f41db66019709489b28d15309d0ff5bc4f4e27f352c0dfda02afb94bb7bbbe
-EBUILD texlive-langenglish-2017.ebuild 2614 BLAKE2B fc4374f2c68dfe8be1d80c3993779f38f2aa0daed50c3b2f92154603901f71edab3a4ad3d0fe30f985c4608773d5ef8918ece9aa7992cdce22fc95efdb74de8e SHA512 0a06229457d1da9978dc68d1ce7ef6271cc690d484a60f541daed343b9d1a4bf156d31a7711d37035cd59976bf7e59958f44af3794771972f479ccfc1d1d8af6
+EBUILD texlive-langenglish-2017.ebuild 2613 BLAKE2B 93fdea6d0354394e21083adc9fc4e37f4c29f278e207236f2a1582db293f69c7908d4bd4d9fc86da5c21763e7b50714cb057a5d4db419c9ac54ec4174d5e1bc8 SHA512 1fd0ea09e458edd548d521fb4bd688834771e4521430d042bec30500fbce9f96f938d2093ffe895ea546080ec749bfc3fd0294c47c09715cf3ecd252998b4119
 MISC metadata.xml 454 BLAKE2B c93dc6411985a25b9a32ad10276380a60dbb427b3b5da91bf09800425ffb32caf65a2fe1e512755d69001c4ba6143fb1df7ebbb259045bdf4cc689a494e67f70 SHA512 31c04097cb5cf947fcb4332ef246526cbe9c0ba0086d12e8ebcd1b7c3e298b063ce8e13d88b29ad7b397ef8338ed38c3f05cfbd1ad3c99fac79c59eeb8b28b5b
diff --git a/dev-texlive/texlive-langenglish/texlive-langenglish-2015.ebuild b/dev-texlive/texlive-langenglish/texlive-langenglish-2015.ebuild
deleted file mode 100644
index d64959f00ca9..000000000000
--- a/dev-texlive/texlive-langenglish/texlive-langenglish-2015.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-TEXLIVE_MODULE_CONTENTS="hyphen-english FAQ-en MemoirChapStyles Type1fonts amslatex-primer around-the-bend ascii-chart components-of-TeX comprehensive dickimaw dtxtut first-latex-doc gentle guide-to-latex happy4th impatient intro-scientific knuth l2tabu-english latex-brochure latex-course latex-doc-ptr latex-graphics-companion latex-veryshortguide latex-web-companion latex2e-help-texinfo latex4wp latexcheat latexcourse-rug latexfileinfo-pkgs lshort-english macros2e math-e maths-symbols memdesign metafont-beginners metapost-examples mil3 patgen2-tutorial pictexsum plain-doc presentations-en pstricks-examples-en simplified-latex svg-inkscape tabulars-e tamethebeast tds tex-font-errors-cheatsheet tex-overview tex-refs texbytopic titlepages tlc2 visualfaq voss-mathmode webguide xetexref collection-langenglish
-"
-TEXLIVE_MODULE_DOC_CONTENTS="FAQ-en.doc MemoirChapStyles.doc Type1fonts.doc amslatex-primer.doc around-the-bend.doc ascii-chart.doc components-of-TeX.doc comprehensive.doc dickimaw.doc dtxtut.doc first-latex-doc.doc gentle.doc guide-to-latex.doc happy4th.doc impatient.doc intro-scientific.doc knuth.doc l2tabu-english.doc latex-brochure.doc latex-course.doc latex-doc-ptr.doc latex-graphics-companion.doc latex-veryshortguide.doc latex-web-companion.doc latex2e-help-texinfo.doc latex4wp.doc latexcheat.doc latexcourse-rug.doc latexfileinfo-pkgs.doc lshort-english.doc macros2e.doc math-e.doc maths-symbols.doc memdesign.doc metafont-beginners.doc metapost-examples.doc mil3.doc patgen2-tutorial.doc pictexsum.doc plain-doc.doc presentations-en.doc pstricks-examples-en.doc simplified-latex.doc svg-inkscape.doc tabulars-e.doc tamethebeast.doc tds.doc tex-font-errors-cheatsheet.doc tex-overview.doc tex-refs.doc texbytopic.doc titlepages.doc tlc2.doc visualfaq.doc voss-mathmode.doc webguide.doc xetexref.doc "
-TEXLIVE_MODULE_SRC_CONTENTS="knuth.source latexfileinfo-pkgs.source "
-inherit  texlive-module
-DESCRIPTION="TeXLive US and UK English"
-
-LICENSE=" FDL-1.1 GPL-1 GPL-2 LPPL-1.2 LPPL-1.3 public-domain TeX-other-free "
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~mips ppc ppc64 ~s390 ~sh x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-DEPEND=">=dev-texlive/texlive-basic-2015
-!dev-texlive/texlive-documentation-english
-"
-RDEPEND="${DEPEND} "
diff --git a/dev-texlive/texlive-langenglish/texlive-langenglish-2016.ebuild b/dev-texlive/texlive-langenglish/texlive-langenglish-2016.ebuild
deleted file mode 100644
index c33388a27a21..000000000000
--- a/dev-texlive/texlive-langenglish/texlive-langenglish-2016.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-TEXLIVE_MODULE_CONTENTS="hyphen-english FAQ-en MemoirChapStyles Type1fonts amslatex-primer around-the-bend ascii-chart components-of-TeX comprehensive dickimaw dtxtut first-latex-doc forest-quickstart gentle guide-to-latex happy4th impatient intro-scientific knuth l2tabu-english latex-brochure latex-course latex-doc-ptr latex-graphics-companion latex-veryshortguide latex-web-companion latex2e-help-texinfo latex4wp latexcheat latexcourse-rug latexfileinfo-pkgs lshort-english macros2e math-e math-into-latex-4 maths-symbols memdesign metafont-beginners metapost-examples patgen2-tutorial pictexsum plain-doc presentations-en simplified-latex svg-inkscape tabulars-e tamethebeast tds tex-font-errors-cheatsheet tex-overview tex-refs texbytopic titlepages tlc2 undergradmath visualfaq webguide xetexref collection-langenglish
-"
-TEXLIVE_MODULE_DOC_CONTENTS="FAQ-en.doc MemoirChapStyles.doc Type1fonts.doc amslatex-primer.doc around-the-bend.doc ascii-chart.doc components-of-TeX.doc comprehensive.doc dickimaw.doc dtxtut.doc first-latex-doc.doc forest-quickstart.doc gentle.doc guide-to-latex.doc happy4th.doc impatient.doc intro-scientific.doc knuth.doc l2tabu-english.doc latex-brochure.doc latex-course.doc latex-doc-ptr.doc latex-graphics-companion.doc latex-veryshortguide.doc latex-web-companion.doc latex2e-help-texinfo.doc latex4wp.doc latexcheat.doc latexcourse-rug.doc latexfileinfo-pkgs.doc lshort-english.doc macros2e.doc math-e.doc math-into-latex-4.doc maths-symbols.doc memdesign.doc metafont-beginners.doc metapost-examples.doc patgen2-tutorial.doc pictexsum.doc plain-doc.doc presentations-en.doc simplified-latex.doc svg-inkscape.doc tabulars-e.doc tamethebeast.doc tds.doc tex-font-errors-cheatsheet.doc tex-overview.doc tex-refs.doc texbytopic.doc titlepages.doc tlc2.doc undergradmath.doc visualfaq.doc webguide.doc xetexref.doc "
-TEXLIVE_MODULE_SRC_CONTENTS="knuth.source latexfileinfo-pkgs.source "
-inherit  texlive-module
-DESCRIPTION="TeXLive US and UK English"
-
-LICENSE=" FDL-1.1 GPL-1 GPL-2 LPPL-1.2 LPPL-1.3 public-domain TeX-other-free "
-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 ~x64-solaris ~x86-solaris"
-IUSE=""
-DEPEND=">=dev-texlive/texlive-basic-2016
-!dev-texlive/texlive-documentation-english
-!<dev-texlive/texlive-basic-2016
-"
-RDEPEND="${DEPEND} "
diff --git a/dev-texlive/texlive-langenglish/texlive-langenglish-2017.ebuild b/dev-texlive/texlive-langenglish/texlive-langenglish-2017.ebuild
index 995a32344026..250b45d740ce 100644
--- a/dev-texlive/texlive-langenglish/texlive-langenglish-2017.ebuild
+++ b/dev-texlive/texlive-langenglish/texlive-langenglish-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive US and UK English"
 
 LICENSE=" FDL-1.1 GPL-1 GPL-2 LPPL-1.2 LPPL-1.3 public-domain TeX TeX-other-free "
 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 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2017
 !dev-texlive/texlive-documentation-english
diff --git a/dev-texlive/texlive-langeuropean/Manifest b/dev-texlive/texlive-langeuropean/Manifest
index 831f634bd689..201b0c33009f 100644
--- a/dev-texlive/texlive-langeuropean/Manifest
+++ b/dev-texlive/texlive-langeuropean/Manifest
@@ -1,626 +1,137 @@
-DIST texlive-module-armtex-2014.tar.xz 527152 BLAKE2B 1f6a15191f1e5cad1ad69d72ff00bb14e1d4b57853ade47353f18c30eef37e47cdcadb033f41413b3b4637611bb9c484f41ac45b6c9fa23a87d1ba27d5ec8e21 SHA512 0e015c5591a8382660dd220059ea55fe032da1c6c7cd254d50a375cfc60b35184a78e53d6191dc6a66c3615aade14332a5fbc873f1f5a12a078abcded5371164
-DIST texlive-module-armtex-2015.tar.xz 527164 BLAKE2B d1eb66645f6cd2789f927f486330cc4d1d4ebeda928c690c51dc33a311ce4e8ebe1c246baac6266ab51da958eccf7fafd465aaf85aa6533607e858405b8c12b7 SHA512 ebee1d3901f8eed5781a5002e0cdd9fce25825f4a1e76d2c0c400fa5b32ca8d71620122d022b162061d2b846d4435df17e66c01fdc385b0287db6b3336a39711
-DIST texlive-module-armtex-2016.tar.xz 527180 BLAKE2B 46bf93a64181015a30cb3609d77f5a228be7865ee9ad3c8d364ab4fe3dd2cda3b8de9139a6188a1126f46a0d9f0658401bb874c98e55168055216df1296c3bad SHA512 7a702f4b2e42e9b7441dd68d2d57ab5468e1c153c314370f6427cbcb263ab8bdbff0f61365df20919f5b20e8b0439ac2c6af5da96d46df8268048305dfbc735a
 DIST texlive-module-armtex-2017.tar.xz 527180 BLAKE2B 46bf93a64181015a30cb3609d77f5a228be7865ee9ad3c8d364ab4fe3dd2cda3b8de9139a6188a1126f46a0d9f0658401bb874c98e55168055216df1296c3bad SHA512 7a702f4b2e42e9b7441dd68d2d57ab5468e1c153c314370f6427cbcb263ab8bdbff0f61365df20919f5b20e8b0439ac2c6af5da96d46df8268048305dfbc735a
-DIST texlive-module-armtex.doc-2014.tar.xz 429996 BLAKE2B a66c0dfc6d3f807a9d15234d517382ee68af7204dc96eb9bd8fabc511925977a4785d39d559b6d9173afae6561f6d2a62918dc0523e0d700ba3dc10816ce9947 SHA512 07bbecf26dfa87ef7de6234b60742cff5cdc3ef0cdaf8d5f649094a6ee5fbcab1ff7bdbfaec24071de73e7eefed26c142252f4adb0bd7994b5d78320a9fb9987
-DIST texlive-module-armtex.doc-2015.tar.xz 430000 BLAKE2B 3cccfd9ce9bdba87f498f06062bfdb726c24765223a9d75b1e8e61b7087f499efd344c197bbace692e7e1c4df838c0bab5541d87e562960754a3636766813eab SHA512 8d1f8990295f95ee4bb3c304a11cc5e8e559f841cfac8cbc9755daa8622d1e25d7e073ddbe6ca55af2c3f624c14d1ee8fb605f0d7b478bdd2a6e21e368c99b82
-DIST texlive-module-armtex.doc-2016.tar.xz 430000 BLAKE2B c15642152b3a2943c9039099d71d88a6ead33546d623ddd3ccdb6004b05ff3f38aeef99ca1a389a39b8c961bbe6207fbbae8387a034d15553d341843d8ea013d SHA512 9e01a8170602ed71aa41f3e47f5dacaee7c8618e3e51a907f9697e04b5b502059ef3b4cb9034a069125eed7afb00f2b69060f06b164cd5a4fbdc5257b034acfa
 DIST texlive-module-armtex.doc-2017.tar.xz 430000 BLAKE2B c15642152b3a2943c9039099d71d88a6ead33546d623ddd3ccdb6004b05ff3f38aeef99ca1a389a39b8c961bbe6207fbbae8387a034d15553d341843d8ea013d SHA512 9e01a8170602ed71aa41f3e47f5dacaee7c8618e3e51a907f9697e04b5b502059ef3b4cb9034a069125eed7afb00f2b69060f06b164cd5a4fbdc5257b034acfa
-DIST texlive-module-babel-albanian-2013.tar.xz 2460 BLAKE2B 88c7bfdd168828c0ace419e8075199f678a907ad901dece466574821bb78c15a91bbfe5971579b7b29953264eaed881b18df4e55baae6298a42217e816614a11 SHA512 976026eab394ec7b21b6a52fa952ad22c80463ba92bb2df16ed25b30551cc87f34acfeca45f8eb5073bfdd4158585effe1153f26ed9bb85b4ca7407b82108dc2
-DIST texlive-module-babel-albanian-2014.tar.xz 2464 BLAKE2B aa377b94d2d2f6adc3e30c72ae1ad575140df63ea6faec872824f95db7bb5c4127b6c30d9b00c381781919dd56509c62cb3dde6d01ef031e484f1528a87f61bc SHA512 58f218f8971e77119c48665293f8007338c7e0334afd17063d19222dd73dea9fd497bbb55d595354f20893b955aba519544f29674d218fd081f6ecea5664d73d
-DIST texlive-module-babel-albanian-2015.tar.xz 2464 BLAKE2B 0ca521de1afb7d1212b9f185856fefd65021efee42b962c4c278baf75dd521d894ce57b35142264e1ba9c6a11fd31952a0ad8bf7894344ccd7cdddd88b10d88e SHA512 4938dc5bf3d2a2a2b6e69a61a4c79c28d008cc703402e5e3c8fba1628aa6609d3ae1f132d46858d7d555afd17a0250b6cc54b60bb24d32446513a2853bb8fde9
-DIST texlive-module-babel-albanian-2016.tar.xz 2476 BLAKE2B fd233fd1d3bd19bf65591cb6c4a487ac2ec20dc6771cfc545efd302259e3359c64034687d0c583b2b024efe953158ecf7450b141ca04e4a5f78953ea3828e363 SHA512 d706bbaaef622f946b1fa154ace1e216d0cec80f2d701f9ea7307e9c71e312308bc08836f54e3f43ce60f6ba4503a97173848dae3d5309c088cb4ffd8f54e230
 DIST texlive-module-babel-albanian-2017.tar.xz 2476 BLAKE2B fd233fd1d3bd19bf65591cb6c4a487ac2ec20dc6771cfc545efd302259e3359c64034687d0c583b2b024efe953158ecf7450b141ca04e4a5f78953ea3828e363 SHA512 d706bbaaef622f946b1fa154ace1e216d0cec80f2d701f9ea7307e9c71e312308bc08836f54e3f43ce60f6ba4503a97173848dae3d5309c088cb4ffd8f54e230
-DIST texlive-module-babel-albanian.doc-2013.tar.xz 124380 BLAKE2B 67ea4585677952c249f30b7d4cafc8ce6d266c23819ca48db2c93df1feac76c1d37d34bce74ace5d59016ed8e0d922e77752d156d7f2c60a2b2cf9a04c4dc50a SHA512 528701cb10484e66c92c641b76d65afe9e924edf14029b2465f0303e7eacb598bccf13a5cebafd3ef0a2c4fd254605fffa6c49c126e6aa75ebfc384493ef8b49
-DIST texlive-module-babel-albanian.doc-2014.tar.xz 124384 BLAKE2B ec619f89e6b308c2d21fbf42e3af11b612a32cd1050c11213e38aef45050ae174a8ed0652f2744652d7db07cf7573965bbf56e148ad44adb29bb914805cd9df8 SHA512 550d23f6b907d623257a55b396721202946e1cda20aea88a98b41a666e7dc041e9de310866560abce856fbfde00ca2822b219336f10fac7c29b90c07ea8b565a
-DIST texlive-module-babel-albanian.doc-2015.tar.xz 124384 BLAKE2B 54e1241599e7e461047fd37d4d8965c0c3608a3e22a010956ed68588e07dccbed06ea89b1cb7995f61f1ffe39304fb1adfa3c2091f1145dc705db616d9d0b4c0 SHA512 0d7986c5c86b44808ccdd607eca5a9c7bac03fd050b1333e42f14972f1c176fea8e6ddd042c55ef8a7c8f0f91ab4da933fb8a2394aff974a98630ab6a006eaac
-DIST texlive-module-babel-albanian.doc-2016.tar.xz 124384 BLAKE2B e1781aaeaf382564e268885fea5acf91e2c05aaeda40970c495a73adffdb9d7a20314a80105c0cd243a0ab605e058c98a8fb43a6b2e5c3bdf66a3eb755f68936 SHA512 f0dd700354ea398d5ef07c41f04357336a3788d64e6974407cc737f489f3270c4d70eb36c8293c18d4a716b3a562d1ccb230dbb4934db430de855e3e7a6eacc3
 DIST texlive-module-babel-albanian.doc-2017.tar.xz 124384 BLAKE2B e1781aaeaf382564e268885fea5acf91e2c05aaeda40970c495a73adffdb9d7a20314a80105c0cd243a0ab605e058c98a8fb43a6b2e5c3bdf66a3eb755f68936 SHA512 f0dd700354ea398d5ef07c41f04357336a3788d64e6974407cc737f489f3270c4d70eb36c8293c18d4a716b3a562d1ccb230dbb4934db430de855e3e7a6eacc3
-DIST texlive-module-babel-albanian.source-2013.tar.xz 5080 BLAKE2B 991b63ad4c3d8228e1d1564518938f65e3652343a80ead3c42de23a35b674270158fd3b62e6eb352fe7bc8a7f5b8df47f7afd7b3ac20057ffe34aee15312980a SHA512 6ae267106edc07dc33ae7b27506c139c18581295e45d905c4e4482f9d7baf2f0a573dd2f64e5cc495bf51b6d78171c3400dd5ef69c18c6aa516390657f3ba81d
-DIST texlive-module-babel-albanian.source-2014.tar.xz 5084 BLAKE2B 8b34dd9b7417f692e930a02434ad09e3121e60a3b55484419808d54654ae6abd8a10e22afb57bf75e19732c8f055b8aef18385e5f2cca9d904dc1a30a25d6b33 SHA512 7730625b94998278013195a40ade051e5ee57ebb7c544b0356bb098ee7f146a610803dbadb250176be2f7641acdf8afc19f9d414e7a55eecfbfa286fa4a8dbfa
-DIST texlive-module-babel-albanian.source-2015.tar.xz 5080 BLAKE2B b249574917165eda9770c562b27442763b8352801e1ff68091be73d9ca299f03314a27ded3a67b9d6496956d4b976ed61ce3222b65a1d4e6680462022716183a SHA512 7258394766c648513dcf91434a620109efd2a60006c3273555fd2a6440b36e11c313886da9712c89d75f9dc7b43076e3bc96322eeb365e1f38cbe5f68fed1632
-DIST texlive-module-babel-albanian.source-2016.tar.xz 5084 BLAKE2B f41896a843b02e315a5a4fc96aab7bd52c3d3e59b48238b8d82187783d8aa3df89fa2c19b68fa6b7a4d4dccb3f81ef5763b97b0888a2721fb3f4d542c30f076d SHA512 4736ac8256974f6e52aa4686cd13ea2fad68330f0042ca7866f84cb1e7b38cba5b77873dce25b1e779916d5f4099230caa2830c14c3f0ed2f8e1e5e77cc92bd4
 DIST texlive-module-babel-albanian.source-2017.tar.xz 5088 BLAKE2B a3791773d6474bf8f4016961ba5220d9e69b36b0ef9fdf01e2e0865504b2b87b0c8a0a564bb3ae16e976a7b5de28147c001e07a1b9b521fd1d73188195c2614e SHA512 564a1dae7381eda267b6bfdde3cc4004ddcd1f723c95373d2053687fb93675ba7f687dd7e179ded909875e69dcca68c78b2b7570aaf8ac3b458feda5ce0b5004
-DIST texlive-module-babel-bosnian-2015.tar.xz 2120 BLAKE2B d49a58b5070a5dde6d242e39802916c0a7086895fdf543b40eaaa2ec0fc54345e299222d71abcd060b9f685507fd5ed1b2c6fa1a5230ea6460ac4fbd7016cc5e SHA512 443484af619524b18afc312a12dfeb9e981c2ac6d92c9d977b30b197617dbd09afec6df60295634e77b065e088f2759661806ab6b43971e62e1a9aa46ad6ab83
-DIST texlive-module-babel-bosnian-2016.tar.xz 2084 BLAKE2B 6f1a9c866c651922425baa7128b0f0c9959dc520b40c2c670469d656cb0b01ec216b70d98236c0fa4d960fa3204722c362083ed1dd4a063419a02e1e32da4d0e SHA512 f27a3177716e6af94b9aa04251448dd60e2c985351d8f043b2144a7b0449b56bbb212fbc43451274046026fd86e068cfe8b27b48e420b2d54f7fb6c2508f361c
 DIST texlive-module-babel-bosnian-2017.tar.xz 2084 BLAKE2B 6f1a9c866c651922425baa7128b0f0c9959dc520b40c2c670469d656cb0b01ec216b70d98236c0fa4d960fa3204722c362083ed1dd4a063419a02e1e32da4d0e SHA512 f27a3177716e6af94b9aa04251448dd60e2c985351d8f043b2144a7b0449b56bbb212fbc43451274046026fd86e068cfe8b27b48e420b2d54f7fb6c2508f361c
-DIST texlive-module-babel-bosnian.doc-2015.tar.xz 113828 BLAKE2B aa66ca4cfcccb21eb026801a5fd5a91777c39edfd00bb9bb53b7ba27ba4e904a956c0a6d7736c04d1fbf52cd5b43fb783e34a99dd7aade184ba59bfe5364b0cf SHA512 5dfa4b3147fc789e7b3c0ffd3eee60daf2d3803603b386e6690f86c2ade3a11d6cdd53027fdb9997b5af04b5a98168c65a46a54f558ff9bae860ff7ceea98147
-DIST texlive-module-babel-bosnian.doc-2016.tar.xz 103212 BLAKE2B d7c78a2e6eb57397cb452e676774dd2533abe481e426992e3fb17db8828972ab87dff2f416c23b4d909b433e18381630ac2ed67e076d012423d77ebeb18afe2e SHA512 610ae88f9558d7eca7f1abd945c339c111ec88dbd7636842a526b6ad059b587cca23227d0728bd983eb5ff1902c3431bee717f33e882c246564bad85d2d8c53b
 DIST texlive-module-babel-bosnian.doc-2017.tar.xz 103212 BLAKE2B d7c78a2e6eb57397cb452e676774dd2533abe481e426992e3fb17db8828972ab87dff2f416c23b4d909b433e18381630ac2ed67e076d012423d77ebeb18afe2e SHA512 610ae88f9558d7eca7f1abd945c339c111ec88dbd7636842a526b6ad059b587cca23227d0728bd983eb5ff1902c3431bee717f33e882c246564bad85d2d8c53b
-DIST texlive-module-babel-bosnian.source-2015.tar.xz 3728 BLAKE2B 547e7873ec7c7c6ed5b59472b9840f69a68ff5d90918cadfe65fc560944bd4fce3f03a712504082cfc150e28d78036b2f5f5c5fea8aec0d836dd593d2ba74f5c SHA512 1c9a457831c24718a16de66fd82a88df9f28ae1f9c3bcb10f469710bb550ceda7fff7af7f54f7c480b6550858d95acd4c6b80abde58e08678475008671dfff97
-DIST texlive-module-babel-bosnian.source-2016.tar.xz 4348 BLAKE2B d28a31b59d1599036a0aee7b6284dd0d304d6e5c054a266134fce4092c9e2b321a72c25dab4cb50f1251d3d3bb8837a2b6472105189e4b57761dc9833b338ddf SHA512 8707c59babe557171198e49ba4a6c123f1cd4b4ea4d53fe03daf500e017215b5475e34190acfa859f0081a7d9cc226667e2314eed3aa212de0727d76fae7570a
 DIST texlive-module-babel-bosnian.source-2017.tar.xz 4348 BLAKE2B d28a31b59d1599036a0aee7b6284dd0d304d6e5c054a266134fce4092c9e2b321a72c25dab4cb50f1251d3d3bb8837a2b6472105189e4b57761dc9833b338ddf SHA512 8707c59babe557171198e49ba4a6c123f1cd4b4ea4d53fe03daf500e017215b5475e34190acfa859f0081a7d9cc226667e2314eed3aa212de0727d76fae7570a
-DIST texlive-module-babel-breton-2013.tar.xz 2536 BLAKE2B ef6ce95b12eac8c88401e8fcd02652f8eadd1a9bb1e0592506177b560238a2b1b5ca177cde25e64088cd2940252e007d1f15a1e4be9a2fa96a9830ac5daea46d SHA512 34e5c65707b48942d11203435e9cbd78b6510912b38692b69f7ed1a7167462ea84f4ae93b1bfcf5d6c7ea93afc14572b97c2148b2b0751e9557d4662607facc3
-DIST texlive-module-babel-breton-2014.tar.xz 2736 BLAKE2B f7152c3429c6f7e312c415afec87cd14386e0255bc00d2240ad11b550e330b6907f541df7bb3f000d09fe4771dfa702fc08e4e7be28df7f2731e82880ec7907e SHA512 2231598d6dad67d7280021e98238f3eafed62739af5d0628ce0a4fe472897330f99701508a5756fc3cfe3a2a69641cd67cf6b1c150be95ec8ab260a1d3a9c8db
-DIST texlive-module-babel-breton-2015.tar.xz 2732 BLAKE2B 80f613e4489b4c5d08f979f799663661c5fdd132641d45614072a050070af69f7837f7b0aea71dff9b437b8c0f7526de93c65e33a3df913cf17889eb2e3c66bf SHA512 8480fa1d3c2da94b6f5db3419f926fe0c9bed81472ca03c0cce77a863a57813f10ecc2cf77f4f2dfbe1b1732cb03bb39eac6668d9dff8e1981fa044a57289bda
-DIST texlive-module-babel-breton-2016.tar.xz 2756 BLAKE2B c2508ca3aa0c36d5f642b9c6041af251afc02fe33be955a616c60758a2e44a1c2e9568eaeade92c5487097826f26a605723cf41ef847f1b82d9cfd8b48281aad SHA512 ef84736a89bc8ff2f5409efde90d0372622b0201059e9a98b8c82fedfe7822106ab57449a395a9a6becc74ba055662ae1211e261abce91ed40b3be227b7a3a8a
 DIST texlive-module-babel-breton-2017.tar.xz 2756 BLAKE2B c2508ca3aa0c36d5f642b9c6041af251afc02fe33be955a616c60758a2e44a1c2e9568eaeade92c5487097826f26a605723cf41ef847f1b82d9cfd8b48281aad SHA512 ef84736a89bc8ff2f5409efde90d0372622b0201059e9a98b8c82fedfe7822106ab57449a395a9a6becc74ba055662ae1211e261abce91ed40b3be227b7a3a8a
-DIST texlive-module-babel-breton.doc-2013.tar.xz 118228 BLAKE2B bc7e95198697bbecf809dbc630260a48a5f736d4df24ea87b65bb394aca8aa874e3a893589b1a597033dd02ab38b497fdc90e708e3cf3d4b36b7a0be100a5c7b SHA512 97dd892b33058295d898803eeffe1dcaed667cd8563f86fc22e0cc7d0e7d8dd22eabb73a36882a0f166f087d09dcf2c5654129a275699c1a6c80fbb14867c9ff
-DIST texlive-module-babel-breton.doc-2014.tar.xz 118228 BLAKE2B 52bdb26b02bf4299ed5e6f048ab6f2171804a741e982253197f8540ac3d8ce5cf66814b61c33b3f614405b8e50e32860729bf192643c1afa2378106937e512f8 SHA512 349bb7e4cc1697635d58391de5c91e97f7931326ac140b597cb8bde2bb89f8b2cd30f8d9bfe196006a8d782475d9b7e087d7f501ea4345ca79f92114c65fa404
-DIST texlive-module-babel-breton.doc-2015.tar.xz 118232 BLAKE2B 73b7e48be4073c390b7d98c0acc49646877531c26986a74b7c2332b96f5ec41e9b5133748e03f37f6f0a97bdc1cb3a425aeee2e4593c95bc1ae4b1fa6f6ad48c SHA512 35d4aba2db08763cc4d7caa1f171224d945d27bef8ff551dc593b676f81a12973dc0ac88f0552bd96ec9c094e0e4d4d09795cbd21c5b97e3863550c8165f4f22
-DIST texlive-module-babel-breton.doc-2016.tar.xz 118232 BLAKE2B ec6119ff839f212f654a459f5b9b6e1af0fedd2623b2555f2560dcf40002e69142063da3ed109eaccc19927c12f402fe4964824487cfebc75d031e90fc2cee29 SHA512 e5227dee469c5284a924840c185df873c60c5787410f18c7716cacd12c366e757305f66f911602caf66828deb633e120f133138b541e00e4ae2fb56e4dda2cf9
 DIST texlive-module-babel-breton.doc-2017.tar.xz 118232 BLAKE2B ec6119ff839f212f654a459f5b9b6e1af0fedd2623b2555f2560dcf40002e69142063da3ed109eaccc19927c12f402fe4964824487cfebc75d031e90fc2cee29 SHA512 e5227dee469c5284a924840c185df873c60c5787410f18c7716cacd12c366e757305f66f911602caf66828deb633e120f133138b541e00e4ae2fb56e4dda2cf9
-DIST texlive-module-babel-breton.source-2013.tar.xz 5388 BLAKE2B ef12b6bd297a878c9252cbfed6d8951914cd6531916e60dfbc74acf91db4ebd4e18ffd1eea9a2f1d985704f11b8fb7da206dc9850c81df3252a9dde8bcda6827 SHA512 e9cfbe945fb5f090e540bd3954cdf249c64d348a7dd2af3006f034fbdb3c1c077e04b1d86f8f10c82d5973b265259bdb906794dc263f78f2ee0bf498277cbaa9
-DIST texlive-module-babel-breton.source-2014.tar.xz 5388 BLAKE2B b7bb51ba7c216066624891300b46ba42c73ed0743ad06951dbc6070c99425759b5f62eab301421db9cd053abc697de483044ac3d7fffc801600f2d247648befe SHA512 44919a0a2bdf64304db4d6619ca3911523f4e26ea5c5b89e776d37180c35578147fd6c66f5d1d5fe8892177e3ef5d2d50276f8f8eb35209642187152ca5510e8
-DIST texlive-module-babel-breton.source-2015.tar.xz 5388 BLAKE2B e2207641114d1d951b943ca882f069b95fd839f2e1b50b985744d56625ff8dd5e3975596d01ea6b52c5a8f954bc164ab908fdb4cd6b4916806d9da35c1ca122a SHA512 a0b2b1049abf1bce84e22fa2c750f44e8bdd2a7f0749a71aac230d94a2f9b70a57b2a792f6ff5c34d35dedca3492d7060061e5feaa1390f6c142ac42ac5988bd
-DIST texlive-module-babel-breton.source-2016.tar.xz 5392 BLAKE2B 32b731d92df77210832b99a0ce4c3613caf5e682ca956f265887f2a43b67b51ec2c8fdfb9cb2a2bfdc4756bf8e8b750285947eede81da5f674211938f2097a15 SHA512 3150e66e42bc7fdb75be2e49e763dc54ac716bb36399714dcebb9dbbab1cad49f052b7a60a9fd65f539eb255e0c031c942fc822ef2a2dd10b2072605576b07bf
 DIST texlive-module-babel-breton.source-2017.tar.xz 5392 BLAKE2B 32b731d92df77210832b99a0ce4c3613caf5e682ca956f265887f2a43b67b51ec2c8fdfb9cb2a2bfdc4756bf8e8b750285947eede81da5f674211938f2097a15 SHA512 3150e66e42bc7fdb75be2e49e763dc54ac716bb36399714dcebb9dbbab1cad49f052b7a60a9fd65f539eb255e0c031c942fc822ef2a2dd10b2072605576b07bf
-DIST texlive-module-babel-croatian-2013.tar.xz 1988 BLAKE2B eb04a98fcbd7cbb30d4cfc44353bf84852b127de51bd0e839c28d17431cdf95c814f2913441a4ce01f0f7dd35ba90b3fe750b78256426209b2edf654507f9b94 SHA512 1ad86f05c66b66db6901fd65d2d6f4c351cc09514efe41048de8c1d782c96f61baa8f84cc052d2c6b9df5079d2c58c73e535031f7021cd8e193f5636323b485b
-DIST texlive-module-babel-croatian-2014.tar.xz 2152 BLAKE2B c4d0dd25d72acd33a8bdcfc7230bd13ff07ef4d2d102f7e0b49a507f5b825aebb8787d5861a2cc64b75d6f9812d33a029cd3dbff539133721c798deef7cfb73b SHA512 8a81c6b52a3045e258fd3e3600f5f517fd61395d17f90dccd406a246eaeea778493ea1fd70c200335a2d21fecd3633821779ba1cf7b68faba55c5c849dfb2807
-DIST texlive-module-babel-croatian-2015.tar.xz 2156 BLAKE2B 1a073132a1e9f5b3e464f99095d21c0971324cc0786cc2caf268801679405408b215b37348b6e747d1952802a9c9d379b241684684151b3988d2dc1fd087ab01 SHA512 c7542deb05120d17cfd5f5aeb44e5c036efcb04cc8439d5b7a94f4558c215e4e951534dac766e630a2baf3523ff7d6ae95a0cbd7feb56fd448a1890ff28117d4
-DIST texlive-module-babel-croatian-2016.tar.xz 2176 BLAKE2B a30b75517dc3e5fbc91ce26810a210fd70f48799327bcfc2b5bc9682cbc4f8dc06c5a7be7b8639c15b3b2d578441d370340e02f9b36bfc4073b773036bacf4f2 SHA512 72e81c674cd38271274fc825626288b02397de9b5b5eb3d706fc08366ec02f68053eef7e46a2d0d2a2d07d71a0bb5799e093e427b5c88805e52ad399d882dca0
 DIST texlive-module-babel-croatian-2017.tar.xz 2176 BLAKE2B a30b75517dc3e5fbc91ce26810a210fd70f48799327bcfc2b5bc9682cbc4f8dc06c5a7be7b8639c15b3b2d578441d370340e02f9b36bfc4073b773036bacf4f2 SHA512 72e81c674cd38271274fc825626288b02397de9b5b5eb3d706fc08366ec02f68053eef7e46a2d0d2a2d07d71a0bb5799e093e427b5c88805e52ad399d882dca0
-DIST texlive-module-babel-croatian.doc-2013.tar.xz 113128 BLAKE2B b4d09b1cbfdeed30733e4b7264dc739d2b4ddf1123fd7a7934bc9e8fd86c10c2ec31e8409860291e35072187351d9ccc69aebfaafa44ba7979c5616889468622 SHA512 0a9be3c22f0802558556f77bdafbdd84b115e5f7d9f73fcf0e7b876ba24acc4a1efa52f5cbcd56ec1c63c61285e24f8711140d31fe8cf0ab893ee3407b4c57e8
-DIST texlive-module-babel-croatian.doc-2014.tar.xz 114148 BLAKE2B ce35cf707cc2a98ec01235951864297ebbc7cc832c983f8e94f207348f7469f4a30bf870e98f2034239cc960ae1e7f2c42b35b94e84cfe79966e2e945d384501 SHA512 a3166f94dab5581821d8c8c2159d4a337bb532e39c197c97b4760ba41e893cbcc736abb00d9aa4957b0273a1706b1db8ceba32bbd025b696583528ddba5c8e62
-DIST texlive-module-babel-croatian.doc-2015.tar.xz 114152 BLAKE2B 0815f318287ee8b2cf38962ea3c9360e3ffc357be46e601e240d8aee2000c42e5577349792702607d7ceefe1d83de7ca40ab9a22925a39e660f6f6659e8aecc9 SHA512 743c19c17c891d1316d5be4564237588363aeacde84dd68e4b91ea235d6f66de469fb27d62d243a1124ef4e01d99311d8b57544363054796c39ef0c3b5d948bc
-DIST texlive-module-babel-croatian.doc-2016.tar.xz 114152 BLAKE2B 2e33dc6c862dfebc0f62645003f980569961dc57989132de289c0496a4e2edfb06f421ebbb4495e00ca5c8c60516f4f323be30e45b07c1ecb7e3ae72d2adf7f0 SHA512 c4ca9499327905457afc963f704d6b078988c9dd23330d0671e3d02717c9a6934d2126456582566dffc6d5294f0b4373cdb7139752ac1aeb6ca13bf93b9de1a1
 DIST texlive-module-babel-croatian.doc-2017.tar.xz 114152 BLAKE2B 2e33dc6c862dfebc0f62645003f980569961dc57989132de289c0496a4e2edfb06f421ebbb4495e00ca5c8c60516f4f323be30e45b07c1ecb7e3ae72d2adf7f0 SHA512 c4ca9499327905457afc963f704d6b078988c9dd23330d0671e3d02717c9a6934d2126456582566dffc6d5294f0b4373cdb7139752ac1aeb6ca13bf93b9de1a1
-DIST texlive-module-babel-croatian.source-2013.tar.xz 4324 BLAKE2B 6286252418639a52c5658d9c303e274d7c12f96da5a1976f2e410b4c0381ac1dd09808d4dc4725ab925d26828ce4603f71449624d7e5fbcdcfbb3711860879fb SHA512 2b71001e518184c6eb6b338c5b05e1b5a55135e456b9184d4a8b0f41538fd8091afcf0a51653d244a600be7036e5652fd70e7225e7981eba75a4d121a07844c4
-DIST texlive-module-babel-croatian.source-2014.tar.xz 4424 BLAKE2B d8013fa090b6642455cbeb5ace3fcb9f328f367ba218b2fa13eeff6b59c6c7346d9a435e24aa0ccf5aed68c6e5f95406b84324daa81be7d9db36a301c5ce321b SHA512 a703af788426f79417dc5116af73cd243541415c98976e4f7f024f9796092c3f74554a8dcbb21e55fffe56f7b1083578f2607bd82d417cda82b44726f2cc5c98
-DIST texlive-module-babel-croatian.source-2015.tar.xz 4428 BLAKE2B 3688459d3a5586528cadfc679e16c4703de6a3cc13187b0f89e584a2f4cb1f0795ebfebb536b8a1882d2691d6dc6240d7ca084babb66e5c09e635dc564167b76 SHA512 c867978a022284f71c879de9ec54efb905a49a7f416e55815e4e376fc68ddbc7773589bc166877b929935b52e1777ab71631fd0b76ba52a702911f60c2ebbf4e
-DIST texlive-module-babel-croatian.source-2016.tar.xz 4428 BLAKE2B e33c7aa7be9d37e593e77ed3a56382f317cb69180f69ba593ec71d90d46b68917f64c6818d88767a1aadc34adbd5ab2398d8ef330154a40d8daf31dbe715f6a1 SHA512 fdf2d76314c593c7716b0e76e8b43187d8a023c733ae2423411a8bfbd4be51f655e337647cfa3180172e534f6fd6d815fd84262e14085bced0caec948383d7b8
 DIST texlive-module-babel-croatian.source-2017.tar.xz 4428 BLAKE2B e33c7aa7be9d37e593e77ed3a56382f317cb69180f69ba593ec71d90d46b68917f64c6818d88767a1aadc34adbd5ab2398d8ef330154a40d8daf31dbe715f6a1 SHA512 fdf2d76314c593c7716b0e76e8b43187d8a023c733ae2423411a8bfbd4be51f655e337647cfa3180172e534f6fd6d815fd84262e14085bced0caec948383d7b8
-DIST texlive-module-babel-danish-2013.tar.xz 2272 BLAKE2B 9940aed8b29e47717d393e2422e8d40bdc706da4ed496ed5647bbf135ef2271dd853735e51ffb2e01368fb86a3f8f553203f4875064d7c305c403a36461bdb37 SHA512 7cc978957a0496414fcd265e65174bcaa255b1b44ede8799f1ff34b9ab8ec32811de8e2e765c5962ce8a0200c062e1f322609771a5b691ac0a74366918cafa9c
-DIST texlive-module-babel-danish-2014.tar.xz 2456 BLAKE2B 2a1e830f72a16efc74bd063da2bd8cb6aa4d8b57535da86b92b70bfb45a223bd972a0b139f582d18205d02d8f36bbfe0776a53141e070ee1a78ebace67d693b3 SHA512 bd6c03dce0216a9e687ebdfa28cc675627a8fef41636c5a72e2eb194e2546b7bc13565a1c4e5f29342ed35fa045e00dc70df6848edc075fea2997f1b8bf928bd
-DIST texlive-module-babel-danish-2015.tar.xz 2456 BLAKE2B 96878cf3afe3ea8aa2f9429c03cc3c965e185606755b654c5dee5a5182b9032825a638ee3f8b883d427c80867ae3a7540ca5011c2228f539b324ef5c017f165f SHA512 f1a9ed9371bb4342d18944c0c1e9010846a8418c60c7302fdc1948ebdc60e6ae20848e4c1f0e161dea51559aa73a4f25a79f7e25b8c1f43aa316c42d7d9d7d49
-DIST texlive-module-babel-danish-2016.tar.xz 2464 BLAKE2B 1cee50433e26848853d77da09fc3e16c5000de31e6e8867a4faee3ceb089410563bad424095c47f236a0c3494981e05f0ef626eecd230a1c283f598d9b9f8ecf SHA512 33c8e7f7962941e0eb0fb27886a9e8385c7d6783b25cb4b2ebcf89bb36d7670115571892cdc11e1ee5f1cadb2059bd57df71b51889366f920cd6c57837d7f0c8
 DIST texlive-module-babel-danish-2017.tar.xz 2464 BLAKE2B 1cee50433e26848853d77da09fc3e16c5000de31e6e8867a4faee3ceb089410563bad424095c47f236a0c3494981e05f0ef626eecd230a1c283f598d9b9f8ecf SHA512 33c8e7f7962941e0eb0fb27886a9e8385c7d6783b25cb4b2ebcf89bb36d7670115571892cdc11e1ee5f1cadb2059bd57df71b51889366f920cd6c57837d7f0c8
-DIST texlive-module-babel-danish.doc-2013.tar.xz 127820 BLAKE2B 6ad9043191c6c9449b9d0050c5d7beb1b7a42f5f6fe6b5a12d4a089fdc5e869ebdee03f673642fa48e59480a50c16689289f2968b63ec289fb09c19dea324aab SHA512 3f98cde8976abb7620fc281a373ee50d51b77533c5c067e3c02c894d9cbd15feb2335916782e1a94fa686e4a3d1f355639b7013bd821796a17537f19bc991cc7
-DIST texlive-module-babel-danish.doc-2014.tar.xz 127820 BLAKE2B 76aedbfa768917a0577cc1ea56553dc044b1e6fb6fabcc7fa66c73f6fcb9aaf5a7878d7af90d8876157661b956b89ea3c71d8f4b5543fc784a9f94b2324b58bf SHA512 05e893e895b4edd81d11ff09b56163ebf14b09d1fdccf3d046ecae047a4ad0ae7c1e165967d796fc31c3e8fc54da52dc5346894fe8c5e21979c4b448278cfe8a
-DIST texlive-module-babel-danish.doc-2015.tar.xz 127820 BLAKE2B e5df802f92a0909b6b463291dcbfb0ea728f86b0a2202b5c57672c35654a03bd79864f907da21c94583cb8ea1fa2714d7062c624aeb45677b6fca4592f312502 SHA512 f8e79fd2556f5386b9834839c3facddeeff3414ab4ad28afc2f4084bf260e1d91e3107219b7a9d203af89df425f0e32a9114cb2dc349778f49786c4965e66961
-DIST texlive-module-babel-danish.doc-2016.tar.xz 127824 BLAKE2B ab349c265c9fa13b4249d45d3896f7407f7bd21aaa68f90ab8b3747ce3f23632328103e087680afc48ab88214a91118794f6facfcb8c6f1ce8211cd9968922c5 SHA512 ae702f8806057fe80d023416fbae4f361d8256c314c6e70975dc8bbdcf64e1ecc36940f46fa2d297e04ef6f2ed32e3bc1b1aad4e4769321750768c0d0d8051e3
 DIST texlive-module-babel-danish.doc-2017.tar.xz 127824 BLAKE2B ab349c265c9fa13b4249d45d3896f7407f7bd21aaa68f90ab8b3747ce3f23632328103e087680afc48ab88214a91118794f6facfcb8c6f1ce8211cd9968922c5 SHA512 ae702f8806057fe80d023416fbae4f361d8256c314c6e70975dc8bbdcf64e1ecc36940f46fa2d297e04ef6f2ed32e3bc1b1aad4e4769321750768c0d0d8051e3
-DIST texlive-module-babel-danish.source-2013.tar.xz 5700 BLAKE2B 80645642ffc43c58ebce547ea500184c08ca8641a7a9a2288af3823a063c99869560bb3c21ccc0ff25ec0fd7ea0b7d6675aa1f285e595bdd25893005dbb4f7fe SHA512 a67eafc80f5977e3e5fbd6b7bd6f48257df4287711d261bba9a1718bd962cca4fdb26485574be3dc17104c23ac7542561ac73f24aff14f539cd892097809e05e
-DIST texlive-module-babel-danish.source-2014.tar.xz 5704 BLAKE2B e067c7024fefb52bd11b321a283901ad3ea20e2bec37a3bbf066328ad4875d5ba435cb2f4e266e2b8a2f811ac0ef261d98ffdba57b8262ea9b4a2c881190f055 SHA512 fd07303bbff34fefb91f6228a0ce045e5c435c13c25defcdc426d88f2d48320c9aac25adff5ca52377efcb89f90af05b7cb2baf85921e3c75c9bc063f557e3d3
-DIST texlive-module-babel-danish.source-2015.tar.xz 5704 BLAKE2B be07f4c753fbaef9bb85f4c53501173746f10e89eff70985289679fe9b717169fceefd8f8af3c7c928cab21b88bf1f76927d1b2f5018c8276372aa8062fed052 SHA512 1a827ed550a0d9cb0a50d88ea0a7d4296660ac122b1cd0f76af0479b5d0833eb65a62624a7bba38fac68de4370a081d13a665da6cf6d4498be084a4f1c4b53a0
-DIST texlive-module-babel-danish.source-2016.tar.xz 5704 BLAKE2B 68f3fe3b051ef0be3e648691df7aa205f0e0293ac05b685e6fa2810933e950f321ca1be7311ac5324034afe25e7c034fa6914e328aec7d210988ee6810c673f5 SHA512 d1409e1cb4c72b13890a8a4e195ee567a7f953d865ce6d4287da816fbc18684ea0bece641747243d3442f53b86339dc2dc7ec5adcf993e904c792cce5a9f4ffb
 DIST texlive-module-babel-danish.source-2017.tar.xz 5704 BLAKE2B 68f3fe3b051ef0be3e648691df7aa205f0e0293ac05b685e6fa2810933e950f321ca1be7311ac5324034afe25e7c034fa6914e328aec7d210988ee6810c673f5 SHA512 d1409e1cb4c72b13890a8a4e195ee567a7f953d865ce6d4287da816fbc18684ea0bece641747243d3442f53b86339dc2dc7ec5adcf993e904c792cce5a9f4ffb
-DIST texlive-module-babel-dutch-2013.tar.xz 2656 BLAKE2B f29b80c5b263d721101669c25b92f55f41474f1ecc31860d60d8c010b76f04b02b33b04b2788c84cbcfd0d5822ffa00ee8d11a29a5a5e8a03a4dd04acad9d143 SHA512 a769fef12bd11446fd4f6ce231e6b7ad549822d715bde6962d87de66a69699affc45219e1303f3f85f9c7ce0149375ff3a23b2b3fba935d4154a738e8d8b631d
-DIST texlive-module-babel-dutch-2014.tar.xz 2844 BLAKE2B 72d568c578abd073482e96a02473d3cb94b12266b75272475a8d7125da4eccc6af0317869f3a0dcb72b5bd547d3866876cabbf903dafe50027e358b6976aa13e SHA512 db3fbdebeb83476fb836a092b2836d3c49a31bdfef9b7728eb156acee3b384371cb210225c57b86f90c348528d3e4b26578e8a9ad47d854c74ebb1ce9c50775d
-DIST texlive-module-babel-dutch-2015.tar.xz 2844 BLAKE2B e509abf391570adea49d72740083cf6eff5df7182a2d35d334cb5df6989c0adc257230135331607964d6ef3526f27b7d6ad4d4d9916306b90cc8e667c61e2225 SHA512 dc16ecf3396751238eab26e0e42953707892e7e678a71e6f9a564ce01ae86c0b77cc906cc37d8c7782eb476c473ca36dd3d808bc149d4d6c09d42c3d2a57983c
-DIST texlive-module-babel-dutch-2016.tar.xz 2852 BLAKE2B 7cd7db0765452a58a20085c8b1dbdd5c9b754c8daa277291ef5deb8354d52d857372c1d26c998cd19c7510477dad324e20af62a86fb30dfc9a824544e98b636e SHA512 e250b1440a8b8fa6ba2390ce6bdfe41cb05af63fd76d14b4ba05f694007c72f49f4f22b6dcbeb10e2c07c5264f0726ddc1b5aedd47e6d3e5505a78950a4ff199
 DIST texlive-module-babel-dutch-2017.tar.xz 2852 BLAKE2B 7cd7db0765452a58a20085c8b1dbdd5c9b754c8daa277291ef5deb8354d52d857372c1d26c998cd19c7510477dad324e20af62a86fb30dfc9a824544e98b636e SHA512 e250b1440a8b8fa6ba2390ce6bdfe41cb05af63fd76d14b4ba05f694007c72f49f4f22b6dcbeb10e2c07c5264f0726ddc1b5aedd47e6d3e5505a78950a4ff199
-DIST texlive-module-babel-dutch.doc-2013.tar.xz 153996 BLAKE2B fb986e098fcff9310da60b4321c825b487b4985b8c4840d5fcad5331acd3696b6323b5f423ac54e4f767e1f6f1195e5414fd80033386340be363a43a22898bc0 SHA512 86eeeae9c1c8395ab9b756fda296b203549f8cb6d3cf571eb6b1034746e4ffcb4a8cb941d00e2cd747b8d5e4f8bdb64934159002444d2af59793b4e7a6f3e22b
-DIST texlive-module-babel-dutch.doc-2014.tar.xz 154000 BLAKE2B aa493d4f49c4fb7b3f6ca4af76ca5a205b658480a0a67239847edfd032558dfad82fac51dfe89719151f813b2374bbaf1a240d8c67e5bf67b61bed8d0cd46d21 SHA512 1980efc82373117632be2835371f73ae96c8a03a5132bc0e976669211d39bef6c9927303d58bf746ce8d846e22b569c93398f315b0be42b6dac868d711676b42
-DIST texlive-module-babel-dutch.doc-2015.tar.xz 154000 BLAKE2B 69c395389ea0e5c5595e8be25bcd7a40be8f0f77f7265139c229e627eecf09656e7a207967aab372c6353261669122b08d440fc3a144cbf9ad1bff68f21c3308 SHA512 1bab3c296a9bef43d19be7d08dc41aa2770e842cba5efbd35548270ba3becba5e20a2c89fe59798a0b0d86647220ad75e308a9d5885fcd0e8747507649ea828d
-DIST texlive-module-babel-dutch.doc-2016.tar.xz 154000 BLAKE2B da9a51773b51822a7d298a632084e2f3f1c71139167cd591028004573908ffe7bea8d5d48d385a3099b04f56aa56d7660fc900b40900676a380be7762dd6a2f4 SHA512 95e70304d58a114acb3142e102d6060819462a6b0267eb3b0229ddd671282e5da090ea86bd0d2c23c3a2999eda8907a6e7d2584eea243b518cafbe079ccba686
 DIST texlive-module-babel-dutch.doc-2017.tar.xz 154000 BLAKE2B da9a51773b51822a7d298a632084e2f3f1c71139167cd591028004573908ffe7bea8d5d48d385a3099b04f56aa56d7660fc900b40900676a380be7762dd6a2f4 SHA512 95e70304d58a114acb3142e102d6060819462a6b0267eb3b0229ddd671282e5da090ea86bd0d2c23c3a2999eda8907a6e7d2584eea243b518cafbe079ccba686
-DIST texlive-module-babel-dutch.source-2013.tar.xz 7932 BLAKE2B 93192598a591e5067dd57f8d9e0950a5b60be0b7a36f3c70aa207a5754acc44683e0481d70fccf658fb51d54d3ef8cb0959b16c29965fb7998a8a102fd65af23 SHA512 713ef8c70a51bc918082c6cbd1d45215e3dc7b70608b1d3d857077d98071c2d12f788182151a2a13342686d552bdc13e9749a21eb84482e8a3533d8ce1a3700f
-DIST texlive-module-babel-dutch.source-2014.tar.xz 7932 BLAKE2B 950534d61e6dbe30f207abd8386bd8469df12e677d85bef501e6c3feaf0a77d1fbab7edc981507d390543d4d098bf5741a29765b328b83ec46466ff857d6921d SHA512 dc3a074bcde3cf12dcf48e6533b81c2dac9587d8fb241bb76b0c3f8c29eb54fc4a7f72002bb259979fa83ba6c1d323f352a2743095b6baa79b2982df3913d5a2
-DIST texlive-module-babel-dutch.source-2015.tar.xz 7932 BLAKE2B aabcc56e5a78938b9db13a0ae741e777f813caf7bd7e421ac83ddbdb1a9b70809fe7b96d5a25ba72ebdd5a572e4abde2fa979af04724381428316f8a786a469f SHA512 e2f477d5c33ebcca355682eb530aba03e99f7d659b18a7d0ff0bedb0cf5053d2c4fe9ab1cdfe7fafac29c0f22db2871ef710afca5d220faa111700fb3f84c370
-DIST texlive-module-babel-dutch.source-2016.tar.xz 7936 BLAKE2B 4173812c71e64f7fc29a9f26b8fc450cb2e49c1fe0756a74b3793f22220c42d6b1a8b8fc24696ada33203809068a821568c688e32a531059c2d8318968a3bf77 SHA512 2cd059959286ab60b21a6819fe1691e5c3d92fc9cf9bea9c2f5cb613971132141f11d9902647a9c791b5a4f7bbca3c19ead3a578e60d312fd03e949a1cead448
 DIST texlive-module-babel-dutch.source-2017.tar.xz 7936 BLAKE2B 4173812c71e64f7fc29a9f26b8fc450cb2e49c1fe0756a74b3793f22220c42d6b1a8b8fc24696ada33203809068a821568c688e32a531059c2d8318968a3bf77 SHA512 2cd059959286ab60b21a6819fe1691e5c3d92fc9cf9bea9c2f5cb613971132141f11d9902647a9c791b5a4f7bbca3c19ead3a578e60d312fd03e949a1cead448
-DIST texlive-module-babel-estonian-2013.tar.xz 2848 BLAKE2B 982dfcbf89b6898f661240e9efd856090109611549a72180e6c815a84f33fceaca4d4722383cf58789a6132d157335a4b9224117faa5340124d70bf3d6d58ef4 SHA512 59237bde125060c722867054900fb50d18fc004599ed8a09aacd131c6c8a62803b4f50118bf30d2efcc08982018ea4235a81c81a8e2c7e1a441635d94e15f79d
-DIST texlive-module-babel-estonian-2014.tar.xz 3036 BLAKE2B 3b85c0c7c0ca74ee17ffc96767983116b89c8cd0e465136975ca932d0b33043b14fe975e6f27750d880c034f57e86ca968b395a8db8612d209d4fb5fbdb15dff SHA512 90f53be02822660c9804c4396dd4fe910d5b93c03fe4aadfe8e7647661c4d289947afef5d29a2ae1be5f2322f82a139c9bb253ad025987a27d7f45d1162429d1
-DIST texlive-module-babel-estonian-2015.tar.xz 3040 BLAKE2B a0a8a7c491526c607455546677a59659aba3b0184f2c7a5aa7357b264b1385a6468fe5c57558278f737701f2afb061950d2c7746eb34b9ace6baab902a9e95c8 SHA512 cb6e68cce67e5db8ec962384f4f3cd38c13b049af73eefffd3431faeacebfec49b98ab6967fd06cdcd0d1db10ee7a96f5a42db3b9bc86a6f12f2f186b9d0ed3f
-DIST texlive-module-babel-estonian-2016.tar.xz 3040 BLAKE2B 8b65665688d806bec0ad638d0fa6570094ce0703a7d5da0c3fb194d2cc3d47f0f92cf931a53b55d11098baadf6c0869534d9e8597fb824bd2dc475c04ca7160a SHA512 bdd6dfa5a97fa67fce7eadc7c8c0d1627e2e8dc37d1c9d70341442bcc5a6394f4499dcff9c0f1d6e0fb3aea9feed90163a96deabc4496b49f076d8e776868a72
 DIST texlive-module-babel-estonian-2017.tar.xz 3040 BLAKE2B 8b65665688d806bec0ad638d0fa6570094ce0703a7d5da0c3fb194d2cc3d47f0f92cf931a53b55d11098baadf6c0869534d9e8597fb824bd2dc475c04ca7160a SHA512 bdd6dfa5a97fa67fce7eadc7c8c0d1627e2e8dc37d1c9d70341442bcc5a6394f4499dcff9c0f1d6e0fb3aea9feed90163a96deabc4496b49f076d8e776868a72
-DIST texlive-module-babel-estonian.doc-2013.tar.xz 136900 BLAKE2B e8ae36b686b8c7a8108defe4d6ed5fdc1515ab49be5a5b3a03d9b62323b09350fe8d286b56d8bd6cffba51e2e13cc99ea6107b58ab352e122420dc17ca5a5049 SHA512 bdcc00769c248c2a321a86214f81c9ef655ebd2215dbcdd49bc315bc776c8e8fdd521de1230887f3d4e706cd97f2449ae4e54110df71cd5957653074e1bb2cbf
-DIST texlive-module-babel-estonian.doc-2014.tar.xz 74652 BLAKE2B b14b621ed57686c71f3cc0b27a0f441c8dd857a1456fbcc7f622cbe3f50c80a14c78f7cc779a1ce973fd64d970ca87c459a10bd5455e212fa9184e573b046cba SHA512 a5f3561b5d78b17128f07f03ab203821b954b1dc408d2e97cce85ba1aa9d8987ed54167de78e2e6d67f9f16dcb6e36894f3e176f7e62817ede62a35ef8567c0c
-DIST texlive-module-babel-estonian.doc-2015.tar.xz 74656 BLAKE2B 7bb987a6d98d90c184e2a7b1eb89c5b984d362aa16c544766e0e9e55ff26dd13cc126e50bebabf177378991c1e520858bddeb7573c2a8ed83fc143eeb96e247a SHA512 8d011bd70427565d6aa574a0ed90b581affd714097cffeecdffbcdd48bdae53db21e96039b9c9e396640ad0a6af0676c388757cb7428d36a80279babeea918a8
-DIST texlive-module-babel-estonian.doc-2016.tar.xz 91472 BLAKE2B d5839bbdc3b0f9e1fd01173e935e7d5be9dbb64af5805f13259fc0fe47274429109a42014a483373b84ab9fddeca634c722029ea63299a5b4106a9e8df11fa92 SHA512 fcfa6378019550d842f1f55483a3f0ff81c6950f9361eef8b9d6365318e33ad83bcddc9103b7b95d496f3eb8144c549372b73d1f711ee36536ee648ced667809
 DIST texlive-module-babel-estonian.doc-2017.tar.xz 91472 BLAKE2B d5839bbdc3b0f9e1fd01173e935e7d5be9dbb64af5805f13259fc0fe47274429109a42014a483373b84ab9fddeca634c722029ea63299a5b4106a9e8df11fa92 SHA512 fcfa6378019550d842f1f55483a3f0ff81c6950f9361eef8b9d6365318e33ad83bcddc9103b7b95d496f3eb8144c549372b73d1f711ee36536ee648ced667809
-DIST texlive-module-babel-estonian.source-2013.tar.xz 6884 BLAKE2B 081ba9bdeffd092121eaeaa01e7ad19194683304cf9c74d99cde8b4237d238102bc963686b22844426174dde4d977dce929c2c819dbeda274092a4401fc6c76c SHA512 92486096686ad6d17d054f975556eba1c4d8097d62a4371cd5f8e057dbacf6e76309ec5f2fb4294a02832ad15fb3fc0eadb4fcf9ac21884dbbeb4f060340dd8c
-DIST texlive-module-babel-estonian.source-2014.tar.xz 8880 BLAKE2B 3e19edf9ddbc2bb069a3c3bb95b1dcaf39aef92cc81070f0efa8431555290ea90ede2aad151ba74dc193956b732412bd955db6c62221c20d3843c0efbb95bd45 SHA512 dba69965ef8590bb5255998baf00fa18abfcdb4174adce449983eab3ba2405853153e5cce6f847b668a05305f7ac932975246e2b17c9fa76cdb0de4446289085
-DIST texlive-module-babel-estonian.source-2015.tar.xz 8880 BLAKE2B 72a300d752c2d763ff55e7444607c783a5f6d65d634abe5e5467d01c2d30e7210c721414fa1a52e1bdb7ed6a67aa8614ffa0b36d759afd343f3f92fa6f92bef6 SHA512 426172ee0fba90c10645c70d474256d3c82c8d09819cf3f85c415701b125bbae293151a14ba3febece9a45a825ab0785dfb7a964d4c3e4994efa11c0bb5c3bbe
-DIST texlive-module-babel-estonian.source-2016.tar.xz 9136 BLAKE2B 895ddcbb1c1891c44a39d8349c76d7f8707f4bbfc467c406a21c1f13f58f030907aaee988a8482a5786e3d4277049981e3e23d83393c29252cb30b77d26ab715 SHA512 ce9d8a7806a4e87b3fc75f443c2bcbf4e910166e1f2f15f7df9fee58d6e39cc1f18ee110369c531fdd9f5b5737f9ae9b61f4c507f4d8b75f7ea4a92cac2bc1f5
 DIST texlive-module-babel-estonian.source-2017.tar.xz 9124 BLAKE2B f3dd6b6602922d6de789d73b122de0be29f5bc91789d6dfefb4ee5f29b0a63be7f139b01dc7596e0c14680203f0c0da7c5fbdac2da68d2d0112e434ef06253be SHA512 fe55efda570e235f198f0e95cf97d097752b2988b40d8a82b8d060120a3c6b51553c5e66e78c03c11652fe8b446e314518147ac8fd02a72127e51edb6774f4a6
-DIST texlive-module-babel-finnish-2013.tar.xz 2352 BLAKE2B a5d8b2bcd9c67f5d88b33907fb59d1c1f45f84ac4018fe028b1f843b31bf2d7f2d8f80b9a81e84744053323253222bf2dd5811aacd6a077af346ee358ec7a0a9 SHA512 7584aabc69dc6a528faaa78299e855341a4d420aef9ef96155e6c99024b41c22f45fb1f6a534bdef03dc2c2600575fd409c994d164a4357ab35b7de73c966399
-DIST texlive-module-babel-finnish-2014.tar.xz 2352 BLAKE2B ba5b78cabe4792cec1e8113d7f5cb7f5e0ab04da7fb03a7244c220b3a7336473fac3ea3e15f1534b4a6e8925360c3b0ae756dfd35596a2f581363d6375f98f9d SHA512 d31a49583059c215f66454eb6f97cce83713fc927a008ca29803a012da95c007eb486479c241422cfedd539ae47c587e0ed1b8c1b69c0997922b1421b31affab
-DIST texlive-module-babel-finnish-2015.tar.xz 2352 BLAKE2B 0d5432b2faceb1732774638e01b1813707e78f0caca2b933e99d4fdce41de87f859bd8331644de0b12ae3737fd51c8ab43840a9e784e8baca22b6cc627acc07d SHA512 097e5977f5768b1a959c6a970df185eea9fe2c9759975671294c0252b967efe8ddbe784b79de6f00566a7cdfe4ad433cc5ae72a26591517e3818db80324f8972
-DIST texlive-module-babel-finnish-2016.tar.xz 2352 BLAKE2B 2a17cccc1e6e7e2925503d66dd84f8466e05e4a9ebb5bb314e5daaf9d78cee178b14f72749d1d2551d7f040d0287a3b248f85e5f505d001d0d3741a78258b6ca SHA512 c6615a326b9e610e37c8357fe2780f7bce4334726c93169ed084194f04a71c94a8e5ef3022988aa00a33987daaafb27bbb4bbe8b8b84be8a677882a5ec9f181f
 DIST texlive-module-babel-finnish-2017.tar.xz 2352 BLAKE2B 2a17cccc1e6e7e2925503d66dd84f8466e05e4a9ebb5bb314e5daaf9d78cee178b14f72749d1d2551d7f040d0287a3b248f85e5f505d001d0d3741a78258b6ca SHA512 c6615a326b9e610e37c8357fe2780f7bce4334726c93169ed084194f04a71c94a8e5ef3022988aa00a33987daaafb27bbb4bbe8b8b84be8a677882a5ec9f181f
-DIST texlive-module-babel-finnish.doc-2013.tar.xz 139484 BLAKE2B af21e98c27d9a2b13bf1664342e3ed399f85462de855958d4135c0a93b5a59e5864e3bf87420c92e81e782285a3475877539786294be3e339cb82b9b8461d2bb SHA512 94fdb4c96b3c4e6838dfed61b42872da32baca86b37b1eade6660d083c124dd440219c14930c728935f74f45b1ed6bc90e82c63f225d8ed912d6415a7d2f1016
-DIST texlive-module-babel-finnish.doc-2014.tar.xz 139484 BLAKE2B aa72a1c8601b2b2fe926240b0fdbbd4fc2c5624c34a515ad8e7ba8efee86275f248fd8b9b74ee7703264315f2c9fe4ee09b85b931c1b1b448d87f331f6b79a9a SHA512 3aa23710905643773caa264a977a6a74675dae426692f671063f192e408bd93b1942c2c500eeec2fd977240612865109db30887187507623a1299e9904ae8ba3
-DIST texlive-module-babel-finnish.doc-2015.tar.xz 139484 BLAKE2B 2aaf77a8c31975c56fb8a160c8d6720b99514d487dbfacf2b7b9e9f7a44bf0e2f81b444c9a94c0a1ff83acde17b6cdad66a0e655569b498618dc6bad2eb2e2fe SHA512 1081a7151dca049b5bfb71b738fad99e5f624f4ab20dc35b796699626eff8f9adc7063ac458e38bcd5a18ffe4dd2d80b48ac755e4f1dfa5e76f3a596cb777355
-DIST texlive-module-babel-finnish.doc-2016.tar.xz 139484 BLAKE2B 3f9bf315184f28135a6968b3e468f3bb121c8c40a504eb2c0ea00d509a1f361297b2edc9dd48eabbb977c1e67a159c9b93e01ad39c75e92e43b9c3ed49dc3e5a SHA512 409ad11151c08ea27138c921fefea616d1979dc8b9dfa415e6d744880903c3603f8ca6d9aae6e4a9fb319190560a890e524b9af12efad1ea73f745a15de9f3da
 DIST texlive-module-babel-finnish.doc-2017.tar.xz 139484 BLAKE2B 3f9bf315184f28135a6968b3e468f3bb121c8c40a504eb2c0ea00d509a1f361297b2edc9dd48eabbb977c1e67a159c9b93e01ad39c75e92e43b9c3ed49dc3e5a SHA512 409ad11151c08ea27138c921fefea616d1979dc8b9dfa415e6d744880903c3603f8ca6d9aae6e4a9fb319190560a890e524b9af12efad1ea73f745a15de9f3da
-DIST texlive-module-babel-finnish.source-2013.tar.xz 6128 BLAKE2B 4b675d367ac186d43fd37afc214640133eac33c74fd44925cc73dcece4be79729e52182926fd85e036190ee5bc9beb01fe430395199278286dfb86af154c4c3f SHA512 a94de9501ab9338ea7a62c0757d6bf33484a9b7b8f4052082f315721e72e925d53fb206184c71b0ec069f8f24486b10a467f0264581501469d2cad02e3fdef10
-DIST texlive-module-babel-finnish.source-2014.tar.xz 6128 BLAKE2B e18b80f5545c5798265c2b8090c3eed8e56d2ef0750353cbdc36c12c70ff9cffb987344a6405ee6065d7c26b82700b4c3c3f3d7212a30b9b075dafbf18156058 SHA512 7e319efd443bd0827de9efe80c271475bed2a8d3c0fd4e280c160e267d62a48911113aef007931369cf2b3cc6038dd9ae58bc4a7fb1565aa5e3633f161a13aa9
-DIST texlive-module-babel-finnish.source-2015.tar.xz 6128 BLAKE2B d52008a40f1209eac1b974d65c6e4b014e11ac0679f86f3f9ff54b5fb652ae7d85e61ba304d6954d32ef25f79852d4416b5d422699490f0ef203dd6459055941 SHA512 6c488ea9be027dfea0b1d8f6314fd97602b5fc31da9cd23f5b40d839a4816c0f964d491b8d3cfb7528e77e4cd63491d1f6f266902b3fac454492ffbdf4378133
-DIST texlive-module-babel-finnish.source-2016.tar.xz 6132 BLAKE2B 0181ff89e1a9b465414573a811f6c504e423bec618cdd0b08966911e98eaab85233c4b650c292483c7ed320d7c0228413b2cc22f373eeb95195bc7f4929819d9 SHA512 8483e65af40be57abf9fa84e996fceb140b5e34c3025d7d3563751bf1d3011a73f1aba106627bbb8395b3b67455bbd454c70c650758b4e2c1e30591126d52ed1
 DIST texlive-module-babel-finnish.source-2017.tar.xz 6132 BLAKE2B 0181ff89e1a9b465414573a811f6c504e423bec618cdd0b08966911e98eaab85233c4b650c292483c7ed320d7c0228413b2cc22f373eeb95195bc7f4929819d9 SHA512 8483e65af40be57abf9fa84e996fceb140b5e34c3025d7d3563751bf1d3011a73f1aba106627bbb8395b3b67455bbd454c70c650758b4e2c1e30591126d52ed1
-DIST texlive-module-babel-friulan-2013.tar.xz 1644 BLAKE2B 85858303c98f2895308053a34a3519b6c0fa13e7923b74a84c8adba5fbde8989d4e421c3ef7e5713347b5ed597d8d735bc22a0776d029db9dfe6daed265a369e SHA512 619fd103dce1a36df21fb28cd6683213bfaed7ec68422dbb0f259b2274955a8b8477d9fedf788417c45ae56881d0c8e2f2a2aa6894bcd958dd28377b73907a7d
-DIST texlive-module-babel-friulan-2014.tar.xz 1644 BLAKE2B 67ed44fdce5307bc331eccf4f710a07278daa71442104d7c84ca54bc92474704225f6af4d1c041c384c244e50e0cc3c2bea935c724a7a61da6c2f41a6b888ed2 SHA512 5d5277c74d0535de54145902ed93b75f029fefdd01a5bb768ecb3fb32adf6e9afd0624bad79a3de2f7eb91a649654fd11825446bb733ef7214219b2ac3549067
-DIST texlive-module-babel-friulan-2015.tar.xz 1644 BLAKE2B 428c020a561228e186fdbd4e0174ef7cfe70cb3a1f76364b5cc0cbc08814615fce351f92e9a7df6cd7f543660ccb7849ad175a387206fe8e40a584688e79a924 SHA512 573fdfc748085a1783f5125a3f3e7b69f6a52019cd5d755aa04f1c28d09789131cb9431fde4f9c94923962700149a68bb136794cb651cba5a3f72e4017e18250
-DIST texlive-module-babel-friulan-2016.tar.xz 1576 BLAKE2B 981f4885881ca53ca3d3eafe3315333a2a83d8d61b213b51939d7fb7584dd938ff157e50e260be6985f885a7fe9320e450680495641ee3860d71f0d9d7e2749e SHA512 248a15bda269eee791945df1664ac668dc37b7cc52e1d59b264f447f2fdd531cc72279e1d4a95a7dbffabf2579aafda8d4b3ec3ef39865248a0349590bb906ed
 DIST texlive-module-babel-friulan-2017.tar.xz 1576 BLAKE2B 981f4885881ca53ca3d3eafe3315333a2a83d8d61b213b51939d7fb7584dd938ff157e50e260be6985f885a7fe9320e450680495641ee3860d71f0d9d7e2749e SHA512 248a15bda269eee791945df1664ac668dc37b7cc52e1d59b264f447f2fdd531cc72279e1d4a95a7dbffabf2579aafda8d4b3ec3ef39865248a0349590bb906ed
-DIST texlive-module-babel-friulan.doc-2013.tar.xz 123100 BLAKE2B 6e122f724c775d5742c7238efcb88d2f1cb6c040ed67ad6a647e278fa85d7563d8dd7755dddefdd835ad979b21bb711b839e27d75277bc4a38d46fda2f70a1ff SHA512 51a028627ee3af527fc06bca18a1819d4dc5fc66728505bd339c8b907516ef732af83587449b1e4b8908409aa303e6c08ecd088c1b6e3431c7cfdd82903eb30d
-DIST texlive-module-babel-friulan.doc-2014.tar.xz 123100 BLAKE2B f47338498584acaf043fb166cff0ebc54fd2d465529a2b09f7905177561a0358ab5325169849e92567db5fa2ac2dc6e89978a294c9751988313d74f22c1b1256 SHA512 40a602b81c0b6ff08858852a79a5e23d95b07bbed2f0f90b1aab6241ac80628cb5ba0845750b466149249413457a1eb4c400aff6a30b35bf3cd05f4e09be62e6
-DIST texlive-module-babel-friulan.doc-2015.tar.xz 123100 BLAKE2B 0470597e1895f412f02c7c8c13a46bbd982412858fdfa2559dc2ac849bcc548675dc4b8074c7cfe24107fef8f9bc248b02de8491b0b64842b640d167a9f4b860 SHA512 a35ea76253a47c75f26dd5fd0b760da7e6529e039e83a0ef33ee294e8a0056e8a93b6b7d4d1014e8e2f8b4ae9cc8122961f732592c904d02bf9cb0bbfa3e0bb7
-DIST texlive-module-babel-friulan.doc-2016.tar.xz 138624 BLAKE2B 609bdb12fb9994cda4a5060355b14d5cb9c08ecb18c5b76c1e0403bbd0a853c19b6478dc499dfba0f8e63020f862c5f23588af29dcd61818ad03ab6e06d28930 SHA512 cbf5c1b8ac9c6dd716f9a54ddacf22a81f83bd3bb2ade321a01d4222771b89445445119133b404606ec759d82007663f19c22ea35d6a3f997a296190e49e470b
 DIST texlive-module-babel-friulan.doc-2017.tar.xz 138624 BLAKE2B 609bdb12fb9994cda4a5060355b14d5cb9c08ecb18c5b76c1e0403bbd0a853c19b6478dc499dfba0f8e63020f862c5f23588af29dcd61818ad03ab6e06d28930 SHA512 cbf5c1b8ac9c6dd716f9a54ddacf22a81f83bd3bb2ade321a01d4222771b89445445119133b404606ec759d82007663f19c22ea35d6a3f997a296190e49e470b
-DIST texlive-module-babel-friulan.source-2013.tar.xz 3740 BLAKE2B 27ad83a3226df2382780c572d075a0e49f5d7491c97f95cc1823a1f0cdcca711f7a0eaa84e1064fb3eaf0131817d925bac3d149d4d370a174bf2631acb1f3f4f SHA512 1c805e1b0407b0a89b909625ac40bbb4b9d31a161ea19c32070afc59619337a5d9feab1ec4f8e1492f64cfaa648d6e09a1c9f93dad2b6af6a868d324f5dc8c72
-DIST texlive-module-babel-friulan.source-2014.tar.xz 3744 BLAKE2B 750b21144ba94bf1f1885fa21d937a317c487fedcfb3738e96bacceefee2684abb0ad635eb8a7e1921c815cdea1e12d524de7428040df8092f78ac7f635741f9 SHA512 d9c5a67acd0294989a413b82625466a51ac973cafd58630f6e5574b81c3dc7e1956d926e53ada89959b8abf77de28e2744fcac34e0207c0ca7d9fc1aa0398649
-DIST texlive-module-babel-friulan.source-2015.tar.xz 3744 BLAKE2B cfca164300cb7eef9d8f40fcd7a41dda85857261a58c64b6993289b12c76dfd857dc673c890f56c9866376d39ccafaf276a669d6c305828721f9d042afb90522 SHA512 11d3cec096ae9158788667de7299c0c651e961c3fe31541749a843225a1d8f7b49d48ca4298f1419c95c42fd1788270edf9d52f0012def342f714005813e664e
-DIST texlive-module-babel-friulan.source-2016.tar.xz 3456 BLAKE2B d15a55916bdd22d0d5b11f3cec6cce5b09cabf4546afe5d041def32857a98f9eca838f8d9ab28214d2a87a46e4bbe7b6aa363cd814ad7c37d772ea43e8df214d SHA512 1570c7f3b99b3dc6a67e76a4253efa0d8e88ff454b9ba0b03cebe54e2425824248b13b15507b6f9b535e337576f925f71c2549696807362dcd2a6739c0f100ff
 DIST texlive-module-babel-friulan.source-2017.tar.xz 3456 BLAKE2B 6dc09da2a7bd73661a47f68b510d872e9ec2d4e6a10bacdef8dd1bac64ed603422f43812e9951fc6fb88f4a9a944ecf64f9a9b17bc4921f8de92185c99eec102 SHA512 be4e2a5d231b41873fc1e5519ab7d23a60322a3de9d9ff53e7fad4699dc124ca25e55a30dce01791d1e266e10b36703c079b7c8e5807ba87c5d52549af1766ae
-DIST texlive-module-babel-hungarian-2013.tar.xz 53632 BLAKE2B ae750f3615c2d41043353b9b7dadfc447938824cbc1176726227952834124bf3554226f691b3168a691fd31fc47f32d103791306f762a9fa59e5f5eaa2277556 SHA512 31a79692a8695a543519270f670c5ffd8420faafe3c220005558fe076d95722d1261b1c172c320ef47671fb539d2ddefcf398755d68b2f0fb741d261c77ee25c
-DIST texlive-module-babel-hungarian-2014.tar.xz 53848 BLAKE2B 455d5637539d4a61a86b25a3af23f1dfa8d39dc8e215784aede3737cdf8a4a336fc86a2eebeedbb8cc3c5d9c0c7df5eefd56acdde7bb133339f5d5efbbb177eb SHA512 8de58c4b98835e1d0729e80c7b8909c4ec527211e471048efcd88331cd6266d01bc3ad6eaf25836d921fee0e70cf224e306daacdbd91879e92cf3499a7197b47
-DIST texlive-module-babel-hungarian-2015.tar.xz 53856 BLAKE2B fc02d41c2f9a5c5072671e91fb8c025997fcfc7078c5a174ccb9535d6be701d093f25393717ddeffaa14be1f1bcd681ce59d7a74f5b20b106528d2d1a7942c48 SHA512 1d5fc182b17dae1887820aaedd9e4c922b528369b93d279ce3a9f1cc086526da3a19c3d2a6d0f1cda72a39280714a8a2afad6befa464a1460e811707ebd1ebe6
-DIST texlive-module-babel-hungarian-2016.tar.xz 53896 BLAKE2B 637c02e932f0830a025262aed9395f7c5c2c8a56d75e5acf48905615ebb554fd8bd860a5056d21f8c047adc0520eb5e11a6fbc7e7b0741835b01267325d5314d SHA512 5c3ed4d720676bf71adbe0c7928161aedf10a8770475143daa2182ab35ead36ad3c8c216ffa5e6c9d0d16ea8da80db12d6f979fe67e9ee35eb09fadef86099a2
 DIST texlive-module-babel-hungarian-2017.tar.xz 53896 BLAKE2B 637c02e932f0830a025262aed9395f7c5c2c8a56d75e5acf48905615ebb554fd8bd860a5056d21f8c047adc0520eb5e11a6fbc7e7b0741835b01267325d5314d SHA512 5c3ed4d720676bf71adbe0c7928161aedf10a8770475143daa2182ab35ead36ad3c8c216ffa5e6c9d0d16ea8da80db12d6f979fe67e9ee35eb09fadef86099a2
-DIST texlive-module-babel-hungarian.doc-2014.tar.xz 664 BLAKE2B 688647f006877100ba64dbcc58c72da29d814de7c1b3c81c1965f01d213cc783182845513abc1a1ac7e49034cd599c12127d1b647f1accce8359ba0291323ddf SHA512 7eafecea52b518591cfc6f319cd34887d6f6e26ace190babb2a0b2431cc61830dedc1c947541c37fbd0b0c5cb04f1d461f1ef273d8e3ecd6f932f5cecfa3fb32
-DIST texlive-module-babel-hungarian.doc-2015.tar.xz 672 BLAKE2B 68f364df41f6f270065da57ae14526564eeaf79e8fd2ce83bc8dcf5ff7e02c6282e98f659b2631484ba749a07212d11875fc114f4f21224fe6558d79ac4f3ba4 SHA512 ee5f805628f1baa78234e8fbe4bc55def517c6a5942a52f02bd862878635e201796b79716f6266238fa09c8a262aaf499cc19b010971ebd39b6ea058a3e9d870
-DIST texlive-module-babel-hungarian.doc-2016.tar.xz 668 BLAKE2B 887294df6ec54a793e59b1fda6515867091f40f9e5b5d9d1e37a063542e0c82d7a85150e17ffffe60e280cbb30fe1fcdaf5833c3aa17d97109c51809edfd8e12 SHA512 d4650ed324b4cc7abddee03b3344e2c166486bc1a25f6cb817398bcc0704f571e362d46abefad5ba681f9a9503be6c83d022176c45e72da9b2dfc9816f55757f
 DIST texlive-module-babel-hungarian.doc-2017.tar.xz 668 BLAKE2B 887294df6ec54a793e59b1fda6515867091f40f9e5b5d9d1e37a063542e0c82d7a85150e17ffffe60e280cbb30fe1fcdaf5833c3aa17d97109c51809edfd8e12 SHA512 d4650ed324b4cc7abddee03b3344e2c166486bc1a25f6cb817398bcc0704f571e362d46abefad5ba681f9a9503be6c83d022176c45e72da9b2dfc9816f55757f
-DIST texlive-module-babel-icelandic-2013.tar.xz 3452 BLAKE2B ca4684a0b4e955a10acf7e4e13dc6f67716d7d2d271b629bd13e9fe8f24e6875d369575ae09e4f9d3ed5c662f0d0cf80137e894dd525509eef66b63555883161 SHA512 2d4aa9d847d746bb5bbffde178105470afa35c40e9310c3af102749b782b3aabc66090128bdc90c893eaac4d0fe60b84c7b641feba91d56cc0e838d146b98a1b
-DIST texlive-module-babel-icelandic-2014.tar.xz 3624 BLAKE2B d6dba37ba170dad7d247749b3dcc97ab7c1f33ed077a81f52d00a802843b43e4f3b64ba70d5485fd41a3bb718b0a2555d5cf33144c0a4b0e1b65b82b784193f0 SHA512 cc4920688605ebd979e5b10b2e70ec6662d918013f9b8d9d8aa0d764841026a3fc7cd93b8068178396641f84f80eff161ba44d12eddc2d3ab460fc6260cc7e07
-DIST texlive-module-babel-icelandic-2015.tar.xz 3624 BLAKE2B f988b993c046ce3b080250dd16bf0f29a4955a3bb46f61be240c8390dd9f598701f08e22fa37ac7530f4de8868cf950dc4edd9775a8480e6bb3564ffb97f903a SHA512 b39602b449789aa5c0dac7f4bd7592df6f7af844c47163f6a01e6b4236ab0dd388180df6724002caa72c3289aca5cb6c3f220ccfc058b2ae708c2a4ac38ccdce
-DIST texlive-module-babel-icelandic-2016.tar.xz 4236 BLAKE2B 4b9ae9dd03d47a5782c677b00644dec5bd25da8f1b993e2c6ee0a0ce57d12456cf61fd80477b4eada5de255f7305367407155ea0ee3ec59f3ee408264f5a1d59 SHA512 2055686c01d6ba04581e9d18d0a23f5a8d129e38c3da73b4ef2b0f8959fc844592a3e6fb8155d28e6ba2f19231ee019884e03354b08c44e693a893d3a30f94b9
 DIST texlive-module-babel-icelandic-2017.tar.xz 4236 BLAKE2B 4b9ae9dd03d47a5782c677b00644dec5bd25da8f1b993e2c6ee0a0ce57d12456cf61fd80477b4eada5de255f7305367407155ea0ee3ec59f3ee408264f5a1d59 SHA512 2055686c01d6ba04581e9d18d0a23f5a8d129e38c3da73b4ef2b0f8959fc844592a3e6fb8155d28e6ba2f19231ee019884e03354b08c44e693a893d3a30f94b9
-DIST texlive-module-babel-icelandic.doc-2013.tar.xz 277760 BLAKE2B 450a5e557212ff7392c8cb1308f366201d2955ad34a347e2f8aa083484e85c4f6852246cd0ee065459e71c7e3e6a075ae825a03de3ddb688ab4cf7481da75850 SHA512 36320b8db5cb7576d1096c01cb301bd56377e93496467dfa48e7f3fc4106bd7fd84ac3a7d34a053661d01720fc47b6f6d8145937af72bf87a5d4581f3ae53d73
-DIST texlive-module-babel-icelandic.doc-2014.tar.xz 277760 BLAKE2B 17ef1ccd14b66982d9472287124a81aeec93941190958e8f518fe77ac1c3bf2ec1da78eed012d9a4d1338744404a22103d36e9cf061cb3a65d6feb0f67852e05 SHA512 0403ff8d9535d826005ec765a1d4a2132d34b6e7c784d56896e328983d971d9ee80743402a0186f006f609a904be8889310df9e62c92514f55549c9e3f54449f
-DIST texlive-module-babel-icelandic.doc-2015.tar.xz 277760 BLAKE2B aa9e8db0467f629dd93a7e53fcbaf7351e736e455d79a738f6bd841e1d86a35de43ba8a3ff532507165dadb47830db6c5051a05c560fed2f154f2bb17f09b443 SHA512 e13a21394b2fabb77f4109ca4154dee4794dfa83781e36b7dec31e57987f083a5465659324b91d68c6a48533fa9b30638b5182551464902e4f1f92e48c88b8fd
-DIST texlive-module-babel-icelandic.doc-2016.tar.xz 316500 BLAKE2B 87eee487ae4ad050825bc6cc7c945f6ae8884957ca6096525da41d62973fe90e8a1950aaf69c38ae9cead4c428abc47b4823b8d5ae8c31c2f72128b47686a9eb SHA512 8fd9f643c672195e5369bfa53b29643cec4ddd24809239ecea4eb8bb10107945ddfbb31c9892a7bd463e9c1c6a52b27da349daf16522cd6359e9c9f60055570e
 DIST texlive-module-babel-icelandic.doc-2017.tar.xz 316500 BLAKE2B 87eee487ae4ad050825bc6cc7c945f6ae8884957ca6096525da41d62973fe90e8a1950aaf69c38ae9cead4c428abc47b4823b8d5ae8c31c2f72128b47686a9eb SHA512 8fd9f643c672195e5369bfa53b29643cec4ddd24809239ecea4eb8bb10107945ddfbb31c9892a7bd463e9c1c6a52b27da349daf16522cd6359e9c9f60055570e
-DIST texlive-module-babel-icelandic.source-2013.tar.xz 9524 BLAKE2B 9eee3ed1d3d09801a5974d7b1227bcead369a541aa86a18dde96c14d8210e572c488c4f764f199e08cb9097866162dedf8c38ddc938c98deab563e00460bb865 SHA512 c13a018e7083c8c40769905f7d4f6a7b8a2291c47de6e9c51f5f02d41c08a749da1c28c1711714164a1521f2314a4dda7419fe1d589fb8924bf59ac2fd7a05bf
-DIST texlive-module-babel-icelandic.source-2014.tar.xz 9524 BLAKE2B 1612d41cc35dffaef79716ba28e3358bf0dd0b93f94487526e0178942e9971d22b93f4fbfed9d4c030462517be1488848b5ed15cc449bb298c992057ae19452a SHA512 1405ffbfd29a31b973d522aa08a068fde6e9ef95534be2102e5e94d2f71bb1bbc2d63a101da41d9fed52d1c4f5349d50dfb02bc2224a5dd95a07cf96a21718e3
-DIST texlive-module-babel-icelandic.source-2015.tar.xz 9524 BLAKE2B 5ac833f185fdcc863aba78b269471735ce08680ab942a3275ed7e158b7130b06b169f99e96ee864e5fbee4424dc87190b518573e9cb48640ab889f989c7b0628 SHA512 e44018c3d8904182a1711550d7ac6c8e90be8dbf11a2b3703f9b3b8b8e902c2f182bfb355a1d87b9568a7ebdb686eb00f814a6d7b8ffe6669dc3cbab8da4e612
-DIST texlive-module-babel-icelandic.source-2016.tar.xz 10988 BLAKE2B 01d8aaffa8aa86120f450ad66bfd977a3876ea8053dcf3d193b8b5b03f9ea21b30482fae1433a2280732a97c52ec060da5ad956fd788bd2e1fd80692bccaaa2e SHA512 5081ca86a43308449929b552a54df880f350ef4c2d69a18ae43566fbf2174858c12cca6d7ec942b47969772463efc6278f1c346d85de4cead32537aaa924cc60
 DIST texlive-module-babel-icelandic.source-2017.tar.xz 10988 BLAKE2B 01d8aaffa8aa86120f450ad66bfd977a3876ea8053dcf3d193b8b5b03f9ea21b30482fae1433a2280732a97c52ec060da5ad956fd788bd2e1fd80692bccaaa2e SHA512 5081ca86a43308449929b552a54df880f350ef4c2d69a18ae43566fbf2174858c12cca6d7ec942b47969772463efc6278f1c346d85de4cead32537aaa924cc60
-DIST texlive-module-babel-irish-2013.tar.xz 2084 BLAKE2B 0c32fa7c37191f1f11e292ad2ac2c2e1d84baa8fdf7621d914304e4c6e66bbf0a2075dcad9eb774e20a08f2455e2ad45a06a096fde7fd13738715e0da108acd9 SHA512 f8e081ac738244ea32ff700b615fed873d1256499225889ad64e2c6b88b4ff4db6153ad5c6ecd208ec36e097ecf3b64ace79e791b34a58f064575f08fbef7c6d
-DIST texlive-module-babel-irish-2014.tar.xz 2260 BLAKE2B 7bf052b475ac6ffac7a8b57742cd3ba5f217f9d3ad36491bd5095e7e9dd28d31f64f28155e79af681fded3348cb20339d418087babb65655d26627421e1217f4 SHA512 4e52c93156499893e81b521a7c47b555db8ff3202d227543b672779aba3b875987b8ab00cefc6bf280d343581337f9d3c9bb21de278f1acc86ec8a417b82ac37
-DIST texlive-module-babel-irish-2015.tar.xz 2260 BLAKE2B 8593bcaa18c9ef3c7fb44a3bf1fedb46de38e0c83a53829d647d940ca67958c74b44e4a0321f50c5a3af2fb939f9b58f2a216776287843c124d9a82f50ff5b21 SHA512 69f0cac01284c22a5110fe3f6246d9e5cab5c01c5ac63443331aabc1edfe42988e3ab3c71f1ab096de1614799c91425f69de2264bfbaf4d67409eaaa6a1741cc
-DIST texlive-module-babel-irish-2016.tar.xz 2276 BLAKE2B d1d60896b1cc06cf7c82738578b3abc39095dcb9985c6b73422886e9c816723c4cab06ed031a5212b18fdeed05ead100e063b999d4f47014c96d4a0b5d6ef5ac SHA512 12f7accf634f29494051993b3e628de718483316756dcc87c376fb00f525c41d29c724637755e4bf5b0ccda81e4afba244a041f7a1ac790364162c811c52155e
 DIST texlive-module-babel-irish-2017.tar.xz 2276 BLAKE2B d1d60896b1cc06cf7c82738578b3abc39095dcb9985c6b73422886e9c816723c4cab06ed031a5212b18fdeed05ead100e063b999d4f47014c96d4a0b5d6ef5ac SHA512 12f7accf634f29494051993b3e628de718483316756dcc87c376fb00f525c41d29c724637755e4bf5b0ccda81e4afba244a041f7a1ac790364162c811c52155e
-DIST texlive-module-babel-irish.doc-2013.tar.xz 110180 BLAKE2B 127b62afd7c72d21a1e284a7da5a4f0c6cf3cd672f4075149360c9c9b280dd102f055ae5c58719a9c50558dea343eede2fd850e16262d62ce3f352cc95f87460 SHA512 d8380431116a439813016fe5e95f6ab256a74c83e01152e02c4defe5268cb0a3b6295914d367fb93348f0f7fa035373266f51a737f156ccb3da9b31ff1f12860
-DIST texlive-module-babel-irish.doc-2014.tar.xz 110180 BLAKE2B ce83a455e068a4536419f916306ec138cd2f397fc651303c38dc8dd16171f383c8a6641c29f8f26ddad794a654e5f68e01a7f2f20b700edeef3df0bd333f9174 SHA512 2c1635f2ef3052a1da37cb1720a646dedddf7733b9f18d0140bce358845c12b4314afb3f46910417133e246e2c752e0e1c18721820caac2b0095e37434914df2
-DIST texlive-module-babel-irish.doc-2015.tar.xz 110180 BLAKE2B bfa4499105c9653fe188d1ece81a74ea882861942a206afe8f0645f936297c1b3b4efa47cbfa20e4fb22201857ff5217656c540a011f34e886991d7dbb7c3fc1 SHA512 2c7b4020c562942dbc70c0847000aa3f6165c76d127297408f5da292d44d5d2ed60ad008fadb70bd5d963b76a0a0fcc30f2d72fb5753dd8e4853e6fb6eabf71b
-DIST texlive-module-babel-irish.doc-2016.tar.xz 110180 BLAKE2B c4c3efae457889e9b833a1456cbf70b9642a1748b857e9b600ad58ca4b961aedfbb1154489e6d88c441b6b512819e672fd277b356f1e0bfcc0fa7501670a2c69 SHA512 bee6e4f2cfcd7b33afc0e072fed85b4fa01ddc13fe506bc7e4d4e3ea7112087d0d46dc1bd1361b953c7a1adbd94edfe2ef1cbf8b29a2d2210ceccec60a5df70c
 DIST texlive-module-babel-irish.doc-2017.tar.xz 110188 BLAKE2B d91b076173ac54c40bbad36b9866fe3757df65bc65a177ed9c499502eb2a792e038942e37506d73e47653426d9484b4449949f6943ed8929a12086c6b42826a4 SHA512 9a0bc220deb1b8f91c812d1cbeb58a4b4b47532029772aab43a3957fd718bfb46267e0b94bbfd1894f442b8ecd9b097ab1b63ab2579add3766dcb6c5d90689be
-DIST texlive-module-babel-irish.source-2013.tar.xz 4248 BLAKE2B 74889336710bdde2016cbb2ae2f8e758809baa8a9422c10933c08dfaafa801bba3adc99d30b814c8cf2761b5031f1be74c8e6e4e05bd9a3459d6a0fab559700d SHA512 555575d7a01a73d302a4651907328e64cd82446c246621539dc50b06f66446cd33fbf763d9ce542126fb22c5557ca0d22feea0441876899a09b2552f2357c8ac
-DIST texlive-module-babel-irish.source-2014.tar.xz 4252 BLAKE2B cf318db3c3326dcb266a3153272ce26aa59f15e15df075f48c2d311ddfebc8c2f550cba0530aff00e9e5535106f82c5c56d13b963816693874d71b26aa117df1 SHA512 a37358ae2146cfd170198c6b3b0f765f6ad7f13a263966ab810b776570018d0bd65507d8dc93fa87d1910c3fcc1d566bfd60c8a6f22c7b61203cb63ec9852db7
-DIST texlive-module-babel-irish.source-2015.tar.xz 4252 BLAKE2B a835bf45a93f1223e5a35c04b4c84c553d8713008117ae55a26e5aaac0572b087e01cd11b7d4e6c13915173bc8b2ac78c17fada3ad31f6a1ea7b99aa837d3d6b SHA512 65c3cfb5f7c8f3d1227659bbbe4051734c218480b09e67ec08cabcdfaa1994b80837d4087e0384dbb206b4da8f0178a22d57f187dec0b4bfc8649e9372107b28
-DIST texlive-module-babel-irish.source-2016.tar.xz 4248 BLAKE2B 1ed7c8bf527847c9e4d542b1ff7f8093ea5c6e04ead96a484debcb47f14982dab1afd7f508a2f41c2d622a0eab127f61275d991ca6e4ce947e57aa248fead0cb SHA512 da20f8789ef9907282c21682fc84675557ec3c894530586f91330ff04c9de37c88d3f38021b1ad15c080c3df167f0dfd4c41fa3bd84b48b6720b8b6330e19d8e
 DIST texlive-module-babel-irish.source-2017.tar.xz 4256 BLAKE2B b45d2031cd8a22d019fb74a6f9b69fa2615232831f9c8042e2c2465e1033e2f3632c8eb8f51b5df19d1a33dfd1fd2a75c82affa47f7b80ccf636fe2a45b78399 SHA512 5f80f69bfeb9e2e531c3d2368839b85f43a06ac553ffb989a8c8825b3abfa5d822b995fcb1a69f267f46dc8bb90249c54d491e6264e3dccb2d8a1d2345f2df7e
-DIST texlive-module-babel-kurmanji-2013.tar.xz 2628 BLAKE2B 5c0b2885a14e3ba8ab7196dafadaee15e3eaab15b724671698de7bd23260aaa3c11836e2cce2f30e8c72101eaa0f1b95fc4e1d6b7b79c17c6cc668d1fea41dae SHA512 90f0e914f27e0c401a526baea3afc083113fc72f921bfabcfd1a056542320369b604eed575934169b0561c61fc12e05a9db1ff34de21b7effa97ac3780eedae0
-DIST texlive-module-babel-kurmanji-2014.tar.xz 2908 BLAKE2B 17ab197e59fec577da7425a26591b3ae96d6a05aed1844e6f207a5e5b9d850029c0dc0bdfef79a2c7f834d44f783cc505f41d12db932ed96d19de224f2ff7072 SHA512 76e38ff22c1a769728b042ec8ba9d09a4ba6172fc4fc91a55e95c29e334221b57aa13afcaacb31d4d81c552a1ffff73e7d034907b856ba112a08b40785223440
-DIST texlive-module-babel-kurmanji-2015.tar.xz 2904 BLAKE2B 8ff245324fef8e81df36929ddc1d8cd2a8e28e5616e4ab7ae0fb7652630efb4918c54d5a2b1170e7e1a4996e509a3fc5c55f3e155944e1773af82f3ce39107c4 SHA512 c068e04ba24759296676738c73d9947bcb8cd59df93be1f100de4a9baa04e024dcb78edf13f2efff3b1d485422aae71d3df8702d6a608cd6054f826e76f2d199
-DIST texlive-module-babel-kurmanji-2016.tar.xz 2924 BLAKE2B 7f24cf8ad6109f0d01baddf422734d02bd2dd7a78a4b0289ea5b37a1ba7b61e20c05de5a1070a027ad43b9c598dc59e6e098c9a0e10a1cb6eb3027c083cef6db SHA512 cd925a5dab7160f9d01ae120e37e390a43353c9e907428e2609115cde62a322b3ec46ad766cbed601983973da22902c12364af66dd5f2c6345844d30e854053c
 DIST texlive-module-babel-kurmanji-2017.tar.xz 2924 BLAKE2B 7f24cf8ad6109f0d01baddf422734d02bd2dd7a78a4b0289ea5b37a1ba7b61e20c05de5a1070a027ad43b9c598dc59e6e098c9a0e10a1cb6eb3027c083cef6db SHA512 cd925a5dab7160f9d01ae120e37e390a43353c9e907428e2609115cde62a322b3ec46ad766cbed601983973da22902c12364af66dd5f2c6345844d30e854053c
-DIST texlive-module-babel-kurmanji.doc-2013.tar.xz 124796 BLAKE2B 91bd1b740e850e909723e24e995d08c7449f7f51b105fb0cd8dc8be23e68202c6db2e2475c4f665d7c9d619492b8dad7f1b2c2c4ee527cd6d04a7dbd165324a8 SHA512 04868176028a67314b5033bf4d8c6be2a1d728bed79e68bee0800eb3d40b34d5e345121471528725f1ff1e0f1cee264d24970e31da90c1f6db07338d730c2dbf
-DIST texlive-module-babel-kurmanji.doc-2014.tar.xz 124796 BLAKE2B 98cb2f892c9146c8eacefe47bf0a6a700d191c3b77f7481dbc8d10152f8e6f76035c9d67af2f3a380eb3490d566186c1583b9975724e57ac72096ce632127812 SHA512 ef82e61722be4751fcb3d0655db707b366b879d7cb1fd09872066e5a199c636e121819860118d8e9075bbaa7c487ea18db8fdcb973711baa3a6fd93d28f1e8c5
-DIST texlive-module-babel-kurmanji.doc-2015.tar.xz 124796 BLAKE2B 995b817b7cc5582fb3fb26c019e2ac822e878f0ae36c68060f606909b6f1ccf5911f2a64699442485db8fbe83c31f5269e49a23ae5c75c6bb733b06e1cf4ed5d SHA512 d98771655c05320ab27f968b1220484a318135d2b5edc404af545ecdabbd7e22a98d822e75d661ae95e6ba09b640653fb0596b45792759d2e25d6b4d722c16e1
-DIST texlive-module-babel-kurmanji.doc-2016.tar.xz 124800 BLAKE2B 1a498ca272e6b5f74707935fa0cc68f0c03161363146eb86caf60e3438927c87a8562c6fb967a399b898b1cc5a77ea9561a09aada6c448f0f13c81ac013b059f SHA512 c4b372a7b336dce7c794b1bd75784cc6092db95e60c15cb728ff5046959f2daa838013d7bda3e809b41c9bc8768f754148ebb5bb7b4cf0e98cb0a46ed4280133
 DIST texlive-module-babel-kurmanji.doc-2017.tar.xz 124800 BLAKE2B 1a498ca272e6b5f74707935fa0cc68f0c03161363146eb86caf60e3438927c87a8562c6fb967a399b898b1cc5a77ea9561a09aada6c448f0f13c81ac013b059f SHA512 c4b372a7b336dce7c794b1bd75784cc6092db95e60c15cb728ff5046959f2daa838013d7bda3e809b41c9bc8768f754148ebb5bb7b4cf0e98cb0a46ed4280133
-DIST texlive-module-babel-kurmanji.source-2013.tar.xz 6144 BLAKE2B 8b9b8976f08e5e9e048fa053e4330d40611d6a161e1af478db34f3ca3f0bc89b1a91f8964304fc97c4edcb6a7873971c79d03ef9c4c452a50c53fb1075dacf2f SHA512 1e4a975631c08ee6a94316f18aee0b1132c1237a0cdec7d4d08aa2b22b4eb330feb2cf5fe69161594c79657255c1e40e0e4f89d6518dec18bc74efb644787470
-DIST texlive-module-babel-kurmanji.source-2014.tar.xz 6140 BLAKE2B 715fa6f5aee3120419cc40242e07fb0bcb2fbfcded93b857dc61c0b13578e27aff1d8e436232007f8cb3981afb1c585be6e3bbf1fdb2ee8b99a506fce81848d6 SHA512 1e89d1cb6bc1b564522566ce3f9116303a7f6825f9f9848e833831b5671cefd9f483f15647ff2a4d06ae2af9470e03d3a818d2323f3bd1e0058d7895603fd3d1
-DIST texlive-module-babel-kurmanji.source-2015.tar.xz 6140 BLAKE2B e73b65e6e1e6b2afb13b5328a3eb8daee23f60660acdfda75df36cfc685fa1e1ba79343bdb87b133c24f676386ee505219bd4044bef8a0f1c04985f354fda278 SHA512 c4e444382a11836de81872fce1c65c48af9c5f95bf1088519da3e7f3b8b8bf6fd360e627ace1dab5f23d00010c51febe1138f982e2ffd92d0ce3e7664bc2a3dd
-DIST texlive-module-babel-kurmanji.source-2016.tar.xz 6144 BLAKE2B 586ad752a92d54bf12fd4ab80ae36af3b12b9091bfc28030a2b5ee36082a1370247e2ef55c375e917f9d2dd021d578b077f033882b2536f4de5dfdf37a037409 SHA512 615a0fcc262bb0a3dd4a19c735f40503a1ea9115f51ec1f9d8c106a2fdced16f39f6bd949a5e77c014cabf199bc91ec92efc54af470034c3da88391ccd2d9be5
 DIST texlive-module-babel-kurmanji.source-2017.tar.xz 6144 BLAKE2B 586ad752a92d54bf12fd4ab80ae36af3b12b9091bfc28030a2b5ee36082a1370247e2ef55c375e917f9d2dd021d578b077f033882b2536f4de5dfdf37a037409 SHA512 615a0fcc262bb0a3dd4a19c735f40503a1ea9115f51ec1f9d8c106a2fdced16f39f6bd949a5e77c014cabf199bc91ec92efc54af470034c3da88391ccd2d9be5
-DIST texlive-module-babel-latin-2013.tar.xz 3268 BLAKE2B eef393cde1ba6a7e7ddbddaaabbee88724a34f5fd4a0da0a400fd7e3825c159df4ff8381a64fe9e0f886d1f2404c267cdf5a607bcd00d7ec38f772cbdfe6f7f1 SHA512 8f9c1dacff40b234ae0a61be3dd67a92f5e542f7f417c43c8fff5aada69dc1be13720afdcdcf52a8c67ddd6e2ee6e412e7f40c35170d6e4780db42466a74b64a
-DIST texlive-module-babel-latin-2014.tar.xz 3344 BLAKE2B 57ecb04976adcec5c6aa0aa568e24861c31cb7f9f5dfba37fcdca133efe1e1744db0e7586cab2be36788416037e2fc99f12c3511c96c9d7981c749c801230605 SHA512 9a2c34bd2704f42ecd2b0cd5d9bf4b83f1876055f3db0f057f805aa2d1ad50425b791d0c2bea7d0827bc69f19c50cd6cd89e7e401efa14a7bf5c3ab69cbbc380
-DIST texlive-module-babel-latin-2015.tar.xz 3348 BLAKE2B eb447022ef99d9500b96c55776f6514115995598b95694ff5c0fa408668133d297f7aeb48971f57b54cea59000e89bde0435de0c515d63e480482dcc75c070d7 SHA512 9ae7571648db52c65c347b496a539100e01a651c9910c011f59d319a2d38858901fc03ca2990099eaf23bf32641a3f5b3f34a7058caa46d63a781df966ae5cec
-DIST texlive-module-babel-latin-2016.tar.xz 3000 BLAKE2B f6c8bcd1e500a1ceb664d62207d34b372f1a26f1f5b637f9d7dfc53591c94373e2776b0fceb1644e82645c96dbecf377f12c576daea90632d73f1fb0d5b7cf98 SHA512 0ae0ff408abeaa6c2e02530630d32ef831dd0c1845afc4511d23e45169eeff706cea0ab3bdc449bffff83d9f084b5df0ccba418d2a3bc2c1ed9071238677b936
 DIST texlive-module-babel-latin-2017.tar.xz 3000 BLAKE2B f6c8bcd1e500a1ceb664d62207d34b372f1a26f1f5b637f9d7dfc53591c94373e2776b0fceb1644e82645c96dbecf377f12c576daea90632d73f1fb0d5b7cf98 SHA512 0ae0ff408abeaa6c2e02530630d32ef831dd0c1845afc4511d23e45169eeff706cea0ab3bdc449bffff83d9f084b5df0ccba418d2a3bc2c1ed9071238677b936
-DIST texlive-module-babel-latin.doc-2013.tar.xz 168472 BLAKE2B 1e48c388147ecfc835c26d881daafe922cd56714cc7c8a058240fb7b16c175bf5177201c85468a31246a37bee1012f4a6ba86a2c5d299f2dad11f56cc2357b32 SHA512 38dd4797c1850fbbe3b082b43d6dd7355b06c2592609499ae7bd65aa3960387cb49183cdfcf597a5d494b91c0bfd7793121d1d7ae92da2c765fd6dc9809e1966
-DIST texlive-module-babel-latin.doc-2014.tar.xz 149164 BLAKE2B 57cd4bd1c6c089c25bd60c1d07c6f38d7202699aed18aa81ea4a98ed1a5cffe7d64362be54a400d8892da9b113057d274b525fc404e22e9ec73ac87a3baf2315 SHA512 64b19c25b2b5df7dd78e7e158bdfddae6b4be323157fe47db9126c6e1c5066ac22482d02692d1d22045df931bfc55c9d66e2634516c17f6f3f11fcc3090b7807
-DIST texlive-module-babel-latin.doc-2015.tar.xz 149168 BLAKE2B 62c058360a78eb35d5f52a20ad72c40a144744c108d86d0426b6174f1f32c11571b727b2196094cfd650255eb8bc34532658b8d24ab9f072d949aa40b3562d67 SHA512 09afb4439f27f4aaabb819f0112c4d5d1f2d7baee28da1454c4ed2253c9d91ab418a41f6531865ee81297a3717178fcef54d923fabaea3442ee136eadd85221f
-DIST texlive-module-babel-latin.doc-2016.tar.xz 156016 BLAKE2B 74e8bdbd96c44a926d1f91b2d0a0b4c599937c8f3370f2018278c8a8d0c7807adcbbb52caa933cb775a8d954887c7936f3f7b4fbeb2df85c33c23b73637a639d SHA512 d11d58f0ad4ddd183a45f896c7307f66c9defc2eebe8cd1a2001f0084b2b410d5a767b57e40b119f93369245b6de49dc8127b7758060293e88bbaf29ad677861
 DIST texlive-module-babel-latin.doc-2017.tar.xz 156016 BLAKE2B 74e8bdbd96c44a926d1f91b2d0a0b4c599937c8f3370f2018278c8a8d0c7807adcbbb52caa933cb775a8d954887c7936f3f7b4fbeb2df85c33c23b73637a639d SHA512 d11d58f0ad4ddd183a45f896c7307f66c9defc2eebe8cd1a2001f0084b2b410d5a767b57e40b119f93369245b6de49dc8127b7758060293e88bbaf29ad677861
-DIST texlive-module-babel-latin.source-2013.tar.xz 10704 BLAKE2B 51fa50fb885dcef9672b11c33fba2b3e51a0083a18b4d84d9a74a8314572653468c62cb8d0d8271ebf3e565c338d736c5d125e38cb72eb181abbae619529e457 SHA512 ea071cc56b00a38b86431e740c11362a41a915b45cbb071681ac02716db5344076274d29266849a3f4bb0ff31b3f65bb76f29bb2c2be65e83e15aa594e0338e6
-DIST texlive-module-babel-latin.source-2014.tar.xz 12720 BLAKE2B eef64fb6e1d3ad785374440a3c1cdab3e710e4aa3e511c40e07d41d02f23e7e3cb80039b7dbe613e4897cf61a8cdaef44ba0c03d34bab42e3d0f8cbbecbaa466 SHA512 3a3cdc71377f943ff6cd817a3480e2b03aea838bb2d5be25da49a70d6452e31bcd831ca8b55f2f11f2dbe0898c19dd0ea9c9c5c8ca3c665a312565a3716ae646
-DIST texlive-module-babel-latin.source-2015.tar.xz 12724 BLAKE2B ed6c1b5f412cf58701f789891edfcb4488ea03cbecbff9fa615d9153dddd62b7f09ccbabf5c8b939a49d01304b7be7c93c12ec20d4e6711ed7c4ebe66165c51a SHA512 5ecdad903c581093bc163f3d257d1e098e2c98583ba13b3230985f24b9c6de32885f1ad505710718d32fccbe40f6ea6a8ffddd5761b2716b9342f16a1b17e46a
-DIST texlive-module-babel-latin.source-2016.tar.xz 13424 BLAKE2B 8bc2908327ea2c9e96db1eb525a8e2ca7041399439ddc9f334253b575eb04b1b720ca66ff7c1f0f0f565326c7766cf253bcdb678e8c84847b2ce6f1febdfdacc SHA512 f99a23f7b4425c0d4ceca4ccf818e4ff323e93ece85a61c8055e59c1a5367824f8967b111a15620add74435dc989d10e46db684f5f6f6d30e3e9cd240ca3cf1a
 DIST texlive-module-babel-latin.source-2017.tar.xz 13424 BLAKE2B 4daf7fce0a0439dc982a668962445080749bc5a875990e8201b34f7181afa4720f29f6463030ec6121aeeac399f634fbea4c51c69a3aeab843c4117a424fdc6f SHA512 38240caa74c9d278091799ae4262bbd5ec9c989868705dd84255827596090cbd7fc1582b8782b407de7066e8c33b9ff9711342ea8eaf0d5bb33ef3d3b7b48e4b
-DIST texlive-module-babel-latvian-2014.tar.xz 4144 BLAKE2B 1a46d6fb15b7d2f9e7f079b69a040e016c0ce4cf870e5dcfcf44b08d34e170a355ab599888fe350577231c82af86fc74b418830cd83651d84da52d3cc8702b51 SHA512 5cbad67fa8939111d2e457feb3c867d5c721a83178c5f6d3faf3d4517fd544dfbef1139aeb353d2933a9727b9ce405aa40902d7d4447ac92b2fd83f9f93f48b2
-DIST texlive-module-babel-latvian-2015.tar.xz 4148 BLAKE2B bf059d5a93c44e29cd3be06127cb00cbaab13ec3421dc7a4712359c0f140b6d2f2853d2382a1cd75eee756f485e34597830096c0230e1f8f15aa181c659ffd10 SHA512 950c89d7c73d7fe07176b4d09f4e8629fa631e4c1138228ca9e84ed1bd5000ac945fa13561d54572c3bd738716abd8c386dad028751bccbcdde0810810917362
-DIST texlive-module-babel-latvian-2016.tar.xz 4172 BLAKE2B c3450663412d985a338a2d52cd75fec80d187c9a27b7ee2cc815148afc8b9793f3f23fadaf3cf1fd709a0db109bb6e324a0d4f2e8705ab75ff918a2867030251 SHA512 6aa67aa30034d6d909740d19e185fdc21897005b1620ba2ac7f5a268c82b8cfc00db453cb11790f1a389f513dbffe82a5e67f58db769924445d33de834380938
 DIST texlive-module-babel-latvian-2017.tar.xz 4172 BLAKE2B c3450663412d985a338a2d52cd75fec80d187c9a27b7ee2cc815148afc8b9793f3f23fadaf3cf1fd709a0db109bb6e324a0d4f2e8705ab75ff918a2867030251 SHA512 6aa67aa30034d6d909740d19e185fdc21897005b1620ba2ac7f5a268c82b8cfc00db453cb11790f1a389f513dbffe82a5e67f58db769924445d33de834380938
-DIST texlive-module-babel-latvian.doc-2014.tar.xz 245216 BLAKE2B c3b34650da1b005b434050aa91fcaf4eb4cac5d229ee6d9122ab26821c9aaf4916b1565ee5fa8b004142bc5555c2e0f66651ee6d0ac37367c61333be0f98b6b5 SHA512 a9bf52ae2bd544be7aa5845ae5caae81745721b3d509c9fcd5437a1a5809f0c0d26bb1dd61dfa3264648f21ab746c4cc2d422d32f9dcefda6103230250c5b748
-DIST texlive-module-babel-latvian.doc-2015.tar.xz 245220 BLAKE2B 899d136229d524ea2704e870b5772f76c29d2732d97c9e6355bbaa6a591399b155fe2a738937196a596190d3aabb09a740e30a942c2d645acb5941db42d797ad SHA512 0f53f54f269524f68a5bfa155a59f6175c39f69b1707367fc1f60c99daac24a2efea13c4b7b73c3a3ea3c787e495b2b154cf643296df0d4a2885b14a74ca4634
-DIST texlive-module-babel-latvian.doc-2016.tar.xz 245224 BLAKE2B a469213ef5aa43cb74ba346e3366a35597e66b71b09afb39105c09a6a71e8123fd091400d51109582bc951f78d5ef3ce8eb094eddc2ddb3fc82a0b98635e21ed SHA512 6557c1b9b6b0b755c76c203dd17a911b41e4c45cc3d29826102c203d59063d47c1fc76a0ab99964876cd6fc6ad4d25846c427e72882af96ed4dd696028e5cef4
 DIST texlive-module-babel-latvian.doc-2017.tar.xz 245224 BLAKE2B a469213ef5aa43cb74ba346e3366a35597e66b71b09afb39105c09a6a71e8123fd091400d51109582bc951f78d5ef3ce8eb094eddc2ddb3fc82a0b98635e21ed SHA512 6557c1b9b6b0b755c76c203dd17a911b41e4c45cc3d29826102c203d59063d47c1fc76a0ab99964876cd6fc6ad4d25846c427e72882af96ed4dd696028e5cef4
-DIST texlive-module-babel-latvian.source-2014.tar.xz 5996 BLAKE2B d381e188d5b705d2cf9aa3ae308dfabebf93101710f7d59fd499811d44f3ac7c501b4c8927908e811a5b4e1d5a56274ba69d30c520bb252ed73e3f7e982fc320 SHA512 7271ca117c4d9106cf2e2cfc9c5071c89ce2d5a631ef628ff13c71165494027504659a188b3675f7512b250c914817770f52b3de2683d999d4c6ee48cfd55386
-DIST texlive-module-babel-latvian.source-2015.tar.xz 6000 BLAKE2B 70ef2593d11321a93457bb46d87d3e0bd9541ba050c3bf67f5b8f311edae1e64f59b3b6542202c38d7b228464c9f0a9d7cb147a2f65d9dd4c3ea9eea65c261c7 SHA512 f856157086908b4ec72bb8295ae701d8db9d560e1c230ee8a202520376eac80eb74b2a7f23ae5f057ace9d64983996aa310f13c9549664f93f87065fb9e9b506
-DIST texlive-module-babel-latvian.source-2016.tar.xz 6000 BLAKE2B 85cd3156e662d1f575876ed135a6d502630168356cc8be5be7a7832b722c456e6fcd5b179be7f280fdfa1dce6ef18d0d7245ca159393a5b7b4814c712a4111c2 SHA512 ac8be4880636fec7d85929c0df21568e0e4044d6c3e79461a9106612922e6905c7c8515062da3e08c097e719d1857345dcc4a33eb76db9b2e59a5d0c98127f3b
 DIST texlive-module-babel-latvian.source-2017.tar.xz 6000 BLAKE2B 85cd3156e662d1f575876ed135a6d502630168356cc8be5be7a7832b722c456e6fcd5b179be7f280fdfa1dce6ef18d0d7245ca159393a5b7b4814c712a4111c2 SHA512 ac8be4880636fec7d85929c0df21568e0e4044d6c3e79461a9106612922e6905c7c8515062da3e08c097e719d1857345dcc4a33eb76db9b2e59a5d0c98127f3b
-DIST texlive-module-babel-macedonian-2016.tar.xz 4832 BLAKE2B 32b7f492ebe63e45da64074a0e281d866eb615520c64aeb0a03ecafb01b782a31b978427db91470ae3e57abc4d7a4638f60f1b6f2e4ccd7517e7017ed19d49f0 SHA512 8dacb89239d103bcb1bc150bc0a4f32acacb785ee105817d896b039fb3e431799f5328301a244101194e4149a885623327e4a0635bbb08ef1561e0822d76deef
 DIST texlive-module-babel-macedonian-2017.tar.xz 4832 BLAKE2B 32b7f492ebe63e45da64074a0e281d866eb615520c64aeb0a03ecafb01b782a31b978427db91470ae3e57abc4d7a4638f60f1b6f2e4ccd7517e7017ed19d49f0 SHA512 8dacb89239d103bcb1bc150bc0a4f32acacb785ee105817d896b039fb3e431799f5328301a244101194e4149a885623327e4a0635bbb08ef1561e0822d76deef
-DIST texlive-module-babel-macedonian.doc-2016.tar.xz 207288 BLAKE2B 98466dbaf7bed4ba76b9afc34ac38d5a29187568a2c8956f25b5153aa061b52301db9aecc219e38fe53bd3658413c0efd3d1cb3a0a634432da81cd0d77c6457f SHA512 27cb61a1eb2d076fafd3769385831bb8c4307b3cf6a5d11bd11b37883f240d070a30d763da8a6da8f69fe4487b3f6272a6e243acb31a11584a297b92dfa162d4
 DIST texlive-module-babel-macedonian.doc-2017.tar.xz 207288 BLAKE2B 98466dbaf7bed4ba76b9afc34ac38d5a29187568a2c8956f25b5153aa061b52301db9aecc219e38fe53bd3658413c0efd3d1cb3a0a634432da81cd0d77c6457f SHA512 27cb61a1eb2d076fafd3769385831bb8c4307b3cf6a5d11bd11b37883f240d070a30d763da8a6da8f69fe4487b3f6272a6e243acb31a11584a297b92dfa162d4
-DIST texlive-module-babel-macedonian.source-2016.tar.xz 11544 BLAKE2B c26b74c7584a205dce77aeb038df8f1e2811d7ce284bec55f1e0d09c2743f6b7bdd0a3b90eb1e93e16df23bc092743e4d3f3f85cc52e6c0c66fa2f32ec933f6a SHA512 2d6e748f6b55dd08d022285173b76ace1516b7f2bec7ea5ecdbf35dc865ca10fa58f2cfc00c2bfbbb8a0f649f6110217ac2a4b34f7d68ed8e0c7251583e2c604
 DIST texlive-module-babel-macedonian.source-2017.tar.xz 11528 BLAKE2B a147770e5eb90830435c0df2d3610134e1fef5b7f3d8ce39dcfbc53e69793dfd7516a2b2da5f5cf52dc1a4d03b3901bf74a99932d5f2ac88bebe22fa5130ba9a SHA512 53178603c452ee8252d75c3b089e6741dbb766826fa365bd7f3687fe87fe41d623673e77f3fc0f76fededbfcaaa0a145bdc99dce7ae17007ae56860f7946faf4
-DIST texlive-module-babel-norsk-2013.tar.xz 2688 BLAKE2B b16280a663815f9b9b43e92e260825c6908ad5b67ef859092ede689923071921736d58a3f1cbbae1b5f235c795eca7176e2d63ab967ce2deba1fb461fa866c92 SHA512 2bbd3546ef0f16e7b342712aea44262987e7d7a2607b68d3be8fe9ef4f02e08f6a99026f4bb5d6b151af0614c009b4a9d3a6d0e3ebaf3fc5d4dd291614dec437
-DIST texlive-module-babel-norsk-2014.tar.xz 2868 BLAKE2B 446ce0a2b9d28005f3acff2295d2ec00ea544d8181f0f1af278e141c525a99362010ad8f228431ed7254ca793ba83a94eb2ffce75bad83f2e83c2a2c382829d9 SHA512 3d0cbea2a0ad8dfa5d0dfbd92ebcac3c8a94655e7d06f28a19f2430b52b7ddcb52be147ce6504fccc5feca7a4c93ed7cf95182f3a5043483b59f1002abb0f967
-DIST texlive-module-babel-norsk-2015.tar.xz 2864 BLAKE2B e77b29575652f2c63dd49275e307ab2d80cd3e24087ff88d0e48371cac1848fe672ad4bcdaf15fd08e17477af42b44d8deaa89b6737f437c7e939653220d10ae SHA512 d2178f1a1cf6a00421b0389e2cb5940ea3a68714fa88ff18fd31e26af306370b6c9a2721e910222162ca2ebeb2df8e29e468656db4e2ae27d67bf813da9772f1
-DIST texlive-module-babel-norsk-2016.tar.xz 2928 BLAKE2B 50d02255b19e86ee2de44fcefdc8b4b4bcf86684001d24fef2ae1d2d5e033bb659b97f0c365e3471bdf27f334a00b9625f4ea39dfb90fe5fb22b3f99db4ca777 SHA512 de8c10d451712f721d2d7052beaea9dfea15248b68f2cd28fd620e21146fa84c6b4244490bbafbdea5b2674389666f7d20a76f8366606563aff0697fcf340c2b
 DIST texlive-module-babel-norsk-2017.tar.xz 2928 BLAKE2B 50d02255b19e86ee2de44fcefdc8b4b4bcf86684001d24fef2ae1d2d5e033bb659b97f0c365e3471bdf27f334a00b9625f4ea39dfb90fe5fb22b3f99db4ca777 SHA512 de8c10d451712f721d2d7052beaea9dfea15248b68f2cd28fd620e21146fa84c6b4244490bbafbdea5b2674389666f7d20a76f8366606563aff0697fcf340c2b
-DIST texlive-module-babel-norsk.doc-2013.tar.xz 142424 BLAKE2B 8acd1c90a462a0c565a4ead738fb07d2876d7af47ab53050b173534179da8666765fc096931039e5d9b3a2edda8023d4e2270b77eea5ba2d9642c423d3523efc SHA512 bc45c657aee7d9c9e6f774467b7e68862dcfa1dd7036884a3af2038415daaf7c339ba90409451d3f50972ed0757b75c2580fea4ac6c2c96c1067602c9464c4e2
-DIST texlive-module-babel-norsk.doc-2014.tar.xz 142428 BLAKE2B 14a71bf8c2131857666ed40adaec0ad48b9027035a057ecff2b6b0644a5fc990583207b9a233eedd9d4301d8d0ce87c0211f565da6b8d8f1f9bc25691dda63cd SHA512 a40a8c40f8ffeab1e0e374117100f00c34462f87eb715a282d0fff1bc4b0dbf58da341ec264e3aff77d276ca0fcc59cf0d94b29c1bfbb6128c750120bede28f1
-DIST texlive-module-babel-norsk.doc-2015.tar.xz 142428 BLAKE2B db042e98fc2252d696a56ccc04caa5e2adedf23992ce056f008a7fe8ec80e7e6c500695401bb16c1f1a72628975d1d968c73be4dfc198811d3e78cbf6dbd78f8 SHA512 6986bd72fe810c2ca864eb8b9c4487a770e029818901297e2aaabee1084d4fcd7b55f50a415c4e10df21eafb6ec85dbd898a2b600a443288df579ee5aea94192
-DIST texlive-module-babel-norsk.doc-2016.tar.xz 142428 BLAKE2B 67955827936778a8675904b55339f46bb093c8ce4c31b48b8bdb23f3cf80b2eee1a9912224b6d9c6eca9ee9173fd484fa17090c2503fa7c94da9532a012b7dfe SHA512 f5e0fccbfa071a620be651886e99d32e938990c57030d81f31a6a5b63e4ea5676b582a9869fe6f37eaa6d31d45c20006d9426fdf23d5c2dc5bc47fbd2a7f9e85
 DIST texlive-module-babel-norsk.doc-2017.tar.xz 142432 BLAKE2B 3814542bc5f34bdd87a98ba254377fd3cf7fda83e57fbe58f6a426e1801c07dc0e85d3bd0ce37eb7830837a7996d8037a8880cf5c7d082226fbee5df4c38af23 SHA512 53f8e760cc6505bdf8b8ef92070e4a5f9c34bc43ea3aae7772c765697e204281b478807e95627ce77776ee4c2bd4bc898e15e7836c3227307b02ef2aaafc22d3
-DIST texlive-module-babel-norsk.source-2013.tar.xz 6780 BLAKE2B 0ea2bb2c963cb7dc650e68803466472621dc746ab9fb8137faeff98e3c9d7537a6a42d56b8b0adece5a48e4750b1b3aa842ddf0c782b152ee6786434425bd689 SHA512 e905cea29fbeb3c2156f7e587f5594d76ea8b3176f262cbca038482c365b5adf43f0bb30a39eb1ddbbcbc8e06b769a3517d040ec221d03340fc69f378aa23dec
-DIST texlive-module-babel-norsk.source-2014.tar.xz 6784 BLAKE2B eff9f0b35143ee68806b9ccf646480940191ef6fc4657810ba986b9eb6826682ae17b8954b660be0deb14abe388a9a88a403c67b885a5695f58bc25ef2f9dc04 SHA512 2c00ae575ddfa5f5ef68843bfdcea4e1a868ee0f015fe66c46838801171256d47c3af2b33c2d5181b525347d5eb9e4aa0c06047040f999917e05731bccde7cd2
-DIST texlive-module-babel-norsk.source-2015.tar.xz 6784 BLAKE2B 0fb501334cccf6bbaf63e86893bed20ff9880b4e33c4289d3fa55f99845c54a549c9eed005c4625a4cf4d99e793538f1ae8996583e1f34158bb3a94ec008ba6d SHA512 1230247fdfaf75e675a3ff6c202c5217d392ee6134242d347b2a52d2a07fcf59efce20108d6a1dc4bc4f6fef1b655b4eafaf4946c1a68f853368f7cf11d6886a
-DIST texlive-module-babel-norsk.source-2016.tar.xz 6784 BLAKE2B bd55a449aac8442fb85141ef61e207971810b4dfeab932b8caf8b149ec99be2135a59c4c7b6bb58d56aa8fb324f282c4586db34f5aea4debf48418c7414e1eee SHA512 cacc7f491b6be8a7fa737aace6a37e8434bff4453876bb9b739b837ba0b60e9b1ea4ed4647874bec353f5f73d4496a92920e83d260c32ff7672828f1a135e6a9
 DIST texlive-module-babel-norsk.source-2017.tar.xz 6784 BLAKE2B bd55a449aac8442fb85141ef61e207971810b4dfeab932b8caf8b149ec99be2135a59c4c7b6bb58d56aa8fb324f282c4586db34f5aea4debf48418c7414e1eee SHA512 cacc7f491b6be8a7fa737aace6a37e8434bff4453876bb9b739b837ba0b60e9b1ea4ed4647874bec353f5f73d4496a92920e83d260c32ff7672828f1a135e6a9
-DIST texlive-module-babel-occitan-2016.tar.xz 2388 BLAKE2B f5177ec0ec63cda6a522d6f1a95bedb7a0ac798d44206780e23a5098886f2c2e9f0d41e7f59ce2d9b64248e8f158d1ca5198035fee7391f32785183c6a142ee7 SHA512 8a537b549ea3df4f60e665c20f5a29e76c29e59d6903dc77656951796fcdd30ac88cdc5452573ddd10e466649536fa74ad90d29b709b52f69f22635723498551
 DIST texlive-module-babel-occitan-2017.tar.xz 2388 BLAKE2B f5177ec0ec63cda6a522d6f1a95bedb7a0ac798d44206780e23a5098886f2c2e9f0d41e7f59ce2d9b64248e8f158d1ca5198035fee7391f32785183c6a142ee7 SHA512 8a537b549ea3df4f60e665c20f5a29e76c29e59d6903dc77656951796fcdd30ac88cdc5452573ddd10e466649536fa74ad90d29b709b52f69f22635723498551
-DIST texlive-module-babel-occitan.doc-2016.tar.xz 411828 BLAKE2B f939edf4a2be7b55cec54989774a330ef34e47dc64a97e93ada70aa69d681c6143a6c18c0c4792585e2792716475c8b6352207ea3800c32def83702d89afe2db SHA512 2361b4013e6728f2e39e6d0af36198f9ba1426c81b1217d8baa32279b8122c00eaef420a394249d436dd3b50921361dbc681b194d2d734eba99d67416626aeb0
 DIST texlive-module-babel-occitan.doc-2017.tar.xz 411828 BLAKE2B f939edf4a2be7b55cec54989774a330ef34e47dc64a97e93ada70aa69d681c6143a6c18c0c4792585e2792716475c8b6352207ea3800c32def83702d89afe2db SHA512 2361b4013e6728f2e39e6d0af36198f9ba1426c81b1217d8baa32279b8122c00eaef420a394249d436dd3b50921361dbc681b194d2d734eba99d67416626aeb0
-DIST texlive-module-babel-occitan.source-2016.tar.xz 10520 BLAKE2B 5d72467d39e461144ab8b2a6f1fba8a2ef56f2fffe777add13928b62ca66498938df48fee19e4897c88b333fa49af6b59c9054677874e82bbdb54791eeb3d91d SHA512 e287aeed9fe7bded56a9e46a0a6dbebb5423b170243108fc84566c529e2d5683e541a48284039b1735943c53c1a7e79575109ee8957cd6103cb2d78f64cdba69
 DIST texlive-module-babel-occitan.source-2017.tar.xz 10520 BLAKE2B 5d72467d39e461144ab8b2a6f1fba8a2ef56f2fffe777add13928b62ca66498938df48fee19e4897c88b333fa49af6b59c9054677874e82bbdb54791eeb3d91d SHA512 e287aeed9fe7bded56a9e46a0a6dbebb5423b170243108fc84566c529e2d5683e541a48284039b1735943c53c1a7e79575109ee8957cd6103cb2d78f64cdba69
-DIST texlive-module-babel-piedmontese-2013.tar.xz 1612 BLAKE2B c77c0ae36b6b59243eb4038058028ddc94d46f14be6434ac5178e1c7222ed9fef8e27375dd78700c299298f8b93014213f15628398b32a9a00454a4c25ff3ae9 SHA512 f924f5c7402efbf40a48fbe1e61e97c4daf79c238d502414c1147598f22bbaa1f7dd9d14cb9e3567e6eeeabab418f05043454d0c11445610063fb84c1bf1a7f0
-DIST texlive-module-babel-piedmontese-2014.tar.xz 1784 BLAKE2B f8bd9fdbc067b60279ef976493cf2c131d003d2db3b411b7d164ef584d452306ba9a3d296c42da75bf43b51c92242845354fdfce3d538be4dedcbab9749b70ca SHA512 6f0604f094ca7e51d2c870e7e9e037077ec864b6c92c92b805cbf71f953c4cde340bb7b8ec5084be63743d68cda19f841c5e944ff1cd548ef5854695cfd92fe8
-DIST texlive-module-babel-piedmontese-2015.tar.xz 1784 BLAKE2B 9a6937e23790f30cb717de3c86f3e0dd096b98a457c18c21733e52ae050367b3bbf59110238bf8715326fe24ef42df02c1d64a8f135e6e42160a92166ec81976 SHA512 fb85c57fca6bd75a0db9b0cd455651df7de5dbc5035f22a09208ce053ca9705293b74b47899352882f4866b8080982b0e619338531de102f7bd3c87af053fe6c
-DIST texlive-module-babel-piedmontese-2016.tar.xz 1808 BLAKE2B cfcb04f31e96dc55acb7dab74cf434028ade4a6221b511b888828a5436b83de6dce09adc440ebcee1f893574e988bb9a590a883ad370d1654f3e0648e34bad80 SHA512 8b2d0ffc0a82f72b3131d15ee809dfe01db1b03f7d079a218f00b2c6b0d550226089be312b177cdb70c233b3a620f970411b4d1e38421dc5ec8516072d01ecbb
 DIST texlive-module-babel-piedmontese-2017.tar.xz 1808 BLAKE2B cfcb04f31e96dc55acb7dab74cf434028ade4a6221b511b888828a5436b83de6dce09adc440ebcee1f893574e988bb9a590a883ad370d1654f3e0648e34bad80 SHA512 8b2d0ffc0a82f72b3131d15ee809dfe01db1b03f7d079a218f00b2c6b0d550226089be312b177cdb70c233b3a620f970411b4d1e38421dc5ec8516072d01ecbb
-DIST texlive-module-babel-piedmontese.doc-2013.tar.xz 106224 BLAKE2B c76b840638563ff8e41f179efb02d2873fe2d47d228d5d2fed823e96a3d86d30a71b01f4b17e5fa88b74027ef1e8d7d6ec6ed815b2b57f3d91220b7afee6bd2c SHA512 e80f8d6711b8665aef1dd9a972559cc051d830841a39255c54eaf0374dc61542e5b70a6b103b820e6e9bbaf37fcd16f2a7a4346caaf0c7b654526a40aed8f2f9
-DIST texlive-module-babel-piedmontese.doc-2014.tar.xz 106224 BLAKE2B 7ee01df5f6bc2d484bede31904202dee79b37774c7c8090332774b4798950103c7a927927ddda87ee890a288ed25156e3d29eece9e5d13b828f25be5ba5c833f SHA512 8cb3ff627de13473c0c48892c41bfb011cd7f7ee3acb65d70829fa5d71737a4c28012095ed3c90b6ac8b5e68139fe9d7c47082ae290c5c5188b5be8c1d64ae83
-DIST texlive-module-babel-piedmontese.doc-2015.tar.xz 106224 BLAKE2B 93025489b7c19ec95fbc43d4de89737a9f640272f01ea8f6f2da5a2b810324d6dbcfb761d0d54d33ee5bf69b051a4e6744fd1ac332fcf038e58de301c0d3cb45 SHA512 0702cd86ac4b67b34eab20c9c1542c08ef1b8c140011569e71fa86fbfcb3a29a43caeede8f2436d40899284dd6c2b9ea4c6f64414b149c5491c26858f86299bf
-DIST texlive-module-babel-piedmontese.doc-2016.tar.xz 106224 BLAKE2B 52fb6f092194940b1d13904cdb2557806850dab7353d7c6bdf559a88c6d0e7f7dccab6cfea4827d507874a3b3480f284af2a64a1950289ac1d7d96c3df97e8f2 SHA512 1b82ebdeed9d10e9734bb1c51bb54e2054e5658f216e1a929819f7807c5d05d7b2e8dbaa94de4c4dc5f3b8b216543759d874d4b9419d07beeb08e72656101910
 DIST texlive-module-babel-piedmontese.doc-2017.tar.xz 106224 BLAKE2B 52fb6f092194940b1d13904cdb2557806850dab7353d7c6bdf559a88c6d0e7f7dccab6cfea4827d507874a3b3480f284af2a64a1950289ac1d7d96c3df97e8f2 SHA512 1b82ebdeed9d10e9734bb1c51bb54e2054e5658f216e1a929819f7807c5d05d7b2e8dbaa94de4c4dc5f3b8b216543759d874d4b9419d07beeb08e72656101910
-DIST texlive-module-babel-piedmontese.source-2013.tar.xz 4044 BLAKE2B a24def62aa1b572a848ad4049e3507dc3f141840124075d39ae5fc89ea1867bebe1b21516b2f61a395a9805e3bb14b2d20f7c839aed079a5fdf44c44d26a218b SHA512 bd892b822917b76f56e3f08e9f66939e1511660db4fedfc980ea69fe0b352e26f91fb60098ce90b0f00d9517ef75c248728cf7d028d88ca8374eb0e86b7c2255
-DIST texlive-module-babel-piedmontese.source-2014.tar.xz 4048 BLAKE2B ad1bf0e599f55b5fcbd1478ffe06141e5669559dc32b1788ef745f3526935cf8f3136c12b5848d83c7f307307f93303ff15a746113b7ae87241904b13205d44a SHA512 40f4d40be3d31230cafc693ceff7cce3545f7fd04b75b75061451f5ab78e86f975ad8b9d1d24328dd13a97c2c9a5214e7b5a24fba3ead32bacc2fec6401bd784
-DIST texlive-module-babel-piedmontese.source-2015.tar.xz 4048 BLAKE2B dad840e4f07ae39980c6a7593b92d0e42e20174a55a70b67e1440dc2470637ea3a016a2f8ab5d5253a9205e4eab1d7c0130f88ec3dff7f2ac56ab72c9a6feffe SHA512 23021b6afa0093d7b3ac52234fd000fbd0c7994d73c3ba9410900eb8448450f5d51f838adae5588d3c629fa0e292ad56a26b69645fa01650894e09935ede4b4a
-DIST texlive-module-babel-piedmontese.source-2016.tar.xz 4044 BLAKE2B 483cee726c44ac97b613d61f7525117e561c59b98cca27bd416ae359b63fc90408dd2306c7925720f782feb901c57193427b107331ab09087bacd30047b79798 SHA512 5807749c611295d9c39f15e3c6db35dce11e2a3e446c00905f486da3ecc73f7b554ac58614ef2353a1552b3e8cabed47775cda69129b95270bce2ba227493edf
 DIST texlive-module-babel-piedmontese.source-2017.tar.xz 4048 BLAKE2B d5c251d3261857e88384423b871ae30808496d4c76c38c4546d5b5ded14bfc61ad893f066c9b5346769840c9fe2fdc196180ccf4d1dbbd874dd5cf7fbf0d4d4c SHA512 99490bdb34d7b3379bc319a3d39a7db60aca5d2b589c72f8b7c5ac2fd651cdc24d648d8b10ee070b7ad476255c97bf45e8cb3c574f5a3caec1e305a07d580da6
-DIST texlive-module-babel-romanian-2013.tar.xz 2012 BLAKE2B 4a27b0e1c09afa0190d27a41d30d163a200f5876836d5451823c0609687bc552ce688cbf56326ed594435c1b2f50bc7472daa5284cfbaed84b56ad0aa31919b3 SHA512 8d227af761b8deb3d62f7bd5bb56036ec350beabdb7cc94186d53606fd286d604e3113f98a7e0e643841fcbc5fc14d9ac428a1b07b8ea56ac5319f2f6f7811a8
-DIST texlive-module-babel-romanian-2014.tar.xz 2168 BLAKE2B ada55aef933f74f9bcc2780519c705cf743483b822995b45afce97ce4eaf5fc6f9cac42c7eaf7ef1edfaf7224d3bda54ebf89eac8d1995174e191c4f5ff05a6e SHA512 237afd7b784f2ba888b861069b3e7b3da63478a1c4631a72a0851993c5db3386327db53ad171e94138e6cb6a380af3d66669597387aaa45355c7ec808682656e
-DIST texlive-module-babel-romanian-2015.tar.xz 2164 BLAKE2B ef194257f390b7229c1848a811724166297e5c5a6b8e9ebb16a0a052fdd9474fa770603422c9f3355e62b47da0c3d2ae050f968e794aeaaec8794537ebf31efe SHA512 37cf69c4d8ec010b1a126275df99a27d6517f4ac72ac8a4575dbb59a65c8da117616ba0838256531007e317c4460496ff1d9f8bef45d4658f8ef672ba2f1bc43
-DIST texlive-module-babel-romanian-2016.tar.xz 2176 BLAKE2B d59115efb672ebcb4c05ad828d01b4aa484adbeef0a63fcad42922e7dc91b22b10ee775fd7efe9e3423071a6d74bcab73ce12962f4d12c3e961b30507e9636ec SHA512 4a6fac95797c041daea06d0dc8f0b93dc3f9ff043d32798a4da6ee7df014921845f5c2ee854c1997b27bfc517eeca0d523a7a6abae70cf29d16e8677b1cb7abd
 DIST texlive-module-babel-romanian-2017.tar.xz 2176 BLAKE2B d59115efb672ebcb4c05ad828d01b4aa484adbeef0a63fcad42922e7dc91b22b10ee775fd7efe9e3423071a6d74bcab73ce12962f4d12c3e961b30507e9636ec SHA512 4a6fac95797c041daea06d0dc8f0b93dc3f9ff043d32798a4da6ee7df014921845f5c2ee854c1997b27bfc517eeca0d523a7a6abae70cf29d16e8677b1cb7abd
-DIST texlive-module-babel-romanian.doc-2013.tar.xz 113076 BLAKE2B 1d5807a5731e7850ea1eaad56aad32fb9f3843946717a73898eb1f20b985f2bde93393359feef095fe2388410d6ac6e3cf5de87564ccbab5d4a49e9f21b8056a SHA512 1d653d4e49bb926f87645d2a820604417f84b62323903e22fe6ca7092ac3a6af584110e35adc3e2064aed0506fe98e2ebb3a9c1a2015c246edf50ce1274e0bb4
-DIST texlive-module-babel-romanian.doc-2014.tar.xz 113080 BLAKE2B 6ddf3e5e45ef526a392f5c04267e9693e91b9625657eba6ac9ed9b0dfafab6621d9caebea2ba63b407bd7ef6382db6b83130ce6b623e9d2effec97fbe7520af2 SHA512 ff5484dd61b38db19c3ea86c10e2a6a4c0fb58fed97a66b08c836dd6fdedc4176dc481b2c3f30239f3734aa4cbea26c83d70739ee7d958dabaf29173ae3d097a
-DIST texlive-module-babel-romanian.doc-2015.tar.xz 113080 BLAKE2B f5f23b947a60953f77f636a8363f2ed1da5738b064fbf031c15f097f46cbc7fdf20440f75800b0f9ab52400109b2f197a82ad1f635e6f4b6c24f4832337882f5 SHA512 e7550716883e0957e4c00c13d4eb565cc687bc481fdea3eb3998642793ce3d9d336e5891f6254de8e35f172393d81000948df65166d6257bf543dd755128f968
-DIST texlive-module-babel-romanian.doc-2016.tar.xz 113080 BLAKE2B 482a111bb9af94b57506b9bcce021723320be7f5fb134a261034dda971d1323632d66df1f3394831007696c6312a838508897cee9497f0057d743a2b80ac4b2a SHA512 48a9cd557782a606549d023c518da049d527cc852ab333e7a6dcf4f153a83988d47e5ecdf2f9dba9f26efe7431acb31c4ac55262e2e8fa74240e69026fc52010
 DIST texlive-module-babel-romanian.doc-2017.tar.xz 113080 BLAKE2B 482a111bb9af94b57506b9bcce021723320be7f5fb134a261034dda971d1323632d66df1f3394831007696c6312a838508897cee9497f0057d743a2b80ac4b2a SHA512 48a9cd557782a606549d023c518da049d527cc852ab333e7a6dcf4f153a83988d47e5ecdf2f9dba9f26efe7431acb31c4ac55262e2e8fa74240e69026fc52010
-DIST texlive-module-babel-romanian.source-2013.tar.xz 4340 BLAKE2B 7a1c5434a660d1cf0e4384bfd46e1b555242f9043b899af81922c1f621a80bc02371dd3a3719018b5cbdd7b592969b577aaddf2ec49b59067ca508a6ebe998c0 SHA512 a850325db4fb218a67fb2d0334c30ea3f0c81f38e534a2bd2df2916f72041d2714293edd459fc5462fad0d17eac426f30a5234f2ffd1a6d15c496981bc64b3a0
-DIST texlive-module-babel-romanian.source-2014.tar.xz 4344 BLAKE2B 90975b3eb81e537c61fd716102434338f9fe403502ef1a9c2bee96b841f063f8e39e9b4c13ff0189c6fcd8cde00ccc335188bd61af234d72a062bfbaeacf4cb8 SHA512 2f93ce98599fe0bde9b9e8706a3b573573c8947944ea0c95e883d0091ff64ae434e8c24593f4d32468241b72c4612c5f287d283482830fee758d361d89307286
-DIST texlive-module-babel-romanian.source-2015.tar.xz 4344 BLAKE2B 16a54a722f801d73e0065c3ee4aee4f992dad083179169cda56d25774373046194b87add477fd09f9cb51bd52537f9afd0e3d945d245a1384d164787cbd3d479 SHA512 0b29a713763b078ecd0008c1d9cc713ee3e510184cbdc63fc0907fabf23dbc5084b118f56b9e9b658939ef06e31529d92ae22ac40a3debc5288719607bff105e
-DIST texlive-module-babel-romanian.source-2016.tar.xz 4344 BLAKE2B a1a0881bb1c6d9c0b6819f56208b92e4c15a9362ca70f8ca01df7efa4506c6e0b0711222db24cf84c283ac1c24231a3006d740869eaccac2952cf3b48097b954 SHA512 9e37b284024cc8cf916a1a614a271aa072c2cd2f1b4895e9159a4477346900598ba4f77657f270265efaf7a40f0e7619e1d6ac5d4343dad6c9d6678e3735a296
 DIST texlive-module-babel-romanian.source-2017.tar.xz 4344 BLAKE2B a1a0881bb1c6d9c0b6819f56208b92e4c15a9362ca70f8ca01df7efa4506c6e0b0711222db24cf84c283ac1c24231a3006d740869eaccac2952cf3b48097b954 SHA512 9e37b284024cc8cf916a1a614a271aa072c2cd2f1b4895e9159a4477346900598ba4f77657f270265efaf7a40f0e7619e1d6ac5d4343dad6c9d6678e3735a296
-DIST texlive-module-babel-romansh-2013.tar.xz 1112 BLAKE2B 553af523d9a365b6bcbb04699a071afe011d9dcb4b0b6de1405360bc6cbf26317b1203ebe851e3ab8bbfeeaaa10e4f1fffdf8ff262122dc0106f45346bca9ba8 SHA512 9aa57fe3265964f184644211ab91705d61739058908c49ffad18e1a98a0ff21866f614d323b2417adcd0001037a60a74ecc850461d75f47b9ad225c5e20f27dc
-DIST texlive-module-babel-romansh-2014.tar.xz 1112 BLAKE2B e9e2b968ccf919b3e91e27b8437a5d1ebc364c25f1ab6176959e8428d3ec42f43aa851d11ac2cbc2f57c07abd8801571c63643777889332e0217c1ef31175ee9 SHA512 f8e231cff6e5e448c706f90f3a10ce2ae594aae22cf2a65b9cf1c8d6a0e6dc31671952a9dbd3c333b50963296f349b53f9d6a79066289aee41c7f1bf6725db04
-DIST texlive-module-babel-romansh-2015.tar.xz 1112 BLAKE2B bae1da2e46cb22c4962f6d6ea4e8746600cb8ffc1031c6843a6fbb357f87c6233a5a92601f03d30b155a64fda90b6171b47679c9101e9bfb10f175b0dfbc6eaf SHA512 b2ee5ded01c5526f803873dbc33eeb682a20504b75078559d4ddd9dac64b1e41012f8fa934c15c20eafaf87080ee4993926239ef93ce4b7be9a7585408518480
-DIST texlive-module-babel-romansh-2016.tar.xz 1128 BLAKE2B 05aca115c0d6d86187c115ca9cf9537cdfbf108bc858cc5c3e114330f4c895bffd6e06c84088de0770068467e9169587a68f9fce7d857ccc28d45a97ace764ac SHA512 bde7b99c66ac765016505e75fa73b4a794f389dfd26dc28ef8c345b2c458eb25ce48077f1badbdf5ed10bcf528ad347bb6f070f47bea3fc6e099bec2fb5ec5cf
 DIST texlive-module-babel-romansh-2017.tar.xz 1128 BLAKE2B 05aca115c0d6d86187c115ca9cf9537cdfbf108bc858cc5c3e114330f4c895bffd6e06c84088de0770068467e9169587a68f9fce7d857ccc28d45a97ace764ac SHA512 bde7b99c66ac765016505e75fa73b4a794f389dfd26dc28ef8c345b2c458eb25ce48077f1badbdf5ed10bcf528ad347bb6f070f47bea3fc6e099bec2fb5ec5cf
-DIST texlive-module-babel-romansh.doc-2013.tar.xz 111832 BLAKE2B 75adb5ff89a45e63f47ba1da0110336d66c687f1fc692814cafb9dc8a49548473ff26120eb93cda4f08789b7e53790808f6ac5cdb1c142814efa58c3529d5abf SHA512 82836ee2105f57d7a152104a20aeda03cc02ad87d1b957f99c995a05b3b452c26ed739de6e59a682909ae60c83632c55af32ca324938ca4cde33026cdd4d902d
-DIST texlive-module-babel-romansh.doc-2014.tar.xz 111836 BLAKE2B 41d36dd91aead237d5713b02d2a278fe5f1201deb9c31396c44b6b17ea6bc06999819ae88660fe66a026c78a3835980515c6459d71a3a133ff49e627ba3041d5 SHA512 3a39af66e8034415873797d2d2bb87ceca97628918f963938dd63413f145d9b366a5345a7eb3b66b9e20aa81e716bc71f4e494ac6c4dfe1e7446015dbb9ec892
-DIST texlive-module-babel-romansh.doc-2015.tar.xz 111840 BLAKE2B 6bcb429abf7d8b6f38ad7b2d09a33caa415c1ea9e7e798bb8f76b35e8c0faf635da74c5e14b7653be6dd17c2026d25e5379b2daa9ef011a1aa081bfda941090b SHA512 ec75361bfe060ca0a8ba31b9a2a6e826088594b02643dfba420584ce6951bee51bf70860a7ad91abd6aa404e8b1671c5584b91b152fa3816651005c24550b863
-DIST texlive-module-babel-romansh.doc-2016.tar.xz 111836 BLAKE2B 52a79100a76b1ebd936d36b9a206dae7e18400ee978077a18135d980192e371f77c1b3c37428f738e30db132a7ad59780dbc11a8ab62e50bd6bd6f801741605c SHA512 6baeb69efe11c8a7555cdb2aeada3a1eb560ad4a007f039e14e610d52ca5c2e0c58e4faafb665ab5069f4ccaa5a2a4e6c780440a9963be7b9d67ba327821b640
 DIST texlive-module-babel-romansh.doc-2017.tar.xz 111836 BLAKE2B f072dce4fba5a9d93284fb1720e725aa1c4de0a72a1de84de823c814f0913f60d85128089ba12bda00b1c0eabd264f2c0ebf2a2914607f090398bc44ffb0c6ad SHA512 b2a5c21e705625d791e806795cc3c58c3284439e4e1c84e105b2791594913af48b4182072aa2f80098f11f86a721fd35e4cf8574b756f1e9aef59e66a4a22ba8
-DIST texlive-module-babel-romansh.source-2013.tar.xz 3196 BLAKE2B 70c892c7bbf9c01a5fbd37f460eb1a006d95fd4aef8871b921643052317af35b34b162a1699a857f52e6f2df675f0c783afa37ea87169d5ee3bd31a3da11a719 SHA512 7f3df8c25c0703d1a24321bfac21bd9bbd54b111c73efada3c5b0391034991513288f4d07b3d7eaf242d70a656eeb39aed274cd0fb9cc5c3a6dc806668fcfbe1
-DIST texlive-module-babel-romansh.source-2014.tar.xz 3200 BLAKE2B 5f8560c53cabb0d8a7f2588f236c6d1eceec9cdc1ecde336c8440c0cce51c9fe725e1a04a49b224940d89d338a5fd6663fbedaa29607614fcddc80d390ed49a8 SHA512 97cae061f1c7a54f6b9118759b3ccdf45613ba4814bd511cea9243fead7bbd87d1d93e6a47d1c0db75392be39cd4d883336ad766150c18dc422c5a653447773c
-DIST texlive-module-babel-romansh.source-2015.tar.xz 3200 BLAKE2B 78eb4d6d776a9836ad3926348d66cc3c788b5813a8e65a1821997fc46c23b716784c47a4f962e37ce6e71c78e9f75e6840483d387b0a1e7ad31453b4b28eabaa SHA512 09bfbd07f1edaa553b92f842e4419f0c68db11ea37a459cf5fa451f1758ddf52d8f09c360b68279cfd366c1c167be898ed2fd195eef4daf9d029758bdabfb7d6
-DIST texlive-module-babel-romansh.source-2016.tar.xz 3200 BLAKE2B 3d40d7f78560f20c4656782bb0ab2828af9501acd2a85b4f632fedea44fdcd417c28f7d14972df7db6e194f225b02fcf9cc0975939f527fc08ad10edfb1c95e2 SHA512 0bfd3435499d5df46c84f7cbd22310052415d007fc8bdf24a9d3a89d50f8f508bacd6dbc4c1d328c51cc59b4443aeb500a4e78a322ea2386e5cd652332695cf4
 DIST texlive-module-babel-romansh.source-2017.tar.xz 3200 BLAKE2B 3d40d7f78560f20c4656782bb0ab2828af9501acd2a85b4f632fedea44fdcd417c28f7d14972df7db6e194f225b02fcf9cc0975939f527fc08ad10edfb1c95e2 SHA512 0bfd3435499d5df46c84f7cbd22310052415d007fc8bdf24a9d3a89d50f8f508bacd6dbc4c1d328c51cc59b4443aeb500a4e78a322ea2386e5cd652332695cf4
-DIST texlive-module-babel-samin-2013.tar.xz 2040 BLAKE2B 07ebf2874ce20b93a01b6f3094b0da1f3c78b34b28b69839e9c54d76bee87545ff8cf6cb00a4a4233fd63fbe3bcc70d9a0af52bd0fc16efd802fb93007db5bdc SHA512 b95f91bdb0735f5ea04f7bd19f5050fdd7d431dfb1f3240ca17c1be31ac54a6bbc6372e1c78cb6bb028827a8d3699cbdac2277253471c516e0449846062c1d8f
-DIST texlive-module-babel-samin-2014.tar.xz 2320 BLAKE2B 4bea44d44ef913ea66a3fddfcb88f4fe0b92e55d8dd3e36d67e3ed0267b76102e184f31406a093d04c52e7288237de7ec721e03a63a226c12f17ef440061e3f7 SHA512 1fde5eb51d8521ca6f115f973b6fdd23cadcc80b338f08f1d46529465bfe79f57ecc95aa6bba10dac55e8c79fbbbeb65c93a877cdb405615b83307445ac3157c
-DIST texlive-module-babel-samin-2015.tar.xz 2320 BLAKE2B f0cd278156f92fb122289e01847022a69eb0e163e302b079ef0a8f654333667770a3b3dfff6c3335c24f009b4e39a0d8f0cb323942ace4562f7c47d51a724c24 SHA512 54f0b6ef65e7302e0135945cc27d5d00a9097f43b2acc38086e216d755f1dddf72db44c448d281ce97aab90e87411a49d619f02bd08afdf24c048165fa67db3f
-DIST texlive-module-babel-samin-2016.tar.xz 2328 BLAKE2B 9f78816d3483a0515339f76d650389515670c2509c897b307de3e1d57ff0ecc7b183e0166b2dd5bfe3c89ed0ccc73079e51d6c54fff9b52c0ead8fbc62620bf4 SHA512 3a47c9889cf319caa606d6000560fb29c7361077bf9fee08982f1475624c76932ddaab5647ee36e12340e796ec62edc040e330a5b8e4687c381cc357974f2a76
 DIST texlive-module-babel-samin-2017.tar.xz 2328 BLAKE2B 9f78816d3483a0515339f76d650389515670c2509c897b307de3e1d57ff0ecc7b183e0166b2dd5bfe3c89ed0ccc73079e51d6c54fff9b52c0ead8fbc62620bf4 SHA512 3a47c9889cf319caa606d6000560fb29c7361077bf9fee08982f1475624c76932ddaab5647ee36e12340e796ec62edc040e330a5b8e4687c381cc357974f2a76
-DIST texlive-module-babel-samin.doc-2013.tar.xz 125084 BLAKE2B ec04836fbf0a6a8719748c3b4aaea7c4c2024ede2263ea4295ef83f0b757530dd811e4bd6ca64206333e2d5e2b8294daff0994ea28c4842d242c626cfcc61c28 SHA512 6bb047c26399d0f4e07a4a4628c59faaf3d5673bbc1e32ff93137ba21fb3dfb4358327e426ef3772ea77acf21219246f54f3fcf669284c97d287d51e58ced58f
-DIST texlive-module-babel-samin.doc-2014.tar.xz 125088 BLAKE2B 46a2f81bb27ea0ba7ab41f8ca94e4c11a7053b8e530f5e9d3c0dfaf7621ec29c84d126f8236bb34137b5ce678192641a0c913e01200c7becb9594e2b81f479c0 SHA512 863e10171e9c55d861e2d5daffec3182019bf12f941562c3378739f2fa543feecda405403e3cf23f1199eac4b5b4528d243f3dafe2729f77133505327d680695
-DIST texlive-module-babel-samin.doc-2015.tar.xz 125088 BLAKE2B 5258c4d32b6342172fec7f9ef4a3cde7c4e16ede6c298ae2e86dd025c774f948d08b781c83fff964082b37cb04450ee462f0cef7ba9f67291fbce829a78023c1 SHA512 af71d18f7616d3a9b0056790afc696a06c8cf6a3e22cb17cd2c2551852b881c3fce35e4945dd2e3ab8daf43e000faf4ac8ee0bddb80dbc30d3a4edd89511d82d
-DIST texlive-module-babel-samin.doc-2016.tar.xz 125088 BLAKE2B c3944d33f19d375f0e37be2aaa5cb25b887e2ab0b002c74e25e03eedb0ecae6602ff679bc1d9f795c23d5543c6066899eb9007081cd185bedc0a51709b228a84 SHA512 ae1043472976161617e489b4f66a09f270291df4acb36ff302441d3aa25f22d2d919dad810904207a0bb8744db903dd1da0312736fd9f7bb7934f4e5df0d580e
 DIST texlive-module-babel-samin.doc-2017.tar.xz 125088 BLAKE2B c3944d33f19d375f0e37be2aaa5cb25b887e2ab0b002c74e25e03eedb0ecae6602ff679bc1d9f795c23d5543c6066899eb9007081cd185bedc0a51709b228a84 SHA512 ae1043472976161617e489b4f66a09f270291df4acb36ff302441d3aa25f22d2d919dad810904207a0bb8744db903dd1da0312736fd9f7bb7934f4e5df0d580e
-DIST texlive-module-babel-samin.source-2013.tar.xz 4380 BLAKE2B c074b2c54bf1e26167d5d9e69e597bf8bb9813f6674e2b83365b8bb97f362d2bf846288d190487039baa83652813b2a4d16eb2ff3e228f8f03c07865b988c30f SHA512 31d483e451d80088a47add909caefc7258bdcf8e2dbe64f976318b93dfb2fb2a15285a6aa4ca546a99730086961e1e18b2cdde7f48fcc13e71f08e1e50e33609
-DIST texlive-module-babel-samin.source-2014.tar.xz 4384 BLAKE2B 6e0b7e324bc3285fe6d18f1931d6f8e942718b4c889512fbae93c90b6eba288b85bef786e55f9dd1fd4b7dbce8968978955b3c7c586ed82da9a00521ded83518 SHA512 7cea692d8d48ba5921f0068bc9276bfd0a97285cfbf817abfde82be4ed7ea75636323e09d86242da1091b8a34abe90648ebabd9db6a5fbbf99478064e51920f4
-DIST texlive-module-babel-samin.source-2015.tar.xz 4384 BLAKE2B 22a3ffaba27fc79c6575061722ec10d08f6783f7fa2246552cf54f64faf3e30c67ef8e822940fe006cfff258be514fea8730a522d2e8b41fe2f1be691fc2e409 SHA512 54ccea0858a7ef857414b7f211fec228b947989351eba99c8cb8dab4f70bd9a899f6f92557551a4a04d190cb5575009024e10802f869c3455331ea9171b8d84c
-DIST texlive-module-babel-samin.source-2016.tar.xz 4384 BLAKE2B 2510ba979818f4e73423c4b4d6dcde06a773de02ae3168e99e937abe0a443aa2f531d80fe2058364b4c3bf5e79fd8992f0faa067fca517ebd4cea9629781a94f SHA512 9f9bbc48774d27647a3b9e0be231d2cdff926a5838b16be23f1eaad1decfc184e5a1e0b514919c7cb69c1f6c990318774784b3e68c52b8b1b096308a172fc295
 DIST texlive-module-babel-samin.source-2017.tar.xz 4384 BLAKE2B 2510ba979818f4e73423c4b4d6dcde06a773de02ae3168e99e937abe0a443aa2f531d80fe2058364b4c3bf5e79fd8992f0faa067fca517ebd4cea9629781a94f SHA512 9f9bbc48774d27647a3b9e0be231d2cdff926a5838b16be23f1eaad1decfc184e5a1e0b514919c7cb69c1f6c990318774784b3e68c52b8b1b096308a172fc295
-DIST texlive-module-babel-scottish-2013.tar.xz 2060 BLAKE2B 4617d27c0379bbdebbda4fe15d184b15cce40143185353f46b55ffb469b27029c8dddd705d3078e371601125e2a32e175190ff8cf393ec3ae3cefc2fa525264d SHA512 2450d8a0af8fe080ae28718bda7df625d575d0f0ad00334bff1326c88431ccbfe2f08bdda22157a7dfed9dc63ae19332d60a5e7ab401d06ab1f95d78f1d52e2b
-DIST texlive-module-babel-scottish-2014.tar.xz 2240 BLAKE2B 44224ecc48bd05988856a10f373e54c5b0f273d6ff642d7606158379e050395b2f74ea840d58aa045771877810df53145950c7657f56a6dc88da6ab8fcf767ed SHA512 9f191717aefbf5ce89c54ad0daa8db668ef35c8204a8ae7206fe8baeb1fbca07cbdb4c91172a6266b33a91b402b34dac9964f63621a8f73c05d59b714a6504fb
-DIST texlive-module-babel-scottish-2015.tar.xz 2240 BLAKE2B a28b764be73b52cc2ec7a004d0542a9cfe00624286c1f116d2b0ea38456512248012d3df8d8f392ddaba3f7473b444ca097453485f4e8a93a2890c5750f19e77 SHA512 f3aecb33a76799e47777d832505f35e9a4d4ca3ff139b7c11ef0517658002e1604ff8d59dca9e85e6f1e8b16ff886aabf96d6cfee867161237695ca48ab50d55
-DIST texlive-module-babel-scottish-2016.tar.xz 2260 BLAKE2B f4a6d9686c3f483fcbda3dc813e13c9d2f018571a4e2f86cc877f4bac0c1c038990a4e1a2bdc877def8fcb8f631d69abe188d8ba00ca3d36bd9644831ebe681c SHA512 dcc76201293c1bbfbca7fbbebfa39a3ccd6bab2097aa703a3b8e8ed1f10c2c0826146980919bc4e547738045787e2506fa4bfdf2a5c408e49033e84faffb17c1
 DIST texlive-module-babel-scottish-2017.tar.xz 2260 BLAKE2B f4a6d9686c3f483fcbda3dc813e13c9d2f018571a4e2f86cc877f4bac0c1c038990a4e1a2bdc877def8fcb8f631d69abe188d8ba00ca3d36bd9644831ebe681c SHA512 dcc76201293c1bbfbca7fbbebfa39a3ccd6bab2097aa703a3b8e8ed1f10c2c0826146980919bc4e547738045787e2506fa4bfdf2a5c408e49033e84faffb17c1
-DIST texlive-module-babel-scottish.doc-2013.tar.xz 113828 BLAKE2B 80e316dd517b552055763a24333835f8b96bb5b3b29f51845ab3028faeb2f9ed51111fbee3616b5769159e066054a0246a52d30141c8a0988303045cfc7be7bd SHA512 878099b485e7b76138715e9bfd709ebd918e2ad3aee4a5a422d130eaf4a9ece46ef3f5b312b5a12cf6d6f2e37e73df5a021a4f3003bec877912061383cdfcad0
-DIST texlive-module-babel-scottish.doc-2014.tar.xz 113832 BLAKE2B d1688f4ae1ac37ee318c6cc192956efcb98ea5325abcf54c9d576da8e09a05c35c86c7a8ab288c7769ec9f06be131d3e498abc54b71cb84abe5b97175432209a SHA512 060ca50caab23853b24e5214d5dbdfb4e3ef517398b8e8062941b9c047c2d6a69ebd7ed5f510b98b45edf3fd576279a2b85f3cd2eedfd4a47d5574bfd4f2d8ce
-DIST texlive-module-babel-scottish.doc-2015.tar.xz 113832 BLAKE2B 0393513000ccd9c629cf34b4b464dc7527e5bcc8080e422e482bbf7ea70b33c77044bb88d793363dd09758d5fb6e2fa3dd3a5fb193348707682087e6d035e2e0 SHA512 bb9341bc13be2bec7f9ae3183bc3d77e545633335cded9c228715778235377785aa840e8a7057ee172da6259191db86525a452fa4f433fca1b0838d0500da0a8
-DIST texlive-module-babel-scottish.doc-2016.tar.xz 113832 BLAKE2B 4a9e450c1b3d2ab497e16ea5dbd27b822cf89ad3110fbd77b5290dbbe8a8fb788f56b86f38bdffad3e030471498dcd3354c49da25bdb1bb84e6e37adbfda0ead SHA512 91186d65cb063a0ca4b96673b68b51d55d1728d72d124b87fc079e278598794eea8a4a067cbfe409b46bbe250aa4b14935db0f94bac6185cbc5444fc324aff17
 DIST texlive-module-babel-scottish.doc-2017.tar.xz 113832 BLAKE2B 4a9e450c1b3d2ab497e16ea5dbd27b822cf89ad3110fbd77b5290dbbe8a8fb788f56b86f38bdffad3e030471498dcd3354c49da25bdb1bb84e6e37adbfda0ead SHA512 91186d65cb063a0ca4b96673b68b51d55d1728d72d124b87fc079e278598794eea8a4a067cbfe409b46bbe250aa4b14935db0f94bac6185cbc5444fc324aff17
-DIST texlive-module-babel-scottish.source-2013.tar.xz 4096 BLAKE2B df093a99fabcde69c8fd37c3b1ec796344efe432cebf7e1805a06d9d4e94388fa79cca64580c70f0fbab209901cbca408fe9b5631d2089ab1128fe5151c7eee4 SHA512 c09d2599a0ad55ea23b68ec873b1660d3d584e95bad7ebcc46150cc3448ec3890115ad1bae95dd961f3890adc5ad9c94a3b1625096fba58c2f7708581c1795c4
-DIST texlive-module-babel-scottish.source-2014.tar.xz 4100 BLAKE2B 64728e0462c9525de21ec89b0c1cf1ed6f2f0e321dfb75f88d372185029628b1f92a70240575aced5b89e65f56fe444d4e70e381515241b81adf089d0ddf19f3 SHA512 d3cfd7e18c62398aafd5ab1825b66f885dd7bc5a3fdf35d9d66624ea63dead679cb16c0c1ed6c6f7415928083fb698de46aaafd001748ad19538c38d28d15b42
-DIST texlive-module-babel-scottish.source-2015.tar.xz 4100 BLAKE2B 8aad1f862af6fbd11f93a0c18a8a17a721b278e99122e3adf465abe097cf92a020fa2f3ccdfc1a7ce1010a0be1b20da88f86bebc1583ab9d0dbb14cc1588d7f4 SHA512 63f9c96bdf2ead6503be56a386fb1ac9766ef3d6084bf33bbcd94acc2694de26bd3d4eab9ac8d28eaa9d436c4792bc36e9179e55e08be3a0a57db90baf75acca
-DIST texlive-module-babel-scottish.source-2016.tar.xz 4100 BLAKE2B 3f6eac642279e9414e90e343af6ff12f533c2125030545d71a5651855ec1b22fd7f26b67ccdd9b5afd123b3be8dcd0740e5aca6f9453436ce08da910b385e313 SHA512 beb886e42de953b129c46741c4d4698d3c43aa5c9febe497f55c69db1e798f7127d1312b94f4eab9143eb80fbc0b973531da2d3a1bdfe12065dfe336817bbef2
 DIST texlive-module-babel-scottish.source-2017.tar.xz 4100 BLAKE2B 3f6eac642279e9414e90e343af6ff12f533c2125030545d71a5651855ec1b22fd7f26b67ccdd9b5afd123b3be8dcd0740e5aca6f9453436ce08da910b385e313 SHA512 beb886e42de953b129c46741c4d4698d3c43aa5c9febe497f55c69db1e798f7127d1312b94f4eab9143eb80fbc0b973531da2d3a1bdfe12065dfe336817bbef2
-DIST texlive-module-babel-slovenian-2013.tar.xz 2392 BLAKE2B 94a563a433dad7deefec0ea7a8c4dafb0dbbcd7d6c27c3194bb808d66dd5afbffd40dee9acccb3b59885c8595a4d0e0b6b493329a0691d37f0215187ba84bd26 SHA512 fc8134151cd94a1984ac7563b1614c171f617717165d4916a488462b0c9f6121a26bad916e3c1ab57c4873249ed1202f6b0beeeefca0de1bde7f17faaefddd46
-DIST texlive-module-babel-slovenian-2014.tar.xz 2396 BLAKE2B 0dc6d820d21851821fe7b7a4036205ad49e3c9d9dc44a26183b5e39c3aed321610778f7eb3145806111fab29f9d1bf1debd8561d150f912d62ee105daf8f4384 SHA512 0a4fc638d95d01046f33414e2cadd683b5cfdf7044d761b164ac92711fcfdd946405dc4aaecf22a191792cf579c250b03d8879b7b77144c6141f01b513f9a93a
-DIST texlive-module-babel-slovenian-2015.tar.xz 2396 BLAKE2B 71a3de0358ad36019cd413d34455211c22b0f305958843869dfbcd8fe86a75fdbce03b7cb0f94f01fdcde765b4cf2a94408e3ba8f45c58dcd87a8892b67dc438 SHA512 a75c35c89b012c414f4b9c8b6756f882c688229c240fbe8cc183ae61a1fb67c445bea89a7d24c0a1e8e1d8ecdeea4c1dc2f9f825f34a13692086500b2ce51ec7
-DIST texlive-module-babel-slovenian-2016.tar.xz 2416 BLAKE2B 4893bfcb7864e5d819675b836401697d10ba8d9d19fe4cc8f5b384f9d038a42385ae3aecd6e86724ec49c636d9a77feb13d796be8568d9dff274cc836d0d4d0a SHA512 57a6b0e9fbf34bcffdd91b87151033fbc89389643f6f303b9dc6cf9ceacaf5b9b3312160d117bb06741e421a63b65767aaae2b41c6545353ae9ac30182d27944
 DIST texlive-module-babel-slovenian-2017.tar.xz 2416 BLAKE2B 4893bfcb7864e5d819675b836401697d10ba8d9d19fe4cc8f5b384f9d038a42385ae3aecd6e86724ec49c636d9a77feb13d796be8568d9dff274cc836d0d4d0a SHA512 57a6b0e9fbf34bcffdd91b87151033fbc89389643f6f303b9dc6cf9ceacaf5b9b3312160d117bb06741e421a63b65767aaae2b41c6545353ae9ac30182d27944
-DIST texlive-module-babel-slovenian.doc-2013.tar.xz 127592 BLAKE2B 5b1fbf8f2e8fb02769a83c75128981ee605ef905eb250caad872b72c4aa7a130db59874b17cdefed424833977251b61b40423b286068eb508ad3232bb9d581cc SHA512 10a2d3425eb4da61478469c3fc04ac39dc26560a93b87066e87b4c7dee8afc2deff45f822e291f4ff57615f4a8c381b6db987a57a82157f50284402117063996
-DIST texlive-module-babel-slovenian.doc-2014.tar.xz 127600 BLAKE2B e6ad292500eefedd51f6345562a511cf65e49f25a9a12cd8f89c946e6791bbfed78c87e2ea11e65a2b326a4e6ff89fb3f12a5351eb9a4f5d2506b8fe1fd4133b SHA512 c1fc2af0f5356ea3e25d2722025a52261a82817cbdbcd0c6b0b0ccd577723dc1856deb802a622abdc578343f06aa9e190542ddac7e63389e050b3653a176440d
-DIST texlive-module-babel-slovenian.doc-2015.tar.xz 127600 BLAKE2B 287ac974cc410b4e48681599aa32793ef5976fb32b3080aebe68f6d49a61c176d4793f1e40d2516156deed196ca81ffb07b3c27f94cedd07b2d460686a974e42 SHA512 8ce3902e43f2444b8d3da6f6f2a6e96ee1a5fb4f3fe2d5d0cd8526bf8757f553d56144e3a8cd4e5d0fe31ea1028f874123e842fc6e3e7d5d8046e321f14deac3
-DIST texlive-module-babel-slovenian.doc-2016.tar.xz 127600 BLAKE2B 6c76ce5ce9968e0bf1b740b50f981e9442cff0db3f66840ccdd4f2f2bfe400177c3473d4e16161ff0e746a70c074fdd857d069bf263cbc3e81e1f0aec1fbc760 SHA512 36ee0c7d86174e833e499bb7e202f6d58d2315690b6bf4dd63b3225a564e749f41521efed804c8cfe625afa5d54680cf700912da4970bed565cb0f6183864472
 DIST texlive-module-babel-slovenian.doc-2017.tar.xz 127596 BLAKE2B 3f89949fc9ec7853b5c396d0d099fa0e24c927a0c449b1d1bca8ef064a2d2c2c3ea33a51c3c1c9b54aa058f0ede9a396c2b3dd60d4fc9fc73f67cf4e3b7f38df SHA512 610d7c812fd90bf7ac42dc3212ff181e48dc82f13ba0d2bef2bc12ba4af62690854b3af233cd3451c0dbeb328cd8639a4b1831655f4097e90ba90e333da74ad2
-DIST texlive-module-babel-slovenian.source-2013.tar.xz 5336 BLAKE2B d6e95c07cab1451e9dbc2447dbdac9599af3d423951336ba6289454d621b5e27725e91cb105ccea4e5cd2d0c9be416f4626cd1098223c46ca6758f3e66f217b8 SHA512 6b4d8d8225ba629aa014c02a431ae951022792a79eb5a408c71a0bd1476d95cb316719c90b432462f080619a222882c2c6ec1f6f940f4279208343d68c19e37d
-DIST texlive-module-babel-slovenian.source-2014.tar.xz 5340 BLAKE2B 3fe2ae558a7f1ee83d909de20333ee982ae22403c3002cb1283b1da889755e0ff905b80582debee5896da86228736d0c8765b96bc98dcc379092a6376679fcf4 SHA512 f6380ada97e497d0607ce7ef756b92edcdc960861c6f2bb186cf0248f01c7123806fa3fa16ddd4723fc33bdf9f0792ea69dd9f7b87a1a4fcb7c741d7bd623ad3
-DIST texlive-module-babel-slovenian.source-2015.tar.xz 5344 BLAKE2B ac9ab08fd4d71338fb39cc5251ad17d474432976badce32d0a12e24949eaa1d2654986f63095d9d6a7663e39c1d7a58f3c207670b8a784766eb20542113cfd63 SHA512 b0f157705dc89f7242129de4da4875f57a94182d2796714dea3fccb22d397f073f967a2d03accd2890187350cdd543683d7995de76539b322747251cae50b5f2
-DIST texlive-module-babel-slovenian.source-2016.tar.xz 5340 BLAKE2B 5ad6865f1fed977ccc1bcd31e93dbb70ce2a7f65f56724bc15545af46e4685fba8bb7bec0726cf014204d58a19ac374a146530c6d46dd0a02b8535b99de67517 SHA512 522de5e80af7435aaa9b0fcf67c1f5b32f757a7a5202c9e4179d5231ccbb99a14fb0f5e224f4d223b6c8b2059aae6889d5e8ec770cda9117c63f7b22cd241a7a
 DIST texlive-module-babel-slovenian.source-2017.tar.xz 5340 BLAKE2B 522d0cdf7045fa9687545ee75ff591c510b4fb40d74db0671ee1873be43513584cf1ecf60cc80199eecb7954203de01bfcbc441564b05503750e96ac14faad1c SHA512 d83473154397f24af1db40056211ddca45584c23add004f5d29811562dd675399e8e48548269a2640052f14824550b8e33cbed373ed6d3dce5f00805e615362e
-DIST texlive-module-babel-swedish-2013.tar.xz 2664 BLAKE2B fbdad1ecbf672c2d84fa98923fac0fdbb8cbcf604a90e5a8e754a589e5c02260ace274942a3f904704ade0396020cba31e3cf6509d557bc1f062c3a00e7652fd SHA512 dee43f27b2363a332cbc10d67b816414c5806d36e3967d760cbbbf435e1ab27033a02ac349df4e57f53f1a3b63dc7de63261c9eb4ec2854c55c9d8044c8b97cf
-DIST texlive-module-babel-swedish-2014.tar.xz 2664 BLAKE2B d5330cd9f2279c89af910247833a8066f21e6dde90d07d98c7f31d43ff7b4331c47825983537d14280c3ac38aa45f5be3ed2abfe6ad8cf9a1c7adf810c3f7f9a SHA512 2747516cbe8c31befc584343a6153d318d811195fe694c6a97f84302790925c8af6c8d93cfc25c9779789f3123a51f3459f87cd865121f3242e72c5163126aa2
-DIST texlive-module-babel-swedish-2015.tar.xz 2664 BLAKE2B 4be819a7cf28677c8b96c3c82140ecf16d933053f671b8a16953955b5d4902b0ea728db5aa69aa2a556a09539a5ae53e9b999142d3571d0dda9718d62eb4fcab SHA512 6e60e1318e45dec2f42f2f602f3a661833b73f27c45cbbe1e6829c90377fb482dfdd94876a650541793d98cb6154e06476c34a3da503631192d6b76376ba5470
-DIST texlive-module-babel-swedish-2016.tar.xz 2684 BLAKE2B 9aaec6b79b931a9ce44fc5bd3f7e47181b8aa4a766da649819d9443cb2d5692cb0c21e897727c17be6752eceb6d3b47ff6e5d186c622c44a5563f3c2d80b0f27 SHA512 c4adb2cd26c59ce978cd41514af297261a7e5ad94e5c9928c776f11f10cff5b629efa71df280881148190f5b8d7ffe80f8a986f0293f4c4bea5adfccf1e4ead6
 DIST texlive-module-babel-swedish-2017.tar.xz 2684 BLAKE2B 9aaec6b79b931a9ce44fc5bd3f7e47181b8aa4a766da649819d9443cb2d5692cb0c21e897727c17be6752eceb6d3b47ff6e5d186c622c44a5563f3c2d80b0f27 SHA512 c4adb2cd26c59ce978cd41514af297261a7e5ad94e5c9928c776f11f10cff5b629efa71df280881148190f5b8d7ffe80f8a986f0293f4c4bea5adfccf1e4ead6
-DIST texlive-module-babel-swedish.doc-2013.tar.xz 130180 BLAKE2B dfdc6f06ec400981b1680891f173f5c209815bab361ab80cbff249c6b37bcfbd90942c6665d32b03f840e70505f13bb813b9e3d6090f0378b4e5c71a2704f551 SHA512 be15e026b81fb58a46d883316f23f56a84aaa84523024577e0bc285d89635deb038c389953728e806aea5709daea20e422b6b49dd318bafb0b3c0f0f381979a1
-DIST texlive-module-babel-swedish.doc-2014.tar.xz 130184 BLAKE2B 8fc295de5d49e7bf0036592053eec45fb1382cde7f863f2de8b1c901f45208a2b21114c3619b7be93cd4ceba790648c8498bb6c8107f3b254bc8b521745bd1bc SHA512 c62e83039df7c5e1dcfec625b3b10a7817f1e09d1138625eaf7d2a8b90865358d1db86cad370f9d92123872df3c143e7e9aa53eb7a8377998923cb2160ad5a8a
-DIST texlive-module-babel-swedish.doc-2015.tar.xz 130184 BLAKE2B 2c765fe7c77d24c99befe364011779d09ef0d9c7d044660a96d18070781b9a734f2da4d5aa657d04182641bda49086c1dab394953a9f3da66008e049b489c7f2 SHA512 b53d02e45ea2df5a879255502657143121c15ae30497ee9dcace90df55401598a78e2927499f662a3418edef7c94da91380759e44835c5aced650d6ac0d32eb6
-DIST texlive-module-babel-swedish.doc-2016.tar.xz 130184 BLAKE2B 4f95df1f97b4f6210412ac654947c966753ecd6c967065b2c14143692537340cb9330094ad84e3c70216e625e80c7eb96073093808a3f7e260889924d790de94 SHA512 ee51d8c0d27b73fd8c8862ee2dc58322befeb99d4131850917caef8480745d6a159626a842e316ccff1c33775a566d543eb6d5d6de6080e63c4bc473151a6bfb
 DIST texlive-module-babel-swedish.doc-2017.tar.xz 130184 BLAKE2B 4f95df1f97b4f6210412ac654947c966753ecd6c967065b2c14143692537340cb9330094ad84e3c70216e625e80c7eb96073093808a3f7e260889924d790de94 SHA512 ee51d8c0d27b73fd8c8862ee2dc58322befeb99d4131850917caef8480745d6a159626a842e316ccff1c33775a566d543eb6d5d6de6080e63c4bc473151a6bfb
-DIST texlive-module-babel-swedish.source-2013.tar.xz 6784 BLAKE2B 56a793d1561ab40a7458272c0454238adaf35f98c625ca190f847d292dfd7a88b41b86a1172aac4038eb7df8f4cf3f662f42731301392ae1459f3329f1082a6d SHA512 b7fbd854abdbee918ae57541bb3f55cb460e2546983bcfea0ca076e3bf214667e23ba44f095a63a34305abf645b4843f5bfa08d946dcfcaf6a9f4ad75bbd222c
-DIST texlive-module-babel-swedish.source-2014.tar.xz 6788 BLAKE2B 14e0bfb56cb29b4c5ebdf46c1140f8f3a68b073f887c5eaa709ac25e03ab649969f3871e3ecc3e4baac5ec28f7597eb963c3816fe2489e971241dba762d50ae1 SHA512 30666a5b2a1a9ded8e226733df3481b48603a667a5c84ab6a0842856aae3128fba3ec174258f34be604e458285d5ec096edbceaf6e944abde9fb52401579cde6
-DIST texlive-module-babel-swedish.source-2015.tar.xz 6788 BLAKE2B a89df546f197cfcdb5385ded46800a01b918e71b91528c142cfcd69c9b929fdc65025976d1d180618abd09337a8f6acb732d898af3d3d3b8cca5eb0a2131a817 SHA512 59261f2526a297b8e7294e4d5a10f0958c2d180b83b2d8f3b41658ec7d2ba632e46eaa3bc68b933a5d556c20abf945fffca0128361a61f1182cee9ceb750b3a1
-DIST texlive-module-babel-swedish.source-2016.tar.xz 6788 BLAKE2B 434f7e5828d8f06bc54e2d4e35fd336e1ea3566acddea9e2e038d64a9b52c5607bf349df70fcddadb253d1e96040dd9d254e7fb8b047f9a59a0d90bdf3dbfeef SHA512 bbbdd2ca2570dbfe58716a5966c4741a03b7979f24dfb42ca1da0d73a66a29b5e340df216f906472e91f98c2eaf1c3befe116e7171b8a5ac8d1632dea573e1d8
 DIST texlive-module-babel-swedish.source-2017.tar.xz 6788 BLAKE2B 434f7e5828d8f06bc54e2d4e35fd336e1ea3566acddea9e2e038d64a9b52c5607bf349df70fcddadb253d1e96040dd9d254e7fb8b047f9a59a0d90bdf3dbfeef SHA512 bbbdd2ca2570dbfe58716a5966c4741a03b7979f24dfb42ca1da0d73a66a29b5e340df216f906472e91f98c2eaf1c3befe116e7171b8a5ac8d1632dea573e1d8
-DIST texlive-module-babel-turkish-2013.tar.xz 2440 BLAKE2B 31060a65aa76d79a8244e87aca298436738a2f072256cb41545fcc40a9f7bfa0b3ba03792d6f160e4c85210c0dc96280db43fe576911c8e7fbc4248e579faed7 SHA512 894949e907f80184c8a907b707054446b0ab55af45291fa7f842e54c9f9196fdd30c628ce90df8859e1b779aedb3f0b616739f9ab8739dc3e528708b34575397
-DIST texlive-module-babel-turkish-2014.tar.xz 2916 BLAKE2B da6a8a9d37009de6441fdfb73d94396e5f3316a5b396f77b896b7598305ba441429147b409eefbf8e87796ee5dd1e3ab60337ac5025bf323343a961b5b70f560 SHA512 88d44f59073e6c8be9558523c20da0db3160e767595f079ea7086d4a88bfd45d030ab5fb9b1f7fee5bbfc74d165fcd99fca884f31cff3db6fd6a51502d26cc6f
-DIST texlive-module-babel-turkish-2015.tar.xz 2912 BLAKE2B decc15a29bb1d6dfb5a7f067ee30d8a0cdc22a95609d73fc8dbe54c5e0ef0fe8945517ed0a61b3363b8a8a6cb7bc79e1bd6a934591bbb24f687029a24e17752f SHA512 84654ead0dc0781765bcab97ae036aac5a8dead6afbc9b4ac4916be709f92cc3943f22d142dfc8174e13e2295a7e1e566823f9969b2c857de5d796d207546844
-DIST texlive-module-babel-turkish-2016.tar.xz 2936 BLAKE2B 093019aa72388eb3ec3a1d8d9ada3e3c052fe872e8e567d64e5d751621f026be7b451e773ae3a53b37a3a295f850e58f9ae8b8a88156ea908c660674050acad7 SHA512 2723fcd26622214cfd2e2f8b049e2cf1019446db7321314bbd186aa4e9e036f93c5532c8675e06f63844c6bcfec64c66227bd850319e3b63e5f98392f05ee747
 DIST texlive-module-babel-turkish-2017.tar.xz 2936 BLAKE2B 093019aa72388eb3ec3a1d8d9ada3e3c052fe872e8e567d64e5d751621f026be7b451e773ae3a53b37a3a295f850e58f9ae8b8a88156ea908c660674050acad7 SHA512 2723fcd26622214cfd2e2f8b049e2cf1019446db7321314bbd186aa4e9e036f93c5532c8675e06f63844c6bcfec64c66227bd850319e3b63e5f98392f05ee747
-DIST texlive-module-babel-turkish.doc-2013.tar.xz 121624 BLAKE2B 700c5de40c3be0960e4245a686f6b2a3fffd02f00a3d604e30aa393fbd655676672d5f4810a1fb09550b90810fdd48d48115bf0a5a439a9af4b0939b1f5ba610 SHA512 439b6eb67aa87f27375d9e4cd25365f2246d6f7595e5604080b195e5414f7ca23aa798d9d445826e78d02cd1b9b8d9b150fd4a00a743ccf5b3b81cdaa3c0ab4d
-DIST texlive-module-babel-turkish.doc-2014.tar.xz 267188 BLAKE2B d330ea36691d4896ee4f14ebc721e988f9b74ffbd38687e950a2d7d4e3878d7ea9a620fc2004c70e8b0239b87fe464a1ccadb787506f993635498762319f53cc SHA512 08dd038b3000a2cb4f6a37d1924ea524d08ca39d2fd95b2f2f7f218d0a26f589e5927eac4b5fa0c436de96b59dfbb7704d145147659d45187832b82e18c5fae8
-DIST texlive-module-babel-turkish.doc-2015.tar.xz 267188 BLAKE2B 99d3c044912aa8b6ef3b405713cf124ef2615cc5ce5260fbdede9f1688e98b4cd38027de2659c23f18ebf5be77ac87f24883471c4133de547bfb9178ec8d4c16 SHA512 d6012d4f49e7d9972026287a86a99b1644325595498446ebc1c97527519915e3edc76058a5df08d5da3148cd4541e92d7cab4592dc471845ecde2eb00c359c55
-DIST texlive-module-babel-turkish.doc-2016.tar.xz 267188 BLAKE2B 002fd726f1cfebfd9e467ea101db5c32248c1ec036e7355c127c5db54f0496a5d3e250fb91f846e9d4e49ad296bdd4ce0a33ec448328143676e988546bac9857 SHA512 4e5b7f3270c09a0207f3211aa0afd19a9f5556ad343ce34ebc771b1838f80928f281b068da76a87e5165b3b8247e3634242b413450e3b477b970a30dc95a66cc
 DIST texlive-module-babel-turkish.doc-2017.tar.xz 267188 BLAKE2B 002fd726f1cfebfd9e467ea101db5c32248c1ec036e7355c127c5db54f0496a5d3e250fb91f846e9d4e49ad296bdd4ce0a33ec448328143676e988546bac9857 SHA512 4e5b7f3270c09a0207f3211aa0afd19a9f5556ad343ce34ebc771b1838f80928f281b068da76a87e5165b3b8247e3634242b413450e3b477b970a30dc95a66cc
-DIST texlive-module-babel-turkish.source-2013.tar.xz 4908 BLAKE2B 9adb41e459ff83e819276332a069162387f4fc5f7de067a6e97c452d25d1099815acfeae69532bba761b31adad5aae57fc11ab8975e6af23f8bf4baed893a50d SHA512 941d7ceb842682e9374e672811f35b6152ef93910297d2d0a4a32b4b84a5eef9eaad8f95e87890aca9a6028e4fc637ef6d3e3400277585ec331f34676d3bafb6
-DIST texlive-module-babel-turkish.source-2014.tar.xz 6272 BLAKE2B e058013c796a5d518a3716577b0b4d3397470b6fd9a163dd2055336bbb40aa1e1f6357eed3f01892e2b2a50e56e1180ea3311dc110de959ef2a98aec0cf79ef4 SHA512 c66ad714dd755a620a275b98bc9f7e67fe333ebfae42dcadace653973797e26b61942e4d6b05fb754e228c744c1507001c53f2975367b4eea936d03a438f869a
-DIST texlive-module-babel-turkish.source-2015.tar.xz 6272 BLAKE2B a6c2ef66ee48cc5cfc09fb1ae395469f4e3a55839c7de55a276aef34409c7e811636781720b4ae763c48c9b81f8c13584cfc19269119b99338daafea3ceafb3a SHA512 a0e19c84c37c2fdb237b0ed24baf23a7a57e148f58e178bf11aad80aeeded8dd450f6472188f9ae6aaf552c3ecc18b1c279195bba510682069662ebabc1b34a0
-DIST texlive-module-babel-turkish.source-2016.tar.xz 6272 BLAKE2B 133dbd21749c645262e5fe763ece27b1cc13159a1faceab82bda025bb97c3539b2ac719c912b5d2a7dc9dfeeb69775a56a03f45cb5ce8ba1b7924aab14a86175 SHA512 328671c1a95700ecd7d05c9b995f8ff174694b459c224b3fe6eb1bf8b46c4c839ecf428e55c84880f7fc19ce94badee8f3815ae1b8eab721c34a7fc7bc6293d4
 DIST texlive-module-babel-turkish.source-2017.tar.xz 6272 BLAKE2B 133dbd21749c645262e5fe763ece27b1cc13159a1faceab82bda025bb97c3539b2ac719c912b5d2a7dc9dfeeb69775a56a03f45cb5ce8ba1b7924aab14a86175 SHA512 328671c1a95700ecd7d05c9b995f8ff174694b459c224b3fe6eb1bf8b46c4c839ecf428e55c84880f7fc19ce94badee8f3815ae1b8eab721c34a7fc7bc6293d4
-DIST texlive-module-babel-welsh-2013.tar.xz 2260 BLAKE2B 300a86786d5494e0b22bad2757dd335c1be88d436dd661c27f3cddc2930124e0832a5f61d10f990148b56af0481970c5929454939cc068367187703518dad8f0 SHA512 53924a751ebaa6eef5592708602227201e769e5fc88904bb4889f5e2347b0329ddd8a950326fe4b1506fe56863069f1fddc5573ca3940e43f3b8654212fc559d
-DIST texlive-module-babel-welsh-2014.tar.xz 2256 BLAKE2B 25f6362354a180819bf89d3a081b0fb483d2ac6ffbf8530716f85cbc793584f0d46913d7f32d65f6444ed4cab878008c53dd20bd8aeb9ea5d43dbc9b5b046b9e SHA512 fa6ac86f0a87711a8aef608460544dc6227473ba5fb26a7edd1acd358818c6b7546efcd4e7a39502d12882a2cacb1bae945b033b7f406d6865a13d49762a0878
-DIST texlive-module-babel-welsh-2015.tar.xz 2256 BLAKE2B 00e7a9aa700c64935116d87297e564db05726c71765a1d7da8527daebd16647c1967917d5b5864b9db3ca563cfb8f5a5d190796c66123b38d3b84a7b7d145d58 SHA512 17549788f0bd7ab15fc5f9111a034cb8e0d2834108ad703452b43ed0a69f0a53edc294eaeb0734fa29d4ed9214c5c1fffb896a8cbd984ad177d027c18dac8158
-DIST texlive-module-babel-welsh-2016.tar.xz 1836 BLAKE2B cea78ee2f1ffc977dbff9567d117cc9d2b5a3ce105a644227e8c5f5dd6dce01a27b4f1395bdc8756cd78616ffe5abd54c56a279e3c37d3ad779dd3b0f14aa4cf SHA512 6d9fa08e22d46641aa04e315cef6f02c145cc79aa6ddd4066e11de3fa8b02d189421fc2f3c09773785ebf65e4486b5c45b74b12ebb934176d77324bbba301a8e
 DIST texlive-module-babel-welsh-2017.tar.xz 1836 BLAKE2B cea78ee2f1ffc977dbff9567d117cc9d2b5a3ce105a644227e8c5f5dd6dce01a27b4f1395bdc8756cd78616ffe5abd54c56a279e3c37d3ad779dd3b0f14aa4cf SHA512 6d9fa08e22d46641aa04e315cef6f02c145cc79aa6ddd4066e11de3fa8b02d189421fc2f3c09773785ebf65e4486b5c45b74b12ebb934176d77324bbba301a8e
-DIST texlive-module-babel-welsh.doc-2013.tar.xz 109344 BLAKE2B b7231b6bb4c9a2fa6a5a2b0dd8d22a9f4edcd49eb0e8988e52fbe0167763db32af362409f0a08d8bb1a99eb9de13b8727f2e6429b4f24fec180796c2f916492e SHA512 d683a2d1fb880b7fc8d95c2eadd3ed14918eeacc621ef4b258ed00ef85bea5288212ba041b7ce2c47fb8a96a94f1cd92e415722bcafe7fadf6c29b0c932cf402
-DIST texlive-module-babel-welsh.doc-2014.tar.xz 109348 BLAKE2B 62ba7fcad784ca30dde8d84f1eb437136b176ef28abb3dfc6134ffaf3fb5517bf9ad012db7609d41ce329b9b8c7062aba78d06f64d333473b7dd57d8f9e42a72 SHA512 e78f22640b2ea266318ec2d355a809cafec9c8b65054223c5c48de23b2856de131cf88aed0e54654934ae8257115da2f8bd6efa52c5196f31b7bfd1fe0907e70
-DIST texlive-module-babel-welsh.doc-2015.tar.xz 109348 BLAKE2B 0f85b659e17cb661f3a94998a6a1e191fb7632343414987e86fb9c64f03fbc31a3e5f053d6d829f02f281145036c2b6442094b46cbab569cd19f180fe8c7eb76 SHA512 bbbc0ec6d954bf5c52ec1e87917e903704d46e6cd8cf09c01515ab88756e80155f626ecf77e2c4e358bef4e258bfaab4741124387351664ac35c77a894a1b0a1
-DIST texlive-module-babel-welsh.doc-2016.tar.xz 111652 BLAKE2B 29fcbf0443f657211b4f4eca93290ab80d07a2790c0273a60cb848a449507c7600c61c8107a2eb200d545cb23b32f5786a75a3688bdd8fb7d30f0a6168b2dee9 SHA512 44f4fd0780777d62f6b3746f8373860a27d4ed72ac072efe60882438aed4d2a133211b6267b1136ea9317a6cee35e9f22baba4af1b7fde93e8dbd032182714a2
 DIST texlive-module-babel-welsh.doc-2017.tar.xz 111652 BLAKE2B 29fcbf0443f657211b4f4eca93290ab80d07a2790c0273a60cb848a449507c7600c61c8107a2eb200d545cb23b32f5786a75a3688bdd8fb7d30f0a6168b2dee9 SHA512 44f4fd0780777d62f6b3746f8373860a27d4ed72ac072efe60882438aed4d2a133211b6267b1136ea9317a6cee35e9f22baba4af1b7fde93e8dbd032182714a2
-DIST texlive-module-babel-welsh.source-2013.tar.xz 4036 BLAKE2B 07dcb7166a2b4c5fc135388298e7d675a8db751a035eb2b442e29ad9bea5a2ac3cdd0b798615e78af14becefa718687011c5be57792d1db0aef13bf4ed04a621 SHA512 aaa1af4c31379aa52766a1a901c305c2b759b279bdfdb82aefa7ec8d7a10c1e8c421690a13d258ce8ab3ab7cf961afa22f9234b145a078bf98a94b71d669465c
-DIST texlive-module-babel-welsh.source-2014.tar.xz 4040 BLAKE2B a0d18cd6acc80722e7c343d21dfb3b54544e16e42b73bc6d9c86cc6ea84c5d25317ff076d11d84ab519e68ba4aa1a43cb82e103c2ea0ce5bc67e8e6480f2e175 SHA512 2471a2ca684cc7c49a98146a58414ec979aa7c65167c2624d1e7699a1635eebcbb00582011e1af09c6515d753ee27f45fe1d71bba7eb7d2f8a1bd1ef97304334
-DIST texlive-module-babel-welsh.source-2015.tar.xz 4036 BLAKE2B d1d5f43268c553910b2746793fc4ac46fb06da684404f4c8c049e405e0d2e5407a20a34690276ac079696c9b015be5677ade88485a1881996cae6968aaf96adb SHA512 99ace890b9598e7ca9561b13f7ff476900229deb8663899aaf9269e02530b71e3830b02e029f5e3823f3698cf905b421f4d34ff02b961e824ca35106e891013d
-DIST texlive-module-babel-welsh.source-2016.tar.xz 4100 BLAKE2B 4d50065cf36241a9ee35e70f6b532dcb5a77104db7fae15c4a5da4d89497b58806b8c60c848e0c94afd80ea54c330f2982c23f3d58edee59ade14e713250332c SHA512 5e0e582e3cb4b2f63b5fe3ffd2a1b81dfe226d786ded3b44cca890d0b1a6c4f2183e70adf9dacf508b847cf524a2547075a9652c78727ac247abf25dc017e392
 DIST texlive-module-babel-welsh.source-2017.tar.xz 4096 BLAKE2B 3227bff4b75ce01c890a83aacf803d1c536c4e65ad79190be91438a3ccaeabc65991ae5d3c9905f31fa1c257cc5c1295fe985190ffe0e03891a4afc72a845ec4 SHA512 e6ecd9685f022eedfc0dde2e3107290ee50c99cf376b156b15341955b345178ba68b3682dfc6b77462dbd6a6618d828f1ebfc8ea89263cbea9457e141be950cd
-DIST texlive-module-collection-langeuropean-2013.tar.xz 656 BLAKE2B 060261d43dfe8ea7383e926e8e5181ad8a318d8774de94159c320b2d2b942b1ec16b802c0a4a06ef6afc51665b9d5905073653824747cb9d106fcf3fb9520c2e SHA512 a0b94acfbe5e8e8cdd0401e2a8712590df252c928b9adba5d13d992a4f98e9c722d685c02b6d450b9485c2392619b15200276ae23f21363a3a5d18ab64679645
-DIST texlive-module-collection-langeuropean-2014.tar.xz 660 BLAKE2B df3d00d7afe5e25aa0f905ad2eb67913651f46c017dca5b88e03fe3f9b8727173aa91a552e0e53d6079b789e0c0ecfec5bb9dd04b25ef0412401c241484e1c66 SHA512 289f55cb106f6af1c3397217a2e7ec642e2e39ee5415e46de74672f58f0d6270babf5d8b18a37ec353900d0d8a870ef148f11389fd3e0e0fb82658efdf4ca982
-DIST texlive-module-collection-langeuropean-2015.tar.xz 664 BLAKE2B dd7472c99a8fb58728694cc09f28868ea2f39349521736b818427b8a75c85c0733b59e6f656f25958ad001980d9ac0e90280192100880e759f348eb1978f4f53 SHA512 02ab267853e6b6eb677e2d85793d20b8220758a08783686be9d24b10b256b8a2d91f5c56156d60eb29e9c8033fbde144041ff5507f0a195c3cafd37a3d28da5f
-DIST texlive-module-collection-langeuropean-2016.tar.xz 692 BLAKE2B d148a0790655983a91ade24c5914aca28a27c8804898961ae1c46e56d17b6016abe3f490a51cfbf96cc08a783018e37eba3da2237cfac512ecda4f8c5965cbd7 SHA512 c6793c076ff9c53630b4e775c6d8c2496414cf3de480ed9bb7395da61c97535835cbe01e640feab956a951c1eeccd54c7dbf0d8c5a3271df5d776182ccf442c0
 DIST texlive-module-collection-langeuropean-2017.tar.xz 684 BLAKE2B b8bb9a313ed1bea271ffc517d2f1101eccbae8972c839905acecd25c0c5b33f82564ca5e3fa7988feabdc502aa2dd79298f9c6c3a0ac7717632991a0333e2aea SHA512 7bc24cfd71b6f4952c192ec214ac8823219ef3ac6f1eee15eeabb1117f89d6c2f7f4ed85a7772b62d8094d6f69b3234b95a1e6be34634125f465f8c81911d255
-DIST texlive-module-finbib-2013.tar.xz 5356 BLAKE2B 793b7f3b037db2e3a3370d9e4e8b49b183a66bafa412afa5f0e159fe832b7f5cb39b1eb747fa941d47b4fa1e124b990a8e508dd62d1e0249f07e9bf14fe3eda1 SHA512 701d986ffe3d93a02d210232ceb3654a85ec5d9e9c96fa9bcec33ee5e445de801ed729160b86407f434305bccc65fa7d9d15207526ea452910d8ffbde001ec65
-DIST texlive-module-finbib-2014.tar.xz 5356 BLAKE2B aeea092899bd5d8bc8303e3df23ad7899077548031452d894f9762755de5d8510f78fc7425862a8c910773e2ccc8bfdfa87b98662625ce34a7bb62dac9f745be SHA512 eeef37693e2255ff0d279b60d09296ac4906852e3018393fd663445c33f107623814d398b85e8c937a94b2a32567a62d5e96e6df40bc7112d8f345dedbffca8c
-DIST texlive-module-finbib-2015.tar.xz 5356 BLAKE2B 3f54c5b3a25a371684fedadd040f9e431dfacdfee14f6bbe6390aea6e6d1a3a1b32c52b8c2c14f1e0fbe8cc81d515250894320572a4dc69eae69044dc00e31b8 SHA512 ef295a9a274cca0f0097fb61fd2c80c28c0618e9027b924865e19afcd15eea0b26f26b276c14064a98dd6c393847d2efeac202289b0b6e78f42bb08a82415511
-DIST texlive-module-finbib-2016.tar.xz 5372 BLAKE2B c8f3eca40488b6c68d0caa83d378db09f7879a577360a5a39280fea011e40440199800976b96b779e7b01a0e3111a30573c5670f3a26e4e05dfa5110c00f8eab SHA512 289aa1def321104982527f209de652841521de265be58795c3aa0ed36a65f6cdf34002b71e33651039709b026a6bae69152e8964661d47411868b190fde6fbd9
 DIST texlive-module-finbib-2017.tar.xz 5376 BLAKE2B 0c56ee8169b6475363c2586c8a9eaaf8e0ca31c6098d240a6398359749aa3e4415c669faeb86cbb96630c278efdf05559c461ed9954e480a55c89cd37047197b SHA512 3f69a708594493bc4aaa4c2fff6777feae389937d08efb16cf61ad62e175dae0bac5a714826e5ef0c6edbbecadd615ad3daf824d809297241ec3f43746df8884
-DIST texlive-module-gloss-occitan-2016.tar.xz 2008 BLAKE2B 3c84b835bcef016434fe2d11969dc87a892093c12fd29e1fe0fb5e2e4da86a2cabe139921cd985ac70426c5aa26a08c3688c266ae7b974d4222980df924514de SHA512 17c22e54c333a43b11c11dd2671b6bf158f0bca0ceaf1f3ded3933101a9bd6585edc8bde23c4c04b2f6d09020934b7f86b4247575ce4c805093d1076be6d3cac
 DIST texlive-module-gloss-occitan-2017.tar.xz 2004 BLAKE2B 4741776d4ab58bec9431a16d3b8fe18e79309c774cd53a699508cf7166192b0e1bf4c8e930cb45e6cded6947ef1177ca941840a876fb289ff2744b1629fef309 SHA512 7e0f4a379e49d01e6a56d35064faac5ee59127760ef575b7c1e648f7492deb0889874d8c2c3ad252e643bc1cb44e55d193e6f688105bdfc362867541657636a5
-DIST texlive-module-gloss-occitan.doc-2016.tar.xz 69744 BLAKE2B 282e6fd5e4de960c39fe60bf9367a7a2757bbfd85e7899f70a484982af828538c91a32519e12385d61899940f06052a1daf9510a63db0025f974e5a58ff3db8c SHA512 07f3a8550587dc3f79ed2b2746be7a07e558f67e2904ba02db3d67ea3e0721be482168f679d665b44aefeb87c00bfab01fced85c1683d8099b282ebb90c9133e
 DIST texlive-module-gloss-occitan.doc-2017.tar.xz 69744 BLAKE2B 282e6fd5e4de960c39fe60bf9367a7a2757bbfd85e7899f70a484982af828538c91a32519e12385d61899940f06052a1daf9510a63db0025f974e5a58ff3db8c SHA512 07f3a8550587dc3f79ed2b2746be7a07e558f67e2904ba02db3d67ea3e0721be482168f679d665b44aefeb87c00bfab01fced85c1683d8099b282ebb90c9133e
-DIST texlive-module-gloss-occitan.source-2016.tar.xz 6340 BLAKE2B 7e50bf261fa8e43ae72631c57ca312018ca11a071a59524fdf8ef95b4bd8143a21158ae710db347f0e2cde63180d96fa0259ecb681588b264fe9c4ad99f2d099 SHA512 3e7e5bb839e6c3cef17019c63253f8c87d62222fe45b30a2f506701187f0b11395c03c0ff22eb0518a34f64c8858baab537cc5eabe90118a1c38e63745168686
 DIST texlive-module-gloss-occitan.source-2017.tar.xz 6340 BLAKE2B a4ac6348568b5a94cf9cd357e17da2b805e44fe1e38912300c2c8ea386731dad95db25beefbfb860ac5a6bc4417eb9488a62f04944b768858fe05de6defe44a2 SHA512 f9b753eed0154880178e0b44841fafd5b038951db122c5dd84899da57f9c27a811bdacd5c5963a956417e650c09524276eb312cac2986c7b18ee51097b79c89b
-DIST texlive-module-hrlatex-2013.tar.xz 3524 BLAKE2B eec1635b306da2bf3c8f9b7c36bfd70eb5d7373643c80abd37f664813ca9eae4e9d87161639b9de5feca8dadce187a7d51323b46054b248bed2682147e0390c2 SHA512 34f6a249fa3f51ca240cc581f0b4b00fca9ea6f8d022a1a4db472ff1364c53fcfd59679d9a380439c94e22e52bcce98a9b1bf7193ec425f4d2e8ff28610410f6
-DIST texlive-module-hrlatex-2014.tar.xz 3524 BLAKE2B 9b439be8ddad0cad3d1476883e330725a42a1a6d9461815791b78469d415b7ca8ea971955d342a0550e6a1ecdcef4d9bb76ded158873d15d738f318eb6b2d9de SHA512 55957329dcd5f1a95d9c81bf24007dcabaa7a8e68aa43eda8b437539bcf9f70f3cfdee240c66439c9bf0f70e029e0365a5b0b376a2cecbde1bfc09b4724b1a1e
-DIST texlive-module-hrlatex-2015.tar.xz 3524 BLAKE2B db134c41d675ee5ff34e968dc1c203e0d5a7a6bfb70284d4f880fd0a884bbce361db67d11fa4fa90c004ed899b634df5cd1bd9865dc6d772cebb01d1f901f452 SHA512 007896e8d9cce7db77a802c39906c47110a2d6457f02d2999f40927fc28bf8c8df28857dc68c4fcb77b453b5a4ddf346d86310c6784e2316444ae531540635bb
-DIST texlive-module-hrlatex-2016.tar.xz 3532 BLAKE2B 10827828d97afba51637cc98029b4a0f084b05f1bf6f4f8afb7419cf3532ffcac908ba2b291f20e9501b899cc61afcaeec493a57186f6e8ef657b7546f8c6c33 SHA512 055042463e8c428e0539613f8dda2cb6b675f6570490062ffbc9779d118c4dd4768748761edd70292d8d0cab68e51debc9adebf0e8ca62d3fa26bb0d5475295f
 DIST texlive-module-hrlatex-2017.tar.xz 3532 BLAKE2B 6e66c220a87b0fc5a967399fe4993af2603a7938ff4d2ffd08f10164796aa65be4a8481c315c8f839ebdcec32e539463a9a216740c7952766a3cd3dc7e7e3a6b SHA512 e8346b098213a26d6557b61a7b2591fd2aebd0334b0e59582c4dd56a1d9b71ed98cc9cebd3dd2256274cd0534c1e9413fe40597d9a902e9438e04719bd67221d
-DIST texlive-module-hrlatex.doc-2013.tar.xz 98320 BLAKE2B 0accd90a1c3434dada11d37d78ffc50a30d090276a2a1591053e7a9ee8ca3812c538395e8525d117b723bfee9a82a95665806e888107ee2a726221d75f22b613 SHA512 3e3caa4d59496323c91141f4bf80c2e8a4e26d88f0a35ff7cb92eefe7fed289d17d4a89042793165ac177c870ff9ef64b5288a444849b1700f353c4299ac9916
-DIST texlive-module-hrlatex.doc-2014.tar.xz 98316 BLAKE2B bfb1ad70b54df408ab2f66e99de6577c2b9ebd7a821808cf08425bff19a9f0334017a6b3b49afd54818a05c4310925675ec970d913f34b6ad4f107ff4f3163a3 SHA512 ad64863b85ce438b010d3da2f8d0d73e9e005b15b363325b173c2b3cf337797ae8e52baaff110d925a11efa5d38d39020a8135117cf8b2684fb7c4d5ede054c9
-DIST texlive-module-hrlatex.doc-2015.tar.xz 98316 BLAKE2B e9f7b6b377017a2c0e9aea4bfce4c549cdd989a9999b6628f52b154ed710c39cf4b30a4480d1f62dec3e358549fc60a40c2efb6bab9c6b148cb68359d86d6244 SHA512 53ebd69c63340beb1ff2b65a1a5e53aea28deac61f8a67f665eb6b60772496355da0ce208f5423c664871315e564e584d5a1ff961d69f233a666c23a62650124
-DIST texlive-module-hrlatex.doc-2016.tar.xz 98316 BLAKE2B 6ff7c6eb5e7400977fd629d155f48b234e27ad3555614df85a97ec885b26ae66dee5759b996c308c1b1af8817a54c6b3ca64dd829643a2b053249790f398eafa SHA512 af1a57ab10b61b75c6f5500a7a5ce3d13bb5f081efc4f358072e10004610c7c1ecf2b7f7e87f5187b48318ae0c6a942b6965d8470f2427be92fd1a08d5d7f45a
 DIST texlive-module-hrlatex.doc-2017.tar.xz 98272 BLAKE2B ada8b9e2effeb41cba7017701a00bd705f94a8b57434d3e1b88a4163a4b4ec9350df111a1f7474c4bb074f89a8ac1b1786da834c0191f562cd88685c4400bd8c SHA512 aeab5548451f3f35b6b9a41c378fb3d9d1b90edeb975e5f6e99e2a481918a51f2728047e6010a44480a63190f731269a43c43432bef6e3b2092df9ebbc72b192
-DIST texlive-module-hrlatex.source-2013.tar.xz 3768 BLAKE2B ee49d3991c53f04dea9f9eb14accf72100ae1ee34e772ab6d4691459e49400d502bbceae483adb98657981304bf1f1e6ad20f8222bfdd1a7080aca79c5d856f6 SHA512 42f252167a2bfd183ad2e7f543a626cf61af919c326d21d975ffabd11e72b54938d2846a27e33cc1af62165d51adb509eaec3824cd22cf9665b5586c1dec6c94
-DIST texlive-module-hrlatex.source-2014.tar.xz 3768 BLAKE2B 650bae544ef25cfd036c9ee6cb561eb8f1ed1f4a86af925c616dd199e36faa7d90a7dbe4a01bd82d9181c92594e58ffce57979eb7f863c849416c23e3f5b98a4 SHA512 04cfdf094ecaf6b11f71f51141228b66793a7725faff631ab95ee8dbbebb3d595391bc8b1c7ea3bb46109ca167c1ca05fa46cceaa6fda8c4173a75d56108cdfa
-DIST texlive-module-hrlatex.source-2015.tar.xz 3768 BLAKE2B 4acb9af855a7609837074a8689c88d9f561b4037c6b82217c37380bb5ecb32bbea897443126c04308a34176ac61ec21adf8232d1afa4c95d86636f6d0a800cac SHA512 b110b9591b067a3b2ca164d993c13b47f452d19f03b15d03f2d3b9008b65ff9239c19a070998256155e8417ab70ffae55986813e1aebcdb5777ee92608ce6f71
-DIST texlive-module-hrlatex.source-2016.tar.xz 3772 BLAKE2B f3d62c290f47f20d0b1e836326c4248e8e6f86c5a7a9f6b7ec04c67a373f7d8838f13b9ff649b9584742eef6b5d5eb29dff9bf3b438f088d6ae848cc2a9d0d2f SHA512 cff2bd29842b3d7020386015e082a2602a1164983f3c239d7d8c9954b6f508163d4adcd4c40998e8045dad59080f712a0b080c054b0aab8923749aa305e0c133
 DIST texlive-module-hrlatex.source-2017.tar.xz 3772 BLAKE2B f3d62c290f47f20d0b1e836326c4248e8e6f86c5a7a9f6b7ec04c67a373f7d8838f13b9ff649b9584742eef6b5d5eb29dff9bf3b438f088d6ae848cc2a9d0d2f SHA512 cff2bd29842b3d7020386015e082a2602a1164983f3c239d7d8c9954b6f508163d4adcd4c40998e8045dad59080f712a0b080c054b0aab8923749aa305e0c133
-DIST texlive-module-hyphen-armenian-2013.tar.xz 396 BLAKE2B 764ce696099addf1eb4bb3f0f6dedc219ecdd69e12985a6606f89d04e33b7ea7dc0caab7586ccdccdbae0d14627b473baa86c6dc8fafbf4df30b6178e5ff5680 SHA512 a60ff37cc9dc94472e59e13bc5e78b381a8b1689032a3aa42dd2cd701fa647dbba4d54a75ff4c5f76b42b1311ab392165009f7159a82143af5bb223051fb5f37
-DIST texlive-module-hyphen-armenian-2014.tar.xz 396 BLAKE2B a0a6213f714e1c76c200ab3252e31e616ecb62ed3e91d606f8937a9a06bee4f402c50452660a25361dd6b8458f0b8c3c1eabc329e6de38f82c6ea693adac308c SHA512 da371568e9e187ee1e9ad63705ac02ed13205cb9aed16042e318a7e533d1a7daf3ba75d8e62afd3005cd87a868c096a791c6f74df01f459bd08f6191b999f551
-DIST texlive-module-hyphen-armenian-2015.tar.xz 392 BLAKE2B 22478351902af64374fbbbc244e2c2d084d61b1c0fcdc6ff3f7c32aec05c8e35269302b91c33f1ab8f91e033a572f91b0c52cfd0e7600976dca0089ba373f152 SHA512 e9c5544e861831a8aaf7ed9dd1407deae65cb2f95ebf20c7dbf45784e8563d1be1bea017475d774bdbac4b0c73da50e46c8205a00609a690b77d05f37f469d45
-DIST texlive-module-hyphen-armenian-2016.tar.xz 2716 BLAKE2B 74ae986fa5cdf47dd4f6c6f2dd781c7414c9b681823c880bd15a88f948092415bc8d382ac2a4974b0b53b48d5b6f6d129fecf6ee23d48a64b2c69c593d6eff24 SHA512 27c2cb9f2a2798b2dce4edb8b99285af0c60d710783f520fb9569b4c2597048626388402e5e665e52a3f678dc9aceb6d7e024509c4c37b24783cf037dc1526ed
-DIST texlive-module-hyphen-armenian.source-2016.tar.xz 1200 BLAKE2B 8078bb4ee45fa519abc15bb73a4acf384d7fce6a71fa9cf6b4528eb7c22a919c5b2b50b74c82515bfee05a5a2c03645db2360ce28d2098dd3a8237e56ae09b49 SHA512 c9a837775e4b092f3db5179c028cf29c2e04bb4e7abdef378a4b1162de4ca9b05ae8520be9070c9c25e6ab85feec8757f38e9f9519d4b25d34a6cf79577c3e47
-DIST texlive-module-hyphen-croatian-2013.tar.xz 476 BLAKE2B 94bf7f8d669160f17e569ddb2fa6a2ff030648a508d7dec751113dde7432ec6c53a5d5542d65e67dac39f3ff31b1b8046d5bc211e9bcb6978bc0c332090d3728 SHA512 d873c27ecdf778701956aaefe73de16dafd07b5457f98a81128089cb42219b2463dc436d187e6da9f488bdf758d93acb81f7dd522752c8bffdaf90e325ac211b
-DIST texlive-module-hyphen-croatian-2014.tar.xz 476 BLAKE2B 5df5e835b6dcac3514b260bc2a56f64c258fa8c676428b4f35b57557c5d8de9516e81cca85bcb4380838b0943c69be3d32a7579dc224e0032cd02807b21acc6c SHA512 c8b3087e913ef64fdb523975dfb868ce1defb1c987de7e9f2374954031ec9fc0f4b05cf092e4e0349027ec0404d0787a78b6bf4c72a6fd4af88ca4196a2bd50e
-DIST texlive-module-hyphen-croatian-2015.tar.xz 476 BLAKE2B ab618194140c9ce63a2160ce57aad4c096a6984431218db0d36edc47d6c24f73ea37ee06bf080d12d1f4e712b6049c9882c90216586efbdf5548992d34c42dc6 SHA512 5e1d38920cc2057ac5e8e19552a7ca40f70ee7b5f15683595a3cc7845ac715076d01e41b9859b5bcc5ad0c83ebc2296a105652fefc40ba6ffdcd4e73e775c018
-DIST texlive-module-hyphen-croatian-2016.tar.xz 5604 BLAKE2B 8dcd651f9e74463c0fb8a95ac3ebfcb77ad557405ac45f1cc07ad8390c8207913c25888f1f8bfca57defb6981e2ef05e8d4ae7707ebee734a276bc04e027bf32 SHA512 4e53a044df6edc763fa8d5c4be54bd00d47f45654089b03e45076f02918ea17810754d47ffef8bcbf2c9306e7ecdedaeef760629be9ea7a4cd56c76c2e5a2e75
 DIST texlive-module-hyphen-croatian-2017.tar.xz 5604 BLAKE2B 8dcd651f9e74463c0fb8a95ac3ebfcb77ad557405ac45f1cc07ad8390c8207913c25888f1f8bfca57defb6981e2ef05e8d4ae7707ebee734a276bc04e027bf32 SHA512 4e53a044df6edc763fa8d5c4be54bd00d47f45654089b03e45076f02918ea17810754d47ffef8bcbf2c9306e7ecdedaeef760629be9ea7a4cd56c76c2e5a2e75
-DIST texlive-module-hyphen-danish-2013.tar.xz 472 BLAKE2B 91c3d5b50fdf3e3d74216e7adef14a61a968bf3057ad264349b3c0856e40447141adbff0916092b011ab7f76eb525f7c7b8c34a7bc3cb221d265cefb20b2dca7 SHA512 f13381f84e012f1dfeb40c97a18186aa18573d5a1bcee3d583f766b6b10f6244cc2bd7170629f5f5f987704777a8611f26b1ce3e8bd640f810428bc1744ee7ca
-DIST texlive-module-hyphen-danish-2014.tar.xz 472 BLAKE2B 590de7925d914795f74369153a36e99907c9c2d1a04f52c3dca3549b7cb86c59180ae17b8e26a239854435c6e8be6dfb795443d91273719c2792c2703cea4d5f SHA512 c35a4f2142e0d668f08348eeb3e5fcffff1fc4c9b2a38ccd3d582aef3d2bcfa5e534049b8b30a305cc09996f9453a2badbd2bc35a2d3a15b12c70fbd7b6c448c
-DIST texlive-module-hyphen-danish-2015.tar.xz 472 BLAKE2B 540b6b10156f6645b6c6b1a4c5f797e2fb6f0615c432cd10ad5dc3bbec079d1ea623dceaef37d6f3d683fcaed89cb271117d37ae4a0cbe47beeb521cef53a612 SHA512 b0acf471d08f4387fc42d0f619d54f40ead32a169389d0de47151169610f13bc793117f3b48c06f1695953d5e143ea518730dd5c45569106ad67d1fa42a504bd
-DIST texlive-module-hyphen-danish-2016.tar.xz 5812 BLAKE2B cfa8b94968634b79316fcd3e0d7567afba9e20de144451c766b07fca7deb3339c25e1f4c55dca9b3407979c3fe7f1dd8e6e036aa36ae4f16b403dec750ac26c6 SHA512 4ce4f9ca2461556726ab7a6e939a359d42dfa0e33dfddf286a5cfeba57449f32efda4e472fb4f0db11226fd0cd0e9b785c0c9f29eec92eabed4589302c82037b
 DIST texlive-module-hyphen-danish-2017.tar.xz 5800 BLAKE2B 508bf8ab9211fba9e207acfa251f0d38a2a40acdbed77058f55fcc34b2692cb14523dd092a0bfe2fb06b7f74ba6daab2ecb11e80291821b422a5347968771f09 SHA512 a4ff436442db5c0f6726986ac4764c8e21e9e224b6cebc4f296de4a00b7efcadc60857ce3cc4fc5c75d6f48873de7a86af99e7df15000a5174d9355b46895c25
-DIST texlive-module-hyphen-dutch-2013.tar.xz 500 BLAKE2B 50f87863043f764adee9177e3422acb3ea621669337ad3c542d1e4080b6eac0f32dfe616d53501240cb134605be8a7e741c0f57a3f162f120272cd6a948bee0c SHA512 68844175b3fe9d7e02aae5380d4465d0c5a3fe5fdc6200e78d1deb6b2e04641c5ed27fa9b95227ad3da32a00a17b6e694df902ada891a2cd8eff72bbb5ad2da8
-DIST texlive-module-hyphen-dutch-2014.tar.xz 500 BLAKE2B af91821c8793cf2e23e5f5d2873cb8c671acb4896f4631f7e751ecbb2752d4c88a77ee1216dbe84d53e51d5813be569395ea3b9eecf655d7e6b081c0a93f84f2 SHA512 2ea5cfc18bbf1b0cc1390b9df286dd93d6916cdd7a77794fe6292c37dade8a86be14750792af4f68b48d60a056d7942737d42baecb2e5d9b8c087088af85e4dd
-DIST texlive-module-hyphen-dutch-2015.tar.xz 500 BLAKE2B b2dcb77586ae19fccea5f925280511b28962bb5230c8b288299fe874b90d97f015b66d35bac10469902399edfe4f80fcb9fefc85e9322bb3898a14b49c2084ab SHA512 3dda6ddd8efda17d76f482bed2730335abf201bf8f8903c26088302b187deb79bee4325328244984619f40bc508f960f4962df199e844bb01ea8a9cb2abfacee
-DIST texlive-module-hyphen-dutch-2016.tar.xz 38028 BLAKE2B 0a2467811ed05619aa7ffcd7ca845d5dba37a0abecee3af798c11356d884e31c0bfc9b0b415304b9003cf03de0541bc0fdd4167c6756d72e806f325f4d826e3a SHA512 89aa4d22b2543e7cb88d688d6dee130d1bd499108df77ce00f58e1653a99d33737614643a95e96a5c48f21c7ff07a46e8edcb0a978d9318d302e8d25f3783f7a
 DIST texlive-module-hyphen-dutch-2017.tar.xz 38028 BLAKE2B 0a2467811ed05619aa7ffcd7ca845d5dba37a0abecee3af798c11356d884e31c0bfc9b0b415304b9003cf03de0541bc0fdd4167c6756d72e806f325f4d826e3a SHA512 89aa4d22b2543e7cb88d688d6dee130d1bd499108df77ce00f58e1653a99d33737614643a95e96a5c48f21c7ff07a46e8edcb0a978d9318d302e8d25f3783f7a
-DIST texlive-module-hyphen-estonian-2013.tar.xz 404 BLAKE2B 781949c9becfae88482c12045e9dc5d5026741258d5e8de5e94d3db2062d02634d070f4bb18737c455df9d37692ff66aa391548959fb6d2dfa5078b642371793 SHA512 bc56bcef501cfabe3eb0fff8d7fe75b91f34e667d8ddb591dbe726b81694ff7b2145953160b467c8186b8d5e7159d705e37a25d4fd8dfd09adef710d7c69ad1a
-DIST texlive-module-hyphen-estonian-2014.tar.xz 408 BLAKE2B d7959ed92e4a0f21394e3ef8fe39ba7f7653d3fce20d4c6fb8ae900601d267ca7da717296c58d059099951ac13762463c21772f2686d0dcfe4a3634c16bdf7a6 SHA512 c7ca40cd4e3f988a4a01caa4c1b9eefc40bb3709a00f0eca765dab0fe519891a986c5de24a2d094c6dd9aefb18cc688c6ee92eb33a3cc574bda500d9da970007
-DIST texlive-module-hyphen-estonian-2015.tar.xz 408 BLAKE2B afd08e4c2d2e64de9c722c47a4d7d6dfa5bb2a7d0ac132d7642b6cef2504d9266faff628d83a3ed2469917843e161e08a4a69e90c847c7e8bed74dd84c0cc1fd SHA512 826c3cc917463cfa467011f6084e4173da0116d0b7cd9f678a7be12f42b370da5375c198f98fe4f89578637c8bce1265fa360dca09c41ccb9923944cde0c1ba7
-DIST texlive-module-hyphen-estonian-2016.tar.xz 14696 BLAKE2B ad39ccc188229631c5ae44b1ec49079b9a171fa270ac445306663c2e48913dcba59d56a24f4e6895aa56317eed2e9000b02a0c2aa12007a3ad06635d4ae8facf SHA512 db53033ff29ced7254334828ecb0a19a50f1688579418c235890783fa4a440da2ad85dd312177bb68d9b639dc3e0a35c4f21db602e2073fbd8c8a2656b4c9bd2
 DIST texlive-module-hyphen-estonian-2017.tar.xz 14712 BLAKE2B 445e888f5be25bb1573cfecc695873c7632b1629691abc3356a038a3c5e99eeb563c36961828bead36bbab3490a141949bbb0d6dbe6c23a6dd2d1960fde55952 SHA512 33e44148383cebc4f8b02f606f7a6d874fd58a949b2f6ee367223e61769abd46f10f5b01e9c6c61a99b467cdc22715f96df0113fcaad9c943a126af7270af1f4
-DIST texlive-module-hyphen-finnish-2013.tar.xz 468 BLAKE2B 5dbfb26d87bc26b6819ec0fbb66aab90ebde43e3ab36e6c7de4a7e740c4e0a075ab61ce8ea842683ae2a00a1bf846921c7380c53226b1541612e80e0a967eca6 SHA512 486a107766582e3bd62ad1af595ff9db7878438e1ef7c8bcab5f750c8c143d0b6a4c371f0407b95755f394a45a11b5ce3817b998a14186b0c5e8fc523aa65aec
-DIST texlive-module-hyphen-finnish-2014.tar.xz 468 BLAKE2B 201fcff962fa1664ac64eed2eb132090e836dcf74563a42094d89d268f58e4adc0f0a6a4f272188dc0e949859c588477cf54d68a98203f4e93c06f23ad1b6b7e SHA512 246c8b7221a4eb53afa7b8689cb890e45472447607086d35f96a0683a2af1c8b894067091e64e9fc49bec383c897bb5c74503a275405ebe093abcd4a6dedcbaa
-DIST texlive-module-hyphen-finnish-2015.tar.xz 472 BLAKE2B 02d6721d1ff83113ada5b20e9c62f322e0dd93ecf445ed2f9f0822319c09aa74521cc32de6f13d7e82cc06975ddf97524f896f8d54c1664fc3211fd79a567be9 SHA512 6339e6ed39a5282960000d9cb01c3cce3d397167d3ed00a1e289119664bd8f42ce9662e809fbbc540a561053c273a805022a5c167ac8880e484beeb3420bbf09
-DIST texlive-module-hyphen-finnish-2016.tar.xz 3732 BLAKE2B f282578af150da16b11e583ff6b4811891359c8ac0726343165622aea5864959fc41448921a0b664bfa3b59b82b69e63e16dc41e606d707ab11450a400efb3f8 SHA512 a1fb2964f4dbd1396e8c9ee3bd8d4b64aaea4e8b19aa57dfcedbc95dcf6b20b7288e39e59eb4207e9f72d46badb7aa30a2dd5d25501e5d8ac930a9bb7bdb5615
 DIST texlive-module-hyphen-finnish-2017.tar.xz 3712 BLAKE2B a89e0748dd188b5305d4cb51ff9e14c4d0c4364bb671cdb200607dc44791372bc68e316f42d457df8fb35640c0209af0c848d5570c44ae68e64b4d3b9018bdeb SHA512 dcf030330637ffc6fd89215b9c7e5abaaa4dec64387cfebd3d63209cd742a022c5327ab7a45c3ccba058a21c7843fce8a6638be78534f2ddb7021775ec86c541
-DIST texlive-module-hyphen-friulan-2013.tar.xz 524 BLAKE2B fe13ac7a769069c432b1e2dbe6ef63f28070e74d482cd4d49855bf1ec0bb2400d13eb58b9937997ff02082f048401ecff8ae9a4c5b8caa9c15b4c60adf4d714f SHA512 270b530e72ca29eb02b4d7466d124f4067edafe965fa05a36d24774b37730edfd7b98f0656733db9b8d9575d9f25f629029c50bcc276da2b7932dd0582ca0163
-DIST texlive-module-hyphen-friulan-2014.tar.xz 524 BLAKE2B 501bc06821fdb0a7b9addf73d6504f920970c18257e9e79f9225f590e5485f7058945f94cf8f813700230e72d11bbfb5b3c2a889d70cea683c2be9b94ea8857f SHA512 a4290acffbc43819e05d5b5da6bc83bcda6f3b28309e5553b54c32652e7470addf22565502f3bcb57ed6ed920321348b623f86493eedb5642f1adeffc165c8e8
-DIST texlive-module-hyphen-friulan-2015.tar.xz 524 BLAKE2B 6099a949641ec003be7c17cdc82ff168e91b88bc6f67288f5f536be33318cbcd8d223c09cd74aa7020d355443d6a86c64b71989463bb206208beb9ef8b893137 SHA512 bcd482011370f7b4adfff2f5b8d5ce2c3c261a66a70a6c76b4821ffc6bc760673a63f18a04b5ffb716719f00cb237a88d314bad1878bfacec99d1b1864f61c51
-DIST texlive-module-hyphen-friulan-2016.tar.xz 3364 BLAKE2B 472bc78ac5cf24cdfb007f9c064966fb87ddff550f78207a75a1f8d81a1a6317b85f83b8424fbbca508aeb7411f7d724e9e1e3f39901a1330ebf00542c4a27d0 SHA512 457a47ace9c6a62c87170167aa8999c962adb4cb3c2eb82d14088c065bc134b57408157146c087e4a24c9e91d6a750635dda46c661a0fe8c1d6456db047f7002
 DIST texlive-module-hyphen-friulan-2017.tar.xz 3364 BLAKE2B 472bc78ac5cf24cdfb007f9c064966fb87ddff550f78207a75a1f8d81a1a6317b85f83b8424fbbca508aeb7411f7d724e9e1e3f39901a1330ebf00542c4a27d0 SHA512 457a47ace9c6a62c87170167aa8999c962adb4cb3c2eb82d14088c065bc134b57408157146c087e4a24c9e91d6a750635dda46c661a0fe8c1d6456db047f7002
-DIST texlive-module-hyphen-hungarian-2013.tar.xz 504 BLAKE2B c0fa3e4f913c1af57b31121848a1c4835f69f4471ce93e453e0c25052677d65d9805d8e032f025fba60e588752a3b0d5971a248f2f2a18110db07fbeef5c4a10 SHA512 ec9d365e687764a4097b1c84cec4ace54c4a1721866d4cffe982ace80dfaa35098ecff3575b5ddc465d11dc772d1bd48bdd63215f0b1e7ab51d893f190df6ad6
-DIST texlive-module-hyphen-hungarian-2014.tar.xz 504 BLAKE2B 2ad34a8c995f0556592928564021ba473aa9dbb5346e95f7e79ae710f0cf0e093c9920bc14cf905c47190f150f82d5bc7df421df9363f1772977d70f6c6a2403 SHA512 517b6e58b0fbc0ed0daf020bfbb9a56a4a409c3c7e730be12d40a508583effb50ae312f7ca71728ff9bd7d4c396e4a38675f012bc552743119dc3022eaf42ae1
-DIST texlive-module-hyphen-hungarian-2015.tar.xz 504 BLAKE2B 949cc0500c77f672535eb80463fa98eee1a264e6277612fcc134c891424e494ec473c1fb7eca908be60fdeb8dcba3990bcb4d8084f5af2d1a4fd25c547238637 SHA512 3828cbad8997d7e29ada1c40831a8b9c17e721a49b9549573bf86fa7376ec370a5f8c6e3deced105e4bec11c267b4b5b750915267c5b919147e99b69ce63f1ea
-DIST texlive-module-hyphen-hungarian-2016.tar.xz 286104 BLAKE2B 938a8812444071026070b8e033ffd24150f3c7cae042cbd8ca22839b8d7e0dd456169a365ce24a0736c985c7dc361883c388c34c7a8695fb84464fac73f16c0a SHA512 65c78a0baa2924dbb863edd3a93a5f980969593be92872659da535c4a216eec14fbfca3e778267f03a495cc71bb13d08488431196ae76913e0b898ea4dd6c4c1
 DIST texlive-module-hyphen-hungarian-2017.tar.xz 286108 BLAKE2B 2fe670bf718cfe10cfbe3dd6b864219040be645fff3748c45f0af1a5a6a366f9ea1d787e555701891280dc11a368171c5d52d8e27562e7cd8f3a71ea6fe1954b SHA512 c58ffcb0f5ef0ca338ee5dba8d520fdf935f264c042112eb016ab99fe5beea68158eae11c3dbdf8148fdb771632df16a7ca762526e8ceb0282a774839463edfd
-DIST texlive-module-hyphen-hungarian.doc-2013.tar.xz 99388 BLAKE2B 84bcd052077654f9d9ae2b02bbb047e53108816dbc5c12db7b39b578967eb2c9c37b840c43439e0c0f6478a3796c326c8d4b2407a03c515e02fba927790c65ec SHA512 baeecdbf4cfbf9f4a28f06b1e2c82ea701e7e2138072a2a7d50fc31c1b1342a5d038ad3fcfd71d1c7133d06d8e5cbe7a5b4566dd8951503461a8e5afff242b0d
-DIST texlive-module-hyphen-hungarian.doc-2014.tar.xz 99388 BLAKE2B e7f26d113c49564b9fcac9357a48f6fe906beb7cb4a85cb9eb16489075c32601fe70a9469939cb77c53c0d0dccb51eeb26d8b523f22ead59a827b11f0495eae6 SHA512 9954d3d21a672ece853ebc885c6f62c4f882417e6044bf24bb277a62b5461e45604e344eb80f5fd5b69b8a953874ac0e73481520d29099d2f9a30aa26884e58b
-DIST texlive-module-hyphen-hungarian.doc-2015.tar.xz 99392 BLAKE2B 3dc8bf05f41588132f83ca58c8fe88cdaf67b4060cb65b9e252b2ac9f14a3510ee932c30e2964327046a577d8c3f5dec3751d7227dd1d71361638c987c0a77c8 SHA512 4b2954520e6b3a0e271fc745cf594faeb35ee1870fdb6591091d9d47c0473db904acdc6a76f46c7e5b885a6a077c170ebe9a49173a784488390978acccc52b41
-DIST texlive-module-hyphen-hungarian.doc-2016.tar.xz 179892 BLAKE2B 02da26412a863acd541014eab368dc1bcf16e50e0cdf9e4d511028488ca975aaa488496e059b3762e7d71f766e0bf4b15cd71c8b289a52ba6e338886e1b58f09 SHA512 5304c7b2be670e68cc946c48cd2ea148da8f5493004fd8090b020b0bf2c36154df999ab72ea9fb2f7b51b689712a43b452a96d5e2a0a275d2c0afc1ce2cfa31a
 DIST texlive-module-hyphen-hungarian.doc-2017.tar.xz 179840 BLAKE2B b4468bafa8625c035277e5104749ebda9d84c408e3b4dc9b84419d59776145245a1d4654d4db2236e39feb56d170efd44c109381feef713f8c165f4d80c45419 SHA512 a14d74bb141abab2cf92a648b7114ed766ceb00de155846ce58c6bc89c313e78ceed0b4c68f4a69b5093a5e6c54e1297c7609548fbda6be41d5e83d59bcc1de6
-DIST texlive-module-hyphen-icelandic-2013.tar.xz 476 BLAKE2B ef0dad9443159493d3a45aae2b90c3b8c6dfb26afbf8b8f9a1838e2430bd0f16cfc74995a6fbdce4f997ed90a3e7dccf0199368e86a49b1f616d57f1c7e247ee SHA512 cc6d60e3d00218036fb690e09ba86fd8545a7bfbf61765ffe751db23d0d73db653a01b77fd8db7a09784077da0915c2fbf767c4c75b89903b554eacc1d09e912
-DIST texlive-module-hyphen-icelandic-2014.tar.xz 476 BLAKE2B cc5a0d5f7c486c57f576f6dcb8f9ca7c62319ad3ed65dd8dd3ddefb20f2cc9d7d76864cd4fcf1bcca0dedee9567439a2e1ea4adb2466519e04a4b379a06e9434 SHA512 7975d9a206540e1090aed37aa9b1784c4d7f83bb29dc61a98e8a3f3fcfedb161d94c3db3b07174a0a57d26a2e9fcdf6c2cc0e7f99af615fa57381307014eced2
-DIST texlive-module-hyphen-icelandic-2015.tar.xz 476 BLAKE2B 80e07c955c5e9e79b3820f97ac7673496c17a737fa660a7f37efd981a9a97f5bf743fadfe386c6be19a37ca1f8cf4b1770201d763c9f44f3a47ad2719273be92 SHA512 7ed4dcae0d9b17612b6bd9a6a6d6fe6eb4adbbe9333efdf9c95a576a1d25c21a6c4b94d4b6a303b21fd339c88691612d9c46b0d11edf430354dc4c7ae357dc9c
-DIST texlive-module-hyphen-icelandic-2016.tar.xz 19588 BLAKE2B de7a4ac52746b68f4ed553e33ff6890c61fc7d91f274656f08543cf01396ec49335f668041cf27613fe12d5c7acf125693891aa2bddcc34b09db8ace99f1debc SHA512 1d8b3a86fc314f7221fbd6c1d7310019d398ce03815c0800e9b3e1348c7075cbeb367c921c58f8c2d1dcf9292f676ae409f1549699f4f602468a181f4559d655
 DIST texlive-module-hyphen-icelandic-2017.tar.xz 19588 BLAKE2B de7a4ac52746b68f4ed553e33ff6890c61fc7d91f274656f08543cf01396ec49335f668041cf27613fe12d5c7acf125693891aa2bddcc34b09db8ace99f1debc SHA512 1d8b3a86fc314f7221fbd6c1d7310019d398ce03815c0800e9b3e1348c7075cbeb367c921c58f8c2d1dcf9292f676ae409f1549699f4f602468a181f4559d655
-DIST texlive-module-hyphen-irish-2013.tar.xz 468 BLAKE2B 00445aa6ecff447d7a6d1b7c7b69048d8226a2296fc1d43fa348dbdfe4972d9e5822151ef7b51e563753d324134142523701b9e5714bbfdd28551c905696ad52 SHA512 7423b4bb06dd9359bfd5b177fd0aa627ff33f189ecc9f955f5e20d7ee5e6aaa28ccd9869d09269d087dbc92380c1ce7338788ea623c9ce6f22c5506b1ed23695
-DIST texlive-module-hyphen-irish-2014.tar.xz 472 BLAKE2B 91883a612dbd966e3a8f9dbdd7e3d3f32361dd3bdb793d793a883f89cb76f263c36d13ca1d34fae2a4faae3320456a7c9407c97a170f2d76f34dba1c9e00e892 SHA512 b017b257775e43bb8c860b958ccf96203c9eea23e09344ac9c7de06c0aee3c44a074e387772468dba9a3d070c5f7c6789e975fbd55cc02c52591975a795e9862
-DIST texlive-module-hyphen-irish-2015.tar.xz 472 BLAKE2B 6e8198a4e7dc52e0e0e8ca98178f919739063edef97b93b12718ac2571b71ba87f0e62defaf560d65f4a77226fc134b8670e5f06e9a92aa9919388082b46b81d SHA512 9e6d2fe53aaffa0c169e33bc87181b46d2154315fd794bbf0ecd1dfabebe87d5df0f97c02df7bf9e41cfef39a77417d6031a33e9c043de227ecfbaae588c1ec9
-DIST texlive-module-hyphen-irish-2016.tar.xz 30448 BLAKE2B 6d00357646d9fc98a3aac64c319863f2780a1586d5218bbd0087d102c920d04283a7d37db3545d0022e0fbc27fe5e44859dae18f740d8db705e3d0d955566a47 SHA512 b24be01b281a932f5e5c63f8c966106a81b1893246ab0f40059dbb65ff515bb74e779e7030969ae194304d1ea2e0819dad9fd37a42868fb992cab3d306e2cc04
 DIST texlive-module-hyphen-irish-2017.tar.xz 30448 BLAKE2B 6d00357646d9fc98a3aac64c319863f2780a1586d5218bbd0087d102c920d04283a7d37db3545d0022e0fbc27fe5e44859dae18f740d8db705e3d0d955566a47 SHA512 b24be01b281a932f5e5c63f8c966106a81b1893246ab0f40059dbb65ff515bb74e779e7030969ae194304d1ea2e0819dad9fd37a42868fb992cab3d306e2cc04
-DIST texlive-module-hyphen-kurmanji-2013.tar.xz 456 BLAKE2B 9dc2d1d4a2d7d1cd8496eaeaba2314a12138eea787557a108ab712fbe0ab8e28f234b44889103c15c9509055f4abe8e96e6f07780d55183de935099bc524002c SHA512 40b37e22979070c5b9b32412ec9f2d56c9961c6b5b7437f6bec3feafa89430f51c8d28e97eb6a600815ec5306bc93b292ce5ee67b86f1c9c29dfdffcb5a98793
-DIST texlive-module-hyphen-kurmanji-2014.tar.xz 456 BLAKE2B bf00dd2c4c740027eda620abb4a49fa07b3544b579789cc6b2d80cc7bbdb40561f1c45381ddc62b25062166c528b7e72014c31bfb0fef0ce4cab846b5cee8f12 SHA512 ae8a8169f0d284e55c85418e198432b9dc78465692becef3e23ba1cb22d768b1756a87c14d356853b172624e61adec35ba0491eace118d49ce0f63faa51868e4
-DIST texlive-module-hyphen-kurmanji-2015.tar.xz 456 BLAKE2B 4d31597a7f219e3d490f2c666487ef8a5d90b0cdab2428bce1f2bf0e6674b3c7468f3108155b2cd4accf133754e61d008696d0d8ed63a45a529bb5b61cc0b41a SHA512 c7c66526bd329a99ebf1c2011a28500aad94de63ecca769d68db6cd82d5a026ebe2b89976b76a8db2efa40df24d654b70fd318b0f1722944d245c1940397f3e3
-DIST texlive-module-hyphen-kurmanji-2016.tar.xz 2820 BLAKE2B 9af3181a1a79f45da48538a2e71dfa6efc909ee2de37752df07b06ee8c000417fe49dc1e4a75fe9a41b6e89cfb3a059b745dc1aeea4926de2628076b6dca4084 SHA512 21a38458d3eb4c4f38701c4cb8981718d85c9d02589c78e7364100c219a7277290d6b225d3925bcdd1231881182bede7c597d6030add2444330d80f124680927
 DIST texlive-module-hyphen-kurmanji-2017.tar.xz 2820 BLAKE2B 9af3181a1a79f45da48538a2e71dfa6efc909ee2de37752df07b06ee8c000417fe49dc1e4a75fe9a41b6e89cfb3a059b745dc1aeea4926de2628076b6dca4084 SHA512 21a38458d3eb4c4f38701c4cb8981718d85c9d02589c78e7364100c219a7277290d6b225d3925bcdd1231881182bede7c597d6030add2444330d80f124680927
-DIST texlive-module-hyphen-latin-2013.tar.xz 656 BLAKE2B 779acced1cdd829b1c215c5183ef1c81b8f0ce5b8b2fdace190c4760359c46a23f3b2d54f2645586c45131e4f28bdc48bf6b1eabc68f1666c553a39b020664c4 SHA512 f616d04a02e3fb16cb904333c875a76a67d3196d7a90b0e16bc19a3614df54b9a35c4bbdd7160259b933928696b5e1d9ce0b2b95c94b7a0eae2c319b7fd1ef71
-DIST texlive-module-hyphen-latin-2014.tar.xz 752 BLAKE2B ddc99d66079ac2e4532d046b1989773acf2b6e7fc8f447a66ffe200e93f6fd8045542203350da3c4efc812ad801a0df071875eb30273b62384abcb817b785cbb SHA512 8a18fe8fb222b98b1385e0cf58cf103412848fa0c3766d656101e4a9097f41f6073c069e033ee3d1987811a3994dd7df76b0b4137165a5952d7bf4667945c4c4
-DIST texlive-module-hyphen-latin-2015.tar.xz 752 BLAKE2B bb952f5a86cf1f5ddae9676ca549b9c2332a40efec6eaf87168ea6a5b5277865a93e5a789c9e2ceb89a15cf39ef6bcfce4f3c4250e46331982c69f5f31a2de45 SHA512 db819972a1784486231de3490ab4c6e511810ccf03e2e156274b988d4fce139abedbe8867315c1b92a9d307cb77ef694923ba4cdf10fb5d0d33a60e7ff3c6f82
-DIST texlive-module-hyphen-latin-2016.tar.xz 14412 BLAKE2B 2b65bf606187c6d39d9ee9ee13c93b70167c6e456692da6a94d100a4ceb5c36e1dbf566463fa9e4d0a1cd57c7cec6d3eb1fe81842cb8c7d679ed6a355a7aecfb SHA512 246acfa2f90367c8b5da9b460d4c9b4caccab86a44e73df49ba01c4bd0cd0a481e04305b9e96aa5ad967a6a3778ec6c0707aac64dd195dde7d7c8d68e83fadcc
 DIST texlive-module-hyphen-latin-2017.tar.xz 14412 BLAKE2B 2b65bf606187c6d39d9ee9ee13c93b70167c6e456692da6a94d100a4ceb5c36e1dbf566463fa9e4d0a1cd57c7cec6d3eb1fe81842cb8c7d679ed6a355a7aecfb SHA512 246acfa2f90367c8b5da9b460d4c9b4caccab86a44e73df49ba01c4bd0cd0a481e04305b9e96aa5ad967a6a3778ec6c0707aac64dd195dde7d7c8d68e83fadcc
-DIST texlive-module-hyphen-latvian-2013.tar.xz 400 BLAKE2B 3355c9607467f137640d5dd06568c5f9a8ffb78a7c70345fcf443ad83e91baf82421ab78e935c487d175fe92c046773312b4da8a1ce350977c7474196e6200e2 SHA512 f33825da96064a92bd905191c30cb64b9e4ff15939dec4949c297d5169edb43f3f20df8bef99980c9d36bc481b2cc5448373fd6cdf44f3aae7aec77f89ff251f
-DIST texlive-module-hyphen-latvian-2014.tar.xz 404 BLAKE2B 1b6079855d6b2b184a6449c34d16f8044145de7d289e887c66634ca7aeaa64de2cb934343d6e25f39328777e8b1cb6ff10675b95cae3104449a798cca0df7a84 SHA512 8d3707e182455a471cba233895bafe12a9392cff53336f4a0f8655bf859284b52b6a2f40fd911619a8848eaa1d2735e67fada1a5b3c85503e0644cf984a61ff0
-DIST texlive-module-hyphen-latvian-2015.tar.xz 404 BLAKE2B ec3b4bbdb6c71ffd7094bb426bb977ccf9c7e3fb22b4f90256cc8691f845a1563590689a161bed96120a3096b158e16238b7743fea0a46defdd947bd5714e192 SHA512 529d187bc9eb2d30b16ef7d751611c2fc938a90a4519ccf096c0641d072238c085bb7e1ff2e12029f99e754f7f8322b67d3cf401be91a0c35ac46576bc2f60b9
-DIST texlive-module-hyphen-latvian-2016.tar.xz 52464 BLAKE2B 76bd2b80b6f77936f3d4c34b3cc04e5b31d2b1b88af6ff797aa8b4ba3a4bc3225ab5116a083759d531b597c900efde3ae0c85646259b2448c2def7834ecad8f1 SHA512 275a5d68cb582c1f188805b1a0963d0c569c576b7b504028c15bf1f766bd530ffa75795c6d9acfbb6ca47255f87991dc767378552bb097fc4e2c52a1bd214648
 DIST texlive-module-hyphen-latvian-2017.tar.xz 52500 BLAKE2B 6e42c7816eb191b4f4ff135e70409f865d6a7bb9ea6e5735c562df8e625ea39e3c70aa106ff4e8cc55fc5e47c5b5605534cceb2c360727333e8c77b4ce482741 SHA512 3470edd656d22cc71c7b89d0f19f191563928eb8ab743d70e1b8c1f6e3863c26ab3b469a22f7cbb27fe34699e9954c4c633e569a402f6dab03734b6ced16d785
-DIST texlive-module-hyphen-lithuanian-2013.tar.xz 432 BLAKE2B 8ec7fa3931c58b26f87ebf07ea2601bef40ff6d253705180caee7f80596a3ea39afbea6eb0934a1df7938bd744b558854fffb1d8c97290581f30ffe6cbeb1bd3 SHA512 2069b56dde375edab9b9e2996517b7ecc961c042a666092173a27dec751aba7b917699cfe832a20f4fbcca217faffd5312cdae3eeadb72ad35881e30f958af7f
-DIST texlive-module-hyphen-lithuanian-2014.tar.xz 432 BLAKE2B c228ca1628926fbf6fa385ee2613426ddd42837f7ca5746d219d3275c7b29411a306d148a5e41365a3a00cf229d401d2b9bd8124ab7b7ca608acd83d7841bd2f SHA512 3dc73f827434b67ab6e768a1b22dc937f0be650ec83a86df58d2122a22bd64e0e324b65773cd3f0fcd2ab1c655659f8cfff60cf1ace15a607dcddb093a917e3f
-DIST texlive-module-hyphen-lithuanian-2015.tar.xz 432 BLAKE2B 9c5379c128354950d27a946d64db6ff7631197ab737ffb4a904c1cb9910d54e41b7d92a968a72fe238fa73761200f1cb6abfb1e82d1bd41c859209685f3d3b42 SHA512 6bee80af40d3697811301d2a4f0eaa2c56c8399b95c2564df371f030f0a95e647c6d1a2fddac31a88d8d388fa0dac4afb9a43a78ae0735b7cd08ac234468dc94
-DIST texlive-module-hyphen-lithuanian-2016.tar.xz 7084 BLAKE2B 49e1aa7d722fa6b23300f5900f2a1e65689f4bba632603558acaa6974abd6c8940d4f598bf2081f134799dd0d575965791f6dcb46510a5361e1de12b9eebb5ee SHA512 bebe5e0beea0ab88b86513b86bedc7fca22fa5f5d6c17d3550761ade9175b072e893ad8b28fb00a300eaa9a75794aa84d772c636451bc0a754e01830851f88b5
 DIST texlive-module-hyphen-lithuanian-2017.tar.xz 7084 BLAKE2B 49e1aa7d722fa6b23300f5900f2a1e65689f4bba632603558acaa6974abd6c8940d4f598bf2081f134799dd0d575965791f6dcb46510a5361e1de12b9eebb5ee SHA512 bebe5e0beea0ab88b86513b86bedc7fca22fa5f5d6c17d3550761ade9175b072e893ad8b28fb00a300eaa9a75794aa84d772c636451bc0a754e01830851f88b5
-DIST texlive-module-hyphen-norwegian-2013.tar.xz 452 BLAKE2B d96d696a1d8aea41382ea616432217ad605f2f1bdced09af4beb61a6819c58490f43d550bd27f2c168e2e7959cdaf707a9bfbaecffca760e98c8a11848683432 SHA512 637123465eca2596385c0af59122c1cd4e0cb0150737cadbbb822b9acc995f5e8e85293db79a5d805e2b60e4536a070a1ca3ab985e3365cea1e743476c88fa82
-DIST texlive-module-hyphen-norwegian-2014.tar.xz 448 BLAKE2B 029e102e57e722abbd84d720425dcbd0c2f5dcc6405502066eeb96e2350883a8f18f63fab3ce9a894e454fd3e5e3b6bf14c1980e8d76ebbbf2c5d84188f9edc0 SHA512 c929eb1211a6097b2f666034962cb6b81138ba8406b232c36cb91d159fc8fa6e8434e79130cc09c008b696bb31aebc45fdc0072a381a281ad755d5a17b0f5928
-DIST texlive-module-hyphen-norwegian-2015.tar.xz 452 BLAKE2B 8822e03f37fe260bbd46bd669f3ddb3e23df11f3ab113b6e61cb02793f8fb28ff5be55d406d1acc23a14cb700a4695a14716ee5e0095dcf7041032af8c6cc573 SHA512 efb72486f22bbbe77df1c492ec779cae9be1d48ba86b969472fdc244b414b37bc0d80ee8e0a1673b1db1c5eb0cd19896beaf2426d4cf4f6f584bb2b2d2d058ee
-DIST texlive-module-hyphen-norwegian-2016.tar.xz 96140 BLAKE2B c3712d7d1ece39ac81844a41e10696ac622ef3de14156937dbcedcbb888c0d6b8583a19b34e639ef360d964ecfb555d5b384312f14131d08fb912598a19b29f9 SHA512 ed6bb8c7a94645ceb956a4b0c0db1ddafde0db96e16e46b68f859a9abf16878e164885f8b7c5ea3d6d8b122997ca5e317fc266f1ea4ef60fa3de1609221d2018
 DIST texlive-module-hyphen-norwegian-2017.tar.xz 96140 BLAKE2B c3712d7d1ece39ac81844a41e10696ac622ef3de14156937dbcedcbb888c0d6b8583a19b34e639ef360d964ecfb555d5b384312f14131d08fb912598a19b29f9 SHA512 ed6bb8c7a94645ceb956a4b0c0db1ddafde0db96e16e46b68f859a9abf16878e164885f8b7c5ea3d6d8b122997ca5e317fc266f1ea4ef60fa3de1609221d2018
-DIST texlive-module-hyphen-occitan-2016.tar.xz 2804 BLAKE2B 441962ed8b596cfff646b0b1b5402f1dca3e44d3945313e1d0ff6c9a4febdf599069d39706fcbdda75b49638cc85b59021734e1c24b6050fc5c131e9b9062fca SHA512 febc2f35fd6917eb968eab0f6f9ec39e3643b8adca773c6158ca6e8fc502dcfeffdb58b91831a484f814e147b134168e8adb23be87f6a9faf28a39f6127827b2
 DIST texlive-module-hyphen-occitan-2017.tar.xz 2784 BLAKE2B 34c132e64c4d9a149064e5b0516c5bddd23a29ef3bfab0ca48f3f0b06aed36553d2020b46f1defc08ee3453fbdf3aecc18a4ea536655598ab6132fca48dd6988 SHA512 8738497cad865898e043a54214b86627a123aea35d5c7ca701bd947966b8b6899cbf66f801f48c1475e3d43ead61e38af082dec101fa1b7556810c778e7bf174
-DIST texlive-module-hyphen-piedmontese-2013.tar.xz 456 BLAKE2B c481fa6a36eb6dae3c71e9f045ef05373d0326005bc34a7cb535fedff1329ba07e966150af1eb0424901aad2582a594226b287532bf27dccc5ea045f86aea7d4 SHA512 d4b0124807a78aab700dc7a86e08935e9da6c7add75db327d89ebcb1baaacae7b01a8c2e2bc2dfc639c2da37b8f650f86afb7637da9d0d4d7dc500e5e95263e9
-DIST texlive-module-hyphen-piedmontese-2014.tar.xz 452 BLAKE2B b80d3371799e9949e1a849dd06d4e211fc9297b14fb5dcebd8e1d4020e8ddbb1ed8c54eb0072be5d09b7ee4450f2ad8c816cdc731a2ea81cf647f8d5991074cd SHA512 6f9d23d3bc55172c2bf8f0dc846615fa71b877f179925dc214d11118df1d9acf95ff285572338a41b8abde4b4e635908ce313fb85a07727d81b7f68c50e37ff7
-DIST texlive-module-hyphen-piedmontese-2015.tar.xz 452 BLAKE2B e1941992f2d2a91db9665dddbe0ae00645094050a84d09eb8b34da65fb256b9d0281f490cf92d8413a559237922fdb5c4a6b593a5fc88e00512054159f54258d SHA512 3499d9166ff3c76bbac6dce09dc92ceefbd851f14a536082f9a90c4219b8d6e7282ce33c020b7cba63bba755ed84a9fa52b6c35218d04d980b487bc3e9b8a1da
-DIST texlive-module-hyphen-piedmontese-2016.tar.xz 2904 BLAKE2B 8138afb740b0314f3cc9b37b3cf5b51a22ad6828fb007168a4eb3b6e012320aa7cef79932424a99c0d0025dad175bf4c8b8544d043b9e72a747f557a04b74606 SHA512 165de96a3873386984b661bf31f52e91e0a995b94194b80f382102b89581bde39dad7c55e03291c228328d34041d596d3965626f7b30d2c66032c8aef69852a5
 DIST texlive-module-hyphen-piedmontese-2017.tar.xz 2892 BLAKE2B 192de03608ed556a0bfa89d48498becbd6fd547607d4267a580413fa49ab2cd8d3999d147737151de9353f2b8f98c6363af1983a24f3b356703e457a0f7d4a56 SHA512 8f5d9a0f6408ff62160f65fe9716f6159b8f2474a106c081c973ad23d4003d56936b9d132c84e1c5e070e79aba6030b7d9c1386b15290fefa5a09e8c50a6b413
-DIST texlive-module-hyphen-romanian-2013.tar.xz 508 BLAKE2B 3cdf092613a7f95caaf2eb4415f777fdfd6162cd03091f44c627a2de776c83a5ba50e4dec11d058285de1afa312dca83fdfa44426df1a6a487ef5fe64cd09e68 SHA512 bf7f1e2f2e524d7a78f6880078884c9b2f9345a7d9ff921791b3627cc6d9a5a2a5240facddc39ebf2a60d7b82e3cf53eb4af9489a7b47b027d91049cf506d615
-DIST texlive-module-hyphen-romanian-2014.tar.xz 508 BLAKE2B e9dafaaee64459762161fa429f0e4229d1b70ad51fb256e8f95f51fc05c086f6baa6db3ea96537311e45e60baaf3b96ae4f1c3cabd6faebcb7940bc6b8d2c7c1 SHA512 948a54e6c86306904d622a0025003faa1816a2e642a1dd028bfd2016017c0927f2852952f5174f63a3b74de97abea82aeec050c6fe7ffcd654a745670f824465
-DIST texlive-module-hyphen-romanian-2015.tar.xz 508 BLAKE2B 03216229fd74cb25f2d804c1fad506b0f151920b144c0d626246cb45f8411ed2b0647a5cd8a796810c23b992574808f5631d87bf99b2f4219419d40cf2574d4e SHA512 1a647967498ea20233304bb2e915623eaf359a9d8423744dcd8fb238f7d5dfd1c661d6a683c9da6afa6be1dbf19fcd2bea1876ff8d5de14d945060d6abbc5376
-DIST texlive-module-hyphen-romanian-2016.tar.xz 4828 BLAKE2B e493b50e3a09a5ac18ac92401184845b36f6bb994a242a76b61a134c93a8944ee722a6e3f34099724f91a3e70cd707e7dcdd8080cd2b017fd8eb2d413f943566 SHA512 8ae79b24812fc22f238dc60911f61acaad49625a29a77a35ba330a2e9084c52b17712e202c9c347d8c9955ef2ff9ccf083f6ac8006a0247d38ba9ac3e06d9c2d
 DIST texlive-module-hyphen-romanian-2017.tar.xz 4828 BLAKE2B 6db5e960b92b06eaac4b45627a4f6fe2f647291074954df6afa38e907f3d455e6e6d57f8cfda9d9e6e47d09097b84ce5293485a522197d7c1b8fd0887011158e SHA512 be833ae75b826202f56413bd57b4ea0b4172b2cb7150af46c929daedd54289181e7b01c6161a2b49f2475910bc76dc6968e986cbdfc2c1409be22dceb0e3c3b5
-DIST texlive-module-hyphen-romansh-2013.tar.xz 468 BLAKE2B e9d7f7156c1c7a9c7726f9e0a41cb1b11a500ab2b0db6374679e0207941ca4cbe1eaa10d58c0e60dd3d5c086d43a22b98a34fc3f0b8b946f3075adccbd4c4334 SHA512 bc8ec853dca28077028376c37760c0770fbddcf33b1949b923fad82947b372b6749b7ba96868b7215447747af09af6ca41b3306e988d9e0090377cdb03e5dcf0
-DIST texlive-module-hyphen-romansh-2014.tar.xz 468 BLAKE2B 57e829af7b757c5160425501dd94aa92cbc23412d32623b9af1a4f93eb313ec3cb2e641e8a67fb00289a470737f522ef13dc451c2f359b16df8f46d8126e72db SHA512 534193b5114d5884627a2ba74cd6f36e404003f5032bbf06b9e368e3e19c309f97a36dc781b96157163b25fcd6c76401e497738b4d079927018060484d7eefa4
-DIST texlive-module-hyphen-romansh-2015.tar.xz 468 BLAKE2B 5b8bab23ea2dd27c16a31ae4b818ba303f4fd9795561b4713a329a6678bf7a84bec464eb09a7a53069bb98ec213c6d5e1bffda978489f88e9a3e52ecaaa038c9 SHA512 179b24ffe27de04f65c332d146b5c6a8e1fd0de63d934cace0bbc84b427be04257ec31f4d159542e73e1124d448bb7325974852abb8b4369d8ee0495bb14b9f7
-DIST texlive-module-hyphen-romansh-2016.tar.xz 3068 BLAKE2B 3c76be4f1f4960964163e2dc1edbf2761576f58470aad5d6317d335d24f4138f7196c7fb4bbff3f234c80b47cc6fdc7862414bb51d11980e28e5cb3a1bbf9ce5 SHA512 860ebca5b6bf6565058979a944724ce19a22b33dc36a2e001daee349982f3e30ba2898056df518f6211a536e72e22dbdba8f63be77c8a10e6380e254fa982396
 DIST texlive-module-hyphen-romansh-2017.tar.xz 3068 BLAKE2B 3c76be4f1f4960964163e2dc1edbf2761576f58470aad5d6317d335d24f4138f7196c7fb4bbff3f234c80b47cc6fdc7862414bb51d11980e28e5cb3a1bbf9ce5 SHA512 860ebca5b6bf6565058979a944724ce19a22b33dc36a2e001daee349982f3e30ba2898056df518f6211a536e72e22dbdba8f63be77c8a10e6380e254fa982396
-DIST texlive-module-hyphen-slovenian-2013.tar.xz 416 BLAKE2B 2fbf3e215987f672f34679839c9137a57003c0a3bd75c2fd4fe9c1305866feb0a039cb850cc29e02c7b4e80c7b23cbc7cb9484561951af248d5c504ba165ae72 SHA512 881816d83ce0429a9321f88788f3f6edd768dfa8f1d7b0150261ec720ae03a745605ab13617d9d2f0917dea1481e43e3748de12c7061f1c5586a6c7af3b0d625
-DIST texlive-module-hyphen-slovenian-2014.tar.xz 416 BLAKE2B d3e7811b42d918d9302b61a1d626afcdf89f24332cc0c954ea711cedf69c0ed435d7d17720fb52c96e7fe26811e72505fb1600acfe1c58bbe9f8c460c6dcd9e3 SHA512 26bbdfdf8ca965a136af0075879b3b85fbda2ff68345574324046e4ade91eb17f0d06a4abb6e25166fc981b47013a21c4ad60403415b5fbfe0c90ecc7b10b2c7
-DIST texlive-module-hyphen-slovenian-2015.tar.xz 416 BLAKE2B 0b0370691b1c301e0d6b647f23a2038c171d5ce279993dcb26e83a47b00e29915a235e517d76fd4a8d16dc11f44266344f7c3aa4fb2d0f2fac864f409bdebfd9 SHA512 b540d21bd419ea4111a34cce9642e04cbaee9148cd194aad2e4f558e33405f342046be3ca3e496600999b225c565b4696d84a878dd2e00a38dee91bff20e2e90
-DIST texlive-module-hyphen-slovenian-2016.tar.xz 6232 BLAKE2B 7bf3f988e35454b8aa9bd7098e4ffa3b0747a4c786357107a3bc91ebc0b82ee6f7a586df46f06bf8da3a9cf0866030d06fa1522053b5f1d824d616804543240e SHA512 f7fe4f7e9a1da432ca817562b81db5cdb6556be3cfc606d110f425e1c19902aafb7fa3e55b14e906fe5646deb53668fc4a66ea46c26376ba2ecc0e02d36534be
 DIST texlive-module-hyphen-slovenian-2017.tar.xz 6232 BLAKE2B 7bf3f988e35454b8aa9bd7098e4ffa3b0747a4c786357107a3bc91ebc0b82ee6f7a586df46f06bf8da3a9cf0866030d06fa1522053b5f1d824d616804543240e SHA512 f7fe4f7e9a1da432ca817562b81db5cdb6556be3cfc606d110f425e1c19902aafb7fa3e55b14e906fe5646deb53668fc4a66ea46c26376ba2ecc0e02d36534be
-DIST texlive-module-hyphen-swedish-2013.tar.xz 404 BLAKE2B 5b8f3f01356c7d21f23a31780e6fa99574c87e127178ead53fe0524bc73fd959e1b98d723edb13d2e07faa0347bca6133ceb048bb56004cdb5938e9c569f4839 SHA512 568714e7fd4547c6c64fe9a0d02f14cf4cb3548f3ae083db87d73320cf252d49e966897110ce6e2d5ecc41f3fe9732e290af3d58d60fa751ea61f60f41f11245
-DIST texlive-module-hyphen-swedish-2014.tar.xz 404 BLAKE2B c7b10dc5aaa2c3625f2a72b1589dc37e976ce199a4608d30df470b154fdec16c3aa670f9009110516f6ac515563ba89ba7a3e3b102ae8c3d9a2f8ec592251661 SHA512 c8622416559b2f68de1cae1ff881d7c98156573e08c642e4381fef44abf5152df9965e2b7a48fe583904b05e52fed306aff36d79289e37ff1e843422eb526d01
-DIST texlive-module-hyphen-swedish-2015.tar.xz 404 BLAKE2B 4f10e127711610ed52dbb7ff56e998cc540d12af5ce3e237259fd0dbff98bad0e3e3524e131fedfaa9345d6404ba242e590a027bbbaac6a1e5fbaa81d560fca7 SHA512 0fe6234fdabb1a656d032cb3dd6fee4254eed9ebf8d551c3be4c5be5adfec74487b0dc82ee89da54a5aabce4aeaed5688a65f41bcec09d2164a4773cbeda895b
-DIST texlive-module-hyphen-swedish-2016.tar.xz 18716 BLAKE2B 61aad3a5fccd73de4b06b1151819088933c52df416a47776df8fd042a554e19866401e5ce126abcf8f9570e59a18043b1a4a232978f899da31ce5ed59ed23796 SHA512 5cdc1662192a2b3d29844f17761d7bce879d62ae0219f8d03c7b7c59e24320f687e32a81144e13f5354a94e3ef98b4fc058f1a0d8995aafe861a51b3f2db06a8
 DIST texlive-module-hyphen-swedish-2017.tar.xz 18684 BLAKE2B f0e72b299396db40946d25bd4af8fc57c36a5d17eba6d8147a9506d7142b5764ab288034bae321dedc449f2bf5497a019c086b4c6b0983a5042bc6f225680629 SHA512 eea8a170b121498be9b36c12196f8b432b4153161d2eb542a76cc5c60658f011fd5a8d6b45fb9c78a5aaef532b7a4e29a60dd73369906b8f3520b54eb4120747
-DIST texlive-module-hyphen-turkish-2013.tar.xz 664 BLAKE2B 28c54db3705f5103cb3bf4f01e29899fd0716963c1be99ba158c31383b3dff41924fe546ee2cd3b9df3388e181a531c505f8e49bd76b1071b924623d1423ce78 SHA512 6b0e03cffc6368ea72c37e506c8f1a7ba8e4ce03215a6773117bb60e6ebe5a0683337f5766d05f95542c44ceec97165be12362b5e40af644987790e47da431d8
-DIST texlive-module-hyphen-turkish-2014.tar.xz 664 BLAKE2B 0f97d25835555091a8d2593a5f26cbf4774916851a1e21204b511d808f61f0f9c02bf33e2c958a34c0735e7fe3538a03ea5a9ab212aa5bde0c401bce468691cd SHA512 7e016f58eda4a14f7fb284cc2495b17df0f73aa56c2992fa28beed45d128cf022db89089eebacc8278dd26ed7df8afb719169f14d197bc326147325553baa2b9
-DIST texlive-module-hyphen-turkish-2015.tar.xz 664 BLAKE2B f35e62fe38f3542208364920c1ac01f33deab9d40e9c045f0c97048804d472f4943f3656544ace926efcf760e40135bda3a1e1a923048801eba16516985fd76b SHA512 a0d999e02ff262ebca843bbc1440a56507e7fb689728ea9ad2a526a03353dcf5d0f3a9a66192a270010f6b888e303c6c73e7f50d3c920c3b5602846fae00f5ef
-DIST texlive-module-hyphen-turkish-2016.tar.xz 3888 BLAKE2B 09f6ba61018f514d5fa70da2603d41849629d069b7d93ec195c1a6710323caa843de8421a5c37f00f2fe31a89bfeb2e40db1d148be2626f1bba8b680f79af8b5 SHA512 607f638f05d8a0ac62432ff0ddc3d84dead16be78b2211d9c25dda0ee3027b33383166531b93ffc9195e1f326cc30180f9777e769b268e8918d71f046592e3e3
 DIST texlive-module-hyphen-turkish-2017.tar.xz 3868 BLAKE2B 414bb445657d006777b1b5270863ba6c276565e2fddf1014e4eeb04310bb56e2110aa292e25a57b57b86c938139a9a37a2e15086cd6c2d94a1c2e340963c4d97 SHA512 f4cc3d6dc466f8ad00964b79f5e6f7cca1254acbf0c98fc0764fe480efbea99cc00d31f45bcb6d28b697483e0b44971c9f319b73c9bf483f87f8b114bb2098d5
-DIST texlive-module-hyphen-turkish.source-2016.tar.xz 2724 BLAKE2B 3518ee850d4879205464094b3eec0509e78bc499833641076d722989dff71b08800fa2c7a4116e8d8823cb81378200b71beec4f382442795c47677378af3de18 SHA512 08e10510c6c1bbde6128a1bfa241cae9e99bb6ce297c4b86f25623741b3594ab432ac7b2856f38e9ead2fccd44957720652ee22ab12eb45513e16619044414b0
 DIST texlive-module-hyphen-turkish.source-2017.tar.xz 2728 BLAKE2B 018dea468d4637645692426bfd560247590c43fded757ef9a87a5f4676ef8b6be61118ba3a1e325b165eb5fdfb80a2d107b7d523d12dd19c126385f0393b08e4 SHA512 cd6a82458e2eebb0b91104e8c0730ea5faa3ce2cb716e21e4d14f22e88e16e0a7de470bffb04da04cd057288ccd6bf9e6f7a9468b54baed6abf8f5a314a19114
-DIST texlive-module-hyphen-uppersorbian-2013.tar.xz 416 BLAKE2B deda225f576cf48f4572d8f7996f834ef78733a76e717bbaf56a4a28ef830d798732f12dbba25ad2c5a6ae5ff8a898f491ba64ad4d7a052d11d1a6b0db153be4 SHA512 3f9f93bb2acf284df23c057ac2140c2513bcd081527b052d440290ed2d5ef10b834d6e8088a3f66b8724ab534f9598225f2d3df602ad9dc32f5bc7b7d502e8bf
-DIST texlive-module-hyphen-uppersorbian-2014.tar.xz 420 BLAKE2B a5279df80ce2c3043c801ea426d7833b3710dcf7c089f5638718b07365b8247deb9bb6b19a21058b1653c8e1adce8aa0eb5367ab612387912f8029d15823bcf3 SHA512 16b2ff66b932fa80ef9b7b608761c9f8a5eb12fb5bd6e4ba7fdf90c8384d0ed0a314d7a933b3abc79124b5215c58986170d66aa878b59037513c3370d7dc97d7
-DIST texlive-module-hyphen-uppersorbian-2015.tar.xz 416 BLAKE2B 860e14bc6ee2e370992d3a34d95f928f2806b10418d162c004f75ab9b9b396b9b33da785846a3a439274af249025ba78d459e405f4972286635dc5e3a1d6249c SHA512 686430f74a43104ccd4d9ef7ab983011f95ef7ef11e0e439d773a9b414d87d73c3af086770d565a5c37aa8b26d833536130253c1d118972c1e604871fa939296
-DIST texlive-module-hyphen-uppersorbian-2016.tar.xz 5640 BLAKE2B 65b736337ff7d5b011652c499832206a2017faf545e8344156fb7e56793c238be0363ca46ca251fd27dda9661492cc2eb340a6972295e9de9f3b0fff5779c00a SHA512 848d3eb5de562139dc6bd10196e19cf8f9e90f31326929825eb74f6f171d6f46135803a612fd72325b5e7f0c8db31a300e74aa93dc619fabb26b2231e61e1be2
 DIST texlive-module-hyphen-uppersorbian-2017.tar.xz 5660 BLAKE2B 6f4b0684353cb53e17f3087f9726aa6c786dd52aa0f048a13f56790b759ee16e4001016dc6b155909f148011a13919e9d231e96d69573f3223d90a07fee572c4 SHA512 499fb8027eeec96d52efa90e13c010219c9d2a26b9f6abf7dd71f0df81f1a4443597beb5413f5c8cf99e3a549121b4c03155250c344f7e1a23370e0e4f587dad
-DIST texlive-module-hyphen-welsh-2013.tar.xz 404 BLAKE2B a91cc22955fea79ea344058d5e381977e05f5a464c3a431d1704c962fa4f8bfeb1b26788462455e707c255096e7f3ab88f4fc0fa9f9b7df9cd97db28318affb2 SHA512 2082f791680c3fb93e20d5465e13ec7978e34448e90460c0e36fb323869cb44e094cd97ba49b83958f3e6a86c68db4695132ed2ac557c96684aec909a5803bc6
-DIST texlive-module-hyphen-welsh-2014.tar.xz 404 BLAKE2B a2b192167478335609baf770c2dbd42865183073d1651c50c8c83e503258f9ba50129c1a82d8122b922c19b0dc586223e902c5c1c1c2db3765fe5a749daca9e3 SHA512 387d9d173d493515ec4aa18a97a48c89bd1e1579f6225ab8ff727e39da1be5155160b7e7fec1b4066b803f96cb1d3e5afe3966dbf68f8f22676b9cd118c31245
-DIST texlive-module-hyphen-welsh-2015.tar.xz 408 BLAKE2B 4d4568971a580cb4a75a54cab3d8712b34c16932b55a389b50519de28e6cc4f35af4aac690a0d5fb724c0ffa38cfa8aff9e72bcad3fbb6561e291a28f593b3ef SHA512 1f7eaf0d6be722625897ffdea0d3e145939e8bc1db1bf697c90376ae3e36d88a730920d337314093793f410ea8f62f90710dc4ca37f9a6c9899b564637ce2501
-DIST texlive-module-hyphen-welsh-2016.tar.xz 20012 BLAKE2B 8214091da00330f7061477516871eea9d43b4a0a83a223e73e4c345e78f47be9ee6dd900db4c5eea08286c8b06844f26ea2cbdf83a70fd1fc4b89a7c59fa8b61 SHA512 f9474e36f43a7b18043c2e37c8d9d380957da66a06e4e84c54bebba922cbc17e25747550269987057ecf2aabe8e4008dfe2c908062982bde699642a8da36b3af
 DIST texlive-module-hyphen-welsh-2017.tar.xz 20012 BLAKE2B 8214091da00330f7061477516871eea9d43b4a0a83a223e73e4c345e78f47be9ee6dd900db4c5eea08286c8b06844f26ea2cbdf83a70fd1fc4b89a7c59fa8b61 SHA512 f9474e36f43a7b18043c2e37c8d9d380957da66a06e4e84c54bebba922cbc17e25747550269987057ecf2aabe8e4008dfe2c908062982bde699642a8da36b3af
-DIST texlive-module-lithuanian-2013.tar.xz 67440 BLAKE2B b6cf31b414ab375dadb24bb01eaa8280d56f566450706edfe1489ab4e7b6c3ae5b5ee4c3041cdbd3a6205ff611f5297c4be2f20a091b126cd4d97e499233744b SHA512 45efdf09c732d894be342bb42adf12c7649e34ed6b3ee7ce0d48193d8504f2520a5b87f7b74c15e943f47fe5c90d2b61a0b5cf05edc93d9eae430605fdf81a34
-DIST texlive-module-lithuanian-2014.tar.xz 67440 BLAKE2B f98f301e31182b5bf01c194aab041065bf156bd48ae8ef0a1ddc065bb7ad17ac799d231ca024a8508e456323664e971d9c18263f9dec680677a9a0a497a2a08f SHA512 2e23ed0e04f1ee3a70d4e059207ab1d747f83795b5e1a4de1efc60ff425c4cb2c72aa1f08d9cd80e9af119e77be54df8d67a2cc67f9570a712f7002c7e58c097
-DIST texlive-module-lithuanian-2015.tar.xz 67436 BLAKE2B 68f8f09aa0fd6d729ec07e9e86db5046d8a8e1cb990b23776bbaea1f085e54448a72eaffb1a1875a9da5181782d3883d67fc9acf6533958d0a696382f54dc453 SHA512 60db96be637483ee4b2792dbfe5807e6f90c4db4333418c0dac32a14963c4fb54c88781fd4d35157f9589cb36038d1dc2d5a7a1fc72b970659003cf11598f813
-DIST texlive-module-lithuanian-2016.tar.xz 67456 BLAKE2B 31647028a392c8e53a221dcb07113efe6c3479d7919345691344236292481e63525c202d03b4924fb69553f415f44cb50e66fd36a145c87034ca47ccd7147f12 SHA512 53b07d14ead981b2b5ef67bc7341584a4b37ca41bc5a2a73917db2830c02387809522e66e3bf142d8c15a3fa0278c6129701ed0576634399a644129f6d9e9a10
 DIST texlive-module-lithuanian-2017.tar.xz 67456 BLAKE2B 31647028a392c8e53a221dcb07113efe6c3479d7919345691344236292481e63525c202d03b4924fb69553f415f44cb50e66fd36a145c87034ca47ccd7147f12 SHA512 53b07d14ead981b2b5ef67bc7341584a4b37ca41bc5a2a73917db2830c02387809522e66e3bf142d8c15a3fa0278c6129701ed0576634399a644129f6d9e9a10
-DIST texlive-module-lithuanian.doc-2013.tar.xz 67024 BLAKE2B c0207c0a61d453987fb0e06e5037d9869b09361242f129a6c646325a7b4a07c2f3b4948b87c0431fa16e9e1ba66e080b6f6b5c427d3e5dd30f956be1f180a626 SHA512 641d19cef1e561c34b7d31bacd73c3a42183457e876c6e058b2a28ef607b6ff8c24036dcb8e33dcfd361c4cd8f78e60029286c8a510d1d39b59f737a5071d1ed
-DIST texlive-module-lithuanian.doc-2014.tar.xz 67028 BLAKE2B a2fa31dc73893052e8a6059043fbcae1116912e9c42d46bae5f4c8d4662a10272bfa51747df3bc82de5275b747135adcd6f9fa3cba825a8c4887a9813338c61d SHA512 49145288b5d2efdaf8b8f1a7dba03e3068846e0f68f9e9317023d5bf3498517419b285bbfc740dad9db42bb22e7d03349d419be37b029cb3bcff20fb90338e95
-DIST texlive-module-lithuanian.doc-2015.tar.xz 67028 BLAKE2B 4c602bd0c107195d076d8609f49eb3270099d4735d769abe783f58dc0a856864eac2167f44d524ab63bdc1d3c0bd998b20403eab2abab5d1706de5d973d693dd SHA512 c378616259e4820fcb458dee46592711a593325e36176ebb416b026925fe9cfd7314154325f566d65a463845a6749b3514a5e6cdc5ed9e569362b449cf37f475
-DIST texlive-module-lithuanian.doc-2016.tar.xz 67028 BLAKE2B 30c317e6f4fc905c08b7a8dffff47f1ca6ca01b28f5934c35eb29d3a1568b920f8a6e03d40c77568a562b1b7bd1f462e6f4a4669073530095be9dbca9a293940 SHA512 e292d7b8ef69d12fd98b98fe9f62ace9d851bf0bb9fc8ba37bb5807e5243e61b945eaefcc310b6e14ad3b86c73a6aa51528aad552a28b82932d70ef48751aa34
 DIST texlive-module-lithuanian.doc-2017.tar.xz 66992 BLAKE2B f591f1837c663513af5f42036ad873df9cfdeab036620f6c34e8636dbde22c81e618a6b3eb1ec926ebc581bcae91c65e8f0b09b63067afa011d89b4cfb6ad5bb SHA512 7677a92fcfe300a582ba9b36ba40bbee039d39a605711d2e0963eb4ea555dff970940cbf37d690758ebd70341142f2a47598ec6a54b12dad7dd29c342b2a01f2
-DIST texlive-module-lshort-dutch-2013.tar.xz 392 BLAKE2B 9232fcaa2551eeb23826417de048323eca951d0c4af47c57d611e18e9a493fdd73a08b2c16fa7f254580fa909f65954180590061ec61194024f3de62c4d7939d SHA512 695007679e7c09fbaebec1a770a16ed8a24a5638423b06938456059e093ace9cf17e132c587c44fb2b2de442b8bba4aa1e7d4d29d94392a6ed5f398e34f2d3f9
-DIST texlive-module-lshort-dutch-2014.tar.xz 392 BLAKE2B e02ce47d3ce3a24101d598f8f4f47be538cc178a1fb16e7ae0adbd6e67dbef2617c56b397919c26a0471ce345c6e5faaac75407c738cd401ac5624813fef830b SHA512 6210e7defc58c270af4710fef5d8c54ec142a7f74599be75bed1e2de2ec88da888cb451862e9669f34b90a43fda119120d90d4f3835cfe5427afb639654bf437
-DIST texlive-module-lshort-dutch-2015.tar.xz 392 BLAKE2B f77d604fa6faf5cba5d90a39fc6854ab883ca03f5f4568c91aec36411d76fbf8c259c1c20c705a9a79de74f2d7b10622284d3e1d5a0f007607a16f2f5bca5b50 SHA512 598eaabc2e95baf42fa1477f6c12568b7a2c6aff80d4bda7fb0eb16863bbfe887971dc972dacef55cde67cdab09d8b6a9c7e27bb1eb40ae71241e069d4f74221
-DIST texlive-module-lshort-dutch-2016.tar.xz 416 BLAKE2B 2ad4b80ad94170a519866f602a4c81c75200fc5a0e33e95a5ee084b39346ed7b840563cf74db33688db8f7759f50446b5da19dd8a702fa3304dac8747be2b4f8 SHA512 b29e8e87974089d57baeb71ac47282fb5b0083128101a96bc94921afabd25fd2762d2606fa502eb7b3a28d09e55e0775fa437c2d4d762f107936322a9be6b09d
 DIST texlive-module-lshort-dutch-2017.tar.xz 412 BLAKE2B 1dd0122bcbde1b5107c0d72c566cd30abc0e590d3821d9d94c9ec8a708be720f5bcbfaeba03833a9d5b969f9d09428e8a2658b58deea3851adb4983ff243acda SHA512 62c08f5226bdb63e5675c82f9a14041e6fa44483b2620ebae9b77dccc026488e01f908a9f769c4bdc4356eabaa8d3da8c43cf16dba387fddf9f72331b5a330ce
-DIST texlive-module-lshort-dutch.doc-2013.tar.xz 777008 BLAKE2B c272bc7bdd8a4c2b235c5aad8a9b1094aaef54dc3f3c61b8c203ddc41b5753930fe1c71c57a471cdfaaf27e17a8be8cb2d6aa6d24e878b6df9ab9d47e1265b3f SHA512 1566a25c8c7a79efb5e7f675c1d07a301461e337b5b7b127cc219fd6e807b8b86e034a49e197735a628db965bc95fe87926770507c0c4abc4131ee872001e5ce
-DIST texlive-module-lshort-dutch.doc-2014.tar.xz 777008 BLAKE2B 1f45263647914f7b5c55b6eada4e358d7edd0045045387c4083cee82ba3fac83eb6bd32eb4fbc6474c6854864fb9514b6742bba22eed3804495a799249b48c4b SHA512 7780cce5e5dd9443351631cc7149152405374944701b34cf5ab89c5ef00c85c0c329a31b526997f9410103ca406490dcc088ef0c3b8c47db6d34b3ddbdac0ef5
-DIST texlive-module-lshort-dutch.doc-2015.tar.xz 777008 BLAKE2B cb83c18cc03d84ebea6ba51e0da08c18a11c70ec87a27f135666a428a3edbc6670d8792f8287ab026e1e5ea4a5d7530f3fe7f5f91fc8a5894141f5db1c449f5b SHA512 4f8d694901e9689581295180f587c21fd9873d41491291248a79355dadf56b0a19a6b3185a6eece4f70187c1ccfcff3e7b980a2fd5aa75bf33e4f2c9be31185a
-DIST texlive-module-lshort-dutch.doc-2016.tar.xz 777008 BLAKE2B 13421501c1f6d2370d9f4b534672d87141036f8fba09b30b9f9d25fce4781eb985ad0391efc65d5c6ba22b881a027e86acd568f592c5c89f7b4d8ed3d26b6ad9 SHA512 27b7129713611614bb39b8d9c2ab66895f35dcaf2888ac2a93c70a61d3ebc049130381bd4d772d2853479f04b839e8721c82e5f0b66af703b9b95fa01cf44713
 DIST texlive-module-lshort-dutch.doc-2017.tar.xz 776904 BLAKE2B efab3a508bf19a250cfbb5e1f43c0b5a5f3aeac899a3f1da0638bb20ad530b815852162d2a19a0acba894b6074f03a0a97ec39f2355dc6737649639e12ea3080 SHA512 5999f216df5f7f7a927776e54fec78dcd320a312f7e95f84c4b47110174a24b9deeaee6f1e4c1977558309551fd479218ad97b0a39a4addadc2f8dd23859a3ad
-DIST texlive-module-lshort-estonian-2016.tar.xz 400 BLAKE2B 51f9dce9042ba7e285b7e4d2162b5f8c3fdf112363411b4176c827c316391de7884da6d2b9504d2521a4a3f0fd6a74a459ea41da0e30342521b368865422a3bd SHA512 9be00f68ad491d0082a0b44681936e0bcfefddcd69ebf2789211c744932dbf89fba8d88751f5ece0161a363c35dd86f8135b538bd6a59bbd61cbb419899839cd
 DIST texlive-module-lshort-estonian-2017.tar.xz 400 BLAKE2B 51f9dce9042ba7e285b7e4d2162b5f8c3fdf112363411b4176c827c316391de7884da6d2b9504d2521a4a3f0fd6a74a459ea41da0e30342521b368865422a3bd SHA512 9be00f68ad491d0082a0b44681936e0bcfefddcd69ebf2789211c744932dbf89fba8d88751f5ece0161a363c35dd86f8135b538bd6a59bbd61cbb419899839cd
-DIST texlive-module-lshort-estonian.doc-2016.tar.xz 2940172 BLAKE2B c3c3a08072ddc139e0cfdf453cfd9c6068597d559f98ad9aae8b5de7fc17a3dfe540393ed3dd88a13a6f1e754a9ea386c5fc8830dd4570fad7bc135f3274b8cc SHA512 1f31d038f5606c99fac10faa5960562084450ca7b37b2c9a99b2de4065b3767f6b9dadcc6366221ec95d41f74c4ca5476ce1bead89ad84c85dae235921d7c6aa
 DIST texlive-module-lshort-estonian.doc-2017.tar.xz 2940172 BLAKE2B c3c3a08072ddc139e0cfdf453cfd9c6068597d559f98ad9aae8b5de7fc17a3dfe540393ed3dd88a13a6f1e754a9ea386c5fc8830dd4570fad7bc135f3274b8cc SHA512 1f31d038f5606c99fac10faa5960562084450ca7b37b2c9a99b2de4065b3767f6b9dadcc6366221ec95d41f74c4ca5476ce1bead89ad84c85dae235921d7c6aa
-DIST texlive-module-lshort-finnish-2013.tar.xz 404 BLAKE2B bd9016c00d1518e30a86fff117a2081277fdb6257cd1478e4b18fb30b6443f396db91d8a3f479f4c7f75ae4451a1dacf28439c5ee9581c3b40eed61a23470a1c SHA512 854e9851d6db999c17559d8430b5a6a30c94deecf70ed27ccb7fbdbdc9fb195dbd1fb91b351da4798428425344b8440c2679db45171273c49bb21ad9463541a9
-DIST texlive-module-lshort-finnish-2014.tar.xz 404 BLAKE2B c6e854fd2c200b10ee4db5d3d5c50c0d0ed5277bcffa8aab49e934ed355042527b6fc1686904a63741e345b48e5d7d7c542a8e76174ed7d7f85752e9d4d462e8 SHA512 3d471c4513c8c81505cf00aa89379e2d000865111ae59ba5781960d802d7afc8c91f870ed4604e631f39cf266e06c48d3936209617e0b4cb87039cb4267f4432
-DIST texlive-module-lshort-finnish-2015.tar.xz 404 BLAKE2B 9c3e018b2de2562d560a7a3662d6be9d792f569e9fb402ded8b4ea90707804dac87bf385e0a33ecdb9d127dda4bc50b986b4ad4caaf331264e27ad087d77a3b6 SHA512 0b525c6847f82a2c3375ed92237340d12b732a0d48984eadb100c2900ad41659027b26d267cd8d0599a7ebcbd50bcac14b05fc624abdb1f6858366a66329f699
-DIST texlive-module-lshort-finnish-2016.tar.xz 428 BLAKE2B 1b71a11aeda0b6235c6982835c4cf7c47215c26abe931ecc68b1e1e814d84cea0d89ea895b8a045e63448f72d27f2da4222426cb48cfcea374af5ad6f8d09725 SHA512 7b00b5e29c53e5de64e235c6727f097c47625283f1bd7b1981e2d53d1d4d6a3e1b97ddc362ea417698cf7fea4b6e449d1a17511cede01912eb3355a86852d289
 DIST texlive-module-lshort-finnish-2017.tar.xz 428 BLAKE2B 1b71a11aeda0b6235c6982835c4cf7c47215c26abe931ecc68b1e1e814d84cea0d89ea895b8a045e63448f72d27f2da4222426cb48cfcea374af5ad6f8d09725 SHA512 7b00b5e29c53e5de64e235c6727f097c47625283f1bd7b1981e2d53d1d4d6a3e1b97ddc362ea417698cf7fea4b6e449d1a17511cede01912eb3355a86852d289
-DIST texlive-module-lshort-finnish.doc-2013.tar.xz 1681088 BLAKE2B a65a1eb63e88cb196591960cfbe8bb58ba6fcb3e589059db2e6ac3db3c09d9480f4b3a296239c8e6ffc70b22d112f4a471a2013316c27b28fc9bc1b973c959f1 SHA512 2494853395475be1316cd4b2ec2d761cd8b311dd344cf2a04f7995d7524492005726c3e378a5c3e8166557fcad5e5d522a3ce8050ca6d68326d60bb067488362
-DIST texlive-module-lshort-finnish.doc-2014.tar.xz 1681088 BLAKE2B 77d862a3c843fd57878310abb579b50bb04b17deda5d7627ecb9a180e26cb8d01a196f3ca151a5e6318bead55aec695c9ee66be94ba143fc4be1b9e26b07fd1e SHA512 ce62aff3e292e894f640638fbfcdb86f526b10d8a218368fb90dfc4d2d6f954013ffdf9960af4b6da621a5c9da91cb84e600e92e25c3daea5ccd97b131b0f225
-DIST texlive-module-lshort-finnish.doc-2015.tar.xz 1681088 BLAKE2B 3a355a34bea7d52990689387db7d495d97e3905550b853916089325f6e9706f7460ed937ee2728904bf827a5b4ed5249127dd77dfcb54ae52bad5ebe1d9dafab SHA512 2b420f847bb22eee9e789f8d07e339d42b08b8282890395b28f5f587fc10639beea37fec99596dd1559ccab509d8438730e05f9ed1a40a85daf4959db2f92b05
-DIST texlive-module-lshort-finnish.doc-2016.tar.xz 1681088 BLAKE2B 780e7b9cf932701027c7371dd705a14905cf766607e4d25db91eaeaf722050eb1d59e72ca6bf4502e988e6dd2ad1eb4cec7a483e12ff959ea2bd159f2d1f9bf6 SHA512 e1d05eafcfaf29a3ebf0690404e131ebcf931a23925b984175bec061837eb3c4f839f1a21ce0c60ff08c62650958202eb60c708c03f646ebb7524d22001b1fdc
 DIST texlive-module-lshort-finnish.doc-2017.tar.xz 1681068 BLAKE2B 6bd8793df3229882eb2f40aa38bfda799860b0cd95ee2d5a4b4bcbf5777b987a0a9203d3e4d54625a0272a194afa4d800c57ab708c9a6a8a1cf233ed4c38372a SHA512 9905feadad575fa628462e2bddf489aa831181bd543e8bb38aeda11e3f793d2f65a31bee7aeede11643b7eb56ddd8ca1376fb2d19b0329c87c71eadbcc1c3d09
-DIST texlive-module-lshort-slovenian-2013.tar.xz 384 BLAKE2B 301379a2d5d7434e0a5f5e51bf7daf4e78062ca477ed5d8708642557da3421e70ea9450ff610172ac12832602a1069fb107e7175034c494e84609d12e59e4c50 SHA512 72a1bd42027e84aec143d0625cb1c93e505479208b0192dba363f260bf106827966e28e21a72039fd56922d06ecb9031cd1b2f1e5c4607f4d1fde0b2c166b7b8
-DIST texlive-module-lshort-slovenian-2014.tar.xz 384 BLAKE2B 9ade6a171088e7274a198a137319a7c6c7afc85c70b3302454cf404a4048cd5ca3c4e35fc7f5971e4811353ba1fc8555e8ada1684b73faa57e32f59fb0c58141 SHA512 16a668a6c7d51e33a7d7bbbc304cd5f6d00d7f77dc6f7ad7e19b1bd6d56cce1d66c544c9d453c0542cdbad8f688237fced4d4fcc4535b47edeee3f6e1517fe8a
-DIST texlive-module-lshort-slovenian-2015.tar.xz 384 BLAKE2B d36634bf7db54ecdb23e2e3c73731e0d54431c2594000fe5a1fa38b6f1c569044cc287d47f57a2e6f220e55c78d2301b2a3ffb49f53a150e6a0b8aa2ca9103c1 SHA512 c9d9f4053fa44a0a9b4899a68c8b7602e4e7f5bd89bc2e4d1860223a06ed1ed20b2ea9fdba765bf9ea05bccde76447c8e670f551a5d3e83cacfb04fdc3627cd9
-DIST texlive-module-lshort-slovenian-2016.tar.xz 404 BLAKE2B e5948e341e2cdece579f100448b08d245380249157b2ac030faef0ec7f3b875523a107adf3d7da44769df75d85cad87eebbd46d6cb057d43e0991b47eef07656 SHA512 3093a7e6cf84fc5dd000193467aaa7ca06f797da7e756f0ad9ce09be090ec77795bacd85e4048d18b5c07a2df523bf0c7ffb03afd11b53698ba60358bd2aa084
 DIST texlive-module-lshort-slovenian-2017.tar.xz 404 BLAKE2B e5948e341e2cdece579f100448b08d245380249157b2ac030faef0ec7f3b875523a107adf3d7da44769df75d85cad87eebbd46d6cb057d43e0991b47eef07656 SHA512 3093a7e6cf84fc5dd000193467aaa7ca06f797da7e756f0ad9ce09be090ec77795bacd85e4048d18b5c07a2df523bf0c7ffb03afd11b53698ba60358bd2aa084
-DIST texlive-module-lshort-slovenian.doc-2013.tar.xz 1390728 BLAKE2B 68f18fa69ca2c2160edb35c99cdda0da7295030f9cbd9c03c5bf1c6362139aac216eff5beb40b4fb29c1081701767fcfe158eca34a8026c150dcbb21d7b78880 SHA512 fda4800d142bfd4aa2b706f9c312b23d40f11adb09a5ca5460bd2627660b7b899abf32e49ee6e96443815af09019a680166ccf18276de6b29551afaab7f73a87
-DIST texlive-module-lshort-slovenian.doc-2014.tar.xz 1390728 BLAKE2B 4d33101bdc7b5d53e52274d287639888585b11bd2a122ddcf044c1d6d0348b0a7ec87a355dc74c9d97fa5cae4d599526402b6650bc10cd77b0fe4c845955b996 SHA512 3e744418de705075741dcb04dbe3f99e406a237624903afeae5a0f0eb3cff02246b3b4d7f24a643adfb7a4355378219b8a10a2ee85971564aecd8d467bc5d238
-DIST texlive-module-lshort-slovenian.doc-2015.tar.xz 1390728 BLAKE2B 66ba5ed5c75c82814da9698a233f9ebcf1dfab423fde764d169630e457702cd12813cbb1674d9353b4d6f296b8f94f2491a32e39744df45e9c10d76cfa25f995 SHA512 8468ad8c827c92952b135d9c52844c96251247ef7d94ad04f0c0d3da6088fc184132c3140150d32f578d61cf1cd7c8d996f4de6215f49e1bee64f85211c1c88e
-DIST texlive-module-lshort-slovenian.doc-2016.tar.xz 1390732 BLAKE2B c25136354ecb8fa10c2da3c9b09085a9b1fa96651dd3a418071c77ec175e2bb5dc91dcead0b6bc9662f0dbe372eebf7ccfad8fbf1be7376f5b81c9b23348bfb7 SHA512 e1a98c861ab3a2180bce006d20bf9b7b8d45241896334b308b6e0b626e357d2f9d8ba4aa82315a3dcb7382ba99c451c8c5d5c45b3dd951e2984ce684e395f81e
 DIST texlive-module-lshort-slovenian.doc-2017.tar.xz 1390740 BLAKE2B 16938631a83dc4967737a9c31c0373cec0b1faff8121b42a876006ebcb0d14b8313ccaf2af721c328496e3c270bcf1855c17ae12d7a79ec9acf54320cc589cf4 SHA512 8248d8e18a569596a957cbd8d8247dca049cac6e4a7ec68e94687bc2fd66dcf7c3263ec596199844bff09ab430077416167b47240f34717e16e95890044987ef
-DIST texlive-module-lshort-turkish-2013.tar.xz 384 BLAKE2B dda8262454e99be2b25c15af2a3a980bb0e6b16c5b2bae5e45c5a1caae6e39ee457bf9424e4688ad7173af01570c24414ca4429ec7d6eff2ecf506e451b2318c SHA512 2a15026ea7162fdfe3162c5577f4aa720291e001b9c476f24bb7ee585adc9a037682565ff9cc8ea9020be1b6008521a5f7b3d26a5746d587ca3e293d699d84f1
-DIST texlive-module-lshort-turkish-2014.tar.xz 384 BLAKE2B 4c8e135a8cfecc89b8db57f07c73bed185313de6a7db4855acb407857e8006575282572d6c3c164b8e792ab03aafc6b495a3b7dad720b42c2785ceb6e91cb725 SHA512 0dc4d1c10d75b4f3793af26235e7177ab479f15ce3ff4b9f16047bd68f86e8e633e7ea730ba91551b2db12db35df0425201e59f5c4fd1d99701e6e459cd645d0
-DIST texlive-module-lshort-turkish-2015.tar.xz 380 BLAKE2B a66e8180e45103db3eaeb09f553dbfcb194b15c39aa1b40bc64a168f511879d667846319bddc411f5024ad11449c66db64f2f47f25fc53029e79e6c02ce00eca SHA512 41b39b5b302fef721f15d5c34263b2cb3c366a481e72b0713961b5c4985fc587f14f8652c1850fb7841d3f2b3abe758c1764a43eb71ef2f9fce97aab5e4612d3
-DIST texlive-module-lshort-turkish-2016.tar.xz 400 BLAKE2B e8c3e2ad6289aae827d2b0d27c0e3570d5f6db6378b51b2175c1fd77dec7c987f9415a66efa756ed2e600060743cb963e27660addafd66b745d33ca869cbf625 SHA512 d709688d9b7a22c82a8d85433b45e93c06c4fc29ada6e44b156dfe45690b56b5d3eabfbedb3820de71085712246dfc0bb1a208a5af575b8ad8386ecb380418c8
 DIST texlive-module-lshort-turkish-2017.tar.xz 400 BLAKE2B 114a9b751539b05332a118b4fd74e9b1c0f7fae4c27b7fd6003098c1505ecd7833d442effb5b13f76aa5c0b074b342eb3b973d7d8636c5da514fa674c5fb3451 SHA512 7504082503c49cbe4dfa998656efd06d4969a68c3458f23835b3c26b85cebc347c9ec4c9bb9b3b4027533046edcd9f92558532969fcbba62398b81afd482d83e
-DIST texlive-module-lshort-turkish.doc-2013.tar.xz 1427684 BLAKE2B afb977a0e48adb30a316613be639931ec0e2f4bf7e7f1a14c7e9e3ab08332a428143414a64e8fed7545960170515fd238479bf27b51ee1b35c659748aa5ef463 SHA512 056b2f387ba980d7f58fe4aede69a1208a70d357249fc33a6396b9ccfa1f552d07ea7065de1cc1ca203ad90c25da7758724c62b3c2c2917d918b48be0c4bcc74
-DIST texlive-module-lshort-turkish.doc-2014.tar.xz 1427684 BLAKE2B be339f5a5ece537316a177b61635ad855abf7cd79c8a941d9d5e43af8b3681e1d6bc70a6ee0836f3b35f2a767268f0cfb92d1c3e98f600a774775cc3fbe61d54 SHA512 7f3ceab5535410cd17b89c6efb7d6b799f577e5f69697933effda0b383947eda6c29d1bf7c8c401f7c478e84c86630c55bd5115884c98b9ebbbb1c07c424b685
-DIST texlive-module-lshort-turkish.doc-2015.tar.xz 1427684 BLAKE2B fae8c99b14215ef19bb6ca61ae0fa5385c8d5d27c729f9b44740730d34034676aa399f1aec1f76310c3ac02fac7db71466e28f963c695c676800b3ac96c44c62 SHA512 b686f69e1eb89138beb0642c26cac24fa53c5dbf3970756f9685e0307eabb98348796520fdbf209cc947cec88d2e10c8896b1186067e0fff850193cf75dc0586
-DIST texlive-module-lshort-turkish.doc-2016.tar.xz 1427680 BLAKE2B c9e4726033ee55408a3894ab171844122b53df079dca2c6ecaeae6fa0760d6034b07364f4e6b6a24a2ec9d1c39ae24b7db49cf27e19ea09d7372a165de4e2003 SHA512 877877ab27dea3dadc7162a872eb55a1c0812af51f7beed739a451c9d463c0f5fb7342a9e7c4a4a757c72238530cd65e599bf1392a0274ec4440848f55e464c5
 DIST texlive-module-lshort-turkish.doc-2017.tar.xz 1427724 BLAKE2B b7455ae9873e5976d8847196040514af9eece33640a8b425db2ef559e3b4663d04c5ecb0b8abc147931a1f97d2770c9ddf5ff18a78a4102a01039d2e90444d59 SHA512 09b90fb9c7a44ea68be192aed17fd350ccd9baa915ae90809f0b167c9ff46f0a9bd64ee2b8fb27c4bcb9b0d84925f301f500dc1da55717a83f68203b3e94243f
-DIST texlive-module-nevelok-2016.tar.xz 1860 BLAKE2B 638e44d11d77554085d7ab129deecf83f0de813153d47936913f7e65288919580b76a9645233ff1b2a80007b1473e56fdfc217defff14d4ece5f6c865d847823 SHA512 7fbe400bfd85a6dfc044942e1bde327be3b1b9658bec732b9c26233136324492828c6d7de0548ee32672fc29277c4e2cf3be7ff939ecef50574448672ef450d1
 DIST texlive-module-nevelok-2017.tar.xz 1860 BLAKE2B 638e44d11d77554085d7ab129deecf83f0de813153d47936913f7e65288919580b76a9645233ff1b2a80007b1473e56fdfc217defff14d4ece5f6c865d847823 SHA512 7fbe400bfd85a6dfc044942e1bde327be3b1b9658bec732b9c26233136324492828c6d7de0548ee32672fc29277c4e2cf3be7ff939ecef50574448672ef450d1
-DIST texlive-module-nevelok.doc-2016.tar.xz 211284 BLAKE2B 8053066fdab63aef6d7aba09070669f8af09aa7b267a6486fb69f898f6d30f75bb647850335323194ba833ecb12f7a75abc11d15bebb94900c8aaa8bb86fd7ba SHA512 707018655dbd713e576613aa51717d4a0f4012771b0c94742577f1beabc1c03f853ae105930a995d3d05d196f3bfd438cb3b833859101555f94362a86b05fe4b
 DIST texlive-module-nevelok.doc-2017.tar.xz 211272 BLAKE2B 94ac93b8973ca5512bf34926d1e508267e0314bd76047c9cbddbe1ff79fd389693177f335dbf861895cef55087b6e41e434835f1d2b73f8afc4adba4c542ff37 SHA512 afebea73b86292ba149fdaf339108385ca6103a448bb6f0423d62ebb1d0681809273bea73430919bcfa4605aaa45786f2814818dd1683e333dabc0fc8e53f904
-DIST texlive-module-nevelok.source-2016.tar.xz 4000 BLAKE2B a7fa8266dedd6a41fc2172dd38789ad34e1b099ab8a7ad13c7a7a44c99962effc60a8f4b3a36e5990b9b89378cabaab4c17e5c3bef17f03232c541f24d57089e SHA512 3c25c9cfe523f67ad12509af9fe9e7e0027435dbc7251514be3d9fd44ac59460ab925ef06a597b4b7bebb737652ca596e6efff22c7430c76119cf5372b2edc71
 DIST texlive-module-nevelok.source-2017.tar.xz 3992 BLAKE2B 40ef68a2e7d8c9d7f717c845d55e6d918def969a9ed40140a8d1157636c77c9173a53a1a0e82261a6c47d9209a2141cc93394fb1fc1f1463dc873605dc34575d SHA512 d9c8f7daf85c917c5fa438fe5d74c15f8106e92bf53e80bb870919788e829bf6563b4a8f12adcb87628dcf65fff76c5fd8a064a6a7a243696337efd2804962a0
-DIST texlive-module-swebib-2013.tar.xz 6880 BLAKE2B 482c347b067306f5e26658be79452e4a2106354dc6c36b79535466cee5459cb6b78794cc7351a4892636b05b820ef1de92d412f3c828f6fa3dc74be1aaf8855f SHA512 1692b1a9f77cd5e9b1546de176062c36f524bae6361fc282205537a556f22916c774999558c40b5cbd4bf04c8e96a9bc27808ebf1e758ca66f537f5ce7753ce4
-DIST texlive-module-swebib-2014.tar.xz 6876 BLAKE2B db8608d43b106b473db0951fbe016c975d0db042ccfac54a011ed38ae078b609f39d28564db5f363559077421e87b7513cdbe00f378515abaf57f72043e101b5 SHA512 f618776cae0fe98b26e41d2ac8568d0b33f98a97512d44c0ede41994a49d70f81a275327c71c89d9fc6d542e053dbd8305db01d3e8e835dbbc46e1973cc85bbf
-DIST texlive-module-swebib-2015.tar.xz 6880 BLAKE2B 61e6cc7245e21291210a5a83b117c28d5fbb11bf6e6f224577b834cb1a850d062c4135d90525b1fef703e1c7044de6ddc215171a735ce7fca9d4b70644819761 SHA512 c66ae0bf800f773a53b5d5af7c1f6e6515ee550e23dc9efc4b9b02fa6304f5681c17ff92c2b7c937a8882ef597e429d6ff6bc1ed1c2edb3e96009c4684134b1c
-DIST texlive-module-swebib-2016.tar.xz 6896 BLAKE2B 87be38030ae097a8f6fb12bffe6dcb6e04bcdcbd20713ff404a400e65c10e722153d99f9cd03669476423269a872dc2d094af77378f17cd7be703391042e1132 SHA512 afbf4095c2926fd16c1cf526cac57ac7e287fed46c85b3465763eede2303427b7e250043c46dccc648def16af29db2c1ac4624d021b12df6fea35e489fe596d3
 DIST texlive-module-swebib-2017.tar.xz 6888 BLAKE2B 453c7fb3c88947391780ac57db956353c1d2f7de10ca4d6cfa6467115e55fb7fe909cfb91fcb7d1c606e8b980af0e9cb5be8240ee6cdafa35f9acf6875f67e98 SHA512 90a97b5273090c6d7776a869be5d11a73e1db69d63c9eb4d48beffb92cf09e9b52c4a48ec9943d0fbf9892f95c4f630177da056e2e690e47558f7a74336d501a
-DIST texlive-module-swebib.doc-2013.tar.xz 492 BLAKE2B 6ebf60a20f135ea1daf312a645f8fae9975d999ae6fb0eff000340807e9546104200f2220ec73d2c74e0dffde30ad07e69043b4d34daf4314e758ce2a8631049 SHA512 508d97ed4b0de4f5ba4cfd4577f1346624056c3afe76bf776245097aff3cae267f160457bddd5b8c5bdf63f7dff585f4811918b5275bbe0cda060cb9fcdd0b08
-DIST texlive-module-swebib.doc-2014.tar.xz 492 BLAKE2B 8cf7f7d39414aa2da116e3a8cc4aabd2de11fac7a5a8d2cf26b4afdd7a927e617a46980576370a48e37698dbf23fb6342ecd4c81d75e3c97af1f04cfa9f469f9 SHA512 064c896caf484d02157c94260b0428ace1fffd63167fa25e1bedd17fc0268166d35904c4f477950a221217ff3f7127d7c0a4efaba7bb33d943b477b5e0c4f13b
-DIST texlive-module-swebib.doc-2015.tar.xz 492 BLAKE2B ffd3c8436473a3e5065e9cbbfc16b979a8be4d7eddb3897099cdc746fcacbaef32c1fbdd91d9271447eadf644136f5975179cd68b41b0a657a397a0a98c8e45c SHA512 66bbc9255018d105f4bcea2cfcc56a67c26a0202a6d5e9f13eec5c23c0e014831d9becee4bb5d30d198cf4ca420468edd81f7cb78dbef55978ec7f9940cd438b
-DIST texlive-module-swebib.doc-2016.tar.xz 492 BLAKE2B 6a69289aa7db869a7cdb643918248bd6d0026846753fed1332df63507fd201a89f07ca115688e3108a13150f213055a7d2ee28308c3e6b21c1c84f201e473e32 SHA512 990a4104e57911ea54b706239d6f63eaa7fbfe8e16456c66bf8e2b2bf2f59721be75228aaf6e954a8db13e75abd36a68730f7b7b0ba3f0daf226e002afb84651
 DIST texlive-module-swebib.doc-2017.tar.xz 488 BLAKE2B ed512f676a1a013ed02cd11cfb5ef87f30b7223c5e4448147a7d80353189b868f2addb61fe63cfc9a47117eb4427f97f5f1eb18ccd7647a7e4d37463ce269a40 SHA512 b7387c6f7051088cb6706153247a1c7681a25809420bebe217870cffb9492d990a1c2340b92cc5e246edd2cb33d54d0a7b11cc0f41609b5c8ac074089a2e98ad
-DIST texlive-module-turkmen-2013.tar.xz 2200 BLAKE2B dfb3f0329f94a282099e6cd8918e6dd4cfd99382bbf1d619e0a17ecc5b8e74450f2b54f70626eab049dc4f60393fd7204bd8b7fbbab751f65fd92cabc07f0241 SHA512 994f21f409f8a3d277d409375fd2ee33ab88334ad51a33544abe34d49d44698910fa2fc0f34ca2ee14caf8900c29e1ed54880d689ef377ed1bec979184d5ce9e
-DIST texlive-module-turkmen-2014.tar.xz 2200 BLAKE2B 83e2fe6a9f60e40bb7389aa374bff102d84d02dcaaf44a671a75cad353fe5de15a2201c80fad5bfc2b433cfbedfc9c53f171b87137250be550694e204203e1b3 SHA512 99cc79a411dd04f89e1220a61dd02c73f1c1de4db3d5602a1980365dfa7f8461b583806daaa723527020461d2914c13b57a0ef1dcf658be458f20d49bfbed45b
-DIST texlive-module-turkmen-2015.tar.xz 2200 BLAKE2B 2eb6e25260d631888e8b7acf578db3be4505ff3cf7fa73cf692e4a4111f2f88061bdf2ed6dba39c7c33c0ed4d1b5d36dd1512d6cd7a6de687378546faaaf0fbe SHA512 6fae147d2d99981f67ea4c7ca0b007d8c20520dbfcaebf82082dcd083b2167688fbdebb48914cfd3e56c044a301e8c2d9d6e485e0f39294a945036ca88df8af4
-DIST texlive-module-turkmen-2016.tar.xz 2220 BLAKE2B 1244dc2faf5dd41e3e0e8dff6e501a9b4d3bed7439975a217bf9804188a75384e1260a61a9ac65bf3fd6005577016da4e74baae878af2106150b06c32ac48347 SHA512 ad4f34d2f7374b4c349457f24d04d5c625470cc3496f3ba5b9e15d451253e861acc3ec45565675416e0cf0f5e03a67dd2f883153ce03246399f78bf79c921526
 DIST texlive-module-turkmen-2017.tar.xz 2216 BLAKE2B b1facb1d6cee9566fde5d1eebc860493e5b39be82cac49597fa8c977503a5664480827499a015edeb3dd6f6cfcbdd8b1b9053a129a03de96c293643ae2af7974 SHA512 cc566d4a90100f8dfae2e92fd31e86321bc877e73621f7bd4c3733d0e7530b6af6cbd4e5adc1c34421e839ae4e26edf4948bc4bec9ee31b8522b2a1e384cd615
-DIST texlive-module-turkmen.doc-2013.tar.xz 109388 BLAKE2B ec314d2e3352a4b8b9e38c142b9c0062d61b65fbc8df9e7f3deea63d88e78caf83bf1e5882d950e7061a6e897a95e5df4b09837c91bbfb518823647027001d5f SHA512 4f2c1c639fe363f79cd1323d2208c042d2141b38e5136f04cd4c47683fc5f37168d4f99d693f11c168b2656741d4220ec33e36316cafa17b74450a697d27b3be
-DIST texlive-module-turkmen.doc-2014.tar.xz 109388 BLAKE2B e6c6abe7836d7c9c0bd8d86b8bcbb0e0a9dc633a863d16e15ec7d39aaaf0c63305b65f9804ffb2b93d47d1e716c4a7b7a6d4e9f17557bbff618c8d66cb6ea1da SHA512 a505c3e5fa32c3c61fc843c00448150e631b41ece41159832f445456598e4c5b5531fce02fb263d3deac800d9bc588aea90d7d8e633e52e2d75cab45988aa1f2
-DIST texlive-module-turkmen.doc-2015.tar.xz 109388 BLAKE2B 8bb165683203f4af87d7092f18dcd5e5cc16ce1480107ee8603e4f1513adbe3ffe5e1cef8f0a6778ab1cb36acd3777e132b2c8ef00a1ab35fa1a570596b97bd4 SHA512 12afb10b94c6037a340cb2b9ba1dc317818f6e4b5848f373470e945b2e262ecddf785b11c491b2db5aca516977b17661a6dbf0df7c495c637cd1e67f5cd1b8bf
-DIST texlive-module-turkmen.doc-2016.tar.xz 109388 BLAKE2B 2ce3c4aebb5fc353f2be8a24993cfd77b98c7c6f435dd3e74b0d220e2e460493163edf6f606c9925727a200ccce7dcced279cc6db5f32433851e02a95499a2e5 SHA512 ff4d28bdc426ca5192c9077689e675a03af77f3f5dedfa956df455a84d9fa3a189cc3485ff26a1f2ec69b06ce2b77bf110486b89b5713e2540e1946675e731e0
 DIST texlive-module-turkmen.doc-2017.tar.xz 109392 BLAKE2B fa1255e2c3795218efdb84c8b7914f2080ea999ef16f5d92bda1d2682ca7d7ead30b949b642f2575924a712de59edccce809556a0873ae12966d9eefb6a60e92 SHA512 d60448287afafbf2b0c1bae27d4f4ebcf571eabb0118a1d3a082371f60a071cd25ac8ed0bb14080c73162cb02b61efe86af9c480038a19d0eeabb553fe26e58d
-DIST texlive-module-turkmen.source-2013.tar.xz 3936 BLAKE2B a99c2ee107863d9adb9dec5215f6b80e05a571942c4e4e20799207e2ce946d6b1b8efd0c0646b1693796e4b04780b2f78ec6a2c0895d2047d3e521dd5fd9714b SHA512 e006aa0066b7f308065d7ed5e34255e9241e73048421a45783e2121821588b6f61a2228a4354c835c852c8367bed6f47ee2eac5c779027c55c27c91d05b97921
-DIST texlive-module-turkmen.source-2014.tar.xz 3936 BLAKE2B ef4e0c7056cc37e22d13f72f782ba0fa5d1a68b4841be71f9aa2992c02021ac952080d12782d49d2c04b726518d67379ed2c33be0040be579f742af2b84cf9e2 SHA512 500ad6430911a804efc8d2c8ebd4f6b1a82130256e44e4599f62a85ffc699fcf9132ba81eec99029404f140ea67b89f2f2716f63bf918a3a2e1873b479f8ecf1
-DIST texlive-module-turkmen.source-2015.tar.xz 3936 BLAKE2B 792cad09133c090d24fe04fcf4eed9eaf2813c2efc5f1087a99931294047025aaf57e389fe9f4d01cf8faf32ffac3bb4266c864affc77d5052acd0a3baba1772 SHA512 6cf15a5539c071d1f3f1067ceaabce7f74c761fa48943dcfe0aa6586e6bdbb5d7c2e7671cda61e95fc7896c229b0c171f63a6f02a066f8e3322d2e54265945fa
-DIST texlive-module-turkmen.source-2016.tar.xz 3936 BLAKE2B 5b2879e491fb969484613b97a0ac4a92b598d23ddfabef88031ed26a6c4a3887d6f74a72c1b912958436717992d02c14ff4824ce4d3342682662a5c63ae894e9 SHA512 d0453dbaaa6d4f72f98b1e42398d035b6b09cc16be345a27270b4b31db93a70b0c66ebee617392c96617173358bf14839073129568b477223f4b3f322895668f
 DIST texlive-module-turkmen.source-2017.tar.xz 3932 BLAKE2B b6177a1558d2a035acab7f3bc67b63e45d70d4688227c6b5f39863776b42e4bb44da987da9e360a536ceda348d88cd8d73605aba5195aaea1aac6701f869f553 SHA512 cc9f6709475ef0cdae27069353c917f4909cd577a31560e732dbcfaa22e887fc882ccbe57b25210d59a1d39bdc38b91a68a16b455f379fd30be13d83dda442c7
-EBUILD texlive-langeuropean-2013.ebuild 2840 BLAKE2B 48f3e173ba64c39818c0d4085d1ea53580ecdcaafd287239eafcec38bc464e919d266d53bdb65c512581f637f6d41e829ef88f1e427c1fa9e527f318b1787128 SHA512 0cb392bb94849c92fe009ccc3ff7a495efaa906cc6c0bd7a63c990f8af62ee38059174acfe45ed941da8f2a76804473674e17301b4cda35a5c464e993a1f0c3c
-EBUILD texlive-langeuropean-2014.ebuild 2909 BLAKE2B d9f5bbc02ec05adafdeda554edf184b9aa870a2844ab0ed2a7fba65dc92025c5b35611b7637fabaf5589a384a5314aee7e124934f80b42cc10ca4777ca3f9dd1 SHA512 1165a468fc864784fdbe11f7e89e25eb2fcd57d2e754af2a865130bbe814b6c327ad920c0a8d878e4179946562861a18a74f3f24121167860c9a562f04fb64eb
-EBUILD texlive-langeuropean-2015.ebuild 3058 BLAKE2B d98a6872ee8dc59ea66645a56c4e318ed457eb8aff33e52644d9c7f5d8e090900abb7094126ce97fc26c28b91f395a1e9ec8c2fa79012c468fa8eb0e9878e89a SHA512 a59af9f2e82083e2a3929955a1863edacf957164aa30ee955a0a525a98d4b26034c82f377a23aa47a6b02f9c437ff3f143f70511b916698b9d8130943edac140
-EBUILD texlive-langeuropean-2016.ebuild 3409 BLAKE2B a78de8adf4e4255c2f882b45cef5e34aa1b3c1d2942a59738772ef205bfcdaa9add592c4a8cf31bcaf6a2021226650840def54dfc1e800e67781a3a384e9d63d SHA512 ceecf93b9bb7b35fc43f84f1941d3e5a9466df8e43f58c2752c0efe7feddded1044a6f4e6a66bf209fc8e94d6f8e8f3372ede7ebbfdf26d7d37f43bcc5a96cd4
-EBUILD texlive-langeuropean-2017.ebuild 3385 BLAKE2B d1cbe28eea279aa17bf9586d6eba8d999dbcaaa6321de45961c836b30b230bc38f9b115f1c18889e591a61162f6ff5b3d48bd987c81d1d6ce56d8ff737965582 SHA512 70a29dfd30aea29e8939931e429e4adc57061bfe36b0ccd01e9ad984afb5296db8f997a30eea6568f847a48a31c515d1c53e14f734793747fbe72d0de87cabbe
+EBUILD texlive-langeuropean-2017.ebuild 3384 BLAKE2B 5b449e8a4c79b7e2eaf0c317e7bfd1ac71902dfe1c0c2db8d16734af1d26da9d1c667da826746974acdb2c26a58af931ee0a9847ee3f3db7f07e4de6e1d7ef47 SHA512 57d163408e6c2126431234cfe01150a654e30da77fbda6a87e82f0eb2177f0791d99113e36da82cd78806830b389cedeae6453da6ee9e8b6ef57a67330ee75a5
 MISC metadata.xml 567 BLAKE2B 1529aa51facc0942b5c0c6e8463aef9b45946bac106e2e5a73357ccb738d724eb0bbdabb382d2d86e27b581f7f573f4544e8e4193efb763039a6109a326aeb00 SHA512 34c78d457f3560fbf5693c5e601a908605082a182c0933b0c00aff363f966e0251b06e5e4751741e0ab9359f3dc92b5ec2bf8fbe72fc0a09ae7a0eadeb100727
diff --git a/dev-texlive/texlive-langeuropean/texlive-langeuropean-2013.ebuild b/dev-texlive/texlive-langeuropean/texlive-langeuropean-2013.ebuild
deleted file mode 100644
index b6e4fb7b5683..000000000000
--- a/dev-texlive/texlive-langeuropean/texlive-langeuropean-2013.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-TEXLIVE_MODULE_CONTENTS="babel-albanian babel-breton babel-croatian babel-danish babel-dutch babel-estonian babel-finnish babel-friulan babel-hungarian babel-icelandic babel-irish babel-kurmanji babel-latin babel-norsk babel-piedmontese babel-romanian babel-romansh babel-samin babel-scottish babel-slovenian babel-swedish babel-turkish babel-welsh finbib hrlatex hyphen-armenian hyphen-croatian hyphen-danish hyphen-dutch hyphen-estonian hyphen-finnish hyphen-friulan hyphen-hungarian hyphen-icelandic hyphen-irish hyphen-kurmanji hyphen-latin hyphen-latvian hyphen-lithuanian hyphen-norwegian hyphen-piedmontese hyphen-romanian hyphen-romansh hyphen-slovenian hyphen-swedish hyphen-turkish hyphen-uppersorbian hyphen-welsh lithuanian lshort-dutch lshort-finnish lshort-slovenian lshort-turkish swebib turkmen collection-langeuropean
-"
-TEXLIVE_MODULE_DOC_CONTENTS="babel-albanian.doc babel-breton.doc babel-croatian.doc babel-danish.doc babel-dutch.doc babel-estonian.doc babel-finnish.doc babel-friulan.doc babel-icelandic.doc babel-irish.doc babel-kurmanji.doc babel-latin.doc babel-norsk.doc babel-piedmontese.doc babel-romanian.doc babel-romansh.doc babel-samin.doc babel-scottish.doc babel-slovenian.doc babel-swedish.doc babel-turkish.doc babel-welsh.doc hrlatex.doc hyphen-hungarian.doc lithuanian.doc lshort-dutch.doc lshort-finnish.doc lshort-slovenian.doc lshort-turkish.doc swebib.doc turkmen.doc "
-TEXLIVE_MODULE_SRC_CONTENTS="babel-albanian.source babel-breton.source babel-croatian.source babel-danish.source babel-dutch.source babel-estonian.source babel-finnish.source babel-friulan.source babel-icelandic.source babel-irish.source babel-kurmanji.source babel-latin.source babel-norsk.source babel-piedmontese.source babel-romanian.source babel-romansh.source babel-samin.source babel-scottish.source babel-slovenian.source babel-swedish.source babel-turkish.source babel-welsh.source hrlatex.source turkmen.source "
-inherit  texlive-module
-DESCRIPTION="TeXLive Other European languages"
-
-LICENSE=" GPL-1 GPL-2 LPPL-1.2 LPPL-1.3 public-domain TeX-other-free "
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-DEPEND=">=dev-texlive/texlive-basic-2013
-!dev-texlive/texlive-langarmenian
-!dev-texlive/texlive-langcroatian
-!dev-texlive/texlive-langdanish
-!dev-texlive/texlive-langdutch
-!dev-texlive/texlive-langfinnish
-!dev-texlive/texlive-langhungarian
-!dev-texlive/texlive-langnorwegia
-!dev-texlive/texlive-langturkmen
-!<dev-texlive/texlive-langother-2013
-!dev-texlive/texlive-langswedish
-!dev-texlive/texlive-langlithuanian
-"
-RDEPEND="${DEPEND} "
diff --git a/dev-texlive/texlive-langeuropean/texlive-langeuropean-2014.ebuild b/dev-texlive/texlive-langeuropean/texlive-langeuropean-2014.ebuild
deleted file mode 100644
index c4863e2b5496..000000000000
--- a/dev-texlive/texlive-langeuropean/texlive-langeuropean-2014.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-TEXLIVE_MODULE_CONTENTS="armtex babel-albanian babel-breton babel-croatian babel-danish babel-dutch babel-estonian babel-finnish babel-friulan babel-hungarian babel-icelandic babel-irish babel-kurmanji babel-latin babel-latvian babel-norsk babel-piedmontese babel-romanian babel-romansh babel-samin babel-scottish babel-slovenian babel-swedish babel-turkish babel-welsh finbib hrlatex hyphen-armenian hyphen-croatian hyphen-danish hyphen-dutch hyphen-estonian hyphen-finnish hyphen-friulan hyphen-hungarian hyphen-icelandic hyphen-irish hyphen-kurmanji hyphen-latin hyphen-latvian hyphen-lithuanian hyphen-norwegian hyphen-piedmontese hyphen-romanian hyphen-romansh hyphen-slovenian hyphen-swedish hyphen-turkish hyphen-uppersorbian hyphen-welsh lithuanian lshort-dutch lshort-finnish lshort-slovenian lshort-turkish swebib turkmen collection-langeuropean
-"
-TEXLIVE_MODULE_DOC_CONTENTS="armtex.doc babel-albanian.doc babel-breton.doc babel-croatian.doc babel-danish.doc babel-dutch.doc babel-estonian.doc babel-finnish.doc babel-friulan.doc babel-hungarian.doc babel-icelandic.doc babel-irish.doc babel-kurmanji.doc babel-latin.doc babel-latvian.doc babel-norsk.doc babel-piedmontese.doc babel-romanian.doc babel-romansh.doc babel-samin.doc babel-scottish.doc babel-slovenian.doc babel-swedish.doc babel-turkish.doc babel-welsh.doc hrlatex.doc hyphen-hungarian.doc lithuanian.doc lshort-dutch.doc lshort-finnish.doc lshort-slovenian.doc lshort-turkish.doc swebib.doc turkmen.doc "
-TEXLIVE_MODULE_SRC_CONTENTS="babel-albanian.source babel-breton.source babel-croatian.source babel-danish.source babel-dutch.source babel-estonian.source babel-finnish.source babel-friulan.source babel-icelandic.source babel-irish.source babel-kurmanji.source babel-latin.source babel-latvian.source babel-norsk.source babel-piedmontese.source babel-romanian.source babel-romansh.source babel-samin.source babel-scottish.source babel-slovenian.source babel-swedish.source babel-turkish.source babel-welsh.source hrlatex.source turkmen.source "
-inherit  texlive-module
-DESCRIPTION="TeXLive Other European languages"
-
-LICENSE=" GPL-1 GPL-2 LPPL-1.2 LPPL-1.3 public-domain "
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~mips ppc ~ppc64 ~s390 ~sh x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-DEPEND=">=dev-texlive/texlive-basic-2014
-!dev-texlive/texlive-langarmenian
-!dev-texlive/texlive-langcroatian
-!dev-texlive/texlive-langdanish
-!dev-texlive/texlive-langdutch
-!dev-texlive/texlive-langfinnish
-!dev-texlive/texlive-langhungarian
-!dev-texlive/texlive-langnorwegia
-!dev-texlive/texlive-langturkmen
-!<dev-texlive/texlive-langother-2013
-!dev-texlive/texlive-langswedish
-!dev-texlive/texlive-langlithuanian
-"
-RDEPEND="${DEPEND} "
diff --git a/dev-texlive/texlive-langeuropean/texlive-langeuropean-2015.ebuild b/dev-texlive/texlive-langeuropean/texlive-langeuropean-2015.ebuild
deleted file mode 100644
index 6f8dfddbf2a0..000000000000
--- a/dev-texlive/texlive-langeuropean/texlive-langeuropean-2015.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-TEXLIVE_MODULE_CONTENTS="armtex babel-albanian babel-bosnian babel-breton babel-croatian babel-danish babel-dutch babel-estonian babel-finnish babel-friulan babel-hungarian babel-icelandic babel-irish babel-kurmanji babel-latin babel-latvian babel-norsk babel-piedmontese babel-romanian babel-romansh babel-samin babel-scottish babel-slovenian babel-swedish babel-turkish babel-welsh finbib hrlatex hyphen-armenian hyphen-croatian hyphen-danish hyphen-dutch hyphen-estonian hyphen-finnish hyphen-friulan hyphen-hungarian hyphen-icelandic hyphen-irish hyphen-kurmanji hyphen-latin hyphen-latvian hyphen-lithuanian hyphen-norwegian hyphen-piedmontese hyphen-romanian hyphen-romansh hyphen-slovenian hyphen-swedish hyphen-turkish hyphen-uppersorbian hyphen-welsh lithuanian lshort-dutch lshort-finnish lshort-slovenian lshort-turkish swebib turkmen collection-langeuropean
-"
-TEXLIVE_MODULE_DOC_CONTENTS="armtex.doc babel-albanian.doc babel-bosnian.doc babel-breton.doc babel-croatian.doc babel-danish.doc babel-dutch.doc babel-estonian.doc babel-finnish.doc babel-friulan.doc babel-hungarian.doc babel-icelandic.doc babel-irish.doc babel-kurmanji.doc babel-latin.doc babel-latvian.doc babel-norsk.doc babel-piedmontese.doc babel-romanian.doc babel-romansh.doc babel-samin.doc babel-scottish.doc babel-slovenian.doc babel-swedish.doc babel-turkish.doc babel-welsh.doc hrlatex.doc hyphen-hungarian.doc lithuanian.doc lshort-dutch.doc lshort-finnish.doc lshort-slovenian.doc lshort-turkish.doc swebib.doc turkmen.doc "
-TEXLIVE_MODULE_SRC_CONTENTS="babel-albanian.source babel-bosnian.source babel-breton.source babel-croatian.source babel-danish.source babel-dutch.source babel-estonian.source babel-finnish.source babel-friulan.source babel-icelandic.source babel-irish.source babel-kurmanji.source babel-latin.source babel-latvian.source babel-norsk.source babel-piedmontese.source babel-romanian.source babel-romansh.source babel-samin.source babel-scottish.source babel-slovenian.source babel-swedish.source babel-turkish.source babel-welsh.source hrlatex.source turkmen.source "
-inherit  texlive-module
-DESCRIPTION="TeXLive Other European languages"
-
-LICENSE=" GPL-1 GPL-2 LPPL-1.2 LPPL-1.3 public-domain "
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~mips ppc ppc64 ~s390 ~sh x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-DEPEND=">=dev-texlive/texlive-basic-2015
-!dev-texlive/texlive-langarmenian
-!dev-texlive/texlive-langcroatian
-!dev-texlive/texlive-langdanish
-!dev-texlive/texlive-langdutch
-!dev-texlive/texlive-langfinnish
-!dev-texlive/texlive-langhungarian
-!dev-texlive/texlive-langnorwegia
-!dev-texlive/texlive-langturkmen
-!<dev-texlive/texlive-langother-2013
-!dev-texlive/texlive-langswedish
-!dev-texlive/texlive-langlithuanian
-!dev-texlive/texlive-langlatvian
-!dev-texlive/texlive-langlatin
-!dev-texlive/texlive-langnorwegian
-"
-RDEPEND="${DEPEND} "
diff --git a/dev-texlive/texlive-langeuropean/texlive-langeuropean-2016.ebuild b/dev-texlive/texlive-langeuropean/texlive-langeuropean-2016.ebuild
deleted file mode 100644
index 6fd54f004953..000000000000
--- a/dev-texlive/texlive-langeuropean/texlive-langeuropean-2016.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-TEXLIVE_MODULE_CONTENTS="armtex babel-albanian babel-bosnian babel-breton babel-croatian babel-danish babel-dutch babel-estonian babel-finnish babel-friulan babel-hungarian babel-icelandic babel-irish babel-kurmanji babel-latin babel-latvian babel-macedonian babel-norsk babel-occitan babel-piedmontese babel-romanian babel-romansh babel-samin babel-scottish babel-slovenian babel-swedish babel-turkish babel-welsh finbib gloss-occitan hrlatex hyphen-armenian hyphen-croatian hyphen-danish hyphen-dutch hyphen-estonian hyphen-finnish hyphen-friulan hyphen-hungarian hyphen-icelandic hyphen-irish hyphen-kurmanji hyphen-latin hyphen-latvian hyphen-lithuanian hyphen-norwegian hyphen-occitan hyphen-piedmontese hyphen-romanian hyphen-romansh hyphen-slovenian hyphen-swedish hyphen-turkish hyphen-uppersorbian hyphen-welsh lithuanian lshort-dutch lshort-estonian lshort-finnish lshort-slovenian lshort-turkish nevelok swebib turkmen collection-langeuropean
-"
-TEXLIVE_MODULE_DOC_CONTENTS="armtex.doc babel-albanian.doc babel-bosnian.doc babel-breton.doc babel-croatian.doc babel-danish.doc babel-dutch.doc babel-estonian.doc babel-finnish.doc babel-friulan.doc babel-hungarian.doc babel-icelandic.doc babel-irish.doc babel-kurmanji.doc babel-latin.doc babel-latvian.doc babel-macedonian.doc babel-norsk.doc babel-occitan.doc babel-piedmontese.doc babel-romanian.doc babel-romansh.doc babel-samin.doc babel-scottish.doc babel-slovenian.doc babel-swedish.doc babel-turkish.doc babel-welsh.doc gloss-occitan.doc hrlatex.doc hyphen-hungarian.doc lithuanian.doc lshort-dutch.doc lshort-estonian.doc lshort-finnish.doc lshort-slovenian.doc lshort-turkish.doc nevelok.doc swebib.doc turkmen.doc "
-TEXLIVE_MODULE_SRC_CONTENTS="babel-albanian.source babel-bosnian.source babel-breton.source babel-croatian.source babel-danish.source babel-dutch.source babel-estonian.source babel-finnish.source babel-friulan.source babel-icelandic.source babel-irish.source babel-kurmanji.source babel-latin.source babel-latvian.source babel-macedonian.source babel-norsk.source babel-occitan.source babel-piedmontese.source babel-romanian.source babel-romansh.source babel-samin.source babel-scottish.source babel-slovenian.source babel-swedish.source babel-turkish.source babel-welsh.source gloss-occitan.source hrlatex.source hyphen-armenian.source hyphen-turkish.source nevelok.source turkmen.source "
-inherit  texlive-module
-DESCRIPTION="TeXLive Other European languages"
-
-LICENSE=" GPL-1 GPL-2 LPPL-1.2 LPPL-1.3 public-domain "
-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 ~x64-solaris ~x86-solaris"
-IUSE=""
-DEPEND=">=dev-texlive/texlive-basic-2016
-!dev-texlive/texlive-langarmenian
-!dev-texlive/texlive-langcroatian
-!dev-texlive/texlive-langdanish
-!dev-texlive/texlive-langdutch
-!dev-texlive/texlive-langfinnish
-!dev-texlive/texlive-langhungarian
-!dev-texlive/texlive-langnorwegia
-!dev-texlive/texlive-langturkmen
-!<dev-texlive/texlive-langother-2013
-!dev-texlive/texlive-langswedish
-!dev-texlive/texlive-langlithuanian
-!dev-texlive/texlive-langlatvian
-!dev-texlive/texlive-langlatin
-!dev-texlive/texlive-langnorwegian
-!<dev-texlive/texlive-basic-2016
-"
-RDEPEND="${DEPEND} "
diff --git a/dev-texlive/texlive-langeuropean/texlive-langeuropean-2017.ebuild b/dev-texlive/texlive-langeuropean/texlive-langeuropean-2017.ebuild
index 580e5042107c..84ff0e817fbf 100644
--- a/dev-texlive/texlive-langeuropean/texlive-langeuropean-2017.ebuild
+++ b/dev-texlive/texlive-langeuropean/texlive-langeuropean-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Other European languages"
 
 LICENSE=" GPL-1 GPL-2 LPPL-1.2 LPPL-1.3 public-domain TeX-other-free "
 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 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2017
 !dev-texlive/texlive-langarmenian
diff --git a/dev-texlive/texlive-langfrench/Manifest b/dev-texlive/texlive-langfrench/Manifest
index 0cae30c2e806..c142f7c573ad 100644
--- a/dev-texlive/texlive-langfrench/Manifest
+++ b/dev-texlive/texlive-langfrench/Manifest
@@ -1,218 +1,76 @@
-DIST texlive-module-aeguill-2015.tar.xz 2364 BLAKE2B 1ab5d1f96b5f686b082fc7acc61feb9ddd8f0ca03590cf4ea5c34718c3455f5cd8e0c9575a92c40074db3967e7184890ca5e500b5b769efee1b9acf9283b9245 SHA512 0df31642890d11da0ad0733d55c096f2a3cc424aa98dcea0eedb2b07deec217d5afebab28b34646494858b6575b2120ea5fa4bb370c734e9ae5724cea9855a40
-DIST texlive-module-aeguill-2016.tar.xz 2388 BLAKE2B 45758f78f6bef241deb3c2caace2af776bd0188111b4d2d15a797e71f5bf6cf845df943b3aa09b189d05c7bc677eb6381ac57b1d5f24e3317972d4e5129f6dae SHA512 ca3fedbb37c4c91435bdb774dbbd4073a335208808abb9d5727e489b59f93debe42b2769ca917b37082a338726409593d6702008a582d369689dabf33a6288ff
 DIST texlive-module-aeguill-2017.tar.xz 2388 BLAKE2B 45758f78f6bef241deb3c2caace2af776bd0188111b4d2d15a797e71f5bf6cf845df943b3aa09b189d05c7bc677eb6381ac57b1d5f24e3317972d4e5129f6dae SHA512 ca3fedbb37c4c91435bdb774dbbd4073a335208808abb9d5727e489b59f93debe42b2769ca917b37082a338726409593d6702008a582d369689dabf33a6288ff
-DIST texlive-module-aeguill.doc-2015.tar.xz 26980 BLAKE2B 1bcba2d80bc52e11c1fe4331e4af2ef2e00fe601e20fb7c3715b4b63cbb4b2551f66c3a717b04dc1c7801a8ca7d7aa44255c9714592b385cbc3cca9046bbbbe7 SHA512 9aedfb6089ff283b502fa35315acb251e4f2776d85a355558bd86e0fdc9bb8a7b9a864fcb7d40cf6f73a191f20f701903b5c0745c4d41c42231d8f37d7f62b90
-DIST texlive-module-aeguill.doc-2016.tar.xz 26984 BLAKE2B eef0a02c065c633efd36f1879542bdc7d48827a32d7fcce73e21cf552e8f6123a6e2b88c1475ce4a592b4ca0bcedd24534b29a5269c5b1bfde9a98bbfa42db7b SHA512 d47054efa63c7b79773ef9a85b4bf1d3b3e9226340c06d842f9582d56c2675911f333e2194f276d141e1228469f097e350fc0fabd4b38ed630b7caf462115d18
 DIST texlive-module-aeguill.doc-2017.tar.xz 26984 BLAKE2B eef0a02c065c633efd36f1879542bdc7d48827a32d7fcce73e21cf552e8f6123a6e2b88c1475ce4a592b4ca0bcedd24534b29a5269c5b1bfde9a98bbfa42db7b SHA512 d47054efa63c7b79773ef9a85b4bf1d3b3e9226340c06d842f9582d56c2675911f333e2194f276d141e1228469f097e350fc0fabd4b38ed630b7caf462115d18
-DIST texlive-module-apprends-latex-2015.tar.xz 388 BLAKE2B 7170e2ab87d41c47dc6000e862a31d5ee3cadbc69924c508d0ea0420fbb3bb0c3f35aba3ee320695800c2beb2a8b31fbf5bed7e56820b27971b30deca7603523 SHA512 53a8e1336d9f05f3e6949295e3c6b03306f1efe5d702ba4f8b174d05a7571745148f7578d5805a4bc898430bf6694df0d890246df419985e89f5d6d488d73357
-DIST texlive-module-apprends-latex-2016.tar.xz 404 BLAKE2B 0b1ad38ede93c309b10fd2790dcc64b150d223ea8e2d5c0eacb41e5fa352b13bd20573e0f8e4c5cfa3ace1be8fff58c8fbe2ccf9bc008f5125a53796a31289e2 SHA512 3b205a29daab8dffe6b3da82007fa0db0728586954f9e687bb3e7bbc7e5b472bc9ad7dab7e82d57cb2d175472df69ac8ac9393f107326e1319b4ffebf5adf2cb
 DIST texlive-module-apprends-latex-2017.tar.xz 404 BLAKE2B 0b1ad38ede93c309b10fd2790dcc64b150d223ea8e2d5c0eacb41e5fa352b13bd20573e0f8e4c5cfa3ace1be8fff58c8fbe2ccf9bc008f5125a53796a31289e2 SHA512 3b205a29daab8dffe6b3da82007fa0db0728586954f9e687bb3e7bbc7e5b472bc9ad7dab7e82d57cb2d175472df69ac8ac9393f107326e1319b4ffebf5adf2cb
-DIST texlive-module-apprends-latex.doc-2015.tar.xz 2489056 BLAKE2B 30cf10ee2c487e4382b277ccca37c6422efcb9770f9bd318dd44e1d09c7d9353d09c1bd292de33b10728ea033521b293c9588337b0c4fa7d81bc8998a968a0a8 SHA512 55104dcb86413427c41930fa5e8483fb65181d13a37ab0281b6ecc432eeac4f17db8fc6c55ab4301b8577dc0bb3a50b6c9cb8d0a547c77792c57db94e51886ce
-DIST texlive-module-apprends-latex.doc-2016.tar.xz 2489060 BLAKE2B 99f8bfd56ed45b8b880d3478df5f3bb87ba0b8f894b5b4726d74fef7a732f7c67039f12a26c34e29cffc6e1063acf44aa7296d1b099271defd05dab508194cc3 SHA512 1d93fca41dba3078a066c3f454e6ffcc85b78688c9200d72b2dcbbee033d04072252b54a3e799d4d39b84d1bd8d8d7d04a0f08a817ea68d35e9de6ac2aacc0dd
 DIST texlive-module-apprends-latex.doc-2017.tar.xz 2489060 BLAKE2B 99f8bfd56ed45b8b880d3478df5f3bb87ba0b8f894b5b4726d74fef7a732f7c67039f12a26c34e29cffc6e1063acf44aa7296d1b099271defd05dab508194cc3 SHA512 1d93fca41dba3078a066c3f454e6ffcc85b78688c9200d72b2dcbbee033d04072252b54a3e799d4d39b84d1bd8d8d7d04a0f08a817ea68d35e9de6ac2aacc0dd
-DIST texlive-module-babel-basque-2015.tar.xz 2640 BLAKE2B 25762aece1e4901db480ae7688b2dfd22edaf57ddc5c23d8bf616a91698ac5d85aae16e4f6e75db5e9dc672694b07463f0f3be3a5212c93aa9f8b5044ca47983 SHA512 3572012fc676076fcfdfc42bb15a8ecc90ce089ba9c64151ab707b1c0cf5ef6ad5a9231b633e08d8c6922ce2b45835560f2aadb3157f0a63d03149c7404b35f5
-DIST texlive-module-babel-basque-2016.tar.xz 2660 BLAKE2B d6550db864fec3ce10793f885efab483d73b9e58b2e159353949dbae91cae34bfc97663465c813f8e5e5915228f9c10ec055d3b85b7666c51a1ee87263c2b0ae SHA512 d51d4c74a3ee1e5590f35be443ed10cc4f749f191fa200c8b612d83410d410550ff89a7295ca812623cd0f7b0de991083fa3bb150c2bd10ff62898cd04413be6
 DIST texlive-module-babel-basque-2017.tar.xz 2660 BLAKE2B d6550db864fec3ce10793f885efab483d73b9e58b2e159353949dbae91cae34bfc97663465c813f8e5e5915228f9c10ec055d3b85b7666c51a1ee87263c2b0ae SHA512 d51d4c74a3ee1e5590f35be443ed10cc4f749f191fa200c8b612d83410d410550ff89a7295ca812623cd0f7b0de991083fa3bb150c2bd10ff62898cd04413be6
-DIST texlive-module-babel-basque.doc-2015.tar.xz 155352 BLAKE2B 923cf1bf7b9dfe4e9ee68039e0d6048bd1fce5f5058249b365e8fb392113d501577af120c983b29acf01816b186ab4444d3259c00f247aefa2ebea80cd9660a8 SHA512 160514c304a1eaec839ef5a119681db796b8c8bab9b9aced5d05c2a6bf100f77f0fe1607bb0e6a26e8ea820fb9b85728812634b4b27c18d760853777d8ea406e
-DIST texlive-module-babel-basque.doc-2016.tar.xz 155352 BLAKE2B a41427d6c39454bb4cff4002d04937293b3cb198376bb5bef2bb9a55053ca58007c81cf71e7474b4ee5d1a7fc08866853bf5683de8e1eb7b1517a27d69425081 SHA512 0613bae550ec9cc77711ff31846c42b74b21ac1d87881f88550f2df5f988684da639e814b570046aaae6e0540262ec751b45b6f07b2d7a1f4c40a9bfe082b0e1
 DIST texlive-module-babel-basque.doc-2017.tar.xz 155352 BLAKE2B a41427d6c39454bb4cff4002d04937293b3cb198376bb5bef2bb9a55053ca58007c81cf71e7474b4ee5d1a7fc08866853bf5683de8e1eb7b1517a27d69425081 SHA512 0613bae550ec9cc77711ff31846c42b74b21ac1d87881f88550f2df5f988684da639e814b570046aaae6e0540262ec751b45b6f07b2d7a1f4c40a9bfe082b0e1
-DIST texlive-module-babel-basque.source-2015.tar.xz 6464 BLAKE2B b266ce00c00a4b7482793096207755ce96897335348fc1455ce87a381b4540e3862747f0a73a95c38f468844d25648489afb9611e2ffd531eeac3941a4ff42e8 SHA512 294a7ea0ba53988bb182f9212d23b5970cb4a87a3957b636e6d990641490a0c671610b029e30f8cbbd22f6accf9a98e29a93aade61fc5613772398392d1a2180
-DIST texlive-module-babel-basque.source-2016.tar.xz 6464 BLAKE2B 79efa2fa23c921a9edcdca96dcbeb50fab72878f4b7406bf4eb922f7aff758716b4f0f08429e88cc26aaf0a5f4abf34553733e38c330ad13a8ded3f84089c49d SHA512 03d49e285cae23bf65d02b474f44b43e795f809cfa3023ecb0f9258a0e1d32e48d8a9da2bf0d9d61aed73456672a24565fc5e5fa33512c7c2fca8b1e4fb7a6b3
 DIST texlive-module-babel-basque.source-2017.tar.xz 6464 BLAKE2B 79efa2fa23c921a9edcdca96dcbeb50fab72878f4b7406bf4eb922f7aff758716b4f0f08429e88cc26aaf0a5f4abf34553733e38c330ad13a8ded3f84089c49d SHA512 03d49e285cae23bf65d02b474f44b43e795f809cfa3023ecb0f9258a0e1d32e48d8a9da2bf0d9d61aed73456672a24565fc5e5fa33512c7c2fca8b1e4fb7a6b3
-DIST texlive-module-babel-french-2015.tar.xz 12884 BLAKE2B 3ceb7307c956b34ec7b5e9fd198e92745c8e223018c63e0c6ed07ea1b49081ef5b1166133ac5bdf38d3bf5160d08b7ccbee0d8b8994eec233e2cb959afd5cd62 SHA512 1a38a9b1704f08db943bf57730619cb2644ba1a79ef903f4e4dd132ddc4d0440800f824e2ec6bccde815c023d1fa085d24679a2b4d235e37a3e21a97a324dfad
-DIST texlive-module-babel-french-2016.tar.xz 13700 BLAKE2B fe9f01a416dee0a6f429c9db145a46972ae91310ac80d85dcaca1970d084cc32cad3264f604bafdf990e4d1c4d79e94919d5306827b3e8518d83c46a3a3efebe SHA512 22f9b3a3ceaec416c63ba812cd195acdd2a25d78d2ab6503e57e9e88b49b77f5b742c8cf4a3c9ad6422f1e82bf97e7c05be0a71a55308e6c9ee12e9223ac86ab
 DIST texlive-module-babel-french-2017.tar.xz 13892 BLAKE2B a30b2b317f1040c721da425728b337c3d272005f47622b5d94a5b6abf637673a092eee941af09ecfa40f6a30576b9e6510eda180b5487f614b5e64572870bbd1 SHA512 866c4ad609b0ec6ab3902e52b06467a9f2876e76c30dbec0c42bcc0fb0dd6661cb010cf3f41462f3479641b426afe8c6438277b9091b487e39cdba3cf0360529
-DIST texlive-module-babel-french.doc-2015.tar.xz 258736 BLAKE2B 654be540275021bf46b12ee85fcda5b4f3552e8534e3d5d3cea5da995ad53a4dbfe6960a197f9f8a04e1784d054b266bd0a64280378225416e1c508cf0198633 SHA512 f79e6e34766b486cd23ef9d806d8dcfca948b42680ffab443c8f4b9360bc74665101adf0327cca315bb25bf4cd430290e5f2f077a6130794d673e18f21b6dd44
-DIST texlive-module-babel-french.doc-2016.tar.xz 265496 BLAKE2B 58dd3d079340892d283c7c51a0f98be74762f35ff763850562481cbb33161a0da300f253d94e21f0a0103dbeccd1fb2e7a34b84521989d877e865a16cb161bb9 SHA512 a469229f18d91edce95629fe9f1f7f982c5a7be1de4cc2a6d71d994930fb2784382235a2a715863ef4d58dac6f05dfd4a9addd1cc46882fed4c8bfd4b8da9152
 DIST texlive-module-babel-french.doc-2017.tar.xz 267144 BLAKE2B 5fab3f99c0b5124081b2c1bb398d2a8915b6215ea1ad62fb46ca30bc817a2cf1eeb3da1841c67714a294b3fb210fb0ea17ba344e1acd3d1e51bbbbd21d4c2788 SHA512 6b0c3a4f38b698487f1fca229b9590827338190ebf13a1ecf7a3e723aec0e42d734b3e042ea690c8db9f9b55f23c6c6b707a4bd304d063a21276a7987d543a05
-DIST texlive-module-babel-french.source-2015.tar.xz 45440 BLAKE2B e6c78db3531b07c170dd8366b4dedce06c5ea83d1a645f11f625a39321a15736e2621b4c4ca486510e9f752b969c5fde9c21a46c5d68737efd84f55100193069 SHA512 df9087ca8941185ac68fc2d4bcc8d526a4da6dca01d31f6d0150d8a73a83f0583da69fa46cc829697455c5a270a62b8c32cad0bbe165748ee65120ec5b2833c7
-DIST texlive-module-babel-french.source-2016.tar.xz 48104 BLAKE2B fac4a6002528da7b2028d9b53ec1146c1a694f839f26e5059b333746d3e8ab7a5823824e8c9d49179cdb79745bfbc813711d6cb289f8904b569f3a9b20c42287 SHA512 034e6eb137c12c51cab81902712f966f8d69dd7c8c22d043291fb9aae3a387b9f5c384647fde67b659e1ca400f1c3b8804269d6c45dceb268c9a74945f304dc5
 DIST texlive-module-babel-french.source-2017.tar.xz 48992 BLAKE2B 926f6682fd6f60affdf5e309ed245c91f51de4f4140559b77b2e33fcc58aa03a31e94ddbb13be4c569bab6e52110246830a0a10b30545d174e4a10c4c3e7b063 SHA512 4e4217b4d569768ad211859c47cb93de3047203ead0a80c87a3f523fea4204d6fa80833df1ba17695d2fdee82bdb3fee63e4f429a67b2060029959914f40950a
-DIST texlive-module-basque-book-2015.tar.xz 6012 BLAKE2B 5922e3567f2ae4aa77ce51fedbf310c92cb8f408c2359feefd6be37c3e6975f9de1b6ce09b23875c4ff5f9a1d4883728eef1c652d1c9068e0a05030f66c0af0b SHA512 0ee2f2a3a0d32463e60e02202e3ff47d0563d70e45b79389bfc88b483ac30263589b97a72d416588eac3b0e71d9a09bd80ed2e572700cfbabd6106cea80a1f05
-DIST texlive-module-basque-book-2016.tar.xz 6036 BLAKE2B 62ec6620e25b03e764ab035dc1714e8e77a32d0d4d5bc2194a25301512383133c48fc50d299067760c9004b1f0ab5ca07407b2530047595e9b407e389ad5899d SHA512 71868b0c7d27a17d15aa5078837c63e8e390182262f3988985407915e3fa5712218927f1152d5aa251095747574fcf21abf7a2181a0035e59d11860e468e4f63
 DIST texlive-module-basque-book-2017.tar.xz 6036 BLAKE2B 62ec6620e25b03e764ab035dc1714e8e77a32d0d4d5bc2194a25301512383133c48fc50d299067760c9004b1f0ab5ca07407b2530047595e9b407e389ad5899d SHA512 71868b0c7d27a17d15aa5078837c63e8e390182262f3988985407915e3fa5712218927f1152d5aa251095747574fcf21abf7a2181a0035e59d11860e468e4f63
-DIST texlive-module-basque-book.doc-2015.tar.xz 391652 BLAKE2B 618b269f9abfaf2c42ff49f9be8f763c8aa9703038305b17104f5e8776d6d7f5bcb6d18db1d006ff5af8b2a8ceb6398772b0ef543c6f909c2b2eb113aeee9945 SHA512 a4d0212ebd378b3d182204e4095300a72a7142557a5782e580cd7155d28fc30477daa23e76645a594ef08dbc5b45c4b4b081493ad5e67b7e4414150a72bbdb89
-DIST texlive-module-basque-book.doc-2016.tar.xz 391652 BLAKE2B 37baee8fa4f34f0d3b7e541b66d4d22c989fcc8d27a54dc821219fdf52b4feb3896d44ffdcbdb9fcd69f641b13f04f8a9d34f6b9713a407ef1b24c623150d990 SHA512 97762440bd9a234c8cabb38e14ec5e7bc4e191b567f39063924effb87e85d94aabb008ec27a75e969e3a163ac010f2bb28ac69ab182bcaf7650c79670746115d
 DIST texlive-module-basque-book.doc-2017.tar.xz 391652 BLAKE2B 37baee8fa4f34f0d3b7e541b66d4d22c989fcc8d27a54dc821219fdf52b4feb3896d44ffdcbdb9fcd69f641b13f04f8a9d34f6b9713a407ef1b24c623150d990 SHA512 97762440bd9a234c8cabb38e14ec5e7bc4e191b567f39063924effb87e85d94aabb008ec27a75e969e3a163ac010f2bb28ac69ab182bcaf7650c79670746115d
-DIST texlive-module-basque-book.source-2015.tar.xz 10284 BLAKE2B e90c8e05e03771183c7089f9459de0100caed630d1d592ac472d12e03f04c79042607c1ae3e57dcfcf2373ac67dcf4e4396599620f50c2c0044a841038b27ebc SHA512 208f10719b434fe004a85c37ad19ca187ee0ba4dbff1673e911106f79c548554212316f6bbf1ec726c08e4665a299725e85ced3994c9b7dc1bd973c5ce1d55a3
-DIST texlive-module-basque-book.source-2016.tar.xz 10284 BLAKE2B c74edee812ba4a143a7a77c8d549885a5f02f8d4c05d129df8f39e86990db24f53b252f8d4eb19906e0cc2c0f1f9f1a8a347d81f7805353063bb6529fb63eadd SHA512 300e5f7b32d6094a3ca7174e1ddab5225d41b7af91abf96dacc622ae5cd244ad1a8edbe1562249b3de2e8253f357a2aa80a8e40e838301ed9a8fd61f80d23fc4
 DIST texlive-module-basque-book.source-2017.tar.xz 10288 BLAKE2B f92904da7f45de0f536abfc8d549ff1542b522a72668cd4f19ca7be4ddeec4a5e2ab516c13a9d74b10608032a2e7783a603813cb877b8047366d0b010b3409e3 SHA512 4f7be96e3f9edffa527bbc63bab8474486170151edc2eb28b4db86f9b08f708c74cdff8802a701f1eb95c5a513d7416fe8804f3bc993010a1ba91d022826dbfb
-DIST texlive-module-basque-date-2015.tar.xz 1684 BLAKE2B ea3e82adcad6e3972f5321e90dbc6b69da0e06929bb4e5c90a6dfde2a3e2217a7402e7ddc795bc09cc6f30d2fe6feec2cf545aef49cdd5d4fc28cbc65e0f3220 SHA512 69850447ce78aa6e64f6e9d63d143e00e1fa677654d5696469d7a98c46083bdb95bad117811aeee6274af359913f6e5f2fbb5ad8fb7a74afb1f3380e234406f4
-DIST texlive-module-basque-date-2016.tar.xz 1700 BLAKE2B 97ecbc2574b432e2d105bb509cc23478b9b7ff465a0d10109a0a78b4f3a21bfcaf6a9d88864a69c7831c62eab4d482ee32c5f71b0fb7528ed9bc780fc2254c12 SHA512 522b41fd512c959ae41d6d627a4ccd23ade60d204e12c7234094e1a1e91f468d531c346541a0e92c27255614e3a9d34ebf7b1e8b3399d1c4fbb9f1c5b5a010d0
 DIST texlive-module-basque-date-2017.tar.xz 1700 BLAKE2B 97ecbc2574b432e2d105bb509cc23478b9b7ff465a0d10109a0a78b4f3a21bfcaf6a9d88864a69c7831c62eab4d482ee32c5f71b0fb7528ed9bc780fc2254c12 SHA512 522b41fd512c959ae41d6d627a4ccd23ade60d204e12c7234094e1a1e91f468d531c346541a0e92c27255614e3a9d34ebf7b1e8b3399d1c4fbb9f1c5b5a010d0
-DIST texlive-module-basque-date.doc-2015.tar.xz 194976 BLAKE2B 5084214b6a39ec4255658c83b42e74487ee1bce9de2d7b08e901c87cefb019013570b0cadb02ede082114b4a4eeb74bd8db2f575850ee55898e099be83e9ae56 SHA512 573956b11917081288420793085ae1ec45545ec31ccf400c25cacc4b8006e2d637dbce8a0b171dbbc5bd54166e79c51fa2fea2edca3426cd1a849f37af7da87a
-DIST texlive-module-basque-date.doc-2016.tar.xz 194976 BLAKE2B 78664f85db9ad4631d917f8185451abe3e7defc49a0fea283c7400e2c17d333f815851f233bb0fe31e65157deab0f32656e5e3e013267104967e97dc810dcfe6 SHA512 d06b35bafb408279ece4dfb22f710cce638498978ed7fed86476e6a69e4a1aab15376734d4b00489b6b0ca0df87c78c9030c7945fb26a161c2694e572dc5ed9a
 DIST texlive-module-basque-date.doc-2017.tar.xz 194976 BLAKE2B 78664f85db9ad4631d917f8185451abe3e7defc49a0fea283c7400e2c17d333f815851f233bb0fe31e65157deab0f32656e5e3e013267104967e97dc810dcfe6 SHA512 d06b35bafb408279ece4dfb22f710cce638498978ed7fed86476e6a69e4a1aab15376734d4b00489b6b0ca0df87c78c9030c7945fb26a161c2694e572dc5ed9a
-DIST texlive-module-basque-date.source-2015.tar.xz 3184 BLAKE2B 3137edf5c90203e5eb7a46dea64c8983e51105b9e299828cd61d53f2e1509a57f8e192f0bf3ab8c80d161b4d445df4dafd33accb3f80213c25fb77bd3981c7e5 SHA512 76dddc7fe5a454cac8e7da90dc514b020f06fe2ecd3b78540d9ea7e0464fcb99e6ab892f422fc51d267eca3db822a56a51722cf8ee286142080e2fd22461b9dc
-DIST texlive-module-basque-date.source-2016.tar.xz 3184 BLAKE2B 57334cf4561e57802e6255ddbd0c7c6e76c32169eb7386079f8b2ef7b33ad8598430e7406a4f7c5b0fa212e99fffd9e433403d9da5cc3100178bf0ab44e4d780 SHA512 d321403364d5cf940b9dee43bf89ae52bcfb187615e974822d138b4c39e1d1e23762c623f8f2368245bb38851c64631c3c91240c5005703dd65a3e496067fb83
 DIST texlive-module-basque-date.source-2017.tar.xz 3184 BLAKE2B cdc45d7778d2759122141c994fcaf8ba34a5b2394e28381cd994e5e0a8d4570b83ce43b7de9d42870ed98af6baecb4ef3ddae806d0f08e239036be06a5bef003 SHA512 2e46e4eaabd9a39870483bd7038f7f4158bad52f6df63283220dff7371aadf4bffcb2f9a89faedd7835e39e0c802694076217651d7571433b01b6e22c4c7c42a
-DIST texlive-module-bib-fr-2015.tar.xz 13416 BLAKE2B 63c7c29f176580b953cd238db5443d33ca5bf5ed08eaf7b570a88a09a8c53e34673522c1026a6ec552158550f4dc7edc48033bcb667e465aca408ce6a92c3d7f SHA512 2355c386562a0401181c48ee672e81167def04dff8250eb23ea89338fb11a7645149c38f40f14fc8b560b158600e3ab55e84dbd809338ce0e517f35b044e696f
-DIST texlive-module-bib-fr-2016.tar.xz 13440 BLAKE2B 55a161c071bd2412aed3c4f8235f5cf32d57d15a878902699180a29f56ade17a79fb816ae9d7d8c3247cfa1800823a04a1b5e31d5971aa2b9244d958398b8759 SHA512 4e4c29c64a06ec48fb881b29b3cee73dc7103d64c575c593f2117dd8bfae74f61b26b5467fdcacb11e992319bda6f44c26fcc09b6b17df91821c615272a16270
 DIST texlive-module-bib-fr-2017.tar.xz 13452 BLAKE2B a1d5c5d54fd672e84c6440cd5f63aca8628c95d0007bd840f7a973ad3955404251f3706d6857a74e4188ec6e463b028f95f08908f44e86c6c94e59445953d753 SHA512 624d4806b5ed577d38d39b9ed805f950a078d942c39cac9196232b9dbbe7dd92db8da0ef1cb7be3934f619be8247fe2e4e41a1f5c7968fd7adc6482eb9e3aafb
-DIST texlive-module-bib-fr.doc-2015.tar.xz 952 BLAKE2B 900b671ff7f94c3d0f880147414fc12e720873197d062160c77af4442151758eac2f45b9f9ab10fcb6cab996212fa63224c7ac212b49403b3c228bf4b7f79efb SHA512 8fefbdeee10a6c1edc610eb789eab35503203aad7a9b65706c13f7fba7f9a25339f3bdd7f13293971ccf0cd3b6a732d59a56c5cf9d7b8f2f927bc245fa83ba6d
-DIST texlive-module-bib-fr.doc-2016.tar.xz 952 BLAKE2B 38442ad37e838847af5f6c2ec34b033f1244e3b1a19ef8496c96c8fa7302f16342ee12418d54d7df2e8b35a3c0ff1ac1822d42f426d107bad564f7b354fcc315 SHA512 93520193728e9e5c0d1278c5951a5252508adc0f1beb8946134e5474ad45682619967120364d6a7e7557181db61fdc9dcb2425dd2855d38e060e5dfddc360012
 DIST texlive-module-bib-fr.doc-2017.tar.xz 952 BLAKE2B 38442ad37e838847af5f6c2ec34b033f1244e3b1a19ef8496c96c8fa7302f16342ee12418d54d7df2e8b35a3c0ff1ac1822d42f426d107bad564f7b354fcc315 SHA512 93520193728e9e5c0d1278c5951a5252508adc0f1beb8946134e5474ad45682619967120364d6a7e7557181db61fdc9dcb2425dd2855d38e060e5dfddc360012
-DIST texlive-module-bibleref-french-2015.tar.xz 4624 BLAKE2B 82bd234dd95ee9e450b445e9a6d86af4172224995c883ed1eba5854ff12981d610c1c1fc7a244b946f30a9dcc4f4212b9b4c433a5629b44d6b81a1b964787da5 SHA512 3ece38b5cc0149defc1053b22c036191d6b4ca73c9910ff18a51493f7a67a3ec9c448604e9d0813e0d6cc56814d42386a6a3dde9a5d9325e9c44fadcf5fdb565
-DIST texlive-module-bibleref-french-2016.tar.xz 4636 BLAKE2B 7538787e8b436217ba414a58a4f16855bd98ccdb9015a21ac605e6eb6bcf37efe37804136fc56a47f35d75a38154086c036e816a76f3c1b13e94df2ea773bfae SHA512 d36dd2173360780b1ef2ec2ffd53725eddf58bb598f0bd1a01521e93c621e6a3542f92bce0e12e90d0536f38e7bde9b1c4709d13efef5e7292ca7c3d1e642a1e
 DIST texlive-module-bibleref-french-2017.tar.xz 4636 BLAKE2B 7538787e8b436217ba414a58a4f16855bd98ccdb9015a21ac605e6eb6bcf37efe37804136fc56a47f35d75a38154086c036e816a76f3c1b13e94df2ea773bfae SHA512 d36dd2173360780b1ef2ec2ffd53725eddf58bb598f0bd1a01521e93c621e6a3542f92bce0e12e90d0536f38e7bde9b1c4709d13efef5e7292ca7c3d1e642a1e
-DIST texlive-module-bibleref-french.doc-2015.tar.xz 643880 BLAKE2B 920bafb914b48419f7c9b715506fbd8b16164223f7eeb36434bcfbb8835a2ebdd457af5c5dd191b7df4844ae848cc4e4e9d7240d160859711e93f187af2dd56e SHA512 5f3c0b00e975eb6bef09b5d7601e26fffdf18e95d1424c18918d49c58688dbf724c67930eed19b6e98f2039b4a2b0fc815843ef6a5ef3a9bd2f78de4d4df5737
-DIST texlive-module-bibleref-french.doc-2016.tar.xz 643876 BLAKE2B f8be485cf06db68d1717fa8ed42a8226a013c6db33d50187eaf6d00be823f9eeed4939d69a61720a42589d5fda64a491c3d7232d321cab2b02d4cded217b3410 SHA512 3eb2be13946ef4de304da1af0c1c85515011eaf05fd59105f06ba87e2c54a2f55a64c71cbde539da3b378d4a6869df40d84859cca95ad1ac913b16208cceadbb
 DIST texlive-module-bibleref-french.doc-2017.tar.xz 643892 BLAKE2B cd9ce9f6933945967850f6408ea01e973693625e060b20938949b9ce3f464d2f5d1b84e1a89e0515b57c3397523eac883f8447026c3684ce9860910b3f902348 SHA512 5bb9cdf3859e4587d9eab58a98f5a8a238df746a75c2bd1b647c09d0547b08195c3274dcbf6453f438a094bd5d39abcc597df00ab7ae4e6771faa2a6a48afa06
-DIST texlive-module-bibleref-french.source-2015.tar.xz 7936 BLAKE2B 2183301994c7f2d88c8ce3f29ef2db96877b44606504b69a9ab8ba39e5a4eb0b07c4548c34dbe42859de1422598bc9bbf7a36abc7dfe2088b912f82f05b1fbed SHA512 4d0d1cf23ca444c8b865e94eaf09ae92fd424e5191d53d36d834727bbd90eb82d9e55b49a66f9a285bd2a74371c4ce929fe8c6984c78e82e880567911d16fb28
-DIST texlive-module-bibleref-french.source-2016.tar.xz 7936 BLAKE2B 0c5031588bbf36d0371143e3c542684c32e771e71a18272aef5ebd5843844f3d59bcf6e841e8e36854ff2148fd26d496c3a9049d5112503ead05454456b73f09 SHA512 cc827e136d8de3653c014b5156d68c11a7432e17c047dd3b5aa6f94ffba87be14fce8ef02775298de17cde87808ccbe0df0053fe0c5a0a59227977580cc0da94
 DIST texlive-module-bibleref-french.source-2017.tar.xz 7928 BLAKE2B 41aae755f429e8a1a0f658615970cc8f656521af4285bdccee09f1b11f3fe37bef4e31439fbe479335b92cba33ddd08d6aeab5ce76719de4897fc85757cece39 SHA512 763205d43ca4c94987b6abd8c3843ae5537cc871e35fe8f9f0f07503dcdcbd72ac4ee2839ebea2780d802c9d77295fe0bc0f232cc8a9dec2aab64d582b7653d1
-DIST texlive-module-booktabs-fr-2015.tar.xz 404 BLAKE2B c728ebff28d1e99b45e8fe81b14973b8293ab53f3f6623cb80f34918bb32b659b6d9b5bc1f805b5f9c80361e3833d1cec3a0bf4429ddaa65003a7ac322a280cf SHA512 1757ed61a090afc8e18333aad5f895588ebc8d219ad66f26b334b82eb33395b758f15a676d0f1e806b65783172e76123588d654eece08c400f3ab306135f4acf
-DIST texlive-module-booktabs-fr-2016.tar.xz 420 BLAKE2B a0293d04d5f92892fc01cc799c23bd8a507fd3adbb92cdf5bed694c7e0e3c027228ac1102b693dac7804fcdf2dda6163848ebe50f36547e1ede5c2e6a61f6210 SHA512 52f011cc80b3faf4a74d417f0afd4b89731e62404df697cc44d2c858eacfcba315694d4a66c7e0640635de2855fc470e18a9e194e45d09024f6a9d6ceb3e4559
 DIST texlive-module-booktabs-fr-2017.tar.xz 420 BLAKE2B 13f664c5f5730a91400d01172f480064f4c747bd44d6e38a29647f96989ee90f8b410182228fda43a3aab861fccbfe0dd60d2d71b088cea6d39a275510212cdd SHA512 bb502c6ffe69c3dd88c5df3d2e2f45f408a1ffcbd09232df5a7209feeb10f076d6f18bea6086180804a64a26e0a82c60060a5efaad134a25a35dd0084cda4356
-DIST texlive-module-booktabs-fr.doc-2015.tar.xz 221368 BLAKE2B 8c50b76e05c5f693edc997fc0a64575943dfb50ba9aedd3914097edc16c44463ef94b538c24735855f6752bb466c6b16922cec119c9c4351bdd67bd0d3299663 SHA512 49e4dd3f08d5d6b0a67f8d508f0f2a34d2e852de360a566d1beeb16b7729d46a15083d447e1200a19fc793c4d991b22050b42d93afab8f2903c037b8caf2e3b6
-DIST texlive-module-booktabs-fr.doc-2016.tar.xz 221368 BLAKE2B d88937183ec0307fcc6e86b2a951d4c32ba40541f50604d7d1e374155cf88838e88e2da9d02bda52af0d4deb87cb24be581d923b2a65e32f0f252b71044beba6 SHA512 fa8c1c725fa6496f17dc1d61407fa1b2224bc31e5c7068cce5ff3eaa2e6ee697d2775b05e8c2f050928e9c7194ce081408c0d833cc99b260f17448d99e4e1018
 DIST texlive-module-booktabs-fr.doc-2017.tar.xz 221352 BLAKE2B 0016e1ae08f6415edd72917b3cb1e2e47a7547915bd9bf3f2b9feed3e527f8e981cf80797800b83e2e61f5718aeb67bea1e626fb9765c233903c2166dd9ca9a0 SHA512 1e2607f9004de6e0ab765dd07312a98a6d72dae93ee5c3463bc5119e36ac8b564c3a23258eef82bcc9cc014224720f4cb1c0863b4cf275e7fe9095caac2915f0
-DIST texlive-module-collection-langfrench-2015.tar.xz 488 BLAKE2B 39f47ba498cb002189c1b643252a579db90417ea950074cbf1a01fef168789a99d7e94691a8e13dbd10f41546d688c64716e94242f084613d06ca95fc6fdcadd SHA512 5f8312990769c2639d5c455a325bfba0dce8cc893115387a25e4aea29fb2ccbd12c89102d23fa2429b2141b32b74158712d719ccbb4ae6a52b6b5f72e0b95438
-DIST texlive-module-collection-langfrench-2016.tar.xz 520 BLAKE2B dfc53998098b96934766b09264b52547eac77ca3325e1c0fcdc92bebe5f8672f6188e1dcdc5169f98f3a264b76924d1469c89b10574e1104f071ba5f7715d53b SHA512 f410588aeaf53b27e73086ce02a1ccebe4df831139eafac22a2a05a4c19455ee795693ec28d16769fcd02718074edb48b7de357bedd96970bf4496d572a54e2f
 DIST texlive-module-collection-langfrench-2017.tar.xz 520 BLAKE2B 8f5eb95d2ca56f26bddbf5c36b39a4149656d9bbcb637d1ecff1436c1332e96684f596cb9af2db2e66f29042abfd982f683452d8bd75bdba04c97e60ce948f52 SHA512 d38335a76ac71f3072498aedb0c0dd99236550ed1050a348c07a5a44e2956f1ef480ea7879480e1ab8bb04fc30a67b40c1c17571d8ec77c17893390878955740
-DIST texlive-module-droit-fr-2015.tar.xz 8412 BLAKE2B 6909e1d1798d56a8cbe3d021c5bc10de5616e6a57c3857d8fada28510500900ec898f8724fe506c7fd606b2ab8ead3884a82523e791598f4e011fb6c446b1ffc SHA512 0e916dc49ab999b27c96beafc473bcd8e3d82336e28f5f5f0b32263bf822cdd9be75caddc8848d2a515d131bdf2c9978a470b73b3da25e76ff614b76fefa056e
-DIST texlive-module-droit-fr-2016.tar.xz 9772 BLAKE2B be0deba662a05f44e34e3d77d8413e505276d7332ac094895171606e83d204d095a6917c13b4c94a7536db4db2834fdc5e9d0aef435a900e66e2ebb35f2f7143 SHA512 edaa319fb6efed449017036f5ae6dd526b167175dd76c43b336689ec896c6624b637eac3736cfa7409018fb058cc4c73426453ec8324d703d0069d4921244333
 DIST texlive-module-droit-fr-2017.tar.xz 9768 BLAKE2B 488fc55e017a126934029be0cb2d6b516507f1e6719c9776307d09251985e290c5320720497073729afc44949d7d4613bb8b395c8bc2519ac75bcaad231a59be SHA512 41d911636a5c4bfa167daa52bb2278714dc0aadca3a229adf0f8767903c3a406d9d126eccb405b22e397686eae0cb6f9d15513d13e3dca9aa0ab316cd4e95974
-DIST texlive-module-droit-fr.doc-2015.tar.xz 271536 BLAKE2B 5646b006ca451563336c5ed050f2237ccd22720ff6b5b76f97b6469eec4faeed15e5b42378219de85cd297840ea6b596321c6a8be6baf7ff7280e998061e41fe SHA512 fcdfce4151ef7ba70f8d727e13165726aa4f653fa954c876fa2e259107dbbc78eb8e939544cefa037d54c27fd92d43b977db7c970c755781d91c5aad1f652cc3
-DIST texlive-module-droit-fr.doc-2016.tar.xz 279420 BLAKE2B d00ea7cb9cd3f28f7583b038ed7ef7a6a08fc2e3e9e132fededb6570a856f88e678b17326cb497c652e12589b703172a4204631b70c149fb9cbff8dbf55300f2 SHA512 115954f404fc009dc2b1bdc1220d5951a7c9cc28d3627937c0344e0f8f8ac4eeca92e6cd9ba346415b8411ba955fb3ad23c1d43e38231448d1787ed899b4a6ac
 DIST texlive-module-droit-fr.doc-2017.tar.xz 279364 BLAKE2B 160aa5e352a4ef9074497a8950cc25e2f62339154f36e7d799130e223d533d5c13d51d6fcfaa0c7846e9fe20d44dec9e679932156ee6445f5a30b02d35c74593 SHA512 0b6e08d5603ff1164b5b6b86d3925ca5ace2b8c2a4356808cfd42005df30a9f1a3e0973532cf4bc4266883679a660d7d1d5d4bb46693461523547a45d297b4ac
-DIST texlive-module-e-french-2016.tar.xz 48684 BLAKE2B adbb8d6f8e1cab328211e7b539ee93b4c6108404e63670104cc616589434e6c30558535760603563da59ea27114b782af78fa54a64ad6aa1473ce09cb69660aa SHA512 65793178449054dae1aca9ea736930e95ec54f8d8011afef618fd11281df606eaa069bb6efd0442780e01eea42c877fcf8e8de0abbc58c9caa8c657e6cf6e871
 DIST texlive-module-e-french-2017.tar.xz 48684 BLAKE2B adbb8d6f8e1cab328211e7b539ee93b4c6108404e63670104cc616589434e6c30558535760603563da59ea27114b782af78fa54a64ad6aa1473ce09cb69660aa SHA512 65793178449054dae1aca9ea736930e95ec54f8d8011afef618fd11281df606eaa069bb6efd0442780e01eea42c877fcf8e8de0abbc58c9caa8c657e6cf6e871
-DIST texlive-module-e-french.doc-2016.tar.xz 1772744 BLAKE2B 4cf71a55e61b685ad5d94f4dce8f506328b0fc7584bcd328997af24395773cebc6f753547f0888e9526c9450fd645cc01498366fa7903dfd25f690dfc5d22064 SHA512 4640c40bbcbc58f8ac5d91952f129055c3abbd3239d7c3768d921ed754831d1b5791f1bf004dd4bcb760c04885af5de425cbad38a37d292ffb2c467aa8462382
 DIST texlive-module-e-french.doc-2017.tar.xz 1772720 BLAKE2B 6f1f0d7cb2b7ca1e4b3e6134cc04a4b1943bfecfe52e40219488adfe1b0e85a0abf564b9829838d1bc05890815b630cebe90952ce37024187b7269c7be4754bd SHA512 b779877506a8b0baa8c8a5f7ded34a045e7b3fa3d5e8d5761f1d14dd9956e2e8a1575fd867b084b966cd307f8f755ab327d8fa14891b73636f29f78020a8b424
-DIST texlive-module-epslatex-fr-2015.tar.xz 416 BLAKE2B 50b2e67855e3cf128b3fbb935ddbe0df2b0aac7568878a98a9f6521e7310c38ad24e1b6ebbe68f6e5357990dde2a08bf657c400afb7a4dd5919e27e1f0b327c1 SHA512 469f8f7dfbc8ae4ea3d90b53d5c37c4fe6e6ddb56baa29987bd8da07d21d64fb972fbbd4d0d46eecc8e0b6c27da6db92e75e28520dd4909e28b5bc187e43db46
-DIST texlive-module-epslatex-fr-2016.tar.xz 432 BLAKE2B 939f3b5b0000b8e1deb836bbd8ec95cc2536cf4da136e0a99aea33e5657571ca7338c9dcbbf429f2de96ba4c107641f7b5a7939f5e17d3971df310f42fba04d5 SHA512 be20baa61894fb1939d81428a5e0b415d45955c1be54652839c746e75628da4b2a786b21ddd0b3fc767c19eecf5cfd7275237364fc6d633463e0a809d5e435bd
 DIST texlive-module-epslatex-fr-2017.tar.xz 432 BLAKE2B 939f3b5b0000b8e1deb836bbd8ec95cc2536cf4da136e0a99aea33e5657571ca7338c9dcbbf429f2de96ba4c107641f7b5a7939f5e17d3971df310f42fba04d5 SHA512 be20baa61894fb1939d81428a5e0b415d45955c1be54652839c746e75628da4b2a786b21ddd0b3fc767c19eecf5cfd7275237364fc6d633463e0a809d5e435bd
-DIST texlive-module-epslatex-fr.doc-2015.tar.xz 1036364 BLAKE2B 6ea3c34d1af3425054439e83884c851697efc0847252b17d25752a6b5026bc9ce0b40990b843e151059f7f1e38fbf0621c8ab0f62801ac506a08674725c590ea SHA512 59543581c6a0e27775277fad8e0fe2083c991e8ce30350861ad802f0aeaf3868354e79a2f492aca23a4e209884a94f4d0b6d243e4e1c4ff8073112ce4e37a4d1
-DIST texlive-module-epslatex-fr.doc-2016.tar.xz 1036360 BLAKE2B c5f0bb4a0ccdfafed7bc950c4b38da5440a642b42f8c934e162b1300202ec7cc9bba9ae5ad919f23614c6359224f31e4f291208de7915093bbac3de7d71fce22 SHA512 78bf0c669e1edad0cd487444d223a468f2ecfb61133adbb915b386a09b27c07eea132d6c30660c538e257373d2fa85fe2c39a919a06fc1eafdc33291a49be6cd
 DIST texlive-module-epslatex-fr.doc-2017.tar.xz 1037096 BLAKE2B 64e1e35c8110c9db63aa0ea0ed98bb1d26b81217fa2dc74301c7029eb16115c9a3cdb6669a5baab44667beb5eca76cf50df161c90e007baed53c547a21244e36 SHA512 491535860a19bcac621af7320a9b3fb9528ae742c1464acf21906b54bd5b725d640aae39b694a7d9b071a3eba572c55061a1893493e0bfb156f2aa0356866299
-DIST texlive-module-facture-2015.tar.xz 3156 BLAKE2B 88696c26866c6e5db49b04b45027af5a7624f951189c204a995d1025f03027bd7788f797476d0579817dc3da02e085e323e7513225a935d4d989e474aacd1a6b SHA512 f1320c1cb2dea39435461076100ced97b37d7dc61ace0aef1ee41f2262ea1c26826c6a2b23712a7822c7676b5a4e1e8013a5d681f3395c9e96a8be6d23d3abde
-DIST texlive-module-facture-2016.tar.xz 3176 BLAKE2B 960feb92e8d9893a3da661847b2c21cafa00b14edd7b224c913f35e3d9296e16443ca32a073f3fab25d2c9be2979b20db83ec9e3913477cbc4c30ccf3ff0d495 SHA512 b003379601c421a278a3f2da63ef1b2a0f4654e096b5c525756971fa1818b12efb491af510fda8e3a26e94122c29a924071a925f70fd31edf2f7dbe1b2c01acb
 DIST texlive-module-facture-2017.tar.xz 3176 BLAKE2B 960feb92e8d9893a3da661847b2c21cafa00b14edd7b224c913f35e3d9296e16443ca32a073f3fab25d2c9be2979b20db83ec9e3913477cbc4c30ccf3ff0d495 SHA512 b003379601c421a278a3f2da63ef1b2a0f4654e096b5c525756971fa1818b12efb491af510fda8e3a26e94122c29a924071a925f70fd31edf2f7dbe1b2c01acb
-DIST texlive-module-facture.doc-2015.tar.xz 155072 BLAKE2B 8022e929df8b0dd11a16caed4d157cb5701989b9d0d3baa4a238d16342a9d984e05cd082421ec7de598e03dd6b83582f39a6185f5b629b165f8741fae68f7dbb SHA512 d95660062dccbf9e32026ff192ea616789ae03d07bbfdfd7d9cf795268a31040d50c2445582bea400a4c1ec87b629e847370813a6b7606ddc00faeed4c53ae93
-DIST texlive-module-facture.doc-2016.tar.xz 155072 BLAKE2B 3b0ada42ee5770c88336fd6bf1e329ac23311ade0ad175c4eca951db9781f92fa8f1600df3c343086bbcb1416329357abf1cc86e8be95137197f331852a8416c SHA512 94ba0b4e85ef5b9fad054cb89245fb88a68c20469546026977838c6902335ba93ec66f05b8959fc736d2198c84b364506239f34df3d0fefec37b94d7736e9434
 DIST texlive-module-facture.doc-2017.tar.xz 156260 BLAKE2B cdb95fe9916fb27358a490388a05d184a449b4654b30436fc74340196b2af1623b4891f50be8048a96058bec8c180b7cc904f49c3723993948a6ee6cc80b1e37 SHA512 df4a4bd55c9706adeba8696ff825cdbd38cd5c2cc8bde21969d6296b4f602e9559be252967f0953af139695e15e47d2308f3abe22320c90475f53b0958071928
-DIST texlive-module-facture.source-2015.tar.xz 7132 BLAKE2B 91b35fd0c65461938bf11330d4a513c34f624ed34d5c11a0f94bae575d62a1b1be142d123e9358c52cc86a346eaccff13b399ea42fa8f7715c81ab30825f5f74 SHA512 1841ed6108b799a49394e924930a47864f7d70cf760a53a39c7e6415b42bbad73ec6469e89955015524cc79e7123c9acb62e16277140a9664662559304171dc4
-DIST texlive-module-facture.source-2016.tar.xz 7132 BLAKE2B 348ca2a0054b7bbd7fe4e8ac14e19133dc937299ee3a53eefeae159ef9df925c96949f31a7aa23502a821d3c10c787470d4ba37c07045efb15fa25356e50008b SHA512 299ed949465547ff7a8474aae7151ab5f798b3b6934f1ca04498f8a11820592c0266ba93fa298c7ea3d34fdc0fcf1c8e1756347c0a046795d6454289665258c4
 DIST texlive-module-facture.source-2017.tar.xz 7352 BLAKE2B 288194858dd70d680045cb36bd842d5c8dbb0b75b6cfbc49a5d574c1523610ccdd7e0e812e2bdac49034434061e7bb00c6b2c0d2cf6fe094782998ba3422e77f SHA512 27da89521c978f70323c3520989e75e8a6b7ccb290b41a4b6acca8c6ee583430f95264d540f0cdf0349b6e1c706e1406f7e22cf65dc169c6780e01e60f580210
-DIST texlive-module-formation-latex-ul-2016.tar.xz 504 BLAKE2B 6ad6c7385cc0c736ec14afb89ef2c363b1ec874b4af51976fda5c6016f68ef48abffeb62382c12c38d3392e68d024df9ee958ff1e59b9000420308f7fd2985bc SHA512 1daef5e52e70152a3341c28e87228143bc9677076fc40301c0ef92b326290bb2ef82178d7f597b9307350aff8eda13b05e8f53012f0383c5650c0ae69459c7c7
 DIST texlive-module-formation-latex-ul-2017.tar.xz 504 BLAKE2B ffd65d3d3e3d089f1e80f085f823274bac540f2810ef22e200eafb7986549ac61f85be2fcd12513633e0307e08ffbf97e431772a32b56bafc668140e87208a01 SHA512 78ce53799ec96c589563f02fe9ec5680608cc791a29417c71038b27f88d3f58e5ea9ad7872982f19aec4c07103be1ad91d1bf8cc69b179eed8f39efc357df5c8
-DIST texlive-module-formation-latex-ul.doc-2016.tar.xz 2723196 BLAKE2B 97081d3c2a1446be9811a3d931f6cc6f4d2d13f6af0532431c23dfa15cef445c4858012bfb87d9886717de3b43f3567cb14076512e35481d1f70dd66a16b07ac SHA512 73dd20e5702e4ad97e4a7f391a89040355853939a154fe793236df3a6568d09b5e3e52f15395005437ebce1534dc5f7eed5c5ccfb5ed45a714c6f7abb4d0d0a4
 DIST texlive-module-formation-latex-ul.doc-2017.tar.xz 2724136 BLAKE2B a095d4feb33e5bf7e3d1c81e58d08c80419c93dbe948138c222585f02bb0023053852263e3451fa0d53a2944577ce1709cea81e02cd6356f8284076d03c17cad SHA512 19a4e4763a5515b2680515cccbef4a61a9d08731cdec6fcbe92c665d97382c441fe3f16f0b68086229372f1d3a5144da6b19e1ad9a3a63684bb9655b0b8d7bff
-DIST texlive-module-formation-latex-ul.source-2016.tar.xz 1934032 BLAKE2B 006234f4211c516935a4f31738fabe93ab361c90ddd1ec65be6929df39e20184c3ede26f43df0eec4dec4befc21561c8194c824b1e21b23471af720029b5356a SHA512 bbdc1a41b7ff8757158a7e4c00d6e6ff48e4a32b775c15a37c3cb41d88594628ba63b36e2cce2cafbbebbec0dd0f73b17a694f8349b2e299dad31e2208ec4cec
 DIST texlive-module-formation-latex-ul.source-2017.tar.xz 1934096 BLAKE2B eb6ebcd612404aeb3fe152040d792b1d658c581dc6f93d0d97b02307af1a101428b251f6017d8a10b01a55e72de6e27be8f763b3709865d5ee8a781e28b42db8 SHA512 72be1d39e9c3df4600feed3e56b6e17a2010a6fa218bd8bb33e2f346f04f33bbcb574c73c9502cffec44de19a6fc0f0503d112af6424473a1d89c14d1f4527b7
-DIST texlive-module-frenchle-2015.tar.xz 20992 BLAKE2B 3f8bafe7283507e662289317d7fa47f19e172882afcb6539288505f8515e6fd0da4caef131aab272cefe4e348867694c8c7eee799c435cdcce212f678b535ba2 SHA512 cb4b9406c1b07abd716bb7b3874579dcb77938be242f9ec4a25da1a4d5c2c3ecbedbd45ce89d5172445525d02119c2b92e3066f97c7533c517a70eb1d1293b0b
-DIST texlive-module-frenchle.doc-2015.tar.xz 518720 BLAKE2B e97fbd0f0e69d075f8df0d3e66ca3c2e83c41fd8da0a2ee52c446830a1994b97eef534447198256fef563fbac7eafc876e16cfe42973a6d17ba1416cb79eace8 SHA512 27db64e8423c1630b6e5c7695a9b80cb29e006e763ad133ae5df501929f39d75efddb1035417a4d619f1ef075759228b123d99cdc9959870edcb6bb3b7f55d4c
-DIST texlive-module-frletter-2015.tar.xz 1788 BLAKE2B 2eecc6b5fb6eeeb30e86396a0f7bd9a95d77b6cbf96e3a3b1134116e2b1b280fc8881340c046b626c8b59446b20133d51ae948361bcbe8e1b8fb419140042055 SHA512 b9e7d95b02574eb98188e5f73c27a1126f9d9185b33bb976cc54816f57e416caa002a98db4fd8cf1f9fe956388ae70f4ceee998a8efb61e94ff7f7ab5a5da931
-DIST texlive-module-frletter-2016.tar.xz 1796 BLAKE2B e71ba092dd6ef0d6fdce0752f026586551fc2eac9fe985da9e70c6f7a4d4762d845a5133436cfc85240d30d55db4097f529427cca7dd2cc1a6b5baf5eed41025 SHA512 88d64da80a8da39d7614edabd369e05651b4f31366a29857813874d824ebf8524ad38c0b8b7ac76513fde9260de6ba000035035ad5f78d75c3686e884c1989f3
 DIST texlive-module-frletter-2017.tar.xz 1796 BLAKE2B e71ba092dd6ef0d6fdce0752f026586551fc2eac9fe985da9e70c6f7a4d4762d845a5133436cfc85240d30d55db4097f529427cca7dd2cc1a6b5baf5eed41025 SHA512 88d64da80a8da39d7614edabd369e05651b4f31366a29857813874d824ebf8524ad38c0b8b7ac76513fde9260de6ba000035035ad5f78d75c3686e884c1989f3
-DIST texlive-module-frletter.doc-2015.tar.xz 600 BLAKE2B f38910ef5ff76b6eec34a262b1c44217fcb0e00e51acf53f67048058c8cc2ace0c50a8a6b3cad87a970e272e18b906ebd1ab1da09c9df12fe293a2e532ce4e1f SHA512 d44094c295b12af113c8109465b95f3dba716d7f59e29c27ea7a5696202cc8aaadb0e527a4e3479afcf0b7d9659196c6ffcb7a7454ceb7afeaa39fa9ca1f247b
-DIST texlive-module-frletter.doc-2016.tar.xz 600 BLAKE2B 5477e23eafbb6e688f1f34aa1bc8f647abd586b61a936d451e54beb8af9889467057a11501be1018d78bd8059a22fa79d530fd6ae1ec4d7626112b77ff2eb4fa SHA512 c832eb7900b9ec17d0335d523cdbf07e9c337d4c77306991924b9b33d746de23433e5ca0bd587faa3368c8396ff9a2329bc6927bc97ddfb291fdbd0d5210d855
 DIST texlive-module-frletter.doc-2017.tar.xz 600 BLAKE2B 5477e23eafbb6e688f1f34aa1bc8f647abd586b61a936d451e54beb8af9889467057a11501be1018d78bd8059a22fa79d530fd6ae1ec4d7626112b77ff2eb4fa SHA512 c832eb7900b9ec17d0335d523cdbf07e9c337d4c77306991924b9b33d746de23433e5ca0bd587faa3368c8396ff9a2329bc6927bc97ddfb291fdbd0d5210d855
-DIST texlive-module-hyphen-basque-2015.tar.xz 468 BLAKE2B 6e49402d3b88b26ea815558e3d446f0be962be3eca4eb8fe6669bc0a5b34441d00577db4e6cae7064786735292d2b8bbedb2f00ee94030b603abe141806df9e6 SHA512 222038208d6028fc947a1ca68f58874f2330aefc7b7be6e08c6a38e6c2989d2f8b2678a0f75ac9e4b3de9aa55f611615b01dde3b9cd82955179467a761b2b97d
-DIST texlive-module-hyphen-basque-2016.tar.xz 3252 BLAKE2B 5fe700ac60b858e76c1e366403c0033d68232b902bf9b23f3e3977cfa2d90847373898b173615c9f3ed79080da754ea8c04edb1db6be1680a532f509cb7e9da2 SHA512 460874c4c4239ded0331c8e77448c6dc5fb0cb6120b6c0e659dffa08ee2954da5a33f5d64ff072fc7a06fbc06cd6fa0a8157a0a08e6b703e3b9f1856dd515546
 DIST texlive-module-hyphen-basque-2017.tar.xz 3236 BLAKE2B 08f5d8e52ad49ba601d97986fb6b8eb37e523c4c95d94e7b8d2b6f7c0b73b965a23a4a7395b2e3446927425786902b6b97cc776bf900b50b5f8b1476da5c18e1 SHA512 27a224ff5196826f0035658b2524d25dc53271810eabbb24ee94a8a0efd9fd07fc3b2017ae2c24ad0f5cf93a203e33d7dcc0eac75c520f308d098974427f03d4
-DIST texlive-module-hyphen-basque.source-2016.tar.xz 2540 BLAKE2B 300f1c67c985e2040d44287fdbb4efe9f526ecc7bf5775e97cc69aaf116982f64a6c48f67b338d4e0ea215e15d3d3b6fd4e36b8f2e212f65e1c46247dba0b559 SHA512 76b51a6b2de0a4f26cc2249cfa0db44cf21d7defffbfbfac20477fa2dda518dff12ab825573721d62e5c682a15f7df39175a5cef2197b8c51c362770748461f7
 DIST texlive-module-hyphen-basque.source-2017.tar.xz 2540 BLAKE2B 300f1c67c985e2040d44287fdbb4efe9f526ecc7bf5775e97cc69aaf116982f64a6c48f67b338d4e0ea215e15d3d3b6fd4e36b8f2e212f65e1c46247dba0b559 SHA512 76b51a6b2de0a4f26cc2249cfa0db44cf21d7defffbfbfac20477fa2dda518dff12ab825573721d62e5c682a15f7df39175a5cef2197b8c51c362770748461f7
-DIST texlive-module-hyphen-french-2015.tar.xz 424 BLAKE2B 11848475127c0080dffc967ee1a13ead6ea35058e5a353814f19ccbf196fa254aaa055ce61453ff56eecd09130758b79406dfb7edeb7985c44ebf1349794fcfb SHA512 56dfee2addb8e365088ef5fc7f880a8b66adf23ec757bb7e51bc7b208732a8af1f269f7f0192356c3b22646626addacd729dd7562532b5d9a7ea2411d86b7204
-DIST texlive-module-hyphen-french-2016.tar.xz 11424 BLAKE2B a21cf532019b1ac70695c46d9e79949a8b135e6344d78a820759066d898c489caf6499e5d4ddb920cd7856d8f17863798df6f2d50602351ec579067a9472bcf5 SHA512 41390f0a751d10d1c8421248e32b41d279d54a7519ad1b69a5047df6d6ff89e7e283214b41493a4df1e0cbfdf9e3f4c77151b98d8212f35a9c8ab7782db16e89
 DIST texlive-module-hyphen-french-2017.tar.xz 11424 BLAKE2B a21cf532019b1ac70695c46d9e79949a8b135e6344d78a820759066d898c489caf6499e5d4ddb920cd7856d8f17863798df6f2d50602351ec579067a9472bcf5 SHA512 41390f0a751d10d1c8421248e32b41d279d54a7519ad1b69a5047df6d6ff89e7e283214b41493a4df1e0cbfdf9e3f4c77151b98d8212f35a9c8ab7782db16e89
-DIST texlive-module-impatient-fr-2015.tar.xz 432 BLAKE2B 93965f1f71dfdec65407b9a3e6d47934394339cfef2610ebb82489b1e065e2d22e8817a1dcf6a2e620827c43c4c4f3e08e3b4872c727591ae6982b66d8ab3c89 SHA512 0fc2a56e18e2c725fc18d80fa1723ebc221f87a8ab195eaac88fac4e4e626801bc9b1ff86367932938d740d237015823b270e1980aa95d26724d0a3e1d5e887b
-DIST texlive-module-impatient-fr-2016.tar.xz 452 BLAKE2B 99289373ff9cc1ac77672a21264da47cb3b5461b993ac32dde25fecd67a26ec01bc50f4a02fb1d7115fa8b1b04975bdaf312a5f8e1c7bce6d554fcb60fd2f516 SHA512 a76dd66b5308277c2a6f8ae233e0124428ae184186ce47c9f8e2da13c8c3f47a6c8866f4d76f93e7051b8e024d67d007fba3ed3e66c3f834f88d039d80b26e95
 DIST texlive-module-impatient-fr-2017.tar.xz 452 BLAKE2B 99289373ff9cc1ac77672a21264da47cb3b5461b993ac32dde25fecd67a26ec01bc50f4a02fb1d7115fa8b1b04975bdaf312a5f8e1c7bce6d554fcb60fd2f516 SHA512 a76dd66b5308277c2a6f8ae233e0124428ae184186ce47c9f8e2da13c8c3f47a6c8866f4d76f93e7051b8e024d67d007fba3ed3e66c3f834f88d039d80b26e95
-DIST texlive-module-impatient-fr.doc-2015.tar.xz 1576664 BLAKE2B a6d6226357cdf698bf229e65f520acb06afa188d2d7ada595ce055ea36fc2375f6b41d91f6c45a7703b65386cfbef81f7f1db93ad829e7b33cb143900b708814 SHA512 c77ec3afc8fb9391f3caaad4a9309a6beb550285533d2da45993757e7edc87990a490d1f78a313634cd95b1ba519a4dd4c409ed35bbb362c8f5637cdaac1a8f0
-DIST texlive-module-impatient-fr.doc-2016.tar.xz 1576664 BLAKE2B acfbeac0eeaff4fc05df623e6cc74aad525cfc96b625d94a5d520ad5ec3d4254c6ab851b2c99cc34b2dc14de786a4a552e4788b8f75b6c517d543b5f7256fcbe SHA512 b7dd28ca7217accbf731e7a7a7d5895a74488eb48e56e6ed96fbe07c54afdfe09ed255adf17e6cde72343f86ae1e4b52181a589d28047c02cd4613788411b1d4
 DIST texlive-module-impatient-fr.doc-2017.tar.xz 1576664 BLAKE2B acfbeac0eeaff4fc05df623e6cc74aad525cfc96b625d94a5d520ad5ec3d4254c6ab851b2c99cc34b2dc14de786a4a552e4788b8f75b6c517d543b5f7256fcbe SHA512 b7dd28ca7217accbf731e7a7a7d5895a74488eb48e56e6ed96fbe07c54afdfe09ed255adf17e6cde72343f86ae1e4b52181a589d28047c02cd4613788411b1d4
-DIST texlive-module-impnattypo-2015.tar.xz 3420 BLAKE2B 783d0f682e217463d792ebf2c32e46f1aa6e592c60a2c365469a6b98c7da288e57eb67e8aeadf29f850731e7899918c8de45f01d8ce0ceb5f0bccea4f28597f6 SHA512 536d16228ce0a45b597422b52a779931abf71041b35ec35299adb0144c2c3a13ceb29ec8bac1a97a9cb149242aba78f3a8aabeb690a0b6cb86972ee8ad1b7f7c
-DIST texlive-module-impnattypo-2016.tar.xz 3440 BLAKE2B 07219e95ffa7483ce5c8de5195cd0de069195ffccb049483c21728e96bda2f4fbc87911de25b92c24f70c701daae6e8eedecb4b355eb928466682943bf62a67c SHA512 0c755b6d593d8371ac97584b49c9e8f82e60f529da7a28159c709b3fd368a2d47b516ba6f2819593ef1f63aa1631ee0a3148082beeec20a4490ae6c8238059bf
 DIST texlive-module-impnattypo-2017.tar.xz 3436 BLAKE2B 8a653a82ea8d3153d84e0a89b28ad473ff151080fcdaae4f3469a8a90f57edd4f1559e4add411bd1e2b6b4c3b3a482069512828d096711f9bc910bf52938b2d6 SHA512 db493c715e9d149742453f7257a72ddc40ab4d79376490fec91e9fccceb49e9d2fa83781b3d0fd0bd5119aae16abb9ddc206eae53ed5bfaa1053d97d756105ad
-DIST texlive-module-impnattypo.doc-2015.tar.xz 145020 BLAKE2B f1776288884a4347c10f5bb12f42489188ad982d78e21db61ff2ba5d6abf129cf01df3072016f4c7088cdee623d356b7a3c43df421b56d3ce893ee741c16f002 SHA512 f9745042ca89a2991795f651ba56e1fc31f3d689a6cb9c22e54c686c190edc2f0ba3f113fd41a93dd79f2c2ba43811ecbd7e3ecd0b1d72309646142fdacaf7cb
-DIST texlive-module-impnattypo.doc-2016.tar.xz 145020 BLAKE2B d3a6d74eaa765b5b16b3a501fb9db336252d02bc65f77fd4255d9d6d6d2c510e12dd0e7278898ccbd793f77459159f89f24486daf4bc4ad147ad0de387d0cf75 SHA512 5ea1374bbee42bc1dd45ebd9d3a169ee2e3a2642eadef47e835a9c0007150962cafc506d5199b5eb68d850b606ed1f5789d1e3c2bd2e67f8adfdf838bb493ce3
 DIST texlive-module-impnattypo.doc-2017.tar.xz 145028 BLAKE2B c8be03186b956f682eadedb534493059304157a0c92122ad5a27840eb0aa01948a37a60bfe79798272a6dd48137e21c29c34b88c8f5731b56827953fd744733f SHA512 4b59db56bd57a302f97a108afd399747a98bafd7e74eb1f543b7748dc4148d819371b3e5eafb0afc9e0f596c4d1dfd68579b69281e44fd6ddcbcbde16c0275ff
-DIST texlive-module-impnattypo.source-2015.tar.xz 9248 BLAKE2B 53a19e73aa0900f9d95ba41a9d011b787af873a7c10f4d3e7e5ad4033333ca0624db917ae970207d0f8eb7051271fef4a56bfffe9eb8f523d716c5c9ea0f8b9f SHA512 5b6f5d0480d2d52db04d546f23cf044e2a75716ba7486cf789eafa7ee3935b7679d82b3cd6ffff81e3eb062d8eaa9de4dc6160b29199d7f5d8a2a7d58bfe6cf2
-DIST texlive-module-impnattypo.source-2016.tar.xz 9248 BLAKE2B d95644ec2c293e75ae3a1107b8d019a8718088d5f65695f6eab17748d23fc74c73193fdc61fa8034e38d5b7fc2b83077540631f6c1023dd6a8d10aa70ae887c3 SHA512 e7f08729c3c5671e2e6cb9506c30aad3c9cf419e9c26984f02e695cd098dddce0ae23b42dfc365bf90fb2e56c030fd0505da8d54e464167b12e22e44a012c160
 DIST texlive-module-impnattypo.source-2017.tar.xz 9248 BLAKE2B d95644ec2c293e75ae3a1107b8d019a8718088d5f65695f6eab17748d23fc74c73193fdc61fa8034e38d5b7fc2b83077540631f6c1023dd6a8d10aa70ae887c3 SHA512 e7f08729c3c5671e2e6cb9506c30aad3c9cf419e9c26984f02e695cd098dddce0ae23b42dfc365bf90fb2e56c030fd0505da8d54e464167b12e22e44a012c160
-DIST texlive-module-l2tabu-french-2015.tar.xz 344 BLAKE2B 88b32bb46fe1843aa884496b25c4481593261ad302569e8031bd78d89ca5dc4aeb335c4a348b3ad376e453cba5cd5e08784823737c4933c5cb4af96265c29f89 SHA512 c5d5013b6549e81bb487a7f0eb5ba3e29d5443cb6d037c938b586a72d8ceab4f19e058d866d79ae5dbf864038b98aeffe87478f684fb7f2099035983cc3f75c3
-DIST texlive-module-l2tabu-french-2016.tar.xz 380 BLAKE2B 89ea1bc502f301c36801fc36edafc2d896f43f20891269ed5e9f6a4d94371d1cc357f53ddafd057eb19bc1b0620ddf11f6a752b7fd05df73d967cb4436b1c0f7 SHA512 0139aff0c7bcfa06c901e145e5e7762f22c303a29ab00404bfb395d03edb3e1efefa1ac7215a19d0a128caf618b681a3de197f99c98560ecc60dee673e7f805e
 DIST texlive-module-l2tabu-french-2017.tar.xz 380 BLAKE2B 89ea1bc502f301c36801fc36edafc2d896f43f20891269ed5e9f6a4d94371d1cc357f53ddafd057eb19bc1b0620ddf11f6a752b7fd05df73d967cb4436b1c0f7 SHA512 0139aff0c7bcfa06c901e145e5e7762f22c303a29ab00404bfb395d03edb3e1efefa1ac7215a19d0a128caf618b681a3de197f99c98560ecc60dee673e7f805e
-DIST texlive-module-l2tabu-french.doc-2015.tar.xz 269348 BLAKE2B 150c207d96050811416217f4fc1b241ac7ba6cd7cfdc94c06c1eeb413d70ffe07c408e7078d799d9272dd8b4c31e7608dcefb9fc41519f20ee6408fb34f9a5f9 SHA512 20cad71e9768f7b54a9faf798f3d11039faa0711387424ef4ea6fe7420a380f7a7cc940132cbf45af493e485ae9e71e58467be3dcce891079f7f6f3ce90d8b03
-DIST texlive-module-l2tabu-french.doc-2016.tar.xz 269352 BLAKE2B 78fe44df01259981ecb68bc22285dc7b72735803815b17fd014f2472e7530d99dfdf978dd1c1e2ab24a211cf0f16234525f1d073bea3f06eecdec423d10b5987 SHA512 42d9207722f0b6b3ae47a7e5ef30e7749d536b4b07cf41234e100685297e8f33827e8e047a1ecf7fc71e2a0d4092a96ac5838b6ec9bac8309a6840b6d18ee69f
 DIST texlive-module-l2tabu-french.doc-2017.tar.xz 269352 BLAKE2B 78fe44df01259981ecb68bc22285dc7b72735803815b17fd014f2472e7530d99dfdf978dd1c1e2ab24a211cf0f16234525f1d073bea3f06eecdec423d10b5987 SHA512 42d9207722f0b6b3ae47a7e5ef30e7749d536b4b07cf41234e100685297e8f33827e8e047a1ecf7fc71e2a0d4092a96ac5838b6ec9bac8309a6840b6d18ee69f
-DIST texlive-module-latex2e-help-texinfo-fr-2016.tar.xz 404 BLAKE2B 2792ad2040d8329f813f8527cf34f3dd5cdc5419936ae1f7ed20e87a167ad9f4c92d4319ad6271d18e0c242e73ec0e3acb1d74104337d412a41f21ead0f78f44 SHA512 5ccd5aa29e767f854b47b90aab313ed855249b4af223989cbcf353aede8edcc011cca5b382904b28cf831e4103807c6924c2bd9c0b24a066ede93d27d66e807e
 DIST texlive-module-latex2e-help-texinfo-fr-2017.tar.xz 404 BLAKE2B cbc1641bd473550200c9b084e6d8f2ddceed84fa548275fb1b3ff791c91a82cd4b340943a6bdc29066fca88012dfea4512834f5e094e4f49cb2dac7fba0a506b SHA512 7959cc1141e4ef6b64ed4c70e17f20f912efbcfa159f47af8090321f8cd2433225fd240d44e597d960bf28dc0257341813c372f4015079ab1f6acf27f269141b
-DIST texlive-module-latex2e-help-texinfo-fr.doc-2016.tar.xz 1083380 BLAKE2B dce2f40206495461b8e63c66a58ed447fb0edae66bfd85eb285c89e66c23c64ac0299fdb18cbed74011cf653943ddef6cf1ffd4b0c34e5827e2543a450cc0a12 SHA512 9f4aa0b50f66249cee1561eeffa1b5a6766f51eb83a59d40c1a9452a23ef8ec9c71e5373e06019ffa10bbe45d69def76de77465a177fe328024872f076c4d5b1
 DIST texlive-module-latex2e-help-texinfo-fr.doc-2017.tar.xz 1083320 BLAKE2B 85d33ccc213249549fc018207ad25ae784109acef48c6beaf46570cab7b4401c384f0cbf1da3d6456f5fabfc89cd35661e0cdded8559cb65aa2714e8f8a01cd8 SHA512 3cd849dee3519e5e3d150d8d1fcae0894f962af108671256a87fc4a8968263b55775e78db7b5c596a28b9ab7360fb3ba3f8cce25f1bb3691c2b90f845f82f044
-DIST texlive-module-lshort-french-2015.tar.xz 384 BLAKE2B 03ae5547ef600c5e6c9efa199558b1cfb8a483f58bd24e4d0e4050065b54d737de3ca25b7beee9d33ed2f01ec15ea20812441020777d1df3b3f6e102e943e62c SHA512 e0dc4ceea8f7c95da6df27f6d9759d83b7d3f3a2852ca742ff34967ef2341786f2b2bf1b046e6c7bacb7eadc06102d367a1eb03a74803349213d0a004152a1f5
-DIST texlive-module-lshort-french-2016.tar.xz 404 BLAKE2B bf81d3fe07862ab2320d7f9fc8a2731aa6e0f9158d5399d2ade71e5927968f909d3c5b60eb48ab31fa3046b536f315fc29b6c8ce5cff4fcb7db5e7f0df9e7c3a SHA512 744a0fca0e693d1e76d0206e342e2ff1c56e65a2657639e88abcd469fb64d9927befa7e97305df3427f0763c56c11d21c64600f1f4ff433d525fb79eadcc2549
 DIST texlive-module-lshort-french-2017.tar.xz 404 BLAKE2B 553198c568146ef22894c450c47be7948f9ebac5f490d3edd2f5a8b856e7258f38bb7f8c3f05aa46caa2cfbc8a85cebbf0a82a6ac27a59198554fea7a8317c4a SHA512 569d06fd4f91fd840efcb85dbb708796a59064e50694ea53450c2e31ad0dc4a099db2d5e8bc331b729c349acbd1260c543afd3bc5823ac5ec74aa9f8390bb4bc
-DIST texlive-module-lshort-french.doc-2015.tar.xz 2147688 BLAKE2B 53817000d2c6add470e2358dc48d9357346c20fb52a9eb72546a40a4efcd65059b36f1a8243bf2853b011f13c3a074a764460c789368d62c042b5be0496311ed SHA512 c4e1ac46247a81ece7263b6d883e92aded2616e5663d9686edba4ebdd77453cfb0b97f399549a3b5afa9542c8428e30652f77f1d2e78db37bd973fdc308b734a
-DIST texlive-module-lshort-french.doc-2016.tar.xz 2147688 BLAKE2B 848ab25c6d856745430064e9bff77b2863683d1da45b2323bba5dd15619e7dd15a19a2557c4a656d490a4996c2b5da7e2bdb505ef858e8d1530144e754b4ca93 SHA512 08a3effb9ed103a381cb5dcc38b0e0ec99f2101ab37a0dfe0e7a5b61adaf4d07f8c11c3ae3e158dbd2d3f8a684da1f621c093c9587645506ddecfbbf0dacd7a7
 DIST texlive-module-lshort-french.doc-2017.tar.xz 2147712 BLAKE2B cbc7e1df9b5b4852dbfeb368674f3b3893cce6698a11af72636bf1c87b3f68824fc1591af2e5288c9f02b244e49c8b9fdf154def1de541f203bed0b9ffddc437 SHA512 ddb43a7318bfaca9c619d3a61761e99407d4051e07aafac373e45ce7dbad81b0fd576995d53a14bd00dbf1a3f41886f03f53cd158149b486697190549af70f12
-DIST texlive-module-mafr-2015.tar.xz 2176 BLAKE2B f8422eb803e24f8152f4bf2aa1b7fada834ad321644c772bb011b77d38fc89cb2024b9861d650bcf6cf6b9813fecc852aaa9efa992f677e1a44a813bd0d4473f SHA512 0cbe4d459ef2d13eec9535638938e784fbdc0e7cb120c63d4a32d5cf43f32d45b0c6ac59e5c72b15d8af6e38908236db140cc677392ac9fe639247b90ec775d5
-DIST texlive-module-mafr-2016.tar.xz 2196 BLAKE2B c7632a9076b4b9db7f7a93682935c442ae787964250e2803901c0bfcab2f44cac46bc2fe97393fe68ef1fc83c1823a6fb831a700779b0829893c1590ef907867 SHA512 777fcc55d877311a61638e573febd3d3140627c0db0d82f2d67f2e7fb5ac2324f959a1c4797c2f5cc06d1d21deb48c29332985151ba7cbeadb595657a9d8afed
 DIST texlive-module-mafr-2017.tar.xz 2196 BLAKE2B c7632a9076b4b9db7f7a93682935c442ae787964250e2803901c0bfcab2f44cac46bc2fe97393fe68ef1fc83c1823a6fb831a700779b0829893c1590ef907867 SHA512 777fcc55d877311a61638e573febd3d3140627c0db0d82f2d67f2e7fb5ac2324f959a1c4797c2f5cc06d1d21deb48c29332985151ba7cbeadb595657a9d8afed
-DIST texlive-module-mafr.doc-2015.tar.xz 60028 BLAKE2B 3d334a25cf6aa5cfbdf1a91081cab21061c815ce150a83d0a8b87cffbb95e2fc739959add385c0760fe0b74a1ca36823822afb18fb0af78d4a5c37fda30cfb9e SHA512 e8127ceaa26012bd88c8dcaead802c95559cdeaba44a0a7ee3c4b1024bfbea0dc4c4b52f64b7837fd2a1d43c32f77f95034bed82f1ae3a63442393b5c6e5eeb5
-DIST texlive-module-mafr.doc-2016.tar.xz 60024 BLAKE2B ed06d6865631350794f355122325263ec14848691dc691cc203d74a4d8523026c0b77e2661a6744ad7849ec73216011174035f307f0bbd9ad3076c2b47e0c221 SHA512 9effad3202466d1b6356ba7ce773d64751bff01dee5525954234343db87f217442b0b7095ac3113a3bd6b7e976c7400fd847fd9dd11387f225223a46805810d3
 DIST texlive-module-mafr.doc-2017.tar.xz 60028 BLAKE2B 5c39d1b885db299aaaad2151d072793c4fd5f452c88264f80d0fd75039868e8b956d90b00cb32792f95fd066b95b9db15fb1c3c7887cf7edd72fada063cb7d2e SHA512 248667e5a9686ac54c3f8454c38a2037c31419177be024c5cb5de3285e8f5712262b326459879d50d28a94911e965d948326ad73e122e7bbaf5a5b50eefcbd90
-DIST texlive-module-tabvar-2015.tar.xz 8852 BLAKE2B 7fd5c1872e97ff6cbc749f7f5bcb08e04354b65613888f142ed7545d6fd370cb5cc895b6d24ae03c159335e3d1141756733a78274086fb2dfbaa0c060833a7fd SHA512 4381731e7e145e22162c0f0506e2f3cf397e41197eace750a691fe2b4ddf09c8cae6185c43606ba0facf4f36766b94f4a3478841f9f1ddbfa71adb5b32e4cd8f
-DIST texlive-module-tabvar-2016.tar.xz 8888 BLAKE2B c0235d685ed4a4e23ed11907400472141b6a96ed31a7dade2f354e54e9c864005b71aaf9596fa935011cffee38c5094bea5c716c0390560c442b8c225d71f033 SHA512 c0934db8b3f9d454eb4fad4906904a2f23395b4df9b98185d183e806027d97cf8e9f23cfc88b8a73754dbb3f6eeab05fbd9558c365be7855c3672bf15946427c
 DIST texlive-module-tabvar-2017.tar.xz 8880 BLAKE2B 6a50b3f5a46c34c203004983c005092b846e6a5e66c7d9f9386ded065b32e76924ced0304922cd323831ea69e78d4e099e7e0f6553e3c9cc301408b6fac4f84f SHA512 edd88eb91a190ae15cf2691a36fc67ac753be46b5ffc9ca027e0ad9aa140e9c948bd660dcbb5394da9263756ad817dec6482daa3d2fc2076abadd8c1e70ca3b3
-DIST texlive-module-tabvar.doc-2015.tar.xz 590656 BLAKE2B 67902a9c3bfeec8d7482d986b2f5031ef64e6cb9a7ab1d5f98b09c1a910e5f9fb0f238d0819220a7bab00912d111a5832ef3391fda141f54457fa21d213ab978 SHA512 2cec63799362e05825a293d496fca37186446142a35e4d084cf9e01923d0f46ec6af7931e7524ce19cb01ce4e76e81c04e2060391d619a7becc18a56309c71a7
-DIST texlive-module-tabvar.doc-2016.tar.xz 590656 BLAKE2B 81362a549affa9b1be0b9f2a3d5c93da811b6c3a5b6e3e23a84610e44ca3b4a9032f7e45608ce99816f50775631aa936a7541388718238a5442f4c65d811beef SHA512 e87e2808a36873d5b52c17e9231020e7c10375cb8411133be55536fcec3591c52b2c7c51ed393ffa8d9d06528252e20f19d0b29783a9ce36f35fa564a6514165
 DIST texlive-module-tabvar.doc-2017.tar.xz 590644 BLAKE2B da73ab77b6ce731faf17cf1f243d1d6c2a9633c860857b0789fc0486ec1d19c81e3a9c2d9f475e2a4e1523f61ba831c50644e1854944a085669e3521a78e16b1 SHA512 0f08db2a9c063bfae8bec3857d105e2c88775fb4a777fb34a1d7388d85c5d8a121b3df895e44df0d3d1f54ec6371ed3147429f34524d5013b0c2e31818cfd8f4
-DIST texlive-module-tabvar.source-2015.tar.xz 11240 BLAKE2B 7c1360f5d3ca0b4e6bef5048ebed970298cfebe4c2496ee5ee6f7244ed022058bb49ecde00db70ff2bb8ebfc3eb9f1e977afa696eb9ab22d14007faea6b69753 SHA512 0fa74dd33088ac7cbbe2d7ca8b67ef65408b60a5a72d362c8fabd7e06322f5555905220df831c7f7f866decc0708e741c8d006fcd22e3f427769d08b7a5afb39
-DIST texlive-module-tabvar.source-2016.tar.xz 11240 BLAKE2B 9fbce795c3a308bccd441f34cc10ca06d34beebfaea8ec486868c8cb9e547b91c8b7cd6838c5a4ef3a6592c92ff521ee46e630b5eecf86e3fd6ff68a13964319 SHA512 bd3bd376f7c7db7de3aa289621bdcda02f9d87a4934dacd47321f932700b67ce39678613b1ca3988fd5c906c7476327d94762fa668bcb86ad5b9d11015d769c7
 DIST texlive-module-tabvar.source-2017.tar.xz 11228 BLAKE2B 5ad8dde15d8928bc39241c299cb415c0565ae6475fc087e33d0122095935edcf0d575b7eca0d3586bc265acb784ff181a4d570eb720f4786d3ee4dbdc4df1232 SHA512 8d2e425f8acf06302ee73547bb431848e00832c4514312d40fc256228fe35586b141f78e1ffd0b67546d4d0a0bcae99a114e5b2c1a9627c5f0131a753ac99324
-DIST texlive-module-tdsfrmath-2015.tar.xz 5476 BLAKE2B aa673658c0216319aa1638b1056c1fb34c87f8a85e1000a14b927ebe4adf5b4ef2ac6851c43f6364832995174de085c680bbeb88f7e2057a2f9862c84625b4b7 SHA512 1bef26d832dffc9e0dbc8c56389ec2d3e1a88477efad6b1f7035b2e34806e8527ce17223bd3eb38f8a984a5d70f8a838669b05997ebf6f5b1ab82039dca520b6
-DIST texlive-module-tdsfrmath-2016.tar.xz 5484 BLAKE2B d3a040d9d452513ad67d629d633b848178b2475f332dfbab3cdd9a9cb6d6ed2e2253c45210594f140f4871be867fbab76689a45fa1cdd63d67672d9fe391c029 SHA512 a2c2ce5fe8b0f1daa32c4a31691ec20afca76556114acb9c978120b088f4c19e57d36547ef4b32727def9317eea65c833d4fe64113d65d5ae1d9b79d2d24b737
 DIST texlive-module-tdsfrmath-2017.tar.xz 5484 BLAKE2B d3a040d9d452513ad67d629d633b848178b2475f332dfbab3cdd9a9cb6d6ed2e2253c45210594f140f4871be867fbab76689a45fa1cdd63d67672d9fe391c029 SHA512 a2c2ce5fe8b0f1daa32c4a31691ec20afca76556114acb9c978120b088f4c19e57d36547ef4b32727def9317eea65c833d4fe64113d65d5ae1d9b79d2d24b737
-DIST texlive-module-tdsfrmath.doc-2015.tar.xz 717624 BLAKE2B f63a32b90ec4aecfa1bf2b11386f8e99cf445f778b5ba7c30945456bd2ff238ce11b648f32978f17acd00c6c36972e47902803647685d9e2049c727852e75e22 SHA512 7717bd142baa14f5e05a6ca95ce201b0be2ddc6cdad7096b25473d3043653ffd881b4ac93ae2285aa61e26358cff7f89344d3f77d25ea38171277b7255f2494c
-DIST texlive-module-tdsfrmath.doc-2016.tar.xz 717624 BLAKE2B 807a7022219c0c15334274c8ea79ede72049b77a36886ae71d9524f8796b8ba5d036179be95fe37bf6993ee2c406da5db49e709fd532b680ff8725a255ef761f SHA512 0105832ba083436ff5d6cf00df0fc167f9aa70b91f37748b208e74956e126e6609cc9b16c95667b71e7d5d561f378749c9514a19c35908cf5fb408411488f548
 DIST texlive-module-tdsfrmath.doc-2017.tar.xz 717636 BLAKE2B 636c0ccfc060a841d6002ebd266143642125e36566dd894b375bea7ec77b9f7dfb65000d38cbbb33233cda6bfa7d8030ff526aec6f38f7ce3e76957e9a90d480 SHA512 e449e85f95f7b241b5c3169f0f26fc7c15b63bd5ed0c4940df0a497300d87a66e67c5191b27d2f42c6f1b056c1009a94fa9c7425eb8306ce94dd71bbd72dd171
-DIST texlive-module-tdsfrmath.source-2015.tar.xz 33688 BLAKE2B 2e7eeea7d1057a75b8cd27c51271329f6cbd0d1eb90942cf48a0d70621adc393cae17bbcca58d24dce0e3e3cf81fbaec820f60bef4731fc9488a9e5427e38925 SHA512 35b3282bcaa2f56cc2ee940d4ab906f9a3bea45a280ebd59b3b23239060658831714af8f225b970295021dc5c9a0702ff45644e5cc85db1bf9282cf92617860e
-DIST texlive-module-tdsfrmath.source-2016.tar.xz 33688 BLAKE2B c5abf93401be16c2d932aa5cad2d15f7b3e8a2047f5bb2a16679848a9aaad7b2afd09f6101c6a448163ef3abb0fefe8c6a152d447aef45bb5a538851f6d56c13 SHA512 48d5e338fd42701480468004c5a6bc4c74e36630cca7afc329574fa18af3a5f8aa4755c7f99f83e1abf1df9dccad84ec58d9682ea0c07de80f85d51284c60d61
 DIST texlive-module-tdsfrmath.source-2017.tar.xz 33668 BLAKE2B e3148b649b5e19be556354682d2dc3d95dc0bde791ed9fb179aee9c822f9288a2181ae74c08f3c51ccc92216ac42cf85bd355899ae408fa00ff716c19b3a21a1 SHA512 53523791df018fb2a2bd8b6ba41745df4e48541f52dd23b777d5583af568038133a416d06ae87e80a3fe70e806be5d84952f20afabeb0b0b6a888c6b49d6998e
-DIST texlive-module-texlive-fr-2015.tar.xz 276 BLAKE2B 7ee07be746ce17e66cc0ef37d1f9a70945ed5298c2ea988288cf0ac2103240606874df541ffa553ba7f8c550321fd43b11cb9f299377a737c4f62f489bf92062 SHA512 7ce2fd399288fdc57ea79b6ef9f6446ee87555cce6b1b858b8a3822983e201f48b7bec631d6d62df91493ab0f4e1293ced9fd3f960aaa28ad8724002d35f1278
-DIST texlive-module-texlive-fr-2016.tar.xz 272 BLAKE2B 52635a0580262f80b60e65d6f0026590dd830dc3fb99492d308bd654a2760320170610fbf42285570d836112d4db4976c79356df92f44c0d7396a32b3414ce2b SHA512 931733c18e94204ce67c81ccb27001503fed0ca7930ad30f1f2491174626d00ae2d9fb1f6f96f58df2577f5eb3cf1a31814fad88d2ef3b79a5c9ff9747930792
 DIST texlive-module-texlive-fr-2017.tar.xz 272 BLAKE2B 52635a0580262f80b60e65d6f0026590dd830dc3fb99492d308bd654a2760320170610fbf42285570d836112d4db4976c79356df92f44c0d7396a32b3414ce2b SHA512 931733c18e94204ce67c81ccb27001503fed0ca7930ad30f1f2491174626d00ae2d9fb1f6f96f58df2577f5eb3cf1a31814fad88d2ef3b79a5c9ff9747930792
-DIST texlive-module-texlive-fr.doc-2015.tar.xz 1146516 BLAKE2B a769382a8637d22f1c9c1582b4771741bcca5872a003d40e63bcc05e1d84912d2cd5df3325c4149d5e3266868bf044959f4ce77d20fb7208b44e336f6af6efb7 SHA512 ad9085580f5d3411e26b8b337f1616fd0d177d68c1937cc671e357f7d5453b15366bb5d53837e704b3f0a862de2fa4c9658f3b32cebad0f514a9b4c7ffeba3f8
-DIST texlive-module-texlive-fr.doc-2016.tar.xz 1147616 BLAKE2B 8461fff90541a67f034436094263ac2cbeaf88947a26ad572270437d729ccccf2bc58aa523d53c06abf7f1eb5c969a44a396dfc3f2f157e78303fbf09054d91a SHA512 5e3ac546ced7bc290b32e9906e9f5a8f519fdd55cb529e4fd8c50ae07b36997653d2b9b08cba3b501b34bd80cb5c93b5525f2af95f384f544f507caeb11ee618
 DIST texlive-module-texlive-fr.doc-2017.tar.xz 1020708 BLAKE2B a5a6044f810ec94e4e40967cd1e3c000af02677e125d8f50171dcd7928e1490217afc9b9e5c7d67599846f2f726551da70e1a26d4cece1205bc19708437304f0 SHA512 b24759873e0d35c18861c10ccc4d7fcf3993fa493b4c2bdb1e5108f2d20863ada88a0fbe26faf24122d065eab7ed28817ea9bb2fb803167c29cead6aa0516319
-DIST texlive-module-translation-array-fr-2015.tar.xz 360 BLAKE2B ac6fdc14d544645c4ace63db68d2857bf559ca8fb76e379da8d3ee1453c04e5cd0df0a0ca5dc4771a79d3f16dfddad980b5dfd5a29eea0967924af4be1d850eb SHA512 ad84d383bc3f36388ebabf562096c630721caa0918338f59734c2da8953cd6a41df323e12508d173e724e6b9bf24930b54544c198fa87976805bdb60b03cee62
-DIST texlive-module-translation-array-fr-2016.tar.xz 388 BLAKE2B 4a48fe48dfe1155f284f131c6eb766509c787dde8444f5b638fc476ae413b3ef730216e2445a432af276a0acb46fadd83fca94edc126007711af50f848ac2964 SHA512 30ed4104c4e01b0e60a27de28d5516b1ede1106ef204d8f27d6fb6155d0cf0e8d75d0b4147876ff4d6bb005a6056f5ed570ab23d9a7f83962e633e9edf042c19
 DIST texlive-module-translation-array-fr-2017.tar.xz 388 BLAKE2B 1261f194eb6bfa7fae7233cb89dbb1e763a2a9b01ae44c5843eeadf2531c4bf5f4060eab6984658877d15d1ff864f34e6abc2f1def251282ae2d72dcc0d43431 SHA512 00d0173c1be22a03d7cd342a6f512cf6ce5c17fe03fda810d631e94c056dc30ee33e344f12b7e0f16070b137c864c2301c21ce25b0c65f02b5e33830cfcebfd2
-DIST texlive-module-translation-array-fr.doc-2015.tar.xz 638988 BLAKE2B c59498443ba9912061a17d7f7e1b5ac3213efa354c5493ff45834f82a965a79760a2603fbf85764c2519ca21a5ae021f8fa2adee83cc9905d1876898c434cccd SHA512 412a3cfaf9d6ea5c052eb999e2a15a764416a04b3f77e9766e6ab1276ce60d9308d23316d429a93858394b6f0b81f9b6f4c7501648251fe299b0e010d066fed2
-DIST texlive-module-translation-array-fr.doc-2016.tar.xz 638988 BLAKE2B 157d41762f8bfd6e5af684d8b5618b9e685ee377d60b5c160eeb396004501c81b8fea377fc450f46b8d621625ebaee18360d292de5170e4f73beb23af1ac7294 SHA512 d3c841976f183935a3f90a113d0b27b4fc5615f7027f0e798e9f505e74cc8ae53a04c17d3de1d5117b1f668632b19ed19da7790436d690ebfe72f6ebedeaa37a
 DIST texlive-module-translation-array-fr.doc-2017.tar.xz 638988 BLAKE2B 157d41762f8bfd6e5af684d8b5618b9e685ee377d60b5c160eeb396004501c81b8fea377fc450f46b8d621625ebaee18360d292de5170e4f73beb23af1ac7294 SHA512 d3c841976f183935a3f90a113d0b27b4fc5615f7027f0e798e9f505e74cc8ae53a04c17d3de1d5117b1f668632b19ed19da7790436d690ebfe72f6ebedeaa37a
-DIST texlive-module-translation-dcolumn-fr-2015.tar.xz 360 BLAKE2B c4e3eda3797fa3946f359969ee1414d6134c5125b6bd1b527500d75a29286c591e705a20a964e380b627627236a199d195415d9542a440585e0096fbc84218a3 SHA512 e4e6ef837f0298f8349d07021d7f1c798a8025f8218ecfa2450f8ec60e84841abbcbed291176fd3dfd83200172ea587930390b7b316f454c060cb279b286d1d7
-DIST texlive-module-translation-dcolumn-fr-2016.tar.xz 388 BLAKE2B 685181491385b05553a9b052437796e6fb66eb9b8fde560b7cf6d881073072f13a2a8aeeb2fce4e329d7f1f5db4d1110569e3d2f9fb3296918d3a74094636949 SHA512 1278c415aa8a68bdda438609421648d07f861e9527cf0eb78ba5c9e8a7912efb1e23cb26770d820442a3ff79aa1069dbf1bada2dff3a68b401508e45ab860ca8
 DIST texlive-module-translation-dcolumn-fr-2017.tar.xz 388 BLAKE2B 685181491385b05553a9b052437796e6fb66eb9b8fde560b7cf6d881073072f13a2a8aeeb2fce4e329d7f1f5db4d1110569e3d2f9fb3296918d3a74094636949 SHA512 1278c415aa8a68bdda438609421648d07f861e9527cf0eb78ba5c9e8a7912efb1e23cb26770d820442a3ff79aa1069dbf1bada2dff3a68b401508e45ab860ca8
-DIST texlive-module-translation-dcolumn-fr.doc-2015.tar.xz 322312 BLAKE2B 44675828b99215e03044463b9dbb5a245379ffcaa7d11b2edcd2cdb5b2af1d1856a16abc818e6477654fa951da33892c25956ea0a9f051beb7d46a55ba316db7 SHA512 bc56761b922e33eb697273c9a62a3f2258a735046d72905f7fac55e102d31b896f42aeb95fdcc87ee2d576d8d06d95353f10458e6aefb1be4782eb1e67250e20
-DIST texlive-module-translation-dcolumn-fr.doc-2016.tar.xz 322316 BLAKE2B 0dfeebafb3b46b26c30d6cc1fac18c3fda4fd6d96d913448f0b0e672427d7493a6e521b7befde05db958b660906d03df4a7ef4d5bfa001b532665c172c56dbea SHA512 5d0a0e47815fa209f220e56da00458f84accc03353fccdf281f222c8e36e97e650d4094ab1733dfa36635e782ee6b8e7ff88dc05732716eaf922f219f30b6e28
 DIST texlive-module-translation-dcolumn-fr.doc-2017.tar.xz 322300 BLAKE2B 5e6920236b24c1e75e310627d7603d4b5dd6ebd5592a1c0fda93dbac8853da656c6f610df07d8dfcd70a71369f2ede1e50a5fdc2d8189bf8dff3e7354894f6f1 SHA512 517955188cabd14de35741113da1541ff808c8ce2f7835f45e53f45954f001767d49d28fb2350c6e84c3a5d877505f4b0c9e7a3c6fad744ccc3e282eac1b2556
-DIST texlive-module-translation-natbib-fr-2015.tar.xz 360 BLAKE2B 093d4ad5656b83095d55f36ecaa0ff59e7e04f577421fdce4fe60d73e41bcf7140414782d8ce1a8f17fe54a1840adf2291490203d77bd17f5defbba113c7c3d5 SHA512 7023a3d262e68cb4c490b7fb0f7114d5dcc8cf9b0b375cfc96c5c98629108670d318dcbad9aa0b338b7530287e28883d7235fe77adfb641a53a6e8b0c0c245ad
-DIST texlive-module-translation-natbib-fr-2016.tar.xz 388 BLAKE2B 3a9b44516c397b4bbabaab13115cf3cd5dde0eda7b906fd62b326c048b8240444bdfada577a4975bf6c9e0ee72bffb3d07e28ffeec2eb6f95dc88eef41378f76 SHA512 597834cc0b02790f0a21a1f960be25add0370f35b1eb7652474e64d85f551ccc65864e25511c4a5e4879afd3528f33e82b7a68765648afd759af0db4b912d928
 DIST texlive-module-translation-natbib-fr-2017.tar.xz 388 BLAKE2B b77a0d5c2babbe069d6f1db905c5c9647047ede2cbe7dfc2e0737637356faee3ca194d75ea9a68162959c114fb1edd70b0fcb7297f5902d5f12e6e120129f2c4 SHA512 1e4deef3cdcde92c67c970a3526872670ffeb217189df7c3903007efe224153d848d81f415fcdc7fe9e46c32bac13b0f4773f43d5027e1bbff4ddf0a7c152015
-DIST texlive-module-translation-natbib-fr.doc-2015.tar.xz 687888 BLAKE2B af5148c328a6433f4f33e0ff53275c0075ee8bab4bb3239c82f9c4a19291bc1f8fe2b88251b61daa45999a160eb20e2b0a1d218a1c70c7c00cee20fb8f54bf89 SHA512 bb0df8a1c3851eb58ad12268db24d397b06ae40b672efa1fda5990b7041a6831c47db4872f9c00344555b4a0b1a3edb743e382dae38d21939261d487ed0ae2c8
-DIST texlive-module-translation-natbib-fr.doc-2016.tar.xz 687888 BLAKE2B 17c48cfc9e09917d49a137c378710f3b502e8ee476edcdec3ba2f42b19cf54c9c72953bb55c28028188b7b1f0574108a41a0923dc60a7c1c8effd0d81161f4d9 SHA512 a4c44749736cd6db51cf496d597c7922a49e1bff8a0acf7c84d8a4fd3f25e4657563aaa5d92268a73005e2a811f8ade02813c723970418e784aab25e20d23ac5
 DIST texlive-module-translation-natbib-fr.doc-2017.tar.xz 687896 BLAKE2B a2d1339a13a8a8d3603adf56c151a84f5c6abd55c9bc343fcc25389f2af64196df545c9c3eb45575e4301825763df3180295e47c2f88a2d4975bd05e18d5c5aa SHA512 b94d895cb6e232c53cb5254e156a9a895dba82d8404978eef1394c0ea825611794dd2489c94eddcf3d93cdc734c8565ff7c48cfc11f56fd3881105ba26ce277b
-DIST texlive-module-translation-tabbing-fr-2015.tar.xz 388 BLAKE2B c7d203575650af9bd8a792aaefa3fd0c57090708f868c0026a413574d9f7c63f7fd1b8cca454d80b104b11dbf712ba41d3f6d947828b10080f3a6f483b383ba0 SHA512 f1cb7a8bc08b5b4973b0cc45638fc377e74fb2b57819e2ec255118a1e79b30b243cfccd15ab9c217f469bb56a4041e99c689f6e31280860ec7ec82bb177daaca
-DIST texlive-module-translation-tabbing-fr-2016.tar.xz 408 BLAKE2B fe453d964f68ab67110b41c3b4fdd74540c744cce3bc4e569eeea2173561f605d7b93a18a39dd15bf5b13d965444493bf72f43d42dede540a315eac3e3626a6b SHA512 d6eb8b54d19abbe30ef0f98f567b565d9f15c5e36b546fabc78a0c631f0d2d710d53ec0c85aefdefdc1615dc834bd81ca6b613a172ccfd67748ef4127b80e4e0
 DIST texlive-module-translation-tabbing-fr-2017.tar.xz 404 BLAKE2B fadc1928a6d553712ccb1dc4150a9f2ddef0401161d60b86d16f3d1b08c470f703e0f00ea7b65461c56efd8f1aaa441f6d0b513698fa58e25c46003cfaaa7a36 SHA512 d2bfe68317406d5c29f92937c65ab86eaaa4cdf96c6bdd15e165762fc12888f6420751d4ec98222b06be104b5d9201dda2d807b6ad6ee199c98960302ee63ea0
-DIST texlive-module-translation-tabbing-fr.doc-2015.tar.xz 355424 BLAKE2B 04b71c9f9e6fab39cb0e41bd39e51ec0d7433ff3e621a2c24e5165ab2182d65cb0c6777bf884f2de6a26034dedb3beb39823da60ba3b378a68a1ce4f7989a61c SHA512 6c2bfa9516fd3e5c8de3ea6f43a0379603105dea496750a6d698b776614bc2e41527fbc08004bdd0398b441bd6efe18fbf1d0cd13fa9160b89d869931e1e5679
-DIST texlive-module-translation-tabbing-fr.doc-2016.tar.xz 355424 BLAKE2B 8b917c5c59a1ab69bdb4215b031ca9133609301c5612e02b843f85704c4d6c82f68722190464b4550f9d422c703b098c697cc48924af00b5b3d267b3dbc44218 SHA512 eba701b13420abd6b340712eaf7a4d062c35919bca22c01fd8f3f964c944ecb37737fd9b42f1c7bcf3787dee2e1192eb43a2555b3af15b2a25ff3cff41c67e28
 DIST texlive-module-translation-tabbing-fr.doc-2017.tar.xz 355424 BLAKE2B 8b917c5c59a1ab69bdb4215b031ca9133609301c5612e02b843f85704c4d6c82f68722190464b4550f9d422c703b098c697cc48924af00b5b3d267b3dbc44218 SHA512 eba701b13420abd6b340712eaf7a4d062c35919bca22c01fd8f3f964c944ecb37737fd9b42f1c7bcf3787dee2e1192eb43a2555b3af15b2a25ff3cff41c67e28
-DIST texlive-module-variations-2015.tar.xz 1308 BLAKE2B e7eb1eb851ce592997d9fdd2098da2166916dfe567dfe4918f96e5eb3607b4e53f95fdc5624ce734a86d1dc748c1635339edec377d62411d1389a8bf508a1bb7 SHA512 2e6bda571d25422313588392fb387fe1dfde288c470e4262dcbb032257aa1d986a95660bf1b43941de845a9a4ce4f28b912b393d879a352ea7adb130a671dccd
-DIST texlive-module-variations-2016.tar.xz 1324 BLAKE2B f91ce987ac4462f7b4fa49db40ed5137e21364b8647a539a6e36207b2dc00d511266ae2fe93fe454abe727666cbc9112423acabdec8470e9bad10b7c19a9b329 SHA512 2bef2dbcbc3edcc4dbd21d9c05c5671371e8e879dbbf9c86c320f57143974f3487fc2116bb8c3b469c88e51f23336078aa018dc9574fd9afeb905bb365d88557
 DIST texlive-module-variations-2017.tar.xz 1324 BLAKE2B f91ce987ac4462f7b4fa49db40ed5137e21364b8647a539a6e36207b2dc00d511266ae2fe93fe454abe727666cbc9112423acabdec8470e9bad10b7c19a9b329 SHA512 2bef2dbcbc3edcc4dbd21d9c05c5671371e8e879dbbf9c86c320f57143974f3487fc2116bb8c3b469c88e51f23336078aa018dc9574fd9afeb905bb365d88557
-DIST texlive-module-variations.doc-2015.tar.xz 75760 BLAKE2B b6c458da4ebc9ede9d5fbeb84903956e27b778adf28d65f2649d2ac8e8f8f2f418e24d84fcfe7cf268e2341e10f098b68099e0cabe95ce466db2148cc601fcdd SHA512 f435d8340840ae482e821c2ca95c0d15e1814c230df89652e8a98179d32a640c0da4fa20ad4a63dca61c75c37d0c606dfce8510d3ad9c2324bdf42f6537ded9c
-DIST texlive-module-variations.doc-2016.tar.xz 75760 BLAKE2B 0ab655ce00fb26c8e01ccd0a11e69e5a7be8786ca6922c3b09cf19d60981d6cc9b1e0468f7673daf5aa7b0e1044cd8ce28d4cb56a559792f46c2db77f719a7d2 SHA512 c8145b3ce00d1a76a659b659a00c1607a71c95ebcf03eae415c096d633a4bbee18f400ddbf6f95d80f02681bf0daf906784317a725b81230244eeafd5f5e6ae4
 DIST texlive-module-variations.doc-2017.tar.xz 75752 BLAKE2B afe7bd3fe57a06e1d5ff068d9bbb8fa7ab78340f461048960110c2fec77382c857bffd0c5553a8083ec9e8b2f72ccae63cadb850665f9a140ce46c49091b56c2 SHA512 e4bd628f70723f16fe798cae3884baef4e1f071b602a82ede1ffaefc99037028c9b8d821d8858a7ddd59aff950e4683b579ddd25e7f6cc3fe81b4a6cdccc65a4
-DIST texlive-module-visualtikz-2016.tar.xz 480 BLAKE2B 207a00a63d5dd9e9a585b05e94bd527ecbc563f9790246a603c99933694f93e28d6c81fe6133682350ffddd89a3a2305b0559a08925d04e7e98e04da1c7201df SHA512 5f4d7e450360d2e4335e403c5cf8824af6dc9f3ee4286a9009de3b2ea7749d153f727e4a71db3bc7e8f8f9099e8b3374646f15d8c4fe55e3d396b1213185149e
 DIST texlive-module-visualtikz-2017.tar.xz 484 BLAKE2B ce2c3ac949a1d57e3b1c07a37ce2542b63d07c382dca984ab3cdfa4b94dea4172e8dc622a30df7f3a4675adcfe74d5917ea39f920d1f5339648ccf8908051dfc SHA512 0f09e700c161889cb1014ed65091de38d3680c219f3b37abf664db45bb4e955f3f623ad6344328b5704ed3007a9376a76c9c29a0b9d0c8456eb53b4f5b286213
-DIST texlive-module-visualtikz.doc-2016.tar.xz 5653552 BLAKE2B 3d7ff5529a25b0a456d981582d42aef0777f25d602ddb94a73baab06a198393e4e99c21e217f435c2318cc9f8f3a08013d1c6a5fa8c2b5f297093d700a3f21b3 SHA512 2b4ff8d422a0ffb707b7a17c6951a3c582ee1ab0cb1d3bd4e5f0e7272aa510f5f6599b6a7762c5b2fa11d0169e15ddc905779260e0188e4db9f70422050f344e
 DIST texlive-module-visualtikz.doc-2017.tar.xz 3723460 BLAKE2B 4cbc3efaf7e628128b1ca6e9a67888e2bc654d32e460c7493b5f75ff9cbe9309dbfe2e03292bcd942643119c9b1fd6f7f7b66b4e223e8b16396a9431f7b1b7d6 SHA512 22729727d95cbceed8baa9d850bc218005d6b5ebabf5add3cf604fcd501f2b07529ef8203c69544e37952f5147f9b4926ba148527c76669a7fcf408c1d94ba62
-EBUILD texlive-langfrench-2015.ebuild 1640 BLAKE2B bb63c7bf5a41ab3bc68d95c5468ac6dc600a4502dd76e9b8a8a914e8532796db8365d8c79f59bc41ef0b01a2bfde5162854e492fe222e37c82dcfe574f92cba4 SHA512 1a57a22528fae6beb713aba8ff09f78a9cc964dc54e29ecb19683d25036b38ac0c671ad17255dc2f44cb8cc8f03172988d0f1bab6cfcaf5b9e72bd74e3c13b67
-EBUILD texlive-langfrench-2016.ebuild 1859 BLAKE2B fe0893111b6c9d090872431116d9dc903633030bd6f86eb9f260938bdc357ba16185785b2eaea06a84750ac15409f18fcb3c551142fea7bd881a1153dfc86dcf SHA512 2f72551f33dcf53097727824d84fb42cddc672e3274750fd75cace1782eecaf02a4824fcb3590d3d7632261bb3dcc5f6f48e4e4e6d8218c7e9189e80a4009432
-EBUILD texlive-langfrench-2017.ebuild 1867 BLAKE2B d26ea5fa6575aa7c8bc5a93f8c138402fe206d3f1d4e8a4b8dcdb6be1d6ca87c831a4ed2533003007837892c5a8a35ecd412d5b84eee4ca0aab6ef6eabd37537 SHA512 726439e6f013fd3c5a60767ab2fa67b106413d5c912daa6e9dce73600cc534c1032ad450d67f80619b370ed277997b628828ccae1426c6bc38cfb46b4b8eb238
+EBUILD texlive-langfrench-2017.ebuild 1866 BLAKE2B 16a20d041af86c05a6632a2f52372172dd73e2dc89fcecac8baa4c32a2227f71cad7126f453159522fa76f80060af358318f7b902263a6e4bc82d6ebb7fb238b SHA512 7b58a417ec3950ef419791f786f4d70dd24ab7345819e1d586ded492238c588305c6c09d4339a2e9137588591ecd2de57e7c24212d4ab2cd67cabd9e0e94d01f
 MISC metadata.xml 441 BLAKE2B 6a36c72a1efc71db9ff852bf890e5303b85c080aba256e055f8dcd97000025ea3351d5293f186fee14497706a8644d67ef7b5fdf783b4c9764f88266fc776c74 SHA512 613ea7ab10d9808c61e8a0b62bf7a1a59c10ac796afb1c8067e8e0ca681530650348af075bc0d02e38f2af4c9131c43343c0c6d9431d8d91d756098f84a5aea2
diff --git a/dev-texlive/texlive-langfrench/texlive-langfrench-2015.ebuild b/dev-texlive/texlive-langfrench/texlive-langfrench-2015.ebuild
deleted file mode 100644
index b68075625d1d..000000000000
--- a/dev-texlive/texlive-langfrench/texlive-langfrench-2015.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-TEXLIVE_MODULE_CONTENTS="aeguill apprends-latex babel-basque babel-french basque-book basque-date bib-fr bibleref-french booktabs-fr droit-fr epslatex-fr facture frenchle frletter hyphen-basque hyphen-french impatient-fr impnattypo l2tabu-french lshort-french mafr tabvar tdsfrmath texlive-fr translation-array-fr translation-dcolumn-fr translation-natbib-fr translation-tabbing-fr variations collection-langfrench
-"
-TEXLIVE_MODULE_DOC_CONTENTS="aeguill.doc apprends-latex.doc babel-basque.doc babel-french.doc basque-book.doc basque-date.doc bib-fr.doc bibleref-french.doc booktabs-fr.doc droit-fr.doc epslatex-fr.doc facture.doc frenchle.doc frletter.doc impatient-fr.doc impnattypo.doc l2tabu-french.doc lshort-french.doc mafr.doc tabvar.doc tdsfrmath.doc texlive-fr.doc translation-array-fr.doc translation-dcolumn-fr.doc translation-natbib-fr.doc translation-tabbing-fr.doc variations.doc "
-TEXLIVE_MODULE_SRC_CONTENTS="babel-basque.source babel-french.source basque-book.source basque-date.source bibleref-french.source facture.source impnattypo.source tabvar.source tdsfrmath.source "
-inherit  texlive-module
-DESCRIPTION="TeXLive French"
-
-LICENSE=" GPL-1 GPL-2 LPPL-1.2 LPPL-1.3 public-domain TeX-other-free "
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~mips ppc ppc64 ~s390 ~sh x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-DEPEND=">=dev-texlive/texlive-basic-2015
-!dev-texlive/texlive-documentation-french
-"
-RDEPEND="${DEPEND} "
diff --git a/dev-texlive/texlive-langfrench/texlive-langfrench-2016.ebuild b/dev-texlive/texlive-langfrench/texlive-langfrench-2016.ebuild
deleted file mode 100644
index 5bdd27527e2e..000000000000
--- a/dev-texlive/texlive-langfrench/texlive-langfrench-2016.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-TEXLIVE_MODULE_CONTENTS="aeguill apprends-latex babel-basque babel-french basque-book basque-date bib-fr bibleref-french booktabs-fr droit-fr e-french epslatex-fr facture formation-latex-ul frletter hyphen-basque hyphen-french impatient-fr impnattypo l2tabu-french latex2e-help-texinfo-fr lshort-french mafr tabvar tdsfrmath texlive-fr translation-array-fr translation-dcolumn-fr translation-natbib-fr translation-tabbing-fr variations visualtikz collection-langfrench
-"
-TEXLIVE_MODULE_DOC_CONTENTS="aeguill.doc apprends-latex.doc babel-basque.doc babel-french.doc basque-book.doc basque-date.doc bib-fr.doc bibleref-french.doc booktabs-fr.doc droit-fr.doc e-french.doc epslatex-fr.doc facture.doc formation-latex-ul.doc frletter.doc impatient-fr.doc impnattypo.doc l2tabu-french.doc latex2e-help-texinfo-fr.doc lshort-french.doc mafr.doc tabvar.doc tdsfrmath.doc texlive-fr.doc translation-array-fr.doc translation-dcolumn-fr.doc translation-natbib-fr.doc translation-tabbing-fr.doc variations.doc visualtikz.doc "
-TEXLIVE_MODULE_SRC_CONTENTS="babel-basque.source babel-french.source basque-book.source basque-date.source bibleref-french.source facture.source formation-latex-ul.source hyphen-basque.source impnattypo.source tabvar.source tdsfrmath.source "
-inherit  texlive-module
-DESCRIPTION="TeXLive French"
-
-LICENSE=" GPL-1 GPL-2 LPPL-1.2 LPPL-1.3 public-domain TeX-other-free "
-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 ~x64-solaris ~x86-solaris"
-IUSE=""
-DEPEND=">=dev-texlive/texlive-basic-2016
-!dev-texlive/texlive-documentation-french
-!<dev-texlive/texlive-basic-2016
-"
-RDEPEND="${DEPEND} "
diff --git a/dev-texlive/texlive-langfrench/texlive-langfrench-2017.ebuild b/dev-texlive/texlive-langfrench/texlive-langfrench-2017.ebuild
index c678cd302c19..df8c5b8e81b2 100644
--- a/dev-texlive/texlive-langfrench/texlive-langfrench-2017.ebuild
+++ b/dev-texlive/texlive-langfrench/texlive-langfrench-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive French"
 
 LICENSE=" FDL-1.1 GPL-1 GPL-2 LPPL-1.2 LPPL-1.3 public-domain TeX-other-free "
 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 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2017
 !dev-texlive/texlive-documentation-french
diff --git a/dev-texlive/texlive-langgerman/Manifest b/dev-texlive/texlive-langgerman/Manifest
index 3cd2688d85df..4035692d3d19 100644
--- a/dev-texlive/texlive-langgerman/Manifest
+++ b/dev-texlive/texlive-langgerman/Manifest
@@ -1,305 +1,105 @@
-DIST texlive-module-apalike-german-2016.tar.xz 5748 BLAKE2B 74e1e03c80a903598b342754a95329898f233c2ab36b33e2a3e329612494636dafe4ab26a43373cafb0a976b6eef61853cb02c9eb56a467b8a98115e0873b40f SHA512 d4b80cd50e43babff02c1fabe14b9664af35c9ddb89a89131a21b1a82c16a35c7416e2b0bf874ea4a6f8791ca8021540106a22caaeef51e35c0c1a472982270e
 DIST texlive-module-apalike-german-2017.tar.xz 5748 BLAKE2B 74e1e03c80a903598b342754a95329898f233c2ab36b33e2a3e329612494636dafe4ab26a43373cafb0a976b6eef61853cb02c9eb56a467b8a98115e0873b40f SHA512 d4b80cd50e43babff02c1fabe14b9664af35c9ddb89a89131a21b1a82c16a35c7416e2b0bf874ea4a6f8791ca8021540106a22caaeef51e35c0c1a472982270e
-DIST texlive-module-apalike-german.doc-2016.tar.xz 12748 BLAKE2B 8cccfe32826000e8b1e038fdad87efe8c4e77e5d1cb71a21633d8c976b4be9e70e7f446246dbdf9398798077fe0ad9295f514f46707cebd8fc253e8bd62a27fc SHA512 de65268faa16789d70253986c9aa29ab2953f34af28c5945980b9e873c7401914bb6e15cf6468a0e524d1c569035f33d8785175fe61e33cbe238806ca56d44f1
 DIST texlive-module-apalike-german.doc-2017.tar.xz 12760 BLAKE2B 2a10b8cd9b4b02e01c276ec9fe69a9b1029b64d7a6f04cfbeea953d510744d8b76fc8332e3be0328fead7518b811b174507416b92ce70f205e56bd1c46bad052 SHA512 714d927e30d1739e69f66806083e0e94ea955cb8b312fea44c9699356355da0c8fd4ba1fc2076ec6ebea767b3726bbb61bca8ff4b5e06c16062d509a2c6a8575
-DIST texlive-module-babel-german-2015.tar.xz 3448 BLAKE2B 3a8bbbd4489cc057a9cf12180170bd7d4ea3b1b5e773b14138d99b436c4112b1a8a23c6dd4fb0f212573625d136fc48ce57b82685806fd7bc55fb9eaafd2a6bc SHA512 6f4b5ac16ef3a00751dd308c91f763f5713148c4c24eda710b918d9c5a0b0f4c2ea0bb3b9745026380dc3b387e6d88f0d4d2c106308093f53a494d8bc672871a
-DIST texlive-module-babel-german-2016.tar.xz 3600 BLAKE2B de7b32e72e5ab8029f6518acb68fc96a801f1eae32b5ea19d54f7e380de42c51d136992b160004c87091ccd3dcbd07de8e758092407c5260178c24eae2cb5fe7 SHA512 1361103f482e7cda0078b79889c2c8e9a156a7c4ede06750862ac193de969b3e605cc04fa9eb532a6ddd1f25518be08c17fb85c7ebca1613d0f55c3dd7f03503
 DIST texlive-module-babel-german-2017.tar.xz 3600 BLAKE2B de7b32e72e5ab8029f6518acb68fc96a801f1eae32b5ea19d54f7e380de42c51d136992b160004c87091ccd3dcbd07de8e758092407c5260178c24eae2cb5fe7 SHA512 1361103f482e7cda0078b79889c2c8e9a156a7c4ede06750862ac193de969b3e605cc04fa9eb532a6ddd1f25518be08c17fb85c7ebca1613d0f55c3dd7f03503
-DIST texlive-module-babel-german.doc-2015.tar.xz 131896 BLAKE2B 6267744e8fe9472ff981a2af795c79ca427b5f047bc4dcc864669e64c9b12465371cd80670977dc1b25e759c0c077cacf06a35c8557b1bc7a0b423e0a0a26cef SHA512 f9049ce134c9bddb1a57d828de4da4bca25f556d697cd410421cee9645433c511887f0b0b199508ae64a3b61b5c81dc7dc19e5922024a4f9510cf71fa5c099cc
-DIST texlive-module-babel-german.doc-2016.tar.xz 499656 BLAKE2B aa3d108cc2e678c08f46b4e4c8d9e0ba195eeab5e05081f90c95a4240a2821310e1c2f74320c3ec4df5e05598ea7cf64d4962a6abc1d3031bf68ca02f9e5cc98 SHA512 aa2b373ce5d11afe41fb46c84811c29803af3c68977973a80ad550a323dc5563c61a770863b5b490f7341581b7ddaaf9eace73b4c4c8d66eab78667a4e69ef5a
 DIST texlive-module-babel-german.doc-2017.tar.xz 499656 BLAKE2B aa3d108cc2e678c08f46b4e4c8d9e0ba195eeab5e05081f90c95a4240a2821310e1c2f74320c3ec4df5e05598ea7cf64d4962a6abc1d3031bf68ca02f9e5cc98 SHA512 aa2b373ce5d11afe41fb46c84811c29803af3c68977973a80ad550a323dc5563c61a770863b5b490f7341581b7ddaaf9eace73b4c4c8d66eab78667a4e69ef5a
-DIST texlive-module-babel-german.source-2015.tar.xz 10484 BLAKE2B b66f98048aa414f5a8abcfc0bf4e7f8ab281acdf132e6718c879f96f36f867172c72245edb40a2db5deb7d565f07b771436a6565e53693c9a8eb1f14fc31ba5d SHA512 2caa8ec7f37200c69f2c9456176c4a213150d95251bd931407f69fbd16ba2bb85f14745ce5585d89e6dd2e6449cd60bfe57e92088a8d1baddab41b6b7021c367
-DIST texlive-module-babel-german.source-2016.tar.xz 11392 BLAKE2B 26a58c97c43294334fda0c8cc6cad9996c19c68cb80b3a02c93202270521baa799e86066455314c2bfa2c3efefd548c268cbc03886a37867a5ffebc062bd7e4f SHA512 f8abbc9d357e1a0b642309aac19963ba3ea68d024e0da6dbca327c2db965a66c45afa1798aaf24b7f2eeba15915a3d25a998869c810df6c0c7137ab8376dd2fb
 DIST texlive-module-babel-german.source-2017.tar.xz 11392 BLAKE2B 26a58c97c43294334fda0c8cc6cad9996c19c68cb80b3a02c93202270521baa799e86066455314c2bfa2c3efefd548c268cbc03886a37867a5ffebc062bd7e4f SHA512 f8abbc9d357e1a0b642309aac19963ba3ea68d024e0da6dbca327c2db965a66c45afa1798aaf24b7f2eeba15915a3d25a998869c810df6c0c7137ab8376dd2fb
-DIST texlive-module-bibleref-german-2015.tar.xz 7480 BLAKE2B b191940a0f529cdfc6cb6ba9bf8ba6f3139dea252102d6e5b27b9f39bb4fa9818319ca190d69eff0b83c7368225a659b3a3a0188513f4c0d975ed4139ef0f216 SHA512 107e4f39355c0aba73486ed43ec9a902a152fa3686143c65dedb5f21ea311a6f1d706a50718cddb39d031e006e6415cd9145884e4914b77872bac52ac9b2fa6a
-DIST texlive-module-bibleref-german-2016.tar.xz 7488 BLAKE2B fbb1b9fc6180746624864fde4142588061181b9fde43a6dc713383e11157a8f9063fbb38b6e78de141911ae62637d846abb2c16dbacc58fe7f6929e4cb608e90 SHA512 1db1bc9052ff2f9e00d8ccd931ac31ec434ed927e04e7ff943b018921fabcc3c66d0a40e1a958a31ae6758c8189b123ac214be5ff3ff69078d4fbbe7c5c8afcf
 DIST texlive-module-bibleref-german-2017.tar.xz 7488 BLAKE2B 5571b8846e459aa7e48cc1811d28ba0b4b4e498c82df0a1f5f86ace75b68fc66e2770ed9f1ab3dac648d401c09aa5a90f014ff035d391aca3b1f3504f936996a SHA512 2104f36a1d8e30f135142ba83f265853b67e8364cfc64bb22d97f3960914212a8d9244a97f10715068595b3c40746d5ce4b644efb4a854a3871f1fa7dc9460c0
-DIST texlive-module-bibleref-german.doc-2015.tar.xz 659488 BLAKE2B 7881ec7dbf6db2ac11af223fc16b0417edad9515d2ee874226f2d1af7383cb6aa5fa995388f9a4b4bdc7a46b92cdadb92214947a94f537874bf5288169bd50e5 SHA512 b78a2f7877c6a4ad3c1ed16966a7b187fbf20448b5843d5208d848a0d46b6d089998e34be53254b800db7ee54940e7f4487e51ec8695641ab1311c78799b2f0a
-DIST texlive-module-bibleref-german.doc-2016.tar.xz 659488 BLAKE2B 5dd07f921158c88698551fe4aeafc4fe2e5cb48720fe9bbc762657a2994dcba172f69c687da6a69f7c6f914e2f6b47fbceadcbea281499b3f97901c2f4c9a847 SHA512 ee07e1036263fe67103237807cba127a09f94147ed60e0aeec048743224b7ad76069d9540d8e5855593091a2adacead7e4900d3c196ffada6b6a9b43dbf65ccb
 DIST texlive-module-bibleref-german.doc-2017.tar.xz 659440 BLAKE2B 4269837b3f9caf4198ab285b4b536fd8a01055d035d6e9b038e06fb5d350735de4e53679e24faf22afc9ca9781deaf68ac63f3c0ead5dcb90de6cf7ea3a8aebd SHA512 4b4d5b0a0d6c997514dd18dd289bcc8fa330aba118b62bf3aa431cedc320861fe47a65c98bd5b470564cc332de53daf3fb5847a65a4c8b15ea76e59e3f0478f5
-DIST texlive-module-booktabs-de-2015.tar.xz 376 BLAKE2B c6f3b1b687696b1b114e2340c77df8bf0c6fff971abd4ee2aa3938e619b257f4c8e4eaa55566d1e7cfdeb09b2b759283afcd49c2d4fe1bbf47f0df1f34fc6e5c SHA512 c27e31ef4ad52deebb9c616ba661a1032e78b75bd7189dba4dd3c139cd5c9ee11bdee70f3503ac80866151c19386239069d8e65c2c5c2e1f2004f1a374a446c7
-DIST texlive-module-booktabs-de-2016.tar.xz 396 BLAKE2B a2f7981fc3b2dde664d875c1784909f5fe05844ffaabf70213d9205ffa7f9d82b6ba1a5305e94bf6541d1f82e5cc7ce5ff90e453eea4838ec25cd4422e9a4b2f SHA512 5e5f4e17e22aa75ba8d704872962550f0d93a9f7cdab08d5f7b936e7d7bcc88d43cda6f2ef48df860c070c7c4b40215005dac38de08c3fd5d9ca5e8eb4d3f8ea
 DIST texlive-module-booktabs-de-2017.tar.xz 396 BLAKE2B 0b82f46f9885b64f293804cc40b245bda359149f1a96e10fff2fe7c1863a68d10cc0423870a11e14a5dd0cbfab68d6193c324c2114a4454f898e7a4769f34247 SHA512 35fd90ae310c5abb9f87894c2bb668d04bb50f977fe5a428b1a230c3fea6a16248fa8bfce67601d41013b567b0a70d36d560d09f63b69c769d6128fa07125369
-DIST texlive-module-booktabs-de.doc-2015.tar.xz 273316 BLAKE2B 7041f8652a7e4b93718880fb33af416a3d2ba725502193a596620a8d24e07b10b6c0cca7ecdb1daf7c8b1c984ce94388a3742e98a789d537b8bd7b3d170982e9 SHA512 46bd0f77f83a67181f9a1e2a0ee773bd0f23875ed5743484295d11a8aae61f1f4e4185242de503b051ce69f7342190c245ff38505fdf39f137c90b1158305fb7
-DIST texlive-module-booktabs-de.doc-2016.tar.xz 273320 BLAKE2B 9c743bfbb9f17a8c70128e194ebaec9391ac69c7908ef819249d558db001961ae9a0574cbd08177d87fed350c4a01c4fde7c61d76bbe080173f58b4b13cfe653 SHA512 4e49734e842ba8acb4e473c01459788816558e73dc9f964b1a2cc96fed995836643e6fc8b3a5be555561c9aec872394aaf3c48026c1922fc5eabff819fdf6c33
 DIST texlive-module-booktabs-de.doc-2017.tar.xz 273320 BLAKE2B 9c743bfbb9f17a8c70128e194ebaec9391ac69c7908ef819249d558db001961ae9a0574cbd08177d87fed350c4a01c4fde7c61d76bbe080173f58b4b13cfe653 SHA512 4e49734e842ba8acb4e473c01459788816558e73dc9f964b1a2cc96fed995836643e6fc8b3a5be555561c9aec872394aaf3c48026c1922fc5eabff819fdf6c33
-DIST texlive-module-collection-langgerman-2015.tar.xz 624 BLAKE2B a982cf8396cafe1c06772fd3827cd9a219654b3bf0efca94cb0732d9c6f1ae1fdc230aa93732aeca8cc881f99c0347739ce926643abf09607b096dd92f3ce346 SHA512 c84927ce2ec8be461f1f7ff58717c22fbc02388e2c5cf043f399227f1352609fbb6e21adf95a325ec409bde516e1c14757b09aa4b1e8bed1a2bea95bce72adb2
-DIST texlive-module-collection-langgerman-2016.tar.xz 640 BLAKE2B 5c78dbca2099baf68f0439e2ccce4fce8b5b0e5d12cacbc699732d5313f1381efd08b90f7d3769533fcfac4c35ece2b1e95db0b1ff184c450951bd7e17738cd9 SHA512 fe2a89b76f7823c5366f56a9da4ae72ad03ecc6347cc55dcdf11bfd0e0aea7c1b9f2c6995573795e67ae6ee194fa7d1ae349f68d96dedf8f9cce997cfc5da498
 DIST texlive-module-collection-langgerman-2017.tar.xz 640 BLAKE2B 5c78dbca2099baf68f0439e2ccce4fce8b5b0e5d12cacbc699732d5313f1381efd08b90f7d3769533fcfac4c35ece2b1e95db0b1ff184c450951bd7e17738cd9 SHA512 fe2a89b76f7823c5366f56a9da4ae72ad03ecc6347cc55dcdf11bfd0e0aea7c1b9f2c6995573795e67ae6ee194fa7d1ae349f68d96dedf8f9cce997cfc5da498
-DIST texlive-module-csquotes-de-2015.tar.xz 384 BLAKE2B fdaf1690e425a6fde092e6c1faed73568e3febfd6c51cb93aa0ad5b432a8cb46ba1c182495c84b96f4f6003a4465623483bb07749128151ff02e0ce9cb5e22fb SHA512 34082797ef7234954a1660547e9c5d760d38ad46dfe5cea59068e38cfb022e6f7eb1432729936ea2c041ec630818594f33c05e47cd6d3e5f57f43a8aa63fd97d
-DIST texlive-module-csquotes-de-2016.tar.xz 400 BLAKE2B 5ba49f1c4a8ea707d9486dbf104fc87cc8f40cd21c9fb750e8801643c7180568ffae0e4004b12a6c2438d23ae7c190a5313e13979378516ecfefe8d47116d396 SHA512 befdd05e92a42427fcaff85f00d25a8d150f9aaffe9c8cec81a222d3110767f5f9b9ebd03c8af69a2e2dc826e197005d0cba50484b5b98e73ec4ecd7db32c8dc
 DIST texlive-module-csquotes-de-2017.tar.xz 400 BLAKE2B 0d52c863d5ac517492aa6665daf3b74f16a0b83df0057fd8529a0f186d9a9426c07e3ba56e6a6a17f52f44a73f2d74acb4c429a24d33865e03bc835a4cbe1d57 SHA512 39850c16ecfbfa5d7fa9d1e2348f11d5b82e51c9eb1a14b573ae9d6252c6bab481e661e6df591d4c17457f96ce3bfacbc23c4f3b603eb8ad372ca416d9779f74
-DIST texlive-module-csquotes-de.doc-2015.tar.xz 321180 BLAKE2B 4a1528c1709fdd39b74227d121a3672d39c4b30e968fe9bd9c89b57530c8b4056d9523c08c08ea991294eea2642578e8fd4eb149773ba3bf0b62d55dc58e6874 SHA512 d54d6cc546db11c3b2ea216bfc76b1bc444f6c4dea3e8d1b4b2d175a6a670948bb2c499e3019364f863cad9f8e1fb5127b07ee497ad27c10c4141c9812846ebc
-DIST texlive-module-csquotes-de.doc-2016.tar.xz 321180 BLAKE2B e4a7b6441481ea8b47485a1c6f816f30c445260dd9cc9529b3af3630f2477b2ea1017037047493cf6ddf20e255703c34ed6f07d7a17f387ac712d11407e423fa SHA512 a6699e7e9734320ffd0238a821744d3ffd1e9d9ab179b268b8d48f95df56132625a8d7f59e7a7eac545509ee6af91c32f6086b335b0fe834d3163abab116e062
 DIST texlive-module-csquotes-de.doc-2017.tar.xz 321180 BLAKE2B e4a7b6441481ea8b47485a1c6f816f30c445260dd9cc9529b3af3630f2477b2ea1017037047493cf6ddf20e255703c34ed6f07d7a17f387ac712d11407e423fa SHA512 a6699e7e9734320ffd0238a821744d3ffd1e9d9ab179b268b8d48f95df56132625a8d7f59e7a7eac545509ee6af91c32f6086b335b0fe834d3163abab116e062
-DIST texlive-module-dehyph-exptl-2015.tar.xz 59780 BLAKE2B c641e0fd6a5a958a299e16572b6cd4b6df74557a02742b00767bf776a8af564660cd8cf9735fba9f3ef8c87caf5fbf53e9fd06122fc7447e30c73571132487f2 SHA512 5f195700b5b285893377a5b57e595eea578a5c32beb9809b80e09ea30a70f0f0e0c25a394937898a995114cb06a03b9f5326d15bd3ec6a98659c59531d91bc56
-DIST texlive-module-dehyph-exptl-2016.tar.xz 59788 BLAKE2B d1f3d18a004f583171f5b061bf0a179af76ec1e9650b01e686083be41ec0eaad0661bae7180078ff0fe735b326f4a719b6a256b174b6f87659d2437865b2f5b6 SHA512 d5f226cb1593363b1ecb1899486a0b4fc0bd568fc8b8df3ef2ac875ea1efc64ada345a1575844514162e5c33a776dadc4f769643dc77ab8a935837e58819ddeb
 DIST texlive-module-dehyph-exptl-2017.tar.xz 88220 BLAKE2B 4a10c7717517fa0a199aa08b9d935d3bcec7b3e56a7ab08d2c7e891f1f5844ae7522dc700e4d876807692574a7d18c114ae30b06f778198bae8ef109d5af6cb5 SHA512 21774777ef8a4e829eb8ca739ed2337d93da011aa709e08a78e310274d14779f97f14efc915077d2bb5cb3adf7b237f5caece02e7021ac2c8657a10f6bc70d3b
-DIST texlive-module-dehyph-exptl.doc-2015.tar.xz 245160 BLAKE2B 3b2ba158f3e956658c1d547de5df9571c702c1bc83685d06cad654942c0dd5628e0e01d4d1881718e58440b097fc27ba261e7ce71988c4839f253e00e6737d04 SHA512 48828a06c41f790e055d020e88a4918ef1c1923253507a18827b0c2148d9cd4dc5dd1d7de9ecd54da2b2b608ab84af1fe9a6a1ad1261b3f8e0999a5ed42841fe
-DIST texlive-module-dehyph-exptl.doc-2016.tar.xz 245160 BLAKE2B f7c9809da7f7c98ad21040b7cee586e12446f27ada96de454668fb8ee84381c74d2b0d47ef223f4f271d2a6e596f8ad29ec7b7b9cd80fe2438aadf2728a97a7e SHA512 609bfd0b10605462919e23c2d6f34f427f6459aabf117454b08c442d60f7f44d157831b01c99846a01f18726e7660303098b622dd5c56f54aee89be9180c7983
 DIST texlive-module-dehyph-exptl.doc-2017.tar.xz 119424 BLAKE2B 44135a21e4436c0177d5ab47abfe23b650c11c976e6fa1156c269fb8a582092d8bbdd568dba5b8a2303eec594e39e980efdb022fe5b74216bc5b22d898beb262 SHA512 aa9795d1d1e03ab4086ebd0a7ca097840959d49b9b63d7f6ecd8400155b9bd052a28d3dd71355d1c3b28bb510ebb2198fb9bbdd9f5240f57c55cf4a4fb104c05
-DIST texlive-module-dhua-2015.tar.xz 4664 BLAKE2B 7243b815694517d7543dd71a3f9d89cedfb29449a174b3c11656abd9d24759a454fa69c5dec8377175acf6477f94dacc0bdb305d9b56eb832578547f4f9b2761 SHA512 b465d1e998daab823b82e24447b3a7016b17a9411342d02045421f08a8a157d2e8262114f607165fe3f24fb937f1fc9cd94452e1203f7a7357611e0181b6de2f
-DIST texlive-module-dhua-2016.tar.xz 4676 BLAKE2B c63da8a123f03706f0102f9316e886f1da40a9fa6707eae390c1922212d625c2c6d7cc1701510e58569acb8129fa31e27cfb3be8460b0fd343608c868b870d9b SHA512 110ed1fc44e604750f4de9d09949dd71d8e077383ebf4164271df48e78cda4878a09d25c62e18eec55025e762bd1f916d63edc3ab194a32f3a9f13ddeb8d61c9
 DIST texlive-module-dhua-2017.tar.xz 4672 BLAKE2B e0c546ed70c6abf2111af83192784db3a9061f36aeb4fdf0eeca1047a106f03f281c88c0ca530b27becd570a5623707e6e25d340acc1c05578a14deed04b602c SHA512 3d7a4262e956e82e8397505191884d142d9b97d99e1598592594c7dc7bbdd2c2bd57d2959f419f5d9fae0fbcde7930c33d864d712664fa3d7f9e59c9e18e7240
-DIST texlive-module-dhua.doc-2015.tar.xz 323644 BLAKE2B 59312b5fb50a67e7a48664d501f18dd05b4978873e4e6d87c7ccf07b809c9fb1d98a9620087cfdd22f784dc67854ec9674925958f28c55e46948f08ea35138bf SHA512 7fae98d915d3b2bfdb02b22a3bc9f446258d80148e2aeb09389f55061f870b0ea5067b8dea095b2a53d221a718d977999c8bd2f196eaaed68dc598e9d639a774
-DIST texlive-module-dhua.doc-2016.tar.xz 323644 BLAKE2B 5a17d7efff1976d0e6549f4de419ef735c9b97d18ebbd65db3ed479f480644a8971b58f657e7063107333f4bfaa4f7932dba32484030732b9d45488e912449a1 SHA512 a45a5e03948af39547ccc9d0ff5c124fd1b5c4b959331f1b7076f5623aaa9034d9d5dc58eaa46d41269e7d5acb4d3505c0da75d173ad720f2fa40fa6c3a59432
 DIST texlive-module-dhua.doc-2017.tar.xz 323644 BLAKE2B 5a17d7efff1976d0e6549f4de419ef735c9b97d18ebbd65db3ed479f480644a8971b58f657e7063107333f4bfaa4f7932dba32484030732b9d45488e912449a1 SHA512 a45a5e03948af39547ccc9d0ff5c124fd1b5c4b959331f1b7076f5623aaa9034d9d5dc58eaa46d41269e7d5acb4d3505c0da75d173ad720f2fa40fa6c3a59432
-DIST texlive-module-dhua.source-2015.tar.xz 3096 BLAKE2B 47b4df6faaff92580d5ba1dbd821645ade66daa5913dfd37c9a57400443afad80ce0c43d9c479f36e69356557d94f633d222ebfc7bc7e7f45651bef9286e5052 SHA512 31023824e9ffdb969ebad15ce2ea101235f90fff3d9918843916c83088e52651fc41508a9b01538d10b2d89c70835e471f27617113b0c3433da9cd2ec0fc60f9
-DIST texlive-module-dhua.source-2016.tar.xz 3096 BLAKE2B 5b28ad4409cd35828f02d190a5ef3c21cc6e6df6e44378f2f63c792af367946bc468afc36e5d1b71580e745641af2bc5e034afad9fea106a39cd7adab2d89006 SHA512 91e2a423aa7d7e7fa13ef7fa46f81a5f4f8387b8bd1f57df97da1439509a05f0e83aaa1ec54bff249800a62978112d498a3c709b48c7f64c1070e12c5c0968c9
 DIST texlive-module-dhua.source-2017.tar.xz 3096 BLAKE2B 5b28ad4409cd35828f02d190a5ef3c21cc6e6df6e44378f2f63c792af367946bc468afc36e5d1b71580e745641af2bc5e034afad9fea106a39cd7adab2d89006 SHA512 91e2a423aa7d7e7fa13ef7fa46f81a5f4f8387b8bd1f57df97da1439509a05f0e83aaa1ec54bff249800a62978112d498a3c709b48c7f64c1070e12c5c0968c9
-DIST texlive-module-einfuehrung-2015.tar.xz 408 BLAKE2B 30d60802e35fdccecb0977089235817c357aa3e2b85246ca37ac03653639cebc6526b2ebdded1f2fb9232165d5d86d2988c87910ead87cfe0a1f556d8f0b3b32 SHA512 dc2221cba12210548b34f552d945ec9d864abd5d608c759c63dfda5667d75d24051f57417632fa656b1fb07c32200872a2e46cf8a565d289d5f660d60954d4f4
-DIST texlive-module-einfuehrung-2016.tar.xz 420 BLAKE2B 1195332598eb8668b4ea9bd987b4df518f65bdbcaca2e9844737675148f974093ccf179cb2db8e0ce31e26f61dbe63f75dbc380d509745d0dfa03bd347ce91ed SHA512 effe8fa7439dff3d850e133a1a18193504e3773912e96b16c17a566aefc58b1f1aa098989c78a9d48e8c34aa1aab54d67265a2594b36cc0ed5fed19669af9f1d
 DIST texlive-module-einfuehrung-2017.tar.xz 420 BLAKE2B e3b81b2330a8040d2189775e1444e1c6b60774ea8f5a163eee171f08b4eb4a5a355a9133ca12d7717667cb2100d4cb32656988ff958009ef747b8372c3fe4e16 SHA512 436807aec42c3a4a16771ebf07bf4c0521b08e0b9f3feb82c1aa9c31e1228517aeacf49fd29c839ed824def78cd6e7d2949a3682e731847ef5e97f543e265bf8
-DIST texlive-module-einfuehrung.doc-2015.tar.xz 159088 BLAKE2B a90e0a8422720c7c9e91e2b79021f7073081d42ce1c35989a53aa7497969c8047b380c3bfa6bea494baba0f2993274061d84b3361df90e2cf3b75f2026184b02 SHA512 f8fab33b7d048dc41bd03f14638452f324dc303bfa5b779def256f4c1a1e08d7b38eb3b0e7bd03e5b55e7748a6906cc082cf56e7a3604ac65a05448c68f5dd55
-DIST texlive-module-einfuehrung.doc-2016.tar.xz 159084 BLAKE2B 9a7acfb3b7b6f1ddbf8692c8ac0c537711fce4538e71f607ec49354c3e4e5111cfc5102dd158183b688f9548102f28c083e5aa48a28f590629cef8e9c957b69f SHA512 70dd2f1ad0da79a1796b2c434fae751eb6343a4a247697a99510594a765ecc823ff792d09e8bb564b5f18a49bb2ccbe9fe5986626a96a5b732a3965294bae82f
 DIST texlive-module-einfuehrung.doc-2017.tar.xz 158992 BLAKE2B a38673e50d8bcb90646f17fece063b1cae2270460cdb04f1ab0799f245264df9a239af1937a6f424d8ce39ca3128d66592c8ee1e9c0e4713d5d03ce7691abe31 SHA512 891177f04d76f9a72b3a7dff329231a71ded153d0f6e45182f35f30798e54f8bdbafe4259dae36420f8d0108f34fcd5d59c0dadfcf64b7be648af1487a8518c7
-DIST texlive-module-einfuehrung2-2016.tar.xz 432 BLAKE2B b912034061fa5587dfe159da693e75de02c5589e3994acacebe71decf7d8ab5071150f682f90ac688022ce3ae3e48519d41795b304af792676540cfda168f0b2 SHA512 143e4ebf07a4371731df1c622b62c1840f68a30ceb708a0235d32d7ef9974eab91394231b7f0ba1e1eda25b2252c3fda027e54d4e39b2366ef28621a516c88f5
 DIST texlive-module-einfuehrung2-2017.tar.xz 432 BLAKE2B 7d3acb156148adfe20213a56fbed7de78dc79c7548f2ebc2b8b6b130444b0550ab09c739b79b7dca4f5da4c1babde6f5f2411f6d211bb0264cb097e7628dcaee SHA512 a7e0c95395a2f021853eeeb459a1fe34974df796c77c59f7b37eff35b72694d49a9240e84a0ddcc109178e2db62f7a842c21574d13cca2d1f5f97b667a3d9052
-DIST texlive-module-einfuehrung2.doc-2016.tar.xz 320368 BLAKE2B 5659d2d7634b497aeed4cd01158fad11dc96aaff589005df34ee381b89375cea017a25be69382098dd4eaf25dbd28e44a4e3ba2dc9116ea5ded7c0b17f167ddd SHA512 76141417eef38179c5f2022263e5b35fbeced3407e9f506a015c277e8c1c397318f15424c5825978c65c1430d05c221a9dff518ad51dd41feb0692965ce502b8
 DIST texlive-module-einfuehrung2.doc-2017.tar.xz 320424 BLAKE2B 06b9f0da827888f599ffa50c7d80be351e5c8869167c64d7a18c9dbabfec1fc0f746793408662486e72fb078b1da7de823daf31ade1b3f7c4a541a7e3396b330 SHA512 1376171bafe517519d7cdf336582a5e90e32be294a315bd9d7e833bf5449e46de165b50c68ed2a4494706c659a49d28c2d45fd2a99b6e6354876adc51c05277e
-DIST texlive-module-etdipa-2015.tar.xz 544 BLAKE2B 96d378bab70d0f6c8cf095e39d062ac1f9158332e352330e6c8c2b55120f1e083403d5b3226ec3ad8720b6a71f14c7c5d3ad71bbb3bc0e024d1613b059b25e67 SHA512 5cc18ba221dc1c142b29b5ca5b2bfed3d76e8c4c681761b8261de2886390c5b67b2b1962fd58c9c5bb2641bbd174fd0ee32ab6eeb54b0d81daa83840feb33173
-DIST texlive-module-etdipa-2016.tar.xz 556 BLAKE2B ebfd8a5934e7a3d20da7abbf69d2e985bef30be7d6ee8eed210ffa0ca3b6e6640153a83e9e6e6849db93aeead28a3cf55d1a4fb0ec0bcc6b5fc82475f7a8ef5a SHA512 9a28e0bee45d92bef972ac159dc2c4221b0740abbe117386ffbceabc67fe901a1e4e5cbe7a110c91837c4a48836d605c6570831fe02f8e34d2558e5be1e108d6
 DIST texlive-module-etdipa-2017.tar.xz 556 BLAKE2B ebfd8a5934e7a3d20da7abbf69d2e985bef30be7d6ee8eed210ffa0ca3b6e6640153a83e9e6e6849db93aeead28a3cf55d1a4fb0ec0bcc6b5fc82475f7a8ef5a SHA512 9a28e0bee45d92bef972ac159dc2c4221b0740abbe117386ffbceabc67fe901a1e4e5cbe7a110c91837c4a48836d605c6570831fe02f8e34d2558e5be1e108d6
-DIST texlive-module-etdipa.doc-2015.tar.xz 1019912 BLAKE2B e64053075e69fdb7874d435fbfcb72815863d3d4fb388c8c981c35dc4563c330535ccdf1130014c0d689d427a0b3492c2994b9addf6ed8fea13bb84cd2788ce1 SHA512 338952df6e1406eb0d2f0e57d7c44519544bd4955559c5a463b512d4cfb131e2542a56e4855440724cbbbce83fa991de18783a2b3d6e7960932baa1685bd4015
-DIST texlive-module-etdipa.doc-2016.tar.xz 1019912 BLAKE2B 60e9429f3aa74a3031077d4fe9b9192dd0505454c9f28238c3961b00e2ad3442b4c42a96f2c435b23b15a38ab280c98d54d9b5da9988c634e24c75d998bc446d SHA512 c249f376c6170a92312c27f1bbff9309604dc0a72079fd5e4b0ae47c7bed0db98e394546a3d02dc3b36b714b0d18c42919a30957d3b52e5bb7010702b322e083
 DIST texlive-module-etdipa.doc-2017.tar.xz 1019912 BLAKE2B 60e9429f3aa74a3031077d4fe9b9192dd0505454c9f28238c3961b00e2ad3442b4c42a96f2c435b23b15a38ab280c98d54d9b5da9988c634e24c75d998bc446d SHA512 c249f376c6170a92312c27f1bbff9309604dc0a72079fd5e4b0ae47c7bed0db98e394546a3d02dc3b36b714b0d18c42919a30957d3b52e5bb7010702b322e083
-DIST texlive-module-etoolbox-de-2015.tar.xz 380 BLAKE2B a901f6c560c19dbc2bfe0a3e4296528571364c86f4e7a692eb274447777aae00ee70d6e91bca0ba8fbc4127dd59d89340b0537fd4ad5c71dd3c76258a460f599 SHA512 940d77f0a89b46ae11efd71c96520e073db080afa3f920aac40eda5d4fa0f59e25a5d00c25c62a38ee67f2d8bead0a0f7ded8f51eacc75425c3bf054505e2b15
-DIST texlive-module-etoolbox-de-2016.tar.xz 404 BLAKE2B 5f1efb79cb86cfffeb51f9277fd4f7609eab3ea5424593e1e9f95fff6404fc20da551b876d22735af1a927c7875463a819668fa0a196c2603759ecc5a2eb57f9 SHA512 5a7e2a1134d1e7d2211ed12abf50d0d7377370bfe0a5c37fc029318d58ba07ed5975e4a9c0b99eed3bdbdb30461e0dc73e288d8249bebfc7b07ff15f6b2f71b3
 DIST texlive-module-etoolbox-de-2017.tar.xz 404 BLAKE2B a8ff349323ac11313c7e2d2a5a7f5ff8cb2698c7eb9787a05c221aa5b45c207f6f2e88233b5188b20687ccddb17e4c703bfacfa953c60e5817edc38e9aed67b8 SHA512 68733f05fa5c7be2bfa403ea1f56d5c9d88034147f30f4b33ab4fb9cf8ec38bd1ac7f6ec05ca6350cfc535a5505e9adf0d43b54c4d34f6f53ab91bdba41a28f0
-DIST texlive-module-etoolbox-de.doc-2015.tar.xz 234632 BLAKE2B ad221681d3c99c0ad6b688a08ec08b56316a93f4ba4038668a2a9f2bc68e391af5f5af27bb836f7ddfa3282cc0a69a69bcdc44675ee3ec03687f513fa3178321 SHA512 b1d3c3849b097ba14213b1ca60129cc5ba39f1639d67ffccf0c614eaa7a3acf7d6cc570a6dec2d8b7c5beec152502913ba0dfabd28997d14da1ee4bad9bc6710
-DIST texlive-module-etoolbox-de.doc-2016.tar.xz 234632 BLAKE2B 1b7651ee752e45f4851795db81583ae100c65ddd57a11e5d5772bba53c367123f763f926df6be965e4a708fafc3af09e0154bd9cd6adf505b75c63eb201eb179 SHA512 641f2eb8c0c17c02161c0abcfc090ce01c34325e45c5a07ac14ecf13a7b3c7f4f0108e7dd2c4ee02d52516ec59ff23a12048b8e15f4dd89e09593465d8e48a73
 DIST texlive-module-etoolbox-de.doc-2017.tar.xz 234640 BLAKE2B 18a30669bdd6a7c815d3c9e4d184b94ed93f9183ec28b628070fbbcfb752453cacca11053663c53e21cc3b1364e396f24eefc02c7ae96128b310cce9bfcb62f0 SHA512 a94bfc0ddc6fb69d659c0ac07228c1b39b8ebee2a5b0856fe5efa04b67728540c10f0e69d954ef0d130ed438d03cd00720334ebd86f900ac2b4c2a9f7a7980d2
-DIST texlive-module-fifinddo-info-2015.tar.xz 464 BLAKE2B c7d422a1933e3ccf2c02a746faf69d661ff0ee8d722116ac80f274d3f877ce0780f8c59f4414294af818f65bdd9bd14e7c90338dba9a0ba50b14f5c003e69825 SHA512 52af65d00ab44b1aa7cfc5d06762c55c1d373ad34b758a293bcf16785c28ca27663ac60370082bf479a89077766c912bf762d79f225d2d61cd9bfd6d0c481a61
-DIST texlive-module-fifinddo-info-2016.tar.xz 484 BLAKE2B 760107843bb66e8092f285878f149b0d5b766c6eb91c6b0cf011151f15482999b1087382aff5a16d097c29726a4732ec0468b99d771e5bb54c5ac0024a431257 SHA512 500f9ed2c6fa6cb68eecbf887cff9337308160105a30f62083aeee805c39921b019789a34fab6424fcf05ec5de9f59b629ac099d359f5ca50e223b1e3f0a203b
 DIST texlive-module-fifinddo-info-2017.tar.xz 484 BLAKE2B 760107843bb66e8092f285878f149b0d5b766c6eb91c6b0cf011151f15482999b1087382aff5a16d097c29726a4732ec0468b99d771e5bb54c5ac0024a431257 SHA512 500f9ed2c6fa6cb68eecbf887cff9337308160105a30f62083aeee805c39921b019789a34fab6424fcf05ec5de9f59b629ac099d359f5ca50e223b1e3f0a203b
-DIST texlive-module-fifinddo-info.doc-2015.tar.xz 257196 BLAKE2B c7df98bb77019180d2b7b72a2555da7144085c1ec10c87184a438a522b48c537ba3d6043cf9078c2d4e0403c20325a66707378e0829466a352da170c448fd3e3 SHA512 3901e1ace31aa118440e8e6d21106cfedb7414c77f56fbcef3e873ce8cfb1b0cdd19515aa6a0d85acfa9f73272498e00b77db2985e4706a39dc0fc7f1c36c158
-DIST texlive-module-fifinddo-info.doc-2016.tar.xz 257196 BLAKE2B 9b10578eb0c61d61549cdebf6f6d046fb0a7cfc17735bf088d2547722c3cfabfa14b5f9f0e122048157da8de55a0fa6f6edb70c9158183daa465b1e28c98914e SHA512 6534ba91abaae7a0bfc4c4610b79b9a76c375a75e0ab925689d472d2f506aeddf26c53924d0ff0c6699dcd01825c51fbed99cccde2e508269d0b43119b9ce0f1
 DIST texlive-module-fifinddo-info.doc-2017.tar.xz 257196 BLAKE2B 9b10578eb0c61d61549cdebf6f6d046fb0a7cfc17735bf088d2547722c3cfabfa14b5f9f0e122048157da8de55a0fa6f6edb70c9158183daa465b1e28c98914e SHA512 6534ba91abaae7a0bfc4c4610b79b9a76c375a75e0ab925689d472d2f506aeddf26c53924d0ff0c6699dcd01825c51fbed99cccde2e508269d0b43119b9ce0f1
-DIST texlive-module-fifinddo-info.source-2015.tar.xz 23136 BLAKE2B 809431ab1c98ea73a3c38e0521be3eb6f8643c0b43ff98a4d11dd33013e34f1391be58bcf9de2f087a0ccf5a032fa535e91ea659d1bcdf2b643c511194bbaba7 SHA512 e62610fc6ff406690cec4a74fbac430473601b225e21094e3601d6336f3498a0381d01d0795497ab0f5fedf649d115062d6e9ca23056caf918bead307273fb00
-DIST texlive-module-fifinddo-info.source-2016.tar.xz 23132 BLAKE2B 6e81900f3699633421f766e2dcee60499a7603ee284259ed1153297139cf2f861a64ea82b2dac08e02106b712691feee503f6dc5f3618df8f9eff245e978ba2c SHA512 2b6d11d333596d1393ebf877f01338b2262d14c92d8e4352c208a36985233985db5fcc36f7313e3ec58c154d5516851f13f9ac90eea1be568ffb1e5a5cc36026
 DIST texlive-module-fifinddo-info.source-2017.tar.xz 23120 BLAKE2B 227ee65c6d5b0da47e4b227d7cbd17e29136af405b33c379a6519e619bf786f4329ab89ebb38b2747a03474cde814081bef49878f2b56862398342794b660af0 SHA512 2b8a240bcfedc8709ea301cfcb039583a2394a2690c8f9471247da6619e48463e1a1c5a1a31478ef404ede438ddf5c1b09878a20070520d994392dab6f953796
-DIST texlive-module-geometry-de-2015.tar.xz 404 BLAKE2B 5e6315ff38ed744ab794f29e3991faedce2c2ccc1b24d9cd988a9d48be709d6af4f25759befaffa89748c0602a7343a90a7d8d52d0074927cc07621f4723b0aa SHA512 fd5d5acd764a63d174a8297a8f9cb039c156af2ff782b068e5686a4595e65683c1a596edd394f6ec20b21e754c9ba9869e1c83dbc545db0fce1b06278825c2c9
-DIST texlive-module-geometry-de-2016.tar.xz 436 BLAKE2B 075dd683f2d059711b496b1aee30409ab67a8a6894468f538f1b7dc045673fe0c94b965a0338fdaa531dbf02712a333e62a8bfa24969c2e52f4c63a0340bb53e SHA512 23b942edd58e8ec7d25f8d4f54996baf2fd00c8a2104de27552cb81b127064bf59b0372c974ef50966056d4a5f6403d6d8674b54568d2e06af3860a8b04f2da4
 DIST texlive-module-geometry-de-2017.tar.xz 436 BLAKE2B e1f6c86ec97b99fedb8bea8d6e63767ec0d88488113a271175e51ad4ab8797d5b6869c80275b8d4819a6fd76f57a353aef5d26679592f2860fd0a20db0e34546 SHA512 ad7bf81cad49340ddebf7cf366fdc6c4797bbde9955adf74172a94ad94e1f8c5e207350442a7890cb6c0b04b51caf1780669499e70c4aa9ce6af93613eeb5302
-DIST texlive-module-geometry-de.doc-2015.tar.xz 443132 BLAKE2B b72b2b05378ab2e8e467035fbcdee71836b756bd3228d67f9bd6e4bd496c7f5b03cfc3cd80c2027f15f819f0b114e4273c7c0dcaa0d218f1273e964e8d598511 SHA512 281375fd933ee16ef239858308eb0c521d597091425764b0553c753d8da4adaa1cc60f7c211e74eb5bc7954e57ddb9ff520fd27a27ab9c6ab38021c8eea2961f
-DIST texlive-module-geometry-de.doc-2016.tar.xz 443132 BLAKE2B bb8861dfe5dc8866f6f8fadcbbdd0bbafa611f8110beaf0dd39f992ba43e12574b2dcb6c9371b10997c25880a5e0eb0609e348f26b01e44ec1972f7ceca33d59 SHA512 592e31c724e1ccf809410193f84e0bb43e3833119532e64bbde8a15e3cd349f37eaf977eac4419be45fd73d8acc9fdd11f9ce81b9d7f93bd0e6358942c26d0da
 DIST texlive-module-geometry-de.doc-2017.tar.xz 443076 BLAKE2B 33373af2d4481ecf621c7fa70c5219e20e58823092c3fe2db35b74bd78ddfe1449752d2025b119586db105a04e3264e8083584bc9835bec40aa320f28378cf2e SHA512 f21d93eb4791f3dddb24c0a3fed610ee195f8d40fbbafc9a88dffa0fcc5c2fa026f4a91bb197de984103fb14079b1323a6259fffc2ac6596555b8bc16b706e5b
-DIST texlive-module-german-2015.tar.xz 6748 BLAKE2B 1403eb21eff9a4b7ceb8dd4d3a4b54ec619334e345d74edebd790ebd10a846a5c7feb5001eb6190167c7d50133d4a3a6706e2879214d13800986c3795422b5f7 SHA512 c4947a78867def054c1555ea6b5fbf325a11c1c992970504b815aac9b91cea07355ac03761543567222168788587f0d329dce2194a8e3627ad8360b77e135000
-DIST texlive-module-german-2016.tar.xz 6756 BLAKE2B f27ade86cbb866aa3a9561ab4100ff8c9227d9b898d9f842f827341c06318c217792bc2cd1a57c9bfb40caeafa9f3582fd03ca2210b97591c3e07fdc1fb979ed SHA512 9cb863ab481d5d49366b6db699c767619f876c1374dd82de1a985338ffe722451d0ea0af4908dbfd604eb0cbe6fb834aaf631bdea3125f2410b3a4da04bfe6eb
 DIST texlive-module-german-2017.tar.xz 6756 BLAKE2B f27ade86cbb866aa3a9561ab4100ff8c9227d9b898d9f842f827341c06318c217792bc2cd1a57c9bfb40caeafa9f3582fd03ca2210b97591c3e07fdc1fb979ed SHA512 9cb863ab481d5d49366b6db699c767619f876c1374dd82de1a985338ffe722451d0ea0af4908dbfd604eb0cbe6fb834aaf631bdea3125f2410b3a4da04bfe6eb
-DIST texlive-module-german.doc-2015.tar.xz 193596 BLAKE2B f627027c05bb6534bcbd90f2c1e6c7b723d955876bdd7b587c492dbf52a8f47de7352962691d4aa2c4d6e00fec5681b91952ee6fb5f038386a1366df5ae30373 SHA512 4836bebb5b7ead2d67ab3cf191d3ba633926c28db3210e6427e44cdc68fa8ad2c6e89f69e36329ed5c5daaf186f80f7900c928c17a149e537948c8badf5c5693
-DIST texlive-module-german.doc-2016.tar.xz 193596 BLAKE2B b6ca1deb4dbbbc0ec651915679df3e1aa032154d68f88a62c44ffe02b41b2c61d5f5b981a9ce6f3388790d265911c6196f6c465a39a6192c1758403ba5e83fc9 SHA512 3bb1ad779fb4fa0c446f62682fac2bbf3b2b19254d05e3c79fd839be10ba80986a26f41bce79ea4aa5a7a8f5b813d3ca03dca8062d731da7c7663f5c63b439c9
 DIST texlive-module-german.doc-2017.tar.xz 193592 BLAKE2B 6c059aee30b595ba5b0f9b7cf1492c1e9cad1a1ef735544b03e3cc293daeed54e147bf1c0b8dde4e39b780c6038eccccd640b3a895599e247b96695abc740504 SHA512 53778d9f92c4f7acbeb9ee40267d85963ee6c6c49e2c02c6c4c0092c9dc2c147d27c23b1b2d74507e48240f85d2b1b608bc505167359b01643bf05cc5fd67942
-DIST texlive-module-german.source-2015.tar.xz 27212 BLAKE2B d8532d8ba38d58f469fbebf8c4f41cacce46ee47146713eb3aec08a9430eaa21a2ba436e55c68d7331bd7ee27a56d4185f707bc0242d5ec1d097ffcd7a0e7046 SHA512 0f872f535685d8130fbc9a8bea403a308c9e6c817adfd12b61387b892ff78b1877787d4ac8d4d2c35fa4899802df111ef1309b66373f7c9909ffadb3c65bbc2c
-DIST texlive-module-german.source-2016.tar.xz 27208 BLAKE2B d08903dd4b876e119bf21d2fc6f86404121396a9a8305d013c51ebcc9f42b2d58bd56b8aa8641b7ece0d481041aa81663efed02e759b9fe94b37907d830fcc1d SHA512 7d14eecc8fd272a2315f2579174f8b7941812ecee3de28225338a413ef1c6ba98ba6bd576abf45cf9feaef377f2954b16090467218b817037830002151d464d4
 DIST texlive-module-german.source-2017.tar.xz 27216 BLAKE2B 5cdd62fdb41ec90ae7a237050e36376d993e405ec0996f4537c0425274cd7fbc98973b0ecde40c24bc634693172047b79ae7b38ba823e0b8087757bbf268e49a SHA512 bf0011534bc03d35fcefcf0a67675eee72f620e0049c7fa58419b21e7436e583f9acb1b2c85ce70a3dc39da57ed5600d89ba0133030062477dcad8c43d57966c
-DIST texlive-module-germbib-2015.tar.xz 12192 BLAKE2B 6c701172a615525dd1d3178a674e99ec3cae77433ff567218fcea56cf89c55d63f0795d12e2d3e6f9a2f0c3b4a030334cbc657849ac8bc90f8a29be16d6df936 SHA512 f4541a6c6678a23ed08cb670b7b34b5ff5bd6c83d47e7a1d4449306cd9abaef6750f6244e165d7277d78917027e53536b486cd79413c6247405ab877c8851943
-DIST texlive-module-germbib-2016.tar.xz 12208 BLAKE2B 8f4e247c4dc783013772a243079e08a293201a904e6695c240e55113312ed61de456b1c378bacaab3f920b423dc56119f168325633c954e75321a81463462553 SHA512 cfaaaf5958c2859e5b56d71b72cd69bfc162b8bf92695c7c5a9b01741226c7e89389069bdf8e624ac7436b24a529c56b0e0993741c8cdd4d85e982574eb82ba5
 DIST texlive-module-germbib-2017.tar.xz 12204 BLAKE2B d2eab408d11fa7a2d604a1969bba60ca9e27a827054097db7f4ba6035d70c722ebaf0e4b9bbd6e4106b9bf5b39a403d62f8a5df5c6d09a56d47d84244fea1c3e SHA512 731dc9f7ebba43a28a2d713f82f847f2419e804e4f908d0bad64209a9cd4eda3ae88dbf3d4f42b10b5005d358e0de393bd12b1677bd51d31337c1068f2787be1
-DIST texlive-module-germbib.doc-2015.tar.xz 35556 BLAKE2B bb6c490fbf5c13444b1eab230d0a7aa0997f207ff3f4f083356e4915d7591a3ab513c129da00ef10b9ea03a2154d48e0bbe8240078113935fa19f67082bea680 SHA512 81e01a9b7bad95608f81a146308a093c8d09d78c826891ab333c9b17eafb6dc93de91f01f346a31af3fe873defef560199cf2330decddc9bb01599a5eb22520d
-DIST texlive-module-germbib.doc-2016.tar.xz 35560 BLAKE2B 9393e498f96611599678836c96c158a9d3b68e375f2f180eba29789719ef1c524b3c3aba598670dd427f8ae65dafb959ef7d28ed4bf13d728b0712ede76b698f SHA512 220ac6be579133a49a2695912b22bfef2c85f83d4a556a63f3bfefc76c2cbf12d4679b5b8305dba88b56077dade7bc4d7ec0e295074af70d377d02603bc86859
 DIST texlive-module-germbib.doc-2017.tar.xz 35572 BLAKE2B 83205fd9a199a042573cc903cd0d343a87a393acd3f1c3ec8a801a2ebbe81a1a269850cb6ebf452de2cfa8e49ef0e06adb38e6713cc1f783ea338124ae12686c SHA512 26569f4415a365d16c79220131d9a44f1722e9c29a789e6e3775d497ae1116685b6a5093868573f48a2bed1460dea3dca4b485324b85eb0c69b82cbbeb3dd6cf
-DIST texlive-module-germkorr-2015.tar.xz 2328 BLAKE2B 65006bb4fdffbb02a7e38a63693ed28e55ca3f12c54dea6991af15c2476c963dd0af68fa5642df7541261c77fa4c83075fc332943142498c4e51549e5f16560d SHA512 b7c606005520b7a04a9414c3a71a18737693092d94c834c099b9fbec640f18b691bbfa75ac63f15e8e10869c102ce9b3289c540d22ef0b4136fffc2a5c11b9f9
-DIST texlive-module-germkorr-2016.tar.xz 2352 BLAKE2B bf98be4b90f71413c6b2c5d34339e98b715eb59bb5486d408439bee9285bc32f252721954fa2148dc2ca6fe0a3e0fa3dcd18adc7242a6ed61fa5922ce03ed42c SHA512 aee58a9d1691f342efdac46f4de76de2f31c826b87eec8a960373b2279938e7b5171923895780e85d20c2fa9f1b4fc799b2f28a3602abe575637c76c583c02ec
 DIST texlive-module-germkorr-2017.tar.xz 2348 BLAKE2B 2156a713a4399be6bbee6b75dbbb0080be3d00d76bc159bbcead91e7e469c1f760148ff50d5f50634ee019128f2aeb73e930ba646213192b2ebbc7878cfe9d4f SHA512 d92900006070f5bf132fe93e1ebc9827819dce8c2d7478ee9aa4dc6d87c0e228c763c1b2429920a5cf9fcbb8c856d75672c588b25ba5d9a3a6ee74659ad7cd62
-DIST texlive-module-germkorr.doc-2015.tar.xz 172296 BLAKE2B f3b593e87537bb27b53c0b8ae69b2426662f8f73de5143d07e6209c2151d85fa11f2aacafe4524283a12ebbc55b4645f2e1e9ebcb593a7ee7d5f71eaa4b71a61 SHA512 a7603f96d84818a3790228e79fc4d94878930a183fc9a14edef6c2edd7286eddccd1fe8683710078df36afb47f4cb1ed90f233d4690bc5ef19a46ab3febe0ab4
-DIST texlive-module-germkorr.doc-2016.tar.xz 172300 BLAKE2B e74f119f98dd9dd0cbbcac2bec6bc9f6c7b2aff9643e247c49997cf7815993ef61db79aa53ac230b7b32e24eccb64af827e4822077aeb9b488a2f92bc5a0adc0 SHA512 7e293270cd420c1969ec31a3de94ae9feab6e20f58dc3eeeec7914296b127c10a55d6051e69557467c8ebfebec7959de93754d185a6b65b014de1eef698b5936
 DIST texlive-module-germkorr.doc-2017.tar.xz 172300 BLAKE2B e74f119f98dd9dd0cbbcac2bec6bc9f6c7b2aff9643e247c49997cf7815993ef61db79aa53ac230b7b32e24eccb64af827e4822077aeb9b488a2f92bc5a0adc0 SHA512 7e293270cd420c1969ec31a3de94ae9feab6e20f58dc3eeeec7914296b127c10a55d6051e69557467c8ebfebec7959de93754d185a6b65b014de1eef698b5936
-DIST texlive-module-hausarbeit-jura-2015.tar.xz 4348 BLAKE2B 93e30f0951e7f23f17a1efe354f7f496b5ba5dcaf1085318ced8d1d51a3fdaa4644a94739b1a1ac581364a697884eb8a58314a96253cf3fb653656e9d01490fb SHA512 5d9d13db13572fe94b5819845297bc414d0fbbb4eeb60c14cd6c8abefc4d5b4f116765ba21c9a582711dc56df69f41bbfe7ce96d5aa6939038117f12465ef622
-DIST texlive-module-hausarbeit-jura-2016.tar.xz 5064 BLAKE2B cb776e4d288b6d3f277f2c8c64bf2cef5d687c1222bde22b94b41c5199364219fb0ea2f158852b25af7ef94abb5a84167efe9ef86627dce48408b86481b90f55 SHA512 3d1525216acde685cceae8a92d76fdf917c66b922b9955f835b8f9e8c31f7bae4682d6132ac6586828458174aec1c8f7aaa88d25ca8c943e4f673f051d470c84
 DIST texlive-module-hausarbeit-jura-2017.tar.xz 5064 BLAKE2B 20c6eb48c159f574bdd032b33e92123dafd8b953718bc49ff22438997d602920014c0a74f988c78657d87336d74a01e7bdc6d6d1c6418fa4dfb95b93633889f6 SHA512 4d08c513073948526182020e9594c9c773b880262d1bf0f22220a70e5660690e7352968bb9f5343c0f1e7a07d311ef85ed23f569dfa62e25dbac48dfb398a023
-DIST texlive-module-hausarbeit-jura.doc-2015.tar.xz 328508 BLAKE2B 9b7032fc4b6f4c58ffe9cd4bf05df92b18e61f273300e891e5cc4271cfd7c7eb3e8041c690d631487cdc57c4cab06144f5e7aba291d4ce09c8048b7554049476 SHA512 406ca2fb9b76b5cd2caaa3ad763ccfae16ec24314ff5252de7b969e6ace9be615f93349f8d3efb63083d54ec658b912ad34bf3dcf0767b3cd1a16a92558c4e09
-DIST texlive-module-hausarbeit-jura.doc-2016.tar.xz 336276 BLAKE2B d52e1cb05bec467106e33ab51d65d46eb04127911b6cd71e091f173811fe0bd5f9e053bfece2e9b89f0ebede9cbc2b7afb5edcdcce29132374e54a8a23e9fdf2 SHA512 1cbfeae4d85ef78b07ef2cb8451f6f7672dcdf03ec7c3e77fb97491e57cadc48083049bfd4e443721420464d71d779fbf9312df5683385eac53f068c3dfcc562
 DIST texlive-module-hausarbeit-jura.doc-2017.tar.xz 336268 BLAKE2B 0fb98bd5cca6d398e5978c38da9be922ff34b3b4bc2c61430cdf1f9de327226cbc768270b9d34817b2a81bfac74c58d3ac83f6c383eb87a6a1a31d2f2f86b0b5 SHA512 6cde5d764bad94fcff002bc3db7b878e7c53e01ed202dd7be2e36e710daaa709f0bfee2696932ff29dca95b0ab37892f0f0d12613e5249561c84ef94b48de2bc
-DIST texlive-module-hausarbeit-jura.source-2015.tar.xz 10368 BLAKE2B 3f1741b6d5cc0d8a2f53c68f0213d63a28a17eec004ab00e40adc155b39292b09a2b6f7a670a0fea53534f802a66e79cd18751fefd3fc31a494e313916f274cd SHA512 23bcc7452b7edef284c4e83fb21a9859ca5e66a05f19781503981edf2041891b2d86bb67de6b35c57c32a38320b7c73c940f2648707b599806f8c12ac436ff61
-DIST texlive-module-hausarbeit-jura.source-2016.tar.xz 12396 BLAKE2B 351fcfc64843012a1ce387fb9a758da852c1e3761092ae0189a68c1f96a6dd2180fc4974995603f776a64df06be36c9d9ff2e207910c82abc287271d60f3f50e SHA512 8e26e52defdfd8101a886f0ebd946ad84de7dadd9b1ba0d21409285d41cf3d9f41bebf1528ab014e69e5823c338ce5d437e3d004ccff16ad246e1736ba07f233
 DIST texlive-module-hausarbeit-jura.source-2017.tar.xz 12396 BLAKE2B 351fcfc64843012a1ce387fb9a758da852c1e3761092ae0189a68c1f96a6dd2180fc4974995603f776a64df06be36c9d9ff2e207910c82abc287271d60f3f50e SHA512 8e26e52defdfd8101a886f0ebd946ad84de7dadd9b1ba0d21409285d41cf3d9f41bebf1528ab014e69e5823c338ce5d437e3d004ccff16ad246e1736ba07f233
-DIST texlive-module-hyphen-german-2015.tar.xz 46652 BLAKE2B efb8d8003d5fe34eeefc8c8d61010302f3fb2df705c70d351301634522bf86556cfd693fef8b26b4a73ef96343129e2170f3a3c077410aacd22ec6b49b9cc0e6 SHA512 33118649711b5a65b21c3eb0f4c601df9276da29ddb080962806b1ee8471e1fa385d7e1ec06d0eb1100a7c8c21f706fe08086bdfe22e0de46d604a96c37f66b6
-DIST texlive-module-hyphen-german-2016.tar.xz 118284 BLAKE2B 20127a8a2c56f5cadcbee236610a6cb3f0047ae5d2617bce6f84b7064a42f2add1f77a4c4e5ede7c3114fe050beb76b09f42e9523159a47656cacf70ac2ae25d SHA512 2018a63a7c02326af069c60e00b27f4973a965e268693a1d7eeaca81e62367b736957f3e0464c85a9a44baa3847966805ecb5d256da27ad6b0737a5fdd6eb17f
 DIST texlive-module-hyphen-german-2017.tar.xz 152568 BLAKE2B aa1c44223b16e82a114fa2b70d52d26fa6985b544ebc71177ba4701574e83f4908b715a1bc4099a7e9f33c0896bbff13c4cb5092055d1fd41f50af76eab3b20e SHA512 712bdaf81f4e9fdeccd1ca90abd8d84eeb3d86f9cf7785a61911a1d490f7d4711646f523a6172e06ca5a1a8749d6d40ef21efc5942b854fa67c257650a5da1b4
-DIST texlive-module-koma-script-examples-2015.tar.xz 504 BLAKE2B 62686c93e8ef22500ebc4c5dcac39ebf0bf773bf0bf0012f400903ed1561d046e09853f7515c27cdf0a83ce73122439d2e948425c5d3b85c6c73da5bc9ebd3bd SHA512 35247101a08b9c45dfc3a267d3a544eca6b2c150d777c1fec6c1ac214c2eb3349e8775b0837fdcdf04a6300a392ad0f7a9f546dbc6b2842457dcc6bec5c4c321
-DIST texlive-module-koma-script-examples-2016.tar.xz 512 BLAKE2B f886be266741c326890b3bb6243ec95fba2d508c31ebd21d15c0a71fec5dfb8a465b3d7b06d4cc2464b26f5d779681a7c00d18872e3d5332d8ac64f44963fec0 SHA512 ef50bf353955937ee20f7603d4ef8353ee78c14b929b8d75666281d85ad40bb17589b356260a8665528904c295dce711d4388b7ae285ef62cf74b260027690ea
 DIST texlive-module-koma-script-examples-2017.tar.xz 512 BLAKE2B f886be266741c326890b3bb6243ec95fba2d508c31ebd21d15c0a71fec5dfb8a465b3d7b06d4cc2464b26f5d779681a7c00d18872e3d5332d8ac64f44963fec0 SHA512 ef50bf353955937ee20f7603d4ef8353ee78c14b929b8d75666281d85ad40bb17589b356260a8665528904c295dce711d4388b7ae285ef62cf74b260027690ea
-DIST texlive-module-koma-script-examples.doc-2015.tar.xz 451636 BLAKE2B 2cd662cd43df7b38a74c10ec96c9203b49b0272c81b7038d1569fdb02a9d7d66beb34edb0ed18721aaee7b9c7d0056fb8234a7f5f6b8fb741f6ca0870214e9dc SHA512 e1bcff9b355e4605441537c288844e2cae947af931950b87d07856ba08e36848d4e7a3aa8d14f3b04c210f9fa270b0e1d1cdee49b7125e329644120e851a15c0
-DIST texlive-module-koma-script-examples.doc-2016.tar.xz 451636 BLAKE2B 08e8e455ee962b40fbfeb9886dbcacc4a9a9242cba225d9affdd6c18552d4d69b2e6fbbafa7a94d915b55fc3b60f587221c30fe638ac68f7db2d9d422cabe4dd SHA512 3a1a154dbe46002cd04853692e0f73ed45196d7ceda0dce5a934aa36010b6d3af1775f786868fa56f83c38b5af0d0257f40ae6f110c01a3788ad55c4f398c7fd
 DIST texlive-module-koma-script-examples.doc-2017.tar.xz 451632 BLAKE2B ab4d33202f1adafaa03eaa79c9fbec39f3cb18f051acf036c77715e3cf4ef66f7e51c516acf8ad943a10dee27e521174cb3079e5b34f864f41fcecb563581663 SHA512 2181447cb7f62fde400d1c982188da82da305aee85c6f072a18af7f65659d95d220f6025abbcca01e7bb081eb328acad785b220d49bc213cfe154dbb3cbe1ee6
-DIST texlive-module-l2picfaq-2015.tar.xz 464 BLAKE2B 66320fdb1f3e96994e2f5f5a2af76872d9533fa34ec89bf08cd13bf882c049269d8579b6baab32ba18e0fa6b5f86e2b9a0240350605a6a8430846237befe54cd SHA512 42b19814b9c64a22c7fe3cebc18eeda1113b1b653598d20548dc15a12a9c902bf8954131af5aa0aed5a8d6caceb040475dc3e940cb17c9371bfc1eaa8d1edf11
-DIST texlive-module-l2picfaq-2016.tar.xz 484 BLAKE2B 4fa7f7df9dfacda2393d94c38692f1f883b97f05072445c3f7bc87814abeafd055adccd9a419946b69cc74c3d0466e91254e3c040bca257dcd5684068a9978d9 SHA512 18b8540bce46832d527bd69bf956007454ef9de010e5cedb67697f13ba5d5aee57b2a55865800de182922638e6b1bf85bddcf7c6ceb367a8c6c37944a05ebf18
 DIST texlive-module-l2picfaq-2017.tar.xz 484 BLAKE2B 4fa7f7df9dfacda2393d94c38692f1f883b97f05072445c3f7bc87814abeafd055adccd9a419946b69cc74c3d0466e91254e3c040bca257dcd5684068a9978d9 SHA512 18b8540bce46832d527bd69bf956007454ef9de010e5cedb67697f13ba5d5aee57b2a55865800de182922638e6b1bf85bddcf7c6ceb367a8c6c37944a05ebf18
-DIST texlive-module-l2picfaq.doc-2015.tar.xz 364384 BLAKE2B 5d8489a96e72cc3e93c524ce7f0c7ac51133f8ad6d622acf9cff2f6f758fffdc2148a449dbcfea17c139acc03335448a2f3e73020fea1f7974b0e3d456aa4d3f SHA512 86b7ea842aab329fed102ac80bc2c88d211564f1afafeb701106cbf5d7d1703ca2d9103437276affee5c84ea8c1c70edd85be3c10950edf1167760181e29d61d
-DIST texlive-module-l2picfaq.doc-2016.tar.xz 364380 BLAKE2B 1740177c9844e063e764c3a92cb969108fc8eb890ed3f02aa743ddc29d52757ae826f489f1ef623526ec0f3528f80227342bcb89a49625db1889b1b093b24179 SHA512 05146be4a1f9dc4ad14a1063473a820e980a08b339983efc552c41d7db61336be5e5d36fbec0453b24a5cabcd3dd7a3083d848ee4ce5301736b6bb057937ddc7
 DIST texlive-module-l2picfaq.doc-2017.tar.xz 364408 BLAKE2B 0c2978d110c920061d8e434e0472fc1b3cc0feb5c04db87031cf5c2ca9a12a3e27f8f528be585fc4ba3ad76bbb072c47ac3d7f70beef5130592d7b5ef932c5c9 SHA512 2d64b6a483a19b97461a2a6d35766e91a970dc026a3927b4f62b6a2c6ebdabc873c08fcdfd937ebfc462921cab3004d6c52ccd738fd2dd730c20043ca93235f2
-DIST texlive-module-l2tabu-2015.tar.xz 484 BLAKE2B 2c1474aceced5d68bbda5edd7301f8f502fd02d31ca7860469a137051185a628b03aee1782b163f78443e0cd38014ca410beb309ff2fcea82efc153372d3a9b1 SHA512 1638be3ea133af365e7be379462fac2cfc86067ec85ffc9a2635e58e759bc68ea64cdb1934e5111c312c0893e8958051f5501359bba51b09b04e85404dfdead7
-DIST texlive-module-l2tabu-2016.tar.xz 500 BLAKE2B 74de464bf2d6db64ce4ea9316e468edba795bfb43e7a690a7ba85b2ac27286310b195b4233788c458aba824a891f958f7301d21e9d55f27ef6b9ab344183057d SHA512 ba294c511a20706ba96017b6b75291643bbc8571c17302aaa05ba2b0ea0b5bc3032aaf4234a0bee86c7f19a87d6bb9b1a721d22b2cdf7527b61fc07da8ce1e38
 DIST texlive-module-l2tabu-2017.tar.xz 496 BLAKE2B 1f4cb645d93b508841a7e919ea1df1ba846478504053f840e28debca637e1c02e1499b96b600e8c03e751904b60028f298c08a617b1874b4d23a4f448f3d15d6 SHA512 7acd1493b182409576b818174b3673ba78530167ef3dd6e3d773c19e0dbb201ea969e39c6dcbd5d2f6565c218bfee2cf88628af2fbb17c036a001a679ef6efed
-DIST texlive-module-l2tabu.doc-2015.tar.xz 254088 BLAKE2B c006c182d348dca30467a767e277a4f4dfeaca29c722933c3dbaedb4a85002026fe6cff2b721f839774ac11788dcd8b9167f1df2c500dd919b3d8ae279b43b7e SHA512 c625feadd1007b4f104f532cc3c8dc7d5314357638ea08fbb08d700b11656e20b8ec10c4ef2a575bd7ce879e11a2fb41bf118cab5bc69d18deb44af093ec4d2d
-DIST texlive-module-l2tabu.doc-2016.tar.xz 245468 BLAKE2B 32b1b142498c1dfb573c2d3dc719c1bbdd2f6bddf262dbe351f9d4768a0706dc252f5f33f7194d2c062be2443f443ad28dcb586b7d5e4d8bae020257575628d5 SHA512 6245eeb56149c56bb5ac6c21228a03589e703eb4c99d562163138ddd72722f757b8a01dc6433289cd34341f2fd82247b19e662c2b3fd56780b75f6d41e567981
 DIST texlive-module-l2tabu.doc-2017.tar.xz 245460 BLAKE2B b9b3435ec5e9e16c1c0672c135fa3b94725bdbb9ae5acc0d19649a5a756b9d101e6123dfe7db3a9187abdf0ca711ddd4bf2234cc993e2ad8ea1b7904ffa3616b SHA512 337f714f0f26c753bf98a22eed59503183e808822c485c2ba3eafae8cc4638d84330beae98e59f822a8b0b287d1d5cffce7696c8d3df6e93652d34552339c3af
-DIST texlive-module-latex-bib-ex-2015.tar.xz 452 BLAKE2B 3aabca831d200a052f7017ea9928357306bdf0bf37b3c1ab9fd3ba77d9c537f39c37e3088d157e9c8099935f3fb21ce8749b6c9181cdedae52addbfbf1a6d8ee SHA512 97e11b72ec99daa136b71055d9712ea5d0259eb8845e8994301ac026d3192297476c85d9501f4d44c903fac9f633658d0a7ebcbc823db52fcf375338b7f8802d
-DIST texlive-module-latex-bib-ex-2016.tar.xz 464 BLAKE2B c5b830a2aee66a4124ba5af98d3556eb3226c325227cec9e0c3417d29cc73807fd156d72147f534d966d83f55d40c0c2b9941c6f70c885d52efe0119e4d09db7 SHA512 397fa05c6130cd99804713b113613918b675c22d0b3accf7182ad66db950b8aa10f35dc84498bb4a9fa86809a4ec2f5b61dc7b577f97bcbce8516492efed5848
 DIST texlive-module-latex-bib-ex-2017.tar.xz 464 BLAKE2B c5b830a2aee66a4124ba5af98d3556eb3226c325227cec9e0c3417d29cc73807fd156d72147f534d966d83f55d40c0c2b9941c6f70c885d52efe0119e4d09db7 SHA512 397fa05c6130cd99804713b113613918b675c22d0b3accf7182ad66db950b8aa10f35dc84498bb4a9fa86809a4ec2f5b61dc7b577f97bcbce8516492efed5848
-DIST texlive-module-latex-bib-ex.doc-2015.tar.xz 49552 BLAKE2B 7cffad951d6e984a80d5ffec0b4ae902cf224bae4c1b2c0f06c1d6fefc64dc2907131c9c51ff5ac277522674f4834a02364b3422ca6a26a0b4f5f67844cd63ef SHA512 9c4eaafca3f50ea631af8bbf1f1c680ec0a6df104d28d226742907d04a84ebe154a57943f0df2ef26f889d8d18a4ed558a64901c521190e3b9d1c7e80bb44e31
-DIST texlive-module-latex-bib-ex.doc-2016.tar.xz 49552 BLAKE2B 19802262805c4272fd823b8b9b27bb296292cebfc3d35549a13505c1ac26c9f9391756c60324b80b657943c57de39bb91b516470331d2e839b1aeaf8b75e7d19 SHA512 5e53ad72209a25ce81071bce71ea6d6a1eef2dc33ca506e0728ac2a13aae04529c5cd2d3e0130ccc66e69ad6062050f54b084a60cd960e2171278cb0296726e1
 DIST texlive-module-latex-bib-ex.doc-2017.tar.xz 49552 BLAKE2B 19802262805c4272fd823b8b9b27bb296292cebfc3d35549a13505c1ac26c9f9391756c60324b80b657943c57de39bb91b516470331d2e839b1aeaf8b75e7d19 SHA512 5e53ad72209a25ce81071bce71ea6d6a1eef2dc33ca506e0728ac2a13aae04529c5cd2d3e0130ccc66e69ad6062050f54b084a60cd960e2171278cb0296726e1
-DIST texlive-module-latex-bib2-ex-2016.tar.xz 456 BLAKE2B b8a3f116843aa2a66df68d7c3e7f29ca82430888a37e1f73c91e1abd288458cdfbb41a0e12223e4fb46a2972a29cbadf0cb2bfa2253801ff61d0e83782184681 SHA512 d183ef3dcf353c5bf8fc84a376782298d923955e96e3884e9605c273a2488dd46370790ad40e23b08eacc6a6b83e991fca309ad9498d30fdf174d37a841bff72
 DIST texlive-module-latex-bib2-ex-2017.tar.xz 456 BLAKE2B b8a3f116843aa2a66df68d7c3e7f29ca82430888a37e1f73c91e1abd288458cdfbb41a0e12223e4fb46a2972a29cbadf0cb2bfa2253801ff61d0e83782184681 SHA512 d183ef3dcf353c5bf8fc84a376782298d923955e96e3884e9605c273a2488dd46370790ad40e23b08eacc6a6b83e991fca309ad9498d30fdf174d37a841bff72
-DIST texlive-module-latex-bib2-ex.doc-2016.tar.xz 180084 BLAKE2B 20d3a3e724e522ff4293a4a62930499103e7289db3acb67fe07759c63be6c226f6846ed7a8b50de8d17974f65a2e607700d019b0e3ea5237ae936ef7ad9600d7 SHA512 9e091281a9804f17c3bcca00acca8269d8a92d5b7a4b2049429a41ee9d950255d443161d81f80d1c4d759e448fb226c2e795991cb4d6534beda1d551e0b1bb2c
 DIST texlive-module-latex-bib2-ex.doc-2017.tar.xz 180060 BLAKE2B 011081dbed3c326b9e7dff4f754dac67bdeb072e1676164190a8736d3233b645d166844b2ffc32330bee50e3e566919a8240f567010bf21dda501c84fa0cfbe3 SHA512 df256a11f460746bbfa7a59a715f9d6cdf641f7adddb9158b365f4ff26fd7d370737422b0e82d6a45a406060dbd2d0efe1a8e2b77ae97f5d699062ad3e686ef5
-DIST texlive-module-latex-referenz-2015.tar.xz 508 BLAKE2B 2358bb998af30277976b6292249ee66c02d111ff2d8d61e29e90bff92a3349825589eef93940393ad8010dda3e2d0c951e4763c6a50156db2d60009630266fd5 SHA512 93370f82d24737b031dd6b1e9a44ecf7a2195be680268261de698c28083fb517b46fdf844310b495947cf0b0b2f21ff3789c521af0c156be87cf41d3f2a1672b
-DIST texlive-module-latex-referenz-2016.tar.xz 516 BLAKE2B a8ba09e460b5105a78b93dbed0c6266f07618586d5fea6173a9c2005030b3f8cdaab0e88bf3addebe5acb4147b98480e77546c6b60e2bac42df7b05321d8dd8b SHA512 5c6faf14eadcb709111ea521e66d7005e4aa8a896efcca5053986b912440d61e9d342ef8945d8decf4906cd86afbed69a8bcb56939d2639fab9d86c66c895e7d
 DIST texlive-module-latex-referenz-2017.tar.xz 516 BLAKE2B a8ba09e460b5105a78b93dbed0c6266f07618586d5fea6173a9c2005030b3f8cdaab0e88bf3addebe5acb4147b98480e77546c6b60e2bac42df7b05321d8dd8b SHA512 5c6faf14eadcb709111ea521e66d7005e4aa8a896efcca5053986b912440d61e9d342ef8945d8decf4906cd86afbed69a8bcb56939d2639fab9d86c66c895e7d
-DIST texlive-module-latex-referenz.doc-2015.tar.xz 98680 BLAKE2B 772090d970274d304502962bac455b10c351920a23c866e525f9f149914ac31ac35e225879318ccc3277f5019bd12f50ebfc56c8b82fbab33e509728e0230d5a SHA512 655e348380d083d076aa77e175ea8235e923af2d71a2b289dad2df824f7f26b014f7652500633051ebdabca565d975539db900741663f1912e8e12373e1f5b83
-DIST texlive-module-latex-referenz.doc-2016.tar.xz 98684 BLAKE2B daffb4335d79ca15fa323686c77589f005d6ce4e2178e0a7d16d83b3affb520fbf50f6f88a0ed433f2c1db4b59480f93354d31d90ea74c07e46fd456e85b984e SHA512 a61b888cae36853a392d1f6f8fdbebc7b6c4296836882de311de953852eafb6815716bc0eea6c1910c4e806a228c954c7a19a46b41b2d5204923f5f6d50b218b
 DIST texlive-module-latex-referenz.doc-2017.tar.xz 98684 BLAKE2B daffb4335d79ca15fa323686c77589f005d6ce4e2178e0a7d16d83b3affb520fbf50f6f88a0ed433f2c1db4b59480f93354d31d90ea74c07e46fd456e85b984e SHA512 a61b888cae36853a392d1f6f8fdbebc7b6c4296836882de311de953852eafb6815716bc0eea6c1910c4e806a228c954c7a19a46b41b2d5204923f5f6d50b218b
-DIST texlive-module-latex-tabellen-2015.tar.xz 372 BLAKE2B 3e2ecfb5cb034fd1fed15dfcc6b67ebc0c404b7361fb4627c1c9cf5a21bf9083c758abf638ef858e9ad769153e6c297813169409d713e9829477d847324c1e1d SHA512 6ef8aa490d2f02f123a45389cf23a6cc6781bf686dd9776108c60874b5d695951a038f5027876f73615b763f098a4c0fd973d531f7144fa9f3668d4937ead3ac
-DIST texlive-module-latex-tabellen-2016.tar.xz 384 BLAKE2B 24eb68564d8a4d33efca3e1834a7dacef92b6c1530c88303bf07634005b7b4c67af8c29e73a92288f27a0389ae3013172595d20f1b043086ae460c9e2bf60558 SHA512 828fc00166f0b39a92943808c73ae764d0d8f7ba86993829f6d565065c635cad36d089f27f38982c1b1c5239582621639a5030c4ce145634d97dc8ea9801e869
 DIST texlive-module-latex-tabellen-2017.tar.xz 384 BLAKE2B 24eb68564d8a4d33efca3e1834a7dacef92b6c1530c88303bf07634005b7b4c67af8c29e73a92288f27a0389ae3013172595d20f1b043086ae460c9e2bf60558 SHA512 828fc00166f0b39a92943808c73ae764d0d8f7ba86993829f6d565065c635cad36d089f27f38982c1b1c5239582621639a5030c4ce145634d97dc8ea9801e869
-DIST texlive-module-latex-tabellen.doc-2015.tar.xz 45788 BLAKE2B 828c6190df7fae781c4ce55ad388532f616707dc63a745b88eb4572b7fd6acfcc94fc3812aedc0a4e0675b8a5a4754e6f279acf657b154522d9ed4b15b577194 SHA512 da8f2b958503ca45bc3a15f102972700a4134b0cc1907a5dd3b55b0402fed3a651f335110e5ffdc4de89382ee9e06c13bda721c58295f12a440dc03ed19f5909
-DIST texlive-module-latex-tabellen.doc-2016.tar.xz 45792 BLAKE2B 812d08b17fcc8fbf968e2cded6649eecef112812eac8a3af2fa3c17c2918d8e5afef7343dfa2ae5d845d9a8ef594e4439d727f13f4a7583207574a1e7bf16bfc SHA512 4effcc9dd7dd57a271add62aac6a5e61ab5bed3aaa3896ed7c37bf6124795d1a3c5ef2a035b8dbb4dcf14a26f7d916b8d44da21e5249bce65625f39ae1405834
 DIST texlive-module-latex-tabellen.doc-2017.tar.xz 45768 BLAKE2B 25d45e894ca3eaaa1f2cbfa46aeafc777d3dba22dfbe932220530e27d203b29a451544fa3599a0dfd64f32df15f9ce80c336202d1f4084f0658f47ddbde78894 SHA512 4cfeb0a3a63549c1cb5636784b49b3308b533f6050ff78de01e468f1c7d3472807fb4a24ac3d9387e4a6891eeeaedff44ba31d1a6a611eef35c39175d40d8590
-DIST texlive-module-latexcheat-de-2015.tar.xz 476 BLAKE2B 9f5015d460cfe0ca051fea969751c7e06a8fd653f0b91459579ebd0c915e6e09c0ea2a38ff46d991e6e08a87ba95bbba8f83a3b1fecb37e518b4d1d2d602eedb SHA512 54cbcad9db3370d5859ba94a2094ce12ceecea68c4127f3029992adc49106f1f3254fa607b74cb38568dea0257ee08d60767a637d6238ef1893f5cdbdaa8b85b
-DIST texlive-module-latexcheat-de-2016.tar.xz 496 BLAKE2B e72df501515f0ab9634762996f32bdf5be9846bfd0b9ac242c53969b5ce3a08d161476dbee34ff930ebe444092780309b2d68d84ddfc41b7cf1da850ab681563 SHA512 d8367dc90a2ab17b61159ea6abe4cdae20c68bb8540cd4223b96b52476665ad21ae1b050aac28d356204842be31b5248ce7d3ea14c33fa06a3b916d47b993f66
 DIST texlive-module-latexcheat-de-2017.tar.xz 496 BLAKE2B d5b1bdbf1279f832173b4581db1791ad755685af81b6ae4f2ba89282926d4893abd9927bcbfe33a3e1f46d50165dd3e0f506963c4ab4b9969be3c66bf8f30afc SHA512 0c6b033e7f04d9ace3d0aaf242ac82303c3c1d4490fb935f6898caca34b63522df5bb127d3537a1b10ce74ae0dc9cc1dd4d90941706816495934d890c11a2f8d
-DIST texlive-module-latexcheat-de.doc-2015.tar.xz 528444 BLAKE2B bd4c8d57f6989fbb516530fbada1f224f577a2a107e6a5c6900d22451db0d666d787ceb76e1b622bd7fac17c0a2c5877f8eb2b81003e02ae3d7ebadcdedffa3c SHA512 a77aded80cff655f2e30ae330c80c267367e9a687d142c8f964589ff8897b04402ab7a045f1b83a348b67c0640220d9133ee5d31c01ed75d4e563f6d447dec93
-DIST texlive-module-latexcheat-de.doc-2016.tar.xz 528444 BLAKE2B 886e52556b4da13b44847bfffcd60278d34cce103698f363fa51b9f2a028ca8f5899bc9ca5d33851286d29e6a72c585282d31cc539a85819588c0497a68b3efb SHA512 333bcbd17a806d823d7823f87189b7d57a451ef33dd921adddfcf7390c7e0c387dea4a62668d2a7564bd011a240c248036153c633986c2f20d3183d5616aaacd
 DIST texlive-module-latexcheat-de.doc-2017.tar.xz 528444 BLAKE2B 33461690a3e9132540a5c99ee4e8a0ca1795e8d9bf9e262548e4fcb254a11a4e54110fc5b246d6fd41808b464838886f552660254f4b64b4fe5a25d298577aa6 SHA512 267eba0aaa0c48e1f57b9d155996b518955bccf705455d45af4b84d9e07073df743dcace80aa44710349f415a32494bd7dc1eb5da27a0c55567d1d22df53c5f5
-DIST texlive-module-lshort-german-2015.tar.xz 372 BLAKE2B bae1e1dec48ecde9219615e012301410cf0cb3dd40dc6dbe0bd4ab9da726017ddb3a717469b8def495da75fc031d28f89ef350a0e62095da8b22fa67a0b6ada0 SHA512 a4013af10d6e6681e9997ae1c863c264719585e5888776032f844008474e3c06e672702f62e35459a95437e5274018291b1be5b437a49f38a2711bc1402ad4a5
-DIST texlive-module-lshort-german-2016.tar.xz 392 BLAKE2B e63affc69cbb38074d4065bb7f84c7e240c8117905081213fd16c7494a4dfe53d909bb7cf17ea3e35c42112b7702360274bb6b814689441f1fab7fb16f08a7c1 SHA512 c3500e179dd30b430c2a7c5231bcf1300c78e7b3960e9bf9cf80e1af9b58237f306cfe5d35460d832a032564b82dc03104f97aafda9da986a1fe600f3b9cd7af
 DIST texlive-module-lshort-german-2017.tar.xz 392 BLAKE2B 86ce8097ebf5330f0d1da6674d731738f24ed1e50f9e1b7ed1d019dd3d1b2a06139a044a6f64b87073ab7bbeb31da10d20bb1719a9d80492a8ca28982f9846b3 SHA512 c3eab626a050dc2648a3c537b1659a0d04cff5400ec345cff3689859c146f030af49551c2216f786cbb7b8161f2e4c8c1c4aa3f75e73a280d833d0c703cc112a
-DIST texlive-module-lshort-german.doc-2015.tar.xz 930384 BLAKE2B c012efe74500f569600969dd5cec7d5d14426010d4989ae82384b043d9ec5206fc3b1e721f3ec1d295486ea6552ce85de75a103d91e6e8848871bba4e42f1c1b SHA512 fb47c6e6d6a45ddc8941457cd12790291f5801d3a022c0130532f71e4198eb942d7494d5e36ad901601e2d022e8134ca8e348f0e02533f2e1afe70eeb632491a
-DIST texlive-module-lshort-german.doc-2016.tar.xz 930280 BLAKE2B 079979bf3a4fcfdd8574142c9bc464b047dfc4cdeb4ebf1d95530c55fe03a06ec446c0b396941f5501191623c7ab4b01d455109cc0aa9dc1f7d359fbe3cbc17d SHA512 5907278978526098861a9e204b7a15b76f46fc2491d2a103f2108c365828167daaf7bc4f9b2130cd3f994453bd65ba17bbc4e4bfa23e1a0741916152172de543
 DIST texlive-module-lshort-german.doc-2017.tar.xz 930288 BLAKE2B e1c4c483458f803e82137eb12e9b347d7823f1c5d5bf76cc011cc47e974802990f31240e78d7ad560dc41c1cfad6a515fcfad3a9d9ec3da1bba109330f7f463c SHA512 3ac4a23508444fda57773f131ca41ba532d0718d95aa9730ec5675971722797c7ad0e4c204a4c9c48d5803faefc3d109f8981f0429138a54e248105d39271129
-DIST texlive-module-lualatex-doc-de-2015.tar.xz 524 BLAKE2B 4d6082645da6e2f059365305bdcc923a644ee2f51bce3d669b547ab74d757ea4a78f9818ceeae8a77532d4d3dbebb4777925571e2679faa42676a4ebccc0a34a SHA512 64b7f83b9669ca581375d7683a3e429c6d4c8f3362603f8c37194be4f0d3afc5914bb37b4bff2d2bec03b14a5184bfa52ee27139d1a7797bdcfb6e05abe5a36e
-DIST texlive-module-lualatex-doc-de-2016.tar.xz 540 BLAKE2B 8dfdcf6ff420955955b8f5e77cdffdc148b64d4a9397682967f8fb09228ec3fff8a9e1426bc1391c0ca948c5370d3d7cd6d1cf41c02dab644f2227c382d8d18d SHA512 a743ff6414d7cce4545fe5a46ed2aa8875667aae6665ffd76d04c9d9058757933950f92e2216916403c73a6d10f8c5695a3ed703fd2f97b1938b289f3bc72e4e
 DIST texlive-module-lualatex-doc-de-2017.tar.xz 540 BLAKE2B 8dfdcf6ff420955955b8f5e77cdffdc148b64d4a9397682967f8fb09228ec3fff8a9e1426bc1391c0ca948c5370d3d7cd6d1cf41c02dab644f2227c382d8d18d SHA512 a743ff6414d7cce4545fe5a46ed2aa8875667aae6665ffd76d04c9d9058757933950f92e2216916403c73a6d10f8c5695a3ed703fd2f97b1938b289f3bc72e4e
-DIST texlive-module-lualatex-doc-de.doc-2015.tar.xz 137624 BLAKE2B 9929f21273108b0d2163269fe2a54efe649de707f97a4b7a08fb049d81decc7b499573196c10894d128242073f78512c994ce08789b5805964107640887d9883 SHA512 b5e86587a4d29e88f5a6465e5dd72e67cefe14e770533845bd7bb8911c8900ded3e0cd30345549828933d75b0f0bd18d895863a9d1aad9dab00f7afff887719c
-DIST texlive-module-lualatex-doc-de.doc-2016.tar.xz 137624 BLAKE2B 60b88fbe08b1be3c71d5458bb08c462bdc3a44a7dd8e08e57491d44663a698f3331e9ff8c26cc221fb855b079be3bc62450962e3becf70886af4ccaea73def4b SHA512 06abdeaf20065636852ba8ee2075603d3ca6cf75ffbf8e1f189c45d2d4ee49cf25e2544fba0404b655a949b5cfec6f2f53515ce323f7f84e35b496e77bc6b90f
 DIST texlive-module-lualatex-doc-de.doc-2017.tar.xz 137624 BLAKE2B 60b88fbe08b1be3c71d5458bb08c462bdc3a44a7dd8e08e57491d44663a698f3331e9ff8c26cc221fb855b079be3bc62450962e3becf70886af4ccaea73def4b SHA512 06abdeaf20065636852ba8ee2075603d3ca6cf75ffbf8e1f189c45d2d4ee49cf25e2544fba0404b655a949b5cfec6f2f53515ce323f7f84e35b496e77bc6b90f
-DIST texlive-module-microtype-de-2015.tar.xz 364 BLAKE2B 74f15df70f676480cfe79f1af747985f341b95b1d9353c8aeb41f8611d1ae9ccdf3f57f51d82d195edd69ee81e6a062fbfdff6d50e12fafe455b3c7faec94d7d SHA512 40fbb2bfba835c081fed60fab900cebb1ea1396cfef69d847c90733c13670ddb0e62b1a61ff114778819499729f434b18d54b9d3b1da401818e47a49eabfaf49
-DIST texlive-module-microtype-de-2016.tar.xz 388 BLAKE2B 1a45ff8ed70bb92b50fbdfabda80fffc5897d4d4033aff4a53dfe8adebd23ba078a32ca75d17d28827ff6bc8045e6f6df4bc1c5656ac39c2619cf5590b4773e5 SHA512 86271be9ce9161243adba327c8059cb480972007f723d0f7c6493633030078b82b48532d04f790be05cc02cc325e6dd9fa739bd66fe03023a5f7efde0e55ea18
 DIST texlive-module-microtype-de-2017.tar.xz 388 BLAKE2B 1a45ff8ed70bb92b50fbdfabda80fffc5897d4d4033aff4a53dfe8adebd23ba078a32ca75d17d28827ff6bc8045e6f6df4bc1c5656ac39c2619cf5590b4773e5 SHA512 86271be9ce9161243adba327c8059cb480972007f723d0f7c6493633030078b82b48532d04f790be05cc02cc325e6dd9fa739bd66fe03023a5f7efde0e55ea18
-DIST texlive-module-microtype-de.doc-2015.tar.xz 1378208 BLAKE2B 35f5f0bde87ec8f536817e2c670ae0464c34935a4b06adb05ce8664d416f75fd560b010063276262c63a37045324853780e9b9ca526771b81297d8291ad7c5d8 SHA512 fecad010893c511d74c12ee2b35da8a5a8c948478b5418fda2acd828d80adfec148564183f82998359f52c6e9365b10f37d21fdeea4c31d58c84d90445446d1e
-DIST texlive-module-microtype-de.doc-2016.tar.xz 1378208 BLAKE2B 64a47c946af97645f25073464606dcdb3ff5e188dbe9d6da1899735793743dfcd11ff8d30a86a95c43ec39c1faeda7983064e16a006ed6c693d4905149d0f251 SHA512 b928e840c4ef829d9396c57d90ff694e911f1d2375b4aa47a13a90524e816d33711d6ce187abf45443fd514b8e70848c2aadebcec1746e7c1e2f186c1b8389e2
 DIST texlive-module-microtype-de.doc-2017.tar.xz 1378204 BLAKE2B 77f9a8a3c8a41db374c2b1ad2af295bb937344d71c9e84ea3d6b282c794f17d5f6fb4bbf555f18743af731ee400b5d4bb2ef97e5dce90e9780820127e968e0dc SHA512 04e6685f0234ed3f02cf5b2e948ddb61bae78cf3f01affd23d5305047ae20b4b7a97d625b00475054685fba53d1249ca4b93d7a45297c430e241a633a822d829
-DIST texlive-module-milog-2016.tar.xz 3104 BLAKE2B fa69812b4e9ff3d4d5a2b78cf665541e97987ded57cfc9133b4dfb365553934fe1a7c9ac2ba02af632f6aec0742c2f79ff4794ff3eb1531aef700310c48c9543 SHA512 ef3db9f50e5a83f383f532e57f5d8f17bfa01887661edca76835930406b06cfbb98874e554517f9a2adf77f3c5ff6a90e99876e1aba05daaf7f2183514bc55b9
 DIST texlive-module-milog-2017.tar.xz 3104 BLAKE2B 288be2c2b11c530f10bf3b917322ef643949a6ed3a84d05e631dd96b32b2b29f1a7041cb37ca354f9496a38c088014c87086e6280ed88300e0adc63c31c5d04d SHA512 132f918b0e0dcd93c125349d40804fd19a7cc47b02de338102340a029ab4a32ce8fbac6fa8f68d479676bf72dfce3e6216f62913857284fc4d2dae879dcaa7e9
-DIST texlive-module-milog.doc-2016.tar.xz 404068 BLAKE2B 4d94e0f95b5828b35a2f3ab8eb50ae925791363d9205c6b30af6b84d86c888faba78681f5fcc1db8c100300888c6fe4213407a906c6d02af663fa1b7f65ff381 SHA512 2e929ec3dce13279c6f9cf3f98771b5501c01bd0756cc17231d5306b7e1e55725d152e1abe9c4281623bd33565285c2def81b63b71e005ac2faf0c032b61f293
 DIST texlive-module-milog.doc-2017.tar.xz 404096 BLAKE2B 2bed221caacc4b849efa5e8a49784254a7a04a06246e99177ab4e0b252b1d16bde30bdf75af9545c07c3783b20903d03355cf0a29c123a298513e2a048408677 SHA512 6f39308c119137ff1862db7d886fc5b5b1e871bd534e80c22056a63426ef34862f800bcf72992164799ed7cc793947636253a692a10ae73d9628425458c99297
-DIST texlive-module-presentations-2015.tar.xz 444 BLAKE2B 8ace007a29bd5a79f7822be3e198214079032b308c054a27339dee59945ba011ec94e013425b574b86caa0516d370034f78a80000602c7df9316f17af656b4f0 SHA512 3b8878c19c42f4f39d45ad95b3f132fcc0d31da9ac52e28d2ead8339e3a80fd1301373800aa74e2310de4322c629a825d52ad6835cc11440834feac6c5f16831
-DIST texlive-module-presentations-2016.tar.xz 456 BLAKE2B 66d2c9f5dc72946d11b674d9ce5a23414aadb7eec89718af8469e81d29d52adc608e03fd8dc4a022c2042207164ecb11d8140cc434d9d18ba00cdca4a5493884 SHA512 13df6526db9dfefd6476571e5c878258b8934a738b31ce26629570dbf904dd0e76e03e7257f61a590bfb70c1d404b7a02a5824a46bf307d96b1fa301064914c8
 DIST texlive-module-presentations-2017.tar.xz 456 BLAKE2B 66d2c9f5dc72946d11b674d9ce5a23414aadb7eec89718af8469e81d29d52adc608e03fd8dc4a022c2042207164ecb11d8140cc434d9d18ba00cdca4a5493884 SHA512 13df6526db9dfefd6476571e5c878258b8934a738b31ce26629570dbf904dd0e76e03e7257f61a590bfb70c1d404b7a02a5824a46bf307d96b1fa301064914c8
-DIST texlive-module-presentations.doc-2015.tar.xz 4076768 BLAKE2B d345c8daa8de8241675ce3a8f72a0b35440931ec964e2348a7796cc19af0e84d2858f2c2757d82e3a7490781e51c9c720a9825572cb720c291739f5724f31005 SHA512 5a33393f9686e729c7ddc340e7de49142d48036997ebe25b8f5dedfa9fa3447342d2b4c0b82d320f8f48006ca01f3c036c51c4fdeb20bcd86110852a73942f40
-DIST texlive-module-presentations.doc-2016.tar.xz 4076768 BLAKE2B 68fc6d9e6942c7425a133bb230b580446daa6dd428815cae30aa138e7a5a7e67e3466f0b4a7c381fe031e013b2f189167bf94754156c05661604311b6e71b966 SHA512 563b20dc9c6083a5ed2cec96bf2f9af5a2f3e3b825f7240dc0ba053e9b5215a95181a7bed682a00b6ef092fbbc3eb4dfef24bf35677a57689d75e008d9c70b51
 DIST texlive-module-presentations.doc-2017.tar.xz 4076600 BLAKE2B 9f1104e2fe18e336c78f06867a91064292cae79ed4da2f815da12d4cbb564761c91f1d6c32ab92802f1b7367068fb763105021b63911d4362ee611322419ee40 SHA512 da145e1c53cdb6689e4e9342194eace169f3a56a66379e1fe31f5e7cfe4100622aef2e2fe45966a865ca73969df79b74363879143c8759feadaab81b9f1905d1
-DIST texlive-module-pstricks-examples-2015.tar.xz 404 BLAKE2B c341a84d7b154d2ec7f241fbb7008093201d2e3ee5c605698b16fab3a8254cfd23baddfd305b75e347bec04516603a28a5df384b99b42c5f0b6fdcf280b3b605 SHA512 c481f393d8028aa399fa2fd4f9a212fd2a318c5d0ac4657dcfb8e6451f472eb1e6e5ca9245bab5082c65721ff1a876d0a566b6b5ad37fcd67a581f146610a946
-DIST texlive-module-pstricks-examples.doc-2015.tar.xz 405304 BLAKE2B 8ad4e6567ea933d97d3bb798735702d127d8183429ceeebcfec69674ed89605cdeebcf6ecda91785ee0607ce7829479a7efc905a760866315d5f419c094c9450 SHA512 037b068fb624096f3dd837a25015ba21ad2f12086eba01533c2f5434b94f5ea6716ae7ba5cf05146cf4f2eadf0f12f2894c5f00a461af923c0188287fa2f5bc1
-DIST texlive-module-r_und_s-2015.tar.xz 15420 BLAKE2B 02195b6070be9626bcb449408990b9f83e5891aec852b1c6de8cfc5a23b9c612e17d616d5753dd199acf8794c2176585262e6694ac393bce442691d71650efbd SHA512 e39748aa921d45b735b6398aedd2db5dc9561ada2afcd7e891efdfa9312a17ba4a68a6d2b29ff50a1b5179ce55970259c1dd213d873230cfca42414f242522d0
-DIST texlive-module-r_und_s-2016.tar.xz 15444 BLAKE2B 1f40b2e74a1fdbe0f3bc51b8aa89450a498c4ba71006621ef7f6c5388ccc605862cef57be4b531e9153664b782f2e9a5635fd5efe653968642de2b934cc1b9fc SHA512 b5338c223aaecb33edd1694d1e1450f9533e4dc6baa2320ecb96b6c9428c221c58c9fc009bcb73cae25f5a04d0c927674cd3fb07ffa82b4ff59f3fae08e8fb30
 DIST texlive-module-r_und_s-2017.tar.xz 15444 BLAKE2B 1f40b2e74a1fdbe0f3bc51b8aa89450a498c4ba71006621ef7f6c5388ccc605862cef57be4b531e9153664b782f2e9a5635fd5efe653968642de2b934cc1b9fc SHA512 b5338c223aaecb33edd1694d1e1450f9533e4dc6baa2320ecb96b6c9428c221c58c9fc009bcb73cae25f5a04d0c927674cd3fb07ffa82b4ff59f3fae08e8fb30
-DIST texlive-module-r_und_s.doc-2015.tar.xz 3584 BLAKE2B c68432f54849e1412824f8121e56b33f75862a898d1026dd42978b50a483e0fb28de19cc8782a26395f5766c04dfda4f812f2a82d4ad7947965b2982ba1bead5 SHA512 0dcaf4962739787500d24c95c7862884fb03b8d6dd407a88262984fd64bc0a18fc40b046e3e199f6760ed7baa98ccc1dfcdf7be3348b6d9ba8a9b43471f8f653
-DIST texlive-module-r_und_s.doc-2016.tar.xz 3584 BLAKE2B 3f31f4252fa97544f7fead7a0f47168fc0ee1485f060811fe3605cd3faa3decc9ebcf82fa0f780ca2e16b80a8df313036210c9785393a59e2edf2c73022a68e5 SHA512 6dc4c3739199c4a89bcd000f78a7af4d4b8b7b4824580e5b82766f208f7150adf9f79ebde2e39b567a9eca45178c5ec9607345aeaa14bf5005a1c8292c5f402b
 DIST texlive-module-r_und_s.doc-2017.tar.xz 3584 BLAKE2B ba8b181ce3a2cfc35cc3a3a0958e12d7db22a9a7b4bc49d958d016bfcbe9b9619b36adbda705b1a93fd7a961548806e8e04bb3c423a89ffb04d73f69ea52e229 SHA512 c9ff5ae725137af07f77e18e019b7a81df670371b4db499a99cc9bc9c29b676d8c71f85de9025582066d288af2cf331fa8272452efa373c54a220358767026ae
-DIST texlive-module-templates-fenn-2015.tar.xz 660 BLAKE2B 7741a649e63f6a6cfd721c1ab199b1814062d074c8e87a18097b056651f36272e08750f1ef21f7fba6868c60f69c77da108bd7f10fef312d39ee4ab04b537bdc SHA512 b2b1e678e322a089c7e4c890e1555f8702adbec942b1450a3ef1fec4f7bf1e0bbccceb47dc4817c92656527757efce33b14f1036a54487b9a07f003f7c6f4e1a
-DIST texlive-module-templates-fenn-2016.tar.xz 668 BLAKE2B c267c7560234dcd5a5253cd96905f81ba7a3e52a23684755d45dbd31a53bfab89127d219f0bf44f1e36c1415250e5023c38a29003d7f412375eb2695cfe24668 SHA512 a7e82db816b2010f9ef23571dcd3b02fffe87a65d8c6842192700c2209f395a09102a41038ee818073a608c6bb32465b1075951c58b4e6da2204716a33bd15ff
 DIST texlive-module-templates-fenn-2017.tar.xz 668 BLAKE2B c267c7560234dcd5a5253cd96905f81ba7a3e52a23684755d45dbd31a53bfab89127d219f0bf44f1e36c1415250e5023c38a29003d7f412375eb2695cfe24668 SHA512 a7e82db816b2010f9ef23571dcd3b02fffe87a65d8c6842192700c2209f395a09102a41038ee818073a608c6bb32465b1075951c58b4e6da2204716a33bd15ff
-DIST texlive-module-templates-fenn.doc-2015.tar.xz 5996 BLAKE2B 95a5c0763cf320a46eb9a0c46c111f7bb1a63e50ddb9975b627696db908357d09c7716ba1fce7d3beb2a2532a9d1727619b4c031bfd8eb7577b0cf11855c8f74 SHA512 3eda499853056c1d4991258ed231a70e1661f7e1733d22bfd6f3a6b38d9bdd23b0872f5ca78cde82dbfa29b6b6be69a30a7c758d61cdcb1309c1033ec3bfb197
-DIST texlive-module-templates-fenn.doc-2016.tar.xz 5996 BLAKE2B 2cba7cd020ed99300bbe297cb668ae9d4ae96fd2b29002b7f651567fda759d6386ca742711d820af2c8263781202afbc208a34162bb3a0117778d720c589436f SHA512 9bb78bb447f9119a774a7c1fbb3edd6f2a13faba945b09e94d6aa51604fb0783bb8a1a9ae885a296689dc964477c81c01959e25ada87e155ca4e998c9fff14a0
 DIST texlive-module-templates-fenn.doc-2017.tar.xz 5988 BLAKE2B d8f1f2346f0ed6577ac6f2c6ca703b4865b438f72e7521ccf4e2169c24540f07bb8dd6111586697cb26d9560ce9b41fc9859eb5247838ef505b9c9b683dd6508 SHA512 25d6f46df63807dd50a75eaa84159c84dd89bdd1c05b3c64cf4af66229076567e72919ed1f8a322c7e1767043186824287748859ab7c1ace59243d5a910e934a
-DIST texlive-module-templates-sommer-2015.tar.xz 496 BLAKE2B fa1647d6674d34866bd25b98a235d05fbf0179ff7e6bdafa00954ed21bf7933d8e2ac609bc7a640cc3363fc9476630e48d297d07511779a15ebc77f994f6cc70 SHA512 5c9b8a2006c1830bd9c44e16ba75dc2ae509e18518940f72ce14bcdaa9d83b40542a2d79c4e1095d62cbee058b1e9db370af766c72921b4736739c501d158282
-DIST texlive-module-templates-sommer-2016.tar.xz 508 BLAKE2B 12bba8f794c45a7865760c9869587bbe976d0c58d0c40d92d02090d17a217521ddfdeeb853d5df151b5273f95cf564ee38b5a5af3ddc7d04994e6bab1e274126 SHA512 8489b201d6d2131e2a417d1608aff1402b22c5805f8bf34faab5efa7b90a3118cce6a952a8bd04775cef674674538ff613b4d17f1000315064218e15da062078
 DIST texlive-module-templates-sommer-2017.tar.xz 504 BLAKE2B 92eeaedede71ff9f6da5ed6594c6b287cee4ae5e0901f19d3c0f538f58bf89dbd05d461d107452394e2ee699b35a92deafa0d3e0b4a0d795cb2120b53b2bc824 SHA512 0dc06402951104bd7e4421ea8351abde30c2312e6f0db3f2cc1400058229d50c7303f57537eaf1d6b37c8c770b611c750dce009db98568b57b96d286daf9536b
-DIST texlive-module-templates-sommer.doc-2015.tar.xz 14428 BLAKE2B 2126d2ce052ecddf8a03130dbf58ed7fc29682e4ec461a93c1a08db67c4c4a342b8fdb9271ad6762582b3b3dfe7c1020cbf1d8196f1d54c732b3c1daa0dd2b44 SHA512 c45970f30012b1f93a04ada831184db0c716a419f25cf928b825fe831d7cc3449c083ad2ae46f7d68e291a61487abeec571115f8e70474cb89a02e532782274b
-DIST texlive-module-templates-sommer.doc-2016.tar.xz 14428 BLAKE2B b6329761df32cfd555e2c9f0ebe3e9f99e6443b2c521e422aa268dfdc16d5397b044c0f2c6d08b0477799c14543a9de3242b26107b517c102e18daf9e2024060 SHA512 594ba4b5588eee089b80d01eb467b00143b618ebdc3490d96b9856563aff6b93f86f9cfe75845faa4690fb3d47c71f5c458d5da6e2d21aa39e43f9672497053d
 DIST texlive-module-templates-sommer.doc-2017.tar.xz 14416 BLAKE2B d3b9a09d07c851534ccac7461d4686a2cf8045bf8dad0ff9a30082c7713a9fffbbbcb9e19cb6d5c9165b9157672280828e16a4c92ee3512e4e2e80f0a349855b SHA512 fb0d620a660092409bdaf2ac93aa656387145bb3b2923a9598784b8a38e63b429969e826df3afb0999fa9aebdb685af182930d5ef045e693fc42bbe038f94b96
-DIST texlive-module-texlive-de-2015.tar.xz 272 BLAKE2B b04a3eb553fe1885345308d4bcf026fd5bc5afd61dbd1e59c14cc31a3e1cdf0b0014fe9eadd966553767fb46e561abb517470ca014bbeb6bf85d35f3a3d4dcf1 SHA512 34506d0ee499765ed6944832bdd24888383f2cff817da2ce679b45d9f8f34c5a1ed55a62067db30d27a8e62d1600ab082d94db55e089580b70c4e94016f30175
-DIST texlive-module-texlive-de-2016.tar.xz 276 BLAKE2B 6cf8dda7f1a3773743ae98afcdd2551d660138526ab0e94e9419ffe1e60a57a810236864d667e8d020ff88b55158aac4e8ffd2791b7e3b8d8df87d6fc80204e1 SHA512 3d6b7d9dbb5bd5e30e2e53046312b4d9010edbf159979a0afb79930a95f5f11b2bf36b3cc81689a563156cc77b0b4b5807c58ed96303e2acececfac5f29ec8b0
 DIST texlive-module-texlive-de-2017.tar.xz 276 BLAKE2B 6cf8dda7f1a3773743ae98afcdd2551d660138526ab0e94e9419ffe1e60a57a810236864d667e8d020ff88b55158aac4e8ffd2791b7e3b8d8df87d6fc80204e1 SHA512 3d6b7d9dbb5bd5e30e2e53046312b4d9010edbf159979a0afb79930a95f5f11b2bf36b3cc81689a563156cc77b0b4b5807c58ed96303e2acececfac5f29ec8b0
-DIST texlive-module-texlive-de.doc-2015.tar.xz 630300 BLAKE2B 0eb951a2d95c4f0b5ef71e167856f9847883097e423aa5c1d05529e66d9f0477d43906a7b132fbe880b1d261dcb22b56de079b95404e97a8add8b68001a51d3f SHA512 bdb53d8ca1431a7fdde26f300cf6c016458c70a57551e02279290dd5a613ff3181213421b3fd7e4e61d1d9d57c783e7d8eecd02da9dc2f7406d59cd16139fde6
-DIST texlive-module-texlive-de.doc-2016.tar.xz 746296 BLAKE2B 8ff891e5117fe5ef10e157f16a8965367f691f975e7e6cd4f0f951a98e5617616524a0a2a338d1e905ba78495416b5bf887f93d21643d718f14c2bdfd2ff17b3 SHA512 60b073aaefff892a7a15c89a20a6476dfb6da82837db4ce7404409d15a48e2077a5727a398817236123ebe575e5ab0b68c19710bf00caae612e1bebd6d913b82
 DIST texlive-module-texlive-de.doc-2017.tar.xz 749672 BLAKE2B 8436b312b6d030f2505dec03c4c768a8b53f288e15c9d1dcf40eb706024c8842f419469c010ef33ed7495b19a7b0bb23a3631af12653e7ebe055c2a09cd59dbe SHA512 cb36167bb4500190de30e698929fcf3f83f70a250514390fac4b17537c53524049c192a3d4820edc585a6ec617eb5c62f73b360a2d97adc96b37b8e7f2569f5a
-DIST texlive-module-tipa-de-2015.tar.xz 396 BLAKE2B b12300ca563f7e7776909e02827094ded26318d35b03e4914f44aa3fd093a910d8deb65bd7a2e75b2f65255268fa11753458353c83dc8ca317e6d8b48aaaca5d SHA512 52754b81f300a3266aed53b085b3812de645b7be3dee59c425bbba15e02554bf30a6d86da3b6cefe1d3bbe6d1b985fcd581c739ed30fbd2dd175342f78e456a2
-DIST texlive-module-tipa-de-2016.tar.xz 412 BLAKE2B 0d6548d5b392eb24629b5243bb98841ec49751b5cb1d85337201f2421dff2ca3c04f3d811c826246a39c41eea135a970305ea6677526885260b625fc03d2e633 SHA512 31caaa9f9eb8c946a0a562b40580605c8d0ed3dac7e256af7d78b82bdcc6433eb4f86d2c423e3a25c4815f2e0dc62421ab61ee05e7fd3ae469359070c147675d
 DIST texlive-module-tipa-de-2017.tar.xz 416 BLAKE2B 6ed2d1b0767d247a684bbd4aa4ed5b95541b198d323fc2e0ad1bf5a84d331aabab431023298c575c2262782642d9d673b57ff8d8fc3f800abc5d6c50989a6c02 SHA512 1cd5c7f7c4a0aab624bfd8526b4cf628ce0e4b0fec1bda362fec4b2f82f817a64454b4d4403ed60bacd60686159372f7643bf2ba211d2d946d6ab2e12a78e5e5
-DIST texlive-module-tipa-de.doc-2015.tar.xz 3676380 BLAKE2B b2105607c3eb93caac38a390288ef67900bcca4c5f2992f3acc961eadc3232de029177b1675a9558f23ba62dfb48c31e7f0507d5f2216897fc34bc5f368916b3 SHA512 bc689e9eb4d170a5b2beda285ba41e760adbec70932cdf63db4eb349aa7c2d2c8beeeb885f9eb84d496c8b7554d4abc50f9af0d54a6f5bddad9c95980505061a
-DIST texlive-module-tipa-de.doc-2016.tar.xz 3676380 BLAKE2B 358f1c1f0d559792c5cfe8b3638a12200d2a10a7a35083ad3a7dd32f74d4fcf8b90f2e5c6e2b4c2ebff7ec600dfd5e4d4723250fee6fbb94b2a4f54c49d2e811 SHA512 b2a21959b225b57748f853887b56ab37924adfba616299476066a8c3b9c43619a15c80f929fd527d563369da16291e36745d012dad5df65696f655dd6071d156
 DIST texlive-module-tipa-de.doc-2017.tar.xz 3676612 BLAKE2B 704b8737bd794b0894dc14e086e44a2feac477105cb68b2d42046f20a4766d1d58fdcece01839ae9aa200e525c1dd6f9d9efc726d8de113deb0094146b6a391f SHA512 4c8fe6f776ae94ad75bc68789287f2bef254f951beb41c26e091d1aba289c8518fada89acf55e11ef0f6b4e1c06374bed8c67fdca2f9256c644daaf724420968
-DIST texlive-module-translation-arsclassica-de-2015.tar.xz 380 BLAKE2B 023967489679e6063549c65b302e528653855a0148827d83b709f553842c7ff3623c67f7b27dd3d43a7b0df2b65fcb349451f0a3351b0e8af968523ec9b8965f SHA512 f27295543036bb6d9395fbd68dc1dd46568116617daa24006b3d486b744c74952b9c4481d577c10f6bf382c995260cbce17785504e074a09c7e87e9f84b388f6
-DIST texlive-module-translation-arsclassica-de-2016.tar.xz 404 BLAKE2B 62a05396f882eef6eae79c12fac2e6b8b53ce2f26435c48314234538edfb7285789feb95613e1cee1d9f9e39e67a1cce66344f09461563f479ba29f05e019edb SHA512 7d582b8649580e66f0ab299c184f33f566e4b55fd4746f2060f0c2162747ca9b1e762a573c135bcade0f64b42895f0990d38050b705016494b084d6ff6e4cd26
 DIST texlive-module-translation-arsclassica-de-2017.tar.xz 404 BLAKE2B 62a05396f882eef6eae79c12fac2e6b8b53ce2f26435c48314234538edfb7285789feb95613e1cee1d9f9e39e67a1cce66344f09461563f479ba29f05e019edb SHA512 7d582b8649580e66f0ab299c184f33f566e4b55fd4746f2060f0c2162747ca9b1e762a573c135bcade0f64b42895f0990d38050b705016494b084d6ff6e4cd26
-DIST texlive-module-translation-arsclassica-de.doc-2015.tar.xz 358864 BLAKE2B fc4a79c02486a0751200fb14a3621b11e333672acb0ed6a4b6be8c815df3b8425cc048a2e1c5d4c34c43280033f0e965c62450b9d893ca73ba188225061812f2 SHA512 bd2519206cfc8015f1cc15410648249b0e50a001451b254874865e0460be0589b65908d2fa45b6038b6180a62675c879233783a46c16b0c6ce09a6f6671153ff
-DIST texlive-module-translation-arsclassica-de.doc-2016.tar.xz 358864 BLAKE2B f85d54d783723692d999783b4b3b11e31d632fff805bdbeb91c7d7510e6ad8a4c4b2137089519372c0f30bec8b5f7713c7773ef8b589f33d9c1a4cb961336621 SHA512 3e5fd4318ce0dc6858c3470d1322fe40015e247381982b407a562379acc38e9b2abd4e77dbd5739c20237e72890f1a884c13adcf5f244780eae7cf6bb9c09522
 DIST texlive-module-translation-arsclassica-de.doc-2017.tar.xz 358864 BLAKE2B f85d54d783723692d999783b4b3b11e31d632fff805bdbeb91c7d7510e6ad8a4c4b2137089519372c0f30bec8b5f7713c7773ef8b589f33d9c1a4cb961336621 SHA512 3e5fd4318ce0dc6858c3470d1322fe40015e247381982b407a562379acc38e9b2abd4e77dbd5739c20237e72890f1a884c13adcf5f244780eae7cf6bb9c09522
-DIST texlive-module-translation-biblatex-de-2015.tar.xz 372 BLAKE2B bcefc183b81c43b4ecafc4c013031a8910dc8f54900aaed3a6aef6026ce58de6791c05d02d302f5efc642d06b6feb411d1fd20c5922e9b595ae34ac3ba2a33bb SHA512 f8d5ac1d9fe202d16b4c5bde23600842ba3969f10ac4fff129b7424be2f9329b2f525469f486dff332c2ab77d1eb2a6340d77cf59f9e626bc8fe42aa88178e0e
-DIST texlive-module-translation-biblatex-de-2016.tar.xz 404 BLAKE2B 930a119972a8c1086a72280b586402ad4c5b76e2d84072d3a168e12ac5e1d4059b63c409b5e001a1d5ee3e7fe8767b053b6a34619d814458712c4ee120fa6a36 SHA512 fcea16239200e48e12f36704dea47e3689988f8396cc70daeae7cd173606463ce1f3cbb491db4875a9637400eada6c432138b50fb502a62a12e835eee0935112
 DIST texlive-module-translation-biblatex-de-2017.tar.xz 404 BLAKE2B f997cda734b3ba5176817ed81e0a3c07e9277c687846b24466b64e194ce55cbccb657b59a2e0f3145e10fa0fe3f49e63eb823a7f432e54ee6279999e6e52785f SHA512 b2cb60f3e2cb7b59a98e5e8a8f0569f6983ad3e460f2e184ce77179e70bbba56ad97e30dfc42671a78b252059769ef408b9559045a257aa2e2b5ab0f1caa71d4
-DIST texlive-module-translation-biblatex-de.doc-2015.tar.xz 1003204 BLAKE2B 1046994a71371f24885fae6f38edebf0b38774d3611de987e00e913df0589b0b77e56b7cdb3ebb5e692ab9b8e5a8cc3f3e18f8542f97969c7c3f6550c6708ed6 SHA512 14ccb2735c0fe9615c0beb0967a8f8d17d36d00608c69636f48f97862b670fc4e0774aae7658b2e425eec8ad6e81fe452e34e32aa9ac7263267bffb91aca8f4a
-DIST texlive-module-translation-biblatex-de.doc-2016.tar.xz 702368 BLAKE2B 509e3a4b7af729f7261321da52fdcb4a0fa6ce9b568b0370766d6fedde9d42fab14daca4252bec0dfa3797b32301d3b386d155c8050be105d60bd2c2ef090fe6 SHA512 d1699e9994782d2fcb963ed9aa50d18d5a795f8d3a410021d96432e43d64165e698f34b4ed3f52062e50cb22645d2d025419f0d086fb89e2f0326b1491fae26f
 DIST texlive-module-translation-biblatex-de.doc-2017.tar.xz 702368 BLAKE2B 509e3a4b7af729f7261321da52fdcb4a0fa6ce9b568b0370766d6fedde9d42fab14daca4252bec0dfa3797b32301d3b386d155c8050be105d60bd2c2ef090fe6 SHA512 d1699e9994782d2fcb963ed9aa50d18d5a795f8d3a410021d96432e43d64165e698f34b4ed3f52062e50cb22645d2d025419f0d086fb89e2f0326b1491fae26f
-DIST texlive-module-translation-chemsym-de-2015.tar.xz 376 BLAKE2B 7215ae40daab42f41dd1021839554cc0f66ed34365a88f74a79a8be8f5eec2559ddf704f94938c220f40a9d24dce7387d76f5abbdc9ce3e4387fccde5801df1c SHA512 ebae746d098ee0ce3af993defe81ac9f3ff895b3200562c620ffa504540b043c4b04d2cab51df8b36deac0c884681168b965ef656f0b46469a6365a5e7dd3dca
-DIST texlive-module-translation-chemsym-de-2016.tar.xz 396 BLAKE2B 3e35326932d0837713527f6906a14ebbf41603144c2df748dfd79f84f77908123589e523141f06e20ff996b00d6249f28e0df462834a83d0ab2fa9367bba3335 SHA512 94d9108abd0b243625442b29bf677754f9ad272a2366e4dd8aa27b139c945fd38cf0c487df65dc84df1c850785142edfe7d1e7cbf735afacfd130f636a52d1ac
 DIST texlive-module-translation-chemsym-de-2017.tar.xz 396 BLAKE2B 8dc636cf2acdcf3fa9b39905031bf113de733255152a4cc7663b2d2880111b3913fc780665889a8524170c9f413fe5f9e3a4fa51eb27b0b580b47b0baca96c58 SHA512 fd1f0be6dfda7c853be711eac5ff8bc0f6819cde88d60cab0058d2c79243e9f8a7ab90e223a11d84e3c68d5a8692e88ba614a35df33002ca32c4005cd892d491
-DIST texlive-module-translation-chemsym-de.doc-2015.tar.xz 141988 BLAKE2B f0fbb662ec3c30a7ca83de0d38d880291d7ebbaab14bda71912972abacb33d280d67b0f28ab5326d1c96e18c9381b285765bab0b98532259006b0f6c29f204f1 SHA512 dd050be3f7ba72ef0e3dbd1845117c3c0541c5f37d31e6f1a735f29cd0e3d3d02e04d47ab50838bdf8910d3a941d45d4c5529295ce7d5d5ec3e0ff9c76a11827
-DIST texlive-module-translation-chemsym-de.doc-2016.tar.xz 141984 BLAKE2B 4225b0e55e581661a8ee183234e2fa1a1beb9c6b4a1cb17a06853f7e4b9e49a5e1080fa6649429629e52d599e2a24d7cc88c20780716871e7463c8dc9d65c59c SHA512 664c8d1da7910b6b41b78a8993edd2b1cdffc777b2213b02751e8e11a61f6f79834d14e531df0a0f310027592b276c0f466b725326c9c247b64c917ca1983be9
 DIST texlive-module-translation-chemsym-de.doc-2017.tar.xz 141960 BLAKE2B 797fe3e09f831d9a660ee4e10f16369bf1e80511f8b2e10a10600c941b033b006f26dca0aca82c8bed6b74adaad76789693623136940c9bece6e461cb218493e SHA512 602caeb175ad882de0973783cc676ad68800bfa4bdd41e8214d87c5d5c1dcec613535ec167b731fa324a1fdf61f6f0dbeb526888bdb6390cae3eccf108624998
-DIST texlive-module-translation-ecv-de-2015.tar.xz 372 BLAKE2B d19cc1a33b39e1a01124620339ae133d3c177cfd6397ea42f1d33284e905ddcfb9e2f88be58753f1eda9d331d8aafe177885c376f301d847beeb73fa73f5d562 SHA512 01ce4017d499823e005cc793e9448aedac2dd1fee50f00fc2714f7d67a5727bf78fecc03e4ea954a818898f4d682744856ec0982a36067ac76575d5acbb095a4
-DIST texlive-module-translation-ecv-de-2016.tar.xz 392 BLAKE2B 6fb5882a0f13325bb71b4205f36b2034a10b0534e72edc193e0e9ee9c1d1a8f7a035877cecbf5746cfd70db545bc2b5e44da8b4d2cc5c06c27df1171d04a78b6 SHA512 dd9e44bac61aae709e333aa81e9bc754e3877fbafc5a61d465bedf4d5e73fb069d5983983a6fce8d08c6e70a231c8033cd5c8f1abb658060308d04e46b469127
 DIST texlive-module-translation-ecv-de-2017.tar.xz 392 BLAKE2B a7dd4cb19609c19617529bda29a7dfed891211162de00cc8ff26c6045175629d371cdaf14df3297a897dc74cf7bbdaea25f32543e6f4975bf54a2b2e92176986 SHA512 7e555bd21053353120ca69b762036908aa8d29b7101acf4ffb4e43474a53dd63a8b7420d630a2744e2f1b0f795387675c80afb5b6d9b8a23bb6e68671d82c312
-DIST texlive-module-translation-ecv-de.doc-2015.tar.xz 406924 BLAKE2B 148b656aca4078ff871beeecd48675d2d706dcea756d56b57aaa7bb6332f0757a55e7a4a038f46295df53d29e33cba07f6445b75c07d9783495e8b911f678f47 SHA512 0033f788804ea54b401795c3c686ca28845c18160c52772b0a0e96df475fe6373e06f95bb5d6d5455c569f85ef5feca7d1855f6d087ab390bde2b74469c094a2
-DIST texlive-module-translation-ecv-de.doc-2016.tar.xz 406928 BLAKE2B e39241f6ef389c05f499ef33120f66d48c6e8902afc67d5e692f0540b52abe034654947c4cba1a3ab9eeb8534f816668d107ab5edb8087d3fe26b49c9a54835c SHA512 60480c397f492082485d8896f2acb7f40a02ce408e1da2e0efc45f3ecc2a4094660ea3c67d05dabb97d1a9969d679b044c8226e5219cac643b53d57d1076d493
 DIST texlive-module-translation-ecv-de.doc-2017.tar.xz 406928 BLAKE2B 8a1d8b21d9b9291ce1c430c8ce6473bbca6aba2f1aec1367282292105db9a8e80e1c7fa88b3555ff0f5ac986816ea49388223e27d56b7309cfb954292b44a328 SHA512 d7214a224f6ea6f520381e59c67c2ac7949167e3ee39827fa5f720560bca11d5905089377b68652b998e3bbfa6a467af9d24f32250cb78ec545c298eb68e7d4f
-DIST texlive-module-translation-enumitem-de-2015.tar.xz 384 BLAKE2B 1604c2d7c5a961631692e0bb441ab69a5fb9f479ce08702ffc84ea67b7256f10aa75f450f30671fea90b244bcca8c5f5c4635a6763e76b70b914a49c26fd5c4f SHA512 70b307b5338b67cc45c847e3dc25074c59dd199a9b771787115473e99b8d7b60799164ddf0acb3f7208e8ec6a0964868ebb16e0b83d67070b1a8dee08696ed1a
-DIST texlive-module-translation-enumitem-de-2016.tar.xz 400 BLAKE2B 5a2be63681b0e491b52c8f6ee042b48b410d6721b7da6d3fdc47f753a15177e512bdcd285f7c188f0a1af3a509fc03b90421d2dfd444d547772bc3b54f7c97bd SHA512 f003d642bbc556dca648ebc37a702d4ce06425d9fab8607af582474ad23b8d01a6eada5e03457c2f3487188c522f19e64326ec4152e1f849d09315d236618ecd
 DIST texlive-module-translation-enumitem-de-2017.tar.xz 400 BLAKE2B 5a2be63681b0e491b52c8f6ee042b48b410d6721b7da6d3fdc47f753a15177e512bdcd285f7c188f0a1af3a509fc03b90421d2dfd444d547772bc3b54f7c97bd SHA512 f003d642bbc556dca648ebc37a702d4ce06425d9fab8607af582474ad23b8d01a6eada5e03457c2f3487188c522f19e64326ec4152e1f849d09315d236618ecd
-DIST texlive-module-translation-enumitem-de.doc-2015.tar.xz 607768 BLAKE2B 8b5a8ed91aaa5bc75e0cc20c9f3d94e66f396b57c76a62d92f9ff320b071ae4711102faed37ace83dc60160e0368632496396c93f089efb75c66125db48902a4 SHA512 e959992474ba0614df0841a48737163c18b99f248895493e94420390cb98f5babc848a30c72cc5aed80f5e861eb732876d04d46c0d012e6af3d3b29e65b3a99d
-DIST texlive-module-translation-enumitem-de.doc-2016.tar.xz 607764 BLAKE2B c03dd11ee799f08d32ca28068f6142914c0ed9d6ad072d6d4d55db1a2a9baa89d21487628385296b5915bc858219c45a0972158ef0c442c52869fc658deb9bb8 SHA512 422ed2cfa076ba1f8893ae7c1412b3bac3eacace26c263b134e22b027d85d472f509d8b6aa2b75f3df703dd977f25c5f4a782ce6ecd4e995aa83f1c78eeaa81d
 DIST texlive-module-translation-enumitem-de.doc-2017.tar.xz 607768 BLAKE2B cd640b2dae4302bc803f2cb44abeaeac16160aa2d986e4dd2083134e17e26a723de8e774f362e7c16fa505832da2124ef028cd11c86e093bfe0c83b83e7a85de SHA512 0c93367014abdb2ff7fc2cbe3665ec6f7d82886271fc5d522e3841c9f9a115f440812ecb080cae8ba246da520044c7253b0a3d1f8bd7e42948375623f8856b1a
-DIST texlive-module-translation-europecv-de-2015.tar.xz 376 BLAKE2B 73c78087994eb27079a98f60cfb221e9890618fcd007e2aac21a81addfd70e36bb35f51dfa30dc76c5692fde3f5ff629c268aa6b721bc51c5ec9562260e08abe SHA512 2538222a2b5e6706ef30f234e3a0f03268d88c415147bd5fa6766264fb528f47d74128215603f0cb08f5ee2e84cef6aa908f7ae8cc09d542c7b53da4dd65a83e
-DIST texlive-module-translation-europecv-de-2016.tar.xz 396 BLAKE2B b964f9d87530dd9367cf203f40f74d5e52559686124b6b5193107631d9a5ee99ca384cbfe5464ac5a3d3808518a07a6493b67a9d3c613fe4ba0ca0f8a4fd1b74 SHA512 882f35a4c002ce02ca62ffbdc29ee12a4064fd2dc278d237bff48a5924485291975d35c03f745a8938d5d37b8a3d02cd7dfef3c31533ed8e8b62826a2c3b4092
 DIST texlive-module-translation-europecv-de-2017.tar.xz 392 BLAKE2B 4e025b8c29dfb49391079b58ed08cd40414b270fd4dce33d7bf12fc67fd51b98a244b91fe39857265ee4320dade6b2b201e51cfcb3130736bc188704081705b2 SHA512 cc95094eebb16dd34aac35ca181e191eb9ca5bc8eeee89ca99b1cc8c379a9b807e8eb6206716797b6a98a25b89d0e7f94737dccbb171750a3f2c077d54dc6da6
-DIST texlive-module-translation-europecv-de.doc-2015.tar.xz 669668 BLAKE2B ca099b6bec67f8f2b91bb47894d8d21a624ff2e11bca54e1d3b83b3b25ee7b02b9f2c339d0c1e1cbda058f484cb447b53906e8f2aef77458757ad6317b4a94ee SHA512 7fbef0e2d6744833f94ec8073e24c0ee89db6cbd6648eb351604aa281141ca9caa86810553025daff5c7dc45cad0f75ba9d3e0b990c0de5c9614cb9b285f16d4
-DIST texlive-module-translation-europecv-de.doc-2016.tar.xz 669668 BLAKE2B 6461bd360e2d3638c66e8db371efbeeba1fa98d81c136e4eb247b6267f5a976de5f5c8320dd7fe38a604f3c48895840cd6113439ddcbfe428a7a032e48fe3dc8 SHA512 9c7b1b117ccf4418c8a847faf37e15b3bb8552690c4a5a18964ebc0c7caf2bda8f3b5442cb0c2b577ad0e757e9241b3e56caf9863dc9defd5ab217557515d07c
 DIST texlive-module-translation-europecv-de.doc-2017.tar.xz 669640 BLAKE2B bd0da573e9c5b8de0acb574b2bf25ae5702065cc7fe59c5cd9deb098dfa825c2ec300ef2819f062b17d15e79aaf2e5458def89c77309de7d2a10d62df536411a SHA512 4b4f99589ea321e9bc721c663cefc0d453bc97d59de507c5fdafeb96fdd706568a7d3b1711fb228b353880e536157ed9c623fd682d6fad408fab32a82896970b
-DIST texlive-module-translation-filecontents-de-2015.tar.xz 380 BLAKE2B 69d79d708ed5a2d08d49f6243f81d109200eb7e60d0df1b86d4c60154f37774777a162d8603c2b416ab0f83cb879b49b36a26a20e20afcb5cf5934a90edb16fc SHA512 2d348196756809d787f0d0fd66da4c88684227af693143432ecee971be24a07dba61203a6ffbcd3d24e930d22ebe162acc4f237b597815ddf69775ddd7966023
-DIST texlive-module-translation-filecontents-de-2016.tar.xz 400 BLAKE2B ad33e18bc6abcb94bf83071e690adc946b2cbeb6afc3a50f0352dbb7d71be2b99084d3d58a59d52638e70f6f0b643566ecb83468e906eaf7189183e94e6e55ae SHA512 9bf121350a393b5a76cfc154d5a7aa645654a91041d378c5a36780819f0901a5dfecec5f80413613160224130f3df767a866299a4af5ce5fafb2755df4c27fc0
 DIST texlive-module-translation-filecontents-de-2017.tar.xz 404 BLAKE2B 12d7a859107e96519ba956bf53129e11697f4daa0fe81d32705790c7bcdc5ff7a783a94a0cd251a2e4ddf208d64279c071425f1511342e642d00320e3456f4b8 SHA512 82338be58406a97e0e5030efb61b1b03af45c4bce2edd3aae321f2e69ef14fac014643777dac22511b98e306cc4d7304c0c30b3567658d3205f7a51ef7df2704
-DIST texlive-module-translation-filecontents-de.doc-2015.tar.xz 214456 BLAKE2B 298cf7955446bcca446f1257e38af6979ef5999f051e65cd6b41d16770051f9e254cd5e1cda660516af36c29563fd6bc100ec5ca2576ebad2132e400fe58f9af SHA512 770255f3189a634e7243db6e4db40d39e873362edc0a2355738eb61883f4873e599827e2e53c0a56773328e0d39748541c29dab562949b6e4fe798814d215d43
-DIST texlive-module-translation-filecontents-de.doc-2016.tar.xz 214452 BLAKE2B fe4c7e6ba38ca4d697338744107cf0ca954aeef1d512e36a7870972970d6f817798b5279adcc78578a1ef2284b96cf441a81f7901a9bf5b8b642dfd9be58d6ce SHA512 4170fda58e1a65d86cce01b1d73b5a0b7b6da90554c66bf7714a989a713f38fdd2e08461c2fdd4fcca44caefe6ee59317e107c5053ba9dc6ed440bc1a5ba2238
 DIST texlive-module-translation-filecontents-de.doc-2017.tar.xz 214456 BLAKE2B 38a9b4bdffd78853a808c525a9eca88f0135fad66bde67f326db4498f05889747fe0d1901ec73844714cac1f42548215f2fd0bebed93a4b8920ec0f93485354d SHA512 3bd9fd043195d5335559a405bd2b890d66fcd27c150147a49e57b5029fec84ddd55ea3fbbe8de73ea0a566833e34a9a05d11a076cb930bff9b9ff23ce2e650e3
-DIST texlive-module-translation-moreverb-de-2015.tar.xz 376 BLAKE2B 6875c77c63aa5d99362391a1d7631e8de4e4c1ec0e4b6090b6f9b285da120ad4fd1507fd60f102f633361f25b4e761fe034cf1fd9d946f5f398e58022083fc2c SHA512 9a10be4a729c4a23db65cbf3f5e7b5db55b22290c54527fba9719ed06b6a780613bb8c8becde91ac4d5183cc25474d268a887577c6294c855ec0f4ec5d056687
-DIST texlive-module-translation-moreverb-de-2016.tar.xz 396 BLAKE2B 54a1c4e8ee982c269ef9a62fb82a0dfffa5caf561493241a2121d0e2e8207a23e9e5dc469ae98e9f179112651bcc999028a5f2b58db3ecd91b3eba71ca16ee1a SHA512 45cd40bf36a2c9ea6ad0535a58262f7ddb1f5b612e9b6eee23411085383fafc2fbe7a5f47b6069f34b69041c85d489b90ba82d7c466eb36730f5a991f8f2b620
 DIST texlive-module-translation-moreverb-de-2017.tar.xz 396 BLAKE2B aa5dab15cec755bc3445ff6ba59b975f7bdc53c988df1302a71a4cbb55324a72aaa9d0d34c919cfd87b053efe85da09041504012110fa6ad64871faafb6bcc03 SHA512 f91ef9289ea8a593b5afa7b1d53c4335e93a649da17040bff3471aef9463d7e6e181ebac547ba9a7d768ea5591b06779ded6f415f51b9e1768b936b574bfd694
-DIST texlive-module-translation-moreverb-de.doc-2015.tar.xz 94828 BLAKE2B 0578b02d0ea2ae677e90e86d0961b27ad8e197bf9b92b9ee4e126d3b221ca91288196ca64226b15561be6f11c4b0c07027218950d4b8146348b404a9fa242943 SHA512 a335199f0470795d985027f584b1ac4c8015f201603ed87168a51bebe483f69afa5a39c6dbe134981a61c277e84aff2149722d9cd17980d819ed06d19422a5c2
-DIST texlive-module-translation-moreverb-de.doc-2016.tar.xz 94828 BLAKE2B 1d871e3b50f1ffc17936485399314cf37e4367ada0918aee8208fd5c1123f53631d2a1e0cc18e30afab4f9a1cb987f31dabb0dfb5872fb1eb7a2cbe604d39f55 SHA512 c433175b5f06d5e7e940084b5a3e5364839a8beb96f6126a813ab57209aa153f31ec4cf39fd4cb6e6c821c428283c1aaab6ee29e50aeb84eb6d1c3a4b135602a
 DIST texlive-module-translation-moreverb-de.doc-2017.tar.xz 94848 BLAKE2B f0b71af381e12819186e2b3f1a5843e52ec21c706ee6ff86059c930dfbdbe3562749d2921d75306b28a226d20fe8027bce2338b2badaeeb1415931e651914722 SHA512 63dc14db09616f5ac7c3db8ddbc8ca9a06a0e47ed44831b95f6aafb5163636e95ef6052f46b7cdb1c7b9ecbd28a830cf66b86afb7c0bdaf66d7c9a8bd6bb10eb
-DIST texlive-module-udesoftec-2015.tar.xz 105200 BLAKE2B f649f172ac6d5e03baf7e87b6bddc7ca55c001dfdd3a2341ce48257e2bd05974c1b796cbdbf6ffe98620b2a4f859f2358b366cda23598034d49f69df0b2b42c7 SHA512 e63415fa5807ca2de6928b6e6d395c79c145359c27a97de981f2ee118000e0cc34417922e516dc284a76dc51aca87feb2f4d7f75c46c9ededf9864dc5e89804c
-DIST texlive-module-udesoftec-2016.tar.xz 108240 BLAKE2B 1783f68de253333f19d442a2400e71e19cd8bde8ab1d80d115ad2c1078eae94c7af32ff9ff1bdba520b98ab2a2bb8e839a94841badffc58dd10488e85c3490b5 SHA512 a85303a7e68c08b45f3fe8ac5b05a6074d4fde644e8a1a2d2a2bf5bc3209a495b58e1ae258d85aa14c249142360c6748a83de3139dcd30de22fc17e07077e1fd
 DIST texlive-module-udesoftec-2017.tar.xz 108332 BLAKE2B 982c0253ae8c089f10feaecd29f034a4fc70093e0c095ac0d93b5929c587709eca2e27c9cdaa643c03e86dd7c71d6c39138908cc9af40bda7fc4272cbb56d6b3 SHA512 39efd4f2c9930ff92eef0629255e62919c55ba8a308dacb01e81c9341c6c5ccee9302d12bfa06ada07ba7451b87c9a600ac7a481ea4b13a7e49c2b7d0cb2924e
-DIST texlive-module-udesoftec.doc-2015.tar.xz 470940 BLAKE2B 9116773edbbb9cea2486a8dcc4bd54be491db927b28569bc099ffca6a6888f36abc42b31796d5a278effaf5c51abf70ef8bad01e1dcb43bfb1caff0f832275eb SHA512 5082f6ee8ffe048f7cd917540d039096503ea3d31635c0e53a0cb726eb4ff0345689344256f5598b919cf0b11a7af0211042b3e11284abfafa4c903c6dd0cff3
-DIST texlive-module-udesoftec.doc-2016.tar.xz 479368 BLAKE2B 36636d06375a3101da0c0898af5661b927b3ac253dfe8889cfbc8da59b278d9bb30e8013523d39866091f619c6a110effad2e32848df839ff0c801652cdbdb3c SHA512 bb3fecf45e1cfc16ed01d2b062654f87e08515b7fb23db94e91abc55036e3c42598e6fa19094c158401f9f44abe03e360b0fd3af93a1256ff03e90556bf4c53e
 DIST texlive-module-udesoftec.doc-2017.tar.xz 479876 BLAKE2B 19eed8a56b6ef556cf838d86a6591001f9ed87e035325e1bc3bb37589265dcedf59bf4d0a89af9543207308e910751623832fb11ca99c8b1488a867c1beb7f1b SHA512 1b6051e2e330b76f95aae7cd314aa9b15db80205026579e4324e8a4f58019c31d5210c72a43b63c7e4cbda30ca805b7080a368e5aac454a105c8393df9366716
-DIST texlive-module-udesoftec.source-2015.tar.xz 43308 BLAKE2B 702dbd49542b9b94dbaf466e0cccda69456e0e82a68fc1c73921e6748eb2839ae9af0cf68496021cefc5011162d6f8473b648bb403205bcdafdef38f3817cbdf SHA512 d56477e62b75e899e2df9624d1f85c6a0e3d3c01a655fca7980ac4bbcac6ecdbbd641eef4b96a795303b28d72eb30596e105a10b1e55ea640d4114f08946f443
-DIST texlive-module-udesoftec.source-2016.tar.xz 45164 BLAKE2B af4f77e9e3b5d2f3776623644cac50692be5dd85215567c02f40e49ca24c5b11e25a128c5f49fef8a5468c05887e08ffde1760c959e497bf64d218196e97e9fb SHA512 bd9d4a4fec924c4d9eeae161217b762c3e8945ba031f7100e970954b349c185093e8fac09e9e374cbd2d401e178e873404ef1e47abd4b5a8ffb021adac2a65d0
 DIST texlive-module-udesoftec.source-2017.tar.xz 45352 BLAKE2B 9ab7b65892843961fc98e4c814299be49c76284f36b07e730fb590cd49988900cee361a4dc5f005e6cebb851d3d09fb86b27a1f58d0dd4a647a712fbb947b2b6 SHA512 c40fd69f2cfd79d125d8888dfc06ebe751c40a6880c0e6a2b16c3828fb018cd0de451a6f25895e7c28abeb9d78694d004aa66688a43a93116dd8fd050f16b451
-DIST texlive-module-uhrzeit-2016.tar.xz 2056 BLAKE2B 59a4caf2835d8cd31fc6ce7f60974573a29d479ee5352457f06c570a87724d87097a2d28dede1949ca953aa4a4b054f56a415d50d5593a8e5ac68059de087a38 SHA512 56f4c5384afc97c2f2cfe158205b1ce4b215988cc87a24bdc562ee869cebc931192ed031a0b3af3d05f3212a2353cfc162f1f39baa0d471768e41f454a6b93b7
 DIST texlive-module-uhrzeit-2017.tar.xz 2056 BLAKE2B 288eabe847c36821dfdd3da8f2bdee2d0fd8cd352133f04541dc9f63f50628de29ec2aeff01d05fae96507dfadf9362d2b651755c67a9b7054b809230c4b1e0a SHA512 cdb467c0a096cc98420d2ff9f25cba954c761dd41c8edaf1bcd761e4add4cbe008ee82e649dbdf72baf7041b26f554a7793a3d05c4fc064fa2ef044769562805
-DIST texlive-module-uhrzeit.doc-2016.tar.xz 209100 BLAKE2B c20d31e63e2fd892dbe05c13407d8d1d13735e2f6c7e2e5e339b2d2c8d200348ba2de3dd66abd7fec574a98d4a7ecd106dd169c2184a1d21dba5b8665bff420d SHA512 1e570026a703ef76b2d6172ecda655cb9a4439d7588399664208a5d097bce939c815d8bb50013235611fe5146fc2684107ec2bf77b9e436499920bc3fd5c74be
 DIST texlive-module-uhrzeit.doc-2017.tar.xz 209096 BLAKE2B 0177d5e092fe185b357311082586c2431f4863f3aa4f9cc63f0462259ea00d722f188f5103896cebf7eeade15ca45dbeff771246fcb1c0ac40479b16cb5971fe SHA512 07c170dee05d5cfe5a52e21b698e7b79ee9e6caecadb5aca0c4cc78809e11837efed82f2b651e46b62719a53ed21c856e89a57d1ac775949785c614a1d3b75ea
-DIST texlive-module-umlaute-2015.tar.xz 2876 BLAKE2B 8e1c271deada9a24bdbd5e5b4c3c7c514f611ca2c61a4ba955ed86ec230cfab7f9b5b0225d9ff1a3e653aa030ef01988b41b0b1bb55b05fe5c7909227e3b193b SHA512 50ac8d4e6ef7bab2c152fbe439042455fc12ebad215d85446c9bb0c2b46435a3912cd54509bde3be16a46370e758e343521891307e28c1ee51415185e90a004a
-DIST texlive-module-umlaute-2016.tar.xz 2884 BLAKE2B b255436b1736a0085ea7a8b66a806c8ce576db3de8435c93dc6781ee0de19f3986fbd47770bde43d2c8576db57711fba18a00f7b747f1ef8e6d533f97b569a80 SHA512 966678436a2ecd9ed99893951160c78174b46249385560123987a1be95089141280a6dcd51c752f98dfeaae914f16223a4b8817a7f058d18ae3ad0821bef2a2a
 DIST texlive-module-umlaute-2017.tar.xz 2884 BLAKE2B b255436b1736a0085ea7a8b66a806c8ce576db3de8435c93dc6781ee0de19f3986fbd47770bde43d2c8576db57711fba18a00f7b747f1ef8e6d533f97b569a80 SHA512 966678436a2ecd9ed99893951160c78174b46249385560123987a1be95089141280a6dcd51c752f98dfeaae914f16223a4b8817a7f058d18ae3ad0821bef2a2a
-DIST texlive-module-umlaute.doc-2015.tar.xz 106304 BLAKE2B af0eec0f99e517f19e22675842691d59e71d3fe6b22d4dc6a4ca682ce615db57fb30ee5a78670e7e456b3cd879a1c022071e93a19a20299a019f0c015a5e3117 SHA512 5bf2e1b283d80f35a18f2461203a289a3ed0d9d2c5fb2cad76c5441e02e62a04dfa0cc94be0dca6d9d8548bcdcfceb590f26751f9209ce3ec28a031df1b9c06f
-DIST texlive-module-umlaute.doc-2016.tar.xz 106304 BLAKE2B 31de7eea72150f25e68fb7f80d4cdac024ea88277419071e7dd12fef03c6f42f0fb0cef5bb2a05fa93256f97af63022cb14e1e044aa51cc1ee8d22d2ab580a42 SHA512 71ab18689c6ab4839fa97d3249566a609ce6c1e050867eec9341e1e1312756607d1a328d863820c22ac5ffef7f4214daf5031d52844f14bb5e1ce0c4099e1608
 DIST texlive-module-umlaute.doc-2017.tar.xz 106264 BLAKE2B a9cd6409372d593f12cf558590c1efc60e9fd1db1a8bb0e4972a5485edd8549f087a6b60cc644f2e52bfb7ee0f8e158746bd9be758bd74cc9a77debbe73406ac SHA512 cdddf03566f34a60def67429cc3e125ed000e4c9155e0b6c612b9bf61b81722f5d08a16f4b2c6650884aae282fab7ad634a6bfef9c434651a4f35aa7f74118d5
-DIST texlive-module-umlaute.source-2015.tar.xz 5732 BLAKE2B 51ecc314694ac69a79a150958912abab6adc89d58bc8a8c3fc55ef8878a3a171cb5e092f460ea031008917b0bc0cb7430f60502fe106840e0984028ad5568784 SHA512 98e203796321940c4a0b9b682d0695a3462b6212b65b7d220960209a561084432d56ff8afb3f25176a6d9eaeae078c0499f692fb6b4d105a527f549289e56382
-DIST texlive-module-umlaute.source-2016.tar.xz 5732 BLAKE2B 21145589d9c70d225616fbba6f307f0773758245ea826a97394d332ff895336c6dbc97e90471738e328c5b51b48790443f43470ef0ecd3cc0dfc659a2e143d4d SHA512 baf4e3935ecc6e509dbd6131a2c7e74d00eb4a765a372d6ebb27288c56eee13ad4cb81f172f500231a515c5a820ffa43ea0b487437211eb8e926fe605fb91ce8
 DIST texlive-module-umlaute.source-2017.tar.xz 5724 BLAKE2B a7f6b1fee33f85d89e91025983b942dbf0b7c0d0fd178323476c3e13c7d638d32b85025065b4a03d8be4eccd922f94959639ebfb19c6c31f7c1973356570f7e0 SHA512 828476eb73b51d4b777f751d2462a6cefbda706a554098134d10f834ab97e37676834736a17fdf195535fdf40a2ef27ba7ccef47ced0d1af6164e04c6e99aabb
-DIST texlive-module-voss-mathcol-2015.tar.xz 532 BLAKE2B 46bf8bba5c1853f6a7eee6540d72c6b14a99e6abfd93355725dcde8d21c7df7af5b6914bd46fe12dd74743b46faf480f2710266cd477a2630e80d254a92dd6f4 SHA512 aa99475d9f9934beedcefa31d3c3c2a44c5d4b0ccdecda033d0ed60107447e2b9057790579c364a8caab0a16b66aedadbb8ea13ec0882e9c011611dc2157513b
-DIST texlive-module-voss-mathcol-2016.tar.xz 552 BLAKE2B 6474f98c9c077ea7dfa5d2a238ca065dfd725ad061ea04c2f5cd1f6583887e9ab28be28d94c6c5342ed97c208bfd46310a842844437373a3002cd38e95bf1b16 SHA512 c3b99f74273407e2ae280cbf67a891902c2aaaec0c84ac7aba01dfc5dc8dca0e547386ff0ff586ca7b8c9404a1a5ff9f3553828eaae8f5f9f57500ee56bc3287
 DIST texlive-module-voss-mathcol-2017.tar.xz 552 BLAKE2B 6474f98c9c077ea7dfa5d2a238ca065dfd725ad061ea04c2f5cd1f6583887e9ab28be28d94c6c5342ed97c208bfd46310a842844437373a3002cd38e95bf1b16 SHA512 c3b99f74273407e2ae280cbf67a891902c2aaaec0c84ac7aba01dfc5dc8dca0e547386ff0ff586ca7b8c9404a1a5ff9f3553828eaae8f5f9f57500ee56bc3287
-DIST texlive-module-voss-mathcol.doc-2015.tar.xz 230652 BLAKE2B a39ce9c1008954477678a05ce5f39dfaf37f94ebe2d0f93668d5d4fff67d12c1c178ede8dca7e6a6d27cfec58f82b6ef8a5ddfd2e1645f8c669a1364ba75e037 SHA512 cebd7d699eb8b2c38f30bda08404a130f205d25cf408e2c67c0a5d98911686358996bd225d6d68474ff0f5a000b718e6eb43955750af542f4e3cfb2381292c30
-DIST texlive-module-voss-mathcol.doc-2016.tar.xz 230652 BLAKE2B 241c60d9b5384986bb1bd402acf726e455bcb0ccfdec25de6372f96dcf045a477f63d2202e571a9b636bd2eb155a25a934af5915e8ba7ba76a482426e2b327eb SHA512 96696525835795ca68a0c81ebb2ee5d6c476ea5fe4530c151988d6aa87b93a7088619693e4695eb298bfaadb683a1fc3461102aa1e6aefa9a08ef3e577371f8d
 DIST texlive-module-voss-mathcol.doc-2017.tar.xz 230640 BLAKE2B 8e71203fa3dc3958fffa93fe9bb2c36d2e2a520dfedf7a62b18d646e6879f8ae6eaa5374f04321de6561599e5c4b9d8bbf583926d89f7f5823ec53a93a9c867f SHA512 f2add19457add6311f59b8a8ecde14e53d0aabfa26698aa109cef1a3c63eb83eeeac32c16818d2ec3483373b9e42bc873a93cd899626b46a363772ff07466894
-EBUILD texlive-langgerman-2015.ebuild 2234 BLAKE2B 60d764b026e67183cdf963aa8286836a18ba4e67626e722d9272425be976f8540257a7a12f12c525a9b8054f96448cc65feddbc8a545c180cb11a938ac48e0fa SHA512 9de673f7ea085be19ea58b8521784d2e865d939b0830d5fd15af5815ec286663ad730d3de2151335affb462e9d566c5cd09adb4bf35eebcf1f572af9f71f2eb2
-EBUILD texlive-langgerman-2016.ebuild 2378 BLAKE2B 3110ae2ed3d58c25f1acf6812b16fc2ab6210c2aab161c7c08b2100000ec5ad04cad688ddd7e8bfc9399c2f53311abac8b218d593046d75b5799f9d822787535 SHA512 f8bf4fdcfada8dfc960c2ef7f3107e485523682e13b5d46a717c05d4f51616c710141aaa052b5c121eec5ebc2eb8222d5f609aaf89941c73e51c81ec7be76013
-EBUILD texlive-langgerman-2017.ebuild 2382 BLAKE2B bdfbb59f37253ec8fc7480b55833c8ef7c5a2a88be90ea1418a09aa7db8033b0cfee9860761508ace486d34eead75776bbd3000852e01e9d10bc68c81cd5a83d SHA512 4bfc7a1e2c9baeb11538f9e178daf047fc2bc3fdbe304d9a349c105c253ad3568ffa9ce9d1573c7255ffec32cf6f1e2aa4a016767fce93559dc8d4ed1b73c6ce
+EBUILD texlive-langgerman-2017.ebuild 2381 BLAKE2B 46d1907f5361adddeef845f4d97c33c17837f28e65077b78bab8227df69ca41138bf8481ff7799acaede08f7ba2a9925c9d35464bdac9d4a396f9d75fb9d6603 SHA512 d38a21e4d82fdfd9930ddaaaf036f4b8111951027bc4a81df4b7db451542e0e863ff271d1c05d989360800be6d4a41cae8d5985280072075c919ae7db59b9a49
 MISC metadata.xml 430 BLAKE2B 41e8c9acd74fe643e9c5dbeac94931be157c58d415956f514e80e9b4756ea3652fb7852058966e0754b48516f6554304eee95f2561aeb4d94ece0b77dbc459b9 SHA512 94807ed6a052b681bb2c080ff42a333ed33229f5b14047d8c669eb34351158cdf40448ae8d57eae7ed25aa74fbeaed05fe0d393944072cd21d4ac9986344530d
diff --git a/dev-texlive/texlive-langgerman/texlive-langgerman-2015.ebuild b/dev-texlive/texlive-langgerman/texlive-langgerman-2015.ebuild
deleted file mode 100644
index 117bd72931c3..000000000000
--- a/dev-texlive/texlive-langgerman/texlive-langgerman-2015.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-TEXLIVE_MODULE_CONTENTS="babel-german bibleref-german booktabs-de csquotes-de dehyph-exptl dhua einfuehrung etdipa etoolbox-de fifinddo-info geometry-de german germbib germkorr hausarbeit-jura hyphen-german koma-script-examples l2picfaq l2tabu latex-bib-ex latex-referenz latex-tabellen latexcheat-de lshort-german lualatex-doc-de microtype-de presentations pstricks-examples r_und_s templates-fenn templates-sommer texlive-de tipa-de translation-arsclassica-de translation-biblatex-de translation-chemsym-de translation-ecv-de translation-enumitem-de translation-europecv-de translation-filecontents-de translation-moreverb-de udesoftec umlaute voss-mathcol collection-langgerman
-"
-TEXLIVE_MODULE_DOC_CONTENTS="babel-german.doc bibleref-german.doc booktabs-de.doc csquotes-de.doc dehyph-exptl.doc dhua.doc einfuehrung.doc etdipa.doc etoolbox-de.doc fifinddo-info.doc geometry-de.doc german.doc germbib.doc germkorr.doc hausarbeit-jura.doc koma-script-examples.doc l2picfaq.doc l2tabu.doc latex-bib-ex.doc latex-referenz.doc latex-tabellen.doc latexcheat-de.doc lshort-german.doc lualatex-doc-de.doc microtype-de.doc presentations.doc pstricks-examples.doc r_und_s.doc templates-fenn.doc templates-sommer.doc texlive-de.doc tipa-de.doc translation-arsclassica-de.doc translation-biblatex-de.doc translation-chemsym-de.doc translation-ecv-de.doc translation-enumitem-de.doc translation-europecv-de.doc translation-filecontents-de.doc translation-moreverb-de.doc udesoftec.doc umlaute.doc voss-mathcol.doc "
-TEXLIVE_MODULE_SRC_CONTENTS="babel-german.source dhua.source fifinddo-info.source german.source hausarbeit-jura.source udesoftec.source umlaute.source "
-inherit  texlive-module
-DESCRIPTION="TeXLive German"
-
-LICENSE=" FDL-1.1 GPL-1 GPL-2 LPPL-1.3 OPL TeX-other-free "
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~mips ppc ppc64 ~s390 ~sh x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-DEPEND=">=dev-texlive/texlive-basic-2015
-!<dev-texlive/texlive-latexextra-2009
-!dev-texlive/texlive-documentation-german
-"
-RDEPEND="${DEPEND} "
diff --git a/dev-texlive/texlive-langgerman/texlive-langgerman-2016.ebuild b/dev-texlive/texlive-langgerman/texlive-langgerman-2016.ebuild
deleted file mode 100644
index 953029ccc290..000000000000
--- a/dev-texlive/texlive-langgerman/texlive-langgerman-2016.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-TEXLIVE_MODULE_CONTENTS="apalike-german babel-german bibleref-german booktabs-de csquotes-de dehyph-exptl dhua einfuehrung einfuehrung2 etdipa etoolbox-de fifinddo-info geometry-de german germbib germkorr hausarbeit-jura hyphen-german koma-script-examples l2picfaq l2tabu latex-bib-ex latex-bib2-ex latex-referenz latex-tabellen latexcheat-de lshort-german lualatex-doc-de microtype-de milog presentations r_und_s templates-fenn templates-sommer texlive-de tipa-de translation-arsclassica-de translation-biblatex-de translation-chemsym-de translation-ecv-de translation-enumitem-de translation-europecv-de translation-filecontents-de translation-moreverb-de udesoftec uhrzeit umlaute voss-mathcol collection-langgerman
-"
-TEXLIVE_MODULE_DOC_CONTENTS="apalike-german.doc babel-german.doc bibleref-german.doc booktabs-de.doc csquotes-de.doc dehyph-exptl.doc dhua.doc einfuehrung.doc einfuehrung2.doc etdipa.doc etoolbox-de.doc fifinddo-info.doc geometry-de.doc german.doc germbib.doc germkorr.doc hausarbeit-jura.doc koma-script-examples.doc l2picfaq.doc l2tabu.doc latex-bib-ex.doc latex-bib2-ex.doc latex-referenz.doc latex-tabellen.doc latexcheat-de.doc lshort-german.doc lualatex-doc-de.doc microtype-de.doc milog.doc presentations.doc r_und_s.doc templates-fenn.doc templates-sommer.doc texlive-de.doc tipa-de.doc translation-arsclassica-de.doc translation-biblatex-de.doc translation-chemsym-de.doc translation-ecv-de.doc translation-enumitem-de.doc translation-europecv-de.doc translation-filecontents-de.doc translation-moreverb-de.doc udesoftec.doc uhrzeit.doc umlaute.doc voss-mathcol.doc "
-TEXLIVE_MODULE_SRC_CONTENTS="babel-german.source dhua.source fifinddo-info.source german.source hausarbeit-jura.source udesoftec.source umlaute.source "
-inherit  texlive-module
-DESCRIPTION="TeXLive German"
-
-LICENSE=" FDL-1.1 GPL-1 GPL-2 LPPL-1.3 OPL TeX-other-free "
-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 ~x64-solaris ~x86-solaris"
-IUSE=""
-DEPEND=">=dev-texlive/texlive-basic-2016
-!<dev-texlive/texlive-latexextra-2009
-!dev-texlive/texlive-documentation-german
-!<dev-texlive/texlive-basic-2016
-"
-RDEPEND="${DEPEND} "
diff --git a/dev-texlive/texlive-langgerman/texlive-langgerman-2017.ebuild b/dev-texlive/texlive-langgerman/texlive-langgerman-2017.ebuild
index 54d62e27705a..39f2ccdc8d7c 100644
--- a/dev-texlive/texlive-langgerman/texlive-langgerman-2017.ebuild
+++ b/dev-texlive/texlive-langgerman/texlive-langgerman-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive German"
 
 LICENSE=" FDL-1.1 GPL-1 GPL-2 LPPL-1.3 MIT OPL TeX-other-free "
 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 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2017
 !<dev-texlive/texlive-latexextra-2009
diff --git a/dev-texlive/texlive-langgreek/Manifest b/dev-texlive/texlive-langgreek/Manifest
index b49503f1e93a..2a10ea62f977 100644
--- a/dev-texlive/texlive-langgreek/Manifest
+++ b/dev-texlive/texlive-langgreek/Manifest
@@ -1,167 +1,57 @@
-DIST texlive-module-babel-greek-2015.tar.xz 5956 BLAKE2B 6b23a93a2e2c3bd23402362ab635d5fca0a7259ae2ec3eefbb00755f4483193470004b7cbe08ab36dabd93638101a10787175d3ef08fd340008694199c55bbff SHA512 5076b9c23f406df27f0560c5a1ab1f298287798ca033649dddeec4a662b4634a70cabf81baccbdc01a432fcc80ae3fb300760d505c7cc620f95d6b51d74a2deb
-DIST texlive-module-babel-greek-2016.tar.xz 5736 BLAKE2B 087252e90ccce34057bf046d8c6abdfb4026d31521fcc0376db0a3a16ebafbfcd0f8936f4344600db90ec1d719ef9762111d1eb8b4280001a8d0df734d48fc67 SHA512 062be08f7f733078bf31ad8013df168eadffc8c9f44cfc6f21e98f55cf2debe448021ef6e18c002f9113c15528a186148236295faa995cc8df89f0ffcd9cee0f
 DIST texlive-module-babel-greek-2017.tar.xz 5736 BLAKE2B 087252e90ccce34057bf046d8c6abdfb4026d31521fcc0376db0a3a16ebafbfcd0f8936f4344600db90ec1d719ef9762111d1eb8b4280001a8d0df734d48fc67 SHA512 062be08f7f733078bf31ad8013df168eadffc8c9f44cfc6f21e98f55cf2debe448021ef6e18c002f9113c15528a186148236295faa995cc8df89f0ffcd9cee0f
-DIST texlive-module-babel-greek.doc-2015.tar.xz 1135988 BLAKE2B 8007005f7cc6480a733f68e7c4d3ff03a3b7b6511eb6c1fdc45c211cb1dfa89da67b10a3e77c7e1f8ae870ce525651ffc5bada9282ff3ee2f13287ea3aab90c7 SHA512 86942c20acf461ada89000ebc2a2cd9efbbdffc9b9770d571dfb26e93690a59fa5247c0d504f2422f8b1db39da3e5e2e57821278ac1d3468cfab7729eb6674dd
-DIST texlive-module-babel-greek.doc-2016.tar.xz 1023932 BLAKE2B 9471f2780af43415ef2ef291d927078b30450973770aa12aabba73ba12f7164e28d5b44fda521f5c4160c1643220e6950ed5e22eac6c2f77bd9328c6b0d32bc1 SHA512 b1926a9aa6228425b79c29693fdf8e9108052657a0ec0ecdc17ec0acf9ddc2bb2be9422262b408d0e6978d3cb44027eb624996ae22e5fe3cde1adc7097a7d91b
 DIST texlive-module-babel-greek.doc-2017.tar.xz 1023932 BLAKE2B 9471f2780af43415ef2ef291d927078b30450973770aa12aabba73ba12f7164e28d5b44fda521f5c4160c1643220e6950ed5e22eac6c2f77bd9328c6b0d32bc1 SHA512 b1926a9aa6228425b79c29693fdf8e9108052657a0ec0ecdc17ec0acf9ddc2bb2be9422262b408d0e6978d3cb44027eb624996ae22e5fe3cde1adc7097a7d91b
-DIST texlive-module-babel-greek.source-2015.tar.xz 20456 BLAKE2B ad9e71609d383d365c9547bf2cbf9e09ed2024c2a5c5f7a158bc0cf7a79d8633b206362989b880b616b8e917a0dd12cee4c442c8bef3fcd437b8426d8381f957 SHA512 837174587535f13fee1a324cf62c54750f8ce26291ecd6d14100201ec1ecc5b3369b873969c4651573e213d1a0ae977117f10517f82e35337b7eb9c97057fc6d
-DIST texlive-module-babel-greek.source-2016.tar.xz 20000 BLAKE2B bdcbe6bef9cc0acbe5bb0f618b97ad33022f1805b0f1bde77c2209cb348329718b389b3686ff5f9ca3e09610490fab620fa576c415df019923c002e56335c760 SHA512 93938cfe14712551ddb2da69b6f9ebb163659fb33319df12dc1323aabdf1df8893fcdf19ddbe20414c2b9ec65d46ce7ad27deecf996c9f226ba6b4ffb8f690e3
 DIST texlive-module-babel-greek.source-2017.tar.xz 20000 BLAKE2B bdcbe6bef9cc0acbe5bb0f618b97ad33022f1805b0f1bde77c2209cb348329718b389b3686ff5f9ca3e09610490fab620fa576c415df019923c002e56335c760 SHA512 93938cfe14712551ddb2da69b6f9ebb163659fb33319df12dc1323aabdf1df8893fcdf19ddbe20414c2b9ec65d46ce7ad27deecf996c9f226ba6b4ffb8f690e3
-DIST texlive-module-begingreek-2015.tar.xz 1660 BLAKE2B e2e02cd3d28ba78376bd202c3a6265ae495f52994c26c3ee75cb566814fb1b0db3be38c9371dd30a3203c5c1b22723c4fe599d2a9c94d09e2ce5165e4cb36579 SHA512 8feb0604881b8d922f1079452f22d84bd14a1549947bb762136a4e2dae7564c4f391604ff3a3ae75f6a2f5ad4e7820deebdb8ee649b9d4a585ba2fe0bbcbeb17
-DIST texlive-module-begingreek-2016.tar.xz 1664 BLAKE2B 6b591efc30355f2fb368fc09afba9cfb344b365b852c1e54fc960448c09e0ef340ab73ea37c989e3a0c90dfaeb6489eb78669c4ef6d800d8e4c9064b8acc0fdb SHA512 7e109afd90db7d7d0a22c6cee0e0cd80574e4908a41a0c349b419400ea0a8ad4052c86ce451c3660fad8f5ed130e785cc4020d9e0283c43b1bf11d0a56ee2106
 DIST texlive-module-begingreek-2017.tar.xz 1664 BLAKE2B 6b591efc30355f2fb368fc09afba9cfb344b365b852c1e54fc960448c09e0ef340ab73ea37c989e3a0c90dfaeb6489eb78669c4ef6d800d8e4c9064b8acc0fdb SHA512 7e109afd90db7d7d0a22c6cee0e0cd80574e4908a41a0c349b419400ea0a8ad4052c86ce451c3660fad8f5ed130e785cc4020d9e0283c43b1bf11d0a56ee2106
-DIST texlive-module-begingreek.doc-2015.tar.xz 709920 BLAKE2B 147e0251f75e17d5f44abfd71f42481d02d8a74f934adfa32873fdbbe02084f9b06edc54018b6381cc65780261964ef55a451c739653c4ed30cf1386262153a1 SHA512 6370fca9e5079e5cee04311d24fb33755eb40d918bd703654160b5fc84bc34f0290cad556ab29562d92e9337a73ee930022f956927772c13b79548a322b818bd
-DIST texlive-module-begingreek.doc-2016.tar.xz 709920 BLAKE2B a3e454876061c4c4fa76b58441c5ca8e792fa5ffc140626de0acd029b7b7a0706a9933fd37c890a5e535f98c83f3b02cf32fec7c9f2078da7fd6973f285beb6c SHA512 4c36a1be49eda02890e99d1add51c7227ff63389bd48f40214d7931fc8be7b3afc3b0f305f402cc14b68ca1d9b561d31e8bfe933c9bee9b9fea146a68a87f009
 DIST texlive-module-begingreek.doc-2017.tar.xz 709920 BLAKE2B a3e454876061c4c4fa76b58441c5ca8e792fa5ffc140626de0acd029b7b7a0706a9933fd37c890a5e535f98c83f3b02cf32fec7c9f2078da7fd6973f285beb6c SHA512 4c36a1be49eda02890e99d1add51c7227ff63389bd48f40214d7931fc8be7b3afc3b0f305f402cc14b68ca1d9b561d31e8bfe933c9bee9b9fea146a68a87f009
-DIST texlive-module-begingreek.source-2015.tar.xz 7452 BLAKE2B 5dbece50e5d6ae44c6f1393cdb54a07435b25bc7a2bf22e3dedd4bdcc0ca218898f2e3ec0fd6e3e3cacc5c6aafc8491249b97daa04d984e31b35fd9ab0f92423 SHA512 e2b229e881352bd36c7f716d79bb1ec58a65a0e9b82a5e8d89359094107c5782579c67292f0b103f382f55614750a05ad44b4dcfbab0e6bf7534410f92c7aa8d
-DIST texlive-module-begingreek.source-2016.tar.xz 7452 BLAKE2B 042bd44dff44a2c5521a1983d5e8434cd760b9c2078bf1d81094a95c8168b61822661030be978a397b738eccc5a4705e7dbbb6ef8ff0e0e306647535cb73c25d SHA512 d44623ed459c46e5da8156a2682fb81d0bfd4810c13a1155fbf1ab21589a2df32e40a29b553cb78275b20fd53f79cfe09e3a95fd60c4e73518106dc3b8e45e79
 DIST texlive-module-begingreek.source-2017.tar.xz 7448 BLAKE2B 9e4078ba4dd684765b3f38f0af4bd9164b0f26261686da2ef8dedb66c69decf63c1ad9c06d90ca4146663a19b911a1b430502096cc5b5c30592780673c3b012e SHA512 80d9348a72a369ccd3f36b259fdfdb5d021852ea594dc2d9dceaff1fb957e235e93aba9761cec284381a7fb2f83ef59e37fe6f3bdafd0b0cf856739337c61933
-DIST texlive-module-betababel-2015.tar.xz 3304 BLAKE2B d717061a7b2079bd91cee1e5530b8ff74b0bf6a692a2a6a1966d888021b56c95caec940507d573f09d86cf65ffbddbc6eebe9d145b5a06ace7906bc961ccaf46 SHA512 96db46b31cddd01f14afa2b8851808ff22d442409a8f816547adf19ef8cc8b8a553656630bb4e91253e93b83734735aab57455eb7bba2236c8f6b693e1872e4d
-DIST texlive-module-betababel-2016.tar.xz 3324 BLAKE2B ae4b22e05074acfa2a4f319f78d5d7ed2836bd765ccfc858d89778711c0e0a239c00fcdd976e3008bb9b2702f38c8d6a0cfaaadc73450087a1328b3178602f9e SHA512 8507598b5b88cacdd363d61217b3e2bff77684f0f41e95e8aaccf37071c8ec549dcd6d118fffbbab5f629064b05e97b99d7067a6bb19df8fccfe048078f256a8
 DIST texlive-module-betababel-2017.tar.xz 3324 BLAKE2B ae4b22e05074acfa2a4f319f78d5d7ed2836bd765ccfc858d89778711c0e0a239c00fcdd976e3008bb9b2702f38c8d6a0cfaaadc73450087a1328b3178602f9e SHA512 8507598b5b88cacdd363d61217b3e2bff77684f0f41e95e8aaccf37071c8ec549dcd6d118fffbbab5f629064b05e97b99d7067a6bb19df8fccfe048078f256a8
-DIST texlive-module-betababel.doc-2015.tar.xz 151924 BLAKE2B 55b789b7939ca60e467a535b2fbf59cc0eebbb8fe19d12c91322d8ef3efc6e128f6c9bb8d66225b37410d25bf87b86fe884297c4cb7294ec1d425f235b02abe0 SHA512 b0cb0f7f6b73fbfd6561a1c6eddf8fb1c194b419bc975c5fe7bbffa2f46ea60def46d11d64abdc995bfc6952482b83149ea9f96d3bab32c69f280a2e1647a178
-DIST texlive-module-betababel.doc-2016.tar.xz 151924 BLAKE2B 7ff0ca50126de6db4673ea0363cc8292ef85d439ed1ca3b0d8a8294e305c6bb73f02e3fac426f6ba096afc9e40eeb0db8749c7434eb0ae0958cef8469bd1286c SHA512 ccebeeb71a350a438fa3411644f1cd4911726c09300d2d0c5a1bc3c3249a45a65d36f12493cdfa91024b3137a9cf7be6d9010a2a48c0438c023d84f95da4bd95
 DIST texlive-module-betababel.doc-2017.tar.xz 151904 BLAKE2B caeb13b46ed1775b6e2fc85610984488b4ba562a9223313a943f17bbe729ec4776308c8cfa640347be01d2c503eb601c9f1161010c343a7530c13c30f166a438 SHA512 baa79285a11a496f1970a19723b0844b869e06d1405b126cd0e6f5e4e61dc8f135a5b4bef650c15d9dec1a5a4eb761e3336ec02d20ca5c5a553d5f402e93a383
-DIST texlive-module-bgreek-2015.tar.xz 40872 BLAKE2B 0a11d0d79c3454d8a2a386636a045aa167837dd885ef1e8fc2feba9887b0a6d22a54dbf19cb7874930ea3a39b86766b5cfe5cabd0a5591f501d4e2a6d423927b SHA512 34a76947c84b99dbbb615e978a8c16d4fc3f0ac8cf99c23eff713245684ecd41cec200121503b23ac8f69c2ff62a609d5bb9ad7ac8cb844ff056f1c141eea2c3
-DIST texlive-module-bgreek-2016.tar.xz 40880 BLAKE2B b7744c0b5793a06a521826ac305cd34f656b1ebb3cc2cca4af87531e480567d12931b32ef2562758c28eb2538933bf278105a9c4f71d02dd08c07d78278d2ccb SHA512 59333f67cdc88b153cea4d47b814e3bcb0c71a4d24c1d4a91d2830df8c26963da0fee3e9e4f1f9d811382c3fe2b9c10d23aa792ced0b0682104bfc0e63485a8e
 DIST texlive-module-bgreek-2017.tar.xz 40880 BLAKE2B b7744c0b5793a06a521826ac305cd34f656b1ebb3cc2cca4af87531e480567d12931b32ef2562758c28eb2538933bf278105a9c4f71d02dd08c07d78278d2ccb SHA512 59333f67cdc88b153cea4d47b814e3bcb0c71a4d24c1d4a91d2830df8c26963da0fee3e9e4f1f9d811382c3fe2b9c10d23aa792ced0b0682104bfc0e63485a8e
-DIST texlive-module-bgreek.doc-2015.tar.xz 207580 BLAKE2B 0ecac7f4f97747352298727ed71878aa5584f999db391e6565865b56536ae24e090a2ba36e032a7b941d44b520363c88ddf9f94c2ee476b5df34aba505c6e3bd SHA512 987797783a3f6cd3ebb60a45570573b4e14a1587125729dcf0233f52c6430085d8f05e79116f621b9632315c29685e6130e74de4912ef970d31d0512f4ecae9f
-DIST texlive-module-bgreek.doc-2016.tar.xz 207580 BLAKE2B 98046a5026069e4125f9dfc4a1febf5954ce45aedaad38a182316b4b0f5e11bf86f7717320e059d8fcbc79d962619860e03de762d75f441a20adceb30964f3de SHA512 6dea85f9f24db629d93a88efd854433baafe9552a45ce02357dc2387776099193b7b645c1d22d37bcaf7151d53ed00a15885a478f44fed1dbe9e8b474ab5580d
 DIST texlive-module-bgreek.doc-2017.tar.xz 207580 BLAKE2B 98046a5026069e4125f9dfc4a1febf5954ce45aedaad38a182316b4b0f5e11bf86f7717320e059d8fcbc79d962619860e03de762d75f441a20adceb30964f3de SHA512 6dea85f9f24db629d93a88efd854433baafe9552a45ce02357dc2387776099193b7b645c1d22d37bcaf7151d53ed00a15885a478f44fed1dbe9e8b474ab5580d
-DIST texlive-module-cbfonts-2015.tar.xz 66009616 BLAKE2B 1d306c3d987e537a582ddbad9cf9d59801609a0fc4529c26228922c11ecb8f8ef97b06036564da0659872d8612afbb9e4d1c4022d5d3e6beb1241e1bdeee97b8 SHA512 2d4b214b8c77cca40c47d9c47a909218e90c36041fe218c4382b09ad5ee1c6d794dcc860d508e685eecfb8ff4be92a722da2fe58e82a53e740c68d1c481e9736
-DIST texlive-module-cbfonts-2016.tar.xz 66009620 BLAKE2B 587771745621cfc7931d34fdaeb9ef4e76ea8a199c65276870febc440ae3e96b14be9e3f7ade6b2fe26158ae24e661956c8b0d82a8310f23f73b16b7d1810eba SHA512 1c752c6acedbcb2bd4692fdb7171e9cd3579b981bb333f9a320dbff2077d696a21a1b97ed0bba68442ecde42cd64c659369dab5bbbdbaa1712c2031458d0f0a2
 DIST texlive-module-cbfonts-2017.tar.xz 66007292 BLAKE2B 1e5bb24695b91a5081cf24afe20cc347f10137aeef789ffc483a2a74d57a6f902a9d02fbfff4ec86f756cc6c2c260e423a5e5a2cb100f9492f66e0877cb70499 SHA512 7a258c834623bd653926518beff97a8fe4528e8c9eab1bf2f1e37e808dba6e5f478853d00681ce8b80a1f2e3ed85a60894c2dd86f10234faa1b79627c1180bb6
-DIST texlive-module-cbfonts-fd-2015.tar.xz 3168 BLAKE2B ba3b90dfb49e2a5b293cf601bd2bafa1aabe1a62cb7535f680a75ce1ce94b8bfbb3209a112f5253ce59fdf6efa56ce313ce7d9584c86af1e950be3876944d2b2 SHA512 bf539923b971667f9819719a0dd6dea7759757ea1a7f955ac7256a1cf3741134c80d81135ee6b4f1018c1b42fe898d893e4f0483087a41e282195d0f9ba9d730
-DIST texlive-module-cbfonts-fd-2016.tar.xz 3308 BLAKE2B db41e8d3b8f26230fc956018ee816ca138498e9a4c0a06480877b878c079f332f7f7e7727ee4de9e3fe2141b1cf55fbe80a420432c8db98a870a4f2a8e5efe04 SHA512 743793e22c39fe91def8880cf6332c20c4f1785e0b307a202af72f9c62510c1b23d59d73ef0e74ab61e9fd41de525fb2cc1ddecc13c002ac46306f3fe5610bf0
 DIST texlive-module-cbfonts-fd-2017.tar.xz 3312 BLAKE2B 683988315cbc92d81b398186ceadd0ed016b3900e66fa03c2d04f14b1843cc1472d6d3ba7d94d5b8803081a7bdba9a59eb6842bc4344e655e87c5f560c1ff7c2 SHA512 4f6877871c6feebcff66540c898ced27417b6a9474e08cd4fcb180d8b3ed9428380d3a29d8f34eb36e61c4d726e20475d8ccb8a5f9a52b75639e51a1c131fe67
-DIST texlive-module-cbfonts-fd.doc-2015.tar.xz 652912 BLAKE2B 662da3d78b7884cb758728ca346e2e1130262f77cbcc312af71c9e532ffa428319697b88f1cc9a686b91ddda5871ef89a2ac544a98ebcdc538d7fb01d8661296 SHA512 0f29ada4bc2d6ee4cf627b2af91502f8b4ff3154298c1b0190c08f8e00534ea860b04b9a0ef149b2d6fbc320c8220890224b1ad8407a613204246bd16d5b03cd
-DIST texlive-module-cbfonts-fd.doc-2016.tar.xz 444308 BLAKE2B 0117282498e20c4fa2b71215da73b2cd8f7ea0af507b71841d5a666c5dba747dc0ba3c8421418708afcb79dff06e621e4b38c516f7bc340bb78ffa0110391586 SHA512 743a2dd0a61ef75402d0b613b5cd036a954521a4d851f0afab8769b6bd22ea544f742647b637991d55507becdb3d76f21e206cc2cbac1c610f308398d08f9568
 DIST texlive-module-cbfonts-fd.doc-2017.tar.xz 444316 BLAKE2B b55826c2935199dafef747af1330f487cd0a92e82d65ab2bf8a3e6b3aa9968fa681f78a7c0d7dea68598e9c260fd6f5e319f52255005e8e614c1d6d8a92e3621 SHA512 1e29d59f4f46d0a821c5979baa42db5bf1e55ecb33fb1750a1ab22a52a86a678d428ab9c454efab9724b750947388d3bb2c92d1eae3e2c72005eed08426a29f2
-DIST texlive-module-cbfonts-fd.source-2015.tar.xz 7104 BLAKE2B 0c8a7b6f005c4b602bc38065afa6fca0bad94fd4dde08de261388c57c99fd467d365e6afc217303bfb450d368b9780468210b0d8a48a63b43c1e22fae57a96ff SHA512 25c443e880acd1655a1d36d59215c9e6395f5b6eda48cc623aadf73ec8f04e3228d7fd4a1a753dbfcb26a52bb7028ce2f088b2dd6145eb9ca17f17fc9a754a35
-DIST texlive-module-cbfonts-fd.source-2016.tar.xz 8584 BLAKE2B e9ee85dd5b913e231fcea97a81031f29fc3823d8f5bd4ecdb5a0168f15936087ca8d70bf23afbeee3cdd1f0e44e91b2ab3b8a77b21e16e74db84858df5ed210b SHA512 60cc620039981ac67cefe9aa21ea0074518ed3be03959f399634248b57fc9014152bd72c783dcb8de72e7f1b0d3b98998231fc39101930a2ec5293adb20612b1
 DIST texlive-module-cbfonts-fd.source-2017.tar.xz 8584 BLAKE2B e9ee85dd5b913e231fcea97a81031f29fc3823d8f5bd4ecdb5a0168f15936087ca8d70bf23afbeee3cdd1f0e44e91b2ab3b8a77b21e16e74db84858df5ed210b SHA512 60cc620039981ac67cefe9aa21ea0074518ed3be03959f399634248b57fc9014152bd72c783dcb8de72e7f1b0d3b98998231fc39101930a2ec5293adb20612b1
-DIST texlive-module-cbfonts.doc-2015.tar.xz 428692 BLAKE2B cae394651578d88a3c0d1f6573b4a443eae144f037aed029f9dd8ffbb2b5d60739c53274d5c8cd57e86165acbcc08ec40c6230c992970f8657609ac5278b4114 SHA512 65aec79996a4c8c67b8bb1c58e8b4d1bf9015fc232cc22c4fd89a7f7f9e824d715d7af035364d4010179b0d299dcd9989acf9bf1861e7be5762cbcc4fcfba48c
-DIST texlive-module-cbfonts.doc-2016.tar.xz 428692 BLAKE2B ec9b5c2b0fd8fbf1ec7ae39d39d0db571a7fc50672ca501a115b8300259ae4571da379d1a6953a33a5dc694e5bd55b38e514e9763fba52df0503ac8f961ff84d SHA512 4910d66786579011c580d25c144c3be1a3e1c9996894f4e3d67870e062cfa8944c1006f83476c36493c970f3b3787486f3325a3f8d2a11c0941ab5a1766b5915
 DIST texlive-module-cbfonts.doc-2017.tar.xz 428688 BLAKE2B 500fce36f8ad5426d3431210553202fc990ff1936fae81e068d5487acc9543b22106e2133b26f0999a095eefbaf58809d17c47089486eacd4156fb711a38fbe1 SHA512 00399324cd89cf49a5ba027615e9926f7067f01d237285ade8fcd7ecc7677a8caf58052bbf4298658cb28a49bbcc192d5751fa30a281944e3f1a7bb84589724a
-DIST texlive-module-collection-langgreek-2015.tar.xz 424 BLAKE2B eaa283865a5a58445775365dfdbd5eda2f6255a1c99a93ddf9016f4b66f650ff7b731365ff6d1bae93552f605e4ce4fc389e996afa97419bacf640a3e012bef1 SHA512 91d4e7f7cab6b43e885ef74ed0f650bb5fe900e58e66db16dca9d42caae0d894687ad50d121e3e63fd835a0aba5ca3d2fc784a38b8370f32e246e0beb5455d85
-DIST texlive-module-collection-langgreek-2016.tar.xz 432 BLAKE2B 121de085adbb12c6b912b8ae1e7a997fe7b7ec7b66fa27b4e503e8b4060e817edbbdc3669a1a3b627e7d34196648ec2bf87fb718aca1ba56933953daced498d5 SHA512 925203f0bf2e0abdc8007c207191b2e7dfed44fc9b951c03cfa537e8ed80aaa4aac56fb6cd535d5afc0fb11aab69295248dd4c03e957c7f1e13576242b3f94ed
 DIST texlive-module-collection-langgreek-2017.tar.xz 432 BLAKE2B 31b1d789861155473320bafd975c5d6e0c486a9a852e6e0eb32c81e0a5df12d9f4e03f41820b14404497b482358efca96eb67691f17df435b4fde7ff17b2e050 SHA512 076f00a0178dc481c3a9e7e1a01322cd312f9f2d0250c0331b1488020d335fcb06f51ff463eec8b5df7ed2ad3d3f22dac1d6ccbb3d5c04c645a845f6f6b0b006
-DIST texlive-module-gfsbaskerville-2015.tar.xz 116552 BLAKE2B 99362bac9f9f18a369de53d6eea611ef3070de2caf6f7053eb940e26c3939191616956f99cbad4e178d88afbd4814e06bf2fd7596c5b498ac0bf5584f0aaf61c SHA512 e6540e591fdaa004def0ca2ce2124c13d4acbc763e51feb6b6fe825b42c52452060ac57e2e7b93fa57f24e5d45c2862b1099a49200185ad834a33979a0ee79b3
-DIST texlive-module-gfsbaskerville-2016.tar.xz 116576 BLAKE2B e93f88a2e274728dd197b49d9d80c6d72cab685c5aed943ce1fb069a473fce7abca568358607f6e66e28f73fd049afec25aeb4844be9ae2472db73ce18d0c424 SHA512 6fff2b6ce298c74fa80fd9975488139ac28c4d2121ef604c0bfc2abe48a3d3baa1f00deeb17fd7b1f650113cd516f972d9bfd74ac6830ba07c0b230fc9c944a6
 DIST texlive-module-gfsbaskerville-2017.tar.xz 116564 BLAKE2B 71e650f4366b9a166586b29878fad2910226f81f8b0f76e7a691bf888c297f54df16233c74e08408e74c9e5a7758ffa8ba7cd483ff37239e8bd815ebcdd038bd SHA512 8f3b1a77371e52496dd55fc05169a7df8a1d29c856a5a917a1bbc7f00d1863fe1815a991132bc12865296f26669b2e010ece01ac9fb83d3793c457a1fc135c1e
-DIST texlive-module-gfsbaskerville.doc-2015.tar.xz 45796 BLAKE2B 8bd2e8e1eb8589b971546ce3018caa346542d3c0b956f10c1d265f10da67e3c4ce6c5b09a961a69da9079613db38a571167cb2b820595fecb33d37be3f918b64 SHA512 916eec53d53df9547aaa05359f55093f571fb7ccad5be1c49d81fa397ab63e39b1d2e48d774b34c8fe57675da3bb0ab5c4312cf3f9970f45d9a6865ff1739534
-DIST texlive-module-gfsbaskerville.doc-2016.tar.xz 45796 BLAKE2B 69a6554b878f4d7da8ca768658126e193f1d9567344204abf87087772b632f10c773cc819e30ca2aa2d76bd328022f5215ade01a1ff0b640b11be51e78ae457f SHA512 a693cd6fd332b67ae490a108e4e3b7afe144919c7dc152d14665cc92816e7f4a3dd2af44ce11752cc35b62e1c2283bedcfff6ed33c95530e8ad084854e00f9b7
 DIST texlive-module-gfsbaskerville.doc-2017.tar.xz 45788 BLAKE2B d1c98ae3bfc93ffbee6330737a8fcf5c7d4088553e6dd3c7f27054394dd2e0bc7ea0fb6410b20799a1f1a0b5b8f6f277014f5aa9dea3f1adf50a1f0857fc8dff SHA512 e524c9c9322cb8ea09d3f35d396c8b75bd8bcd684fbfaaca68e502220b6fd4b1d7248c579fdcd35fbf2bec01f06034341fe1aded9a2eb4b0a30d90763ecc668a
-DIST texlive-module-gfsporson-2015.tar.xz 125468 BLAKE2B 71b6b20b5849cc5b89b26e53361b889041f2e5929a13b38093aec8ddcc716182ce9bff79194f1c995e9306d2e4b753f32c2baec54b480823473f207043fd2cd6 SHA512 fe2a48691c442e21ec35b80459ff48fe9a97d136eb9b730b37de1f7bc1fecd67584086108cfcc0971e239844923c23897fe3b828179fc58eb88171073891d38a
-DIST texlive-module-gfsporson-2016.tar.xz 125492 BLAKE2B feddb841b79805d36b55d04ca978573138d112ddb35e67ccac831e045f4257e7abb136008ec213e43c46c25264e747d77f930b746afb45e1c41cf2c85ae5650c SHA512 8d9d63358ee7315542ac4005a23571f4eb19e013c1b3d2ce7ccf21acfc20e8babcd7e56dad7b9da74f10c8d8dae25154d153fbac2f0cd22ca03638cd7ffb6dce
 DIST texlive-module-gfsporson-2017.tar.xz 125464 BLAKE2B 7f29ac0477e6d9e383e1676c8d4d11dabb15401058cde4c9f834feff2634b0cb6ddc57928d658475ecb21ee073e404b087968565f27e3ff7be8f7387748059d2 SHA512 1b8098bd718b7fb249108889681223f1b78936d10f72b4decdaf0a84772982c7a93321a3e97c36d815a895c917225de3737e2368b192495b64d4134daddccbaf
-DIST texlive-module-gfsporson.doc-2015.tar.xz 33268 BLAKE2B 0420ad841abcb96af6cec96c4825d72328c0085e7c78b0e0d1a78b93caf3df59251f3fdc44300eef9a4a249e29dd8b4b80964a9ea200f62cdbb1c73cf4c80d52 SHA512 aa12cca0872a12bf2d4c709d62ee589acbe772662e32515496ae4a95640bb9c9401771dcbe39c6a7c22b33cf7e4d158694200148b1c966b7ea8ef2565a251d87
-DIST texlive-module-gfsporson.doc-2016.tar.xz 33272 BLAKE2B 9e4dd53aacbd57cb21d63351db5141bd447fd9d0974607a3535b9f90c9aa07f1346fad57aae394bf5513f24cb2b314a8d07a17be6145780fa6e72b7cfd37407a SHA512 b9ff254efab9dbabb8b1f87cecc6c19db06676411c10f831ea742970a57df15b95baafae5a1485fa6507708b356fdafed3d72366ceb95be1787f4450c5fb6ff9
 DIST texlive-module-gfsporson.doc-2017.tar.xz 33256 BLAKE2B 90cceb994079bea681804e7b25b4d9391cf1009debf3e5f3da02478d77a446cc3997e07b960319bf6cfb8a404d52ee3e5680c8bf73c40eddf1bd95c24883e33c SHA512 cb8bec053d9eefcaf2c27ed7824607f72233aa4617e198e535992b5f282bfe6d069174e725168a142e3e1f2e79a8b10cd9c74ea6fa2b018b52c0d774aa35c24d
-DIST texlive-module-greek-fontenc-2015.tar.xz 21840 BLAKE2B 4a4cb5c42bfa88d8ac12fe1da0835db3f2fdc6d52a8e5158bdf91261ae2bae4a33a8f4e4e9c01bef6e58bea7c5819a145756153e9c043edbf73be722deb3437c SHA512 fa299fd22f4fe563af3fc0051518f8cca5918942ff9389fa17487536b23f78360af90dd1a4a2dc8e3971f352a346f45408c65cfbdc191f4d8e456a473f8a2901
-DIST texlive-module-greek-fontenc-2016.tar.xz 25080 BLAKE2B a81847d8dfbae2f6fc5240fbcce4ffbf7d1b8c1d1fe55e4f40b4270961ea4f8824e98a150a86d7b19d16ddd5fe50615565aa262122de94e53be87754d42cf746 SHA512 5a6c5f98d0a274f21821eec74531f3b67d5dd2274576959989b783b9acf2e3be61cbfe9635e3948f90fcc23c0b30cad937d2f656c833dcfb3fa5824662bd622c
 DIST texlive-module-greek-fontenc-2017.tar.xz 25064 BLAKE2B 1a53bf866cad521814a15cd87999741ae098fc3b28efdeb9f2a1b46412c006a698b9c6a5cc4197ab3277b1404a4f0458f83a638d9b9bf6b79cbec34c2c4b46cd SHA512 605f1d91a43146603279cbcecb2da650dd4c00c13399e01da328878dce44777100b4102b5f9a23fc81c63c50427c2f5c9a71b1b8e706977e52e077717386a13f
-DIST texlive-module-greek-fontenc.doc-2015.tar.xz 1335948 BLAKE2B 56ea3b598570b194e5e4d4576736461f8344c1c9a4e886e85c766161d33b98bb9e601effbdd5547f49f3b1ec3e720e7f1b4a97333e59f1eeb946b3c8817d1b08 SHA512 470627aabc0d719f24d9e65d9629a3af943a411f8c8ea316fc25497f4fed4e107cf6535403039a7293d7d294977f46e44d3619ad3412a506fdf66dce9a20145b
-DIST texlive-module-greek-fontenc.doc-2016.tar.xz 1755196 BLAKE2B 0bde234661d0a287e97008cf62f6494080ffe647dcdd625f4a12cf7d3d90a173df54c36475ecba02f4815eb19370313e6b00eca599f58fe7846c738a677b78a3 SHA512 72e516e1f0d3fb4386ced790343c58386fa1c71f67827d6fb34eb3f2282e384e933bce876ad63e1f9fff24e63d76cc736f5efa18a05b89a1f5269570f1132d77
 DIST texlive-module-greek-fontenc.doc-2017.tar.xz 1755124 BLAKE2B 61a29e69aa326645b7b92783122b1b97eed2c6d4632cf354c75cfc4da06d252ee1280b7c3ef8069a390c39383b83378e09be27674571ced4326db6ab42a7bdb3 SHA512 fd054ef5f78ea6d69ecce352e8258561dd295338410dbcee5b27f87db8c08f09d08d8f18eef7dfe918fdd6ce48a8f897d59847e1e7818d19313753b558499500
-DIST texlive-module-greek-inputenc-2015.tar.xz 5972 BLAKE2B bcce78972cdf2cef84d17e9b46c81a39591e6ac8220ecd6f840e70916b3ae563c493eea19895083a1babed3aef010ca3de3317f87ad4c630edeee847406aa10d SHA512 c400e349d3f958f73a88e5a0306f9b4b7bae6a788bb25e911340c3f7ed5e45794ba01a44b66559d176ec8c4535f89c4aea8b7a9a00f9453e26c6ff028d1f49aa
-DIST texlive-module-greek-inputenc-2016.tar.xz 6236 BLAKE2B 64d277a6bdb7ea834c55a5e1f77d81cc1805706f82df67d85850032d480814c18adc092c652fee5ad2c13e1dc6a986f830e76a1a95f9dc95ee91f1c5e2b2fffe SHA512 6ad97bcd32290e484ad99d542eb5ae6333d426b7c2c3a41ca3846c67a4279539e44a5d9e0f72edbf2882eb6c6460cb3095061198a6ddd26fb21148bd22f7e525
 DIST texlive-module-greek-inputenc-2017.tar.xz 6236 BLAKE2B d1114a099bc2e275750a46bf0387c33b39d522cb82a77141d029caef2b2ff979c14c4bc85368099d746fda5114bbccec4bd17a114727a65e6d2ee0b4b6ddda19 SHA512 432266a627b883535d306a3099c3269eace84be95adf1384264a0f4fc0c5e45947b96ece58f69e5d48f6e4518e8e789f7b3d5ae17b8a1b4b55e2f83f49393f2b
-DIST texlive-module-greek-inputenc.doc-2015.tar.xz 413900 BLAKE2B d1fa1da02f892fda006a1bfb650aef670e74d2d7906b55bf2f8e789fe4d618a268e4fcbafc80b4f2776cd961fc662bf7ed72428fdee1ea857e1ff930a0c8da47 SHA512 0014c694fba6b137bc31354f3ac6d56a6428e6588bc8266aa7894f1fec6e00cbf907a271b527f23919c7c21a543b1038dbb31a7a2013d756e21987d9b97d2795
-DIST texlive-module-greek-inputenc.doc-2016.tar.xz 413704 BLAKE2B c59c4ad6688ac1a76c02e9b59324e939cc8315edac9393368f82abc53edf0986c0f112f231a28b4355ba1fc4b73bea639ef5e4d7ce78df4b1b15fddf9815c81e SHA512 4fb1d4904350e3568c54e91bf9a71aac8db81c2652314c013de927b7d234b6ab97352a46be7c8e68560ddbf724ec86fa7485cd651fe8d7ebbb4a16a201b0ee46
 DIST texlive-module-greek-inputenc.doc-2017.tar.xz 413692 BLAKE2B 3b25777f4aa4f5ab9aafbfe58f9fd9fe1cc9d9a5a882db614df63c4e14d43c26e23820e20ae8710d953d79424b62168715e44315300dbd1b0950a75af726eb89 SHA512 b92dabada3f928b05dcecb84ea2bcd4cdb660f95a053e9e3c7ddaae9782c7c7d1ffb2200243d295a7885f26c4537db6c0ed16cfa349f4a4711a58f784fa5d190
-DIST texlive-module-greekdates-2015.tar.xz 3808 BLAKE2B fdc6570fe8c71b1200fc092f9cf674936fa8591f027106b2774b305a69f1ba13628375602d32a9b1c24d9edff84d22b9c4da98a606faf2d1c723deabb9a1a66b SHA512 ae1affd51578df982944ee56dcf5f0c0ac563b3b9280acaeaafd4d9cd50f321fb702e500489a2a9cfb8ce08f7bdd39f16d96dcd0a3850c1996c160aad6824372
-DIST texlive-module-greekdates-2016.tar.xz 3820 BLAKE2B 629ce59ed35d29c802591e2c435b445f3df7b0bc7bb48a05d693d38129f77dd142ed613e8eee7f62f870806fa4e5eab8b495480f14def7c9e742f7f715ab251e SHA512 0818bb532e9ea298b8c56cb6ec960b1791d18c2578c809351bbbcb74bdf3b92ad15459ab520e5ddfcd0b968094b3d5cf26f1c6e243e1985e4fa285b2f833a5cf
 DIST texlive-module-greekdates-2017.tar.xz 3820 BLAKE2B 629ce59ed35d29c802591e2c435b445f3df7b0bc7bb48a05d693d38129f77dd142ed613e8eee7f62f870806fa4e5eab8b495480f14def7c9e742f7f715ab251e SHA512 0818bb532e9ea298b8c56cb6ec960b1791d18c2578c809351bbbcb74bdf3b92ad15459ab520e5ddfcd0b968094b3d5cf26f1c6e243e1985e4fa285b2f833a5cf
-DIST texlive-module-greekdates.doc-2015.tar.xz 98120 BLAKE2B e19e52ccc38a2c844c9b0331c049f02f10bc2e3c556633f419731d7df5ace914d9f7a7d117d1f5336fed637da0c09fb4168c0ca8b8ce4ca589fa7d59b4fc08c8 SHA512 bb4211fe84832a9fec5bf6df0055a1986566469283960c7dc5c616f0e512fae20264ddfcf59817ff868d58a7d8c17d519012eaf93653d87b224a2d95075531e3
-DIST texlive-module-greekdates.doc-2016.tar.xz 98120 BLAKE2B 1ee4126c6deaea7c979f94c320ec52ce3aa47ac45cfa1bbe9a840fa77de5d4ce47fe2680d0c44a17f8e3bec47414b32d6915f82f79c8a646cb2195143982fc78 SHA512 0e2e6f6638f951937136c10b4d813a2e9c0e75a0b450a39351ca14ee5d382d8c288966596bacee7c2642333795d7ce64e785f4796263845f060c795d1ebc6e6d
 DIST texlive-module-greekdates.doc-2017.tar.xz 98116 BLAKE2B aaba402341bacb742ab789834c05956220f72da4ad0a6fa1d923bfc11c3bf0c42c715ef3c564e15c17042ad226bdea580302605d30d14bcfcb4e4008e6188fa2 SHA512 040414914ac5739885d28421d54a8813dc974cf4ab5e7b972cc83dd491085c90ece8f17d9a03a1e89cb7a559314cadb83668cd9e2379c81e11b27e3e5adccd31
-DIST texlive-module-greekdates.source-2015.tar.xz 7280 BLAKE2B c4c3dfcd9ce37fc55ee9b15ad438a6ba036c1e4c5329dff088ec0d02eee06fd6c83f2d9f5adc4eff8a6e2dd4010c6ae536a631f0362065f2ffa5a93e0760b80a SHA512 9265fafd1490f7f57ab0d0a67e6609ea3331ff2c442f0d4b3e80667612f66f937107288a11b0e21f57ccc5a366af2d4fa995cf0ff8a91faea3ea788d87c4010d
-DIST texlive-module-greekdates.source-2016.tar.xz 7276 BLAKE2B a0b8cf75a8fb0b7e68d7276a613a02e8eae12de72020b1987dd02b108f795e5ddb03dd729368bcda3cdafab9617740d8c3c612f11d08032909decbd559856eb1 SHA512 a61d907010f373836d6acd885087d6b3d13e693e5365b7ea2c78e664294ec7ac8a94823d17b906c8ebc80433057060dd2e4c866c3b1cced02488c83e5922902b
 DIST texlive-module-greekdates.source-2017.tar.xz 7272 BLAKE2B b39c1d3b3b2dec5842124554756b75ac5cf2a5a70f1ec8fb98d96d0cab23c49c19ba4bf02b1ae0069ede1aeaac4f199860616a65452d759db3752f881913aaf5 SHA512 23420b6246d4f328017ec044a67ad1d2815e0b0a4cd7c29b552f9d35a6f6903fc0d4a38fdaf92da9e7e24984761bdf854cb51fb79853e897d2c68f2716a56c1f
-DIST texlive-module-greektex-2015.tar.xz 5972 BLAKE2B 4cf769a884969c76ea8149f5f0266296c90108e27f1e2111ff18cfc38f1f87110ce48f27ad599183b00daaac7dfe7a8d4d993b1cbb049a2bcbdb37adad994038 SHA512 10954090de2152df14d239281bb7a70d4ca3b5bd0b22fa56e847cbc84a60bb0618b16401d1d5fa71191c87decd821719fba92c1f0be3460abb9262a49cd095ee
-DIST texlive-module-greektex-2016.tar.xz 5996 BLAKE2B a746afc12d5fcc4415597bb3b18ceef2a8b328f750e66c57fc3cd123f4248b4c39f12d7960748c57391bd2a2848e7f79288e2771dfdb39393f94173cef31a3a7 SHA512 e78882d5d59c503d7f8ab3524b3c05b60f77dd7eaa3a4296dbe3bdd7da08aa5e2b50e8832c819ed5226dc1f31fbe1bf594b4a583bea1d857b24b5b722d942233
 DIST texlive-module-greektex-2017.tar.xz 6012 BLAKE2B d10dd48547bca0be83284e4880719402e5f3e0c68ae9c747fca2b3ec2edd4ada8db4dfbe8c68a659a4c7a09c3e8c9e31f96af21b647e44c910bc3de07200a3ea SHA512 8cb4dd29de606a66a8c9ea571e64c03b03d8fbf42a3a8d6680b6d39cd4f73dd27c60c8f91ee6d1885841b87770e48f4c40fe1fa54f812a5bf871c539d0f70912
-DIST texlive-module-greektex.doc-2015.tar.xz 311292 BLAKE2B 4082644db74beb9e44b2d58395471ca3573d37bd008b23b306d29018555d6a9836f1f8d5bde4a7a7bc0aafd9263d49ce4bafc2860edecaaec5a7dd97f5a16e35 SHA512 3ec9722888d2708ec97aedd42b1dea70b723d9242bcb20dbacb6a79ffe57772e621d530a28649eaae6a18e8f2409a72bcda168285dbf0b14923148eb17694985
-DIST texlive-module-greektex.doc-2016.tar.xz 311292 BLAKE2B 33a9f8079ed978ac24b9cfd5892775234e4e8bc55c494befeef5979f82d0105b84ef541034cf4af93e5f2007e0f46d3c8c542e2c64873eae9167c2030094b7e6 SHA512 b9eca542aee1576ab86443351e4d616624a2b2cb7f77f28113a26bcbafa06a05ef53bb0c209b971d7cabfa105ed9d072311642ecbd8aefc39709fd9655297bea
 DIST texlive-module-greektex.doc-2017.tar.xz 311300 BLAKE2B 5b76404f946e0caf276c31c52d541c3e48141f4301c524acff020f9bcd33c11bb1ed8c4aabd4e63521ed78a7d54a90f45c949f64ef5cafed13a2b9e5c3ebff92 SHA512 2e1dca244449a6f5da1184761fc8e8100f74d33dcfad250a6db8052f66f14272294f062bda3cbe1671d806b6df73ee8d5677dfd3f9ae904ebc167527530cc3de
-DIST texlive-module-greektonoi-2016.tar.xz 37164 BLAKE2B 3983d27f0b50b04f142d2dd429ca50f68ebc72567554ecf58b0f8f55e857f70120a6dd4ac760b1e33950353188ca86478c83c771fe62bb98428cc23b47f6ca13 SHA512 85be921bf17e717a6a3d2f690b6e28af6dfcfacdd153748c5de8a55be646c310b57c8ba42d14473cc32a07411d73298bbd50e10863fefc6dabccea1665321999
 DIST texlive-module-greektonoi-2017.tar.xz 37232 BLAKE2B 2c7199c23a36da4c6e6ad8e898b86ca430455573961e496af72a6bd9e99a8ab2dc33c7a987c9a84bf4b720e6c7eb149267ef1ed79030b6ad7093e482e28f2b0e SHA512 3784eb59d7574f161f1e044dd18daf2a042d1193599013d4472ddcd694e1e622ffc0ac113266a8bb9a22e033af35076ee923114ad3233bb9ecdf8026eb026a31
-DIST texlive-module-greektonoi.doc-2016.tar.xz 235232 BLAKE2B 000bd8f0d66b14cba93bbcfb5d0706afd1a2495c45c0103fbdd9be3d29aec84b070af74c36a7c673db36e9cdb97f8b54fb57900a9ff796a79853d0e5a6bc0474 SHA512 7eb5824e09a4ee3972bc038c823f9d09a76726fc402d0f1287448f803ce1a9d0e985d0911d64468b8db172c8ccd2dc2c7c81857fd9353df52cc003e9c4a8053f
 DIST texlive-module-greektonoi.doc-2017.tar.xz 235248 BLAKE2B baa3a23ac1cb00fb043198efac3a89e109ff8e7198fbd7ba24f3e226dc1cf4a428d1dd2e1f857677898e3e3c7a84e2cbd5bfd833e1ffdf9123a8a655071a69e0 SHA512 4f955724c820cf77ba3a412a30c4ccc4fef38440c43bf8e5b626961077ca17deb32bba47538b1661b64e2c556efc7081ce721a524a7234a868b1d257e7af3fa5
-DIST texlive-module-hyphen-ancientgreek-2015.tar.xz 17376 BLAKE2B ce4381faccfce3c0a32aec26aba715fffc155d57304f6d478ba2ff2c2e3751baffa94e397178b9e37f969d2aeb77dd5478343b8c3124bbc25576e9c33440d084 SHA512 a8b990a672c696bc2e239919574b4fb6f7a613af7de44489190aab690b758ce8288c6fc994b5838d75b9455f9750961e94c58002a990652fd9a367cdcfbf96ce
-DIST texlive-module-hyphen-ancientgreek-2016.tar.xz 38552 BLAKE2B 5cf6fb709fd55a8d1bcf7cee0836cc9ec366f731792a5ae03efb0444ded16def6d8ac849929d9ecb96b35505bc3cab5b6df106c8ac7f71c2a430e374bf16549f SHA512 6798bc976e09a3de23a04bfd3ebac255d1fc3b55a5cbdc87d7ae557ae3cb447ceb6d7633dca75471369d2c6e6c6cf7f8690e654f584204eaa161273d8a474d18
 DIST texlive-module-hyphen-ancientgreek-2017.tar.xz 38480 BLAKE2B 3a5530121a60fd591693a9aa00945665cf7528c5f6b94ae50fc80944cf0fea7c026737df78e0df47177f1681d34facf35e09af40db84b197c52fbbf849d38d94 SHA512 357015430e95b9ab12786e2b4449f804b38d04fa22b0bf22d9c45a75adfc72c618f01a50a85f79460d390e317dc1c09599cd3b0ae2c82ad0b9945f6d1a10f978
-DIST texlive-module-hyphen-greek-2015.tar.xz 6364 BLAKE2B e07d2dcdfaa8db5314579d70e5e92161b6717e12efe14c6922d800b9253052e4e83cc3e205240fe9298c618c682f2e1a78e8dcd11dc8c85322e13fa9dc0cb875 SHA512 7d944db4687ca898deefa298ae176bff4a2bf9b0064adff9ee012237dfba4158fefb3aecdb0a4e196b847a4ed362a74b78103c03d6024302705c68c12c934610
-DIST texlive-module-hyphen-greek-2016.tar.xz 13696 BLAKE2B 4bb067baef32ab30b3ec9c59a5c922eee05733c18267f879e89726d6f64f503b06a31b4f4c629aa2fd641d60acbec674021fd2b952cd953c1d0e802a066a592d SHA512 ea85693eeaca1e7f66b9438a85b409bbabde6405be50f54759009ae0b88a644cdb772d95642867749638372afc1a8f6d7e003eb9679dbd3e3340f072cc94bae9
 DIST texlive-module-hyphen-greek-2017.tar.xz 13696 BLAKE2B 4bb067baef32ab30b3ec9c59a5c922eee05733c18267f879e89726d6f64f503b06a31b4f4c629aa2fd641d60acbec674021fd2b952cd953c1d0e802a066a592d SHA512 ea85693eeaca1e7f66b9438a85b409bbabde6405be50f54759009ae0b88a644cdb772d95642867749638372afc1a8f6d7e003eb9679dbd3e3340f072cc94bae9
-DIST texlive-module-hyphen-greek.doc-2015.tar.xz 727512 BLAKE2B f3e69fc5ea11574a954cae0ac24fc844f1a0c3db7507989b6d46897dc1d025defff02ef9a5de0ec9a5b5df1b751d18e3a1210f256ac85402844877f5ad0fa7db SHA512 3173dd04f132b6d051f5448fbf761d38607f442ed050e5c0bd7788c55338cf7887e49466f48c55d44f5264252e6e629ebe273cde58318eb695d1d3be083f8bd5
-DIST texlive-module-hyphen-greek.doc-2016.tar.xz 727508 BLAKE2B 01ad1473353bf23d52696bc128af67a7469c3992ead871809661289fd38ed77fc41a6f88b9a5527ca1b019cce595bc6e514503007c860f43af6be82c15b92d09 SHA512 002386694e0310f5654c4ae5902307c5518963d55a32678715dd22d4549cfdb992208d47adf7215bc63b627fbbc5cad0b46eeaa781ba5eb7e721b58cda674b13
 DIST texlive-module-hyphen-greek.doc-2017.tar.xz 727508 BLAKE2B 01ad1473353bf23d52696bc128af67a7469c3992ead871809661289fd38ed77fc41a6f88b9a5527ca1b019cce595bc6e514503007c860f43af6be82c15b92d09 SHA512 002386694e0310f5654c4ae5902307c5518963d55a32678715dd22d4549cfdb992208d47adf7215bc63b627fbbc5cad0b46eeaa781ba5eb7e721b58cda674b13
-DIST texlive-module-ibycus-babel-2015.tar.xz 2148 BLAKE2B 1636d710e1bd559e88e4b8398565e01d82e6fb2da2f903b1acbee83327f0961c7caff86883e078e33ce1ee4ccc5a4a270a37986dcf766f987af08eeaac383535 SHA512 57ec4a92b6f9c07672d66d7a97ffde08f3492000232b9a19e29c06b178d22da2a0ce898b77f5eeb66f3c50efb66cccf132ca2934e5de42d6261d8d6432b81dc9
-DIST texlive-module-ibycus-babel-2016.tar.xz 2168 BLAKE2B 6070e9aa2aaca96b249fd2370c3c2a89f3381007a5b45319761e0fa96cf608df9db888f98c6e4dae51a566d5f1f1d8dee31d3a525f862269eea7bb8dcb72b724 SHA512 13c469b0c60c1bfd8fdc562919ce3ef8fb0e86d76f950ba94957cca350e4deec3fef6b49dbd161c895ec13550379dbb214c0ad360f785e80b35269bea203d32f
 DIST texlive-module-ibycus-babel-2017.tar.xz 2164 BLAKE2B f7a9c13eac4d4daafcd90edc5024834e1f77a03ae9acef7e5e5f2db5ddabf7587c0a340f9560fa538368b88ebdc5d6f9dee7a3a3d33479e5c979bf98d08cf8c2 SHA512 c2af30625578806caac29fab263dc4c62d7ccbb40b32aa2e469cef23613ea2cb70f56ea4e1ec244e35f254af65ec602df92b5418264b5644cf2ba562b0bb64af
-DIST texlive-module-ibycus-babel.doc-2015.tar.xz 53836 BLAKE2B 47129a46cb0552a49fb83e742dc1171cf6065fa2581fcf2e91f4cc1ccc2174c596ff0c3b52a4093833e42f7454b9053d73fe6ba83521ab8bc889cb4c91883e51 SHA512 eda770351eddbac445704d7e037bd35d2edd15722c37e116bf060c23c8ef9e8cc81ca103f27de135838ab4b23625c842a1b97d4bdf5f6d74550c98144b6652e5
-DIST texlive-module-ibycus-babel.doc-2016.tar.xz 53836 BLAKE2B 5a017aef04df72f01e4b7db7d5c8b4f2f3c875b6bdc647226a0c3e24784ab434dbcdebdbd4d86fc752db008508f75fd13c584da7b2269795f070fbfd14e0895f SHA512 a3b4706d515775a8ece7d5fed028393a2e50287574f6391cb0e3e89ac47ed58d01b3e6d7865cbf9f8632432aa74e0d7a45a430ebdf9a44c7b26416485cee791c
 DIST texlive-module-ibycus-babel.doc-2017.tar.xz 53836 BLAKE2B 5a017aef04df72f01e4b7db7d5c8b4f2f3c875b6bdc647226a0c3e24784ab434dbcdebdbd4d86fc752db008508f75fd13c584da7b2269795f070fbfd14e0895f SHA512 a3b4706d515775a8ece7d5fed028393a2e50287574f6391cb0e3e89ac47ed58d01b3e6d7865cbf9f8632432aa74e0d7a45a430ebdf9a44c7b26416485cee791c
-DIST texlive-module-ibycus-babel.source-2015.tar.xz 7824 BLAKE2B aea6fc7943435f56b9ec240d67fe8b6d3af6c4e3ea72ef9123e13e3700671c326c1012bd6606d2701053ba965d7a7a5727c685dca431d2bd1c7ca2dbf7bcd688 SHA512 ec98b36f8f08f2b884210acc66ca2993e0d2c4ccd7bee3acdfce620bbee379a563e18dacc3fe926f56c145bb0e60ff0addc7f08864b6a4946e7ad5802d1e9bc4
-DIST texlive-module-ibycus-babel.source-2016.tar.xz 7824 BLAKE2B 9e0953034527f65ac4b276c822eb6cfdfcf82f16a61a643524d008188d82057b77b80fede9a6e722139f3b133a7946ba4b065b800f1ec095e1114c07d091453c SHA512 7c47b6cf5be0496b013729a3a41ed5f9040257c45bdd89eba97d8560ab761e3df7ed76b45d82b9b1e4c8ccc2476250faf3630e69f7b70f09ad4c863d9a3d736d
 DIST texlive-module-ibycus-babel.source-2017.tar.xz 7820 BLAKE2B 41da9ccaba431f7b4cac6c3e80e1b2f0e31a0ce54b37979005b4be86b210f6e6f0bd8f70f4a7ae2ccff62f65626cc8f56d7175bca59a4b36df40cac9ecdf8af8 SHA512 b5a441180e741ea592b547db5f01950e2665aaaf9b720937c675e0534712db8a4fa31def6d119176a32bbe638b8af074057c04023206d3a7b616633550bb349c
-DIST texlive-module-ibygrk-2015.tar.xz 138884 BLAKE2B d11029f5df4b59ea27e16acf43deb769ba9901c670f59d3804b60c0fcc9d818ed5073406cd7f401a499dc055e0e97c3782b8b9a3e8e70b5d20701b132e93a872 SHA512 d265bb8f0f39b03d418b949cdbb844c4c8d3ee16e3f1c487ef08da18b59f41dea3389510d0076ab614d1c61243eb30c078525c93edbf99bc6441742e2d8e75c5
-DIST texlive-module-ibygrk-2016.tar.xz 138896 BLAKE2B bcbeea2d8c2c796862f343fdaca05ec962200fce978398cd5ef20973f2f1453408bbb87806fc96222cad78e65509b73e7642136f3cf3cbc238d765d7ce1cde93 SHA512 ff8888adc54058714244a9191d017d57023be69e9e493d72998b0abc09229b9eb9c6ee600342409457b3bce311971dbfb6601492eae7f494d8af8c5233748faa
 DIST texlive-module-ibygrk-2017.tar.xz 138984 BLAKE2B d0e01dc2a37b339bdc5cb9939bfae447fe41283e563bf8f95c77e2b2d3c3807bf3aa29301d5cd6d7bfbb9a66a0ef4a57718eefe8b41041bb42326af12b0c636b SHA512 f1ee3b261b36f3eb9f05873455d93fde5d882d8526dc7abf36fc5ce277a12cdd42ecd849e904cdba5c5e7e64f2049d3f0c3aa122f1e8cbe917c015ce4c8d8e0a
-DIST texlive-module-ibygrk.doc-2015.tar.xz 15584 BLAKE2B c62cd21c0041da756236172e34a693e50c38d1f11f5f447145a44ef9c6e452dd028feefec51494250c308c417824eab417a5a88add55d3cce33eb0f74fae4037 SHA512 82ff18acdcdd59009a595bef66e1ceb13f3b743d77b92607c13532ffb497ec019707f6c3a8216804465a2dcd97bf94f45bd6b6eba8e1f5a3dfd4bda719094d70
-DIST texlive-module-ibygrk.doc-2016.tar.xz 15580 BLAKE2B 739ff390d0ff10bb81213a1f334917d9782b555296f9847ac1c81884539ac12a5105b7769a5b4ec8f1a02172be4f298c7344c22a8e8fd24fbf384c52a5cec637 SHA512 e609dda79fec7897476b069e44bad634dba4e9903e8b6ca382062aa4fe63593eff562b51a97ac7d13fd46e42a267b102670fefdeb550e8ac4c2d39ce56c8f749
 DIST texlive-module-ibygrk.doc-2017.tar.xz 15572 BLAKE2B 47738264ec7a13806cf45b2eb5e60e77426bf56d426645e14f450343f99a833a752aa9104c040af3b52d4e413573c50a8214f2f146cc65a1ad8d1e689807161d SHA512 3b24188c4bcd8b50dae2ea41028eb8e03c8ab7337082d0bc7aef291ab8823638ad38c8a678fbf1c3dcc2b73c808196b943b3cfd592d6eacfc5d7452332c9105a
-DIST texlive-module-kerkis-2015.tar.xz 1693392 BLAKE2B c8651d496db42fef04cf4879e322b20bf9124a8139598343b40e4e0693b9369e8a39d9f903eb9c94f3b945e2f4575220fe1efb50dd33e3998039e1e6e3b27691 SHA512 c5cd6588857fb94f0f8ea508297b3b167faf271a525378c47b8d52e6bdad90eab4078fbdbb5b4894c7b3a53a52ade472a61c80f0d49a0518286ad5f7904703f5
-DIST texlive-module-kerkis-2016.tar.xz 1693408 BLAKE2B d423391147eac89a9d87a89ddcc8aa3dec5c4b28ac1171b7d972c51183fa6b9d476110032d5aff3a9badbec8900cbf1100878f6339258a79378ad7bfd1e10f1e SHA512 0d4054392b60c3e6782d136c4368d0e30e03b6efdc91ce089f581d534f7d6ac6b0b1327be81934b707ddd341486dec6c3715edf942cc6bf65b134a15154fe276
 DIST texlive-module-kerkis-2017.tar.xz 1693408 BLAKE2B d423391147eac89a9d87a89ddcc8aa3dec5c4b28ac1171b7d972c51183fa6b9d476110032d5aff3a9badbec8900cbf1100878f6339258a79378ad7bfd1e10f1e SHA512 0d4054392b60c3e6782d136c4368d0e30e03b6efdc91ce089f581d534f7d6ac6b0b1327be81934b707ddd341486dec6c3715edf942cc6bf65b134a15154fe276
-DIST texlive-module-kerkis.doc-2015.tar.xz 2924 BLAKE2B c1c50c6f5621a819242654cf9fa05977c127b774424aa2df5314607c2625a69ec9dafe957aee5104c092fecbc671117406e196a32d8eebb95456242b413fed72 SHA512 54dce27122ed1504d47619f92b1a6d423b2d78aa265cf996d964a53a99d4572c87d7d1fff2cc80df4f1fd9025b9175b9329f0dd28d9a11d66cc6169c23d534c0
-DIST texlive-module-kerkis.doc-2016.tar.xz 2924 BLAKE2B 5971ebf02e8516efdd29edf3c8bd577df78ac18758f372853d02e6ca056242bbe317a88df16faff93b5c23e20781a9e38c60a97ced9500d01b3005d5af6f8242 SHA512 dbfa4f85406a79ceb8acb8e4b339958b3ef5553a1c1dcae17e5ebf3f1d2aef165f406f79191c0f678cf2505be950256108b28fc0e8bbf01eaaa37c3bcd504179
 DIST texlive-module-kerkis.doc-2017.tar.xz 2908 BLAKE2B d0c078c1f371fb27feb80177b8e703e2c22bd43be8314ea6c465df9d8c9d68a3c04cb84e1efb750d86a860af388634b39d0d526dcc4dea91250246227e8f30bb SHA512 1356c2c1db466845f653d5eec8233a7f3171e92d8f6e4da2bf4c1e6bc16b784e06a948c9b6ddb7b1c8820e5771a8543a24df70e67e501360ec2264f3acfce8ed
-DIST texlive-module-levy-2015.tar.xz 34720 BLAKE2B 1456b85ea6012e0b664a88746b2914e08e6df6a0278a4bbb0dbbdcb06815abca008ee671cd953514edebfc9a0f210ac102661bebd6ddebffbcf1b20e9e9a630c SHA512 2e3f111c576740e2e6fd09bcbb87b5967bba3273f30148b97e7bbb3971e8a65446d3a4456a66abe287ffd31867f85039404c9a32de49d8ba2f612126bdb5d1cc
-DIST texlive-module-levy-2016.tar.xz 34740 BLAKE2B cc02b54adc8f161edf61e36d17380f07dfb2573ab63df749ffd8d405c6d6ae4fb7e86098efdd91fbd8ef69db82612f5061bfe31cd5082179a617ee916293c1c3 SHA512 7cfca242b8e07129b1c75a4bc89869c8471430fa24a511cf37865c90c0aadffb217f63c98529968401a13ad4b5cadba6e4ba128c05a9dfaeada5c69cb5ceda5c
 DIST texlive-module-levy-2017.tar.xz 34740 BLAKE2B cc02b54adc8f161edf61e36d17380f07dfb2573ab63df749ffd8d405c6d6ae4fb7e86098efdd91fbd8ef69db82612f5061bfe31cd5082179a617ee916293c1c3 SHA512 7cfca242b8e07129b1c75a4bc89869c8471430fa24a511cf37865c90c0aadffb217f63c98529968401a13ad4b5cadba6e4ba128c05a9dfaeada5c69cb5ceda5c
-DIST texlive-module-levy.doc-2015.tar.xz 24736 BLAKE2B 776d146171ba6788d3f732eef93ccbd6afaca8343d80fe633690256aca7c07210422a1a2f365ed0fa09a0ad47d377d78da41e6aa42d61d4bf8d6c4216b14c509 SHA512 82ff7e75609f8ad262a3ebbc2210660e701a17debad2e76c037a6fd171a62895134e1ed0a3ef5509d578c662f60eafdb33dcf4c590d997de95afff4965894584
-DIST texlive-module-levy.doc-2016.tar.xz 24736 BLAKE2B cb3940fd9b132ca07f4403fa8caaaf3a712db8ac7f8649b8b7d98b7b42c84b1c3fb964b22d100c1304902ab4058cec3483496bcf34bdc039d2bc889bbeffd2b0 SHA512 c3f816e4a5100e0f62f3b8e12dbd6072736e3b19fd24d40bf6e8c663b9644b74265830272c00264138734c923d14a3f0310ad70713e05cd1d8b6db47e7d0f2b4
 DIST texlive-module-levy.doc-2017.tar.xz 24728 BLAKE2B 2edf93ec80e0cc13db929aee0d997cbd400200e81452ebc9976ef2908d7206ee2588487e4f9390badae1e69c4510c5babe54f46871910bb2263cf6db2135201c SHA512 b4a7dbe81e752eebae0a0623a828fca9f95d56593fec150a31165f2f0ff411a5fa3dc0ea55a8baf3df867ce6e006d8721270f6b7bc53f83296b158064518874e
-DIST texlive-module-lgreek-2015.tar.xz 1696 BLAKE2B 894594a7417c7793ddbb06a4053bb527af07c3156eb722a9eef2bff79b79ccc90741d043ad78d14c9a660eaa6207da10116f065f5816d8d59b54407650b3616e SHA512 f857702eb361eb7a354330a74484b9fe8cfcc3b64651bed6a7a23faa1f21e0245eab6eaba7e4c4b5741d0280865a909fbc31405ec0d039fa84656296c06e548b
-DIST texlive-module-lgreek-2016.tar.xz 1720 BLAKE2B 6253fb01d8b4a0cb8e732aa0b4930c5f114df5706e2f6c96a74edf4c37444158df5e883a892be1ec883e57d9544099d40f03f04d2dfaf15a12d966339a89f5b0 SHA512 ebe56bd97cc799584ffec21cf8b02b70586df6f5cc98934f1e042c8d6c9666b971f10d690cd1557fa7b2e9b4ac2367bee56571f4c4808a4825499eb1335b5a94
 DIST texlive-module-lgreek-2017.tar.xz 1720 BLAKE2B 6253fb01d8b4a0cb8e732aa0b4930c5f114df5706e2f6c96a74edf4c37444158df5e883a892be1ec883e57d9544099d40f03f04d2dfaf15a12d966339a89f5b0 SHA512 ebe56bd97cc799584ffec21cf8b02b70586df6f5cc98934f1e042c8d6c9666b971f10d690cd1557fa7b2e9b4ac2367bee56571f4c4808a4825499eb1335b5a94
-DIST texlive-module-lgreek.doc-2015.tar.xz 203112 BLAKE2B e4a37d74e84dc323bedcd894eab4f51da812a694b92b5969fff2e2cf8986e4d94b3a6a26dbdbb389eac5ce4395effba0c29e60144fedf4f6ccd30473620ae045 SHA512 414f30494075f78e544d9ecc4f9a7c05f33d85610636da10125d79dd5858aad417f2975609ad5eada88a83098c17b651d04b4dda27634ae596dd1056082e78aa
-DIST texlive-module-lgreek.doc-2016.tar.xz 203116 BLAKE2B 957f4d4c7155895e414b309df4fd3c9e8026c843bcf91adc0a40fb679110bb22989183e6807ff17256c1c926009dea15e0b63ccba3d6d649ea70bb9e41ec2c4e SHA512 c83a31f4384d2ac9491456a462bdecd736f0c56d1ffbfb19113e667438c07dbbea85be5818d3e5412c4d04eaa72ffa367423724077c7e84ae17548e015982273
 DIST texlive-module-lgreek.doc-2017.tar.xz 203120 BLAKE2B 891d0a8e814a280119cbb23e9a3f7cda5b4e2b0fb936701e9983a1169c820c5f21953dca2fb9c7951f97ccab113861f4a3dc0302acfbfdeafbf2aec5f97c2fae SHA512 bea42993770f2a7e2b43332009a82088db4db0a787c41240b9a3b8654ce4d6cc330d2e4763c4274def5d31ee4206ec8fd242835cbfcfc938806a29970d6ca830
-DIST texlive-module-mkgrkindex-2015.tar.xz 2880 BLAKE2B 07b67403167646f65340a02e55b1361a98443db0d39de4ec30707d22bf3420bf0fcc80f8f4d9097c7999932c7f10806948d146326e978ecedbf72cee6f176542 SHA512 0911c1cffae50cdb5c91ca1b59adbdf15233a5d4a1705f96a23f192168d87769a27168562ab9a1b8ed0c32110e9b5629955d4ab12ea76a01e4d842afe0c8e8d5
-DIST texlive-module-mkgrkindex-2016.tar.xz 2896 BLAKE2B 49894fd2c611895579291e4a7038fdb8187841ba6e15f5fd38a45a229fcdc3b01261125077476fab8af1d5c5d0b880ad8193cc1e2d8865b1fcc7b62eb690e922 SHA512 a364ee9c37618c4c1cc82b88c94ca1883d7d148cb19f6d66affe95eecb95b16d3d06f79bdbe0f3a6ea194877030d1f91629e794253b0d0d3cc4d68f1f0811a8b
 DIST texlive-module-mkgrkindex-2017.tar.xz 2896 BLAKE2B 954efc7e5ee851e18ef69d681f445a2a3c423df58a8f5e4ef275544d5153102db21f7226b61633cf7c706cc37fd96a605521c17a4404c42bde9fe8850e5ec730 SHA512 19f28882640f8ffcca3368932a60efcc64176cdb4c796cdaee55e1539a4b24f944da6af2ddbfee0abdcb5c79a02d58a6a2842dd101b37bd41baa18f9a97cd0cb
-DIST texlive-module-mkgrkindex.doc-2015.tar.xz 91484 BLAKE2B 76e84da4ce83b4bbcde3611991a060aa280bdf8f49c1f8595d63aa6d6253479d808a3f5a658876e505bf2b177989cef56596a3853f574a694d15c8ffde3ebcb1 SHA512 003e8fc824bbcc01dc3d75632a5a32fc360f2e28a2cb0600d14d32690138f84af571ef2f266221b0e2a43d942d493363d74b6a46f96a59876893cb7c39a3aca9
-DIST texlive-module-mkgrkindex.doc-2016.tar.xz 91488 BLAKE2B 9ba86645a2a001fa6ee14551ae1bde44cf68ed2d7f99fdcf16f6afe6b3284a78b28bee6ef80c845fda2c1174bf62de40f357f2900540a5e6956300bde78233e7 SHA512 4ba133879cca282563737877f61153311e567e0d2117aa7250ddf16af319bce51534fdc25e504fbd7a4c7abdfd54e012bf1a06477cf9ff62cba9f487930bee42
 DIST texlive-module-mkgrkindex.doc-2017.tar.xz 91488 BLAKE2B 9ba86645a2a001fa6ee14551ae1bde44cf68ed2d7f99fdcf16f6afe6b3284a78b28bee6ef80c845fda2c1174bf62de40f357f2900540a5e6956300bde78233e7 SHA512 4ba133879cca282563737877f61153311e567e0d2117aa7250ddf16af319bce51534fdc25e504fbd7a4c7abdfd54e012bf1a06477cf9ff62cba9f487930bee42
-DIST texlive-module-teubner-2015.tar.xz 10468 BLAKE2B d6e8d213f101be216e0312f4277ead8113091bf2b891b46c427fb6509b84aa78e12894edfc16c454ec67e37908fadabf0000d8f9514d4a0696a17df66dd5f24b SHA512 7c9f8f398b3ee3ee80f433a9fe0ab36129d2a17d749a6b7dc4c4004d1060106ea5fbe76cd7e357608843ab8bf3a73f2e7d1996fe3d3cd710a278adc534af56d0
-DIST texlive-module-teubner-2016.tar.xz 10144 BLAKE2B 90cc82e7b5a875b792e479d6df1d73629f00f1fab13bdbfea2238e0bc4992f507179deb8f0c4af1465326b15ee4baed64de33a13b6dae34e5154be2c45fdec40 SHA512 3a2da7236d3f9d71b1b723b3c11b759f6ad1827eb97af180caa726520612e81a2e98a18d6f0e8a4666eb4cc4377cec3f002c733338fe78e775a5d720732aface
 DIST texlive-module-teubner-2017.tar.xz 10128 BLAKE2B c58d87f6b1ad745a196ff16958bc32977a4e83a12a2a596e7b810880b22e99eada633401d253acb95d546a5c53c859c89d9617cc695db249f003d69c6924f18b SHA512 9d1f5f4a8370d6bb9d21286ec9847ce4a08808ae45ff0f6761cb422e5eee1fac23374bb20e75bbd81f79ca0a0a78c9790fbb2b2ab5830245a0e5fe32c9e4972a
-DIST texlive-module-teubner.doc-2015.tar.xz 1001996 BLAKE2B ff44e1e3921af5f22112df37665253052f59437b9951c5e98f147dff32bf4b8a70b0579561cc61d00985733af9eac32b87e5112ecaf858928b524fa139618f43 SHA512 130382a6f00f2e58cd0df009f6de3b7c492079220b423f7ad7096bbca03c9cc2fd210e38de5d605025cce2e3defd7ad08d0b192554403e78ad85205efa1ec6d6
-DIST texlive-module-teubner.doc-2016.tar.xz 1019212 BLAKE2B 302d0ae1a5198a4edbfd4e75713066cc57e171b7009409c5df56951223c980cf4240b312d20c68d2c909b0bdddaa8b75762a8fb729dd67c38549c7a6b51355e4 SHA512 9b2424098b0160a1bddd18f0b4f2ed2a5110170c44d34a2ed9a69423b502135fa4d32c6bd24b66c775ad3d521e156cffa954a9172a210b44fbcae2ee84cd3949
 DIST texlive-module-teubner.doc-2017.tar.xz 1019228 BLAKE2B 44d1138b79e165f1646a9a7b8e0fc44b58785872b6eceb14815e1d3caf60eeedd23c0e282cd9951fdfef250c5e646168d5dc28b1c4a81ea24d92ef2018767e3c SHA512 fa25e9c75e69d46aa7dcb56076f3d9f2cf0fe21db9d231bd5cfd05c5925a46a026470c761c57a3ce0bbbd89c069ba1590a49437aa00e3e862978d6d6b39c6107
-DIST texlive-module-teubner.source-2015.tar.xz 41016 BLAKE2B 2a414cbb8c651a23a0442380cd589a9cf508f7ca71c49d196013b7c23390af85e1e8d4069b3f5fee665fc6307bb7a3c09457c77a509157b260ff85d67a867f7f SHA512 bbe2afd0c83bd2b5362f2743eed4b0ab391c855822285b4af2729f974ca581395d5d41dcb04471707bbf2bfde15553ced61b5d59dd8be623ed1aa357783ca568
-DIST texlive-module-teubner.source-2016.tar.xz 40792 BLAKE2B abb6fc725bfa38edf1719381a5a13d024d8be851152283d5cb5b67bf7f9378b7a3fc0ead64a05ae8276b7ca008537bd2f068d7cfe3f8fc89f6adff31237d94ec SHA512 2e0a58bbacb933de6002a0f4662e0aa373669bdf6d3b543d7ff13b0f75da45d9edd824416f44ed4313b59267bb120ce2fec65d29b31fd242ccbc40c009ecc542
 DIST texlive-module-teubner.source-2017.tar.xz 40792 BLAKE2B abb6fc725bfa38edf1719381a5a13d024d8be851152283d5cb5b67bf7f9378b7a3fc0ead64a05ae8276b7ca008537bd2f068d7cfe3f8fc89f6adff31237d94ec SHA512 2e0a58bbacb933de6002a0f4662e0aa373669bdf6d3b543d7ff13b0f75da45d9edd824416f44ed4313b59267bb120ce2fec65d29b31fd242ccbc40c009ecc542
-DIST texlive-module-xgreek-2015.tar.xz 4544 BLAKE2B ae8dee81c8ace7f3ee1fe5b1ea4159ca2b3f00ddccd92cdebbc32aa5e99d768bacbc4a72204595442d3272da2c1d864d7c095aa8bb57be9c7efb330531138698 SHA512 62758f4b0afdc07038e69d1af69ee3800a54e8456942676af7846e5a02e9d06f70642be5cb27783969b9d5da5cbc70c2467e66f5e5d238c7feff8c5b81a353bb
-DIST texlive-module-xgreek-2016.tar.xz 4636 BLAKE2B bff43fcd37d62c65dcf35356430d36e57444f41d7cb2d2bb0594e03540d9c98db2d0cb1ce1f7a43f3f14e9461448bbfcb71df34cb0ed2411674a1c166221623d SHA512 9aa321729ff08fb76058788f74bf5059e2bb05487534049b85b8c2f9d991cb3a03bd4b3eca651efaf180af6faf433da3f24340ac3d8fa06efc31f99236c5b526
 DIST texlive-module-xgreek-2017.tar.xz 4724 BLAKE2B 85c3b8ee75520d08ad7217afdf0ae7428a937fcbfdb6236446ec6b48c272531dea8d8cdf8020ca6d007e89bb4dd3d63a128a3c193b75226dd2c9d005141d4088 SHA512 e028e8ef1bd0ab278e7b553e531119d6991ab07d362875f02c4ae01081e43a918b39863f96373fbc0d0c910cf3f6e7509b6eaab9ca0a2d1183fa0187d794524b
-DIST texlive-module-xgreek.doc-2015.tar.xz 61824 BLAKE2B 346d593e77959ef6e881c3bb556d2c41ee82833aa48b3f2454ce1d48cd4ba897df0cc9401b95f8ecebb1917e214edb5ef77ad8dae52f414d5fc378c9da59db2f SHA512 7f9622de49625f11a5eeada8d0b9d41e0d6d2f347e8579d80ca0b169e3dd3c3ba7462d474d4da15744141292564c6c468320bfe12575d4a78bccae5e3ca48c73
-DIST texlive-module-xgreek.doc-2016.tar.xz 62084 BLAKE2B eead55bbac0ae18d68366311c213af16e143d0c7588011a408b900ff15a4be38ca9abbd3d35d1776431ad4a9917b9ffd2324a2a912a99ad2f66877e9cea5d9cf SHA512 abe32ff1e3c08f53f198dccf4efe5383037214e42d57081c4289a3109022339d5b3d4e50cad1d7c43d41592162e3e02d71d116434e06e6d879a4131dfebf05e6
 DIST texlive-module-xgreek.doc-2017.tar.xz 67752 BLAKE2B 04c63f14ba8fb0fe554ba7f29b451292e55ff20f50be2c77ecc241c3ea18ca498bc6fe88de98ba16950655548ce15dc1b99d075382767341c254a707f56948b1 SHA512 7042e12c2b04e5f789eeae942e6e691207422603e6f3714c62170d55f2a6ebebe1669abf15d63798e9132ac23b2eb0f98fa7d946953c2e78937bbab0a1084f1b
-DIST texlive-module-xgreek.source-2015.tar.xz 9408 BLAKE2B 19f12e2e7458b93ea3c6460b2346c15dc396d32f7a5613f22792e6b12321227cb39091d4aa76e7a4860cdf9bd410773d6ef222e9a4af2e222dbc758a46da94b1 SHA512 a939040476700e91908b38bea9e1642f1ae6040de1dae070e91785fd23bb3e85f3a9321bf2e80b7bb730128a1fc60ab320944e248b56765238bbcc4b6d4115ea
-DIST texlive-module-xgreek.source-2016.tar.xz 9508 BLAKE2B 510f74dcb4479a69fb6ee8ac03cf48439510c7be75cd8651fced1e175a256bea8405b8893f57345e5525712497a6259a9b493acb31e7b7149bd347f5d681f318 SHA512 f7c7adba79c0ac0a7d3861bbbbe8643b5c262a039f2f66c60fbc9baec2a272807c97204e6d0d4361134969dcd0f93d149eb5fffa3518956d02ab22e9a56f219c
 DIST texlive-module-xgreek.source-2017.tar.xz 9884 BLAKE2B bc8256dc37262cdcda195024c98d4b4b96664b307e3e920b66b482f0f136b1337f31832c3db308b1bbca7851a5976682c4405f52f397dc1dd923eb893bcc39de SHA512 bb4723c133804e7ac6d3e37627da32994c36c33434c76a23c4f7ca3ba58a34fb049e7476af9bf37c8e7982d18d646cf5a4f8ddb2ceb61b0ceb7a4d2613414d9e
-DIST texlive-module-yannisgr-2015.tar.xz 37596 BLAKE2B 3f31388fe12f3c7f8d39cfa35eb0f4bb48084987ca3b692cac14df296e8e340c7f8d33190e7f539a0734cf76dabaf88761e95d1c29270dfa913e3f5e28bf74c1 SHA512 85b6eadf20d7562493dd174a59d726d156e6a23783d9bb80ea82b9a31a75db5adf3af9b3e974a25845e40afee11697276938e156abe8ad70cf6a254f3f2d1bf6
-DIST texlive-module-yannisgr-2016.tar.xz 37612 BLAKE2B 07beec4629e6c1053131c988501078ef0a947dc840d7d7371a18c274fa1fe5a5e6d313cd29dc5645aea75a2a867ef0879c57ea367647f2a5817d9b949e6f723f SHA512 10b15cb6d48ce42efec877b00f6bb0ef4842bf5c60be2eaba83b4518bfc16990e258b0cfcda7e64abd988f0b590e3f528fc934219d0f367e67283a9525a93efb
 DIST texlive-module-yannisgr-2017.tar.xz 37568 BLAKE2B c620a260fd776420ad04248683bcab7ab9dd4cca36bf432a36935344c30876f54193410a486f867547c99c15b6c298890a62376d4013ad2f3ba8cfe8ea9e81bd SHA512 0d5059793bf65a149bb491e8448b65cc8a8ded213b70af66800dedf9cf9bce66a4c384287203b95c4162b665139a45fdbafa52e3f1a9fe5fb54de781ec53660b
-DIST texlive-module-yannisgr.doc-2015.tar.xz 28912 BLAKE2B 5f024103800357f60e06d902895e426f4b9d8bb06a4617d60b0c843f9c017c2a573c4c4dedf954abbdf90b33e1b967355ea20d466d774f4f53947dacc9e90eed SHA512 db634515bc7fed9a994d013146578cca11b3798afc899f18579e4e679d102a3b3adaaf5500321c0f636e2f1c12100475c7ac2262ab41487eeafa40f39de2b0cb
-DIST texlive-module-yannisgr.doc-2016.tar.xz 28912 BLAKE2B 70c3fa5093ebb4ca06dbce587a56730d95584089c0bdc17daecb87a07539a649a08a049bb11cb6baee88f82350a4954331355b2160e7f47f56e2e4e5b1ee711f SHA512 36b0bba4e760d8b1198fa366973d37261bae970fa4b499140d8578197c399f694c2df78998c3e30d5fc7e0bef6fd12a0f4cac8d7307b7718c49d78b90533294f
 DIST texlive-module-yannisgr.doc-2017.tar.xz 28908 BLAKE2B 162c85ea48dd27040d7f964d34c23d9e81210a27bcb6294d49d1a093f4c077dea08d9cbdb5ef65447e190887a184ff6665ab9e71ed36805c023273300a7375ac SHA512 174fdf12c5fa80bde25b5d519115a275d1fa41990b4167549cd7b5c1417af86cb5b342ea29d6dbf912d7b3ef50d008ed646094e41a1c0c68208e897279c5fb3b
-EBUILD texlive-langgreek-2015.ebuild 1345 BLAKE2B 5edae562bcfe19b95ad2c371e3d113a5796a1c9991fb6ef0f32fdf4953a3d11746964f7a684df45426a6e03910d544a86fe63a22b24e8f00beef7e11da9afed5 SHA512 950d2c080f22645444d7e4265019d036d5ef6b5bfae22e82f4ccc1411e25e81e936cb635f882a3dff0e2166ceaff4f4f992ae2d9ea4adee67bce8d0ae5395f75
-EBUILD texlive-langgreek-2016.ebuild 1430 BLAKE2B b29f77dc8dee13041428cf812365b0255e419d495077e962a9b8e250ba12f0cf62635babeb138177fd34407b9d351a0c9e1eca8deff459b2b6ea17cf4d5aab3b SHA512 ef1f871250d34e9eac1382bf81257843e55c1fdc1dfd5342ff2489cb5efcb375b2bebce0ec50ad3b109b214c3a422528309e446e70fb0bb717beb440ac4f7983
-EBUILD texlive-langgreek-2017.ebuild 1430 BLAKE2B ba8d4bc00789453667033aa7a9a81ee5dffd901e4139279d293e537dc71031660da90d03f94c9915ee192e90f8beefb68abd8bfb8fef49be60347f09c2bc55f5 SHA512 01b2c2611a93776c9406db0afdba0eea24e811fc5e7e43aa4922f54d1d6f8ace1171ab7aae28c24973e96a6749bfadb2a57949895df3d3908c15275e22b538eb
+EBUILD texlive-langgreek-2017.ebuild 1429 BLAKE2B b76ffd4721250b11b1e6fc2e502da327f824ac2d2dff3d6ba86da30f354a6b291a58a5566a960f9e3ceb148cd39a3edc3ab89b42303209aa0563edabc0d308eb SHA512 7953558505891c4b96b368fce1361769f9e6f680d2f826d2f11a3d2e73134c2c38bbb0c57e52ae00399d7e96c20ec4d05c5c639ba52da3f18b34b7cfda674e88
 MISC metadata.xml 429 BLAKE2B 01e67263a2df3a5c42fc95f234933748d2e6fd741d2ef909646f39aae12a0bbf10611248f6c62ca71bf9a9bc71a30ec6ffc10fbb1b8e649a6aa732649a98900c SHA512 0bf25c8f6d55b298c60dee53a09d63e1d8b659b4b2585b35f8b3f0081a5e68073627f7ab4ea27b5cc135939845f0ad609373edb4265183ae4affec6cf0c700f3
diff --git a/dev-texlive/texlive-langgreek/texlive-langgreek-2015.ebuild b/dev-texlive/texlive-langgreek/texlive-langgreek-2015.ebuild
deleted file mode 100644
index 1d3a16bfd5d9..000000000000
--- a/dev-texlive/texlive-langgreek/texlive-langgreek-2015.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-TEXLIVE_MODULE_CONTENTS="babel-greek begingreek betababel bgreek cbfonts cbfonts-fd gfsbaskerville gfsporson greek-fontenc greek-inputenc greekdates greektex hyphen-greek hyphen-ancientgreek ibycus-babel ibygrk kerkis levy lgreek mkgrkindex teubner xgreek yannisgr collection-langgreek
-"
-TEXLIVE_MODULE_DOC_CONTENTS="babel-greek.doc begingreek.doc betababel.doc bgreek.doc cbfonts.doc cbfonts-fd.doc gfsbaskerville.doc gfsporson.doc greek-fontenc.doc greek-inputenc.doc greekdates.doc greektex.doc hyphen-greek.doc ibycus-babel.doc ibygrk.doc kerkis.doc levy.doc lgreek.doc mkgrkindex.doc teubner.doc xgreek.doc yannisgr.doc "
-TEXLIVE_MODULE_SRC_CONTENTS="babel-greek.source begingreek.source cbfonts-fd.source greekdates.source ibycus-babel.source teubner.source xgreek.source "
-inherit  texlive-module
-DESCRIPTION="TeXLive Greek"
-
-LICENSE=" GPL-1 GPL-2 LPPL-1.3 public-domain TeX-other-free "
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~mips ppc ppc64 ~s390 ~sh x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-DEPEND=">=dev-texlive/texlive-basic-2015
-"
-RDEPEND="${DEPEND} "
-TEXLIVE_MODULE_BINSCRIPTS="texmf-dist/scripts/mkgrkindex/mkgrkindex"
diff --git a/dev-texlive/texlive-langgreek/texlive-langgreek-2016.ebuild b/dev-texlive/texlive-langgreek/texlive-langgreek-2016.ebuild
deleted file mode 100644
index 459d07e5b749..000000000000
--- a/dev-texlive/texlive-langgreek/texlive-langgreek-2016.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-TEXLIVE_MODULE_CONTENTS="babel-greek begingreek betababel bgreek cbfonts cbfonts-fd gfsbaskerville gfsporson greek-fontenc greek-inputenc greekdates greektex greektonoi hyphen-greek hyphen-ancientgreek ibycus-babel ibygrk kerkis levy lgreek mkgrkindex teubner xgreek yannisgr collection-langgreek
-"
-TEXLIVE_MODULE_DOC_CONTENTS="babel-greek.doc begingreek.doc betababel.doc bgreek.doc cbfonts.doc cbfonts-fd.doc gfsbaskerville.doc gfsporson.doc greek-fontenc.doc greek-inputenc.doc greekdates.doc greektex.doc greektonoi.doc hyphen-greek.doc ibycus-babel.doc ibygrk.doc kerkis.doc levy.doc lgreek.doc mkgrkindex.doc teubner.doc xgreek.doc yannisgr.doc "
-TEXLIVE_MODULE_SRC_CONTENTS="babel-greek.source begingreek.source cbfonts-fd.source greekdates.source ibycus-babel.source teubner.source xgreek.source "
-inherit  texlive-module
-DESCRIPTION="TeXLive Greek"
-
-LICENSE=" GPL-1 GPL-2 LGPL-3 LPPL-1.3 public-domain TeX-other-free "
-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 ~x64-solaris ~x86-solaris"
-IUSE=""
-DEPEND=">=dev-texlive/texlive-basic-2016
-!<dev-texlive/texlive-basic-2016
-"
-RDEPEND="${DEPEND} "
-TEXLIVE_MODULE_BINSCRIPTS="texmf-dist/scripts/mkgrkindex/mkgrkindex"
diff --git a/dev-texlive/texlive-langgreek/texlive-langgreek-2017.ebuild b/dev-texlive/texlive-langgreek/texlive-langgreek-2017.ebuild
index 7cfe02c3d80b..88c8e30d0a37 100644
--- a/dev-texlive/texlive-langgreek/texlive-langgreek-2017.ebuild
+++ b/dev-texlive/texlive-langgreek/texlive-langgreek-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Greek"
 
 LICENSE=" GPL-1 GPL-2 LGPL-3 LPPL-1.3 public-domain TeX-other-free "
 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 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2017
 !<dev-texlive/texlive-basic-2016
diff --git a/dev-texlive/texlive-langindic/Manifest b/dev-texlive/texlive-langindic/Manifest
deleted file mode 100644
index e4cfb899687c..000000000000
--- a/dev-texlive/texlive-langindic/Manifest
+++ /dev/null
@@ -1,61 +0,0 @@
-DIST texlive-module-bangtex-2015.tar.xz 35312 BLAKE2B 68873e55d8af0a49b984caa936d3d51b13e210da16be8700cf78d67fcefda9faa75268aaf99d9920e3c7807c47daf8a4b9953f3a9ca0d6ba0fd755e36cf02ff4 SHA512 5dd6fef7ff44ba0bd37fa88527969400188ed44495f7ce6402e4ffdc0e01eec855d5cf9375ac73290b6904b71b8ba6f4105628ce159c5b54ed45251d1ddfdf44
-DIST texlive-module-bangtex-2016.tar.xz 35324 BLAKE2B e80ca01db0a5d44eacbec7697fdeef197f1630abf4cc0decc6e3101a1ab0d77f5e9768426d826f2c8173ccf0e0092e8c05fc90f6900b26f717cf17f0a5588f88 SHA512 dc7f13a6a432609a7bc1224e1512dc3e0168bd86a7e32990a262667cc2fb33d3527935b0471f4224566ac9035d2632a0c0de6ae7636ca27b045c92e5b8172962
-DIST texlive-module-bangtex.doc-2015.tar.xz 15636 BLAKE2B 1b15fead32ac37af72373855180343ef806f30ee5a8ade856e82e1348ca5a49804087fe44091b4fdf196864bdc0012d3b7ad25dca548091367c9798fd9407c47 SHA512 1c814c928c8b49b54d83574c1424269b73f94f9c6e9b36b90615de4f65a1cca09ef624260d425b12b7c4c273296fefcba740c2ca30c0df35be4c59b62fa8ffc7
-DIST texlive-module-bangtex.doc-2016.tar.xz 15640 BLAKE2B 6c3a355617b6f903922c41555422ee9fb5e1a7ab43641c8122e3936a43521d68269252de7e8c53e6a33a13657c66191fda9108a1e963d4eb5797376622523875 SHA512 d7c0727caa648c6549515bd8e65ee7a044e3cfc2015972acce063858d281b5ed0997ccfb8292b9bf44e0460976b145ffbf03021119a0afaf7929d1ecd701ee8b
-DIST texlive-module-bengali-2015.tar.xz 17068 BLAKE2B 8b819b8490b5ede90126c3a9395824b0bc4a9e3f92e8320d416ef7707e4863cc341e75bcb4cd5f0121daa16bb7290dcea7353535fca6868c372e1f568aa8e471 SHA512 405eab685a42cb0e8bf404a3bd0bb75864abe051a5bd3777fe51889ab194480ec2980f6e80b5b559ccbb13f39d99498bfa5f8f809889acbdc24ef020005a5769
-DIST texlive-module-bengali-2016.tar.xz 17084 BLAKE2B 18ebe0f23743d3e13f2db236ffdf0ff0ffbdb60b5fd5e4399d9f147d1641c9ee569166cabe0c078c878979a626c3a3b35b6cd3b8f2594fc0c2768ceb95f7b31a SHA512 2647d111f65c5096a09ddbc3388770c20af784c17e14328dae0423e6b2bba43ffa153f2c95ac58d9d142cc734e01f0bd87847a9447fabe5bb6c4836a2e239984
-DIST texlive-module-bengali.doc-2015.tar.xz 76024 BLAKE2B 8c65f22d9554a5012fd0164b21d80ff25e106e371c5aca82a01f5500580a59e8ef9e655871c4274739d3e46af18a4f19bd72699c32e31c4b54755ed114120776 SHA512 9d08748928c4b4ddeccf9fe573abd6d1ab695615d2722ad0975af4f715daf9632c5ff92ff858743243fc761f69a3c5b10853abe2fd336949d3adf84836b69e3a
-DIST texlive-module-bengali.doc-2016.tar.xz 76020 BLAKE2B 6e4f8ed0445ac4d943410a75195036bf7a9a5c1ca2e2fa6f7c67f151aa8f371d491be053b4f758cbd9d61a660865f26e4890e30bdb0e78674b43ec3e9a4b36f8 SHA512 746a50d7690a37fac44bd3ec31a57cd3e0a6f0c1a653b7500f08f10c0ebdf53c9b3a902f93a3335cab3e2ad0e8f258d73d3b8a59c8cbeedb60b0274a98665118
-DIST texlive-module-bengali.source-2015.tar.xz 8944 BLAKE2B 773e32524f88cddcc2ab473afd35abdbb1f6b092dfdcabfe5f88e05edb666ccb54ce98fb89b4360bb744f715bc44b11c1b08122a16370ccc4c7c414a2b917102 SHA512 ab4eb9ed10aa236800f8b940ca0ddc7f009c12078112c91afec66c7e5d8c6573573dbce06015e7e4317285b12ae83f6ee81b85e20049f3165682dc43b24633cd
-DIST texlive-module-bengali.source-2016.tar.xz 8944 BLAKE2B d0c5f227906bdf4f01df5b906a2c131f2cbe4e8d9317f6b0df716f238afe135a314c0cdcd2852d93d816b2a560cf859267d6340dfc19ce05c751f4c936a1c00d SHA512 4bae6a8d87d474917c8e5b56f533afb40824da7feb6f1073f13daf446ec56b93f2157244cffb00a4fc5afabe79bd262b5c28b1cddc62575ae3a69e5bd76021a6
-DIST texlive-module-burmese-2015.tar.xz 54636 BLAKE2B ea024977175f08d723aaf08909529a2ecf3ab1c7de40496a10f0b423b07a190b4a32a3741bb77c09831a73bf58b22f98dc16a212fb7f7c0d884c74c9f4672894 SHA512 155d879deafee701710f50a49e391ae54bf8b4990fb95b9f2c301440e37ad8a9a40fa9751204a9a6cb9cfcfe54bdc60ded0b9cffdd368e279b5de5cf8cab83d2
-DIST texlive-module-burmese-2016.tar.xz 54640 BLAKE2B d58cbb2b8f41654ada54baac724b218830a62ff9367455200cce4e062def996c17f4acbb68a2da16d780adef5540021035d10188a984e44aeffe9d88c7a43d25 SHA512 c3f5889f00b95e28dda4e577d3801f4fda64b0c1499ced8cee7f950e7e6b45d9a5cc46ae87b8e7b39fc7d3842cd91fe755cc327fa1de8553ed6a1673e88f1cbb
-DIST texlive-module-burmese.doc-2015.tar.xz 133020 BLAKE2B 99a83365c7b580e51f5f6d6a0910d9223907647d5aa2684708a53fe9315e5339ecda8e000d3e3eafe53e726915d3b569225d7cbd1acf1914e14a70f78efbbb24 SHA512 2acdc38e9561a989620108bad9e25cbee6973e285f9250eba84c6fbbc14bd781d3aeff291e1f3e78b4f18aa162f0cb8f1a73a27698a2555fe02a0367216a7d3e
-DIST texlive-module-burmese.doc-2016.tar.xz 133020 BLAKE2B 92449a15bc62fb3baaa2e754716189260c564cfeb9b1c3637125336be7d585f841e86d499da10e73477418f9525cddc27fe8cc972f72489dc83c0ad08463f413 SHA512 bf3cc2b957f050c83c4c31317adf54ce2e311f84cd635074017abe6ae3d47b9b92d3d8a12b5e0f888fbb829fe5374401217a3dd28b49d6e898e4921c3424ce12
-DIST texlive-module-burmese.source-2015.tar.xz 3436 BLAKE2B f79c4bd1cb9433e5c060e0a6e5f8de4759ab608f2ae2ca95b189de5500a40609d0dac5f5dd1e797d0eefaa8d8bdbbf1d996cf0266876e881f84742ef6d500d88 SHA512 789f2738f4648c5debd790442568511d502bc7403d635ee4d84161d4fdcce5dcd7e047a2b6ee0c5e196f4dc20eaf952c90efcfecac3fdad06e0d3124a39aee1d
-DIST texlive-module-burmese.source-2016.tar.xz 3436 BLAKE2B 4970aaa24403d93c6e32e24ddf2920a19809a7b8bc7a28550879f1ed18fd205710bba263d49b7718884f0cda9afee4f8f0c5edd01a1dd1bb95766eed50bba3ab SHA512 62696efe06b1d88596aef73a0d44ae0929487a82dc0089121e042e34db157ff87707e3a529c7dbc5752092233561f82f903781610455bf1336fb0b7a25fe4e4c
-DIST texlive-module-collection-langindic-2015.tar.xz 380 BLAKE2B 5a7b68fc63bce45851d34d306fe071d77e1182db9e693191d8b24480b985b0d0dbf5a704900135dd91da3688fa8b620f7d84b36c0f0d136e818322033c39e48f SHA512 d7de07a18d8296adca68f6d776e042afb3ec128050f8c42f1eaeb63c3b90a9244b841b239aad7414a83ad058eb9e514905a62cb9aee781cbe3661ec650f418f8
-DIST texlive-module-collection-langindic-2016.tar.xz 380 BLAKE2B b3a96031565444474d187f4619b7d2e92c48d726dd669961c7eb2d9678a299182d178a98825d1f59b600467d69e7ddc677068f1c7f2ffb0907af1fc7e5b488b6 SHA512 2490cc67c615c4d543a5cddd015160cbd3258fb357144de61b5eabe1f68fece1227e6db5b5d190210c639aa113761e309d849bb981ac4f32b68e920af01daeed
-DIST texlive-module-devnag-2015.tar.xz 644 BLAKE2B e718a88584de3aa21a1b99ba78cb524b6c9afb9015774a1be85c2ecccc83d80cd85932900bbaa60450386ced9f64a51add95787b64328401b2effcdef3207e44 SHA512 7c4a10764e56cd1bce1c0657358d336f8e0a5da41ad482018fa33bca526c1900b227d9fff63ff2b09209a49bd46b7f1e8a6c8d857edfa1d90eabc0a4b96e4b36
-DIST texlive-module-ebong-2015.tar.xz 2608 BLAKE2B eea93d850c6d5852f7d5276bf0a5219241ae975268c83ab977a475276e2bcc2cb913f18d1a6ecae11b15e043eac4b795d053ddd0f96c266c51ba5eef99c32811 SHA512 6d28efa509bd353f0ba7d7e24037fd7a182c3f5cad54cd5ad50bd50d778c96c52f77c6dad01ad45eb32e486d282184437993b88c322b718c22be7bbeb7073d3b
-DIST texlive-module-ebong-2016.tar.xz 2620 BLAKE2B c92b20ee163d1434d5ab7e4c3fa88180959f234bbf8dd05d92846a05e8d83a2f234831646225df42c12fd89441619dd6f144d613851c31bef1aa8103ad1b5425 SHA512 e6ca7b106fc640eea7d7ad7103e5e3f0f2d90422aa68755de8c03325cc9be710d784588afa0ccb3346ec205796db089191a3b332b6e524d888c95be5d1b53ea0
-DIST texlive-module-ebong.doc-2015.tar.xz 50104 BLAKE2B 0b8daf69e2d6577c43a46c5ac56631cad3772b05ce5f709daef6ade008759b4c6733cd414bc121a81e3dcd8e047ca111286cebbe1d84ef40dc93a3b5d41cf0e3 SHA512 2162597d4cad2548e625f3ed5bb0216b6dbc683ca3fa877a70f29aab2e9954afce2fe1023d29832edeb1ae9a42c3533c27016da2c437879b7bd1888bcc54c5f6
-DIST texlive-module-ebong.doc-2016.tar.xz 50100 BLAKE2B f55e9766684ccd309ec58efbdb9c1d96e5bf799390031638c781f9727a077215f53753492668b5fdbcfc697d7cc476a59afd0df57e051578a44687d60d501d7b SHA512 40d419d3720610c3a3e3b266bd32c3d58955d2412c4a025d2bc329a452f518d470790ad993141248175ae347016e01cf620159357bb46d3a1db8d4d0d9ef541c
-DIST texlive-module-hyphen-indic-2015.tar.xz 576 BLAKE2B ccc4ad0032a13ee01a29e7215948bbfb424ca8a129114060323cba65e8e12d3c8ce94ada9da8db39c4df9b05db0324520369e06b176eaa5e0d92047667ea5761 SHA512 9384caff44ad3353cc4b1199e68fa4f82ed206f89c6afec44de36360b9d079cecbc346f6cff28f1f4ce99653def73642aa54a8c3b5b5f7faad5a0c77b5a0dfaa
-DIST texlive-module-hyphen-indic-2016.tar.xz 5388 BLAKE2B f5e83f4866104e1b7e87ccfb392fdc1953430678e06155abaa444bca03fb364180ba5314a24d87e1e165b7638e9b39fc60644fc6aaffe3f17c59d554cc76e9a5 SHA512 1e0bc23c054ac23c20a3c80fa16d09e3a0daa56e7d8b776075b1625e11fba1ca38661e2f346e23befaed911071b17b2a5d8a1073b950bad4c9b0829d0533277d
-DIST texlive-module-hyphen-sanskrit-2015.tar.xz 464 BLAKE2B 1d494ac9d4169a75a8a8562522d774314797afdaf4d25c0bdec615bf4018cccbb1c97ffbe62449e20cb96442190818a3dab6ee0e216e87af81bb11686e12e4a2 SHA512 1cc685898959e606afb6800f58baae07389fe53c0bc105d1ad19eec1d34a13f00a8a5ca4f0883658a75735abb2dc8dbd180d10c19c30b4d706400672b6d87095
-DIST texlive-module-hyphen-sanskrit-2016.tar.xz 4168 BLAKE2B e4cba5caf8c91903d705794119426a0a67a151fe0012cf0890b1232d06b126b2c9078c8819e7a6bf7d9130a10b8647dc21e286b9db7b2b1829a50f8a4679f757 SHA512 2051929e868b59c645fa44598150f9f9738a8dc1192578e33fdb5f73dd0c425b26508d579653c3aa1415ba402701f1377f4301ac90355e746f9bc1b61e6ffc20
-DIST texlive-module-hyphen-sanskrit.doc-2016.tar.xz 992 BLAKE2B ffab6fa14619b7381cf039de9330849a620132d7482ffa2058a89053b87b4c0080de9dc6b4ceccae001dc9b85641a4971e2ef247ebd7eed4a982c695b84916e3 SHA512 b3660c29b368e8668f64b3d0ce854b2f9a11822cde67a44bec68c1176b585f5ec9f1bae5c978e4f3a130f19ba0f7defe2f2a69c0146c2955e8d46ec68c489be0
-DIST texlive-module-latexbangla-2016.tar.xz 3284 BLAKE2B 69e0de8addb1f3ad1d1f38b85e0fdabe8e86c2be8db4404e0dd8984ee589628a03e4252f09d090570c7a826452a591dd33c07921b8157c0c8aab6a8fd6fed9cf SHA512 1728ad558cb15e10a7eb77bd5099c8939758c893166676ae7f5fe0c9807c1c3573d71ac53963387c9c944709ab18df99568dafedf8e7bcf9b8b34ae5a92dc7b7
-DIST texlive-module-latexbangla.doc-2016.tar.xz 147408 BLAKE2B 87d2a2c25ca8b3343c1d3bd2e8c42d7088d6be46fbb37502b0d2e84c7ae63645d90049ffc73782e24ecc0a9d69931108bbe87b22f4d606cad97cede7881ea659 SHA512 af449647efb805b6428f01d7eef643246f16c8679c8d6921dcbd348249a5a3d667cda1939620a065dc4399ea7708d4c05dfa92724b4e18f6bfafaeddda87ce08
-DIST texlive-module-sanskrit-2015.tar.xz 16308 BLAKE2B b11ee11f7ce9880c14b76860a64b32dd72739fb068723931846721b390b0f5fb13beb7c6f064d47802318ffbad5acde44334d5947971ee42319982e3682a0f76 SHA512 82793bc05d4f4cc8a4f8a73751c783e076b7545c808aa3a3bf3428656b960fbfe1263bac12e738ba820e449bb393c39ed71f72a8fa064377f5b053a46c6cd34a
-DIST texlive-module-sanskrit-2016.tar.xz 16352 BLAKE2B 5f1bd775bbc760e524db93f9a57a11c2a06dad569851e3b1b439f1864288b6262323a10a2a60fdbfa31f99798a73aba69d1ae9496f3ede039821312407a18e96 SHA512 64602a2d8926de8493cfefacc42243f9aa6d1152a662ce687618d60fe06f8138ccd4e5dad3b70a2807077c95a2761504564a1e7aa808abe26b3d91feadf19425
-DIST texlive-module-sanskrit-t1-2015.tar.xz 454136 BLAKE2B ca0710fb4eaf28379fb9a712fbda523afb9f6d9353cdeaf69790caba97d1322c0c357f5a4c3be8d5d5d27d8494c7a3a968c2224dfa00873227a1abc2385d0a66 SHA512 d968ae2dc2cf73f614c43dbec529dad0eb463f7c62e149250cc5fe0d61c340f7b27ac30a0120e43d073608eb6d2a6afea3fc32561abae75b2d9c725cc80104d2
-DIST texlive-module-sanskrit-t1-2016.tar.xz 454152 BLAKE2B 1708f8d70915a6762b5c2b24104b114dbc9d19d71fda739f2439a818b36abe4e13603bb1cafc4175f10e06ab407c75925a16a2f77620983357281ec907259def SHA512 dd3a9fe1fc08ec81c551bbe369f8623f6e4ce291c61afec4b9302dbeb85c05aa431fba6a64c72f5a2fd6a1055e7e7211bffae71f51b3bd430212bb53bacca61e
-DIST texlive-module-sanskrit-t1.doc-2015.tar.xz 290436 BLAKE2B 62de3d94937f4e5e8d74aacbacbf460fb1e408f7a4ad7b5929886217b56122850614bbe68027cd0ba0500cc7df036dddde1eefaab8a5346ce4cb8a25a72fd168 SHA512 01d9aef05be7bcc5b18631882b0d39f4c7dc4b85d3737f4873b508883b2ee400fd2a5962567d8b6c5d3347bae12667eb771fb08df918af302b7480e9295e1b84
-DIST texlive-module-sanskrit-t1.doc-2016.tar.xz 290436 BLAKE2B 5f52e506377b6f86b646310fefe6b920991294d3b66181a7071b2d8d62585da05e9a71c107d62d3d8efb8b6781cc429aa2c3e8def6f455db32da1b440558102d SHA512 9fc5838fec01102df4d82666e1079c68eeb308cf6e487bdfb32c6013da3f9d88fb13ee1f10a9f75a10fccd8fb6ed56fe39485c8626b451def4292f3c5c393698
-DIST texlive-module-sanskrit.doc-2015.tar.xz 22920 BLAKE2B a784aa22dd424e424ff3501553cb773b2a6093af6bf9765026592340384c4c84f56f40eb6838c865ad3cf7142a8e708bb06db9d6f4c4105aaaf59f3d79a40aa5 SHA512 e0e37c8986c7e9433b3772883597b35153e1e12132b15297953047ce1e1f383efbf1072ae3a5a9882c7482a09c0673d7677038c12ca08524750797852b92ebe2
-DIST texlive-module-sanskrit.doc-2016.tar.xz 526892 BLAKE2B 624f7650137d25a18c3b3bedcc44cfdb942eee5aede1619ea508b267288f2728ad138d857d20e88c7657d7f69ade4bf46fb5df2d193066dc54b87e096a203e3a SHA512 5a0b98d666d58e40b47740385d6fb817327283e7658470ac4aca403a63685e6dddbb42b2aa1af16a021b4e2a7059c8d910b2c502c0ef948982254b4c6827cefc
-DIST texlive-module-sanskrit.source-2015.tar.xz 22320 BLAKE2B ed5e91d4ffc706abad4d1e2d9d94a739f701eee7db4433b17222b0a7a764f23dd7d69116b641458a92d64cc36aef041f48ea54748f2382231db5803da0e352eb SHA512 6a573454d79fc7ff28bce033a620682a02dfa1c17674a6d7a9ef48a66c6774d4579869b265f30fa64c40829af6dde1a4f5f2d0cbe970f70135342a327b1d99eb
-DIST texlive-module-sanskrit.source-2016.tar.xz 22208 BLAKE2B df3d93a7e4878a30120176a7e8b79e20233894ecb6ddc583ca68232032ee7fc95c6b067fb7e476b757fd0394077e6c2334e1fb91c8c6359d41c9323fca1888ea SHA512 eac0e856d5d2a9149ad40a09154c106e3bd8ac6bc0841c012bc4f1d8ab7ba2a56536fa59bd2b0c41afd1b361cf3b17fd68538457cb42dd56e3a15fcfdd3abeb1
-DIST texlive-module-velthuis-2015.tar.xz 4149588 BLAKE2B 4654a67e2289de461b3045c5a90a014c2163ae3db16426d36b9146a276c0d13341d70037ad93fa6d9897a1afd155e6833750e51f60baa8a9a4ad64ebb54f3fad SHA512 ce6c800d1c04a25d77a2570fd376639f9131f85a159b77b16b35e9d2203f5577c1a48f20ebb114ecfd013ab7f1252df907a0ed2cfd502145f0d77ae9253e8878
-DIST texlive-module-velthuis-2016.tar.xz 4149368 BLAKE2B c48990e0c1a75fdc74e67a017ded44a0cd495629edfe838789dbf6820b630419314ba8d3b88a3ed462c8ca2823e8ee0bf48cc0e015d8925b8c71a98076fa79dd SHA512 44eb8d8a8a9a31285f6fbbcc660e8e55cba722f2ad0fd5128c17ee0602787e13025b208fb2222f6fbba95de6791d34894b8beb7339ddfeb9073357dfa7ce77e0
-DIST texlive-module-velthuis.doc-2015.tar.xz 959316 BLAKE2B 08abf9b195608bcca04921d963219700a7efc02ba7a6d798cde6b414c4211167b8ab0bbfd579913c461a7b68ff8da8bc7872d38362601925630d8b1785ef1209 SHA512 4bc2de0cbb4d493436ba2d016e4ae051fd0799603a2edafad61e4af437e80b9e991f9b91084312381fad760ee1d293b2b078dd3f653e7792dec7607c68938eaa
-DIST texlive-module-velthuis.doc-2016.tar.xz 977840 BLAKE2B d604f4bdb27a8cd5c6192b57bd1fd59ed1bc10fad780e2607401cd5546925d30e67e084e7ebb820cb62b9d37f4f3e951590d59d14fd2583ed84c1edcb9ff71c5 SHA512 0d2409129fbb6bf52d9eb23b1b584c559b8194b629e29e5905f08858facbb5153ad6919ef1bd484bdfdf6f5481c138352e34fd37cbeaebda6ce54aade9097e86
-DIST texlive-module-wnri-2015.tar.xz 46332 BLAKE2B 8264c4d76a98104405fc2effa51b9a8a2d80f5005351db8b097538df1b0a5cb5699f285ccb71e6d49596e371379d817d04a6bb52c53331767a52bc8b65318115 SHA512 27f37006b1d25d2dbf81343ac0fa708133423f542b47d633f96121fcb649ab19de2ff5bd99c06d167579d5b12b8be0e53a558d8748887bd8c3b458cc4996237f
-DIST texlive-module-wnri-2016.tar.xz 46360 BLAKE2B f74dea18e6cfc553df01348c827d5bb3035d1c23f47ac5b1139af3381c80c771c08a4e6917c019dfd8b78193c61fed099292a5aac425d498039bc5aa425f8abf SHA512 c82dc6c16d0d769381c9e95157679e4f48a7652b943f2d016952a1b3620f80cd4eabb482dfce31941e40d5b038c9661c7dd87c05f0523c04518b9e5dfeae8252
-DIST texlive-module-wnri-latex-2015.tar.xz 2648 BLAKE2B fb10dc1788ee5fc0143ff957cfb9bd5ba90ad65253ad1b7026f990c2798556fd7c1e14aded658ef0d3377635529d735f69889c55abb1b805acdec3ea3e3f8cbd SHA512 f8fbd883439e0f1208551ffc6f55a883da8747fef58a2a2625d7295d251abdafe4c720b9719f8f7a01703a357116fcd3618d2bfd56aec94ef2790525ab93381e
-DIST texlive-module-wnri-latex-2016.tar.xz 2664 BLAKE2B 82fc7283e558877ee708ef830b4bb210f09a4c757c334472f25909047a1bd520814c8cb275b0331447af5305ef37f777c22ae348a6fa651c8f69adf4167f9ca7 SHA512 a670ba6649163fce404543c979e7a4c50e7ab018b5e99b1e3f7b83462dcd29eae602f6dad28e5f71022e24efdb8069041fbb2a650f482472ddf265662bd17b06
-DIST texlive-module-wnri-latex.doc-2015.tar.xz 198680 BLAKE2B 0a4ec790a3eedb884a82fe89251887b7a10dbfc46e32d0caae3387d9f0445eee68b5f9cc75ba06fe43f544e91689debd5d0057109ca7fdacbf39a2ef54e2f054 SHA512 24d38a7fadddbd494d91b04b2c4e0d2527f1999ee4c8ae48a7822164f2ae4fd5b264e66123515f0de058a68b26dfeefc0dfe92b0cb47440dcef55de7c2bafeb4
-DIST texlive-module-wnri-latex.doc-2016.tar.xz 198684 BLAKE2B 7aa524912f6af630c22471eb11eecbc2ae788795c05f7c6397f2bc44733804e6d3c58a52031e84c6d3ecf4ef6239fa1e2f492566911653b3c1342a131fba4adc SHA512 a885ed426317d15412f4ee4c4c97adfcdc09871691774da433f82943bdde639bea769ce8684e4d599561e028652b9578b10eb825c63ec425414c4bb7596cfd83
-DIST texlive-module-wnri-latex.source-2015.tar.xz 4364 BLAKE2B 8beb11d793a3462d127af1ab925deefd5fa290e69caf54d4f51daefbb123c6a205c44136867d4ba4b3a8565aea4bf6d3084e382429ecce231a6052e762b445bd SHA512 6c5ff5b232014dd49cc46b89c9f58d7edd6dbc1f6a49ad7bc6493f11312455e0196b9d71693ec75c0c28c27f7a4584472500ecb1fa7fbf98bfe1eb27a21f6624
-DIST texlive-module-wnri-latex.source-2016.tar.xz 4364 BLAKE2B 4e24251290ae738ca341764815233bae12fc6ad5be11f15dbf7786e8c5e1f3887f2d8a14d478e4bc53f1a4f743120a430e0b328c8d4d92484ed4fc65a1684798 SHA512 39eb5b12c41ef69b5d04422b3c96304e55527b786a9e5d5f23d76e49f6f3832b361b3f5e7ec1bcae8a98e8e59415a1a16ecd2b3038246ad880a8e725d78ba6bc
-DIST texlive-module-wnri.doc-2015.tar.xz 6784 BLAKE2B 312066d0e68c7c6fd14eb64a9eae96c34aadaf1e4de9c833fa96e6492d8c04e07596e0cd4dacdb2f54c97d9db0a150f20b0664d63a42e451faf3b77d586f4b5a SHA512 f3733c6c5894a2d4c7da50b7e2523569df02ca4979b699daa0019a52c648428c04641b71e66891d834c599e6157655358dd2f9463a58637e375309413c89e54b
-DIST texlive-module-wnri.doc-2016.tar.xz 6784 BLAKE2B 78490ac1f7844ba7e07fcabaf2e3b65a111a771b98ae3740221f9a3cc3f0bc5fe138df816a739198c191fa273f75a0c4d73ed466e2fa1787118c9d30c819e057 SHA512 e09d281d8b8685abf57fd4dc2101eef96195ef53c7f9b01f9ed45f8f31310aaa0864e22b2dc760f446554be706aebfc11666db880d32bf15ee72388639968ced
-DIST texlive-module-xetex-devanagari-2015.tar.xz 12436 BLAKE2B 0b4730260fe7c544fe7534cc3358f9e340b99d59aae3183a53177b1be2d2e5fa617836cc17812909d5d2738fc13c60948325c5bea22cbd9812c346a9beaa2839 SHA512 14a89298b7b35ff576605d46b9fd456ad999a84b37e4151406e5853bb9ac32b5e920410205d4bef5b0d7cfd2f28b490577ba7d6725bb8a21334c749ea71b87e4
-DIST texlive-module-xetex-devanagari-2016.tar.xz 12448 BLAKE2B 0cda7b4f9d47b40e55ce94983a6518f9271a2f2d17e80cfcf23a17f6f437e99a7a4e7f2c829289d97133427939f6e31ede7ffe4ae0032a4e1dbf47cf98653f6d SHA512 add74dd4512f32ba1017f95eb63d926522aaa195606db05c95f1d5a5fd0d43df97a75017142f67808cfee0cc68a9fab93140cd9fc21d7c15ba73284470c1d9a8
-DIST texlive-module-xetex-devanagari.doc-2015.tar.xz 992 BLAKE2B bf20efd582fba00820496f8803c1041c2589b6b5048ed36d370c8f43ac1df82252b42c1be2c597557d8d5448e3771e6761d1d55560030c4469df5a1245091470 SHA512 310d11877359eb81b5d1dbc3d6694920e74ae00de887cd259ebe2bbdd89ee0c763d11abbbaef03849a7e03fad12bfa92b2c51fcd70120e44706da9fbd298d357
-DIST texlive-module-xetex-devanagari.doc-2016.tar.xz 992 BLAKE2B 49ac83f97eca1f0a684bfe8ec25cc356ade8599fcc35da24c6f7cf2df5803dc0ca00696b84b6dc751ade22bea028ded5f1a429791f38e40a4a8834cb0b8ac2e3 SHA512 5353e700971a594c630d1dd3b83f163056c7728c8f2ad9f18a49e55b92a0ed15dcba30e36d4bf34c3207db63715f513732522e00f5f63a745ea72268f8c838a8
-EBUILD texlive-langindic-2015.ebuild 987 BLAKE2B 82e673f7a28140f336fbddd0d13c38e205d29cc002c295183c38e59a0237c893d9888f61a60f3bed45b792fe29e91203e271929f159d92e579f59192c7701b91 SHA512 6eb60ba9829c1ab6a1acff7d37e0954f48009012838302ed4f22389f71d408a91a470987c391f870bf8ae7ec9cf3d67609b68ffea3553c7bb9a36a6af732a40a
-EBUILD texlive-langindic-2016.ebuild 1080 BLAKE2B cc9521f8974112bed9592b5d077e4609480a7b326ef77ff6861be1b02e6df1347de472c333134b3f20847b5cf7be6ed412d2d29569f407504b5f44bc4d870095 SHA512 c2846273844e2cc3a50bcc78b163a9cc1fc5978af3117d4646be7f3071d6ab5f3b2c8b17bc234704c4d5c42bb2605cb2d99de04222838db3e6cc4c4efd6acadb
-MISC metadata.xml 437 BLAKE2B e1f5e71585ae9495661000114e51037112402b86ff0572695e8b290b841fb5ad0925e2cb18e73e33622c83c52f5879d10d3e9f8eee2bb24550a4ca417ce7227e SHA512 80779b48baa09bb6b25c4d0fde4eb3927ed230b609c9b99d7d315c7cc15e4b92a75f565015ccc0d047d4bb69f4a386dca37fb225433c53ad147639835c5e4890
diff --git a/dev-texlive/texlive-langindic/texlive-langindic-2015.ebuild b/dev-texlive/texlive-langindic/texlive-langindic-2015.ebuild
deleted file mode 100644
index 45ce3260bddd..000000000000
--- a/dev-texlive/texlive-langindic/texlive-langindic-2015.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-TEXLIVE_MODULE_CONTENTS="bangtex bengali burmese devnag ebong hyphen-indic hyphen-sanskrit sanskrit sanskrit-t1 velthuis wnri wnri-latex xetex-devanagari collection-langindic
-"
-TEXLIVE_MODULE_DOC_CONTENTS="bangtex.doc bengali.doc burmese.doc ebong.doc sanskrit.doc sanskrit-t1.doc velthuis.doc wnri.doc wnri-latex.doc xetex-devanagari.doc "
-TEXLIVE_MODULE_SRC_CONTENTS="bengali.source burmese.source sanskrit.source wnri-latex.source "
-inherit  texlive-module
-DESCRIPTION="TeXLive Indic scripts"
-
-LICENSE=" GPL-1 GPL-2 LPPL-1.3 public-domain "
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~mips ppc ppc64 ~s390 ~sh x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-DEPEND=">=dev-texlive/texlive-basic-2015
-"
-RDEPEND="${DEPEND} "
-TEXLIVE_MODULE_BINSCRIPTS="texmf-dist/scripts/ebong/ebong.py"
diff --git a/dev-texlive/texlive-langindic/texlive-langindic-2016.ebuild b/dev-texlive/texlive-langindic/texlive-langindic-2016.ebuild
deleted file mode 100644
index 502ac17f97cb..000000000000
--- a/dev-texlive/texlive-langindic/texlive-langindic-2016.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-TEXLIVE_MODULE_CONTENTS="bangtex latexbangla bengali burmese ebong hyphen-indic hyphen-sanskrit sanskrit sanskrit-t1 velthuis wnri wnri-latex xetex-devanagari collection-langindic
-"
-TEXLIVE_MODULE_DOC_CONTENTS="bangtex.doc latexbangla.doc bengali.doc burmese.doc ebong.doc hyphen-sanskrit.doc sanskrit.doc sanskrit-t1.doc velthuis.doc wnri.doc wnri-latex.doc xetex-devanagari.doc "
-TEXLIVE_MODULE_SRC_CONTENTS="bengali.source burmese.source sanskrit.source wnri-latex.source "
-inherit  texlive-module
-DESCRIPTION="TeXLive Indic scripts"
-
-LICENSE=" GPL-1 GPL-2 LPPL-1.3 public-domain "
-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 ~x64-solaris ~x86-solaris"
-IUSE=""
-DEPEND=">=dev-texlive/texlive-basic-2016
-!<dev-texlive/texlive-basic-2016
-"
-RDEPEND="${DEPEND} "
-TEXLIVE_MODULE_BINSCRIPTS="texmf-dist/scripts/ebong/ebong.py"
diff --git a/dev-texlive/texlive-langitalian/Manifest b/dev-texlive/texlive-langitalian/Manifest
index 6e2a8b45d847..b837c76522f9 100644
--- a/dev-texlive/texlive-langitalian/Manifest
+++ b/dev-texlive/texlive-langitalian/Manifest
@@ -114,5 +114,5 @@ DIST texlive-module-texlive-it.doc-2016.tar.xz 1026220 BLAKE2B 62008baebedecde0b
 DIST texlive-module-texlive-it.doc-2017.tar.xz 896808 BLAKE2B e9414135232cac146bb7dff72b6dce1e50c9789ea39f15908cd6927943577edd0f6c0136a9247a67ec52bad99c5e06017c92638bd38c140743b08e9bfd8e6148 SHA512 4f50a36da762c4ee000e93df770232d97726f7846c6d3dcdb9333849479371334f12c7acb454441f5985c44c0aeefcf1146136eae3ce69c4daf9c8e2af89fb9a
 EBUILD texlive-langitalian-2015.ebuild 1226 BLAKE2B 2377cec38bcb2fe414dcc007efa11f526d0180522cdbf5f383194d03b0ff0e098e50c534943b1203d79b134d4fb1fe39883fea0473e2fcc5c1d0917275d5e893 SHA512 1e265212d5f7ae230020279c83e452eb72106249ce512cbfb152b86e3c8f39ea868744824193fb7d6b561ca3d2cd8ae5eb5f4a1a5fe930c5e65f99468a5f2a5b
 EBUILD texlive-langitalian-2016.ebuild 1278 BLAKE2B 35292e791eddee046ba56b5c11312f9a2b67ab0d42feef2ad7d753e9663a68296b42895d69103124c9c4c18298311811a88a96967c8e9c58a3e5d9e88b2edec2 SHA512 44afe9a2fcd7edde0902c2c2e759e9817c1fb691a6807fed5d799214a176d64d9391a1b388b9e06853e0a158f0f2227c601a866a6fee241a42bc1fd08ca27c29
-EBUILD texlive-langitalian-2017.ebuild 1285 BLAKE2B 295bf37eeddc2a5dae133233aa5a43086c12640f934334ce1e165c31a33a933b4dee0764126db8870ed1ea1beb6d139834336dae442928c09193b0baf04ab266 SHA512 2f94e423700198afba5ad69dbf3c1674d33e167f5273f64b7b7e7d463ae76925fbc314a446659d48c3687c878071b96ec5f396069995587389a9b3eccf972edd
+EBUILD texlive-langitalian-2017.ebuild 1284 BLAKE2B 773e60314f4fef8db3572a544026e782ac6630a82912be8e1a1b28bd46fe7212892a9929b1857f4ce14b2e0f7381d0a5ef7f329fdfacdf5d277ba19bd9702727 SHA512 8d4f4682d8240c0a503f9af4d3f465c69d06c3a1c5caf8327e533fc69437be181b0e72566f67b8f85b308791dc388ba4f9adb7598ab3bdfc2d219df6073f1d9f
 MISC metadata.xml 431 BLAKE2B 27fe61311c21a334ee4479de2505b23adc057f3b3307d19e4399b739a2c3a569ebba3918cfb1aa1ee19796615d1a0f52c474f2fa793ec8d7eb4c9cb64836326c SHA512 de7474642ce4d561760aa2302808ecf5d6d845f99fc6817543f60ba14f51e31ce809b08ee5b71f99e9efd43ef29b79827d73ba6888a8ed98e57551aff7664f92
diff --git a/dev-texlive/texlive-langitalian/texlive-langitalian-2017.ebuild b/dev-texlive/texlive-langitalian/texlive-langitalian-2017.ebuild
index cac00023b32a..57698a201614 100644
--- a/dev-texlive/texlive-langitalian/texlive-langitalian-2017.ebuild
+++ b/dev-texlive/texlive-langitalian/texlive-langitalian-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Italian"
 
 LICENSE=" FDL-1.1 GPL-1 GPL-2 LGPL-2 LPPL-1.3 TeX-other-free "
 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 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2017
 !dev-texlive/texlive-documentation-italian
diff --git a/dev-texlive/texlive-langkorean/Manifest b/dev-texlive/texlive-langkorean/Manifest
index 8fec71efe617..1958f05757af 100644
--- a/dev-texlive/texlive-langkorean/Manifest
+++ b/dev-texlive/texlive-langkorean/Manifest
@@ -63,5 +63,5 @@ DIST texlive-module-unfonts-extra.doc-2016.tar.xz 8064 BLAKE2B 7c3f53612c4ab16c0
 DIST texlive-module-unfonts-extra.doc-2017.tar.xz 8068 BLAKE2B 759d77ce36409524db5834237bdcdd85c525a9a01b440dff13e06be414910b847ede522c44b6da6d118c0f5e87bb2df053307aa8ba932e7ab5f9ec62b5a1e52f SHA512 1581e671688c88457227f54f9b35a37f4b3eb066528d4ee85c39d8330144a40d9cb5d0e967098be389bbbe1fee2d53f4437fa1c56d1735f53b49ce7699b2b845
 EBUILD texlive-langkorean-2015.ebuild 1008 BLAKE2B 0a8ef6c6c75d3db0436ba443e8d732ca6a602c4afdacb0d8b85c297e140475a39348b1492b2c0475bb57a9ac41317546a7c0c08a33490d2e3b55611423473b7a SHA512 a0e697d716ed50cc7d0436a1a8efc8b0a4c620e9b5370f88fbfcf1f5f8e1fa2345b5c8abe0a73cbc698228fe14da2a156325d51b588bc7b3e4c4186a6309a462
 EBUILD texlive-langkorean-2016.ebuild 1142 BLAKE2B 8a0ae6cca00845abc98fa59cd2a84759d2d7a266a85c49608136bd9da45899362c746d5092d925d13d94c838f9740a49ddc28ef94b1093f8fda24aa47cea9409 SHA512 c3c0a02cf3dd6b4787d5cbe4f79eb01d439987528a4e3e1c1dc8d6f469f576888ce94991e9e0438420f3fcb7cbbefc76bb2ec0e6c5fd37355c82be6934f15a6d
-EBUILD texlive-langkorean-2017.ebuild 1142 BLAKE2B 5b872a674ce14bd2bfe9d1ee2a8eac6b5ce817504b2d9e9d3d4be53ba8188de6b76ee3688a40c516d82601a91c374899c8be7e5d76e307065a54698afbbe5131 SHA512 09ed06d3bd24b2bbb38d32ebe51b33e7e7409954354493c8f416d5e8517f473b6cde4f9aecdabdcc430c3721c368396dd927c9fe130828b600d9e77a9943afd0
+EBUILD texlive-langkorean-2017.ebuild 1141 BLAKE2B 0143a4be6a0ad79b96765f272648c678b24ef4ee6dac8520a7ce44d05bc765552f634177e3d86e05275661936f4c98aa3884a8508b26ee649648b3c2fd991d40 SHA512 ed12855feaba601501cc1ab4dbf3ce5dc90d5eb1a07965e4cff52dae19b8ee8d776ca655f68a0b7f43610782c7b0a9dcc0bb9f854f082f9bb1fef9e515ad3057
 MISC metadata.xml 473 BLAKE2B 3f98501738312fa8703259ad9c06be5c22e8e13cbeb3c073eb06409589fa54255cc721748f9b44670c2cf889b5d9884a9c84ca0f67595cc5e5eff66422bfec79 SHA512 74e1c1d392ea2aef8b16938b7d77867236548014132035d592e629755e4e2fd9aab59eaaf1384e493fc2d66b1655d0775a92d61020cbd5c01cc85bed041b6a66
diff --git a/dev-texlive/texlive-langkorean/texlive-langkorean-2017.ebuild b/dev-texlive/texlive-langkorean/texlive-langkorean-2017.ebuild
index c92d9ff02564..23326ed9a06c 100644
--- a/dev-texlive/texlive-langkorean/texlive-langkorean-2017.ebuild
+++ b/dev-texlive/texlive-langkorean/texlive-langkorean-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Korean"
 
 LICENSE=" FDL-1.1 GPL-2 LPPL-1.3 OFL TeX-other-free "
 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 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-langcjk-2017
 !<dev-texlive/texlive-langcjk-2014
diff --git a/dev-texlive/texlive-langother/Manifest b/dev-texlive/texlive-langother/Manifest
index 7602b229db5a..22cec03dcd1c 100644
--- a/dev-texlive/texlive-langother/Manifest
+++ b/dev-texlive/texlive-langother/Manifest
@@ -212,5 +212,5 @@ DIST texlive-module-xetex-devanagari-2017.tar.xz 12444 BLAKE2B f884d677eb3f303d6
 DIST texlive-module-xetex-devanagari.doc-2017.tar.xz 988 BLAKE2B 7590cedc25e6b10b7b50623373b0f4f643b23455fd3a97c2197f4336b0303796a8f1d665750baa732446f4aba63fab13daced7eed26af36285b6e3cb08b5ed73 SHA512 deb051cb19d44f438ac1f3b7716fb66fc6538ca1ce33c1b84976d6904715d17ef65e4a2fd015f168d908b6905d0a2de5621d8b03150e45b7f5dcfb68f2eeecc5
 EBUILD texlive-langother-2015.ebuild 1703 BLAKE2B a776e72562722025e3f4e3c7a2baf6d61e2573c20c965273224e3f74710da8cc52ce37d922f137fdb424548a00de885239a887b0f291c945e14cab1898f45293 SHA512 aebc6f82f9d2a1de983d652f0e1863d0cb7336180247ddd49f9a4439bac07682f334fd8eb627f00d769b6dfc9e0df739a18b88a2248ed6695b2f92e58b353ca1
 EBUILD texlive-langother-2016.ebuild 1820 BLAKE2B eae19257187024e8f659a47d7d8945cd3f5e080c889ea04a13f6204c476a4ed43f7c39ceacdcdeb76037b0a6bfd7d881557fff01f16e703e84764abab6833650 SHA512 e29a7f00c6c1cd796d1233c8f50c4d05104dcb74217ae27bc0855e61854c903bc618324e3a992bbceb0c9774e110069bb4fc36043ce8ec2ceb3c34732519c12d
-EBUILD texlive-langother-2017.ebuild 2662 BLAKE2B b68b6506bd71117a66cb0f60d14330bfd967f63477d5095a99d5a4c4f00f25bf733a8c536aecdb319c8b279d042ac18df4517a72808924b3199b11a3240a9a4b SHA512 ea50f6f71701e7a11233723a13c2202822948231bfd0fce8c1b4a382f0155692ad7875338e9909a1e6d9abcdc6d4d3e70b73515e45a6c5f5af9a4427bf42ef44
+EBUILD texlive-langother-2017.ebuild 2661 BLAKE2B 2752e08b00a243ed326afac835048b8b037840d66e2d249fa4e674b22a70aa75877123aeb20df58ea1a17eba72a9b83ba32afd0ebdd0d52f50edebefef308a5a SHA512 1b4201c4d9a12c6f3dfd149676c7b6a4e35c854b64fdfa2851961ddb7af12eb380db8d59ecdf91b5fcb3f05d42f917bf8ffcbd970ee3ef8b97bf7a7a9bf18479
 MISC metadata.xml 692 BLAKE2B fa87041bafc6f25a3ee065fa21c064cb2109470b9833a4d20c5d3d8e9488ee91fff4364cb078287f481402219a77d1c0fd655b90951ae7d7226011e5352af5f6 SHA512 6c9fbac4fe09b5d24c5ce682f68801725f66857ec30418a8fcd2614319750936af116b30357ab03b2dc4ef761dd397a8786e81374f7f230a4d77660df67c083b
diff --git a/dev-texlive/texlive-langother/texlive-langother-2017.ebuild b/dev-texlive/texlive-langother/texlive-langother-2017.ebuild
index feb80a81e68e..1b9aa48f7fab 100644
--- a/dev-texlive/texlive-langother/texlive-langother-2017.ebuild
+++ b/dev-texlive/texlive-langother/texlive-langother-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Other languages"
 
 LICENSE=" GPL-1 GPL-2 LGPL-2 LPPL-1.3 OFL public-domain TeX-other-free "
 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 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2017
 !<dev-texlive/texlive-basic-2009
diff --git a/dev-texlive/texlive-langpolish/Manifest b/dev-texlive/texlive-langpolish/Manifest
index df013a71d9ba..0e04889c48fa 100644
--- a/dev-texlive/texlive-langpolish/Manifest
+++ b/dev-texlive/texlive-langpolish/Manifest
@@ -110,5 +110,5 @@ DIST texlive-module-utf8mex.doc-2016.tar.xz 7496 BLAKE2B d32ef2bd413f0daa010a453
 DIST texlive-module-utf8mex.doc-2017.tar.xz 7496 BLAKE2B cd63a21dd1699b7ab117a9cf7c3ccc5c8c9368dbdf8f6a87f25d0e50bf0d19381f517085a64356571465edd2a3b2fa671b64ab8b398cdac6acad8ccf9650f5fe SHA512 3ae93491cd484e39552273cec22d7b295a7a8b12259b67bd803bdab60d2919678c72b4ee46d4a0e41425bdb2cb29fd53b5c880690141dffea8c9417561af4939
 EBUILD texlive-langpolish-2015.ebuild 1100 BLAKE2B 62e87d127307f315be93ae65bc1f8079e9233587f27bb67f654195901755fdbda4574acd3c34e21b28ce760679c7f441c283310046f3c4dac777601793d31598 SHA512 7c3e0f346cc9ca9fb75706cd87f843db18ab3267dbab01520e293054130ca63a77548c67a6b7c36c53a032542a2de320ccc8fb2141bbb50cbca18c34481b35e4
 EBUILD texlive-langpolish-2016.ebuild 1152 BLAKE2B c2bc2e33e5ecca1fe7cef3ff12310d7f00c542dc6d646f4762b83be22f888cd94a97f85fa13ed149720a2b87ea31be5afb45c2b6233a047c05654238b72dbe3e SHA512 08a03ac8d2113fcb46e677a0ecc59d749dd925e59900391302a3d34190a2c85a376d36214f023b323fb35ad2d64aafd3234c146ecd4f28ca454d063c731a3866
-EBUILD texlive-langpolish-2017.ebuild 1175 BLAKE2B 6c5f992da6896136cbe27215837eee62aa994ec11b6f7025b99f3ae8a3d07293b00da607198e493ec5181bbab6876a86e03984265165fdde6d9374bcbad7e7ac SHA512 eb6afcac4e7e68c2e7d8013deb7b5c6e4c1b706f5744e437e6b62373d74a1fa6479f328e027c71e268d07c094ffd46962338d7ff9f85cff1faabeb621cb144e9
+EBUILD texlive-langpolish-2017.ebuild 1174 BLAKE2B b75174b55fff2a54797a509eb92f61d2bd6efdc115eacc6e72dbc6de45821f1c9b90eac8d5f09fba0a5f22cf817abdac04a5f6d6675f44707b517ee6603ffd22 SHA512 8fc15bcfd66e4e70e0e3a8600302e58bfd1cacfc86b54b97c6a1f681df367ec29d8f873a4270cc02a9d3b882c3413ec932e1e0b9b2228a89d586da1445faff66
 MISC metadata.xml 430 BLAKE2B e3f3794885f68e64219d24a8a9d38f2fde0fffd413f3233196641a3ea95035329fcd9d632a3fc9bfd9f34540402f4bdb0b2bae0c0613aceb660baa7e64d6ecbf SHA512 4fd41829665f79f87a77ebb3cedce3ecea4bcc767ed49cf40d7e424eb0a1836817a001852e67ead3f61f189a71eb022bc6ef415e616176c33c1d129b105732e8
diff --git a/dev-texlive/texlive-langpolish/texlive-langpolish-2017.ebuild b/dev-texlive/texlive-langpolish/texlive-langpolish-2017.ebuild
index 17fa7db98f26..932d93b997c6 100644
--- a/dev-texlive/texlive-langpolish/texlive-langpolish-2017.ebuild
+++ b/dev-texlive/texlive-langpolish/texlive-langpolish-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Polish"
 
 LICENSE=" GPL-2 LPPL-1.2 LPPL-1.3 LPPL-1.3c public-domain TeX "
 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 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-latex-2017
 >=dev-texlive/texlive-basic-2017
diff --git a/dev-texlive/texlive-langportuguese/Manifest b/dev-texlive/texlive-langportuguese/Manifest
index cf7586f4dedb..ad0737334ca6 100644
--- a/dev-texlive/texlive-langportuguese/Manifest
+++ b/dev-texlive/texlive-langportuguese/Manifest
@@ -60,5 +60,5 @@ DIST texlive-module-xypic-tut-pt.doc-2016.tar.xz 225212 BLAKE2B 5439ab246f1df32e
 DIST texlive-module-xypic-tut-pt.doc-2017.tar.xz 225224 BLAKE2B 8b0095cdd853c248e968896248335f58165c3e4abe7d93fd0d4ee9242c73b6f8a5c8693211820b066a07cbbe7554b0d26c92eed4382d1b7c5be22edc45b9b8a0 SHA512 24bb3acdb66190e34bc56cb5696ea17be0a14fd25cf0a519e44b676bdf8b1bccf7987da307bf0d1f0288918dd15e589c05ecc0eeb351f7aeb2a870396a9d55fd
 EBUILD texlive-langportuguese-2015.ebuild 956 BLAKE2B 541f2e489aa22777dc81d1c69a2c14b2b1843ad707c11201714fc75e6981d1e9681a04ec159fa140bb647e60dd6d4495d8a6239fedf310233c4189b2f74e3a8e SHA512 25453a658f94ee1468e0517aa645473ca1f5d9d2ea9ba93f439556fd9ac09a7df09f92c2c79381f95691f8156a950a7bb6f6c9c7b1de4a970e60208f3ef79d2e
 EBUILD texlive-langportuguese-2016.ebuild 1008 BLAKE2B 08ae382e1bab87629d2125266f788ba61fa15f3d51d454d094233de33bdb2f0c6ecd5c383a4e47c2ab0275a3d61b9164e2d1c223dd4a372faf00493cdf9650c3 SHA512 5fe479bf4e4289e57f3cd7426453fd9ec5934aef7d407ade3841f63954006443720e24fc341c356e1b5ed69e5996e0adac6e9285beda7a4da76701f0cf3fe636
-EBUILD texlive-langportuguese-2017.ebuild 1008 BLAKE2B bc57252c1b48f5240284d345d2229769dcd40ee6de8e03aadeb1956d3f46b907c851e8b1b16680d746112b987c4dafc7bb6e005eb6444fed6a6fc72533696f5e SHA512 9b33f7a9193c3c4b9db1a5e7a219f80911c464029c088c6ab8371f6ae822b59fb1464319b4a61ce868e2314bf2a31a4a76301996f8734ed894e7ea5a8793be61
+EBUILD texlive-langportuguese-2017.ebuild 1007 BLAKE2B a515c3a9f94b25d5399bbe96160c697f9aeac6c3e536959081769f503d6445fddcf1c0f3c5204899d20cb3f64fbeb839474154b9a8bf17d8b52061a7b4aa61a4 SHA512 364035d104525e718f136e1606ca851822511071f8045bf8f190cd59743a4cd058a7239be5a73ce69e9830184157bed785df59cda732780a17b99783d31790f9
 MISC metadata.xml 434 BLAKE2B dcf4b081dc6c914dd2e249828f1512711394ee46c6100dbaccace8faaf713b3fd2988c14330fea99b123f5ab2c84a0c843aaf4642a32c060be94ddde18d332da SHA512 3a73611ae49dcc118cd89773bb2bb73a3bd4535a77379c44946f08fe84ffb846cfd1a8a68ad3daead16f2590803976b2b9b44b63c9bc21da43193f0c2979ad4d
diff --git a/dev-texlive/texlive-langportuguese/texlive-langportuguese-2017.ebuild b/dev-texlive/texlive-langportuguese/texlive-langportuguese-2017.ebuild
index 35d4b3f4c6e5..9d7608f65fd2 100644
--- a/dev-texlive/texlive-langportuguese/texlive-langportuguese-2017.ebuild
+++ b/dev-texlive/texlive-langportuguese/texlive-langportuguese-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Portuguese"
 
 LICENSE=" GPL-1 GPL-2 LPPL-1.3 public-domain "
 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 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2017
 !dev-texlive/texlive-documentation-portuguese
diff --git a/dev-texlive/texlive-langspanish/Manifest b/dev-texlive/texlive-langspanish/Manifest
index 594db68a47b0..4548cda15d98 100644
--- a/dev-texlive/texlive-langspanish/Manifest
+++ b/dev-texlive/texlive-langspanish/Manifest
@@ -91,5 +91,5 @@ DIST texlive-module-texlive-es.doc-2016.tar.xz 1026792 BLAKE2B d46a6cc74b57c07eb
 DIST texlive-module-texlive-es.doc-2017.tar.xz 1026792 BLAKE2B d46a6cc74b57c07ebbc873939bee1d8aeb26daea5641bdee56ec7071f2b841481cb179ab58f47354b32f520ecdb7e90177741c891a6f41b39ec2fa7d1a449e68 SHA512 d2a5c3f7626ffa447565a6c850e6edd736faaa87d460b961842a5ca3bb3d13766ee3ee25057644184af2c5a1306c75c89250fbb44a1c2920cd17fff7b6024e5b
 EBUILD texlive-langspanish-2015.ebuild 1109 BLAKE2B c45e2f789dce6409d7e8e957a4598b977324e4bbf40ccb2f7430a8c18f18b8073878ad557c087f266fc266b022e47231bab9a6776635ff1a884f44079b7f1d6d SHA512 4ae7db7978bb010a2eb6ab13537d8de2ba97182f691c4011904532a051e64056c2abb8196da3c352f282f7a6316fcdec27da2a62511c4918cc0bae5b2e0fa012
 EBUILD texlive-langspanish-2016.ebuild 1251 BLAKE2B e2f87cdf269ace40bc1298d72400eee0824fa68777497ce2521b49cf5c45afe7d4b8066fb4681f5af219fadcce21e4e8b593a3e22421082adf2ff2ca65b4d810 SHA512 5cc99ee9922382813deb3bf0f8ee5941563c93473f25c54feb50159907ec04f539b38ba69cf695dda250899540211a8a6ea39432500cc2946c8f8abd10c66bf1
-EBUILD texlive-langspanish-2017.ebuild 1251 BLAKE2B dbd7686c9890d2ba0f3a0b8374d5580a6a05d0c21fc7e17c209b1bae73b5caaa97588f04aa27250e1176b19e82a2953ccb046525f27a5772fc774c37eddd4573 SHA512 bdd8e2b12ec908d340232c8b9c38ea357012d87de21f2eec1a50208f340a312c574743d1cc489a41340b20b1d193755a1c935aa10e71254d790ec0e411ded9d8
+EBUILD texlive-langspanish-2017.ebuild 1250 BLAKE2B 570d0f39b51cddbf11ce8d413e6221e5a054a5d893b8d17650f854a0b22cb6ab91b7ea9f988f94605299d160d81b75b8fb2d3cf1a79579b2d3cb85968cbf80bf SHA512 9a843f0e2f1bcfb9d9c115ae8599bfd1cb00a7c05f19e37662b654f3491764ffcc14e8aa2c6320e9e6175b3dcb6a4b7fdb8e046cd876f6274a8efde19a1a66c8
 MISC metadata.xml 431 BLAKE2B 5b913256eb54147f95ff3804ef4e8975fed09563218bfcafbc6d664199b647f289e14e59e61d1cda1714c0295d3d7d4b03af7029ea3a642ff85db17a942eed33 SHA512 e7af474fa040a433df88f7d07f7ef410f4d5cc8086f8cbf397b08f40c03f2ce47a884ee7c994c7a6a75098f508ad73cc9aeaf74b84307b6aaedb9f16ff5873d2
diff --git a/dev-texlive/texlive-langspanish/texlive-langspanish-2017.ebuild b/dev-texlive/texlive-langspanish/texlive-langspanish-2017.ebuild
index 5c4b26893713..9d15a4486210 100644
--- a/dev-texlive/texlive-langspanish/texlive-langspanish-2017.ebuild
+++ b/dev-texlive/texlive-langspanish/texlive-langspanish-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Spanish"
 
 LICENSE=" GPL-2 LPPL-1.3 public-domain TeX-other-free "
 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 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2017
 !dev-texlive/texlive-documentation-spanish
diff --git a/dev-texlive/texlive-latex/Manifest b/dev-texlive/texlive-latex/Manifest
index bafc6d4d95a5..56e53e32d243 100644
--- a/dev-texlive/texlive-latex/Manifest
+++ b/dev-texlive/texlive-latex/Manifest
@@ -218,5 +218,5 @@ DIST texlive-module-url.doc-2016.tar.xz 266856 BLAKE2B b20dab7bdddd79e71440befcb
 DIST texlive-module-url.doc-2017.tar.xz 266852 BLAKE2B 159ca5b010b9a66768c0b37760d39f93356e1ef81be55da03f360b2c9fef8f345af38cf7cb9432b038485d212d427b6db564fc773b7ad3d15638054b84112a1f SHA512 ec678563ea26b5e013d631b9ced49c870f95556bf9f29259b9f35e2ba1a25150e613cf7fd7cf03e12fdc2323e2124dc617b3cc3bb164a9e7df2365b252d75858
 EBUILD texlive-latex-2015.ebuild 1664 BLAKE2B ca23fa646440a7af7c4f447914bf67100c8cf2101bb715e01da310b3f7e220399e06bc373ba03ff9080b51b1612835bd931aba8b4775d19a8b9cc95fb614c76a SHA512 55ac48caaa06f6b065706ebaad54a16f4800b0f545184ece83257939435c14d39e1bba72e375b685c8e73edab3cb670de3e854c3cd2c4eb4c900a60bb0024571
 EBUILD texlive-latex-2016.ebuild 1749 BLAKE2B dbed9fe284e1737a13d9e8e6cd134754419c14489ed63a939b25602eb58a77fdfdf5ffc35dedaf9a051b8365d93e64444a2d1fd61a652a0ec5c878bf99f25599 SHA512 11fec719d43909cb6931af816f6526738a9f8de7ddaab3bcb6af95e0c08beb69783e48ed374b57cbe39114c87c26a79b18205abc9ec61a2d89ea845e824556db
-EBUILD texlive-latex-2017.ebuild 1750 BLAKE2B d33a90f210d49bd230fa4ecc3306f262b0d06e7e8eaf84a3721b97043eab7a6429cdeb0631b13125635ceb90da7be2be02f61067da1af1d83df7dff0a2473df7 SHA512 e5ea5112c5ab0437e413cd68e97f14210b1d4ffe624265302edca14643118d968f51a7569a3954fb5af4b03c6052d18a962241e31648cbb47d21f989130f7488
+EBUILD texlive-latex-2017.ebuild 1749 BLAKE2B 66d229e6f3b4b8881f89742320c4c690a08f09ff8950d6009e12ed7414f3021a403b70fe55a4bb84ca50efcf7b6d5a1bcf763fedb1d7c6bbf9c9a672a1e6f078 SHA512 0d7cddfb79ba4bddb32d172e5cda30a0a779dadd06e7b686a83510c0891179d78dec3eb5781afe9cd28d0baa4318083cb44613c93516b37524f73c7bbe7e9d19
 MISC metadata.xml 529 BLAKE2B 59fc302f07f83452a60415a6ef75ae13bc314b3e2e0c3e8c58aedef8e2079e7184879908ec6d978a43a09a4429b3c1b79a3cc786a9695238b2a021916895269d SHA512 394556cea6402e78e83bb5ecb801bc9c6d4f0e85f368437953ccd1ce563954a3be99badee441c26d7791c965e13b17acd003ec325cc11b87a6fc605ffa2dd350
diff --git a/dev-texlive/texlive-latex/texlive-latex-2017.ebuild b/dev-texlive/texlive-latex/texlive-latex-2017.ebuild
index 4024f53d0559..2a52e2562fc1 100644
--- a/dev-texlive/texlive-latex/texlive-latex-2017.ebuild
+++ b/dev-texlive/texlive-latex/texlive-latex-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive LaTeX fundamental packages"
 
 LICENSE=" GPL-2 LPPL-1.3 public-domain "
 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 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2017
 !!<dev-texlive/texlive-latex-2016
diff --git a/dev-texlive/texlive-latexextra/Manifest b/dev-texlive/texlive-latexextra/Manifest
index dce4d50c6be3..a86db0f41be1 100644
--- a/dev-texlive/texlive-latexextra/Manifest
+++ b/dev-texlive/texlive-latexextra/Manifest
@@ -8557,5 +8557,5 @@ DIST texlive-module-zwpagelayout.doc-2016.tar.xz 591560 BLAKE2B b82dc9fa2ee968c3
 DIST texlive-module-zwpagelayout.doc-2017.tar.xz 591516 BLAKE2B 2c7a6199ffd8262858bdda2697b6f9aabde0c1d4cbcacaef223683be09fa1fc2db87be5a7542fc68de96a62ccab7f45468a41d1ba0303ddbbfd2a1947791864c SHA512 0a31ba65d49cbc111d6a5ca3ff1b2f9aa91614a23d6606aad1d5b9d37cd40f0f72c95bdfd56e56cb5f408279870e867282d862d0267d8e829fde608a49c079de
 EBUILD texlive-latexextra-2015-r1.ebuild 35701 BLAKE2B 46fdc6ce25f678528baa046d968c460f64c85ce8ab62663d5dd04405dc1d93c99f1ce10e361a2e9f6f034756a3e689326e43aeb8ef11acd3366ff7fdd5a93435 SHA512 8eafc43db3fca70cc31be8d4b3283cbb51e096c41bb45b6d930ed17fa32a4e899be8afaf25807cef3d4a0cf7c7e39eac06027cf642c02a8c6ad5fc1549c2d54b
 EBUILD texlive-latexextra-2016.ebuild 38864 BLAKE2B fb33ec8142e6175f326d62f259906592e0c379268f50ed472c171a54cd23826ac7a42ab35c9e71c88fd58cb6f4fc8a478bfb4f9927165415ab6326334874be73 SHA512 25639da7c812a1c920068252eeebe967ea498302e75e094345af966cd2aa0adaa0038d28300eca134f70edbdd471bdff54aa2c8e4f2202674da4aec05bf42d1c
-EBUILD texlive-latexextra-2017.ebuild 39383 BLAKE2B 086cf3bee3bd99617b0d36498cbe25a6e06ea31bdc4bd0550e5182ece7d7ef0dd40d59f8086f050af0680dd96d34d38f2537affcb46910d981fc5f9dca6dc1db SHA512 63480593f863788a25ab0b08bdc0f5b2d9c36e8875a472dff31b4ef90cc5edaa33dea4461406dffce8321903374ee40cd05d294a914e4da9bdf8960e55c6d280
+EBUILD texlive-latexextra-2017.ebuild 39382 BLAKE2B 32a9c3d24caf26ebb15c9142607c65b302b5e5f87be7cfd949268391fc2c634e6b528a7e7d13149b81535638f1f7c1aa1c5538af8e205db3ba87e28d94ca6302 SHA512 517eb7a37051f04fe9b89dba7e2b791f4c3cf1bc16b5272d7c7e1d6e2807cfde8ebe32308a614a005115e772a951b83c9edf9c21ec56517972619e07f8b0d9ee
 MISC metadata.xml 464 BLAKE2B f44661c9ab79ec9d3ca261cea4af7b64fbef81b0d63218137c940e804a8254b7a8638564d51b4f843e4ec59fc15711bbebd09f4b1fefd5a070ce0819345ce778 SHA512 f2f516eb45d8d405e29e91886fd2ffeb54e6126028d2ac218eb0bf43e009ab225f0a0661ce99436dda82b5f63b47e5930ab047e2bf16a2e306da510453fbe6a0
diff --git a/dev-texlive/texlive-latexextra/texlive-latexextra-2017.ebuild b/dev-texlive/texlive-latexextra/texlive-latexextra-2017.ebuild
index 1a87c8d16863..aca99b04143f 100644
--- a/dev-texlive/texlive-latexextra/texlive-latexextra-2017.ebuild
+++ b/dev-texlive/texlive-latexextra/texlive-latexextra-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive LaTeX additional packages"
 
 LICENSE=" Apache-2.0 Artistic BSD GPL-1 GPL-2 GPL-3 GPL-3+ LGPL-2 LPPL-1.2 LPPL-1.3 LPPL-1.3c MIT public-domain TeX-other-free "
 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 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-latexrecommended-2017
 >=dev-texlive/texlive-pictures-2017
diff --git a/dev-texlive/texlive-latexrecommended/Manifest b/dev-texlive/texlive-latexrecommended/Manifest
index b07231449b2b..8b12b9727ce0 100644
--- a/dev-texlive/texlive-latexrecommended/Manifest
+++ b/dev-texlive/texlive-latexrecommended/Manifest
@@ -433,5 +433,5 @@ DIST texlive-module-xunicode.doc-2016.tar.xz 588 BLAKE2B 323414d6b59493065bd9c03
 DIST texlive-module-xunicode.doc-2017.tar.xz 588 BLAKE2B d26d3f9960cc982a16cfdb2435d59d187b16370034e473a7f72439d4e41f24365df03bb8cc56dfa55d736a53b41baa43eb9ad9ef7790874265f4e8702dd9e6b3 SHA512 29ef434a1832f9c21b327856d074fff3db3d9e6094ac251b9e00cb224fff058806b7a491e9c166570b41ebbc2d1db084b90fac68a26f45e70196623b6754f9fc
 EBUILD texlive-latexrecommended-2015-r1.ebuild 2523 BLAKE2B 871965a20dc0d8485e86a7f21a6c9ed464bb2f34a7933aa835c60029bac591ceb31f20847cb81baa4ab14355732e441118d45800cb315c90ce2fc77458cbf09a SHA512 d554eac751c4d856768baf916f676302fa4ff47de94f92084ce3ce24ec773e6c6a297723d56b37c1a708a129250ba50c5cc8194b8810afb35197d53c97ce44ff
 EBUILD texlive-latexrecommended-2016.ebuild 2669 BLAKE2B aefccbfc5396277a5e45b271de1e083fe7698578a9da7e4a0f0a31e45901fa89b45f9c097749cc314103977211f96e5b5a6cb0a77bd6865d806462f5a94793b7 SHA512 d8a307c712528487358343fa9f0803283375ad3d66f60b7b546f3c818b3fae9f7f8d21381d6a293cc28870180e6907bd759f6f9e68beafe07badc40a079517ef
-EBUILD texlive-latexrecommended-2017.ebuild 2822 BLAKE2B 57a1cd6615d0a4c0025fd5e703d815f856054ceb7c609a1429c0e5370c197497612d64b4f0fa1ccafe5029bb2b579c4f3853fbfeda305bc7d0021e0875b9d71e SHA512 dc50bdc79409679567525c5976f191e01ba277f0575214d044c1460d3147df15d7980f1d33a9bc17df8ea5d3cb509b09c7d53c80fda656e259f8bc68aeca99fa
+EBUILD texlive-latexrecommended-2017.ebuild 2821 BLAKE2B 8d862feadcef33e9bf1e0bd4e45dd4708bb33922ecc46541033888ef641ea79147d93b627c3c1bf8a2cd54bb416f427ef0ea20c141bf4a6f77acc9f3d5a30e4c SHA512 9dca3784f0f919134831f9a8a0093c61a93bd92afed4165897fa1a5f6836af883ae1806d2723f40a4ed4a44c291f43f1584e68b3e8b09de600bc375d12f56e4c
 MISC metadata.xml 493 BLAKE2B 2863d00d1b302441682fdc631273218535ce353c050c295b9f9f0fd133cd687a281e4cb634eeb58c89421dc9cecb3bf32e7816dfa2745e139a90f5760e7d0927 SHA512 815d4e8c1dee309cee3f6f0fc553903a7129a3fb9be6dd413e3c0b81f8924c82e8377b11eddeae17192b2451209ecc25d15dc19a925a58ec979c10f2342a6869
diff --git a/dev-texlive/texlive-latexrecommended/texlive-latexrecommended-2017.ebuild b/dev-texlive/texlive-latexrecommended/texlive-latexrecommended-2017.ebuild
index a9938f16d220..eb9bdd2dfb92 100644
--- a/dev-texlive/texlive-latexrecommended/texlive-latexrecommended-2017.ebuild
+++ b/dev-texlive/texlive-latexrecommended/texlive-latexrecommended-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive LaTeX recommended packages"
 
 LICENSE=" GPL-1 GPL-2 LPPL-1.2 LPPL-1.3 LPPL-1.3c public-domain TeX-other-free "
 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 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-latex-2017
 !dev-tex/xkeyval
diff --git a/dev-texlive/texlive-luatex/Manifest b/dev-texlive/texlive-luatex/Manifest
index c0fd5d565bc6..8c3a9535d543 100644
--- a/dev-texlive/texlive-luatex/Manifest
+++ b/dev-texlive/texlive-luatex/Manifest
@@ -266,5 +266,5 @@ DIST texlive-module-ucharcat.source-2016.tar.xz 2324 BLAKE2B 32a496c2f876e38e6e0
 DIST texlive-module-ucharcat.source-2017.tar.xz 2316 BLAKE2B bf8293199b8b1f8207b13bea33e526db234b76080a85815a5c8ba1ef2b90cd0e6f41f607c179c06fca2d7e784400822965b0cf7099a9b22a22a28f687f9c6f4e SHA512 558e2895a44364217155323d0c7592fcd9c6730ae35d998e2135f95bd420ad8c8724627b0616cb649ed12cdb20fe75a02fcf545180d081537fe148a44cd1bc2c
 EBUILD texlive-luatex-2015.ebuild 1933 BLAKE2B 151dadac8277032b699389ff0076b09de2b797f4aa9aa0b80bb6af1a2087aa75bac4785fa58df761681f9a7169005309afa60f3a3b48dc579e5496b14234aec6 SHA512 3784c4eccd2b2c458d77050f3b2ee05c1b4e4856f1fe6751d787c3e342a1a06151a34e1eecb9fb61ad53b8a71f773bf6b52f15f804fb04ee5c305124f4b0ad88
 EBUILD texlive-luatex-2016.ebuild 2130 BLAKE2B f19caa4317b9fd487eea19b65c126f0e107331d5b187bc7a455c5d390ede3af9e02c6ba29c7614804c20175b2419a97c13a0ba48978ff86655579cfc2ba0b1f5 SHA512 03e91853717d21fa034638402c976762e59ac66a781e129ed71ac877333bf2a4d4dc726bbdc37732e1bb4b3eeab68c3aff194b90a109995d93c010fbf3a76ccd
-EBUILD texlive-luatex-2017.ebuild 2151 BLAKE2B 90313eb0a490e0458e8f21178e45744a18c04037b2ceaed824071e210e6215d0a6792a53c246df2023fb1454346f51946dffca73ba6156ca4a5f0b9912acab6f SHA512 a12bcbfade1e5dedaacad3ad6cee0c5638d0e430525d2435978ae0da6b851b6a1fcae7db86434764db0b857297577e4f083cb69a6275852cdb29ac6c218e90f2
+EBUILD texlive-luatex-2017.ebuild 2150 BLAKE2B b08b9f00d0d84ab20db9e9b1009e37749185ff52d9bee2568b19df5665ce344079b892737759f287eb8d7688d9b13609b52595363ef76894ce46cc38335d1eff SHA512 fbcaf52b696bda3c739a6b577b6df40518c7b827747e7ce081e48b39b32d3d0d7d6309036ea0dc7131cf19fea1299b182397353c4b738b82686861b35a495956
 MISC metadata.xml 548 BLAKE2B 12926c8cbe1c42799921e43f05ea4b2ed0e314855e01131d271d97f1b72914ee3eeee039e959a81d27e6c39469a42f68443245420a50b7177815858f3a92924d SHA512 9952f37d3ba08676efe90c13476b43140d0039a6b698ac91dc028c26fb7704dbf9da880d5f38123b219f0af0c6a029bd463625a6af5527ebb94f2d56b1b1b166
diff --git a/dev-texlive/texlive-luatex/texlive-luatex-2017.ebuild b/dev-texlive/texlive-luatex/texlive-luatex-2017.ebuild
index e3da2427773e..cbf4b8d3dd3a 100644
--- a/dev-texlive/texlive-luatex/texlive-luatex-2017.ebuild
+++ b/dev-texlive/texlive-luatex/texlive-luatex-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive LuaTeX packages"
 
 LICENSE=" BSD FDL-1.1 GPL-2 LPPL-1.2 LPPL-1.3 LPPL-1.3c MIT public-domain TeX-other-free "
 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 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2017
 "
diff --git a/dev-texlive/texlive-mathscience/Manifest b/dev-texlive/texlive-mathscience/Manifest
index 22c6bdd5033e..161f900e98e6 100644
--- a/dev-texlive/texlive-mathscience/Manifest
+++ b/dev-texlive/texlive-mathscience/Manifest
@@ -760,5 +760,5 @@ DIST texlive-module-ytableau.doc-2017.tar.xz 360816 BLAKE2B 0acb1fbf39ef9de43869
 DIST texlive-module-ytableau.source-2016.tar.xz 15896 BLAKE2B 4e5573ebce1e66772b5486c79586d4cf33fd36f8b05dd302ecb20da33edbc84fdc6899b9dab6c52e066462c3958cca6f5fc8a6213865f53817addb214ce1b9f5 SHA512 76ec8e726ab8878e9ec7a1ce674da3a8d6dbd5c971d95cb6ddb68475493fc179ff3904a7f9b45da1c36ebd10f6d1d95678c0176b11ca48c4b598188713d94da0
 DIST texlive-module-ytableau.source-2017.tar.xz 15884 BLAKE2B 5474eb45ab176e7e03352eef9f87604052099bd385e804fb98795b9b68cc5c15c125fe8f5307a10ed6b7e282c3fca1ffa913cf9b0c4c128134e0113d95f92c79 SHA512 646fa552fadca33406c195ac17b2d20504439f39dd8f62d85fe4f66b6a476424cce08599e69571ac7d05a28252f406fb0c092f55bdbf00524d1967a231a9dc04
 EBUILD texlive-mathscience-2016.ebuild 5518 BLAKE2B 358d034a7ad2114c2097eb5758168f95b3be25e6f2df6c44e722fb0e053a16163925303a6656678b83f18c4b98d364ee1835323f09bb9af43eed6edaa8cb8255 SHA512 b38dfd37ca9ec6553ec0391ab0c7c9bb5648aa6ea9fa5234b18b0932e1305487ac4f5b83705c8c331ec9fd42100e6645b23f8b54ba216aa86d0c552618b15520
-EBUILD texlive-mathscience-2017.ebuild 5812 BLAKE2B c0d26931d3803cc45fbdbe57dc17ce86304286aec6150e08c84395ae3cc0ac699e482be9fdbd1a0730f25b654840c79922a4584f1172f044f660c29fce909a60 SHA512 1875b23ae70116f7db9a33d741cf51c27ed320b7da571ded97aeb028927d1b1cb4481605f5d225c32149971a2d378af1f875851a5b64ec7893d15fc6fa21ce83
+EBUILD texlive-mathscience-2017.ebuild 5811 BLAKE2B 2cd491be7447978fb2f99e9f4664f704dc100d01e54073cef75e5f84266df75fb1a7043dcb6bd9c0356c0222eb5d54d3891d59c5daaadf09556ea9b7846f9b51 SHA512 284e074cfe9adea1bd642985ad44fe2726b5564bbbf93a8448a44e7e12c641edea158a767dfbe58923585fd4f93e6510451e75ca7252ba6d235194370786a0f6
 MISC metadata.xml 359 BLAKE2B 8b3bf3704460503fb9f60ef92d86e7631912398637de4ce55933ad5edf272acf8401bd49f9f47c176c6580ea58e58f93532bac040e583f45674c8eca39664a1d SHA512 f6decb141c5a9c40ead9e20dce2c1d9c030c1c03d69ec36ea41dc791b51c97153647d8d3680a0a87592da09e7a369bb9f2ec5c80796022d029fee6a1b9924e2c
diff --git a/dev-texlive/texlive-mathscience/texlive-mathscience-2017.ebuild b/dev-texlive/texlive-mathscience/texlive-mathscience-2017.ebuild
index 12d53284e7e0..dba2e7823cd7 100644
--- a/dev-texlive/texlive-mathscience/texlive-mathscience-2017.ebuild
+++ b/dev-texlive/texlive-mathscience/texlive-mathscience-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Mathematics and science packages"
 
 LICENSE=" BSD BSD-2 GPL-1 GPL-2 GPL-3 LGPL-2 LPPL-1.2 LPPL-1.3 MIT public-domain TeX TeX-other-free "
 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 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-fontsrecommended-2017
 >=dev-texlive/texlive-latex-2017
diff --git a/dev-texlive/texlive-metapost/Manifest b/dev-texlive/texlive-metapost/Manifest
index 47e5a5178e00..94b0d76e2239 100644
--- a/dev-texlive/texlive-metapost/Manifest
+++ b/dev-texlive/texlive-metapost/Manifest
@@ -270,5 +270,5 @@ DIST texlive-module-threeddice.doc-2016.tar.xz 119012 BLAKE2B c27db6786bec940763
 DIST texlive-module-threeddice.doc-2017.tar.xz 119008 BLAKE2B e364557138a3dabc1eff4bef7ce2042a1f6522eb3b6ce84e1e3778c49707546271948e25c3650d3fdff3d07ee176f3071e3f7ba4778eff2ffda75b5d851bc0ee SHA512 976acf5671cdfab523ce1af8a3851a99bb154ae19e601d2cb6ee26f5f78d69b975fe8e73a6930c6dbbf086c5e574d83a279efac3d6fe3f376eaaaef7f05665b6
 EBUILD texlive-metapost-2015.ebuild 2087 BLAKE2B d1761344d2fd274f1e4f3cb111a187386e2ab2e4b29beb249340ea0ceeea52de4990d354518a7db5ae5a4d0f9ea4bb9303cc4ed454ec37853d6b2a12d42c0588 SHA512 a68c555617d120ff2c5b9799a0734dc5345e3da878d6db8fc49ab8273b8b2561ef1ca75fbe8d0cb755ccc84ebdb7bbbb113604702fc9067b580567e7b3ddc9a3
 EBUILD texlive-metapost-2016.ebuild 2194 BLAKE2B 2f93e3d25d7c77ddd8b392fe3c5349d8b3ec0ddbd462986f1200f73afb21d644ba2c8193b27af36ca4f8bd45ebf5c73e7fae967d2448800aeda2cb8405b3a514 SHA512 f586b069af46b2e854375c26dc035959682aa212056a7ab52f2a8f3af0d1e06bbaea4eccaefc03c1f2c0b69af74ba8a2088f301ffa8dc56e557334221869a012
-EBUILD texlive-metapost-2017.ebuild 2221 BLAKE2B 878d030918a7f16c1912f5cee25f101319ec0079c0a2c7c63cee590261162cec0eb6d90001a3e710e533a680849b30953c902324f44cbba0faed771e697f9110 SHA512 cefcd4b9d5e1acc17f79556e578666a28865115900729ca40c6d557d40e57c7c39ee5b8d7298c5d5b655e65fec51154e72613415b4e199cd03a73ad0b695669f
+EBUILD texlive-metapost-2017.ebuild 2220 BLAKE2B 416d401f2a9c0a1b3fc65cea41a8920d012afd26a95863450742787483c0abc6d5e4d7e0b367d49c00d25996dcadc562da91b1930d8f5f6232aa2a17a3bca7ce SHA512 446ccf7870f365abaa34c946d188c3e141848d2120a679c5cc1df6cdb0bffda75ed6d7c78c8990b164a7b766c13b5ea7c8a340fbdf061f6916aaa1906a692a65
 MISC metadata.xml 359 BLAKE2B 8b3bf3704460503fb9f60ef92d86e7631912398637de4ce55933ad5edf272acf8401bd49f9f47c176c6580ea58e58f93532bac040e583f45674c8eca39664a1d SHA512 f6decb141c5a9c40ead9e20dce2c1d9c030c1c03d69ec36ea41dc791b51c97153647d8d3680a0a87592da09e7a369bb9f2ec5c80796022d029fee6a1b9924e2c
diff --git a/dev-texlive/texlive-metapost/texlive-metapost-2017.ebuild b/dev-texlive/texlive-metapost/texlive-metapost-2017.ebuild
index 6a2a2186b886..e7b08708cb3e 100644
--- a/dev-texlive/texlive-metapost/texlive-metapost-2017.ebuild
+++ b/dev-texlive/texlive-metapost/texlive-metapost-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive MetaPost and Metafont packages"
 
 LICENSE=" BSD GPL-1 GPL-2 LGPL-2 LPPL-1.3 public-domain TeX-other-free "
 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 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2017
 "
diff --git a/dev-texlive/texlive-music/Manifest b/dev-texlive/texlive-music/Manifest
index 9999424e9185..d48db770d074 100644
--- a/dev-texlive/texlive-music/Manifest
+++ b/dev-texlive/texlive-music/Manifest
@@ -158,5 +158,5 @@ DIST texlive-module-xpiano.source-2016.tar.xz 6324 BLAKE2B c3cf3e0a74df7994f2585
 DIST texlive-module-xpiano.source-2017.tar.xz 6324 BLAKE2B c3cf3e0a74df7994f25853fe895773f8b23733e71831060a4ba761fa1603ba4201e9e913e4c6008184c7159d1c331a6bd2c34d37b865d883b0e1b52f2d1b2687 SHA512 2566a4cd4070ae021ea0808b3c9ccf1d6a7add4f9e0a504c42f6c42ce659ddb6e9de7f7b8cd61f02a84c8bbb9163ac11aabb09c1b7efa4aa8a6e067ae3c129a6
 EBUILD texlive-music-2015.ebuild 1639 BLAKE2B ef6fcb260aca80084d8b6914808ca11194e5707589fd40ef348073fb592c82bef2abeaec1ae2affe3e1310d315776aad2416f137ac95df6fe0a3dd192e03507c SHA512 5984a2c6fa3e0fa3355ed7817496ab529efd02cfcec845058a284aace05ca459dda8da9ac317948f1e60e221b0bbfd65f0793799968539f41103afd83184879d
 EBUILD texlive-music-2016.ebuild 1707 BLAKE2B 13639fb9102b4b15c837183ec8a3ff8b97ba9acbcda5fc2e96950def41ecaea5988c009a738e81e1f940dfff5b5de9df1425d85eb548abaa06a743069e675044 SHA512 231669bffd8ff89c2afec839bab68363284e0384305eeb368030e1d699b55f16118777e759b9cf2a233200050e477dbf4a7fcf66adcdce8dda25be7c03cdda4f
-EBUILD texlive-music-2017.ebuild 1678 BLAKE2B 08e297e6d663d675f9d6d831e0228e4337b1456c0295907cdabc14249bdeae105f45603fab01b5de29ec41c52607a3633dccce6fa35c97d4f03a73bfe683f946 SHA512 0bca9d0e38ca96f7bf7116af77cc6d1fec3e85b2c44b374792eaba0a1f96121f966dd192054537eb8565c05c0b2e908d98677d8ba311d629aa10ffb741ec262a
+EBUILD texlive-music-2017.ebuild 1677 BLAKE2B 5493943977b4d3b51882e1fcec5aae2bb1a9f272884e04aadf4904734e1f75ab0758269e1fa707e4556f766700bfd684991f86c98ad70ec89b8053b9f2b6622d SHA512 e0eba0e9fe0b9c72d5ea5359eb2d0acc7b24d8df625376ee009c2cc9903420a61b69f07613de158f498d4677856e2899677c47b5be064c652ee8315024d68a01
 MISC metadata.xml 444 BLAKE2B bcaf0689cbedb3dc02a63060d40765ba836651697d152028439119abff46f55cedd497220880d05ea00d5ac98dc61df77bd918c88e3d6fa783a356552be2b8b9 SHA512 2f4196a50ed70a2fe7a7f3d51ee5f3299682a7dcd06f0791ba128503d0bae27caf127eaa61e847644c06d40d3bc107977fe5546040e3eb14cae1705c570d6c7a
diff --git a/dev-texlive/texlive-music/texlive-music-2017.ebuild b/dev-texlive/texlive-music/texlive-music-2017.ebuild
index 3874ff631178..5519ac461e3b 100644
--- a/dev-texlive/texlive-music/texlive-music-2017.ebuild
+++ b/dev-texlive/texlive-music/texlive-music-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Music packages"
 
 LICENSE=" GPL-1 GPL-2 GPL-3 LGPL-2.1 LPPL-1.2 LPPL-1.3 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 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-latex-2017
 !<app-text/texlive-core-2011
diff --git a/dev-texlive/texlive-pictures/Manifest b/dev-texlive/texlive-pictures/Manifest
index 655923297daa..d03cf312b395 100644
--- a/dev-texlive/texlive-pictures/Manifest
+++ b/dev-texlive/texlive-pictures/Manifest
@@ -1011,5 +1011,5 @@ DIST texlive-module-xypic.doc-2016.tar.xz 3923200 BLAKE2B 3c0da6c849d411338568c1
 DIST texlive-module-xypic.doc-2017.tar.xz 3923164 BLAKE2B 05428b38455175d31fb3f6cd492a7209ad90370c15467637894e387836d7c25d669263c16382b24d1ed060b3e7d50282a06197cc79e5fd5731b9c92f1097baed SHA512 9f2ca1f120378e4ce52d96d7622a7f22a301c02ceaa2a19ce14d775073961aef01d1fb65202bce2ce1d8b88801749e2d642a0b2d52518d7c70317e8c62d9d2bc
 EBUILD texlive-pictures-2015-r2.ebuild 4702 BLAKE2B 0f3de68fba8f5c5ab1d7da53cf684a74327decca7dce8bb9d9319c3fec4602abf8bd40be33338de28146690abcee14b24b5c07e1e340d2a4ca06fd0837bab411 SHA512 9d139b8e5ae9b39ca353f3542ecded6f474f1146c8d3076ab96f1e1c229baffb298af4a63f721b7bc604be67c4113f69e8d5bb97a82bad587cc7b5cbf29e7d00
 EBUILD texlive-pictures-2016.ebuild 5350 BLAKE2B 236fa6ce487c989244bbf50ba5a20f0b045ea069e9e399458d5efec652c09c2f38a89146d1b76f575083ae8019296e5d85524b576b2a8b4e2a569cd5a8be4ae6 SHA512 154546a58d9e46cc4ee55aae6af764294d9705b54499608a7916580b56414248f181831581ffaafad94061a513b8a90b466e7ba7d5f9afcd9b23f9839e8c1758
-EBUILD texlive-pictures-2017.ebuild 5541 BLAKE2B 662fcae75b31ffd7d19bd0d4d86572fd2562a91003273d1d665fdb0669cf3fa9eeda41c02b19ad73c7b883aa1598ced14361b29d6c5d4c17c40565ddb89cc545 SHA512 a053407741e1949d3655b6b5801a874b0ab2bfca1f416375d5ac7954c03920147189fd99e1cd190ade8771c588bbd3a85e2c38f6e0c3fd6ea7b9ad1c6e8de538
+EBUILD texlive-pictures-2017.ebuild 5540 BLAKE2B 24010d6a125311594c312903b2923c9268ba198b952631d305569981c0237f0f9183614fad637fb56b52b0bd2dbdace6aed8a8282a777b6ff45d06bde58c8ba9 SHA512 5a703c4b0293425083aceab5e35de1ed20d85a5b70989825d1b90f08010a6ce590a4a23b58e2b86b664fa800da8811c2f8ff335d21ad1ebe48098c91a020104e
 MISC metadata.xml 478 BLAKE2B e113025fb506c77cc1f2a8099b1182d3ce057e8067145dfe921af4289f22f3894e4a20eb6f941f4bdcad739df93975766490d62ce253a0710ff428dcc045ec11 SHA512 547880e196d638109a84a159cf694f201dc6e01ae15d26e252fc7da697cc2c466da0a3403c149d5847049da06e682557293cda020b77a05b0684611b4562f957
diff --git a/dev-texlive/texlive-pictures/texlive-pictures-2017.ebuild b/dev-texlive/texlive-pictures/texlive-pictures-2017.ebuild
index f989285c7bcb..971a9304f1a2 100644
--- a/dev-texlive/texlive-pictures/texlive-pictures-2017.ebuild
+++ b/dev-texlive/texlive-pictures/texlive-pictures-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Graphics, pictures, diagrams"
 
 LICENSE=" Apache-2.0 BSD-2 GPL-1 GPL-2 GPL-3 LPPL-1.2 LPPL-1.3 LPPL-1.3c MIT public-domain TeX-other-free "
 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 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2017
 !<dev-texlive/texlive-latexextra-2009
diff --git a/dev-texlive/texlive-plaingeneric/Manifest b/dev-texlive/texlive-plaingeneric/Manifest
index c51209452106..cb0569e64385 100644
--- a/dev-texlive/texlive-plaingeneric/Manifest
+++ b/dev-texlive/texlive-plaingeneric/Manifest
@@ -181,5 +181,5 @@ DIST texlive-module-xlop.doc-2017.tar.xz 537924 BLAKE2B 99ca47024e0a88404dc3dcbf
 DIST texlive-module-xlop.source-2017.tar.xz 916 BLAKE2B 13e151cd8bb0bf1b2912b7e9962a2da70e52f24b6f8ced1aa582ec974e20c680befc949f677dcfa54c4f8f0a6266b14611022a28f1118d6b8e85a4e5c3495fcd SHA512 246d2ff227d6ab8ff9367f0ab26458e408f4919f84edba84a06c97c057ad4c217fdac5efe8dbae56bea66f4ec0133e9e94ce444cbac4a3c70e3d88b413b7de08
 DIST texlive-module-yax-2017.tar.xz 5952 BLAKE2B 41a9fdfa93d7f50c7977ed2270ba0c62b80f329a9ddc9b86ac909217ea6614884c0a58904a94109d2347fb7e5ad627dde5464718fdfff364d9c402b59645b359 SHA512 2602ad4d5487fc3ff982b9921c0f16b19b658d0d225cc4b40be98be4b7d6ac86666475955644d04d8ec0fabca8c566b1fd219797d2dbbec8b6d9becfeeb6d0f3
 DIST texlive-module-yax.doc-2017.tar.xz 123708 BLAKE2B 7a64cdbd2a8e88238f331fc2dd9f4350e02ff4cc9cbe32741debbd7a47ea4bd934cb751eb9faad159e594f6fbaf86ecca86d497795c7e2985e5134ceb879def2 SHA512 ead74dc1ee40a1b28cda1665969e3e21f1c1f153d6af1b74e1c1473c0edd79225e74a054416f0d04c432721c7ad80540d28566735e570234371d290033c9afd1
-EBUILD texlive-plaingeneric-2017.ebuild 2903 BLAKE2B 28dd330a1ef8b5fc5c07c092e48796424c5399f23dc277bd0eb940f9c234e53c6dc84e55a859374b93204bf33765994032d419e9b4cd13a156338c14027ceb5d SHA512 8d2e38b3aa3f118c2c89a06aef43e263baaf9375d6b937e1a017b658255f2ca675f1b49da4dc89bd14c9570ace496f72dcb60d203761fcde3f8227aac543c21b
+EBUILD texlive-plaingeneric-2017.ebuild 2902 BLAKE2B 5a70ce3a51ec618333a887148235b7957a0b2f3268643fda24b0696fb6661153a20585b4fb3e60f919b5ff4bea50c572b499d3084f93a783c1a4fc500986ca48 SHA512 368d03969713b9b334055f9c6da6224872bc077f5fcc8120210f0363e24136c7ab432bb0b507b328a18781e00ec8df14ab35e600370b2db43c1276dde2859f50
 MISC metadata.xml 510 BLAKE2B 499e22771e566c734ad5e8c6a239863e8ba931da1b0784f3320e07d4741afd647cc893a2f0646bb2ddc6b17cb340303efdeb5c8c6d866caa9abe7c97a133a620 SHA512 651f52d36fa1f4c9b767e600554cff9a6a38b702727ca17db398eba1ec732e60351cabb4521bff8a3234230f645fbb9e24af342df28e857fa6d1c6f5ceb3f9c8
diff --git a/dev-texlive/texlive-plaingeneric/texlive-plaingeneric-2017.ebuild b/dev-texlive/texlive-plaingeneric/texlive-plaingeneric-2017.ebuild
index e970e4d52281..8f6a59eb2cd2 100644
--- a/dev-texlive/texlive-plaingeneric/texlive-plaingeneric-2017.ebuild
+++ b/dev-texlive/texlive-plaingeneric/texlive-plaingeneric-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Plain (La)TeX packages"
 
 LICENSE=" GPL-1 GPL-2 GPL-3 LPPL-1.3 LPPL-1.3c public-domain TeX TeX-other-free "
 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 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2017
 !<dev-texlive/texlive-langvietnamese-2009
diff --git a/dev-texlive/texlive-pstricks/Manifest b/dev-texlive/texlive-pstricks/Manifest
index 25845adb4978..a32d86a3cb4b 100644
--- a/dev-texlive/texlive-pstricks/Manifest
+++ b/dev-texlive/texlive-pstricks/Manifest
@@ -692,5 +692,5 @@ DIST texlive-module-vocaltract.doc-2016.tar.xz 15928 BLAKE2B 35c277d8ab65745bd41
 DIST texlive-module-vocaltract.doc-2017.tar.xz 15928 BLAKE2B 35c277d8ab65745bd415507cb2c3e056783327aab71d6918434675bb41febddd8b237abdbb5398e18d7ee959c3ab20597824a4ece759572f55871437e4cfc7d5 SHA512 38931f205f6a284a8e1397d74ea4987ed99317582f10fc5a28d3dcb06489cb6031d97edbc3a5a0c0bff25cb4a8c1b223da3491573bfaf26b6c76c5569617b037
 EBUILD texlive-pstricks-2015.ebuild 3837 BLAKE2B 988ad479cf87d9fcf47284366d8ff4c17a7dd863a4ab312d98bb7d1faca3910f99ac9cf11dcea7c2687a68d850dc1275933616d57c43f9dbb05dcda544eb0358 SHA512 7984d95ed298cc8bdf142b8d7d5826793cb0d0c0692625926fae792ac26ed8f634d91308c7a5916d2b0749e5895369078625ed64e8f7a01104100228f94a1dcc
 EBUILD texlive-pstricks-2016.ebuild 3906 BLAKE2B 48c1faa217c65c19a0b0dfc7f974c5e669b40dc2d6987cce7b3cf5fccc607e6a7a0469c447c020f3b185094cf48983a8cea2d79f9668398442d179cacbf92d2f SHA512 eab6117beb0d638c0c993a8a10a557a1002d96cb05f822231b3a89137b505fe2dfeaeb9ae3a4a49efbe4c9ce51612ae95327127b1062d13548c555660167b5ed
-EBUILD texlive-pstricks-2017.ebuild 3881 BLAKE2B db4245eb218457f414b5b922aa72824ea4ce9c49186aef8f309e27fc107990f11679b82c78f71a4cbfb9beecdf22cc57ac5ef332211f60dd5e0c770143653c1c SHA512 7c3a79692a8cf9e524dacf77171384f0dc68a6c6816bd3c84b00190686cfeb4efd84f95f4c2e8340d0e63cbf1888dd6dcc2fde83a40738bfdfa4be4ed0bff829
+EBUILD texlive-pstricks-2017.ebuild 3880 BLAKE2B e99fe6c9a8c956051a43e68e7bea38c510cbb0039d805671de45fd4ac68a8c3608b831ebbf7009f9d5b007c5de81b0945f6a675d00d6f8c2e2260f92c1bd2883 SHA512 4e4179df96933a07222b274c809b36a76e8efc6726d79a73a2e9b3da7378a936e213411193aac02a47ad0b6b313beedd6b4d573104bd3029d8caf11c1d89dc30
 MISC metadata.xml 449 BLAKE2B 524269780e1b502624f7ca03581ecaa6dc078802561231346bebefc0d9110aa0c8080b52e4ca3efa80c9ed5cd9a680d23a6228cbb693cd40c7d787ea24c7c06a SHA512 a3df336b00fc7b9c13cb71b5bbc2917fd5eabc00fe2cb341ecb845167a3f2d342025d4d81d22f421c79b2cd6fb14782cc1c5fcc54fe720b2e14d5e75f56eb58f
diff --git a/dev-texlive/texlive-pstricks/texlive-pstricks-2017.ebuild b/dev-texlive/texlive-pstricks/texlive-pstricks-2017.ebuild
index 63d48a408a88..b1e5f565fae4 100644
--- a/dev-texlive/texlive-pstricks/texlive-pstricks-2017.ebuild
+++ b/dev-texlive/texlive-pstricks/texlive-pstricks-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive PSTricks"
 
 LICENSE=" GPL-1 GPL-2 LGPL-2 LPPL-1.3 "
 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 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2017
 >=dev-texlive/texlive-plaingeneric-2017
diff --git a/dev-texlive/texlive-publishers/Manifest b/dev-texlive/texlive-publishers/Manifest
index 6c5715da3b4d..d71da36f3158 100644
--- a/dev-texlive/texlive-publishers/Manifest
+++ b/dev-texlive/texlive-publishers/Manifest
@@ -1221,5 +1221,5 @@ DIST texlive-module-york-thesis.source-2016.tar.xz 12584 BLAKE2B 62d8fbc2d8e7195
 DIST texlive-module-york-thesis.source-2017.tar.xz 12580 BLAKE2B 1bae520b3031c8bdebef74a8391f9f89d40e9a0d0cd71a46285e0939f1c0fca4be0ef7edfc491f6f5eb4a48a61404a0026514fbf307ec6a3bc383fe95eb87ec9 SHA512 088375bfb5eb7d55150761e9e322f93e8282735740a30176c3c8e03e720692b3212ddbda85410429e477d95841f396b43a3998d6d03a55b8d3edde0ff592b1ca
 EBUILD texlive-publishers-2015.ebuild 5206 BLAKE2B 89eac7c490c9a707ab43b7c31b741b0af929fbaee896fe9f4cd3d002bf7379088f6ad89128a4ad4b97c7d6df882f5565bb44a4145cd1947794135e0480085763 SHA512 8b19b119e459b980432f71e41b89ed55887c79647facbe967821a282b7d4de691acc10da19634c6697240cdcf5e7d0970d6f11dbbb2afab200996d844f0b73b8
 EBUILD texlive-publishers-2016.ebuild 6003 BLAKE2B 51629da13cdd24d5e6992253133d21ff3cdb5fee110c7a349f59352def289b042aab1c1ed644604c06ff1480025451be33eb6d911cb811fe2363eacd5f6c2c65 SHA512 1698659d1889afd405fc2e94c2f4daab7ec18f0efb0c12267d2673a60e104e82711f1ef40fbca3d6cd6c34572dd991bfecf5fd1b1d78eea10ffa054a10d0a0d7
-EBUILD texlive-publishers-2017.ebuild 6169 BLAKE2B 7469cffc3f83f91ba78174c80a35c3f403b5ca4ab77d72c20e60590e17256a935f4e5a96253f82ba74360f4d7bc96f90390c1ba3ad0d87f5c7be58f7296fc104 SHA512 3fa962da3c5be39b6b9bda3b94a6460796a0bfed8dc4bacd87176443263f53545efb7ff05acd490c1e5145d439335bdb9c83c52eb3a3c49a7f0aeb63674e6c29
+EBUILD texlive-publishers-2017.ebuild 6168 BLAKE2B bf21398940e71143c0ee8418a63be0bdb782b73f150d0556d07f5498e93ce8682b91470b9bc9c900d3a514a3c0e6dfba71ec3df950eadadfd4a58a1614923baf SHA512 3a9012bbe341339dd6c1a150bf335c591c7877b9de2ef7990b6f21e1832d0776e1f232d1f11ba3d3f668157022e7cb34502ec0e8bc18b617cb4ae7b50bbbaa97
 MISC metadata.xml 359 BLAKE2B 8b3bf3704460503fb9f60ef92d86e7631912398637de4ce55933ad5edf272acf8401bd49f9f47c176c6580ea58e58f93532bac040e583f45674c8eca39664a1d SHA512 f6decb141c5a9c40ead9e20dce2c1d9c030c1c03d69ec36ea41dc791b51c97153647d8d3680a0a87592da09e7a369bb9f2ec5c80796022d029fee6a1b9924e2c
diff --git a/dev-texlive/texlive-publishers/texlive-publishers-2017.ebuild b/dev-texlive/texlive-publishers/texlive-publishers-2017.ebuild
index d93d4648ae16..e31c2747609e 100644
--- a/dev-texlive/texlive-publishers/texlive-publishers-2017.ebuild
+++ b/dev-texlive/texlive-publishers/texlive-publishers-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Publisher styles, theses, etc."
 
 LICENSE=" Apache-2.0 BSD GPL-1 GPL-2 GPL-3 LPPL-1.2 LPPL-1.3 LPPL-1.3c OFL public-domain TeX-other-free "
 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 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-latex-2017
 !<dev-texlive/texlive-latexextra-2014
diff --git a/dev-texlive/texlive-xetex/Manifest b/dev-texlive/texlive-xetex/Manifest
index 24fb9c20c7ca..f49921d3b149 100644
--- a/dev-texlive/texlive-xetex/Manifest
+++ b/dev-texlive/texlive-xetex/Manifest
@@ -236,5 +236,5 @@ DIST texlive-module-xunicode-2015.tar.xz 25752 BLAKE2B cf329be8b01de223cec927cba
 DIST texlive-module-xunicode.doc-2015.tar.xz 588 BLAKE2B 6fd1bd78870423aac5f246596b46f120020199d00818701fa6a45e77d7dc3ebc547d352ee264c7b93b22b84586adb242f4e1aafbaf8a33259f8b2dda832069cf SHA512 25cb6d481074888a2a033950fce4779399b311b0fb0072abc41ad30e943e15b1321ebaaa2c34e0b90941ff3df1a2779aa1ef8c336ac93ddf1359bad674502baa
 EBUILD texlive-xetex-2015.ebuild 2137 BLAKE2B 718243970bedd524c327019733d9a32b15f9ef3163927113d783deb3721be873538c8fa6b0e092a6615ff3303784d3db56b7c8f8d95032b6fd5810403f2689a3 SHA512 1fa5f3642c6423469523e90670fed9fe21d45a8caf3abddf71219df821f7f956c89aa55370b899ea571bbe4dbf9aa8b7c6df38b58022da727350bb0946d502ff
 EBUILD texlive-xetex-2016.ebuild 2095 BLAKE2B 60f9f421b0a8e2eed9d21718422e93d0f97a50a6de7f5d9dfd128beb0eba742497ce87da878c16e651679d86b319fbf70135cd258b7c69b1cae0bf5c1a3de2b7 SHA512 1e14458de84ba0dfdc2d32594cb074981251b6915b7408cfe417d696c3d9e9af51de28c1135ae542fe0ec24710099da7198615c1da48e4cbe080c99a0bf01a67
-EBUILD texlive-xetex-2017.ebuild 2182 BLAKE2B 95cab1ad394b6e9b0d8bc9094fc8fc9dabc8c9a3557b87185d7421c3f45c4698bd462b15b3b5ed4aca4b902818b4d2a7048089e50526a6ab68f238f623694b5e SHA512 49c4967bb061c1c5ef13714784c72f6fbdd4b724525ddadc0ef584f29a87ff669fe7acc9fc4812050afe6e6f71fc3daddc602c4d95d45e3c21277387ff77d950
+EBUILD texlive-xetex-2017.ebuild 2181 BLAKE2B cfe6629cb02e858e1deeb4fe03637ce99b32b02c58b6a5038733bb91be69eda4df448cf9a0fe39c9c473012a522ef7dbf07850a987e5d6d6ea822418c428cd12 SHA512 2c76327f212d11e722321e1db79cd706351ae2cf1aacf3b750293166a9f258579fd00ca07c1172e36f851d7e50c08e0727597bc271ee546fc4f2f4f52c2b71d2
 MISC metadata.xml 504 BLAKE2B a78657320760b67ad93c4a3c8742b007639499446359800bc66c332b20dcdeec00835b9c17b576a45398efb5b15275427a74dfc1a474c513f8fb4eb0fc58d68a SHA512 c93e85dfe7e3cd8b815b3ceaa52f9fc91899eafa788904ccd10fea03bfbf40f5699e90f059899ed721a23f34b368885e38aa8e22e11f5950d3cae1bbe2626e96
diff --git a/dev-texlive/texlive-xetex/texlive-xetex-2017.ebuild b/dev-texlive/texlive-xetex/texlive-xetex-2017.ebuild
index a532e5cb26f3..073b85a463ac 100644
--- a/dev-texlive/texlive-xetex/texlive-xetex-2017.ebuild
+++ b/dev-texlive/texlive-xetex/texlive-xetex-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive XeTeX and packages"
 
 LICENSE=" Apache-2.0 GPL-1 GPL-2 LPPL-1.2 LPPL-1.3 LPPL-1.3c OFL public-domain TeX-other-free "
 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 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2017
 !=app-text/texlive-core-2007*
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 8df4feba8126..68f05f3f85e0 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/clion/Manifest b/dev-util/clion/Manifest
index 887d3c1fb0ba..e88fd4b91d30 100644
--- a/dev-util/clion/Manifest
+++ b/dev-util/clion/Manifest
@@ -1,7 +1,7 @@
 DIST clion-143.1186.tar.gz 220702330 BLAKE2B 05799e66aff500adbb66f553f6fc00c58d1ea5e352b0f3d2e50897fbaa48c0977438027ec6282133502c0ce29d2392c49b2c000eae35407d8c3947b7e2d5ebe7 SHA512 d4ea1bad5f3da3bab569380114011798c29e633009867c8020363c9af72326ebaa3232dff9c931a67dd0a0195bf4903647e250963c7aeebe9ad83340c988cbad
 DIST clion-2016.2.1.tar.gz 287103613 BLAKE2B a3b31d5a5de5a9640cc7298ee6431030ed3e5954455a34845ee525b0edd73a265d0ac38df50094564f68f9f7c17883571c61c2e5dadcdfe504f7320492d7380c SHA512 a4734c1b5d544cb7f6bd4752f5853d3c44e123e8ad8584b76098ef51a00261350d49bdd628d08c171f7c04b77862e8f28b5d8f16813c282542f83a16100c7415
-DIST clion-2017.3.3.tar.gz 331047955 BLAKE2B eb12a2c5a22fe6541127f187da55eb2841ba878a1d8d1ff1b7c3bebf7e1a7895b451f089507306ecc5fa50190448826be69056ff848e1a25440330f3cb048f7c SHA512 b3003b8e3edd623f8356fae290a3c567b6712cd4dee335e7e4b35aed02bdf16abc57e8b4944e654d854d34f3e18d643bb4a3e0caf9e0ddac178d1e9d4bdb55ce
+DIST clion-2017.3.4.tar.gz 331195446 BLAKE2B 5d868de5b1d97a80dd2d63977dfda8d3ab56840c95e4cdba5b8e55cf626dbd68e1015fd8dae664dbdf8161853a96a492ce43a78e0e6bd13138144d28e1146f78 SHA512 044e713e2ab3724b891b48a1d75936dce1580be0fded174101f768f6976f76f2557768128fd596cc8855c15f27dbd9a1e9d4299b947ad00ca458c537d81fd0b8
 EBUILD clion-1.2.4.143.1186.ebuild 1777 BLAKE2B 5343a168bac0f2e2b84c6eff58711debab6a6e0ee1f6f8f3eab9d60694a4090d33200a496c54c4de0c31a44dd66fb7ceede10f6018b8c4f11ca2c1f6cf4117f2 SHA512 60327f78d5189ca3bbfd892d3d5c760d563ca4026acd1fc38bcd0d21dfee2bea8a22b2bebf91c2529a8bd100e05b218d2409e2a19b1b50c411ba2f4d18d7ad72
 EBUILD clion-2016.2.1.ebuild 1775 BLAKE2B 301d7f82b5d8275d205553b51076eb6d06906e51e50f0b6a0cf21c9dec2be61954b63a87e007ffcd8c44fb5072bfb2afecef21c17c9feaa083cc88dfb65a3dda SHA512 8370b3ca5696952e2d25da79e0b9715ab901d5eedeb93753d343582108f33a76535fb7187c2f3d291b04578a201c0b912e667132a48bf3bdf32f4f586151d37e
-EBUILD clion-2017.3.3.ebuild 1691 BLAKE2B 8a328cc12143812aff6bf86448d8fa3b8967e9ca76c346315b7f73943dc47004ed33803004fa924a340faf3732d49cb7c82ae100ea14680ff9af66bd2474eda2 SHA512 06f8220b6fd19196d4e62c0620ab7f7d2ae533b7c34427eb202a458fef60703c96679fb629b6ed5935121fceaad9a8506346778a8ca9ef11e3cbf79959915c1c
+EBUILD clion-2017.3.4.ebuild 1675 BLAKE2B 7f783320aa718aa64c41d88665428cef1007d96e63a0862b871fc7efb73b6402fe4a934e841a42733588d166107872c84c39f3caebba41532b237a092bcb4690 SHA512 dcc1430ceb9e5e137e11601503ef47f962644b06ec9e2785916dc4dbe0fbd9c6d71e9d193ac6601b87a4f665eae031afc697dbcff313f1be6c5a624448abbe3c
 MISC metadata.xml 470 BLAKE2B 839c416b941a14b2025a68ad5bf7cb1ea2d1be8b5f7cff2cd87cb5eff6ef73d37a462b868ee56ec70d9270d9ed15fc01533fb3a217fd1273de9b839c6dc8af82 SHA512 9aa5a4724a19a45cbd03c4d71005265509546d8e3134dbf634ed19ae4d7d3d56f2cf17edd9d7e3d2882e57c2f07a1229f0b76af11f2c95a3cfd56dd0db3b6757
diff --git a/dev-util/clion/clion-2017.3.3.ebuild b/dev-util/clion/clion-2017.3.4.ebuild
index e648402ebdbb..376319ea602b 100644
--- a/dev-util/clion/clion-2017.3.3.ebuild
+++ b/dev-util/clion/clion-2017.3.4.ebuild
@@ -3,18 +3,16 @@
 
 EAPI=6
 
-inherit desktop
-inherit eutils
+inherit desktop eutils
 
-SLOT="0"
-
-SRC_URI="http://download.jetbrains.com/cpp/CLion-${PV}.tar.gz -> ${P}.tar.gz"
 DESCRIPTION="A complete toolset for C and C++ development"
 HOMEPAGE="http://www.jetbrains.com/clion"
+SRC_URI="http://download.jetbrains.com/cpp/CLion-${PV}.tar.gz -> ${P}.tar.gz"
 
-KEYWORDS="~amd64 ~x86"
 LICENSE="IDEA
 	|| ( IDEA_Academic IDEA_Classroom IDEA_OpenSource IDEA_Personal )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
 
 # RDEPENDS may cause false positives in repoman.
 # clion requires cmake and gdb at runtime to build and debug C/C++ projects
@@ -57,6 +55,6 @@ src_install() {
 	make_desktop_entry "${PN}" "clion" "${PN}" "Development;IDE;"
 
 	# recommended by: https://confluence.jetbrains.com/display/IDEADEV/Inotify+Watches+Limit
-	mkdir -p "${D}/etc/sysctl.d/" || die
-	echo "fs.inotify.max_user_watches = 524288" > "${D}/etc/sysctl.d/30-idea-inotify-watches.conf" || die
+	dodir /usr/lib/sysctl.d/
+	echo "fs.inotify.max_user_watches = 524288" > "${D}/usr/lib/sysctl.d/30-clion-inotify-watches.conf" || die
 }
diff --git a/dev-util/cmdtest/Manifest b/dev-util/cmdtest/Manifest
index 644e95fbb172..afae394a80db 100644
--- a/dev-util/cmdtest/Manifest
+++ b/dev-util/cmdtest/Manifest
@@ -5,5 +5,5 @@ DIST cmdtest_0.30.orig.tar.xz 38508 BLAKE2B 7a27ed4930decdfbc49e922af9724ddba2da
 EBUILD cmdtest-0.16.ebuild 565 BLAKE2B 995a4abe2db0272e6f806937b4990fb89843ed2fcf825140e6ce963bf4beb14223aee7b50cbbd9f68a7e80249ef11f2f5253f34b889e821f8c7804e3261809d3 SHA512 35a3ab987715ec0af7dc3665c766a9c1b4d35005d7799eadb7478c0125add44761a61b17f8e2d8b80cf79421c0b0a3b7ca6f886153934728a5e2809f291fabe3
 EBUILD cmdtest-0.18.ebuild 601 BLAKE2B 77c1b49917bf33964f7f2075ccd9e2b2f068a5d50d7d3744b388db2d69870605813486e6ac6858a19fce0c2bfedcda576af3a09b2b1386afb95e8e5dad4207e3 SHA512 432135a76f50e12791623ceab1e1866dfdce2b038f0a82bc6c884f85f2aa50ba6371c6ba0bd1a9e1ac5d155dd6467e012b566ec22c1512a5e19553a6bc39970b
 EBUILD cmdtest-0.27.ebuild 641 BLAKE2B 0719f9ee8398d9651210172815b72314c5ce0a4f4aca2b676c54144a182e12de4a1b33670584401e3080cea867f02a74f14989aa9578394f0cad5759cf3d7094 SHA512 47d71f682e2f37c913593a768097bc1c04ccbcb393057428e89de3ea7ce214160fc25b785b7689327d73ed8fedd4c0e6b3269b51cd2ec33463cea4aeb26091d3
-EBUILD cmdtest-0.30.ebuild 741 BLAKE2B 0d14f47ee33ec07e93411ac7a266e506235190462028a4fcf62de0bccb2fddca10b8d390fe6f17d4c73d16e6e1d575d8df02f2ee44bbb75db9e0a3ba82d311b6 SHA512 aea730fbfcf304fbb99685f19e185349c96e6b9c7c23211173f7c635120f3c24e6c598a5d18b3be97ae2fc501628850ac9db5d6fa884714650c98d0596e96aac
+EBUILD cmdtest-0.30.ebuild 740 BLAKE2B 7389472d1479c094627eb8b89e81f077dae31219a4a30ff1855245f2d46ebaadfb5651c51e61ee965323af9a9011a3c0e006ee5c647abde709873fe34991e83b SHA512 8d8b8c897dcb2fa38b67006016f4af46b0264f18758eec9be88b02f2d0f988d05878fbeda63639441e7c639f6f57411f35eb2e3204c7cc8628762b0ead322b2a
 MISC metadata.xml 250 BLAKE2B fef48a48388f26a915c53bca9aa9cab62fb73ec006736542afb4cbbe0c7b81d23afe2884f52433c7d390fc38ac32f957a6f6efe285ee1cafaed76407a964cf9b SHA512 924271cfb32ceafc4134e19b53fbeed96f2e9056addc3c2cbdec28890254abf5f0714979a3ab698ca046e41ef5c2cca2932350830bd8bd3a8e214d99123c12de
diff --git a/dev-util/cmdtest/cmdtest-0.30.ebuild b/dev-util/cmdtest/cmdtest-0.30.ebuild
index 4babd4548541..aaef1d8ec955 100644
--- a/dev-util/cmdtest/cmdtest-0.30.ebuild
+++ b/dev-util/cmdtest/cmdtest-0.30.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://code.liw.fi/debian/pool/main/c/${PN}/${PN}_${PV}.orig.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd"
 
 RDEPEND="
 	dev-python/cliapp[${PYTHON_USEDEP}]
diff --git a/dev-util/dialog/Manifest b/dev-util/dialog/Manifest
index 1eae570bb88c..9ac669450db2 100644
--- a/dev-util/dialog/Manifest
+++ b/dev-util/dialog/Manifest
@@ -2,6 +2,6 @@ DIST dialog-1.3-20160828.tgz 501960 BLAKE2B a9ec14a56dfa165345b5cc60e2f91b3da6c3
 DIST dialog-1.3-20170131.tgz 507783 BLAKE2B a98c436eabc8d06619bd64a8b1d647a0712630f0f89565253636ef2f38333ca6926177aa0c2001305b0c06fc7a1f576cda87da493183402ef9ec3cdc3fa8be23 SHA512 818b4e9d0d5ee55377b78ccceacf59a78e5e6d6fbc09e24a19e62b4988ff8de32f3364132b9ee88c86e126114eda45c82d86397d5f26fae81a6bda91be979786
 DIST dialog-1.3-20170509.tgz 509135 BLAKE2B 30f443953701f79db86a317d3c1a3a7743685388cf432a4d48e10f0df5181207e0a182f96566cd868d9ee5db8296f362e57f40a8e58c99d3b372eb967bc56ebe SHA512 dd3fe2041a15dd344ea39a1ba111d3b26daca1cda91a4e82f1223385a49cdf3de15f11129366a20c5a24b16b5301f215543850a390d70d0559f98247bbd49a56
 EBUILD dialog-1.3.20160828.ebuild 1278 BLAKE2B bd9847da9f7f35cdccc3639ffe919e1dd4265ba495f5a12fb1062b10cf2214309cd84fbc9b42208e4585d6cd2688628ff042c23b239513c64a3417408b03a943 SHA512 fe6672bf50566bab89d8a3c8938e647961fedc0f00ab1f33fe5d02b1973fbccea9c7bf258f96625f115dd4805aa3f8c6d26977547d49c32018b2e73881fe581a
-EBUILD dialog-1.3.20170131.ebuild 1283 BLAKE2B 98c8e145993e5faa0b1855eec45d7f1cc0b5f67c23186ac9d5d435641ece1e368080d6899368db324a1c8a2e71a14f19b5f815e7fe343bb622bc4a734195792d SHA512 66cc689d80812e5f87d480fbf1d376492090c9a85560612151facf102515d7aa3325e21cbe2ae25675613a5bc180294c7ef9c3e8674d12b61ec780b5d7db714f
+EBUILD dialog-1.3.20170131.ebuild 1282 BLAKE2B 5c4f7825d15cd72dfe9dd6c8d1f52da7260f54ed1ef0c54c08be884a8ce9fa094391436a47091a0fea52ce607268b1da51b167c905dd98698b8a7cc17c017ec9 SHA512 9ec24863c2597b4937a575b7e8d6ff6e1bdd1b54d8fd04b9382fa780a97765ab50dce65e469716052efd5800faf4d84c02397ff1e3cc81f1dde3f454a2bf41b4
 EBUILD dialog-1.3.20170509.ebuild 1290 BLAKE2B a9cc5c942135ea7ddede6b99f89a2b809b845a96bc6048d079e407a7cde93824a24795b9b3a0054cccdc541dee503322dea52d5fab87feacd7de55c206839263 SHA512 d0446c58fa792ad28393ee9946b866a7b45280e2aaa8d63add0f8c53a68229eaef793d9b65822edc1de13e354476c12a2bbbffa9aafe6c06adfb92648a520beb
 MISC metadata.xml 341 BLAKE2B 84cb58bb0ffe236825ae28f7f277c172eb8e8ec279aec915cdac1078342272a180aceb72400817be94b01568c24c4588d6423baa2be02c70a9971840a7e62650 SHA512 b194bfc5daa545724eaa7ec7dcc5618ec87249158d5e8fcb01a76375960b2d9dd012e596c0fc8e0d9c94eb39175a6b4424257cf0828cc73956c7a68ff4749da8
diff --git a/dev-util/dialog/dialog-1.3.20170131.ebuild b/dev-util/dialog/dialog-1.3.20170131.ebuild
index a3edce261da8..c73170b22412 100644
--- a/dev-util/dialog/dialog-1.3.20170131.ebuild
+++ b/dev-util/dialog/dialog-1.3.20170131.ebuild
@@ -12,7 +12,7 @@ SRC_URI="ftp://invisible-island.net/${PN}/${MY_P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0/14"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="examples minimal nls static-libs unicode"
 
 RDEPEND="
diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
index 38632de9b4b3..52bc8f033588 100644
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@@ -1,6 +1,6 @@
 DIST meson-0.44.1.tar.gz 1136337 BLAKE2B 7391776d2f480f43c6cf0bfae3665c16a61c4a28fc4310dc8659ab4165ef76ad1729a9daf645330ea213aeb59e5ba9d991d021d1ad620f6673cebfd64b085d93 SHA512 3c350d1752ae4463ec47060e051d79cc0855385e9552deff34fad8431175fb5d0f04b51a242f8f8f737726d06e504339d6b02a5aa9558ee673fb867dbb4e5b2d
-DIST meson-0.45.0.tar.gz 1161584 BLAKE2B 4344d2eaa9f6242c69fa94603b948a43bb32143791aa9ebcb1e8ec4504af76696bca5b6da903551b4511ab498c4b5a8df4d231c965b304396224c646323d18f9 SHA512 9bc08655e113dc09857a71fe17bb3101d7aea625b65ae73054b0119069af71028d3b46ceee9f3a4eba02f5d21dbfab533c7c113c416881f213fdf01d452037e3
+DIST meson-0.45.1.tar.gz 1163287 BLAKE2B 820ab763193322c75ebf3a79cd38f49f9fa06f9645f382961eddab9bb088263f5ecc603d3ba6db9e038db1ea150d6897dc202bad24ff985ab1ef2dea3f08b724 SHA512 704731aae28ba5fe4c2040464d42489cfc1946c95c39e28eef170ba5ab929b8672c782ed18798528b59aeb38abd23e4930f38e38f1e8c45f1ccf96071b097731
 EBUILD meson-0.44.1.ebuild 923 BLAKE2B bd78fd51af575678067d4fad1c4c240fb4582607ad1dd0eb9bc2c114ac61942956bc93b2b419bbf95edc0c6c7ba4326833aa01a39036a67bf0ff504e4b9054a5 SHA512 3b69e8a6d79476bc93185865c6795b239eb8c4b91d6aab48b8fe6dfb14288e7c53b59ec2418795270f1901debe0ebdcf1167e5817bffb37b62cb6f270df9a4a9
-EBUILD meson-0.45.0-r1.ebuild 929 BLAKE2B 522fba88c9e3d16680c76f6190b89b49b2261a250f762034965ed17fab29c1b3df1ead39e9bdc7114a496494f2dfba8ea2b7796eb9972cba95f1b53594a544d5 SHA512 d04a4d8fa0cbbb3aaa1a5cd485198d58734861eddf695dd37cb81c0541c3f4dabd955912f9bb27b9433a2e5d38f26523bd03548b3945f825dcdf7622d8c262b9
+EBUILD meson-0.45.1.ebuild 929 BLAKE2B 522fba88c9e3d16680c76f6190b89b49b2261a250f762034965ed17fab29c1b3df1ead39e9bdc7114a496494f2dfba8ea2b7796eb9972cba95f1b53594a544d5 SHA512 d04a4d8fa0cbbb3aaa1a5cd485198d58734861eddf695dd37cb81c0541c3f4dabd955912f9bb27b9433a2e5d38f26523bd03548b3945f825dcdf7622d8c262b9
 EBUILD meson-9999.ebuild 929 BLAKE2B 522fba88c9e3d16680c76f6190b89b49b2261a250f762034965ed17fab29c1b3df1ead39e9bdc7114a496494f2dfba8ea2b7796eb9972cba95f1b53594a544d5 SHA512 d04a4d8fa0cbbb3aaa1a5cd485198d58734861eddf695dd37cb81c0541c3f4dabd955912f9bb27b9433a2e5d38f26523bd03548b3945f825dcdf7622d8c262b9
 MISC metadata.xml 423 BLAKE2B 3dc99d370f7c1f4e9d9e47b3e472c1cb26ffedf4dacf20d84a27c4bddb9a47aa09849cdb4d1307f6980cf63511584f71dc3c1c9f20debb32134e004bd57130fe SHA512 417736194719d102e906ae6efcfa37930d4706a8a1e94b09a266e044ee806ef25ded2f935fed76a2d29f6443c0387b2ebd37f9d084887bce30a7079e2ff76467
diff --git a/dev-util/meson/meson-0.45.0-r1.ebuild b/dev-util/meson/meson-0.45.1.ebuild
index 37aab5a3b433..37aab5a3b433 100644
--- a/dev-util/meson/meson-0.45.0-r1.ebuild
+++ b/dev-util/meson/meson-0.45.1.ebuild
diff --git a/dev-util/mingw64-runtime/Manifest b/dev-util/mingw64-runtime/Manifest
index 756e9ee333a9..264bf2aef55d 100644
--- a/dev-util/mingw64-runtime/Manifest
+++ b/dev-util/mingw64-runtime/Manifest
@@ -22,6 +22,7 @@ EBUILD mingw64-runtime-5.0.1.ebuild 2524 BLAKE2B f9ab5353a35a61bc2f41720825ae532
 EBUILD mingw64-runtime-5.0.2-r1.ebuild 2615 BLAKE2B fda70d33c5c91481a162f88e431996582fb0da14b6a6c725aa1879780a9b993fa18bd522a9808f71cdf6b2eda5205b073a5e24ff2f605e74327318cc5ccc88ad SHA512 9c6520b42eaa6f06ab03da66284a6648b6d787323367ebd6b0be57c116a7644f131492779023fd1a8708fd8711347247e199a0aee9783fe51b6d11ef76e33528
 EBUILD mingw64-runtime-5.0.2-r2.ebuild 2655 BLAKE2B 1b9cf748d095cc8c7d7683a07462b8c9ea8116418bd549a93d4392f8bfd61b60d70a50bf4d8102f7b271c56b86768f879a745140b29b7b7a2057feae85e44ce7 SHA512 38e16934a793b9c1fe05a4f611682fffbb336e509d49ada6c9bfacb97d55144815177986b892e9650e3842a47699229efc154ff842f4db034bf91f3e21c86b2b
 EBUILD mingw64-runtime-5.0.2.ebuild 2524 BLAKE2B f9ab5353a35a61bc2f41720825ae5329e7b8fdc81e96c8ebfa5bad6ea99e8b09fbf10c51344c69ff17b3f1892ae6ea2cf92def90d458a0523e86581f5ba6af32 SHA512 91d08c3b756d0ec758a02f3180d1f2f7392b7416e843b2645325469f125fdf6eeca9cf4b236930c6ebcdc595c97734c5c19854763e4051e00a3e272a272d916f
-EBUILD mingw64-runtime-5.0.3-r1.ebuild 2533 BLAKE2B 9a175322ad3422c66dbd29794383bf8e33e8edc35cab995e83213890f80e0a1cf375ffbfb7cd7c3867c4464a660f076b07776625e43e43f865b9d4d50cd40077 SHA512 388ab79e22fc4eb939ef18931e3d34ba8249a04f194bbddd1927791400b7426d5223aad8c6fceebda7aada050eeff97fec361a4dca76906650f63a7700441b5f
+EBUILD mingw64-runtime-5.0.3-r1.ebuild 2572 BLAKE2B 9caca29d8aa7fdf54d3437a3801d7640bac7e4c9becd805b311a7247103d8772b8cfcef553db1175ed7b4973bd6667a5f7715b2179b1e66a0e44f90d366e9fae SHA512 c7b33d49e829790eaddd9739c5077a036a68ec0beae3e9d0a39687870028fc4a757878d6be89900ba56ac08cedfd5e7f90f4c1a26591902332de2b0a23dbde9f
+EBUILD mingw64-runtime-5.0.3-r2.ebuild 2683 BLAKE2B 92ccdb40cc2ebdc49bc903da98384f82a5fd7836f990b861662bdfb338478339702831b1e13c46301fd2329f2718e22357af0edc56dee238a75ff938207975bb SHA512 67946916dcc13cbae20ed39e8d90ad0905fd3179f3aed454e41dc48d417db33db61e374bbe00764ab373972cfd88a405a296950f5e13a4c4e34c73cb7d22f85c
 EBUILD mingw64-runtime-5.0.3.ebuild 2497 BLAKE2B ba30e069818937c620dc436e4a3c8d9e9bc0838620c80372f8e30153c2f3903dbfda3e0c6d157e9cccd94241bc3da47dec7ba3b92a39808b85771fc58dc2636d SHA512 8cf13af35caf3ceb2fc8bafdb6e3f980a0d63bc7795ef8bf12e2b6195bf1bb6e8fe0c0c0b5af45350c3e4a83a14ac4d7b98f1e4f9bf3c6807a29533f6eb1947e
 MISC metadata.xml 544 BLAKE2B 5d2a688f8f644b6893efd4f7a2e756d336c569a6a51fc4a0b0df94623ef7f3e8fa317fe6c971f233883b424e1abeaaf03ef92d56434cfea6eab5bdd3798ad6d5 SHA512 297a90e704de81f41a4f29871f96bed47aa00c703e79fd825b3a06ab8850fe67896c66dee2603f86cd6596a0c5cbd533c87cb94c1c674714f65767954341a3c8
diff --git a/dev-util/mingw64-runtime/mingw64-runtime-5.0.3-r1.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-5.0.3-r1.ebuild
index 0dcbcfe06eea..68655a1ed3a5 100644
--- a/dev-util/mingw64-runtime/mingw64-runtime-5.0.3-r1.ebuild
+++ b/dev-util/mingw64-runtime/mingw64-runtime-5.0.3-r1.ebuild
@@ -35,7 +35,10 @@ is_crosscompile() {
 	[[ ${CHOST} != ${CTARGET} ]]
 }
 just_headers() {
-	use headers-only && [[ ${CHOST} != ${CTARGET} ]]
+	is_crosscompile && use headers-only
+}
+alt_prefix() {
+	is_crosscompile && echo /usr/${CTARGET}
 }
 crt_with() {
 	just_headers && echo --without-$1 || echo --with-$1
@@ -74,9 +77,9 @@ src_configure() {
 	fi
 
 	CHOST=${CTARGET} econf \
-		--prefix="${EPREFIX}"/usr/${CTARGET} \
-		--includedir="${EPREFIX}"/usr/${CTARGET}/usr/include \
-		--libdir="${EPREFIX}"/usr/${CTARGET}/usr/lib \
+		--prefix="${EPREFIX}"$(alt_prefix) \
+		--includedir="${EPREFIX}"$(alt_prefix)/usr/include \
+		--libdir="${EPREFIX}"$(alt_prefix)/usr/lib \
 		--with-headers \
 		--enable-sdk \
 		$(crt_with crt) \
diff --git a/dev-util/mingw64-runtime/mingw64-runtime-5.0.3-r2.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-5.0.3-r2.ebuild
new file mode 100644
index 000000000000..e52536087f3e
--- /dev/null
+++ b/dev-util/mingw64-runtime/mingw64-runtime-5.0.3-r2.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+export CBUILD=${CBUILD:-${CHOST}}
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CTARGET} == ${CHOST} ]] ; then
+	if [[ ${CATEGORY} == cross-* ]] ; then
+		export CTARGET=${CATEGORY#cross-}
+	fi
+fi
+
+WANT_AUTOMAKE="1.15"
+
+inherit autotools flag-o-matic eutils
+
+DESCRIPTION="Free Win64 runtime and import library definitions"
+HOMEPAGE="http://mingw-w64.sourceforge.net/"
+SRC_URI="mirror://sourceforge/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v${PV}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="headers-only idl libraries tools"
+RESTRICT="strip"
+
+S="${WORKDIR}/mingw-w64-v${PV}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-build.patch"
+)
+
+is_crosscompile() {
+	[[ ${CHOST} != ${CTARGET} ]]
+}
+just_headers() {
+	use headers-only
+}
+alt_prefix() {
+	is_crosscompile && echo /usr/${CTARGET}
+}
+crt_with() {
+	just_headers && echo --without-$1 || echo --with-$1
+}
+crt_use_enable() {
+	just_headers && echo --without-$2 || use_enable "$@"
+}
+crt_use_with() {
+	just_headers && echo --without-$2 || use_with "$@"
+}
+
+pkg_setup() {
+	if [[ ${CBUILD} == ${CHOST} ]] && [[ ${CHOST} == ${CTARGET} ]] ; then
+		die "Invalid configuration"
+	fi
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	CHOST=${CTARGET} strip-unsupported-flags
+
+	if ! just_headers; then
+		mkdir "${WORKDIR}/headers"
+		pushd "${WORKDIR}/headers" > /dev/null
+		CHOST=${CTARGET} "${S}/configure" \
+			--prefix="${T}/tmproot" \
+			--with-headers \
+			--without-crt \
+			|| die
+		popd > /dev/null
+		append-cppflags "-I${T}/tmproot/include"
+	fi
+
+	# By default configure tries to set --sysroot=${prefix}. We disable
+	# this behaviour with --with-sysroot=no to use gcc's sysroot default.
+	# That way we can cross-build mingw64-runtime with cross-emerge.
+	CHOST=${CTARGET} econf \
+		--with-sysroot=no \
+		--prefix="${EPREFIX}"$(alt_prefix)/usr \
+		--with-headers \
+		--enable-sdk \
+		$(crt_with crt) \
+		$(crt_use_enable idl idl) \
+		$(crt_use_with libraries libraries) \
+		$(crt_use_with tools tools) \
+		$(
+			$(tc-getCPP ${CTARGET}) ${CPPFLAGS} -dM - < /dev/null | grep -q __MINGW64__ \
+				&& echo --disable-lib32 --enable-lib64 \
+				|| echo --enable-lib32 --disable-lib64
+		)
+}
+
+src_compile() {
+	if ! just_headers; then
+		emake -C "${WORKDIR}/headers" install
+	fi
+	default
+}
+
+src_install() {
+	default
+
+	if is_crosscompile ; then
+		# gcc is configured to look at specific hard-coded paths for mingw #419601
+		dosym usr /usr/${CTARGET}/mingw
+		dosym usr /usr/${CTARGET}/${CTARGET}
+		dosym usr/include /usr/${CTARGET}/sys-include
+	fi
+
+	env -uRESTRICT CHOST=${CTARGET} prepallstrip
+	rm -rf "${ED}/usr/share"
+}
diff --git a/dev-util/rosdep/Manifest b/dev-util/rosdep/Manifest
index b7e8ad14c69e..6d24d1d6d670 100644
--- a/dev-util/rosdep/Manifest
+++ b/dev-util/rosdep/Manifest
@@ -1,6 +1,6 @@
-DIST rosdep-0.11.8.tar.gz 112899 BLAKE2B 863cb6caaa1748477ec6216dbcdaf1c547135e2aaddb533373d20cc84bef51f640ce3544aaf99821c749b953effd594cc1909ca7e05d6fb3e277ae806747c5a8 SHA512 9fe44eb2dbcdfce0ac6df9b4f6926d26fa12d9fe4089976a460448dc6d4ecb893c0c7cb6b6e9f16bd07da0be4088d7d3eb594d2c0fad6f77d8728e2873cbc344
 DIST rosdep-0.12.1.tar.gz 117102 BLAKE2B 42b0f6e7b6b0c2a4219bce24ff74ec01efb61ac0799a89baa5dc7f6b698e8f69a1578f744179252e7123c87c9fb0368b43a9a293609b28f6bfbc32c87b5f4627 SHA512 031bdfb4877865cacfab63a4494807ecf157d8514e89c7ab15e38fcbd4664df1247874975d7b1af42a8a1fc24cb62a558bd6b43732946f3122ffa6448a7631da
-EBUILD rosdep-0.11.8.ebuild 1455 BLAKE2B 89878ff04c2eb0036974e95d0b25071c45c57c705c3e737a1df99748f43c14192e9ae274c70be0963780557882fa2bfa3fb0e5928dd8e004b97be70faf95b7fe SHA512 26863413617e4a0a251aec84c1e2fddf297333ac7e00eff1e95ea2d4f76526bc7db89540f4371b12e1e5b93a6435e1eedc5ffd05c534025aea2e29badaa3ea07
+DIST rosdep-0.12.2.tar.gz 118343 BLAKE2B 98163feef406707772a54bf6d1825900ac593113d635de92adcac0ae7ce201c2e312116104c76c13b9c1e3b1847ef4dcc0cfb4fd1edcb2795c6b323fa9cc7167 SHA512 0932a5ff9874bbdffa1160fe0a391d27eef9a2f2435d7a89fa3b5e4eab0fc08205d4417aaea1254ab7bfe679cfeb61a6f1b199f06d65154b30505e2a280c0b61
 EBUILD rosdep-0.12.1.ebuild 1493 BLAKE2B 14848d0cc919de003bdf86d87fcb942ca22aaa66b5c19eee08c288529682f152b0d25c542573261df6a18929dd54e7282df704c193e2f1bb8e9e3432d10ac418 SHA512 ec31c55b9e7c4de2b5eb7ebeec2b877fc10492324cbc46bb17961efde0fca52ad7be3f61559d845ea101afd9700fb01640b11b9ee30e32e07828b5bf4a1eab67
+EBUILD rosdep-0.12.2.ebuild 1493 BLAKE2B 14848d0cc919de003bdf86d87fcb942ca22aaa66b5c19eee08c288529682f152b0d25c542573261df6a18929dd54e7282df704c193e2f1bb8e9e3432d10ac418 SHA512 ec31c55b9e7c4de2b5eb7ebeec2b877fc10492324cbc46bb17961efde0fca52ad7be3f61559d845ea101afd9700fb01640b11b9ee30e32e07828b5bf4a1eab67
 EBUILD rosdep-9999.ebuild 1493 BLAKE2B 14848d0cc919de003bdf86d87fcb942ca22aaa66b5c19eee08c288529682f152b0d25c542573261df6a18929dd54e7282df704c193e2f1bb8e9e3432d10ac418 SHA512 ec31c55b9e7c4de2b5eb7ebeec2b877fc10492324cbc46bb17961efde0fca52ad7be3f61559d845ea101afd9700fb01640b11b9ee30e32e07828b5bf4a1eab67
 MISC metadata.xml 339 BLAKE2B 98c570641ca07f96e5fcfaece9d49977136f720d77c9cf6dcecbb06bc4016410e082201d69d3c36af5de03cc70ea5a1b726289124324e2f11266e5db69a6ea97 SHA512 62ab4dc2638e4af95290eba19e1755d3bade56e5d1e7251d3cc9da410fcf7ead48562193b2cb6b6f8800daf7df31786e70ce153780b9e278891c31d2b9c257bf
diff --git a/dev-util/rosdep/rosdep-0.11.8.ebuild b/dev-util/rosdep/rosdep-0.12.2.ebuild
index 463cc83cafbd..842ec4941e9e 100644
--- a/dev-util/rosdep/rosdep-0.11.8.ebuild
+++ b/dev-util/rosdep/rosdep-0.12.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -38,6 +38,7 @@ DEPEND="${RDEPEND}
 	test? (
 		dev-python/coverage[${PYTHON_USEDEP}]
 		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/flake8[${PYTHON_USEDEP}]
 	)
 "
 
diff --git a/dev-util/statifier/Manifest b/dev-util/statifier/Manifest
index da553fcaf404..eec7d8663ae2 100644
--- a/dev-util/statifier/Manifest
+++ b/dev-util/statifier/Manifest
@@ -1,3 +1,3 @@
 DIST statifier-1.7.4.tar.gz 73245 BLAKE2B 897b78b31aa4f148b6a6a986251ba9d4f40ebad3209f71896ffffb71e06ab25d337a4a79adc0217592051f917bc71428d3032f6216ec053f62c4632edef474d5 SHA512 22d4873130bafe06144c8f6ce7089aa25e3eb047bbee5709344fee1e8d85b24aac689c88d34537fe4a690e231d768e56a2fa13672b9eccf27d945b3f8bcda756
-EBUILD statifier-1.7.4.ebuild 917 BLAKE2B be4f41d9863a281f8743df62e5f5472fe6414dbee1e12a880b72dbe67ac1a41ffbab86fe7c5ccff3a7aea8032d14ad2677154a0867f77a09e5226c6b726f7229 SHA512 c5ce6da61b64a14d3a443ec46b21cd650c25c51c86860750c60723455c9b5e0553f8c702c21674df9b6b98e3ed16ebf67211002ecc81576520b2620bc88a0fef
+EBUILD statifier-1.7.4.ebuild 1131 BLAKE2B a278f994399923631a587542e2e8fda7f22f53210c9d2e4ab594aedaa3afede3effd0921d8b89128e36dd5b5796005c70e21b23314b5de4e9ac848a4b11cd10c SHA512 3359e99cc8ab99dfbf80b780dcb3f7acfc1843ae17b55815591bdd20b6669e736013ce3d4157e7e6878e74503c3dc286746717d4ecfeec4d1c632967e49f85cc
 MISC metadata.xml 369 BLAKE2B 99bc89ce5469bce6e867ce73fa66fee3fa41bf2166453c3606b03b1f3879f837c46d41068430e217a7ab4b0d0096650762095ffe5f13382ab055e5815f90ebb1 SHA512 5d49b66d13a6055421fc9e9a180d6d5657e367cfdc6e74a13c16955cc1bfda765605f0ab7c0d7d5f67ce847e09306fef52a2fb621eccdf358e5d21e82129a2b3
diff --git a/dev-util/statifier/statifier-1.7.4.ebuild b/dev-util/statifier/statifier-1.7.4.ebuild
index 2e2867cd1b96..a90f4825f90a 100644
--- a/dev-util/statifier/statifier-1.7.4.ebuild
+++ b/dev-util/statifier/statifier-1.7.4.ebuild
@@ -3,6 +3,10 @@
 
 EAPI="6"
 
+MULTILIB_COMPAT=( abi_x86_{32,64} )
+
+inherit multilib-build
+
 DESCRIPTION="Statifier is a tool for creating portable, self-containing Linux executables"
 HOMEPAGE="http://statifier.sourceforge.net"
 SRC_URI="https://sourceforge.net/projects/${PN}/files/${PN}/${PV}/${P}.tar.gz"
@@ -20,6 +24,11 @@ src_prepare() {
 	# Respect users CFLAGS and LDFLAGS
 	sed -i -e 's/-Wall -O2/$(CFLAGS) $(LDFLAGS)/g' src/Makefile || die
 
+	# Don't compile 32-bit on amd64 no-multilib profile
+	if ! use abi_x86_32; then
+		sed -i -e 's/ELF32 .*/ELF32 := no/g' configs/config.x86_64 || die
+	fi
+
 	# Apply user patches
 	eapply_user
 }
diff --git a/dev-util/xfce4-dev-tools/Manifest b/dev-util/xfce4-dev-tools/Manifest
index da55a86b08b9..1becaeeda521 100644
--- a/dev-util/xfce4-dev-tools/Manifest
+++ b/dev-util/xfce4-dev-tools/Manifest
@@ -1,4 +1,3 @@
 DIST xfce4-dev-tools-4.12.0.tar.bz2 309586 BLAKE2B 8ebcc8f133772eb39acba0b2f189a67751b9a2b4d36e5897003d56f6b88d3e97e89e0383b98c4b5ae684786d5aed3409a4b491fdbaa6e37bf8fc7447a33b8605 SHA512 60f90daaaac3eea355779ee1bb6a0cf24fb9e0ba70971c9c26ea681755de41560cfbca59a28241c2fd818031dc46e95c550424577451ceb7a42b1de0b0ff4a31
 EBUILD xfce4-dev-tools-4.12.0-r1.ebuild 625 BLAKE2B 4f1d21d96f00d66c831dcdd3da7227245c728b209a850af016d60b6464ea09ca705b14e51419d4104a19737cb4bbfed3bbbf491b2eb38f9cbd215042fc35bdb2 SHA512 8095e118fcfbfeffd6482cef19762cae62406bda526a5488ade91157592881519ca99adb4b3f3f832941ac021ce6e3d47bea02180d42c5ee8269870685bf1241
-EBUILD xfce4-dev-tools-4.12.0.ebuild 656 BLAKE2B 8ac6d5792b533095405de797a2965b03a3cea149f780e65e9db7b6238854f1c2bb36fad06b74bfa0c2a0994ce93ed1cc0f17e6f3ba0c6eaee1264879b43fe85b SHA512 7eedf87afd0397dc9632458762b3471ebbbfd2453d5d2903584f79f05912999631629ea1d221aed8883705e05eeb6beff4dfe99aa38e0c515a9f0944b1b93382
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.12.0.ebuild b/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.12.0.ebuild
deleted file mode 100644
index 1f2adf858832..000000000000
--- a/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.12.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit xfconf
-
-DESCRIPTION="A set of scripts and m4/autoconf macros that ease build system maintenance"
-HOMEPAGE="https://www.xfce.org/ http://users.xfce.org/~benny/projects/xfce4-dev-tools/"
-SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2.30"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-pkg_setup() {
-	DOCS=( AUTHORS ChangeLog HACKING NEWS README )
-}
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz
index ae4a792d164f..b66eece87215 100644
--- a/eclass/Manifest.gz
+++ b/eclass/Manifest.gz
diff --git a/eclass/java-ant-2.eclass b/eclass/java-ant-2.eclass
index db8404a3c24b..8da5971844a0 100644
--- a/eclass/java-ant-2.eclass
+++ b/eclass/java-ant-2.eclass
@@ -1,4 +1,4 @@
-# Copyright 2004-2017 Gentoo Foundation
+# Copyright 2004-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: java-ant-2.eclass
@@ -359,40 +359,6 @@ java-ant_rewrite-classpath() {
 	fi
 }
 
-# @FUNCTION: java-ant_remove-taskdefs
-# @USAGE: [--name NAME] [path/to/build.xml]
-# @DESCRIPTION:
-# Removes (named) taskdef elements from the build.xml file.
-# When --name NAME is specified, only remove taskdef with name NAME. Otherwise,
-# all taskdefs are removed.
-# The file to rewrite defaults to build.xml when not specified.
-java-ant_remove-taskdefs() {
-	debug-print-function ${FUNCNAME} $*
-
-	die "${FUNCNAME} has been banned, see bug #479838."
-
-	local task_name
-	if [[ "${1}" == --name ]]; then
-		task_name="${2}"
-		shift 2
-	fi
-	local file="${1:-build.xml}"
-	echo "Removing taskdefs from ${file}"
-	python <<EOF
-import sys
-from xml.dom.minidom import parse
-dom = parse("${file}")
-for elem in dom.getElementsByTagName('taskdef'):
-	if (len("${task_name}") == 0 or elem.getAttribute("name") == "${task_name}"):
-		elem.parentNode.removeChild(elem)
-		elem.unlink()
-f = open("${file}", "w")
-dom.writexml(f)
-f.close()
-EOF
-	[[ $? != 0 ]] && die "Removing taskdefs failed"
-}
-
 # @FUNCTION: java-ant_ignore-system-classes
 # @USAGE: [path/to/build.xml]
 # @DESCRIPTION:
diff --git a/games-action/Manifest.gz b/games-action/Manifest.gz
index 8c5d68041739..600f3f45b45f 100644
--- a/games-action/Manifest.gz
+++ b/games-action/Manifest.gz
diff --git a/games-action/trine-bin/Manifest b/games-action/trine-bin/Manifest
deleted file mode 100644
index 9e3b6e2c288c..000000000000
--- a/games-action/trine-bin/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST TrineUpdate4.64.run 647258173 BLAKE2B b520d1f312b9bd9ef94f32cd5fbe7ceaea0cb1bd839d8a898ac02cac0eb3464d83588f1163949ca2f53d7badb2eca456b8e1438d6f5e96e3c6baa10ca6cb865a SHA512 1255edc90cfd47c4f5a3cf7fa07cebac047f46f9b5f9f6621baff01d9c4295c95204a695127ce4947038c50c80253e7a004ec1c3accff6ac8697605fd25885f9
-EBUILD trine-bin-1.08-r2.ebuild 1600 BLAKE2B ca1e3ddfeaf2d584a158ba319c0808046cf679a50b30a9332a567befca5766136ce4d82c5a9f25f45eaa42ea2d1953da221ca2f90f15f85f30e34e67f4528d4e SHA512 aae2c12a3f387d7f7f918f46e246e9756abe75ec4e98c24ef120f57104edf79c110c04bb79a80fb6a486891d7a66d40ad4ed770c8b3dd367ef46ce82586ef081
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-action/trine-bin/metadata.xml b/games-action/trine-bin/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-action/trine-bin/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?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>
-</pkgmetadata>
diff --git a/games-action/trine-bin/trine-bin-1.08-r2.ebuild b/games-action/trine-bin/trine-bin-1.08-r2.ebuild
deleted file mode 100644
index 99503c9efac8..000000000000
--- a/games-action/trine-bin/trine-bin-1.08-r2.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit desktop eutils unpacker
-
-DESCRIPTION="A physics-based action game with character-dependent solutions to challenges"
-HOMEPAGE="http://trine-thegame.com/"
-SRC_URI="TrineUpdate4.64.run"
-
-LICENSE="frozenbyte-eula"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-RESTRICT="fetch strip"
-
-DEPEND="
-	app-admin/chrpath
-	app-arch/unzip
-"
-
-RDEPEND="
-	dev-libs/glib:2
-	dev-libs/libx86
-	gnome-base/libglade:2.0
-	media-libs/libogg
-	media-libs/libpng:1.2
-	>=media-libs/libsdl-1.2[opengl,sound,video]
-	>=media-libs/libvorbis-1.3
-	>=media-libs/openal-1.15
-	>=media-libs/tiff-3.9:3
-	>=sys-devel/gcc-4.3.0
-	>=sys-libs/glibc-2.4
-	virtual/jpeg:62
-	x11-libs/gtk+:2
-"
-
-S="${WORKDIR}"
-d="/opt/${PN}"
-QA_PREBUILT="*"
-
-pkg_nofetch() {
-	einfo "Fetch ${SRC_URI} and put it into ${DISTDIR}"
-	einfo "See http://www.humblebundle.com/ for more info."
-}
-
-src_unpack() {
-	unpack_zip ${A}
-}
-
-src_prepare() {
-	default
-	rm -v lib*/lib{gcc_s,jpeg,m,ogg,openal,png*,rt,SDL*,selinux,stdc++,tiff,vorbis*}.* || die
-	chrpath --replace "${EPREFIX}${d}"/lib trine-{bin,launcher}$(usex x86 32 64) || die
-}
-
-src_install() {
-	local b bb
-	local sfx=$(usex x86 32 64)
-
-	doicon Trine.xpm
-	for b in bin launcher ; do
-		bb="trine-${b}"
-		exeinto ${d}
-		newexe ${bb}${sfx} ${bb}
-		make_wrapper ${bb} "./${bb}" "${d}"
-		make_desktop_entry ${bb} "Trine ${b}" Trine
-	done
-
-	exeinto ${d}/lib
-	doexe lib${sfx}/*
-
-	insinto ${d}
-	doins -r binds config data dev profiles *.fbz *.glade trine-logo.png
-
-	dodoc Trine_Manual_linux.pdf Trine_updates.txt
-}
diff --git a/games-action/trine-enchanted-edition/Manifest b/games-action/trine-enchanted-edition/Manifest
new file mode 100644
index 000000000000..7bed2544ddbc
--- /dev/null
+++ b/games-action/trine-enchanted-edition/Manifest
@@ -0,0 +1,3 @@
+DIST trine_enchanted_edition_v2_12_build_508_humble_linux_full.zip 1226749814 BLAKE2B 9803f78279bcf83a2a54f25e2498664b73ba1c0ae5c540bb4479345ae05495cc11527937876fb7c9dbb34d05dbbdb4575cc6c1899923c782ff67ea23bd2cfac9 SHA512 e883763efe89f09a84c2896bfd0a9a13319dd14bb840e67f1812a0bab45bcab7a144f4c9399194e5aabad0435e350c6a903a542c9101a37c602855ebd0884d9d
+EBUILD trine-enchanted-edition-2.12.508.ebuild 2281 BLAKE2B 414c0a17d01db6edc9fbb41e80a9e604e73aedec3df46f82f4833034d61ff820a9c49c6ef30fcb88df21b3cdf8f9a7f5828a00a12e271aa659ec8e39d45577a8 SHA512 feb074255ad518616b4dd116e05b3e2cbddbc5cc5e49962cf4011e7bb8226b304557b1bac993316c696b073f02119cea7ed5078eb8aa38d3ce858a009d46317d
+MISC metadata.xml 321 BLAKE2B 5aca052a154cd0d9a43b96774253a2999ad36aa01c956961ad0021fa7cc6cbc8b89b7f93c6318308f6310a877ac9cb2b70bf622f25b882cf0c13261a7fae9b9c SHA512 ab5d27c4f1f5760f902abe8829db8732a19206739001dd349ac170bc64e5edb9b10ec4d16ec3d8f52569a05bc90ac08af6724f11206fce2b3506d99555712747
diff --git a/games-action/trine-enchanted-edition/metadata.xml b/games-action/trine-enchanted-edition/metadata.xml
new file mode 100644
index 000000000000..b26a6baa4124
--- /dev/null
+++ b/games-action/trine-enchanted-edition/metadata.xml
@@ -0,0 +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="launcher">Install GTK+ launcher</flag>
+	</use>
+</pkgmetadata>
diff --git a/games-action/trine-enchanted-edition/trine-enchanted-edition-2.12.508.ebuild b/games-action/trine-enchanted-edition/trine-enchanted-edition-2.12.508.ebuild
new file mode 100644
index 000000000000..87871dfbf505
--- /dev/null
+++ b/games-action/trine-enchanted-edition/trine-enchanted-edition-2.12.508.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit desktop eutils gnome2-utils
+
+MY_P="${PV//./_}"
+MY_P="${PN//-/_}_v${MY_P%_*}_build_${MY_P##*_}"
+MY_PN="Trine Enchanted Edition"
+
+DESCRIPTION="The original sidescrolling action platformer under the Trine 2 engine"
+HOMEPAGE="https://www.frozenbyte.com/games/trine-enchanted-edition"
+SRC_URI="${MY_P}_humble_linux_full.zip"
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="+launcher"
+RESTRICT="bindist fetch splitdebug"
+
+QA_PREBUILT="opt/${PN}/${PN}*"
+
+DEPEND="app-arch/unzip"
+
+# SDL 1.3 is bundled but the game appears to be statically linked
+# against SDL 2.0.3. This is unfortunate as there are bugs. For example,
+# it doesn't respect the DISPLAY variable under Zaphod mode.
+
+RDEPEND="
+	media-gfx/nvidia-cg-toolkit[abi_x86_32]
+	media-libs/alsa-lib[abi_x86_32]
+	media-libs/freetype:2[abi_x86_32]
+	media-libs/libogg[abi_x86_32]
+	>=media-libs/libvorbis-1.3[abi_x86_32]
+	>=media-libs/openal-1.15[abi_x86_32]
+	sys-libs/zlib[abi_x86_32]
+	virtual/glu[abi_x86_32]
+	virtual/opengl[abi_x86_32]
+	launcher? (
+		dev-libs/glib:2[abi_x86_32]
+		media-libs/libpng:1.2[abi_x86_32]
+		x11-libs/gdk-pixbuf:2[abi_x86_32,X]
+		x11-libs/gtk+:2[abi_x86_32]
+		x11-libs/libX11[abi_x86_32]
+		x11-libs/pango[abi_x86_32,X]
+	)"
+
+S="${WORKDIR}/linux/_enchanted_edition_"
+
+pkg_nofetch() {
+	einfo "Please buy and download ${SRC_URI} from:"
+	einfo "  https://www.humblebundle.com/store/${PN}"
+	einfo "and move it to your distfiles directory."
+}
+
+src_install() {
+	local dir=/opt/${PN}
+
+	insinto "${dir}"
+	doins -r *.fbq data
+
+	exeinto "${dir}"
+	newexe bin/trine1_linux_32bit ${PN}
+
+	make_wrapper ${PN} ./${PN} "${dir}"
+	make_desktop_entry ${PN} "${MY_PN}"
+
+	if use launcher ; then
+		exeinto "${dir}"
+		newexe bin/trine1_linux_launcher_32bit ${PN}-launcher
+
+		make_wrapper ${PN}-launcher ./${PN}-launcher "${dir}"
+		make_desktop_entry ${PN}-launcher "${MY_PN} (launcher)"
+
+		# Launcher binary has hardcoded the game path.
+		dosym ../${PN} "${dir}"/bin/trine1_bin_starter.sh
+	fi
+
+	newicon -s 64 trine1.png ${PN}.png
+	dodoc readme_changelog.txt
+}
+
+pkg_preinst() { gnome2_icon_savelist; }
+pkg_postinst() { gnome2_icon_cache_update; }
+pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/games-action/trine/Manifest b/games-action/trine/Manifest
new file mode 100644
index 000000000000..7db21e5d4541
--- /dev/null
+++ b/games-action/trine/Manifest
@@ -0,0 +1,3 @@
+DIST TrineUpdate4.64.run 647258173 BLAKE2B b520d1f312b9bd9ef94f32cd5fbe7ceaea0cb1bd839d8a898ac02cac0eb3464d83588f1163949ca2f53d7badb2eca456b8e1438d6f5e96e3c6baa10ca6cb865a SHA512 1255edc90cfd47c4f5a3cf7fa07cebac047f46f9b5f9f6621baff01d9c4295c95204a695127ce4947038c50c80253e7a004ec1c3accff6ac8697605fd25885f9
+EBUILD trine-1.08-r3.ebuild 2401 BLAKE2B c81708cf345a2a67e7ef0e0edc570bcb95946145dc78408aa2d03d5f365efc269df9c8a69c40d97037853f6efa860ba9a6bf0cd2cffe2adb65a592cf6459e715 SHA512 cebbd8d3a103cf6fa5e363b2f504a45b20f2dd3dbf071071fd3b003a45aba2f2f955f16e32d679a8406504eb46f37fbcd85cf06c99bad9d9a2de0eda82f89525
+MISC metadata.xml 321 BLAKE2B 5aca052a154cd0d9a43b96774253a2999ad36aa01c956961ad0021fa7cc6cbc8b89b7f93c6318308f6310a877ac9cb2b70bf622f25b882cf0c13261a7fae9b9c SHA512 ab5d27c4f1f5760f902abe8829db8732a19206739001dd349ac170bc64e5edb9b10ec4d16ec3d8f52569a05bc90ac08af6724f11206fce2b3506d99555712747
diff --git a/games-action/trine/metadata.xml b/games-action/trine/metadata.xml
new file mode 100644
index 000000000000..b26a6baa4124
--- /dev/null
+++ b/games-action/trine/metadata.xml
@@ -0,0 +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="launcher">Install GTK+ launcher</flag>
+	</use>
+</pkgmetadata>
diff --git a/games-action/trine/trine-1.08-r3.ebuild b/games-action/trine/trine-1.08-r3.ebuild
new file mode 100644
index 000000000000..f9b9673cdd45
--- /dev/null
+++ b/games-action/trine/trine-1.08-r3.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit desktop eutils gnome2-utils unpacker
+
+DESCRIPTION="A physics-based action game with character-dependent solutions to challenges"
+HOMEPAGE="https://www.frozenbyte.com/games/trine-enchanted-edition"
+SRC_URI="TrineUpdate4.64.run"
+LICENSE="frozenbyte-eula"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="+launcher"
+RESTRICT="bindist fetch strip"
+
+QA_PREBUILT="opt/${PN}/${PN}*
+	opt/${PN}/lib/*"
+
+DEPEND="
+	app-admin/chrpath
+	app-arch/unzip
+"
+
+RDEPEND="
+	media-gfx/nvidia-cg-toolkit
+	>=media-libs/libsdl-1.2[opengl,video]
+	>=media-libs/sdl-image-1.2
+	>=media-libs/sdl-ttf-2.0
+	>=media-libs/libvorbis-1.3
+	>=media-libs/openal-1.15
+	>=sys-devel/gcc-4.3.0
+	>=sys-libs/glibc-2.4
+	sys-libs/zlib
+	x11-libs/gtk+:2
+	launcher? (
+		dev-libs/glib:2
+		gnome-base/libglade:2.0
+	)"
+
+S="${WORKDIR}"
+dir="/opt/${PN}"
+
+pkg_nofetch() {
+	einfo "Fetch ${SRC_URI} and put it into your distfiles directory."
+	einfo "It is no longer available to purchase but you can still download it"
+	einfo "from https://www.humblebundle.com if you bought it previously."
+	einfo "Otherwise install ${CATEGORY}/trine-enchanted-edition instead."
+}
+
+src_unpack() {
+	unpack_zip ${A}
+}
+
+src_prepare() {
+	default
+	use launcher || rm -v lib*/lib{boost*,icu*}.* || die
+	rm -v lib*/lib{Cg*,direct*,fusion*,gcc_s,jpeg,m,ogg,openal,png*,rt,SDL*,selinux,stdc++,tiff,vga,vorbis*}.* || die
+	chrpath --replace "${EPREFIX}${dir}"/lib trine-{bin,launcher}$(usex x86 32 64) || die
+}
+
+src_install() {
+	local sfx=$(usex x86 32 64)
+
+	insinto "${dir}"
+	doins -r binds config data dev profiles *.fbz *.glade trine-logo.png
+
+	exeinto "${dir}/lib"
+	doexe lib${sfx}/*
+
+	exeinto "${dir}"
+	newexe trine-bin${sfx} ${PN}
+
+	make_wrapper ${PN} ./${PN} "${dir}"
+	make_desktop_entry ${PN} "Trine"
+
+	# Compatibility with trine-bin.
+	dosym ${PN} /usr/bin/${PN}-bin
+
+	if use launcher ; then
+		exeinto "${dir}"
+		newexe trine-launcher${sfx} ${PN}-launcher
+
+		dosym {"../..${dir}",/usr/bin}/${PN}-launcher
+		make_desktop_entry ${PN}-launcher "Trine (launcher)"
+
+		# Launcher binary has hardcoded the game path.
+		dosym ${PN} "${dir}"/${PN}-bin
+	fi
+
+	newicon -s 512 Trine.xpm ${PN}.xpm
+	dodoc Trine_Manual_linux.pdf Trine_updates.txt
+}
+
+pkg_preinst() { gnome2_icon_savelist; }
+pkg_postinst() { gnome2_icon_cache_update; }
+pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/gnome-base/Manifest.gz b/gnome-base/Manifest.gz
index de8293b219af..ac22baae3a75 100644
--- a/gnome-base/Manifest.gz
+++ b/gnome-base/Manifest.gz
diff --git a/gnome-base/gnome-menus/Manifest b/gnome-base/gnome-menus/Manifest
index 07525ad20a29..5be24b7c10cb 100644
--- a/gnome-base/gnome-menus/Manifest
+++ b/gnome-base/gnome-menus/Manifest
@@ -1,10 +1,6 @@
 AUX gnome-menus-3.13.3-multiple-desktop.patch 5094 BLAKE2B 8f70982804f8c8778e0e0eb60496c87b9634b817ca538793ba14c56a66934e540a315ba82a54fb0412bfc95234c5e3485f1a6210eac2125f4b77d9a9cacd6113 SHA512 6d7b3cb6d3e445355ea4c77a2930ef93792d5ce1ec44e449576700cea00f1f9e0fd2f1445a7d41675ed5a976501b458a8e650fd0c8e1adb0c1b364832d6f0972
 AUX gnome-menus-3.13.3-multiple-desktop2.patch 781 BLAKE2B 2da46999a7943a61b0032c77e863b201f9a46598dc5da385b5529afa62d3f826373d315132cd1580ef1e63f264e7cc61ca51757ae2bd509e409b4408f3e9cae9 SHA512 e48c3a35fae90e35bffc1a36713d3b5122de7edb5369a4e34b04c49030a0c33937ad24099814e3003c887d5a0369b9cc927445f965ec2a2cfa9ac55858404f4d
 AUX gnome-menus-3.8.0-ignore_kde_standalone.patch 1665 BLAKE2B 97e21c328c44620d7cacfd302907d846d0d58c86c4e2709231f94318bde97825f59f85616c47d475ec5c1fec969a8d46301532deeb03ab910df2f9cec5692a5e SHA512 db461006883594de834fff029b3aa769afa6955bc94062865d8c71ec224fdd64867693763c3ecb98921c98c7410bacf18dc2110b5322e1956c877e7fcf61bef0
-DIST gnome-menus-3.10.1-patches.tar.xz 5708 BLAKE2B 0f6549744aa157f362ed6743b600e73d9897ca6c88c8f1d0bfcc2d7c96889e69624cc1f80b44c46bba6425f98379dd85e737885f079b6f15be47047922fd6da6 SHA512 bfdca2ba70525b71059262d4d19a2567c3d74c7f255ff823e5c24e631b764ab05be954ec16630729220a22f2425f8d2a8ecb1b22641346f53d5af9d9f90feebc
-DIST gnome-menus-3.10.1.tar.xz 423052 BLAKE2B 5ab0144d1a44db598746822accc11f528520ff4eb453f667352d1ce590f10c9a7956dc0e552b98e680fbe9809c5c32b4faf91c03230088675cffad965cd7abb4 SHA512 e6f0fe223e60f6c33a2ed2cd958035e5560d4063fbe7485263c4ad0eba82e18948d19f7dbe84dd0db5c339e94366759a0f98da533e2798c3ed9cc9a87f73c7e0
 DIST gnome-menus-3.13.3.tar.xz 404664 BLAKE2B 7772c817317b4af86e740aeea3095f51ff210f73e53160ca2359d45a017236c82fe787956c04a9e0001e2511671438d4955f0bf7947cdfa8649d78fe931d6d79 SHA512 d631eb17ddc1b33227d0e5862a9344a8605ee1e9ebc1f12ce4ac98895adaf8a82ef2a49415d99bc194a02f30f30c3d6d49759f280fbc246c9e482711fd5021d2
-EBUILD gnome-menus-3.10.1-r1.ebuild 1509 BLAKE2B dde1d6b30f561476eec5edc3a24565bf4053c11cd76e28a5d5d21e1af281a9b4833ef73f06af33b3e8be006d22a0ad271f01518267b93923f0510cb52ffb3a8c SHA512 9816e9b145242f1b4d97845505303bad5c00b83549112e3bdb94eebf166ac9ed7ac44d5a6900f1df32ae8965c18a937a6408c53c69c44b200646e3c8874c0cfd
 EBUILD gnome-menus-3.13.3-r1.ebuild 1382 BLAKE2B 8bb7a4381e0975e4c6030708920a8d2a3a192ee52dd0da131cf3c4b8c9aa89eeb5f150a5af2b417955643f2ed2aed1b63b6ffe9fe082b3ac0e0f53578dbeb3ef SHA512 13517cd1fc4b57e6f63d114a273639cfafa3faeb16aaa977a3a9213a12e39fc8cc6a50f8b40b1f7e4f36265d586ac0a7fa76d285d382514ba64a81a42c11fe54
-EBUILD gnome-menus-3.13.3.ebuild 1238 BLAKE2B cdefe22f1491469f3c9415eecc9d81eeddad6127d90ae47dc626fda41373cfe7c06c88b335785256119e052aa8aff83e80baf44a411735aaed5b8e78ea158527 SHA512 d961500f12aa96ae6d0bef93b116d43070fb8a2db5491986c7128b6c0a56c914cbb698d941de194c2060a9bdff28a951196ec4589723e8c4e72b7126e437d3c3
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-base/gnome-menus/gnome-menus-3.10.1-r1.ebuild b/gnome-base/gnome-menus/gnome-menus-3.10.1-r1.ebuild
deleted file mode 100644
index 57afc35dc8dc..000000000000
--- a/gnome-base/gnome-menus/gnome-menus-3.10.1-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCONF_DEBUG="no"
-
-inherit eutils gnome2
-
-DESCRIPTION="Library for the Desktop Menu fd.o specification"
-HOMEPAGE="https://git.gnome.org/browse/gnome-menus"
-SRC_URI="${SRC_URI}
-	https://dev.gentoo.org/~tetromino/distfiles/${PN}/${PN}-3.10.1-patches.tar.xz"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="3"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-
-IUSE="debug +introspection test"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.29.15:2
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
-"
-# Older versions of slot 0 install the menu editor and the desktop directories
-
-RDEPEND="${COMMON_DEPEND}
-	!<gnome-base/gnome-menus-3.0.1-r1:0
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.40
-	sys-devel/gettext
-	virtual/pkgconfig
-	test? ( dev-libs/gjs )
-"
-
-src_prepare() {
-	# Don't show KDE standalone settings desktop files in GNOME others menu
-	epatch "${FILESDIR}/${PN}-3.8.0-ignore_kde_standalone.patch"
-
-	# Fixes for crashes and memory leaks from upstream git master
-	epatch ../"${PN}-3.10.1-patches"/*.patch
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	DOCS="AUTHORS ChangeLog HACKING NEWS README"
-
-	# Do NOT compile with --disable-debug/--enable-debug=no
-	# It disables api usage checks
-	gnome2_src_configure \
-		$(usex debug --enable-debug=yes --enable-debug=minimum) \
-		$(use_enable introspection) \
-		--disable-static
-}
diff --git a/gnome-base/gnome-menus/gnome-menus-3.13.3.ebuild b/gnome-base/gnome-menus/gnome-menus-3.13.3.ebuild
deleted file mode 100644
index 21dd0cd86385..000000000000
--- a/gnome-base/gnome-menus/gnome-menus-3.13.3.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCONF_DEBUG="yes"
-
-inherit eutils gnome2
-
-DESCRIPTION="Library for the Desktop Menu fd.o specification"
-HOMEPAGE="https://git.gnome.org/browse/gnome-menus"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="3"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-
-IUSE="+introspection test"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.29.15:2
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
-"
-# Older versions of slot 0 install the menu editor and the desktop directories
-RDEPEND="${COMMON_DEPEND}
-	!<gnome-base/gnome-menus-3.0.1-r1:0
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.40
-	sys-devel/gettext
-	virtual/pkgconfig
-	test? ( dev-libs/gjs )
-"
-
-src_prepare() {
-	# Don't show KDE standalone settings desktop files in GNOME others menu
-	epatch "${FILESDIR}/${PN}-3.8.0-ignore_kde_standalone.patch"
-	gnome2_src_prepare
-}
-
-src_configure() {
-	DOCS="AUTHORS ChangeLog HACKING NEWS README"
-
-	# Do NOT compile with --disable-debug/--enable-debug=no
-	# It disables api usage checks
-	gnome2_src_configure \
-		$(use_enable introspection) \
-		--disable-static
-}
diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz
index a778c18686f0..ef4b8d128eff 100644
--- a/gnome-extra/Manifest.gz
+++ b/gnome-extra/Manifest.gz
diff --git a/gnome-extra/gucharmap/Manifest b/gnome-extra/gucharmap/Manifest
index 16620bbc5d28..1b2d97a3d78b 100644
--- a/gnome-extra/gucharmap/Manifest
+++ b/gnome-extra/gucharmap/Manifest
@@ -5,7 +5,7 @@ DIST gucharmap-3.0.1.tar.bz2 3275481 BLAKE2B 80dde7791abdc72677add9c65c59f810e6c
 DIST gucharmap-9.0.2.tar.xz 1023120 BLAKE2B f0ea1b2e866abea180c062ea2559f6f26b80d38c66aac838ee2e6371ea4a09a14842a51e2e4e7d9ffb0e0bf052a7c6f21e92843c8f36eb6edc52a73063bef0f3 SHA512 33fa2989e263ba30bc430b8181009dd5d491dd2b453f6047369dc49dafb4f58be67dd9f1320b7005325236519a794eb4564fbd39a1d976133001f4f983ae1370
 DIST gucharmap-9.0.4.tar.xz 1029684 BLAKE2B f2af9c422abceb98783b6ea6a29241383cc6220410cd45a4c1fc04ce57fc51bc629fc4560d5ad852b19f1b85fc0276e68b423b2f6579e8f973794b2528b9cb7c SHA512 2d2ce94796cb40bcaf14930624ddd788af1c49d464be1fc5d4ab8112df14054ce1324c86eaf028921266494f9fbb41d29a7b40db810fb15280d470fd26be6df2
 EBUILD gucharmap-10.0.0.ebuild 1664 BLAKE2B 81d087632398b74ad6fb3eba9cfc1e8b663b054db3cfdf9611d2ceb34215e1ba80af4686def075b93b8e1b1d1255d57e586474475e83cd37778e05654b8140bb SHA512 0352bcd7dcbac69699c57c45080875821a4dfe07e6dcc8ae6ef24aa82042756c5409fd7e342d8e6244ca818a2abec8f2d80e7dffa1fbe24e4f24aac67180f417
-EBUILD gucharmap-10.0.3.ebuild 1663 BLAKE2B e1555b36e2070ddb0f31429f3d9558e09c63ccf85090123c9792dda87c6bdf27db186d99c132f6333a29d43b1e3e74cead14592c8d60bb127047bbd54abf0442 SHA512 7fde9e194a64c8678fe7d751c9b3b87cc8d60dddb717f1ca0a9821879362e028879a6db26210cb658e6563e839fc56436f04044cc287f18081169cfb29f1363c
+EBUILD gucharmap-10.0.3.ebuild 1662 BLAKE2B c4b9dbce55667c3728d5af1b2d1a7913426e1adcb9c286136c2ea0522ffad0edeb44822c2ca3c65caa69c5378e7ed822fb228f5b6e43a638ae42b367725b8ce6 SHA512 de5497e9392c012a7a6a498adad8b99a5b0e831ad9eff4afd848974ad164014753246f6cd107ca4594dfed7565e835d370ed37dfa2abd5732dd67916e8d3ad42
 EBUILD gucharmap-3.0.1-r200.ebuild 1470 BLAKE2B 9f817d96745a0fbf907aec0b13d6be14a99c815af50846ae6ccbd4a84d826d7ff8635ff893a69a9e0be4f9d199977264eb34cf60c8f75b817f4f2d3df73fc6ad SHA512 254fec449e286c8df0f273f5cde96d1571baebc0384a8e5ac69e17808ce14f7a49fdabd44b0d5f584c7935a33c7eb395c34db2df315d4ba9ae155471499bda65
 EBUILD gucharmap-9.0.2.ebuild 1649 BLAKE2B 46f9ec6ad8452f2e850cc21a6bee29275e0c27c7ede9535a563a292a72ced0791492c003e81c8019b11513b6c8a52dc38705599c7c136398cebd38f05d66bf10 SHA512 493545976a8d527349a4318b7aa18e84da54c1e7c49fecdd28640e1c9555ce0877051bf1a3c108c9806c6f6837fdd452d548f80cb33b82a02380aebf58e410fe
 EBUILD gucharmap-9.0.4.ebuild 1649 BLAKE2B 46f9ec6ad8452f2e850cc21a6bee29275e0c27c7ede9535a563a292a72ced0791492c003e81c8019b11513b6c8a52dc38705599c7c136398cebd38f05d66bf10 SHA512 493545976a8d527349a4318b7aa18e84da54c1e7c49fecdd28640e1c9555ce0877051bf1a3c108c9806c6f6837fdd452d548f80cb33b82a02380aebf58e410fe
diff --git a/gnome-extra/gucharmap/gucharmap-10.0.3.ebuild b/gnome-extra/gucharmap/gucharmap-10.0.3.ebuild
index d32b1d7dffaa..f0152f40573b 100644
--- a/gnome-extra/gucharmap/gucharmap-10.0.3.ebuild
+++ b/gnome-extra/gucharmap/gucharmap-10.0.3.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Gucharmap"
 
 LICENSE="GPL-3"
 SLOT="2.90"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ia64 ~ppc ~ppc64 ~sh sparc ~x86 ~x86-fbsd"
 
 IUSE="debug +introspection test vala"
 REQUIRED_USE="vala? ( introspection )"
diff --git a/licenses/Manifest.gz b/licenses/Manifest.gz
index 62b9e179912b..bbd293c1b8f4 100644
--- a/licenses/Manifest.gz
+++ b/licenses/Manifest.gz
diff --git a/licenses/supermicro b/licenses/supermicro
new file mode 100644
index 000000000000..979ea00dbdc5
--- /dev/null
+++ b/licenses/supermicro
@@ -0,0 +1,127 @@
+End User License Agreement (EULA)
+
+  IMPORTANT - READ CAREFULLY BEFORE INSTALLING:
+
+  THIS END-USER LICENSE AGREEMENT is a legal contract between SUPER MICRO
+  COMPUTER, INC. ("SUPERMICRO") and the individual or entity which
+  downloads, installs or otherwise uses the attached SUPERMICRO software
+  product ("the Software ").
+
+  BY CLICKING ON THE "ACCEPT" BUTTON AT THE END OF THIS AGREEMENT, WHICH
+  WILL INSTALL THE ATTACHED SOFTWARE, OR BY OTHERWISE INSTALLING OR USING
+  THE SOFTWARE, THE INDIVIDUAL OR ENTITY WHICH INSTALLS OR USES THE SOFTWARE
+  ("LICENSEE") AGREES TO BE BOUND BY THE TERMS OF THIS AGREEMENT. IF YOU DO
+  NOT AGREE TO ALL OF THE TERMS OF THIS AGREEMENT, CLICK THE "CANCEL" BUTTON
+  AND THE INSTALLATION PROCESS WILL NOT CONTINUE.
+
+  1. License: This Agreement grants you, the Licensee, a limited,
+  non-exclusive, global, non-transferable license to download the Software,
+  install on SUPERMICRO's products, and distribute the Software in
+  combination with SUPERMICRO's products ("License").
+
+  2. General Public License/Lesser General Public License. Certain
+  components of the Software may be subject to the GNU GPL or LGPL terms and
+  conditions available for viewing at http://www.gnu.org/copyleft/gpl.html
+  and http://www.gnu.org/copyleft/lesser.html or as otherwise designated. To
+  the extent you receive Software under this License which contains
+  components subject to the GPL or LGPL terms, you agree to be bound by all
+  the terms and restrictions therein including keeping all copyright notices
+  in tact for the duration of your use of the Software and modifying and/or
+  redistributing such components only in accordance with the terms of the
+  GNU GPL or LGPL terms.
+
+  3. Restrictions: The Licensee may NOT sublicense, assign, reproduce or
+  distribute copies of the Software to others except as otherwise provided
+  herein. The Software contains trade secrets. The Licensee may NOT
+  decompile, reverse engineer, disassemble, or otherwise reduce the Software
+  to a human readable form. THE LICENSEE MAY NOT MODIFY, ADAPT, TRANSLATE,
+  RENT, LEASE, LOAN, RESELL FOR PROFIT, DISTRIBUTE, OR OTHERWISE ASSIGN OR
+  TRANSFER THE SOFTWARE, OR CREATE DERIVATIVE WORKS BASED UPON THE SOFTWARE
+  OR ANY PART THEREOF, EXCEPT AS EXPRESSLY AGREED TO IN WRITING BY
+  SUPERMICRO.
+
+  4. Copyright Protection: Except to the extent the Software was licensed to
+  SUPERMICRO by its licensor, the Software and all related documentation are
+  owned by SUPERMICRO and are protected by United States' copyright laws and
+  international treaty provisions. Any copying or redistribution, except as
+  expressly permitted by this Agreement is a violation of the law. You may
+  not remove or alter any copyright, trade secret, patent, trademark, trade
+  name, logo, product designation or other proprietary and/or other legal
+  notices contained in or on the Software. These legal notices must be
+  retained on any copies of the Software. Except as otherwise expressly
+  provided, this License grants no express or implied rights under the
+  respective patents, copyrights, trademarks or other intellectual property
+  rights of SUPERMICRO or its licensors.
+
+  5. Termination: This License is effective until terminated. This License
+  will terminate immediately without notice from SUPERMICRO if the Licensee
+  fails to comply with any of its provisions. Upon termination the Licensee
+  must destroy the Software and all copies thereof, and the Licensee may
+  terminate this License at any time by doing so.
+
+  6. No Warranty: THE SOFTWARE IS DELIVERED TO LICENSEE "AS-IS". SUPERMICRO
+  AND ITS SUPPLIERS AND RESELLERS MAKE NO WARRANTY AS TO THE USE OR
+  PERFORMANCE OF THE SOFTWARE OF ANY KIND. SUPERMICRO AND ITS SUPPLIERS AND
+  RESELLERS DO NOT WARRANT THAT THE SOFTWARE IS FREE OF DEFECTS,
+  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING OF THIRD
+  PARTY RIGHTS, AND DISCLAIM AND EXCLUDE ALL WARRANTIES, EXPRESS OR IMPLIED,
+  WITH RESPECT TO THE SOFTWARE, ITS USE, PERFORMANCE OR APPLICATION, THE
+  DISKETTE OR OTHER TANGIBLE MEDIA ON WHICH THE SOFTWARE IS DELIVERED, OR
+  ANY INFORMATION PROVIDED REGARDING THE SOFTWARE.
+
+  7. Limitation of Liability: IN NO EVENT WILL SUPERMICRO OR ITS LICENSORS
+  BE LIABLE TO LICENSEE FOR ANY DAMAGES INCLUDING ANY LOST PROFITS, LOST
+  SAVINGS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES, EVEN IF SUPERMICRO
+  OR ITS LICENSORS HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES, OR
+  FOR ANY CLAIM BY ANY OTHER PARTY. IN NO EVENT WILL THE LIABILITY OF
+  SUPERMICRO OR ITS LICENSORS, WHETHER IN CONTRACT, TORT (INCLUDING
+  NEGLIGENCE), STRICT LIABILITY OR OTHERWISE, EXCEED THE AMOUNT PAID BY YOU
+  UNDER THIS LICENSE.
+
+  8. General: California law, except as to copyright matters, which are
+  covered by Federal law, and its principals of conflict of laws, shall
+  govern this Agreement. This Agreement will not be governed by the conflict
+  of law rules of any jurisdiction or the United Nations Convention of
+  Contracts for the Sale of Goods. The parties hereby consent to the
+  exclusive personal jurisdiction of and venue in a court of competent
+  jurisdiction located in Santa Clara County is the State of California. Any
+  cause of action or claim with respect to the Software provided under this
+  Agreement must be commenced within one (1) year after the claim or cause
+  of action arises or such claim or cause of action is barred. Should any
+  provision of this Agreement be declared unenforceable by a court of
+  competent jurisdiction, then such provision shall be deemed severable from
+  this Agreement and changed and interpreted so as to best accomplish the
+  objectives of the original provision to the fullest extent allowed by law.
+  Such an event shall not affect the remainder hereof and the remaining
+  provisions shall remain in full force and effect. SUPERMICRO reserves all
+  rights in the Software not specifically granted in this Agreement. The
+  Licensee agrees to indemnify, defend and hold SUPERMICRO harmless from any
+  and all expenses, judgments, penalties, or other liabilities by reason of
+  its failure to comply with any provisions under this Agreement.
+
+  9. Export Regulations. All Software and technical data delivered under
+  this License are subject to U.S. export control laws and may be subject to
+  export or import regulations in other countries. You may not use or
+  otherwise export or re-export the Software except as authorized by U.S.
+  law and the laws of the jurisdiction in which the Software was obtained.
+  You agree to comply strictly with all such laws and regulations and
+  acknowledge that the Software may not be exported or re-exported (i) into
+  (or to a national or resident of) any U.S. embargoed country or (ii) to
+  anyone on the U.S. Treasury Department's list of Specially Designated
+  Nationals or the U.S. Commerce Department's Table of Denial Orders (each,
+  a "List"). By using the Software, you represent and warranty that you are
+  not located in, under the control of, or a national or resident of any
+  such country or on any such List.
+
+  10. Acknowledgment and Exclusivity. LICENSEE ACKNOWLEDGES THAT IT HAS READ
+  THIS AGREEMENT, UNDERSTAND IT, AND AGREE TO BE BOUND BY ITS TERMS AND
+  CONDITIONS. LICENSEE FURTHER AGREES THAT IT IS THE COMPLETE AND EXCLUSIVE
+  STATEMENT OF THE AGREEMENT BETWEEN US WHICH SUPERCEDES ANY PROPOSAL OR
+  PRIOR AGREEMENT, ORAL OR WRITTEN, AND ANY OTHER COMMUNICATIONS BETWEEN THE
+  PARTIES RELATING TO THE SUBJECT MATTER OF THIS AGREEMENT. No provision
+  appearing on any form originated by Licensee shall be applicable or have
+  any force or effect unless such provision is expressly accepted in writing
+  by an officer of SUPERMICRO. This Agreement cannot be modified by purchase
+  orders or other forms, advertisements, or oral or written representations
+  of representatives of Licensee or SUPERMICRO, or anyone else, unless a
+  written amendment has been signed by a SUPERMICRO officer.
diff --git a/mail-client/Manifest.gz b/mail-client/Manifest.gz
index 3bba1abf07cb..f81c9387a63e 100644
--- a/mail-client/Manifest.gz
+++ b/mail-client/Manifest.gz
diff --git a/mail-client/mailx/Manifest b/mail-client/mailx/Manifest
index d18aa9d890f9..531c22b3993d 100644
--- a/mail-client/mailx/Manifest
+++ b/mail-client/mailx/Manifest
@@ -5,5 +5,5 @@ DIST bsd-mailx_8.1.2-0.20160123cvs.orig.tar.bz2 76715 BLAKE2B c6491cd88e99b62184
 DIST mailx_8.1.2-0.20050715cvs-1.diff.gz 36758 BLAKE2B 825e4a62fa2d33e29c25092ec466e07be6be2abed0f1da5623f37be179cbb1212baade400a621fa838eced88a84393078c67c3126774ff08030680f4f0dbdd54 SHA512 6506261f24d5a022fd9cee596a78488a279a0b39b7281cdad9c3e52b5c7f6c2506a1b24970c28cf7b4ffa4ce2d71fec650f42d22959b53aeca0f160b2885b2fe
 DIST mailx_8.1.2-0.20050715cvs.orig.tar.gz 94664 BLAKE2B 0b0b9f4db18bda8b6572c97c33784f7e29c16d500b3658b79f31fb80947035e2bfc7eaf6e8bc50e621ee13ae5e61d7760aa882c29f0b082ce8974f7b1aa8416f SHA512 1c1d991a0e522b2e78a49b9c78eed80b1f6d4f68ca0427ef720ebe77a3a2881bcd3d63967ab04f5d6f75fbf2212e260e4a841152f8a69d300c46acd90bb48d68
 EBUILD mailx-8.1.2.20050715-r6.ebuild 1611 BLAKE2B b0ee36ea309f4aa4cf1f691f931e3bc303e0d15425425fa439d3b8101b74e27c09b21130062dd582cd0b2fb9b288d3b971c4cbff4703a7400d4b1cbb77331dd8 SHA512 08097bbdade032ffd4ec92527b56ff4aaaaf356e7c6ea990fca3a8210567abf9f5e0c31c46beaf9fb803306fd83642b600a0dc16ef80b4f6bca7ff59eb9cb711
-EBUILD mailx-8.1.2.20160123.ebuild 1260 BLAKE2B 2af4e275156a4da269b91be31f3ef2545b29df96103575bf94a22277f84364ffa7dc35a113cc76dd83162a650401db43b19b225f0a828265e025f2e01e5e5232 SHA512 1d07b926792bcde4563d8d2d07ba0312eaa2c16c09331a19b77d2d6a4e2eb35f2ba80ada2ae5a5db2b3fdf928499a55d69f5857404f46b4d20b68b5f6e213690
+EBUILD mailx-8.1.2.20160123.ebuild 1259 BLAKE2B f91ea8bf281c51ef867625d78fa9d7de8f2aa548ae759c8819321004152b577a039ed56d99b5c022813c64325b637e2e329c4ccd1f8e0c5ac832c7350c74f58c SHA512 6270f3279bd76fadc17fefb594c503baaecfd07af04ba522599b2e1eda8b8dab5ccaf06ce1c4dfa95da72aff5c5c0d9c347279d75aa045e59ee4c3ca0374c04f
 MISC metadata.xml 240 BLAKE2B eeb6099e7ebc29b81588528b970830d2461fa16783bda673672d405615e46d240dcd806b3d18b6207ef8e5365f8860aa20c304394c3f5b267c5ea4dc739cb94b SHA512 97824dbce22630efb21e647b55212b7a8a19d8e38b5bf05cb0b8078530bbbaaf4dc91284e2a11beab7dfcfb779df82b87b49d11a746c7a4f6dc71f2fda8942db
diff --git a/mail-client/mailx/mailx-8.1.2.20160123.ebuild b/mail-client/mailx/mailx-8.1.2.20160123.ebuild
index 3560add8afd0..574a7dde4b59 100644
--- a/mail-client/mailx/mailx-8.1.2.20160123.ebuild
+++ b/mail-client/mailx/mailx-8.1.2.20160123.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${DP/_/-}.orig"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""
 
 DEPEND=">=net-libs/liblockfile-1.03
diff --git a/mail-client/thunderbird-bin/Manifest b/mail-client/thunderbird-bin/Manifest
index d9f4e1fcb277..34c5ee85dfb6 100644
--- a/mail-client/thunderbird-bin/Manifest
+++ b/mail-client/thunderbird-bin/Manifest
@@ -2,63 +2,63 @@ AUX 10thunderbird-bin 36 BLAKE2B 4a1c1d5ff170a7f3a15402e5f52761dacb02e9afc518c9a
 AUX icon/thunderbird-bin.desktop 229 BLAKE2B 2f9ec11f54483bb5c648a6fab4b95fd0c9b31a645c82f568263fd2b461b43921ea3a8261119ca210a531ca01955050f430fc881ab68a0c463d043953d9d0b02d SHA512 12906325b92fc3c336dc5d083f0b3ff56fd9892dd234abb9fa1a98ff51b718816b1ad50eb4063e718a86341e710e5410bc216bb398feff163eefff434ecaeccd
 AUX thunderbird-gentoo-default-prefs.js 404 BLAKE2B 488c7fa7faea76726e01c459ef41629a946ecc23c4034ec9326be0f124c17d2f39b7e0d6f70a4639d60910035c8af744c169185b1dd04ee21c44ae599f8f949e SHA512 7163d09a6e5760327b4fad5e5ef8402640a1b1bbb173a78101275a245248c2c406a5e5e0ca675b7e7281f07d6d272a8586f007bec39c73621f3261862da93d81
 DIST lightning-5.4.5.tar.xz 1898160 BLAKE2B ed8c2f54140444610fdcc91e375636d53d7ede9e70e114e072a55867278130e09bf54bb4e04cec789efa47ed8e92586b2217b53663e6057d6556df1a5a25f48f SHA512 621d21c20bd74271f83ce9eb89b1f65cb43ab6182793bb7b9b3ca04799644f6700d15a59c6b312459d0471f5f243c3b9f534d1adf4bc72c36c2bd04f2937e3d3
-DIST thunderbird-52.6.0-ar.xpi 604236 BLAKE2B fb3d14519457fee343dc1be376338f55cbb9f68b33cf9fd11c3c9d9300bf10dee9b65c44d01d20bc9a2b626194625f6a23fe0e517c1ce0c97d809dd9ad2415e2 SHA512 6d9be27bc7fd08b5ffff5d68b07eba1791db4d18af06e2fadf4ed252934cc610954b85fdfc5fca5366d15444a6f693f60fcd7f466ed5cf23881c586f214d15e3
-DIST thunderbird-52.6.0-ast.xpi 541173 BLAKE2B 63aa8617d4824525ac7c9287d01b8066a48958dbc9e19f51c48d63e0a52f4f51ded9b1205edc8bdc1e1ef1ebdba5a2a1c81045c483bae8b7a39dcf674a9efe6f SHA512 7838b5195baa3bd0c46ac4a81e8ebb9a4e113062fc217a619a41300795abecf277de7e0898a58f52575d37ca7fef841a2f27ce6ced90cc508fdebe9a40381d3a
-DIST thunderbird-52.6.0-be.xpi 570932 BLAKE2B 1aacf13bbe52c14f6bfa5e484663ea49eb0cf4272feb7010a60574de0002d9dcc1733e058ebfac0c2fb0acc707fe4a8cc1c6fac9d9bc403bbcd12dc27b46c3d4 SHA512 914968e2fe7dc279deaf0e30d676ab7f028953aff890153bdc2f2b07cb47f9225c4f9bcf9ffafa44f8b289f29f1132466b443cb976deba6021cadf9a9ae1a59e
-DIST thunderbird-52.6.0-bg.xpi 634897 BLAKE2B 309da88bd5224953b04e34e28ae480782c0b25ec1e63c50b27340dd6877b3ef388df875b31d27a87dee67b5644a304b7e3c91179d89a27c3a27f6003a56a1e36 SHA512 60e85b6c842a779668b1ba3c73a6fb2254846db7fbf37fbe06fbfe71b65deade435f45511b43920a293ab9d4d32276809196169a7513a7a982fd904c3671c5b9
-DIST thunderbird-52.6.0-bn-BD.xpi 676901 BLAKE2B 98c01cff6b1f47879a87cdb192f0512d14626c9bc334d58b8c25d172dac92b24e45444de9ed4fdae2aa6c866942ddebb11ea2f2ad74ca787c1422a531c8616d6 SHA512 d4576943e7ab07973e9384c287840d7ae0d70a5d30f57f6dd0ee2e050a78eabc74db4ca2c1473ebce981af8cba903c65f349e523585d5fcf63f1dc4c22220a6d
-DIST thunderbird-52.6.0-br.xpi 559380 BLAKE2B 472e60477e224ccc5c421ef5de08b2096bc4035a843ead771fc108e0abeab38c5b40d53b76576d694c5c305f9ac1845625491e20baa2f4d1b718f9c491e6f658 SHA512 2620ad382f20d84073e1f2a6e21dff2ddd722d4d17ef14e57ffeb2efe2359b6767dc418c81e250864db73d204326ae61ed5550d65b557c503f01c57cc780778a
-DIST thunderbird-52.6.0-ca.xpi 569910 BLAKE2B 346e7ad2f20e1af7563a159c20e66f0512587167f4e2076422ac3a1f84a7b7cd68e0f03fda20deb5319eaa68f71e4ec9be43fb84bdb173c4b30fa1441d7514a1 SHA512 0cd3b488b3af4b30304d892544d605d992ece56909290571e097c832c572a883de7664a451b631b71e561e75b4fa2fee07efb75400d90a75007d96d20b13fab2
-DIST thunderbird-52.6.0-cs.xpi 579150 BLAKE2B f866368547878453df392565d641e8b7343176f53132c97891da5d10de70c242539c06f0eaa8066b5520f1424cdd9771a82796ec416edefb2ac81ba31dd87fa5 SHA512 ea681ffcb8ed9c7b8b251f42614283852319d62a5fea537f4df43978deb63b221669253a59110eb86320dd7923be1d7d79d85f87c4256c79d2d4ef40db833035
-DIST thunderbird-52.6.0-cy.xpi 554858 BLAKE2B 23341d1bc4647632789aaf10625e59b0c4450ba45b3096bfc8f913c4f28ab7045739d2a694f84884ff7a37eff0414505208e1f6ca9aa4c68378a5d8a5e215179 SHA512 5e199d720027526fb8f477530ee99d41bd283b4e751fdc58ea55dbc558d0ebbbd61ffeace8cda176e2ea69afb08d57567b5dcf09443608100184884548ea1041
-DIST thunderbird-52.6.0-da.xpi 543336 BLAKE2B 3c6d894db0e1cd89857fa394698f81b815e7e8b023f0435268440b6e45c0603425d0bb19011c08135eb4d1a0e0dc5e548ae66d705c46bfec58e4a45022592ec2 SHA512 8de93f940992627068a68d2d817c1bca290b056eddfc04a01662eed23e370f4275f5cdb8ed26b25fa549eef2046c1022b6caa2391a0728dff3a296cc70904e99
-DIST thunderbird-52.6.0-de.xpi 555744 BLAKE2B 818721c4a242f634eccaa3eacb8e2610e8d5cd1cca73bcf72d96f837ad21b8795aaf0239ff90eeb17d0932683d3b3b66505f56c68d85978147c389a86e65b6ca SHA512 6fc5b497e6973a1cec843f169ca6c5fb3d603d04c9692e4b9184b9832f59178b70098a25eca1c5b01972158cdf6fbe357de170b14baac5d1e9e71a90b60fd881
-DIST thunderbird-52.6.0-el.xpi 662965 BLAKE2B dfaf8eb735a31abe454d0e1c0070f1b984c2db2b3849e138eef07b651395061c8348272c32c869a257a038fea007a956ac048801b163af4ec1645f927b95773c SHA512 1ca3ee4e427afd5ac154345286866ac65b2c440bf3466f33355ff38d3a41c67fed79aa7e5fc5468c3093ab67af2d15305dc30e85661649e7195f2a3d22901107
-DIST thunderbird-52.6.0-en-GB.xpi 531234 BLAKE2B 781bf5e12503e0a6a6f7345a07f84fe26c16ec27985109cb7fcb68caab0248696c3db4dfd806ff7922cc64849ea5f35783bdcb8c76dd833044cce18c7d561769 SHA512 7f004fb258387491462cc8affa1881c4f6f4ee54cfb17ad582282639001f1a92b907ff03ab033016e3644d84a33994276d30e02ed5f95de10a1ea2b7d6b69c7d
-DIST thunderbird-52.6.0-es-AR.xpi 565995 BLAKE2B 031f17ba2aacd08bce03aea3387579248bf4ff5b7acd55208d602f6fa7c662d88d5b02752d6e864d4e6d71dfa599cacac9fc7c711753643dca957ebf4ee371c8 SHA512 26bff59fe4b7bc3f95f2344b46964c1708ac4bba8a33934c5e0fcb0b80eeb3ccdd5ba1d51d46dbf6e04c123c96ab5a3f211f5bd1628e8703b7c85b48e603bc02
-DIST thunderbird-52.6.0-es-ES.xpi 445464 BLAKE2B cb420d3b17bf85eec5338c55a86dd8876e4389b388e8928364ea93b3132bf126a82afbe00e366f82120c85efab336732c5601a039d5d6495dd12384f0533fc77 SHA512 806d6406eb3b4fa25fa7998c08df2a7a0083039f9bc6d81d4598104ac40df6a0f726786f0b6d8562036d9cec80677f49a0b24b3ff555488831cfcf51993a84e7
-DIST thunderbird-52.6.0-et.xpi 551661 BLAKE2B c555335e624d838629a2e7a08408b907e97aef17e47ea94ba9f8631ba6fc57547a66956615c2969112b3ea6b1a12b637c370c40e278658c3a0a73efe177561f8 SHA512 5a988745c130c3769b4737aaefc4b2f63109247930a9cd2a2dc17f1a6ed1d447d65f3001ede0e59d8aaf8a837c879b766d100c3d38845a8fd1433224b5d9bc07
-DIST thunderbird-52.6.0-eu.xpi 555536 BLAKE2B 8dcbd953f7e96ae4b4f1c31080f3e350334658a22194dba7b4a3f3c1de0559aa124674f976d99be2f6a5591a5c93914aef2eaf2df998b85a776aba66b70eacc4 SHA512 2e0a903c0fc67f7d983f902492d0ae003263299d3b0d1b0367d87c52d4a7097d23a3c02bbd8373922e2840cc8f6b1319d715b970a40ac074040a7931ceba0fd8
-DIST thunderbird-52.6.0-fi.xpi 550669 BLAKE2B 9d244e1766b59b4585ac6313ead37917b69dbc8859e928914b50ae070ca82feed49b82b1826f07fa513446a385fc24f3f98474d65fb1bfe6c5a1e006e85d5ab0 SHA512 fdb318318ac43718cd5bbef635c551f59d0f9e2a6870b500e0c311385d6a06aec93cf9fe52abb14f62bfdf46bf272f29624debd239f66d2f946f76b14da5c531
-DIST thunderbird-52.6.0-fr.xpi 577561 BLAKE2B 3e813b685ed2fc344d80b6bc28db42859fc870c909b89bd60485efaa0e510d4a2b4840ce812821319b5082171bf0458fbf18204aaf28fdf2f6c957275fb87ba0 SHA512 825ec9456a742f5de38ef419c52f5d76166b407828a70dd409e3ab6b12548a354995bc66dffa9b7637873be34b7713413125e6b821a20100db7c0b91e7ddfc4c
-DIST thunderbird-52.6.0-fy-NL.xpi 563633 BLAKE2B 9a551ea0465909ce9370528ffe83342c0ee34409661358c15fa8987f5477a7d23e73b3a0634d9bea352bfba486f220b5322e9a32cf31f7b343988127d162af9f SHA512 41947057c4766808b835c3cff0b23095b574ce39355d29842d45556841b9d1ec759bc3711ea0be9365b1e504a42522c260e232c014b987ea0abb6b94a184bdd5
-DIST thunderbird-52.6.0-ga-IE.xpi 583557 BLAKE2B 1fde1f866ec49e6c52cace5df9125cc403297771cef38e50a379ea3a2c0a111000b5a489a8ec3671406539b5f480d4857c77318e79ad9ae4aac98378062daab3 SHA512 6ce943e5459f282f5d235a931c0990c1a5759844f5e92695538260e68d3dd2b6b6d8e69631bcfa5f39281390847b68a2a87163410b427a0252cb11c6c2f0c2cb
-DIST thunderbird-52.6.0-gd.xpi 574065 BLAKE2B 058d78958e5779390b331870bad7c2979ddc86a537eea373feada1611c6159aae403900e7e92f4d9a96c3d51ab7e19101ab4c0c4b01a503e52a53b12cd012eb2 SHA512 4c644b45350b4af2b1bb8199837d6a91116382b9729d2292eb1ec4f624dbaa6dda81cfc2e6dd2a384fcaabb6b15b6fc9b797b18022c8590faa4b3f320903953a
-DIST thunderbird-52.6.0-gl.xpi 575150 BLAKE2B e6ac28b678af2aea6c82db1c4c509529626b9f4146282d48dc52f8a90537463989c71f4a3491267b59c6b3baa8c38e897e291eb472862605ca7e81a477065945 SHA512 4436881aacb13edd33f76519311b4612d41211c1e73d2a4467ceb9e06b15df746baaf26210de44cea164e062fdb6a7109000a7f03c7d5b32a8d2bcda4c515a60
-DIST thunderbird-52.6.0-he.xpi 592566 BLAKE2B 75f86e8709485c7a8c0d196abedc0d0c3a2fa65000d8be0f86593c6be07200d9e2af32c289f271d80288f951227bc6bd704bfebda0a8a67e9df1548f22b18249 SHA512 c8ab390f6cd96197c22d119f8c1695db0bf12721049caeefd3cbe8724030ff79efd8a9417902222b93424d49c8f7296dbf28b601c814346bb4d4971e5f229ee0
-DIST thunderbird-52.6.0-hr.xpi 564779 BLAKE2B 6f66e8f63b7bb969b50036c489fa136f47c1c3952052140e8237a4b20bd4b4a1c896fbaa27da30249bd272834e2919a00fd63e78f611ff5e3b8bf9a3a6d9a6c5 SHA512 4b302ea73ac48c4568b71099fb70090952392244a18662d529fce46e0d56c47ab327ace2efdce55b8fdef1b58653594c74a33ec51a94f05923f055d8b14c3f4c
-DIST thunderbird-52.6.0-hsb.xpi 582242 BLAKE2B a69b25758bf20c8526ace8752a1c160f21eaa339bedcf968fe707990dda57c1c8a671fcccfb476b1dd0afe2ee18a7b203eb2f285be3d53204b982affb6da2d3d SHA512 cc1930e69c3d912585b04e575323f613e7e698012a3ecd5d6690a31cb98cf7fb8ac62a410881ebc759a8f4d740453df8254290faabadbe95b7cccd0a1b377f7e
-DIST thunderbird-52.6.0-hu.xpi 586446 BLAKE2B 6ec8e30649ab7ad16e46fbcbd10bb46f1b554d99d2d70d54e69724441def5ea78236a439462dde8341ccdcd31db9642d75f45c343c31c2298daf80e715bf46d7 SHA512 f521f9f299eed773387da148621d65d8157cb2ec5f12452b7a1017a0dce4f16ae3438e002b1706d8d6d11979df3fa5d2251a9e8390f6ee537fc29f4224eccb87
-DIST thunderbird-52.6.0-hy-AM.xpi 629880 BLAKE2B 985164dfdd34919cd6037769a86d5653bee45936ec80a517ded3a55eb0d2f61d9100df2d317febcfded3bbab60ab5af88cdbf5e1ba33d6ea7304b79525ca42d8 SHA512 616d40f68b8eec6427ed32d81b632783e0297a4f0e65b018069479d7761658de50e72653ac9d6456db0252f4102fff39cb3d921ce4aa7a9684267cdf711501ae
-DIST thunderbird-52.6.0-id.xpi 546527 BLAKE2B c384434b69cb1d04d8edc3ef5c9cca33d3f21d9f6c8a36821ee416702b12be33373a1eae1ad4388b48803c2bd829539ae9bf3f6b58fff16b16bdf9d22f2def70 SHA512 9eb15d63f23742e9952c5a1021c55cd107ec33777bec4ec79aba81b7b840fbbb3610faffed2fed3929eb43de8b9453dad863ecee2dd1ee823e87a7eef5392e9f
-DIST thunderbird-52.6.0-is.xpi 555713 BLAKE2B 54de05718e8f87bb49a19f295ef23ac9bc59297def3a1535a54937e70882759b72018efc88a7655063d5b4af6c3fd61b9f353c6f21733f839ea969a163cfd5e7 SHA512 89b0e6add3d81637b457d52c92d75c165bde42ecfe5807b088c8e1c9fbc41239a9cf57d9c19503df9ae3287a65f7fd4c2a69b41e732b81049fa695831b595505
-DIST thunderbird-52.6.0-it.xpi 455408 BLAKE2B 1fcba03159449f3bc930d6801039f8b7091979a0932700d6683285b81adf99b8349852caae6fd74c6212c41fc6fcbc41970267b4906474751cd90b3474157ab1 SHA512 22f5bd6348e3e497ea9b51d0b13455dc77b33b5d4d3f291368b003d7632a0ce12f57bb9cf77f14eafd06d5640434116903d2c89a001a3ca164964a7d632386a9
-DIST thunderbird-52.6.0-ja.xpi 630053 BLAKE2B a3a856f6882eae598053c080729c31d645dcfef1c704b210a32e02b9159049cc5012885772d6404c73e923890ab2d35dc70e60a3f7369fdb43924417500c7de6 SHA512 df48e054195d50e50bb25c0b315c4a9b47856552555bc8277338daf238e435ce66ae5689f86657f4344326cbf272c4b947687ae8d745cfef25a5c0b41dfaa24b
-DIST thunderbird-52.6.0-ko.xpi 595517 BLAKE2B 08c696373d3fa9db00d476d0e05a6103373c203656c1fae24643949694622bfd413ff0931d7d266f4b1a641f40ce39884a720cb9babb136b3a75801bfe0747bc SHA512 92a73716e619b3fc51c51343e180ec62fc59a018843b4cd8f343452af0c12530d1a2448fd84c30f91c0c968db8315475b491a6963b7714c26431263d5c74fbc1
-DIST thunderbird-52.6.0-lt.xpi 580598 BLAKE2B 8cfee8609b6cc1c8991146f355da33b472bac1c85ac6f5dd18162bb059663cd63e8844baa51add765f58d6b0ba664199c2e648115f47f92cf21f0040fac91b11 SHA512 7127aed50f0a3ce596ec030715bcedac57b9de4081d49a97eb669f7bdcd1c968f4cd5bfdf1a44d4602ca5f86c4c308bb42c17ba6fe4e2fe80c040061b52e21ec
-DIST thunderbird-52.6.0-nb-NO.xpi 551104 BLAKE2B 613678eb6828a9ec98ca102c3af89368bb6211f9b6a66f7159c1b113679c566412c4d418419c41ad0a499dcdeee755cd313880aa2f3b5ade96abb7218f22a56b SHA512 56c49e358571048a9ea78de33a9c5dfbe4b6d68890102d3d705aac8136f441bd81389ef181bc3fefdc61d68284cdb9124b838efd281a6f712fbb559163d8ff2e
-DIST thunderbird-52.6.0-nl.xpi 557957 BLAKE2B 3b215ae54c8757b9a8a8a5805e292eb847cf91f8330f2abfe4cff5be00a6b877a37b264482563894ea22ff4146b6992e5335ccfa2ecff604d824eca157e3538b SHA512 5101d4e3bfeee18d51a2a570db11e5aadf4b3596fa7fa59070ff0c9637538309bf9fee99f24a60c2dc9f6d897f28a00e66dffe656e0308d2fcd8906866b7d539
-DIST thunderbird-52.6.0-nn-NO.xpi 551892 BLAKE2B 69b5241e0948e1650db3444943eec94527bae299b95bebc4eada80823d2ec00eb7437dd08f1044d90181a30fe0fe39cf9d20a0ab6ae49eb0ca8c8e85fdb5eed9 SHA512 d3dd9804fa094c395480813217f7f59c25725d6c9ccbb830b07f950d305e028c99bdad8bc92e849a4b5fbf7b0aadfdcabfa0b1182f751b5773fab32cbe0aea1b
-DIST thunderbird-52.6.0-pa-IN.xpi 646569 BLAKE2B 3fc478539a2aac7d582067a9cd4dde30489e04e4d09d60653a61b04ec2b2f620794f9af7dec805467960d7530b1d85c67d69d8982c94f788aa31b7f48da5c697 SHA512 a5cb0a87a6e3449791d52209e19b818db8f673d84899073caa81a4cdc8867cdbc2cbe1e032f641703ecd2de433d3b6da70bb011ea15184bb404c0fcf8ae7436c
-DIST thunderbird-52.6.0-pl.xpi 469902 BLAKE2B 5fe9a3605e582c052101b46ef700d10e5007d83bfafd9133364cefe8afc18c51bb8d4c8f4111270c4d8ed2e91aa139662981148980521be9903635b8bfe6459c SHA512 8f47ca30cec603beb94dda109a77c16ab1e6ed1f07968e1f71dafc35c73521f6b511ddf9dc2b7fd85ad881d7e7c01217b42464d0beb5040b620e52f05248a952
-DIST thunderbird-52.6.0-pt-BR.xpi 558224 BLAKE2B 611ee36ca9cc18626c22684ef3317388bc9778e47bf4544e3ec15d720c35d4e4e64c392bd7f1b0947ccf21252e0810e52642c367fd5273261ddb1eef38a9b0ce SHA512 0d2e67821ca55f2ab68bff442deaaf191d77072dcba64ac98cf3c41ac5d6ea102ef10236439a98445f74cd1b96f768e729702ba88f418ee3560f17bff3f35a3a
-DIST thunderbird-52.6.0-pt-PT.xpi 565624 BLAKE2B 8244137556c525210227d25b7e3897bc096219d6a7295b67cc1a04be0c105383760051c4aa9c961ab8e59f4bcbe1ed5e9a8e454833f7789c1a2e2b6749598663 SHA512 be0d52eef40d47b3c33ffb968eab5962c43c0bbc809a99b5be4fc0adee72ee718f14a2daf144a0681dcf13e65fef6ac09f315b4fd3e920f81003fa7d5b56af0d
-DIST thunderbird-52.6.0-rm.xpi 557605 BLAKE2B 366c1a6477e9c489d975d61c1acaed1e408af199a53710cbc1fa1df92f7505d036a161b34af4a5b2b0a0fbba0a65f937654f519b31fac49da3423955d8738658 SHA512 58f5aa0dad3e42b8b4bb9df55eb86620166a9a5f4ff52707d0b6fe41dfe8fe58db642072ddc22195f974a488a4a83b7ba9927992f12034387cd60caec5e17d8b
-DIST thunderbird-52.6.0-ro.xpi 570529 BLAKE2B 74dc1286a8e047a6a4762fb1da1a490168f156f43bb87304e2901ad10fe57c401b078c67a197067b509b228ffc3e443ab7c5361bf4128d767610f6c73ef775da SHA512 2030cdef005a53ebd89a686cc11d70927e6f9b10d498e49e551ef67a7c449d1994ab7591e30ef6934b092ed8c619fa9f1a446d0784f0e9d7fb133c0716a03e50
-DIST thunderbird-52.6.0-ru.xpi 530670 BLAKE2B 067df60653c0f1c41749b5989ce4d2d2751a4dc34d3a14d9bfe297a8f0f27556a7ad4a7cb2bc9ba1d2d09226f5457bb2caeaa8061213a09828b96ea23dfe1d34 SHA512 07d02c9a8b1c5c7c58027305ac7ff651ca37bc2c5e1aa8fb81a5d8f4a7aab441b685bf7b3d5505922f742e9c455be85ef9a42af391b3eecb2255bf59ae08b266
-DIST thunderbird-52.6.0-si.xpi 649010 BLAKE2B 74f058127dc4729ec8aa3b950e205aef0096b713b6237e512dde12539cd400deab4dc06262b18231ac104a334fce9bcc189d5c46ccc26366e7757ec5e1448d9e SHA512 f358909d801b47e9077387bb1ba9bfba3948b46eb0b21c5944d2b9627044b83711515bafa578a3ee3113d45f47ed76b00f3d86eb53893f988faab039ccb6fe3a
-DIST thunderbird-52.6.0-sk.xpi 583882 BLAKE2B bf63e74ea9b368e0d92463a4cba943dbf272749f030a8610e5c9a2a8cc5ff0ef466703e366a1d2c11e3eda99763a8b187d2526cd82cb958e404c4ed352abe4bc SHA512 f1ef435aa22f7beb2c8f9dab2347a841fdacd14bfe03443df0a8d65f83ab3549ce337f66dc31f1688702e7f2905987a274c829fd447251d3a2d24f84d29dc505
-DIST thunderbird-52.6.0-sl.xpi 562835 BLAKE2B 78f9d3e0a8d4afd3271e5f33d7b8d5c71efa8033042798069d3d49bf581f9e5c2e5b8b5a6eb010a6849808888484414c0944333e7234b12f48c0542ffaafa23f SHA512 e79a60d83079e74f14d97fe1a6c774bee46aeb6d7dcb5d955c445b2b8b32d3f1fdd0b473e34bfc3f2acfe34acfb3b1cbc866d26663c063f80bf56ff1f2b7939c
-DIST thunderbird-52.6.0-sq.xpi 570616 BLAKE2B 0fbd2d2126dca5f4a99446b0e9632942631cc5cc4989a2cd784ec63011a158a00c9da870c2ac7afc21310efa982b54675e9946601c79bd25f70560f0f8bafee6 SHA512 5ac4301b07eca95d1da1c7842de0a1f123adc9d1bd7a564b93fe99d50c302f1f24f3f4218c7491cee9dda32e02e49e4835d1fa2ddc89945231a9bcbe86839e8e
-DIST thunderbird-52.6.0-sr.xpi 609020 BLAKE2B eecb7d9b4cdbc80d92bf5c10e2fb4ddc76f698ad62752d34af89c5be260bf7d70da6dbd24f8940b9794cb3babc669a0613263bb262969a78167ef0c36a7d6719 SHA512 6b77dc1968e627d99625ea0bf72019c399d44eb2220e738d61817e240af53f4ec483cbc8667881b9df6eb4c63cbca397f75c0459b6fbe0a2be958599fcf49eb7
-DIST thunderbird-52.6.0-sv-SE.xpi 565777 BLAKE2B 3947c8182568dfef185bd88c2c029cfc57b416ca17f92d5403d0447334145106325bdeb7ad371d7fdefc47bd293e1fab2049857d2113706eca9ca9d1639c0ae1 SHA512 dbbe8feeeb00d0f0722d2bfcc9aaea3bfee03bb3c2c0d5babb2d62b9cb5c067c4a60331944f207ccfdbf16d723304f384016254593b2fd0a3e0bf9a7a7b54543
-DIST thunderbird-52.6.0-ta-LK.xpi 675039 BLAKE2B 5b6467a975983d2f96b43383164c4625736a427a1f629235d0c46a092bb55452d38914b64dd3f558752015afe2efbfafdef1f7b77be7fc0deef61e7bfdcc455e SHA512 56596118bfee7e6d12657768861760f161654f7fd6ec6cc464001826e96c30650216f093977b7e8763d595903b4d656dec5bc1952f85d6d7e12f676371a598c5
-DIST thunderbird-52.6.0-tr.xpi 569926 BLAKE2B 8aad3f025ca1e5f633bd6e2ea1985d99a91ad8f557016243890fe4840e58d922976081878de0865a94bd09e6d077a3410a4d379831afab145518cc79953ef534 SHA512 04cb63d5505c47547eda7f7374d6f26c5f7c690eb5b3b6ee51868eb906ca352fbc7ef1f5c3be537a769007a443bd755cd8b4ba8729a4cdd777dfa111f5ee726f
-DIST thunderbird-52.6.0-uk.xpi 652855 BLAKE2B c9557bfd23e72a801450f4ff4b81ffd953d5bbf30d5eaf56d86ed05cc4a6dc8acc30279efc0939382c4a7d5f1d7cd34d8ac7a31f02cfd425d38b73d6ce8f5e84 SHA512 085d2ab5c0e7c1a283fe07597789cc31deadf785984b7ab7c8b6ca608c7260ddb39c06aa52ffb13e045ac9719c7ae0f2ccd90e1b90ae3649dbe481739caff18b
-DIST thunderbird-52.6.0-vi.xpi 637164 BLAKE2B 7a2f8b4861cfb1af294480a1a301b48a983713a889bcf65595178de16109e1abd418217e339d692ad4aaacc2e88958618840d9b0c91f2959fd05d77873c0d3a5 SHA512 22a8a0e140eaee032d8539ad485db130b4b51e6a660dd0839327e66ac1d81e493e816d7f946685d587ef4160baecfcc9d1139b0e810c2fe63de3ca805dff685c
-DIST thunderbird-52.6.0-zh-CN.xpi 593612 BLAKE2B fbe92431a085803d194d4852611270f12be63f6b279f3e808e602e0d88c0668d0484c623f084cae7929ec380b6e5dc088b10e4a26c490dfbb2e555cc6db5ed09 SHA512 424aa45f9984628e81222dff3d7be3e53d3936d813fe347a32dd9a44974a98293907a85ad618111971cd2b165cb7d657f3c2cb3f49f1803184a0d68d1d1bb577
-DIST thunderbird-52.6.0-zh-TW.xpi 595729 BLAKE2B eb23d82a05ef1ecb15c3c333afe17efacef6107586d2e8e2ff646fcf009ed5ab5128f1f2be43fbbb0fa349e28dcc3b80cf5cca46ae78505c0d9298baac2ba186 SHA512 715c53ba721672f45b9b6f221125f56fd08f74bcd4439b89e0d8b5d72b6779581eab66a8f4cba7227a45e33a9f47dd090d96cf517393ea68114e4b46c4969788
-DIST thunderbird-bin_i686-52.6.0.tar.bz2 51143854 BLAKE2B 1c9c2aefd935c8935808b3530ebbe537a468474ab6b918419473b13c0dd40e1a5d30a88f4f4261f98e9181eca1e2d1c88471b6a52b3410711aebe30fcb18504f SHA512 628a5f50871bf44c59e1d8983f520d5ede9f22bff15eb4b03673dc6d4b0f72c84247a5e29ba67e871be449825dde8090a6e9a50501e434bbc17d86aeb846e1cf
-DIST thunderbird-bin_x86_64-52.6.0.tar.bz2 49850341 BLAKE2B db2959464829592f1cbc4a261c68f2ba9e78f1e3489bced09b69f0c834330bb2aade6a3362e82fb0772ccb7b85a8f91ba937a27a224460c91544d29264120ed4 SHA512 10c1147b8509876d3b278df8d362cfb3279086d51ad40de1ffc8814878ba28b051940b347b4ca1a67bad8090ba488426403b219b2add070b704fac200ad4c283
-EBUILD thunderbird-bin-52.6.0.ebuild 4742 BLAKE2B 09cf322050e3564ef6f2969b651db2f000f3ed23cae73ad1904f2d4065eee0f78cd86ce8638d908bfb8e827c06e9ba7f6d1361792f734877882411396f1dcb34 SHA512 b9ffb328592f8ccd8c5a7b6de292158fc8fe71768738af4a2be150c22ff513c6927e6e109c0e167a16cd6308b0bba4a255eb4a4f49fe9cb65aa9fe9e9605b0f3
+DIST thunderbird-52.7.0-ar.xpi 604236 BLAKE2B 9b0f94a0e934b4a34b2ce8cfa7415969132af062f9251f628052a43ce78c5792acc839268fa946f408fc7caed62517019d23176a40d07b648cefee4e02496392 SHA512 5adfff22e8f42f1927e467d4912b46558d8db72b7ab34783824e1ce374861000a49922eab3d46fdbe9b64582c186887b491489af4ff9371243fc97344caa1350
+DIST thunderbird-52.7.0-ast.xpi 541174 BLAKE2B 0056c2c36bc9f9196e607a0c0f91387fc48bda6e8d8d728b7ff57d152852267c28af5a31cab3867630b9d0ec29b55e77880bae39301f9ac1b7bde4381fd7981b SHA512 5c67a7573e70fb8fc66cbb0c3180ab00387905b7f4b1d03139ba876074a963b96e04c5bd6dc0ee1c6fd35e9ba014220179533e876dd9558351f148bd7cc5bc6b
+DIST thunderbird-52.7.0-be.xpi 570932 BLAKE2B 1f4d1dc2b486797a500f2c3327710ff43edcac3dcf3a74aab29234b72167b8e65c343457799b2a571c0f9f4d3e23b24dfe8481573429c25d9df256ca441bfa44 SHA512 918fed7ea14d50d04fb375e3e550ca6beb167f5a92ef4cb535c04f1a73d49ccd404a5dcd3d724b07767e073fa5c78ef7a86744d06eab37f5221d73a369f9ca77
+DIST thunderbird-52.7.0-bg.xpi 634897 BLAKE2B 3b3e4984fd995098705089dc579cc4885cbfcf2637ce54cbacb6bc005bbb33850cd265a85cf0769966e19158647df20e99f99093ede5b3ff2e80f306ebcc656a SHA512 1abe8cde30a787a8167050b6309e576906c7049c019281ea900acfa0199038eb736f7643f963256d1158820435f24f2c814a3e893e32a2db6b826b8022df9019
+DIST thunderbird-52.7.0-bn-BD.xpi 676901 BLAKE2B fe41f7a21247b97fe636fb3434e5f39eeb9b99e1166671d88492925fcee6c796ec9e135fc2bf5ad3b2c792d956ac36683ec76736f699ef981c589ab3f0d98c43 SHA512 ec9d98fcb0f587a6c2dd19ade3017ba1210e55cae62d6499182944dd7cced262dd8b3808719a425953f46ad0f7d8d3a7b8d54e889bee0d8878b87172a6db592d
+DIST thunderbird-52.7.0-br.xpi 559381 BLAKE2B 5dd5e0b0ff3fb8341eab27c55074b9c9503e669eb96e024548a97e6380f0ec7935f990df8275a72982cd826e6c892f50bb99f3fe0e6aae33f99159962112b7c3 SHA512 c8c96e418f87d7ea31cfc596301233f28a178b34e19a7d6185f2ee8ecf04280e78f728fc408b948bd5daff3a34173f4240305cc742e275d9655311be02d31d33
+DIST thunderbird-52.7.0-ca.xpi 569910 BLAKE2B f763578d971eefe70fd22eb1abc76864b1a50c9431275286ceff236fbfca846174f92bb23abd3dbefc766ce7229c2dbb04946a1fc63983a33a28474f688bfb74 SHA512 58d42989075e4ca8165de7d50eafc4b2a7f59849bfa726d945367699f1e08ecd22a5461b386c46a1678e7628a78e90281f55ea4b30a147b5d48acc0869679298
+DIST thunderbird-52.7.0-cs.xpi 579150 BLAKE2B 38a93335376aa17ce3c210bea976d602d99d422831923257b6e6f3ea4ba8c661cdbd0de70002d5a2f811327d09a2e0c630e5e7e97452f8e532130c0ab58fb92e SHA512 2ac3759661c2e2007f9797ec83ae9b38cc5eacf9a7f3489a56f50fcadc6294e1a32458a5f5f5155fc60b749be17e2f2ab8f1907770bd3b7761be8c22bf0d1f9f
+DIST thunderbird-52.7.0-cy.xpi 554858 BLAKE2B 91b2c17c7eb328f9f25c16ed078e01b719f32e040c11352506cc98d86fca09837bcb702b566c82a1eb77f1bff6e0cbf725f950007cb812887b12011a5c37d2b6 SHA512 c20a359639b6f4e6369fce17008c6b9a86567e451ec14cc0cb0fa3c4cf1ddbba700e06186907b8995b12ac748711b13a3d39e7b1875c56e5eae3803a5acbf19d
+DIST thunderbird-52.7.0-da.xpi 543336 BLAKE2B f5c56cdeb5865e70a5b0d652697d821502205e2ebfa11fee58b5da82ca90031c9834248bc89eb6f9040dce469691c29693bb6aa06e9ce4b9c4cd2f7694eca9ac SHA512 4ca0f6bee5daaa96fc7f3c2a9dce76cff408c7893c8fd5164237468b913f2585944b909cf581cc72d05999a8bd1d5030eca1d4e727bfa8b5bc2aa491083444ac
+DIST thunderbird-52.7.0-de.xpi 555744 BLAKE2B cd780d98bf052117d80316fe4b4e510a06207f761a4ee92ae2437a4cea75a2ea990a07071ca33e740eefb7a68881bf0dee63af8fcbc6e9d48bb9143cc971ea1a SHA512 0f07f2306b3366025a4cb08ab7e3992a6f9fc52e61f028ec81b40d494df80a06d3ac7acf9023f7c615af8020912203ce560c5cac35c79c327c7452ed0cf49935
+DIST thunderbird-52.7.0-el.xpi 662965 BLAKE2B 089c02be214dd37bb6f9156c46c53cf51f048539554da0acd6f04c41240aed8e0d3205c130447b5259822d14e7b543af701759342700d9f8828e74deb6fbd57b SHA512 4e244532c36b3d471923ef9a8483667b030970bd067247cde1dedb335978137f9556e611541236e4cfbaf860589666f89a4d8301c5ba864a3edf8908e4731e0f
+DIST thunderbird-52.7.0-en-GB.xpi 531234 BLAKE2B 856b71a0b1005b7d1eff9f65659d24c80322f6183baaac15985f155ff39042e7068560ef1c7e86db5dd57a78be78c93966592e101d6afedb339d7c6649a1b3bd SHA512 9103b73468c1a7f1bb99cf7d22257bbc06f3fa191f1da4ab5041efaaa18f5bb413f8856a78ac0a97bd9bae89f6364bfedd4d3cbf7a5a2e28e489046485a980b4
+DIST thunderbird-52.7.0-es-AR.xpi 565995 BLAKE2B 5c28c9bc9e68387f6de9beffc680ed39839135eb470030a36100f7f6608f10fbd5c361d8beff15ca9723734a9d1eeb9b86a4b2e77ac14a1c0d2a1f54336ec435 SHA512 43b25cccc0dfa4f91bfe73de0dcf25f1ed97fd012b63d531a0a45c7fcbd06533ad61ccc6dc8c8af97f94f0626587d8d0c90f7f8bef2ff619ce4cd9d26905c556
+DIST thunderbird-52.7.0-es-ES.xpi 445464 BLAKE2B d87fb2187c2ead9cd171a4b3e0b7b3c3d915ca712e495467a98ebcd6570973837e731a7b0fc911883753106b6fb752675b384c538924fa5294d9d2749c143ace SHA512 308b706ab3159d926ceda44b37f69d59ed125e736d11905fc16e168d6a169a26fcd621a7b52bbf66116f16287511aa5984a0452cf509227db5f38bea6ff09ced
+DIST thunderbird-52.7.0-et.xpi 551661 BLAKE2B cc2a1792659b162ac25118f553e8f990919cc5dd75544d503fa0bc3f5508f48e631ee46d8e433d428b428a3a1359204a60ac7e61c1b04a8fb9a34186731ca7e7 SHA512 ae4c9da0672def6378ab103f68625e181cfbd456f8dd6096debdac9674711946e10eb81d06148d57fb3b3edd3efb12981e06b8ed18cb2a9259654610e2510300
+DIST thunderbird-52.7.0-eu.xpi 555536 BLAKE2B 0bae546daf4dad10d85d966b14ca90c21fa6613758f7fd329da7625ce561354be4fa6f1399799ce31c55c56fce0f43cbb5bd9db51cd4ff7fee22240465ee8ad2 SHA512 5840b4ca35daee13781aac1beca3be0404daedba85773375131c5cacc431655ee946981373dd8be016bba411886fcd04e2d6cf5c031c7bf16db94743eb6dc54b
+DIST thunderbird-52.7.0-fi.xpi 550669 BLAKE2B 715e72bdf9307efdd98f7e6d97789f1ce4aceede42975c1009341e5a428f754c082ebf8e90caeb20784c564543a5f0a435602121639e8900f05fd06716be32a4 SHA512 76bb8215405eefa83b9e3fe69337f5f3b5365c79cc1bc3d8599bbf8e1018c67f31c2963d28ab3817a79d831174a10d6e4cf369637abb9da52272715f3aeac466
+DIST thunderbird-52.7.0-fr.xpi 577561 BLAKE2B e38845a6202a199589340aeb0f2e907c0d1e212d8017d5a0b172b6ca1e503f6ca61eceb0d8d3045cb593e381749aa017f70ac13fe1c4663bfe1716ed25d7df20 SHA512 fd9856a0d3378adce66c6b1e54604cafbe7fd34f4c9486ff19d78c694b30ba792c74a8c18cbdaa4284f20831a5fd61a00d620f562208ba2ade9d1f34deb0f919
+DIST thunderbird-52.7.0-fy-NL.xpi 563633 BLAKE2B 2101645341bf82acc32a9dc2e18f0667ecc8272c44c41fd51230b78f7175b588ead3f9bed3465cdb95d9518bf76741226ec4f26a26e42ec35da5e2bac926fab6 SHA512 5c3b0e4e43abd511fe8963a8ffe5979126638383146fa5f53c44859eb9ae11ef8a87ed141fcea5afc55f5f729dae7e3b704dc341985eb18cb8cacbd07e6976ed
+DIST thunderbird-52.7.0-ga-IE.xpi 583557 BLAKE2B 26e63330902682a1c1c9026a6d5b52d992845057866b3cabd3db31105e4d3669a7ceb3b28a5b2ec2c1be18659c2e7cfd7339585e248cddb71ae65f100d90a896 SHA512 5c389c03648c232fd272cfecefd820fc892c787c2eefa5786074b50131facedab62c98eb4ca3303c399b975119249882b696827d8ee2c698ee828342a95e1577
+DIST thunderbird-52.7.0-gd.xpi 574065 BLAKE2B c5fc6cf8d0da281574533293f67c007ab8e9483285e68e6e9c8d66552f86a326bb484ef9d7494244bc529843f61074b9fc9fecd46e547e8f5703042a2482f3a7 SHA512 16fc42019d146efe2cbaf59cc575862056a41547b9e9bf8e4151f0b66f9e925ccae33bfd373b37395ddcba7229a8235fc42219b6cbb525291fa3526acb41e35b
+DIST thunderbird-52.7.0-gl.xpi 575150 BLAKE2B 6ced1a99f903a776f5771979c98e13cb4b3c5bea848ab608d17a517b90a44ac0315cb81e1c29d5d100b765f1e0606a34dcc9dd4ff29830da827700ae29d1ffa4 SHA512 7be2b56fd616b1145188bf03a4125d4d30e978f6c3bae6fad7bf716c73043a2a6bbedf5dd0dff844f1d27a2753f12b2043dcf8369e052ad643137c728a0c9f00
+DIST thunderbird-52.7.0-he.xpi 592566 BLAKE2B e1a2dd0a6cc9c75c5073cf3d1341ad72752bb9000066f876421cebccc652b73020636e8191e7a480ba09419631aa11331bb8aed14de9f8dcedc4c76a78e863ad SHA512 81d5c978b874d69f5d416d008f206ff95e6689663a1aa2895071bb717a1a035eb4682596e4b71a4f74eff444a571313c2f23157d5bf1d8af1658a63d9f4bf5a9
+DIST thunderbird-52.7.0-hr.xpi 564780 BLAKE2B 6d03d1f0874f0ebbac5b88b671dcf323c7a61b02f5fbd697adad3799989e8e76a7d9ff7d0f576aba3147b91a742f962e31a31c17af5b445d1e70943e5f35e5e5 SHA512 15bd315924b4d97f7fed528d5a170057faf7f3a9f205bbb1dd1a48c8098647c485e4dd9f134fbde62313250f065f222b3138dee6b2e66e96c6c8a7468ae22bbb
+DIST thunderbird-52.7.0-hsb.xpi 582242 BLAKE2B ca8de136bf8837c55398e760737bae14d30034151562efd51743dd6bf01285657dba218b9ed2f931af0df0bebab911bf170ba12f81e437b20ca0d50003bed309 SHA512 d9a0407500e0f42f18b5927612f8edf55f9261aff83d47f30c2e9a394c93b24eee39e0a7bc6686e27f4723914c89902c7ec08fbb5b6e2ab0ee8277f78d0dd5b6
+DIST thunderbird-52.7.0-hu.xpi 586446 BLAKE2B 89a28d08a74496430eab99660307c898fd5495026b74240e3e1d5c6bb411ccc5f00cf2ab220ff858d358f5302aa9a82bc871e77ed5ff0dd01b10a0cd2d6568b2 SHA512 20b729ad9e74a6bd55904568404619fd27c938313e2b119859233ff33407a7c5f744ece12e75eb335bcc4a861afb432f5a16fac6582bb47b3e855ea156bb5d1b
+DIST thunderbird-52.7.0-hy-AM.xpi 629880 BLAKE2B 8afea83cf66f885b6f722c8bccbcdf71ea7d3e9c2b52670fb7d060a2ca901402ba9c5c09146c67f621fcab8025b607685c96e4ce502e0c2dac5feaf11088feff SHA512 7abf492dcd070a6df511177f2b76cd8a1b6ca46ed0d8b5a0263bc15477774354ab91e42e34715915bcbba6fe3017d8c3aa177e00c56c5139cd0a201afbd2d2fa
+DIST thunderbird-52.7.0-id.xpi 546527 BLAKE2B b7c2fdae6e93029f27bd6241b1a165ae477a382862e2b28c4f19a3daae4a4a67e50bc9682c225332433c16db2b8e5d6e6c0dafcb63799292e5b6f1f745221d47 SHA512 36b29a38b5773c8f9d25d272a6a46a34efd76c26861b6d8c64fd3a3d77326a72415d971eb7937ed90c5be787060cbe2e6ea725e2a10248061173a93378b2b364
+DIST thunderbird-52.7.0-is.xpi 555713 BLAKE2B e221947a38e8a1d6a5cd6e03e0f6b3642c5473552032d1687fba9afac116c5b666813dabdfd975ce83074a461822ec1210fe7b660b51cf6f85fb0a05e724f717 SHA512 d25dc5fa4c499c9362f19d4c38492f0bd3e9d86cdcdce21c875f5e235b22433de176fa0ff3af8b202620541742e16f4d3f5d2394254471979ce2ca333a8ff9cc
+DIST thunderbird-52.7.0-it.xpi 455408 BLAKE2B da5dc81863a8ec83002c384f08be49acc1d613d139d2787c5ba74a996c0f66d43194b180a6078ed013dd0c1e872a0b1f5317296bebc017f8fa8f9d9caa9bd1f3 SHA512 a5e841c37ff17a6039c378ce2bcf57f62cf5d6df89634471139d7f97906800ee3f8a6ce492b293e8a868cb18c3f928429d394c4a36ed84b69b164391ff2ae564
+DIST thunderbird-52.7.0-ja.xpi 630053 BLAKE2B 94aaf82fcd4a17bf54570f4e7e7c15e64fd685ca50e8b3d9b94b6309c67ea737e16d92905a6f3934bba0cfe9d799dc1aeed2528770687b760f6f4620d8dc77a2 SHA512 726e80ea09fe34993f9975eb76d752d06f2b982802c48acef7941184363d213f9a7f6b4819462c2a652b78d743e816c1b3a0825089c0dfc42fe302e5f372f925
+DIST thunderbird-52.7.0-ko.xpi 595517 BLAKE2B b85828c902136a4789486e406048d669adda432bc0829a1b6c524412558340f21b91286f1f33c3512f867678bcf05ce5f9f432dfdf43da06977c6c63867b3cb1 SHA512 bf909e5f3051f50339f71ebe82233c49f39ceb858ba481f6874547b19a2d119e7ad57fe6b611949a38acee16380805a959375fcfa793ae1f4dcd892f0d14b280
+DIST thunderbird-52.7.0-lt.xpi 580598 BLAKE2B 139b7aa466c8fdd441b72b41cfc25632b80c6804fb46d1f7e78cfa80fa59f4b7124bc4b1698f475a06de59e9b2da16d8b11d92a783cb7b9fc063cb7af96f3786 SHA512 fcadc3e84d91c6e746f27f0889c8d0ddf9b4d68865a8324c750b0a842aca64f84924d24d72628eae68a9a571b7c5f990a3027b02b428dad9c073be9cb8f17f9d
+DIST thunderbird-52.7.0-nb-NO.xpi 551104 BLAKE2B b2752a70a915378f5e53fc52196aa6da7c22e0630a5aa04177552a758f5565eb911d9532d1dad81b4d8ce12893ef5cfba3822304890b72915eb175190d5a024a SHA512 ee49979f1c2e3ad8f14864edaeaece215ae15ca212a144b4425db190a3d14c726a7e5648000c634985a911d35a23fa8f9007e0cc6a3d7bd5ec61f9fb8f78c2ef
+DIST thunderbird-52.7.0-nl.xpi 557957 BLAKE2B 883724ee67c2e5e4ceb5bd2a08e599a84a4149078e23058fe63c78f98be8c5711b326d8dc3f6a595acb7d97a147db9b080f75d8f106dd593c3eb945b75d60ddf SHA512 9f277f1fb1af40a77cf4a7ceea3508fff170e897c6882a77c40a3405e596a4cb32e94e07bf9057ddd42f6f16fc94d553f033c69a7d25f2d369d29671812b50f4
+DIST thunderbird-52.7.0-nn-NO.xpi 551892 BLAKE2B 0b9472581591c176cb20f037271c70bebc2b4370bd7217087aabf8cbb35ddef66f3c4a8eca5fcbeaa4c064164e865f507ab7ac648ca24d01c669572711c3892b SHA512 a148709005133fbd51fb0659f06142494e62c217faea7d16939ff3abae95e9544da6e907fd0d4a231e7cf499863c62aae929000e5714a33ac167cfaf0432351c
+DIST thunderbird-52.7.0-pa-IN.xpi 646569 BLAKE2B b4251d0e8c6402601b4ec3ae0e8c4c971c64810a693db28ce00232b3daa7be94e8f649562c68d1a568cec81758c39e9c5a3f184a0d89ac7b37e87ea50c6afe42 SHA512 c3a133acc7d7f82a94b79403f6be465976e414c2176d08b67a3b8a8339548b08a513db2c405d99deca13c4130e204e354717f86409b013be00e72d0f216b6c6f
+DIST thunderbird-52.7.0-pl.xpi 469902 BLAKE2B 2e26eb35985810a68569451d915dbc6f1603b837cac1b4e2a8d6e4412ccd3c8ef79c737652e5c4f01d33e09d65ed9839339703e6d136000abaa240bade1634b1 SHA512 d60d0a25db3ef8fce81241191811afff4b8c23e1578c6954c29346dd52a69236c5907ff31179ef204e92ee9f3ed958518cace777eed5814be4f1131a4e18ffe2
+DIST thunderbird-52.7.0-pt-BR.xpi 558224 BLAKE2B f0a068f9f41f0e121d17dfed8abc837d5e06bf05fc625737da1308801f2fee59fd201c91bfd965f0dc6632caa4fdfc15faca1c8660743bc6af4706604071dd0c SHA512 e97444703049d97beb96a9cc0538c72feba772ba365c5e49f05e11d82a32edff1492f9e4109995d241df09b2b8fa5520a306da7c4ce86b5a79cf9e2fddd62819
+DIST thunderbird-52.7.0-pt-PT.xpi 565624 BLAKE2B 5e1b602db29cfd18b3b9e772c0afd41c45779c1f8a9297135a8a91ed86114a4b785151fe611475a529d5bd4aec903083d91f9a85c76860dfc7358874cbb51866 SHA512 16542c6a9d8065bf35164550a57a4be5048eb249a4a5f8fc99ae5c05c79e5a84b2db4f565363cce834de8e38505cbc92ce4f42cd1f1927bde2df7bee994d4dd4
+DIST thunderbird-52.7.0-rm.xpi 557605 BLAKE2B 57a3f888dff3daa8cd38156d85a6985052999d54598c4c2cf950de79c103e055c99bdf7d329993779dbfd4b51515887114be1eef069f185e9e3fd7795d914e11 SHA512 aecfbfd31a0731c5a2c89c731d63570ca9de04f9dc01339a9f17c54038852218670c76f969809cedc6b9afd1fa8ce5ee852c0e78ae889a8b70e832a59b2c13fe
+DIST thunderbird-52.7.0-ro.xpi 570530 BLAKE2B bc07c944e791745fed70687bcd4f378c5af6cb91cba8405d1959515cd6059ddc3adbf8b629dd4860ae67705f5826756debf89980b989474a50b1943864309114 SHA512 1da58f6f2a8da1f011123b8601931c9430877bf3446aa267591180e29e034c6ac3deebf94f07c3ce4256169aa48e6f6e793d10d58afd40907654992e620ac786
+DIST thunderbird-52.7.0-ru.xpi 530670 BLAKE2B 8a737bfbca2b69a290da6f873e926b535a55896f3a855e3012e0d7850c373956bef9136f361a89f4d4d42cb437321000b47166d6b392469f3514bf6ff25c5043 SHA512 734a28b963eb5430ebf210b492cf5376f2988ceb5afaed6685fc78e17933330b9c178bc3a8e96baaff34402da0f434c277f0592305575a1308e7b1331726ede8
+DIST thunderbird-52.7.0-si.xpi 649010 BLAKE2B 14b63ddf0a3907fc426d109387d2dab8d6e9ab9ebe73abf950ab7ebdab69616965937cdaadb5676b454c2671a513bee30ad2fc27b1bd8513837fc499f80d35fd SHA512 957d1bf1ab45f56e8271fd9071a98f3be3b9b711708c098fb46ac2636949696d685892e4ab6392b56a82b41547a0735fcd5b11043377127084ab1895dca10f9d
+DIST thunderbird-52.7.0-sk.xpi 583882 BLAKE2B 6a7b46ff516ee0572a86fa0372f4b4fb8a090cd0c5f11edfde58d2a7df37d98b7bca3d6c38cb825918d4b63156090fc495ba191ec43fe224ad1cba9891968ec1 SHA512 793520668940be422ff96d680330a6b991ee49107aaf13fe7f475edfc35c1285e09bb4af55a7fe1ffe6839ce44d174cad4c4a139904f7a6c5f5cf733ab9ba50e
+DIST thunderbird-52.7.0-sl.xpi 562835 BLAKE2B 04cefe89e64bc85ec7baa08af71d1a2a1a2bd1fd87da526c09092e2ca4903613f865d794b49ac9e4fdadfa29b21dc9898463151d6c8d5fc9c64dea6f590a4d91 SHA512 55a79a83bec3aff011cdfcbe80f39a927371703e914ffbe43b99b6104e8de77225979c92b7942c4bc74fc222a2c08a90ad52273277ff3d738f687a0c20d66f24
+DIST thunderbird-52.7.0-sq.xpi 570616 BLAKE2B d27017442693bf342714b9f46010078eec5696c45cb81c5b3b30dca45af78b872c3850b302e690ed70485848e67df2e9e89523de714479a951b7ffcd6bb86e5e SHA512 05d927adaffc6ec7d187e2ad62c47a43ba69b33bda764e5196666aabae7127e6ae6e753fc13a61add339df9a794c0f78e9c145c45b5c6913dd29801cdf9591d4
+DIST thunderbird-52.7.0-sr.xpi 609020 BLAKE2B 824ddde4977b463b962d8484405ee77133276996c9685bb96bd3a1dc56d9142403c1bb4ab3052b07f335b09d98e0bb29ba1288d81a0736ad0ed4245f008c5e0a SHA512 c3cef0085050e1f2bc155858789bee9a699ac43fd859fe4b3ff32596de92483df9f63e27b28c344c127441e51b9492827077e83d77545f208a0c876ecdc53d8e
+DIST thunderbird-52.7.0-sv-SE.xpi 565777 BLAKE2B c55abc8259102c72840510113e481ededbc2e657b7ff179a31d27b52da53281bbfb9303167594a41212fdc2540434a6b54ba9f2f8336a9e8cba8b085e1d00056 SHA512 cd1acab8f60d4db1afed1358866ce2eaae7a032ee45a2616f5074868c4afb08049dfb5014e4fc6eeebfdb6f2f187d0afcb342d89b1896c5484ed6825faf974cb
+DIST thunderbird-52.7.0-ta-LK.xpi 675039 BLAKE2B a9c09bb8bb96ec555dbc9b4d363305244d5ae05a29139968bdcd74191d061fb335b908915298aadbb283b435ba8e8b59654bb3c748e18c1cec8d810562607ce8 SHA512 83d511ca833f6a37958b8b45f33a4a3fe23413efaa04c92fe40f192d31bec8623046ccf669cdcd21361c66f7458923810b95db099267cb1b5f97c50fe70d4c07
+DIST thunderbird-52.7.0-tr.xpi 569926 BLAKE2B aec66b4dd9f268ef7880598bb13b2dbb82b232de9900e2f038d6ae3066e597e2c5a60f55eaa55a82145fc902a8179d1efedcc7064844692b679aec734ea5ed64 SHA512 a15aa5cfc11c5708b697d82fbc0c9611fbad4cf4cf374fd4b989b8afe687dde1c64c363e18093d6de845ba7ab4842b64661e0c3893e80aaf8c9438e517e16445
+DIST thunderbird-52.7.0-uk.xpi 652855 BLAKE2B d78bdee25c519750ae812c6d69b344239ea41b46ba5d1e3a3e2b5681cac7dc5f460a7168e0b4a3bfdb0b2efe44714b879d484d14abdb8037311c06ba294d6c9b SHA512 6791d3a192d4975b188d4dc713a43726a1d30e5321c69a93b9135d2608e83e665e868b2a681115a5edd17536d5653efde67cabac4d712086df89425c46df5d00
+DIST thunderbird-52.7.0-vi.xpi 637164 BLAKE2B d9b33374ee657248f3c83c41dbd7deeadc523ff9158dec2fdf698924fda0a80e805b8c1f5c592fb67b663b7b221e494b7d1af00bc4530c7bbd0a27a844d0efc1 SHA512 e0f914e55174c5827b887cc2dfb1dd5e63be55b46fb40c2bf6bedcf7b5f06201ca12535e732806f9278d008da02df8ff9cadd01b3b8b893d630e2072f6ef01d0
+DIST thunderbird-52.7.0-zh-CN.xpi 593612 BLAKE2B 51027d99360c386d9f61ad1049f239757291bd0eb449ddd247263d139a4b583bad6ceadb14a0a5ac33a1ac0013f635837c6c6b8fa04e6b856c0a02bda9169d81 SHA512 e3a8b15133484760f6a9acb49600f979f62b194b5c6621cb5ec9805317de49e58a79692f9c69b34f03af119de31e54f42cfd43434b8a0e0fa26082e7746bc92d
+DIST thunderbird-52.7.0-zh-TW.xpi 595729 BLAKE2B 4b2877e9f45e6d64cfba8ebe41d6d832e5ee87a667ce5c778d1bfb651b9d18ca1abe34125bdc308d226bf79f67505ebe1de05cd14dbc7aa0228611a2f9d00916 SHA512 9aae56ebd2f3e13f097927953d0a1f7834a68d7d37259a2bf425a88d404b91da9488aacf64bda89bb6e35856e6a1a4e6d26d636915df9f15c49fe5e781a0d35a
+DIST thunderbird-bin_i686-52.7.0.tar.bz2 51178246 BLAKE2B 3f76b8de1cd1ca2d19d5c1a8fd693d850319b532cb71e7dd9a0fec6533af50ffe628c1f0412f26da335c4fa3243944a29daeb4b0adf65e70c58b38381c72faca SHA512 f7f8bf3f74052310987b546bba0f986abcfd65e53125c2cbde4bc4744e27de054f21eba8080313c28c9c3b44de1d773e4471facc9b71f520b6085c32cfe721c2
+DIST thunderbird-bin_x86_64-52.7.0.tar.bz2 49902909 BLAKE2B b5a20f7dcd83d66cf1075cce7530a673537f77844a2f5d58991ecf0a90e449011ef70648976197fb918ccc5e9eda7184d912e949913251b5f8c7b99a923f7efa SHA512 a8f4cb2238c3bf0ea6e4f8b444991bf0d6a4fe42cf7c0e38ae3738167900ac52debc0daf8bf4d7fb1e63326626072fc498db6b227337eab82ea48f2fcd561334
+EBUILD thunderbird-bin-52.7.0.ebuild 4742 BLAKE2B 09cf322050e3564ef6f2969b651db2f000f3ed23cae73ad1904f2d4065eee0f78cd86ce8638d908bfb8e827c06e9ba7f6d1361792f734877882411396f1dcb34 SHA512 b9ffb328592f8ccd8c5a7b6de292158fc8fe71768738af4a2be150c22ff513c6927e6e109c0e167a16cd6308b0bba4a255eb4a4f49fe9cb65aa9fe9e9605b0f3
 MISC metadata.xml 329 BLAKE2B 429b3afed246e9243db4ca334139ee4a5cdf8f34c89fd724a718a1d53e88ec3afc96adfa194c4b8f31da7934f1a59348af3bb94882e95b6e9a23ab14cbeeaf42 SHA512 8710fdb1dc3db7de4980029b8c0e2e1b3b449505c3878c955e519b50715a5c82ed16a120e6e259a1e4a56e7e39162e7b009d5db8ef4d96e607e89d48161d1e7f
diff --git a/mail-client/thunderbird-bin/thunderbird-bin-52.6.0.ebuild b/mail-client/thunderbird-bin/thunderbird-bin-52.7.0.ebuild
index a0a280b27aa3..a0a280b27aa3 100644
--- a/mail-client/thunderbird-bin/thunderbird-bin-52.6.0.ebuild
+++ b/mail-client/thunderbird-bin/thunderbird-bin-52.7.0.ebuild
diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest
index 4f6e0a9c439c..aa26f863527a 100644
--- a/mail-client/thunderbird/Manifest
+++ b/mail-client/thunderbird/Manifest
@@ -8,7 +8,6 @@ DIST gdata-provider-2.6-r1.tar.xz 83836 BLAKE2B 774458132c914cd0165387f2d8c1ebaa
 DIST gdata-provider-3.3.tar.xz 85628 BLAKE2B 2ccde620b181a2d8678f50d7107373886f3b2e7d1d1e8861c4e42602cedb02108d28e0bf5e5cd9e31474356b70cb99baa7870e20436bc72e25cd8a8fc1353d14 SHA512 ae0c0e6fd42d6e7088256ca8a4be5b0bac84b2f331b51afdc982354caef60b6ba631d4f76bfba7523000b49235c8f8c63704d90acf24b34b14696b709be9342b
 DIST lightning-4.7.8.tar.xz 1951252 BLAKE2B df8900cacfe660ad17454836893e7199b8590d47ef093699afd135e0a39201cb43dda8d581a36b5375a29c43bb55dd7cb9479dcaf02f52ee8f4a454fe3d426a0 SHA512 37decaf4010e48cf242e76c5d73caf96f7b1e34c67fd465fb8b33055a6986d5fa7b1557862526224ab4ac421df3441e974d297ec4a9454dd63a039683ec46fe6
 DIST lightning-5.4.5.2.tar.xz 1896864 BLAKE2B 545db49edb693696440a48e1b4e0367580284815f918129fe148037312a9950887cfdbc4d41719f8cd8eb47ed193c8e29c10b49dfb919f8bc7d362e07b238ff6 SHA512 544961df074123548c7d71ae195835a17d861d74f838849666380ba6e2975179668d79c2e8053429eb9c52a6b315335e109c942ecf498f48f5729307334a174f
-DIST lightning-5.4.5.tar.xz 1898160 BLAKE2B ed8c2f54140444610fdcc91e375636d53d7ede9e70e114e072a55867278130e09bf54bb4e04cec789efa47ed8e92586b2217b53663e6057d6556df1a5a25f48f SHA512 621d21c20bd74271f83ce9eb89b1f65cb43ab6182793bb7b9b3ca04799644f6700d15a59c6b312459d0471f5f243c3b9f534d1adf4bc72c36c2bd04f2937e3d3
 DIST lightning-5.4.6.tar.xz 1862620 BLAKE2B a7d1d3dd1926844aba7c83378d672317e3ee01ea0d96d233471dcd64cd16af7f1d33c7b2d58ce7539f13874a93efb65edd3329b522eb69f088f734934c5a166f SHA512 10deb6990c260e9b64e08d4a562f6ca496299e5087037632ce082e063999e9af0b0f9fd45df592859b802c510b45818f123a091cde2105167985f99b63031abe
 DIST thunderbird-38.0-patches-0.1.tar.xz 684 BLAKE2B 5f55008421169da375e5cca5e3e4944c207e53b194b7d7b6bc0a589cbcb38695ffd4b06c1f9a8adec9c6affc41717f3a4f0e7da2d8aca647cf8164b6f4834a78 SHA512 52c83af301be959e861dfec55b3c4bc60035387c606976bd29232c4cba077230edcadef242491e699fba10027d0408dd4f33fa320bcf96727afe149166ca02de
 DIST thunderbird-45.8.0-ar.xpi 490775 BLAKE2B acd6914f3792b71a2245c8cdb14f143ff3c3b0f8f5176d2808fbaead0c0c57affbc82c26075d7e3c2c31658e29f038200252ca726a4b9ca0eb8fb8e934439301 SHA512 95adc2355a27d916f96c43bee0d4527990a1eba8cee9e4f85cd6da9202ea0ff4fb89fde127abce03962e185b272f5bbd1d8cfb032f6f32c7895bf3dde8d35a2c
@@ -68,63 +67,6 @@ DIST thunderbird-45.8.0-vi.xpi 540498 BLAKE2B 196c681c121b0d8aafc34c29e8fb616724
 DIST thunderbird-45.8.0-zh-CN.xpi 489209 BLAKE2B ddd2b7b6b282a6ce0e2be337fa5d139c2cdeb11a8a61582addbaf1eabb3880de704f2f275976b89f6dd3662f22ad459383358187e3c19629731d268455e382e7 SHA512 346e15d8bec51831c2205a653e84735abfdbc6db1266a8545d138ed11f492d58f3529fc15870eac3c7c28cc60300de2fde85b6927338a2c8fb03ca90449f8a81
 DIST thunderbird-45.8.0-zh-TW.xpi 490850 BLAKE2B ca3c29580b561ee525c2d178dac36a87db12e07c261807d9becb1584b6c3c2a0e14c59f6e3738d65364ee69dc96b19569a0824fa32ce063ac0e23e98b04204df SHA512 0b473f3eadbcc63225c5f2b90d6be26d79a139aa72120d45dcfad4a22a20309f11c4565e72bbe9281f0ea0fe508173e046d3f747975f1619f6717835361ab70f
 DIST thunderbird-45.8.0.source.tar.xz 201199348 BLAKE2B af3f228ca23b1cbaa8fdb37c0cc303f9d54f8767f1b7af4058d93d9b013f8ba501041d104bca4d553dde9cc941b0474024a669bacd454a1cf08b660d5d42d728 SHA512 f8ba08d874fb1a09ac9ba5d4d1f46cefe801783ba4bf82eee682ac2ecc4e231d07033a80e036ad04bda7780c093fb7bc3122a23dc6e19c12f18fb7168dc78deb
-DIST thunderbird-52.5.0-ar.xpi 604235 BLAKE2B 88a5df7e0fdef432a556506c86cda2c92a938c0efbe240b21c215e23ca225beb3375600ca744c72fc83032114f8f99904838bb9ea596de4c2b079af11c9295ca SHA512 2d9b168f14fac07d66c7d889b3d28061f5f85eb6c60d1f8650382cbca3749bc3b77cae67ad707f6c4bbcb956eb2003abac5734040b289a50ed21fecd3d2ad12f
-DIST thunderbird-52.5.0-ast.xpi 541173 BLAKE2B 6b71fa1955c959708cd276322c2300df5bfa4a20d4f5481bb8ae970b075e49bbc5bf151ad4f2208e326901fe3231a595151f45e1de6e0a68e51e633141c447b8 SHA512 e4955ea38a41126f5304431f0eaaf06a01a7f186b9ac52867ce2df098b5ea761c97c8be4ebebd4cb6598bf7dd6aeded6b257dac1ce27dda8b719877a275e7ffb
-DIST thunderbird-52.5.0-be.xpi 570932 BLAKE2B d211681c14a3c7e7a84ad389b83a9bce40133adc873a2ccde25be32146c85835bb5cfe62621b1498c77ab55446680f15f0b895ad9e24c1904beef658a1a7cf6b SHA512 da8eb62a4a1704c0f14e8043fb4663db706292c15c3a89b770ac7cab7dff606faf285454ed49cbfdc3ca92c7b10f07a477fd7036d740ac2e18d35ce0e50dbf76
-DIST thunderbird-52.5.0-bg.xpi 634897 BLAKE2B 19aeb457e3aebc495dff1ed92824e0a3d10f3a10c0284fa1428f66597a337d6a21d312508801d9ebd0d5cbe82230fe87a75e5dea06acf951f7ca0c527899cb07 SHA512 019326e813f76d38504f9c327569302eac6b58117ad08075394e4bc12b5cf0f576fea9a0755c233ad27c3cc566670dbec9e70dafa6ae2c7d919741909494008e
-DIST thunderbird-52.5.0-bn-BD.xpi 676901 BLAKE2B a9180c4f2619767c35db63c5ef95b7476e714d5174d6159757e007450a21774d004731caa8a0ebcc6e4d4aff8b585cc5635af4e5674679d4d415b2a1c41ff711 SHA512 fc11e8b4519f05864690ea7315f13261e263277c656ef34b1c882fd66f9a3664c15cb2f26bc99eefa23ebce6e4052aa749072780e35b8163a0c4308145c8530d
-DIST thunderbird-52.5.0-br.xpi 559380 BLAKE2B e432329ebeb50d2ef8583ff24ea440d4e058c41be8542b872c3f3c0bcf0b25323d22c3bde5c4cb4aae2951b892b8012aa6159ec6dfd939dcb29c84bf3a462f20 SHA512 ffb5192d90927506c4c83669729b4e459c555f272881383a6f8f479b7285815bc11ee7dd7eb5fba8332e02ae8e4632a212832ebc183fc47258dfadf7bb5668fa
-DIST thunderbird-52.5.0-ca.xpi 569910 BLAKE2B 9b26e688bd60f0badf3485eb13ee7887393b8eb6a6414fd2e6c6fe133df45a83f92d6c5e89299df088302cfb1d6567b044b27c329a534d5a9de2f615828f0e03 SHA512 d9cb6e643eed8c110df555fc9e5b5b8b8b07d1dbd189fe4a9e5b82b2c0d334fe15e45000e321efa12571df440fc484587fe676d645081643b7a6d6e178db33bb
-DIST thunderbird-52.5.0-cs.xpi 579150 BLAKE2B d46023334829eaa3733c92bd9be3105dadd752a5bc528c0ca67a25663684d7f056ccbe641527ce908c02927ebc2bb4ca060f5cdadc351921f6aa1b19c3c34fae SHA512 954301323aa6c393c99bb92a1a220bc2045047c435b4a52fa5df437c8a6f3a679d1dc58f3550f727e2c3f917a447776d9bb39961254cc297bdc87be344a27c0d
-DIST thunderbird-52.5.0-cy.xpi 554858 BLAKE2B d791fec5e22706911074c700728603ee508d54fd54fafcdb00e971c3fd0dcd5dfa949a047929fe311cbe9396c1309b2655c68a5e6e1377efb6f6001204070f06 SHA512 2f5bcab1d3dc6d0eafd22b54970b3cf16a00210a15ec24d3044f7a60672b34e4d5e3a87c81054043f06d1b1b96db1f7a6622d373c1002f17dad20259bf934a25
-DIST thunderbird-52.5.0-da.xpi 543335 BLAKE2B 2b749174b253e501e8d274b1d19190ac97e63e869b4b1b88de351e3c56465a078221337af063b8fb572f2596a0e45165a50d8b5657064ffaf48a10ad696df29f SHA512 f1a1c53a74b015f6af4bc76036fd6f91da3623b134d9cdbc400af4eff89a1413e03875cb6f527e61715954f8aff7a0ccb70ebda9d87ccecf5e6ec156a7bb2226
-DIST thunderbird-52.5.0-de.xpi 555744 BLAKE2B 97984fb6eb5904ae74b78745d0e2b5f522541eb6df5321fdbb82a906cb22fcff05e3a78b3402497eebb846b15c66fb839ee47d08bf7118006789e17fa8dab4e4 SHA512 65cc8af943713e0131878226d3ebf0e5f27aea3a3305c3d48605522bf31ab091662838009db444671da4aab7c404c1ddf03326c5111e786bf30d8ce2aee230b0
-DIST thunderbird-52.5.0-el.xpi 662965 BLAKE2B aafe9fec27025928272b9dce295a1f5a9fbcb08a1fa3b19282912aab6d1491fb4a4bc5e58c6ffe69a7b21cfb0a1c39ed2d0b7b1efe491040d4fbb702e480d106 SHA512 67b0c8c3e3db77350c41150fb9ea0c9093949bbc6cdfe3a3e9091248b323cc9b727091f6448f822121fa37679b08332bcc254f92654876ebf587b9a0cbfc5190
-DIST thunderbird-52.5.0-en-GB.xpi 531234 BLAKE2B 04d28067331617f6b3d93341a1b98dad4b23ba72410069e416f9b0a40c52fd5bf8071900062b86753d3b373cc10c42bed5a0012f70040d75f3c220759c115153 SHA512 8174909a2a4f4a504663242120762b24598c8e2163f283c8552f9a605919aebe8a4fa44759d70a98701d2c5b09edaeba41974c0698dc0a04e2fe36f78a3c9a65
-DIST thunderbird-52.5.0-es-AR.xpi 565995 BLAKE2B 2d872654acf33db83bdf84c327eebf362e7ee7943528a68116eae385f39bc31dc9524430b5b8936ba74850b8a6b3e28fc30a3d9a36ab1853e12401aecdae8391 SHA512 c4a71393007c324f2af25a0f9d896373f4d0146e6e62a5e1a724a3f6318188fc3136c436d3271047469234a3c85367a8bb9d3814a040b828d0ef6598f87f24d6
-DIST thunderbird-52.5.0-es-ES.xpi 445464 BLAKE2B 61522b456af3ab6fd90e4d39440a7b5f89e825d299770cbe84c6ef3e2e6b7966538f56744a6bcf7a440d04287dcace0785908becff7e83127c455e4244c044a1 SHA512 dbd1f45f5d4bdf5dd2e43330bf75fdba5b7e30f20e55aa1755038a06be7c3a417aea15105b449f35a5283922c5e8af970af607a23563f1a81c98ad2402082b4c
-DIST thunderbird-52.5.0-et.xpi 551661 BLAKE2B b41932ac5fc5814799a0c1b05d6ac70132a9ead4f727ff6fa5eceaebb4ea4c8bd98745f09a0efbbde292cbf686cac6810e72328958cb5f23814a79ef97fad15c SHA512 ac4d5583068b2c5887e0bec86354c821153c57b56004e61654f6b6afdfad7fdde21ac01491b6f2afceaa347093ffdf6fa87e8954670210a070872121fbc3fadd
-DIST thunderbird-52.5.0-eu.xpi 555536 BLAKE2B c18fdeb9b783e2d28d2f611c7746780868450f0bf9fc491f51905e28c96ca3080bf5c949798232b387844da9cccb8c02f434db4359bd15d19868c0e682cc5d61 SHA512 6ad3f52d2c0bf10dc73c9d8eab08eb2a1df655e4061f0d27f8f8b7335c3c59041f2af3c90ad1bbac04491c1633a58e597b3754788905f82959467c74b6423f1c
-DIST thunderbird-52.5.0-fi.xpi 550669 BLAKE2B 41ae17c85a88a3a7aaeec287eee9b5333913b7b18d382f0a0dc7598c7a533cfc2d90ff39982aa288d2bac73afc7a2debb236469b72d00c5d28ef74066ffd5e3c SHA512 4de837d8651c302e0ad4f0243e791ed396d5ed9842128fc45d13b1fb128fc94bd070ed526c08781cca49a2f72d8b77f30a0caee82fc39c7fba56d4ee0f712fd6
-DIST thunderbird-52.5.0-fr.xpi 577560 BLAKE2B 9f19bafefe36de5336b7f51f7b1b693cf62ed9ef22cdf4f5d9dba0527bd25d3a380ac90bc90fbe8c9d6ce66137c5bec333ac71159a51c87b68d20dc895473551 SHA512 3d2df00ec8bc2ea92da1a2d820c15f34beecdb5a16aec9c8a3bae78e4c5e6d4ce50702f107eb626f83ec145df1387e4a2890b3de2e809a46299c566806ac9d63
-DIST thunderbird-52.5.0-fy-NL.xpi 563632 BLAKE2B 93c83a0e6d3fb96a1e82bea6e680add7bbebceb4fb9d68f2eeb7b889ff81c29bf4d4b0498175acafa527a245af0fe31ef8244bd907f7f0da21112ff18c2a76a1 SHA512 7831392bbb24a84cbe32e7f1142f0e4d5e880ff3a23110a48de97b4b121f02a141a6d5baaa4e13c40195703a47c49cf08a61490c10dc6a0b6da22e9e4955151c
-DIST thunderbird-52.5.0-ga-IE.xpi 583556 BLAKE2B 09a3ff06cde044ff565c5bbe926d3b4b5e545a2b697bd32604db168462857100ea597899da14b276945a98626dfdf7c567cec1a4dc98b9b652b4dfce05f6b2e5 SHA512 8186daf635e3a6afe3ba3986cf4b7bf12f8e8ddab399fdd14c4a2efa591e059cfeac529b8f4f67f2f4b93d4625705c4cad9abec99bfe6a4058dadd64cd350f76
-DIST thunderbird-52.5.0-gd.xpi 574065 BLAKE2B f7e751bbad43d103026108aa61d5c55a3ebf4cb3e5b98d406cbf49900cd762403cd6f1492cb47820f59e91f7833fcc42887cac61181ea872967becef1f067452 SHA512 dc9bd843f352e5915305a70767caefda7c6127316fe36bbd8af2c49262d05dfbb5b12f3d2b0c0e9b5421e858b467da0ef64e93814b020ee82507186e1124eefc
-DIST thunderbird-52.5.0-gl.xpi 575150 BLAKE2B c16c9cc8c9d19c4539870b890f887589a44ba74f296d5f9f216cd6837928254bc9aa98c6ad581104a7e2ae4a71d5eedd1503968de483ca477e1f242c77472f16 SHA512 f15f80d5119465fab34c2a316ac5d8f12430f30237d8fc0efedb27cce289ed4d4bd369bc741c9e5759633c2d8972477c5a74d0f07249460496aaec4b6ef8fc9e
-DIST thunderbird-52.5.0-he.xpi 592566 BLAKE2B 7c93e2513a57c94567fb457f72b1f6905c48faed19d2f75fda40568f715990345be474e66098e6a8d9836374f74bd16a50b72f37a5e0d6b27abda3d5f41b9a8d SHA512 1c20c22f5af002807a376ceb7ce0171889310c95c668c3258188d38d0800f2879295d9c02196f2e2d500b79a3e504b96f124b320bc9d8c39fbe1c7ca241cbab4
-DIST thunderbird-52.5.0-hr.xpi 564779 BLAKE2B 1a33eb1a4e3d9c3f00b16254496b66aea03017af48720426dfe3bca244c5c609fb9b073d4b764878aa0f4ce4e9d360fa8b5b6253263fff50c208d5e449e45de6 SHA512 67ce0be04b6def4fd8623ebbaa39ba52efdbed423656c2f0d701b93ea6f0460a3987454a4f964000a58af30f322f907bf552af50426cfbc9a4fd5c01c7261570
-DIST thunderbird-52.5.0-hsb.xpi 582241 BLAKE2B 431fc615e50dec9483042a6fb8f8c0a33c62902b86eaca57e84ab9e9ada73dc55281b37eca410c8cc8f37a6a1115f60a135e05efa8ac3578532141cbcfb6ebe6 SHA512 17a5f81d513cfd4f1884a2e44f3fc58eca57a631272bd3799ec120e2cca5090d04c7c851abc501f5b8c37beda0d23f1a5bd26e9f0c618bf0f5b75d67035d7103
-DIST thunderbird-52.5.0-hu.xpi 586446 BLAKE2B ff1ff98cfa9e2f7c3575f0514d6ee25684629743c4c6a01545f577f907c1a041e02b38d0ce76068f207e8888243c317ba4c07a7d22ea3512ee7a4bdbf5eab8d4 SHA512 68e9d71884e35668d96d858a3dc6182239858504107c3eb1fa0713fd131744f64fc5d6535b45e5c93dee38669d660d17007c5cf714fc8b929c5294c8d84ed68e
-DIST thunderbird-52.5.0-hy-AM.xpi 629879 BLAKE2B 4816013e9bbf5095791d49b246b01297ae32df502763be5830d7321cce7a1a4faad25a354d842112e95fe428ac5a187a69ed6e495ebc6d07b6dc0974472c6b5d SHA512 6d86a09a2ffd163d72e692563815210bd6fdbce1b9966f2747bb4e8c1c41fae148c6f281e3d0fbded28cc774e1a50fddbe6faf47be7cf8e66c622329c826fbd0
-DIST thunderbird-52.5.0-id.xpi 546526 BLAKE2B 43ca989f024ece6942d31d91599a45ff4683aa24ad72cbbd600a106dc0c7e189e1f229d0149baa89f80b75335dbc63036046a6b45d8f085fc71d050d807c50b6 SHA512 5a575ed2d2d16c3e3cd90b750f6d979549003af602ff42ae9bcb22a6a007fb9fbc4ec5bac8ce8c164c02c8468b4a6158901a25f906d9c3cae3a0c498c18d94a5
-DIST thunderbird-52.5.0-is.xpi 555712 BLAKE2B 8697b56ff12edbcbd5821f4a7eb04bfa411cc4c280e2d893cc8333b790bbac6ec15eb6b651038ab1eea477ba7787ac265f1abbec38a22a4e6f1642a53655d316 SHA512 5a956004611f04ca3206047c18dc0dbe7be718e14c6781de32274ec9535dfde049e9fa994b6820422af066057e0a5f7ed649957f79f77531f9f54f0503f9d0e6
-DIST thunderbird-52.5.0-it.xpi 455408 BLAKE2B 70551c76804a42b7ecf60208cd128f82d4426fbeb544c6af4e7a3696ecbfcf479d250e4e8cd505c0011744da5978680e0da192e3cda1214387fce16b157e61be SHA512 3dd6fffded6b28fbf604d8ee4ab30dddd1428d5656a50a16480de3bad7284a5035239ddf32373a319fbe7eb02086e16b767fb648148ecaa46bbe3f6f2bbe2677
-DIST thunderbird-52.5.0-ja.xpi 630053 BLAKE2B aac1a26e546020393aedb6d1c79e54e34bac01d54cc05f88a50a4e7d9ad8b49721ffd0d0a44f5695b74c209841329ce708379583554c1e44578de26b83083d34 SHA512 f70eb783c9a3271f89e009b60af7db1635e91225756034d85fef1887f3fcf1a4692526ba28ab6b5b6af2c297875251323746e86fe1ba2c76d8e9efc9105dd8c3
-DIST thunderbird-52.5.0-ko.xpi 595517 BLAKE2B f59263a41d570b2d644804d60fbbbe5ff12f5b12238e5be993bd1a875354cbb0bc446d6ce061a6dc41a9d414efb905bdf1028f8de4aa355ea2e38c784c2b153c SHA512 77403ecfb6b94449da8ed64605275bb22252f322b04d2be41359885a06c4ba2c8a45a441f4d8a5fc0abd1b1441830a54131f0cfa38828327f8ab3e162491a950
-DIST thunderbird-52.5.0-lt.xpi 580598 BLAKE2B 83ed2d57232adeebe35222fbf31950edfabbf6ec241f31e71da9563a2731fdb7dfcaa7dd97c8d5e4a09176b25f828c9eff5cea9d88df610b0943c33c9fe10b29 SHA512 e023acf509b5340bc5de83c02b9742d4035612092638ab707a9cf4a024478c6790e921bfa121d5c34a047384cb368a39424224459a070eae419c2337eb2c5de3
-DIST thunderbird-52.5.0-nb-NO.xpi 551104 BLAKE2B 2725e387fb7b55572c65e2b7167c658c92eb983e450fc593c3604811ea39ea44b7116debcb918f66faa32cdf9b1c765158facac2d06fff9a3f9294645d6bc86a SHA512 10c924c9d2e72857a6a6adb144603b0f93658bc17f4ed704f2e162ae9417ba29291ac3cdbfe7ab2f6e505057202fcdfff56e5162e1ef749ec36bd37eacf3420e
-DIST thunderbird-52.5.0-nl.xpi 557957 BLAKE2B 7ed32555605b5924a0f9b30afbc78169ae0d2dd665571fdf22f8a2cbc6fa6b3ae239feb0402a44c590680527962c2dcb3d743ab708db8fea160102de1307b6ff SHA512 f2a67dba86f3828ccb232429f5c4b0e32dad05b8c302d1350fd1a159d6a5772a46ea459a86f6c31b830e1a70eff7c2a6125aa389a66854e07fab8e90cc1a81c7
-DIST thunderbird-52.5.0-nn-NO.xpi 551891 BLAKE2B b468262bd05291ce7a0123dd96e1bc0aa8f385ce67062db5f9c0a8400acf54145006e04ff72a8968e44dd304785c15f56672ee85433fbde0b26f3f195ec2605b SHA512 7366eb30267d55de6a064d56013335e95d80aa59d11f4637d56332977b204f2ab5f11b0072d1eb8b8f25837b2dcd3638e8b8615d2cdb1abd6df073a739b7b654
-DIST thunderbird-52.5.0-pa-IN.xpi 646568 BLAKE2B 06f6a83f43ebb1bd00f4d4006c14820c6b4894e8886406ce6e40092a001166cf17e37d8934a10dc3ebb60f3015d47d91170414954aa78102d74dfc8bcecb5d62 SHA512 2889eefa4a415568277ef91ad83aeed37813647b4562a2b53c4ec3495a4fb9ee9eb71d91a1769ca2a989a8c81770109d69af7de588fa95d1f99b45c8e81bbf3a
-DIST thunderbird-52.5.0-pl.xpi 469901 BLAKE2B e8a76d7b6304a6d6097ba9b250413c39bb1cb3f3faeffa1ebeea80c87fb6d4774e1f6ea1fff3eab134af96b6e5630335e72fb912184d53ef4a1a5cb485ca4a3f SHA512 53f4286d772af127f9233885d02c9e893ec6429410a9d1a6a49180a67586a8ff7c2463b51f8fd8e8c73e5ec366a2212755e9499e5f902be3dd00c0d7d1458405
-DIST thunderbird-52.5.0-pt-BR.xpi 558224 BLAKE2B 08282d08815a858e2f0400f9ba6c48818d209b3bf094933c4312d755d28b6a445ce7d30838eb5359f08cc9346e14618a9bef5cbe983908cf85b778918878391c SHA512 83389cd51ba83640a5006aace0aaa42bab3b80fafbb35d78e04b214bd74761dd12611410e6427feab832977934d216fee9521c971bf63463d99a2042a73f69f5
-DIST thunderbird-52.5.0-pt-PT.xpi 565624 BLAKE2B 45cf9cc79546036d134837f335d4949f07f9a7eda0fc61f7b04636fe0826b6334bbfcb476861cfab3e79385889cf18b4a8d2fab68eb16ba19d3f35a2c84a3c79 SHA512 2814cfc4a2a931aaf0915e85423acf2cf9fb775d56c85c768d35861fdfb1a0c9e3487501956c701ea357c11f6fecf8e2e62553d886e92eb395a1ee2f585faccf
-DIST thunderbird-52.5.0-rm.xpi 557605 BLAKE2B 2e47d2ca7d4dfacb20ab278541fc03a5fc09fde8193e15317782c1218bfca3eaa44f9c2a556af1f5d576942761267a1f2c4fd2cfb87240eda372347a4b00d077 SHA512 a9156db559979faf61066c2ce86587ad9379150973604080833674186a68361db8ca0bd47226dd11533fa82a79339b39a169b07635d5518f3d78e8ed001b1e7a
-DIST thunderbird-52.5.0-ro.xpi 570529 BLAKE2B 0753d98efa390304971e527fbcfd35ce62252f2d7ce78830b6b26d53a617424ce841609c8e1bbade5bb5578bd47719c8e62b72fa03c2b1bc8e420160df05b5c7 SHA512 983f71665dc67a71eef5b18824234de16fca3ba9eb53dd646f81a85e75ff4669ee92e5204a757d9b128acb8672e79e1c9f29b00964d4cbcb786045577a2cad52
-DIST thunderbird-52.5.0-ru.xpi 530670 BLAKE2B b4501960d1ede8aef3098b31f1acc7104c16c73f03fa76d73a54f39f538446a9023a959125a7ffa36570788602db0ff2721852fbcfee8ac8a13777d159df9654 SHA512 aac29ddf8f0570107123625345ae2924e5b37a5b14bc03f36e97c19ef942c2ac363635109fd81fee5de6c26630d12626f6816bc6496b8a86aa8cff4553da9185
-DIST thunderbird-52.5.0-si.xpi 649010 BLAKE2B 678636c5b08ec3ddf95f9c98e0cc03dab7075f337b0ba5fc1b7b8bfee37de9c2b6ae4d61c8ecbf0c8d4500e001a231b56efb68624ab295ed9c491adc8d052de9 SHA512 a5f65bc7c54a4b364590085689da6c0ab726017fc00a5cebbbdf9e6396888dda8666823f371d7ff9850c571951acffba7d7a4d3583f350dd50ef739ef74777de
-DIST thunderbird-52.5.0-sk.xpi 583882 BLAKE2B 99f06187a8712597b589b5e6a24d3399eeae53545c429710c14194f3e32aef87bdf8660aa292356d1532d557509c2e5817733be792b3c7fbb35ca9528984c4a1 SHA512 1705819cff08feaa188d605d886e167c26a03599fc71929358e1a6b9b66fb48c27546541194691bbbbcdabc81238ba3f002448fe0e50bc1b50ce1173b8edeea8
-DIST thunderbird-52.5.0-sl.xpi 562834 BLAKE2B 4f9750554c983cb702a8f2bb3a978fad687f09e927ff05391caa657dd1531d142018ef5720f5079a065d78bb20170ee7b8c7a746cf9915bdec8b1abf05008889 SHA512 2e2700a1d926d353649c5e6edcceb722d8a5f4d1153f1d950390729565cf3e53539cfcd17793c3720c247ddd43d5f540a7cc3ecedacd15f7fd6e60a5b03c74d7
-DIST thunderbird-52.5.0-sq.xpi 570616 BLAKE2B 3b889bc815565a022858e02877c6905b5621fa804dd1dcbc926d80541651ae0217edfdb882702088b159e76e1741f43b47064398e3d7d891b74ade9835baebe8 SHA512 64c060517aae4a6cd7faecf682a1ddc44efbb5861aa32f215936e04e6f0338acd985b09166d2827844a6582b651dfb3f5a13981e702d19bca550064319259c15
-DIST thunderbird-52.5.0-sr.xpi 609020 BLAKE2B 831a41a1b4bb653d0c33f8fb54844de6590bc28c852179402ebcde8866f560dd5518dca69e27f1e59b5a39e8f49e33c40cbcb2eb19e31532d27fadd40197062c SHA512 0e440a6311024aecfd01b95a3fd0973e38e52784df18d8d7dbeccd447116d0f2b84c72152ee7d93083e2dbc5ee4acd9902d7a5ea00c1030552f14bccc10f337f
-DIST thunderbird-52.5.0-sv-SE.xpi 565777 BLAKE2B e8b7cffd686bc936c0c81ebd2eba025a898ed50c751969be49df2d2e877f80d9b4facdb142bd080d448e4169db9a20536735605bb4c6738bbf34f6dd65671ed7 SHA512 a1cbbb81b7802c540669d36f2899d486f99343172a52e3ea8519a7b701604309b232b696428284495cefbb97d9781ee5e39c0a45df8826d6e25e841c536025bc
-DIST thunderbird-52.5.0-ta-LK.xpi 675039 BLAKE2B d91be42b03a77be88739ebe3c0b512992721d50fc0f4f565b778221c57d76a2aec3d99ac1788cbd17e3dc5bf1b76f3825a9df786be83e0a3426b91d18d2badb7 SHA512 a2724e8f4bab87a5d0b183f7002121ed343902ad1b6bf0e2b2f11f4997db726858170ec231ae6c087437580c0cf21cd4bd36f2bbb66b2f61b5d152fa2e53a192
-DIST thunderbird-52.5.0-tr.xpi 569926 BLAKE2B 6c51c1266ee0820ab37e29a8e39b59c9de4f8ac8340ae107297acc42aa8934c045de52b7b19d39167cffe6f514563723ecb83ea47b88309367add23b26b38d4f SHA512 89ea2799d3b327287ea31f15ac2cd6296ce41096ae940648d248856dd77631a1f8a32c2df16800203191181f526f9f8c12311f722e16fe0daedb2efc03108a42
-DIST thunderbird-52.5.0-uk.xpi 652855 BLAKE2B 0ab13307cd983fe1bf4eec3370a30b8298011c7b6bed0f6d05d0b0c6ede28f8bf413dda7b90d305de1538cd48637172238b6d41974c9ff593a99f6d72c7bad5a SHA512 44a7b86ba202d70f69b874a7a76de0e68e13e1d9e40d82a3763032860f16494a74ba722186c881a71ed27334d32b03c0f1321e71520a7d4a1a208d09e2abc7db
-DIST thunderbird-52.5.0-vi.xpi 637164 BLAKE2B c02ed0be7662a6767fc92182805e91fb46cd6b2785db1a09f80172bb619746b02fe18ffa00a14fba99b5f32d297f21369c3d3644cf4766cbb9378d3d5c7de4a9 SHA512 b7d12eabd2cd1c722d5a906f361d695503571181bac1b26206da6c6464ad77e7eba5ff368944a48968fd1899957556a35103376854336d29230a670a15e07a36
-DIST thunderbird-52.5.0-zh-CN.xpi 593612 BLAKE2B 1664070f807fdc6682001bde160b1ecf5f495742e8e26ce60f1119b384f4c0121662783f220140b4af06def0c76d43914cbd68a84f64b859d257d8bcd30de085 SHA512 2d120f19d57f486228862f434e3aff63e2213547fcc4e5ff3ecccfc9bc18e6bd3aa223e999965923879d0d943360b17247ad94946afc7a962d37a6d380548673
-DIST thunderbird-52.5.0-zh-TW.xpi 595729 BLAKE2B d7f7dd63c3b6a621a60ddd2e613defa01bfe14ce708492f710f5e6b66515bcf2f63eb335eb7eccb67f0c1a643b1cdff960d7608735bd2f0aaa9f064070d00595 SHA512 19218e384e84fdf8cdc00fa8acce1a70f53b5c2ee6df58b9a1001bcfb2b77ceb031148c2b95063dca8a95157718de10c1315811f7b9b6bd36f4e7a24e548eba8
-DIST thunderbird-52.5.0.source.tar.xz 230282080 BLAKE2B d55dc086c23813cc116277d532e3f3f99711d7f00be1e09c22d76f021b074d63b1abc8f3814906d73060481857328f0391140484eb1b4c413e8c91fb70003063 SHA512 b9b599e5853887bd518e5a57f6fd04751bb78f553f97b260cd9ba7268c4cff307be40b81b00f1320f5a5156e5c67115595b2d389f931c265d0c3448f56fb8319
 DIST thunderbird-52.5.2-ar.xpi 604235 BLAKE2B e3f465394770c70093d9f55642c5686a07ab2ee9cb9ccc240cb62897cd3468e50e3eabf2fa61784c19cf1d30891fa474564ece3bfdf13e42648a375376b3f23a SHA512 02210011b262f75447f73ed31e584d5ca0774cf4f4a71621e7f0f118f1e5f8007ac362de51bcc1b246103171e5e17e2978b2fdb4b47dc2ffe298e74a6da06084
 DIST thunderbird-52.5.2-ast.xpi 541173 BLAKE2B 536340ece0791c11b67d6b4a23f7ade2fa4e1609a96652bcb7cfd6ee0f3ce3613f5095bf3ae964035cc9bca47ccf66413748a8e1bb53258371e054ea4defd720 SHA512 8dffec5aa3c0a20d7b85fef5160efc38f9296b9099eb3c085fca5528e9eb290a9226ab46097594c5e6799e3b67c13c2075f1ea7b39f039a87b80b1a29e0166bf
 DIST thunderbird-52.5.2-be.xpi 570931 BLAKE2B c21d79d4f2e7eb77710e59b459713e83204f44cfd19084a3a31801f55033ef7cd04448cbc220d33fd1e4a32931554df1ce460046a81d0929a421edde8b545ac0 SHA512 5fc0de75825b5fca44221a838354c74ac39dc72153d1646dfc5f9508fe2d0e54af351bb87cee1ce85b4551571311c223080fbc40a8d95e065e8e9beed08ca1ed
@@ -239,9 +181,65 @@ DIST thunderbird-52.6.0-vi.xpi 637164 BLAKE2B 7a2f8b4861cfb1af294480a1a301b48a98
 DIST thunderbird-52.6.0-zh-CN.xpi 593612 BLAKE2B fbe92431a085803d194d4852611270f12be63f6b279f3e808e602e0d88c0668d0484c623f084cae7929ec380b6e5dc088b10e4a26c490dfbb2e555cc6db5ed09 SHA512 424aa45f9984628e81222dff3d7be3e53d3936d813fe347a32dd9a44974a98293907a85ad618111971cd2b165cb7d657f3c2cb3f49f1803184a0d68d1d1bb577
 DIST thunderbird-52.6.0-zh-TW.xpi 595729 BLAKE2B eb23d82a05ef1ecb15c3c333afe17efacef6107586d2e8e2ff646fcf009ed5ab5128f1f2be43fbbb0fa349e28dcc3b80cf5cca46ae78505c0d9298baac2ba186 SHA512 715c53ba721672f45b9b6f221125f56fd08f74bcd4439b89e0d8b5d72b6779581eab66a8f4cba7227a45e33a9f47dd090d96cf517393ea68114e4b46c4969788
 DIST thunderbird-52.6.0.source.tar.xz 230376180 BLAKE2B cbf1b39f504beb2a862e79ed8e612770cd2f2ca97abb790b8e379be856f9d41fa3a28d15adda69deeb9a3559ef1132dff1f9959c8110374a854f59eff0a9645c SHA512 80742c95ed61d1cb2e72b71bb23bdd211a40240ab4393e9f028a38f902547372084a8f56445e2394484be088a7b9801405f3d6618fb2742601cc968bf34427f0
+DIST thunderbird-52.7.0-ar.xpi 604236 BLAKE2B 9b0f94a0e934b4a34b2ce8cfa7415969132af062f9251f628052a43ce78c5792acc839268fa946f408fc7caed62517019d23176a40d07b648cefee4e02496392 SHA512 5adfff22e8f42f1927e467d4912b46558d8db72b7ab34783824e1ce374861000a49922eab3d46fdbe9b64582c186887b491489af4ff9371243fc97344caa1350
+DIST thunderbird-52.7.0-ast.xpi 541174 BLAKE2B 0056c2c36bc9f9196e607a0c0f91387fc48bda6e8d8d728b7ff57d152852267c28af5a31cab3867630b9d0ec29b55e77880bae39301f9ac1b7bde4381fd7981b SHA512 5c67a7573e70fb8fc66cbb0c3180ab00387905b7f4b1d03139ba876074a963b96e04c5bd6dc0ee1c6fd35e9ba014220179533e876dd9558351f148bd7cc5bc6b
+DIST thunderbird-52.7.0-be.xpi 570932 BLAKE2B 1f4d1dc2b486797a500f2c3327710ff43edcac3dcf3a74aab29234b72167b8e65c343457799b2a571c0f9f4d3e23b24dfe8481573429c25d9df256ca441bfa44 SHA512 918fed7ea14d50d04fb375e3e550ca6beb167f5a92ef4cb535c04f1a73d49ccd404a5dcd3d724b07767e073fa5c78ef7a86744d06eab37f5221d73a369f9ca77
+DIST thunderbird-52.7.0-bg.xpi 634897 BLAKE2B 3b3e4984fd995098705089dc579cc4885cbfcf2637ce54cbacb6bc005bbb33850cd265a85cf0769966e19158647df20e99f99093ede5b3ff2e80f306ebcc656a SHA512 1abe8cde30a787a8167050b6309e576906c7049c019281ea900acfa0199038eb736f7643f963256d1158820435f24f2c814a3e893e32a2db6b826b8022df9019
+DIST thunderbird-52.7.0-bn-BD.xpi 676901 BLAKE2B fe41f7a21247b97fe636fb3434e5f39eeb9b99e1166671d88492925fcee6c796ec9e135fc2bf5ad3b2c792d956ac36683ec76736f699ef981c589ab3f0d98c43 SHA512 ec9d98fcb0f587a6c2dd19ade3017ba1210e55cae62d6499182944dd7cced262dd8b3808719a425953f46ad0f7d8d3a7b8d54e889bee0d8878b87172a6db592d
+DIST thunderbird-52.7.0-br.xpi 559381 BLAKE2B 5dd5e0b0ff3fb8341eab27c55074b9c9503e669eb96e024548a97e6380f0ec7935f990df8275a72982cd826e6c892f50bb99f3fe0e6aae33f99159962112b7c3 SHA512 c8c96e418f87d7ea31cfc596301233f28a178b34e19a7d6185f2ee8ecf04280e78f728fc408b948bd5daff3a34173f4240305cc742e275d9655311be02d31d33
+DIST thunderbird-52.7.0-ca.xpi 569910 BLAKE2B f763578d971eefe70fd22eb1abc76864b1a50c9431275286ceff236fbfca846174f92bb23abd3dbefc766ce7229c2dbb04946a1fc63983a33a28474f688bfb74 SHA512 58d42989075e4ca8165de7d50eafc4b2a7f59849bfa726d945367699f1e08ecd22a5461b386c46a1678e7628a78e90281f55ea4b30a147b5d48acc0869679298
+DIST thunderbird-52.7.0-cs.xpi 579150 BLAKE2B 38a93335376aa17ce3c210bea976d602d99d422831923257b6e6f3ea4ba8c661cdbd0de70002d5a2f811327d09a2e0c630e5e7e97452f8e532130c0ab58fb92e SHA512 2ac3759661c2e2007f9797ec83ae9b38cc5eacf9a7f3489a56f50fcadc6294e1a32458a5f5f5155fc60b749be17e2f2ab8f1907770bd3b7761be8c22bf0d1f9f
+DIST thunderbird-52.7.0-cy.xpi 554858 BLAKE2B 91b2c17c7eb328f9f25c16ed078e01b719f32e040c11352506cc98d86fca09837bcb702b566c82a1eb77f1bff6e0cbf725f950007cb812887b12011a5c37d2b6 SHA512 c20a359639b6f4e6369fce17008c6b9a86567e451ec14cc0cb0fa3c4cf1ddbba700e06186907b8995b12ac748711b13a3d39e7b1875c56e5eae3803a5acbf19d
+DIST thunderbird-52.7.0-da.xpi 543336 BLAKE2B f5c56cdeb5865e70a5b0d652697d821502205e2ebfa11fee58b5da82ca90031c9834248bc89eb6f9040dce469691c29693bb6aa06e9ce4b9c4cd2f7694eca9ac SHA512 4ca0f6bee5daaa96fc7f3c2a9dce76cff408c7893c8fd5164237468b913f2585944b909cf581cc72d05999a8bd1d5030eca1d4e727bfa8b5bc2aa491083444ac
+DIST thunderbird-52.7.0-de.xpi 555744 BLAKE2B cd780d98bf052117d80316fe4b4e510a06207f761a4ee92ae2437a4cea75a2ea990a07071ca33e740eefb7a68881bf0dee63af8fcbc6e9d48bb9143cc971ea1a SHA512 0f07f2306b3366025a4cb08ab7e3992a6f9fc52e61f028ec81b40d494df80a06d3ac7acf9023f7c615af8020912203ce560c5cac35c79c327c7452ed0cf49935
+DIST thunderbird-52.7.0-el.xpi 662965 BLAKE2B 089c02be214dd37bb6f9156c46c53cf51f048539554da0acd6f04c41240aed8e0d3205c130447b5259822d14e7b543af701759342700d9f8828e74deb6fbd57b SHA512 4e244532c36b3d471923ef9a8483667b030970bd067247cde1dedb335978137f9556e611541236e4cfbaf860589666f89a4d8301c5ba864a3edf8908e4731e0f
+DIST thunderbird-52.7.0-en-GB.xpi 531234 BLAKE2B 856b71a0b1005b7d1eff9f65659d24c80322f6183baaac15985f155ff39042e7068560ef1c7e86db5dd57a78be78c93966592e101d6afedb339d7c6649a1b3bd SHA512 9103b73468c1a7f1bb99cf7d22257bbc06f3fa191f1da4ab5041efaaa18f5bb413f8856a78ac0a97bd9bae89f6364bfedd4d3cbf7a5a2e28e489046485a980b4
+DIST thunderbird-52.7.0-es-AR.xpi 565995 BLAKE2B 5c28c9bc9e68387f6de9beffc680ed39839135eb470030a36100f7f6608f10fbd5c361d8beff15ca9723734a9d1eeb9b86a4b2e77ac14a1c0d2a1f54336ec435 SHA512 43b25cccc0dfa4f91bfe73de0dcf25f1ed97fd012b63d531a0a45c7fcbd06533ad61ccc6dc8c8af97f94f0626587d8d0c90f7f8bef2ff619ce4cd9d26905c556
+DIST thunderbird-52.7.0-es-ES.xpi 445464 BLAKE2B d87fb2187c2ead9cd171a4b3e0b7b3c3d915ca712e495467a98ebcd6570973837e731a7b0fc911883753106b6fb752675b384c538924fa5294d9d2749c143ace SHA512 308b706ab3159d926ceda44b37f69d59ed125e736d11905fc16e168d6a169a26fcd621a7b52bbf66116f16287511aa5984a0452cf509227db5f38bea6ff09ced
+DIST thunderbird-52.7.0-et.xpi 551661 BLAKE2B cc2a1792659b162ac25118f553e8f990919cc5dd75544d503fa0bc3f5508f48e631ee46d8e433d428b428a3a1359204a60ac7e61c1b04a8fb9a34186731ca7e7 SHA512 ae4c9da0672def6378ab103f68625e181cfbd456f8dd6096debdac9674711946e10eb81d06148d57fb3b3edd3efb12981e06b8ed18cb2a9259654610e2510300
+DIST thunderbird-52.7.0-eu.xpi 555536 BLAKE2B 0bae546daf4dad10d85d966b14ca90c21fa6613758f7fd329da7625ce561354be4fa6f1399799ce31c55c56fce0f43cbb5bd9db51cd4ff7fee22240465ee8ad2 SHA512 5840b4ca35daee13781aac1beca3be0404daedba85773375131c5cacc431655ee946981373dd8be016bba411886fcd04e2d6cf5c031c7bf16db94743eb6dc54b
+DIST thunderbird-52.7.0-fi.xpi 550669 BLAKE2B 715e72bdf9307efdd98f7e6d97789f1ce4aceede42975c1009341e5a428f754c082ebf8e90caeb20784c564543a5f0a435602121639e8900f05fd06716be32a4 SHA512 76bb8215405eefa83b9e3fe69337f5f3b5365c79cc1bc3d8599bbf8e1018c67f31c2963d28ab3817a79d831174a10d6e4cf369637abb9da52272715f3aeac466
+DIST thunderbird-52.7.0-fr.xpi 577561 BLAKE2B e38845a6202a199589340aeb0f2e907c0d1e212d8017d5a0b172b6ca1e503f6ca61eceb0d8d3045cb593e381749aa017f70ac13fe1c4663bfe1716ed25d7df20 SHA512 fd9856a0d3378adce66c6b1e54604cafbe7fd34f4c9486ff19d78c694b30ba792c74a8c18cbdaa4284f20831a5fd61a00d620f562208ba2ade9d1f34deb0f919
+DIST thunderbird-52.7.0-fy-NL.xpi 563633 BLAKE2B 2101645341bf82acc32a9dc2e18f0667ecc8272c44c41fd51230b78f7175b588ead3f9bed3465cdb95d9518bf76741226ec4f26a26e42ec35da5e2bac926fab6 SHA512 5c3b0e4e43abd511fe8963a8ffe5979126638383146fa5f53c44859eb9ae11ef8a87ed141fcea5afc55f5f729dae7e3b704dc341985eb18cb8cacbd07e6976ed
+DIST thunderbird-52.7.0-ga-IE.xpi 583557 BLAKE2B 26e63330902682a1c1c9026a6d5b52d992845057866b3cabd3db31105e4d3669a7ceb3b28a5b2ec2c1be18659c2e7cfd7339585e248cddb71ae65f100d90a896 SHA512 5c389c03648c232fd272cfecefd820fc892c787c2eefa5786074b50131facedab62c98eb4ca3303c399b975119249882b696827d8ee2c698ee828342a95e1577
+DIST thunderbird-52.7.0-gd.xpi 574065 BLAKE2B c5fc6cf8d0da281574533293f67c007ab8e9483285e68e6e9c8d66552f86a326bb484ef9d7494244bc529843f61074b9fc9fecd46e547e8f5703042a2482f3a7 SHA512 16fc42019d146efe2cbaf59cc575862056a41547b9e9bf8e4151f0b66f9e925ccae33bfd373b37395ddcba7229a8235fc42219b6cbb525291fa3526acb41e35b
+DIST thunderbird-52.7.0-gl.xpi 575150 BLAKE2B 6ced1a99f903a776f5771979c98e13cb4b3c5bea848ab608d17a517b90a44ac0315cb81e1c29d5d100b765f1e0606a34dcc9dd4ff29830da827700ae29d1ffa4 SHA512 7be2b56fd616b1145188bf03a4125d4d30e978f6c3bae6fad7bf716c73043a2a6bbedf5dd0dff844f1d27a2753f12b2043dcf8369e052ad643137c728a0c9f00
+DIST thunderbird-52.7.0-he.xpi 592566 BLAKE2B e1a2dd0a6cc9c75c5073cf3d1341ad72752bb9000066f876421cebccc652b73020636e8191e7a480ba09419631aa11331bb8aed14de9f8dcedc4c76a78e863ad SHA512 81d5c978b874d69f5d416d008f206ff95e6689663a1aa2895071bb717a1a035eb4682596e4b71a4f74eff444a571313c2f23157d5bf1d8af1658a63d9f4bf5a9
+DIST thunderbird-52.7.0-hr.xpi 564780 BLAKE2B 6d03d1f0874f0ebbac5b88b671dcf323c7a61b02f5fbd697adad3799989e8e76a7d9ff7d0f576aba3147b91a742f962e31a31c17af5b445d1e70943e5f35e5e5 SHA512 15bd315924b4d97f7fed528d5a170057faf7f3a9f205bbb1dd1a48c8098647c485e4dd9f134fbde62313250f065f222b3138dee6b2e66e96c6c8a7468ae22bbb
+DIST thunderbird-52.7.0-hsb.xpi 582242 BLAKE2B ca8de136bf8837c55398e760737bae14d30034151562efd51743dd6bf01285657dba218b9ed2f931af0df0bebab911bf170ba12f81e437b20ca0d50003bed309 SHA512 d9a0407500e0f42f18b5927612f8edf55f9261aff83d47f30c2e9a394c93b24eee39e0a7bc6686e27f4723914c89902c7ec08fbb5b6e2ab0ee8277f78d0dd5b6
+DIST thunderbird-52.7.0-hu.xpi 586446 BLAKE2B 89a28d08a74496430eab99660307c898fd5495026b74240e3e1d5c6bb411ccc5f00cf2ab220ff858d358f5302aa9a82bc871e77ed5ff0dd01b10a0cd2d6568b2 SHA512 20b729ad9e74a6bd55904568404619fd27c938313e2b119859233ff33407a7c5f744ece12e75eb335bcc4a861afb432f5a16fac6582bb47b3e855ea156bb5d1b
+DIST thunderbird-52.7.0-hy-AM.xpi 629880 BLAKE2B 8afea83cf66f885b6f722c8bccbcdf71ea7d3e9c2b52670fb7d060a2ca901402ba9c5c09146c67f621fcab8025b607685c96e4ce502e0c2dac5feaf11088feff SHA512 7abf492dcd070a6df511177f2b76cd8a1b6ca46ed0d8b5a0263bc15477774354ab91e42e34715915bcbba6fe3017d8c3aa177e00c56c5139cd0a201afbd2d2fa
+DIST thunderbird-52.7.0-id.xpi 546527 BLAKE2B b7c2fdae6e93029f27bd6241b1a165ae477a382862e2b28c4f19a3daae4a4a67e50bc9682c225332433c16db2b8e5d6e6c0dafcb63799292e5b6f1f745221d47 SHA512 36b29a38b5773c8f9d25d272a6a46a34efd76c26861b6d8c64fd3a3d77326a72415d971eb7937ed90c5be787060cbe2e6ea725e2a10248061173a93378b2b364
+DIST thunderbird-52.7.0-is.xpi 555713 BLAKE2B e221947a38e8a1d6a5cd6e03e0f6b3642c5473552032d1687fba9afac116c5b666813dabdfd975ce83074a461822ec1210fe7b660b51cf6f85fb0a05e724f717 SHA512 d25dc5fa4c499c9362f19d4c38492f0bd3e9d86cdcdce21c875f5e235b22433de176fa0ff3af8b202620541742e16f4d3f5d2394254471979ce2ca333a8ff9cc
+DIST thunderbird-52.7.0-it.xpi 455408 BLAKE2B da5dc81863a8ec83002c384f08be49acc1d613d139d2787c5ba74a996c0f66d43194b180a6078ed013dd0c1e872a0b1f5317296bebc017f8fa8f9d9caa9bd1f3 SHA512 a5e841c37ff17a6039c378ce2bcf57f62cf5d6df89634471139d7f97906800ee3f8a6ce492b293e8a868cb18c3f928429d394c4a36ed84b69b164391ff2ae564
+DIST thunderbird-52.7.0-ja.xpi 630053 BLAKE2B 94aaf82fcd4a17bf54570f4e7e7c15e64fd685ca50e8b3d9b94b6309c67ea737e16d92905a6f3934bba0cfe9d799dc1aeed2528770687b760f6f4620d8dc77a2 SHA512 726e80ea09fe34993f9975eb76d752d06f2b982802c48acef7941184363d213f9a7f6b4819462c2a652b78d743e816c1b3a0825089c0dfc42fe302e5f372f925
+DIST thunderbird-52.7.0-ko.xpi 595517 BLAKE2B b85828c902136a4789486e406048d669adda432bc0829a1b6c524412558340f21b91286f1f33c3512f867678bcf05ce5f9f432dfdf43da06977c6c63867b3cb1 SHA512 bf909e5f3051f50339f71ebe82233c49f39ceb858ba481f6874547b19a2d119e7ad57fe6b611949a38acee16380805a959375fcfa793ae1f4dcd892f0d14b280
+DIST thunderbird-52.7.0-lt.xpi 580598 BLAKE2B 139b7aa466c8fdd441b72b41cfc25632b80c6804fb46d1f7e78cfa80fa59f4b7124bc4b1698f475a06de59e9b2da16d8b11d92a783cb7b9fc063cb7af96f3786 SHA512 fcadc3e84d91c6e746f27f0889c8d0ddf9b4d68865a8324c750b0a842aca64f84924d24d72628eae68a9a571b7c5f990a3027b02b428dad9c073be9cb8f17f9d
+DIST thunderbird-52.7.0-nb-NO.xpi 551104 BLAKE2B b2752a70a915378f5e53fc52196aa6da7c22e0630a5aa04177552a758f5565eb911d9532d1dad81b4d8ce12893ef5cfba3822304890b72915eb175190d5a024a SHA512 ee49979f1c2e3ad8f14864edaeaece215ae15ca212a144b4425db190a3d14c726a7e5648000c634985a911d35a23fa8f9007e0cc6a3d7bd5ec61f9fb8f78c2ef
+DIST thunderbird-52.7.0-nl.xpi 557957 BLAKE2B 883724ee67c2e5e4ceb5bd2a08e599a84a4149078e23058fe63c78f98be8c5711b326d8dc3f6a595acb7d97a147db9b080f75d8f106dd593c3eb945b75d60ddf SHA512 9f277f1fb1af40a77cf4a7ceea3508fff170e897c6882a77c40a3405e596a4cb32e94e07bf9057ddd42f6f16fc94d553f033c69a7d25f2d369d29671812b50f4
+DIST thunderbird-52.7.0-nn-NO.xpi 551892 BLAKE2B 0b9472581591c176cb20f037271c70bebc2b4370bd7217087aabf8cbb35ddef66f3c4a8eca5fcbeaa4c064164e865f507ab7ac648ca24d01c669572711c3892b SHA512 a148709005133fbd51fb0659f06142494e62c217faea7d16939ff3abae95e9544da6e907fd0d4a231e7cf499863c62aae929000e5714a33ac167cfaf0432351c
+DIST thunderbird-52.7.0-pa-IN.xpi 646569 BLAKE2B b4251d0e8c6402601b4ec3ae0e8c4c971c64810a693db28ce00232b3daa7be94e8f649562c68d1a568cec81758c39e9c5a3f184a0d89ac7b37e87ea50c6afe42 SHA512 c3a133acc7d7f82a94b79403f6be465976e414c2176d08b67a3b8a8339548b08a513db2c405d99deca13c4130e204e354717f86409b013be00e72d0f216b6c6f
+DIST thunderbird-52.7.0-pl.xpi 469902 BLAKE2B 2e26eb35985810a68569451d915dbc6f1603b837cac1b4e2a8d6e4412ccd3c8ef79c737652e5c4f01d33e09d65ed9839339703e6d136000abaa240bade1634b1 SHA512 d60d0a25db3ef8fce81241191811afff4b8c23e1578c6954c29346dd52a69236c5907ff31179ef204e92ee9f3ed958518cace777eed5814be4f1131a4e18ffe2
+DIST thunderbird-52.7.0-pt-BR.xpi 558224 BLAKE2B f0a068f9f41f0e121d17dfed8abc837d5e06bf05fc625737da1308801f2fee59fd201c91bfd965f0dc6632caa4fdfc15faca1c8660743bc6af4706604071dd0c SHA512 e97444703049d97beb96a9cc0538c72feba772ba365c5e49f05e11d82a32edff1492f9e4109995d241df09b2b8fa5520a306da7c4ce86b5a79cf9e2fddd62819
+DIST thunderbird-52.7.0-pt-PT.xpi 565624 BLAKE2B 5e1b602db29cfd18b3b9e772c0afd41c45779c1f8a9297135a8a91ed86114a4b785151fe611475a529d5bd4aec903083d91f9a85c76860dfc7358874cbb51866 SHA512 16542c6a9d8065bf35164550a57a4be5048eb249a4a5f8fc99ae5c05c79e5a84b2db4f565363cce834de8e38505cbc92ce4f42cd1f1927bde2df7bee994d4dd4
+DIST thunderbird-52.7.0-rm.xpi 557605 BLAKE2B 57a3f888dff3daa8cd38156d85a6985052999d54598c4c2cf950de79c103e055c99bdf7d329993779dbfd4b51515887114be1eef069f185e9e3fd7795d914e11 SHA512 aecfbfd31a0731c5a2c89c731d63570ca9de04f9dc01339a9f17c54038852218670c76f969809cedc6b9afd1fa8ce5ee852c0e78ae889a8b70e832a59b2c13fe
+DIST thunderbird-52.7.0-ro.xpi 570530 BLAKE2B bc07c944e791745fed70687bcd4f378c5af6cb91cba8405d1959515cd6059ddc3adbf8b629dd4860ae67705f5826756debf89980b989474a50b1943864309114 SHA512 1da58f6f2a8da1f011123b8601931c9430877bf3446aa267591180e29e034c6ac3deebf94f07c3ce4256169aa48e6f6e793d10d58afd40907654992e620ac786
+DIST thunderbird-52.7.0-ru.xpi 530670 BLAKE2B 8a737bfbca2b69a290da6f873e926b535a55896f3a855e3012e0d7850c373956bef9136f361a89f4d4d42cb437321000b47166d6b392469f3514bf6ff25c5043 SHA512 734a28b963eb5430ebf210b492cf5376f2988ceb5afaed6685fc78e17933330b9c178bc3a8e96baaff34402da0f434c277f0592305575a1308e7b1331726ede8
+DIST thunderbird-52.7.0-si.xpi 649010 BLAKE2B 14b63ddf0a3907fc426d109387d2dab8d6e9ab9ebe73abf950ab7ebdab69616965937cdaadb5676b454c2671a513bee30ad2fc27b1bd8513837fc499f80d35fd SHA512 957d1bf1ab45f56e8271fd9071a98f3be3b9b711708c098fb46ac2636949696d685892e4ab6392b56a82b41547a0735fcd5b11043377127084ab1895dca10f9d
+DIST thunderbird-52.7.0-sk.xpi 583882 BLAKE2B 6a7b46ff516ee0572a86fa0372f4b4fb8a090cd0c5f11edfde58d2a7df37d98b7bca3d6c38cb825918d4b63156090fc495ba191ec43fe224ad1cba9891968ec1 SHA512 793520668940be422ff96d680330a6b991ee49107aaf13fe7f475edfc35c1285e09bb4af55a7fe1ffe6839ce44d174cad4c4a139904f7a6c5f5cf733ab9ba50e
+DIST thunderbird-52.7.0-sl.xpi 562835 BLAKE2B 04cefe89e64bc85ec7baa08af71d1a2a1a2bd1fd87da526c09092e2ca4903613f865d794b49ac9e4fdadfa29b21dc9898463151d6c8d5fc9c64dea6f590a4d91 SHA512 55a79a83bec3aff011cdfcbe80f39a927371703e914ffbe43b99b6104e8de77225979c92b7942c4bc74fc222a2c08a90ad52273277ff3d738f687a0c20d66f24
+DIST thunderbird-52.7.0-sq.xpi 570616 BLAKE2B d27017442693bf342714b9f46010078eec5696c45cb81c5b3b30dca45af78b872c3850b302e690ed70485848e67df2e9e89523de714479a951b7ffcd6bb86e5e SHA512 05d927adaffc6ec7d187e2ad62c47a43ba69b33bda764e5196666aabae7127e6ae6e753fc13a61add339df9a794c0f78e9c145c45b5c6913dd29801cdf9591d4
+DIST thunderbird-52.7.0-sr.xpi 609020 BLAKE2B 824ddde4977b463b962d8484405ee77133276996c9685bb96bd3a1dc56d9142403c1bb4ab3052b07f335b09d98e0bb29ba1288d81a0736ad0ed4245f008c5e0a SHA512 c3cef0085050e1f2bc155858789bee9a699ac43fd859fe4b3ff32596de92483df9f63e27b28c344c127441e51b9492827077e83d77545f208a0c876ecdc53d8e
+DIST thunderbird-52.7.0-sv-SE.xpi 565777 BLAKE2B c55abc8259102c72840510113e481ededbc2e657b7ff179a31d27b52da53281bbfb9303167594a41212fdc2540434a6b54ba9f2f8336a9e8cba8b085e1d00056 SHA512 cd1acab8f60d4db1afed1358866ce2eaae7a032ee45a2616f5074868c4afb08049dfb5014e4fc6eeebfdb6f2f187d0afcb342d89b1896c5484ed6825faf974cb
+DIST thunderbird-52.7.0-ta-LK.xpi 675039 BLAKE2B a9c09bb8bb96ec555dbc9b4d363305244d5ae05a29139968bdcd74191d061fb335b908915298aadbb283b435ba8e8b59654bb3c748e18c1cec8d810562607ce8 SHA512 83d511ca833f6a37958b8b45f33a4a3fe23413efaa04c92fe40f192d31bec8623046ccf669cdcd21361c66f7458923810b95db099267cb1b5f97c50fe70d4c07
+DIST thunderbird-52.7.0-tr.xpi 569926 BLAKE2B aec66b4dd9f268ef7880598bb13b2dbb82b232de9900e2f038d6ae3066e597e2c5a60f55eaa55a82145fc902a8179d1efedcc7064844692b679aec734ea5ed64 SHA512 a15aa5cfc11c5708b697d82fbc0c9611fbad4cf4cf374fd4b989b8afe687dde1c64c363e18093d6de845ba7ab4842b64661e0c3893e80aaf8c9438e517e16445
+DIST thunderbird-52.7.0-uk.xpi 652855 BLAKE2B d78bdee25c519750ae812c6d69b344239ea41b46ba5d1e3a3e2b5681cac7dc5f460a7168e0b4a3bfdb0b2efe44714b879d484d14abdb8037311c06ba294d6c9b SHA512 6791d3a192d4975b188d4dc713a43726a1d30e5321c69a93b9135d2608e83e665e868b2a681115a5edd17536d5653efde67cabac4d712086df89425c46df5d00
+DIST thunderbird-52.7.0-vi.xpi 637164 BLAKE2B d9b33374ee657248f3c83c41dbd7deeadc523ff9158dec2fdf698924fda0a80e805b8c1f5c592fb67b663b7b221e494b7d1af00bc4530c7bbd0a27a844d0efc1 SHA512 e0f914e55174c5827b887cc2dfb1dd5e63be55b46fb40c2bf6bedcf7b5f06201ca12535e732806f9278d008da02df8ff9cadd01b3b8b893d630e2072f6ef01d0
+DIST thunderbird-52.7.0-zh-CN.xpi 593612 BLAKE2B 51027d99360c386d9f61ad1049f239757291bd0eb449ddd247263d139a4b583bad6ceadb14a0a5ac33a1ac0013f635837c6c6b8fa04e6b856c0a02bda9169d81 SHA512 e3a8b15133484760f6a9acb49600f979f62b194b5c6621cb5ec9805317de49e58a79692f9c69b34f03af119de31e54f42cfd43434b8a0e0fa26082e7746bc92d
+DIST thunderbird-52.7.0-zh-TW.xpi 595729 BLAKE2B 4b2877e9f45e6d64cfba8ebe41d6d832e5ee87a667ce5c778d1bfb651b9d18ca1abe34125bdc308d226bf79f67505ebe1de05cd14dbc7aa0228611a2f9d00916 SHA512 9aae56ebd2f3e13f097927953d0a1f7834a68d7d37259a2bf425a88d404b91da9488aacf64bda89bb6e35856e6a1a4e6d26d636915df9f15c49fe5e781a0d35a
+DIST thunderbird-52.7.0.source.tar.xz 230410444 BLAKE2B 4c7d10a16f78c2ea791d72f3f99b25556ccfce9448d7b1235403738722aee1c8ad9aa08a21bce3c5a82389d9b4d96ada104950b0168424308f07fa6a939c190b SHA512 875ad6f2b030c65d248ecec4f4a5b51767c3ee7944ac72893237efd2af50145ec2e4a9efa8d60807b78bcfb8189969e5a67d15124710e8b0091f639cddfbfe21
 EBUILD thunderbird-45.8.0.ebuild 11907 BLAKE2B 9c59384a0af373242f9c0178ce2d9ecfa47d462d35b937ba6f7822db31ab1f7ac0f6c74039f8ac616d10461e7d6a343ecb1e3c17e1f8648b45200d4b6d04a9ee SHA512 fdd92606748e698b21b6f8c3a37aad0e107de5326a5e20cb53b48878b153e7a77c01e30aea3a9e60a187da3265efc36bbbc2783d5edcda921ca3d172b801f1e3
-EBUILD thunderbird-52.5.0.ebuild 10419 BLAKE2B 7ce64e109b74f8f0cc1eb7398ff425c3d402898c10a21daedf6125e49b59699f4f835588a1328e034eaac23b823bc2262b4a0030d899b5503000a020702bd12e SHA512 8c2d47e8e3f8b7e6f3208d1b658699c319951aa498e57674ed686f3d4bf621f327c6de99f8b15d7387c14c81a4c0038044f34f82b40552a127823e463c9cdce7
 EBUILD thunderbird-52.5.2.ebuild 10421 BLAKE2B eae5e5b0aa7a10289518343dfc8471a185fcf8bbdd789eca86615be2263fb6e300aee27c82f54133518893060dec53f5488f32c61dde6f585f2e018a9cc2580c SHA512 e1f50c390c7c889c546fbcbe18f1aedf976a3d79ce9531aad20389e736df1b7ca0e7cdd11c9bb140c160e2db537e707b4ba272c9d4b7235eb1cfc2ecfa634930
 EBUILD thunderbird-52.6.0-r1.ebuild 10489 BLAKE2B 3e76ba3894f8715ffbfaa0c4a9cd16e9a288e63c45d2e194991073e784fa7fae89f87dbcd7b83cd1d0ca0a3bbd45bb2b773ffcfc2678ef63ea21cb8d3ea3c246 SHA512 9f605505758d73e79c574ac52a2a3fc6b2ab2d6113b3e9a5c598df3991e8c22d058dbf732b6a8f77f4b2f3f420a39df16bdadf129b03c28a30a09ca6bd1a6849
-EBUILD thunderbird-52.6.0.ebuild 10488 BLAKE2B 34f8496e0bc52749cc871b5f910886e26800f4d9f6fb3d3c9a2078b90fcf9ea84cebdcef51fe16b8fb56433433bbdb11cc2d9fbe6901165227ab797625df827a SHA512 77d9f45527b17dd00a5c528865565072d322fc5168436d4b3b0817769f8a32e5cef5b9190232869e0c11065f53575f3d676cc6c20784deb168431a2d3aea648b
+EBUILD thunderbird-52.7.0.ebuild 10491 BLAKE2B 263ecb44797ae637b43711a402d42abcaaf2af9343a7e2e46dfb66858f30c36f7c185dec1e999ca9056dd255a1bc985651bbe7d281cd3f7b7845a9e9db0d1ed7 SHA512 b537ff9fd113c23b5caf177aefa054a89233f8e6a864fef9f9f8791c49cae59dba13cde405e1d23c9f25d68019b605f0514a2a3ace798fe2c281125209f2e5dd
 MISC metadata.xml 2018 BLAKE2B 992a35d8bcd4492c85a2ab2566c63b070f46ddbb7adb4a87ffabcfd64dda0a183337a60bf9fb23b0513972f50e4214af2ee0316f53c9eb18705f83d9843f9fda SHA512 274dd1f5aeb1db04a5a0d0414ee35cb3b656d7864f78f349de9e535150d34b42d950d67e9029de5648725a1ab53b51e5d6054f0b5325bdfcae5f1171689df7d7
diff --git a/mail-client/thunderbird/thunderbird-52.5.0.ebuild b/mail-client/thunderbird/thunderbird-52.5.0.ebuild
deleted file mode 100644
index 122a2007115f..000000000000
--- a/mail-client/thunderbird/thunderbird-52.5.0.ebuild
+++ /dev/null
@@ -1,341 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-WANT_AUTOCONF="2.1"
-MOZ_ESR=""
-MOZ_LIGHTNING_VER="5.4.5"
-MOZ_LIGHTNING_GDATA_VER="3.3"
-
-# This list can be updated using scripts/get_langs.sh from the mozilla overlay
-MOZ_LANGS=(ar ast be bg bn-BD br ca cs cy da de el en en-GB en-US es-AR
-es-ES et eu fi fr fy-NL ga-IE gd gl he hr hsb hu hy-AM id is it ja ko lt
-nb-NO nl nn-NO pa-IN pl pt-BR pt-PT rm ro ru si sk sl sq sr sv-SE ta-LK tr
-uk vi zh-CN zh-TW )
-
-# Convert the ebuild version to the upstream mozilla version, used by mozlinguas
-MOZ_PV="${PV/_beta/b}"
-
-# Patches
-PATCHFF="firefox-52.5-patches-02"
-
-MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/releases"
-
-# ESR releases have slightly version numbers
-if [[ ${MOZ_ESR} == 1 ]]; then
-	MOZ_PV="${MOZ_PV}esr"
-fi
-MOZ_P="${PN}-${MOZ_PV}"
-
-MOZCONFIG_OPTIONAL_GTK2ONLY=1
-MOZCONFIG_OPTIONAL_WIFI=1
-
-inherit flag-o-matic toolchain-funcs mozconfig-v6.52 autotools pax-utils check-reqs nsplugins mozlinguas-v2 xdg-utils gnome2-utils
-
-DESCRIPTION="Thunderbird Mail Client"
-HOMEPAGE="http://www.mozilla.com/en-US/thunderbird/"
-
-KEYWORDS="~alpha amd64 ~arm ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-SLOT="0"
-LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-IUSE="bindist crypt hardened ldap lightning +minimal mozdom rust selinux"
-RESTRICT="!bindist? ( bindist )"
-
-PATCH_URIS=( https://dev.gentoo.org/~{anarchy,axs,polynomial-c}/mozilla/patchsets/${PATCHFF}.tar.xz )
-SRC_URI="${SRC_URI}
-	${MOZ_HTTP_URI}/${MOZ_PV}/source/${MOZ_P}.source.tar.xz
-	https://dev.gentoo.org/~axs/distfiles/lightning-${MOZ_LIGHTNING_VER}.tar.xz
-	lightning? ( https://dev.gentoo.org/~axs/distfiles/gdata-provider-${MOZ_LIGHTNING_GDATA_VER}.tar.xz )
-	${PATCH_URIS[@]}"
-
-ASM_DEPEND=">=dev-lang/yasm-1.1"
-
-CDEPEND="
-	>=dev-libs/nss-3.28.3
-	>=dev-libs/nspr-4.13.1
-	"
-
-DEPEND="rust? ( dev-lang/rust )
-	amd64? ( ${ASM_DEPEND}
-		virtual/opengl )
-	x86? ( ${ASM_DEPEND}
-		virtual/opengl )"
-
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-thunderbird )
-	crypt? ( >=x11-plugins/enigmail-1.9.8.3-r1 )
-"
-
-S="${WORKDIR}/${MOZ_P}"
-
-BUILD_OBJ_DIR="${S}/tbird"
-
-pkg_setup() {
-	moz_pkgsetup
-
-	export MOZILLA_DIR="${S}/mozilla"
-
-	if ! use bindist ; then
-		elog "You are enabling official branding. You may not redistribute this build"
-		elog "to any users on your network or the internet. Doing so puts yourself into"
-		elog "a legal problem with Mozilla Foundation"
-		elog "You can disable it by emerging ${PN} _with_ the bindist USE-flag"
-		elog
-	fi
-}
-
-pkg_pretend() {
-	# Ensure we have enough disk space to compile
-	CHECKREQS_DISK_BUILD="4G"
-	check-reqs_pkg_setup
-}
-
-src_unpack() {
-	unpack ${A}
-
-	# Unpack language packs
-	mozlinguas_src_unpack
-
-	# this version of lightning is a .tar.xz, no xpi needed
-	#xpi_unpack lightning-${MOZ_LIGHTNING_VER}.xpi
-
-	# this version of gdata-provider is a .tar.xz , no xpi needed
-	#use lightning && xpi_unpack gdata-provider-${MOZ_LIGHTNING_GDATA_VER}.xpi
-}
-
-src_prepare() {
-	# Apply our Thunderbird patchset
-	epatch "${FILESDIR}"/1000_fix_gentoo_preferences.patch
-
-	# Apply our patchset from firefox to thunderbird as well
-	pushd "${S}"/mozilla &>/dev/null || die
-	eapply "${WORKDIR}/firefox"
-	popd &>/dev/null || die
-
-	# Ensure that are plugins dir is enabled as default
-	sed -i -e "s:/usr/lib/mozilla/plugins:/usr/lib/nsbrowser/plugins:" \
-		"${S}"/mozilla/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 32bit!"
-	sed -i -e "s:/usr/lib64/mozilla/plugins:/usr/lib64/nsbrowser/plugins:" \
-		"${S}"/mozilla/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 64bit!"
-
-	# Don't exit with error when some libs are missing which we have in
-	# system.
-	sed '/^MOZ_PKG_FATAL_WARNINGS/s@= 1@= 0@' \
-		-i "${S}"/mail/installer/Makefile.in || die
-
-	# Don't error out when there's no files to be removed:
-	sed 's@\(xargs rm\)$@\1 -f@' \
-		-i "${S}"/mozilla/toolkit/mozapps/installer/packager.mk || die
-
-	# Shell scripts sometimes contain DOS line endings; bug 391889
-	grep -rlZ --include="*.sh" $'\r$' . |
-	while read -r -d $'\0' file ; do
-		einfo edos2unix "${file}"
-		edos2unix "${file}"
-	done
-
-	# Allow user to apply any additional patches without modifing ebuild
-	eapply_user
-
-	# Confirm the version of lightning being grabbed for langpacks is the same
-	# as that used in thunderbird
-	local THIS_MOZ_LIGHTNING_VER=$(python "${S}"/calendar/lightning/build/makeversion.py ${PV})
-	if [[ ${MOZ_LIGHTNING_VER} != ${THIS_MOZ_LIGHTNING_VER} ]]; then
-		eqawarn "The version of lightning used for localization differs from the version"
-		eqawarn "in thunderbird.  Please update MOZ_LIGHTNING_VER in the ebuild from ${MOZ_LIGHTNING_VER}"
-		eqawarn "to ${THIS_MOZ_LIGHTNING_VER}"
-	fi
-
-	eautoreconf
-	# Ensure we run eautoreconf in mozilla to regenerate configure
-	cd "${S}"/mozilla || die
-	eautoconf
-	cd "${S}"/mozilla/js/src || die
-	eautoconf
-}
-
-src_configure() {
-	MEXTENSIONS="default"
-
-	####################################
-	#
-	# mozconfig, CFLAGS and CXXFLAGS setup
-	#
-	####################################
-
-	mozconfig_init
-	mozconfig_config
-
-	# It doesn't compile on alpha without this LDFLAGS
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# Add full relro support for hardened
-	use hardened && append-ldflags "-Wl,-z,relro,-z,now"
-
-	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
-	mozconfig_annotate '' --enable-calendar
-
-	# Other tb-specific settings
-	mozconfig_annotate '' --with-user-appdir=.thunderbird
-
-	mozconfig_use_enable ldap
-	mozconfig_use_enable rust
-
-	mozlinguas_mozconfig
-
-	# Bug #72667
-	if use mozdom; then
-		MEXTENSIONS="${MEXTENSIONS},inspector"
-	fi
-
-	# Use an objdir to keep things organized.
-	echo "mk_add_options MOZ_OBJDIR=${BUILD_OBJ_DIR}" >> "${S}"/.mozconfig
-	echo "mk_add_options XARGS=/usr/bin/xargs" >> "${S}"/.mozconfig
-
-	# Finalize and report settings
-	mozconfig_final
-
-	####################################
-	#
-	#  Configure and build
-	#
-	####################################
-
-	# Disable no-print-directory
-	MAKEOPTS=${MAKEOPTS/--no-print-directory/}
-
-	if [[ $(gcc-major-version) -lt 4 ]]; then
-		append-cxxflags -fno-stack-protector
-	fi
-
-	# workaround for funky/broken upstream configure...
-	SHELL="${SHELL:-${EPREFIX}/bin/bash}" \
-	emake V=1 -f client.mk configure
-}
-
-src_compile() {
-	MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX}/bin/bash}" \
-	emake V=1 -f client.mk
-}
-
-src_install() {
-	declare emid
-	cd "${BUILD_OBJ_DIR}" || die
-
-	# Pax mark xpcshell for hardened support, only used for startupcache creation.
-	pax-mark m "${BUILD_OBJ_DIR}"/dist/bin/xpcshell
-
-	# Copy our preference before omnijar is created.
-	cp "${FILESDIR}"/thunderbird-gentoo-default-prefs-1.js-1 \
-		"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" \
-		|| die
-
-	mozconfig_install_prefs \
-		"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js"
-
-	# dev-db/sqlite does not have FTS3_TOKENIZER support.
-	# gloda needs it to function, and bad crashes happen when its enabled and doesn't work
-	if in_iuse system-sqlite && use system-sqlite ; then
-		echo "sticky_pref(\"mailnews.database.global.indexer.enabled\", false);" \
-			>>"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" || die
-	fi
-
-	MOZ_MAKE_FLAGS="${MAKEOPTS}" \
-	emake DESTDIR="${D}" install
-
-	# Install language packs
-	mozlinguas_src_install
-
-	local size sizes icon_path icon
-	if ! use bindist; then
-		icon_path="${S}/other-licenses/branding/thunderbird"
-		icon="${PN}-icon"
-
-		domenu "${FILESDIR}"/icon/${PN}.desktop
-	else
-		icon_path="${S}/mail/branding/aurora"
-		icon="${PN}-icon-unbranded"
-
-		newmenu "${FILESDIR}"/icon/${PN}-unbranded.desktop \
-			${PN}.desktop
-
-		sed -i -e "s:Mozilla\ Thunderbird:EarlyBird:g" \
-			"${ED}"/usr/share/applications/${PN}.desktop
-	fi
-
-	# Install a 48x48 icon into /usr/share/pixmaps for legacy DEs
-	newicon "${icon_path}"/mailicon48.png "${icon}".png
-	# Install icons for menu entry
-	sizes="16 22 24 32 48 256"
-	for size in ${sizes}; do
-		newicon -s ${size} "${icon_path}/mailicon${size}.png" "${icon}.png"
-	done
-
-	local emid
-	# stage extra locales for lightning and install over existing
-	mozlinguas_xpistage_langpacks "${BUILD_OBJ_DIR}"/dist/xpi-stage/lightning \
-		"${WORKDIR}"/lightning-${MOZ_LIGHTNING_VER} lightning calendar
-
-	emid='{e2fda1a4-762b-4020-b5ad-a41df1933103}'
-	mkdir -p "${T}/${emid}" || die
-	cp -RLp -t "${T}/${emid}" "${BUILD_OBJ_DIR}"/dist/xpi-stage/lightning/* || die
-	insinto ${MOZILLA_FIVE_HOME}/distribution/extensions
-	doins -r "${T}/${emid}"
-
-	if use lightning; then
-		# move lightning out of distribution/extensions and into extensions for app-global install
-		mv "${ED}"/${MOZILLA_FIVE_HOME}/{distribution,}/extensions/${emid} || die
-
-		# stage extra locales for gdata-provider and install app-global
-		mozlinguas_xpistage_langpacks "${BUILD_OBJ_DIR}"/dist/xpi-stage/gdata-provider \
-			"${WORKDIR}"/gdata-provider-${MOZ_LIGHTNING_GDATA_VER}
-		emid='{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}'
-		mkdir -p "${T}/${emid}" || die
-		cp -RLp -t "${T}/${emid}" "${BUILD_OBJ_DIR}"/dist/xpi-stage/gdata-provider/* || die
-		insinto ${MOZILLA_FIVE_HOME}/extensions
-		doins -r "${T}/${emid}"
-	fi
-
-	# Required in order to use plugins and even run thunderbird on hardened.
-	pax-mark pm "${ED}"${MOZILLA_FIVE_HOME}/{thunderbird,thunderbird-bin,plugin-container}
-
-	if use minimal; then
-		rm -r "${ED}"/usr/include "${ED}"${MOZILLA_FIVE_HOME}/{idl,include,lib,sdk} || \
-			die "Failed to remove sdk and headers"
-	fi
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-
-	if use crypt; then
-		elog
-		elog "USE=crypt will be dropped from thunderbird with version 52.6.0 as"
-		elog "x11-plugins/enigmail-1.9.8.3-r1 and above is now a fully standalone"
-		elog "package.  For continued enigmail support in thunderbird please add"
-		elog "x11-plugins/enigmail to your @world set."
-	fi
-
-	elog
-	elog "If you experience problems with plugins please issue the"
-	elog "following command : rm \${HOME}/.thunderbird/*/extensions.sqlite ,"
-	elog "then restart thunderbird"
-
-	if ! use lightning; then
-		elog
-		elog "If calendar fails to show up in extensions please open config editor"
-		elog "and set extensions.lastAppVersion to 38.0.0 to force a reload. If this"
-		elog "fails to show the calendar extension after restarting with above change"
-		elog "please file a bug report."
-	fi
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
diff --git a/mail-client/thunderbird/thunderbird-52.6.0.ebuild b/mail-client/thunderbird/thunderbird-52.7.0.ebuild
index 8de691cdc1e6..4d7fb31337cd 100644
--- a/mail-client/thunderbird/thunderbird-52.6.0.ebuild
+++ b/mail-client/thunderbird/thunderbird-52.7.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 WANT_AUTOCONF="2.1"
 MOZ_ESR=""
-MOZ_LIGHTNING_VER="5.4.5.2"
+MOZ_LIGHTNING_VER="5.4.6"
 MOZ_LIGHTNING_GDATA_VER="3.3"
 
 # This list can be updated using scripts/get_langs.sh from the mozilla overlay
@@ -44,7 +44,7 @@ RESTRICT="!bindist? ( bindist )"
 PATCH_URIS=( https://dev.gentoo.org/~{anarchy,axs,polynomial-c}/mozilla/patchsets/${PATCHFF}.tar.xz )
 SRC_URI="${SRC_URI}
 	${MOZ_HTTP_URI}/${MOZ_PV}/source/${MOZ_P}.source.tar.xz
-	https://dev.gentoo.org/~axs/distfiles/lightning-${MOZ_LIGHTNING_VER}.tar.xz
+	https://dev.gentoo.org/~chutzpah/distfiles/lightning-${MOZ_LIGHTNING_VER}.tar.xz
 	lightning? ( https://dev.gentoo.org/~axs/distfiles/gdata-provider-${MOZ_LIGHTNING_GDATA_VER}.tar.xz )
 	${PATCH_URIS[@]}"
 
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 7c848cdba08f..86f2dae7b1e6 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index 413c36de2255..4b3c9d4a05dd 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -8,7 +8,7 @@ AUX blender-2.79-fix-build-with-OSL-1.9.x.patch 1119 BLAKE2B f0289707d5383ee11af
 AUX blender-fix-install-rules.patch 518 BLAKE2B 178929de7adb1b4a0063134da93248af8c2c42fe0d3e9730833272b4fe8387075ce592ee65668cc9862a1ad10c9857a31b3f1c0614c9e69f937998ccb5c86a17 SHA512 5343f0e9e6bba2d15a38cb5db95a1aeff0a704c0762e558b9b74d88dd58e2fb5077289f0d8f25a61fa092d083f7db916d27c4642dfd7cf84d4c989258c3253ec
 DIST blender-2.72b.tar.gz 52018242 BLAKE2B fa0b8ab3feaeb35e76d833415984eb21d7b6dca47b9e5fb337cdfbdc9924165d3345caa5608ee2849bf71855c917a6fa56d79d4f375b57ff367047ef92e8e0b9 SHA512 9767797621e443ff9b6810d1713dda110f883c33626d40d7fe5dda676f549e3591516dc24b75feebd85823dd13437c34521ca752139cd31ddacf31ea6b14e124
 DIST blender-2.79.tar.gz 50145270 BLAKE2B 5c11b36840d4bf4a414f01d1f8efcbfb2879ce56c9e2ebe32d8bb0be3ce29fd194dec8b3aa5bca9bf664804c1be57d01394494fdfebc7a4d8257bd2c47866338 SHA512 9b81c41882f4e150476ebda5b301b78c2d35ea918394c8a01671fc031f7cb7a34b5a3d68b6a345f6d23fd9ecedd25bc0bd24f9f9b3ec771237ac4496bbde7d2f
-EBUILD blender-2.72b-r4.ebuild 8113 BLAKE2B a4d67b0ecd15f1a4f6eedb11d1160ef9514970052b2daa145848e8fc1247839bcfbeb61851a7c550be06b7153ea6e4e159932d36eddd7cb253d1bb6317221439 SHA512 837256447e727e165cb05e733236162ac03a82fa72a41e3a7d894c5efb60a26a959442cdc6eb528ad676b641f127b37d454080392ce54d14676cc8e29487c783
-EBUILD blender-2.79-r1.ebuild 8111 BLAKE2B a3812df81e30ed0bf22ffdffcdaf07f774b102a8012a9cac478689ba07d552feb87281c52e384829b9e894e5144b0efafd962f85cf66fe9ef41e6b8029b1a3b1 SHA512 29fd1536f1bcf1c99c752fea0fe256ce007a533177861cefdb73107dd2fe1e12f34ebaadc9ace523a9cf0383251697fd70145452320460be8bcd0db3e272a337
-EBUILD blender-2.79.ebuild 8059 BLAKE2B d60a56884d15f6d1ddf5a2b8070de29284cf63ac152a19bfa4a0ecb3c66f4fdb200ce7831cd928133882614d5e29f2a5d3bde7c22cfc4506df5ead0792aea503 SHA512 99e7f652915b69087deb9ef11a5d78951b7553db60f8327150dd349a8a84672e9cb9fb2740acc00a927171388d346a3a57904ff2dfa0f826dddb2ce3c5e11eed
+EBUILD blender-2.72b-r4.ebuild 8115 BLAKE2B c864b87e4003dcf523876a57ba238951e3e31282346de9a132caf68a224abb2b2a076d86676e1e7c100ce7cec6c4a774431a190e0b33cce5389c52b1cc9d2da6 SHA512 5ec076d2e03a8cf459c04d6f03257a3bce47dc41e0007242bb9d70a64683f2787934eaf041ee7ac93e387a6d40cf1371f1d63f60e2e2a5ee2aeb59127d321364
+EBUILD blender-2.79-r1.ebuild 8113 BLAKE2B 224d9b443d4799ed3a87f3bcd498ba0396c15ccc3925cef478beb29cd3feada35e913f2bdb7eba58625d25b213cca9512f99526750d00e75e2bd5be0257bcf88 SHA512 9a70cda8d9a226acc1eeb343d7dd14acbdc5527ea832ea3f3e6b4d987e3c4675342078de2adfb6d8c7e247a956ba4aa33c70c2768379267935dff52fbe570192
+EBUILD blender-2.79.ebuild 8061 BLAKE2B b272ffbd61642c168c1b248983a819928eea34fcb4f34c196ce75d92aa65dafe2f1f0cf5f1c823ce9cfa001c5e1758f9752f2a2dbd1081e002cfd1389adbef6d SHA512 5966a1b28386891fb9f2aafa0731fbcf0a69bc9c7ff2cb0ce631c3af3888d88364dd18d31d9a4c4b2e28b64727c3a37b9eaf0f0587f362e9fd27ad83ddfad0dc
 MISC metadata.xml 3716 BLAKE2B 2c04c8b2724d9153efc0bdf8772b4a107e072a009032d390977f53972fb4afe27eada91da3991f680f41d8114d22a75e84c4f359e00ef2b378e53d7b507a45de SHA512 77866e595fba02c31ac64d9a124af03a6fe9080b27434ea2f93e615c6e702d1a393103d96c361079b1b5af861f0775cc0e57888d23e528e32c326dca7af4c09d
diff --git a/media-gfx/blender/blender-2.72b-r4.ebuild b/media-gfx/blender/blender-2.72b-r4.ebuild
index ede795b90d16..23b564e42069 100644
--- a/media-gfx/blender/blender-2.72b-r4.ebuild
+++ b/media-gfx/blender/blender-2.72b-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 ## BUNDLED-DEPS:
@@ -32,13 +32,13 @@ PYTHON_COMPAT=( python3_4 )
 inherit multilib fdo-mime gnome2-utils cmake-utils eutils python-single-r1 versionator flag-o-matic toolchain-funcs pax-utils check-reqs
 
 DESCRIPTION="3D Creation/Animation/Publishing System"
-HOMEPAGE="http://www.blender.org"
+HOMEPAGE="https://www.blender.org"
 
 case ${PV} in
 	*_p*)
 		SRC_URI="https://dev.gentoo.org/~lu_zero/${P}.tar.gz" ;;
 	*)
-		SRC_URI="http://download.blender.org/source/${P}.tar.gz" ;;
+		SRC_URI="https://download.blender.org/source/${P}.tar.gz" ;;
 esac
 
 if [[ -n ${PATCHSET} ]]; then
diff --git a/media-gfx/blender/blender-2.79-r1.ebuild b/media-gfx/blender/blender-2.79-r1.ebuild
index 108783768d04..b7db3139bdae 100644
--- a/media-gfx/blender/blender-2.79-r1.ebuild
+++ b/media-gfx/blender/blender-2.79-r1.ebuild
@@ -8,9 +8,9 @@ inherit check-reqs cmake-utils xdg-utils flag-o-matic gnome2-utils \
 	pax-utils python-single-r1 toolchain-funcs versionator
 
 DESCRIPTION="3D Creation/Animation/Publishing System"
-HOMEPAGE="http://www.blender.org"
+HOMEPAGE="https://www.blender.org"
 
-SRC_URI="http://download.blender.org/source/${P}.tar.gz"
+SRC_URI="https://download.blender.org/source/${P}.tar.gz"
 
 # Blender can have letters in the version string,
 # so strip of the letter if it exists.
diff --git a/media-gfx/blender/blender-2.79.ebuild b/media-gfx/blender/blender-2.79.ebuild
index 06c60b3f827e..145205ce35b8 100644
--- a/media-gfx/blender/blender-2.79.ebuild
+++ b/media-gfx/blender/blender-2.79.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,9 +8,9 @@ inherit check-reqs cmake-utils xdg-utils flag-o-matic gnome2-utils \
 	pax-utils python-single-r1 toolchain-funcs versionator
 
 DESCRIPTION="3D Creation/Animation/Publishing System"
-HOMEPAGE="http://www.blender.org"
+HOMEPAGE="https://www.blender.org"
 
-SRC_URI="http://download.blender.org/source/${P}.tar.gz"
+SRC_URI="https://download.blender.org/source/${P}.tar.gz"
 
 # Blender can have letters in the version string,
 # so strip of the letter if it exists.
diff --git a/media-gfx/fim/Manifest b/media-gfx/fim/Manifest
index ff5dc37d6dbc..a558ac9798f3 100644
--- a/media-gfx/fim/Manifest
+++ b/media-gfx/fim/Manifest
@@ -1,5 +1,9 @@
 AUX fim-0.4_rc3-gcc6.patch 2140 BLAKE2B d5b041660e880675d83bd3743c647a12def7058a1731a272399a27999de61c51509df4b6e31f96a715ccdcec22a8506714eff22e28f643660c0b52e71502843b SHA512 288796013b4f3f54cb7893de2a558a5315c00bd09aed770bb3f0b743e06575d35d23addca67e192fcf96378f637d1421d2258785065c081816e9a556a7d930d5
 AUX fim-0.4_rc3-poppler031.patch 706 BLAKE2B b358bc51ccdb6b19533f4ef0571eb2f86e9f1259d4a6ca86d3cddeaf96b6e983a19993ce523a8edb45037eafd12412a56ca641276eb5ba6a915d0cd1bef8b88d SHA512 ddd9d5a9a8fee1269af6daed3edf965f3a2eba33c31c86bfae5af1b1db2e6809e6ad92439b9a438a7ab8a8dc7e30f9c472aad8d13c96b3d5371726b6fac6972c
+AUX fim-0.5_rc3-jpeg.patch 434 BLAKE2B a0de955643df8602a940f42f1727b4d7ae4ed1d65ce62ee32b0bf9882b1143aecf1566bc0328ae2ca7e6fd21d5331b78e43638fb2a295da09a816854e2e22f53 SHA512 e7918287d59a6677f2c0701a3e03871c2913aacb525438e56daf26064192606ff50b82b8334a3f96e1651fce895d7018606e24a06408fe1981a241f8b874dc7c
+AUX fim-0.5_rc3-libsdl.patch 905 BLAKE2B 5ee899dfa13c362ff4b5de243968376bd9c602f1c4d34763c99556fa0aa8ed523480fe4a65043124d5d65ebf67f376768647284db4a8ccfb812b62b33deee858 SHA512 b96dff8e07f44f24aa2324344889c6828f0d913f40a0b9eab8dffc58e3fddecafa36baa18eee08e19cbf5d1ad3996b1cbcda195c3f58f91537ce309a1345150c
 DIST fim-0.4-rc3.tar.bz2 504681 BLAKE2B 6a161e5b278b980a4442300f1c7d90b5ab690f6379cb0f2e72d7b2b3478d1877f1c99f1f46f173f788390ea32d6185f13d570ea128d2f52ff351dff74c779737 SHA512 82a2b191c0cd26fb77b442df9ed104e51ae15f485390f07cf15a043725e6ee9b860ce903bf8355ad556adbbe076516a8807c0a6d937e89177e46c0068d5acabf
+DIST fim-0.5-rc3.tar.bz2 564226 BLAKE2B 117e4a8644f1b7133f8a5337ce1a606017bee81180ff9a6fbd0c19d3056d2e670a84db20f2a0080ff5bf8e6e91108fdc952b77e4799f47968b38a108f145871e SHA512 946825e683a9020740b6e2115e44e4cd99b4d6bf59fde53d08d90666f00cdb8d98797d4e88b4513dd0e8d8fe5fbab3073cb1aae72117d129688050adf73da306
 EBUILD fim-0.4_rc3-r2.ebuild 2501 BLAKE2B 5f66202def62df300eddfed039655131adbd86a26cbe316c8dc67cb9753e99749893a65af02780ad120db625c87ba4fb652fb363677b8cd0348796e08b1f268b SHA512 b0839bab333a084bdc2d2864e3fd03d084af3522c99d5699c2fe9251ccdf585043f7dce491805a8ebae893906fa2054be034d50435b2d98ad14e634484421e97
-MISC metadata.xml 492 BLAKE2B cd37b0d51b77c8222a5064701f2ede90757dd39938532f7240df6dd05b399478b831b39d6c5a987def61e47a1dc3632575e24bb13801637131419cc93a98c819 SHA512 48b25d06654705efc6b14b9e7d4a5198f3146e281151bfd54b48c181296a45cb2a38f3548257b369ab100b2502a31c15fc2b07e80ae2c2a15b4480321db2e32c
+EBUILD fim-0.5_rc3.ebuild 2725 BLAKE2B dadbe6a87a5a3bdbaa02da27e40bbc4dd36568d570ec7dfdf879870a7af7ebf0c91360511f626ce7065bb97ff26cdba44be38c0e24932e69c282baee0883d346 SHA512 a08429dcdec86eca9e50267ab7bef1b04dbf042f9718822b13baa83b06a6e2af57ec4107aaee7b9a9d3ac278c52c0222508003eac2b1e49f25478ee9b6215722
+MISC metadata.xml 714 BLAKE2B cae2d5ed896e4abac20df176c20df975b38a4c1fb429134c2c829a07af07cb6db86f2081252ba893fc8124385c842227eac5cb44c96595b1c5e798a6f06586d3 SHA512 57b1bbbf3b980fc94b58dfa9f4631e65a49b1b21f62966acaae13a2401cfb0466a0dac068cad51948c9795144a8445595d7d27b1a9b8f0d0f0e3ee4bd28739cc
diff --git a/media-gfx/fim/files/fim-0.5_rc3-jpeg.patch b/media-gfx/fim/files/fim-0.5_rc3-jpeg.patch
new file mode 100644
index 000000000000..1887196f7cbf
--- /dev/null
+++ b/media-gfx/fim/files/fim-0.5_rc3-jpeg.patch
@@ -0,0 +1,13 @@
+https://svn.savannah.gnu.org/viewvc/fbi-improved/trunk/src/FbiStuffJpeg.cpp?r1=1041&r2=1076
+
+--- trunk/src/FbiStuffJpeg.cpp
++++ trunk/src/FbiStuffJpeg.cpp
+@@ -179,7 +179,7 @@
+ 
+ 	if(nsp)
+ 		/* std::cout << "|" << title << "|\n", */
+-		nsp->setVariable(string("EXIF_") + title,value);
++		nsp->setVariable(string("EXIF_") + string(title),value);
+ }
+ 
+ static void fim_ExifDataForeachContentFunc (ExifContent *content, void * user_data)
diff --git a/media-gfx/fim/files/fim-0.5_rc3-libsdl.patch b/media-gfx/fim/files/fim-0.5_rc3-libsdl.patch
new file mode 100644
index 000000000000..0f1e6beb6feb
--- /dev/null
+++ b/media-gfx/fim/files/fim-0.5_rc3-libsdl.patch
@@ -0,0 +1,27 @@
+https://svn.savannah.gnu.org/viewvc/fbi-improved/trunk/configure.ac?r1=1474&r2=1521
+
+--- trunk/configure.ac
++++ trunk/configure.ac
+@@ -1128,15 +1128,17 @@
+ 			fim_handle_sdl='no'
+ 		fi
+         else
+-dnl		if test x$fim_cv_want_static == x1 ; then 
+-			LIBSDL_CONFIG_FLAGS=--static-libs
+-dnl		else
+-dnl			LIBSDL_CONFIG_FLAGS=--libs
+-dnl		fi
+ 		AC_MSG_NOTICE([Activating LIBSDL.])
+ 		fim_handle_sdl='yes'
+                 LIBSDL_CXXFLAGS=`$LIBSDL_CONFIG --cflags`
+                 CXXFLAGS="$CXXFLAGS $LIBSDL_CXXFLAGS"
++		LIBSDL_CONFIG_FLAGS=--static-libs
++		if $LIBSDL_CONFIG $LIBSDL_CONFIG_FLAGS ; then 
++			LIBSDL_CONFIG_FLAGS=--static-libs
++		else
++			LIBSDL_CONFIG_FLAGS=--libs
++		fi
++		AC_MSG_NOTICE([Invoking $LIBSDL_CONFIG $LIBSDL_CONFIG_FLAGS.])
+                 LIBS="$LIBS `$LIBSDL_CONFIG $LIBSDL_CONFIG_FLAGS`"
+ 		# finish this !
+                 #FIM_LIB_OBJECTS="$FIM_LIB_OBJECTS SDLDevice.o"
diff --git a/media-gfx/fim/fim-0.5_rc3.ebuild b/media-gfx/fim/fim-0.5_rc3.ebuild
new file mode 100644
index 000000000000..1fc260ca524d
--- /dev/null
+++ b/media-gfx/fim/fim-0.5_rc3.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="Fbi-IMproved is a framebuffer image viewer based on Fbi and inspired from Vim"
+HOMEPAGE="https://savannah.nongnu.org/projects/fbi-improved"
+SRC_URI="http://download.savannah.gnu.org/releases/fbi-improved/${P/_rc/-rc}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="aalib bmp dia djvu exif fbcon gif graphicsmagick imagemagick jpeg jpeg2k pcx pdf png postscript readline sdl static svg tiff xfig"
+
+RDEPEND="media-fonts/terminus-font
+	aalib? ( media-libs/aalib[slang] )
+	dia? ( app-office/dia )
+	djvu? ( app-text/djvu )
+	exif? ( media-libs/libexif )
+	gif? ( media-libs/giflib )
+	graphicsmagick? ( media-gfx/graphicsmagick )
+	imagemagick? ( virtual/imagemagick-tools )
+	jpeg? ( virtual/jpeg:0 )
+	jpeg2k? ( media-libs/jasper:= )
+	pdf? ( >=app-text/poppler-0.31 )
+	png? ( media-libs/libpng:0= )
+	postscript? ( app-text/libspectre )
+	readline? ( sys-libs/readline:0= )
+	sdl? ( media-libs/libsdl )
+	svg? ( media-gfx/inkscape )
+	tiff? ( media-libs/tiff:0 )
+	xfig? ( media-gfx/xfig )"
+DEPEND="${RDEPEND}
+	sys-devel/bison
+	sys-devel/flex"
+
+S=${WORKDIR}/${P/_rc/-rc}
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.4_rc3-poppler031.patch"
+	"${FILESDIR}/${PN}-0.5_rc3-jpeg.patch"
+	"${FILESDIR}/${PN}-0.5_rc3-libsdl.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable aalib aa) \
+		$(use_enable bmp) \
+		$(use_enable dia) \
+		$(use_enable djvu) \
+		$(use_enable exif) \
+		$(use_enable fbcon framebuffer) \
+		$(use_enable gif) \
+		$(use_enable graphicsmagick) \
+		$(use_enable imagemagick convert) \
+		$(use_enable jpeg) \
+		$(use_enable jpeg2k jasper) \
+		$(use_enable pcx) \
+		$(use_enable pdf poppler) \
+		$(use_enable png) \
+		$(use_enable postscript ps) \
+		$(use_enable readline) \
+		$(use_enable sdl) \
+		$(use_enable static) \
+		$(use_enable svg inkscape) \
+		$(use_enable tiff) \
+		$(use_enable xfig) \
+		--disable-hardcoded-font \
+		--disable-imlib2 \
+		--disable-matrices-rendering \
+		--disable-xcftopnm \
+		--enable-fimrc \
+		--enable-history \
+		--enable-loader-string-specification \
+		--enable-mark-and-dump \
+		--enable-output-console \
+		--enable-raw-bits-rendering \
+		--enable-read-dirs \
+		--enable-recursive-dirs \
+		--enable-resize-optimizations \
+		--enable-scan-consolefonts \
+		--enable-screen \
+		--enable-scripting \
+		--enable-seek-magic \
+		--enable-stdin-image-reading \
+		--enable-unicode \
+		--enable-warnings \
+		--enable-windows \
+		--with-default-consolefont=/usr/share/consolefonts/ter-114n.psf.gz
+}
+
+src_compile() {
+	emake -j1
+}
+
+src_install() {
+	emake DESTDIR="${D}" docdir=/usr/share/doc/${PF} install
+}
diff --git a/media-gfx/fim/metadata.xml b/media-gfx/fim/metadata.xml
index 6b3d433fbf24..e69460104901 100644
--- a/media-gfx/fim/metadata.xml
+++ b/media-gfx/fim/metadata.xml
@@ -1,13 +1,19 @@
 <?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="dia">Enable DIA file support via app-office/dia</flag>
-    <flag name="imagemagick">Use convert from media-gfx/imagemagick as fallback file opener</flag>
-    <flag name="xfig">Enable FIG file support via media-gfx/xfig</flag>
-</use>
+	<maintainer type="person">
+		<email>xmw@gentoo.org</email>
+		<name>Michael Weber</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>graphics@gentoo.org</email>
+		<name>Gentoo Graphics Project</name>
+	</maintainer>
+	<use>
+		<flag name="bmp">Enable BMP file support</flag>
+		<flag name="dia">Enable DIA file support via app-office/dia</flag>
+		<flag name="imagemagick">Use convert from media-gfx/imagemagick as fallback file opener</flag>
+		<flag name="pcx">Enable PCX file support</flag>
+		<flag name="xfig">Enable FIG file support via media-gfx/xfig</flag>
+	</use>
 </pkgmetadata>
diff --git a/media-gfx/raw-thumbnailer/Manifest b/media-gfx/raw-thumbnailer/Manifest
index 3a4d3715272d..755de3d2104a 100644
--- a/media-gfx/raw-thumbnailer/Manifest
+++ b/media-gfx/raw-thumbnailer/Manifest
@@ -1,5 +1,5 @@
 AUX raw-thumbnailer-0.2.1-libopenraw.patch 897 BLAKE2B 26065ada735e744b0bac662110f8f6a8d70f808721452adab0c7b4cf6927152ab255e424b2978147895e36833cf525893d3f601a09871e712a2dcd348d05e1f0 SHA512 c9b582a6f7d8ccd5958da96d4773105e17b9047b1081d5a4e2a48384831f83e79ef32b9fafd3cd2436472ac86554ffa2232b1d039f06d9890425c5b2d6da185d
 DIST raw-thumbnailer-0.2.1.tar.gz 89468 BLAKE2B 8041cfee56f9be900c6f7bfa6dfb9b21b482ee8eb7dacb83ed37603c32edf6e1dee122de3e98b06d158b6725a1900c73c7e1aee1b8e6a53545428ff7aca47b53 SHA512 cc3c107b060add00b4af811bb548b597493ff0d54d863c530d183970ac8bdd4f6b9f4c25cf978e1d2bf80b11424dbbfb20e73c6dd1abeff3a15a08843bcd41e1
-EBUILD raw-thumbnailer-0.2.1-r1.ebuild 667 BLAKE2B d1eff79489037b3481bed89ffda015e7c047d158c4325ec6001b7bb099da1e35a5b7f33e9e08026505aa468d86d12b38eae22ff33a4a65cd8c41f6caec005fb7 SHA512 76d9efd456bc1cd93bef33cfbf2b61c60cc68dd36309f80cf2c48531ef400caf4297e0637e19c995a2292fb0daf94c24c3485259e205e435e503b3d59a803241
+EBUILD raw-thumbnailer-0.2.1-r1.ebuild 666 BLAKE2B 69206b8a4f4e37fc24a4740ce221b4fb07366a407bec9793a788bb45e2e3d2452615ae2e2d7c35ccab5c76a6bbbbd9d2f0c4b7eeaf46b10e33a209907a7fa039 SHA512 542f64a627f800b26de8b5503b0489106976457c15eec52c09ce50fcfb78de3487b9f9a7e240bfeef1912cb036f12a07703ea58ce0114a24ad2cf802bd8caacc
 EBUILD raw-thumbnailer-0.2.1.ebuild 540 BLAKE2B e414123881d1b4f1d3aa8b2b8a37e7a9cc7b14ed05337f9f5091f2281f30661541d5bcfbae9b5b96815a88a5fc4cd523ef9adba9b7599dce7c942341002ad292 SHA512 c2c23998a3af64a083872e64654539e02ece59ca37375c81f2c4bdf96e84d57f51129b78cd73bffb67c66edabe9e81dcc2b94c0284b07b7d7a6a4b8d660cae7a
 MISC metadata.xml 407 BLAKE2B 713244da2a69bfc59fb7a82373bba128e0d08fe7c12645245fb01df403e3affc792fc26ca28967dcc6c499145e90f9a34eb7c984164ccf4396a8924c4c153312 SHA512 7383547238ca395a6cffde72366521dd7e3e04218f8840f19f093cfa61d0788d10138d39250702085a5669f715aaf3d0da5e357829a0e0fd44a70d20c14ed46a
diff --git a/media-gfx/raw-thumbnailer/raw-thumbnailer-0.2.1-r1.ebuild b/media-gfx/raw-thumbnailer/raw-thumbnailer-0.2.1-r1.ebuild
index 853a7a6ed512..d14b02cd628f 100644
--- a/media-gfx/raw-thumbnailer/raw-thumbnailer-0.2.1-r1.ebuild
+++ b/media-gfx/raw-thumbnailer/raw-thumbnailer-0.2.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ia64 ppc ~ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ~ppc64 sparc x86"
 IUSE=""
 
 RDEPEND=">=media-libs/libopenraw-0.1:=[gtk]
diff --git a/media-gfx/ristretto/Manifest b/media-gfx/ristretto/Manifest
index 559ce451c059..090b8db06ca5 100644
--- a/media-gfx/ristretto/Manifest
+++ b/media-gfx/ristretto/Manifest
@@ -1,9 +1,3 @@
-AUX ristretto-0.8.0-fix-appdata-validation.patch 1084 BLAKE2B d627a8f32fab6aaf2ad6a03857e6233f7f200c9c8bc504a2d92f98e9dbb58c31580590894cc8094555acdf8d20a2305645d957d38091576579409bf2ee2a0514 SHA512 dcd2ee1a6b21c7973b0de30632029628eadc604f4d606f16d72eb344b2f321caeed527c9964ddd4972d5db529bf48bc234ef67759953943b2df21ddaaed94fa4
-AUX ristretto-0.8.0-fix-icon-installation.patch 745 BLAKE2B 1903ccfc4f3cdc171138870dbfef27426e6e2f58aa8c4ff9fc2b1853dbb1e533d46cda0c41d3919f66d2d09208131c1c5587892319377fe88499ac96f70c9e65 SHA512 878c6e377ab261b7034d659be768c816ad61be960a792d506dde404d0a7c04436d8ca60bec35a4562ead219cc329b53e301afda1536ce456270cb5469472a079
-DIST ristretto-0.8.0.tar.bz2 541473 BLAKE2B 5d13133177b73716ae85426f85e4eab2f2b4b3a9c10ebd3e024ee54bf855ec83ffd5f695eb3a8ba665d609f6af24e76f6e20242f08cc31d015cf35921ccd283c SHA512 067d3e7b5ec4fe3537cc796b94e8b999fc99efdb58c52a2a71160405626a3784caa877724e756b363012dce4719ee534f4ce0c92f2f6f2adaf937da8d5abab99
-DIST ristretto-0.8.2.tar.bz2 559444 BLAKE2B a44cb653fca2452d787b2d69b556fddc9f6f9d0ae2a447d411649b37d49398700ed216af6348de98124468b3a4fd2b10d9b3a7f75c3438d5e14127bacbced50d SHA512 bceef420ebb6e5ab89f339cb4d173bbdd3abc09df5f7dd4551e5c8484e226af6a4ef7b131888926027bae901fd05278cf29de296588723142bd6d0bd8afc312e
 DIST ristretto-0.8.2git-rd21ed3c.tar.bz2 584418 BLAKE2B 50d24fa81f4ce59a3a9acdb71a532e8d57399aafc4c20790b4a08ef3584bf3c71af978cb4e53ba6f4821fd4fc02e12600d39b84309ee29a764581855fd43bc75 SHA512 17fe6b5c24d4f4f3b6d28e1c435afbb0140e81a77f2b1c628ab7e05ed380a55a902368dabbb8e92647f08bb8853df8099b8de779d94dc91d3426cc7e33cbcbe3
-EBUILD ristretto-0.8.0-r1.ebuild 959 BLAKE2B 546b009d37ebf39e984bd0b81deefd55e66c0f6336328a79d785d866e1468483aab6eba1cfe1fbbea993b2baf1876d925342e25c8e46fd11bc5d4791d3bb6b8a SHA512 6a0829f14ac72ce3e7860412e09ea9148d39d00fd21d9cd52f2dac30c4bdc0cf10ebe8f471f519886f7d85530eced1d518cbe9eca090eb741e7b0a555f9edd38
-EBUILD ristretto-0.8.2.ebuild 853 BLAKE2B 17ad3b252cfc8b1c07e3e7c65873d0c85b69eb56e64b148efc7012ba6ce210f9443089a13aa4259ddd9c473242a15a0773f56c2f199a6c4312ed214bd772d193 SHA512 ab24be0f6c395ba7c3fae4fa1a17ca3dfb785814f05fb1ae788a2b76331647138c0c99db760656d89acb44b945f260ad061d26c79527023b09f21a95489c0ecd
 EBUILD ristretto-0.8.2_p20170821.ebuild 949 BLAKE2B 118693c9ce2ac41f5dfce5410cf4951c3f05ea5334a84b04c43e4d877d14021eb08b30a99c343270af2ccb1611ee898695f9d20fada95888a28516a6ff1dfa26 SHA512 01e5b950ff9684ade413e33532e0f81b0ea214bd13203cfe68f2cfa7bd278be50d27cb9a1196b0ab69d80a0f48384aa11e0686074d7919e17fcb0cd8d8b40d12
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/media-gfx/ristretto/files/ristretto-0.8.0-fix-appdata-validation.patch b/media-gfx/ristretto/files/ristretto-0.8.0-fix-appdata-validation.patch
deleted file mode 100644
index e1266ab547b9..000000000000
--- a/media-gfx/ristretto/files/ristretto-0.8.0-fix-appdata-validation.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 3ae341ba0bbf5c0fefcdb02a3674061a6b73f7db Mon Sep 17 00:00:00 2001
-From: Kevin Fenzi <kevin@scrye.com>
-Date: Mon, 2 Mar 2015 15:41:11 +0300
-Subject: appdata fails validation (Bug #11622)
-
-appstream-util fails with "cannot contain a hyperlink".
-
-Signed-off-by: Eric Koegel <eric.koegel@gmail.com>
-
-diff --git a/ristretto.appdata.xml.in b/ristretto.appdata.xml.in
-index 0ff8b22..ea7a96f 100644
---- a/ristretto.appdata.xml.in
-+++ b/ristretto.appdata.xml.in
-@@ -66,7 +66,7 @@
-     <release version="0.6.0" timestamp="1335662454">
-       <description>
-         <_p>This version comes with several changes such as online documentation on
--           http://docs.xfce.org, the option to limit the maximum image-quality to
-+           docs.xfce.org, the option to limit the maximum image-quality to
-            the screen dimensions to improve memory-usage and performance - now ristretto
-            renders at full quality with this option disabled, only one toolbar - instead 
-            of two, a quick-launch button on the toolbar to execute an editor, the option
--- 
-cgit v0.10.1
-
diff --git a/media-gfx/ristretto/files/ristretto-0.8.0-fix-icon-installation.patch b/media-gfx/ristretto/files/ristretto-0.8.0-fix-icon-installation.patch
deleted file mode 100644
index 79eed6b47b7d..000000000000
--- a/media-gfx/ristretto/files/ristretto-0.8.0-fix-icon-installation.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-This should normally patch Makefile.am and use autotools.eclass to re-run
-autoreconf. However, this does not work out of the box and pulling out the big
-artillery to fix a simple typo which will be gone in the next release wasn't
-worth the trouble.
-
-See https://bugs.gentoo.org/542604.
-
-Denis Dupeyron <calchan@gentoo.org>
-
---- icons/128x128/Makefile.in.orig	2015-04-20 21:16:04.376497095 -0600
-+++ icons/128x128/Makefile.in	2015-04-20 21:16:23.423138219 -0600
-@@ -337,7 +337,7 @@
- top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
--iconsdir = $(datadir)/icons/hicolor/48x48/apps
-+iconsdir = $(datadir)/icons/hicolor/128x128/apps
- icons_DATA = ristretto.png
- EXTRA_DIST = $(icons_DATA)
- all: all-am
diff --git a/media-gfx/ristretto/ristretto-0.8.0-r1.ebuild b/media-gfx/ristretto/ristretto-0.8.0-r1.ebuild
deleted file mode 100644
index 8974558e41db..000000000000
--- a/media-gfx/ristretto/ristretto-0.8.0-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit xfconf
-
-DESCRIPTION="A fast and lightweight picture viewer for the Xfce desktop environment"
-HOMEPAGE="https://docs.xfce.org/apps/ristretto/start"
-SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="debug"
-
-RDEPEND=">=dev-libs/dbus-glib-0.98:0=
-	>=dev-libs/glib-2.24:2=
-	media-libs/libexif:0=
-	x11-libs/cairo:0=
-	>=x11-libs/gtk+-2.20:2=
-	x11-libs/libX11:0=
-	>=xfce-base/libxfce4ui-4.10:0=
-	>=xfce-base/libxfce4util-4.10:0=
-	>=xfce-base/xfconf-4.10:0="
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig
-	sys-devel/gettext"
-
-pkg_setup() {
-	PATCHES=(
-		"${FILESDIR}"/${P}-fix-appdata-validation.patch
-		"${FILESDIR}"/${P}-fix-icon-installation.patch
-		)
-
-	XFCONF=(
-		$(xfconf_use_debug)
-		)
-
-	DOCS=( AUTHORS ChangeLog NEWS TODO )
-}
diff --git a/media-gfx/ristretto/ristretto-0.8.2.ebuild b/media-gfx/ristretto/ristretto-0.8.2.ebuild
deleted file mode 100644
index 7c1f99c4c960..000000000000
--- a/media-gfx/ristretto/ristretto-0.8.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit xfconf
-
-DESCRIPTION="A fast and lightweight picture viewer for the Xfce desktop environment"
-HOMEPAGE="https://docs.xfce.org/apps/ristretto/start"
-SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug"
-
-RDEPEND=">=dev-libs/dbus-glib-0.98:0=
-	>=dev-libs/glib-2.24:2=
-	media-libs/libexif:0=
-	x11-libs/cairo:0=
-	>=x11-libs/gtk+-2.20:2=
-	x11-libs/libX11:0=
-	>=xfce-base/libxfce4ui-4.10:0=
-	>=xfce-base/libxfce4util-4.10:0=
-	>=xfce-base/xfconf-4.10:0="
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig
-	sys-devel/gettext"
-
-pkg_setup() {
-	XFCONF=(
-		$(xfconf_use_debug)
-		)
-
-	DOCS=( AUTHORS ChangeLog NEWS TODO )
-}
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 894d53ae1173..12f21b6529e0 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/gd/Manifest b/media-libs/gd/Manifest
index 7a677b593d4a..7992dd771207 100644
--- a/media-libs/gd/Manifest
+++ b/media-libs/gd/Manifest
@@ -1,5 +1,5 @@
 DIST libgd-2.2.4.tar.xz 2478528 BLAKE2B bec49fd50465549d13a403e6f2d487ef83633842ff313a44f45ea9bf50c66e70186f314da5a943cc4199185b992f8178334bfb14fb039fe51cdb296e80648cdc SHA512 07903f322c4f6ab392508b0f60c38ca133699111ea92995dc6cd9379210d598bcb24a46c19657884d9e252f8663d0ee8c89c600e3a382a5ae598198c190f39b5
 DIST libgd-2.2.5.tar.xz 2594092 BLAKE2B 222a7e012fbf9924ac391ee96c7cd3dec96afd78c6d43dfb680b33e7143e7df87fe6be75bbfe8fb93e916302d7daf08271214c84da28712e93a36465566cb2bd SHA512 e4598e17a277a75e02255402182cab139cb3f2cffcd68ec05cc10bbeaf6bc7aa39162c3445cd4a7efc1a26b72b9152bbedb187351e3ed099ea51767319997a6b
 EBUILD gd-2.2.4.ebuild 2072 BLAKE2B 1acf2722c761a805ce0fa14a6301d04c7fb00bc4cfd2e9b21d8b92d7521154382cfcd56c7a0be3daadfe8420f38457038228bd88a8b4fba257eba720d5a6bd11 SHA512 016b8b4c88a5f50b931e903b1dab5f029da8892269eb3e2e16623936c0764b0ae0360a73b6ddc0cec5ed2587784bdf621e54a2d830a4efa866b14d551623fa54
-EBUILD gd-2.2.5.ebuild 2047 BLAKE2B 0fdb102aa3cb92ef7a7691c462d155e29601e6b85123898c255187306ea61026cd7c416bdf97ac38816ed61d295c3b4efc230d7ba7d750d9bc0d28007c8c5c97 SHA512 0826e1e8908bda3c31d432f3470a7984b58861f7448fcf7690d87ec2ec2fa4887e8f74f685531d587b3358cb796fd0763891182ba7492d88845b84ce8f2f8c74
+EBUILD gd-2.2.5.ebuild 2043 BLAKE2B d26a91f5c7658d216f282818208768a30fcfb9266999ce51b1ab5dd9689e73b46d2116e611736baf716ec0beb0996ede8d3c1ac4c53235f5d165e89eff092044 SHA512 62080ddfdac28fc39f1f5639212d5a11557baeb64ebcd145d5bfaab3a5e11a91bfc7984264001d0b94e6e1ca7b4f3114094a3827d0b479250c84d3c6ee0a02c3
 MISC metadata.xml 1507 BLAKE2B 34dbcbc70165ebe74ea14e6394e2691bda7523e4c848b13a512de8f0707c194a7da3de41a8fe483d7a8b2aa1af8f0d164ea210605ae76480dbf22b976b53d2f5 SHA512 0ac3c1ca25c190333e7f97dbb05e197e62e76abeaa045966fa3024dbeb22d541d78794df08d450e887591909a25dfb6a4fef861ed62f7f055b129e17b1329919
diff --git a/media-libs/gd/gd-2.2.5.ebuild b/media-libs/gd/gd-2.2.5.ebuild
index dd27316e7a25..7290fcb7551f 100644
--- a/media-libs/gd/gd-2.2.5.ebuild
+++ b/media-libs/gd/gd-2.2.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/libgd/libgd/releases/download/${P}/lib${P}.tar.xz"
 
 LICENSE="gd IJG HPND BSD"
 SLOT="2/3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~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 ~m68k ~mips ppc ppc64 ~s390 ~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="fontconfig jpeg png static-libs tiff truetype webp xpm zlib"
 
 # fontconfig has prefixed font paths, details see bug #518970
diff --git a/media-libs/jasper/Manifest b/media-libs/jasper/Manifest
index 524c620903a6..995553d89d20 100644
--- a/media-libs/jasper/Manifest
+++ b/media-libs/jasper/Manifest
@@ -2,6 +2,6 @@ AUX jasper-2.0.14-fix-test-suite.patch 1097 BLAKE2B 050311299ad9e247663b045f87b0
 DIST jasper-2.0.12.tar.gz 1311323 BLAKE2B bc9922bfc4765ea4630f9a504c9e5a1c0992f78c2ef68cd077ba0c8a36332debd5db9fc5c639accc7eaa0eda64e478c1e615da9f2eaf363446635dd94a253fa0 SHA512 a308983511119d85e6580772f5164c188e2e170500fa4b98c8831aa63aa87cb661b88952b278e390497571f9ebf9286855a8aa946037692309ba5f41cffe265a
 DIST jasper-2.0.14.tar.gz 1311825 BLAKE2B 0cd2feb5a73aaa2da6f1d105fefe98f57c6a5ecf92f6449891f49eca0b5926bc683a03bf933b920cad95883134cf292405f244f10b3bbe7867a41f2dde80337e SHA512 6b270cb1eb55f777f30016f3258e5e2297627e7d086334814c308464f5a4552c23241b0fdbc81ea715a6f4746294657f96c1cb6ceb320629ce57db7e81d84940
 EBUILD jasper-2.0.12.ebuild 1807 BLAKE2B 724d504c046501904f8da136be0042665b453f02320574ec807f069b1b6f246b3ec11d53908ab03681f456d10888f35dabcf6c9e771975837336799d773974e9 SHA512 7fd349ca1e0f5f8c3bbded01685dbc8dd699811f98f3d781e32ef42e94c4c3c2c08af9b6b1ef8988e6c4b4b84a4f0c11d647bdb4aca1239b38000efe90fc84e1
-EBUILD jasper-2.0.14.ebuild 1920 BLAKE2B 2d67f8e89e0e04e0fecb55e65f5e58b18804b54913ecc7352aebdbaa8320d11b82e8905d98bea76625ee505060a86f984fcbc27961d3b1990fc62503838a36f8 SHA512 d3e133c73678bac7333d33f72e12f75761c53c9887fbf34a0c8ad6c1f872e7002d919c0582718504f0eb14222d1e2ca69438aaa53714ebb2245d8ad00dd2d777
+EBUILD jasper-2.0.14.ebuild 1919 BLAKE2B f2055e26f616313f6260d6c2662febb6c7a2bc4dfec03e59d03c2650bad1bd8ac3c4e5b21119bba0dc5dc426ecc7821e95d45d1fbb7b89647050b7bf572f520b SHA512 1a59ac2c42290c6d059c910f7fd06583d2fe56611429c79b24577b1069d5c9ccc2b061cff72fce73572d78d96498ad9b9e7aee908ae40d845faa19a06cab7ac6
 EBUILD jasper-9999.ebuild 1814 BLAKE2B ff6b0d726b1988d0b1fbbf8e737808839f29fbd253c18d9a0c1b2b451b8ff8e7966672d45f04963c5c104dbcf3f2b9656d2c3ecc939b871a4210fd061c1126ab SHA512 3d137d1caac04177169b847a5fc1b8ae3148f8dc215fcfb51881d7a793c6d889ac818f03bf670b97999a461ec4810eb6ec19d1a34a58aa915e4aedb15a00e5f2
 MISC metadata.xml 342 BLAKE2B 4260ac1403a844c48b72bd62c04073de06da73cecca8bbab9fdd7de36b4a462feabee08d933b0098c451691b17aa3ff7d7e3eb25052461381a37198b12225c55 SHA512 a01344f985dc6b7a24ca568fe859f2a593b55df39ba7b711c4db62eb7df5389007cb6c8dd1ab399f70bf8cb221a22681a9eab279ce8ab1ea6b198fa65f1b8a20
diff --git a/media-libs/jasper/jasper-2.0.14.ebuild b/media-libs/jasper/jasper-2.0.14.ebuild
index 9e3a30900081..dc7e97111944 100644
--- a/media-libs/jasper/jasper-2.0.14.ebuild
+++ b/media-libs/jasper/jasper-2.0.14.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then
 else
 	inherit vcs-snapshot
 	SRC_URI="https://github.com/mdadams/${PN}/archive/version-${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 
 # We limit memory usage to 128 MiB by default, specified in bytes
diff --git a/media-libs/jpeg/Manifest b/media-libs/jpeg/Manifest
index 27161552c71f..036d6b1dd4ea 100644
--- a/media-libs/jpeg/Manifest
+++ b/media-libs/jpeg/Manifest
@@ -12,5 +12,5 @@ EBUILD jpeg-8d-r1.ebuild 2069 BLAKE2B 83224207c0bd3fb14947a3c7bc506fcd5c9d20f9c1
 EBUILD jpeg-8d-r2.ebuild 1532 BLAKE2B 7cb616d69fbad57a538c50f08ecce6a4c76c455724b280d51bbff2dc6707329e8db15e040a1c7ca2bf607dabd1690045cc7ad5cacd66185b01da3abda9386e04 SHA512 66faaee06b6243bfaf5ac512ebc14042b6b41a5c24de53ea376f0fb8b8959ec135bf7789dba6935d96e367059e8d04abb8198a229a47892f4c7df0f94ed677b7
 EBUILD jpeg-9a.ebuild 2035 BLAKE2B 959e8dfd3c8f73a7e8420c03d56f9d1c5b7b84fb92b0c2967b410378ad593d4e4190bdf726ff290654b7dce29b14c530bd2108a3137d4124c0f45f9db9cfecd2 SHA512 9382789c9d079b01d7a9105f75c742d466de0b5726b06a84e36a10c37ea21ec753e2ae1eab03a2f2660e7876eb054bbda20a7aa9688900b54a78e4a510e9607b
 EBUILD jpeg-9b.ebuild 2035 BLAKE2B 959e8dfd3c8f73a7e8420c03d56f9d1c5b7b84fb92b0c2967b410378ad593d4e4190bdf726ff290654b7dce29b14c530bd2108a3137d4124c0f45f9db9cfecd2 SHA512 9382789c9d079b01d7a9105f75c742d466de0b5726b06a84e36a10c37ea21ec753e2ae1eab03a2f2660e7876eb054bbda20a7aa9688900b54a78e4a510e9607b
-EBUILD jpeg-9c.ebuild 2008 BLAKE2B 964307027062fe7a35c893658a229d2075d6d58c243c681844a486b3b2e7ffbad985fb3d6e6ff3acfa6a5bfabab103ca941552dc1f9267f1c24164ad2adfcfc7 SHA512 473a565108c7bf468928afaecbd4c49674c29760961dfa5749bf5ae0afc7fb18c103a8b80e487311af1806c006beab3b99bac8ed71e5c92e514fd985e387d4f0
+EBUILD jpeg-9c.ebuild 2006 BLAKE2B 0a7e33926485fa5faaedd172f82e86a9db17c1472787839266c6018d31ca901c5f6e82fcdba1e11fc10af2183d9cc262c761b611518c36f3defdc2d57a3886a4 SHA512 4dccb83f9f985013c9528f63d9783d5cc0ce16fbe837fdf90ac8904132eec7179bdc4a18dca62678f88b2989815bc081ac720c456f4c6f93fe94f47c993d57a5
 MISC metadata.xml 255 BLAKE2B f12a1ca502ad96bd6de4c8b83dfb8887ab70dec78f10a8b52dcd4618eb182192477ddca18738d734a43f3c7ac3b5e0955f4ae9347ea80e788a92974c7d50a574 SHA512 b7bc93530a1726c2d4dfbc71ae29cfbb57712fd9fdd2e76fd52f35ab4368cba0497b50145d1527a3b79e465d459a380821bb1371a01c2e915dc9adc6c7fafd5f
diff --git a/media-libs/jpeg/jpeg-9c.ebuild b/media-libs/jpeg/jpeg-9c.ebuild
index 08a81c8e0b6d..8f4c74e0f092 100644
--- a/media-libs/jpeg/jpeg-9c.ebuild
+++ b/media-libs/jpeg/jpeg-9c.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.ijg.org/files/${PN}src.v${PV}.tar.gz
 
 LICENSE="IJG"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 DEPEND=""
diff --git a/media-libs/libdvdcss/Manifest b/media-libs/libdvdcss/Manifest
index 2353c20cc21c..9d41e6fa3fbd 100644
--- a/media-libs/libdvdcss/Manifest
+++ b/media-libs/libdvdcss/Manifest
@@ -1,7 +1,9 @@
 DIST libdvdcss-1.3.0.tar.bz2 355417 BLAKE2B 33fa609f8131f7b53d579805fcfcd4aa821f9d9d434f4f34720a4b9a8421bf64206609801da1ca6e36aed63db6c97103cf2303e4b83fbd4a563bf8bbe13147bf SHA512 f3254cb882f03d24e9fbe70fa9aa32ac34c104b57b3ad43727e26a4ab930bddd75de8d9a0e4ba68cdac23e1828f38c2b276679f5386f296cf20db46828836a3d
 DIST libdvdcss-1.4.0.tar.bz2 364373 BLAKE2B bad4bfaa17df33ff665684000d54b91c37b5d924b4b707a47756a2ef9b468256eff966379ab30f0c4d7650c0cd5617f70413a8508fa2279485a14b6b44c38680 SHA512 ad4503a37f47a9563da0b9e387ca3e812f6cdfbf109b8d92f8eccdd879b4270e5b0ee79041d7fb4c86698d72748f7bbf0257db8da6bb1c889dd4f78645e3371b
 DIST libdvdcss-1.4.1.tar.bz2 366169 BLAKE2B 54d3f8ccd76286a5b7082abdc8d134fb47d192bb62ee8d58b04f5eb387b804bdde4ec5c7a48627b9afebbb8d3a783a23189886e50277cf855a819fdd08eefd5e SHA512 4456ebcf8b53a8aaee97643261a14a05c929e9e9120cbe5fc6839ddf62be3dcfe7313fca3ee57c00bea43ddf623dc3d61fff7c2f6316338495df95c9c422f39e
+DIST libdvdcss-1.4.2.tar.bz2 366824 BLAKE2B 106ec0f46eeb4969d0c878ef1e2ad05ac9c0b0ce0d2781c0d68d9d5e08f9c6154b43c4b2e0cd2db0d530eb0a94914161384e788b307af4c4fca3351d270cbe9a SHA512 e46ccded1951046ec481604c5b533c435be14cd0e734cd5315b61868836a20edf4cdc7c1466c2f4ed374de4382c5e758ace700e84aadcb29513001d696f1049c
 EBUILD libdvdcss-1.3.0.ebuild 796 BLAKE2B 46c60fc09583d30961b1526990b8d6f583b9d63acc4c1b2cca1ae44b621d964783ede275c2612f64bea635c2a32e1ad26294282e132e056e551db046883a0498 SHA512 84baa330a130ffd7f0246815ab3c987c9df2f26e59929f8413ea36b0208e5aca607f3865788632a348039cb5f7bcfdf179e5a2f12163ecbfc942007c100094f2
 EBUILD libdvdcss-1.4.0.ebuild 809 BLAKE2B 176d9562c52261563c14a6d0f8e94fff5abca7ad7d1cffa6746f3083b81a5d9e44f7d918717246843bc99d04a99934048ee30040e9734cdbbccdac5f29d139b7 SHA512 62967a8f03b58cee3ebac30fced2da26c9218baad8f3695f4846ab03b5c2d06eb6dfc617ff3043192f231748b23160cf4c4cea7c0c837dc2185c00cefc778c68
 EBUILD libdvdcss-1.4.1.ebuild 817 BLAKE2B 3ec859850660f9f526587a76c993d1b00fc67624a97d6b88997dd44b201ab8e1f9120080cb2b38e8efe22ca2c996a426cfab1cbd19bde146859de2c5ff2d8f3b SHA512 5b264785c8051592e78c67f00a2bc8c1b3eab7a7d0f330ecdbfdee58f3a43e01c983cbef603ba0f43ad70ced2a40118a64c05c2551f1a2ad82eaa9f03919c2c2
+EBUILD libdvdcss-1.4.2.ebuild 817 BLAKE2B 3ec859850660f9f526587a76c993d1b00fc67624a97d6b88997dd44b201ab8e1f9120080cb2b38e8efe22ca2c996a426cfab1cbd19bde146859de2c5ff2d8f3b SHA512 5b264785c8051592e78c67f00a2bc8c1b3eab7a7d0f330ecdbfdee58f3a43e01c983cbef603ba0f43ad70ced2a40118a64c05c2551f1a2ad82eaa9f03919c2c2
 MISC metadata.xml 219 BLAKE2B bca5749b6f2d3541ba2d2635b59056f9ecdc46553991dec3ee5a7bc9f26393bdae62755418850d3cbda0eeb65b7f72029ddf09d4f088b21c84d407d0e6eaa098 SHA512 24793c7fd0e2cef8fa5a0efd9bd55fed1e62ff6810199a969d4c0b869bac9b9ec79b288105b73b1b99734320bb13569a8ee00516b5452dd67d91d14dd17038e2
diff --git a/media-libs/libdvdcss/libdvdcss-1.4.2.ebuild b/media-libs/libdvdcss/libdvdcss-1.4.2.ebuild
new file mode 100644
index 000000000000..bda143969dff
--- /dev/null
+++ b/media-libs/libdvdcss/libdvdcss-1.4.2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit autotools-multilib
+
+DESCRIPTION="A portable abstraction library for DVD decryption"
+HOMEPAGE="https://www.videolan.org/developers/libdvdcss.html"
+SRC_URI="https://download.videolan.org/pub/${PN}/${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="1.2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="doc static-libs"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )"
+
+#DOCS=( AUTHORS ChangeLog NEWS README )
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable doc)
+		--htmldir=/usr/share/doc/${PF}/html
+	)
+
+	autotools-multilib_src_configure
+}
diff --git a/media-libs/libmpris2client/Manifest b/media-libs/libmpris2client/Manifest
index ecad1fddd12d..548d77cb1067 100644
--- a/media-libs/libmpris2client/Manifest
+++ b/media-libs/libmpris2client/Manifest
@@ -1,4 +1,3 @@
 DIST libmpris2client-0.1.0.tar.bz2 287862 BLAKE2B ab5d19c0469e3adad9734141d507ce036d4ddc9d3716b7905648f880680a496c237f2c26afa4983a2c17327171ad5d9052911a5a30e76145b1c5d3e6fc8a17e2 SHA512 29926a60c2da71c78b38154ff39e310785e089abac756a5e1adea71f9f33975028a3110473a07c2cf56271fa978400d1249e5cab44c4bdd440f48ef37775ca44
 EBUILD libmpris2client-0.1.0-r1.ebuild 682 BLAKE2B 0431cdf420648a7e0aec3a34f0b8d40688d8988348f247f44c00dda11d89b6a0fc707663904bc3fc8bf496999790cddb3e357958d6944c14c2fcddad96bf7458 SHA512 e34447e76bbebf913b874ceffa4a71f6d2480595e9f4add835d70d25f5c8db70a62a0f5ac86cc97d50cef8e352432bc6c1b44e4a8b229d7afd56dd9f39d0a206
-EBUILD libmpris2client-0.1.0.ebuild 706 BLAKE2B f9b6bda980119605a27dbb78fd1f6135b7721792dc8800fe661eb4067e3ef9b3cbcb0ce93ef5c095ee914fb1480fbc54197d772a52e35fd0c1a8f999dfd6e9e0 SHA512 7de56ef5053237436fb47591ed02e3c2deee117fb2f9509eda0d75b7cfd3376d29f43d06b14a7512419ca77843a72cd8742b8a85b4427d488107c3d24ca8ffb6
 MISC metadata.xml 346 BLAKE2B f27dc0e8f01c8c2810e8920a46e87c98484cbeb0137faef98c9ece3907df3c5881ee8603a68c258b9fa6ba9b23bc18e0b29610d83c065803849b4f268f01630a SHA512 3e491f998b2ca58209ab5eb0913637b2ae55360d0f356a3fbd054ce0243e361c2852185c1ed0e5b835c7661fc2102bd0831d016320da8686d8573aa8c0b872cf
diff --git a/media-libs/libmpris2client/libmpris2client-0.1.0.ebuild b/media-libs/libmpris2client/libmpris2client-0.1.0.ebuild
deleted file mode 100644
index 07967c18380b..000000000000
--- a/media-libs/libmpris2client/libmpris2client-0.1.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils gnome2-utils
-
-DESCRIPTION="An library to control MPRIS2 compatible players"
-HOMEPAGE="https://github.com/matiasdelellis/libmpris2client"
-SRC_URI="https://github.com/matiasdelellis/${PN}/releases/download/V${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2
-	x11-libs/gtk+:2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS="AUTHORS NEWS README TODO"
-
-src_install() {
-	default
-	prune_libtool_files
-}
-
-pkg_preinst() {	gnome2_icon_savelist; }
-pkg_postinst() { gnome2_icon_cache_update; }
-pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/media-libs/libmtp/Manifest b/media-libs/libmtp/Manifest
index 725502465115..d38b61d0a63a 100644
--- a/media-libs/libmtp/Manifest
+++ b/media-libs/libmtp/Manifest
@@ -1,6 +1,6 @@
 DIST libmtp-1.1.13.tar.gz 801519 BLAKE2B f0452515f83d001a4e7a32528265d46814898fbaff5afd9a66c1a1fd85d78dae1b9ed9c057030849fd8fc0acec5f2ad012c0f098323d3596f6c38d5b01a9603a SHA512 99d5a277806f29f1d27a64a478e344916e8bfc9949a41a807c16d37bd29ec99dc3f36d504cfc6e67f1e91ee932a7cf82f13d4c9fe14b7e34333d9b12b04fff77
 DIST libmtp-1.1.14.tar.gz 804354 BLAKE2B 8a5ec431b3a3c1445b3ae62dd0f6ebee36a473ce3d7da07400263434d6e1be49624b8c807bce015f9e55d450f9e25eb2dcf0831c639b97e39cb900ac4d62f81c SHA512 337d259462cf9700fe5a5f09b38f4652045ee71249d54562661362e6d0ec7fe087ab77ec68d443e4fb84839a8ad9dc686c207d723ab47bc1a542dd0a71b294b1
 EBUILD libmtp-1.1.13.ebuild 1596 BLAKE2B 34ae4dc534b04f1a010155aa2c20c956e1ff692a57b3b291bd701a1c20f291c79eb4f7dd9263749374c3b3b13796379f0eba1fb2acd65c77882214258a0e71ac SHA512 fc4452159dd8d8d7285002ea14f8ed64739cacf00551dd0408450f8370480de0388ee27b27ef617e239c24aef63e239d22265e8b75e97af49bd875a71f55df8b
-EBUILD libmtp-1.1.14.ebuild 1603 BLAKE2B 68dbef72c8b95ddf2e6f483c4f29edd373190900750f1fe8b14ec9136877fff8c8905e9fca6065daeb447b0ce60359e1f828b92fd457f665a47ce4cc58ef4a66 SHA512 19295d09b442b0fd7bc5961cc38a587edc9f41e0d8a3656f92628db71cf4f542e27af35a2f23535678fba7d76dbe1fa926a58bcf3fdbe612dcf8db7a527c601a
+EBUILD libmtp-1.1.14.ebuild 1602 BLAKE2B 6db5bc42d265c8df8398c84b06409e2427ca1597df5d785e2291c4c7abce8dca342d1f2e54ecab81113a221b646ff07476643de2f2d533c7d956abe47fb69365 SHA512 7011222ca97526b0b9425b2a08dafe274b261bca00b50d569b389d626c8b3d2ba1e5feb9593670a5bfe18d53501263da91ed0e6e01fe275929f111ea2629c3b5
 EBUILD libmtp-9999.ebuild 1603 BLAKE2B 68dbef72c8b95ddf2e6f483c4f29edd373190900750f1fe8b14ec9136877fff8c8905e9fca6065daeb447b0ce60359e1f828b92fd457f665a47ce4cc58ef4a66 SHA512 19295d09b442b0fd7bc5961cc38a587edc9f41e0d8a3656f92628db71cf4f542e27af35a2f23535678fba7d76dbe1fa926a58bcf3fdbe612dcf8db7a527c601a
 MISC metadata.xml 329 BLAKE2B 4d7d938ffffc075084e5d43ca37040cb1612e7d6bdfed9c12d5edb00e0ce536d2d19b070dcd26d64a46a6664985db1f07aed073e2912c3dfc743ff6d55e8d187 SHA512 99fed0095b41d435c1bf82d7fa9c51b03fadc01646d959735693219cbfe2b69f784610fb296d5f1fdc8bb7c84dca4dbf3718effd350745de6483f8a8f9407d6c
diff --git a/media-libs/libmtp/libmtp-1.1.14.ebuild b/media-libs/libmtp/libmtp-1.1.14.ebuild
index b009b4abaff4..079492dd3eff 100644
--- a/media-libs/libmtp/libmtp-1.1.14.ebuild
+++ b/media-libs/libmtp/libmtp-1.1.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ if [[ ${PV} == 9999* ]]; then
 	inherit autotools git-r3
 else
 	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd"
 fi
 
 DESCRIPTION="An implementation of Microsoft's Media Transfer Protocol (MTP)"
diff --git a/media-libs/libopenraw/Manifest b/media-libs/libopenraw/Manifest
index 77cfbdf68a95..013458e1cc2f 100644
--- a/media-libs/libopenraw/Manifest
+++ b/media-libs/libopenraw/Manifest
@@ -7,5 +7,5 @@ DIST libopenraw-0.1.2.tar.bz2 563981 BLAKE2B 60332274c72602e5b3eea3e41dfee8c6230
 EBUILD libopenraw-0.0.9.ebuild 1169 BLAKE2B 6548945f67fed5f9ed96341a1e6f37af9d3e61655a95f23dbe5fdc68fa35c92e913e2e5cb51c744e1ca8dccc7efed3e7cd7776f65e58056349f67fa8854fc755 SHA512 8ed478f8438c0d278b40aaed32831e0b70a591ff426d48fd82015838f1a3cb1bea5cc153d85c36d81d3605069e11812487821a9afb084c36b3f3c41235adc03d
 EBUILD libopenraw-0.1.0.ebuild 1221 BLAKE2B fcdbbbff7ac8fef777a9366ff255f36296fbcd86d2750d581bec1b5fddf3af0da45628591b6afc849d09893f774b69e4ddd1d415f898ea196ff66abb6732584b SHA512 a2b73e4e3d407bd4e06e8e077027109ad395e9720dc8b8f49e957b68cde7139a274fda5e98be5a5ecfdef19f5f569b3412a443e64363053cada2c22799d1e986
 EBUILD libopenraw-0.1.1.ebuild 1113 BLAKE2B f307eb191171c2dc977c7f87c57396470d4b6951406fb9cbb3c244395503865e67f74e1d577491878732de43a4e8789cb6b436da07b104ef0c5a7d528abbee61 SHA512 92c0ea3a04232eba0f796bc94ffb2f76d47a26b0f18f0571bd85625c0dc8a64078cb203d20fb8116258bfd9e16dc6349f5c31737453ec23ad888e6168a006af6
-EBUILD libopenraw-0.1.2.ebuild 1107 BLAKE2B 0c7c1f3bb56b6ca506f553d52422d366689642ac30b10493f81208d9609e7cbae4c9b1c33a97100486aeb5849a8d0e6c81adbb5d5a82abca3fdc988b99e5e17b SHA512 d2bda150f2b9f16b5185dced40c123115e781e91cc45eebf121c1790deb16e9cdf39dd3bcb0450cdf9760d7c25a2a909f1f9ff6b3d3ae3816596b4d82e43f9d9
+EBUILD libopenraw-0.1.2.ebuild 1106 BLAKE2B fc86ece01fc559bc623c640ed5f14b51a3280813f80de3005caca57cbd87f76e47362f77ab4ab4a0052c4f233a86674123f1bb45d3c884da30254eb986eb29ea SHA512 302d5d97a0e8f02bf4da18c5f2aed7cf199b191c4fb22584c6722fd8013135c9dcf9329aafcf29f8b1720bc214d89a54fab6d1468a844566c3358c2859d52c90
 MISC metadata.xml 224 BLAKE2B 50a08713f8b792454787823dd56f1dcc1a1970ded78fa6ddffc6fb7301e0de75018e1e7a8c7ed890b4910f2716d2588ad21c7ae88ad8013b51cab7ba401c46c9 SHA512 12da46d8052565f62c482e6bcc714d8c00cac256f85dc1602579c8d61e0b61af95da149d1a446e56b2eba918ab9d78b556f77c6fe034a2e578f57a9dbe62fc44
diff --git a/media-libs/libopenraw/libopenraw-0.1.2.ebuild b/media-libs/libopenraw/libopenraw-0.1.2.ebuild
index 5346d2ab1ecd..42f3caff116c 100644
--- a/media-libs/libopenraw/libopenraw-0.1.2.ebuild
+++ b/media-libs/libopenraw/libopenraw-0.1.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://${PN}.freedesktop.org/download/${P}.tar.bz2"
 
 LICENSE="GPL-3 LGPL-3"
 SLOT="0/7"
-KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~mips ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
 IUSE="gtk static-libs test"
 
 RDEPEND="
diff --git a/media-libs/openal/Manifest b/media-libs/openal/Manifest
index f07c658fd5f8..1fb4bda7f29c 100644
--- a/media-libs/openal/Manifest
+++ b/media-libs/openal/Manifest
@@ -1,5 +1,5 @@
 DIST openal-soft-1.15.1.tar.bz2 253006 BLAKE2B 0023eed2e98d07190aa4301a84e6818224feb6459303681276525237c5de9c145cdaab3437cae6b7998307a2294aafebedf3852cbebe8c12232d1e39ba6e15e8 SHA512 ca6dafdd503d06892dff08763bc00b974ec6e7c4bf3dcebb4cb41a486b4ea777c278299a198db182fee888a19a5716bd57d91a2859b764a532138a79f2bd672f
 DIST openal-soft-1.18.2.tar.bz2 639420 BLAKE2B 8e31db9d3c6eb49fe4833a6449603dc6284e39810942536594fb5e96d0bc2b867b69bd90e64d40cf99f9a279f3809509cf1c9af3114a4887057e78962a5463e8 SHA512 752e2fb0a5a014caa6d6bac1590d3df46140b463fbaa13378fb5de89f1c97ee8b62bec74f68484d4ec02ee8755c1a2d0c9394cdb477db1b7401deae2fb9eeb4d
 EBUILD openal-1.15.1-r2.ebuild 1461 BLAKE2B 96c339461509d21beccecef1f52a60f2181d1dc87b31d2cc05aad10dc3e8a4e47cc5be6721dcbaae07ad401650f38092bd20d501302137354ca668b0c631186a SHA512 0f4ce8cfdeb34c1ab3ef16cb7fdb72fd6d2e53ff306ac241c472f161f298fe9eec4b64603bda566e2fd45ed8fc89f8a4ad60f3043594e53568711b728af1a098
-EBUILD openal-1.18.2-r1.ebuild 2023 BLAKE2B 0df8d35a912772fd9735627b76424fccfb52d3e1e84eed7eebf21c723e5b0882ae3e30e30d9cfc3c8d4005f194422f1330a4a0f4b93ac6f7944c14a85479a57f SHA512 2fe36b77fee6b2fb1ab0260ced146d941f42f241435d2afc423faed6484886484bdd77e7143918c2a5627042e0300fee39dbb4fc60465692df18a1f9299d86b1
+EBUILD openal-1.18.2-r1.ebuild 2022 BLAKE2B 919a2618017122893072fb11b38fb58e647bd1cbe81694a70aa02aa8fa060988bca72e843cdef23d54451b99b733dfa57f772f340e7c7824fcc5d9075c9f0c36 SHA512 aee64a9f44d55f9fd278dc93a74832c3463d68eb388479e2cd060a2fc4c720ed0ef3882d350f4c40733a5d876034302f56ce77eca04f0a3f9ff264ce7603c3ae
 MISC metadata.xml 253 BLAKE2B 6426153a5fa5bbad2aaffd28a6460f87a35678319768c57ac8dfae02b2229f6278dead4f564e6bc2bfd54d7143aed95c382abc2ee16c1073e9fbaf4f84cc0fef SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894
diff --git a/media-libs/openal/openal-1.18.2-r1.ebuild b/media-libs/openal/openal-1.18.2-r1.ebuild
index a05a1ab26759..b3629cd8e6ba 100644
--- a/media-libs/openal/openal-1.18.2-r1.ebuild
+++ b/media-libs/openal/openal-1.18.2-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://kcat.strangesoft.net/openal-releases/${MY_P}.tar.bz2"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="
 	alsa coreaudio debug jack oss portaudio pulseaudio qt5
 	cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse4_1
diff --git a/media-libs/tiff/Manifest b/media-libs/tiff/Manifest
index 41341765684e..fd14875fa09b 100644
--- a/media-libs/tiff/Manifest
+++ b/media-libs/tiff/Manifest
@@ -21,5 +21,5 @@ EBUILD tiff-3.9.7-r1.ebuild 2072 BLAKE2B 1a1fbd60077b9d98c591041006443f2074d78d8
 EBUILD tiff-4.0.8.ebuild 2615 BLAKE2B 7cbfe610a0a6120946bcfcbbbbfdcd3de00d3355478900efe4206e95db378d60772f2e553a55719557d087669af653c7b151da93efc0afe0a287bf5d512a1bb3 SHA512 100bda64fb5f70919467585eac5d717d4cf7dfb6059c9a87482c370a3013eb566b73ad01160c0a9b5cab48e6b442182edbbe70d593293ce8984650032981c339
 EBUILD tiff-4.0.9-r1.ebuild 2260 BLAKE2B 4bf6af1f52b2990ffe3ec4a6169ee8ac774f3bdb52bdfe46450a6b724b4ca0ac04d4d7f849e390125403e0aa8555465b32ce5a824d8344403688321a6708f2de SHA512 1b47e588d6578cc2d6d3c0b1264f896854f2279ee8f9dd07b377ed4f78d680306eefa3cd462e27e460af18289d8734fa69128b55d5d0352a0199ba93a4377e09
 EBUILD tiff-4.0.9-r2.ebuild 2359 BLAKE2B 65b2f2e66992a1d926aacd94439afc0f1fa48e568473fb750bacfa30048c618b1bb4e75555d18f434a13ec0736be7292e8c00921a6e7c605082fba7f8f2432f5 SHA512 5fea44e4882feffea242270d23a464348aa086dec354349f09ed4be0ae26664e8522fbec177820fe8e1c9d94764746a493fb0b7e38b249300bf316243a3625f7
-EBUILD tiff-4.0.9-r3.ebuild 2406 BLAKE2B ee622156f0d7543949bcf77833319860a10a1ac4cad6c05e4aa427e933b0b7c6f01ba399fabf777427d304f7af218825e1f983ed236584060c76e1c3c1a6db04 SHA512 6477d3eb713ea1a36854135bd4e003dadef1768aa54e286f87e72976d9211b41e945878f6a362c10224a812ebad4967c6b65a9e917d1de2ecf1ef98eff5340b2
+EBUILD tiff-4.0.9-r3.ebuild 2405 BLAKE2B c138a53bf4fc66a565794aebd4172229bb635f1c47ea184f7690fecf32344017c6ebc7f0e7485dc8e6e68903b11a5fe7a7aa8cad76ee5133793e500caddd33fe SHA512 6bebdd0e902a5bf283af8d3ee88ea5a7b70204f08b31666f20ec51ae533bcbbb92351916d8540815174dab2fd53b1e8ae90878c7cc5b165a8e4ce69f5207b741
 MISC metadata.xml 565 BLAKE2B 3d487835599974795ba6007439bf1d08756ab1c5dbe191509832b302f3199e4ffc05be64df3e26b4d4a1c11d1292c48cbb59ffa6e412831d16d7415e076f1062 SHA512 289043206dbb512c97e4bb703b32549ac4a77f40e212548b80ea865052b80fed9d4562f9fc94638fda54da9bc3e0c19ba303c027e66e7b75c772aeec91aebe6f
diff --git a/media-libs/tiff/tiff-4.0.9-r3.ebuild b/media-libs/tiff/tiff-4.0.9-r3.ebuild
index c29020ab5185..e10f0ee92cc9 100644
--- a/media-libs/tiff/tiff-4.0.9-r3.ebuild
+++ b/media-libs/tiff/tiff-4.0.9-r3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://download.osgeo.org/libtiff/${P}.tar.gz
 
 LICENSE="libtiff"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="+cxx jbig jpeg lzma static-libs test zlib"
 
 RDEPEND="jpeg? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 115e3b67b0fb..2591ef7f0ac8 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/pragha/Manifest b/media-sound/pragha/Manifest
index eb85315197b8..5ec1ad1fa844 100644
--- a/media-sound/pragha/Manifest
+++ b/media-sound/pragha/Manifest
@@ -1,7 +1,5 @@
-DIST pragha-1.3.1.tar.bz2 621106 BLAKE2B 22d3908c5715c88834403da36bbd871781964a3939163256e0ba7f0795f6be7b123a65ab538634caef095779b46f8c8351aee6e947419f94bf02c0e32502c9a3 SHA512 17d086d84382c8e417e513c8803ea90612ca9d5c665384299362b3197978a8697faef531996b078e4ce12c52b7fad3be377083622c923775c6c738d5ae6acb93
 DIST pragha-1.3.3.tar.bz2 679754 BLAKE2B e9e785998d5ae805aa8427d18d1cbdcdd1e23224ce18b3927933c0986fd8793dec9457eedcb005be498b37940cc3c7e36e68940ccaa675f4b350931315c3d997 SHA512 3dc87d4e75cd9f145c3921af4c09140a705611d72176fd80db2d89048bc22c8edda5f87bce75f26e0cce4f6934c927e814e5c54fec7820116485cf4e04e876a9
 DIST pragha-1.3.90.tar.bz2 760153 BLAKE2B 22cb90225cad5b19ecd95691bafd11f55b35e5f2b59e877c2c998b2e4744f1298f28469bdb11f00598f31fc154c55427d000a995d952112b238cf84302993564 SHA512 877d27814927ab67a0b1defe70d753466e3ad14a0274a2168eb2521ded4eddeb04bce5177869b19ca57b38e7374047ee36982cce3f7e8a75b801cd060f8460d2
-EBUILD pragha-1.3.1-r1.ebuild 2602 BLAKE2B 31d242654e528af065c91731d624df1e5fdf989a9e1f259603db65fab0bcfecba913478557b67110719d7c284f8c566fd64442ab97201e2451f01a600dc6e9c5 SHA512 c17edf8c79aa6a16803de9cbcc9c9f62a3a5f9f02c427f80548623b087feccd6be5e10584bbe8fe01b6b559e2344b367d1db06328fd9d1081f7c37c3fd7145a4
 EBUILD pragha-1.3.3.ebuild 2288 BLAKE2B 0cad8db3ec862e8e731135eb2e53c2e6fadcc397476512153b1d72531eb74521b4f97c99c3a929f8968046ec98581a41719e75c0c8bee5dd15e2d77a9c7c0215 SHA512 90a7562ed5be7146fb86ea61befd6d145230235020d88f99a0762d2749b05640591343e680b3580654840ebb34ff1c9b1174ee28f73e28fe79c030ab739c6f73
 EBUILD pragha-1.3.90.ebuild 2502 BLAKE2B ad6086767bf4d14ba02311377ee5009ca66e8a87265119f1476191c81641867804eaa7484b7c04133ca82e4651b4e1cc45f1820227c7d6fa3be609fe2122197f SHA512 27c0cbe0ed8ad4bdb76a0d18dd0d60bdacac7506f36bc68165675c17845b514cdd5a913be34702809b6186a0d26e40fb412e36d1faed1bdd1f86335fcb737d8d
 MISC metadata.xml 1158 BLAKE2B b7d3fe9b4867324351eabb050306806202e4af8f4c4b1cbbd02f0d88eae27fcf0d6e52fe39f7cf470508db1528684fe064c1e0861658c883bb0a3f4a04abd799 SHA512 68257f425b4e8634f4ed696e7066a8b0c328b1bca0794a72a54f438d2aaa174b4cf816cf693046221bfef88e6b8fc08dfe2211e9be98c28da0d119d957bf9812
diff --git a/media-sound/pragha/pragha-1.3.1-r1.ebuild b/media-sound/pragha/pragha-1.3.1-r1.ebuild
deleted file mode 100644
index 48e150a7febd..000000000000
--- a/media-sound/pragha/pragha-1.3.1-r1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit xfconf # autotools
-
-DESCRIPTION="A lightweight music player (with support for the Xfce desktop environment)"
-HOMEPAGE="https://github.com/pragha-music-player/pragha"
-SRC_URI="https://github.com/pragha-music-player/${PN}/releases/download/v${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug +glyr grilo +keybinder lastfm libnotify mtp +peas +playlist rygel soup +udev"
-
-COMMON_DEPEND=">=dev-db/sqlite-3.4:3=
-	>=dev-libs/glib-2.32:=
-	>=dev-libs/libcdio-0.90:=
-	>=dev-libs/libcdio-paranoia-0.90:=
-	media-libs/gst-plugins-base:1.0=
-	>=media-libs/libcddb-1.3.0:=
-	>=media-libs/taglib-1.7.0:=
-	>=x11-libs/gtk+-3.4:3=
-	>=xfce-base/libxfce4ui-4.11:=[gtk3(+)]
-	glyr? ( >=media-libs/glyr-1.0.1:= )
-	grilo? ( >=media-libs/grilo-0.2.10:= )
-	keybinder? ( >=dev-libs/keybinder-0.2.0:3= )
-	lastfm? ( >=media-libs/libclastfm-0.5:= )
-	libnotify? ( >=x11-libs/libnotify-0.7:= )
-	mtp? ( >=media-libs/libmtp-1.1.0:= )
-	peas? ( >=dev-libs/libpeas-1.0.0:=[gtk] )
-	playlist? ( >=dev-libs/totem-pl-parser-2.26:= )
-	rygel? ( >=net-misc/rygel-0.20:= )
-	soup? ( >=net-libs/libsoup-2.38:= )
-	udev? ( virtual/libgudev:= )"
-RDEPEND="${COMMON_DEPEND}
-	media-plugins/gst-plugins-meta:1.0"
-DEPEND="${COMMON_DEPEND}
-	dev-util/intltool
-	>=dev-util/xfce4-dev-tools-4.10
-	sys-devel/gettext
-	virtual/pkgconfig"
-REQUIRED_USE="glyr? ( peas )
-	grilo? ( peas )
-	libnotify? ( peas )
-	mtp? ( udev )
-	rygel? ( peas )
-	soup? ( peas )
-	udev? ( peas )"
-
-pkg_setup() {
-	XFCONF=(
-		--docdir="${EPREFIX}"/usr/share/doc/${PF}
-		$(use_enable debug)
-		$(use_enable peas libpeas-1.0)
-		$(use_enable glyr libglyr)
-		$(use_enable lastfm libclastfm)
-		$(use_enable playlist totem-plparser)
-		--with-gstreamer=1.0
-		)
-
-	if use peas; then
-		XFCONF+=(
-			$(use_enable libnotify)
-			$(use_enable keybinder)
-			$(use_enable udev gudev-1.0)
-			$(use_enable mtp libmtp)
-			$(use_enable soup libsoup-2.4)
-			$(use_enable rygel rygel-server-2.2)
-			$(use_enable grilo grilo-0.2)
-			)
-	else
-		XFCONF+=(
-			--disable-libnotify
-			--disable-keybinder
-			--disable-gudev-1.0
-			--disable-libmtp
-			--disable-libsoup-2.4
-			--disable-rygel-server-2.2
-			--disable-grilo-0.2
-			)
-	fi
-}
-
-src_prepare() {
-	sed -i -e '/CFLAGS/s:-g -ggdb -O0::' configure || die
-
-	# Prevent glib-gettextize from running wrt #423115
-#	export AT_M4DIR=${EPREFIX}/usr/share/xfce4/dev-tools/m4macros
-#	intltoolize --automake --copy --force
-#	_elibtoolize --copy --force --install
-#	eaclocal; eautoconf; eautoheader; eautomake
-
-	xfconf_src_prepare
-}
diff --git a/media-sound/xfmpc/Manifest b/media-sound/xfmpc/Manifest
index eb2928ef5350..15fc2e1e3f40 100644
--- a/media-sound/xfmpc/Manifest
+++ b/media-sound/xfmpc/Manifest
@@ -1,6 +1,3 @@
-DIST xfmpc-0.2.2.tar.bz2 404906 BLAKE2B bdef74eac80451064c2ea8004a329735f26e4f2e4761533a05fd1cb6f83b1d361f27fcef82e90c94c44f76f2fbbcbaf183851b08b301afe69cd02aae83d3a949 SHA512 a90697bcd86e7f3952faa4d37800755a49a09886de7a95ae69b4e8a59b7750b1098d372b1734eadf3bb1d2c74fc5447707fc0203de435cfa51423530c663f6c7
 DIST xfmpc-0.2.3.tar.bz2 414680 BLAKE2B 167af8e53d7ddf2a629d585e8ca9f15507e54ee92ceae0f48d3462fc1667b07570d2489cc5058c0521aae2f0b1493a1101655ae702e48b3c4d0c6be493a4ec57 SHA512 3f592fdd559817051f7720bafc07fc66b39f682cc20286c12d54c4bd607e85bb0a722c567264a29224971b4ac14db51b0b44b233a16cccd9d17579a50549a3be
-EBUILD xfmpc-0.2.2.ebuild 693 BLAKE2B 37161bc72f2c6965263e085e79802da7294d19645dc39706fc770fa261b38b9c5e17298c52e5afec2e354660d497a2677734b8e8edca76326301ec052437427a SHA512 5db626e67a68842a15ee1f49680bfb977fa64ed0382e336db94a9c915d7d3546a7a288735e7f70628019e78de9766dfb62d141c53b3cd589b35844d8b9415387
 EBUILD xfmpc-0.2.3-r1.ebuild 763 BLAKE2B fc955996e53129533110994c9a36134bf56c6c8204b5caea7671741a47585dea562bb087f5c2acd4436e0b853b9d6476cfb24598e9b40b64d5e1304ddb0f454a SHA512 64e9a9454b6b4f0457167debff549a10e4a82f31cc9c3a60d6d33c5c4bb0b2a8d4da6f6fe7d11408e976870ea6c7ad96328f708ecf08ab60f41d51f1cbfe71d2
-EBUILD xfmpc-0.2.3.ebuild 703 BLAKE2B 936e73b42b78f2eec2b1041c5b6c54b566e1a7dd387507dd0f5dfe3ca95295f275403a6754ba4326c057a7c26c8ca2d8b8956cda78568f0ee2513d8edcf99f4d SHA512 5e667066d598c0088306c2c5188f97cd8ae642551183304cb478ba20dbff722748a4a9fd0d5b9314a41863f6dbcc90c60d90d6fdecefe92a16c3c3c803d14070
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/media-sound/xfmpc/xfmpc-0.2.2.ebuild b/media-sound/xfmpc/xfmpc-0.2.2.ebuild
deleted file mode 100644
index 965667bd7bdc..000000000000
--- a/media-sound/xfmpc/xfmpc-0.2.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit xfconf
-
-DESCRIPTION="Music Player Daemon (MPD) client for the Xfce desktop environment"
-HOMEPAGE="https://goodies.xfce.org/projects/applications/xfmpc"
-SRC_URI="mirror://xfce/src/apps/${PN}/0.2/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug"
-
-RDEPEND=">=dev-libs/glib-2.18:2
-	>=media-libs/libmpd-0.15
-	>=x11-libs/gtk+-2.16:2
-	>=xfce-base/libxfce4ui-4.8
-	>=xfce-base/libxfce4util-4.8"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig"
-
-pkg_setup() {
-	XFCONF=( $(xfconf_use_debug) )
-	DOCS=( AUTHORS ChangeLog IDEAS NEWS README THANKS )
-}
diff --git a/media-sound/xfmpc/xfmpc-0.2.3.ebuild b/media-sound/xfmpc/xfmpc-0.2.3.ebuild
deleted file mode 100644
index 2b973c294102..000000000000
--- a/media-sound/xfmpc/xfmpc-0.2.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit xfconf
-
-DESCRIPTION="Music Player Daemon (MPD) client for the Xfce desktop environment"
-HOMEPAGE="https://goodies.xfce.org/projects/applications/xfmpc"
-SRC_URI="mirror://xfce/src/apps/${PN}/0.2/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-RDEPEND=">=dev-libs/glib-2.18:2=
-	>=media-libs/libmpd-0.15:=
-	>=x11-libs/gtk+-2.16:2=
-	>=xfce-base/libxfce4ui-4.8:=
-	>=xfce-base/libxfce4util-4.8:="
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig"
-
-pkg_setup() {
-	XFCONF=( $(xfconf_use_debug) )
-	DOCS=( AUTHORS ChangeLog IDEAS NEWS README THANKS )
-}
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 2d20ee34cb95..068c15647ab3 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest
index d5bda64265aa..173f5c85d376 100644
--- a/media-video/mkvtoolnix/Manifest
+++ b/media-video/mkvtoolnix/Manifest
@@ -1,10 +1,6 @@
 DIST mkvtoolnix-19.0.0.tar.xz 4616780 BLAKE2B 72eb3b1a34bbed0d492098c02c1f60c7ce7f0ea6a8fbff6b88bd9d7af5891dda8c8adb9a0f856c65106fb430b481183ce74b9369590cd4dcfe881d7db84eb06d SHA512 dd18eeffc8a5210ca3c8a287321ad106f63cff8fbe5ad3891460aab7e60f2d5261a3f335f3991524a95724861288593cfb3bd9df6829a2f7751f6a1fdaba0ca6
-DIST mkvtoolnix-20.0.0.tar.xz 4670268 BLAKE2B fd10e5bd739338252d4d1c8878382652660e59b9669c85a3f9bfab1349da6cbcd4a79b23a1db9f59adb5ccb12aa1ae046978f722e887ab0668c91270cf50b705 SHA512 1ba7b2d02fcaa2252409702e82e04075237a33b8f2cfe8b85e4ea416d7ad55d0454659c821eb851fa666b15acceec40a5be00691ddaa4ea098cd3a4d2db0d313
 DIST mkvtoolnix-21.0.0.tar.xz 4682788 BLAKE2B 52d9920fc5b735f7d8af1f6e60828f143a914ce7cd7c635daacb6d2da584b0158f80e0f4d39824130b0c8fcc83b7c3a1215b2e965cb8b47b2b297df2d78414d5 SHA512 881e0c38eee2d36ab9dea5ccaa8ad74e0076cdc13606f873ab58bfeeec09c05e947529d3bad665b1d4df6a816faca30e8a685bc19115f90c18dac3c1ae27c252
-DIST mkvtoolnix-9.6.0.tar.xz 3810216 BLAKE2B 0213f7643b517436610fd2abd5862026cad81ae48018bbdde6fd83b226eaba6d36589925fd49b7244a47569f7fd15480eac9af559df1da7c131a05aea4865606 SHA512 5f469215a10dc865e51f77c43961705d70b1b0e38d70b930e5065d8d89b8379734d9826a63e2cb7ae9cb6723ed8a1d16793df35bad6244cedaa19bc4df49b436
 EBUILD mkvtoolnix-19.0.0.ebuild 2549 BLAKE2B f205d940a9fe250d842cfeaffefd389be863556cfbb6d1d2960551c5b16ece35269c9c64f2c110655e38f2cda894c5940bf686fb04602ad997cca05f61ecb0b9 SHA512 e8291ce11ad3871b538ccce78d81e258ff4112098a14587f12a03969a40cec24ddb884a2c9e3c16503ac1272a586e6e61fef8d414c28e9ee526949c97e52124c
-EBUILD mkvtoolnix-20.0.0.ebuild 2711 BLAKE2B 05bc79c266139415bfa53d7c739bfd4b1738b606d2d7660d41eb1fa68a4738970371ab915e0413b30ff8a482452ed8b4568f076c32a8383955f5c2a7f237bff8 SHA512 db31f33ad3f2f302fb978a5a5ce59c265141844142b1d557a1febc42b2c3a0ac1a13a9b5cd04d8903a7c1dab01f3fea9701aa634edd165c40d04e6d64ff9f5df
 EBUILD mkvtoolnix-21.0.0.ebuild 2711 BLAKE2B 05bc79c266139415bfa53d7c739bfd4b1738b606d2d7660d41eb1fa68a4738970371ab915e0413b30ff8a482452ed8b4568f076c32a8383955f5c2a7f237bff8 SHA512 db31f33ad3f2f302fb978a5a5ce59c265141844142b1d557a1febc42b2c3a0ac1a13a9b5cd04d8903a7c1dab01f3fea9701aa634edd165c40d04e6d64ff9f5df
-EBUILD mkvtoolnix-9.6.0.ebuild 2797 BLAKE2B 63dcef388c97df90fa9d47572d2af82839fb1687409060aedeb824400e5e2d450674689c69e630bc02f00ff92f784ab29d3b445b39a4317884a30513e30151b2 SHA512 bd376bb7787b79719e4e3bba4361e55be0d8c39d55b6c37c905c84bf8b583f718b66d7ce9941f87213514ce38c33f2d2a506f2fd8e1edcd6d0fb4e11e45d4052
 EBUILD mkvtoolnix-9999.ebuild 2711 BLAKE2B 05bc79c266139415bfa53d7c739bfd4b1738b606d2d7660d41eb1fa68a4738970371ab915e0413b30ff8a482452ed8b4568f076c32a8383955f5c2a7f237bff8 SHA512 db31f33ad3f2f302fb978a5a5ce59c265141844142b1d557a1febc42b2c3a0ac1a13a9b5cd04d8903a7c1dab01f3fea9701aa634edd165c40d04e6d64ff9f5df
 MISC metadata.xml 255 BLAKE2B 84855d12acedab301e8e709820ef74f658689209ce914cad2c71d11f4248a7d3356109d93573ed675698031eca1e0b6e0372a61c2a43a9f09840e295f94b74ef SHA512 92b56f4d9c86ad69341e67e8cc74db0bd068e45afdf2f3d3f9ea410fc5e64f3476143b656f2cb3d26b97ae01a967d71766952eba22e2278aab907c20b00ae0e9
diff --git a/media-video/mkvtoolnix/mkvtoolnix-20.0.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-20.0.0.ebuild
deleted file mode 100644
index 9cc2c6abecac..000000000000
--- a/media-video/mkvtoolnix/mkvtoolnix-20.0.0.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit toolchain-funcs versionator multiprocessing xdg-utils qmake-utils
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://gitlab.com/mbunkus/mkvtoolnix.git"
-	inherit git-r3
-else
-	SRC_URI="https://mkvtoolnix.download/sources/${P}.tar.xz"
-	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-fi
-
-DESCRIPTION="Tools to create, alter, and inspect Matroska files"
-HOMEPAGE="https://mkvtoolnix.download/ https://gitlab.com/mbunkus/mkvtoolnix"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="debug pch test qt5"
-
-# check NEWS.md for build system changes entries for boost/libebml/libmatroska
-# version requirement updates and other packaging info
-RDEPEND="
-	>=dev-libs/boost-1.49.0:=
-	>=dev-libs/libebml-1.3.5:=
-	dev-libs/jsoncpp:=
-	dev-libs/pugixml
-	media-libs/flac
-	>=media-libs/libmatroska-1.4.8:=
-	media-libs/libogg
-	media-libs/libvorbis
-	sys-apps/file
-	sys-libs/zlib
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtnetwork:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtconcurrent:5
-		dev-qt/qtmultimedia:5
-		app-text/cmark
-	)
-"
-DEPEND="${RDEPEND}
-	dev-ruby/rake
-	sys-devel/gettext
-	virtual/pkgconfig
-	dev-libs/libxslt
-	app-text/docbook-xsl-stylesheets
-	app-text/po4a
-	test? ( dev-cpp/gtest )
-"
-
-DOCS="AUTHORS NEWS.md README.md"
-
-pkg_pretend() {
-	# https://bugs.gentoo.org/419257
-	local ver=4.6
-	local msg="You need at least GCC ${ver}.x for C++11 range-based 'for' and nullptr support."
-	if ! version_is_at_least ${ver} $(gcc-version); then
-		eerror ${msg}
-		die ${msg}
-	fi
-}
-
-src_prepare() {
-	default
-	[[ ${PV} == "9999" ]] && { ./autogen.sh || die; }
-}
-
-src_configure() {
-	local myconf
-
-	if use qt5 ; then
-		# ac/qt5.m4 finds default Qt version set by qtchooser, bug #532600
-		myconf+=(
-			--with-moc=$(qt5_get_bindir)/moc
-			--with-uic=$(qt5_get_bindir)/uic
-			--with-rcc=$(qt5_get_bindir)/rcc
-			--with-qmake=$(qt5_get_bindir)/qmake
-		)
-	fi
-
-	econf \
-		$(use_enable debug) \
-		$(use_enable qt5 qt) \
-		$(usex pch "" --disable-precompiled-headers) \
-		"${myconf[@]}" \
-		--disable-update-check \
-		--disable-optimization \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		--with-boost="${EPREFIX}"/usr \
-		--with-boost-libdir="${EPREFIX}"/usr/$(get_libdir)
-}
-
-src_compile() {
-	rake V=1 -j$(makeopts_jobs) || die
-}
-
-src_test() {
-	rake V=1 -j$(makeopts_jobs) tests:unit || die
-	rake V=1 -j$(makeopts_jobs) tests:run_unit || die
-}
-
-src_install() {
-	DESTDIR="${D}" rake -j$(makeopts_jobs) install || die
-
-	einstalldocs
-	doman doc/man/*.1
-}
-
-pkg_postrm() {
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
-
-pkg_postinst() {
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
diff --git a/media-video/mkvtoolnix/mkvtoolnix-9.6.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-9.6.0.ebuild
deleted file mode 100644
index 4004b469a2ec..000000000000
--- a/media-video/mkvtoolnix/mkvtoolnix-9.6.0.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils multilib toolchain-funcs versionator multiprocessing autotools
-
-DESCRIPTION="Tools to create, alter, and inspect Matroska files"
-HOMEPAGE="https://mkvtoolnix.download/"
-SRC_URI="https://mkvtoolnix.download/sources/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="curl debug pch test qt5"
-
-ruby_atom() {
-	local ruby_slot=${1/ruby/}
-	ruby_slot="${ruby_slot:0:1}.${ruby_slot:1:2}"
-	echo "dev-lang/ruby:${ruby_slot}"
-}
-
-# hacks to avoid using the ruby eclasses since this requires something similar
-# to the python-any-r1 eclass for ruby which currently doesn't exist
-RUBY_IMPLS=( ruby24 ruby23 ruby22 )
-RUBY_BDEPS="$(for ruby_impl in "${RUBY_IMPLS[@]}"; do
-	echo "( $(ruby_atom ${ruby_impl}) virtual/rubygems[ruby_targets_${ruby_impl}] )"; done)"
-
-RDEPEND="
-	>=dev-libs/boost-1.46.0:=
-	>=dev-libs/libebml-1.3.3:=
-	dev-libs/pugixml
-	media-libs/flac
-	>=media-libs/libmatroska-1.4.4:=
-	media-libs/libogg
-	media-libs/libvorbis
-	sys-apps/file
-	sys-libs/zlib
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtnetwork:5
-		dev-qt/qtwidgets:5
-	)
-"
-DEPEND="${RDEPEND}
-	|| ( ${RUBY_BDEPS} )
-	sys-devel/gettext
-	virtual/pkgconfig
-	test? ( dev-cpp/gtest )
-"
-
-pkg_pretend() {
-	# https://bugs.gentoo.org/419257
-	local ver=4.6
-	local msg="You need at least GCC ${ver}.x for C++11 range-based 'for' and nullptr support."
-	if ! version_is_at_least ${ver} $(gcc-version); then
-		eerror ${msg}
-		die ${msg}
-	fi
-}
-
-src_prepare() {
-	local ruby_impl
-	for ruby_impl in "${RUBY_IMPLS[@]}"; do
-		if has_version "$(ruby_atom ${ruby_impl})"; then
-			export RUBY=${ruby_impl}
-			break
-		fi
-	done
-	[[ -z ${RUBY} ]] && die "No available ruby implementations to build with"
-
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-
-	if use qt5 ; then
-		# ac/qt5.m4 finds default Qt version set by qtchooser, bug #532600
-		myconf+=(
-			--with-moc=/usr/$(get_libdir)/qt5/bin/moc
-			--with-uic=/usr/$(get_libdir)/qt5/bin/uic
-			--with-rcc=/usr/$(get_libdir)/qt5/bin/rcc
-		)
-	fi
-
-	econf \
-		$(use_enable debug) \
-		$(use_enable qt5 qt) \
-		$(use_with curl) \
-		$(usex pch "" --disable-precompiled-headers) \
-		"${myconf[@]}" \
-		--disable-optimization \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		--with-boost="${EPREFIX}"/usr \
-		--with-boost-libdir="${EPREFIX}"/usr/$(get_libdir)
-}
-
-src_compile() {
-	"${RUBY}" ./drake V=1 -j$(makeopts_jobs) || die
-}
-
-src_test() {
-	"${RUBY}" ./drake V=1 -j$(makeopts_jobs) tests:unit || die
-	"${RUBY}" ./drake V=1 -j$(makeopts_jobs) tests:run_unit || die
-}
-
-src_install() {
-	DESTDIR="${D}" "${RUBY}" ./drake -j$(makeopts_jobs) install || die
-
-	dodoc AUTHORS ChangeLog README.md
-	doman doc/man/*.1
-}
diff --git a/media-video/parole/Manifest b/media-video/parole/Manifest
index 50a5909f45ce..31c1cb890046 100644
--- a/media-video/parole/Manifest
+++ b/media-video/parole/Manifest
@@ -1,7 +1,5 @@
 DIST parole-0.8.1.tar.bz2 814827 BLAKE2B 54c6753da5f9e6e6eef70bfbe13dd6496687fb35905ac8222a8ab96d3a46bc2f718a5d87dc44abec2c15cfde503f839960b0bcb51c8a58b5c978df830eec5207 SHA512 73c27022331828adb7b5805245ce97f03f4848c569125529436e82651da61e28f4d4a834468d6e4c165754f2fd9664eded9a7e15fc86f067d9b2c7c54afff3ee
-DIST parole-0.9.2.tar.bz2 922024 BLAKE2B 95075aae3a1ba5595dc28c5610539a7c330802a03e4b53cee221ce131cb02df72b582000e98349d624fd1834cb97118ce75ce54e8acf820b1380ea2c24ce3fd5 SHA512 c3eee9501648bbb058a22398f2b8ae3727036718052b9e93ebb6f7dc3eb88ce1cfe8d443a5abf7d0cebc2853e14f42fed520ce17d8c7e03dacdcafb57247fb4d
 DIST parole-1.0.0.tar.bz2 900499 BLAKE2B d6a1eb21846426781a712f33b7cf8f412b17b9a3e02b1ef15b6ff742687efc70a3e3f0ae8124ed2226a1cf00022c7ef0650c8e1c1b6e3279b111891e8c3e651e SHA512 0581fed93d2a09a3d9ec9cf1bb68a298ccd47676b22d0824495136ee9d785290b8465af8c12b5ecd34a46936f7433bf96dd559e6252a8f1af46c0e2f9256c864
 EBUILD parole-0.8.1.ebuild 1270 BLAKE2B 41da47e2e022fa88316f0b255dd3142e3d242fa76d2bfc52b42f8b559b1a9084f0a84c206c9c70040e0de5024b0a41c3c8e78259925855c71564ab51acf691a6 SHA512 dced0c4718135bc2572ef9a08a7ab36cebc018d6dd5cbcbb9fe93384d86c7c72925c1236b0096b5d5f4c0cb2f62c85e89675766f7fadc13633059d04c6349a29
-EBUILD parole-0.9.2.ebuild 1477 BLAKE2B 9a0927c2e1d42a3b0d135db4e381258e2f1f785e53c1780974e9cf9ec92abbfc47bba0a88964016e158356f73f45cb14163c667cea1b608c58971cd19ae3edc8 SHA512 dc13e5a8febc839c3a2c1685b9d7eb3d26ca01e4f2dceb339df4bfa23cc1fd277b88661b1ae7e5aec184d304846c6e70d70b49ebd32fcd72f446ebfe3f4078e4
 EBUILD parole-1.0.0.ebuild 1477 BLAKE2B e67975fdee67dfdb67c961d25d3b872e901711c6ee31f4c879286875ae8173fd51fbd6a0a3f9a05e97473301b5b2ec42340412de2cc121fb2b705cfa28637f8c SHA512 ae87c7d54d350333f5d284c69fa60bffb121ce14877890b84206b9c4bd58152843158034c5ec98ae22783ef62360b9795731d39d0249fdf4ebbf63237930ddae
 MISC metadata.xml 318 BLAKE2B fc559f9ed2dba93e1117e5b01a8e7202b4d8fa64493133ebbe758e4d6c13836ae484b7be986cbcae4d32ec3175d138292aa51a86018cf531c7f12c8f3bd06590 SHA512 412b57b034604b0b6d532fadf5eba6478222b30fe4a003ff1486b59ec1136f440343c4524951cee33b235dfa782c09380326d9cbee17e1406408947d12fc430e
diff --git a/media-video/parole/parole-0.9.2.ebuild b/media-video/parole/parole-0.9.2.ebuild
deleted file mode 100644
index 2f1e710f27aa..000000000000
--- a/media-video/parole/parole-0.9.2.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils xdg-utils
-
-DESCRIPTION="A simple Xfce4 media player using GStreamer"
-HOMEPAGE="https://docs.xfce.org/apps/parole/start"
-SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~mips ~x86"
-IUSE="clutter libnotify taglib"
-
-COMMON_DEPEND=">=dev-libs/dbus-glib-0.100:=
-	>=dev-libs/glib-2.32:2=
-	media-libs/gstreamer:1.0=
-	media-libs/gst-plugins-base:1.0=
-	sys-apps/dbus:0=
-	>=x11-libs/gtk+-3.20:3=
-	x11-libs/libX11:0=
-	>=xfce-base/libxfce4ui-4.11:0=[gtk3(+)]
-	>=xfce-base/libxfce4util-4.11:0=
-	>=xfce-base/xfconf-4.10:0=
-	clutter? (
-		>=media-libs/clutter-1.16.4:1.0=
-		>=media-libs/clutter-gtk-1.4.4:1.0=
-		<x11-libs/gtk+-3.22:3
-	)
-	libnotify? ( >=x11-libs/libnotify-0.7:0= )
-	taglib? ( >=media-libs/taglib-1.6:0= )"
-RDEPEND="${COMMON_DEPEND}
-	media-plugins/gst-plugins-meta:1.0"
-DEPEND="${COMMON_DEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig
-	x11-proto/xproto"
-
-DOCS=( AUTHORS ChangeLog README THANKS TODO )
-
-src_configure() {
-	local myconf=(
-		$(use_enable clutter)
-		$(use_enable taglib)
-		$(use_enable libnotify notify-plugin)
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index eb25cc8a4b7a..ebd1a9448209 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index ae0ba7dc5745..24bf41cfcf56 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Sat, 24 Mar 2018 09:38:23 +0000
+Sun, 25 Mar 2018 17:38:27 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 54dfa4e9dc2a..d3ca3ace6856 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 419008 BLAKE2B 71f0ab3699e4a099c44c011fb7d1607c93e4628556d357e248d588dd4b30298f24421e20f3b09028f394cd30565736a3debab29d055e38cc1d05cc3b95e7fbb3 SHA512 243c38e1d0bd0c55ae403827eb74db802e4b6860f3637cb5417657bc368b43d6df8654d962a90a10485228d9fcdfa0522237ccff245f2bacf058795ba79b2a43
-TIMESTAMP 2018-03-24T09:38:27Z
+TIMESTAMP 2018-03-25T17:38:30Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlq2HJNfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlq33pZfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCRixAApslPYHlAvJHbhmnsXPocnqsqsXZeuEF5VWC8Ejl9Bkp21h5RhMdNW5Zs
-5wI2gT2/na01e8RjANICNcwxn8jP9eZZU5i3sK8D4eaSXHeVM9e1dK/w6rd8XZkb
-uoDw9NddVOFDT+uwQ/H2L6b8Rn7TsG7P7c6nX2PATjdAUiO244DuaeAqFswfS3va
-CNyFHjRauL0GiQ9D9czKPaPsYaGQqTkEjBcwRApMw/rE0JEP7nPXi9YYUbT2UqPv
-0YuRL2IdhUApx96TOh9bYMvzP7L5RkkMZxFxIb3iUmcVNM+BaYm5ddzM0KbidGr2
-3bRVBai0YSleWp2TsrH6itAaMfQk8QFFWqGNMPXbQBOYpM3MOGcYqhutzzD1s2QD
-1bTPbEHCj+nksMghFV3VoTcsQ4qS9sulJSpsrvgoKbToL3/47lIBVitRVPTiT3vH
-x72RcGeoSfHfon+9fhQ6vE2o2BcXM6Tq5U2PbWW91+hSAKk1fDBT2bEFtLN9+7pY
-djBuDplGl/GVfaJd8XJZDq5PTNriiZouFxTnj5wwIkl4UF1lTBCbpimmPJx1kTcB
-SUGyE2xuH/NqF1BuKVbbhMGZ0cvyrUZishaAAtmTSfbCKqKncE08rodMtfb/G9yz
-wI0AgP2ojshX5guGsBqrVAMMHKgEyO+++vmILrOpdT3ClcQdxwM=
-=nYYb
+klD/DQ/+IT9kZVcpXrrxmLaxI3A5nm3GLeN059CAgHOWeiBGQCJ6dDa0PS84VUjM
+xWwakEuJk5xz2zfR3GCQ1TIrE/uPGYWZjOHiTNBU/xWIVGHY2yXtkDtsQNl2HM9t
+onRyZLyuuTTbsQfGEF4uXfrHrYow2yamsPuQR3eSpPCEWLxXJSkWyDQne2likDHe
+Q6xXPlR7j9OG9CcRKW9yMRdahYc4Gbo3r1oJbvMAZHaZQaN+7dM6izO+IX/2xK0S
+xg7MSEehSDmeo7x6jdUiTaEgTkrgGIYRWiS5CRa8hXq8wdyh18UFISC+GGmzGz3W
+2HzUQZQQAoOUVn3jHmtYGQ7XMNdlI8/8oKKmljAbGfQ3oFfnEclBOLSK5Lbqugrj
+TUJ089KxPCSK4MET3yIEaBQcJNlZbswogc36bJYHZ/SYT8ksPF1XsjAthk46T3x5
+1F9ehewmVcfnQbm6b8G6GBy8+FKX2yJLujBPFMuwEJj5gItxMPaXRezTpOK6mxkJ
+xGM/VgXh3Js2zvOpR/9HKxtPvwysVlxXG2LSAcD6+IRdGojSbBSgJ7jhZEePcse0
+5nzeJG/hCHkM3Y3lPVRviC9MC9lkRb+O4m+fk3wo6JJxVkw3TLgVFj5H17ZvOvpX
+IJ46wWfs6JbqGgahqjuCDDm5cowtiN0YJhmkBMcf/wnd/J08Od4=
+=TfBP
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index ae0ba7dc5745..24bf41cfcf56 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Sat, 24 Mar 2018 09:38:23 +0000
+Sun, 25 Mar 2018 17:38:27 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 5b53d85ebc85..1c2fd5092ddd 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-accessibility/Manifest.gz b/metadata/md5-cache/app-accessibility/Manifest.gz
index 8b2f14fff794..f4b72f39a084 100644
--- a/metadata/md5-cache/app-accessibility/Manifest.gz
+++ b/metadata/md5-cache/app-accessibility/Manifest.gz
diff --git a/metadata/md5-cache/app-accessibility/freetts-1.2.1-r2 b/metadata/md5-cache/app-accessibility/freetts-1.2.1-r2
index 5de16f7298fa..8a0df8b41d82 100644
--- a/metadata/md5-cache/app-accessibility/freetts-1.2.1-r2
+++ b/metadata/md5-cache/app-accessibility/freetts-1.2.1-r2
@@ -9,5 +9,5 @@ LICENSE=jsapi? ( sun-bcla-jsapi ) freetts
 RDEPEND=>=virtual/jre-1.4 mbrola? ( >=app-accessibility/mbrola-3.0.1h-r6 ) >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=mirror://sourceforge/freetts/freetts-1.2.1-src.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=b87bd88757bb2e6224c0bf8da5c1ca50
diff --git a/metadata/md5-cache/app-accessibility/freetts-1.2.2 b/metadata/md5-cache/app-accessibility/freetts-1.2.2
index ae6fa41bda01..8ad655f5ca74 100644
--- a/metadata/md5-cache/app-accessibility/freetts-1.2.2
+++ b/metadata/md5-cache/app-accessibility/freetts-1.2.2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 mbrola? ( >=app-accessibility/mbrola-3.0.1h-r6 ) >=dev
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/freetts/freetts-1.2.2-src.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=2a12e601f44e6f39f12bc019d01943e7
diff --git a/metadata/md5-cache/app-admin/389-console-1.1.7-r1 b/metadata/md5-cache/app-admin/389-console-1.1.7-r1
index 4511879333ae..03458db7f2cf 100644
--- a/metadata/md5-cache/app-admin/389-console-1.1.7-r1
+++ b/metadata/md5-cache/app-admin/389-console-1.1.7-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-java/jss:3.4 dev-java/ldapsdk:4.1 >=dev-java/idm-console-framework-1.1 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3
 SLOT=1.1
 SRC_URI=http://directory.fedoraproject.org/sources/389-console-1.1.7.tar.bz2 https://dev.gentoo.org/~lxnay/389-console/fedora.png
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=d0cdfc0a5c36c7b3a0b20673e8824ead
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index bf1a311b7ea8..4243bc472a96 100644
--- a/metadata/md5-cache/app-admin/Manifest.gz
+++ b/metadata/md5-cache/app-admin/Manifest.gz
diff --git a/metadata/md5-cache/app-arch/Manifest.gz b/metadata/md5-cache/app-arch/Manifest.gz
index de1727f5da98..356782ac9cf3 100644
--- a/metadata/md5-cache/app-arch/Manifest.gz
+++ b/metadata/md5-cache/app-arch/Manifest.gz
diff --git a/metadata/md5-cache/app-arch/xarchiver-0.5.4 b/metadata/md5-cache/app-arch/xarchiver-0.5.4
deleted file mode 100644
index 0029cace303e..000000000000
--- a/metadata/md5-cache/app-arch/xarchiver-0.5.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=>=dev-libs/glib-2 >=x11-libs/gtk+-2.24:2 dev-util/intltool sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170422 >=sys-apps/sed-4
-DESCRIPTION=a GTK+ based and advanced archive manager that can be used with Thunar
-EAPI=5
-HOMEPAGE=http://xarchiver.sourceforge.net/
-IUSE=debug
-KEYWORDS=alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2 >=x11-libs/gtk+-2.24:2
-SLOT=0
-SRC_URI=mirror://sourceforge/xarchiver/xarchiver-0.5.4.tar.bz2
-_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25	xfconf	25bb7fe99d6e58851633dc43d429c5ae
-_md5_=15d651c16a0bff1fbf28dfb31d98493c
diff --git a/metadata/md5-cache/app-arch/xarchiver-0.5.4.11_p20170629 b/metadata/md5-cache/app-arch/xarchiver-0.5.4.11_p20170629
deleted file mode 100644
index 9a88a01d0191..000000000000
--- a/metadata/md5-cache/app-arch/xarchiver-0.5.4.11_p20170629
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure postinst postrm prepare
-DEPEND=>=dev-libs/glib-2:= x11-libs/gtk+:3= dev-util/intltool sys-devel/gettext virtual/pkgconfig doc? ( app-text/docbook-xml-dtd app-text/docbook-xsl-stylesheets dev-libs/libxml2 dev-libs/libxslt ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4
-DESCRIPTION=A GTK+ archive manager that can be used with Thunar
-EAPI=6
-HOMEPAGE=https://github.com/ib/xarchiver
-IUSE=doc
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2:= x11-libs/gtk+:3=
-SLOT=0
-SRC_URI=https://github.com/ib/xarchiver/archive/79a73d46b782cf8bb93d058d00d2cb81a9b3df8a.tar.gz -> xarchiver-0.5.4.11_p20170629.tar.gz
-_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a4e95720f419daf3ea92f832b52d442c
diff --git a/metadata/md5-cache/app-cdr/Manifest.gz b/metadata/md5-cache/app-cdr/Manifest.gz
index c210b9d2362b..dda2d516c4c8 100644
--- a/metadata/md5-cache/app-cdr/Manifest.gz
+++ b/metadata/md5-cache/app-cdr/Manifest.gz
diff --git a/metadata/md5-cache/app-cdr/xfburn-0.5.4 b/metadata/md5-cache/app-cdr/xfburn-0.5.4
deleted file mode 100644
index 5300187afb72..000000000000
--- a/metadata/md5-cache/app-cdr/xfburn-0.5.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=>=dev-libs/glib-2.32:= >=dev-libs/libburn-0.4.2:= >=dev-libs/libisofs-0.6.2:= >=x11-libs/gtk+-2.24:2= >=xfce-base/exo-0.6:= >=xfce-base/libxfce4ui-4.10:= gstreamer? ( media-libs/gstreamer:1.0= media-libs/gst-plugins-base:1.0= ) udev? ( virtual/libgudev:= ) dev-util/intltool sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170422 >=sys-apps/sed-4
-DESCRIPTION=GTK+ based CD and DVD burning application
-EAPI=5
-HOMEPAGE=https://goodies.xfce.org/projects/applications/xfburn
-IUSE=debug gstreamer +udev
-KEYWORDS=amd64 arm ~ppc x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.32:= >=dev-libs/libburn-0.4.2:= >=dev-libs/libisofs-0.6.2:= >=x11-libs/gtk+-2.24:2= >=xfce-base/exo-0.6:= >=xfce-base/libxfce4ui-4.10:= gstreamer? ( media-libs/gstreamer:1.0= media-libs/gst-plugins-base:1.0= ) udev? ( virtual/libgudev:= )
-SLOT=0
-SRC_URI=mirror://xfce/src/apps/xfburn/0.5/xfburn-0.5.4.tar.bz2
-_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25	xfconf	25bb7fe99d6e58851633dc43d429c5ae
-_md5_=261ad9e5804a80a1a54fd4d0930e9d05
diff --git a/metadata/md5-cache/app-cdr/xfburn-0.5.4-r1 b/metadata/md5-cache/app-cdr/xfburn-0.5.4-r1
deleted file mode 100644
index 80a1ec20202b..000000000000
--- a/metadata/md5-cache/app-cdr/xfburn-0.5.4-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure postinst postrm
-DEPEND=>=dev-libs/glib-2.32:= >=dev-libs/libburn-0.4.2:= >=dev-libs/libisofs-0.6.2:= >=x11-libs/gtk+-2.24:2= >=xfce-base/exo-0.6:= >=xfce-base/libxfce4ui-4.10:= gstreamer? ( media-libs/gstreamer:1.0= media-libs/gst-plugins-base:1.0= ) udev? ( virtual/libgudev:= ) dev-util/intltool sys-devel/gettext virtual/pkgconfig >=sys-apps/sed-4
-DESCRIPTION=GTK+ based CD and DVD burning application
-EAPI=6
-HOMEPAGE=https://goodies.xfce.org/projects/applications/xfburn
-IUSE=gstreamer +udev
-KEYWORDS=~amd64 ~arm ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.32:= >=dev-libs/libburn-0.4.2:= >=dev-libs/libisofs-0.6.2:= >=x11-libs/gtk+-2.24:2= >=xfce-base/exo-0.6:= >=xfce-base/libxfce4ui-4.10:= gstreamer? ( media-libs/gstreamer:1.0= media-libs/gst-plugins-base:1.0= ) udev? ( virtual/libgudev:= )
-SLOT=0
-SRC_URI=mirror://xfce/src/apps/xfburn/0.5/xfburn-0.5.4.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a7c35745a960435de584c60c84049f92
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index b23c16977b65..2f88484c47f6 100644
--- a/metadata/md5-cache/app-crypt/Manifest.gz
+++ b/metadata/md5-cache/app-crypt/Manifest.gz
diff --git a/metadata/md5-cache/app-crypt/jacksum-1.7.0 b/metadata/md5-cache/app-crypt/jacksum-1.7.0
index 693bf2ca25bc..bc5c6008cd2c 100644
--- a/metadata/md5-cache/app-crypt/jacksum-1.7.0
+++ b/metadata/md5-cache/app-crypt/jacksum-1.7.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.3.1 >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=mirror://sourceforge/jacksum/jacksum-1.7.0.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=81fa0d6c8411f32886db12981d7116eb
diff --git a/metadata/md5-cache/app-crypt/moolticute-0.11.11_beta b/metadata/md5-cache/app-crypt/moolticute-0.12.7
index 78a078bb0ba4..7a7929866c88 100644
--- a/metadata/md5-cache/app-crypt/moolticute-0.11.11_beta
+++ b/metadata/md5-cache/app-crypt/moolticute-0.12.7
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 ~arm
 LICENSE=GPL-3
 RDEPEND=>=dev-libs/libusb-1.0.20 >=dev-qt/qtcore-5.6:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qttest:5 dev-qt/qtwebsockets:5 dev-qt/qtwidgets:5
 SLOT=0
-SRC_URI=https://github.com/mooltipass/moolticute/archive/v0.11.11-beta.tar.gz -> moolticute-0.11.11_beta.tar.gz
+SRC_URI=https://github.com/mooltipass/moolticute/archive/v0.12.7.tar.gz -> moolticute-0.12.7.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	udev	d91cac2c73b94629cad2daea66e0d182	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=4e9ce8403a081e97fee544d363655a9e
diff --git a/metadata/md5-cache/app-editors/Manifest.gz b/metadata/md5-cache/app-editors/Manifest.gz
index 326215b5ed40..97045ee9b6e7 100644
--- a/metadata/md5-cache/app-editors/Manifest.gz
+++ b/metadata/md5-cache/app-editors/Manifest.gz
diff --git a/metadata/md5-cache/app-editors/jedit-5.2.0-r1 b/metadata/md5-cache/app-editors/jedit-5.2.0-r1
index 7beaf7db3239..650e53a87692 100644
--- a/metadata/md5-cache/app-editors/jedit-5.2.0-r1
+++ b/metadata/md5-cache/app-editors/jedit-5.2.0-r1
@@ -9,5 +9,5 @@ LICENSE=BSD GPL-2
 RDEPEND=dev-java/bsh:0 dev-java/jsr305:0 dev-java/ant-contrib:0 dev-java/ant-apache-bsf:0 >=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=mirror://sourceforge/jedit/jedit5.2.0source.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=3c5b3c487a3cc0bb29f7d8423d48c65e
diff --git a/metadata/md5-cache/app-editors/jedit-5.4.0 b/metadata/md5-cache/app-editors/jedit-5.4.0
index 741ff7d6962a..a347a79521a5 100644
--- a/metadata/md5-cache/app-editors/jedit-5.4.0
+++ b/metadata/md5-cache/app-editors/jedit-5.4.0
@@ -9,5 +9,5 @@ LICENSE=BSD GPL-2
 RDEPEND=dev-java/jsr305:0 >=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=mirror://sourceforge/jedit/jedit5.4.0source.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=63141cd6f4c6af2df53c906c02711d9c
diff --git a/metadata/md5-cache/app-editors/jext-5.0-r2 b/metadata/md5-cache/app-editors/jext-5.0-r2
index bd6e785653ec..6a0cc7c09c1f 100644
--- a/metadata/md5-cache/app-editors/jext-5.0-r2
+++ b/metadata/md5-cache/app-editors/jext-5.0-r2
@@ -9,5 +9,5 @@ LICENSE=|| ( GPL-2 JPython )
 RDEPEND=>=virtual/jre-1.6 dev-java/jython:2.7 dev-java/jgoodies-looks:1.2 dev-java/gnu-regexp:1 >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=mirror://sourceforge/jext/jext-sources-5.0.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=b5c1a6dfee1d1abc26470765a14ad015
diff --git a/metadata/md5-cache/app-emacs/Manifest.gz b/metadata/md5-cache/app-emacs/Manifest.gz
index 0297c03d2e10..f9b13aee3577 100644
--- a/metadata/md5-cache/app-emacs/Manifest.gz
+++ b/metadata/md5-cache/app-emacs/Manifest.gz
diff --git a/metadata/md5-cache/app-emacs/jde-2.4.1 b/metadata/md5-cache/app-emacs/jde-2.4.1
index c451432fb493..482f3d87391d 100644
--- a/metadata/md5-cache/app-emacs/jde-2.4.1
+++ b/metadata/md5-cache/app-emacs/jde-2.4.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/jdk-1.3 app-emacs/elib dev-java/bsh:0 dev-java/junit:0 dev-util/checkstyle:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=virtual/emacs-23
 SLOT=0
 SRC_URI=mirror://gentoo/jdee-2.4.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp	8a9eaaa38b2345593b1cbc5315dde83c	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp	8a9eaaa38b2345593b1cbc5315dde83c	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=c9da711d9544abd501f08ca0b643ee4e
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index 255d5715b206..b9dbcd52e241 100644
--- a/metadata/md5-cache/app-emulation/Manifest.gz
+++ b/metadata/md5-cache/app-emulation/Manifest.gz
diff --git a/metadata/md5-cache/app-emulation/edumips64-1.1 b/metadata/md5-cache/app-emulation/edumips64-1.1
index cced9e9fc8a2..0a77cb216650 100644
--- a/metadata/md5-cache/app-emulation/edumips64-1.1
+++ b/metadata/md5-cache/app-emulation/edumips64-1.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=mirror://sourceforge/edumips64/edumips64-1.1.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=b59e7e08d1794a2fa4cdbb7993b6c0c0
diff --git a/metadata/md5-cache/app-emulation/edumips64-1.2 b/metadata/md5-cache/app-emulation/edumips64-1.2
index 4e6ebc7e22b4..308b728c1759 100644
--- a/metadata/md5-cache/app-emulation/edumips64-1.2
+++ b/metadata/md5-cache/app-emulation/edumips64-1.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=mirror://sourceforge/edumips64/edumips64-1.2.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=8517a4dd49baa3290f9ec87d2a8e1aa7
diff --git a/metadata/md5-cache/app-emulation/virt-manager-9999 b/metadata/md5-cache/app-emulation/virt-manager-9999
index e5a509c7176d..5daffaa8563f 100644
--- a/metadata/md5-cache/app-emulation/virt-manager-9999
+++ b/metadata/md5-cache/app-emulation/virt-manager-9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=!app-emulation/virtinst 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(+)] >=app-emulation/libvirt-glib-1.0.0[introspection] dev-libs/libxml2[python,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/configparser[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/ipaddr[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/libvirt-python[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/pygobject:3[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/requests[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(+)] >=sys-libs/libosinfo-0.2.10[introspection] gtk? ( gnome-base/dconf >=net-libs/gtk-vnc-0.3.8[gtk3,introspection,python,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(+)] net-misc/spice-gtk[usbredir,gtk3,introspection,sasl?] net-misc/x11-ssh-askpass x11-libs/gtk+:3[introspection] x11-libs/vte:2.91[introspection] gnome-keyring? ( gnome-base/libgnome-keyring ) policykit? ( sys-auth/polkit[introspection] ) ) dev-lang/perl dev-util/intltool >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info 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-vcs/git-1.8.2.1
+DEPEND=!app-emulation/virtinst 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(+)?] >=app-emulation/libvirt-glib-1.0.0[introspection] dev-libs/libxml2[python,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/configparser[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/ipaddr[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/libvirt-python[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/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/requests[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-libs/libosinfo-0.2.10[introspection] gtk? ( gnome-base/dconf >=net-libs/gtk-vnc-0.3.8[gtk3,introspection,python,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(+)?] net-misc/spice-gtk[usbredir,gtk3,introspection,sasl?] net-misc/x11-ssh-askpass x11-libs/gtk+:3[introspection] x11-libs/vte:2.91[introspection] gnome-keyring? ( gnome-base/libgnome-keyring ) policykit? ( sys-auth/polkit[introspection] ) ) dev-lang/perl dev-util/intltool >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info 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-vcs/git-1.8.2.1
 DESCRIPTION=A graphical tool for administering virtual machines
 EAPI=6
 HOMEPAGE=http://virt-manager.org
-IUSE=gnome-keyring gtk policykit sasl python_targets_python2_7
+IUSE=gnome-keyring gtk policykit sasl 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
 LICENSE=GPL-2
-RDEPEND=!app-emulation/virtinst 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(+)] >=app-emulation/libvirt-glib-1.0.0[introspection] dev-libs/libxml2[python,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/configparser[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/ipaddr[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/libvirt-python[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/pygobject:3[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/requests[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(+)] >=sys-libs/libosinfo-0.2.10[introspection] gtk? ( gnome-base/dconf >=net-libs/gtk-vnc-0.3.8[gtk3,introspection,python,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(+)] net-misc/spice-gtk[usbredir,gtk3,introspection,sasl?] net-misc/x11-ssh-askpass x11-libs/gtk+:3[introspection] x11-libs/vte:2.91[introspection] gnome-keyring? ( gnome-base/libgnome-keyring ) policykit? ( sys-auth/polkit[introspection] ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)]
-REQUIRED_USE=python_targets_python2_7
+RDEPEND=!app-emulation/virtinst 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(+)?] >=app-emulation/libvirt-glib-1.0.0[introspection] dev-libs/libxml2[python,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/configparser[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/ipaddr[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/libvirt-python[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/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/requests[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-libs/libosinfo-0.2.10[introspection] gtk? ( gnome-base/dconf >=net-libs/gtk-vnc-0.3.8[gtk3,introspection,python,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(+)?] net-misc/spice-gtk[usbredir,gtk3,introspection,sasl?] net-misc/x11-ssh-askpass x11-libs/gtk+:3[introspection] x11-libs/vte:2.91[introspection] gnome-keyring? ( gnome-base/libgnome-keyring ) policykit? ( sys-auth/polkit[introspection] ) ) 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(+)?]
+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
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a8a640edb2d989c773ba2e54ddca7071
+_md5_=690888f4417f96f4c0c4e9ffa3b0eeae
diff --git a/metadata/md5-cache/app-forensics/Manifest.gz b/metadata/md5-cache/app-forensics/Manifest.gz
index 563650592d60..2696c18b097b 100644
--- a/metadata/md5-cache/app-forensics/Manifest.gz
+++ b/metadata/md5-cache/app-forensics/Manifest.gz
diff --git a/metadata/md5-cache/app-forensics/sleuthkit-4.5.0 b/metadata/md5-cache/app-forensics/sleuthkit-4.5.0
index 8d797e2668ff..7afbb167ed49 100644
--- a/metadata/md5-cache/app-forensics/sleuthkit-4.5.0
+++ b/metadata/md5-cache/app-forensics/sleuthkit-4.5.0
@@ -9,5 +9,5 @@ LICENSE=BSD CPL-1.0 GPL-2+ IBM java? ( Apache-2.0 )
 RDEPEND=dev-db/sqlite:3 dev-lang/perl:* aff? ( app-forensics/afflib ) ewf? ( app-forensics/libewf:= ) java? ( >=virtual/jdk-1.8:* >=dev-java/c3p0-0.9.5:0 >=dev-java/jdbc-postgresql-9.4:0 ) zlib? ( sys-libs/zlib ) java? ( >=virtual/jre-1.8:= ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0/13
 SRC_URI=https://github.com/sleuthkit/sleuthkit/releases/download/sleuthkit-4.5.0/sleuthkit-4.5.0.tar.gz java? ( http://repo1.maven.org/maven2/org/xerial/sqlite-jdbc/3.8.11/sqlite-jdbc-3.8.11.jar )
-_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=d67c7a2a7a68d5382fda9432acbe2901
diff --git a/metadata/md5-cache/app-i18n/Manifest.gz b/metadata/md5-cache/app-i18n/Manifest.gz
index 2b7b1cf50bed..96bd1d43af2e 100644
--- a/metadata/md5-cache/app-i18n/Manifest.gz
+++ b/metadata/md5-cache/app-i18n/Manifest.gz
diff --git a/metadata/md5-cache/app-i18n/unicode-data-10.0.0 b/metadata/md5-cache/app-i18n/unicode-data-10.0.0
index b29fe6dce12a..f3100475fc2d 100644
--- a/metadata/md5-cache/app-i18n/unicode-data-10.0.0
+++ b/metadata/md5-cache/app-i18n/unicode-data-10.0.0
@@ -3,8 +3,8 @@ DEPEND=app-arch/unzip
 DESCRIPTION=Unicode data from unicode.org
 EAPI=6
 HOMEPAGE=http://www.unicode.org/ucd/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=unicode
 SLOT=0
 SRC_URI=http://www.unicode.org/Public/zipped/10.0.0/UCD.zip -> unicode-data-10.0.0-UCD.zip http://www.unicode.org/Public/zipped/10.0.0/Unihan.zip -> unicode-data-10.0.0-Unihan.zip
-_md5_=2895a141c244e240712b7b00e3610e61
+_md5_=fa79531ede8dced7bbc9568308acda99
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index e282d10fb43a..a37ef2111f71 100644
--- a/metadata/md5-cache/app-misc/Manifest.gz
+++ b/metadata/md5-cache/app-misc/Manifest.gz
diff --git a/metadata/md5-cache/app-misc/bfm-1.2-r1 b/metadata/md5-cache/app-misc/bfm-1.2-r1
index 2d81c0d5d12b..14cf45efa581 100644
--- a/metadata/md5-cache/app-misc/bfm-1.2-r1
+++ b/metadata/md5-cache/app-misc/bfm-1.2-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.4 >=dev-java/sun-java3d-bin-1.3 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://bfm.webhop.net/releases/bfm-1.2.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=0ccadd38be72f78455c39086f7750e5b
diff --git a/metadata/md5-cache/app-misc/bfm-1.2-r2 b/metadata/md5-cache/app-misc/bfm-1.2-r2
index da91ac01b67d..6b55311b9a35 100644
--- a/metadata/md5-cache/app-misc/bfm-1.2-r2
+++ b/metadata/md5-cache/app-misc/bfm-1.2-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.4 dev-java/sun-java3d-bin:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://bfm.webhop.net/releases/bfm-1.2.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=ceb130ba5ea4c1462c3b659126a18ea8
diff --git a/metadata/md5-cache/app-misc/calendar-0.9.1 b/metadata/md5-cache/app-misc/calendar-0.9.1
deleted file mode 100644
index b886d732e5a5..000000000000
--- a/metadata/md5-cache/app-misc/calendar-0.9.1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install
-DESCRIPTION=Standard unix calendar program for Linux, ported from OpenBSD
-EAPI=0
-HOMEPAGE=http://bsdcalendar.sourceforge.net/
-KEYWORDS=alpha amd64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86
-LICENSE=BSD
-SLOT=0
-SRC_URI=http://bsdcalendar.sourceforge.net/calendar-0.9.1.tar.bz2
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=8871ca4581ae638fd8b361f4ffa7e921
diff --git a/metadata/md5-cache/app-misc/freemind-1.0.1-r3 b/metadata/md5-cache/app-misc/freemind-1.0.1-r3
index f10800a637af..0e1ccfe2e7a4 100644
--- a/metadata/md5-cache/app-misc/freemind-1.0.1-r3
+++ b/metadata/md5-cache/app-misc/freemind-1.0.1-r3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-java/javahelp:0 dev-java/jgoodies-forms:0 dev-java/jibx:0 dev-java/jortho:0 >=dev-java/simplyhtml-0.13.1:0 groovy? ( dev-java/groovy ) latex? ( dev-java/hoteqn:0 ) pdf? ( dev-java/batik:1.9 dev-java/fop:0 ) svg? ( dev-java/batik:1.9 dev-java/fop:0 ) >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=mirror://sourceforge/freemind/freemind-src-1.0.1.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=0df7525279b5f762f28253cb56571fe8
diff --git a/metadata/md5-cache/app-misc/gramps-4.2.8 b/metadata/md5-cache/app-misc/gramps-4.2.8
new file mode 100644
index 000000000000..f607457cd98c
--- /dev/null
+++ b/metadata/md5-cache/app-misc/gramps-4.2.8
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=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_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?]
+DESCRIPTION=Genealogical Research and Analysis Management Programming System
+EAPI=6
+HOMEPAGE=https://gramps-project.org/
+IUSE=+rcs +reports exif geo postscript spell python_targets_python3_4 python_targets_python3_5 python_single_target_python3_4 python_single_target_python3_5
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=dev-python/bsddb3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] dev-python/pycairo[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/pygobject-3.12:3[cairo,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] dev-python/pyicu[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] gnome-base/librsvg:2 >x11-libs/gtk+-3.14.8:3[introspection] x11-libs/pango[introspection] x11-misc/xdg-utils reports? ( media-gfx/graphviz[postscript?] ) exif? ( >=media-libs/gexiv2-0.5[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,introspection] ) geo? ( >=sci-geosciences/osm-gps-map-1.1.0 ) spell? ( app-text/gtkspell:3[introspection] ) rcs? ( dev-vcs/rcs ) 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_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?]
+REQUIRED_USE=^^ ( python_single_target_python3_4 python_single_target_python3_5 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 )
+SLOT=0
+SRC_URI=https://github.com/gramps-project/gramps/archive/v4.2.8.tar.gz -> gramps-4.2.8.tar.gz
+_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=ca9bbec6f2c4ffb77ea9c403cb7f2bd1
diff --git a/metadata/md5-cache/app-misc/pax-utils-1.2.3 b/metadata/md5-cache/app-misc/pax-utils-1.2.3
index a1e30cdff4b6..f0129e1bbd4d 100644
--- a/metadata/md5-cache/app-misc/pax-utils-1.2.3
+++ b/metadata/md5-cache/app-misc/pax-utils-1.2.3
@@ -4,10 +4,10 @@ DESCRIPTION=ELF utils that can check files for security relevant properties
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/index.php?title=Project:Hardened/PaX_Utilities
 IUSE=caps debug python seccomp
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=caps? ( >=sys-libs/libcap-2.24 ) python? ( dev-python/pyelftools ) seccomp? ( sys-libs/libseccomp )
 SLOT=0
 SRC_URI=mirror://gentoo/pax-utils-1.2.3.tar.xz https://dev.gentoo.org/~slyfox/distfiles/pax-utils-1.2.3.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=69ff875b76e9efeb963c6f5c4a7afee8
+_md5_=15456055c14667218f3a8cbcb6213b6a
diff --git a/metadata/md5-cache/app-office/Manifest.gz b/metadata/md5-cache/app-office/Manifest.gz
index 69c0e3cccbe4..f55d048dc856 100644
--- a/metadata/md5-cache/app-office/Manifest.gz
+++ b/metadata/md5-cache/app-office/Manifest.gz
diff --git a/metadata/md5-cache/app-office/auto-multiple-choice-1.3.0-r1 b/metadata/md5-cache/app-office/auto-multiple-choice-1.3.0-r1
index e1989c29f387..ce3e61ce1dc2 100644
--- a/metadata/md5-cache/app-office/auto-multiple-choice-1.3.0-r1
+++ b/metadata/md5-cache/app-office/auto-multiple-choice-1.3.0-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile install postinst postrm prepare
-DEPEND=app-text/texlive[dvi2tty,extra,graphics,png,pstricks,science,truetype,xml,X,luatex,xetex,humanities,omega,publishers] app-text/poppler:= dev-perl/XML-LibXML media-libs/netpbm media-libs/opencv l10n_fr? ( app-text/texlive[l10n_fr] ) l10n_ja? ( app-text/texlive[l10n_ja] ) app-text/dblatex app-text/docbook-xml-simple-dtd:* app-text/docbook-xsl-stylesheets virtual/latex-base >=sys-apps/texinfo-4.2-r5
+DEPEND=app-text/texlive[dvi2tty,extra,graphics,png,pstricks,science,truetype,xml,X,luatex,xetex,humanities,publishers] app-text/poppler:= dev-perl/XML-LibXML media-libs/netpbm media-libs/opencv l10n_fr? ( app-text/texlive[l10n_fr] ) l10n_ja? ( app-text/texlive[l10n_ja] ) app-text/dblatex app-text/docbook-xml-simple-dtd:* app-text/docbook-xsl-stylesheets virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DESCRIPTION=Create and manage multiple choice questionnaries, including automated marking
 EAPI=6
 HOMEPAGE=http://home.gna.org/auto-qcm/
 IUSE=l10n_ar l10n_es l10n_fr l10n_ja
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
-RDEPEND=app-text/texlive[dvi2tty,extra,graphics,png,pstricks,science,truetype,xml,X,luatex,xetex,humanities,omega,publishers] app-text/poppler:= dev-perl/XML-LibXML media-libs/netpbm media-libs/opencv l10n_fr? ( app-text/texlive[l10n_fr] ) l10n_ja? ( app-text/texlive[l10n_ja] ) app-text/pdftk dev-lang/perl:= dev-perl/Glib-Object-Introspection dev-perl/Gtk2 dev-perl/Gtk2-Notify media-gfx/imagemagick dev-perl/XML-Writer dev-perl/Archive-Zip dev-perl/DBI dev-perl/Text-CSV dev-perl/DBD-SQLite dev-perl/Net-CUPS dev-perl/Email-Address dev-perl/Email-MIME dev-perl/Email-Sender virtual/latex-base
+RDEPEND=app-text/texlive[dvi2tty,extra,graphics,png,pstricks,science,truetype,xml,X,luatex,xetex,humanities,publishers] app-text/poppler:= dev-perl/XML-LibXML media-libs/netpbm media-libs/opencv l10n_fr? ( app-text/texlive[l10n_fr] ) l10n_ja? ( app-text/texlive[l10n_ja] ) app-text/pdftk dev-lang/perl:= dev-perl/Glib-Object-Introspection dev-perl/Gtk2 dev-perl/Gtk2-Notify media-gfx/imagemagick dev-perl/XML-Writer dev-perl/Archive-Zip dev-perl/DBI dev-perl/Text-CSV dev-perl/DBD-SQLite dev-perl/Net-CUPS dev-perl/Email-Address dev-perl/Email-MIME dev-perl/Email-Sender virtual/latex-base
 SLOT=0
 SRC_URI=http://download.gna.org/auto-qcm/auto-multiple-choice_1.3.0_sources.tar.gz
 _eclasses_=latex-package	79acad19b9efeec616d0ad70cd117b03	multilib	97f470f374f2e94ccab04a2fb21d811e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=0532433d9539b5310e1edc9041b0fbae
+_md5_=23929485d68efe159fc76f89cb190627
diff --git a/metadata/md5-cache/app-office/borg-1.7.4-r3 b/metadata/md5-cache/app-office/borg-1.7.4-r3
index e39cdd60912d..864353ae741f 100644
--- a/metadata/md5-cache/app-office/borg-1.7.4-r3
+++ b/metadata/md5-cache/app-office/borg-1.7.4-r3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-java/javahelp:0 dev-java/oracle-javamail:0 >=virtual/jre-1.6 dev-db/hsqldb:0 dev-java/jgoodies-looks:2.0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/borg-calendar/borg%201.7/BORG%201.7.4/borg_src_1_7_4.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=82582d34556beb640e0ed303ade7e3fd
diff --git a/metadata/md5-cache/app-office/gnucash-2.6.19 b/metadata/md5-cache/app-office/gnucash-2.6.19
deleted file mode 100644
index d96d1de5a81c..000000000000
--- a/metadata/md5-cache/app-office/gnucash-2.6.19
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=>=dev-libs/glib-2.32.0:2 >=dev-libs/libxml2-2.5.10:2 >=dev-libs/popt-1.5 >=dev-scheme/guile-1.8.5:12=[deprecated,regex] <dev-scheme/guile-2.2 >=net-libs/webkit-gtk-1.2:2 >=sys-libs/zlib-1.1.4 >=x11-libs/goffice-0.7.0:0.8[gnome] >=x11-libs/gtk+-2.24:2 dev-libs/libxslt dev-scheme/guile-www gnome-base/dconf gnome-base/libgnomecanvas x11-libs/pango gnome-keyring? ( >=app-crypt/libsecret-0.18 ) hbci? ( >=net-libs/aqbanking-5[gtk,ofx?] sys-libs/gwenhywfar[gtk] chipcard? ( sys-libs/libchipcard ) ) mysql? ( dev-db/libdbi dev-db/libdbi-drivers[mysql] ) ofx? ( >=dev-libs/libofx-0.9.1 ) postgres? ( dev-db/libdbi dev-db/libdbi-drivers[postgres] ) 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(+)] ) quotes? ( >=dev-perl/Finance-Quote-1.11 dev-perl/Date-Manip dev-perl/HTML-TableExtract ) sqlite? ( >=dev-db/libdbi-0.9.0 >=dev-db/libdbi-drivers-0.9.0[sqlite] ) dev-util/intltool gnome-base/gnome-common sys-devel/libtool virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1: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 personal finance manager
-EAPI=6
-HOMEPAGE=http://www.gnucash.org/
-IUSE=chipcard debug +doc gnome-keyring hbci mysql ofx postgres python quotes sqlite python_targets_python2_7
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-PDEPEND=doc? ( ~app-doc/gnucash-docs-2.6.19 gnome-extra/yelp )
-RDEPEND=>=dev-libs/glib-2.32.0:2 >=dev-libs/libxml2-2.5.10:2 >=dev-libs/popt-1.5 >=dev-scheme/guile-1.8.5:12=[deprecated,regex] <dev-scheme/guile-2.2 >=net-libs/webkit-gtk-1.2:2 >=sys-libs/zlib-1.1.4 >=x11-libs/goffice-0.7.0:0.8[gnome] >=x11-libs/gtk+-2.24:2 dev-libs/libxslt dev-scheme/guile-www gnome-base/dconf gnome-base/libgnomecanvas x11-libs/pango gnome-keyring? ( >=app-crypt/libsecret-0.18 ) hbci? ( >=net-libs/aqbanking-5[gtk,ofx?] sys-libs/gwenhywfar[gtk] chipcard? ( sys-libs/libchipcard ) ) mysql? ( dev-db/libdbi dev-db/libdbi-drivers[mysql] ) ofx? ( >=dev-libs/libofx-0.9.1 ) postgres? ( dev-db/libdbi dev-db/libdbi-drivers[postgres] ) 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(+)] ) quotes? ( >=dev-perl/Finance-Quote-1.11 dev-perl/Date-Manip dev-perl/HTML-TableExtract ) sqlite? ( >=dev-db/libdbi-0.9.0 >=dev-db/libdbi-drivers-0.9.0[sqlite] )
-REQUIRED_USE=python? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://sourceforge/gnucash/gnucash-2.6.19.tar.bz2
-_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=87de0404e612af4083e86be947c25829
diff --git a/metadata/md5-cache/app-office/gnucash-2.7.7 b/metadata/md5-cache/app-office/gnucash-2.7.7-r1
index bc1288b4c725..5d85ae44fa99 100644
--- a/metadata/md5-cache/app-office/gnucash-2.7.7
+++ b/metadata/md5-cache/app-office/gnucash-2.7.7-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-libs/glib-2.40.0:2 >=dev-libs/libxml2-2.7.0:2 >=dev-scheme/guile-2.0.0:12=[regex] >=sys-libs/zlib-1.1.4 >=x11-libs/gtk+-3.14.0:3 dev-libs/boost:=[icu,nls] dev-libs/icu:= dev-libs/libxslt gnome-base/dconf net-libs/webkit-gtk:4= aqbanking? ( >=net-libs/aqbanking-5[gtk,ofx?] sys-libs/gwenhywfar[gtk] chipcard? ( sys-libs/libchipcard ) ) gnome-keyring? ( >=app-crypt/libsecret-0.18 ) mysql? ( dev-db/libdbi dev-db/libdbi-drivers[mysql] ) ofx? ( >=dev-libs/libofx-0.9.1 ) postgres? ( dev-db/libdbi dev-db/libdbi-drivers[postgres] ) 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(+)] ) quotes? ( >=dev-perl/Finance-Quote-1.11 dev-perl/Date-Manip dev-perl/HTML-TableExtract ) sqlite? ( >=dev-db/libdbi-0.9.0 >=dev-db/libdbi-drivers-0.9.0[sqlite] ) ~dev-cpp/gtest-1.8.0 >=sys-devel/gettext-0.19.6 dev-lang/perl dev-perl/XML-Parser gnome-base/gnome-common sys-devel/libtool virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
+DEPEND=>=dev-libs/glib-2.40.0:2 >=dev-libs/libxml2-2.7.0:2 >=dev-scheme/guile-2.0.0:12=[regex] >=sys-libs/zlib-1.1.4 >=x11-libs/gtk+-3.14.0:3 dev-libs/boost:=[icu,nls] dev-libs/icu:= dev-libs/libxslt gnome-base/dconf net-libs/webkit-gtk:4= aqbanking? ( >=net-libs/aqbanking-5[gtk,ofx?] sys-libs/gwenhywfar[gtk] chipcard? ( sys-libs/libchipcard ) ) gnome-keyring? ( >=app-crypt/libsecret-0.18 ) mysql? ( dev-db/libdbi dev-db/libdbi-drivers[mysql] ) ofx? ( >=dev-libs/libofx-0.9.1 ) postgres? ( dev-db/libdbi dev-db/libdbi-drivers[postgres] ) python? ( 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(+)?] ) quotes? ( >=dev-perl/Finance-Quote-1.11 dev-perl/Date-Manip dev-perl/HTML-TableExtract ) sqlite? ( >=dev-db/libdbi-0.9.0 >=dev-db/libdbi-drivers-0.9.0[sqlite] ) ~dev-cpp/gtest-1.8.0 >=sys-devel/gettext-0.19.6 dev-lang/perl dev-perl/XML-Parser gnome-base/gnome-common sys-devel/libtool virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
 DESCRIPTION=A personal finance manager
 EAPI=6
 HOMEPAGE=http://www.gnucash.org/
-IUSE=aqbanking chipcard debug examples gnome-keyring mysql nls ofx postgres python quotes -register2 sqlite python_targets_python2_7
+IUSE=aqbanking chipcard debug examples gnome-keyring mysql nls ofx postgres python quotes -register2 sqlite 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 ~ppc ~ppc64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.40.0:2 >=dev-libs/libxml2-2.7.0:2 >=dev-scheme/guile-2.0.0:12=[regex] >=sys-libs/zlib-1.1.4 >=x11-libs/gtk+-3.14.0:3 dev-libs/boost:=[icu,nls] dev-libs/icu:= dev-libs/libxslt gnome-base/dconf net-libs/webkit-gtk:4= aqbanking? ( >=net-libs/aqbanking-5[gtk,ofx?] sys-libs/gwenhywfar[gtk] chipcard? ( sys-libs/libchipcard ) ) gnome-keyring? ( >=app-crypt/libsecret-0.18 ) mysql? ( dev-db/libdbi dev-db/libdbi-drivers[mysql] ) ofx? ( >=dev-libs/libofx-0.9.1 ) postgres? ( dev-db/libdbi dev-db/libdbi-drivers[postgres] ) 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(+)] ) quotes? ( >=dev-perl/Finance-Quote-1.11 dev-perl/Date-Manip dev-perl/HTML-TableExtract ) sqlite? ( >=dev-db/libdbi-0.9.0 >=dev-db/libdbi-drivers-0.9.0[sqlite] )
-REQUIRED_USE=chipcard? ( aqbanking ) python? ( python_targets_python2_7 )
+RDEPEND=>=dev-libs/glib-2.40.0:2 >=dev-libs/libxml2-2.7.0:2 >=dev-scheme/guile-2.0.0:12=[regex] >=sys-libs/zlib-1.1.4 >=x11-libs/gtk+-3.14.0:3 dev-libs/boost:=[icu,nls] dev-libs/icu:= dev-libs/libxslt gnome-base/dconf net-libs/webkit-gtk:4= aqbanking? ( >=net-libs/aqbanking-5[gtk,ofx?] sys-libs/gwenhywfar[gtk] chipcard? ( sys-libs/libchipcard ) ) gnome-keyring? ( >=app-crypt/libsecret-0.18 ) mysql? ( dev-db/libdbi dev-db/libdbi-drivers[mysql] ) ofx? ( >=dev-libs/libofx-0.9.1 ) postgres? ( dev-db/libdbi dev-db/libdbi-drivers[postgres] ) python? ( 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(+)?] ) quotes? ( >=dev-perl/Finance-Quote-1.11 dev-perl/Date-Manip dev-perl/HTML-TableExtract ) sqlite? ( >=dev-db/libdbi-0.9.0 >=dev-db/libdbi-drivers-0.9.0[sqlite] )
+REQUIRED_USE=chipcard? ( aqbanking ) python? ( ^^ ( 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=mirror://sourceforge/gnucash/gnucash-2.7.7.tar.bz2 https://github.com/google/googletest/archive/release-1.8.0.tar.gz -> gtest-1.8.0.tar.gz
 _eclasses_=cmake-utils	b8d2d7038bb36192aa14e01c64e5a06a	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a2bf53205399370e1df34ebfcd6199a4
+_md5_=8ab321c1e7da1a4ed3aa865d7656e649
diff --git a/metadata/md5-cache/app-office/hourglass-0.7.2-r1 b/metadata/md5-cache/app-office/hourglass-0.7.2-r1
index cf0007a682ce..93c8bab431d5 100644
--- a/metadata/md5-cache/app-office/hourglass-0.7.2-r1
+++ b/metadata/md5-cache/app-office/hourglass-0.7.2-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.5 dev-java/jdom:0 dev-java/log4j:0 dev-java/ant-core:0 dev-java/jcommon:1.0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/hourglass/hourglass-0.7.2-src.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=361d092e395902c252874f6c2c852034
diff --git a/metadata/md5-cache/app-office/orage-4.12.1 b/metadata/md5-cache/app-office/orage-4.12.1
deleted file mode 100644
index 6fc7f5da940e..000000000000
--- a/metadata/md5-cache/app-office/orage-4.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=>=dev-libs/libical-0.48:= dev-libs/popt:= >=x11-libs/gtk+-2.10:2= berkdb? ( >=sys-libs/db-4:= ) dbus? ( >=dev-libs/dbus-glib-0.100:= ) libnotify? ( >=x11-libs/libnotify-0.7:= ) xfce_plugins_clock? ( >=xfce-base/xfce4-panel-4.10:= ) dev-util/intltool sys-devel/gettext >=sys-devel/libtool-2.2.6 virtual/pkgconfig >=app-portage/elt-patches-20170422 >=sys-apps/sed-4
-DESCRIPTION=A time managing application (and panel plug-in) for the Xfce desktop environment
-EAPI=5
-HOMEPAGE=https://git.xfce.org/apps/orage/
-IUSE=berkdb dbus debug libnotify +xfce_plugins_clock
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/libical-0.48:= dev-libs/popt:= >=x11-libs/gtk+-2.10:2= berkdb? ( >=sys-libs/db-4:= ) dbus? ( >=dev-libs/dbus-glib-0.100:= ) libnotify? ( >=x11-libs/libnotify-0.7:= ) xfce_plugins_clock? ( >=xfce-base/xfce4-panel-4.10:= )
-SLOT=0
-SRC_URI=mirror://xfce/src/apps/orage/4.12/orage-4.12.1.tar.bz2
-_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25	xfconf	25bb7fe99d6e58851633dc43d429c5ae
-_md5_=b969525078a7dc2ecdc9e35753021569
diff --git a/metadata/md5-cache/app-portage/Manifest.gz b/metadata/md5-cache/app-portage/Manifest.gz
index 17aa1cec58af..b3d96b09a5b4 100644
--- a/metadata/md5-cache/app-portage/Manifest.gz
+++ b/metadata/md5-cache/app-portage/Manifest.gz
diff --git a/metadata/md5-cache/app-portage/portage-utils-0.64 b/metadata/md5-cache/app-portage/portage-utils-0.64
index 65c02afddcd9..9c414c960907 100644
--- a/metadata/md5-cache/app-portage/portage-utils-0.64
+++ b/metadata/md5-cache/app-portage/portage-utils-0.64
@@ -4,10 +4,10 @@ DESCRIPTION=small and fast portage helper tools written in C
 EAPI=5
 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 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 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_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=dcf219b1827851e80eb245f777883d96
+_md5_=f0d456e19362f6110c2e035832a6a6a6
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index 321c89478730..e824787e62d6 100644
--- a/metadata/md5-cache/app-text/Manifest.gz
+++ b/metadata/md5-cache/app-text/Manifest.gz
diff --git a/metadata/md5-cache/app-text/enchant-1.6.0 b/metadata/md5-cache/app-text/enchant-1.6.0
deleted file mode 100644
index be57f8e0352e..000000000000
--- a/metadata/md5-cache/app-text/enchant-1.6.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=dev-libs/glib:2 aspell? ( app-text/aspell ) hunspell? ( >=app-text/hunspell-1.2.1:0= ) zemberek? ( dev-libs/dbus-glib ) virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Spellchecker wrapping library
-EAPI=6
-HOMEPAGE=http://www.abisource.com/enchant/
-IUSE=aspell +hunspell static-libs zemberek
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
-LICENSE=LGPL-2.1
-RDEPEND=dev-libs/glib:2 aspell? ( app-text/aspell ) hunspell? ( >=app-text/hunspell-1.2.1:0= ) zemberek? ( dev-libs/dbus-glib ) zemberek? ( app-text/zemberek-server )
-REQUIRED_USE=|| ( hunspell aspell zemberek )
-SLOT=0
-SRC_URI=http://www.abisource.com/downloads/enchant/1.6.0/enchant-1.6.0.tar.gz
-_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c4f1bb9cd36841cc28c98679f9b4ae49
diff --git a/metadata/md5-cache/app-text/jabref-2.10-r2 b/metadata/md5-cache/app-text/jabref-2.10-r2
index 3d083661dcc7..ef8271332482 100644
--- a/metadata/md5-cache/app-text/jabref-2.10-r2
+++ b/metadata/md5-cache/app-text/jabref-2.10-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.6 dev-java/antlr:3 dev-java/fontbox:1.7 dev-java/jempbox:1.7 dev-java/log4j:0 dev-java/spin:0 dev-java/microba:0 >=dev-java/glazedlists-1.8.0:0 >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=mirror://sourceforge/jabref/JabRef-2.10-src.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=947cdef8f2e53d58a688a98ea9669b0e
diff --git a/metadata/md5-cache/app-text/jabref-2.10-r4 b/metadata/md5-cache/app-text/jabref-2.10-r4
index 721c71a77545..a32563e72760 100644
--- a/metadata/md5-cache/app-text/jabref-2.10-r4
+++ b/metadata/md5-cache/app-text/jabref-2.10-r4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.6 dev-java/antlr:0 dev-java/antlr:3 dev-java/fontbox:1.7 dev-java/jempbox:1.7 dev-java/log4j:0 dev-java/spin:0 dev-java/microba:0 >=dev-java/glazedlists-1.8.0:0 >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=mirror://sourceforge/jabref/JabRef-2.10-src.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=3d1bf63525c5ba06eafadb253959c5e9
diff --git a/metadata/md5-cache/app-text/jpdftweak-0.9-r1 b/metadata/md5-cache/app-text/jpdftweak-0.9-r1
index 783b680d837c..f96d4ec6ef9b 100644
--- a/metadata/md5-cache/app-text/jpdftweak-0.9-r1
+++ b/metadata/md5-cache/app-text/jpdftweak-0.9-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.5 dev-java/itext:0 dev-java/jgoodies-forms:0 >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=mirror://sourceforge/jpdftweak/jpdftweak-src-0.9.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=3b5bec4f4fcfc019714763ffc2ff10df
diff --git a/metadata/md5-cache/app-text/texlive-2016 b/metadata/md5-cache/app-text/texlive-2016
deleted file mode 100644
index 4b4b06af024b..000000000000
--- a/metadata/md5-cache/app-text/texlive-2016
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DEPEND=>=app-text/texlive-core-2016
-DESCRIPTION=A complete TeX distribution
-EAPI=5
-HOMEPAGE=http://tug.org/texlive/
-IUSE=cjk context detex dvi2tty extra epspdf games graphics humanities jadetex luatex metapost music omega pdfannotextractor png pstricks publishers science tex4ht texi2html truetype xetex xindy xml X l10n_af l10n_ar l10n_as l10n_bg l10n_bn l10n_br l10n_ca l10n_cs l10n_cy l10n_da l10n_de l10n_el l10n_en l10n_en-GB l10n_eo l10n_es l10n_et l10n_eu l10n_fa l10n_fi l10n_fr l10n_ga l10n_gl l10n_gu l10n_he l10n_hi l10n_hr l10n_hsb l10n_hu l10n_hy l10n_ia l10n_id l10n_is l10n_it l10n_ja l10n_ko l10n_kn l10n_la l10n_lo l10n_lt l10n_lv l10n_ml l10n_mn l10n_mr l10n_nb l10n_nl l10n_nn l10n_no l10n_or l10n_pa l10n_pl l10n_pt l10n_rm l10n_ro l10n_ru l10n_sa l10n_sco l10n_sk l10n_sl l10n_sq l10n_sr l10n_sv l10n_ta l10n_te l10n_th l10n_tk l10n_tr l10n_uk l10n_vi l10n_zh
-KEYWORDS=alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=metapackage
-RDEPEND=>=app-text/texlive-core-2016 app-text/psutils >=dev-texlive/texlive-fontutils-2016 media-gfx/sam2p texi2html? ( app-text/texi2html ) sys-apps/texinfo app-text/t1utils >=app-text/lcdf-typetools-2.92[kpathsea] truetype? ( >=app-text/ttf2pk2-2.0_p20150521 ) detex? ( dev-tex/detex ) app-text/ps2eps dvi2tty? ( dev-tex/dvi2tty ) png? ( app-text/dvipng ) X? ( >=app-text/xdvik-22.87 ) >=dev-texlive/texlive-basic-2016 >=dev-texlive/texlive-fontsrecommended-2016 >=dev-texlive/texlive-latex-2016 luatex? ( >=dev-texlive/texlive-luatex-2016 ) >=dev-texlive/texlive-latexrecommended-2016 >=dev-tex/xcolor-2.11 >=dev-tex/latex-beamer-3.36 metapost? ( >=dev-texlive/texlive-metapost-2016 dev-tex/feynmf ) >=dev-texlive/texlive-genericrecommended-2016 pdfannotextractor? ( dev-tex/pdfannotextractor ) extra? ( dev-tex/chktex app-text/dvisvgm dev-tex/latexdiff >=dev-tex/latexmk-418 >=app-text/pdfjam-2.02 >=dev-texlive/texlive-bibtexextra-2016 >=dev-texlive/texlive-fontsextra-2016 >=dev-texlive/texlive-formatsextra-2016 >=dev-texlive/texlive-genericextra-2016 >=dev-texlive/texlive-latexextra-2016 >=dev-tex/glossaries-2.07 >=dev-tex/leaflet-20041222 >=dev-tex/currvita-0.9i-r1 >=dev-tex/g-brief-4.0.2 >=dev-tex/envlab-1.2-r1 >=dev-tex/europecv-20060424-r1 >=dev-tex/svninfo-0.7.3-r1 >=dev-texlive/texlive-plainextra-2016 ) xetex? ( >=dev-texlive/texlive-xetex-2016 ) graphics? ( >=dev-texlive/texlive-pictures-2016 dev-tex/dot2texi ) epspdf? ( app-text/epspdf ) science? ( >=dev-texlive/texlive-mathscience-2016 ) publishers? ( >=dev-texlive/texlive-publishers-2016 ) music? ( >=dev-texlive/texlive-music-2016 ) pstricks? ( >=dev-texlive/texlive-pstricks-2016 ) omega? ( >=dev-texlive/texlive-omega-2016 ) context? ( >=dev-texlive/texlive-context-2016 ) games? ( >=dev-texlive/texlive-games-2016 ) humanities? ( >=dev-texlive/texlive-humanities-2016 ) tex4ht? ( >=dev-tex/tex4ht-20090611_p1038-r3 ) xml? ( >=dev-tex/xmltex-1.9-r2 app-text/passivetex ) jadetex? ( >=app-text/jadetex-3.13-r2 ) l10n_af? ( >=dev-texlive/texlive-langafrican-2016 >=dev-texlive/texlive-langother-2016 ) l10n_ar? ( >=dev-texlive/texlive-langarabic-2016 ) l10n_fa? ( >=dev-texlive/texlive-langarabic-2016 ) l10n_hy? ( >=dev-texlive/texlive-langeuropean-2016 ) cjk? ( >=dev-texlive/texlive-langcjk-2016 >=dev-tex/cjk-latex-4.8.4 ) l10n_hr? ( >=dev-texlive/texlive-langeuropean-2016 ) l10n_bg? ( >=dev-texlive/texlive-langcyrillic-2016 ) l10n_br? ( >=dev-texlive/texlive-langeuropean-2016 ) l10n_ru? ( >=dev-texlive/texlive-langcyrillic-2016 ) l10n_uk? ( >=dev-texlive/texlive-langcyrillic-2016 ) l10n_cs? ( >=dev-texlive/texlive-langczechslovak-2016 >=app-text/vlna-1.3 ) l10n_sk? ( >=dev-texlive/texlive-langczechslovak-2016 ) l10n_da? ( >=dev-texlive/texlive-langeuropean-2016 ) l10n_nl? ( >=dev-texlive/texlive-langeuropean-2016 ) l10n_en? ( >=dev-texlive/texlive-langenglish-2016 ) l10n_en-GB? ( >=dev-texlive/texlive-langenglish-2016 ) l10n_fi? ( >=dev-texlive/texlive-langeuropean-2016 ) l10n_eu? ( >=dev-texlive/texlive-langfrench-2016 ) l10n_fr? ( >=dev-texlive/texlive-langfrench-2016 ) l10n_de? ( >=dev-texlive/texlive-langgerman-2016 ) l10n_el? ( >=dev-texlive/texlive-langgreek-2016 ) l10n_he? ( >=dev-texlive/texlive-langother-2016 ) l10n_hu? ( >=dev-texlive/texlive-langeuropean-2016 ) l10n_as? ( >=dev-texlive/texlive-langindic-2016 ) l10n_bn? ( >=dev-texlive/texlive-langindic-2016 ) l10n_gu? ( >=dev-texlive/texlive-langindic-2016 ) l10n_hi? ( >=dev-texlive/texlive-langindic-2016 ) l10n_kn? ( >=dev-texlive/texlive-langindic-2016 ) l10n_ml? ( >=dev-texlive/texlive-langindic-2016 ) l10n_mr? ( >=dev-texlive/texlive-langindic-2016 ) l10n_or? ( >=dev-texlive/texlive-langindic-2016 ) l10n_pa? ( >=dev-texlive/texlive-langindic-2016 ) l10n_sa? ( >=dev-texlive/texlive-langindic-2016 ) l10n_ta? ( >=dev-texlive/texlive-langindic-2016 ) l10n_te? ( >=dev-texlive/texlive-langindic-2016 ) l10n_it? ( >=dev-texlive/texlive-langitalian-2016 ) l10n_ja? ( >=dev-texlive/texlive-langjapanese-2016 ) l10n_ko? ( >=dev-texlive/texlive-langkorean-2016 ) l10n_la? ( >=dev-texlive/texlive-langeuropean-2016 ) l10n_lt? ( >=dev-texlive/texlive-langeuropean-2016 ) l10n_lv? ( >=dev-texlive/texlive-langeuropean-2016 ) l10n_mn? ( >=dev-texlive/texlive-langcyrillic-2016 ) l10n_nb? ( >=dev-texlive/texlive-langeuropean-2016 ) l10n_nn? ( >=dev-texlive/texlive-langeuropean-2016 ) l10n_no? ( >=dev-texlive/texlive-langeuropean-2016 ) l10n_cy? ( >=dev-texlive/texlive-langeuropean-2016 ) l10n_eo? ( >=dev-texlive/texlive-langother-2016 ) l10n_et? ( >=dev-texlive/texlive-langeuropean-2016 ) l10n_ga? ( >=dev-texlive/texlive-langeuropean-2016 ) l10n_rm? ( >=dev-texlive/texlive-langeuropean-2016 ) l10n_hsb? ( >=dev-texlive/texlive-langother-2016 ) l10n_ia? ( >=dev-texlive/texlive-langother-2016 ) l10n_id? ( >=dev-texlive/texlive-langother-2016 ) l10n_is? ( >=dev-texlive/texlive-langeuropean-2016 ) l10n_lo? ( >=dev-texlive/texlive-langother-2016 ) l10n_ro? ( >=dev-texlive/texlive-langeuropean-2016 ) l10n_sq? ( >=dev-texlive/texlive-langeuropean-2016 ) l10n_sr? ( >=dev-texlive/texlive-langeuropean-2016 >=dev-texlive/texlive-langcyrillic-2016 ) l10n_sl? ( >=dev-texlive/texlive-langeuropean-2016 ) l10n_tr? ( >=dev-texlive/texlive-langeuropean-2016 ) l10n_pl? ( >=dev-texlive/texlive-langpolish-2016 ) l10n_pt? ( >=dev-texlive/texlive-langportuguese-2016 ) l10n_ca? ( >=dev-texlive/texlive-langspanish-2016 ) l10n_gl? ( >=dev-texlive/texlive-langspanish-2016 ) l10n_es? ( >=dev-texlive/texlive-langspanish-2016 ) l10n_sco? ( >=dev-texlive/texlive-langeuropean-2016 ) l10n_sv? ( >=dev-texlive/texlive-langeuropean-2016 ) l10n_tk? ( >=dev-texlive/texlive-langeuropean-2016 ) l10n_vi? ( >=dev-texlive/texlive-langother-2016 ) l10n_zh? ( >=dev-texlive/texlive-langchinese-2016 ) xindy? ( app-text/xindy )
-SLOT=0
-_md5_=963f3f90b98f655208dfa0f24597081c
diff --git a/metadata/md5-cache/app-text/texlive-2017 b/metadata/md5-cache/app-text/texlive-2017
index 612272881c37..5284d24a7966 100644
--- a/metadata/md5-cache/app-text/texlive-2017
+++ b/metadata/md5-cache/app-text/texlive-2017
@@ -4,8 +4,8 @@ DESCRIPTION=A complete TeX distribution
 EAPI=5
 HOMEPAGE=http://tug.org/texlive/
 IUSE=cjk context detex dvi2tty extra epspdf games graphics humanities jadetex luatex metapost music pdfannotextractor png pstricks publishers science tex4ht texi2html truetype xetex xindy xml X l10n_af l10n_ar l10n_as l10n_bg l10n_bn l10n_br l10n_ca l10n_cs l10n_cy l10n_da l10n_de l10n_el l10n_en l10n_en-GB l10n_eo l10n_es l10n_et l10n_eu l10n_fa l10n_fi l10n_fr l10n_ga l10n_gl l10n_gu l10n_he l10n_hi l10n_hr l10n_hsb l10n_hu l10n_hy l10n_ia l10n_id l10n_is l10n_it l10n_ja l10n_ko l10n_kn l10n_la l10n_lo l10n_lt l10n_lv l10n_ml l10n_mn l10n_mr l10n_nb l10n_nl l10n_nn l10n_no l10n_or l10n_pa l10n_pl l10n_pt l10n_rm l10n_ro l10n_ru l10n_sa l10n_sco l10n_sk l10n_sl l10n_sq l10n_sr l10n_sv l10n_ta l10n_te l10n_th l10n_tk l10n_tr l10n_uk l10n_vi l10n_zh
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~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 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=metapackage
 RDEPEND=>=app-text/texlive-core-2017 app-text/psutils >=dev-texlive/texlive-fontutils-2017 media-gfx/sam2p texi2html? ( app-text/texi2html ) sys-apps/texinfo app-text/t1utils >=app-text/lcdf-typetools-2.92[kpathsea] truetype? ( >=app-text/ttf2pk2-2.0_p20150521 ) detex? ( dev-tex/detex ) app-text/ps2eps dvi2tty? ( dev-tex/dvi2tty ) png? ( app-text/dvipng ) X? ( >=app-text/xdvik-22.87 ) >=dev-texlive/texlive-basic-2017 >=dev-texlive/texlive-fontsrecommended-2017 >=dev-texlive/texlive-latex-2017 luatex? ( >=dev-texlive/texlive-luatex-2017 ) >=dev-texlive/texlive-latexrecommended-2017 >=dev-tex/xcolor-2.11 >=dev-tex/latex-beamer-3.36 metapost? ( >=dev-texlive/texlive-metapost-2017 dev-tex/feynmf ) >=dev-texlive/texlive-plaingeneric-2017 pdfannotextractor? ( dev-tex/pdfannotextractor ) extra? ( dev-tex/chktex app-text/dvisvgm dev-tex/latexdiff >=dev-tex/latexmk-418 >=app-text/pdfjam-2.02 >=dev-texlive/texlive-bibtexextra-2017 >=dev-texlive/texlive-fontsextra-2017 >=dev-texlive/texlive-formatsextra-2017 >=dev-texlive/texlive-latexextra-2017 >=dev-tex/glossaries-2.07 >=dev-tex/leaflet-20041222 >=dev-tex/currvita-0.9i-r1 >=dev-tex/g-brief-4.0.2 >=dev-tex/envlab-1.2-r1 >=dev-tex/europecv-20060424-r1 >=dev-tex/svninfo-0.7.3-r1 ) xetex? ( >=dev-texlive/texlive-xetex-2017 ) graphics? ( >=dev-texlive/texlive-pictures-2017 dev-tex/dot2texi ) epspdf? ( app-text/epspdf ) science? ( >=dev-texlive/texlive-mathscience-2017 ) publishers? ( >=dev-texlive/texlive-publishers-2017 ) music? ( >=dev-texlive/texlive-music-2017 ) pstricks? ( >=dev-texlive/texlive-pstricks-2017 ) context? ( >=dev-texlive/texlive-context-2017 ) games? ( >=dev-texlive/texlive-games-2017 ) humanities? ( >=dev-texlive/texlive-humanities-2017 ) tex4ht? ( >=dev-tex/tex4ht-20090611_p1038-r3 ) xml? ( >=dev-tex/xmltex-1.9-r2 app-text/passivetex ) jadetex? ( >=app-text/jadetex-3.13-r2 ) l10n_af? ( >=dev-texlive/texlive-langother-2017 >=dev-texlive/texlive-langother-2017 ) l10n_ar? ( >=dev-texlive/texlive-langarabic-2017 ) l10n_fa? ( >=dev-texlive/texlive-langarabic-2017 ) l10n_hy? ( >=dev-texlive/texlive-langeuropean-2017 ) cjk? ( >=dev-texlive/texlive-langcjk-2017 >=dev-tex/cjk-latex-4.8.4 ) l10n_hr? ( >=dev-texlive/texlive-langeuropean-2017 ) l10n_bg? ( >=dev-texlive/texlive-langcyrillic-2017 ) l10n_br? ( >=dev-texlive/texlive-langeuropean-2017 ) l10n_ru? ( >=dev-texlive/texlive-langcyrillic-2017 ) l10n_uk? ( >=dev-texlive/texlive-langcyrillic-2017 ) l10n_cs? ( >=dev-texlive/texlive-langczechslovak-2017 >=app-text/vlna-1.3 ) l10n_sk? ( >=dev-texlive/texlive-langczechslovak-2017 ) l10n_da? ( >=dev-texlive/texlive-langeuropean-2017 ) l10n_nl? ( >=dev-texlive/texlive-langeuropean-2017 ) l10n_en? ( >=dev-texlive/texlive-langenglish-2017 ) l10n_en-GB? ( >=dev-texlive/texlive-langenglish-2017 ) l10n_fi? ( >=dev-texlive/texlive-langeuropean-2017 ) l10n_eu? ( >=dev-texlive/texlive-langfrench-2017 ) l10n_fr? ( >=dev-texlive/texlive-langfrench-2017 ) l10n_de? ( >=dev-texlive/texlive-langgerman-2017 ) l10n_el? ( >=dev-texlive/texlive-langgreek-2017 ) l10n_he? ( >=dev-texlive/texlive-langother-2017 ) l10n_hu? ( >=dev-texlive/texlive-langeuropean-2017 ) l10n_as? ( >=dev-texlive/texlive-langother-2017 ) l10n_bn? ( >=dev-texlive/texlive-langother-2017 ) l10n_gu? ( >=dev-texlive/texlive-langother-2017 ) l10n_hi? ( >=dev-texlive/texlive-langother-2017 ) l10n_kn? ( >=dev-texlive/texlive-langother-2017 ) l10n_ml? ( >=dev-texlive/texlive-langother-2017 ) l10n_mr? ( >=dev-texlive/texlive-langother-2017 ) l10n_or? ( >=dev-texlive/texlive-langother-2017 ) l10n_pa? ( >=dev-texlive/texlive-langother-2017 ) l10n_sa? ( >=dev-texlive/texlive-langother-2017 ) l10n_ta? ( >=dev-texlive/texlive-langother-2017 ) l10n_te? ( >=dev-texlive/texlive-langother-2017 ) l10n_it? ( >=dev-texlive/texlive-langitalian-2017 ) l10n_ja? ( >=dev-texlive/texlive-langjapanese-2017 ) l10n_ko? ( >=dev-texlive/texlive-langkorean-2017 ) l10n_la? ( >=dev-texlive/texlive-langeuropean-2017 ) l10n_lt? ( >=dev-texlive/texlive-langeuropean-2017 ) l10n_lv? ( >=dev-texlive/texlive-langeuropean-2017 ) l10n_mn? ( >=dev-texlive/texlive-langcyrillic-2017 ) l10n_nb? ( >=dev-texlive/texlive-langeuropean-2017 ) l10n_nn? ( >=dev-texlive/texlive-langeuropean-2017 ) l10n_no? ( >=dev-texlive/texlive-langeuropean-2017 ) l10n_cy? ( >=dev-texlive/texlive-langeuropean-2017 ) l10n_eo? ( >=dev-texlive/texlive-langother-2017 ) l10n_et? ( >=dev-texlive/texlive-langeuropean-2017 ) l10n_ga? ( >=dev-texlive/texlive-langeuropean-2017 ) l10n_rm? ( >=dev-texlive/texlive-langeuropean-2017 ) l10n_hsb? ( >=dev-texlive/texlive-langother-2017 ) l10n_ia? ( >=dev-texlive/texlive-langother-2017 ) l10n_id? ( >=dev-texlive/texlive-langother-2017 ) l10n_is? ( >=dev-texlive/texlive-langeuropean-2017 ) l10n_lo? ( >=dev-texlive/texlive-langother-2017 ) l10n_ro? ( >=dev-texlive/texlive-langeuropean-2017 ) l10n_sq? ( >=dev-texlive/texlive-langeuropean-2017 ) l10n_sr? ( >=dev-texlive/texlive-langeuropean-2017 >=dev-texlive/texlive-langcyrillic-2017 ) l10n_sl? ( >=dev-texlive/texlive-langeuropean-2017 ) l10n_tr? ( >=dev-texlive/texlive-langeuropean-2017 ) l10n_pl? ( >=dev-texlive/texlive-langpolish-2017 ) l10n_pt? ( >=dev-texlive/texlive-langportuguese-2017 ) l10n_ca? ( >=dev-texlive/texlive-langspanish-2017 ) l10n_gl? ( >=dev-texlive/texlive-langspanish-2017 ) l10n_es? ( >=dev-texlive/texlive-langspanish-2017 ) l10n_sco? ( >=dev-texlive/texlive-langeuropean-2017 ) l10n_sv? ( >=dev-texlive/texlive-langeuropean-2017 ) l10n_tk? ( >=dev-texlive/texlive-langeuropean-2017 ) l10n_vi? ( >=dev-texlive/texlive-langother-2017 ) l10n_zh? ( >=dev-texlive/texlive-langchinese-2017 ) xindy? ( app-text/xindy )
 SLOT=0
-_md5_=503c38efbe7daeacbad7cc8a43fd6697
+_md5_=ee4681329f481f83372c326e12461033
diff --git a/metadata/md5-cache/app-text/texlive-core-2017-r3 b/metadata/md5-cache/app-text/texlive-core-2017-r3
index 2cd16dade360..2fa56cf99c67 100644
--- a/metadata/md5-cache/app-text/texlive-core-2017-r3
+++ b/metadata/md5-cache/app-text/texlive-core-2017-r3
@@ -4,10 +4,10 @@ DESCRIPTION=A complete TeX distribution
 EAPI=5
 HOMEPAGE=http://tug.org/texlive/
 IUSE=cjk X doc source tk +luajittex xetex
-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 ~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 ~x64-solaris ~x86-solaris
 LICENSE=GPL-2 LPPL-1.3c TeX
 RDEPEND=X? ( x11-libs/libXmu x11-libs/libXp x11-libs/libXpm x11-libs/libXaw ) !app-text/ptex !app-text/tetex !<app-text/texlive-2007 !app-text/xetex !<dev-texlive/texlive-basic-2014 !<dev-texlive/texlive-metapost-2011 !app-text/dvibook !dev-tex/luatex !app-text/dvipdfm !app-text/dvipdfmx !app-text/xdvipdfmx sys-libs/zlib >=media-libs/libpng-1.2.43-r2:0= >=app-text/poppler-0.58.0:= >=x11-libs/cairo-1.12 >=x11-libs/pixman-0.18 dev-libs/zziplib app-text/libpaper dev-libs/gmp:0 dev-libs/mpfr:0= xetex? ( >=media-libs/harfbuzz-1.4.5[icu,graphite] >=dev-libs/icu-50:= >=app-text/teckit-2.5.3 media-libs/fontconfig media-gfx/graphite2 ) media-libs/freetype:2 >=dev-libs/kpathsea-6.2.3 cjk? ( >=dev-libs/ptexenc-1.3.5 ) >=app-text/ps2pkm-1.8_p20170524 >=app-text/dvipsk-5.997 >=dev-tex/bibtexu-3.71_p20170524 virtual/perl-Getopt-Long tk? ( dev-perl/Tk )
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-20170524-source.tar.xz mirror://gentoo/texlive-core-patches-70.tar.xz mirror://gentoo/texlive-module-tetex-2017.tar.xz mirror://gentoo/texlive-module-hyphen-base-2017.tar.xz mirror://gentoo/texlive-module-texconfig-2017.tar.xz mirror://gentoo/texlive-module-gsftopk-2017.tar.xz mirror://gentoo/texlive-module-texlive.infra-2017.tar.xz mirror://gentoo/texlive-module-a2ping-2017.tar.xz mirror://gentoo/texlive-module-adhocfilelist-2017.tar.xz mirror://gentoo/texlive-module-arara-2017.tar.xz mirror://gentoo/texlive-module-asymptote-2017.tar.xz mirror://gentoo/texlive-module-bundledoc-2017.tar.xz mirror://gentoo/texlive-module-checklistings-2017.tar.xz mirror://gentoo/texlive-module-ctan_chk-2017.tar.xz mirror://gentoo/texlive-module-ctanify-2017.tar.xz mirror://gentoo/texlive-module-ctanupload-2017.tar.xz mirror://gentoo/texlive-module-ctie-2017.tar.xz mirror://gentoo/texlive-module-cweb-2017.tar.xz mirror://gentoo/texlive-module-de-macro-2017.tar.xz mirror://gentoo/texlive-module-dtl-2017.tar.xz mirror://gentoo/texlive-module-dtxgen-2017.tar.xz mirror://gentoo/texlive-module-dvi2tty-2017.tar.xz mirror://gentoo/texlive-module-dviasm-2017.tar.xz mirror://gentoo/texlive-module-dvicopy-2017.tar.xz mirror://gentoo/texlive-module-dvidvi-2017.tar.xz mirror://gentoo/texlive-module-dviljk-2017.tar.xz mirror://gentoo/texlive-module-dvipos-2017.tar.xz mirror://gentoo/texlive-module-findhyph-2017.tar.xz mirror://gentoo/texlive-module-fragmaster-2017.tar.xz mirror://gentoo/texlive-module-hook-pre-commit-pkg-2017.tar.xz mirror://gentoo/texlive-module-hyphenex-2017.tar.xz mirror://gentoo/texlive-module-installfont-2017.tar.xz mirror://gentoo/texlive-module-lacheck-2017.tar.xz mirror://gentoo/texlive-module-latex-git-log-2017.tar.xz mirror://gentoo/texlive-module-latex-papersize-2017.tar.xz mirror://gentoo/texlive-module-latex2man-2017.tar.xz mirror://gentoo/texlive-module-latex2nemeth-2017.tar.xz mirror://gentoo/texlive-module-latexfileversion-2017.tar.xz mirror://gentoo/texlive-module-latexpand-2017.tar.xz mirror://gentoo/texlive-module-latexindent-2017.tar.xz mirror://gentoo/texlive-module-ltxfileinfo-2017.tar.xz mirror://gentoo/texlive-module-ltximg-2017.tar.xz mirror://gentoo/texlive-module-listings-ext-2017.tar.xz mirror://gentoo/texlive-module-make4ht-2017.tar.xz mirror://gentoo/texlive-module-match_parens-2017.tar.xz mirror://gentoo/texlive-module-mflua-2017.tar.xz mirror://gentoo/texlive-module-mkjobtexmf-2017.tar.xz mirror://gentoo/texlive-module-patgen-2017.tar.xz mirror://gentoo/texlive-module-pdfbook2-2017.tar.xz mirror://gentoo/texlive-module-pdfcrop-2017.tar.xz mirror://gentoo/texlive-module-pdflatexpicscale-2017.tar.xz mirror://gentoo/texlive-module-pdftools-2017.tar.xz mirror://gentoo/texlive-module-pdfxup-2017.tar.xz mirror://gentoo/texlive-module-pfarrei-2017.tar.xz mirror://gentoo/texlive-module-pkfix-2017.tar.xz mirror://gentoo/texlive-module-pkfix-helper-2017.tar.xz mirror://gentoo/texlive-module-purifyeps-2017.tar.xz mirror://gentoo/texlive-module-seetexk-2017.tar.xz mirror://gentoo/texlive-module-srcredact-2017.tar.xz mirror://gentoo/texlive-module-sty2dtx-2017.tar.xz mirror://gentoo/texlive-module-synctex-2017.tar.xz mirror://gentoo/texlive-module-tex4ebook-2017.tar.xz mirror://gentoo/texlive-module-texcount-2017.tar.xz mirror://gentoo/texlive-module-texdef-2017.tar.xz mirror://gentoo/texlive-module-texdiff-2017.tar.xz mirror://gentoo/texlive-module-texdirflatten-2017.tar.xz mirror://gentoo/texlive-module-texdoc-2017.tar.xz mirror://gentoo/texlive-module-texfot-2017.tar.xz mirror://gentoo/texlive-module-texliveonfly-2017.tar.xz mirror://gentoo/texlive-module-texloganalyser-2017.tar.xz mirror://gentoo/texlive-module-texosquery-2017.tar.xz mirror://gentoo/texlive-module-texware-2017.tar.xz mirror://gentoo/texlive-module-tie-2017.tar.xz mirror://gentoo/texlive-module-tpic2pdftex-2017.tar.xz mirror://gentoo/texlive-module-typeoutfileinfo-2017.tar.xz mirror://gentoo/texlive-module-web-2017.tar.xz mirror://gentoo/texlive-module-collection-binextra-2017.tar.xz doc? ( mirror://gentoo/texlive-module-tetex.doc-2017.tar.xz mirror://gentoo/texlive-module-texconfig.doc-2017.tar.xz mirror://gentoo/texlive-module-gsftopk.doc-2017.tar.xz mirror://gentoo/texlive-module-texlive.infra.doc-2017.tar.xz mirror://gentoo/texlive-module-a2ping.doc-2017.tar.xz mirror://gentoo/texlive-module-adhocfilelist.doc-2017.tar.xz mirror://gentoo/texlive-module-arara.doc-2017.tar.xz mirror://gentoo/texlive-module-asymptote.doc-2017.tar.xz mirror://gentoo/texlive-module-bundledoc.doc-2017.tar.xz mirror://gentoo/texlive-module-checklistings.doc-2017.tar.xz mirror://gentoo/texlive-module-ctan_chk.doc-2017.tar.xz mirror://gentoo/texlive-module-ctanify.doc-2017.tar.xz mirror://gentoo/texlive-module-ctanupload.doc-2017.tar.xz mirror://gentoo/texlive-module-ctie.doc-2017.tar.xz mirror://gentoo/texlive-module-cweb.doc-2017.tar.xz mirror://gentoo/texlive-module-de-macro.doc-2017.tar.xz mirror://gentoo/texlive-module-dtl.doc-2017.tar.xz mirror://gentoo/texlive-module-dtxgen.doc-2017.tar.xz mirror://gentoo/texlive-module-dvi2tty.doc-2017.tar.xz mirror://gentoo/texlive-module-dviasm.doc-2017.tar.xz mirror://gentoo/texlive-module-dvicopy.doc-2017.tar.xz mirror://gentoo/texlive-module-dvidvi.doc-2017.tar.xz mirror://gentoo/texlive-module-dviljk.doc-2017.tar.xz mirror://gentoo/texlive-module-dvipos.doc-2017.tar.xz mirror://gentoo/texlive-module-findhyph.doc-2017.tar.xz mirror://gentoo/texlive-module-fragmaster.doc-2017.tar.xz mirror://gentoo/texlive-module-hook-pre-commit-pkg.doc-2017.tar.xz mirror://gentoo/texlive-module-installfont.doc-2017.tar.xz mirror://gentoo/texlive-module-lacheck.doc-2017.tar.xz mirror://gentoo/texlive-module-latex-git-log.doc-2017.tar.xz mirror://gentoo/texlive-module-latex-papersize.doc-2017.tar.xz mirror://gentoo/texlive-module-latex2man.doc-2017.tar.xz mirror://gentoo/texlive-module-latex2nemeth.doc-2017.tar.xz mirror://gentoo/texlive-module-latexfileversion.doc-2017.tar.xz mirror://gentoo/texlive-module-latexpand.doc-2017.tar.xz mirror://gentoo/texlive-module-latexindent.doc-2017.tar.xz mirror://gentoo/texlive-module-ltxfileinfo.doc-2017.tar.xz mirror://gentoo/texlive-module-ltximg.doc-2017.tar.xz mirror://gentoo/texlive-module-listings-ext.doc-2017.tar.xz mirror://gentoo/texlive-module-make4ht.doc-2017.tar.xz mirror://gentoo/texlive-module-match_parens.doc-2017.tar.xz mirror://gentoo/texlive-module-mkjobtexmf.doc-2017.tar.xz mirror://gentoo/texlive-module-patgen.doc-2017.tar.xz mirror://gentoo/texlive-module-pdfbook2.doc-2017.tar.xz mirror://gentoo/texlive-module-pdfcrop.doc-2017.tar.xz mirror://gentoo/texlive-module-pdflatexpicscale.doc-2017.tar.xz mirror://gentoo/texlive-module-pdftools.doc-2017.tar.xz mirror://gentoo/texlive-module-pdfxup.doc-2017.tar.xz mirror://gentoo/texlive-module-pfarrei.doc-2017.tar.xz mirror://gentoo/texlive-module-pkfix.doc-2017.tar.xz mirror://gentoo/texlive-module-pkfix-helper.doc-2017.tar.xz mirror://gentoo/texlive-module-purifyeps.doc-2017.tar.xz mirror://gentoo/texlive-module-pythontex.doc-2017.tar.xz mirror://gentoo/texlive-module-seetexk.doc-2017.tar.xz mirror://gentoo/texlive-module-srcredact.doc-2017.tar.xz mirror://gentoo/texlive-module-sty2dtx.doc-2017.tar.xz mirror://gentoo/texlive-module-synctex.doc-2017.tar.xz mirror://gentoo/texlive-module-tex4ebook.doc-2017.tar.xz mirror://gentoo/texlive-module-texcount.doc-2017.tar.xz mirror://gentoo/texlive-module-texdef.doc-2017.tar.xz mirror://gentoo/texlive-module-texdiff.doc-2017.tar.xz mirror://gentoo/texlive-module-texdirflatten.doc-2017.tar.xz mirror://gentoo/texlive-module-texdoc.doc-2017.tar.xz mirror://gentoo/texlive-module-texfot.doc-2017.tar.xz mirror://gentoo/texlive-module-texliveonfly.doc-2017.tar.xz mirror://gentoo/texlive-module-texloganalyser.doc-2017.tar.xz mirror://gentoo/texlive-module-texosquery.doc-2017.tar.xz mirror://gentoo/texlive-module-texware.doc-2017.tar.xz mirror://gentoo/texlive-module-tie.doc-2017.tar.xz mirror://gentoo/texlive-module-tpic2pdftex.doc-2017.tar.xz mirror://gentoo/texlive-module-typeoutfileinfo.doc-2017.tar.xz mirror://gentoo/texlive-module-web.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-adhocfilelist.source-2017.tar.xz mirror://gentoo/texlive-module-arara.source-2017.tar.xz mirror://gentoo/texlive-module-checklistings.source-2017.tar.xz mirror://gentoo/texlive-module-hyphenex.source-2017.tar.xz mirror://gentoo/texlive-module-listings-ext.source-2017.tar.xz mirror://gentoo/texlive-module-mkjobtexmf.source-2017.tar.xz mirror://gentoo/texlive-module-pfarrei.source-2017.tar.xz mirror://gentoo/texlive-module-pythontex.source-2017.tar.xz mirror://gentoo/texlive-module-texdef.source-2017.tar.xz mirror://gentoo/texlive-module-texosquery.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b8267b70effae995d3f2abd56db78c98
+_md5_=a43d50afb969bbdb3364510d7476483a
diff --git a/metadata/md5-cache/app-text/trang-20151127 b/metadata/md5-cache/app-text/trang-20151127
index 065f4f7240e4..04214d8eb06f 100644
--- a/metadata/md5-cache/app-text/trang-20151127
+++ b/metadata/md5-cache/app-text/trang-20151127
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.7 dev-java/xerces:2 dev-java/xml-commons-resolver:0 >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=https://github.com/relaxng/jing-trang/archive/1e74846999bbd14ce5248acbd2be9f1e624a9846.tar.gz -> trang-20151127.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=c2f70e2d566e205c1e7fe4332f024f25
diff --git a/metadata/md5-cache/app-text/xfbib-0.0.2-r1 b/metadata/md5-cache/app-text/xfbib-0.0.2-r1
deleted file mode 100644
index 5f12ad634784..000000000000
--- a/metadata/md5-cache/app-text/xfbib-0.0.2-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=>=dev-libs/glib-2.12 >=x11-libs/gtk+-2.10:2 >=xfce-base/libxfce4ui-4.8 >=xfce-base/libxfce4util-4.8 dev-util/intltool sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170422 >=sys-apps/sed-4
-DESCRIPTION=a lightweight BibTeX editor
-EAPI=5
-HOMEPAGE=https://goodies.xfce.org/projects/applications/xfbib
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.12 >=x11-libs/gtk+-2.10:2 >=xfce-base/libxfce4ui-4.8 >=xfce-base/libxfce4util-4.8
-SLOT=0
-SRC_URI=https://goodies.xfce.org/releases/xfbib/xfbib-0.0.2.tar.bz2
-_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25	xfconf	25bb7fe99d6e58851633dc43d429c5ae
-_md5_=6933cbb4c65dfcf4c09f84a72fa10ad5
diff --git a/metadata/md5-cache/app-text/zemberek-server-0.7.1 b/metadata/md5-cache/app-text/zemberek-server-0.7.1
index a871a5fa68eb..2138f0eb12cb 100644
--- a/metadata/md5-cache/app-text/zemberek-server-0.7.1
+++ b/metadata/md5-cache/app-text/zemberek-server-0.7.1
@@ -9,5 +9,5 @@ LICENSE=MPL-1.1 GPL-2
 RDEPEND=dev-java/zemberek[l10n_tr] dev-java/dbus-java dev-java/mina-core dev-java/slf4j-nop >=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=https://zemberek.googlecode.com/files/zemberek-server-nolibs-0.7.1.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=ee3d3372957781359a271a3c5be1d46b
diff --git a/metadata/md5-cache/app-text/zemberek-server-0.7.1-r1 b/metadata/md5-cache/app-text/zemberek-server-0.7.1-r1
index 19bb20631401..6dd3a1812d25 100644
--- a/metadata/md5-cache/app-text/zemberek-server-0.7.1-r1
+++ b/metadata/md5-cache/app-text/zemberek-server-0.7.1-r1
@@ -9,5 +9,5 @@ LICENSE=MPL-1.1 GPL-2
 RDEPEND=dev-java/zemberek[l10n_tr] dev-java/dbus-java dev-java/mina-core dev-java/slf4j-nop >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=https://zemberek.googlecode.com/files/zemberek-server-nolibs-0.7.1.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=f48640562e5254b1c85eb577e0e85dd1
diff --git a/metadata/md5-cache/app-vim/Manifest.gz b/metadata/md5-cache/app-vim/Manifest.gz
index 866fa66b9f76..e8f5bad672a3 100644
--- a/metadata/md5-cache/app-vim/Manifest.gz
+++ b/metadata/md5-cache/app-vim/Manifest.gz
diff --git a/metadata/md5-cache/app-vim/airline-0.9 b/metadata/md5-cache/app-vim/airline-0.9
new file mode 100644
index 000000000000..77435fa4f174
--- /dev/null
+++ b/metadata/md5-cache/app-vim/airline-0.9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst postrm prepare
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DESCRIPTION=vim plugin: lean & mean statusline for vim that's light as air
+EAPI=6
+HOMEPAGE=https://github.com/vim-airline/vim-airline/ https://www.vim.org/scripts/script.php?script_id=4661
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+SLOT=0
+SRC_URI=https://github.com/vim-airline/vim-airline/archive/v0.9.tar.gz -> airline-0.9.tar.gz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
+_md5_=bc87517b125862cf7ef2085718775611
diff --git a/metadata/md5-cache/app-vim/airline-9999 b/metadata/md5-cache/app-vim/airline-9999
index 79eb4c44329b..625514839baa 100644
--- a/metadata/md5-cache/app-vim/airline-9999
+++ b/metadata/md5-cache/app-vim/airline-9999
@@ -1,10 +1,10 @@
 DEFINED_PHASES=install postinst postrm prepare unpack
 DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 ) >=dev-vcs/git-1.8.2.1
 DESCRIPTION=vim plugin: lean & mean statusline for vim that's light as air
-EAPI=5
+EAPI=6
 HOMEPAGE=https://github.com/vim-airline/vim-airline/ https://www.vim.org/scripts/script.php?script_id=4661
 LICENSE=MIT
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=9215bdd45fde25b388b4dacb465ebd63
+_md5_=2c274a2b0c5360034edd55c2a825d2bc
diff --git a/metadata/md5-cache/app-vim/dbext-25.0 b/metadata/md5-cache/app-vim/dbext-25.0
deleted file mode 100644
index 6935d001439a..000000000000
--- a/metadata/md5-cache/app-vim/dbext-25.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: easy access to databases
-EAPI=6
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=356
-KEYWORDS=amd64 ~mips ppc x86
-LICENSE=GPL-2
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=mirror://gentoo/dbext-25.0.tar.bz2 https://dev.gentoo.org/~radhermit/vim/dbext-25.0.tar.bz2
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=5622978270657b426327143b95317a91
diff --git a/metadata/md5-cache/app-vim/dbext-26.00 b/metadata/md5-cache/app-vim/dbext-26.00
index bbd65f36fdd5..337937b6bf70 100644
--- a/metadata/md5-cache/app-vim/dbext-26.00
+++ b/metadata/md5-cache/app-vim/dbext-26.00
@@ -3,10 +3,10 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: easy access to databases
 EAPI=6
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=356
-KEYWORDS=~amd64 ~mips ~ppc ~x86
+KEYWORDS=amd64 ~mips ppc x86
 LICENSE=GPL-2
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/dbext-26.00.tar.bz2 https://dev.gentoo.org/~radhermit/vim/dbext-26.00.tar.bz2
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=0cc8d754616fb85824723227bcd9f137
+_md5_=5622978270657b426327143b95317a91
diff --git a/metadata/md5-cache/app-vim/gitgutter-20170222 b/metadata/md5-cache/app-vim/gitgutter-20170222
deleted file mode 100644
index e6be1c47e79e..000000000000
--- a/metadata/md5-cache/app-vim/gitgutter-20170222
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: shows a git diff in the sign column and stages/reverts hunks
-EAPI=6
-HOMEPAGE=https://github.com/airblade/vim-gitgutter/
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=dev-vcs/git || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=mirror://gentoo/gitgutter-20170222.tar.bz2 https://dev.gentoo.org/~radhermit/vim/gitgutter-20170222.tar.bz2
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=3d5d5f3014a2e215ca635b6f291a354e
diff --git a/metadata/md5-cache/app-vim/gitgutter-20171101 b/metadata/md5-cache/app-vim/gitgutter-20171101
index 9680826f29e6..0ad1272610ce 100644
--- a/metadata/md5-cache/app-vim/gitgutter-20171101
+++ b/metadata/md5-cache/app-vim/gitgutter-20171101
@@ -3,10 +3,10 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: shows a git diff in the sign column and stages/reverts hunks
 EAPI=6
 HOMEPAGE=https://github.com/airblade/vim-gitgutter/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=dev-vcs/git || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/airblade/vim-gitgutter/archive/1e60667322b7cd1bfcba98762fbba746a888d21a.tar.gz -> gitgutter-20171101.tar.gz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=68482a2adfe89642e3a7fdbaea2da3c8
+_md5_=17bc046e420fa454c6c641a48b8273e6
diff --git a/metadata/md5-cache/app-vim/gitgutter-20180316 b/metadata/md5-cache/app-vim/gitgutter-20180316
new file mode 100644
index 000000000000..efa44c570011
--- /dev/null
+++ b/metadata/md5-cache/app-vim/gitgutter-20180316
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst postrm prepare unpack
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DESCRIPTION=vim plugin: shows a git diff in the sign column and stages/reverts hunks
+EAPI=6
+HOMEPAGE=https://github.com/airblade/vim-gitgutter/
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-vcs/git || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+SLOT=0
+SRC_URI=https://github.com/airblade/vim-gitgutter/archive/37bdd03d176c5e182c7e8dbdc79c3f71d2a04898.tar.gz -> gitgutter-20180316.tar.gz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
+_md5_=890112afbdebdf52965ff8fedd6601a4
diff --git a/metadata/md5-cache/app-vim/gitgutter-99999999 b/metadata/md5-cache/app-vim/gitgutter-99999999
index 1ba14be02db7..20e5996590d8 100644
--- a/metadata/md5-cache/app-vim/gitgutter-99999999
+++ b/metadata/md5-cache/app-vim/gitgutter-99999999
@@ -7,4 +7,4 @@ LICENSE=MIT
 RDEPEND=dev-vcs/git || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=68482a2adfe89642e3a7fdbaea2da3c8
+_md5_=890112afbdebdf52965ff8fedd6601a4
diff --git a/metadata/md5-cache/app-vim/gundo-2.6.1 b/metadata/md5-cache/app-vim/gundo-2.6.1
deleted file mode 100644
index eb29e6a45f05..000000000000
--- a/metadata/md5-cache/app-vim/gundo-2.6.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare setup
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: visualize your vim undo tree
-EAPI=5
-HOMEPAGE=https://sjl.bitbucket.io/gundo.vim/
-IUSE=python_targets_python2_7
-KEYWORDS=amd64 x86 ~x64-macos
-LICENSE=GPL-2+
-RDEPEND=|| ( app-editors/vim[python,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(+)] app-editors/gvim[python,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(+)] ) 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(+)] || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=https://github.com/sjl/gundo.vim/archive/v2.6.1.tar.gz -> gundo-2.6.1.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=c1b276b90a3dda1cb0d709cc2de195d4
diff --git a/metadata/md5-cache/app-vim/gundo-2.6.2 b/metadata/md5-cache/app-vim/gundo-2.6.2
index 9ef5e8b539c1..321a44010112 100644
--- a/metadata/md5-cache/app-vim/gundo-2.6.2
+++ b/metadata/md5-cache/app-vim/gundo-2.6.2
@@ -4,11 +4,11 @@ DESCRIPTION=vim plugin: visualize your vim undo tree
 EAPI=6
 HOMEPAGE=https://sjl.bitbucket.io/gundo.vim/
 IUSE=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 ~x86 ~x64-macos
+KEYWORDS=amd64 x86 ~x64-macos
 LICENSE=GPL-2+
 RDEPEND=|| ( app-editors/vim[python,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(+)?] app-editors/gvim[python,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-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 ) python_single_target_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_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(+)?] || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://bitbucket.org/sjl/gundo.vim/get/v2.6.2.tar.bz2 -> gundo-2.6.2.tar.bz2
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=68b5eb07a5041ace6160f369aed73a05
+_md5_=959f81d249671ecf03c2e95aad14135e
diff --git a/metadata/md5-cache/app-vim/nerdcommenter-2.5.1 b/metadata/md5-cache/app-vim/nerdcommenter-2.5.1
new file mode 100644
index 000000000000..da8d7bcde8f2
--- /dev/null
+++ b/metadata/md5-cache/app-vim/nerdcommenter-2.5.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst postrm prepare
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DESCRIPTION=vim plugin: easy commenting of code for many filetypes
+EAPI=6
+HOMEPAGE=https://github.com/scrooloose/nerdcommenter https://www.vim.org/scripts/script.php?script_id=1218
+KEYWORDS=~amd64 ~x86 ~x86-linux ~x86-macos ~sparc64-solaris
+LICENSE=WTFPL-2
+RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+SLOT=0
+SRC_URI=https://github.com/scrooloose/nerdcommenter/archive/2.5.1.tar.gz -> nerdcommenter-2.5.1.tar.gz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
+_md5_=5e68fb8c994340d740ca824b691cd320
diff --git a/metadata/md5-cache/app-vim/vimtex-20180324 b/metadata/md5-cache/app-vim/vimtex-20180324
new file mode 100644
index 000000000000..43b651770fd4
--- /dev/null
+++ b/metadata/md5-cache/app-vim/vimtex-20180324
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst postrm prepare unpack
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DESCRIPTION=vim plugin: a modern vim plugin for editing LaTeX files
+EAPI=6
+HOMEPAGE=https://github.com/lervag/vimtex
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=!app-vim/vim-latex !app-vim/automatictexplugin virtual/latex-base dev-tex/latexmk || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+SLOT=0
+SRC_URI=https://github.com/lervag/vimtex/archive/17d809706edcb277f1ee7fa5e33aff3619926fe4.tar.gz -> vimtex-20180324.tar.gz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
+_md5_=f71aa35c69672944424bc99cdde15a29
diff --git a/metadata/md5-cache/app-vim/vimtex-99999999 b/metadata/md5-cache/app-vim/vimtex-99999999
new file mode 100644
index 000000000000..4a7ca7670394
--- /dev/null
+++ b/metadata/md5-cache/app-vim/vimtex-99999999
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install postinst postrm prepare unpack
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 ) >=dev-vcs/git-1.8.2.1
+DESCRIPTION=vim plugin: a modern vim plugin for editing LaTeX files
+EAPI=6
+HOMEPAGE=https://github.com/lervag/vimtex
+LICENSE=MIT
+RDEPEND=!app-vim/vim-latex !app-vim/automatictexplugin virtual/latex-base dev-tex/latexmk || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+SLOT=0
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
+_md5_=f71aa35c69672944424bc99cdde15a29
diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz
index 19fc400f8e7c..b7c5dabc4c5d 100644
--- a/metadata/md5-cache/dev-db/Manifest.gz
+++ b/metadata/md5-cache/dev-db/Manifest.gz
diff --git a/metadata/md5-cache/dev-db/apgdiff-1.4 b/metadata/md5-cache/dev-db/apgdiff-1.4
index 39ad6209f7ae..c9ae9b266e4a 100644
--- a/metadata/md5-cache/dev-db/apgdiff-1.4
+++ b/metadata/md5-cache/dev-db/apgdiff-1.4
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/apgdiff/apgdiff-1.4-src.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=583dd6f02d25efbaf90954bf4f60c5fc
diff --git a/metadata/md5-cache/dev-db/apgdiff-2.2.1 b/metadata/md5-cache/dev-db/apgdiff-2.2.1
index e503b742408b..4872e32748f4 100644
--- a/metadata/md5-cache/dev-db/apgdiff-2.2.1
+++ b/metadata/md5-cache/dev-db/apgdiff-2.2.1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://apgdiff.com/download/apgdiff-2.2.1-src.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=92ce00d05f2aca4969ca09f69b7a7022
diff --git a/metadata/md5-cache/dev-db/apgdiff-2.2.2 b/metadata/md5-cache/dev-db/apgdiff-2.2.2
index 012f6cfa649d..1619690d2ccc 100644
--- a/metadata/md5-cache/dev-db/apgdiff-2.2.2
+++ b/metadata/md5-cache/dev-db/apgdiff-2.2.2
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://apgdiff.com/download/apgdiff-2.2.2-src.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=1114799c2ded02c105b71d4c0015f81f
diff --git a/metadata/md5-cache/dev-db/apgdiff-2.3 b/metadata/md5-cache/dev-db/apgdiff-2.3
index cb2b55314769..f569de0bf634 100644
--- a/metadata/md5-cache/dev-db/apgdiff-2.3
+++ b/metadata/md5-cache/dev-db/apgdiff-2.3
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://apgdiff.com/download/apgdiff-2.3-src.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=1114799c2ded02c105b71d4c0015f81f
diff --git a/metadata/md5-cache/dev-db/apgdiff-2.4 b/metadata/md5-cache/dev-db/apgdiff-2.4
index 1c9271efe7dd..792799c4348a 100644
--- a/metadata/md5-cache/dev-db/apgdiff-2.4
+++ b/metadata/md5-cache/dev-db/apgdiff-2.4
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://apgdiff.com/download/apgdiff-2.4-src.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=1114799c2ded02c105b71d4c0015f81f
diff --git a/metadata/md5-cache/dev-db/db-je-3.3.75 b/metadata/md5-cache/dev-db/db-je-3.3.75
index ab4ebe8268c5..93975f6f4c4b 100644
--- a/metadata/md5-cache/dev-db/db-je-3.3.75
+++ b/metadata/md5-cache/dev-db/db-je-3.3.75
@@ -9,5 +9,5 @@ LICENSE=Sleepycat BSD
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=3.3
 SRC_URI=http://download.oracle.com/berkeley-db/je-3.3.75.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=4b4a267c2a9b17f759d72558ca2fc7f7
diff --git a/metadata/md5-cache/dev-db/henplus-0.9.8 b/metadata/md5-cache/dev-db/henplus-0.9.8
index 08e2beda79d6..44114222351d 100644
--- a/metadata/md5-cache/dev-db/henplus-0.9.8
+++ b/metadata/md5-cache/dev-db/henplus-0.9.8
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.4 dev-java/commons-cli:1 dev-java/libreadline-java:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/henplus/henplus-0.9.8.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=ce4591fe17c404593b840940d7ec567e
diff --git a/metadata/md5-cache/dev-db/henplus-0.9.8-r1 b/metadata/md5-cache/dev-db/henplus-0.9.8-r1
index 920e3df92185..d2fc2a89cb6e 100644
--- a/metadata/md5-cache/dev-db/henplus-0.9.8-r1
+++ b/metadata/md5-cache/dev-db/henplus-0.9.8-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.6 dev-java/commons-cli:1 dev-java/libreadline-java:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/henplus/henplus-0.9.8.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=6c56244b5298f95681f8012443b20e55
diff --git a/metadata/md5-cache/dev-db/hsqldb-1.8.1.3-r2 b/metadata/md5-cache/dev-db/hsqldb-1.8.1.3-r2
index 7efc64615b88..409e16a82bfc 100644
--- a/metadata/md5-cache/dev-db/hsqldb-1.8.1.3-r2
+++ b/metadata/md5-cache/dev-db/hsqldb-1.8.1.3-r2
@@ -9,5 +9,5 @@ LICENSE=BSD GPL-2
 RDEPEND=java-virtuals/servlet-api:2.5 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/hsqldb/hsqldb_1_8_1_3.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=5265d69c55f5ffe2539f15456695c4b9
diff --git a/metadata/md5-cache/dev-embedded/Manifest.gz b/metadata/md5-cache/dev-embedded/Manifest.gz
index 98a535971d90..ed51c32c0c10 100644
--- a/metadata/md5-cache/dev-embedded/Manifest.gz
+++ b/metadata/md5-cache/dev-embedded/Manifest.gz
diff --git a/metadata/md5-cache/dev-embedded/arduino-1.0.5-r1 b/metadata/md5-cache/dev-embedded/arduino-1.0.5-r1
index 171e9e76eccc..493947a39f26 100644
--- a/metadata/md5-cache/dev-embedded/arduino-1.0.5-r1
+++ b/metadata/md5-cache/dev-embedded/arduino-1.0.5-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-java/jna:0 >dev-java/rxtx-2.1:2 dev-embedded/avrdude dev-embedded/ui
 RESTRICT=strip binchecks
 SLOT=0
 SRC_URI=https://arduino.googlecode.com/files/arduino-1.0.5-src.tar.gz mirror://gentoo/arduino-icons.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=4600cb87f5224bbb46f1ade0ee52a1e8
diff --git a/metadata/md5-cache/dev-embedded/arduino-1.0.5-r2 b/metadata/md5-cache/dev-embedded/arduino-1.0.5-r2
index f7985dd623ed..118fc0eddfd7 100644
--- a/metadata/md5-cache/dev-embedded/arduino-1.0.5-r2
+++ b/metadata/md5-cache/dev-embedded/arduino-1.0.5-r2
@@ -10,5 +10,5 @@ RDEPEND=dev-java/jna:0 >dev-java/rxtx-2.1:2 dev-embedded/avrdude dev-embedded/ui
 RESTRICT=strip binchecks
 SLOT=0
 SRC_URI=https://github.com/arduino/Arduino/archive/1.0.5.tar.gz -> arduino-src-1.0.5.tar.gz mirror://gentoo/arduino-icons.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=0c7160e8295e9bf64a879b188e2c1273
diff --git a/metadata/md5-cache/dev-embedded/arduino-1.8.5 b/metadata/md5-cache/dev-embedded/arduino-1.8.5
index 0d2a4122cabc..7e1e2d5cfcbc 100644
--- a/metadata/md5-cache/dev-embedded/arduino-1.8.5
+++ b/metadata/md5-cache/dev-embedded/arduino-1.8.5
@@ -10,5 +10,5 @@ RDEPEND=dev-embedded/arduino-builder >=dev-util/astyle-3.1[java] dev-embedded/ar
 RESTRICT=strip binchecks
 SLOT=0
 SRC_URI=https://github.com/arduino/Arduino/archive/1.8.5.tar.gz -> arduino-1.8.5.tar.gz https://github.com/arduino-libraries/Firmata/archive/2.5.6.zip -> arduino-1.8.5-Firmata-2.5.6.zip https://github.com/arduino-libraries/Bridge/archive/1.6.3.zip -> arduino-1.8.5-Bridge-1.6.3.zip https://github.com/arduino-libraries/Robot_Control/archive/1.0.4.zip -> arduino-1.8.5-Robot_Control-1.0.4.zip https://github.com/arduino-libraries/Robot_Motor/archive/1.0.3.zip -> arduino-1.8.5-Robot_Motor-1.0.3.zip https://github.com/arduino-libraries/RobotIRremote/archive/2.0.0.zip -> arduino-1.8.5-RobotIRremote-2.0.0.zip https://github.com/arduino-libraries/SpacebrewYun/archive/1.0.1.zip -> arduino-1.8.5-SpacebrewYun-1.0.1.zip https://github.com/arduino-libraries/Temboo/archive/1.2.1.zip -> arduino-1.8.5-Temboo-1.2.1.zip https://github.com/arduino-libraries/Esplora/archive/1.0.4.zip -> arduino-1.8.5-Esplora-1.0.4.zip https://github.com/arduino-libraries/Mouse/archive/1.0.1.zip -> arduino-1.8.5-Mouse-1.0.1.zip https://github.com/arduino-libraries/Keyboard/archive/1.0.1.zip -> arduino-1.8.5-Keyboard-1.0.1.zip https://github.com/arduino-libraries/SD/archive/1.1.1.zip -> arduino-1.8.5-SD-1.1.1.zip https://github.com/arduino-libraries/Servo/archive/1.1.2.zip -> arduino-1.8.5-Servo-1.1.2.zip https://github.com/arduino-libraries/LiquidCrystal/archive/1.0.7.zip -> arduino-1.8.5-LiquidCrystal-1.0.7.zip https://github.com/Adafruit/Adafruit_CircuitPlayground/archive/1.6.8.zip -> arduino-1.8.5-Adafruit_CircuitPlayground-1.6.8.zip https://github.com/arduino-libraries/WiFi101-FirmwareUpdater-Plugin/releases/download/v0.9.1/WiFi101-Updater-ArduinoIDE-Plugin-0.9.1.zip -> arduino-1.8.5-WiFi101-Updater-ArduinoIDE-Plugin-0.9.1.zip doc? ( https://downloads.arduino.cc/reference-1.6.6-3.zip -> arduino-1.8.5-reference-1.6.6-3.zip https://downloads.arduino.cc/Galileo_help_files-1.6.2.zip -> arduino-1.8.5-Galileo_help_files-1.6.2.zip https://downloads.arduino.cc/Edison_help_files-1.6.2.zip -> arduino-1.8.5-Edison_help_files-1.6.2.zip )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=4e3c695051374fa3116b053f807f961e
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index 431bff3cc455..3b9ed1943695 100644
--- a/metadata/md5-cache/dev-java/Manifest.gz
+++ b/metadata/md5-cache/dev-java/Manifest.gz
diff --git a/metadata/md5-cache/dev-java/ant-antlr-1.9.2-r1 b/metadata/md5-cache/dev-java/ant-antlr-1.9.2-r1
index 775bb78acce2..38f1aae5d749 100644
--- a/metadata/md5-cache/dev-java/ant-antlr-1.9.2-r1
+++ b/metadata/md5-cache/dev-java/ant-antlr-1.9.2-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/antlr-2.7.7-r7:0 >=dev-java/java-config-2.2.0-r3 ~dev-java/an
 RESTRICT=test
 SLOT=0
 SRC_URI=https://archive.apache.org/dist/ant/source/apache-ant-1.9.2-src.tar.bz2 https://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
-_eclasses_=ant-tasks	2963378d098344fe05672f1145af1283	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=ant-tasks	2963378d098344fe05672f1145af1283	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=cf4a4bc44d4f2e921cbe2da5f44fd370
diff --git a/metadata/md5-cache/dev-java/ant-apache-bcel-1.9.2 b/metadata/md5-cache/dev-java/ant-apache-bcel-1.9.2
index 504e7eb36d53..d4881685e42c 100644
--- a/metadata/md5-cache/dev-java/ant-apache-bcel-1.9.2
+++ b/metadata/md5-cache/dev-java/ant-apache-bcel-1.9.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/bcel-5.1-r3:0 >=dev-java/java-config-2.2.0-r3 ~dev-java/ant-c
 RESTRICT=test
 SLOT=0
 SRC_URI=https://archive.apache.org/dist/ant/source/apache-ant-1.9.2-src.tar.bz2 https://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
-_eclasses_=ant-tasks	2963378d098344fe05672f1145af1283	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=ant-tasks	2963378d098344fe05672f1145af1283	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=0f543426b369505d956aada18eee2b4f
diff --git a/metadata/md5-cache/dev-java/ant-apache-bsf-1.9.2 b/metadata/md5-cache/dev-java/ant-apache-bsf-1.9.2
index 66494ac08168..36e5bd582d29 100644
--- a/metadata/md5-cache/dev-java/ant-apache-bsf-1.9.2
+++ b/metadata/md5-cache/dev-java/ant-apache-bsf-1.9.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/bsf-2.4.0-r1:2.3[python?,javascript?,tcl?] >=dev-java/java-co
 RESTRICT=test
 SLOT=0
 SRC_URI=https://archive.apache.org/dist/ant/source/apache-ant-1.9.2-src.tar.bz2 https://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
-_eclasses_=ant-tasks	2963378d098344fe05672f1145af1283	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=ant-tasks	2963378d098344fe05672f1145af1283	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=7a93525df1db49b86c6b7d47188d29b8
diff --git a/metadata/md5-cache/dev-java/ant-apache-log4j-1.9.2 b/metadata/md5-cache/dev-java/ant-apache-log4j-1.9.2
index 6e05e8a648e0..04618e987df1 100644
--- a/metadata/md5-cache/dev-java/ant-apache-log4j-1.9.2
+++ b/metadata/md5-cache/dev-java/ant-apache-log4j-1.9.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/log4j-1.2.13-r2:0 >=dev-java/java-config-2.2.0-r3 ~dev-java/a
 RESTRICT=test
 SLOT=0
 SRC_URI=https://archive.apache.org/dist/ant/source/apache-ant-1.9.2-src.tar.bz2 https://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
-_eclasses_=ant-tasks	2963378d098344fe05672f1145af1283	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=ant-tasks	2963378d098344fe05672f1145af1283	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=165c0c3a19b4f37c729f4f13b077b4e6
diff --git a/metadata/md5-cache/dev-java/ant-apache-oro-1.9.2 b/metadata/md5-cache/dev-java/ant-apache-oro-1.9.2
index 2c880467dc6d..8632329a303b 100644
--- a/metadata/md5-cache/dev-java/ant-apache-oro-1.9.2
+++ b/metadata/md5-cache/dev-java/ant-apache-oro-1.9.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/jakarta-oro-2.0.8-r2:2.0 >=dev-java/java-config-2.2.0-r3 ~dev
 RESTRICT=test
 SLOT=0
 SRC_URI=https://archive.apache.org/dist/ant/source/apache-ant-1.9.2-src.tar.bz2 https://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
-_eclasses_=ant-tasks	2963378d098344fe05672f1145af1283	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=ant-tasks	2963378d098344fe05672f1145af1283	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=8de3397cbde85e552c1cff53992876ec
diff --git a/metadata/md5-cache/dev-java/ant-apache-regexp-1.9.2 b/metadata/md5-cache/dev-java/ant-apache-regexp-1.9.2
index 720549dd5443..30d9b5171d11 100644
--- a/metadata/md5-cache/dev-java/ant-apache-regexp-1.9.2
+++ b/metadata/md5-cache/dev-java/ant-apache-regexp-1.9.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/jakarta-regexp-1.4-r1:1.4 >=dev-java/java-config-2.2.0-r3 ~de
 RESTRICT=test
 SLOT=0
 SRC_URI=https://archive.apache.org/dist/ant/source/apache-ant-1.9.2-src.tar.bz2 https://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
-_eclasses_=ant-tasks	2963378d098344fe05672f1145af1283	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=ant-tasks	2963378d098344fe05672f1145af1283	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=8645de8212d1ec09ed93d04ca185a94b
diff --git a/metadata/md5-cache/dev-java/ant-apache-resolver-1.9.2 b/metadata/md5-cache/dev-java/ant-apache-resolver-1.9.2
index 71ec2a8f73d0..5e5080c84140 100644
--- a/metadata/md5-cache/dev-java/ant-apache-resolver-1.9.2
+++ b/metadata/md5-cache/dev-java/ant-apache-resolver-1.9.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/xml-commons-resolver-1.2:0 >=dev-java/java-config-2.2.0-r3 ~d
 RESTRICT=test
 SLOT=0
 SRC_URI=https://archive.apache.org/dist/ant/source/apache-ant-1.9.2-src.tar.bz2 https://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
-_eclasses_=ant-tasks	2963378d098344fe05672f1145af1283	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=ant-tasks	2963378d098344fe05672f1145af1283	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=c6247c1105ef0feebdf813bcc2143c43
diff --git a/metadata/md5-cache/dev-java/ant-apache-xalan2-1.9.2-r1 b/metadata/md5-cache/dev-java/ant-apache-xalan2-1.9.2-r1
index 4c8fc0f6cb3c..39904504afae 100644
--- a/metadata/md5-cache/dev-java/ant-apache-xalan2-1.9.2-r1
+++ b/metadata/md5-cache/dev-java/ant-apache-xalan2-1.9.2-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-java/xalan:0 dev-java/xalan-serializer:0 >=dev-java/java-config-2.2.
 RESTRICT=test
 SLOT=0
 SRC_URI=https://archive.apache.org/dist/ant/source/apache-ant-1.9.2-src.tar.bz2 https://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
-_eclasses_=ant-tasks	2963378d098344fe05672f1145af1283	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=ant-tasks	2963378d098344fe05672f1145af1283	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=149f9c2e892fa2a8f381dcd190d60c16
diff --git a/metadata/md5-cache/dev-java/ant-commons-logging-1.9.2 b/metadata/md5-cache/dev-java/ant-commons-logging-1.9.2
index 0bdcfe8b2dba..a28b65697b8a 100644
--- a/metadata/md5-cache/dev-java/ant-commons-logging-1.9.2
+++ b/metadata/md5-cache/dev-java/ant-commons-logging-1.9.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/commons-logging-1.0.4-r2:0 >=dev-java/java-config-2.2.0-r3 ~d
 RESTRICT=test
 SLOT=0
 SRC_URI=https://archive.apache.org/dist/ant/source/apache-ant-1.9.2-src.tar.bz2 https://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
-_eclasses_=ant-tasks	2963378d098344fe05672f1145af1283	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=ant-tasks	2963378d098344fe05672f1145af1283	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=4d7619d04c7fc8e72a616543479589bd
diff --git a/metadata/md5-cache/dev-java/ant-commons-net-1.9.2 b/metadata/md5-cache/dev-java/ant-commons-net-1.9.2
index 65e38ba0382f..802cef07e486 100644
--- a/metadata/md5-cache/dev-java/ant-commons-net-1.9.2
+++ b/metadata/md5-cache/dev-java/ant-commons-net-1.9.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/commons-net-1.4.1-r1:0 >=dev-java/java-config-2.2.0-r3 ~dev-j
 RESTRICT=test
 SLOT=0
 SRC_URI=https://archive.apache.org/dist/ant/source/apache-ant-1.9.2-src.tar.bz2 https://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
-_eclasses_=ant-tasks	2963378d098344fe05672f1145af1283	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=ant-tasks	2963378d098344fe05672f1145af1283	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=5f16b4cf2a9a04da1fc44430f5c261e7
diff --git a/metadata/md5-cache/dev-java/ant-contrib-1.0_beta2-r2 b/metadata/md5-cache/dev-java/ant-contrib-1.0_beta2-r2
index 621242ed8feb..1223f7dab5d3 100644
--- a/metadata/md5-cache/dev-java/ant-contrib-1.0_beta2-r2
+++ b/metadata/md5-cache/dev-java/ant-contrib-1.0_beta2-r2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 >=dev-java/bcel-5.1 >=dev-java/xerces-2.7 >=dev-java/a
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/ant-contrib/ant-contrib-1.0b2-src.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=41a6a77c5b745addc1879e8cd85db156
diff --git a/metadata/md5-cache/dev-java/ant-contrib-1.0_beta3-r2 b/metadata/md5-cache/dev-java/ant-contrib-1.0_beta3-r2
index 84fe19f04731..545ba2111021 100644
--- a/metadata/md5-cache/dev-java/ant-contrib-1.0_beta3-r2
+++ b/metadata/md5-cache/dev-java/ant-contrib-1.0_beta3-r2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/ant-core-1.7.0:0 dev-java/ant-ivy:0 >=dev-java/bcel-5.1:0 dev
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/ant-contrib/ant-contrib-1.0b3-src.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=5f09bd7d6f7b4e8ab3be0f800debf404
diff --git a/metadata/md5-cache/dev-java/ant-core-1.9.2 b/metadata/md5-cache/dev-java/ant-core-1.9.2
index 46cec8f37a45..293d2023916f 100644
--- a/metadata/md5-cache/dev-java/ant-core-1.9.2
+++ b/metadata/md5-cache/dev-java/ant-core-1.9.2
@@ -10,5 +10,5 @@ RDEPEND=|| ( >=virtual/jdk-1.5 dev-java/gcj-jdk ) !dev-java/ant-tasks !dev-java/
 RESTRICT=test
 SLOT=0
 SRC_URI=https://archive.apache.org/dist/ant/source/apache-ant-1.9.2-src.tar.bz2 https://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=72d59c71cbe2d58c406dc7152a2d9bca
diff --git a/metadata/md5-cache/dev-java/ant-ivy-1.3.1-r1 b/metadata/md5-cache/dev-java/ant-ivy-1.3.1-r1
index 2bce392c6e03..86939ddfb5a5 100644
--- a/metadata/md5-cache/dev-java/ant-ivy-1.3.1-r1
+++ b/metadata/md5-cache/dev-java/ant-ivy-1.3.1-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 dev-java/ant-core =dev-java/commons-cli-1* =dev-java/c
 RESTRICT=test
 SLOT=0
 SRC_URI=http://jayasoft.org/downloads/ivy/1.3.1/ivy-1.3.1-src.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=4495466e86641fe11326e96174786c91
diff --git a/metadata/md5-cache/dev-java/ant-ivy-1.4.1-r1 b/metadata/md5-cache/dev-java/ant-ivy-1.4.1-r1
index e2eb59ac9a4d..88750fdba3dc 100644
--- a/metadata/md5-cache/dev-java/ant-ivy-1.4.1-r1
+++ b/metadata/md5-cache/dev-java/ant-ivy-1.4.1-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.4 dev-java/ant-core:0 dev-java/commons-cli:1 dev-java/commons-httpclient:3 dev-java/commons-vfs:0 dev-java/jakarta-oro:2.0 dev-java/jsch:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://www.jaya.free.fr/downloads/ivy/1.4.1/ivy-1.4.1-src.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=c20452915eb03d6959710df38bc02a75
diff --git a/metadata/md5-cache/dev-java/ant-ivy-2.0.0 b/metadata/md5-cache/dev-java/ant-ivy-2.0.0
index ec3f777e91e2..dec7b2cffb62 100644
--- a/metadata/md5-cache/dev-java/ant-ivy-2.0.0
+++ b/metadata/md5-cache/dev-java/ant-ivy-2.0.0
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 dev-java/ant-core:0 dev-java/jakarta-oro:2.0 dev-java/
 RESTRICT=test
 SLOT=2
 SRC_URI=mirror://apache/ant/ivy/2.0.0/apache-ivy-2.0.0-src.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=111e744317b3e54c79138bc6f62f631d
diff --git a/metadata/md5-cache/dev-java/ant-ivy-2.3.0-r2 b/metadata/md5-cache/dev-java/ant-ivy-2.3.0-r2
index 015074ab2f9b..68ac047ec699 100644
--- a/metadata/md5-cache/dev-java/ant-ivy-2.3.0-r2
+++ b/metadata/md5-cache/dev-java/ant-ivy-2.3.0-r2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 dev-java/jsch:0 dev-java/bcpg:1.50 dev-java/ant-core:0
 RESTRICT=test
 SLOT=2
 SRC_URI=mirror://apache/ant/ivy/2.3.0/apache-ivy-2.3.0-src.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=7b2be8253e0ef6d086342d1bd48773eb
diff --git a/metadata/md5-cache/dev-java/ant-jai-1.9.2 b/metadata/md5-cache/dev-java/ant-jai-1.9.2
index b96ca6b08c29..b18e2a11eb8f 100644
--- a/metadata/md5-cache/dev-java/ant-jai-1.9.2
+++ b/metadata/md5-cache/dev-java/ant-jai-1.9.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/sun-jai-bin-1.1.2.01-r1 >=dev-java/java-config-2.2.0-r3 ~dev-
 RESTRICT=test
 SLOT=0
 SRC_URI=https://archive.apache.org/dist/ant/source/apache-ant-1.9.2-src.tar.bz2 https://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
-_eclasses_=ant-tasks	2963378d098344fe05672f1145af1283	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=ant-tasks	2963378d098344fe05672f1145af1283	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=35237aa274e73386ecc2140b6b6d946c
diff --git a/metadata/md5-cache/dev-java/ant-javamail-1.9.2-r2 b/metadata/md5-cache/dev-java/ant-javamail-1.9.2-r2
index ebf9bb8520ca..0bda6efddf84 100644
--- a/metadata/md5-cache/dev-java/ant-javamail-1.9.2-r2
+++ b/metadata/md5-cache/dev-java/ant-javamail-1.9.2-r2
@@ -10,5 +10,5 @@ RDEPEND=dev-java/oracle-javamail:0 >=dev-java/java-config-2.2.0-r3 ~dev-java/ant
 RESTRICT=test
 SLOT=0
 SRC_URI=https://archive.apache.org/dist/ant/source/apache-ant-1.9.2-src.tar.bz2 https://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
-_eclasses_=ant-tasks	2963378d098344fe05672f1145af1283	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=ant-tasks	2963378d098344fe05672f1145af1283	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=3948a19af726de7d7626018b2d4e578a
diff --git a/metadata/md5-cache/dev-java/ant-jdepend-1.9.2 b/metadata/md5-cache/dev-java/ant-jdepend-1.9.2
index 115a44c3a366..e4f0e75b3f75 100644
--- a/metadata/md5-cache/dev-java/ant-jdepend-1.9.2
+++ b/metadata/md5-cache/dev-java/ant-jdepend-1.9.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/jdepend-2.9-r2:0 >=dev-java/java-config-2.2.0-r3 ~dev-java/an
 RESTRICT=test
 SLOT=0
 SRC_URI=https://archive.apache.org/dist/ant/source/apache-ant-1.9.2-src.tar.bz2 https://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
-_eclasses_=ant-tasks	2963378d098344fe05672f1145af1283	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=ant-tasks	2963378d098344fe05672f1145af1283	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=b668cc89775a08a57c2017a961c33e42
diff --git a/metadata/md5-cache/dev-java/ant-jmf-1.9.2 b/metadata/md5-cache/dev-java/ant-jmf-1.9.2
index a7f9e641bc59..9437a218b3f6 100644
--- a/metadata/md5-cache/dev-java/ant-jmf-1.9.2
+++ b/metadata/md5-cache/dev-java/ant-jmf-1.9.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/java-config-2.2.0-r3 ~dev-java/ant-core-1.9.2:0 >=virtual/jre
 RESTRICT=test
 SLOT=0
 SRC_URI=https://archive.apache.org/dist/ant/source/apache-ant-1.9.2-src.tar.bz2 https://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
-_eclasses_=ant-tasks	2963378d098344fe05672f1145af1283	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=ant-tasks	2963378d098344fe05672f1145af1283	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=9316cef2d79f489f0a68ab7c0a9d1111
diff --git a/metadata/md5-cache/dev-java/ant-jsch-1.9.2 b/metadata/md5-cache/dev-java/ant-jsch-1.9.2
index 169f4bea892b..397af318238b 100644
--- a/metadata/md5-cache/dev-java/ant-jsch-1.9.2
+++ b/metadata/md5-cache/dev-java/ant-jsch-1.9.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/jsch-0.1.37:0 >=dev-java/java-config-2.2.0-r3 ~dev-java/ant-c
 RESTRICT=test
 SLOT=0
 SRC_URI=https://archive.apache.org/dist/ant/source/apache-ant-1.9.2-src.tar.bz2 https://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
-_eclasses_=ant-tasks	2963378d098344fe05672f1145af1283	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=ant-tasks	2963378d098344fe05672f1145af1283	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=bed845d81eb6c83c6ecc9ac2f8be0425
diff --git a/metadata/md5-cache/dev-java/ant-junit-1.9.2 b/metadata/md5-cache/dev-java/ant-junit-1.9.2
index cce480c8c77e..f0aa46bb4f8a 100644
--- a/metadata/md5-cache/dev-java/ant-junit-1.9.2
+++ b/metadata/md5-cache/dev-java/ant-junit-1.9.2
@@ -10,5 +10,5 @@ RDEPEND=dev-java/junit:4 >=dev-java/java-config-2.2.0-r3 ~dev-java/ant-core-1.9.
 RESTRICT=test
 SLOT=0
 SRC_URI=https://archive.apache.org/dist/ant/source/apache-ant-1.9.2-src.tar.bz2 https://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
-_eclasses_=ant-tasks	2963378d098344fe05672f1145af1283	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=ant-tasks	2963378d098344fe05672f1145af1283	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=ed5b2422ad1611633b81538083d6b4ce
diff --git a/metadata/md5-cache/dev-java/ant-junit4-1.9.2 b/metadata/md5-cache/dev-java/ant-junit4-1.9.2
index 4881bcb5cc08..cca7ba55a8b1 100644
--- a/metadata/md5-cache/dev-java/ant-junit4-1.9.2
+++ b/metadata/md5-cache/dev-java/ant-junit4-1.9.2
@@ -10,5 +10,5 @@ RDEPEND=dev-java/junit:4 ~dev-java/ant-junit-1.9.2 >=dev-java/java-config-2.2.0-
 RESTRICT=test
 SLOT=0
 SRC_URI=https://archive.apache.org/dist/ant/source/apache-ant-1.9.2-src.tar.bz2 https://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
-_eclasses_=ant-tasks	2963378d098344fe05672f1145af1283	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=ant-tasks	2963378d098344fe05672f1145af1283	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=468d53d584b9e1195e4cc0faa60569c3
diff --git a/metadata/md5-cache/dev-java/ant-nodeps-1.9.2 b/metadata/md5-cache/dev-java/ant-nodeps-1.9.2
index c84b042b015f..27b684e94591 100644
--- a/metadata/md5-cache/dev-java/ant-nodeps-1.9.2
+++ b/metadata/md5-cache/dev-java/ant-nodeps-1.9.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/java-config-2.2.0-r3 ~dev-java/ant-core-1.9.2:0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://archive.apache.org/dist/ant/source/apache-ant-1.9.2-src.tar.bz2 https://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
-_eclasses_=ant-tasks	2963378d098344fe05672f1145af1283	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=ant-tasks	2963378d098344fe05672f1145af1283	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=144b4aadb0979f294fabfec202580a60
diff --git a/metadata/md5-cache/dev-java/ant-owanttask-1.3.2 b/metadata/md5-cache/dev-java/ant-owanttask-1.3.2
index ba4df50462ad..54ea12154b0f 100644
--- a/metadata/md5-cache/dev-java/ant-owanttask-1.3.2
+++ b/metadata/md5-cache/dev-java/ant-owanttask-1.3.2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.4 >=dev-java/ant-core-1.7.0 dev-java/xalan >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=http://download.forge.objectweb.org/monolog/ow_util_ant_tasks_1.3.2.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=ddfa51b8afc12f6c2e2cf1e3e2a8b733
diff --git a/metadata/md5-cache/dev-java/ant-swing-1.9.2 b/metadata/md5-cache/dev-java/ant-swing-1.9.2
index f9b7dbf2745b..11e9192ea9fc 100644
--- a/metadata/md5-cache/dev-java/ant-swing-1.9.2
+++ b/metadata/md5-cache/dev-java/ant-swing-1.9.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/java-config-2.2.0-r3 ~dev-java/ant-core-1.9.2:0 >=virtual/jre
 RESTRICT=test
 SLOT=0
 SRC_URI=https://archive.apache.org/dist/ant/source/apache-ant-1.9.2-src.tar.bz2 https://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
-_eclasses_=ant-tasks	2963378d098344fe05672f1145af1283	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=ant-tasks	2963378d098344fe05672f1145af1283	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=f52a5798a3a9ea325e08f618550238b9
diff --git a/metadata/md5-cache/dev-java/ant-testutil-1.9.2 b/metadata/md5-cache/dev-java/ant-testutil-1.9.2
index cd47ce3a97c0..16d942e87ac4 100644
--- a/metadata/md5-cache/dev-java/ant-testutil-1.9.2
+++ b/metadata/md5-cache/dev-java/ant-testutil-1.9.2
@@ -10,5 +10,5 @@ RDEPEND=dev-java/ant-core:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 ~d
 RESTRICT=test
 SLOT=0
 SRC_URI=https://archive.apache.org/dist/ant/source/apache-ant-1.9.2-src.tar.bz2 https://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
-_eclasses_=ant-tasks	2963378d098344fe05672f1145af1283	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=ant-tasks	2963378d098344fe05672f1145af1283	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=e62d079fa700b4fc8f23ee3b92dc9318
diff --git a/metadata/md5-cache/dev-java/ant-trax-1.9.2 b/metadata/md5-cache/dev-java/ant-trax-1.9.2
index 68e123a3a445..f32fd345b957 100644
--- a/metadata/md5-cache/dev-java/ant-trax-1.9.2
+++ b/metadata/md5-cache/dev-java/ant-trax-1.9.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/java-config-2.2.0-r3 ~dev-java/ant-core-1.9.2:0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://archive.apache.org/dist/ant/source/apache-ant-1.9.2-src.tar.bz2 https://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
-_eclasses_=ant-tasks	2963378d098344fe05672f1145af1283	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=ant-tasks	2963378d098344fe05672f1145af1283	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=4230f4e0c2c5c66cbb2185346271369b
diff --git a/metadata/md5-cache/dev-java/asm-3.3.1-r1 b/metadata/md5-cache/dev-java/asm-3.3.1-r1
index a3b16f4fa936..a3e9417d09b6 100644
--- a/metadata/md5-cache/dev-java/asm-3.3.1-r1
+++ b/metadata/md5-cache/dev-java/asm-3.3.1-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 RESTRICT=test
 SLOT=3
 SRC_URI=http://download.forge.objectweb.org/asm/asm-3.3.1.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=1537c16182828095098e0b40d45595a3
diff --git a/metadata/md5-cache/dev-java/asm-5.0.3 b/metadata/md5-cache/dev-java/asm-5.0.3
index 958a26212abf..4a16c0442e65 100644
--- a/metadata/md5-cache/dev-java/asm-5.0.3
+++ b/metadata/md5-cache/dev-java/asm-5.0.3
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 RESTRICT=test
 SLOT=4
 SRC_URI=http://download.forge.objectweb.org/asm/asm-5.0.3.tar.gz http://download.forge.objectweb.org/asm/asm-4.0.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=138cbd34157e281dd32f7686dfccc5d4
diff --git a/metadata/md5-cache/dev-java/asm-5.1 b/metadata/md5-cache/dev-java/asm-5.1
index 62bfa393c931..f820541c10dc 100644
--- a/metadata/md5-cache/dev-java/asm-5.1
+++ b/metadata/md5-cache/dev-java/asm-5.1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 RESTRICT=test
 SLOT=4
 SRC_URI=http://download.forge.objectweb.org/asm/asm-5.1.tar.gz http://download.forge.objectweb.org/asm/asm-4.0.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=f707bee29b01120eac55b206ae74691e
diff --git a/metadata/md5-cache/dev-java/avalon-framework-4.1.5-r1 b/metadata/md5-cache/dev-java/avalon-framework-4.1.5-r1
index 6f5ec6a9b7aa..5b7b34563723 100644
--- a/metadata/md5-cache/dev-java/avalon-framework-4.1.5-r1
+++ b/metadata/md5-cache/dev-java/avalon-framework-4.1.5-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.4 =dev-java/avalon-logkit-2* >=dev-java/log4j-1.2.9 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=4.1
 SRC_URI=mirror://apache/avalon/avalon-framework/source/avalon-framework-4.1.5.src.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=7c2e8c1344e7761c05bbf7cb1d5ebcb6
diff --git a/metadata/md5-cache/dev-java/avalon-framework-4.1.5-r2 b/metadata/md5-cache/dev-java/avalon-framework-4.1.5-r2
index c3debe71ad41..0b3e342364b5 100644
--- a/metadata/md5-cache/dev-java/avalon-framework-4.1.5-r2
+++ b/metadata/md5-cache/dev-java/avalon-framework-4.1.5-r2
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.4 dev-java/avalon-logkit:2.0 dev-java/log4j:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=4.1
 SRC_URI=mirror://apache/avalon/avalon-framework/source/avalon-framework-4.1.5.src.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=9fbfce69038b8ae32de5580f86ddced4
diff --git a/metadata/md5-cache/dev-java/avalon-framework-4.2.0-r1 b/metadata/md5-cache/dev-java/avalon-framework-4.2.0-r1
index 3dcf695b3721..cfcf1b3918da 100644
--- a/metadata/md5-cache/dev-java/avalon-framework-4.2.0-r1
+++ b/metadata/md5-cache/dev-java/avalon-framework-4.2.0-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.4 =dev-java/avalon-logkit-2* >=dev-java/log4j-1.2.9 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=4.2
 SRC_URI=mirror://apache/avalon/avalon-framework/source/avalon-framework-4.2.0-src.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=60607cadc08d38f044280d94a15869ab
diff --git a/metadata/md5-cache/dev-java/avalon-framework-4.2.0-r2 b/metadata/md5-cache/dev-java/avalon-framework-4.2.0-r2
index b863e4ad1063..776b426345dd 100644
--- a/metadata/md5-cache/dev-java/avalon-framework-4.2.0-r2
+++ b/metadata/md5-cache/dev-java/avalon-framework-4.2.0-r2
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.4 dev-java/avalon-logkit:2.0 dev-java/log4j:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=4.2
 SRC_URI=mirror://apache/avalon/avalon-framework/source/avalon-framework-4.2.0-src.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=e2cfad44953685210ccca733f9034887
diff --git a/metadata/md5-cache/dev-java/avalon-logkit-2.1-r8 b/metadata/md5-cache/dev-java/avalon-logkit-2.1-r8
index 03083635fb23..2915d2d2b04b 100644
--- a/metadata/md5-cache/dev-java/avalon-logkit-2.1-r8
+++ b/metadata/md5-cache/dev-java/avalon-logkit-2.1-r8
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-java/log4j:0 java-virtuals/jms:0 dev-java/oracle-javamail:0 java-virtuals/servlet-api:3.0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2.0
 SRC_URI=mirror://apache/excalibur/excalibur-logkit/source/avalon-logkit-2.1-src.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=0d4415329ffddb2803e2e6cb8d818660
diff --git a/metadata/md5-cache/dev-java/backport-util-concurrent-3.1 b/metadata/md5-cache/dev-java/backport-util-concurrent-3.1
index 91620988e698..3657cd5f853c 100644
--- a/metadata/md5-cache/dev-java/backport-util-concurrent-3.1
+++ b/metadata/md5-cache/dev-java/backport-util-concurrent-3.1
@@ -9,5 +9,5 @@ LICENSE=public-domain
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/backport-jsr166/3.1/backport-util-concurrent-Java60-3.1-src.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=b42473939cf6595818b23e569e3faf9b
diff --git a/metadata/md5-cache/dev-java/backport-util-concurrent-3.1-r1 b/metadata/md5-cache/dev-java/backport-util-concurrent-3.1-r1
index 6df0253fa667..d085b430b474 100644
--- a/metadata/md5-cache/dev-java/backport-util-concurrent-3.1-r1
+++ b/metadata/md5-cache/dev-java/backport-util-concurrent-3.1-r1
@@ -9,5 +9,5 @@ LICENSE=public-domain
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/backport-jsr166/3.1/backport-util-concurrent-Java60-3.1-src.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=fbf16d3aed3d4336348f05dde2e2b975
diff --git a/metadata/md5-cache/dev-java/balloontip-1.2.1 b/metadata/md5-cache/dev-java/balloontip-1.2.1
index d253f2181fdd..2447909eb471 100644
--- a/metadata/md5-cache/dev-java/balloontip-1.2.1
+++ b/metadata/md5-cache/dev-java/balloontip-1.2.1
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://java.net/projects/balloontip/downloads/download/balloontip_1.2.1.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=57daaafd5a937a3111f7ac2f34a3fefb
diff --git a/metadata/md5-cache/dev-java/batik-1.9 b/metadata/md5-cache/dev-java/batik-1.9
index 59c75a720974..86d0ccc921e7 100644
--- a/metadata/md5-cache/dev-java/batik-1.9
+++ b/metadata/md5-cache/dev-java/batik-1.9
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=tcl? ( dev-java/jacl:0 ) python? ( dev-java/jython:2.7 ) dev-java/xalan:0 dev-java/rhino:1.6 dev-java/ant-core:0 dev-java/xmlgraphics-commons:2 dev-java/xml-commons-external:1.3 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3
 SLOT=1.9
 SRC_URI=http://apache.mirrors.ovh.net/ftp.apache.org/dist/xmlgraphics/batik/source/batik-src-1.9.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=cceae751da77eeab869f4e182d420f5b
diff --git a/metadata/md5-cache/dev-java/blowfishj-2.14-r3 b/metadata/md5-cache/dev-java/blowfishj-2.14-r3
index fd43142bec35..0d3d8fc36900 100644
--- a/metadata/md5-cache/dev-java/blowfishj-2.14-r3
+++ b/metadata/md5-cache/dev-java/blowfishj-2.14-r3
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/blowfishj/blowfishj-2.14-src.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=545abc2772bb0d1a3adbbe8b05c19d1a
diff --git a/metadata/md5-cache/dev-java/bnd-junit-2.1.0 b/metadata/md5-cache/dev-java/bnd-junit-2.1.0
index 8c6fc8b49eab..5140dad85593 100644
--- a/metadata/md5-cache/dev-java/bnd-junit-2.1.0
+++ b/metadata/md5-cache/dev-java/bnd-junit-2.1.0
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 dev-java/osgi-core-api:0 dev-java/bndlib:0 >=dev-java/
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/bndtools/bnd/archive/2.1.0.REL.tar.gz -> bndlib-2.1.0.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=2673026a30262cbd49961b2d2375dee2
diff --git a/metadata/md5-cache/dev-java/bndlib-2.1.0 b/metadata/md5-cache/dev-java/bndlib-2.1.0
index 48afe374bf8d..5396509975d7 100644
--- a/metadata/md5-cache/dev-java/bndlib-2.1.0
+++ b/metadata/md5-cache/dev-java/bndlib-2.1.0
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 dev-java/libg:0 dev-java/osgi-compendium:0 dev-java/os
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/bndtools/bnd/archive/2.1.0.REL.tar.gz -> bndlib-2.1.0.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=07a34029be330d2867d34394e8a33c7c
diff --git a/metadata/md5-cache/dev-java/boilerpipe-1.2.0 b/metadata/md5-cache/dev-java/boilerpipe-1.2.0
index 80d1e4a8e15c..a522781b42c2 100644
--- a/metadata/md5-cache/dev-java/boilerpipe-1.2.0
+++ b/metadata/md5-cache/dev-java/boilerpipe-1.2.0
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 dev-java/xerces:2 dev-java/nekohtml:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://boilerpipe.googlecode.com/files/boilerpipe-1.2.0-src.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=a43ddeafcc79f17afb6c6068f3b23f6f
diff --git a/metadata/md5-cache/dev-java/browserlauncher2-1.3-r1 b/metadata/md5-cache/dev-java/browserlauncher2-1.3-r1
index 19f7fc07bda8..8cd4f57c287e 100644
--- a/metadata/md5-cache/dev-java/browserlauncher2-1.3-r1
+++ b/metadata/md5-cache/dev-java/browserlauncher2-1.3-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1.0
 SRC_URI=mirror://sourceforge/browserlaunch2/BrowserLauncher2-all-1_3.jar
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=71ebcb7a11216a2f1724ece5ddc4d7e5
diff --git a/metadata/md5-cache/dev-java/bsf-2.4.0-r2 b/metadata/md5-cache/dev-java/bsf-2.4.0-r2
index 850579cd6876..4b8588604379 100644
--- a/metadata/md5-cache/dev-java/bsf-2.4.0-r2
+++ b/metadata/md5-cache/dev-java/bsf-2.4.0-r2
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=python? ( dev-java/jython:2.7 ) javascript? ( dev-java/rhino:1.6 ) tcl? ( dev-java/jacl:0 ) dev-java/xalan:0 dev-java/commons-logging:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2.3
 SRC_URI=mirror://apache/jakarta/bsf/source/bsf-src-2.4.0.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=73108d81e9e6f2c6ed47ace2236a6a26
diff --git a/metadata/md5-cache/dev-java/bsh-2.0_beta6 b/metadata/md5-cache/dev-java/bsh-2.0_beta6
index aec55e9020aa..bba8e06178b6 100644
--- a/metadata/md5-cache/dev-java/bsh-2.0_beta6
+++ b/metadata/md5-cache/dev-java/bsh-2.0_beta6
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-java/bsf:2.3 java-virtuals/servlet-api:3.0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/beanshell/beanshell/archive/2.0b6.zip -> bsh-2.0b6.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=0ca44d446252617c84efe3975dc405d8
diff --git a/metadata/md5-cache/dev-java/bytelist-1.0.10 b/metadata/md5-cache/dev-java/bytelist-1.0.10
index b11b1b4ad2b9..f14e424e4b05 100644
--- a/metadata/md5-cache/dev-java/bytelist-1.0.10
+++ b/metadata/md5-cache/dev-java/bytelist-1.0.10
@@ -9,5 +9,5 @@ LICENSE=|| ( CPL-1.0 GPL-2 LGPL-2.1 )
 RDEPEND=dev-java/jcodings:0 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/jruby/bytelist/tarball/1.0.10 -> bytelist-1.0.10.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=991dd9adffefccdb5541600bf84b849f
diff --git a/metadata/md5-cache/dev-java/c3p0-0.9.5.1 b/metadata/md5-cache/dev-java/c3p0-0.9.5.1
index 4f4a6a284900..89e52cedf341 100644
--- a/metadata/md5-cache/dev-java/c3p0-0.9.5.1
+++ b/metadata/md5-cache/dev-java/c3p0-0.9.5.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=dev-java/log4j:0 dev-java/mchange-commons:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/c3p0/c3p0-0.9.5.1.src.tgz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=d276529f7b28c5884a9d546627c9e318
diff --git a/metadata/md5-cache/dev-java/cdegroot-db-0.08-r1 b/metadata/md5-cache/dev-java/cdegroot-db-0.08-r1
index 1a67c684d0e8..3ec4c11c794e 100644
--- a/metadata/md5-cache/dev-java/cdegroot-db-0.08-r1
+++ b/metadata/md5-cache/dev-java/cdegroot-db-0.08-r1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1
 SRC_URI=http://www.cdegroot.com/software/db/download/com.cdegroot.db-0.08.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=e5d9402fb60aa04ab1c755c5e9cdc294
diff --git a/metadata/md5-cache/dev-java/cdegroot-db-0.08-r2 b/metadata/md5-cache/dev-java/cdegroot-db-0.08-r2
index 4d19253aadc2..ec7a889640b7 100644
--- a/metadata/md5-cache/dev-java/cdegroot-db-0.08-r2
+++ b/metadata/md5-cache/dev-java/cdegroot-db-0.08-r2
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1
 SRC_URI=http://www.cdegroot.com/software/db/download/com.cdegroot.db-0.08.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=ff0ad34c55009c58982b48d5cc99891f
diff --git a/metadata/md5-cache/dev-java/cglib-3.1 b/metadata/md5-cache/dev-java/cglib-3.1
index c2d36abe2a4a..c2a28aee4a46 100644
--- a/metadata/md5-cache/dev-java/cglib-3.1
+++ b/metadata/md5-cache/dev-java/cglib-3.1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 dev-java/asm:4 dev-java/ant-core:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=3
 SRC_URI=mirror://sourceforge/cglib/cglib-src-3.1.jar
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=1f20f1a606219b9740d98d2ec2fc1794
diff --git a/metadata/md5-cache/dev-java/colt-1.2.0-r3 b/metadata/md5-cache/dev-java/colt-1.2.0-r3
index 46c54b64b6d9..44e743c26f65 100644
--- a/metadata/md5-cache/dev-java/colt-1.2.0-r3
+++ b/metadata/md5-cache/dev-java/colt-1.2.0-r3
@@ -9,5 +9,5 @@ LICENSE=colt
 RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://dsd.lbl.gov/~hoschek/colt-download/releases/colt-1.2.0.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=0b3f45cd668acbb9e7e8706a06ef0799
diff --git a/metadata/md5-cache/dev-java/commons-beanutils-1.9.2 b/metadata/md5-cache/dev-java/commons-beanutils-1.9.2
index 5d47d5a00c71..8f95ec4cc248 100644
--- a/metadata/md5-cache/dev-java/commons-beanutils-1.9.2
+++ b/metadata/md5-cache/dev-java/commons-beanutils-1.9.2
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 dev-java/commons-collections:0 dev-java/commons-logging:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1.7
 SRC_URI=mirror://apache/commons/beanutils/source/commons-beanutils-1.9.2-src.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=39e2313f052559b6e32b0f1322869e1e
diff --git a/metadata/md5-cache/dev-java/commons-betwixt-0.8 b/metadata/md5-cache/dev-java/commons-betwixt-0.8
index b8d1d2d773b0..c86cd31d0c64 100644
--- a/metadata/md5-cache/dev-java/commons-betwixt-0.8
+++ b/metadata/md5-cache/dev-java/commons-betwixt-0.8
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.4 dev-java/commons-collections:0 >=dev-java/commons-logging-1.0.2:0 dev-java/commons-beanutils:1.7 >=dev-java/commons-digester-1.6:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0.7
 SRC_URI=mirror://apache/commons//betwixt/source/commons-betwixt-0.8-src.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=da5161337afb93fb33a57b25ee18fbba
diff --git a/metadata/md5-cache/dev-java/commons-chain-1.2 b/metadata/md5-cache/dev-java/commons-chain-1.2
index 1af2fa64d096..da6bd2b61291 100644
--- a/metadata/md5-cache/dev-java/commons-chain-1.2
+++ b/metadata/md5-cache/dev-java/commons-chain-1.2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 dev-java/commons-digester:0 dev-java/mojarra:2.2 dev-j
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/commons/chain/source/commons-chain-1.2-src.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=b4472f5b46f83e26d8808e19097e98b3
diff --git a/metadata/md5-cache/dev-java/commons-codec-1.7 b/metadata/md5-cache/dev-java/commons-codec-1.7
index 3dc3bc66c016..56436111e169 100644
--- a/metadata/md5-cache/dev-java/commons-codec-1.7
+++ b/metadata/md5-cache/dev-java/commons-codec-1.7
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/commons/codec/source/commons-codec-1.7-src.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=a2893132c0e416c741f86b2e40525814
diff --git a/metadata/md5-cache/dev-java/commons-collections-3.2.1-r1 b/metadata/md5-cache/dev-java/commons-collections-3.2.1-r1
index 244389ac1f5f..16231cbc3322 100644
--- a/metadata/md5-cache/dev-java/commons-collections-3.2.1-r1
+++ b/metadata/md5-cache/dev-java/commons-collections-3.2.1-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 test-framework? ( dev-java/junit:0 dev-java/ant-junit:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/commons/collections/source/commons-collections-3.2.1-src.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=ef71d71350e4086011262beef62b0e20
diff --git a/metadata/md5-cache/dev-java/commons-collections-3.2.1-r2 b/metadata/md5-cache/dev-java/commons-collections-3.2.1-r2
index a20986f53e93..e0a0f5b4c290 100644
--- a/metadata/md5-cache/dev-java/commons-collections-3.2.1-r2
+++ b/metadata/md5-cache/dev-java/commons-collections-3.2.1-r2
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/commons/collections/source/commons-collections-3.2.1-src.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=706646d68ce7b9f81e839a0357935ef7
diff --git a/metadata/md5-cache/dev-java/commons-compress-1.10 b/metadata/md5-cache/dev-java/commons-compress-1.10
index 0fcf4593acca..028e1746321d 100644
--- a/metadata/md5-cache/dev-java/commons-compress-1.10
+++ b/metadata/md5-cache/dev-java/commons-compress-1.10
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-java/xz-java:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/commons//compress/source/commons-compress-1.10-src.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=4cc4ca6d29c0329282ff4f21ec471188
diff --git a/metadata/md5-cache/dev-java/commons-configuration-1.6-r2 b/metadata/md5-cache/dev-java/commons-configuration-1.6-r2
index 553c4ace1d9d..6edd9a50e381 100644
--- a/metadata/md5-cache/dev-java/commons-configuration-1.6-r2
+++ b/metadata/md5-cache/dev-java/commons-configuration-1.6-r2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/commons-beanutils-1.7.0:1.7 >=dev-java/comm
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/commons/configuration/source/commons-configuration-1.6-src.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=b28571f055c9e0c436e599e100e59552
diff --git a/metadata/md5-cache/dev-java/commons-daemon-1.0.15 b/metadata/md5-cache/dev-java/commons-daemon-1.0.15
index e8430e4f124b..20246954fcd8 100644
--- a/metadata/md5-cache/dev-java/commons-daemon-1.0.15
+++ b/metadata/md5-cache/dev-java/commons-daemon-1.0.15
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=kernel_linux? ( sys-libs/libcap ) >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/commons/daemon/source/commons-daemon-1.0.15-src.tar.gz
-_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=82240b5b191a7a37bba20e7cd40032b0
diff --git a/metadata/md5-cache/dev-java/commons-dbcp-2.1 b/metadata/md5-cache/dev-java/commons-dbcp-2.1
index b0ae6fb61175..8360799e57a4 100644
--- a/metadata/md5-cache/dev-java/commons-dbcp-2.1
+++ b/metadata/md5-cache/dev-java/commons-dbcp-2.1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jdk-1.7 >=dev-java/commons-logging-1.1.1 dev-java/commons-pool:2 java-virtuals/transaction-api:0 dev-java/junit:4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2
 SRC_URI=mirror://apache/commons/dbcp/source/commons-dbcp2-2.1-src.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=5064396b8c30af1b83532f7a1f7d12b7
diff --git a/metadata/md5-cache/dev-java/commons-dbutils-1.6 b/metadata/md5-cache/dev-java/commons-dbutils-1.6
index 7fec37b7eb6a..b1c07658c27d 100644
--- a/metadata/md5-cache/dev-java/commons-dbutils-1.6
+++ b/metadata/md5-cache/dev-java/commons-dbutils-1.6
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/commons/dbutils/source/commons-dbutils-1.6-src.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=badcbb5a0e92dadbe94e7eeb54660047
diff --git a/metadata/md5-cache/dev-java/commons-digester-1.8.1-r2 b/metadata/md5-cache/dev-java/commons-digester-1.8.1-r2
index b728dd8f98de..cd8ea6b190ce 100644
--- a/metadata/md5-cache/dev-java/commons-digester-1.8.1-r2
+++ b/metadata/md5-cache/dev-java/commons-digester-1.8.1-r2
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 dev-java/commons-beanutils:1.7 >=dev-java/commons-collections-2.1:0 >=dev-java/commons-logging-1.0.2:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/commons/digester/source/commons-digester-1.8.1-src.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=f66137a2fbff87bf593c72c95c3fc283
diff --git a/metadata/md5-cache/dev-java/commons-digester-2.1-r1 b/metadata/md5-cache/dev-java/commons-digester-2.1-r1
index 48e693e1c03f..5682f11dd410 100644
--- a/metadata/md5-cache/dev-java/commons-digester-2.1-r1
+++ b/metadata/md5-cache/dev-java/commons-digester-2.1-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 dev-java/commons-beanutils:1.7 >=dev-java/commons-collections-2.1:0 >=dev-java/commons-logging-1.0.2:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2.1
 SRC_URI=mirror://apache/commons/digester/source/commons-digester-2.1-src.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=5b2b3bbc2c35d4cba73f564cc5bdbd08
diff --git a/metadata/md5-cache/dev-java/commons-digester-3.2-r2 b/metadata/md5-cache/dev-java/commons-digester-3.2-r2
index 3a520ff0f9d3..e14273ae5919 100644
--- a/metadata/md5-cache/dev-java/commons-digester-3.2-r2
+++ b/metadata/md5-cache/dev-java/commons-digester-3.2-r2
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 dev-java/cglib:3 dev-java/commons-beanutils:1.7 >=dev-java/commons-logging-1.0.2:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=3.2
 SRC_URI=mirror://apache/commons/digester/source/commons-digester3-3.2-src.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=e55c359a6450415af0aa4a37ba7ce9a0
diff --git a/metadata/md5-cache/dev-java/commons-el-1.0-r3 b/metadata/md5-cache/dev-java/commons-el-1.0-r3
index 7f80e709fc37..0eb7dde021dc 100644
--- a/metadata/md5-cache/dev-java/commons-el-1.0-r3
+++ b/metadata/md5-cache/dev-java/commons-el-1.0-r3
@@ -9,5 +9,5 @@ LICENSE=Apache-1.1
 RDEPEND=java-virtuals/servlet-api:2.5 >=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/jakarta/commons/el/source/commons-el-1.0-src.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-osgi	c90eda970384b702459d01fc288d647d	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-osgi	c90eda970384b702459d01fc288d647d	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=4cf831fcaa935ff30a082cb6b86aefd1
diff --git a/metadata/md5-cache/dev-java/commons-email-1.4 b/metadata/md5-cache/dev-java/commons-email-1.4
index 319495405eaf..d1c7e6443022 100644
--- a/metadata/md5-cache/dev-java/commons-email-1.4
+++ b/metadata/md5-cache/dev-java/commons-email-1.4
@@ -10,5 +10,5 @@ RDEPEND=dev-java/oracle-javamail:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/commons/email/source/commons-email-1.4-src.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=38eacc0fd6775f9c96e1f3103a586b2e
diff --git a/metadata/md5-cache/dev-java/commons-fileupload-1.3 b/metadata/md5-cache/dev-java/commons-fileupload-1.3
index 4983691691ea..ce2bc9a71e06 100644
--- a/metadata/md5-cache/dev-java/commons-fileupload-1.3
+++ b/metadata/md5-cache/dev-java/commons-fileupload-1.3
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-java/commons-io:1 dev-java/portletapi:1 java-virtuals/servlet-api:2.5 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/commons/fileupload/source/commons-fileupload-1.3-src.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=483b6b4739391c1910eefef426937c70
diff --git a/metadata/md5-cache/dev-java/commons-graph-0.1 b/metadata/md5-cache/dev-java/commons-graph-0.1
index c6297079b381..0f4569b52d31 100644
--- a/metadata/md5-cache/dev-java/commons-graph-0.1
+++ b/metadata/md5-cache/dev-java/commons-graph-0.1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~monsieurp/packages/commons-graph-0.1.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=3bcc8e0ca50aefdd14f5f8623ea62eb7
diff --git a/metadata/md5-cache/dev-java/commons-httpclient-3.1-r1 b/metadata/md5-cache/dev-java/commons-httpclient-3.1-r1
index 070ef608401c..17d628e7401c 100644
--- a/metadata/md5-cache/dev-java/commons-httpclient-3.1-r1
+++ b/metadata/md5-cache/dev-java/commons-httpclient-3.1-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 dev-java/commons-logging:0 dev-java/commons-codec:0 >=
 RESTRICT=test
 SLOT=3
 SRC_URI=mirror://apache/httpcomponents/commons-httpclient/source/commons-httpclient-3.1-src.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=d209e71ee76f1ca05e8e498bea1d83a1
diff --git a/metadata/md5-cache/dev-java/commons-io-2.4 b/metadata/md5-cache/dev-java/commons-io-2.4
index 230b8f0074f7..a24487610862 100644
--- a/metadata/md5-cache/dev-java/commons-io-2.4
+++ b/metadata/md5-cache/dev-java/commons-io-2.4
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1
 SRC_URI=mirror://apache/commons/io/source/commons-io-2.4-src.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=feb908b65673b91e9d738dfab119e2c6
diff --git a/metadata/md5-cache/dev-java/commons-jelly-1.0-r8 b/metadata/md5-cache/dev-java/commons-jelly-1.0-r8
index 9171a39867ae..ebe0bec861ca 100644
--- a/metadata/md5-cache/dev-java/commons-jelly-1.0-r8
+++ b/metadata/md5-cache/dev-java/commons-jelly-1.0-r8
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-java/dom4j:1 dev-java/junit:0 dev-java/jaxen:1.1 dev-java/commons-cli:1 dev-java/commons-lang:0 dev-java/commons-jexl:1.0 dev-java/commons-logging:0 dev-java/commons-discovery:0 dev-java/commons-collections:0 dev-java/commons-beanutils:1.7 dev-java/tomcat-jstl-spec:0 java-virtuals/servlet-api:3.0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1
 SRC_URI=mirror://apache/jakarta/commons/jelly/source/commons-jelly-1.0-src.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=6e3268e5e735ac7c12bc9ab7b56d1bda
diff --git a/metadata/md5-cache/dev-java/commons-jexl-1.1-r1 b/metadata/md5-cache/dev-java/commons-jexl-1.1-r1
index 80c145259844..0f9998fe61a9 100644
--- a/metadata/md5-cache/dev-java/commons-jexl-1.1-r1
+++ b/metadata/md5-cache/dev-java/commons-jexl-1.1-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 dev-java/commons-logging dev-java/junit:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1.0
 SRC_URI=mirror://apache/jakarta/commons/jexl/source/commons-jexl-1.1-src.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=433e7a610ad54ea8225bc23b3a089bef
diff --git a/metadata/md5-cache/dev-java/commons-jexl-2.1.1 b/metadata/md5-cache/dev-java/commons-jexl-2.1.1
index 094f093e4f10..de481a8a65fb 100644
--- a/metadata/md5-cache/dev-java/commons-jexl-2.1.1
+++ b/metadata/md5-cache/dev-java/commons-jexl-2.1.1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 dev-java/commons-logging:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2
 SRC_URI=mirror://apache/commons/jexl/source/commons-jexl-2.1.1-src.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=286570409a811a1be618db0ab146fdc1
diff --git a/metadata/md5-cache/dev-java/commons-jxpath-1.3-r3 b/metadata/md5-cache/dev-java/commons-jxpath-1.3-r3
index 980f97a6450c..5d41a7dc218b 100644
--- a/metadata/md5-cache/dev-java/commons-jxpath-1.3-r3
+++ b/metadata/md5-cache/dev-java/commons-jxpath-1.3-r3
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-java/jdom:0 java-virtuals/servlet-api:3.0 dev-java/commons-beanutils:1.7 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/commons/jxpath/source/commons-jxpath-1.3-src.tar.gz -> commons-jxpath-1.3.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=4894d3e11fd77f06d93164f624fbede9
diff --git a/metadata/md5-cache/dev-java/commons-lang-2.0-r2 b/metadata/md5-cache/dev-java/commons-lang-2.0-r2
index c735d8a0abe5..6bca032b8b00 100644
--- a/metadata/md5-cache/dev-java/commons-lang-2.0-r2
+++ b/metadata/md5-cache/dev-java/commons-lang-2.0-r2
@@ -9,5 +9,5 @@ LICENSE=Apache-1.1
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/jakarta/commons/lang/source/commons-lang-2.0-src.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=2065a0c3b95d0ccb595fffbaf69b26e7
diff --git a/metadata/md5-cache/dev-java/commons-lang-2.0-r3 b/metadata/md5-cache/dev-java/commons-lang-2.0-r3
index 8400cb04bb99..5317ed720798 100644
--- a/metadata/md5-cache/dev-java/commons-lang-2.0-r3
+++ b/metadata/md5-cache/dev-java/commons-lang-2.0-r3
@@ -9,5 +9,5 @@ LICENSE=Apache-1.1
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/jakarta/commons/lang/source/commons-lang-2.0-src.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=bdb9f8cb2b0b5ee671211d10a723363b
diff --git a/metadata/md5-cache/dev-java/commons-lang-2.6-r1 b/metadata/md5-cache/dev-java/commons-lang-2.6-r1
index fe0d4548dafc..fdc50ed52081 100644
--- a/metadata/md5-cache/dev-java/commons-lang-2.6-r1
+++ b/metadata/md5-cache/dev-java/commons-lang-2.6-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2.1
 SRC_URI=mirror://apache/commons/lang/source/commons-lang-2.6-src.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=ef2a6f83437b6f25b8ae7a6ce60bcb2d
diff --git a/metadata/md5-cache/dev-java/commons-lang-3.1 b/metadata/md5-cache/dev-java/commons-lang-3.1
index db3bad2190f4..45b3ad187179 100644
--- a/metadata/md5-cache/dev-java/commons-lang-3.1
+++ b/metadata/md5-cache/dev-java/commons-lang-3.1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=3.1
 SRC_URI=mirror://apache/commons/lang/source/commons-lang3-3.1-src.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=104e8d9f1183db97fcf2cd8633a51f1d
diff --git a/metadata/md5-cache/dev-java/commons-lang-3.3.2 b/metadata/md5-cache/dev-java/commons-lang-3.3.2
index 2d8ee16a5bbf..0f867670db30 100644
--- a/metadata/md5-cache/dev-java/commons-lang-3.3.2
+++ b/metadata/md5-cache/dev-java/commons-lang-3.3.2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 RESTRICT=ppc? ( test ) ppc64? ( test )
 SLOT=3.3
 SRC_URI=mirror://apache/commons/lang/source/commons-lang3-3.3.2-src.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=c76042258b5a2728aefda28543c2bdf6
diff --git a/metadata/md5-cache/dev-java/commons-lang-3.4 b/metadata/md5-cache/dev-java/commons-lang-3.4
index 50c984fc5e98..67b186032d80 100644
--- a/metadata/md5-cache/dev-java/commons-lang-3.4
+++ b/metadata/md5-cache/dev-java/commons-lang-3.4
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 RESTRICT=ppc? ( test ) ppc64? ( test )
 SLOT=3.4
 SRC_URI=mirror://apache/commons/lang/source/commons-lang3-3.4-src.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=7eb0f5a34b832a51d86bbe5da479e649
diff --git a/metadata/md5-cache/dev-java/commons-logging-1.2-r1 b/metadata/md5-cache/dev-java/commons-logging-1.2-r1
index da8f2cfe5f0c..7a8f675f79b6 100644
--- a/metadata/md5-cache/dev-java/commons-logging-1.2-r1
+++ b/metadata/md5-cache/dev-java/commons-logging-1.2-r1
@@ -10,5 +10,5 @@ RDEPEND=avalon-framework? ( dev-java/avalon-framework:4.2 ) avalon-logkit? ( dev
 RESTRICT=!servletapi? ( test )
 SLOT=0
 SRC_URI=mirror://apache/commons/logging/source/commons-logging-1.2-src.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-osgi	c90eda970384b702459d01fc288d647d	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-osgi	c90eda970384b702459d01fc288d647d	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=b1f9d26e43e13efb70aa3a22cd696514
diff --git a/metadata/md5-cache/dev-java/commons-logging-1.2-r2 b/metadata/md5-cache/dev-java/commons-logging-1.2-r2
index 0c3354a8d420..b2c1ea59d04d 100644
--- a/metadata/md5-cache/dev-java/commons-logging-1.2-r2
+++ b/metadata/md5-cache/dev-java/commons-logging-1.2-r2
@@ -10,5 +10,5 @@ RDEPEND=log4j? ( dev-java/log4j:0 ) servletapi? ( java-virtuals/servlet-api:3.1
 RESTRICT=!servletapi? ( test )
 SLOT=0
 SRC_URI=mirror://apache/commons/logging/source/commons-logging-1.2-src.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-osgi	c90eda970384b702459d01fc288d647d	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-osgi	c90eda970384b702459d01fc288d647d	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=3880d42622ea8fabc7bf679c650e6c7d
diff --git a/metadata/md5-cache/dev-java/commons-math-2.1-r1 b/metadata/md5-cache/dev-java/commons-math-2.1-r1
index 012a60b906ed..0385c3b63b58 100644
--- a/metadata/md5-cache/dev-java/commons-math-2.1-r1
+++ b/metadata/md5-cache/dev-java/commons-math-2.1-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2
 SRC_URI=mirror://apache/commons/math/source/commons-math-2.1-src.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=3b1c0fc1d33227fa99f36ccba6284005
diff --git a/metadata/md5-cache/dev-java/commons-math-2.1-r2 b/metadata/md5-cache/dev-java/commons-math-2.1-r2
index cf59726a9f6f..9fe87940b291 100644
--- a/metadata/md5-cache/dev-java/commons-math-2.1-r2
+++ b/metadata/md5-cache/dev-java/commons-math-2.1-r2
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2
 SRC_URI=mirror://apache/commons/math/source/commons-math-2.1-src.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=3c9979bac3086f79459afcd86e89739a
diff --git a/metadata/md5-cache/dev-java/commons-math-3.2 b/metadata/md5-cache/dev-java/commons-math-3.2
index 2be90bc249b6..0efdbfc7cf14 100644
--- a/metadata/md5-cache/dev-java/commons-math-3.2
+++ b/metadata/md5-cache/dev-java/commons-math-3.2
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=3
 SRC_URI=mirror://apache/commons/math/source/commons-math3-3.2-src.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-osgi	c90eda970384b702459d01fc288d647d	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-osgi	c90eda970384b702459d01fc288d647d	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=60e0dc8a5a0435389b235ebfca97ad38
diff --git a/metadata/md5-cache/dev-java/commons-net-3.2 b/metadata/md5-cache/dev-java/commons-net-3.2
index 949582de01c5..f029cb2a116e 100644
--- a/metadata/md5-cache/dev-java/commons-net-3.2
+++ b/metadata/md5-cache/dev-java/commons-net-3.2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/commons/net/source/commons-net-3.2-src.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-osgi	c90eda970384b702459d01fc288d647d	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-osgi	c90eda970384b702459d01fc288d647d	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=0e18375f63ae6abc8d9d8a8cd398f50b
diff --git a/metadata/md5-cache/dev-java/commons-pool-1.6 b/metadata/md5-cache/dev-java/commons-pool-1.6
index eb8d75243fe3..7573869ee7de 100644
--- a/metadata/md5-cache/dev-java/commons-pool-1.6
+++ b/metadata/md5-cache/dev-java/commons-pool-1.6
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/commons/pool/source/commons-pool-1.6-src.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=43462b6e4177df27c73c8153af36031f
diff --git a/metadata/md5-cache/dev-java/commons-pool-2.2 b/metadata/md5-cache/dev-java/commons-pool-2.2
index 9761b1a8b4b9..01091a1013aa 100644
--- a/metadata/md5-cache/dev-java/commons-pool-2.2
+++ b/metadata/md5-cache/dev-java/commons-pool-2.2
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-java/cglib:3 dev-java/asm:4 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2
 SRC_URI=mirror://apache/commons/pool/source/commons-pool2-2.2-src.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=cf02b5994ab214491bc54415f70a1121
diff --git a/metadata/md5-cache/dev-java/commons-validator-1.4.0 b/metadata/md5-cache/dev-java/commons-validator-1.4.0
index 476d32189396..d6bbe183f3e6 100644
--- a/metadata/md5-cache/dev-java/commons-validator-1.4.0
+++ b/metadata/md5-cache/dev-java/commons-validator-1.4.0
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 >=dev-java/commons-digester-1.6:0 >=dev-java/commons-c
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/commons/validator/source/commons-validator-1.4.0-src.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=b51c746c7553314eaaa9b603b7018940
diff --git a/metadata/md5-cache/dev-java/commons-validator-1.4.1 b/metadata/md5-cache/dev-java/commons-validator-1.4.1
index c18e77bb57b2..2da2754aa76e 100644
--- a/metadata/md5-cache/dev-java/commons-validator-1.4.1
+++ b/metadata/md5-cache/dev-java/commons-validator-1.4.1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/commons-digester-1.6:0 >=dev-java/commons-c
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/commons/validator/source/commons-validator-1.4.1-src.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=75ca5d9fd15d38117739447c7211751f
diff --git a/metadata/md5-cache/dev-java/commons-vfs-2.0-r1 b/metadata/md5-cache/dev-java/commons-vfs-2.0-r1
index 09129a636f56..da1667da4961 100644
--- a/metadata/md5-cache/dev-java/commons-vfs-2.0-r1
+++ b/metadata/md5-cache/dev-java/commons-vfs-2.0-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 dev-java/ant-core:0 dev-java/commons-collections:0 dev-java/commons-logging:0 dev-java/commons-net:0 dev-java/commons-httpclient:3 dev-java/jackrabbit-webdav:0 dev-java/jsch:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2
 SRC_URI=mirror://apache/commons/vfs/source/commons-vfs-2.0-src.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=1b18fa8a8204962f407af00f6a84ffd6
diff --git a/metadata/md5-cache/dev-java/constantine-0.7-r1 b/metadata/md5-cache/dev-java/constantine-0.7-r1
index 7a780e58776e..8481affe54d2 100644
--- a/metadata/md5-cache/dev-java/constantine-0.7-r1
+++ b/metadata/md5-cache/dev-java/constantine-0.7-r1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://gentoo/constantine-0.7.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=378570763a3ff27c48f1e392b353f872
diff --git a/metadata/md5-cache/dev-java/cortado-0.6.0-r1 b/metadata/md5-cache/dev-java/cortado-0.6.0-r1
index f761c82a64e0..806c65ac0651 100644
--- a/metadata/md5-cache/dev-java/cortado-0.6.0-r1
+++ b/metadata/md5-cache/dev-java/cortado-0.6.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=http://downloads.xiph.org/releases/cortado/cortado-0.6.0.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=afdc622bb92b9cd531129067286d1c03
diff --git a/metadata/md5-cache/dev-java/cpptasks-1.0_beta5 b/metadata/md5-cache/dev-java/cpptasks-1.0_beta5
index f5685d9fd227..ba33e1b417b5 100644
--- a/metadata/md5-cache/dev-java/cpptasks-1.0_beta5
+++ b/metadata/md5-cache/dev-java/cpptasks-1.0_beta5
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-java/ant-core:0 dev-java/xerces:2 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/ant-contrib/ant-contrib/cpptasks-1.0-beta5/cpptasks-1.0b5.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=2ea577b41d8f8daec43d867f7dc916ff
diff --git a/metadata/md5-cache/dev-java/dnsjava-2.1.6 b/metadata/md5-cache/dev-java/dnsjava-2.1.6
index d9866ecfe1a9..6dadeb62fc2b 100644
--- a/metadata/md5-cache/dev-java/dnsjava-2.1.6
+++ b/metadata/md5-cache/dev-java/dnsjava-2.1.6
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://www.dnsjava.org/download/dnsjava-2.1.6.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=d45c3ec6b02ded313c621bad616eff28
diff --git a/metadata/md5-cache/dev-java/dnsjava-2.1.7 b/metadata/md5-cache/dev-java/dnsjava-2.1.7
index 5a67683afb99..9bfd2d8cb299 100644
--- a/metadata/md5-cache/dev-java/dnsjava-2.1.7
+++ b/metadata/md5-cache/dev-java/dnsjava-2.1.7
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://www.dnsjava.org/download/dnsjava-2.1.7.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=dab6ffde143b324da389ac14eb4b075a
diff --git a/metadata/md5-cache/dev-java/dom4j-1.6.1-r7 b/metadata/md5-cache/dev-java/dom4j-1.6.1-r7
index b9c1d102c667..ae1b8c7ce7a6 100644
--- a/metadata/md5-cache/dev-java/dom4j-1.6.1-r7
+++ b/metadata/md5-cache/dev-java/dom4j-1.6.1-r7
@@ -10,5 +10,5 @@ PDEPEND=dev-java/jaxen:1.1
 RDEPEND=dev-java/xpp2:0 dev-java/xpp3:0 dev-java/xsdlib:0 dev-java/relaxng-datatype:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1
 SRC_URI=mirror://sourceforge/dom4j/dom4j-1.6.1.tar.gz mirror://gentoo/dom4j-1.6.1-java5.patch.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=df221d37e12e4e925646caba43643b28
diff --git a/metadata/md5-cache/dev-java/dynalang-0.4-r1 b/metadata/md5-cache/dev-java/dynalang-0.4-r1
index 42121b591054..45cd3262d1fc 100644
--- a/metadata/md5-cache/dev-java/dynalang-0.4-r1
+++ b/metadata/md5-cache/dev-java/dynalang-0.4-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/dynalang/dynalang/dynalang-mop-0.4.tgz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=99c5353eb5b9346bbd1ce0540b739b5a
diff --git a/metadata/md5-cache/dev-java/easyneurons-2.3 b/metadata/md5-cache/dev-java/easyneurons-2.3
index 32fe551b9087..125e080cc7ad 100644
--- a/metadata/md5-cache/dev-java/easyneurons-2.3
+++ b/metadata/md5-cache/dev-java/easyneurons-2.3
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=virtual/jre-1.6 dev-java/colt:0 dev-java/appframework:0 dev-java/commons-collections:0 dev-java/absolutelayout:0 dev-java/jung:0 dev-java/xstream:0 ~dev-java/neuroph-2.3 dev-java/javahelp:0 dev-java/appframework:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/neuroph/neuroph_2.3_nb.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=d5962a7235d69d3129c1a29e07e7b092
diff --git a/metadata/md5-cache/dev-java/echo2-2.1.1 b/metadata/md5-cache/dev-java/echo2-2.1.1
index 4ec85bca9582..0517f6efeda3 100644
--- a/metadata/md5-cache/dev-java/echo2-2.1.1
+++ b/metadata/md5-cache/dev-java/echo2-2.1.1
@@ -9,5 +9,5 @@ LICENSE=|| ( MPL-1.1 GPL-2 LGPL-2.1 )
 RDEPEND=>=virtual/jre-1.4 java-virtuals/servlet-api:2.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2.1
 SRC_URI=http://download.nextapp.com/downloads/echo2/2.1.1/NextApp_Echo2.tgz -> NextApp_Echo2-2.1.1.tgz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=16fe0a4aec19e36d40f4249fcf655219
diff --git a/metadata/md5-cache/dev-java/eclipsito-0_pre20130713 b/metadata/md5-cache/dev-java/eclipsito-0_pre20130713
index 1702de49e8a1..ecd73b5bde05 100644
--- a/metadata/md5-cache/dev-java/eclipsito-0_pre20130713
+++ b/metadata/md5-cache/dev-java/eclipsito-0_pre20130713
@@ -9,5 +9,5 @@ LICENSE=EPL-1.0
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~tomwij/files/dist/eclipsito-0_pre20130713.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=e543daefe08ec4c5f47812db799b2afb
diff --git a/metadata/md5-cache/dev-java/edtftpj-2.4.0 b/metadata/md5-cache/dev-java/edtftpj-2.4.0
index 49188cf48a82..93548bdf9aca 100644
--- a/metadata/md5-cache/dev-java/edtftpj-2.4.0
+++ b/metadata/md5-cache/dev-java/edtftpj-2.4.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://www.enterprisedt.com/products/edtftpj/download/edtftpj-2.4.0.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=b48b6946304df8181976e031f0cf3466
diff --git a/metadata/md5-cache/dev-java/emma-2.0.5312-r3 b/metadata/md5-cache/dev-java/emma-2.0.5312-r3
index 6f6d3433023e..6850642699bf 100644
--- a/metadata/md5-cache/dev-java/emma-2.0.5312-r3
+++ b/metadata/md5-cache/dev-java/emma-2.0.5312-r3
@@ -9,5 +9,5 @@ LICENSE=CPL-1.0
 RDEPEND=dev-java/ant-core launcher? ( !sci-biology/emboss ) >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/emma/emma-2.0.5312-src.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=9ff3793af2032727d7239a1721ef2963
diff --git a/metadata/md5-cache/dev-java/fastutil-7.0.10 b/metadata/md5-cache/dev-java/fastutil-7.0.10
index aa960bb863b8..3d35ff2c4bb2 100644
--- a/metadata/md5-cache/dev-java/fastutil-7.0.10
+++ b/metadata/md5-cache/dev-java/fastutil-7.0.10
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/vigna/fastutil/archive/7.0.10.zip -> fastutil-7.0.10.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=9dfc2cb6d124109a3efe18a4793537dd
diff --git a/metadata/md5-cache/dev-java/fec-1.0.4-r2 b/metadata/md5-cache/dev-java/fec-1.0.4-r2
index 981444fc3d1c..b281bfeab378 100644
--- a/metadata/md5-cache/dev-java/fec-1.0.4-r2
+++ b/metadata/md5-cache/dev-java/fec-1.0.4-r2
@@ -10,5 +10,5 @@ RDEPEND=dev-java/log4j:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 sourc
 RESTRICT=test
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~monsieurp/packages/fec-1.0.4.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=ff002f56c314f38dcbd602d9b4df1bb6
diff --git a/metadata/md5-cache/dev-java/felix-bundlerepository-1.6.6 b/metadata/md5-cache/dev-java/felix-bundlerepository-1.6.6
index c89174520599..091f62038378 100644
--- a/metadata/md5-cache/dev-java/felix-bundlerepository-1.6.6
+++ b/metadata/md5-cache/dev-java/felix-bundlerepository-1.6.6
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 dev-java/kxml:2 dev-java/xpp3:0 dev-java/felix-shell:0 dev-java/felix-utils:0 dev-java/osgi-core-api:0 dev-java/osgi-obr:0 >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=mirror://apache/felix/org.apache.felix.bundlerepository-1.6.6-source-release.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-osgi	c90eda970384b702459d01fc288d647d	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-osgi	c90eda970384b702459d01fc288d647d	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=e6e6a5677159fe94aea78de6b95d5131
diff --git a/metadata/md5-cache/dev-java/felix-gogo-command-0.12.0 b/metadata/md5-cache/dev-java/felix-gogo-command-0.12.0
index e4a397d48b49..201d3f5e7a04 100644
--- a/metadata/md5-cache/dev-java/felix-gogo-command-0.12.0
+++ b/metadata/md5-cache/dev-java/felix-gogo-command-0.12.0
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 dev-java/felix-bundlerepository:0 dev-java/felix-gogo-runtime:0 dev-java/osgi-compendium:0 dev-java/osgi-core-api:0 >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=mirror://apache/felix/org.apache.felix.gogo.command-0.12.0-project.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-osgi	c90eda970384b702459d01fc288d647d	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-osgi	c90eda970384b702459d01fc288d647d	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=59ce56d2f1f662d658fea4a67a010a80
diff --git a/metadata/md5-cache/dev-java/felix-gogo-runtime-0.10.0 b/metadata/md5-cache/dev-java/felix-gogo-runtime-0.10.0
index 2f12d7980c8c..2d933c761a01 100644
--- a/metadata/md5-cache/dev-java/felix-gogo-runtime-0.10.0
+++ b/metadata/md5-cache/dev-java/felix-gogo-runtime-0.10.0
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=mirror://apache/felix/org.apache.felix.gogo.runtime-0.10.0-project.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-osgi	c90eda970384b702459d01fc288d647d	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-osgi	c90eda970384b702459d01fc288d647d	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=0db63394cba36f2e7d816544d67b98cf
diff --git a/metadata/md5-cache/dev-java/felix-shell-1.4.3 b/metadata/md5-cache/dev-java/felix-shell-1.4.3
index ab0bda218d80..ace27247e34e 100644
--- a/metadata/md5-cache/dev-java/felix-shell-1.4.3
+++ b/metadata/md5-cache/dev-java/felix-shell-1.4.3
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=mirror://apache/felix/org.apache.felix.shell-1.4.3-source-release.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-osgi	c90eda970384b702459d01fc288d647d	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-osgi	c90eda970384b702459d01fc288d647d	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=726de66509aa89f3d51e22cd03826d1b
diff --git a/metadata/md5-cache/dev-java/felix-utils-1.2.0 b/metadata/md5-cache/dev-java/felix-utils-1.2.0
index 6541c71eb57d..f7ee9b59a7b8 100644
--- a/metadata/md5-cache/dev-java/felix-utils-1.2.0
+++ b/metadata/md5-cache/dev-java/felix-utils-1.2.0
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=mirror://apache/felix/org.apache.felix.utils-1.2.0-source-release.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-osgi	c90eda970384b702459d01fc288d647d	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-osgi	c90eda970384b702459d01fc288d647d	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=c36d676cf72362ef24e36af5eac67811
diff --git a/metadata/md5-cache/dev-java/flyingsaucer-7-r2 b/metadata/md5-cache/dev-java/flyingsaucer-7-r2
index d99d1b2ebd41..15a34efdbbd2 100644
--- a/metadata/md5-cache/dev-java/flyingsaucer-7-r2
+++ b/metadata/md5-cache/dev-java/flyingsaucer-7-r2
@@ -10,5 +10,5 @@ RDEPEND=svg? ( >=virtual/jre-1.5 ) !svg? ( >=virtual/jre-1.4 ) >=dev-java/itext-
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.pdoubleya.com/projects/flyingsaucer/downloads/r7/flyingsaucer-R7final-src.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=848175e7cc71ff8bd838c2148e699e8c
diff --git a/metadata/md5-cache/dev-java/fontbox-1.7.1 b/metadata/md5-cache/dev-java/fontbox-1.7.1
index 84b06907bb11..a43af97f79ac 100644
--- a/metadata/md5-cache/dev-java/fontbox-1.7.1
+++ b/metadata/md5-cache/dev-java/fontbox-1.7.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1.7
 SRC_URI=mirror://apache/pdfbox/1.7.1/pdfbox-1.7.1-src.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=90f8fb0e8208cde5987a1be565b0ed74
diff --git a/metadata/md5-cache/dev-java/fop-2.0-r3 b/metadata/md5-cache/dev-java/fop-2.0-r3
index 503ffe6035a2..2df3c5c6f341 100644
--- a/metadata/md5-cache/dev-java/fop-2.0-r3
+++ b/metadata/md5-cache/dev-java/fop-2.0-r3
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 dev-java/batik:1.9 dev-java/ant-core:0 dev-java/fontbo
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/xmlgraphics/fop/source/fop-2.0-src.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=2d8c5d4af67dab37645f415b73285bfe
diff --git a/metadata/md5-cache/dev-java/freemarker-2.3.13-r2 b/metadata/md5-cache/dev-java/freemarker-2.3.13-r2
index 443f20ccdca9..45b9d2b17d89 100644
--- a/metadata/md5-cache/dev-java/freemarker-2.3.13-r2
+++ b/metadata/md5-cache/dev-java/freemarker-2.3.13-r2
@@ -9,5 +9,5 @@ LICENSE=freemarker
 RDEPEND=dev-java/jython:2.7 java-virtuals/servlet-api:2.3 java-virtuals/servlet-api:2.4 java-virtuals/servlet-api:2.5 dev-java/jaxen:1.1 dev-java/juel:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2.3
 SRC_URI=mirror://sourceforge/freemarker/freemarker-2.3.13.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=cc9606b481217142183aea5f4ac2eb87
diff --git a/metadata/md5-cache/dev-java/freemarker-2.3.25 b/metadata/md5-cache/dev-java/freemarker-2.3.25
index b67e4b97ede8..5886c7849d9a 100644
--- a/metadata/md5-cache/dev-java/freemarker-2.3.25
+++ b/metadata/md5-cache/dev-java/freemarker-2.3.25
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-java/avalon-logkit:2.0 dev-java/commons-logging:0 dev-java/dom4j:1 dev-java/jaxen:1.1 dev-java/jython:2.7 dev-java/log4j:0 dev-java/rhino:1.6 dev-java/slf4j-api:0 dev-java/xalan:0 java-virtuals/servlet-api:2.5 >=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2.3
 SRC_URI=https://github.com/apache/incubator-freemarker/archive/v2.3.25.tar.gz -> freemarker-2.3.25.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=c7a210a6e0a1720f6d7cc0b445c6926d
diff --git a/metadata/md5-cache/dev-java/fscript-1.17-r1 b/metadata/md5-cache/dev-java/fscript-1.17-r1
index 99c981e91cfe..3bf55bd5f7e1 100644
--- a/metadata/md5-cache/dev-java/fscript-1.17-r1
+++ b/metadata/md5-cache/dev-java/fscript-1.17-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/fscript/fscript-1.17.tgz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=d24c955223f9fed3193e943a90991440
diff --git a/metadata/md5-cache/dev-java/glassfish-connector-api-1.1.2.2.04 b/metadata/md5-cache/dev-java/glassfish-connector-api-1.1.2.2.04
index e96291ee07d6..d01f5d38031c 100644
--- a/metadata/md5-cache/dev-java/glassfish-connector-api-1.1.2.2.04
+++ b/metadata/md5-cache/dev-java/glassfish-connector-api-1.1.2.2.04
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2 )
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://download.java.net/javaee5/v2ur2/promoted/source/glassfish-v2ur2-b04-src.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=1e9f08225ea8488902775bcf5c44e544
diff --git a/metadata/md5-cache/dev-java/glassfish-ejb-api-3.2 b/metadata/md5-cache/dev-java/glassfish-ejb-api-3.2
index c9bb901a0264..2f1a8beff9b7 100644
--- a/metadata/md5-cache/dev-java/glassfish-ejb-api-3.2
+++ b/metadata/md5-cache/dev-java/glassfish-ejb-api-3.2
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.7 java-virtuals/xmlrpc-api:0 java-virtuals/transaction-api:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~tomwij/files/dist/glassfish-ejb-api-3.2.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=c35cecd5e6ab0c1d335a3795f0121409
diff --git a/metadata/md5-cache/dev-java/glassfish-interceptor-api-3.1 b/metadata/md5-cache/dev-java/glassfish-interceptor-api-3.1
index 84e64ba7987b..242dbfa77f84 100644
--- a/metadata/md5-cache/dev-java/glassfish-interceptor-api-3.1
+++ b/metadata/md5-cache/dev-java/glassfish-interceptor-api-3.1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~tomwij/files/dist/glassfish-interceptor-api-3.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=a2a5d2853eec8cc4ae3eefd2915f6c16
diff --git a/metadata/md5-cache/dev-java/glassfish-jms-api-1.1.2.2.04 b/metadata/md5-cache/dev-java/glassfish-jms-api-1.1.2.2.04
index 9cd9f8f68745..8f99ce8e0082 100644
--- a/metadata/md5-cache/dev-java/glassfish-jms-api-1.1.2.2.04
+++ b/metadata/md5-cache/dev-java/glassfish-jms-api-1.1.2.2.04
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2 )
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://download.java.net/javaee5/v2ur2/promoted/source/glassfish-v2ur2-b04-src.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=df957e7ce7abec896bbfb20b3a1ccfa2
diff --git a/metadata/md5-cache/dev-java/glassfish-persistence-1.0-r1 b/metadata/md5-cache/dev-java/glassfish-persistence-1.0-r1
index b2ebd5fa28ed..eee65d659175 100644
--- a/metadata/md5-cache/dev-java/glassfish-persistence-1.0-r1
+++ b/metadata/md5-cache/dev-java/glassfish-persistence-1.0-r1
@@ -9,5 +9,5 @@ LICENSE=CDDL
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=http://download.java.net/javaee5/fcs_branch/promoted/source/glassfish-9_0-b48-src.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=be5a9cf69e89ba3b7e4e5117240d9fe0
diff --git a/metadata/md5-cache/dev-java/glassfish-xmlrpc-api-1.1.1 b/metadata/md5-cache/dev-java/glassfish-xmlrpc-api-1.1.1
index 4a7ebaaf9161..d8d5131e6310 100644
--- a/metadata/md5-cache/dev-java/glassfish-xmlrpc-api-1.1.1
+++ b/metadata/md5-cache/dev-java/glassfish-xmlrpc-api-1.1.1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.7 java-virtuals/servlet-api:3.0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~tomwij/files/dist/glassfish-xmlrpc-api-1.1.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=3c5a2c8cab7c937c2d95224f0887d6a0
diff --git a/metadata/md5-cache/dev-java/gnu-crypto-2.0.1-r3 b/metadata/md5-cache/dev-java/gnu-crypto-2.0.1-r3
index 84c88aa1ae70..6ef7f4c012a5 100644
--- a/metadata/md5-cache/dev-java/gnu-crypto-2.0.1-r3
+++ b/metadata/md5-cache/dev-java/gnu-crypto-2.0.1-r3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=ftp://ftp.gnupg.org/GnuPG/gnu-crypto/gnu-crypto-2.0.1.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=cdc612efe97c59dc62eb1d5e84633bb4
diff --git a/metadata/md5-cache/dev-java/gnu-jaf-1.1.1 b/metadata/md5-cache/dev-java/gnu-jaf-1.1.1
index 9848538907ef..e89105f47933 100644
--- a/metadata/md5-cache/dev-java/gnu-jaf-1.1.1
+++ b/metadata/md5-cache/dev-java/gnu-jaf-1.1.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2-with-linking-exception
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1
 SRC_URI=mirror://gnu/classpathx/activation-1.1.1.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=db0bfbb30468528558d0608de4fea74d
diff --git a/metadata/md5-cache/dev-java/guice-4.1 b/metadata/md5-cache/dev-java/guice-4.1
index 422e553d54a4..9c705fcf07de 100644
--- a/metadata/md5-cache/dev-java/guice-4.1
+++ b/metadata/md5-cache/dev-java/guice-4.1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.7 dev-java/aopalliance:1 >=dev-java/asm-5:4 >=dev-java/c
 RESTRICT=test
 SLOT=4
 SRC_URI=https://github.com/google/guice/archive/4.1.tar.gz -> guice-4.1.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=280e009d0e788cb2c20b13e4b57cbca8
diff --git a/metadata/md5-cache/dev-java/hamcrest-core-1.3 b/metadata/md5-cache/dev-java/hamcrest-core-1.3
index 83f6c001f998..229df74cee07 100644
--- a/metadata/md5-cache/dev-java/hamcrest-core-1.3
+++ b/metadata/md5-cache/dev-java/hamcrest-core-1.3
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1.3
 SRC_URI=https://hamcrest.googlecode.com/files/hamcrest-1.3.tgz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=a7697eb8da556cda1145177ba5032d57
diff --git a/metadata/md5-cache/dev-java/hamcrest-generator-1.1 b/metadata/md5-cache/dev-java/hamcrest-generator-1.1
index c63c9e0520ae..51d2cd52c131 100644
--- a/metadata/md5-cache/dev-java/hamcrest-generator-1.1
+++ b/metadata/md5-cache/dev-java/hamcrest-generator-1.1
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=>=virtual/jre-1.5 dev-java/qdox:1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://hamcrest.googlecode.com/files/hamcrest-1.1.tgz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=64c3adf7407c81579cd8276865bc0e21
diff --git a/metadata/md5-cache/dev-java/hamcrest-generator-1.3-r1 b/metadata/md5-cache/dev-java/hamcrest-generator-1.3-r1
index 0abf5a91abeb..0b13683d53a3 100644
--- a/metadata/md5-cache/dev-java/hamcrest-generator-1.3-r1
+++ b/metadata/md5-cache/dev-java/hamcrest-generator-1.3-r1
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=>=virtual/jre-1.5 >=dev-java/qdox-1.12-r1:1.12 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1.3
 SRC_URI=https://hamcrest.googlecode.com/files/hamcrest-1.3.tgz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=a77cfb889d276a188ac6dbb14862921e
diff --git a/metadata/md5-cache/dev-java/hamcrest-integration-1.3 b/metadata/md5-cache/dev-java/hamcrest-integration-1.3
index f6a7c4de25b2..7b97160e9bb9 100644
--- a/metadata/md5-cache/dev-java/hamcrest-integration-1.3
+++ b/metadata/md5-cache/dev-java/hamcrest-integration-1.3
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=>=virtual/jre-1.5 dev-java/hamcrest-core:1.3 dev-java/qdox:1.6 dev-java/easymock:3.2 dev-java/jmock:1.0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1.3
 SRC_URI=https://hamcrest.googlecode.com/files/hamcrest-1.3.tgz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=506784f7f4caf627bcb75869ac92a9ec
diff --git a/metadata/md5-cache/dev-java/hamcrest-library-1.3-r1 b/metadata/md5-cache/dev-java/hamcrest-library-1.3-r1
index 947804499e15..efc5a462b3ca 100644
--- a/metadata/md5-cache/dev-java/hamcrest-library-1.3-r1
+++ b/metadata/md5-cache/dev-java/hamcrest-library-1.3-r1
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=>=virtual/jre-1.6 dev-java/hamcrest-generator:1.3 dev-java/hamcrest-core:1.3 dev-java/qdox:1.12 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1.3
 SRC_URI=https://hamcrest.googlecode.com/files/hamcrest-1.3.tgz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=afd7f1e2186c490b1c6aee1b6b57ac7f
diff --git a/metadata/md5-cache/dev-java/headius-options-1.1 b/metadata/md5-cache/dev-java/headius-options-1.1
index 1bc7a55637a4..14a906b0c687 100644
--- a/metadata/md5-cache/dev-java/headius-options-1.1
+++ b/metadata/md5-cache/dev-java/headius-options-1.1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/headius/options/archive/options-1.1.tar.gz -> headius-options-1.1.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=10f0aa8de33acbb25d8a6def7b184f7a
diff --git a/metadata/md5-cache/dev-java/helpgui-1.1-r2 b/metadata/md5-cache/dev-java/helpgui-1.1-r2
index bafa640cc420..bcdccff7927a 100644
--- a/metadata/md5-cache/dev-java/helpgui-1.1-r2
+++ b/metadata/md5-cache/dev-java/helpgui-1.1-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/helpgui/helpgui-1.1-src.jar
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=a4b0bdb057e9a6871add066b92164699
diff --git a/metadata/md5-cache/dev-java/htmlparser-1.4-r1 b/metadata/md5-cache/dev-java/htmlparser-1.4-r1
index 6d1ec06afcfb..15a6aecc31f9 100644
--- a/metadata/md5-cache/dev-java/htmlparser-1.4-r1
+++ b/metadata/md5-cache/dev-java/htmlparser-1.4-r1
@@ -9,5 +9,5 @@ LICENSE=W3C
 RDEPEND=dev-java/icu4j:52 dev-java/jchardet:0 dev-java/xom:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://about.validator.nu/htmlparser/htmlparser-1.4.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=adc3f61b82e4634e5e3e3e56e28e1432
diff --git a/metadata/md5-cache/dev-java/httpcomponents-client-4.5 b/metadata/md5-cache/dev-java/httpcomponents-client-4.5
index bf9d5f7b9758..7f755817bd03 100644
--- a/metadata/md5-cache/dev-java/httpcomponents-client-4.5
+++ b/metadata/md5-cache/dev-java/httpcomponents-client-4.5
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 dev-java/ant-junit:0 dev-java/easymock:3.2 dev-java/spymemcached:0 dev-java/osgi-core-api:0 dev-java/osgi-enterprise-api:0 dev-java/commons-codec:0 dev-java/commons-logging:0 dev-java/httpcomponents-core:4.4 dev-java/easymock-classextension:3.2 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=4.5
 SRC_URI=mirror://apache/httpcomponents/httpclient/source/httpcomponents-client-4.5-src.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=2c8b31d4c4453d34be180112b7d8b807
diff --git a/metadata/md5-cache/dev-java/httpcomponents-core-4.4.1-r1 b/metadata/md5-cache/dev-java/httpcomponents-core-4.4.1-r1
index 97d71ede66f8..b4ebd30b54c2 100644
--- a/metadata/md5-cache/dev-java/httpcomponents-core-4.4.1-r1
+++ b/metadata/md5-cache/dev-java/httpcomponents-core-4.4.1-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=4.4
 SRC_URI=mirror://apache/httpcomponents/httpcore/source/httpcomponents-core-4.4.1-src.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=d9f791b2d967a5a013d9294bc3ede1d8
diff --git a/metadata/md5-cache/dev-java/ical4j-1.0.5 b/metadata/md5-cache/dev-java/ical4j-1.0.5
index 33ac72602d63..4a93b1f67a2c 100644
--- a/metadata/md5-cache/dev-java/ical4j-1.0.5
+++ b/metadata/md5-cache/dev-java/ical4j-1.0.5
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 dev-java/commons-logging:0 dev-java/commons-codec:0 de
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/ical4j/ical4j-1.0.5-src.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=632a1b19bf7daa3089f6e603a8828a93
diff --git a/metadata/md5-cache/dev-java/icu4j-54.1.1 b/metadata/md5-cache/dev-java/icu4j-54.1.1
index b9b6f4835f04..405e858f44ff 100644
--- a/metadata/md5-cache/dev-java/icu4j-54.1.1
+++ b/metadata/md5-cache/dev-java/icu4j-54.1.1
@@ -9,5 +9,5 @@ LICENSE=icu
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=52
 SRC_URI=http://download.icu-project.org/files/icu4j/54.1.1/icu4j-54_1_1.tgz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=c28c1e919be8f3b6184776bcd7dad4ca
diff --git a/metadata/md5-cache/dev-java/icu4j-55.1 b/metadata/md5-cache/dev-java/icu4j-55.1
index de7a62296aac..25dd319535d9 100644
--- a/metadata/md5-cache/dev-java/icu4j-55.1
+++ b/metadata/md5-cache/dev-java/icu4j-55.1
@@ -9,5 +9,5 @@ LICENSE=icu
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=55
 SRC_URI=http://download.icu-project.org/files/icu4j/55.1/icu4j-55_1.tgz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=354cf3441cd96d928c1ecbb05118282a
diff --git a/metadata/md5-cache/dev-java/icu4j-56.1 b/metadata/md5-cache/dev-java/icu4j-56.1
index 06a74fb60488..a8982aa0ce67 100644
--- a/metadata/md5-cache/dev-java/icu4j-56.1
+++ b/metadata/md5-cache/dev-java/icu4j-56.1
@@ -9,5 +9,5 @@ LICENSE=icu
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=56
 SRC_URI=http://download.icu-project.org/files/icu4j/56.1/icu4j-56_1.tgz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=abe70e3a44a247a7804d7ba8d261564e
diff --git a/metadata/md5-cache/dev-java/idm-console-framework-1.1.7 b/metadata/md5-cache/dev-java/idm-console-framework-1.1.7
index 0e2ada44fe9a..ce1afc49f06d 100644
--- a/metadata/md5-cache/dev-java/idm-console-framework-1.1.7
+++ b/metadata/md5-cache/dev-java/idm-console-framework-1.1.7
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.6 dev-java/jss:3.4 dev-java/ldapsdk:4.1 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1.1
 SRC_URI=http://directory.fedoraproject.org/sources/idm-console-framework-1.1.7.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=c7e5ec6c30a64c35d5cdd1fefdb1dc08
diff --git a/metadata/md5-cache/dev-java/invokebinder-1.6 b/metadata/md5-cache/dev-java/invokebinder-1.6
index ee6e651d4363..5650f4c01867 100644
--- a/metadata/md5-cache/dev-java/invokebinder-1.6
+++ b/metadata/md5-cache/dev-java/invokebinder-1.6
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/headius/invokebinder/archive/invokebinder-1.6.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=7adf737eb0720dc8b5f7fc6517a3d30c
diff --git a/metadata/md5-cache/dev-java/itext-2.1.5-r2 b/metadata/md5-cache/dev-java/itext-2.1.5-r2
index 4c4ddf5e14e4..21000134ebe5 100644
--- a/metadata/md5-cache/dev-java/itext-2.1.5-r2
+++ b/metadata/md5-cache/dev-java/itext-2.1.5-r2
@@ -9,5 +9,5 @@ LICENSE=MPL-1.1
 RDEPEND=dev-java/bcmail:1.45 dev-java/bcprov:1.45 rups? ( dev-java/dom4j:1 dev-java/pdf-renderer:0 ) >=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/itext/iText-src-2.1.5.tar.gz cjk? ( mirror://sourceforge/itext/iTextAsian.jar mirror://sourceforge/itext/iTextAsianCmaps.jar )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=edb81c26b42de24f348cf430a194e17c
diff --git a/metadata/md5-cache/dev-java/j2ssh-0.2.9 b/metadata/md5-cache/dev-java/j2ssh-0.2.9
index 776b1e0db8d1..ff99f320f90b 100644
--- a/metadata/md5-cache/dev-java/j2ssh-0.2.9
+++ b/metadata/md5-cache/dev-java/j2ssh-0.2.9
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-java/commons-logging:0 dev-java/ant-core:0 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/sshtools/j2ssh-0.2.9-src.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=65769b0364e3ee7c0db17f26080b60a9
diff --git a/metadata/md5-cache/dev-java/jackrabbit-webdav-2.10.1 b/metadata/md5-cache/dev-java/jackrabbit-webdav-2.10.1
index eeb7aa78b2f6..2a925c1bf003 100644
--- a/metadata/md5-cache/dev-java/jackrabbit-webdav-2.10.1
+++ b/metadata/md5-cache/dev-java/jackrabbit-webdav-2.10.1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 dev-java/bndlib:0 dev-java/slf4j-api:0 dev-java/slf4j-nop:0 dev-java/commons-httpclient:3 java-virtuals/servlet-api:2.3 >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=mirror://apache/jackrabbit/2.10.1/jackrabbit-2.10.1-src.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=aeb82541390a8eef4c1a487a95fc711c
diff --git a/metadata/md5-cache/dev-java/jakarta-oro-2.0.8-r3 b/metadata/md5-cache/dev-java/jakarta-oro-2.0.8-r3
index eceeb6febfac..e15defbab13b 100644
--- a/metadata/md5-cache/dev-java/jakarta-oro-2.0.8-r3
+++ b/metadata/md5-cache/dev-java/jakarta-oro-2.0.8-r3
@@ -9,5 +9,5 @@ LICENSE=Apache-1.1
 RDEPEND=>=virtual/jre-1.3 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2.0
 SRC_URI=http://archive.apache.org/dist/jakarta/oro/jakarta-oro-2.0.8.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=5e09cc59e91608f09a5e5fba4f1630f2
diff --git a/metadata/md5-cache/dev-java/jansi-1.11-r1 b/metadata/md5-cache/dev-java/jansi-1.11-r1
index d70aa7694224..b468a6b49021 100644
--- a/metadata/md5-cache/dev-java/jansi-1.11-r1
+++ b/metadata/md5-cache/dev-java/jansi-1.11-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-java/jansi-native:0 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1.11
 SRC_URI=https://github.com/fusesource/jansi/tarball/jansi-project-1.11 -> jansi-1.11.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=47beae57040ccbb54dd6a23f7a1fc3e7
diff --git a/metadata/md5-cache/dev-java/jarbundler-1.8.1-r2 b/metadata/md5-cache/dev-java/jarbundler-1.8.1-r2
index 14cee29affec..9cba41f73c73 100644
--- a/metadata/md5-cache/dev-java/jarbundler-1.8.1-r2
+++ b/metadata/md5-cache/dev-java/jarbundler-1.8.1-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-java/xerces-2.8.1:2 >=virtual/jre-1.4 >=dev-java/ant-core-1.7:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/jarbundler/jarbundler-1.8.1.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=604efa718fb813941e554cc7f432d387
diff --git a/metadata/md5-cache/dev-java/jarbundler-2.3.1 b/metadata/md5-cache/dev-java/jarbundler-2.3.1
index 782bae53be6b..f91771bd04f9 100644
--- a/metadata/md5-cache/dev-java/jarbundler-2.3.1
+++ b/metadata/md5-cache/dev-java/jarbundler-2.3.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-java/xerces-2.8.1:2 >=virtual/jre-1.6 >=dev-java/ant-core-1.7:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://downloads.sourceforge.net/project/jarbundler/JarBundler/v2.3.1/jarbundler.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=9e5f0098d42f148a36869dfc16bcbe73
diff --git a/metadata/md5-cache/dev-java/jarjar-1.4 b/metadata/md5-cache/dev-java/jarjar-1.4
index e89f1f836cbd..5146b5824d89 100644
--- a/metadata/md5-cache/dev-java/jarjar-1.4
+++ b/metadata/md5-cache/dev-java/jarjar-1.4
@@ -10,5 +10,5 @@ RDEPEND=dev-java/asm:4 dev-java/gnu-regexp:1 dev-java/java-getopt:1 dev-java/ant
 RESTRICT=test
 SLOT=1
 SRC_URI=https://jarjar.googlecode.com/files/jarjar-src-1.4.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=7c1a1790c23757584418afd752b09a64
diff --git a/metadata/md5-cache/dev-java/java-getopt-1.0.14 b/metadata/md5-cache/dev-java/java-getopt-1.0.14
index 39232658b950..7f121e8679e4 100644
--- a/metadata/md5-cache/dev-java/java-getopt-1.0.14
+++ b/metadata/md5-cache/dev-java/java-getopt-1.0.14
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1
 SRC_URI=http://www.urbanophile.com/arenn/hacking/getopt/java-getopt-1.0.14.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=85208ad4b9a4c677ce17f6eadd272083
diff --git a/metadata/md5-cache/dev-java/java-service-wrapper-3.5.25-r1 b/metadata/md5-cache/dev-java/java-service-wrapper-3.5.25-r1
index dfe506711862..b8ca88266c20 100644
--- a/metadata/md5-cache/dev-java/java-service-wrapper-3.5.25-r1
+++ b/metadata/md5-cache/dev-java/java-service-wrapper-3.5.25-r1
@@ -9,5 +9,5 @@ LICENSE=tanuki-community
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://wrapper.tanukisoftware.org/download/3.5.25/wrapper_3.5.25_src.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=de5d68acf18bde177cdac36fd88b917c
diff --git a/metadata/md5-cache/dev-java/javacc-5.0-r3 b/metadata/md5-cache/dev-java/javacc-5.0-r3
index ec208c15b6a2..7c452602c202 100644
--- a/metadata/md5-cache/dev-java/javacc-5.0-r3
+++ b/metadata/md5-cache/dev-java/javacc-5.0-r3
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-java/junit:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://java.net/projects/javacc/downloads/download/javacc-5.0src.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=3aadeb6eeb7c37040354e22335019fa0
diff --git a/metadata/md5-cache/dev-java/javacsv-2.1 b/metadata/md5-cache/dev-java/javacsv-2.1
index 9be12cdc9741..ab092ff32a2b 100644
--- a/metadata/md5-cache/dev-java/javacsv-2.1
+++ b/metadata/md5-cache/dev-java/javacsv-2.1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/javacsv/javacsv2.1.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=612ee0db58c8431823a273966418daa8
diff --git a/metadata/md5-cache/dev-java/javacup-0.11b_p20151001 b/metadata/md5-cache/dev-java/javacup-0.11b_p20151001
index 33666134ce7d..bda888cda301 100644
--- a/metadata/md5-cache/dev-java/javacup-0.11b_p20151001
+++ b/metadata/md5-cache/dev-java/javacup-0.11b_p20151001
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://www2.cs.tum.edu/projects/cup/releases/java-cup-src-11b-20151001.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=80c3668002f51409b0bf1d207c28b137
diff --git a/metadata/md5-cache/dev-java/javahelp-2.0.05_p20170719 b/metadata/md5-cache/dev-java/javahelp-2.0.05_p20170719
index 61b956377eee..3264e796f2f5 100644
--- a/metadata/md5-cache/dev-java/javahelp-2.0.05_p20170719
+++ b/metadata/md5-cache/dev-java/javahelp-2.0.05_p20170719
@@ -9,5 +9,5 @@ LICENSE=GPL-2-with-linking-exception
 RDEPEND=>=virtual/jre-1.4 java-virtuals/servlet-api:2.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/javaee/javahelp/archive/3ca862d8626096770598a3a256886d205246f4a4.tar.gz -> javahelp-2.0.05_p20170719.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=79b4e4017eeea9c8ffcd33e0315f20a9
diff --git a/metadata/md5-cache/dev-java/javahelp-2.0.05_p63 b/metadata/md5-cache/dev-java/javahelp-2.0.05_p63
index 8163b11bd83d..31e102e63244 100644
--- a/metadata/md5-cache/dev-java/javahelp-2.0.05_p63
+++ b/metadata/md5-cache/dev-java/javahelp-2.0.05_p63
@@ -9,5 +9,5 @@ LICENSE=GPL-2-with-linking-exception
 RDEPEND=>=virtual/jre-1.4 java-virtuals/servlet-api:2.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://javahelp.dev.java.net/files/documents/5985/145533/javahelp2-src-2.0.05_svn63.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=443195055f9ab152cc3b29334ed20140
diff --git a/metadata/md5-cache/dev-java/javassist-2.6-r2 b/metadata/md5-cache/dev-java/javassist-2.6-r2
index 0bc0417ce4b1..6d49c4d9bde0 100644
--- a/metadata/md5-cache/dev-java/javassist-2.6-r2
+++ b/metadata/md5-cache/dev-java/javassist-2.6-r2
@@ -9,5 +9,5 @@ LICENSE=MPL-1.1
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2
 SRC_URI=mirror://sourceforge/jboss/javassist-2.6.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=4c2caa6cfd54a279ed75cafa487c5ac4
diff --git a/metadata/md5-cache/dev-java/javassist-3.18.2 b/metadata/md5-cache/dev-java/javassist-3.18.2
index 4a9b28abf284..6bf3f7a30346 100644
--- a/metadata/md5-cache/dev-java/javassist-3.18.2
+++ b/metadata/md5-cache/dev-java/javassist-3.18.2
@@ -9,5 +9,5 @@ LICENSE=MPL-1.1
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=3
 SRC_URI=https://github.com/jboss-javassist/javassist/archive/rel_3_18_2_ga_build.tar.gz -> javassist-3.18.2.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=6ab849afdf27fb0534670ee931656517
diff --git a/metadata/md5-cache/dev-java/javolution-4.0.2-r1 b/metadata/md5-cache/dev-java/javolution-4.0.2-r1
index 508323adc34c..c68e12d882b9 100644
--- a/metadata/md5-cache/dev-java/javolution-4.0.2-r1
+++ b/metadata/md5-cache/dev-java/javolution-4.0.2-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=4
 SRC_URI=http://javolution.org/javolution-4.0.2-src.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=4405b9dc1094e9afc3ffc96c3eec51d8
diff --git a/metadata/md5-cache/dev-java/javolution-6.0.0 b/metadata/md5-cache/dev-java/javolution-6.0.0
index 65349a140c58..7babe0a577f6 100644
--- a/metadata/md5-cache/dev-java/javolution-6.0.0
+++ b/metadata/md5-cache/dev-java/javolution-6.0.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.5 dev-java/osgi-core-api:0 dev-java/osgi-compendium:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=6
 SRC_URI=https://dev.gentoo.org/~tomwij/files/dist/javolution-6.0.0.tar.xz https://dev.gentoo.org/~tomwij/files/dist/javolution-6.0.0-build.xml.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=968a2a8c9811c7e2096307d8bd05290c
diff --git a/metadata/md5-cache/dev-java/jaxen-1.1.4-r1 b/metadata/md5-cache/dev-java/jaxen-1.1.4-r1
index 1b4daf1f1c40..ce143eadc238 100644
--- a/metadata/md5-cache/dev-java/jaxen-1.1.4-r1
+++ b/metadata/md5-cache/dev-java/jaxen-1.1.4-r1
@@ -9,5 +9,5 @@ LICENSE=JDOM
 RDEPEND=dev-java/xom:0 dev-java/jdom:0 dev-java/dom4j:1 >=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1.1
 SRC_URI=http://dist.codehaus.org/jaxen/distributions/jaxen-1.1.4-src.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=b5aeecab33f5759c327d8dd6d27c6b46
diff --git a/metadata/md5-cache/dev-java/jboss-logging-3.1.4 b/metadata/md5-cache/dev-java/jboss-logging-3.1.4
index e77adab1a7c1..a6d49658013a 100644
--- a/metadata/md5-cache/dev-java/jboss-logging-3.1.4
+++ b/metadata/md5-cache/dev-java/jboss-logging-3.1.4
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 dev-java/jboss-logmanager:0 >=dev-java/slf4j-api-1.7.7 dev-java/log4j:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/jboss-logging/jboss-logging/archive/3.1.4.GA.tar.gz -> jboss-logging-3.1.4.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=a548ecc9765dfdc7b16f751cf815f35a
diff --git a/metadata/md5-cache/dev-java/jcalendar-1.4 b/metadata/md5-cache/dev-java/jcalendar-1.4
index 75a8031b8c0c..0be512d3a9a7 100644
--- a/metadata/md5-cache/dev-java/jcalendar-1.4
+++ b/metadata/md5-cache/dev-java/jcalendar-1.4
@@ -10,5 +10,5 @@ RDEPEND=dev-java/jgoodies-looks:2.6 >=virtual/jre-1.6 >=dev-java/java-config-2.2
 RESTRICT=test
 SLOT=1.2
 SRC_URI=http://www.toedter.com/download/jcalendar-1.4.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=3794a92463f8704139567c381e170be9
diff --git a/metadata/md5-cache/dev-java/jcifs-1.3.17-r1 b/metadata/md5-cache/dev-java/jcifs-1.3.17-r1
index 6a4fca51e42b..64a2fc47b130 100644
--- a/metadata/md5-cache/dev-java/jcifs-1.3.17-r1
+++ b/metadata/md5-cache/dev-java/jcifs-1.3.17-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.4 java-virtuals/servlet-api:2.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1.1
 SRC_URI=https://jcifs.samba.org/src/jcifs-1.3.17.tgz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=f818adddcd1537576626b68088959ae9
diff --git a/metadata/md5-cache/dev-java/jclasslib-3.1 b/metadata/md5-cache/dev-java/jclasslib-3.1
index e8b12f31e768..5f32f522aab6 100644
--- a/metadata/md5-cache/dev-java/jclasslib-3.1
+++ b/metadata/md5-cache/dev-java/jclasslib-3.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/ingokegel/jclasslib/archive/3.1.tar.gz -> jclasslib-3.1.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=43a18d81a9af39c5d3a0587c57c100bc
diff --git a/metadata/md5-cache/dev-java/jcmdline-1.0.2-r2 b/metadata/md5-cache/dev-java/jcmdline-1.0.2-r2
index 313b6b3e61cb..fd60c16973e1 100644
--- a/metadata/md5-cache/dev-java/jcmdline-1.0.2-r2
+++ b/metadata/md5-cache/dev-java/jcmdline-1.0.2-r2
@@ -9,5 +9,5 @@ LICENSE=MPL-1.1
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1.0
 SRC_URI=mirror://sourceforge/jcmdline/jcmdline-1.0.2.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=42ec54722bba09657be42910b5eb9dc2
diff --git a/metadata/md5-cache/dev-java/jcodings-1.0.11 b/metadata/md5-cache/dev-java/jcodings-1.0.11
index dc4949ff47f0..cce1113d546b 100644
--- a/metadata/md5-cache/dev-java/jcodings-1.0.11
+++ b/metadata/md5-cache/dev-java/jcodings-1.0.11
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1
 SRC_URI=https://github.com/jruby/jcodings/archive/jcodings-1.0.11.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=ed5ec9c10cc126d0031db83f2e45fa21
diff --git a/metadata/md5-cache/dev-java/jcodings-1.0.4 b/metadata/md5-cache/dev-java/jcodings-1.0.4
index 92b453e0bb7d..affc5a8de8ba 100644
--- a/metadata/md5-cache/dev-java/jcodings-1.0.4
+++ b/metadata/md5-cache/dev-java/jcodings-1.0.4
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://gentoo/jcodings-1.0.4-git.tar.gz
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=66a40881f68521f22382054a03f949d0
diff --git a/metadata/md5-cache/dev-java/jcodings-1.0.5 b/metadata/md5-cache/dev-java/jcodings-1.0.5
index f05436ba9ebe..d54ed97ad24f 100644
--- a/metadata/md5-cache/dev-java/jcodings-1.0.5
+++ b/metadata/md5-cache/dev-java/jcodings-1.0.5
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/jruby/jcodings/tarball/1.0.5 -> jcodings-1.0.5-git.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=ea49a050de2fb4e9c7884391e7c2f264
diff --git a/metadata/md5-cache/dev-java/jcommon-1.0.23 b/metadata/md5-cache/dev-java/jcommon-1.0.23
index 6bde0400d3a6..7983534a2da3 100644
--- a/metadata/md5-cache/dev-java/jcommon-1.0.23
+++ b/metadata/md5-cache/dev-java/jcommon-1.0.23
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1.0
 SRC_URI=mirror://sourceforge/jfreechart/jcommon-1.0.23.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=4850f5b75a4aab0b2c486ecafcad7c89
diff --git a/metadata/md5-cache/dev-java/jcs-2.0 b/metadata/md5-cache/dev-java/jcs-2.0
index 19050340c07d..7ebce45fdde2 100644
--- a/metadata/md5-cache/dev-java/jcs-2.0
+++ b/metadata/md5-cache/dev-java/jcs-2.0
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 dev-java/jisp:2.5 dev-db/hsqldb:0 dev-java/log4j:0 dev-java/xmlrpc:3 dev-java/commons-lang:0 dev-java/commons-dbcp:0 dev-java/commons-pool:0 dev-java/commons-logging:0 dev-java/commons-httpclient:3 java-virtuals/servlet-api:3.0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2.0
 SRC_URI=http://apache.mirrors.ovh.net/ftp.apache.org/dist/commons/jcs/source/commons-jcs-dist-2.0-beta-1-src.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=36d7df7251e39aa88991defd284a2ad2
diff --git a/metadata/md5-cache/dev-java/jdbc-mysql-5.1.26 b/metadata/md5-cache/dev-java/jdbc-mysql-5.1.26
index a4a90dbc479d..10264fc1d056 100644
--- a/metadata/md5-cache/dev-java/jdbc-mysql-5.1.26
+++ b/metadata/md5-cache/dev-java/jdbc-mysql-5.1.26
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 dev-java/slf4j-api:0 log4j? ( dev-java/log4j:0 ) c3p0?
 RESTRICT=test
 SLOT=0
 SRC_URI=https://dev.mysql.com/get/Downloads/Connector-J/mysql-connector-java-5.1.26.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=cb8e43735788bd05b9e88df48ca237d7
diff --git a/metadata/md5-cache/dev-java/jdbc-postgresql-9.2_p1003 b/metadata/md5-cache/dev-java/jdbc-postgresql-9.2_p1003
index efa00b87278c..80a1ab746f7b 100644
--- a/metadata/md5-cache/dev-java/jdbc-postgresql-9.2_p1003
+++ b/metadata/md5-cache/dev-java/jdbc-postgresql-9.2_p1003
@@ -9,5 +9,5 @@ LICENSE=POSTGRESQL
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://jdbc.postgresql.org/download/postgresql-jdbc-9.2-1003.src.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=e99bb548bd1aa8ddac28657987ab2c60
diff --git a/metadata/md5-cache/dev-java/jdbc-postgresql-9.2_p1004 b/metadata/md5-cache/dev-java/jdbc-postgresql-9.2_p1004
index bb96c297d7ed..d507ab6ff1d7 100644
--- a/metadata/md5-cache/dev-java/jdbc-postgresql-9.2_p1004
+++ b/metadata/md5-cache/dev-java/jdbc-postgresql-9.2_p1004
@@ -9,5 +9,5 @@ LICENSE=POSTGRESQL
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://jdbc.postgresql.org/download/postgresql-jdbc-9.2-1004.src.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=a430664642e4300c390d0aa5e01ef263
diff --git a/metadata/md5-cache/dev-java/jdbc-postgresql-9.3_p1100 b/metadata/md5-cache/dev-java/jdbc-postgresql-9.3_p1100
index a930855d9529..f9a389c51ed0 100644
--- a/metadata/md5-cache/dev-java/jdbc-postgresql-9.3_p1100
+++ b/metadata/md5-cache/dev-java/jdbc-postgresql-9.3_p1100
@@ -9,5 +9,5 @@ LICENSE=POSTGRESQL
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://jdbc.postgresql.org/download/postgresql-jdbc-9.3-1100.src.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=a430664642e4300c390d0aa5e01ef263
diff --git a/metadata/md5-cache/dev-java/jdbc-postgresql-9.4_p1205 b/metadata/md5-cache/dev-java/jdbc-postgresql-9.4_p1205
index c45ac49e0d07..1ac017070a07 100644
--- a/metadata/md5-cache/dev-java/jdbc-postgresql-9.4_p1205
+++ b/metadata/md5-cache/dev-java/jdbc-postgresql-9.4_p1205
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 RESTRICT=test
 SLOT=0
 SRC_URI=http://jdbc.postgresql.org/download/postgresql-jdbc-9.4-1205.src.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=db5639c6d83d2740c8a777d1ccdac4b1
diff --git a/metadata/md5-cache/dev-java/jdbc-postgresql-9.4_p1206 b/metadata/md5-cache/dev-java/jdbc-postgresql-9.4_p1206
index e6244e836903..88d57a641d12 100644
--- a/metadata/md5-cache/dev-java/jdbc-postgresql-9.4_p1206
+++ b/metadata/md5-cache/dev-java/jdbc-postgresql-9.4_p1206
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 RESTRICT=test
 SLOT=0
 SRC_URI=http://jdbc.postgresql.org/download/postgresql-jdbc-9.4-1206.src.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=3455f2542fdd5ffa7b4a26d91056166b
diff --git a/metadata/md5-cache/dev-java/jdbm-0.12-r2 b/metadata/md5-cache/dev-java/jdbm-0.12-r2
index e30fd2ff2050..314ba98cfac8 100644
--- a/metadata/md5-cache/dev-java/jdbm-0.12-r2
+++ b/metadata/md5-cache/dev-java/jdbm-0.12-r2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.3 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1
 SRC_URI=mirror://sourceforge/jdbm/jdbm-0.12-src.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=da3b598dfcbd818b038b921257d4d16c
diff --git a/metadata/md5-cache/dev-java/jdepend-2.9-r5 b/metadata/md5-cache/dev-java/jdepend-2.9-r5
index ef8c87bb19d4..37181db7ce6f 100644
--- a/metadata/md5-cache/dev-java/jdepend-2.9-r5
+++ b/metadata/md5-cache/dev-java/jdepend-2.9-r5
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://www.clarkware.com/software/jdepend-2.9.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=125d82afc050bdbf5e66ec30e03cdb4e
diff --git a/metadata/md5-cache/dev-java/jdom-1.0-r2 b/metadata/md5-cache/dev-java/jdom-1.0-r2
index 14b0dc74986c..0f2cdcc9d264 100644
--- a/metadata/md5-cache/dev-java/jdom-1.0-r2
+++ b/metadata/md5-cache/dev-java/jdom-1.0-r2
@@ -9,5 +9,5 @@ LICENSE=JDOM
 RDEPEND=>=virtual/jre-1.4 dev-java/saxpath >=dev-java/xerces-2.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1.0
 SRC_URI=http://www.jdom.org/dist/source/jdom-1.0.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=4f5f3244ec698dd829e65cfb04a50a28
diff --git a/metadata/md5-cache/dev-java/jdom-1.0-r4 b/metadata/md5-cache/dev-java/jdom-1.0-r4
index 92d6131f3191..b653753620b3 100644
--- a/metadata/md5-cache/dev-java/jdom-1.0-r4
+++ b/metadata/md5-cache/dev-java/jdom-1.0-r4
@@ -10,5 +10,5 @@ PDEPEND=~dev-java/jdom-jaxen-1.0
 RDEPEND=>=virtual/jre-1.4 dev-java/saxpath >=dev-java/xerces-2.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1.0
 SRC_URI=http://www.jdom.org/dist/source/archive/jdom-1.0.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=d400b4a6e2876d557515f55ed2019b04
diff --git a/metadata/md5-cache/dev-java/jdom-1.1.3 b/metadata/md5-cache/dev-java/jdom-1.1.3
index e6d80accced5..87b167b0e277 100644
--- a/metadata/md5-cache/dev-java/jdom-1.1.3
+++ b/metadata/md5-cache/dev-java/jdom-1.1.3
@@ -9,5 +9,5 @@ LICENSE=JDOM
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://www.jdom.org/dist/binary/archive/jdom-1.1.3.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=38a316984f1744a845187ef80af3f7cc
diff --git a/metadata/md5-cache/dev-java/jdom-2.0.6-r4 b/metadata/md5-cache/dev-java/jdom-2.0.6-r4
index 0a4511aa00ee..58df8d536e09 100644
--- a/metadata/md5-cache/dev-java/jdom-2.0.6-r4
+++ b/metadata/md5-cache/dev-java/jdom-2.0.6-r4
@@ -9,5 +9,5 @@ LICENSE=Apache-1.1
 RDEPEND=dev-java/xalan:0 dev-java/jaxen:1.1 dev-java/iso-relax:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2
 SRC_URI=https://github.com/hunterhacker/jdom/archive/JDOM-2.0.6.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=07e6a0339f0650a8ffceb89b2ff929d4
diff --git a/metadata/md5-cache/dev-java/jebl-2013.02.18 b/metadata/md5-cache/dev-java/jebl-2013.02.18
index f082b6083a40..6f776460b4cd 100644
--- a/metadata/md5-cache/dev-java/jebl-2013.02.18
+++ b/metadata/md5-cache/dev-java/jebl-2013.02.18
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jlec/distfiles/jebl-2013.02.18.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=7f09f4583807b47004872a3b3b71933b
diff --git a/metadata/md5-cache/dev-java/jempbox-1.7.1 b/metadata/md5-cache/dev-java/jempbox-1.7.1
index fe86c3aff8c1..08f9db42ee73 100644
--- a/metadata/md5-cache/dev-java/jempbox-1.7.1
+++ b/metadata/md5-cache/dev-java/jempbox-1.7.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1.7
 SRC_URI=mirror://apache/pdfbox/1.7.1/pdfbox-1.7.1-src.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=9401cece3744665a72abd9c618145b89
diff --git a/metadata/md5-cache/dev-java/jffi-1.2.9 b/metadata/md5-cache/dev-java/jffi-1.2.9
index edbae428fdb9..7e6f80bee46f 100644
--- a/metadata/md5-cache/dev-java/jffi-1.2.9
+++ b/metadata/md5-cache/dev-java/jffi-1.2.9
@@ -10,5 +10,5 @@ RDEPEND=virtual/libffi:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 sourc
 RESTRICT=test
 SLOT=1.2
 SRC_URI=https://github.com/jnr/jffi/archive/1.2.9.tar.gz -> jffi-1.2.9.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=9620f611fff14aac068786dabf4e6c9c
diff --git a/metadata/md5-cache/dev-java/jfreechart-1.0.19-r1 b/metadata/md5-cache/dev-java/jfreechart-1.0.19-r1
index 3a42b6666764..3cbb5d01dc1b 100644
--- a/metadata/md5-cache/dev-java/jfreechart-1.0.19-r1
+++ b/metadata/md5-cache/dev-java/jfreechart-1.0.19-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-java/jfreesvg:2.1 >=dev-java/jcommon-1.0.23:1.0 java-virtuals/servle
 RESTRICT=test
 SLOT=1.0
 SRC_URI=mirror://sourceforge/jfreechart/jfreechart-1.0.19.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=b98cb85a0de0f2ad8cee7d9c164bada2
diff --git a/metadata/md5-cache/dev-java/jfreesvg-2.1-r1 b/metadata/md5-cache/dev-java/jfreesvg-2.1-r1
index fe3c253b67c8..36981e0001e1 100644
--- a/metadata/md5-cache/dev-java/jfreesvg-2.1-r1
+++ b/metadata/md5-cache/dev-java/jfreesvg-2.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2.1
 SRC_URI=mirror://sourceforge/jfreegraphics2d/jfreesvg-2.1.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=4714b5f1df8880e9936254ab9b3ddd05
diff --git a/metadata/md5-cache/dev-java/jfreesvg-3.0 b/metadata/md5-cache/dev-java/jfreesvg-3.0
index b38b39e41e98..1fa83a36df76 100644
--- a/metadata/md5-cache/dev-java/jfreesvg-3.0
+++ b/metadata/md5-cache/dev-java/jfreesvg-3.0
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=3.0
 SRC_URI=mirror://sourceforge/jfreegraphics2d/jfreesvg-3.0.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=71f1073b7bef0f744d89970c79856ecd
diff --git a/metadata/md5-cache/dev-java/jgoodies-animation-1.2.0 b/metadata/md5-cache/dev-java/jgoodies-animation-1.2.0
index 00b181f1da94..11a26aabab85 100644
--- a/metadata/md5-cache/dev-java/jgoodies-animation-1.2.0
+++ b/metadata/md5-cache/dev-java/jgoodies-animation-1.2.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.4 examples? ( x86? ( >=dev-java/jgoodies-binding-1.1 >=dev-java/jgoodies-forms-1.0 ) ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://www.jgoodies.com/download/libraries/animation-1_2_0.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=ae2582f69e745ab646ca90e478e66a34
diff --git a/metadata/md5-cache/dev-java/jgoodies-animation-1.2.0-r1 b/metadata/md5-cache/dev-java/jgoodies-animation-1.2.0-r1
index cff13e7db24d..6766e6ce1128 100644
--- a/metadata/md5-cache/dev-java/jgoodies-animation-1.2.0-r1
+++ b/metadata/md5-cache/dev-java/jgoodies-animation-1.2.0-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.4 examples? ( >=dev-java/jgoodies-binding-1.1:1.0 >=dev-java/jgoodies-forms-1.0:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://www.jgoodies.com/download/libraries/animation-1_2_0.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=b26833bb296d6db3987610d7edda18ab
diff --git a/metadata/md5-cache/dev-java/jgoodies-binding-1.1.2 b/metadata/md5-cache/dev-java/jgoodies-binding-1.1.2
index 42a83ac2a28d..95e23307117d 100644
--- a/metadata/md5-cache/dev-java/jgoodies-binding-1.1.2
+++ b/metadata/md5-cache/dev-java/jgoodies-binding-1.1.2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4.2 examples? ( >=dev-java/jgoodies-looks-1.0.5 ) >=dev-
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://www.jgoodies.com/download/libraries/binding-1_1_2.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=a9a316b3bdefdb8d8f530b0bd516f69f
diff --git a/metadata/md5-cache/dev-java/jgoodies-binding-1.1.2-r1 b/metadata/md5-cache/dev-java/jgoodies-binding-1.1.2-r1
index a1968021c575..c04f9bdec73f 100644
--- a/metadata/md5-cache/dev-java/jgoodies-binding-1.1.2-r1
+++ b/metadata/md5-cache/dev-java/jgoodies-binding-1.1.2-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4.2 examples? ( >=dev-java/jgoodies-looks-1.0.5 ) >=dev-
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://www.jgoodies.com/download/libraries/binding-1_1_2.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=94797ef6f526b52568e1bdaf61516d9b
diff --git a/metadata/md5-cache/dev-java/jgoodies-forms-1.3.0-r1 b/metadata/md5-cache/dev-java/jgoodies-forms-1.3.0-r1
index 5dc17d56864e..60f4cd85edff 100644
--- a/metadata/md5-cache/dev-java/jgoodies-forms-1.3.0-r1
+++ b/metadata/md5-cache/dev-java/jgoodies-forms-1.3.0-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://www.jgoodies.com/download/libraries/forms/forms-1_3_0.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=ecd00ae31ad557282d91909f5f299174
diff --git a/metadata/md5-cache/dev-java/jgoodies-looks-1.2.2-r2 b/metadata/md5-cache/dev-java/jgoodies-looks-1.2.2-r2
index e1ff81cd55d2..0bf7664bee17 100644
--- a/metadata/md5-cache/dev-java/jgoodies-looks-1.2.2-r2
+++ b/metadata/md5-cache/dev-java/jgoodies-looks-1.2.2-r2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1.2
 SRC_URI=http://www.jgoodies.com/download/libraries/looks-1_2_2.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=118dd3ef6cf8284fc3d00e89082c6fff
diff --git a/metadata/md5-cache/dev-java/jgoodies-looks-2.3.1-r1 b/metadata/md5-cache/dev-java/jgoodies-looks-2.3.1-r1
index 5412fbb16be3..d1d2d737c318 100644
--- a/metadata/md5-cache/dev-java/jgoodies-looks-2.3.1-r1
+++ b/metadata/md5-cache/dev-java/jgoodies-looks-2.3.1-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2.0
 SRC_URI=http://www.jgoodies.com/download/libraries/looks/looks-2_3_1.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=3f2e8e5ed7d0100f7dc9d419176eb316
diff --git a/metadata/md5-cache/dev-java/jgraph-5.12.0.4 b/metadata/md5-cache/dev-java/jgraph-5.12.0.4
index 3e4f6c7fd871..7a84db265532 100644
--- a/metadata/md5-cache/dev-java/jgraph-5.12.0.4
+++ b/metadata/md5-cache/dev-java/jgraph-5.12.0.4
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/jgraph/jgraph-5.12.0.4-lgpl-src.jar
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=0415e696aedc572105f0b005d00a4ebe
diff --git a/metadata/md5-cache/dev-java/jgrapht-0.8.3 b/metadata/md5-cache/dev-java/jgrapht-0.8.3
index f9bc0f4c58cf..4d26f642e0b5 100644
--- a/metadata/md5-cache/dev-java/jgrapht-0.8.3
+++ b/metadata/md5-cache/dev-java/jgrapht-0.8.3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-java/touchgraph-graphlayout:0 dev-java/jgraph:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/jgrapht/jgrapht-0.8.3.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=1a27818180025e86f9835b683b45b496
diff --git a/metadata/md5-cache/dev-java/jgroups-2.9.0 b/metadata/md5-cache/dev-java/jgroups-2.9.0
index 0308c879f84f..9580d2a1b322 100644
--- a/metadata/md5-cache/dev-java/jgroups-2.9.0
+++ b/metadata/md5-cache/dev-java/jgroups-2.9.0
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 dev-java/bsh:0 dev-java/log4j:0 java-virtuals/jmx >=de
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/javagroups/JGroups-2.9.0.GA.src.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=5877e0ab68eca8cac1f1e22d70cefd84
diff --git a/metadata/md5-cache/dev-java/jibx-1.1.5-r3 b/metadata/md5-cache/dev-java/jibx-1.1.5-r3
index 9700df5b31ec..1d43240e548d 100644
--- a/metadata/md5-cache/dev-java/jibx-1.1.5-r3
+++ b/metadata/md5-cache/dev-java/jibx-1.1.5-r3
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-java/bcel:0 dev-java/xpp3:0 dev-java/dom4j:1 dev-java/ant-core:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/jibx/jibx_1_1_5.zip -> jibx-1.1.5.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=fa99479b132db9e2c6b90712d3aa0e27
diff --git a/metadata/md5-cache/dev-java/jibx-tools-1.1.5-r2 b/metadata/md5-cache/dev-java/jibx-tools-1.1.5-r2
index 294e9614cf99..afad23d7e1c8 100644
--- a/metadata/md5-cache/dev-java/jibx-tools-1.1.5-r2
+++ b/metadata/md5-cache/dev-java/jibx-tools-1.1.5-r2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.6 dev-java/bcel:0 java-virtuals/stax-api:0 dev-java/jibx:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/jibx/jibx_1_1_5.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=3e3f54441022bc2033f0b5a4ae00c2a5
diff --git a/metadata/md5-cache/dev-java/jibx-tools-1.1.5-r3 b/metadata/md5-cache/dev-java/jibx-tools-1.1.5-r3
index c394c273c8e6..73b857c3cdc8 100644
--- a/metadata/md5-cache/dev-java/jibx-tools-1.1.5-r3
+++ b/metadata/md5-cache/dev-java/jibx-tools-1.1.5-r3
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.6 dev-java/bcel:0 dev-java/jibx:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/jibx/jibx_1_1_5.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=b785c49b69cf0c7ae028e9f9e8f0efb5
diff --git a/metadata/md5-cache/dev-java/jid3-0.46-r2 b/metadata/md5-cache/dev-java/jid3-0.46-r2
index 9b158133baec..945094615e8c 100644
--- a/metadata/md5-cache/dev-java/jid3-0.46-r2
+++ b/metadata/md5-cache/dev-java/jid3-0.46-r2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://jid3.blinkenlights.org/release/jid3_0.46.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=53352187f7bcf7f51fefe8b6c8453fcb
diff --git a/metadata/md5-cache/dev-java/jide-oss-3.6.12 b/metadata/md5-cache/dev-java/jide-oss-3.6.12
index 607ce6570598..f367556c3d10 100644
--- a/metadata/md5-cache/dev-java/jide-oss-3.6.12
+++ b/metadata/md5-cache/dev-java/jide-oss-3.6.12
@@ -9,5 +9,5 @@ LICENSE=GPL-2-with-exceptions
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/jidesoft/jide-oss/archive/3.6.12.tar.gz -> jide-oss-3.6.12.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=64d413126ce650453bcdcc5ac44eb1e8
diff --git a/metadata/md5-cache/dev-java/jinklevel-0.1 b/metadata/md5-cache/dev-java/jinklevel-0.1
index 24c8727ab138..4ec7c53f967c 100644
--- a/metadata/md5-cache/dev-java/jinklevel-0.1
+++ b/metadata/md5-cache/dev-java/jinklevel-0.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.5 >=net-print/libinklevel-0.8.0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://mso.googlecode.com/files/jinklevel-0.1.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=9a340f17e6370f3e25fb5c30ab3093a5
diff --git a/metadata/md5-cache/dev-java/jinput-2.0.6-r1 b/metadata/md5-cache/dev-java/jinput-2.0.6-r1
index 4ed52d8535b4..51a8980641e9 100644
--- a/metadata/md5-cache/dev-java/jinput-2.0.6-r1
+++ b/metadata/md5-cache/dev-java/jinput-2.0.6-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.4 dev-java/jutils:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/jinput/jinput/archive/790b666.tar.gz -> jinput-2.0.6.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=e2e7421d277298fc52fc9780d292d116
diff --git a/metadata/md5-cache/dev-java/jlayer-1.0.1 b/metadata/md5-cache/dev-java/jlayer-1.0.1
index 3d22fdf95a7c..d1e559571f35 100644
--- a/metadata/md5-cache/dev-java/jlayer-1.0.1
+++ b/metadata/md5-cache/dev-java/jlayer-1.0.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://www.javazoom.net/javalayer/sources/jlayer1.0.1.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=697c9f8358f9a8e065c15f737b06d951
diff --git a/metadata/md5-cache/dev-java/jline-1.0 b/metadata/md5-cache/dev-java/jline-1.0
index 23b15e938d79..7a7998c3a7f0 100644
--- a/metadata/md5-cache/dev-java/jline-1.0
+++ b/metadata/md5-cache/dev-java/jline-1.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/jline/jline-1.0.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=1bec6d8d4dbffced1500b3c372b69384
diff --git a/metadata/md5-cache/dev-java/jna-3.4.1 b/metadata/md5-cache/dev-java/jna-3.4.1
index c479b214a468..ee8711de76b1 100644
--- a/metadata/md5-cache/dev-java/jna-3.4.1
+++ b/metadata/md5-cache/dev-java/jna-3.4.1
@@ -10,5 +10,5 @@ RDEPEND=virtual/libffi >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source?
 REQUIRED_USE=test? ( awt nio-buffers )
 SLOT=0
 SRC_URI=https://github.com/twall/jna/tarball/3.4.1 -> jna-3.4.1.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=0bf1b8ef6b2eccdd25521471d09e46ee
diff --git a/metadata/md5-cache/dev-java/jna-4.2.2-r1 b/metadata/md5-cache/dev-java/jna-4.2.2-r1
index df49ddf01343..24721c15f718 100644
--- a/metadata/md5-cache/dev-java/jna-4.2.2-r1
+++ b/metadata/md5-cache/dev-java/jna-4.2.2-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=test? ( awt nio-buffers )
 RESTRICT=test
 SLOT=4
 SRC_URI=https://github.com/twall/jna/archive/4.2.2.tar.gz -> jna-4.2.2.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=919371f98032943ea0df91d486e9edaf
diff --git a/metadata/md5-cache/dev-java/jnr-constants-0.8.6 b/metadata/md5-cache/dev-java/jnr-constants-0.8.6
index f76dce46eb5a..8f87be490028 100644
--- a/metadata/md5-cache/dev-java/jnr-constants-0.8.6
+++ b/metadata/md5-cache/dev-java/jnr-constants-0.8.6
@@ -9,5 +9,5 @@ LICENSE=|| ( Apache-2.0 LGPL-3 )
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/jnr/jnr-constants/archive/jnr-constants-0.8.6.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=9243686962c9cc1bdc71e39dafbfb165
diff --git a/metadata/md5-cache/dev-java/jnr-enxio-0.7-r1 b/metadata/md5-cache/dev-java/jnr-enxio-0.7-r1
index 7f99de2040e6..75d136c0f276 100644
--- a/metadata/md5-cache/dev-java/jnr-enxio-0.7-r1
+++ b/metadata/md5-cache/dev-java/jnr-enxio-0.7-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-java/jnr-constants:0 dev-java/jnr-ffi:2 >=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/jnr/jnr-enxio/archive/0.7.tar.gz -> jnr-enxio-0.7.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=0360ef646c8255ea1ce04044b644bcff
diff --git a/metadata/md5-cache/dev-java/jnr-ffi-2.0.2 b/metadata/md5-cache/dev-java/jnr-ffi-2.0.2
index ab7b24d8ef7d..4042dfd6a327 100644
--- a/metadata/md5-cache/dev-java/jnr-ffi-2.0.2
+++ b/metadata/md5-cache/dev-java/jnr-ffi-2.0.2
@@ -9,5 +9,5 @@ LICENSE=|| ( Apache-2.0 LGPL-3 )
 RDEPEND=dev-java/jffi:1.2 dev-java/jnr-x86asm:1.0 dev-java/asm:4 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2
 SRC_URI=https://github.com/jnr/jnr-ffi/archive/2.0.2.tar.gz -> jnr-ffi-2.0.2.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=faff1779f73f0b98ba3ba3099804757b
diff --git a/metadata/md5-cache/dev-java/jnr-netdb-1.1.4 b/metadata/md5-cache/dev-java/jnr-netdb-1.1.4
index e934fc83b442..f29998a39f85 100644
--- a/metadata/md5-cache/dev-java/jnr-netdb-1.1.4
+++ b/metadata/md5-cache/dev-java/jnr-netdb-1.1.4
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-java/jnr-ffi:2 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1.0
 SRC_URI=https://github.com/jnr/jnr-netdb/archive/1.1.4.tar.gz -> jnr-netdb-1.1.4.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=803a3b7c5b99814db1ba91503f0cde57
diff --git a/metadata/md5-cache/dev-java/jnr-posix-3.0.10 b/metadata/md5-cache/dev-java/jnr-posix-3.0.10
index 43008fee83c1..6b7f7fa85bce 100644
--- a/metadata/md5-cache/dev-java/jnr-posix-3.0.10
+++ b/metadata/md5-cache/dev-java/jnr-posix-3.0.10
@@ -9,5 +9,5 @@ LICENSE=|| ( CPL-1.0 GPL-2 LGPL-2.1 )
 RDEPEND=dev-java/jnr-constants:0 dev-java/jnr-ffi:2 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=3.0
 SRC_URI=https://github.com/jnr/jnr-posix/archive/3.0.10.tar.gz -> jnr-posix-3.0.10.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=a51f761d28c7f4af6d0038aa4b0dc1f0
diff --git a/metadata/md5-cache/dev-java/jnr-unixsocket-0.6-r1 b/metadata/md5-cache/dev-java/jnr-unixsocket-0.6-r1
index a11703684dd5..3164fd512644 100644
--- a/metadata/md5-cache/dev-java/jnr-unixsocket-0.6-r1
+++ b/metadata/md5-cache/dev-java/jnr-unixsocket-0.6-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-java/jnr-constants:0 dev-java/jnr-enxio:0 dev-java/jnr-posix:3.0 dev-java/jnr-ffi:2 >=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/jnr/jnr-unixsocket/archive/0.6.tar.gz -> jnr-unixsocket-0.6.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=7836e09796f994737a1d4ea8bd46cd86
diff --git a/metadata/md5-cache/dev-java/joda-convert-1.3.1 b/metadata/md5-cache/dev-java/joda-convert-1.3.1
index 8e168c43a56f..73fd8a449832 100644
--- a/metadata/md5-cache/dev-java/joda-convert-1.3.1
+++ b/metadata/md5-cache/dev-java/joda-convert-1.3.1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/joda-convert/joda-convert-1.3.1-dist.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=ab500aadb8005badef0d7beaa9e949d1
diff --git a/metadata/md5-cache/dev-java/joda-time-2.7 b/metadata/md5-cache/dev-java/joda-time-2.7
index e69de9de6874..9a67f8ea3305 100644
--- a/metadata/md5-cache/dev-java/joda-time-2.7
+++ b/metadata/md5-cache/dev-java/joda-time-2.7
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/JodaOrg/joda-time/releases/download/v2.7/joda-time-2.7-dist.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=c4df77829ce5df2a9a8d4cac94369ef8
diff --git a/metadata/md5-cache/dev-java/joni-2.1.0 b/metadata/md5-cache/dev-java/joni-2.1.0
index f577de355616..9e125984faaf 100644
--- a/metadata/md5-cache/dev-java/joni-2.1.0
+++ b/metadata/md5-cache/dev-java/joni-2.1.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=dev-java/asm:3 dev-java/jcodings:1 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2.1
 SRC_URI=https://github.com/jruby/joni/archive/joni-2.1.0.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=c448987ebf1f7d35ecfb0424e5bda500
diff --git a/metadata/md5-cache/dev-java/jreleaseinfo-1.3.0-r2 b/metadata/md5-cache/dev-java/jreleaseinfo-1.3.0-r2
index 318c284e7116..e0ab22b9703c 100644
--- a/metadata/md5-cache/dev-java/jreleaseinfo-1.3.0-r2
+++ b/metadata/md5-cache/dev-java/jreleaseinfo-1.3.0-r2
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.4 dev-java/ant-core:0 >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=mirror://sourceforge/jreleaseinfo/jreleaseinfo-1.3.0-src.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=e2ca4a4d61d2b2c2714a757df3476b03
diff --git a/metadata/md5-cache/dev-java/jsch-0.1.52 b/metadata/md5-cache/dev-java/jsch-0.1.52
index 85b49caaf95f..5f658c8b745d 100644
--- a/metadata/md5-cache/dev-java/jsch-0.1.52
+++ b/metadata/md5-cache/dev-java/jsch-0.1.52
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.6 zlib? ( dev-java/jzlib:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/jsch/jsch-0.1.52.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-osgi	c90eda970384b702459d01fc288d647d	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-osgi	c90eda970384b702459d01fc288d647d	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=388aee91bb439932e3d6119eec56d2bc
diff --git a/metadata/md5-cache/dev-java/jsch-0.1.54 b/metadata/md5-cache/dev-java/jsch-0.1.54
index 0decc4db11f6..83f1545a3290 100644
--- a/metadata/md5-cache/dev-java/jsch-0.1.54
+++ b/metadata/md5-cache/dev-java/jsch-0.1.54
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=zlib? ( dev-java/jzlib:0 ) >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/jsch/jsch-0.1.54.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-osgi	c90eda970384b702459d01fc288d647d	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-osgi	c90eda970384b702459d01fc288d647d	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=62a48900a7e715daf9d53227483039a8
diff --git a/metadata/md5-cache/dev-java/json-simple-1.1 b/metadata/md5-cache/dev-java/json-simple-1.1
index 1d0773dfc013..65306678300c 100644
--- a/metadata/md5-cache/dev-java/json-simple-1.1
+++ b/metadata/md5-cache/dev-java/json-simple-1.1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://json-simple.googlecode.com/files/json_simple-1.1-all.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=b7585ec9702be2db29e50089cb7f23e5
diff --git a/metadata/md5-cache/dev-java/jspeex-0.9.7-r1 b/metadata/md5-cache/dev-java/jspeex-0.9.7-r1
index 9c3e8d37d175..b60617cbed19 100644
--- a/metadata/md5-cache/dev-java/jspeex-0.9.7-r1
+++ b/metadata/md5-cache/dev-java/jspeex-0.9.7-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-java/ant-core:0 >=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/jspeex/jspeex-0.9.7.zip
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=6745b09076c63f6a7d8ea94ce90e3b90
diff --git a/metadata/md5-cache/dev-java/jstun-0.7.3 b/metadata/md5-cache/dev-java/jstun-0.7.3
index 8f166520c1ea..6a6f2bc875db 100644
--- a/metadata/md5-cache/dev-java/jstun-0.7.3
+++ b/metadata/md5-cache/dev-java/jstun-0.7.3
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 dev-java/slf4j-api:0 >=dev-java/java-config-2.2.0-r3 s
 RESTRICT=test
 SLOT=0
 SRC_URI=http://jstun.javawi.de/jstun-0.7.3.src.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=fab3417b6d18672ed5466c0d202dae97
diff --git a/metadata/md5-cache/dev-java/jtidy-1.0 b/metadata/md5-cache/dev-java/jtidy-1.0
index 3cd863722b8b..f6d2938d2d0f 100644
--- a/metadata/md5-cache/dev-java/jtidy-1.0
+++ b/metadata/md5-cache/dev-java/jtidy-1.0
@@ -9,5 +9,5 @@ LICENSE=HTML-Tidy W3C
 RDEPEND=dev-java/ant-core:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/jtidy/jtidy-r938-sources.zip -> jtidy-1.0.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=520505db054e83f36b44f002f2dd3c9c
diff --git a/metadata/md5-cache/dev-java/jung-1.7.6 b/metadata/md5-cache/dev-java/jung-1.7.6
index eeb3d5630b41..a9b33e00d873 100644
--- a/metadata/md5-cache/dev-java/jung-1.7.6
+++ b/metadata/md5-cache/dev-java/jung-1.7.6
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.4 dev-java/colt:0 dev-java/commons-collections >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/jung/jung-1.7.6.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=4d2b2df627c3d84b09a90bf709dd91ef
diff --git a/metadata/md5-cache/dev-java/junit-3.8.2-r1 b/metadata/md5-cache/dev-java/junit-3.8.2-r1
index b95c962783bb..bba9aed3a6a7 100644
--- a/metadata/md5-cache/dev-java/junit-3.8.2-r1
+++ b/metadata/md5-cache/dev-java/junit-3.8.2-r1
@@ -9,5 +9,5 @@ LICENSE=CPL-1.0
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/junit/junit3.8.2.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=207c59d3bcee8b9778125ce892cbe528
diff --git a/metadata/md5-cache/dev-java/junit-addons-1.4-r1 b/metadata/md5-cache/dev-java/junit-addons-1.4-r1
index 98483c7a7bb4..bb5ba61e3ef7 100644
--- a/metadata/md5-cache/dev-java/junit-addons-1.4-r1
+++ b/metadata/md5-cache/dev-java/junit-addons-1.4-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-1.1
 RDEPEND=>=virtual/jre-1.4 dev-java/junit:0 dev-java/ant-core:0 dev-java/jdom:0 dev-java/jaxen:1.1 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/junit-addons/junit-addons-1.4.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=92f017acf1d126d5277af68859f28704
diff --git a/metadata/md5-cache/dev-java/junitperf-1.9.1-r2 b/metadata/md5-cache/dev-java/junitperf-1.9.1-r2
index 023c8c7460e5..8e1b96cc81cf 100644
--- a/metadata/md5-cache/dev-java/junitperf-1.9.1-r2
+++ b/metadata/md5-cache/dev-java/junitperf-1.9.1-r2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-java/junit:4 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://www.clarkware.com/software/junitperf-1.9.1.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=bcdd52d3492989c8a5e6e954344697a0
diff --git a/metadata/md5-cache/dev-java/jupidator-0.6.0 b/metadata/md5-cache/dev-java/jupidator-0.6.0
index e9c69d65268f..f18bff96a2a6 100644
--- a/metadata/md5-cache/dev-java/jupidator-0.6.0
+++ b/metadata/md5-cache/dev-java/jupidator-0.6.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-3
 RDEPEND=>=virtual/jre-1.5 dev-java/ant-core >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/jupidator/jupidator.0.6.0.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=e0769396ba4595000b478417c029c4a1
diff --git a/metadata/md5-cache/dev-java/jvyamlb-0.2.5 b/metadata/md5-cache/dev-java/jvyamlb-0.2.5
index cc846354e898..3b9c5921f3c6 100644
--- a/metadata/md5-cache/dev-java/jvyamlb-0.2.5
+++ b/metadata/md5-cache/dev-java/jvyamlb-0.2.5
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/jre-1.4 dev-java/bytelist:0 dev-java/jcodings:0 dev-java/joda-time:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://jvyamlb.googlecode.com/files/jvyamlb-src-0.2.5.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=168c481bd14a9d383d53ab6f6025165e
diff --git a/metadata/md5-cache/dev-java/jython-2.7.0-r2 b/metadata/md5-cache/dev-java/jython-2.7.0-r2
index 2479550c1bda..f08f54b8e240 100644
--- a/metadata/md5-cache/dev-java/jython-2.7.0-r2
+++ b/metadata/md5-cache/dev-java/jython-2.7.0-r2
@@ -10,5 +10,5 @@ RDEPEND=dev-java/antlr:3 dev-java/netty-transport:0 >=dev-java/asm-5:4 dev-java/
 RESTRICT=test
 SLOT=2.7
 SRC_URI=http://search.maven.org/remotecontent?filepath=org/python/jython/2.7.0/jython-2.7.0-sources.jar
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=1a4cb72bf1af61c6e0d5bbb5b792314e
diff --git a/metadata/md5-cache/dev-java/kxml-2.3.0 b/metadata/md5-cache/dev-java/kxml-2.3.0
index 47d7549f1dbf..3587b7aac96d 100644
--- a/metadata/md5-cache/dev-java/kxml-2.3.0
+++ b/metadata/md5-cache/dev-java/kxml-2.3.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-java/xpp3:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2
 SRC_URI=mirror://sourceforge/kxml/kxml2-src-2.3.0.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=e7c066dba1d92c3e7a4749ad3fe5846c
diff --git a/metadata/md5-cache/dev-java/l2fprod-common-7.3-r2 b/metadata/md5-cache/dev-java/l2fprod-common-7.3-r2
index 8ae42ef322fc..a9860dc9980e 100644
--- a/metadata/md5-cache/dev-java/l2fprod-common-7.3-r2
+++ b/metadata/md5-cache/dev-java/l2fprod-common-7.3-r2
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.4 dev-java/nachocalendar:0 dev-java/jcalendar:1.2 >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=mirror://gentoo/l2fprod-common-7.3.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=96acb5be1c0702ec59ce26a1d3869499
diff --git a/metadata/md5-cache/dev-java/ldapsdk-4.1.7-r4 b/metadata/md5-cache/dev-java/ldapsdk-4.1.7-r4
index 82c08a89331f..66a9b72e5014 100644
--- a/metadata/md5-cache/dev-java/ldapsdk-4.1.7-r4
+++ b/metadata/md5-cache/dev-java/ldapsdk-4.1.7-r4
@@ -9,5 +9,5 @@ LICENSE=MPL-1.1
 RDEPEND=>=virtual/jre-1.4 dev-java/jss:3.4 dev-java/jakarta-oro:2.0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=4.1
 SRC_URI=http://www.mozilla.org/directory/ldapsdk_java_20020819.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=0d84497b79bbdb7d72722bc7368b1e96
diff --git a/metadata/md5-cache/dev-java/libg-2.1.0-r1 b/metadata/md5-cache/dev-java/libg-2.1.0-r1
index a1a332cce6f9..f6b0995ca899 100644
--- a/metadata/md5-cache/dev-java/libg-2.1.0-r1
+++ b/metadata/md5-cache/dev-java/libg-2.1.0-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/bndtools/bnd/archive/2.1.0.REL.tar.gz -> bndlib-2.1.0.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=cce0dc87133c79e2f85f024fae178440
diff --git a/metadata/md5-cache/dev-java/libmso-0.1 b/metadata/md5-cache/dev-java/libmso-0.1
index afada497bb99..d5de42e7ffba 100644
--- a/metadata/md5-cache/dev-java/libmso-0.1
+++ b/metadata/md5-cache/dev-java/libmso-0.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.5 sys-apps/hwinfo dev-java/jinklevel:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://mso.googlecode.com/files/libmso-0.1.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=a9442b7a04d404a9bc4937e4fa182545
diff --git a/metadata/md5-cache/dev-java/log4j-1.2.17-r3 b/metadata/md5-cache/dev-java/log4j-1.2.17-r3
index 4293ba1f6fa6..a9145712e83b 100644
--- a/metadata/md5-cache/dev-java/log4j-1.2.17-r3
+++ b/metadata/md5-cache/dev-java/log4j-1.2.17-r3
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=javamail? ( dev-java/oracle-javamail:0 ) jms? ( java-virtuals/jms:0 ) >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/logging/log4j/1.2.17/log4j-1.2.17.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=66d90dc74f7d4926fa36a95e204d2ba4
diff --git a/metadata/md5-cache/dev-java/logback-1.0.13-r1 b/metadata/md5-cache/dev-java/logback-1.0.13-r1
index c0c63b2ca00f..5ce90c8a3cf7 100644
--- a/metadata/md5-cache/dev-java/logback-1.0.13-r1
+++ b/metadata/md5-cache/dev-java/logback-1.0.13-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( EPL-1.0 LGPL-2.1 )
 RDEPEND=dev-java/jansi:0 dev-java/janino:0 dev-java/slf4j-api:0 dev-java/oracle-javamail:0 java-virtuals/servlet-api:3.0 tomcat? ( www-servers/tomcat:7 ) >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://logback.qos.ch/dist/logback-1.0.13.tar.gz https://dev.gentoo.org/~ercpe/distfiles/dev-java/logback/logback-1.0.13-build.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=f8af4f480ef4f6df4c26d77c81222b4a
diff --git a/metadata/md5-cache/dev-java/lucene-1.4.3-r4 b/metadata/md5-cache/dev-java/lucene-1.4.3-r4
index 68b52c4c4b18..e463c752501d 100644
--- a/metadata/md5-cache/dev-java/lucene-1.4.3-r4
+++ b/metadata/md5-cache/dev-java/lucene-1.4.3-r4
@@ -9,5 +9,5 @@ LICENSE=Apache-1.1
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1
 SRC_URI=mirror://apache/lucene/java/archive/lucene-1.4.3-src.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=f68b71512f67de7b10707b67e5d558b1
diff --git a/metadata/md5-cache/dev-java/lucene-2.4.1-r2 b/metadata/md5-cache/dev-java/lucene-2.4.1-r2
index 6943d92fb954..23d6a8b14d8b 100644
--- a/metadata/md5-cache/dev-java/lucene-2.4.1-r2
+++ b/metadata/md5-cache/dev-java/lucene-2.4.1-r2
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-java/javacc:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2.4
 SRC_URI=https://archive.apache.org/dist/lucene/java/lucene-2.4.1-src.tar.gz -> lucene-2.4.1.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=90c28a55e0a841c1e994c75b1a02d31e
diff --git a/metadata/md5-cache/dev-java/lucene-3.5.0-r1 b/metadata/md5-cache/dev-java/lucene-3.5.0-r1
index 7646e9ef5f67..090f89cd94dc 100644
--- a/metadata/md5-cache/dev-java/lucene-3.5.0-r1
+++ b/metadata/md5-cache/dev-java/lucene-3.5.0-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-java/junit:4 dev-java/ant-junit:0 dev-java/ant-nodeps:0 contrib? ( d
 RESTRICT=test
 SLOT=3.5
 SRC_URI=mirror://apache/lucene/java/3.5.0/lucene-3.5.0-src.tgz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=93d18340437e30a0ec2ac0b870151fda
diff --git a/metadata/md5-cache/dev-java/lucene-3.5.0-r2 b/metadata/md5-cache/dev-java/lucene-3.5.0-r2
index 466d027a98a9..31cbcac9f12e 100644
--- a/metadata/md5-cache/dev-java/lucene-3.5.0-r2
+++ b/metadata/md5-cache/dev-java/lucene-3.5.0-r2
@@ -10,5 +10,5 @@ RDEPEND=dev-java/junit:4 dev-java/ant-junit:0 dev-java/ant-core:0 contrib? ( dev
 RESTRICT=test
 SLOT=3.5
 SRC_URI=mirror://apache/lucene/java/3.5.0/lucene-3.5.0-src.tgz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=692d0922972c755c539251d79ea8caa9
diff --git a/metadata/md5-cache/dev-java/lucene-3.6.2-r1 b/metadata/md5-cache/dev-java/lucene-3.6.2-r1
index 22e4814832b5..eeb4b09ce42d 100644
--- a/metadata/md5-cache/dev-java/lucene-3.6.2-r1
+++ b/metadata/md5-cache/dev-java/lucene-3.6.2-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-java/ant-ivy:2 dev-java/ant-junit:0 dev-java/ant-nodeps:0 dev-java/h
 RESTRICT=test
 SLOT=3.6
 SRC_URI=mirror://apache/lucene/java/3.6.2/lucene-3.6.2-src.tgz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=0073a120b71a9fdd968874c81086ff6f
diff --git a/metadata/md5-cache/dev-java/lucene-3.6.2-r2 b/metadata/md5-cache/dev-java/lucene-3.6.2-r2
index e0ca72474ac5..279c8898e73e 100644
--- a/metadata/md5-cache/dev-java/lucene-3.6.2-r2
+++ b/metadata/md5-cache/dev-java/lucene-3.6.2-r2
@@ -10,5 +10,5 @@ RDEPEND=dev-java/ant-ivy:2 dev-java/ant-junit:0 dev-java/ant-core:0 dev-java/ham
 RESTRICT=test
 SLOT=3.6
 SRC_URI=mirror://apache/lucene/java/3.6.2/lucene-3.6.2-src.tgz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=94e5d96c69561ac78e993344c8a5198e
diff --git a/metadata/md5-cache/dev-java/lucene-analyzers-1.9.1-r1 b/metadata/md5-cache/dev-java/lucene-analyzers-1.9.1-r1
index 7a47a4577985..f5d05183f2e3 100644
--- a/metadata/md5-cache/dev-java/lucene-analyzers-1.9.1-r1
+++ b/metadata/md5-cache/dev-java/lucene-analyzers-1.9.1-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1.9
 SRC_URI=mirror://apache/lucene/java/lucene-1.9.1-src.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-osgi	c90eda970384b702459d01fc288d647d	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-osgi	c90eda970384b702459d01fc288d647d	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=7b7b03a8bc534e24a1c464f0c77b9216
diff --git a/metadata/md5-cache/dev-java/lucene-analyzers-2.3.2 b/metadata/md5-cache/dev-java/lucene-analyzers-2.3.2
index e9b32cb5f8d3..cd5656e9edb5 100644
--- a/metadata/md5-cache/dev-java/lucene-analyzers-2.3.2
+++ b/metadata/md5-cache/dev-java/lucene-analyzers-2.3.2
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2.3
 SRC_URI=mirror://apache/lucene/java/lucene-2.3.2-src.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-osgi	c90eda970384b702459d01fc288d647d	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-osgi	c90eda970384b702459d01fc288d647d	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=dea4a8cf969d166a15d9445f71833687
diff --git a/metadata/md5-cache/dev-java/matrix-toolkits-java-0.9.12 b/metadata/md5-cache/dev-java/matrix-toolkits-java-0.9.12
index 274dc37564ec..95cf2c574c2e 100644
--- a/metadata/md5-cache/dev-java/matrix-toolkits-java-0.9.12
+++ b/metadata/md5-cache/dev-java/matrix-toolkits-java-0.9.12
@@ -9,5 +9,5 @@ LICENSE=LGPL-3
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=https://matrix-toolkits-java.googlecode.com/files/mtj-0.9.12.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=e5a6ebd9d52ce99ea89fd7d74cb7ad47
diff --git a/metadata/md5-cache/dev-java/metainf-services-1.6 b/metadata/md5-cache/dev-java/metainf-services-1.6
index 86dc12d0c80e..09469e2fa1a6 100644
--- a/metadata/md5-cache/dev-java/metainf-services-1.6
+++ b/metadata/md5-cache/dev-java/metainf-services-1.6
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=https://github.com/kohsuke/metainf-services/archive/metainf-services-1.6.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=f79e64abbaca065377eea9c82b583245
diff --git a/metadata/md5-cache/dev-java/metainf-services-1.7 b/metadata/md5-cache/dev-java/metainf-services-1.7
index 11de6b76f643..b8879de9bc1a 100644
--- a/metadata/md5-cache/dev-java/metainf-services-1.7
+++ b/metadata/md5-cache/dev-java/metainf-services-1.7
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=https://github.com/kohsuke/metainf-services/archive/metainf-services-1.7.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=0f3ab79241926a177e59063f163ace6d
diff --git a/metadata/md5-cache/dev-java/mimepull-1.8 b/metadata/md5-cache/dev-java/mimepull-1.8
index b63c74fc29ed..b7ff828e938e 100644
--- a/metadata/md5-cache/dev-java/mimepull-1.8
+++ b/metadata/md5-cache/dev-java/mimepull-1.8
@@ -9,5 +9,5 @@ LICENSE=CDDL
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~sera/distfiles/mimepull-1.8.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=b1cbce45f7451cc7c12d9dd11583db98
diff --git a/metadata/md5-cache/dev-java/nailgun-0.7.1-r1 b/metadata/md5-cache/dev-java/nailgun-0.7.1-r1
index 201cbcf8e080..c5f7a426a8f9 100644
--- a/metadata/md5-cache/dev-java/nailgun-0.7.1-r1
+++ b/metadata/md5-cache/dev-java/nailgun-0.7.1-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 !app-editors/ng >=dev-java/java-config-2.2.0-r3 source
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/nailgun/nailgun-src-0.7.1.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=cdf3707f6b792e4a839a75d7ac112f8d
diff --git a/metadata/md5-cache/dev-java/nekohtml-1.9.18-r1 b/metadata/md5-cache/dev-java/nekohtml-1.9.18-r1
index a65b276cdf34..507a3515a395 100644
--- a/metadata/md5-cache/dev-java/nekohtml-1.9.18-r1
+++ b/metadata/md5-cache/dev-java/nekohtml-1.9.18-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.4 >=dev-java/xerces-2.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/nekohtml/nekohtml-1.9.18.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=10cbb9ff7c8cb8442faec9a992af7263
diff --git a/metadata/md5-cache/dev-java/netbeans-apisupport-8.2 b/metadata/md5-cache/dev-java/netbeans-apisupport-8.2
index 908a4365b001..90bc5185c4c4 100644
--- a/metadata/md5-cache/dev-java/netbeans-apisupport-8.2
+++ b/metadata/md5-cache/dev-java/netbeans-apisupport-8.2
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=virtual/jdk:1.8 ~dev-java/netbeans-extide-8.2 ~dev-java/netbeans-harness-8.2 ~dev-java/netbeans-ide-8.2 ~dev-java/netbeans-java-8.2 ~dev-java/netbeans-platform-8.2 >=dev-java/java-config-2.2.0-r3
 SLOT=8.2
 SRC_URI=http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=b3b4d97460684746f008028c0cd6a336
diff --git a/metadata/md5-cache/dev-java/netbeans-cnd-8.2 b/metadata/md5-cache/dev-java/netbeans-cnd-8.2
index 55d32d9f0850..99375940794b 100644
--- a/metadata/md5-cache/dev-java/netbeans-cnd-8.2
+++ b/metadata/md5-cache/dev-java/netbeans-cnd-8.2
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=virtual/jdk:1.8 ~dev-java/netbeans-dlight-8.2 ~dev-java/netbeans-harness-8.2 ~dev-java/netbeans-ide-8.2 ~dev-java/netbeans-platform-8.2 >=dev-java/java-config-2.2.0-r3
 SLOT=8.2
 SRC_URI=http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2 http://hg.netbeans.org/binaries/5CAB59D859CAA6598E28131D30DD2E89806DB57F-antlr-3.4.jar http://hg.netbeans.org/binaries/4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar http://hg.netbeans.org/binaries/F20EEEDF4FE6B93B180387576FB780EED9F79C66-clank_0.3.9.zip http://hg.netbeans.org/binaries/43A82EB3CE61B9B0B1C60586C7D84729BD5BE3E0-cnd-build-trace-1.0.zip http://hg.netbeans.org/binaries/E59851B0E49C05D728D5C653E52750FA5B6A8F0E-cnd-rfs-1.0.zip http://hg.netbeans.org/binaries/C51780D99464CBF45B0495C7646B442AB3C7B463-open-fortran-parser-0.7.1.2.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=014c1be7dd85ab43536904d8a431504d
diff --git a/metadata/md5-cache/dev-java/netbeans-dlight-8.2 b/metadata/md5-cache/dev-java/netbeans-dlight-8.2
index f1b0f6ddc52c..5f6f98a5fd75 100644
--- a/metadata/md5-cache/dev-java/netbeans-dlight-8.2
+++ b/metadata/md5-cache/dev-java/netbeans-dlight-8.2
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=virtual/jdk:1.8 ~dev-java/netbeans-ide-8.2 ~dev-java/netbeans-platform-8.2 >=dev-java/java-config-2.2.0-r3
 SLOT=8.2
 SRC_URI=http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2 http://hg.netbeans.org/binaries/18E39A0D10357B72EDB76F2070E27019317792F1-fs_server-1.0.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=16a6d0b47ec391fcd8d3478562aa2be9
diff --git a/metadata/md5-cache/dev-java/netbeans-enterprise-8.2-r1 b/metadata/md5-cache/dev-java/netbeans-enterprise-8.2-r1
index 9cba596c6fab..0dcb8ec9579c 100644
--- a/metadata/md5-cache/dev-java/netbeans-enterprise-8.2-r1
+++ b/metadata/md5-cache/dev-java/netbeans-enterprise-8.2-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=virtual/jdk:1.8 ~dev-java/netbeans-ide-8.2 ~dev-java/netbeans-harness-8.2 ~dev-java/netbeans-ide-8.2 ~dev-java/netbeans-java-8.2 ~dev-java/netbeans-profiler-8.2 ~dev-java/netbeans-platform-8.2 ~dev-java/netbeans-webcommon-8.2 ~dev-java/netbeans-websvccommon-8.2 dev-java/commons-codec:0 dev-java/commons-fileupload:0 dev-java/commons-logging:0 dev-java/glassfish-deployment-api:1.2 dev-java/jsr181:0 >=dev-java/antlr-2.7.7-r7:0 dev-java/bsf:2.3 dev-java/cglib:3 dev-java/commons-beanutils:1.7 dev-java/commons-collections:0 dev-java/commons-digester:0 dev-java/commons-io:1 dev-java/commons-validator:0 dev-java/glassfish-persistence:0 dev-java/guava:20 dev-java/jakarta-oro:2.0 dev-java/osgi-core-api:0 dev-java/validation-api:1.0 >=dev-java/java-config-2.2.0-r3
 SLOT=8.2
 SRC_URI=http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2 http://hg.netbeans.org/binaries/8BFEBCD4B39B87BBE788B4EECED068C8DBE75822-aws-java-sdk-1.2.1.jar http://hg.netbeans.org/binaries/BA8A45A96AFE07D914DE153E0BB137DCDC7734F6-el-impl.jar http://hg.netbeans.org/binaries/33B0D0945555A06B74931DEACF9DB1A4AE2A3EC4-glassfish-jspparser-4.0.jar http://hg.netbeans.org/binaries/D813E05A06B587CD0FE36B00442EAB03C1431AA9-glassfish-logging-2.0.jar http://hg.netbeans.org/binaries/3D74BFB229C259E2398F2B383D5425CB81C643F0-httpclient-4.1.1.jar http://hg.netbeans.org/binaries/33FC26C02F8043AB0EDE19EADC8C9885386B255C-httpcore-4.1.jar http://hg.netbeans.org/binaries/D6F416983EA13C334D5C599A9045414ECAF5D66D-javaee-api-6.0.jar http://hg.netbeans.org/binaries/51399F902CC27A808122EDCBEBFAA1AD989954BA-javaee-api-7.0.jar http://hg.netbeans.org/binaries/EBEC44255251E6D3B8DDBAF701F732DAF0238CBF-javaee-web-api-6.0.jar http://hg.netbeans.org/binaries/B1FCE45BA94108EBF7E1CACE6427EC8761CABEC1-javaee-web-api-7.0.jar http://hg.netbeans.org/binaries/27E9711AA35C39EF455BFD900D544BACB99C0E89-javaee-doc-api.jar http://hg.netbeans.org/binaries/B290091E71DEED6CE7F9EB40523D49C26399A2B4-javax.annotation.jar http://hg.netbeans.org/binaries/1DEEA980904E39C3D7AA240B72CDBBEB8E4860F9-javax.annotation-api.jar http://hg.netbeans.org/binaries/E11C0F07A92F6D02A347DD9C55EE56692A6D9F7E-javax.xml.soap-api.jar http://hg.netbeans.org/binaries/EB77D3664EEA27D67B799ED28CB766B4D0971505-jaxb-api-osgi.jar http://hg.netbeans.org/binaries/45EBA8B0520A70787D5DD2EA154ACE152F817C0D-jaxb-api-osgi.jar http://hg.netbeans.org/binaries/C614ECF62381F88208D66D96146A8307781058DB-jaxrs-ri-2.5.1.zip http://hg.netbeans.org/binaries/D4C96D968F87B1BFEF138E91E06C8FD4A1904208-jaxws-api.jar http://hg.netbeans.org/binaries/B9DB1A789C301F1D31DD6CC524DA2EBD7F89190D-jsf-1.2.zip http://hg.netbeans.org/binaries/99277566601C4D5C2598B0206B5DC071932F3641-jsf-2.2.zip http://hg.netbeans.org/binaries/93A58E37BA1D014375B1578F3D904736CB2D408F-jsf-api-docs.zip http://hg.netbeans.org/binaries/F072F63AB1689E885AC40C221DF3E6BB3E64A84A-jstl-api.jar http://hg.netbeans.org/binaries/5B2E83EF42B4EEF0A7E41D43BB1D4B835F59AC7A-jstl-impl.jar http://hg.netbeans.org/binaries/FDECFB78184C7D19E7E20130A7D7E88C1DF0BDD1-metro-1.4-doc.zip http://hg.netbeans.org/binaries/F05AE8173BC750ECF1B52AD1F80050226458E490-metro-2.0.zip http://hg.netbeans.org/binaries/065BDCE80509320280B3B5210FCDDAE9B7D50338-primefaces-5.0.jar http://hg.netbeans.org/binaries/68C97A238A2143B616879E8C1EF5BF01EA25B11E-servlet3.1-jsp2.3-api.jar http://hg.netbeans.org/binaries/9319FDBED11E0D2EB03E4BB9E94BAA439A1DA469-struts-1.3.10-javadoc.zip http://hg.netbeans.org/binaries/9E226CFC08177A6666E5A2C535C25837A92C54C9-struts-1.3.10-lib.zip http://hg.netbeans.org/binaries/F6E990DF59BD1FD2058320002A853A5411A45CD4-syntaxref20.zip http://hg.netbeans.org/binaries/A5744971ACE1F44A0FC71CCB93DE530CB3022965-webservices-api-osgi.jar
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=f08fc0dedc45fedd32172ddf00737c8d
diff --git a/metadata/md5-cache/dev-java/netbeans-ergonomics-8.2 b/metadata/md5-cache/dev-java/netbeans-ergonomics-8.2
index daf91fb00abd..538012e14ec5 100644
--- a/metadata/md5-cache/dev-java/netbeans-ergonomics-8.2
+++ b/metadata/md5-cache/dev-java/netbeans-ergonomics-8.2
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=virtual/jdk:1.8 ~dev-java/netbeans-ide-8.2 ~dev-java/netbeans-nb-8.2 ~dev-java/netbeans-platform-8.2 >=dev-java/java-config-2.2.0-r3
 SLOT=8.2
 SRC_URI=http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=5963149972fe9ae54c22a227f5a339f1
diff --git a/metadata/md5-cache/dev-java/netbeans-extide-8.2 b/metadata/md5-cache/dev-java/netbeans-extide-8.2
index 23f7711e83ef..99df77834d3c 100644
--- a/metadata/md5-cache/dev-java/netbeans-extide-8.2
+++ b/metadata/md5-cache/dev-java/netbeans-extide-8.2
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=virtual/jdk:1.8 ~dev-java/netbeans-ide-8.2 ~dev-java/netbeans-platform-8.2 >=dev-java/java-config-2.2.0-r3
 SLOT=8.2
 SRC_URI=http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2 http://hg.netbeans.org/binaries/BEA15848D713D491C6EBA1307E0564A5BC3965E7-ant-libs-1.9.7.zip http://hg.netbeans.org/binaries/545E2B7AB1BD579CC76E3836055877982C5CD0C6-ant-misc-1.9.7.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=fc7728d446230609034ec09aa8d4fd90
diff --git a/metadata/md5-cache/dev-java/netbeans-groovy-8.2 b/metadata/md5-cache/dev-java/netbeans-groovy-8.2
index d96394960d42..97e2189b803d 100644
--- a/metadata/md5-cache/dev-java/netbeans-groovy-8.2
+++ b/metadata/md5-cache/dev-java/netbeans-groovy-8.2
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=virtual/jdk:1.8 ~dev-java/netbeans-extide-8.2 ~dev-java/netbeans-ide-8.2 ~dev-java/netbeans-java-8.2 ~dev-java/netbeans-platform-8.2 >=dev-java/java-config-2.2.0-r3
 SLOT=8.2
 SRC_URI=http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2 http://hg.netbeans.org/binaries/01730F61E9C9E59FD1B814371265334D7BE0B8D2-groovy-all-2.4.5.jar
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=678283e68dd260cf13c09d484961e0a8
diff --git a/metadata/md5-cache/dev-java/netbeans-harness-8.2 b/metadata/md5-cache/dev-java/netbeans-harness-8.2
index 016d7824571b..91deec341a1d 100644
--- a/metadata/md5-cache/dev-java/netbeans-harness-8.2
+++ b/metadata/md5-cache/dev-java/netbeans-harness-8.2
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=virtual/jdk:1.8 ~dev-java/netbeans-platform-8.2 dev-java/javahelp:0 >=dev-java/java-config-2.2.0-r3
 SLOT=8.2
 SRC_URI=http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2 http://hg.netbeans.org/binaries/A806D99716C5E9441BFD8B401176FDDEFC673022-bindex-2.2.jar http://hg.netbeans.org/binaries/D325D3913CBC0F9A8D73A466FABB98EDEEC014AB-jemmy-2.3.1.1.jar http://hg.netbeans.org/binaries/D06C8980C9025183C044202419EA29E69FBD4B99-jemmy-2.3.1.1-doc.zip http://hg.netbeans.org/binaries/49197106637CCA8C337AF16CC01BB5D9DEC7E179-jemmy-2.3.1.1-src.zip http://hg.netbeans.org/binaries/20D826CC819A5A969CF3F7204E2E26CB6263EC43-jnlp-servlet.jar
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=0c2c58efe902cd24c46db83dddc97713
diff --git a/metadata/md5-cache/dev-java/netbeans-ide-8.2 b/metadata/md5-cache/dev-java/netbeans-ide-8.2
index 8ef499e23901..395b064ade43 100644
--- a/metadata/md5-cache/dev-java/netbeans-ide-8.2
+++ b/metadata/md5-cache/dev-java/netbeans-ide-8.2
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=virtual/jdk:1.8 ~dev-java/netbeans-harness-8.2 ~dev-java/netbeans-platform-8.2 >=dev-java/antlr-4.5:4 dev-java/commons-compress:0 dev-java/commons-httpclient:3 dev-java/commons-logging:0 dev-java/icu4j:55 dev-java/iso-relax:0 dev-java/jdbc-mysql:0 dev-java/jdbc-postgresql:0 >=dev-java/jsch-0.1.46:0 >=dev-java/json-simple-1.1:0 dev-java/jsr173:0 dev-java/jvyamlb:0 dev-java/log4j:0 dev-java/lucene:3.5 dev-java/rhino:1.6 dev-java/saxon:9 dev-java/smack:2.2 <=dev-java/sun-jaf-1.1.1:0 dev-java/tomcat-servlet-api:2.2 dev-java/ws-commons-util:0 dev-java/xerces:2 >=dev-java/java-config-2.2.0-r3
 SLOT=8.2
 SRC_URI=http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2 http://hg.netbeans.org/binaries/4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar http://hg.netbeans.org/binaries/886FAF4B85054DD6E50D9B3438542F432B5F9251-bytelist-0.1.jar http://hg.netbeans.org/binaries/DCDA3604865C8E80789B4F8E8EECC3D4D15D00F8-com.trilead.ssh2_1.0.0.build220_r167_v20150618_1733.jar http://hg.netbeans.org/binaries/A8762D07E76CFDE2395257A5DA47BA7C1DBD3DCE-commons-io-1.4.jar http://hg.netbeans.org/binaries/0CE1EDB914C94EBC388F086C6827E8BDEEC71AC2-commons-lang-2.6.jar http://hg.netbeans.org/binaries/CD0D5510908225F76C5FE5A3F1DF4FA44866F81E-commons-net-3.3.jar http://hg.netbeans.org/binaries/901D8F815922C435D985DA3814D20E34CC7622CB-css21-spec.zip http://hg.netbeans.org/binaries/83E794DFF9A39401AC65252C8E10157761584224-css3-spec.zip http://hg.netbeans.org/binaries/C9A6304FAA121C97CB2458B93D30B1FD6F0F7691-derbysampledb.zip http://hg.netbeans.org/binaries/3502EB7D4A72C2C684D23AFC241CCF50797079D1-exechlp-1.0.zip http://hg.netbeans.org/binaries/5EEAAC41164FEBCB79C73BEBD678A7B6C10C3E80-freemarker-2.3.19.jar http://hg.netbeans.org/binaries/ED727A8D9F247E2050281CB083F1C77B09DCB5CD-guava-15.0.jar http://hg.netbeans.org/binaries/23123BB29025254556B6E573023FCDF0F6715A66-html-4.01.zip http://hg.netbeans.org/binaries/2541D025F428A361110C4D656CDD99B5C5C5DFCE-html5doc.zip http://hg.netbeans.org/binaries/D528B44AE7593D2275927396BF930B28078C5220-htmlparser-1.2.1.jar http://hg.netbeans.org/binaries/8E737D82ECAC9BA6100A9BBA71E92A381B75EFDC-ini4j-0.5.1.jar http://hg.netbeans.org/binaries/0DCC973606CBD9737541AA5F3E76DED6E3F4D0D0-iri.jar http://hg.netbeans.org/binaries/F90E3DA5259DB07F36E6987EFDED647A5231DE76-ispell-enwl-3.1.20.zip http://hg.netbeans.org/binaries/ECEAF316A8FAF0E794296EBE158AE110C7D72A5A-JavaEWAH-0.7.9.jar http://hg.netbeans.org/binaries/71F434378F822B09A57174AF6C75D37408687C57-jaxb-api.jar http://hg.netbeans.org/binaries/27FAE927B5B9AE53A5B0ED825575DD8217CE7042-jaxb-api-doc.zip http://hg.netbeans.org/binaries/387BE740EAEF52B3F6E6EE2F140757E7632584CE-jaxb-impl.jar http://hg.netbeans.org/binaries/C3787DAB0DDFBD9E98086ED2F219859B0CB77EF7-jaxb-xjc.jar http://hg.netbeans.org/binaries/F4DB465F207907A2406B0BF5C8FFEE22A5C3E4E3-jaxb1-impl.jar http://hg.netbeans.org/binaries/5E40984A55F6FFF704F05D511A119CA5B456DDB1-jfxrt.jar http://hg.netbeans.org/binaries/483A61B688B13C62BB201A683D98A6688B5373B6-jing.jar http://hg.netbeans.org/binaries/036FA0032B44AD06A1F13504D97B3685B1C88961-jsch.agentproxy.core-0.0.7.jar http://hg.netbeans.org/binaries/9F31964104D71855DF6B73F0C761CDEB3FA3C49C-jsch.agentproxy.sshagent-0.0.7.jar http://hg.netbeans.org/binaries/3FA59A536F3DC2197826DC7F224C0823C1534203-jsch.agentproxy.pageant-0.0.7.jar http://hg.netbeans.org/binaries/F759114E5A9F9AE907EADB59DBF65189AA399B45-jsch.agentproxy.usocket-jna-0.0.7.jar http://hg.netbeans.org/binaries/F406B7784A0DA5C4670B038BF55A4DCD4AF30AEB-jzlib-1.0.7.jar http://hg.netbeans.org/binaries/2E07375E5CA3A452472F0E87FB33F243F7A5C08C-libpam4j-1.1.jar http://hg.netbeans.org/binaries/AA2671239EBB762FEEE8B908E9F35473A72AFE1B-org.eclipse.core.contenttype_3.4.100.v20110423-0524_nosignature.jar http://hg.netbeans.org/binaries/1605B38BB28EAE32C11EAB8F9E238A497754A5B8-org.eclipse.core.jobs-3.5.101_nosignature.jar http://hg.netbeans.org/binaries/20800206EB8B490F3CE5BB8AC8A7C3B9E8004A30-org.eclipse.core.net_1.2.100.I20110511-0800_nosignature.jar http://hg.netbeans.org/binaries/D2D2105B1E3C9E2FA6240AD088237A57590DDA8D-org.eclipse.core.runtime-3.7.0_nosignature.jar http://hg.netbeans.org/binaries/16507EAFDC2B95121AA718895BDB54D616EE4B0F-org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110_nosignature.jar http://hg.netbeans.org/binaries/BD55836AABD558DC643A7844B78866AD990544BC-org.eclipse.equinox.app-1.3.100_nosignature.jar http://hg.netbeans.org/binaries/4EE275AE73A140A403903D7E4DBA68C8FBB07001-org.eclipse.equinox.common_3.6.0.v20110523_nosignature.jar http://hg.netbeans.org/binaries/B7001D9CC2E2AC4E167D22A13063F0350C71AAA9-org.eclipse.equinox.preferences-3.4.2_nosignature.jar http://hg.netbeans.org/binaries/C647079E36A4EB7A24AED2C545E4F0F94194C4D1-org.eclipse.equinox.registry_3.5.200.v20120522-1841_nosignature.jar http://hg.netbeans.org/binaries/9267CF311F979078211A70C1B19AF8A8EE71DC8E-org.eclipse.equinox.security-1.1.1_nosignature.jar http://hg.netbeans.org/binaries/B580E446B543A8DD2F5AA368B07F9C4C9C2E7029-org.eclipse.jgit-3.6.2.201501210735-r_nosignature.jar http://hg.netbeans.org/binaries/244560B99152F3F9BC75DF2D6FAFA8A5216B06B6-org.eclipse.jgit.java7-3.6.2.201501210735-r_nosignature.jar http://hg.netbeans.org/binaries/8E2776DE17446EC7450285F19F2C6366117748A8-org.eclipse.mylyn.bugzilla.core_3.17.0.v20150828-2026.jar http://hg.netbeans.org/binaries/D4F2BE52B5C048158B5C046C0ACAC3965027FE12-org.eclipse.mylyn.commons.core_3.17.0.v20150625-2042.jar http://hg.netbeans.org/binaries/4C753A9D8AB768A55EC99A377A0D22EDA67BAE25-org.eclipse.mylyn.commons.net_3.17.0.v20150706-2057.jar http://hg.netbeans.org/binaries/8E52A783A3700FE2F3AED720CBEF6D895C0D5DBC-org.eclipse.mylyn.commons.repositories.core_1.9.0.v20150625-2042.jar http://hg.netbeans.org/binaries/50F0A49BDF7C5610E3E602609926065D47A16C6E-org.eclipse.mylyn.commons.xmlrpc_3.17.0.v20150625-2042.jar http://hg.netbeans.org/binaries/4F2E28BDB091E2DD215FB9B16C8708513288F16A-org.eclipse.mylyn.tasks.core_3.17.0.v20150828-2026.jar http://hg.netbeans.org/binaries/11D1982BE23B06B2721240F424DBEF9F5FDE7F45-org.eclipse.mylyn.wikitext.confluence.core_2.6.0.v20150901-2143.jar http://hg.netbeans.org/binaries/A3FEF6144ED1622E4CDD506B9D745527CC675D8D-org.eclipse.mylyn.wikitext.core_2.6.0.v20150901-2143-patched-nosignature.jar http://hg.netbeans.org/binaries/825DC870D1D423E347F4F8229A211A2C297BB15D-org.eclipse.mylyn.wikitext.markdown.core_2.6.0.v20150901-2143.jar http://hg.netbeans.org/binaries/C3024631DD14008D2FF35A576C3D82AC6FCB2E10-org.eclipse.mylyn.wikitext.textile.core_2.6.0.v20150901-2143.jar http://hg.netbeans.org/binaries/17C0C8D6DEBF5EBE734881C131888D8088BD9E7D-org.tmatesoft.svnkit_1.8.12.r10533_v20160129_0158.jar http://hg.netbeans.org/binaries/6819C79348FCF4F5125C834E7D3B742582DCA34D-processtreekiller-1.0.7.jar http://hg.netbeans.org/binaries/B0D0FCBAC68826D2AFA3C7C89FC4D57B95A000C3-resolver-1.2.jar http://hg.netbeans.org/binaries/DAAEFA7A5F3AF75FE4CDC86A1B5904C9F3B5BBF8-svnClientAdapter-javahl-1.10.12.jar http://hg.netbeans.org/binaries/C47ED3BCD8CEAECDE3BDEEB7D8D14B577B26F9C8-svnClientAdapter-main-1.10.12.jar http://hg.netbeans.org/binaries/AD4A88D99AB7C5B64C8893CA2FF2CBCFCEFC51C8-svnClientAdapter-svnkit-1.10.12.jar http://hg.netbeans.org/binaries/5C47A97F05F761F190D87ED5FCBB08D1E05A7FB5-svnjavahl-1.9.3.jar http://hg.netbeans.org/binaries/4F94E5B4F14B4571A1D8E37885A3037C91F7C02C-svnkit_1.7.8.r9538_v20130107_2001.jar http://hg.netbeans.org/binaries/C0D8A3265D194CC886BAFD585117B6465FD97DCE-swingx-all-1.6.4.jar http://hg.netbeans.org/binaries/EDE7FBABD4C96D34E48FDA0E8FECED24C98CEDCA-sqljet-1.1.10.jar http://hg.netbeans.org/binaries/CD5B5996B46CB8D96C8F0F89A7A734B3C01F3DF7-tomcat-webserver-3.2.jar http://hg.netbeans.org/binaries/89BC047153217F5254506F4C622A771A78883CBC-ValidationAPI.jar http://hg.netbeans.org/binaries/15ACB06E2E3A70FC188782BA51369CA81ACFE860-validator.jar http://hg.netbeans.org/binaries/C9757EFB2CFBA523A7375A78FA9ECFAF0D0AC505-winp-1.14-patched.jar http://hg.netbeans.org/binaries/64F5BEEADD2A239C4BC354B8DFDB97CF7FDD9983-xmlrpc-client-3.0.jar http://hg.netbeans.org/binaries/8FA16AD28B5E79A7CD52B8B72985B0AE8CCD6ADF-xmlrpc-common-3.0.jar http://hg.netbeans.org/binaries/D6917BF718583002CBE44E773EE21E2DF08ADC71-xmlrpc-server-3.0.jar
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=33a3127af463bf693b4736fa5bb7f580
diff --git a/metadata/md5-cache/dev-java/netbeans-ide-8.2-r1 b/metadata/md5-cache/dev-java/netbeans-ide-8.2-r1
index 32a9c88eabb4..3ae8ff23e264 100644
--- a/metadata/md5-cache/dev-java/netbeans-ide-8.2-r1
+++ b/metadata/md5-cache/dev-java/netbeans-ide-8.2-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=virtual/jdk:1.8 ~dev-java/netbeans-harness-8.2 ~dev-java/netbeans-platform-8.2 >=dev-java/antlr-4.5:4 dev-java/commons-compress:0 dev-java/commons-httpclient:3 dev-java/commons-logging:0 dev-java/icu4j:55 dev-java/iso-relax:0 dev-java/jdbc-mysql:0 dev-java/jdbc-postgresql:0 >=dev-java/jsch-0.1.46:0 >=dev-java/json-simple-1.1:0 dev-java/jsr173:0 dev-java/jvyamlb:0 dev-java/log4j:0 dev-java/lucene:3.5 dev-java/rhino:1.6 dev-java/saxon:9 dev-java/smack:2.2 >=dev-java/sun-jaf-1.1.1-r1:0 dev-java/tomcat-servlet-api:2.2 dev-java/ws-commons-util:0 dev-java/xerces:2 >=dev-java/java-config-2.2.0-r3
 SLOT=8.2
 SRC_URI=http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2 http://hg.netbeans.org/binaries/4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar http://hg.netbeans.org/binaries/886FAF4B85054DD6E50D9B3438542F432B5F9251-bytelist-0.1.jar http://hg.netbeans.org/binaries/DCDA3604865C8E80789B4F8E8EECC3D4D15D00F8-com.trilead.ssh2_1.0.0.build220_r167_v20150618_1733.jar http://hg.netbeans.org/binaries/A8762D07E76CFDE2395257A5DA47BA7C1DBD3DCE-commons-io-1.4.jar http://hg.netbeans.org/binaries/0CE1EDB914C94EBC388F086C6827E8BDEEC71AC2-commons-lang-2.6.jar http://hg.netbeans.org/binaries/CD0D5510908225F76C5FE5A3F1DF4FA44866F81E-commons-net-3.3.jar http://hg.netbeans.org/binaries/901D8F815922C435D985DA3814D20E34CC7622CB-css21-spec.zip http://hg.netbeans.org/binaries/83E794DFF9A39401AC65252C8E10157761584224-css3-spec.zip http://hg.netbeans.org/binaries/C9A6304FAA121C97CB2458B93D30B1FD6F0F7691-derbysampledb.zip http://hg.netbeans.org/binaries/3502EB7D4A72C2C684D23AFC241CCF50797079D1-exechlp-1.0.zip http://hg.netbeans.org/binaries/5EEAAC41164FEBCB79C73BEBD678A7B6C10C3E80-freemarker-2.3.19.jar http://hg.netbeans.org/binaries/ED727A8D9F247E2050281CB083F1C77B09DCB5CD-guava-15.0.jar http://hg.netbeans.org/binaries/23123BB29025254556B6E573023FCDF0F6715A66-html-4.01.zip http://hg.netbeans.org/binaries/2541D025F428A361110C4D656CDD99B5C5C5DFCE-html5doc.zip http://hg.netbeans.org/binaries/D528B44AE7593D2275927396BF930B28078C5220-htmlparser-1.2.1.jar http://hg.netbeans.org/binaries/8E737D82ECAC9BA6100A9BBA71E92A381B75EFDC-ini4j-0.5.1.jar http://hg.netbeans.org/binaries/0DCC973606CBD9737541AA5F3E76DED6E3F4D0D0-iri.jar http://hg.netbeans.org/binaries/F90E3DA5259DB07F36E6987EFDED647A5231DE76-ispell-enwl-3.1.20.zip http://hg.netbeans.org/binaries/ECEAF316A8FAF0E794296EBE158AE110C7D72A5A-JavaEWAH-0.7.9.jar http://hg.netbeans.org/binaries/71F434378F822B09A57174AF6C75D37408687C57-jaxb-api.jar http://hg.netbeans.org/binaries/27FAE927B5B9AE53A5B0ED825575DD8217CE7042-jaxb-api-doc.zip http://hg.netbeans.org/binaries/387BE740EAEF52B3F6E6EE2F140757E7632584CE-jaxb-impl.jar http://hg.netbeans.org/binaries/C3787DAB0DDFBD9E98086ED2F219859B0CB77EF7-jaxb-xjc.jar http://hg.netbeans.org/binaries/F4DB465F207907A2406B0BF5C8FFEE22A5C3E4E3-jaxb1-impl.jar http://hg.netbeans.org/binaries/5E40984A55F6FFF704F05D511A119CA5B456DDB1-jfxrt.jar http://hg.netbeans.org/binaries/483A61B688B13C62BB201A683D98A6688B5373B6-jing.jar http://hg.netbeans.org/binaries/036FA0032B44AD06A1F13504D97B3685B1C88961-jsch.agentproxy.core-0.0.7.jar http://hg.netbeans.org/binaries/9F31964104D71855DF6B73F0C761CDEB3FA3C49C-jsch.agentproxy.sshagent-0.0.7.jar http://hg.netbeans.org/binaries/3FA59A536F3DC2197826DC7F224C0823C1534203-jsch.agentproxy.pageant-0.0.7.jar http://hg.netbeans.org/binaries/F759114E5A9F9AE907EADB59DBF65189AA399B45-jsch.agentproxy.usocket-jna-0.0.7.jar http://hg.netbeans.org/binaries/F406B7784A0DA5C4670B038BF55A4DCD4AF30AEB-jzlib-1.0.7.jar http://hg.netbeans.org/binaries/2E07375E5CA3A452472F0E87FB33F243F7A5C08C-libpam4j-1.1.jar http://hg.netbeans.org/binaries/AA2671239EBB762FEEE8B908E9F35473A72AFE1B-org.eclipse.core.contenttype_3.4.100.v20110423-0524_nosignature.jar http://hg.netbeans.org/binaries/1605B38BB28EAE32C11EAB8F9E238A497754A5B8-org.eclipse.core.jobs-3.5.101_nosignature.jar http://hg.netbeans.org/binaries/20800206EB8B490F3CE5BB8AC8A7C3B9E8004A30-org.eclipse.core.net_1.2.100.I20110511-0800_nosignature.jar http://hg.netbeans.org/binaries/D2D2105B1E3C9E2FA6240AD088237A57590DDA8D-org.eclipse.core.runtime-3.7.0_nosignature.jar http://hg.netbeans.org/binaries/16507EAFDC2B95121AA718895BDB54D616EE4B0F-org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110_nosignature.jar http://hg.netbeans.org/binaries/BD55836AABD558DC643A7844B78866AD990544BC-org.eclipse.equinox.app-1.3.100_nosignature.jar http://hg.netbeans.org/binaries/4EE275AE73A140A403903D7E4DBA68C8FBB07001-org.eclipse.equinox.common_3.6.0.v20110523_nosignature.jar http://hg.netbeans.org/binaries/B7001D9CC2E2AC4E167D22A13063F0350C71AAA9-org.eclipse.equinox.preferences-3.4.2_nosignature.jar http://hg.netbeans.org/binaries/C647079E36A4EB7A24AED2C545E4F0F94194C4D1-org.eclipse.equinox.registry_3.5.200.v20120522-1841_nosignature.jar http://hg.netbeans.org/binaries/9267CF311F979078211A70C1B19AF8A8EE71DC8E-org.eclipse.equinox.security-1.1.1_nosignature.jar http://hg.netbeans.org/binaries/B580E446B543A8DD2F5AA368B07F9C4C9C2E7029-org.eclipse.jgit-3.6.2.201501210735-r_nosignature.jar http://hg.netbeans.org/binaries/244560B99152F3F9BC75DF2D6FAFA8A5216B06B6-org.eclipse.jgit.java7-3.6.2.201501210735-r_nosignature.jar http://hg.netbeans.org/binaries/8E2776DE17446EC7450285F19F2C6366117748A8-org.eclipse.mylyn.bugzilla.core_3.17.0.v20150828-2026.jar http://hg.netbeans.org/binaries/D4F2BE52B5C048158B5C046C0ACAC3965027FE12-org.eclipse.mylyn.commons.core_3.17.0.v20150625-2042.jar http://hg.netbeans.org/binaries/4C753A9D8AB768A55EC99A377A0D22EDA67BAE25-org.eclipse.mylyn.commons.net_3.17.0.v20150706-2057.jar http://hg.netbeans.org/binaries/8E52A783A3700FE2F3AED720CBEF6D895C0D5DBC-org.eclipse.mylyn.commons.repositories.core_1.9.0.v20150625-2042.jar http://hg.netbeans.org/binaries/50F0A49BDF7C5610E3E602609926065D47A16C6E-org.eclipse.mylyn.commons.xmlrpc_3.17.0.v20150625-2042.jar http://hg.netbeans.org/binaries/4F2E28BDB091E2DD215FB9B16C8708513288F16A-org.eclipse.mylyn.tasks.core_3.17.0.v20150828-2026.jar http://hg.netbeans.org/binaries/11D1982BE23B06B2721240F424DBEF9F5FDE7F45-org.eclipse.mylyn.wikitext.confluence.core_2.6.0.v20150901-2143.jar http://hg.netbeans.org/binaries/A3FEF6144ED1622E4CDD506B9D745527CC675D8D-org.eclipse.mylyn.wikitext.core_2.6.0.v20150901-2143-patched-nosignature.jar http://hg.netbeans.org/binaries/825DC870D1D423E347F4F8229A211A2C297BB15D-org.eclipse.mylyn.wikitext.markdown.core_2.6.0.v20150901-2143.jar http://hg.netbeans.org/binaries/C3024631DD14008D2FF35A576C3D82AC6FCB2E10-org.eclipse.mylyn.wikitext.textile.core_2.6.0.v20150901-2143.jar http://hg.netbeans.org/binaries/17C0C8D6DEBF5EBE734881C131888D8088BD9E7D-org.tmatesoft.svnkit_1.8.12.r10533_v20160129_0158.jar http://hg.netbeans.org/binaries/6819C79348FCF4F5125C834E7D3B742582DCA34D-processtreekiller-1.0.7.jar http://hg.netbeans.org/binaries/B0D0FCBAC68826D2AFA3C7C89FC4D57B95A000C3-resolver-1.2.jar http://hg.netbeans.org/binaries/DAAEFA7A5F3AF75FE4CDC86A1B5904C9F3B5BBF8-svnClientAdapter-javahl-1.10.12.jar http://hg.netbeans.org/binaries/C47ED3BCD8CEAECDE3BDEEB7D8D14B577B26F9C8-svnClientAdapter-main-1.10.12.jar http://hg.netbeans.org/binaries/AD4A88D99AB7C5B64C8893CA2FF2CBCFCEFC51C8-svnClientAdapter-svnkit-1.10.12.jar http://hg.netbeans.org/binaries/5C47A97F05F761F190D87ED5FCBB08D1E05A7FB5-svnjavahl-1.9.3.jar http://hg.netbeans.org/binaries/4F94E5B4F14B4571A1D8E37885A3037C91F7C02C-svnkit_1.7.8.r9538_v20130107_2001.jar http://hg.netbeans.org/binaries/C0D8A3265D194CC886BAFD585117B6465FD97DCE-swingx-all-1.6.4.jar http://hg.netbeans.org/binaries/EDE7FBABD4C96D34E48FDA0E8FECED24C98CEDCA-sqljet-1.1.10.jar http://hg.netbeans.org/binaries/CD5B5996B46CB8D96C8F0F89A7A734B3C01F3DF7-tomcat-webserver-3.2.jar http://hg.netbeans.org/binaries/89BC047153217F5254506F4C622A771A78883CBC-ValidationAPI.jar http://hg.netbeans.org/binaries/15ACB06E2E3A70FC188782BA51369CA81ACFE860-validator.jar http://hg.netbeans.org/binaries/C9757EFB2CFBA523A7375A78FA9ECFAF0D0AC505-winp-1.14-patched.jar http://hg.netbeans.org/binaries/64F5BEEADD2A239C4BC354B8DFDB97CF7FDD9983-xmlrpc-client-3.0.jar http://hg.netbeans.org/binaries/8FA16AD28B5E79A7CD52B8B72985B0AE8CCD6ADF-xmlrpc-common-3.0.jar http://hg.netbeans.org/binaries/D6917BF718583002CBE44E773EE21E2DF08ADC71-xmlrpc-server-3.0.jar
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=4368519622975fba84677bc42d7cc6bc
diff --git a/metadata/md5-cache/dev-java/netbeans-java-8.2 b/metadata/md5-cache/dev-java/netbeans-java-8.2
index 1d8268209885..845943c060ca 100644
--- a/metadata/md5-cache/dev-java/netbeans-java-8.2
+++ b/metadata/md5-cache/dev-java/netbeans-java-8.2
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=virtual/jdk:1.8 ~dev-java/netbeans-platform-8.2 ~dev-java/netbeans-extide-8.2 ~dev-java/netbeans-harness-8.2 ~dev-java/netbeans-ide-8.2 ~dev-java/netbeans-websvccommon-8.2 dev-java/beansbinding:0 dev-java/cglib:3 dev-java/jdom:0 dev-java/absolutelayout:0 >=dev-java/antlr-2.7.7-r7:0 dev-java/c3p0:0 dev-java/commons-cli:1 dev-java/commons-collections:0 dev-java/dom4j:1 dev-java/fastinfoset:0 dev-java/glassfish-transaction-api:0 dev-java/javassist:3 dev-java/jboss-logging:0 dev-java/jsr67:0 dev-java/jsr181:0 >=dev-java/jtidy-1:0 dev-java/log4j:0 dev-java/mimepull:0 dev-java/oracle-javamail:0 dev-java/saaj:0 dev-java/slf4j-api:0 dev-java/slf4j-log4j12:0 dev-java/slf4j-simple:0 dev-java/stax-ex:0 dev-java/stax2-api:0 dev-java/xmlstreambuffer:0 >=dev-java/java-config-2.2.0-r3
 SLOT=8.2
 SRC_URI=http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2 http://hg.netbeans.org/binaries/839F93A5213FB3E233B09BFD6D6B95669F7043C0-aether-api-1.0.2.v20150114.jar http://hg.netbeans.org/binaries/694F57282D92C434800F79218E64704E5947008A-apache-maven-3.0.5-bin.zip http://hg.netbeans.org/binaries/F7BD95641780C2AAE8CB9BED1686441A1CE5E749-beansbinding-1.2.1-doc.zip http://hg.netbeans.org/binaries/CD2211635F3011E300CA8FEDC1CE0E1CF61C175B-eclipselink.jar http://hg.netbeans.org/binaries/A9A0648BD7D9FD2CDFBD22C25366E71DA72438DA-hibernate-release-4.3.1-lib.zip http://hg.netbeans.org/binaries/562F0CFA47F0636EBB5A544968EE7A692FC5D26D-indexer-artifact-5.1.1.jar http://hg.netbeans.org/binaries/E775F5BEB07F8303A9AD3DDC12E3128DD48AB03A-indexer-core-5.1.1-patched.jar http://hg.netbeans.org/binaries/D87F53C99E4CD88F5416EDD5ABB77F2A1CCFB050-jarjar-1.4.jar http://hg.netbeans.org/binaries/5BAB675816DBE0F64BB86004B108BF2A00292358-javax.persistence_2.1.0.v201304241213.jar http://hg.netbeans.org/binaries/84E2020E5499015E9F40D1212C86918264B89EB1-jaxws-2.2.6.zip http://hg.netbeans.org/binaries/D64C40E770C95C2A6994081C00CCD489C0AA20C9-jaxws-2.2.6-api.zip http://hg.netbeans.org/binaries/8ECD169E9E308C258287E4F28B03B6D6F1E55F47-jaxws-api-doc.zip http://hg.netbeans.org/binaries/A8BD39C5B88571B4D4697E78DD1A56566E44B1DD-JPAjavadocs04032013.zip http://hg.netbeans.org/binaries/9EC77E2507F9CC01756964C71D91EFD8154A8C47-lucene-core-3.6.2.jar http://hg.netbeans.org/binaries/A90682C6BC0B9E105BD260C9A041FEFEA9579E46-lucene-highlighter-3.6.2.jar http://hg.netbeans.org/binaries/BF206C4AA93C74A739FBAF1F1C78E3AD5F167245-maven-dependency-tree-2.0.jar http://hg.netbeans.org/binaries/5D007C6037A8501E73A3D3FB98A1F6AE5768C3DD-nb-javac-api.jar http://hg.netbeans.org/binaries/5968566A351B28623DE4720B0ACB1E40338074D0-nb-javac-impl.jar http://hg.netbeans.org/binaries/29AF1D338CBB76290D1A96F5A6610F1E8C319AE5-org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar http://hg.netbeans.org/binaries/3CE04BDB48FE315736B1DCE407362C57DFAE286D-org.eclipse.persistence.jpa.modelgen_2.5.2.v20140319-9ad6abd.jar http://hg.netbeans.org/binaries/7666B94C1004AFFFE88E5328BD70EBA6F60125F4-spring-framework-3.2.7.RELEASE.zip http://hg.netbeans.org/binaries/91B55CDAC59BC4DDDF0AF9A54EAAE4304EDEF266-spring-framework-4.0.1.RELEASE.zip http://hg.netbeans.org/binaries/BFCC4C322190D6E3DD2FA9F191C0359D380D87C5-wagon-file-2.10.jar http://hg.netbeans.org/binaries/4EF309C09ABB5F8B2D0C6A4010205DB185729CDC-wagon-http-2.10-shaded.jar http://hg.netbeans.org/binaries/3B96251214DF697E902C849EB0B4A0EFA2CD1A53-wagon-http-shared-2.10.jar http://hg.netbeans.org/binaries/0CD9CDDE3F56BB5250D87C54592F04CBC24F03BF-wagon-provider-api-2.10.jar
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=2765d819c822c2ddc0a303a721c14823
diff --git a/metadata/md5-cache/dev-java/netbeans-java-8.2-r1 b/metadata/md5-cache/dev-java/netbeans-java-8.2-r1
index ccafba60f192..78ab5aef9878 100644
--- a/metadata/md5-cache/dev-java/netbeans-java-8.2-r1
+++ b/metadata/md5-cache/dev-java/netbeans-java-8.2-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=virtual/jdk:1.8 ~dev-java/netbeans-platform-8.2 ~dev-java/netbeans-extide-8.2 ~dev-java/netbeans-harness-8.2 ~dev-java/netbeans-ide-8.2 ~dev-java/netbeans-websvccommon-8.2 dev-java/beansbinding:0 dev-java/cglib:3 dev-java/jdom:0 dev-java/absolutelayout:0 >=dev-java/antlr-2.7.7-r7:0 dev-java/c3p0:0 dev-java/commons-cli:1 dev-java/commons-collections:0 dev-java/dom4j:1 dev-java/fastinfoset:0 dev-java/glassfish-transaction-api:0 dev-java/javassist:3 dev-java/jboss-logging:0 dev-java/jsr67:0 dev-java/jsr181:0 >=dev-java/jtidy-1:0 dev-java/log4j:0 dev-java/mimepull:0 dev-java/oracle-javamail:0 dev-java/saaj:0 dev-java/slf4j-api:0 dev-java/slf4j-log4j12:0 dev-java/slf4j-simple:0 dev-java/stax-ex:0 dev-java/stax2-api:0 dev-java/xmlstreambuffer:0 >=dev-java/java-config-2.2.0-r3
 SLOT=8.2
 SRC_URI=http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2 http://hg.netbeans.org/binaries/839F93A5213FB3E233B09BFD6D6B95669F7043C0-aether-api-1.0.2.v20150114.jar http://hg.netbeans.org/binaries/694F57282D92C434800F79218E64704E5947008A-apache-maven-3.0.5-bin.zip http://hg.netbeans.org/binaries/F7BD95641780C2AAE8CB9BED1686441A1CE5E749-beansbinding-1.2.1-doc.zip http://hg.netbeans.org/binaries/CD2211635F3011E300CA8FEDC1CE0E1CF61C175B-eclipselink.jar http://hg.netbeans.org/binaries/A9A0648BD7D9FD2CDFBD22C25366E71DA72438DA-hibernate-release-4.3.1-lib.zip http://hg.netbeans.org/binaries/562F0CFA47F0636EBB5A544968EE7A692FC5D26D-indexer-artifact-5.1.1.jar http://hg.netbeans.org/binaries/E775F5BEB07F8303A9AD3DDC12E3128DD48AB03A-indexer-core-5.1.1-patched.jar http://hg.netbeans.org/binaries/D87F53C99E4CD88F5416EDD5ABB77F2A1CCFB050-jarjar-1.4.jar http://hg.netbeans.org/binaries/5BAB675816DBE0F64BB86004B108BF2A00292358-javax.persistence_2.1.0.v201304241213.jar http://hg.netbeans.org/binaries/84E2020E5499015E9F40D1212C86918264B89EB1-jaxws-2.2.6.zip http://hg.netbeans.org/binaries/D64C40E770C95C2A6994081C00CCD489C0AA20C9-jaxws-2.2.6-api.zip http://hg.netbeans.org/binaries/8ECD169E9E308C258287E4F28B03B6D6F1E55F47-jaxws-api-doc.zip http://hg.netbeans.org/binaries/A8BD39C5B88571B4D4697E78DD1A56566E44B1DD-JPAjavadocs04032013.zip http://hg.netbeans.org/binaries/9EC77E2507F9CC01756964C71D91EFD8154A8C47-lucene-core-3.6.2.jar http://hg.netbeans.org/binaries/A90682C6BC0B9E105BD260C9A041FEFEA9579E46-lucene-highlighter-3.6.2.jar http://hg.netbeans.org/binaries/BF206C4AA93C74A739FBAF1F1C78E3AD5F167245-maven-dependency-tree-2.0.jar http://hg.netbeans.org/binaries/5D007C6037A8501E73A3D3FB98A1F6AE5768C3DD-nb-javac-api.jar http://hg.netbeans.org/binaries/5968566A351B28623DE4720B0ACB1E40338074D0-nb-javac-impl.jar http://hg.netbeans.org/binaries/29AF1D338CBB76290D1A96F5A6610F1E8C319AE5-org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar http://hg.netbeans.org/binaries/3CE04BDB48FE315736B1DCE407362C57DFAE286D-org.eclipse.persistence.jpa.modelgen_2.5.2.v20140319-9ad6abd.jar http://hg.netbeans.org/binaries/7666B94C1004AFFFE88E5328BD70EBA6F60125F4-spring-framework-3.2.7.RELEASE.zip http://hg.netbeans.org/binaries/91B55CDAC59BC4DDDF0AF9A54EAAE4304EDEF266-spring-framework-4.0.1.RELEASE.zip http://hg.netbeans.org/binaries/BFCC4C322190D6E3DD2FA9F191C0359D380D87C5-wagon-file-2.10.jar http://hg.netbeans.org/binaries/4EF309C09ABB5F8B2D0C6A4010205DB185729CDC-wagon-http-2.10-shaded.jar http://hg.netbeans.org/binaries/3B96251214DF697E902C849EB0B4A0EFA2CD1A53-wagon-http-shared-2.10.jar http://hg.netbeans.org/binaries/0CD9CDDE3F56BB5250D87C54592F04CBC24F03BF-wagon-provider-api-2.10.jar
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=9310321716bb3d340e9bbcfee24eafb3
diff --git a/metadata/md5-cache/dev-java/netbeans-javacard-8.2 b/metadata/md5-cache/dev-java/netbeans-javacard-8.2
index ab734b68bd1c..e09edc55d3e2 100644
--- a/metadata/md5-cache/dev-java/netbeans-javacard-8.2
+++ b/metadata/md5-cache/dev-java/netbeans-javacard-8.2
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=virtual/jdk:1.8 ~dev-java/netbeans-extide-8.2 ~dev-java/netbeans-ide-8.2 ~dev-java/netbeans-java-8.2 ~dev-java/netbeans-platform-8.2 dev-java/ant-contrib:0 dev-java/asm:3 dev-java/bcel:0 dev-java/commons-cli:1 dev-java/commons-codec:0 dev-java/commons-httpclient:3 dev-java/commons-logging:0 >=dev-java/java-config-2.2.0-r3
 SLOT=8.2
 SRC_URI=http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2 http://hg.netbeans.org/binaries/33DCFAE258453BDD3D8A042F6ECF80656A82B8DD-anttasks.jar http://hg.netbeans.org/binaries/9C1A8BC9D3270D184F1D1BCC5F60AA81D46E1ADF-apduio.jar http://hg.netbeans.org/binaries/6243337E93F5841D4FFB404011AA076BFEB1590A-javacard_ri.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=4eb7d837206dfdca0e350531450fdc86
diff --git a/metadata/md5-cache/dev-java/netbeans-javadoc-8.2 b/metadata/md5-cache/dev-java/netbeans-javadoc-8.2
index ae95f4c93bbb..8600c345a595 100644
--- a/metadata/md5-cache/dev-java/netbeans-javadoc-8.2
+++ b/metadata/md5-cache/dev-java/netbeans-javadoc-8.2
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=dev-java/java-config-2.2.0-r3
 SLOT=8.2
 SRC_URI=http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2 http://hg.netbeans.org/binaries/BEA15848D713D491C6EBA1307E0564A5BC3965E7-ant-libs-1.9.7.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=d95ed0a7453f71ac13cce81bccb717f8
diff --git a/metadata/md5-cache/dev-java/netbeans-javafx-8.2 b/metadata/md5-cache/dev-java/netbeans-javafx-8.2
index 7fa7b48a6c65..fbb0a57c6308 100644
--- a/metadata/md5-cache/dev-java/netbeans-javafx-8.2
+++ b/metadata/md5-cache/dev-java/netbeans-javafx-8.2
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=virtual/jdk:1.8 ~dev-java/netbeans-extide-8.2 ~dev-java/netbeans-ide-8.2 ~dev-java/netbeans-java-8.2 ~dev-java/netbeans-platform-8.2 >=dev-java/java-config-2.2.0-r3
 SLOT=8.2
 SRC_URI=http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2 http://hg.netbeans.org/binaries/A806D99716C5E9441BFD8B401176FDDEFC673022-bindex-2.2.jar http://hg.netbeans.org/binaries/D325D3913CBC0F9A8D73A466FABB98EDEEC014AB-jemmy-2.3.1.1.jar http://hg.netbeans.org/binaries/D06C8980C9025183C044202419EA29E69FBD4B99-jemmy-2.3.1.1-doc.zip http://hg.netbeans.org/binaries/49197106637CCA8C337AF16CC01BB5D9DEC7E179-jemmy-2.3.1.1-src.zip http://hg.netbeans.org/binaries/20D826CC819A5A969CF3F7204E2E26CB6263EC43-jnlp-servlet.jar http://hg.netbeans.org/binaries/5D007C6037A8501E73A3D3FB98A1F6AE5768C3DD-nb-javac-api.jar
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=b9e799ad2bb4f784987f3d8a5daf6154
diff --git a/metadata/md5-cache/dev-java/netbeans-mobility-8.2 b/metadata/md5-cache/dev-java/netbeans-mobility-8.2
index 75cdcd14bef1..e6f09042647a 100644
--- a/metadata/md5-cache/dev-java/netbeans-mobility-8.2
+++ b/metadata/md5-cache/dev-java/netbeans-mobility-8.2
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=virtual/jdk:1.8 ~dev-java/netbeans-apisupport-8.2 ~dev-java/netbeans-enterprise-8.2 ~dev-java/netbeans-extide-8.2 ~dev-java/netbeans-ide-8.2 ~dev-java/netbeans-java-8.2 ~dev-java/netbeans-platform-8.2 ~dev-java/netbeans-websvccommon-8.2 >=dev-java/java-config-2.2.0-r3
 SLOT=8.2
 SRC_URI=http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=c459c9ef6af172f3f1f834f16a894d2b
diff --git a/metadata/md5-cache/dev-java/netbeans-nb-8.2 b/metadata/md5-cache/dev-java/netbeans-nb-8.2
index 41cb49bd9d4d..03cde914bc41 100644
--- a/metadata/md5-cache/dev-java/netbeans-nb-8.2
+++ b/metadata/md5-cache/dev-java/netbeans-nb-8.2
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=virtual/jdk:1.8 ~dev-java/netbeans-platform-8.2 ~dev-java/netbeans-harness-8.2 ~dev-java/netbeans-ide-8.2 >=dev-java/java-config-2.2.0-r3
 SLOT=8.2
 SRC_URI=http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2 https://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.0.png
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=0e9701e20f571e83a082016867be6d27
diff --git a/metadata/md5-cache/dev-java/netbeans-php-8.2 b/metadata/md5-cache/dev-java/netbeans-php-8.2
index acdac0c09bf9..010daae5ad2c 100644
--- a/metadata/md5-cache/dev-java/netbeans-php-8.2
+++ b/metadata/md5-cache/dev-java/netbeans-php-8.2
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=virtual/jdk:1.8 ~dev-java/netbeans-extide-8.2 ~dev-java/netbeans-ide-8.2 ~dev-java/netbeans-platform-8.2 ~dev-java/netbeans-webcommon-8.2 ~dev-java/netbeans-websvccommon-8.2 dev-java/javacup:0 >=dev-java/java-config-2.2.0-r3
 SLOT=8.2
 SRC_URI=http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2 http://hg.netbeans.org/binaries/0702230EB3354A1687E4496D73A94F33A1E343BD-phpdocdesc.zip http://hg.netbeans.org/binaries/472A52636BE09823B4E5F707071B31FB990A7375-phpsigfiles.zip http://hg.netbeans.org/binaries/3D6AF75EA20D715887DAF47A3F063864EF0814C1-predefined_vars.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=02c65a097f3650351e0ea1d7141bb192
diff --git a/metadata/md5-cache/dev-java/netbeans-platform-8.2 b/metadata/md5-cache/dev-java/netbeans-platform-8.2
index 303384bc9674..f4af1f089a2c 100644
--- a/metadata/md5-cache/dev-java/netbeans-platform-8.2
+++ b/metadata/md5-cache/dev-java/netbeans-platform-8.2
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=dev-java/hamcrest-core:1.3 dev-java/javahelp:0 >=dev-java/jna-3.4:0 dev-java/junit:4[source] >=dev-java/osgi-core-api-5:0 dev-java/osgi-compendium:0 dev-java/swing-layout:1[source] dev-java/testng:0 virtual/jdk:1.8 >=dev-java/java-config-2.2.0-r3
 SLOT=8.2
 SRC_URI=http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2 http://hg.netbeans.org/binaries/2F7553F50B0D14ED811B849C282DA8C1FFC32AAE-asm-all-5.0.1.jar http://hg.netbeans.org/binaries/1BA97A9FFD4A1DFF3E75B76CD3AE3D0EFF8493B7-felix-4.2.1.jar http://hg.netbeans.org/binaries/941A8BE4506C65F0A9001C08812FB7DA1E505E21-junit-4.12-javadoc.jar http://hg.netbeans.org/binaries/771CDCA0A3F2F3CE818E20CC2D707A3592422485-ko4j-1.3.jar http://hg.netbeans.org/binaries/A3085BAA78C8EE7F55081E70C79ABE04CA38CE93-net.java.html-1.3.jar http://hg.netbeans.org/binaries/7FC91530F4395FA0D58F9539F3B40858E766BFA3-net.java.html.boot-1.3.jar http://hg.netbeans.org/binaries/5C992BAEC0111EE293BD44173140A9D8EC860765-net.java.html.boot.fx-1.3.jar http://hg.netbeans.org/binaries/BF6C9BB0FFB78A6B846ECAEB880C460D883B4F72-net.java.html.boot.script-1.3.jar http://hg.netbeans.org/binaries/10E4214A89082C70FCF9F721953001C0932037BA-net.java.html.geo-1.3.jar http://hg.netbeans.org/binaries/D97314CE1869DD3B8B8942256A70673E2991C9DD-net.java.html.json-1.3.jar http://hg.netbeans.org/binaries/6BDCE8349F83CD02F2942D4FBFA86A81A129F42A-net.java.html.sound-1.3.jar http://hg.netbeans.org/binaries/E5DDC5E827D3D62E7BE9F7E32927CA01F2839971-org.eclipse.osgi_3.9.1.v20140110-1610.jar http://hg.netbeans.org/binaries/1C7FE319052EF49126CF07D0DB6953CB7007229E-swing-layout-1.0.4-doc.zip http://hg.netbeans.org/binaries/AF022CBCACD8CBFCF946816441D1E7568D817745-testng-6.8.1-javadoc.zip http://hg.netbeans.org/binaries/CEC2829EC391CB404AD32EB2D08F879C418B745B-xhr4j-1.3.jar
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=7b8fd427b24df51eec751f593c750a09
diff --git a/metadata/md5-cache/dev-java/netbeans-profiler-8.2 b/metadata/md5-cache/dev-java/netbeans-profiler-8.2
index 4d839904a79b..7b55aeab6931 100644
--- a/metadata/md5-cache/dev-java/netbeans-profiler-8.2
+++ b/metadata/md5-cache/dev-java/netbeans-profiler-8.2
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=virtual/jdk:1.8 ~dev-java/netbeans-extide-8.2 ~dev-java/netbeans-ide-8.2 ~dev-java/netbeans-java-8.2 ~dev-java/netbeans-platform-8.2 >=dev-java/java-config-2.2.0-r3
 SLOT=8.2
 SRC_URI=http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=157c3934ad3d4bfed8738c4c9cc66c7c
diff --git a/metadata/md5-cache/dev-java/netbeans-webcommon-8.2 b/metadata/md5-cache/dev-java/netbeans-webcommon-8.2
index 07cd84b7b19f..c7751308829c 100644
--- a/metadata/md5-cache/dev-java/netbeans-webcommon-8.2
+++ b/metadata/md5-cache/dev-java/netbeans-webcommon-8.2
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=virtual/jdk:1.8 ~dev-java/netbeans-platform-8.2 ~dev-java/netbeans-extide-8.2 ~dev-java/netbeans-ide-8.2 >=dev-java/java-config-2.2.0-r3
 SLOT=8.2
 SRC_URI=http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2 http://hg.netbeans.org/binaries/7CA13589F586F659BB0E1561719A91CA47BF1897-com.oracle.js.parser.jar http://hg.netbeans.org/binaries/59631804B5A7FF3CEAA3F0E113584AF7E1BB6E9B-dd-plist.jar http://hg.netbeans.org/binaries/7C4A82593A85524A3541E55A4A9C906B773ABAD6-ios-sim http://hg.netbeans.org/binaries/C8EEAB10E4539BEAF97476EBA252BD4B40377FA9-js-corestubs.zip http://hg.netbeans.org/binaries/2AA13ACCC4059C930C4AD3B6ABD8E1C0FC06235C-js-domstubs.zip http://hg.netbeans.org/binaries/7C0C3CFD989EE775198337C11715C1ACD6C84F41-js-reststubs.zip http://hg.netbeans.org/binaries/0929AC5F40B5A8667021408748D64F30F77B3165-libiDeviceNativeBinding.dylib http://hg.netbeans.org/binaries/2A38DA3DB5D36DBBDC0B03990B46810F72430D5E-libimobiledevice.4.dylib http://hg.netbeans.org/binaries/480C9E376169E21EA3BDA5D5841425BD7CC054D7-libplist.1.dylib http://hg.netbeans.org/binaries/08FE518AB60FFA2E5440B75B4D9F8502E0791B3C-libs.jstestdriver-ext.jar http://hg.netbeans.org/binaries/C1BB9FF4232248B0054E5A26A33474A251EA19CB-libusbmuxd.2.dylib http://hg.netbeans.org/binaries/D4BD3F62EADB61216A47EF96B3152EDD35A56005-ojetdocs-1_0_0.zip http://hg.netbeans.org/binaries/1EFED55F8C442E4DB1C2338A5C35D494364F9ECD-ojetdocs-1_1_2.zip http://hg.netbeans.org/binaries/CA8F6968FED0BE20E786C70CF9B603F4D7B66C68-ojetdocs-2_0_0.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=38aed7ab6df99057c0ce6a1290549165
diff --git a/metadata/md5-cache/dev-java/netbeans-websvccommon-8.2 b/metadata/md5-cache/dev-java/netbeans-websvccommon-8.2
index 922d4846683f..554b2e071502 100644
--- a/metadata/md5-cache/dev-java/netbeans-websvccommon-8.2
+++ b/metadata/md5-cache/dev-java/netbeans-websvccommon-8.2
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=virtual/jdk:1.8 ~dev-java/netbeans-platform-8.2 ~dev-java/netbeans-ide-8.2 >=dev-java/java-config-2.2.0-r3
 SLOT=8.2
 SRC_URI=http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=a82b37eff956d4ccfb8ade79a75a00dd
diff --git a/metadata/md5-cache/dev-java/netty-buffer-4.0.21 b/metadata/md5-cache/dev-java/netty-buffer-4.0.21
index d14a82cfcd23..8a9990bfbf2e 100644
--- a/metadata/md5-cache/dev-java/netty-buffer-4.0.21
+++ b/metadata/md5-cache/dev-java/netty-buffer-4.0.21
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 dev-java/netty-common:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/netty/netty/archive/netty-4.0.21.Final.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=fc7cddec54ecefca467357814e98a654
diff --git a/metadata/md5-cache/dev-java/netty-transport-4.0.21-r1 b/metadata/md5-cache/dev-java/netty-transport-4.0.21-r1
index 2106571e02b1..07a64e9a9ee5 100644
--- a/metadata/md5-cache/dev-java/netty-transport-4.0.21-r1
+++ b/metadata/md5-cache/dev-java/netty-transport-4.0.21-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.7 dev-java/netty-buffer:0 dev-java/netty-common:0 >=dev-
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/netty/netty/archive/netty-4.0.21.Final.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=8bb55f558603901de29bd4311487d34c
diff --git a/metadata/md5-cache/dev-java/neuroph-2.3 b/metadata/md5-cache/dev-java/neuroph-2.3
index 4c1937018dc8..775d2432a947 100644
--- a/metadata/md5-cache/dev-java/neuroph-2.3
+++ b/metadata/md5-cache/dev-java/neuroph-2.3
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/neuroph/neuroph_2.3_nb.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=4ba3924d22dcf77c1d102447cf1872af
diff --git a/metadata/md5-cache/dev-java/neuroph-2.3.1 b/metadata/md5-cache/dev-java/neuroph-2.3.1
index e066d1714b55..fa74dd2f45f2 100644
--- a/metadata/md5-cache/dev-java/neuroph-2.3.1
+++ b/metadata/md5-cache/dev-java/neuroph-2.3.1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/neuroph/neuroph_2.3.1_nb.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=4ba3924d22dcf77c1d102447cf1872af
diff --git a/metadata/md5-cache/dev-java/neuroph-2.4 b/metadata/md5-cache/dev-java/neuroph-2.4
index 5fae387c1170..afddac1d6ea5 100644
--- a/metadata/md5-cache/dev-java/neuroph-2.4
+++ b/metadata/md5-cache/dev-java/neuroph-2.4
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/neuroph/neuroph_2.4_nb.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=0d925704ae30fab2300fba6b27aa8d86
diff --git a/metadata/md5-cache/dev-java/odfdom-0.8.6-r1 b/metadata/md5-cache/dev-java/odfdom-0.8.6-r1
index b7f2658b6684..e3a78f443ecf 100644
--- a/metadata/md5-cache/dev-java/odfdom-0.8.6-r1
+++ b/metadata/md5-cache/dev-java/odfdom-0.8.6-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.5 dev-java/xerces:2 dev-java/xml-commons-external:1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://odftoolkit.org/projects/odfdom/downloads/download/current-version%252Fodfdom-0.8.6-sources.zip -> odfdom-0.8.6-sources.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=9f3f5341774584108674fd75d4577e74
diff --git a/metadata/md5-cache/dev-java/ognl-3.0.8 b/metadata/md5-cache/dev-java/ognl-3.0.8
index ac8d254219ca..3b01492e7f19 100644
--- a/metadata/md5-cache/dev-java/ognl-3.0.8
+++ b/metadata/md5-cache/dev-java/ognl-3.0.8
@@ -9,5 +9,5 @@ LICENSE=Apache-1.1
 RDEPEND=dev-java/javassist:3 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=3.0
 SRC_URI=https://github.com/jkuhnert/ognl/archive/OGNL_3_0_8.tar.gz https://ognl.dev.java.net/source/browse/*checkout*/ognl/osbuild.xml
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=c6ebf25296a071d6e5aee15b966c35c9
diff --git a/metadata/md5-cache/dev-java/oracle-javamail-1.5.2 b/metadata/md5-cache/dev-java/oracle-javamail-1.5.2
index bb45ae168b5b..dc383c6f8151 100644
--- a/metadata/md5-cache/dev-java/oracle-javamail-1.5.2
+++ b/metadata/md5-cache/dev-java/oracle-javamail-1.5.2
@@ -9,5 +9,5 @@ LICENSE=CDDL GPL-2 BSD
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://java.net/projects/javamail/downloads/download/source/javamail-1.5.2-src.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=165d599d329e7d40e158edc803a887fd
diff --git a/metadata/md5-cache/dev-java/oracle-javamail-1.5.5 b/metadata/md5-cache/dev-java/oracle-javamail-1.5.5
index 71645e2593be..449de21fbea8 100644
--- a/metadata/md5-cache/dev-java/oracle-javamail-1.5.5
+++ b/metadata/md5-cache/dev-java/oracle-javamail-1.5.5
@@ -9,5 +9,5 @@ LICENSE=CDDL GPL-2 BSD
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://java.net/projects/javamail/downloads/download/source/javamail-1.5.5-src.zip -> oracle-javamail-1.5.5.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=36864345a6c97569f67ac65822c29595
diff --git a/metadata/md5-cache/dev-java/oracle-javamail-1.5.6 b/metadata/md5-cache/dev-java/oracle-javamail-1.5.6
index a22e4d2015f9..c95b102ea1fb 100644
--- a/metadata/md5-cache/dev-java/oracle-javamail-1.5.6
+++ b/metadata/md5-cache/dev-java/oracle-javamail-1.5.6
@@ -9,5 +9,5 @@ LICENSE=CDDL GPL-2 BSD
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://java.net/projects/javamail/downloads/download/source/javamail-1.5.6-src.zip -> oracle-javamail-1.5.6.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=64639e3c4a994e808dba97d220d2b8ad
diff --git a/metadata/md5-cache/dev-java/osgi-foundation-1.2.0-r1 b/metadata/md5-cache/dev-java/osgi-foundation-1.2.0-r1
index 83a125d44196..c717c2fba46f 100644
--- a/metadata/md5-cache/dev-java/osgi-foundation-1.2.0-r1
+++ b/metadata/md5-cache/dev-java/osgi-foundation-1.2.0-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0 OSGi-Specification-2.0
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~tomwij/files/dist/osgi-foundation-1.2.0.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=115c3fb4eec53990852908dec04d1f9d
diff --git a/metadata/md5-cache/dev-java/osgi-obr-1.0.2 b/metadata/md5-cache/dev-java/osgi-obr-1.0.2
index 389a321f9bd0..960d6cb50e1a 100644
--- a/metadata/md5-cache/dev-java/osgi-obr-1.0.2
+++ b/metadata/md5-cache/dev-java/osgi-obr-1.0.2
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 dev-java/osgi-core-api:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/dist/felix/org.osgi.service.obr-1.0.2-project.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=8c79dc7b9f79b2a007e3400919d5c5f6
diff --git a/metadata/md5-cache/dev-java/pdf-renderer-0.9.1 b/metadata/md5-cache/dev-java/pdf-renderer-0.9.1
index ef0cd4edc3b4..158547184e3a 100644
--- a/metadata/md5-cache/dev-java/pdf-renderer-0.9.1
+++ b/metadata/md5-cache/dev-java/pdf-renderer-0.9.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-3
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://java.net/projects/pdf-renderer/downloads/download/PDFRenderer-full-0.9.1.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=c1e804c8677dcff00e7c081f5c479c88
diff --git a/metadata/md5-cache/dev-java/piccolo-1.04 b/metadata/md5-cache/dev-java/piccolo-1.04
index 5edef7437ded..8b9e9c2c8fb7 100644
--- a/metadata/md5-cache/dev-java/piccolo-1.04
+++ b/metadata/md5-cache/dev-java/piccolo-1.04
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/piccolo/piccolo-1.04-src.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=9d9336f5e71e84b6c28435a6a5476627
diff --git a/metadata/md5-cache/dev-java/picocontainer-1.1-r1 b/metadata/md5-cache/dev-java/picocontainer-1.1-r1
index 54d679369fef..e68aa98357a6 100644
--- a/metadata/md5-cache/dev-java/picocontainer-1.1-r1
+++ b/metadata/md5-cache/dev-java/picocontainer-1.1-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3
 RESTRICT=test
 SLOT=1
 SRC_URI=http://dist.codehaus.org/picocontainer/distributions/picocontainer-1.1-src.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=87d279420f99638d6cde698acd8aa1f9
diff --git a/metadata/md5-cache/dev-java/plexus-classworlds-2.2.3 b/metadata/md5-cache/dev-java/plexus-classworlds-2.2.3
index 8a3543d9d0d9..b6dc9288e589 100644
--- a/metadata/md5-cache/dev-java/plexus-classworlds-2.2.3
+++ b/metadata/md5-cache/dev-java/plexus-classworlds-2.2.3
@@ -9,5 +9,5 @@ LICENSE=codehaus-classworlds
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ercpe/distfiles/dev-java/plexus-classworlds/plexus-classworlds-2.2.3.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=d7974393ec3bae5d6466ebf1c53b4435
diff --git a/metadata/md5-cache/dev-java/prefuse-20071021_beta b/metadata/md5-cache/dev-java/prefuse-20071021_beta
index 2141785b58aa..4e35740f8cb7 100644
--- a/metadata/md5-cache/dev-java/prefuse-20071021_beta
+++ b/metadata/md5-cache/dev-java/prefuse-20071021_beta
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.4 dev-java/lucene:1 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2006
 SRC_URI=mirror://sourceforge/prefuse/prefuse-beta-20071021.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=7d5b3e38cb30548dda878167acf90790
diff --git a/metadata/md5-cache/dev-java/proguard-4.5 b/metadata/md5-cache/dev-java/proguard-4.5
index 2fe817f0bc74..00ea8c7f9a12 100644
--- a/metadata/md5-cache/dev-java/proguard-4.5
+++ b/metadata/md5-cache/dev-java/proguard-4.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2-with-linking-exception
 RDEPEND=>=virtual/jre-1.4 >=dev-java/ant-core-1.7:0 j2me? ( >=dev-java/sun-j2me-bin-2.2:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/proguard/proguard4.5.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=d6fce5c3cf0e7f647215e6af3332b31d
diff --git a/metadata/md5-cache/dev-java/proguard-4.7 b/metadata/md5-cache/dev-java/proguard-4.7
index d2f0f02e91a9..936e60104e7b 100644
--- a/metadata/md5-cache/dev-java/proguard-4.7
+++ b/metadata/md5-cache/dev-java/proguard-4.7
@@ -9,5 +9,5 @@ LICENSE=GPL-2-with-linking-exception
 RDEPEND=>=virtual/jre-1.4 >=dev-java/ant-core-1.7:0 j2me? ( >=dev-java/sun-j2me-bin-2.2:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/proguard/proguard4.7.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=62f5286a43fb3b02e07a2206a3c1a4d4
diff --git a/metadata/md5-cache/dev-java/proguard-4.8 b/metadata/md5-cache/dev-java/proguard-4.8
index 86b5411b17e1..a1fee86ea332 100644
--- a/metadata/md5-cache/dev-java/proguard-4.8
+++ b/metadata/md5-cache/dev-java/proguard-4.8
@@ -9,5 +9,5 @@ LICENSE=GPL-2-with-linking-exception
 RDEPEND=>=virtual/jre-1.4 >=dev-java/ant-core-1.7:0 j2me? ( >=dev-java/sun-j2me-bin-2.2:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/proguard/proguard4.8.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=b7c3c3d11614f424f72e2b3d285d3dbd
diff --git a/metadata/md5-cache/dev-java/proguard-5.2.1 b/metadata/md5-cache/dev-java/proguard-5.2.1
index 4647cc90db22..9d728e396e8a 100644
--- a/metadata/md5-cache/dev-java/proguard-5.2.1
+++ b/metadata/md5-cache/dev-java/proguard-5.2.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2-with-linking-exception
 RDEPEND=>=virtual/jre-1.5 >=dev-java/ant-core-1.7:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/proguard/proguard5.2.1.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=d1f2a0e9e5261c4be6123d78f37f0756
diff --git a/metadata/md5-cache/dev-java/qdox-1.12.1-r1 b/metadata/md5-cache/dev-java/qdox-1.12.1-r1
index d1753b9196ad..fd12f0ab6e47 100644
--- a/metadata/md5-cache/dev-java/qdox-1.12.1-r1
+++ b/metadata/md5-cache/dev-java/qdox-1.12.1-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.4 dev-java/ant-core:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1.12
 SRC_URI=https://github.com/codehaus/qdox/archive/qdox-1.12.1.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=816722133499abb5cbe24284edd497db
diff --git a/metadata/md5-cache/dev-java/qdox-1.6.3 b/metadata/md5-cache/dev-java/qdox-1.6.3
index 0f625bad88b6..5c3adb37344f 100644
--- a/metadata/md5-cache/dev-java/qdox-1.6.3
+++ b/metadata/md5-cache/dev-java/qdox-1.6.3
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.4 dev-java/ant-core =dev-java/junit-3.8* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1.6
 SRC_URI=http://repository.codehaus.org/com/thoughtworks/qdox/qdox/1.6.3/qdox-1.6.3-sources.jar
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=b6b30e730e500d70513fda364fb49c9b
diff --git a/metadata/md5-cache/dev-java/radeox-1.0_beta2-r1 b/metadata/md5-cache/dev-java/radeox-1.0_beta2-r1
index a597ef485860..e06236001017 100644
--- a/metadata/md5-cache/dev-java/radeox-1.0_beta2-r1
+++ b/metadata/md5-cache/dev-java/radeox-1.0_beta2-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.4 =dev-java/commons-logging-1* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1
 SRC_URI=ftp://snipsnap.org/radeox/radeox-1.0-BETA-2-src.tgz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=33eedcf109a3d94f73b2653944a50759
diff --git a/metadata/md5-cache/dev-java/relaxngcc-1.12-r3 b/metadata/md5-cache/dev-java/relaxngcc-1.12-r3
index 188826d4837e..a2b6a2ec319c 100644
--- a/metadata/md5-cache/dev-java/relaxngcc-1.12-r3
+++ b/metadata/md5-cache/dev-java/relaxngcc-1.12-r3
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-java/msv:0 dev-java/xsdlib:0 dev-java/ant-core:0 dev-java/iso-relax:0 dev-java/relaxng-datatype:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/relaxngcc/relaxngcc-20031218.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=e698d05dce2e21199a36dc8008266d62
diff --git a/metadata/md5-cache/dev-java/resin-servlet-api-3.0.25 b/metadata/md5-cache/dev-java/resin-servlet-api-3.0.25
index e7842a38b435..87e5e278fa7e 100644
--- a/metadata/md5-cache/dev-java/resin-servlet-api-3.0.25
+++ b/metadata/md5-cache/dev-java/resin-servlet-api-3.0.25
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2.4
 SRC_URI=http://www.caucho.com/download/resin-3.0.25-src.zip mirror://gentoo/resin-gentoo-patches-3.0.25.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=a9299cb5aa15656d474c20e343f6a9f2
diff --git a/metadata/md5-cache/dev-java/resin-servlet-api-3.1.12 b/metadata/md5-cache/dev-java/resin-servlet-api-3.1.12
index face962e75f7..bc7790bf2eb4 100644
--- a/metadata/md5-cache/dev-java/resin-servlet-api-3.1.12
+++ b/metadata/md5-cache/dev-java/resin-servlet-api-3.1.12
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2.5
 SRC_URI=http://www.caucho.com/download/resin-3.1.12-src.zip mirror://gentoo/resin-gentoo-patches-3.1.12.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=57e74bb9d1d280ff99556a1c66f88b7d
diff --git a/metadata/md5-cache/dev-java/resin-servlet-api-4.0.26 b/metadata/md5-cache/dev-java/resin-servlet-api-4.0.26
index 24d4709eda3d..2344661fe9f4 100644
--- a/metadata/md5-cache/dev-java/resin-servlet-api-4.0.26
+++ b/metadata/md5-cache/dev-java/resin-servlet-api-4.0.26
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=3.0
 SRC_URI=http://www.caucho.com/download/resin-4.0.26-src.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=13b2354e75bfd3325aef994feba3e4ae
diff --git a/metadata/md5-cache/dev-java/resin-servlet-api-4.0.27 b/metadata/md5-cache/dev-java/resin-servlet-api-4.0.27
index 3eb8549c8f49..2eb85c87465f 100644
--- a/metadata/md5-cache/dev-java/resin-servlet-api-4.0.27
+++ b/metadata/md5-cache/dev-java/resin-servlet-api-4.0.27
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=3.0
 SRC_URI=http://www.caucho.com/download/resin-4.0.27-src.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=5e039ff37fca4bee299f695b4c11d000
diff --git a/metadata/md5-cache/dev-java/resin-servlet-api-4.0.44 b/metadata/md5-cache/dev-java/resin-servlet-api-4.0.44
index 5b1f4182adfc..e67780c43168 100644
--- a/metadata/md5-cache/dev-java/resin-servlet-api-4.0.44
+++ b/metadata/md5-cache/dev-java/resin-servlet-api-4.0.44
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=3.1
 SRC_URI=http://www.caucho.com/download/resin-4.0.44-src.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=554bbd3ab83a632806686636c74d6d27
diff --git a/metadata/md5-cache/dev-java/resin-servlet-api-4.0.46 b/metadata/md5-cache/dev-java/resin-servlet-api-4.0.46
index bdc0f3e255d1..51fd079bccac 100644
--- a/metadata/md5-cache/dev-java/resin-servlet-api-4.0.46
+++ b/metadata/md5-cache/dev-java/resin-servlet-api-4.0.46
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=3.1
 SRC_URI=http://www.caucho.com/download/resin-4.0.46-src.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=554bbd3ab83a632806686636c74d6d27
diff --git a/metadata/md5-cache/dev-java/rhino-1.7.7-r1 b/metadata/md5-cache/dev-java/rhino-1.7.7-r1
index 1518f9eb8983..623412b24ab9 100644
--- a/metadata/md5-cache/dev-java/rhino-1.7.7-r1
+++ b/metadata/md5-cache/dev-java/rhino-1.7.7-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 RESTRICT=test
 SLOT=1.6
 SRC_URI=https://github.com/mozilla/rhino/archive/Rhino1_7_7_RELEASE.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=df724426752836f18a85e500e2efc0b5
diff --git a/metadata/md5-cache/dev-java/rome-0.9-r3 b/metadata/md5-cache/dev-java/rome-0.9-r3
index aa16c0773a73..e6f0ccbdb53d 100644
--- a/metadata/md5-cache/dev-java/rome-0.9-r3
+++ b/metadata/md5-cache/dev-java/rome-0.9-r3
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-java/jdom:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://gentoo/rome-0.9-src.zip -> rome-0.9.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=3a03597f5356ed01f60b32249cb58f32
diff --git a/metadata/md5-cache/dev-java/saaj-1.3.19-r2 b/metadata/md5-cache/dev-java/saaj-1.3.19-r2
index e0168474ddbf..d0b1c1e34f30 100644
--- a/metadata/md5-cache/dev-java/saaj-1.3.19-r2
+++ b/metadata/md5-cache/dev-java/saaj-1.3.19-r2
@@ -9,5 +9,5 @@ LICENSE=CDDL
 RDEPEND=dev-java/mimepull:0 dev-java/xerces:2 dev-java/xml-commons-external:1.4 java-virtuals/saaj-api:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~sera/distfiles/saaj-1.3.19.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=758e158e14670019a9df7958a85f9941
diff --git a/metadata/md5-cache/dev-java/sat4j-core-2.2.0 b/metadata/md5-cache/dev-java/sat4j-core-2.2.0
index 9781e881e7bc..723e96498ffe 100644
--- a/metadata/md5-cache/dev-java/sat4j-core-2.2.0
+++ b/metadata/md5-cache/dev-java/sat4j-core-2.2.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2
 SRC_URI=http://download.forge.objectweb.org/sat4j/sat4j-core-v20100623.zip http://download.forge.objectweb.org/sat4j/build-2.4.xml -> sat4j-core-2.2.0-build.xml
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=3576990347e79a7b53889e7fe421f883
diff --git a/metadata/md5-cache/dev-java/sat4j-core-2.3.1-r1 b/metadata/md5-cache/dev-java/sat4j-core-2.3.1-r1
index 7bad20e833fe..296e972089ad 100644
--- a/metadata/md5-cache/dev-java/sat4j-core-2.3.1-r1
+++ b/metadata/md5-cache/dev-java/sat4j-core-2.3.1-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2.3
 SRC_URI=http://download.forge.objectweb.org/sat4j/sat4j-core-v20111030.zip http://download.forge.objectweb.org/sat4j/build-2.4.xml -> sat4j-core-2.3.1-build.xml
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=49f89a7b92d9725552b80396091ff817
diff --git a/metadata/md5-cache/dev-java/sat4j-pseudo-2.2.0 b/metadata/md5-cache/dev-java/sat4j-pseudo-2.2.0
index 306639539a11..db738dc15fe3 100644
--- a/metadata/md5-cache/dev-java/sat4j-pseudo-2.2.0
+++ b/metadata/md5-cache/dev-java/sat4j-pseudo-2.2.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-java/sat4j-core:2 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2
 SRC_URI=http://download.forge.objectweb.org/sat4j/sat4j-pb-v20100623.zip http://download.forge.objectweb.org/sat4j/build-2.4.xml -> sat4j-pseudo-2.2.0-build.xml
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=8e785ba116eb746157dc52e2cd1c3497
diff --git a/metadata/md5-cache/dev-java/sat4j-pseudo-2.3.1 b/metadata/md5-cache/dev-java/sat4j-pseudo-2.3.1
index e8aa4fb6390a..6e19ca129db8 100644
--- a/metadata/md5-cache/dev-java/sat4j-pseudo-2.3.1
+++ b/metadata/md5-cache/dev-java/sat4j-pseudo-2.3.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-java/sat4j-core:2.3 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2.3
 SRC_URI=http://download.forge.objectweb.org/sat4j/sat4j-pb-v20111030.zip http://download.forge.objectweb.org/sat4j/build-2.4.xml -> sat4j-pseudo-2.3.1-build.xml
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=14adaf21bade1a789bc42ea78c6accf9
diff --git a/metadata/md5-cache/dev-java/saxon-9.2.0.6 b/metadata/md5-cache/dev-java/saxon-9.2.0.6
index 8e172f8c89e4..b2d77e0790bc 100644
--- a/metadata/md5-cache/dev-java/saxon-9.2.0.6
+++ b/metadata/md5-cache/dev-java/saxon-9.2.0.6
@@ -9,5 +9,5 @@ LICENSE=MPL-1.0
 RDEPEND=>=virtual/jre-1.6 dev-java/ant-core dev-java/dom4j:1 dev-java/jdom:1.0 dev-java/xom >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=9
 SRC_URI=mirror://sourceforge/saxon/saxonhe9-2-0-6source.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=c5ef146c8b08364389c5c933a8c5f7c2
diff --git a/metadata/md5-cache/dev-java/saxon-9.2.0.6-r2 b/metadata/md5-cache/dev-java/saxon-9.2.0.6-r2
index 12210d9331d0..1365a8c917f7 100644
--- a/metadata/md5-cache/dev-java/saxon-9.2.0.6-r2
+++ b/metadata/md5-cache/dev-java/saxon-9.2.0.6-r2
@@ -9,5 +9,5 @@ LICENSE=MPL-1.0
 RDEPEND=dev-java/xom:0 dev-java/jdom:0 dev-java/dom4j:1 dev-java/ant-core >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=9
 SRC_URI=mirror://sourceforge/saxon/saxonhe9-2-0-6source.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=c8a2d185535d2716e87114000bfc0b8a
diff --git a/metadata/md5-cache/dev-java/sblim-cim-client-2.2.1 b/metadata/md5-cache/dev-java/sblim-cim-client-2.2.1
index c16dabe43a16..db6ae74dec07 100644
--- a/metadata/md5-cache/dev-java/sblim-cim-client-2.2.1
+++ b/metadata/md5-cache/dev-java/sblim-cim-client-2.2.1
@@ -9,5 +9,5 @@ LICENSE=CPL-1.0
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2
 SRC_URI=mirror://sourceforge/sblim/sblim-cim-client2-2.2.1-src.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=af75cdcd6f23c8bff48c95cb0b2defc9
diff --git a/metadata/md5-cache/dev-java/sblim-cim-client-2.2.1-r1 b/metadata/md5-cache/dev-java/sblim-cim-client-2.2.1-r1
index ff2a47466947..28465b5ad9d5 100644
--- a/metadata/md5-cache/dev-java/sblim-cim-client-2.2.1-r1
+++ b/metadata/md5-cache/dev-java/sblim-cim-client-2.2.1-r1
@@ -9,5 +9,5 @@ LICENSE=CPL-1.0
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2
 SRC_URI=mirror://sourceforge/sblim/sblim-cim-client2-2.2.1-src.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=9364d446f7c2067d58685825a2fb1f10
diff --git a/metadata/md5-cache/dev-java/servletapi-2.2-r3 b/metadata/md5-cache/dev-java/servletapi-2.2-r3
index 1efe3431e221..b48ee409c2bb 100644
--- a/metadata/md5-cache/dev-java/servletapi-2.2-r3
+++ b/metadata/md5-cache/dev-java/servletapi-2.2-r3
@@ -9,5 +9,5 @@ LICENSE=Apache-1.1
 RDEPEND=>=virtual/jre-1.3 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2.2
 SRC_URI=mirror://gentoo/servletapi-2.2-20021101.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=d819c8ca9ad4a1f13904925cb126b510
diff --git a/metadata/md5-cache/dev-java/servletapi-2.2-r4 b/metadata/md5-cache/dev-java/servletapi-2.2-r4
index 0fc015fd14b3..d0673ee3c871 100644
--- a/metadata/md5-cache/dev-java/servletapi-2.2-r4
+++ b/metadata/md5-cache/dev-java/servletapi-2.2-r4
@@ -9,5 +9,5 @@ LICENSE=Apache-1.1
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2.2
 SRC_URI=mirror://gentoo/servletapi-2.2-20021101.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=2a91e9bb2d59edbcea0a2d296099ea62
diff --git a/metadata/md5-cache/dev-java/servletapi-2.3-r3 b/metadata/md5-cache/dev-java/servletapi-2.3-r3
index ed0eba66c165..17ee85e6d17c 100644
--- a/metadata/md5-cache/dev-java/servletapi-2.3-r3
+++ b/metadata/md5-cache/dev-java/servletapi-2.3-r3
@@ -9,5 +9,5 @@ LICENSE=Apache-1.1
 RDEPEND=>=virtual/jre-1.3 >=dev-java/java-config-2.2.0-r3
 SLOT=2.3
 SRC_URI=mirror://gentoo/servletapi-2.3-20021101.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=09c9a078c752142541fe74d614c68ddb
diff --git a/metadata/md5-cache/dev-java/servletapi-2.3-r4 b/metadata/md5-cache/dev-java/servletapi-2.3-r4
index 426dac33142c..f5adee315eac 100644
--- a/metadata/md5-cache/dev-java/servletapi-2.3-r4
+++ b/metadata/md5-cache/dev-java/servletapi-2.3-r4
@@ -9,5 +9,5 @@ LICENSE=Apache-1.1
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3
 SLOT=2.3
 SRC_URI=mirror://gentoo/servletapi-2.3-20021101.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=40c6e19d35bf1b468944aed4cf6bad8d
diff --git a/metadata/md5-cache/dev-java/servletapi-2.4-r5 b/metadata/md5-cache/dev-java/servletapi-2.4-r5
index 1a13f0f7ff6e..c0caa0133fc8 100644
--- a/metadata/md5-cache/dev-java/servletapi-2.4-r5
+++ b/metadata/md5-cache/dev-java/servletapi-2.4-r5
@@ -9,5 +9,5 @@ LICENSE=Apache-1.1
 RDEPEND=>=virtual/jdk-1.4 >=dev-java/java-config-2.2.0-r3
 SLOT=2.4
 SRC_URI=http://archive.apache.org/dist/tomcat/tomcat-5/v5.5.20/src/apache-tomcat-5.5.20-src.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=814d11eab24d6ba2414f84d8dc999bdc
diff --git a/metadata/md5-cache/dev-java/servletapi-2.4-r6 b/metadata/md5-cache/dev-java/servletapi-2.4-r6
index dbb0d78b6a74..1fb8567e8f3a 100644
--- a/metadata/md5-cache/dev-java/servletapi-2.4-r6
+++ b/metadata/md5-cache/dev-java/servletapi-2.4-r6
@@ -9,5 +9,5 @@ LICENSE=Apache-1.1
 RDEPEND=>=virtual/jdk-1.4 >=dev-java/java-config-2.2.0-r3
 SLOT=2.4
 SRC_URI=https://archive.apache.org/dist/tomcat/tomcat-5/v5.5.20/src/apache-tomcat-5.5.20-src.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=54ad7661f29cd0e23d596ecb2c69ee39
diff --git a/metadata/md5-cache/dev-java/simplyhtml-0.13.1-r1 b/metadata/md5-cache/dev-java/simplyhtml-0.13.1-r1
index 1fb0cbfc629e..4a64169fcbc1 100644
--- a/metadata/md5-cache/dev-java/simplyhtml-0.13.1-r1
+++ b/metadata/md5-cache/dev-java/simplyhtml-0.13.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-java/javahelp:0 dev-java/gnu-regexp:1 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/simplyhtml/SimplyHTML_src_0_13_1.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=1f3541238a04a8b3ead5e5ad78461243
diff --git a/metadata/md5-cache/dev-java/skinlf-6.7-r1 b/metadata/md5-cache/dev-java/skinlf-6.7-r1
index 0a88d7be9706..f5bdfb24fdba 100644
--- a/metadata/md5-cache/dev-java/skinlf-6.7-r1
+++ b/metadata/md5-cache/dev-java/skinlf-6.7-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-1.1
 RDEPEND=>=virtual/jre-1.4 dev-java/laf-plugin:0 dev-java/xalan:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://skinlf.dev.java.net/files/documents/66/37801/skinlf-6.7-20060722.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=2f9cdf5f5a9de82e67772996073b8026
diff --git a/metadata/md5-cache/dev-java/slf4j-api-1.7.7 b/metadata/md5-cache/dev-java/slf4j-api-1.7.7
index 07cc12ac4d68..30cc2270f57c 100644
--- a/metadata/md5-cache/dev-java/slf4j-api-1.7.7
+++ b/metadata/md5-cache/dev-java/slf4j-api-1.7.7
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://www.slf4j.org/dist/slf4j-1.7.7.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=dccd62aeb43d26e27ca1f8feb660ba66
diff --git a/metadata/md5-cache/dev-java/slf4j-ext-1.7.5 b/metadata/md5-cache/dev-java/slf4j-ext-1.7.5
index a89db55ef254..7ad5152696fa 100644
--- a/metadata/md5-cache/dev-java/slf4j-ext-1.7.5
+++ b/metadata/md5-cache/dev-java/slf4j-ext-1.7.5
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 dev-java/slf4j-api:0 dev-java/javassist:3 dev-java/cal
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.slf4j.org/dist/slf4j-1.7.5.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=b55dd37b7e892e31a4ac8edd2b9baeb9
diff --git a/metadata/md5-cache/dev-java/slf4j-ext-1.7.7 b/metadata/md5-cache/dev-java/slf4j-ext-1.7.7
index 1b5df09f8121..becbd5802ef3 100644
--- a/metadata/md5-cache/dev-java/slf4j-ext-1.7.7
+++ b/metadata/md5-cache/dev-java/slf4j-ext-1.7.7
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 dev-java/slf4j-api:0 dev-java/javassist:3 dev-java/cal
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.slf4j.org/dist/slf4j-1.7.7.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=edf1a164c1662d3c3c17168930087d20
diff --git a/metadata/md5-cache/dev-java/slf4j-log4j12-1.7.7 b/metadata/md5-cache/dev-java/slf4j-log4j12-1.7.7
index ebb3619489b3..840e82bf6fed 100644
--- a/metadata/md5-cache/dev-java/slf4j-log4j12-1.7.7
+++ b/metadata/md5-cache/dev-java/slf4j-log4j12-1.7.7
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=dev-java/log4j:0 dev-java/slf4j-api:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://www.slf4j.org/dist/slf4j-1.7.7.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=88bcdd78c78224103d61169f7d7bf98b
diff --git a/metadata/md5-cache/dev-java/slf4j-nop-1.7.7 b/metadata/md5-cache/dev-java/slf4j-nop-1.7.7
index c9b35ac458a6..124b74f74027 100644
--- a/metadata/md5-cache/dev-java/slf4j-nop-1.7.7
+++ b/metadata/md5-cache/dev-java/slf4j-nop-1.7.7
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/jre-1.6 dev-java/slf4j-api:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://www.slf4j.org/dist/slf4j-1.7.7.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=526245eca5f28dfa648ddd5fb385a913
diff --git a/metadata/md5-cache/dev-java/slf4j-simple-1.7.7 b/metadata/md5-cache/dev-java/slf4j-simple-1.7.7
index 333106f2d5ee..c62cfe5fbab3 100644
--- a/metadata/md5-cache/dev-java/slf4j-simple-1.7.7
+++ b/metadata/md5-cache/dev-java/slf4j-simple-1.7.7
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/jre-1.6 dev-java/slf4j-api:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://www.slf4j.org/dist/slf4j-1.7.7.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=02470128a295cf0e398636d5451db3fe
diff --git a/metadata/md5-cache/dev-java/smack-2.2.1 b/metadata/md5-cache/dev-java/smack-2.2.1
index f275d2484839..0ae7d7c5cb4b 100644
--- a/metadata/md5-cache/dev-java/smack-2.2.1
+++ b/metadata/md5-cache/dev-java/smack-2.2.1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.4 dev-java/xpp3 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2.2
 SRC_URI=http://www.jivesoftware.org/builds/smack/smack-dev-2.2.1.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=90a3feaa2daea65d675d423649d8cf40
diff --git a/metadata/md5-cache/dev-java/snappy-1.0.3_rc3 b/metadata/md5-cache/dev-java/snappy-1.0.3_rc3
index 03433cd37b58..ac3a77436e66 100644
--- a/metadata/md5-cache/dev-java/snappy-1.0.3_rc3
+++ b/metadata/md5-cache/dev-java/snappy-1.0.3_rc3
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 dev-java/osgi-core-api:0 app-arch/snappy >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1.0
 SRC_URI=https://github.com/xerial/snappy-java/archive/snappy-java-1.0.3-rc3.tar.gz -> snappy-java-1.0.3_rc3.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=9c87aad9bb1076d8f5cec730a1ad9f6e
diff --git a/metadata/md5-cache/dev-java/snappy-1.1.0.1 b/metadata/md5-cache/dev-java/snappy-1.1.0.1
index 1bbe2c4d9c83..89a8ccd1a711 100644
--- a/metadata/md5-cache/dev-java/snappy-1.1.0.1
+++ b/metadata/md5-cache/dev-java/snappy-1.1.0.1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 dev-java/osgi-core-api:0 app-arch/snappy >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1.1
 SRC_URI=https://github.com/xerial/snappy-java/archive/1.1.0.1.tar.gz -> snappy-java-1.1.0.1.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=682a7afb07c4d74950986862764f2924
diff --git a/metadata/md5-cache/dev-java/spice-jndikit-1.2 b/metadata/md5-cache/dev-java/spice-jndikit-1.2
index 0c23618b7f42..adc73f689dff 100644
--- a/metadata/md5-cache/dev-java/spice-jndikit-1.2
+++ b/metadata/md5-cache/dev-java/spice-jndikit-1.2
@@ -9,5 +9,5 @@ LICENSE=Spice-1.1
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://dist.codehaus.org/spice/distributions/spice-jndikit-1.2-src.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=1037c0372a406c5c1059b53846ca34aa
diff --git a/metadata/md5-cache/dev-java/spin-1.5-r1 b/metadata/md5-cache/dev-java/spin-1.5-r1
index 7c7f7571d4fe..1111059a46f3 100644
--- a/metadata/md5-cache/dev-java/spin-1.5-r1
+++ b/metadata/md5-cache/dev-java/spin-1.5-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 dev-java/cglib:3 >=dev-java/java-config-2.2.0-r3 sourc
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/spin/spin-1.5-all.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=8bfd524ca4facefc1b00aa755c67ad78
diff --git a/metadata/md5-cache/dev-java/spring-aop-3.2.4 b/metadata/md5-cache/dev-java/spring-aop-3.2.4
index c47f432bb2f4..a595e86a1600 100644
--- a/metadata/md5-cache/dev-java/spring-aop-3.2.4
+++ b/metadata/md5-cache/dev-java/spring-aop-3.2.4
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.7 dev-java/spring-core:3.2 dev-java/spring-beans:3.2 dev-java/aopalliance:1 dev-java/aspectj:0 dev-java/commons-logging:0 dev-java/commons-pool:0 dev-java/jamon:1 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=3.2
 SRC_URI=https://github.com/SpringSource/spring-framework/archive/v3.2.4.RELEASE.tar.gz -> spring-framework-3.2.4.tar.gz https://dev.gentoo.org/~ercpe/distfiles/dev-java/spring-framework/spring-framework-3.2.4-buildscripts.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=a44f80ef803a617a21ecb3234336b289
diff --git a/metadata/md5-cache/dev-java/spring-beans-3.2.4 b/metadata/md5-cache/dev-java/spring-beans-3.2.4
index b55eb32731f3..ef8dde4a9bef 100644
--- a/metadata/md5-cache/dev-java/spring-beans-3.2.4
+++ b/metadata/md5-cache/dev-java/spring-beans-3.2.4
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.7 dev-java/commons-logging:0 java-virtuals/servlet-api:3.0 dev-java/javax-inject:0 dev-java/spring-core:3.2 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=3.2
 SRC_URI=https://github.com/SpringSource/spring-framework/archive/v3.2.4.RELEASE.tar.gz -> spring-framework-3.2.4.tar.gz https://dev.gentoo.org/~ercpe/distfiles/dev-java/spring-framework/spring-framework-3.2.4-buildscripts.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=6da32f2574f814c9ef223e11ac2579a5
diff --git a/metadata/md5-cache/dev-java/spring-core-3.2.4 b/metadata/md5-cache/dev-java/spring-core-3.2.4
index 94640232b477..a43feb469cea 100644
--- a/metadata/md5-cache/dev-java/spring-core-3.2.4
+++ b/metadata/md5-cache/dev-java/spring-core-3.2.4
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.7 dev-java/commons-logging:0 dev-java/log4j:0 dev-java/aspectj:0 dev-java/asm:4 dev-java/cglib:3 dev-java/jopt-simple:4.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=3.2
 SRC_URI=https://github.com/SpringSource/spring-framework/archive/v3.2.4.RELEASE.tar.gz -> spring-framework-3.2.4.tar.gz https://dev.gentoo.org/~ercpe/distfiles/dev-java/spring-framework/spring-framework-3.2.4-buildscripts.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=87c519da68f83820ecdeff40ab0a67db
diff --git a/metadata/md5-cache/dev-java/spring-expression-3.2.4 b/metadata/md5-cache/dev-java/spring-expression-3.2.4
index 0877a3cf8b4f..c46597cc302a 100644
--- a/metadata/md5-cache/dev-java/spring-expression-3.2.4
+++ b/metadata/md5-cache/dev-java/spring-expression-3.2.4
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.7 dev-java/spring-core:3.2 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=3.2
 SRC_URI=https://github.com/SpringSource/spring-framework/archive/v3.2.4.RELEASE.tar.gz -> spring-framework-3.2.4.tar.gz https://dev.gentoo.org/~ercpe/distfiles/dev-java/spring-framework/spring-framework-3.2.4-buildscripts.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=3c685354f3d4ce61d3c30ce6991c0c0d
diff --git a/metadata/md5-cache/dev-java/spring-instrument-3.2.4 b/metadata/md5-cache/dev-java/spring-instrument-3.2.4
index a9f3681a7117..02b669d3400e 100644
--- a/metadata/md5-cache/dev-java/spring-instrument-3.2.4
+++ b/metadata/md5-cache/dev-java/spring-instrument-3.2.4
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=3.2
 SRC_URI=https://github.com/SpringSource/spring-framework/archive/v3.2.4.RELEASE.tar.gz -> spring-framework-3.2.4.tar.gz https://dev.gentoo.org/~ercpe/distfiles/dev-java/spring-framework/spring-framework-3.2.4-buildscripts.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=1d85fc4c425acee734ecc5e20f392c36
diff --git a/metadata/md5-cache/dev-java/squareness-jlf-2.3.0-r1 b/metadata/md5-cache/dev-java/squareness-jlf-2.3.0-r1
index 65a5c749adfb..f2b24380aaeb 100644
--- a/metadata/md5-cache/dev-java/squareness-jlf-2.3.0-r1
+++ b/metadata/md5-cache/dev-java/squareness-jlf-2.3.0-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.4 dev-java/laf-plugin:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/squareness/squareness_jlf_src-2.3.0.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=a460b84cbeea73767f2b2c36962e343d
diff --git a/metadata/md5-cache/dev-java/stax-1.2.0 b/metadata/md5-cache/dev-java/stax-1.2.0
index 7e24c2725ac8..82a109f7fdf7 100644
--- a/metadata/md5-cache/dev-java/stax-1.2.0
+++ b/metadata/md5-cache/dev-java/stax-1.2.0
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 RESTRICT=test
 SLOT=0
 SRC_URI=http://dist.codehaus.org/stax/distributions/stax-src-1.2.0.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=e4d3134bcbdc173bc0af39f43641ca55
diff --git a/metadata/md5-cache/dev-java/sun-dtdparser-1.0 b/metadata/md5-cache/dev-java/sun-dtdparser-1.0
index 7af8c3248fa8..a621b3da104b 100644
--- a/metadata/md5-cache/dev-java/sun-dtdparser-1.0
+++ b/metadata/md5-cache/dev-java/sun-dtdparser-1.0
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://gentoo/dtd-parser-1.0-src.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=0e431c16adc3543452c35cce5c0ac458
diff --git a/metadata/md5-cache/dev-java/sun-jacc-api-20070102 b/metadata/md5-cache/dev-java/sun-jacc-api-20070102
index 3f5e9ad3b385..476d4545b8c8 100644
--- a/metadata/md5-cache/dev-java/sun-jacc-api-20070102
+++ b/metadata/md5-cache/dev-java/sun-jacc-api-20070102
@@ -9,5 +9,5 @@ LICENSE=CDDL
 RDEPEND=>=virtual/jre-1.4 =dev-java/servletapi-2.4* >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=mirror://gentoo/sun-jacc-api-20070102.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=82d48daecae62764feeccf786dd1b67f
diff --git a/metadata/md5-cache/dev-java/sun-jaf-1.1.1 b/metadata/md5-cache/dev-java/sun-jaf-1.1.1
index 7e3cf60ad79e..d24cf1a2ce1b 100644
--- a/metadata/md5-cache/dev-java/sun-jaf-1.1.1
+++ b/metadata/md5-cache/dev-java/sun-jaf-1.1.1
@@ -9,5 +9,5 @@ LICENSE=CDDL
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://gentoo/sun-jaf-1.1.1.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=a49c825a7420c6e545de5b1d994f56d6
diff --git a/metadata/md5-cache/dev-java/super-csv-2.3.1 b/metadata/md5-cache/dev-java/super-csv-2.3.1
index 4e67e88fe9c8..ea3c44a3f066 100644
--- a/metadata/md5-cache/dev-java/super-csv-2.3.1
+++ b/metadata/md5-cache/dev-java/super-csv-2.3.1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/super-csv/super-csv/archive/v2.3.1.zip -> super-csv-2.3.1.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=7d3585a2eaf8f531285ee87e0ab511ac
diff --git a/metadata/md5-cache/dev-java/svgsalamander-0.0-r2 b/metadata/md5-cache/dev-java/svgsalamander-0.0-r2
index ccc7525649ef..58149cfe0d44 100644
--- a/metadata/md5-cache/dev-java/svgsalamander-0.0-r2
+++ b/metadata/md5-cache/dev-java/svgsalamander-0.0-r2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-java/ant-core:0 dev-java/javacc:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://gentoo/svgsalamander-0.0.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=d9cec4124050563c0926ef5c76872fd5
diff --git a/metadata/md5-cache/dev-java/swarmcache-1.0_pre20050106-r1 b/metadata/md5-cache/dev-java/swarmcache-1.0_pre20050106-r1
index 71b8bb3a8b6f..9e8e2ec8e0d2 100644
--- a/metadata/md5-cache/dev-java/swarmcache-1.0_pre20050106-r1
+++ b/metadata/md5-cache/dev-java/swarmcache-1.0_pre20050106-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 >=dev-java/commons-collections-3 >=dev-java/commons-lo
 RESTRICT=test
 SLOT=1.0
 SRC_URI=mirror://gentoo/swarmcache-1.0_pre20050106.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=e52f5bf355d4288eefceb05039c4dcad
diff --git a/metadata/md5-cache/dev-java/swt-3.7.2-r2 b/metadata/md5-cache/dev-java/swt-3.7.2-r2
index ea9d7a27747a..9d901dd8ca31 100644
--- a/metadata/md5-cache/dev-java/swt-3.7.2-r2
+++ b/metadata/md5-cache/dev-java/swt-3.7.2-r2
@@ -9,5 +9,5 @@ LICENSE=CPL-1.0 LGPL-2.1 MPL-1.1
 RDEPEND=>=virtual/jre-1.4 >=dev-libs/glib-2.6 >=x11-libs/gtk+-2.6.8:2 >=dev-libs/atk-1.10.2 cairo? ( >=x11-libs/cairo-1.4.14 ) gnome? ( =gnome-base/libgnome-2* =gnome-base/gnome-vfs-2* =gnome-base/libgnomeui-2* ) opengl? ( virtual/opengl virtual/glu ) x11-libs/libXtst >=dev-java/java-config-2.2.0-r3
 SLOT=3.7
 SRC_URI=amd64? ( http://archive.eclipse.org/eclipse/downloads/drops/R-3.7.2-201202080800/swt-3.7.2-gtk-linux-x86_64.zip ) ppc? ( http://archive.eclipse.org/eclipse/downloads/drops/R-3.7.2-201202080800/swt-3.7.2-gtk-linux-x86.zip ) ppc64? ( http://archive.eclipse.org/eclipse/downloads/drops/R-3.7.2-201202080800/swt-3.7.2-gtk-linux-ppc64.zip ) x86? ( http://archive.eclipse.org/eclipse/downloads/drops/R-3.7.2-201202080800/swt-3.7.2-gtk-linux-x86.zip ) x86-fbsd? ( http://archive.eclipse.org/eclipse/downloads/drops/R-3.7.2-201202080800/swt-3.7.2-gtk-linux-x86.zip )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-osgi	c90eda970384b702459d01fc288d647d	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-osgi	c90eda970384b702459d01fc288d647d	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=e220b1e4a200130a18e2508812411db4
diff --git a/metadata/md5-cache/dev-java/swt-3.8.2-r2 b/metadata/md5-cache/dev-java/swt-3.8.2-r2
index f0771229b1ae..d825aa2925dd 100644
--- a/metadata/md5-cache/dev-java/swt-3.8.2-r2
+++ b/metadata/md5-cache/dev-java/swt-3.8.2-r2
@@ -9,5 +9,5 @@ LICENSE=CPL-1.0 LGPL-2.1 MPL-1.1
 RDEPEND=>=virtual/jre-1.4 >=dev-libs/glib-2.6 >=x11-libs/gtk+-2.6.8:2 >=dev-libs/atk-1.10.2 cairo? ( >=x11-libs/cairo-1.4.14 ) gnome? ( gnome-base/gnome-vfs:2 gnome-base/libgnome gnome-base/libgnomeui ) opengl? ( virtual/opengl virtual/glu ) x11-libs/libXtst >=dev-java/java-config-2.2.0-r3
 SLOT=3.8
 SRC_URI=amd64? ( http://archive.eclipse.org/eclipse/downloads/drops/R-3.8.2-201301310800/swt-3.8.2-gtk-linux-x86_64.zip ) ppc? ( http://archive.eclipse.org/eclipse/downloads/drops/R-3.8.2-201301310800/swt-3.8.2-gtk-linux-x86.zip ) ppc64? ( http://archive.eclipse.org/eclipse/downloads/drops/R-3.8.2-201301310800/swt-3.8.2-gtk-linux-ppc64.zip ) x86? ( http://archive.eclipse.org/eclipse/downloads/drops/R-3.8.2-201301310800/swt-3.8.2-gtk-linux-x86.zip ) x86-fbsd? ( http://archive.eclipse.org/eclipse/downloads/drops/R-3.8.2-201301310800/swt-3.8.2-gtk-linux-x86.zip )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-osgi	c90eda970384b702459d01fc288d647d	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-osgi	c90eda970384b702459d01fc288d647d	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=b5af815b3c3d800b1718c09fbca33ff5
diff --git a/metadata/md5-cache/dev-java/swt-4.2-r3 b/metadata/md5-cache/dev-java/swt-4.2-r3
index 4ff4e488ee28..6c8450548928 100644
--- a/metadata/md5-cache/dev-java/swt-4.2-r3
+++ b/metadata/md5-cache/dev-java/swt-4.2-r3
@@ -9,5 +9,5 @@ LICENSE=CPL-1.0 LGPL-2.1 MPL-1.1
 RDEPEND=>=dev-libs/atk-1.10.2 >=dev-libs/glib-2.32 >=x11-libs/gtk+-2.6.8:2 x11-libs/libXtst cairo? ( >=x11-libs/cairo-1.4.14 ) gnome? ( =gnome-base/gnome-vfs-2* =gnome-base/libgnome-2* =gnome-base/libgnomeui-2* ) opengl? ( virtual/glu virtual/opengl ) >=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3
 SLOT=4.2
 SRC_URI=amd64? ( http://archive.eclipse.org/eclipse/downloads/drops4/R-4.2-201206081400/swt-4.2-gtk-linux-x86_64.zip ) ppc? ( http://archive.eclipse.org/eclipse/downloads/drops4/R-4.2-201206081400/swt-4.2-gtk-linux-x86.zip ) ppc64? ( http://archive.eclipse.org/eclipse/downloads/drops4/R-4.2-201206081400/swt-4.2-gtk-linux-ppc64.zip ) x86? ( http://archive.eclipse.org/eclipse/downloads/drops4/R-4.2-201206081400/swt-4.2-gtk-linux-x86.zip ) x86-fbsd? ( http://archive.eclipse.org/eclipse/downloads/drops4/R-4.2-201206081400/swt-4.2-gtk-linux-x86.zip )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-osgi	c90eda970384b702459d01fc288d647d	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-osgi	c90eda970384b702459d01fc288d647d	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=bf735aa703b2454878c0c17c83cdd4ec
diff --git a/metadata/md5-cache/dev-java/tagsoup-1.2.1 b/metadata/md5-cache/dev-java/tagsoup-1.2.1
index a4439a65b935..8c898e1bac77 100644
--- a/metadata/md5-cache/dev-java/tagsoup-1.2.1
+++ b/metadata/md5-cache/dev-java/tagsoup-1.2.1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://mercury.ccil.org/~cowan/XML/tagsoup/tagsoup-1.2.1-src.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=fa65f246930586bfdaacea11b5bbd202
diff --git a/metadata/md5-cache/dev-java/tapestry-3.0.4-r2 b/metadata/md5-cache/dev-java/tapestry-3.0.4-r2
index 49b252684be0..fae0aba7be02 100644
--- a/metadata/md5-cache/dev-java/tapestry-3.0.4-r2
+++ b/metadata/md5-cache/dev-java/tapestry-3.0.4-r2
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-java/bsf:2.3 dev-java/commons-beanutils:1.7 dev-java/commons-codec:0 dev-java/commons-digester:0 dev-java/commons-fileupload:0 dev-java/commons-lang:2.1 dev-java/commons-logging:0 dev-java/jakarta-oro:2.0 dev-java/javassist:2 dev-java/ognl:3.0 dev-java/servletapi:2.4 >=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=3.0
 SRC_URI=mirror://apache/tapestry/Tapestry-3.0.4-src.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=ed28cfbacfd9a6e0ce4a6ce6eb6ce28a
diff --git a/metadata/md5-cache/dev-java/tapestry-3.0.4-r3 b/metadata/md5-cache/dev-java/tapestry-3.0.4-r3
index c6ca58b2e79e..bf466f420ac4 100644
--- a/metadata/md5-cache/dev-java/tapestry-3.0.4-r3
+++ b/metadata/md5-cache/dev-java/tapestry-3.0.4-r3
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-java/bsf:2.3 dev-java/commons-beanutils:1.7 dev-java/commons-codec:0 dev-java/commons-digester:0 dev-java/commons-fileupload:0 dev-java/commons-lang:2.1 dev-java/commons-logging:0 dev-java/jakarta-oro:2.0 dev-java/javassist:2 dev-java/ognl:3.0 dev-java/tomcat-servlet-api:2.4 >=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=3.0
 SRC_URI=mirror://apache/tapestry/Tapestry-3.0.4-src.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=17c90cd55ca66c1ac6125f5a007ac827
diff --git a/metadata/md5-cache/dev-java/tomcat-jstl-compat-1.2.5-r1 b/metadata/md5-cache/dev-java/tomcat-jstl-compat-1.2.5-r1
index a4c879fa7009..590aced2854c 100644
--- a/metadata/md5-cache/dev-java/tomcat-jstl-compat-1.2.5-r1
+++ b/metadata/md5-cache/dev-java/tomcat-jstl-compat-1.2.5-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-java/tomcat-jstl-spec:0 dev-java/tomcat-jstl-impl:0 java-virtuals/servlet-api:3.0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://apache.mirrors.ovh.net/ftp.apache.org/dist/tomcat/taglibs/taglibs-standard-1.2.5/taglibs-standard-1.2.5-source-release.zip -> tomcat-jstl-compat-1.2.5.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=0b314a1e79c47565c2ccd2d5dd28c445
diff --git a/metadata/md5-cache/dev-java/tomcat-jstl-el-1.2.5-r1 b/metadata/md5-cache/dev-java/tomcat-jstl-el-1.2.5-r1
index 0ce142cfe905..8e68d44e48f0 100644
--- a/metadata/md5-cache/dev-java/tomcat-jstl-el-1.2.5-r1
+++ b/metadata/md5-cache/dev-java/tomcat-jstl-el-1.2.5-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-java/tomcat-jstl-impl:0 dev-java/tomcat-jstl-spec:0 java-virtuals/servlet-api:3.0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://apache.mirrors.ovh.net/ftp.apache.org/dist/tomcat/taglibs/taglibs-standard-1.2.5/taglibs-standard-1.2.5-source-release.zip -> tomcat-jstl-el-1.2.5.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=b35c235a6d96d48e3b0b464fb588d1c8
diff --git a/metadata/md5-cache/dev-java/tomcat-jstl-impl-1.2.5-r1 b/metadata/md5-cache/dev-java/tomcat-jstl-impl-1.2.5-r1
index 2c5b98a8af79..8d59d54f9af7 100644
--- a/metadata/md5-cache/dev-java/tomcat-jstl-impl-1.2.5-r1
+++ b/metadata/md5-cache/dev-java/tomcat-jstl-impl-1.2.5-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-java/xalan:0 dev-java/tomcat-jstl-spec:0 dev-java/tomcat-servlet-api:3.1 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://apache.mirrors.ovh.net/ftp.apache.org/dist/tomcat/taglibs/taglibs-standard-1.2.5/taglibs-standard-1.2.5-source-release.zip -> tomcat-jstl-impl-1.2.5.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=3b156f83be6e54ca69e340ae6ac21b8d
diff --git a/metadata/md5-cache/dev-java/tomcat-jstl-spec-1.2.5-r1 b/metadata/md5-cache/dev-java/tomcat-jstl-spec-1.2.5-r1
index 105b6821dc52..9a1000b597d9 100644
--- a/metadata/md5-cache/dev-java/tomcat-jstl-spec-1.2.5-r1
+++ b/metadata/md5-cache/dev-java/tomcat-jstl-spec-1.2.5-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=java-virtuals/servlet-api:3.0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://apache.mirrors.ovh.net/ftp.apache.org/dist/tomcat/taglibs/taglibs-standard-1.2.5/taglibs-standard-1.2.5-source-release.zip -> tomcat-jstl-spec-1.2.5.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=80680f00201543ce8406ed3ddb38ce83
diff --git a/metadata/md5-cache/dev-java/tomcat-native-1.2.14 b/metadata/md5-cache/dev-java/tomcat-native-1.2.14
index 081c547dedb9..8fc8729a4ca5 100644
--- a/metadata/md5-cache/dev-java/tomcat-native-1.2.14
+++ b/metadata/md5-cache/dev-java/tomcat-native-1.2.14
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-libs/apr:1 dev-libs/openssl:= >=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=mirror://apache/tomcat/tomcat-connectors/native/1.2.14/source/tomcat-native-1.2.14-src.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=220f8e8ef9878cb22676a261c0d4811f
diff --git a/metadata/md5-cache/dev-java/tomcat-native-1.2.16 b/metadata/md5-cache/dev-java/tomcat-native-1.2.16
index 422b68ea6bb7..e2753f0fe32c 100644
--- a/metadata/md5-cache/dev-java/tomcat-native-1.2.16
+++ b/metadata/md5-cache/dev-java/tomcat-native-1.2.16
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-libs/apr:1 dev-libs/openssl:= >=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=mirror://apache/tomcat/tomcat-connectors/native/1.2.16/source/tomcat-native-1.2.16-src.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=48ff38fa0542e37bcc4a1c6d087208da
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-3 b/metadata/md5-cache/dev-java/tomcat-servlet-api-3
index 496bf5a317e9..5a509768cd83 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-3
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-3
@@ -9,5 +9,5 @@ LICENSE=Apache-1.1
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2.2
 SRC_URI=mirror://apache/jakarta/tomcat-3/src/jakarta-servletapi-src.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=0be039d36b742b792685db4a8dba397e
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-4.1.36 b/metadata/md5-cache/dev-java/tomcat-servlet-api-4.1.36
index 410b808c59a4..3fa060178387 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-4.1.36
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-4.1.36
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2.3
 SRC_URI=mirror://apache/tomcat/tomcat-4/v4.1.36/src/apache-tomcat-4.1.36-src.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=b2304685ab105b44b1e285cc7b40a5d2
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-5.5.27-r1 b/metadata/md5-cache/dev-java/tomcat-servlet-api-5.5.27-r1
index f6a024aa74ae..a2a99be7acdf 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-5.5.27-r1
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-5.5.27-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jdk-1.5 >=dev-java/java-config-2.2.0-r3
 SLOT=2.4
 SRC_URI=mirror://apache/tomcat/tomcat-5/v5.5.27/src/apache-tomcat-5.5.27-src.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-osgi	c90eda970384b702459d01fc288d647d	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-osgi	c90eda970384b702459d01fc288d647d	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=3dfd469fcbecd84ad92f3d4f58f1f978
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-5.5.34 b/metadata/md5-cache/dev-java/tomcat-servlet-api-5.5.34
index 0c5f484a9740..426771acac49 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-5.5.34
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-5.5.34
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jdk-1.5 >=dev-java/java-config-2.2.0-r3
 SLOT=2.4
 SRC_URI=mirror://apache/tomcat/tomcat-5/v5.5.34/src/apache-tomcat-5.5.34-src.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-osgi	c90eda970384b702459d01fc288d647d	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-osgi	c90eda970384b702459d01fc288d647d	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=2a39f90106bd586ae689d25ce3951173
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-6.0.44-r1 b/metadata/md5-cache/dev-java/tomcat-servlet-api-6.0.44-r1
index 75774adc2a79..9f87085c986b 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-6.0.44-r1
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-6.0.44-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2.5
 SRC_URI=mirror://apache/tomcat/tomcat-6/v6.0.44/src/apache-tomcat-6.0.44-src.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=aa244fe54e74cfc621130ba8e5b50865
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-6.0.45 b/metadata/md5-cache/dev-java/tomcat-servlet-api-6.0.45
index f59a9a5b616e..992ed57bb4f9 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-6.0.45
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-6.0.45
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2.5
 SRC_URI=mirror://apache/tomcat/tomcat-6/v6.0.45/src/apache-tomcat-6.0.45-src.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=5a59dffb3ab53cf2a69a9b0a1fa64cee
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-6.0.53 b/metadata/md5-cache/dev-java/tomcat-servlet-api-6.0.53
index 6bc09302688b..855ba788a3f3 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-6.0.53
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-6.0.53
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2.5
 SRC_URI=mirror://apache/tomcat/tomcat-6/v6.0.53/src/apache-tomcat-6.0.53-src.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=78e6df7787e33e61ca61baaa6c998d1e
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-7.0.82 b/metadata/md5-cache/dev-java/tomcat-servlet-api-7.0.82
index e1e089dd1b1f..d9ab8331e876 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-7.0.82
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-7.0.82
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=3.0
 SRC_URI=mirror://apache/tomcat/tomcat-7/v7.0.82/src/apache-tomcat-7.0.82-src.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=e82a26a2a780d2ae0e3a0f9cd2647c49
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-7.0.84 b/metadata/md5-cache/dev-java/tomcat-servlet-api-7.0.84
index fb571fef803a..73c0e885f236 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-7.0.84
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-7.0.84
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=3.0
 SRC_URI=mirror://apache/tomcat/tomcat-7/v7.0.84/src/apache-tomcat-7.0.84-src.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=779a8bed93a93b69d5ac1757890a916c
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-7.0.85 b/metadata/md5-cache/dev-java/tomcat-servlet-api-7.0.85
index 19483fb022f0..0a5f763acb8b 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-7.0.85
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-7.0.85
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=3.0
 SRC_URI=mirror://apache/tomcat/tomcat-7/v7.0.85/src/apache-tomcat-7.0.85-src.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=779a8bed93a93b69d5ac1757890a916c
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.0.48 b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.0.48
index c5dd2aece785..c2c49748985e 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.0.48
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.0.48
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=3.1
 SRC_URI=mirror://apache/tomcat/tomcat-8/v8.0.48/src/apache-tomcat-8.0.48-src.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=1b3f03355b813721a9204e8e46d68185
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.0.49 b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.0.49
index fa11d024d01b..8fe882fb5dfc 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.0.49
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.0.49
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=3.1
 SRC_URI=mirror://apache/tomcat/tomcat-8/v8.0.49/src/apache-tomcat-8.0.49-src.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=c1fe3ba0136216ce36f0693ecde026b6
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.0.50 b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.0.50
index 2c4406782de0..8e165def7aa9 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.0.50
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.0.50
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=3.1
 SRC_URI=mirror://apache/tomcat/tomcat-8/v8.0.50/src/apache-tomcat-8.0.50-src.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=c1fe3ba0136216ce36f0693ecde026b6
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.11 b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.11
index 90de52a830cc..8c41965b1318 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.11
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.11
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=3.1
 SRC_URI=mirror://apache/tomcat/tomcat-8/v8.5.11/src/apache-tomcat-8.5.11-src.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=5189711e10ea83e6dd9100212a61099b
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.23 b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.23
index 92ddb921aa8e..8c748167bccd 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.23
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.23
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=3.1
 SRC_URI=mirror://apache/tomcat/tomcat-8/v8.5.23/src/apache-tomcat-8.5.23-src.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=7fa97a50c5e386ce2850b0a2e7001f7b
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.24 b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.24
index 9c2b41f09e3b..ffe713da3da0 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.24
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.24
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=3.1
 SRC_URI=mirror://apache/tomcat/tomcat-8/v8.5.24/src/apache-tomcat-8.5.24-src.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=6cb28624e7504c7ac433a8c198dde806
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.27 b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.27
index 772c73053211..9608056ba801 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.27
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.27
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=3.1
 SRC_URI=mirror://apache/tomcat/tomcat-8/v8.5.27/src/apache-tomcat-8.5.27-src.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=466a50287d6629c3864557c848e828eb
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.28 b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.28
index a2e6870e7757..d9561871b5e6 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.28
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.28
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=3.1
 SRC_URI=mirror://apache/tomcat/tomcat-8/v8.5.28/src/apache-tomcat-8.5.28-src.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=466a50287d6629c3864557c848e828eb
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.4 b/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.4
index 8a53d6d21f1d..ce8183f6a2a3 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.4
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.4
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=4.0
 SRC_URI=mirror://apache/tomcat/tomcat-9/v9.0.4/src/apache-tomcat-9.0.4-src.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=2b8827f71321f04c309f7a1cccf79d5d
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.5 b/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.5
index ad143003af8d..d9824a6c92be 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.5
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.5
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=4.0
 SRC_URI=mirror://apache/tomcat/tomcat-9/v9.0.5/src/apache-tomcat-9.0.5-src.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=2b8827f71321f04c309f7a1cccf79d5d
diff --git a/metadata/md5-cache/dev-java/treelayout-1.0.2 b/metadata/md5-cache/dev-java/treelayout-1.0.2
index 965c905cc8c2..98770c1aef9b 100644
--- a/metadata/md5-cache/dev-java/treelayout-1.0.2
+++ b/metadata/md5-cache/dev-java/treelayout-1.0.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/abego/treelayout/archive/v1.0.2.tar.gz -> treelayout-1.0.2.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=0bede0c19e35672400b1c787a3673ae6
diff --git a/metadata/md5-cache/dev-java/trident-1.3 b/metadata/md5-cache/dev-java/trident-1.3
index 03c434d08ce6..ebeee64fba79 100644
--- a/metadata/md5-cache/dev-java/trident-1.3
+++ b/metadata/md5-cache/dev-java/trident-1.3
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 dev-java/swt:3.7 >=dev-java/java-config-2.2.0-r3 sourc
 RESTRICT=test
 SLOT=0
 SRC_URI=https://kenai.com/projects/trident/downloads/download/version%201.3%20-%20stable/trident-all.zip -> trident-1.3.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=2f80b86c7c62e5e4588953bc93f543a5
diff --git a/metadata/md5-cache/dev-java/vecmath-1.6.0_pre12 b/metadata/md5-cache/dev-java/vecmath-1.6.0_pre12
index 7f2fa9ddac46..0440ff044b59 100644
--- a/metadata/md5-cache/dev-java/vecmath-1.6.0_pre12
+++ b/metadata/md5-cache/dev-java/vecmath-1.6.0_pre12
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/hharrison/vecmath/archive/1.6.0-pre12.tar.gz -> vecmath-1.6.0_pre12.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=50f4b389050a187f8eeda3446df1c448
diff --git a/metadata/md5-cache/dev-java/werken-xpath-0.9.4_beta-r4 b/metadata/md5-cache/dev-java/werken-xpath-0.9.4_beta-r4
index 850b4ba71a21..c88161b89c56 100644
--- a/metadata/md5-cache/dev-java/werken-xpath-0.9.4_beta-r4
+++ b/metadata/md5-cache/dev-java/werken-xpath-0.9.4_beta-r4
@@ -9,5 +9,5 @@ LICENSE=JDOM
 RDEPEND=>=virtual/jre-1.4 dev-java/jdom:0 >=dev-java/antlr-2.7.7-r7:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://gentoo/werken.xpath-0.9.4-beta-src.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=dfd0bc1fc52c6fe27e9506525c85dd26
diff --git a/metadata/md5-cache/dev-java/wsdl4j-1.6.2 b/metadata/md5-cache/dev-java/wsdl4j-1.6.2
index ffdf33d41130..2f78be4f933c 100644
--- a/metadata/md5-cache/dev-java/wsdl4j-1.6.2
+++ b/metadata/md5-cache/dev-java/wsdl4j-1.6.2
@@ -9,5 +9,5 @@ LICENSE=CPL-1.0
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/wsdl4j/wsdl4j-src-1.6.2.zip test? ( mirror://sourceforge/jwsdltck/jwsdltck-bin-1.2.zip )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=a9c37cc4a30299e59f9f889658cea8f0
diff --git a/metadata/md5-cache/dev-java/wstx-3.2.9-r1 b/metadata/md5-cache/dev-java/wstx-3.2.9-r1
index 77abd9af79e4..2e53fa72e726 100644
--- a/metadata/md5-cache/dev-java/wstx-3.2.9-r1
+++ b/metadata/md5-cache/dev-java/wstx-3.2.9-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-java/sax:0 dev-java/msv:0 dev-java/relaxng-datatype:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=3.2
 SRC_URI=mirror://gentoo/wstx-src-3.2.9.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=edb56e0437c58c79c7108df0363e1d92
diff --git a/metadata/md5-cache/dev-java/xalan-2.7.2 b/metadata/md5-cache/dev-java/xalan-2.7.2
index f683113118b7..f9dce32438bc 100644
--- a/metadata/md5-cache/dev-java/xalan-2.7.2
+++ b/metadata/md5-cache/dev-java/xalan-2.7.2
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-java/javacup:0 dev-java/bcel:0 >=virtual/jre-1.3 ~dev-java/xalan-serializer-2.7.2:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/xalan/xalan-j/source/xalan-j_2_7_2-src.tar.gz doc? ( mirror://apache/xalan/xalan-j/binaries/xalan-j_2_7_2-bin.zip )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=6d5cecaed24df7ca6c66d2356aff1143
diff --git a/metadata/md5-cache/dev-java/xalan-serializer-2.7.2 b/metadata/md5-cache/dev-java/xalan-serializer-2.7.2
index bcabc5badf82..36ba6971ee02 100644
--- a/metadata/md5-cache/dev-java/xalan-serializer-2.7.2
+++ b/metadata/md5-cache/dev-java/xalan-serializer-2.7.2
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.3 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/xalan/xalan-j/source/xalan-j_2_7_2-src.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=6ccfc2a0cfdbd7840d6f3fe43ada8a98
diff --git a/metadata/md5-cache/dev-java/xerces-2.11.0 b/metadata/md5-cache/dev-java/xerces-2.11.0
index b7c2c13f9649..3e678c75c10b 100644
--- a/metadata/md5-cache/dev-java/xerces-2.11.0
+++ b/metadata/md5-cache/dev-java/xerces-2.11.0
@@ -10,5 +10,5 @@ RDEPEND=dev-java/xml-commons-external:1.4 >=dev-java/xml-commons-resolver-1.2:0
 RESTRICT=test
 SLOT=2
 SRC_URI=mirror://apache/xerces/j/Xerces-J-src.2.11.0.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=9ffd2e1270002799b5efc9fb82976770
diff --git a/metadata/md5-cache/dev-java/xerces-2.11.0-r1 b/metadata/md5-cache/dev-java/xerces-2.11.0-r1
index 07e4a66ae26d..1ae203b23f4a 100644
--- a/metadata/md5-cache/dev-java/xerces-2.11.0-r1
+++ b/metadata/md5-cache/dev-java/xerces-2.11.0-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-java/xml-commons-external:1.4 >=dev-java/xml-commons-resolver-1.2:0
 RESTRICT=test
 SLOT=2
 SRC_URI=mirror://apache/xerces/j/Xerces-J-src.2.11.0.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=85d990900febad61cf21d82754404cfb
diff --git a/metadata/md5-cache/dev-java/xerial-core-2.0.1 b/metadata/md5-cache/dev-java/xerial-core-2.0.1
index c5e9b0087be3..a1a023eff7b4 100644
--- a/metadata/md5-cache/dev-java/xerial-core-2.0.1
+++ b/metadata/md5-cache/dev-java/xerial-core-2.0.1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ercpe/distfiles/dev-java/xerial-core/xerial-core-2.0.1.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=654c972a7c7906472c5d010773355f3b
diff --git a/metadata/md5-cache/dev-java/xjavac-20110814 b/metadata/md5-cache/dev-java/xjavac-20110814
index 45dfd402acab..78cec6c1f9f2 100644
--- a/metadata/md5-cache/dev-java/xjavac-20110814
+++ b/metadata/md5-cache/dev-java/xjavac-20110814
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jdk-1.4 >=dev-java/ant-core-1.7 >=dev-java/java-config-2.2.0-r3
 SLOT=1
 SRC_URI=mirror://gentoo/xjavac-20110814.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=1d596313effae982234c69f9242e6ab4
diff --git a/metadata/md5-cache/dev-java/xml-commons-external-1.3.04 b/metadata/md5-cache/dev-java/xml-commons-external-1.3.04
index caa9256ddf58..983a7a9c115c 100644
--- a/metadata/md5-cache/dev-java/xml-commons-external-1.3.04
+++ b/metadata/md5-cache/dev-java/xml-commons-external-1.3.04
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.3 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1.3
 SRC_URI=mirror://gentoo/xml-commons-external-1.3.04.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=2495a74d3d346d92a3fb3fc23203f325
diff --git a/metadata/md5-cache/dev-java/xml-commons-external-1.4.01 b/metadata/md5-cache/dev-java/xml-commons-external-1.4.01
index dafae2d01953..527da308d328 100644
--- a/metadata/md5-cache/dev-java/xml-commons-external-1.4.01
+++ b/metadata/md5-cache/dev-java/xml-commons-external-1.4.01
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.3 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1.4
 SRC_URI=https://dev.gentoo.org/~sera/distfiles/xml-commons-external-1.4.01.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=75c86f51b14cd0f0a273e6c34cf6ffd3
diff --git a/metadata/md5-cache/dev-java/xml-security-1.5.7-r1 b/metadata/md5-cache/dev-java/xml-security-1.5.7-r1
index 435953faab36..17d5dccde725 100644
--- a/metadata/md5-cache/dev-java/xml-security-1.5.7-r1
+++ b/metadata/md5-cache/dev-java/xml-security-1.5.7-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-java/commons-logging:0 dev-java/xalan:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/santuario/java-library/1_5_7/xml-security-bin-1_5_7.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=d93c6a4c3a5797a04b68f16f00ae9504
diff --git a/metadata/md5-cache/dev-java/xml-xmlbeans-2.6.0 b/metadata/md5-cache/dev-java/xml-xmlbeans-2.6.0
index f104aabf3e5e..8913d28c5a61 100644
--- a/metadata/md5-cache/dev-java/xml-xmlbeans-2.6.0
+++ b/metadata/md5-cache/dev-java/xml-xmlbeans-2.6.0
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-java/saxon:9 dev-java/jsr173:0 dev-java/annogen:0 dev-java/piccolo:0 dev-java/ant-core:0 dev-java/xml-commons-resolver:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2
 SRC_URI=http://archive.apache.org/dist/xmlbeans/source/xmlbeans-2.6.0-src.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=aaafed38e99a7b6df1193542a5623d3b
diff --git a/metadata/md5-cache/dev-java/xmlgraphics-commons-2.0.1 b/metadata/md5-cache/dev-java/xmlgraphics-commons-2.0.1
index 3c26b39bd4f6..5a0433e0ebe3 100644
--- a/metadata/md5-cache/dev-java/xmlgraphics-commons-2.0.1
+++ b/metadata/md5-cache/dev-java/xmlgraphics-commons-2.0.1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 dev-java/commons-io:1 >=dev-java/commons-logging-1:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2
 SRC_URI=mirror://apache/xmlgraphics/commons/source/xmlgraphics-commons-2.0.1-src.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=156c0b621deda9698c319f4135cca827
diff --git a/metadata/md5-cache/dev-java/xmlrpc-3.1.3 b/metadata/md5-cache/dev-java/xmlrpc-3.1.3
index f6900dcd26c1..e3971c6d7bae 100644
--- a/metadata/md5-cache/dev-java/xmlrpc-3.1.3
+++ b/metadata/md5-cache/dev-java/xmlrpc-3.1.3
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 dev-java/commons-httpclient:3 dev-java/commons-codec:0 dev-java/ws-commons-util:0 dev-java/commons-logging:0 java-virtuals/servlet-api:2.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=3
 SRC_URI=https://archive.apache.org/dist/ws/xmlrpc/sources/apache-xmlrpc-3.1.3-src.tar.bz2 https://dev.gentoo.org/~ercpe/distfiles/dev-java/xmlrpc/xmlrpc-3.1.3-build.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=d4505da5368b09057275021d438d142d
diff --git a/metadata/md5-cache/dev-java/xmlunit-1.6 b/metadata/md5-cache/dev-java/xmlunit-1.6
index 6fa20e873a66..40505cab0985 100644
--- a/metadata/md5-cache/dev-java/xmlunit-1.6
+++ b/metadata/md5-cache/dev-java/xmlunit-1.6
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.6 dev-java/junit:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1
 SRC_URI=mirror://sourceforge/xmlunit/xmlunit-1.6-src.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=65d9ced889708dcc2b73b49c16ba6a4b
diff --git a/metadata/md5-cache/dev-java/xom-1.2.10 b/metadata/md5-cache/dev-java/xom-1.2.10
index 125d5dc92a9b..2efc128d9f4a 100644
--- a/metadata/md5-cache/dev-java/xom-1.2.10
+++ b/metadata/md5-cache/dev-java/xom-1.2.10
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 dev-java/xerces:2 dev-java/xml-commons-external:1.3 ex
 RESTRICT=test
 SLOT=0
 SRC_URI=http://cafeconleche.org/XOM/xom-1.2.10.tar.gz http://dist.codehaus.org/jaxen/distributions/jaxen-1.1.6-src.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=b396e7f1e5dc52540b8e387a1e8ff9ad
diff --git a/metadata/md5-cache/dev-java/xpp2-2.1.10-r2 b/metadata/md5-cache/dev-java/xpp2-2.1.10-r2
index e97c1ad871e6..3128e008859d 100644
--- a/metadata/md5-cache/dev-java/xpp2-2.1.10-r2
+++ b/metadata/md5-cache/dev-java/xpp2-2.1.10-r2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.3 dev-java/xerces:2 >=dev-java/java-config-2.2.0-r3 sour
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.extreme.indiana.edu/xgws/xsoap/xpp/download/PullParser2/PullParser2.1.10.tgz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=dd87980d4a35e05b986cd2b96fd41539
diff --git a/metadata/md5-cache/dev-java/xz-java-1.5 b/metadata/md5-cache/dev-java/xz-java-1.5
index bf0ea689c09f..06494fba9e81 100644
--- a/metadata/md5-cache/dev-java/xz-java-1.5
+++ b/metadata/md5-cache/dev-java/xz-java-1.5
@@ -9,5 +9,5 @@ LICENSE=public-domain
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://tukaani.org/xz/xz-java-1.5.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=b0a55db7aec8213da2fa571e62c31186
diff --git a/metadata/md5-cache/dev-java/xz-java-1.6 b/metadata/md5-cache/dev-java/xz-java-1.6
index 5acf43082358..2ba69dbadaa7 100644
--- a/metadata/md5-cache/dev-java/xz-java-1.6
+++ b/metadata/md5-cache/dev-java/xz-java-1.6
@@ -9,5 +9,5 @@ LICENSE=public-domain
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://tukaani.org/xz/xz-java-1.6.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=da5187c0e7c4eef4f6f4057d4b135d77
diff --git a/metadata/md5-cache/dev-java/yanfs-1.0 b/metadata/md5-cache/dev-java/yanfs-1.0
index fdbcf83d2d1a..c110a362ef6d 100644
--- a/metadata/md5-cache/dev-java/yanfs-1.0
+++ b/metadata/md5-cache/dev-java/yanfs-1.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ercpe/distfiles/dev-java/yanfs/yanfs-1.0.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=9fd0563473ecfd3f49457df6e16ee7ac
diff --git a/metadata/md5-cache/dev-java/zemberek-2.1.1 b/metadata/md5-cache/dev-java/zemberek-2.1.1
index 457a53239264..ff3bd2580b0a 100644
--- a/metadata/md5-cache/dev-java/zemberek-2.1.1
+++ b/metadata/md5-cache/dev-java/zemberek-2.1.1
@@ -9,5 +9,5 @@ LICENSE=MPL-1.1
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://zemberek.googlecode.com/files/zemberek-2.1.1-nolibs-src.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=7234b9c38acfc6f5a307114b81f236c2
diff --git a/metadata/md5-cache/dev-java/zeus-jscl-1.64-r1 b/metadata/md5-cache/dev-java/zeus-jscl-1.64-r1
index a8d9d0d613f1..2b76b6fb416a 100644
--- a/metadata/md5-cache/dev-java/zeus-jscl-1.64-r1
+++ b/metadata/md5-cache/dev-java/zeus-jscl-1.64-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/zeus-jscl/zeus-jscl_v1_64.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=35332c903b99f92424ba601a79124b72
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index b51974c8ea2e..510640c8d6cd 100644
--- a/metadata/md5-cache/dev-lang/Manifest.gz
+++ b/metadata/md5-cache/dev-lang/Manifest.gz
diff --git a/metadata/md5-cache/dev-lang/bff-1.0.5 b/metadata/md5-cache/dev-lang/bff-1.0.5
index 29ee4dd675d0..a989edb1d26d 100644
--- a/metadata/md5-cache/dev-lang/bff-1.0.5
+++ b/metadata/md5-cache/dev-lang/bff-1.0.5
@@ -3,9 +3,9 @@ DESCRIPTION=A brainfuck interpreter
 EAPI=6
 HOMEPAGE=https://github.com/apankrat/bff
 IUSE=test
-KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~x86
+KEYWORDS=~amd64 ~arm ~hppa ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://github.com/apankrat/bff/archive/v1.0.5.tar.gz -> bff-1.0.5.tar.gz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=8f87f90d0c35b9487dd738f0b96857ce
+_md5_=7d33d38e407546f4fe20e9dcc98ea935
diff --git a/metadata/md5-cache/dev-lang/clojure-1.5.1 b/metadata/md5-cache/dev-lang/clojure-1.5.1
index 6165bb0a8500..9538f3ed13b7 100644
--- a/metadata/md5-cache/dev-lang/clojure-1.5.1
+++ b/metadata/md5-cache/dev-lang/clojure-1.5.1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 RESTRICT=test
 SLOT=1.5
 SRC_URI=https://github.com/clojure/clojure/tarball/clojure-1.5.1 -> clojure-1.5.1.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=c02749ad3b9348a0720f6a5646eabb46
diff --git a/metadata/md5-cache/dev-lang/clojure-1.6.0 b/metadata/md5-cache/dev-lang/clojure-1.6.0
index 07e4ebbc06ec..84745c92222a 100644
--- a/metadata/md5-cache/dev-lang/clojure-1.6.0
+++ b/metadata/md5-cache/dev-lang/clojure-1.6.0
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 RESTRICT=test
 SLOT=1.6
 SRC_URI=https://github.com/clojure/clojure/tarball/clojure-1.6.0 -> clojure-1.6.0.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=29541b14032b291a4a5288c2c000cd97
diff --git a/metadata/md5-cache/dev-lang/clojure-1.7.0 b/metadata/md5-cache/dev-lang/clojure-1.7.0
index 04a8c7007deb..7b118bdde673 100644
--- a/metadata/md5-cache/dev-lang/clojure-1.7.0
+++ b/metadata/md5-cache/dev-lang/clojure-1.7.0
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 RESTRICT=test
 SLOT=1.7
 SRC_URI=https://github.com/clojure/clojure/tarball/clojure-1.7.0 -> clojure-1.7.0.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=90605de69a97e7002965d8e7ad3f2580
diff --git a/metadata/md5-cache/dev-lang/clojure-1.8.0 b/metadata/md5-cache/dev-lang/clojure-1.8.0
index 5d1944d79b78..65e3210485d0 100644
--- a/metadata/md5-cache/dev-lang/clojure-1.8.0
+++ b/metadata/md5-cache/dev-lang/clojure-1.8.0
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 RESTRICT=test
 SLOT=1.8
 SRC_URI=https://github.com/clojure/clojure/tarball/clojure-1.8.0 -> clojure-1.8.0.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=9b5d778c02b707c49fe71aea528d8ad2
diff --git a/metadata/md5-cache/dev-lang/gnuprologjava-0.2.6 b/metadata/md5-cache/dev-lang/gnuprologjava-0.2.6
index e980bf519b50..914a16cb94d8 100644
--- a/metadata/md5-cache/dev-lang/gnuprologjava-0.2.6
+++ b/metadata/md5-cache/dev-lang/gnuprologjava-0.2.6
@@ -9,5 +9,5 @@ LICENSE=LGPL-3+
 RDEPEND=>=virtual/jdk-1.6:= >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=mirror://gnu/gnuprologjava/gnuprologjava-0.2.6-src.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=b3afe0bf3a2a9394048d8771dacd39fa
diff --git a/metadata/md5-cache/dev-lang/interprolog-2.1.2 b/metadata/md5-cache/dev-lang/interprolog-2.1.2
index e3ffe4fa2f48..6c3d118bb61c 100644
--- a/metadata/md5-cache/dev-lang/interprolog-2.1.2
+++ b/metadata/md5-cache/dev-lang/interprolog-2.1.2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=virtual/jdk-1.4 =dev-java/junit-3.8* || ( dev-lang/xsb dev-lang/swi-prolog dev-lang/yap ) >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=http://www.declarativa.com/interprolog/interprolog212.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=8dacc90a5c16ced67fecee376a7668cc
diff --git a/metadata/md5-cache/dev-lang/scala-2.11.1-r2 b/metadata/md5-cache/dev-lang/scala-2.11.1-r2
index 4bf164ad0fe2..d5d2abe73acf 100644
--- a/metadata/md5-cache/dev-lang/scala-2.11.1-r2
+++ b/metadata/md5-cache/dev-lang/scala-2.11.1-r2
@@ -10,5 +10,5 @@ PDEPEND=emacs? ( app-emacs/scala-mode:0 )
 RDEPEND=dev-java/ant-core:0 dev-java/hawtjni-runtime:0 >=virtual/jre-1.7 app-eselect/eselect-scala !dev-lang/scala-bin:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2.11/2.11.1
 SRC_URI=!binary? ( https://github.com/scala/scala/archive/v2.11.1.tar.gz -> scala-2.11.1.tar.gz http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/943cd5c8802b2a3a64a010efb86ec19bac142e40/lib/ant/ant-contrib.jar -> scala-2.11.1-ant-contrib.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/3fc1e35ca8c991fc3488548f7a276bd9053c179d/lib/ant/ant-dotnet-1.0.jar -> scala-2.11.1-ant-dotnet-1.0.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/7b456ca6b93900f96e58cc8371f03d90a9c1c8d1/lib/ant/ant.jar -> scala-2.11.1-ant.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/7e50e3e227d834695f1e0bf018a7326e06ee4c86/lib/ant/maven-ant-tasks-2.1.1.jar -> scala-2.11.1-maven-ant-tasks-2.1.1.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/2c61d6e9a912b3253194d5d6d3e1db7e2545ac4b/lib/ant/vizant.jar -> scala-2.11.1-vizant.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/ddd7d5398733c4fbbb8355c049e258d47af636cf/lib/forkjoin.jar -> scala-2.11.1-forkjoin.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/0392ecdeb306263c471ce51fa368223388b82b61/test/benchmarks/lib/jsr166_and_extra.jar -> scala-2.11.1-jsr166_and_extra.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/e737b123d31eede5594ceda07caafed1673ec472/test/files/codelib/code.jar -> scala-2.11.1-code.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/02fe2ed93766323a13f22c7a7e2ecdcd84259b6c/test/files/lib/annotations.jar -> scala-2.11.1-annotations.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/981392dbd1f727b152cd1c908c5fce60ad9d07f7/test/files/lib/enums.jar -> scala-2.11.1-enums.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/b1ec8a095cec4902b3609d74d274c04365c59c04/test/files/lib/genericNest.jar -> scala-2.11.1-genericNest.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/346d3dff4088839d6b4d163efa2892124039d216/test/files/lib/jsoup-1.3.1.jar -> scala-2.11.1-jsoup-1.3.1.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/3794ec22d9b27f2b179bd34e9b46db771b934ec3/test/files/lib/macro210.jar -> scala-2.11.1-macro210.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/be8454d5e7751b063ade201c225dcedefd252775/test/files/lib/methvsfield.jar -> scala-2.11.1-methvsfield.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/cd33e0a0ea249eb42363a2f8ba531186345ff68c/test/files/lib/nest.jar -> scala-2.11.1-nest.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/1b11ac773055c1e942c6b5eb4aabdf02292a7194/test/files/speclib/instrumented.jar -> scala-2.11.1-instrumented.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/a1883f4304d5aa65e1f6ee6aad5900c62dd81079/tools/push.jar -> scala-2.11.1-push.jar https://dev.gentoo.org/~gienah/snapshots/scala-2.11.1-maven-deps.tar.gz ) binary? ( https://dev.gentoo.org/~gienah/files/dist/scala-2.11.1-gentoo-binary.tar.bz2 )
-_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=028e95473f5c50b8c2e76576cd0e7125
diff --git a/metadata/md5-cache/dev-lang/scala-2.11.11 b/metadata/md5-cache/dev-lang/scala-2.11.11
index 10231607a0f0..b832d01a287b 100644
--- a/metadata/md5-cache/dev-lang/scala-2.11.11
+++ b/metadata/md5-cache/dev-lang/scala-2.11.11
@@ -10,5 +10,5 @@ PDEPEND=emacs? ( app-emacs/scala-mode:0 )
 RDEPEND=dev-java/ant-core:0 dev-java/hawtjni-runtime:0 >=virtual/jre-1.7 app-eselect/eselect-scala !dev-lang/scala-bin:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2.11/2.11.11
 SRC_URI=!binary? ( https://github.com/scala/scala/archive/v2.11.11.tar.gz -> scala-2.11.11.tar.gz http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/943cd5c8802b2a3a64a010efb86ec19bac142e40/lib/ant/ant-contrib.jar -> scala-2.11.11-ant-contrib.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/3fc1e35ca8c991fc3488548f7a276bd9053c179d/lib/ant/ant-dotnet-1.0.jar -> scala-2.11.11-ant-dotnet-1.0.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/7b456ca6b93900f96e58cc8371f03d90a9c1c8d1/lib/ant/ant.jar -> scala-2.11.11-ant.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/7e50e3e227d834695f1e0bf018a7326e06ee4c86/lib/ant/maven-ant-tasks-2.1.1.jar -> scala-2.11.11-maven-ant-tasks-2.1.1.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/2c61d6e9a912b3253194d5d6d3e1db7e2545ac4b/lib/ant/vizant.jar -> scala-2.11.11-vizant.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/ddd7d5398733c4fbbb8355c049e258d47af636cf/lib/forkjoin.jar -> scala-2.11.11-forkjoin.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/0392ecdeb306263c471ce51fa368223388b82b61/test/benchmarks/lib/jsr166_and_extra.jar -> scala-2.11.11-jsr166_and_extra.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/e737b123d31eede5594ceda07caafed1673ec472/test/files/codelib/code.jar -> scala-2.11.11-code.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/02fe2ed93766323a13f22c7a7e2ecdcd84259b6c/test/files/lib/annotations.jar -> scala-2.11.11-annotations.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/981392dbd1f727b152cd1c908c5fce60ad9d07f7/test/files/lib/enums.jar -> scala-2.11.11-enums.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/b1ec8a095cec4902b3609d74d274c04365c59c04/test/files/lib/genericNest.jar -> scala-2.11.11-genericNest.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/346d3dff4088839d6b4d163efa2892124039d216/test/files/lib/jsoup-1.3.1.jar -> scala-2.11.11-jsoup-1.3.1.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/3794ec22d9b27f2b179bd34e9b46db771b934ec3/test/files/lib/macro210.jar -> scala-2.11.11-macro210.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/be8454d5e7751b063ade201c225dcedefd252775/test/files/lib/methvsfield.jar -> scala-2.11.11-methvsfield.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/cd33e0a0ea249eb42363a2f8ba531186345ff68c/test/files/lib/nest.jar -> scala-2.11.11-nest.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/1b11ac773055c1e942c6b5eb4aabdf02292a7194/test/files/speclib/instrumented.jar -> scala-2.11.11-instrumented.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/a1883f4304d5aa65e1f6ee6aad5900c62dd81079/tools/push.jar -> scala-2.11.11-push.jar https://dev.gentoo.org/~patrick/scala-2.11.11-maven-deps.tar.gz ) binary? ( https://dev.gentoo.org/~patrick/scala-2.11.11-gentoo-binary.tar.bz2 )
-_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=fe1dbd3e4e278681dd181b4fe7a8fa79
diff --git a/metadata/md5-cache/dev-lang/scala-2.11.2-r2 b/metadata/md5-cache/dev-lang/scala-2.11.2-r2
index 33698a77fbb8..35160ed9ad85 100644
--- a/metadata/md5-cache/dev-lang/scala-2.11.2-r2
+++ b/metadata/md5-cache/dev-lang/scala-2.11.2-r2
@@ -10,5 +10,5 @@ PDEPEND=emacs? ( app-emacs/scala-mode:0 )
 RDEPEND=dev-java/ant-core:0 dev-java/hawtjni-runtime:0 >=virtual/jre-1.7 app-eselect/eselect-scala !dev-lang/scala-bin:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2.11/2.11.2
 SRC_URI=!binary? ( https://github.com/scala/scala/archive/v2.11.2.tar.gz -> scala-2.11.2.tar.gz http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/943cd5c8802b2a3a64a010efb86ec19bac142e40/lib/ant/ant-contrib.jar -> scala-2.11.2-ant-contrib.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/3fc1e35ca8c991fc3488548f7a276bd9053c179d/lib/ant/ant-dotnet-1.0.jar -> scala-2.11.2-ant-dotnet-1.0.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/7b456ca6b93900f96e58cc8371f03d90a9c1c8d1/lib/ant/ant.jar -> scala-2.11.2-ant.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/7e50e3e227d834695f1e0bf018a7326e06ee4c86/lib/ant/maven-ant-tasks-2.1.1.jar -> scala-2.11.2-maven-ant-tasks-2.1.1.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/2c61d6e9a912b3253194d5d6d3e1db7e2545ac4b/lib/ant/vizant.jar -> scala-2.11.2-vizant.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/ddd7d5398733c4fbbb8355c049e258d47af636cf/lib/forkjoin.jar -> scala-2.11.2-forkjoin.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/0392ecdeb306263c471ce51fa368223388b82b61/test/benchmarks/lib/jsr166_and_extra.jar -> scala-2.11.2-jsr166_and_extra.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/e737b123d31eede5594ceda07caafed1673ec472/test/files/codelib/code.jar -> scala-2.11.2-code.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/02fe2ed93766323a13f22c7a7e2ecdcd84259b6c/test/files/lib/annotations.jar -> scala-2.11.2-annotations.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/981392dbd1f727b152cd1c908c5fce60ad9d07f7/test/files/lib/enums.jar -> scala-2.11.2-enums.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/b1ec8a095cec4902b3609d74d274c04365c59c04/test/files/lib/genericNest.jar -> scala-2.11.2-genericNest.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/346d3dff4088839d6b4d163efa2892124039d216/test/files/lib/jsoup-1.3.1.jar -> scala-2.11.2-jsoup-1.3.1.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/3794ec22d9b27f2b179bd34e9b46db771b934ec3/test/files/lib/macro210.jar -> scala-2.11.2-macro210.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/be8454d5e7751b063ade201c225dcedefd252775/test/files/lib/methvsfield.jar -> scala-2.11.2-methvsfield.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/cd33e0a0ea249eb42363a2f8ba531186345ff68c/test/files/lib/nest.jar -> scala-2.11.2-nest.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/1b11ac773055c1e942c6b5eb4aabdf02292a7194/test/files/speclib/instrumented.jar -> scala-2.11.2-instrumented.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/a1883f4304d5aa65e1f6ee6aad5900c62dd81079/tools/push.jar -> scala-2.11.2-push.jar https://dev.gentoo.org/~gienah/snapshots/scala-2.11.2-maven-deps.tar.gz ) binary? ( https://dev.gentoo.org/~gienah/files/dist/scala-2.11.2-gentoo-binary.tar.bz2 )
-_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=6323c13c25f7152eaf6b015d3362e4a7
diff --git a/metadata/md5-cache/dev-lang/scala-2.11.4-r1 b/metadata/md5-cache/dev-lang/scala-2.11.4-r1
index 42e8a79f1692..bcf76fb60860 100644
--- a/metadata/md5-cache/dev-lang/scala-2.11.4-r1
+++ b/metadata/md5-cache/dev-lang/scala-2.11.4-r1
@@ -10,5 +10,5 @@ PDEPEND=emacs? ( app-emacs/scala-mode:0 )
 RDEPEND=dev-java/ant-core:0 dev-java/hawtjni-runtime:0 >=virtual/jre-1.6 app-eselect/eselect-scala !dev-lang/scala-bin:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2.11/2.11.4
 SRC_URI=!binary? ( https://github.com/scala/scala/archive/v2.11.4.tar.gz -> scala-2.11.4.tar.gz http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/943cd5c8802b2a3a64a010efb86ec19bac142e40/lib/ant/ant-contrib.jar -> scala-2.11.4-ant-contrib.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/3fc1e35ca8c991fc3488548f7a276bd9053c179d/lib/ant/ant-dotnet-1.0.jar -> scala-2.11.4-ant-dotnet-1.0.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/7b456ca6b93900f96e58cc8371f03d90a9c1c8d1/lib/ant/ant.jar -> scala-2.11.4-ant.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/7e50e3e227d834695f1e0bf018a7326e06ee4c86/lib/ant/maven-ant-tasks-2.1.1.jar -> scala-2.11.4-maven-ant-tasks-2.1.1.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/2c61d6e9a912b3253194d5d6d3e1db7e2545ac4b/lib/ant/vizant.jar -> scala-2.11.4-vizant.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/ddd7d5398733c4fbbb8355c049e258d47af636cf/lib/forkjoin.jar -> scala-2.11.4-forkjoin.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/0392ecdeb306263c471ce51fa368223388b82b61/test/benchmarks/lib/jsr166_and_extra.jar -> scala-2.11.4-jsr166_and_extra.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/e737b123d31eede5594ceda07caafed1673ec472/test/files/codelib/code.jar -> scala-2.11.4-code.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/02fe2ed93766323a13f22c7a7e2ecdcd84259b6c/test/files/lib/annotations.jar -> scala-2.11.4-annotations.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/981392dbd1f727b152cd1c908c5fce60ad9d07f7/test/files/lib/enums.jar -> scala-2.11.4-enums.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/b1ec8a095cec4902b3609d74d274c04365c59c04/test/files/lib/genericNest.jar -> scala-2.11.4-genericNest.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/346d3dff4088839d6b4d163efa2892124039d216/test/files/lib/jsoup-1.3.1.jar -> scala-2.11.4-jsoup-1.3.1.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/3794ec22d9b27f2b179bd34e9b46db771b934ec3/test/files/lib/macro210.jar -> scala-2.11.4-macro210.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/be8454d5e7751b063ade201c225dcedefd252775/test/files/lib/methvsfield.jar -> scala-2.11.4-methvsfield.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/cd33e0a0ea249eb42363a2f8ba531186345ff68c/test/files/lib/nest.jar -> scala-2.11.4-nest.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/1b11ac773055c1e942c6b5eb4aabdf02292a7194/test/files/speclib/instrumented.jar -> scala-2.11.4-instrumented.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/a1883f4304d5aa65e1f6ee6aad5900c62dd81079/tools/push.jar -> scala-2.11.4-push.jar https://dev.gentoo.org/~gienah/snapshots/scala-2.11.4-maven-deps.tar.gz ) binary? ( https://dev.gentoo.org/~gienah/files/dist/scala-2.11.4-gentoo-binary.tar.bz2 )
-_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=583f40a36f9e401a9537960ff7035e5b
diff --git a/metadata/md5-cache/dev-lang/scala-2.11.4-r2 b/metadata/md5-cache/dev-lang/scala-2.11.4-r2
index 0a38e2a4bfee..e2bc282bdbc8 100644
--- a/metadata/md5-cache/dev-lang/scala-2.11.4-r2
+++ b/metadata/md5-cache/dev-lang/scala-2.11.4-r2
@@ -10,5 +10,5 @@ PDEPEND=emacs? ( app-emacs/scala-mode:0 )
 RDEPEND=dev-java/ant-core:0 dev-java/hawtjni-runtime:0 >=virtual/jre-1.7 app-eselect/eselect-scala !dev-lang/scala-bin:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2.11/2.11.4
 SRC_URI=!binary? ( https://github.com/scala/scala/archive/v2.11.4.tar.gz -> scala-2.11.4.tar.gz http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/943cd5c8802b2a3a64a010efb86ec19bac142e40/lib/ant/ant-contrib.jar -> scala-2.11.4-ant-contrib.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/3fc1e35ca8c991fc3488548f7a276bd9053c179d/lib/ant/ant-dotnet-1.0.jar -> scala-2.11.4-ant-dotnet-1.0.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/7b456ca6b93900f96e58cc8371f03d90a9c1c8d1/lib/ant/ant.jar -> scala-2.11.4-ant.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/7e50e3e227d834695f1e0bf018a7326e06ee4c86/lib/ant/maven-ant-tasks-2.1.1.jar -> scala-2.11.4-maven-ant-tasks-2.1.1.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/2c61d6e9a912b3253194d5d6d3e1db7e2545ac4b/lib/ant/vizant.jar -> scala-2.11.4-vizant.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/ddd7d5398733c4fbbb8355c049e258d47af636cf/lib/forkjoin.jar -> scala-2.11.4-forkjoin.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/0392ecdeb306263c471ce51fa368223388b82b61/test/benchmarks/lib/jsr166_and_extra.jar -> scala-2.11.4-jsr166_and_extra.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/e737b123d31eede5594ceda07caafed1673ec472/test/files/codelib/code.jar -> scala-2.11.4-code.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/02fe2ed93766323a13f22c7a7e2ecdcd84259b6c/test/files/lib/annotations.jar -> scala-2.11.4-annotations.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/981392dbd1f727b152cd1c908c5fce60ad9d07f7/test/files/lib/enums.jar -> scala-2.11.4-enums.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/b1ec8a095cec4902b3609d74d274c04365c59c04/test/files/lib/genericNest.jar -> scala-2.11.4-genericNest.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/346d3dff4088839d6b4d163efa2892124039d216/test/files/lib/jsoup-1.3.1.jar -> scala-2.11.4-jsoup-1.3.1.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/3794ec22d9b27f2b179bd34e9b46db771b934ec3/test/files/lib/macro210.jar -> scala-2.11.4-macro210.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/be8454d5e7751b063ade201c225dcedefd252775/test/files/lib/methvsfield.jar -> scala-2.11.4-methvsfield.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/cd33e0a0ea249eb42363a2f8ba531186345ff68c/test/files/lib/nest.jar -> scala-2.11.4-nest.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/1b11ac773055c1e942c6b5eb4aabdf02292a7194/test/files/speclib/instrumented.jar -> scala-2.11.4-instrumented.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/a1883f4304d5aa65e1f6ee6aad5900c62dd81079/tools/push.jar -> scala-2.11.4-push.jar https://dev.gentoo.org/~gienah/snapshots/scala-2.11.4-maven-deps.tar.gz ) binary? ( https://dev.gentoo.org/~gienah/files/dist/scala-2.11.4-gentoo-binary.tar.bz2 )
-_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=6c608a89efe260265035b9ebb0526b62
diff --git a/metadata/md5-cache/dev-lang/scala-2.11.6-r1 b/metadata/md5-cache/dev-lang/scala-2.11.6-r1
index a7301c26cb06..b8493b3be8cb 100644
--- a/metadata/md5-cache/dev-lang/scala-2.11.6-r1
+++ b/metadata/md5-cache/dev-lang/scala-2.11.6-r1
@@ -10,5 +10,5 @@ PDEPEND=emacs? ( app-emacs/scala-mode:0 )
 RDEPEND=dev-java/ant-core:0 dev-java/hawtjni-runtime:0 >=virtual/jre-1.7 app-eselect/eselect-scala !dev-lang/scala-bin:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2.11/2.11.6
 SRC_URI=!binary? ( https://github.com/scala/scala/archive/v2.11.6.tar.gz -> scala-2.11.6.tar.gz http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/943cd5c8802b2a3a64a010efb86ec19bac142e40/lib/ant/ant-contrib.jar -> scala-2.11.6-ant-contrib.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/3fc1e35ca8c991fc3488548f7a276bd9053c179d/lib/ant/ant-dotnet-1.0.jar -> scala-2.11.6-ant-dotnet-1.0.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/7b456ca6b93900f96e58cc8371f03d90a9c1c8d1/lib/ant/ant.jar -> scala-2.11.6-ant.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/7e50e3e227d834695f1e0bf018a7326e06ee4c86/lib/ant/maven-ant-tasks-2.1.1.jar -> scala-2.11.6-maven-ant-tasks-2.1.1.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/2c61d6e9a912b3253194d5d6d3e1db7e2545ac4b/lib/ant/vizant.jar -> scala-2.11.6-vizant.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/ddd7d5398733c4fbbb8355c049e258d47af636cf/lib/forkjoin.jar -> scala-2.11.6-forkjoin.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/0392ecdeb306263c471ce51fa368223388b82b61/test/benchmarks/lib/jsr166_and_extra.jar -> scala-2.11.6-jsr166_and_extra.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/e737b123d31eede5594ceda07caafed1673ec472/test/files/codelib/code.jar -> scala-2.11.6-code.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/02fe2ed93766323a13f22c7a7e2ecdcd84259b6c/test/files/lib/annotations.jar -> scala-2.11.6-annotations.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/981392dbd1f727b152cd1c908c5fce60ad9d07f7/test/files/lib/enums.jar -> scala-2.11.6-enums.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/b1ec8a095cec4902b3609d74d274c04365c59c04/test/files/lib/genericNest.jar -> scala-2.11.6-genericNest.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/346d3dff4088839d6b4d163efa2892124039d216/test/files/lib/jsoup-1.3.1.jar -> scala-2.11.6-jsoup-1.3.1.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/3794ec22d9b27f2b179bd34e9b46db771b934ec3/test/files/lib/macro210.jar -> scala-2.11.6-macro210.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/be8454d5e7751b063ade201c225dcedefd252775/test/files/lib/methvsfield.jar -> scala-2.11.6-methvsfield.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/cd33e0a0ea249eb42363a2f8ba531186345ff68c/test/files/lib/nest.jar -> scala-2.11.6-nest.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/1b11ac773055c1e942c6b5eb4aabdf02292a7194/test/files/speclib/instrumented.jar -> scala-2.11.6-instrumented.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/a1883f4304d5aa65e1f6ee6aad5900c62dd81079/tools/push.jar -> scala-2.11.6-push.jar https://dev.gentoo.org/~gienah/snapshots/scala-2.11.6-maven-deps.tar.gz ) binary? ( https://dev.gentoo.org/~gienah/files/dist/scala-2.11.6-gentoo-binary.tar.bz2 )
-_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=cfdbdf4aefc415799376aae239b3f8b5
diff --git a/metadata/md5-cache/dev-lang/scala-2.11.7-r1 b/metadata/md5-cache/dev-lang/scala-2.11.7-r1
index ea0b3b974e2e..7d99356174ad 100644
--- a/metadata/md5-cache/dev-lang/scala-2.11.7-r1
+++ b/metadata/md5-cache/dev-lang/scala-2.11.7-r1
@@ -10,5 +10,5 @@ PDEPEND=emacs? ( app-emacs/scala-mode:0 )
 RDEPEND=dev-java/ant-core:0 dev-java/hawtjni-runtime:0 >=virtual/jre-1.7 app-eselect/eselect-scala !dev-lang/scala-bin:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2.11/2.11.7
 SRC_URI=!binary? ( https://github.com/scala/scala/archive/v2.11.7.tar.gz -> scala-2.11.7.tar.gz http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/943cd5c8802b2a3a64a010efb86ec19bac142e40/lib/ant/ant-contrib.jar -> scala-2.11.7-ant-contrib.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/3fc1e35ca8c991fc3488548f7a276bd9053c179d/lib/ant/ant-dotnet-1.0.jar -> scala-2.11.7-ant-dotnet-1.0.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/7b456ca6b93900f96e58cc8371f03d90a9c1c8d1/lib/ant/ant.jar -> scala-2.11.7-ant.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/7e50e3e227d834695f1e0bf018a7326e06ee4c86/lib/ant/maven-ant-tasks-2.1.1.jar -> scala-2.11.7-maven-ant-tasks-2.1.1.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/2c61d6e9a912b3253194d5d6d3e1db7e2545ac4b/lib/ant/vizant.jar -> scala-2.11.7-vizant.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/ddd7d5398733c4fbbb8355c049e258d47af636cf/lib/forkjoin.jar -> scala-2.11.7-forkjoin.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/0392ecdeb306263c471ce51fa368223388b82b61/test/benchmarks/lib/jsr166_and_extra.jar -> scala-2.11.7-jsr166_and_extra.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/e737b123d31eede5594ceda07caafed1673ec472/test/files/codelib/code.jar -> scala-2.11.7-code.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/02fe2ed93766323a13f22c7a7e2ecdcd84259b6c/test/files/lib/annotations.jar -> scala-2.11.7-annotations.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/981392dbd1f727b152cd1c908c5fce60ad9d07f7/test/files/lib/enums.jar -> scala-2.11.7-enums.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/b1ec8a095cec4902b3609d74d274c04365c59c04/test/files/lib/genericNest.jar -> scala-2.11.7-genericNest.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/346d3dff4088839d6b4d163efa2892124039d216/test/files/lib/jsoup-1.3.1.jar -> scala-2.11.7-jsoup-1.3.1.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/3794ec22d9b27f2b179bd34e9b46db771b934ec3/test/files/lib/macro210.jar -> scala-2.11.7-macro210.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/be8454d5e7751b063ade201c225dcedefd252775/test/files/lib/methvsfield.jar -> scala-2.11.7-methvsfield.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/cd33e0a0ea249eb42363a2f8ba531186345ff68c/test/files/lib/nest.jar -> scala-2.11.7-nest.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/1b11ac773055c1e942c6b5eb4aabdf02292a7194/test/files/speclib/instrumented.jar -> scala-2.11.7-instrumented.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/a1883f4304d5aa65e1f6ee6aad5900c62dd81079/tools/push.jar -> scala-2.11.7-push.jar https://dev.gentoo.org/~gienah/snapshots/scala-2.11.7-maven-deps.tar.gz ) binary? ( https://dev.gentoo.org/~gienah/files/dist/scala-2.11.7-gentoo-binary.tar.bz2 )
-_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=a8ec228def4995369a7311e9f4f5239b
diff --git a/metadata/md5-cache/dev-lang/scala-2.11.8 b/metadata/md5-cache/dev-lang/scala-2.11.8
index 123d53bab5d9..b95e4d680c5d 100644
--- a/metadata/md5-cache/dev-lang/scala-2.11.8
+++ b/metadata/md5-cache/dev-lang/scala-2.11.8
@@ -10,5 +10,5 @@ PDEPEND=emacs? ( app-emacs/scala-mode:0 )
 RDEPEND=dev-java/ant-core:0 dev-java/hawtjni-runtime:0 >=virtual/jre-1.7 app-eselect/eselect-scala !dev-lang/scala-bin:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2.11/2.11.8
 SRC_URI=!binary? ( https://github.com/scala/scala/archive/v2.11.8.tar.gz -> scala-2.11.8.tar.gz http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/943cd5c8802b2a3a64a010efb86ec19bac142e40/lib/ant/ant-contrib.jar -> scala-2.11.8-ant-contrib.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/3fc1e35ca8c991fc3488548f7a276bd9053c179d/lib/ant/ant-dotnet-1.0.jar -> scala-2.11.8-ant-dotnet-1.0.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/7b456ca6b93900f96e58cc8371f03d90a9c1c8d1/lib/ant/ant.jar -> scala-2.11.8-ant.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/7e50e3e227d834695f1e0bf018a7326e06ee4c86/lib/ant/maven-ant-tasks-2.1.1.jar -> scala-2.11.8-maven-ant-tasks-2.1.1.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/2c61d6e9a912b3253194d5d6d3e1db7e2545ac4b/lib/ant/vizant.jar -> scala-2.11.8-vizant.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/ddd7d5398733c4fbbb8355c049e258d47af636cf/lib/forkjoin.jar -> scala-2.11.8-forkjoin.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/0392ecdeb306263c471ce51fa368223388b82b61/test/benchmarks/lib/jsr166_and_extra.jar -> scala-2.11.8-jsr166_and_extra.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/e737b123d31eede5594ceda07caafed1673ec472/test/files/codelib/code.jar -> scala-2.11.8-code.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/02fe2ed93766323a13f22c7a7e2ecdcd84259b6c/test/files/lib/annotations.jar -> scala-2.11.8-annotations.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/981392dbd1f727b152cd1c908c5fce60ad9d07f7/test/files/lib/enums.jar -> scala-2.11.8-enums.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/b1ec8a095cec4902b3609d74d274c04365c59c04/test/files/lib/genericNest.jar -> scala-2.11.8-genericNest.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/346d3dff4088839d6b4d163efa2892124039d216/test/files/lib/jsoup-1.3.1.jar -> scala-2.11.8-jsoup-1.3.1.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/3794ec22d9b27f2b179bd34e9b46db771b934ec3/test/files/lib/macro210.jar -> scala-2.11.8-macro210.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/be8454d5e7751b063ade201c225dcedefd252775/test/files/lib/methvsfield.jar -> scala-2.11.8-methvsfield.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/cd33e0a0ea249eb42363a2f8ba531186345ff68c/test/files/lib/nest.jar -> scala-2.11.8-nest.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/1b11ac773055c1e942c6b5eb4aabdf02292a7194/test/files/speclib/instrumented.jar -> scala-2.11.8-instrumented.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/a1883f4304d5aa65e1f6ee6aad5900c62dd81079/tools/push.jar -> scala-2.11.8-push.jar https://dev.gentoo.org/~gienah/snapshots/scala-2.11.8-maven-deps.tar.gz ) binary? ( https://dev.gentoo.org/~gienah/files/dist/scala-2.11.8-gentoo-binary.tar.bz2 )
-_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=0b8cf6cd28ed0765af3a4f7fd0519711
diff --git a/metadata/md5-cache/dev-lang/tuprolog-2.9.2 b/metadata/md5-cache/dev-lang/tuprolog-2.9.2
index 4e01ebd9d6a8..003c2a4f523f 100644
--- a/metadata/md5-cache/dev-lang/tuprolog-2.9.2
+++ b/metadata/md5-cache/dev-lang/tuprolog-2.9.2
@@ -9,5 +9,5 @@ LICENSE=LGPL-3
 RDEPEND=>=virtual/jdk-1.7:= dev-java/javassist:3 >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=mirror://gentoo/tuprolog-2.9.2.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=2af38c2a472e5d95cb944879af55fc3a
diff --git a/metadata/md5-cache/dev-lang/tuprolog-3.0.1 b/metadata/md5-cache/dev-lang/tuprolog-3.0.1
index 8147b61faac2..986182f75990 100644
--- a/metadata/md5-cache/dev-lang/tuprolog-3.0.1
+++ b/metadata/md5-cache/dev-lang/tuprolog-3.0.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-3 BSD
 RDEPEND=>=virtual/jdk-1.8:= dev-java/javassist:3 dev-java/commons-lang:3.1 >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=mirror://gentoo/tuprolog-3.0.1.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=c8eb46faca18a091ac0a9659f33ef606
diff --git a/metadata/md5-cache/dev-lang/tuprolog-3.1.0 b/metadata/md5-cache/dev-lang/tuprolog-3.1.0
index d8743e5e0035..16cc67cf2e80 100644
--- a/metadata/md5-cache/dev-lang/tuprolog-3.1.0
+++ b/metadata/md5-cache/dev-lang/tuprolog-3.1.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-3 BSD
 RDEPEND=>=virtual/jdk-1.8:= dev-java/javassist:3 dev-java/commons-lang:3.1 >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=mirror://gentoo/tuprolog-3.1.0.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=2f66fcc0056bb9e2a90a449dff594b92
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 3425c4653368..afb86ab65080 100644
--- a/metadata/md5-cache/dev-libs/Manifest.gz
+++ b/metadata/md5-cache/dev-libs/Manifest.gz
diff --git a/metadata/md5-cache/dev-libs/check-0.12.0 b/metadata/md5-cache/dev-libs/check-0.12.0
index 9f8c9c64a679..051e9f125872 100644
--- a/metadata/md5-cache/dev-libs/check-0.12.0
+++ b/metadata/md5-cache/dev-libs/check-0.12.0
@@ -4,10 +4,10 @@ DESCRIPTION=A unit test framework for C
 EAPI=6
 HOMEPAGE=https://libcheck.github.io/check/
 IUSE=static-libs subunit abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2.1
 RDEPEND=subunit? ( >=dev-python/subunit-0.0.10-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=https://github.com/libcheck/check/archive/0.12.0.tar.gz -> check-0.12.0-github.tar.gz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	libtool	0081a71a261724730ec4c248494f044d	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=de1661dfd8235a9fa73d9061b9ffd104
+_md5_=709cd3a23cefd9b08258cef193f5432f
diff --git a/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.26-r10 b/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.26-r10
index 924528225e99..1df1c18b76a5 100644
--- a/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.26-r10
+++ b/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.26-r10
@@ -4,10 +4,10 @@ DESCRIPTION=The Cyrus SASL (Simple Authentication and Security Layer)
 EAPI=5
 HOMEPAGE=http://cyrusimap.web.cmu.edu/
 IUSE=authdaemond berkdb gdbm kerberos ldapdb libressl openldap mysql pam postgres sample selinux sqlite srp ssl static-libs urandom 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 elibc_FreeBSD java
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=BSD-with-attribution
 RDEPEND=net-mail/mailbase authdaemond? ( || ( net-mail/courier-imap mail-mta/courier ) ) berkdb? ( >=sys-libs/db-4.8.30-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(-)?] ) gdbm? ( >=sys-libs/gdbm-1.10-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(-)?] ) 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(-)?] ) openldap? ( >=net-nds/openldap-2.4.38-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(-)?] ) mysql? ( virtual/mysql ) pam? ( >=virtual/pam-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(-)?] ) postgres? ( dev-db/postgresql:= ) sqlite? ( >=dev-db/sqlite-3.8.2: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(-)?] ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1h-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(-)?] ) libressl? ( dev-libs/libressl[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/jdk-1.4:= ) selinux? ( sec-policy/selinux-sasl ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=2
 SRC_URI=ftp://ftp.cyrusimap.org/cyrus-sasl/cyrus-sasl-2.1.26.tar.gz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	db-use	582140d1a711279e50ce284fc7b609f5	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=cf00c078c3cdc00012f4fe1012b19e50
+_md5_=2341c229ee6a4feccb842eefe55b9f31
diff --git a/metadata/md5-cache/dev-libs/dotconf-1.3 b/metadata/md5-cache/dev-libs/dotconf-1.3
deleted file mode 100644
index d146d3fc4a15..000000000000
--- a/metadata/md5-cache/dev-libs/dotconf-1.3
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install postinst
-DEPEND=>=sys-devel/autoconf-2.58
-DESCRIPTION=dot.conf configuration file parser
-EAPI=3
-HOMEPAGE=https://github.com/williamh/dotconf
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=LGPL-2.1
-SLOT=0
-SRC_URI=mirror://gentoo/dotconf-1.3.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ef69fc13efa0b2f3f9fe5f204b00761d
diff --git a/metadata/md5-cache/dev-libs/dotconf-1.3-r1 b/metadata/md5-cache/dev-libs/dotconf-1.3-r1
index fdf311a6f9bc..bb4da3d132c9 100644
--- a/metadata/md5-cache/dev-libs/dotconf-1.3-r1
+++ b/metadata/md5-cache/dev-libs/dotconf-1.3-r1
@@ -3,9 +3,9 @@ DEPEND=>=sys-devel/autoconf-2.58
 DESCRIPTION=dot.conf configuration file parser
 EAPI=6
 HOMEPAGE=https://github.com/williamh/dotconf
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=mirror://gentoo/dotconf-1.3.tar.gz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=4963a9d472f16a04b3f8d26795568342
+_md5_=4eece6589135ff80a1cbd406268ce99e
diff --git a/metadata/md5-cache/dev-libs/libbsd-0.8.3 b/metadata/md5-cache/dev-libs/libbsd-0.8.3
deleted file mode 100644
index e5629f49018a..000000000000
--- a/metadata/md5-cache/dev-libs/libbsd-0.8.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install setup test
-DEPEND=>=sys-kernel/linux-headers-3.17
-DESCRIPTION=An library to provide useful functions commonly found on BSD systems
-EAPI=6
-HOMEPAGE=https://libbsd.freedesktop.org/wiki/
-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 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=BSD BSD-2 BSD-4 ISC
-SLOT=0
-SRC_URI=https://libbsd.freedesktop.org/releases/libbsd-0.8.3.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=358d0e477f4d81e038cc1f48e5b99a35
diff --git a/metadata/md5-cache/dev-libs/libgames-support-1.0.2 b/metadata/md5-cache/dev-libs/libgames-support-1.0.2
deleted file mode 100644
index 98b54c411334..000000000000
--- a/metadata/md5-cache/dev-libs/libgames-support-1.0.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=|| ( dev-lang/vala:0.36 dev-lang/vala:0.34 dev-lang/vala:0.32 ) >=dev-util/intltool-0.50.2 virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Library for code commong to Gnome games
-EAPI=6
-HOMEPAGE=https://git.gnome.org/browse/libgames-support/
-KEYWORDS=amd64 x86
-LICENSE=LGPL-3+
-RDEPEND=>=dev-libs/glib-2.40:2 >=x11-libs/gtk+-3.19.2:3 dev-libs/libgee:0.8=
-SLOT=0
-SRC_URI=mirror://gnome/sources/libgames-support/1.0/libgames-support-1.0.2.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=56dec27b53c212f29b0e046e885bb7ee
diff --git a/metadata/md5-cache/dev-libs/libressl-2.7.1 b/metadata/md5-cache/dev-libs/libressl-2.7.1
new file mode 100644
index 000000000000..f6b7fd628b65
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libressl-2.7.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=!dev-libs/openssl:0
+DESCRIPTION=Free version of the SSL/TLS protocol forked from OpenSSL
+EAPI=6
+HOMEPAGE=http://www.libressl.org/
+IUSE=+asm 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
+LICENSE=ISC openssl
+PDEPEND=app-misc/ca-certificates
+RDEPEND=!dev-libs/openssl:0
+SLOT=0/45
+SRC_URI=http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-2.7.1.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=33dcdb961902947984c415e42c52f2a6
diff --git a/metadata/md5-cache/dev-libs/libusb-1.0.22 b/metadata/md5-cache/dev-libs/libusb-1.0.22
new file mode 100644
index 000000000000..5916c954758c
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libusb-1.0.22
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=udev? ( >=virtual/libudev-208:=[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?] ) doc? ( app-doc/doxygen ) !udev? ( virtual/os-headers )
+DESCRIPTION=Userspace access to USB devices
+EAPI=6
+HOMEPAGE=http://libusb.info/ https://github.com/libusb/libusb
+IUSE=debug doc examples static-libs test udev 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 -x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=LGPL-2.1
+RDEPEND=udev? ( >=virtual/libudev-208:=[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=1
+SRC_URI=https://github.com/libusb/libusb/releases/download/v1.0.22/libusb-1.0.22.tar.bz2
+_eclasses_=ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=a00f9634ca88a7f40d89a7a298a4ba4a
diff --git a/metadata/md5-cache/dev-libs/uthash-2.0.2 b/metadata/md5-cache/dev-libs/uthash-2.0.2
new file mode 100644
index 000000000000..cacc5ac689ed
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/uthash-2.0.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install test
+DEPEND=test? ( dev-lang/perl )
+DESCRIPTION=An easy-to-use hash implementation for C programmers
+EAPI=6
+HOMEPAGE=https://troydhanson.github.io/uthash/index.html
+IUSE=test
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86
+LICENSE=BSD-1
+SLOT=0
+SRC_URI=https://github.com/troydhanson/uthash/archive/v2.0.2.tar.gz -> uthash-2.0.2.tar.gz
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=277ff9ad79e01ad5ae32750f2751dfad
diff --git a/metadata/md5-cache/dev-lisp/Manifest.gz b/metadata/md5-cache/dev-lisp/Manifest.gz
index 6f4bea104f41..20a6df0d3d5a 100644
--- a/metadata/md5-cache/dev-lisp/Manifest.gz
+++ b/metadata/md5-cache/dev-lisp/Manifest.gz
diff --git a/metadata/md5-cache/dev-lisp/abcl-0.20.0 b/metadata/md5-cache/dev-lisp/abcl-0.20.0
index bf26fd3981fc..f0ffb925b8f7 100644
--- a/metadata/md5-cache/dev-lisp/abcl-0.20.0
+++ b/metadata/md5-cache/dev-lisp/abcl-0.20.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.5 jad? ( dev-java/jad-bin ) >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=http://common-lisp.net/project/armedbear/releases/abcl-src-0.20.0.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=82e261d1408cee3c28a6495fd60824d7
diff --git a/metadata/md5-cache/dev-lisp/abcl-0.20.0-r1 b/metadata/md5-cache/dev-lisp/abcl-0.20.0-r1
index 9b5d8372223e..7cf22db17d0c 100644
--- a/metadata/md5-cache/dev-lisp/abcl-0.20.0-r1
+++ b/metadata/md5-cache/dev-lisp/abcl-0.20.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=http://common-lisp.net/project/armedbear/releases/abcl-src-0.20.0.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=a99e9213d32906e1a393841ceeaf8b6b
diff --git a/metadata/md5-cache/dev-lisp/clisp-2.49.90 b/metadata/md5-cache/dev-lisp/clisp-2.49.90
index 36bf1ad7b3dd..ca727baa95d0 100644
--- a/metadata/md5-cache/dev-lisp/clisp-2.49.90
+++ b/metadata/md5-cache/dev-lisp/clisp-2.49.90
@@ -4,10 +4,10 @@ DESCRIPTION=A portable, bytecode-compiled implementation of Common Lisp
 EAPI=6
 HOMEPAGE=http://clisp.sourceforge.net/
 IUSE=hyperspec X berkdb dbus fastcgi gdbm gtk pari +pcre postgres +readline svm -threads +unicode +zlib
-KEYWORDS=~amd64 ~ppc ~sparc ~x86
+KEYWORDS=~amd64 ~ia64 ~ppc ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-lisp/asdf-2.33-r3 virtual/libiconv >=dev-libs/libsigsegv-2.10 >=dev-libs/ffcall-1.10 dbus? ( sys-apps/dbus ) fastcgi? ( dev-libs/fcgi ) gdbm? ( sys-libs/gdbm ) gtk? ( >=x11-libs/gtk+-2.10:2 >=gnome-base/libglade-2.6 ) pari? ( <sci-mathematics/pari-2.5.0 ) postgres? ( >=dev-db/postgresql-8.0:* ) readline? ( >=sys-libs/readline-7.0:0= ) pcre? ( dev-libs/libpcre:3 ) svm? ( sci-libs/libsvm ) zlib? ( sys-libs/zlib ) X? ( x11-libs/libXpm ) hyperspec? ( dev-lisp/hyperspec ) berkdb? ( sys-libs/db:4.8 )
 SLOT=2/8
 SRC_URI=https://haible.de/bruno/gnu/clisp-2.49.90.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=96607d255a085ec56c024a134aaa24fc
+_md5_=5c2b099b1de653d7b3f018d58428a2b0
diff --git a/metadata/md5-cache/dev-perl/Manifest.gz b/metadata/md5-cache/dev-perl/Manifest.gz
index 91d863fbb8b4..cfdced46285e 100644
--- a/metadata/md5-cache/dev-perl/Manifest.gz
+++ b/metadata/md5-cache/dev-perl/Manifest.gz
diff --git a/metadata/md5-cache/dev-perl/Template-DBI-2.650.0-r2 b/metadata/md5-cache/dev-perl/Template-DBI-2.650.0-r2
index 1ed29107d29c..8c3a3e55a3df 100644
--- a/metadata/md5-cache/dev-perl/Template-DBI-2.650.0-r2
+++ b/metadata/md5-cache/dev-perl/Template-DBI-2.650.0-r2
@@ -4,10 +4,10 @@ DESCRIPTION=DBI plugin for the Template Toolkit
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Template-DBI/
 IUSE=test
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~ppc-aix ~x86-fbsd ~x86-solaris
+KEYWORDS=amd64 ~arm ppc ppc64 x86 ~ppc-aix ~x86-fbsd ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/DBI-1.612 >=dev-perl/Template-Toolkit-2.22 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RE/REHSACK/Template-DBI-2.65.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=fcfeff0e2702b72de2845a822096d334
+_md5_=e73315a62576a8898db81ee68fa3a792
diff --git a/metadata/md5-cache/dev-perl/XML-DOM-1.460.0-r1 b/metadata/md5-cache/dev-perl/XML-DOM-1.460.0-r1
new file mode 100644
index 000000000000..7e83bd856918
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/XML-DOM-1.460.0-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-perl/libwww-perl >=dev-perl/XML-Parser-2.300.0 dev-perl/XML-RegExp virtual/perl-ExtUtils-MakeMaker test? ( >=dev-perl/libxml-perl-0.70.0 ) dev-lang/perl:=
+DESCRIPTION=A Perl module for an DOM Level 1 compliant interface
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/XML-DOM/
+IUSE=test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-perl/libwww-perl >=dev-perl/XML-Parser-2.300.0 dev-perl/XML-RegExp dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/T/TJ/TJMATHER/XML-DOM-1.46.tar.gz
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=d925accd045b9d83ec74da07bd1bf924
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index f3f588ebd7a4..fdab0979b62f 100644
--- a/metadata/md5-cache/dev-python/Manifest.gz
+++ b/metadata/md5-cache/dev-python/Manifest.gz
diff --git a/metadata/md5-cache/dev-python/attrs-17.2.0 b/metadata/md5-cache/dev-python/attrs-17.2.0
deleted file mode 100644
index d868251689bf..000000000000
--- a/metadata/md5-cache/dev-python/attrs-17.2.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/zope-interface[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/setuptools[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? ( dev-lang/python[sqlite] >=dev-python/hypothesis-3.6.0[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[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= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_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=Attributes without boilerplate
-EAPI=6
-HOMEPAGE=https://github.com/hynek/attrs https://attrs.readthedocs.org/ https://pypi.python.org/pypi/attrs
-IUSE=test 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 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=dev-python/zope-interface[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= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_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/a/attrs/attrs-17.2.0.tar.gz
-_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=989d67566d936218d0220fd80445e869
diff --git a/metadata/md5-cache/dev-python/attrs-17.3.0 b/metadata/md5-cache/dev-python/attrs-17.3.0
deleted file mode 100644
index 8b72b084faae..000000000000
--- a/metadata/md5-cache/dev-python/attrs-17.3.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/zope-interface[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/setuptools[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? ( dev-lang/python[sqlite] >=dev-python/hypothesis-3.6.0[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[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= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_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=Attributes without boilerplate
-EAPI=6
-HOMEPAGE=https://github.com/hynek/attrs https://attrs.readthedocs.org/ https://pypi.python.org/pypi/attrs
-IUSE=test 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 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~amd64-fbsd
-LICENSE=MIT
-RDEPEND=dev-python/zope-interface[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= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_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/a/attrs/attrs-17.3.0.tar.gz
-_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4698abd7c90326750d56204503396bfd
diff --git a/metadata/md5-cache/dev-python/attrs-17.4.0 b/metadata/md5-cache/dev-python/attrs-17.4.0
index 4688e4a762d0..257bd708557d 100644
--- a/metadata/md5-cache/dev-python/attrs-17.4.0
+++ b/metadata/md5-cache/dev-python/attrs-17.4.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/zope-interface[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/setuptools[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? ( dev-lang/python[sqlite] >=dev-python/hypothesis-3.6.0[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[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= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_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(-)]
+DEPEND=dev-python/zope-interface[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/setuptools[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? ( python_targets_pypy? ( >=virtual/pypy-5:0=[sqlite] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[sqlite] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_4? ( dev-lang/python:3.4[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=dev-python/hypothesis-3.6.0[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[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= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_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=Attributes without boilerplate
 EAPI=6
 HOMEPAGE=https://github.com/hynek/attrs https://attrs.readthedocs.org/ https://pypi.python.org/pypi/attrs
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python
 SLOT=0
 SRC_URI=mirror://pypi/a/attrs/attrs-17.4.0.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4698abd7c90326750d56204503396bfd
+_md5_=18a2a037d910a47c0dea2d9161a4ecd7
diff --git a/metadata/md5-cache/dev-python/cliapp-1.20170823 b/metadata/md5-cache/dev-python/cliapp-1.20170823
index 2d4a4230b45f..363ee0b9ee56 100644
--- a/metadata/md5-cache/dev-python/cliapp-1.20170823
+++ b/metadata/md5-cache/dev-python/cliapp-1.20170823
@@ -4,11 +4,11 @@ DESCRIPTION=Framework for Unix-like command line programs
 EAPI=6
 HOMEPAGE=http://liw.fi/cliapp/
 IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd
 LICENSE=GPL-2
 RDEPEND=dev-python/pyyaml[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(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=http://git.liw.fi/cgi-bin/cgit/cgit.cgi/cliapp/snapshot/cliapp-1.20170823.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1b23d048280dd571dc0754abdc0ed886
+_md5_=72c2668cbe238927ce4162ba1f33e4e2
diff --git a/metadata/md5-cache/dev-python/freezegun-0.3.10 b/metadata/md5-cache/dev-python/freezegun-0.3.10
new file mode 100644
index 000000000000..f57fcb792997
--- /dev/null
+++ b/metadata/md5-cache/dev-python/freezegun-0.3.10
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>dev-python/python-dateutil-2.0 dev-python/six dev-python/setuptools[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? ( python_targets_pypy? ( >=virtual/pypy-5:0=[sqlite] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[sqlite] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_4? ( dev-lang/python:3.4[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) dev-python/mock[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/nose[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= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_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=Let your Python tests travel through time
+EAPI=6
+HOMEPAGE=https://github.com/spulec/freezegun
+IUSE=test 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 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=Apache-2.0
+RDEPEND=>dev-python/python-dateutil-2.0 dev-python/six python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_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/f/freezegun/freezegun-0.3.10.tar.gz
+_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=8056268838c64ad2260c1e5f609d9950
diff --git a/metadata/md5-cache/dev-python/paste-2.0.3-r1 b/metadata/md5-cache/dev-python/paste-2.0.3-r1
index b3124f5da5c0..a5ac7ff90f15 100644
--- a/metadata/md5-cache/dev-python/paste-2.0.3-r1
+++ b/metadata/md5-cache/dev-python/paste-2.0.3-r1
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install prepare test
 DEPEND=dev-python/namespace-paste[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/six[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/tempita-0.5.2_pre20130828[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(-)] flup? ( dev-python/flup[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) openid? ( dev-python/python-openid[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) 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(-)] doc? ( dev-python/sphinx[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=Tools for using a Web Server Gateway Interface stack
 EAPI=6
-HOMEPAGE=http://pythonpaste.org https://pypi.python.org/pypi/Paste
+HOMEPAGE=https://pypi.python.org/pypi/Paste
 IUSE=doc flup openid python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
 KEYWORDS=amd64 ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris
 LICENSE=MIT
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/P/Paste/Paste-2.0.3.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f2999f420c14c802609efb077dab52a4
+_md5_=1cf788608ab295f1e82572b41f8c0609
diff --git a/metadata/md5-cache/dev-python/pastedeploy-1.5.2 b/metadata/md5-cache/dev-python/pastedeploy-1.5.2
index 4927a37ba4fc..90f3250f7cc9 100644
--- a/metadata/md5-cache/dev-python/pastedeploy-1.5.2
+++ b/metadata/md5-cache/dev-python/pastedeploy-1.5.2
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install prepare 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(-)] 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=Load, configure, and compose WSGI applications and servers
 EAPI=5
-HOMEPAGE=http://pythonpaste.org/deploy/ https://pypi.python.org/pypi/PasteDeploy
+HOMEPAGE=https://pypi.python.org/pypi/PasteDeploy
 IUSE=doc python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=MIT
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/P/PasteDeploy/PasteDeploy-1.5.2.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=03ab2ccf9fd45490f6ff51161cec3c9c
+_md5_=f71009181d9823fbfe258e9dba8cd935
diff --git a/metadata/md5-cache/dev-python/pastedeploy-1.5.2-r1 b/metadata/md5-cache/dev-python/pastedeploy-1.5.2-r1
index b621504966eb..76be4bc7248f 100644
--- a/metadata/md5-cache/dev-python/pastedeploy-1.5.2-r1
+++ b/metadata/md5-cache/dev-python/pastedeploy-1.5.2-r1
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=dev-python/namespace-paste[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/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/nose[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=Load, configure, and compose WSGI applications and servers
 EAPI=5
-HOMEPAGE=http://pythonpaste.org/deploy/ https://pypi.python.org/pypi/PasteDeploy
+HOMEPAGE=https://pypi.python.org/pypi/PasteDeploy
 IUSE=doc test 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 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=MIT
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 SLOT=0
 SRC_URI=https://bitbucket.org/ianb/pastedeploy/get/1.5.2.tar.gz -> pastedeploy-1.5.2-r1.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=cfa3be5ad6e2fd8a2a91c773db53c58f
+_md5_=b3aec8a3e3640328376626b5e200149d
diff --git a/metadata/md5-cache/dev-python/pastescript-2.0.2-r1 b/metadata/md5-cache/dev-python/pastescript-2.0.2-r1
index 8c504e2417ce..dab28eb528f6 100644
--- a/metadata/md5-cache/dev-python/pastescript-2.0.2-r1
+++ b/metadata/md5-cache/dev-python/pastescript-2.0.2-r1
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install prepare test
 DEPEND=dev-python/namespace-paste[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/paste-1.3[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/pastedeploy[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/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(-)] doc? ( dev-python/pygments[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/sphinx[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/sphinx[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=A pluggable command-line frontend, including commands to setup package file layouts
 EAPI=5
-HOMEPAGE=http://pythonpaste.org/script/ https://pypi.python.org/pypi/PasteScript
+HOMEPAGE=https://pypi.python.org/pypi/PasteScript
 IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
 KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=MIT
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/P/PasteScript/PasteScript-2.0.2.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ecd09add92b12d28e03dc83968fbe23a
+_md5_=b5cae4d679867fba732a0a75a324e68a
diff --git a/metadata/md5-cache/dev-python/pyfakefs-3.4.1 b/metadata/md5-cache/dev-python/pyfakefs-3.4.1
new file mode 100644
index 000000000000..e2fe17b0d517
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pyfakefs-3.4.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[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= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_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=a fake file system that mocks the Python file system modules
+EAPI=6
+HOMEPAGE=https://github.com/jmcgeheeiv/pyfakefs/ https://pypi.python.org/pypi/pyfakefs
+IUSE=python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_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=https://github.com/jmcgeheeiv/pyfakefs/archive/v3.4.1.tar.gz -> pyfakefs-3.4.1.tar.gz
+_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=aca60dcaf16630297a329d14852a5235
diff --git a/metadata/md5-cache/dev-python/python-daap-0.7.1-r1 b/metadata/md5-cache/dev-python/python-daap-0.7.1-r1
index 1532656b0da3..b0a1ac7ab140 100644
--- a/metadata/md5-cache/dev-python/python-daap-0.7.1-r1
+++ b/metadata/md5-cache/dev-python/python-daap-0.7.1-r1
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install prepare test
 DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=PyDaap is a DAAP client implemented in Python, based on PyTunes
 EAPI=5
-HOMEPAGE=http://jerakeen.org/code/pythondaap
+HOMEPAGE=https://movieos.org/code/pythondaap/ https://github.com/tominsam/pythondaap
 IUSE=examples python_targets_python2_7
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://jerakeen.org/files/PythonDaap-0.7.1.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=946d208a9ef9b212549d091458716ba6
+_md5_=3d4bc52785a84666290d88086f7a6329
diff --git a/metadata/md5-cache/dev-python/python-dateutil-2.7.1 b/metadata/md5-cache/dev-python/python-dateutil-2.7.1
new file mode 100644
index 000000000000..8d6faf220a40
--- /dev/null
+++ b/metadata/md5-cache/dev-python/python-dateutil-2.7.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/six-1.5[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(-)] sys-libs/timezone-data dev-python/setuptools_scm[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/setuptools[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? ( dev-python/pytest[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/freezegun[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= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_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=Extensions to the standard Python datetime module
+EAPI=6
+HOMEPAGE=https://dateutil.readthedocs.org/ https://pypi.python.org/pypi/python-dateutil https://github.com/dateutil/dateutil/
+IUSE=test 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 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=BSD
+RDEPEND=>=dev-python/six-1.5[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(-)] sys-libs/timezone-data python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_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/python-dateutil/python-dateutil-2.7.1.tar.gz
+_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=96940344efc4cf1d37a5fa6b49757e5a
diff --git a/metadata/md5-cache/dev-python/python-memcached-1.53-r1 b/metadata/md5-cache/dev-python/python-memcached-1.53-r1
index 2536af0388dc..f1ed8244a95a 100644
--- a/metadata/md5-cache/dev-python/python-memcached-1.53-r1
+++ b/metadata/md5-cache/dev-python/python-memcached-1.53-r1
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install prepare test
 DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)] test? ( net-misc/memcached ) 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(-)]
 DESCRIPTION=Pure python memcached client
 EAPI=5
-HOMEPAGE=http://www.tummy.com/Community/software/python-memcached/ https://pypi.python.org/pypi/python-memcached
+HOMEPAGE=https://www.tummy.com/Community/software/python-memcached/ https://pypi.python.org/pypi/python-memcached
 IUSE=test python_targets_pypy python_targets_python2_7
 KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=OSL-2.0
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=ftp://ftp.tummy.com/pub/python-memcached/old-releases/python-memcached-1.53.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e21941a21935ffaac74d4749d42b9bbf
+_md5_=fe47c6dab6202fc5f2c4a756165ca1b3
diff --git a/metadata/md5-cache/dev-python/python-memcached-1.58 b/metadata/md5-cache/dev-python/python-memcached-1.58
index 158f3703cfaf..c6a03993e32a 100644
--- a/metadata/md5-cache/dev-python/python-memcached-1.58
+++ b/metadata/md5-cache/dev-python/python-memcached-1.58
@@ -2,7 +2,7 @@ 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? ( net-misc/memcached dev-python/nose[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= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 DESCRIPTION=Pure python memcached client
 EAPI=5
-HOMEPAGE=http://www.tummy.com/Community/software/python-memcached/ https://pypi.python.org/pypi/python-memcached
+HOMEPAGE=https://www.tummy.com/Community/software/python-memcached/ https://pypi.python.org/pypi/python-memcached
 IUSE=test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
 KEYWORDS=amd64 ~arm64 ppc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=OSL-2.0
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/python-memcached/python-memcached-1.58.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6f5a3daabb53b4916f58bed948c7ede5
+_md5_=325394137a7e75de30b1463e96a0edf6
diff --git a/metadata/md5-cache/dev-python/python-nss-0.16.0 b/metadata/md5-cache/dev-python/python-nss-0.16.0
index 228a9f57dbd2..4376712c16dd 100644
--- a/metadata/md5-cache/dev-python/python-nss-0.16.0
+++ b/metadata/md5-cache/dev-python/python-nss-0.16.0
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install prepare test
 DEPEND=dev-libs/nspr dev-libs/nss doc? ( dev-python/docutils[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/epydoc[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(-)]
 DESCRIPTION=Python bindings for Network Security Services (NSS)
 EAPI=5
-HOMEPAGE=http://www.mozilla.org/projects/security/pki/python-nss/
+HOMEPAGE=https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/Python_binding_for_NSS
 IUSE=doc examples python_targets_python2_7
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( MPL-1.1 GPL-2 LGPL-2 )
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=ftp://ftp.mozilla.org/pub/mozilla.org/security/python-nss/releases/PYNSS_RELEASE_0_16_0/src/python-nss-0.16.0.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=96285e65af64661ea45f4466239f720d
+_md5_=0739c43e03b21986f9fca943209871d4
diff --git a/metadata/md5-cache/dev-python/pyzor-1.0.0-r1 b/metadata/md5-cache/dev-python/pyzor-1.0.0-r1
index 9680deca7397..d278ae7c1ce0 100644
--- a/metadata/md5-cache/dev-python/pyzor-1.0.0-r1
+++ b/metadata/md5-cache/dev-python/pyzor-1.0.0-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=pyzord? ( || ( gdbm mysql redis ) ) test? ( gdbm mysql redis ) || (
 SLOT=0
 SRC_URI=https://github.com/SpamExperts/pyzor/archive/release-1-0-0.tar.gz -> pyzor-1.0.0.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4566d286f3319839588cec8b577cc0c7
+_md5_=0d9610c802f0836c2092cd2e90f1a9e9
diff --git a/metadata/md5-cache/dev-python/sancho-2.4-r1 b/metadata/md5-cache/dev-python/sancho-2.4-r1
index 38ee19934d20..a8b0e5531fc8 100644
--- a/metadata/md5-cache/dev-python/sancho-2.4-r1
+++ b/metadata/md5-cache/dev-python/sancho-2.4-r1
@@ -2,13 +2,13 @@ DEFINED_PHASES=compile configure install prepare test
 DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Sancho is a unit testing framework
 EAPI=5
-HOMEPAGE=http://www.mems-exchange.org/software/sancho/
+HOMEPAGE=https://www.mems-exchange.org/software/sancho/
 IUSE=python_targets_python2_7
 KEYWORDS=alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=CNRI
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-SRC_URI=http://www.mems-exchange.org/software/files/sancho/Sancho-2.4.tar.gz
+SRC_URI=https://www.mems-exchange.org/software/files/sancho/Sancho-2.4.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=cc1bd7cd497eb611bb1b36ffd5e6981e
+_md5_=0f745c00c3a5359c094f5ff5be91c75b
diff --git a/metadata/md5-cache/dev-python/scripttest-1.2-r1 b/metadata/md5-cache/dev-python/scripttest-1.2-r1
index 06286f93016c..bd928f597133 100644
--- a/metadata/md5-cache/dev-python/scripttest-1.2-r1
+++ b/metadata/md5-cache/dev-python/scripttest-1.2-r1
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install prepare test
 DEPEND=dev-python/setuptools[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(-)]
 DESCRIPTION=A very small text templating language
 EAPI=5
-HOMEPAGE=http://pythonpaste.org/scripttest/ https://pypi.python.org/pypi/ScriptTest
+HOMEPAGE=https://pypi.python.org/pypi/ScriptTest https://github.com/pypa/scripttest
 IUSE=python_targets_python2_7
 KEYWORDS=amd64 x86
 LICENSE=MIT
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/S/ScriptTest/ScriptTest-1.2.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=8566252bfccb48ff252ac8820dce4f8c
+_md5_=9da05cb4acb3d272f8bad085b2415434
diff --git a/metadata/md5-cache/dev-python/scripttest-1.3.0 b/metadata/md5-cache/dev-python/scripttest-1.3.0
index 3d02eb463b01..414bbc13d474 100644
--- a/metadata/md5-cache/dev-python/scripttest-1.3.0
+++ b/metadata/md5-cache/dev-python/scripttest-1.3.0
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install prepare test
 DEPEND=dev-python/setuptools[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? ( dev-python/pytest[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= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_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=A very small text templating language
 EAPI=5
-HOMEPAGE=http://pythonpaste.org/scripttest/ https://pypi.python.org/pypi/ScriptTest
+HOMEPAGE=https://pypi.python.org/pypi/ScriptTest https://github.com/pypa/scripttest
 IUSE=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 ~x86
 LICENSE=MIT
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python
 SLOT=0
 SRC_URI=https://github.com/pypa/scripttest/archive/1.3.0.tar.gz -> scripttest-1.3.0.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=bfd619f193dc4398c26c8a5476643776
+_md5_=15c1de88cd7a229064dfc6eca14c69d4
diff --git a/metadata/md5-cache/dev-python/sip-4.19.8 b/metadata/md5-cache/dev-python/sip-4.19.8
index 9828c26355f5..76c08b014053 100644
--- a/metadata/md5-cache/dev-python/sip-4.19.8
+++ b/metadata/md5-cache/dev-python/sip-4.19.8
@@ -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.8.tar.gz
 _eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=49a7aae6e6f1d3512a364f4db274fcb4
+_md5_=6ad0b73ac6dd993460b8d0864c64e9f5
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-httpdomain-1.4.0 b/metadata/md5-cache/dev-python/sphinxcontrib-httpdomain-1.4.0
index 44153614beb2..74797839af32 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-httpdomain-1.4.0
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-httpdomain-1.4.0
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install prepare test
 DEPEND=>=dev-python/sphinx-1.0[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/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/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(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 DESCRIPTION=Extension providing a Sphinx domain for describing RESTful HTTP APIs
 EAPI=5
-HOMEPAGE=https://bitbucket.org/birkenfeld/sphinx-contrib/ http://packages.python.org/sphinxcontrib-httpdomain/
+HOMEPAGE=https://bitbucket.org/birkenfeld/sphinx-contrib/ https://sphinxcontrib-httpdomain.readthedocs.io/en/stable/
 IUSE=python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
 KEYWORDS=amd64 x86
 LICENSE=BSD-2
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_py
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinxcontrib-httpdomain/sphinxcontrib-httpdomain-1.4.0.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=df5bf1a138455d8485cd245a3ca2f81a
+_md5_=b1012d76573e50e579c30425e1a59519
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-httpdomain-1.5.0 b/metadata/md5-cache/dev-python/sphinxcontrib-httpdomain-1.5.0
index 90482e1985c3..b62aa6963dac 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-httpdomain-1.5.0
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-httpdomain-1.5.0
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install prepare test
 DEPEND=dev-python/sphinx[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/namespace-sphinxcontrib[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/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/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(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 DESCRIPTION=Extension providing a Sphinx domain for describing RESTful HTTP APIs
 EAPI=6
-HOMEPAGE=http://packages.python.org/sphinxcontrib-httpdomain/
+HOMEPAGE=https://bitbucket.org/birkenfeld/sphinx-contrib/ https://sphinxcontrib-httpdomain.readthedocs.io/en/stable/
 IUSE=python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD-2
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_py
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinxcontrib-httpdomain/sphinxcontrib-httpdomain-1.5.0.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b7f29b5712a8085907e6da5ba3e0adbc
+_md5_=c09af2868ddcd2c02ec5c6202fac59e1
diff --git a/metadata/md5-cache/dev-python/tempita-0.5.3-r1 b/metadata/md5-cache/dev-python/tempita-0.5.3-r1
index 7782d6959903..626251f28d96 100644
--- a/metadata/md5-cache/dev-python/tempita-0.5.3-r1
+++ b/metadata/md5-cache/dev-python/tempita-0.5.3-r1
@@ -2,7 +2,7 @@ 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(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 DESCRIPTION=A very small text templating language
 EAPI=5
-HOMEPAGE=http://pythonpaste.org/tempita https://pypi.python.org/pypi/Tempita
+HOMEPAGE=https://pypi.python.org/pypi/Tempita
 IUSE=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
 LICENSE=MIT
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_py
 SLOT=0
 SRC_URI=mirror://pypi/T/Tempita/Tempita-0.5.3dev.tar.gz -> tempita-0.5.3.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=29a4d83fd5d24c688913820473c107e8
+_md5_=87369cd177ace8a434bb1b10e05a77e8
diff --git a/metadata/md5-cache/dev-python/thunarx-python-0.3.0-r1 b/metadata/md5-cache/dev-python/thunarx-python-0.3.0-r1
deleted file mode 100644
index 509722a82b01..000000000000
--- a/metadata/md5-cache/dev-python/thunarx-python-0.3.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] x11-libs/gtk+:2 dev-libs/glib:2 >=dev-python/pygobject-2.16: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/pygtk: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(+)] >=xfce-base/thunar-1.1.0 virtual/pkgconfig >=app-portage/elt-patches-20170422 >=sys-apps/sed-4
-DESCRIPTION=Python bindings for the Thunar file manager
-EAPI=5
-HOMEPAGE=https://goodies.xfce.org/projects/bindings/thunarx-python
-IUSE=debug python_targets_python2_7
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] x11-libs/gtk+:2 dev-libs/glib:2 >=dev-python/pygobject-2.16: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/pygtk: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(+)] >=xfce-base/thunar-1.1.0
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=mirror://xfce/src/bindings/thunarx-python/0.3/thunarx-python-0.3.0.tar.bz2
-_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25	xfconf	25bb7fe99d6e58851633dc43d429c5ae
-_md5_=79650c6b2a9fab519d81fa0719551479
diff --git a/metadata/md5-cache/dev-python/thunarx-python-0.4.0 b/metadata/md5-cache/dev-python/thunarx-python-0.4.0
deleted file mode 100644
index 6d0d2100ab40..000000000000
--- a/metadata/md5-cache/dev-python/thunarx-python-0.4.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install setup
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=x11-libs/gtk+-3.20:3 >=dev-libs/glib-2.30:2 >=dev-python/pygobject-3.20:3[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(+)] >=xfce-base/thunar-1.7.0 virtual/pkgconfig
-DESCRIPTION=Python bindings for the Thunar file manager
-EAPI=6
-HOMEPAGE=https://goodies.xfce.org/projects/bindings/thunarx-python
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=x11-libs/gtk+-3.20:3 >=dev-libs/glib-2.30:2 >=dev-python/pygobject-3.20:3[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(+)] >=xfce-base/thunar-1.7.0
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=mirror://xfce/src/bindings/thunarx-python/0.4/thunarx-python-0.4.0.tar.bz2
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=40864c4db648717995cb16cc75f775f0
diff --git a/metadata/md5-cache/dev-python/thunarx-python-0.5.0 b/metadata/md5-cache/dev-python/thunarx-python-0.5.0
deleted file mode 100644
index 5f39ebb5a5c2..000000000000
--- a/metadata/md5-cache/dev-python/thunarx-python-0.5.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install setup
-DEPEND=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 ) python_single_target_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_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(+)?] >=x11-libs/gtk+-3.20:3 >=dev-libs/glib-2.30:2 >=dev-python/pygobject-3.20:3[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(+)?] >=xfce-base/thunar-1.7.0 virtual/pkgconfig
-DESCRIPTION=Python bindings for the Thunar file manager
-EAPI=6
-HOMEPAGE=https://goodies.xfce.org/projects/bindings/thunarx-python
-IUSE=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 ~x86
-LICENSE=GPL-3
-RDEPEND=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 ) python_single_target_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_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(+)?] >=x11-libs/gtk+-3.20:3 >=dev-libs/glib-2.30:2 >=dev-python/pygobject-3.20:3[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(+)?] >=xfce-base/thunar-1.7.0
-REQUIRED_USE=^^ ( 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://xfce/src/bindings/thunarx-python/0.5/thunarx-python-0.5.0.tar.bz2
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=d1b5ab69158d9e6372ffc2514da4cf78
diff --git a/metadata/md5-cache/dev-python/ttystatus-0.35 b/metadata/md5-cache/dev-python/ttystatus-0.35
index 6db236da6cf3..6e9fcb871b6e 100644
--- a/metadata/md5-cache/dev-python/ttystatus-0.35
+++ b/metadata/md5-cache/dev-python/ttystatus-0.35
@@ -4,11 +4,11 @@ DESCRIPTION=Terminal progress bar and status output for command line
 EAPI=5
 HOMEPAGE=http://liw.fi/ttystatus/
 IUSE=python_targets_python2_7
-KEYWORDS=alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd
 LICENSE=GPL-3
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://git.liw.fi/cgi-bin/cgit/cgit.cgi/ttystatus/snapshot/ttystatus-0.35.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b6598358f2ee874f081c9c35b6104235
+_md5_=114a5d3350a18bdf380720c3a6a26828
diff --git a/metadata/md5-cache/dev-python/virtualenv-15.1.0 b/metadata/md5-cache/dev-python/virtualenv-15.1.0
index be5d162728c3..e0e8a10659b7 100644
--- a/metadata/md5-cache/dev-python/virtualenv-15.1.0
+++ b/metadata/md5-cache/dev-python/virtualenv-15.1.0
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install prepare test
 DEPEND=>=dev-python/setuptools-19.6.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(-)] 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(-)] ) test? ( dev-python/mock[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[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= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_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=Virtual Python Environment builder
 EAPI=6
-HOMEPAGE=http://www.virtualenv.org/ https://pypi.python.org/pypi/virtualenv https://github.com/pypa/virtualenv/
+HOMEPAGE=https://virtualenv.pypa.io/en/stable/ https://pypi.python.org/pypi/virtualenv https://github.com/pypa/virtualenv/
 IUSE=doc test 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 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~amd64-fbsd
 LICENSE=MIT
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python
 SLOT=0
 SRC_URI=https://github.com/pypa/virtualenv/archive/15.1.0.tar.gz -> virtualenv-15.1.0.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=366afa9f31654d9c8102953a3706b07c
+_md5_=a971a7ad15cb57313f89189dc3bb5c6d
diff --git a/metadata/md5-cache/dev-python/virtualenvwrapper-4.7.1 b/metadata/md5-cache/dev-python/virtualenvwrapper-4.7.1
index 2a6b365328c4..ae282a59a2c9 100644
--- a/metadata/md5-cache/dev-python/virtualenvwrapper-4.7.1
+++ b/metadata/md5-cache/dev-python/virtualenvwrapper-4.7.1
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/v/virtualenvwrapper/virtualenvwrapper-4.7.1.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=744b2590ca4dfc6fb25a5cbe09ff4b51
+_md5_=3194ccd1150440b21fc72f0ae2e33bfa
diff --git a/metadata/md5-cache/dev-python/virtualenvwrapper-4.8.2 b/metadata/md5-cache/dev-python/virtualenvwrapper-4.8.2
index ebb4a80402ef..3f67978ed966 100644
--- a/metadata/md5-cache/dev-python/virtualenvwrapper-4.8.2
+++ b/metadata/md5-cache/dev-python/virtualenvwrapper-4.8.2
@@ -2,7 +2,7 @@ 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(-)] dev-python/pbr[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=Set of extensions to Ian Bicking's virtualenv tool
 EAPI=6
-HOMEPAGE=http://www.doughellmann.com/projects/virtualenvwrapper https://pypi.python.org/pypi/virtualenvwrapper
+HOMEPAGE=https://bitbucket.org/dhellmann/virtualenvwrapper https://pypi.python.org/pypi/virtualenvwrapper
 IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/v/virtualenvwrapper/virtualenvwrapper-4.8.2.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=99f40b05cc9c08017281895eb3641eff
+_md5_=1863f80228569b852edbbe201b6bf27e
diff --git a/metadata/md5-cache/dev-python/webhelpers-1.3-r1 b/metadata/md5-cache/dev-python/webhelpers-1.3-r1
index e986c7b1606d..db2be43eb298 100644
--- a/metadata/md5-cache/dev-python/webhelpers-1.3-r1
+++ b/metadata/md5-cache/dev-python/webhelpers-1.3-r1
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install prepare test
 DEPEND=>=dev-python/markupsafe-0.9.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/webob[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/routes[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] doc? ( dev-python/sphinx[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) test? ( dev-python/nose[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(-)]
 DESCRIPTION=Web Helpers
 EAPI=5
-HOMEPAGE=http://webhelpers.groovie.org/ https://pypi.python.org/pypi/WebHelpers
+HOMEPAGE=https://docs.pylonsproject.org/projects/webhelpers/en/latest/ https://pypi.python.org/pypi/WebHelpers
 IUSE=doc test python_targets_python2_7
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=BSD
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/W/WebHelpers/WebHelpers-1.3.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ff75118f5df8e6e5ad12d7133d4415c8
+_md5_=ee9ed01f8e129f5094ab195bfc7c6f08
diff --git a/metadata/md5-cache/dev-python/webtest-2.0.21 b/metadata/md5-cache/dev-python/webtest-2.0.21
index 8c238ef06978..541992fc1abc 100644
--- a/metadata/md5-cache/dev-python/webtest-2.0.21
+++ b/metadata/md5-cache/dev-python/webtest-2.0.21
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install prepare test
 DEPEND=dev-python/six[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/waitress-0.8.5[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/webob-1.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/beautifulsoup:4[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/lxml[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(-)] app-arch/unzip 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(-)] doc? ( dev-python/sphinx[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/nose[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/pyquery[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/pastedeploy[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/wsgiproxy2[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/coverage[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-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) 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=Helper to test WSGI applications
 EAPI=6
-HOMEPAGE=http://pythonpaste.org/webtest/ https://pypi.python.org/pypi/WebTest
+HOMEPAGE=https://pypi.python.org/pypi/WebTest
 IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
 KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ppc64 ~s390 ~sh sparc x86
 LICENSE=MIT
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/W/WebTest/WebTest-2.0.21.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=33f73771567721542bb988af2f42df12
+_md5_=44bc4736387a8feb2f155aab157fe106
diff --git a/metadata/md5-cache/dev-python/webtest-2.0.29 b/metadata/md5-cache/dev-python/webtest-2.0.29
index b35f6a6399b0..205c63fab9fd 100644
--- a/metadata/md5-cache/dev-python/webtest-2.0.29
+++ b/metadata/md5-cache/dev-python/webtest-2.0.29
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install prepare test
 DEPEND=dev-python/six[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/webob-1.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/waitress-0.8.5[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/beautifulsoup:4[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(-)] app-arch/unzip 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(-)] doc? ( dev-python/sphinx[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/nose[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/pyquery[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/pastedeploy[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/wsgiproxy2[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/coverage[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-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) 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=Helper to test WSGI applications
 EAPI=6
-HOMEPAGE=http://pythonpaste.org/webtest/ https://pypi.python.org/pypi/WebTest
+HOMEPAGE=https://pypi.python.org/pypi/WebTest
 IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=MIT
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/W/WebTest/WebTest-2.0.29.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=57420527f3420d5962ff14307189986a
+_md5_=19395df05d1ff6b0efb495c59de613e4
diff --git a/metadata/md5-cache/dev-python/wsgiproxy2-0.4.2 b/metadata/md5-cache/dev-python/wsgiproxy2-0.4.2
index f1ae75523a8f..13862872d3ba 100644
--- a/metadata/md5-cache/dev-python/wsgiproxy2-0.4.2
+++ b/metadata/md5-cache/dev-python/wsgiproxy2-0.4.2
@@ -2,7 +2,7 @@ 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/urllib3[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/requests[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/webob[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/six[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/webtest-2.0.17[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/socketpool[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/restkit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) 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=HTTP proxying tools for WSGI apps
 EAPI=5
-HOMEPAGE=http://pythonpaste.org/wsgiproxy/
+HOMEPAGE=https://pypi.python.org/pypi/WSGIProxy2
 IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc64 ~s390 ~sh sparc x86
 LICENSE=MIT
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/W/WSGIProxy2/WSGIProxy2-0.4.2.zip
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=23a8052515c5d5b259748809c8fe80c4
+_md5_=decdc44566d3dcdf400606b0c0b49366
diff --git a/metadata/md5-cache/dev-python/wsgiproxy2-0.4.4 b/metadata/md5-cache/dev-python/wsgiproxy2-0.4.4
index 3b81d432b390..410bfb0a3c78 100644
--- a/metadata/md5-cache/dev-python/wsgiproxy2-0.4.4
+++ b/metadata/md5-cache/dev-python/wsgiproxy2-0.4.4
@@ -2,7 +2,7 @@ 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/urllib3[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/requests[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/webob[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/six[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/webtest-2.0.17[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/socketpool[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/restkit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) 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=HTTP proxying tools for WSGI apps
 EAPI=5
-HOMEPAGE=http://pythonpaste.org/wsgiproxy/
+HOMEPAGE=https://pypi.python.org/pypi/WSGIProxy2
 IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=MIT
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/W/WSGIProxy2/WSGIProxy2-0.4.4.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e209b69bfce73e0d32000b818c4c7911
+_md5_=3a2abdace9b2f61596bdf66c46bbd95e
diff --git a/metadata/md5-cache/dev-ros/Manifest.gz b/metadata/md5-cache/dev-ros/Manifest.gz
index 7a77391ef508..345da071cf94 100644
--- a/metadata/md5-cache/dev-ros/Manifest.gz
+++ b/metadata/md5-cache/dev-ros/Manifest.gz
diff --git a/metadata/md5-cache/dev-ros/amcl-1.15.2 b/metadata/md5-cache/dev-ros/amcl-1.15.2
new file mode 100644
index 000000000000..4ce7c3f84ec5
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/amcl-1.15.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/roscpp dev-ros/tf dev-ros/rosbag dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/boost:= dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.9.6 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(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Probabilistic localization system for a robot moving in 2D
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/amcl
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=LGPL-2.1
+RDEPEND=dev-ros/roscpp dev-ros/tf dev-ros/rosbag dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/boost:= dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] 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://github.com/ros-planning/navigation/archive/1.15.2.tar.gz -> navigation-1.15.2.tar.gz
+_eclasses_=cmake-utils	b8d2d7038bb36192aa14e01c64e5a06a	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=665e0c4b5984695890452c5c843e4fd2
diff --git a/metadata/md5-cache/dev-ros/base_local_planner-1.15.2 b/metadata/md5-cache/dev-ros/base_local_planner-1.15.2
new file mode 100644
index 000000000000..d908caa271b2
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/base_local_planner-1.15.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/roscpp dev-ros/tf dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/nav_core dev-ros/pcl_conversions dev-ros/rostest dev-ros/costmap_2d dev-ros/pluginlib dev-ros/angles dev-libs/boost:=[threads] dev-cpp/eigen:3 sci-libs/pcl dev-libs/console_bridge:= dev-ros/cmake_modules test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.9.6 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(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[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(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DESCRIPTION=Trajectory Rollout and Dynamic Window approaches to local robot navigation on a plane
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/base_local_planner
+IUSE=python_targets_python2_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/roscpp dev-ros/tf dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/nav_core dev-ros/pcl_conversions dev-ros/rostest dev-ros/costmap_2d dev-ros/pluginlib dev-ros/angles dev-libs/boost:=[threads] dev-cpp/eigen:3 sci-libs/pcl dev-libs/console_bridge:= 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(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros-planning/navigation/archive/1.15.2.tar.gz -> navigation-1.15.2.tar.gz
+_eclasses_=cmake-utils	b8d2d7038bb36192aa14e01c64e5a06a	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=6a0f9d5c9ca9063f9df35aae79fcc932
diff --git a/metadata/md5-cache/dev-ros/carrot_planner-1.15.2 b/metadata/md5-cache/dev-ros/carrot_planner-1.15.2
new file mode 100644
index 000000000000..d9404a00db38
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/carrot_planner-1.15.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/roscpp dev-ros/tf dev-ros/nav_core dev-ros/costmap_2d dev-ros/base_local_planner dev-ros/pluginlib dev-libs/boost:= dev-libs/console_bridge:= sys-devel/make >=dev-util/cmake-3.9.6 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(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Attempts to find a legal place to put a carrot for the robot to follow
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/carrot_planner
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/roscpp dev-ros/tf dev-ros/nav_core dev-ros/costmap_2d dev-ros/base_local_planner dev-ros/pluginlib dev-libs/boost:= dev-libs/console_bridge:= 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://github.com/ros-planning/navigation/archive/1.15.2.tar.gz -> navigation-1.15.2.tar.gz
+_eclasses_=cmake-utils	b8d2d7038bb36192aa14e01c64e5a06a	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=0f86efe3fc2906cfaf3e153cdf5571b7
diff --git a/metadata/md5-cache/dev-ros/clear_costmap_recovery-1.15.2 b/metadata/md5-cache/dev-ros/clear_costmap_recovery-1.15.2
new file mode 100644
index 000000000000..21b9ef1ecc97
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/clear_costmap_recovery-1.15.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-ros/costmap_2d-1.13.1 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-ros/tf dev-cpp/eigen:3 sci-libs/pcl dev-libs/boost:=[threads] dev-libs/console_bridge:= dev-ros/cmake_modules test? ( dev-ros/rostest dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.9.6 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(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Recovery behavior that attempts to clear space by reverting the costmaps to the static map
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/clear_costmap_recovery
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=>=dev-ros/costmap_2d-1.13.1 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-ros/tf dev-cpp/eigen:3 sci-libs/pcl dev-libs/boost:=[threads] dev-libs/console_bridge:= 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://github.com/ros-planning/navigation/archive/1.15.2.tar.gz -> navigation-1.15.2.tar.gz
+_eclasses_=cmake-utils	b8d2d7038bb36192aa14e01c64e5a06a	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=2d5d1344d8adf1a79b643344f961c6ab
diff --git a/metadata/md5-cache/dev-ros/costmap_2d-1.15.2 b/metadata/md5-cache/dev-ros/costmap_2d-1.15.2
new file mode 100644
index 000000000000..5f9063142405
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/costmap_2d-1.15.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/laser_geometry dev-ros/message_filters dev-ros/nav_msgs dev-ros/pcl_conversions dev-ros/pcl_ros dev-ros/pluginlib dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/tf dev-ros/voxel_grid dev-cpp/eigen:3 sci-libs/pcl:= dev-libs/boost:=[threads] dev-libs/tinyxml2:= dev-ros/cmake_modules test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.9.6 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(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[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(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/map_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/map_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DESCRIPTION=Creates a 2D costmap from sensor data
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/costmap_2d
+IUSE=python_targets_python2_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/laser_geometry dev-ros/message_filters dev-ros/nav_msgs dev-ros/pcl_conversions dev-ros/pcl_ros dev-ros/pluginlib dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/tf dev-ros/voxel_grid dev-cpp/eigen:3 sci-libs/pcl:= dev-libs/boost:=[threads] dev-libs/tinyxml2:= 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(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/map_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/map_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+REQUIRED_USE=ros_messages_cxx || ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros-planning/navigation/archive/1.15.2.tar.gz -> navigation-1.15.2.tar.gz
+_eclasses_=cmake-utils	b8d2d7038bb36192aa14e01c64e5a06a	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=7595cef3a8f73907396c66b83e151d04
diff --git a/metadata/md5-cache/dev-ros/dwa_local_planner-1.15.2 b/metadata/md5-cache/dev-ros/dwa_local_planner-1.15.2
new file mode 100644
index 000000000000..ff7e6fe67bf6
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/dwa_local_planner-1.15.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/base_local_planner dev-ros/costmap_2d dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/nav_core dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/pluginlib dev-ros/pcl_conversions dev-ros/roscpp dev-ros/tf dev-cpp/eigen:3 sci-libs/pcl dev-libs/boost:=[threads] dev-libs/console_bridge:= sys-devel/make >=dev-util/cmake-3.9.6 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(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Dynamic Window Approach to local robot navigation on a plane
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/dwa_local_planner
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/base_local_planner dev-ros/costmap_2d dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/nav_core dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/pluginlib dev-ros/pcl_conversions dev-ros/roscpp dev-ros/tf dev-cpp/eigen:3 sci-libs/pcl dev-libs/boost:=[threads] dev-libs/console_bridge:= 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://github.com/ros-planning/navigation/archive/1.15.2.tar.gz -> navigation-1.15.2.tar.gz
+_eclasses_=cmake-utils	b8d2d7038bb36192aa14e01c64e5a06a	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=0d9aeea234fa56d222948ecc96170bb8
diff --git a/metadata/md5-cache/dev-ros/fake_localization-1.15.2 b/metadata/md5-cache/dev-ros/fake_localization-1.15.2
new file mode 100644
index 000000000000..c076e398d26b
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/fake_localization-1.15.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/boost:= dev-ros/angles dev-ros/roscpp dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosconsole dev-ros/nav_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_cxx(-)] dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/message_filters sys-devel/make >=dev-util/cmake-3.9.6 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(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=A ROS node that simply forwards odometry information
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/fake_localization
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-libs/boost:= dev-ros/angles dev-ros/roscpp dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosconsole dev-ros/nav_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_cxx(-)] dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/message_filters 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://github.com/ros-planning/navigation/archive/1.15.2.tar.gz -> navigation-1.15.2.tar.gz
+_eclasses_=cmake-utils	b8d2d7038bb36192aa14e01c64e5a06a	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=522029e9ccc9fc24d750386ade31e864
diff --git a/metadata/md5-cache/dev-ros/global_planner-1.15.2 b/metadata/md5-cache/dev-ros/global_planner-1.15.2
new file mode 100644
index 000000000000..cd99e9aa7725
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/global_planner-1.15.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/costmap_2d dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/nav_core dev-ros/navfn dev-ros/pluginlib dev-ros/roscpp dev-ros/tf dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-libs/boost:= dev-libs/console_bridge:= sys-devel/make >=dev-util/cmake-3.9.6 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(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Path planner library and node
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/global_planner
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/costmap_2d dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/nav_core dev-ros/navfn dev-ros/pluginlib dev-ros/roscpp dev-ros/tf dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-libs/boost:= dev-libs/console_bridge:= 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://github.com/ros-planning/navigation/archive/1.15.2.tar.gz -> navigation-1.15.2.tar.gz
+_eclasses_=cmake-utils	b8d2d7038bb36192aa14e01c64e5a06a	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=b12d691b2197a404c698c88a00bda46a
diff --git a/metadata/md5-cache/dev-ros/map_server-1.15.2 b/metadata/md5-cache/dev-ros/map_server-1.15.2
new file mode 100644
index 000000000000..b3dad0a6f641
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/map_server-1.15.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/roscpp dev-ros/tf dev-ros/nav_msgs[ros_messages_cxx(-)] dev-libs/boost:= media-libs/sdl-image >=dev-cpp/yaml-cpp-0.5 sci-physics/bullet:= test? ( dev-ros/rostest dev-cpp/gtest ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 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(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Offers map data as a ROS service
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/map_server
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/roscpp dev-ros/tf dev-ros/nav_msgs[ros_messages_cxx(-)] dev-libs/boost:= media-libs/sdl-image >=dev-cpp/yaml-cpp-0.5 sci-physics/bullet:= 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://github.com/ros-planning/navigation/archive/1.15.2.tar.gz -> navigation-1.15.2.tar.gz
+_eclasses_=cmake-utils	b8d2d7038bb36192aa14e01c64e5a06a	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=8012cae7d600e3b893be3000c60d0226
diff --git a/metadata/md5-cache/dev-ros/move_base-1.15.2 b/metadata/md5-cache/dev-ros/move_base-1.15.2
new file mode 100644
index 000000000000..71383d0b387d
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/move_base-1.15.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-ros/costmap_2d-1.15.1 dev-ros/roscpp dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/actionlib dev-ros/base_local_planner dev-ros/clear_costmap_recovery dev-ros/navfn dev-ros/rotate_recovery dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/nav_core dev-ros/tf dev-ros/move_base_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-cpp/eigen:3 dev-libs/boost:= dev-libs/console_bridge:= dev-ros/cmake_modules sys-devel/make >=dev-util/cmake-3.9.6 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(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Given a goal in the world, will attempt to reach it with a mobile base
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/move_base
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=>=dev-ros/costmap_2d-1.15.1 dev-ros/roscpp dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/actionlib dev-ros/base_local_planner dev-ros/clear_costmap_recovery dev-ros/navfn dev-ros/rotate_recovery dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/nav_core dev-ros/tf dev-ros/move_base_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-cpp/eigen:3 dev-libs/boost:= dev-libs/console_bridge:= 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://github.com/ros-planning/navigation/archive/1.15.2.tar.gz -> navigation-1.15.2.tar.gz
+_eclasses_=cmake-utils	b8d2d7038bb36192aa14e01c64e5a06a	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=46710ec6d0524eb750b4aa7d223c556f
diff --git a/metadata/md5-cache/dev-ros/move_slow_and_clear-1.15.2 b/metadata/md5-cache/dev-ros/move_slow_and_clear-1.15.2
new file mode 100644
index 000000000000..3a14acdffd59
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/move_slow_and_clear-1.15.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/roscpp dev-ros/nav_core dev-ros/costmap_2d dev-ros/actionlib_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/pluginlib dev-libs/boost:=[threads] dev-cpp/eigen:3 sci-libs/pcl dev-libs/console_bridge:= dev-ros/cmake_modules sys-devel/make >=dev-util/cmake-3.9.6 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(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Move slow and clear
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/move_slow_and_clear
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/roscpp dev-ros/nav_core dev-ros/costmap_2d dev-ros/actionlib_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/pluginlib dev-libs/boost:=[threads] dev-cpp/eigen:3 sci-libs/pcl dev-libs/console_bridge:= 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://github.com/ros-planning/navigation/archive/1.15.2.tar.gz -> navigation-1.15.2.tar.gz
+_eclasses_=cmake-utils	b8d2d7038bb36192aa14e01c64e5a06a	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=379526f03b1569d41d400fe18e903e34
diff --git a/metadata/md5-cache/dev-ros/nav_core-1.15.2 b/metadata/md5-cache/dev-ros/nav_core-1.15.2
new file mode 100644
index 000000000000..b53c91a93d0a
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/nav_core-1.15.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/tf dev-ros/costmap_2d sys-devel/make >=dev-util/cmake-3.9.6 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(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Common interfaces for navigation specific robot actions
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/nav_core
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/tf dev-ros/costmap_2d 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://github.com/ros-planning/navigation/archive/1.15.2.tar.gz -> navigation-1.15.2.tar.gz
+_eclasses_=cmake-utils	b8d2d7038bb36192aa14e01c64e5a06a	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=83a7268b87351721f1a618adc8c74530
diff --git a/metadata/md5-cache/dev-ros/navfn-1.15.2 b/metadata/md5-cache/dev-ros/navfn-1.15.2
new file mode 100644
index 000000000000..c2e053ae0fbd
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/navfn-1.15.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/costmap_2d dev-ros/nav_core dev-ros/pcl_conversions dev-ros/pcl_ros dev-ros/pluginlib dev-ros/roscpp dev-ros/tf dev-ros/visualization_msgs dev-cpp/eigen:3 sci-libs/pcl x11-libs/fltk media-libs/netpbm dev-libs/boost:=[threads] dev-libs/console_bridge:= test? ( dev-cpp/gtest ) dev-ros/cmake_modules sys-devel/make >=dev-util/cmake-3.9.6 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(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[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(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/nav_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/nav_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DESCRIPTION=Fast interpolated navigation function that can be used to create plans for a mobile base
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/navfn
+IUSE=python_targets_python2_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/costmap_2d dev-ros/nav_core dev-ros/pcl_conversions dev-ros/pcl_ros dev-ros/pluginlib dev-ros/roscpp dev-ros/tf dev-ros/visualization_msgs dev-cpp/eigen:3 sci-libs/pcl x11-libs/fltk media-libs/netpbm dev-libs/boost:=[threads] dev-libs/console_bridge:= 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(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/nav_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/nav_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros-planning/navigation/archive/1.15.2.tar.gz -> navigation-1.15.2.tar.gz
+_eclasses_=cmake-utils	b8d2d7038bb36192aa14e01c64e5a06a	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=566a7b698e5aabf669e2e18f38f99332
diff --git a/metadata/md5-cache/dev-ros/robot_pose_ekf-1.15.2 b/metadata/md5-cache/dev-ros/robot_pose_ekf-1.15.2
new file mode 100644
index 000000000000..7aaa6d36316f
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/robot_pose_ekf-1.15.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/roscpp dev-ros/tf dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] sci-libs/orocos-bfl dev-libs/boost:=[threads] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 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(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[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(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DESCRIPTION=Estimate the 3D pose of a robot, based on (partial) pose measurements coming from different sources
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/robot_pose_ekf
+IUSE=python_targets_python2_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/roscpp dev-ros/tf dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] sci-libs/orocos-bfl dev-libs/boost:=[threads] 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(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros-planning/navigation/archive/1.15.2.tar.gz -> navigation-1.15.2.tar.gz
+_eclasses_=cmake-utils	b8d2d7038bb36192aa14e01c64e5a06a	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=14481d41de7772c6a18e89726c5403f8
diff --git a/metadata/md5-cache/dev-ros/rotate_recovery-1.15.2 b/metadata/md5-cache/dev-ros/rotate_recovery-1.15.2
new file mode 100644
index 000000000000..e60f7cf851e2
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/rotate_recovery-1.15.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/roscpp dev-ros/tf dev-ros/costmap_2d dev-ros/nav_core dev-ros/pluginlib dev-ros/base_local_planner dev-cpp/eigen:3 dev-libs/boost:= dev-libs/console_bridge:= dev-ros/cmake_modules sys-devel/make >=dev-util/cmake-3.9.6 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(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Recovery behavior that attempts to clear space by performing a 360 degree rotation of the robot
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/rotate_recovery
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/roscpp dev-ros/tf dev-ros/costmap_2d dev-ros/nav_core dev-ros/pluginlib dev-ros/base_local_planner dev-cpp/eigen:3 dev-libs/boost:= dev-libs/console_bridge:= 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://github.com/ros-planning/navigation/archive/1.15.2.tar.gz -> navigation-1.15.2.tar.gz
+_eclasses_=cmake-utils	b8d2d7038bb36192aa14e01c64e5a06a	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=318b216d63e161c7b2595aecc47e21d3
diff --git a/metadata/md5-cache/dev-ros/voxel_grid-1.15.2 b/metadata/md5-cache/dev-ros/voxel_grid-1.15.2
new file mode 100644
index 000000000000..c7e123c97ad0
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/voxel_grid-1.15.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/roscpp test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.9.6 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(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Implementation of an efficient 3D voxel grid
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/voxel_grid
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/roscpp 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://github.com/ros-planning/navigation/archive/1.15.2.tar.gz -> navigation-1.15.2.tar.gz
+_eclasses_=cmake-utils	b8d2d7038bb36192aa14e01c64e5a06a	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=7a3b333f83f6dfe5a0782e85e11a567f
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index a49079a9fe8a..cba25666fd72 100644
--- a/metadata/md5-cache/dev-ruby/Manifest.gz
+++ b/metadata/md5-cache/dev-ruby/Manifest.gz
diff --git a/metadata/md5-cache/dev-ruby/actionmailer-5.1.4 b/metadata/md5-cache/dev-ruby/actionmailer-5.1.4
index a8fd8e5a81a5..40f95bcc159a 100644
--- a/metadata/md5-cache/dev-ruby/actionmailer-5.1.4
+++ b/metadata/md5-cache/dev-ruby/actionmailer-5.1.4
@@ -4,11 +4,11 @@ DESCRIPTION=Framework for designing email-service layers
 EAPI=6
 HOMEPAGE=https://github.com/rails/rails
 IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86 ~amd64-linux
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby22? ( ~dev-ruby/actionpack-5.1.4[ruby_targets_ruby22] ~dev-ruby/actionview-5.1.4[ruby_targets_ruby22] ~dev-ruby/activejob-5.1.4[ruby_targets_ruby22] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby22] =dev-ruby/mail-2*:*[ruby_targets_ruby22] dev-ruby/rails-dom-testing:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/actionpack-5.1.4[ruby_targets_ruby23] ~dev-ruby/actionview-5.1.4[ruby_targets_ruby23] ~dev-ruby/activejob-5.1.4[ruby_targets_ruby23] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby23] =dev-ruby/mail-2*:*[ruby_targets_ruby23] dev-ruby/rails-dom-testing:2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( ~dev-ruby/actionpack-5.1.4[ruby_targets_ruby24] ~dev-ruby/actionview-5.1.4[ruby_targets_ruby24] ~dev-ruby/activejob-5.1.4[ruby_targets_ruby24] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby24] =dev-ruby/mail-2*:*[ruby_targets_ruby24] dev-ruby/rails-dom-testing:2[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=5.1
 SRC_URI=https://github.com/rails/rails/archive/v5.1.4.tar.gz -> rails-5.1.4.tgz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=c89dd1e28a13964326f8e307c1cafaed
+_md5_=b687201c5561cbc418f35dc92c4263af
diff --git a/metadata/md5-cache/dev-ruby/actionmailer-5.1.5 b/metadata/md5-cache/dev-ruby/actionmailer-5.1.5
index dd4abc128374..419160665d2f 100644
--- a/metadata/md5-cache/dev-ruby/actionmailer-5.1.5
+++ b/metadata/md5-cache/dev-ruby/actionmailer-5.1.5
@@ -4,11 +4,11 @@ DESCRIPTION=Framework for designing email-service layers
 EAPI=6
 HOMEPAGE=https://github.com/rails/rails
 IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86 ~amd64-linux
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby22? ( ~dev-ruby/actionpack-5.1.5[ruby_targets_ruby22] ~dev-ruby/actionview-5.1.5[ruby_targets_ruby22] ~dev-ruby/activejob-5.1.5[ruby_targets_ruby22] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby22] =dev-ruby/mail-2*:*[ruby_targets_ruby22] dev-ruby/rails-dom-testing:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/actionpack-5.1.5[ruby_targets_ruby23] ~dev-ruby/actionview-5.1.5[ruby_targets_ruby23] ~dev-ruby/activejob-5.1.5[ruby_targets_ruby23] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby23] =dev-ruby/mail-2*:*[ruby_targets_ruby23] dev-ruby/rails-dom-testing:2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( ~dev-ruby/actionpack-5.1.5[ruby_targets_ruby24] ~dev-ruby/actionview-5.1.5[ruby_targets_ruby24] ~dev-ruby/activejob-5.1.5[ruby_targets_ruby24] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby24] =dev-ruby/mail-2*:*[ruby_targets_ruby24] dev-ruby/rails-dom-testing:2[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=5.1
 SRC_URI=https://github.com/rails/rails/archive/v5.1.5.tar.gz -> rails-5.1.5.tgz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=c89dd1e28a13964326f8e307c1cafaed
+_md5_=b687201c5561cbc418f35dc92c4263af
diff --git a/metadata/md5-cache/dev-ruby/actionpack-5.1.4 b/metadata/md5-cache/dev-ruby/actionpack-5.1.4
index ac02cd8eacec..c262fbc2d3bf 100644
--- a/metadata/md5-cache/dev-ruby/actionpack-5.1.4
+++ b/metadata/md5-cache/dev-ruby/actionpack-5.1.4
@@ -4,11 +4,11 @@ DESCRIPTION=Eases web-request routing, handling, and response
 EAPI=6
 HOMEPAGE=https://github.com/rails/rails
 IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86 ~amd64-linux
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby22? ( ~dev-ruby/activesupport-5.1.4[ruby_targets_ruby22] ~dev-ruby/actionview-5.1.4[ruby_targets_ruby22] dev-ruby/rack:2.0[ruby_targets_ruby22] >=dev-ruby/rack-test-0.6.3:0.6[ruby_targets_ruby22] >=dev-ruby/rails-html-sanitizer-1.0.2:1[ruby_targets_ruby22] dev-ruby/rails-dom-testing:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/activesupport-5.1.4[ruby_targets_ruby23] ~dev-ruby/actionview-5.1.4[ruby_targets_ruby23] dev-ruby/rack:2.0[ruby_targets_ruby23] >=dev-ruby/rack-test-0.6.3:0.6[ruby_targets_ruby23] >=dev-ruby/rails-html-sanitizer-1.0.2:1[ruby_targets_ruby23] dev-ruby/rails-dom-testing:2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( ~dev-ruby/activesupport-5.1.4[ruby_targets_ruby24] ~dev-ruby/actionview-5.1.4[ruby_targets_ruby24] dev-ruby/rack:2.0[ruby_targets_ruby24] >=dev-ruby/rack-test-0.6.3:0.6[ruby_targets_ruby24] >=dev-ruby/rails-html-sanitizer-1.0.2:1[ruby_targets_ruby24] dev-ruby/rails-dom-testing:2[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=5.1
 SRC_URI=https://github.com/rails/rails/archive/v5.1.4.tar.gz -> rails-5.1.4.tgz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=f405b8d33a95eef74ec488003818fc72
+_md5_=2f0f321d61824be8451b4134344651c0
diff --git a/metadata/md5-cache/dev-ruby/actionpack-5.1.5 b/metadata/md5-cache/dev-ruby/actionpack-5.1.5
index 5a602f945105..e7e0d8a8bf92 100644
--- a/metadata/md5-cache/dev-ruby/actionpack-5.1.5
+++ b/metadata/md5-cache/dev-ruby/actionpack-5.1.5
@@ -4,11 +4,11 @@ DESCRIPTION=Eases web-request routing, handling, and response
 EAPI=6
 HOMEPAGE=https://github.com/rails/rails
 IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86 ~amd64-linux
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby22? ( ~dev-ruby/activesupport-5.1.5[ruby_targets_ruby22] ~dev-ruby/actionview-5.1.5[ruby_targets_ruby22] dev-ruby/rack:2.0[ruby_targets_ruby22] >=dev-ruby/rack-test-0.6.3:0.6[ruby_targets_ruby22] >=dev-ruby/rails-html-sanitizer-1.0.2:1[ruby_targets_ruby22] dev-ruby/rails-dom-testing:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/activesupport-5.1.5[ruby_targets_ruby23] ~dev-ruby/actionview-5.1.5[ruby_targets_ruby23] dev-ruby/rack:2.0[ruby_targets_ruby23] >=dev-ruby/rack-test-0.6.3:0.6[ruby_targets_ruby23] >=dev-ruby/rails-html-sanitizer-1.0.2:1[ruby_targets_ruby23] dev-ruby/rails-dom-testing:2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( ~dev-ruby/activesupport-5.1.5[ruby_targets_ruby24] ~dev-ruby/actionview-5.1.5[ruby_targets_ruby24] dev-ruby/rack:2.0[ruby_targets_ruby24] >=dev-ruby/rack-test-0.6.3:0.6[ruby_targets_ruby24] >=dev-ruby/rails-html-sanitizer-1.0.2:1[ruby_targets_ruby24] dev-ruby/rails-dom-testing:2[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=5.1
 SRC_URI=https://github.com/rails/rails/archive/v5.1.5.tar.gz -> rails-5.1.5.tgz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=faf9db3d78d0a2f3c13831b8a2a7813a
+_md5_=eb75a4ea2bd08ac7dd8029ad78d0e0cf
diff --git a/metadata/md5-cache/dev-ruby/actionview-5.1.4 b/metadata/md5-cache/dev-ruby/actionview-5.1.4
index 01f51af0a735..c343fa27f6e6 100644
--- a/metadata/md5-cache/dev-ruby/actionview-5.1.4
+++ b/metadata/md5-cache/dev-ruby/actionview-5.1.4
@@ -4,11 +4,11 @@ DESCRIPTION=Simple, battle-tested conventions and helpers for building web pages
 EAPI=6
 HOMEPAGE=https://github.com/rails/rails/
 IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86 ~amd64-linux
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby22? ( ~dev-ruby/activesupport-5.1.4[ruby_targets_ruby22] >=dev-ruby/builder-3.1:*[ruby_targets_ruby22] =dev-ruby/builder-3*:*[ruby_targets_ruby22] >=dev-ruby/erubi-1.4:0[ruby_targets_ruby22] >=dev-ruby/rails-html-sanitizer-1.0.3:1[ruby_targets_ruby22] dev-ruby/rails-dom-testing:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/activesupport-5.1.4[ruby_targets_ruby23] >=dev-ruby/builder-3.1:*[ruby_targets_ruby23] =dev-ruby/builder-3*:*[ruby_targets_ruby23] >=dev-ruby/erubi-1.4:0[ruby_targets_ruby23] >=dev-ruby/rails-html-sanitizer-1.0.3:1[ruby_targets_ruby23] dev-ruby/rails-dom-testing:2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( ~dev-ruby/activesupport-5.1.4[ruby_targets_ruby24] >=dev-ruby/builder-3.1:*[ruby_targets_ruby24] =dev-ruby/builder-3*:*[ruby_targets_ruby24] >=dev-ruby/erubi-1.4:0[ruby_targets_ruby24] >=dev-ruby/rails-html-sanitizer-1.0.3:1[ruby_targets_ruby24] dev-ruby/rails-dom-testing:2[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=5.1
 SRC_URI=https://github.com/rails/rails/archive/v5.1.4.tar.gz -> rails-5.1.4.tgz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=9830a1cf36bad3e7820646db9882aced
+_md5_=1125eb26eccac6317d766cc8148d6312
diff --git a/metadata/md5-cache/dev-ruby/actionview-5.1.5 b/metadata/md5-cache/dev-ruby/actionview-5.1.5
index cc2e02f74781..17a835a90336 100644
--- a/metadata/md5-cache/dev-ruby/actionview-5.1.5
+++ b/metadata/md5-cache/dev-ruby/actionview-5.1.5
@@ -4,11 +4,11 @@ DESCRIPTION=Simple, battle-tested conventions and helpers for building web pages
 EAPI=6
 HOMEPAGE=https://github.com/rails/rails/
 IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86 ~amd64-linux
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby22? ( ~dev-ruby/activesupport-5.1.5[ruby_targets_ruby22] >=dev-ruby/builder-3.1:*[ruby_targets_ruby22] =dev-ruby/builder-3*:*[ruby_targets_ruby22] >=dev-ruby/erubi-1.4:0[ruby_targets_ruby22] >=dev-ruby/rails-html-sanitizer-1.0.3:1[ruby_targets_ruby22] dev-ruby/rails-dom-testing:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/activesupport-5.1.5[ruby_targets_ruby23] >=dev-ruby/builder-3.1:*[ruby_targets_ruby23] =dev-ruby/builder-3*:*[ruby_targets_ruby23] >=dev-ruby/erubi-1.4:0[ruby_targets_ruby23] >=dev-ruby/rails-html-sanitizer-1.0.3:1[ruby_targets_ruby23] dev-ruby/rails-dom-testing:2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( ~dev-ruby/activesupport-5.1.5[ruby_targets_ruby24] >=dev-ruby/builder-3.1:*[ruby_targets_ruby24] =dev-ruby/builder-3*:*[ruby_targets_ruby24] >=dev-ruby/erubi-1.4:0[ruby_targets_ruby24] >=dev-ruby/rails-html-sanitizer-1.0.3:1[ruby_targets_ruby24] dev-ruby/rails-dom-testing:2[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=5.1
 SRC_URI=https://github.com/rails/rails/archive/v5.1.5.tar.gz -> rails-5.1.5.tgz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=b1db9bb29d121d6e0128bfe65af8c356
+_md5_=72cfa9ed8ed095096985d0289bae53c4
diff --git a/metadata/md5-cache/dev-ruby/activejob-5.1.4 b/metadata/md5-cache/dev-ruby/activejob-5.1.4
index 5d9a7f25a116..6475a6a8a2bb 100644
--- a/metadata/md5-cache/dev-ruby/activejob-5.1.4
+++ b/metadata/md5-cache/dev-ruby/activejob-5.1.4
@@ -4,11 +4,11 @@ DESCRIPTION=Job framework with pluggable queues
 EAPI=6
 HOMEPAGE=https://github.com/rails/rails
 IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86 ~amd64-linux
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby22? ( ~dev-ruby/activesupport-5.1.4[ruby_targets_ruby22] >=dev-ruby/globalid-0.3.6[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/activesupport-5.1.4[ruby_targets_ruby23] >=dev-ruby/globalid-0.3.6[ruby_targets_ruby23] ) ruby_targets_ruby24? ( ~dev-ruby/activesupport-5.1.4[ruby_targets_ruby24] >=dev-ruby/globalid-0.3.6[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=5.1
 SRC_URI=https://github.com/rails/rails/archive/v5.1.4.tar.gz -> rails-5.1.4.tgz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=d28e17566fc30f8babf1c9a458dafe19
+_md5_=fccfeef2c72dd4da0598ae8fd203b0b0
diff --git a/metadata/md5-cache/dev-ruby/activejob-5.1.5 b/metadata/md5-cache/dev-ruby/activejob-5.1.5
index df2026a626e0..cb8c439a72bb 100644
--- a/metadata/md5-cache/dev-ruby/activejob-5.1.5
+++ b/metadata/md5-cache/dev-ruby/activejob-5.1.5
@@ -4,11 +4,11 @@ DESCRIPTION=Job framework with pluggable queues
 EAPI=6
 HOMEPAGE=https://github.com/rails/rails
 IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86 ~amd64-linux
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby22? ( ~dev-ruby/activesupport-5.1.5[ruby_targets_ruby22] >=dev-ruby/globalid-0.3.6[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/activesupport-5.1.5[ruby_targets_ruby23] >=dev-ruby/globalid-0.3.6[ruby_targets_ruby23] ) ruby_targets_ruby24? ( ~dev-ruby/activesupport-5.1.5[ruby_targets_ruby24] >=dev-ruby/globalid-0.3.6[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=5.1
 SRC_URI=https://github.com/rails/rails/archive/v5.1.5.tar.gz -> rails-5.1.5.tgz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=d28e17566fc30f8babf1c9a458dafe19
+_md5_=fccfeef2c72dd4da0598ae8fd203b0b0
diff --git a/metadata/md5-cache/dev-ruby/activemodel-5.1.4 b/metadata/md5-cache/dev-ruby/activemodel-5.1.4
index a1e307f70d67..1d15d1dd73d3 100644
--- a/metadata/md5-cache/dev-ruby/activemodel-5.1.4
+++ b/metadata/md5-cache/dev-ruby/activemodel-5.1.4
@@ -4,11 +4,11 @@ DESCRIPTION=Toolkit for building modeling frameworks like Active Record and Acti
 EAPI=6
 HOMEPAGE=https://github.com/rails/rails
 IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86 ~amd64-linux
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby22? ( ~dev-ruby/activesupport-5.1.4:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/activesupport-5.1.4:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( ~dev-ruby/activesupport-5.1.4:*[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=5.1
 SRC_URI=https://github.com/rails/rails/archive/v5.1.4.tar.gz -> rails-5.1.4.tgz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=c6ac7a71c329ce5a1975a2b5c83b6128
+_md5_=a2f3db041a0b0dc568a4aaff4f39173a
diff --git a/metadata/md5-cache/dev-ruby/activemodel-5.1.5 b/metadata/md5-cache/dev-ruby/activemodel-5.1.5
index f97e9e824c49..6be83699cc0f 100644
--- a/metadata/md5-cache/dev-ruby/activemodel-5.1.5
+++ b/metadata/md5-cache/dev-ruby/activemodel-5.1.5
@@ -4,11 +4,11 @@ DESCRIPTION=Toolkit for building modeling frameworks like Active Record and Acti
 EAPI=6
 HOMEPAGE=https://github.com/rails/rails
 IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86 ~amd64-linux
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby22? ( ~dev-ruby/activesupport-5.1.5:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/activesupport-5.1.5:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( ~dev-ruby/activesupport-5.1.5:*[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=5.1
 SRC_URI=https://github.com/rails/rails/archive/v5.1.5.tar.gz -> rails-5.1.5.tgz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=fd7682a69b00bd7aa7f3b1424fdda637
+_md5_=5b678f15252f2f2986c83069661728ce
diff --git a/metadata/md5-cache/dev-ruby/activerecord-5.1.4 b/metadata/md5-cache/dev-ruby/activerecord-5.1.4
index 52424c410113..208a3bab6dfc 100644
--- a/metadata/md5-cache/dev-ruby/activerecord-5.1.4
+++ b/metadata/md5-cache/dev-ruby/activerecord-5.1.4
@@ -4,11 +4,11 @@ DESCRIPTION=Implements the ActiveRecord pattern (Fowler, PoEAA) for ORM
 EAPI=6
 HOMEPAGE=https://github.com/rails/rails/
 IUSE=mysql postgres sqlite test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86 ~amd64-linux
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby22? ( ~dev-ruby/activesupport-5.1.4[ruby_targets_ruby22] ~dev-ruby/activemodel-5.1.4[ruby_targets_ruby22] dev-ruby/arel:8.0[ruby_targets_ruby22] sqlite? ( >=dev-ruby/sqlite3-1.3.6[ruby_targets_ruby22] ) mysql? ( || ( dev-ruby/mysql2:0.4[ruby_targets_ruby22] >=dev-ruby/mysql2-0.3.18:0.3[ruby_targets_ruby22] ) ) postgres? ( >=dev-ruby/pg-0.18.0[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( ~dev-ruby/activesupport-5.1.4[ruby_targets_ruby23] ~dev-ruby/activemodel-5.1.4[ruby_targets_ruby23] dev-ruby/arel:8.0[ruby_targets_ruby23] sqlite? ( >=dev-ruby/sqlite3-1.3.6[ruby_targets_ruby23] ) mysql? ( || ( dev-ruby/mysql2:0.4[ruby_targets_ruby23] >=dev-ruby/mysql2-0.3.18:0.3[ruby_targets_ruby23] ) ) postgres? ( >=dev-ruby/pg-0.18.0[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( ~dev-ruby/activesupport-5.1.4[ruby_targets_ruby24] ~dev-ruby/activemodel-5.1.4[ruby_targets_ruby24] dev-ruby/arel:8.0[ruby_targets_ruby24] sqlite? ( >=dev-ruby/sqlite3-1.3.6[ruby_targets_ruby24] ) mysql? ( || ( dev-ruby/mysql2:0.4[ruby_targets_ruby24] >=dev-ruby/mysql2-0.3.18:0.3[ruby_targets_ruby24] ) ) postgres? ( >=dev-ruby/pg-0.18.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=5.1
 SRC_URI=https://github.com/rails/rails/archive/v5.1.4.tar.gz -> rails-5.1.4.tgz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=ecdd67c892ef14e7994102e7b0cffa09
+_md5_=770f870e81487a46840b23d5520ded7b
diff --git a/metadata/md5-cache/dev-ruby/activerecord-5.1.5 b/metadata/md5-cache/dev-ruby/activerecord-5.1.5
index 6d1b9b915821..7b2e0da111c9 100644
--- a/metadata/md5-cache/dev-ruby/activerecord-5.1.5
+++ b/metadata/md5-cache/dev-ruby/activerecord-5.1.5
@@ -4,11 +4,11 @@ DESCRIPTION=Implements the ActiveRecord pattern (Fowler, PoEAA) for ORM
 EAPI=6
 HOMEPAGE=https://github.com/rails/rails/
 IUSE=mysql postgres sqlite test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86 ~amd64-linux
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby22? ( ~dev-ruby/activesupport-5.1.5[ruby_targets_ruby22] ~dev-ruby/activemodel-5.1.5[ruby_targets_ruby22] dev-ruby/arel:8.0[ruby_targets_ruby22] sqlite? ( >=dev-ruby/sqlite3-1.3.6[ruby_targets_ruby22] ) mysql? ( || ( dev-ruby/mysql2:0.4[ruby_targets_ruby22] >=dev-ruby/mysql2-0.3.18:0.3[ruby_targets_ruby22] ) ) postgres? ( >=dev-ruby/pg-0.18.0[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( ~dev-ruby/activesupport-5.1.5[ruby_targets_ruby23] ~dev-ruby/activemodel-5.1.5[ruby_targets_ruby23] dev-ruby/arel:8.0[ruby_targets_ruby23] sqlite? ( >=dev-ruby/sqlite3-1.3.6[ruby_targets_ruby23] ) mysql? ( || ( dev-ruby/mysql2:0.4[ruby_targets_ruby23] >=dev-ruby/mysql2-0.3.18:0.3[ruby_targets_ruby23] ) ) postgres? ( >=dev-ruby/pg-0.18.0[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( ~dev-ruby/activesupport-5.1.5[ruby_targets_ruby24] ~dev-ruby/activemodel-5.1.5[ruby_targets_ruby24] dev-ruby/arel:8.0[ruby_targets_ruby24] sqlite? ( >=dev-ruby/sqlite3-1.3.6[ruby_targets_ruby24] ) mysql? ( || ( dev-ruby/mysql2:0.4[ruby_targets_ruby24] >=dev-ruby/mysql2-0.3.18:0.3[ruby_targets_ruby24] ) ) postgres? ( >=dev-ruby/pg-0.18.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=5.1
 SRC_URI=https://github.com/rails/rails/archive/v5.1.5.tar.gz -> rails-5.1.5.tgz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=ecdd67c892ef14e7994102e7b0cffa09
+_md5_=770f870e81487a46840b23d5520ded7b
diff --git a/metadata/md5-cache/dev-ruby/activesupport-5.1.4 b/metadata/md5-cache/dev-ruby/activesupport-5.1.4
index 45e05b44515d..66089a83a14b 100644
--- a/metadata/md5-cache/dev-ruby/activesupport-5.1.4
+++ b/metadata/md5-cache/dev-ruby/activesupport-5.1.4
@@ -4,11 +4,11 @@ DESCRIPTION=Utility Classes and Extension to the Standard Library
 EAPI=6
 HOMEPAGE=https://github.com/rails/rails
 IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby22] >=dev-ruby/i18n-0.7:*[ruby_targets_ruby22] =dev-ruby/i18n-0*:*[ruby_targets_ruby22] >=dev-ruby/tzinfo-1.1:1[ruby_targets_ruby22] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby23] >=dev-ruby/i18n-0.7:*[ruby_targets_ruby23] =dev-ruby/i18n-0*:*[ruby_targets_ruby23] >=dev-ruby/tzinfo-1.1:1[ruby_targets_ruby23] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby24] >=dev-ruby/i18n-0.7:*[ruby_targets_ruby24] =dev-ruby/i18n-0*:*[ruby_targets_ruby24] >=dev-ruby/tzinfo-1.1:1[ruby_targets_ruby24] >=dev-ruby/minitest-5.1:5[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=5.1
 SRC_URI=https://github.com/rails/rails/archive/v5.1.4.tar.gz -> rails-5.1.4.tgz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=394b6b2ec0a3cefb5e8380d5fe898e16
+_md5_=0e6f4568f7b91bd4f68258d956428416
diff --git a/metadata/md5-cache/dev-ruby/activesupport-5.1.5 b/metadata/md5-cache/dev-ruby/activesupport-5.1.5
index d2df54c6ed3c..8a4e0c841e44 100644
--- a/metadata/md5-cache/dev-ruby/activesupport-5.1.5
+++ b/metadata/md5-cache/dev-ruby/activesupport-5.1.5
@@ -4,11 +4,11 @@ DESCRIPTION=Utility Classes and Extension to the Standard Library
 EAPI=6
 HOMEPAGE=https://github.com/rails/rails
 IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby22] >=dev-ruby/i18n-0.7:*[ruby_targets_ruby22] =dev-ruby/i18n-0*:*[ruby_targets_ruby22] >=dev-ruby/tzinfo-1.1:1[ruby_targets_ruby22] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby23] >=dev-ruby/i18n-0.7:*[ruby_targets_ruby23] =dev-ruby/i18n-0*:*[ruby_targets_ruby23] >=dev-ruby/tzinfo-1.1:1[ruby_targets_ruby23] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby24] >=dev-ruby/i18n-0.7:*[ruby_targets_ruby24] =dev-ruby/i18n-0*:*[ruby_targets_ruby24] >=dev-ruby/tzinfo-1.1:1[ruby_targets_ruby24] >=dev-ruby/minitest-5.1:5[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=5.1
 SRC_URI=https://github.com/rails/rails/archive/v5.1.5.tar.gz -> rails-5.1.5.tgz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=74cc4b9d9587e1468afbce2961fd148b
+_md5_=27492a31129b1394692394126dd1d2d4
diff --git a/metadata/md5-cache/dev-ruby/bcat-0.6.2-r3 b/metadata/md5-cache/dev-ruby/bcat-0.6.2-r3
new file mode 100644
index 000000000000..da36ffb2a4a4
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/bcat-0.6.2-r3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby22? ( doc? ( app-text/ronn[ruby_targets_ruby22] ) test? ( dev-ruby/test-unit:2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( app-text/ronn[ruby_targets_ruby23] ) test? ( dev-ruby/test-unit:2[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( app-text/ronn[ruby_targets_ruby24] ) test? ( dev-ruby/test-unit:2[ruby_targets_ruby24] ) ) test? ( ruby_targets_ruby22? ( =dev-ruby/rack-1*:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( =dev-ruby/rack-1*:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( =dev-ruby/rack-1*:*[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DESCRIPTION=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
+LICENSE=MIT
+RDEPEND=!!<app-accessibility/speech-tools-2.1-r3 ruby_targets_ruby22? ( =dev-ruby/rack-1*:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( =dev-ruby/rack-1*:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( =dev-ruby/rack-1*:*[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_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=7a978b5f982c84c9fb387f012fd2dd2b
diff --git a/metadata/md5-cache/dev-ruby/certificate_authority-0.1.6-r2 b/metadata/md5-cache/dev-ruby/certificate_authority-0.1.6-r2
index c4dec479e2d3..5a25dea61ee6 100644
--- a/metadata/md5-cache/dev-ruby/certificate_authority-0.1.6-r2
+++ b/metadata/md5-cache/dev-ruby/certificate_authority-0.1.6-r2
@@ -4,11 +4,11 @@ DESCRIPTION=Managing the core functions outlined in RFC-3280 for PKI
 EAPI=5
 HOMEPAGE=https://github.com/cchandler/certificate_authority
 IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/activemodel-3.0.6:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activemodel-3.0.6:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/activemodel-3.0.6:*[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/certificate_authority-0.1.6.gem
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=2748b4c510650811f4b6cda85b0b2e1e
+_md5_=333537427a94708f4d6805da4fc37c97
diff --git a/metadata/md5-cache/dev-ruby/cliver-0.3.2 b/metadata/md5-cache/dev-ruby/cliver-0.3.2
index 1563009ef753..11b0c32721e2 100644
--- a/metadata/md5-cache/dev-ruby/cliver-0.3.2
+++ b/metadata/md5-cache/dev-ruby/cliver-0.3.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( 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_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby22? ( 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_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby25] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby25] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
 DESCRIPTION=An easy way to detect and use command-line dependencies
 EAPI=5
 HOMEPAGE=http://yaauie.github.io/cliver/
-IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test test
 KEYWORDS=~amd64
 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 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=0
 SRC_URI=mirror://rubygems/cliver-0.3.2.gem
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=7fddfd7d3c53cdf7fb3d525f4ee3e2a6
+_md5_=2e3615519f0effc1e923e80b7c2b597a
diff --git a/metadata/md5-cache/dev-ruby/daemons-1.2.6 b/metadata/md5-cache/dev-ruby/daemons-1.2.6
index 2034a4ec6ed0..40e2e401bef9 100644
--- a/metadata/md5-cache/dev-ruby/daemons-1.2.6
+++ b/metadata/md5-cache/dev-ruby/daemons-1.2.6
@@ -4,11 +4,11 @@ DESCRIPTION=Wrap existing ruby scripts to be run as a daemon
 EAPI=6
 HOMEPAGE=https://github.com/thuehlinger/daemons
 IUSE=examples elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=~alpha amd64 ~arm hppa ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm hppa ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-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/thuehlinger/daemons/archive/v1.2.6.tar.gz -> daemons-1.2.6.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=30f6660a11fda250f054d90cb4a71346
+_md5_=43cbbd0984d6a55303d7015275e5c524
diff --git a/metadata/md5-cache/dev-ruby/fakefs-0.11.3 b/metadata/md5-cache/dev-ruby/fakefs-0.11.3
index e3ff4463b486..39917b5e7eeb 100644
--- a/metadata/md5-cache/dev-ruby/fakefs-0.11.3
+++ b/metadata/md5-cache/dev-ruby/fakefs-0.11.3
@@ -4,11 +4,11 @@ DESCRIPTION=A fake filesystem. Use it in your tests
 EAPI=6
 HOMEPAGE=https://github.com/defunkt/fakefs
 IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc 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
+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_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/defunkt/fakefs/archive/v0.11.3.tar.gz -> fakefs-0.11.3.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=e3bef9da5dda0c5efe40d68ec25ba297
+_md5_=ab507a205b1cdff4259610ec652ef3e6
diff --git a/metadata/md5-cache/dev-ruby/globalid-0.4.1 b/metadata/md5-cache/dev-ruby/globalid-0.4.1
index 3bf0a12e4dbd..5e3bd76c167c 100644
--- a/metadata/md5-cache/dev-ruby/globalid-0.4.1
+++ b/metadata/md5-cache/dev-ruby/globalid-0.4.1
@@ -4,11 +4,11 @@ DESCRIPTION=Reference models by URI
 EAPI=6
 HOMEPAGE=https://github.com/rails/globalid
 IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86 ~amd64-linux
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/activesupport-4.2.0:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activesupport-4.2.0:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/activesupport-4.2.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=https://github.com/rails/globalid/archive/v0.4.1.tar.gz -> globalid-0.4.1.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=e08fb405e8e629a2ff1946d2704719e8
+_md5_=478ea8cc093ce3746cf54cc62de826f6
diff --git a/metadata/md5-cache/dev-ruby/hashdiff-0.3.7 b/metadata/md5-cache/dev-ruby/hashdiff-0.3.7
index 18dbf3ac1a25..ddcb9f8b921c 100644
--- a/metadata/md5-cache/dev-ruby/hashdiff-0.3.7
+++ b/metadata/md5-cache/dev-ruby/hashdiff-0.3.7
@@ -4,11 +4,11 @@ DESCRIPTION=Simple Hash extension to make working with nested hashes easier
 EAPI=6
 HOMEPAGE=https://github.com/liufengyun/hashdiff
 IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~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_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/hashdiff-0.3.7.gem
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=a4556377214d8e8eb681bb66083b3259
+_md5_=7c80763dcaf92815a1bd1311d0c218fe
diff --git a/metadata/md5-cache/dev-ruby/http-0.9.8-r2 b/metadata/md5-cache/dev-ruby/http-0.9.8-r2
index 8505b22e6903..41cebe5b0f2b 100644
--- a/metadata/md5-cache/dev-ruby/http-0.9.8-r2
+++ b/metadata/md5-cache/dev-ruby/http-0.9.8-r2
@@ -4,11 +4,11 @@ DESCRIPTION=An easy-to-use client library for making requests from Ruby
 EAPI=5
 HOMEPAGE=https://github.com/tarcieri/http
 IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby22] >=dev-ruby/http-cookie-1.0[ruby_targets_ruby22] >=dev-ruby/http-form_data-1.0.1:1.0[ruby_targets_ruby22] >=dev-ruby/http_parser_rb-0.6.0[ruby_targets_ruby22] =dev-ruby/http_parser_rb-0.6*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby23] >=dev-ruby/http-cookie-1.0[ruby_targets_ruby23] >=dev-ruby/http-form_data-1.0.1:1.0[ruby_targets_ruby23] >=dev-ruby/http_parser_rb-0.6.0[ruby_targets_ruby23] =dev-ruby/http_parser_rb-0.6*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby24] >=dev-ruby/http-cookie-1.0[ruby_targets_ruby24] >=dev-ruby/http-form_data-1.0.1:1.0[ruby_targets_ruby24] >=dev-ruby/http_parser_rb-0.6.0[ruby_targets_ruby24] =dev-ruby/http_parser_rb-0.6*[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.8
 SRC_URI=mirror://rubygems/http-0.9.8.gem
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=8c83abf8fb15b8545c3bbf6163d6d44c
+_md5_=242a7a8319c4594804b58fc1b67197a2
diff --git a/metadata/md5-cache/dev-ruby/http-3.0.0 b/metadata/md5-cache/dev-ruby/http-3.0.0
index e57dfacc15cc..30560634868e 100644
--- a/metadata/md5-cache/dev-ruby/http-3.0.0
+++ b/metadata/md5-cache/dev-ruby/http-3.0.0
@@ -4,11 +4,11 @@ DESCRIPTION=An easy-to-use client library for making requests from Ruby
 EAPI=6
 HOMEPAGE=https://github.com/tarcieri/http
 IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=~amd64 ~arm ~hppa ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby22] >=dev-ruby/http-cookie-1.0[ruby_targets_ruby22] >=dev-ruby/http-form_data-1.0.1:1.0[ruby_targets_ruby22] >=dev-ruby/http_parser_rb-0.6.0[ruby_targets_ruby22] =dev-ruby/http_parser_rb-0.6*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby23] >=dev-ruby/http-cookie-1.0[ruby_targets_ruby23] >=dev-ruby/http-form_data-1.0.1:1.0[ruby_targets_ruby23] >=dev-ruby/http_parser_rb-0.6.0[ruby_targets_ruby23] =dev-ruby/http_parser_rb-0.6*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby24] >=dev-ruby/http-cookie-1.0[ruby_targets_ruby24] >=dev-ruby/http-form_data-1.0.1:1.0[ruby_targets_ruby24] >=dev-ruby/http_parser_rb-0.6.0[ruby_targets_ruby24] =dev-ruby/http_parser_rb-0.6*[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=3
 SRC_URI=mirror://rubygems/http-3.0.0.gem
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=500e0ec667d1fa87d42a362c27754735
+_md5_=531145236798f245267e2614fed3e575
diff --git a/metadata/md5-cache/dev-ruby/listen-3.1.5-r1 b/metadata/md5-cache/dev-ruby/listen-3.1.5-r1
index 073a55625fa3..157f01952939 100644
--- a/metadata/md5-cache/dev-ruby/listen-3.1.5-r1
+++ b/metadata/md5-cache/dev-ruby/listen-3.1.5-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Listens to file modifications and notifies you about the changes
 EAPI=6
 HOMEPAGE=https://github.com/guard/listen
 IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
 LICENSE=MIT
 RDEPEND=!!media-sound/listen !!media-radio/ax25 !!<dev-ruby/listen-2.8.6-r1:2 ruby_targets_ruby22? ( >=dev-ruby/rb-inotify-0.9.7[ruby_targets_ruby22] >=dev-ruby/ruby_dep-1.2:1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rb-inotify-0.9.7[ruby_targets_ruby23] >=dev-ruby/ruby_dep-1.2:1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/rb-inotify-0.9.7[ruby_targets_ruby24] >=dev-ruby/ruby_dep-1.2:1[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=3
 SRC_URI=https://github.com/guard/listen/archive/v3.1.5.tar.gz -> listen-3.1.5.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=47eb0997f5a8830f4cb48c73df2b4826
+_md5_=9850ec78bfca73fc873dce3cd53264d3
diff --git a/metadata/md5-cache/dev-ruby/parser-2.5.0.5 b/metadata/md5-cache/dev-ruby/parser-2.5.0.5
new file mode 100644
index 000000000000..a6476e0dc838
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/parser-2.5.0.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby22? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby22] dev-ruby/racc[ruby_targets_ruby22] dev-ruby/cliver[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby23] dev-ruby/racc[ruby_targets_ruby23] dev-ruby/cliver[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby24] dev-ruby/racc[ruby_targets_ruby24] dev-ruby/cliver[ruby_targets_ruby24] ) ) test? ( ruby_targets_ruby22? ( =dev-ruby/ast-2.4*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( =dev-ruby/ast-2.4*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( =dev-ruby/ast-2.4*[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/yard[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DESCRIPTION=A production-ready Ruby parser written in pure Ruby
+EAPI=6
+HOMEPAGE=https://github.com/whitequark/parser
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby22? ( =dev-ruby/ast-2.4*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( =dev-ruby/ast-2.4*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( =dev-ruby/ast-2.4*[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/parser-2.5.0.5.gem
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=42fab5b2dd6e1031da7ef0d89d0da3ae
diff --git a/metadata/md5-cache/dev-ruby/railties-5.1.4 b/metadata/md5-cache/dev-ruby/railties-5.1.4
index 6ad6e6a4d074..a3ac9dea2e98 100644
--- a/metadata/md5-cache/dev-ruby/railties-5.1.4
+++ b/metadata/md5-cache/dev-ruby/railties-5.1.4
@@ -4,7 +4,7 @@ DESCRIPTION=Tools for creating, working with, and running Rails applications
 EAPI=6
 HOMEPAGE=https://github.com/rails/rails
 IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86 ~amd64-linux
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux
 LICENSE=MIT
 RDEPEND=>=app-eselect/eselect-rails-0.23 ruby_targets_ruby22? ( ~dev-ruby/activesupport-5.1.4[ruby_targets_ruby22] ~dev-ruby/actionpack-5.1.4[ruby_targets_ruby22] >=dev-ruby/thor-0.18.1[ruby_targets_ruby22] >=dev-ruby/rake-0.8.7[ruby_targets_ruby22] dev-ruby/method_source[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/activesupport-5.1.4[ruby_targets_ruby23] ~dev-ruby/actionpack-5.1.4[ruby_targets_ruby23] >=dev-ruby/thor-0.18.1[ruby_targets_ruby23] >=dev-ruby/rake-0.8.7[ruby_targets_ruby23] dev-ruby/method_source[ruby_targets_ruby23] ) ruby_targets_ruby24? ( ~dev-ruby/activesupport-5.1.4[ruby_targets_ruby24] ~dev-ruby/actionpack-5.1.4[ruby_targets_ruby24] >=dev-ruby/thor-0.18.1[ruby_targets_ruby24] >=dev-ruby/rake-0.8.7[ruby_targets_ruby24] dev-ruby/method_source[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 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=5.1
 SRC_URI=https://github.com/rails/rails/archive/v5.1.4.tar.gz -> rails-5.1.4.tgz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=9e4b0d650290890512ee6fc6e4c5319c
+_md5_=0aadbe369def01f1687937b7c88844c7
diff --git a/metadata/md5-cache/dev-ruby/railties-5.1.5 b/metadata/md5-cache/dev-ruby/railties-5.1.5
index a9616ee0022f..806fe6b3c694 100644
--- a/metadata/md5-cache/dev-ruby/railties-5.1.5
+++ b/metadata/md5-cache/dev-ruby/railties-5.1.5
@@ -4,7 +4,7 @@ DESCRIPTION=Tools for creating, working with, and running Rails applications
 EAPI=6
 HOMEPAGE=https://github.com/rails/rails
 IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86 ~amd64-linux
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux
 LICENSE=MIT
 RDEPEND=>=app-eselect/eselect-rails-0.23 ruby_targets_ruby22? ( ~dev-ruby/activesupport-5.1.5[ruby_targets_ruby22] ~dev-ruby/actionpack-5.1.5[ruby_targets_ruby22] >=dev-ruby/thor-0.18.1[ruby_targets_ruby22] >=dev-ruby/rake-0.8.7[ruby_targets_ruby22] dev-ruby/method_source[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/activesupport-5.1.5[ruby_targets_ruby23] ~dev-ruby/actionpack-5.1.5[ruby_targets_ruby23] >=dev-ruby/thor-0.18.1[ruby_targets_ruby23] >=dev-ruby/rake-0.8.7[ruby_targets_ruby23] dev-ruby/method_source[ruby_targets_ruby23] ) ruby_targets_ruby24? ( ~dev-ruby/activesupport-5.1.5[ruby_targets_ruby24] ~dev-ruby/actionpack-5.1.5[ruby_targets_ruby24] >=dev-ruby/thor-0.18.1[ruby_targets_ruby24] >=dev-ruby/rake-0.8.7[ruby_targets_ruby24] dev-ruby/method_source[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 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=5.1
 SRC_URI=https://github.com/rails/rails/archive/v5.1.5.tar.gz -> rails-5.1.5.tgz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=68b4a8d014baf361979b0baab1d33d4b
+_md5_=7d951ee266ab0b7530cd7da07a920719
diff --git a/metadata/md5-cache/dev-ruby/rdoc-5.0.0-r3 b/metadata/md5-cache/dev-ruby/rdoc-5.0.0-r3
deleted file mode 100644
index 01dc744099b6..000000000000
--- a/metadata/md5-cache/dev-ruby/rdoc-5.0.0-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( dev-ruby/kpeg[ruby_targets_ruby22] dev-ruby/racc[ruby_targets_ruby22] test? ( >=dev-ruby/minitest-5.8:5[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( dev-ruby/kpeg[ruby_targets_ruby23] dev-ruby/racc[ruby_targets_ruby23] test? ( >=dev-ruby/minitest-5.8:5[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( dev-ruby/kpeg[ruby_targets_ruby24] dev-ruby/racc[ruby_targets_ruby24] test? ( >=dev-ruby/minitest-5.8:5[ruby_targets_ruby24] ) ) test? ( ruby_targets_ruby22? ( dev-ruby/json:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/json:2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/json:2[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? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
-DESCRIPTION=An extended version of the RDoc library from Ruby 1.8
-EAPI=5
-HOMEPAGE=https://github.com/rdoc/rdoc/
-IUSE=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
-LICENSE=Ruby MIT
-RDEPEND=>=app-eselect/eselect-ruby-20161226 ruby_targets_ruby22? ( dev-ruby/json:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/json:2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/json:2[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/rdoc/rdoc/archive/v5.0.0.tar.gz -> rdoc-5.0.0.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=7cd0cd8a39c8fd09b6567e5a3b3c6e00
diff --git a/metadata/md5-cache/dev-ruby/rdoc-6.0.0 b/metadata/md5-cache/dev-ruby/rdoc-6.0.0
deleted file mode 100644
index 4b941fa016b5..000000000000
--- a/metadata/md5-cache/dev-ruby/rdoc-6.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( dev-ruby/kpeg[ruby_targets_ruby22] >dev-ruby/racc-1.4.10[ruby_targets_ruby22] test? ( >=dev-ruby/minitest-5.8:5[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( dev-ruby/kpeg[ruby_targets_ruby23] >dev-ruby/racc-1.4.10[ruby_targets_ruby23] test? ( >=dev-ruby/minitest-5.8:5[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( dev-ruby/kpeg[ruby_targets_ruby24] >dev-ruby/racc-1.4.10[ruby_targets_ruby24] test? ( >=dev-ruby/minitest-5.8:5[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? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
-DESCRIPTION=An extended version of the RDoc library from Ruby 1.8
-EAPI=5
-HOMEPAGE=https://github.com/ruby/rdoc/
-IUSE=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 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=Ruby MIT
-RDEPEND=>=app-eselect/eselect-ruby-20161226 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/ruby/rdoc/archive/v6.0.0.tar.gz -> rdoc-6.0.0.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=8048a313ffd95f19328c8b5e91e94282
diff --git a/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.6.0 b/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.6.0
index 1b3df0f39127..8d41d2b4d29d 100644
--- a/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.6.0
+++ b/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.6.0
@@ -2,13 +2,13 @@ DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=test? ( ~net-analyzer/rrdtool-1.6.0[graph] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 )
 DESCRIPTION=Ruby bindings for rrdtool
 EAPI=5
-HOMEPAGE=http://oss.oetiker.ch/rrdtool/
+HOMEPAGE=https://oss.oetiker.ch/rrdtool/
 IUSE=graph test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24
 KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=~net-analyzer/rrdtool-1.6.0[graph=] ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 )
 REQUIRED_USE=test? ( graph ) || ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
-SRC_URI=http://oss.oetiker.ch/rrdtool/pub/rrdtool-1.6.0.tar.gz
+SRC_URI=https://oss.oetiker.ch/rrdtool/pub/rrdtool-1.6.0.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=7e488a89b530b4681291b8f666e3b1da
+_md5_=e52eb264680b15864a60d015aea62606
diff --git a/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.7.0 b/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.7.0
index 8613638970ee..0c70c2c1ba3e 100644
--- a/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.7.0
+++ b/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.7.0
@@ -2,13 +2,13 @@ DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=test? ( ~net-analyzer/rrdtool-1.7.0[graph] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 )
 DESCRIPTION=Ruby bindings for rrdtool
 EAPI=5
-HOMEPAGE=http://oss.oetiker.ch/rrdtool/
+HOMEPAGE=https://oss.oetiker.ch/rrdtool/
 IUSE=graph test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=~net-analyzer/rrdtool-1.7.0[graph=] ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 )
 REQUIRED_USE=test? ( graph ) || ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
-SRC_URI=http://oss.oetiker.ch/rrdtool/pub/rrdtool-1.7.0.tar.gz
+SRC_URI=https://oss.oetiker.ch/rrdtool/pub/rrdtool-1.7.0.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=3238a935b2fdc5bc1ad972ac3136af82
+_md5_=1214dcce0a62f784fc23029ad9b5590c
diff --git a/metadata/md5-cache/dev-ruby/thor-0.19.4 b/metadata/md5-cache/dev-ruby/thor-0.19.4
index 7a1edd92671c..c59a49bc0a89 100644
--- a/metadata/md5-cache/dev-ruby/thor-0.19.4
+++ b/metadata/md5-cache/dev-ruby/thor-0.19.4
@@ -4,11 +4,11 @@ DESCRIPTION=A scripting framework that replaces rake and sake
 EAPI=6
 HOMEPAGE=http://whatisthor.com/
 IUSE=doc elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86 ~amd64-linux
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux
 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/erikhuda/thor/archive/v0.19.4.tar.gz -> thor-git-0.19.4.tgz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=17db77601ce7f58636ee4e381850e069
+_md5_=8ef7095372836c8c6250b6d8e06f60a9
diff --git a/metadata/md5-cache/dev-ruby/thor-0.20.0 b/metadata/md5-cache/dev-ruby/thor-0.20.0
index 123f4214f66c..aede1a13152f 100644
--- a/metadata/md5-cache/dev-ruby/thor-0.20.0
+++ b/metadata/md5-cache/dev-ruby/thor-0.20.0
@@ -4,11 +4,11 @@ DESCRIPTION=A scripting framework that replaces rake and sake
 EAPI=6
 HOMEPAGE=http://whatisthor.com/
 IUSE=doc elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86 ~amd64-linux
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux
 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/erikhuda/thor/archive/v0.20.0.tar.gz -> thor-git-0.20.0.tgz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=97dcff35e69fe2d2c801c9d29a23e6af
+_md5_=c491f3757e7610cae8dd19a0d9f606e9
diff --git a/metadata/md5-cache/dev-ruby/webmock-2.3.2 b/metadata/md5-cache/dev-ruby/webmock-2.3.2
index 7ebc4f7984c8..7138f1a80ab8 100644
--- a/metadata/md5-cache/dev-ruby/webmock-2.3.2
+++ b/metadata/md5-cache/dev-ruby/webmock-2.3.2
@@ -4,11 +4,11 @@ DESCRIPTION=Allows stubbing HTTP requests and setting expectations on HTTP reque
 EAPI=5
 HOMEPAGE=https://github.com/bblimke/webmock
 IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/addressable-2.3.6[ruby_targets_ruby22] >=dev-ruby/crack-0.3.2[ruby_targets_ruby22] dev-ruby/hashdiff[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/addressable-2.3.6[ruby_targets_ruby23] >=dev-ruby/crack-0.3.2[ruby_targets_ruby23] dev-ruby/hashdiff[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/addressable-2.3.6[ruby_targets_ruby24] >=dev-ruby/crack-0.3.2[ruby_targets_ruby24] dev-ruby/hashdiff[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=2
 SRC_URI=mirror://rubygems/webmock-2.3.2.gem
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=c26c016b890e27f3c49c80765aee3195
+_md5_=8c590b4c3bab225c9154f26ac5f8e657
diff --git a/metadata/md5-cache/dev-ruby/webmock-3.3.0 b/metadata/md5-cache/dev-ruby/webmock-3.3.0
index ef2cf055e821..7f6505c19fa6 100644
--- a/metadata/md5-cache/dev-ruby/webmock-3.3.0
+++ b/metadata/md5-cache/dev-ruby/webmock-3.3.0
@@ -4,11 +4,11 @@ DESCRIPTION=Allows stubbing HTTP requests and setting expectations on HTTP reque
 EAPI=6
 HOMEPAGE=https://github.com/bblimke/webmock
 IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=~amd64 ~arm ~hppa ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/addressable-2.3.6[ruby_targets_ruby22] >=dev-ruby/crack-0.3.2[ruby_targets_ruby22] dev-ruby/hashdiff[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/addressable-2.3.6[ruby_targets_ruby23] >=dev-ruby/crack-0.3.2[ruby_targets_ruby23] dev-ruby/hashdiff[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/addressable-2.3.6[ruby_targets_ruby24] >=dev-ruby/crack-0.3.2[ruby_targets_ruby24] dev-ruby/hashdiff[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=3
 SRC_URI=mirror://rubygems/webmock-3.3.0.gem
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=bf7457b9b045a6d7bc44a2eecb13602c
+_md5_=64fe32711f018204cf808168497f1e53
diff --git a/metadata/md5-cache/dev-tex/Manifest.gz b/metadata/md5-cache/dev-tex/Manifest.gz
index 1cedea444c73..c6ec6bde87d6 100644
--- a/metadata/md5-cache/dev-tex/Manifest.gz
+++ b/metadata/md5-cache/dev-tex/Manifest.gz
diff --git a/metadata/md5-cache/dev-tex/pdfannotextractor-0.1l-r1 b/metadata/md5-cache/dev-tex/pdfannotextractor-0.1l-r1
index 5e5076a7e48c..279754812efa 100644
--- a/metadata/md5-cache/dev-tex/pdfannotextractor-0.1l-r1
+++ b/metadata/md5-cache/dev-tex/pdfannotextractor-0.1l-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/latex-base dev-java/pdfbox:1.8 dev-java/fontbox:1.7 virtual/perl-Getopt-Long dev-perl/File-Which >=virtual/jre-1.6 !<=dev-texlive/texlive-latexextra-2010 virtual/latex-base >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=mirror://gentoo/pdfannotextractor-0.1l.zip
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	latex-package	79acad19b9efeec616d0ad70cd117b03	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	latex-package	79acad19b9efeec616d0ad70cd117b03	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=f26eda61049851a602862320d29a3735
diff --git a/metadata/md5-cache/dev-texlive/Manifest.gz b/metadata/md5-cache/dev-texlive/Manifest.gz
index 5116e02a9285..ea1d8300ebaf 100644
--- a/metadata/md5-cache/dev-texlive/Manifest.gz
+++ b/metadata/md5-cache/dev-texlive/Manifest.gz
diff --git a/metadata/md5-cache/dev-texlive/texlive-basic-2017-r1 b/metadata/md5-cache/dev-texlive/texlive-basic-2017-r1
index bbbba8f154f4..3a7be81f120d 100644
--- a/metadata/md5-cache/dev-texlive/texlive-basic-2017-r1
+++ b/metadata/md5-cache/dev-texlive/texlive-basic-2017-r1
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive Essential programs and files
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc +luajittex
-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 ~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 ~x64-solaris ~x86-solaris
 LICENSE=GPL-1 GPL-2 LPPL-1.3 OFL public-domain TeX TeX-other-free
 RDEPEND=!<dev-texlive/texlive-latex-2009 !<dev-texlive/texlive-latexrecommended-2009 !dev-texlive/texlive-documentation-base !<app-text/dvipsk-5.996_p20160523 >=app-text/texlive-core-2015[luajittex?] !<dev-texlive/texlive-latex-2016 >=app-text/texlive-core-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-amsfonts-2017.tar.xz mirror://gentoo/texlive-module-bibtex-2017.tar.xz mirror://gentoo/texlive-module-cm-2017.tar.xz mirror://gentoo/texlive-module-enctex-2017.tar.xz mirror://gentoo/texlive-module-etex-2017.tar.xz mirror://gentoo/texlive-module-etex-pkg-2017.tar.xz mirror://gentoo/texlive-module-graphics-def-2017.tar.xz mirror://gentoo/texlive-module-hyph-utf8-2017.tar.xz mirror://gentoo/texlive-module-ifluatex-2017.tar.xz mirror://gentoo/texlive-module-ifxetex-2017.tar.xz mirror://gentoo/texlive-module-knuth-lib-2017.tar.xz mirror://gentoo/texlive-module-knuth-local-2017.tar.xz mirror://gentoo/texlive-module-lua-alt-getopt-2017.tar.xz mirror://gentoo/texlive-module-luatex-2017.tar.xz mirror://gentoo/texlive-module-makeindex-2017.tar.xz mirror://gentoo/texlive-module-metafont-2017.tar.xz mirror://gentoo/texlive-module-mflogo-2017.tar.xz mirror://gentoo/texlive-module-mfware-2017.tar.xz mirror://gentoo/texlive-module-pdftex-2017.tar.xz mirror://gentoo/texlive-module-plain-2017.tar.xz mirror://gentoo/texlive-module-tex-2017.tar.xz mirror://gentoo/texlive-module-tex-ini-files-2017.tar.xz mirror://gentoo/texlive-module-texlive-common-2017.tar.xz mirror://gentoo/texlive-module-texlive-docindex-2017.tar.xz mirror://gentoo/texlive-module-texlive-en-2017.tar.xz mirror://gentoo/texlive-module-texlive-msg-translations-2017.tar.xz mirror://gentoo/texlive-module-texlive-scripts-2017.tar.xz mirror://gentoo/texlive-module-unicode-data-2017.tar.xz mirror://gentoo/texlive-module-updmap-map-2017.tar.xz mirror://gentoo/texlive-module-collection-basic-2017.tar.xz doc? ( mirror://gentoo/texlive-module-amsfonts.doc-2017.tar.xz mirror://gentoo/texlive-module-bibtex.doc-2017.tar.xz mirror://gentoo/texlive-module-cm.doc-2017.tar.xz mirror://gentoo/texlive-module-enctex.doc-2017.tar.xz mirror://gentoo/texlive-module-etex.doc-2017.tar.xz mirror://gentoo/texlive-module-etex-pkg.doc-2017.tar.xz mirror://gentoo/texlive-module-graphics-def.doc-2017.tar.xz mirror://gentoo/texlive-module-hyph-utf8.doc-2017.tar.xz mirror://gentoo/texlive-module-ifluatex.doc-2017.tar.xz mirror://gentoo/texlive-module-ifxetex.doc-2017.tar.xz mirror://gentoo/texlive-module-lua-alt-getopt.doc-2017.tar.xz mirror://gentoo/texlive-module-luatex.doc-2017.tar.xz mirror://gentoo/texlive-module-makeindex.doc-2017.tar.xz mirror://gentoo/texlive-module-metafont.doc-2017.tar.xz mirror://gentoo/texlive-module-mflogo.doc-2017.tar.xz mirror://gentoo/texlive-module-mfware.doc-2017.tar.xz mirror://gentoo/texlive-module-pdftex.doc-2017.tar.xz mirror://gentoo/texlive-module-tex.doc-2017.tar.xz mirror://gentoo/texlive-module-tex-ini-files.doc-2017.tar.xz mirror://gentoo/texlive-module-texlive-common.doc-2017.tar.xz mirror://gentoo/texlive-module-texlive-docindex.doc-2017.tar.xz mirror://gentoo/texlive-module-texlive-en.doc-2017.tar.xz mirror://gentoo/texlive-module-texlive-scripts.doc-2017.tar.xz mirror://gentoo/texlive-module-unicode-data.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-amsfonts.source-2017.tar.xz mirror://gentoo/texlive-module-hyph-utf8.source-2017.tar.xz mirror://gentoo/texlive-module-ifluatex.source-2017.tar.xz mirror://gentoo/texlive-module-ifxetex.source-2017.tar.xz mirror://gentoo/texlive-module-mflogo.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8016737652f5b451dad813ec95e70c20
+_md5_=bb50ff85c0cbc40dfce100d74d1d1583
diff --git a/metadata/md5-cache/dev-texlive/texlive-bibtexextra-2017 b/metadata/md5-cache/dev-texlive/texlive-bibtexextra-2017
index 1e413ae59d2d..2a206c6fefee 100644
--- a/metadata/md5-cache/dev-texlive/texlive-bibtexextra-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-bibtexextra-2017
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive BibTeX additional styles
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-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 ~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 ~x64-solaris ~x86-solaris
 LICENSE=Artistic GPL-1 GPL-2 GPL-3 LPPL-1.2 LPPL-1.3 LPPL-1.3c public-domain TeX TeX-other-free
 RDEPEND=>=dev-texlive/texlive-latex-2017 !=dev-texlive/texlive-latexextra-2007* !<dev-texlive/texlive-latex-2009 !<dev-texlive/texlive-publishers-2014 >=app-text/texlive-core-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-aichej-2017.tar.xz mirror://gentoo/texlive-module-ajl-2017.tar.xz mirror://gentoo/texlive-module-amsrefs-2017.tar.xz mirror://gentoo/texlive-module-apacite-2017.tar.xz mirror://gentoo/texlive-module-apalike2-2017.tar.xz mirror://gentoo/texlive-module-archaeologie-2017.tar.xz mirror://gentoo/texlive-module-beebe-2017.tar.xz mirror://gentoo/texlive-module-besjournals-2017.tar.xz mirror://gentoo/texlive-module-bestpapers-2017.tar.xz mirror://gentoo/texlive-module-bibarts-2017.tar.xz mirror://gentoo/texlive-module-biber-2017.tar.xz mirror://gentoo/texlive-module-bibexport-2017.tar.xz mirror://gentoo/texlive-module-bibhtml-2017.tar.xz mirror://gentoo/texlive-module-biblatex-abnt-2017.tar.xz mirror://gentoo/texlive-module-biblatex-anonymous-2017.tar.xz mirror://gentoo/texlive-module-biblatex-apa-2017.tar.xz mirror://gentoo/texlive-module-biblatex-archaeology-2017.tar.xz mirror://gentoo/texlive-module-biblatex-arthistory-bonn-2017.tar.xz mirror://gentoo/texlive-module-biblatex-bookinarticle-2017.tar.xz mirror://gentoo/texlive-module-biblatex-bookinother-2017.tar.xz mirror://gentoo/texlive-module-biblatex-bwl-2017.tar.xz mirror://gentoo/texlive-module-biblatex-caspervector-2017.tar.xz mirror://gentoo/texlive-module-biblatex-chem-2017.tar.xz mirror://gentoo/texlive-module-biblatex-chicago-2017.tar.xz mirror://gentoo/texlive-module-biblatex-claves-2017.tar.xz mirror://gentoo/texlive-module-biblatex-dw-2017.tar.xz mirror://gentoo/texlive-module-biblatex-fiwi-2017.tar.xz mirror://gentoo/texlive-module-biblatex-gb7714-2015-2017.tar.xz mirror://gentoo/texlive-module-biblatex-gost-2017.tar.xz mirror://gentoo/texlive-module-biblatex-historian-2017.tar.xz mirror://gentoo/texlive-module-biblatex-ieee-2017.tar.xz mirror://gentoo/texlive-module-biblatex-ijsra-2017.tar.xz mirror://gentoo/texlive-module-biblatex-iso690-2017.tar.xz mirror://gentoo/texlive-module-biblatex-juradiss-2017.tar.xz mirror://gentoo/texlive-module-biblatex-lni-2017.tar.xz mirror://gentoo/texlive-module-biblatex-luh-ipw-2017.tar.xz mirror://gentoo/texlive-module-biblatex-manuscripts-philology-2017.tar.xz mirror://gentoo/texlive-module-biblatex-mla-2017.tar.xz mirror://gentoo/texlive-module-biblatex-morenames-2017.tar.xz mirror://gentoo/texlive-module-biblatex-multiple-dm-2017.tar.xz mirror://gentoo/texlive-module-biblatex-musuos-2017.tar.xz mirror://gentoo/texlive-module-biblatex-nature-2017.tar.xz mirror://gentoo/texlive-module-biblatex-nejm-2017.tar.xz mirror://gentoo/texlive-module-biblatex-nottsclassic-2017.tar.xz mirror://gentoo/texlive-module-biblatex-opcit-booktitle-2017.tar.xz mirror://gentoo/texlive-module-biblatex-oxref-2017.tar.xz mirror://gentoo/texlive-module-biblatex-philosophy-2017.tar.xz mirror://gentoo/texlive-module-biblatex-phys-2017.tar.xz mirror://gentoo/texlive-module-biblatex-publist-2017.tar.xz mirror://gentoo/texlive-module-biblatex-realauthor-2017.tar.xz mirror://gentoo/texlive-module-biblatex-sbl-2017.tar.xz mirror://gentoo/texlive-module-biblatex-science-2017.tar.xz mirror://gentoo/texlive-module-biblatex-shortfields-2017.tar.xz mirror://gentoo/texlive-module-biblatex-source-division-2017.tar.xz mirror://gentoo/texlive-module-biblatex-subseries-2017.tar.xz mirror://gentoo/texlive-module-biblatex-swiss-legal-2017.tar.xz mirror://gentoo/texlive-module-biblatex-trad-2017.tar.xz mirror://gentoo/texlive-module-biblatex-true-citepages-omit-2017.tar.xz mirror://gentoo/texlive-module-biblist-2017.tar.xz mirror://gentoo/texlive-module-bibtexperllibs-2017.tar.xz mirror://gentoo/texlive-module-bibtopic-2017.tar.xz mirror://gentoo/texlive-module-bibtopicprefix-2017.tar.xz mirror://gentoo/texlive-module-bibunits-2017.tar.xz mirror://gentoo/texlive-module-biolett-bst-2017.tar.xz mirror://gentoo/texlive-module-bookdb-2017.tar.xz mirror://gentoo/texlive-module-breakcites-2017.tar.xz mirror://gentoo/texlive-module-cell-2017.tar.xz mirror://gentoo/texlive-module-chbibref-2017.tar.xz mirror://gentoo/texlive-module-chicago-2017.tar.xz mirror://gentoo/texlive-module-chicago-annote-2017.tar.xz mirror://gentoo/texlive-module-chembst-2017.tar.xz mirror://gentoo/texlive-module-chscite-2017.tar.xz mirror://gentoo/texlive-module-citeall-2017.tar.xz mirror://gentoo/texlive-module-collref-2017.tar.xz mirror://gentoo/texlive-module-compactbib-2017.tar.xz mirror://gentoo/texlive-module-crossrefware-2017.tar.xz mirror://gentoo/texlive-module-custom-bib-2017.tar.xz mirror://gentoo/texlive-module-din1505-2017.tar.xz mirror://gentoo/texlive-module-dk-bib-2017.tar.xz mirror://gentoo/texlive-module-doipubmed-2017.tar.xz mirror://gentoo/texlive-module-ecobiblatex-2017.tar.xz mirror://gentoo/texlive-module-economic-2017.tar.xz mirror://gentoo/texlive-module-fbs-2017.tar.xz mirror://gentoo/texlive-module-figbib-2017.tar.xz mirror://gentoo/texlive-module-footbib-2017.tar.xz mirror://gentoo/texlive-module-francais-bst-2017.tar.xz mirror://gentoo/texlive-module-geschichtsfrkl-2017.tar.xz mirror://gentoo/texlive-module-harvard-2017.tar.xz mirror://gentoo/texlive-module-harvmac-2017.tar.xz mirror://gentoo/texlive-module-historische-zeitschrift-2017.tar.xz mirror://gentoo/texlive-module-ietfbibs-2017.tar.xz mirror://gentoo/texlive-module-ijqc-2017.tar.xz mirror://gentoo/texlive-module-inlinebib-2017.tar.xz mirror://gentoo/texlive-module-iopart-num-2017.tar.xz mirror://gentoo/texlive-module-jneurosci-2017.tar.xz mirror://gentoo/texlive-module-jurabib-2017.tar.xz mirror://gentoo/texlive-module-ksfh_nat-2017.tar.xz mirror://gentoo/texlive-module-ltb2bib-2017.tar.xz mirror://gentoo/texlive-module-listbib-2017.tar.xz mirror://gentoo/texlive-module-logreq-2017.tar.xz mirror://gentoo/texlive-module-margbib-2017.tar.xz mirror://gentoo/texlive-module-multibib-2017.tar.xz mirror://gentoo/texlive-module-multibibliography-2017.tar.xz mirror://gentoo/texlive-module-munich-2017.tar.xz mirror://gentoo/texlive-module-nar-2017.tar.xz mirror://gentoo/texlive-module-nmbib-2017.tar.xz mirror://gentoo/texlive-module-notes2bib-2017.tar.xz mirror://gentoo/texlive-module-notex-bst-2017.tar.xz mirror://gentoo/texlive-module-oscola-2017.tar.xz mirror://gentoo/texlive-module-perception-2017.tar.xz mirror://gentoo/texlive-module-pnas2009-2017.tar.xz mirror://gentoo/texlive-module-rsc-2017.tar.xz mirror://gentoo/texlive-module-showtags-2017.tar.xz mirror://gentoo/texlive-module-sort-by-letters-2017.tar.xz mirror://gentoo/texlive-module-splitbib-2017.tar.xz mirror://gentoo/texlive-module-turabian-formatting-2017.tar.xz mirror://gentoo/texlive-module-uni-wtal-ger-2017.tar.xz mirror://gentoo/texlive-module-uni-wtal-lin-2017.tar.xz mirror://gentoo/texlive-module-urlbst-2017.tar.xz mirror://gentoo/texlive-module-usebib-2017.tar.xz mirror://gentoo/texlive-module-vak-2017.tar.xz mirror://gentoo/texlive-module-xcite-2017.tar.xz mirror://gentoo/texlive-module-collection-bibtexextra-2017.tar.xz doc? ( mirror://gentoo/texlive-module-amsrefs.doc-2017.tar.xz mirror://gentoo/texlive-module-apacite.doc-2017.tar.xz mirror://gentoo/texlive-module-archaeologie.doc-2017.tar.xz mirror://gentoo/texlive-module-besjournals.doc-2017.tar.xz mirror://gentoo/texlive-module-bestpapers.doc-2017.tar.xz mirror://gentoo/texlive-module-bibarts.doc-2017.tar.xz mirror://gentoo/texlive-module-biber.doc-2017.tar.xz mirror://gentoo/texlive-module-bibexport.doc-2017.tar.xz mirror://gentoo/texlive-module-bibhtml.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-abnt.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-anonymous.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-apa.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-archaeology.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-arthistory-bonn.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-bookinarticle.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-bookinother.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-bwl.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-caspervector.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-chem.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-chicago.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-claves.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-dw.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-fiwi.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-gb7714-2015.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-gost.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-historian.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-ieee.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-ijsra.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-iso690.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-juradiss.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-lni.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-luh-ipw.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-manuscripts-philology.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-mla.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-morenames.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-multiple-dm.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-musuos.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-nature.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-nejm.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-nottsclassic.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-opcit-booktitle.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-oxref.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-philosophy.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-phys.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-publist.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-realauthor.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-sbl.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-science.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-shortfields.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-source-division.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-subseries.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-swiss-legal.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-trad.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-true-citepages-omit.doc-2017.tar.xz mirror://gentoo/texlive-module-biblist.doc-2017.tar.xz mirror://gentoo/texlive-module-bibtexperllibs.doc-2017.tar.xz mirror://gentoo/texlive-module-bibtopic.doc-2017.tar.xz mirror://gentoo/texlive-module-bibtopicprefix.doc-2017.tar.xz mirror://gentoo/texlive-module-bibunits.doc-2017.tar.xz mirror://gentoo/texlive-module-biolett-bst.doc-2017.tar.xz mirror://gentoo/texlive-module-bookdb.doc-2017.tar.xz mirror://gentoo/texlive-module-breakcites.doc-2017.tar.xz mirror://gentoo/texlive-module-cell.doc-2017.tar.xz mirror://gentoo/texlive-module-chbibref.doc-2017.tar.xz mirror://gentoo/texlive-module-chicago-annote.doc-2017.tar.xz mirror://gentoo/texlive-module-chembst.doc-2017.tar.xz mirror://gentoo/texlive-module-chscite.doc-2017.tar.xz mirror://gentoo/texlive-module-citeall.doc-2017.tar.xz mirror://gentoo/texlive-module-collref.doc-2017.tar.xz mirror://gentoo/texlive-module-crossrefware.doc-2017.tar.xz mirror://gentoo/texlive-module-custom-bib.doc-2017.tar.xz mirror://gentoo/texlive-module-din1505.doc-2017.tar.xz mirror://gentoo/texlive-module-dk-bib.doc-2017.tar.xz mirror://gentoo/texlive-module-doipubmed.doc-2017.tar.xz mirror://gentoo/texlive-module-ecobiblatex.doc-2017.tar.xz mirror://gentoo/texlive-module-economic.doc-2017.tar.xz mirror://gentoo/texlive-module-figbib.doc-2017.tar.xz mirror://gentoo/texlive-module-footbib.doc-2017.tar.xz mirror://gentoo/texlive-module-francais-bst.doc-2017.tar.xz mirror://gentoo/texlive-module-geschichtsfrkl.doc-2017.tar.xz mirror://gentoo/texlive-module-harvard.doc-2017.tar.xz mirror://gentoo/texlive-module-harvmac.doc-2017.tar.xz mirror://gentoo/texlive-module-historische-zeitschrift.doc-2017.tar.xz mirror://gentoo/texlive-module-ietfbibs.doc-2017.tar.xz mirror://gentoo/texlive-module-ijqc.doc-2017.tar.xz mirror://gentoo/texlive-module-inlinebib.doc-2017.tar.xz mirror://gentoo/texlive-module-iopart-num.doc-2017.tar.xz mirror://gentoo/texlive-module-jneurosci.doc-2017.tar.xz mirror://gentoo/texlive-module-jurabib.doc-2017.tar.xz mirror://gentoo/texlive-module-ltb2bib.doc-2017.tar.xz mirror://gentoo/texlive-module-listbib.doc-2017.tar.xz mirror://gentoo/texlive-module-logreq.doc-2017.tar.xz mirror://gentoo/texlive-module-margbib.doc-2017.tar.xz mirror://gentoo/texlive-module-multibib.doc-2017.tar.xz mirror://gentoo/texlive-module-multibibliography.doc-2017.tar.xz mirror://gentoo/texlive-module-munich.doc-2017.tar.xz mirror://gentoo/texlive-module-nmbib.doc-2017.tar.xz mirror://gentoo/texlive-module-notes2bib.doc-2017.tar.xz mirror://gentoo/texlive-module-oscola.doc-2017.tar.xz mirror://gentoo/texlive-module-perception.doc-2017.tar.xz mirror://gentoo/texlive-module-rsc.doc-2017.tar.xz mirror://gentoo/texlive-module-showtags.doc-2017.tar.xz mirror://gentoo/texlive-module-sort-by-letters.doc-2017.tar.xz mirror://gentoo/texlive-module-splitbib.doc-2017.tar.xz mirror://gentoo/texlive-module-turabian-formatting.doc-2017.tar.xz mirror://gentoo/texlive-module-uni-wtal-ger.doc-2017.tar.xz mirror://gentoo/texlive-module-uni-wtal-lin.doc-2017.tar.xz mirror://gentoo/texlive-module-urlbst.doc-2017.tar.xz mirror://gentoo/texlive-module-usebib.doc-2017.tar.xz mirror://gentoo/texlive-module-vak.doc-2017.tar.xz mirror://gentoo/texlive-module-xcite.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-amsrefs.source-2017.tar.xz mirror://gentoo/texlive-module-apacite.source-2017.tar.xz mirror://gentoo/texlive-module-bibarts.source-2017.tar.xz mirror://gentoo/texlive-module-biber.source-2017.tar.xz mirror://gentoo/texlive-module-bibexport.source-2017.tar.xz mirror://gentoo/texlive-module-biblatex-archaeology.source-2017.tar.xz mirror://gentoo/texlive-module-biblatex-gb7714-2015.source-2017.tar.xz mirror://gentoo/texlive-module-biblatex-oxref.source-2017.tar.xz mirror://gentoo/texlive-module-biblatex-philosophy.source-2017.tar.xz mirror://gentoo/texlive-module-bibtexperllibs.source-2017.tar.xz mirror://gentoo/texlive-module-bibtopic.source-2017.tar.xz mirror://gentoo/texlive-module-bibtopicprefix.source-2017.tar.xz mirror://gentoo/texlive-module-bibunits.source-2017.tar.xz mirror://gentoo/texlive-module-chembst.source-2017.tar.xz mirror://gentoo/texlive-module-chscite.source-2017.tar.xz mirror://gentoo/texlive-module-collref.source-2017.tar.xz mirror://gentoo/texlive-module-custom-bib.source-2017.tar.xz mirror://gentoo/texlive-module-dk-bib.source-2017.tar.xz mirror://gentoo/texlive-module-doipubmed.source-2017.tar.xz mirror://gentoo/texlive-module-footbib.source-2017.tar.xz mirror://gentoo/texlive-module-geschichtsfrkl.source-2017.tar.xz mirror://gentoo/texlive-module-harvard.source-2017.tar.xz mirror://gentoo/texlive-module-jurabib.source-2017.tar.xz mirror://gentoo/texlive-module-ltb2bib.source-2017.tar.xz mirror://gentoo/texlive-module-listbib.source-2017.tar.xz mirror://gentoo/texlive-module-margbib.source-2017.tar.xz mirror://gentoo/texlive-module-multibib.source-2017.tar.xz mirror://gentoo/texlive-module-multibibliography.source-2017.tar.xz mirror://gentoo/texlive-module-nmbib.source-2017.tar.xz mirror://gentoo/texlive-module-notes2bib.source-2017.tar.xz mirror://gentoo/texlive-module-rsc.source-2017.tar.xz mirror://gentoo/texlive-module-splitbib.source-2017.tar.xz mirror://gentoo/texlive-module-urlbst.source-2017.tar.xz mirror://gentoo/texlive-module-usebib.source-2017.tar.xz mirror://gentoo/texlive-module-xcite.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b6b088063708b05ccee951d536a8db51
+_md5_=ff8c67440a2e39399415b0b26c696a4b
diff --git a/metadata/md5-cache/dev-texlive/texlive-context-2017 b/metadata/md5-cache/dev-texlive/texlive-context-2017
index 67e5e282243c..2f030c4d377b 100644
--- a/metadata/md5-cache/dev-texlive/texlive-context-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-context-2017
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive ConTeXt and packages
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-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 ~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 ~x64-solaris ~x86-solaris
 LICENSE=BSD GPL-1 GPL-2 GPL-3 public-domain TeX-other-free
 RDEPEND=>=dev-texlive/texlive-basic-2017 >=dev-texlive/texlive-latex-2010 !<dev-texlive/texlive-latex-2010 >=app-text/texlive-core-2010[xetex] >=dev-texlive/texlive-metapost-2010 dev-lang/ruby >=app-text/texlive-core-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-context-2017.tar.xz mirror://gentoo/texlive-module-jmn-2017.tar.xz mirror://gentoo/texlive-module-context-notes-zh-cn-2017.tar.xz mirror://gentoo/texlive-module-context-account-2017.tar.xz mirror://gentoo/texlive-module-context-algorithmic-2017.tar.xz mirror://gentoo/texlive-module-context-animation-2017.tar.xz mirror://gentoo/texlive-module-context-annotation-2017.tar.xz mirror://gentoo/texlive-module-context-bnf-2017.tar.xz mirror://gentoo/texlive-module-context-chromato-2017.tar.xz mirror://gentoo/texlive-module-context-cmscbf-2017.tar.xz mirror://gentoo/texlive-module-context-cmttbf-2017.tar.xz mirror://gentoo/texlive-module-context-construction-plan-2017.tar.xz mirror://gentoo/texlive-module-context-cyrillicnumbers-2017.tar.xz mirror://gentoo/texlive-module-context-degrade-2017.tar.xz mirror://gentoo/texlive-module-context-fancybreak-2017.tar.xz mirror://gentoo/texlive-module-context-filter-2017.tar.xz mirror://gentoo/texlive-module-context-french-2017.tar.xz mirror://gentoo/texlive-module-context-fullpage-2017.tar.xz mirror://gentoo/texlive-module-context-gantt-2017.tar.xz mirror://gentoo/texlive-module-context-gnuplot-2017.tar.xz mirror://gentoo/texlive-module-context-inifile-2017.tar.xz mirror://gentoo/texlive-module-context-layout-2017.tar.xz mirror://gentoo/texlive-module-context-letter-2017.tar.xz mirror://gentoo/texlive-module-context-lettrine-2017.tar.xz mirror://gentoo/texlive-module-context-mathsets-2017.tar.xz mirror://gentoo/texlive-module-context-rst-2017.tar.xz mirror://gentoo/texlive-module-context-ruby-2017.tar.xz mirror://gentoo/texlive-module-context-simplefonts-2017.tar.xz mirror://gentoo/texlive-module-context-simpleslides-2017.tar.xz mirror://gentoo/texlive-module-context-title-2017.tar.xz mirror://gentoo/texlive-module-context-transliterator-2017.tar.xz mirror://gentoo/texlive-module-context-typearea-2017.tar.xz mirror://gentoo/texlive-module-context-typescripts-2017.tar.xz mirror://gentoo/texlive-module-context-vim-2017.tar.xz mirror://gentoo/texlive-module-context-visualcounter-2017.tar.xz mirror://gentoo/texlive-module-collection-context-2017.tar.xz doc? ( mirror://gentoo/texlive-module-context.doc-2017.tar.xz mirror://gentoo/texlive-module-context-notes-zh-cn.doc-2017.tar.xz mirror://gentoo/texlive-module-context-account.doc-2017.tar.xz mirror://gentoo/texlive-module-context-animation.doc-2017.tar.xz mirror://gentoo/texlive-module-context-annotation.doc-2017.tar.xz mirror://gentoo/texlive-module-context-bnf.doc-2017.tar.xz mirror://gentoo/texlive-module-context-chromato.doc-2017.tar.xz mirror://gentoo/texlive-module-context-cmscbf.doc-2017.tar.xz mirror://gentoo/texlive-module-context-cmttbf.doc-2017.tar.xz mirror://gentoo/texlive-module-context-construction-plan.doc-2017.tar.xz mirror://gentoo/texlive-module-context-cyrillicnumbers.doc-2017.tar.xz mirror://gentoo/texlive-module-context-degrade.doc-2017.tar.xz mirror://gentoo/texlive-module-context-fancybreak.doc-2017.tar.xz mirror://gentoo/texlive-module-context-filter.doc-2017.tar.xz mirror://gentoo/texlive-module-context-french.doc-2017.tar.xz mirror://gentoo/texlive-module-context-fullpage.doc-2017.tar.xz mirror://gentoo/texlive-module-context-gantt.doc-2017.tar.xz mirror://gentoo/texlive-module-context-gnuplot.doc-2017.tar.xz mirror://gentoo/texlive-module-context-inifile.doc-2017.tar.xz mirror://gentoo/texlive-module-context-layout.doc-2017.tar.xz mirror://gentoo/texlive-module-context-letter.doc-2017.tar.xz mirror://gentoo/texlive-module-context-lettrine.doc-2017.tar.xz mirror://gentoo/texlive-module-context-mathsets.doc-2017.tar.xz mirror://gentoo/texlive-module-context-rst.doc-2017.tar.xz mirror://gentoo/texlive-module-context-ruby.doc-2017.tar.xz mirror://gentoo/texlive-module-context-simplefonts.doc-2017.tar.xz mirror://gentoo/texlive-module-context-simpleslides.doc-2017.tar.xz mirror://gentoo/texlive-module-context-title.doc-2017.tar.xz mirror://gentoo/texlive-module-context-transliterator.doc-2017.tar.xz mirror://gentoo/texlive-module-context-typearea.doc-2017.tar.xz mirror://gentoo/texlive-module-context-typescripts.doc-2017.tar.xz mirror://gentoo/texlive-module-context-vim.doc-2017.tar.xz mirror://gentoo/texlive-module-context-visualcounter.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-context-visualcounter.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=4b371d796f244ef52017559a6fd531e9
+_md5_=b94717a1aa2001b7d7fec852e7d62b17
diff --git a/metadata/md5-cache/dev-texlive/texlive-fontsextra-2017 b/metadata/md5-cache/dev-texlive/texlive-fontsextra-2017
index d1dbbdceccd8..72ee33baf190 100644
--- a/metadata/md5-cache/dev-texlive/texlive-fontsextra-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-fontsextra-2017
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive Additional fonts
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-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 ~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 ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0 BSD GPL-1 GPL-2 GPL-3 LPPL-1.2 LPPL-1.3 MIT OFL public-domain TeX TeX-other-free
 RDEPEND=>=dev-texlive/texlive-basic-2017 !=dev-texlive/texlive-langpolish-2007* !<dev-texlive/texlive-latexextra-2016 >=app-text/texlive-core-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-Asana-Math-2017.tar.xz mirror://gentoo/texlive-module-academicons-2017.tar.xz mirror://gentoo/texlive-module-accanthis-2017.tar.xz mirror://gentoo/texlive-module-adforn-2017.tar.xz mirror://gentoo/texlive-module-adfsymbols-2017.tar.xz mirror://gentoo/texlive-module-aecc-2017.tar.xz mirror://gentoo/texlive-module-alegreya-2017.tar.xz mirror://gentoo/texlive-module-allrunes-2017.tar.xz mirror://gentoo/texlive-module-almfixed-2017.tar.xz mirror://gentoo/texlive-module-anonymouspro-2017.tar.xz mirror://gentoo/texlive-module-antiqua-2017.tar.xz mirror://gentoo/texlive-module-antt-2017.tar.xz mirror://gentoo/texlive-module-archaic-2017.tar.xz mirror://gentoo/texlive-module-arev-2017.tar.xz mirror://gentoo/texlive-module-arimo-2017.tar.xz mirror://gentoo/texlive-module-asapsym-2017.tar.xz mirror://gentoo/texlive-module-ascii-font-2017.tar.xz mirror://gentoo/texlive-module-aspectratio-2017.tar.xz mirror://gentoo/texlive-module-astro-2017.tar.xz mirror://gentoo/texlive-module-augie-2017.tar.xz mirror://gentoo/texlive-module-auncial-new-2017.tar.xz mirror://gentoo/texlive-module-aurical-2017.tar.xz mirror://gentoo/texlive-module-b1encoding-2017.tar.xz mirror://gentoo/texlive-module-barcodes-2017.tar.xz mirror://gentoo/texlive-module-baskervald-2017.tar.xz mirror://gentoo/texlive-module-baskervaldx-2017.tar.xz mirror://gentoo/texlive-module-baskervillef-2017.tar.xz mirror://gentoo/texlive-module-bbding-2017.tar.xz mirror://gentoo/texlive-module-bbm-2017.tar.xz mirror://gentoo/texlive-module-bbm-macros-2017.tar.xz mirror://gentoo/texlive-module-bbold-2017.tar.xz mirror://gentoo/texlive-module-bbold-type1-2017.tar.xz mirror://gentoo/texlive-module-belleek-2017.tar.xz mirror://gentoo/texlive-module-bera-2017.tar.xz mirror://gentoo/texlive-module-berenisadf-2017.tar.xz mirror://gentoo/texlive-module-beuron-2017.tar.xz mirror://gentoo/texlive-module-bguq-2017.tar.xz mirror://gentoo/texlive-module-blacklettert1-2017.tar.xz mirror://gentoo/texlive-module-boisik-2017.tar.xz mirror://gentoo/texlive-module-bookhands-2017.tar.xz mirror://gentoo/texlive-module-boondox-2017.tar.xz mirror://gentoo/texlive-module-braille-2017.tar.xz mirror://gentoo/texlive-module-brushscr-2017.tar.xz mirror://gentoo/texlive-module-cabin-2017.tar.xz mirror://gentoo/texlive-module-caladea-2017.tar.xz mirror://gentoo/texlive-module-calligra-2017.tar.xz mirror://gentoo/texlive-module-calligra-type1-2017.tar.xz mirror://gentoo/texlive-module-cantarell-2017.tar.xz mirror://gentoo/texlive-module-carlito-2017.tar.xz mirror://gentoo/texlive-module-carolmin-ps-2017.tar.xz mirror://gentoo/texlive-module-ccicons-2017.tar.xz mirror://gentoo/texlive-module-cfr-initials-2017.tar.xz mirror://gentoo/texlive-module-cfr-lm-2017.tar.xz mirror://gentoo/texlive-module-cherokee-2017.tar.xz mirror://gentoo/texlive-module-chivo-2017.tar.xz mirror://gentoo/texlive-module-cinzel-2017.tar.xz mirror://gentoo/texlive-module-clearsans-2017.tar.xz mirror://gentoo/texlive-module-cm-lgc-2017.tar.xz mirror://gentoo/texlive-module-cm-unicode-2017.tar.xz mirror://gentoo/texlive-module-cmbright-2017.tar.xz mirror://gentoo/texlive-module-cmexb-2017.tar.xz mirror://gentoo/texlive-module-cmll-2017.tar.xz mirror://gentoo/texlive-module-cmpica-2017.tar.xz mirror://gentoo/texlive-module-cmtiup-2017.tar.xz mirror://gentoo/texlive-module-cochineal-2017.tar.xz mirror://gentoo/texlive-module-comfortaa-2017.tar.xz mirror://gentoo/texlive-module-comicneue-2017.tar.xz mirror://gentoo/texlive-module-concmath-fonts-2017.tar.xz mirror://gentoo/texlive-module-cookingsymbols-2017.tar.xz mirror://gentoo/texlive-module-cormorantgaramond-2017.tar.xz mirror://gentoo/texlive-module-countriesofeurope-2017.tar.xz mirror://gentoo/texlive-module-courier-scaled-2017.tar.xz mirror://gentoo/texlive-module-crimson-2017.tar.xz mirror://gentoo/texlive-module-cryst-2017.tar.xz mirror://gentoo/texlive-module-cyklop-2017.tar.xz mirror://gentoo/texlive-module-dancers-2017.tar.xz mirror://gentoo/texlive-module-dantelogo-2017.tar.xz mirror://gentoo/texlive-module-dejavu-2017.tar.xz mirror://gentoo/texlive-module-dice-2017.tar.xz mirror://gentoo/texlive-module-dictsym-2017.tar.xz mirror://gentoo/texlive-module-dingbat-2017.tar.xz mirror://gentoo/texlive-module-doublestroke-2017.tar.xz mirror://gentoo/texlive-module-dozenal-2017.tar.xz mirror://gentoo/texlive-module-drm-2017.tar.xz mirror://gentoo/texlive-module-droid-2017.tar.xz mirror://gentoo/texlive-module-duerer-2017.tar.xz mirror://gentoo/texlive-module-duerer-latex-2017.tar.xz mirror://gentoo/texlive-module-dutchcal-2017.tar.xz mirror://gentoo/texlive-module-ean-2017.tar.xz mirror://gentoo/texlive-module-ebgaramond-2017.tar.xz mirror://gentoo/texlive-module-ebgaramond-maths-2017.tar.xz mirror://gentoo/texlive-module-ecc-2017.tar.xz mirror://gentoo/texlive-module-eco-2017.tar.xz mirror://gentoo/texlive-module-eiad-2017.tar.xz mirror://gentoo/texlive-module-eiad-ltx-2017.tar.xz mirror://gentoo/texlive-module-electrum-2017.tar.xz mirror://gentoo/texlive-module-elvish-2017.tar.xz mirror://gentoo/texlive-module-epigrafica-2017.tar.xz mirror://gentoo/texlive-module-epsdice-2017.tar.xz mirror://gentoo/texlive-module-erewhon-2017.tar.xz mirror://gentoo/texlive-module-esrelation-2017.tar.xz mirror://gentoo/texlive-module-esstix-2017.tar.xz mirror://gentoo/texlive-module-esvect-2017.tar.xz mirror://gentoo/texlive-module-eulervm-2017.tar.xz mirror://gentoo/texlive-module-euxm-2017.tar.xz mirror://gentoo/texlive-module-fbb-2017.tar.xz mirror://gentoo/texlive-module-fdsymbol-2017.tar.xz mirror://gentoo/texlive-module-fetamont-2017.tar.xz mirror://gentoo/texlive-module-feyn-2017.tar.xz mirror://gentoo/texlive-module-fge-2017.tar.xz mirror://gentoo/texlive-module-fira-2017.tar.xz mirror://gentoo/texlive-module-foekfont-2017.tar.xz mirror://gentoo/texlive-module-fonetika-2017.tar.xz mirror://gentoo/texlive-module-fontawesome-2017.tar.xz mirror://gentoo/texlive-module-fontmfizz-2017.tar.xz mirror://gentoo/texlive-module-fonts-churchslavonic-2017.tar.xz mirror://gentoo/texlive-module-fourier-2017.tar.xz mirror://gentoo/texlive-module-fouriernc-2017.tar.xz mirror://gentoo/texlive-module-frcursive-2017.tar.xz mirror://gentoo/texlive-module-frederika2016-2017.tar.xz mirror://gentoo/texlive-module-genealogy-2017.tar.xz mirror://gentoo/texlive-module-gentium-tug-2017.tar.xz mirror://gentoo/texlive-module-gfsartemisia-2017.tar.xz mirror://gentoo/texlive-module-gfsbodoni-2017.tar.xz mirror://gentoo/texlive-module-gfscomplutum-2017.tar.xz mirror://gentoo/texlive-module-gfsdidot-2017.tar.xz mirror://gentoo/texlive-module-gfsneohellenic-2017.tar.xz mirror://gentoo/texlive-module-gfssolomos-2017.tar.xz mirror://gentoo/texlive-module-gillcm-2017.tar.xz mirror://gentoo/texlive-module-gillius-2017.tar.xz mirror://gentoo/texlive-module-gnu-freefont-2017.tar.xz mirror://gentoo/texlive-module-gofonts-2017.tar.xz mirror://gentoo/texlive-module-gothic-2017.tar.xz mirror://gentoo/texlive-module-greenpoint-2017.tar.xz mirror://gentoo/texlive-module-grotesq-2017.tar.xz mirror://gentoo/texlive-module-hacm-2017.tar.xz mirror://gentoo/texlive-module-hands-2017.tar.xz mirror://gentoo/texlive-module-heuristica-2017.tar.xz mirror://gentoo/texlive-module-hfbright-2017.tar.xz mirror://gentoo/texlive-module-hfoldsty-2017.tar.xz mirror://gentoo/texlive-module-ifsym-2017.tar.xz mirror://gentoo/texlive-module-imfellenglish-2017.tar.xz mirror://gentoo/texlive-module-inconsolata-2017.tar.xz mirror://gentoo/texlive-module-initials-2017.tar.xz mirror://gentoo/texlive-module-ipaex-type1-2017.tar.xz mirror://gentoo/texlive-module-iwona-2017.tar.xz mirror://gentoo/texlive-module-jablantile-2017.tar.xz mirror://gentoo/texlive-module-jamtimes-2017.tar.xz mirror://gentoo/texlive-module-junicode-2017.tar.xz mirror://gentoo/texlive-module-kixfont-2017.tar.xz mirror://gentoo/texlive-module-knuthotherfonts-2017.tar.xz mirror://gentoo/texlive-module-kpfonts-2017.tar.xz mirror://gentoo/texlive-module-kurier-2017.tar.xz mirror://gentoo/texlive-module-lato-2017.tar.xz mirror://gentoo/texlive-module-lfb-2017.tar.xz mirror://gentoo/texlive-module-libertine-2017.tar.xz mirror://gentoo/texlive-module-libertinegc-2017.tar.xz mirror://gentoo/texlive-module-libertinus-2017.tar.xz mirror://gentoo/texlive-module-libertinust1math-2017.tar.xz mirror://gentoo/texlive-module-librebaskerville-2017.tar.xz mirror://gentoo/texlive-module-librebodoni-2017.tar.xz mirror://gentoo/texlive-module-librecaslon-2017.tar.xz mirror://gentoo/texlive-module-libris-2017.tar.xz mirror://gentoo/texlive-module-linearA-2017.tar.xz mirror://gentoo/texlive-module-lobster2-2017.tar.xz mirror://gentoo/texlive-module-lxfonts-2017.tar.xz mirror://gentoo/texlive-module-ly1-2017.tar.xz mirror://gentoo/texlive-module-mathabx-2017.tar.xz mirror://gentoo/texlive-module-mathabx-type1-2017.tar.xz mirror://gentoo/texlive-module-mathdesign-2017.tar.xz mirror://gentoo/texlive-module-mdputu-2017.tar.xz mirror://gentoo/texlive-module-mdsymbol-2017.tar.xz mirror://gentoo/texlive-module-merriweather-2017.tar.xz mirror://gentoo/texlive-module-miama-2017.tar.xz mirror://gentoo/texlive-module-mintspirit-2017.tar.xz mirror://gentoo/texlive-module-missaali-2017.tar.xz mirror://gentoo/texlive-module-mnsymbol-2017.tar.xz mirror://gentoo/texlive-module-montserrat-2017.tar.xz mirror://gentoo/texlive-module-mweights-2017.tar.xz mirror://gentoo/texlive-module-newpx-2017.tar.xz mirror://gentoo/texlive-module-newtx-2017.tar.xz mirror://gentoo/texlive-module-newtxsf-2017.tar.xz mirror://gentoo/texlive-module-newtxtt-2017.tar.xz mirror://gentoo/texlive-module-nimbus15-2017.tar.xz mirror://gentoo/texlive-module-nkarta-2017.tar.xz mirror://gentoo/texlive-module-noto-2017.tar.xz mirror://gentoo/texlive-module-obnov-2017.tar.xz mirror://gentoo/texlive-module-ocherokee-2017.tar.xz mirror://gentoo/texlive-module-ocr-b-2017.tar.xz mirror://gentoo/texlive-module-ocr-b-outline-2017.tar.xz mirror://gentoo/texlive-module-ogham-2017.tar.xz mirror://gentoo/texlive-module-oinuit-2017.tar.xz mirror://gentoo/texlive-module-old-arrows-2017.tar.xz mirror://gentoo/texlive-module-oldlatin-2017.tar.xz mirror://gentoo/texlive-module-oldstandard-2017.tar.xz mirror://gentoo/texlive-module-opensans-2017.tar.xz mirror://gentoo/texlive-module-orkhun-2017.tar.xz mirror://gentoo/texlive-module-overlock-2017.tar.xz mirror://gentoo/texlive-module-pacioli-2017.tar.xz mirror://gentoo/texlive-module-paratype-2017.tar.xz mirror://gentoo/texlive-module-phaistos-2017.tar.xz mirror://gentoo/texlive-module-phonetic-2017.tar.xz mirror://gentoo/texlive-module-pigpen-2017.tar.xz mirror://gentoo/texlive-module-playfair-2017.tar.xz mirror://gentoo/texlive-module-poltawski-2017.tar.xz mirror://gentoo/texlive-module-prodint-2017.tar.xz mirror://gentoo/texlive-module-punk-2017.tar.xz mirror://gentoo/texlive-module-punk-latex-2017.tar.xz mirror://gentoo/texlive-module-punknova-2017.tar.xz mirror://gentoo/texlive-module-pxtxalfa-2017.tar.xz mirror://gentoo/texlive-module-quattrocento-2017.tar.xz mirror://gentoo/texlive-module-raleway-2017.tar.xz mirror://gentoo/texlive-module-recycle-2017.tar.xz mirror://gentoo/texlive-module-roboto-2017.tar.xz mirror://gentoo/texlive-module-romande-2017.tar.xz mirror://gentoo/texlive-module-rosario-2017.tar.xz mirror://gentoo/texlive-module-rsfso-2017.tar.xz mirror://gentoo/texlive-module-sansmathaccent-2017.tar.xz mirror://gentoo/texlive-module-sansmathfonts-2017.tar.xz mirror://gentoo/texlive-module-sauter-2017.tar.xz mirror://gentoo/texlive-module-sauterfonts-2017.tar.xz mirror://gentoo/texlive-module-schulschriften-2017.tar.xz mirror://gentoo/texlive-module-semaphor-2017.tar.xz mirror://gentoo/texlive-module-skull-2017.tar.xz mirror://gentoo/texlive-module-sourcecodepro-2017.tar.xz mirror://gentoo/texlive-module-sourcesanspro-2017.tar.xz mirror://gentoo/texlive-module-sourceserifpro-2017.tar.xz mirror://gentoo/texlive-module-starfont-2017.tar.xz mirror://gentoo/texlive-module-staves-2017.tar.xz mirror://gentoo/texlive-module-stix-2017.tar.xz mirror://gentoo/texlive-module-superiors-2017.tar.xz mirror://gentoo/texlive-module-svrsymbols-2017.tar.xz mirror://gentoo/texlive-module-tapir-2017.tar.xz mirror://gentoo/texlive-module-tempora-2017.tar.xz mirror://gentoo/texlive-module-tengwarscript-2017.tar.xz mirror://gentoo/texlive-module-tfrupee-2017.tar.xz mirror://gentoo/texlive-module-tinos-2017.tar.xz mirror://gentoo/texlive-module-tpslifonts-2017.tar.xz mirror://gentoo/texlive-module-trajan-2017.tar.xz mirror://gentoo/texlive-module-txfontsb-2017.tar.xz mirror://gentoo/texlive-module-txuprcal-2017.tar.xz mirror://gentoo/texlive-module-typicons-2017.tar.xz mirror://gentoo/texlive-module-umtypewriter-2017.tar.xz mirror://gentoo/texlive-module-universa-2017.tar.xz mirror://gentoo/texlive-module-universalis-2017.tar.xz mirror://gentoo/texlive-module-uppunctlm-2017.tar.xz mirror://gentoo/texlive-module-urwchancal-2017.tar.xz mirror://gentoo/texlive-module-venturisadf-2017.tar.xz mirror://gentoo/texlive-module-wsuipa-2017.tar.xz mirror://gentoo/texlive-module-xcharter-2017.tar.xz mirror://gentoo/texlive-module-xits-2017.tar.xz mirror://gentoo/texlive-module-yfonts-2017.tar.xz mirror://gentoo/texlive-module-yfonts-t1-2017.tar.xz mirror://gentoo/texlive-module-yinit-otf-2017.tar.xz mirror://gentoo/texlive-module-zlmtt-2017.tar.xz mirror://gentoo/texlive-module-collection-fontsextra-2017.tar.xz doc? ( mirror://gentoo/texlive-module-Asana-Math.doc-2017.tar.xz mirror://gentoo/texlive-module-academicons.doc-2017.tar.xz mirror://gentoo/texlive-module-accanthis.doc-2017.tar.xz mirror://gentoo/texlive-module-adforn.doc-2017.tar.xz mirror://gentoo/texlive-module-adfsymbols.doc-2017.tar.xz mirror://gentoo/texlive-module-aecc.doc-2017.tar.xz mirror://gentoo/texlive-module-alegreya.doc-2017.tar.xz mirror://gentoo/texlive-module-allrunes.doc-2017.tar.xz mirror://gentoo/texlive-module-almfixed.doc-2017.tar.xz mirror://gentoo/texlive-module-anonymouspro.doc-2017.tar.xz mirror://gentoo/texlive-module-antiqua.doc-2017.tar.xz mirror://gentoo/texlive-module-antt.doc-2017.tar.xz mirror://gentoo/texlive-module-archaic.doc-2017.tar.xz mirror://gentoo/texlive-module-arev.doc-2017.tar.xz mirror://gentoo/texlive-module-arimo.doc-2017.tar.xz mirror://gentoo/texlive-module-asapsym.doc-2017.tar.xz mirror://gentoo/texlive-module-ascii-font.doc-2017.tar.xz mirror://gentoo/texlive-module-aspectratio.doc-2017.tar.xz mirror://gentoo/texlive-module-astro.doc-2017.tar.xz mirror://gentoo/texlive-module-augie.doc-2017.tar.xz mirror://gentoo/texlive-module-auncial-new.doc-2017.tar.xz mirror://gentoo/texlive-module-aurical.doc-2017.tar.xz mirror://gentoo/texlive-module-b1encoding.doc-2017.tar.xz mirror://gentoo/texlive-module-barcodes.doc-2017.tar.xz mirror://gentoo/texlive-module-baskervald.doc-2017.tar.xz mirror://gentoo/texlive-module-baskervaldx.doc-2017.tar.xz mirror://gentoo/texlive-module-baskervillef.doc-2017.tar.xz mirror://gentoo/texlive-module-bbding.doc-2017.tar.xz mirror://gentoo/texlive-module-bbm.doc-2017.tar.xz mirror://gentoo/texlive-module-bbm-macros.doc-2017.tar.xz mirror://gentoo/texlive-module-bbold.doc-2017.tar.xz mirror://gentoo/texlive-module-bbold-type1.doc-2017.tar.xz mirror://gentoo/texlive-module-belleek.doc-2017.tar.xz mirror://gentoo/texlive-module-bera.doc-2017.tar.xz mirror://gentoo/texlive-module-berenisadf.doc-2017.tar.xz mirror://gentoo/texlive-module-beuron.doc-2017.tar.xz mirror://gentoo/texlive-module-bguq.doc-2017.tar.xz mirror://gentoo/texlive-module-blacklettert1.doc-2017.tar.xz mirror://gentoo/texlive-module-boisik.doc-2017.tar.xz mirror://gentoo/texlive-module-bookhands.doc-2017.tar.xz mirror://gentoo/texlive-module-boondox.doc-2017.tar.xz mirror://gentoo/texlive-module-braille.doc-2017.tar.xz mirror://gentoo/texlive-module-brushscr.doc-2017.tar.xz mirror://gentoo/texlive-module-cabin.doc-2017.tar.xz mirror://gentoo/texlive-module-caladea.doc-2017.tar.xz mirror://gentoo/texlive-module-calligra.doc-2017.tar.xz mirror://gentoo/texlive-module-calligra-type1.doc-2017.tar.xz mirror://gentoo/texlive-module-cantarell.doc-2017.tar.xz mirror://gentoo/texlive-module-carlito.doc-2017.tar.xz mirror://gentoo/texlive-module-carolmin-ps.doc-2017.tar.xz mirror://gentoo/texlive-module-ccicons.doc-2017.tar.xz mirror://gentoo/texlive-module-cfr-initials.doc-2017.tar.xz mirror://gentoo/texlive-module-cfr-lm.doc-2017.tar.xz mirror://gentoo/texlive-module-cherokee.doc-2017.tar.xz mirror://gentoo/texlive-module-chivo.doc-2017.tar.xz mirror://gentoo/texlive-module-cinzel.doc-2017.tar.xz mirror://gentoo/texlive-module-clearsans.doc-2017.tar.xz mirror://gentoo/texlive-module-cm-lgc.doc-2017.tar.xz mirror://gentoo/texlive-module-cm-unicode.doc-2017.tar.xz mirror://gentoo/texlive-module-cmbright.doc-2017.tar.xz mirror://gentoo/texlive-module-cmexb.doc-2017.tar.xz mirror://gentoo/texlive-module-cmll.doc-2017.tar.xz mirror://gentoo/texlive-module-cmpica.doc-2017.tar.xz mirror://gentoo/texlive-module-cmtiup.doc-2017.tar.xz mirror://gentoo/texlive-module-cochineal.doc-2017.tar.xz mirror://gentoo/texlive-module-comfortaa.doc-2017.tar.xz mirror://gentoo/texlive-module-comicneue.doc-2017.tar.xz mirror://gentoo/texlive-module-concmath-fonts.doc-2017.tar.xz mirror://gentoo/texlive-module-cookingsymbols.doc-2017.tar.xz mirror://gentoo/texlive-module-cormorantgaramond.doc-2017.tar.xz mirror://gentoo/texlive-module-countriesofeurope.doc-2017.tar.xz mirror://gentoo/texlive-module-courier-scaled.doc-2017.tar.xz mirror://gentoo/texlive-module-crimson.doc-2017.tar.xz mirror://gentoo/texlive-module-cryst.doc-2017.tar.xz mirror://gentoo/texlive-module-cyklop.doc-2017.tar.xz mirror://gentoo/texlive-module-dantelogo.doc-2017.tar.xz mirror://gentoo/texlive-module-dejavu.doc-2017.tar.xz mirror://gentoo/texlive-module-dice.doc-2017.tar.xz mirror://gentoo/texlive-module-dictsym.doc-2017.tar.xz mirror://gentoo/texlive-module-dingbat.doc-2017.tar.xz mirror://gentoo/texlive-module-doublestroke.doc-2017.tar.xz mirror://gentoo/texlive-module-dozenal.doc-2017.tar.xz mirror://gentoo/texlive-module-drm.doc-2017.tar.xz mirror://gentoo/texlive-module-droid.doc-2017.tar.xz mirror://gentoo/texlive-module-duerer.doc-2017.tar.xz mirror://gentoo/texlive-module-duerer-latex.doc-2017.tar.xz mirror://gentoo/texlive-module-dutchcal.doc-2017.tar.xz mirror://gentoo/texlive-module-ean.doc-2017.tar.xz mirror://gentoo/texlive-module-ebgaramond.doc-2017.tar.xz mirror://gentoo/texlive-module-ebgaramond-maths.doc-2017.tar.xz mirror://gentoo/texlive-module-ecc.doc-2017.tar.xz mirror://gentoo/texlive-module-eco.doc-2017.tar.xz mirror://gentoo/texlive-module-eiad.doc-2017.tar.xz mirror://gentoo/texlive-module-eiad-ltx.doc-2017.tar.xz mirror://gentoo/texlive-module-electrum.doc-2017.tar.xz mirror://gentoo/texlive-module-elvish.doc-2017.tar.xz mirror://gentoo/texlive-module-epigrafica.doc-2017.tar.xz mirror://gentoo/texlive-module-epsdice.doc-2017.tar.xz mirror://gentoo/texlive-module-erewhon.doc-2017.tar.xz mirror://gentoo/texlive-module-esrelation.doc-2017.tar.xz mirror://gentoo/texlive-module-esstix.doc-2017.tar.xz mirror://gentoo/texlive-module-esvect.doc-2017.tar.xz mirror://gentoo/texlive-module-eulervm.doc-2017.tar.xz mirror://gentoo/texlive-module-fbb.doc-2017.tar.xz mirror://gentoo/texlive-module-fdsymbol.doc-2017.tar.xz mirror://gentoo/texlive-module-fetamont.doc-2017.tar.xz mirror://gentoo/texlive-module-feyn.doc-2017.tar.xz mirror://gentoo/texlive-module-fge.doc-2017.tar.xz mirror://gentoo/texlive-module-fira.doc-2017.tar.xz mirror://gentoo/texlive-module-foekfont.doc-2017.tar.xz mirror://gentoo/texlive-module-fonetika.doc-2017.tar.xz mirror://gentoo/texlive-module-fontawesome.doc-2017.tar.xz mirror://gentoo/texlive-module-fontmfizz.doc-2017.tar.xz mirror://gentoo/texlive-module-fonts-churchslavonic.doc-2017.tar.xz mirror://gentoo/texlive-module-fourier.doc-2017.tar.xz mirror://gentoo/texlive-module-fouriernc.doc-2017.tar.xz mirror://gentoo/texlive-module-frcursive.doc-2017.tar.xz mirror://gentoo/texlive-module-frederika2016.doc-2017.tar.xz mirror://gentoo/texlive-module-genealogy.doc-2017.tar.xz mirror://gentoo/texlive-module-gentium-tug.doc-2017.tar.xz mirror://gentoo/texlive-module-gfsartemisia.doc-2017.tar.xz mirror://gentoo/texlive-module-gfsbodoni.doc-2017.tar.xz mirror://gentoo/texlive-module-gfscomplutum.doc-2017.tar.xz mirror://gentoo/texlive-module-gfsdidot.doc-2017.tar.xz mirror://gentoo/texlive-module-gfsneohellenic.doc-2017.tar.xz mirror://gentoo/texlive-module-gfssolomos.doc-2017.tar.xz mirror://gentoo/texlive-module-gillcm.doc-2017.tar.xz mirror://gentoo/texlive-module-gillius.doc-2017.tar.xz mirror://gentoo/texlive-module-gnu-freefont.doc-2017.tar.xz mirror://gentoo/texlive-module-gofonts.doc-2017.tar.xz mirror://gentoo/texlive-module-gothic.doc-2017.tar.xz mirror://gentoo/texlive-module-greenpoint.doc-2017.tar.xz mirror://gentoo/texlive-module-grotesq.doc-2017.tar.xz mirror://gentoo/texlive-module-hacm.doc-2017.tar.xz mirror://gentoo/texlive-module-heuristica.doc-2017.tar.xz mirror://gentoo/texlive-module-hfbright.doc-2017.tar.xz mirror://gentoo/texlive-module-hfoldsty.doc-2017.tar.xz mirror://gentoo/texlive-module-ifsym.doc-2017.tar.xz mirror://gentoo/texlive-module-imfellenglish.doc-2017.tar.xz mirror://gentoo/texlive-module-inconsolata.doc-2017.tar.xz mirror://gentoo/texlive-module-initials.doc-2017.tar.xz mirror://gentoo/texlive-module-ipaex-type1.doc-2017.tar.xz mirror://gentoo/texlive-module-iwona.doc-2017.tar.xz mirror://gentoo/texlive-module-jablantile.doc-2017.tar.xz mirror://gentoo/texlive-module-jamtimes.doc-2017.tar.xz mirror://gentoo/texlive-module-junicode.doc-2017.tar.xz mirror://gentoo/texlive-module-kixfont.doc-2017.tar.xz mirror://gentoo/texlive-module-kpfonts.doc-2017.tar.xz mirror://gentoo/texlive-module-kurier.doc-2017.tar.xz mirror://gentoo/texlive-module-lato.doc-2017.tar.xz mirror://gentoo/texlive-module-lfb.doc-2017.tar.xz mirror://gentoo/texlive-module-libertine.doc-2017.tar.xz mirror://gentoo/texlive-module-libertinegc.doc-2017.tar.xz mirror://gentoo/texlive-module-libertinus.doc-2017.tar.xz mirror://gentoo/texlive-module-libertinust1math.doc-2017.tar.xz mirror://gentoo/texlive-module-librebaskerville.doc-2017.tar.xz mirror://gentoo/texlive-module-librebodoni.doc-2017.tar.xz mirror://gentoo/texlive-module-librecaslon.doc-2017.tar.xz mirror://gentoo/texlive-module-libris.doc-2017.tar.xz mirror://gentoo/texlive-module-linearA.doc-2017.tar.xz mirror://gentoo/texlive-module-lobster2.doc-2017.tar.xz mirror://gentoo/texlive-module-lxfonts.doc-2017.tar.xz mirror://gentoo/texlive-module-ly1.doc-2017.tar.xz mirror://gentoo/texlive-module-mathabx.doc-2017.tar.xz mirror://gentoo/texlive-module-mathabx-type1.doc-2017.tar.xz mirror://gentoo/texlive-module-mathdesign.doc-2017.tar.xz mirror://gentoo/texlive-module-mdputu.doc-2017.tar.xz mirror://gentoo/texlive-module-mdsymbol.doc-2017.tar.xz mirror://gentoo/texlive-module-merriweather.doc-2017.tar.xz mirror://gentoo/texlive-module-miama.doc-2017.tar.xz mirror://gentoo/texlive-module-mintspirit.doc-2017.tar.xz mirror://gentoo/texlive-module-missaali.doc-2017.tar.xz mirror://gentoo/texlive-module-mnsymbol.doc-2017.tar.xz mirror://gentoo/texlive-module-montserrat.doc-2017.tar.xz mirror://gentoo/texlive-module-mweights.doc-2017.tar.xz mirror://gentoo/texlive-module-newpx.doc-2017.tar.xz mirror://gentoo/texlive-module-newtx.doc-2017.tar.xz mirror://gentoo/texlive-module-newtxsf.doc-2017.tar.xz mirror://gentoo/texlive-module-newtxtt.doc-2017.tar.xz mirror://gentoo/texlive-module-nimbus15.doc-2017.tar.xz mirror://gentoo/texlive-module-nkarta.doc-2017.tar.xz mirror://gentoo/texlive-module-noto.doc-2017.tar.xz mirror://gentoo/texlive-module-obnov.doc-2017.tar.xz mirror://gentoo/texlive-module-ocherokee.doc-2017.tar.xz mirror://gentoo/texlive-module-ocr-b.doc-2017.tar.xz mirror://gentoo/texlive-module-ocr-b-outline.doc-2017.tar.xz mirror://gentoo/texlive-module-ogham.doc-2017.tar.xz mirror://gentoo/texlive-module-oinuit.doc-2017.tar.xz mirror://gentoo/texlive-module-old-arrows.doc-2017.tar.xz mirror://gentoo/texlive-module-oldlatin.doc-2017.tar.xz mirror://gentoo/texlive-module-oldstandard.doc-2017.tar.xz mirror://gentoo/texlive-module-opensans.doc-2017.tar.xz mirror://gentoo/texlive-module-orkhun.doc-2017.tar.xz mirror://gentoo/texlive-module-overlock.doc-2017.tar.xz mirror://gentoo/texlive-module-pacioli.doc-2017.tar.xz mirror://gentoo/texlive-module-paratype.doc-2017.tar.xz mirror://gentoo/texlive-module-phaistos.doc-2017.tar.xz mirror://gentoo/texlive-module-phonetic.doc-2017.tar.xz mirror://gentoo/texlive-module-pigpen.doc-2017.tar.xz mirror://gentoo/texlive-module-playfair.doc-2017.tar.xz mirror://gentoo/texlive-module-poltawski.doc-2017.tar.xz mirror://gentoo/texlive-module-prodint.doc-2017.tar.xz mirror://gentoo/texlive-module-punk.doc-2017.tar.xz mirror://gentoo/texlive-module-punk-latex.doc-2017.tar.xz mirror://gentoo/texlive-module-punknova.doc-2017.tar.xz mirror://gentoo/texlive-module-pxtxalfa.doc-2017.tar.xz mirror://gentoo/texlive-module-quattrocento.doc-2017.tar.xz mirror://gentoo/texlive-module-raleway.doc-2017.tar.xz mirror://gentoo/texlive-module-recycle.doc-2017.tar.xz mirror://gentoo/texlive-module-roboto.doc-2017.tar.xz mirror://gentoo/texlive-module-romande.doc-2017.tar.xz mirror://gentoo/texlive-module-rosario.doc-2017.tar.xz mirror://gentoo/texlive-module-rsfso.doc-2017.tar.xz mirror://gentoo/texlive-module-sansmathaccent.doc-2017.tar.xz mirror://gentoo/texlive-module-sansmathfonts.doc-2017.tar.xz mirror://gentoo/texlive-module-sauterfonts.doc-2017.tar.xz mirror://gentoo/texlive-module-schulschriften.doc-2017.tar.xz mirror://gentoo/texlive-module-semaphor.doc-2017.tar.xz mirror://gentoo/texlive-module-sourcecodepro.doc-2017.tar.xz mirror://gentoo/texlive-module-sourcesanspro.doc-2017.tar.xz mirror://gentoo/texlive-module-sourceserifpro.doc-2017.tar.xz mirror://gentoo/texlive-module-starfont.doc-2017.tar.xz mirror://gentoo/texlive-module-staves.doc-2017.tar.xz mirror://gentoo/texlive-module-stix.doc-2017.tar.xz mirror://gentoo/texlive-module-superiors.doc-2017.tar.xz mirror://gentoo/texlive-module-svrsymbols.doc-2017.tar.xz mirror://gentoo/texlive-module-tapir.doc-2017.tar.xz mirror://gentoo/texlive-module-tempora.doc-2017.tar.xz mirror://gentoo/texlive-module-tengwarscript.doc-2017.tar.xz mirror://gentoo/texlive-module-tfrupee.doc-2017.tar.xz mirror://gentoo/texlive-module-tinos.doc-2017.tar.xz mirror://gentoo/texlive-module-tpslifonts.doc-2017.tar.xz mirror://gentoo/texlive-module-trajan.doc-2017.tar.xz mirror://gentoo/texlive-module-txfontsb.doc-2017.tar.xz mirror://gentoo/texlive-module-txuprcal.doc-2017.tar.xz mirror://gentoo/texlive-module-typicons.doc-2017.tar.xz mirror://gentoo/texlive-module-universa.doc-2017.tar.xz mirror://gentoo/texlive-module-universalis.doc-2017.tar.xz mirror://gentoo/texlive-module-uppunctlm.doc-2017.tar.xz mirror://gentoo/texlive-module-urwchancal.doc-2017.tar.xz mirror://gentoo/texlive-module-venturisadf.doc-2017.tar.xz mirror://gentoo/texlive-module-wsuipa.doc-2017.tar.xz mirror://gentoo/texlive-module-xcharter.doc-2017.tar.xz mirror://gentoo/texlive-module-xits.doc-2017.tar.xz mirror://gentoo/texlive-module-yfonts.doc-2017.tar.xz mirror://gentoo/texlive-module-yfonts-t1.doc-2017.tar.xz mirror://gentoo/texlive-module-yinit-otf.doc-2017.tar.xz mirror://gentoo/texlive-module-zlmtt.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-allrunes.source-2017.tar.xz mirror://gentoo/texlive-module-anonymouspro.source-2017.tar.xz mirror://gentoo/texlive-module-archaic.source-2017.tar.xz mirror://gentoo/texlive-module-arev.source-2017.tar.xz mirror://gentoo/texlive-module-asapsym.source-2017.tar.xz mirror://gentoo/texlive-module-ascii-font.source-2017.tar.xz mirror://gentoo/texlive-module-auncial-new.source-2017.tar.xz mirror://gentoo/texlive-module-b1encoding.source-2017.tar.xz mirror://gentoo/texlive-module-barcodes.source-2017.tar.xz mirror://gentoo/texlive-module-baskervald.source-2017.tar.xz mirror://gentoo/texlive-module-bbding.source-2017.tar.xz mirror://gentoo/texlive-module-bbm-macros.source-2017.tar.xz mirror://gentoo/texlive-module-bbold.source-2017.tar.xz mirror://gentoo/texlive-module-belleek.source-2017.tar.xz mirror://gentoo/texlive-module-bguq.source-2017.tar.xz mirror://gentoo/texlive-module-blacklettert1.source-2017.tar.xz mirror://gentoo/texlive-module-bookhands.source-2017.tar.xz mirror://gentoo/texlive-module-cantarell.source-2017.tar.xz mirror://gentoo/texlive-module-ccicons.source-2017.tar.xz mirror://gentoo/texlive-module-cfr-lm.source-2017.tar.xz mirror://gentoo/texlive-module-chivo.source-2017.tar.xz mirror://gentoo/texlive-module-cmbright.source-2017.tar.xz mirror://gentoo/texlive-module-cmll.source-2017.tar.xz mirror://gentoo/texlive-module-comfortaa.source-2017.tar.xz mirror://gentoo/texlive-module-cookingsymbols.source-2017.tar.xz mirror://gentoo/texlive-module-dingbat.source-2017.tar.xz mirror://gentoo/texlive-module-dozenal.source-2017.tar.xz mirror://gentoo/texlive-module-drm.source-2017.tar.xz mirror://gentoo/texlive-module-droid.source-2017.tar.xz mirror://gentoo/texlive-module-eco.source-2017.tar.xz mirror://gentoo/texlive-module-eiad-ltx.source-2017.tar.xz mirror://gentoo/texlive-module-electrum.source-2017.tar.xz mirror://gentoo/texlive-module-epsdice.source-2017.tar.xz mirror://gentoo/texlive-module-esrelation.source-2017.tar.xz mirror://gentoo/texlive-module-esvect.source-2017.tar.xz mirror://gentoo/texlive-module-eulervm.source-2017.tar.xz mirror://gentoo/texlive-module-fdsymbol.source-2017.tar.xz mirror://gentoo/texlive-module-fetamont.source-2017.tar.xz mirror://gentoo/texlive-module-feyn.source-2017.tar.xz mirror://gentoo/texlive-module-fge.source-2017.tar.xz mirror://gentoo/texlive-module-fourier.source-2017.tar.xz mirror://gentoo/texlive-module-gentium-tug.source-2017.tar.xz mirror://gentoo/texlive-module-gnu-freefont.source-2017.tar.xz mirror://gentoo/texlive-module-gothic.source-2017.tar.xz mirror://gentoo/texlive-module-hfoldsty.source-2017.tar.xz mirror://gentoo/texlive-module-lato.source-2017.tar.xz mirror://gentoo/texlive-module-libris.source-2017.tar.xz mirror://gentoo/texlive-module-linearA.source-2017.tar.xz mirror://gentoo/texlive-module-lxfonts.source-2017.tar.xz mirror://gentoo/texlive-module-mdsymbol.source-2017.tar.xz mirror://gentoo/texlive-module-miama.source-2017.tar.xz mirror://gentoo/texlive-module-mnsymbol.source-2017.tar.xz mirror://gentoo/texlive-module-nkarta.source-2017.tar.xz mirror://gentoo/texlive-module-ocr-b-outline.source-2017.tar.xz mirror://gentoo/texlive-module-oinuit.source-2017.tar.xz mirror://gentoo/texlive-module-opensans.source-2017.tar.xz mirror://gentoo/texlive-module-pacioli.source-2017.tar.xz mirror://gentoo/texlive-module-phaistos.source-2017.tar.xz mirror://gentoo/texlive-module-romande.source-2017.tar.xz mirror://gentoo/texlive-module-rosario.source-2017.tar.xz mirror://gentoo/texlive-module-sauterfonts.source-2017.tar.xz mirror://gentoo/texlive-module-skull.source-2017.tar.xz mirror://gentoo/texlive-module-staves.source-2017.tar.xz mirror://gentoo/texlive-module-stix.source-2017.tar.xz mirror://gentoo/texlive-module-svrsymbols.source-2017.tar.xz mirror://gentoo/texlive-module-tengwarscript.source-2017.tar.xz mirror://gentoo/texlive-module-tfrupee.source-2017.tar.xz mirror://gentoo/texlive-module-tpslifonts.source-2017.tar.xz mirror://gentoo/texlive-module-trajan.source-2017.tar.xz mirror://gentoo/texlive-module-txfontsb.source-2017.tar.xz mirror://gentoo/texlive-module-universa.source-2017.tar.xz mirror://gentoo/texlive-module-venturisadf.source-2017.tar.xz mirror://gentoo/texlive-module-xits.source-2017.tar.xz mirror://gentoo/texlive-module-yfonts.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=955a13f2f7f147be00691424b277c44a
+_md5_=e862c045f543e3f8c3d6bf278050c249
diff --git a/metadata/md5-cache/dev-texlive/texlive-fontsrecommended-2017 b/metadata/md5-cache/dev-texlive/texlive-fontsrecommended-2017
index 2b93a0e4e839..47a55b2a7427 100644
--- a/metadata/md5-cache/dev-texlive/texlive-fontsrecommended-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-fontsrecommended-2017
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive Recommended fonts
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-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 ~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 ~x64-solaris ~x86-solaris
 LICENSE=BSD GPL-1 GPL-2 LPPL-1.3 OFL public-domain TeX TeX-other-free
 RDEPEND=>=dev-texlive/texlive-basic-2017 !=dev-texlive/texlive-basic-2007* !<dev-texlive/texlive-fontsextra-2010 !<dev-texlive/texlive-latexrecommended-2014 >=app-text/texlive-core-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-avantgar-2017.tar.xz mirror://gentoo/texlive-module-bookman-2017.tar.xz mirror://gentoo/texlive-module-charter-2017.tar.xz mirror://gentoo/texlive-module-cm-super-2017.tar.xz mirror://gentoo/texlive-module-cmextra-2017.tar.xz mirror://gentoo/texlive-module-courier-2017.tar.xz mirror://gentoo/texlive-module-ec-2017.tar.xz mirror://gentoo/texlive-module-euro-2017.tar.xz mirror://gentoo/texlive-module-euro-ce-2017.tar.xz mirror://gentoo/texlive-module-eurosym-2017.tar.xz mirror://gentoo/texlive-module-fpl-2017.tar.xz mirror://gentoo/texlive-module-helvetic-2017.tar.xz mirror://gentoo/texlive-module-lm-2017.tar.xz mirror://gentoo/texlive-module-lm-math-2017.tar.xz mirror://gentoo/texlive-module-marvosym-2017.tar.xz mirror://gentoo/texlive-module-mathpazo-2017.tar.xz mirror://gentoo/texlive-module-manfnt-font-2017.tar.xz mirror://gentoo/texlive-module-mflogo-font-2017.tar.xz mirror://gentoo/texlive-module-ncntrsbk-2017.tar.xz mirror://gentoo/texlive-module-palatino-2017.tar.xz mirror://gentoo/texlive-module-pxfonts-2017.tar.xz mirror://gentoo/texlive-module-rsfs-2017.tar.xz mirror://gentoo/texlive-module-symbol-2017.tar.xz mirror://gentoo/texlive-module-tex-gyre-2017.tar.xz mirror://gentoo/texlive-module-tex-gyre-math-2017.tar.xz mirror://gentoo/texlive-module-times-2017.tar.xz mirror://gentoo/texlive-module-tipa-2017.tar.xz mirror://gentoo/texlive-module-txfonts-2017.tar.xz mirror://gentoo/texlive-module-utopia-2017.tar.xz mirror://gentoo/texlive-module-wasy-2017.tar.xz mirror://gentoo/texlive-module-wasy2-ps-2017.tar.xz mirror://gentoo/texlive-module-wasysym-2017.tar.xz mirror://gentoo/texlive-module-zapfchan-2017.tar.xz mirror://gentoo/texlive-module-zapfding-2017.tar.xz mirror://gentoo/texlive-module-collection-fontsrecommended-2017.tar.xz doc? ( mirror://gentoo/texlive-module-charter.doc-2017.tar.xz mirror://gentoo/texlive-module-cm-super.doc-2017.tar.xz mirror://gentoo/texlive-module-ec.doc-2017.tar.xz mirror://gentoo/texlive-module-euro.doc-2017.tar.xz mirror://gentoo/texlive-module-euro-ce.doc-2017.tar.xz mirror://gentoo/texlive-module-eurosym.doc-2017.tar.xz mirror://gentoo/texlive-module-fpl.doc-2017.tar.xz mirror://gentoo/texlive-module-lm.doc-2017.tar.xz mirror://gentoo/texlive-module-lm-math.doc-2017.tar.xz mirror://gentoo/texlive-module-marvosym.doc-2017.tar.xz mirror://gentoo/texlive-module-mathpazo.doc-2017.tar.xz mirror://gentoo/texlive-module-mflogo-font.doc-2017.tar.xz mirror://gentoo/texlive-module-pxfonts.doc-2017.tar.xz mirror://gentoo/texlive-module-rsfs.doc-2017.tar.xz mirror://gentoo/texlive-module-tex-gyre.doc-2017.tar.xz mirror://gentoo/texlive-module-tex-gyre-math.doc-2017.tar.xz mirror://gentoo/texlive-module-tipa.doc-2017.tar.xz mirror://gentoo/texlive-module-txfonts.doc-2017.tar.xz mirror://gentoo/texlive-module-utopia.doc-2017.tar.xz mirror://gentoo/texlive-module-wasy.doc-2017.tar.xz mirror://gentoo/texlive-module-wasy2-ps.doc-2017.tar.xz mirror://gentoo/texlive-module-wasysym.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-euro.source-2017.tar.xz mirror://gentoo/texlive-module-fpl.source-2017.tar.xz mirror://gentoo/texlive-module-lm.source-2017.tar.xz mirror://gentoo/texlive-module-marvosym.source-2017.tar.xz mirror://gentoo/texlive-module-mathpazo.source-2017.tar.xz mirror://gentoo/texlive-module-tex-gyre-math.source-2017.tar.xz mirror://gentoo/texlive-module-wasysym.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b8e0a16c872ec3340b3d9a018b52d3a0
+_md5_=491100923eee89a5555735c762eb5b15
diff --git a/metadata/md5-cache/dev-texlive/texlive-fontutils-2017 b/metadata/md5-cache/dev-texlive/texlive-fontutils-2017
index b16427d3bf79..769c96a7549a 100644
--- a/metadata/md5-cache/dev-texlive/texlive-fontutils-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-fontutils-2017
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive Graphics and font utilities
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-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 ~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 ~x64-solaris ~x86-solaris
 LICENSE=Artistic GPL-1 GPL-2 LPPL-1.3 public-domain TeX-other-free
 RDEPEND=>=dev-texlive/texlive-basic-2017 !dev-texlive/texlive-psutils !<dev-texlive/texlive-fontsextra-2009 !<app-text/texlive-core-2013 >=app-text/texlive-core-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-accfonts-2017.tar.xz mirror://gentoo/texlive-module-afm2pl-2017.tar.xz mirror://gentoo/texlive-module-dosepsbin-2017.tar.xz mirror://gentoo/texlive-module-epstopdf-2017.tar.xz mirror://gentoo/texlive-module-fontware-2017.tar.xz mirror://gentoo/texlive-module-lcdftypetools-2017.tar.xz mirror://gentoo/texlive-module-metatype1-2017.tar.xz mirror://gentoo/texlive-module-ps2pk-2017.tar.xz mirror://gentoo/texlive-module-pstools-2017.tar.xz mirror://gentoo/texlive-module-psutils-2017.tar.xz mirror://gentoo/texlive-module-dvipsconfig-2017.tar.xz mirror://gentoo/texlive-module-fontinst-2017.tar.xz mirror://gentoo/texlive-module-fontools-2017.tar.xz mirror://gentoo/texlive-module-mf2pt1-2017.tar.xz mirror://gentoo/texlive-module-t1utils-2017.tar.xz mirror://gentoo/texlive-module-collection-fontutils-2017.tar.xz doc? ( mirror://gentoo/texlive-module-accfonts.doc-2017.tar.xz mirror://gentoo/texlive-module-afm2pl.doc-2017.tar.xz mirror://gentoo/texlive-module-dosepsbin.doc-2017.tar.xz mirror://gentoo/texlive-module-epstopdf.doc-2017.tar.xz mirror://gentoo/texlive-module-fontware.doc-2017.tar.xz mirror://gentoo/texlive-module-lcdftypetools.doc-2017.tar.xz mirror://gentoo/texlive-module-ps2pk.doc-2017.tar.xz mirror://gentoo/texlive-module-pstools.doc-2017.tar.xz mirror://gentoo/texlive-module-psutils.doc-2017.tar.xz mirror://gentoo/texlive-module-fontinst.doc-2017.tar.xz mirror://gentoo/texlive-module-fontools.doc-2017.tar.xz mirror://gentoo/texlive-module-mf2pt1.doc-2017.tar.xz mirror://gentoo/texlive-module-t1utils.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-dosepsbin.source-2017.tar.xz mirror://gentoo/texlive-module-metatype1.source-2017.tar.xz mirror://gentoo/texlive-module-fontinst.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=93d3aa7a2c1df0ed854478df7de718e3
+_md5_=e3273e6349f1b3dea93c2f5f18c0e6f7
diff --git a/metadata/md5-cache/dev-texlive/texlive-formatsextra-2017 b/metadata/md5-cache/dev-texlive/texlive-formatsextra-2017
index 74147ed669c3..d513a7b7db95 100644
--- a/metadata/md5-cache/dev-texlive/texlive-formatsextra-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-formatsextra-2017
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive Additional formats
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-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 ~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 ~x64-solaris ~x86-solaris
 LICENSE=GPL-1 GPL-2 GPL-3 LPPL-1.3 public-domain TeX
 RDEPEND=>=dev-texlive/texlive-basic-2017 >=dev-texlive/texlive-latex-2017 >=dev-texlive/texlive-latex-2008 dev-texlive/texlive-xetex !<dev-texlive/texlive-fontsextra-2009 !dev-texlive/texlive-langtibetan !<dev-texlive/texlive-basic-2014 !dev-texlive/texlive-omega >=app-text/texlive-core-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-edmac-2017.tar.xz mirror://gentoo/texlive-module-eplain-2017.tar.xz mirror://gentoo/texlive-module-lollipop-2017.tar.xz mirror://gentoo/texlive-module-mltex-2017.tar.xz mirror://gentoo/texlive-module-psizzl-2017.tar.xz mirror://gentoo/texlive-module-startex-2017.tar.xz mirror://gentoo/texlive-module-texsis-2017.tar.xz mirror://gentoo/texlive-module-xmltexconfig-2017.tar.xz mirror://gentoo/texlive-module-aleph-2017.tar.xz mirror://gentoo/texlive-module-antomega-2017.tar.xz mirror://gentoo/texlive-module-lambda-2017.tar.xz mirror://gentoo/texlive-module-mxedruli-2017.tar.xz mirror://gentoo/texlive-module-omega-2017.tar.xz mirror://gentoo/texlive-module-omegaware-2017.tar.xz mirror://gentoo/texlive-module-otibet-2017.tar.xz mirror://gentoo/texlive-module-collection-formatsextra-2017.tar.xz doc? ( mirror://gentoo/texlive-module-edmac.doc-2017.tar.xz mirror://gentoo/texlive-module-eplain.doc-2017.tar.xz mirror://gentoo/texlive-module-lollipop.doc-2017.tar.xz mirror://gentoo/texlive-module-mltex.doc-2017.tar.xz mirror://gentoo/texlive-module-psizzl.doc-2017.tar.xz mirror://gentoo/texlive-module-startex.doc-2017.tar.xz mirror://gentoo/texlive-module-texsis.doc-2017.tar.xz mirror://gentoo/texlive-module-aleph.doc-2017.tar.xz mirror://gentoo/texlive-module-antomega.doc-2017.tar.xz mirror://gentoo/texlive-module-mxedruli.doc-2017.tar.xz mirror://gentoo/texlive-module-omega.doc-2017.tar.xz mirror://gentoo/texlive-module-omegaware.doc-2017.tar.xz mirror://gentoo/texlive-module-otibet.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-edmac.source-2017.tar.xz mirror://gentoo/texlive-module-eplain.source-2017.tar.xz mirror://gentoo/texlive-module-psizzl.source-2017.tar.xz mirror://gentoo/texlive-module-startex.source-2017.tar.xz mirror://gentoo/texlive-module-antomega.source-2017.tar.xz mirror://gentoo/texlive-module-otibet.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0e84e85d489bd0ec2385bf6073d975e8
+_md5_=7d815242f2988b5941ae068de6c84dbe
diff --git a/metadata/md5-cache/dev-texlive/texlive-games-2017 b/metadata/md5-cache/dev-texlive/texlive-games-2017
index 093973b2f113..387d69a9860e 100644
--- a/metadata/md5-cache/dev-texlive/texlive-games-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-games-2017
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive Games typesetting
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-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 ~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 ~x64-solaris ~x86-solaris
 LICENSE=GPL-1 GPL-2 LPPL-1.2 LPPL-1.3 public-domain TeX-other-free
 RDEPEND=>=dev-texlive/texlive-latex-2017 !<dev-texlive/texlive-latexextra-2009 >=app-text/texlive-core-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-bartel-chess-fonts-2017.tar.xz mirror://gentoo/texlive-module-chess-2017.tar.xz mirror://gentoo/texlive-module-chess-problem-diagrams-2017.tar.xz mirror://gentoo/texlive-module-chessboard-2017.tar.xz mirror://gentoo/texlive-module-chessfss-2017.tar.xz mirror://gentoo/texlive-module-crossword-2017.tar.xz mirror://gentoo/texlive-module-crosswrd-2017.tar.xz mirror://gentoo/texlive-module-egameps-2017.tar.xz mirror://gentoo/texlive-module-gamebook-2017.tar.xz mirror://gentoo/texlive-module-go-2017.tar.xz mirror://gentoo/texlive-module-hanoi-2017.tar.xz mirror://gentoo/texlive-module-havannah-2017.tar.xz mirror://gentoo/texlive-module-hexgame-2017.tar.xz mirror://gentoo/texlive-module-horoscop-2017.tar.xz mirror://gentoo/texlive-module-labyrinth-2017.tar.xz mirror://gentoo/texlive-module-logicpuzzle-2017.tar.xz mirror://gentoo/texlive-module-othello-2017.tar.xz mirror://gentoo/texlive-module-othelloboard-2017.tar.xz mirror://gentoo/texlive-module-pas-crosswords-2017.tar.xz mirror://gentoo/texlive-module-psgo-2017.tar.xz mirror://gentoo/texlive-module-reverxii-2017.tar.xz mirror://gentoo/texlive-module-rubik-2017.tar.xz mirror://gentoo/texlive-module-schwalbe-chess-2017.tar.xz mirror://gentoo/texlive-module-sgame-2017.tar.xz mirror://gentoo/texlive-module-skak-2017.tar.xz mirror://gentoo/texlive-module-skaknew-2017.tar.xz mirror://gentoo/texlive-module-soup-2017.tar.xz mirror://gentoo/texlive-module-sudoku-2017.tar.xz mirror://gentoo/texlive-module-sudokubundle-2017.tar.xz mirror://gentoo/texlive-module-xq-2017.tar.xz mirror://gentoo/texlive-module-xskak-2017.tar.xz mirror://gentoo/texlive-module-collection-games-2017.tar.xz doc? ( mirror://gentoo/texlive-module-bartel-chess-fonts.doc-2017.tar.xz mirror://gentoo/texlive-module-chess.doc-2017.tar.xz mirror://gentoo/texlive-module-chess-problem-diagrams.doc-2017.tar.xz mirror://gentoo/texlive-module-chessboard.doc-2017.tar.xz mirror://gentoo/texlive-module-chessfss.doc-2017.tar.xz mirror://gentoo/texlive-module-crossword.doc-2017.tar.xz mirror://gentoo/texlive-module-crosswrd.doc-2017.tar.xz mirror://gentoo/texlive-module-egameps.doc-2017.tar.xz mirror://gentoo/texlive-module-gamebook.doc-2017.tar.xz mirror://gentoo/texlive-module-go.doc-2017.tar.xz mirror://gentoo/texlive-module-havannah.doc-2017.tar.xz mirror://gentoo/texlive-module-hexgame.doc-2017.tar.xz mirror://gentoo/texlive-module-horoscop.doc-2017.tar.xz mirror://gentoo/texlive-module-labyrinth.doc-2017.tar.xz mirror://gentoo/texlive-module-logicpuzzle.doc-2017.tar.xz mirror://gentoo/texlive-module-othello.doc-2017.tar.xz mirror://gentoo/texlive-module-othelloboard.doc-2017.tar.xz mirror://gentoo/texlive-module-pas-crosswords.doc-2017.tar.xz mirror://gentoo/texlive-module-psgo.doc-2017.tar.xz mirror://gentoo/texlive-module-reverxii.doc-2017.tar.xz mirror://gentoo/texlive-module-rubik.doc-2017.tar.xz mirror://gentoo/texlive-module-schwalbe-chess.doc-2017.tar.xz mirror://gentoo/texlive-module-sgame.doc-2017.tar.xz mirror://gentoo/texlive-module-skak.doc-2017.tar.xz mirror://gentoo/texlive-module-skaknew.doc-2017.tar.xz mirror://gentoo/texlive-module-soup.doc-2017.tar.xz mirror://gentoo/texlive-module-sudoku.doc-2017.tar.xz mirror://gentoo/texlive-module-sudokubundle.doc-2017.tar.xz mirror://gentoo/texlive-module-xq.doc-2017.tar.xz mirror://gentoo/texlive-module-xskak.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-chess-problem-diagrams.source-2017.tar.xz mirror://gentoo/texlive-module-chessboard.source-2017.tar.xz mirror://gentoo/texlive-module-chessfss.source-2017.tar.xz mirror://gentoo/texlive-module-crossword.source-2017.tar.xz mirror://gentoo/texlive-module-crosswrd.source-2017.tar.xz mirror://gentoo/texlive-module-gamebook.source-2017.tar.xz mirror://gentoo/texlive-module-go.source-2017.tar.xz mirror://gentoo/texlive-module-havannah.source-2017.tar.xz mirror://gentoo/texlive-module-horoscop.source-2017.tar.xz mirror://gentoo/texlive-module-rubik.source-2017.tar.xz mirror://gentoo/texlive-module-schwalbe-chess.source-2017.tar.xz mirror://gentoo/texlive-module-soup.source-2017.tar.xz mirror://gentoo/texlive-module-sudoku.source-2017.tar.xz mirror://gentoo/texlive-module-sudokubundle.source-2017.tar.xz mirror://gentoo/texlive-module-xskak.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=89a2d90d6f58a9ecb8258c57a06a2cdd
+_md5_=f2f86850f214b8f0d833fe7e2c6dd859
diff --git a/metadata/md5-cache/dev-texlive/texlive-humanities-2017 b/metadata/md5-cache/dev-texlive/texlive-humanities-2017
index 494bc4c964e8..70752c62f9da 100644
--- a/metadata/md5-cache/dev-texlive/texlive-humanities-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-humanities-2017
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive Humanities packages
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-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 ~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 ~x64-solaris ~x86-solaris
 LICENSE=GPL-1 GPL-2 LPPL-1.2 LPPL-1.3
 RDEPEND=>=dev-texlive/texlive-latex-2017 !dev-tex/lineno >=app-text/texlive-core-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-adtrees-2017.tar.xz mirror://gentoo/texlive-module-bibleref-2017.tar.xz mirror://gentoo/texlive-module-bibleref-lds-2017.tar.xz mirror://gentoo/texlive-module-bibleref-mouth-2017.tar.xz mirror://gentoo/texlive-module-bibleref-parse-2017.tar.xz mirror://gentoo/texlive-module-covington-2017.tar.xz mirror://gentoo/texlive-module-diadia-2017.tar.xz mirror://gentoo/texlive-module-dramatist-2017.tar.xz mirror://gentoo/texlive-module-dvgloss-2017.tar.xz mirror://gentoo/texlive-module-ecltree-2017.tar.xz mirror://gentoo/texlive-module-edfnotes-2017.tar.xz mirror://gentoo/texlive-module-ednotes-2017.tar.xz mirror://gentoo/texlive-module-eledform-2017.tar.xz mirror://gentoo/texlive-module-eledmac-2017.tar.xz mirror://gentoo/texlive-module-expex-2017.tar.xz mirror://gentoo/texlive-module-gb4e-2017.tar.xz mirror://gentoo/texlive-module-gmverse-2017.tar.xz mirror://gentoo/texlive-module-jura-2017.tar.xz mirror://gentoo/texlive-module-juraabbrev-2017.tar.xz mirror://gentoo/texlive-module-juramisc-2017.tar.xz mirror://gentoo/texlive-module-jurarsp-2017.tar.xz mirror://gentoo/texlive-module-ledmac-2017.tar.xz mirror://gentoo/texlive-module-leipzig-2017.tar.xz mirror://gentoo/texlive-module-lexikon-2017.tar.xz mirror://gentoo/texlive-module-lexref-2017.tar.xz mirror://gentoo/texlive-module-ling-macros-2017.tar.xz mirror://gentoo/texlive-module-linguex-2017.tar.xz mirror://gentoo/texlive-module-liturg-2017.tar.xz mirror://gentoo/texlive-module-metrix-2017.tar.xz mirror://gentoo/texlive-module-parallel-2017.tar.xz mirror://gentoo/texlive-module-parrun-2017.tar.xz mirror://gentoo/texlive-module-phonrule-2017.tar.xz mirror://gentoo/texlive-module-plari-2017.tar.xz mirror://gentoo/texlive-module-play-2017.tar.xz mirror://gentoo/texlive-module-poemscol-2017.tar.xz mirror://gentoo/texlive-module-poetrytex-2017.tar.xz mirror://gentoo/texlive-module-qobitree-2017.tar.xz mirror://gentoo/texlive-module-qtree-2017.tar.xz mirror://gentoo/texlive-module-reledmac-2017.tar.xz mirror://gentoo/texlive-module-rrgtrees-2017.tar.xz mirror://gentoo/texlive-module-rtklage-2017.tar.xz mirror://gentoo/texlive-module-screenplay-2017.tar.xz mirror://gentoo/texlive-module-screenplay-pkg-2017.tar.xz mirror://gentoo/texlive-module-sides-2017.tar.xz mirror://gentoo/texlive-module-stage-2017.tar.xz mirror://gentoo/texlive-module-textglos-2017.tar.xz mirror://gentoo/texlive-module-thalie-2017.tar.xz mirror://gentoo/texlive-module-tree-dvips-2017.tar.xz mirror://gentoo/texlive-module-verse-2017.tar.xz mirror://gentoo/texlive-module-xyling-2017.tar.xz mirror://gentoo/texlive-module-collection-humanities-2017.tar.xz doc? ( mirror://gentoo/texlive-module-adtrees.doc-2017.tar.xz mirror://gentoo/texlive-module-bibleref.doc-2017.tar.xz mirror://gentoo/texlive-module-bibleref-lds.doc-2017.tar.xz mirror://gentoo/texlive-module-bibleref-mouth.doc-2017.tar.xz mirror://gentoo/texlive-module-bibleref-parse.doc-2017.tar.xz mirror://gentoo/texlive-module-covington.doc-2017.tar.xz mirror://gentoo/texlive-module-diadia.doc-2017.tar.xz mirror://gentoo/texlive-module-dramatist.doc-2017.tar.xz mirror://gentoo/texlive-module-dvgloss.doc-2017.tar.xz mirror://gentoo/texlive-module-ecltree.doc-2017.tar.xz mirror://gentoo/texlive-module-edfnotes.doc-2017.tar.xz mirror://gentoo/texlive-module-ednotes.doc-2017.tar.xz mirror://gentoo/texlive-module-eledform.doc-2017.tar.xz mirror://gentoo/texlive-module-eledmac.doc-2017.tar.xz mirror://gentoo/texlive-module-expex.doc-2017.tar.xz mirror://gentoo/texlive-module-gb4e.doc-2017.tar.xz mirror://gentoo/texlive-module-gmverse.doc-2017.tar.xz mirror://gentoo/texlive-module-jura.doc-2017.tar.xz mirror://gentoo/texlive-module-juraabbrev.doc-2017.tar.xz mirror://gentoo/texlive-module-juramisc.doc-2017.tar.xz mirror://gentoo/texlive-module-jurarsp.doc-2017.tar.xz mirror://gentoo/texlive-module-ledmac.doc-2017.tar.xz mirror://gentoo/texlive-module-leipzig.doc-2017.tar.xz mirror://gentoo/texlive-module-lexikon.doc-2017.tar.xz mirror://gentoo/texlive-module-lexref.doc-2017.tar.xz mirror://gentoo/texlive-module-ling-macros.doc-2017.tar.xz mirror://gentoo/texlive-module-linguex.doc-2017.tar.xz mirror://gentoo/texlive-module-liturg.doc-2017.tar.xz mirror://gentoo/texlive-module-metrix.doc-2017.tar.xz mirror://gentoo/texlive-module-parallel.doc-2017.tar.xz mirror://gentoo/texlive-module-parrun.doc-2017.tar.xz mirror://gentoo/texlive-module-phonrule.doc-2017.tar.xz mirror://gentoo/texlive-module-plari.doc-2017.tar.xz mirror://gentoo/texlive-module-play.doc-2017.tar.xz mirror://gentoo/texlive-module-poemscol.doc-2017.tar.xz mirror://gentoo/texlive-module-poetrytex.doc-2017.tar.xz mirror://gentoo/texlive-module-qobitree.doc-2017.tar.xz mirror://gentoo/texlive-module-qtree.doc-2017.tar.xz mirror://gentoo/texlive-module-reledmac.doc-2017.tar.xz mirror://gentoo/texlive-module-rrgtrees.doc-2017.tar.xz mirror://gentoo/texlive-module-rtklage.doc-2017.tar.xz mirror://gentoo/texlive-module-screenplay.doc-2017.tar.xz mirror://gentoo/texlive-module-screenplay-pkg.doc-2017.tar.xz mirror://gentoo/texlive-module-sides.doc-2017.tar.xz mirror://gentoo/texlive-module-stage.doc-2017.tar.xz mirror://gentoo/texlive-module-textglos.doc-2017.tar.xz mirror://gentoo/texlive-module-thalie.doc-2017.tar.xz mirror://gentoo/texlive-module-tree-dvips.doc-2017.tar.xz mirror://gentoo/texlive-module-verse.doc-2017.tar.xz mirror://gentoo/texlive-module-xyling.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-bibleref.source-2017.tar.xz mirror://gentoo/texlive-module-bibleref-lds.source-2017.tar.xz mirror://gentoo/texlive-module-bibleref-mouth.source-2017.tar.xz mirror://gentoo/texlive-module-dramatist.source-2017.tar.xz mirror://gentoo/texlive-module-dvgloss.source-2017.tar.xz mirror://gentoo/texlive-module-edfnotes.source-2017.tar.xz mirror://gentoo/texlive-module-eledform.source-2017.tar.xz mirror://gentoo/texlive-module-eledmac.source-2017.tar.xz mirror://gentoo/texlive-module-jura.source-2017.tar.xz mirror://gentoo/texlive-module-juraabbrev.source-2017.tar.xz mirror://gentoo/texlive-module-jurarsp.source-2017.tar.xz mirror://gentoo/texlive-module-ledmac.source-2017.tar.xz mirror://gentoo/texlive-module-leipzig.source-2017.tar.xz mirror://gentoo/texlive-module-liturg.source-2017.tar.xz mirror://gentoo/texlive-module-metrix.source-2017.tar.xz mirror://gentoo/texlive-module-parallel.source-2017.tar.xz mirror://gentoo/texlive-module-parrun.source-2017.tar.xz mirror://gentoo/texlive-module-plari.source-2017.tar.xz mirror://gentoo/texlive-module-play.source-2017.tar.xz mirror://gentoo/texlive-module-poemscol.source-2017.tar.xz mirror://gentoo/texlive-module-poetrytex.source-2017.tar.xz mirror://gentoo/texlive-module-reledmac.source-2017.tar.xz mirror://gentoo/texlive-module-rrgtrees.source-2017.tar.xz mirror://gentoo/texlive-module-screenplay.source-2017.tar.xz mirror://gentoo/texlive-module-textglos.source-2017.tar.xz mirror://gentoo/texlive-module-thalie.source-2017.tar.xz mirror://gentoo/texlive-module-verse.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8cfc14c30d29d0e02efb959acc9b8191
+_md5_=5791528e9cbd9367f4c93fe57bae1451
diff --git a/metadata/md5-cache/dev-texlive/texlive-langarabic-2017 b/metadata/md5-cache/dev-texlive/texlive-langarabic-2017
index 24a57c8a1d51..98b3408ea0ba 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langarabic-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-langarabic-2017
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive Arabic
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-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 ~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 ~x64-solaris ~x86-solaris
 LICENSE=CC-BY-SA-4.0 GPL-2 GPL-3+ LPPL-1.3 LPPL-1.3c OFL public-domain
 RDEPEND=>=dev-texlive/texlive-basic-2017 !dev-texlive/texlive-langarab !<dev-texlive/texlive-xetex-2016 !<dev-texlive/texlive-publishers-2013 !dev-texlive/texlive-documentation-arabic !<dev-texlive/texlive-latexextra-2013 !<dev-texlive/texlive-basic-2016 >=app-text/texlive-core-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-amiri-2017.tar.xz mirror://gentoo/texlive-module-arabi-2017.tar.xz mirror://gentoo/texlive-module-arabi-add-2017.tar.xz mirror://gentoo/texlive-module-arabluatex-2017.tar.xz mirror://gentoo/texlive-module-arabtex-2017.tar.xz mirror://gentoo/texlive-module-bidi-2017.tar.xz mirror://gentoo/texlive-module-bidihl-2017.tar.xz mirror://gentoo/texlive-module-dad-2017.tar.xz mirror://gentoo/texlive-module-ghab-2017.tar.xz mirror://gentoo/texlive-module-hyphen-arabic-2017.tar.xz mirror://gentoo/texlive-module-hyphen-farsi-2017.tar.xz mirror://gentoo/texlive-module-imsproc-2017.tar.xz mirror://gentoo/texlive-module-lshort-persian-2017.tar.xz mirror://gentoo/texlive-module-persian-bib-2017.tar.xz mirror://gentoo/texlive-module-simurgh-2017.tar.xz mirror://gentoo/texlive-module-tram-2017.tar.xz mirror://gentoo/texlive-module-xepersian-2017.tar.xz mirror://gentoo/texlive-module-collection-langarabic-2017.tar.xz doc? ( mirror://gentoo/texlive-module-amiri.doc-2017.tar.xz mirror://gentoo/texlive-module-arabi.doc-2017.tar.xz mirror://gentoo/texlive-module-arabi-add.doc-2017.tar.xz mirror://gentoo/texlive-module-arabluatex.doc-2017.tar.xz mirror://gentoo/texlive-module-arabtex.doc-2017.tar.xz mirror://gentoo/texlive-module-bidi.doc-2017.tar.xz mirror://gentoo/texlive-module-bidihl.doc-2017.tar.xz mirror://gentoo/texlive-module-dad.doc-2017.tar.xz mirror://gentoo/texlive-module-ghab.doc-2017.tar.xz mirror://gentoo/texlive-module-imsproc.doc-2017.tar.xz mirror://gentoo/texlive-module-lshort-persian.doc-2017.tar.xz mirror://gentoo/texlive-module-persian-bib.doc-2017.tar.xz mirror://gentoo/texlive-module-simurgh.doc-2017.tar.xz mirror://gentoo/texlive-module-tram.doc-2017.tar.xz mirror://gentoo/texlive-module-xepersian.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-arabluatex.source-2017.tar.xz mirror://gentoo/texlive-module-bidi.source-2017.tar.xz mirror://gentoo/texlive-module-xepersian.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6d3c82cc66ab2505151edb72c0c89b46
+_md5_=304193e64dfc38025024f1daf24702d1
diff --git a/metadata/md5-cache/dev-texlive/texlive-langchinese-2017 b/metadata/md5-cache/dev-texlive/texlive-langchinese-2017
index b132c6430eac..386de5225eed 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langchinese-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-langchinese-2017
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive Chinese
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-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 ~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 ~x64-solaris ~x86-solaris
 LICENSE=FDL-1.1 GPL-1 GPL-2 LGPL-2 LPPL-1.3 TeX-other-free
 RDEPEND=>=dev-texlive/texlive-langcjk-2017 !<dev-texlive/texlive-langcjk-2014 !<dev-texlive/texlive-basic-2016 >=app-text/texlive-core-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-arphic-2017.tar.xz mirror://gentoo/texlive-module-arphic-ttf-2017.tar.xz mirror://gentoo/texlive-module-asymptote-by-example-zh-cn-2017.tar.xz mirror://gentoo/texlive-module-asymptote-faq-zh-cn-2017.tar.xz mirror://gentoo/texlive-module-asymptote-manual-zh-cn-2017.tar.xz mirror://gentoo/texlive-module-cns-2017.tar.xz mirror://gentoo/texlive-module-ctex-2017.tar.xz mirror://gentoo/texlive-module-ctex-faq-2017.tar.xz mirror://gentoo/texlive-module-fandol-2017.tar.xz mirror://gentoo/texlive-module-hyphen-chinese-2017.tar.xz mirror://gentoo/texlive-module-impatient-cn-2017.tar.xz mirror://gentoo/texlive-module-latex-notes-zh-cn-2017.tar.xz mirror://gentoo/texlive-module-lshort-chinese-2017.tar.xz mirror://gentoo/texlive-module-texlive-zh-cn-2017.tar.xz mirror://gentoo/texlive-module-texproposal-2017.tar.xz mirror://gentoo/texlive-module-xpinyin-2017.tar.xz mirror://gentoo/texlive-module-zhmetrics-2017.tar.xz mirror://gentoo/texlive-module-zhmetrics-uptex-2017.tar.xz mirror://gentoo/texlive-module-zhnumber-2017.tar.xz mirror://gentoo/texlive-module-zhspacing-2017.tar.xz mirror://gentoo/texlive-module-collection-langchinese-2017.tar.xz doc? ( mirror://gentoo/texlive-module-arphic.doc-2017.tar.xz mirror://gentoo/texlive-module-arphic-ttf.doc-2017.tar.xz mirror://gentoo/texlive-module-asymptote-by-example-zh-cn.doc-2017.tar.xz mirror://gentoo/texlive-module-asymptote-faq-zh-cn.doc-2017.tar.xz mirror://gentoo/texlive-module-asymptote-manual-zh-cn.doc-2017.tar.xz mirror://gentoo/texlive-module-cns.doc-2017.tar.xz mirror://gentoo/texlive-module-ctex.doc-2017.tar.xz mirror://gentoo/texlive-module-ctex-faq.doc-2017.tar.xz mirror://gentoo/texlive-module-fandol.doc-2017.tar.xz mirror://gentoo/texlive-module-impatient-cn.doc-2017.tar.xz mirror://gentoo/texlive-module-latex-notes-zh-cn.doc-2017.tar.xz mirror://gentoo/texlive-module-lshort-chinese.doc-2017.tar.xz mirror://gentoo/texlive-module-texlive-zh-cn.doc-2017.tar.xz mirror://gentoo/texlive-module-texproposal.doc-2017.tar.xz mirror://gentoo/texlive-module-xpinyin.doc-2017.tar.xz mirror://gentoo/texlive-module-zhmetrics.doc-2017.tar.xz mirror://gentoo/texlive-module-zhmetrics-uptex.doc-2017.tar.xz mirror://gentoo/texlive-module-zhnumber.doc-2017.tar.xz mirror://gentoo/texlive-module-zhspacing.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-ctex.source-2017.tar.xz mirror://gentoo/texlive-module-xpinyin.source-2017.tar.xz mirror://gentoo/texlive-module-zhmetrics.source-2017.tar.xz mirror://gentoo/texlive-module-zhnumber.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=48a0c4a87093e0708679524708fc203e
+_md5_=b3e13f1b733208c176b7039e9f1ecaf7
diff --git a/metadata/md5-cache/dev-texlive/texlive-langcyrillic-2017 b/metadata/md5-cache/dev-texlive/texlive-langcyrillic-2017
index d10095f6bd3d..58ec791b42d4 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langcyrillic-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-langcyrillic-2017
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive Cyrillic
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-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 ~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 ~x64-solaris ~x86-solaris
 LICENSE=GPL-1 GPL-2 LPPL-1.3 MIT public-domain TeX-other-free
 RDEPEND=>=dev-texlive/texlive-basic-2017 >=dev-texlive/texlive-latex-2017 !dev-texlive/texlive-documentation-ukrainian !dev-texlive/texlive-documentation-bulgarian !dev-texlive/texlive-documentation-russian !dev-texlive/texlive-documentation-mongolian !dev-texlive/texlive-langmongolian !<dev-texlive/texlive-langother-2013 !dev-texlive/texlive-documentation-serbian !<app-text/texlive-core-2013 !<dev-texlive/texlive-latexextra-2013 !<dev-texlive/texlive-basic-2016 >=app-text/texlive-core-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-babel-belarusian-2017.tar.xz mirror://gentoo/texlive-module-babel-bulgarian-2017.tar.xz mirror://gentoo/texlive-module-babel-russian-2017.tar.xz mirror://gentoo/texlive-module-babel-serbian-2017.tar.xz mirror://gentoo/texlive-module-babel-serbianc-2017.tar.xz mirror://gentoo/texlive-module-babel-ukrainian-2017.tar.xz mirror://gentoo/texlive-module-churchslavonic-2017.tar.xz mirror://gentoo/texlive-module-cmcyr-2017.tar.xz mirror://gentoo/texlive-module-cyrillic-2017.tar.xz mirror://gentoo/texlive-module-cyrillic-bin-2017.tar.xz mirror://gentoo/texlive-module-cyrplain-2017.tar.xz mirror://gentoo/texlive-module-disser-2017.tar.xz mirror://gentoo/texlive-module-eskd-2017.tar.xz mirror://gentoo/texlive-module-eskdx-2017.tar.xz mirror://gentoo/texlive-module-gost-2017.tar.xz mirror://gentoo/texlive-module-hyphen-belarusian-2017.tar.xz mirror://gentoo/texlive-module-hyphen-bulgarian-2017.tar.xz mirror://gentoo/texlive-module-hyphen-churchslavonic-2017.tar.xz mirror://gentoo/texlive-module-hyphen-mongolian-2017.tar.xz mirror://gentoo/texlive-module-hyphen-russian-2017.tar.xz mirror://gentoo/texlive-module-hyphen-serbian-2017.tar.xz mirror://gentoo/texlive-module-hyphen-ukrainian-2017.tar.xz mirror://gentoo/texlive-module-lcyw-2017.tar.xz mirror://gentoo/texlive-module-lh-2017.tar.xz mirror://gentoo/texlive-module-lhcyr-2017.tar.xz mirror://gentoo/texlive-module-lshort-bulgarian-2017.tar.xz mirror://gentoo/texlive-module-lshort-mongol-2017.tar.xz mirror://gentoo/texlive-module-lshort-russian-2017.tar.xz mirror://gentoo/texlive-module-lshort-ukr-2017.tar.xz mirror://gentoo/texlive-module-mongolian-babel-2017.tar.xz mirror://gentoo/texlive-module-montex-2017.tar.xz mirror://gentoo/texlive-module-mpman-ru-2017.tar.xz mirror://gentoo/texlive-module-pst-eucl-translation-bg-2017.tar.xz mirror://gentoo/texlive-module-ruhyphen-2017.tar.xz mirror://gentoo/texlive-module-russ-2017.tar.xz mirror://gentoo/texlive-module-serbian-apostrophe-2017.tar.xz mirror://gentoo/texlive-module-serbian-date-lat-2017.tar.xz mirror://gentoo/texlive-module-serbian-def-cyr-2017.tar.xz mirror://gentoo/texlive-module-serbian-lig-2017.tar.xz mirror://gentoo/texlive-module-t2-2017.tar.xz mirror://gentoo/texlive-module-texlive-ru-2017.tar.xz mirror://gentoo/texlive-module-texlive-sr-2017.tar.xz mirror://gentoo/texlive-module-ukrhyph-2017.tar.xz mirror://gentoo/texlive-module-collection-langcyrillic-2017.tar.xz doc? ( mirror://gentoo/texlive-module-babel-belarusian.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-bulgarian.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-russian.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-serbian.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-serbianc.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-ukrainian.doc-2017.tar.xz mirror://gentoo/texlive-module-churchslavonic.doc-2017.tar.xz mirror://gentoo/texlive-module-cmcyr.doc-2017.tar.xz mirror://gentoo/texlive-module-cyrillic.doc-2017.tar.xz mirror://gentoo/texlive-module-cyrillic-bin.doc-2017.tar.xz mirror://gentoo/texlive-module-disser.doc-2017.tar.xz mirror://gentoo/texlive-module-eskd.doc-2017.tar.xz mirror://gentoo/texlive-module-eskdx.doc-2017.tar.xz mirror://gentoo/texlive-module-gost.doc-2017.tar.xz mirror://gentoo/texlive-module-hyphen-bulgarian.doc-2017.tar.xz mirror://gentoo/texlive-module-lcyw.doc-2017.tar.xz mirror://gentoo/texlive-module-lh.doc-2017.tar.xz mirror://gentoo/texlive-module-lshort-bulgarian.doc-2017.tar.xz mirror://gentoo/texlive-module-lshort-mongol.doc-2017.tar.xz mirror://gentoo/texlive-module-lshort-russian.doc-2017.tar.xz mirror://gentoo/texlive-module-lshort-ukr.doc-2017.tar.xz mirror://gentoo/texlive-module-mongolian-babel.doc-2017.tar.xz mirror://gentoo/texlive-module-montex.doc-2017.tar.xz mirror://gentoo/texlive-module-mpman-ru.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-eucl-translation-bg.doc-2017.tar.xz mirror://gentoo/texlive-module-russ.doc-2017.tar.xz mirror://gentoo/texlive-module-serbian-apostrophe.doc-2017.tar.xz mirror://gentoo/texlive-module-serbian-date-lat.doc-2017.tar.xz mirror://gentoo/texlive-module-serbian-def-cyr.doc-2017.tar.xz mirror://gentoo/texlive-module-serbian-lig.doc-2017.tar.xz mirror://gentoo/texlive-module-t2.doc-2017.tar.xz mirror://gentoo/texlive-module-texlive-ru.doc-2017.tar.xz mirror://gentoo/texlive-module-texlive-sr.doc-2017.tar.xz mirror://gentoo/texlive-module-ukrhyph.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-babel-belarusian.source-2017.tar.xz mirror://gentoo/texlive-module-babel-bulgarian.source-2017.tar.xz mirror://gentoo/texlive-module-babel-russian.source-2017.tar.xz mirror://gentoo/texlive-module-babel-serbian.source-2017.tar.xz mirror://gentoo/texlive-module-babel-serbianc.source-2017.tar.xz mirror://gentoo/texlive-module-babel-ukrainian.source-2017.tar.xz mirror://gentoo/texlive-module-cyrillic.source-2017.tar.xz mirror://gentoo/texlive-module-disser.source-2017.tar.xz mirror://gentoo/texlive-module-eskd.source-2017.tar.xz mirror://gentoo/texlive-module-gost.source-2017.tar.xz mirror://gentoo/texlive-module-lcyw.source-2017.tar.xz mirror://gentoo/texlive-module-lh.source-2017.tar.xz mirror://gentoo/texlive-module-lhcyr.source-2017.tar.xz mirror://gentoo/texlive-module-mongolian-babel.source-2017.tar.xz mirror://gentoo/texlive-module-ruhyphen.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=aab7aa16921aeb54b0ad06034a6b7795
+_md5_=8b5d52d1f288a81edf8bdbff71893370
diff --git a/metadata/md5-cache/dev-texlive/texlive-langczechslovak-2015-r1 b/metadata/md5-cache/dev-texlive/texlive-langczechslovak-2015-r1
deleted file mode 100644
index 891ee588ddfe..000000000000
--- a/metadata/md5-cache/dev-texlive/texlive-langczechslovak-2015-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=dev-texlive/texlive-basic-2015 >=dev-texlive/texlive-latex-2015 !dev-texlive/texlive-documentation-czechslovak >=app-text/texlive-core-2014[xetex] >=app-text/texlive-core-2015 app-arch/xz-utils
-DESCRIPTION=TeXLive Czech/Slovak
-EAPI=5
-HOMEPAGE=http://www.tug.org/texlive/
-IUSE=source doc
-KEYWORDS=alpha amd64 arm ~hppa ~mips ppc ppc64 ~s390 ~sh x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-1 GPL-2 LPPL-1.3 TeX-other-free
-RDEPEND=>=dev-texlive/texlive-basic-2015 >=dev-texlive/texlive-latex-2015 !dev-texlive/texlive-documentation-czechslovak >=app-text/texlive-core-2014[xetex] >=app-text/texlive-core-2015
-SLOT=0
-SRC_URI=mirror://gentoo/texlive-module-babel-czech-2015.tar.xz mirror://gentoo/texlive-module-babel-slovak-2015.tar.xz mirror://gentoo/texlive-module-cnbwp-2015.tar.xz mirror://gentoo/texlive-module-cs-2015.tar.xz mirror://gentoo/texlive-module-csbulletin-2015.tar.xz mirror://gentoo/texlive-module-cslatex-2015.tar.xz mirror://gentoo/texlive-module-csplain-2015.tar.xz mirror://gentoo/texlive-module-cstex-2015.tar.xz mirror://gentoo/texlive-module-hyphen-czech-2015.tar.xz mirror://gentoo/texlive-module-hyphen-slovak-2015.tar.xz mirror://gentoo/texlive-module-lshort-czech-2015.tar.xz mirror://gentoo/texlive-module-lshort-slovak-2015.tar.xz mirror://gentoo/texlive-module-texlive-cz-2015.tar.xz mirror://gentoo/texlive-module-collection-langczechslovak-2015.tar.xz doc? ( mirror://gentoo/texlive-module-babel-czech.doc-2015.tar.xz mirror://gentoo/texlive-module-babel-slovak.doc-2015.tar.xz mirror://gentoo/texlive-module-cnbwp.doc-2015.tar.xz mirror://gentoo/texlive-module-csbulletin.doc-2015.tar.xz mirror://gentoo/texlive-module-cstex.doc-2015.tar.xz mirror://gentoo/texlive-module-lshort-czech.doc-2015.tar.xz mirror://gentoo/texlive-module-lshort-slovak.doc-2015.tar.xz mirror://gentoo/texlive-module-texlive-cz.doc-2015.tar.xz ) source? ( mirror://gentoo/texlive-module-babel-czech.source-2015.tar.xz mirror://gentoo/texlive-module-babel-slovak.source-2015.tar.xz mirror://gentoo/texlive-module-cslatex.source-2015.tar.xz )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=625450c5026db0d19bace76c1213159b
diff --git a/metadata/md5-cache/dev-texlive/texlive-langczechslovak-2016 b/metadata/md5-cache/dev-texlive/texlive-langczechslovak-2016
deleted file mode 100644
index 5b67830e9b03..000000000000
--- a/metadata/md5-cache/dev-texlive/texlive-langczechslovak-2016
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=dev-texlive/texlive-basic-2016 >=dev-texlive/texlive-latex-2016 !dev-texlive/texlive-documentation-czechslovak >=app-text/texlive-core-2014[xetex] !<dev-texlive/texlive-basic-2016 >=dev-texlive/texlive-luatex-2016 >=app-text/texlive-core-2016 app-arch/xz-utils
-DESCRIPTION=TeXLive Czech/Slovak
-EAPI=5
-HOMEPAGE=http://www.tug.org/texlive/
-IUSE=source doc
-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 ~x64-solaris ~x86-solaris
-LICENSE=GPL-1 GPL-2 LPPL-1.3 TeX-other-free
-RDEPEND=>=dev-texlive/texlive-basic-2016 >=dev-texlive/texlive-latex-2016 !dev-texlive/texlive-documentation-czechslovak >=app-text/texlive-core-2014[xetex] !<dev-texlive/texlive-basic-2016 >=dev-texlive/texlive-luatex-2016 >=app-text/texlive-core-2016
-SLOT=0
-SRC_URI=mirror://gentoo/texlive-module-babel-czech-2016.tar.xz mirror://gentoo/texlive-module-babel-slovak-2016.tar.xz mirror://gentoo/texlive-module-cnbwp-2016.tar.xz mirror://gentoo/texlive-module-cs-2016.tar.xz mirror://gentoo/texlive-module-csbulletin-2016.tar.xz mirror://gentoo/texlive-module-cslatex-2016.tar.xz mirror://gentoo/texlive-module-csplain-2016.tar.xz mirror://gentoo/texlive-module-cstex-2016.tar.xz mirror://gentoo/texlive-module-hyphen-czech-2016.tar.xz mirror://gentoo/texlive-module-hyphen-slovak-2016.tar.xz mirror://gentoo/texlive-module-lshort-czech-2016.tar.xz mirror://gentoo/texlive-module-lshort-slovak-2016.tar.xz mirror://gentoo/texlive-module-texlive-cz-2016.tar.xz mirror://gentoo/texlive-module-collection-langczechslovak-2016.tar.xz doc? ( mirror://gentoo/texlive-module-babel-czech.doc-2016.tar.xz mirror://gentoo/texlive-module-babel-slovak.doc-2016.tar.xz mirror://gentoo/texlive-module-cnbwp.doc-2016.tar.xz mirror://gentoo/texlive-module-csbulletin.doc-2016.tar.xz mirror://gentoo/texlive-module-cstex.doc-2016.tar.xz mirror://gentoo/texlive-module-lshort-czech.doc-2016.tar.xz mirror://gentoo/texlive-module-lshort-slovak.doc-2016.tar.xz mirror://gentoo/texlive-module-texlive-cz.doc-2016.tar.xz ) source? ( mirror://gentoo/texlive-module-babel-czech.source-2016.tar.xz mirror://gentoo/texlive-module-babel-slovak.source-2016.tar.xz mirror://gentoo/texlive-module-cslatex.source-2016.tar.xz )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c2bc122688cacde730c76b6223b0c60b
diff --git a/metadata/md5-cache/dev-texlive/texlive-langczechslovak-2017 b/metadata/md5-cache/dev-texlive/texlive-langczechslovak-2017
index de84397db061..c2f7f7eb239d 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langczechslovak-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-langczechslovak-2017
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive Czech/Slovak
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-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 ~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 ~x64-solaris ~x86-solaris
 LICENSE=GPL-1 GPL-2 LPPL-1.3 TeX-other-free
 RDEPEND=>=dev-texlive/texlive-basic-2017 >=dev-texlive/texlive-latex-2017 !dev-texlive/texlive-documentation-czechslovak >=app-text/texlive-core-2014[xetex] !<dev-texlive/texlive-basic-2016 >=dev-texlive/texlive-luatex-2016 >=app-text/texlive-core-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-babel-czech-2017.tar.xz mirror://gentoo/texlive-module-babel-slovak-2017.tar.xz mirror://gentoo/texlive-module-cnbwp-2017.tar.xz mirror://gentoo/texlive-module-cs-2017.tar.xz mirror://gentoo/texlive-module-csbulletin-2017.tar.xz mirror://gentoo/texlive-module-cslatex-2017.tar.xz mirror://gentoo/texlive-module-csplain-2017.tar.xz mirror://gentoo/texlive-module-cstex-2017.tar.xz mirror://gentoo/texlive-module-hyphen-czech-2017.tar.xz mirror://gentoo/texlive-module-hyphen-slovak-2017.tar.xz mirror://gentoo/texlive-module-lshort-czech-2017.tar.xz mirror://gentoo/texlive-module-lshort-slovak-2017.tar.xz mirror://gentoo/texlive-module-texlive-cz-2017.tar.xz mirror://gentoo/texlive-module-collection-langczechslovak-2017.tar.xz doc? ( mirror://gentoo/texlive-module-babel-czech.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-slovak.doc-2017.tar.xz mirror://gentoo/texlive-module-cnbwp.doc-2017.tar.xz mirror://gentoo/texlive-module-csbulletin.doc-2017.tar.xz mirror://gentoo/texlive-module-cstex.doc-2017.tar.xz mirror://gentoo/texlive-module-lshort-czech.doc-2017.tar.xz mirror://gentoo/texlive-module-lshort-slovak.doc-2017.tar.xz mirror://gentoo/texlive-module-texlive-cz.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-babel-czech.source-2017.tar.xz mirror://gentoo/texlive-module-babel-slovak.source-2017.tar.xz mirror://gentoo/texlive-module-cslatex.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f77fe006c03e3629a2cca98fadb9f368
+_md5_=21fc70d5021527893d27abc55083b62f
diff --git a/metadata/md5-cache/dev-texlive/texlive-langenglish-2015 b/metadata/md5-cache/dev-texlive/texlive-langenglish-2015
deleted file mode 100644
index f2cb1c2f218f..000000000000
--- a/metadata/md5-cache/dev-texlive/texlive-langenglish-2015
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=dev-texlive/texlive-basic-2015 !dev-texlive/texlive-documentation-english >=app-text/texlive-core-2015 app-arch/xz-utils
-DESCRIPTION=TeXLive US and UK English
-EAPI=5
-HOMEPAGE=http://www.tug.org/texlive/
-IUSE=source doc
-KEYWORDS=alpha amd64 arm hppa ~mips ppc ppc64 ~s390 ~sh x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=FDL-1.1 GPL-1 GPL-2 LPPL-1.2 LPPL-1.3 public-domain TeX-other-free
-RDEPEND=>=dev-texlive/texlive-basic-2015 !dev-texlive/texlive-documentation-english >=app-text/texlive-core-2015
-SLOT=0
-SRC_URI=mirror://gentoo/texlive-module-hyphen-english-2015.tar.xz mirror://gentoo/texlive-module-FAQ-en-2015.tar.xz mirror://gentoo/texlive-module-MemoirChapStyles-2015.tar.xz mirror://gentoo/texlive-module-Type1fonts-2015.tar.xz mirror://gentoo/texlive-module-amslatex-primer-2015.tar.xz mirror://gentoo/texlive-module-around-the-bend-2015.tar.xz mirror://gentoo/texlive-module-ascii-chart-2015.tar.xz mirror://gentoo/texlive-module-components-of-TeX-2015.tar.xz mirror://gentoo/texlive-module-comprehensive-2015.tar.xz mirror://gentoo/texlive-module-dickimaw-2015.tar.xz mirror://gentoo/texlive-module-dtxtut-2015.tar.xz mirror://gentoo/texlive-module-first-latex-doc-2015.tar.xz mirror://gentoo/texlive-module-gentle-2015.tar.xz mirror://gentoo/texlive-module-guide-to-latex-2015.tar.xz mirror://gentoo/texlive-module-happy4th-2015.tar.xz mirror://gentoo/texlive-module-impatient-2015.tar.xz mirror://gentoo/texlive-module-intro-scientific-2015.tar.xz mirror://gentoo/texlive-module-knuth-2015.tar.xz mirror://gentoo/texlive-module-l2tabu-english-2015.tar.xz mirror://gentoo/texlive-module-latex-brochure-2015.tar.xz mirror://gentoo/texlive-module-latex-course-2015.tar.xz mirror://gentoo/texlive-module-latex-doc-ptr-2015.tar.xz mirror://gentoo/texlive-module-latex-graphics-companion-2015.tar.xz mirror://gentoo/texlive-module-latex-veryshortguide-2015.tar.xz mirror://gentoo/texlive-module-latex-web-companion-2015.tar.xz mirror://gentoo/texlive-module-latex2e-help-texinfo-2015.tar.xz mirror://gentoo/texlive-module-latex4wp-2015.tar.xz mirror://gentoo/texlive-module-latexcheat-2015.tar.xz mirror://gentoo/texlive-module-latexcourse-rug-2015.tar.xz mirror://gentoo/texlive-module-latexfileinfo-pkgs-2015.tar.xz mirror://gentoo/texlive-module-lshort-english-2015.tar.xz mirror://gentoo/texlive-module-macros2e-2015.tar.xz mirror://gentoo/texlive-module-math-e-2015.tar.xz mirror://gentoo/texlive-module-maths-symbols-2015.tar.xz mirror://gentoo/texlive-module-memdesign-2015.tar.xz mirror://gentoo/texlive-module-metafont-beginners-2015.tar.xz mirror://gentoo/texlive-module-metapost-examples-2015.tar.xz mirror://gentoo/texlive-module-mil3-2015.tar.xz mirror://gentoo/texlive-module-patgen2-tutorial-2015.tar.xz mirror://gentoo/texlive-module-pictexsum-2015.tar.xz mirror://gentoo/texlive-module-plain-doc-2015.tar.xz mirror://gentoo/texlive-module-presentations-en-2015.tar.xz mirror://gentoo/texlive-module-pstricks-examples-en-2015.tar.xz mirror://gentoo/texlive-module-simplified-latex-2015.tar.xz mirror://gentoo/texlive-module-svg-inkscape-2015.tar.xz mirror://gentoo/texlive-module-tabulars-e-2015.tar.xz mirror://gentoo/texlive-module-tamethebeast-2015.tar.xz mirror://gentoo/texlive-module-tds-2015.tar.xz mirror://gentoo/texlive-module-tex-font-errors-cheatsheet-2015.tar.xz mirror://gentoo/texlive-module-tex-overview-2015.tar.xz mirror://gentoo/texlive-module-tex-refs-2015.tar.xz mirror://gentoo/texlive-module-texbytopic-2015.tar.xz mirror://gentoo/texlive-module-titlepages-2015.tar.xz mirror://gentoo/texlive-module-tlc2-2015.tar.xz mirror://gentoo/texlive-module-visualfaq-2015.tar.xz mirror://gentoo/texlive-module-voss-mathmode-2015.tar.xz mirror://gentoo/texlive-module-webguide-2015.tar.xz mirror://gentoo/texlive-module-xetexref-2015.tar.xz mirror://gentoo/texlive-module-collection-langenglish-2015.tar.xz doc? ( mirror://gentoo/texlive-module-FAQ-en.doc-2015.tar.xz mirror://gentoo/texlive-module-MemoirChapStyles.doc-2015.tar.xz mirror://gentoo/texlive-module-Type1fonts.doc-2015.tar.xz mirror://gentoo/texlive-module-amslatex-primer.doc-2015.tar.xz mirror://gentoo/texlive-module-around-the-bend.doc-2015.tar.xz mirror://gentoo/texlive-module-ascii-chart.doc-2015.tar.xz mirror://gentoo/texlive-module-components-of-TeX.doc-2015.tar.xz mirror://gentoo/texlive-module-comprehensive.doc-2015.tar.xz mirror://gentoo/texlive-module-dickimaw.doc-2015.tar.xz mirror://gentoo/texlive-module-dtxtut.doc-2015.tar.xz mirror://gentoo/texlive-module-first-latex-doc.doc-2015.tar.xz mirror://gentoo/texlive-module-gentle.doc-2015.tar.xz mirror://gentoo/texlive-module-guide-to-latex.doc-2015.tar.xz mirror://gentoo/texlive-module-happy4th.doc-2015.tar.xz mirror://gentoo/texlive-module-impatient.doc-2015.tar.xz mirror://gentoo/texlive-module-intro-scientific.doc-2015.tar.xz mirror://gentoo/texlive-module-knuth.doc-2015.tar.xz mirror://gentoo/texlive-module-l2tabu-english.doc-2015.tar.xz mirror://gentoo/texlive-module-latex-brochure.doc-2015.tar.xz mirror://gentoo/texlive-module-latex-course.doc-2015.tar.xz mirror://gentoo/texlive-module-latex-doc-ptr.doc-2015.tar.xz mirror://gentoo/texlive-module-latex-graphics-companion.doc-2015.tar.xz mirror://gentoo/texlive-module-latex-veryshortguide.doc-2015.tar.xz mirror://gentoo/texlive-module-latex-web-companion.doc-2015.tar.xz mirror://gentoo/texlive-module-latex2e-help-texinfo.doc-2015.tar.xz mirror://gentoo/texlive-module-latex4wp.doc-2015.tar.xz mirror://gentoo/texlive-module-latexcheat.doc-2015.tar.xz mirror://gentoo/texlive-module-latexcourse-rug.doc-2015.tar.xz mirror://gentoo/texlive-module-latexfileinfo-pkgs.doc-2015.tar.xz mirror://gentoo/texlive-module-lshort-english.doc-2015.tar.xz mirror://gentoo/texlive-module-macros2e.doc-2015.tar.xz mirror://gentoo/texlive-module-math-e.doc-2015.tar.xz mirror://gentoo/texlive-module-maths-symbols.doc-2015.tar.xz mirror://gentoo/texlive-module-memdesign.doc-2015.tar.xz mirror://gentoo/texlive-module-metafont-beginners.doc-2015.tar.xz mirror://gentoo/texlive-module-metapost-examples.doc-2015.tar.xz mirror://gentoo/texlive-module-mil3.doc-2015.tar.xz mirror://gentoo/texlive-module-patgen2-tutorial.doc-2015.tar.xz mirror://gentoo/texlive-module-pictexsum.doc-2015.tar.xz mirror://gentoo/texlive-module-plain-doc.doc-2015.tar.xz mirror://gentoo/texlive-module-presentations-en.doc-2015.tar.xz mirror://gentoo/texlive-module-pstricks-examples-en.doc-2015.tar.xz mirror://gentoo/texlive-module-simplified-latex.doc-2015.tar.xz mirror://gentoo/texlive-module-svg-inkscape.doc-2015.tar.xz mirror://gentoo/texlive-module-tabulars-e.doc-2015.tar.xz mirror://gentoo/texlive-module-tamethebeast.doc-2015.tar.xz mirror://gentoo/texlive-module-tds.doc-2015.tar.xz mirror://gentoo/texlive-module-tex-font-errors-cheatsheet.doc-2015.tar.xz mirror://gentoo/texlive-module-tex-overview.doc-2015.tar.xz mirror://gentoo/texlive-module-tex-refs.doc-2015.tar.xz mirror://gentoo/texlive-module-texbytopic.doc-2015.tar.xz mirror://gentoo/texlive-module-titlepages.doc-2015.tar.xz mirror://gentoo/texlive-module-tlc2.doc-2015.tar.xz mirror://gentoo/texlive-module-visualfaq.doc-2015.tar.xz mirror://gentoo/texlive-module-voss-mathmode.doc-2015.tar.xz mirror://gentoo/texlive-module-webguide.doc-2015.tar.xz mirror://gentoo/texlive-module-xetexref.doc-2015.tar.xz ) source? ( mirror://gentoo/texlive-module-knuth.source-2015.tar.xz mirror://gentoo/texlive-module-latexfileinfo-pkgs.source-2015.tar.xz )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7c938ff3d03ca1be6013ec176ac05e16
diff --git a/metadata/md5-cache/dev-texlive/texlive-langenglish-2016 b/metadata/md5-cache/dev-texlive/texlive-langenglish-2016
deleted file mode 100644
index da074fc6e58e..000000000000
--- a/metadata/md5-cache/dev-texlive/texlive-langenglish-2016
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=dev-texlive/texlive-basic-2016 !dev-texlive/texlive-documentation-english !<dev-texlive/texlive-basic-2016 >=app-text/texlive-core-2016 app-arch/xz-utils
-DESCRIPTION=TeXLive US and UK English
-EAPI=5
-HOMEPAGE=http://www.tug.org/texlive/
-IUSE=source doc
-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 ~x64-solaris ~x86-solaris
-LICENSE=FDL-1.1 GPL-1 GPL-2 LPPL-1.2 LPPL-1.3 public-domain TeX-other-free
-RDEPEND=>=dev-texlive/texlive-basic-2016 !dev-texlive/texlive-documentation-english !<dev-texlive/texlive-basic-2016 >=app-text/texlive-core-2016
-SLOT=0
-SRC_URI=mirror://gentoo/texlive-module-hyphen-english-2016.tar.xz mirror://gentoo/texlive-module-FAQ-en-2016.tar.xz mirror://gentoo/texlive-module-MemoirChapStyles-2016.tar.xz mirror://gentoo/texlive-module-Type1fonts-2016.tar.xz mirror://gentoo/texlive-module-amslatex-primer-2016.tar.xz mirror://gentoo/texlive-module-around-the-bend-2016.tar.xz mirror://gentoo/texlive-module-ascii-chart-2016.tar.xz mirror://gentoo/texlive-module-components-of-TeX-2016.tar.xz mirror://gentoo/texlive-module-comprehensive-2016.tar.xz mirror://gentoo/texlive-module-dickimaw-2016.tar.xz mirror://gentoo/texlive-module-dtxtut-2016.tar.xz mirror://gentoo/texlive-module-first-latex-doc-2016.tar.xz mirror://gentoo/texlive-module-forest-quickstart-2016.tar.xz mirror://gentoo/texlive-module-gentle-2016.tar.xz mirror://gentoo/texlive-module-guide-to-latex-2016.tar.xz mirror://gentoo/texlive-module-happy4th-2016.tar.xz mirror://gentoo/texlive-module-impatient-2016.tar.xz mirror://gentoo/texlive-module-intro-scientific-2016.tar.xz mirror://gentoo/texlive-module-knuth-2016.tar.xz mirror://gentoo/texlive-module-l2tabu-english-2016.tar.xz mirror://gentoo/texlive-module-latex-brochure-2016.tar.xz mirror://gentoo/texlive-module-latex-course-2016.tar.xz mirror://gentoo/texlive-module-latex-doc-ptr-2016.tar.xz mirror://gentoo/texlive-module-latex-graphics-companion-2016.tar.xz mirror://gentoo/texlive-module-latex-veryshortguide-2016.tar.xz mirror://gentoo/texlive-module-latex-web-companion-2016.tar.xz mirror://gentoo/texlive-module-latex2e-help-texinfo-2016.tar.xz mirror://gentoo/texlive-module-latex4wp-2016.tar.xz mirror://gentoo/texlive-module-latexcheat-2016.tar.xz mirror://gentoo/texlive-module-latexcourse-rug-2016.tar.xz mirror://gentoo/texlive-module-latexfileinfo-pkgs-2016.tar.xz mirror://gentoo/texlive-module-lshort-english-2016.tar.xz mirror://gentoo/texlive-module-macros2e-2016.tar.xz mirror://gentoo/texlive-module-math-e-2016.tar.xz mirror://gentoo/texlive-module-math-into-latex-4-2016.tar.xz mirror://gentoo/texlive-module-maths-symbols-2016.tar.xz mirror://gentoo/texlive-module-memdesign-2016.tar.xz mirror://gentoo/texlive-module-metafont-beginners-2016.tar.xz mirror://gentoo/texlive-module-metapost-examples-2016.tar.xz mirror://gentoo/texlive-module-patgen2-tutorial-2016.tar.xz mirror://gentoo/texlive-module-pictexsum-2016.tar.xz mirror://gentoo/texlive-module-plain-doc-2016.tar.xz mirror://gentoo/texlive-module-presentations-en-2016.tar.xz mirror://gentoo/texlive-module-simplified-latex-2016.tar.xz mirror://gentoo/texlive-module-svg-inkscape-2016.tar.xz mirror://gentoo/texlive-module-tabulars-e-2016.tar.xz mirror://gentoo/texlive-module-tamethebeast-2016.tar.xz mirror://gentoo/texlive-module-tds-2016.tar.xz mirror://gentoo/texlive-module-tex-font-errors-cheatsheet-2016.tar.xz mirror://gentoo/texlive-module-tex-overview-2016.tar.xz mirror://gentoo/texlive-module-tex-refs-2016.tar.xz mirror://gentoo/texlive-module-texbytopic-2016.tar.xz mirror://gentoo/texlive-module-titlepages-2016.tar.xz mirror://gentoo/texlive-module-tlc2-2016.tar.xz mirror://gentoo/texlive-module-undergradmath-2016.tar.xz mirror://gentoo/texlive-module-visualfaq-2016.tar.xz mirror://gentoo/texlive-module-webguide-2016.tar.xz mirror://gentoo/texlive-module-xetexref-2016.tar.xz mirror://gentoo/texlive-module-collection-langenglish-2016.tar.xz doc? ( mirror://gentoo/texlive-module-FAQ-en.doc-2016.tar.xz mirror://gentoo/texlive-module-MemoirChapStyles.doc-2016.tar.xz mirror://gentoo/texlive-module-Type1fonts.doc-2016.tar.xz mirror://gentoo/texlive-module-amslatex-primer.doc-2016.tar.xz mirror://gentoo/texlive-module-around-the-bend.doc-2016.tar.xz mirror://gentoo/texlive-module-ascii-chart.doc-2016.tar.xz mirror://gentoo/texlive-module-components-of-TeX.doc-2016.tar.xz mirror://gentoo/texlive-module-comprehensive.doc-2016.tar.xz mirror://gentoo/texlive-module-dickimaw.doc-2016.tar.xz mirror://gentoo/texlive-module-dtxtut.doc-2016.tar.xz mirror://gentoo/texlive-module-first-latex-doc.doc-2016.tar.xz mirror://gentoo/texlive-module-forest-quickstart.doc-2016.tar.xz mirror://gentoo/texlive-module-gentle.doc-2016.tar.xz mirror://gentoo/texlive-module-guide-to-latex.doc-2016.tar.xz mirror://gentoo/texlive-module-happy4th.doc-2016.tar.xz mirror://gentoo/texlive-module-impatient.doc-2016.tar.xz mirror://gentoo/texlive-module-intro-scientific.doc-2016.tar.xz mirror://gentoo/texlive-module-knuth.doc-2016.tar.xz mirror://gentoo/texlive-module-l2tabu-english.doc-2016.tar.xz mirror://gentoo/texlive-module-latex-brochure.doc-2016.tar.xz mirror://gentoo/texlive-module-latex-course.doc-2016.tar.xz mirror://gentoo/texlive-module-latex-doc-ptr.doc-2016.tar.xz mirror://gentoo/texlive-module-latex-graphics-companion.doc-2016.tar.xz mirror://gentoo/texlive-module-latex-veryshortguide.doc-2016.tar.xz mirror://gentoo/texlive-module-latex-web-companion.doc-2016.tar.xz mirror://gentoo/texlive-module-latex2e-help-texinfo.doc-2016.tar.xz mirror://gentoo/texlive-module-latex4wp.doc-2016.tar.xz mirror://gentoo/texlive-module-latexcheat.doc-2016.tar.xz mirror://gentoo/texlive-module-latexcourse-rug.doc-2016.tar.xz mirror://gentoo/texlive-module-latexfileinfo-pkgs.doc-2016.tar.xz mirror://gentoo/texlive-module-lshort-english.doc-2016.tar.xz mirror://gentoo/texlive-module-macros2e.doc-2016.tar.xz mirror://gentoo/texlive-module-math-e.doc-2016.tar.xz mirror://gentoo/texlive-module-math-into-latex-4.doc-2016.tar.xz mirror://gentoo/texlive-module-maths-symbols.doc-2016.tar.xz mirror://gentoo/texlive-module-memdesign.doc-2016.tar.xz mirror://gentoo/texlive-module-metafont-beginners.doc-2016.tar.xz mirror://gentoo/texlive-module-metapost-examples.doc-2016.tar.xz mirror://gentoo/texlive-module-patgen2-tutorial.doc-2016.tar.xz mirror://gentoo/texlive-module-pictexsum.doc-2016.tar.xz mirror://gentoo/texlive-module-plain-doc.doc-2016.tar.xz mirror://gentoo/texlive-module-presentations-en.doc-2016.tar.xz mirror://gentoo/texlive-module-simplified-latex.doc-2016.tar.xz mirror://gentoo/texlive-module-svg-inkscape.doc-2016.tar.xz mirror://gentoo/texlive-module-tabulars-e.doc-2016.tar.xz mirror://gentoo/texlive-module-tamethebeast.doc-2016.tar.xz mirror://gentoo/texlive-module-tds.doc-2016.tar.xz mirror://gentoo/texlive-module-tex-font-errors-cheatsheet.doc-2016.tar.xz mirror://gentoo/texlive-module-tex-overview.doc-2016.tar.xz mirror://gentoo/texlive-module-tex-refs.doc-2016.tar.xz mirror://gentoo/texlive-module-texbytopic.doc-2016.tar.xz mirror://gentoo/texlive-module-titlepages.doc-2016.tar.xz mirror://gentoo/texlive-module-tlc2.doc-2016.tar.xz mirror://gentoo/texlive-module-undergradmath.doc-2016.tar.xz mirror://gentoo/texlive-module-visualfaq.doc-2016.tar.xz mirror://gentoo/texlive-module-webguide.doc-2016.tar.xz mirror://gentoo/texlive-module-xetexref.doc-2016.tar.xz ) source? ( mirror://gentoo/texlive-module-knuth.source-2016.tar.xz mirror://gentoo/texlive-module-latexfileinfo-pkgs.source-2016.tar.xz )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=bf6033af2a7f02eefe0078d4015f4998
diff --git a/metadata/md5-cache/dev-texlive/texlive-langenglish-2017 b/metadata/md5-cache/dev-texlive/texlive-langenglish-2017
index 453a7d32e219..a3bf8b36f259 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langenglish-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-langenglish-2017
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive US and UK English
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-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 ~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 ~x64-solaris ~x86-solaris
 LICENSE=FDL-1.1 GPL-1 GPL-2 LPPL-1.2 LPPL-1.3 public-domain TeX TeX-other-free
 RDEPEND=>=dev-texlive/texlive-basic-2017 !dev-texlive/texlive-documentation-english !<dev-texlive/texlive-basic-2016 >=app-text/texlive-core-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-hyphen-english-2017.tar.xz mirror://gentoo/texlive-module-FAQ-en-2017.tar.xz mirror://gentoo/texlive-module-MemoirChapStyles-2017.tar.xz mirror://gentoo/texlive-module-Type1fonts-2017.tar.xz mirror://gentoo/texlive-module-amslatex-primer-2017.tar.xz mirror://gentoo/texlive-module-around-the-bend-2017.tar.xz mirror://gentoo/texlive-module-ascii-chart-2017.tar.xz mirror://gentoo/texlive-module-biblatex-cheatsheet-2017.tar.xz mirror://gentoo/texlive-module-components-of-TeX-2017.tar.xz mirror://gentoo/texlive-module-comprehensive-2017.tar.xz mirror://gentoo/texlive-module-dickimaw-2017.tar.xz mirror://gentoo/texlive-module-docsurvey-2017.tar.xz mirror://gentoo/texlive-module-dtxtut-2017.tar.xz mirror://gentoo/texlive-module-first-latex-doc-2017.tar.xz mirror://gentoo/texlive-module-forest-quickstart-2017.tar.xz mirror://gentoo/texlive-module-gentle-2017.tar.xz mirror://gentoo/texlive-module-guide-to-latex-2017.tar.xz mirror://gentoo/texlive-module-happy4th-2017.tar.xz mirror://gentoo/texlive-module-impatient-2017.tar.xz mirror://gentoo/texlive-module-intro-scientific-2017.tar.xz mirror://gentoo/texlive-module-knuth-2017.tar.xz mirror://gentoo/texlive-module-l2tabu-english-2017.tar.xz mirror://gentoo/texlive-module-latex-brochure-2017.tar.xz mirror://gentoo/texlive-module-latex-course-2017.tar.xz mirror://gentoo/texlive-module-latex-doc-ptr-2017.tar.xz mirror://gentoo/texlive-module-latex-graphics-companion-2017.tar.xz mirror://gentoo/texlive-module-latex-veryshortguide-2017.tar.xz mirror://gentoo/texlive-module-latex-web-companion-2017.tar.xz mirror://gentoo/texlive-module-latex2e-help-texinfo-2017.tar.xz mirror://gentoo/texlive-module-latex4wp-2017.tar.xz mirror://gentoo/texlive-module-latexcheat-2017.tar.xz mirror://gentoo/texlive-module-latexcourse-rug-2017.tar.xz mirror://gentoo/texlive-module-latexfileinfo-pkgs-2017.tar.xz mirror://gentoo/texlive-module-lshort-english-2017.tar.xz mirror://gentoo/texlive-module-macros2e-2017.tar.xz mirror://gentoo/texlive-module-math-e-2017.tar.xz mirror://gentoo/texlive-module-math-into-latex-4-2017.tar.xz mirror://gentoo/texlive-module-maths-symbols-2017.tar.xz mirror://gentoo/texlive-module-memdesign-2017.tar.xz mirror://gentoo/texlive-module-metafont-beginners-2017.tar.xz mirror://gentoo/texlive-module-metapost-examples-2017.tar.xz mirror://gentoo/texlive-module-patgen2-tutorial-2017.tar.xz mirror://gentoo/texlive-module-pictexsum-2017.tar.xz mirror://gentoo/texlive-module-plain-doc-2017.tar.xz mirror://gentoo/texlive-module-presentations-en-2017.tar.xz mirror://gentoo/texlive-module-simplified-latex-2017.tar.xz mirror://gentoo/texlive-module-svg-inkscape-2017.tar.xz mirror://gentoo/texlive-module-tabulars-e-2017.tar.xz mirror://gentoo/texlive-module-tamethebeast-2017.tar.xz mirror://gentoo/texlive-module-tds-2017.tar.xz mirror://gentoo/texlive-module-tex-font-errors-cheatsheet-2017.tar.xz mirror://gentoo/texlive-module-tex-overview-2017.tar.xz mirror://gentoo/texlive-module-tex-refs-2017.tar.xz mirror://gentoo/texlive-module-texbytopic-2017.tar.xz mirror://gentoo/texlive-module-titlepages-2017.tar.xz mirror://gentoo/texlive-module-tlc2-2017.tar.xz mirror://gentoo/texlive-module-undergradmath-2017.tar.xz mirror://gentoo/texlive-module-visualfaq-2017.tar.xz mirror://gentoo/texlive-module-webguide-2017.tar.xz mirror://gentoo/texlive-module-xetexref-2017.tar.xz mirror://gentoo/texlive-module-collection-langenglish-2017.tar.xz doc? ( mirror://gentoo/texlive-module-FAQ-en.doc-2017.tar.xz mirror://gentoo/texlive-module-MemoirChapStyles.doc-2017.tar.xz mirror://gentoo/texlive-module-Type1fonts.doc-2017.tar.xz mirror://gentoo/texlive-module-amslatex-primer.doc-2017.tar.xz mirror://gentoo/texlive-module-around-the-bend.doc-2017.tar.xz mirror://gentoo/texlive-module-ascii-chart.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-cheatsheet.doc-2017.tar.xz mirror://gentoo/texlive-module-components-of-TeX.doc-2017.tar.xz mirror://gentoo/texlive-module-comprehensive.doc-2017.tar.xz mirror://gentoo/texlive-module-dickimaw.doc-2017.tar.xz mirror://gentoo/texlive-module-docsurvey.doc-2017.tar.xz mirror://gentoo/texlive-module-dtxtut.doc-2017.tar.xz mirror://gentoo/texlive-module-first-latex-doc.doc-2017.tar.xz mirror://gentoo/texlive-module-forest-quickstart.doc-2017.tar.xz mirror://gentoo/texlive-module-gentle.doc-2017.tar.xz mirror://gentoo/texlive-module-guide-to-latex.doc-2017.tar.xz mirror://gentoo/texlive-module-happy4th.doc-2017.tar.xz mirror://gentoo/texlive-module-impatient.doc-2017.tar.xz mirror://gentoo/texlive-module-intro-scientific.doc-2017.tar.xz mirror://gentoo/texlive-module-knuth.doc-2017.tar.xz mirror://gentoo/texlive-module-l2tabu-english.doc-2017.tar.xz mirror://gentoo/texlive-module-latex-brochure.doc-2017.tar.xz mirror://gentoo/texlive-module-latex-course.doc-2017.tar.xz mirror://gentoo/texlive-module-latex-doc-ptr.doc-2017.tar.xz mirror://gentoo/texlive-module-latex-graphics-companion.doc-2017.tar.xz mirror://gentoo/texlive-module-latex-veryshortguide.doc-2017.tar.xz mirror://gentoo/texlive-module-latex-web-companion.doc-2017.tar.xz mirror://gentoo/texlive-module-latex2e-help-texinfo.doc-2017.tar.xz mirror://gentoo/texlive-module-latex4wp.doc-2017.tar.xz mirror://gentoo/texlive-module-latexcheat.doc-2017.tar.xz mirror://gentoo/texlive-module-latexcourse-rug.doc-2017.tar.xz mirror://gentoo/texlive-module-latexfileinfo-pkgs.doc-2017.tar.xz mirror://gentoo/texlive-module-lshort-english.doc-2017.tar.xz mirror://gentoo/texlive-module-macros2e.doc-2017.tar.xz mirror://gentoo/texlive-module-math-e.doc-2017.tar.xz mirror://gentoo/texlive-module-math-into-latex-4.doc-2017.tar.xz mirror://gentoo/texlive-module-maths-symbols.doc-2017.tar.xz mirror://gentoo/texlive-module-memdesign.doc-2017.tar.xz mirror://gentoo/texlive-module-metafont-beginners.doc-2017.tar.xz mirror://gentoo/texlive-module-metapost-examples.doc-2017.tar.xz mirror://gentoo/texlive-module-patgen2-tutorial.doc-2017.tar.xz mirror://gentoo/texlive-module-pictexsum.doc-2017.tar.xz mirror://gentoo/texlive-module-plain-doc.doc-2017.tar.xz mirror://gentoo/texlive-module-presentations-en.doc-2017.tar.xz mirror://gentoo/texlive-module-simplified-latex.doc-2017.tar.xz mirror://gentoo/texlive-module-svg-inkscape.doc-2017.tar.xz mirror://gentoo/texlive-module-tabulars-e.doc-2017.tar.xz mirror://gentoo/texlive-module-tamethebeast.doc-2017.tar.xz mirror://gentoo/texlive-module-tds.doc-2017.tar.xz mirror://gentoo/texlive-module-tex-font-errors-cheatsheet.doc-2017.tar.xz mirror://gentoo/texlive-module-tex-overview.doc-2017.tar.xz mirror://gentoo/texlive-module-tex-refs.doc-2017.tar.xz mirror://gentoo/texlive-module-texbytopic.doc-2017.tar.xz mirror://gentoo/texlive-module-titlepages.doc-2017.tar.xz mirror://gentoo/texlive-module-tlc2.doc-2017.tar.xz mirror://gentoo/texlive-module-undergradmath.doc-2017.tar.xz mirror://gentoo/texlive-module-visualfaq.doc-2017.tar.xz mirror://gentoo/texlive-module-webguide.doc-2017.tar.xz mirror://gentoo/texlive-module-xetexref.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-knuth.source-2017.tar.xz mirror://gentoo/texlive-module-latexfileinfo-pkgs.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3d2608d67ed52667223b07b44cfbbe31
+_md5_=ea30c40830ebdb8b82de2a61d1c4feaa
diff --git a/metadata/md5-cache/dev-texlive/texlive-langeuropean-2013 b/metadata/md5-cache/dev-texlive/texlive-langeuropean-2013
deleted file mode 100644
index ed740d138e1c..000000000000
--- a/metadata/md5-cache/dev-texlive/texlive-langeuropean-2013
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=dev-texlive/texlive-basic-2013 !dev-texlive/texlive-langarmenian !dev-texlive/texlive-langcroatian !dev-texlive/texlive-langdanish !dev-texlive/texlive-langdutch !dev-texlive/texlive-langfinnish !dev-texlive/texlive-langhungarian !dev-texlive/texlive-langnorwegia !dev-texlive/texlive-langturkmen !<dev-texlive/texlive-langother-2013 !dev-texlive/texlive-langswedish !dev-texlive/texlive-langlithuanian >=app-text/texlive-core-2013 app-arch/xz-utils
-DESCRIPTION=TeXLive Other European languages
-EAPI=5
-HOMEPAGE=http://www.tug.org/texlive/
-IUSE=source doc
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-1 GPL-2 LPPL-1.2 LPPL-1.3 public-domain TeX-other-free
-RDEPEND=>=dev-texlive/texlive-basic-2013 !dev-texlive/texlive-langarmenian !dev-texlive/texlive-langcroatian !dev-texlive/texlive-langdanish !dev-texlive/texlive-langdutch !dev-texlive/texlive-langfinnish !dev-texlive/texlive-langhungarian !dev-texlive/texlive-langnorwegia !dev-texlive/texlive-langturkmen !<dev-texlive/texlive-langother-2013 !dev-texlive/texlive-langswedish !dev-texlive/texlive-langlithuanian >=app-text/texlive-core-2013
-SLOT=0
-SRC_URI=mirror://gentoo/texlive-module-babel-albanian-2013.tar.xz mirror://gentoo/texlive-module-babel-breton-2013.tar.xz mirror://gentoo/texlive-module-babel-croatian-2013.tar.xz mirror://gentoo/texlive-module-babel-danish-2013.tar.xz mirror://gentoo/texlive-module-babel-dutch-2013.tar.xz mirror://gentoo/texlive-module-babel-estonian-2013.tar.xz mirror://gentoo/texlive-module-babel-finnish-2013.tar.xz mirror://gentoo/texlive-module-babel-friulan-2013.tar.xz mirror://gentoo/texlive-module-babel-hungarian-2013.tar.xz mirror://gentoo/texlive-module-babel-icelandic-2013.tar.xz mirror://gentoo/texlive-module-babel-irish-2013.tar.xz mirror://gentoo/texlive-module-babel-kurmanji-2013.tar.xz mirror://gentoo/texlive-module-babel-latin-2013.tar.xz mirror://gentoo/texlive-module-babel-norsk-2013.tar.xz mirror://gentoo/texlive-module-babel-piedmontese-2013.tar.xz mirror://gentoo/texlive-module-babel-romanian-2013.tar.xz mirror://gentoo/texlive-module-babel-romansh-2013.tar.xz mirror://gentoo/texlive-module-babel-samin-2013.tar.xz mirror://gentoo/texlive-module-babel-scottish-2013.tar.xz mirror://gentoo/texlive-module-babel-slovenian-2013.tar.xz mirror://gentoo/texlive-module-babel-swedish-2013.tar.xz mirror://gentoo/texlive-module-babel-turkish-2013.tar.xz mirror://gentoo/texlive-module-babel-welsh-2013.tar.xz mirror://gentoo/texlive-module-finbib-2013.tar.xz mirror://gentoo/texlive-module-hrlatex-2013.tar.xz mirror://gentoo/texlive-module-hyphen-armenian-2013.tar.xz mirror://gentoo/texlive-module-hyphen-croatian-2013.tar.xz mirror://gentoo/texlive-module-hyphen-danish-2013.tar.xz mirror://gentoo/texlive-module-hyphen-dutch-2013.tar.xz mirror://gentoo/texlive-module-hyphen-estonian-2013.tar.xz mirror://gentoo/texlive-module-hyphen-finnish-2013.tar.xz mirror://gentoo/texlive-module-hyphen-friulan-2013.tar.xz mirror://gentoo/texlive-module-hyphen-hungarian-2013.tar.xz mirror://gentoo/texlive-module-hyphen-icelandic-2013.tar.xz mirror://gentoo/texlive-module-hyphen-irish-2013.tar.xz mirror://gentoo/texlive-module-hyphen-kurmanji-2013.tar.xz mirror://gentoo/texlive-module-hyphen-latin-2013.tar.xz mirror://gentoo/texlive-module-hyphen-latvian-2013.tar.xz mirror://gentoo/texlive-module-hyphen-lithuanian-2013.tar.xz mirror://gentoo/texlive-module-hyphen-norwegian-2013.tar.xz mirror://gentoo/texlive-module-hyphen-piedmontese-2013.tar.xz mirror://gentoo/texlive-module-hyphen-romanian-2013.tar.xz mirror://gentoo/texlive-module-hyphen-romansh-2013.tar.xz mirror://gentoo/texlive-module-hyphen-slovenian-2013.tar.xz mirror://gentoo/texlive-module-hyphen-swedish-2013.tar.xz mirror://gentoo/texlive-module-hyphen-turkish-2013.tar.xz mirror://gentoo/texlive-module-hyphen-uppersorbian-2013.tar.xz mirror://gentoo/texlive-module-hyphen-welsh-2013.tar.xz mirror://gentoo/texlive-module-lithuanian-2013.tar.xz mirror://gentoo/texlive-module-lshort-dutch-2013.tar.xz mirror://gentoo/texlive-module-lshort-finnish-2013.tar.xz mirror://gentoo/texlive-module-lshort-slovenian-2013.tar.xz mirror://gentoo/texlive-module-lshort-turkish-2013.tar.xz mirror://gentoo/texlive-module-swebib-2013.tar.xz mirror://gentoo/texlive-module-turkmen-2013.tar.xz mirror://gentoo/texlive-module-collection-langeuropean-2013.tar.xz doc? ( mirror://gentoo/texlive-module-babel-albanian.doc-2013.tar.xz mirror://gentoo/texlive-module-babel-breton.doc-2013.tar.xz mirror://gentoo/texlive-module-babel-croatian.doc-2013.tar.xz mirror://gentoo/texlive-module-babel-danish.doc-2013.tar.xz mirror://gentoo/texlive-module-babel-dutch.doc-2013.tar.xz mirror://gentoo/texlive-module-babel-estonian.doc-2013.tar.xz mirror://gentoo/texlive-module-babel-finnish.doc-2013.tar.xz mirror://gentoo/texlive-module-babel-friulan.doc-2013.tar.xz mirror://gentoo/texlive-module-babel-icelandic.doc-2013.tar.xz mirror://gentoo/texlive-module-babel-irish.doc-2013.tar.xz mirror://gentoo/texlive-module-babel-kurmanji.doc-2013.tar.xz mirror://gentoo/texlive-module-babel-latin.doc-2013.tar.xz mirror://gentoo/texlive-module-babel-norsk.doc-2013.tar.xz mirror://gentoo/texlive-module-babel-piedmontese.doc-2013.tar.xz mirror://gentoo/texlive-module-babel-romanian.doc-2013.tar.xz mirror://gentoo/texlive-module-babel-romansh.doc-2013.tar.xz mirror://gentoo/texlive-module-babel-samin.doc-2013.tar.xz mirror://gentoo/texlive-module-babel-scottish.doc-2013.tar.xz mirror://gentoo/texlive-module-babel-slovenian.doc-2013.tar.xz mirror://gentoo/texlive-module-babel-swedish.doc-2013.tar.xz mirror://gentoo/texlive-module-babel-turkish.doc-2013.tar.xz mirror://gentoo/texlive-module-babel-welsh.doc-2013.tar.xz mirror://gentoo/texlive-module-hrlatex.doc-2013.tar.xz mirror://gentoo/texlive-module-hyphen-hungarian.doc-2013.tar.xz mirror://gentoo/texlive-module-lithuanian.doc-2013.tar.xz mirror://gentoo/texlive-module-lshort-dutch.doc-2013.tar.xz mirror://gentoo/texlive-module-lshort-finnish.doc-2013.tar.xz mirror://gentoo/texlive-module-lshort-slovenian.doc-2013.tar.xz mirror://gentoo/texlive-module-lshort-turkish.doc-2013.tar.xz mirror://gentoo/texlive-module-swebib.doc-2013.tar.xz mirror://gentoo/texlive-module-turkmen.doc-2013.tar.xz ) source? ( mirror://gentoo/texlive-module-babel-albanian.source-2013.tar.xz mirror://gentoo/texlive-module-babel-breton.source-2013.tar.xz mirror://gentoo/texlive-module-babel-croatian.source-2013.tar.xz mirror://gentoo/texlive-module-babel-danish.source-2013.tar.xz mirror://gentoo/texlive-module-babel-dutch.source-2013.tar.xz mirror://gentoo/texlive-module-babel-estonian.source-2013.tar.xz mirror://gentoo/texlive-module-babel-finnish.source-2013.tar.xz mirror://gentoo/texlive-module-babel-friulan.source-2013.tar.xz mirror://gentoo/texlive-module-babel-icelandic.source-2013.tar.xz mirror://gentoo/texlive-module-babel-irish.source-2013.tar.xz mirror://gentoo/texlive-module-babel-kurmanji.source-2013.tar.xz mirror://gentoo/texlive-module-babel-latin.source-2013.tar.xz mirror://gentoo/texlive-module-babel-norsk.source-2013.tar.xz mirror://gentoo/texlive-module-babel-piedmontese.source-2013.tar.xz mirror://gentoo/texlive-module-babel-romanian.source-2013.tar.xz mirror://gentoo/texlive-module-babel-romansh.source-2013.tar.xz mirror://gentoo/texlive-module-babel-samin.source-2013.tar.xz mirror://gentoo/texlive-module-babel-scottish.source-2013.tar.xz mirror://gentoo/texlive-module-babel-slovenian.source-2013.tar.xz mirror://gentoo/texlive-module-babel-swedish.source-2013.tar.xz mirror://gentoo/texlive-module-babel-turkish.source-2013.tar.xz mirror://gentoo/texlive-module-babel-welsh.source-2013.tar.xz mirror://gentoo/texlive-module-hrlatex.source-2013.tar.xz mirror://gentoo/texlive-module-turkmen.source-2013.tar.xz )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b27d2a40ee3c09a614e48afefd3e3a0b
diff --git a/metadata/md5-cache/dev-texlive/texlive-langeuropean-2014 b/metadata/md5-cache/dev-texlive/texlive-langeuropean-2014
deleted file mode 100644
index bcc35af726f6..000000000000
--- a/metadata/md5-cache/dev-texlive/texlive-langeuropean-2014
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=dev-texlive/texlive-basic-2014 !dev-texlive/texlive-langarmenian !dev-texlive/texlive-langcroatian !dev-texlive/texlive-langdanish !dev-texlive/texlive-langdutch !dev-texlive/texlive-langfinnish !dev-texlive/texlive-langhungarian !dev-texlive/texlive-langnorwegia !dev-texlive/texlive-langturkmen !<dev-texlive/texlive-langother-2013 !dev-texlive/texlive-langswedish !dev-texlive/texlive-langlithuanian >=app-text/texlive-core-2014 app-arch/xz-utils
-DESCRIPTION=TeXLive Other European languages
-EAPI=5
-HOMEPAGE=http://www.tug.org/texlive/
-IUSE=source doc
-KEYWORDS=~alpha amd64 arm ~hppa ~mips ppc ~ppc64 ~s390 ~sh x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-1 GPL-2 LPPL-1.2 LPPL-1.3 public-domain
-RDEPEND=>=dev-texlive/texlive-basic-2014 !dev-texlive/texlive-langarmenian !dev-texlive/texlive-langcroatian !dev-texlive/texlive-langdanish !dev-texlive/texlive-langdutch !dev-texlive/texlive-langfinnish !dev-texlive/texlive-langhungarian !dev-texlive/texlive-langnorwegia !dev-texlive/texlive-langturkmen !<dev-texlive/texlive-langother-2013 !dev-texlive/texlive-langswedish !dev-texlive/texlive-langlithuanian >=app-text/texlive-core-2014
-SLOT=0
-SRC_URI=mirror://gentoo/texlive-module-armtex-2014.tar.xz mirror://gentoo/texlive-module-babel-albanian-2014.tar.xz mirror://gentoo/texlive-module-babel-breton-2014.tar.xz mirror://gentoo/texlive-module-babel-croatian-2014.tar.xz mirror://gentoo/texlive-module-babel-danish-2014.tar.xz mirror://gentoo/texlive-module-babel-dutch-2014.tar.xz mirror://gentoo/texlive-module-babel-estonian-2014.tar.xz mirror://gentoo/texlive-module-babel-finnish-2014.tar.xz mirror://gentoo/texlive-module-babel-friulan-2014.tar.xz mirror://gentoo/texlive-module-babel-hungarian-2014.tar.xz mirror://gentoo/texlive-module-babel-icelandic-2014.tar.xz mirror://gentoo/texlive-module-babel-irish-2014.tar.xz mirror://gentoo/texlive-module-babel-kurmanji-2014.tar.xz mirror://gentoo/texlive-module-babel-latin-2014.tar.xz mirror://gentoo/texlive-module-babel-latvian-2014.tar.xz mirror://gentoo/texlive-module-babel-norsk-2014.tar.xz mirror://gentoo/texlive-module-babel-piedmontese-2014.tar.xz mirror://gentoo/texlive-module-babel-romanian-2014.tar.xz mirror://gentoo/texlive-module-babel-romansh-2014.tar.xz mirror://gentoo/texlive-module-babel-samin-2014.tar.xz mirror://gentoo/texlive-module-babel-scottish-2014.tar.xz mirror://gentoo/texlive-module-babel-slovenian-2014.tar.xz mirror://gentoo/texlive-module-babel-swedish-2014.tar.xz mirror://gentoo/texlive-module-babel-turkish-2014.tar.xz mirror://gentoo/texlive-module-babel-welsh-2014.tar.xz mirror://gentoo/texlive-module-finbib-2014.tar.xz mirror://gentoo/texlive-module-hrlatex-2014.tar.xz mirror://gentoo/texlive-module-hyphen-armenian-2014.tar.xz mirror://gentoo/texlive-module-hyphen-croatian-2014.tar.xz mirror://gentoo/texlive-module-hyphen-danish-2014.tar.xz mirror://gentoo/texlive-module-hyphen-dutch-2014.tar.xz mirror://gentoo/texlive-module-hyphen-estonian-2014.tar.xz mirror://gentoo/texlive-module-hyphen-finnish-2014.tar.xz mirror://gentoo/texlive-module-hyphen-friulan-2014.tar.xz mirror://gentoo/texlive-module-hyphen-hungarian-2014.tar.xz mirror://gentoo/texlive-module-hyphen-icelandic-2014.tar.xz mirror://gentoo/texlive-module-hyphen-irish-2014.tar.xz mirror://gentoo/texlive-module-hyphen-kurmanji-2014.tar.xz mirror://gentoo/texlive-module-hyphen-latin-2014.tar.xz mirror://gentoo/texlive-module-hyphen-latvian-2014.tar.xz mirror://gentoo/texlive-module-hyphen-lithuanian-2014.tar.xz mirror://gentoo/texlive-module-hyphen-norwegian-2014.tar.xz mirror://gentoo/texlive-module-hyphen-piedmontese-2014.tar.xz mirror://gentoo/texlive-module-hyphen-romanian-2014.tar.xz mirror://gentoo/texlive-module-hyphen-romansh-2014.tar.xz mirror://gentoo/texlive-module-hyphen-slovenian-2014.tar.xz mirror://gentoo/texlive-module-hyphen-swedish-2014.tar.xz mirror://gentoo/texlive-module-hyphen-turkish-2014.tar.xz mirror://gentoo/texlive-module-hyphen-uppersorbian-2014.tar.xz mirror://gentoo/texlive-module-hyphen-welsh-2014.tar.xz mirror://gentoo/texlive-module-lithuanian-2014.tar.xz mirror://gentoo/texlive-module-lshort-dutch-2014.tar.xz mirror://gentoo/texlive-module-lshort-finnish-2014.tar.xz mirror://gentoo/texlive-module-lshort-slovenian-2014.tar.xz mirror://gentoo/texlive-module-lshort-turkish-2014.tar.xz mirror://gentoo/texlive-module-swebib-2014.tar.xz mirror://gentoo/texlive-module-turkmen-2014.tar.xz mirror://gentoo/texlive-module-collection-langeuropean-2014.tar.xz doc? ( mirror://gentoo/texlive-module-armtex.doc-2014.tar.xz mirror://gentoo/texlive-module-babel-albanian.doc-2014.tar.xz mirror://gentoo/texlive-module-babel-breton.doc-2014.tar.xz mirror://gentoo/texlive-module-babel-croatian.doc-2014.tar.xz mirror://gentoo/texlive-module-babel-danish.doc-2014.tar.xz mirror://gentoo/texlive-module-babel-dutch.doc-2014.tar.xz mirror://gentoo/texlive-module-babel-estonian.doc-2014.tar.xz mirror://gentoo/texlive-module-babel-finnish.doc-2014.tar.xz mirror://gentoo/texlive-module-babel-friulan.doc-2014.tar.xz mirror://gentoo/texlive-module-babel-hungarian.doc-2014.tar.xz mirror://gentoo/texlive-module-babel-icelandic.doc-2014.tar.xz mirror://gentoo/texlive-module-babel-irish.doc-2014.tar.xz mirror://gentoo/texlive-module-babel-kurmanji.doc-2014.tar.xz mirror://gentoo/texlive-module-babel-latin.doc-2014.tar.xz mirror://gentoo/texlive-module-babel-latvian.doc-2014.tar.xz mirror://gentoo/texlive-module-babel-norsk.doc-2014.tar.xz mirror://gentoo/texlive-module-babel-piedmontese.doc-2014.tar.xz mirror://gentoo/texlive-module-babel-romanian.doc-2014.tar.xz mirror://gentoo/texlive-module-babel-romansh.doc-2014.tar.xz mirror://gentoo/texlive-module-babel-samin.doc-2014.tar.xz mirror://gentoo/texlive-module-babel-scottish.doc-2014.tar.xz mirror://gentoo/texlive-module-babel-slovenian.doc-2014.tar.xz mirror://gentoo/texlive-module-babel-swedish.doc-2014.tar.xz mirror://gentoo/texlive-module-babel-turkish.doc-2014.tar.xz mirror://gentoo/texlive-module-babel-welsh.doc-2014.tar.xz mirror://gentoo/texlive-module-hrlatex.doc-2014.tar.xz mirror://gentoo/texlive-module-hyphen-hungarian.doc-2014.tar.xz mirror://gentoo/texlive-module-lithuanian.doc-2014.tar.xz mirror://gentoo/texlive-module-lshort-dutch.doc-2014.tar.xz mirror://gentoo/texlive-module-lshort-finnish.doc-2014.tar.xz mirror://gentoo/texlive-module-lshort-slovenian.doc-2014.tar.xz mirror://gentoo/texlive-module-lshort-turkish.doc-2014.tar.xz mirror://gentoo/texlive-module-swebib.doc-2014.tar.xz mirror://gentoo/texlive-module-turkmen.doc-2014.tar.xz ) source? ( mirror://gentoo/texlive-module-babel-albanian.source-2014.tar.xz mirror://gentoo/texlive-module-babel-breton.source-2014.tar.xz mirror://gentoo/texlive-module-babel-croatian.source-2014.tar.xz mirror://gentoo/texlive-module-babel-danish.source-2014.tar.xz mirror://gentoo/texlive-module-babel-dutch.source-2014.tar.xz mirror://gentoo/texlive-module-babel-estonian.source-2014.tar.xz mirror://gentoo/texlive-module-babel-finnish.source-2014.tar.xz mirror://gentoo/texlive-module-babel-friulan.source-2014.tar.xz mirror://gentoo/texlive-module-babel-icelandic.source-2014.tar.xz mirror://gentoo/texlive-module-babel-irish.source-2014.tar.xz mirror://gentoo/texlive-module-babel-kurmanji.source-2014.tar.xz mirror://gentoo/texlive-module-babel-latin.source-2014.tar.xz mirror://gentoo/texlive-module-babel-latvian.source-2014.tar.xz mirror://gentoo/texlive-module-babel-norsk.source-2014.tar.xz mirror://gentoo/texlive-module-babel-piedmontese.source-2014.tar.xz mirror://gentoo/texlive-module-babel-romanian.source-2014.tar.xz mirror://gentoo/texlive-module-babel-romansh.source-2014.tar.xz mirror://gentoo/texlive-module-babel-samin.source-2014.tar.xz mirror://gentoo/texlive-module-babel-scottish.source-2014.tar.xz mirror://gentoo/texlive-module-babel-slovenian.source-2014.tar.xz mirror://gentoo/texlive-module-babel-swedish.source-2014.tar.xz mirror://gentoo/texlive-module-babel-turkish.source-2014.tar.xz mirror://gentoo/texlive-module-babel-welsh.source-2014.tar.xz mirror://gentoo/texlive-module-hrlatex.source-2014.tar.xz mirror://gentoo/texlive-module-turkmen.source-2014.tar.xz )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1fd4c3c03cfc46e5b0dca716dca0309c
diff --git a/metadata/md5-cache/dev-texlive/texlive-langeuropean-2015 b/metadata/md5-cache/dev-texlive/texlive-langeuropean-2015
deleted file mode 100644
index 0bed3378e68c..000000000000
--- a/metadata/md5-cache/dev-texlive/texlive-langeuropean-2015
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=dev-texlive/texlive-basic-2015 !dev-texlive/texlive-langarmenian !dev-texlive/texlive-langcroatian !dev-texlive/texlive-langdanish !dev-texlive/texlive-langdutch !dev-texlive/texlive-langfinnish !dev-texlive/texlive-langhungarian !dev-texlive/texlive-langnorwegia !dev-texlive/texlive-langturkmen !<dev-texlive/texlive-langother-2013 !dev-texlive/texlive-langswedish !dev-texlive/texlive-langlithuanian !dev-texlive/texlive-langlatvian !dev-texlive/texlive-langlatin !dev-texlive/texlive-langnorwegian >=app-text/texlive-core-2015 app-arch/xz-utils
-DESCRIPTION=TeXLive Other European languages
-EAPI=5
-HOMEPAGE=http://www.tug.org/texlive/
-IUSE=source doc
-KEYWORDS=alpha amd64 arm hppa ~mips ppc ppc64 ~s390 ~sh x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-1 GPL-2 LPPL-1.2 LPPL-1.3 public-domain
-RDEPEND=>=dev-texlive/texlive-basic-2015 !dev-texlive/texlive-langarmenian !dev-texlive/texlive-langcroatian !dev-texlive/texlive-langdanish !dev-texlive/texlive-langdutch !dev-texlive/texlive-langfinnish !dev-texlive/texlive-langhungarian !dev-texlive/texlive-langnorwegia !dev-texlive/texlive-langturkmen !<dev-texlive/texlive-langother-2013 !dev-texlive/texlive-langswedish !dev-texlive/texlive-langlithuanian !dev-texlive/texlive-langlatvian !dev-texlive/texlive-langlatin !dev-texlive/texlive-langnorwegian >=app-text/texlive-core-2015
-SLOT=0
-SRC_URI=mirror://gentoo/texlive-module-armtex-2015.tar.xz mirror://gentoo/texlive-module-babel-albanian-2015.tar.xz mirror://gentoo/texlive-module-babel-bosnian-2015.tar.xz mirror://gentoo/texlive-module-babel-breton-2015.tar.xz mirror://gentoo/texlive-module-babel-croatian-2015.tar.xz mirror://gentoo/texlive-module-babel-danish-2015.tar.xz mirror://gentoo/texlive-module-babel-dutch-2015.tar.xz mirror://gentoo/texlive-module-babel-estonian-2015.tar.xz mirror://gentoo/texlive-module-babel-finnish-2015.tar.xz mirror://gentoo/texlive-module-babel-friulan-2015.tar.xz mirror://gentoo/texlive-module-babel-hungarian-2015.tar.xz mirror://gentoo/texlive-module-babel-icelandic-2015.tar.xz mirror://gentoo/texlive-module-babel-irish-2015.tar.xz mirror://gentoo/texlive-module-babel-kurmanji-2015.tar.xz mirror://gentoo/texlive-module-babel-latin-2015.tar.xz mirror://gentoo/texlive-module-babel-latvian-2015.tar.xz mirror://gentoo/texlive-module-babel-norsk-2015.tar.xz mirror://gentoo/texlive-module-babel-piedmontese-2015.tar.xz mirror://gentoo/texlive-module-babel-romanian-2015.tar.xz mirror://gentoo/texlive-module-babel-romansh-2015.tar.xz mirror://gentoo/texlive-module-babel-samin-2015.tar.xz mirror://gentoo/texlive-module-babel-scottish-2015.tar.xz mirror://gentoo/texlive-module-babel-slovenian-2015.tar.xz mirror://gentoo/texlive-module-babel-swedish-2015.tar.xz mirror://gentoo/texlive-module-babel-turkish-2015.tar.xz mirror://gentoo/texlive-module-babel-welsh-2015.tar.xz mirror://gentoo/texlive-module-finbib-2015.tar.xz mirror://gentoo/texlive-module-hrlatex-2015.tar.xz mirror://gentoo/texlive-module-hyphen-armenian-2015.tar.xz mirror://gentoo/texlive-module-hyphen-croatian-2015.tar.xz mirror://gentoo/texlive-module-hyphen-danish-2015.tar.xz mirror://gentoo/texlive-module-hyphen-dutch-2015.tar.xz mirror://gentoo/texlive-module-hyphen-estonian-2015.tar.xz mirror://gentoo/texlive-module-hyphen-finnish-2015.tar.xz mirror://gentoo/texlive-module-hyphen-friulan-2015.tar.xz mirror://gentoo/texlive-module-hyphen-hungarian-2015.tar.xz mirror://gentoo/texlive-module-hyphen-icelandic-2015.tar.xz mirror://gentoo/texlive-module-hyphen-irish-2015.tar.xz mirror://gentoo/texlive-module-hyphen-kurmanji-2015.tar.xz mirror://gentoo/texlive-module-hyphen-latin-2015.tar.xz mirror://gentoo/texlive-module-hyphen-latvian-2015.tar.xz mirror://gentoo/texlive-module-hyphen-lithuanian-2015.tar.xz mirror://gentoo/texlive-module-hyphen-norwegian-2015.tar.xz mirror://gentoo/texlive-module-hyphen-piedmontese-2015.tar.xz mirror://gentoo/texlive-module-hyphen-romanian-2015.tar.xz mirror://gentoo/texlive-module-hyphen-romansh-2015.tar.xz mirror://gentoo/texlive-module-hyphen-slovenian-2015.tar.xz mirror://gentoo/texlive-module-hyphen-swedish-2015.tar.xz mirror://gentoo/texlive-module-hyphen-turkish-2015.tar.xz mirror://gentoo/texlive-module-hyphen-uppersorbian-2015.tar.xz mirror://gentoo/texlive-module-hyphen-welsh-2015.tar.xz mirror://gentoo/texlive-module-lithuanian-2015.tar.xz mirror://gentoo/texlive-module-lshort-dutch-2015.tar.xz mirror://gentoo/texlive-module-lshort-finnish-2015.tar.xz mirror://gentoo/texlive-module-lshort-slovenian-2015.tar.xz mirror://gentoo/texlive-module-lshort-turkish-2015.tar.xz mirror://gentoo/texlive-module-swebib-2015.tar.xz mirror://gentoo/texlive-module-turkmen-2015.tar.xz mirror://gentoo/texlive-module-collection-langeuropean-2015.tar.xz doc? ( mirror://gentoo/texlive-module-armtex.doc-2015.tar.xz mirror://gentoo/texlive-module-babel-albanian.doc-2015.tar.xz mirror://gentoo/texlive-module-babel-bosnian.doc-2015.tar.xz mirror://gentoo/texlive-module-babel-breton.doc-2015.tar.xz mirror://gentoo/texlive-module-babel-croatian.doc-2015.tar.xz mirror://gentoo/texlive-module-babel-danish.doc-2015.tar.xz mirror://gentoo/texlive-module-babel-dutch.doc-2015.tar.xz mirror://gentoo/texlive-module-babel-estonian.doc-2015.tar.xz mirror://gentoo/texlive-module-babel-finnish.doc-2015.tar.xz mirror://gentoo/texlive-module-babel-friulan.doc-2015.tar.xz mirror://gentoo/texlive-module-babel-hungarian.doc-2015.tar.xz mirror://gentoo/texlive-module-babel-icelandic.doc-2015.tar.xz mirror://gentoo/texlive-module-babel-irish.doc-2015.tar.xz mirror://gentoo/texlive-module-babel-kurmanji.doc-2015.tar.xz mirror://gentoo/texlive-module-babel-latin.doc-2015.tar.xz mirror://gentoo/texlive-module-babel-latvian.doc-2015.tar.xz mirror://gentoo/texlive-module-babel-norsk.doc-2015.tar.xz mirror://gentoo/texlive-module-babel-piedmontese.doc-2015.tar.xz mirror://gentoo/texlive-module-babel-romanian.doc-2015.tar.xz mirror://gentoo/texlive-module-babel-romansh.doc-2015.tar.xz mirror://gentoo/texlive-module-babel-samin.doc-2015.tar.xz mirror://gentoo/texlive-module-babel-scottish.doc-2015.tar.xz mirror://gentoo/texlive-module-babel-slovenian.doc-2015.tar.xz mirror://gentoo/texlive-module-babel-swedish.doc-2015.tar.xz mirror://gentoo/texlive-module-babel-turkish.doc-2015.tar.xz mirror://gentoo/texlive-module-babel-welsh.doc-2015.tar.xz mirror://gentoo/texlive-module-hrlatex.doc-2015.tar.xz mirror://gentoo/texlive-module-hyphen-hungarian.doc-2015.tar.xz mirror://gentoo/texlive-module-lithuanian.doc-2015.tar.xz mirror://gentoo/texlive-module-lshort-dutch.doc-2015.tar.xz mirror://gentoo/texlive-module-lshort-finnish.doc-2015.tar.xz mirror://gentoo/texlive-module-lshort-slovenian.doc-2015.tar.xz mirror://gentoo/texlive-module-lshort-turkish.doc-2015.tar.xz mirror://gentoo/texlive-module-swebib.doc-2015.tar.xz mirror://gentoo/texlive-module-turkmen.doc-2015.tar.xz ) source? ( mirror://gentoo/texlive-module-babel-albanian.source-2015.tar.xz mirror://gentoo/texlive-module-babel-bosnian.source-2015.tar.xz mirror://gentoo/texlive-module-babel-breton.source-2015.tar.xz mirror://gentoo/texlive-module-babel-croatian.source-2015.tar.xz mirror://gentoo/texlive-module-babel-danish.source-2015.tar.xz mirror://gentoo/texlive-module-babel-dutch.source-2015.tar.xz mirror://gentoo/texlive-module-babel-estonian.source-2015.tar.xz mirror://gentoo/texlive-module-babel-finnish.source-2015.tar.xz mirror://gentoo/texlive-module-babel-friulan.source-2015.tar.xz mirror://gentoo/texlive-module-babel-icelandic.source-2015.tar.xz mirror://gentoo/texlive-module-babel-irish.source-2015.tar.xz mirror://gentoo/texlive-module-babel-kurmanji.source-2015.tar.xz mirror://gentoo/texlive-module-babel-latin.source-2015.tar.xz mirror://gentoo/texlive-module-babel-latvian.source-2015.tar.xz mirror://gentoo/texlive-module-babel-norsk.source-2015.tar.xz mirror://gentoo/texlive-module-babel-piedmontese.source-2015.tar.xz mirror://gentoo/texlive-module-babel-romanian.source-2015.tar.xz mirror://gentoo/texlive-module-babel-romansh.source-2015.tar.xz mirror://gentoo/texlive-module-babel-samin.source-2015.tar.xz mirror://gentoo/texlive-module-babel-scottish.source-2015.tar.xz mirror://gentoo/texlive-module-babel-slovenian.source-2015.tar.xz mirror://gentoo/texlive-module-babel-swedish.source-2015.tar.xz mirror://gentoo/texlive-module-babel-turkish.source-2015.tar.xz mirror://gentoo/texlive-module-babel-welsh.source-2015.tar.xz mirror://gentoo/texlive-module-hrlatex.source-2015.tar.xz mirror://gentoo/texlive-module-turkmen.source-2015.tar.xz )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ad77678dfbbbcdbcb14794087502d4ed
diff --git a/metadata/md5-cache/dev-texlive/texlive-langeuropean-2016 b/metadata/md5-cache/dev-texlive/texlive-langeuropean-2016
deleted file mode 100644
index c7b72e2797bb..000000000000
--- a/metadata/md5-cache/dev-texlive/texlive-langeuropean-2016
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=dev-texlive/texlive-basic-2016 !dev-texlive/texlive-langarmenian !dev-texlive/texlive-langcroatian !dev-texlive/texlive-langdanish !dev-texlive/texlive-langdutch !dev-texlive/texlive-langfinnish !dev-texlive/texlive-langhungarian !dev-texlive/texlive-langnorwegia !dev-texlive/texlive-langturkmen !<dev-texlive/texlive-langother-2013 !dev-texlive/texlive-langswedish !dev-texlive/texlive-langlithuanian !dev-texlive/texlive-langlatvian !dev-texlive/texlive-langlatin !dev-texlive/texlive-langnorwegian !<dev-texlive/texlive-basic-2016 >=app-text/texlive-core-2016 app-arch/xz-utils
-DESCRIPTION=TeXLive Other European languages
-EAPI=5
-HOMEPAGE=http://www.tug.org/texlive/
-IUSE=source doc
-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 ~x64-solaris ~x86-solaris
-LICENSE=GPL-1 GPL-2 LPPL-1.2 LPPL-1.3 public-domain
-RDEPEND=>=dev-texlive/texlive-basic-2016 !dev-texlive/texlive-langarmenian !dev-texlive/texlive-langcroatian !dev-texlive/texlive-langdanish !dev-texlive/texlive-langdutch !dev-texlive/texlive-langfinnish !dev-texlive/texlive-langhungarian !dev-texlive/texlive-langnorwegia !dev-texlive/texlive-langturkmen !<dev-texlive/texlive-langother-2013 !dev-texlive/texlive-langswedish !dev-texlive/texlive-langlithuanian !dev-texlive/texlive-langlatvian !dev-texlive/texlive-langlatin !dev-texlive/texlive-langnorwegian !<dev-texlive/texlive-basic-2016 >=app-text/texlive-core-2016
-SLOT=0
-SRC_URI=mirror://gentoo/texlive-module-armtex-2016.tar.xz mirror://gentoo/texlive-module-babel-albanian-2016.tar.xz mirror://gentoo/texlive-module-babel-bosnian-2016.tar.xz mirror://gentoo/texlive-module-babel-breton-2016.tar.xz mirror://gentoo/texlive-module-babel-croatian-2016.tar.xz mirror://gentoo/texlive-module-babel-danish-2016.tar.xz mirror://gentoo/texlive-module-babel-dutch-2016.tar.xz mirror://gentoo/texlive-module-babel-estonian-2016.tar.xz mirror://gentoo/texlive-module-babel-finnish-2016.tar.xz mirror://gentoo/texlive-module-babel-friulan-2016.tar.xz mirror://gentoo/texlive-module-babel-hungarian-2016.tar.xz mirror://gentoo/texlive-module-babel-icelandic-2016.tar.xz mirror://gentoo/texlive-module-babel-irish-2016.tar.xz mirror://gentoo/texlive-module-babel-kurmanji-2016.tar.xz mirror://gentoo/texlive-module-babel-latin-2016.tar.xz mirror://gentoo/texlive-module-babel-latvian-2016.tar.xz mirror://gentoo/texlive-module-babel-macedonian-2016.tar.xz mirror://gentoo/texlive-module-babel-norsk-2016.tar.xz mirror://gentoo/texlive-module-babel-occitan-2016.tar.xz mirror://gentoo/texlive-module-babel-piedmontese-2016.tar.xz mirror://gentoo/texlive-module-babel-romanian-2016.tar.xz mirror://gentoo/texlive-module-babel-romansh-2016.tar.xz mirror://gentoo/texlive-module-babel-samin-2016.tar.xz mirror://gentoo/texlive-module-babel-scottish-2016.tar.xz mirror://gentoo/texlive-module-babel-slovenian-2016.tar.xz mirror://gentoo/texlive-module-babel-swedish-2016.tar.xz mirror://gentoo/texlive-module-babel-turkish-2016.tar.xz mirror://gentoo/texlive-module-babel-welsh-2016.tar.xz mirror://gentoo/texlive-module-finbib-2016.tar.xz mirror://gentoo/texlive-module-gloss-occitan-2016.tar.xz mirror://gentoo/texlive-module-hrlatex-2016.tar.xz mirror://gentoo/texlive-module-hyphen-armenian-2016.tar.xz mirror://gentoo/texlive-module-hyphen-croatian-2016.tar.xz mirror://gentoo/texlive-module-hyphen-danish-2016.tar.xz mirror://gentoo/texlive-module-hyphen-dutch-2016.tar.xz mirror://gentoo/texlive-module-hyphen-estonian-2016.tar.xz mirror://gentoo/texlive-module-hyphen-finnish-2016.tar.xz mirror://gentoo/texlive-module-hyphen-friulan-2016.tar.xz mirror://gentoo/texlive-module-hyphen-hungarian-2016.tar.xz mirror://gentoo/texlive-module-hyphen-icelandic-2016.tar.xz mirror://gentoo/texlive-module-hyphen-irish-2016.tar.xz mirror://gentoo/texlive-module-hyphen-kurmanji-2016.tar.xz mirror://gentoo/texlive-module-hyphen-latin-2016.tar.xz mirror://gentoo/texlive-module-hyphen-latvian-2016.tar.xz mirror://gentoo/texlive-module-hyphen-lithuanian-2016.tar.xz mirror://gentoo/texlive-module-hyphen-norwegian-2016.tar.xz mirror://gentoo/texlive-module-hyphen-occitan-2016.tar.xz mirror://gentoo/texlive-module-hyphen-piedmontese-2016.tar.xz mirror://gentoo/texlive-module-hyphen-romanian-2016.tar.xz mirror://gentoo/texlive-module-hyphen-romansh-2016.tar.xz mirror://gentoo/texlive-module-hyphen-slovenian-2016.tar.xz mirror://gentoo/texlive-module-hyphen-swedish-2016.tar.xz mirror://gentoo/texlive-module-hyphen-turkish-2016.tar.xz mirror://gentoo/texlive-module-hyphen-uppersorbian-2016.tar.xz mirror://gentoo/texlive-module-hyphen-welsh-2016.tar.xz mirror://gentoo/texlive-module-lithuanian-2016.tar.xz mirror://gentoo/texlive-module-lshort-dutch-2016.tar.xz mirror://gentoo/texlive-module-lshort-estonian-2016.tar.xz mirror://gentoo/texlive-module-lshort-finnish-2016.tar.xz mirror://gentoo/texlive-module-lshort-slovenian-2016.tar.xz mirror://gentoo/texlive-module-lshort-turkish-2016.tar.xz mirror://gentoo/texlive-module-nevelok-2016.tar.xz mirror://gentoo/texlive-module-swebib-2016.tar.xz mirror://gentoo/texlive-module-turkmen-2016.tar.xz mirror://gentoo/texlive-module-collection-langeuropean-2016.tar.xz doc? ( mirror://gentoo/texlive-module-armtex.doc-2016.tar.xz mirror://gentoo/texlive-module-babel-albanian.doc-2016.tar.xz mirror://gentoo/texlive-module-babel-bosnian.doc-2016.tar.xz mirror://gentoo/texlive-module-babel-breton.doc-2016.tar.xz mirror://gentoo/texlive-module-babel-croatian.doc-2016.tar.xz mirror://gentoo/texlive-module-babel-danish.doc-2016.tar.xz mirror://gentoo/texlive-module-babel-dutch.doc-2016.tar.xz mirror://gentoo/texlive-module-babel-estonian.doc-2016.tar.xz mirror://gentoo/texlive-module-babel-finnish.doc-2016.tar.xz mirror://gentoo/texlive-module-babel-friulan.doc-2016.tar.xz mirror://gentoo/texlive-module-babel-hungarian.doc-2016.tar.xz mirror://gentoo/texlive-module-babel-icelandic.doc-2016.tar.xz mirror://gentoo/texlive-module-babel-irish.doc-2016.tar.xz mirror://gentoo/texlive-module-babel-kurmanji.doc-2016.tar.xz mirror://gentoo/texlive-module-babel-latin.doc-2016.tar.xz mirror://gentoo/texlive-module-babel-latvian.doc-2016.tar.xz mirror://gentoo/texlive-module-babel-macedonian.doc-2016.tar.xz mirror://gentoo/texlive-module-babel-norsk.doc-2016.tar.xz mirror://gentoo/texlive-module-babel-occitan.doc-2016.tar.xz mirror://gentoo/texlive-module-babel-piedmontese.doc-2016.tar.xz mirror://gentoo/texlive-module-babel-romanian.doc-2016.tar.xz mirror://gentoo/texlive-module-babel-romansh.doc-2016.tar.xz mirror://gentoo/texlive-module-babel-samin.doc-2016.tar.xz mirror://gentoo/texlive-module-babel-scottish.doc-2016.tar.xz mirror://gentoo/texlive-module-babel-slovenian.doc-2016.tar.xz mirror://gentoo/texlive-module-babel-swedish.doc-2016.tar.xz mirror://gentoo/texlive-module-babel-turkish.doc-2016.tar.xz mirror://gentoo/texlive-module-babel-welsh.doc-2016.tar.xz mirror://gentoo/texlive-module-gloss-occitan.doc-2016.tar.xz mirror://gentoo/texlive-module-hrlatex.doc-2016.tar.xz mirror://gentoo/texlive-module-hyphen-hungarian.doc-2016.tar.xz mirror://gentoo/texlive-module-lithuanian.doc-2016.tar.xz mirror://gentoo/texlive-module-lshort-dutch.doc-2016.tar.xz mirror://gentoo/texlive-module-lshort-estonian.doc-2016.tar.xz mirror://gentoo/texlive-module-lshort-finnish.doc-2016.tar.xz mirror://gentoo/texlive-module-lshort-slovenian.doc-2016.tar.xz mirror://gentoo/texlive-module-lshort-turkish.doc-2016.tar.xz mirror://gentoo/texlive-module-nevelok.doc-2016.tar.xz mirror://gentoo/texlive-module-swebib.doc-2016.tar.xz mirror://gentoo/texlive-module-turkmen.doc-2016.tar.xz ) source? ( mirror://gentoo/texlive-module-babel-albanian.source-2016.tar.xz mirror://gentoo/texlive-module-babel-bosnian.source-2016.tar.xz mirror://gentoo/texlive-module-babel-breton.source-2016.tar.xz mirror://gentoo/texlive-module-babel-croatian.source-2016.tar.xz mirror://gentoo/texlive-module-babel-danish.source-2016.tar.xz mirror://gentoo/texlive-module-babel-dutch.source-2016.tar.xz mirror://gentoo/texlive-module-babel-estonian.source-2016.tar.xz mirror://gentoo/texlive-module-babel-finnish.source-2016.tar.xz mirror://gentoo/texlive-module-babel-friulan.source-2016.tar.xz mirror://gentoo/texlive-module-babel-icelandic.source-2016.tar.xz mirror://gentoo/texlive-module-babel-irish.source-2016.tar.xz mirror://gentoo/texlive-module-babel-kurmanji.source-2016.tar.xz mirror://gentoo/texlive-module-babel-latin.source-2016.tar.xz mirror://gentoo/texlive-module-babel-latvian.source-2016.tar.xz mirror://gentoo/texlive-module-babel-macedonian.source-2016.tar.xz mirror://gentoo/texlive-module-babel-norsk.source-2016.tar.xz mirror://gentoo/texlive-module-babel-occitan.source-2016.tar.xz mirror://gentoo/texlive-module-babel-piedmontese.source-2016.tar.xz mirror://gentoo/texlive-module-babel-romanian.source-2016.tar.xz mirror://gentoo/texlive-module-babel-romansh.source-2016.tar.xz mirror://gentoo/texlive-module-babel-samin.source-2016.tar.xz mirror://gentoo/texlive-module-babel-scottish.source-2016.tar.xz mirror://gentoo/texlive-module-babel-slovenian.source-2016.tar.xz mirror://gentoo/texlive-module-babel-swedish.source-2016.tar.xz mirror://gentoo/texlive-module-babel-turkish.source-2016.tar.xz mirror://gentoo/texlive-module-babel-welsh.source-2016.tar.xz mirror://gentoo/texlive-module-gloss-occitan.source-2016.tar.xz mirror://gentoo/texlive-module-hrlatex.source-2016.tar.xz mirror://gentoo/texlive-module-hyphen-armenian.source-2016.tar.xz mirror://gentoo/texlive-module-hyphen-turkish.source-2016.tar.xz mirror://gentoo/texlive-module-nevelok.source-2016.tar.xz mirror://gentoo/texlive-module-turkmen.source-2016.tar.xz )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f2b050e4735990b375a94688534f19b4
diff --git a/metadata/md5-cache/dev-texlive/texlive-langeuropean-2017 b/metadata/md5-cache/dev-texlive/texlive-langeuropean-2017
index 0fa101ed49ac..b8692db6c32b 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langeuropean-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-langeuropean-2017
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive Other European languages
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-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 ~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 ~x64-solaris ~x86-solaris
 LICENSE=GPL-1 GPL-2 LPPL-1.2 LPPL-1.3 public-domain TeX-other-free
 RDEPEND=>=dev-texlive/texlive-basic-2017 !dev-texlive/texlive-langarmenian !dev-texlive/texlive-langcroatian !dev-texlive/texlive-langdanish !dev-texlive/texlive-langdutch !dev-texlive/texlive-langfinnish !dev-texlive/texlive-langhungarian !dev-texlive/texlive-langnorwegia !dev-texlive/texlive-langturkmen !<dev-texlive/texlive-langother-2013 !dev-texlive/texlive-langswedish !dev-texlive/texlive-langlithuanian !dev-texlive/texlive-langlatvian !dev-texlive/texlive-langlatin !dev-texlive/texlive-langnorwegian !<dev-texlive/texlive-basic-2016 >=app-text/texlive-core-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-armtex-2017.tar.xz mirror://gentoo/texlive-module-babel-albanian-2017.tar.xz mirror://gentoo/texlive-module-babel-bosnian-2017.tar.xz mirror://gentoo/texlive-module-babel-breton-2017.tar.xz mirror://gentoo/texlive-module-babel-croatian-2017.tar.xz mirror://gentoo/texlive-module-babel-danish-2017.tar.xz mirror://gentoo/texlive-module-babel-dutch-2017.tar.xz mirror://gentoo/texlive-module-babel-estonian-2017.tar.xz mirror://gentoo/texlive-module-babel-finnish-2017.tar.xz mirror://gentoo/texlive-module-babel-friulan-2017.tar.xz mirror://gentoo/texlive-module-babel-hungarian-2017.tar.xz mirror://gentoo/texlive-module-babel-icelandic-2017.tar.xz mirror://gentoo/texlive-module-babel-irish-2017.tar.xz mirror://gentoo/texlive-module-babel-kurmanji-2017.tar.xz mirror://gentoo/texlive-module-babel-latin-2017.tar.xz mirror://gentoo/texlive-module-babel-latvian-2017.tar.xz mirror://gentoo/texlive-module-babel-macedonian-2017.tar.xz mirror://gentoo/texlive-module-babel-norsk-2017.tar.xz mirror://gentoo/texlive-module-babel-occitan-2017.tar.xz mirror://gentoo/texlive-module-babel-piedmontese-2017.tar.xz mirror://gentoo/texlive-module-babel-romanian-2017.tar.xz mirror://gentoo/texlive-module-babel-romansh-2017.tar.xz mirror://gentoo/texlive-module-babel-samin-2017.tar.xz mirror://gentoo/texlive-module-babel-scottish-2017.tar.xz mirror://gentoo/texlive-module-babel-slovenian-2017.tar.xz mirror://gentoo/texlive-module-babel-swedish-2017.tar.xz mirror://gentoo/texlive-module-babel-turkish-2017.tar.xz mirror://gentoo/texlive-module-babel-welsh-2017.tar.xz mirror://gentoo/texlive-module-finbib-2017.tar.xz mirror://gentoo/texlive-module-gloss-occitan-2017.tar.xz mirror://gentoo/texlive-module-hrlatex-2017.tar.xz mirror://gentoo/texlive-module-hyphen-croatian-2017.tar.xz mirror://gentoo/texlive-module-hyphen-danish-2017.tar.xz mirror://gentoo/texlive-module-hyphen-dutch-2017.tar.xz mirror://gentoo/texlive-module-hyphen-estonian-2017.tar.xz mirror://gentoo/texlive-module-hyphen-finnish-2017.tar.xz mirror://gentoo/texlive-module-hyphen-friulan-2017.tar.xz mirror://gentoo/texlive-module-hyphen-hungarian-2017.tar.xz mirror://gentoo/texlive-module-hyphen-icelandic-2017.tar.xz mirror://gentoo/texlive-module-hyphen-irish-2017.tar.xz mirror://gentoo/texlive-module-hyphen-kurmanji-2017.tar.xz mirror://gentoo/texlive-module-hyphen-latin-2017.tar.xz mirror://gentoo/texlive-module-hyphen-latvian-2017.tar.xz mirror://gentoo/texlive-module-hyphen-lithuanian-2017.tar.xz mirror://gentoo/texlive-module-hyphen-norwegian-2017.tar.xz mirror://gentoo/texlive-module-hyphen-occitan-2017.tar.xz mirror://gentoo/texlive-module-hyphen-piedmontese-2017.tar.xz mirror://gentoo/texlive-module-hyphen-romanian-2017.tar.xz mirror://gentoo/texlive-module-hyphen-romansh-2017.tar.xz mirror://gentoo/texlive-module-hyphen-slovenian-2017.tar.xz mirror://gentoo/texlive-module-hyphen-swedish-2017.tar.xz mirror://gentoo/texlive-module-hyphen-turkish-2017.tar.xz mirror://gentoo/texlive-module-hyphen-uppersorbian-2017.tar.xz mirror://gentoo/texlive-module-hyphen-welsh-2017.tar.xz mirror://gentoo/texlive-module-lithuanian-2017.tar.xz mirror://gentoo/texlive-module-lshort-dutch-2017.tar.xz mirror://gentoo/texlive-module-lshort-estonian-2017.tar.xz mirror://gentoo/texlive-module-lshort-finnish-2017.tar.xz mirror://gentoo/texlive-module-lshort-slovenian-2017.tar.xz mirror://gentoo/texlive-module-lshort-turkish-2017.tar.xz mirror://gentoo/texlive-module-nevelok-2017.tar.xz mirror://gentoo/texlive-module-swebib-2017.tar.xz mirror://gentoo/texlive-module-turkmen-2017.tar.xz mirror://gentoo/texlive-module-collection-langeuropean-2017.tar.xz doc? ( mirror://gentoo/texlive-module-armtex.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-albanian.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-bosnian.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-breton.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-croatian.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-danish.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-dutch.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-estonian.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-finnish.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-friulan.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-hungarian.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-icelandic.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-irish.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-kurmanji.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-latin.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-latvian.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-macedonian.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-norsk.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-occitan.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-piedmontese.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-romanian.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-romansh.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-samin.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-scottish.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-slovenian.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-swedish.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-turkish.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-welsh.doc-2017.tar.xz mirror://gentoo/texlive-module-gloss-occitan.doc-2017.tar.xz mirror://gentoo/texlive-module-hrlatex.doc-2017.tar.xz mirror://gentoo/texlive-module-hyphen-hungarian.doc-2017.tar.xz mirror://gentoo/texlive-module-lithuanian.doc-2017.tar.xz mirror://gentoo/texlive-module-lshort-dutch.doc-2017.tar.xz mirror://gentoo/texlive-module-lshort-estonian.doc-2017.tar.xz mirror://gentoo/texlive-module-lshort-finnish.doc-2017.tar.xz mirror://gentoo/texlive-module-lshort-slovenian.doc-2017.tar.xz mirror://gentoo/texlive-module-lshort-turkish.doc-2017.tar.xz mirror://gentoo/texlive-module-nevelok.doc-2017.tar.xz mirror://gentoo/texlive-module-swebib.doc-2017.tar.xz mirror://gentoo/texlive-module-turkmen.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-babel-albanian.source-2017.tar.xz mirror://gentoo/texlive-module-babel-bosnian.source-2017.tar.xz mirror://gentoo/texlive-module-babel-breton.source-2017.tar.xz mirror://gentoo/texlive-module-babel-croatian.source-2017.tar.xz mirror://gentoo/texlive-module-babel-danish.source-2017.tar.xz mirror://gentoo/texlive-module-babel-dutch.source-2017.tar.xz mirror://gentoo/texlive-module-babel-estonian.source-2017.tar.xz mirror://gentoo/texlive-module-babel-finnish.source-2017.tar.xz mirror://gentoo/texlive-module-babel-friulan.source-2017.tar.xz mirror://gentoo/texlive-module-babel-icelandic.source-2017.tar.xz mirror://gentoo/texlive-module-babel-irish.source-2017.tar.xz mirror://gentoo/texlive-module-babel-kurmanji.source-2017.tar.xz mirror://gentoo/texlive-module-babel-latin.source-2017.tar.xz mirror://gentoo/texlive-module-babel-latvian.source-2017.tar.xz mirror://gentoo/texlive-module-babel-macedonian.source-2017.tar.xz mirror://gentoo/texlive-module-babel-norsk.source-2017.tar.xz mirror://gentoo/texlive-module-babel-occitan.source-2017.tar.xz mirror://gentoo/texlive-module-babel-piedmontese.source-2017.tar.xz mirror://gentoo/texlive-module-babel-romanian.source-2017.tar.xz mirror://gentoo/texlive-module-babel-romansh.source-2017.tar.xz mirror://gentoo/texlive-module-babel-samin.source-2017.tar.xz mirror://gentoo/texlive-module-babel-scottish.source-2017.tar.xz mirror://gentoo/texlive-module-babel-slovenian.source-2017.tar.xz mirror://gentoo/texlive-module-babel-swedish.source-2017.tar.xz mirror://gentoo/texlive-module-babel-turkish.source-2017.tar.xz mirror://gentoo/texlive-module-babel-welsh.source-2017.tar.xz mirror://gentoo/texlive-module-gloss-occitan.source-2017.tar.xz mirror://gentoo/texlive-module-hrlatex.source-2017.tar.xz mirror://gentoo/texlive-module-hyphen-turkish.source-2017.tar.xz mirror://gentoo/texlive-module-nevelok.source-2017.tar.xz mirror://gentoo/texlive-module-turkmen.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f7c32ffd8f4dd5276612fefe2f1541e3
+_md5_=e7f3ec2f171455c518b2d3f39828bdcd
diff --git a/metadata/md5-cache/dev-texlive/texlive-langfrench-2015 b/metadata/md5-cache/dev-texlive/texlive-langfrench-2015
deleted file mode 100644
index 6b0d8dfec7a4..000000000000
--- a/metadata/md5-cache/dev-texlive/texlive-langfrench-2015
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=dev-texlive/texlive-basic-2015 !dev-texlive/texlive-documentation-french >=app-text/texlive-core-2015 app-arch/xz-utils
-DESCRIPTION=TeXLive French
-EAPI=5
-HOMEPAGE=http://www.tug.org/texlive/
-IUSE=source doc
-KEYWORDS=alpha amd64 arm hppa ~mips ppc ppc64 ~s390 ~sh x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-1 GPL-2 LPPL-1.2 LPPL-1.3 public-domain TeX-other-free
-RDEPEND=>=dev-texlive/texlive-basic-2015 !dev-texlive/texlive-documentation-french >=app-text/texlive-core-2015
-SLOT=0
-SRC_URI=mirror://gentoo/texlive-module-aeguill-2015.tar.xz mirror://gentoo/texlive-module-apprends-latex-2015.tar.xz mirror://gentoo/texlive-module-babel-basque-2015.tar.xz mirror://gentoo/texlive-module-babel-french-2015.tar.xz mirror://gentoo/texlive-module-basque-book-2015.tar.xz mirror://gentoo/texlive-module-basque-date-2015.tar.xz mirror://gentoo/texlive-module-bib-fr-2015.tar.xz mirror://gentoo/texlive-module-bibleref-french-2015.tar.xz mirror://gentoo/texlive-module-booktabs-fr-2015.tar.xz mirror://gentoo/texlive-module-droit-fr-2015.tar.xz mirror://gentoo/texlive-module-epslatex-fr-2015.tar.xz mirror://gentoo/texlive-module-facture-2015.tar.xz mirror://gentoo/texlive-module-frenchle-2015.tar.xz mirror://gentoo/texlive-module-frletter-2015.tar.xz mirror://gentoo/texlive-module-hyphen-basque-2015.tar.xz mirror://gentoo/texlive-module-hyphen-french-2015.tar.xz mirror://gentoo/texlive-module-impatient-fr-2015.tar.xz mirror://gentoo/texlive-module-impnattypo-2015.tar.xz mirror://gentoo/texlive-module-l2tabu-french-2015.tar.xz mirror://gentoo/texlive-module-lshort-french-2015.tar.xz mirror://gentoo/texlive-module-mafr-2015.tar.xz mirror://gentoo/texlive-module-tabvar-2015.tar.xz mirror://gentoo/texlive-module-tdsfrmath-2015.tar.xz mirror://gentoo/texlive-module-texlive-fr-2015.tar.xz mirror://gentoo/texlive-module-translation-array-fr-2015.tar.xz mirror://gentoo/texlive-module-translation-dcolumn-fr-2015.tar.xz mirror://gentoo/texlive-module-translation-natbib-fr-2015.tar.xz mirror://gentoo/texlive-module-translation-tabbing-fr-2015.tar.xz mirror://gentoo/texlive-module-variations-2015.tar.xz mirror://gentoo/texlive-module-collection-langfrench-2015.tar.xz doc? ( mirror://gentoo/texlive-module-aeguill.doc-2015.tar.xz mirror://gentoo/texlive-module-apprends-latex.doc-2015.tar.xz mirror://gentoo/texlive-module-babel-basque.doc-2015.tar.xz mirror://gentoo/texlive-module-babel-french.doc-2015.tar.xz mirror://gentoo/texlive-module-basque-book.doc-2015.tar.xz mirror://gentoo/texlive-module-basque-date.doc-2015.tar.xz mirror://gentoo/texlive-module-bib-fr.doc-2015.tar.xz mirror://gentoo/texlive-module-bibleref-french.doc-2015.tar.xz mirror://gentoo/texlive-module-booktabs-fr.doc-2015.tar.xz mirror://gentoo/texlive-module-droit-fr.doc-2015.tar.xz mirror://gentoo/texlive-module-epslatex-fr.doc-2015.tar.xz mirror://gentoo/texlive-module-facture.doc-2015.tar.xz mirror://gentoo/texlive-module-frenchle.doc-2015.tar.xz mirror://gentoo/texlive-module-frletter.doc-2015.tar.xz mirror://gentoo/texlive-module-impatient-fr.doc-2015.tar.xz mirror://gentoo/texlive-module-impnattypo.doc-2015.tar.xz mirror://gentoo/texlive-module-l2tabu-french.doc-2015.tar.xz mirror://gentoo/texlive-module-lshort-french.doc-2015.tar.xz mirror://gentoo/texlive-module-mafr.doc-2015.tar.xz mirror://gentoo/texlive-module-tabvar.doc-2015.tar.xz mirror://gentoo/texlive-module-tdsfrmath.doc-2015.tar.xz mirror://gentoo/texlive-module-texlive-fr.doc-2015.tar.xz mirror://gentoo/texlive-module-translation-array-fr.doc-2015.tar.xz mirror://gentoo/texlive-module-translation-dcolumn-fr.doc-2015.tar.xz mirror://gentoo/texlive-module-translation-natbib-fr.doc-2015.tar.xz mirror://gentoo/texlive-module-translation-tabbing-fr.doc-2015.tar.xz mirror://gentoo/texlive-module-variations.doc-2015.tar.xz ) source? ( mirror://gentoo/texlive-module-babel-basque.source-2015.tar.xz mirror://gentoo/texlive-module-babel-french.source-2015.tar.xz mirror://gentoo/texlive-module-basque-book.source-2015.tar.xz mirror://gentoo/texlive-module-basque-date.source-2015.tar.xz mirror://gentoo/texlive-module-bibleref-french.source-2015.tar.xz mirror://gentoo/texlive-module-facture.source-2015.tar.xz mirror://gentoo/texlive-module-impnattypo.source-2015.tar.xz mirror://gentoo/texlive-module-tabvar.source-2015.tar.xz mirror://gentoo/texlive-module-tdsfrmath.source-2015.tar.xz )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5c031ee551cd53118b7fde3578cd32fd
diff --git a/metadata/md5-cache/dev-texlive/texlive-langfrench-2016 b/metadata/md5-cache/dev-texlive/texlive-langfrench-2016
deleted file mode 100644
index e423921c297e..000000000000
--- a/metadata/md5-cache/dev-texlive/texlive-langfrench-2016
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=dev-texlive/texlive-basic-2016 !dev-texlive/texlive-documentation-french !<dev-texlive/texlive-basic-2016 >=app-text/texlive-core-2016 app-arch/xz-utils
-DESCRIPTION=TeXLive French
-EAPI=5
-HOMEPAGE=http://www.tug.org/texlive/
-IUSE=source doc
-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 ~x64-solaris ~x86-solaris
-LICENSE=GPL-1 GPL-2 LPPL-1.2 LPPL-1.3 public-domain TeX-other-free
-RDEPEND=>=dev-texlive/texlive-basic-2016 !dev-texlive/texlive-documentation-french !<dev-texlive/texlive-basic-2016 >=app-text/texlive-core-2016
-SLOT=0
-SRC_URI=mirror://gentoo/texlive-module-aeguill-2016.tar.xz mirror://gentoo/texlive-module-apprends-latex-2016.tar.xz mirror://gentoo/texlive-module-babel-basque-2016.tar.xz mirror://gentoo/texlive-module-babel-french-2016.tar.xz mirror://gentoo/texlive-module-basque-book-2016.tar.xz mirror://gentoo/texlive-module-basque-date-2016.tar.xz mirror://gentoo/texlive-module-bib-fr-2016.tar.xz mirror://gentoo/texlive-module-bibleref-french-2016.tar.xz mirror://gentoo/texlive-module-booktabs-fr-2016.tar.xz mirror://gentoo/texlive-module-droit-fr-2016.tar.xz mirror://gentoo/texlive-module-e-french-2016.tar.xz mirror://gentoo/texlive-module-epslatex-fr-2016.tar.xz mirror://gentoo/texlive-module-facture-2016.tar.xz mirror://gentoo/texlive-module-formation-latex-ul-2016.tar.xz mirror://gentoo/texlive-module-frletter-2016.tar.xz mirror://gentoo/texlive-module-hyphen-basque-2016.tar.xz mirror://gentoo/texlive-module-hyphen-french-2016.tar.xz mirror://gentoo/texlive-module-impatient-fr-2016.tar.xz mirror://gentoo/texlive-module-impnattypo-2016.tar.xz mirror://gentoo/texlive-module-l2tabu-french-2016.tar.xz mirror://gentoo/texlive-module-latex2e-help-texinfo-fr-2016.tar.xz mirror://gentoo/texlive-module-lshort-french-2016.tar.xz mirror://gentoo/texlive-module-mafr-2016.tar.xz mirror://gentoo/texlive-module-tabvar-2016.tar.xz mirror://gentoo/texlive-module-tdsfrmath-2016.tar.xz mirror://gentoo/texlive-module-texlive-fr-2016.tar.xz mirror://gentoo/texlive-module-translation-array-fr-2016.tar.xz mirror://gentoo/texlive-module-translation-dcolumn-fr-2016.tar.xz mirror://gentoo/texlive-module-translation-natbib-fr-2016.tar.xz mirror://gentoo/texlive-module-translation-tabbing-fr-2016.tar.xz mirror://gentoo/texlive-module-variations-2016.tar.xz mirror://gentoo/texlive-module-visualtikz-2016.tar.xz mirror://gentoo/texlive-module-collection-langfrench-2016.tar.xz doc? ( mirror://gentoo/texlive-module-aeguill.doc-2016.tar.xz mirror://gentoo/texlive-module-apprends-latex.doc-2016.tar.xz mirror://gentoo/texlive-module-babel-basque.doc-2016.tar.xz mirror://gentoo/texlive-module-babel-french.doc-2016.tar.xz mirror://gentoo/texlive-module-basque-book.doc-2016.tar.xz mirror://gentoo/texlive-module-basque-date.doc-2016.tar.xz mirror://gentoo/texlive-module-bib-fr.doc-2016.tar.xz mirror://gentoo/texlive-module-bibleref-french.doc-2016.tar.xz mirror://gentoo/texlive-module-booktabs-fr.doc-2016.tar.xz mirror://gentoo/texlive-module-droit-fr.doc-2016.tar.xz mirror://gentoo/texlive-module-e-french.doc-2016.tar.xz mirror://gentoo/texlive-module-epslatex-fr.doc-2016.tar.xz mirror://gentoo/texlive-module-facture.doc-2016.tar.xz mirror://gentoo/texlive-module-formation-latex-ul.doc-2016.tar.xz mirror://gentoo/texlive-module-frletter.doc-2016.tar.xz mirror://gentoo/texlive-module-impatient-fr.doc-2016.tar.xz mirror://gentoo/texlive-module-impnattypo.doc-2016.tar.xz mirror://gentoo/texlive-module-l2tabu-french.doc-2016.tar.xz mirror://gentoo/texlive-module-latex2e-help-texinfo-fr.doc-2016.tar.xz mirror://gentoo/texlive-module-lshort-french.doc-2016.tar.xz mirror://gentoo/texlive-module-mafr.doc-2016.tar.xz mirror://gentoo/texlive-module-tabvar.doc-2016.tar.xz mirror://gentoo/texlive-module-tdsfrmath.doc-2016.tar.xz mirror://gentoo/texlive-module-texlive-fr.doc-2016.tar.xz mirror://gentoo/texlive-module-translation-array-fr.doc-2016.tar.xz mirror://gentoo/texlive-module-translation-dcolumn-fr.doc-2016.tar.xz mirror://gentoo/texlive-module-translation-natbib-fr.doc-2016.tar.xz mirror://gentoo/texlive-module-translation-tabbing-fr.doc-2016.tar.xz mirror://gentoo/texlive-module-variations.doc-2016.tar.xz mirror://gentoo/texlive-module-visualtikz.doc-2016.tar.xz ) source? ( mirror://gentoo/texlive-module-babel-basque.source-2016.tar.xz mirror://gentoo/texlive-module-babel-french.source-2016.tar.xz mirror://gentoo/texlive-module-basque-book.source-2016.tar.xz mirror://gentoo/texlive-module-basque-date.source-2016.tar.xz mirror://gentoo/texlive-module-bibleref-french.source-2016.tar.xz mirror://gentoo/texlive-module-facture.source-2016.tar.xz mirror://gentoo/texlive-module-formation-latex-ul.source-2016.tar.xz mirror://gentoo/texlive-module-hyphen-basque.source-2016.tar.xz mirror://gentoo/texlive-module-impnattypo.source-2016.tar.xz mirror://gentoo/texlive-module-tabvar.source-2016.tar.xz mirror://gentoo/texlive-module-tdsfrmath.source-2016.tar.xz )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ddb5676b11c30a75888f9d1ac89c2afd
diff --git a/metadata/md5-cache/dev-texlive/texlive-langfrench-2017 b/metadata/md5-cache/dev-texlive/texlive-langfrench-2017
index 58565659f13a..90ee95c14f71 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langfrench-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-langfrench-2017
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive French
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-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 ~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 ~x64-solaris ~x86-solaris
 LICENSE=FDL-1.1 GPL-1 GPL-2 LPPL-1.2 LPPL-1.3 public-domain TeX-other-free
 RDEPEND=>=dev-texlive/texlive-basic-2017 !dev-texlive/texlive-documentation-french !<dev-texlive/texlive-basic-2016 >=app-text/texlive-core-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-aeguill-2017.tar.xz mirror://gentoo/texlive-module-apprends-latex-2017.tar.xz mirror://gentoo/texlive-module-babel-basque-2017.tar.xz mirror://gentoo/texlive-module-babel-french-2017.tar.xz mirror://gentoo/texlive-module-basque-book-2017.tar.xz mirror://gentoo/texlive-module-basque-date-2017.tar.xz mirror://gentoo/texlive-module-bib-fr-2017.tar.xz mirror://gentoo/texlive-module-bibleref-french-2017.tar.xz mirror://gentoo/texlive-module-booktabs-fr-2017.tar.xz mirror://gentoo/texlive-module-droit-fr-2017.tar.xz mirror://gentoo/texlive-module-e-french-2017.tar.xz mirror://gentoo/texlive-module-epslatex-fr-2017.tar.xz mirror://gentoo/texlive-module-facture-2017.tar.xz mirror://gentoo/texlive-module-formation-latex-ul-2017.tar.xz mirror://gentoo/texlive-module-frletter-2017.tar.xz mirror://gentoo/texlive-module-hyphen-basque-2017.tar.xz mirror://gentoo/texlive-module-hyphen-french-2017.tar.xz mirror://gentoo/texlive-module-impatient-fr-2017.tar.xz mirror://gentoo/texlive-module-impnattypo-2017.tar.xz mirror://gentoo/texlive-module-l2tabu-french-2017.tar.xz mirror://gentoo/texlive-module-latex2e-help-texinfo-fr-2017.tar.xz mirror://gentoo/texlive-module-lshort-french-2017.tar.xz mirror://gentoo/texlive-module-mafr-2017.tar.xz mirror://gentoo/texlive-module-tabvar-2017.tar.xz mirror://gentoo/texlive-module-tdsfrmath-2017.tar.xz mirror://gentoo/texlive-module-texlive-fr-2017.tar.xz mirror://gentoo/texlive-module-translation-array-fr-2017.tar.xz mirror://gentoo/texlive-module-translation-dcolumn-fr-2017.tar.xz mirror://gentoo/texlive-module-translation-natbib-fr-2017.tar.xz mirror://gentoo/texlive-module-translation-tabbing-fr-2017.tar.xz mirror://gentoo/texlive-module-variations-2017.tar.xz mirror://gentoo/texlive-module-visualtikz-2017.tar.xz mirror://gentoo/texlive-module-collection-langfrench-2017.tar.xz doc? ( mirror://gentoo/texlive-module-aeguill.doc-2017.tar.xz mirror://gentoo/texlive-module-apprends-latex.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-basque.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-french.doc-2017.tar.xz mirror://gentoo/texlive-module-basque-book.doc-2017.tar.xz mirror://gentoo/texlive-module-basque-date.doc-2017.tar.xz mirror://gentoo/texlive-module-bib-fr.doc-2017.tar.xz mirror://gentoo/texlive-module-bibleref-french.doc-2017.tar.xz mirror://gentoo/texlive-module-booktabs-fr.doc-2017.tar.xz mirror://gentoo/texlive-module-droit-fr.doc-2017.tar.xz mirror://gentoo/texlive-module-e-french.doc-2017.tar.xz mirror://gentoo/texlive-module-epslatex-fr.doc-2017.tar.xz mirror://gentoo/texlive-module-facture.doc-2017.tar.xz mirror://gentoo/texlive-module-formation-latex-ul.doc-2017.tar.xz mirror://gentoo/texlive-module-frletter.doc-2017.tar.xz mirror://gentoo/texlive-module-impatient-fr.doc-2017.tar.xz mirror://gentoo/texlive-module-impnattypo.doc-2017.tar.xz mirror://gentoo/texlive-module-l2tabu-french.doc-2017.tar.xz mirror://gentoo/texlive-module-latex2e-help-texinfo-fr.doc-2017.tar.xz mirror://gentoo/texlive-module-lshort-french.doc-2017.tar.xz mirror://gentoo/texlive-module-mafr.doc-2017.tar.xz mirror://gentoo/texlive-module-tabvar.doc-2017.tar.xz mirror://gentoo/texlive-module-tdsfrmath.doc-2017.tar.xz mirror://gentoo/texlive-module-texlive-fr.doc-2017.tar.xz mirror://gentoo/texlive-module-translation-array-fr.doc-2017.tar.xz mirror://gentoo/texlive-module-translation-dcolumn-fr.doc-2017.tar.xz mirror://gentoo/texlive-module-translation-natbib-fr.doc-2017.tar.xz mirror://gentoo/texlive-module-translation-tabbing-fr.doc-2017.tar.xz mirror://gentoo/texlive-module-variations.doc-2017.tar.xz mirror://gentoo/texlive-module-visualtikz.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-babel-basque.source-2017.tar.xz mirror://gentoo/texlive-module-babel-french.source-2017.tar.xz mirror://gentoo/texlive-module-basque-book.source-2017.tar.xz mirror://gentoo/texlive-module-basque-date.source-2017.tar.xz mirror://gentoo/texlive-module-bibleref-french.source-2017.tar.xz mirror://gentoo/texlive-module-facture.source-2017.tar.xz mirror://gentoo/texlive-module-formation-latex-ul.source-2017.tar.xz mirror://gentoo/texlive-module-hyphen-basque.source-2017.tar.xz mirror://gentoo/texlive-module-impnattypo.source-2017.tar.xz mirror://gentoo/texlive-module-tabvar.source-2017.tar.xz mirror://gentoo/texlive-module-tdsfrmath.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7e15c66387fefca2c68e8e192bbb5a1d
+_md5_=c32ec43b38ded811694816aa9f6239d0
diff --git a/metadata/md5-cache/dev-texlive/texlive-langgerman-2015 b/metadata/md5-cache/dev-texlive/texlive-langgerman-2015
deleted file mode 100644
index 576c90ceefa0..000000000000
--- a/metadata/md5-cache/dev-texlive/texlive-langgerman-2015
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=dev-texlive/texlive-basic-2015 !<dev-texlive/texlive-latexextra-2009 !dev-texlive/texlive-documentation-german >=app-text/texlive-core-2015 app-arch/xz-utils
-DESCRIPTION=TeXLive German
-EAPI=5
-HOMEPAGE=http://www.tug.org/texlive/
-IUSE=source doc
-KEYWORDS=alpha amd64 arm hppa ~mips ppc ppc64 ~s390 ~sh x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=FDL-1.1 GPL-1 GPL-2 LPPL-1.3 OPL TeX-other-free
-RDEPEND=>=dev-texlive/texlive-basic-2015 !<dev-texlive/texlive-latexextra-2009 !dev-texlive/texlive-documentation-german >=app-text/texlive-core-2015
-SLOT=0
-SRC_URI=mirror://gentoo/texlive-module-babel-german-2015.tar.xz mirror://gentoo/texlive-module-bibleref-german-2015.tar.xz mirror://gentoo/texlive-module-booktabs-de-2015.tar.xz mirror://gentoo/texlive-module-csquotes-de-2015.tar.xz mirror://gentoo/texlive-module-dehyph-exptl-2015.tar.xz mirror://gentoo/texlive-module-dhua-2015.tar.xz mirror://gentoo/texlive-module-einfuehrung-2015.tar.xz mirror://gentoo/texlive-module-etdipa-2015.tar.xz mirror://gentoo/texlive-module-etoolbox-de-2015.tar.xz mirror://gentoo/texlive-module-fifinddo-info-2015.tar.xz mirror://gentoo/texlive-module-geometry-de-2015.tar.xz mirror://gentoo/texlive-module-german-2015.tar.xz mirror://gentoo/texlive-module-germbib-2015.tar.xz mirror://gentoo/texlive-module-germkorr-2015.tar.xz mirror://gentoo/texlive-module-hausarbeit-jura-2015.tar.xz mirror://gentoo/texlive-module-hyphen-german-2015.tar.xz mirror://gentoo/texlive-module-koma-script-examples-2015.tar.xz mirror://gentoo/texlive-module-l2picfaq-2015.tar.xz mirror://gentoo/texlive-module-l2tabu-2015.tar.xz mirror://gentoo/texlive-module-latex-bib-ex-2015.tar.xz mirror://gentoo/texlive-module-latex-referenz-2015.tar.xz mirror://gentoo/texlive-module-latex-tabellen-2015.tar.xz mirror://gentoo/texlive-module-latexcheat-de-2015.tar.xz mirror://gentoo/texlive-module-lshort-german-2015.tar.xz mirror://gentoo/texlive-module-lualatex-doc-de-2015.tar.xz mirror://gentoo/texlive-module-microtype-de-2015.tar.xz mirror://gentoo/texlive-module-presentations-2015.tar.xz mirror://gentoo/texlive-module-pstricks-examples-2015.tar.xz mirror://gentoo/texlive-module-r_und_s-2015.tar.xz mirror://gentoo/texlive-module-templates-fenn-2015.tar.xz mirror://gentoo/texlive-module-templates-sommer-2015.tar.xz mirror://gentoo/texlive-module-texlive-de-2015.tar.xz mirror://gentoo/texlive-module-tipa-de-2015.tar.xz mirror://gentoo/texlive-module-translation-arsclassica-de-2015.tar.xz mirror://gentoo/texlive-module-translation-biblatex-de-2015.tar.xz mirror://gentoo/texlive-module-translation-chemsym-de-2015.tar.xz mirror://gentoo/texlive-module-translation-ecv-de-2015.tar.xz mirror://gentoo/texlive-module-translation-enumitem-de-2015.tar.xz mirror://gentoo/texlive-module-translation-europecv-de-2015.tar.xz mirror://gentoo/texlive-module-translation-filecontents-de-2015.tar.xz mirror://gentoo/texlive-module-translation-moreverb-de-2015.tar.xz mirror://gentoo/texlive-module-udesoftec-2015.tar.xz mirror://gentoo/texlive-module-umlaute-2015.tar.xz mirror://gentoo/texlive-module-voss-mathcol-2015.tar.xz mirror://gentoo/texlive-module-collection-langgerman-2015.tar.xz doc? ( mirror://gentoo/texlive-module-babel-german.doc-2015.tar.xz mirror://gentoo/texlive-module-bibleref-german.doc-2015.tar.xz mirror://gentoo/texlive-module-booktabs-de.doc-2015.tar.xz mirror://gentoo/texlive-module-csquotes-de.doc-2015.tar.xz mirror://gentoo/texlive-module-dehyph-exptl.doc-2015.tar.xz mirror://gentoo/texlive-module-dhua.doc-2015.tar.xz mirror://gentoo/texlive-module-einfuehrung.doc-2015.tar.xz mirror://gentoo/texlive-module-etdipa.doc-2015.tar.xz mirror://gentoo/texlive-module-etoolbox-de.doc-2015.tar.xz mirror://gentoo/texlive-module-fifinddo-info.doc-2015.tar.xz mirror://gentoo/texlive-module-geometry-de.doc-2015.tar.xz mirror://gentoo/texlive-module-german.doc-2015.tar.xz mirror://gentoo/texlive-module-germbib.doc-2015.tar.xz mirror://gentoo/texlive-module-germkorr.doc-2015.tar.xz mirror://gentoo/texlive-module-hausarbeit-jura.doc-2015.tar.xz mirror://gentoo/texlive-module-koma-script-examples.doc-2015.tar.xz mirror://gentoo/texlive-module-l2picfaq.doc-2015.tar.xz mirror://gentoo/texlive-module-l2tabu.doc-2015.tar.xz mirror://gentoo/texlive-module-latex-bib-ex.doc-2015.tar.xz mirror://gentoo/texlive-module-latex-referenz.doc-2015.tar.xz mirror://gentoo/texlive-module-latex-tabellen.doc-2015.tar.xz mirror://gentoo/texlive-module-latexcheat-de.doc-2015.tar.xz mirror://gentoo/texlive-module-lshort-german.doc-2015.tar.xz mirror://gentoo/texlive-module-lualatex-doc-de.doc-2015.tar.xz mirror://gentoo/texlive-module-microtype-de.doc-2015.tar.xz mirror://gentoo/texlive-module-presentations.doc-2015.tar.xz mirror://gentoo/texlive-module-pstricks-examples.doc-2015.tar.xz mirror://gentoo/texlive-module-r_und_s.doc-2015.tar.xz mirror://gentoo/texlive-module-templates-fenn.doc-2015.tar.xz mirror://gentoo/texlive-module-templates-sommer.doc-2015.tar.xz mirror://gentoo/texlive-module-texlive-de.doc-2015.tar.xz mirror://gentoo/texlive-module-tipa-de.doc-2015.tar.xz mirror://gentoo/texlive-module-translation-arsclassica-de.doc-2015.tar.xz mirror://gentoo/texlive-module-translation-biblatex-de.doc-2015.tar.xz mirror://gentoo/texlive-module-translation-chemsym-de.doc-2015.tar.xz mirror://gentoo/texlive-module-translation-ecv-de.doc-2015.tar.xz mirror://gentoo/texlive-module-translation-enumitem-de.doc-2015.tar.xz mirror://gentoo/texlive-module-translation-europecv-de.doc-2015.tar.xz mirror://gentoo/texlive-module-translation-filecontents-de.doc-2015.tar.xz mirror://gentoo/texlive-module-translation-moreverb-de.doc-2015.tar.xz mirror://gentoo/texlive-module-udesoftec.doc-2015.tar.xz mirror://gentoo/texlive-module-umlaute.doc-2015.tar.xz mirror://gentoo/texlive-module-voss-mathcol.doc-2015.tar.xz ) source? ( mirror://gentoo/texlive-module-babel-german.source-2015.tar.xz mirror://gentoo/texlive-module-dhua.source-2015.tar.xz mirror://gentoo/texlive-module-fifinddo-info.source-2015.tar.xz mirror://gentoo/texlive-module-german.source-2015.tar.xz mirror://gentoo/texlive-module-hausarbeit-jura.source-2015.tar.xz mirror://gentoo/texlive-module-udesoftec.source-2015.tar.xz mirror://gentoo/texlive-module-umlaute.source-2015.tar.xz )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c9efa886f7a98319da1f36cd6f5c7d2d
diff --git a/metadata/md5-cache/dev-texlive/texlive-langgerman-2016 b/metadata/md5-cache/dev-texlive/texlive-langgerman-2016
deleted file mode 100644
index ce9093174201..000000000000
--- a/metadata/md5-cache/dev-texlive/texlive-langgerman-2016
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=dev-texlive/texlive-basic-2016 !<dev-texlive/texlive-latexextra-2009 !dev-texlive/texlive-documentation-german !<dev-texlive/texlive-basic-2016 >=app-text/texlive-core-2016 app-arch/xz-utils
-DESCRIPTION=TeXLive German
-EAPI=5
-HOMEPAGE=http://www.tug.org/texlive/
-IUSE=source doc
-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 ~x64-solaris ~x86-solaris
-LICENSE=FDL-1.1 GPL-1 GPL-2 LPPL-1.3 OPL TeX-other-free
-RDEPEND=>=dev-texlive/texlive-basic-2016 !<dev-texlive/texlive-latexextra-2009 !dev-texlive/texlive-documentation-german !<dev-texlive/texlive-basic-2016 >=app-text/texlive-core-2016
-SLOT=0
-SRC_URI=mirror://gentoo/texlive-module-apalike-german-2016.tar.xz mirror://gentoo/texlive-module-babel-german-2016.tar.xz mirror://gentoo/texlive-module-bibleref-german-2016.tar.xz mirror://gentoo/texlive-module-booktabs-de-2016.tar.xz mirror://gentoo/texlive-module-csquotes-de-2016.tar.xz mirror://gentoo/texlive-module-dehyph-exptl-2016.tar.xz mirror://gentoo/texlive-module-dhua-2016.tar.xz mirror://gentoo/texlive-module-einfuehrung-2016.tar.xz mirror://gentoo/texlive-module-einfuehrung2-2016.tar.xz mirror://gentoo/texlive-module-etdipa-2016.tar.xz mirror://gentoo/texlive-module-etoolbox-de-2016.tar.xz mirror://gentoo/texlive-module-fifinddo-info-2016.tar.xz mirror://gentoo/texlive-module-geometry-de-2016.tar.xz mirror://gentoo/texlive-module-german-2016.tar.xz mirror://gentoo/texlive-module-germbib-2016.tar.xz mirror://gentoo/texlive-module-germkorr-2016.tar.xz mirror://gentoo/texlive-module-hausarbeit-jura-2016.tar.xz mirror://gentoo/texlive-module-hyphen-german-2016.tar.xz mirror://gentoo/texlive-module-koma-script-examples-2016.tar.xz mirror://gentoo/texlive-module-l2picfaq-2016.tar.xz mirror://gentoo/texlive-module-l2tabu-2016.tar.xz mirror://gentoo/texlive-module-latex-bib-ex-2016.tar.xz mirror://gentoo/texlive-module-latex-bib2-ex-2016.tar.xz mirror://gentoo/texlive-module-latex-referenz-2016.tar.xz mirror://gentoo/texlive-module-latex-tabellen-2016.tar.xz mirror://gentoo/texlive-module-latexcheat-de-2016.tar.xz mirror://gentoo/texlive-module-lshort-german-2016.tar.xz mirror://gentoo/texlive-module-lualatex-doc-de-2016.tar.xz mirror://gentoo/texlive-module-microtype-de-2016.tar.xz mirror://gentoo/texlive-module-milog-2016.tar.xz mirror://gentoo/texlive-module-presentations-2016.tar.xz mirror://gentoo/texlive-module-r_und_s-2016.tar.xz mirror://gentoo/texlive-module-templates-fenn-2016.tar.xz mirror://gentoo/texlive-module-templates-sommer-2016.tar.xz mirror://gentoo/texlive-module-texlive-de-2016.tar.xz mirror://gentoo/texlive-module-tipa-de-2016.tar.xz mirror://gentoo/texlive-module-translation-arsclassica-de-2016.tar.xz mirror://gentoo/texlive-module-translation-biblatex-de-2016.tar.xz mirror://gentoo/texlive-module-translation-chemsym-de-2016.tar.xz mirror://gentoo/texlive-module-translation-ecv-de-2016.tar.xz mirror://gentoo/texlive-module-translation-enumitem-de-2016.tar.xz mirror://gentoo/texlive-module-translation-europecv-de-2016.tar.xz mirror://gentoo/texlive-module-translation-filecontents-de-2016.tar.xz mirror://gentoo/texlive-module-translation-moreverb-de-2016.tar.xz mirror://gentoo/texlive-module-udesoftec-2016.tar.xz mirror://gentoo/texlive-module-uhrzeit-2016.tar.xz mirror://gentoo/texlive-module-umlaute-2016.tar.xz mirror://gentoo/texlive-module-voss-mathcol-2016.tar.xz mirror://gentoo/texlive-module-collection-langgerman-2016.tar.xz doc? ( mirror://gentoo/texlive-module-apalike-german.doc-2016.tar.xz mirror://gentoo/texlive-module-babel-german.doc-2016.tar.xz mirror://gentoo/texlive-module-bibleref-german.doc-2016.tar.xz mirror://gentoo/texlive-module-booktabs-de.doc-2016.tar.xz mirror://gentoo/texlive-module-csquotes-de.doc-2016.tar.xz mirror://gentoo/texlive-module-dehyph-exptl.doc-2016.tar.xz mirror://gentoo/texlive-module-dhua.doc-2016.tar.xz mirror://gentoo/texlive-module-einfuehrung.doc-2016.tar.xz mirror://gentoo/texlive-module-einfuehrung2.doc-2016.tar.xz mirror://gentoo/texlive-module-etdipa.doc-2016.tar.xz mirror://gentoo/texlive-module-etoolbox-de.doc-2016.tar.xz mirror://gentoo/texlive-module-fifinddo-info.doc-2016.tar.xz mirror://gentoo/texlive-module-geometry-de.doc-2016.tar.xz mirror://gentoo/texlive-module-german.doc-2016.tar.xz mirror://gentoo/texlive-module-germbib.doc-2016.tar.xz mirror://gentoo/texlive-module-germkorr.doc-2016.tar.xz mirror://gentoo/texlive-module-hausarbeit-jura.doc-2016.tar.xz mirror://gentoo/texlive-module-koma-script-examples.doc-2016.tar.xz mirror://gentoo/texlive-module-l2picfaq.doc-2016.tar.xz mirror://gentoo/texlive-module-l2tabu.doc-2016.tar.xz mirror://gentoo/texlive-module-latex-bib-ex.doc-2016.tar.xz mirror://gentoo/texlive-module-latex-bib2-ex.doc-2016.tar.xz mirror://gentoo/texlive-module-latex-referenz.doc-2016.tar.xz mirror://gentoo/texlive-module-latex-tabellen.doc-2016.tar.xz mirror://gentoo/texlive-module-latexcheat-de.doc-2016.tar.xz mirror://gentoo/texlive-module-lshort-german.doc-2016.tar.xz mirror://gentoo/texlive-module-lualatex-doc-de.doc-2016.tar.xz mirror://gentoo/texlive-module-microtype-de.doc-2016.tar.xz mirror://gentoo/texlive-module-milog.doc-2016.tar.xz mirror://gentoo/texlive-module-presentations.doc-2016.tar.xz mirror://gentoo/texlive-module-r_und_s.doc-2016.tar.xz mirror://gentoo/texlive-module-templates-fenn.doc-2016.tar.xz mirror://gentoo/texlive-module-templates-sommer.doc-2016.tar.xz mirror://gentoo/texlive-module-texlive-de.doc-2016.tar.xz mirror://gentoo/texlive-module-tipa-de.doc-2016.tar.xz mirror://gentoo/texlive-module-translation-arsclassica-de.doc-2016.tar.xz mirror://gentoo/texlive-module-translation-biblatex-de.doc-2016.tar.xz mirror://gentoo/texlive-module-translation-chemsym-de.doc-2016.tar.xz mirror://gentoo/texlive-module-translation-ecv-de.doc-2016.tar.xz mirror://gentoo/texlive-module-translation-enumitem-de.doc-2016.tar.xz mirror://gentoo/texlive-module-translation-europecv-de.doc-2016.tar.xz mirror://gentoo/texlive-module-translation-filecontents-de.doc-2016.tar.xz mirror://gentoo/texlive-module-translation-moreverb-de.doc-2016.tar.xz mirror://gentoo/texlive-module-udesoftec.doc-2016.tar.xz mirror://gentoo/texlive-module-uhrzeit.doc-2016.tar.xz mirror://gentoo/texlive-module-umlaute.doc-2016.tar.xz mirror://gentoo/texlive-module-voss-mathcol.doc-2016.tar.xz ) source? ( mirror://gentoo/texlive-module-babel-german.source-2016.tar.xz mirror://gentoo/texlive-module-dhua.source-2016.tar.xz mirror://gentoo/texlive-module-fifinddo-info.source-2016.tar.xz mirror://gentoo/texlive-module-german.source-2016.tar.xz mirror://gentoo/texlive-module-hausarbeit-jura.source-2016.tar.xz mirror://gentoo/texlive-module-udesoftec.source-2016.tar.xz mirror://gentoo/texlive-module-umlaute.source-2016.tar.xz )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8baf5f5a16f0c6ede23777bcace5f727
diff --git a/metadata/md5-cache/dev-texlive/texlive-langgerman-2017 b/metadata/md5-cache/dev-texlive/texlive-langgerman-2017
index b2d8b0c2baba..e48a24185e5e 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langgerman-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-langgerman-2017
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive German
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-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 ~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 ~x64-solaris ~x86-solaris
 LICENSE=FDL-1.1 GPL-1 GPL-2 LPPL-1.3 MIT OPL TeX-other-free
 RDEPEND=>=dev-texlive/texlive-basic-2017 !<dev-texlive/texlive-latexextra-2009 !dev-texlive/texlive-documentation-german !<dev-texlive/texlive-basic-2016 >=app-text/texlive-core-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-apalike-german-2017.tar.xz mirror://gentoo/texlive-module-babel-german-2017.tar.xz mirror://gentoo/texlive-module-bibleref-german-2017.tar.xz mirror://gentoo/texlive-module-booktabs-de-2017.tar.xz mirror://gentoo/texlive-module-csquotes-de-2017.tar.xz mirror://gentoo/texlive-module-dehyph-exptl-2017.tar.xz mirror://gentoo/texlive-module-dhua-2017.tar.xz mirror://gentoo/texlive-module-einfuehrung-2017.tar.xz mirror://gentoo/texlive-module-einfuehrung2-2017.tar.xz mirror://gentoo/texlive-module-etdipa-2017.tar.xz mirror://gentoo/texlive-module-etoolbox-de-2017.tar.xz mirror://gentoo/texlive-module-fifinddo-info-2017.tar.xz mirror://gentoo/texlive-module-geometry-de-2017.tar.xz mirror://gentoo/texlive-module-german-2017.tar.xz mirror://gentoo/texlive-module-germbib-2017.tar.xz mirror://gentoo/texlive-module-germkorr-2017.tar.xz mirror://gentoo/texlive-module-hausarbeit-jura-2017.tar.xz mirror://gentoo/texlive-module-hyphen-german-2017.tar.xz mirror://gentoo/texlive-module-koma-script-examples-2017.tar.xz mirror://gentoo/texlive-module-l2picfaq-2017.tar.xz mirror://gentoo/texlive-module-l2tabu-2017.tar.xz mirror://gentoo/texlive-module-latex-bib-ex-2017.tar.xz mirror://gentoo/texlive-module-latex-bib2-ex-2017.tar.xz mirror://gentoo/texlive-module-latex-referenz-2017.tar.xz mirror://gentoo/texlive-module-latex-tabellen-2017.tar.xz mirror://gentoo/texlive-module-latexcheat-de-2017.tar.xz mirror://gentoo/texlive-module-lshort-german-2017.tar.xz mirror://gentoo/texlive-module-lualatex-doc-de-2017.tar.xz mirror://gentoo/texlive-module-microtype-de-2017.tar.xz mirror://gentoo/texlive-module-milog-2017.tar.xz mirror://gentoo/texlive-module-presentations-2017.tar.xz mirror://gentoo/texlive-module-r_und_s-2017.tar.xz mirror://gentoo/texlive-module-templates-fenn-2017.tar.xz mirror://gentoo/texlive-module-templates-sommer-2017.tar.xz mirror://gentoo/texlive-module-texlive-de-2017.tar.xz mirror://gentoo/texlive-module-tipa-de-2017.tar.xz mirror://gentoo/texlive-module-translation-arsclassica-de-2017.tar.xz mirror://gentoo/texlive-module-translation-biblatex-de-2017.tar.xz mirror://gentoo/texlive-module-translation-chemsym-de-2017.tar.xz mirror://gentoo/texlive-module-translation-ecv-de-2017.tar.xz mirror://gentoo/texlive-module-translation-enumitem-de-2017.tar.xz mirror://gentoo/texlive-module-translation-europecv-de-2017.tar.xz mirror://gentoo/texlive-module-translation-filecontents-de-2017.tar.xz mirror://gentoo/texlive-module-translation-moreverb-de-2017.tar.xz mirror://gentoo/texlive-module-udesoftec-2017.tar.xz mirror://gentoo/texlive-module-uhrzeit-2017.tar.xz mirror://gentoo/texlive-module-umlaute-2017.tar.xz mirror://gentoo/texlive-module-voss-mathcol-2017.tar.xz mirror://gentoo/texlive-module-collection-langgerman-2017.tar.xz doc? ( mirror://gentoo/texlive-module-apalike-german.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-german.doc-2017.tar.xz mirror://gentoo/texlive-module-bibleref-german.doc-2017.tar.xz mirror://gentoo/texlive-module-booktabs-de.doc-2017.tar.xz mirror://gentoo/texlive-module-csquotes-de.doc-2017.tar.xz mirror://gentoo/texlive-module-dehyph-exptl.doc-2017.tar.xz mirror://gentoo/texlive-module-dhua.doc-2017.tar.xz mirror://gentoo/texlive-module-einfuehrung.doc-2017.tar.xz mirror://gentoo/texlive-module-einfuehrung2.doc-2017.tar.xz mirror://gentoo/texlive-module-etdipa.doc-2017.tar.xz mirror://gentoo/texlive-module-etoolbox-de.doc-2017.tar.xz mirror://gentoo/texlive-module-fifinddo-info.doc-2017.tar.xz mirror://gentoo/texlive-module-geometry-de.doc-2017.tar.xz mirror://gentoo/texlive-module-german.doc-2017.tar.xz mirror://gentoo/texlive-module-germbib.doc-2017.tar.xz mirror://gentoo/texlive-module-germkorr.doc-2017.tar.xz mirror://gentoo/texlive-module-hausarbeit-jura.doc-2017.tar.xz mirror://gentoo/texlive-module-koma-script-examples.doc-2017.tar.xz mirror://gentoo/texlive-module-l2picfaq.doc-2017.tar.xz mirror://gentoo/texlive-module-l2tabu.doc-2017.tar.xz mirror://gentoo/texlive-module-latex-bib-ex.doc-2017.tar.xz mirror://gentoo/texlive-module-latex-bib2-ex.doc-2017.tar.xz mirror://gentoo/texlive-module-latex-referenz.doc-2017.tar.xz mirror://gentoo/texlive-module-latex-tabellen.doc-2017.tar.xz mirror://gentoo/texlive-module-latexcheat-de.doc-2017.tar.xz mirror://gentoo/texlive-module-lshort-german.doc-2017.tar.xz mirror://gentoo/texlive-module-lualatex-doc-de.doc-2017.tar.xz mirror://gentoo/texlive-module-microtype-de.doc-2017.tar.xz mirror://gentoo/texlive-module-milog.doc-2017.tar.xz mirror://gentoo/texlive-module-presentations.doc-2017.tar.xz mirror://gentoo/texlive-module-r_und_s.doc-2017.tar.xz mirror://gentoo/texlive-module-templates-fenn.doc-2017.tar.xz mirror://gentoo/texlive-module-templates-sommer.doc-2017.tar.xz mirror://gentoo/texlive-module-texlive-de.doc-2017.tar.xz mirror://gentoo/texlive-module-tipa-de.doc-2017.tar.xz mirror://gentoo/texlive-module-translation-arsclassica-de.doc-2017.tar.xz mirror://gentoo/texlive-module-translation-biblatex-de.doc-2017.tar.xz mirror://gentoo/texlive-module-translation-chemsym-de.doc-2017.tar.xz mirror://gentoo/texlive-module-translation-ecv-de.doc-2017.tar.xz mirror://gentoo/texlive-module-translation-enumitem-de.doc-2017.tar.xz mirror://gentoo/texlive-module-translation-europecv-de.doc-2017.tar.xz mirror://gentoo/texlive-module-translation-filecontents-de.doc-2017.tar.xz mirror://gentoo/texlive-module-translation-moreverb-de.doc-2017.tar.xz mirror://gentoo/texlive-module-udesoftec.doc-2017.tar.xz mirror://gentoo/texlive-module-uhrzeit.doc-2017.tar.xz mirror://gentoo/texlive-module-umlaute.doc-2017.tar.xz mirror://gentoo/texlive-module-voss-mathcol.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-babel-german.source-2017.tar.xz mirror://gentoo/texlive-module-dhua.source-2017.tar.xz mirror://gentoo/texlive-module-fifinddo-info.source-2017.tar.xz mirror://gentoo/texlive-module-german.source-2017.tar.xz mirror://gentoo/texlive-module-hausarbeit-jura.source-2017.tar.xz mirror://gentoo/texlive-module-udesoftec.source-2017.tar.xz mirror://gentoo/texlive-module-umlaute.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ce613fa04baa5922097ceb90e2be6e0d
+_md5_=111199751ace605f835c7844cef6d160
diff --git a/metadata/md5-cache/dev-texlive/texlive-langgreek-2015 b/metadata/md5-cache/dev-texlive/texlive-langgreek-2015
deleted file mode 100644
index 7d4c6390ab95..000000000000
--- a/metadata/md5-cache/dev-texlive/texlive-langgreek-2015
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=dev-texlive/texlive-basic-2015 >=app-text/texlive-core-2015 app-arch/xz-utils
-DESCRIPTION=TeXLive Greek
-EAPI=5
-HOMEPAGE=http://www.tug.org/texlive/
-IUSE=source doc
-KEYWORDS=alpha amd64 arm hppa ~mips ppc ppc64 ~s390 ~sh x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-1 GPL-2 LPPL-1.3 public-domain TeX-other-free
-RDEPEND=>=dev-texlive/texlive-basic-2015 >=app-text/texlive-core-2015
-SLOT=0
-SRC_URI=mirror://gentoo/texlive-module-babel-greek-2015.tar.xz mirror://gentoo/texlive-module-begingreek-2015.tar.xz mirror://gentoo/texlive-module-betababel-2015.tar.xz mirror://gentoo/texlive-module-bgreek-2015.tar.xz mirror://gentoo/texlive-module-cbfonts-2015.tar.xz mirror://gentoo/texlive-module-cbfonts-fd-2015.tar.xz mirror://gentoo/texlive-module-gfsbaskerville-2015.tar.xz mirror://gentoo/texlive-module-gfsporson-2015.tar.xz mirror://gentoo/texlive-module-greek-fontenc-2015.tar.xz mirror://gentoo/texlive-module-greek-inputenc-2015.tar.xz mirror://gentoo/texlive-module-greekdates-2015.tar.xz mirror://gentoo/texlive-module-greektex-2015.tar.xz mirror://gentoo/texlive-module-hyphen-greek-2015.tar.xz mirror://gentoo/texlive-module-hyphen-ancientgreek-2015.tar.xz mirror://gentoo/texlive-module-ibycus-babel-2015.tar.xz mirror://gentoo/texlive-module-ibygrk-2015.tar.xz mirror://gentoo/texlive-module-kerkis-2015.tar.xz mirror://gentoo/texlive-module-levy-2015.tar.xz mirror://gentoo/texlive-module-lgreek-2015.tar.xz mirror://gentoo/texlive-module-mkgrkindex-2015.tar.xz mirror://gentoo/texlive-module-teubner-2015.tar.xz mirror://gentoo/texlive-module-xgreek-2015.tar.xz mirror://gentoo/texlive-module-yannisgr-2015.tar.xz mirror://gentoo/texlive-module-collection-langgreek-2015.tar.xz doc? ( mirror://gentoo/texlive-module-babel-greek.doc-2015.tar.xz mirror://gentoo/texlive-module-begingreek.doc-2015.tar.xz mirror://gentoo/texlive-module-betababel.doc-2015.tar.xz mirror://gentoo/texlive-module-bgreek.doc-2015.tar.xz mirror://gentoo/texlive-module-cbfonts.doc-2015.tar.xz mirror://gentoo/texlive-module-cbfonts-fd.doc-2015.tar.xz mirror://gentoo/texlive-module-gfsbaskerville.doc-2015.tar.xz mirror://gentoo/texlive-module-gfsporson.doc-2015.tar.xz mirror://gentoo/texlive-module-greek-fontenc.doc-2015.tar.xz mirror://gentoo/texlive-module-greek-inputenc.doc-2015.tar.xz mirror://gentoo/texlive-module-greekdates.doc-2015.tar.xz mirror://gentoo/texlive-module-greektex.doc-2015.tar.xz mirror://gentoo/texlive-module-hyphen-greek.doc-2015.tar.xz mirror://gentoo/texlive-module-ibycus-babel.doc-2015.tar.xz mirror://gentoo/texlive-module-ibygrk.doc-2015.tar.xz mirror://gentoo/texlive-module-kerkis.doc-2015.tar.xz mirror://gentoo/texlive-module-levy.doc-2015.tar.xz mirror://gentoo/texlive-module-lgreek.doc-2015.tar.xz mirror://gentoo/texlive-module-mkgrkindex.doc-2015.tar.xz mirror://gentoo/texlive-module-teubner.doc-2015.tar.xz mirror://gentoo/texlive-module-xgreek.doc-2015.tar.xz mirror://gentoo/texlive-module-yannisgr.doc-2015.tar.xz ) source? ( mirror://gentoo/texlive-module-babel-greek.source-2015.tar.xz mirror://gentoo/texlive-module-begingreek.source-2015.tar.xz mirror://gentoo/texlive-module-cbfonts-fd.source-2015.tar.xz mirror://gentoo/texlive-module-greekdates.source-2015.tar.xz mirror://gentoo/texlive-module-ibycus-babel.source-2015.tar.xz mirror://gentoo/texlive-module-teubner.source-2015.tar.xz mirror://gentoo/texlive-module-xgreek.source-2015.tar.xz )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f4b6a62835ffb0a507a1e7e4b326bbfb
diff --git a/metadata/md5-cache/dev-texlive/texlive-langgreek-2016 b/metadata/md5-cache/dev-texlive/texlive-langgreek-2016
deleted file mode 100644
index 1fedadbb7271..000000000000
--- a/metadata/md5-cache/dev-texlive/texlive-langgreek-2016
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=dev-texlive/texlive-basic-2016 !<dev-texlive/texlive-basic-2016 >=app-text/texlive-core-2016 app-arch/xz-utils
-DESCRIPTION=TeXLive Greek
-EAPI=5
-HOMEPAGE=http://www.tug.org/texlive/
-IUSE=source doc
-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 ~x64-solaris ~x86-solaris
-LICENSE=GPL-1 GPL-2 LGPL-3 LPPL-1.3 public-domain TeX-other-free
-RDEPEND=>=dev-texlive/texlive-basic-2016 !<dev-texlive/texlive-basic-2016 >=app-text/texlive-core-2016
-SLOT=0
-SRC_URI=mirror://gentoo/texlive-module-babel-greek-2016.tar.xz mirror://gentoo/texlive-module-begingreek-2016.tar.xz mirror://gentoo/texlive-module-betababel-2016.tar.xz mirror://gentoo/texlive-module-bgreek-2016.tar.xz mirror://gentoo/texlive-module-cbfonts-2016.tar.xz mirror://gentoo/texlive-module-cbfonts-fd-2016.tar.xz mirror://gentoo/texlive-module-gfsbaskerville-2016.tar.xz mirror://gentoo/texlive-module-gfsporson-2016.tar.xz mirror://gentoo/texlive-module-greek-fontenc-2016.tar.xz mirror://gentoo/texlive-module-greek-inputenc-2016.tar.xz mirror://gentoo/texlive-module-greekdates-2016.tar.xz mirror://gentoo/texlive-module-greektex-2016.tar.xz mirror://gentoo/texlive-module-greektonoi-2016.tar.xz mirror://gentoo/texlive-module-hyphen-greek-2016.tar.xz mirror://gentoo/texlive-module-hyphen-ancientgreek-2016.tar.xz mirror://gentoo/texlive-module-ibycus-babel-2016.tar.xz mirror://gentoo/texlive-module-ibygrk-2016.tar.xz mirror://gentoo/texlive-module-kerkis-2016.tar.xz mirror://gentoo/texlive-module-levy-2016.tar.xz mirror://gentoo/texlive-module-lgreek-2016.tar.xz mirror://gentoo/texlive-module-mkgrkindex-2016.tar.xz mirror://gentoo/texlive-module-teubner-2016.tar.xz mirror://gentoo/texlive-module-xgreek-2016.tar.xz mirror://gentoo/texlive-module-yannisgr-2016.tar.xz mirror://gentoo/texlive-module-collection-langgreek-2016.tar.xz doc? ( mirror://gentoo/texlive-module-babel-greek.doc-2016.tar.xz mirror://gentoo/texlive-module-begingreek.doc-2016.tar.xz mirror://gentoo/texlive-module-betababel.doc-2016.tar.xz mirror://gentoo/texlive-module-bgreek.doc-2016.tar.xz mirror://gentoo/texlive-module-cbfonts.doc-2016.tar.xz mirror://gentoo/texlive-module-cbfonts-fd.doc-2016.tar.xz mirror://gentoo/texlive-module-gfsbaskerville.doc-2016.tar.xz mirror://gentoo/texlive-module-gfsporson.doc-2016.tar.xz mirror://gentoo/texlive-module-greek-fontenc.doc-2016.tar.xz mirror://gentoo/texlive-module-greek-inputenc.doc-2016.tar.xz mirror://gentoo/texlive-module-greekdates.doc-2016.tar.xz mirror://gentoo/texlive-module-greektex.doc-2016.tar.xz mirror://gentoo/texlive-module-greektonoi.doc-2016.tar.xz mirror://gentoo/texlive-module-hyphen-greek.doc-2016.tar.xz mirror://gentoo/texlive-module-ibycus-babel.doc-2016.tar.xz mirror://gentoo/texlive-module-ibygrk.doc-2016.tar.xz mirror://gentoo/texlive-module-kerkis.doc-2016.tar.xz mirror://gentoo/texlive-module-levy.doc-2016.tar.xz mirror://gentoo/texlive-module-lgreek.doc-2016.tar.xz mirror://gentoo/texlive-module-mkgrkindex.doc-2016.tar.xz mirror://gentoo/texlive-module-teubner.doc-2016.tar.xz mirror://gentoo/texlive-module-xgreek.doc-2016.tar.xz mirror://gentoo/texlive-module-yannisgr.doc-2016.tar.xz ) source? ( mirror://gentoo/texlive-module-babel-greek.source-2016.tar.xz mirror://gentoo/texlive-module-begingreek.source-2016.tar.xz mirror://gentoo/texlive-module-cbfonts-fd.source-2016.tar.xz mirror://gentoo/texlive-module-greekdates.source-2016.tar.xz mirror://gentoo/texlive-module-ibycus-babel.source-2016.tar.xz mirror://gentoo/texlive-module-teubner.source-2016.tar.xz mirror://gentoo/texlive-module-xgreek.source-2016.tar.xz )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8f0cb8dd3090dd2d29a4c846b01c6b19
diff --git a/metadata/md5-cache/dev-texlive/texlive-langgreek-2017 b/metadata/md5-cache/dev-texlive/texlive-langgreek-2017
index 658e0d0b6e89..450e0fc22635 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langgreek-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-langgreek-2017
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive Greek
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-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 ~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 ~x64-solaris ~x86-solaris
 LICENSE=GPL-1 GPL-2 LGPL-3 LPPL-1.3 public-domain TeX-other-free
 RDEPEND=>=dev-texlive/texlive-basic-2017 !<dev-texlive/texlive-basic-2016 >=app-text/texlive-core-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-babel-greek-2017.tar.xz mirror://gentoo/texlive-module-begingreek-2017.tar.xz mirror://gentoo/texlive-module-betababel-2017.tar.xz mirror://gentoo/texlive-module-bgreek-2017.tar.xz mirror://gentoo/texlive-module-cbfonts-2017.tar.xz mirror://gentoo/texlive-module-cbfonts-fd-2017.tar.xz mirror://gentoo/texlive-module-gfsbaskerville-2017.tar.xz mirror://gentoo/texlive-module-gfsporson-2017.tar.xz mirror://gentoo/texlive-module-greek-fontenc-2017.tar.xz mirror://gentoo/texlive-module-greek-inputenc-2017.tar.xz mirror://gentoo/texlive-module-greekdates-2017.tar.xz mirror://gentoo/texlive-module-greektex-2017.tar.xz mirror://gentoo/texlive-module-greektonoi-2017.tar.xz mirror://gentoo/texlive-module-hyphen-greek-2017.tar.xz mirror://gentoo/texlive-module-hyphen-ancientgreek-2017.tar.xz mirror://gentoo/texlive-module-ibycus-babel-2017.tar.xz mirror://gentoo/texlive-module-ibygrk-2017.tar.xz mirror://gentoo/texlive-module-kerkis-2017.tar.xz mirror://gentoo/texlive-module-levy-2017.tar.xz mirror://gentoo/texlive-module-lgreek-2017.tar.xz mirror://gentoo/texlive-module-mkgrkindex-2017.tar.xz mirror://gentoo/texlive-module-teubner-2017.tar.xz mirror://gentoo/texlive-module-xgreek-2017.tar.xz mirror://gentoo/texlive-module-yannisgr-2017.tar.xz mirror://gentoo/texlive-module-collection-langgreek-2017.tar.xz doc? ( mirror://gentoo/texlive-module-babel-greek.doc-2017.tar.xz mirror://gentoo/texlive-module-begingreek.doc-2017.tar.xz mirror://gentoo/texlive-module-betababel.doc-2017.tar.xz mirror://gentoo/texlive-module-bgreek.doc-2017.tar.xz mirror://gentoo/texlive-module-cbfonts.doc-2017.tar.xz mirror://gentoo/texlive-module-cbfonts-fd.doc-2017.tar.xz mirror://gentoo/texlive-module-gfsbaskerville.doc-2017.tar.xz mirror://gentoo/texlive-module-gfsporson.doc-2017.tar.xz mirror://gentoo/texlive-module-greek-fontenc.doc-2017.tar.xz mirror://gentoo/texlive-module-greek-inputenc.doc-2017.tar.xz mirror://gentoo/texlive-module-greekdates.doc-2017.tar.xz mirror://gentoo/texlive-module-greektex.doc-2017.tar.xz mirror://gentoo/texlive-module-greektonoi.doc-2017.tar.xz mirror://gentoo/texlive-module-hyphen-greek.doc-2017.tar.xz mirror://gentoo/texlive-module-ibycus-babel.doc-2017.tar.xz mirror://gentoo/texlive-module-ibygrk.doc-2017.tar.xz mirror://gentoo/texlive-module-kerkis.doc-2017.tar.xz mirror://gentoo/texlive-module-levy.doc-2017.tar.xz mirror://gentoo/texlive-module-lgreek.doc-2017.tar.xz mirror://gentoo/texlive-module-mkgrkindex.doc-2017.tar.xz mirror://gentoo/texlive-module-teubner.doc-2017.tar.xz mirror://gentoo/texlive-module-xgreek.doc-2017.tar.xz mirror://gentoo/texlive-module-yannisgr.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-babel-greek.source-2017.tar.xz mirror://gentoo/texlive-module-begingreek.source-2017.tar.xz mirror://gentoo/texlive-module-cbfonts-fd.source-2017.tar.xz mirror://gentoo/texlive-module-greekdates.source-2017.tar.xz mirror://gentoo/texlive-module-ibycus-babel.source-2017.tar.xz mirror://gentoo/texlive-module-teubner.source-2017.tar.xz mirror://gentoo/texlive-module-xgreek.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=24f75d56aec8ce0b0161dae4c0f03595
+_md5_=11d1e826adabedce080aa93cc35b6dfd
diff --git a/metadata/md5-cache/dev-texlive/texlive-langindic-2015 b/metadata/md5-cache/dev-texlive/texlive-langindic-2015
deleted file mode 100644
index 6bbdc443f37f..000000000000
--- a/metadata/md5-cache/dev-texlive/texlive-langindic-2015
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=dev-texlive/texlive-basic-2015 >=app-text/texlive-core-2015 app-arch/xz-utils
-DESCRIPTION=TeXLive Indic scripts
-EAPI=5
-HOMEPAGE=http://www.tug.org/texlive/
-IUSE=source doc
-KEYWORDS=alpha amd64 arm hppa ~mips ppc ppc64 ~s390 ~sh x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-1 GPL-2 LPPL-1.3 public-domain
-RDEPEND=>=dev-texlive/texlive-basic-2015 >=app-text/texlive-core-2015
-SLOT=0
-SRC_URI=mirror://gentoo/texlive-module-bangtex-2015.tar.xz mirror://gentoo/texlive-module-bengali-2015.tar.xz mirror://gentoo/texlive-module-burmese-2015.tar.xz mirror://gentoo/texlive-module-devnag-2015.tar.xz mirror://gentoo/texlive-module-ebong-2015.tar.xz mirror://gentoo/texlive-module-hyphen-indic-2015.tar.xz mirror://gentoo/texlive-module-hyphen-sanskrit-2015.tar.xz mirror://gentoo/texlive-module-sanskrit-2015.tar.xz mirror://gentoo/texlive-module-sanskrit-t1-2015.tar.xz mirror://gentoo/texlive-module-velthuis-2015.tar.xz mirror://gentoo/texlive-module-wnri-2015.tar.xz mirror://gentoo/texlive-module-wnri-latex-2015.tar.xz mirror://gentoo/texlive-module-xetex-devanagari-2015.tar.xz mirror://gentoo/texlive-module-collection-langindic-2015.tar.xz doc? ( mirror://gentoo/texlive-module-bangtex.doc-2015.tar.xz mirror://gentoo/texlive-module-bengali.doc-2015.tar.xz mirror://gentoo/texlive-module-burmese.doc-2015.tar.xz mirror://gentoo/texlive-module-ebong.doc-2015.tar.xz mirror://gentoo/texlive-module-sanskrit.doc-2015.tar.xz mirror://gentoo/texlive-module-sanskrit-t1.doc-2015.tar.xz mirror://gentoo/texlive-module-velthuis.doc-2015.tar.xz mirror://gentoo/texlive-module-wnri.doc-2015.tar.xz mirror://gentoo/texlive-module-wnri-latex.doc-2015.tar.xz mirror://gentoo/texlive-module-xetex-devanagari.doc-2015.tar.xz ) source? ( mirror://gentoo/texlive-module-bengali.source-2015.tar.xz mirror://gentoo/texlive-module-burmese.source-2015.tar.xz mirror://gentoo/texlive-module-sanskrit.source-2015.tar.xz mirror://gentoo/texlive-module-wnri-latex.source-2015.tar.xz )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=feab37ebf22b1a9a578bdbd15ed5fbf8
diff --git a/metadata/md5-cache/dev-texlive/texlive-langindic-2016 b/metadata/md5-cache/dev-texlive/texlive-langindic-2016
deleted file mode 100644
index 3eac8da80c17..000000000000
--- a/metadata/md5-cache/dev-texlive/texlive-langindic-2016
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=dev-texlive/texlive-basic-2016 !<dev-texlive/texlive-basic-2016 >=app-text/texlive-core-2016 app-arch/xz-utils
-DESCRIPTION=TeXLive Indic scripts
-EAPI=5
-HOMEPAGE=http://www.tug.org/texlive/
-IUSE=source doc
-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 ~x64-solaris ~x86-solaris
-LICENSE=GPL-1 GPL-2 LPPL-1.3 public-domain
-RDEPEND=>=dev-texlive/texlive-basic-2016 !<dev-texlive/texlive-basic-2016 >=app-text/texlive-core-2016
-SLOT=0
-SRC_URI=mirror://gentoo/texlive-module-bangtex-2016.tar.xz mirror://gentoo/texlive-module-latexbangla-2016.tar.xz mirror://gentoo/texlive-module-bengali-2016.tar.xz mirror://gentoo/texlive-module-burmese-2016.tar.xz mirror://gentoo/texlive-module-ebong-2016.tar.xz mirror://gentoo/texlive-module-hyphen-indic-2016.tar.xz mirror://gentoo/texlive-module-hyphen-sanskrit-2016.tar.xz mirror://gentoo/texlive-module-sanskrit-2016.tar.xz mirror://gentoo/texlive-module-sanskrit-t1-2016.tar.xz mirror://gentoo/texlive-module-velthuis-2016.tar.xz mirror://gentoo/texlive-module-wnri-2016.tar.xz mirror://gentoo/texlive-module-wnri-latex-2016.tar.xz mirror://gentoo/texlive-module-xetex-devanagari-2016.tar.xz mirror://gentoo/texlive-module-collection-langindic-2016.tar.xz doc? ( mirror://gentoo/texlive-module-bangtex.doc-2016.tar.xz mirror://gentoo/texlive-module-latexbangla.doc-2016.tar.xz mirror://gentoo/texlive-module-bengali.doc-2016.tar.xz mirror://gentoo/texlive-module-burmese.doc-2016.tar.xz mirror://gentoo/texlive-module-ebong.doc-2016.tar.xz mirror://gentoo/texlive-module-hyphen-sanskrit.doc-2016.tar.xz mirror://gentoo/texlive-module-sanskrit.doc-2016.tar.xz mirror://gentoo/texlive-module-sanskrit-t1.doc-2016.tar.xz mirror://gentoo/texlive-module-velthuis.doc-2016.tar.xz mirror://gentoo/texlive-module-wnri.doc-2016.tar.xz mirror://gentoo/texlive-module-wnri-latex.doc-2016.tar.xz mirror://gentoo/texlive-module-xetex-devanagari.doc-2016.tar.xz ) source? ( mirror://gentoo/texlive-module-bengali.source-2016.tar.xz mirror://gentoo/texlive-module-burmese.source-2016.tar.xz mirror://gentoo/texlive-module-sanskrit.source-2016.tar.xz mirror://gentoo/texlive-module-wnri-latex.source-2016.tar.xz )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=03daa8a44d93ae0e7b80d8a60296a4db
diff --git a/metadata/md5-cache/dev-texlive/texlive-langitalian-2017 b/metadata/md5-cache/dev-texlive/texlive-langitalian-2017
index 27f93351700e..7cceab569d14 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langitalian-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-langitalian-2017
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive Italian
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-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 ~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 ~x64-solaris ~x86-solaris
 LICENSE=FDL-1.1 GPL-1 GPL-2 LGPL-2 LPPL-1.3 TeX-other-free
 RDEPEND=>=dev-texlive/texlive-basic-2017 !dev-texlive/texlive-documentation-italian !<dev-texlive/texlive-basic-2016 >=app-text/texlive-core-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-amsldoc-it-2017.tar.xz mirror://gentoo/texlive-module-amsmath-it-2017.tar.xz mirror://gentoo/texlive-module-amsthdoc-it-2017.tar.xz mirror://gentoo/texlive-module-babel-italian-2017.tar.xz mirror://gentoo/texlive-module-codicefiscaleitaliano-2017.tar.xz mirror://gentoo/texlive-module-fancyhdr-it-2017.tar.xz mirror://gentoo/texlive-module-fixltxhyph-2017.tar.xz mirror://gentoo/texlive-module-frontespizio-2017.tar.xz mirror://gentoo/texlive-module-hyphen-italian-2017.tar.xz mirror://gentoo/texlive-module-itnumpar-2017.tar.xz mirror://gentoo/texlive-module-l2tabu-italian-2017.tar.xz mirror://gentoo/texlive-module-latex4wp-it-2017.tar.xz mirror://gentoo/texlive-module-layaureo-2017.tar.xz mirror://gentoo/texlive-module-lshort-italian-2017.tar.xz mirror://gentoo/texlive-module-psfrag-italian-2017.tar.xz mirror://gentoo/texlive-module-texlive-it-2017.tar.xz mirror://gentoo/texlive-module-collection-langitalian-2017.tar.xz doc? ( mirror://gentoo/texlive-module-amsldoc-it.doc-2017.tar.xz mirror://gentoo/texlive-module-amsmath-it.doc-2017.tar.xz mirror://gentoo/texlive-module-amsthdoc-it.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-italian.doc-2017.tar.xz mirror://gentoo/texlive-module-codicefiscaleitaliano.doc-2017.tar.xz mirror://gentoo/texlive-module-fancyhdr-it.doc-2017.tar.xz mirror://gentoo/texlive-module-fixltxhyph.doc-2017.tar.xz mirror://gentoo/texlive-module-frontespizio.doc-2017.tar.xz mirror://gentoo/texlive-module-itnumpar.doc-2017.tar.xz mirror://gentoo/texlive-module-l2tabu-italian.doc-2017.tar.xz mirror://gentoo/texlive-module-latex4wp-it.doc-2017.tar.xz mirror://gentoo/texlive-module-layaureo.doc-2017.tar.xz mirror://gentoo/texlive-module-lshort-italian.doc-2017.tar.xz mirror://gentoo/texlive-module-psfrag-italian.doc-2017.tar.xz mirror://gentoo/texlive-module-texlive-it.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-babel-italian.source-2017.tar.xz mirror://gentoo/texlive-module-codicefiscaleitaliano.source-2017.tar.xz mirror://gentoo/texlive-module-fixltxhyph.source-2017.tar.xz mirror://gentoo/texlive-module-frontespizio.source-2017.tar.xz mirror://gentoo/texlive-module-itnumpar.source-2017.tar.xz mirror://gentoo/texlive-module-layaureo.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f11cf2c4794e9b9bc9c70cfdd668dcde
+_md5_=8bb9f8ab0c1b3e875fb8b82c6df69eb9
diff --git a/metadata/md5-cache/dev-texlive/texlive-langkorean-2017 b/metadata/md5-cache/dev-texlive/texlive-langkorean-2017
index 47e93e178070..e0576f82d63a 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langkorean-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-langkorean-2017
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive Korean
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-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 ~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 ~x64-solaris ~x86-solaris
 LICENSE=FDL-1.1 GPL-2 LPPL-1.3 OFL TeX-other-free
 RDEPEND=>=dev-texlive/texlive-langcjk-2017 !<dev-texlive/texlive-langcjk-2014 !<dev-texlive/texlive-basic-2016 >=app-text/texlive-core-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-baekmuk-2017.tar.xz mirror://gentoo/texlive-module-cjk-ko-2017.tar.xz mirror://gentoo/texlive-module-kotex-oblivoir-2017.tar.xz mirror://gentoo/texlive-module-kotex-plain-2017.tar.xz mirror://gentoo/texlive-module-kotex-utf-2017.tar.xz mirror://gentoo/texlive-module-kotex-utils-2017.tar.xz mirror://gentoo/texlive-module-lshort-korean-2017.tar.xz mirror://gentoo/texlive-module-nanumtype1-2017.tar.xz mirror://gentoo/texlive-module-uhc-2017.tar.xz mirror://gentoo/texlive-module-unfonts-core-2017.tar.xz mirror://gentoo/texlive-module-unfonts-extra-2017.tar.xz mirror://gentoo/texlive-module-collection-langkorean-2017.tar.xz doc? ( mirror://gentoo/texlive-module-baekmuk.doc-2017.tar.xz mirror://gentoo/texlive-module-cjk-ko.doc-2017.tar.xz mirror://gentoo/texlive-module-kotex-oblivoir.doc-2017.tar.xz mirror://gentoo/texlive-module-kotex-plain.doc-2017.tar.xz mirror://gentoo/texlive-module-kotex-utf.doc-2017.tar.xz mirror://gentoo/texlive-module-kotex-utils.doc-2017.tar.xz mirror://gentoo/texlive-module-lshort-korean.doc-2017.tar.xz mirror://gentoo/texlive-module-nanumtype1.doc-2017.tar.xz mirror://gentoo/texlive-module-uhc.doc-2017.tar.xz mirror://gentoo/texlive-module-unfonts-core.doc-2017.tar.xz mirror://gentoo/texlive-module-unfonts-extra.doc-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0f65765d348d443476dd06532a1f9626
+_md5_=9c9092f8cefedbc4b82a14feeafa5627
diff --git a/metadata/md5-cache/dev-texlive/texlive-langother-2017 b/metadata/md5-cache/dev-texlive/texlive-langother-2017
index fe42168b0679..519d66f5183d 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langother-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-langother-2017
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive Other languages
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-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 ~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 ~x64-solaris ~x86-solaris
 LICENSE=GPL-1 GPL-2 LGPL-2 LPPL-1.3 OFL public-domain TeX-other-free
 RDEPEND=>=dev-texlive/texlive-basic-2017 !<dev-texlive/texlive-basic-2009 !dev-texlive/texlive-documentation-vietnamese !dev-texlive/texlive-langvietnamese !<dev-texlive/texlive-langcjk-2013 !dev-texlive/texlive-langhebrew !dev-texlive/texlive-documentation-thai !dev-texlive/texlive-langturkmen !dev-texlive/texlive-langtibetan !<dev-texlive/texlive-basic-2016 !<dev-texlive/texlive-langafrican-2017 !<dev-texlive/texlive-langindic-2017 !<dev-texlive/texlive-langeuropean-2017 >=app-text/texlive-core-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-amsldoc-vn-2017.tar.xz mirror://gentoo/texlive-module-aramaic-serto-2017.tar.xz mirror://gentoo/texlive-module-hyphen-armenian-2017.tar.xz mirror://gentoo/texlive-module-babel-azerbaijani-2017.tar.xz mirror://gentoo/texlive-module-babel-esperanto-2017.tar.xz mirror://gentoo/texlive-module-babel-georgian-2017.tar.xz mirror://gentoo/texlive-module-babel-hebrew-2017.tar.xz mirror://gentoo/texlive-module-babel-indonesian-2017.tar.xz mirror://gentoo/texlive-module-babel-interlingua-2017.tar.xz mirror://gentoo/texlive-module-babel-malay-2017.tar.xz mirror://gentoo/texlive-module-babel-sorbian-2017.tar.xz mirror://gentoo/texlive-module-babel-thai-2017.tar.xz mirror://gentoo/texlive-module-babel-vietnamese-2017.tar.xz mirror://gentoo/texlive-module-bangtex-2017.tar.xz mirror://gentoo/texlive-module-bengali-2017.tar.xz mirror://gentoo/texlive-module-burmese-2017.tar.xz mirror://gentoo/texlive-module-cjhebrew-2017.tar.xz mirror://gentoo/texlive-module-ctib-2017.tar.xz mirror://gentoo/texlive-module-ebong-2017.tar.xz mirror://gentoo/texlive-module-ethiop-2017.tar.xz mirror://gentoo/texlive-module-ethiop-t1-2017.tar.xz mirror://gentoo/texlive-module-fc-2017.tar.xz mirror://gentoo/texlive-module-fonts-tlwg-2017.tar.xz mirror://gentoo/texlive-module-hyphen-afrikaans-2017.tar.xz mirror://gentoo/texlive-module-hyphen-coptic-2017.tar.xz mirror://gentoo/texlive-module-hyphen-esperanto-2017.tar.xz mirror://gentoo/texlive-module-hyphen-ethiopic-2017.tar.xz mirror://gentoo/texlive-module-hyphen-georgian-2017.tar.xz mirror://gentoo/texlive-module-hyphen-indic-2017.tar.xz mirror://gentoo/texlive-module-hyphen-indonesian-2017.tar.xz mirror://gentoo/texlive-module-hyphen-interlingua-2017.tar.xz mirror://gentoo/texlive-module-hyphen-sanskrit-2017.tar.xz mirror://gentoo/texlive-module-hyphen-thai-2017.tar.xz mirror://gentoo/texlive-module-hyphen-turkmen-2017.tar.xz mirror://gentoo/texlive-module-latexbangla-2017.tar.xz mirror://gentoo/texlive-module-lshort-thai-2017.tar.xz mirror://gentoo/texlive-module-lshort-vietnamese-2017.tar.xz mirror://gentoo/texlive-module-ntheorem-vn-2017.tar.xz mirror://gentoo/texlive-module-padauk-2017.tar.xz mirror://gentoo/texlive-module-sanskrit-2017.tar.xz mirror://gentoo/texlive-module-sanskrit-t1-2017.tar.xz mirror://gentoo/texlive-module-thaienum-2017.tar.xz mirror://gentoo/texlive-module-velthuis-2017.tar.xz mirror://gentoo/texlive-module-vntex-2017.tar.xz mirror://gentoo/texlive-module-wnri-2017.tar.xz mirror://gentoo/texlive-module-wnri-latex-2017.tar.xz mirror://gentoo/texlive-module-xetex-devanagari-2017.tar.xz mirror://gentoo/texlive-module-collection-langother-2017.tar.xz doc? ( mirror://gentoo/texlive-module-amsldoc-vn.doc-2017.tar.xz mirror://gentoo/texlive-module-aramaic-serto.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-azerbaijani.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-esperanto.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-georgian.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-hebrew.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-indonesian.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-interlingua.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-malay.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-sorbian.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-thai.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-vietnamese.doc-2017.tar.xz mirror://gentoo/texlive-module-bangtex.doc-2017.tar.xz mirror://gentoo/texlive-module-bengali.doc-2017.tar.xz mirror://gentoo/texlive-module-burmese.doc-2017.tar.xz mirror://gentoo/texlive-module-cjhebrew.doc-2017.tar.xz mirror://gentoo/texlive-module-ctib.doc-2017.tar.xz mirror://gentoo/texlive-module-ebong.doc-2017.tar.xz mirror://gentoo/texlive-module-ethiop.doc-2017.tar.xz mirror://gentoo/texlive-module-ethiop-t1.doc-2017.tar.xz mirror://gentoo/texlive-module-fc.doc-2017.tar.xz mirror://gentoo/texlive-module-fonts-tlwg.doc-2017.tar.xz mirror://gentoo/texlive-module-hyphen-sanskrit.doc-2017.tar.xz mirror://gentoo/texlive-module-latexbangla.doc-2017.tar.xz mirror://gentoo/texlive-module-lshort-thai.doc-2017.tar.xz mirror://gentoo/texlive-module-lshort-vietnamese.doc-2017.tar.xz mirror://gentoo/texlive-module-ntheorem-vn.doc-2017.tar.xz mirror://gentoo/texlive-module-padauk.doc-2017.tar.xz mirror://gentoo/texlive-module-sanskrit.doc-2017.tar.xz mirror://gentoo/texlive-module-sanskrit-t1.doc-2017.tar.xz mirror://gentoo/texlive-module-thaienum.doc-2017.tar.xz mirror://gentoo/texlive-module-velthuis.doc-2017.tar.xz mirror://gentoo/texlive-module-vntex.doc-2017.tar.xz mirror://gentoo/texlive-module-wnri.doc-2017.tar.xz mirror://gentoo/texlive-module-wnri-latex.doc-2017.tar.xz mirror://gentoo/texlive-module-xetex-devanagari.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-hyphen-armenian.source-2017.tar.xz mirror://gentoo/texlive-module-babel-azerbaijani.source-2017.tar.xz mirror://gentoo/texlive-module-babel-esperanto.source-2017.tar.xz mirror://gentoo/texlive-module-babel-hebrew.source-2017.tar.xz mirror://gentoo/texlive-module-babel-indonesian.source-2017.tar.xz mirror://gentoo/texlive-module-babel-interlingua.source-2017.tar.xz mirror://gentoo/texlive-module-babel-malay.source-2017.tar.xz mirror://gentoo/texlive-module-babel-sorbian.source-2017.tar.xz mirror://gentoo/texlive-module-babel-thai.source-2017.tar.xz mirror://gentoo/texlive-module-babel-vietnamese.source-2017.tar.xz mirror://gentoo/texlive-module-bengali.source-2017.tar.xz mirror://gentoo/texlive-module-burmese.source-2017.tar.xz mirror://gentoo/texlive-module-ctib.source-2017.tar.xz mirror://gentoo/texlive-module-ethiop.source-2017.tar.xz mirror://gentoo/texlive-module-fonts-tlwg.source-2017.tar.xz mirror://gentoo/texlive-module-hyphen-ethiopic.source-2017.tar.xz mirror://gentoo/texlive-module-hyphen-turkmen.source-2017.tar.xz mirror://gentoo/texlive-module-sanskrit.source-2017.tar.xz mirror://gentoo/texlive-module-vntex.source-2017.tar.xz mirror://gentoo/texlive-module-wnri-latex.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c4deb08195b5d98ac026cda3d739f560
+_md5_=00d76c1b8b21c71d68f7c8b9b689f9e8
diff --git a/metadata/md5-cache/dev-texlive/texlive-langpolish-2017 b/metadata/md5-cache/dev-texlive/texlive-langpolish-2017
index cf1315894d15..66b727d8d2cc 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langpolish-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-langpolish-2017
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive Polish
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-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 ~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 ~x64-solaris ~x86-solaris
 LICENSE=GPL-2 LPPL-1.2 LPPL-1.3 LPPL-1.3c public-domain TeX
 RDEPEND=>=dev-texlive/texlive-latex-2017 >=dev-texlive/texlive-basic-2017 !dev-texlive/texlive-documentation-polish !<dev-texlive/texlive-basic-2016 >=app-text/texlive-core-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-babel-polish-2017.tar.xz mirror://gentoo/texlive-module-bredzenie-2017.tar.xz mirror://gentoo/texlive-module-cc-pl-2017.tar.xz mirror://gentoo/texlive-module-gustlib-2017.tar.xz mirror://gentoo/texlive-module-gustprog-2017.tar.xz mirror://gentoo/texlive-module-hyphen-polish-2017.tar.xz mirror://gentoo/texlive-module-lshort-polish-2017.tar.xz mirror://gentoo/texlive-module-mex-2017.tar.xz mirror://gentoo/texlive-module-mwcls-2017.tar.xz mirror://gentoo/texlive-module-pl-2017.tar.xz mirror://gentoo/texlive-module-polski-2017.tar.xz mirror://gentoo/texlive-module-przechlewski-book-2017.tar.xz mirror://gentoo/texlive-module-qpxqtx-2017.tar.xz mirror://gentoo/texlive-module-tap-2017.tar.xz mirror://gentoo/texlive-module-tex-virtual-academy-pl-2017.tar.xz mirror://gentoo/texlive-module-texlive-pl-2017.tar.xz mirror://gentoo/texlive-module-utf8mex-2017.tar.xz mirror://gentoo/texlive-module-collection-langpolish-2017.tar.xz doc? ( mirror://gentoo/texlive-module-babel-polish.doc-2017.tar.xz mirror://gentoo/texlive-module-bredzenie.doc-2017.tar.xz mirror://gentoo/texlive-module-cc-pl.doc-2017.tar.xz mirror://gentoo/texlive-module-gustlib.doc-2017.tar.xz mirror://gentoo/texlive-module-gustprog.doc-2017.tar.xz mirror://gentoo/texlive-module-lshort-polish.doc-2017.tar.xz mirror://gentoo/texlive-module-mex.doc-2017.tar.xz mirror://gentoo/texlive-module-mwcls.doc-2017.tar.xz mirror://gentoo/texlive-module-pl.doc-2017.tar.xz mirror://gentoo/texlive-module-polski.doc-2017.tar.xz mirror://gentoo/texlive-module-przechlewski-book.doc-2017.tar.xz mirror://gentoo/texlive-module-qpxqtx.doc-2017.tar.xz mirror://gentoo/texlive-module-tap.doc-2017.tar.xz mirror://gentoo/texlive-module-tex-virtual-academy-pl.doc-2017.tar.xz mirror://gentoo/texlive-module-texlive-pl.doc-2017.tar.xz mirror://gentoo/texlive-module-utf8mex.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-babel-polish.source-2017.tar.xz mirror://gentoo/texlive-module-mex.source-2017.tar.xz mirror://gentoo/texlive-module-mwcls.source-2017.tar.xz mirror://gentoo/texlive-module-polski.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=84ca6d813bde4bb36bbcdb79e774ea3f
+_md5_=e40f746c95cf50dce4b9f7eaae3e8f30
diff --git a/metadata/md5-cache/dev-texlive/texlive-langportuguese-2017 b/metadata/md5-cache/dev-texlive/texlive-langportuguese-2017
index efb3e2fec88f..16376daacd6b 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langportuguese-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-langportuguese-2017
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive Portuguese
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-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 ~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 ~x64-solaris ~x86-solaris
 LICENSE=GPL-1 GPL-2 LPPL-1.3 public-domain
 RDEPEND=>=dev-texlive/texlive-basic-2017 !dev-texlive/texlive-documentation-portuguese !<dev-texlive/texlive-basic-2016 >=app-text/texlive-core-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-babel-portuges-2017.tar.xz mirror://gentoo/texlive-module-beamer-tut-pt-2017.tar.xz mirror://gentoo/texlive-module-cursolatex-2017.tar.xz mirror://gentoo/texlive-module-feupphdteses-2017.tar.xz mirror://gentoo/texlive-module-hyphen-portuguese-2017.tar.xz mirror://gentoo/texlive-module-latexcheat-ptbr-2017.tar.xz mirror://gentoo/texlive-module-lshort-portuguese-2017.tar.xz mirror://gentoo/texlive-module-ordinalpt-2017.tar.xz mirror://gentoo/texlive-module-xypic-tut-pt-2017.tar.xz mirror://gentoo/texlive-module-collection-langportuguese-2017.tar.xz doc? ( mirror://gentoo/texlive-module-babel-portuges.doc-2017.tar.xz mirror://gentoo/texlive-module-beamer-tut-pt.doc-2017.tar.xz mirror://gentoo/texlive-module-cursolatex.doc-2017.tar.xz mirror://gentoo/texlive-module-feupphdteses.doc-2017.tar.xz mirror://gentoo/texlive-module-latexcheat-ptbr.doc-2017.tar.xz mirror://gentoo/texlive-module-lshort-portuguese.doc-2017.tar.xz mirror://gentoo/texlive-module-ordinalpt.doc-2017.tar.xz mirror://gentoo/texlive-module-xypic-tut-pt.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-babel-portuges.source-2017.tar.xz mirror://gentoo/texlive-module-ordinalpt.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=593c964768dc0fa064f26ec1d7b67507
+_md5_=5d81000de777d2e79eedc9e6cc39460a
diff --git a/metadata/md5-cache/dev-texlive/texlive-langspanish-2017 b/metadata/md5-cache/dev-texlive/texlive-langspanish-2017
index 24bbda29e98d..89dd39625831 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langspanish-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-langspanish-2017
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive Spanish
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-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 ~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 ~x64-solaris ~x86-solaris
 LICENSE=GPL-2 LPPL-1.3 public-domain TeX-other-free
 RDEPEND=>=dev-texlive/texlive-basic-2017 !dev-texlive/texlive-documentation-spanish !<dev-texlive/texlive-basic-2016 >=app-text/texlive-core-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-babel-catalan-2017.tar.xz mirror://gentoo/texlive-module-babel-galician-2017.tar.xz mirror://gentoo/texlive-module-babel-spanglish-2017.tar.xz mirror://gentoo/texlive-module-babel-spanish-2017.tar.xz mirror://gentoo/texlive-module-es-tex-faq-2017.tar.xz mirror://gentoo/texlive-module-hyphen-catalan-2017.tar.xz mirror://gentoo/texlive-module-hyphen-galician-2017.tar.xz mirror://gentoo/texlive-module-hyphen-spanish-2017.tar.xz mirror://gentoo/texlive-module-l2tabu-spanish-2017.tar.xz mirror://gentoo/texlive-module-latex2e-help-texinfo-spanish-2017.tar.xz mirror://gentoo/texlive-module-latexcheat-esmx-2017.tar.xz mirror://gentoo/texlive-module-lshort-spanish-2017.tar.xz mirror://gentoo/texlive-module-spanish-mx-2017.tar.xz mirror://gentoo/texlive-module-texlive-es-2017.tar.xz mirror://gentoo/texlive-module-collection-langspanish-2017.tar.xz doc? ( mirror://gentoo/texlive-module-babel-catalan.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-galician.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-spanglish.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-spanish.doc-2017.tar.xz mirror://gentoo/texlive-module-es-tex-faq.doc-2017.tar.xz mirror://gentoo/texlive-module-hyphen-spanish.doc-2017.tar.xz mirror://gentoo/texlive-module-l2tabu-spanish.doc-2017.tar.xz mirror://gentoo/texlive-module-latex2e-help-texinfo-spanish.doc-2017.tar.xz mirror://gentoo/texlive-module-latexcheat-esmx.doc-2017.tar.xz mirror://gentoo/texlive-module-lshort-spanish.doc-2017.tar.xz mirror://gentoo/texlive-module-spanish-mx.doc-2017.tar.xz mirror://gentoo/texlive-module-texlive-es.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-babel-catalan.source-2017.tar.xz mirror://gentoo/texlive-module-babel-galician.source-2017.tar.xz mirror://gentoo/texlive-module-babel-spanish.source-2017.tar.xz mirror://gentoo/texlive-module-hyphen-galician.source-2017.tar.xz mirror://gentoo/texlive-module-hyphen-spanish.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e4610fc36fd73e58815880e06f8ed7a2
+_md5_=3ae31ef18c72505613d258cfa8099342
diff --git a/metadata/md5-cache/dev-texlive/texlive-latex-2017 b/metadata/md5-cache/dev-texlive/texlive-latex-2017
index 428a74b30526..90b65a8f57be 100644
--- a/metadata/md5-cache/dev-texlive/texlive-latex-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-latex-2017
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive LaTeX fundamental packages
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-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 ~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 ~x64-solaris ~x86-solaris
 LICENSE=GPL-2 LPPL-1.3 public-domain
 RDEPEND=>=dev-texlive/texlive-basic-2017 !!<dev-texlive/texlive-latex-2016 !<dev-texlive/texlive-context-2010 !<dev-texlive/texlive-latexrecommended-2014 >=app-text/texlive-core-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-ae-2017.tar.xz mirror://gentoo/texlive-module-amscls-2017.tar.xz mirror://gentoo/texlive-module-amsmath-2017.tar.xz mirror://gentoo/texlive-module-babel-2017.tar.xz mirror://gentoo/texlive-module-babel-english-2017.tar.xz mirror://gentoo/texlive-module-babelbib-2017.tar.xz mirror://gentoo/texlive-module-carlisle-2017.tar.xz mirror://gentoo/texlive-module-colortbl-2017.tar.xz mirror://gentoo/texlive-module-fancyhdr-2017.tar.xz mirror://gentoo/texlive-module-fix2col-2017.tar.xz mirror://gentoo/texlive-module-geometry-2017.tar.xz mirror://gentoo/texlive-module-graphics-2017.tar.xz mirror://gentoo/texlive-module-graphics-cfg-2017.tar.xz mirror://gentoo/texlive-module-hyperref-2017.tar.xz mirror://gentoo/texlive-module-latex-2017.tar.xz mirror://gentoo/texlive-module-latex-bin-2017.tar.xz mirror://gentoo/texlive-module-latex-fonts-2017.tar.xz mirror://gentoo/texlive-module-latexconfig-2017.tar.xz mirror://gentoo/texlive-module-ltxmisc-2017.tar.xz mirror://gentoo/texlive-module-mfnfss-2017.tar.xz mirror://gentoo/texlive-module-mptopdf-2017.tar.xz mirror://gentoo/texlive-module-natbib-2017.tar.xz mirror://gentoo/texlive-module-oberdiek-2017.tar.xz mirror://gentoo/texlive-module-pslatex-2017.tar.xz mirror://gentoo/texlive-module-psnfss-2017.tar.xz mirror://gentoo/texlive-module-pspicture-2017.tar.xz mirror://gentoo/texlive-module-tools-2017.tar.xz mirror://gentoo/texlive-module-url-2017.tar.xz mirror://gentoo/texlive-module-collection-latex-2017.tar.xz doc? ( mirror://gentoo/texlive-module-ae.doc-2017.tar.xz mirror://gentoo/texlive-module-amscls.doc-2017.tar.xz mirror://gentoo/texlive-module-amsmath.doc-2017.tar.xz mirror://gentoo/texlive-module-babel.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-english.doc-2017.tar.xz mirror://gentoo/texlive-module-babelbib.doc-2017.tar.xz mirror://gentoo/texlive-module-carlisle.doc-2017.tar.xz mirror://gentoo/texlive-module-colortbl.doc-2017.tar.xz mirror://gentoo/texlive-module-fancyhdr.doc-2017.tar.xz mirror://gentoo/texlive-module-fix2col.doc-2017.tar.xz mirror://gentoo/texlive-module-geometry.doc-2017.tar.xz mirror://gentoo/texlive-module-graphics.doc-2017.tar.xz mirror://gentoo/texlive-module-graphics-cfg.doc-2017.tar.xz mirror://gentoo/texlive-module-hyperref.doc-2017.tar.xz mirror://gentoo/texlive-module-latex.doc-2017.tar.xz mirror://gentoo/texlive-module-latex-bin.doc-2017.tar.xz mirror://gentoo/texlive-module-latex-fonts.doc-2017.tar.xz mirror://gentoo/texlive-module-mfnfss.doc-2017.tar.xz mirror://gentoo/texlive-module-mptopdf.doc-2017.tar.xz mirror://gentoo/texlive-module-natbib.doc-2017.tar.xz mirror://gentoo/texlive-module-oberdiek.doc-2017.tar.xz mirror://gentoo/texlive-module-psnfss.doc-2017.tar.xz mirror://gentoo/texlive-module-pspicture.doc-2017.tar.xz mirror://gentoo/texlive-module-tools.doc-2017.tar.xz mirror://gentoo/texlive-module-url.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-ae.source-2017.tar.xz mirror://gentoo/texlive-module-amscls.source-2017.tar.xz mirror://gentoo/texlive-module-amsmath.source-2017.tar.xz mirror://gentoo/texlive-module-babel.source-2017.tar.xz mirror://gentoo/texlive-module-babel-english.source-2017.tar.xz mirror://gentoo/texlive-module-carlisle.source-2017.tar.xz mirror://gentoo/texlive-module-colortbl.source-2017.tar.xz mirror://gentoo/texlive-module-fix2col.source-2017.tar.xz mirror://gentoo/texlive-module-geometry.source-2017.tar.xz mirror://gentoo/texlive-module-graphics.source-2017.tar.xz mirror://gentoo/texlive-module-hyperref.source-2017.tar.xz mirror://gentoo/texlive-module-latex.source-2017.tar.xz mirror://gentoo/texlive-module-mfnfss.source-2017.tar.xz mirror://gentoo/texlive-module-natbib.source-2017.tar.xz mirror://gentoo/texlive-module-oberdiek.source-2017.tar.xz mirror://gentoo/texlive-module-pslatex.source-2017.tar.xz mirror://gentoo/texlive-module-psnfss.source-2017.tar.xz mirror://gentoo/texlive-module-pspicture.source-2017.tar.xz mirror://gentoo/texlive-module-tools.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=cc394a012cf596c0fdad5396cb9cfd6f
+_md5_=4539fe94c8a1f7549d6234bf065ebbd5
diff --git a/metadata/md5-cache/dev-texlive/texlive-latexextra-2017 b/metadata/md5-cache/dev-texlive/texlive-latexextra-2017
index 2e7e07f1489c..23dc7d417669 100644
--- a/metadata/md5-cache/dev-texlive/texlive-latexextra-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-latexextra-2017
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive LaTeX additional packages
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-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 ~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 ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0 Artistic BSD GPL-1 GPL-2 GPL-3 GPL-3+ LGPL-2 LPPL-1.2 LPPL-1.3 LPPL-1.3c MIT public-domain TeX-other-free
 RDEPEND=>=dev-texlive/texlive-latexrecommended-2017 >=dev-texlive/texlive-pictures-2017 >=dev-texlive/texlive-fontsrecommended-2014 !dev-tex/achemso !dev-tex/prosper !dev-tex/ha-prosper !dev-tex/texpower !dev-tex/cdcover !dev-tex/ppower4 !=dev-texlive/texlive-latexrecommended-2007* !=dev-texlive/texlive-latex3-2007* !<dev-texlive/texlive-humanities-2014 !<dev-texlive/texlive-mathextra-2010 !<dev-texlive/texlive-plainextra-2010 !<dev-texlive/texlive-pictures-2013 dev-perl/Spreadsheet-ParseExcel >=app-text/texlive-core-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-2up-2017.tar.xz mirror://gentoo/texlive-module-ESIEEcv-2017.tar.xz mirror://gentoo/texlive-module-GS1-2017.tar.xz mirror://gentoo/texlive-module-HA-prosper-2017.tar.xz mirror://gentoo/texlive-module-Tabbing-2017.tar.xz mirror://gentoo/texlive-module-a0poster-2017.tar.xz mirror://gentoo/texlive-module-a4wide-2017.tar.xz mirror://gentoo/texlive-module-a5comb-2017.tar.xz mirror://gentoo/texlive-module-abraces-2017.tar.xz mirror://gentoo/texlive-module-abstract-2017.tar.xz mirror://gentoo/texlive-module-achemso-2017.tar.xz mirror://gentoo/texlive-module-acro-2017.tar.xz mirror://gentoo/texlive-module-acronym-2017.tar.xz mirror://gentoo/texlive-module-acroterm-2017.tar.xz mirror://gentoo/texlive-module-actuarialangle-2017.tar.xz mirror://gentoo/texlive-module-actuarialsymbol-2017.tar.xz mirror://gentoo/texlive-module-addfont-2017.tar.xz mirror://gentoo/texlive-module-addlines-2017.tar.xz mirror://gentoo/texlive-module-adjmulticol-2017.tar.xz mirror://gentoo/texlive-module-adjustbox-2017.tar.xz mirror://gentoo/texlive-module-adrconv-2017.tar.xz mirror://gentoo/texlive-module-advdate-2017.tar.xz mirror://gentoo/texlive-module-akktex-2017.tar.xz mirror://gentoo/texlive-module-akletter-2017.tar.xz mirror://gentoo/texlive-module-alertmessage-2017.tar.xz mirror://gentoo/texlive-module-alnumsec-2017.tar.xz mirror://gentoo/texlive-module-alterqcm-2017.tar.xz mirror://gentoo/texlive-module-altfont-2017.tar.xz mirror://gentoo/texlive-module-amsaddr-2017.tar.xz mirror://gentoo/texlive-module-animate-2017.tar.xz mirror://gentoo/texlive-module-anonchap-2017.tar.xz mirror://gentoo/texlive-module-answers-2017.tar.xz mirror://gentoo/texlive-module-anyfontsize-2017.tar.xz mirror://gentoo/texlive-module-appendix-2017.tar.xz mirror://gentoo/texlive-module-appendixnumberbeamer-2017.tar.xz mirror://gentoo/texlive-module-apptools-2017.tar.xz mirror://gentoo/texlive-module-arcs-2017.tar.xz mirror://gentoo/texlive-module-arrayjobx-2017.tar.xz mirror://gentoo/texlive-module-arraysort-2017.tar.xz mirror://gentoo/texlive-module-arydshln-2017.tar.xz mirror://gentoo/texlive-module-asciilist-2017.tar.xz mirror://gentoo/texlive-module-assignment-2017.tar.xz mirror://gentoo/texlive-module-assoccnt-2017.tar.xz mirror://gentoo/texlive-module-attachfile-2017.tar.xz mirror://gentoo/texlive-module-aurl-2017.tar.xz mirror://gentoo/texlive-module-authoraftertitle-2017.tar.xz mirror://gentoo/texlive-module-authorindex-2017.tar.xz mirror://gentoo/texlive-module-autonum-2017.tar.xz mirror://gentoo/texlive-module-autopdf-2017.tar.xz mirror://gentoo/texlive-module-avremu-2017.tar.xz mirror://gentoo/texlive-module-background-2017.tar.xz mirror://gentoo/texlive-module-bankstatement-2017.tar.xz mirror://gentoo/texlive-module-bashful-2017.tar.xz mirror://gentoo/texlive-module-basicarith-2017.tar.xz mirror://gentoo/texlive-module-bchart-2017.tar.xz mirror://gentoo/texlive-module-beamer2thesis-2017.tar.xz mirror://gentoo/texlive-module-beameraudience-2017.tar.xz mirror://gentoo/texlive-module-beamercolorthemeowl-2017.tar.xz mirror://gentoo/texlive-module-beamerdarkthemes-2017.tar.xz mirror://gentoo/texlive-module-beamerposter-2017.tar.xz mirror://gentoo/texlive-module-beamersubframe-2017.tar.xz mirror://gentoo/texlive-module-beamertheme-cuerna-2017.tar.xz mirror://gentoo/texlive-module-beamertheme-detlevcm-2017.tar.xz mirror://gentoo/texlive-module-beamertheme-epyt-2017.tar.xz mirror://gentoo/texlive-module-beamertheme-metropolis-2017.tar.xz mirror://gentoo/texlive-module-beamertheme-phnompenh-2017.tar.xz mirror://gentoo/texlive-module-beamertheme-upenn-bc-2017.tar.xz mirror://gentoo/texlive-module-beamerthemejltree-2017.tar.xz mirror://gentoo/texlive-module-beamerthemenirma-2017.tar.xz mirror://gentoo/texlive-module-beton-2017.tar.xz mirror://gentoo/texlive-module-bewerbung-2017.tar.xz mirror://gentoo/texlive-module-bez123-2017.tar.xz mirror://gentoo/texlive-module-bezos-2017.tar.xz mirror://gentoo/texlive-module-bhcexam-2017.tar.xz mirror://gentoo/texlive-module-bibletext-2017.tar.xz mirror://gentoo/texlive-module-bigfoot-2017.tar.xz mirror://gentoo/texlive-module-bigints-2017.tar.xz mirror://gentoo/texlive-module-biochemistry-colors-2017.tar.xz mirror://gentoo/texlive-module-bizcard-2017.tar.xz mirror://gentoo/texlive-module-blindtext-2017.tar.xz mirror://gentoo/texlive-module-blkarray-2017.tar.xz mirror://gentoo/texlive-module-block-2017.tar.xz mirror://gentoo/texlive-module-bnumexpr-2017.tar.xz mirror://gentoo/texlive-module-boites-2017.tar.xz mirror://gentoo/texlive-module-bold-extra-2017.tar.xz mirror://gentoo/texlive-module-bookcover-2017.tar.xz mirror://gentoo/texlive-module-bookest-2017.tar.xz mirror://gentoo/texlive-module-booklet-2017.tar.xz mirror://gentoo/texlive-module-boolexpr-2017.tar.xz mirror://gentoo/texlive-module-bophook-2017.tar.xz mirror://gentoo/texlive-module-boxedminipage-2017.tar.xz mirror://gentoo/texlive-module-boxedminipage2e-2017.tar.xz mirror://gentoo/texlive-module-boxhandler-2017.tar.xz mirror://gentoo/texlive-module-bracketkey-2017.tar.xz mirror://gentoo/texlive-module-braket-2017.tar.xz mirror://gentoo/texlive-module-breakurl-2017.tar.xz mirror://gentoo/texlive-module-bullcntr-2017.tar.xz mirror://gentoo/texlive-module-bussproofs-2017.tar.xz mirror://gentoo/texlive-module-bxdpx-beamer-2017.tar.xz mirror://gentoo/texlive-module-bxdvidriver-2017.tar.xz mirror://gentoo/texlive-module-bxenclose-2017.tar.xz mirror://gentoo/texlive-module-bxnewfont-2017.tar.xz mirror://gentoo/texlive-module-bxpapersize-2017.tar.xz mirror://gentoo/texlive-module-bxpdfver-2017.tar.xz mirror://gentoo/texlive-module-calcage-2017.tar.xz mirror://gentoo/texlive-module-calctab-2017.tar.xz mirror://gentoo/texlive-module-calculator-2017.tar.xz mirror://gentoo/texlive-module-calrsfs-2017.tar.xz mirror://gentoo/texlive-module-cals-2017.tar.xz mirror://gentoo/texlive-module-calxxxx-yyyy-2017.tar.xz mirror://gentoo/texlive-module-cancel-2017.tar.xz mirror://gentoo/texlive-module-canoniclayout-2017.tar.xz mirror://gentoo/texlive-module-capt-of-2017.tar.xz mirror://gentoo/texlive-module-captcont-2017.tar.xz mirror://gentoo/texlive-module-captdef-2017.tar.xz mirror://gentoo/texlive-module-carbohydrates-2017.tar.xz mirror://gentoo/texlive-module-cases-2017.tar.xz mirror://gentoo/texlive-module-casyl-2017.tar.xz mirror://gentoo/texlive-module-catchfilebetweentags-2017.tar.xz mirror://gentoo/texlive-module-catechis-2017.tar.xz mirror://gentoo/texlive-module-catoptions-2017.tar.xz mirror://gentoo/texlive-module-cbcoptic-2017.tar.xz mirror://gentoo/texlive-module-ccaption-2017.tar.xz mirror://gentoo/texlive-module-cclicenses-2017.tar.xz mirror://gentoo/texlive-module-cd-2017.tar.xz mirror://gentoo/texlive-module-cd-cover-2017.tar.xz mirror://gentoo/texlive-module-cdpbundl-2017.tar.xz mirror://gentoo/texlive-module-cellspace-2017.tar.xz mirror://gentoo/texlive-module-censor-2017.tar.xz mirror://gentoo/texlive-module-changebar-2017.tar.xz mirror://gentoo/texlive-module-changelayout-2017.tar.xz mirror://gentoo/texlive-module-changepage-2017.tar.xz mirror://gentoo/texlive-module-changes-2017.tar.xz mirror://gentoo/texlive-module-chappg-2017.tar.xz mirror://gentoo/texlive-module-chapterfolder-2017.tar.xz mirror://gentoo/texlive-module-chet-2017.tar.xz mirror://gentoo/texlive-module-chextras-2017.tar.xz mirror://gentoo/texlive-module-childdoc-2017.tar.xz mirror://gentoo/texlive-module-chkfloat-2017.tar.xz mirror://gentoo/texlive-module-chletter-2017.tar.xz mirror://gentoo/texlive-module-chngcntr-2017.tar.xz mirror://gentoo/texlive-module-chronology-2017.tar.xz mirror://gentoo/texlive-module-circ-2017.tar.xz mirror://gentoo/texlive-module-classics-2017.tar.xz mirror://gentoo/texlive-module-classpack-2017.tar.xz mirror://gentoo/texlive-module-clefval-2017.tar.xz mirror://gentoo/texlive-module-cleveref-2017.tar.xz mirror://gentoo/texlive-module-clipboard-2017.tar.xz mirror://gentoo/texlive-module-clock-2017.tar.xz mirror://gentoo/texlive-module-cmdstring-2017.tar.xz mirror://gentoo/texlive-module-cmdtrack-2017.tar.xz mirror://gentoo/texlive-module-cmsd-2017.tar.xz mirror://gentoo/texlive-module-cnltx-2017.tar.xz mirror://gentoo/texlive-module-cntformats-2017.tar.xz mirror://gentoo/texlive-module-cntperchap-2017.tar.xz mirror://gentoo/texlive-module-codedoc-2017.tar.xz mirror://gentoo/texlive-module-codepage-2017.tar.xz mirror://gentoo/texlive-module-codesection-2017.tar.xz mirror://gentoo/texlive-module-collcell-2017.tar.xz mirror://gentoo/texlive-module-collectbox-2017.tar.xz mirror://gentoo/texlive-module-colordoc-2017.tar.xz mirror://gentoo/texlive-module-colorinfo-2017.tar.xz mirror://gentoo/texlive-module-coloring-2017.tar.xz mirror://gentoo/texlive-module-colorspace-2017.tar.xz mirror://gentoo/texlive-module-colortab-2017.tar.xz mirror://gentoo/texlive-module-colorwav-2017.tar.xz mirror://gentoo/texlive-module-colorweb-2017.tar.xz mirror://gentoo/texlive-module-colourchange-2017.tar.xz mirror://gentoo/texlive-module-combelow-2017.tar.xz mirror://gentoo/texlive-module-combine-2017.tar.xz mirror://gentoo/texlive-module-comma-2017.tar.xz mirror://gentoo/texlive-module-commado-2017.tar.xz mirror://gentoo/texlive-module-comment-2017.tar.xz mirror://gentoo/texlive-module-concepts-2017.tar.xz mirror://gentoo/texlive-module-concprog-2017.tar.xz mirror://gentoo/texlive-module-constants-2017.tar.xz mirror://gentoo/texlive-module-continue-2017.tar.xz mirror://gentoo/texlive-module-contour-2017.tar.xz mirror://gentoo/texlive-module-contracard-2017.tar.xz mirror://gentoo/texlive-module-conv-xkv-2017.tar.xz mirror://gentoo/texlive-module-cooking-2017.tar.xz mirror://gentoo/texlive-module-cooking-units-2017.tar.xz mirror://gentoo/texlive-module-cool-2017.tar.xz mirror://gentoo/texlive-module-coollist-2017.tar.xz mirror://gentoo/texlive-module-coolstr-2017.tar.xz mirror://gentoo/texlive-module-coolthms-2017.tar.xz mirror://gentoo/texlive-module-cooltooltips-2017.tar.xz mirror://gentoo/texlive-module-coordsys-2017.tar.xz mirror://gentoo/texlive-module-copyedit-2017.tar.xz mirror://gentoo/texlive-module-copyrightbox-2017.tar.xz mirror://gentoo/texlive-module-coseoul-2017.tar.xz mirror://gentoo/texlive-module-counttexruns-2017.tar.xz mirror://gentoo/texlive-module-courseoutline-2017.tar.xz mirror://gentoo/texlive-module-coursepaper-2017.tar.xz mirror://gentoo/texlive-module-coverpage-2017.tar.xz mirror://gentoo/texlive-module-cprotect-2017.tar.xz mirror://gentoo/texlive-module-crbox-2017.tar.xz mirror://gentoo/texlive-module-crossreference-2017.tar.xz mirror://gentoo/texlive-module-csquotes-2017.tar.xz mirror://gentoo/texlive-module-css-colors-2017.tar.xz mirror://gentoo/texlive-module-csvsimple-2017.tar.xz mirror://gentoo/texlive-module-cuisine-2017.tar.xz mirror://gentoo/texlive-module-currfile-2017.tar.xz mirror://gentoo/texlive-module-cutwin-2017.tar.xz mirror://gentoo/texlive-module-cv-2017.tar.xz mirror://gentoo/texlive-module-cv4tw-2017.tar.xz mirror://gentoo/texlive-module-cweb-latex-2017.tar.xz mirror://gentoo/texlive-module-cyber-2017.tar.xz mirror://gentoo/texlive-module-cybercic-2017.tar.xz mirror://gentoo/texlive-module-dashbox-2017.tar.xz mirror://gentoo/texlive-module-dashrule-2017.tar.xz mirror://gentoo/texlive-module-dashundergaps-2017.tar.xz mirror://gentoo/texlive-module-dataref-2017.tar.xz mirror://gentoo/texlive-module-datatool-2017.tar.xz mirror://gentoo/texlive-module-dateiliste-2017.tar.xz mirror://gentoo/texlive-module-datenumber-2017.tar.xz mirror://gentoo/texlive-module-datetime-2017.tar.xz mirror://gentoo/texlive-module-datetime2-2017.tar.xz mirror://gentoo/texlive-module-datetime2-bahasai-2017.tar.xz mirror://gentoo/texlive-module-datetime2-basque-2017.tar.xz mirror://gentoo/texlive-module-datetime2-breton-2017.tar.xz mirror://gentoo/texlive-module-datetime2-bulgarian-2017.tar.xz mirror://gentoo/texlive-module-datetime2-catalan-2017.tar.xz mirror://gentoo/texlive-module-datetime2-croatian-2017.tar.xz mirror://gentoo/texlive-module-datetime2-czech-2017.tar.xz mirror://gentoo/texlive-module-datetime2-danish-2017.tar.xz mirror://gentoo/texlive-module-datetime2-dutch-2017.tar.xz mirror://gentoo/texlive-module-datetime2-en-fulltext-2017.tar.xz mirror://gentoo/texlive-module-datetime2-english-2017.tar.xz mirror://gentoo/texlive-module-datetime2-esperanto-2017.tar.xz mirror://gentoo/texlive-module-datetime2-estonian-2017.tar.xz mirror://gentoo/texlive-module-datetime2-finnish-2017.tar.xz mirror://gentoo/texlive-module-datetime2-french-2017.tar.xz mirror://gentoo/texlive-module-datetime2-galician-2017.tar.xz mirror://gentoo/texlive-module-datetime2-german-2017.tar.xz mirror://gentoo/texlive-module-datetime2-greek-2017.tar.xz mirror://gentoo/texlive-module-datetime2-hebrew-2017.tar.xz mirror://gentoo/texlive-module-datetime2-icelandic-2017.tar.xz mirror://gentoo/texlive-module-datetime2-irish-2017.tar.xz mirror://gentoo/texlive-module-datetime2-italian-2017.tar.xz mirror://gentoo/texlive-module-datetime2-it-fulltext-2017.tar.xz mirror://gentoo/texlive-module-datetime2-latin-2017.tar.xz mirror://gentoo/texlive-module-datetime2-lsorbian-2017.tar.xz mirror://gentoo/texlive-module-datetime2-magyar-2017.tar.xz mirror://gentoo/texlive-module-datetime2-norsk-2017.tar.xz mirror://gentoo/texlive-module-datetime2-polish-2017.tar.xz mirror://gentoo/texlive-module-datetime2-portuges-2017.tar.xz mirror://gentoo/texlive-module-datetime2-romanian-2017.tar.xz mirror://gentoo/texlive-module-datetime2-russian-2017.tar.xz mirror://gentoo/texlive-module-datetime2-samin-2017.tar.xz mirror://gentoo/texlive-module-datetime2-scottish-2017.tar.xz mirror://gentoo/texlive-module-datetime2-serbian-2017.tar.xz mirror://gentoo/texlive-module-datetime2-slovak-2017.tar.xz mirror://gentoo/texlive-module-datetime2-slovene-2017.tar.xz mirror://gentoo/texlive-module-datetime2-spanish-2017.tar.xz mirror://gentoo/texlive-module-datetime2-swedish-2017.tar.xz mirror://gentoo/texlive-module-datetime2-turkish-2017.tar.xz mirror://gentoo/texlive-module-datetime2-ukrainian-2017.tar.xz mirror://gentoo/texlive-module-datetime2-usorbian-2017.tar.xz mirror://gentoo/texlive-module-datetime2-welsh-2017.tar.xz mirror://gentoo/texlive-module-dblfloatfix-2017.tar.xz mirror://gentoo/texlive-module-decimal-2017.tar.xz mirror://gentoo/texlive-module-decorule-2017.tar.xz mirror://gentoo/texlive-module-delimtxt-2017.tar.xz mirror://gentoo/texlive-module-denisbdoc-2017.tar.xz mirror://gentoo/texlive-module-diagbox-2017.tar.xz mirror://gentoo/texlive-module-diagnose-2017.tar.xz mirror://gentoo/texlive-module-dialogl-2017.tar.xz mirror://gentoo/texlive-module-dichokey-2017.tar.xz mirror://gentoo/texlive-module-dinbrief-2017.tar.xz mirror://gentoo/texlive-module-directory-2017.tar.xz mirror://gentoo/texlive-module-dirtytalk-2017.tar.xz mirror://gentoo/texlive-module-dlfltxb-2017.tar.xz mirror://gentoo/texlive-module-dnaseq-2017.tar.xz mirror://gentoo/texlive-module-doclicense-2017.tar.xz mirror://gentoo/texlive-module-docmfp-2017.tar.xz mirror://gentoo/texlive-module-docmute-2017.tar.xz mirror://gentoo/texlive-module-doctools-2017.tar.xz mirror://gentoo/texlive-module-documentation-2017.tar.xz mirror://gentoo/texlive-module-doi-2017.tar.xz mirror://gentoo/texlive-module-dotarrow-2017.tar.xz mirror://gentoo/texlive-module-dotseqn-2017.tar.xz mirror://gentoo/texlive-module-download-2017.tar.xz mirror://gentoo/texlive-module-dox-2017.tar.xz mirror://gentoo/texlive-module-dpfloat-2017.tar.xz mirror://gentoo/texlive-module-dprogress-2017.tar.xz mirror://gentoo/texlive-module-drac-2017.tar.xz mirror://gentoo/texlive-module-draftcopy-2017.tar.xz mirror://gentoo/texlive-module-draftfigure-2017.tar.xz mirror://gentoo/texlive-module-draftwatermark-2017.tar.xz mirror://gentoo/texlive-module-dtk-2017.tar.xz mirror://gentoo/texlive-module-dtxdescribe-2017.tar.xz mirror://gentoo/texlive-module-dtxgallery-2017.tar.xz mirror://gentoo/texlive-module-dvdcoll-2017.tar.xz mirror://gentoo/texlive-module-dynamicnumber-2017.tar.xz mirror://gentoo/texlive-module-dynblocks-2017.tar.xz mirror://gentoo/texlive-module-ean13isbn-2017.tar.xz mirror://gentoo/texlive-module-easy-2017.tar.xz mirror://gentoo/texlive-module-easy-todo-2017.tar.xz mirror://gentoo/texlive-module-easyfig-2017.tar.xz mirror://gentoo/texlive-module-easyformat-2017.tar.xz mirror://gentoo/texlive-module-easylist-2017.tar.xz mirror://gentoo/texlive-module-easyreview-2017.tar.xz mirror://gentoo/texlive-module-ebezier-2017.tar.xz mirror://gentoo/texlive-module-ecclesiastic-2017.tar.xz mirror://gentoo/texlive-module-ecv-2017.tar.xz mirror://gentoo/texlive-module-ed-2017.tar.xz mirror://gentoo/texlive-module-edmargin-2017.tar.xz mirror://gentoo/texlive-module-eemeir-2017.tar.xz mirror://gentoo/texlive-module-efbox-2017.tar.xz mirror://gentoo/texlive-module-egplot-2017.tar.xz mirror://gentoo/texlive-module-elements-2017.tar.xz mirror://gentoo/texlive-module-ellipsis-2017.tar.xz mirror://gentoo/texlive-module-elmath-2017.tar.xz mirror://gentoo/texlive-module-elocalloc-2017.tar.xz mirror://gentoo/texlive-module-elpres-2017.tar.xz mirror://gentoo/texlive-module-elzcards-2017.tar.xz mirror://gentoo/texlive-module-emarks-2017.tar.xz mirror://gentoo/texlive-module-embedall-2017.tar.xz mirror://gentoo/texlive-module-embrac-2017.tar.xz mirror://gentoo/texlive-module-emptypage-2017.tar.xz mirror://gentoo/texlive-module-emulateapj-2017.tar.xz mirror://gentoo/texlive-module-endfloat-2017.tar.xz mirror://gentoo/texlive-module-endheads-2017.tar.xz mirror://gentoo/texlive-module-endnotes-2017.tar.xz mirror://gentoo/texlive-module-engpron-2017.tar.xz mirror://gentoo/texlive-module-engrec-2017.tar.xz mirror://gentoo/texlive-module-enotez-2017.tar.xz mirror://gentoo/texlive-module-enumitem-2017.tar.xz mirror://gentoo/texlive-module-enumitem-zref-2017.tar.xz mirror://gentoo/texlive-module-envbig-2017.tar.xz mirror://gentoo/texlive-module-environ-2017.tar.xz mirror://gentoo/texlive-module-epigraph-2017.tar.xz mirror://gentoo/texlive-module-epiolmec-2017.tar.xz mirror://gentoo/texlive-module-eqell-2017.tar.xz mirror://gentoo/texlive-module-eqlist-2017.tar.xz mirror://gentoo/texlive-module-eqnalign-2017.tar.xz mirror://gentoo/texlive-module-eqname-2017.tar.xz mirror://gentoo/texlive-module-eqparbox-2017.tar.xz mirror://gentoo/texlive-module-errata-2017.tar.xz mirror://gentoo/texlive-module-esami-2017.tar.xz mirror://gentoo/texlive-module-esdiff-2017.tar.xz mirror://gentoo/texlive-module-esint-2017.tar.xz mirror://gentoo/texlive-module-esint-type1-2017.tar.xz mirror://gentoo/texlive-module-etaremune-2017.tar.xz mirror://gentoo/texlive-module-etextools-2017.tar.xz mirror://gentoo/texlive-module-etoc-2017.tar.xz mirror://gentoo/texlive-module-etoolbox-2017.tar.xz mirror://gentoo/texlive-module-eukdate-2017.tar.xz mirror://gentoo/texlive-module-eulerpx-2017.tar.xz mirror://gentoo/texlive-module-europasscv-2017.tar.xz mirror://gentoo/texlive-module-everyhook-2017.tar.xz mirror://gentoo/texlive-module-everypage-2017.tar.xz mirror://gentoo/texlive-module-exam-2017.tar.xz mirror://gentoo/texlive-module-exam-n-2017.tar.xz mirror://gentoo/texlive-module-examdesign-2017.tar.xz mirror://gentoo/texlive-module-example-2017.tar.xz mirror://gentoo/texlive-module-examplep-2017.tar.xz mirror://gentoo/texlive-module-exceltex-2017.tar.xz mirror://gentoo/texlive-module-excludeonly-2017.tar.xz mirror://gentoo/texlive-module-exercise-2017.tar.xz mirror://gentoo/texlive-module-exercises-2017.tar.xz mirror://gentoo/texlive-module-exp-testopt-2017.tar.xz mirror://gentoo/texlive-module-expdlist-2017.tar.xz mirror://gentoo/texlive-module-export-2017.tar.xz mirror://gentoo/texlive-module-exsheets-2017.tar.xz mirror://gentoo/texlive-module-exsol-2017.tar.xz mirror://gentoo/texlive-module-extract-2017.tar.xz mirror://gentoo/texlive-module-facsimile-2017.tar.xz mirror://gentoo/texlive-module-factura-2017.tar.xz mirror://gentoo/texlive-module-fancylabel-2017.tar.xz mirror://gentoo/texlive-module-fancynum-2017.tar.xz mirror://gentoo/texlive-module-fancypar-2017.tar.xz mirror://gentoo/texlive-module-fancyslides-2017.tar.xz mirror://gentoo/texlive-module-fancytabs-2017.tar.xz mirror://gentoo/texlive-module-fancytooltips-2017.tar.xz mirror://gentoo/texlive-module-fcolumn-2017.tar.xz mirror://gentoo/texlive-module-ffslides-2017.tar.xz mirror://gentoo/texlive-module-fgruler-2017.tar.xz mirror://gentoo/texlive-module-fibeamer-2017.tar.xz mirror://gentoo/texlive-module-fifo-stack-2017.tar.xz mirror://gentoo/texlive-module-figsize-2017.tar.xz mirror://gentoo/texlive-module-filecontents-2017.tar.xz mirror://gentoo/texlive-module-filecontentsdef-2017.tar.xz mirror://gentoo/texlive-module-filedate-2017.tar.xz mirror://gentoo/texlive-module-fileinfo-2017.tar.xz mirror://gentoo/texlive-module-filemod-2017.tar.xz mirror://gentoo/texlive-module-fink-2017.tar.xz mirror://gentoo/texlive-module-finstrut-2017.tar.xz mirror://gentoo/texlive-module-fithesis-2017.tar.xz mirror://gentoo/texlive-module-fixcmex-2017.tar.xz mirror://gentoo/texlive-module-fixfoot-2017.tar.xz mirror://gentoo/texlive-module-fixme-2017.tar.xz mirror://gentoo/texlive-module-fixmetodonotes-2017.tar.xz mirror://gentoo/texlive-module-fjodor-2017.tar.xz mirror://gentoo/texlive-module-flabels-2017.tar.xz mirror://gentoo/texlive-module-flacards-2017.tar.xz mirror://gentoo/texlive-module-flagderiv-2017.tar.xz mirror://gentoo/texlive-module-flashcards-2017.tar.xz mirror://gentoo/texlive-module-flashmovie-2017.tar.xz mirror://gentoo/texlive-module-flipbook-2017.tar.xz mirror://gentoo/texlive-module-flippdf-2017.tar.xz mirror://gentoo/texlive-module-floatflt-2017.tar.xz mirror://gentoo/texlive-module-floatrow-2017.tar.xz mirror://gentoo/texlive-module-flowfram-2017.tar.xz mirror://gentoo/texlive-module-fmp-2017.tar.xz mirror://gentoo/texlive-module-fmtcount-2017.tar.xz mirror://gentoo/texlive-module-fn2end-2017.tar.xz mirror://gentoo/texlive-module-fnbreak-2017.tar.xz mirror://gentoo/texlive-module-fncychap-2017.tar.xz mirror://gentoo/texlive-module-fncylab-2017.tar.xz mirror://gentoo/texlive-module-fnpara-2017.tar.xz mirror://gentoo/texlive-module-fnpct-2017.tar.xz mirror://gentoo/texlive-module-fnumprint-2017.tar.xz mirror://gentoo/texlive-module-foilhtml-2017.tar.xz mirror://gentoo/texlive-module-fontaxes-2017.tar.xz mirror://gentoo/texlive-module-fonttable-2017.tar.xz mirror://gentoo/texlive-module-footmisc-2017.tar.xz mirror://gentoo/texlive-module-footmisx-2017.tar.xz mirror://gentoo/texlive-module-footnotebackref-2017.tar.xz mirror://gentoo/texlive-module-footnotehyper-2017.tar.xz mirror://gentoo/texlive-module-footnoterange-2017.tar.xz mirror://gentoo/texlive-module-footnpag-2017.tar.xz mirror://gentoo/texlive-module-forarray-2017.tar.xz mirror://gentoo/texlive-module-foreign-2017.tar.xz mirror://gentoo/texlive-module-forloop-2017.tar.xz mirror://gentoo/texlive-module-formlett-2017.tar.xz mirror://gentoo/texlive-module-formular-2017.tar.xz mirror://gentoo/texlive-module-fragments-2017.tar.xz mirror://gentoo/texlive-module-frame-2017.tar.xz mirror://gentoo/texlive-module-framed-2017.tar.xz mirror://gentoo/texlive-module-frankenstein-2017.tar.xz mirror://gentoo/texlive-module-frege-2017.tar.xz mirror://gentoo/texlive-module-ftcap-2017.tar.xz mirror://gentoo/texlive-module-ftnxtra-2017.tar.xz mirror://gentoo/texlive-module-fullblck-2017.tar.xz mirror://gentoo/texlive-module-fullminipage-2017.tar.xz mirror://gentoo/texlive-module-fullwidth-2017.tar.xz mirror://gentoo/texlive-module-fundus-calligra-2017.tar.xz mirror://gentoo/texlive-module-fundus-cyr-2017.tar.xz mirror://gentoo/texlive-module-fundus-sueterlin-2017.tar.xz mirror://gentoo/texlive-module-fvextra-2017.tar.xz mirror://gentoo/texlive-module-fwlw-2017.tar.xz mirror://gentoo/texlive-module-gauss-2017.tar.xz mirror://gentoo/texlive-module-gcard-2017.tar.xz mirror://gentoo/texlive-module-gcite-2017.tar.xz mirror://gentoo/texlive-module-gender-2017.tar.xz mirror://gentoo/texlive-module-genmpage-2017.tar.xz mirror://gentoo/texlive-module-getfiledate-2017.tar.xz mirror://gentoo/texlive-module-getitems-2017.tar.xz mirror://gentoo/texlive-module-ginpenc-2017.tar.xz mirror://gentoo/texlive-module-gitfile-info-2017.tar.xz mirror://gentoo/texlive-module-gitinfo-2017.tar.xz mirror://gentoo/texlive-module-gitinfo2-2017.tar.xz mirror://gentoo/texlive-module-gitlog-2017.tar.xz mirror://gentoo/texlive-module-gloss-2017.tar.xz mirror://gentoo/texlive-module-glossaries-danish-2017.tar.xz mirror://gentoo/texlive-module-glossaries-dutch-2017.tar.xz mirror://gentoo/texlive-module-glossaries-english-2017.tar.xz mirror://gentoo/texlive-module-glossaries-extra-2017.tar.xz mirror://gentoo/texlive-module-glossaries-french-2017.tar.xz mirror://gentoo/texlive-module-glossaries-german-2017.tar.xz mirror://gentoo/texlive-module-glossaries-irish-2017.tar.xz mirror://gentoo/texlive-module-glossaries-italian-2017.tar.xz mirror://gentoo/texlive-module-glossaries-magyar-2017.tar.xz mirror://gentoo/texlive-module-glossaries-polish-2017.tar.xz mirror://gentoo/texlive-module-glossaries-portuges-2017.tar.xz mirror://gentoo/texlive-module-glossaries-serbian-2017.tar.xz mirror://gentoo/texlive-module-glossaries-spanish-2017.tar.xz mirror://gentoo/texlive-module-gmdoc-2017.tar.xz mirror://gentoo/texlive-module-gmdoc-enhance-2017.tar.xz mirror://gentoo/texlive-module-gmiflink-2017.tar.xz mirror://gentoo/texlive-module-gmutils-2017.tar.xz mirror://gentoo/texlive-module-gmverb-2017.tar.xz mirror://gentoo/texlive-module-graphbox-2017.tar.xz mirror://gentoo/texlive-module-graphicx-psmin-2017.tar.xz mirror://gentoo/texlive-module-graphicxbox-2017.tar.xz mirror://gentoo/texlive-module-grayhints-2017.tar.xz mirror://gentoo/texlive-module-grfpaste-2017.tar.xz mirror://gentoo/texlive-module-grid-2017.tar.xz mirror://gentoo/texlive-module-grid-system-2017.tar.xz mirror://gentoo/texlive-module-gridset-2017.tar.xz mirror://gentoo/texlive-module-guitlogo-2017.tar.xz mirror://gentoo/texlive-module-halloweenmath-2017.tar.xz mirror://gentoo/texlive-module-handout-2017.tar.xz mirror://gentoo/texlive-module-hang-2017.tar.xz mirror://gentoo/texlive-module-hanging-2017.tar.xz mirror://gentoo/texlive-module-hardwrap-2017.tar.xz mirror://gentoo/texlive-module-harnon-cv-2017.tar.xz mirror://gentoo/texlive-module-harpoon-2017.tar.xz mirror://gentoo/texlive-module-hc-2017.tar.xz mirror://gentoo/texlive-module-he-she-2017.tar.xz mirror://gentoo/texlive-module-hhtensor-2017.tar.xz mirror://gentoo/texlive-module-histogr-2017.tar.xz mirror://gentoo/texlive-module-hitec-2017.tar.xz mirror://gentoo/texlive-module-hletter-2017.tar.xz mirror://gentoo/texlive-module-hpsdiss-2017.tar.xz mirror://gentoo/texlive-module-hrefhide-2017.tar.xz mirror://gentoo/texlive-module-hvindex-2017.tar.xz mirror://gentoo/texlive-module-hypdvips-2017.tar.xz mirror://gentoo/texlive-module-hyper-2017.tar.xz mirror://gentoo/texlive-module-hypernat-2017.tar.xz mirror://gentoo/texlive-module-hyperref-docsrc-2017.tar.xz mirror://gentoo/texlive-module-hyperxmp-2017.tar.xz mirror://gentoo/texlive-module-hyphenat-2017.tar.xz mirror://gentoo/texlive-module-idxcmds-2017.tar.xz mirror://gentoo/texlive-module-idxlayout-2017.tar.xz mirror://gentoo/texlive-module-iffont-2017.tar.xz mirror://gentoo/texlive-module-ifmslide-2017.tar.xz mirror://gentoo/texlive-module-ifmtarg-2017.tar.xz mirror://gentoo/texlive-module-ifnextok-2017.tar.xz mirror://gentoo/texlive-module-ifoddpage-2017.tar.xz mirror://gentoo/texlive-module-ifplatform-2017.tar.xz mirror://gentoo/texlive-module-ifthenx-2017.tar.xz mirror://gentoo/texlive-module-iitem-2017.tar.xz mirror://gentoo/texlive-module-image-gallery-2017.tar.xz mirror://gentoo/texlive-module-imakeidx-2017.tar.xz mirror://gentoo/texlive-module-import-2017.tar.xz mirror://gentoo/texlive-module-incgraph-2017.tar.xz mirror://gentoo/texlive-module-indextools-2017.tar.xz mirror://gentoo/texlive-module-inlinedef-2017.tar.xz mirror://gentoo/texlive-module-inputtrc-2017.tar.xz mirror://gentoo/texlive-module-interactiveworkbook-2017.tar.xz mirror://gentoo/texlive-module-interfaces-2017.tar.xz mirror://gentoo/texlive-module-inversepath-2017.tar.xz mirror://gentoo/texlive-module-invoice-2017.tar.xz mirror://gentoo/texlive-module-iso-2017.tar.xz mirror://gentoo/texlive-module-iso10303-2017.tar.xz mirror://gentoo/texlive-module-isodate-2017.tar.xz mirror://gentoo/texlive-module-isodoc-2017.tar.xz mirror://gentoo/texlive-module-isonums-2017.tar.xz mirror://gentoo/texlive-module-isorot-2017.tar.xz mirror://gentoo/texlive-module-isotope-2017.tar.xz mirror://gentoo/texlive-module-issuulinks-2017.tar.xz mirror://gentoo/texlive-module-iwhdp-2017.tar.xz mirror://gentoo/texlive-module-jlabels-2017.tar.xz mirror://gentoo/texlive-module-jslectureplanner-2017.tar.xz mirror://gentoo/texlive-module-jumplines-2017.tar.xz mirror://gentoo/texlive-module-jvlisting-2017.tar.xz mirror://gentoo/texlive-module-kantlipsum-2017.tar.xz mirror://gentoo/texlive-module-kerntest-2017.tar.xz mirror://gentoo/texlive-module-keycommand-2017.tar.xz mirror://gentoo/texlive-module-keyfloat-2017.tar.xz mirror://gentoo/texlive-module-keyreader-2017.tar.xz mirror://gentoo/texlive-module-keystroke-2017.tar.xz mirror://gentoo/texlive-module-keyval2e-2017.tar.xz mirror://gentoo/texlive-module-keyvaltable-2017.tar.xz mirror://gentoo/texlive-module-kix-2017.tar.xz mirror://gentoo/texlive-module-koma-moderncvclassic-2017.tar.xz mirror://gentoo/texlive-module-koma-script-sfs-2017.tar.xz mirror://gentoo/texlive-module-komacv-2017.tar.xz mirror://gentoo/texlive-module-ktv-texdata-2017.tar.xz mirror://gentoo/texlive-module-l3build-2017.tar.xz mirror://gentoo/texlive-module-labbook-2017.tar.xz mirror://gentoo/texlive-module-labels-2017.tar.xz mirror://gentoo/texlive-module-lastpackage-2017.tar.xz mirror://gentoo/texlive-module-lastpage-2017.tar.xz mirror://gentoo/texlive-module-latex-tds-2017.tar.xz mirror://gentoo/texlive-module-latexdemo-2017.tar.xz mirror://gentoo/texlive-module-latexgit-2017.tar.xz mirror://gentoo/texlive-module-layouts-2017.tar.xz mirror://gentoo/texlive-module-lazylist-2017.tar.xz mirror://gentoo/texlive-module-lcd-2017.tar.xz mirror://gentoo/texlive-module-lcg-2017.tar.xz mirror://gentoo/texlive-module-leading-2017.tar.xz mirror://gentoo/texlive-module-leftidx-2017.tar.xz mirror://gentoo/texlive-module-lengthconvert-2017.tar.xz mirror://gentoo/texlive-module-lettre-2017.tar.xz mirror://gentoo/texlive-module-lettrine-2017.tar.xz mirror://gentoo/texlive-module-lewis-2017.tar.xz mirror://gentoo/texlive-module-lhelp-2017.tar.xz mirror://gentoo/texlive-module-libgreek-2017.tar.xz mirror://gentoo/texlive-module-limap-2017.tar.xz mirror://gentoo/texlive-module-linegoal-2017.tar.xz mirror://gentoo/texlive-module-linop-2017.tar.xz mirror://gentoo/texlive-module-lipsum-2017.tar.xz mirror://gentoo/texlive-module-lisp-on-tex-2017.tar.xz mirror://gentoo/texlive-module-listing-2017.tar.xz mirror://gentoo/texlive-module-listlbls-2017.tar.xz mirror://gentoo/texlive-module-listliketab-2017.tar.xz mirror://gentoo/texlive-module-listofsymbols-2017.tar.xz mirror://gentoo/texlive-module-lkproof-2017.tar.xz mirror://gentoo/texlive-module-lmake-2017.tar.xz mirror://gentoo/texlive-module-locality-2017.tar.xz mirror://gentoo/texlive-module-localloc-2017.tar.xz mirror://gentoo/texlive-module-logbox-2017.tar.xz mirror://gentoo/texlive-module-logical-markup-utils-2017.tar.xz mirror://gentoo/texlive-module-logpap-2017.tar.xz mirror://gentoo/texlive-module-longfbox-2017.tar.xz mirror://gentoo/texlive-module-longfigure-2017.tar.xz mirror://gentoo/texlive-module-longnamefilelist-2017.tar.xz mirror://gentoo/texlive-module-loops-2017.tar.xz mirror://gentoo/texlive-module-lsc-2017.tar.xz mirror://gentoo/texlive-module-lstaddons-2017.tar.xz mirror://gentoo/texlive-module-lt3graph-2017.tar.xz mirror://gentoo/texlive-module-ltablex-2017.tar.xz mirror://gentoo/texlive-module-ltabptch-2017.tar.xz mirror://gentoo/texlive-module-ltxdockit-2017.tar.xz mirror://gentoo/texlive-module-ltxindex-2017.tar.xz mirror://gentoo/texlive-module-ltxkeys-2017.tar.xz mirror://gentoo/texlive-module-ltxnew-2017.tar.xz mirror://gentoo/texlive-module-ltxtools-2017.tar.xz mirror://gentoo/texlive-module-macroswap-2017.tar.xz mirror://gentoo/texlive-module-magaz-2017.tar.xz mirror://gentoo/texlive-module-mailing-2017.tar.xz mirror://gentoo/texlive-module-mailmerge-2017.tar.xz mirror://gentoo/texlive-module-makebarcode-2017.tar.xz mirror://gentoo/texlive-module-makebase-2017.tar.xz mirror://gentoo/texlive-module-makebox-2017.tar.xz mirror://gentoo/texlive-module-makecell-2017.tar.xz mirror://gentoo/texlive-module-makecirc-2017.tar.xz mirror://gentoo/texlive-module-makecmds-2017.tar.xz mirror://gentoo/texlive-module-makedtx-2017.tar.xz mirror://gentoo/texlive-module-makeglos-2017.tar.xz mirror://gentoo/texlive-module-mandi-2017.tar.xz mirror://gentoo/texlive-module-manfnt-2017.tar.xz mirror://gentoo/texlive-module-manuscript-2017.tar.xz mirror://gentoo/texlive-module-marginfix-2017.tar.xz mirror://gentoo/texlive-module-marginnote-2017.tar.xz mirror://gentoo/texlive-module-markdown-2017.tar.xz mirror://gentoo/texlive-module-mathalfa-2017.tar.xz mirror://gentoo/texlive-module-mathastext-2017.tar.xz mirror://gentoo/texlive-module-mathexam-2017.tar.xz mirror://gentoo/texlive-module-maybemath-2017.tar.xz mirror://gentoo/texlive-module-mbenotes-2017.tar.xz mirror://gentoo/texlive-module-mcaption-2017.tar.xz mirror://gentoo/texlive-module-mceinleger-2017.tar.xz mirror://gentoo/texlive-module-mcexam-2017.tar.xz mirror://gentoo/texlive-module-mcite-2017.tar.xz mirror://gentoo/texlive-module-mciteplus-2017.tar.xz mirror://gentoo/texlive-module-mdframed-2017.tar.xz mirror://gentoo/texlive-module-media9-2017.tar.xz mirror://gentoo/texlive-module-medstarbeamer-2017.tar.xz mirror://gentoo/texlive-module-meetingmins-2017.tar.xz mirror://gentoo/texlive-module-memexsupp-2017.tar.xz mirror://gentoo/texlive-module-memory-2017.tar.xz mirror://gentoo/texlive-module-menu-2017.tar.xz mirror://gentoo/texlive-module-menukeys-2017.tar.xz mirror://gentoo/texlive-module-method-2017.tar.xz mirror://gentoo/texlive-module-metre-2017.tar.xz mirror://gentoo/texlive-module-mfirstuc-2017.tar.xz mirror://gentoo/texlive-module-mftinc-2017.tar.xz mirror://gentoo/texlive-module-midpage-2017.tar.xz mirror://gentoo/texlive-module-minibox-2017.tar.xz mirror://gentoo/texlive-module-minidocument-2017.tar.xz mirror://gentoo/texlive-module-minifp-2017.tar.xz mirror://gentoo/texlive-module-minipage-marginpar-2017.tar.xz mirror://gentoo/texlive-module-minitoc-2017.tar.xz mirror://gentoo/texlive-module-minorrevision-2017.tar.xz mirror://gentoo/texlive-module-minted-2017.tar.xz mirror://gentoo/texlive-module-minutes-2017.tar.xz mirror://gentoo/texlive-module-mla-paper-2017.tar.xz mirror://gentoo/texlive-module-mlist-2017.tar.xz mirror://gentoo/texlive-module-mmap-2017.tar.xz mirror://gentoo/texlive-module-mnotes-2017.tar.xz mirror://gentoo/texlive-module-moderncv-2017.tar.xz mirror://gentoo/texlive-module-moderntimeline-2017.tar.xz mirror://gentoo/texlive-module-modref-2017.tar.xz mirror://gentoo/texlive-module-modroman-2017.tar.xz mirror://gentoo/texlive-module-modular-2017.tar.xz mirror://gentoo/texlive-module-monofill-2017.tar.xz mirror://gentoo/texlive-module-moodle-2017.tar.xz mirror://gentoo/texlive-module-moreenum-2017.tar.xz mirror://gentoo/texlive-module-morefloats-2017.tar.xz mirror://gentoo/texlive-module-morehype-2017.tar.xz mirror://gentoo/texlive-module-moresize-2017.tar.xz mirror://gentoo/texlive-module-moreverb-2017.tar.xz mirror://gentoo/texlive-module-morewrites-2017.tar.xz mirror://gentoo/texlive-module-movie15-2017.tar.xz mirror://gentoo/texlive-module-mparhack-2017.tar.xz mirror://gentoo/texlive-module-mpostinl-2017.tar.xz mirror://gentoo/texlive-module-msc-2017.tar.xz mirror://gentoo/texlive-module-msg-2017.tar.xz mirror://gentoo/texlive-module-mslapa-2017.tar.xz mirror://gentoo/texlive-module-mtgreek-2017.tar.xz mirror://gentoo/texlive-module-multenum-2017.tar.xz mirror://gentoo/texlive-module-multiaudience-2017.tar.xz mirror://gentoo/texlive-module-multibbl-2017.tar.xz mirror://gentoo/texlive-module-multicap-2017.tar.xz mirror://gentoo/texlive-module-multidef-2017.tar.xz mirror://gentoo/texlive-module-multienv-2017.tar.xz mirror://gentoo/texlive-module-multiexpand-2017.tar.xz mirror://gentoo/texlive-module-multirow-2017.tar.xz mirror://gentoo/texlive-module-mversion-2017.tar.xz mirror://gentoo/texlive-module-mwe-2017.tar.xz mirror://gentoo/texlive-module-mycv-2017.tar.xz mirror://gentoo/texlive-module-mylatexformat-2017.tar.xz mirror://gentoo/texlive-module-nag-2017.tar.xz mirror://gentoo/texlive-module-nameauth-2017.tar.xz mirror://gentoo/texlive-module-namespc-2017.tar.xz mirror://gentoo/texlive-module-ncclatex-2017.tar.xz mirror://gentoo/texlive-module-ncctools-2017.tar.xz mirror://gentoo/texlive-module-needspace-2017.tar.xz mirror://gentoo/texlive-module-nestquot-2017.tar.xz mirror://gentoo/texlive-module-newcommand-2017.tar.xz mirror://gentoo/texlive-module-newenviron-2017.tar.xz mirror://gentoo/texlive-module-newfile-2017.tar.xz mirror://gentoo/texlive-module-newlfm-2017.tar.xz mirror://gentoo/texlive-module-newspaper-2017.tar.xz mirror://gentoo/texlive-module-newunicodechar-2017.tar.xz mirror://gentoo/texlive-module-newvbtm-2017.tar.xz mirror://gentoo/texlive-module-newverbs-2017.tar.xz mirror://gentoo/texlive-module-nextpage-2017.tar.xz mirror://gentoo/texlive-module-nfssext-cfr-2017.tar.xz mirror://gentoo/texlive-module-nicefilelist-2017.tar.xz mirror://gentoo/texlive-module-niceframe-2017.tar.xz mirror://gentoo/texlive-module-nicetext-2017.tar.xz mirror://gentoo/texlive-module-nlctdoc-2017.tar.xz mirror://gentoo/texlive-module-noconflict-2017.tar.xz mirror://gentoo/texlive-module-noindentafter-2017.tar.xz mirror://gentoo/texlive-module-noitcrul-2017.tar.xz mirror://gentoo/texlive-module-nolbreaks-2017.tar.xz mirror://gentoo/texlive-module-nomencl-2017.tar.xz mirror://gentoo/texlive-module-nomentbl-2017.tar.xz mirror://gentoo/texlive-module-nonfloat-2017.tar.xz mirror://gentoo/texlive-module-nonumonpart-2017.tar.xz mirror://gentoo/texlive-module-nopageno-2017.tar.xz mirror://gentoo/texlive-module-normalcolor-2017.tar.xz mirror://gentoo/texlive-module-notes-2017.tar.xz mirror://gentoo/texlive-module-notespages-2017.tar.xz mirror://gentoo/texlive-module-notoccite-2017.tar.xz mirror://gentoo/texlive-module-nowidow-2017.tar.xz mirror://gentoo/texlive-module-nox-2017.tar.xz mirror://gentoo/texlive-module-ntheorem-2017.tar.xz mirror://gentoo/texlive-module-numberedblock-2017.tar.xz mirror://gentoo/texlive-module-numname-2017.tar.xz mirror://gentoo/texlive-module-numprint-2017.tar.xz mirror://gentoo/texlive-module-numspell-2017.tar.xz mirror://gentoo/texlive-module-ocg-p-2017.tar.xz mirror://gentoo/texlive-module-ocgx-2017.tar.xz mirror://gentoo/texlive-module-ocgx2-2017.tar.xz mirror://gentoo/texlive-module-ocr-latex-2017.tar.xz mirror://gentoo/texlive-module-octavo-2017.tar.xz mirror://gentoo/texlive-module-oldstyle-2017.tar.xz mirror://gentoo/texlive-module-onlyamsmath-2017.tar.xz mirror://gentoo/texlive-module-opcit-2017.tar.xz mirror://gentoo/texlive-module-optidef-2017.tar.xz mirror://gentoo/texlive-module-optional-2017.tar.xz mirror://gentoo/texlive-module-options-2017.tar.xz mirror://gentoo/texlive-module-outline-2017.tar.xz mirror://gentoo/texlive-module-outliner-2017.tar.xz mirror://gentoo/texlive-module-outlines-2017.tar.xz mirror://gentoo/texlive-module-overlays-2017.tar.xz mirror://gentoo/texlive-module-overpic-2017.tar.xz mirror://gentoo/texlive-module-pagecolor-2017.tar.xz mirror://gentoo/texlive-module-pagecont-2017.tar.xz mirror://gentoo/texlive-module-pagenote-2017.tar.xz mirror://gentoo/texlive-module-pagerange-2017.tar.xz mirror://gentoo/texlive-module-pageslts-2017.tar.xz mirror://gentoo/texlive-module-paper-2017.tar.xz mirror://gentoo/texlive-module-papercdcase-2017.tar.xz mirror://gentoo/texlive-module-papermas-2017.tar.xz mirror://gentoo/texlive-module-papertex-2017.tar.xz mirror://gentoo/texlive-module-paracol-2017.tar.xz mirror://gentoo/texlive-module-parades-2017.tar.xz mirror://gentoo/texlive-module-paralist-2017.tar.xz mirror://gentoo/texlive-module-paresse-2017.tar.xz mirror://gentoo/texlive-module-parnotes-2017.tar.xz mirror://gentoo/texlive-module-parselines-2017.tar.xz mirror://gentoo/texlive-module-pas-cours-2017.tar.xz mirror://gentoo/texlive-module-pas-cv-2017.tar.xz mirror://gentoo/texlive-module-pas-tableur-2017.tar.xz mirror://gentoo/texlive-module-patch-2017.tar.xz mirror://gentoo/texlive-module-patchcmd-2017.tar.xz mirror://gentoo/texlive-module-pauldoc-2017.tar.xz mirror://gentoo/texlive-module-pawpict-2017.tar.xz mirror://gentoo/texlive-module-pbox-2017.tar.xz mirror://gentoo/texlive-module-pbsheet-2017.tar.xz mirror://gentoo/texlive-module-pdf14-2017.tar.xz mirror://gentoo/texlive-module-pdfcomment-2017.tar.xz mirror://gentoo/texlive-module-pdfcprot-2017.tar.xz mirror://gentoo/texlive-module-pdfmarginpar-2017.tar.xz mirror://gentoo/texlive-module-pdfpagediff-2017.tar.xz mirror://gentoo/texlive-module-pdfscreen-2017.tar.xz mirror://gentoo/texlive-module-pdfslide-2017.tar.xz mirror://gentoo/texlive-module-pdfsync-2017.tar.xz mirror://gentoo/texlive-module-pdfwin-2017.tar.xz mirror://gentoo/texlive-module-pdfx-2017.tar.xz mirror://gentoo/texlive-module-pecha-2017.tar.xz mirror://gentoo/texlive-module-perltex-2017.tar.xz mirror://gentoo/texlive-module-permute-2017.tar.xz mirror://gentoo/texlive-module-petiteannonce-2017.tar.xz mirror://gentoo/texlive-module-phffullpagefigure-2017.tar.xz mirror://gentoo/texlive-module-phfnote-2017.tar.xz mirror://gentoo/texlive-module-phfparen-2017.tar.xz mirror://gentoo/texlive-module-phfqit-2017.tar.xz mirror://gentoo/texlive-module-phfquotetext-2017.tar.xz mirror://gentoo/texlive-module-phfsvnwatermark-2017.tar.xz mirror://gentoo/texlive-module-phfthm-2017.tar.xz mirror://gentoo/texlive-module-philex-2017.tar.xz mirror://gentoo/texlive-module-phonenumbers-2017.tar.xz mirror://gentoo/texlive-module-photo-2017.tar.xz mirror://gentoo/texlive-module-piff-2017.tar.xz mirror://gentoo/texlive-module-pkgloader-2017.tar.xz mirror://gentoo/texlive-module-placeins-2017.tar.xz mirror://gentoo/texlive-module-plantslabels-2017.tar.xz mirror://gentoo/texlive-module-plates-2017.tar.xz mirror://gentoo/texlive-module-plweb-2017.tar.xz mirror://gentoo/texlive-module-polynom-2017.tar.xz mirror://gentoo/texlive-module-polynomial-2017.tar.xz mirror://gentoo/texlive-module-polytable-2017.tar.xz mirror://gentoo/texlive-module-postcards-2017.tar.xz mirror://gentoo/texlive-module-poster-mac-2017.tar.xz mirror://gentoo/texlive-module-ppr-prv-2017.tar.xz mirror://gentoo/texlive-module-preprint-2017.tar.xz mirror://gentoo/texlive-module-pressrelease-2017.tar.xz mirror://gentoo/texlive-module-prettyref-2017.tar.xz mirror://gentoo/texlive-module-preview-2017.tar.xz mirror://gentoo/texlive-module-printlen-2017.tar.xz mirror://gentoo/texlive-module-probsoln-2017.tar.xz mirror://gentoo/texlive-module-program-2017.tar.xz mirror://gentoo/texlive-module-progress-2017.tar.xz mirror://gentoo/texlive-module-progressbar-2017.tar.xz mirror://gentoo/texlive-module-proofread-2017.tar.xz mirror://gentoo/texlive-module-properties-2017.tar.xz mirror://gentoo/texlive-module-prosper-2017.tar.xz mirror://gentoo/texlive-module-protex-2017.tar.xz mirror://gentoo/texlive-module-protocol-2017.tar.xz mirror://gentoo/texlive-module-psfragx-2017.tar.xz mirror://gentoo/texlive-module-pst-pdf-2017.tar.xz mirror://gentoo/texlive-module-pstool-2017.tar.xz mirror://gentoo/texlive-module-pstring-2017.tar.xz mirror://gentoo/texlive-module-pxgreeks-2017.tar.xz mirror://gentoo/texlive-module-python-2017.tar.xz mirror://gentoo/texlive-module-qcm-2017.tar.xz mirror://gentoo/texlive-module-qstest-2017.tar.xz mirror://gentoo/texlive-module-qsymbols-2017.tar.xz mirror://gentoo/texlive-module-quicktype-2017.tar.xz mirror://gentoo/texlive-module-quotchap-2017.tar.xz mirror://gentoo/texlive-module-quoting-2017.tar.xz mirror://gentoo/texlive-module-quotmark-2017.tar.xz mirror://gentoo/texlive-module-ran_toks-2017.tar.xz mirror://gentoo/texlive-module-randtext-2017.tar.xz mirror://gentoo/texlive-module-rccol-2017.tar.xz mirror://gentoo/texlive-module-rcs-multi-2017.tar.xz mirror://gentoo/texlive-module-rcsinfo-2017.tar.xz mirror://gentoo/texlive-module-readarray-2017.tar.xz mirror://gentoo/texlive-module-realboxes-2017.tar.xz mirror://gentoo/texlive-module-recipe-2017.tar.xz mirror://gentoo/texlive-module-recipebook-2017.tar.xz mirror://gentoo/texlive-module-recipecard-2017.tar.xz mirror://gentoo/texlive-module-rectopma-2017.tar.xz mirror://gentoo/texlive-module-refcheck-2017.tar.xz mirror://gentoo/texlive-module-refenums-2017.tar.xz mirror://gentoo/texlive-module-reflectgraphics-2017.tar.xz mirror://gentoo/texlive-module-refman-2017.tar.xz mirror://gentoo/texlive-module-refstyle-2017.tar.xz mirror://gentoo/texlive-module-regcount-2017.tar.xz mirror://gentoo/texlive-module-regexpatch-2017.tar.xz mirror://gentoo/texlive-module-register-2017.tar.xz mirror://gentoo/texlive-module-regstats-2017.tar.xz mirror://gentoo/texlive-module-relenc-2017.tar.xz mirror://gentoo/texlive-module-relsize-2017.tar.xz mirror://gentoo/texlive-module-repeatindex-2017.tar.xz mirror://gentoo/texlive-module-repltext-2017.tar.xz mirror://gentoo/texlive-module-rjlparshap-2017.tar.xz mirror://gentoo/texlive-module-rlepsf-2017.tar.xz mirror://gentoo/texlive-module-rmpage-2017.tar.xz mirror://gentoo/texlive-module-robustcommand-2017.tar.xz mirror://gentoo/texlive-module-robustindex-2017.tar.xz mirror://gentoo/texlive-module-romanbar-2017.tar.xz mirror://gentoo/texlive-module-romanbarpagenumber-2017.tar.xz mirror://gentoo/texlive-module-romanneg-2017.tar.xz mirror://gentoo/texlive-module-romannum-2017.tar.xz mirror://gentoo/texlive-module-rotfloat-2017.tar.xz mirror://gentoo/texlive-module-rotpages-2017.tar.xz mirror://gentoo/texlive-module-roundbox-2017.tar.xz mirror://gentoo/texlive-module-rterface-2017.tar.xz mirror://gentoo/texlive-module-rtkinenc-2017.tar.xz mirror://gentoo/texlive-module-rulercompass-2017.tar.xz mirror://gentoo/texlive-module-rvwrite-2017.tar.xz mirror://gentoo/texlive-module-sanitize-umlaut-2017.tar.xz mirror://gentoo/texlive-module-sauerj-2017.tar.xz mirror://gentoo/texlive-module-savefnmark-2017.tar.xz mirror://gentoo/texlive-module-savesym-2017.tar.xz mirror://gentoo/texlive-module-savetrees-2017.tar.xz mirror://gentoo/texlive-module-scale-2017.tar.xz mirror://gentoo/texlive-module-scalebar-2017.tar.xz mirror://gentoo/texlive-module-scalerel-2017.tar.xz mirror://gentoo/texlive-module-scanpages-2017.tar.xz mirror://gentoo/texlive-module-scrlttr2copy-2017.tar.xz mirror://gentoo/texlive-module-sdrt-2017.tar.xz mirror://gentoo/texlive-module-secdot-2017.tar.xz mirror://gentoo/texlive-module-sectionbox-2017.tar.xz mirror://gentoo/texlive-module-sectsty-2017.tar.xz mirror://gentoo/texlive-module-seealso-2017.tar.xz mirror://gentoo/texlive-module-selectp-2017.tar.xz mirror://gentoo/texlive-module-semantic-2017.tar.xz mirror://gentoo/texlive-module-semantic-markup-2017.tar.xz mirror://gentoo/texlive-module-semioneside-2017.tar.xz mirror://gentoo/texlive-module-semproc-2017.tar.xz mirror://gentoo/texlive-module-sepfootnotes-2017.tar.xz mirror://gentoo/texlive-module-seqsplit-2017.tar.xz mirror://gentoo/texlive-module-sesstime-2017.tar.xz mirror://gentoo/texlive-module-sf298-2017.tar.xz mirror://gentoo/texlive-module-sffms-2017.tar.xz mirror://gentoo/texlive-module-sfmath-2017.tar.xz mirror://gentoo/texlive-module-shadethm-2017.tar.xz mirror://gentoo/texlive-module-shadow-2017.tar.xz mirror://gentoo/texlive-module-shadowtext-2017.tar.xz mirror://gentoo/texlive-module-shapepar-2017.tar.xz mirror://gentoo/texlive-module-shdoc-2017.tar.xz mirror://gentoo/texlive-module-shipunov-2017.tar.xz mirror://gentoo/texlive-module-shorttoc-2017.tar.xz mirror://gentoo/texlive-module-show2e-2017.tar.xz mirror://gentoo/texlive-module-showcharinbox-2017.tar.xz mirror://gentoo/texlive-module-showdim-2017.tar.xz mirror://gentoo/texlive-module-showexpl-2017.tar.xz mirror://gentoo/texlive-module-showlabels-2017.tar.xz mirror://gentoo/texlive-module-sidecap-2017.tar.xz mirror://gentoo/texlive-module-sidenotes-2017.tar.xz mirror://gentoo/texlive-module-silence-2017.tar.xz mirror://gentoo/texlive-module-simplecd-2017.tar.xz mirror://gentoo/texlive-module-simplecv-2017.tar.xz mirror://gentoo/texlive-module-sitem-2017.tar.xz mirror://gentoo/texlive-module-skb-2017.tar.xz mirror://gentoo/texlive-module-skdoc-2017.tar.xz mirror://gentoo/texlive-module-skeycommand-2017.tar.xz mirror://gentoo/texlive-module-skeyval-2017.tar.xz mirror://gentoo/texlive-module-skrapport-2017.tar.xz mirror://gentoo/texlive-module-slantsc-2017.tar.xz mirror://gentoo/texlive-module-smalltableof-2017.tar.xz mirror://gentoo/texlive-module-smartunits-2017.tar.xz mirror://gentoo/texlive-module-smartref-2017.tar.xz mirror://gentoo/texlive-module-snapshot-2017.tar.xz mirror://gentoo/texlive-module-snotez-2017.tar.xz mirror://gentoo/texlive-module-soul-2017.tar.xz mirror://gentoo/texlive-module-sparklines-2017.tar.xz mirror://gentoo/texlive-module-sphack-2017.tar.xz mirror://gentoo/texlive-module-splitindex-2017.tar.xz mirror://gentoo/texlive-module-spot-2017.tar.xz mirror://gentoo/texlive-module-spotcolor-2017.tar.xz mirror://gentoo/texlive-module-spreadtab-2017.tar.xz mirror://gentoo/texlive-module-spverbatim-2017.tar.xz mirror://gentoo/texlive-module-srbook-mem-2017.tar.xz mirror://gentoo/texlive-module-srcltx-2017.tar.xz mirror://gentoo/texlive-module-sseq-2017.tar.xz mirror://gentoo/texlive-module-sslides-2017.tar.xz mirror://gentoo/texlive-module-stack-2017.tar.xz mirror://gentoo/texlive-module-stackengine-2017.tar.xz mirror://gentoo/texlive-module-standalone-2017.tar.xz mirror://gentoo/texlive-module-statistik-2017.tar.xz mirror://gentoo/texlive-module-stdclsdv-2017.tar.xz mirror://gentoo/texlive-module-stdpage-2017.tar.xz mirror://gentoo/texlive-module-stex-2017.tar.xz mirror://gentoo/texlive-module-storebox-2017.tar.xz mirror://gentoo/texlive-module-storecmd-2017.tar.xz mirror://gentoo/texlive-module-stringstrings-2017.tar.xz mirror://gentoo/texlive-module-sttools-2017.tar.xz mirror://gentoo/texlive-module-stubs-2017.tar.xz mirror://gentoo/texlive-module-studenthandouts-2017.tar.xz mirror://gentoo/texlive-module-subdepth-2017.tar.xz mirror://gentoo/texlive-module-subeqn-2017.tar.xz mirror://gentoo/texlive-module-subeqnarray-2017.tar.xz mirror://gentoo/texlive-module-subfigmat-2017.tar.xz mirror://gentoo/texlive-module-subfigure-2017.tar.xz mirror://gentoo/texlive-module-subfiles-2017.tar.xz mirror://gentoo/texlive-module-subfloat-2017.tar.xz mirror://gentoo/texlive-module-substitutefont-2017.tar.xz mirror://gentoo/texlive-module-substr-2017.tar.xz mirror://gentoo/texlive-module-supertabular-2017.tar.xz mirror://gentoo/texlive-module-svg-2017.tar.xz mirror://gentoo/texlive-module-svgcolor-2017.tar.xz mirror://gentoo/texlive-module-svn-2017.tar.xz mirror://gentoo/texlive-module-svn-multi-2017.tar.xz mirror://gentoo/texlive-module-svn-prov-2017.tar.xz mirror://gentoo/texlive-module-syntax-2017.tar.xz mirror://gentoo/texlive-module-syntrace-2017.tar.xz mirror://gentoo/texlive-module-synttree-2017.tar.xz mirror://gentoo/texlive-module-tabfigures-2017.tar.xz mirror://gentoo/texlive-module-tableaux-2017.tar.xz mirror://gentoo/texlive-module-tablefootnote-2017.tar.xz mirror://gentoo/texlive-module-tableof-2017.tar.xz mirror://gentoo/texlive-module-tablestyles-2017.tar.xz mirror://gentoo/texlive-module-tablists-2017.tar.xz mirror://gentoo/texlive-module-tabls-2017.tar.xz mirror://gentoo/texlive-module-tabstackengine-2017.tar.xz mirror://gentoo/texlive-module-tabto-ltx-2017.tar.xz mirror://gentoo/texlive-module-tabu-2017.tar.xz mirror://gentoo/texlive-module-tabularborder-2017.tar.xz mirror://gentoo/texlive-module-tabularcalc-2017.tar.xz mirror://gentoo/texlive-module-tabularew-2017.tar.xz mirror://gentoo/texlive-module-tabulary-2017.tar.xz mirror://gentoo/texlive-module-tagging-2017.tar.xz mirror://gentoo/texlive-module-tagpair-2017.tar.xz mirror://gentoo/texlive-module-talk-2017.tar.xz mirror://gentoo/texlive-module-tamefloats-2017.tar.xz mirror://gentoo/texlive-module-tasks-2017.tar.xz mirror://gentoo/texlive-module-tcldoc-2017.tar.xz mirror://gentoo/texlive-module-tcolorbox-2017.tar.xz mirror://gentoo/texlive-module-tdclock-2017.tar.xz mirror://gentoo/texlive-module-technics-2017.tar.xz mirror://gentoo/texlive-module-ted-2017.tar.xz mirror://gentoo/texlive-module-templatetools-2017.tar.xz mirror://gentoo/texlive-module-termcal-2017.tar.xz mirror://gentoo/texlive-module-termlist-2017.tar.xz mirror://gentoo/texlive-module-testhyphens-2017.tar.xz mirror://gentoo/texlive-module-testidx-2017.tar.xz mirror://gentoo/texlive-module-tex-label-2017.tar.xz mirror://gentoo/texlive-module-texlogos-2017.tar.xz mirror://gentoo/texlive-module-texmate-2017.tar.xz mirror://gentoo/texlive-module-texments-2017.tar.xz mirror://gentoo/texlive-module-texpower-2017.tar.xz mirror://gentoo/texlive-module-texshade-2017.tar.xz mirror://gentoo/texlive-module-texvc-2017.tar.xz mirror://gentoo/texlive-module-textfit-2017.tar.xz mirror://gentoo/texlive-module-textmerg-2017.tar.xz mirror://gentoo/texlive-module-textpos-2017.tar.xz mirror://gentoo/texlive-module-theoremref-2017.tar.xz mirror://gentoo/texlive-module-thinsp-2017.tar.xz mirror://gentoo/texlive-module-thmtools-2017.tar.xz mirror://gentoo/texlive-module-threadcol-2017.tar.xz mirror://gentoo/texlive-module-threeparttable-2017.tar.xz mirror://gentoo/texlive-module-threeparttablex-2017.tar.xz mirror://gentoo/texlive-module-thumb-2017.tar.xz mirror://gentoo/texlive-module-thumbs-2017.tar.xz mirror://gentoo/texlive-module-thumby-2017.tar.xz mirror://gentoo/texlive-module-ticket-2017.tar.xz mirror://gentoo/texlive-module-titlecaps-2017.tar.xz mirror://gentoo/texlive-module-titlefoot-2017.tar.xz mirror://gentoo/texlive-module-titlepic-2017.tar.xz mirror://gentoo/texlive-module-titleref-2017.tar.xz mirror://gentoo/texlive-module-titlesec-2017.tar.xz mirror://gentoo/texlive-module-titling-2017.tar.xz mirror://gentoo/texlive-module-tocbibind-2017.tar.xz mirror://gentoo/texlive-module-tocdata-2017.tar.xz mirror://gentoo/texlive-module-tocloft-2017.tar.xz mirror://gentoo/texlive-module-tocvsec2-2017.tar.xz mirror://gentoo/texlive-module-todo-2017.tar.xz mirror://gentoo/texlive-module-todonotes-2017.tar.xz mirror://gentoo/texlive-module-tokenizer-2017.tar.xz mirror://gentoo/texlive-module-toolbox-2017.tar.xz mirror://gentoo/texlive-module-topfloat-2017.tar.xz mirror://gentoo/texlive-module-totcount-2017.tar.xz mirror://gentoo/texlive-module-totpages-2017.tar.xz mirror://gentoo/texlive-module-translations-2017.tar.xz mirror://gentoo/texlive-module-trfsigns-2017.tar.xz mirror://gentoo/texlive-module-trimspaces-2017.tar.xz mirror://gentoo/texlive-module-trivfloat-2017.tar.xz mirror://gentoo/texlive-module-trsym-2017.tar.xz mirror://gentoo/texlive-module-truncate-2017.tar.xz mirror://gentoo/texlive-module-tucv-2017.tar.xz mirror://gentoo/texlive-module-turnthepage-2017.tar.xz mirror://gentoo/texlive-module-twoinone-2017.tar.xz mirror://gentoo/texlive-module-twoup-2017.tar.xz mirror://gentoo/texlive-module-txgreeks-2017.tar.xz mirror://gentoo/texlive-module-type1cm-2017.tar.xz mirror://gentoo/texlive-module-typed-checklist-2017.tar.xz mirror://gentoo/texlive-module-typeface-2017.tar.xz mirror://gentoo/texlive-module-typoaid-2017.tar.xz mirror://gentoo/texlive-module-typogrid-2017.tar.xz mirror://gentoo/texlive-module-uassign-2017.tar.xz mirror://gentoo/texlive-module-ucs-2017.tar.xz mirror://gentoo/texlive-module-uebungsblatt-2017.tar.xz mirror://gentoo/texlive-module-umoline-2017.tar.xz mirror://gentoo/texlive-module-underlin-2017.tar.xz mirror://gentoo/texlive-module-underoverlap-2017.tar.xz mirror://gentoo/texlive-module-undolabl-2017.tar.xz mirror://gentoo/texlive-module-units-2017.tar.xz mirror://gentoo/texlive-module-unravel-2017.tar.xz mirror://gentoo/texlive-module-upmethodology-2017.tar.xz mirror://gentoo/texlive-module-upquote-2017.tar.xz mirror://gentoo/texlive-module-uri-2017.tar.xz mirror://gentoo/texlive-module-ushort-2017.tar.xz mirror://gentoo/texlive-module-uspace-2017.tar.xz mirror://gentoo/texlive-module-uwmslide-2017.tar.xz mirror://gentoo/texlive-module-variablelm-2017.tar.xz mirror://gentoo/texlive-module-varindex-2017.tar.xz mirror://gentoo/texlive-module-varsfromjobname-2017.tar.xz mirror://gentoo/texlive-module-varwidth-2017.tar.xz mirror://gentoo/texlive-module-vdmlisting-2017.tar.xz mirror://gentoo/texlive-module-verbasef-2017.tar.xz mirror://gentoo/texlive-module-verbatimbox-2017.tar.xz mirror://gentoo/texlive-module-verbatimcopy-2017.tar.xz mirror://gentoo/texlive-module-verbdef-2017.tar.xz mirror://gentoo/texlive-module-verbments-2017.tar.xz mirror://gentoo/texlive-module-version-2017.tar.xz mirror://gentoo/texlive-module-versions-2017.tar.xz mirror://gentoo/texlive-module-versonotes-2017.tar.xz mirror://gentoo/texlive-module-vertbars-2017.tar.xz mirror://gentoo/texlive-module-vgrid-2017.tar.xz mirror://gentoo/texlive-module-vhistory-2017.tar.xz mirror://gentoo/texlive-module-vmargin-2017.tar.xz mirror://gentoo/texlive-module-volumes-2017.tar.xz mirror://gentoo/texlive-module-vpe-2017.tar.xz mirror://gentoo/texlive-module-vruler-2017.tar.xz mirror://gentoo/texlive-module-vwcol-2017.tar.xz mirror://gentoo/texlive-module-wallpaper-2017.tar.xz mirror://gentoo/texlive-module-warning-2017.tar.xz mirror://gentoo/texlive-module-warpcol-2017.tar.xz mirror://gentoo/texlive-module-was-2017.tar.xz mirror://gentoo/texlive-module-widetable-2017.tar.xz mirror://gentoo/texlive-module-williams-2017.tar.xz mirror://gentoo/texlive-module-withargs-2017.tar.xz mirror://gentoo/texlive-module-wordcount-2017.tar.xz mirror://gentoo/texlive-module-wordlike-2017.tar.xz mirror://gentoo/texlive-module-wrapfig-2017.tar.xz mirror://gentoo/texlive-module-wtref-2017.tar.xz mirror://gentoo/texlive-module-xargs-2017.tar.xz mirror://gentoo/texlive-module-xassoccnt-2017.tar.xz mirror://gentoo/texlive-module-xcntperchap-2017.tar.xz mirror://gentoo/texlive-module-xcolor-material-2017.tar.xz mirror://gentoo/texlive-module-xcolor-solarized-2017.tar.xz mirror://gentoo/texlive-module-xcomment-2017.tar.xz mirror://gentoo/texlive-module-xdoc-2017.tar.xz mirror://gentoo/texlive-module-xellipsis-2017.tar.xz mirror://gentoo/texlive-module-xfor-2017.tar.xz mirror://gentoo/texlive-module-xhfill-2017.tar.xz mirror://gentoo/texlive-module-xifthen-2017.tar.xz mirror://gentoo/texlive-module-xint-2017.tar.xz mirror://gentoo/texlive-module-xmpincl-2017.tar.xz mirror://gentoo/texlive-module-xnewcommand-2017.tar.xz mirror://gentoo/texlive-module-xoptarg-2017.tar.xz mirror://gentoo/texlive-module-xpatch-2017.tar.xz mirror://gentoo/texlive-module-xpeek-2017.tar.xz mirror://gentoo/texlive-module-xprintlen-2017.tar.xz mirror://gentoo/texlive-module-xpunctuate-2017.tar.xz mirror://gentoo/texlive-module-xsavebox-2017.tar.xz mirror://gentoo/texlive-module-xsim-2017.tar.xz mirror://gentoo/texlive-module-xstring-2017.tar.xz mirror://gentoo/texlive-module-xtab-2017.tar.xz mirror://gentoo/texlive-module-xwatermark-2017.tar.xz mirror://gentoo/texlive-module-xytree-2017.tar.xz mirror://gentoo/texlive-module-yafoot-2017.tar.xz mirror://gentoo/texlive-module-yaletter-2017.tar.xz mirror://gentoo/texlive-module-yagusylo-2017.tar.xz mirror://gentoo/texlive-module-ycbook-2017.tar.xz mirror://gentoo/texlive-module-ydoc-2017.tar.xz mirror://gentoo/texlive-module-yplan-2017.tar.xz mirror://gentoo/texlive-module-zed-csp-2017.tar.xz mirror://gentoo/texlive-module-ziffer-2017.tar.xz mirror://gentoo/texlive-module-zwgetfdate-2017.tar.xz mirror://gentoo/texlive-module-zwpagelayout-2017.tar.xz mirror://gentoo/texlive-module-collection-latexextra-2017.tar.xz doc? ( mirror://gentoo/texlive-module-2up.doc-2017.tar.xz mirror://gentoo/texlive-module-ESIEEcv.doc-2017.tar.xz mirror://gentoo/texlive-module-GS1.doc-2017.tar.xz mirror://gentoo/texlive-module-HA-prosper.doc-2017.tar.xz mirror://gentoo/texlive-module-Tabbing.doc-2017.tar.xz mirror://gentoo/texlive-module-a0poster.doc-2017.tar.xz mirror://gentoo/texlive-module-a4wide.doc-2017.tar.xz mirror://gentoo/texlive-module-a5comb.doc-2017.tar.xz mirror://gentoo/texlive-module-abraces.doc-2017.tar.xz mirror://gentoo/texlive-module-abstract.doc-2017.tar.xz mirror://gentoo/texlive-module-achemso.doc-2017.tar.xz mirror://gentoo/texlive-module-acro.doc-2017.tar.xz mirror://gentoo/texlive-module-acronym.doc-2017.tar.xz mirror://gentoo/texlive-module-acroterm.doc-2017.tar.xz mirror://gentoo/texlive-module-actuarialangle.doc-2017.tar.xz mirror://gentoo/texlive-module-actuarialsymbol.doc-2017.tar.xz mirror://gentoo/texlive-module-addfont.doc-2017.tar.xz mirror://gentoo/texlive-module-addlines.doc-2017.tar.xz mirror://gentoo/texlive-module-adjmulticol.doc-2017.tar.xz mirror://gentoo/texlive-module-adjustbox.doc-2017.tar.xz mirror://gentoo/texlive-module-adrconv.doc-2017.tar.xz mirror://gentoo/texlive-module-advdate.doc-2017.tar.xz mirror://gentoo/texlive-module-akktex.doc-2017.tar.xz mirror://gentoo/texlive-module-akletter.doc-2017.tar.xz mirror://gentoo/texlive-module-alertmessage.doc-2017.tar.xz mirror://gentoo/texlive-module-alnumsec.doc-2017.tar.xz mirror://gentoo/texlive-module-alterqcm.doc-2017.tar.xz mirror://gentoo/texlive-module-altfont.doc-2017.tar.xz mirror://gentoo/texlive-module-amsaddr.doc-2017.tar.xz mirror://gentoo/texlive-module-animate.doc-2017.tar.xz mirror://gentoo/texlive-module-anonchap.doc-2017.tar.xz mirror://gentoo/texlive-module-answers.doc-2017.tar.xz mirror://gentoo/texlive-module-anyfontsize.doc-2017.tar.xz mirror://gentoo/texlive-module-appendix.doc-2017.tar.xz mirror://gentoo/texlive-module-appendixnumberbeamer.doc-2017.tar.xz mirror://gentoo/texlive-module-apptools.doc-2017.tar.xz mirror://gentoo/texlive-module-arcs.doc-2017.tar.xz mirror://gentoo/texlive-module-arrayjobx.doc-2017.tar.xz mirror://gentoo/texlive-module-arraysort.doc-2017.tar.xz mirror://gentoo/texlive-module-arydshln.doc-2017.tar.xz mirror://gentoo/texlive-module-asciilist.doc-2017.tar.xz mirror://gentoo/texlive-module-assignment.doc-2017.tar.xz mirror://gentoo/texlive-module-assoccnt.doc-2017.tar.xz mirror://gentoo/texlive-module-attachfile.doc-2017.tar.xz mirror://gentoo/texlive-module-aurl.doc-2017.tar.xz mirror://gentoo/texlive-module-authoraftertitle.doc-2017.tar.xz mirror://gentoo/texlive-module-authorindex.doc-2017.tar.xz mirror://gentoo/texlive-module-autonum.doc-2017.tar.xz mirror://gentoo/texlive-module-autopdf.doc-2017.tar.xz mirror://gentoo/texlive-module-avremu.doc-2017.tar.xz mirror://gentoo/texlive-module-background.doc-2017.tar.xz mirror://gentoo/texlive-module-bankstatement.doc-2017.tar.xz mirror://gentoo/texlive-module-bashful.doc-2017.tar.xz mirror://gentoo/texlive-module-basicarith.doc-2017.tar.xz mirror://gentoo/texlive-module-bchart.doc-2017.tar.xz mirror://gentoo/texlive-module-beamer2thesis.doc-2017.tar.xz mirror://gentoo/texlive-module-beameraudience.doc-2017.tar.xz mirror://gentoo/texlive-module-beamercolorthemeowl.doc-2017.tar.xz mirror://gentoo/texlive-module-beamerdarkthemes.doc-2017.tar.xz mirror://gentoo/texlive-module-beamerposter.doc-2017.tar.xz mirror://gentoo/texlive-module-beamersubframe.doc-2017.tar.xz mirror://gentoo/texlive-module-beamertheme-cuerna.doc-2017.tar.xz mirror://gentoo/texlive-module-beamertheme-detlevcm.doc-2017.tar.xz mirror://gentoo/texlive-module-beamertheme-epyt.doc-2017.tar.xz mirror://gentoo/texlive-module-beamertheme-metropolis.doc-2017.tar.xz mirror://gentoo/texlive-module-beamertheme-phnompenh.doc-2017.tar.xz mirror://gentoo/texlive-module-beamertheme-upenn-bc.doc-2017.tar.xz mirror://gentoo/texlive-module-beamerthemenirma.doc-2017.tar.xz mirror://gentoo/texlive-module-beton.doc-2017.tar.xz mirror://gentoo/texlive-module-bewerbung.doc-2017.tar.xz mirror://gentoo/texlive-module-bez123.doc-2017.tar.xz mirror://gentoo/texlive-module-bezos.doc-2017.tar.xz mirror://gentoo/texlive-module-bhcexam.doc-2017.tar.xz mirror://gentoo/texlive-module-bibletext.doc-2017.tar.xz mirror://gentoo/texlive-module-bigfoot.doc-2017.tar.xz mirror://gentoo/texlive-module-bigints.doc-2017.tar.xz mirror://gentoo/texlive-module-biochemistry-colors.doc-2017.tar.xz mirror://gentoo/texlive-module-bizcard.doc-2017.tar.xz mirror://gentoo/texlive-module-blindtext.doc-2017.tar.xz mirror://gentoo/texlive-module-blkarray.doc-2017.tar.xz mirror://gentoo/texlive-module-block.doc-2017.tar.xz mirror://gentoo/texlive-module-bnumexpr.doc-2017.tar.xz mirror://gentoo/texlive-module-boites.doc-2017.tar.xz mirror://gentoo/texlive-module-bold-extra.doc-2017.tar.xz mirror://gentoo/texlive-module-bookcover.doc-2017.tar.xz mirror://gentoo/texlive-module-bookest.doc-2017.tar.xz mirror://gentoo/texlive-module-booklet.doc-2017.tar.xz mirror://gentoo/texlive-module-boolexpr.doc-2017.tar.xz mirror://gentoo/texlive-module-bophook.doc-2017.tar.xz mirror://gentoo/texlive-module-boxedminipage.doc-2017.tar.xz mirror://gentoo/texlive-module-boxedminipage2e.doc-2017.tar.xz mirror://gentoo/texlive-module-boxhandler.doc-2017.tar.xz mirror://gentoo/texlive-module-bracketkey.doc-2017.tar.xz mirror://gentoo/texlive-module-braket.doc-2017.tar.xz mirror://gentoo/texlive-module-breakurl.doc-2017.tar.xz mirror://gentoo/texlive-module-bullcntr.doc-2017.tar.xz mirror://gentoo/texlive-module-bussproofs.doc-2017.tar.xz mirror://gentoo/texlive-module-bxdpx-beamer.doc-2017.tar.xz mirror://gentoo/texlive-module-bxdvidriver.doc-2017.tar.xz mirror://gentoo/texlive-module-bxenclose.doc-2017.tar.xz mirror://gentoo/texlive-module-bxnewfont.doc-2017.tar.xz mirror://gentoo/texlive-module-bxpapersize.doc-2017.tar.xz mirror://gentoo/texlive-module-bxpdfver.doc-2017.tar.xz mirror://gentoo/texlive-module-calcage.doc-2017.tar.xz mirror://gentoo/texlive-module-calctab.doc-2017.tar.xz mirror://gentoo/texlive-module-calculator.doc-2017.tar.xz mirror://gentoo/texlive-module-calrsfs.doc-2017.tar.xz mirror://gentoo/texlive-module-cals.doc-2017.tar.xz mirror://gentoo/texlive-module-calxxxx-yyyy.doc-2017.tar.xz mirror://gentoo/texlive-module-cancel.doc-2017.tar.xz mirror://gentoo/texlive-module-canoniclayout.doc-2017.tar.xz mirror://gentoo/texlive-module-capt-of.doc-2017.tar.xz mirror://gentoo/texlive-module-captcont.doc-2017.tar.xz mirror://gentoo/texlive-module-captdef.doc-2017.tar.xz mirror://gentoo/texlive-module-carbohydrates.doc-2017.tar.xz mirror://gentoo/texlive-module-cases.doc-2017.tar.xz mirror://gentoo/texlive-module-casyl.doc-2017.tar.xz mirror://gentoo/texlive-module-catchfilebetweentags.doc-2017.tar.xz mirror://gentoo/texlive-module-catechis.doc-2017.tar.xz mirror://gentoo/texlive-module-catoptions.doc-2017.tar.xz mirror://gentoo/texlive-module-cbcoptic.doc-2017.tar.xz mirror://gentoo/texlive-module-ccaption.doc-2017.tar.xz mirror://gentoo/texlive-module-cclicenses.doc-2017.tar.xz mirror://gentoo/texlive-module-cd.doc-2017.tar.xz mirror://gentoo/texlive-module-cd-cover.doc-2017.tar.xz mirror://gentoo/texlive-module-cdpbundl.doc-2017.tar.xz mirror://gentoo/texlive-module-cellspace.doc-2017.tar.xz mirror://gentoo/texlive-module-censor.doc-2017.tar.xz mirror://gentoo/texlive-module-changebar.doc-2017.tar.xz mirror://gentoo/texlive-module-changelayout.doc-2017.tar.xz mirror://gentoo/texlive-module-changepage.doc-2017.tar.xz mirror://gentoo/texlive-module-changes.doc-2017.tar.xz mirror://gentoo/texlive-module-chappg.doc-2017.tar.xz mirror://gentoo/texlive-module-chapterfolder.doc-2017.tar.xz mirror://gentoo/texlive-module-chet.doc-2017.tar.xz mirror://gentoo/texlive-module-chextras.doc-2017.tar.xz mirror://gentoo/texlive-module-childdoc.doc-2017.tar.xz mirror://gentoo/texlive-module-chkfloat.doc-2017.tar.xz mirror://gentoo/texlive-module-chletter.doc-2017.tar.xz mirror://gentoo/texlive-module-chngcntr.doc-2017.tar.xz mirror://gentoo/texlive-module-chronology.doc-2017.tar.xz mirror://gentoo/texlive-module-circ.doc-2017.tar.xz mirror://gentoo/texlive-module-classics.doc-2017.tar.xz mirror://gentoo/texlive-module-classpack.doc-2017.tar.xz mirror://gentoo/texlive-module-clefval.doc-2017.tar.xz mirror://gentoo/texlive-module-cleveref.doc-2017.tar.xz mirror://gentoo/texlive-module-clipboard.doc-2017.tar.xz mirror://gentoo/texlive-module-clock.doc-2017.tar.xz mirror://gentoo/texlive-module-cmdstring.doc-2017.tar.xz mirror://gentoo/texlive-module-cmdtrack.doc-2017.tar.xz mirror://gentoo/texlive-module-cmsd.doc-2017.tar.xz mirror://gentoo/texlive-module-cnltx.doc-2017.tar.xz mirror://gentoo/texlive-module-cntformats.doc-2017.tar.xz mirror://gentoo/texlive-module-cntperchap.doc-2017.tar.xz mirror://gentoo/texlive-module-codedoc.doc-2017.tar.xz mirror://gentoo/texlive-module-codepage.doc-2017.tar.xz mirror://gentoo/texlive-module-codesection.doc-2017.tar.xz mirror://gentoo/texlive-module-collcell.doc-2017.tar.xz mirror://gentoo/texlive-module-collectbox.doc-2017.tar.xz mirror://gentoo/texlive-module-colordoc.doc-2017.tar.xz mirror://gentoo/texlive-module-colorinfo.doc-2017.tar.xz mirror://gentoo/texlive-module-coloring.doc-2017.tar.xz mirror://gentoo/texlive-module-colorspace.doc-2017.tar.xz mirror://gentoo/texlive-module-colortab.doc-2017.tar.xz mirror://gentoo/texlive-module-colorwav.doc-2017.tar.xz mirror://gentoo/texlive-module-colorweb.doc-2017.tar.xz mirror://gentoo/texlive-module-colourchange.doc-2017.tar.xz mirror://gentoo/texlive-module-combelow.doc-2017.tar.xz mirror://gentoo/texlive-module-combine.doc-2017.tar.xz mirror://gentoo/texlive-module-comma.doc-2017.tar.xz mirror://gentoo/texlive-module-commado.doc-2017.tar.xz mirror://gentoo/texlive-module-comment.doc-2017.tar.xz mirror://gentoo/texlive-module-concepts.doc-2017.tar.xz mirror://gentoo/texlive-module-concprog.doc-2017.tar.xz mirror://gentoo/texlive-module-constants.doc-2017.tar.xz mirror://gentoo/texlive-module-continue.doc-2017.tar.xz mirror://gentoo/texlive-module-contour.doc-2017.tar.xz mirror://gentoo/texlive-module-contracard.doc-2017.tar.xz mirror://gentoo/texlive-module-conv-xkv.doc-2017.tar.xz mirror://gentoo/texlive-module-cooking.doc-2017.tar.xz mirror://gentoo/texlive-module-cooking-units.doc-2017.tar.xz mirror://gentoo/texlive-module-cool.doc-2017.tar.xz mirror://gentoo/texlive-module-coollist.doc-2017.tar.xz mirror://gentoo/texlive-module-coolstr.doc-2017.tar.xz mirror://gentoo/texlive-module-coolthms.doc-2017.tar.xz mirror://gentoo/texlive-module-cooltooltips.doc-2017.tar.xz mirror://gentoo/texlive-module-coordsys.doc-2017.tar.xz mirror://gentoo/texlive-module-copyedit.doc-2017.tar.xz mirror://gentoo/texlive-module-copyrightbox.doc-2017.tar.xz mirror://gentoo/texlive-module-coseoul.doc-2017.tar.xz mirror://gentoo/texlive-module-counttexruns.doc-2017.tar.xz mirror://gentoo/texlive-module-courseoutline.doc-2017.tar.xz mirror://gentoo/texlive-module-coursepaper.doc-2017.tar.xz mirror://gentoo/texlive-module-coverpage.doc-2017.tar.xz mirror://gentoo/texlive-module-cprotect.doc-2017.tar.xz mirror://gentoo/texlive-module-crbox.doc-2017.tar.xz mirror://gentoo/texlive-module-crossreference.doc-2017.tar.xz mirror://gentoo/texlive-module-csquotes.doc-2017.tar.xz mirror://gentoo/texlive-module-css-colors.doc-2017.tar.xz mirror://gentoo/texlive-module-csvsimple.doc-2017.tar.xz mirror://gentoo/texlive-module-cuisine.doc-2017.tar.xz mirror://gentoo/texlive-module-currfile.doc-2017.tar.xz mirror://gentoo/texlive-module-cutwin.doc-2017.tar.xz mirror://gentoo/texlive-module-cv.doc-2017.tar.xz mirror://gentoo/texlive-module-cv4tw.doc-2017.tar.xz mirror://gentoo/texlive-module-cweb-latex.doc-2017.tar.xz mirror://gentoo/texlive-module-cyber.doc-2017.tar.xz mirror://gentoo/texlive-module-cybercic.doc-2017.tar.xz mirror://gentoo/texlive-module-dashbox.doc-2017.tar.xz mirror://gentoo/texlive-module-dashrule.doc-2017.tar.xz mirror://gentoo/texlive-module-dashundergaps.doc-2017.tar.xz mirror://gentoo/texlive-module-dataref.doc-2017.tar.xz mirror://gentoo/texlive-module-datatool.doc-2017.tar.xz mirror://gentoo/texlive-module-dateiliste.doc-2017.tar.xz mirror://gentoo/texlive-module-datenumber.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-bahasai.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-basque.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-breton.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-bulgarian.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-catalan.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-croatian.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-czech.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-danish.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-dutch.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-en-fulltext.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-english.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-esperanto.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-estonian.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-finnish.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-french.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-galician.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-german.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-greek.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-hebrew.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-icelandic.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-irish.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-italian.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-it-fulltext.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-latin.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-lsorbian.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-magyar.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-norsk.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-polish.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-portuges.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-romanian.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-russian.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-samin.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-scottish.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-serbian.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-slovak.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-slovene.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-spanish.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-swedish.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-turkish.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-ukrainian.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-usorbian.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-welsh.doc-2017.tar.xz mirror://gentoo/texlive-module-dblfloatfix.doc-2017.tar.xz mirror://gentoo/texlive-module-decimal.doc-2017.tar.xz mirror://gentoo/texlive-module-decorule.doc-2017.tar.xz mirror://gentoo/texlive-module-delimtxt.doc-2017.tar.xz mirror://gentoo/texlive-module-denisbdoc.doc-2017.tar.xz mirror://gentoo/texlive-module-diagbox.doc-2017.tar.xz mirror://gentoo/texlive-module-diagnose.doc-2017.tar.xz mirror://gentoo/texlive-module-dialogl.doc-2017.tar.xz mirror://gentoo/texlive-module-dichokey.doc-2017.tar.xz mirror://gentoo/texlive-module-dinbrief.doc-2017.tar.xz mirror://gentoo/texlive-module-directory.doc-2017.tar.xz mirror://gentoo/texlive-module-dirtytalk.doc-2017.tar.xz mirror://gentoo/texlive-module-dlfltxb.doc-2017.tar.xz mirror://gentoo/texlive-module-dnaseq.doc-2017.tar.xz mirror://gentoo/texlive-module-doclicense.doc-2017.tar.xz mirror://gentoo/texlive-module-docmfp.doc-2017.tar.xz mirror://gentoo/texlive-module-docmute.doc-2017.tar.xz mirror://gentoo/texlive-module-doctools.doc-2017.tar.xz mirror://gentoo/texlive-module-documentation.doc-2017.tar.xz mirror://gentoo/texlive-module-doi.doc-2017.tar.xz mirror://gentoo/texlive-module-dotarrow.doc-2017.tar.xz mirror://gentoo/texlive-module-dotseqn.doc-2017.tar.xz mirror://gentoo/texlive-module-download.doc-2017.tar.xz mirror://gentoo/texlive-module-dox.doc-2017.tar.xz mirror://gentoo/texlive-module-dpfloat.doc-2017.tar.xz mirror://gentoo/texlive-module-dprogress.doc-2017.tar.xz mirror://gentoo/texlive-module-drac.doc-2017.tar.xz mirror://gentoo/texlive-module-draftcopy.doc-2017.tar.xz mirror://gentoo/texlive-module-draftfigure.doc-2017.tar.xz mirror://gentoo/texlive-module-draftwatermark.doc-2017.tar.xz mirror://gentoo/texlive-module-dtk.doc-2017.tar.xz mirror://gentoo/texlive-module-dtxdescribe.doc-2017.tar.xz mirror://gentoo/texlive-module-dtxgallery.doc-2017.tar.xz mirror://gentoo/texlive-module-dvdcoll.doc-2017.tar.xz mirror://gentoo/texlive-module-dynamicnumber.doc-2017.tar.xz mirror://gentoo/texlive-module-dynblocks.doc-2017.tar.xz mirror://gentoo/texlive-module-ean13isbn.doc-2017.tar.xz mirror://gentoo/texlive-module-easy.doc-2017.tar.xz mirror://gentoo/texlive-module-easy-todo.doc-2017.tar.xz mirror://gentoo/texlive-module-easyfig.doc-2017.tar.xz mirror://gentoo/texlive-module-easyformat.doc-2017.tar.xz mirror://gentoo/texlive-module-easylist.doc-2017.tar.xz mirror://gentoo/texlive-module-easyreview.doc-2017.tar.xz mirror://gentoo/texlive-module-ebezier.doc-2017.tar.xz mirror://gentoo/texlive-module-ecclesiastic.doc-2017.tar.xz mirror://gentoo/texlive-module-ecv.doc-2017.tar.xz mirror://gentoo/texlive-module-ed.doc-2017.tar.xz mirror://gentoo/texlive-module-edmargin.doc-2017.tar.xz mirror://gentoo/texlive-module-eemeir.doc-2017.tar.xz mirror://gentoo/texlive-module-efbox.doc-2017.tar.xz mirror://gentoo/texlive-module-egplot.doc-2017.tar.xz mirror://gentoo/texlive-module-elements.doc-2017.tar.xz mirror://gentoo/texlive-module-ellipsis.doc-2017.tar.xz mirror://gentoo/texlive-module-elmath.doc-2017.tar.xz mirror://gentoo/texlive-module-elocalloc.doc-2017.tar.xz mirror://gentoo/texlive-module-elpres.doc-2017.tar.xz mirror://gentoo/texlive-module-elzcards.doc-2017.tar.xz mirror://gentoo/texlive-module-emarks.doc-2017.tar.xz mirror://gentoo/texlive-module-embedall.doc-2017.tar.xz mirror://gentoo/texlive-module-embrac.doc-2017.tar.xz mirror://gentoo/texlive-module-emptypage.doc-2017.tar.xz mirror://gentoo/texlive-module-emulateapj.doc-2017.tar.xz mirror://gentoo/texlive-module-endfloat.doc-2017.tar.xz mirror://gentoo/texlive-module-endheads.doc-2017.tar.xz mirror://gentoo/texlive-module-endnotes.doc-2017.tar.xz mirror://gentoo/texlive-module-engpron.doc-2017.tar.xz mirror://gentoo/texlive-module-engrec.doc-2017.tar.xz mirror://gentoo/texlive-module-enotez.doc-2017.tar.xz mirror://gentoo/texlive-module-enumitem.doc-2017.tar.xz mirror://gentoo/texlive-module-enumitem-zref.doc-2017.tar.xz mirror://gentoo/texlive-module-envbig.doc-2017.tar.xz mirror://gentoo/texlive-module-environ.doc-2017.tar.xz mirror://gentoo/texlive-module-epigraph.doc-2017.tar.xz mirror://gentoo/texlive-module-epiolmec.doc-2017.tar.xz mirror://gentoo/texlive-module-eqell.doc-2017.tar.xz mirror://gentoo/texlive-module-eqlist.doc-2017.tar.xz mirror://gentoo/texlive-module-eqnalign.doc-2017.tar.xz mirror://gentoo/texlive-module-eqparbox.doc-2017.tar.xz mirror://gentoo/texlive-module-errata.doc-2017.tar.xz mirror://gentoo/texlive-module-esami.doc-2017.tar.xz mirror://gentoo/texlive-module-esdiff.doc-2017.tar.xz mirror://gentoo/texlive-module-esint.doc-2017.tar.xz mirror://gentoo/texlive-module-esint-type1.doc-2017.tar.xz mirror://gentoo/texlive-module-etaremune.doc-2017.tar.xz mirror://gentoo/texlive-module-etextools.doc-2017.tar.xz mirror://gentoo/texlive-module-etoc.doc-2017.tar.xz mirror://gentoo/texlive-module-etoolbox.doc-2017.tar.xz mirror://gentoo/texlive-module-eukdate.doc-2017.tar.xz mirror://gentoo/texlive-module-eulerpx.doc-2017.tar.xz mirror://gentoo/texlive-module-europasscv.doc-2017.tar.xz mirror://gentoo/texlive-module-everyhook.doc-2017.tar.xz mirror://gentoo/texlive-module-everypage.doc-2017.tar.xz mirror://gentoo/texlive-module-exam.doc-2017.tar.xz mirror://gentoo/texlive-module-exam-n.doc-2017.tar.xz mirror://gentoo/texlive-module-examdesign.doc-2017.tar.xz mirror://gentoo/texlive-module-examplep.doc-2017.tar.xz mirror://gentoo/texlive-module-exceltex.doc-2017.tar.xz mirror://gentoo/texlive-module-excludeonly.doc-2017.tar.xz mirror://gentoo/texlive-module-exercise.doc-2017.tar.xz mirror://gentoo/texlive-module-exercises.doc-2017.tar.xz mirror://gentoo/texlive-module-exp-testopt.doc-2017.tar.xz mirror://gentoo/texlive-module-expdlist.doc-2017.tar.xz mirror://gentoo/texlive-module-export.doc-2017.tar.xz mirror://gentoo/texlive-module-exsheets.doc-2017.tar.xz mirror://gentoo/texlive-module-exsol.doc-2017.tar.xz mirror://gentoo/texlive-module-extract.doc-2017.tar.xz mirror://gentoo/texlive-module-facsimile.doc-2017.tar.xz mirror://gentoo/texlive-module-factura.doc-2017.tar.xz mirror://gentoo/texlive-module-fancylabel.doc-2017.tar.xz mirror://gentoo/texlive-module-fancynum.doc-2017.tar.xz mirror://gentoo/texlive-module-fancypar.doc-2017.tar.xz mirror://gentoo/texlive-module-fancyslides.doc-2017.tar.xz mirror://gentoo/texlive-module-fancytabs.doc-2017.tar.xz mirror://gentoo/texlive-module-fancytooltips.doc-2017.tar.xz mirror://gentoo/texlive-module-fcolumn.doc-2017.tar.xz mirror://gentoo/texlive-module-ffslides.doc-2017.tar.xz mirror://gentoo/texlive-module-fgruler.doc-2017.tar.xz mirror://gentoo/texlive-module-fibeamer.doc-2017.tar.xz mirror://gentoo/texlive-module-fifo-stack.doc-2017.tar.xz mirror://gentoo/texlive-module-figsize.doc-2017.tar.xz mirror://gentoo/texlive-module-filecontents.doc-2017.tar.xz mirror://gentoo/texlive-module-filecontentsdef.doc-2017.tar.xz mirror://gentoo/texlive-module-filedate.doc-2017.tar.xz mirror://gentoo/texlive-module-fileinfo.doc-2017.tar.xz mirror://gentoo/texlive-module-filemod.doc-2017.tar.xz mirror://gentoo/texlive-module-fink.doc-2017.tar.xz mirror://gentoo/texlive-module-finstrut.doc-2017.tar.xz mirror://gentoo/texlive-module-fithesis.doc-2017.tar.xz mirror://gentoo/texlive-module-fixcmex.doc-2017.tar.xz mirror://gentoo/texlive-module-fixfoot.doc-2017.tar.xz mirror://gentoo/texlive-module-fixme.doc-2017.tar.xz mirror://gentoo/texlive-module-fixmetodonotes.doc-2017.tar.xz mirror://gentoo/texlive-module-fjodor.doc-2017.tar.xz mirror://gentoo/texlive-module-flabels.doc-2017.tar.xz mirror://gentoo/texlive-module-flacards.doc-2017.tar.xz mirror://gentoo/texlive-module-flagderiv.doc-2017.tar.xz mirror://gentoo/texlive-module-flashcards.doc-2017.tar.xz mirror://gentoo/texlive-module-flashmovie.doc-2017.tar.xz mirror://gentoo/texlive-module-flipbook.doc-2017.tar.xz mirror://gentoo/texlive-module-flippdf.doc-2017.tar.xz mirror://gentoo/texlive-module-floatflt.doc-2017.tar.xz mirror://gentoo/texlive-module-floatrow.doc-2017.tar.xz mirror://gentoo/texlive-module-flowfram.doc-2017.tar.xz mirror://gentoo/texlive-module-fmp.doc-2017.tar.xz mirror://gentoo/texlive-module-fmtcount.doc-2017.tar.xz mirror://gentoo/texlive-module-fn2end.doc-2017.tar.xz mirror://gentoo/texlive-module-fnbreak.doc-2017.tar.xz mirror://gentoo/texlive-module-fncychap.doc-2017.tar.xz mirror://gentoo/texlive-module-fncylab.doc-2017.tar.xz mirror://gentoo/texlive-module-fnpara.doc-2017.tar.xz mirror://gentoo/texlive-module-fnpct.doc-2017.tar.xz mirror://gentoo/texlive-module-fnumprint.doc-2017.tar.xz mirror://gentoo/texlive-module-foilhtml.doc-2017.tar.xz mirror://gentoo/texlive-module-fontaxes.doc-2017.tar.xz mirror://gentoo/texlive-module-fonttable.doc-2017.tar.xz mirror://gentoo/texlive-module-footmisc.doc-2017.tar.xz mirror://gentoo/texlive-module-footmisx.doc-2017.tar.xz mirror://gentoo/texlive-module-footnotebackref.doc-2017.tar.xz mirror://gentoo/texlive-module-footnotehyper.doc-2017.tar.xz mirror://gentoo/texlive-module-footnoterange.doc-2017.tar.xz mirror://gentoo/texlive-module-footnpag.doc-2017.tar.xz mirror://gentoo/texlive-module-forarray.doc-2017.tar.xz mirror://gentoo/texlive-module-foreign.doc-2017.tar.xz mirror://gentoo/texlive-module-forloop.doc-2017.tar.xz mirror://gentoo/texlive-module-formlett.doc-2017.tar.xz mirror://gentoo/texlive-module-formular.doc-2017.tar.xz mirror://gentoo/texlive-module-fragments.doc-2017.tar.xz mirror://gentoo/texlive-module-frame.doc-2017.tar.xz mirror://gentoo/texlive-module-framed.doc-2017.tar.xz mirror://gentoo/texlive-module-frankenstein.doc-2017.tar.xz mirror://gentoo/texlive-module-frege.doc-2017.tar.xz mirror://gentoo/texlive-module-ftcap.doc-2017.tar.xz mirror://gentoo/texlive-module-ftnxtra.doc-2017.tar.xz mirror://gentoo/texlive-module-fullblck.doc-2017.tar.xz mirror://gentoo/texlive-module-fullminipage.doc-2017.tar.xz mirror://gentoo/texlive-module-fullwidth.doc-2017.tar.xz mirror://gentoo/texlive-module-fundus-calligra.doc-2017.tar.xz mirror://gentoo/texlive-module-fundus-sueterlin.doc-2017.tar.xz mirror://gentoo/texlive-module-fvextra.doc-2017.tar.xz mirror://gentoo/texlive-module-fwlw.doc-2017.tar.xz mirror://gentoo/texlive-module-gauss.doc-2017.tar.xz mirror://gentoo/texlive-module-gcard.doc-2017.tar.xz mirror://gentoo/texlive-module-gcite.doc-2017.tar.xz mirror://gentoo/texlive-module-gender.doc-2017.tar.xz mirror://gentoo/texlive-module-genmpage.doc-2017.tar.xz mirror://gentoo/texlive-module-getfiledate.doc-2017.tar.xz mirror://gentoo/texlive-module-getitems.doc-2017.tar.xz mirror://gentoo/texlive-module-ginpenc.doc-2017.tar.xz mirror://gentoo/texlive-module-gitfile-info.doc-2017.tar.xz mirror://gentoo/texlive-module-gitinfo.doc-2017.tar.xz mirror://gentoo/texlive-module-gitinfo2.doc-2017.tar.xz mirror://gentoo/texlive-module-gitlog.doc-2017.tar.xz mirror://gentoo/texlive-module-gloss.doc-2017.tar.xz mirror://gentoo/texlive-module-glossaries-danish.doc-2017.tar.xz mirror://gentoo/texlive-module-glossaries-dutch.doc-2017.tar.xz mirror://gentoo/texlive-module-glossaries-english.doc-2017.tar.xz mirror://gentoo/texlive-module-glossaries-extra.doc-2017.tar.xz mirror://gentoo/texlive-module-glossaries-french.doc-2017.tar.xz mirror://gentoo/texlive-module-glossaries-german.doc-2017.tar.xz mirror://gentoo/texlive-module-glossaries-irish.doc-2017.tar.xz mirror://gentoo/texlive-module-glossaries-italian.doc-2017.tar.xz mirror://gentoo/texlive-module-glossaries-magyar.doc-2017.tar.xz mirror://gentoo/texlive-module-glossaries-polish.doc-2017.tar.xz mirror://gentoo/texlive-module-glossaries-portuges.doc-2017.tar.xz mirror://gentoo/texlive-module-glossaries-serbian.doc-2017.tar.xz mirror://gentoo/texlive-module-glossaries-spanish.doc-2017.tar.xz mirror://gentoo/texlive-module-gmdoc.doc-2017.tar.xz mirror://gentoo/texlive-module-gmdoc-enhance.doc-2017.tar.xz mirror://gentoo/texlive-module-gmiflink.doc-2017.tar.xz mirror://gentoo/texlive-module-gmutils.doc-2017.tar.xz mirror://gentoo/texlive-module-gmverb.doc-2017.tar.xz mirror://gentoo/texlive-module-graphbox.doc-2017.tar.xz mirror://gentoo/texlive-module-graphicx-psmin.doc-2017.tar.xz mirror://gentoo/texlive-module-graphicxbox.doc-2017.tar.xz mirror://gentoo/texlive-module-grayhints.doc-2017.tar.xz mirror://gentoo/texlive-module-grfpaste.doc-2017.tar.xz mirror://gentoo/texlive-module-grid.doc-2017.tar.xz mirror://gentoo/texlive-module-grid-system.doc-2017.tar.xz mirror://gentoo/texlive-module-gridset.doc-2017.tar.xz mirror://gentoo/texlive-module-guitlogo.doc-2017.tar.xz mirror://gentoo/texlive-module-halloweenmath.doc-2017.tar.xz mirror://gentoo/texlive-module-handout.doc-2017.tar.xz mirror://gentoo/texlive-module-hang.doc-2017.tar.xz mirror://gentoo/texlive-module-hanging.doc-2017.tar.xz mirror://gentoo/texlive-module-hardwrap.doc-2017.tar.xz mirror://gentoo/texlive-module-harnon-cv.doc-2017.tar.xz mirror://gentoo/texlive-module-harpoon.doc-2017.tar.xz mirror://gentoo/texlive-module-hc.doc-2017.tar.xz mirror://gentoo/texlive-module-he-she.doc-2017.tar.xz mirror://gentoo/texlive-module-hhtensor.doc-2017.tar.xz mirror://gentoo/texlive-module-histogr.doc-2017.tar.xz mirror://gentoo/texlive-module-hitec.doc-2017.tar.xz mirror://gentoo/texlive-module-hletter.doc-2017.tar.xz mirror://gentoo/texlive-module-hpsdiss.doc-2017.tar.xz mirror://gentoo/texlive-module-hrefhide.doc-2017.tar.xz mirror://gentoo/texlive-module-hvindex.doc-2017.tar.xz mirror://gentoo/texlive-module-hypdvips.doc-2017.tar.xz mirror://gentoo/texlive-module-hyper.doc-2017.tar.xz mirror://gentoo/texlive-module-hypernat.doc-2017.tar.xz mirror://gentoo/texlive-module-hyperref-docsrc.doc-2017.tar.xz mirror://gentoo/texlive-module-hyperxmp.doc-2017.tar.xz mirror://gentoo/texlive-module-hyphenat.doc-2017.tar.xz mirror://gentoo/texlive-module-idxcmds.doc-2017.tar.xz mirror://gentoo/texlive-module-idxlayout.doc-2017.tar.xz mirror://gentoo/texlive-module-iffont.doc-2017.tar.xz mirror://gentoo/texlive-module-ifmslide.doc-2017.tar.xz mirror://gentoo/texlive-module-ifmtarg.doc-2017.tar.xz mirror://gentoo/texlive-module-ifnextok.doc-2017.tar.xz mirror://gentoo/texlive-module-ifoddpage.doc-2017.tar.xz mirror://gentoo/texlive-module-ifplatform.doc-2017.tar.xz mirror://gentoo/texlive-module-ifthenx.doc-2017.tar.xz mirror://gentoo/texlive-module-iitem.doc-2017.tar.xz mirror://gentoo/texlive-module-image-gallery.doc-2017.tar.xz mirror://gentoo/texlive-module-imakeidx.doc-2017.tar.xz mirror://gentoo/texlive-module-import.doc-2017.tar.xz mirror://gentoo/texlive-module-incgraph.doc-2017.tar.xz mirror://gentoo/texlive-module-indextools.doc-2017.tar.xz mirror://gentoo/texlive-module-inlinedef.doc-2017.tar.xz mirror://gentoo/texlive-module-inputtrc.doc-2017.tar.xz mirror://gentoo/texlive-module-interactiveworkbook.doc-2017.tar.xz mirror://gentoo/texlive-module-interfaces.doc-2017.tar.xz mirror://gentoo/texlive-module-inversepath.doc-2017.tar.xz mirror://gentoo/texlive-module-invoice.doc-2017.tar.xz mirror://gentoo/texlive-module-iso.doc-2017.tar.xz mirror://gentoo/texlive-module-iso10303.doc-2017.tar.xz mirror://gentoo/texlive-module-isodate.doc-2017.tar.xz mirror://gentoo/texlive-module-isodoc.doc-2017.tar.xz mirror://gentoo/texlive-module-isonums.doc-2017.tar.xz mirror://gentoo/texlive-module-isorot.doc-2017.tar.xz mirror://gentoo/texlive-module-isotope.doc-2017.tar.xz mirror://gentoo/texlive-module-issuulinks.doc-2017.tar.xz mirror://gentoo/texlive-module-iwhdp.doc-2017.tar.xz mirror://gentoo/texlive-module-jlabels.doc-2017.tar.xz mirror://gentoo/texlive-module-jslectureplanner.doc-2017.tar.xz mirror://gentoo/texlive-module-jumplines.doc-2017.tar.xz mirror://gentoo/texlive-module-jvlisting.doc-2017.tar.xz mirror://gentoo/texlive-module-kantlipsum.doc-2017.tar.xz mirror://gentoo/texlive-module-kerntest.doc-2017.tar.xz mirror://gentoo/texlive-module-keycommand.doc-2017.tar.xz mirror://gentoo/texlive-module-keyfloat.doc-2017.tar.xz mirror://gentoo/texlive-module-keyreader.doc-2017.tar.xz mirror://gentoo/texlive-module-keystroke.doc-2017.tar.xz mirror://gentoo/texlive-module-keyval2e.doc-2017.tar.xz mirror://gentoo/texlive-module-keyvaltable.doc-2017.tar.xz mirror://gentoo/texlive-module-kix.doc-2017.tar.xz mirror://gentoo/texlive-module-koma-moderncvclassic.doc-2017.tar.xz mirror://gentoo/texlive-module-koma-script-sfs.doc-2017.tar.xz mirror://gentoo/texlive-module-komacv.doc-2017.tar.xz mirror://gentoo/texlive-module-ktv-texdata.doc-2017.tar.xz mirror://gentoo/texlive-module-l3build.doc-2017.tar.xz mirror://gentoo/texlive-module-labbook.doc-2017.tar.xz mirror://gentoo/texlive-module-labels.doc-2017.tar.xz mirror://gentoo/texlive-module-lastpackage.doc-2017.tar.xz mirror://gentoo/texlive-module-lastpage.doc-2017.tar.xz mirror://gentoo/texlive-module-latex-tds.doc-2017.tar.xz mirror://gentoo/texlive-module-latexdemo.doc-2017.tar.xz mirror://gentoo/texlive-module-latexgit.doc-2017.tar.xz mirror://gentoo/texlive-module-layouts.doc-2017.tar.xz mirror://gentoo/texlive-module-lazylist.doc-2017.tar.xz mirror://gentoo/texlive-module-lcd.doc-2017.tar.xz mirror://gentoo/texlive-module-lcg.doc-2017.tar.xz mirror://gentoo/texlive-module-leading.doc-2017.tar.xz mirror://gentoo/texlive-module-leftidx.doc-2017.tar.xz mirror://gentoo/texlive-module-lengthconvert.doc-2017.tar.xz mirror://gentoo/texlive-module-lettre.doc-2017.tar.xz mirror://gentoo/texlive-module-lettrine.doc-2017.tar.xz mirror://gentoo/texlive-module-lewis.doc-2017.tar.xz mirror://gentoo/texlive-module-lhelp.doc-2017.tar.xz mirror://gentoo/texlive-module-libgreek.doc-2017.tar.xz mirror://gentoo/texlive-module-limap.doc-2017.tar.xz mirror://gentoo/texlive-module-linegoal.doc-2017.tar.xz mirror://gentoo/texlive-module-linop.doc-2017.tar.xz mirror://gentoo/texlive-module-lipsum.doc-2017.tar.xz mirror://gentoo/texlive-module-lisp-on-tex.doc-2017.tar.xz mirror://gentoo/texlive-module-listing.doc-2017.tar.xz mirror://gentoo/texlive-module-listlbls.doc-2017.tar.xz mirror://gentoo/texlive-module-listliketab.doc-2017.tar.xz mirror://gentoo/texlive-module-listofsymbols.doc-2017.tar.xz mirror://gentoo/texlive-module-lkproof.doc-2017.tar.xz mirror://gentoo/texlive-module-lmake.doc-2017.tar.xz mirror://gentoo/texlive-module-locality.doc-2017.tar.xz mirror://gentoo/texlive-module-localloc.doc-2017.tar.xz mirror://gentoo/texlive-module-logbox.doc-2017.tar.xz mirror://gentoo/texlive-module-logical-markup-utils.doc-2017.tar.xz mirror://gentoo/texlive-module-logpap.doc-2017.tar.xz mirror://gentoo/texlive-module-longfbox.doc-2017.tar.xz mirror://gentoo/texlive-module-longfigure.doc-2017.tar.xz mirror://gentoo/texlive-module-longnamefilelist.doc-2017.tar.xz mirror://gentoo/texlive-module-loops.doc-2017.tar.xz mirror://gentoo/texlive-module-lsc.doc-2017.tar.xz mirror://gentoo/texlive-module-lstaddons.doc-2017.tar.xz mirror://gentoo/texlive-module-lt3graph.doc-2017.tar.xz mirror://gentoo/texlive-module-ltablex.doc-2017.tar.xz mirror://gentoo/texlive-module-ltabptch.doc-2017.tar.xz mirror://gentoo/texlive-module-ltxdockit.doc-2017.tar.xz mirror://gentoo/texlive-module-ltxindex.doc-2017.tar.xz mirror://gentoo/texlive-module-ltxkeys.doc-2017.tar.xz mirror://gentoo/texlive-module-ltxnew.doc-2017.tar.xz mirror://gentoo/texlive-module-ltxtools.doc-2017.tar.xz mirror://gentoo/texlive-module-macroswap.doc-2017.tar.xz mirror://gentoo/texlive-module-magaz.doc-2017.tar.xz mirror://gentoo/texlive-module-mailing.doc-2017.tar.xz mirror://gentoo/texlive-module-mailmerge.doc-2017.tar.xz mirror://gentoo/texlive-module-makebarcode.doc-2017.tar.xz mirror://gentoo/texlive-module-makebase.doc-2017.tar.xz mirror://gentoo/texlive-module-makebox.doc-2017.tar.xz mirror://gentoo/texlive-module-makecell.doc-2017.tar.xz mirror://gentoo/texlive-module-makecirc.doc-2017.tar.xz mirror://gentoo/texlive-module-makecmds.doc-2017.tar.xz mirror://gentoo/texlive-module-makedtx.doc-2017.tar.xz mirror://gentoo/texlive-module-makeglos.doc-2017.tar.xz mirror://gentoo/texlive-module-mandi.doc-2017.tar.xz mirror://gentoo/texlive-module-manuscript.doc-2017.tar.xz mirror://gentoo/texlive-module-marginfix.doc-2017.tar.xz mirror://gentoo/texlive-module-marginnote.doc-2017.tar.xz mirror://gentoo/texlive-module-markdown.doc-2017.tar.xz mirror://gentoo/texlive-module-mathalfa.doc-2017.tar.xz mirror://gentoo/texlive-module-mathastext.doc-2017.tar.xz mirror://gentoo/texlive-module-mathexam.doc-2017.tar.xz mirror://gentoo/texlive-module-maybemath.doc-2017.tar.xz mirror://gentoo/texlive-module-mbenotes.doc-2017.tar.xz mirror://gentoo/texlive-module-mcaption.doc-2017.tar.xz mirror://gentoo/texlive-module-mceinleger.doc-2017.tar.xz mirror://gentoo/texlive-module-mcexam.doc-2017.tar.xz mirror://gentoo/texlive-module-mcite.doc-2017.tar.xz mirror://gentoo/texlive-module-mciteplus.doc-2017.tar.xz mirror://gentoo/texlive-module-mdframed.doc-2017.tar.xz mirror://gentoo/texlive-module-media9.doc-2017.tar.xz mirror://gentoo/texlive-module-medstarbeamer.doc-2017.tar.xz mirror://gentoo/texlive-module-meetingmins.doc-2017.tar.xz mirror://gentoo/texlive-module-memexsupp.doc-2017.tar.xz mirror://gentoo/texlive-module-memory.doc-2017.tar.xz mirror://gentoo/texlive-module-menu.doc-2017.tar.xz mirror://gentoo/texlive-module-menukeys.doc-2017.tar.xz mirror://gentoo/texlive-module-method.doc-2017.tar.xz mirror://gentoo/texlive-module-metre.doc-2017.tar.xz mirror://gentoo/texlive-module-mfirstuc.doc-2017.tar.xz mirror://gentoo/texlive-module-mftinc.doc-2017.tar.xz mirror://gentoo/texlive-module-midpage.doc-2017.tar.xz mirror://gentoo/texlive-module-minibox.doc-2017.tar.xz mirror://gentoo/texlive-module-minidocument.doc-2017.tar.xz mirror://gentoo/texlive-module-minifp.doc-2017.tar.xz mirror://gentoo/texlive-module-minipage-marginpar.doc-2017.tar.xz mirror://gentoo/texlive-module-minitoc.doc-2017.tar.xz mirror://gentoo/texlive-module-minorrevision.doc-2017.tar.xz mirror://gentoo/texlive-module-minted.doc-2017.tar.xz mirror://gentoo/texlive-module-minutes.doc-2017.tar.xz mirror://gentoo/texlive-module-mla-paper.doc-2017.tar.xz mirror://gentoo/texlive-module-mlist.doc-2017.tar.xz mirror://gentoo/texlive-module-mmap.doc-2017.tar.xz mirror://gentoo/texlive-module-mnotes.doc-2017.tar.xz mirror://gentoo/texlive-module-moderncv.doc-2017.tar.xz mirror://gentoo/texlive-module-moderntimeline.doc-2017.tar.xz mirror://gentoo/texlive-module-modref.doc-2017.tar.xz mirror://gentoo/texlive-module-modroman.doc-2017.tar.xz mirror://gentoo/texlive-module-modular.doc-2017.tar.xz mirror://gentoo/texlive-module-monofill.doc-2017.tar.xz mirror://gentoo/texlive-module-moodle.doc-2017.tar.xz mirror://gentoo/texlive-module-moreenum.doc-2017.tar.xz mirror://gentoo/texlive-module-morefloats.doc-2017.tar.xz mirror://gentoo/texlive-module-morehype.doc-2017.tar.xz mirror://gentoo/texlive-module-moresize.doc-2017.tar.xz mirror://gentoo/texlive-module-moreverb.doc-2017.tar.xz mirror://gentoo/texlive-module-morewrites.doc-2017.tar.xz mirror://gentoo/texlive-module-movie15.doc-2017.tar.xz mirror://gentoo/texlive-module-mparhack.doc-2017.tar.xz mirror://gentoo/texlive-module-mpostinl.doc-2017.tar.xz mirror://gentoo/texlive-module-msc.doc-2017.tar.xz mirror://gentoo/texlive-module-msg.doc-2017.tar.xz mirror://gentoo/texlive-module-mslapa.doc-2017.tar.xz mirror://gentoo/texlive-module-mtgreek.doc-2017.tar.xz mirror://gentoo/texlive-module-multenum.doc-2017.tar.xz mirror://gentoo/texlive-module-multiaudience.doc-2017.tar.xz mirror://gentoo/texlive-module-multibbl.doc-2017.tar.xz mirror://gentoo/texlive-module-multicap.doc-2017.tar.xz mirror://gentoo/texlive-module-multidef.doc-2017.tar.xz mirror://gentoo/texlive-module-multienv.doc-2017.tar.xz mirror://gentoo/texlive-module-multiexpand.doc-2017.tar.xz mirror://gentoo/texlive-module-multirow.doc-2017.tar.xz mirror://gentoo/texlive-module-mversion.doc-2017.tar.xz mirror://gentoo/texlive-module-mwe.doc-2017.tar.xz mirror://gentoo/texlive-module-mycv.doc-2017.tar.xz mirror://gentoo/texlive-module-mylatexformat.doc-2017.tar.xz mirror://gentoo/texlive-module-nag.doc-2017.tar.xz mirror://gentoo/texlive-module-nameauth.doc-2017.tar.xz mirror://gentoo/texlive-module-namespc.doc-2017.tar.xz mirror://gentoo/texlive-module-ncclatex.doc-2017.tar.xz mirror://gentoo/texlive-module-ncctools.doc-2017.tar.xz mirror://gentoo/texlive-module-needspace.doc-2017.tar.xz mirror://gentoo/texlive-module-newcommand.doc-2017.tar.xz mirror://gentoo/texlive-module-newenviron.doc-2017.tar.xz mirror://gentoo/texlive-module-newfile.doc-2017.tar.xz mirror://gentoo/texlive-module-newlfm.doc-2017.tar.xz mirror://gentoo/texlive-module-newspaper.doc-2017.tar.xz mirror://gentoo/texlive-module-newunicodechar.doc-2017.tar.xz mirror://gentoo/texlive-module-newvbtm.doc-2017.tar.xz mirror://gentoo/texlive-module-newverbs.doc-2017.tar.xz mirror://gentoo/texlive-module-nfssext-cfr.doc-2017.tar.xz mirror://gentoo/texlive-module-nicefilelist.doc-2017.tar.xz mirror://gentoo/texlive-module-niceframe.doc-2017.tar.xz mirror://gentoo/texlive-module-nicetext.doc-2017.tar.xz mirror://gentoo/texlive-module-nlctdoc.doc-2017.tar.xz mirror://gentoo/texlive-module-noconflict.doc-2017.tar.xz mirror://gentoo/texlive-module-noindentafter.doc-2017.tar.xz mirror://gentoo/texlive-module-noitcrul.doc-2017.tar.xz mirror://gentoo/texlive-module-nolbreaks.doc-2017.tar.xz mirror://gentoo/texlive-module-nomencl.doc-2017.tar.xz mirror://gentoo/texlive-module-nomentbl.doc-2017.tar.xz mirror://gentoo/texlive-module-nonfloat.doc-2017.tar.xz mirror://gentoo/texlive-module-nonumonpart.doc-2017.tar.xz mirror://gentoo/texlive-module-nopageno.doc-2017.tar.xz mirror://gentoo/texlive-module-normalcolor.doc-2017.tar.xz mirror://gentoo/texlive-module-notes.doc-2017.tar.xz mirror://gentoo/texlive-module-notespages.doc-2017.tar.xz mirror://gentoo/texlive-module-notoccite.doc-2017.tar.xz mirror://gentoo/texlive-module-nowidow.doc-2017.tar.xz mirror://gentoo/texlive-module-nox.doc-2017.tar.xz mirror://gentoo/texlive-module-ntheorem.doc-2017.tar.xz mirror://gentoo/texlive-module-numberedblock.doc-2017.tar.xz mirror://gentoo/texlive-module-numname.doc-2017.tar.xz mirror://gentoo/texlive-module-numprint.doc-2017.tar.xz mirror://gentoo/texlive-module-numspell.doc-2017.tar.xz mirror://gentoo/texlive-module-ocg-p.doc-2017.tar.xz mirror://gentoo/texlive-module-ocgx.doc-2017.tar.xz mirror://gentoo/texlive-module-ocgx2.doc-2017.tar.xz mirror://gentoo/texlive-module-ocr-latex.doc-2017.tar.xz mirror://gentoo/texlive-module-octavo.doc-2017.tar.xz mirror://gentoo/texlive-module-oldstyle.doc-2017.tar.xz mirror://gentoo/texlive-module-onlyamsmath.doc-2017.tar.xz mirror://gentoo/texlive-module-opcit.doc-2017.tar.xz mirror://gentoo/texlive-module-optidef.doc-2017.tar.xz mirror://gentoo/texlive-module-optional.doc-2017.tar.xz mirror://gentoo/texlive-module-options.doc-2017.tar.xz mirror://gentoo/texlive-module-outline.doc-2017.tar.xz mirror://gentoo/texlive-module-outliner.doc-2017.tar.xz mirror://gentoo/texlive-module-outlines.doc-2017.tar.xz mirror://gentoo/texlive-module-overlays.doc-2017.tar.xz mirror://gentoo/texlive-module-overpic.doc-2017.tar.xz mirror://gentoo/texlive-module-pagecolor.doc-2017.tar.xz mirror://gentoo/texlive-module-pagecont.doc-2017.tar.xz mirror://gentoo/texlive-module-pagenote.doc-2017.tar.xz mirror://gentoo/texlive-module-pagerange.doc-2017.tar.xz mirror://gentoo/texlive-module-pageslts.doc-2017.tar.xz mirror://gentoo/texlive-module-paper.doc-2017.tar.xz mirror://gentoo/texlive-module-papercdcase.doc-2017.tar.xz mirror://gentoo/texlive-module-papermas.doc-2017.tar.xz mirror://gentoo/texlive-module-papertex.doc-2017.tar.xz mirror://gentoo/texlive-module-paracol.doc-2017.tar.xz mirror://gentoo/texlive-module-parades.doc-2017.tar.xz mirror://gentoo/texlive-module-paralist.doc-2017.tar.xz mirror://gentoo/texlive-module-paresse.doc-2017.tar.xz mirror://gentoo/texlive-module-parnotes.doc-2017.tar.xz mirror://gentoo/texlive-module-parselines.doc-2017.tar.xz mirror://gentoo/texlive-module-pas-cours.doc-2017.tar.xz mirror://gentoo/texlive-module-pas-cv.doc-2017.tar.xz mirror://gentoo/texlive-module-pas-tableur.doc-2017.tar.xz mirror://gentoo/texlive-module-patchcmd.doc-2017.tar.xz mirror://gentoo/texlive-module-pauldoc.doc-2017.tar.xz mirror://gentoo/texlive-module-pawpict.doc-2017.tar.xz mirror://gentoo/texlive-module-pbox.doc-2017.tar.xz mirror://gentoo/texlive-module-pbsheet.doc-2017.tar.xz mirror://gentoo/texlive-module-pdf14.doc-2017.tar.xz mirror://gentoo/texlive-module-pdfcomment.doc-2017.tar.xz mirror://gentoo/texlive-module-pdfcprot.doc-2017.tar.xz mirror://gentoo/texlive-module-pdfmarginpar.doc-2017.tar.xz mirror://gentoo/texlive-module-pdfpagediff.doc-2017.tar.xz mirror://gentoo/texlive-module-pdfscreen.doc-2017.tar.xz mirror://gentoo/texlive-module-pdfslide.doc-2017.tar.xz mirror://gentoo/texlive-module-pdfsync.doc-2017.tar.xz mirror://gentoo/texlive-module-pdfwin.doc-2017.tar.xz mirror://gentoo/texlive-module-pdfx.doc-2017.tar.xz mirror://gentoo/texlive-module-pecha.doc-2017.tar.xz mirror://gentoo/texlive-module-perltex.doc-2017.tar.xz mirror://gentoo/texlive-module-permute.doc-2017.tar.xz mirror://gentoo/texlive-module-petiteannonce.doc-2017.tar.xz mirror://gentoo/texlive-module-phffullpagefigure.doc-2017.tar.xz mirror://gentoo/texlive-module-phfnote.doc-2017.tar.xz mirror://gentoo/texlive-module-phfparen.doc-2017.tar.xz mirror://gentoo/texlive-module-phfqit.doc-2017.tar.xz mirror://gentoo/texlive-module-phfquotetext.doc-2017.tar.xz mirror://gentoo/texlive-module-phfsvnwatermark.doc-2017.tar.xz mirror://gentoo/texlive-module-phfthm.doc-2017.tar.xz mirror://gentoo/texlive-module-philex.doc-2017.tar.xz mirror://gentoo/texlive-module-phonenumbers.doc-2017.tar.xz mirror://gentoo/texlive-module-photo.doc-2017.tar.xz mirror://gentoo/texlive-module-piff.doc-2017.tar.xz mirror://gentoo/texlive-module-pkgloader.doc-2017.tar.xz mirror://gentoo/texlive-module-placeins.doc-2017.tar.xz mirror://gentoo/texlive-module-plantslabels.doc-2017.tar.xz mirror://gentoo/texlive-module-plates.doc-2017.tar.xz mirror://gentoo/texlive-module-plweb.doc-2017.tar.xz mirror://gentoo/texlive-module-polynom.doc-2017.tar.xz mirror://gentoo/texlive-module-polynomial.doc-2017.tar.xz mirror://gentoo/texlive-module-polytable.doc-2017.tar.xz mirror://gentoo/texlive-module-postcards.doc-2017.tar.xz mirror://gentoo/texlive-module-poster-mac.doc-2017.tar.xz mirror://gentoo/texlive-module-ppr-prv.doc-2017.tar.xz mirror://gentoo/texlive-module-preprint.doc-2017.tar.xz mirror://gentoo/texlive-module-pressrelease.doc-2017.tar.xz mirror://gentoo/texlive-module-prettyref.doc-2017.tar.xz mirror://gentoo/texlive-module-preview.doc-2017.tar.xz mirror://gentoo/texlive-module-printlen.doc-2017.tar.xz mirror://gentoo/texlive-module-probsoln.doc-2017.tar.xz mirror://gentoo/texlive-module-program.doc-2017.tar.xz mirror://gentoo/texlive-module-progress.doc-2017.tar.xz mirror://gentoo/texlive-module-progressbar.doc-2017.tar.xz mirror://gentoo/texlive-module-proofread.doc-2017.tar.xz mirror://gentoo/texlive-module-properties.doc-2017.tar.xz mirror://gentoo/texlive-module-prosper.doc-2017.tar.xz mirror://gentoo/texlive-module-protex.doc-2017.tar.xz mirror://gentoo/texlive-module-protocol.doc-2017.tar.xz mirror://gentoo/texlive-module-psfragx.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-pdf.doc-2017.tar.xz mirror://gentoo/texlive-module-pstool.doc-2017.tar.xz mirror://gentoo/texlive-module-pstring.doc-2017.tar.xz mirror://gentoo/texlive-module-pxgreeks.doc-2017.tar.xz mirror://gentoo/texlive-module-python.doc-2017.tar.xz mirror://gentoo/texlive-module-qcm.doc-2017.tar.xz mirror://gentoo/texlive-module-qstest.doc-2017.tar.xz mirror://gentoo/texlive-module-qsymbols.doc-2017.tar.xz mirror://gentoo/texlive-module-quicktype.doc-2017.tar.xz mirror://gentoo/texlive-module-quotchap.doc-2017.tar.xz mirror://gentoo/texlive-module-quoting.doc-2017.tar.xz mirror://gentoo/texlive-module-quotmark.doc-2017.tar.xz mirror://gentoo/texlive-module-ran_toks.doc-2017.tar.xz mirror://gentoo/texlive-module-randtext.doc-2017.tar.xz mirror://gentoo/texlive-module-rccol.doc-2017.tar.xz mirror://gentoo/texlive-module-rcs-multi.doc-2017.tar.xz mirror://gentoo/texlive-module-rcsinfo.doc-2017.tar.xz mirror://gentoo/texlive-module-readarray.doc-2017.tar.xz mirror://gentoo/texlive-module-realboxes.doc-2017.tar.xz mirror://gentoo/texlive-module-recipe.doc-2017.tar.xz mirror://gentoo/texlive-module-recipebook.doc-2017.tar.xz mirror://gentoo/texlive-module-recipecard.doc-2017.tar.xz mirror://gentoo/texlive-module-rectopma.doc-2017.tar.xz mirror://gentoo/texlive-module-refcheck.doc-2017.tar.xz mirror://gentoo/texlive-module-refenums.doc-2017.tar.xz mirror://gentoo/texlive-module-reflectgraphics.doc-2017.tar.xz mirror://gentoo/texlive-module-refman.doc-2017.tar.xz mirror://gentoo/texlive-module-refstyle.doc-2017.tar.xz mirror://gentoo/texlive-module-regcount.doc-2017.tar.xz mirror://gentoo/texlive-module-regexpatch.doc-2017.tar.xz mirror://gentoo/texlive-module-register.doc-2017.tar.xz mirror://gentoo/texlive-module-regstats.doc-2017.tar.xz mirror://gentoo/texlive-module-relenc.doc-2017.tar.xz mirror://gentoo/texlive-module-relsize.doc-2017.tar.xz mirror://gentoo/texlive-module-repeatindex.doc-2017.tar.xz mirror://gentoo/texlive-module-repltext.doc-2017.tar.xz mirror://gentoo/texlive-module-rjlparshap.doc-2017.tar.xz mirror://gentoo/texlive-module-rlepsf.doc-2017.tar.xz mirror://gentoo/texlive-module-rmpage.doc-2017.tar.xz mirror://gentoo/texlive-module-robustcommand.doc-2017.tar.xz mirror://gentoo/texlive-module-robustindex.doc-2017.tar.xz mirror://gentoo/texlive-module-romanbar.doc-2017.tar.xz mirror://gentoo/texlive-module-romanbarpagenumber.doc-2017.tar.xz mirror://gentoo/texlive-module-romanneg.doc-2017.tar.xz mirror://gentoo/texlive-module-romannum.doc-2017.tar.xz mirror://gentoo/texlive-module-rotfloat.doc-2017.tar.xz mirror://gentoo/texlive-module-rotpages.doc-2017.tar.xz mirror://gentoo/texlive-module-roundbox.doc-2017.tar.xz mirror://gentoo/texlive-module-rterface.doc-2017.tar.xz mirror://gentoo/texlive-module-rtkinenc.doc-2017.tar.xz mirror://gentoo/texlive-module-rulercompass.doc-2017.tar.xz mirror://gentoo/texlive-module-rvwrite.doc-2017.tar.xz mirror://gentoo/texlive-module-sanitize-umlaut.doc-2017.tar.xz mirror://gentoo/texlive-module-sauerj.doc-2017.tar.xz mirror://gentoo/texlive-module-savefnmark.doc-2017.tar.xz mirror://gentoo/texlive-module-savetrees.doc-2017.tar.xz mirror://gentoo/texlive-module-scale.doc-2017.tar.xz mirror://gentoo/texlive-module-scalebar.doc-2017.tar.xz mirror://gentoo/texlive-module-scalerel.doc-2017.tar.xz mirror://gentoo/texlive-module-scanpages.doc-2017.tar.xz mirror://gentoo/texlive-module-scrlttr2copy.doc-2017.tar.xz mirror://gentoo/texlive-module-sdrt.doc-2017.tar.xz mirror://gentoo/texlive-module-secdot.doc-2017.tar.xz mirror://gentoo/texlive-module-sectionbox.doc-2017.tar.xz mirror://gentoo/texlive-module-sectsty.doc-2017.tar.xz mirror://gentoo/texlive-module-seealso.doc-2017.tar.xz mirror://gentoo/texlive-module-selectp.doc-2017.tar.xz mirror://gentoo/texlive-module-semantic.doc-2017.tar.xz mirror://gentoo/texlive-module-semantic-markup.doc-2017.tar.xz mirror://gentoo/texlive-module-semioneside.doc-2017.tar.xz mirror://gentoo/texlive-module-semproc.doc-2017.tar.xz mirror://gentoo/texlive-module-sepfootnotes.doc-2017.tar.xz mirror://gentoo/texlive-module-seqsplit.doc-2017.tar.xz mirror://gentoo/texlive-module-sesstime.doc-2017.tar.xz mirror://gentoo/texlive-module-sf298.doc-2017.tar.xz mirror://gentoo/texlive-module-sffms.doc-2017.tar.xz mirror://gentoo/texlive-module-shadethm.doc-2017.tar.xz mirror://gentoo/texlive-module-shadow.doc-2017.tar.xz mirror://gentoo/texlive-module-shadowtext.doc-2017.tar.xz mirror://gentoo/texlive-module-shapepar.doc-2017.tar.xz mirror://gentoo/texlive-module-shdoc.doc-2017.tar.xz mirror://gentoo/texlive-module-shipunov.doc-2017.tar.xz mirror://gentoo/texlive-module-shorttoc.doc-2017.tar.xz mirror://gentoo/texlive-module-show2e.doc-2017.tar.xz mirror://gentoo/texlive-module-showcharinbox.doc-2017.tar.xz mirror://gentoo/texlive-module-showdim.doc-2017.tar.xz mirror://gentoo/texlive-module-showexpl.doc-2017.tar.xz mirror://gentoo/texlive-module-showlabels.doc-2017.tar.xz mirror://gentoo/texlive-module-sidecap.doc-2017.tar.xz mirror://gentoo/texlive-module-sidenotes.doc-2017.tar.xz mirror://gentoo/texlive-module-silence.doc-2017.tar.xz mirror://gentoo/texlive-module-simplecd.doc-2017.tar.xz mirror://gentoo/texlive-module-simplecv.doc-2017.tar.xz mirror://gentoo/texlive-module-sitem.doc-2017.tar.xz mirror://gentoo/texlive-module-skb.doc-2017.tar.xz mirror://gentoo/texlive-module-skdoc.doc-2017.tar.xz mirror://gentoo/texlive-module-skeycommand.doc-2017.tar.xz mirror://gentoo/texlive-module-skeyval.doc-2017.tar.xz mirror://gentoo/texlive-module-skrapport.doc-2017.tar.xz mirror://gentoo/texlive-module-slantsc.doc-2017.tar.xz mirror://gentoo/texlive-module-smalltableof.doc-2017.tar.xz mirror://gentoo/texlive-module-smartunits.doc-2017.tar.xz mirror://gentoo/texlive-module-smartref.doc-2017.tar.xz mirror://gentoo/texlive-module-snapshot.doc-2017.tar.xz mirror://gentoo/texlive-module-snotez.doc-2017.tar.xz mirror://gentoo/texlive-module-soul.doc-2017.tar.xz mirror://gentoo/texlive-module-sparklines.doc-2017.tar.xz mirror://gentoo/texlive-module-sphack.doc-2017.tar.xz mirror://gentoo/texlive-module-splitindex.doc-2017.tar.xz mirror://gentoo/texlive-module-spot.doc-2017.tar.xz mirror://gentoo/texlive-module-spotcolor.doc-2017.tar.xz mirror://gentoo/texlive-module-spreadtab.doc-2017.tar.xz mirror://gentoo/texlive-module-spverbatim.doc-2017.tar.xz mirror://gentoo/texlive-module-srbook-mem.doc-2017.tar.xz mirror://gentoo/texlive-module-srcltx.doc-2017.tar.xz mirror://gentoo/texlive-module-sseq.doc-2017.tar.xz mirror://gentoo/texlive-module-sslides.doc-2017.tar.xz mirror://gentoo/texlive-module-stackengine.doc-2017.tar.xz mirror://gentoo/texlive-module-standalone.doc-2017.tar.xz mirror://gentoo/texlive-module-statistik.doc-2017.tar.xz mirror://gentoo/texlive-module-stdclsdv.doc-2017.tar.xz mirror://gentoo/texlive-module-stdpage.doc-2017.tar.xz mirror://gentoo/texlive-module-stex.doc-2017.tar.xz mirror://gentoo/texlive-module-storebox.doc-2017.tar.xz mirror://gentoo/texlive-module-storecmd.doc-2017.tar.xz mirror://gentoo/texlive-module-stringstrings.doc-2017.tar.xz mirror://gentoo/texlive-module-sttools.doc-2017.tar.xz mirror://gentoo/texlive-module-stubs.doc-2017.tar.xz mirror://gentoo/texlive-module-studenthandouts.doc-2017.tar.xz mirror://gentoo/texlive-module-subdepth.doc-2017.tar.xz mirror://gentoo/texlive-module-subeqn.doc-2017.tar.xz mirror://gentoo/texlive-module-subeqnarray.doc-2017.tar.xz mirror://gentoo/texlive-module-subfigmat.doc-2017.tar.xz mirror://gentoo/texlive-module-subfigure.doc-2017.tar.xz mirror://gentoo/texlive-module-subfiles.doc-2017.tar.xz mirror://gentoo/texlive-module-subfloat.doc-2017.tar.xz mirror://gentoo/texlive-module-substitutefont.doc-2017.tar.xz mirror://gentoo/texlive-module-substr.doc-2017.tar.xz mirror://gentoo/texlive-module-supertabular.doc-2017.tar.xz mirror://gentoo/texlive-module-svg.doc-2017.tar.xz mirror://gentoo/texlive-module-svgcolor.doc-2017.tar.xz mirror://gentoo/texlive-module-svn.doc-2017.tar.xz mirror://gentoo/texlive-module-svn-multi.doc-2017.tar.xz mirror://gentoo/texlive-module-svn-prov.doc-2017.tar.xz mirror://gentoo/texlive-module-syntax.doc-2017.tar.xz mirror://gentoo/texlive-module-syntrace.doc-2017.tar.xz mirror://gentoo/texlive-module-synttree.doc-2017.tar.xz mirror://gentoo/texlive-module-tabfigures.doc-2017.tar.xz mirror://gentoo/texlive-module-tableaux.doc-2017.tar.xz mirror://gentoo/texlive-module-tablefootnote.doc-2017.tar.xz mirror://gentoo/texlive-module-tableof.doc-2017.tar.xz mirror://gentoo/texlive-module-tablestyles.doc-2017.tar.xz mirror://gentoo/texlive-module-tablists.doc-2017.tar.xz mirror://gentoo/texlive-module-tabls.doc-2017.tar.xz mirror://gentoo/texlive-module-tabstackengine.doc-2017.tar.xz mirror://gentoo/texlive-module-tabto-ltx.doc-2017.tar.xz mirror://gentoo/texlive-module-tabu.doc-2017.tar.xz mirror://gentoo/texlive-module-tabularborder.doc-2017.tar.xz mirror://gentoo/texlive-module-tabularcalc.doc-2017.tar.xz mirror://gentoo/texlive-module-tabularew.doc-2017.tar.xz mirror://gentoo/texlive-module-tabulary.doc-2017.tar.xz mirror://gentoo/texlive-module-tagging.doc-2017.tar.xz mirror://gentoo/texlive-module-tagpair.doc-2017.tar.xz mirror://gentoo/texlive-module-talk.doc-2017.tar.xz mirror://gentoo/texlive-module-tamefloats.doc-2017.tar.xz mirror://gentoo/texlive-module-tasks.doc-2017.tar.xz mirror://gentoo/texlive-module-tcldoc.doc-2017.tar.xz mirror://gentoo/texlive-module-tcolorbox.doc-2017.tar.xz mirror://gentoo/texlive-module-tdclock.doc-2017.tar.xz mirror://gentoo/texlive-module-technics.doc-2017.tar.xz mirror://gentoo/texlive-module-ted.doc-2017.tar.xz mirror://gentoo/texlive-module-templatetools.doc-2017.tar.xz mirror://gentoo/texlive-module-termcal.doc-2017.tar.xz mirror://gentoo/texlive-module-termlist.doc-2017.tar.xz mirror://gentoo/texlive-module-testhyphens.doc-2017.tar.xz mirror://gentoo/texlive-module-testidx.doc-2017.tar.xz mirror://gentoo/texlive-module-tex-label.doc-2017.tar.xz mirror://gentoo/texlive-module-texmate.doc-2017.tar.xz mirror://gentoo/texlive-module-texments.doc-2017.tar.xz mirror://gentoo/texlive-module-texpower.doc-2017.tar.xz mirror://gentoo/texlive-module-texshade.doc-2017.tar.xz mirror://gentoo/texlive-module-texvc.doc-2017.tar.xz mirror://gentoo/texlive-module-textfit.doc-2017.tar.xz mirror://gentoo/texlive-module-textmerg.doc-2017.tar.xz mirror://gentoo/texlive-module-textpos.doc-2017.tar.xz mirror://gentoo/texlive-module-theoremref.doc-2017.tar.xz mirror://gentoo/texlive-module-thinsp.doc-2017.tar.xz mirror://gentoo/texlive-module-thmtools.doc-2017.tar.xz mirror://gentoo/texlive-module-threadcol.doc-2017.tar.xz mirror://gentoo/texlive-module-threeparttable.doc-2017.tar.xz mirror://gentoo/texlive-module-threeparttablex.doc-2017.tar.xz mirror://gentoo/texlive-module-thumb.doc-2017.tar.xz mirror://gentoo/texlive-module-thumbs.doc-2017.tar.xz mirror://gentoo/texlive-module-thumby.doc-2017.tar.xz mirror://gentoo/texlive-module-ticket.doc-2017.tar.xz mirror://gentoo/texlive-module-titlecaps.doc-2017.tar.xz mirror://gentoo/texlive-module-titlepic.doc-2017.tar.xz mirror://gentoo/texlive-module-titleref.doc-2017.tar.xz mirror://gentoo/texlive-module-titlesec.doc-2017.tar.xz mirror://gentoo/texlive-module-titling.doc-2017.tar.xz mirror://gentoo/texlive-module-tocbibind.doc-2017.tar.xz mirror://gentoo/texlive-module-tocdata.doc-2017.tar.xz mirror://gentoo/texlive-module-tocloft.doc-2017.tar.xz mirror://gentoo/texlive-module-tocvsec2.doc-2017.tar.xz mirror://gentoo/texlive-module-todo.doc-2017.tar.xz mirror://gentoo/texlive-module-todonotes.doc-2017.tar.xz mirror://gentoo/texlive-module-tokenizer.doc-2017.tar.xz mirror://gentoo/texlive-module-toolbox.doc-2017.tar.xz mirror://gentoo/texlive-module-topfloat.doc-2017.tar.xz mirror://gentoo/texlive-module-totcount.doc-2017.tar.xz mirror://gentoo/texlive-module-totpages.doc-2017.tar.xz mirror://gentoo/texlive-module-translations.doc-2017.tar.xz mirror://gentoo/texlive-module-trfsigns.doc-2017.tar.xz mirror://gentoo/texlive-module-trimspaces.doc-2017.tar.xz mirror://gentoo/texlive-module-trivfloat.doc-2017.tar.xz mirror://gentoo/texlive-module-trsym.doc-2017.tar.xz mirror://gentoo/texlive-module-truncate.doc-2017.tar.xz mirror://gentoo/texlive-module-tucv.doc-2017.tar.xz mirror://gentoo/texlive-module-turnthepage.doc-2017.tar.xz mirror://gentoo/texlive-module-twoinone.doc-2017.tar.xz mirror://gentoo/texlive-module-twoup.doc-2017.tar.xz mirror://gentoo/texlive-module-txgreeks.doc-2017.tar.xz mirror://gentoo/texlive-module-type1cm.doc-2017.tar.xz mirror://gentoo/texlive-module-typed-checklist.doc-2017.tar.xz mirror://gentoo/texlive-module-typeface.doc-2017.tar.xz mirror://gentoo/texlive-module-typoaid.doc-2017.tar.xz mirror://gentoo/texlive-module-typogrid.doc-2017.tar.xz mirror://gentoo/texlive-module-uassign.doc-2017.tar.xz mirror://gentoo/texlive-module-ucs.doc-2017.tar.xz mirror://gentoo/texlive-module-uebungsblatt.doc-2017.tar.xz mirror://gentoo/texlive-module-umoline.doc-2017.tar.xz mirror://gentoo/texlive-module-underlin.doc-2017.tar.xz mirror://gentoo/texlive-module-underoverlap.doc-2017.tar.xz mirror://gentoo/texlive-module-undolabl.doc-2017.tar.xz mirror://gentoo/texlive-module-units.doc-2017.tar.xz mirror://gentoo/texlive-module-unravel.doc-2017.tar.xz mirror://gentoo/texlive-module-upmethodology.doc-2017.tar.xz mirror://gentoo/texlive-module-upquote.doc-2017.tar.xz mirror://gentoo/texlive-module-uri.doc-2017.tar.xz mirror://gentoo/texlive-module-ushort.doc-2017.tar.xz mirror://gentoo/texlive-module-uspace.doc-2017.tar.xz mirror://gentoo/texlive-module-uwmslide.doc-2017.tar.xz mirror://gentoo/texlive-module-variablelm.doc-2017.tar.xz mirror://gentoo/texlive-module-varindex.doc-2017.tar.xz mirror://gentoo/texlive-module-varsfromjobname.doc-2017.tar.xz mirror://gentoo/texlive-module-varwidth.doc-2017.tar.xz mirror://gentoo/texlive-module-vdmlisting.doc-2017.tar.xz mirror://gentoo/texlive-module-verbasef.doc-2017.tar.xz mirror://gentoo/texlive-module-verbatimbox.doc-2017.tar.xz mirror://gentoo/texlive-module-verbatimcopy.doc-2017.tar.xz mirror://gentoo/texlive-module-verbdef.doc-2017.tar.xz mirror://gentoo/texlive-module-verbments.doc-2017.tar.xz mirror://gentoo/texlive-module-version.doc-2017.tar.xz mirror://gentoo/texlive-module-versions.doc-2017.tar.xz mirror://gentoo/texlive-module-versonotes.doc-2017.tar.xz mirror://gentoo/texlive-module-vertbars.doc-2017.tar.xz mirror://gentoo/texlive-module-vgrid.doc-2017.tar.xz mirror://gentoo/texlive-module-vhistory.doc-2017.tar.xz mirror://gentoo/texlive-module-vmargin.doc-2017.tar.xz mirror://gentoo/texlive-module-volumes.doc-2017.tar.xz mirror://gentoo/texlive-module-vpe.doc-2017.tar.xz mirror://gentoo/texlive-module-vruler.doc-2017.tar.xz mirror://gentoo/texlive-module-vwcol.doc-2017.tar.xz mirror://gentoo/texlive-module-wallpaper.doc-2017.tar.xz mirror://gentoo/texlive-module-warning.doc-2017.tar.xz mirror://gentoo/texlive-module-warpcol.doc-2017.tar.xz mirror://gentoo/texlive-module-was.doc-2017.tar.xz mirror://gentoo/texlive-module-widetable.doc-2017.tar.xz mirror://gentoo/texlive-module-williams.doc-2017.tar.xz mirror://gentoo/texlive-module-withargs.doc-2017.tar.xz mirror://gentoo/texlive-module-wordcount.doc-2017.tar.xz mirror://gentoo/texlive-module-wordlike.doc-2017.tar.xz mirror://gentoo/texlive-module-wrapfig.doc-2017.tar.xz mirror://gentoo/texlive-module-wtref.doc-2017.tar.xz mirror://gentoo/texlive-module-xargs.doc-2017.tar.xz mirror://gentoo/texlive-module-xassoccnt.doc-2017.tar.xz mirror://gentoo/texlive-module-xcntperchap.doc-2017.tar.xz mirror://gentoo/texlive-module-xcolor-material.doc-2017.tar.xz mirror://gentoo/texlive-module-xcolor-solarized.doc-2017.tar.xz mirror://gentoo/texlive-module-xcomment.doc-2017.tar.xz mirror://gentoo/texlive-module-xdoc.doc-2017.tar.xz mirror://gentoo/texlive-module-xellipsis.doc-2017.tar.xz mirror://gentoo/texlive-module-xfor.doc-2017.tar.xz mirror://gentoo/texlive-module-xhfill.doc-2017.tar.xz mirror://gentoo/texlive-module-xifthen.doc-2017.tar.xz mirror://gentoo/texlive-module-xint.doc-2017.tar.xz mirror://gentoo/texlive-module-xmpincl.doc-2017.tar.xz mirror://gentoo/texlive-module-xnewcommand.doc-2017.tar.xz mirror://gentoo/texlive-module-xoptarg.doc-2017.tar.xz mirror://gentoo/texlive-module-xpatch.doc-2017.tar.xz mirror://gentoo/texlive-module-xpeek.doc-2017.tar.xz mirror://gentoo/texlive-module-xprintlen.doc-2017.tar.xz mirror://gentoo/texlive-module-xpunctuate.doc-2017.tar.xz mirror://gentoo/texlive-module-xsavebox.doc-2017.tar.xz mirror://gentoo/texlive-module-xsim.doc-2017.tar.xz mirror://gentoo/texlive-module-xstring.doc-2017.tar.xz mirror://gentoo/texlive-module-xtab.doc-2017.tar.xz mirror://gentoo/texlive-module-xwatermark.doc-2017.tar.xz mirror://gentoo/texlive-module-xytree.doc-2017.tar.xz mirror://gentoo/texlive-module-yafoot.doc-2017.tar.xz mirror://gentoo/texlive-module-yaletter.doc-2017.tar.xz mirror://gentoo/texlive-module-yagusylo.doc-2017.tar.xz mirror://gentoo/texlive-module-ycbook.doc-2017.tar.xz mirror://gentoo/texlive-module-ydoc.doc-2017.tar.xz mirror://gentoo/texlive-module-yplan.doc-2017.tar.xz mirror://gentoo/texlive-module-zed-csp.doc-2017.tar.xz mirror://gentoo/texlive-module-ziffer.doc-2017.tar.xz mirror://gentoo/texlive-module-zwgetfdate.doc-2017.tar.xz mirror://gentoo/texlive-module-zwpagelayout.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-ESIEEcv.source-2017.tar.xz mirror://gentoo/texlive-module-GS1.source-2017.tar.xz mirror://gentoo/texlive-module-HA-prosper.source-2017.tar.xz mirror://gentoo/texlive-module-Tabbing.source-2017.tar.xz mirror://gentoo/texlive-module-abstract.source-2017.tar.xz mirror://gentoo/texlive-module-achemso.source-2017.tar.xz mirror://gentoo/texlive-module-acronym.source-2017.tar.xz mirror://gentoo/texlive-module-acroterm.source-2017.tar.xz mirror://gentoo/texlive-module-actuarialangle.source-2017.tar.xz mirror://gentoo/texlive-module-actuarialsymbol.source-2017.tar.xz mirror://gentoo/texlive-module-addlines.source-2017.tar.xz mirror://gentoo/texlive-module-adjmulticol.source-2017.tar.xz mirror://gentoo/texlive-module-adjustbox.source-2017.tar.xz mirror://gentoo/texlive-module-adrconv.source-2017.tar.xz mirror://gentoo/texlive-module-alertmessage.source-2017.tar.xz mirror://gentoo/texlive-module-alnumsec.source-2017.tar.xz mirror://gentoo/texlive-module-altfont.source-2017.tar.xz mirror://gentoo/texlive-module-amsaddr.source-2017.tar.xz mirror://gentoo/texlive-module-animate.source-2017.tar.xz mirror://gentoo/texlive-module-answers.source-2017.tar.xz mirror://gentoo/texlive-module-appendix.source-2017.tar.xz mirror://gentoo/texlive-module-apptools.source-2017.tar.xz mirror://gentoo/texlive-module-arcs.source-2017.tar.xz mirror://gentoo/texlive-module-arraysort.source-2017.tar.xz mirror://gentoo/texlive-module-arydshln.source-2017.tar.xz mirror://gentoo/texlive-module-asciilist.source-2017.tar.xz mirror://gentoo/texlive-module-attachfile.source-2017.tar.xz mirror://gentoo/texlive-module-autonum.source-2017.tar.xz mirror://gentoo/texlive-module-autopdf.source-2017.tar.xz mirror://gentoo/texlive-module-avremu.source-2017.tar.xz mirror://gentoo/texlive-module-background.source-2017.tar.xz mirror://gentoo/texlive-module-basicarith.source-2017.tar.xz mirror://gentoo/texlive-module-beamercolorthemeowl.source-2017.tar.xz mirror://gentoo/texlive-module-beamersubframe.source-2017.tar.xz mirror://gentoo/texlive-module-beamertheme-cuerna.source-2017.tar.xz mirror://gentoo/texlive-module-beamertheme-metropolis.source-2017.tar.xz mirror://gentoo/texlive-module-beton.source-2017.tar.xz mirror://gentoo/texlive-module-bewerbung.source-2017.tar.xz mirror://gentoo/texlive-module-bez123.source-2017.tar.xz mirror://gentoo/texlive-module-bhcexam.source-2017.tar.xz mirror://gentoo/texlive-module-bigfoot.source-2017.tar.xz mirror://gentoo/texlive-module-bizcard.source-2017.tar.xz mirror://gentoo/texlive-module-blindtext.source-2017.tar.xz mirror://gentoo/texlive-module-bnumexpr.source-2017.tar.xz mirror://gentoo/texlive-module-boites.source-2017.tar.xz mirror://gentoo/texlive-module-bookcover.source-2017.tar.xz mirror://gentoo/texlive-module-booklet.source-2017.tar.xz mirror://gentoo/texlive-module-boolexpr.source-2017.tar.xz mirror://gentoo/texlive-module-bophook.source-2017.tar.xz mirror://gentoo/texlive-module-boxedminipage2e.source-2017.tar.xz mirror://gentoo/texlive-module-boxhandler.source-2017.tar.xz mirror://gentoo/texlive-module-breakurl.source-2017.tar.xz mirror://gentoo/texlive-module-bullcntr.source-2017.tar.xz mirror://gentoo/texlive-module-calcage.source-2017.tar.xz mirror://gentoo/texlive-module-calculator.source-2017.tar.xz mirror://gentoo/texlive-module-cals.source-2017.tar.xz mirror://gentoo/texlive-module-canoniclayout.source-2017.tar.xz mirror://gentoo/texlive-module-capt-of.source-2017.tar.xz mirror://gentoo/texlive-module-captcont.source-2017.tar.xz mirror://gentoo/texlive-module-catchfilebetweentags.source-2017.tar.xz mirror://gentoo/texlive-module-catechis.source-2017.tar.xz mirror://gentoo/texlive-module-ccaption.source-2017.tar.xz mirror://gentoo/texlive-module-cclicenses.source-2017.tar.xz mirror://gentoo/texlive-module-cd.source-2017.tar.xz mirror://gentoo/texlive-module-cd-cover.source-2017.tar.xz mirror://gentoo/texlive-module-cdpbundl.source-2017.tar.xz mirror://gentoo/texlive-module-changebar.source-2017.tar.xz mirror://gentoo/texlive-module-changepage.source-2017.tar.xz mirror://gentoo/texlive-module-changes.source-2017.tar.xz mirror://gentoo/texlive-module-chappg.source-2017.tar.xz mirror://gentoo/texlive-module-chapterfolder.source-2017.tar.xz mirror://gentoo/texlive-module-chextras.source-2017.tar.xz mirror://gentoo/texlive-module-childdoc.source-2017.tar.xz mirror://gentoo/texlive-module-chletter.source-2017.tar.xz mirror://gentoo/texlive-module-circ.source-2017.tar.xz mirror://gentoo/texlive-module-classpack.source-2017.tar.xz mirror://gentoo/texlive-module-clefval.source-2017.tar.xz mirror://gentoo/texlive-module-cleveref.source-2017.tar.xz mirror://gentoo/texlive-module-cmdtrack.source-2017.tar.xz mirror://gentoo/texlive-module-codepage.source-2017.tar.xz mirror://gentoo/texlive-module-codesection.source-2017.tar.xz mirror://gentoo/texlive-module-collcell.source-2017.tar.xz mirror://gentoo/texlive-module-collectbox.source-2017.tar.xz mirror://gentoo/texlive-module-colordoc.source-2017.tar.xz mirror://gentoo/texlive-module-colorwav.source-2017.tar.xz mirror://gentoo/texlive-module-colorweb.source-2017.tar.xz mirror://gentoo/texlive-module-combine.source-2017.tar.xz mirror://gentoo/texlive-module-commado.source-2017.tar.xz mirror://gentoo/texlive-module-constants.source-2017.tar.xz mirror://gentoo/texlive-module-continue.source-2017.tar.xz mirror://gentoo/texlive-module-contour.source-2017.tar.xz mirror://gentoo/texlive-module-contracard.source-2017.tar.xz mirror://gentoo/texlive-module-conv-xkv.source-2017.tar.xz mirror://gentoo/texlive-module-cooking.source-2017.tar.xz mirror://gentoo/texlive-module-cooking-units.source-2017.tar.xz mirror://gentoo/texlive-module-cool.source-2017.tar.xz mirror://gentoo/texlive-module-coollist.source-2017.tar.xz mirror://gentoo/texlive-module-coolstr.source-2017.tar.xz mirror://gentoo/texlive-module-coolthms.source-2017.tar.xz mirror://gentoo/texlive-module-cooltooltips.source-2017.tar.xz mirror://gentoo/texlive-module-coordsys.source-2017.tar.xz mirror://gentoo/texlive-module-copyedit.source-2017.tar.xz mirror://gentoo/texlive-module-counttexruns.source-2017.tar.xz mirror://gentoo/texlive-module-coverpage.source-2017.tar.xz mirror://gentoo/texlive-module-cprotect.source-2017.tar.xz mirror://gentoo/texlive-module-crossreference.source-2017.tar.xz mirror://gentoo/texlive-module-cuisine.source-2017.tar.xz mirror://gentoo/texlive-module-currfile.source-2017.tar.xz mirror://gentoo/texlive-module-cutwin.source-2017.tar.xz mirror://gentoo/texlive-module-cyber.source-2017.tar.xz mirror://gentoo/texlive-module-cybercic.source-2017.tar.xz mirror://gentoo/texlive-module-dashbox.source-2017.tar.xz mirror://gentoo/texlive-module-dashrule.source-2017.tar.xz mirror://gentoo/texlive-module-datatool.source-2017.tar.xz mirror://gentoo/texlive-module-dateiliste.source-2017.tar.xz mirror://gentoo/texlive-module-datenumber.source-2017.tar.xz mirror://gentoo/texlive-module-datetime.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-bahasai.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-basque.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-breton.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-bulgarian.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-catalan.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-croatian.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-czech.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-danish.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-dutch.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-en-fulltext.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-english.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-esperanto.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-estonian.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-finnish.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-french.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-galician.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-german.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-greek.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-hebrew.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-icelandic.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-irish.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-italian.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-it-fulltext.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-latin.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-lsorbian.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-magyar.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-norsk.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-polish.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-portuges.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-romanian.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-russian.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-samin.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-scottish.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-serbian.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-slovak.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-slovene.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-spanish.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-swedish.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-turkish.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-ukrainian.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-usorbian.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-welsh.source-2017.tar.xz mirror://gentoo/texlive-module-decimal.source-2017.tar.xz mirror://gentoo/texlive-module-decorule.source-2017.tar.xz mirror://gentoo/texlive-module-delimtxt.source-2017.tar.xz mirror://gentoo/texlive-module-denisbdoc.source-2017.tar.xz mirror://gentoo/texlive-module-diagbox.source-2017.tar.xz mirror://gentoo/texlive-module-dialogl.source-2017.tar.xz mirror://gentoo/texlive-module-dinbrief.source-2017.tar.xz mirror://gentoo/texlive-module-dirtytalk.source-2017.tar.xz mirror://gentoo/texlive-module-dnaseq.source-2017.tar.xz mirror://gentoo/texlive-module-doclicense.source-2017.tar.xz mirror://gentoo/texlive-module-docmfp.source-2017.tar.xz mirror://gentoo/texlive-module-docmute.source-2017.tar.xz mirror://gentoo/texlive-module-doctools.source-2017.tar.xz mirror://gentoo/texlive-module-documentation.source-2017.tar.xz mirror://gentoo/texlive-module-dotarrow.source-2017.tar.xz mirror://gentoo/texlive-module-dotseqn.source-2017.tar.xz mirror://gentoo/texlive-module-download.source-2017.tar.xz mirror://gentoo/texlive-module-dox.source-2017.tar.xz mirror://gentoo/texlive-module-dprogress.source-2017.tar.xz mirror://gentoo/texlive-module-drac.source-2017.tar.xz mirror://gentoo/texlive-module-draftcopy.source-2017.tar.xz mirror://gentoo/texlive-module-draftwatermark.source-2017.tar.xz mirror://gentoo/texlive-module-dtxdescribe.source-2017.tar.xz mirror://gentoo/texlive-module-dtxgallery.source-2017.tar.xz mirror://gentoo/texlive-module-dynamicnumber.source-2017.tar.xz mirror://gentoo/texlive-module-easyfig.source-2017.tar.xz mirror://gentoo/texlive-module-easyreview.source-2017.tar.xz mirror://gentoo/texlive-module-ebezier.source-2017.tar.xz mirror://gentoo/texlive-module-ecclesiastic.source-2017.tar.xz mirror://gentoo/texlive-module-ecv.source-2017.tar.xz mirror://gentoo/texlive-module-ed.source-2017.tar.xz mirror://gentoo/texlive-module-edmargin.source-2017.tar.xz mirror://gentoo/texlive-module-eemeir.source-2017.tar.xz mirror://gentoo/texlive-module-efbox.source-2017.tar.xz mirror://gentoo/texlive-module-egplot.source-2017.tar.xz mirror://gentoo/texlive-module-ellipsis.source-2017.tar.xz mirror://gentoo/texlive-module-elmath.source-2017.tar.xz mirror://gentoo/texlive-module-elocalloc.source-2017.tar.xz mirror://gentoo/texlive-module-elzcards.source-2017.tar.xz mirror://gentoo/texlive-module-emarks.source-2017.tar.xz mirror://gentoo/texlive-module-embedall.source-2017.tar.xz mirror://gentoo/texlive-module-emptypage.source-2017.tar.xz mirror://gentoo/texlive-module-endfloat.source-2017.tar.xz mirror://gentoo/texlive-module-endheads.source-2017.tar.xz mirror://gentoo/texlive-module-engpron.source-2017.tar.xz mirror://gentoo/texlive-module-engrec.source-2017.tar.xz mirror://gentoo/texlive-module-enumitem-zref.source-2017.tar.xz mirror://gentoo/texlive-module-environ.source-2017.tar.xz mirror://gentoo/texlive-module-epigraph.source-2017.tar.xz mirror://gentoo/texlive-module-epiolmec.source-2017.tar.xz mirror://gentoo/texlive-module-eqlist.source-2017.tar.xz mirror://gentoo/texlive-module-eqnalign.source-2017.tar.xz mirror://gentoo/texlive-module-eqparbox.source-2017.tar.xz mirror://gentoo/texlive-module-errata.source-2017.tar.xz mirror://gentoo/texlive-module-esdiff.source-2017.tar.xz mirror://gentoo/texlive-module-esint.source-2017.tar.xz mirror://gentoo/texlive-module-etaremune.source-2017.tar.xz mirror://gentoo/texlive-module-etextools.source-2017.tar.xz mirror://gentoo/texlive-module-etoc.source-2017.tar.xz mirror://gentoo/texlive-module-eukdate.source-2017.tar.xz mirror://gentoo/texlive-module-everyhook.source-2017.tar.xz mirror://gentoo/texlive-module-everypage.source-2017.tar.xz mirror://gentoo/texlive-module-exam-n.source-2017.tar.xz mirror://gentoo/texlive-module-examdesign.source-2017.tar.xz mirror://gentoo/texlive-module-exercise.source-2017.tar.xz mirror://gentoo/texlive-module-exercises.source-2017.tar.xz mirror://gentoo/texlive-module-exp-testopt.source-2017.tar.xz mirror://gentoo/texlive-module-expdlist.source-2017.tar.xz mirror://gentoo/texlive-module-export.source-2017.tar.xz mirror://gentoo/texlive-module-exsol.source-2017.tar.xz mirror://gentoo/texlive-module-extract.source-2017.tar.xz mirror://gentoo/texlive-module-facsimile.source-2017.tar.xz mirror://gentoo/texlive-module-factura.source-2017.tar.xz mirror://gentoo/texlive-module-fancylabel.source-2017.tar.xz mirror://gentoo/texlive-module-fancynum.source-2017.tar.xz mirror://gentoo/texlive-module-fancypar.source-2017.tar.xz mirror://gentoo/texlive-module-fancytabs.source-2017.tar.xz mirror://gentoo/texlive-module-fancytooltips.source-2017.tar.xz mirror://gentoo/texlive-module-fcolumn.source-2017.tar.xz mirror://gentoo/texlive-module-fgruler.source-2017.tar.xz mirror://gentoo/texlive-module-fibeamer.source-2017.tar.xz mirror://gentoo/texlive-module-fifo-stack.source-2017.tar.xz mirror://gentoo/texlive-module-filecontents.source-2017.tar.xz mirror://gentoo/texlive-module-filecontentsdef.source-2017.tar.xz mirror://gentoo/texlive-module-filedate.source-2017.tar.xz mirror://gentoo/texlive-module-fileinfo.source-2017.tar.xz mirror://gentoo/texlive-module-fink.source-2017.tar.xz mirror://gentoo/texlive-module-finstrut.source-2017.tar.xz mirror://gentoo/texlive-module-fithesis.source-2017.tar.xz mirror://gentoo/texlive-module-fixcmex.source-2017.tar.xz mirror://gentoo/texlive-module-fixme.source-2017.tar.xz mirror://gentoo/texlive-module-fixmetodonotes.source-2017.tar.xz mirror://gentoo/texlive-module-flabels.source-2017.tar.xz mirror://gentoo/texlive-module-flagderiv.source-2017.tar.xz mirror://gentoo/texlive-module-flashcards.source-2017.tar.xz mirror://gentoo/texlive-module-flippdf.source-2017.tar.xz mirror://gentoo/texlive-module-floatflt.source-2017.tar.xz mirror://gentoo/texlive-module-floatrow.source-2017.tar.xz mirror://gentoo/texlive-module-flowfram.source-2017.tar.xz mirror://gentoo/texlive-module-fmp.source-2017.tar.xz mirror://gentoo/texlive-module-fmtcount.source-2017.tar.xz mirror://gentoo/texlive-module-fnbreak.source-2017.tar.xz mirror://gentoo/texlive-module-fnumprint.source-2017.tar.xz mirror://gentoo/texlive-module-foilhtml.source-2017.tar.xz mirror://gentoo/texlive-module-fontaxes.source-2017.tar.xz mirror://gentoo/texlive-module-fonttable.source-2017.tar.xz mirror://gentoo/texlive-module-footmisc.source-2017.tar.xz mirror://gentoo/texlive-module-footmisx.source-2017.tar.xz mirror://gentoo/texlive-module-footnotehyper.source-2017.tar.xz mirror://gentoo/texlive-module-footnoterange.source-2017.tar.xz mirror://gentoo/texlive-module-footnpag.source-2017.tar.xz mirror://gentoo/texlive-module-forarray.source-2017.tar.xz mirror://gentoo/texlive-module-foreign.source-2017.tar.xz mirror://gentoo/texlive-module-forloop.source-2017.tar.xz mirror://gentoo/texlive-module-formular.source-2017.tar.xz mirror://gentoo/texlive-module-frankenstein.source-2017.tar.xz mirror://gentoo/texlive-module-ftnxtra.source-2017.tar.xz mirror://gentoo/texlive-module-fullblck.source-2017.tar.xz mirror://gentoo/texlive-module-fullminipage.source-2017.tar.xz mirror://gentoo/texlive-module-fundus-calligra.source-2017.tar.xz mirror://gentoo/texlive-module-fundus-sueterlin.source-2017.tar.xz mirror://gentoo/texlive-module-fvextra.source-2017.tar.xz mirror://gentoo/texlive-module-gcite.source-2017.tar.xz mirror://gentoo/texlive-module-gender.source-2017.tar.xz mirror://gentoo/texlive-module-genmpage.source-2017.tar.xz mirror://gentoo/texlive-module-getitems.source-2017.tar.xz mirror://gentoo/texlive-module-ginpenc.source-2017.tar.xz mirror://gentoo/texlive-module-gitfile-info.source-2017.tar.xz mirror://gentoo/texlive-module-glossaries-danish.source-2017.tar.xz mirror://gentoo/texlive-module-glossaries-dutch.source-2017.tar.xz mirror://gentoo/texlive-module-glossaries-english.source-2017.tar.xz mirror://gentoo/texlive-module-glossaries-extra.source-2017.tar.xz mirror://gentoo/texlive-module-glossaries-french.source-2017.tar.xz mirror://gentoo/texlive-module-glossaries-german.source-2017.tar.xz mirror://gentoo/texlive-module-glossaries-irish.source-2017.tar.xz mirror://gentoo/texlive-module-glossaries-italian.source-2017.tar.xz mirror://gentoo/texlive-module-glossaries-magyar.source-2017.tar.xz mirror://gentoo/texlive-module-glossaries-polish.source-2017.tar.xz mirror://gentoo/texlive-module-glossaries-portuges.source-2017.tar.xz mirror://gentoo/texlive-module-glossaries-serbian.source-2017.tar.xz mirror://gentoo/texlive-module-glossaries-spanish.source-2017.tar.xz mirror://gentoo/texlive-module-gmdoc-enhance.source-2017.tar.xz mirror://gentoo/texlive-module-graphbox.source-2017.tar.xz mirror://gentoo/texlive-module-graphicx-psmin.source-2017.tar.xz mirror://gentoo/texlive-module-graphicxbox.source-2017.tar.xz mirror://gentoo/texlive-module-grayhints.source-2017.tar.xz mirror://gentoo/texlive-module-grid.source-2017.tar.xz mirror://gentoo/texlive-module-gridset.source-2017.tar.xz mirror://gentoo/texlive-module-guitlogo.source-2017.tar.xz mirror://gentoo/texlive-module-halloweenmath.source-2017.tar.xz mirror://gentoo/texlive-module-hanging.source-2017.tar.xz mirror://gentoo/texlive-module-hardwrap.source-2017.tar.xz mirror://gentoo/texlive-module-hc.source-2017.tar.xz mirror://gentoo/texlive-module-hhtensor.source-2017.tar.xz mirror://gentoo/texlive-module-histogr.source-2017.tar.xz mirror://gentoo/texlive-module-hpsdiss.source-2017.tar.xz mirror://gentoo/texlive-module-hrefhide.source-2017.tar.xz mirror://gentoo/texlive-module-hyper.source-2017.tar.xz mirror://gentoo/texlive-module-hyperxmp.source-2017.tar.xz mirror://gentoo/texlive-module-hyphenat.source-2017.tar.xz mirror://gentoo/texlive-module-idxlayout.source-2017.tar.xz mirror://gentoo/texlive-module-iffont.source-2017.tar.xz mirror://gentoo/texlive-module-ifmtarg.source-2017.tar.xz mirror://gentoo/texlive-module-ifnextok.source-2017.tar.xz mirror://gentoo/texlive-module-ifoddpage.source-2017.tar.xz mirror://gentoo/texlive-module-ifplatform.source-2017.tar.xz mirror://gentoo/texlive-module-iitem.source-2017.tar.xz mirror://gentoo/texlive-module-imakeidx.source-2017.tar.xz mirror://gentoo/texlive-module-indextools.source-2017.tar.xz mirror://gentoo/texlive-module-inlinedef.source-2017.tar.xz mirror://gentoo/texlive-module-inputtrc.source-2017.tar.xz mirror://gentoo/texlive-module-interfaces.source-2017.tar.xz mirror://gentoo/texlive-module-inversepath.source-2017.tar.xz mirror://gentoo/texlive-module-iso.source-2017.tar.xz mirror://gentoo/texlive-module-iso10303.source-2017.tar.xz mirror://gentoo/texlive-module-isodate.source-2017.tar.xz mirror://gentoo/texlive-module-isodoc.source-2017.tar.xz mirror://gentoo/texlive-module-isorot.source-2017.tar.xz mirror://gentoo/texlive-module-isotope.source-2017.tar.xz mirror://gentoo/texlive-module-issuulinks.source-2017.tar.xz mirror://gentoo/texlive-module-jvlisting.source-2017.tar.xz mirror://gentoo/texlive-module-kantlipsum.source-2017.tar.xz mirror://gentoo/texlive-module-kerntest.source-2017.tar.xz mirror://gentoo/texlive-module-keycommand.source-2017.tar.xz mirror://gentoo/texlive-module-keyfloat.source-2017.tar.xz mirror://gentoo/texlive-module-keyvaltable.source-2017.tar.xz mirror://gentoo/texlive-module-komacv.source-2017.tar.xz mirror://gentoo/texlive-module-ktv-texdata.source-2017.tar.xz mirror://gentoo/texlive-module-l3build.source-2017.tar.xz mirror://gentoo/texlive-module-labbook.source-2017.tar.xz mirror://gentoo/texlive-module-labels.source-2017.tar.xz mirror://gentoo/texlive-module-lastpackage.source-2017.tar.xz mirror://gentoo/texlive-module-lastpage.source-2017.tar.xz mirror://gentoo/texlive-module-latex-tds.source-2017.tar.xz mirror://gentoo/texlive-module-latexdemo.source-2017.tar.xz mirror://gentoo/texlive-module-latexgit.source-2017.tar.xz mirror://gentoo/texlive-module-layouts.source-2017.tar.xz mirror://gentoo/texlive-module-lcd.source-2017.tar.xz mirror://gentoo/texlive-module-lcg.source-2017.tar.xz mirror://gentoo/texlive-module-leading.source-2017.tar.xz mirror://gentoo/texlive-module-leftidx.source-2017.tar.xz mirror://gentoo/texlive-module-lengthconvert.source-2017.tar.xz mirror://gentoo/texlive-module-lettrine.source-2017.tar.xz mirror://gentoo/texlive-module-lhelp.source-2017.tar.xz mirror://gentoo/texlive-module-libgreek.source-2017.tar.xz mirror://gentoo/texlive-module-limap.source-2017.tar.xz mirror://gentoo/texlive-module-linegoal.source-2017.tar.xz mirror://gentoo/texlive-module-lipsum.source-2017.tar.xz mirror://gentoo/texlive-module-listlbls.source-2017.tar.xz mirror://gentoo/texlive-module-listliketab.source-2017.tar.xz mirror://gentoo/texlive-module-listofsymbols.source-2017.tar.xz mirror://gentoo/texlive-module-lmake.source-2017.tar.xz mirror://gentoo/texlive-module-locality.source-2017.tar.xz mirror://gentoo/texlive-module-localloc.source-2017.tar.xz mirror://gentoo/texlive-module-logbox.source-2017.tar.xz mirror://gentoo/texlive-module-logpap.source-2017.tar.xz mirror://gentoo/texlive-module-longfigure.source-2017.tar.xz mirror://gentoo/texlive-module-longnamefilelist.source-2017.tar.xz mirror://gentoo/texlive-module-lstaddons.source-2017.tar.xz mirror://gentoo/texlive-module-ltxindex.source-2017.tar.xz mirror://gentoo/texlive-module-ltxnew.source-2017.tar.xz mirror://gentoo/texlive-module-macroswap.source-2017.tar.xz mirror://gentoo/texlive-module-mailing.source-2017.tar.xz mirror://gentoo/texlive-module-mailmerge.source-2017.tar.xz mirror://gentoo/texlive-module-makebase.source-2017.tar.xz mirror://gentoo/texlive-module-makebox.source-2017.tar.xz mirror://gentoo/texlive-module-makecell.source-2017.tar.xz mirror://gentoo/texlive-module-makecmds.source-2017.tar.xz mirror://gentoo/texlive-module-makedtx.source-2017.tar.xz mirror://gentoo/texlive-module-mandi.source-2017.tar.xz mirror://gentoo/texlive-module-manfnt.source-2017.tar.xz mirror://gentoo/texlive-module-manuscript.source-2017.tar.xz mirror://gentoo/texlive-module-marginfix.source-2017.tar.xz mirror://gentoo/texlive-module-marginnote.source-2017.tar.xz mirror://gentoo/texlive-module-markdown.source-2017.tar.xz mirror://gentoo/texlive-module-mathastext.source-2017.tar.xz mirror://gentoo/texlive-module-mathexam.source-2017.tar.xz mirror://gentoo/texlive-module-mcaption.source-2017.tar.xz mirror://gentoo/texlive-module-mcite.source-2017.tar.xz mirror://gentoo/texlive-module-mdframed.source-2017.tar.xz mirror://gentoo/texlive-module-media9.source-2017.tar.xz mirror://gentoo/texlive-module-meetingmins.source-2017.tar.xz mirror://gentoo/texlive-module-memory.source-2017.tar.xz mirror://gentoo/texlive-module-menu.source-2017.tar.xz mirror://gentoo/texlive-module-menukeys.source-2017.tar.xz mirror://gentoo/texlive-module-method.source-2017.tar.xz mirror://gentoo/texlive-module-metre.source-2017.tar.xz mirror://gentoo/texlive-module-mfirstuc.source-2017.tar.xz mirror://gentoo/texlive-module-mftinc.source-2017.tar.xz mirror://gentoo/texlive-module-minibox.source-2017.tar.xz mirror://gentoo/texlive-module-minidocument.source-2017.tar.xz mirror://gentoo/texlive-module-minifp.source-2017.tar.xz mirror://gentoo/texlive-module-minipage-marginpar.source-2017.tar.xz mirror://gentoo/texlive-module-minted.source-2017.tar.xz mirror://gentoo/texlive-module-minutes.source-2017.tar.xz mirror://gentoo/texlive-module-mlist.source-2017.tar.xz mirror://gentoo/texlive-module-mnotes.source-2017.tar.xz mirror://gentoo/texlive-module-moderntimeline.source-2017.tar.xz mirror://gentoo/texlive-module-modref.source-2017.tar.xz mirror://gentoo/texlive-module-modroman.source-2017.tar.xz mirror://gentoo/texlive-module-monofill.source-2017.tar.xz mirror://gentoo/texlive-module-moodle.source-2017.tar.xz mirror://gentoo/texlive-module-morefloats.source-2017.tar.xz mirror://gentoo/texlive-module-morehype.source-2017.tar.xz mirror://gentoo/texlive-module-moresize.source-2017.tar.xz mirror://gentoo/texlive-module-moreverb.source-2017.tar.xz mirror://gentoo/texlive-module-morewrites.source-2017.tar.xz mirror://gentoo/texlive-module-mparhack.source-2017.tar.xz mirror://gentoo/texlive-module-mpostinl.source-2017.tar.xz mirror://gentoo/texlive-module-msg.source-2017.tar.xz mirror://gentoo/texlive-module-mtgreek.source-2017.tar.xz mirror://gentoo/texlive-module-multiaudience.source-2017.tar.xz mirror://gentoo/texlive-module-multibbl.source-2017.tar.xz mirror://gentoo/texlive-module-multicap.source-2017.tar.xz mirror://gentoo/texlive-module-multidef.source-2017.tar.xz mirror://gentoo/texlive-module-multienv.source-2017.tar.xz mirror://gentoo/texlive-module-multiexpand.source-2017.tar.xz mirror://gentoo/texlive-module-multirow.source-2017.tar.xz mirror://gentoo/texlive-module-mversion.source-2017.tar.xz mirror://gentoo/texlive-module-mwe.source-2017.tar.xz mirror://gentoo/texlive-module-mycv.source-2017.tar.xz mirror://gentoo/texlive-module-mylatexformat.source-2017.tar.xz mirror://gentoo/texlive-module-nag.source-2017.tar.xz mirror://gentoo/texlive-module-nameauth.source-2017.tar.xz mirror://gentoo/texlive-module-namespc.source-2017.tar.xz mirror://gentoo/texlive-module-ncctools.source-2017.tar.xz mirror://gentoo/texlive-module-needspace.source-2017.tar.xz mirror://gentoo/texlive-module-newfile.source-2017.tar.xz mirror://gentoo/texlive-module-newlfm.source-2017.tar.xz mirror://gentoo/texlive-module-newspaper.source-2017.tar.xz mirror://gentoo/texlive-module-newunicodechar.source-2017.tar.xz mirror://gentoo/texlive-module-newvbtm.source-2017.tar.xz mirror://gentoo/texlive-module-newverbs.source-2017.tar.xz mirror://gentoo/texlive-module-nicefilelist.source-2017.tar.xz mirror://gentoo/texlive-module-niceframe.source-2017.tar.xz mirror://gentoo/texlive-module-nicetext.source-2017.tar.xz mirror://gentoo/texlive-module-noitcrul.source-2017.tar.xz mirror://gentoo/texlive-module-nomencl.source-2017.tar.xz mirror://gentoo/texlive-module-nomentbl.source-2017.tar.xz mirror://gentoo/texlive-module-nonfloat.source-2017.tar.xz mirror://gentoo/texlive-module-nonumonpart.source-2017.tar.xz mirror://gentoo/texlive-module-normalcolor.source-2017.tar.xz mirror://gentoo/texlive-module-notes.source-2017.tar.xz mirror://gentoo/texlive-module-notespages.source-2017.tar.xz mirror://gentoo/texlive-module-nowidow.source-2017.tar.xz mirror://gentoo/texlive-module-ntheorem.source-2017.tar.xz mirror://gentoo/texlive-module-numprint.source-2017.tar.xz mirror://gentoo/texlive-module-ocgx.source-2017.tar.xz mirror://gentoo/texlive-module-octavo.source-2017.tar.xz mirror://gentoo/texlive-module-oldstyle.source-2017.tar.xz mirror://gentoo/texlive-module-onlyamsmath.source-2017.tar.xz mirror://gentoo/texlive-module-opcit.source-2017.tar.xz mirror://gentoo/texlive-module-pagecolor.source-2017.tar.xz mirror://gentoo/texlive-module-pagecont.source-2017.tar.xz mirror://gentoo/texlive-module-pagenote.source-2017.tar.xz mirror://gentoo/texlive-module-pageslts.source-2017.tar.xz mirror://gentoo/texlive-module-paper.source-2017.tar.xz mirror://gentoo/texlive-module-papercdcase.source-2017.tar.xz mirror://gentoo/texlive-module-papermas.source-2017.tar.xz mirror://gentoo/texlive-module-papertex.source-2017.tar.xz mirror://gentoo/texlive-module-paracol.source-2017.tar.xz mirror://gentoo/texlive-module-paralist.source-2017.tar.xz mirror://gentoo/texlive-module-paresse.source-2017.tar.xz mirror://gentoo/texlive-module-parselines.source-2017.tar.xz mirror://gentoo/texlive-module-patch.source-2017.tar.xz mirror://gentoo/texlive-module-patchcmd.source-2017.tar.xz mirror://gentoo/texlive-module-pauldoc.source-2017.tar.xz mirror://gentoo/texlive-module-pawpict.source-2017.tar.xz mirror://gentoo/texlive-module-pbox.source-2017.tar.xz mirror://gentoo/texlive-module-pbsheet.source-2017.tar.xz mirror://gentoo/texlive-module-pdf14.source-2017.tar.xz mirror://gentoo/texlive-module-pdfcprot.source-2017.tar.xz mirror://gentoo/texlive-module-pdfx.source-2017.tar.xz mirror://gentoo/texlive-module-perltex.source-2017.tar.xz mirror://gentoo/texlive-module-permute.source-2017.tar.xz mirror://gentoo/texlive-module-phffullpagefigure.source-2017.tar.xz mirror://gentoo/texlive-module-phfnote.source-2017.tar.xz mirror://gentoo/texlive-module-phfparen.source-2017.tar.xz mirror://gentoo/texlive-module-phfqit.source-2017.tar.xz mirror://gentoo/texlive-module-phfquotetext.source-2017.tar.xz mirror://gentoo/texlive-module-phfsvnwatermark.source-2017.tar.xz mirror://gentoo/texlive-module-phfthm.source-2017.tar.xz mirror://gentoo/texlive-module-photo.source-2017.tar.xz mirror://gentoo/texlive-module-plweb.source-2017.tar.xz mirror://gentoo/texlive-module-polynom.source-2017.tar.xz mirror://gentoo/texlive-module-polynomial.source-2017.tar.xz mirror://gentoo/texlive-module-polytable.source-2017.tar.xz mirror://gentoo/texlive-module-ppr-prv.source-2017.tar.xz mirror://gentoo/texlive-module-preprint.source-2017.tar.xz mirror://gentoo/texlive-module-pressrelease.source-2017.tar.xz mirror://gentoo/texlive-module-prettyref.source-2017.tar.xz mirror://gentoo/texlive-module-preview.source-2017.tar.xz mirror://gentoo/texlive-module-probsoln.source-2017.tar.xz mirror://gentoo/texlive-module-proofread.source-2017.tar.xz mirror://gentoo/texlive-module-protocol.source-2017.tar.xz mirror://gentoo/texlive-module-psfragx.source-2017.tar.xz mirror://gentoo/texlive-module-pst-pdf.source-2017.tar.xz mirror://gentoo/texlive-module-pstool.source-2017.tar.xz mirror://gentoo/texlive-module-pxgreeks.source-2017.tar.xz mirror://gentoo/texlive-module-qcm.source-2017.tar.xz mirror://gentoo/texlive-module-qstest.source-2017.tar.xz mirror://gentoo/texlive-module-qsymbols.source-2017.tar.xz mirror://gentoo/texlive-module-quotchap.source-2017.tar.xz mirror://gentoo/texlive-module-quoting.source-2017.tar.xz mirror://gentoo/texlive-module-quotmark.source-2017.tar.xz mirror://gentoo/texlive-module-ran_toks.source-2017.tar.xz mirror://gentoo/texlive-module-rccol.source-2017.tar.xz mirror://gentoo/texlive-module-rcs-multi.source-2017.tar.xz mirror://gentoo/texlive-module-rcsinfo.source-2017.tar.xz mirror://gentoo/texlive-module-realboxes.source-2017.tar.xz mirror://gentoo/texlive-module-recipecard.source-2017.tar.xz mirror://gentoo/texlive-module-reflectgraphics.source-2017.tar.xz mirror://gentoo/texlive-module-refman.source-2017.tar.xz mirror://gentoo/texlive-module-refstyle.source-2017.tar.xz mirror://gentoo/texlive-module-regcount.source-2017.tar.xz mirror://gentoo/texlive-module-regexpatch.source-2017.tar.xz mirror://gentoo/texlive-module-register.source-2017.tar.xz mirror://gentoo/texlive-module-regstats.source-2017.tar.xz mirror://gentoo/texlive-module-relenc.source-2017.tar.xz mirror://gentoo/texlive-module-repltext.source-2017.tar.xz mirror://gentoo/texlive-module-rjlparshap.source-2017.tar.xz mirror://gentoo/texlive-module-robustcommand.source-2017.tar.xz mirror://gentoo/texlive-module-romanbar.source-2017.tar.xz mirror://gentoo/texlive-module-romanbarpagenumber.source-2017.tar.xz mirror://gentoo/texlive-module-romannum.source-2017.tar.xz mirror://gentoo/texlive-module-rotfloat.source-2017.tar.xz mirror://gentoo/texlive-module-rtkinenc.source-2017.tar.xz mirror://gentoo/texlive-module-rulercompass.source-2017.tar.xz mirror://gentoo/texlive-module-sauerj.source-2017.tar.xz mirror://gentoo/texlive-module-savefnmark.source-2017.tar.xz mirror://gentoo/texlive-module-savetrees.source-2017.tar.xz mirror://gentoo/texlive-module-scale.source-2017.tar.xz mirror://gentoo/texlive-module-scalebar.source-2017.tar.xz mirror://gentoo/texlive-module-sectsty.source-2017.tar.xz mirror://gentoo/texlive-module-seealso.source-2017.tar.xz mirror://gentoo/texlive-module-semantic.source-2017.tar.xz mirror://gentoo/texlive-module-semioneside.source-2017.tar.xz mirror://gentoo/texlive-module-semproc.source-2017.tar.xz mirror://gentoo/texlive-module-seqsplit.source-2017.tar.xz mirror://gentoo/texlive-module-sesstime.source-2017.tar.xz mirror://gentoo/texlive-module-sf298.source-2017.tar.xz mirror://gentoo/texlive-module-sffms.source-2017.tar.xz mirror://gentoo/texlive-module-shdoc.source-2017.tar.xz mirror://gentoo/texlive-module-shorttoc.source-2017.tar.xz mirror://gentoo/texlive-module-show2e.source-2017.tar.xz mirror://gentoo/texlive-module-showcharinbox.source-2017.tar.xz mirror://gentoo/texlive-module-showexpl.source-2017.tar.xz mirror://gentoo/texlive-module-showlabels.source-2017.tar.xz mirror://gentoo/texlive-module-sidecap.source-2017.tar.xz mirror://gentoo/texlive-module-sidenotes.source-2017.tar.xz mirror://gentoo/texlive-module-silence.source-2017.tar.xz mirror://gentoo/texlive-module-simplecd.source-2017.tar.xz mirror://gentoo/texlive-module-simplecv.source-2017.tar.xz mirror://gentoo/texlive-module-sitem.source-2017.tar.xz mirror://gentoo/texlive-module-skb.source-2017.tar.xz mirror://gentoo/texlive-module-skdoc.source-2017.tar.xz mirror://gentoo/texlive-module-skrapport.source-2017.tar.xz mirror://gentoo/texlive-module-slantsc.source-2017.tar.xz mirror://gentoo/texlive-module-snapshot.source-2017.tar.xz mirror://gentoo/texlive-module-soul.source-2017.tar.xz mirror://gentoo/texlive-module-splitindex.source-2017.tar.xz mirror://gentoo/texlive-module-spot.source-2017.tar.xz mirror://gentoo/texlive-module-spverbatim.source-2017.tar.xz mirror://gentoo/texlive-module-srcltx.source-2017.tar.xz mirror://gentoo/texlive-module-sseq.source-2017.tar.xz mirror://gentoo/texlive-module-stack.source-2017.tar.xz mirror://gentoo/texlive-module-standalone.source-2017.tar.xz mirror://gentoo/texlive-module-statistik.source-2017.tar.xz mirror://gentoo/texlive-module-stdclsdv.source-2017.tar.xz mirror://gentoo/texlive-module-stdpage.source-2017.tar.xz mirror://gentoo/texlive-module-stex.source-2017.tar.xz mirror://gentoo/texlive-module-storebox.source-2017.tar.xz mirror://gentoo/texlive-module-stringstrings.source-2017.tar.xz mirror://gentoo/texlive-module-sttools.source-2017.tar.xz mirror://gentoo/texlive-module-subdepth.source-2017.tar.xz mirror://gentoo/texlive-module-subeqn.source-2017.tar.xz mirror://gentoo/texlive-module-subeqnarray.source-2017.tar.xz mirror://gentoo/texlive-module-subfigure.source-2017.tar.xz mirror://gentoo/texlive-module-subfiles.source-2017.tar.xz mirror://gentoo/texlive-module-subfloat.source-2017.tar.xz mirror://gentoo/texlive-module-supertabular.source-2017.tar.xz mirror://gentoo/texlive-module-svg.source-2017.tar.xz mirror://gentoo/texlive-module-svn.source-2017.tar.xz mirror://gentoo/texlive-module-svn-multi.source-2017.tar.xz mirror://gentoo/texlive-module-svn-prov.source-2017.tar.xz mirror://gentoo/texlive-module-syntrace.source-2017.tar.xz mirror://gentoo/texlive-module-synttree.source-2017.tar.xz mirror://gentoo/texlive-module-tabfigures.source-2017.tar.xz mirror://gentoo/texlive-module-tablefootnote.source-2017.tar.xz mirror://gentoo/texlive-module-tableof.source-2017.tar.xz mirror://gentoo/texlive-module-tablestyles.source-2017.tar.xz mirror://gentoo/texlive-module-tablists.source-2017.tar.xz mirror://gentoo/texlive-module-tabu.source-2017.tar.xz mirror://gentoo/texlive-module-tabularborder.source-2017.tar.xz mirror://gentoo/texlive-module-tabularew.source-2017.tar.xz mirror://gentoo/texlive-module-tabulary.source-2017.tar.xz mirror://gentoo/texlive-module-talk.source-2017.tar.xz mirror://gentoo/texlive-module-tcldoc.source-2017.tar.xz mirror://gentoo/texlive-module-ted.source-2017.tar.xz mirror://gentoo/texlive-module-templatetools.source-2017.tar.xz mirror://gentoo/texlive-module-termcal.source-2017.tar.xz mirror://gentoo/texlive-module-termlist.source-2017.tar.xz mirror://gentoo/texlive-module-testhyphens.source-2017.tar.xz mirror://gentoo/texlive-module-testidx.source-2017.tar.xz mirror://gentoo/texlive-module-tex-label.source-2017.tar.xz mirror://gentoo/texlive-module-texmate.source-2017.tar.xz mirror://gentoo/texlive-module-texments.source-2017.tar.xz mirror://gentoo/texlive-module-texpower.source-2017.tar.xz mirror://gentoo/texlive-module-texshade.source-2017.tar.xz mirror://gentoo/texlive-module-texvc.source-2017.tar.xz mirror://gentoo/texlive-module-textfit.source-2017.tar.xz mirror://gentoo/texlive-module-textmerg.source-2017.tar.xz mirror://gentoo/texlive-module-textpos.source-2017.tar.xz mirror://gentoo/texlive-module-thmtools.source-2017.tar.xz mirror://gentoo/texlive-module-threadcol.source-2017.tar.xz mirror://gentoo/texlive-module-thumb.source-2017.tar.xz mirror://gentoo/texlive-module-thumbs.source-2017.tar.xz mirror://gentoo/texlive-module-titling.source-2017.tar.xz mirror://gentoo/texlive-module-tocbibind.source-2017.tar.xz mirror://gentoo/texlive-module-tocdata.source-2017.tar.xz mirror://gentoo/texlive-module-tocloft.source-2017.tar.xz mirror://gentoo/texlive-module-tocvsec2.source-2017.tar.xz mirror://gentoo/texlive-module-todo.source-2017.tar.xz mirror://gentoo/texlive-module-todonotes.source-2017.tar.xz mirror://gentoo/texlive-module-toolbox.source-2017.tar.xz mirror://gentoo/texlive-module-totcount.source-2017.tar.xz mirror://gentoo/texlive-module-totpages.source-2017.tar.xz mirror://gentoo/texlive-module-trfsigns.source-2017.tar.xz mirror://gentoo/texlive-module-trimspaces.source-2017.tar.xz mirror://gentoo/texlive-module-trivfloat.source-2017.tar.xz mirror://gentoo/texlive-module-trsym.source-2017.tar.xz mirror://gentoo/texlive-module-tucv.source-2017.tar.xz mirror://gentoo/texlive-module-twoup.source-2017.tar.xz mirror://gentoo/texlive-module-txgreeks.source-2017.tar.xz mirror://gentoo/texlive-module-type1cm.source-2017.tar.xz mirror://gentoo/texlive-module-typed-checklist.source-2017.tar.xz mirror://gentoo/texlive-module-typeface.source-2017.tar.xz mirror://gentoo/texlive-module-typogrid.source-2017.tar.xz mirror://gentoo/texlive-module-umoline.source-2017.tar.xz mirror://gentoo/texlive-module-underlin.source-2017.tar.xz mirror://gentoo/texlive-module-undolabl.source-2017.tar.xz mirror://gentoo/texlive-module-units.source-2017.tar.xz mirror://gentoo/texlive-module-unravel.source-2017.tar.xz mirror://gentoo/texlive-module-upquote.source-2017.tar.xz mirror://gentoo/texlive-module-uri.source-2017.tar.xz mirror://gentoo/texlive-module-ushort.source-2017.tar.xz mirror://gentoo/texlive-module-varindex.source-2017.tar.xz mirror://gentoo/texlive-module-versonotes.source-2017.tar.xz mirror://gentoo/texlive-module-vertbars.source-2017.tar.xz mirror://gentoo/texlive-module-vgrid.source-2017.tar.xz mirror://gentoo/texlive-module-vmargin.source-2017.tar.xz mirror://gentoo/texlive-module-volumes.source-2017.tar.xz mirror://gentoo/texlive-module-vwcol.source-2017.tar.xz mirror://gentoo/texlive-module-warpcol.source-2017.tar.xz mirror://gentoo/texlive-module-was.source-2017.tar.xz mirror://gentoo/texlive-module-widetable.source-2017.tar.xz mirror://gentoo/texlive-module-wordlike.source-2017.tar.xz mirror://gentoo/texlive-module-xargs.source-2017.tar.xz mirror://gentoo/texlive-module-xcolor-material.source-2017.tar.xz mirror://gentoo/texlive-module-xcolor-solarized.source-2017.tar.xz mirror://gentoo/texlive-module-xdoc.source-2017.tar.xz mirror://gentoo/texlive-module-xellipsis.source-2017.tar.xz mirror://gentoo/texlive-module-xfor.source-2017.tar.xz mirror://gentoo/texlive-module-xint.source-2017.tar.xz mirror://gentoo/texlive-module-xmpincl.source-2017.tar.xz mirror://gentoo/texlive-module-xpatch.source-2017.tar.xz mirror://gentoo/texlive-module-xpeek.source-2017.tar.xz mirror://gentoo/texlive-module-xpunctuate.source-2017.tar.xz mirror://gentoo/texlive-module-xsavebox.source-2017.tar.xz mirror://gentoo/texlive-module-xtab.source-2017.tar.xz mirror://gentoo/texlive-module-yafoot.source-2017.tar.xz mirror://gentoo/texlive-module-yaletter.source-2017.tar.xz mirror://gentoo/texlive-module-yagusylo.source-2017.tar.xz mirror://gentoo/texlive-module-ydoc.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=11c9e3f69b02a0822629a4dd32e9e271
+_md5_=6d12718563976aead16b447363e4ef75
diff --git a/metadata/md5-cache/dev-texlive/texlive-latexrecommended-2017 b/metadata/md5-cache/dev-texlive/texlive-latexrecommended-2017
index 9ac4f556dbf7..a24bcdddda89 100644
--- a/metadata/md5-cache/dev-texlive/texlive-latexrecommended-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-latexrecommended-2017
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive LaTeX recommended packages
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-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 ~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 ~x64-solaris ~x86-solaris
 LICENSE=GPL-1 GPL-2 LPPL-1.2 LPPL-1.3 LPPL-1.3c public-domain TeX-other-free
 RDEPEND=>=dev-texlive/texlive-latex-2017 !dev-tex/xkeyval !dev-tex/memoir !dev-tex/listings !<dev-texlive/texlive-latexextra-2017 !=app-text/texlive-core-2007* !<dev-texlive/texlive-xetex-2016 !dev-texlive/texlive-latex3 !<dev-texlive/texlive-humanities-2014 !dev-texlive/texlive-mathextra >=app-text/texlive-core-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-anysize-2017.tar.xz mirror://gentoo/texlive-module-booktabs-2017.tar.xz mirror://gentoo/texlive-module-breqn-2017.tar.xz mirror://gentoo/texlive-module-caption-2017.tar.xz mirror://gentoo/texlive-module-cite-2017.tar.xz mirror://gentoo/texlive-module-cmap-2017.tar.xz mirror://gentoo/texlive-module-crop-2017.tar.xz mirror://gentoo/texlive-module-ctable-2017.tar.xz mirror://gentoo/texlive-module-eso-pic-2017.tar.xz mirror://gentoo/texlive-module-euenc-2017.tar.xz mirror://gentoo/texlive-module-euler-2017.tar.xz mirror://gentoo/texlive-module-extsizes-2017.tar.xz mirror://gentoo/texlive-module-fancybox-2017.tar.xz mirror://gentoo/texlive-module-fancyref-2017.tar.xz mirror://gentoo/texlive-module-fancyvrb-2017.tar.xz mirror://gentoo/texlive-module-filehook-2017.tar.xz mirror://gentoo/texlive-module-float-2017.tar.xz mirror://gentoo/texlive-module-fontspec-2017.tar.xz mirror://gentoo/texlive-module-fp-2017.tar.xz mirror://gentoo/texlive-module-index-2017.tar.xz mirror://gentoo/texlive-module-jknapltx-2017.tar.xz mirror://gentoo/texlive-module-koma-script-2017.tar.xz mirror://gentoo/texlive-module-latexbug-2017.tar.xz mirror://gentoo/texlive-module-l3experimental-2017.tar.xz mirror://gentoo/texlive-module-l3kernel-2017.tar.xz mirror://gentoo/texlive-module-l3packages-2017.tar.xz mirror://gentoo/texlive-module-lineno-2017.tar.xz mirror://gentoo/texlive-module-listings-2017.tar.xz mirror://gentoo/texlive-module-lwarp-2017.tar.xz mirror://gentoo/texlive-module-mathspec-2017.tar.xz mirror://gentoo/texlive-module-mathtools-2017.tar.xz mirror://gentoo/texlive-module-mdwtools-2017.tar.xz mirror://gentoo/texlive-module-memoir-2017.tar.xz mirror://gentoo/texlive-module-metalogo-2017.tar.xz mirror://gentoo/texlive-module-microtype-2017.tar.xz mirror://gentoo/texlive-module-ms-2017.tar.xz mirror://gentoo/texlive-module-ntgclass-2017.tar.xz mirror://gentoo/texlive-module-parskip-2017.tar.xz mirror://gentoo/texlive-module-pdfpages-2017.tar.xz mirror://gentoo/texlive-module-polyglossia-2017.tar.xz mirror://gentoo/texlive-module-powerdot-2017.tar.xz mirror://gentoo/texlive-module-psfrag-2017.tar.xz mirror://gentoo/texlive-module-rcs-2017.tar.xz mirror://gentoo/texlive-module-sansmath-2017.tar.xz mirror://gentoo/texlive-module-section-2017.tar.xz mirror://gentoo/texlive-module-seminar-2017.tar.xz mirror://gentoo/texlive-module-sepnum-2017.tar.xz mirror://gentoo/texlive-module-setspace-2017.tar.xz mirror://gentoo/texlive-module-subfig-2017.tar.xz mirror://gentoo/texlive-module-textcase-2017.tar.xz mirror://gentoo/texlive-module-thumbpdf-2017.tar.xz mirror://gentoo/texlive-module-typehtml-2017.tar.xz mirror://gentoo/texlive-module-underscore-2017.tar.xz mirror://gentoo/texlive-module-unicode-math-2017.tar.xz mirror://gentoo/texlive-module-xkeyval-2017.tar.xz mirror://gentoo/texlive-module-xltxtra-2017.tar.xz mirror://gentoo/texlive-module-xunicode-2017.tar.xz mirror://gentoo/texlive-module-collection-latexrecommended-2017.tar.xz doc? ( mirror://gentoo/texlive-module-anysize.doc-2017.tar.xz mirror://gentoo/texlive-module-booktabs.doc-2017.tar.xz mirror://gentoo/texlive-module-breqn.doc-2017.tar.xz mirror://gentoo/texlive-module-caption.doc-2017.tar.xz mirror://gentoo/texlive-module-cite.doc-2017.tar.xz mirror://gentoo/texlive-module-cmap.doc-2017.tar.xz mirror://gentoo/texlive-module-crop.doc-2017.tar.xz mirror://gentoo/texlive-module-ctable.doc-2017.tar.xz mirror://gentoo/texlive-module-eso-pic.doc-2017.tar.xz mirror://gentoo/texlive-module-euenc.doc-2017.tar.xz mirror://gentoo/texlive-module-euler.doc-2017.tar.xz mirror://gentoo/texlive-module-extsizes.doc-2017.tar.xz mirror://gentoo/texlive-module-fancybox.doc-2017.tar.xz mirror://gentoo/texlive-module-fancyref.doc-2017.tar.xz mirror://gentoo/texlive-module-fancyvrb.doc-2017.tar.xz mirror://gentoo/texlive-module-filehook.doc-2017.tar.xz mirror://gentoo/texlive-module-float.doc-2017.tar.xz mirror://gentoo/texlive-module-fontspec.doc-2017.tar.xz mirror://gentoo/texlive-module-fp.doc-2017.tar.xz mirror://gentoo/texlive-module-index.doc-2017.tar.xz mirror://gentoo/texlive-module-jknapltx.doc-2017.tar.xz mirror://gentoo/texlive-module-latexbug.doc-2017.tar.xz mirror://gentoo/texlive-module-l3experimental.doc-2017.tar.xz mirror://gentoo/texlive-module-l3kernel.doc-2017.tar.xz mirror://gentoo/texlive-module-l3packages.doc-2017.tar.xz mirror://gentoo/texlive-module-lineno.doc-2017.tar.xz mirror://gentoo/texlive-module-listings.doc-2017.tar.xz mirror://gentoo/texlive-module-lwarp.doc-2017.tar.xz mirror://gentoo/texlive-module-mathspec.doc-2017.tar.xz mirror://gentoo/texlive-module-mathtools.doc-2017.tar.xz mirror://gentoo/texlive-module-mdwtools.doc-2017.tar.xz mirror://gentoo/texlive-module-memoir.doc-2017.tar.xz mirror://gentoo/texlive-module-metalogo.doc-2017.tar.xz mirror://gentoo/texlive-module-microtype.doc-2017.tar.xz mirror://gentoo/texlive-module-ms.doc-2017.tar.xz mirror://gentoo/texlive-module-ntgclass.doc-2017.tar.xz mirror://gentoo/texlive-module-parskip.doc-2017.tar.xz mirror://gentoo/texlive-module-pdfpages.doc-2017.tar.xz mirror://gentoo/texlive-module-polyglossia.doc-2017.tar.xz mirror://gentoo/texlive-module-powerdot.doc-2017.tar.xz mirror://gentoo/texlive-module-psfrag.doc-2017.tar.xz mirror://gentoo/texlive-module-rcs.doc-2017.tar.xz mirror://gentoo/texlive-module-sansmath.doc-2017.tar.xz mirror://gentoo/texlive-module-section.doc-2017.tar.xz mirror://gentoo/texlive-module-seminar.doc-2017.tar.xz mirror://gentoo/texlive-module-sepnum.doc-2017.tar.xz mirror://gentoo/texlive-module-setspace.doc-2017.tar.xz mirror://gentoo/texlive-module-subfig.doc-2017.tar.xz mirror://gentoo/texlive-module-textcase.doc-2017.tar.xz mirror://gentoo/texlive-module-thumbpdf.doc-2017.tar.xz mirror://gentoo/texlive-module-typehtml.doc-2017.tar.xz mirror://gentoo/texlive-module-underscore.doc-2017.tar.xz mirror://gentoo/texlive-module-unicode-math.doc-2017.tar.xz mirror://gentoo/texlive-module-xkeyval.doc-2017.tar.xz mirror://gentoo/texlive-module-xltxtra.doc-2017.tar.xz mirror://gentoo/texlive-module-xunicode.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-booktabs.source-2017.tar.xz mirror://gentoo/texlive-module-breqn.source-2017.tar.xz mirror://gentoo/texlive-module-caption.source-2017.tar.xz mirror://gentoo/texlive-module-crop.source-2017.tar.xz mirror://gentoo/texlive-module-ctable.source-2017.tar.xz mirror://gentoo/texlive-module-eso-pic.source-2017.tar.xz mirror://gentoo/texlive-module-euenc.source-2017.tar.xz mirror://gentoo/texlive-module-euler.source-2017.tar.xz mirror://gentoo/texlive-module-fancyref.source-2017.tar.xz mirror://gentoo/texlive-module-fancyvrb.source-2017.tar.xz mirror://gentoo/texlive-module-filehook.source-2017.tar.xz mirror://gentoo/texlive-module-float.source-2017.tar.xz mirror://gentoo/texlive-module-fontspec.source-2017.tar.xz mirror://gentoo/texlive-module-index.source-2017.tar.xz mirror://gentoo/texlive-module-latexbug.source-2017.tar.xz mirror://gentoo/texlive-module-l3experimental.source-2017.tar.xz mirror://gentoo/texlive-module-l3kernel.source-2017.tar.xz mirror://gentoo/texlive-module-l3packages.source-2017.tar.xz mirror://gentoo/texlive-module-lineno.source-2017.tar.xz mirror://gentoo/texlive-module-listings.source-2017.tar.xz mirror://gentoo/texlive-module-lwarp.source-2017.tar.xz mirror://gentoo/texlive-module-mathtools.source-2017.tar.xz mirror://gentoo/texlive-module-mdwtools.source-2017.tar.xz mirror://gentoo/texlive-module-memoir.source-2017.tar.xz mirror://gentoo/texlive-module-metalogo.source-2017.tar.xz mirror://gentoo/texlive-module-microtype.source-2017.tar.xz mirror://gentoo/texlive-module-ms.source-2017.tar.xz mirror://gentoo/texlive-module-ntgclass.source-2017.tar.xz mirror://gentoo/texlive-module-pdfpages.source-2017.tar.xz mirror://gentoo/texlive-module-polyglossia.source-2017.tar.xz mirror://gentoo/texlive-module-powerdot.source-2017.tar.xz mirror://gentoo/texlive-module-psfrag.source-2017.tar.xz mirror://gentoo/texlive-module-rcs.source-2017.tar.xz mirror://gentoo/texlive-module-subfig.source-2017.tar.xz mirror://gentoo/texlive-module-textcase.source-2017.tar.xz mirror://gentoo/texlive-module-typehtml.source-2017.tar.xz mirror://gentoo/texlive-module-unicode-math.source-2017.tar.xz mirror://gentoo/texlive-module-xkeyval.source-2017.tar.xz mirror://gentoo/texlive-module-xltxtra.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2fca91f46ac9c91ad46844e2fbe721b4
+_md5_=367840ea4bb52f65a3c46c48cbb635ef
diff --git a/metadata/md5-cache/dev-texlive/texlive-luatex-2017 b/metadata/md5-cache/dev-texlive/texlive-luatex-2017
index 03a6c4b44325..bc6769d2c9b0 100644
--- a/metadata/md5-cache/dev-texlive/texlive-luatex-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-luatex-2017
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive LuaTeX packages
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-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 ~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 ~x64-solaris ~x86-solaris
 LICENSE=BSD FDL-1.1 GPL-2 LPPL-1.2 LPPL-1.3 LPPL-1.3c MIT public-domain TeX-other-free
 RDEPEND=>=dev-texlive/texlive-basic-2017 dev-texlive/texlive-latexrecommended >=app-text/texlive-core-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-checkcites-2017.tar.xz mirror://gentoo/texlive-module-chickenize-2017.tar.xz mirror://gentoo/texlive-module-cloze-2017.tar.xz mirror://gentoo/texlive-module-cstypo-2017.tar.xz mirror://gentoo/texlive-module-ctablestack-2017.tar.xz mirror://gentoo/texlive-module-enigma-2017.tar.xz mirror://gentoo/texlive-module-interpreter-2017.tar.xz mirror://gentoo/texlive-module-lua-check-hyphen-2017.tar.xz mirror://gentoo/texlive-module-lua-visual-debug-2017.tar.xz mirror://gentoo/texlive-module-lua2dox-2017.tar.xz mirror://gentoo/texlive-module-luabibentry-2017.tar.xz mirror://gentoo/texlive-module-luabidi-2017.tar.xz mirror://gentoo/texlive-module-luacode-2017.tar.xz mirror://gentoo/texlive-module-luahyphenrules-2017.tar.xz mirror://gentoo/texlive-module-luaindex-2017.tar.xz mirror://gentoo/texlive-module-luainputenc-2017.tar.xz mirror://gentoo/texlive-module-luaintro-2017.tar.xz mirror://gentoo/texlive-module-lualatex-doc-2017.tar.xz mirror://gentoo/texlive-module-lualatex-math-2017.tar.xz mirror://gentoo/texlive-module-lualibs-2017.tar.xz mirror://gentoo/texlive-module-luamplib-2017.tar.xz mirror://gentoo/texlive-module-luaotfload-2017.tar.xz mirror://gentoo/texlive-module-luasseq-2017.tar.xz mirror://gentoo/texlive-module-luatex85-2017.tar.xz mirror://gentoo/texlive-module-luatexbase-2017.tar.xz mirror://gentoo/texlive-module-luatexko-2017.tar.xz mirror://gentoo/texlive-module-luatextra-2017.tar.xz mirror://gentoo/texlive-module-luatodonotes-2017.tar.xz mirror://gentoo/texlive-module-luaxml-2017.tar.xz mirror://gentoo/texlive-module-nodetree-2017.tar.xz mirror://gentoo/texlive-module-odsfile-2017.tar.xz mirror://gentoo/texlive-module-placeat-2017.tar.xz mirror://gentoo/texlive-module-selnolig-2017.tar.xz mirror://gentoo/texlive-module-showhyphens-2017.tar.xz mirror://gentoo/texlive-module-spelling-2017.tar.xz mirror://gentoo/texlive-module-ucharcat-2017.tar.xz mirror://gentoo/texlive-module-collection-luatex-2017.tar.xz doc? ( mirror://gentoo/texlive-module-checkcites.doc-2017.tar.xz mirror://gentoo/texlive-module-chickenize.doc-2017.tar.xz mirror://gentoo/texlive-module-cloze.doc-2017.tar.xz mirror://gentoo/texlive-module-cstypo.doc-2017.tar.xz mirror://gentoo/texlive-module-ctablestack.doc-2017.tar.xz mirror://gentoo/texlive-module-enigma.doc-2017.tar.xz mirror://gentoo/texlive-module-interpreter.doc-2017.tar.xz mirror://gentoo/texlive-module-lua-check-hyphen.doc-2017.tar.xz mirror://gentoo/texlive-module-lua-visual-debug.doc-2017.tar.xz mirror://gentoo/texlive-module-lua2dox.doc-2017.tar.xz mirror://gentoo/texlive-module-luabibentry.doc-2017.tar.xz mirror://gentoo/texlive-module-luabidi.doc-2017.tar.xz mirror://gentoo/texlive-module-luacode.doc-2017.tar.xz mirror://gentoo/texlive-module-luahyphenrules.doc-2017.tar.xz mirror://gentoo/texlive-module-luaindex.doc-2017.tar.xz mirror://gentoo/texlive-module-luainputenc.doc-2017.tar.xz mirror://gentoo/texlive-module-luaintro.doc-2017.tar.xz mirror://gentoo/texlive-module-lualatex-doc.doc-2017.tar.xz mirror://gentoo/texlive-module-lualatex-math.doc-2017.tar.xz mirror://gentoo/texlive-module-lualibs.doc-2017.tar.xz mirror://gentoo/texlive-module-luamplib.doc-2017.tar.xz mirror://gentoo/texlive-module-luaotfload.doc-2017.tar.xz mirror://gentoo/texlive-module-luasseq.doc-2017.tar.xz mirror://gentoo/texlive-module-luatex85.doc-2017.tar.xz mirror://gentoo/texlive-module-luatexbase.doc-2017.tar.xz mirror://gentoo/texlive-module-luatexko.doc-2017.tar.xz mirror://gentoo/texlive-module-luatextra.doc-2017.tar.xz mirror://gentoo/texlive-module-luatodonotes.doc-2017.tar.xz mirror://gentoo/texlive-module-luaxml.doc-2017.tar.xz mirror://gentoo/texlive-module-nodetree.doc-2017.tar.xz mirror://gentoo/texlive-module-odsfile.doc-2017.tar.xz mirror://gentoo/texlive-module-placeat.doc-2017.tar.xz mirror://gentoo/texlive-module-selnolig.doc-2017.tar.xz mirror://gentoo/texlive-module-showhyphens.doc-2017.tar.xz mirror://gentoo/texlive-module-spelling.doc-2017.tar.xz mirror://gentoo/texlive-module-ucharcat.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-chickenize.source-2017.tar.xz mirror://gentoo/texlive-module-cloze.source-2017.tar.xz mirror://gentoo/texlive-module-ctablestack.source-2017.tar.xz mirror://gentoo/texlive-module-luabibentry.source-2017.tar.xz mirror://gentoo/texlive-module-luacode.source-2017.tar.xz mirror://gentoo/texlive-module-luaindex.source-2017.tar.xz mirror://gentoo/texlive-module-luainputenc.source-2017.tar.xz mirror://gentoo/texlive-module-lualatex-doc.source-2017.tar.xz mirror://gentoo/texlive-module-lualatex-math.source-2017.tar.xz mirror://gentoo/texlive-module-lualibs.source-2017.tar.xz mirror://gentoo/texlive-module-luamplib.source-2017.tar.xz mirror://gentoo/texlive-module-luaotfload.source-2017.tar.xz mirror://gentoo/texlive-module-luasseq.source-2017.tar.xz mirror://gentoo/texlive-module-luatex85.source-2017.tar.xz mirror://gentoo/texlive-module-luatexbase.source-2017.tar.xz mirror://gentoo/texlive-module-luatextra.source-2017.tar.xz mirror://gentoo/texlive-module-luatodonotes.source-2017.tar.xz mirror://gentoo/texlive-module-nodetree.source-2017.tar.xz mirror://gentoo/texlive-module-placeat.source-2017.tar.xz mirror://gentoo/texlive-module-ucharcat.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d65ac32dca5a5de36d3021bd205ec9c0
+_md5_=003084b91cd2e8e73c67c2b11808f574
diff --git a/metadata/md5-cache/dev-texlive/texlive-mathscience-2017 b/metadata/md5-cache/dev-texlive/texlive-mathscience-2017
index 3b2690112fd6..b8e8b47e0567 100644
--- a/metadata/md5-cache/dev-texlive/texlive-mathscience-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-mathscience-2017
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive Mathematics and science packages
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-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 ~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 ~x64-solaris ~x86-solaris
 LICENSE=BSD BSD-2 GPL-1 GPL-2 GPL-3 LGPL-2 LPPL-1.2 LPPL-1.3 MIT public-domain TeX TeX-other-free
 RDEPEND=>=dev-texlive/texlive-fontsrecommended-2017 >=dev-texlive/texlive-latex-2017 !<dev-texlive/texlive-latexextra-2017 !dev-tex/SIunits !dev-texlive/texlive-mathextra !dev-texlive/texlive-science dev-texlive/texlive-pstricks >=app-text/texlive-core-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-12many-2017.tar.xz mirror://gentoo/texlive-module-SIstyle-2017.tar.xz mirror://gentoo/texlive-module-SIunits-2017.tar.xz mirror://gentoo/texlive-module-alg-2017.tar.xz mirror://gentoo/texlive-module-algorithm2e-2017.tar.xz mirror://gentoo/texlive-module-algorithmicx-2017.tar.xz mirror://gentoo/texlive-module-algorithms-2017.tar.xz mirror://gentoo/texlive-module-amstex-2017.tar.xz mirror://gentoo/texlive-module-apxproof-2017.tar.xz mirror://gentoo/texlive-module-autobreak-2017.tar.xz mirror://gentoo/texlive-module-axodraw2-2017.tar.xz mirror://gentoo/texlive-module-backnaur-2017.tar.xz mirror://gentoo/texlive-module-begriff-2017.tar.xz mirror://gentoo/texlive-module-binomexp-2017.tar.xz mirror://gentoo/texlive-module-biocon-2017.tar.xz mirror://gentoo/texlive-module-bitpattern-2017.tar.xz mirror://gentoo/texlive-module-bohr-2017.tar.xz mirror://gentoo/texlive-module-boldtensors-2017.tar.xz mirror://gentoo/texlive-module-bosisio-2017.tar.xz mirror://gentoo/texlive-module-bpchem-2017.tar.xz mirror://gentoo/texlive-module-bropd-2017.tar.xz mirror://gentoo/texlive-module-bytefield-2017.tar.xz mirror://gentoo/texlive-module-calculation-2017.tar.xz mirror://gentoo/texlive-module-ccfonts-2017.tar.xz mirror://gentoo/texlive-module-chemarrow-2017.tar.xz mirror://gentoo/texlive-module-chemcompounds-2017.tar.xz mirror://gentoo/texlive-module-chemcono-2017.tar.xz mirror://gentoo/texlive-module-chemexec-2017.tar.xz mirror://gentoo/texlive-module-chemformula-2017.tar.xz mirror://gentoo/texlive-module-chemgreek-2017.tar.xz mirror://gentoo/texlive-module-chemmacros-2017.tar.xz mirror://gentoo/texlive-module-chemnum-2017.tar.xz mirror://gentoo/texlive-module-chemschemex-2017.tar.xz mirror://gentoo/texlive-module-chemstyle-2017.tar.xz mirror://gentoo/texlive-module-clrscode-2017.tar.xz mirror://gentoo/texlive-module-clrscode3e-2017.tar.xz mirror://gentoo/texlive-module-commath-2017.tar.xz mirror://gentoo/texlive-module-complexity-2017.tar.xz mirror://gentoo/texlive-module-computational-complexity-2017.tar.xz mirror://gentoo/texlive-module-concmath-2017.tar.xz mirror://gentoo/texlive-module-concrete-2017.tar.xz mirror://gentoo/texlive-module-conteq-2017.tar.xz mirror://gentoo/texlive-module-correctmathalign-2017.tar.xz mirror://gentoo/texlive-module-cryptocode-2017.tar.xz mirror://gentoo/texlive-module-delim-2017.tar.xz mirror://gentoo/texlive-module-delimset-2017.tar.xz mirror://gentoo/texlive-module-delimseasy-2017.tar.xz mirror://gentoo/texlive-module-diffcoeff-2017.tar.xz mirror://gentoo/texlive-module-digiconfigs-2017.tar.xz mirror://gentoo/texlive-module-drawmatrix-2017.tar.xz mirror://gentoo/texlive-module-drawstack-2017.tar.xz mirror://gentoo/texlive-module-dyntree-2017.tar.xz mirror://gentoo/texlive-module-ebproof-2017.tar.xz mirror://gentoo/texlive-module-econometrics-2017.tar.xz mirror://gentoo/texlive-module-eltex-2017.tar.xz mirror://gentoo/texlive-module-emf-2017.tar.xz mirror://gentoo/texlive-module-endiagram-2017.tar.xz mirror://gentoo/texlive-module-engtlc-2017.tar.xz mirror://gentoo/texlive-module-eqnarray-2017.tar.xz mirror://gentoo/texlive-module-extarrows-2017.tar.xz mirror://gentoo/texlive-module-extpfeil-2017.tar.xz mirror://gentoo/texlive-module-faktor-2017.tar.xz mirror://gentoo/texlive-module-fnspe-2017.tar.xz mirror://gentoo/texlive-module-fouridx-2017.tar.xz mirror://gentoo/texlive-module-functan-2017.tar.xz mirror://gentoo/texlive-module-galois-2017.tar.xz mirror://gentoo/texlive-module-gastex-2017.tar.xz mirror://gentoo/texlive-module-gene-logic-2017.tar.xz mirror://gentoo/texlive-module-ghsystem-2017.tar.xz mirror://gentoo/texlive-module-gotoh-2017.tar.xz mirror://gentoo/texlive-module-grundgesetze-2017.tar.xz mirror://gentoo/texlive-module-gu-2017.tar.xz mirror://gentoo/texlive-module-hep-2017.tar.xz mirror://gentoo/texlive-module-hepnames-2017.tar.xz mirror://gentoo/texlive-module-hepparticles-2017.tar.xz mirror://gentoo/texlive-module-hepthesis-2017.tar.xz mirror://gentoo/texlive-module-hepunits-2017.tar.xz mirror://gentoo/texlive-module-interval-2017.tar.xz mirror://gentoo/texlive-module-ionumbers-2017.tar.xz mirror://gentoo/texlive-module-isomath-2017.tar.xz mirror://gentoo/texlive-module-karnaugh-2017.tar.xz mirror://gentoo/texlive-module-karnaugh-map-2017.tar.xz mirror://gentoo/texlive-module-karnaughmap-2017.tar.xz mirror://gentoo/texlive-module-logicproof-2017.tar.xz mirror://gentoo/texlive-module-longdivision-2017.tar.xz mirror://gentoo/texlive-module-lpform-2017.tar.xz mirror://gentoo/texlive-module-lplfitch-2017.tar.xz mirror://gentoo/texlive-module-lstbayes-2017.tar.xz mirror://gentoo/texlive-module-mathcomp-2017.tar.xz mirror://gentoo/texlive-module-mathpartir-2017.tar.xz mirror://gentoo/texlive-module-mathpunctspace-2017.tar.xz mirror://gentoo/texlive-module-matlab-prettifier-2017.tar.xz mirror://gentoo/texlive-module-mattens-2017.tar.xz mirror://gentoo/texlive-module-mgltex-2017.tar.xz mirror://gentoo/texlive-module-mhchem-2017.tar.xz mirror://gentoo/texlive-module-mhequ-2017.tar.xz mirror://gentoo/texlive-module-miller-2017.tar.xz mirror://gentoo/texlive-module-multiobjective-2017.tar.xz mirror://gentoo/texlive-module-mychemistry-2017.tar.xz mirror://gentoo/texlive-module-natded-2017.tar.xz mirror://gentoo/texlive-module-nath-2017.tar.xz mirror://gentoo/texlive-module-nuc-2017.tar.xz mirror://gentoo/texlive-module-nucleardata-2017.tar.xz mirror://gentoo/texlive-module-objectz-2017.tar.xz mirror://gentoo/texlive-module-oplotsymbl-2017.tar.xz mirror://gentoo/texlive-module-ot-tableau-2017.tar.xz mirror://gentoo/texlive-module-oubraces-2017.tar.xz mirror://gentoo/texlive-module-perfectcut-2017.tar.xz mirror://gentoo/texlive-module-physics-2017.tar.xz mirror://gentoo/texlive-module-prftree-2017.tar.xz mirror://gentoo/texlive-module-proba-2017.tar.xz mirror://gentoo/texlive-module-prooftrees-2017.tar.xz mirror://gentoo/texlive-module-pseudocode-2017.tar.xz mirror://gentoo/texlive-module-pygmentex-2017.tar.xz mirror://gentoo/texlive-module-pythonhighlight-2017.tar.xz mirror://gentoo/texlive-module-rec-thy-2017.tar.xz mirror://gentoo/texlive-module-revquantum-2017.tar.xz mirror://gentoo/texlive-module-ribbonproofs-2017.tar.xz mirror://gentoo/texlive-module-rmathbr-2017.tar.xz mirror://gentoo/texlive-module-sasnrdisplay-2017.tar.xz mirror://gentoo/texlive-module-sciposter-2017.tar.xz mirror://gentoo/texlive-module-sclang-prettifier-2017.tar.xz mirror://gentoo/texlive-module-sesamanuel-2017.tar.xz mirror://gentoo/texlive-module-sfg-2017.tar.xz mirror://gentoo/texlive-module-shuffle-2017.tar.xz mirror://gentoo/texlive-module-simpler-wick-2017.tar.xz mirror://gentoo/texlive-module-simplewick-2017.tar.xz mirror://gentoo/texlive-module-siunitx-2017.tar.xz mirror://gentoo/texlive-module-skmath-2017.tar.xz mirror://gentoo/texlive-module-spalign-2017.tar.xz mirror://gentoo/texlive-module-stanli-2017.tar.xz mirror://gentoo/texlive-module-statex-2017.tar.xz mirror://gentoo/texlive-module-statex2-2017.tar.xz mirror://gentoo/texlive-module-steinmetz-2017.tar.xz mirror://gentoo/texlive-module-stmaryrd-2017.tar.xz mirror://gentoo/texlive-module-struktex-2017.tar.xz mirror://gentoo/texlive-module-substances-2017.tar.xz mirror://gentoo/texlive-module-subsupscripts-2017.tar.xz mirror://gentoo/texlive-module-susy-2017.tar.xz mirror://gentoo/texlive-module-syllogism-2017.tar.xz mirror://gentoo/texlive-module-sympytexpackage-2017.tar.xz mirror://gentoo/texlive-module-synproof-2017.tar.xz mirror://gentoo/texlive-module-t-angles-2017.tar.xz mirror://gentoo/texlive-module-tablor-2017.tar.xz mirror://gentoo/texlive-module-tensor-2017.tar.xz mirror://gentoo/texlive-module-tex-ewd-2017.tar.xz mirror://gentoo/texlive-module-textgreek-2017.tar.xz mirror://gentoo/texlive-module-textopo-2017.tar.xz mirror://gentoo/texlive-module-thmbox-2017.tar.xz mirror://gentoo/texlive-module-turnstile-2017.tar.xz mirror://gentoo/texlive-module-ulqda-2017.tar.xz mirror://gentoo/texlive-module-unitsdef-2017.tar.xz mirror://gentoo/texlive-module-venn-2017.tar.xz mirror://gentoo/texlive-module-xymtex-2017.tar.xz mirror://gentoo/texlive-module-yhmath-2017.tar.xz mirror://gentoo/texlive-module-youngtab-2017.tar.xz mirror://gentoo/texlive-module-ytableau-2017.tar.xz mirror://gentoo/texlive-module-collection-mathscience-2017.tar.xz doc? ( mirror://gentoo/texlive-module-12many.doc-2017.tar.xz mirror://gentoo/texlive-module-SIstyle.doc-2017.tar.xz mirror://gentoo/texlive-module-SIunits.doc-2017.tar.xz mirror://gentoo/texlive-module-alg.doc-2017.tar.xz mirror://gentoo/texlive-module-algorithm2e.doc-2017.tar.xz mirror://gentoo/texlive-module-algorithmicx.doc-2017.tar.xz mirror://gentoo/texlive-module-algorithms.doc-2017.tar.xz mirror://gentoo/texlive-module-amstex.doc-2017.tar.xz mirror://gentoo/texlive-module-apxproof.doc-2017.tar.xz mirror://gentoo/texlive-module-autobreak.doc-2017.tar.xz mirror://gentoo/texlive-module-axodraw2.doc-2017.tar.xz mirror://gentoo/texlive-module-backnaur.doc-2017.tar.xz mirror://gentoo/texlive-module-begriff.doc-2017.tar.xz mirror://gentoo/texlive-module-binomexp.doc-2017.tar.xz mirror://gentoo/texlive-module-biocon.doc-2017.tar.xz mirror://gentoo/texlive-module-bitpattern.doc-2017.tar.xz mirror://gentoo/texlive-module-bohr.doc-2017.tar.xz mirror://gentoo/texlive-module-boldtensors.doc-2017.tar.xz mirror://gentoo/texlive-module-bosisio.doc-2017.tar.xz mirror://gentoo/texlive-module-bpchem.doc-2017.tar.xz mirror://gentoo/texlive-module-bropd.doc-2017.tar.xz mirror://gentoo/texlive-module-bytefield.doc-2017.tar.xz mirror://gentoo/texlive-module-calculation.doc-2017.tar.xz mirror://gentoo/texlive-module-ccfonts.doc-2017.tar.xz mirror://gentoo/texlive-module-chemarrow.doc-2017.tar.xz mirror://gentoo/texlive-module-chemcompounds.doc-2017.tar.xz mirror://gentoo/texlive-module-chemcono.doc-2017.tar.xz mirror://gentoo/texlive-module-chemexec.doc-2017.tar.xz mirror://gentoo/texlive-module-chemformula.doc-2017.tar.xz mirror://gentoo/texlive-module-chemgreek.doc-2017.tar.xz mirror://gentoo/texlive-module-chemmacros.doc-2017.tar.xz mirror://gentoo/texlive-module-chemnum.doc-2017.tar.xz mirror://gentoo/texlive-module-chemschemex.doc-2017.tar.xz mirror://gentoo/texlive-module-chemstyle.doc-2017.tar.xz mirror://gentoo/texlive-module-clrscode.doc-2017.tar.xz mirror://gentoo/texlive-module-clrscode3e.doc-2017.tar.xz mirror://gentoo/texlive-module-commath.doc-2017.tar.xz mirror://gentoo/texlive-module-complexity.doc-2017.tar.xz mirror://gentoo/texlive-module-computational-complexity.doc-2017.tar.xz mirror://gentoo/texlive-module-concmath.doc-2017.tar.xz mirror://gentoo/texlive-module-concrete.doc-2017.tar.xz mirror://gentoo/texlive-module-conteq.doc-2017.tar.xz mirror://gentoo/texlive-module-correctmathalign.doc-2017.tar.xz mirror://gentoo/texlive-module-cryptocode.doc-2017.tar.xz mirror://gentoo/texlive-module-delim.doc-2017.tar.xz mirror://gentoo/texlive-module-delimset.doc-2017.tar.xz mirror://gentoo/texlive-module-delimseasy.doc-2017.tar.xz mirror://gentoo/texlive-module-diffcoeff.doc-2017.tar.xz mirror://gentoo/texlive-module-digiconfigs.doc-2017.tar.xz mirror://gentoo/texlive-module-drawmatrix.doc-2017.tar.xz mirror://gentoo/texlive-module-drawstack.doc-2017.tar.xz mirror://gentoo/texlive-module-dyntree.doc-2017.tar.xz mirror://gentoo/texlive-module-ebproof.doc-2017.tar.xz mirror://gentoo/texlive-module-econometrics.doc-2017.tar.xz mirror://gentoo/texlive-module-eltex.doc-2017.tar.xz mirror://gentoo/texlive-module-emf.doc-2017.tar.xz mirror://gentoo/texlive-module-endiagram.doc-2017.tar.xz mirror://gentoo/texlive-module-engtlc.doc-2017.tar.xz mirror://gentoo/texlive-module-eqnarray.doc-2017.tar.xz mirror://gentoo/texlive-module-extarrows.doc-2017.tar.xz mirror://gentoo/texlive-module-extpfeil.doc-2017.tar.xz mirror://gentoo/texlive-module-faktor.doc-2017.tar.xz mirror://gentoo/texlive-module-fnspe.doc-2017.tar.xz mirror://gentoo/texlive-module-fouridx.doc-2017.tar.xz mirror://gentoo/texlive-module-functan.doc-2017.tar.xz mirror://gentoo/texlive-module-galois.doc-2017.tar.xz mirror://gentoo/texlive-module-gastex.doc-2017.tar.xz mirror://gentoo/texlive-module-gene-logic.doc-2017.tar.xz mirror://gentoo/texlive-module-ghsystem.doc-2017.tar.xz mirror://gentoo/texlive-module-gotoh.doc-2017.tar.xz mirror://gentoo/texlive-module-grundgesetze.doc-2017.tar.xz mirror://gentoo/texlive-module-gu.doc-2017.tar.xz mirror://gentoo/texlive-module-hep.doc-2017.tar.xz mirror://gentoo/texlive-module-hepnames.doc-2017.tar.xz mirror://gentoo/texlive-module-hepparticles.doc-2017.tar.xz mirror://gentoo/texlive-module-hepthesis.doc-2017.tar.xz mirror://gentoo/texlive-module-hepunits.doc-2017.tar.xz mirror://gentoo/texlive-module-interval.doc-2017.tar.xz mirror://gentoo/texlive-module-ionumbers.doc-2017.tar.xz mirror://gentoo/texlive-module-isomath.doc-2017.tar.xz mirror://gentoo/texlive-module-karnaugh.doc-2017.tar.xz mirror://gentoo/texlive-module-karnaugh-map.doc-2017.tar.xz mirror://gentoo/texlive-module-karnaughmap.doc-2017.tar.xz mirror://gentoo/texlive-module-logicproof.doc-2017.tar.xz mirror://gentoo/texlive-module-longdivision.doc-2017.tar.xz mirror://gentoo/texlive-module-lpform.doc-2017.tar.xz mirror://gentoo/texlive-module-lplfitch.doc-2017.tar.xz mirror://gentoo/texlive-module-lstbayes.doc-2017.tar.xz mirror://gentoo/texlive-module-mathcomp.doc-2017.tar.xz mirror://gentoo/texlive-module-mathpartir.doc-2017.tar.xz mirror://gentoo/texlive-module-mathpunctspace.doc-2017.tar.xz mirror://gentoo/texlive-module-matlab-prettifier.doc-2017.tar.xz mirror://gentoo/texlive-module-mattens.doc-2017.tar.xz mirror://gentoo/texlive-module-mgltex.doc-2017.tar.xz mirror://gentoo/texlive-module-mhchem.doc-2017.tar.xz mirror://gentoo/texlive-module-mhequ.doc-2017.tar.xz mirror://gentoo/texlive-module-miller.doc-2017.tar.xz mirror://gentoo/texlive-module-multiobjective.doc-2017.tar.xz mirror://gentoo/texlive-module-mychemistry.doc-2017.tar.xz mirror://gentoo/texlive-module-natded.doc-2017.tar.xz mirror://gentoo/texlive-module-nath.doc-2017.tar.xz mirror://gentoo/texlive-module-nuc.doc-2017.tar.xz mirror://gentoo/texlive-module-nucleardata.doc-2017.tar.xz mirror://gentoo/texlive-module-objectz.doc-2017.tar.xz mirror://gentoo/texlive-module-oplotsymbl.doc-2017.tar.xz mirror://gentoo/texlive-module-ot-tableau.doc-2017.tar.xz mirror://gentoo/texlive-module-oubraces.doc-2017.tar.xz mirror://gentoo/texlive-module-perfectcut.doc-2017.tar.xz mirror://gentoo/texlive-module-physics.doc-2017.tar.xz mirror://gentoo/texlive-module-prftree.doc-2017.tar.xz mirror://gentoo/texlive-module-proba.doc-2017.tar.xz mirror://gentoo/texlive-module-prooftrees.doc-2017.tar.xz mirror://gentoo/texlive-module-pseudocode.doc-2017.tar.xz mirror://gentoo/texlive-module-pygmentex.doc-2017.tar.xz mirror://gentoo/texlive-module-pythonhighlight.doc-2017.tar.xz mirror://gentoo/texlive-module-rec-thy.doc-2017.tar.xz mirror://gentoo/texlive-module-revquantum.doc-2017.tar.xz mirror://gentoo/texlive-module-ribbonproofs.doc-2017.tar.xz mirror://gentoo/texlive-module-rmathbr.doc-2017.tar.xz mirror://gentoo/texlive-module-sasnrdisplay.doc-2017.tar.xz mirror://gentoo/texlive-module-sciposter.doc-2017.tar.xz mirror://gentoo/texlive-module-sclang-prettifier.doc-2017.tar.xz mirror://gentoo/texlive-module-sesamanuel.doc-2017.tar.xz mirror://gentoo/texlive-module-sfg.doc-2017.tar.xz mirror://gentoo/texlive-module-shuffle.doc-2017.tar.xz mirror://gentoo/texlive-module-simpler-wick.doc-2017.tar.xz mirror://gentoo/texlive-module-simplewick.doc-2017.tar.xz mirror://gentoo/texlive-module-siunitx.doc-2017.tar.xz mirror://gentoo/texlive-module-skmath.doc-2017.tar.xz mirror://gentoo/texlive-module-spalign.doc-2017.tar.xz mirror://gentoo/texlive-module-stanli.doc-2017.tar.xz mirror://gentoo/texlive-module-statex.doc-2017.tar.xz mirror://gentoo/texlive-module-statex2.doc-2017.tar.xz mirror://gentoo/texlive-module-steinmetz.doc-2017.tar.xz mirror://gentoo/texlive-module-stmaryrd.doc-2017.tar.xz mirror://gentoo/texlive-module-struktex.doc-2017.tar.xz mirror://gentoo/texlive-module-substances.doc-2017.tar.xz mirror://gentoo/texlive-module-subsupscripts.doc-2017.tar.xz mirror://gentoo/texlive-module-susy.doc-2017.tar.xz mirror://gentoo/texlive-module-syllogism.doc-2017.tar.xz mirror://gentoo/texlive-module-sympytexpackage.doc-2017.tar.xz mirror://gentoo/texlive-module-synproof.doc-2017.tar.xz mirror://gentoo/texlive-module-t-angles.doc-2017.tar.xz mirror://gentoo/texlive-module-tablor.doc-2017.tar.xz mirror://gentoo/texlive-module-tensor.doc-2017.tar.xz mirror://gentoo/texlive-module-tex-ewd.doc-2017.tar.xz mirror://gentoo/texlive-module-textgreek.doc-2017.tar.xz mirror://gentoo/texlive-module-textopo.doc-2017.tar.xz mirror://gentoo/texlive-module-thmbox.doc-2017.tar.xz mirror://gentoo/texlive-module-turnstile.doc-2017.tar.xz mirror://gentoo/texlive-module-ulqda.doc-2017.tar.xz mirror://gentoo/texlive-module-unitsdef.doc-2017.tar.xz mirror://gentoo/texlive-module-venn.doc-2017.tar.xz mirror://gentoo/texlive-module-xymtex.doc-2017.tar.xz mirror://gentoo/texlive-module-yhmath.doc-2017.tar.xz mirror://gentoo/texlive-module-youngtab.doc-2017.tar.xz mirror://gentoo/texlive-module-ytableau.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-12many.source-2017.tar.xz mirror://gentoo/texlive-module-SIstyle.source-2017.tar.xz mirror://gentoo/texlive-module-SIunits.source-2017.tar.xz mirror://gentoo/texlive-module-alg.source-2017.tar.xz mirror://gentoo/texlive-module-algorithms.source-2017.tar.xz mirror://gentoo/texlive-module-apxproof.source-2017.tar.xz mirror://gentoo/texlive-module-autobreak.source-2017.tar.xz mirror://gentoo/texlive-module-axodraw2.source-2017.tar.xz mirror://gentoo/texlive-module-backnaur.source-2017.tar.xz mirror://gentoo/texlive-module-binomexp.source-2017.tar.xz mirror://gentoo/texlive-module-bitpattern.source-2017.tar.xz mirror://gentoo/texlive-module-bosisio.source-2017.tar.xz mirror://gentoo/texlive-module-bpchem.source-2017.tar.xz mirror://gentoo/texlive-module-bropd.source-2017.tar.xz mirror://gentoo/texlive-module-bytefield.source-2017.tar.xz mirror://gentoo/texlive-module-calculation.source-2017.tar.xz mirror://gentoo/texlive-module-ccfonts.source-2017.tar.xz mirror://gentoo/texlive-module-chemarrow.source-2017.tar.xz mirror://gentoo/texlive-module-chemcompounds.source-2017.tar.xz mirror://gentoo/texlive-module-chemschemex.source-2017.tar.xz mirror://gentoo/texlive-module-chemstyle.source-2017.tar.xz mirror://gentoo/texlive-module-computational-complexity.source-2017.tar.xz mirror://gentoo/texlive-module-concmath.source-2017.tar.xz mirror://gentoo/texlive-module-conteq.source-2017.tar.xz mirror://gentoo/texlive-module-delim.source-2017.tar.xz mirror://gentoo/texlive-module-delimset.source-2017.tar.xz mirror://gentoo/texlive-module-drawmatrix.source-2017.tar.xz mirror://gentoo/texlive-module-dyntree.source-2017.tar.xz mirror://gentoo/texlive-module-eqnarray.source-2017.tar.xz mirror://gentoo/texlive-module-extpfeil.source-2017.tar.xz mirror://gentoo/texlive-module-faktor.source-2017.tar.xz mirror://gentoo/texlive-module-fouridx.source-2017.tar.xz mirror://gentoo/texlive-module-functan.source-2017.tar.xz mirror://gentoo/texlive-module-galois.source-2017.tar.xz mirror://gentoo/texlive-module-gotoh.source-2017.tar.xz mirror://gentoo/texlive-module-grundgesetze.source-2017.tar.xz mirror://gentoo/texlive-module-ionumbers.source-2017.tar.xz mirror://gentoo/texlive-module-karnaugh-map.source-2017.tar.xz mirror://gentoo/texlive-module-karnaughmap.source-2017.tar.xz mirror://gentoo/texlive-module-logicproof.source-2017.tar.xz mirror://gentoo/texlive-module-lplfitch.source-2017.tar.xz mirror://gentoo/texlive-module-lstbayes.source-2017.tar.xz mirror://gentoo/texlive-module-mathcomp.source-2017.tar.xz mirror://gentoo/texlive-module-mathpartir.source-2017.tar.xz mirror://gentoo/texlive-module-matlab-prettifier.source-2017.tar.xz mirror://gentoo/texlive-module-mattens.source-2017.tar.xz mirror://gentoo/texlive-module-mgltex.source-2017.tar.xz mirror://gentoo/texlive-module-miller.source-2017.tar.xz mirror://gentoo/texlive-module-multiobjective.source-2017.tar.xz mirror://gentoo/texlive-module-nucleardata.source-2017.tar.xz mirror://gentoo/texlive-module-objectz.source-2017.tar.xz mirror://gentoo/texlive-module-proba.source-2017.tar.xz mirror://gentoo/texlive-module-revquantum.source-2017.tar.xz mirror://gentoo/texlive-module-rmathbr.source-2017.tar.xz mirror://gentoo/texlive-module-sclang-prettifier.source-2017.tar.xz mirror://gentoo/texlive-module-sesamanuel.source-2017.tar.xz mirror://gentoo/texlive-module-shuffle.source-2017.tar.xz mirror://gentoo/texlive-module-simplewick.source-2017.tar.xz mirror://gentoo/texlive-module-siunitx.source-2017.tar.xz mirror://gentoo/texlive-module-skmath.source-2017.tar.xz mirror://gentoo/texlive-module-spalign.source-2017.tar.xz mirror://gentoo/texlive-module-steinmetz.source-2017.tar.xz mirror://gentoo/texlive-module-stmaryrd.source-2017.tar.xz mirror://gentoo/texlive-module-struktex.source-2017.tar.xz mirror://gentoo/texlive-module-sympytexpackage.source-2017.tar.xz mirror://gentoo/texlive-module-tensor.source-2017.tar.xz mirror://gentoo/texlive-module-textgreek.source-2017.tar.xz mirror://gentoo/texlive-module-textopo.source-2017.tar.xz mirror://gentoo/texlive-module-thmbox.source-2017.tar.xz mirror://gentoo/texlive-module-turnstile.source-2017.tar.xz mirror://gentoo/texlive-module-ulqda.source-2017.tar.xz mirror://gentoo/texlive-module-unitsdef.source-2017.tar.xz mirror://gentoo/texlive-module-xymtex.source-2017.tar.xz mirror://gentoo/texlive-module-yhmath.source-2017.tar.xz mirror://gentoo/texlive-module-youngtab.source-2017.tar.xz mirror://gentoo/texlive-module-ytableau.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=fd21f1f68d1af4a0da23218ca39e97d9
+_md5_=43b647600c1c8e1fc2966b51e2906f78
diff --git a/metadata/md5-cache/dev-texlive/texlive-metapost-2017 b/metadata/md5-cache/dev-texlive/texlive-metapost-2017
index 95c5c8196578..7f3bf264214c 100644
--- a/metadata/md5-cache/dev-texlive/texlive-metapost-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-metapost-2017
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive MetaPost and Metafont packages
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-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 ~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 ~x64-solaris ~x86-solaris
 LICENSE=BSD GPL-1 GPL-2 LGPL-2 LPPL-1.3 public-domain TeX-other-free
 RDEPEND=>=dev-texlive/texlive-basic-2017 >=app-text/texlive-core-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-automata-2017.tar.xz mirror://gentoo/texlive-module-bbcard-2017.tar.xz mirror://gentoo/texlive-module-blockdraw_mp-2017.tar.xz mirror://gentoo/texlive-module-bpolynomial-2017.tar.xz mirror://gentoo/texlive-module-cmarrows-2017.tar.xz mirror://gentoo/texlive-module-drv-2017.tar.xz mirror://gentoo/texlive-module-dviincl-2017.tar.xz mirror://gentoo/texlive-module-emp-2017.tar.xz mirror://gentoo/texlive-module-epsincl-2017.tar.xz mirror://gentoo/texlive-module-expressg-2017.tar.xz mirror://gentoo/texlive-module-exteps-2017.tar.xz mirror://gentoo/texlive-module-featpost-2017.tar.xz mirror://gentoo/texlive-module-feynmp-auto-2017.tar.xz mirror://gentoo/texlive-module-garrigues-2017.tar.xz mirror://gentoo/texlive-module-gmp-2017.tar.xz mirror://gentoo/texlive-module-hatching-2017.tar.xz mirror://gentoo/texlive-module-latexmp-2017.tar.xz mirror://gentoo/texlive-module-mcf2graph-2017.tar.xz mirror://gentoo/texlive-module-metago-2017.tar.xz mirror://gentoo/texlive-module-metaobj-2017.tar.xz mirror://gentoo/texlive-module-metaplot-2017.tar.xz mirror://gentoo/texlive-module-metapost-2017.tar.xz mirror://gentoo/texlive-module-metauml-2017.tar.xz mirror://gentoo/texlive-module-mfpic-2017.tar.xz mirror://gentoo/texlive-module-mfpic4ode-2017.tar.xz mirror://gentoo/texlive-module-mp3d-2017.tar.xz mirror://gentoo/texlive-module-mparrows-2017.tar.xz mirror://gentoo/texlive-module-mpattern-2017.tar.xz mirror://gentoo/texlive-module-mpcolornames-2017.tar.xz mirror://gentoo/texlive-module-mpgraphics-2017.tar.xz mirror://gentoo/texlive-module-mptrees-2017.tar.xz mirror://gentoo/texlive-module-piechartmp-2017.tar.xz mirror://gentoo/texlive-module-repere-2017.tar.xz mirror://gentoo/texlive-module-roex-2017.tar.xz mirror://gentoo/texlive-module-roundrect-2017.tar.xz mirror://gentoo/texlive-module-shapes-2017.tar.xz mirror://gentoo/texlive-module-slideshow-2017.tar.xz mirror://gentoo/texlive-module-splines-2017.tar.xz mirror://gentoo/texlive-module-suanpan-2017.tar.xz mirror://gentoo/texlive-module-textpath-2017.tar.xz mirror://gentoo/texlive-module-threeddice-2017.tar.xz mirror://gentoo/texlive-module-collection-metapost-2017.tar.xz doc? ( mirror://gentoo/texlive-module-automata.doc-2017.tar.xz mirror://gentoo/texlive-module-bbcard.doc-2017.tar.xz mirror://gentoo/texlive-module-blockdraw_mp.doc-2017.tar.xz mirror://gentoo/texlive-module-bpolynomial.doc-2017.tar.xz mirror://gentoo/texlive-module-cmarrows.doc-2017.tar.xz mirror://gentoo/texlive-module-drv.doc-2017.tar.xz mirror://gentoo/texlive-module-dviincl.doc-2017.tar.xz mirror://gentoo/texlive-module-emp.doc-2017.tar.xz mirror://gentoo/texlive-module-epsincl.doc-2017.tar.xz mirror://gentoo/texlive-module-expressg.doc-2017.tar.xz mirror://gentoo/texlive-module-exteps.doc-2017.tar.xz mirror://gentoo/texlive-module-featpost.doc-2017.tar.xz mirror://gentoo/texlive-module-feynmp-auto.doc-2017.tar.xz mirror://gentoo/texlive-module-garrigues.doc-2017.tar.xz mirror://gentoo/texlive-module-gmp.doc-2017.tar.xz mirror://gentoo/texlive-module-hatching.doc-2017.tar.xz mirror://gentoo/texlive-module-latexmp.doc-2017.tar.xz mirror://gentoo/texlive-module-mcf2graph.doc-2017.tar.xz mirror://gentoo/texlive-module-metago.doc-2017.tar.xz mirror://gentoo/texlive-module-metaobj.doc-2017.tar.xz mirror://gentoo/texlive-module-metaplot.doc-2017.tar.xz mirror://gentoo/texlive-module-metapost.doc-2017.tar.xz mirror://gentoo/texlive-module-metauml.doc-2017.tar.xz mirror://gentoo/texlive-module-mfpic.doc-2017.tar.xz mirror://gentoo/texlive-module-mfpic4ode.doc-2017.tar.xz mirror://gentoo/texlive-module-mp3d.doc-2017.tar.xz mirror://gentoo/texlive-module-mparrows.doc-2017.tar.xz mirror://gentoo/texlive-module-mpattern.doc-2017.tar.xz mirror://gentoo/texlive-module-mpcolornames.doc-2017.tar.xz mirror://gentoo/texlive-module-mpgraphics.doc-2017.tar.xz mirror://gentoo/texlive-module-mptrees.doc-2017.tar.xz mirror://gentoo/texlive-module-piechartmp.doc-2017.tar.xz mirror://gentoo/texlive-module-repere.doc-2017.tar.xz mirror://gentoo/texlive-module-roundrect.doc-2017.tar.xz mirror://gentoo/texlive-module-shapes.doc-2017.tar.xz mirror://gentoo/texlive-module-slideshow.doc-2017.tar.xz mirror://gentoo/texlive-module-splines.doc-2017.tar.xz mirror://gentoo/texlive-module-suanpan.doc-2017.tar.xz mirror://gentoo/texlive-module-textpath.doc-2017.tar.xz mirror://gentoo/texlive-module-threeddice.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-emp.source-2017.tar.xz mirror://gentoo/texlive-module-expressg.source-2017.tar.xz mirror://gentoo/texlive-module-feynmp-auto.source-2017.tar.xz mirror://gentoo/texlive-module-gmp.source-2017.tar.xz mirror://gentoo/texlive-module-mfpic.source-2017.tar.xz mirror://gentoo/texlive-module-mfpic4ode.source-2017.tar.xz mirror://gentoo/texlive-module-mpcolornames.source-2017.tar.xz mirror://gentoo/texlive-module-mpgraphics.source-2017.tar.xz mirror://gentoo/texlive-module-roex.source-2017.tar.xz mirror://gentoo/texlive-module-roundrect.source-2017.tar.xz mirror://gentoo/texlive-module-shapes.source-2017.tar.xz mirror://gentoo/texlive-module-splines.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ab1947cb0c5a51978707a537156b7f09
+_md5_=49a2dcea1b6709ffa0eae79d40b90249
diff --git a/metadata/md5-cache/dev-texlive/texlive-music-2017 b/metadata/md5-cache/dev-texlive/texlive-music-2017
index 53d0f267ed50..2a87633c65f8 100644
--- a/metadata/md5-cache/dev-texlive/texlive-music-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-music-2017
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive Music packages
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-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 ~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 ~x64-solaris ~x86-solaris
 LICENSE=GPL-1 GPL-2 GPL-3 LGPL-2.1 LPPL-1.2 LPPL-1.3 MIT
 RDEPEND=>=dev-texlive/texlive-latex-2017 !<app-text/texlive-core-2011 !<dev-texlive/texlive-pictures-2015 !<dev-texlive/texlive-genericextra-2015 >=app-text/texlive-core-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-abc-2017.tar.xz mirror://gentoo/texlive-module-autosp-2017.tar.xz mirror://gentoo/texlive-module-bagpipe-2017.tar.xz mirror://gentoo/texlive-module-figbas-2017.tar.xz mirror://gentoo/texlive-module-gchords-2017.tar.xz mirror://gentoo/texlive-module-gregoriotex-2017.tar.xz mirror://gentoo/texlive-module-gtrcrd-2017.tar.xz mirror://gentoo/texlive-module-guitar-2017.tar.xz mirror://gentoo/texlive-module-guitarchordschemes-2017.tar.xz mirror://gentoo/texlive-module-harmony-2017.tar.xz mirror://gentoo/texlive-module-leadsheets-2017.tar.xz mirror://gentoo/texlive-module-lilyglyphs-2017.tar.xz mirror://gentoo/texlive-module-m-tx-2017.tar.xz mirror://gentoo/texlive-module-musixguit-2017.tar.xz mirror://gentoo/texlive-module-musixtex-2017.tar.xz mirror://gentoo/texlive-module-musixtex-fonts-2017.tar.xz mirror://gentoo/texlive-module-musixtnt-2017.tar.xz mirror://gentoo/texlive-module-piano-2017.tar.xz mirror://gentoo/texlive-module-pmx-2017.tar.xz mirror://gentoo/texlive-module-pmxchords-2017.tar.xz mirror://gentoo/texlive-module-songbook-2017.tar.xz mirror://gentoo/texlive-module-songs-2017.tar.xz mirror://gentoo/texlive-module-xpiano-2017.tar.xz mirror://gentoo/texlive-module-collection-music-2017.tar.xz doc? ( mirror://gentoo/texlive-module-abc.doc-2017.tar.xz mirror://gentoo/texlive-module-autosp.doc-2017.tar.xz mirror://gentoo/texlive-module-bagpipe.doc-2017.tar.xz mirror://gentoo/texlive-module-figbas.doc-2017.tar.xz mirror://gentoo/texlive-module-gchords.doc-2017.tar.xz mirror://gentoo/texlive-module-gregoriotex.doc-2017.tar.xz mirror://gentoo/texlive-module-gtrcrd.doc-2017.tar.xz mirror://gentoo/texlive-module-guitar.doc-2017.tar.xz mirror://gentoo/texlive-module-guitarchordschemes.doc-2017.tar.xz mirror://gentoo/texlive-module-harmony.doc-2017.tar.xz mirror://gentoo/texlive-module-leadsheets.doc-2017.tar.xz mirror://gentoo/texlive-module-lilyglyphs.doc-2017.tar.xz mirror://gentoo/texlive-module-m-tx.doc-2017.tar.xz mirror://gentoo/texlive-module-musixguit.doc-2017.tar.xz mirror://gentoo/texlive-module-musixtex.doc-2017.tar.xz mirror://gentoo/texlive-module-musixtex-fonts.doc-2017.tar.xz mirror://gentoo/texlive-module-musixtnt.doc-2017.tar.xz mirror://gentoo/texlive-module-piano.doc-2017.tar.xz mirror://gentoo/texlive-module-pmx.doc-2017.tar.xz mirror://gentoo/texlive-module-pmxchords.doc-2017.tar.xz mirror://gentoo/texlive-module-songbook.doc-2017.tar.xz mirror://gentoo/texlive-module-songs.doc-2017.tar.xz mirror://gentoo/texlive-module-xpiano.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-abc.source-2017.tar.xz mirror://gentoo/texlive-module-guitar.source-2017.tar.xz mirror://gentoo/texlive-module-lilyglyphs.source-2017.tar.xz mirror://gentoo/texlive-module-musixtex.source-2017.tar.xz mirror://gentoo/texlive-module-songbook.source-2017.tar.xz mirror://gentoo/texlive-module-songs.source-2017.tar.xz mirror://gentoo/texlive-module-xpiano.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2d910b951dda88a688f6348d87a2320f
+_md5_=366b83dcdfd7f05c688cfe20adb7a071
diff --git a/metadata/md5-cache/dev-texlive/texlive-pictures-2017 b/metadata/md5-cache/dev-texlive/texlive-pictures-2017
index a75fb9971f24..914d94f238f7 100644
--- a/metadata/md5-cache/dev-texlive/texlive-pictures-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-pictures-2017
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive Graphics, pictures, diagrams
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-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 ~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 ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0 BSD-2 GPL-1 GPL-2 GPL-3 LPPL-1.2 LPPL-1.3 LPPL-1.3c MIT public-domain TeX-other-free
 RDEPEND=>=dev-texlive/texlive-basic-2017 !<dev-texlive/texlive-latexextra-2009 !<dev-texlive/texlive-texinfo-2009 >=dev-tex/pgf-3.0.1 >=app-text/texlive-core-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-aobs-tikz-2017.tar.xz mirror://gentoo/texlive-module-askmaps-2017.tar.xz mirror://gentoo/texlive-module-asyfig-2017.tar.xz mirror://gentoo/texlive-module-asypictureb-2017.tar.xz mirror://gentoo/texlive-module-autoarea-2017.tar.xz mirror://gentoo/texlive-module-bardiag-2017.tar.xz mirror://gentoo/texlive-module-beamerswitch-2017.tar.xz mirror://gentoo/texlive-module-binarytree-2017.tar.xz mirror://gentoo/texlive-module-blochsphere-2017.tar.xz mirror://gentoo/texlive-module-bloques-2017.tar.xz mirror://gentoo/texlive-module-blox-2017.tar.xz mirror://gentoo/texlive-module-bodegraph-2017.tar.xz mirror://gentoo/texlive-module-bondgraph-2017.tar.xz mirror://gentoo/texlive-module-bondgraphs-2017.tar.xz mirror://gentoo/texlive-module-braids-2017.tar.xz mirror://gentoo/texlive-module-bxeepic-2017.tar.xz mirror://gentoo/texlive-module-cachepic-2017.tar.xz mirror://gentoo/texlive-module-callouts-2017.tar.xz mirror://gentoo/texlive-module-celtic-2017.tar.xz mirror://gentoo/texlive-module-chemfig-2017.tar.xz mirror://gentoo/texlive-module-combinedgraphics-2017.tar.xz mirror://gentoo/texlive-module-circuitikz-2017.tar.xz mirror://gentoo/texlive-module-curve-2017.tar.xz mirror://gentoo/texlive-module-curve2e-2017.tar.xz mirror://gentoo/texlive-module-curves-2017.tar.xz mirror://gentoo/texlive-module-dcpic-2017.tar.xz mirror://gentoo/texlive-module-diagmac2-2017.tar.xz mirror://gentoo/texlive-module-doc-pictex-2017.tar.xz mirror://gentoo/texlive-module-dottex-2017.tar.xz mirror://gentoo/texlive-module-dratex-2017.tar.xz mirror://gentoo/texlive-module-drs-2017.tar.xz mirror://gentoo/texlive-module-duotenzor-2017.tar.xz mirror://gentoo/texlive-module-ecgdraw-2017.tar.xz mirror://gentoo/texlive-module-eepic-2017.tar.xz mirror://gentoo/texlive-module-ellipse-2017.tar.xz mirror://gentoo/texlive-module-epspdfconversion-2017.tar.xz mirror://gentoo/texlive-module-esk-2017.tar.xz mirror://gentoo/texlive-module-fast-diagram-2017.tar.xz mirror://gentoo/texlive-module-fig4latex-2017.tar.xz mirror://gentoo/texlive-module-fitbox-2017.tar.xz mirror://gentoo/texlive-module-flowchart-2017.tar.xz mirror://gentoo/texlive-module-forest-2017.tar.xz mirror://gentoo/texlive-module-genealogytree-2017.tar.xz mirror://gentoo/texlive-module-getmap-2017.tar.xz mirror://gentoo/texlive-module-gincltex-2017.tar.xz mirror://gentoo/texlive-module-gnuplottex-2017.tar.xz mirror://gentoo/texlive-module-gradientframe-2017.tar.xz mirror://gentoo/texlive-module-grafcet-2017.tar.xz mirror://gentoo/texlive-module-graphviz-2017.tar.xz mirror://gentoo/texlive-module-gtrlib-largetrees-2017.tar.xz mirror://gentoo/texlive-module-harveyballs-2017.tar.xz mirror://gentoo/texlive-module-here-2017.tar.xz mirror://gentoo/texlive-module-hf-tikz-2017.tar.xz mirror://gentoo/texlive-module-hobby-2017.tar.xz mirror://gentoo/texlive-module-hvfloat-2017.tar.xz mirror://gentoo/texlive-module-knitting-2017.tar.xz mirror://gentoo/texlive-module-knittingpattern-2017.tar.xz mirror://gentoo/texlive-module-ladder-2017.tar.xz mirror://gentoo/texlive-module-lapdf-2017.tar.xz mirror://gentoo/texlive-module-latex-make-2017.tar.xz mirror://gentoo/texlive-module-lpic-2017.tar.xz mirror://gentoo/texlive-module-lroundrect-2017.tar.xz mirror://gentoo/texlive-module-luamesh-2017.tar.xz mirror://gentoo/texlive-module-makeshape-2017.tar.xz mirror://gentoo/texlive-module-mathspic-2017.tar.xz mirror://gentoo/texlive-module-miniplot-2017.tar.xz mirror://gentoo/texlive-module-mkpic-2017.tar.xz mirror://gentoo/texlive-module-modiagram-2017.tar.xz mirror://gentoo/texlive-module-neuralnetwork-2017.tar.xz mirror://gentoo/texlive-module-numericplots-2017.tar.xz mirror://gentoo/texlive-module-pb-diagram-2017.tar.xz mirror://gentoo/texlive-module-petri-nets-2017.tar.xz mirror://gentoo/texlive-module-pgf-blur-2017.tar.xz mirror://gentoo/texlive-module-pgf-soroban-2017.tar.xz mirror://gentoo/texlive-module-pgf-spectra-2017.tar.xz mirror://gentoo/texlive-module-pgf-umlcd-2017.tar.xz mirror://gentoo/texlive-module-pgf-umlsd-2017.tar.xz mirror://gentoo/texlive-module-pgfgantt-2017.tar.xz mirror://gentoo/texlive-module-pgfkeyx-2017.tar.xz mirror://gentoo/texlive-module-pgfmolbio-2017.tar.xz mirror://gentoo/texlive-module-pgfopts-2017.tar.xz mirror://gentoo/texlive-module-pgfornament-2017.tar.xz mirror://gentoo/texlive-module-pgfplots-2017.tar.xz mirror://gentoo/texlive-module-picinpar-2017.tar.xz mirror://gentoo/texlive-module-pict2e-2017.tar.xz mirror://gentoo/texlive-module-pictex-2017.tar.xz mirror://gentoo/texlive-module-pictex2-2017.tar.xz mirror://gentoo/texlive-module-pinlabel-2017.tar.xz mirror://gentoo/texlive-module-pmgraph-2017.tar.xz mirror://gentoo/texlive-module-prerex-2017.tar.xz mirror://gentoo/texlive-module-productbox-2017.tar.xz mirror://gentoo/texlive-module-pxpgfmark-2017.tar.xz mirror://gentoo/texlive-module-qcircuit-2017.tar.xz mirror://gentoo/texlive-module-qrcode-2017.tar.xz mirror://gentoo/texlive-module-randbild-2017.tar.xz mirror://gentoo/texlive-module-randomwalk-2017.tar.xz mirror://gentoo/texlive-module-reotex-2017.tar.xz mirror://gentoo/texlive-module-rviewport-2017.tar.xz mirror://gentoo/texlive-module-sa-tikz-2017.tar.xz mirror://gentoo/texlive-module-schemabloc-2017.tar.xz mirror://gentoo/texlive-module-scsnowman-2017.tar.xz mirror://gentoo/texlive-module-scratch-2017.tar.xz mirror://gentoo/texlive-module-setdeck-2017.tar.xz mirror://gentoo/texlive-module-signchart-2017.tar.xz mirror://gentoo/texlive-module-smartdiagram-2017.tar.xz mirror://gentoo/texlive-module-spath3-2017.tar.xz mirror://gentoo/texlive-module-swimgraf-2017.tar.xz mirror://gentoo/texlive-module-table-fct-2017.tar.xz mirror://gentoo/texlive-module-texdraw-2017.tar.xz mirror://gentoo/texlive-module-ticollege-2017.tar.xz mirror://gentoo/texlive-module-tipfr-2017.tar.xz mirror://gentoo/texlive-module-tikz-3dplot-2017.tar.xz mirror://gentoo/texlive-module-tikz-bayesnet-2017.tar.xz mirror://gentoo/texlive-module-tikz-cd-2017.tar.xz mirror://gentoo/texlive-module-tikz-dependency-2017.tar.xz mirror://gentoo/texlive-module-tikz-dimline-2017.tar.xz mirror://gentoo/texlive-module-tikz-feynman-2017.tar.xz mirror://gentoo/texlive-module-tikz-inet-2017.tar.xz mirror://gentoo/texlive-module-tikz-kalender-2017.tar.xz mirror://gentoo/texlive-module-tikz-opm-2017.tar.xz mirror://gentoo/texlive-module-tikz-optics-2017.tar.xz mirror://gentoo/texlive-module-tikz-page-2017.tar.xz mirror://gentoo/texlive-module-tikz-palattice-2017.tar.xz mirror://gentoo/texlive-module-tikz-qtree-2017.tar.xz mirror://gentoo/texlive-module-tikz-timing-2017.tar.xz mirror://gentoo/texlive-module-tikzinclude-2017.tar.xz mirror://gentoo/texlive-module-tikzmark-2017.tar.xz mirror://gentoo/texlive-module-tikzorbital-2017.tar.xz mirror://gentoo/texlive-module-tikzpagenodes-2017.tar.xz mirror://gentoo/texlive-module-tikzpfeile-2017.tar.xz mirror://gentoo/texlive-module-tikzpeople-2017.tar.xz mirror://gentoo/texlive-module-tikzposter-2017.tar.xz mirror://gentoo/texlive-module-tikzscale-2017.tar.xz mirror://gentoo/texlive-module-tikzsymbols-2017.tar.xz mirror://gentoo/texlive-module-timing-diagrams-2017.tar.xz mirror://gentoo/texlive-module-tqft-2017.tar.xz mirror://gentoo/texlive-module-tkz-base-2017.tar.xz mirror://gentoo/texlive-module-tkz-berge-2017.tar.xz mirror://gentoo/texlive-module-tkz-doc-2017.tar.xz mirror://gentoo/texlive-module-tkz-euclide-2017.tar.xz mirror://gentoo/texlive-module-tkz-fct-2017.tar.xz mirror://gentoo/texlive-module-tkz-graph-2017.tar.xz mirror://gentoo/texlive-module-tkz-kiviat-2017.tar.xz mirror://gentoo/texlive-module-tkz-linknodes-2017.tar.xz mirror://gentoo/texlive-module-tkz-orm-2017.tar.xz mirror://gentoo/texlive-module-tkz-tab-2017.tar.xz mirror://gentoo/texlive-module-tsemlines-2017.tar.xz mirror://gentoo/texlive-module-tufte-latex-2017.tar.xz mirror://gentoo/texlive-module-venndiagram-2017.tar.xz mirror://gentoo/texlive-module-visualpstricks-2017.tar.xz mirror://gentoo/texlive-module-xpicture-2017.tar.xz mirror://gentoo/texlive-module-xypic-2017.tar.xz mirror://gentoo/texlive-module-collection-pictures-2017.tar.xz doc? ( mirror://gentoo/texlive-module-aobs-tikz.doc-2017.tar.xz mirror://gentoo/texlive-module-askmaps.doc-2017.tar.xz mirror://gentoo/texlive-module-asyfig.doc-2017.tar.xz mirror://gentoo/texlive-module-asypictureb.doc-2017.tar.xz mirror://gentoo/texlive-module-autoarea.doc-2017.tar.xz mirror://gentoo/texlive-module-bardiag.doc-2017.tar.xz mirror://gentoo/texlive-module-beamerswitch.doc-2017.tar.xz mirror://gentoo/texlive-module-binarytree.doc-2017.tar.xz mirror://gentoo/texlive-module-blochsphere.doc-2017.tar.xz mirror://gentoo/texlive-module-bloques.doc-2017.tar.xz mirror://gentoo/texlive-module-blox.doc-2017.tar.xz mirror://gentoo/texlive-module-bodegraph.doc-2017.tar.xz mirror://gentoo/texlive-module-bondgraph.doc-2017.tar.xz mirror://gentoo/texlive-module-bondgraphs.doc-2017.tar.xz mirror://gentoo/texlive-module-braids.doc-2017.tar.xz mirror://gentoo/texlive-module-bxeepic.doc-2017.tar.xz mirror://gentoo/texlive-module-cachepic.doc-2017.tar.xz mirror://gentoo/texlive-module-callouts.doc-2017.tar.xz mirror://gentoo/texlive-module-celtic.doc-2017.tar.xz mirror://gentoo/texlive-module-chemfig.doc-2017.tar.xz mirror://gentoo/texlive-module-combinedgraphics.doc-2017.tar.xz mirror://gentoo/texlive-module-circuitikz.doc-2017.tar.xz mirror://gentoo/texlive-module-curve.doc-2017.tar.xz mirror://gentoo/texlive-module-curve2e.doc-2017.tar.xz mirror://gentoo/texlive-module-curves.doc-2017.tar.xz mirror://gentoo/texlive-module-dcpic.doc-2017.tar.xz mirror://gentoo/texlive-module-diagmac2.doc-2017.tar.xz mirror://gentoo/texlive-module-doc-pictex.doc-2017.tar.xz mirror://gentoo/texlive-module-dottex.doc-2017.tar.xz mirror://gentoo/texlive-module-dratex.doc-2017.tar.xz mirror://gentoo/texlive-module-drs.doc-2017.tar.xz mirror://gentoo/texlive-module-duotenzor.doc-2017.tar.xz mirror://gentoo/texlive-module-ecgdraw.doc-2017.tar.xz mirror://gentoo/texlive-module-eepic.doc-2017.tar.xz mirror://gentoo/texlive-module-ellipse.doc-2017.tar.xz mirror://gentoo/texlive-module-epspdfconversion.doc-2017.tar.xz mirror://gentoo/texlive-module-esk.doc-2017.tar.xz mirror://gentoo/texlive-module-fast-diagram.doc-2017.tar.xz mirror://gentoo/texlive-module-fig4latex.doc-2017.tar.xz mirror://gentoo/texlive-module-fitbox.doc-2017.tar.xz mirror://gentoo/texlive-module-flowchart.doc-2017.tar.xz mirror://gentoo/texlive-module-forest.doc-2017.tar.xz mirror://gentoo/texlive-module-genealogytree.doc-2017.tar.xz mirror://gentoo/texlive-module-getmap.doc-2017.tar.xz mirror://gentoo/texlive-module-gincltex.doc-2017.tar.xz mirror://gentoo/texlive-module-gnuplottex.doc-2017.tar.xz mirror://gentoo/texlive-module-gradientframe.doc-2017.tar.xz mirror://gentoo/texlive-module-grafcet.doc-2017.tar.xz mirror://gentoo/texlive-module-graphviz.doc-2017.tar.xz mirror://gentoo/texlive-module-gtrlib-largetrees.doc-2017.tar.xz mirror://gentoo/texlive-module-harveyballs.doc-2017.tar.xz mirror://gentoo/texlive-module-here.doc-2017.tar.xz mirror://gentoo/texlive-module-hf-tikz.doc-2017.tar.xz mirror://gentoo/texlive-module-hobby.doc-2017.tar.xz mirror://gentoo/texlive-module-hvfloat.doc-2017.tar.xz mirror://gentoo/texlive-module-knitting.doc-2017.tar.xz mirror://gentoo/texlive-module-knittingpattern.doc-2017.tar.xz mirror://gentoo/texlive-module-ladder.doc-2017.tar.xz mirror://gentoo/texlive-module-lapdf.doc-2017.tar.xz mirror://gentoo/texlive-module-latex-make.doc-2017.tar.xz mirror://gentoo/texlive-module-lpic.doc-2017.tar.xz mirror://gentoo/texlive-module-lroundrect.doc-2017.tar.xz mirror://gentoo/texlive-module-luamesh.doc-2017.tar.xz mirror://gentoo/texlive-module-makeshape.doc-2017.tar.xz mirror://gentoo/texlive-module-mathspic.doc-2017.tar.xz mirror://gentoo/texlive-module-miniplot.doc-2017.tar.xz mirror://gentoo/texlive-module-mkpic.doc-2017.tar.xz mirror://gentoo/texlive-module-modiagram.doc-2017.tar.xz mirror://gentoo/texlive-module-neuralnetwork.doc-2017.tar.xz mirror://gentoo/texlive-module-numericplots.doc-2017.tar.xz mirror://gentoo/texlive-module-pb-diagram.doc-2017.tar.xz mirror://gentoo/texlive-module-petri-nets.doc-2017.tar.xz mirror://gentoo/texlive-module-pgf-blur.doc-2017.tar.xz mirror://gentoo/texlive-module-pgf-soroban.doc-2017.tar.xz mirror://gentoo/texlive-module-pgf-spectra.doc-2017.tar.xz mirror://gentoo/texlive-module-pgf-umlcd.doc-2017.tar.xz mirror://gentoo/texlive-module-pgf-umlsd.doc-2017.tar.xz mirror://gentoo/texlive-module-pgfgantt.doc-2017.tar.xz mirror://gentoo/texlive-module-pgfkeyx.doc-2017.tar.xz mirror://gentoo/texlive-module-pgfmolbio.doc-2017.tar.xz mirror://gentoo/texlive-module-pgfopts.doc-2017.tar.xz mirror://gentoo/texlive-module-pgfornament.doc-2017.tar.xz mirror://gentoo/texlive-module-pgfplots.doc-2017.tar.xz mirror://gentoo/texlive-module-picinpar.doc-2017.tar.xz mirror://gentoo/texlive-module-pict2e.doc-2017.tar.xz mirror://gentoo/texlive-module-pictex.doc-2017.tar.xz mirror://gentoo/texlive-module-pinlabel.doc-2017.tar.xz mirror://gentoo/texlive-module-pmgraph.doc-2017.tar.xz mirror://gentoo/texlive-module-prerex.doc-2017.tar.xz mirror://gentoo/texlive-module-productbox.doc-2017.tar.xz mirror://gentoo/texlive-module-pxpgfmark.doc-2017.tar.xz mirror://gentoo/texlive-module-qcircuit.doc-2017.tar.xz mirror://gentoo/texlive-module-qrcode.doc-2017.tar.xz mirror://gentoo/texlive-module-randbild.doc-2017.tar.xz mirror://gentoo/texlive-module-randomwalk.doc-2017.tar.xz mirror://gentoo/texlive-module-reotex.doc-2017.tar.xz mirror://gentoo/texlive-module-rviewport.doc-2017.tar.xz mirror://gentoo/texlive-module-sa-tikz.doc-2017.tar.xz mirror://gentoo/texlive-module-schemabloc.doc-2017.tar.xz mirror://gentoo/texlive-module-scsnowman.doc-2017.tar.xz mirror://gentoo/texlive-module-scratch.doc-2017.tar.xz mirror://gentoo/texlive-module-setdeck.doc-2017.tar.xz mirror://gentoo/texlive-module-signchart.doc-2017.tar.xz mirror://gentoo/texlive-module-smartdiagram.doc-2017.tar.xz mirror://gentoo/texlive-module-spath3.doc-2017.tar.xz mirror://gentoo/texlive-module-swimgraf.doc-2017.tar.xz mirror://gentoo/texlive-module-table-fct.doc-2017.tar.xz mirror://gentoo/texlive-module-texdraw.doc-2017.tar.xz mirror://gentoo/texlive-module-ticollege.doc-2017.tar.xz mirror://gentoo/texlive-module-tipfr.doc-2017.tar.xz mirror://gentoo/texlive-module-tikz-3dplot.doc-2017.tar.xz mirror://gentoo/texlive-module-tikz-bayesnet.doc-2017.tar.xz mirror://gentoo/texlive-module-tikz-cd.doc-2017.tar.xz mirror://gentoo/texlive-module-tikz-dependency.doc-2017.tar.xz mirror://gentoo/texlive-module-tikz-dimline.doc-2017.tar.xz mirror://gentoo/texlive-module-tikz-feynman.doc-2017.tar.xz mirror://gentoo/texlive-module-tikz-inet.doc-2017.tar.xz mirror://gentoo/texlive-module-tikz-kalender.doc-2017.tar.xz mirror://gentoo/texlive-module-tikz-opm.doc-2017.tar.xz mirror://gentoo/texlive-module-tikz-optics.doc-2017.tar.xz mirror://gentoo/texlive-module-tikz-page.doc-2017.tar.xz mirror://gentoo/texlive-module-tikz-palattice.doc-2017.tar.xz mirror://gentoo/texlive-module-tikz-qtree.doc-2017.tar.xz mirror://gentoo/texlive-module-tikz-timing.doc-2017.tar.xz mirror://gentoo/texlive-module-tikzinclude.doc-2017.tar.xz mirror://gentoo/texlive-module-tikzmark.doc-2017.tar.xz mirror://gentoo/texlive-module-tikzorbital.doc-2017.tar.xz mirror://gentoo/texlive-module-tikzpagenodes.doc-2017.tar.xz mirror://gentoo/texlive-module-tikzpfeile.doc-2017.tar.xz mirror://gentoo/texlive-module-tikzpeople.doc-2017.tar.xz mirror://gentoo/texlive-module-tikzposter.doc-2017.tar.xz mirror://gentoo/texlive-module-tikzscale.doc-2017.tar.xz mirror://gentoo/texlive-module-tikzsymbols.doc-2017.tar.xz mirror://gentoo/texlive-module-timing-diagrams.doc-2017.tar.xz mirror://gentoo/texlive-module-tqft.doc-2017.tar.xz mirror://gentoo/texlive-module-tkz-base.doc-2017.tar.xz mirror://gentoo/texlive-module-tkz-berge.doc-2017.tar.xz mirror://gentoo/texlive-module-tkz-doc.doc-2017.tar.xz mirror://gentoo/texlive-module-tkz-euclide.doc-2017.tar.xz mirror://gentoo/texlive-module-tkz-fct.doc-2017.tar.xz mirror://gentoo/texlive-module-tkz-graph.doc-2017.tar.xz mirror://gentoo/texlive-module-tkz-kiviat.doc-2017.tar.xz mirror://gentoo/texlive-module-tkz-linknodes.doc-2017.tar.xz mirror://gentoo/texlive-module-tkz-orm.doc-2017.tar.xz mirror://gentoo/texlive-module-tkz-tab.doc-2017.tar.xz mirror://gentoo/texlive-module-tufte-latex.doc-2017.tar.xz mirror://gentoo/texlive-module-venndiagram.doc-2017.tar.xz mirror://gentoo/texlive-module-visualpstricks.doc-2017.tar.xz mirror://gentoo/texlive-module-xpicture.doc-2017.tar.xz mirror://gentoo/texlive-module-xypic.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-aobs-tikz.source-2017.tar.xz mirror://gentoo/texlive-module-asyfig.source-2017.tar.xz mirror://gentoo/texlive-module-asypictureb.source-2017.tar.xz mirror://gentoo/texlive-module-beamerswitch.source-2017.tar.xz mirror://gentoo/texlive-module-binarytree.source-2017.tar.xz mirror://gentoo/texlive-module-blochsphere.source-2017.tar.xz mirror://gentoo/texlive-module-blox.source-2017.tar.xz mirror://gentoo/texlive-module-bondgraphs.source-2017.tar.xz mirror://gentoo/texlive-module-braids.source-2017.tar.xz mirror://gentoo/texlive-module-celtic.source-2017.tar.xz mirror://gentoo/texlive-module-combinedgraphics.source-2017.tar.xz mirror://gentoo/texlive-module-curve.source-2017.tar.xz mirror://gentoo/texlive-module-curve2e.source-2017.tar.xz mirror://gentoo/texlive-module-curves.source-2017.tar.xz mirror://gentoo/texlive-module-dottex.source-2017.tar.xz mirror://gentoo/texlive-module-ecgdraw.source-2017.tar.xz mirror://gentoo/texlive-module-ellipse.source-2017.tar.xz mirror://gentoo/texlive-module-esk.source-2017.tar.xz mirror://gentoo/texlive-module-fitbox.source-2017.tar.xz mirror://gentoo/texlive-module-flowchart.source-2017.tar.xz mirror://gentoo/texlive-module-forest.source-2017.tar.xz mirror://gentoo/texlive-module-gincltex.source-2017.tar.xz mirror://gentoo/texlive-module-gnuplottex.source-2017.tar.xz mirror://gentoo/texlive-module-gradientframe.source-2017.tar.xz mirror://gentoo/texlive-module-graphviz.source-2017.tar.xz mirror://gentoo/texlive-module-gtrlib-largetrees.source-2017.tar.xz mirror://gentoo/texlive-module-hf-tikz.source-2017.tar.xz mirror://gentoo/texlive-module-hobby.source-2017.tar.xz mirror://gentoo/texlive-module-latex-make.source-2017.tar.xz mirror://gentoo/texlive-module-lroundrect.source-2017.tar.xz mirror://gentoo/texlive-module-makeshape.source-2017.tar.xz mirror://gentoo/texlive-module-pgf-blur.source-2017.tar.xz mirror://gentoo/texlive-module-pgfgantt.source-2017.tar.xz mirror://gentoo/texlive-module-pgfmolbio.source-2017.tar.xz mirror://gentoo/texlive-module-pgfopts.source-2017.tar.xz mirror://gentoo/texlive-module-pgfplots.source-2017.tar.xz mirror://gentoo/texlive-module-pict2e.source-2017.tar.xz mirror://gentoo/texlive-module-productbox.source-2017.tar.xz mirror://gentoo/texlive-module-qrcode.source-2017.tar.xz mirror://gentoo/texlive-module-randbild.source-2017.tar.xz mirror://gentoo/texlive-module-randomwalk.source-2017.tar.xz mirror://gentoo/texlive-module-rviewport.source-2017.tar.xz mirror://gentoo/texlive-module-signchart.source-2017.tar.xz mirror://gentoo/texlive-module-smartdiagram.source-2017.tar.xz mirror://gentoo/texlive-module-spath3.source-2017.tar.xz mirror://gentoo/texlive-module-tikz-page.source-2017.tar.xz mirror://gentoo/texlive-module-tikz-timing.source-2017.tar.xz mirror://gentoo/texlive-module-tikzinclude.source-2017.tar.xz mirror://gentoo/texlive-module-tikzmark.source-2017.tar.xz mirror://gentoo/texlive-module-tikzpagenodes.source-2017.tar.xz mirror://gentoo/texlive-module-tikzpfeile.source-2017.tar.xz mirror://gentoo/texlive-module-tikzposter.source-2017.tar.xz mirror://gentoo/texlive-module-tikzscale.source-2017.tar.xz mirror://gentoo/texlive-module-tikzsymbols.source-2017.tar.xz mirror://gentoo/texlive-module-tqft.source-2017.tar.xz mirror://gentoo/texlive-module-venndiagram.source-2017.tar.xz mirror://gentoo/texlive-module-xpicture.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ff84df422f9846c44389618b826888c6
+_md5_=a9757b4b48b0eb4f69f95400dd6efc8f
diff --git a/metadata/md5-cache/dev-texlive/texlive-plaingeneric-2017 b/metadata/md5-cache/dev-texlive/texlive-plaingeneric-2017
index c23afa9c633f..2fbcb4879fca 100644
--- a/metadata/md5-cache/dev-texlive/texlive-plaingeneric-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-plaingeneric-2017
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive Plain (La)TeX packages
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-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 ~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 ~x64-solaris ~x86-solaris
 LICENSE=GPL-1 GPL-2 GPL-3 LPPL-1.3 LPPL-1.3c public-domain TeX TeX-other-free
 RDEPEND=>=dev-texlive/texlive-basic-2017 !<dev-texlive/texlive-langvietnamese-2009 !dev-texlive/texlive-texinfo !=dev-texlive/texlive-basic-2007* !<dev-texlive/texlive-texinfo-2009 !<dev-texlive/texlive-latexextra-2010 !dev-texlive/texlive-genericextra !dev-texlive/texlive-genericrecommended !dev-texlive/texlive-plainextra >=app-text/texlive-core-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-abbr-2017.tar.xz mirror://gentoo/texlive-module-abstyles-2017.tar.xz mirror://gentoo/texlive-module-apnum-2017.tar.xz mirror://gentoo/texlive-module-autoaligne-2017.tar.xz mirror://gentoo/texlive-module-barr-2017.tar.xz mirror://gentoo/texlive-module-bitelist-2017.tar.xz mirror://gentoo/texlive-module-borceux-2017.tar.xz mirror://gentoo/texlive-module-c-pascal-2017.tar.xz mirror://gentoo/texlive-module-catcodes-2017.tar.xz mirror://gentoo/texlive-module-chronosys-2017.tar.xz mirror://gentoo/texlive-module-colorsep-2017.tar.xz mirror://gentoo/texlive-module-dinat-2017.tar.xz mirror://gentoo/texlive-module-dirtree-2017.tar.xz mirror://gentoo/texlive-module-docbytex-2017.tar.xz mirror://gentoo/texlive-module-dowith-2017.tar.xz mirror://gentoo/texlive-module-eijkhout-2017.tar.xz mirror://gentoo/texlive-module-encxvlna-2017.tar.xz mirror://gentoo/texlive-module-epigram-2017.tar.xz mirror://gentoo/texlive-module-epsf-2017.tar.xz mirror://gentoo/texlive-module-epsf-dvipdfmx-2017.tar.xz mirror://gentoo/texlive-module-fenixpar-2017.tar.xz mirror://gentoo/texlive-module-figflow-2017.tar.xz mirror://gentoo/texlive-module-fixpdfmag-2017.tar.xz mirror://gentoo/texlive-module-fltpoint-2017.tar.xz mirror://gentoo/texlive-module-fntproof-2017.tar.xz mirror://gentoo/texlive-module-font-change-2017.tar.xz mirror://gentoo/texlive-module-fontch-2017.tar.xz mirror://gentoo/texlive-module-fontname-2017.tar.xz mirror://gentoo/texlive-module-gates-2017.tar.xz mirror://gentoo/texlive-module-genmisc-2017.tar.xz mirror://gentoo/texlive-module-getoptk-2017.tar.xz mirror://gentoo/texlive-module-gfnotation-2017.tar.xz mirror://gentoo/texlive-module-gobble-2017.tar.xz mirror://gentoo/texlive-module-graphics-pln-2017.tar.xz mirror://gentoo/texlive-module-gtl-2017.tar.xz mirror://gentoo/texlive-module-hlist-2017.tar.xz mirror://gentoo/texlive-module-hyplain-2017.tar.xz mirror://gentoo/texlive-module-ifetex-2017.tar.xz mirror://gentoo/texlive-module-iftex-2017.tar.xz mirror://gentoo/texlive-module-insbox-2017.tar.xz mirror://gentoo/texlive-module-js-misc-2017.tar.xz mirror://gentoo/texlive-module-kastrup-2017.tar.xz mirror://gentoo/texlive-module-lambda-lists-2017.tar.xz mirror://gentoo/texlive-module-langcode-2017.tar.xz mirror://gentoo/texlive-module-lecturer-2017.tar.xz mirror://gentoo/texlive-module-librarian-2017.tar.xz mirror://gentoo/texlive-module-listofitems-2017.tar.xz mirror://gentoo/texlive-module-mathdots-2017.tar.xz mirror://gentoo/texlive-module-metatex-2017.tar.xz mirror://gentoo/texlive-module-midnight-2017.tar.xz mirror://gentoo/texlive-module-mkpattern-2017.tar.xz mirror://gentoo/texlive-module-multido-2017.tar.xz mirror://gentoo/texlive-module-navigator-2017.tar.xz mirror://gentoo/texlive-module-newsletr-2017.tar.xz mirror://gentoo/texlive-module-ofs-2017.tar.xz mirror://gentoo/texlive-module-olsak-misc-2017.tar.xz mirror://gentoo/texlive-module-path-2017.tar.xz mirror://gentoo/texlive-module-pdf-trans-2017.tar.xz mirror://gentoo/texlive-module-pitex-2017.tar.xz mirror://gentoo/texlive-module-placeins-plain-2017.tar.xz mirror://gentoo/texlive-module-plainpkg-2017.tar.xz mirror://gentoo/texlive-module-plipsum-2017.tar.xz mirror://gentoo/texlive-module-plnfss-2017.tar.xz mirror://gentoo/texlive-module-plstmary-2017.tar.xz mirror://gentoo/texlive-module-present-2017.tar.xz mirror://gentoo/texlive-module-randomlist-2017.tar.xz mirror://gentoo/texlive-module-resumemac-2017.tar.xz mirror://gentoo/texlive-module-schemata-2017.tar.xz mirror://gentoo/texlive-module-shade-2017.tar.xz mirror://gentoo/texlive-module-systeme-2017.tar.xz mirror://gentoo/texlive-module-tabto-generic-2017.tar.xz mirror://gentoo/texlive-module-termmenu-2017.tar.xz mirror://gentoo/texlive-module-tex-ps-2017.tar.xz mirror://gentoo/texlive-module-tex4ht-2017.tar.xz mirror://gentoo/texlive-module-texapi-2017.tar.xz mirror://gentoo/texlive-module-texinfo-2017.tar.xz mirror://gentoo/texlive-module-timetable-2017.tar.xz mirror://gentoo/texlive-module-tracklang-2017.tar.xz mirror://gentoo/texlive-module-treetex-2017.tar.xz mirror://gentoo/texlive-module-trigonometry-2017.tar.xz mirror://gentoo/texlive-module-ulem-2017.tar.xz mirror://gentoo/texlive-module-upca-2017.tar.xz mirror://gentoo/texlive-module-varisize-2017.tar.xz mirror://gentoo/texlive-module-xii-2017.tar.xz mirror://gentoo/texlive-module-xlop-2017.tar.xz mirror://gentoo/texlive-module-yax-2017.tar.xz mirror://gentoo/texlive-module-collection-plaingeneric-2017.tar.xz doc? ( mirror://gentoo/texlive-module-abbr.doc-2017.tar.xz mirror://gentoo/texlive-module-abstyles.doc-2017.tar.xz mirror://gentoo/texlive-module-apnum.doc-2017.tar.xz mirror://gentoo/texlive-module-autoaligne.doc-2017.tar.xz mirror://gentoo/texlive-module-barr.doc-2017.tar.xz mirror://gentoo/texlive-module-bitelist.doc-2017.tar.xz mirror://gentoo/texlive-module-borceux.doc-2017.tar.xz mirror://gentoo/texlive-module-c-pascal.doc-2017.tar.xz mirror://gentoo/texlive-module-catcodes.doc-2017.tar.xz mirror://gentoo/texlive-module-chronosys.doc-2017.tar.xz mirror://gentoo/texlive-module-dinat.doc-2017.tar.xz mirror://gentoo/texlive-module-dirtree.doc-2017.tar.xz mirror://gentoo/texlive-module-docbytex.doc-2017.tar.xz mirror://gentoo/texlive-module-dowith.doc-2017.tar.xz mirror://gentoo/texlive-module-encxvlna.doc-2017.tar.xz mirror://gentoo/texlive-module-epsf.doc-2017.tar.xz mirror://gentoo/texlive-module-epsf-dvipdfmx.doc-2017.tar.xz mirror://gentoo/texlive-module-fenixpar.doc-2017.tar.xz mirror://gentoo/texlive-module-figflow.doc-2017.tar.xz mirror://gentoo/texlive-module-fltpoint.doc-2017.tar.xz mirror://gentoo/texlive-module-fntproof.doc-2017.tar.xz mirror://gentoo/texlive-module-font-change.doc-2017.tar.xz mirror://gentoo/texlive-module-fontch.doc-2017.tar.xz mirror://gentoo/texlive-module-fontname.doc-2017.tar.xz mirror://gentoo/texlive-module-gates.doc-2017.tar.xz mirror://gentoo/texlive-module-getoptk.doc-2017.tar.xz mirror://gentoo/texlive-module-gfnotation.doc-2017.tar.xz mirror://gentoo/texlive-module-gobble.doc-2017.tar.xz mirror://gentoo/texlive-module-graphics-pln.doc-2017.tar.xz mirror://gentoo/texlive-module-gtl.doc-2017.tar.xz mirror://gentoo/texlive-module-hlist.doc-2017.tar.xz mirror://gentoo/texlive-module-hyplain.doc-2017.tar.xz mirror://gentoo/texlive-module-ifetex.doc-2017.tar.xz mirror://gentoo/texlive-module-iftex.doc-2017.tar.xz mirror://gentoo/texlive-module-insbox.doc-2017.tar.xz mirror://gentoo/texlive-module-js-misc.doc-2017.tar.xz mirror://gentoo/texlive-module-kastrup.doc-2017.tar.xz mirror://gentoo/texlive-module-lambda-lists.doc-2017.tar.xz mirror://gentoo/texlive-module-langcode.doc-2017.tar.xz mirror://gentoo/texlive-module-lecturer.doc-2017.tar.xz mirror://gentoo/texlive-module-librarian.doc-2017.tar.xz mirror://gentoo/texlive-module-listofitems.doc-2017.tar.xz mirror://gentoo/texlive-module-mathdots.doc-2017.tar.xz mirror://gentoo/texlive-module-metatex.doc-2017.tar.xz mirror://gentoo/texlive-module-midnight.doc-2017.tar.xz mirror://gentoo/texlive-module-mkpattern.doc-2017.tar.xz mirror://gentoo/texlive-module-multido.doc-2017.tar.xz mirror://gentoo/texlive-module-navigator.doc-2017.tar.xz mirror://gentoo/texlive-module-newsletr.doc-2017.tar.xz mirror://gentoo/texlive-module-ofs.doc-2017.tar.xz mirror://gentoo/texlive-module-olsak-misc.doc-2017.tar.xz mirror://gentoo/texlive-module-path.doc-2017.tar.xz mirror://gentoo/texlive-module-pdf-trans.doc-2017.tar.xz mirror://gentoo/texlive-module-pitex.doc-2017.tar.xz mirror://gentoo/texlive-module-plainpkg.doc-2017.tar.xz mirror://gentoo/texlive-module-plipsum.doc-2017.tar.xz mirror://gentoo/texlive-module-plnfss.doc-2017.tar.xz mirror://gentoo/texlive-module-plstmary.doc-2017.tar.xz mirror://gentoo/texlive-module-present.doc-2017.tar.xz mirror://gentoo/texlive-module-randomlist.doc-2017.tar.xz mirror://gentoo/texlive-module-resumemac.doc-2017.tar.xz mirror://gentoo/texlive-module-schemata.doc-2017.tar.xz mirror://gentoo/texlive-module-shade.doc-2017.tar.xz mirror://gentoo/texlive-module-systeme.doc-2017.tar.xz mirror://gentoo/texlive-module-termmenu.doc-2017.tar.xz mirror://gentoo/texlive-module-tex-ps.doc-2017.tar.xz mirror://gentoo/texlive-module-tex4ht.doc-2017.tar.xz mirror://gentoo/texlive-module-texapi.doc-2017.tar.xz mirror://gentoo/texlive-module-tracklang.doc-2017.tar.xz mirror://gentoo/texlive-module-treetex.doc-2017.tar.xz mirror://gentoo/texlive-module-trigonometry.doc-2017.tar.xz mirror://gentoo/texlive-module-ulem.doc-2017.tar.xz mirror://gentoo/texlive-module-upca.doc-2017.tar.xz mirror://gentoo/texlive-module-varisize.doc-2017.tar.xz mirror://gentoo/texlive-module-xii.doc-2017.tar.xz mirror://gentoo/texlive-module-xlop.doc-2017.tar.xz mirror://gentoo/texlive-module-yax.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-bitelist.source-2017.tar.xz mirror://gentoo/texlive-module-catcodes.source-2017.tar.xz mirror://gentoo/texlive-module-dirtree.source-2017.tar.xz mirror://gentoo/texlive-module-dowith.source-2017.tar.xz mirror://gentoo/texlive-module-fltpoint.source-2017.tar.xz mirror://gentoo/texlive-module-gobble.source-2017.tar.xz mirror://gentoo/texlive-module-graphics-pln.source-2017.tar.xz mirror://gentoo/texlive-module-gtl.source-2017.tar.xz mirror://gentoo/texlive-module-ifetex.source-2017.tar.xz mirror://gentoo/texlive-module-kastrup.source-2017.tar.xz mirror://gentoo/texlive-module-langcode.source-2017.tar.xz mirror://gentoo/texlive-module-mathdots.source-2017.tar.xz mirror://gentoo/texlive-module-multido.source-2017.tar.xz mirror://gentoo/texlive-module-plainpkg.source-2017.tar.xz mirror://gentoo/texlive-module-randomlist.source-2017.tar.xz mirror://gentoo/texlive-module-schemata.source-2017.tar.xz mirror://gentoo/texlive-module-termmenu.source-2017.tar.xz mirror://gentoo/texlive-module-tracklang.source-2017.tar.xz mirror://gentoo/texlive-module-xlop.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ea1693b0988b36c154934c3cc666a3d2
+_md5_=25bfba9301aa28ae93df73e8375d0e60
diff --git a/metadata/md5-cache/dev-texlive/texlive-pstricks-2017 b/metadata/md5-cache/dev-texlive/texlive-pstricks-2017
index 94c06fcc182e..eee2619dbbbb 100644
--- a/metadata/md5-cache/dev-texlive/texlive-pstricks-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-pstricks-2017
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive PSTricks
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-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 ~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 ~x64-solaris ~x86-solaris
 LICENSE=GPL-1 GPL-2 LGPL-2 LPPL-1.3
 RDEPEND=>=dev-texlive/texlive-basic-2017 >=dev-texlive/texlive-plaingeneric-2017 dev-tex/pgf >=app-text/texlive-core-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-auto-pst-pdf-2017.tar.xz mirror://gentoo/texlive-module-bclogo-2017.tar.xz mirror://gentoo/texlive-module-dsptricks-2017.tar.xz mirror://gentoo/texlive-module-makeplot-2017.tar.xz mirror://gentoo/texlive-module-pdftricks-2017.tar.xz mirror://gentoo/texlive-module-pdftricks2-2017.tar.xz mirror://gentoo/texlive-module-pedigree-perl-2017.tar.xz mirror://gentoo/texlive-module-psbao-2017.tar.xz mirror://gentoo/texlive-module-pst-2dplot-2017.tar.xz mirror://gentoo/texlive-module-pst-3d-2017.tar.xz mirror://gentoo/texlive-module-pst-3dplot-2017.tar.xz mirror://gentoo/texlive-module-pst-abspos-2017.tar.xz mirror://gentoo/texlive-module-pst-arrow-2017.tar.xz mirror://gentoo/texlive-module-pst-am-2017.tar.xz mirror://gentoo/texlive-module-pst-asr-2017.tar.xz mirror://gentoo/texlive-module-pst-bar-2017.tar.xz mirror://gentoo/texlive-module-pst-barcode-2017.tar.xz mirror://gentoo/texlive-module-pst-bezier-2017.tar.xz mirror://gentoo/texlive-module-pst-blur-2017.tar.xz mirror://gentoo/texlive-module-pst-bspline-2017.tar.xz mirror://gentoo/texlive-module-pst-calendar-2017.tar.xz mirror://gentoo/texlive-module-pst-cie-2017.tar.xz mirror://gentoo/texlive-module-pst-circ-2017.tar.xz mirror://gentoo/texlive-module-pst-coil-2017.tar.xz mirror://gentoo/texlive-module-pst-cox-2017.tar.xz mirror://gentoo/texlive-module-pst-dbicons-2017.tar.xz mirror://gentoo/texlive-module-pst-diffraction-2017.tar.xz mirror://gentoo/texlive-module-pst-electricfield-2017.tar.xz mirror://gentoo/texlive-module-pst-eps-2017.tar.xz mirror://gentoo/texlive-module-pst-eucl-2017.tar.xz mirror://gentoo/texlive-module-pst-exa-2017.tar.xz mirror://gentoo/texlive-module-pst-fill-2017.tar.xz mirror://gentoo/texlive-module-pst-fit-2017.tar.xz mirror://gentoo/texlive-module-pst-fr3d-2017.tar.xz mirror://gentoo/texlive-module-pst-fractal-2017.tar.xz mirror://gentoo/texlive-module-pst-fun-2017.tar.xz mirror://gentoo/texlive-module-pst-func-2017.tar.xz mirror://gentoo/texlive-module-pst-gantt-2017.tar.xz mirror://gentoo/texlive-module-pst-geo-2017.tar.xz mirror://gentoo/texlive-module-pst-ghsb-2017.tar.xz mirror://gentoo/texlive-module-pst-gr3d-2017.tar.xz mirror://gentoo/texlive-module-pst-grad-2017.tar.xz mirror://gentoo/texlive-module-pst-graphicx-2017.tar.xz mirror://gentoo/texlive-module-pst-infixplot-2017.tar.xz mirror://gentoo/texlive-module-pst-intersect-2017.tar.xz mirror://gentoo/texlive-module-pst-jtree-2017.tar.xz mirror://gentoo/texlive-module-pst-knot-2017.tar.xz mirror://gentoo/texlive-module-pst-labo-2017.tar.xz mirror://gentoo/texlive-module-pst-layout-2017.tar.xz mirror://gentoo/texlive-module-pst-lens-2017.tar.xz mirror://gentoo/texlive-module-pst-light3d-2017.tar.xz mirror://gentoo/texlive-module-pst-magneticfield-2017.tar.xz mirror://gentoo/texlive-module-pst-math-2017.tar.xz mirror://gentoo/texlive-module-pst-mirror-2017.tar.xz mirror://gentoo/texlive-module-pst-node-2017.tar.xz mirror://gentoo/texlive-module-pst-ob3d-2017.tar.xz mirror://gentoo/texlive-module-pst-ode-2017.tar.xz mirror://gentoo/texlive-module-pst-optexp-2017.tar.xz mirror://gentoo/texlive-module-pst-optic-2017.tar.xz mirror://gentoo/texlive-module-pst-osci-2017.tar.xz mirror://gentoo/texlive-module-pst-ovl-2017.tar.xz mirror://gentoo/texlive-module-pst-pad-2017.tar.xz mirror://gentoo/texlive-module-pst-pdgr-2017.tar.xz mirror://gentoo/texlive-module-pst-perspective-2017.tar.xz mirror://gentoo/texlive-module-pst-platon-2017.tar.xz mirror://gentoo/texlive-module-pst-plot-2017.tar.xz mirror://gentoo/texlive-module-pst-poly-2017.tar.xz mirror://gentoo/texlive-module-pst-pulley-2017.tar.xz mirror://gentoo/texlive-module-pst-qtree-2017.tar.xz mirror://gentoo/texlive-module-pst-rubans-2017.tar.xz mirror://gentoo/texlive-module-pst-shell-2017.tar.xz mirror://gentoo/texlive-module-pst-sigsys-2017.tar.xz mirror://gentoo/texlive-module-pst-slpe-2017.tar.xz mirror://gentoo/texlive-module-pst-solarsystem-2017.tar.xz mirror://gentoo/texlive-module-pst-solides3d-2017.tar.xz mirror://gentoo/texlive-module-pst-soroban-2017.tar.xz mirror://gentoo/texlive-module-pst-spectra-2017.tar.xz mirror://gentoo/texlive-module-pst-spinner-2017.tar.xz mirror://gentoo/texlive-module-pst-spirograph-2017.tar.xz mirror://gentoo/texlive-module-pst-stru-2017.tar.xz mirror://gentoo/texlive-module-pst-support-2017.tar.xz mirror://gentoo/texlive-module-pst-text-2017.tar.xz mirror://gentoo/texlive-module-pst-thick-2017.tar.xz mirror://gentoo/texlive-module-pst-tools-2017.tar.xz mirror://gentoo/texlive-module-pst-tree-2017.tar.xz mirror://gentoo/texlive-module-pst-tvz-2017.tar.xz mirror://gentoo/texlive-module-pst-uml-2017.tar.xz mirror://gentoo/texlive-module-pst-vectorian-2017.tar.xz mirror://gentoo/texlive-module-pst-vowel-2017.tar.xz mirror://gentoo/texlive-module-pst-vue3d-2017.tar.xz mirror://gentoo/texlive-module-pst2pdf-2017.tar.xz mirror://gentoo/texlive-module-pstricks-2017.tar.xz mirror://gentoo/texlive-module-pstricks-add-2017.tar.xz mirror://gentoo/texlive-module-pstricks_calcnotes-2017.tar.xz mirror://gentoo/texlive-module-rputover-2017.tar.xz mirror://gentoo/texlive-module-uml-2017.tar.xz mirror://gentoo/texlive-module-vaucanson-g-2017.tar.xz mirror://gentoo/texlive-module-vocaltract-2017.tar.xz mirror://gentoo/texlive-module-collection-pstricks-2017.tar.xz doc? ( mirror://gentoo/texlive-module-auto-pst-pdf.doc-2017.tar.xz mirror://gentoo/texlive-module-bclogo.doc-2017.tar.xz mirror://gentoo/texlive-module-dsptricks.doc-2017.tar.xz mirror://gentoo/texlive-module-makeplot.doc-2017.tar.xz mirror://gentoo/texlive-module-pdftricks.doc-2017.tar.xz mirror://gentoo/texlive-module-pdftricks2.doc-2017.tar.xz mirror://gentoo/texlive-module-pedigree-perl.doc-2017.tar.xz mirror://gentoo/texlive-module-psbao.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-2dplot.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-3d.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-3dplot.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-abspos.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-arrow.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-am.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-asr.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-bar.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-barcode.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-bezier.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-blur.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-bspline.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-calendar.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-cie.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-circ.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-coil.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-cox.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-dbicons.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-diffraction.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-electricfield.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-eps.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-eucl.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-exa.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-fill.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-fit.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-fr3d.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-fractal.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-fun.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-func.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-gantt.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-geo.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-ghsb.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-gr3d.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-grad.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-graphicx.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-infixplot.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-intersect.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-jtree.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-knot.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-labo.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-layout.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-lens.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-light3d.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-magneticfield.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-math.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-mirror.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-node.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-ob3d.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-ode.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-optexp.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-optic.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-osci.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-ovl.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-pad.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-pdgr.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-perspective.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-platon.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-plot.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-poly.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-pulley.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-qtree.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-rubans.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-shell.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-sigsys.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-slpe.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-solarsystem.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-solides3d.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-soroban.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-spectra.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-spinner.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-spirograph.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-stru.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-support.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-text.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-thick.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-tools.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-tree.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-tvz.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-uml.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-vectorian.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-vowel.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-vue3d.doc-2017.tar.xz mirror://gentoo/texlive-module-pst2pdf.doc-2017.tar.xz mirror://gentoo/texlive-module-pstricks.doc-2017.tar.xz mirror://gentoo/texlive-module-pstricks-add.doc-2017.tar.xz mirror://gentoo/texlive-module-pstricks_calcnotes.doc-2017.tar.xz mirror://gentoo/texlive-module-rputover.doc-2017.tar.xz mirror://gentoo/texlive-module-uml.doc-2017.tar.xz mirror://gentoo/texlive-module-vaucanson-g.doc-2017.tar.xz mirror://gentoo/texlive-module-vocaltract.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-auto-pst-pdf.source-2017.tar.xz mirror://gentoo/texlive-module-makeplot.source-2017.tar.xz mirror://gentoo/texlive-module-pst-3d.source-2017.tar.xz mirror://gentoo/texlive-module-pst-abspos.source-2017.tar.xz mirror://gentoo/texlive-module-pst-am.source-2017.tar.xz mirror://gentoo/texlive-module-pst-bar.source-2017.tar.xz mirror://gentoo/texlive-module-pst-blur.source-2017.tar.xz mirror://gentoo/texlive-module-pst-dbicons.source-2017.tar.xz mirror://gentoo/texlive-module-pst-diffraction.source-2017.tar.xz mirror://gentoo/texlive-module-pst-electricfield.source-2017.tar.xz mirror://gentoo/texlive-module-pst-eps.source-2017.tar.xz mirror://gentoo/texlive-module-pst-fill.source-2017.tar.xz mirror://gentoo/texlive-module-pst-fit.source-2017.tar.xz mirror://gentoo/texlive-module-pst-fr3d.source-2017.tar.xz mirror://gentoo/texlive-module-pst-fun.source-2017.tar.xz mirror://gentoo/texlive-module-pst-gr3d.source-2017.tar.xz mirror://gentoo/texlive-module-pst-intersect.source-2017.tar.xz mirror://gentoo/texlive-module-pst-lens.source-2017.tar.xz mirror://gentoo/texlive-module-pst-light3d.source-2017.tar.xz mirror://gentoo/texlive-module-pst-magneticfield.source-2017.tar.xz mirror://gentoo/texlive-module-pst-ob3d.source-2017.tar.xz mirror://gentoo/texlive-module-pst-optexp.source-2017.tar.xz mirror://gentoo/texlive-module-pst-pad.source-2017.tar.xz mirror://gentoo/texlive-module-pst-pdgr.source-2017.tar.xz mirror://gentoo/texlive-module-pst-platon.source-2017.tar.xz mirror://gentoo/texlive-module-pst-pulley.source-2017.tar.xz mirror://gentoo/texlive-module-pst-rubans.source-2017.tar.xz mirror://gentoo/texlive-module-pst-shell.source-2017.tar.xz mirror://gentoo/texlive-module-pst-slpe.source-2017.tar.xz mirror://gentoo/texlive-module-pst-solarsystem.source-2017.tar.xz mirror://gentoo/texlive-module-pst-soroban.source-2017.tar.xz mirror://gentoo/texlive-module-pst-text.source-2017.tar.xz mirror://gentoo/texlive-module-pst-thick.source-2017.tar.xz mirror://gentoo/texlive-module-pst-tvz.source-2017.tar.xz mirror://gentoo/texlive-module-pst-uml.source-2017.tar.xz mirror://gentoo/texlive-module-pst-vue3d.source-2017.tar.xz mirror://gentoo/texlive-module-uml.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ec3eef18bf2a8377a1ca20cf14c85dfe
+_md5_=a2f377d7364208f7899900313880de29
diff --git a/metadata/md5-cache/dev-texlive/texlive-publishers-2017 b/metadata/md5-cache/dev-texlive/texlive-publishers-2017
index ef179dbdadb9..7af14518b56c 100644
--- a/metadata/md5-cache/dev-texlive/texlive-publishers-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-publishers-2017
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive Publisher styles, theses, etc.
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-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 ~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 ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0 BSD GPL-1 GPL-2 GPL-3 LPPL-1.2 LPPL-1.3 LPPL-1.3c OFL public-domain TeX-other-free
 RDEPEND=>=dev-texlive/texlive-latex-2017 !<dev-texlive/texlive-latexextra-2014 >=app-text/texlive-core-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-IEEEconf-2017.tar.xz mirror://gentoo/texlive-module-IEEEtran-2017.tar.xz mirror://gentoo/texlive-module-aastex-2017.tar.xz mirror://gentoo/texlive-module-abntex2-2017.tar.xz mirror://gentoo/texlive-module-acmart-2017.tar.xz mirror://gentoo/texlive-module-acmconf-2017.tar.xz mirror://gentoo/texlive-module-active-conf-2017.tar.xz mirror://gentoo/texlive-module-adfathesis-2017.tar.xz mirror://gentoo/texlive-module-afparticle-2017.tar.xz mirror://gentoo/texlive-module-afthesis-2017.tar.xz mirror://gentoo/texlive-module-aguplus-2017.tar.xz mirror://gentoo/texlive-module-aiaa-2017.tar.xz mirror://gentoo/texlive-module-ametsoc-2017.tar.xz mirror://gentoo/texlive-module-anufinalexam-2017.tar.xz mirror://gentoo/texlive-module-aomart-2017.tar.xz mirror://gentoo/texlive-module-apa-2017.tar.xz mirror://gentoo/texlive-module-apa6-2017.tar.xz mirror://gentoo/texlive-module-apa6e-2017.tar.xz mirror://gentoo/texlive-module-arsclassica-2017.tar.xz mirror://gentoo/texlive-module-articleingud-2017.tar.xz mirror://gentoo/texlive-module-asaetr-2017.tar.xz mirror://gentoo/texlive-module-ascelike-2017.tar.xz mirror://gentoo/texlive-module-aucklandthesis-2017.tar.xz mirror://gentoo/texlive-module-bangorcsthesis-2017.tar.xz mirror://gentoo/texlive-module-bangorexam-2017.tar.xz mirror://gentoo/texlive-module-beamer-FUBerlin-2017.tar.xz mirror://gentoo/texlive-module-beamer-verona-2017.tar.xz mirror://gentoo/texlive-module-bgteubner-2017.tar.xz mirror://gentoo/texlive-module-br-lex-2017.tar.xz mirror://gentoo/texlive-module-brandeis-dissertation-2017.tar.xz mirror://gentoo/texlive-module-cascadilla-2017.tar.xz mirror://gentoo/texlive-module-chem-journal-2017.tar.xz mirror://gentoo/texlive-module-classicthesis-2017.tar.xz mirror://gentoo/texlive-module-cleanthesis-2017.tar.xz mirror://gentoo/texlive-module-cmpj-2017.tar.xz mirror://gentoo/texlive-module-confproc-2017.tar.xz mirror://gentoo/texlive-module-cquthesis-2017.tar.xz mirror://gentoo/texlive-module-dccpaper-2017.tar.xz mirror://gentoo/texlive-module-dithesis-2017.tar.xz mirror://gentoo/texlive-module-ebook-2017.tar.xz mirror://gentoo/texlive-module-ebsthesis-2017.tar.xz mirror://gentoo/texlive-module-ejpecp-2017.tar.xz mirror://gentoo/texlive-module-ekaia-2017.tar.xz mirror://gentoo/texlive-module-elbioimp-2017.tar.xz mirror://gentoo/texlive-module-elsarticle-2017.tar.xz mirror://gentoo/texlive-module-elteikthesis-2017.tar.xz mirror://gentoo/texlive-module-emisa-2017.tar.xz mirror://gentoo/texlive-module-erdc-2017.tar.xz mirror://gentoo/texlive-module-estcpmm-2017.tar.xz mirror://gentoo/texlive-module-fbithesis-2017.tar.xz mirror://gentoo/texlive-module-fcavtex-2017.tar.xz mirror://gentoo/texlive-module-fcltxdoc-2017.tar.xz mirror://gentoo/texlive-module-fei-2017.tar.xz mirror://gentoo/texlive-module-gaceta-2017.tar.xz mirror://gentoo/texlive-module-gatech-thesis-2017.tar.xz mirror://gentoo/texlive-module-gradstudentresume-2017.tar.xz mirror://gentoo/texlive-module-grant-2017.tar.xz mirror://gentoo/texlive-module-gsemthesis-2017.tar.xz mirror://gentoo/texlive-module-gzt-2017.tar.xz mirror://gentoo/texlive-module-h2020proposal-2017.tar.xz mirror://gentoo/texlive-module-har2nat-2017.tar.xz mirror://gentoo/texlive-module-hobete-2017.tar.xz mirror://gentoo/texlive-module-hustthesis-2017.tar.xz mirror://gentoo/texlive-module-icsv-2017.tar.xz mirror://gentoo/texlive-module-ieeepes-2017.tar.xz mirror://gentoo/texlive-module-ijmart-2017.tar.xz mirror://gentoo/texlive-module-ijsra-2017.tar.xz mirror://gentoo/texlive-module-imac-2017.tar.xz mirror://gentoo/texlive-module-imtekda-2017.tar.xz mirror://gentoo/texlive-module-iscram-2017.tar.xz mirror://gentoo/texlive-module-jacow-2017.tar.xz mirror://gentoo/texlive-module-jmlr-2017.tar.xz mirror://gentoo/texlive-module-jpsj-2017.tar.xz mirror://gentoo/texlive-module-kdgdocs-2017.tar.xz mirror://gentoo/texlive-module-kluwer-2017.tar.xz mirror://gentoo/texlive-module-ksp-thesis-2017.tar.xz mirror://gentoo/texlive-module-langsci-2017.tar.xz mirror://gentoo/texlive-module-lion-msc-2017.tar.xz mirror://gentoo/texlive-module-lni-2017.tar.xz mirror://gentoo/texlive-module-lps-2017.tar.xz mirror://gentoo/texlive-module-matc3-2017.tar.xz mirror://gentoo/texlive-module-matc3mem-2017.tar.xz mirror://gentoo/texlive-module-mcmthesis-2017.tar.xz mirror://gentoo/texlive-module-mentis-2017.tar.xz mirror://gentoo/texlive-module-mnras-2017.tar.xz mirror://gentoo/texlive-module-msu-thesis-2017.tar.xz mirror://gentoo/texlive-module-mucproc-2017.tar.xz mirror://gentoo/texlive-module-mugsthesis-2017.tar.xz mirror://gentoo/texlive-module-musuos-2017.tar.xz mirror://gentoo/texlive-module-muthesis-2017.tar.xz mirror://gentoo/texlive-module-mynsfc-2017.tar.xz mirror://gentoo/texlive-module-nature-2017.tar.xz mirror://gentoo/texlive-module-navydocs-2017.tar.xz mirror://gentoo/texlive-module-nddiss-2017.tar.xz mirror://gentoo/texlive-module-ndsu-thesis-2017.tar.xz mirror://gentoo/texlive-module-novel-2017.tar.xz mirror://gentoo/texlive-module-nwejm-2017.tar.xz mirror://gentoo/texlive-module-nih-2017.tar.xz mirror://gentoo/texlive-module-nihbiosketch-2017.tar.xz mirror://gentoo/texlive-module-nostarch-2017.tar.xz mirror://gentoo/texlive-module-nrc-2017.tar.xz mirror://gentoo/texlive-module-onrannual-2017.tar.xz mirror://gentoo/texlive-module-opteng-2017.tar.xz mirror://gentoo/texlive-module-philosophersimprint-2017.tar.xz mirror://gentoo/texlive-module-pittetd-2017.tar.xz mirror://gentoo/texlive-module-pkuthss-2017.tar.xz mirror://gentoo/texlive-module-powerdot-FUBerlin-2017.tar.xz mirror://gentoo/texlive-module-pracjourn-2017.tar.xz mirror://gentoo/texlive-module-procIAGssymp-2017.tar.xz mirror://gentoo/texlive-module-proposal-2017.tar.xz mirror://gentoo/texlive-module-ptptex-2017.tar.xz mirror://gentoo/texlive-module-psu-thesis-2017.tar.xz mirror://gentoo/texlive-module-resphilosophica-2017.tar.xz mirror://gentoo/texlive-module-resumecls-2017.tar.xz mirror://gentoo/texlive-module-revtex-2017.tar.xz mirror://gentoo/texlive-module-revtex4-2017.tar.xz mirror://gentoo/texlive-module-ryethesis-2017.tar.xz mirror://gentoo/texlive-module-sageep-2017.tar.xz mirror://gentoo/texlive-module-sapthesis-2017.tar.xz mirror://gentoo/texlive-module-scrjrnl-2017.tar.xz mirror://gentoo/texlive-module-schule-2017.tar.xz mirror://gentoo/texlive-module-sduthesis-2017.tar.xz mirror://gentoo/texlive-module-seuthesis-2017.tar.xz mirror://gentoo/texlive-module-seuthesix-2017.tar.xz mirror://gentoo/texlive-module-soton-2017.tar.xz mirror://gentoo/texlive-module-sphdthesis-2017.tar.xz mirror://gentoo/texlive-module-spie-2017.tar.xz mirror://gentoo/texlive-module-sr-vorl-2017.tar.xz mirror://gentoo/texlive-module-stellenbosch-2017.tar.xz mirror://gentoo/texlive-module-suftesi-2017.tar.xz mirror://gentoo/texlive-module-sugconf-2017.tar.xz mirror://gentoo/texlive-module-tabriz-thesis-2017.tar.xz mirror://gentoo/texlive-module-texilikechaps-2017.tar.xz mirror://gentoo/texlive-module-texilikecover-2017.tar.xz mirror://gentoo/texlive-module-thesis-ekf-2017.tar.xz mirror://gentoo/texlive-module-thesis-titlepage-fhac-2017.tar.xz mirror://gentoo/texlive-module-thuthesis-2017.tar.xz mirror://gentoo/texlive-module-toptesi-2017.tar.xz mirror://gentoo/texlive-module-tudscr-2017.tar.xz mirror://gentoo/texlive-module-tugboat-2017.tar.xz mirror://gentoo/texlive-module-tugboat-plain-2017.tar.xz mirror://gentoo/texlive-module-turabian-2017.tar.xz mirror://gentoo/texlive-module-tui-2017.tar.xz mirror://gentoo/texlive-module-uaclasses-2017.tar.xz mirror://gentoo/texlive-module-uafthesis-2017.tar.xz mirror://gentoo/texlive-module-uantwerpendocs-2017.tar.xz mirror://gentoo/texlive-module-ucbthesis-2017.tar.xz mirror://gentoo/texlive-module-ucdavisthesis-2017.tar.xz mirror://gentoo/texlive-module-ucthesis-2017.tar.xz mirror://gentoo/texlive-module-uestcthesis-2017.tar.xz mirror://gentoo/texlive-module-uhhassignment-2017.tar.xz mirror://gentoo/texlive-module-uiucredborder-2017.tar.xz mirror://gentoo/texlive-module-uiucthesis-2017.tar.xz mirror://gentoo/texlive-module-ulthese-2017.tar.xz mirror://gentoo/texlive-module-umbclegislation-2017.tar.xz mirror://gentoo/texlive-module-umthesis-2017.tar.xz mirror://gentoo/texlive-module-umich-thesis-2017.tar.xz mirror://gentoo/texlive-module-unamth-template-2017.tar.xz mirror://gentoo/texlive-module-unamthesis-2017.tar.xz mirror://gentoo/texlive-module-unswcover-2017.tar.xz mirror://gentoo/texlive-module-uothesis-2017.tar.xz mirror://gentoo/texlive-module-urcls-2017.tar.xz mirror://gentoo/texlive-module-uowthesis-2017.tar.xz mirror://gentoo/texlive-module-uowthesistitlepage-2017.tar.xz mirror://gentoo/texlive-module-uspatent-2017.tar.xz mirror://gentoo/texlive-module-ut-thesis-2017.tar.xz mirror://gentoo/texlive-module-uwthesis-2017.tar.xz mirror://gentoo/texlive-module-vancouver-2017.tar.xz mirror://gentoo/texlive-module-xduthesis-2017.tar.xz mirror://gentoo/texlive-module-wsemclassic-2017.tar.xz mirror://gentoo/texlive-module-xcookybooky-2017.tar.xz mirror://gentoo/texlive-module-yathesis-2017.tar.xz mirror://gentoo/texlive-module-york-thesis-2017.tar.xz mirror://gentoo/texlive-module-collection-publishers-2017.tar.xz doc? ( mirror://gentoo/texlive-module-IEEEconf.doc-2017.tar.xz mirror://gentoo/texlive-module-IEEEtran.doc-2017.tar.xz mirror://gentoo/texlive-module-aastex.doc-2017.tar.xz mirror://gentoo/texlive-module-abntex2.doc-2017.tar.xz mirror://gentoo/texlive-module-acmart.doc-2017.tar.xz mirror://gentoo/texlive-module-acmconf.doc-2017.tar.xz mirror://gentoo/texlive-module-active-conf.doc-2017.tar.xz mirror://gentoo/texlive-module-adfathesis.doc-2017.tar.xz mirror://gentoo/texlive-module-afparticle.doc-2017.tar.xz mirror://gentoo/texlive-module-afthesis.doc-2017.tar.xz mirror://gentoo/texlive-module-aguplus.doc-2017.tar.xz mirror://gentoo/texlive-module-aiaa.doc-2017.tar.xz mirror://gentoo/texlive-module-ametsoc.doc-2017.tar.xz mirror://gentoo/texlive-module-anufinalexam.doc-2017.tar.xz mirror://gentoo/texlive-module-aomart.doc-2017.tar.xz mirror://gentoo/texlive-module-apa.doc-2017.tar.xz mirror://gentoo/texlive-module-apa6.doc-2017.tar.xz mirror://gentoo/texlive-module-apa6e.doc-2017.tar.xz mirror://gentoo/texlive-module-arsclassica.doc-2017.tar.xz mirror://gentoo/texlive-module-articleingud.doc-2017.tar.xz mirror://gentoo/texlive-module-asaetr.doc-2017.tar.xz mirror://gentoo/texlive-module-ascelike.doc-2017.tar.xz mirror://gentoo/texlive-module-aucklandthesis.doc-2017.tar.xz mirror://gentoo/texlive-module-bangorcsthesis.doc-2017.tar.xz mirror://gentoo/texlive-module-bangorexam.doc-2017.tar.xz mirror://gentoo/texlive-module-beamer-FUBerlin.doc-2017.tar.xz mirror://gentoo/texlive-module-beamer-verona.doc-2017.tar.xz mirror://gentoo/texlive-module-bgteubner.doc-2017.tar.xz mirror://gentoo/texlive-module-br-lex.doc-2017.tar.xz mirror://gentoo/texlive-module-brandeis-dissertation.doc-2017.tar.xz mirror://gentoo/texlive-module-cascadilla.doc-2017.tar.xz mirror://gentoo/texlive-module-classicthesis.doc-2017.tar.xz mirror://gentoo/texlive-module-cleanthesis.doc-2017.tar.xz mirror://gentoo/texlive-module-cmpj.doc-2017.tar.xz mirror://gentoo/texlive-module-confproc.doc-2017.tar.xz mirror://gentoo/texlive-module-cquthesis.doc-2017.tar.xz mirror://gentoo/texlive-module-dccpaper.doc-2017.tar.xz mirror://gentoo/texlive-module-dithesis.doc-2017.tar.xz mirror://gentoo/texlive-module-ebook.doc-2017.tar.xz mirror://gentoo/texlive-module-ebsthesis.doc-2017.tar.xz mirror://gentoo/texlive-module-ejpecp.doc-2017.tar.xz mirror://gentoo/texlive-module-ekaia.doc-2017.tar.xz mirror://gentoo/texlive-module-elbioimp.doc-2017.tar.xz mirror://gentoo/texlive-module-elsarticle.doc-2017.tar.xz mirror://gentoo/texlive-module-elteikthesis.doc-2017.tar.xz mirror://gentoo/texlive-module-emisa.doc-2017.tar.xz mirror://gentoo/texlive-module-erdc.doc-2017.tar.xz mirror://gentoo/texlive-module-estcpmm.doc-2017.tar.xz mirror://gentoo/texlive-module-fbithesis.doc-2017.tar.xz mirror://gentoo/texlive-module-fcavtex.doc-2017.tar.xz mirror://gentoo/texlive-module-fcltxdoc.doc-2017.tar.xz mirror://gentoo/texlive-module-fei.doc-2017.tar.xz mirror://gentoo/texlive-module-gaceta.doc-2017.tar.xz mirror://gentoo/texlive-module-gatech-thesis.doc-2017.tar.xz mirror://gentoo/texlive-module-gradstudentresume.doc-2017.tar.xz mirror://gentoo/texlive-module-grant.doc-2017.tar.xz mirror://gentoo/texlive-module-gsemthesis.doc-2017.tar.xz mirror://gentoo/texlive-module-gzt.doc-2017.tar.xz mirror://gentoo/texlive-module-h2020proposal.doc-2017.tar.xz mirror://gentoo/texlive-module-har2nat.doc-2017.tar.xz mirror://gentoo/texlive-module-hobete.doc-2017.tar.xz mirror://gentoo/texlive-module-hustthesis.doc-2017.tar.xz mirror://gentoo/texlive-module-icsv.doc-2017.tar.xz mirror://gentoo/texlive-module-ieeepes.doc-2017.tar.xz mirror://gentoo/texlive-module-ijmart.doc-2017.tar.xz mirror://gentoo/texlive-module-ijsra.doc-2017.tar.xz mirror://gentoo/texlive-module-imac.doc-2017.tar.xz mirror://gentoo/texlive-module-imtekda.doc-2017.tar.xz mirror://gentoo/texlive-module-iscram.doc-2017.tar.xz mirror://gentoo/texlive-module-jacow.doc-2017.tar.xz mirror://gentoo/texlive-module-jmlr.doc-2017.tar.xz mirror://gentoo/texlive-module-jpsj.doc-2017.tar.xz mirror://gentoo/texlive-module-kdgdocs.doc-2017.tar.xz mirror://gentoo/texlive-module-kluwer.doc-2017.tar.xz mirror://gentoo/texlive-module-ksp-thesis.doc-2017.tar.xz mirror://gentoo/texlive-module-langsci.doc-2017.tar.xz mirror://gentoo/texlive-module-lion-msc.doc-2017.tar.xz mirror://gentoo/texlive-module-lni.doc-2017.tar.xz mirror://gentoo/texlive-module-lps.doc-2017.tar.xz mirror://gentoo/texlive-module-matc3.doc-2017.tar.xz mirror://gentoo/texlive-module-matc3mem.doc-2017.tar.xz mirror://gentoo/texlive-module-mcmthesis.doc-2017.tar.xz mirror://gentoo/texlive-module-mentis.doc-2017.tar.xz mirror://gentoo/texlive-module-mnras.doc-2017.tar.xz mirror://gentoo/texlive-module-msu-thesis.doc-2017.tar.xz mirror://gentoo/texlive-module-mucproc.doc-2017.tar.xz mirror://gentoo/texlive-module-mugsthesis.doc-2017.tar.xz mirror://gentoo/texlive-module-musuos.doc-2017.tar.xz mirror://gentoo/texlive-module-muthesis.doc-2017.tar.xz mirror://gentoo/texlive-module-mynsfc.doc-2017.tar.xz mirror://gentoo/texlive-module-nature.doc-2017.tar.xz mirror://gentoo/texlive-module-navydocs.doc-2017.tar.xz mirror://gentoo/texlive-module-nddiss.doc-2017.tar.xz mirror://gentoo/texlive-module-ndsu-thesis.doc-2017.tar.xz mirror://gentoo/texlive-module-novel.doc-2017.tar.xz mirror://gentoo/texlive-module-nwejm.doc-2017.tar.xz mirror://gentoo/texlive-module-nih.doc-2017.tar.xz mirror://gentoo/texlive-module-nihbiosketch.doc-2017.tar.xz mirror://gentoo/texlive-module-nostarch.doc-2017.tar.xz mirror://gentoo/texlive-module-nrc.doc-2017.tar.xz mirror://gentoo/texlive-module-onrannual.doc-2017.tar.xz mirror://gentoo/texlive-module-opteng.doc-2017.tar.xz mirror://gentoo/texlive-module-philosophersimprint.doc-2017.tar.xz mirror://gentoo/texlive-module-pittetd.doc-2017.tar.xz mirror://gentoo/texlive-module-pkuthss.doc-2017.tar.xz mirror://gentoo/texlive-module-powerdot-FUBerlin.doc-2017.tar.xz mirror://gentoo/texlive-module-pracjourn.doc-2017.tar.xz mirror://gentoo/texlive-module-procIAGssymp.doc-2017.tar.xz mirror://gentoo/texlive-module-proposal.doc-2017.tar.xz mirror://gentoo/texlive-module-ptptex.doc-2017.tar.xz mirror://gentoo/texlive-module-psu-thesis.doc-2017.tar.xz mirror://gentoo/texlive-module-resphilosophica.doc-2017.tar.xz mirror://gentoo/texlive-module-resumecls.doc-2017.tar.xz mirror://gentoo/texlive-module-revtex.doc-2017.tar.xz mirror://gentoo/texlive-module-revtex4.doc-2017.tar.xz mirror://gentoo/texlive-module-ryethesis.doc-2017.tar.xz mirror://gentoo/texlive-module-sageep.doc-2017.tar.xz mirror://gentoo/texlive-module-sapthesis.doc-2017.tar.xz mirror://gentoo/texlive-module-scrjrnl.doc-2017.tar.xz mirror://gentoo/texlive-module-schule.doc-2017.tar.xz mirror://gentoo/texlive-module-sduthesis.doc-2017.tar.xz mirror://gentoo/texlive-module-seuthesis.doc-2017.tar.xz mirror://gentoo/texlive-module-seuthesix.doc-2017.tar.xz mirror://gentoo/texlive-module-soton.doc-2017.tar.xz mirror://gentoo/texlive-module-sphdthesis.doc-2017.tar.xz mirror://gentoo/texlive-module-spie.doc-2017.tar.xz mirror://gentoo/texlive-module-sr-vorl.doc-2017.tar.xz mirror://gentoo/texlive-module-stellenbosch.doc-2017.tar.xz mirror://gentoo/texlive-module-suftesi.doc-2017.tar.xz mirror://gentoo/texlive-module-sugconf.doc-2017.tar.xz mirror://gentoo/texlive-module-tabriz-thesis.doc-2017.tar.xz mirror://gentoo/texlive-module-thesis-ekf.doc-2017.tar.xz mirror://gentoo/texlive-module-thesis-titlepage-fhac.doc-2017.tar.xz mirror://gentoo/texlive-module-thuthesis.doc-2017.tar.xz mirror://gentoo/texlive-module-toptesi.doc-2017.tar.xz mirror://gentoo/texlive-module-tudscr.doc-2017.tar.xz mirror://gentoo/texlive-module-tugboat.doc-2017.tar.xz mirror://gentoo/texlive-module-tugboat-plain.doc-2017.tar.xz mirror://gentoo/texlive-module-turabian.doc-2017.tar.xz mirror://gentoo/texlive-module-tui.doc-2017.tar.xz mirror://gentoo/texlive-module-uaclasses.doc-2017.tar.xz mirror://gentoo/texlive-module-uafthesis.doc-2017.tar.xz mirror://gentoo/texlive-module-uantwerpendocs.doc-2017.tar.xz mirror://gentoo/texlive-module-ucbthesis.doc-2017.tar.xz mirror://gentoo/texlive-module-ucdavisthesis.doc-2017.tar.xz mirror://gentoo/texlive-module-ucthesis.doc-2017.tar.xz mirror://gentoo/texlive-module-uestcthesis.doc-2017.tar.xz mirror://gentoo/texlive-module-uhhassignment.doc-2017.tar.xz mirror://gentoo/texlive-module-uiucredborder.doc-2017.tar.xz mirror://gentoo/texlive-module-uiucthesis.doc-2017.tar.xz mirror://gentoo/texlive-module-ulthese.doc-2017.tar.xz mirror://gentoo/texlive-module-umbclegislation.doc-2017.tar.xz mirror://gentoo/texlive-module-umthesis.doc-2017.tar.xz mirror://gentoo/texlive-module-umich-thesis.doc-2017.tar.xz mirror://gentoo/texlive-module-unamth-template.doc-2017.tar.xz mirror://gentoo/texlive-module-unamthesis.doc-2017.tar.xz mirror://gentoo/texlive-module-unswcover.doc-2017.tar.xz mirror://gentoo/texlive-module-uothesis.doc-2017.tar.xz mirror://gentoo/texlive-module-urcls.doc-2017.tar.xz mirror://gentoo/texlive-module-uowthesis.doc-2017.tar.xz mirror://gentoo/texlive-module-uowthesistitlepage.doc-2017.tar.xz mirror://gentoo/texlive-module-uspatent.doc-2017.tar.xz mirror://gentoo/texlive-module-ut-thesis.doc-2017.tar.xz mirror://gentoo/texlive-module-uwthesis.doc-2017.tar.xz mirror://gentoo/texlive-module-vancouver.doc-2017.tar.xz mirror://gentoo/texlive-module-xduthesis.doc-2017.tar.xz mirror://gentoo/texlive-module-wsemclassic.doc-2017.tar.xz mirror://gentoo/texlive-module-xcookybooky.doc-2017.tar.xz mirror://gentoo/texlive-module-yathesis.doc-2017.tar.xz mirror://gentoo/texlive-module-york-thesis.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-IEEEconf.source-2017.tar.xz mirror://gentoo/texlive-module-acmart.source-2017.tar.xz mirror://gentoo/texlive-module-acmconf.source-2017.tar.xz mirror://gentoo/texlive-module-active-conf.source-2017.tar.xz mirror://gentoo/texlive-module-adfathesis.source-2017.tar.xz mirror://gentoo/texlive-module-afparticle.source-2017.tar.xz mirror://gentoo/texlive-module-aiaa.source-2017.tar.xz mirror://gentoo/texlive-module-aomart.source-2017.tar.xz mirror://gentoo/texlive-module-apa6.source-2017.tar.xz mirror://gentoo/texlive-module-apa6e.source-2017.tar.xz mirror://gentoo/texlive-module-articleingud.source-2017.tar.xz mirror://gentoo/texlive-module-bangorcsthesis.source-2017.tar.xz mirror://gentoo/texlive-module-bangorexam.source-2017.tar.xz mirror://gentoo/texlive-module-bgteubner.source-2017.tar.xz mirror://gentoo/texlive-module-brandeis-dissertation.source-2017.tar.xz mirror://gentoo/texlive-module-confproc.source-2017.tar.xz mirror://gentoo/texlive-module-cquthesis.source-2017.tar.xz mirror://gentoo/texlive-module-dccpaper.source-2017.tar.xz mirror://gentoo/texlive-module-ebsthesis.source-2017.tar.xz mirror://gentoo/texlive-module-ejpecp.source-2017.tar.xz mirror://gentoo/texlive-module-ekaia.source-2017.tar.xz mirror://gentoo/texlive-module-elbioimp.source-2017.tar.xz mirror://gentoo/texlive-module-elsarticle.source-2017.tar.xz mirror://gentoo/texlive-module-elteikthesis.source-2017.tar.xz mirror://gentoo/texlive-module-emisa.source-2017.tar.xz mirror://gentoo/texlive-module-erdc.source-2017.tar.xz mirror://gentoo/texlive-module-estcpmm.source-2017.tar.xz mirror://gentoo/texlive-module-fbithesis.source-2017.tar.xz mirror://gentoo/texlive-module-fcltxdoc.source-2017.tar.xz mirror://gentoo/texlive-module-fei.source-2017.tar.xz mirror://gentoo/texlive-module-grant.source-2017.tar.xz mirror://gentoo/texlive-module-gsemthesis.source-2017.tar.xz mirror://gentoo/texlive-module-gzt.source-2017.tar.xz mirror://gentoo/texlive-module-hustthesis.source-2017.tar.xz mirror://gentoo/texlive-module-icsv.source-2017.tar.xz mirror://gentoo/texlive-module-ijmart.source-2017.tar.xz mirror://gentoo/texlive-module-imtekda.source-2017.tar.xz mirror://gentoo/texlive-module-jmlr.source-2017.tar.xz mirror://gentoo/texlive-module-kdgdocs.source-2017.tar.xz mirror://gentoo/texlive-module-kluwer.source-2017.tar.xz mirror://gentoo/texlive-module-lni.source-2017.tar.xz mirror://gentoo/texlive-module-lps.source-2017.tar.xz mirror://gentoo/texlive-module-matc3.source-2017.tar.xz mirror://gentoo/texlive-module-matc3mem.source-2017.tar.xz mirror://gentoo/texlive-module-mcmthesis.source-2017.tar.xz mirror://gentoo/texlive-module-mentis.source-2017.tar.xz mirror://gentoo/texlive-module-mucproc.source-2017.tar.xz mirror://gentoo/texlive-module-mugsthesis.source-2017.tar.xz mirror://gentoo/texlive-module-musuos.source-2017.tar.xz mirror://gentoo/texlive-module-mynsfc.source-2017.tar.xz mirror://gentoo/texlive-module-navydocs.source-2017.tar.xz mirror://gentoo/texlive-module-nddiss.source-2017.tar.xz mirror://gentoo/texlive-module-nwejm.source-2017.tar.xz mirror://gentoo/texlive-module-nostarch.source-2017.tar.xz mirror://gentoo/texlive-module-nrc.source-2017.tar.xz mirror://gentoo/texlive-module-philosophersimprint.source-2017.tar.xz mirror://gentoo/texlive-module-pittetd.source-2017.tar.xz mirror://gentoo/texlive-module-pracjourn.source-2017.tar.xz mirror://gentoo/texlive-module-proposal.source-2017.tar.xz mirror://gentoo/texlive-module-resphilosophica.source-2017.tar.xz mirror://gentoo/texlive-module-resumecls.source-2017.tar.xz mirror://gentoo/texlive-module-revtex.source-2017.tar.xz mirror://gentoo/texlive-module-revtex4.source-2017.tar.xz mirror://gentoo/texlive-module-ryethesis.source-2017.tar.xz mirror://gentoo/texlive-module-sageep.source-2017.tar.xz mirror://gentoo/texlive-module-scrjrnl.source-2017.tar.xz mirror://gentoo/texlive-module-schule.source-2017.tar.xz mirror://gentoo/texlive-module-sduthesis.source-2017.tar.xz mirror://gentoo/texlive-module-seuthesis.source-2017.tar.xz mirror://gentoo/texlive-module-seuthesix.source-2017.tar.xz mirror://gentoo/texlive-module-sr-vorl.source-2017.tar.xz mirror://gentoo/texlive-module-stellenbosch.source-2017.tar.xz mirror://gentoo/texlive-module-suftesi.source-2017.tar.xz mirror://gentoo/texlive-module-thesis-ekf.source-2017.tar.xz mirror://gentoo/texlive-module-thesis-titlepage-fhac.source-2017.tar.xz mirror://gentoo/texlive-module-thuthesis.source-2017.tar.xz mirror://gentoo/texlive-module-toptesi.source-2017.tar.xz mirror://gentoo/texlive-module-tudscr.source-2017.tar.xz mirror://gentoo/texlive-module-tugboat.source-2017.tar.xz mirror://gentoo/texlive-module-uaclasses.source-2017.tar.xz mirror://gentoo/texlive-module-uantwerpendocs.source-2017.tar.xz mirror://gentoo/texlive-module-ucdavisthesis.source-2017.tar.xz mirror://gentoo/texlive-module-uhhassignment.source-2017.tar.xz mirror://gentoo/texlive-module-uiucredborder.source-2017.tar.xz mirror://gentoo/texlive-module-uiucthesis.source-2017.tar.xz mirror://gentoo/texlive-module-ulthese.source-2017.tar.xz mirror://gentoo/texlive-module-uothesis.source-2017.tar.xz mirror://gentoo/texlive-module-xduthesis.source-2017.tar.xz mirror://gentoo/texlive-module-wsemclassic.source-2017.tar.xz mirror://gentoo/texlive-module-xcookybooky.source-2017.tar.xz mirror://gentoo/texlive-module-yathesis.source-2017.tar.xz mirror://gentoo/texlive-module-york-thesis.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b05de7d499fb6b77a46441a1e4d1a441
+_md5_=fb7c2933dc9a321c6e0f24a0fe277d1b
diff --git a/metadata/md5-cache/dev-texlive/texlive-xetex-2017 b/metadata/md5-cache/dev-texlive/texlive-xetex-2017
index 515a0215f07e..6c95a6b1ae73 100644
--- a/metadata/md5-cache/dev-texlive/texlive-xetex-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-xetex-2017
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive XeTeX and packages
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=X source doc
-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 ~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 ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0 GPL-1 GPL-2 LPPL-1.2 LPPL-1.3 LPPL-1.3c OFL public-domain TeX-other-free
 RDEPEND=>=dev-texlive/texlive-basic-2017 !=app-text/texlive-core-2007* >=dev-texlive/texlive-latexextra-2010 >=app-text/texlive-core-2010[xetex] dev-texlive/texlive-mathscience !<dev-texlive/texlive-mathextra-2012 dev-texlive/texlive-luatex >=app-text/texlive-core-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-arabxetex-2017.tar.xz mirror://gentoo/texlive-module-awesomebox-2017.tar.xz mirror://gentoo/texlive-module-bidi-atbegshi-2017.tar.xz mirror://gentoo/texlive-module-bidicontour-2017.tar.xz mirror://gentoo/texlive-module-bidipagegrid-2017.tar.xz mirror://gentoo/texlive-module-bidishadowtext-2017.tar.xz mirror://gentoo/texlive-module-bidipresentation-2017.tar.xz mirror://gentoo/texlive-module-fixlatvian-2017.tar.xz mirror://gentoo/texlive-module-font-change-xetex-2017.tar.xz mirror://gentoo/texlive-module-fontbook-2017.tar.xz mirror://gentoo/texlive-module-fontwrap-2017.tar.xz mirror://gentoo/texlive-module-interchar-2017.tar.xz mirror://gentoo/texlive-module-philokalia-2017.tar.xz mirror://gentoo/texlive-module-ptext-2017.tar.xz mirror://gentoo/texlive-module-quran-2017.tar.xz mirror://gentoo/texlive-module-realscripts-2017.tar.xz mirror://gentoo/texlive-module-simple-resume-cv-2017.tar.xz mirror://gentoo/texlive-module-simple-thesis-dissertation-2017.tar.xz mirror://gentoo/texlive-module-ucharclasses-2017.tar.xz mirror://gentoo/texlive-module-unicode-bidi-2017.tar.xz mirror://gentoo/texlive-module-unisugar-2017.tar.xz mirror://gentoo/texlive-module-xebaposter-2017.tar.xz mirror://gentoo/texlive-module-xecjk-2017.tar.xz mirror://gentoo/texlive-module-xecolor-2017.tar.xz mirror://gentoo/texlive-module-xecyr-2017.tar.xz mirror://gentoo/texlive-module-xeindex-2017.tar.xz mirror://gentoo/texlive-module-xesearch-2017.tar.xz mirror://gentoo/texlive-module-xespotcolor-2017.tar.xz mirror://gentoo/texlive-module-xetex-2017.tar.xz mirror://gentoo/texlive-module-xetex-itrans-2017.tar.xz mirror://gentoo/texlive-module-xetex-pstricks-2017.tar.xz mirror://gentoo/texlive-module-xetex-tibetan-2017.tar.xz mirror://gentoo/texlive-module-xetexconfig-2017.tar.xz mirror://gentoo/texlive-module-xetexfontinfo-2017.tar.xz mirror://gentoo/texlive-module-xetexko-2017.tar.xz mirror://gentoo/texlive-module-xevlna-2017.tar.xz mirror://gentoo/texlive-module-collection-xetex-2017.tar.xz doc? ( mirror://gentoo/texlive-module-arabxetex.doc-2017.tar.xz mirror://gentoo/texlive-module-awesomebox.doc-2017.tar.xz mirror://gentoo/texlive-module-bidi-atbegshi.doc-2017.tar.xz mirror://gentoo/texlive-module-bidicontour.doc-2017.tar.xz mirror://gentoo/texlive-module-bidipagegrid.doc-2017.tar.xz mirror://gentoo/texlive-module-bidishadowtext.doc-2017.tar.xz mirror://gentoo/texlive-module-bidipresentation.doc-2017.tar.xz mirror://gentoo/texlive-module-fixlatvian.doc-2017.tar.xz mirror://gentoo/texlive-module-font-change-xetex.doc-2017.tar.xz mirror://gentoo/texlive-module-fontbook.doc-2017.tar.xz mirror://gentoo/texlive-module-fontwrap.doc-2017.tar.xz mirror://gentoo/texlive-module-interchar.doc-2017.tar.xz mirror://gentoo/texlive-module-philokalia.doc-2017.tar.xz mirror://gentoo/texlive-module-ptext.doc-2017.tar.xz mirror://gentoo/texlive-module-quran.doc-2017.tar.xz mirror://gentoo/texlive-module-realscripts.doc-2017.tar.xz mirror://gentoo/texlive-module-simple-resume-cv.doc-2017.tar.xz mirror://gentoo/texlive-module-simple-thesis-dissertation.doc-2017.tar.xz mirror://gentoo/texlive-module-ucharclasses.doc-2017.tar.xz mirror://gentoo/texlive-module-unicode-bidi.doc-2017.tar.xz mirror://gentoo/texlive-module-unisugar.doc-2017.tar.xz mirror://gentoo/texlive-module-xebaposter.doc-2017.tar.xz mirror://gentoo/texlive-module-xecjk.doc-2017.tar.xz mirror://gentoo/texlive-module-xecolor.doc-2017.tar.xz mirror://gentoo/texlive-module-xecyr.doc-2017.tar.xz mirror://gentoo/texlive-module-xeindex.doc-2017.tar.xz mirror://gentoo/texlive-module-xesearch.doc-2017.tar.xz mirror://gentoo/texlive-module-xespotcolor.doc-2017.tar.xz mirror://gentoo/texlive-module-xetex.doc-2017.tar.xz mirror://gentoo/texlive-module-xetex-itrans.doc-2017.tar.xz mirror://gentoo/texlive-module-xetex-pstricks.doc-2017.tar.xz mirror://gentoo/texlive-module-xetex-tibetan.doc-2017.tar.xz mirror://gentoo/texlive-module-xetexfontinfo.doc-2017.tar.xz mirror://gentoo/texlive-module-xetexko.doc-2017.tar.xz mirror://gentoo/texlive-module-xevlna.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-arabxetex.source-2017.tar.xz mirror://gentoo/texlive-module-fixlatvian.source-2017.tar.xz mirror://gentoo/texlive-module-fontbook.source-2017.tar.xz mirror://gentoo/texlive-module-philokalia.source-2017.tar.xz mirror://gentoo/texlive-module-realscripts.source-2017.tar.xz mirror://gentoo/texlive-module-xecjk.source-2017.tar.xz mirror://gentoo/texlive-module-xespotcolor.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	font	82836641e7d4639329d8c195234ad0e3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6575a4b3939617e27f02a0e4f11a400a
+_md5_=ad472b8434883efe013ea872e22c5c45
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 3a5eff4646b0..82792020fd8c 100644
--- a/metadata/md5-cache/dev-util/Manifest.gz
+++ b/metadata/md5-cache/dev-util/Manifest.gz
diff --git a/metadata/md5-cache/dev-util/bluej-3.1.1 b/metadata/md5-cache/dev-util/bluej-3.1.1
index 88a5161760a3..374117b30f1b 100644
--- a/metadata/md5-cache/dev-util/bluej-3.1.1
+++ b/metadata/md5-cache/dev-util/bluej-3.1.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jdk-1.5.0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://www.bluej.org/download/files/source/BlueJ-source-311.zip doc? ( http://bluej.org/download/files/bluej-ref-manual.pdf http://bluej.org/tutorial/tutorial-201.pdf -> bluej-tutorial-2.0.1.pdf http://bluej.org/tutorial/testing-tutorial.pdf -> bluej-testing-tutorial.pdf )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=c5d0afa10607f68055b9999027a5c59b
diff --git a/metadata/md5-cache/dev-util/clion-2017.3.3 b/metadata/md5-cache/dev-util/clion-2017.3.4
index f1ab6d8c3ef3..e717e87a457b 100644
--- a/metadata/md5-cache/dev-util/clion-2017.3.3
+++ b/metadata/md5-cache/dev-util/clion-2017.3.4
@@ -6,6 +6,6 @@ KEYWORDS=~amd64 ~x86
 LICENSE=IDEA || ( IDEA_Academic IDEA_Classroom IDEA_OpenSource IDEA_Personal )
 RDEPEND=sys-devel/gdb dev-util/cmake
 SLOT=0
-SRC_URI=http://download.jetbrains.com/cpp/CLion-2017.3.3.tar.gz -> clion-2017.3.3.tar.gz
+SRC_URI=http://download.jetbrains.com/cpp/CLion-2017.3.4.tar.gz -> clion-2017.3.4.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b4c8c9f2e79a20fd951ed2379a394643
+_md5_=9d6aad82957b1fa26df263cdf0ec2f6c
diff --git a/metadata/md5-cache/dev-util/cmdtest-0.30 b/metadata/md5-cache/dev-util/cmdtest-0.30
index b1c28361838a..55c215347971 100644
--- a/metadata/md5-cache/dev-util/cmdtest-0.30
+++ b/metadata/md5-cache/dev-util/cmdtest-0.30
@@ -4,11 +4,11 @@ DESCRIPTION=black box tests Unix command line tools
 EAPI=6
 HOMEPAGE=http://liw.fi/cmdtest/
 IUSE=python_targets_python2_7
-KEYWORDS=alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd
 LICENSE=GPL-3
 RDEPEND=dev-python/cliapp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/markdown[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/ttystatus[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=http://code.liw.fi/debian/pool/main/c/cmdtest/cmdtest_0.30.orig.tar.xz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5e2a3a6ee0d4010236bb5066877134de
+_md5_=928ee023cb6b2adeda9cffa6da0fd5b5
diff --git a/metadata/md5-cache/dev-util/dialog-1.3.20170131 b/metadata/md5-cache/dev-util/dialog-1.3.20170131
index 5b10f5503a05..287af6eb44f8 100644
--- a/metadata/md5-cache/dev-util/dialog-1.3.20170131
+++ b/metadata/md5-cache/dev-util/dialog-1.3.20170131
@@ -4,10 +4,10 @@ DESCRIPTION=tool to display dialog boxes from a shell
 EAPI=6
 HOMEPAGE=http://invisible-island.net/dialog/dialog.html
 IUSE=examples minimal nls static-libs unicode
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=sys-libs/ncurses-5.2-r5:=[unicode?]
 SLOT=0/14
 SRC_URI=ftp://invisible-island.net/dialog/dialog-1.3-20170131.tgz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=49039cdf273c4c57df3c9686fbd9a34a
+_md5_=99da05e4d25f9390f931386476c90255
diff --git a/metadata/md5-cache/dev-util/findbugs-3.0.1 b/metadata/md5-cache/dev-util/findbugs-3.0.1
index 9da614ab3832..81bee99ea073 100644
--- a/metadata/md5-cache/dev-util/findbugs-3.0.1
+++ b/metadata/md5-cache/dev-util/findbugs-3.0.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.7 dev-java/ant-core:0 dev-java/apple-java-extensions-bin:0 >=dev-java/asm-5:4 >=dev-java/bcel-6:0 dev-java/commons-lang:2.1 dev-java/dom4j:1 dev-java/hamcrest-core:1.3 dev-java/jaxen:1.1 dev-java/jcip-annotations:0 dev-java/jdepend:0 >=dev-java/jformatstring-2.0.3:0 dev-java/jsr305:0 dev-java/junit:4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/findbugs/findbugs-3.0.1-source.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=4b93e1ca964013bde01f0d8ef06db610
diff --git a/metadata/md5-cache/dev-util/jarwizard-2.50 b/metadata/md5-cache/dev-util/jarwizard-2.50
index 8ffa1abd3a79..8a1a6d5e2fae 100644
--- a/metadata/md5-cache/dev-util/jarwizard-2.50
+++ b/metadata/md5-cache/dev-util/jarwizard-2.50
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=mirror://sourceforge/jarwizard/jarwizard_250_src.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=8339b6985257c47928d7a804ceac6b61
diff --git a/metadata/md5-cache/dev-util/jconfig-2.8-r3 b/metadata/md5-cache/dev-util/jconfig-2.8-r3
index 8661c8a041a2..7180755a9c0c 100644
--- a/metadata/md5-cache/dev-util/jconfig-2.8-r3
+++ b/metadata/md5-cache/dev-util/jconfig-2.8-r3
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.4 java-virtuals/jmx >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/jconfig/jconfig-src-v2.8.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=57c63a68bc36a58609302dcdb1f90a5c
diff --git a/metadata/md5-cache/dev-util/jconfig-2.8.5 b/metadata/md5-cache/dev-util/jconfig-2.8.5
index 7acbdf2f6b8a..678f6080aac9 100644
--- a/metadata/md5-cache/dev-util/jconfig-2.8.5
+++ b/metadata/md5-cache/dev-util/jconfig-2.8.5
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.4 java-virtuals/jmx >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/jconfig/jconfig-src-v2.8.5.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=57c63a68bc36a58609302dcdb1f90a5c
diff --git a/metadata/md5-cache/dev-util/jconfig-2.9 b/metadata/md5-cache/dev-util/jconfig-2.9
index 2bf3292c3019..8881a0679150 100644
--- a/metadata/md5-cache/dev-util/jconfig-2.9
+++ b/metadata/md5-cache/dev-util/jconfig-2.9
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.6 java-virtuals/jmx >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/jconfig/jconfig-src-v2.9.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=45bf6322487ba3dfa28e4500ecbaa393
diff --git a/metadata/md5-cache/dev-util/meson-0.45.0-r1 b/metadata/md5-cache/dev-util/meson-0.45.1
index bd3136ee6918..700f0e9efe43 100644
--- a/metadata/md5-cache/dev-util/meson-0.45.0-r1
+++ b/metadata/md5-cache/dev-util/meson-0.45.1
@@ -10,6 +10,6 @@ RDEPEND=python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
 RESTRICT=test
 SLOT=0
-SRC_URI=mirror://pypi/m/meson/meson-0.45.0.tar.gz
+SRC_URI=mirror://pypi/m/meson/meson-0.45.1.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=2261cdd8f8e5a10a3d1b1569dd8b1ddd
diff --git a/metadata/md5-cache/dev-util/mingw64-runtime-5.0.3-r1 b/metadata/md5-cache/dev-util/mingw64-runtime-5.0.3-r1
index 92a796d24bf2..b061b956d0cb 100644
--- a/metadata/md5-cache/dev-util/mingw64-runtime-5.0.3-r1
+++ b/metadata/md5-cache/dev-util/mingw64-runtime-5.0.3-r1
@@ -10,4 +10,4 @@ RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://sourceforge/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v5.0.3.tar.bz2
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=01af51c54e2846332ff7f1a11c43d1ae
+_md5_=5a92e4b94efd4874f383eb81420c8af6
diff --git a/metadata/md5-cache/dev-util/mingw64-runtime-5.0.3-r2 b/metadata/md5-cache/dev-util/mingw64-runtime-5.0.3-r2
new file mode 100644
index 000000000000..11954099566e
--- /dev/null
+++ b/metadata/md5-cache/dev-util/mingw64-runtime-5.0.3-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare setup
+DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 =sys-devel/automake-1.15* >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Free Win64 runtime and import library definitions
+EAPI=6
+HOMEPAGE=http://mingw-w64.sourceforge.net/
+IUSE=headers-only idl libraries tools
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RESTRICT=strip
+SLOT=0
+SRC_URI=mirror://sourceforge/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v5.0.3.tar.bz2
+_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=1685cba60f82bacbceb988d48c2eae68
diff --git a/metadata/md5-cache/dev-util/netbeans-8.2 b/metadata/md5-cache/dev-util/netbeans-8.2
index a500e39f01c8..523fb526aeb6 100644
--- a/metadata/md5-cache/dev-util/netbeans-8.2
+++ b/metadata/md5-cache/dev-util/netbeans-8.2
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=virtual/jdk:1.8 ~dev-java/netbeans-harness-8.2 ~dev-java/netbeans-ide-8.2 ~dev-java/netbeans-nb-8.2 ~dev-java/netbeans-platform-8.2 netbeans_modules_apisupport? ( ~dev-java/netbeans-apisupport-8.2 ) netbeans_modules_cnd? ( ~dev-java/netbeans-cnd-8.2 ) netbeans_modules_dlight? ( ~dev-java/netbeans-dlight-8.2 ) netbeans_modules_enterprise? ( ~dev-java/netbeans-enterprise-8.2 ) netbeans_modules_ergonomics? ( ~dev-java/netbeans-ergonomics-8.2 ) netbeans_modules_extide? ( ~dev-java/netbeans-extide-8.2 ) netbeans_modules_groovy? ( ~dev-java/netbeans-groovy-8.2 ) netbeans_modules_java? ( ~dev-java/netbeans-java-8.2 ) netbeans_modules_javacard? ( ~dev-java/netbeans-javacard-8.2 ) netbeans_modules_javafx? ( ~dev-java/netbeans-javafx-8.2 ) netbeans_modules_mobility? ( ~dev-java/netbeans-mobility-8.2 ) netbeans_modules_php? ( ~dev-java/netbeans-php-8.2 ) netbeans_modules_profiler? ( ~dev-java/netbeans-profiler-8.2 ) netbeans_modules_webcommon? ( ~dev-java/netbeans-webcommon-8.2 ) netbeans_modules_websvccommon? ( ~dev-java/netbeans-websvccommon-8.2 ) doc? ( ~dev-java/netbeans-javadoc-8.2 ) >=dev-java/java-config-2.2.0-r3
 SLOT=8.2
 SRC_URI=l10n_af? ( http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2 https://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.2-20160920.tar.bz2 ) l10n_ar? ( http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2 https://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.2-20160920.tar.bz2 ) l10n_bg? ( http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2 https://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.2-20160920.tar.bz2 ) l10n_ca? ( http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2 https://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.2-20160920.tar.bz2 ) l10n_cs? ( http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2 https://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.2-20160920.tar.bz2 ) l10n_de? ( http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2 https://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.2-20160920.tar.bz2 ) l10n_el? ( http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2 https://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.2-20160920.tar.bz2 ) l10n_es? ( http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2 https://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.2-20160920.tar.bz2 ) l10n_fil? ( http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2 https://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.2-20160920.tar.bz2 ) l10n_fr? ( http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2 https://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.2-20160920.tar.bz2 ) l10n_gl? ( http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2 https://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.2-20160920.tar.bz2 ) l10n_hi? ( http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2 https://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.2-20160920.tar.bz2 ) l10n_id? ( http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2 https://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.2-20160920.tar.bz2 ) l10n_it? ( http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2 https://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.2-20160920.tar.bz2 ) l10n_ja? ( http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2 https://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.2-20160920.tar.bz2 ) l10n_ko? ( http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2 https://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.2-20160920.tar.bz2 ) l10n_lt? ( http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2 https://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.2-20160920.tar.bz2 ) l10n_nl? ( http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2 https://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.2-20160920.tar.bz2 ) l10n_pl? ( http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2 https://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.2-20160920.tar.bz2 ) l10n_pt-BR? ( http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2 https://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.2-20160920.tar.bz2 ) l10n_pt-PT? ( http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2 https://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.2-20160920.tar.bz2 ) l10n_ro? ( http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2 https://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.2-20160920.tar.bz2 ) l10n_ru? ( http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2 https://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.2-20160920.tar.bz2 ) l10n_si? ( http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2 https://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.2-20160920.tar.bz2 ) l10n_sq? ( http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2 https://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.2-20160920.tar.bz2 ) l10n_sr? ( http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2 https://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.2-20160920.tar.bz2 ) l10n_sv? ( http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2 https://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.2-20160920.tar.bz2 ) l10n_ta? ( http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2 https://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.2-20160920.tar.bz2 ) l10n_tr? ( http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2 https://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.2-20160920.tar.bz2 ) l10n_vi? ( http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2 https://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.2-20160920.tar.bz2 ) l10n_zh-CN? ( http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2 https://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.2-20160920.tar.bz2 ) l10n_zh-TW? ( http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2 https://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.2-20160920.tar.bz2 )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=7ba8fe67904b9efddc65e179586cbd20
diff --git a/metadata/md5-cache/dev-util/pmd-4.2.5 b/metadata/md5-cache/dev-util/pmd-4.2.5
index 22c42f0717e9..d0e60a5c895a 100644
--- a/metadata/md5-cache/dev-util/pmd-4.2.5
+++ b/metadata/md5-cache/dev-util/pmd-4.2.5
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 dev-java/ant-core dev-java/asm:3 dev-java/jaxen:1.1 >=
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/pmd/pmd-src-4.2.5.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=563ada3d854efc902bbfb07ced5eb6e3
diff --git a/metadata/md5-cache/dev-util/rosdep-0.11.8 b/metadata/md5-cache/dev-util/rosdep-0.12.2
index 6e8ca750a310..3ff9d5a313a2 100644
--- a/metadata/md5-cache/dev-util/rosdep-0.11.8
+++ b/metadata/md5-cache/dev-util/rosdep-0.12.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=dev-python/catkin_pkg[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/rospkg[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/rosdistro[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/pyyaml[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/nose[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? ( dev-python/coverage[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/mock[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= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_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(-)]
+DEPEND=dev-python/catkin_pkg[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/rospkg[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/rosdistro[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/pyyaml[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/nose[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? ( dev-python/coverage[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/mock[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/flake8[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= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_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=Command-line tool for installing ROS system dependencies
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosdep
@@ -9,6 +9,6 @@ LICENSE=BSD
 RDEPEND=dev-python/catkin_pkg[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/rospkg[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/rosdistro[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/pyyaml[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= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_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://download.ros.org/downloads/rosdep/rosdep-0.11.8.tar.gz https://github.com/ros-infrastructure/rosdep/archive/0.11.8.tar.gz -> rosdep-0.11.8.tar.gz
+SRC_URI=http://download.ros.org/downloads/rosdep/rosdep-0.12.2.tar.gz https://github.com/ros-infrastructure/rosdep/archive/0.12.2.tar.gz -> rosdep-0.12.2.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=90b296116b17712b52331e7bab814c50
+_md5_=cc0c08934d7fdad3ffc5255ab88cf1ce
diff --git a/metadata/md5-cache/dev-util/statifier-1.7.4 b/metadata/md5-cache/dev-util/statifier-1.7.4
index 2a99790a31cb..44026c60f688 100644
--- a/metadata/md5-cache/dev-util/statifier-1.7.4
+++ b/metadata/md5-cache/dev-util/statifier-1.7.4
@@ -2,9 +2,12 @@ DEFINED_PHASES=compile configure install prepare
 DESCRIPTION=Statifier is a tool for creating portable, self-containing Linux executables
 EAPI=6
 HOMEPAGE=http://statifier.sourceforge.net
+IUSE=abi_x86_32 abi_x86_64
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=app-shells/bash sys-apps/coreutils virtual/awk
+REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 )
 SLOT=0
 SRC_URI=https://sourceforge.net/projects/statifier/files/statifier/1.7.4/statifier-1.7.4.tar.gz
-_md5_=42e30edfc7f8e69dd8b90c5c6c305ca2
+_eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=b324acf2f299c6b8dafb2a28c0297f1e
diff --git a/metadata/md5-cache/dev-util/visualvm-1.3.9 b/metadata/md5-cache/dev-util/visualvm-1.3.9
index 3ec19babd334..b96c0b0ae880 100644
--- a/metadata/md5-cache/dev-util/visualvm-1.3.9
+++ b/metadata/md5-cache/dev-util/visualvm-1.3.9
@@ -9,5 +9,5 @@ LICENSE=GPL-2-with-linking-exception
 RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3
 SLOT=7
 SRC_URI=https://github.com/oracle/visualvm/archive/1.3.9.tar.gz -> visualvm-1.3.9.tar.gz https://github.com/oracle/visualvm/releases/download/1.3.9/nb802_visualvm_02102016.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=810435eceb09ac9065b4dbd66fa750ec
diff --git a/metadata/md5-cache/dev-util/weka-3.7.13 b/metadata/md5-cache/dev-util/weka-3.7.13
index a760ae6793af..330486626e62 100644
--- a/metadata/md5-cache/dev-util/weka-3.7.13
+++ b/metadata/md5-cache/dev-util/weka-3.7.13
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.6 >=dev-java/javacup-0.11a_beta20060608:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/weka/weka-3-7-13.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=c46dbb28d362ee494a805de1bc9ca256
diff --git a/metadata/md5-cache/dev-util/weka-3.8.0 b/metadata/md5-cache/dev-util/weka-3.8.0
index 64e4d477d54d..f2483da7a8ed 100644
--- a/metadata/md5-cache/dev-util/weka-3.8.0
+++ b/metadata/md5-cache/dev-util/weka-3.8.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.7 >=dev-java/javacup-0.11a_beta20060608:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/weka/weka-3-8-0.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=c5158bbf71027224721724572d44c2fc
diff --git a/metadata/md5-cache/dev-util/xfce4-dev-tools-4.12.0 b/metadata/md5-cache/dev-util/xfce4-dev-tools-4.12.0
deleted file mode 100644
index aba775c0e4c0..000000000000
--- a/metadata/md5-cache/dev-util/xfce4-dev-tools-4.12.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=>=dev-libs/glib-2.30 virtual/pkgconfig >=app-portage/elt-patches-20170422 >=sys-apps/sed-4
-DESCRIPTION=A set of scripts and m4/autoconf macros that ease build system maintenance
-EAPI=5
-HOMEPAGE=https://www.xfce.org/ http://users.xfce.org/~benny/projects/xfce4-dev-tools/
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.30
-SLOT=0
-SRC_URI=mirror://xfce/src/xfce/xfce4-dev-tools/4.12/xfce4-dev-tools-4.12.0.tar.bz2
-_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25	xfconf	25bb7fe99d6e58851633dc43d429c5ae
-_md5_=2d219e7ca70b38e8c85bfd27c8507620
diff --git a/metadata/md5-cache/games-action/Manifest.gz b/metadata/md5-cache/games-action/Manifest.gz
index 282f7cd205a3..884d466c1dd1 100644
--- a/metadata/md5-cache/games-action/Manifest.gz
+++ b/metadata/md5-cache/games-action/Manifest.gz
diff --git a/metadata/md5-cache/games-action/trine-1.08-r3 b/metadata/md5-cache/games-action/trine-1.08-r3
new file mode 100644
index 000000000000..dbfded3c6f3a
--- /dev/null
+++ b/metadata/md5-cache/games-action/trine-1.08-r3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install nofetch postinst postrm preinst prepare unpack
+DEPEND=app-admin/chrpath app-arch/unzip >=sys-apps/sed-4
+DESCRIPTION=A physics-based action game with character-dependent solutions to challenges
+EAPI=6
+HOMEPAGE=https://www.frozenbyte.com/games/trine-enchanted-edition
+IUSE=+launcher
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=frozenbyte-eula
+RDEPEND=media-gfx/nvidia-cg-toolkit >=media-libs/libsdl-1.2[opengl,video] >=media-libs/sdl-image-1.2 >=media-libs/sdl-ttf-2.0 >=media-libs/libvorbis-1.3 >=media-libs/openal-1.15 >=sys-devel/gcc-4.3.0 >=sys-libs/glibc-2.4 sys-libs/zlib x11-libs/gtk+:2 launcher? ( dev-libs/glib:2 gnome-base/libglade:2.0 )
+RESTRICT=bindist fetch strip
+SLOT=0
+SRC_URI=TrineUpdate4.64.run
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=5f9e04e0f615f5ae156d2f44510e2a69
diff --git a/metadata/md5-cache/games-action/trine-bin-1.08-r2 b/metadata/md5-cache/games-action/trine-bin-1.08-r2
deleted file mode 100644
index 4cd4cd9a64e3..000000000000
--- a/metadata/md5-cache/games-action/trine-bin-1.08-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install nofetch prepare unpack
-DEPEND=app-admin/chrpath app-arch/unzip
-DESCRIPTION=A physics-based action game with character-dependent solutions to challenges
-EAPI=6
-HOMEPAGE=http://trine-thegame.com/
-KEYWORDS=-* ~amd64 ~x86
-LICENSE=frozenbyte-eula
-RDEPEND=dev-libs/glib:2 dev-libs/libx86 gnome-base/libglade:2.0 media-libs/libogg media-libs/libpng:1.2 >=media-libs/libsdl-1.2[opengl,sound,video] >=media-libs/libvorbis-1.3 >=media-libs/openal-1.15 >=media-libs/tiff-3.9:3 >=sys-devel/gcc-4.3.0 >=sys-libs/glibc-2.4 virtual/jpeg:62 x11-libs/gtk+:2
-RESTRICT=fetch strip
-SLOT=0
-SRC_URI=TrineUpdate4.64.run
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=04d6f5044c03e226e84b645deecf45c0
diff --git a/metadata/md5-cache/games-action/trine-enchanted-edition-2.12.508 b/metadata/md5-cache/games-action/trine-enchanted-edition-2.12.508
new file mode 100644
index 000000000000..715005307071
--- /dev/null
+++ b/metadata/md5-cache/games-action/trine-enchanted-edition-2.12.508
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install nofetch postinst postrm preinst
+DEPEND=app-arch/unzip >=sys-apps/sed-4
+DESCRIPTION=The original sidescrolling action platformer under the Trine 2 engine
+EAPI=6
+HOMEPAGE=https://www.frozenbyte.com/games/trine-enchanted-edition
+IUSE=+launcher
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=all-rights-reserved
+RDEPEND=media-gfx/nvidia-cg-toolkit[abi_x86_32] media-libs/alsa-lib[abi_x86_32] media-libs/freetype:2[abi_x86_32] media-libs/libogg[abi_x86_32] >=media-libs/libvorbis-1.3[abi_x86_32] >=media-libs/openal-1.15[abi_x86_32] sys-libs/zlib[abi_x86_32] virtual/glu[abi_x86_32] virtual/opengl[abi_x86_32] launcher? ( dev-libs/glib:2[abi_x86_32] media-libs/libpng:1.2[abi_x86_32] x11-libs/gdk-pixbuf:2[abi_x86_32,X] x11-libs/gtk+:2[abi_x86_32] x11-libs/libX11[abi_x86_32] x11-libs/pango[abi_x86_32,X] )
+RESTRICT=bindist fetch splitdebug
+SLOT=0
+SRC_URI=trine_enchanted_edition_v2_12_build_508_humble_linux_full.zip
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=e0e4fec610ed625abc4d7a6bd9c41012
diff --git a/metadata/md5-cache/games-board/Manifest.gz b/metadata/md5-cache/games-board/Manifest.gz
index 62a820c9f51a..4b9d86166f75 100644
--- a/metadata/md5-cache/games-board/Manifest.gz
+++ b/metadata/md5-cache/games-board/Manifest.gz
diff --git a/metadata/md5-cache/games-board/domination-1.1.1.6-r1 b/metadata/md5-cache/games-board/domination-1.1.1.6-r1
index dec8056822d9..352dfbd0caae 100644
--- a/metadata/md5-cache/games-board/domination-1.1.1.6-r1
+++ b/metadata/md5-cache/games-board/domination-1.1.1.6-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=mirror://sourceforge/domination/Domination_1.1.1.6.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=d74338c88afc468e983379f2f0782e45
diff --git a/metadata/md5-cache/games-board/megamek-0.34.10-r1 b/metadata/md5-cache/games-board/megamek-0.34.10-r1
index 7c281b90b317..cd9fa773a375 100644
--- a/metadata/md5-cache/games-board/megamek-0.34.10-r1
+++ b/metadata/md5-cache/games-board/megamek-0.34.10-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=mirror://sourceforge/megamek/MegaMek-v0.34.10.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=cff4c6a187aaf596cc300a5ed36c3935
diff --git a/metadata/md5-cache/games-puzzle/Manifest.gz b/metadata/md5-cache/games-puzzle/Manifest.gz
index 1f760c0a9c9e..167fcf52fd60 100644
--- a/metadata/md5-cache/games-puzzle/Manifest.gz
+++ b/metadata/md5-cache/games-puzzle/Manifest.gz
diff --git a/metadata/md5-cache/games-puzzle/pauker-1.8 b/metadata/md5-cache/games-puzzle/pauker-1.8
index fda1941706ed..ba4c521b2dd1 100644
--- a/metadata/md5-cache/games-puzzle/pauker-1.8
+++ b/metadata/md5-cache/games-puzzle/pauker-1.8
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.5 dev-java/browserlauncher2:1.0 dev-java/javahelp dev-java/lucene:2.4 dev-java/swing-layout:1 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) games-misc/games-envd
 SLOT=0
 SRC_URI=mirror://sourceforge/pauker/pauker-1.8.src.jar
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	games	2bb3ede665927a68ffdb7c41eec7efde	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	games	2bb3ede665927a68ffdb7c41eec7efde	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=c8816f912863c1a311f1d34ac2d58186
diff --git a/metadata/md5-cache/games-strategy/Manifest.gz b/metadata/md5-cache/games-strategy/Manifest.gz
index 4babf652bafd..63d0ca9557aa 100644
--- a/metadata/md5-cache/games-strategy/Manifest.gz
+++ b/metadata/md5-cache/games-strategy/Manifest.gz
diff --git a/metadata/md5-cache/games-strategy/freecol-0.11.6 b/metadata/md5-cache/games-strategy/freecol-0.11.6
index 7879f63bc54b..94e76e42f83a 100644
--- a/metadata/md5-cache/games-strategy/freecol-0.11.6
+++ b/metadata/md5-cache/games-strategy/freecol-0.11.6
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/jre-1.8 dev-java/jsr173 dev-java/wstx:3.2 dev-java/commons-cli:1 dev-java/cortado dev-java/miglayout >=dev-java/java-config-2.2.0-r3 games-misc/games-envd
 SLOT=0
 SRC_URI=mirror://sourceforge/freecol/freecol-0.11.6-src.zip
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	games	2bb3ede665927a68ffdb7c41eec7efde	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	games	2bb3ede665927a68ffdb7c41eec7efde	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=25e048e64cca192c37301c3c19802b42
diff --git a/metadata/md5-cache/games-strategy/triplea-1.8.0.9-r1 b/metadata/md5-cache/games-strategy/triplea-1.8.0.9-r1
index ad2f3f827d75..63fd3556226f 100644
--- a/metadata/md5-cache/games-strategy/triplea-1.8.0.9-r1
+++ b/metadata/md5-cache/games-strategy/triplea-1.8.0.9-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-java/apple-java-extensions-bin:0 dev-java/commons-httpclient:3 dev-j
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/triplea/triplea_1_8_0_9_source_code_only.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=6f049f12f809fb0e5cbac394d9ff32c4
diff --git a/metadata/md5-cache/gnome-base/Manifest.gz b/metadata/md5-cache/gnome-base/Manifest.gz
index 9d86f8061d51..9c93dcd6deff 100644
--- a/metadata/md5-cache/gnome-base/Manifest.gz
+++ b/metadata/md5-cache/gnome-base/Manifest.gz
diff --git a/metadata/md5-cache/gnome-base/gnome-menus-3.10.1-r1 b/metadata/md5-cache/gnome-base/gnome-menus-3.10.1-r1
deleted file mode 100644
index 646c78d6f446..000000000000
--- a/metadata/md5-cache/gnome-base/gnome-menus-3.10.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=>=dev-libs/glib-2.29.15:2 introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) >=dev-util/intltool-0.40 sys-devel/gettext virtual/pkgconfig test? ( dev-libs/gjs ) >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Library for the Desktop Menu fd.o specification
-EAPI=5
-HOMEPAGE=https://git.gnome.org/browse/gnome-menus
-IUSE=debug +introspection test
-KEYWORDS=~alpha amd64 ~arm ~ia64 ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
-LICENSE=GPL-2+ LGPL-2+
-RDEPEND=>=dev-libs/glib-2.29.15:2 introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) !<gnome-base/gnome-menus-3.0.1-r1:0
-SLOT=3
-SRC_URI=mirror://gnome/sources/gnome-menus/3.10/gnome-menus-3.10.1.tar.xz https://dev.gentoo.org/~tetromino/distfiles/gnome-menus/gnome-menus-3.10.1-patches.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2eb5b8eaa07d24454a335a74e48532e4
diff --git a/metadata/md5-cache/gnome-base/gnome-menus-3.13.3 b/metadata/md5-cache/gnome-base/gnome-menus-3.13.3
deleted file mode 100644
index 003f8c3cb89a..000000000000
--- a/metadata/md5-cache/gnome-base/gnome-menus-3.13.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=>=dev-libs/glib-2.29.15:2 introspection? ( >=dev-libs/gobject-introspection-0.9.5:= ) >=dev-util/intltool-0.40 sys-devel/gettext virtual/pkgconfig test? ( dev-libs/gjs ) >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Library for the Desktop Menu fd.o specification
-EAPI=5
-HOMEPAGE=https://git.gnome.org/browse/gnome-menus
-IUSE=+introspection test debug
-KEYWORDS=~alpha amd64 ~arm ~ia64 ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
-LICENSE=GPL-2+ LGPL-2+
-RDEPEND=>=dev-libs/glib-2.29.15:2 introspection? ( >=dev-libs/gobject-introspection-0.9.5:= ) !<gnome-base/gnome-menus-3.0.1-r1:0
-SLOT=3
-SRC_URI=mirror://gnome/sources/gnome-menus/3.13/gnome-menus-3.13.3.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3a486faf910821501382858e58c7203e
diff --git a/metadata/md5-cache/gnome-extra/Manifest.gz b/metadata/md5-cache/gnome-extra/Manifest.gz
index 9a94d3486468..213a50d4c353 100644
--- a/metadata/md5-cache/gnome-extra/Manifest.gz
+++ b/metadata/md5-cache/gnome-extra/Manifest.gz
diff --git a/metadata/md5-cache/gnome-extra/gucharmap-10.0.3 b/metadata/md5-cache/gnome-extra/gucharmap-10.0.3
index 0c7dae91aa50..7d69ace38fef 100644
--- a/metadata/md5-cache/gnome-extra/gucharmap-10.0.3
+++ b/metadata/md5-cache/gnome-extra/gucharmap-10.0.3
@@ -4,11 +4,11 @@ DESCRIPTION=Unicode character map viewer and library
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Apps/Gucharmap
 IUSE=debug +introspection test vala
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ia64 ~ppc ~ppc64 ~sh sparc ~x86 ~x86-fbsd
 LICENSE=GPL-3
 RDEPEND==app-i18n/unicode-data-10.0* >=dev-libs/glib-2.32:2 >=x11-libs/pango-1.2.1[introspection?] >=x11-libs/gtk+-3.16:3[introspection?] introspection? ( >=dev-libs/gobject-introspection-0.9.0:= ) !<gnome-extra/gucharmap-3:0
 REQUIRED_USE=vala? ( introspection )
 SLOT=2.90
 SRC_URI=mirror://gnome/sources/gucharmap/10.0/gucharmap-10.0.3.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c01f45ca7d5abca4fe695e70af8e022d
+_md5_=8d9b94a9402af2783746b839f61c5dc0
diff --git a/metadata/md5-cache/mail-client/Manifest.gz b/metadata/md5-cache/mail-client/Manifest.gz
index 57705f9f1ca9..b340c1a1bcf3 100644
--- a/metadata/md5-cache/mail-client/Manifest.gz
+++ b/metadata/md5-cache/mail-client/Manifest.gz
diff --git a/metadata/md5-cache/mail-client/mailx-8.1.2.20160123 b/metadata/md5-cache/mail-client/mailx-8.1.2.20160123
index 43c9b56b9b14..c5b091112579 100644
--- a/metadata/md5-cache/mail-client/mailx-8.1.2.20160123
+++ b/metadata/md5-cache/mail-client/mailx-8.1.2.20160123
@@ -3,10 +3,10 @@ DEPEND=>=net-libs/liblockfile-1.03 dev-libs/libbsd virtual/mta mail-client/mailx
 DESCRIPTION=The $ mail program, which is used to send mail via shell scripts
 EAPI=6
 HOMEPAGE=https://www.debian.org/
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=~alpha amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=BSD
 RDEPEND=>=net-libs/liblockfile-1.03 dev-libs/libbsd virtual/mta mail-client/mailx-support !mail-client/nail !net-mail/mailutils
 SLOT=0
 SRC_URI=http://http.debian.net/debian/pool/main/b/bsd-mailx/bsd-mailx_8.1.2-0.20160123cvs.orig.tar.bz2 http://http.debian.net/debian/pool/main/b/bsd-mailx/bsd-mailx_8.1.2-0.20160123cvs-4.debian.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=91e78f11fcf5391f8ba243393f2bb15e
+_md5_=a4266ded068147a148af564d341e86c2
diff --git a/metadata/md5-cache/mail-client/thunderbird-52.5.0 b/metadata/md5-cache/mail-client/thunderbird-52.5.0
deleted file mode 100644
index 68f5f4ab7586..000000000000
--- a/metadata/md5-cache/mail-client/thunderbird-52.5.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup unpack
-DEPEND=rust? ( dev-lang/rust ) amd64? ( >=dev-lang/yasm-1.1 virtual/opengl ) x86? ( >=dev-lang/yasm-1.1 virtual/opengl ) virtual/pkgconfig || ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,sqlite,ssl,threads] ) app-arch/zip app-arch/unzip >=sys-devel/binutils-2.16.1 sys-apps/findutils pulseaudio? ( media-sound/pulseaudio ) >=app-text/hunspell-1.2:= dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-2.18:2 x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.25:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.9 ) ) virtual/freedesktop-icon-theme dbus? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=virtual/libffi-3.0.10 virtual/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt system-cairo? ( >=x11-libs/cairo-1.12[X,xcb] >=x11-libs/pixman-0.19.2 ) system-icu? ( >=dev-libs/icu-58.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0= ) system-sqlite? ( >=dev-db/sqlite-3.17.0:3[secure-delete,debug=] ) system-libvpx? ( >=media-libs/libvpx-1.5.0:0=[postproc] ) system-harfbuzz? ( >=media-libs/harfbuzz-1.3.3:0= >=media-gfx/graphite2-1.3.8 ) !gtk2? ( >=x11-libs/gtk+-3.4.0:3 ) wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 net-misc/networkmanager ) ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) ~sys-devel/autoconf-2.13 >=sys-devel/libtool-2.4 app-arch/unzip >=sys-apps/sed-4
-DESCRIPTION=Thunderbird Mail Client
-EAPI=6
-HOMEPAGE=http://www.mozilla.com/en-US/thunderbird/
-IUSE=bindist crypt hardened ldap lightning +minimal mozdom rust selinux custom-cflags custom-optimization dbus debug +jemalloc neon pulseaudio selinux startup-notification system-cairo system-harfbuzz system-icu system-jpeg system-libevent system-sqlite system-libvpx gtk2 wifi l10n_ar l10n_ast l10n_be l10n_bg l10n_bn-BD l10n_br l10n_ca l10n_cs l10n_cy l10n_da l10n_de l10n_el l10n_en-GB l10n_es-AR l10n_es-ES l10n_et l10n_eu l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_he l10n_hr l10n_hsb l10n_hu l10n_hy l10n_id l10n_is l10n_it l10n_ja l10n_ko l10n_lt l10n_nb l10n_nl l10n_nn l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_si l10n_sk l10n_sl l10n_sq l10n_sr l10n_sv l10n_ta-LK l10n_tr l10n_uk l10n_vi l10n_zh-CN l10n_zh-TW
-KEYWORDS=~alpha amd64 ~arm ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=MPL-2.0 GPL-2 LGPL-2.1
-RDEPEND=>=dev-libs/nss-3.28.3 >=dev-libs/nspr-4.13.1 selinux? ( sec-policy/selinux-thunderbird ) crypt? ( >=x11-plugins/enigmail-1.9.8.3-r1 ) >=app-text/hunspell-1.2:= dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-2.18:2 x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.25:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.9 ) ) virtual/freedesktop-icon-theme dbus? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=virtual/libffi-3.0.10 virtual/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt system-cairo? ( >=x11-libs/cairo-1.12[X,xcb] >=x11-libs/pixman-0.19.2 ) system-icu? ( >=dev-libs/icu-58.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0= ) system-sqlite? ( >=dev-db/sqlite-3.17.0:3[secure-delete,debug=] ) system-libvpx? ( >=media-libs/libvpx-1.5.0:0=[postproc] ) system-harfbuzz? ( >=media-libs/harfbuzz-1.3.3:0= >=media-gfx/graphite2-1.3.8 ) !gtk2? ( >=x11-libs/gtk+-3.4.0:3 ) wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 net-misc/networkmanager ) ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.9 ) ) selinux? ( sec-policy/selinux-mozilla )
-RESTRICT=!bindist? ( bindist )
-SLOT=0
-SRC_URI=l10n_ar? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/xpi/ar.xpi -> thunderbird-52.5.0-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/xpi/ast.xpi -> thunderbird-52.5.0-ast.xpi ) l10n_be? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/xpi/be.xpi -> thunderbird-52.5.0-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/xpi/bg.xpi -> thunderbird-52.5.0-bg.xpi ) l10n_bn-BD? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/xpi/bn-BD.xpi -> thunderbird-52.5.0-bn-BD.xpi ) l10n_br? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/xpi/br.xpi -> thunderbird-52.5.0-br.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/xpi/ca.xpi -> thunderbird-52.5.0-ca.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/xpi/cs.xpi -> thunderbird-52.5.0-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/xpi/cy.xpi -> thunderbird-52.5.0-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/xpi/da.xpi -> thunderbird-52.5.0-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/xpi/de.xpi -> thunderbird-52.5.0-de.xpi ) l10n_el? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/xpi/el.xpi -> thunderbird-52.5.0-el.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/xpi/en-GB.xpi -> thunderbird-52.5.0-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/xpi/es-AR.xpi -> thunderbird-52.5.0-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/xpi/es-ES.xpi -> thunderbird-52.5.0-es-ES.xpi ) l10n_et? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/xpi/et.xpi -> thunderbird-52.5.0-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/xpi/eu.xpi -> thunderbird-52.5.0-eu.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/xpi/fi.xpi -> thunderbird-52.5.0-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/xpi/fr.xpi -> thunderbird-52.5.0-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/xpi/fy-NL.xpi -> thunderbird-52.5.0-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/xpi/ga-IE.xpi -> thunderbird-52.5.0-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/xpi/gd.xpi -> thunderbird-52.5.0-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/xpi/gl.xpi -> thunderbird-52.5.0-gl.xpi ) l10n_he? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/xpi/he.xpi -> thunderbird-52.5.0-he.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/xpi/hr.xpi -> thunderbird-52.5.0-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/xpi/hsb.xpi -> thunderbird-52.5.0-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/xpi/hu.xpi -> thunderbird-52.5.0-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/xpi/hy-AM.xpi -> thunderbird-52.5.0-hy-AM.xpi ) l10n_id? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/xpi/id.xpi -> thunderbird-52.5.0-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/xpi/is.xpi -> thunderbird-52.5.0-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/xpi/it.xpi -> thunderbird-52.5.0-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/xpi/ja.xpi -> thunderbird-52.5.0-ja.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/xpi/ko.xpi -> thunderbird-52.5.0-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/xpi/lt.xpi -> thunderbird-52.5.0-lt.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/xpi/nb-NO.xpi -> thunderbird-52.5.0-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/xpi/nl.xpi -> thunderbird-52.5.0-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/xpi/nn-NO.xpi -> thunderbird-52.5.0-nn-NO.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/xpi/pa-IN.xpi -> thunderbird-52.5.0-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/xpi/pl.xpi -> thunderbird-52.5.0-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/xpi/pt-BR.xpi -> thunderbird-52.5.0-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/xpi/pt-PT.xpi -> thunderbird-52.5.0-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/xpi/rm.xpi -> thunderbird-52.5.0-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/xpi/ro.xpi -> thunderbird-52.5.0-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/xpi/ru.xpi -> thunderbird-52.5.0-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/xpi/si.xpi -> thunderbird-52.5.0-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/xpi/sk.xpi -> thunderbird-52.5.0-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/xpi/sl.xpi -> thunderbird-52.5.0-sl.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/xpi/sq.xpi -> thunderbird-52.5.0-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/xpi/sr.xpi -> thunderbird-52.5.0-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/xpi/sv-SE.xpi -> thunderbird-52.5.0-sv-SE.xpi ) l10n_ta-LK? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/xpi/ta-LK.xpi -> thunderbird-52.5.0-ta-LK.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/xpi/tr.xpi -> thunderbird-52.5.0-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/xpi/uk.xpi -> thunderbird-52.5.0-uk.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/xpi/vi.xpi -> thunderbird-52.5.0-vi.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/xpi/zh-CN.xpi -> thunderbird-52.5.0-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/xpi/zh-TW.xpi -> thunderbird-52.5.0-zh-TW.xpi ) https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/source/thunderbird-52.5.0.source.tar.xz https://dev.gentoo.org/~axs/distfiles/lightning-5.4.5.tar.xz lightning? ( https://dev.gentoo.org/~axs/distfiles/gdata-provider-3.3.tar.xz ) https://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-52.5-patches-02.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-52.5-patches-02.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-52.5-patches-02.tar.xz
-_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	mozconfig-v6.52	aeba761913d03fc45f4d6ae2b89165ca	mozcoreconf-v5	602c3c0a642bafeabb149c49a6df941f	mozextension	89a560beaf496e7cb89f3d79d4aef09e	mozlinguas-v2	e7b3bd89af6dc1a3dd10be68ba3d574d	multilib	97f470f374f2e94ccab04a2fb21d811e	nsplugins	2049586e425364a1c5bdb004205d1758	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=35b9afd5db5b52a383cca9bc8c060b1b
diff --git a/metadata/md5-cache/mail-client/thunderbird-52.6.0 b/metadata/md5-cache/mail-client/thunderbird-52.6.0
deleted file mode 100644
index 5e784bc63819..000000000000
--- a/metadata/md5-cache/mail-client/thunderbird-52.6.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup unpack
-DEPEND=rust? ( dev-lang/rust ) amd64? ( >=dev-lang/yasm-1.1 virtual/opengl ) x86? ( >=dev-lang/yasm-1.1 virtual/opengl ) virtual/pkgconfig || ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,sqlite,ssl,threads] ) app-arch/zip app-arch/unzip >=sys-devel/binutils-2.16.1 sys-apps/findutils pulseaudio? ( media-sound/pulseaudio ) >=app-text/hunspell-1.2:= dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-2.18:2 x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.25:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.9 ) ) virtual/freedesktop-icon-theme dbus? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=virtual/libffi-3.0.10 virtual/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt system-cairo? ( >=x11-libs/cairo-1.12[X,xcb] >=x11-libs/pixman-0.19.2 ) system-icu? ( >=dev-libs/icu-58.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0= ) system-sqlite? ( >=dev-db/sqlite-3.17.0:3[secure-delete,debug=] ) system-libvpx? ( >=media-libs/libvpx-1.5.0:0=[postproc] ) system-harfbuzz? ( >=media-libs/harfbuzz-1.3.3:0= >=media-gfx/graphite2-1.3.8 ) !gtk2? ( >=x11-libs/gtk+-3.4.0:3 ) wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 net-misc/networkmanager ) ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) ~sys-devel/autoconf-2.13 >=sys-devel/libtool-2.4 app-arch/unzip >=sys-apps/sed-4
-DESCRIPTION=Thunderbird Mail Client
-EAPI=6
-HOMEPAGE=http://www.mozilla.com/en-US/thunderbird/
-IUSE=bindist crypt hardened ldap lightning +minimal mozdom rust selinux custom-cflags custom-optimization dbus debug +jemalloc neon pulseaudio selinux startup-notification system-cairo system-harfbuzz system-icu system-jpeg system-libevent system-sqlite system-libvpx gtk2 wifi l10n_ar l10n_ast l10n_be l10n_bg l10n_bn-BD l10n_br l10n_ca l10n_cs l10n_cy l10n_da l10n_de l10n_el l10n_en-GB l10n_es-AR l10n_es-ES l10n_et l10n_eu l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_he l10n_hr l10n_hsb l10n_hu l10n_hy l10n_id l10n_is l10n_it l10n_ja l10n_ko l10n_lt l10n_nb l10n_nl l10n_nn l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_si l10n_sk l10n_sl l10n_sq l10n_sr l10n_sv l10n_ta-LK l10n_tr l10n_uk l10n_vi l10n_zh-CN l10n_zh-TW
-KEYWORDS=~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=MPL-2.0 GPL-2 LGPL-2.1
-RDEPEND=>=dev-libs/nss-3.28.3 >=dev-libs/nspr-4.13.1 selinux? ( sec-policy/selinux-thunderbird ) crypt? ( >=x11-plugins/enigmail-1.9.8.3-r1 ) >=app-text/hunspell-1.2:= dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-2.18:2 x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.25:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.9 ) ) virtual/freedesktop-icon-theme dbus? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=virtual/libffi-3.0.10 virtual/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt system-cairo? ( >=x11-libs/cairo-1.12[X,xcb] >=x11-libs/pixman-0.19.2 ) system-icu? ( >=dev-libs/icu-58.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0= ) system-sqlite? ( >=dev-db/sqlite-3.17.0:3[secure-delete,debug=] ) system-libvpx? ( >=media-libs/libvpx-1.5.0:0=[postproc] ) system-harfbuzz? ( >=media-libs/harfbuzz-1.3.3:0= >=media-gfx/graphite2-1.3.8 ) !gtk2? ( >=x11-libs/gtk+-3.4.0:3 ) wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 net-misc/networkmanager ) ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.9 ) ) selinux? ( sec-policy/selinux-mozilla )
-RESTRICT=!bindist? ( bindist )
-SLOT=0
-SRC_URI=l10n_ar? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/xpi/ar.xpi -> thunderbird-52.6.0-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/xpi/ast.xpi -> thunderbird-52.6.0-ast.xpi ) l10n_be? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/xpi/be.xpi -> thunderbird-52.6.0-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/xpi/bg.xpi -> thunderbird-52.6.0-bg.xpi ) l10n_bn-BD? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/xpi/bn-BD.xpi -> thunderbird-52.6.0-bn-BD.xpi ) l10n_br? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/xpi/br.xpi -> thunderbird-52.6.0-br.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/xpi/ca.xpi -> thunderbird-52.6.0-ca.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/xpi/cs.xpi -> thunderbird-52.6.0-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/xpi/cy.xpi -> thunderbird-52.6.0-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/xpi/da.xpi -> thunderbird-52.6.0-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/xpi/de.xpi -> thunderbird-52.6.0-de.xpi ) l10n_el? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/xpi/el.xpi -> thunderbird-52.6.0-el.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/xpi/en-GB.xpi -> thunderbird-52.6.0-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/xpi/es-AR.xpi -> thunderbird-52.6.0-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/xpi/es-ES.xpi -> thunderbird-52.6.0-es-ES.xpi ) l10n_et? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/xpi/et.xpi -> thunderbird-52.6.0-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/xpi/eu.xpi -> thunderbird-52.6.0-eu.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/xpi/fi.xpi -> thunderbird-52.6.0-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/xpi/fr.xpi -> thunderbird-52.6.0-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/xpi/fy-NL.xpi -> thunderbird-52.6.0-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/xpi/ga-IE.xpi -> thunderbird-52.6.0-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/xpi/gd.xpi -> thunderbird-52.6.0-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/xpi/gl.xpi -> thunderbird-52.6.0-gl.xpi ) l10n_he? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/xpi/he.xpi -> thunderbird-52.6.0-he.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/xpi/hr.xpi -> thunderbird-52.6.0-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/xpi/hsb.xpi -> thunderbird-52.6.0-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/xpi/hu.xpi -> thunderbird-52.6.0-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/xpi/hy-AM.xpi -> thunderbird-52.6.0-hy-AM.xpi ) l10n_id? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/xpi/id.xpi -> thunderbird-52.6.0-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/xpi/is.xpi -> thunderbird-52.6.0-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/xpi/it.xpi -> thunderbird-52.6.0-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/xpi/ja.xpi -> thunderbird-52.6.0-ja.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/xpi/ko.xpi -> thunderbird-52.6.0-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/xpi/lt.xpi -> thunderbird-52.6.0-lt.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/xpi/nb-NO.xpi -> thunderbird-52.6.0-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/xpi/nl.xpi -> thunderbird-52.6.0-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/xpi/nn-NO.xpi -> thunderbird-52.6.0-nn-NO.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/xpi/pa-IN.xpi -> thunderbird-52.6.0-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/xpi/pl.xpi -> thunderbird-52.6.0-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/xpi/pt-BR.xpi -> thunderbird-52.6.0-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/xpi/pt-PT.xpi -> thunderbird-52.6.0-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/xpi/rm.xpi -> thunderbird-52.6.0-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/xpi/ro.xpi -> thunderbird-52.6.0-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/xpi/ru.xpi -> thunderbird-52.6.0-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/xpi/si.xpi -> thunderbird-52.6.0-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/xpi/sk.xpi -> thunderbird-52.6.0-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/xpi/sl.xpi -> thunderbird-52.6.0-sl.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/xpi/sq.xpi -> thunderbird-52.6.0-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/xpi/sr.xpi -> thunderbird-52.6.0-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/xpi/sv-SE.xpi -> thunderbird-52.6.0-sv-SE.xpi ) l10n_ta-LK? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/xpi/ta-LK.xpi -> thunderbird-52.6.0-ta-LK.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/xpi/tr.xpi -> thunderbird-52.6.0-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/xpi/uk.xpi -> thunderbird-52.6.0-uk.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/xpi/vi.xpi -> thunderbird-52.6.0-vi.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/xpi/zh-CN.xpi -> thunderbird-52.6.0-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/xpi/zh-TW.xpi -> thunderbird-52.6.0-zh-TW.xpi ) https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/source/thunderbird-52.6.0.source.tar.xz https://dev.gentoo.org/~axs/distfiles/lightning-5.4.5.2.tar.xz lightning? ( https://dev.gentoo.org/~axs/distfiles/gdata-provider-3.3.tar.xz ) https://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-52.5-patches-02.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-52.5-patches-02.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-52.5-patches-02.tar.xz
-_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	mozconfig-v6.52	aeba761913d03fc45f4d6ae2b89165ca	mozcoreconf-v5	602c3c0a642bafeabb149c49a6df941f	mozextension	89a560beaf496e7cb89f3d79d4aef09e	mozlinguas-v2	e7b3bd89af6dc1a3dd10be68ba3d574d	multilib	97f470f374f2e94ccab04a2fb21d811e	nsplugins	2049586e425364a1c5bdb004205d1758	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=08307504ca36c978ed45bab5cdd4765d
diff --git a/metadata/md5-cache/mail-client/thunderbird-52.7.0 b/metadata/md5-cache/mail-client/thunderbird-52.7.0
new file mode 100644
index 000000000000..d2b4d6159100
--- /dev/null
+++ b/metadata/md5-cache/mail-client/thunderbird-52.7.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup unpack
+DEPEND=rust? ( dev-lang/rust ) amd64? ( >=dev-lang/yasm-1.1 virtual/opengl ) x86? ( >=dev-lang/yasm-1.1 virtual/opengl ) virtual/pkgconfig || ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,sqlite,ssl,threads] ) app-arch/zip app-arch/unzip >=sys-devel/binutils-2.16.1 sys-apps/findutils pulseaudio? ( media-sound/pulseaudio ) >=app-text/hunspell-1.2:= dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-2.18:2 x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.25:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.9 ) ) virtual/freedesktop-icon-theme dbus? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=virtual/libffi-3.0.10 virtual/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt system-cairo? ( >=x11-libs/cairo-1.12[X,xcb] >=x11-libs/pixman-0.19.2 ) system-icu? ( >=dev-libs/icu-58.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0= ) system-sqlite? ( >=dev-db/sqlite-3.17.0:3[secure-delete,debug=] ) system-libvpx? ( >=media-libs/libvpx-1.5.0:0=[postproc] ) system-harfbuzz? ( >=media-libs/harfbuzz-1.3.3:0= >=media-gfx/graphite2-1.3.8 ) !gtk2? ( >=x11-libs/gtk+-3.4.0:3 ) wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 net-misc/networkmanager ) ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) ~sys-devel/autoconf-2.13 >=sys-devel/libtool-2.4 app-arch/unzip >=sys-apps/sed-4
+DESCRIPTION=Thunderbird Mail Client
+EAPI=6
+HOMEPAGE=http://www.mozilla.com/en-US/thunderbird/
+IUSE=bindist crypt hardened ldap lightning +minimal mozdom rust selinux custom-cflags custom-optimization dbus debug +jemalloc neon pulseaudio selinux startup-notification system-cairo system-harfbuzz system-icu system-jpeg system-libevent system-sqlite system-libvpx gtk2 wifi l10n_ar l10n_ast l10n_be l10n_bg l10n_bn-BD l10n_br l10n_ca l10n_cs l10n_cy l10n_da l10n_de l10n_el l10n_en-GB l10n_es-AR l10n_es-ES l10n_et l10n_eu l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_he l10n_hr l10n_hsb l10n_hu l10n_hy l10n_id l10n_is l10n_it l10n_ja l10n_ko l10n_lt l10n_nb l10n_nl l10n_nn l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_si l10n_sk l10n_sl l10n_sq l10n_sr l10n_sv l10n_ta-LK l10n_tr l10n_uk l10n_vi l10n_zh-CN l10n_zh-TW
+KEYWORDS=~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
+LICENSE=MPL-2.0 GPL-2 LGPL-2.1
+RDEPEND=>=dev-libs/nss-3.28.3 >=dev-libs/nspr-4.13.1 selinux? ( sec-policy/selinux-thunderbird ) crypt? ( >=x11-plugins/enigmail-1.9.8.3-r1 ) >=app-text/hunspell-1.2:= dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-2.18:2 x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.25:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.9 ) ) virtual/freedesktop-icon-theme dbus? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=virtual/libffi-3.0.10 virtual/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt system-cairo? ( >=x11-libs/cairo-1.12[X,xcb] >=x11-libs/pixman-0.19.2 ) system-icu? ( >=dev-libs/icu-58.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0= ) system-sqlite? ( >=dev-db/sqlite-3.17.0:3[secure-delete,debug=] ) system-libvpx? ( >=media-libs/libvpx-1.5.0:0=[postproc] ) system-harfbuzz? ( >=media-libs/harfbuzz-1.3.3:0= >=media-gfx/graphite2-1.3.8 ) !gtk2? ( >=x11-libs/gtk+-3.4.0:3 ) wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 net-misc/networkmanager ) ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.9 ) ) selinux? ( sec-policy/selinux-mozilla )
+RESTRICT=!bindist? ( bindist )
+SLOT=0
+SRC_URI=l10n_ar? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/ar.xpi -> thunderbird-52.7.0-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/ast.xpi -> thunderbird-52.7.0-ast.xpi ) l10n_be? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/be.xpi -> thunderbird-52.7.0-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/bg.xpi -> thunderbird-52.7.0-bg.xpi ) l10n_bn-BD? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/bn-BD.xpi -> thunderbird-52.7.0-bn-BD.xpi ) l10n_br? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/br.xpi -> thunderbird-52.7.0-br.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/ca.xpi -> thunderbird-52.7.0-ca.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/cs.xpi -> thunderbird-52.7.0-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/cy.xpi -> thunderbird-52.7.0-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/da.xpi -> thunderbird-52.7.0-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/de.xpi -> thunderbird-52.7.0-de.xpi ) l10n_el? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/el.xpi -> thunderbird-52.7.0-el.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/en-GB.xpi -> thunderbird-52.7.0-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/es-AR.xpi -> thunderbird-52.7.0-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/es-ES.xpi -> thunderbird-52.7.0-es-ES.xpi ) l10n_et? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/et.xpi -> thunderbird-52.7.0-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/eu.xpi -> thunderbird-52.7.0-eu.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/fi.xpi -> thunderbird-52.7.0-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/fr.xpi -> thunderbird-52.7.0-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/fy-NL.xpi -> thunderbird-52.7.0-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/ga-IE.xpi -> thunderbird-52.7.0-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/gd.xpi -> thunderbird-52.7.0-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/gl.xpi -> thunderbird-52.7.0-gl.xpi ) l10n_he? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/he.xpi -> thunderbird-52.7.0-he.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/hr.xpi -> thunderbird-52.7.0-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/hsb.xpi -> thunderbird-52.7.0-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/hu.xpi -> thunderbird-52.7.0-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/hy-AM.xpi -> thunderbird-52.7.0-hy-AM.xpi ) l10n_id? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/id.xpi -> thunderbird-52.7.0-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/is.xpi -> thunderbird-52.7.0-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/it.xpi -> thunderbird-52.7.0-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/ja.xpi -> thunderbird-52.7.0-ja.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/ko.xpi -> thunderbird-52.7.0-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/lt.xpi -> thunderbird-52.7.0-lt.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/nb-NO.xpi -> thunderbird-52.7.0-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/nl.xpi -> thunderbird-52.7.0-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/nn-NO.xpi -> thunderbird-52.7.0-nn-NO.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/pa-IN.xpi -> thunderbird-52.7.0-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/pl.xpi -> thunderbird-52.7.0-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/pt-BR.xpi -> thunderbird-52.7.0-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/pt-PT.xpi -> thunderbird-52.7.0-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/rm.xpi -> thunderbird-52.7.0-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/ro.xpi -> thunderbird-52.7.0-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/ru.xpi -> thunderbird-52.7.0-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/si.xpi -> thunderbird-52.7.0-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/sk.xpi -> thunderbird-52.7.0-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/sl.xpi -> thunderbird-52.7.0-sl.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/sq.xpi -> thunderbird-52.7.0-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/sr.xpi -> thunderbird-52.7.0-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/sv-SE.xpi -> thunderbird-52.7.0-sv-SE.xpi ) l10n_ta-LK? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/ta-LK.xpi -> thunderbird-52.7.0-ta-LK.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/tr.xpi -> thunderbird-52.7.0-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/uk.xpi -> thunderbird-52.7.0-uk.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/vi.xpi -> thunderbird-52.7.0-vi.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/zh-CN.xpi -> thunderbird-52.7.0-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/zh-TW.xpi -> thunderbird-52.7.0-zh-TW.xpi ) https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/source/thunderbird-52.7.0.source.tar.xz https://dev.gentoo.org/~chutzpah/distfiles/lightning-5.4.6.tar.xz lightning? ( https://dev.gentoo.org/~axs/distfiles/gdata-provider-3.3.tar.xz ) https://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-52.5-patches-02.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-52.5-patches-02.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-52.5-patches-02.tar.xz
+_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	mozconfig-v6.52	aeba761913d03fc45f4d6ae2b89165ca	mozcoreconf-v5	602c3c0a642bafeabb149c49a6df941f	mozextension	89a560beaf496e7cb89f3d79d4aef09e	mozlinguas-v2	e7b3bd89af6dc1a3dd10be68ba3d574d	multilib	97f470f374f2e94ccab04a2fb21d811e	nsplugins	2049586e425364a1c5bdb004205d1758	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=886fa9f119b82fb6402573dc1a422747
diff --git a/metadata/md5-cache/mail-client/thunderbird-bin-52.6.0 b/metadata/md5-cache/mail-client/thunderbird-bin-52.6.0
deleted file mode 100644
index 2d2a91bc39d0..000000000000
--- a/metadata/md5-cache/mail-client/thunderbird-bin-52.6.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst unpack
-DEPEND=app-arch/unzip >=sys-apps/sed-4 app-arch/unzip
-DESCRIPTION=Thunderbird Mail Client
-EAPI=6
-HOMEPAGE=http://www.mozilla.com/thunderbird
-IUSE=+crashreporter +ffmpeg +pulseaudio selinux l10n_ar l10n_ast l10n_be l10n_bg l10n_bn-BD l10n_br l10n_ca l10n_cs l10n_cy l10n_da l10n_de l10n_el l10n_en-GB l10n_es-AR l10n_es-ES l10n_et l10n_eu l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_he l10n_hr l10n_hsb l10n_hu l10n_hy l10n_id l10n_is l10n_it l10n_ja l10n_ko l10n_lt l10n_nb l10n_nl l10n_nn l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_si l10n_sk l10n_sl l10n_sq l10n_sr l10n_sv l10n_ta-LK l10n_tr l10n_uk l10n_vi l10n_zh-CN l10n_zh-TW
-KEYWORDS=-* amd64 x86
-LICENSE=MPL-2.0 GPL-2 LGPL-2.1
-RDEPEND=virtual/freedesktop-icon-theme dev-libs/atk >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 >=dev-libs/glib-2.26:2 >=media-libs/alsa-lib-1.0.16 media-libs/fontconfig >=media-libs/freetype-2.4.10:2 >=x11-libs/cairo-1.10[X] x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.18:2 >=x11-libs/gtk+-3.4.0:3 x11-libs/libX11 x11-libs/libXext x11-libs/libXrender x11-libs/libXt >=x11-libs/pango-1.22.0 pulseaudio? ( !<media-sound/apulse-0.1.9 || ( media-sound/pulseaudio media-sound/apulse ) ) ffmpeg? ( media-video/ffmpeg ) crashreporter? ( net-misc/curl ) selinux? ( sec-policy/selinux-thunderbird )
-RESTRICT=strip mirror
-SLOT=0
-SRC_URI=l10n_ar? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/xpi/ar.xpi -> thunderbird-52.6.0-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/xpi/ast.xpi -> thunderbird-52.6.0-ast.xpi ) l10n_be? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/xpi/be.xpi -> thunderbird-52.6.0-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/xpi/bg.xpi -> thunderbird-52.6.0-bg.xpi ) l10n_bn-BD? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/xpi/bn-BD.xpi -> thunderbird-52.6.0-bn-BD.xpi ) l10n_br? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/xpi/br.xpi -> thunderbird-52.6.0-br.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/xpi/ca.xpi -> thunderbird-52.6.0-ca.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/xpi/cs.xpi -> thunderbird-52.6.0-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/xpi/cy.xpi -> thunderbird-52.6.0-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/xpi/da.xpi -> thunderbird-52.6.0-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/xpi/de.xpi -> thunderbird-52.6.0-de.xpi ) l10n_el? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/xpi/el.xpi -> thunderbird-52.6.0-el.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/xpi/en-GB.xpi -> thunderbird-52.6.0-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/xpi/es-AR.xpi -> thunderbird-52.6.0-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/xpi/es-ES.xpi -> thunderbird-52.6.0-es-ES.xpi ) l10n_et? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/xpi/et.xpi -> thunderbird-52.6.0-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/xpi/eu.xpi -> thunderbird-52.6.0-eu.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/xpi/fi.xpi -> thunderbird-52.6.0-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/xpi/fr.xpi -> thunderbird-52.6.0-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/xpi/fy-NL.xpi -> thunderbird-52.6.0-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/xpi/ga-IE.xpi -> thunderbird-52.6.0-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/xpi/gd.xpi -> thunderbird-52.6.0-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/xpi/gl.xpi -> thunderbird-52.6.0-gl.xpi ) l10n_he? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/xpi/he.xpi -> thunderbird-52.6.0-he.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/xpi/hr.xpi -> thunderbird-52.6.0-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/xpi/hsb.xpi -> thunderbird-52.6.0-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/xpi/hu.xpi -> thunderbird-52.6.0-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/xpi/hy-AM.xpi -> thunderbird-52.6.0-hy-AM.xpi ) l10n_id? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/xpi/id.xpi -> thunderbird-52.6.0-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/xpi/is.xpi -> thunderbird-52.6.0-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/xpi/it.xpi -> thunderbird-52.6.0-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/xpi/ja.xpi -> thunderbird-52.6.0-ja.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/xpi/ko.xpi -> thunderbird-52.6.0-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/xpi/lt.xpi -> thunderbird-52.6.0-lt.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/xpi/nb-NO.xpi -> thunderbird-52.6.0-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/xpi/nl.xpi -> thunderbird-52.6.0-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/xpi/nn-NO.xpi -> thunderbird-52.6.0-nn-NO.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/xpi/pa-IN.xpi -> thunderbird-52.6.0-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/xpi/pl.xpi -> thunderbird-52.6.0-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/xpi/pt-BR.xpi -> thunderbird-52.6.0-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/xpi/pt-PT.xpi -> thunderbird-52.6.0-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/xpi/rm.xpi -> thunderbird-52.6.0-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/xpi/ro.xpi -> thunderbird-52.6.0-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/xpi/ru.xpi -> thunderbird-52.6.0-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/xpi/si.xpi -> thunderbird-52.6.0-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/xpi/sk.xpi -> thunderbird-52.6.0-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/xpi/sl.xpi -> thunderbird-52.6.0-sl.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/xpi/sq.xpi -> thunderbird-52.6.0-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/xpi/sr.xpi -> thunderbird-52.6.0-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/xpi/sv-SE.xpi -> thunderbird-52.6.0-sv-SE.xpi ) l10n_ta-LK? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/xpi/ta-LK.xpi -> thunderbird-52.6.0-ta-LK.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/xpi/tr.xpi -> thunderbird-52.6.0-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/xpi/uk.xpi -> thunderbird-52.6.0-uk.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/xpi/vi.xpi -> thunderbird-52.6.0-vi.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/xpi/zh-CN.xpi -> thunderbird-52.6.0-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/xpi/zh-TW.xpi -> thunderbird-52.6.0-zh-TW.xpi ) amd64? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/en-US/thunderbird-52.6.0.tar.bz2 -> thunderbird-bin_x86_64-52.6.0.tar.bz2 ) x86? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/en-US/thunderbird-52.6.0.tar.bz2 -> thunderbird-bin_i686-52.6.0.tar.bz2 ) https://dev.gentoo.org/~axs/distfiles/lightning-5.4.5.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	mozextension	89a560beaf496e7cb89f3d79d4aef09e	mozlinguas-v2	e7b3bd89af6dc1a3dd10be68ba3d574d	multilib	97f470f374f2e94ccab04a2fb21d811e	nsplugins	2049586e425364a1c5bdb004205d1758	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=8f32082f3f1980fa88531128c9afc9a6
diff --git a/metadata/md5-cache/mail-client/thunderbird-bin-52.7.0 b/metadata/md5-cache/mail-client/thunderbird-bin-52.7.0
new file mode 100644
index 000000000000..80475183eb63
--- /dev/null
+++ b/metadata/md5-cache/mail-client/thunderbird-bin-52.7.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst unpack
+DEPEND=app-arch/unzip >=sys-apps/sed-4 app-arch/unzip
+DESCRIPTION=Thunderbird Mail Client
+EAPI=6
+HOMEPAGE=http://www.mozilla.com/thunderbird
+IUSE=+crashreporter +ffmpeg +pulseaudio selinux l10n_ar l10n_ast l10n_be l10n_bg l10n_bn-BD l10n_br l10n_ca l10n_cs l10n_cy l10n_da l10n_de l10n_el l10n_en-GB l10n_es-AR l10n_es-ES l10n_et l10n_eu l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_he l10n_hr l10n_hsb l10n_hu l10n_hy l10n_id l10n_is l10n_it l10n_ja l10n_ko l10n_lt l10n_nb l10n_nl l10n_nn l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_si l10n_sk l10n_sl l10n_sq l10n_sr l10n_sv l10n_ta-LK l10n_tr l10n_uk l10n_vi l10n_zh-CN l10n_zh-TW
+KEYWORDS=-* amd64 x86
+LICENSE=MPL-2.0 GPL-2 LGPL-2.1
+RDEPEND=virtual/freedesktop-icon-theme dev-libs/atk >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 >=dev-libs/glib-2.26:2 >=media-libs/alsa-lib-1.0.16 media-libs/fontconfig >=media-libs/freetype-2.4.10:2 >=x11-libs/cairo-1.10[X] x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.18:2 >=x11-libs/gtk+-3.4.0:3 x11-libs/libX11 x11-libs/libXext x11-libs/libXrender x11-libs/libXt >=x11-libs/pango-1.22.0 pulseaudio? ( !<media-sound/apulse-0.1.9 || ( media-sound/pulseaudio media-sound/apulse ) ) ffmpeg? ( media-video/ffmpeg ) crashreporter? ( net-misc/curl ) selinux? ( sec-policy/selinux-thunderbird )
+RESTRICT=strip mirror
+SLOT=0
+SRC_URI=l10n_ar? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/ar.xpi -> thunderbird-52.7.0-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/ast.xpi -> thunderbird-52.7.0-ast.xpi ) l10n_be? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/be.xpi -> thunderbird-52.7.0-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/bg.xpi -> thunderbird-52.7.0-bg.xpi ) l10n_bn-BD? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/bn-BD.xpi -> thunderbird-52.7.0-bn-BD.xpi ) l10n_br? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/br.xpi -> thunderbird-52.7.0-br.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/ca.xpi -> thunderbird-52.7.0-ca.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/cs.xpi -> thunderbird-52.7.0-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/cy.xpi -> thunderbird-52.7.0-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/da.xpi -> thunderbird-52.7.0-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/de.xpi -> thunderbird-52.7.0-de.xpi ) l10n_el? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/el.xpi -> thunderbird-52.7.0-el.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/en-GB.xpi -> thunderbird-52.7.0-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/es-AR.xpi -> thunderbird-52.7.0-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/es-ES.xpi -> thunderbird-52.7.0-es-ES.xpi ) l10n_et? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/et.xpi -> thunderbird-52.7.0-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/eu.xpi -> thunderbird-52.7.0-eu.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/fi.xpi -> thunderbird-52.7.0-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/fr.xpi -> thunderbird-52.7.0-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/fy-NL.xpi -> thunderbird-52.7.0-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/ga-IE.xpi -> thunderbird-52.7.0-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/gd.xpi -> thunderbird-52.7.0-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/gl.xpi -> thunderbird-52.7.0-gl.xpi ) l10n_he? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/he.xpi -> thunderbird-52.7.0-he.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/hr.xpi -> thunderbird-52.7.0-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/hsb.xpi -> thunderbird-52.7.0-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/hu.xpi -> thunderbird-52.7.0-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/hy-AM.xpi -> thunderbird-52.7.0-hy-AM.xpi ) l10n_id? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/id.xpi -> thunderbird-52.7.0-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/is.xpi -> thunderbird-52.7.0-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/it.xpi -> thunderbird-52.7.0-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/ja.xpi -> thunderbird-52.7.0-ja.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/ko.xpi -> thunderbird-52.7.0-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/lt.xpi -> thunderbird-52.7.0-lt.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/nb-NO.xpi -> thunderbird-52.7.0-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/nl.xpi -> thunderbird-52.7.0-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/nn-NO.xpi -> thunderbird-52.7.0-nn-NO.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/pa-IN.xpi -> thunderbird-52.7.0-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/pl.xpi -> thunderbird-52.7.0-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/pt-BR.xpi -> thunderbird-52.7.0-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/pt-PT.xpi -> thunderbird-52.7.0-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/rm.xpi -> thunderbird-52.7.0-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/ro.xpi -> thunderbird-52.7.0-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/ru.xpi -> thunderbird-52.7.0-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/si.xpi -> thunderbird-52.7.0-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/sk.xpi -> thunderbird-52.7.0-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/sl.xpi -> thunderbird-52.7.0-sl.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/sq.xpi -> thunderbird-52.7.0-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/sr.xpi -> thunderbird-52.7.0-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/sv-SE.xpi -> thunderbird-52.7.0-sv-SE.xpi ) l10n_ta-LK? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/ta-LK.xpi -> thunderbird-52.7.0-ta-LK.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/tr.xpi -> thunderbird-52.7.0-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/uk.xpi -> thunderbird-52.7.0-uk.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/vi.xpi -> thunderbird-52.7.0-vi.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/zh-CN.xpi -> thunderbird-52.7.0-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/zh-TW.xpi -> thunderbird-52.7.0-zh-TW.xpi ) amd64? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/en-US/thunderbird-52.7.0.tar.bz2 -> thunderbird-bin_x86_64-52.7.0.tar.bz2 ) x86? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/en-US/thunderbird-52.7.0.tar.bz2 -> thunderbird-bin_i686-52.7.0.tar.bz2 ) https://dev.gentoo.org/~axs/distfiles/lightning-5.4.5.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	mozextension	89a560beaf496e7cb89f3d79d4aef09e	mozlinguas-v2	e7b3bd89af6dc1a3dd10be68ba3d574d	multilib	97f470f374f2e94ccab04a2fb21d811e	nsplugins	2049586e425364a1c5bdb004205d1758	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=8f32082f3f1980fa88531128c9afc9a6
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index 4d3f267393ce..8597c8e81a54 100644
--- a/metadata/md5-cache/media-gfx/Manifest.gz
+++ b/metadata/md5-cache/media-gfx/Manifest.gz
diff --git a/metadata/md5-cache/media-gfx/blender-2.72b-r4 b/metadata/md5-cache/media-gfx/blender-2.72b-r4
index db4b498a12dc..d7e9e4415e93 100644
--- a/metadata/md5-cache/media-gfx/blender-2.72b-r4
+++ b/metadata/md5-cache/media-gfx/blender-2.72b-r4
@@ -2,13 +2,13 @@ DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend
 DEPEND=python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)] dev-python/numpy[python_targets_python3_4(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)] dev-python/requests[python_targets_python3_4(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)] >=media-libs/freetype-2.0:2 media-libs/glew:0= media-libs/libpng:0 media-libs/libsamplerate sys-libs/zlib virtual/glu virtual/jpeg:0 virtual/libintl virtual/opengl x11-libs/libX11 x11-libs/libXi x11-libs/libXxf86vm boost? ( >=dev-libs/boost-1.44[nls?,threads(+)] ) collada? ( >=media-libs/opencollada-1.6.18 ) colorio? ( >=media-libs/opencolorio-1.0.9-r2 ) cycles? ( media-libs/openimageio ) ffmpeg? ( media-video/ffmpeg:0=[x264,mp3,encode,theora,jpeg2k?] ) libav? ( >=media-video/libav-11.3:0=[x264,mp3,encode,theora,jpeg2k?] ) fftw? ( sci-libs/fftw:3.0 ) jack? ( media-sound/jack-audio-connection-kit ) jpeg2k? ( media-libs/openjpeg:0 ) ndof? ( app-misc/spacenavd dev-libs/libspnav ) nls? ( virtual/libiconv ) openal? ( >=media-libs/openal-1.6.372 ) openimageio? ( media-libs/openimageio ) openexr? ( media-libs/ilmbase media-libs/openexr ) sdl? ( media-libs/libsdl[sound,joystick] ) sndfile? ( media-libs/libsndfile ) tiff? ( media-libs/tiff:0 ) doc? ( app-doc/doxygen[-nodot(-),dot(+)] dev-python/sphinx ) nls? ( sys-devel/gettext ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-3.9.6
 DESCRIPTION=3D Creation/Animation/Publishing System
 EAPI=6
-HOMEPAGE=http://www.blender.org
+HOMEPAGE=https://www.blender.org
 IUSE=+boost +bullet collada colorio cycles +dds debug doc +elbeem ffmpeg fftw +game-engine jack jpeg2k libav ndof nls openal openimageio +opennl openmp +openexr player redcode sdl sndfile cpu_flags_x86_sse cpu_flags_x86_sse2 tiff python_targets_python3_4
 KEYWORDS=amd64 x86
 LICENSE=|| ( GPL-2 BL )
 RDEPEND=python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)] dev-python/numpy[python_targets_python3_4(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)] dev-python/requests[python_targets_python3_4(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)] >=media-libs/freetype-2.0:2 media-libs/glew:0= media-libs/libpng:0 media-libs/libsamplerate sys-libs/zlib virtual/glu virtual/jpeg:0 virtual/libintl virtual/opengl x11-libs/libX11 x11-libs/libXi x11-libs/libXxf86vm boost? ( >=dev-libs/boost-1.44[nls?,threads(+)] ) collada? ( >=media-libs/opencollada-1.6.18 ) colorio? ( >=media-libs/opencolorio-1.0.9-r2 ) cycles? ( media-libs/openimageio ) ffmpeg? ( media-video/ffmpeg:0=[x264,mp3,encode,theora,jpeg2k?] ) libav? ( >=media-video/libav-11.3:0=[x264,mp3,encode,theora,jpeg2k?] ) fftw? ( sci-libs/fftw:3.0 ) jack? ( media-sound/jack-audio-connection-kit ) jpeg2k? ( media-libs/openjpeg:0 ) ndof? ( app-misc/spacenavd dev-libs/libspnav ) nls? ( virtual/libiconv ) openal? ( >=media-libs/openal-1.6.372 ) openimageio? ( media-libs/openimageio ) openexr? ( media-libs/ilmbase media-libs/openexr ) sdl? ( media-libs/libsdl[sound,joystick] ) sndfile? ( media-libs/libsndfile ) tiff? ( media-libs/tiff:0 )
 REQUIRED_USE=python_targets_python3_4 player? ( game-engine ) redcode? ( jpeg2k ffmpeg ) cycles? ( boost openexr tiff ) nls? ( boost ) colorio? ( boost ) openal? ( boost ) game-engine? ( boost ) ?? ( ffmpeg libav )
 SLOT=0
-SRC_URI=http://download.blender.org/source/blender-2.72b.tar.gz
+SRC_URI=https://download.blender.org/source/blender-2.72b.tar.gz
 _eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	cmake-utils	b8d2d7038bb36192aa14e01c64e5a06a	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=09f08d13ca73fb01466fd3a67b752bbc
+_md5_=069859041061bbfd225c663a6756570b
diff --git a/metadata/md5-cache/media-gfx/blender-2.79 b/metadata/md5-cache/media-gfx/blender-2.79
index a649999bc2bc..cbba7a4db173 100644
--- a/metadata/md5-cache/media-gfx/blender-2.79
+++ b/metadata/md5-cache/media-gfx/blender-2.79
@@ -2,13 +2,13 @@ DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend
 DEPEND=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_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/boost-1.62:=[nls?,threads(+)] dev-libs/lzo:2 >=dev-python/numpy-1.10.1[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/requests[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(+)?] media-libs/freetype media-libs/glew:* media-libs/libpng:0= media-libs/libsamplerate sys-libs/zlib virtual/glu virtual/jpeg:0= virtual/libintl virtual/opengl collada? ( >=media-libs/opencollada-1.6.18:= ) colorio? ( media-libs/opencolorio ) cuda? ( dev-util/nvidia-cuda-toolkit:= ) ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?] ) libav? ( >=media-video/libav-11.3:=[x264,mp3,encode,theora,jpeg2k?] ) fftw? ( sci-libs/fftw:3.0= ) !headless? ( x11-libs/libX11 x11-libs/libXi x11-libs/libXxf86vm ) jack? ( virtual/jack ) jemalloc? ( dev-libs/jemalloc:= ) jpeg2k? ( media-libs/openjpeg:0 ) llvm? ( sys-devel/llvm:= ) ndof? ( app-misc/spacenavd dev-libs/libspnav ) nls? ( virtual/libiconv ) openal? ( media-libs/openal ) opencl? ( virtual/opencl ) openimageio? ( >=media-libs/openimageio-1.7.0 ) openexr? ( >=media-libs/ilmbase-2.2.0:= >=media-libs/openexr-2.2.0:= ) opensubdiv? ( >=media-libs/opensubdiv-3.3.0:=[cuda=,opencl=] ) openvdb? ( media-gfx/openvdb[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(+)?,abi3-compat(+),openvdb-compression(+)] dev-cpp/tbb >=dev-libs/c-blosc-1.5.2 ) osl? ( media-libs/osl:= ) sdl? ( media-libs/libsdl2[sound,joystick] ) sndfile? ( media-libs/libsndfile ) tiff? ( media-libs/tiff:0 ) valgrind? ( dev-util/valgrind ) virtual/pkgconfig >=dev-cpp/eigen-3.2.8:3 nls? ( sys-devel/gettext ) doc? ( app-doc/doxygen[-nodot(-),dot(+),latex] dev-python/sphinx[latex] ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
 DESCRIPTION=3D Creation/Animation/Publishing System
 EAPI=6
-HOMEPAGE=http://www.blender.org
+HOMEPAGE=https://www.blender.org
 IUSE=+bullet +dds +elbeem +game-engine +openexr collada colorio cuda cycles debug doc ffmpeg fftw headless jack jemalloc jpeg2k libav llvm man ndof nls openal opencl openimageio openmp opensubdiv openvdb osl player sdl sndfile test tiff valgrind python_targets_python3_5 python_targets_python3_6 python_single_target_python3_5 python_single_target_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( GPL-2 BL )
 RDEPEND=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_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/boost-1.62:=[nls?,threads(+)] dev-libs/lzo:2 >=dev-python/numpy-1.10.1[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/requests[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(+)?] media-libs/freetype media-libs/glew:* media-libs/libpng:0= media-libs/libsamplerate sys-libs/zlib virtual/glu virtual/jpeg:0= virtual/libintl virtual/opengl collada? ( >=media-libs/opencollada-1.6.18:= ) colorio? ( media-libs/opencolorio ) cuda? ( dev-util/nvidia-cuda-toolkit:= ) ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?] ) libav? ( >=media-video/libav-11.3:=[x264,mp3,encode,theora,jpeg2k?] ) fftw? ( sci-libs/fftw:3.0= ) !headless? ( x11-libs/libX11 x11-libs/libXi x11-libs/libXxf86vm ) jack? ( virtual/jack ) jemalloc? ( dev-libs/jemalloc:= ) jpeg2k? ( media-libs/openjpeg:0 ) llvm? ( sys-devel/llvm:= ) ndof? ( app-misc/spacenavd dev-libs/libspnav ) nls? ( virtual/libiconv ) openal? ( media-libs/openal ) opencl? ( virtual/opencl ) openimageio? ( >=media-libs/openimageio-1.7.0 ) openexr? ( >=media-libs/ilmbase-2.2.0:= >=media-libs/openexr-2.2.0:= ) opensubdiv? ( >=media-libs/opensubdiv-3.3.0:=[cuda=,opencl=] ) openvdb? ( media-gfx/openvdb[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(+)?,abi3-compat(+),openvdb-compression(+)] dev-cpp/tbb >=dev-libs/c-blosc-1.5.2 ) osl? ( media-libs/osl:= ) sdl? ( media-libs/libsdl2[sound,joystick] ) sndfile? ( media-libs/libsndfile ) tiff? ( media-libs/tiff:0 ) valgrind? ( dev-util/valgrind )
 REQUIRED_USE=^^ ( python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) player? ( game-engine !headless ) cuda? ( cycles ) cycles? ( openexr tiff openimageio ) opencl? ( cycles ) osl? ( cycles llvm )
 SLOT=0
-SRC_URI=http://download.blender.org/source/blender-2.79.tar.gz
+SRC_URI=https://download.blender.org/source/blender-2.79.tar.gz
 _eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	cmake-utils	b8d2d7038bb36192aa14e01c64e5a06a	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c343b5e24d7e7d8d9e403404469c3f5e
+_md5_=1bb68cfbea7abf92644c47cf6094243d
diff --git a/metadata/md5-cache/media-gfx/blender-2.79-r1 b/metadata/md5-cache/media-gfx/blender-2.79-r1
index 4944930241b5..a25afb163427 100644
--- a/metadata/md5-cache/media-gfx/blender-2.79-r1
+++ b/metadata/md5-cache/media-gfx/blender-2.79-r1
@@ -2,13 +2,13 @@ DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend
 DEPEND=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_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/boost-1.62:=[nls?,threads(+)] dev-libs/lzo:2 >=dev-python/numpy-1.10.1[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/requests[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(+)?] media-libs/freetype media-libs/glew:* media-libs/libpng:0= media-libs/libsamplerate sys-libs/zlib virtual/glu virtual/jpeg:0= virtual/libintl virtual/opengl collada? ( >=media-libs/opencollada-1.6.18:= ) colorio? ( media-libs/opencolorio ) cuda? ( dev-util/nvidia-cuda-toolkit:= ) ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?] ) libav? ( >=media-video/libav-11.3:=[x264,mp3,encode,theora,jpeg2k?] ) fftw? ( sci-libs/fftw:3.0= ) !headless? ( x11-libs/libX11 x11-libs/libXi x11-libs/libXxf86vm ) jack? ( virtual/jack ) jemalloc? ( dev-libs/jemalloc:= ) jpeg2k? ( media-libs/openjpeg:0 ) llvm? ( sys-devel/llvm:= ) ndof? ( app-misc/spacenavd dev-libs/libspnav ) nls? ( virtual/libiconv ) openal? ( media-libs/openal ) opencl? ( virtual/opencl ) openimageio? ( >=media-libs/openimageio-1.7.0 ) openexr? ( >=media-libs/ilmbase-2.2.0:= >=media-libs/openexr-2.2.0:= ) opensubdiv? ( >=media-libs/opensubdiv-3.3.0:=[cuda=,opencl=] ) openvdb? ( media-gfx/openvdb[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(+)?,abi3-compat(+),openvdb-compression(+)] dev-cpp/tbb >=dev-libs/c-blosc-1.5.2 ) osl? ( media-libs/osl:= ) sdl? ( media-libs/libsdl2[sound,joystick] ) sndfile? ( media-libs/libsndfile ) tiff? ( media-libs/tiff:0 ) valgrind? ( dev-util/valgrind ) virtual/pkgconfig >=dev-cpp/eigen-3.2.8:3 nls? ( sys-devel/gettext ) doc? ( app-doc/doxygen[-nodot(-),dot(+),latex] dev-python/sphinx[latex] ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
 DESCRIPTION=3D Creation/Animation/Publishing System
 EAPI=6
-HOMEPAGE=http://www.blender.org
+HOMEPAGE=https://www.blender.org
 IUSE=+bullet +dds +elbeem +game-engine +openexr collada colorio cuda cycles debug doc ffmpeg fftw headless jack jemalloc jpeg2k libav llvm man ndof nls openal opencl openimageio openmp opensubdiv openvdb osl player sdl sndfile test tiff valgrind python_targets_python3_5 python_targets_python3_6 python_single_target_python3_5 python_single_target_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( GPL-2 BL )
 RDEPEND=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_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/boost-1.62:=[nls?,threads(+)] dev-libs/lzo:2 >=dev-python/numpy-1.10.1[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/requests[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(+)?] media-libs/freetype media-libs/glew:* media-libs/libpng:0= media-libs/libsamplerate sys-libs/zlib virtual/glu virtual/jpeg:0= virtual/libintl virtual/opengl collada? ( >=media-libs/opencollada-1.6.18:= ) colorio? ( media-libs/opencolorio ) cuda? ( dev-util/nvidia-cuda-toolkit:= ) ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?] ) libav? ( >=media-video/libav-11.3:=[x264,mp3,encode,theora,jpeg2k?] ) fftw? ( sci-libs/fftw:3.0= ) !headless? ( x11-libs/libX11 x11-libs/libXi x11-libs/libXxf86vm ) jack? ( virtual/jack ) jemalloc? ( dev-libs/jemalloc:= ) jpeg2k? ( media-libs/openjpeg:0 ) llvm? ( sys-devel/llvm:= ) ndof? ( app-misc/spacenavd dev-libs/libspnav ) nls? ( virtual/libiconv ) openal? ( media-libs/openal ) opencl? ( virtual/opencl ) openimageio? ( >=media-libs/openimageio-1.7.0 ) openexr? ( >=media-libs/ilmbase-2.2.0:= >=media-libs/openexr-2.2.0:= ) opensubdiv? ( >=media-libs/opensubdiv-3.3.0:=[cuda=,opencl=] ) openvdb? ( media-gfx/openvdb[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(+)?,abi3-compat(+),openvdb-compression(+)] dev-cpp/tbb >=dev-libs/c-blosc-1.5.2 ) osl? ( media-libs/osl:= ) sdl? ( media-libs/libsdl2[sound,joystick] ) sndfile? ( media-libs/libsndfile ) tiff? ( media-libs/tiff:0 ) valgrind? ( dev-util/valgrind )
 REQUIRED_USE=^^ ( python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) player? ( game-engine !headless ) cuda? ( cycles ) cycles? ( openexr tiff openimageio ) opencl? ( cycles ) osl? ( cycles llvm )
 SLOT=0
-SRC_URI=http://download.blender.org/source/blender-2.79.tar.gz
+SRC_URI=https://download.blender.org/source/blender-2.79.tar.gz
 _eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	cmake-utils	b8d2d7038bb36192aa14e01c64e5a06a	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2c42ef7bca309a261529b32c2cd4c1fb
+_md5_=2098efbafde0d6e5bba83df230fe3cae
diff --git a/metadata/md5-cache/media-gfx/fim-0.5_rc3 b/metadata/md5-cache/media-gfx/fim-0.5_rc3
new file mode 100644
index 000000000000..6da3a70041cd
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/fim-0.5_rc3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=media-fonts/terminus-font aalib? ( media-libs/aalib[slang] ) dia? ( app-office/dia ) djvu? ( app-text/djvu ) exif? ( media-libs/libexif ) gif? ( media-libs/giflib ) graphicsmagick? ( media-gfx/graphicsmagick ) imagemagick? ( virtual/imagemagick-tools ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/jasper:= ) pdf? ( >=app-text/poppler-0.31 ) png? ( media-libs/libpng:0= ) postscript? ( app-text/libspectre ) readline? ( sys-libs/readline:0= ) sdl? ( media-libs/libsdl ) svg? ( media-gfx/inkscape ) tiff? ( media-libs/tiff:0 ) xfig? ( media-gfx/xfig ) sys-devel/bison sys-devel/flex >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Fbi-IMproved is a framebuffer image viewer based on Fbi and inspired from Vim
+EAPI=6
+HOMEPAGE=https://savannah.nongnu.org/projects/fbi-improved
+IUSE=aalib bmp dia djvu exif fbcon gif graphicsmagick imagemagick jpeg jpeg2k pcx pdf png postscript readline sdl static svg tiff xfig
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=media-fonts/terminus-font aalib? ( media-libs/aalib[slang] ) dia? ( app-office/dia ) djvu? ( app-text/djvu ) exif? ( media-libs/libexif ) gif? ( media-libs/giflib ) graphicsmagick? ( media-gfx/graphicsmagick ) imagemagick? ( virtual/imagemagick-tools ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/jasper:= ) pdf? ( >=app-text/poppler-0.31 ) png? ( media-libs/libpng:0= ) postscript? ( app-text/libspectre ) readline? ( sys-libs/readline:0= ) sdl? ( media-libs/libsdl ) svg? ( media-gfx/inkscape ) tiff? ( media-libs/tiff:0 ) xfig? ( media-gfx/xfig )
+SLOT=0
+SRC_URI=http://download.savannah.gnu.org/releases/fbi-improved/fim-0.5-rc3.tar.bz2
+_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=af4b6b537cb7bcf6dc21d94ff95b28f3
diff --git a/metadata/md5-cache/media-gfx/plantuml-8046 b/metadata/md5-cache/media-gfx/plantuml-8046
index 4fc74efee913..13221a7a3403 100644
--- a/metadata/md5-cache/media-gfx/plantuml-8046
+++ b/metadata/md5-cache/media-gfx/plantuml-8046
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=virtual/jre-1.7 dev-java/ant-core:0 >=media-gfx/graphviz-2.26.3 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/plantuml/plantuml-8046.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=2bd2fa6696a55dcf6bea8edcc10c5fed
diff --git a/metadata/md5-cache/media-gfx/raw-thumbnailer-0.2.1-r1 b/metadata/md5-cache/media-gfx/raw-thumbnailer-0.2.1-r1
index ed1e6637e0cc..4187a9493994 100644
--- a/metadata/md5-cache/media-gfx/raw-thumbnailer-0.2.1-r1
+++ b/metadata/md5-cache/media-gfx/raw-thumbnailer-0.2.1-r1
@@ -3,10 +3,10 @@ DEPEND=>=media-libs/libopenraw-0.1:=[gtk] x11-libs/gtk+:2 !media-gfx/gnome-raw-t
 DESCRIPTION=A lightweight and fast raw image thumbnailer
 EAPI=6
 HOMEPAGE=https://github.com/erlendd/raw-thumbnailer
-KEYWORDS=alpha amd64 ~arm ~hppa ia64 ppc ~ppc64 sparc x86
+KEYWORDS=alpha amd64 arm ~hppa ia64 ppc ~ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/libopenraw-0.1:=[gtk] x11-libs/gtk+:2 !media-gfx/gnome-raw-thumbnailer
 SLOT=0
 SRC_URI=https://raw-thumbnailer.googlecode.com/files/raw-thumbnailer-0.2.1.tar.gz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=5be2799f3573fb11bfd46012902d551a
+_md5_=d8864419f590431b9cbab58ba3daaab3
diff --git a/metadata/md5-cache/media-gfx/ristretto-0.8.0-r1 b/metadata/md5-cache/media-gfx/ristretto-0.8.0-r1
deleted file mode 100644
index 0528788dc2df..000000000000
--- a/metadata/md5-cache/media-gfx/ristretto-0.8.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=>=dev-libs/dbus-glib-0.98:0= >=dev-libs/glib-2.24:2= media-libs/libexif:0= x11-libs/cairo:0= >=x11-libs/gtk+-2.20:2= x11-libs/libX11:0= >=xfce-base/libxfce4ui-4.10:0= >=xfce-base/libxfce4util-4.10:0= >=xfce-base/xfconf-4.10:0= dev-util/intltool virtual/pkgconfig sys-devel/gettext >=app-portage/elt-patches-20170422 >=sys-apps/sed-4
-DESCRIPTION=A fast and lightweight picture viewer for the Xfce desktop environment
-EAPI=5
-HOMEPAGE=https://docs.xfce.org/apps/ristretto/start
-IUSE=debug
-KEYWORDS=~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/dbus-glib-0.98:0= >=dev-libs/glib-2.24:2= media-libs/libexif:0= x11-libs/cairo:0= >=x11-libs/gtk+-2.20:2= x11-libs/libX11:0= >=xfce-base/libxfce4ui-4.10:0= >=xfce-base/libxfce4util-4.10:0= >=xfce-base/xfconf-4.10:0=
-SLOT=0
-SRC_URI=mirror://xfce/src/apps/ristretto/0.8/ristretto-0.8.0.tar.bz2
-_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25	xfconf	25bb7fe99d6e58851633dc43d429c5ae
-_md5_=568eba31f79a3e9b9b3b6767b9111636
diff --git a/metadata/md5-cache/media-gfx/ristretto-0.8.2 b/metadata/md5-cache/media-gfx/ristretto-0.8.2
deleted file mode 100644
index 473d9f29c57d..000000000000
--- a/metadata/md5-cache/media-gfx/ristretto-0.8.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=>=dev-libs/dbus-glib-0.98:0= >=dev-libs/glib-2.24:2= media-libs/libexif:0= x11-libs/cairo:0= >=x11-libs/gtk+-2.20:2= x11-libs/libX11:0= >=xfce-base/libxfce4ui-4.10:0= >=xfce-base/libxfce4util-4.10:0= >=xfce-base/xfconf-4.10:0= dev-util/intltool virtual/pkgconfig sys-devel/gettext >=app-portage/elt-patches-20170422 >=sys-apps/sed-4
-DESCRIPTION=A fast and lightweight picture viewer for the Xfce desktop environment
-EAPI=5
-HOMEPAGE=https://docs.xfce.org/apps/ristretto/start
-IUSE=debug
-KEYWORDS=~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/dbus-glib-0.98:0= >=dev-libs/glib-2.24:2= media-libs/libexif:0= x11-libs/cairo:0= >=x11-libs/gtk+-2.20:2= x11-libs/libX11:0= >=xfce-base/libxfce4ui-4.10:0= >=xfce-base/libxfce4util-4.10:0= >=xfce-base/xfconf-4.10:0=
-SLOT=0
-SRC_URI=mirror://xfce/src/apps/ristretto/0.8/ristretto-0.8.2.tar.bz2
-_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25	xfconf	25bb7fe99d6e58851633dc43d429c5ae
-_md5_=9084c2374a0692fc699bacc19c26c0d5
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index 05e132d203a7..ea2c3fa06ff2 100644
--- a/metadata/md5-cache/media-libs/Manifest.gz
+++ b/metadata/md5-cache/media-libs/Manifest.gz
diff --git a/metadata/md5-cache/media-libs/gd-2.2.5 b/metadata/md5-cache/media-libs/gd-2.2.5
index 28c40359f54d..91cf3bdd8ece 100644
--- a/metadata/md5-cache/media-libs/gd-2.2.5
+++ b/metadata/md5-cache/media-libs/gd-2.2.5
@@ -4,11 +4,11 @@ DESCRIPTION=A graphics library for fast image creation
 EAPI=6
 HOMEPAGE=http://libgd.org/ http://www.boutell.com/gd/
 IUSE=fontconfig jpeg png static-libs tiff truetype webp xpm 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
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~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 ~m68k ~mips ppc ppc64 ~s390 ~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=gd IJG HPND BSD
 RDEPEND=fontconfig? ( >=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(-)?] ) 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(-)?] ) tiff? ( media-libs/tiff: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(-)?] ) truetype? ( >=media-libs/freetype-2.5.0.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(-)?] ) webp? ( media-libs/libwebp:=[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(-)?] ) xpm? ( >=x11-libs/libXpm-3.5.10-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/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(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=prefix? ( fontconfig )
 SLOT=2/3
 SRC_URI=https://github.com/libgd/libgd/releases/download/gd-2.2.5/libgd-2.2.5.tar.xz
 _eclasses_=libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=2397e9af88869d5512e168dbf6c449ca
+_md5_=0aa25df4e95eeb055997d4901075b983
diff --git a/metadata/md5-cache/media-libs/jasper-2.0.14 b/metadata/md5-cache/media-libs/jasper-2.0.14
index 13c04a65a07c..1ab0d5a1d283 100644
--- a/metadata/md5-cache/media-libs/jasper-2.0.14
+++ b/metadata/md5-cache/media-libs/jasper-2.0.14
@@ -4,10 +4,10 @@ DESCRIPTION=Implementation of the codec specified in the JPEG-2000 Part-1 standa
 EAPI=6
 HOMEPAGE=https://www.ece.uvic.ca/~mdadams/jasper/
 IUSE=doc jpeg opengl 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 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=JasPer2.0
 RDEPEND=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(-)?] ) opengl? ( >=virtual/opengl-7.0-r1: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/freeglut-2.8.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(-)?] virtual/glu[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/libXi[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[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/4
 SRC_URI=https://github.com/mdadams/jasper/archive/version-2.0.14.tar.gz -> jasper-2.0.14.tar.gz
 _eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	b8d2d7038bb36192aa14e01c64e5a06a	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ac5717b19b2d2bafffdf2eb7b870d37a
+_md5_=7b4be5a03d5c1ab21758ce763803b459
diff --git a/metadata/md5-cache/media-libs/jpeg-9c b/metadata/md5-cache/media-libs/jpeg-9c
index 049a3f7751c8..18cbafc9b6e0 100644
--- a/metadata/md5-cache/media-libs/jpeg-9c
+++ b/metadata/md5-cache/media-libs/jpeg-9c
@@ -4,10 +4,10 @@ DESCRIPTION=Library to load, handle and manipulate images in the JPEG format
 EAPI=6
 HOMEPAGE=http://jpegclub.org/ http://www.ijg.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 ~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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=IJG
 RDEPEND=!media-libs/libjpeg-turbo:0
 SLOT=0
 SRC_URI=http://www.ijg.org/files/jpegsrc.v9c.tar.gz mirror://debian/pool/main/libj/libjpeg8/libjpeg8_8d-1.debian.tar.gz
 _eclasses_=libtool	0081a71a261724730ec4c248494f044d	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=8516ff01e4ed0ce680d3ba480a47808e
+_md5_=fe30f2c697c97e00de229e6c6e8ca0df
diff --git a/metadata/md5-cache/media-libs/libdvdcss-1.4.2 b/metadata/md5-cache/media-libs/libdvdcss-1.4.2
new file mode 100644
index 000000000000..08d1109ee6eb
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libdvdcss-1.4.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=doc? ( app-doc/doxygen ) >=app-portage/elt-patches-20170422
+DESCRIPTION=A portable abstraction library for DVD decryption
+EAPI=5
+HOMEPAGE=https://www.videolan.org/developers/libdvdcss.html
+IUSE=doc 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 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+LICENSE=GPL-2
+SLOT=1.2
+SRC_URI=https://download.videolan.org/pub/libdvdcss/1.4.2/libdvdcss-1.4.2.tar.bz2
+_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	autotools-multilib	f4848d9634439c7203cb7dd3b9650fff	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=74b364fa018663760038838d67607153
diff --git a/metadata/md5-cache/media-libs/libmpris2client-0.1.0 b/metadata/md5-cache/media-libs/libmpris2client-0.1.0
deleted file mode 100644
index b08a0711223e..000000000000
--- a/metadata/md5-cache/media-libs/libmpris2client-0.1.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst
-DEPEND=>=dev-libs/glib-2 x11-libs/gtk+:2 virtual/pkgconfig >=sys-apps/sed-4
-DESCRIPTION=An library to control MPRIS2 compatible players
-EAPI=5
-HOMEPAGE=https://github.com/matiasdelellis/libmpris2client
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=>=dev-libs/glib-2 x11-libs/gtk+:2
-SLOT=0
-SRC_URI=https://github.com/matiasdelellis/libmpris2client/releases/download/V0.1.0/libmpris2client-0.1.0.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=cde7111c32f42b4bdd277b07b27523da
diff --git a/metadata/md5-cache/media-libs/libmtp-1.1.14 b/metadata/md5-cache/media-libs/libmtp-1.1.14
index c6cead5314ef..8e03440a8a5c 100644
--- a/metadata/md5-cache/media-libs/libmtp-1.1.14
+++ b/metadata/md5-cache/media-libs/libmtp-1.1.14
@@ -4,10 +4,10 @@ DESCRIPTION=An implementation of Microsoft's Media Transfer Protocol (MTP)
 EAPI=6
 HOMEPAGE=http://libmtp.sourceforge.net/
 IUSE=+crypt doc examples static-libs
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=LGPL-2.1
 RDEPEND=virtual/libusb:1 crypt? ( >=dev-libs/libgcrypt-1.5.4:0= )
 SLOT=0/9
 SRC_URI=mirror://sourceforge/libmtp/libmtp-1.1.14.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=baef03001443ca2120019357bcba1100
+_md5_=40f4e98d3c7a45b576ecf7f61fbba2e6
diff --git a/metadata/md5-cache/media-libs/libopenraw-0.1.2 b/metadata/md5-cache/media-libs/libopenraw-0.1.2
index 47fd614aef8c..c38d691ce056 100644
--- a/metadata/md5-cache/media-libs/libopenraw-0.1.2
+++ b/metadata/md5-cache/media-libs/libopenraw-0.1.2
@@ -4,10 +4,10 @@ DESCRIPTION=A decoding library for RAW image formats
 EAPI=6
 HOMEPAGE=https://libopenraw.freedesktop.org/wiki/
 IUSE=gtk static-libs test
-KEYWORDS=alpha amd64 ~arm ~hppa ia64 ~mips ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris
+KEYWORDS=alpha amd64 arm ~hppa ia64 ~mips ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris
 LICENSE=GPL-3 LGPL-3
 RDEPEND=dev-libs/libxml2 virtual/jpeg:0 gtk? ( dev-libs/glib:2 >=x11-libs/gdk-pixbuf-2.24.0:2 )
 SLOT=0/7
 SRC_URI=https://libopenraw.freedesktop.org/download/libopenraw-0.1.2.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=82a2b80e2ec047359f280a89e634f5ea
+_md5_=afc13f2c05f535f80c343ed7f7981d4d
diff --git a/metadata/md5-cache/media-libs/openal-1.18.2-r1 b/metadata/md5-cache/media-libs/openal-1.18.2-r1
index 640e149264d4..1ca0bf7471f0 100644
--- a/metadata/md5-cache/media-libs/openal-1.18.2-r1
+++ b/metadata/md5-cache/media-libs/openal-1.18.2-r1
@@ -4,10 +4,10 @@ DESCRIPTION=A software implementation of the OpenAL 3D audio API
 EAPI=6
 HOMEPAGE=http://kcat.strangesoft.net/openal.html
 IUSE=alsa coreaudio debug jack oss portaudio pulseaudio qt5 cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_arm_neon 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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=LGPL-2+
 RDEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.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(-)?] ) jack? ( virtual/jack[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(-)?] ) portaudio? ( >=media-libs/portaudio-19_pre20111121-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(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.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(-)?] ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )
 SLOT=0
 SRC_URI=http://kcat.strangesoft.net/openal-releases/openal-soft-1.18.2.tar.bz2
 _eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	b8d2d7038bb36192aa14e01c64e5a06a	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=43b772254615c629a86fba00065cb2b8
+_md5_=9c49048b4a678aad1e6fd3dc0cb09547
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 10856f4c4a8d..18f7146ad409 100644
--- a/metadata/md5-cache/media-libs/opencv-2.4.13-r3
+++ b/metadata/md5-cache/media-libs/opencv-2.4.13-r3
@@ -10,5 +10,5 @@ RDEPEND=app-arch/bzip2 sys-libs/zlib cuda? ( >=dev-util/nvidia-cuda-toolkit-5.5
 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	b8d2d7038bb36192aa14e01c64e5a06a	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	b8d2d7038bb36192aa14e01c64e5a06a	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=dbb0be6f401ffb448b480f2d5227dd4d
diff --git a/metadata/md5-cache/media-libs/opencv-3.1.0-r8 b/metadata/md5-cache/media-libs/opencv-3.1.0-r8
index 261945924ec3..63dce1b986fc 100644
--- a/metadata/md5-cache/media-libs/opencv-3.1.0-r8
+++ b/metadata/md5-cache/media-libs/opencv-3.1.0-r8
@@ -10,5 +10,5 @@ RDEPEND=app-arch/bzip2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n3
 REQUIRED_USE=cuda? ( tesseract? ( opencl ) ) gflags? ( contrib ) glog? ( contrib ) contrib_cvv? ( contrib qt5 ) contrib_hdf? ( contrib ) contrib_sfm? ( contrib eigen gflags glog ) opengl? ( || ( gtk qt5 ) ) python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 ) ) tesseract? ( contrib )
 SLOT=0/3.1
 SRC_URI=https://github.com/opencv/opencv/archive/3.1.0.tar.gz -> opencv-3.1.0.tar.gz contrib? ( https://github.com/opencv/opencv_contrib/archive/75b3ea9f72fdb083140fc63855b7677d67748376.tar.gz -> opencv-3.1.0_contrib-75b3ea9.tar.gz )
-_eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	b8d2d7038bb36192aa14e01c64e5a06a	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	b8d2d7038bb36192aa14e01c64e5a06a	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=33e8e4f9b6f5e0dc69280d01d4bca97c
diff --git a/metadata/md5-cache/media-libs/opencv-3.2.0-r2 b/metadata/md5-cache/media-libs/opencv-3.2.0-r2
index f677afa4e741..705ee999c1ad 100644
--- a/metadata/md5-cache/media-libs/opencv-3.2.0-r2
+++ b/metadata/md5-cache/media-libs/opencv-3.2.0-r2
@@ -10,5 +10,5 @@ RDEPEND=app-arch/bzip2 sys-libs/zlib cuda? ( dev-util/nvidia-cuda-toolkit:0= ) c
 REQUIRED_USE=cuda? ( tesseract? ( opencl ) ) gflags? ( contrib ) glog? ( contrib ) contrib_cvv? ( contrib qt5 ) contrib_hdf? ( contrib ) contrib_sfm? ( contrib eigen gflags glog ) opengl? ( || ( gtk qt5 ) ) python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 ) ) tesseract? ( contrib )
 SLOT=0/3.2
 SRC_URI=https://github.com/opencv/opencv/archive/3.2.0.tar.gz -> opencv-3.2.0.tar.gz contrib? ( https://github.com/opencv/opencv_contrib/archive/3.2.0.tar.gz -> opencv-3.2.0_contrib.tar.gz contrib_xfeatures2d? ( https://dev.gentoo.org/~amynka/snap/vgg_boostdesc-3.2.0.tar.gz ) )
-_eclasses_=cmake-utils	b8d2d7038bb36192aa14e01c64e5a06a	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	b8d2d7038bb36192aa14e01c64e5a06a	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=dccc61a5a7970551d71dbea49cc5efaa
diff --git a/metadata/md5-cache/media-libs/opencv-3.2.0-r3 b/metadata/md5-cache/media-libs/opencv-3.2.0-r3
index c30ee4f31e87..09026ffa014b 100644
--- a/metadata/md5-cache/media-libs/opencv-3.2.0-r3
+++ b/metadata/md5-cache/media-libs/opencv-3.2.0-r3
@@ -10,5 +10,5 @@ RDEPEND=app-arch/bzip2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n3
 REQUIRED_USE=cuda? ( tesseract? ( opencl ) ) gflags? ( contrib ) glog? ( contrib ) contrib_cvv? ( contrib qt5 ) contrib_hdf? ( contrib ) contrib_sfm? ( contrib eigen gflags glog ) opengl? ( || ( gtk qt5 ) ) python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 ) ) tesseract? ( contrib )
 SLOT=0/3.2
 SRC_URI=https://github.com/opencv/opencv/archive/3.2.0.tar.gz -> opencv-3.2.0.tar.gz contrib? ( https://github.com/opencv/opencv_contrib/archive/3.2.0.tar.gz -> opencv-3.2.0_contrib.tar.gz contrib_xfeatures2d? ( https://dev.gentoo.org/~amynka/snap/vgg_boostdesc-3.2.0.tar.gz ) )
-_eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	b8d2d7038bb36192aa14e01c64e5a06a	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	b8d2d7038bb36192aa14e01c64e5a06a	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=beb6587b1daf5cb9b9df03582c6f70e1
diff --git a/metadata/md5-cache/media-libs/opencv-3.3.0-r2 b/metadata/md5-cache/media-libs/opencv-3.3.0-r2
index 2f2d1a838eb4..ccdab64c5829 100644
--- a/metadata/md5-cache/media-libs/opencv-3.3.0-r2
+++ b/metadata/md5-cache/media-libs/opencv-3.3.0-r2
@@ -10,5 +10,5 @@ RDEPEND=app-arch/bzip2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n3
 REQUIRED_USE=cuda? ( tesseract? ( opencl ) ) gflags? ( contrib ) glog? ( contrib ) contrib_cvv? ( contrib qt5 ) contrib_hdf? ( contrib ) contrib_sfm? ( contrib eigen gflags glog ) contrib_xfeatures2d? ( contrib cuda ) java? ( python ) opengl? ( || ( gtk qt5 ) ) python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 ) ) tesseract? ( contrib )
 SLOT=0/3.3
 SRC_URI=https://github.com/opencv/opencv/archive/3.3.0.tar.gz -> opencv-3.3.0.tar.gz https://dev.gentoo.org/~amynka/snap/imgcodecs-opencv-3.3.0.tar.gz contrib? ( https://github.com/opencv/opencv_contrib/archive/3.3.0.tar.gz -> opencv-3.3.0_contrib.tar.gz contrib_xfeatures2d? ( https://dev.gentoo.org/~amynka/snap/vgg_boostdesc-3.2.0.tar.gz ) )
-_eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	b8d2d7038bb36192aa14e01c64e5a06a	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	b8d2d7038bb36192aa14e01c64e5a06a	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=93fa8c7c66aba3cc3d63344f17ac2736
diff --git a/metadata/md5-cache/media-libs/opencv-3.3.0-r4 b/metadata/md5-cache/media-libs/opencv-3.3.0-r4
index 4d9477184da0..f7be339f5c90 100644
--- a/metadata/md5-cache/media-libs/opencv-3.3.0-r4
+++ b/metadata/md5-cache/media-libs/opencv-3.3.0-r4
@@ -10,5 +10,5 @@ RDEPEND=app-arch/bzip2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n3
 REQUIRED_USE=cuda? ( tesseract? ( opencl ) ) gflags? ( contrib ) glog? ( contrib ) contrib_cvv? ( contrib qt5 ) contrib_hdf? ( contrib ) contrib_sfm? ( contrib eigen gflags glog ) contrib_xfeatures2d? ( contrib cuda ) java? ( python ) opengl? ( || ( gtk qt5 ) ) python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 ) ) tesseract? ( contrib )
 SLOT=0/3.3
 SRC_URI=https://github.com/opencv/opencv/archive/3.3.0.tar.gz -> opencv-3.3.0.tar.gz https://dev.gentoo.org/~amynka/snap/imgcodecs-opencv-3.3.0.tar.gz contrib? ( https://github.com/opencv/opencv_contrib/archive/3.3.0.tar.gz -> opencv-3.3.0_contrib.tar.gz contrib_xfeatures2d? ( https://dev.gentoo.org/~amynka/snap/vgg_boostdesc-3.2.0.tar.gz ) )
-_eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	b8d2d7038bb36192aa14e01c64e5a06a	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	b8d2d7038bb36192aa14e01c64e5a06a	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=acabf75003bca1c9c8859a314c1325bf
diff --git a/metadata/md5-cache/media-libs/opencv-3.3.0-r5 b/metadata/md5-cache/media-libs/opencv-3.3.0-r5
index 85a49401ad20..6a0e6e3e95ab 100644
--- a/metadata/md5-cache/media-libs/opencv-3.3.0-r5
+++ b/metadata/md5-cache/media-libs/opencv-3.3.0-r5
@@ -10,5 +10,5 @@ RDEPEND=app-arch/bzip2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n3
 REQUIRED_USE=cuda? ( tesseract? ( opencl ) ) gflags? ( contrib ) glog? ( contrib ) contrib_cvv? ( contrib qt5 ) contrib_dnn? ( contrib ) contrib_hdf? ( contrib ) contrib_sfm? ( contrib eigen gflags glog ) contrib_xfeatures2d? ( contrib cuda ) java? ( python ) opengl? ( || ( gtk qt5 ) ) python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) ) tesseract? ( contrib )
 SLOT=0/3.3
 SRC_URI=https://github.com/opencv/opencv/archive/3.3.0.tar.gz -> opencv-3.3.0.tar.gz https://dev.gentoo.org/~amynka/snap/imgcodecs-opencv-3.3.0.tar.gz contrib? ( https://github.com/opencv/opencv_contrib/archive/3.3.0.tar.gz -> opencv-3.3.0_contrib.tar.gz contrib_dnn? ( https://github.com/tiny-dnn/tiny-dnn/archive/v1.0.0a3.tar.gz -> tiny-dnn-1.0.0a3.tar.gz ) contrib_xfeatures2d? ( https://dev.gentoo.org/~amynka/snap/vgg_boostdesc-3.2.0.tar.gz ) )
-_eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	b8d2d7038bb36192aa14e01c64e5a06a	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	b8d2d7038bb36192aa14e01c64e5a06a	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=0de664d541bde8a1514f4d65fe29569e
diff --git a/metadata/md5-cache/media-libs/tiff-4.0.9-r3 b/metadata/md5-cache/media-libs/tiff-4.0.9-r3
index 8788074f1d63..e18485a2ba7a 100644
--- a/metadata/md5-cache/media-libs/tiff-4.0.9-r3
+++ b/metadata/md5-cache/media-libs/tiff-4.0.9-r3
@@ -4,11 +4,11 @@ DESCRIPTION=Tag Image File Format (TIFF) library
 EAPI=6
 HOMEPAGE=http://libtiff.maptools.org
 IUSE=+cxx jbig jpeg lzma static-libs test 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
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=libtiff
 RDEPEND=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(-)?] ) jbig? ( >=media-libs/jbigkit-2.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(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-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(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 REQUIRED_USE=test? ( jpeg )
 SLOT=0
 SRC_URI=http://download.osgeo.org/libtiff/tiff-4.0.9.tar.gz ftp://ftp.remotesensing.org/pub/libtiff/tiff-4.0.9.tar.gz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=6047ad114af344d97cc9e544fedace07
+_md5_=48c44fd13f878805af9be8f40db9ecda
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index 6313c52454b9..7145a3b8dbb5 100644
--- a/metadata/md5-cache/media-sound/Manifest.gz
+++ b/metadata/md5-cache/media-sound/Manifest.gz
diff --git a/metadata/md5-cache/media-sound/entagged-tageditor-0.35 b/metadata/md5-cache/media-sound/entagged-tageditor-0.35
index 1b7a1dfb0833..170254e64a76 100644
--- a/metadata/md5-cache/media-sound/entagged-tageditor-0.35
+++ b/metadata/md5-cache/media-sound/entagged-tageditor-0.35
@@ -9,5 +9,5 @@ LICENSE=|| ( GPL-2 LGPL-2.1 )
 RDEPEND=>=virtual/jre-1.5 dev-java/squareness-jlf dev-db/hsqldb >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=mirror://gentoo/entagged-tageditor-0.35.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=9b1eef405a502d22f820d5aaea073073
diff --git a/metadata/md5-cache/media-sound/pragha-1.3.1-r1 b/metadata/md5-cache/media-sound/pragha-1.3.1-r1
deleted file mode 100644
index 89a567de0fa0..000000000000
--- a/metadata/md5-cache/media-sound/pragha-1.3.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=>=dev-db/sqlite-3.4:3= >=dev-libs/glib-2.32:= >=dev-libs/libcdio-0.90:= >=dev-libs/libcdio-paranoia-0.90:= media-libs/gst-plugins-base:1.0= >=media-libs/libcddb-1.3.0:= >=media-libs/taglib-1.7.0:= >=x11-libs/gtk+-3.4:3= >=xfce-base/libxfce4ui-4.11:=[gtk3(+)] glyr? ( >=media-libs/glyr-1.0.1:= ) grilo? ( >=media-libs/grilo-0.2.10:= ) keybinder? ( >=dev-libs/keybinder-0.2.0:3= ) lastfm? ( >=media-libs/libclastfm-0.5:= ) libnotify? ( >=x11-libs/libnotify-0.7:= ) mtp? ( >=media-libs/libmtp-1.1.0:= ) peas? ( >=dev-libs/libpeas-1.0.0:=[gtk] ) playlist? ( >=dev-libs/totem-pl-parser-2.26:= ) rygel? ( >=net-misc/rygel-0.20:= ) soup? ( >=net-libs/libsoup-2.38:= ) udev? ( virtual/libgudev:= ) dev-util/intltool >=dev-util/xfce4-dev-tools-4.10 sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170422 >=sys-apps/sed-4
-DESCRIPTION=A lightweight music player (with support for the Xfce desktop environment)
-EAPI=5
-HOMEPAGE=https://github.com/pragha-music-player/pragha
-IUSE=debug +glyr grilo +keybinder lastfm libnotify mtp +peas +playlist rygel soup +udev
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=>=dev-db/sqlite-3.4:3= >=dev-libs/glib-2.32:= >=dev-libs/libcdio-0.90:= >=dev-libs/libcdio-paranoia-0.90:= media-libs/gst-plugins-base:1.0= >=media-libs/libcddb-1.3.0:= >=media-libs/taglib-1.7.0:= >=x11-libs/gtk+-3.4:3= >=xfce-base/libxfce4ui-4.11:=[gtk3(+)] glyr? ( >=media-libs/glyr-1.0.1:= ) grilo? ( >=media-libs/grilo-0.2.10:= ) keybinder? ( >=dev-libs/keybinder-0.2.0:3= ) lastfm? ( >=media-libs/libclastfm-0.5:= ) libnotify? ( >=x11-libs/libnotify-0.7:= ) mtp? ( >=media-libs/libmtp-1.1.0:= ) peas? ( >=dev-libs/libpeas-1.0.0:=[gtk] ) playlist? ( >=dev-libs/totem-pl-parser-2.26:= ) rygel? ( >=net-misc/rygel-0.20:= ) soup? ( >=net-libs/libsoup-2.38:= ) udev? ( virtual/libgudev:= ) media-plugins/gst-plugins-meta:1.0
-REQUIRED_USE=glyr? ( peas ) grilo? ( peas ) libnotify? ( peas ) mtp? ( udev ) rygel? ( peas ) soup? ( peas ) udev? ( peas )
-SLOT=0
-SRC_URI=https://github.com/pragha-music-player/pragha/releases/download/v1.3.1/pragha-1.3.1.tar.bz2
-_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25	xfconf	25bb7fe99d6e58851633dc43d429c5ae
-_md5_=9a9fe4c2ecd4360fad837bdb96e0e4a9
diff --git a/metadata/md5-cache/media-sound/tuxguitar-1.3.2 b/metadata/md5-cache/media-sound/tuxguitar-1.3.2
index b95d3d0a3d69..02fbb785f831 100644
--- a/metadata/md5-cache/media-sound/tuxguitar-1.3.2
+++ b/metadata/md5-cache/media-sound/tuxguitar-1.3.2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.5 timidity? ( media-sound/timidity++[alsa?,oss?] ) dev-java/swt:3.7[cairo] alsa? ( media-libs/alsa-lib ) pdf? ( dev-java/itext:5 ) fluidsynth? ( media-sound/fluidsynth ) lilypond? ( media-sound/lilypond ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/tuxguitar/tuxguitar-1.3.2-src.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=632c9b7a44e2be730b7e9b4023831958
diff --git a/metadata/md5-cache/media-sound/xfmpc-0.2.2 b/metadata/md5-cache/media-sound/xfmpc-0.2.2
deleted file mode 100644
index e97ade8431b9..000000000000
--- a/metadata/md5-cache/media-sound/xfmpc-0.2.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=>=dev-libs/glib-2.18:2 >=media-libs/libmpd-0.15 >=x11-libs/gtk+-2.16:2 >=xfce-base/libxfce4ui-4.8 >=xfce-base/libxfce4util-4.8 dev-util/intltool virtual/pkgconfig >=app-portage/elt-patches-20170422 >=sys-apps/sed-4
-DESCRIPTION=Music Player Daemon (MPD) client for the Xfce desktop environment
-EAPI=5
-HOMEPAGE=https://goodies.xfce.org/projects/applications/xfmpc
-IUSE=debug
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.18:2 >=media-libs/libmpd-0.15 >=x11-libs/gtk+-2.16:2 >=xfce-base/libxfce4ui-4.8 >=xfce-base/libxfce4util-4.8
-SLOT=0
-SRC_URI=mirror://xfce/src/apps/xfmpc/0.2/xfmpc-0.2.2.tar.bz2
-_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25	xfconf	25bb7fe99d6e58851633dc43d429c5ae
-_md5_=ca6946b1331b3f570960181780cbc3cb
diff --git a/metadata/md5-cache/media-sound/xfmpc-0.2.3 b/metadata/md5-cache/media-sound/xfmpc-0.2.3
deleted file mode 100644
index 964dee7c48c8..000000000000
--- a/metadata/md5-cache/media-sound/xfmpc-0.2.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=>=dev-libs/glib-2.18:2= >=media-libs/libmpd-0.15:= >=x11-libs/gtk+-2.16:2= >=xfce-base/libxfce4ui-4.8:= >=xfce-base/libxfce4util-4.8:= dev-util/intltool virtual/pkgconfig >=app-portage/elt-patches-20170422 >=sys-apps/sed-4
-DESCRIPTION=Music Player Daemon (MPD) client for the Xfce desktop environment
-EAPI=5
-HOMEPAGE=https://goodies.xfce.org/projects/applications/xfmpc
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.18:2= >=media-libs/libmpd-0.15:= >=x11-libs/gtk+-2.16:2= >=xfce-base/libxfce4ui-4.8:= >=xfce-base/libxfce4util-4.8:=
-SLOT=0
-SRC_URI=mirror://xfce/src/apps/xfmpc/0.2/xfmpc-0.2.3.tar.bz2
-_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25	xfconf	25bb7fe99d6e58851633dc43d429c5ae
-_md5_=46f6081a035574cae08751ed3fe6f7e2
diff --git a/metadata/md5-cache/media-tv/Manifest.gz b/metadata/md5-cache/media-tv/Manifest.gz
index 7e5f971e5211..3615754228db 100644
--- a/metadata/md5-cache/media-tv/Manifest.gz
+++ b/metadata/md5-cache/media-tv/Manifest.gz
diff --git a/metadata/md5-cache/media-tv/channeleditor-1.9.2.1-r1 b/metadata/md5-cache/media-tv/channeleditor-1.9.2.1-r1
index f5a87b86c1f1..3f6c091fc50e 100644
--- a/metadata/md5-cache/media-tv/channeleditor-1.9.2.1-r1
+++ b/metadata/md5-cache/media-tv/channeleditor-1.9.2.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/channeleditor/channeleditor_1.9.2.1_src.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=f0cd12df88cc52b7ab84f09989adeca6
diff --git a/metadata/md5-cache/media-tv/tvbrowser-3.4.1.0-r1 b/metadata/md5-cache/media-tv/tvbrowser-3.4.1.0-r1
index f1dd7c392161..a0b7b086ef50 100644
--- a/metadata/md5-cache/media-tv/tvbrowser-3.4.1.0-r1
+++ b/metadata/md5-cache/media-tv/tvbrowser-3.4.1.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-java/bsh:0 dev-java/commons-codec:0 dev-java/commons-lang:3.1 dev-java/commons-net:0 dev-java/jakarta-oro:2.0 dev-java/jgoodies-common:1.8 dev-java/jgoodies-forms:1.8 dev-java/jgoodies-looks:2.6 dev-java/l2fprod-common:0 dev-java/htmlparser-org:0 dev-java/log4j:0 dev-java/skinlf:0 dev-java/xalan:0 dev-java/opencsv:0 dev-java/texhyphj:0 dev-java/trident:0 x11-libs/libXt x11-libs/libSM x11-libs/libICE x11-libs/libXext x11-libs/libXtst x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/tvbrowser/tvbrowser_3.4.1.0_src.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=eb9da33ae606aaea9f14d9e3430b01f9
diff --git a/metadata/md5-cache/media-tv/tvbrowser-3.4.3 b/metadata/md5-cache/media-tv/tvbrowser-3.4.3
index 8875889e596c..4858ada23aa7 100644
--- a/metadata/md5-cache/media-tv/tvbrowser-3.4.3
+++ b/metadata/md5-cache/media-tv/tvbrowser-3.4.3
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-java/bsh:0 dev-java/commons-codec:0 dev-java/commons-lang:3.1 dev-java/commons-net:0 dev-java/jakarta-oro:2.0 dev-java/jgoodies-common:1.8 dev-java/jgoodies-forms:1.8 dev-java/jgoodies-looks:2.6 dev-java/l2fprod-common:0 dev-java/htmlparser-org:0 dev-java/log4j:0 dev-java/skinlf:0 dev-java/xalan:0 dev-java/opencsv:0 dev-java/texhyphj:0 dev-java/trident:0 x11-libs/libXt x11-libs/libSM x11-libs/libICE x11-libs/libXext x11-libs/libXtst x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/tvbrowser/tvbrowser_3.4.3_src.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=1645d42d62f300981c5624ce31c86a01
diff --git a/metadata/md5-cache/media-tv/tvbrowser-9999-r1 b/metadata/md5-cache/media-tv/tvbrowser-9999-r1
index e9a27e733c2a..53c7b4cd0519 100644
--- a/metadata/md5-cache/media-tv/tvbrowser-9999-r1
+++ b/metadata/md5-cache/media-tv/tvbrowser-9999-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=dev-java/bsh:0 dev-java/commons-codec:0 dev-java/commons-lang:3.3 dev-java/commons-net:0 dev-java/jakarta-oro:2.0 dev-java/jgoodies-common:1.8 dev-java/jgoodies-forms:1.8 dev-java/jgoodies-looks:2.6 dev-java/l2fprod-common:0 dev-java/log4j:0 dev-java/skinlf:0 dev-java/swt:4.2 dev-java/xalan:0 x11-libs/libXt:0 x11-libs/libSM:0 x11-libs/libICE:0 x11-libs/libXext:0 x11-libs/libXtst:0 x11-libs/libX11:0 x11-libs/libXau:0 x11-libs/libXdmcp:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=themes? ( http://javootoo.l2fprod.com/plaf/skinlf/themepacks/BeOSthemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/amarachthemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/aquathemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/architectBluethemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/architectOlivethemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/b0sumiErgothempack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/b0sumithemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/bbjthemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/beigeazulthemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/beosthemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/blueMetalthemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/blueTurquesathemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/cellshadedthemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/chaNinja-Bluethemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/coronaHthemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/cougarthemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/crystal2themepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/fatalEthemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/gfxOasisthemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/gorillathemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/hmmXPBluethemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/hmmXPMonoBluethemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/iBarthemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/macosthemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/midnightthemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/mmMagra-Xthemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/modernthemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/oliveGreenLunaXPthemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/opusLunaSilverthemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/opusOSBluethemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/opusOSDeepthemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/opusOSOlivethemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/quickSilverRthemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/roueBluethemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/roueBrownthemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/roueGreenthemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/royalInspiratthemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/silverLunaXPthemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/solunaRthemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/tigerGraphitethemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/tigerthemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/toxicthemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/underlingthemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/whistlerthemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/xplunathemepack.zip http://tvbrowser.org/downloads/noia.zip http://tvbrowser.org/downloads/nuvola.zip http://tvbrowser.org/downloads/tulliana.zip http://tvbrowser.org/downloads/tango_without_heart.zip )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	subversion	a5d5826a85609611f098c0553eb24cc1	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	subversion	a5d5826a85609611f098c0553eb24cc1	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=9666a9cd6324ff50d357567c942a54a4
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index 9c44465b66d0..6d35e63ccc3c 100644
--- a/metadata/md5-cache/media-video/Manifest.gz
+++ b/metadata/md5-cache/media-video/Manifest.gz
diff --git a/metadata/md5-cache/media-video/bdsup2sub-4.0.0-r2 b/metadata/md5-cache/media-video/bdsup2sub-4.0.0-r2
index 96f14c5e8524..48b8815aa378 100644
--- a/metadata/md5-cache/media-video/bdsup2sub-4.0.0-r2
+++ b/metadata/md5-cache/media-video/bdsup2sub-4.0.0-r2
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://sbriesen.de/gentoo/distfiles/bdsup2sub-4.0.0.tar.xz http://sbriesen.de/gentoo/distfiles/xdg-20100731.java.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=14664438ff60d8620a2b90813af04d92
diff --git a/metadata/md5-cache/media-video/google2srt-0.5.6-r1 b/metadata/md5-cache/media-video/google2srt-0.5.6-r1
index 862c8f118e22..8bb18c7134e0 100644
--- a/metadata/md5-cache/media-video/google2srt-0.5.6-r1
+++ b/metadata/md5-cache/media-video/google2srt-0.5.6-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=virtual/jre-1.6 dev-java/jdom:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/google2srt/Google2SRT-0.5.6.zip http://sbriesen.de/gentoo/distfiles/google2srt-icon.png
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=f180433d7c7ca38661519c119c5b10e8
diff --git a/metadata/md5-cache/media-video/jubler-5.1 b/metadata/md5-cache/media-video/jubler-5.1
index dbfa4a1f4c3f..22e3219303e7 100644
--- a/metadata/md5-cache/media-video/jubler-5.1
+++ b/metadata/md5-cache/media-video/jubler-5.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=mplayer? ( media-video/mplayer[libass] ) spell? ( app-text/aspell ) >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=mirror://sourceforge/jubler/Jubler-source-5.1.tar.bz2 -> jubler-5.1.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=69b073150efdc6aedd66497f4e07f3b6
diff --git a/metadata/md5-cache/media-video/mkvtoolnix-20.0.0 b/metadata/md5-cache/media-video/mkvtoolnix-20.0.0
deleted file mode 100644
index d76c93cb15f0..000000000000
--- a/metadata/md5-cache/media-video/mkvtoolnix-20.0.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare pretend test
-DEPEND=>=dev-libs/boost-1.49.0:= >=dev-libs/libebml-1.3.5:= dev-libs/jsoncpp:= dev-libs/pugixml media-libs/flac >=media-libs/libmatroska-1.4.8:= media-libs/libogg media-libs/libvorbis sys-apps/file sys-libs/zlib qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtconcurrent:5 dev-qt/qtmultimedia:5 app-text/cmark ) dev-ruby/rake sys-devel/gettext virtual/pkgconfig dev-libs/libxslt app-text/docbook-xsl-stylesheets app-text/po4a test? ( dev-cpp/gtest )
-DESCRIPTION=Tools to create, alter, and inspect Matroska files
-EAPI=6
-HOMEPAGE=https://mkvtoolnix.download/ https://gitlab.com/mbunkus/mkvtoolnix
-IUSE=debug pch test qt5
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/boost-1.49.0:= >=dev-libs/libebml-1.3.5:= dev-libs/jsoncpp:= dev-libs/pugixml media-libs/flac >=media-libs/libmatroska-1.4.8:= media-libs/libogg media-libs/libvorbis sys-apps/file sys-libs/zlib qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtconcurrent:5 dev-qt/qtmultimedia:5 app-text/cmark )
-SLOT=0
-SRC_URI=https://mkvtoolnix.download/sources/mkvtoolnix-20.0.0.tar.xz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c389374096a61ba3dc8ec0911fb9b09a
diff --git a/metadata/md5-cache/media-video/mkvtoolnix-9.6.0 b/metadata/md5-cache/media-video/mkvtoolnix-9.6.0
deleted file mode 100644
index f56e1220611d..000000000000
--- a/metadata/md5-cache/media-video/mkvtoolnix-9.6.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare pretend test
-DEPEND=>=dev-libs/boost-1.46.0:= >=dev-libs/libebml-1.3.3:= dev-libs/pugixml media-libs/flac >=media-libs/libmatroska-1.4.4:= media-libs/libogg media-libs/libvorbis sys-apps/file sys-libs/zlib qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 ) || ( ( dev-lang/ruby:2.4 virtual/rubygems[ruby_targets_ruby24] ) ( dev-lang/ruby:2.3 virtual/rubygems[ruby_targets_ruby23] ) ( dev-lang/ruby:2.2 virtual/rubygems[ruby_targets_ruby22] ) ) sys-devel/gettext virtual/pkgconfig test? ( dev-cpp/gtest ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Tools to create, alter, and inspect Matroska files
-EAPI=6
-HOMEPAGE=https://mkvtoolnix.download/
-IUSE=curl debug pch test qt5
-KEYWORDS=amd64 ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/boost-1.46.0:= >=dev-libs/libebml-1.3.3:= dev-libs/pugixml media-libs/flac >=media-libs/libmatroska-1.4.4:= media-libs/libogg media-libs/libvorbis sys-apps/file sys-libs/zlib qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 )
-SLOT=0
-SRC_URI=https://mkvtoolnix.download/sources/mkvtoolnix-9.6.0.tar.xz
-_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=782a4593aa7538f3df4858e5882a24f6
diff --git a/metadata/md5-cache/media-video/parole-0.9.2 b/metadata/md5-cache/media-video/parole-0.9.2
deleted file mode 100644
index 3c791ebe22fe..000000000000
--- a/metadata/md5-cache/media-video/parole-0.9.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm
-DEPEND=>=dev-libs/dbus-glib-0.100:= >=dev-libs/glib-2.32:2= media-libs/gstreamer:1.0= media-libs/gst-plugins-base:1.0= sys-apps/dbus:0= >=x11-libs/gtk+-3.20:3= x11-libs/libX11:0= >=xfce-base/libxfce4ui-4.11:0=[gtk3(+)] >=xfce-base/libxfce4util-4.11:0= >=xfce-base/xfconf-4.10:0= clutter? ( >=media-libs/clutter-1.16.4:1.0= >=media-libs/clutter-gtk-1.4.4:1.0= <x11-libs/gtk+-3.22:3 ) libnotify? ( >=x11-libs/libnotify-0.7:0= ) taglib? ( >=media-libs/taglib-1.6:0= ) dev-util/intltool sys-devel/gettext virtual/pkgconfig x11-proto/xproto >=sys-apps/sed-4
-DESCRIPTION=A simple Xfce4 media player using GStreamer
-EAPI=6
-HOMEPAGE=https://docs.xfce.org/apps/parole/start
-IUSE=clutter libnotify taglib
-KEYWORDS=~amd64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/dbus-glib-0.100:= >=dev-libs/glib-2.32:2= media-libs/gstreamer:1.0= media-libs/gst-plugins-base:1.0= sys-apps/dbus:0= >=x11-libs/gtk+-3.20:3= x11-libs/libX11:0= >=xfce-base/libxfce4ui-4.11:0=[gtk3(+)] >=xfce-base/libxfce4util-4.11:0= >=xfce-base/xfconf-4.10:0= clutter? ( >=media-libs/clutter-1.16.4:1.0= >=media-libs/clutter-gtk-1.4.4:1.0= <x11-libs/gtk+-3.22:3 ) libnotify? ( >=x11-libs/libnotify-0.7:0= ) taglib? ( >=media-libs/taglib-1.6:0= ) media-plugins/gst-plugins-meta:1.0
-SLOT=0
-SRC_URI=mirror://xfce/src/apps/parole/0.9/parole-0.9.2.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b0a9f1f58fb22e38db3b7c7960f5fba0
diff --git a/metadata/md5-cache/media-video/projectx-0.91.0.10 b/metadata/md5-cache/media-video/projectx-0.91.0.10
index 6b83f7404bc2..105a9c3ee816 100644
--- a/metadata/md5-cache/media-video/projectx-0.91.0.10
+++ b/metadata/md5-cache/media-video/projectx-0.91.0.10
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.5 dev-java/commons-net X? ( =dev-java/browserlauncher2-1* ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~billie/distfiles/projectx-0.91.0.10.tar.xz http://sbriesen.de/gentoo/distfiles/projectx-idctfast.tar.xz http://sbriesen.de/gentoo/distfiles/xdg-20100731.java.xz http://sbriesen.de/gentoo/distfiles/projectx-icon.png
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=3854cb67aaad5d6c1755fa24baea9aae
diff --git a/metadata/md5-cache/media-video/projectx-0.91.0.10-r1 b/metadata/md5-cache/media-video/projectx-0.91.0.10-r1
index 0f8ba8de9fa8..740a1e9e2e99 100644
--- a/metadata/md5-cache/media-video/projectx-0.91.0.10-r1
+++ b/metadata/md5-cache/media-video/projectx-0.91.0.10-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.5 dev-java/commons-net:0 X? ( dev-java/browserlauncher2:1.0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~billie/distfiles/projectx-0.91.0.10.tar.xz https://dev.gentoo.org/~billie/distfiles/projectx-idctfast.tar.xz https://dev.gentoo.org/~billie/distfiles/xdg-20100731.java.xz https://dev.gentoo.org/~billie/distfiles/projectx-icon.png
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=50bf65edb72588518bdd91dec45db6f5
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index 61c0e8b27982..33a78b62c042 100644
--- a/metadata/md5-cache/net-analyzer/Manifest.gz
+++ b/metadata/md5-cache/net-analyzer/Manifest.gz
diff --git a/metadata/md5-cache/net-analyzer/rrdtool-1.6.0-r1 b/metadata/md5-cache/net-analyzer/rrdtool-1.6.0-r1
index 35da5363828c..1aad1a07cfe8 100644
--- a/metadata/md5-cache/net-analyzer/rrdtool-1.6.0-r1
+++ b/metadata/md5-cache/net-analyzer/rrdtool-1.6.0-r1
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=>=dev-libs/glib-2.28.7:2[static-libs(+)?] >=dev-libs/libxml2-2.7.8:2[static-libs(+)?] dbi? ( dev-db/libdbi[static-libs(+)?] ) graph? ( >=media-libs/libpng-1.5.10:0=[static-libs(+)?] >=x11-libs/cairo-1.10.2[svg,static-libs(+)?] >=x11-libs/pango-1.28 ) lua? ( dev-lang/lua:*[deprecated] ) perl? ( dev-lang/perl:= ) 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(+)] ) rados? ( sys-cluster/ceph ) tcl? ( dev-lang/tcl:0= ) tcpd? ( sys-apps/tcp-wrappers ) sys-apps/groff virtual/pkgconfig virtual/awk >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=A system to store and display time-series data
 EAPI=5
-HOMEPAGE=http://oss.oetiker.ch/rrdtool/
+HOMEPAGE=https://oss.oetiker.ch/rrdtool/
 IUSE=dbi doc graph lua perl python rados rrdcgi ruby static-libs tcl tcpd python_targets_python2_7
 KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris
 LICENSE=GPL-2
@@ -10,6 +10,6 @@ PDEPEND=ruby? ( ~dev-ruby/rrdtool-bindings-1.6.0 )
 RDEPEND=>=dev-libs/glib-2.28.7:2[static-libs(+)?] >=dev-libs/libxml2-2.7.8:2[static-libs(+)?] dbi? ( dev-db/libdbi[static-libs(+)?] ) graph? ( >=media-libs/libpng-1.5.10:0=[static-libs(+)?] >=x11-libs/cairo-1.10.2[svg,static-libs(+)?] >=x11-libs/pango-1.28 ) lua? ( dev-lang/lua:*[deprecated] ) perl? ( dev-lang/perl:= ) 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(+)] ) rados? ( sys-cluster/ceph ) tcl? ( dev-lang/tcl:0= ) tcpd? ( sys-apps/tcp-wrappers )
 REQUIRED_USE=python? ( python_targets_python2_7 )
 SLOT=0/8.0.0
-SRC_URI=http://oss.oetiker.ch/rrdtool/pub/rrdtool-1.6.0.tar.gz
+SRC_URI=https://oss.oetiker.ch/rrdtool/pub/rrdtool-1.6.0.tar.gz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4befb2ecd1f21a950bfa262cb9b37540
+_md5_=fbb18df0fbd87d3c06af38eeecdf26b8
diff --git a/metadata/md5-cache/net-analyzer/rrdtool-1.7.0 b/metadata/md5-cache/net-analyzer/rrdtool-1.7.0
index 0f16160bf813..47fea13bed1d 100644
--- a/metadata/md5-cache/net-analyzer/rrdtool-1.7.0
+++ b/metadata/md5-cache/net-analyzer/rrdtool-1.7.0
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=>=dev-libs/glib-2.28.7:2[static-libs(+)?] >=dev-libs/libxml2-2.7.8:2[static-libs(+)?] dbi? ( dev-db/libdbi[static-libs(+)?] ) graph? ( >=media-libs/libpng-1.5.10:0=[static-libs(+)?] >=x11-libs/cairo-1.10.2[svg,static-libs(+)?] >=x11-libs/pango-1.28 ) lua? ( dev-lang/lua:*[deprecated] ) perl? ( dev-lang/perl:= ) python? ( 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(+)?] ) rados? ( sys-cluster/ceph ) tcl? ( dev-lang/tcl:0= ) tcpd? ( sys-apps/tcp-wrappers ) sys-apps/groff virtual/pkgconfig virtual/awk >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=A system to store and display time-series data
 EAPI=6
-HOMEPAGE=http://oss.oetiker.ch/rrdtool/
+HOMEPAGE=https://oss.oetiker.ch/rrdtool/
 IUSE=dbi doc graph lua perl python rados rrdcgi ruby static-libs tcl tcpd python_targets_python2_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 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris
 LICENSE=GPL-2
@@ -10,6 +10,6 @@ PDEPEND=ruby? ( ~dev-ruby/rrdtool-bindings-1.7.0 )
 RDEPEND=>=dev-libs/glib-2.28.7:2[static-libs(+)?] >=dev-libs/libxml2-2.7.8:2[static-libs(+)?] dbi? ( dev-db/libdbi[static-libs(+)?] ) graph? ( >=media-libs/libpng-1.5.10:0=[static-libs(+)?] >=x11-libs/cairo-1.10.2[svg,static-libs(+)?] >=x11-libs/pango-1.28 ) lua? ( dev-lang/lua:*[deprecated] ) perl? ( dev-lang/perl:= ) python? ( 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(+)?] ) rados? ( sys-cluster/ceph ) tcl? ( dev-lang/tcl:0= ) tcpd? ( sys-apps/tcp-wrappers )
 REQUIRED_USE=python? ( ^^ ( 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/8.0.0
-SRC_URI=http://oss.oetiker.ch/rrdtool/pub/rrdtool-1.7.0.tar.gz
+SRC_URI=https://oss.oetiker.ch/rrdtool/pub/rrdtool-1.7.0.tar.gz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=983ef2548cd67d068218f547a5c2738d
+_md5_=5d1d23c125241df5a377f3c491185ca4
diff --git a/metadata/md5-cache/net-im/Manifest.gz b/metadata/md5-cache/net-im/Manifest.gz
index fc1430002ee9..e1340dc46abd 100644
--- a/metadata/md5-cache/net-im/Manifest.gz
+++ b/metadata/md5-cache/net-im/Manifest.gz
diff --git a/metadata/md5-cache/net-im/kouchat-1.1.0 b/metadata/md5-cache/net-im/kouchat-1.1.0
index 7e61486a1755..56e931864410 100644
--- a/metadata/md5-cache/net-im/kouchat-1.1.0
+++ b/metadata/md5-cache/net-im/kouchat-1.1.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-3
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=https://kouchat.googlecode.com/files/kouchat-1.1.0-src.tar.gz https://dev.gentoo.org/~serkan/distfiles/kouchat-1.1.0-buildfiles.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=0d3cf2a29c069c287432ce3087ac33fe
diff --git a/metadata/md5-cache/net-im/openfire-4.1.0 b/metadata/md5-cache/net-im/openfire-4.1.0
index 92d886edd7e4..eb6f8197b259 100644
--- a/metadata/md5-cache/net-im/openfire-4.1.0
+++ b/metadata/md5-cache/net-im/openfire-4.1.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=http://www.igniterealtime.org/builds/openfire/openfire_src_4_1_0.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=2e8a1415d7b94f24ef4ef5327ebba9fa
diff --git a/metadata/md5-cache/net-im/openfire-4.1.4 b/metadata/md5-cache/net-im/openfire-4.1.4
index d4b42ab82f16..e62e8c54faa7 100644
--- a/metadata/md5-cache/net-im/openfire-4.1.4
+++ b/metadata/md5-cache/net-im/openfire-4.1.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=http://www.igniterealtime.org/builds/openfire/openfire_src_4_1_4.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=7211e978195135bd558f4fc09a28695a
diff --git a/metadata/md5-cache/net-im/openfire-4.1.5 b/metadata/md5-cache/net-im/openfire-4.1.5
index fd80965b4644..c5bf48c3b777 100644
--- a/metadata/md5-cache/net-im/openfire-4.1.5
+++ b/metadata/md5-cache/net-im/openfire-4.1.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=http://www.igniterealtime.org/builds/openfire/openfire_src_4_1_5.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=7211e978195135bd558f4fc09a28695a
diff --git a/metadata/md5-cache/net-im/openfire-4.2.2 b/metadata/md5-cache/net-im/openfire-4.2.2
index 61d57dc3e0eb..34ecf9be7bcb 100644
--- a/metadata/md5-cache/net-im/openfire-4.2.2
+++ b/metadata/md5-cache/net-im/openfire-4.2.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=http://www.igniterealtime.org/builds/openfire/openfire_src_4_2_2.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=35747e9728d00cb07e52e40ef36befa9
diff --git a/metadata/md5-cache/net-im/openfire-4.2.3 b/metadata/md5-cache/net-im/openfire-4.2.3
index 2b0c8838df2f..befa1039904a 100644
--- a/metadata/md5-cache/net-im/openfire-4.2.3
+++ b/metadata/md5-cache/net-im/openfire-4.2.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=http://www.igniterealtime.org/builds/openfire/openfire_src_4_2_3.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=fcd835d10555ffb04f4f5e1ae1cf0668
diff --git a/metadata/md5-cache/net-im/skypeforlinux-8.13.0.2 b/metadata/md5-cache/net-im/skypeforlinux-8.18.0.6
index daacb1c9b98d..4a836e1f99fe 100644
--- a/metadata/md5-cache/net-im/skypeforlinux-8.13.0.2
+++ b/metadata/md5-cache/net-im/skypeforlinux-8.18.0.6
@@ -10,6 +10,6 @@ RDEPEND=app-crypt/libsecret[abi_x86_64(-)?] dev-libs/atk[abi_x86_64(-)?] dev-lib
 REQUIRED_USE=|| ( abi_x86_64 )
 RESTRICT=mirror bindist strip
 SLOT=0
-SRC_URI=https://repo.skype.com/rpm/stable/skypeforlinux_8.13.0.2-1.x86_64.rpm
+SRC_URI=https://repo.skype.com/rpm/stable/skypeforlinux_8.18.0.6-1.x86_64.rpm
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=8523b4dae203741adc033ffdefb59aee
+_md5_=ba8418b71f52ce9ff95fc668698d3769
diff --git a/metadata/md5-cache/net-irc/Manifest.gz b/metadata/md5-cache/net-irc/Manifest.gz
index 3729918bd503..1d840a652796 100644
--- a/metadata/md5-cache/net-irc/Manifest.gz
+++ b/metadata/md5-cache/net-irc/Manifest.gz
diff --git a/metadata/md5-cache/net-irc/irssi-1.0.7 b/metadata/md5-cache/net-irc/irssi-1.0.7
index 73d51c71f62d..ea14bfaecd3e 100644
--- a/metadata/md5-cache/net-irc/irssi-1.0.7
+++ b/metadata/md5-cache/net-irc/irssi-1.0.7
@@ -4,11 +4,11 @@ DESCRIPTION=A modular textUI IRC client with IPv6 support
 EAPI=6
 HOMEPAGE=https://irssi.org/
 IUSE=+perl selinux socks5 +proxy libressl
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~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 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses:0= >=dev-libs/glib-2.6.0 !libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) perl? ( dev-lang/perl:= ) socks5? ( >=net-proxy/dante-1.1.18 ) selinux? ( sec-policy/selinux-irc ) perl? ( !net-im/silc-client ) dev-lang/perl:=
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/irssi/irssi/releases/download/1.0.7/irssi-1.0.7.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e0cceeda5441fa203a909122a4053f1c
+_md5_=5d8d0bc1b0c20cd7499b019cba21f92a
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index 938d40877cf4..94b499056dcf 100644
--- a/metadata/md5-cache/net-libs/Manifest.gz
+++ b/metadata/md5-cache/net-libs/Manifest.gz
diff --git a/metadata/md5-cache/net-libs/serf-1.3.8-r1 b/metadata/md5-cache/net-libs/serf-1.3.8-r1
index fee07d9ffd48..de3c1efd7248 100644
--- a/metadata/md5-cache/net-libs/serf-1.3.8-r1
+++ b/metadata/md5-cache/net-libs/serf-1.3.8-r1
@@ -4,10 +4,10 @@ DESCRIPTION=HTTP client library
 EAPI=5
 HOMEPAGE=https://serf.apache.org/
 IUSE=kerberos static-libs libressl
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris
 LICENSE=Apache-2.0
 RDEPEND=dev-libs/apr:1= dev-libs/apr-util:1= !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-libs/zlib:0= kerberos? ( virtual/krb5 )
 SLOT=1
 SRC_URI=mirror://apache/serf/serf-1.3.8.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	fcace052aef60e6b0eb3023c26aa585a	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3bc360efc866937fecab584a67fcbd53
+_md5_=13b46f4e1c1fe83f9fe14d3e6a614fc8
diff --git a/metadata/md5-cache/net-mail/Freemail-9999-r1 b/metadata/md5-cache/net-mail/Freemail-9999-r1
index 57c48bbb819d..1ec7585f9f3c 100644
--- a/metadata/md5-cache/net-mail/Freemail-9999-r1
+++ b/metadata/md5-cache/net-mail/Freemail-9999-r1
@@ -7,5 +7,5 @@ IUSE=elibc_FreeBSD elibc_FreeBSD
 LICENSE=LGPL-2.1
 RDEPEND=dev-java/bcprov:1.38 net-p2p/freenet >=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3
 SLOT=0
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	git-2	195a672bfaf52d868442171c9469bbb6	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	git-2	195a672bfaf52d868442171c9469bbb6	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=eb239b7adadffb9a1d59b9b92bb250d1
diff --git a/metadata/md5-cache/net-mail/Manifest.gz b/metadata/md5-cache/net-mail/Manifest.gz
index 6e05c0bec2c5..3306e08950e5 100644
--- a/metadata/md5-cache/net-mail/Manifest.gz
+++ b/metadata/md5-cache/net-mail/Manifest.gz
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index e55a4abd8014..b41764edbe29 100644
--- a/metadata/md5-cache/net-misc/Manifest.gz
+++ b/metadata/md5-cache/net-misc/Manifest.gz
diff --git a/metadata/md5-cache/net-misc/dropbear-2017.75 b/metadata/md5-cache/net-misc/dropbear-2017.75
index 996c11ef8333..03e94bf20e66 100644
--- a/metadata/md5-cache/net-misc/dropbear-2017.75
+++ b/metadata/md5-cache/net-misc/dropbear-2017.75
@@ -4,11 +4,11 @@ DESCRIPTION=small SSH 2 client/server designed for small memory environments
 EAPI=5
 HOMEPAGE=http://matt.ucc.asn.au/dropbear/dropbear.html
 IUSE=bsdpty minimal multicall pam +shadow static +syslog zlib savedconfig
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=!static? ( zlib? ( sys-libs/zlib ) dev-libs/libtommath ) pam? ( virtual/pam ) pam? ( >=sys-auth/pambase-20080219.1 )
 REQUIRED_USE=pam? ( !static )
 SLOT=0
 SRC_URI=http://matt.ucc.asn.au/dropbear/releases/dropbear-2017.75.tar.bz2 http://matt.ucc.asn.au/dropbear/testing/dropbear-2017.75.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	savedconfig	e6948c872ff47e15a10e5ad1be15c18e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7bab454314d421ce4732d8d116cb105e
+_md5_=425a674aaff09f4cce9b6d6d258fa6dc
diff --git a/metadata/md5-cache/net-misc/java-wakeonlan-1.0.0-r2 b/metadata/md5-cache/net-misc/java-wakeonlan-1.0.0-r2
index 9bdf52c2db87..fda32a6cb3ba 100644
--- a/metadata/md5-cache/net-misc/java-wakeonlan-1.0.0-r2
+++ b/metadata/md5-cache/net-misc/java-wakeonlan-1.0.0-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.6 dev-java/jsap:0 dev-java/junit:4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://www.moldaner.de/wakeonlan/download/wakeonlan-1.0.0.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=00ca50fcaf4b50c543bc77a54fb5fbba
diff --git a/metadata/md5-cache/net-misc/jrdesktop-0.3.1.0 b/metadata/md5-cache/net-misc/jrdesktop-0.3.1.0
index d5edb211c2d0..76b9a8d24d25 100644
--- a/metadata/md5-cache/net-misc/jrdesktop-0.3.1.0
+++ b/metadata/md5-cache/net-misc/jrdesktop-0.3.1.0
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/jrdesktop/jrdesktop-source-0.3.1.0.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=e524223ecdd2e9c22dfdba9a0de2bc7f
diff --git a/metadata/md5-cache/net-misc/mindterm-3.4 b/metadata/md5-cache/net-misc/mindterm-3.4
index e2f2a0735388..57cb2637da6c 100644
--- a/metadata/md5-cache/net-misc/mindterm-3.4
+++ b/metadata/md5-cache/net-misc/mindterm-3.4
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 dev-java/jzlib:0 >=dev-java/java-config-2.2.0-r3
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.appgate.com/downloads/MindTerm-3.4/mindterm_3.4-src.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=b47d202da409702a7a7c1ce8f614ccfd
diff --git a/metadata/md5-cache/net-misc/streamlink-0.11.0 b/metadata/md5-cache/net-misc/streamlink-0.11.0
new file mode 100644
index 000000000000..c7e093bdb4b0
--- /dev/null
+++ b/metadata/md5-cache/net-misc/streamlink-0.11.0
@@ -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(-)] doc? ( dev-python/sphinx[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/docutils[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? ( python_targets_python2_7? ( dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/pycryptodome[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/requests[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(-)] virtual/python-futures[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(-)] virtual/python-singledispatch[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/backports-shutil_which[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( dev-python/backports-shutil_get_terminal_size[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/pycountry[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/websocket-client[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(-)] media-video/rtmpdump virtual/ffmpeg ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+),threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[xml(+),threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[xml(+),threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+),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=CLI for extracting streams from websites to a video player of your choice
+EAPI=6
+HOMEPAGE=https://streamlink.github.io/
+IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD-2 Apache-2.0
+RDEPEND=dev-python/pycryptodome[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/requests[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(-)] virtual/python-futures[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(-)] virtual/python-singledispatch[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/backports-shutil_which[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( dev-python/backports-shutil_get_terminal_size[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/pycountry[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/websocket-client[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(-)] media-video/rtmpdump virtual/ffmpeg python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+),threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[xml(+),threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[xml(+),threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+),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/streamlink/streamlink/archive/0.11.0.tar.gz -> streamlink-0.11.0.tar.gz
+_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=bec786db0572f5557b2d8311124bbef0
diff --git a/metadata/md5-cache/net-misc/streamlink-9999 b/metadata/md5-cache/net-misc/streamlink-9999
index 5d052fe7d38f..58693c625e67 100644
--- a/metadata/md5-cache/net-misc/streamlink-9999
+++ b/metadata/md5-cache/net-misc/streamlink-9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-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(-)] doc? ( 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(-)] dev-python/docutils[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) test? ( python_targets_python2_7? ( dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/pycryptodome[python_targets_python2_7(-)?,python_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[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] virtual/python-futures[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] virtual/python-singledispatch[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/backports-shutil_which[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( dev-python/backports-shutil_get_terminal_size[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/pycountry[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/websocket-client[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] media-video/rtmpdump virtual/ffmpeg ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+),threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[xml(+),threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[xml(+),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(-)] >=dev-vcs/git-1.8.2.1
+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(-)] doc? ( dev-python/sphinx[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/docutils[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? ( python_targets_python2_7? ( dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/pycryptodome[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/requests[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(-)] virtual/python-futures[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(-)] virtual/python-singledispatch[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/backports-shutil_which[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( dev-python/backports-shutil_get_terminal_size[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/pycountry[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/websocket-client[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(-)] media-video/rtmpdump virtual/ffmpeg ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+),threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[xml(+),threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[xml(+),threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+),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(-)] >=dev-vcs/git-1.8.2.1
 DESCRIPTION=CLI for extracting streams from websites to a video player of your choice
 EAPI=6
 HOMEPAGE=https://streamlink.github.io/
-IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
+IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
 LICENSE=BSD-2 Apache-2.0
-RDEPEND=dev-python/pycryptodome[python_targets_python2_7(-)?,python_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[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] virtual/python-futures[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] virtual/python-singledispatch[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/backports-shutil_which[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( dev-python/backports-shutil_get_terminal_size[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/pycountry[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/websocket-client[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] media-video/rtmpdump virtual/ffmpeg python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+),threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[xml(+),threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[xml(+),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(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
+RDEPEND=dev-python/pycryptodome[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/requests[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(-)] virtual/python-futures[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(-)] virtual/python-singledispatch[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/backports-shutil_which[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( dev-python/backports-shutil_get_terminal_size[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/pycountry[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/websocket-client[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(-)] media-video/rtmpdump virtual/ffmpeg python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+),threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[xml(+),threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[xml(+),threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+),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
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=aadf5a097f261f86ae9680b1ea8d5def
+_md5_=ebc25e1915bea0e6b4f7607bea316a84
diff --git a/metadata/md5-cache/net-misc/whois-5.2.20 b/metadata/md5-cache/net-misc/whois-5.2.20
index 7bed6763fa40..8852f22b5570 100644
--- a/metadata/md5-cache/net-misc/whois-5.2.20
+++ b/metadata/md5-cache/net-misc/whois-5.2.20
@@ -4,11 +4,11 @@ DESCRIPTION=improved Whois Client
 EAPI=6
 HOMEPAGE=https://www.linux.it/~md/software/
 IUSE=iconv idn nls
-KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=iconv? ( virtual/libiconv ) idn? ( net-dns/libidn ) nls? ( virtual/libintl )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://debian/pool/main/w/whois/whois_5.2.20.tar.xz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=68f1a458fbbcdb03ca4ea3fdbfbf5306
+_md5_=94dae736ab939bdafa32b44a71253f8c
diff --git a/metadata/md5-cache/net-nds/Manifest.gz b/metadata/md5-cache/net-nds/Manifest.gz
index 49a5622a9f25..ca6f9d4ffb4a 100644
--- a/metadata/md5-cache/net-nds/Manifest.gz
+++ b/metadata/md5-cache/net-nds/Manifest.gz
diff --git a/metadata/md5-cache/net-nds/jxplorer-3.3.1 b/metadata/md5-cache/net-nds/jxplorer-3.3.1
index c94533b5e2b9..1f34d9936ced 100644
--- a/metadata/md5-cache/net-nds/jxplorer-3.3.1
+++ b/metadata/md5-cache/net-nds/jxplorer-3.3.1
@@ -9,5 +9,5 @@ LICENSE=CAOSL
 RDEPEND=>=virtual/jre-1.5 >=dev-java/javahelp-2.0.02_p46:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/jxplorer/jxplorer-3.3.1-project.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=bef683123bcb4656148d6f8e84950370
diff --git a/metadata/md5-cache/net-nds/jxplorer-3.3.1.1 b/metadata/md5-cache/net-nds/jxplorer-3.3.1.1
index 4257bd97f701..bd270270307e 100644
--- a/metadata/md5-cache/net-nds/jxplorer-3.3.1.1
+++ b/metadata/md5-cache/net-nds/jxplorer-3.3.1.1
@@ -9,5 +9,5 @@ LICENSE=CAOSL
 RDEPEND=>=virtual/jre-1.5 >=dev-java/javahelp-2.0.02_p46:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/jxplorer/jxplorer-3.3.1.1-project.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=65a572c011dd0408083ec346ea08525b
diff --git a/metadata/md5-cache/net-nds/jxplorer-3.3.1.2 b/metadata/md5-cache/net-nds/jxplorer-3.3.1.2
index 5fe406056b79..63b53a405863 100644
--- a/metadata/md5-cache/net-nds/jxplorer-3.3.1.2
+++ b/metadata/md5-cache/net-nds/jxplorer-3.3.1.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/javahelp-2.0.02_p46:0 >=virtual/jre-1.5 >=dev-java/java-confi
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/jxplorer/jxplorer-3.3.1.2-project.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=5823ebf1c6db3d5fdb152aa84a333b65
diff --git a/metadata/md5-cache/net-p2p/Manifest.gz b/metadata/md5-cache/net-p2p/Manifest.gz
index e2c5258c2de0..005ce64285aa 100644
--- a/metadata/md5-cache/net-p2p/Manifest.gz
+++ b/metadata/md5-cache/net-p2p/Manifest.gz
diff --git a/metadata/md5-cache/net-p2p/freenet-0.7.5_p1478 b/metadata/md5-cache/net-p2p/freenet-0.7.5_p1478
index 5b79c1a7bc41..a545e0e7f34c 100644
--- a/metadata/md5-cache/net-p2p/freenet-0.7.5_p1478
+++ b/metadata/md5-cache/net-p2p/freenet-0.7.5_p1478
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.7 net-libs/nativebiginteger:0 dev-java/bcprov:1.54 dev-j
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/freenet/fred/archive/build01478.zip -> freenet-0.7.5_p1478.zip mirror://gentoo/seednodes-20160521.fref.bz2 mirror://gentoo/freenet-ant-1.7.1.jar
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=a73afbde16e38d2312ee3f330ef76a00
diff --git a/metadata/md5-cache/net-p2p/freenet-0.7.5_p1478-r1 b/metadata/md5-cache/net-p2p/freenet-0.7.5_p1478-r1
index 5b79c1a7bc41..a545e0e7f34c 100644
--- a/metadata/md5-cache/net-p2p/freenet-0.7.5_p1478-r1
+++ b/metadata/md5-cache/net-p2p/freenet-0.7.5_p1478-r1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.7 net-libs/nativebiginteger:0 dev-java/bcprov:1.54 dev-j
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/freenet/fred/archive/build01478.zip -> freenet-0.7.5_p1478.zip mirror://gentoo/seednodes-20160521.fref.bz2 mirror://gentoo/freenet-ant-1.7.1.jar
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=a73afbde16e38d2312ee3f330ef76a00
diff --git a/metadata/md5-cache/net-p2p/freenet-0.7.5_p1480 b/metadata/md5-cache/net-p2p/freenet-0.7.5_p1480
index c47f23b8498c..9e3bd499e3b5 100644
--- a/metadata/md5-cache/net-p2p/freenet-0.7.5_p1480
+++ b/metadata/md5-cache/net-p2p/freenet-0.7.5_p1480
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.7 net-libs/nativebiginteger:0 dev-java/bcprov:1.54 dev-j
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/freenet/fred/archive/build01480.zip -> freenet-0.7.5_p1480.zip https://github.com/freenet/seedrefs/archive/build01480.zip -> seednodes-0.7.5_p1480.zip mirror://gentoo/freenet-ant-1.7.1.jar
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=f05b8f53e320fb902e318600c27c9852
diff --git a/metadata/md5-cache/net-p2p/gtk-gnutella-1.1.11-r1 b/metadata/md5-cache/net-p2p/gtk-gnutella-1.1.11-r1
deleted file mode 100644
index 685689635a65..000000000000
--- a/metadata/md5-cache/net-p2p/gtk-gnutella-1.1.11-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=sys-libs/binutils-libs:= dev-libs/glib:2 sys-libs/zlib gtk? ( >=x11-libs/gtk+-2.2.1:2 ) dbus? ( >=sys-apps/dbus-0.35.2 ) ssl? ( >=net-libs/gnutls-2.2.5 ) nls? ( >=sys-devel/gettext-0.11.5 ) virtual/pkgconfig
-DESCRIPTION=A GTK+ Gnutella client
-EAPI=6
-HOMEPAGE=http://gtk-gnutella.sourceforge.net/
-IUSE=nls dbus ssl +gtk
-KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=sys-libs/binutils-libs:= dev-libs/glib:2 sys-libs/zlib gtk? ( >=x11-libs/gtk+-2.2.1:2 ) dbus? ( >=sys-apps/dbus-0.35.2 ) ssl? ( >=net-libs/gnutls-2.2.5 ) nls? ( >=sys-devel/gettext-0.11.5 )
-SLOT=0
-SRC_URI=mirror://sourceforge/gtk-gnutella/gtk-gnutella-1.1.11.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6eb723253e843b5c608641567e3750ad
diff --git a/metadata/md5-cache/net-p2p/vuze-4.8.1.2-r1 b/metadata/md5-cache/net-p2p/vuze-4.8.1.2-r1
index 154f4e9f6a70..c4e0b8680672 100644
--- a/metadata/md5-cache/net-p2p/vuze-4.8.1.2-r1
+++ b/metadata/md5-cache/net-p2p/vuze-4.8.1.2-r1
@@ -10,5 +10,5 @@ PDEPEND=~net-p2p/vuze-coreplugins-4.8.1.2
 RDEPEND=dev-java/json-simple:0 dev-java/bcprov:1.40 >=dev-java/commons-cli-1.0:1 >=dev-java/log4j-1.2.8:0 >=dev-java/swt-3.7.2-r1:3.7[cairo] >=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/azureus/vuze/Vuze_4812/Vuze_4812_source.zip mirror://gentoo/vuze-4.5.0.2-gentoo-patches.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=29098e2ad0dd30e6f9e15d567611fea2
diff --git a/metadata/md5-cache/net-p2p/vuze-5.7.2.0 b/metadata/md5-cache/net-p2p/vuze-5.7.2.0
index abd9f0510e68..47838d9a3239 100644
--- a/metadata/md5-cache/net-p2p/vuze-5.7.2.0
+++ b/metadata/md5-cache/net-p2p/vuze-5.7.2.0
@@ -10,5 +10,5 @@ PDEPEND=~net-p2p/vuze-coreplugins-5.7.2.0
 RDEPEND=dev-java/commons-cli:1 dev-java/commons-lang:2.1 dev-java/json-simple:0 dev-java/log4j:0 dev-java/swt:3.8[cairo] >=virtual/jre-1.6:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/azureus/vuze/Vuze_5720/Vuze_5720_source.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=a63e7baf5cb47e3aa8719129e5408bad
diff --git a/metadata/md5-cache/net-vpn/Manifest.gz b/metadata/md5-cache/net-vpn/Manifest.gz
index df0275aaa5cd..98c9f163a711 100644
--- a/metadata/md5-cache/net-vpn/Manifest.gz
+++ b/metadata/md5-cache/net-vpn/Manifest.gz
diff --git a/metadata/md5-cache/net-vpn/i2p-0.9.31 b/metadata/md5-cache/net-vpn/i2p-0.9.31
index ee46a92965ee..57c2f586573e 100644
--- a/metadata/md5-cache/net-vpn/i2p-0.9.31
+++ b/metadata/md5-cache/net-vpn/i2p-0.9.31
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0 Artistic BSD CC-BY-2.5 CC-BY-3.0 CC-BY-SA-3.0 EPL-1.0 GPL-2 G
 RDEPEND=dev-java/bcprov:1.50 dev-java/jrobin:0 dev-java/slf4j-api:0 dev-java/tomcat-jstl-impl:0 dev-java/tomcat-jstl-spec:0 dev-java/java-service-wrapper:0 ecdsa? ( || ( dev-java/icedtea:7[-sunec] dev-java/icedtea:8[-sunec] dev-java/icedtea-bin:7 dev-java/icedtea-bin:8 dev-java/oracle-jre-bin dev-java/oracle-jdk-bin ) ) !ecdsa? ( >=virtual/jre-1.7 ) >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=https://download.i2p2.de/releases/0.9.31/i2psource_0.9.31.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=f788121323b6d76da61c0c4b96d8f702
diff --git a/metadata/md5-cache/net-vpn/i2p-0.9.33 b/metadata/md5-cache/net-vpn/i2p-0.9.33
index 0c0240b4e813..b879add2568d 100644
--- a/metadata/md5-cache/net-vpn/i2p-0.9.33
+++ b/metadata/md5-cache/net-vpn/i2p-0.9.33
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0 Artistic BSD CC-BY-2.5 CC-BY-3.0 CC-BY-SA-3.0 EPL-1.0 GPL-2 G
 RDEPEND=dev-java/bcprov:1.50 dev-java/jrobin:0 dev-java/slf4j-api:0 dev-java/tomcat-jstl-impl:0 dev-java/tomcat-jstl-spec:0 dev-java/java-service-wrapper:0 ecdsa? ( || ( dev-java/icedtea:8[-sunec] dev-java/icedtea-bin:8 dev-java/oracle-jre-bin dev-java/oracle-jdk-bin ) ) !ecdsa? ( >=virtual/jre-1.7 ) >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=https://download.i2p2.de/releases/0.9.33/i2psource_0.9.33.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=fc09c13a3e5511077518e5512a172d78
diff --git a/metadata/md5-cache/net-wireless/Manifest.gz b/metadata/md5-cache/net-wireless/Manifest.gz
index 800c01806c68..92ba1905333b 100644
--- a/metadata/md5-cache/net-wireless/Manifest.gz
+++ b/metadata/md5-cache/net-wireless/Manifest.gz
diff --git a/metadata/md5-cache/net-wireless/bluez-5.49 b/metadata/md5-cache/net-wireless/bluez-5.49
index c6caaa9170db..44c25372d3d4 100644
--- a/metadata/md5-cache/net-wireless/bluez-5.49
+++ b/metadata/md5-cache/net-wireless/bluez-5.49
@@ -4,11 +4,11 @@ DESCRIPTION=Bluetooth Tools and System Daemons for Linux
 EAPI=6
 HOMEPAGE=http://www.bluez.org
 IUSE=alsa cups doc debug deprecated extra-tools experimental +mesh +obex +readline selinux systemd test test-programs +udev user-session python_targets_python2_7 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 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~x86
 LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.28: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(-)?] >=sys-apps/dbus-1.6:=[user-session=] >=sys-apps/hwids-20121202.2 alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) mesh? ( dev-libs/json-c:= sys-libs/readline:0= ) obex? ( dev-libs/libical:= ) readline? ( sys-libs/readline:0= ) systemd? ( sys-apps/systemd ) udev? ( >=virtual/udev-172 ) selinux? ( sec-policy/selinux-bluetooth ) test-programs? ( 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/dbus-python-1[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/pygobject:3[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] )
 REQUIRED_USE=extra-tools? ( deprecated readline ) test? ( python_targets_python2_7 ) test-programs? ( python_targets_python2_7 ) user-session? ( systemd )
 SLOT=0/3
 SRC_URI=mirror://kernel/linux/bluetooth/bluez-5.49.tar.xz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	libtool	0081a71a261724730ec4c248494f044d	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=47503bcf6dde98932b5d61e087fbb1bb
+_md5_=53625761bb8b2b04b57ac536cd43bef5
diff --git a/metadata/md5-cache/ros-meta/Manifest.gz b/metadata/md5-cache/ros-meta/Manifest.gz
index 36c019995c62..3ed53687a863 100644
--- a/metadata/md5-cache/ros-meta/Manifest.gz
+++ b/metadata/md5-cache/ros-meta/Manifest.gz
diff --git a/metadata/md5-cache/ros-meta/navigation-1.15.2 b/metadata/md5-cache/ros-meta/navigation-1.15.2
new file mode 100644
index 000000000000..8cd02b63300c
--- /dev/null
+++ b/metadata/md5-cache/ros-meta/navigation-1.15.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/amcl dev-ros/base_local_planner dev-ros/carrot_planner dev-ros/clear_costmap_recovery dev-ros/costmap_2d dev-ros/dwa_local_planner dev-ros/fake_localization dev-ros/global_planner dev-ros/map_server dev-ros/move_base dev-ros/move_slow_and_clear dev-ros/nav_core dev-ros/navfn dev-ros/robot_pose_ekf dev-ros/rotate_recovery dev-ros/voxel_grid sys-devel/make >=dev-util/cmake-3.9.6 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(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=2D navigation stack
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/navigation
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD LGPL-2.1
+RDEPEND=dev-ros/amcl dev-ros/base_local_planner dev-ros/carrot_planner dev-ros/clear_costmap_recovery dev-ros/costmap_2d dev-ros/dwa_local_planner dev-ros/fake_localization dev-ros/global_planner dev-ros/map_server dev-ros/move_base dev-ros/move_slow_and_clear dev-ros/nav_core dev-ros/navfn dev-ros/robot_pose_ekf dev-ros/rotate_recovery dev-ros/voxel_grid 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://github.com/ros-planning/navigation/archive/1.15.2.tar.gz -> navigation-1.15.2.tar.gz
+_eclasses_=cmake-utils	b8d2d7038bb36192aa14e01c64e5a06a	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=9f949735b56624a1308c1d63fb12239f
diff --git a/metadata/md5-cache/sci-astronomy/Manifest.gz b/metadata/md5-cache/sci-astronomy/Manifest.gz
index a39a6750980b..8731d1c14118 100644
--- a/metadata/md5-cache/sci-astronomy/Manifest.gz
+++ b/metadata/md5-cache/sci-astronomy/Manifest.gz
diff --git a/metadata/md5-cache/sci-astronomy/healpix-3.30 b/metadata/md5-cache/sci-astronomy/healpix-3.30
index fbee97bd9c1a..2f62c4aeb3d7 100644
--- a/metadata/md5-cache/sci-astronomy/healpix-3.30
+++ b/metadata/md5-cache/sci-astronomy/healpix-3.30
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sci-libs/cfitsio-3 idl? ( dev-lang/gdl sci-astronomy/idlastro ) java? ( >=virtual/jre-1.6:* ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0
 SRC_URI=mirror://sourceforge/healpix/Healpix_3.30/Healpix_3.30_2015Oct08.tar.gz
-_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=c40c9fbaf34285f46d81d62a04c18e28
diff --git a/metadata/md5-cache/sci-astronomy/healpix-3.31 b/metadata/md5-cache/sci-astronomy/healpix-3.31
index d8b88c42b782..96237af45893 100644
--- a/metadata/md5-cache/sci-astronomy/healpix-3.31
+++ b/metadata/md5-cache/sci-astronomy/healpix-3.31
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sci-libs/cfitsio-3 idl? ( dev-lang/gdl sci-astronomy/idlastro ) java? ( >=virtual/jre-1.6:* ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0
 SRC_URI=mirror://sourceforge/healpix/Healpix_3.31/Healpix_3.31_2016Aug26.tar.gz
-_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=25491f4a82489b669c12f3f64a6526ad
diff --git a/metadata/md5-cache/sci-biology/Manifest.gz b/metadata/md5-cache/sci-biology/Manifest.gz
index cd8da322cfff..152928d0fcd6 100644
--- a/metadata/md5-cache/sci-biology/Manifest.gz
+++ b/metadata/md5-cache/sci-biology/Manifest.gz
diff --git a/metadata/md5-cache/sci-biology/amap-2.2-r3 b/metadata/md5-cache/sci-biology/amap-2.2-r3
index fb05abce9d4b..3dd59e5817f3 100644
--- a/metadata/md5-cache/sci-biology/amap-2.2-r3
+++ b/metadata/md5-cache/sci-biology/amap-2.2-r3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0
 SRC_URI=http://baboon.math.berkeley.edu/amap/download/amap.2.2.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=6bd792e8b76c06ee993b88f83e48b907
diff --git a/metadata/md5-cache/sci-biology/beast-mcmc-1.7.5-r1 b/metadata/md5-cache/sci-biology/beast-mcmc-1.7.5-r1
index 171dc05bfdce..f5a53e5eb50f 100644
--- a/metadata/md5-cache/sci-biology/beast-mcmc-1.7.5-r1
+++ b/metadata/md5-cache/sci-biology/beast-mcmc-1.7.5-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-3
 RDEPEND=>=virtual/jre-1.5 dev-java/colt:0 dev-java/jdom:0 dev-java/itext:0 dev-java/junit:4 dev-java/jebl:0 dev-java/matrix-toolkits-java dev-java/commons-math:2 dev-java/jdom-jaxen:1.0 >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jlec/distfiles/beast-mcmc-1.7.5.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=ff6d5ad394902a1137f7b3a310e2da17
diff --git a/metadata/md5-cache/sci-biology/beast-mcmc-9999 b/metadata/md5-cache/sci-biology/beast-mcmc-9999
index 1c7bd0825a8a..3c2553392ce7 100644
--- a/metadata/md5-cache/sci-biology/beast-mcmc-9999
+++ b/metadata/md5-cache/sci-biology/beast-mcmc-9999
@@ -7,5 +7,5 @@ IUSE=elibc_FreeBSD elibc_FreeBSD
 LICENSE=LGPL-3
 RDEPEND=>=virtual/jre-1.5 dev-java/colt:0 dev-java/jdom:0 dev-java/itext:0 dev-java/junit:4 dev-java/jebl:0 dev-java/matrix-toolkits-java dev-java/commons-math:2 dev-java/jdom-jaxen:1.0 >=dev-java/java-config-2.2.0-r3
 SLOT=0
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	subversion	a5d5826a85609611f098c0553eb24cc1	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	subversion	a5d5826a85609611f098c0553eb24cc1	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=8ad11964919894b7a04467aea903b1c3
diff --git a/metadata/md5-cache/sci-biology/gatk-2.4 b/metadata/md5-cache/sci-biology/gatk-2.4
index 88f6142cb6c9..c7c442630b45 100644
--- a/metadata/md5-cache/sci-biology/gatk-2.4
+++ b/metadata/md5-cache/sci-biology/gatk-2.4
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=https://github.com/broadgsa/gatk/archive/2.4.tar.gz -> gatk-2.4.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=8afea474ed6c1f4ad5ac6d6a18c49542
diff --git a/metadata/md5-cache/sci-biology/gatk-9999 b/metadata/md5-cache/sci-biology/gatk-9999
index a07d3507d738..be9e78ba98c6 100644
--- a/metadata/md5-cache/sci-biology/gatk-9999
+++ b/metadata/md5-cache/sci-biology/gatk-9999
@@ -7,5 +7,5 @@ IUSE=elibc_FreeBSD elibc_FreeBSD
 LICENSE=MIT
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3
 SLOT=0
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	git-2	195a672bfaf52d868442171c9469bbb6	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	git-2	195a672bfaf52d868442171c9469bbb6	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=df4fa840e567320d0f100f0073200f23
diff --git a/metadata/md5-cache/sci-biology/goby-1.9.7.3-r1 b/metadata/md5-cache/sci-biology/goby-1.9.7.3-r1
index 0f9cb1c424b4..3e0a45a09df3 100644
--- a/metadata/md5-cache/sci-biology/goby-1.9.7.3-r1
+++ b/metadata/md5-cache/sci-biology/goby-1.9.7.3-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3 LGPL-3
 RDEPEND=>=virtual/jre-1.6 dev-java/commons-logging dev-java/commons-lang:2.1 dev-java/commons-io:1 dev-java/protobuf-java:0 dev-java/fastutil:0 dev-java/log4j dev-java/jsap dev-java/commons-configuration dev-java/commons-math:2 cpp? ( ~sci-biology/goby-cpp-1.9.7.3 ) >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=http://chagall.med.cornell.edu/goby/releases/archive/release-goby_1.9.7.3/goby_1.9.7.3-src.zip http://chagall.med.cornell.edu/goby/releases/archive/release-goby_1.9.7.3/goby_1.9.7.3-deps.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=d8bbf59f45f0b32b55de88f3c5233883
diff --git a/metadata/md5-cache/sci-biology/goby-1.9.8.1-r1 b/metadata/md5-cache/sci-biology/goby-1.9.8.1-r1
index 6b6c831b4ee1..42118bf4e1ae 100644
--- a/metadata/md5-cache/sci-biology/goby-1.9.8.1-r1
+++ b/metadata/md5-cache/sci-biology/goby-1.9.8.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3 LGPL-3
 RDEPEND=>=virtual/jre-1.6 dev-java/commons-logging dev-java/commons-lang:2.1 dev-java/commons-io:1 dev-java/protobuf-java:0 dev-java/fastutil:0 dev-java/log4j dev-java/jsap dev-java/commons-configuration dev-java/commons-math:2 cpp? ( ~sci-biology/goby-cpp-1.9.8.1 ) >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=http://chagall.med.cornell.edu/goby/releases/archive/release-goby_1.9.8.1/goby_1.9.8.1-src.zip http://chagall.med.cornell.edu/goby/releases/archive/release-goby_1.9.8.1/goby_1.9.8.1-deps.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=d8bbf59f45f0b32b55de88f3c5233883
diff --git a/metadata/md5-cache/sci-biology/picard-1.103 b/metadata/md5-cache/sci-biology/picard-1.103
index eb08149d0775..9a5043aaff2b 100644
--- a/metadata/md5-cache/sci-biology/picard-1.103
+++ b/metadata/md5-cache/sci-biology/picard-1.103
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 dev-java/snappy:1.0 dev-java/cofoja:0 dev-java/commons-jexl:2 dev-java/ant-core:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ercpe/distfiles/sci-biology/picard/picard-1.103.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=09627e6bb74ee9997324bde01a56bcbd
diff --git a/metadata/md5-cache/sci-chemistry/Manifest.gz b/metadata/md5-cache/sci-chemistry/Manifest.gz
index afc40f76d3df..5b8637acaa2a 100644
--- a/metadata/md5-cache/sci-chemistry/Manifest.gz
+++ b/metadata/md5-cache/sci-chemistry/Manifest.gz
diff --git a/metadata/md5-cache/sci-chemistry/jmol-12.0.45-r1 b/metadata/md5-cache/sci-chemistry/jmol-12.0.45-r1
index f7075a391a82..b6eed5a65a31 100644
--- a/metadata/md5-cache/sci-chemistry/jmol-12.0.45-r1
+++ b/metadata/md5-cache/sci-chemistry/jmol-12.0.45-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.4 dev-java/commons-cli:1 dev-java/itext:0 sci-libs/jmol-acme:0 sci-libs/vecmath-objectclub:0 >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=mirror://sourceforge/jmol/Jmol-12.0.45-full.tar.gz https://dev.gentoo.org/~jlec/distfiles/jmol-selfSignedCertificate.store.tar
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	webapp	a76ebd3cb5649737496e8238992dd7ca
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	webapp	a76ebd3cb5649737496e8238992dd7ca
 _md5_=e5be2ed02e2c454e5aae9177da649849
diff --git a/metadata/md5-cache/sci-chemistry/jmol-12.2.27-r1 b/metadata/md5-cache/sci-chemistry/jmol-12.2.27-r1
index a9ee72067ee4..43545ddbcf94 100644
--- a/metadata/md5-cache/sci-chemistry/jmol-12.2.27-r1
+++ b/metadata/md5-cache/sci-chemistry/jmol-12.2.27-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.5 dev-java/commons-cli:1 dev-java/itext:0 sci-libs/jmol-acme:0 sci-libs/vecmath-objectclub:0 sci-libs/naga >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=mirror://sourceforge/jmol/Jmol-12.2.27-full.tar.gz https://dev.gentoo.org/~jlec/distfiles/jmol-selfSignedCertificate.store.tar
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	webapp	a76ebd3cb5649737496e8238992dd7ca
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	webapp	a76ebd3cb5649737496e8238992dd7ca
 _md5_=de2dedca3cc13b31429da06c08257045
diff --git a/metadata/md5-cache/sci-geosciences/Manifest.gz b/metadata/md5-cache/sci-geosciences/Manifest.gz
index 4666b0b3317b..30573059e2d3 100644
--- a/metadata/md5-cache/sci-geosciences/Manifest.gz
+++ b/metadata/md5-cache/sci-geosciences/Manifest.gz
diff --git a/metadata/md5-cache/sci-geosciences/bt747-2.1.7-r1 b/metadata/md5-cache/sci-geosciences/bt747-2.1.7-r1
index 7c36a47ee488..c1947afcaea0 100644
--- a/metadata/md5-cache/sci-geosciences/bt747-2.1.7-r1
+++ b/metadata/md5-cache/sci-geosciences/bt747-2.1.7-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-java/commons-imaging:0 dev-java/jcalendar:1.2 dev-java/jchart2d:0 dev-java/jopt-simple:0 >=dev-java/rxtx-2.2_pre2:2 dev-java/swing-layout:1 dev-java/swingx:1.6 dev-java/swingx-ws:bt747 dev-libs/glib:2[dbus] >=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3
 SLOT=1
 SRC_URI=mirror://sourceforge/bt747/Stable/BT747_2.1.7_full.zip http://www.bt747.org/icon/bt747_128x128.gif -> bt747.gif
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=83fa37d67cedb7c8396021ebd58ed43e
diff --git a/metadata/md5-cache/sci-geosciences/bt747-2.1.7-r2 b/metadata/md5-cache/sci-geosciences/bt747-2.1.7-r2
index 2da399f2a5c5..3ac38498d6fb 100644
--- a/metadata/md5-cache/sci-geosciences/bt747-2.1.7-r2
+++ b/metadata/md5-cache/sci-geosciences/bt747-2.1.7-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-java/commons-imaging:0 dev-java/jcalendar:1.2 dev-java/jchart2d:0 dev-java/jopt-simple:0 >=dev-java/rxtx-2.2_pre2:2 dev-java/swing-layout:1 dev-java/swingx:1.6 dev-java/swingx-ws:bt747 dev-libs/glib:2[dbus] >=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3
 SLOT=1
 SRC_URI=mirror://sourceforge/bt747/Stable/BT747_2.1.7_full.zip http://www.bt747.org/icon/bt747_128x128.gif -> bt747.gif
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=bc1cfa0584223529e57f38f5ea6aa3d3
diff --git a/metadata/md5-cache/sci-geosciences/josm-10966 b/metadata/md5-cache/sci-geosciences/josm-10966
index f1fdf1fb9c2b..eff5df28216d 100644
--- a/metadata/md5-cache/sci-geosciences/josm-10966
+++ b/metadata/md5-cache/sci-geosciences/josm-10966
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=mirror://gentoo/josm-10966.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=8519ff72a062323f49069d6fa619e65b
diff --git a/metadata/md5-cache/sci-geosciences/josm-99999 b/metadata/md5-cache/sci-geosciences/josm-99999
index 47232a458e81..c01225edfc62 100644
--- a/metadata/md5-cache/sci-geosciences/josm-99999
+++ b/metadata/md5-cache/sci-geosciences/josm-99999
@@ -7,5 +7,5 @@ IUSE=elibc_FreeBSD elibc_FreeBSD
 LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3
 SLOT=0
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	subversion	a5d5826a85609611f098c0553eb24cc1	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	subversion	a5d5826a85609611f098c0553eb24cc1	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=a167ab9ac34c9275d349cb2b9d870bf4
diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index 060cc6b7ffb1..182d2b287429 100644
--- a/metadata/md5-cache/sci-libs/Manifest.gz
+++ b/metadata/md5-cache/sci-libs/Manifest.gz
diff --git a/metadata/md5-cache/sci-libs/jmol-acme-1.0 b/metadata/md5-cache/sci-libs/jmol-acme-1.0
index 05bbb51d2ec1..c63322a583b4 100644
--- a/metadata/md5-cache/sci-libs/jmol-acme-1.0
+++ b/metadata/md5-cache/sci-libs/jmol-acme-1.0
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=http://www.acme.com/resources/classes/Acme.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=0802c0d1cb9766ef70601b6c4f3511f6
diff --git a/metadata/md5-cache/sci-libs/naga-2.1 b/metadata/md5-cache/sci-libs/naga-2.1
index 735dea2a38b2..78e649ec3cb1 100644
--- a/metadata/md5-cache/sci-libs/naga-2.1
+++ b/metadata/md5-cache/sci-libs/naga-2.1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=mirror://gentoo/naga-2.1.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=694049afd4ef2a3fde487af8a325b948
diff --git a/metadata/md5-cache/sci-libs/szip-2.1-r2 b/metadata/md5-cache/sci-libs/szip-2.1-r2
index 8e50800c2a72..fcd1df25a947 100644
--- a/metadata/md5-cache/sci-libs/szip-2.1-r2
+++ b/metadata/md5-cache/sci-libs/szip-2.1-r2
@@ -3,10 +3,10 @@ DESCRIPTION=Extended-Rice lossless compression algorithm implementation
 EAPI=6
 HOMEPAGE=http://www.hdfgroup.org/doc_resource/SZIP/
 IUSE=static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=szip
 RDEPEND=!sci-libs/libaec[szip]
 SLOT=0/2
 SRC_URI=ftp://ftp.hdfgroup.org/lib-external/szip/2.1/src/szip-2.1.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=04772fd4dfeae052bd946c1dd32707a9
+_md5_=02857327a3079f5134965f9d2f1f7a4c
diff --git a/metadata/md5-cache/sci-physics/Manifest.gz b/metadata/md5-cache/sci-physics/Manifest.gz
index 7c36e1a824c3..400820c8e51e 100644
--- a/metadata/md5-cache/sci-physics/Manifest.gz
+++ b/metadata/md5-cache/sci-physics/Manifest.gz
diff --git a/metadata/md5-cache/sci-physics/jaxodraw-2.0.1-r1 b/metadata/md5-cache/sci-physics/jaxodraw-2.0.1-r1
index d351ca179281..3d494aa36eba 100644
--- a/metadata/md5-cache/sci-physics/jaxodraw-2.0.1-r1
+++ b/metadata/md5-cache/sci-physics/jaxodraw-2.0.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/jaxodraw/jaxodraw-2.0-1_src.tar.gz http://downloads.sourceforge.net/jaxodraw/axodraw4j_2008_11_19.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=b82db55e4b6cc5c982f973037c7ebaa0
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index d56450a766bf..008b12c38e24 100644
--- a/metadata/md5-cache/sys-apps/Manifest.gz
+++ b/metadata/md5-cache/sys-apps/Manifest.gz
diff --git a/metadata/md5-cache/sys-apps/i2c-tools-3.1.1-r1 b/metadata/md5-cache/sys-apps/i2c-tools-3.1.1-r1
index 4d24050af111..5f8711a2d17a 100644
--- a/metadata/md5-cache/sys-apps/i2c-tools-3.1.1-r1
+++ b/metadata/md5-cache/sys-apps/i2c-tools-3.1.1-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_4 py
 SLOT=0
 SRC_URI=http://dl.lm-sensors.org/i2c-tools/releases/i2c-tools-3.1.1.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=97f25ca31f02904e73e8272b81f09993
+_md5_=b9ac449e2ff7fafbb3be7879d47eaac9
diff --git a/metadata/md5-cache/sys-apps/i2c-tools-4.0 b/metadata/md5-cache/sys-apps/i2c-tools-4.0
index 7d48e6ab1aa5..72d26f9c89a3 100644
--- a/metadata/md5-cache/sys-apps/i2c-tools-4.0
+++ b/metadata/md5-cache/sys-apps/i2c-tools-4.0
@@ -11,4 +11,4 @@ REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_4 py
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/software/utils/i2c-tools/i2c-tools-4.0.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f0d6b266ce66e01c7d8bbc8034535bcf
+_md5_=bfde565a1391935e3fb4f5777d549fa0
diff --git a/metadata/md5-cache/sys-apps/ipmicfg-1.27.1.170901 b/metadata/md5-cache/sys-apps/ipmicfg-1.27.1.170901
new file mode 100644
index 000000000000..d237edfb8797
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/ipmicfg-1.27.1.170901
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install nofetch
+DEPEND=app-arch/unzip
+DESCRIPTION=An in-band utility for configuring Supermicro IPMI devices
+EAPI=6
+HOMEPAGE=https://www.supermicro.com
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=supermicro
+RDEPEND=sys-libs/glibc
+RESTRICT=bindist fetch mirror strip
+SLOT=0
+SRC_URI=ftp://ftp.supermicro.com/utility/IPMICFG/IPMICFG_1.27.1_build.170901.zip
+_eclasses_=eapi7-ver	ad64fd3dcf3a655ac44ecae6d0e5ffcc
+_md5_=f62e5a59fc3ad5aa8540200e1703ff7e
diff --git a/metadata/md5-cache/sys-apps/portage-mgorny-2.3.24.3 b/metadata/md5-cache/sys-apps/portage-mgorny-2.3.24.3
new file mode 100644
index 000000000000..6187fea6aca4
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/portage-mgorny-2.3.24.3
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install preinst prepare pretend test
+DEPEND=!build? ( python_targets_pypy? ( >=virtual/pypy-5:0=[ssl(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ssl(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[ssl(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[ssl(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[ssl(+)] ) ) >=app-arch/tar-1.27 >=sys-apps/sed-4.0.5 sys-devel/patch python_targets_pypy? ( >=virtual/pypy-5:0=[bzip2(+),threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[bzip2(+),threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[bzip2(+),threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[bzip2(+),threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[bzip2(+),threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Fork of Portage focused on cleaning up and useful features
+EAPI=6
+HOMEPAGE=https://github.com/mgorny/portage
+IUSE=build +ipc +native-extensions selinux xattr kernel_linux python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+LICENSE=GPL-2
+PDEPEND=!build? ( >=net-misc/rsync-2.6.4 )
+RDEPEND=>=app-arch/tar-1.27 !build? ( >=app-admin/eselect-1.2 app-crypt/openpgp-keys-gentoo-release >=app-crypt/gnupg-2.2.4-r2[ssl(-)] >=app-portage/gemato-10 app-shells/bash:0[readline] python_targets_pypy? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python2_7? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_4? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_5? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) >=dev-python/lxml-3.6.0[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(-)] >=sys-apps/sed-4.0.5 ) elibc_FreeBSD? ( sys-freebsd/freebsd-bin ) elibc_glibc? ( >=sys-apps/sandbox-2.2 ) elibc_musl? ( >=sys-apps/sandbox-2.2 ) elibc_uclibc? ( >=sys-apps/sandbox-2.2 ) >=app-misc/pax-utils-0.1.17 selinux? ( >=sys-libs/libselinux-2.0.94[python,python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) xattr? ( kernel_linux? ( >=sys-apps/install-xattr-0.3 python_targets_pypy? ( dev-python/pyxattr[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/pyxattr[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) ) !app-portage/repoman !sys-apps/portage python_targets_pypy? ( >=virtual/pypy-5:0=[bzip2(+),threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[bzip2(+),threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[bzip2(+),threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[bzip2(+),threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[bzip2(+),threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+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=https://github.com/mgorny/portage/archive/v2.3.24.3.tar.gz -> portage-mgorny-2.3.24.3.tar.gz
+_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=56a9c8122136728d09f9b86ba316d07d
diff --git a/metadata/md5-cache/sys-apps/ripgrep-0.8.1-r1 b/metadata/md5-cache/sys-apps/ripgrep-0.8.1-r2
index eca9b8063b9a..9a7a0b9aadba 100644
--- a/metadata/md5-cache/sys-apps/ripgrep-0.8.1-r1
+++ b/metadata/md5-cache/sys-apps/ripgrep-0.8.1-r2
@@ -9,4 +9,4 @@ LICENSE=|| ( MIT Unlicense )
 SLOT=0
 SRC_URI=https://crates.io/api/v1/crates/aho-corasick/0.6.4/download -> aho-corasick-0.6.4.crate https://crates.io/api/v1/crates/ansi_term/0.10.2/download -> ansi_term-0.10.2.crate https://crates.io/api/v1/crates/atty/0.2.6/download -> atty-0.2.6.crate https://crates.io/api/v1/crates/bitflags/1.0.1/download -> bitflags-1.0.1.crate https://crates.io/api/v1/crates/bytecount/0.3.1/download -> bytecount-0.3.1.crate https://crates.io/api/v1/crates/cfg-if/0.1.2/download -> cfg-if-0.1.2.crate https://crates.io/api/v1/crates/clap/2.30.0/download -> clap-2.30.0.crate https://crates.io/api/v1/crates/crossbeam/0.3.2/download -> crossbeam-0.3.2.crate https://crates.io/api/v1/crates/encoding_rs/0.7.2/download -> encoding_rs-0.7.2.crate https://crates.io/api/v1/crates/fnv/1.0.6/download -> fnv-1.0.6.crate https://crates.io/api/v1/crates/fuchsia-zircon/0.3.3/download -> fuchsia-zircon-0.3.3.crate https://crates.io/api/v1/crates/fuchsia-zircon-sys/0.3.3/download -> fuchsia-zircon-sys-0.3.3.crate https://crates.io/api/v1/crates/glob/0.2.11/download -> glob-0.2.11.crate https://crates.io/api/v1/crates/globset/0.3.0/download -> globset-0.3.0.crate https://crates.io/api/v1/crates/grep/0.1.8/download -> grep-0.1.8.crate https://crates.io/api/v1/crates/ignore/0.4.1/download -> ignore-0.4.1.crate https://crates.io/api/v1/crates/lazy_static/1.0.0/download -> lazy_static-1.0.0.crate https://crates.io/api/v1/crates/libc/0.2.36/download -> libc-0.2.36.crate https://crates.io/api/v1/crates/log/0.4.1/download -> log-0.4.1.crate https://crates.io/api/v1/crates/memchr/2.0.1/download -> memchr-2.0.1.crate https://crates.io/api/v1/crates/memmap/0.6.2/download -> memmap-0.6.2.crate https://crates.io/api/v1/crates/num_cpus/1.8.0/download -> num_cpus-1.8.0.crate https://crates.io/api/v1/crates/rand/0.3.22/download -> rand-0.3.22.crate https://crates.io/api/v1/crates/rand/0.4.2/download -> rand-0.4.2.crate https://crates.io/api/v1/crates/redox_syscall/0.1.37/download -> redox_syscall-0.1.37.crate https://crates.io/api/v1/crates/redox_termios/0.1.1/download -> redox_termios-0.1.1.crate https://crates.io/api/v1/crates/regex/0.2.6/download -> regex-0.2.6.crate https://crates.io/api/v1/crates/regex-syntax/0.4.2/download -> regex-syntax-0.4.2.crate https://crates.io/api/v1/crates/ripgrep/0.8.1/download -> ripgrep-0.8.1.crate https://crates.io/api/v1/crates/same-file/1.0.2/download -> same-file-1.0.2.crate https://crates.io/api/v1/crates/simd/0.2.1/download -> simd-0.2.1.crate https://crates.io/api/v1/crates/strsim/0.7.0/download -> strsim-0.7.0.crate https://crates.io/api/v1/crates/tempdir/0.3.5/download -> tempdir-0.3.5.crate https://crates.io/api/v1/crates/termcolor/0.3.5/download -> termcolor-0.3.5.crate https://crates.io/api/v1/crates/termion/1.5.1/download -> termion-1.5.1.crate https://crates.io/api/v1/crates/textwrap/0.9.0/download -> textwrap-0.9.0.crate https://crates.io/api/v1/crates/thread_local/0.3.5/download -> thread_local-0.3.5.crate https://crates.io/api/v1/crates/unicode-width/0.1.4/download -> unicode-width-0.1.4.crate https://crates.io/api/v1/crates/unreachable/1.0.0/download -> unreachable-1.0.0.crate https://crates.io/api/v1/crates/utf8-ranges/1.0.0/download -> utf8-ranges-1.0.0.crate https://crates.io/api/v1/crates/void/1.0.2/download -> void-1.0.2.crate https://crates.io/api/v1/crates/walkdir/2.1.4/download -> walkdir-2.1.4.crate https://crates.io/api/v1/crates/winapi/0.3.4/download -> winapi-0.3.4.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/wincolor/0.1.6/download -> wincolor-0.1.6.crate
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	cargo	959846e2836f8244430c9582dd6493af	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=ea4ca1e3355f6b3c4c69e899b014875c
+_md5_=27585d0d3928df428bc522248a1be9e1
diff --git a/metadata/md5-cache/sys-apps/sandbox-2.13 b/metadata/md5-cache/sys-apps/sandbox-2.13
index f326714c627a..3e135532dc65 100644
--- a/metadata/md5-cache/sys-apps/sandbox-2.13
+++ b/metadata/md5-cache/sys-apps/sandbox-2.13
@@ -4,9 +4,9 @@ DESCRIPTION=sandbox'd LD_PRELOAD hack
 EAPI=6
 HOMEPAGE=https://www.gentoo.org/proj/en/portage/sandbox/
 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=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~mgorny/dist/sandbox-2.13.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7264537f14285ebdd8d7227778ba6678
+_md5_=db2b2f2f3f981de25586d9c3eb783cd1
diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz
index eff4e3a3dbf6..d9adb54c923e 100644
--- a/metadata/md5-cache/sys-fs/Manifest.gz
+++ b/metadata/md5-cache/sys-fs/Manifest.gz
diff --git a/metadata/md5-cache/sys-fs/e2fsprogs-1.44.1 b/metadata/md5-cache/sys-fs/e2fsprogs-1.44.1
new file mode 100644
index 000000000000..2da2abcba376
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/e2fsprogs-1.44.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=~sys-libs/e2fsprogs-libs-1.44.1 >=sys-apps/util-linux-2.16 fuse? ( sys-fs/fuse:0 ) nls? ( virtual/libintl ) nls? ( sys-devel/gettext ) virtual/pkgconfig sys-apps/texinfo
+DESCRIPTION=Standard EXT2/EXT3/EXT4 filesystem utilities
+EAPI=6
+HOMEPAGE=http://e2fsprogs.sourceforge.net/
+IUSE=fuse nls static-libs elibc_FreeBSD
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 -x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~m68k-mint
+LICENSE=GPL-2 BSD
+RDEPEND=~sys-libs/e2fsprogs-libs-1.44.1 >=sys-apps/util-linux-2.16 fuse? ( sys-fs/fuse:0 ) nls? ( virtual/libintl )
+SLOT=0
+SRC_URI=mirror://sourceforge/e2fsprogs/e2fsprogs-1.44.1.tar.gz mirror://kernel/linux/kernel/people/tytso/e2fsprogs/v1.44.1/e2fsprogs-1.44.1.tar.gz elibc_mintlib? ( mirror://gentoo/e2fsprogs-1.42.9-mint-r1.patch.xz )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=9c66ca93d3cc027eadba742980cc4f25
diff --git a/metadata/md5-cache/sys-fs/udev-236-r1 b/metadata/md5-cache/sys-fs/udev-236-r1
index abeb7a69b9ed..bd6d6790ad93 100644
--- a/metadata/md5-cache/sys-fs/udev-236-r1
+++ b/metadata/md5-cache/sys-fs/udev-236-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Linux dynamic and persistent device naming support (aka userspace de
 EAPI=6
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/systemd
 IUSE=acl +kmod selinux 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
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86
 LICENSE=LGPL-2.1 MIT GPL-2
 PDEPEND=>=sys-apps/hwids-20140304[udev] >=sys-fs/udev-init-scripts-26
 RDEPEND=>=sys-apps/util-linux-2.30[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/libcap[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(-)?] acl? ( sys-apps/acl ) kmod? ( >=sys-apps/kmod-16 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) !<sys-libs/glibc-2.11 !sys-apps/gentoo-systemd-integration !sys-apps/systemd abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r7 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) !<sys-fs/lvm2-2.02.103 !<sec-policy/selinux-base-2.20120725-r10
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/systemd/systemd/archive/v236.tar.gz -> systemd-236.tar.gz
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	ca370deef9d44125d829f2eb6ebc83e0	meson	f8e09b2b2ac1e9bb0bd374b6ad77a90d	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=5dc071d879f91ce592ea1f47c54a2a46
+_md5_=5c973d4bfd886ed717b12c92489c9cc4
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index 4e447963cff9..55557ba0e5a9 100644
--- a/metadata/md5-cache/sys-kernel/Manifest.gz
+++ b/metadata/md5-cache/sys-kernel/Manifest.gz
diff --git a/metadata/md5-cache/sys-kernel/dracut-047 b/metadata/md5-cache/sys-kernel/dracut-047-r1
index d142ac6a1da7..d6b8405d91b7 100644
--- a/metadata/md5-cache/sys-kernel/dracut-047
+++ b/metadata/md5-cache/sys-kernel/dracut-047-r1
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://kernel/linux/utils/boot/dracut/dracut-047.tar.xz
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=9fc46d266ae33e46fa2060981c210751
+_md5_=517cd291cf2ff19ed1805244e8961626
diff --git a/metadata/md5-cache/sys-kernel/dracut-9999 b/metadata/md5-cache/sys-kernel/dracut-9999
index d91be430c919..2ec6e0c82139 100644
--- a/metadata/md5-cache/sys-kernel/dracut-9999
+++ b/metadata/md5-cache/sys-kernel/dracut-9999
@@ -9,4 +9,4 @@ RDEPEND=>=sys-apps/kmod-23[tools] virtual/pkgconfig virtual/udev app-arch/cpio >
 RESTRICT=test
 SLOT=0
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=ce3506d52e359ca95ca37f297db2649f
+_md5_=741b2dd38c300c12f1c6159d2a107caa
diff --git a/metadata/md5-cache/sys-kernel/dracut-crypt-ssh-1.0.6 b/metadata/md5-cache/sys-kernel/dracut-crypt-ssh-1.0.6-r1
index 73e1bf486fb7..177bcbebae68 100644
--- a/metadata/md5-cache/sys-kernel/dracut-crypt-ssh-1.0.6
+++ b/metadata/md5-cache/sys-kernel/dracut-crypt-ssh-1.0.6-r1
@@ -1,11 +1,11 @@
-DEFINED_PHASES=postinst
+DEFINED_PHASES=-
 DEPEND=sys-kernel/dracut
 DESCRIPTION=early unlocking of encrypted systems via ssh for dracut
 EAPI=6
 HOMEPAGE=https://github.com/dracut-crypt-ssh/dracut-crypt-ssh
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=sys-kernel/dracut net-misc/dropbear
+RDEPEND=sys-kernel/dracut net-misc/dhcp net-misc/dropbear
 SLOT=0
 SRC_URI=https://github.com/dracut-crypt-ssh/dracut-crypt-ssh/archive/v1.0.6.tar.gz -> dracut-crypt-ssh-1.0.6.tar.gz
-_md5_=82ddb3edc45232c858d66010d386dd74
+_md5_=15332960869d765f29e86fc8f593fe47
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.30 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.30
new file mode 100644
index 000000000000..ab6b13e91552
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.30
@@ -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 )
+DESCRIPTION=Full sources including the Gentoo patchset for the 4.14 kernel tree
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2 linux-firmware
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.14.30
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz mirror://gentoo/genpatches-4.14-35.base.tar.xz mirror://gentoo/genpatches-4.14-35.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-35.experimental.tar.xz )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	6e37f651408d80af441518a0264b59c7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=63b2f08bbe0da23fd93ba82fe2ff52e9
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.15.13 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.15.13
new file mode 100644
index 000000000000..96045cc42f63
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.15.13
@@ -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 )
+DESCRIPTION=Full sources including the Gentoo patchset for the 4.15 kernel tree
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2 linux-firmware
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.15.13
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.15.tar.xz mirror://gentoo/genpatches-4.15-16.base.tar.xz mirror://gentoo/genpatches-4.15-16.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.15-16.experimental.tar.xz )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	6e37f651408d80af441518a0264b59c7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=719b8e7fcc982ac6f624e7b04d63e4a5
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.124 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.124
new file mode 100644
index 000000000000..aa8619096d69
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.124
@@ -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 )
+DESCRIPTION=Full sources including the Gentoo patchset for the 4.4 kernel tree
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2 linux-firmware
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.4.124
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz mirror://gentoo/genpatches-4.4-127.base.tar.xz mirror://gentoo/genpatches-4.4-127.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.4-127.experimental.tar.xz )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	6e37f651408d80af441518a0264b59c7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=16d037616a6f8739641028588c345093
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.90 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.90
new file mode 100644
index 000000000000..931907f2c564
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.90
@@ -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 )
+DESCRIPTION=Full sources including the Gentoo patchset for the 4.9 kernel tree
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2 linux-firmware
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.9.90
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz mirror://gentoo/genpatches-4.9-93.base.tar.xz mirror://gentoo/genpatches-4.9-93.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-93.experimental.tar.xz )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	6e37f651408d80af441518a0264b59c7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=b1b6c39e4bd5003b8c59939baa098f04
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index bf72a60d41c3..305468b5e13c 100644
--- a/metadata/md5-cache/sys-libs/Manifest.gz
+++ b/metadata/md5-cache/sys-libs/Manifest.gz
diff --git a/metadata/md5-cache/sys-libs/e2fsprogs-libs-1.44.1 b/metadata/md5-cache/sys-libs/e2fsprogs-libs-1.44.1
new file mode 100644
index 000000000000..62715c1d310c
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/e2fsprogs-libs-1.44.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=nls? ( sys-devel/gettext ) virtual/pkgconfig
+DESCRIPTION=e2fsprogs libraries (common error and subsystem)
+EAPI=6
+HOMEPAGE=http://e2fsprogs.sourceforge.net/
+IUSE=nls static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~m68k-mint ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=!sys-libs/com_err !sys-libs/ss !<sys-fs/e2fsprogs-1.41.8
+SLOT=0
+SRC_URI=mirror://sourceforge/e2fsprogs/e2fsprogs-libs-1.44.1.tar.gz mirror://kernel/linux/kernel/people/tytso/e2fsprogs/v1.44.1/e2fsprogs-libs-1.44.1.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=c8cf9adf726d1dde5f4e892faa619782
diff --git a/metadata/md5-cache/sys-libs/ncurses-6.1-r1 b/metadata/md5-cache/sys-libs/ncurses-6.1-r1
index 8303dea659eb..eaa9bbaa0344 100644
--- a/metadata/md5-cache/sys-libs/ncurses-6.1-r1
+++ b/metadata/md5-cache/sys-libs/ncurses-6.1-r1
@@ -4,10 +4,10 @@ DESCRIPTION=console display library
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/ncurses/ http://dickey.his.com/ncurses/
 IUSE=ada +cxx debug doc gpm minimal profile static-libs test threads tinfo trace unicode abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=MIT
 RDEPEND=gpm? ( sys-libs/gpm[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/ncurses-5.9-r4:5 !<sys-libs/slang-2.3.2_pre23 !<x11-terms/rxvt-unicode-9.06-r3 !<x11-terms/st-0.6-r1 !app-emulation/emul-linux-x86-baselibs
 SLOT=0/6
 SRC_URI=mirror://gnu/ncurses/ncurses-6.1.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6924770835e2cf8e7398d124520d753e
+_md5_=9656261c92669758bc8ad62bb18f466d
diff --git a/metadata/md5-cache/sys-libs/slang-2.3.2 b/metadata/md5-cache/sys-libs/slang-2.3.2
index 6bffb16bf404..2ea7b056b4da 100644
--- a/metadata/md5-cache/sys-libs/slang-2.3.2
+++ b/metadata/md5-cache/sys-libs/slang-2.3.2
@@ -4,10 +4,10 @@ DESCRIPTION=Multi-platform library designed to allow a developer to create robus
 EAPI=6
 HOMEPAGE=http://www.jedsoft.org/slang/
 IUSE=cjk pcre png readline static-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
-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 ~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 ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses:0= cjk? ( >=dev-libs/oniguruma-5.9.5:=[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(-)?] ) pcre? ( >=dev-libs/libpcre-8.33-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(-)?] ) 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(-)?] ) readline? ( >=sys-libs/readline-6.2_p5-r1: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(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
 SRC_URI=http://www.jedsoft.org/releases/slang/slang-2.3.2.tar.bz2 http://www.jedsoft.org/releases/slang/old/slang-2.3.2.tar.bz2
 _eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=cebc6bb3bc28dcd3c5db9c4d006a26df
+_md5_=b2f3cd7c2f1fa620ed5ec008d7b8e6df
diff --git a/metadata/md5-cache/www-apps/Manifest.gz b/metadata/md5-cache/www-apps/Manifest.gz
index 0aecfb4cd98e..a522c3fd23b0 100644
--- a/metadata/md5-cache/www-apps/Manifest.gz
+++ b/metadata/md5-cache/www-apps/Manifest.gz
diff --git a/metadata/md5-cache/www-apps/grafana-bin-5.0.2 b/metadata/md5-cache/www-apps/grafana-bin-5.0.3
index 2d7db9b6d812..0b3eb13c34c5 100644
--- a/metadata/md5-cache/www-apps/grafana-bin-5.0.2
+++ b/metadata/md5-cache/www-apps/grafana-bin-5.0.3
@@ -6,6 +6,6 @@ HOMEPAGE=http://grafana.org
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
 SLOT=0
-SRC_URI=https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-5.0.2.linux-x64.tar.gz -> grafana-bin-5.0.2.tar.gz
+SRC_URI=https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-5.0.3.linux-x64.tar.gz -> grafana-bin-5.0.3.tar.gz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=7986335bb3f56c54ad172d2ec3e7809f
diff --git a/metadata/md5-cache/www-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz
index 22e7525189fc..1171bed70144 100644
--- a/metadata/md5-cache/www-client/Manifest.gz
+++ b/metadata/md5-cache/www-client/Manifest.gz
diff --git a/metadata/md5-cache/www-client/chromium-65.0.3325.181 b/metadata/md5-cache/www-client/chromium-65.0.3325.181
new file mode 100644
index 000000000000..d34f8e20fd2f
--- /dev/null
+++ b/metadata/md5-cache/www-client/chromium-65.0.3325.181
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup
+DEPEND=app-accessibility/at-spi2-atk:2 app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) dev-libs/atk dev-libs/expat:= dev-libs/glib:2 system-icu? ( >=dev-libs/icu-59:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/libxslt:= dev-libs/nspr:= >=dev-libs/nss-3.26:= >=dev-libs/re2-0.2016.05.01:= gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= >=media-libs/harfbuzz-1.6.0:=[icu(-)] media-libs/libjpeg-turbo:= media-libs/libpng:= system-libvpx? ( media-libs/libvpx:=[postproc,svc] ) >=media-libs/openh264-1.6.0:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-3:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) !=net-fs/samba-4.5.12 media-libs/opus:= ) sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= x11-libs/pango:= app-arch/snappy:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) >=app-arch/gzip-1.7 !arm? ( dev-lang/yasm ) dev-lang/perl >=dev-util/gperf-3.0.3 >=dev-util/ninja-1.7.2 >=net-libs/nodejs-6.9.4 sys-apps/hwids[usb(+)] >=sys-devel/bison-2.4.3 sys-devel/flex >=sys-devel/clang-5 virtual/pkgconfig dev-vcs/git || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/beautifulsoup:python-2[python_targets_python2_7(-),python_single_target_python2_7(+)] >=dev-python/beautifulsoup-4.3.2:4[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/html5lib[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/simplejson[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) >=sys-apps/sed-4
+DESCRIPTION=Open-source version of Google Chrome web browser
+EAPI=6
+HOMEPAGE=http://chromium.org/
+IUSE=component-build cups gnome-keyring +hangouts jumbo-build kerberos neon pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-icu +system-libvpx +tcmalloc widevine custom-cflags +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +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 ~arm64 ~x86
+LICENSE=BSD
+RDEPEND=app-accessibility/at-spi2-atk:2 app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) dev-libs/atk dev-libs/expat:= dev-libs/glib:2 system-icu? ( >=dev-libs/icu-59:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/libxslt:= dev-libs/nspr:= >=dev-libs/nss-3.26:= >=dev-libs/re2-0.2016.05.01:= gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= >=media-libs/harfbuzz-1.6.0:=[icu(-)] media-libs/libjpeg-turbo:= media-libs/libpng:= system-libvpx? ( media-libs/libvpx:=[postproc,svc] ) >=media-libs/openh264-1.6.0:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-3:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) !=net-fs/samba-4.5.12 media-libs/opus:= ) sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= x11-libs/pango:= app-arch/snappy:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) !=www-client/chromium-9999 !<www-plugins/chrome-binary-plugins-57 x11-misc/xdg-utils virtual/opengl virtual/ttf-fonts selinux? ( sec-policy/selinux-chromium ) tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 ) widevine? ( www-plugins/chrome-binary-plugins[widevine(-)] )
+RESTRICT=!system-ffmpeg? ( proprietary-codecs? ( bindist ) )
+SLOT=0
+SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-65.0.3325.181.tar.xz
+_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	chromium-2	bb47c729513f3f0fde655928a9904ab0	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pax-utils	b963274a93e76570a88168c1f1db4cd7	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=42b713ea979780e908a648484a9b0c72
diff --git a/metadata/md5-cache/www-client/chromium-66.0.3355.0 b/metadata/md5-cache/www-client/chromium-66.0.3359.45
index 2f1a531cf774..01d0dc26b0b3 100644
--- a/metadata/md5-cache/www-client/chromium-66.0.3355.0
+++ b/metadata/md5-cache/www-client/chromium-66.0.3359.45
@@ -9,6 +9,6 @@ LICENSE=BSD
 RDEPEND=app-accessibility/at-spi2-atk:2 app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) dev-libs/atk dev-libs/expat:= dev-libs/glib:2 system-icu? ( >=dev-libs/icu-59:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/libxslt:= dev-libs/nspr:= >=dev-libs/nss-3.26:= >=dev-libs/re2-0.2016.05.01:= gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= >=media-libs/harfbuzz-1.6.0:=[icu(-)] media-libs/libjpeg-turbo:= media-libs/libpng:= system-libvpx? ( media-libs/libvpx:=[postproc,svc] ) >=media-libs/openh264-1.6.0:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-3:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) !=net-fs/samba-4.5.12 media-libs/opus:= ) sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= x11-libs/pango:= app-arch/snappy:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) !=www-client/chromium-9999 !<www-plugins/chrome-binary-plugins-57 x11-misc/xdg-utils virtual/opengl virtual/ttf-fonts selinux? ( sec-policy/selinux-chromium ) tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 ) widevine? ( www-plugins/chrome-binary-plugins[widevine(-)] )
 RESTRICT=!system-ffmpeg? ( proprietary-codecs? ( bindist ) )
 SLOT=0
-SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-66.0.3355.0.tar.xz
+SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-66.0.3359.45.tar.xz
 _eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	chromium-2	bb47c729513f3f0fde655928a9904ab0	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pax-utils	b963274a93e76570a88168c1f1db4cd7	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=82e6e35a405840f6fb105333807abbcb
+_md5_=c3a7422f3487469cc959ffbf1d0e52b4
diff --git a/metadata/md5-cache/www-client/google-chrome-unstable-67.0.3371.0 b/metadata/md5-cache/www-client/google-chrome-unstable-67.0.3377.1
index 4a6f8d922bae..97eee7f50ef4 100644
--- a/metadata/md5-cache/www-client/google-chrome-unstable-67.0.3371.0
+++ b/metadata/md5-cache/www-client/google-chrome-unstable-67.0.3377.1
@@ -9,6 +9,6 @@ LICENSE=google-chrome
 RDEPEND=app-accessibility/at-spi2-atk:2 app-arch/bzip2 app-misc/ca-certificates dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr >=dev-libs/nss-3.26 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype:2 net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 >=x11-libs/libX11-1.5.0 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/libXScrnSaver x11-libs/libXtst x11-libs/libxcb x11-libs/pango x11-misc/xdg-utils
 RESTRICT=bindist mirror strip
 SLOT=0
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_67.0.3371.0-1_amd64.deb
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_67.0.3377.1-1_amd64.deb
 _eclasses_=chromium-2	bb47c729513f3f0fde655928a9904ab0	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=9f3bf237a83ecd802a636b64a7996448
diff --git a/metadata/md5-cache/www-client/qupzilla-2.2.5 b/metadata/md5-cache/www-client/qupzilla-2.2.5
index a63c90c0eeef..677f1945e946 100644
--- a/metadata/md5-cache/www-client/qupzilla-2.2.5
+++ b/metadata/md5-cache/www-client/qupzilla-2.2.5
@@ -4,10 +4,10 @@ DESCRIPTION=A cross-platform web browser using QtWebEngine
 EAPI=6
 HOMEPAGE=https://www.qupzilla.com/
 IUSE=dbus debug gnome-keyring kwallet libressl nonblockdialogs
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm ~x86
 LICENSE=GPL-3
 RDEPEND=>=dev-qt/qtcore-5.8:5 >=dev-qt/qtdeclarative-5.8:5[widgets] >=dev-qt/qtgui-5.8:5 >=dev-qt/qtnetwork-5.8:5[ssl] >=dev-qt/qtprintsupport-5.8:5 >=dev-qt/qtsql-5.8:5[sqlite] >=dev-qt/qtwebchannel-5.8:5 >=dev-qt/qtwebengine-5.8:5[widgets] >=dev-qt/qtwidgets-5.8:5 >=dev-qt/qtx11extras-5.8:5 x11-libs/libxcb:= dbus? ( >=dev-qt/qtdbus-5.8:5 ) gnome-keyring? ( gnome-base/gnome-keyring ) kwallet? ( kde-frameworks/kwallet:5 ) libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:0= ) >=dev-qt/qtsvg-5.8:5
 SLOT=0
 SRC_URI=https://github.com/QupZilla/qupzilla/releases/download/v2.2.5/QupZilla-2.2.5.tar.xz https://github.com/QupZilla/qupzilla-plugins/archive/80fea7df7765fdf9c9c64fdb667052b25f1c0a22.tar.gz -> qupzilla-plugins-2017.03.26.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=670d2a486b41366c0ba76317152d82f3
+_md5_=589821ff08666e5e10882b0859af2377
diff --git a/metadata/md5-cache/www-client/seamonkey-2.49.5.2_p0 b/metadata/md5-cache/www-client/seamonkey-2.49.5.2_p0
deleted file mode 100644
index 01868c8700f0..000000000000
--- a/metadata/md5-cache/www-client/seamonkey-2.49.5.2_p0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare pretend setup unpack
-DEPEND=>=dev-libs/nss-3.28.3 >=dev-libs/nspr-4.13.1 jack? ( virtual/jack ) crypt? ( >=x11-plugins/enigmail-1.9.8.3-r1 ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( dev-libs/libexecinfo ) ) ) amd64? ( >=dev-lang/yasm-1.1 virtual/opengl ) x86? ( >=dev-lang/yasm-1.1 virtual/opengl ) virtual/pkgconfig || ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,sqlite,ssl,threads] ) app-arch/zip app-arch/unzip >=sys-devel/binutils-2.16.1 sys-apps/findutils pulseaudio? ( media-sound/pulseaudio ) >=app-text/hunspell-1.2:= dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-2.18:2 x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.25:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.9 ) ) virtual/freedesktop-icon-theme dbus? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=virtual/libffi-3.0.10 virtual/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt system-cairo? ( >=x11-libs/cairo-1.12[X,xcb] >=x11-libs/pixman-0.19.2 ) system-icu? ( >=dev-libs/icu-58.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0= ) system-sqlite? ( >=dev-db/sqlite-3.17.0:3[secure-delete,debug=] ) system-libvpx? ( >=media-libs/libvpx-1.5.0:0=[postproc] ) system-harfbuzz? ( >=media-libs/harfbuzz-1.3.3:0= >=media-gfx/graphite2-1.3.8 ) force-gtk3? ( >=x11-libs/gtk+-3.4.0:3 ) wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 net-misc/networkmanager ) ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) ~sys-devel/autoconf-2.13 >=sys-devel/libtool-2.4 app-arch/unzip
-DESCRIPTION=Seamonkey Web Browser
-EAPI=6
-HOMEPAGE=http://www.seamonkey-project.org
-IUSE=+calendar +chatzilla +crypt +gmp-autoupdate +ipc jack minimal pulseaudio +roaming selinux test custom-cflags custom-optimization dbus debug +jemalloc neon pulseaudio selinux startup-notification system-cairo system-harfbuzz system-icu system-jpeg system-libevent system-sqlite system-libvpx force-gtk3 wifi l10n_cs l10n_de l10n_en-GB l10n_es-AR l10n_es-ES l10n_fr l10n_hu l10n_it l10n_ja l10n_lt l10n_nl l10n_pl l10n_pt-PT l10n_ru l10n_sk l10n_sv l10n_zh-CN l10n_zh-TW
-KEYWORDS=~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86
-LICENSE=MPL-2.0 GPL-2 LGPL-2.1
-RDEPEND=>=dev-libs/nss-3.28.3 >=dev-libs/nspr-4.13.1 jack? ( virtual/jack ) crypt? ( >=x11-plugins/enigmail-1.9.8.3-r1 ) >=app-text/hunspell-1.2:= dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-2.18:2 x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.25:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.9 ) ) virtual/freedesktop-icon-theme dbus? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=virtual/libffi-3.0.10 virtual/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt system-cairo? ( >=x11-libs/cairo-1.12[X,xcb] >=x11-libs/pixman-0.19.2 ) system-icu? ( >=dev-libs/icu-58.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0= ) system-sqlite? ( >=dev-db/sqlite-3.17.0:3[secure-delete,debug=] ) system-libvpx? ( >=media-libs/libvpx-1.5.0:0=[postproc] ) system-harfbuzz? ( >=media-libs/harfbuzz-1.3.3:0= >=media-gfx/graphite2-1.3.8 ) force-gtk3? ( >=x11-libs/gtk+-3.4.0:3 ) wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 net-misc/networkmanager ) ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.9 ) ) selinux? ( sec-policy/selinux-mozilla )
-SLOT=0
-SRC_URI=https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/source/thunderbird-52.5.2.source.tar.xz https://hg.mozilla.org/chatzilla/archive/SEA2_48_RELBRANCH.tar.bz2 -> chatzilla-SEA2_48_RELBRANCH.tar.bz2 https://hg.mozilla.org/dom-inspector/archive/DOMI_2_0_17.tar.bz2 -> dom-inspector-DOMI_2_0_17.tar.bz2 l10n_cs? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/../../../seamonkey/releases/2.49.1/linux-i686/xpi/cs.xpi -> seamonkey-2.49.5.2-cs.xpi ) l10n_de? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/../../../seamonkey/releases/2.49.1/linux-i686/xpi/de.xpi -> seamonkey-2.49.5.2-de.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/../../../seamonkey/releases/2.49.1/linux-i686/xpi/en-GB.xpi -> seamonkey-2.49.5.2-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/../../../seamonkey/releases/2.49.1/linux-i686/xpi/es-AR.xpi -> seamonkey-2.49.5.2-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/../../../seamonkey/releases/2.49.1/linux-i686/xpi/es-ES.xpi -> seamonkey-2.49.5.2-es-ES.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/../../../seamonkey/releases/2.49.1/linux-i686/xpi/fr.xpi -> seamonkey-2.49.5.2-fr.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/../../../seamonkey/releases/2.49.1/linux-i686/xpi/hu.xpi -> seamonkey-2.49.5.2-hu.xpi ) l10n_it? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/../../../seamonkey/releases/2.49.1/linux-i686/xpi/it.xpi -> seamonkey-2.49.5.2-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/../../../seamonkey/releases/2.49.1/linux-i686/xpi/ja.xpi -> seamonkey-2.49.5.2-ja.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/../../../seamonkey/releases/2.49.1/linux-i686/xpi/lt.xpi -> seamonkey-2.49.5.2-lt.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/../../../seamonkey/releases/2.49.1/linux-i686/xpi/nl.xpi -> seamonkey-2.49.5.2-nl.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/../../../seamonkey/releases/2.49.1/linux-i686/xpi/pl.xpi -> seamonkey-2.49.5.2-pl.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/../../../seamonkey/releases/2.49.1/linux-i686/xpi/pt-PT.xpi -> seamonkey-2.49.5.2-pt-PT.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/../../../seamonkey/releases/2.49.1/linux-i686/xpi/ru.xpi -> seamonkey-2.49.5.2-ru.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/../../../seamonkey/releases/2.49.1/linux-i686/xpi/sk.xpi -> seamonkey-2.49.5.2-sk.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/../../../seamonkey/releases/2.49.1/linux-i686/xpi/sv-SE.xpi -> seamonkey-2.49.5.2-sv-SE.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/../../../seamonkey/releases/2.49.1/linux-i686/xpi/zh-CN.xpi -> seamonkey-2.49.5.2-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/../../../seamonkey/releases/2.49.1/linux-i686/xpi/zh-TW.xpi -> seamonkey-2.49.5.2-zh-TW.xpi ) https://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-52.4-patches-02.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-52.4-patches-02.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-52.4-patches-02.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/seamonkey-2.46-patches-01.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/seamonkey-2.46-patches-01.tar.xz
-_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	mozconfig-v6.52	aeba761913d03fc45f4d6ae2b89165ca	mozcoreconf-v5	602c3c0a642bafeabb149c49a6df941f	mozextension	89a560beaf496e7cb89f3d79d4aef09e	mozlinguas-v2	e7b3bd89af6dc1a3dd10be68ba3d574d	multilib	97f470f374f2e94ccab04a2fb21d811e	nsplugins	2049586e425364a1c5bdb004205d1758	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ebb109ec43769e084011ece1eb007b56
diff --git a/metadata/md5-cache/www-client/seamonkey-2.49.6.0_p0 b/metadata/md5-cache/www-client/seamonkey-2.49.7.0_p0
index ace5ba687042..8af35ec27cd5 100644
--- a/metadata/md5-cache/www-client/seamonkey-2.49.6.0_p0
+++ b/metadata/md5-cache/www-client/seamonkey-2.49.7.0_p0
@@ -8,6 +8,6 @@ KEYWORDS=~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86
 LICENSE=MPL-2.0 GPL-2 LGPL-2.1
 RDEPEND=>=dev-libs/nss-3.28.3 >=dev-libs/nspr-4.13.1 jack? ( virtual/jack ) crypt? ( >=x11-plugins/enigmail-1.9.8.3-r1 ) >=app-text/hunspell-1.2:= dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-2.18:2 x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.25:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.9 ) ) virtual/freedesktop-icon-theme dbus? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=virtual/libffi-3.0.10 virtual/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt system-cairo? ( >=x11-libs/cairo-1.12[X,xcb] >=x11-libs/pixman-0.19.2 ) system-icu? ( >=dev-libs/icu-58.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0= ) system-sqlite? ( >=dev-db/sqlite-3.17.0:3[secure-delete,debug=] ) system-libvpx? ( >=media-libs/libvpx-1.5.0:0=[postproc] ) system-harfbuzz? ( >=media-libs/harfbuzz-1.3.3:0= >=media-gfx/graphite2-1.3.8 ) force-gtk3? ( >=x11-libs/gtk+-3.4.0:3 ) wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 net-misc/networkmanager ) ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.9 ) ) selinux? ( sec-policy/selinux-mozilla )
 SLOT=0
-SRC_URI=https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/source/thunderbird-52.6.0.source.tar.xz https://hg.mozilla.org/chatzilla/archive/SEA2_48_RELBRANCH.tar.bz2 -> chatzilla-SEA2_48_RELBRANCH.tar.bz2 https://hg.mozilla.org/dom-inspector/archive/DOMI_2_0_17.tar.bz2 -> dom-inspector-DOMI_2_0_17.tar.bz2 l10n_cs? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/cs.xpi -> seamonkey-2.49.6.0-cs.xpi ) l10n_de? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/de.xpi -> seamonkey-2.49.6.0-de.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/en-GB.xpi -> seamonkey-2.49.6.0-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/es-AR.xpi -> seamonkey-2.49.6.0-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/es-ES.xpi -> seamonkey-2.49.6.0-es-ES.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/fr.xpi -> seamonkey-2.49.6.0-fr.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/hu.xpi -> seamonkey-2.49.6.0-hu.xpi ) l10n_it? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/it.xpi -> seamonkey-2.49.6.0-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/ja.xpi -> seamonkey-2.49.6.0-ja.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/lt.xpi -> seamonkey-2.49.6.0-lt.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/nl.xpi -> seamonkey-2.49.6.0-nl.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/pl.xpi -> seamonkey-2.49.6.0-pl.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/pt-PT.xpi -> seamonkey-2.49.6.0-pt-PT.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/ru.xpi -> seamonkey-2.49.6.0-ru.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/sk.xpi -> seamonkey-2.49.6.0-sk.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/sv-SE.xpi -> seamonkey-2.49.6.0-sv-SE.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/zh-CN.xpi -> seamonkey-2.49.6.0-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/zh-TW.xpi -> seamonkey-2.49.6.0-zh-TW.xpi ) https://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-52.4-patches-02.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-52.4-patches-02.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-52.4-patches-02.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/seamonkey-2.46-patches-01.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/seamonkey-2.46-patches-01.tar.xz
+SRC_URI=https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/source/thunderbird-52.7.0.source.tar.xz https://hg.mozilla.org/chatzilla/archive/SEA2_48_RELBRANCH.tar.bz2 -> chatzilla-SEA2_48_RELBRANCH.tar.bz2 https://hg.mozilla.org/dom-inspector/archive/DOMI_2_0_17.tar.bz2 -> dom-inspector-DOMI_2_0_17.tar.bz2 l10n_cs? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/cs.xpi -> seamonkey-2.49.7.0-cs.xpi ) l10n_de? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/de.xpi -> seamonkey-2.49.7.0-de.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/en-GB.xpi -> seamonkey-2.49.7.0-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/es-AR.xpi -> seamonkey-2.49.7.0-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/es-ES.xpi -> seamonkey-2.49.7.0-es-ES.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/fr.xpi -> seamonkey-2.49.7.0-fr.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/hu.xpi -> seamonkey-2.49.7.0-hu.xpi ) l10n_it? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/it.xpi -> seamonkey-2.49.7.0-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/ja.xpi -> seamonkey-2.49.7.0-ja.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/lt.xpi -> seamonkey-2.49.7.0-lt.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/nl.xpi -> seamonkey-2.49.7.0-nl.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/pl.xpi -> seamonkey-2.49.7.0-pl.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/pt-PT.xpi -> seamonkey-2.49.7.0-pt-PT.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/ru.xpi -> seamonkey-2.49.7.0-ru.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/sk.xpi -> seamonkey-2.49.7.0-sk.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/sv-SE.xpi -> seamonkey-2.49.7.0-sv-SE.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/zh-CN.xpi -> seamonkey-2.49.7.0-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/zh-TW.xpi -> seamonkey-2.49.7.0-zh-TW.xpi ) https://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-52.4-patches-02.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-52.4-patches-02.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-52.4-patches-02.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/seamonkey-2.46-patches-01.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/seamonkey-2.46-patches-01.tar.xz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	mozconfig-v6.52	aeba761913d03fc45f4d6ae2b89165ca	mozcoreconf-v5	602c3c0a642bafeabb149c49a6df941f	mozextension	89a560beaf496e7cb89f3d79d4aef09e	mozlinguas-v2	e7b3bd89af6dc1a3dd10be68ba3d574d	multilib	97f470f374f2e94ccab04a2fb21d811e	nsplugins	2049586e425364a1c5bdb004205d1758	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=ebb109ec43769e084011ece1eb007b56
diff --git a/metadata/md5-cache/www-plugins/Manifest.gz b/metadata/md5-cache/www-plugins/Manifest.gz
index 73bc9cf26cc3..b6c57b5c5d17 100644
--- a/metadata/md5-cache/www-plugins/Manifest.gz
+++ b/metadata/md5-cache/www-plugins/Manifest.gz
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-67.0.3371.0_alpha b/metadata/md5-cache/www-plugins/chrome-binary-plugins-67.0.3377.1_alpha
index 7e4c684c0d0c..f07fad556ffe 100644
--- a/metadata/md5-cache/www-plugins/chrome-binary-plugins-67.0.3371.0_alpha
+++ b/metadata/md5-cache/www-plugins/chrome-binary-plugins-67.0.3377.1_alpha
@@ -8,6 +8,6 @@ LICENSE=google-chrome
 RDEPEND=widevine? ( !<www-client/chromium-57[widevine(-)] ) !www-plugins/chrome-binary-plugins:0 !www-plugins/chrome-binary-plugins:beta !www-plugins/chrome-binary-plugins:stable
 RESTRICT=bindist mirror strip
 SLOT=unstable
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_67.0.3371.0-1_amd64.deb
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_67.0.3377.1-1_amd64.deb
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70
-_md5_=961944dc038e342d0f63b365c993ebb1
+_md5_=867413b03b94a7908f0373ccd5ea7ea1
diff --git a/metadata/md5-cache/www-servers/Manifest.gz b/metadata/md5-cache/www-servers/Manifest.gz
index 605096988429..1526c83c7fad 100644
--- a/metadata/md5-cache/www-servers/Manifest.gz
+++ b/metadata/md5-cache/www-servers/Manifest.gz
diff --git a/metadata/md5-cache/www-servers/puma-3.11.0 b/metadata/md5-cache/www-servers/puma-3.11.0
index ca0928ea13e3..eb7edb028433 100644
--- a/metadata/md5-cache/www-servers/puma-3.11.0
+++ b/metadata/md5-cache/www-servers/puma-3.11.0
@@ -4,11 +4,11 @@ DESCRIPTION=a simple, fast, threaded, and highly concurrent HTTP 1.1 server for
 EAPI=6
 HOMEPAGE=http://puma.io/
 IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~x86
 LICENSE=BSD
 RDEPEND=dev-libs/openssl:0 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=3
 SRC_URI=https://github.com/puma/puma/archive/v3.11.0.tar.gz -> puma-3.11.0.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=99299a995f35d807486ed82f32e33f3b
+_md5_=466b85d6870c6f959889fd0dcddd7c6e
diff --git a/metadata/md5-cache/www-servers/puma-3.11.2 b/metadata/md5-cache/www-servers/puma-3.11.2
index 5497e1ea16c9..70a76c5e39ff 100644
--- a/metadata/md5-cache/www-servers/puma-3.11.2
+++ b/metadata/md5-cache/www-servers/puma-3.11.2
@@ -4,11 +4,11 @@ DESCRIPTION=a simple, fast, threaded, and highly concurrent HTTP 1.1 server for
 EAPI=6
 HOMEPAGE=http://puma.io/
 IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~x86
 LICENSE=BSD
 RDEPEND=dev-libs/openssl:0 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=3
 SRC_URI=https://github.com/puma/puma/archive/v3.11.2.tar.gz -> puma-3.11.2.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=8d2e85dd3f04cd0b5cfb70b2535c0cfd
+_md5_=09f9bb8975d06ab9621db6a51a553b49
diff --git a/metadata/md5-cache/www-servers/puma-3.11.3 b/metadata/md5-cache/www-servers/puma-3.11.3
index 618fb9ee7ba8..0d76b38e7a00 100644
--- a/metadata/md5-cache/www-servers/puma-3.11.3
+++ b/metadata/md5-cache/www-servers/puma-3.11.3
@@ -4,11 +4,11 @@ DESCRIPTION=a simple, fast, threaded, and highly concurrent HTTP 1.1 server for
 EAPI=6
 HOMEPAGE=https://puma.io/
 IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~x86
 LICENSE=BSD
 RDEPEND=dev-libs/openssl:0 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=3
 SRC_URI=https://github.com/puma/puma/archive/v3.11.3.tar.gz -> puma-3.11.3.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=d81a56bc03f710b929f65ad250cba3ea
+_md5_=e009472278ef53fc7e4545edf9acf8a2
diff --git a/metadata/md5-cache/www-servers/resin-4.0.46 b/metadata/md5-cache/www-servers/resin-4.0.46
index 0306e4ef42fe..395501606556 100644
--- a/metadata/md5-cache/www-servers/resin-4.0.46
+++ b/metadata/md5-cache/www-servers/resin-4.0.46
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.6 dev-java/jsr101:0 dev-java/mojarra:2.2 dev-java/oracle-javamail:0 dev-java/validation-api:1.0 dev-java/resin-servlet-api:3.1 dev-java/glassfish-xmlrpc-api:0 dev-java/glassfish-deployment-api:1.2 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://www.caucho.com/download/resin-4.0.46-src.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=5897cf0dc84f0ba48b2155b59318ad5d
diff --git a/metadata/md5-cache/www-servers/resin-4.0.48 b/metadata/md5-cache/www-servers/resin-4.0.48
index f86251f6cbe7..d2963b5a3a0b 100644
--- a/metadata/md5-cache/www-servers/resin-4.0.48
+++ b/metadata/md5-cache/www-servers/resin-4.0.48
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-java/jsr101:0 dev-java/mojarra:2.2 dev-java/oracle-javamail:0 dev-java/validation-api:1.0 dev-java/resin-servlet-api:3.1 dev-java/glassfish-xmlrpc-api:0 dev-java/glassfish-deployment-api:1.2 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://www.caucho.com/download/resin-4.0.48-src.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=57e92b082b096e24f92e84fc40aa5c2d
diff --git a/metadata/md5-cache/www-servers/resin-4.0.48-r1 b/metadata/md5-cache/www-servers/resin-4.0.48-r1
index 96e35002c909..ac52c6972c47 100644
--- a/metadata/md5-cache/www-servers/resin-4.0.48-r1
+++ b/metadata/md5-cache/www-servers/resin-4.0.48-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-java/jsr101:0 dev-java/mojarra:2.2 dev-java/oracle-javamail:0 dev-java/validation-api:1.0 dev-java/resin-servlet-api:3.1 dev-java/glassfish-xmlrpc-api:0 dev-java/glassfish-deployment-api:1.2 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://www.caucho.com/download/resin-4.0.48-src.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=4ad7381ca883c57afc47e944a4f09caa
diff --git a/metadata/md5-cache/www-servers/tomcat-7.0.82 b/metadata/md5-cache/www-servers/tomcat-7.0.82
index d671808ead15..c758aa15ac81 100644
--- a/metadata/md5-cache/www-servers/tomcat-7.0.82
+++ b/metadata/md5-cache/www-servers/tomcat-7.0.82
@@ -10,5 +10,5 @@ RDEPEND=dev-java/eclipse-ecj:4.5 dev-java/tomcat-servlet-api:3.0 websockets? ( >
 RESTRICT=test
 SLOT=7
 SRC_URI=mirror://apache/tomcat/tomcat-7/v7.0.82/src/apache-tomcat-7.0.82-src.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=57715ad775f0258234eaa00a2d856057
diff --git a/metadata/md5-cache/www-servers/tomcat-7.0.84 b/metadata/md5-cache/www-servers/tomcat-7.0.84
index 2bbfea09fca1..4aefea3d4e98 100644
--- a/metadata/md5-cache/www-servers/tomcat-7.0.84
+++ b/metadata/md5-cache/www-servers/tomcat-7.0.84
@@ -10,5 +10,5 @@ RDEPEND=dev-java/eclipse-ecj:4.5 dev-java/tomcat-servlet-api:3.0 virtual/jre !<d
 RESTRICT=test
 SLOT=7
 SRC_URI=mirror://apache/tomcat/tomcat-7/v7.0.84/src/apache-tomcat-7.0.84-src.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=6f86bb1ae3c6a30ec86f965a6dd806fe
diff --git a/metadata/md5-cache/www-servers/tomcat-7.0.85 b/metadata/md5-cache/www-servers/tomcat-7.0.85
index a35c41f4322f..708259f5a785 100644
--- a/metadata/md5-cache/www-servers/tomcat-7.0.85
+++ b/metadata/md5-cache/www-servers/tomcat-7.0.85
@@ -10,5 +10,5 @@ RDEPEND=dev-java/eclipse-ecj:4.5 dev-java/tomcat-servlet-api:3.0 virtual/jre !<d
 RESTRICT=test
 SLOT=7
 SRC_URI=mirror://apache/tomcat/tomcat-7/v7.0.85/src/apache-tomcat-7.0.85-src.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=6f86bb1ae3c6a30ec86f965a6dd806fe
diff --git a/metadata/md5-cache/www-servers/tomcat-8.0.48 b/metadata/md5-cache/www-servers/tomcat-8.0.48
index 61e8fd0bfcc8..afdb11ea8683 100644
--- a/metadata/md5-cache/www-servers/tomcat-8.0.48
+++ b/metadata/md5-cache/www-servers/tomcat-8.0.48
@@ -10,5 +10,5 @@ RDEPEND=dev-java/eclipse-ecj:4.5 dev-java/tomcat-servlet-api:3.1 !<dev-java/tomc
 RESTRICT=test
 SLOT=8
 SRC_URI=mirror://apache/tomcat/tomcat-8/v8.0.48/src/apache-tomcat-8.0.48-src.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=90958e89aa26ff0154ee77cd3bd38d95
diff --git a/metadata/md5-cache/www-servers/tomcat-8.0.49 b/metadata/md5-cache/www-servers/tomcat-8.0.49
index 44d64eeb1c88..e097e5332804 100644
--- a/metadata/md5-cache/www-servers/tomcat-8.0.49
+++ b/metadata/md5-cache/www-servers/tomcat-8.0.49
@@ -10,5 +10,5 @@ RDEPEND=dev-java/eclipse-ecj:4.5 dev-java/tomcat-servlet-api:3.1 !<dev-java/tomc
 RESTRICT=test
 SLOT=8
 SRC_URI=mirror://apache/tomcat/tomcat-8/v8.0.49/src/apache-tomcat-8.0.49-src.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=b5ff04af41e71cd68aa684c7b5a9a6fd
diff --git a/metadata/md5-cache/www-servers/tomcat-8.0.50 b/metadata/md5-cache/www-servers/tomcat-8.0.50
index 9eda02353498..421d16dc4617 100644
--- a/metadata/md5-cache/www-servers/tomcat-8.0.50
+++ b/metadata/md5-cache/www-servers/tomcat-8.0.50
@@ -10,5 +10,5 @@ RDEPEND=dev-java/eclipse-ecj:4.5 dev-java/tomcat-servlet-api:3.1 !<dev-java/tomc
 RESTRICT=test
 SLOT=8
 SRC_URI=mirror://apache/tomcat/tomcat-8/v8.0.50/src/apache-tomcat-8.0.50-src.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=b5ff04af41e71cd68aa684c7b5a9a6fd
diff --git a/metadata/md5-cache/www-servers/tomcat-8.5.24 b/metadata/md5-cache/www-servers/tomcat-8.5.24
index 54d602aef0aa..6007828e398f 100644
--- a/metadata/md5-cache/www-servers/tomcat-8.5.24
+++ b/metadata/md5-cache/www-servers/tomcat-8.5.24
@@ -10,5 +10,5 @@ RDEPEND=dev-java/eclipse-ecj:4.5 >=dev-java/tomcat-servlet-api-8.5:3.1 !<dev-jav
 RESTRICT=test
 SLOT=8.5
 SRC_URI=mirror://apache/tomcat/tomcat-8/v8.5.24/src/apache-tomcat-8.5.24-src.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=9786f3dbd3756eec4a29b3ba69628786
diff --git a/metadata/md5-cache/www-servers/tomcat-8.5.27 b/metadata/md5-cache/www-servers/tomcat-8.5.27
index e1ad6f6d74b6..719346114471 100644
--- a/metadata/md5-cache/www-servers/tomcat-8.5.27
+++ b/metadata/md5-cache/www-servers/tomcat-8.5.27
@@ -10,5 +10,5 @@ RDEPEND=dev-java/eclipse-ecj:4.5 >=dev-java/tomcat-servlet-api-8.5:3.1 !<dev-jav
 RESTRICT=test
 SLOT=8.5
 SRC_URI=mirror://apache/tomcat/tomcat-8/v8.5.27/src/apache-tomcat-8.5.27-src.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=76639ca490750e292ad6e5d78bde7524
diff --git a/metadata/md5-cache/www-servers/tomcat-8.5.28 b/metadata/md5-cache/www-servers/tomcat-8.5.28
index 93c5b9d2d381..e229417157ab 100644
--- a/metadata/md5-cache/www-servers/tomcat-8.5.28
+++ b/metadata/md5-cache/www-servers/tomcat-8.5.28
@@ -10,5 +10,5 @@ RDEPEND=dev-java/eclipse-ecj:4.5 >=dev-java/tomcat-servlet-api-8.5:3.1 !<dev-jav
 RESTRICT=test
 SLOT=8.5
 SRC_URI=mirror://apache/tomcat/tomcat-8/v8.5.28/src/apache-tomcat-8.5.28-src.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=76639ca490750e292ad6e5d78bde7524
diff --git a/metadata/md5-cache/www-servers/tomcat-9.0.4 b/metadata/md5-cache/www-servers/tomcat-9.0.4
index 958a62fe2495..de4d29e4868f 100644
--- a/metadata/md5-cache/www-servers/tomcat-9.0.4
+++ b/metadata/md5-cache/www-servers/tomcat-9.0.4
@@ -10,5 +10,5 @@ RDEPEND=dev-java/eclipse-ecj:4.5 =dev-java/tomcat-servlet-api-9.0.4:4.0 !<dev-ja
 RESTRICT=test
 SLOT=9
 SRC_URI=mirror://apache/tomcat/tomcat-9/v9.0.4/src/apache-tomcat-9.0.4-src.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=45f8df0161acd92cbf04cabccb225681
diff --git a/metadata/md5-cache/www-servers/tomcat-9.0.5 b/metadata/md5-cache/www-servers/tomcat-9.0.5
index 141f653c5487..cd96d830ef6e 100644
--- a/metadata/md5-cache/www-servers/tomcat-9.0.5
+++ b/metadata/md5-cache/www-servers/tomcat-9.0.5
@@ -10,5 +10,5 @@ RDEPEND=dev-java/eclipse-ecj:4.5 =dev-java/tomcat-servlet-api-9.0.5:4.0 !<dev-ja
 RESTRICT=test
 SLOT=9
 SRC_URI=mirror://apache/tomcat/tomcat-9/v9.0.5/src/apache-tomcat-9.0.5-src.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=45f8df0161acd92cbf04cabccb225681
diff --git a/metadata/md5-cache/x11-base/Manifest.gz b/metadata/md5-cache/x11-base/Manifest.gz
index 44a9ca2f8960..e151975b8311 100644
--- a/metadata/md5-cache/x11-base/Manifest.gz
+++ b/metadata/md5-cache/x11-base/Manifest.gz
diff --git a/metadata/md5-cache/x11-base/xorg-proto-2018.4 b/metadata/md5-cache/x11-base/xorg-proto-2018.4
index 9e43dc3c192c..59cb12b7cf60 100644
--- a/metadata/md5-cache/x11-base/xorg-proto-2018.4
+++ b/metadata/md5-cache/x11-base/xorg-proto-2018.4
@@ -3,10 +3,10 @@ DEPEND=>=dev-util/meson-0.40.0 >=dev-util/ninja-1.7.2
 DESCRIPTION=X.Org combined protocol headers
 EAPI=6
 HOMEPAGE=https://cgit.freedesktop.org/xorg/proto/xorgproto/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x64-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x64-solaris
 LICENSE=MIT
 RDEPEND=!<x11-proto/bigreqsproto-1.1.2-r1 !<x11-proto/compositeproto-0.4.2-r2 !<x11-proto/damageproto-1.2.1-r2 !<x11-proto/dmxproto-2.3.1-r2 !<x11-proto/dri2proto-2.8-r2 !<x11-proto/dri3proto-1.0-r1 !<x11-proto/fixesproto-5.0-r2 !<x11-proto/fontsproto-2.1.3-r1 !<x11-proto/glproto-1.4.17-r2 !<x11-proto/inputproto-2.3.2-r1 !<x11-proto/kbproto-1.0.7-r1 !<x11-proto/presentproto-1.1-r1 !<x11-proto/randrproto-1.5.0-r1 !<x11-proto/recordproto-1.14.2-r2 !<x11-proto/renderproto-0.11.1-r2 !<x11-proto/resourceproto-1.2.0-r1 !<x11-proto/scrnsaverproto-1.2.2-r2 !<x11-proto/trapproto-3.4.3-r1 !<x11-proto/videoproto-2.3.3-r1 !<x11-proto/xcmiscproto-1.2.2-r1 !<x11-proto/xextproto-7.3.0-r1 !<x11-proto/xf86bigfontproto-1.2.0-r2 !<x11-proto/xf86dgaproto-2.1-r3 !<x11-proto/xf86driproto-2.1.1-r2 !<x11-proto/xf86miscproto-0.9.3-r1 !<x11-proto/xf86vidmodeproto-2.3.1-r2 !<x11-proto/xineramaproto-1.2.1-r2 !<x11-proto/xproto-7.0.31-r1 !x11-proto/fontcacheproto !x11-proto/xf86rushproto
 SLOT=0
 SRC_URI=https://xorg.freedesktop.org/archive/individual/proto/xorgproto-2018.4.tar.gz
 _eclasses_=meson	f8e09b2b2ac1e9bb0bd374b6ad77a90d	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=f0f60383609103cd1592ad503a29d379
+_md5_=3a1524f104fa8cc456956147c9716cb9
diff --git a/metadata/md5-cache/x11-libs/Manifest.gz b/metadata/md5-cache/x11-libs/Manifest.gz
index bb73b68331b8..b241a718ee6b 100644
--- a/metadata/md5-cache/x11-libs/Manifest.gz
+++ b/metadata/md5-cache/x11-libs/Manifest.gz
diff --git a/metadata/md5-cache/x11-libs/gksu-2.0.2-r1 b/metadata/md5-cache/x11-libs/gksu-2.0.2-r1
deleted file mode 100644
index 3157646eaae7..000000000000
--- a/metadata/md5-cache/x11-libs/gksu-2.0.2-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=x11-libs/libgksu-2.0.8 >=x11-libs/gtk+-2.4:2 >=gnome-base/gconf-2 gnome? ( >=gnome-base/nautilus-2 x11-terms/gnome-terminal ) dev-util/intltool virtual/pkgconfig doc? ( dev-util/gtk-doc ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1: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 >=sys-apps/sed-4
-DESCRIPTION=A gtk+ frontend for libgksu
-EAPI=4
-HOMEPAGE=http://www.nongnu.org/gksu/
-IUSE=doc gnome
-KEYWORDS=alpha amd64 arm ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=>=x11-libs/libgksu-2.0.8 >=x11-libs/gtk+-2.4:2 >=gnome-base/gconf-2 gnome? ( >=gnome-base/nautilus-2 x11-terms/gnome-terminal )
-SLOT=0
-SRC_URI=http://people.debian.org/~kov/gksu/gksu-2.0.2.tar.gz
-_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=83440971b51ac3a438230e6222a9d657
diff --git a/metadata/md5-cache/x11-libs/libast-0.7-r1 b/metadata/md5-cache/x11-libs/libast-0.7-r1
index 48a4b4520285..20b0cbc20ab6 100644
--- a/metadata/md5-cache/x11-libs/libast-0.7-r1
+++ b/metadata/md5-cache/x11-libs/libast-0.7-r1
@@ -4,9 +4,9 @@ DESCRIPTION=LIBrary of Assorted Spiffy Things
 EAPI=6
 HOMEPAGE=http://www.eterm.org/download/
 IUSE=imlib cpu_flags_x86_mmx pcre
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=GPL-2
 RDEPEND=!sci-astronomy/ast x11-libs/libXt x11-proto/xproto x11-libs/libICE x11-libs/libSM x11-libs/libX11 media-libs/freetype imlib? ( media-libs/imlib2 ) pcre? ( dev-libs/libpcre )
 SLOT=0
 SRC_URI=http://www.eterm.org/download/libast-0.7.tar.gz
-_md5_=20bf00ac7b0ca37c27cd6e3af66ad162
+_md5_=20841c3133e36a53a591d0566173dcc7
diff --git a/metadata/md5-cache/x11-libs/neXtaw-0.15.1-r2 b/metadata/md5-cache/x11-libs/neXtaw-0.15.1-r2
index 0809bbdc0232..361f1f6c1691 100644
--- a/metadata/md5-cache/x11-libs/neXtaw-0.15.1-r2
+++ b/metadata/md5-cache/x11-libs/neXtaw-0.15.1-r2
@@ -3,9 +3,9 @@ DEPEND=x11-libs/libICE x11-libs/libXext x11-libs/libXt x11-libs/libX11 x11-libs/
 DESCRIPTION=Athena Widgets with N*XTSTEP appearance
 EAPI=6
 HOMEPAGE=http://siag.nu/neXtaw/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
 LICENSE=BSD
 RDEPEND=x11-libs/libICE x11-libs/libXext x11-libs/libXt x11-libs/libX11 x11-libs/libSM x11-libs/libXmu x11-libs/libxkbfile x11-libs/libXpm x11-proto/xextproto x11-proto/xproto !<x11-libs/neXtaw-0.15.1-r1
 SLOT=0
 SRC_URI=http://siag.nu/pub/neXtaw/neXtaw-0.15.1.tar.gz
-_md5_=423e7b1d2dccb5dfcc75ef95dd034ad7
+_md5_=3440ad5b80d834936fcddda7b50e58c3
diff --git a/metadata/md5-cache/x11-libs/wxGTK-3.0.2.0-r4 b/metadata/md5-cache/x11-libs/wxGTK-3.0.2.0-r4
deleted file mode 100644
index 5cb893e2cea3..000000000000
--- a/metadata/md5-cache/x11-libs/wxGTK-3.0.2.0-r4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=dev-libs/expat[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(-)?] sdl? ( media-libs/libsdl[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(-)?] ) X? ( >=dev-libs/glib-2.22: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/libpng: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-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(-)?] virtual/jpeg: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(-)?] >=x11-libs/gtk+-2.18: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/gdk-pixbuf[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/libSM[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/libXxf86vm[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/pango[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(-)?] libnotify? ( x11-libs/libnotify[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(-)?] ) opengl? ( virtual/opengl[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(-)?] ) tiff? ( media-libs/tiff: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(-)?] ) ) aqua? ( x11-libs/gtk+:2[aqua=,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(-)?] virtual/jpeg: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(-)?] tiff? ( media-libs/tiff: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(-)?] ) ) 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(-)?] opengl? ( virtual/glu[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(-)?] ) X? ( x11-proto/xproto[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-proto/xineramaproto[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-proto/xf86vidmodeproto[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit
-EAPI=5
-HOMEPAGE=https://wxwidgets.org/
-IUSE=+X aqua doc debug libnotify opengl sdl tiff 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=arm
-LICENSE=wxWinLL-3 GPL-2 doc? ( wxWinFDL-3 )
-PDEPEND=>=app-eselect/eselect-wxwidgets-20131230
-RDEPEND=dev-libs/expat[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(-)?] sdl? ( media-libs/libsdl[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(-)?] ) X? ( >=dev-libs/glib-2.22: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/libpng: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-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(-)?] virtual/jpeg: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(-)?] >=x11-libs/gtk+-2.18: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/gdk-pixbuf[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/libSM[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/libXxf86vm[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/pango[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(-)?] libnotify? ( x11-libs/libnotify[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(-)?] ) opengl? ( virtual/opengl[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(-)?] ) tiff? ( media-libs/tiff: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(-)?] ) ) aqua? ( x11-libs/gtk+:2[aqua=,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(-)?] virtual/jpeg: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(-)?] tiff? ( media-libs/tiff: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=3.0
-SRC_URI=mirror://sourceforge/wxpython/wxPython-src-3.0.2.0.tar.bz2 doc? ( mirror://sourceforge/wxpython/wxPython-docs-3.0.2.0.tar.bz2 )
-_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d6d939df95746068c87d36a37f778404
diff --git a/metadata/md5-cache/x11-misc/Manifest.gz b/metadata/md5-cache/x11-misc/Manifest.gz
index fb7b05ff5cee..7d596537111e 100644
--- a/metadata/md5-cache/x11-misc/Manifest.gz
+++ b/metadata/md5-cache/x11-misc/Manifest.gz
diff --git a/metadata/md5-cache/x11-misc/gigolo-0.4.2 b/metadata/md5-cache/x11-misc/gigolo-0.4.2
deleted file mode 100644
index 612832f6c603..000000000000
--- a/metadata/md5-cache/x11-misc/gigolo-0.4.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=>=dev-libs/glib-2.16 >=x11-libs/gtk+-2.12:2 dev-util/intltool virtual/pkgconfig >=app-portage/elt-patches-20170422 >=sys-apps/sed-4
-DESCRIPTION=a frontend to easily manage connections to remote filesystems using GIO/GVfs
-EAPI=5
-HOMEPAGE=http://www.uvena.de/gigolo/ https://goodies.xfce.org/projects/applications/gigolo
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.16 >=x11-libs/gtk+-2.12:2
-SLOT=0
-SRC_URI=mirror://xfce/src/apps/gigolo/0.4/gigolo-0.4.2.tar.bz2
-_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25	xfconf	25bb7fe99d6e58851633dc43d429c5ae
-_md5_=9ead598a073ce6a81ed1aa8e1b5b76ef
diff --git a/metadata/md5-cache/x11-misc/rodent-5.3.16.3 b/metadata/md5-cache/x11-misc/rodent-5.3.16.3
deleted file mode 100644
index 1d4339760764..000000000000
--- a/metadata/md5-cache/x11-misc/rodent-5.3.16.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=prepare setup
-DEPEND=>=x11-libs/librfm-5.3.16.3 dev-util/intltool virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=A fast, small and powerful file manager and graphical shell
-EAPI=5
-HOMEPAGE=http://xffm.org/
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=>=x11-libs/librfm-5.3.16.3
-SLOT=0
-SRC_URI=mirror://sourceforge/xffm/5.3.16.3/rodent-5.3.16.3.tar.bz2
-_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=86ef4f539f36246b8c34db23a8dd71ed
diff --git a/metadata/md5-cache/x11-proto/Manifest.gz b/metadata/md5-cache/x11-proto/Manifest.gz
index 0ff5a81551a0..c95de7874e23 100644
--- a/metadata/md5-cache/x11-proto/Manifest.gz
+++ b/metadata/md5-cache/x11-proto/Manifest.gz
diff --git a/metadata/md5-cache/x11-proto/bigreqsproto-1.1.2-r1 b/metadata/md5-cache/x11-proto/bigreqsproto-1.1.2-r1
index 886da1550b35..aebb78cb2df5 100644
--- a/metadata/md5-cache/x11-proto/bigreqsproto-1.1.2-r1
+++ b/metadata/md5-cache/x11-proto/bigreqsproto-1.1.2-r1
@@ -3,9 +3,9 @@ DESCRIPTION=X.Org BigReqs protocol headers
 EAPI=6
 HOMEPAGE=https://www.x.org/wiki/
 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=~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-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 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=x11-base/xorg-proto
 SLOT=0
 _eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=a029112574034074e6c81504171dbd7f
+_md5_=33c0d07331a6d4381f33a481c8d2f334
diff --git a/metadata/md5-cache/x11-proto/compositeproto-0.4.2-r2 b/metadata/md5-cache/x11-proto/compositeproto-0.4.2-r2
index 6eefcab12c1f..578582847b83 100644
--- a/metadata/md5-cache/x11-proto/compositeproto-0.4.2-r2
+++ b/metadata/md5-cache/x11-proto/compositeproto-0.4.2-r2
@@ -3,9 +3,9 @@ DESCRIPTION=X.Org Composite protocol headers
 EAPI=6
 HOMEPAGE=https://www.x.org/wiki/
 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=~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-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 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=x11-base/xorg-proto
 SLOT=0
 _eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=95375432cb6abb04115b7f0ebf410b62
+_md5_=848c73e534b09f9ac5f119c209083f23
diff --git a/metadata/md5-cache/x11-proto/damageproto-1.2.1-r2 b/metadata/md5-cache/x11-proto/damageproto-1.2.1-r2
index 623ecd2b7248..a9b5b27d675f 100644
--- a/metadata/md5-cache/x11-proto/damageproto-1.2.1-r2
+++ b/metadata/md5-cache/x11-proto/damageproto-1.2.1-r2
@@ -3,9 +3,9 @@ DESCRIPTION=X.Org Damage protocol headers
 EAPI=6
 HOMEPAGE=https://www.x.org/wiki/
 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=~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-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 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=x11-base/xorg-proto
 SLOT=0
 _eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=952217d98a7a9d84ce65a696a488c6ef
+_md5_=d8136dd96291ede53d28fa44bc671584
diff --git a/metadata/md5-cache/x11-proto/dmxproto-2.3.1-r2 b/metadata/md5-cache/x11-proto/dmxproto-2.3.1-r2
index 65e1e62adc8e..2054c1f42ad6 100644
--- a/metadata/md5-cache/x11-proto/dmxproto-2.3.1-r2
+++ b/metadata/md5-cache/x11-proto/dmxproto-2.3.1-r2
@@ -3,9 +3,9 @@ DESCRIPTION=X.Org DMX protocol headers
 EAPI=6
 HOMEPAGE=https://www.x.org/wiki/
 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=~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-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 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=x11-base/xorg-proto
 SLOT=0
 _eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=6912d09bf281d7b2f9c885ab57f978f7
+_md5_=a32f95fc36b25b6a8f3acb4bed682ddb
diff --git a/metadata/md5-cache/x11-proto/dri2proto-2.8-r2 b/metadata/md5-cache/x11-proto/dri2proto-2.8-r2
index ece3b1bd871d..9b61bc3a3027 100644
--- a/metadata/md5-cache/x11-proto/dri2proto-2.8-r2
+++ b/metadata/md5-cache/x11-proto/dri2proto-2.8-r2
@@ -3,9 +3,9 @@ DESCRIPTION=X.Org DRI2 protocol headers
 EAPI=6
 HOMEPAGE=https://www.x.org/wiki/
 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=~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-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 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=x11-base/xorg-proto
 SLOT=0
 _eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=0fd7fb05552d09846cf88cfb7d78785b
+_md5_=5370cb39584e96d45a18872b017ddb58
diff --git a/metadata/md5-cache/x11-proto/dri3proto-1.0-r1 b/metadata/md5-cache/x11-proto/dri3proto-1.0-r1
index bb4a0fe3e5ab..ecf26125569a 100644
--- a/metadata/md5-cache/x11-proto/dri3proto-1.0-r1
+++ b/metadata/md5-cache/x11-proto/dri3proto-1.0-r1
@@ -3,9 +3,9 @@ DESCRIPTION=X.Org DRI3 protocol specification and Xlib/Xserver headers
 EAPI=6
 HOMEPAGE=https://www.x.org/wiki/
 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=~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-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 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=x11-base/xorg-proto
 SLOT=0
 _eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=43bb2dc6bbd656449e0d91bda7d4e8ee
+_md5_=1c434519ea189f5b04d77bd80bea6e99
diff --git a/metadata/md5-cache/x11-proto/fixesproto-5.0-r2 b/metadata/md5-cache/x11-proto/fixesproto-5.0-r2
index 45b3a4994f3b..578f6da0115b 100644
--- a/metadata/md5-cache/x11-proto/fixesproto-5.0-r2
+++ b/metadata/md5-cache/x11-proto/fixesproto-5.0-r2
@@ -3,9 +3,9 @@ DESCRIPTION=X.Org Fixes protocol headers
 EAPI=6
 HOMEPAGE=https://www.x.org/wiki/
 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=~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=MIT
 RDEPEND=x11-base/xorg-proto
 SLOT=0
 _eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=69a730d5c72f7e0f3ee6e4c0150fcf86
+_md5_=7b528502aef2a555639a20c4f9fd5108
diff --git a/metadata/md5-cache/x11-proto/fontsproto-2.1.3-r1 b/metadata/md5-cache/x11-proto/fontsproto-2.1.3-r1
index 127c0f5826b7..08eada6b635f 100644
--- a/metadata/md5-cache/x11-proto/fontsproto-2.1.3-r1
+++ b/metadata/md5-cache/x11-proto/fontsproto-2.1.3-r1
@@ -3,9 +3,9 @@ DESCRIPTION=X.Org Fonts protocol headers
 EAPI=6
 HOMEPAGE=https://www.x.org/wiki/
 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=~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=MIT
 RDEPEND=x11-base/xorg-proto
 SLOT=0
 _eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=1da62f86c236e803fcd254984484b84c
+_md5_=b08db2887c5275da2c7a1a5bd7243ef0
diff --git a/metadata/md5-cache/x11-proto/glproto-1.4.17-r2 b/metadata/md5-cache/x11-proto/glproto-1.4.17-r2
index 03d009744c6f..416a185fae9c 100644
--- a/metadata/md5-cache/x11-proto/glproto-1.4.17-r2
+++ b/metadata/md5-cache/x11-proto/glproto-1.4.17-r2
@@ -3,9 +3,9 @@ DESCRIPTION=X.Org GL protocol headers
 EAPI=6
 HOMEPAGE=https://www.x.org/wiki/
 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=~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=SGI-B-2.0
 RDEPEND=x11-base/xorg-proto
 SLOT=0
 _eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=cc9a3d391ed7dba82f583e596490118f
+_md5_=b3ac590032bfc4fec5d8b87ae8bb127e
diff --git a/metadata/md5-cache/x11-proto/inputproto-2.3.2-r1 b/metadata/md5-cache/x11-proto/inputproto-2.3.2-r1
index 835f1b2745a0..f31f15198aa7 100644
--- a/metadata/md5-cache/x11-proto/inputproto-2.3.2-r1
+++ b/metadata/md5-cache/x11-proto/inputproto-2.3.2-r1
@@ -3,9 +3,9 @@ DESCRIPTION=X.Org Input protocol headers
 EAPI=6
 HOMEPAGE=https://www.x.org/wiki/
 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=~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=MIT
 RDEPEND=x11-base/xorg-proto
 SLOT=0
 _eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=d6e0dea5aaf6d7dafa6c422e7d77aa7a
+_md5_=8b26b472d720cef302324ee00a4fe63f
diff --git a/metadata/md5-cache/x11-proto/kbproto-1.0.7-r1 b/metadata/md5-cache/x11-proto/kbproto-1.0.7-r1
index b2c6fbcfccad..b2cdbfa42d58 100644
--- a/metadata/md5-cache/x11-proto/kbproto-1.0.7-r1
+++ b/metadata/md5-cache/x11-proto/kbproto-1.0.7-r1
@@ -3,9 +3,9 @@ DESCRIPTION=X.Org KB protocol headers
 EAPI=6
 HOMEPAGE=https://www.x.org/wiki/
 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=~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=MIT
 RDEPEND=x11-base/xorg-proto
 SLOT=0
 _eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=aa18b12919068836501a1e47b134e3ab
+_md5_=cb3b55ff35ce318f81d23e1bcb8fb285
diff --git a/metadata/md5-cache/x11-proto/presentproto-1.1-r1 b/metadata/md5-cache/x11-proto/presentproto-1.1-r1
index 61cdb9b933d5..5ddb5f1bb9b1 100644
--- a/metadata/md5-cache/x11-proto/presentproto-1.1-r1
+++ b/metadata/md5-cache/x11-proto/presentproto-1.1-r1
@@ -3,9 +3,9 @@ DESCRIPTION=X.Org Present protocol specification and Xlib/Xserver headers
 EAPI=6
 HOMEPAGE=https://www.x.org/wiki/
 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=~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-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 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=x11-base/xorg-proto
 SLOT=0
 _eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=8827f43744bd0feab6e5e01e02c18217
+_md5_=502f540e00b0a376ed16dddcb3532f54
diff --git a/metadata/md5-cache/x11-proto/randrproto-1.5.0-r1 b/metadata/md5-cache/x11-proto/randrproto-1.5.0-r1
index 16a8acea99d4..344b5cfd001f 100644
--- a/metadata/md5-cache/x11-proto/randrproto-1.5.0-r1
+++ b/metadata/md5-cache/x11-proto/randrproto-1.5.0-r1
@@ -3,9 +3,9 @@ DESCRIPTION=X.Org Randr protocol headers
 EAPI=6
 HOMEPAGE=https://www.x.org/wiki/
 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=~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=MIT
 RDEPEND=x11-base/xorg-proto
 SLOT=0
 _eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=09fc6c1c65f7f01f4b972d1bbbf8f0ba
+_md5_=2931ac601543a83b2fe9f2107bd82c52
diff --git a/metadata/md5-cache/x11-proto/recordproto-1.14.2-r2 b/metadata/md5-cache/x11-proto/recordproto-1.14.2-r2
index b812183c002e..2692f91d0176 100644
--- a/metadata/md5-cache/x11-proto/recordproto-1.14.2-r2
+++ b/metadata/md5-cache/x11-proto/recordproto-1.14.2-r2
@@ -3,9 +3,9 @@ DESCRIPTION=X.Org Record protocol headers
 EAPI=6
 HOMEPAGE=https://www.x.org/wiki/
 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=~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=MIT
 RDEPEND=x11-base/xorg-proto
 SLOT=0
 _eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=cd3306b00c1917115f8510e5ff0ca75c
+_md5_=6fae207c0671dc7d1e16d47bac104fbf
diff --git a/metadata/md5-cache/x11-proto/renderproto-0.11.1-r2 b/metadata/md5-cache/x11-proto/renderproto-0.11.1-r2
index 8d13077f68c4..662d974935b7 100644
--- a/metadata/md5-cache/x11-proto/renderproto-0.11.1-r2
+++ b/metadata/md5-cache/x11-proto/renderproto-0.11.1-r2
@@ -3,9 +3,9 @@ DESCRIPTION=X.Org Render protocol headers
 EAPI=6
 HOMEPAGE=https://www.x.org/wiki/
 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=~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=MIT
 RDEPEND=x11-base/xorg-proto
 SLOT=0
 _eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=3c88694aae8ef3483fc5e39e1042779e
+_md5_=6323f073ef394836377ac96c72a9c839
diff --git a/metadata/md5-cache/x11-proto/resourceproto-1.2.0-r1 b/metadata/md5-cache/x11-proto/resourceproto-1.2.0-r1
index 5fbfb01f39e5..38f27987179d 100644
--- a/metadata/md5-cache/x11-proto/resourceproto-1.2.0-r1
+++ b/metadata/md5-cache/x11-proto/resourceproto-1.2.0-r1
@@ -3,9 +3,9 @@ DESCRIPTION=X.Org Resource protocol headers
 EAPI=6
 HOMEPAGE=https://www.x.org/wiki/
 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=~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-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 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=x11-base/xorg-proto
 SLOT=0
 _eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=08a71895a2c94e1004f841532a5da098
+_md5_=a498ff79e7a05985c80e47e462fb1a64
diff --git a/metadata/md5-cache/x11-proto/scrnsaverproto-1.2.2-r2 b/metadata/md5-cache/x11-proto/scrnsaverproto-1.2.2-r2
index 9ce0202a6e7d..a3befc0beee6 100644
--- a/metadata/md5-cache/x11-proto/scrnsaverproto-1.2.2-r2
+++ b/metadata/md5-cache/x11-proto/scrnsaverproto-1.2.2-r2
@@ -3,9 +3,9 @@ DESCRIPTION=X.Org ScrnSaver protocol headers
 EAPI=6
 HOMEPAGE=https://www.x.org/wiki/
 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=~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-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 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=x11-base/xorg-proto
 SLOT=0
 _eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=017be4b1b130a85e0085550d6841e2e0
+_md5_=2671e2cc7e92fb6ca84ef22ddf9dc05e
diff --git a/metadata/md5-cache/x11-proto/trapproto-3.4.3-r1 b/metadata/md5-cache/x11-proto/trapproto-3.4.3-r1
index 9bcf95c685df..54578a4640b6 100644
--- a/metadata/md5-cache/x11-proto/trapproto-3.4.3-r1
+++ b/metadata/md5-cache/x11-proto/trapproto-3.4.3-r1
@@ -3,9 +3,9 @@ DESCRIPTION=X.Org Trap protocol headers
 EAPI=6
 HOMEPAGE=https://www.x.org/wiki/
 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=~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=MIT
 RDEPEND=x11-base/xorg-proto
 SLOT=0
 _eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=dde4e9e32fa812aab3228ba0b829ed08
+_md5_=926b19f969f3b6d33fff344c8b975650
diff --git a/metadata/md5-cache/x11-proto/videoproto-2.3.3-r1 b/metadata/md5-cache/x11-proto/videoproto-2.3.3-r1
index 742565f6ad58..2f4ab72c92e5 100644
--- a/metadata/md5-cache/x11-proto/videoproto-2.3.3-r1
+++ b/metadata/md5-cache/x11-proto/videoproto-2.3.3-r1
@@ -3,9 +3,9 @@ DESCRIPTION=X.Org Video protocol headers
 EAPI=6
 HOMEPAGE=https://www.x.org/wiki/
 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=~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=x11-base/xorg-proto
 SLOT=0
 _eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=81a427963549fcbedc19de6b08af8a89
+_md5_=543ba6c41576fcd136b075c1042f5de2
diff --git a/metadata/md5-cache/x11-proto/xcb-proto-1.13 b/metadata/md5-cache/x11-proto/xcb-proto-1.13
index a67a60a02c2b..fc137878dc71 100644
--- a/metadata/md5-cache/x11-proto/xcb-proto-1.13
+++ b/metadata/md5-cache/x11-proto/xcb-proto-1.13
@@ -4,11 +4,11 @@ DESCRIPTION=X C-language Bindings protocol headers
 EAPI=5
 HOMEPAGE=https://xcb.freedesktop.org/
 IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 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 ) 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(-)] abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://xcb.freedesktop.org/dist/xcb-proto-1.13.tar.bz2
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	autotools-multilib	f4848d9634439c7203cb7dd3b9650fff	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	234cf45e2565fab7c0dff5bd8d1f9177
-_md5_=e8a421940e11f2eb6665c071f0defb37
+_md5_=e11a2895aedd60cbdaebc6785532afc9
diff --git a/metadata/md5-cache/x11-proto/xcmiscproto-1.2.2-r1 b/metadata/md5-cache/x11-proto/xcmiscproto-1.2.2-r1
index b75f34416c39..7914fe4a3012 100644
--- a/metadata/md5-cache/x11-proto/xcmiscproto-1.2.2-r1
+++ b/metadata/md5-cache/x11-proto/xcmiscproto-1.2.2-r1
@@ -3,9 +3,9 @@ DESCRIPTION=X.Org XCMisc protocol headers
 EAPI=6
 HOMEPAGE=https://www.x.org/wiki/
 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=~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-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 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=x11-base/xorg-proto
 SLOT=0
 _eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=eb88f486f9a4d5a3a9b0e093033dfde6
+_md5_=e176419b871d0a6395f9a76c17bae9b1
diff --git a/metadata/md5-cache/x11-proto/xextproto-7.3.0-r1 b/metadata/md5-cache/x11-proto/xextproto-7.3.0-r1
index da6d8db87dc4..a0267f0f50f9 100644
--- a/metadata/md5-cache/x11-proto/xextproto-7.3.0-r1
+++ b/metadata/md5-cache/x11-proto/xextproto-7.3.0-r1
@@ -3,9 +3,9 @@ DESCRIPTION=X.Org XExt protocol headers
 EAPI=6
 HOMEPAGE=https://www.x.org/wiki/
 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=~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=MIT
 RDEPEND=x11-base/xorg-proto
 SLOT=0
 _eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=f4a2de8ac4f8ecf0d9e8a1c05439884c
+_md5_=545fcb6c36415aab58afc2916c11babf
diff --git a/metadata/md5-cache/x11-proto/xf86bigfontproto-1.2.0-r2 b/metadata/md5-cache/x11-proto/xf86bigfontproto-1.2.0-r2
index 8e2acf1fc101..b95f2aa5b135 100644
--- a/metadata/md5-cache/x11-proto/xf86bigfontproto-1.2.0-r2
+++ b/metadata/md5-cache/x11-proto/xf86bigfontproto-1.2.0-r2
@@ -3,9 +3,9 @@ DESCRIPTION=X.Org XF86BigFont protocol headers
 EAPI=6
 HOMEPAGE=https://www.x.org/wiki/
 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=~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=x11-base/xorg-proto
 SLOT=0
 _eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=721f301e2ee8d8d9e34ff16d842aba88
+_md5_=cc030752f1ec258f961de632eaa45dd6
diff --git a/metadata/md5-cache/x11-proto/xf86dgaproto-2.1-r3 b/metadata/md5-cache/x11-proto/xf86dgaproto-2.1-r3
index 73a40896083d..f6fb3a2493d3 100644
--- a/metadata/md5-cache/x11-proto/xf86dgaproto-2.1-r3
+++ b/metadata/md5-cache/x11-proto/xf86dgaproto-2.1-r3
@@ -3,9 +3,9 @@ DESCRIPTION=X.Org XF86DGA protocol headers
 EAPI=6
 HOMEPAGE=https://www.x.org/wiki/
 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=~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-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 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=x11-base/xorg-proto
 SLOT=0
 _eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=afeb708cdf8fe57447f63f8d0c2cc3fd
+_md5_=d92c02ca76713a94d5ad8a184a94cefd
diff --git a/metadata/md5-cache/x11-proto/xf86driproto-2.1.1-r2 b/metadata/md5-cache/x11-proto/xf86driproto-2.1.1-r2
index 22fbafef9941..1643c0e710ce 100644
--- a/metadata/md5-cache/x11-proto/xf86driproto-2.1.1-r2
+++ b/metadata/md5-cache/x11-proto/xf86driproto-2.1.1-r2
@@ -3,9 +3,9 @@ DESCRIPTION=X.Org XF86DRI protocol headers
 EAPI=6
 HOMEPAGE=https://www.x.org/wiki/
 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=~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-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 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=x11-base/xorg-proto
 SLOT=0
 _eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=737e571c19c5624a361dd89d47a71232
+_md5_=7be66cda1b52b36d865f9c821d0e0029
diff --git a/metadata/md5-cache/x11-proto/xf86miscproto-0.9.3-r1 b/metadata/md5-cache/x11-proto/xf86miscproto-0.9.3-r1
index 1a090f23c560..e2499919f120 100644
--- a/metadata/md5-cache/x11-proto/xf86miscproto-0.9.3-r1
+++ b/metadata/md5-cache/x11-proto/xf86miscproto-0.9.3-r1
@@ -3,9 +3,9 @@ DESCRIPTION=X.Org XF86Misc protocol headers
 EAPI=6
 HOMEPAGE=https://www.x.org/wiki/
 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=~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=MIT
 RDEPEND=x11-base/xorg-proto
 SLOT=0
 _eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=3e54e9b3cf34c2825c83c418a8037e88
+_md5_=7b0fc13198f1805c63d443c50a32dd42
diff --git a/metadata/md5-cache/x11-proto/xf86vidmodeproto-2.3.1-r2 b/metadata/md5-cache/x11-proto/xf86vidmodeproto-2.3.1-r2
index b947df205836..caf3f90e518a 100644
--- a/metadata/md5-cache/x11-proto/xf86vidmodeproto-2.3.1-r2
+++ b/metadata/md5-cache/x11-proto/xf86vidmodeproto-2.3.1-r2
@@ -3,9 +3,9 @@ DESCRIPTION=X.Org XF86VidMode protocol headers
 EAPI=6
 HOMEPAGE=https://www.x.org/wiki/
 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=~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=MIT
 RDEPEND=x11-base/xorg-proto
 SLOT=0
 _eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=f8a4a9e3b8b9c115f29afdc1d685b15a
+_md5_=eaf22bdae74c5f37bb86fef82017dfeb
diff --git a/metadata/md5-cache/x11-proto/xineramaproto-1.2.1-r2 b/metadata/md5-cache/x11-proto/xineramaproto-1.2.1-r2
index d399dbb5c9f6..f9e0851d1637 100644
--- a/metadata/md5-cache/x11-proto/xineramaproto-1.2.1-r2
+++ b/metadata/md5-cache/x11-proto/xineramaproto-1.2.1-r2
@@ -3,9 +3,9 @@ DESCRIPTION=X.Org Xinerama protocol headers
 EAPI=6
 HOMEPAGE=https://www.x.org/wiki/
 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=~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-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 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=x11-base/xorg-proto
 SLOT=0
 _eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=db5e1cf8df416301f556b7a12d488ffd
+_md5_=283a5065ccffb5ef6981573da1bff603
diff --git a/metadata/md5-cache/x11-proto/xproto-7.0.31-r1 b/metadata/md5-cache/x11-proto/xproto-7.0.31-r1
index 312a12ce552d..8cd70c83ef51 100644
--- a/metadata/md5-cache/x11-proto/xproto-7.0.31-r1
+++ b/metadata/md5-cache/x11-proto/xproto-7.0.31-r1
@@ -3,9 +3,9 @@ DESCRIPTION=X.Org xproto protocol headers
 EAPI=6
 HOMEPAGE=https://www.x.org/wiki/
 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=~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=x11-base/xorg-proto
 SLOT=0
 _eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=02ff860f20bb7ec3bbd3d5992ad244c9
+_md5_=4f726f4a731a5fe04e5fbabca6da99d3
diff --git a/metadata/md5-cache/x11-terms/Manifest.gz b/metadata/md5-cache/x11-terms/Manifest.gz
index 759d8ef8b4f9..8baed5936476 100644
--- a/metadata/md5-cache/x11-terms/Manifest.gz
+++ b/metadata/md5-cache/x11-terms/Manifest.gz
diff --git a/metadata/md5-cache/x11-terms/xfce4-terminal-0.6.3 b/metadata/md5-cache/x11-terms/xfce4-terminal-0.6.3
deleted file mode 100644
index 57e6539c5347..000000000000
--- a/metadata/md5-cache/x11-terms/xfce4-terminal-0.6.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=>=dev-libs/glib-2.26 >=x11-libs/gtk+-2.24:2 x11-libs/libX11 >=x11-libs/vte-0.28:0 >=xfce-base/libxfce4ui-4.10 dev-libs/libxml2 dev-util/intltool sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170422 >=sys-apps/sed-4
-DESCRIPTION=A terminal emulator for the Xfce desktop environment
-EAPI=5
-HOMEPAGE=https://docs.xfce.org/apps/terminal/start
-IUSE=debug
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.26 >=x11-libs/gtk+-2.24:2 x11-libs/libX11 >=x11-libs/vte-0.28:0 >=xfce-base/libxfce4ui-4.10
-SLOT=0
-SRC_URI=mirror://xfce/src/apps/xfce4-terminal/0.6/xfce4-terminal-0.6.3.tar.bz2
-_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25	xfconf	25bb7fe99d6e58851633dc43d429c5ae
-_md5_=53ffb0a239673180acd19dfb7ecd245f
diff --git a/metadata/md5-cache/x11-terms/xfce4-terminal-0.8.5.1 b/metadata/md5-cache/x11-terms/xfce4-terminal-0.8.5.1
deleted file mode 100644
index 4cf1f5677617..000000000000
--- a/metadata/md5-cache/x11-terms/xfce4-terminal-0.8.5.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DEPEND=>=dev-libs/glib-2.32:2= >=x11-libs/gtk+-3.16:3= x11-libs/libX11:= >=x11-libs/vte-0.38:2.91= >=xfce-base/libxfce4ui-4.10:=[gtk3(+)] dev-libs/libxml2 dev-util/intltool sys-devel/gettext virtual/pkgconfig
-DESCRIPTION=A terminal emulator for the Xfce desktop environment
-EAPI=6
-HOMEPAGE=https://docs.xfce.org/apps/terminal/start
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.32:2= >=x11-libs/gtk+-3.16:3= x11-libs/libX11:= >=x11-libs/vte-0.38:2.91= >=xfce-base/libxfce4ui-4.10:=[gtk3(+)]
-SLOT=0
-SRC_URI=mirror://xfce/src/apps/xfce4-terminal/0.8/xfce4-terminal-0.8.5.1.tar.bz2
-_md5_=aaf578cd3b5a564daeea25ebe857ef34
diff --git a/metadata/md5-cache/x11-terms/xfce4-terminal-0.8.7.1 b/metadata/md5-cache/x11-terms/xfce4-terminal-0.8.7.1
deleted file mode 100644
index 87d64f3fbb9d..000000000000
--- a/metadata/md5-cache/x11-terms/xfce4-terminal-0.8.7.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure
-DEPEND=>=dev-libs/glib-2.32:2= >=x11-libs/gtk+-3.20.8:3= x11-libs/libX11:= >=x11-libs/vte-0.38:2.91= >=xfce-base/libxfce4ui-4.10:=[gtk3(+)] utempter? ( sys-libs/libutempter:= ) dev-libs/libxml2 dev-util/intltool sys-devel/gettext virtual/pkgconfig
-DESCRIPTION=A terminal emulator for the Xfce desktop environment
-EAPI=6
-HOMEPAGE=https://docs.xfce.org/apps/terminal/start
-IUSE=utempter
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.32:2= >=x11-libs/gtk+-3.20.8:3= x11-libs/libX11:= >=x11-libs/vte-0.38:2.91= >=xfce-base/libxfce4ui-4.10:=[gtk3(+)] utempter? ( sys-libs/libutempter:= )
-SLOT=0
-SRC_URI=mirror://xfce/src/apps/xfce4-terminal/0.8/xfce4-terminal-0.8.7.1.tar.bz2
-_eclasses_=eapi7-ver	ad64fd3dcf3a655ac44ecae6d0e5ffcc
-_md5_=0460e326f50b62230e9a4ff655ddb5a9
diff --git a/metadata/md5-cache/x11-themes/Manifest.gz b/metadata/md5-cache/x11-themes/Manifest.gz
index e1412ed1dc6c..7cebd329af46 100644
--- a/metadata/md5-cache/x11-themes/Manifest.gz
+++ b/metadata/md5-cache/x11-themes/Manifest.gz
diff --git a/metadata/md5-cache/x11-themes/elementary-xfce-icon-theme-0.8 b/metadata/md5-cache/x11-themes/elementary-xfce-icon-theme-0.8
deleted file mode 100644
index a09501ec267d..000000000000
--- a/metadata/md5-cache/x11-themes/elementary-xfce-icon-theme-0.8
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst
-DEPEND=>=sys-apps/sed-4
-DESCRIPTION=Elementary icons forked from upstream, extended and maintained for Xfce
-EAPI=6
-HOMEPAGE=https://github.com/shimmerproject/elementary-xfce
-KEYWORDS=~amd64 ~x86
-LICENSE=public-domain GPL-1 GPL-2 GPL-3
-SLOT=0
-SRC_URI=https://github.com/shimmerproject/elementary-xfce/archive/v0.8.tar.gz -> elementary-xfce-icon-theme-0.8.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=00834d8ab944032efe16ef9998c333a7
diff --git a/metadata/md5-cache/x11-themes/elementary-xfce-icon-theme-0.8_p20170710 b/metadata/md5-cache/x11-themes/elementary-xfce-icon-theme-0.8_p20170710
deleted file mode 100644
index de8ad9793b46..000000000000
--- a/metadata/md5-cache/x11-themes/elementary-xfce-icon-theme-0.8_p20170710
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst
-DEPEND=>=sys-apps/sed-4
-DESCRIPTION=Elementary icons forked from upstream, extended and maintained for Xfce
-EAPI=6
-HOMEPAGE=https://github.com/shimmerproject/elementary-xfce
-KEYWORDS=~amd64 ~x86
-LICENSE=public-domain GPL-1 GPL-2 GPL-3
-SLOT=0
-SRC_URI=https://github.com/shimmerproject/elementary-xfce/archive/7d3a76510d38ad650854382d2dcc502beb91642a.tar.gz -> elementary-xfce-icon-theme-0.8_p20170710.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b75e34b04e706b4b10b6337f8ba3231f
diff --git a/metadata/md5-cache/x11-themes/golden-xcursors-0.8-r1 b/metadata/md5-cache/x11-themes/golden-xcursors-0.8-r1
index 7f646f9b20e0..e60723db0331 100644
--- a/metadata/md5-cache/x11-themes/golden-xcursors-0.8-r1
+++ b/metadata/md5-cache/x11-themes/golden-xcursors-0.8-r1
@@ -2,8 +2,8 @@ DEFINED_PHASES=install
 DESCRIPTION=A high quality set of Xfree 4.3.0 animated mouse cursors
 EAPI=6
 HOMEPAGE=http://www.kde-look.org/content/show.php?content=5507
-KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=http://www.kde-look.org/content/files/5507-Golden-XCursors-3D-0.8.tar.bz2
-_md5_=c813a1556953a0e3be1247314422675f
+_md5_=0155caaa1f60ee01c2557d23e1c3d679
diff --git a/metadata/md5-cache/x11-themes/xfce-gant-icon-theme-3.9_p6 b/metadata/md5-cache/x11-themes/xfce-gant-icon-theme-3.9_p6
deleted file mode 100644
index 3f93acaac16f..000000000000
--- a/metadata/md5-cache/x11-themes/xfce-gant-icon-theme-3.9_p6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst
-DEPEND=x11-themes/hicolor-icon-theme >=sys-apps/sed-4
-DESCRIPTION=Xfce Gant Icon Theme
-EAPI=5
-HOMEPAGE=http://www.xfce-look.org/content/show.php/GANT?content=23297
-KEYWORDS=amd64 x86
-LICENSE=public-domain
-RDEPEND=x11-themes/hicolor-icon-theme
-RESTRICT=binchecks strip
-SLOT=0
-SRC_URI=http://overlay.uberpenguin.net/icons-xfce-gant-3.9-6.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=acb2b9bb5b6b7af3bdac3470f9d38625
diff --git a/metadata/md5-cache/x11-themes/xfwm4-themes-4.10.0 b/metadata/md5-cache/x11-themes/xfwm4-themes-4.10.0
deleted file mode 100644
index bd3e9a0d3abd..000000000000
--- a/metadata/md5-cache/x11-themes/xfwm4-themes-4.10.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=>=app-portage/elt-patches-20170422 >=sys-apps/sed-4
-DESCRIPTION=Additional themes for the Xfce window manager
-EAPI=5
-HOMEPAGE=https://www.xfce.org/projects/
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=GPL-3
-RDEPEND=>=xfce-base/xfwm4-4.10
-RESTRICT=binchecks strip
-SLOT=0
-SRC_URI=mirror://xfce/src/art/xfwm4-themes/4.10/xfwm4-themes-4.10.0.tar.bz2
-_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25	xfconf	25bb7fe99d6e58851633dc43d429c5ae
-_md5_=e4b7098b6be08a733ab1fa8bca0bdb3e
diff --git a/metadata/md5-cache/x11-wm/Manifest.gz b/metadata/md5-cache/x11-wm/Manifest.gz
index 583f9d61767e..c0e8108d5be9 100644
--- a/metadata/md5-cache/x11-wm/Manifest.gz
+++ b/metadata/md5-cache/x11-wm/Manifest.gz
diff --git a/metadata/md5-cache/x11-wm/ctwm-4.0.1 b/metadata/md5-cache/x11-wm/ctwm-4.0.1
index 5c9ca91fc7c4..2878500bd459 100644
--- a/metadata/md5-cache/x11-wm/ctwm-4.0.1
+++ b/metadata/md5-cache/x11-wm/ctwm-4.0.1
@@ -3,10 +3,10 @@ DEPEND=x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/
 DESCRIPTION=A clean, light window manager
 EAPI=6
 HOMEPAGE=http://ctwm.org/
-KEYWORDS=~amd64 ~ppc x86 ~x86-fbsd
+KEYWORDS=amd64 ~ppc x86 ~x86-fbsd
 LICENSE=MIT
 RDEPEND=x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXpm x11-libs/libXt
 SLOT=0
 SRC_URI=http://ctwm.org/dist/ctwm-4.0.1.tar.xz
 _eclasses_=cmake-utils	b8d2d7038bb36192aa14e01c64e5a06a	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=8c58a646a9467bec8104f5d385e0a020
+_md5_=11d1d7ed795e3b79d7afbcb0d8cdca87
diff --git a/metadata/md5-cache/x11-wm/enlightenment-0.21.7 b/metadata/md5-cache/x11-wm/enlightenment-0.21.7
index f2ee176a9f5e..bdb67349c609 100644
--- a/metadata/md5-cache/x11-wm/enlightenment-0.21.7
+++ b/metadata/md5-cache/x11-wm/enlightenment-0.21.7
@@ -1,5 +1,5 @@
-DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=pam? ( sys-libs/pam ) systemd? ( sys-apps/systemd ) wayland? ( dev-libs/efl[wayland] >=dev-libs/wayland-1.10.0 >=x11-libs/pixman-0.31.1 >=x11-libs/libxkbcommon-0.3.1 ) >=dev-libs/efl-1.18[X] x11-libs/xcb-util-keysyms >=app-portage/elt-patches-20170317 >=app-portage/elt-patches-20170422 doc? ( app-doc/doxygen )
+DEFINED_PHASES=compile configure install postinst postrm prepare unpack
+DEPEND=pam? ( sys-libs/pam ) systemd? ( sys-apps/systemd ) wayland? ( dev-libs/efl[wayland] >=dev-libs/wayland-1.10.0 >=x11-libs/pixman-0.31.1 >=x11-libs/libxkbcommon-0.3.1 ) >=dev-libs/efl-1.18[X] x11-libs/xcb-util-keysyms sys-devel/automake:1.15 >=app-portage/elt-patches-20170317 >=app-portage/elt-patches-20170422 doc? ( app-doc/doxygen )
 DESCRIPTION=Enlightenment DR17 window manager
 EAPI=5
 HOMEPAGE=https://www.enlightenment.org
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=pam? ( sys-libs/pam ) systemd? ( sys-apps/systemd ) wayland? ( dev-libs/efl[wayland] >=dev-libs/wayland-1.10.0 >=x11-libs/pixman-0.31.1 >=x11-libs/libxkbcommon-0.3.1 ) >=dev-libs/efl-1.18[X] x11-libs/xcb-util-keysyms nls? ( sys-devel/gettext )
 SLOT=0.17/0.21.7
 SRC_URI=https://download.enlightenment.org/rel/apps/enlightenment/enlightenment-0.21.7.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	enlightenment	1fa177784657aaf9484e91d7427a2b2e	epatch	8233751dc5105a6ae8fcd86ce2bb0247	epunt-cxx	e99babeaa7d98c1caaa6a61a79902210	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b209ced529b71900f43107a89c48820a
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	enlightenment	1fa177784657aaf9484e91d7427a2b2e	epatch	8233751dc5105a6ae8fcd86ce2bb0247	epunt-cxx	e99babeaa7d98c1caaa6a61a79902210	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=83a7249c37ea9e89654c11fa460cc257
diff --git a/metadata/md5-cache/xfce-base/Manifest.gz b/metadata/md5-cache/xfce-base/Manifest.gz
index 69fb17a62333..74bd80173352 100644
--- a/metadata/md5-cache/xfce-base/Manifest.gz
+++ b/metadata/md5-cache/xfce-base/Manifest.gz
diff --git a/metadata/md5-cache/xfce-base/exo-0.11.5 b/metadata/md5-cache/xfce-base/exo-0.11.5
deleted file mode 100644
index 6b91b1cf0216..000000000000
--- a/metadata/md5-cache/xfce-base/exo-0.11.5
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=>=dev-lang/perl-5.6 >=dev-libs/glib-2.42:= dev-perl/URI >=x11-libs/gtk+-2.24:2= >=x11-libs/gtk+-3.20:3= >=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/libxfce4util-4.10:= dev-util/gtk-doc-am dev-util/intltool sys-devel/gettext virtual/pkgconfig >=sys-apps/sed-4
-DESCRIPTION=Extensions, widgets and framework library with session support for Xfce
-EAPI=6
-HOMEPAGE=https://www.xfce.org/projects/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=>=dev-lang/perl-5.6 >=dev-libs/glib-2.42:= dev-perl/URI >=x11-libs/gtk+-2.24:2= >=x11-libs/gtk+-3.20:3= >=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/libxfce4util-4.10:=
-SLOT=0
-SRC_URI=mirror://xfce/src/xfce/exo/0.11/exo-0.11.5.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=8d9aa351ba9e23a6908ff000eb14b695
diff --git a/metadata/md5-cache/xfce-base/libxfce4ui-4.13.0 b/metadata/md5-cache/xfce-base/libxfce4ui-4.13.0
deleted file mode 100644
index 05618b32ae4d..000000000000
--- a/metadata/md5-cache/xfce-base/libxfce4ui-4.13.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=>=dev-libs/glib-2.30:2= >=x11-libs/gtk+-2.24:2= >=x11-libs/gtk+-3.2:3= x11-libs/libX11:= x11-libs/libICE:= x11-libs/libSM:= >=xfce-base/libxfce4util-4.12:= >=xfce-base/xfconf-4.12:= glade? ( dev-util/glade:3.10= ) startup-notification? ( x11-libs/startup-notification:= ) !xfce-base/xfce-utils dev-lang/perl dev-util/intltool sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170422 >=sys-apps/sed-4
-DESCRIPTION=Unified widget and session management libraries for Xfce
-EAPI=5
-HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
-IUSE=debug glade startup-notification
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=LGPL-2
-RDEPEND=>=dev-libs/glib-2.30:2= >=x11-libs/gtk+-2.24:2= >=x11-libs/gtk+-3.2:3= x11-libs/libX11:= x11-libs/libICE:= x11-libs/libSM:= >=xfce-base/libxfce4util-4.12:= >=xfce-base/xfconf-4.12:= glade? ( dev-util/glade:3.10= ) startup-notification? ( x11-libs/startup-notification:= ) !xfce-base/xfce-utils
-SLOT=0
-SRC_URI=mirror://xfce/src/xfce/libxfce4ui/4.13/libxfce4ui-4.13.0.tar.bz2
-_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25	xfconf	25bb7fe99d6e58851633dc43d429c5ae
-_md5_=03b263d21485eba977a8751bd66becaa
diff --git a/metadata/md5-cache/xfce-base/libxfce4ui-4.13.3 b/metadata/md5-cache/xfce-base/libxfce4ui-4.13.3
deleted file mode 100644
index d4a891afda9a..000000000000
--- a/metadata/md5-cache/xfce-base/libxfce4ui-4.13.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm
-DEPEND=>=dev-libs/glib-2.42:2= >=x11-libs/gtk+-2.24:2= >=x11-libs/gtk+-3.18:3=[introspection?] x11-libs/libX11:= x11-libs/libICE:= x11-libs/libSM:= >=xfce-base/libxfce4util-4.12:=[introspection?] >=xfce-base/xfconf-4.12:= glade? ( dev-util/glade:3.10= ) introspection? ( dev-libs/gobject-introspection:= ) startup-notification? ( x11-libs/startup-notification:= ) !xfce-base/xfce-utils dev-lang/perl dev-util/intltool sys-devel/gettext virtual/pkgconfig >=sys-apps/sed-4
-DESCRIPTION=Unified widget and session management libs for Xfce
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
-IUSE=debug glade introspection startup-notification
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=LGPL-2
-RDEPEND=>=dev-libs/glib-2.42:2= >=x11-libs/gtk+-2.24:2= >=x11-libs/gtk+-3.18:3=[introspection?] x11-libs/libX11:= x11-libs/libICE:= x11-libs/libSM:= >=xfce-base/libxfce4util-4.12:=[introspection?] >=xfce-base/xfconf-4.12:= glade? ( dev-util/glade:3.10= ) introspection? ( dev-libs/gobject-introspection:= ) startup-notification? ( x11-libs/startup-notification:= ) !xfce-base/xfce-utils
-SLOT=0
-SRC_URI=mirror://xfce/src/xfce/libxfce4ui/4.13/libxfce4ui-4.13.3.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=885256d279508e93cedcca34d1ef2318
diff --git a/metadata/md5-cache/xfce-base/libxfce4util-4.12.1-r1 b/metadata/md5-cache/xfce-base/libxfce4util-4.12.1-r1
deleted file mode 100644
index 60c0cf8a442b..000000000000
--- a/metadata/md5-cache/xfce-base/libxfce4util-4.12.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=>=dev-libs/glib-2.24 dev-util/intltool dev-util/gtk-doc-am sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170422 >=sys-apps/sed-4
-DESCRIPTION=A basic utility library for the Xfce desktop environment
-EAPI=5
-HOMEPAGE=https://git.xfce.org/xfce/libxfce4util/
-IUSE=debug
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
-LICENSE=LGPL-2
-RDEPEND=>=dev-libs/glib-2.24
-SLOT=0/7
-SRC_URI=mirror://xfce/src/xfce/libxfce4util/4.12/libxfce4util-4.12.1.tar.bz2
-_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25	xfconf	25bb7fe99d6e58851633dc43d429c5ae
-_md5_=2d232be69d83e7f0e50e900fbfd31ed3
diff --git a/metadata/md5-cache/xfce-base/libxfcegui4-4.10.0-r1 b/metadata/md5-cache/xfce-base/libxfcegui4-4.10.0-r1
deleted file mode 100644
index 29d1da6f8e6d..000000000000
--- a/metadata/md5-cache/xfce-base/libxfcegui4-4.10.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=gnome-base/libglade x11-libs/libSM x11-libs/libX11 >=x11-libs/gtk+-2.10:2 >=xfce-base/libxfce4util-4.10 startup-notification? ( x11-libs/startup-notification ) dev-util/intltool sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170422 >=sys-apps/sed-4
-DESCRIPTION=A compability library for unported Xfce 4.6 plugins (DEPRECATED)
-EAPI=5
-HOMEPAGE=https://git.xfce.org/archive/libxfcegui4/
-IUSE=startup-notification
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=gnome-base/libglade x11-libs/libSM x11-libs/libX11 >=x11-libs/gtk+-2.10:2 >=xfce-base/libxfce4util-4.10 startup-notification? ( x11-libs/startup-notification )
-SLOT=0
-SRC_URI=mirror://xfce/src/xfce/libxfcegui4/4.10/libxfcegui4-4.10.0.tar.bz2
-_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25	xfconf	25bb7fe99d6e58851633dc43d429c5ae
-_md5_=2f422b0aa5df1167bca2efce0fbda7d1
diff --git a/metadata/md5-cache/xfce-base/thunar-1.7.0 b/metadata/md5-cache/xfce-base/thunar-1.7.0
deleted file mode 100644
index 75833e93ac2c..000000000000
--- a/metadata/md5-cache/xfce-base/thunar-1.7.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm test
-DEPEND=>=dev-lang/perl-5.6 >=dev-libs/glib-2.30:= >=x11-libs/gdk-pixbuf-2.14:= >=x11-libs/gtk+-3.20:3= >=xfce-base/exo-0.11:= >=xfce-base/libxfce4ui-4.12:= >=xfce-base/libxfce4util-4.12:= >=xfce-base/xfconf-4.12:= exif? ( >=media-libs/libexif-0.6.19:= ) introspection? ( dev-libs/gobject-introspection:= ) libnotify? ( >=x11-libs/libnotify-0.7:= ) pcre? ( >=dev-libs/libpcre-6:= ) trash-panel-plugin? ( >=xfce-base/xfce4-panel-4.10:= ) udisks? ( virtual/libgudev:= ) dev-util/intltool sys-devel/gettext virtual/pkgconfig >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=File manager for the Xfce desktop environment
-EAPI=6
-HOMEPAGE=https://www.xfce.org/projects/ https://docs.xfce.org/xfce/thunar/start
-IUSE=exif introspection libnotify pcre test +trash-panel-plugin udisks test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=GPL-2 LGPL-2
-RDEPEND=>=dev-lang/perl-5.6 >=dev-libs/glib-2.30:= >=x11-libs/gdk-pixbuf-2.14:= >=x11-libs/gtk+-3.20:3= >=xfce-base/exo-0.11:= >=xfce-base/libxfce4ui-4.12:= >=xfce-base/libxfce4util-4.12:= >=xfce-base/xfconf-4.12:= exif? ( >=media-libs/libexif-0.6.19:= ) introspection? ( dev-libs/gobject-introspection:= ) libnotify? ( >=x11-libs/libnotify-0.7:= ) pcre? ( >=dev-libs/libpcre-6:= ) trash-panel-plugin? ( >=xfce-base/xfce4-panel-4.10:= ) udisks? ( virtual/libgudev:= ) >=dev-util/desktop-file-utils-0.20-r1 x11-misc/shared-mime-info trash-panel-plugin? ( >=gnome-base/gvfs-1.18.3 ) udisks? ( virtual/udev >=gnome-base/gvfs-1.18.3[udisks,udev] )
-SLOT=0
-SRC_URI=mirror://xfce/src/xfce/thunar/1.7/Thunar-1.7.0.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2d95986664e298bb97e1c3186863339e
diff --git a/metadata/md5-cache/xfce-base/xfce4-meta-4.12 b/metadata/md5-cache/xfce-base/xfce4-meta-4.12
deleted file mode 100644
index 6e850f97b3d6..000000000000
--- a/metadata/md5-cache/xfce-base/xfce4-meta-4.12
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=The Xfce Desktop Environment (meta package)
-EAPI=5
-HOMEPAGE=https://www.xfce.org/
-IUSE=minimal +svg
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=metapackage
-RDEPEND=>=x11-themes/gtk-engines-xfce-3:0 x11-themes/hicolor-icon-theme >=xfce-base/xfce4-appfinder-4.12 >=xfce-base/xfce4-panel-4.12 >=xfce-base/xfce4-session-4.12 >=xfce-base/xfce4-settings-4.12 >=xfce-base/xfdesktop-4.12 >=xfce-base/xfwm4-4.12 !minimal? ( media-fonts/dejavu virtual/freedesktop-icon-theme ) svg? ( gnome-base/librsvg )
-SLOT=0
-_md5_=74cd3c787f5d5cc3722058ce420451fc
diff --git a/metadata/md5-cache/xfce-base/xfce4-panel-4.12.0-r1 b/metadata/md5-cache/xfce-base/xfce4-panel-4.12.0-r1
deleted file mode 100644
index 0099f0c4b4f7..000000000000
--- a/metadata/md5-cache/xfce-base/xfce4-panel-4.12.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=>=dev-libs/dbus-glib-0.100 >=dev-libs/glib-2.24 >=x11-libs/cairo-1 >=x11-libs/gtk+-2.20:2 >=x11-libs/gtk+-3.2:3 x11-libs/libX11 >=x11-libs/libwnck-2.31:1 >=xfce-base/exo-0.8 >=xfce-base/garcon-0.3[gtk2(+)] >=xfce-base/libxfce4ui-4.11 >=xfce-base/libxfce4util-4.11 >=xfce-base/xfconf-4.10 dev-lang/perl dev-util/gtk-doc-am dev-util/intltool sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170422 >=sys-apps/sed-4
-DESCRIPTION=Panel for the Xfce desktop environment
-EAPI=5
-HOMEPAGE=https://docs.xfce.org/xfce/xfce4-panel/start
-IUSE=debug
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=>=dev-libs/dbus-glib-0.100 >=dev-libs/glib-2.24 >=x11-libs/cairo-1 >=x11-libs/gtk+-2.20:2 >=x11-libs/gtk+-3.2:3 x11-libs/libX11 >=x11-libs/libwnck-2.31:1 >=xfce-base/exo-0.8 >=xfce-base/garcon-0.3[gtk2(+)] >=xfce-base/libxfce4ui-4.11 >=xfce-base/libxfce4util-4.11 >=xfce-base/xfconf-4.10
-SLOT=0
-SRC_URI=mirror://xfce/src/xfce/xfce4-panel/4.12/xfce4-panel-4.12.0.tar.bz2
-_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25	xfconf	25bb7fe99d6e58851633dc43d429c5ae
-_md5_=b0fdee03831de252e2ec3e3d98a9ac27
diff --git a/metadata/md5-cache/xfce-base/xfce4-panel-4.12.1-r1 b/metadata/md5-cache/xfce-base/xfce4-panel-4.12.1-r1
deleted file mode 100644
index b7fb049f8a00..000000000000
--- a/metadata/md5-cache/xfce-base/xfce4-panel-4.12.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=>=dev-libs/dbus-glib-0.100 >=dev-libs/glib-2.24 >=x11-libs/cairo-1 >=x11-libs/gtk+-2.20:2 >=x11-libs/gtk+-3.2:3 x11-libs/libX11 >=x11-libs/libwnck-2.31:1 >=xfce-base/exo-0.8 >=xfce-base/garcon-0.3[gtk2(+)] >=xfce-base/libxfce4ui-4.11 >=xfce-base/libxfce4util-4.11 >=xfce-base/xfconf-4.10 dev-lang/perl dev-util/gtk-doc-am dev-util/intltool sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170422 >=sys-apps/sed-4
-DESCRIPTION=Panel for the Xfce desktop environment
-EAPI=5
-HOMEPAGE=https://www.xfce.org/projects/
-IUSE=debug
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=>=dev-libs/dbus-glib-0.100 >=dev-libs/glib-2.24 >=x11-libs/cairo-1 >=x11-libs/gtk+-2.20:2 >=x11-libs/gtk+-3.2:3 x11-libs/libX11 >=x11-libs/libwnck-2.31:1 >=xfce-base/exo-0.8 >=xfce-base/garcon-0.3[gtk2(+)] >=xfce-base/libxfce4ui-4.11 >=xfce-base/libxfce4util-4.11 >=xfce-base/xfconf-4.10
-SLOT=0
-SRC_URI=mirror://xfce/src/xfce/xfce4-panel/4.12/xfce4-panel-4.12.1.tar.bz2
-_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25	xfconf	25bb7fe99d6e58851633dc43d429c5ae
-_md5_=b543637aa2b01996b3d109cbabb1a59e
diff --git a/metadata/md5-cache/xfce-base/xfce4-panel-4.13.1 b/metadata/md5-cache/xfce-base/xfce4-panel-4.13.1
deleted file mode 100644
index 42a4bc20f21e..000000000000
--- a/metadata/md5-cache/xfce-base/xfce4-panel-4.13.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm
-DEPEND=>=dev-libs/glib-2.24:= >=x11-libs/cairo-1:= >=x11-libs/gtk+-2.20:2= >=x11-libs/gtk+-3.16:3= x11-libs/libX11:= x11-libs/libwnck:3= >=xfce-base/exo-0.11.2:= >=xfce-base/garcon-0.5:= >=xfce-base/libxfce4ui-4.13:= >=xfce-base/libxfce4util-4.11:= >=xfce-base/xfconf-4.13:= dev-lang/perl dev-util/gtk-doc-am dev-util/intltool sys-devel/gettext virtual/pkgconfig >=sys-apps/sed-4
-DESCRIPTION=Panel for the Xfce desktop environment
-EAPI=6
-HOMEPAGE=https://www.xfce.org/projects/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=>=dev-libs/glib-2.24:= >=x11-libs/cairo-1:= >=x11-libs/gtk+-2.20:2= >=x11-libs/gtk+-3.16:3= x11-libs/libX11:= x11-libs/libwnck:3= >=xfce-base/exo-0.11.2:= >=xfce-base/garcon-0.5:= >=xfce-base/libxfce4ui-4.13:= >=xfce-base/libxfce4util-4.11:= >=xfce-base/xfconf-4.13:=
-SLOT=0
-SRC_URI=mirror://xfce/src/xfce/xfce4-panel/4.13/xfce4-panel-4.13.1.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d07563e9613dddf6141bdf4bb9d1823c
diff --git a/metadata/md5-cache/xfce-base/xfce4-session-4.13.0 b/metadata/md5-cache/xfce-base/xfce4-session-4.13.0
deleted file mode 100644
index f7be4f3d107d..000000000000
--- a/metadata/md5-cache/xfce-base/xfce4-session-4.13.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm
-DEPEND=x11-apps/iceauth x11-libs/gtk+:3= x11-libs/libSM:= x11-libs/libwnck:3= x11-libs/libX11:= >=xfce-base/libxfce4util-4.12:= >=xfce-base/libxfce4ui-4.12.1:=[gtk3(+)] >=xfce-base/xfconf-4.12:= policykit? ( >=sys-auth/polkit-0.102:= ) dev-util/intltool sys-devel/gettext virtual/pkgconfig >=sys-apps/sed-4
-DESCRIPTION=A session manager for the Xfce desktop environment
-EAPI=6
-HOMEPAGE=https://docs.xfce.org/xfce/xfce4-session/start
-IUSE=nls policykit systemd +xscreensaver
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=x11-apps/iceauth x11-libs/gtk+:3= x11-libs/libSM:= x11-libs/libwnck:3= x11-libs/libX11:= >=xfce-base/libxfce4util-4.12:= >=xfce-base/libxfce4ui-4.12.1:=[gtk3(+)] >=xfce-base/xfconf-4.12:= policykit? ( >=sys-auth/polkit-0.102:= ) x11-apps/xrdb nls? ( x11-misc/xdg-user-dirs ) xscreensaver? ( || ( >=x11-misc/xscreensaver-5.26 x11-misc/light-locker >=x11-misc/xlockmore-5.43 x11-misc/slock x11-misc/alock[pam] ) )
-REQUIRED_USE=systemd? ( policykit )
-SLOT=0
-SRC_URI=mirror://xfce/src/xfce/xfce4-session/4.13/xfce4-session-4.13.0.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=638e67863b79c336b87ea0d0bbc13016
diff --git a/metadata/md5-cache/xfce-base/xfce4-settings-4.12.2 b/metadata/md5-cache/xfce-base/xfce4-settings-4.12.2
deleted file mode 100644
index 4b5dcca8ada3..000000000000
--- a/metadata/md5-cache/xfce-base/xfce4-settings-4.12.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure postinst postrm
-DEPEND=>=dev-libs/dbus-glib-0.100 >=dev-libs/glib-2.24 media-libs/fontconfig >=x11-libs/gtk+-2.20:2 x11-libs/libX11 >=x11-libs/libXcursor-1.1 >=x11-libs/libXi-1.3 >=x11-libs/libXrandr-1.2 >=xfce-base/garcon-0.2 >=xfce-base/exo-0.8 >=xfce-base/libxfce4ui-4.11 >=xfce-base/libxfce4util-4.11 >=xfce-base/xfconf-4.10 libcanberra? ( >=media-libs/libcanberra-0.25[sound] ) input_devices_libinput? ( x11-drivers/xf86-input-libinput ) libnotify? ( >=x11-libs/libnotify-0.7 ) upower? ( || ( >=sys-power/upower-0.9.23 sys-power/upower-pm-utils ) ) xklavier? ( >=x11-libs/libxklavier-5 ) dev-util/intltool virtual/pkgconfig sys-devel/gettext >=x11-proto/inputproto-1.4 x11-proto/xproto >=sys-apps/sed-4
-DESCRIPTION=Configuration system for the Xfce desktop environment
-EAPI=6
-HOMEPAGE=https://www.xfce.org/projects/
-IUSE=input_devices_libinput libcanberra libnotify upower +xklavier
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/dbus-glib-0.100 >=dev-libs/glib-2.24 media-libs/fontconfig >=x11-libs/gtk+-2.20:2 x11-libs/libX11 >=x11-libs/libXcursor-1.1 >=x11-libs/libXi-1.3 >=x11-libs/libXrandr-1.2 >=xfce-base/garcon-0.2 >=xfce-base/exo-0.8 >=xfce-base/libxfce4ui-4.11 >=xfce-base/libxfce4util-4.11 >=xfce-base/xfconf-4.10 libcanberra? ( >=media-libs/libcanberra-0.25[sound] ) input_devices_libinput? ( x11-drivers/xf86-input-libinput ) libnotify? ( >=x11-libs/libnotify-0.7 ) upower? ( || ( >=sys-power/upower-0.9.23 sys-power/upower-pm-utils ) ) xklavier? ( >=x11-libs/libxklavier-5 )
-SLOT=0
-SRC_URI=mirror://xfce/src/xfce/xfce4-settings/4.12/xfce4-settings-4.12.2.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4a178484537c9eee3a124cc098fbff46
diff --git a/metadata/md5-cache/xfce-base/xfce4-settings-4.13.1 b/metadata/md5-cache/xfce-base/xfce4-settings-4.13.1
deleted file mode 100644
index 1cbb69c17344..000000000000
--- a/metadata/md5-cache/xfce-base/xfce4-settings-4.13.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure postinst postrm
-DEPEND=>=dev-libs/dbus-glib-0.100 >=dev-libs/glib-2.24 media-libs/fontconfig x11-libs/gtk+:3 x11-libs/libX11 >=x11-libs/libXcursor-1.1 >=x11-libs/libXi-1.3 >=x11-libs/libXrandr-1.2 >=xfce-base/garcon-0.2 >=xfce-base/exo-0.11 >=xfce-base/libxfce4ui-4.12 >=xfce-base/libxfce4util-4.12 >=xfce-base/xfconf-4.13 libcanberra? ( >=media-libs/libcanberra-0.25[sound] ) input_devices_libinput? ( x11-drivers/xf86-input-libinput ) libnotify? ( >=x11-libs/libnotify-0.7 ) upower? ( || ( >=sys-power/upower-0.9.23 sys-power/upower-pm-utils ) ) xklavier? ( >=x11-libs/libxklavier-5 ) dev-util/intltool virtual/pkgconfig sys-devel/gettext >=x11-proto/inputproto-1.4 x11-proto/xproto >=sys-apps/sed-4
-DESCRIPTION=Configuration system for the Xfce desktop environment
-EAPI=6
-HOMEPAGE=https://www.xfce.org/projects/
-IUSE=input_devices_libinput libcanberra libnotify upower +xklavier
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/dbus-glib-0.100 >=dev-libs/glib-2.24 media-libs/fontconfig x11-libs/gtk+:3 x11-libs/libX11 >=x11-libs/libXcursor-1.1 >=x11-libs/libXi-1.3 >=x11-libs/libXrandr-1.2 >=xfce-base/garcon-0.2 >=xfce-base/exo-0.11 >=xfce-base/libxfce4ui-4.12 >=xfce-base/libxfce4util-4.12 >=xfce-base/xfconf-4.13 libcanberra? ( >=media-libs/libcanberra-0.25[sound] ) input_devices_libinput? ( x11-drivers/xf86-input-libinput ) libnotify? ( >=x11-libs/libnotify-0.7 ) upower? ( || ( >=sys-power/upower-0.9.23 sys-power/upower-pm-utils ) ) xklavier? ( >=x11-libs/libxklavier-5 )
-SLOT=0
-SRC_URI=mirror://xfce/src/xfce/xfce4-settings/4.13/xfce4-settings-4.13.1.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=080c23e2d281ff4eede1003e7a8fc77e
diff --git a/metadata/md5-cache/xfce-base/xfconf-4.12.0-r1 b/metadata/md5-cache/xfce-base/xfconf-4.12.0-r1
deleted file mode 100644
index 2d48f15fa0d7..000000000000
--- a/metadata/md5-cache/xfce-base/xfconf-4.12.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=>=dev-libs/dbus-glib-0.98 >=dev-libs/glib-2.30 >=xfce-base/libxfce4util-4.10 perl? ( dev-lang/perl:=[-build(-)] dev-perl/glib-perl ) dev-util/intltool virtual/pkgconfig sys-devel/gettext perl? ( dev-perl/ExtUtils-Depends dev-perl/ExtUtils-PkgConfig ) >=app-portage/elt-patches-20170422 >=sys-apps/sed-4
-DESCRIPTION=A configuration management system for Xfce
-EAPI=5
-HOMEPAGE=https://docs.xfce.org/xfce/xfconf/start
-IUSE=debug perl
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/dbus-glib-0.98 >=dev-libs/glib-2.30 >=xfce-base/libxfce4util-4.10 perl? ( dev-lang/perl:=[-build(-)] dev-perl/glib-perl )
-SLOT=0
-SRC_URI=mirror://xfce/src/xfce/xfconf/4.12/xfconf-4.12.0.tar.bz2
-_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25	xfconf	25bb7fe99d6e58851633dc43d429c5ae
-_md5_=4c6d703c7f43088f8262abfb879c0927
diff --git a/metadata/md5-cache/xfce-base/xfdesktop-4.12.3 b/metadata/md5-cache/xfce-base/xfdesktop-4.12.3
deleted file mode 100644
index b97b0b62e135..000000000000
--- a/metadata/md5-cache/xfce-base/xfdesktop-4.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=>=x11-libs/cairo-1.6:= >=dev-libs/dbus-glib-0.100:= >=dev-libs/glib-2.20:= >=x11-libs/gtk+-2.24:2= >=x11-libs/libwnck-2.30:1= x11-libs/libX11:= >=xfce-base/exo-0.8:= >=xfce-base/garcon-0.3:= >=xfce-base/libxfce4ui-4.11:= >=xfce-base/libxfce4util-4.11:= >=xfce-base/xfconf-4.10:= libnotify? ( >=x11-libs/libnotify-0.7:= ) thunar? ( >=dev-libs/glib-2.38:= >=xfce-base/thunar-1.6:=[dbus] ) dev-util/intltool sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170422 >=sys-apps/sed-4
-DESCRIPTION=Desktop manager for the Xfce desktop environment
-EAPI=5
-HOMEPAGE=https://www.xfce.org/projects/
-IUSE=debug libnotify +thunar
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=>=x11-libs/cairo-1.6:= >=dev-libs/dbus-glib-0.100:= >=dev-libs/glib-2.20:= >=x11-libs/gtk+-2.24:2= >=x11-libs/libwnck-2.30:1= x11-libs/libX11:= >=xfce-base/exo-0.8:= >=xfce-base/garcon-0.3:= >=xfce-base/libxfce4ui-4.11:= >=xfce-base/libxfce4util-4.11:= >=xfce-base/xfconf-4.10:= libnotify? ( >=x11-libs/libnotify-0.7:= ) thunar? ( >=dev-libs/glib-2.38:= >=xfce-base/thunar-1.6:=[dbus] )
-SLOT=0
-SRC_URI=mirror://xfce/src/xfce/xfdesktop/4.12/xfdesktop-4.12.3.tar.bz2
-_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25	xfconf	25bb7fe99d6e58851633dc43d429c5ae
-_md5_=83dc8831ba36796a50f23f3f45bdf746
diff --git a/metadata/md5-cache/xfce-base/xfwm4-4.12.3-r1 b/metadata/md5-cache/xfce-base/xfwm4-4.12.3-r1
deleted file mode 100644
index bc4ae5c2f890..000000000000
--- a/metadata/md5-cache/xfce-base/xfwm4-4.12.3-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=dev-libs/dbus-glib:= >=dev-libs/glib-2.20:= >=x11-libs/gtk+-2.24:2= x11-libs/libX11:= x11-libs/libXext:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/pango:= >=x11-libs/libwnck-2.30:1= >=xfce-base/libxfce4util-4.10:= >=xfce-base/libxfce4ui-4.11:= >=xfce-base/xfconf-4.10:= startup-notification? ( x11-libs/startup-notification:= ) xcomposite? ( x11-libs/libXcomposite:= x11-libs/libXdamage:= x11-libs/libXfixes:= ) dev-util/intltool sys-devel/gettext x11-libs/libICE x11-libs/libSM xfce-base/exo virtual/pkgconfig dri? ( >=x11-libs/libdrm-2.4 ) >=app-portage/elt-patches-20170422 >=sys-apps/sed-4
-DESCRIPTION=Window manager for the Xfce desktop environment
-EAPI=5
-HOMEPAGE=https://docs.xfce.org/xfce/xfwm4/start
-IUSE=debug dri startup-notification +xcomposite
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=dev-libs/dbus-glib:= >=dev-libs/glib-2.20:= >=x11-libs/gtk+-2.24:2= x11-libs/libX11:= x11-libs/libXext:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/pango:= >=x11-libs/libwnck-2.30:1= >=xfce-base/libxfce4util-4.10:= >=xfce-base/libxfce4ui-4.11:= >=xfce-base/xfconf-4.10:= startup-notification? ( x11-libs/startup-notification:= ) xcomposite? ( x11-libs/libXcomposite:= x11-libs/libXdamage:= x11-libs/libXfixes:= )
-SLOT=0
-SRC_URI=mirror://xfce/src/xfce/xfwm4/4.12/xfwm4-4.12.3.tar.bz2
-_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25	xfconf	25bb7fe99d6e58851633dc43d429c5ae
-_md5_=764b830c83e2c31f24c84312ca6d418e
diff --git a/metadata/md5-cache/xfce-base/xfwm4-4.13.0 b/metadata/md5-cache/xfce-base/xfwm4-4.13.0
deleted file mode 100644
index cca5959eb12d..000000000000
--- a/metadata/md5-cache/xfce-base/xfwm4-4.13.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure postinst postrm
-DEPEND=dev-libs/dbus-glib:= >=dev-libs/glib-2.20:= >=x11-libs/gtk+-2.24:2= x11-libs/libX11:= x11-libs/libXext:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/pango:= >=x11-libs/libwnck-2.30:1= >=xfce-base/libxfce4util-4.10:= >=xfce-base/libxfce4ui-4.11:= >=xfce-base/xfconf-4.10:= opengl? ( media-libs/libepoxy:=[X(+)] ) startup-notification? ( x11-libs/startup-notification:= ) xpresent? ( x11-libs/libXpresent ) xcomposite? ( x11-libs/libXcomposite:= x11-libs/libXdamage:= x11-libs/libXfixes:= ) dev-util/intltool sys-devel/gettext x11-libs/libICE x11-libs/libSM xfce-base/exo virtual/pkgconfig >=sys-apps/sed-4
-DESCRIPTION=Window manager for the Xfce desktop environment
-EAPI=6
-HOMEPAGE=https://www.xfce.org/projects/
-IUSE=opengl startup-notification +xcomposite xpresent
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=dev-libs/dbus-glib:= >=dev-libs/glib-2.20:= >=x11-libs/gtk+-2.24:2= x11-libs/libX11:= x11-libs/libXext:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/pango:= >=x11-libs/libwnck-2.30:1= >=xfce-base/libxfce4util-4.10:= >=xfce-base/libxfce4ui-4.11:= >=xfce-base/xfconf-4.10:= opengl? ( media-libs/libepoxy:=[X(+)] ) startup-notification? ( x11-libs/startup-notification:= ) xpresent? ( x11-libs/libXpresent ) xcomposite? ( x11-libs/libXcomposite:= x11-libs/libXdamage:= x11-libs/libXfixes:= )
-SLOT=0
-SRC_URI=mirror://xfce/src/xfce/xfwm4/4.13/xfwm4-4.13.0.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=54c9146ea6eb1c2e617480f04ee40668
diff --git a/metadata/md5-cache/xfce-extra/Manifest.gz b/metadata/md5-cache/xfce-extra/Manifest.gz
index 9d8dcce3c14b..9c410d0d235b 100644
--- a/metadata/md5-cache/xfce-extra/Manifest.gz
+++ b/metadata/md5-cache/xfce-extra/Manifest.gz
diff --git a/metadata/md5-cache/xfce-extra/eatmonkey-0.1.4 b/metadata/md5-cache/xfce-extra/eatmonkey-0.1.4
deleted file mode 100644
index c71d6937a9d1..000000000000
--- a/metadata/md5-cache/xfce-extra/eatmonkey-0.1.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=>=x11-libs/gtk+-2.12:2 dev-libs/libunique:1 >=xfce-base/libxfce4util-4.8 >=net-libs/libsoup-2.26:2.4 dev-util/intltool sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170422 >=sys-apps/sed-4
-DESCRIPTION=A download manager that works exclusively with aria2
-EAPI=5
-HOMEPAGE=https://goodies.xfce.org/projects/applications/eatmonkey
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=>=x11-libs/gtk+-2.12:2 dev-libs/libunique:1 >=xfce-base/libxfce4util-4.8 >=net-libs/libsoup-2.26:2.4 >=net-misc/aria2-1.9.0[bittorrent,xmlrpc] dev-lang/ruby dev-ruby/ruby-glib2 dev-ruby/ruby-gtk2
-SLOT=0
-SRC_URI=mirror://xfce/src/apps/eatmonkey/0.1/eatmonkey-0.1.4.tar.bz2
-_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25	xfconf	25bb7fe99d6e58851633dc43d429c5ae
-_md5_=5892854784896eae69c877c14d850a85
diff --git a/metadata/md5-cache/xfce-extra/multiload-nandhp-0.3 b/metadata/md5-cache/xfce-extra/multiload-nandhp-0.3
deleted file mode 100644
index ff6b347a8289..000000000000
--- a/metadata/md5-cache/xfce-extra/multiload-nandhp-0.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=x11-libs/gtk+-2.14:2= x11-libs/cairo:= >=gnome-base/libgtop-2.11.92:= >=xfce-base/libxfce4ui-4.10:= >=xfce-base/libxfce4util-4.10:= >=xfce-base/xfce4-panel-4.10:= dev-util/intltool sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=A port of the GNOME multiload applet for the Xfce panel
-EAPI=5
-HOMEPAGE=https://github.com/nandhp/multiload-nandhp
-KEYWORDS=~amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=x11-libs/gtk+-2.14:2= x11-libs/cairo:= >=gnome-base/libgtop-2.11.92:= >=xfce-base/libxfce4ui-4.10:= >=xfce-base/libxfce4util-4.10:= >=xfce-base/xfce4-panel-4.10:=
-SLOT=0
-SRC_URI=https://github.com/nandhp/multiload-nandhp/archive/version-0-3.tar.gz -> multiload-nandhp-0.3.tar.gz
-_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=433c419d381fc002bcb1171ab0d0f646
diff --git a/metadata/md5-cache/xfce-extra/thunar-archive-plugin-0.3.1-r2 b/metadata/md5-cache/xfce-extra/thunar-archive-plugin-0.3.1-r2
deleted file mode 100644
index 7ddf0efe2017..000000000000
--- a/metadata/md5-cache/xfce-extra/thunar-archive-plugin-0.3.1-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=>=xfce-base/libxfce4util-4.8:= >=xfce-base/exo-0.6:= >=xfce-base/thunar-1.2:= dev-util/intltool sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 >=dev-util/xfce4-dev-tools-4.10
-DESCRIPTION=Archive plug-in for the Thunar filemanager
-EAPI=5
-HOMEPAGE=https://goodies.xfce.org/projects/thunar-plugins/thunar-archive-plugin
-IUSE=debug
-KEYWORDS=alpha amd64 arm ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=LGPL-2
-RDEPEND=>=xfce-base/libxfce4util-4.8:= >=xfce-base/exo-0.6:= >=xfce-base/thunar-1.2:=
-SLOT=0
-SRC_URI=mirror://xfce/src/thunar-plugins/thunar-archive-plugin/0.3/thunar-archive-plugin-0.3.1.tar.bz2
-_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25	xfconf	25bb7fe99d6e58851633dc43d429c5ae
-_md5_=2ae3e76a648be72856c96dd15a952780
diff --git a/metadata/md5-cache/xfce-extra/thunar-media-tags-plugin-0.2.1 b/metadata/md5-cache/xfce-extra/thunar-media-tags-plugin-0.2.1
deleted file mode 100644
index 5c7aee0f31bc..000000000000
--- a/metadata/md5-cache/xfce-extra/thunar-media-tags-plugin-0.2.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=>=media-libs/taglib-1.6 >=x11-libs/gtk+-2.12:2 >=xfce-base/exo-0.6 >=xfce-base/thunar-1.2 dev-util/intltool virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 >=dev-util/xfce4-dev-tools-4.10
-DESCRIPTION=Adds special features for media files to the Thunar File Manager
-EAPI=5
-HOMEPAGE=https://goodies.xfce.org/projects/thunar-plugins/thunar-media-tags-plugin
-IUSE=debug
-KEYWORDS=amd64 x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=>=media-libs/taglib-1.6 >=x11-libs/gtk+-2.12:2 >=xfce-base/exo-0.6 >=xfce-base/thunar-1.2
-SLOT=0
-SRC_URI=mirror://xfce/src/thunar-plugins/thunar-media-tags-plugin/0.2/thunar-media-tags-plugin-0.2.1.tar.bz2
-_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25	xfconf	25bb7fe99d6e58851633dc43d429c5ae
-_md5_=dea0b1fe2ad09f48d322aeabf74a8dd4
diff --git a/metadata/md5-cache/xfce-extra/thunar-vcs-plugin-0.1.4 b/metadata/md5-cache/xfce-extra/thunar-vcs-plugin-0.1.4
deleted file mode 100644
index ee5aea5fafba..000000000000
--- a/metadata/md5-cache/xfce-extra/thunar-vcs-plugin-0.1.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=>=dev-libs/glib-2.18 >=x11-libs/gtk+-2.14:2 >=xfce-base/exo-0.6 >=xfce-base/libxfce4util-4.8 >=xfce-base/thunar-1.2 git? ( dev-vcs/git ) subversion? ( >=dev-libs/apr-0.9.7 >=dev-vcs/subversion-1.5 ) dev-util/intltool virtual/pkgconfig >=app-portage/elt-patches-20170422 >=sys-apps/sed-4
-DESCRIPTION=adds Subversion and GIT actions to the context menu of thunar
-EAPI=5
-HOMEPAGE=https://goodies.xfce.org/projects/thunar-plugins/thunar-vcs-plugin
-IUSE=debug +git +subversion
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.18 >=x11-libs/gtk+-2.14:2 >=xfce-base/exo-0.6 >=xfce-base/libxfce4util-4.8 >=xfce-base/thunar-1.2 git? ( dev-vcs/git ) subversion? ( >=dev-libs/apr-0.9.7 >=dev-vcs/subversion-1.5 )
-SLOT=0
-SRC_URI=mirror://xfce/src/thunar-plugins/thunar-vcs-plugin/0.1/thunar-vcs-plugin-0.1.4.tar.bz2 https://dev.gentoo.org/~ssuominen/thunar-vcs-plugin-0.1.4-el.po.bz2 https://dev.gentoo.org/~ssuominen/thunar-vcs-plugin-0.1.4-eu.po.bz2 mirror://gentoo/thunar-vcs-plugin-0.1.4-ru.po.bz2 https://dev.gentoo.org/~ssuominen/thunar-vcs-plugin-0.1.4-ug.po.bz2 https://dev.gentoo.org/~ssuominen/thunar-vcs-plugin-0.1.4-uk.po.bz2
-_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25	xfconf	25bb7fe99d6e58851633dc43d429c5ae
-_md5_=d7a251a5e59a184dacf25bca9f67d885
diff --git a/metadata/md5-cache/xfce-extra/thunar-volman-0.8.1 b/metadata/md5-cache/xfce-extra/thunar-volman-0.8.1
deleted file mode 100644
index c7aae84d4606..000000000000
--- a/metadata/md5-cache/xfce-extra/thunar-volman-0.8.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=>=dev-libs/glib-2.30 virtual/libgudev:= >=x11-libs/gtk+-2.24:2 >=xfce-base/exo-0.10 >=xfce-base/libxfce4ui-4.10 >=xfce-base/libxfce4util-4.10 >=xfce-base/xfconf-4.10 libnotify? ( >=x11-libs/libnotify-0.7 ) dev-util/intltool sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170422 >=sys-apps/sed-4
-DESCRIPTION=Daemon that enforces volume-related policies
-EAPI=5
-HOMEPAGE=https://goodies.xfce.org/projects/thunar-plugins/thunar-volman
-IUSE=debug libnotify
-KEYWORDS=alpha amd64 arm ~arm64 ia64 ppc ppc64 sparc x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.30 virtual/libgudev:= >=x11-libs/gtk+-2.24:2 >=xfce-base/exo-0.10 >=xfce-base/libxfce4ui-4.10 >=xfce-base/libxfce4util-4.10 >=xfce-base/xfconf-4.10 libnotify? ( >=x11-libs/libnotify-0.7 ) virtual/udev >=xfce-base/thunar-1.6[udisks]
-SLOT=0
-SRC_URI=mirror://xfce/src/apps/thunar-volman/0.8/thunar-volman-0.8.1.tar.bz2
-_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25	xfconf	25bb7fe99d6e58851633dc43d429c5ae
-_md5_=bef8b107215e33b47789f5530eea3863
diff --git a/metadata/md5-cache/xfce-extra/tumbler-0.1.31-r1 b/metadata/md5-cache/xfce-extra/tumbler-0.1.31-r1
deleted file mode 100644
index 3e07f2751b47..000000000000
--- a/metadata/md5-cache/xfce-extra/tumbler-0.1.31-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=>=dev-libs/dbus-glib-0.100:= >=dev-libs/glib-2.24:2= media-libs/freetype:2= media-libs/libpng:0= >=sys-apps/dbus-1.6:= >=x11-libs/gdk-pixbuf-2.14:2= curl? ( >=net-misc/curl-7.25:= ) ffmpeg? ( >=media-video/ffmpegthumbnailer-2.0.8:= ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) jpeg? ( virtual/jpeg:0= ) odf? ( >=gnome-extra/libgsf-1.14.20:= ) pdf? ( >=app-text/poppler-0.12.4[cairo] ) raw? ( >=media-libs/libopenraw-0.0.8:=[gtk] ) dev-util/gtk-doc-am dev-util/intltool sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170422 >=sys-apps/sed-4
-DESCRIPTION=A thumbnail service for the filemanager of Xfce desktop environment
-EAPI=5
-HOMEPAGE=https://docs.xfce.org/xfce/thunar/start
-IUSE=curl debug ffmpeg gstreamer jpeg odf pdf raw
-KEYWORDS=~alpha amd64 arm ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/dbus-glib-0.100:= >=dev-libs/glib-2.24:2= media-libs/freetype:2= media-libs/libpng:0= >=sys-apps/dbus-1.6:= >=x11-libs/gdk-pixbuf-2.14:2= curl? ( >=net-misc/curl-7.25:= ) ffmpeg? ( >=media-video/ffmpegthumbnailer-2.0.8:= ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) jpeg? ( virtual/jpeg:0= ) odf? ( >=gnome-extra/libgsf-1.14.20:= ) pdf? ( >=app-text/poppler-0.12.4[cairo] ) raw? ( >=media-libs/libopenraw-0.0.8:=[gtk] ) >=xfce-base/thunar-1.4 gstreamer? ( media-plugins/gst-plugins-meta:1.0 )
-SLOT=0
-SRC_URI=mirror://xfce/src/apps/tumbler/0.1/tumbler-0.1.31.tar.bz2
-_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25	xfconf	25bb7fe99d6e58851633dc43d429c5ae
-_md5_=3d90b9694c954ce2c36d8ec201a48170
diff --git a/metadata/md5-cache/xfce-extra/tumbler-0.1.32 b/metadata/md5-cache/xfce-extra/tumbler-0.1.32
deleted file mode 100644
index 57f313a2a212..000000000000
--- a/metadata/md5-cache/xfce-extra/tumbler-0.1.32
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=>=dev-libs/dbus-glib-0.100:= >=dev-libs/glib-2.24:2= media-libs/freetype:2= media-libs/libpng:0= >=sys-apps/dbus-1.6:= >=x11-libs/gdk-pixbuf-2.14:2= curl? ( >=net-misc/curl-7.25:= ) ffmpeg? ( >=media-video/ffmpegthumbnailer-2.0.8:= ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) jpeg? ( virtual/jpeg:0= ) odf? ( >=gnome-extra/libgsf-1.14.20:= ) pdf? ( >=app-text/poppler-0.12.4[cairo] ) raw? ( >=media-libs/libopenraw-0.0.8:=[gtk] ) dev-util/gtk-doc-am dev-util/intltool sys-devel/gettext virtual/pkgconfig
-DESCRIPTION=A thumbnail service for Thunar
-EAPI=6
-HOMEPAGE=https://docs.xfce.org/xfce/thunar/start
-IUSE=curl ffmpeg gstreamer jpeg odf pdf raw
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/dbus-glib-0.100:= >=dev-libs/glib-2.24:2= media-libs/freetype:2= media-libs/libpng:0= >=sys-apps/dbus-1.6:= >=x11-libs/gdk-pixbuf-2.14:2= curl? ( >=net-misc/curl-7.25:= ) ffmpeg? ( >=media-video/ffmpegthumbnailer-2.0.8:= ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) jpeg? ( virtual/jpeg:0= ) odf? ( >=gnome-extra/libgsf-1.14.20:= ) pdf? ( >=app-text/poppler-0.12.4[cairo] ) raw? ( >=media-libs/libopenraw-0.0.8:=[gtk] ) >=xfce-base/thunar-1.4 gstreamer? ( media-plugins/gst-plugins-meta:1.0 )
-SLOT=0
-SRC_URI=mirror://xfce/src/apps/tumbler/0.1/tumbler-0.1.32.tar.bz2
-_md5_=536f78042fa11c76d3fd132a5eeedb93
diff --git a/metadata/md5-cache/xfce-extra/xfce4-battery-plugin-1.0.5 b/metadata/md5-cache/xfce-extra/xfce4-battery-plugin-1.0.5
deleted file mode 100644
index c1791af275a1..000000000000
--- a/metadata/md5-cache/xfce-extra/xfce4-battery-plugin-1.0.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=>=dev-libs/glib-2.24 >=x11-libs/gtk+-2.20:2 >=xfce-base/libxfce4ui-4.8 >=xfce-base/libxfce4util-4.8 >=xfce-base/xfce4-panel-4.8 dev-util/intltool virtual/pkgconfig >=app-portage/elt-patches-20170422 >=sys-apps/sed-4
-DESCRIPTION=A battery monitor panel plugin for the Xfce desktop environment
-EAPI=5
-HOMEPAGE=https://goodies.xfce.org/projects/panel-plugins/xfce4-battery-plugin
-IUSE=debug kernel_linux
-KEYWORDS=amd64 ~arm ~mips ~ppc x86
-LICENSE=GPL-2 LGPL-2
-RDEPEND=>=dev-libs/glib-2.24 >=x11-libs/gtk+-2.20:2 >=xfce-base/libxfce4ui-4.8 >=xfce-base/libxfce4util-4.8 >=xfce-base/xfce4-panel-4.8
-SLOT=0
-SRC_URI=mirror://xfce/src/panel-plugins/xfce4-battery-plugin/1.0/xfce4-battery-plugin-1.0.5.tar.bz2
-_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25	xfconf	25bb7fe99d6e58851633dc43d429c5ae
-_md5_=7792543b44e00cf2fc31c2d683c173eb
diff --git a/metadata/md5-cache/xfce-extra/xfce4-clipman-plugin-1.2.6 b/metadata/md5-cache/xfce-extra/xfce4-clipman-plugin-1.2.6
deleted file mode 100644
index d9853eea064c..000000000000
--- a/metadata/md5-cache/xfce-extra/xfce4-clipman-plugin-1.2.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=>=dev-libs/glib-2.18 dev-libs/libunique:1 >=x11-libs/gtk+-2.14:2 x11-libs/libXtst >=xfce-base/exo-0.10 >=xfce-base/libxfce4ui-4.10 >=xfce-base/libxfce4util-4.10 >=xfce-base/xfce4-panel-4.10 >=xfce-base/xfconf-4.10 qrcode? ( >=media-gfx/qrencode-3.3.0 ) dev-util/intltool sys-devel/gettext virtual/pkgconfig x11-proto/xproto >=app-portage/elt-patches-20170422 >=sys-apps/sed-4
-DESCRIPTION=A clipboard manager plug-in for the Xfce panel
-EAPI=5
-HOMEPAGE=https://goodies.xfce.org/projects/panel-plugins/xfce4-clipman-plugin
-IUSE=debug qrcode
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.18 dev-libs/libunique:1 >=x11-libs/gtk+-2.14:2 x11-libs/libXtst >=xfce-base/exo-0.10 >=xfce-base/libxfce4ui-4.10 >=xfce-base/libxfce4util-4.10 >=xfce-base/xfce4-panel-4.10 >=xfce-base/xfconf-4.10 qrcode? ( >=media-gfx/qrencode-3.3.0 )
-SLOT=0
-SRC_URI=mirror://xfce/src/panel-plugins/xfce4-clipman-plugin/1.2/xfce4-clipman-plugin-1.2.6.tar.bz2
-_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25	xfconf	25bb7fe99d6e58851633dc43d429c5ae
-_md5_=25d81832df8ffd02761a357006342eae
diff --git a/metadata/md5-cache/xfce-extra/xfce4-datetime-plugin-0.6.2 b/metadata/md5-cache/xfce-extra/xfce4-datetime-plugin-0.6.2
deleted file mode 100644
index 2f69ccdfc685..000000000000
--- a/metadata/md5-cache/xfce-extra/xfce4-datetime-plugin-0.6.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=>=x11-libs/gtk+-2.24:2 >=xfce-base/libxfce4ui-4.10 >=xfce-base/libxfce4util-4.10 >=xfce-base/xfce4-panel-4.10 dev-util/intltool sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170422 >=sys-apps/sed-4
-DESCRIPTION=A panel plug-in with date, time and embedded calender
-EAPI=5
-HOMEPAGE=https://goodies.xfce.org/projects/panel-plugins/xfce4-datetime-plugin
-IUSE=debug
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=>=x11-libs/gtk+-2.24:2 >=xfce-base/libxfce4ui-4.10 >=xfce-base/libxfce4util-4.10 >=xfce-base/xfce4-panel-4.10
-SLOT=0
-SRC_URI=mirror://xfce/src/panel-plugins/xfce4-datetime-plugin/0.6/xfce4-datetime-plugin-0.6.2.tar.bz2
-_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25	xfconf	25bb7fe99d6e58851633dc43d429c5ae
-_md5_=4848e757c70cdd371c7d7d1714f7c69d
diff --git a/metadata/md5-cache/xfce-extra/xfce4-dict-0.7.2 b/metadata/md5-cache/xfce-extra/xfce4-dict-0.7.2
deleted file mode 100644
index 1832ed5c40e7..000000000000
--- a/metadata/md5-cache/xfce-extra/xfce4-dict-0.7.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=>=dev-libs/glib-2.24:= >=x11-libs/gtk+-2.20:2= >=xfce-base/libxfce4util-4.10:= >=xfce-base/libxfce4ui-4.10:= >=xfce-base/xfce4-panel-4.10:= dev-util/intltool virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 >=dev-util/xfce4-dev-tools-4.10
-DESCRIPTION=A dict.org querying application and panel plug-in for the Xfce desktop
-EAPI=5
-HOMEPAGE=https://goodies.xfce.org/projects/applications/xfce4-dict
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.24:= >=x11-libs/gtk+-2.20:2= >=xfce-base/libxfce4util-4.10:= >=xfce-base/libxfce4ui-4.10:= >=xfce-base/xfce4-panel-4.10:=
-SLOT=0
-SRC_URI=mirror://xfce/src/apps/xfce4-dict/0.7/xfce4-dict-0.7.2.tar.bz2
-_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25	xfconf	25bb7fe99d6e58851633dc43d429c5ae
-_md5_=2d4ea84c0f41c1db035364ab1db0b853
diff --git a/metadata/md5-cache/xfce-extra/xfce4-diskperf-plugin-2.5.5 b/metadata/md5-cache/xfce-extra/xfce4-diskperf-plugin-2.5.5
deleted file mode 100644
index e49623e14907..000000000000
--- a/metadata/md5-cache/xfce-extra/xfce4-diskperf-plugin-2.5.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=>=xfce-base/libxfce4ui-4.8:= >=xfce-base/xfce4-panel-4.8:= dev-util/intltool sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170422 >=sys-apps/sed-4
-DESCRIPTION=A panel plug-in for disk usage and performance statistics
-EAPI=5
-HOMEPAGE=https://goodies.xfce.org/projects/panel-plugins/xfce4-diskperf-plugin
-IUSE=debug
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux
-LICENSE=BSD-2
-RDEPEND=>=xfce-base/libxfce4ui-4.8:= >=xfce-base/xfce4-panel-4.8:=
-SLOT=0
-SRC_URI=mirror://xfce/src/panel-plugins/xfce4-diskperf-plugin/2.5/xfce4-diskperf-plugin-2.5.5.tar.bz2
-_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25	xfconf	25bb7fe99d6e58851633dc43d429c5ae
-_md5_=647383ecd84ebc66062ebf7745974485
diff --git a/metadata/md5-cache/xfce-extra/xfce4-equake-plugin-1.3.8 b/metadata/md5-cache/xfce-extra/xfce4-equake-plugin-1.3.8
deleted file mode 100644
index c4706dd64677..000000000000
--- a/metadata/md5-cache/xfce-extra/xfce4-equake-plugin-1.3.8
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=>=dev-libs/glib-2:= x11-libs/gtk+:2= x11-libs/libX11:= >=xfce-base/libxfce4ui-4.10:= >=xfce-base/libxfce4util-4.10:= >=xfce-base/xfce4-panel-4.10:= dev-util/intltool sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170422 >=sys-apps/sed-4
-DESCRIPTION=Panel plug-in that displays information about earthquakes at regular intervals
-EAPI=5
-HOMEPAGE=http://www.e-quake.org/
-IUSE=debug
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=>=dev-libs/glib-2:= x11-libs/gtk+:2= x11-libs/libX11:= >=xfce-base/libxfce4ui-4.10:= >=xfce-base/libxfce4util-4.10:= >=xfce-base/xfce4-panel-4.10:=
-SLOT=0
-SRC_URI=mirror://xfce/src/panel-plugins/xfce4-equake-plugin/1.3/xfce4-equake-plugin-1.3.8.tar.bz2
-_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25	xfconf	25bb7fe99d6e58851633dc43d429c5ae
-_md5_=dff6832f59fbe3bee21a82bcc9e07b82
diff --git a/metadata/md5-cache/xfce-extra/xfce4-fsguard-plugin-1.0.2 b/metadata/md5-cache/xfce-extra/xfce4-fsguard-plugin-1.0.2
deleted file mode 100644
index 52c1cb36e49a..000000000000
--- a/metadata/md5-cache/xfce-extra/xfce4-fsguard-plugin-1.0.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=x11-libs/gtk+:2= >=xfce-base/libxfce4ui-4.8:= >=xfce-base/libxfce4util-4.8:= >=xfce-base/xfce4-panel-4.8:= dev-util/intltool sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170422 >=sys-apps/sed-4
-DESCRIPTION=A filesystem guard plug-in for the Xfce panel
-EAPI=5
-HOMEPAGE=https://goodies.xfce.org/projects/panel-plugins/xfce4-fsguard-plugin
-IUSE=debug
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=GPL-3
-RDEPEND=x11-libs/gtk+:2= >=xfce-base/libxfce4ui-4.8:= >=xfce-base/libxfce4util-4.8:= >=xfce-base/xfce4-panel-4.8:=
-SLOT=0
-SRC_URI=mirror://xfce/src/panel-plugins/xfce4-fsguard-plugin/1.0/xfce4-fsguard-plugin-1.0.2.tar.bz2
-_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25	xfconf	25bb7fe99d6e58851633dc43d429c5ae
-_md5_=bc0bea86a806dd5c22882b65d743bf48
diff --git a/metadata/md5-cache/xfce-extra/xfce4-genmon-plugin-3.4.0 b/metadata/md5-cache/xfce-extra/xfce4-genmon-plugin-3.4.0
deleted file mode 100644
index 598b67f906a0..000000000000
--- a/metadata/md5-cache/xfce-extra/xfce4-genmon-plugin-3.4.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=>=xfce-base/libxfce4ui-4.8 >=xfce-base/xfce4-panel-4.8 dev-util/intltool sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170422 >=sys-apps/sed-4
-DESCRIPTION=Cyclically spawned executable output on the panel
-EAPI=5
-HOMEPAGE=https://goodies.xfce.org/projects/panel-plugins/xfce4-genmon-plugin
-IUSE=debug
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=LGPL-2.1
-RDEPEND=>=xfce-base/libxfce4ui-4.8 >=xfce-base/xfce4-panel-4.8
-SLOT=0
-SRC_URI=mirror://xfce/src/panel-plugins/xfce4-genmon-plugin/3.4/xfce4-genmon-plugin-3.4.0.tar.bz2
-_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25	xfconf	25bb7fe99d6e58851633dc43d429c5ae
-_md5_=3de942f9d7f3f2275fb2cee844149e15
diff --git a/metadata/md5-cache/xfce-extra/xfce4-genmon-plugin-4.0.0 b/metadata/md5-cache/xfce-extra/xfce4-genmon-plugin-4.0.0
deleted file mode 100644
index 6a001405dae5..000000000000
--- a/metadata/md5-cache/xfce-extra/xfce4-genmon-plugin-4.0.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DEPEND=>=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/xfce4-panel-4.12:= dev-util/intltool sys-devel/gettext virtual/pkgconfig
-DESCRIPTION=Cyclically spawned executable output on the panel
-EAPI=6
-HOMEPAGE=https://goodies.xfce.org/projects/panel-plugins/xfce4-genmon-plugin
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=LGPL-2.1
-RDEPEND=>=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/xfce4-panel-4.12:=
-SLOT=0
-SRC_URI=mirror://xfce/src/panel-plugins/xfce4-genmon-plugin/4.0/xfce4-genmon-plugin-4.0.0.tar.bz2
-_md5_=80be9e7bf0983c979c776a17192d0975
diff --git a/metadata/md5-cache/xfce-extra/xfce4-gvfs-mount-0.0.4 b/metadata/md5-cache/xfce-extra/xfce4-gvfs-mount-0.0.4
deleted file mode 100644
index b1a7ffffcf30..000000000000
--- a/metadata/md5-cache/xfce-extra/xfce4-gvfs-mount-0.0.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=>=dev-libs/dbus-glib-0.98 >=dev-libs/glib-2.24 >=gnome-base/libglade-2.6 >=x11-libs/gtk+-2.20:2 >=xfce-base/libxfce4util-4.8 >=xfce-base/libxfcegui4-4.8 >=xfce-base/xfce4-panel-4.8 dev-util/intltool virtual/pkgconfig >=app-portage/elt-patches-20170422 >=sys-apps/sed-4
-DESCRIPTION=A panel plug-in to mount remote filesystems for the Xfce desktop environment
-EAPI=5
-HOMEPAGE=https://goodies.xfce.org/projects/panel-plugins/xfce4-gvfs-mount
-KEYWORDS=~amd64 x86
-LICENSE=GPL-3
-RDEPEND=>=dev-libs/dbus-glib-0.98 >=dev-libs/glib-2.24 >=gnome-base/libglade-2.6 >=x11-libs/gtk+-2.20:2 >=xfce-base/libxfce4util-4.8 >=xfce-base/libxfcegui4-4.8 >=xfce-base/xfce4-panel-4.8
-SLOT=0
-SRC_URI=mirror://xfce/src/panel-plugins/xfce4-gvfs-mount/0.0/xfce4-gvfs-mount-0.0.4-6d2684b.tar.bz2
-_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25	xfconf	25bb7fe99d6e58851633dc43d429c5ae
-_md5_=0174874e9b370509b8bb0081025c6c0f
diff --git a/metadata/md5-cache/xfce-extra/xfce4-indicator-plugin-2.3.3-r2 b/metadata/md5-cache/xfce-extra/xfce4-indicator-plugin-2.3.3-r2
deleted file mode 100644
index 8a42f22e8796..000000000000
--- a/metadata/md5-cache/xfce-extra/xfce4-indicator-plugin-2.3.3-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm setup
-DEPEND=>=dev-libs/libindicator-12.10.1:3= >=x11-libs/gtk+-3.6:3= x11-libs/libX11:= >=xfce-base/libxfce4ui-4.11:=[gtk3(+)] >=xfce-base/libxfce4util-4.11:= >=xfce-base/xfce4-panel-4.11:= >=xfce-base/xfconf-4.10:= dev-util/intltool sys-devel/gettext virtual/pkgconfig >=sys-apps/sed-4
-DESCRIPTION=A panel plugin that uses indicator-applet to show new messages
-EAPI=6
-HOMEPAGE=https://goodies.xfce.org/projects/panel-plugins/xfce4-indicator-plugin
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 LGPL-2
-RDEPEND=>=dev-libs/libindicator-12.10.1:3= >=x11-libs/gtk+-3.6:3= x11-libs/libX11:= >=xfce-base/libxfce4ui-4.11:=[gtk3(+)] >=xfce-base/libxfce4util-4.11:= >=xfce-base/xfce4-panel-4.11:= >=xfce-base/xfconf-4.10:=
-SLOT=0
-SRC_URI=mirror://xfce/src/panel-plugins/xfce4-indicator-plugin/2.3/xfce4-indicator-plugin-2.3.3.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=860dc9380c4c648bfd4bfb704ef0cdfa
diff --git a/metadata/md5-cache/xfce-extra/xfce4-mount-plugin-0.6.7 b/metadata/md5-cache/xfce-extra/xfce4-mount-plugin-0.6.7
deleted file mode 100644
index 748898b37966..000000000000
--- a/metadata/md5-cache/xfce-extra/xfce4-mount-plugin-0.6.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=>=xfce-base/libxfce4ui-4.10 >=xfce-base/xfce4-panel-4.10 dev-util/intltool sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170422 >=sys-apps/sed-4
-DESCRIPTION=An mount plug-in for the Xfce panel
-EAPI=5
-HOMEPAGE=https://goodies.xfce.org/projects/panel-plugins/xfce4-mount-plugin
-IUSE=debug
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=>=xfce-base/libxfce4ui-4.10 >=xfce-base/xfce4-panel-4.10
-SLOT=0
-SRC_URI=mirror://xfce/src/panel-plugins/xfce4-mount-plugin/0.6/xfce4-mount-plugin-0.6.7.tar.bz2
-_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25	xfconf	25bb7fe99d6e58851633dc43d429c5ae
-_md5_=3a1f3d4587cc53e63ba1f6efad4a64b8
diff --git a/metadata/md5-cache/xfce-extra/xfce4-mpc-plugin-0.4.5 b/metadata/md5-cache/xfce-extra/xfce4-mpc-plugin-0.4.5
deleted file mode 100644
index 3443a03e6bd6..000000000000
--- a/metadata/md5-cache/xfce-extra/xfce4-mpc-plugin-0.4.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=>=xfce-base/exo-0.6:= >=xfce-base/libxfce4ui-4.8:= >=xfce-base/xfce4-panel-4.8:= libmpd? ( media-libs/libmpd:= ) dev-util/intltool virtual/pkgconfig >=app-portage/elt-patches-20170422 >=sys-apps/sed-4
-DESCRIPTION=Music Player Daemon (mpd) panel plugin
-EAPI=5
-HOMEPAGE=https://goodies.xfce.org/projects/panel-plugins/xfce4-mpc-plugin
-IUSE=debug +libmpd
-KEYWORDS=amd64 ~ppc ~ppc64 x86
-LICENSE=ISC
-RDEPEND=>=xfce-base/exo-0.6:= >=xfce-base/libxfce4ui-4.8:= >=xfce-base/xfce4-panel-4.8:= libmpd? ( media-libs/libmpd:= )
-SLOT=0
-SRC_URI=mirror://xfce/src/panel-plugins/xfce4-mpc-plugin/0.4/xfce4-mpc-plugin-0.4.5.tar.bz2
-_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25	xfconf	25bb7fe99d6e58851633dc43d429c5ae
-_md5_=71deb9624c99c2540745ca44d0bf8d7d
diff --git a/metadata/md5-cache/xfce-extra/xfce4-netload-plugin-1.2.4 b/metadata/md5-cache/xfce-extra/xfce4-netload-plugin-1.2.4
deleted file mode 100644
index f897e92527b1..000000000000
--- a/metadata/md5-cache/xfce-extra/xfce4-netload-plugin-1.2.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=>=xfce-base/libxfce4ui-4.10:= >=xfce-base/xfce4-panel-4.10:= dev-util/intltool virtual/pkgconfig >=app-portage/elt-patches-20170422 >=sys-apps/sed-4
-DESCRIPTION=A network load plug-in for the Xfce panel
-EAPI=5
-HOMEPAGE=https://goodies.xfce.org/projects/panel-plugins/xfce4-netload-plugin
-IUSE=debug
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=>=xfce-base/libxfce4ui-4.10:= >=xfce-base/xfce4-panel-4.10:=
-SLOT=0
-SRC_URI=mirror://xfce/src/panel-plugins/xfce4-netload-plugin/1.2/xfce4-netload-plugin-1.2.4.tar.bz2
-_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25	xfconf	25bb7fe99d6e58851633dc43d429c5ae
-_md5_=1741d99c96a5b3e7b20e24dbd2ea9841
diff --git a/metadata/md5-cache/xfce-extra/xfce4-notifyd-0.2.4 b/metadata/md5-cache/xfce-extra/xfce4-notifyd-0.2.4
deleted file mode 100644
index 5f49fb8c178a..000000000000
--- a/metadata/md5-cache/xfce-extra/xfce4-notifyd-0.2.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=>=dev-libs/dbus-glib-0.100 >=sys-apps/dbus-1.6 >=x11-libs/gtk+-2.14:2 >=x11-libs/libnotify-0.7 >=xfce-base/libxfce4ui-4.8 >=xfce-base/libxfce4util-4.8 >=xfce-base/xfconf-4.8 dev-util/intltool sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170422 >=sys-apps/sed-4
-DESCRIPTION=Notification daemon for the Xfce desktop environment
-EAPI=5
-HOMEPAGE=https://goodies.xfce.org/projects/applications/xfce4-notifyd
-IUSE=debug
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/dbus-glib-0.100 >=sys-apps/dbus-1.6 >=x11-libs/gtk+-2.14:2 >=x11-libs/libnotify-0.7 >=xfce-base/libxfce4ui-4.8 >=xfce-base/libxfce4util-4.8 >=xfce-base/xfconf-4.8
-SLOT=0
-SRC_URI=mirror://xfce/src/apps/xfce4-notifyd/0.2/xfce4-notifyd-0.2.4.tar.bz2
-_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25	xfconf	25bb7fe99d6e58851633dc43d429c5ae
-_md5_=4c42f6620c2412525180e2e4b97789bd
diff --git a/metadata/md5-cache/xfce-extra/xfce4-notifyd-0.3.6 b/metadata/md5-cache/xfce-extra/xfce4-notifyd-0.3.6
deleted file mode 100644
index ebf1ba175ee6..000000000000
--- a/metadata/md5-cache/xfce-extra/xfce4-notifyd-0.3.6
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=postinst postrm
-DEPEND=>=dev-libs/glib-2.42:2= >=x11-libs/gtk+-3.14:3= >=x11-libs/libnotify-0.7:= >=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/libxfce4util-4.12:= >=xfce-base/xfconf-4.10:= dev-util/gdbus-codegen dev-util/intltool sys-devel/gettext virtual/pkgconfig >=sys-apps/sed-4
-DESCRIPTION=Notification daemon for the Xfce desktop environment
-EAPI=6
-HOMEPAGE=https://goodies.xfce.org/projects/applications/xfce4-notifyd
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.42:2= >=x11-libs/gtk+-3.14:3= >=x11-libs/libnotify-0.7:= >=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/libxfce4util-4.12:= >=xfce-base/xfconf-4.10:=
-SLOT=0
-SRC_URI=mirror://xfce/src/apps/xfce4-notifyd/0.3/xfce4-notifyd-0.3.6.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=eded4019a12249444c3122231ad97c32
diff --git a/metadata/md5-cache/xfce-extra/xfce4-notifyd-0.4.0 b/metadata/md5-cache/xfce-extra/xfce4-notifyd-0.4.0
deleted file mode 100644
index cb753869a7b5..000000000000
--- a/metadata/md5-cache/xfce-extra/xfce4-notifyd-0.4.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=postinst postrm
-DEPEND=>=dev-libs/glib-2.42:2= >=x11-libs/gtk+-3.14:3= >=x11-libs/libnotify-0.7:= >=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/libxfce4util-4.12:= >=xfce-base/xfce4-panel-4.12:= >=xfce-base/xfconf-4.10:= dev-util/gdbus-codegen dev-util/intltool sys-devel/gettext virtual/pkgconfig >=sys-apps/sed-4
-DESCRIPTION=Notification daemon for the Xfce desktop environment
-EAPI=6
-HOMEPAGE=https://goodies.xfce.org/projects/applications/xfce4-notifyd
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.42:2= >=x11-libs/gtk+-3.14:3= >=x11-libs/libnotify-0.7:= >=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/libxfce4util-4.12:= >=xfce-base/xfce4-panel-4.12:= >=xfce-base/xfconf-4.10:=
-SLOT=0
-SRC_URI=mirror://xfce/src/apps/xfce4-notifyd/0.4/xfce4-notifyd-0.4.0.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=da2e141f2f6fbe3d19abef5a60ae1421
diff --git a/metadata/md5-cache/xfce-extra/xfce4-power-manager-1.6.0 b/metadata/md5-cache/xfce-extra/xfce4-power-manager-1.6.0
deleted file mode 100644
index 42cb4a627692..000000000000
--- a/metadata/md5-cache/xfce-extra/xfce4-power-manager-1.6.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=>=dev-libs/glib-2.42:= >=sys-power/upower-0.99.0 sys-power/pm-utils >=x11-libs/gtk+-3.14:3= >=x11-libs/libnotify-0.7 x11-libs/libX11:= x11-libs/libXScrnSaver:= >=x11-libs/libXrandr-1.2:= x11-libs/libXext:= x11-libs/libXtst:= >=xfce-base/xfconf-4.12:= >=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/libxfce4util-4.12:= policykit? ( >=sys-auth/polkit-0.112 !systemd? ( sys-auth/consolekit ) ) xfce_plugins_power? ( >=xfce-base/xfce4-panel-4.12:= ) dev-util/intltool sys-devel/gettext virtual/pkgconfig x11-proto/xproto >=app-portage/elt-patches-20170422 >=sys-apps/sed-4
-DESCRIPTION=Power manager for the Xfce desktop environment
-EAPI=5
-HOMEPAGE=https://goodies.xfce.org/projects/applications/xfce4-power-manager
-IUSE=debug kernel_linux networkmanager policykit systemd +xfce_plugins_power
-KEYWORDS=amd64 ~arm ppc ppc64 x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.42:= >=sys-power/upower-0.99.0 sys-power/pm-utils >=x11-libs/gtk+-3.14:3= >=x11-libs/libnotify-0.7 x11-libs/libX11:= x11-libs/libXScrnSaver:= >=x11-libs/libXrandr-1.2:= x11-libs/libXext:= x11-libs/libXtst:= >=xfce-base/xfconf-4.12:= >=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/libxfce4util-4.12:= policykit? ( >=sys-auth/polkit-0.112 !systemd? ( sys-auth/consolekit ) ) xfce_plugins_power? ( >=xfce-base/xfce4-panel-4.12:= ) networkmanager? ( net-misc/networkmanager )
-SLOT=0
-SRC_URI=mirror://xfce/src/apps/xfce4-power-manager/1.6/xfce4-power-manager-1.6.0.tar.bz2
-_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25	xfconf	25bb7fe99d6e58851633dc43d429c5ae
-_md5_=baac28568502155604cee3abb87dcdb7
diff --git a/metadata/md5-cache/xfce-extra/xfce4-power-manager-1.6.0-r1 b/metadata/md5-cache/xfce-extra/xfce4-power-manager-1.6.0-r1
deleted file mode 100644
index 3877e770a7d2..000000000000
--- a/metadata/md5-cache/xfce-extra/xfce4-power-manager-1.6.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm
-DEPEND=>=dev-libs/glib-2.42:= >=sys-power/upower-0.99.0 sys-power/pm-utils >=x11-libs/gtk+-3.14:3= >=x11-libs/libnotify-0.7:= x11-libs/libX11:= x11-libs/libXScrnSaver:= >=x11-libs/libXrandr-1.2:= x11-libs/libXext:= x11-libs/libXtst:= >=xfce-base/xfconf-4.12:= >=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/libxfce4util-4.12:= panel-plugin? ( >=xfce-base/xfce4-panel-4.12:= ) policykit? ( >=sys-auth/polkit-0.112 !systemd? ( sys-auth/consolekit ) ) dev-util/intltool sys-devel/gettext virtual/pkgconfig x11-proto/xproto >=sys-apps/sed-4
-DESCRIPTION=Power manager for the Xfce desktop environment
-EAPI=6
-HOMEPAGE=https://goodies.xfce.org/projects/applications/xfce4-power-manager
-IUSE=debug kernel_linux networkmanager +panel-plugin policykit systemd
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.42:= >=sys-power/upower-0.99.0 sys-power/pm-utils >=x11-libs/gtk+-3.14:3= >=x11-libs/libnotify-0.7:= x11-libs/libX11:= x11-libs/libXScrnSaver:= >=x11-libs/libXrandr-1.2:= x11-libs/libXext:= x11-libs/libXtst:= >=xfce-base/xfconf-4.12:= >=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/libxfce4util-4.12:= panel-plugin? ( >=xfce-base/xfce4-panel-4.12:= ) policykit? ( >=sys-auth/polkit-0.112 !systemd? ( sys-auth/consolekit ) ) networkmanager? ( net-misc/networkmanager )
-SLOT=0
-SRC_URI=mirror://xfce/src/apps/xfce4-power-manager/1.6/xfce4-power-manager-1.6.0.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c24fc5a481a3ac2b9c7fa8288f429bcd
diff --git a/metadata/md5-cache/xfce-extra/xfce4-pulseaudio-plugin-0.3.5 b/metadata/md5-cache/xfce-extra/xfce4-pulseaudio-plugin-0.3.5
deleted file mode 100644
index 33a0e30d49a0..000000000000
--- a/metadata/md5-cache/xfce-extra/xfce4-pulseaudio-plugin-0.3.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm
-DEPEND=>=dev-libs/glib-2.42.0:= media-sound/pulseaudio:= >=x11-libs/gtk+-3.20.0:3= >=xfce-base/libxfce4ui-4.11.0:=[gtk3(+)] >=xfce-base/libxfce4util-4.9.0:= >=xfce-base/xfce4-panel-4.11.0:= >=xfce-base/xfconf-4.6.0:= keybinder? ( dev-libs/keybinder:3= ) libnotify? ( x11-libs/libnotify:= ) wnck? ( x11-libs/libwnck:3= ) dev-util/intltool virtual/pkgconfig >=sys-apps/sed-4
-DESCRIPTION=A panel plug-in for PulseAudio volume control
-EAPI=6
-HOMEPAGE=https://git.xfce.org/panel-plugins/xfce4-pulseaudio-plugin/
-IUSE=debug keybinder libnotify wnck
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.42.0:= media-sound/pulseaudio:= >=x11-libs/gtk+-3.20.0:3= >=xfce-base/libxfce4ui-4.11.0:=[gtk3(+)] >=xfce-base/libxfce4util-4.9.0:= >=xfce-base/xfce4-panel-4.11.0:= >=xfce-base/xfconf-4.6.0:= keybinder? ( dev-libs/keybinder:3= ) libnotify? ( x11-libs/libnotify:= ) wnck? ( x11-libs/libwnck:3= )
-SLOT=0
-SRC_URI=mirror://xfce/src/panel-plugins/xfce4-pulseaudio-plugin/0.3/xfce4-pulseaudio-plugin-0.3.5.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=53258ed82fc8a0648df6b24aed1ddce8
diff --git a/metadata/md5-cache/xfce-extra/xfce4-smartbookmark-plugin-0.4.6 b/metadata/md5-cache/xfce-extra/xfce4-smartbookmark-plugin-0.4.6
deleted file mode 100644
index 4d4d15cf0518..000000000000
--- a/metadata/md5-cache/xfce-extra/xfce4-smartbookmark-plugin-0.4.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=x11-libs/gtk+:2= x11-libs/libX11:= >=xfce-base/libxfce4ui-4.10:= >=xfce-base/xfce4-panel-4.10:= dev-util/intltool sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170422 >=sys-apps/sed-4
-DESCRIPTION=Smart bookmark plug-in for the Xfce desktop environment
-EAPI=5
-HOMEPAGE=https://goodies.xfce.org/projects/panel-plugins/xfce4-smartbookmark-plugin
-IUSE=debug
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=x11-libs/gtk+:2= x11-libs/libX11:= >=xfce-base/libxfce4ui-4.10:= >=xfce-base/xfce4-panel-4.10:= >=xfce-base/exo-0.8
-SLOT=0
-SRC_URI=mirror://xfce/src/panel-plugins/xfce4-smartbookmark-plugin/0.4/xfce4-smartbookmark-plugin-0.4.6.tar.bz2
-_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25	xfconf	25bb7fe99d6e58851633dc43d429c5ae
-_md5_=956695e239347b9b05da5f1765bf6493
diff --git a/metadata/md5-cache/xfce-extra/xfce4-statusnotifier-plugin-0.2.0 b/metadata/md5-cache/xfce-extra/xfce4-statusnotifier-plugin-0.2.0
deleted file mode 100644
index d1ff18fa507a..000000000000
--- a/metadata/md5-cache/xfce-extra/xfce4-statusnotifier-plugin-0.2.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=>=dev-libs/glib-2.24:= >=dev-libs/libdbusmenu-16.04.0:=[gtk3] >=x11-libs/gtk+-3.18:3= x11-libs/libX11:= >=xfce-base/libxfce4ui-4.12:= >=xfce-base/libxfce4util-4.12:= >=xfce-base/xfce4-panel-4.12:= >=xfce-base/xfconf-4.12:= dev-util/gdbus-codegen >=sys-apps/sed-4
-DESCRIPTION=A panel area for fd.o Status Notifiers (systray replacement)
-EAPI=6
-HOMEPAGE=https://goodies.xfce.org/projects/panel-plugins/xfce4-statusnotifier-plugin
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.24:= >=dev-libs/libdbusmenu-16.04.0:=[gtk3] >=x11-libs/gtk+-3.18:3= x11-libs/libX11:= >=xfce-base/libxfce4ui-4.12:= >=xfce-base/libxfce4util-4.12:= >=xfce-base/xfce4-panel-4.12:= >=xfce-base/xfconf-4.12:=
-SLOT=0
-SRC_URI=mirror://xfce/src/panel-plugins/xfce4-statusnotifier-plugin/0.2/xfce4-statusnotifier-plugin-0.2.0.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2b5741eb49850a16beecb398768d6778
diff --git a/metadata/md5-cache/xfce-extra/xfce4-systemload-plugin-1.1.2 b/metadata/md5-cache/xfce-extra/xfce4-systemload-plugin-1.1.2
deleted file mode 100644
index 575701bbb94f..000000000000
--- a/metadata/md5-cache/xfce-extra/xfce4-systemload-plugin-1.1.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=>=x11-libs/gtk+-2.6:2= >=xfce-base/libxfce4ui-4.10:= >=xfce-base/libxfce4util-4.10:= >=xfce-base/xfce4-panel-4.10:= upower? ( || ( >=sys-power/upower-0.9.23 sys-power/upower-pm-utils ) ) dev-util/intltool virtual/pkgconfig >=app-portage/elt-patches-20170422 >=sys-apps/sed-4
-DESCRIPTION=System load plug-in for Xfce panel
-EAPI=5
-HOMEPAGE=https://goodies.xfce.org/projects/panel-plugins/xfce4-systemload-plugin
-IUSE=debug upower
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=BSD-2
-RDEPEND=>=x11-libs/gtk+-2.6:2= >=xfce-base/libxfce4ui-4.10:= >=xfce-base/libxfce4util-4.10:= >=xfce-base/xfce4-panel-4.10:= upower? ( || ( >=sys-power/upower-0.9.23 sys-power/upower-pm-utils ) )
-SLOT=0
-SRC_URI=mirror://xfce/src/panel-plugins/xfce4-systemload-plugin/1.1/xfce4-systemload-plugin-1.1.2.tar.bz2
-_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25	xfconf	25bb7fe99d6e58851633dc43d429c5ae
-_md5_=1928af590553de9202d9b9bc87bb7b11
diff --git a/metadata/md5-cache/xfce-extra/xfce4-taskmanager-1.0.1 b/metadata/md5-cache/xfce-extra/xfce4-taskmanager-1.0.1
deleted file mode 100644
index f9bff1aff591..000000000000
--- a/metadata/md5-cache/xfce-extra/xfce4-taskmanager-1.0.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=x11-libs/cairo >=x11-libs/gtk+-2.12:2 x11-libs/libwnck:1 gksu? ( x11-libs/libgksu:2 ) dev-util/intltool sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170422 >=sys-apps/sed-4
-DESCRIPTION=Task Manager
-EAPI=5
-HOMEPAGE=https://goodies.xfce.org/projects/applications/xfce4-taskmanager
-IUSE=debug gksu
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=x11-libs/cairo >=x11-libs/gtk+-2.12:2 x11-libs/libwnck:1 gksu? ( x11-libs/libgksu:2 )
-SLOT=0
-SRC_URI=mirror://xfce/src/apps/xfce4-taskmanager/1.0/xfce4-taskmanager-1.0.1.tar.bz2
-_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25	xfconf	25bb7fe99d6e58851633dc43d429c5ae
-_md5_=1941d8d54450bed6a3fd252f3bed0b1e
diff --git a/metadata/md5-cache/xfce-extra/xfce4-taskmanager-1.1.0 b/metadata/md5-cache/xfce-extra/xfce4-taskmanager-1.1.0
deleted file mode 100644
index 42a984825dd0..000000000000
--- a/metadata/md5-cache/xfce-extra/xfce4-taskmanager-1.1.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=x11-libs/cairo:= gtk3? ( x11-libs/gtk+:3= x11-libs/libwnck:3= ) !gtk3? ( >=x11-libs/gtk+-2.12:2= x11-libs/libwnck:1= gksu? ( x11-libs/libgksu:2= ) ) dev-util/intltool sys-devel/gettext >=x11-libs/gtk+-2.12:2= virtual/pkgconfig >=app-portage/elt-patches-20170422 >=sys-apps/sed-4
-DESCRIPTION=Task Manager
-EAPI=5
-HOMEPAGE=https://goodies.xfce.org/projects/applications/xfce4-taskmanager
-IUSE=debug gksu gtk3
-KEYWORDS=alpha amd64 arm ~arm64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=x11-libs/cairo:= gtk3? ( x11-libs/gtk+:3= x11-libs/libwnck:3= ) !gtk3? ( >=x11-libs/gtk+-2.12:2= x11-libs/libwnck:1= gksu? ( x11-libs/libgksu:2= ) )
-REQUIRED_USE=gksu? ( !gtk3 )
-SLOT=0
-SRC_URI=mirror://xfce/src/apps/xfce4-taskmanager/1.1/xfce4-taskmanager-1.1.0.tar.bz2
-_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25	xfconf	25bb7fe99d6e58851633dc43d429c5ae
-_md5_=e13e8cf99bc2b6fb3621871cc1216172
diff --git a/metadata/md5-cache/xfce-extra/xfce4-volumed-pulse-0.2.0 b/metadata/md5-cache/xfce-extra/xfce4-volumed-pulse-0.2.0
deleted file mode 100644
index 56c2c4939267..000000000000
--- a/metadata/md5-cache/xfce-extra/xfce4-volumed-pulse-0.2.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=>=dev-libs/glib-2.16 dev-libs/keybinder:0 >=media-sound/pulseaudio-0.9.19[glib] >=x11-libs/gtk+-2.20:2 >=xfce-base/xfconf-4.8 libnotify? ( x11-libs/libnotify ) virtual/pkgconfig >=app-portage/elt-patches-20170422 >=sys-apps/sed-4
-DESCRIPTION=Daemon to control volume up/down and mute keys for pulseaudio
-EAPI=5
-HOMEPAGE=https://launchpad.net/xfce4-volumed-pulse
-IUSE=debug libnotify
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=>=dev-libs/glib-2.16 dev-libs/keybinder:0 >=media-sound/pulseaudio-0.9.19[glib] >=x11-libs/gtk+-2.20:2 >=xfce-base/xfconf-4.8 libnotify? ( x11-libs/libnotify )
-SLOT=0
-SRC_URI=https://launchpad.net/xfce4-volumed-pulse/trunk/0.2.0/+download/xfce4-volumed-pulse-0.2.0.tar.bz2
-_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25	xfconf	25bb7fe99d6e58851633dc43d429c5ae
-_md5_=50fa00820930c973933529d1afcfeb69
diff --git a/metadata/md5-cache/xfce-extra/xfce4-wavelan-plugin-0.5.12 b/metadata/md5-cache/xfce-extra/xfce4-wavelan-plugin-0.5.12
deleted file mode 100644
index 6041771c7735..000000000000
--- a/metadata/md5-cache/xfce-extra/xfce4-wavelan-plugin-0.5.12
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=>=xfce-base/libxfce4ui-4.8:= >=xfce-base/libxfce4util-4.8:= >=xfce-base/xfce4-panel-4.8:= dev-util/intltool sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170422 >=sys-apps/sed-4
-DESCRIPTION=A panel plug-in to display wireless interface statistics
-EAPI=5
-HOMEPAGE=https://goodies.xfce.org/projects/panel-plugins/xfce4-wavelan-plugin
-IUSE=debug kernel_linux
-KEYWORDS=amd64 ~arm ~hppa ~ppc ~ppc64 x86
-LICENSE=BSD-2
-RDEPEND=>=xfce-base/libxfce4ui-4.8:= >=xfce-base/libxfce4util-4.8:= >=xfce-base/xfce4-panel-4.8:= kernel_linux? ( sys-apps/net-tools )
-SLOT=0
-SRC_URI=mirror://xfce/src/panel-plugins/xfce4-wavelan-plugin/0.5/xfce4-wavelan-plugin-0.5.12.tar.bz2
-_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25	xfconf	25bb7fe99d6e58851633dc43d429c5ae
-_md5_=82d2ff816430cd5508bfd700b09a02bc
diff --git a/metadata/md5-cache/xfce-extra/xfce4-weather-plugin-0.8.8 b/metadata/md5-cache/xfce-extra/xfce4-weather-plugin-0.8.8
deleted file mode 100644
index dc681a6148fa..000000000000
--- a/metadata/md5-cache/xfce-extra/xfce4-weather-plugin-0.8.8
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=>=dev-libs/glib-2.20:= dev-libs/libxml2:= >=net-libs/libsoup-2.32:= >=x11-libs/gtk+-2.14:2= >=xfce-base/libxfce4ui-4.10:= >=xfce-base/libxfce4util-4.10:= >=xfce-base/xfce4-panel-4.10:= upower? ( || ( >=sys-power/upower-0.9.23 sys-power/upower-pm-utils ) ) dev-util/intltool virtual/pkgconfig >=app-portage/elt-patches-20170422 >=sys-apps/sed-4
-DESCRIPTION=A weather plug-in for the Xfce desktop environment
-EAPI=5
-HOMEPAGE=https://goodies.xfce.org/projects/panel-plugins/xfce4-weather-plugin
-IUSE=debug upower
-KEYWORDS=amd64 ~arm ~ppc ~ppc64 x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.20:= dev-libs/libxml2:= >=net-libs/libsoup-2.32:= >=x11-libs/gtk+-2.14:2= >=xfce-base/libxfce4ui-4.10:= >=xfce-base/libxfce4util-4.10:= >=xfce-base/xfce4-panel-4.10:= upower? ( || ( >=sys-power/upower-0.9.23 sys-power/upower-pm-utils ) )
-SLOT=0
-SRC_URI=mirror://xfce/src/panel-plugins/xfce4-weather-plugin/0.8/xfce4-weather-plugin-0.8.8.tar.bz2
-_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25	xfconf	25bb7fe99d6e58851633dc43d429c5ae
-_md5_=065bc3754272f77707c3369b766a0f71
diff --git a/metadata/md5-cache/xfce-extra/xfce4-weather-plugin-0.8.9 b/metadata/md5-cache/xfce-extra/xfce4-weather-plugin-0.8.9
deleted file mode 100644
index 661a7f319a1c..000000000000
--- a/metadata/md5-cache/xfce-extra/xfce4-weather-plugin-0.8.9
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure
-DEPEND=>=dev-libs/glib-2.20:= dev-libs/libxml2:= >=net-libs/libsoup-2.32:=[ssl] >=x11-libs/gtk+-2.14:2= >=xfce-base/libxfce4ui-4.10:= >=xfce-base/libxfce4util-4.10:= >=xfce-base/xfce4-panel-4.10:= upower? ( || ( >=sys-power/upower-0.9.23 sys-power/upower-pm-utils ) ) dev-util/intltool virtual/pkgconfig
-DESCRIPTION=A weather plug-in for the Xfce desktop environment
-EAPI=6
-HOMEPAGE=https://goodies.xfce.org/projects/panel-plugins/xfce4-weather-plugin
-IUSE=upower
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.20:= dev-libs/libxml2:= >=net-libs/libsoup-2.32:=[ssl] >=x11-libs/gtk+-2.14:2= >=xfce-base/libxfce4ui-4.10:= >=xfce-base/libxfce4util-4.10:= >=xfce-base/xfce4-panel-4.10:= upower? ( || ( >=sys-power/upower-0.9.23 sys-power/upower-pm-utils ) )
-SLOT=0
-SRC_URI=mirror://xfce/src/panel-plugins/xfce4-weather-plugin/0.8/xfce4-weather-plugin-0.8.9.tar.bz2
-_md5_=de14c8786ca4d897f9cf7a5203d791e0
diff --git a/metadata/md5-cache/xfce-extra/xfce4-whiskermenu-plugin-1.6.0 b/metadata/md5-cache/xfce-extra/xfce4-whiskermenu-plugin-1.6.0
deleted file mode 100644
index cfd0a626f8ad..000000000000
--- a/metadata/md5-cache/xfce-extra/xfce4-whiskermenu-plugin-1.6.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=virtual/libintl:= x11-libs/gtk+:2= xfce-base/exo:= xfce-base/garcon:= xfce-base/libxfce4ui:= xfce-base/libxfce4util:= xfce-base/xfce4-panel:= sys-devel/gettext virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
-DESCRIPTION=Alternate application launcher for Xfce
-EAPI=6
-HOMEPAGE=https://gottcode.org/xfce4-whiskermenu-plugin
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-2
-RDEPEND=virtual/libintl:= x11-libs/gtk+:2= xfce-base/exo:= xfce-base/garcon:= xfce-base/libxfce4ui:= xfce-base/libxfce4util:= xfce-base/xfce4-panel:=
-SLOT=0
-SRC_URI=https://github.com/gottcode/xfce4-whiskermenu-plugin/archive/v1.6.0.tar.gz -> xfce4-whiskermenu-plugin-1.6.0.tar.gz
-_eclasses_=cmake-utils	b8d2d7038bb36192aa14e01c64e5a06a	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5a615e6d42ca5bc284b7cc292f456420
diff --git a/metadata/md5-cache/xfce-extra/xfce4-whiskermenu-plugin-1.7.4 b/metadata/md5-cache/xfce-extra/xfce4-whiskermenu-plugin-1.7.4
deleted file mode 100644
index b54c88c7a531..000000000000
--- a/metadata/md5-cache/xfce-extra/xfce4-whiskermenu-plugin-1.7.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=virtual/libintl:= x11-libs/gtk+:2= xfce-base/exo:= xfce-base/garcon:= xfce-base/libxfce4ui:= xfce-base/libxfce4util:= xfce-base/xfce4-panel:= sys-devel/gettext virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
-DESCRIPTION=Alternate application launcher for Xfce
-EAPI=6
-HOMEPAGE=https://gottcode.org/xfce4-whiskermenu-plugin
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=virtual/libintl:= x11-libs/gtk+:2= xfce-base/exo:= xfce-base/garcon:= xfce-base/libxfce4ui:= xfce-base/libxfce4util:= xfce-base/xfce4-panel:=
-SLOT=0
-SRC_URI=mirror://xfce/src/panel-plugins/xfce4-whiskermenu-plugin/1.7/xfce4-whiskermenu-plugin-1.7.4.tar.bz2
-_eclasses_=cmake-utils	b8d2d7038bb36192aa14e01c64e5a06a	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=de90f1b7756690cd287639ecf0951eb3
diff --git a/metadata/md5-cache/xfce-extra/xfce4-whiskermenu-plugin-2.1.4 b/metadata/md5-cache/xfce-extra/xfce4-whiskermenu-plugin-2.1.4
deleted file mode 100644
index bc628807103f..000000000000
--- a/metadata/md5-cache/xfce-extra/xfce4-whiskermenu-plugin-2.1.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=virtual/libintl:= x11-libs/gtk+:3= >=xfce-base/exo-0.11.0:= xfce-base/garcon:= xfce-base/libxfce4ui:= xfce-base/libxfce4util:= xfce-base/xfce4-panel:= sys-devel/gettext virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
-DESCRIPTION=Alternate application launcher for Xfce
-EAPI=6
-HOMEPAGE=https://gottcode.org/xfce4-whiskermenu-plugin
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=virtual/libintl:= x11-libs/gtk+:3= >=xfce-base/exo-0.11.0:= xfce-base/garcon:= xfce-base/libxfce4ui:= xfce-base/libxfce4util:= xfce-base/xfce4-panel:=
-SLOT=0
-SRC_URI=mirror://xfce/src/panel-plugins/xfce4-whiskermenu-plugin/2.1/xfce4-whiskermenu-plugin-2.1.4.tar.bz2
-_eclasses_=cmake-utils	b8d2d7038bb36192aa14e01c64e5a06a	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=714e028a6534869f9c79c7d5bb859da4
diff --git a/metadata/md5-cache/xfce-extra/xfce4-xkb-plugin-0.7.1-r1 b/metadata/md5-cache/xfce-extra/xfce4-xkb-plugin-0.7.1-r1
deleted file mode 100644
index 3cc1ca8460a0..000000000000
--- a/metadata/md5-cache/xfce-extra/xfce4-xkb-plugin-0.7.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=>=gnome-base/librsvg-2.36.2:= x11-libs/gtk+:2= >=x11-libs/libwnck-2.12:1= x11-libs/libX11:= >=x11-libs/libxklavier-5:= >=xfce-base/garcon-0.1.5:= >=xfce-base/libxfce4ui-4.11:= >=xfce-base/libxfce4util-4.11:= >=xfce-base/xfce4-panel-4.11:= dev-util/intltool sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170422 >=sys-apps/sed-4
-DESCRIPTION=XKB layout switching panel plug-in for the Xfce desktop environment
-EAPI=5
-HOMEPAGE=https://goodies.xfce.org/projects/panel-plugins/xfce4-xkb-plugin
-IUSE=debug
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=BSD-2 GPL-2+
-RDEPEND=>=gnome-base/librsvg-2.36.2:= x11-libs/gtk+:2= >=x11-libs/libwnck-2.12:1= x11-libs/libX11:= >=x11-libs/libxklavier-5:= >=xfce-base/garcon-0.1.5:= >=xfce-base/libxfce4ui-4.11:= >=xfce-base/libxfce4util-4.11:= >=xfce-base/xfce4-panel-4.11:= x11-apps/setxkbmap >=xfce-base/xfce4-settings-4.11
-SLOT=0
-SRC_URI=mirror://xfce/src/panel-plugins/xfce4-xkb-plugin/0.7/xfce4-xkb-plugin-0.7.1.tar.bz2
-_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25	xfconf	25bb7fe99d6e58851633dc43d429c5ae
-_md5_=a73b06471f29ff4b29fbe3b986897fad
diff --git a/metadata/md5-cache/xfce-extra/xfce4-xkb-plugin-0.8.0 b/metadata/md5-cache/xfce-extra/xfce4-xkb-plugin-0.8.0
deleted file mode 100644
index 3990dcba3d59..000000000000
--- a/metadata/md5-cache/xfce-extra/xfce4-xkb-plugin-0.8.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure
-DEPEND=gnome-base/librsvg:= x11-libs/gtk+:3= x11-libs/libwnck:3= x11-libs/libX11:= >=x11-libs/libxklavier-5.4:= xfce-base/garcon:= >=xfce-base/libxfce4ui-4.12:= >=xfce-base/libxfce4util-4.12:= >=xfce-base/xfce4-panel-4.12:= >=xfce-base/xfconf-4.12.1:= dev-util/intltool sys-devel/gettext virtual/pkgconfig
-DESCRIPTION=XKB layout switching panel plug-in for the Xfce desktop environment
-EAPI=6
-HOMEPAGE=https://goodies.xfce.org/projects/panel-plugins/xfce4-xkb-plugin
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=BSD-2 GPL-2+
-RDEPEND=gnome-base/librsvg:= x11-libs/gtk+:3= x11-libs/libwnck:3= x11-libs/libX11:= >=x11-libs/libxklavier-5.4:= xfce-base/garcon:= >=xfce-base/libxfce4ui-4.12:= >=xfce-base/libxfce4util-4.12:= >=xfce-base/xfce4-panel-4.12:= >=xfce-base/xfconf-4.12.1:= x11-apps/setxkbmap >=xfce-base/xfce4-settings-4.11
-SLOT=0
-SRC_URI=mirror://xfce/src/panel-plugins/xfce4-xkb-plugin/0.8/xfce4-xkb-plugin-0.8.0.tar.bz2
-_md5_=8a9e1925f6a5cfb7e26487b381d68070
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 10c70454a27c..9ea165fa40f6 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 19389 BLAKE2B 7284bb20afdbc54d8fd10daa6eb23af34e945b7de42dc8636dc389c9aed99f768d74320549dacb305de33c63f2c9137b1cf164cb6f2c633dfde66d4866cfdab2 SHA512 f51acb92afe4d097909da2fa27ac72f1ec0347e9d8b12fc0e002557278915c403b4870c0ddabbc2fad68799e6ad2cbd835fb9cc74577916255a94d1f3d50a682
-TIMESTAMP 2018-03-24T09:38:27Z
+TIMESTAMP 2018-03-25T17:38:30Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlq2HJNfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlq33pdfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDXJA//cHzcpVxbvDIfLxnC65TtS+/wJxVyEEGBR++CJLGc5cHrjJQTJ+RYrWeI
-YnroFg77sIaJdveJ/fEr27Zgi2a6S3Tmw4RfTA7TYRZ9RxiS8F5K8Dy+JQXmUtCF
-Z+l2A2cr39jodL4Eu53a/rNGEDnxwHE62wrW8vyCMQHwGQIvGjNdLjrzXM8TpE5h
-Oq39sPhy8OvuFE0CpaKj2vb6krTnjw5foAbRCuJUWHKFpf2zHyRCDVppw98g8RF/
-Svhu+1RLzdRtiMYcaQeG/nQKewsKuXE+HSzVfnVreqMeJABT1dJI35lt5oFqXBg9
-OceR4HnnODbRkGxfyMLLMfSWeAcRIdba77WJaUoT7ZeQI6wH3otaZaVF0886iOC5
-Ow5QJMYsuwbrVZc/vf7yHl5m8H6QqmEx6ircb7trMTFD+BaXtj2tS9sNi+geJlY0
-bhYt98nRKCCAtFwFSVfBa+yi2+SCg+njEMRwHNh94w1xSw43OWneSMxZI+Fzowix
-SBCXmkJqW+IJGLsqomy5SWxNQPLmzac8TutqkBYM5JjUyzjwpq2TGc57AAnReQ0U
-dr7auGiKs2pc83AkCXocq/J7+jNuC7PEzsYg97SAvoO/3ubiaV3LbrMp2tXY8YNg
-j89pdve5j0nAgxD6jgwgEES1JGmul0yt+twa3WWE/gd7S84Dya8=
-=SJpI
+klB1RhAAnYSfF3HgVQA4IgeUoUO2YhZtZp4FG2eXcE97CGannSpoeHHNse8s81RC
++OftCxpdep0CwcTEspl4DbA9TMVP0NrXHFKRD+RoOVfqyhXzEiZFDw7bzhIkGtdy
+fj6Yu20cYJ6JQw7VahT4ExRAGarFMfaQe58/iT04aU8R+zSeQ/QlsZq3hG1OqCTY
+6w/ROIBquokNDlIYkUSdOvgQTv4bWA4j9pA281cKDMZLoEKrPiOaIc8IVVBoeZzT
+gSG9Fy+HuU0gydrDKBaB6PxfYfqy40azxUhTDMUNQZ33HcfKON676nA+PKiQx/2L
+c3oABbwOl2xN8IfZLQoelxSy6kN67Wr9icAwwOkpCd8mdaxdsVZkhR+Bwa1Hs9ar
+r+6MLD11OGCFi1tei+T8A4ABBuNjexJIW9kjIn1I1H00yYIsOKHYb8h4B7vGxGml
+xMoK+W+aVeT6pHNuORYXnKBo7A6vr4bOghwgYG+uf5WUoyCvehQzRuxtIlttRQEE
+pGWC/yjt+GzCNQco+UMNLphgrveD2reqqePFDae2oHf8K6BSeEwa7IMnZrm90Yjz
+gHVIAROUF/6CtyQ0p2qmrP3dfSjrzHLIdTDGVTraM7qMke6HG0y30CsS7Zww5zJk
+SVu1sObS1hHw9lMD/dplSDVRn07qB+rUoH+1QUTHZyQ11YpneHg=
+=C3Ef
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index ae0ba7dc5745..24bf41cfcf56 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Sat, 24 Mar 2018 09:38:23 +0000
+Sun, 25 Mar 2018 17:38:27 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 67543ddde4fb..b7342684e574 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Sat Mar 24 09:38:23 UTC 2018
+Sun Mar 25 17:38:27 UTC 2018
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 377b6af56f71..0584f5bcb7dc 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Sat, 24 Mar 2018 09:45:01 +0000
+Sun, 25 Mar 2018 17:45:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index e3622ede5761..cb7b76566e11 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-b272f01ac9a8cad378882a31b0a442f04c2d015b 1521881795 2018-03-24T08:56:35+00:00
+f5107b5ce867dd22af19f17f8cdd51dcbaea9686 1521998863 2018-03-25T17:27:43+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 1d1b42a62778..22c01372d5b9 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1521884101 Sat 24 Mar 2018 09:35:01 AM UTC
+1521999301 Sun 25 Mar 2018 05:35:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index ae0ba7dc5745..24bf41cfcf56 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Sat, 24 Mar 2018 09:38:23 +0000
+Sun, 25 Mar 2018 17:38:27 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 2d7ef85c8683..797df44d4cb0 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/rrdtool/Manifest b/net-analyzer/rrdtool/Manifest
index 6804a98a3150..3bbe4ab8ceea 100644
--- a/net-analyzer/rrdtool/Manifest
+++ b/net-analyzer/rrdtool/Manifest
@@ -9,6 +9,6 @@ AUX rrdtool-1.6.0-configure.ac.patch 537 BLAKE2B c90a5b9e2ef8fcba87947e6091c4de0
 AUX rrdtool-1.7.0-disable-rrd_graph-cgi.patch 1249 BLAKE2B 91dc764b7629ec517ff35362dc31605ab0428be4291afe5bd0a5c9c901bdd85a989cf1dcb33e247a7f79d8b155daf02d512691c38e72b8d2be3691d9733e5dc9 SHA512 5c2d192919e31a91cd600ed0e11346a4cbb1c66f93abbb583f20882d03705972eb4ed3156a9cae9a589aa5d26009037deb280569baf940966887483c6dbefb81
 DIST rrdtool-1.6.0.tar.gz 2186538 BLAKE2B b56ef79b9d45a65cacd7c1d8da2158dcaaff3ebc2ffc0640081cdc2fa3ac643be1ce48a2cac60427a836dc3e457ddb042c95533d0ffbcdefa2978f5659150391 SHA512 45a8f16a2bda9d497c5f39de80236adb7a5bd054a14755c4d130f21cd6430bd0a76caef9632994be56fd1ea2364eb218687ea8ebf945a71ca411221c248f3ebd
 DIST rrdtool-1.7.0.tar.gz 2849994 BLAKE2B f7a91fa661728850af55356a69b61ea1d4343c79579823e025e0a0757d1dab0d2cda6387197ece20e07f33a657743350cadfaf6504500f13be472d18e8826a3f SHA512 36d979561601135d74622eaf183701de15cba5e25118f7a308926a695ba84ecb33c3d16511bf4bc80cff055853e2eb85065bc4ed8aef19fc0277c6430ecd319f
-EBUILD rrdtool-1.6.0-r1.ebuild 4252 BLAKE2B 71ea024eda1113e8aa7c0b682fdc2bc565854e1ee97545ae7e1ab75795f58d623d47684fbb34aa771fc96e02d49885f72d12c119804ec1f8343d5385aa5064bc SHA512 8055b0432db0c7a728e0d5ddc699457d0203464192ffcc8a6fd1c1abe1206856f9f83feaff82995ec4f775d030bb0363a953cb56697a7604b412dbd1e1bb5298
-EBUILD rrdtool-1.7.0.ebuild 4310 BLAKE2B 3084372a08723bf67e31eafad1b38f74a650710a1e5abbbc3c06857d21a9535d5d3d0860d3751ab431e5f09a21917a08e875e383a0ae7613932cda6a23fde083 SHA512 e7813b76116883440c66108b1b15481f7a7a3a665b39f11c3ea719372563b5e983749a9b2b2f8d61cdc808ea37230cc08e250d67a301b4271bc3819bf5d79e7e
+EBUILD rrdtool-1.6.0-r1.ebuild 4246 BLAKE2B 02403955767076ad3b3cd33532bce9b929ddeaef9f4e864f9166058a04b2c66b6e95f6ab14ddbe75b04b3035719883017e075d01342b8d5d19376b96b1683665 SHA512 58357968c80b0894410e4857dd65c7c92ff14a1cd1b6b3293f98935464b3c0e1e2a37291977c18947c083d1f203069b20184b6bb2f140ba241ab8051473b114c
+EBUILD rrdtool-1.7.0.ebuild 4304 BLAKE2B 1ccb1a2f9db16542b09fef8b99a76ac6a1f825f8fe68be9a29cc52f4d40dade564540bae98b067a9b20bf8c2e63038845f9cfc1dc4a06a608821e102f0fe53e2 SHA512 b407cb0f83a846c0621e1ae33be704195a6584e0a09994ed0b51cbe8a0b93ec674790d45ee0cf6297411bdb6da9b7760a5cd27fae78f9ff27259b7762febfc48
 MISC metadata.xml 486 BLAKE2B d4e04c193a7b46a532791a0a448c7db4acaa4b4d4d775db70b6ab843ba32b616c91b516dbaca5b4e0a30649743553325a134291edb0ee17fe2ca049ed1e720ff SHA512 ddca3904aa3e0f1d2f543ae9329298a2dc69bbc0803c568d0871bb5ace21d2dee4d0b226e5eef0258fd59dd2cf046ee807afaa588e31db35e574f3d707894a23
diff --git a/net-analyzer/rrdtool/rrdtool-1.6.0-r1.ebuild b/net-analyzer/rrdtool/rrdtool-1.6.0-r1.ebuild
index 9d61df1ee9a9..b6a50b536199 100644
--- a/net-analyzer/rrdtool/rrdtool-1.6.0-r1.ebuild
+++ b/net-analyzer/rrdtool/rrdtool-1.6.0-r1.ebuild
@@ -9,9 +9,11 @@ GENTOO_DEPEND_ON_PERL=no
 PYTHON_COMPAT=( python2_7 )
 inherit autotools eutils perl-module distutils-r1 flag-o-matic multilib
 
+MY_P=${P/_/-}
+
 DESCRIPTION="A system to store and display time-series data"
-HOMEPAGE="http://oss.oetiker.ch/rrdtool/"
-SRC_URI="http://oss.oetiker.ch/rrdtool/pub/${P/_/-}.tar.gz"
+HOMEPAGE="https://oss.oetiker.ch/rrdtool/"
+SRC_URI="${HOMEPAGE}pub/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/8.0.0"
@@ -48,8 +50,7 @@ RDEPEND="
 PDEPEND="
 	ruby? ( ~dev-ruby/rrdtool-bindings-${PV} )
 "
-
-S=${WORKDIR}/${P/_/-}
+S=${WORKDIR}/${MY_P}
 
 python_compile() {
 	cd bindings/python || die
diff --git a/net-analyzer/rrdtool/rrdtool-1.7.0.ebuild b/net-analyzer/rrdtool/rrdtool-1.7.0.ebuild
index 88256ecc9dc2..955b659434e5 100644
--- a/net-analyzer/rrdtool/rrdtool-1.7.0.ebuild
+++ b/net-analyzer/rrdtool/rrdtool-1.7.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,9 +9,11 @@ GENTOO_DEPEND_ON_PERL=no
 PYTHON_COMPAT=( python{2_7,3_4,3_5} )
 inherit autotools perl-module distutils-r1 flag-o-matic multilib
 
+MY_P=${P/_/-}
+
 DESCRIPTION="A system to store and display time-series data"
-HOMEPAGE="http://oss.oetiker.ch/rrdtool/"
-SRC_URI="http://oss.oetiker.ch/rrdtool/pub/${P/_/-}.tar.gz"
+HOMEPAGE="https://oss.oetiker.ch/rrdtool/"
+SRC_URI="${HOMEPAGE}pub/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/8.0.0"
@@ -55,8 +57,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.7.0-disable-rrd_graph-cgi.patch
 
 )
-
-S=${WORKDIR}/${P/_/-}
+S=${WORKDIR}/${MY_P}
 
 python_compile() {
 	cd bindings/python || die
diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index 36a72c5c35ba..976952586d87 100644
--- a/net-im/Manifest.gz
+++ b/net-im/Manifest.gz
diff --git a/net-im/skypeforlinux/Manifest b/net-im/skypeforlinux/Manifest
index 79963707f5c4..e06dbdeda002 100644
--- a/net-im/skypeforlinux/Manifest
+++ b/net-im/skypeforlinux/Manifest
@@ -1,11 +1,11 @@
-DIST skypeforlinux_8.13.0.2-1.x86_64.rpm 102816632 BLAKE2B 402b95a4dfaebf93200f46fb226d907fe99bb42141f629750ec34c97bae576b79953178c21cfb5309e20867a227577998887e063b9aa2a7e4aacfd0c747911e6 SHA512 2628cb5be1d95b838afd2bc51f200e7c2591e5620c45019ff179fb2f8a480dea0f643676ab0cfea5946a1a5d79d0e181b1b1e4c8f7bade60ffe176e5cb8b3795
 DIST skypeforlinux_8.14.0.10-1.x86_64.rpm 103063075 BLAKE2B c1d414ffbaa633bc29146c2a8b0e731c575c8c0afc523b487834aef9759981449659aec6720e6a3659f785d7089d9af3f59a959553f87e9007e4dcac9ebb91f4 SHA512 86471e71f2cb0eca0a41f0fc6e9dce6c67d2af898376bb70524a06ac21af4aa18855f1f22493f2fdd0a9753cd3d451228fe8b24661b1abed328a8bf85381f6d0
 DIST skypeforlinux_8.15.0.4-1.x86_64.rpm 104944478 BLAKE2B 6a490eb49e1887a6e4aa97c644d840dd5daf085212db431ade92232f354d7f6f707b596055f4fd2b74922c071de7179de7be570dc9fa8c08e536ada8abecc0e2 SHA512 5a70ef2395b9d37b4d6417de9a3211b64f0fc7f6bc92b93abace51da911a79e559d1c4f590f1ee830a56e186a91ab713ee8e3327dfae260635ae9005341fcb1c
 DIST skypeforlinux_8.16.0.4-1.x86_64.rpm 105226365 BLAKE2B 377c4d646740c29efb10e7379b37e4661dd5e4f438e31895b4b32e2dacb922fcde8d6713790266f4532dbd6818a8ffefc5749ead0b495deafa0e85b00a8f4f00 SHA512 e499a3d9bb50695989ad629256a1e974bd9ccb3cfeeb5090cdc4986fca58fcdeb9dd9e969caacc0b42945481fc0f26b91353a0a0c60fe57a44581f6c3e27b1bb
 DIST skypeforlinux_8.17.0.2-1.x86_64.rpm 101588489 BLAKE2B 0a92756c403ae8a8b7f9aa4769cecc518988904d3b9cdc5e3cfc11518e2c369816df1c9e9c71e973cbef8200de3ca5be0ea18daa5e75432a0267f2dd09f9ce6c SHA512 121907e15b6b52d3ba35be7162ff0ba66b183d76fc929ca238a698d5035b625fcdf4efb93f2dbfd92fb18dc2aaf0b5bfbebac9fc96bd408478e4549d7e47454a
-EBUILD skypeforlinux-8.13.0.2.ebuild 3688 BLAKE2B 96d57b74a1999954486ec4705e34a91e231ad68a831a587d774bd796be37a24b93fb3383449eb71fc0c7c52064f3d2959d3111084de7c415912dd5596c6504e9 SHA512 30be913632466485e4ea45c8dd0e3954a742c99a23dfc965ebfdd662832d1462940a79c1de212891b8616bcd4bd6f4eced3a7e265c9170efdb4c3d163614fdbb
+DIST skypeforlinux_8.18.0.6-1.x86_64.rpm 101968899 BLAKE2B 2aa2ed9d290f2f9307cb8db124b407b509a7b8f869805f25293df343978cc4911476a1734563325063bd1e3ef0e9044bc12d864edff838855af1f1b731dd4b39 SHA512 0917875b21b9d77f2299260ea2152b3c14c0b332343cb9832be2a613c875025b77ca782f60987f638d430d005d1bf78f1763fe82b7d91c3146c39e7fafbf1c11
 EBUILD skypeforlinux-8.14.0.10.ebuild 3678 BLAKE2B bf717c61439733f94edb07332df57f42eb3b399e3996e6eace9fec071a637a2fa9565a6af386d26f07ae96bb5b2e66775b6608c4f62d392426d11cbae868ab3b SHA512 68a96a0939ccb7e5e0540f2c02b426d996217aa173cee2750b4edae70b87e22ed5d3a26c1cde219be8e0dde641877a22226d4dc85b022ec2e7369068d40c5cf5
 EBUILD skypeforlinux-8.15.0.4.ebuild 3678 BLAKE2B bf717c61439733f94edb07332df57f42eb3b399e3996e6eace9fec071a637a2fa9565a6af386d26f07ae96bb5b2e66775b6608c4f62d392426d11cbae868ab3b SHA512 68a96a0939ccb7e5e0540f2c02b426d996217aa173cee2750b4edae70b87e22ed5d3a26c1cde219be8e0dde641877a22226d4dc85b022ec2e7369068d40c5cf5
 EBUILD skypeforlinux-8.16.0.4.ebuild 3678 BLAKE2B bf717c61439733f94edb07332df57f42eb3b399e3996e6eace9fec071a637a2fa9565a6af386d26f07ae96bb5b2e66775b6608c4f62d392426d11cbae868ab3b SHA512 68a96a0939ccb7e5e0540f2c02b426d996217aa173cee2750b4edae70b87e22ed5d3a26c1cde219be8e0dde641877a22226d4dc85b022ec2e7369068d40c5cf5
 EBUILD skypeforlinux-8.17.0.2.ebuild 3678 BLAKE2B bf717c61439733f94edb07332df57f42eb3b399e3996e6eace9fec071a637a2fa9565a6af386d26f07ae96bb5b2e66775b6608c4f62d392426d11cbae868ab3b SHA512 68a96a0939ccb7e5e0540f2c02b426d996217aa173cee2750b4edae70b87e22ed5d3a26c1cde219be8e0dde641877a22226d4dc85b022ec2e7369068d40c5cf5
+EBUILD skypeforlinux-8.18.0.6.ebuild 3678 BLAKE2B bf717c61439733f94edb07332df57f42eb3b399e3996e6eace9fec071a637a2fa9565a6af386d26f07ae96bb5b2e66775b6608c4f62d392426d11cbae868ab3b SHA512 68a96a0939ccb7e5e0540f2c02b426d996217aa173cee2750b4edae70b87e22ed5d3a26c1cde219be8e0dde641877a22226d4dc85b022ec2e7369068d40c5cf5
 MISC metadata.xml 684 BLAKE2B 90b427ff6ed13fb5046a188fc8476d45989bdb717c1a930e81270164d72b565942ecfd4f08821bcf265ef17fa79f515c205b314abd21b2e7335387ab10e7f93a SHA512 8a7481d0a0b8d453f7748491ebf12d34e1deeb2f0bfc618e27e15a1029bf04814afadc3ca169c12f1e7d199ec0deebcdf6369ccc6c6a41a2add78209c257f8c6
diff --git a/net-im/skypeforlinux/skypeforlinux-8.13.0.2.ebuild b/net-im/skypeforlinux/skypeforlinux-8.18.0.6.ebuild
index e7683f76434b..d5e5dfdff41c 100644
--- a/net-im/skypeforlinux/skypeforlinux-8.13.0.2.ebuild
+++ b/net-im/skypeforlinux/skypeforlinux-8.18.0.6.ebuild
@@ -95,11 +95,11 @@ src_install() {
 	if use pax_kernel; then
 		pax-mark -m "${ED%/}"/opt/skypeforlinux/skypeforlinux
 		pax-mark -m "${ED%/}"/opt/skypeforlinux/resources/app.asar.unpacked/node_modules/slimcore/bin/slimcore.node
-		eqawarn "You have set USE=pax_kernel meaning that you intend to run"
-		eqawarn "${PN} under a PaX enabled kernel. To do so, we must modify"
-		eqawarn "the ${PN} binary itself and this *may* lead to breakage! If"
-		eqawarn "you suspect that ${PN} is being broken by this modification,"
-		eqawarn "please open a bug."
+		ewarn "You have set USE=pax_kernel meaning that you intend to run"
+		ewarn "${PN} under a PaX enabled kernel. To do so, we must modify"
+		ewarn "the ${PN} binary itself and this *may* lead to breakage! If"
+		ewarn "you suspect that ${PN} is being broken by this modification,"
+		ewarn "please open a bug."
 	fi
 }
 
diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz
index 5ef95b504045..2b5caeff2984 100644
--- a/net-irc/Manifest.gz
+++ b/net-irc/Manifest.gz
diff --git a/net-irc/irssi/Manifest b/net-irc/irssi/Manifest
index 5a9577460fa0..03f8b62d64a2 100644
--- a/net-irc/irssi/Manifest
+++ b/net-irc/irssi/Manifest
@@ -7,7 +7,7 @@ DIST irssi-1.1.1.tar.xz 1080992 BLAKE2B a7f7f2004958d9b71d0bba3dea2ee09ebd7f9924
 EBUILD irssi-1.0.4.ebuild 1262 BLAKE2B 7c9562df38e7b0889ef44c3c905d46ad1cf29d892889af131c96828e1e3656a62824b1dc714cb1e1411c500e61e8614a3ce2e736aa4cb9120394e4b367316189 SHA512 b4ba04fe03cc81a833aa1394303bb2055718293b8c906edd46fcc97af54ffb1cd0a353c16416bb3598626bbdfc2ff1b19c8a93f4f262a18b830eec0b7661c164
 EBUILD irssi-1.0.5.ebuild 1252 BLAKE2B ab7c9b9df8fe7c7c18e94a1c70a0a01b311d38fe8cf51587ba4c6ce35e15c03db32385724b47ba06707f713e5d16bcff8699c8b6572c0497a17a1656a4d0304f SHA512 709aa545bcacf13cd72be4d04359b02058e769952525cb2f95da12255cdfdce8dc8f400de5bfd8d0474fb031d61ce335761097b65cc2f5524df2fc37158fdfbc
 EBUILD irssi-1.0.6.ebuild 1248 BLAKE2B c694a02939c61515d55cbcc08f192a593abe3df663dd108e169c68cc9430ab6a0e1148bd23f665fa9a3d085bc113a45faeb2f6847946c85b19f124202ad36655 SHA512 c06b8f15c5cb553cb70e4f305f5acd1359fa31fe0fd87cb63d35c1206035f2b44aec7aab745439bf245800c921850246332a143e559b800f24c035439eaf8a9d
-EBUILD irssi-1.0.7.ebuild 1255 BLAKE2B f20353b6a2231e359f8c0d3aa9c6854a6b20396e0fda1174971677ad661b9fcc747b8ac459ca859170340848726303fbca5baae50d28ad0e6b68f381a2ba3b03 SHA512 b75b580c543e83e3fd6edc620d0acd769e715abc75f9ab10ab57e796859ffe389384205e514aa1464c5d0828e6868025aebf3a0460290d01c86aa5c3deffe678
+EBUILD irssi-1.0.7.ebuild 1254 BLAKE2B 3fdae3c78186a233b3b6e6e4d97fd2ec11cc96cf3cb8da4e956b7f7745e064cf04f41fe4e12a8777f246a04d9cdc689efebf708b47c12101cc2f90474318be40 SHA512 0bad35297bddd1abdce8dd69cadc0353725ba2b73f32780bccabea7631e46a0f4485cac32b831de2d28068d16268b3d04b2a547261036cb9c0297de8adb20d0a
 EBUILD irssi-1.1.0.ebuild 1256 BLAKE2B 443e8c17a0656108d92f747a6957c5592066a3de21ac7e1684b5f523b569828f37df772662986ca195c0a042c15aa75d9bfab62b96272371ffc295776f5a0422 SHA512 7248fcf3cf33a9603c1148fea6d97e2116b9a5f8de4f169978d933021590def7fd782f5f93014a419e31f19c92efecc046a718a64fbd729ea20ad8db7a713da2
 EBUILD irssi-1.1.1.ebuild 1256 BLAKE2B 443e8c17a0656108d92f747a6957c5592066a3de21ac7e1684b5f523b569828f37df772662986ca195c0a042c15aa75d9bfab62b96272371ffc295776f5a0422 SHA512 7248fcf3cf33a9603c1148fea6d97e2116b9a5f8de4f169978d933021590def7fd782f5f93014a419e31f19c92efecc046a718a64fbd729ea20ad8db7a713da2
 EBUILD irssi-9999.ebuild 1202 BLAKE2B 6fdefbaa5021802fc8326b0a633c3ad666f226070972a34936dc02f26f8cb68eb6036ee7e94b2940c6952e49cd2d151c590aa1badbef35e1817df2fceb7996c9 SHA512 fc9126562591b6df88a71b2c3beb4d99a91f62f65f3df46da2808b63eee490f988291b6271de857ea430fcc3c4e1cedb9bc1e00248877bc22d5414f408943954
diff --git a/net-irc/irssi/irssi-1.0.7.ebuild b/net-irc/irssi/irssi-1.0.7.ebuild
index cd03b8eff8dd..691ba6e33af8 100644
--- a/net-irc/irssi/irssi-1.0.7.ebuild
+++ b/net-irc/irssi/irssi-1.0.7.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV/_/-}/${MY_P}.tar.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~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 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+perl selinux socks5 +proxy libressl"
 
 CDEPEND="
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 9e5571d5e964..18a69c2a2781 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/serf/Manifest b/net-libs/serf/Manifest
index 0bc4b745eb0b..3d8a8b5647c6 100644
--- a/net-libs/serf/Manifest
+++ b/net-libs/serf/Manifest
@@ -5,7 +5,7 @@ AUX serf-1.3.8-static-lib.patch 1922 BLAKE2B 66e518933fd12141916e93955d9648149de
 AUX serf-1.3.8-tests.patch 3159 BLAKE2B 96cd539541f8ca59dd5693bed44854d2aa626cdecaf89e754e8123166559f8e6518f3cde372a42f6d0455302d53dba6a55e51fd44734e1984730f34a090969a3 SHA512 d2b89743e38492a0626b509864c34a3747d73b5aeb7a22df84ce739588663582eea3b6c3d599b8e42896b1720c529e19c5497ff4e830e67981f0664b5e6c533d
 DIST serf-1.3.8.tar.bz2 143337 BLAKE2B 873f78ec7fab6323e3351e43ed7b03e8208be8d7ced5a017ca121ecbc091de49a963e69beeee592f39dfab23ff30d4bda3378192ea24f2ec07a5569ee19dc062 SHA512 78787a0d1e3e72dd9afc2e0de65e9af3b4303fefdcb865bd5e087fae570a7fe4d1395ce021756db4685c6e63e31c495563afe57baf677bf9846657f5d63d4205
 DIST serf-1.3.9.tar.bz2 145132 BLAKE2B 59776f85b409b2eaea81f3e07b0301515e20cbd2aa0ef05c1c38aa8152a6d5627e526e4bc160abb1fd438e9fa46f97096c639860729d2ea8e0b2fcfcf8222002 SHA512 9f5418d991840a08d293d1ecba70cd9534a207696d002f22dbe62354e7b005955112a0d144a76c89c7f7ad3b4c882e54974441fafa0c09c4aa25c49c021ca75d
-EBUILD serf-1.3.8-r1.ebuild 2089 BLAKE2B beaad84e898901b9ca6b039ba605efb387ef3bb2f34de14c0b3d764bec9e73b1c49bf498f1370c463e44fb5cdd6d6726735de728853006503ee8b270169fa9e2 SHA512 c87bece36357431c0376855d8dafd974e64c6d0106b3f4966ca3d46aa33602dae497126d7cdacd867fc416d3bc486716ba8c3868380a85ff854be43b683bb23e
+EBUILD serf-1.3.8-r1.ebuild 2088 BLAKE2B 50336e17d7b130e97fe0f55eade27e8da5bc5644f2b229c8da70ae3bcf694e29e130621fa9a67b7b44552877c7b7acdb33782d666c845cb803447a1c1989480b SHA512 4bd41fe3e056c446b8c7da65cc64f8e53d58dcaddc108773be0545fee42ec9bd6cb8686b37a73ccae87727c708eac7214a8adbb8ef3b7502743ba1e941d1a900
 EBUILD serf-1.3.8.ebuild 1466 BLAKE2B ce499ab84e4060665265121555a41c24cf40de45efa3d9f736e822826149449a22de1e63b4c0c86d75f9b6ff5d353bf19f144566835b54afa4ccbe236b09b2a5 SHA512 1790d5466dd4d1b478e752579c3907325b147b8a90d4a73a76f8572e0e717769e3a8b93503aa2149000915de0edb9288fae361d557fa18408458bba3ab185050
 EBUILD serf-1.3.9.ebuild 2092 BLAKE2B 94920aa41d663d406b572cb21adaf596e9bc67a2bc6ebf98f475955f13da1adb36fedb382723066605308b641c01c305397f6ef408896e04d16b73539cd53405 SHA512 b0fd733f83306234c0e93cb0fe9eefce2abc7cbbf71ef084a268fa231864580cb6f5614f261f9c0cd2d586c26bc7a5ff3343d8a37a30acd26da96cc29ec22fc9
 MISC metadata.xml 339 BLAKE2B ff1bd30899bf67f73610a584e1d012632c801f3fecc39b5dc1a79025abdc151c650d26e5363bce5aace53798b20ec8931fc3532e83814b89fce767a2ecdc4e0d SHA512 b98b7e682407dd662a866336f76031793f13b0d76a7dae86b542afb515fdda1224b8141c71ff1f502294c2bcd88f3f80d18d654dcabe77088bef049bf462f18c
diff --git a/net-libs/serf/serf-1.3.8-r1.ebuild b/net-libs/serf/serf-1.3.8-r1.ebuild
index c93bcfde2fca..7f3512ce0942 100644
--- a/net-libs/serf/serf-1.3.8-r1.ebuild
+++ b/net-libs/serf/serf-1.3.8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/${PN}/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 IUSE="kerberos static-libs libressl"
 
 RDEPEND="dev-libs/apr:1=
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 7f4d2e53c6b8..ad360c91b3b2 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/dropbear/Manifest b/net-misc/dropbear/Manifest
index 6776e95389c8..cf07b9a9f6ca 100644
--- a/net-misc/dropbear/Manifest
+++ b/net-misc/dropbear/Manifest
@@ -5,6 +5,6 @@ DIST dropbear-2016.74.tar.bz2 1622234 BLAKE2B c729a2c1afd13e1ca07f3c9cfe3ff0ea78
 DIST dropbear-2017.75.tar.bz2 1623392 BLAKE2B c024037d3ebcb3f16aed2a5f24e07c06699a510b327a0ea528db7160ad2a8e554af2a233a266f869e0e30c78f3b0b7792a817d9c07f058f605dbf2dc749a4fda SHA512 9c2f2a5e718339f83abc0ad7719bda12bfc75e5bcb87a7c0eec0afefc743e5c0a1575d290d5fde152ff2100b0f0e6fd5ef4431f7bbcb5ca9a332d93c20f5a8f4
 DIST dropbear-2018.76.tar.bz2 2688697 BLAKE2B 1c22d38487e94427b2678d070f8d370eb09bb2d69253fd6f76d8d80fd637ff86a44b00ab42e1f6d84042c72cbcbd4bb6cbb415f961502e0437c7c8c1b812f059 SHA512 82323279f7e78c366ba1ea07ff242259132b2576122429f54326518dd6092aba8ae5de4a0b8a3cef7efc3507015741abe2ac23376c03b40b247527da7a88120e
 EBUILD dropbear-2016.74.ebuild 2476 BLAKE2B 41d21f7aecf0d056a63ab5150af700d2fd36659dd25f29dc67cbb7acf852ee4e583b5ef1c7f2c74710d5409988ed91a4e3eecb2e9821911cf5a8c67cfef41795 SHA512 a1bf33919cce4fab7c1b23dac884db81883555eb9c249f30e5ff96cc856375e3849b18350a52abf7e78bcb3fc12418ad2d86508cd396562230cb155fb15f9420
-EBUILD dropbear-2017.75.ebuild 2487 BLAKE2B 736d9c2de5a1782619c69435ec3e25dbfa3d359039160d5a5196d7f9de3215de06d3f00ee0ed31165f68e61134195be65ff8faba6b89b4628cb7c9f1fffd68fd SHA512 2e0a66b9bf243f96da0888376f6a0ce3288d133931c48794a6696d480281f96a8477fbeafb5253df8e389fc19722900adc89d90d56ea9decbd61e75b863056a3
+EBUILD dropbear-2017.75.ebuild 2486 BLAKE2B 8f22c615a1fcc30bfefe9debb7fcc7b24dd8b44a2df955e1df0e048c64956165fede85dce12e7e8e8bbbe32efd8473005a1b08be20b5d7d94364f863aa6c4e11 SHA512 dba55735c28edfaca8f11590d67e1dfff5eb0fe3e19962217692e083ef283e479d7c18a190d43372b43c03925fd7a687765ee934c18de18b7bd076e3633754fb
 EBUILD dropbear-2018.76.ebuild 2624 BLAKE2B be125d92c97eca0b2798caeb6357a854683af3ed62353aac7c988fb1dc6ac722d92a7a1a72ddee5d5d16b7e4b2f0707dd5498b27c9999b94b8ea25254e40ee2c SHA512 77a7488f5b18d326f504ea71219d4c38d8a48f45cdd0a846df8c882516413404983f7b60740b43f679c329622355bbcd4183f72f7032633fa4409ca74d46131c
 MISC metadata.xml 1791 BLAKE2B d5816e2173f3fe0177562b1ef7e36c6ec56c4d596c27231f02eaedd41eba091abcff7cb0e0114d5431d735b011fcaaabf01e5e70ff61478c669232243bc7e244 SHA512 1f99332f1f194f989838dc5c04fa1c7661e13da3efa7b98fa6392ab3c3e6887a4a9c7319fdb43f102b2fb3cbc0ee70e79792b595c2f49d2bbf4e50be3f362314
diff --git a/net-misc/dropbear/dropbear-2017.75.ebuild b/net-misc/dropbear/dropbear-2017.75.ebuild
index e4b2ed7f1b51..2b419233c502 100644
--- a/net-misc/dropbear/dropbear-2017.75.ebuild
+++ b/net-misc/dropbear/dropbear-2017.75.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://matt.ucc.asn.au/dropbear/releases/${P}.tar.bz2
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="bsdpty minimal multicall pam +shadow static +syslog zlib"
 
 LIB_DEPEND="zlib? ( sys-libs/zlib[static-libs(+)] )
diff --git a/net-misc/streamlink/Manifest b/net-misc/streamlink/Manifest
index f760830db1ce..7303692082e4 100644
--- a/net-misc/streamlink/Manifest
+++ b/net-misc/streamlink/Manifest
@@ -1,12 +1,14 @@
 DIST streamlink-0.1.0.tar.gz 960622 BLAKE2B 8d035784fc3585c738135a901b6da35b9acee2cc993e4b99b0ed609e6d68eefd6df5fff5ae4b63ef2267fd0606b2f5e29b56da4d40cf49a41c433ab58570a561 SHA512 78b5bd9d35c2fc9c1d9fe3954b439e56cfee48f2b73a95a2c08a53c3a66143938ba162f2d2ba29c8af989565c920756cab605ae772d73828a3dd5a41fc6d30c2
+DIST streamlink-0.11.0.tar.gz 30718822 BLAKE2B cbda2783bed0e7d721dad44ca8815fa862531fdff84007245a76205dd869098d9ef2d371035e784e1d002497bbbcf8268aa4ee94c63fdc0f16082cf55d878b8f SHA512 a62e906f7b37c9cd33ce5e7d5d84bfee9fa8ca5ddd4699e4985ed932147a346188026fd868b30e6b26ce6b5806217f838bbf8191074f9b0271dd87aaee501f7f
 DIST streamlink-0.4.0.tar.gz 30674625 BLAKE2B 301ff7e2086425604c59d12063cd5b14f789dc39249bba96faedb0fece663f9e5d65f1f696d40f92f07a95a9edd5c915c71d22dcd1afb378cc000bac6eeebd5e SHA512 58a4110b1e6b20f0b05842ee8450a93d646d523a284cf60ad878b460b8e80081d78658f5abb67744609cfdd0a88ebbf97faf6453b2b53709f259e4f9cc093eed
 DIST streamlink-0.6.0.tar.gz 30696706 BLAKE2B d735c9605b1d0bb9aa6c52c145b1ee3d9645d5a1be0ab0bbc4a84a3e9c5b527a8a35f3d61c2bc5e51d1549f6328802e13ca83231c08bebc90496144fb25c7dfe SHA512 b9f75bfd2cab577688ed84a6c690f776b2e3af38fa60edb7f2fd73f2c25246c81098652180c3adae61eec8798a7805988cad01c366989a961efdb1e12578af49
 DIST streamlink-0.7.0.tar.gz 30709251 BLAKE2B 215a8aa8b273e9b46fb86020dd53cb15bd19cb3de77e0b6e4a124916b964077a012cec5358d81707782834031490921fcae8a3a8321b70a43a4b538321eac06e SHA512 6e908229295c4d129d2bb9bfc26c76b20d45c2c9dc8193528a259c572cddd4ea620f9f903fb639ddad206bcad05a416ccc50328d01489a7684ec724a8cf1c3c1
 DIST streamlink-0.9.0.tar.gz 30720281 BLAKE2B b0a19f78f26908ff7b35cbcc3a95539969cb00e6b54c1cdb4c4c72685e77f9291ced933238708cfd4cdb6225c7dade4fd49e9a98a7092a1aff2d91297aacd951 SHA512 3d8aea95cd71968dc8a77eb1ad243abad10db76d6f9729498826876465e10ad2ac6204f26ec528d05ddd352236789ba8f8a86347abd50ed2d558b7ffc41349cd
 EBUILD streamlink-0.1.0.ebuild 973 BLAKE2B a150b16f5aac63906c1078d50d0cb70f905236ac2e25b05b09c555e72a190d95c6d3c10091272243696809501a50b7516d4c57812f39b36df7e793082e099c3a SHA512 4a1e98fb0c7538490c6c8b11f99e5674e032f3ab8de0a7a1996cbea422c79ec150d09ee15069a2ef7e8e4dd504add42f2f9ec6acd3fc6d5c5945cb903f1962c1
+EBUILD streamlink-0.11.0.ebuild 1580 BLAKE2B 553cd49a5b1ef86e706c9b850075335750436f2047076a7c44c007d7132508bd20e826cbe1860f3a5d72d1c248579363e7eb56752f0dafdd174759cf5bd70658 SHA512 736b3bbafb3eaff9acda15ac18bbe467ab06b886e64d422f6ef0c77c51437c1d7ef3193c07c1aa1cf0bb44c79413468aa99cc8214e6f102cb4dd3745d3850372
 EBUILD streamlink-0.4.0.ebuild 1439 BLAKE2B 1a6306a4cfb1b1c316a9ca93b5b944a7549da96918cf3262efbf13158a20b3078570f6f72eb4bd84f38ae464aaaa1d98612a8764fa64c52e56dc0c00b9367ed7 SHA512 b7ffa7b4f89be630249571a8aecbe852689e1992b6075750a9bc7235e3a3c37dcd77a028155e6f120962e0de2173f6611a26a503c16df26796106885d3279c2c
 EBUILD streamlink-0.6.0.ebuild 1439 BLAKE2B 1a6306a4cfb1b1c316a9ca93b5b944a7549da96918cf3262efbf13158a20b3078570f6f72eb4bd84f38ae464aaaa1d98612a8764fa64c52e56dc0c00b9367ed7 SHA512 b7ffa7b4f89be630249571a8aecbe852689e1992b6075750a9bc7235e3a3c37dcd77a028155e6f120962e0de2173f6611a26a503c16df26796106885d3279c2c
 EBUILD streamlink-0.7.0.ebuild 1481 BLAKE2B 2a8f4ba7ed184a3b02c312da078b3e30b821aacdd66abe716da99ccb051d7f25e9b12126d6d50e18ad88890786b4720bbef84ba00ef2613d9f085248e7a4eda7 SHA512 d9fa66ff97771b07bcbf78800ec02ca3ad575a23228571b66ef45e674d379bfb55b2c11b71b5f6993d6108acf2d22a504c05f29c0948751290c02fc28ae21fa7
 EBUILD streamlink-0.9.0.ebuild 1580 BLAKE2B 425851d87baf78adf1b50410361483d73f959d7f959702ee2d505ab05173b8dfc306a2bb4c28c14c94b8789c604191131618176a0a72853bd0b18729adfe4557 SHA512 854aa7667c70e74acf2aa62f143032957d0b5d0360a3d774328358be3b084d371a4d8de29a051c979291705862ab670ed1763f328bf128e36a5d6d55b25e3eac
-EBUILD streamlink-9999.ebuild 1542 BLAKE2B 886d0540739c78f971494c5006f9b627375f5412dd54d27c8f531bc3c2efc001cb9fb16f1e9032095f2928b205cabc5025781f4e63e3278fee3ca9a32ccd392d SHA512 7650512a65eefec3925986e047d91cd49d8845f7bddb160304b2f7255c75a3dcd1fa264710182a3b432e5971c2245a541de6ae99ae214c4d8a311489e6e587e7
+EBUILD streamlink-9999.ebuild 1546 BLAKE2B 034d354005c4e72d769bc33de4068aa537d239050a64b83c3c260662ee1609d80a478fcb58bf42a94a50224e43a16ca2972d6ac7a2e9f31d54ddc1a643f5a235 SHA512 3c5f51958877bd15cd3c5f82c42c076bd8ff1ff52102702508d48a746b03b955520bccc14dbd13b80688f1824e68f79fb5a6fba565847a07e553bf42eb94b554
 MISC metadata.xml 443 BLAKE2B 8557851068cd831f7ba85676e7defbd7a3d990af985aac5e51c581cf56a47a137436a67236a194aa8d55c2f2eecc1b67bafdaf52f8315d796198be6edc3de0d5 SHA512 f5b30f24fc2574bdea1e1bbd0cf8dfd6173cdd56f913c018f6a93760d1df1e76e8f9a4730e2f2308b905b41688024fa48d7c9902a3dbb8dc8ac07fa439f32a9b
diff --git a/net-misc/streamlink/streamlink-0.11.0.ebuild b/net-misc/streamlink/streamlink-0.11.0.ebuild
new file mode 100644
index 000000000000..6096587d059d
--- /dev/null
+++ b/net-misc/streamlink/streamlink-0.11.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2018 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='xml(+),threads(+)'
+
+inherit distutils-r1
+
+DESCRIPTION="CLI for extracting streams from websites to a video player of your choice"
+HOMEPAGE="https://streamlink.github.io/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="BSD-2 Apache-2.0"
+SLOT="0"
+IUSE="doc test"
+
+RDEPEND="dev-python/pycryptodome[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	virtual/python-futures[${PYTHON_USEDEP}]
+	virtual/python-singledispatch[${PYTHON_USEDEP}]
+	dev-python/backports-shutil_which[$(python_gen_usedep 'python2*')]
+	$(python_gen_cond_dep 'dev-python/backports-shutil_get_terminal_size[${PYTHON_USEDEP}]' 'python2*')
+	dev-python/pycountry[${PYTHON_USEDEP}]
+	dev-python/websocket-client[${PYTHON_USEDEP}]
+	media-video/rtmpdump
+	virtual/ffmpeg"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/docutils[${PYTHON_USEDEP}]
+	)
+	test? (
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' 'python2*')
+		${RDEPEND}
+	)"
+
+python_configure_all() {
+	# Avoid iso-639, iso3166 dependencies since we use pycountry.
+	export STREAMLINK_USE_PYCOUNTRY=1
+}
+
+python_compile_all() {
+	use doc && emake -C docs html man
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	if use doc; then
+		local HTML_DOCS=( docs/_build/html/. )
+		doman docs/_build/man/*
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/net-misc/streamlink/streamlink-9999.ebuild b/net-misc/streamlink/streamlink-9999.ebuild
index ff3f06dea73a..a824074d2cd5 100644
--- a/net-misc/streamlink/streamlink-9999.ebuild
+++ b/net-misc/streamlink/streamlink-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 PYTHON_REQ_USE='xml(+),threads(+)'
 
 inherit distutils-r1 git-r3
diff --git a/net-misc/whois/Manifest b/net-misc/whois/Manifest
index 63b42782db2c..264ff9701694 100644
--- a/net-misc/whois/Manifest
+++ b/net-misc/whois/Manifest
@@ -4,6 +4,6 @@ DIST whois_5.2.12.tar.xz 80428 BLAKE2B 53aa08d4e45ab417585aaaff03beb588a01e88c35
 DIST whois_5.2.20.tar.xz 82336 BLAKE2B b10d7e22f41bfb68cdd1264016bbfeeb93436a5c46b0ddcfc79834d0446ea8c21cd8ff95bc440bbe4fda0d5b08a16c50fe9504c98c3de3cf4ce18892203518e1 SHA512 3308d9f5562babe007e46b7764718f13c1e7cd8ef7f501161353e4b1b81efacec9742ec25dec3b1cc80940898c785c1920a1aa68af10081f952ebde320075808
 DIST whois_5.3.0.tar.xz 82728 BLAKE2B ac5e9bdd070c3a79306f79709d6450455ff74fc7c3a8c81380f79b98cdd36d25932032673710a39ec55da2220f1d0a21221e1a2b70c36e8798affe9b7f46f3bb SHA512 a507f38254d826a9112d1f5a7888fbd4b79eeaa372977c02e4e8235509d133540ba647ddece95376f6ac704f9b1042d276051d4a3a36d10906ad11f69561432f
 EBUILD whois-5.2.12.ebuild 1494 BLAKE2B b84e9fa6367d3f977423ff590d54d094f2d2cf218937f410619646f574b7810029a7b587a8d8600baed31cf050f19f67e5cb56f189175f516dad5af1cf9dce52 SHA512 ca9371338ccbba81f3a60a611e82b6702c4a43166d57c02cb029d1303fc2cee92cf2173f9381d888a48785191dd05719f66d3eb687bf90e4d987377d092700ff
-EBUILD whois-5.2.20.ebuild 1506 BLAKE2B 53a8ac9f0162bf126ea9d76c251ab2dda3c6c73d1ce4c6f32b619ccdf2e70d1a876c3aba5884061d31b19716e764cc0fb009a889fd28cd61a8b31ac8c663b6bf SHA512 be3731643383126c3f23c41c20ec8bc98c911602554b28636f31660e357831cfd79045a923f27eeea31548c335da1405c8cc01d6d85a21b9507f3dc4f876be70
+EBUILD whois-5.2.20.ebuild 1505 BLAKE2B d8d54ccd6c45e5b2ca743ded1ad4559a15083153e0e97186610742ccdcd41355c38d4f359c4365901073b6b566ff09b2f20b0d938f9d2ee175f98bfad93eeaaf SHA512 8408031d607970ef68cc07a24ac2e79625c9708b77068aa0a9910d6819456f6f7142af183ab9c10d45f84d438838e991b124bd5a8cc563d947c9859bae5bdabc
 EBUILD whois-5.3.0.ebuild 1588 BLAKE2B 4518cbf6d72192faa8ac482d752571d9df527cdf61e856c9c4c572e307e334269c00e031d80beeab44b4ecab207eb9e6428b0e8b3fb5979c197c317cd02dc39f SHA512 fe7028e212fc0a1062e081b46c4c16ff57622b95062ef7533cee5ecaafdfda8200b047e2f24670058652f5c1c2ba7e07fd6c244dfa039cc7716d647da23c64f2
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/net-misc/whois/whois-5.2.20.ebuild b/net-misc/whois/whois-5.2.20.ebuild
index 37fc874d24fa..2edfeccda9a9 100644
--- a/net-misc/whois/whois-5.2.20.ebuild
+++ b/net-misc/whois/whois-5.2.20.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/w/whois/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="iconv idn nls"
 RESTRICT="test" #59327
 
diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz
index 99e57c5ea1be..b3ca9634d622 100644
--- a/net-p2p/Manifest.gz
+++ b/net-p2p/Manifest.gz
diff --git a/net-p2p/gtk-gnutella/Manifest b/net-p2p/gtk-gnutella/Manifest
index fe5c3e42964f..20834d638494 100644
--- a/net-p2p/gtk-gnutella/Manifest
+++ b/net-p2p/gtk-gnutella/Manifest
@@ -1,6 +1,5 @@
 DIST gtk-gnutella-1.1.11.tar.bz2 19966423 BLAKE2B 38defd83e342751d86d0504846a0f80468a73d37faa25fd9c62a90da92306774fdf585c04e2729a7c9a68c206f67eaccfd483833ffe72b27cf08a5920e403115 SHA512 87d2d66b555180c0db7c360106377133b9e1f8ad8d28fc0f9a38498f3b4502a817650f9683cf92919b7d3a1b3602f7136143d2f1c920e10727576c703e233d07
 DIST gtk-gnutella-1.1.13.tar.xz 19207704 BLAKE2B 4a11fd3f8bd7554e78a75b51b818e2e863edc328d07d0da4fce07e9a6eca7307dd66082dc70caf96e9e85d1d68ee1ef253a47ffb58cc9f33358a5d71b10782cb SHA512 14ff19a3f0bf55101570b4268cdd422defd2ccd112d80e9bafe2f6eb019b94c3c72763e67e2853d4446e68943355093c1279c6d67c101ca6d9b7f05ddd9ac7e0
-EBUILD gtk-gnutella-1.1.11-r1.ebuild 1869 BLAKE2B eb4de0bb0f1bcd3b83143e6dac0f590c53e1f1a8390df74b0150cd8ec5920744d5054e79daaabb6bc7dd28716cc923c62429ef1b46e801f643d242cf84978e6c SHA512 3df30186715ee7497e6a5f68ad38dbb1ee8dd9e04b9a9ba0d67e603df2661ad929944e21a291ddb4243866417504da64e56ac0bca5f626f76b6525e91148e700
 EBUILD gtk-gnutella-1.1.11.ebuild 1840 BLAKE2B 7145e716a1ee9badd489c858609a9b8fc42859b13f9d25d07d8d224be3629f5f18bd5ff0da38455fe280a567e46b586b40d29437d5a3f70ac6f398d9a72c1393 SHA512 ba05eaeef63243a39fdc801f1a6fa7581506dd7721c3615f23665cf5aa43d945cfd620831b06de958af8d8180fffdc0685fedbecd4884947ab56ce386218cf52
 EBUILD gtk-gnutella-1.1.13.ebuild 1875 BLAKE2B 70373958c494d2f7177bae59c6a7d6f27ded087ff1c4dcbf990724f4258e6db3b34b5530e13a7c5049f112f1abb70e12d78b25aefb6337c6b357d7b6dc60ef20 SHA512 c62936155f514d888a366f9c6b2073f2bae284dc86b930384b57a1f2a627e40961031096b0121e06c7dc7fa26d652f0e0933eced7416e294c27262388b9a3c62
 MISC metadata.xml 299 BLAKE2B 8e823e2ff9ff16738e4f1d5a5e04264557ee9529ce035978e59a8d1371a8dba5485bde5095e05346ddca410d197e7fbb62f8b651bbe8cd0815396fdeda7935ed SHA512 ab18fa3318fdd64a0e4bff392a88d9f58b1c611c71ee090a767a4a25f75f273dc60a7cfeb7e386e5fbed548d982788c16654584938aec8ef5f6b11cd6d5b3c61
diff --git a/net-p2p/gtk-gnutella/gtk-gnutella-1.1.11-r1.ebuild b/net-p2p/gtk-gnutella/gtk-gnutella-1.1.11-r1.ebuild
deleted file mode 100644
index 6cbf0a7e3653..000000000000
--- a/net-p2p/gtk-gnutella/gtk-gnutella-1.1.11-r1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils
-
-IUSE="nls dbus ssl +gtk"
-
-DESCRIPTION="A GTK+ Gnutella client"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-HOMEPAGE="http://gtk-gnutella.sourceforge.net/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
-
-RDEPEND="
-	sys-libs/binutils-libs:=
-	dev-libs/glib:2
-	sys-libs/zlib
-	gtk? ( >=x11-libs/gtk+-2.2.1:2 )
-	dbus? ( >=sys-apps/dbus-0.35.2 )
-	ssl? ( >=net-libs/gnutls-2.2.5 )
-	nls? ( >=sys-devel/gettext-0.11.5 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	strip-linguas -i po
-
-	echo "# Gentoo-selected LINGUAS" > po/LINGUAS
-	for ling in ${LINGUAS}; do
-		echo $ling >> po/LINGUAS
-	done
-
-	default
-}
-
-src_configure() {
-	# There is no option to turn off optimization through the build.sh
-	# script.
-	sed -i -e "s/Configure -Oder/Configure -Oder -Doptimize=none/" build.sh || die
-
-	# The build script does not support the equivalent --enable
-	# options so we must construct the configuration by hand.
-
-	local myconf
-
-	if ! use nls; then
-		myconf="${myconf} --disable-nls"
-	fi
-
-	if ! use dbus; then
-		myconf="${myconf} --disable-dbus"
-	fi
-
-	if ! use ssl; then
-		myconf="${myconf} --disable-gnutls"
-	fi
-
-	if use gtk; then
-		myconf="${myconf} --gtk2"
-	else
-		myconf="${myconf} --topless"
-	fi
-
-	./build.sh \
-		--configure-only \
-		--prefix="/usr" \
-		--cc=$(tc-getCC) \
-		${myconf}
-}
-
-src_compile() {
-	# Build system is not parallel-safe, bug 500760
-	emake -j1
-}
-
-src_install() {
-	dodir /usr/bin
-	emake INSTALL_PREFIX="${D}" install || die "Install failed"
-	dodoc AUTHORS ChangeLog README TODO
-
-	# Touch the symbols file into the future to avoid warnings from
-	# gtk-gnutella later on, since we will most likely strip the binary.
-	touch --date="next minute" "${D}/usr/lib/gtk-gnutella/gtk-gnutella.nm" || die
-}
diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index d363d1bac85c..a7feae822584 100644
--- a/net-wireless/Manifest.gz
+++ b/net-wireless/Manifest.gz
diff --git a/net-wireless/bluez/Manifest b/net-wireless/bluez/Manifest
index 21e5ebb9872d..c16da23cd91d 100644
--- a/net-wireless/bluez/Manifest
+++ b/net-wireless/bluez/Manifest
@@ -12,5 +12,5 @@ DIST bluez-5.48.tar.xz 1733952 BLAKE2B 0a68a1b790d752b02b8ab3d0eeaa9387c15851003
 DIST bluez-5.49.tar.xz 1744860 BLAKE2B 25b350debb016f93d23a2ecf14183197a3b8e8c0496b82b22a51ccc00ccf0241fb43d7d8d9ed04bdfcc0a1111078b8394e8b9ff23963854e51b6a19cf769811f SHA512 bc2988649420232b92e2c6836857027369f05ace005972f575ed0601c02cc97a07a3b7a0707a8bad72be73df7e8096c8bf023530443556e87c2ccb667981b37d
 EBUILD bluez-5.47-r1.ebuild 8003 BLAKE2B d4bf09bdd60cc7bb4069a5cadccdebf31a04bba1d31f4374e394b8dd79a5901ae7e8881435cfe1790dc5882daeef43fae43263c03b9415795ee7694c89c5e5e2 SHA512 e307de7b0805f1d37755ae1355a25f993ac1e870bdc0276e582e66f26a7916c0cd829cceb185796930ecb95ea26b8c74c45f6bf8c47673b90ff922eb72fe2baf
 EBUILD bluez-5.48-r1.ebuild 7898 BLAKE2B 7d05df3d6161bb98d19c1a92a6709dc9174d0ef6378d74ebb33f79161e767600be63c5b3843a03b85f5d9d1321cc7464822aac9513e1d4dfab97b11e94cabc1a SHA512 3e8f5e729d9d23e3db6fb64e8d14509fe736fc88f43f9f8e8cbfe305fcf9230303688c829cc1c65918cb2f9fbceb4110a99bcee378d4dc9f410f1ae2386f5e2a
-EBUILD bluez-5.49.ebuild 7936 BLAKE2B 2439416e976b8450979208ec398eb594c95558c5372b3fc882d8037b81c60a28c014ace3cc03e514db13053eec29433d29261b7e08daa58b527fe344d70c4e3d SHA512 0d7dc135d273cc67894ed6bea5e92d75593710739ed3e245c9ea3f05425338b4bb6a73a29e54163cab8963c8e8fb72ef0c9dba0ee7c8fffa8e1eedcf76cf57b4
+EBUILD bluez-5.49.ebuild 7935 BLAKE2B 09f5ffef3c448e82ad0ae00f48bef8456b874454ef3dde2ad5300a8d9e5337e17491330d5fa442e5f48640ce2a137ac3f648d1faccc06759cab11e38d526cc06 SHA512 44e16073f69082ecd98b074d224c6e11b7c63c130828d48be171c93a054076d1a489960b52a4394fb987a5f06f8bfa6751797b46131e23e7a708e052173686ec
 MISC metadata.xml 1123 BLAKE2B 87f3bc5c6709f1d82237c9ef91b30491f8854b79a9d661e7788496361cff763ec510368d08e832df58ad474802619a5b1434acd4c2c20f41a42fd12f2c946b96 SHA512 be4e0c9c8e589d9c2c1f1f8bc2119da6239d726201ce35979996a6364b02fae8782a9b44742a601e14342eb1501734d68b032bceb26d1f2628782dc9ab5d7f93
diff --git a/net-wireless/bluez/bluez-5.49.ebuild b/net-wireless/bluez/bluez-5.49.ebuild
index 921e17a3ae89..8bb65b3e2992 100644
--- a/net-wireless/bluez/bluez-5.49.ebuild
+++ b/net-wireless/bluez/bluez-5.49.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://kernel/linux/bluetooth/${P}.tar.xz"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0/3"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~x86"
 IUSE="alsa cups doc debug deprecated extra-tools experimental +mesh +obex +readline selinux systemd test test-programs +udev user-session"
 
 # Since this release all remaining extra-tools need readline support, but this could
diff --git a/net-wireless/hostapd/Manifest b/net-wireless/hostapd/Manifest
index f69f55ee6df9..9320e5004586 100644
--- a/net-wireless/hostapd/Manifest
+++ b/net-wireless/hostapd/Manifest
@@ -10,4 +10,4 @@ AUX hostapd-init.d 739 BLAKE2B 83c48748cf20c8ee7d1124d373ee565c724d4714bffc51262
 AUX hostapd.service 213 BLAKE2B 0141aace8e6f807611e423e70cce437a5ae38a5fee8af74a7284980a1c2f642f1e98d020f327dbe5591e9d68114f3ee966229fb6d8f5116fe7d9e2bd93bae7bd SHA512 4d1a1619c49ad0272f360d2c9d79f2fd30503786fe8f22dd3fc4abcc39176029fe907c79d22f168c100b0d7b4ac969b5f4b5815d5ebe6805db5881dda69eef29
 DIST hostapd-2.6.tar.gz 1822341 BLAKE2B c0075ffcdb11237e11410d87329a7a71aae5e00481022e02faf03771d45a61410ff906ebffdeea03fdeab751ce85e5a5e191173883ee9f1c284e6bc00342a011 SHA512 e60baaa092786250b8de9935f5417c7626f5d749210cce9f83d776b65c19fc92a8141f41923389f05c16295d482a15ae8d8b744f4667425040c99e3c2f5b1bda
 EBUILD hostapd-2.6-r1.ebuild 6385 BLAKE2B 9fed57cea65df41398ac68bbe92766f59307ca1b9c95374136bbf472dbed7f469bcf156ffc35b5e2b36f04fdf2316132a650da3e736ab159e9e8256a0cb3f992 SHA512 bae75fa20068a5b6e4458d36e4b931bfd467775fa782c630f2a6c9940b16faa0dc0df90ff43f23851b50fd4cb4ae5c560764703afe33c69190af6883796a1461
-MISC metadata.xml 683 BLAKE2B afcfbf306bfcdc6d8ea40f8d1ac5dd50ac0fcc318ff766cb75d084a2325321f8ecd29f57e8a15a03a36a30badefb0f7d1d4209f35e0a7187e8cd474a6000c47e SHA512 52b1cc92baf14afd77a8aa9568bb161d5f936416b8858aea8fd1fe155e2ffdf3c45ff543c0f4e3941ed47a8c3c3b2096423f1ebc25d658b86860e312bdad410d
+MISC metadata.xml 795 BLAKE2B 2a8c749490a82b3d943cd2e23e3c6575d9b84ed7bda1cfcd2d984589501d3b469bba054a883542c40a10a4eb154fc58f7b103780ce90b15885dde211c75a5c6c SHA512 880dfc97358fee5a6e1782d5102e9c5cab8190cb4a78a3db042ee2b3997f6c8f82031bdfe3bc0112b4cc1ebabb1df93650dad9652c764970b8520f020dfd5bea
diff --git a/net-wireless/hostapd/metadata.xml b/net-wireless/hostapd/metadata.xml
index 109bc255a2da..1b21c81f5917 100644
--- a/net-wireless/hostapd/metadata.xml
+++ b/net-wireless/hostapd/metadata.xml
@@ -14,4 +14,8 @@
 		<flag name="sqlite">Adding sqlite support</flag>
 		<flag name="wps">Add support for Wi-Fi Protected Setup</flag>
 	</use>
+	<maintainer type="person">
+		<email>andrey_utkin@gentoo.org</email>
+		<name>Andrey Utkin</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 3585cc0b2b74..17aa31d8e1cb 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/arch/amd64/no-multilib/package.mask b/profiles/arch/amd64/no-multilib/package.mask
index 4ca9e2de3dad..c49832e6640c 100644
--- a/profiles/arch/amd64/no-multilib/package.mask
+++ b/profiles/arch/amd64/no-multilib/package.mask
@@ -61,6 +61,7 @@ games-action/shadowgrounds-survivor-bin
 games-action/solar2
 games-action/spacetripper-demo
 games-action/swordandsworcery
+games-action/trine-enchanted-edition
 games-action/trine2
 games-arcade/aquaria
 games-arcade/barbarian-bin
diff --git a/profiles/default/linux/musl/package.mask b/profiles/default/linux/musl/package.mask
index 303f8b5b4ca2..313dfc4b59a8 100644
--- a/profiles/default/linux/musl/package.mask
+++ b/profiles/default/linux/musl/package.mask
@@ -35,7 +35,8 @@ games-action/shadowgrounds-survivor-bin
 games-action/solar2
 games-action/spacetripper-demo
 games-action/swordandsworcery
-games-action/trine-bin
+games-action/trine
+games-action/trine-enchanted-edition
 games-action/trine2
 games-arcade/aquaria
 games-arcade/barbarian-bin
diff --git a/profiles/default/linux/uclibc/package.mask b/profiles/default/linux/uclibc/package.mask
index f5208eadab27..b94a8ca92688 100644
--- a/profiles/default/linux/uclibc/package.mask
+++ b/profiles/default/linux/uclibc/package.mask
@@ -24,7 +24,7 @@ games-action/descent3
 games-action/descent3-demo
 games-action/shadowgrounds-bin
 games-action/shadowgrounds-survivor-bin
-games-action/trine-bin
+games-action/trine
 games-arcade/marbleblastgold-demo
 games-fps/enemy-territory
 games-fps/enemy-territory-etpro
@@ -79,6 +79,7 @@ games-action/hotline-miami
 games-action/intrusion2
 games-action/solar2
 games-action/swordandsworcery
+games-action/trine-enchanted-edition
 games-action/trine2
 games-arcade/dynamitejack
 games-arcade/thinktanks-demo
diff --git a/profiles/hardened/linux/amd64/no-multilib/package.mask b/profiles/hardened/linux/amd64/no-multilib/package.mask
index cd820bb9b97a..b820b2630d26 100644
--- a/profiles/hardened/linux/amd64/no-multilib/package.mask
+++ b/profiles/hardened/linux/amd64/no-multilib/package.mask
@@ -8,6 +8,7 @@ dev-lang/rebol-bin
 
 games-action/brutal-legend
 games-action/hotline-miami
+games-action/trine-enchanted-edition
 games-action/trine2
 games-action/swordandsworcery
 games-action/beathazardultra
diff --git a/profiles/license_groups b/profiles/license_groups
index 1d0d77dbe449..48ed48742c58 100644
--- a/profiles/license_groups
+++ b/profiles/license_groups
@@ -71,7 +71,7 @@ BINARY-REDISTRIBUTABLE @FREE bh-luxi Broadcom Dina intel-ucode ipw2100-fw ipw220
 
 # License agreements that try to take away your rights. These are more
 # restrictive than "all-rights-reserved" or require explicit approval.
-EULA Adaptec-EULA AdobeFlash-11.x ArxFatalis-EULA-JoWooD baudline BCS bf1942-lnxded CAPYBARA-EULA Coherent-Graphics CROSSOVER-2 CYANA DOOM3 ETQW FAH-EULA-2014 FraunhoferFDK GameFront Gameplay-Group-EULA geekbench genymotion GIMPS GOG-EULA google-chrome Google-TOS Intel-SDP Introversion LastPass LOKI-EULA LRCTF MakeMKV-EULA MARBLEBLAST Mendeley-terms MTA-0.5 NVIDIA-CODEC-SDK NVIDIA-CUDA Nero-AAC-EULA Nero-EULA-US OPERA-12 OPERA-2014 Oracle-BCLA-JavaSE PAPERS-PLEASE POMPOM postal2 Primate-Plunge PUEL Q3AEULA Q3AEULA-20000111 QUAKE4 Quartus-prime-megacore RAR RTCW RTCW-ETEULA RuneScape-EULA SJ-Labs spin-commercial spin-educational StarUML-EULA TeamViewer THINKTANKS UPEK-SDK-EULA ut2003 ut2003-demo Vivaldi worklog-assistant yangcli-pro zi-labone
+EULA Adaptec-EULA AdobeFlash-11.x ArxFatalis-EULA-JoWooD baudline BCS bf1942-lnxded CAPYBARA-EULA Coherent-Graphics CROSSOVER-2 CYANA DOOM3 ETQW FAH-EULA-2014 FraunhoferFDK GameFront Gameplay-Group-EULA geekbench genymotion GIMPS GOG-EULA google-chrome Google-TOS Intel-SDP Introversion LastPass LOKI-EULA LRCTF MakeMKV-EULA MARBLEBLAST Mendeley-terms MTA-0.5 NVIDIA-CODEC-SDK NVIDIA-CUDA Nero-AAC-EULA Nero-EULA-US OPERA-12 OPERA-2014 Oracle-BCLA-JavaSE PAPERS-PLEASE POMPOM postal2 Primate-Plunge PUEL Q3AEULA Q3AEULA-20000111 QUAKE4 Quartus-prime-megacore RAR RTCW RTCW-ETEULA RuneScape-EULA SJ-Labs spin-commercial spin-educational StarUML-EULA supermicro TeamViewer THINKTANKS UPEK-SDK-EULA ut2003 ut2003-demo Vivaldi worklog-assistant yangcli-pro zi-labone
 
 # Local Variables:
 # mode: conf-space
diff --git a/profiles/package.mask b/profiles/package.mask
index 2ef68d9c2bca..6c867eb29198 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -29,6 +29,11 @@
 
 #--- END OF EXAMPLES ---
 
+# Mike Gilbert <floppym@gentoo.org> (24 Mar 2018)
+# Dev channel releases are only for people who are developers or want more
+# experimental features and accept a more unstable release.
+>=www-client/chromium-67
+
 # Aaron W. Swenson <titanofold@gentoo.org> (22 Mar 2018)
 # EOL. No longer receives bug or security fixes. Recommended to update
 # to latest available.
@@ -547,11 +552,6 @@ media-gfx/photivo
 # Masked for removal in 30 days. Bug 644404
 net-fs/smbtatools
 
-# Mike Gilbert <floppym@gentoo.org> (04 Mar 2018)
-# Dev channel releases are only for people who are developers or want more
-# experimental features and accept a more unstable release.
->=www-client/chromium-66
-
 # Andreas Sturmlechner <asturm@gentoo.org> (04 Mar 2018)
 # Dead upstream, depends on deprecated Qt4. media-sound/cantata
 # is an actively developed alternative based on Qt5.
@@ -683,12 +683,6 @@ dev-php/ZendFramework
 # Masked for removal in 30 days. Bug #629184.
 media-sound/moodbar
 
-# Mart Raudsepp <leio@gentoo.org> (22 Feb 2018)
-# This package was renamed to dev-libs/libgnome-games-support without
-# a pkgmove; everything in tree uses it now instead of libgames-support.
-# Masked for removal in 30 days. Bug #648468.
-dev-libs/libgames-support
-
 # Ulrich Müller <ulm@gentoo.org> (21 Feb 2018)
 # Homepage is dead. Apparently the last release was in 2012
 # and it does not work with Emacs 25 and later.
diff --git a/profiles/updates/1Q-2018 b/profiles/updates/1Q-2018
index 9ef13e4e9496..fa4dd25f87d7 100644
--- a/profiles/updates/1Q-2018
+++ b/profiles/updates/1Q-2018
@@ -6,3 +6,4 @@ move app-admin/restart_services app-admin/restart-services
 move dev-libs/purpose kde-frameworks/purpose
 move kde-misc/plasma-applet-redshift-control kde-misc/plasma-redshift-control
 move x11-proto/xorgproto x11-base/xorg-proto
+move games-action/trine-bin games-action/trine
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index dfea20209ec7..68d146e96b47 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -909,6 +909,7 @@ app-misc/gourmet:print - Enable pretty Python printing
 app-misc/gourmet:spell - Enable support for the spell check plugin
 app-misc/gourmet:web - Enable support for the web import plugin
 app-misc/gramps:geo - Enable rendering of geographical data using sci-geosciences/osm-gps-map
+app-misc/gramps:rcs - Adds support for family tree archives via dev-vcs/rcs
 app-misc/gramps:reports - All external software that is needed for graphical reports will be installed
 app-misc/graphlcd-base:g15 - Add support for app-misc/g15daemon driver (e.g. Logitech G15 Keybord)
 app-misc/irtrans-irserver:mono - Enable mono support
@@ -1027,7 +1028,6 @@ app-office/calligra:spacenav - Enable support for the 3Dconnexion spacenav input
 app-office/glabels:barcode - Enable barcode support through external libraries.
 app-office/gnucash:aqbanking - Connect to some internet banks via AqBanking
 app-office/gnucash:chipcard - Enable support for chipcard reading and processing.
-app-office/gnucash:hbci - Enable HBCI support, for connecting to some internet banks
 app-office/gnucash:quotes - Enable Online Stock Quote retrieval
 app-office/gnucash:register2 - Use the new register (Experimental)
 app-office/gnumeric:libgda - Enable database support through gnome-extra/libgda.
@@ -1238,7 +1238,6 @@ app-text/texlive:jadetex - Add support for app-text/jadetex (for processing tex
 app-text/texlive:luatex - Add extra support for luatex
 app-text/texlive:metapost - Add support for metapost: A tool for creating graphics in scalable PostScript
 app-text/texlive:music - Add support for music typesetting (dev-texlive/texlive-music)
-app-text/texlive:omega - Add omega packages (dev-texlive/texlive-omega)
 app-text/texlive:pdfannotextractor - Add dev-tex/pdfannotextractor support, for extracting annotations from PDF files
 app-text/texlive:pstricks - Add pstricks packages (dev-texlive/texlive-pstricks)
 app-text/texlive:publishers - Add support for publishers (dev-texlive/texlive-publishers)
@@ -3086,6 +3085,8 @@ games-action/supertuxkart:fribidi - Support for right-to-left languages
 games-action/supertuxkart:recorder - Enable recording with media-libs/libopenglrecorder
 games-action/supertuxkart:wiimote - Support for wiimote input devices
 games-action/swordandsworcery:bundled-libs - Use the upstream provided bundled libraries.
+games-action/trine:launcher - Install GTK+ launcher
+games-action/trine-enchanted-edition:launcher - Install GTK+ launcher
 games-action/trine2:bundled-libs - Use bundled libraries.
 games-action/trine2:launcher - Install gtk+ launcher
 games-arcade/bomns:editor - enables building the level editor
@@ -4007,8 +4008,10 @@ media-gfx/fbida:X - Install the Motif based image viewer "ida"
 media-gfx/fbida:fbcon - Install the framebuffer image viewer "fbi"
 media-gfx/fbida:ghostscript - Install the framebuffer ghostscript viewer "fbgs"
 media-gfx/fbida:webp - Enable support for the WebP image format
+media-gfx/fim:bmp - Enable BMP file support
 media-gfx/fim:dia - Enable DIA file support via app-office/dia
 media-gfx/fim:imagemagick - Use convert from media-gfx/imagemagick as fallback file opener
+media-gfx/fim:pcx - Enable PCX file support
 media-gfx/fim:xfig - Enable FIG file support via media-gfx/xfig
 media-gfx/fontforge:truetype-debugger - Enable truetype debugger in fontforge
 media-gfx/fotowall:webcam - Enable webcam support
@@ -8938,7 +8941,6 @@ xfce-extra/xfce4-pulseaudio-plugin:wnck - Enable experimental support for raisin
 xfce-extra/xfce4-soundmenu-plugin:glyr - Enable music metadata searchengine support using media-libs/glyr
 xfce-extra/xfce4-soundmenu-plugin:keybinder - Enable shortcut support using dev-libs/keybinder
 xfce-extra/xfce4-soundmenu-plugin:lastfm - Enable last.fm support using media-libs/libclastfm
-xfce-extra/xfce4-taskmanager:gksu - Build against x11-libs/libgksu to provide "Run as root" option in the application's menu
 xfce-extra/xfce4-taskmanager:gtk3 - Use GTK+3 instead of GTK+2
 xfce-extra/xfswitch-plugin:gdm - Compatibility with gnome-base/gdm only
 xfce-extra/xfswitch-plugin:lightdm - Compatibility with x11-misc/lightdm only
diff --git a/ros-meta/Manifest.gz b/ros-meta/Manifest.gz
index 6fa6a9522255..4dddc72df03a 100644
--- a/ros-meta/Manifest.gz
+++ b/ros-meta/Manifest.gz
diff --git a/ros-meta/navigation/Manifest b/ros-meta/navigation/Manifest
index 76862d7ba03a..569e22069f12 100644
--- a/ros-meta/navigation/Manifest
+++ b/ros-meta/navigation/Manifest
@@ -1,4 +1,6 @@
 DIST navigation-1.15.1.tar.gz 346480 BLAKE2B 29f9a0b6f2c62bd21a7cb87a64b490c845bb7db4af338fd094744abb22402df7eedc8c164b64f93f2d67dabaff99ca3b946b45e93173bed74834d9e3668726ad SHA512 25c5093bf7acca9d15d46bb2d0ae7e4ce0fa45f18b32d1626668dcbd33732317e8535b978e7225d86391472c517f05acb7736f31a7c511c8736ab8a22c7af4b0
+DIST navigation-1.15.2.tar.gz 348985 BLAKE2B 866779425828b1e4c3a044654ae41f33643646ca70cf6841f23bce265add2c420bf0934a41a6b29fa65fc421228a31dc15e9fb0f6cc4295ce12adbbb627b43d4 SHA512 582422756b31b4d83e929e3c723e7205e772b9775fcf618c9bd5d3c54af1f20e9bc8a0143626750c0c3cffeb0cbea8f8706b7e66f62dc037cfe12b05f23ee142
 EBUILD navigation-1.15.1.ebuild 707 BLAKE2B 82ed7c7ce652e56b309fb73e635568d9abdd8c9024689646bc4df2c50eb4a0e7a38751fb58b2c62e0791412374358c216f3ca8f76a59d0345467bcd9ef8fc236 SHA512 0a435c9140130e7a6552379ca1a007264d74f26731648e5ca76d3d0bf5c79bc37bfe6214517e180b022b446863580e3a7ead9e98b643c1338fee4a1353c5e6af
+EBUILD navigation-1.15.2.ebuild 707 BLAKE2B a3f0ef9c87421c68d8ed46071de3887aa5be4b77a9a254fbcf36306f46c96ef471b2a13cb9d18e9eb40c94462312ab92c2867b740b1274e0912ea6cd9a6d670e SHA512 db7417b213a67515d8255d3cb02e18d88b1e7dd8da729fa8e66c593da5d5ee8cc8ff382767fd48a0b27bcbd8d628d042aac271fcca014731b6351e5df4724b1f
 EBUILD navigation-9999.ebuild 707 BLAKE2B c626bdb7deab685f080b9bd09def905e00c84e7d0b6ba9a83d457dd8c3dfa4d47203b4dcfb64fdb754d55a24534c6beeb0f4d2f8f0975a54d0fdd901b41a7a3d SHA512 2737ddd9f6671ac0612f2453f00ea8ddecf222a298013e160ebdb32c007f055acba11f897fa091bfa3ddb8fad61a7dae825d0ceb06c664c64478916af911f260
 MISC metadata.xml 337 BLAKE2B ecfbf3d0b63a1b876065d04b3d52daa0442e3bcaf060836731012a1e698b3aea06ff292d892035feb2fb0fc257d6d8462d013ccc67f2650177c9cdba4d051d44 SHA512 f5df7464100fa15a3d2ad11cc620007500a5cb5ea7be67ac45819a541dd4ae53ce476231d475acf4dfe7e7bf0c31281325dc4e003867d1cc01a29353bb5ea09e
diff --git a/ros-meta/navigation/navigation-1.15.2.ebuild b/ros-meta/navigation/navigation-1.15.2.ebuild
new file mode 100644
index 000000000000..41d50ea09327
--- /dev/null
+++ b/ros-meta/navigation/navigation-1.15.2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-planning/navigation"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="2D navigation stack"
+LICENSE="BSD LGPL-2.1"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/amcl
+	dev-ros/base_local_planner
+	dev-ros/carrot_planner
+	dev-ros/clear_costmap_recovery
+	dev-ros/costmap_2d
+	dev-ros/dwa_local_planner
+	dev-ros/fake_localization
+	dev-ros/global_planner
+	dev-ros/map_server
+	dev-ros/move_base
+	dev-ros/move_slow_and_clear
+	dev-ros/nav_core
+	dev-ros/navfn
+	dev-ros/robot_pose_ekf
+	dev-ros/rotate_recovery
+	dev-ros/voxel_grid
+"
+DEPEND="${RDEPEND}"
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index cc3e16687057..297c7a170dd6 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/szip/Manifest b/sci-libs/szip/Manifest
index 7adf963d933e..f5b01fd88242 100644
--- a/sci-libs/szip/Manifest
+++ b/sci-libs/szip/Manifest
@@ -1,4 +1,4 @@
 DIST szip-2.1.tar.gz 383219 BLAKE2B 84e10763bcec885a423d64c2c3cff0632d7a6a39c8cd177cf607f549cb4cd02a4ca03362464c2c4ec4539c80149493329427f529f5d6daea4a35b91af6fa1538 SHA512 bb7e0af6dfaaaaa85013ef52e6901d5b7b6159795338d285c2e843bd2879230a6397fb072662fdfeda5690981db4e9af94782c057bf993f92516d92a8934cb75
-EBUILD szip-2.1-r2.ebuild 719 BLAKE2B 1258ab18bfb76267e0bad685d6689f659d1249323fffc16683410e9bf8d7deca15970c41c2cfdeb131636c7b469e786821425af46fbd41a1193b3870090d74fe SHA512 1fc06ec85db407b0efc297ac504b79984f3164d66be465657be209247326a0f077dd671f76ba547bd62806109ebe83f870e6206103ef056cb896413ee2ff1b0b
+EBUILD szip-2.1-r2.ebuild 717 BLAKE2B c3dbdac05e99cc5d81f2028929dd4011adb00763ca1f96439dd0c57d59d98e8e14fc58b9ecfc41730a05019de6aad11d756ba7eb70328aa83d39683603cbf9eb SHA512 4fc6cdeccc55ba091e6d785368a2af08996bf781d6b5a5f4a6d4abf2271004627072c7bbc59ddd0f549729f1f0b5835af60bf51e52d4f8f30a832c16eee06bd5
 EBUILD szip-2.1.ebuild 649 BLAKE2B 93a9fd8bf30d89079ac58ae79658b9b84896bbdcadae530e84da7c62845a887f4f581034a3d333f2e727a3f5dbb9a52307222d6374998254328c07a63badc887 SHA512 fbcaffb62c0827464c812a577e9b828f54f7cab5de9bce1d189a4deb5eab0980142b3d48b20ff263cd40a0c07dc0baaa89d608fa331e2bc71a89532618140890
 MISC metadata.xml 765 BLAKE2B a720dfb9f71c9f9adc5e539b2a791b8edcd2fce2b1540b17066c09e1d3895d40e147ddd2ef86499c6a9db3c2c68c3bb9aae3357f13d86370d7fba8069f968368 SHA512 c56edc42adeff2e523e9a312b0393f45647b2a902334221d2b9842afa1ecd885a17f108041cad69a0797bdc1eb58c75672226a0c3a2f4c8f561ab8a70eb28b27
diff --git a/sci-libs/szip/szip-2.1-r2.ebuild b/sci-libs/szip/szip-2.1-r2.ebuild
index 86f9bc1b2151..040c45accc1b 100644
--- a/sci-libs/szip/szip-2.1-r2.ebuild
+++ b/sci-libs/szip/szip-2.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.hdfgroup.org/lib-external/${PN}/${PV}/src/${P}.tar.gz"
 LICENSE="szip"
 
 SLOT="0/2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 
 IUSE="static-libs"
 RDEPEND="!sci-libs/libaec[szip]"
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index a796db3c05f5..72876d83039e 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/i2c-tools/Manifest b/sys-apps/i2c-tools/Manifest
index 10cb78b6d11e..a7f099b41244 100644
--- a/sys-apps/i2c-tools/Manifest
+++ b/sys-apps/i2c-tools/Manifest
@@ -1,6 +1,6 @@
 AUX i2c-tools-3.1.1-python-3.patch 3348 BLAKE2B 4fbe75455e4370da6c61c786cd0eaef94039b24d9de33ecc1ac6333f5776d61d8638493f7b7218bd15e36301cfeed840217050ed37edf3825017cdbf9b7b3d25 SHA512 0f264e49237af0318c868deac39bdd7c2b718c39317c2e47b15ad7d421530dc165f38b5995ca45bcfd65074ab51022d88ced6f2d589e30ebbab1702cf964f8da
 DIST i2c-tools-3.1.1.tar.bz2 71789 BLAKE2B 0a7a3db6a3b396cfb8d5e58d8c83cae4e52239786502c6552d971350f7fc05a1ce9d7d89e9cdb154a21ac15bdf34aa0dec9501ea45317ec9c5d9fc211780bbf1 SHA512 b91f89b803e5558d49ce63f42f6542438f4f47927e4ce420cd9df989cab14a5c55d971befed73e8f793b0cf4aa41936c0ef519e5a407dceb2c08964461e803c5
 DIST i2c-tools-4.0.tar.xz 79972 BLAKE2B 982e4139ed0e2111f9e082d0690fcc0f86f97a433e292e9464b41991f14a1f90147a3612172bad6880f0df6896612e1dea0ae7bf6f459758b2cff45fb35a5dc7 SHA512 ddf86c357c101388193581bc40285089e6ab5e8d870f8aa5d594acc7ecb8596fbd30501e147b88bdea0200b1be88bc0a374356c188d1bcb067bf8e254e3dc51e
-EBUILD i2c-tools-3.1.1-r1.ebuild 1431 BLAKE2B 9e345a8bcc8122c6e5dc1dc08ce5e3278c682d35725d03ed92d1ca5650f92e6d24e9fc7b8419271f155ca440b538838969a3ed7b038cbd9d6616f1ab736b1343 SHA512 03b8a80f90970877019cc27d519e535fb7478d636603b937a63f375b3c7ed8264bf975bc3640541afbe02ca7f0de7e226940f6a0f6ab4a7f9d54f2fc02efc564
-EBUILD i2c-tools-4.0.ebuild 1400 BLAKE2B 3e8316aec0396172e0b3626f888fb4789eb36916592f085fb23148d893efdea13b2d82bd28ba0682390718c7a17e3ca2d1a16cbcb89e0118602a5b4e2e61581c SHA512 9cc0e3bf449c75a7502e384337912390cb66af15bb1ee51b64a76deffd7fa5b596c040eca9d6c88275e961a2862760d8531ecc268c6174ba082ad3646042da9d
+EBUILD i2c-tools-3.1.1-r1.ebuild 1438 BLAKE2B c9d1e61d5c2f743cca2bdbae3c518998178fbafd09a42538c91d1b637dcc9bd31a1cb746a63fc81e06875c76386a70832305d8cb6f48d3fa282ec598c094b0f2 SHA512 7187a3759ab86014023b45adc9aeea93e7dc1f29f6266b7ef1c514d65e28bb097aa74844d5d279b3961d544f21283ae6076b7c5206c78393866dc4aa41173150
+EBUILD i2c-tools-4.0.ebuild 1391 BLAKE2B 0951d16029bad7c3876c5112c34e492ff0fe3f54b5eb78986ea276252cb7c40e42eb8fafd761597c7078d77d541615d5c60c3e73451e2152dcbe22a7ff313741 SHA512 af1d4c6d94a12a045c4a5bbec615a467a2d1104f54fc1b583cfad4c83dd62c753a06b8c6ae3243c2dd1418c912727028068d92d29c75c598afbf9936f3288e10
 MISC metadata.xml 243 BLAKE2B f7576f14be2c0aa21ca2c7147133e4a4132d6559cca1519745dd2f4ea912b3856950c7645e13d2317f38c80ba93b13d47370260920241a5ab60a4eae59f2cf33 SHA512 0dc1f228861badffd9c4175af734b72435dc7c60d369a3d9ff946c5b98b3f2f49af7d433f7ec5fc2afee7015b8f75259e8debe150b1bcffa0cb66425bed10d8d
diff --git a/sys-apps/i2c-tools/i2c-tools-3.1.1-r1.ebuild b/sys-apps/i2c-tools/i2c-tools-3.1.1-r1.ebuild
index 342d6295325e..98c99d4b0435 100644
--- a/sys-apps/i2c-tools/i2c-tools-3.1.1-r1.ebuild
+++ b/sys-apps/i2c-tools/i2c-tools-3.1.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 DISTUTILS_OPTIONAL="1"
 
-inherit flag-o-matic toolchain-funcs distutils-r1
+inherit distutils-r1 flag-o-matic toolchain-funcs
 
 DESCRIPTION="I2C tools for bus probing, chip dumping, EEPROM decoding, and more"
 HOMEPAGE="http://www.lm-sensors.org/wiki/I2CTools"
@@ -45,7 +45,7 @@ src_compile() {
 src_install() {
 	emake install prefix="${D}"/usr
 	dosbin eepromer/eepro{g,m{,er}}
-	rm -rf "${D}"/usr/include # part of linux-headers
+	rm -rf "${D}"/usr/include || die # part of linux-headers
 	dodoc CHANGES README
 	local d
 	for d in eeprom eepromer ; do
diff --git a/sys-apps/i2c-tools/i2c-tools-4.0.ebuild b/sys-apps/i2c-tools/i2c-tools-4.0.ebuild
index d5f248f7c280..32dffbf1e2ba 100644
--- a/sys-apps/i2c-tools/i2c-tools-4.0.ebuild
+++ b/sys-apps/i2c-tools/i2c-tools-4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 DISTUTILS_OPTIONAL="1"
 
-inherit flag-o-matic multilib toolchain-funcs distutils-r1
+inherit distutils-r1 flag-o-matic toolchain-funcs
 
 DESCRIPTION="I2C tools for bus probing, chip dumping, EEPROM decoding, and more"
 HOMEPAGE="https://www.kernel.org/pub/software/utils/i2c-tools"
diff --git a/sys-apps/ipmicfg/Manifest b/sys-apps/ipmicfg/Manifest
new file mode 100644
index 000000000000..541dc302238a
--- /dev/null
+++ b/sys-apps/ipmicfg/Manifest
@@ -0,0 +1,3 @@
+DIST IPMICFG_1.27.1_build.170901.zip 1667230 BLAKE2B 6411f735fed2e66f8dc012c480e6f9a4c2c9223643074514ca6fbb0db62df06fd78714c4a95ce92edc22a4473734a1d41a6c3bdb61268c73a628f08e7dc87c0e SHA512 9ed01a8a1eae7a7e41fafdbb3b666e7760057c960b65da547f0cf197b30b1a535fa2fe8357e13e6ccda0e0dd4474170b43ca3bc89f55c2de5df0160adde9377e
+EBUILD ipmicfg-1.27.1.170901.ebuild 1425 BLAKE2B 130cfa8b7cf23f2316fd45f174bef028c7c6e5c3b3344b4651b93339258cd4c1d28cc2ca335ac649a995c65b049881bcaf131f69d8fab2fcbf493d0c4f251a4e SHA512 572e8b141d38c2421e020b0453d8e859182c9d9a37711ff7292aab3f837e9b08e559b814050c1b3b48e78999460a70b78602535d6aaade957564f296f1e0b7a0
+MISC metadata.xml 369 BLAKE2B 99bc89ce5469bce6e867ce73fa66fee3fa41bf2166453c3606b03b1f3879f837c46d41068430e217a7ab4b0d0096650762095ffe5f13382ab055e5815f90ebb1 SHA512 5d49b66d13a6055421fc9e9a180d6d5657e367cfdc6e74a13c16955cc1bfda765605f0ab7c0d7d5f67ce847e09306fef52a2fb621eccdf358e5d21e82129a2b3
diff --git a/sys-apps/ipmicfg/ipmicfg-1.27.1.170901.ebuild b/sys-apps/ipmicfg/ipmicfg-1.27.1.170901.ebuild
new file mode 100644
index 000000000000..ce0d6c434345
--- /dev/null
+++ b/sys-apps/ipmicfg/ipmicfg-1.27.1.170901.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eapi7-ver
+
+MY_DATE="$(ver_cut 4)"
+MY_PN="${PN^^}"
+MY_PV="$(ver_cut 1-3)"
+
+DESCRIPTION="An in-band utility for configuring Supermicro IPMI devices"
+HOMEPAGE="https://www.supermicro.com"
+SRC_URI="ftp://ftp.supermicro.com/utility/${MY_PN}/${MY_PN}_${MY_PV}_build.${MY_DATE}.zip"
+
+KEYWORDS="-* ~amd64 ~x86"
+LICENSE="supermicro"
+SLOT="0"
+
+RDEPEND="sys-libs/glibc"
+DEPEND="app-arch/unzip"
+
+RESTRICT="bindist fetch mirror strip"
+
+S="${WORKDIR}/${MY_PN}_${MY_PV}_build.${MY_DATE}"
+
+QA_PREBUILT="opt/ipmicfg/IPMICFG-Linux.x86 opt/ipmicfg/IPMICFG-Linux.x86_64"
+
+pkg_nofetch() {
+	elog "Please download ${A} from"
+	elog "https://www.supermicro.com/SwDownload/UserInfo.aspx?sw=0&cat=IPMI"
+	elog "and place it in your DISTDIR directory."
+}
+
+src_install() {
+	# Choose ARCH
+	if use amd64; then
+		local my_arch_binary="x86_64"
+		local my_arch_folder="64bit"
+	else
+		local my_arch_binary="x86"
+		local my_arch_folder="32bit"
+	fi
+
+	# Install files
+	insinto "/opt/ipmicfg"
+	doins "Linux/${my_arch_folder}"/*.dat
+
+	# Install binary
+	exeinto "/opt/ipmicfg"
+	doexe "Linux/${my_arch_folder}/IPMICFG-Linux.${my_arch_binary}"
+
+	# Install symlink
+	dodir "/opt/bin"
+	dosym "../ipmicfg/IPMICFG-Linux.${my_arch_binary}" "/opt/bin/ipmicfg"
+
+	# Install docs
+	local DOCS=( "IPMICFG_UserGuide.pdf" "ReleaseNotes.txt" )
+	einstalldocs
+}
diff --git a/dev-texlive/texlive-langindic/metadata.xml b/sys-apps/ipmicfg/metadata.xml
index 69beb8c840ef..54d5423c4060 100644
--- a/dev-texlive/texlive-langindic/metadata.xml
+++ b/sys-apps/ipmicfg/metadata.xml
@@ -2,14 +2,11 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>aballier@gentoo.org</email>
-		<name>Alexis Ballier</name>
+		<email>ck+gentoo@bl4ckb0x.de</email>
+		<name>Conrad Kostecki</name>
 	</maintainer>
 	<maintainer type="project">
-		<email>tex@gentoo.org</email>
-		<name>Gentoo TeX Project</name>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
 	</maintainer>
-	<longdescription lang="en">
-		Support for Indic scripts.
-	</longdescription>
 </pkgmetadata>
diff --git a/sys-apps/portage-mgorny/Manifest b/sys-apps/portage-mgorny/Manifest
index 04814e5e78f6..318445b805c7 100644
--- a/sys-apps/portage-mgorny/Manifest
+++ b/sys-apps/portage-mgorny/Manifest
@@ -1,6 +1,8 @@
 DIST portage-mgorny-2.3.24.1.tar.gz 1239318 BLAKE2B bfa8418ade600835c90378177bc6cd91f6c17e02c0e05b0829f4ee3b500ce3275fcb76424e19af5618026daa7b79d402aeb0d9f2133e7db09cb8983eeb355427 SHA512 04e3d5ee08f78ba3bb8045c36e7e81b06b7a0aff65a22c82cd2ca6fc0ab9f7b63a49c7eda9048d15fbc9c8d1a898c0d038f7cac2f4daf6d68bb799a9303d74c1
 DIST portage-mgorny-2.3.24.2.tar.gz 1239343 BLAKE2B 701c90d333c10976f11910babed4b002cb545561c931d635973cf9b455a247b050b098c61fca0b20a5a8d70d4478a9daddacc826045e74c52d45878260431c93 SHA512 0319a973a26650ce182c0e1f997399f0c3944474ad5c8c2f88b9588ffbf99ccd12bd84e7537f8368f8362a098a72d177fc3c844e2afc086f95094baa27d97b93
+DIST portage-mgorny-2.3.24.3.tar.gz 1235966 BLAKE2B 0919ad1c287075cdeaacb3c40b468ba9afd93df59ea3e8caa87300f87e0638e72d3d2791d07764d82147025c407f83f7442d9c4f02b5b8ae7ba8485f54193499 SHA512 dfb2341a512b3db37b7f282d7246d16afb8df9e1c401656022ac72adf35541bd4aa0224974deb581e76174b1bd7c49368c76215dd977168e5da858e9d8b8eda5
 EBUILD portage-mgorny-2.3.24.1.ebuild 5451 BLAKE2B ca175205856228d36517a41420a5739832bf0919ad18d3af8f86ac05c75df3a0a371417c0541ce9caeee804ec519724675149713c495261db67f078daa9e8e25 SHA512 0a4261c22521ce902df520f254607cfa80019ad91d89eec1bf6ea8517062615a2c9272ba9de477c0509e09aafe7615772b5e4b157c3c8002d6e1b4945ac146b9
 EBUILD portage-mgorny-2.3.24.2.ebuild 5467 BLAKE2B e9128167ffd714269124199116d31bb4cc582fd36aee26c8da10dd40fe1e27b8f8aa1e1b2f0c51660c54259ca7f0c39ed431e3e0d432224e2813019fa1e5f6cc SHA512 18a4d5a807e0f13199d6256e5218af8cf6b247a519b330ca19a0d6de714d386c8a12713fce86d1628a7c4fd6f65eab249c4bc4231a37a6e9c5c059e9aa5c52a8
+EBUILD portage-mgorny-2.3.24.3.ebuild 5467 BLAKE2B e9128167ffd714269124199116d31bb4cc582fd36aee26c8da10dd40fe1e27b8f8aa1e1b2f0c51660c54259ca7f0c39ed431e3e0d432224e2813019fa1e5f6cc SHA512 18a4d5a807e0f13199d6256e5218af8cf6b247a519b330ca19a0d6de714d386c8a12713fce86d1628a7c4fd6f65eab249c4bc4231a37a6e9c5c059e9aa5c52a8
 EBUILD portage-mgorny-9999.ebuild 5352 BLAKE2B 6ecd0c3f4c4eb308a6eb5c6867402f231ba0233c6e8ef224e6ec2185c77475fd6bc114bf8622fdb28aed5b06af705d4956608ccc1b22402eb1fe50763773e209 SHA512 65c03a6f7e8047b8b51a9761625b291a027f2745b4ac6b10c2323710ca91bd1cdc17e29dbc61c7e0c16a44691e5daab32e3f71324b32928c2277d14b8542302d
 MISC metadata.xml 817 BLAKE2B 8792bea6f73e3d72c747a11a0946c119abd9a24e3a1f40c457563536a9a1ce304c8c2ff0682fad3f94913d171806a262cf73de7437b5f250215810d8ffb32447 SHA512 e3498363b89e349d37b13dd40c7b3225f8c445b1ea2db9f70f2a1d718b7576103296d52581aa5ae0edc4ddd3fa8123161425c2732753f88e997b1cca818572b2
diff --git a/sys-apps/portage-mgorny/portage-mgorny-2.3.24.3.ebuild b/sys-apps/portage-mgorny/portage-mgorny-2.3.24.3.ebuild
new file mode 100644
index 000000000000..eb3315f80c86
--- /dev/null
+++ b/sys-apps/portage-mgorny/portage-mgorny-2.3.24.3.ebuild
@@ -0,0 +1,163 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} pypy )
+PYTHON_REQ_USE='bzip2(+),threads(+)'
+
+inherit distutils-r1
+
+DESCRIPTION="Fork of Portage focused on cleaning up and useful features"
+HOMEPAGE="https://github.com/mgorny/portage"
+SRC_URI="https://github.com/mgorny/portage/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S=${WORKDIR}/portage-${PV}
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+SLOT="0"
+IUSE="build +ipc +native-extensions selinux xattr kernel_linux"
+
+DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
+	>=app-arch/tar-1.27
+	>=sys-apps/sed-4.0.5
+	sys-devel/patch"
+RDEPEND="
+	>=app-arch/tar-1.27
+	!build? (
+		>=app-admin/eselect-1.2
+		app-crypt/openpgp-keys-gentoo-release
+		>=app-crypt/gnupg-2.2.4-r2[ssl(-)]
+		>=app-portage/gemato-10
+		app-shells/bash:0[readline]
+		$(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \
+			python{2_7,3_4,3_5} pypy)
+		>=dev-python/lxml-3.6.0[${PYTHON_USEDEP}]
+		>=sys-apps/sed-4.0.5
+	)
+	elibc_FreeBSD? ( sys-freebsd/freebsd-bin )
+	elibc_glibc? ( >=sys-apps/sandbox-2.2 )
+	elibc_musl? ( >=sys-apps/sandbox-2.2 )
+	elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
+	>=app-misc/pax-utils-0.1.17
+	selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
+	xattr? ( kernel_linux? (
+		>=sys-apps/install-xattr-0.3
+		$(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \
+			python2_7 pypy)
+	) )
+	!app-portage/repoman
+	!sys-apps/portage"
+PDEPEND="
+	!build? (
+		>=net-misc/rsync-2.6.4
+	)"
+# NOTE: FEATURES=installsources requires debugedit and rsync
+
+pkg_pretend() {
+	if has_version sys-apps/portage; then
+		ewarn "If you are migrating from sys-apps/portage to sys-apps/portage-mgorny,"
+		ewarn "please note that Portage will abort upon having to unmerge itself."
+		ewarn "However, sys-apps/portage-mgorny will already be installed at this"
+		ewarn "point, so you simply have to restart emerge and it will successfully"
+		ewarn "clean the old package afterwards."
+	fi
+}
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+
+	if ! use ipc ; then
+		einfo "Disabling ipc..."
+		sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
+			-i pym/_emerge/AbstractEbuildProcess.py ||
+			die "failed to patch AbstractEbuildProcess.py"
+	fi
+
+	if use xattr && use kernel_linux ; then
+		einfo "Adding FEATURES=xattr to make.globals ..."
+		echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \
+			|| die "failed to append to make.globals"
+	fi
+
+	if [[ -n ${EPREFIX} ]] ; then
+		einfo "Setting portage.const.EPREFIX ..."
+		sed -e "s|^\(SANDBOX_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/sandbox\"\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(FAKEROOT_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/fakeroot\"\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(BASH_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/bash\"\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(MOVE_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/mv\"\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(PRELINK_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/sbin/prelink\"\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(EPREFIX[[:space:]]*=[[:space:]]*\"\).*|\\1${EPREFIX}\"|" \
+			-i pym/portage/const.py ||
+			die "Failed to patch portage.const.EPREFIX"
+
+		einfo "Prefixing shebangs ..."
+		while read -r -d $'\0' ; do
+			local shebang=$(head -n1 "${REPLY}")
+			if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
+				sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "${REPLY}" ||
+					die "sed failed"
+			fi
+		done < <(find . -type f -print0)
+
+		einfo "Adjusting make.globals ..."
+		sed -e "s|\(/usr/portage\)|${EPREFIX}\\1|" \
+			-e "s|^\(PORTAGE_TMPDIR=\"\)\(/var/tmp\"\)|\\1${EPREFIX}\\2|" \
+			-i cnf/make.globals || die "sed failed"
+
+		einfo "Adjusting repos.conf ..."
+		sed -e "s|^\(location = \)\(/usr/portage\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(sync-openpgp-key-path = \)\(.*\)|\\1${EPREFIX}\\2|" \
+			-i cnf/repos.conf || die "sed failed"
+		if prefix-guest ; then
+			sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
+				-e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
+				-e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \
+				-i cnf/repos.conf || die "sed failed"
+		fi
+
+		einfo "Adding FEATURES=force-prefix to make.globals ..."
+		echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \
+			|| die "failed to append to make.globals"
+	fi
+
+	cd "${S}/cnf" || die
+	if [[ -f make.conf.example.${ARCH}.diff ]]; then
+		patch make.conf.example "make.conf.example.${ARCH}.diff" ||
+			die "Failed to patch make.conf.example"
+	else
+		eerror ""
+		eerror "Portage does not have an arch-specific configuration for this arch."
+		eerror "Please notify the arch maintainer about this issue. Using generic."
+		eerror ""
+	fi
+}
+
+python_configure_all() {
+	cat >> setup.cfg <<-EOF || die
+		[build_ext]
+		portage-ext-modules=$(usex native-extensions true false)
+	EOF
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install() {
+	distutils-r1_python_install \
+		--system-prefix="${EPREFIX}/usr" \
+		--bindir="$(python_get_scriptdir)" \
+		--portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \
+		--sysconfdir="${EPREFIX}/etc" \
+		"${@}"
+
+	keepdir /var/log/portage/elog
+}
+
+pkg_preinst() {
+	# This is allowed to fail if the user/group are invalid for prefix users.
+	if chown portage:portage "${ED%/}"/var/log/portage{,/elog} 2>/dev/null ; then
+		chmod g+s,ug+rwx "${ED%/}"/var/log/portage{,/elog}
+	fi
+}
diff --git a/sys-apps/ripgrep/Manifest b/sys-apps/ripgrep/Manifest
index 69fb6684c8cb..d3788e18f535 100644
--- a/sys-apps/ripgrep/Manifest
+++ b/sys-apps/ripgrep/Manifest
@@ -44,5 +44,5 @@ DIST winapi-0.3.4.crate 905247 BLAKE2B a6dacb223c0f7743af4c16d4256eea6fdab49ef7f
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 DIST wincolor-0.1.6.crate 4799 BLAKE2B 37e72b9603d912b65dd59fe74f1158dd87783ef10511527e50795efc28711348a4c34ee27a2cb4ab523389f443c66ede77c471dd8c2e1bfadb6e8f22726e634e SHA512 d8d9e3a16918844d82cf1cddd7ffdd35cbeb8367b661108cc392d5ce636c270a27a307a4d0307553103356db2958114f269b5a007e4271dd1e6039d7c737e374
-EBUILD ripgrep-0.8.1-r1.ebuild 1528 BLAKE2B 57a1799d3cceb5a1605ed94512edf5f1cf9e4e30bbf8af7f60524989da7ad26e3f2a4aa1cc4ec1ef6e5f9cf6605895c30feb4f10a6e5ec5656e1d6704fc2f178 SHA512 486a5e5a6b8319b8509acab50cc0000484ff6819585a6e89a13b007e5d104b2313432ba9763ee5c1b956851f1236b2344041132411991c4d719ee758836be4f1
+EBUILD ripgrep-0.8.1-r2.ebuild 1532 BLAKE2B 1b5dec09d8a0ad05d570534daa72dfd4cff896a20e79b6c26daf151c79234042eaa02a44afa1652c16881b2787e0612d46649fbccbf52fa8008feafd7196ef60 SHA512 d4d4be24db631878e260c1d43b4b2d73bad4a8002cdf2fc404457f587b52b975e836ded7d17a9e9b9343b8dc54941dc06debf717d4532453a67ca8d5b9f525bb
 MISC metadata.xml 339 BLAKE2B 814975935c3042512ae2d83d3964bc94bef9b6b19181adc8c07f538e095983d503af6f6683c61109f4c3515175f02879f07d352845966c04bc774ee47d65db97 SHA512 4501066b64cc47d58915b452027ea603d319b0eae3d9bcd45642f16bcca3e5bbba3fc998fe8501ce63c4717ccf5f404392b98b54d53b93c648e8c8de116141ef
diff --git a/sys-apps/ripgrep/ripgrep-0.8.1-r1.ebuild b/sys-apps/ripgrep/ripgrep-0.8.1-r2.ebuild
index 27998b14ac3e..e0f4fe2ab36d 100644
--- a/sys-apps/ripgrep/ripgrep-0.8.1-r1.ebuild
+++ b/sys-apps/ripgrep/ripgrep-0.8.1-r2.ebuild
@@ -76,7 +76,7 @@ src_install() {
 	# hacks to find/install generated files
 	BUILD_DIR=$(dirname $(find target/release -name rg.1))
 	doman "${BUILD_DIR}"/rg.1
-	dobashcomp "${BUILD_DIR}"/rg.bash
+	newbashcomp "${BUILD_DIR}"/rg.bash rg
 
 	dodoc CHANGELOG.md README.md
 
diff --git a/sys-apps/sandbox/Manifest b/sys-apps/sandbox/Manifest
index fb6e898b78a6..860d5df360b7 100644
--- a/sys-apps/sandbox/Manifest
+++ b/sys-apps/sandbox/Manifest
@@ -2,5 +2,5 @@ AUX 09sandbox 37 BLAKE2B 181213e2cc0bcfa328310cced40bfaba4530d8d2f80e892cb5649d5
 DIST sandbox-2.12.tar.xz 424252 BLAKE2B 55eb06cbc15ad9ff8b0c272b8d071591ce3533a6ff807719df79131e6c966d60c3b37d9d8e4e1d466df0992836c4594bf6927b496ecb343a71d7b0656219a6d7 SHA512 98bd2ee8807d81e65ee0c9f11cfaf2b37da2ee4d8763c68d18c0ff6b14f3cc847ae2d3a0aa30cbe86063a2108ed4d4dcf7cc3fc4f37cb7549d266d4c1989c2a9
 DIST sandbox-2.13.tar.xz 424968 BLAKE2B efcbf527853e8cfe8b3fec026041f55f51cba78029f92195ec76a45e84cb2b6cc129267c6e50608584607de72a86b2e7836e77f20677de9b94bb5c40999e4712 SHA512 46ad79335e51a1ec0aaa34ab5eeabe9d007818c518682409c5aaf97d49ec23021ece8fa53264ce5332cdd04ef6b3fd9beff0dc0a3cb5dfe2f9b6a6e359f8c1cf
 EBUILD sandbox-2.12.ebuild 1928 BLAKE2B a7a78a1e8b6513b88b79ed395caa976601698355fc839004ae132b5a94e33295e4edc9d41e6c8e056c8fa0abee3c2199bc3a5fa09394ab58c5f60133c0b18b1e SHA512 f3e73bc7fb6b73490d395fe109bfbb35986720b8fafbdb3a1d8885a3388e4561b5e7f92a06c19909dca4e985923059743bbc0d060da39d1dc3031a8218a6e48f
-EBUILD sandbox-2.13.ebuild 1938 BLAKE2B 26db9bc8c8334a4a20bcb09765861f6ed6b6a3da6edd02cc9438943fc18271a9ffa90a26d37e2f648cdd5073a22de71decc21417db1ea331833f11d146f5ce4d SHA512 11cd256384d562de308cd579a04c3742dc436a8e3f4e30cc66d837373c2352b99b23bd4fbfee6fa61b74b7e1eaae95b7ffec1f0fb9785979b783c17f420cdbe7
+EBUILD sandbox-2.13.ebuild 1936 BLAKE2B 6fbde8f69b9389b46c027c04153bf0c863191cad8f42d7ccf151d10525a0ccd2e1b227d30663ed18b3233d8f81466c0fa004a73e2ccb776018c00890d6b8d41e SHA512 e1876c3b78ad65abbad3eb48c7eab773749fc6ad457bfc4a4560ef5bcbe8fdb9d227b27d8c6dcded3e5810d840cfeff3e10a54f81fa1918ca7eb0c53b86c52d8
 MISC metadata.xml 252 BLAKE2B d709f9b334b2810c5ffe7d73ef430f0f347f26f7649bca4bb8803c8e0be106534bcee6efae4f80b6fb1781b09284bb3dbc32d8dff4a3aa01a924fd3437b9da7c SHA512 de8b6a78dcc379d1d34960caecdab8da9fdb9a9f010ec8611cab79487b5f28f6ae80c8b0884731fa91c4ae98482a195faa8d1ec911b1d95fafdfe9cd622cc5d9
diff --git a/sys-apps/sandbox/sandbox-2.13.ebuild b/sys-apps/sandbox/sandbox-2.13.ebuild
index 37b52a70e2e2..966c4ce8a6d1 100644
--- a/sys-apps/sandbox/sandbox-2.13.ebuild
+++ b/sys-apps/sandbox/sandbox-2.13.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE=""
 
 DEPEND="app-arch/xz-utils
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index b355f11a80e2..2da8855615ec 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest
index 0c8059012cb1..2eca1c574413 100644
--- a/sys-fs/e2fsprogs/Manifest
+++ b/sys-fs/e2fsprogs/Manifest
@@ -12,8 +12,10 @@ DIST e2fsprogs-1.43.3.tar.gz 7405892 BLAKE2B 158aeee327a1ca68ce1bda1f97c9fa25ba1
 DIST e2fsprogs-1.43.6.tar.gz 7466907 BLAKE2B 6c19c686432b7990900b239c4a1b3b6675b085ca7adfdb4323d1253ee8c83f22f87f67b0b4a843e48cb71322b1a7454b3ceab669f875b71b967e96054a55f1ac SHA512 95e3e7def177de921d3204aeace4cb8243d79872468d3289cace0547798c84e92af253022deb803cd8c045411283b01431728a86b14b9e8b45cdd5dca739db66
 DIST e2fsprogs-1.43.9.tar.gz 7470878 BLAKE2B dcc1a6fda87884a0b3b1d49f4116be060bf39c4820246ba6aa7ce61c6735415542f852b36d3c809b2b52782de2ca9ea9a87086a0d4ff71ee217845939aae00f1 SHA512 7bdc5da165b14e6779aedd9243175018ca8cb2bb0f5aad9c3d04f7e0619da2107f37929e6d8027b682145801106f97d1376345c4c30ce64f2b02b716b0c4ba3b
 DIST e2fsprogs-1.44.0.tar.gz 7547084 BLAKE2B 32b16453931e33eb21cd42724c7dbe420c21ebdf1650f7eb9b8bc5a1016166e4fd244e97f7dd2c90c934f7244b9cae75bd9d177685b92a9430f29e3349f47b64 SHA512 a084973097bcc806d63b94c106fb22d840a53863c63016d7e0d68094b01679c6985a195e5f7983cfeb356e0a45636a52d6c444af30275c4c42c49c1d94663fed
+DIST e2fsprogs-1.44.1.tar.gz 7534979 BLAKE2B 1d1dcdfebca41d62bb15e0b0464bcfc848b8c1379f89987f91a59093d497536ccd5e80be67419cad05daf694be1629774f881d026ef834e3a61b00dc64f3543b SHA512 acd612a5146e4a07aa7ab3ef1b38c3ef3f27120f65c519dd02d44e48e5814c86d013315eb30c4f08edecaef6f08f0ec0b91fa133ea9dbd769ee29be3f2ae17c9
 EBUILD e2fsprogs-1.43.3-r1.ebuild 4042 BLAKE2B 9c30738f57c6d066f85eab86b74fd56253a56d1c00d88f40fe95301f51869ed68ecb31f002f44c079b10f4758c9cab09f41ddab3513e26c7d599aa5394c77448 SHA512 8f45b073d5684401e28b44decfa841a0a1ca778a6748081e1f07a3a903220c46a24fc7d5fce4d4e2ecb89bb3dcf54eee7a7b6e581534aaebd88dd2f1b91f16dc
 EBUILD e2fsprogs-1.43.6.ebuild 3796 BLAKE2B dda1c06831a1bae190689363561d34a653b51723dd14be8f910c43e77a58ab9aff566eaaae22879c499c1da7a34c72051b3839538b794f8f9d56fe90aa406aa4 SHA512 bebd95aafb0246723b6228ab3152e438a08c8d6a55f988e822cdb989d688a6b69bae1423ce2a5480c631461f00552d65dbe0420fcc094895ee70b809bcfa1dea
 EBUILD e2fsprogs-1.43.9.ebuild 3827 BLAKE2B 71bb5aef6c6f5ab2b1fc288821cdeab9f4ba067e481a80115042fd9c2624082a6b9a1dc8fa399071cf85937a451d47ffe007e46d51ab03742bb5fda266ee23e6 SHA512 89086e25c804f89bdd84a870c28e90dd7bb32de1cc4a891fb58f08c3566a53dafada3d65814612e7c0b1d1a34d8ee41de883037da00127a1bc7d769ae47bd9ab
 EBUILD e2fsprogs-1.44.0.ebuild 3827 BLAKE2B 71bb5aef6c6f5ab2b1fc288821cdeab9f4ba067e481a80115042fd9c2624082a6b9a1dc8fa399071cf85937a451d47ffe007e46d51ab03742bb5fda266ee23e6 SHA512 89086e25c804f89bdd84a870c28e90dd7bb32de1cc4a891fb58f08c3566a53dafada3d65814612e7c0b1d1a34d8ee41de883037da00127a1bc7d769ae47bd9ab
+EBUILD e2fsprogs-1.44.1.ebuild 3827 BLAKE2B 71bb5aef6c6f5ab2b1fc288821cdeab9f4ba067e481a80115042fd9c2624082a6b9a1dc8fa399071cf85937a451d47ffe007e46d51ab03742bb5fda266ee23e6 SHA512 89086e25c804f89bdd84a870c28e90dd7bb32de1cc4a891fb58f08c3566a53dafada3d65814612e7c0b1d1a34d8ee41de883037da00127a1bc7d769ae47bd9ab
 MISC metadata.xml 520 BLAKE2B 3e908938de1132b5cde97c6b51b40f72c03e91301b54c14339379d2e2380414dd33096a87d64ff2fc7d886cd65fb16b9c16a376b7338c826f44917860f380be2 SHA512 a5ff91610ed175147f1a9c2c725a30380908c02fc04c6b7df2792cb4fd805f9137374d2a910e456128a7bf2fec9e83af3063bcb5f2ad51394bed8bed648e3905
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.44.1.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.44.1.ebuild
new file mode 100644
index 000000000000..76d036d2679c
--- /dev/null
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.44.1.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+case ${PV} in
+*_pre*) UP_PV="${PV%_pre*}-WIP-${PV#*_pre}" ;;
+*)      UP_PV=${PV} ;;
+esac
+
+inherit eutils flag-o-matic multilib toolchain-funcs
+
+DESCRIPTION="Standard EXT2/EXT3/EXT4 filesystem utilities"
+HOMEPAGE="http://e2fsprogs.sourceforge.net/"
+SRC_URI="mirror://sourceforge/e2fsprogs/${PN}-${UP_PV}.tar.gz
+	mirror://kernel/linux/kernel/people/tytso/e2fsprogs/v${UP_PV}/${PN}-${UP_PV}.tar.gz
+	elibc_mintlib? ( mirror://gentoo/${PN}-1.42.9-mint-r1.patch.xz )"
+
+LICENSE="GPL-2 BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 -x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~m68k-mint"
+IUSE="fuse nls static-libs elibc_FreeBSD"
+
+RDEPEND="~sys-libs/${PN}-libs-${PV}
+	>=sys-apps/util-linux-2.16
+	fuse? ( sys-fs/fuse:0 )
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )
+	virtual/pkgconfig
+	sys-apps/texinfo"
+
+S="${WORKDIR}/${P%_pre*}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.41.8-makefile.patch
+	"${FILESDIR}"/${PN}-1.40-fbsd.patch
+	"${FILESDIR}"/${PN}-1.42.13-fix-build-cflags.patch #516854
+
+	# Upstream patches (can usually removed with next version bump)
+)
+
+src_prepare() {
+	if [[ ${CHOST} == *-mint* ]] ; then
+		PATCHES+=( "${WORKDIR}"/${PN}-1.42.9-mint-r1.patch )
+	fi
+
+	default
+
+	# blargh ... trick e2fsprogs into using e2fsprogs-libs
+	rm -rf doc
+	sed -i -r \
+		-e 's:@LIBINTL@:@LTLIBINTL@:' \
+		-e '/^(STATIC_)?LIB(COM_ERR|SS)/s:[$][(]LIB[)]/lib([^@]*)@(STATIC_)?LIB_EXT@:-l\1:' \
+		-e '/^DEP(STATIC_)?LIB(COM_ERR|SS)/s:=.*:=:' \
+		MCONFIG.in || die "muck libs" #122368
+	sed -i -r \
+		-e '/^LIB_SUBDIRS/s:lib/(et|ss)::g' \
+		Makefile.in || die "remove subdirs"
+	ln -s $(which mk_cmds) lib/ss/ || die
+
+	# Avoid rebuild
+	echo '#include_next <ss/ss_err.h>' > lib/ss/ss_err.h
+}
+
+src_configure() {
+	# Keep the package from doing silly things #261411
+	export VARTEXFONTS="${T}/fonts"
+
+	# needs open64() prototypes and friends
+	append-cppflags -D_GNU_SOURCE
+
+	local myeconfargs=(
+		--with-root-prefix="${EPREFIX}/"
+		--enable-symlink-install
+		$(tc-is-static-only || echo --enable-elf-shlibs)
+		$(tc-has-tls || echo --disable-tls)
+		--without-included-gettext
+		$(use_enable fuse fuse2fs)
+		$(use_enable nls)
+		--disable-libblkid
+		--disable-libuuid
+		--disable-fsck
+		--disable-uuidd
+	)
+	ac_cv_path_LDCONFIG=: econf "${myeconfargs[@]}"
+	if [[ ${CHOST} != *-uclibc ]] && grep -qs 'USE_INCLUDED_LIBINTL.*yes' config.{log,status} ; then
+		eerror "INTL sanity check failed, aborting build."
+		eerror "Please post your ${S}/config.log file as an"
+		eerror "attachment to https://bugs.gentoo.org/show_bug.cgi?id=81096"
+		die "Preventing included intl cruft from building"
+	fi
+}
+
+src_compile() {
+	emake V=1 COMPILE_ET=compile_et MK_CMDS=mk_cmds
+
+	# Build the FreeBSD helper
+	if use elibc_FreeBSD ; then
+		cp "${FILESDIR}"/fsck_ext2fs.c .
+		emake V=1 fsck_ext2fs
+	fi
+}
+
+src_install() {
+	# need to set root_libdir= manually as any --libdir options in the
+	# econf above (i.e. multilib) will screw up the default #276465
+	emake \
+		STRIP=: \
+		root_libdir="${EPREFIX}/usr/$(get_libdir)" \
+		DESTDIR="${D}" \
+		install install-libs
+	dodoc README RELEASE-NOTES
+
+	insinto /etc
+	doins "${FILESDIR}"/e2fsck.conf
+
+	# Move shared libraries to /lib/, install static libraries to
+	# /usr/lib/, and install linker scripts to /usr/lib/.
+	gen_usr_ldscript -a e2p ext2fs
+	# configure doesn't have an option to disable static libs :/
+	if ! use static-libs ; then
+		find "${D}" -name '*.a' -delete || die
+	fi
+
+	if use elibc_FreeBSD ; then
+		# Install helpers for us
+		into /
+		dosbin "${S}"/fsck_ext2fs
+		doman "${FILESDIR}"/fsck_ext2fs.8
+
+		# filefrag is linux only
+		rm \
+			"${ED%/}"/usr/sbin/filefrag \
+			"${ED%/}"/usr/share/man/man8/filefrag.8 || die
+	fi
+}
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index 26010981e99c..82e8081948da 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -16,7 +16,7 @@ EBUILD udev-225-r1.ebuild 13566 BLAKE2B 9aba88a7a7edcd0b2f63f590f84af713df2b2bbb
 EBUILD udev-233.ebuild 13034 BLAKE2B ab219baa2baa309e5b0598bbc1fc9a11d8dfb110e100dc8bf9e63c894df62c217a4ebaf9c2a28d67ce0f61d90c64fe476c3c5c4ba25b52decef9d47d4d72001a SHA512 6382221804b758022770ef3643720bd6780722790d408506fc4357132dc052e2061180ccef904da59302c464d9383de305b01f47835fef33dea5869f75a54d8a
 EBUILD udev-234-r1.ebuild 9990 BLAKE2B 8759bf272f1f7d2e03692049c11d9cbf106e0169c36b5125f8bf342af00133c70c5ecf88bf10bd1edfecddbc3c5075c7149903d5211c956277d7920191275688 SHA512 347f2941145237bc9732ad94074e5a6be432b15466ef2af4f82110a9314dbd9c6d69d391d8181ca66e9b13998466d9a609d03886e5afb5e250ad0323aaa65ec9
 EBUILD udev-235.ebuild 9988 BLAKE2B 275ed1ba897951832d3bcd566aed8c3762002736444fcd808b71c11cdadb194ab59da7df31af42092f474eeba2ae47f87cf8d68ed1c09117990c0bdfeda7fbaf SHA512 8a6fc0f42ccba3f0cbf808d1bf4c2d725347781f156fb36fe39057573f35e8d2a5c01fc091e2a5fc2a9a49ba78b4c86f6fec164ffd4d9d153092c3dfdc46c76f
-EBUILD udev-236-r1.ebuild 10183 BLAKE2B a2830dae74165b5d7e86cbf60de0c9e621ec0606369661d911ccceaaf2c794ada11aca457ae83cca388957f6fbf03604fee0fab3e74f4c6a3f8cfedc0f9ea115 SHA512 c304ab971260823bf409563f695ddf943af68b4746f67384281ff9ffcf5d5c9205a11db859964c15956ac1b42d0f64775f4f87006710586b149c0f0a501eee28
+EBUILD udev-236-r1.ebuild 10182 BLAKE2B 60bf63b4ac4a5aae260ebbb7086fb238cb9f7c75abf9300a819bd4925c22858d4fb1b77e556eadf645d58cbee085d391e36dbfe4aac0aa72bf195624a8374e6f SHA512 4384ee213525ef707c0225a3c7fabe2c726ee9660d5db20990583ea029676c51820f1fd21916c31ecbd402dd1cf798ce772d1827fecb4164ee3ecfda9374a82c
 EBUILD udev-237.ebuild 9737 BLAKE2B 0cb90c1e3f0fcc92a82d12191cbf4c69cbe2ca853e31dda0fc904f40d7ea8b5d9ad25ed6c43c1177a7d80d2b018d800fcbac5d2fdd2b6f33fa3d015f782297e8 SHA512 d03d4fc06b24964ac7cb6de2f5847f22566605934788e612fe186cac76660947e75a7f23d2000929fe061af75878d423c52776846fa9c3e4b49ea4f10c35fcd4
 EBUILD udev-238.ebuild 9737 BLAKE2B 0cb90c1e3f0fcc92a82d12191cbf4c69cbe2ca853e31dda0fc904f40d7ea8b5d9ad25ed6c43c1177a7d80d2b018d800fcbac5d2fdd2b6f33fa3d015f782297e8 SHA512 d03d4fc06b24964ac7cb6de2f5847f22566605934788e612fe186cac76660947e75a7f23d2000929fe061af75878d423c52776846fa9c3e4b49ea4f10c35fcd4
 EBUILD udev-9999.ebuild 9737 BLAKE2B 0cb90c1e3f0fcc92a82d12191cbf4c69cbe2ca853e31dda0fc904f40d7ea8b5d9ad25ed6c43c1177a7d80d2b018d800fcbac5d2fdd2b6f33fa3d015f782297e8 SHA512 d03d4fc06b24964ac7cb6de2f5847f22566605934788e612fe186cac76660947e75a7f23d2000929fe061af75878d423c52776846fa9c3e4b49ea4f10c35fcd4
diff --git a/sys-fs/udev/udev-236-r1.ebuild b/sys-fs/udev/udev-236-r1.ebuild
index 6817f1b99076..5ba8936e6fcf 100644
--- a/sys-fs/udev/udev-236-r1.ebuild
+++ b/sys-fs/udev/udev-236-r1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} = 9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> systemd-${PV}.tar.gz"
-	KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
+	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
 fi
 
 DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index 52796c469860..544c0957ac64 100644
--- a/sys-kernel/Manifest.gz
+++ b/sys-kernel/Manifest.gz
diff --git a/sys-kernel/dracut-crypt-ssh/Manifest b/sys-kernel/dracut-crypt-ssh/Manifest
index 053e82d726b2..dd38b2b5d978 100644
--- a/sys-kernel/dracut-crypt-ssh/Manifest
+++ b/sys-kernel/dracut-crypt-ssh/Manifest
@@ -1,3 +1,3 @@
 DIST dracut-crypt-ssh-1.0.6.tar.gz 19549 BLAKE2B fe73e5abefd00b07bcba9d8f55994a937328767730acc5b1ee7583487dea25c8df2628c4c46703148458cac3b0ae32673318fa960e0628570ddfcbadfb61dbd3 SHA512 a6fd9159ad74dd09f549a030fcb0189a525190d244d247a743e1c2ae044708aa1bfc3b9c7fe9d245945fa1b90668fedf913b87030fc7aab56e5ab36785a2f83d
-EBUILD dracut-crypt-ssh-1.0.6.ebuild 618 BLAKE2B a797763e533bc65dd6f38a4f3eb05b96d67e12c75d588cbbe24e80326e77cb7641e5f4f4d4d9b52ee0648ca0fe4e20c24fab3bb7806f233a0d2a4d51f259eceb SHA512 a9a3a72586c42457cbe2cd14b1a7d3edee3ea76d5a83c68020b679d317cd81be0cacfe78b6e9471b33b498efc7157fc8752e70ca92eefeb0bc5b164aeb50fe80
+EBUILD dracut-crypt-ssh-1.0.6-r1.ebuild 487 BLAKE2B a2588867b7cd91c5f9f78052621afdf3dc91c178c37983b29027709d1e92a2f1214577a39db22e5d7ecfa3aa77ccb633774b9b5ae8c05c5675329bb0796217fa SHA512 1f09e4ae12f29193ecfba8aaa568c1186bd84f22c879652da4a72def6a28e039d1c54cb7a0f835a146424abc293156e890a1cec5eb5f89726a5c37af99cffa4b
 MISC metadata.xml 558 BLAKE2B 629331efdb52a11585f2418fd9315f85b2871649d96d1303ac0a55f2e02648349e6d61d72c070246ccd9566ee8a9306e7b3260bdc02575b9c1eca5a5567990d2 SHA512 a3d8f046df9f52e068c8010eae94f2e8224140fb4fac92b612b75b09cf90f73ac38ac3b98e920fad51dc5d7f2a4d8bf9c0b8f5db0145396e9e54cae90be0f04b
diff --git a/sys-kernel/dracut-crypt-ssh/dracut-crypt-ssh-1.0.6.ebuild b/sys-kernel/dracut-crypt-ssh/dracut-crypt-ssh-1.0.6-r1.ebuild
index 9125a04c6f29..9ec7b6fe9200 100644
--- a/sys-kernel/dracut-crypt-ssh/dracut-crypt-ssh-1.0.6.ebuild
+++ b/sys-kernel/dracut-crypt-ssh/dracut-crypt-ssh-1.0.6-r1.ebuild
@@ -14,11 +14,7 @@ IUSE=""
 
 DEPEND="sys-kernel/dracut"
 RDEPEND="${DEPEND}
+	net-misc/dhcp
 	net-misc/dropbear"
 
 DOCS=("README.md")
-
-pkg_postinst() {
-	elog "If you want to use DHCP in the initramfs during boot,"
-	elog "dracut will require dhclient provided by net-misc/dhcp."
-}
diff --git a/sys-kernel/dracut/Manifest b/sys-kernel/dracut/Manifest
index b76f491be07f..d7900b8a9d39 100644
--- a/sys-kernel/dracut/Manifest
+++ b/sys-kernel/dracut/Manifest
@@ -3,6 +3,8 @@ AUX 044-0002-systemd-initrd-add-initrd-root-device.target.patch 924 BLAKE2B eeeb
 AUX 044-0003-50-dracut.install-use-bin-bash-shebang.patch 558 BLAKE2B 7a5c30a6a70b4dba8463c4701910dd9878f6923a572532b022cfd0c63e9f3f01559d5c2e5c419f8e3b7196d3e2c587279e16761e60e8e67d8fc8ab5d35c96cdf SHA512 657685b27d3ffd326fd1976ccd89cbe4ab9122b63f2a6a03cae3bd54663bd1a26366552550ea50af671aa5a604b9ca08caf1bc689551e46f7d208c7d5e83730b
 AUX 045-systemdutildir.patch 1665 BLAKE2B ddca173403586e0ec4f8af86bf9d8004a0fa6176155c8b9d3e7906fdbf23db910290d60cf1834da7635c75b58b107616a722b560b076608920f9cc4b3a6351ff SHA512 f576cd166e9ad03ffa8317dcffcd7c6f920ffa92251eaacc5c2a95e4ca88687bd1870c8f75ecf3b5fc81773f2d3e082dff647d6a313d183a6017fc79b7bc604b
 AUX 046-amd-microcode.patch 1013 BLAKE2B be9f9b545e5d68285f2b4e3a4ccee3e39c0c41349450053e411532c47e9634157df190ea2bceacb422a3f1b874ae256c34a4822f3fb964b8c06a05f7adec3a59 SHA512 c37734a66a9727cb0effc5a02b85e6bd2d3e5b05913657f517fcb26fc6cacc89398e28dd2865e5abe0148520bc95530a6cffb904b5dbde00af1d85e7d1c26b65
+AUX 047-all-fix-issues-found-by-shellcheck.patch 3265 BLAKE2B 0f7e227311c96ca204d5b23093003b38c120dfe208482e421f7104fdfb29beb925239e007d372ba1e7b9e75ad395f2a4b59a5a0dbed02389398f678f480fb45b SHA512 21fbcb0558a543402325f3b356d08ce4747c82e337a3f196a1ded20b633bcf79ab14323858386a5c35ef4857f8795f14b0df874596ecb1a4f8aed90160405dc8
+AUX 047-plymouth-fix-detection-of-plymouth-directory.patch 1055 BLAKE2B 285e008dcbada06a475f1cbfe67602f046c7bb354b812ea614d99a921d40d09d099f3329cbc348b8bc4dd17bbbdcc0da986f0de5cce7f07464d2318dd9f0d719 SHA512 90372cd630903981528acd6aec1f1051e94ca2a0e53a834583faf6bf244aa7967f590f9bc38db3233e78bfd859388c011484a624d7f092c863755f73d6285b21
 AUX dracut-044-bash-4.4.patch 5036 BLAKE2B faf944f4405b560d7f43ce2fd0595b223f1c91eed11422b19a5b61b710e69c10b855d3fb99fd28f204d8c31c49c272259704e148fcb794bbd8309b3779a62b4f SHA512 68522464fb446175f967c8453e8427f961e97522661a22a7c302a90ff716ab75b0cfc32f568a06f1e1821ba7115d6d2f48b6ded9ed65b30806d4d505a0903279
 AUX dracut-044-preserve-xattrs-when-copying.patch 2354 BLAKE2B a7195fdf0663e71b5e5eb2f8c9d971f5bd2bdc8b8a49399d836efc8efed2547118399ae7780c93014659d88c0359e7336f2e2a345ce009b5f872468d0412aaf9 SHA512 b15babf62a4ece46c8b55a2ac21c3284665da8c38c10fc1209c08605b778689cf80108b8baa0ce66eee2218d6975cc5b9401d8a70326ddb6f731c55373e52a02
 DIST dracut-044.tar.xz 280004 BLAKE2B 5b9603eb769b542e2d56fae4d0f0fe250e7e60eb9c85f9c7b7a472b9d889a9f323b3ba1cbbeb1d5de10507498542275cd4430695cc8b48426b42c03d0672ea87 SHA512 bc788076e425b223d98cf0e0b15ff57d75d423991d7a67fb564a2857c38d5c3a21d846d2ca4523f9d4b0128bb981d09b5c26031435c5fc5e30f53080bca19b3d
@@ -13,6 +15,6 @@ EBUILD dracut-044-r1.ebuild 7688 BLAKE2B 0746d8c7b1bc07fffceb5fd8e12ecffd6638853
 EBUILD dracut-044-r3.ebuild 6946 BLAKE2B 0d8d4af31cee443564192cb02ef4b620f33a5388ada4c5359dd21c6e21abd2beebf194b7d5890c6f96016e15928118b88603e56bf4a81fe82ce09f5d33534bf5 SHA512 65f4f7193a6eb32c81cf57ac8d37c7a82ad2fe0bb580f5dc65c168b02a41f4cea29b81f6432f760bf59decdde501800d7a573dd6a5c021834896e911035f5ebd
 EBUILD dracut-045-r2.ebuild 4798 BLAKE2B 9ea482401d66d49eadca291a2fea9a7238d052f304cc6af83f509a92369383109d99d43a8a8caee258bd9d9fbadb23a2e6822314c95db26194567ab2f78cfd8c SHA512 3cd182bff67a90bc94e7b289ce1f09532dbe3784f93e798e7d5362418cc43d42c26277d4c4e13abcb389058b76629ad0babfe3b7a7176390358bf148167c2c26
 EBUILD dracut-046-r1.ebuild 4807 BLAKE2B f31663293ad74ca0ac058a43edac505a8f7bea5af6677535a6425588de39bbd2a0750085e0c290af234de075d05cb9c71f43587490f7090724140856361e424b SHA512 b6c93ec687c3d005ba7e2b0f5ad1317f343edc20c527b68927b00c6c64c29c74fdcb6db0b4a738e22de94141bae43e5aef37aaf1625667f8824dd8dbc5691748
-EBUILD dracut-047.ebuild 4584 BLAKE2B ad45aa14e8e521d4a88450f239c8666564d88876fe632d8b4678750209a47c3b54aca1ca93ecde2cde6bb6b4dd5cfcf814665a8bf643a38a14ddd519d97e5684 SHA512 57e1617da82ba2549c3d61661f1a2eb7bb3eccd0841a8f91c4eb23a39daee39de8b9abb2b35e33a31f3a9dfd93a4bcf9e52171bfcc9bb69c0e9b9e2dc4793789
-EBUILD dracut-9999.ebuild 4719 BLAKE2B 3c7f5ed4e95f956ed2f92d1d1553439d74aed8098c7936b3ced73f0eea680aa14915bd99952ab1a7d2fe7f30f205422c51911bd9cf158c6ab57cf223adcbfab5 SHA512 cefc18a54e7e9ce56bda7c2f25a5ef592d3086ed9975e06f603f00721fe2af086eef83bfa377038ae34b646d7bb2b26475ba5d76b312fe8ffd70eabab64280ef
+EBUILD dracut-047-r1.ebuild 4736 BLAKE2B 6940ade45fdac58fabaf6f814037ca704e77f01872163da3e4dc96572051961ca92a1e467dfe0541e40c920988400fbaa37e2a62a1e7edda31d99564d4c3b5b9 SHA512 4f39489389f78dc8aab806156821e6bd95a276f117c5d1711a8fe4498a94d83590cdab10d533bfc0bf5e6e0b66de46c349aa827f244ca86101aa67aad9ba2756
+EBUILD dracut-9999.ebuild 4741 BLAKE2B 32973c0e3706bc6d46aaa8ffa9ea24da1098454bbbb03fe68b9b34637a59fdcac5a20bc334f1b12c066972f3c53780328ba89de576ffa46e2c3ac074582d301a SHA512 70e4e0e9a3b95290eeba46c7d3cdfa63b9af08c96522a697bc4efe9ed041232841142947d13bcc3a64e08a8a802e9cd8399a64b1297f501bf43dc41b9e99636f
 MISC metadata.xml 725 BLAKE2B 475d51f4e2bebf318ef94ea1fec40a34bcf04b4f0c69e051c8840e0965a92fd9861c5aa8acfb2ccb5a4cf354665ab3efc6adfdf7d0191325c1f798ea5e49594e SHA512 b708d0eb6a792d5ba3495f321af5e10672af3354f1f42c60b175b7fb48ae836e24db7768511c44cbb0a949c1cca75948890d3b32904bbe47e50d9c43d71787fb
diff --git a/sys-kernel/dracut/dracut-047.ebuild b/sys-kernel/dracut/dracut-047-r1.ebuild
index b37520c7e9fc..d663ce2a26f6 100644
--- a/sys-kernel/dracut/dracut-047.ebuild
+++ b/sys-kernel/dracut/dracut-047-r1.ebuild
@@ -46,12 +46,14 @@ DEPEND="${COMMON_DEPEND}
 	"
 
 DOCS=( AUTHORS HACKING NEWS README README.generic README.kernel README.modules
-	README.testsuite TODO dracut.html )
+	README.testsuite TODO )
 
 QA_MULTILIB_PATHS="usr/lib/dracut/.*"
 
 PATCHES=(
 	"${FILESDIR}/045-systemdutildir.patch"
+	"${FILESDIR}/047-all-fix-issues-found-by-shellcheck.patch"
+	"${FILESDIR}/047-plymouth-fix-detection-of-plymouth-directory.patch"
 )
 
 src_configure() {
@@ -84,6 +86,9 @@ src_install() {
 
 	insinto /etc/logrotate.d
 	newins dracut.logrotate dracut
+
+	docinto html
+	dodoc dracut.html
 }
 
 pkg_postinst() {
diff --git a/sys-kernel/dracut/dracut-9999.ebuild b/sys-kernel/dracut/dracut-9999.ebuild
index 684ea423e895..791e382ac490 100644
--- a/sys-kernel/dracut/dracut-9999.ebuild
+++ b/sys-kernel/dracut/dracut-9999.ebuild
@@ -53,7 +53,7 @@ DEPEND="${COMMON_DEPEND}
 	"
 
 DOCS=( AUTHORS HACKING NEWS README README.generic README.kernel README.modules
-	README.testsuite TODO dracut.html )
+	README.testsuite TODO )
 
 QA_MULTILIB_PATHS="usr/lib/dracut/.*"
 
@@ -91,6 +91,9 @@ src_install() {
 
 	insinto /etc/logrotate.d
 	newins dracut.logrotate dracut
+
+	docinto html
+	dodoc dracut.html
 }
 
 pkg_postinst() {
diff --git a/sys-kernel/dracut/files/047-all-fix-issues-found-by-shellcheck.patch b/sys-kernel/dracut/files/047-all-fix-issues-found-by-shellcheck.patch
new file mode 100644
index 000000000000..d5cbe042b639
--- /dev/null
+++ b/sys-kernel/dracut/files/047-all-fix-issues-found-by-shellcheck.patch
@@ -0,0 +1,77 @@
+From 3aa37cafde734719f2377600a17459fad30edfbc Mon Sep 17 00:00:00 2001
+From: Lukas Nykryn <lnykryn@redhat.com>
+Date: Fri, 2 Mar 2018 12:29:46 +0100
+Subject: [PATCH 06/14] all: fix issues found by shellcheck
+To: <initramfs@vger.kernel.org>
+
+Error: SHELLCHECK_WARNING:
+/usr/lib/dracut/dracut-init.sh:939:20: error: Argument to implicit -n is always true due to literal strings. [SC2157]
+  937|   dracut_kernel_post() {
+  938|       for _f in modules.builtin.bin modules.builtin modules.order; do
+  939|->         [[ $srcmods/$_f ]] && inst_simple "$srcmods/$_f" "/lib/modules/$kernel/$_f"
+  940|       done
+  941|
+
+Error: SHELLCHECK_WARNING:
+/usr/lib/dracut/modules.d/98syslog/parse-syslog-opts.sh:18:12: error: This expression is constant. Did you forget a $ somewhere? [SC2078]
+   16|       elif [ -e /sbin/syslogd ]; then
+   17|           syslogtype="syslogd"
+   18|->     elif [ /sbin/syslog-ng ]; then
+   19|           syslogtype="syslog-ng"
+   20|       else
+
+Error: SHELLCHECK_WARNING:
+/usr/lib/dracut/modules.d/90crypt/crypt-lib.sh:15:29: error: Since you double quoted this, it will not word split, and the loop will only run once. [SC2066]
+   13|               strstr "$d" "${luks##luks-}" && return 0
+   14|               if [ -n "$dev" ]; then
+   15|->                 for _dev in "$(devnames $d)"; do
+   16|                       [ "$dev" -ef "$_dev" ] && return 0
+   17|                   done
+---
+ dracut-init.sh                          | 2 +-
+ modules.d/90crypt/crypt-lib.sh          | 2 +-
+ modules.d/98syslog/parse-syslog-opts.sh | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/dracut-init.sh b/dracut-init.sh
+index 53e6f13a..1278c638 100644
+--- a/dracut-init.sh
++++ b/dracut-init.sh
+@@ -942,7 +942,7 @@ for_each_kmod_dep() {
+ 
+ dracut_kernel_post() {
+     for _f in modules.builtin.bin modules.builtin modules.order; do
+-        [[ $srcmods/$_f ]] && inst_simple "$srcmods/$_f" "/lib/modules/$kernel/$_f"
++        [[ -e $srcmods/$_f ]] && inst_simple "$srcmods/$_f" "/lib/modules/$kernel/$_f"
+     done
+ 
+     # generate module dependencies for the initrd
+diff --git a/modules.d/90crypt/crypt-lib.sh b/modules.d/90crypt/crypt-lib.sh
+index 532b9a71..bbf485e0 100755
+--- a/modules.d/90crypt/crypt-lib.sh
++++ b/modules.d/90crypt/crypt-lib.sh
+@@ -12,7 +12,7 @@ crypttab_contains() {
+             strstr "${l##luks-}" "${luks##luks-}" && return 0
+             strstr "$d" "${luks##luks-}" && return 0
+             if [ -n "$dev" ]; then
+-                for _dev in "$(devnames $d)"; do
++                for _dev in $(devnames $d); do
+                     [ "$dev" -ef "$_dev" ] && return 0
+                 done
+             fi
+diff --git a/modules.d/98syslog/parse-syslog-opts.sh b/modules.d/98syslog/parse-syslog-opts.sh
+index 50ec2759..9ec6ad47 100755
+--- a/modules.d/98syslog/parse-syslog-opts.sh
++++ b/modules.d/98syslog/parse-syslog-opts.sh
+@@ -15,7 +15,7 @@ detect_syslog() {
+         syslogtype="rsyslogd"
+     elif [ -e /sbin/syslogd ]; then
+         syslogtype="syslogd"
+-    elif [ /sbin/syslog-ng ]; then
++    elif [ -e /sbin/syslog-ng ]; then
+         syslogtype="syslog-ng"
+     else
+         warn "Could not find any syslog binary although the syslogmodule is selected to be installed. Please check."
+-- 
+2.16.1
+
diff --git a/sys-kernel/dracut/files/047-plymouth-fix-detection-of-plymouth-directory.patch b/sys-kernel/dracut/files/047-plymouth-fix-detection-of-plymouth-directory.patch
new file mode 100644
index 000000000000..42f877292a79
--- /dev/null
+++ b/sys-kernel/dracut/files/047-plymouth-fix-detection-of-plymouth-directory.patch
@@ -0,0 +1,31 @@
+From fe6c7e0f06cde65effb3503a47c31ac39aceefb6 Mon Sep 17 00:00:00 2001
+From: Alexander Tsoy <alexander@tsoy.me>
+Date: Fri, 23 Mar 2018 11:52:27 +0300
+Subject: [PATCH 14/14] plymouth: fix detection of plymouth directory
+To: <initramfs@vger.kernel.org>
+
+Some distros have both /usr/lib/plymouth and /usr/libexec/plymouth
+directorirs, so we should check the existance of plymouth-populate-initrd
+script.
+
+Fixes: 421b46f8ae89cfe2b62e880a8a5079ee8c1b3aae
+---
+ modules.d/50plymouth/module-setup.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/modules.d/50plymouth/module-setup.sh b/modules.d/50plymouth/module-setup.sh
+index 5fbca8b0..b51913e8 100755
+--- a/modules.d/50plymouth/module-setup.sh
++++ b/modules.d/50plymouth/module-setup.sh
+@@ -6,7 +6,7 @@ pkglib_dir() {
+         _dirs+=" /usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)/plymouth"
+     fi
+     for _dir in $_dirs; do
+-        if [ -d $_dir ]; then
++        if [ -x $_dir/plymouth-populate-initrd ]; then
+             echo $_dir
+             return
+         fi
+-- 
+2.16.1
+
diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest
index 239560af5b6c..63559569f764 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -16,6 +16,9 @@ DIST genpatches-4.14-33.extras.tar.xz 17492 BLAKE2B ebff9e91c92b4fb48ae355401faf
 DIST genpatches-4.14-34.base.tar.xz 893480 BLAKE2B 26a867d2f723bee9e2e3f90ae1208f447aa6c025ef520020bcff2656c6870cc25ac44c0533fc555c77a8a4f8fe22b545ac8f2e10820935e5dd88fada4a40e71f SHA512 6721ef0e5153d334c95f70c5180587ffc716882f4abaf71e830a79641499527aebf7e310ba81c9e0e69bf83656c53f19c4a22720686e20b476f032a56e30ba88
 DIST genpatches-4.14-34.experimental.tar.xz 5184 BLAKE2B 1543a0da91eb42dc3c61b3670c2d5aa94a49bf30c3745b2408d43d55f009f378737d05d9c8cc2b16a43717ef96fe52758c0487f7f9ab725ced9482c92494321c SHA512 e9014e32d8d4659d4d7ac5e4902b6a4bb1fca2f3263efae09873e966a86151045c054c42f3247074ca802fd7008a7ba8ff06cdc507367cf9298579ddcd73f6da
 DIST genpatches-4.14-34.extras.tar.xz 17492 BLAKE2B ebff9e91c92b4fb48ae355401faf2c7dfc4029899cb2bad7a31fd9c2d2675d6d941584d74db8f96971a64cbc2e2a1e8dd6e9b189443a8b7d4918f3ce33cdf481 SHA512 dc05fdfa9b0a799b8767109033434d8a2be00dedb19a420c395576fc142dd41e7ed1a74530d543958865d9d8557eac2b193fea3a16fb45fb1e725b0129ab75f2
+DIST genpatches-4.14-35.base.tar.xz 911684 BLAKE2B 28fb557cfca83b5138fb6e04d0377c9d5507049680fc86f8e073ab00b4db89689d20dd6c22ca21ade35e3d10187b26139057114ae81f1db3a24ed436557719a7 SHA512 52bc894c5483c21d9228671adbd12be36be669a70426399d0c183e4a87e102e06e1151e5b057da4e9dd46696a74d03f5404bf4c180c15c3595bb1c44ae511965
+DIST genpatches-4.14-35.experimental.tar.xz 5184 BLAKE2B b4d97f8f7d4dc4fdeb22e316ee5474f86376571eeee384385e0130d56f6228896d5de5cb74f3abd4e437b0fb2ad5f8e092c431ca3efe076af06e1d1008b70fc3 SHA512 5666450cc357545df8260e7100cfbfdc6389f7c766a93214ed5f8fb0ff7524c90fcdb232e136d3cf451be581e021b8ecc086d37782780b44772eb95e3a0f0432
+DIST genpatches-4.14-35.extras.tar.xz 17492 BLAKE2B 585593b652ce04707ded634190d56ce3e548493b1d65e2cffe963d62abe3bab83134eb6a0feef45b94b324c577a7c5aa318bebeb2e97bf2943c8a1319e40ed3a SHA512 df8d909c8897116f42877fce9b7e62f5eb651a0ab51861ad4e3acd68adebb40657755cb7c7757b001beec7f959cf1ef8691609b11deba0aa214baacc7b4f66ae
 DIST genpatches-4.15-1.base.tar.xz 5908 BLAKE2B 6627ff7c5bd6b799dae5e61b1638ccc538715cc253521fd07faa0c5ea7dc9aed5204c040742d37a9d172509577ae5442526d11cbe8714540ee8e1f1637d0fbbc SHA512 c7b8cb613f4a2e6570808d179be6972511ea45c849c4415509e38e1d4688014cab15486628bb282178f306ff786e83718fb2171d1391057bb817ed67a0508caf
 DIST genpatches-4.15-1.experimental.tar.xz 5184 BLAKE2B 814356256c11ea5bb67706f47ed76d6fe6f8b4232b989ca042509ed2a7f3088f55bd113d3cac25342a66e4803f90864cca803c91661af106141b78ac9cf5fe18 SHA512 e840928a463a764d59013424045f64c1fdc8e5d18cf1d20c9ea15388d5f4c4b9ec6aa86e88c33add716366d6b18be175943c22b6bb1c88d3cdbaebb606a38b10
 DIST genpatches-4.15-1.extras.tar.xz 17492 BLAKE2B 1242891d2ebe519d6c9d43eb6a0b2e9dd1c51ae76dc8aaf71f14dfbf3b9c52097cfc4ad59c5e2add1da4ded0a34a06e2d302a0366a8afb665f1536f899fa3f9d SHA512 21830b23a1b16291beba81ac122a36e8bcf9268b548aa6e9258f18283e80f610ed249ccf320f27b0a45acd35e3bd8ba5ceb0420e360ae94635121f89d74903b6
@@ -34,6 +37,9 @@ DIST genpatches-4.15-14.extras.tar.xz 17492 BLAKE2B ebff9e91c92b4fb48ae355401faf
 DIST genpatches-4.15-15.base.tar.xz 336656 BLAKE2B 326410c6d2ede2393d0e4e9dc034d1adee8336fdd2ea6a9831dd9be7963d72cdfe031ac24db54a95ce1c94cd388121ee381cbac5c365d2eee79e49c4277480be SHA512 a286494dcaa8d1a063501b364354cd4fb9d342f03efa559292b9908928cce7a684bb706ec89bfd46b52c1253125894322fa4f1d0ec3a7577bf47a4cab0ceba7b
 DIST genpatches-4.15-15.experimental.tar.xz 5184 BLAKE2B 1543a0da91eb42dc3c61b3670c2d5aa94a49bf30c3745b2408d43d55f009f378737d05d9c8cc2b16a43717ef96fe52758c0487f7f9ab725ced9482c92494321c SHA512 e9014e32d8d4659d4d7ac5e4902b6a4bb1fca2f3263efae09873e966a86151045c054c42f3247074ca802fd7008a7ba8ff06cdc507367cf9298579ddcd73f6da
 DIST genpatches-4.15-15.extras.tar.xz 17492 BLAKE2B ebff9e91c92b4fb48ae355401faf2c7dfc4029899cb2bad7a31fd9c2d2675d6d941584d74db8f96971a64cbc2e2a1e8dd6e9b189443a8b7d4918f3ce33cdf481 SHA512 dc05fdfa9b0a799b8767109033434d8a2be00dedb19a420c395576fc142dd41e7ed1a74530d543958865d9d8557eac2b193fea3a16fb45fb1e725b0129ab75f2
+DIST genpatches-4.15-16.base.tar.xz 358520 BLAKE2B 46f38cf7c2994d51d5ac2180e9f08043b2cb41e49b4ee021136ffbdf68baca3f83b4e4bf5edace618b3a4f675955109393e31a16250d50b765da2f417e3588b0 SHA512 ef755f131261c9b20abf83f1b573261e9a0fda2ef7b985316a98119d2c098f7f844d5128eef9c4aa13d582dd15f93a31efe136575431ba34bd1b97153fb8d8f9
+DIST genpatches-4.15-16.experimental.tar.xz 5184 BLAKE2B b4d97f8f7d4dc4fdeb22e316ee5474f86376571eeee384385e0130d56f6228896d5de5cb74f3abd4e437b0fb2ad5f8e092c431ca3efe076af06e1d1008b70fc3 SHA512 5666450cc357545df8260e7100cfbfdc6389f7c766a93214ed5f8fb0ff7524c90fcdb232e136d3cf451be581e021b8ecc086d37782780b44772eb95e3a0f0432
+DIST genpatches-4.15-16.extras.tar.xz 17492 BLAKE2B 585593b652ce04707ded634190d56ce3e548493b1d65e2cffe963d62abe3bab83134eb6a0feef45b94b324c577a7c5aa318bebeb2e97bf2943c8a1319e40ed3a SHA512 df8d909c8897116f42877fce9b7e62f5eb651a0ab51861ad4e3acd68adebb40657755cb7c7757b001beec7f959cf1ef8691609b11deba0aa214baacc7b4f66ae
 DIST genpatches-4.15-2.base.tar.xz 22348 BLAKE2B a4d4e0b6a83e46a657ced903845dc7adcdb749e6657006c58d7070a0cb906066a1241ba7c33c9431aab4af12debc0e875822c5d327dc29853420cc5699cfae2e SHA512 2d6d8a2cda9ee4c41068c03f1e90e5bec2c25debb2bfbda7d6acc83b49b4ecfe861fd0be68c133dac4c98f23d8c23fca816f817653cb283405148985f20c4e9e
 DIST genpatches-4.15-2.experimental.tar.xz 5184 BLAKE2B 4967ea59aaf9587c5f36e1cb97e0ce454f7d23c0d9e02cacf4bffef14834ca591eb4b64606fdc267d2051cab21ac49cfab16082d1a0affa2e2e555bfda27a72c SHA512 9fbf5806636b2676144dfce4d33c8ff1d97dba9a44703abe5cbc1741c3f54f082416f9628f308a186dfef1c82b42183a9a52970f96be06c1e0a60ae1a1a29257
 DIST genpatches-4.15-2.extras.tar.xz 17488 BLAKE2B 7549c1059b8aa48dedf196fbf53be363735ee2d016ce03fc22c3c72082eb5c770d5af557c8602ad01e7b98f1eeaa4c0497a6eebf344596365811f402307b3f6d SHA512 053490dac39816e14086781c4aa7a6c66544543a8851fd672b8a8cfcf49a03573e3820284de3a28c0345eec27a1c1687bc445443c5076ae3662686da3ed5e1d5
@@ -115,6 +121,9 @@ DIST genpatches-4.4-125.extras.tar.xz 16464 BLAKE2B 17b725189a9c68d87b9500e50b3b
 DIST genpatches-4.4-126.base.tar.xz 1916044 BLAKE2B 041e99faa4b789c7578faf9f304a33e53d913f6ee1b68fa4c367a7b376bd72573ccad5db47f9f59cbdb30a5b061eab059c0520aab0f5049e097a9f551de6b979 SHA512 78fbbdecef6398858e44c78f4af33b2ca08c764670be11d2bc643365c081df2ea456d784e8d1d31f9d75f948764c72db7d21df704d63f072d7f918421df916ca
 DIST genpatches-4.4-126.experimental.tar.xz 87792 BLAKE2B fed0cbc54f215d1572bbf6a81ecfb472646635d06c175b6d28b9b1a09d3592178c92ad8a6b306dcfb2ab1bfe50dc75863b2d50803a68788cada9e77c8b5f0dfe SHA512 14ca02669d2940d09d6a86761b8c56eacdf677f0ed3b464fdc6df7f6e91a9eaf00ca44c4fa69dfdcd3aba7ca51dd63a2be77cace707bfc052573d85e133159cc
 DIST genpatches-4.4-126.extras.tar.xz 16460 BLAKE2B e4c01bc55ba62f675b983a3e38e10256ea4a7ebe24e1a9baa540fc7721f03d430524d7ee324adcdb01b437a229a6922e47db3b19f0c20536187fec60b7237b31 SHA512 726ebd4e034ec5871cc4d95dc206ae09feaf8e24eb1eb6348ce10c6a5d69fd3f09aba3b57ad8fd15e2106d1f1baf8ba4502ce7b27022a62cea836f67b07229fb
+DIST genpatches-4.4-127.base.tar.xz 1936904 BLAKE2B 1a78de18d5484142684c070c47ad18d0a5141065e72daa4970d063e70e5189145b720fcca9b4144a9c3e1daa0be186dfcc1240f8f1b46b82ea2ab8564514e138 SHA512 dc117ddf1263709150c95c0a4aba2e85ee0fac133c094d783de3e109215c5e48c483145d45348d5535ee3c4bdaaae37632cb7ecbba7d8ff5904216079d7f00af
+DIST genpatches-4.4-127.experimental.tar.xz 87800 BLAKE2B cb8bc2cf7ae5658a49aa0f47a3083a7af930b30631f659fdb7621475c3842a43b3749466faa5202d65e3a9157a351c92ab62f44131487a0af95eaea52aa7af8a SHA512 3414de31cf89f186c3acee6b4d788f65b5338b3df21f1d702d7c987cceb6e861b60f95ad629c8a23baefc01581116ceb6a6fc5be167eb8cc4c4a0e344de6f82e
+DIST genpatches-4.4-127.extras.tar.xz 16460 BLAKE2B f793e17ad055a8ada8b8a32f7465c14eca965a737834eafbd6317bfb574ea12f1e8c1f7c01fd612e2267dfebe09618eb5e22af63710149e248cc2fb6a1cc3c00 SHA512 481f96cdd557ef4129790b2f0c0ed4844c54b3004b280a9520de868edc67509644fc03f29f4d8a1123bf094738b0a7f629c16f92ee2e9c918f8a97ca16f7d225
 DIST genpatches-4.4-91.base.tar.xz 1428436 BLAKE2B 4b706e9682e883dd1954632efe5ec161347432a6260c353e160b8591f8377e6d1e1768acd2e3e72237e3ea6b7104137e3504e3f290fb12b0dabf662b0fb034c1 SHA512 cdddd25be04b33558f7ebcee66df992aae38f29181474ebed82958d4d50639097b4a82eaf256d7b3576bfcd0cd3fe7682956e1d2cdbdb912d47fe86205d9b554
 DIST genpatches-4.4-91.experimental.tar.xz 87760 BLAKE2B d8a165fb3708192a12e826a713e896ca83785da084c9a9aeaae909473c598669867fa303636d762facd2d7bc1a857da3ba0d994ee62d008dc17955dd84181942 SHA512 0bbc83e076d45da1d0258bfd7f6acf6170e99891a9a857b2552f3a0fcefff4f318a8c5c8779591b0bb654760f905530de18723f2ba960618eae59a1b7219c28f
 DIST genpatches-4.4-91.extras.tar.xz 16468 BLAKE2B b99298cd9e57a2b8a0619495df0450373c9f5c14ff2398d76534c7167f3a563c05e67f9aff80ff97a474ae7a8cb298a4ffbc5eab25d79075aac5cc01964c3e9d SHA512 229922945fcb882a0cb7dcba8bac9de51683690462a8df59e181a03d702fcb1c9b54078c5434624b4a197c481f0bb9b73dca58456ef5a5884a30bfd3644dfd6d
@@ -193,6 +202,9 @@ DIST genpatches-4.9-91.extras.tar.xz 17352 BLAKE2B cebd73ce2ff0719364f33fdc2a57a
 DIST genpatches-4.9-92.base.tar.xz 1730124 BLAKE2B 5780324beff88240c8b40594dfb9acd8e922d3985f4242eec60c7111e3e23b36016a47990867e98b2fabfa8f698bd29749e9ca8a9062875edce50638d99fec92 SHA512 97a4b956d0d6e561ebdfcd665fb61ecd73c9958d0128a0696cbe8e0a4f89def8cacfd6fe1a799bf24a6a0aa5181c7456813d82410904c649b876bba9ba1180b2
 DIST genpatches-4.9-92.experimental.tar.xz 106364 BLAKE2B 5339624160c3d7f7dc32c39dcce00a575f24a1ade8140462f8cf7b369f5c584e1845741b483d79a2fe25c405b4b5d486059fdeb39df2ec8c13e1d0e47d37732e SHA512 f872f13319637634cc25d4d68697dcf865ff10ae284413238545a9ceadcd5868750d34ae32d3bb850d3d0547430edd8d6f01efcea5756420d148db6daa1523f1
 DIST genpatches-4.9-92.extras.tar.xz 17356 BLAKE2B b423959ebbe6193dc78214df91ab821f74cc258421891c3bf7d5ddb1fc1e125e5c185ac12d70ea2b0199115d554ed851ffe59c1f799346803446aedb79801a3b SHA512 666b5f9a473bb197e9782ea20b1de79f810a0440f5fe6bda674fdd78601f33e3f97947d5201b7d3c6028728c30810fb849ff7cd2df9133796031fddc021f08cc
+DIST genpatches-4.9-93.base.tar.xz 1770748 BLAKE2B b592968d1f9261d759c802ec3afb0b4158320b375d439163f5b3b1253e26736b30e5cfbfb76cf7b7fce4b5adf0f635c302045cdcfe6e10a9400118b2ba2c6199 SHA512 1c33c7013cc6b395bfbfec351cfd8a6da393c356e2e286c814b97ee7777dc338555fa7e94d5644c999cd685be49df66d828af2aab0e2aef45dfa689939494e33
+DIST genpatches-4.9-93.experimental.tar.xz 106380 BLAKE2B 79a35166fc44d99f6540e17644afb54e68efc673897770d028baf6249c60e53f8655d118caf143f3c09a95aed4dbb776d1ebd1486d54541a17f738c47f552a25 SHA512 3e479f9b9586dd6802441689365190a7dc5309c21f30a22f4611aeeb9f45e93dfa1fa208a9cc6eeebbdd3d9977d6e5aac9c19458d683bb69b4f964b1ee8db92f
+DIST genpatches-4.9-93.extras.tar.xz 17356 BLAKE2B af835d4ecc744045630c6915658f8ae0dcb1aafe2fd42566b190180a0e7bc14e242718466a95a263910595d29faa7a3b94ff1f10409a6db4900700d80b92a9af SHA512 61b4434c5797f43f9ce35d54457f80a629daffbdf9d8e92660acd883d808b4cb0069205bb1e6be78009135c958e11760425bd12c5d7c183871013d79d66c40ef
 DIST linux-4.1.tar.xz 83017828 BLAKE2B d1dc4e458db191f16306b3d2d7eb60ef5e04307406c769cccdd88beb407f8de228ab1f095a44d6e992b06d01cd896fda31dec1cdf16667f4ca0b628da594aee3 SHA512 168ef84a4e67619f9f53f3574e438542a5747f9b43443363cb83597fcdac9f40d201625c66e375a23226745eaada9176eb006ca023613cec089349e91751f3c0
 DIST linux-4.14.tar.xz 100770500 BLAKE2B 85dc4aa953fe65e273a24473d8de98e4f204f97c43be9fc87cf5be01f796f94cfde5c8f9c84619751f1cac51f83ce0b4681fb19c5f2965a72d4a94fe5577846a SHA512 77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8
 DIST linux-4.15.tar.xz 102181404 BLAKE2B 5fd831356c2174d2779ab31033caec6929b2f47857f0bb82ef43ad1140c639d0dc5553e64d062f67486eeff780d5df8d971051fd5a626b51bed170067fea11e0 SHA512 c00d92659df815a53dcac7dde145b742b1f20867d380c07cb09ddb3295d6ff10f8931b21ef0b09d7156923a3957b39d74d87c883300173b2e20690d2b4ec35ea
@@ -204,11 +216,13 @@ EBUILD gentoo-sources-4.14.26.ebuild 742 BLAKE2B 29603d1baaeca495b2d7901b5d7def6
 EBUILD gentoo-sources-4.14.27.ebuild 742 BLAKE2B 89e036514fe6e31d83a901add8df70fdb49e6994ae69d1dd33731a888201cb0d2b26a41c2418cca5b5998d824969e9c13d8c2f312b8643da3acd66d7a2f3abc9 SHA512 ecbcc89cf0a160e9a911bc7bd87f9599c1ef3cf86b9dd42676fc7497c4ac127d5b929820e12b5941e7d505015700ab497beaec727afe7ba4f4300f33a9ca5083
 EBUILD gentoo-sources-4.14.28.ebuild 742 BLAKE2B be4d2d512eff0f02a94339a2c51fa76381845627f8ac418a582978688e306aa92df9c86bfeffdebf169e1e27fadd34b120db774aab9a2166ec78f4032887e645 SHA512 79671b1a75a0eed3f0d0ecf9212579a8ecbff29cfc1adcdfdbc917092eaba8f5d9f468120a4d5039c2e6dc37e328880f063b3f4842c067a942bc4eec326e923c
 EBUILD gentoo-sources-4.14.29.ebuild 742 BLAKE2B e187ce51ff0e131340ed4bfec573d40a227404bf04f975dda485d7ae4392a9c76e8bdf1f3194a8470c3238c44b137b361af06ea90fa934d3f538118938317086 SHA512 8555a07e6794cb978941961effc2fd7252cb74e61ed52d40d6bd48105432c54b0d3f5bffeca589c83ca1a12c8a78287d93016c4069412bd081faae2f4aa71b40
+EBUILD gentoo-sources-4.14.30.ebuild 742 BLAKE2B cb21d2e34d1a11144d2b91079bcee61f46c871f94e97f459e27d70515c2da9c6b74e4321730b6add4b4013e3dc8ac8c0172bb18d9231cb3bd8fe8ec076393bb4 SHA512 0e12e46ae2017e656128519ea3d1ee16d8fb56c77763379ccdb4fdeee484b0d80177eab223ce2425a256ebfc8ece92d5f018f9c695f5410c6f8269c71cd99d84
 EBUILD gentoo-sources-4.15.0.ebuild 741 BLAKE2B 6cccd19877bc0d5bc677ea794fd4669268c654d01c156b62f24cc1a7cf89c54db8685b78fc2ba941c9b48602847f3b9c9d5c05a358015e1cabead653c0f4476d SHA512 8daf880f336464e106ea015594b1ee8f476e8391dac6f698327b2c48faacaf0f4c864b6b2bbeb2b723d0cd0ea1e88041e3b23010748baaa313962028453c7164
 EBUILD gentoo-sources-4.15.1.ebuild 741 BLAKE2B bdd6a645dca7b8cb96832f43ba52604d095b4074326e482a08a46bebccfcd88dba40dee9de1d01f55e41d32209b20e99cf632bc8bb4189e97efde854275613c1 SHA512 d3101818abccdb94c1ca8a070301a2261027b655b376d3ee4eebf3ce78e88848efd3c4d770857a9657ceaadba2c34b1f220f5d48accd7f2534d37109b69edc4d
 EBUILD gentoo-sources-4.15.10.ebuild 742 BLAKE2B 818a7736a0eadd81c931bf616cf58ce7011ca1bc2095e765c40faf3d77f5197b695b5bb4ab3b5d0670ef6227180b480e761d64550e4621671231992570b7fc80 SHA512 5bd1d2ead0d2519803c6ba7d09a431d1d0ecb32f92238b60bbbcee3f687ff0aae3f271886ff62281276bb972c29117cc6ea2c1d011735d6025862da0e552f8cc
 EBUILD gentoo-sources-4.15.11.ebuild 742 BLAKE2B 758990368d1b70dc99338f90b7773a5d43db3c05247ed8301014975ad9f9e764aa45f336bfa827c0607f579d397f1dd0eeb3f602181c39b4e1afc0cb02ec5a6d SHA512 b42bc2e3146536e00b240b83120960e13adb9b7409cfb4210be65f24b7e64829807f4ac4235811f7e07e61676da86929f75db6aa24e382cd0f6084366a4be411
 EBUILD gentoo-sources-4.15.12.ebuild 742 BLAKE2B c2a813ca6dc44d5c9aa406b764023fcfc0d2937cc6becad1db47b6b845086d6850acb733cb09519d5a1bd10c21d5444d27228d3c8fb88cedcb634bd60b47ddd9 SHA512 29a60c02f676af5dafee0c7f0035e3a829d56b81662c3fc596b214fc528ea0612b2b9e0d3c600a8cf25919c11b95199e6227a6845c6c1bb6679e067c2b00bb9a
+EBUILD gentoo-sources-4.15.13.ebuild 742 BLAKE2B 488ad955893a137a14c5249704ab6df9b14a50924cd57fda114010a65d1fac8481a88115b6a08f9a68b602b683de96f2f126a525e91053285287cd520e698d14 SHA512 d005a5a2ea115f3cc352a1ff721b0be94a58d989480632afbc6646cd6b3e2edd699b3f9856dfdd08963211465bdc2b1501756823c5b7bd50cbeb1db6f7dd8853
 EBUILD gentoo-sources-4.15.2.ebuild 741 BLAKE2B 2eb00d59aa519bd1ce81391f509a492a74fb5026947883f638c5f0eae7f7b78e86310997497db063f18398f3f7c7543c1913f6d5552c986443ec75724895d13f SHA512 a369ec39bdb9c4f320fc140f92109aac23067610d99250c298d033248be9b324f07f07dbbcbac52e9be01666bfc111c121346813b267ace82f6fa8690940124e
 EBUILD gentoo-sources-4.15.3.ebuild 741 BLAKE2B 64ad4fafa2243d25c4798c2020c8a16ce32c4212812023073b55a977021e150b52bb2fcd13133831233be438760178c71c03423643b3729e11814ad55aa71c95 SHA512 2a26da6cc8938e404fde1ae53aba5531521d87cdfb1ccda14cb64584df2595e9293d303ebcb09c384c2134b4a5e0e6176c0d5d77de6a55f463113e4b94a06d70
 EBUILD gentoo-sources-4.15.4.ebuild 741 BLAKE2B f1e5fa6acf69df9a5e78740ee57f94033bc417bc64b6af21df7016d4f20b10b5498c49eedfe042bb2a5c020d30baeab532d3296c5284cd8de1e95bd342b80c60 SHA512 2491e573773f078689ec07fd1c836b55032fca2773f5ec8195a4c3fd2e23c8356bfbf0a51976621c074491881352c3fc4ce35723f2ae2c1c55773b5dd799b463
@@ -237,6 +251,7 @@ EBUILD gentoo-sources-4.4.119.ebuild 743 BLAKE2B bca9e86d0e32a66395c2fb43c34c1d2
 EBUILD gentoo-sources-4.4.120.ebuild 743 BLAKE2B df2e388bef224bf84820c1c13992120fee5ce1c029dc115027082a7b9f72a1a09b19c9a370a4d12e76fb64ced961726eaaeadcfec340ad1ea8d39d551392173c SHA512 31fc815881a47f39a97bb82a11d3fcae200ce99172c68fe0333cf1bd85c33d983b0ef7c9238754f1cbf801f4d229e72a6bae67273e351ed0684d45016e90b625
 EBUILD gentoo-sources-4.4.121.ebuild 743 BLAKE2B f735fd2f7980e5ae343c215682df455b33d565b59d82946e5c8a9c3ef864b7638905f5506640f102b18ccda86e7ff0d78fbf09012d4ab0d476716513a2233612 SHA512 7730d21a53b6d8cf1ec0b889e76a0635cfc70ee640e17b9ff9f8f56988dad2130d13f42eeb53d34b73577869815f9bc55a9f9690f0483c032cf3fa817c2ca7a0
 EBUILD gentoo-sources-4.4.123.ebuild 743 BLAKE2B 28e702c6e7792fe33f823017a985c5fff26593d0c86911fc1dcca4ebc4c8f9f79fd09efaaac095b12b6e558fdf04911f4414e5249344740fad2b14a87abf09ed SHA512 233638c68d65bcdaf7b537565e8f30c234807fb9376ea7af5838d88b1930191da4ae43c361abf8d6759a19c7db8c1332cd511ccdc4332ef36f827912e62d7afb
+EBUILD gentoo-sources-4.4.124.ebuild 743 BLAKE2B 48bc0794014acce93d1479bfb1b551b6347090c8f813bfd4df49a4df9d6cd90090841ee9259112b352912331e8ff47ff64d4850acab4672482618c5702ef5a58 SHA512 784536a62dece4628d2f85880b955b4e480900dd3494ca5e31476e6ef9824f1bb0026dbd5fa37e208d76535adbde538e4b619d263c984878b878ef35699a4f35
 EBUILD gentoo-sources-4.4.87-r1.ebuild 734 BLAKE2B 1f1cb7f7355792bcb664b74c7476e9f8d0e90ca648b819ad44e0a4339210867658584a206beb21842633b7537b2b7f58d43b391d4c4f98fd700280a72662423b SHA512 3a59950c522313a2f9722ae6d4801cd03ddb9430b58f17ab9e8a500fb9a083dc59369de7ad59de1064412f82bdc21396c7280a6af6fcb0a4524ac93f758d85ff
 EBUILD gentoo-sources-4.9.49-r1.ebuild 734 BLAKE2B 169d43bf5276e6d398a72a22b968f571d6122d6b88f61e757f27ccc3d732b171bcdffc27d502c440818e93da732495c258844f047f2f64672fca5b595d15b906 SHA512 8a42455eb119e89f3df16a675486efc5ba208a94ac255b0f4033cb699dea75b9ad7fe28acb1df044b73f16f1bb50c08bbc09bb59e541286893048190c5a74a8e
 EBUILD gentoo-sources-4.9.67.ebuild 742 BLAKE2B 86d65f90024085652859b5e3091f097e556be4a69fa24045fcf98f54000e7d48da3a822a9fc294417665b48f6b49a4e0cc9c3f746c1ea9330725b37529f75b07 SHA512 d444a40a62974d90dccb589d0098e8066615f6e32088fdf5a24bf7063df96d9b720d704ba805291160a030e5e240fd915e442c680f11feb7838e1dee9f9bb439
@@ -263,4 +278,5 @@ EBUILD gentoo-sources-4.9.86.ebuild 742 BLAKE2B 0ff3fbd99e90e097acba49e2ab358154
 EBUILD gentoo-sources-4.9.87.ebuild 742 BLAKE2B a176c840e4a339e5873884c6fd03d6a1ee8535f6f5a76bf13da2e57d917f59c9374946b6c4a9420b762e7afb79edeb5321cc3139323d1ee25f351ebc2ba8b0b8 SHA512 e8eb8919bde23e8ffa939dfe45288bf47031cda8c28555328153d6699c934bdaf2cf3f5fc45e53c516ab7000bd1d6c98c18dbc8f17de863f11dd6f9bd33fa7f8
 EBUILD gentoo-sources-4.9.88.ebuild 742 BLAKE2B e49271026e11a649c0f5f00ca629257fb23a946fee969527474c576ab36fbda10794607ff7fe054c3df646f6627e086547253993e3cf0f3cdb2d46363d449af2 SHA512 d130eb9af90ae6a08f76487a29fe84ccfbd98c387c238689dca086c6ea9e2a7b32149770e56e06908aec0c8016fea71e80b93d40791fa4b2a6b30022686fdca3
 EBUILD gentoo-sources-4.9.89.ebuild 742 BLAKE2B 8335da57b3da5e8614296311c48b257795aa5692740bc9e461d3a3b8f87706dda8027a3e72e0549e7f6077f962a641ccb6cf440f8ed15ce26170baec73c97bad SHA512 ba61b2fa996dbcc46cd2a280fb8087baa79be14f2e1145a37ce1c5ea616c037d13da31d5b2b000ea84ccefd018112a1920fb9afef662a2e562024b02855a1c3b
+EBUILD gentoo-sources-4.9.90.ebuild 742 BLAKE2B ea4ba2dd2baaf0d84fb2115237e4c256c677d46d6d73e7a3f60b2cc9a35e5cbe5ab2026dcebc112dbb91c8b5dde4a8b60f648a867624a3aa0280e57b268859bf SHA512 a0923d6eea985f05fbffe9296bb9f71b83fdee94bada8c533107f81e67d5636b49158659710afaf3bd76e5ab0d052c52943a6a606fb86b11b1278637fae7ebe3
 MISC metadata.xml 500 BLAKE2B 0876bc03bc9d32afee87523a55415ba549942acc4e9a1b65511ced2aa4038557854fd9f570dd1afb6d94ecd899d9cc48034911f547eb88ef76457cdfa62845e4 SHA512 c01d2263a3faff75c3b1f01eef806a9b0c0950c904c28c11b057cfdf2f5c302b95b20f45e649a3749c4ffafa6dafd759e7738bd8e807f23e49d2febaa212ec6b
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.14.30.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.14.30.ebuild
new file mode 100644
index 000000000000..134b4a6a4b36
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.14.30.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="35"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.15.13.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.15.13.ebuild
new file mode 100644
index 000000000000..5e911d2bf0c6
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.15.13.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="16"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.4.124.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.4.124.ebuild
new file mode 100644
index 000000000000..5cdca17a4153
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.4.124.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="127"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.9.90.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.9.90.ebuild
new file mode 100644
index 000000000000..61f638004757
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.9.90.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="93"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index 74db94474422..7dd871765ba9 100644
--- a/sys-libs/Manifest.gz
+++ b/sys-libs/Manifest.gz
diff --git a/sys-libs/e2fsprogs-libs/Manifest b/sys-libs/e2fsprogs-libs/Manifest
index d373b35f1523..7470818dc5dd 100644
--- a/sys-libs/e2fsprogs-libs/Manifest
+++ b/sys-libs/e2fsprogs-libs/Manifest
@@ -3,8 +3,10 @@ DIST e2fsprogs-libs-1.43.3.tar.gz 599387 BLAKE2B decdb20114ad7b00754ecfe5658de64
 DIST e2fsprogs-libs-1.43.6.tar.gz 595409 BLAKE2B a5edf65b637b7f3fab16174a695baa232b8aeab6e8d28140a3a68ed63eee309949ca85a28f33d15199068fffe9174ef76b28f403ec09118296a458611592a36e SHA512 80a643ba349aac79c88548e9692066f777c5f9e82e309b348606a8078de456171535e6e5df91f73ca3db9d03bb539b1a19883cf74615357bdf77f3bd20cc0b11
 DIST e2fsprogs-libs-1.43.9.tar.gz 595452 BLAKE2B 2f4c8b07abe343f304f3217984ec03a38dca2d69765d7e9edef184c5b478fb0aa860fb0338a41e9d2d47c55780b0e44450efbe2528110403a77696af9e0c9d7c SHA512 c4b78000ace629a7e6f12d7c63f5ff36885bc7ba69a22654f95fd384bb347f0f28ba544644b40cdcbf14ec211e724901fbe44cc2b730f2dafba77632b3e2d0b1
 DIST e2fsprogs-libs-1.44.0.tar.gz 714451 BLAKE2B 30db99eb22814c36ce55ec3bbcdf2c81faaf1708625ca06ab62a96eed89371ca996e31da52ef0045899d0d5289c3a918bd3743c72ebce778960084c19133f18a SHA512 7b4db8c7e07c3915f1e92d832044d1dfb61a38220e19ba8ba62dce7db532ffb04d9dfc89b5ab509e75023d64dfdfa5e9271249a5436ee9758dcfcd14221f6f75
+DIST e2fsprogs-libs-1.44.1.tar.gz 714486 BLAKE2B d2794e5b3a28b2b3ef811396ffb3ac139c294f8a4407cd74ae0f8c6b39d5ebcdc464cfd2e99e1f8fd3e2be7bcb2016c019f586810ccbfef15696fd2a21cb49cd SHA512 2b81454230def3f499a634e38342f323d3708be460ec0d69a7de7d9c9fea657a84759f7dd09b81e7dc6fbe07510c06c5e55317374a25f4ed3b6dfc58881132a3
 EBUILD e2fsprogs-libs-1.43.3.ebuild 1866 BLAKE2B 85c2912077fb0b2d9673a17ea16880a8b3f3b481134dd7c7057261811095bfe2bb72510338b0cd817363b319b5dee3f1848143f931bf5b98940dbc1af40b587e SHA512 d3b5cd55e334010d636fe72f5ec54b8ef4383327b242bb4be9bb496107c96d0cf83f47886dae2f915b4f7b6d9f53595b0effe7911a74770e18a20321c272dc60
 EBUILD e2fsprogs-libs-1.43.6.ebuild 1855 BLAKE2B 54e3174ce5891be2774b6921eaf9cf790d28f78f532ecbf214607877b95d6e294535231278ddd4748727d6a66e8805201b12b4d87047f26be0a2cd4c6e6d35b8 SHA512 629a6b920429ea98277618a32d7145ee5ed4a5b7fb98f2ad610ce9f9f13f877b4b99264900417d4341f4a411532fbc1218a529d288c3ceb405508bfa5f308c44
 EBUILD e2fsprogs-libs-1.43.9.ebuild 1878 BLAKE2B 8abd48e95d66949bf5451ae3820f2da81eee7a0fb662c7da1a46a013a87da3858ba245c8ae84ca9e1d443ec79dcfdc97bb61b55c943b816c7f9f927174a868b7 SHA512 96e1d98877c800cafc48065584c92711b64af5531cfb70a97fedfabc3cd5c5126ac8923582456eda24ca655dd119206929e6171c453e146ed8cf1c332ba252fa
 EBUILD e2fsprogs-libs-1.44.0.ebuild 1878 BLAKE2B 8abd48e95d66949bf5451ae3820f2da81eee7a0fb662c7da1a46a013a87da3858ba245c8ae84ca9e1d443ec79dcfdc97bb61b55c943b816c7f9f927174a868b7 SHA512 96e1d98877c800cafc48065584c92711b64af5531cfb70a97fedfabc3cd5c5126ac8923582456eda24ca655dd119206929e6171c453e146ed8cf1c332ba252fa
+EBUILD e2fsprogs-libs-1.44.1.ebuild 1878 BLAKE2B 8abd48e95d66949bf5451ae3820f2da81eee7a0fb662c7da1a46a013a87da3858ba245c8ae84ca9e1d443ec79dcfdc97bb61b55c943b816c7f9f927174a868b7 SHA512 96e1d98877c800cafc48065584c92711b64af5531cfb70a97fedfabc3cd5c5126ac8923582456eda24ca655dd119206929e6171c453e146ed8cf1c332ba252fa
 MISC metadata.xml 329 BLAKE2B 03dc6edded63d4d10b064515402e963a4770ffc36e17de351d5617849ea138796e4bf20c7feb383cc8ca3a88fba1caaf68b5411241a2558db832f9b659193644 SHA512 39e1ddf508b648594e45cd4e72a41997ab4ae7b5cfdefa136a18a1e68ac5a2bfb1f6a12328f1faee5501fbeff0c61cd91417de717c4869f530a18a05ea5d4c71
diff --git a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.44.1.ebuild b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.44.1.ebuild
new file mode 100644
index 000000000000..68c23f47263a
--- /dev/null
+++ b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.44.1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+case ${PV} in
+*_pre*) UP_PV="${PV%_pre*}-WIP-${PV#*_pre}" ;;
+*)      UP_PV=${PV} ;;
+esac
+
+inherit toolchain-funcs eutils multilib-minimal
+
+DESCRIPTION="e2fsprogs libraries (common error and subsystem)"
+HOMEPAGE="http://e2fsprogs.sourceforge.net/"
+SRC_URI="mirror://sourceforge/e2fsprogs/${PN}-${UP_PV}.tar.gz
+	mirror://kernel/linux/kernel/people/tytso/e2fsprogs/v${UP_PV}/${PN}-${UP_PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~m68k-mint ~x86-solaris"
+IUSE="nls static-libs"
+
+RDEPEND="!sys-libs/com_err
+	!sys-libs/ss
+	!<sys-fs/e2fsprogs-1.41.8"
+DEPEND="nls? ( sys-devel/gettext )
+	virtual/pkgconfig"
+
+S="${WORKDIR}/${P%_pre*}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.42.13-fix-build-cflags.patch #516854
+)
+
+src_prepare() {
+	printf 'all:\n%%:;@:\n' > doc/Makefile.in # don't bother with docs #305613
+	default
+}
+
+multilib_src_configure() {
+	local myconf=(
+		$(tc-is-static-only || echo --enable-elf-shlibs)
+		$(tc-has-tls || echo --disable-tls)
+		$(use_enable nls)
+	)
+	# we use blkid/uuid from util-linux now
+	if use kernel_linux ; then
+		export ac_cv_lib_{uuid_uuid_generate,blkid_blkid_get_cache}=yes
+		myconf+=( --disable-lib{blkid,uuid} )
+	fi
+	ac_cv_path_LDCONFIG=: \
+	ECONF_SOURCE="${S}" \
+	CC="$(tc-getCC)" \
+	BUILD_CC="$(tc-getBUILD_CC)" \
+	BUILD_LD="$(tc-getBUILD_LD)" \
+	econf "${myconf[@]}"
+}
+
+multilib_src_compile() {
+	emake V=1
+}
+
+multilib_src_install() {
+	emake V=1 STRIP=: DESTDIR="${D}" install || die
+	gen_usr_ldscript -a com_err ss $(usex kernel_linux '' 'uuid blkid')
+	# configure doesn't have an option to disable static libs :/
+	if ! use static-libs ; then
+		find "${ED}" -name '*.a' -delete || die
+	fi
+}
diff --git a/sys-libs/ncurses/Manifest b/sys-libs/ncurses/Manifest
index b3be5a7933d8..d01e737a25e6 100644
--- a/sys-libs/ncurses/Manifest
+++ b/sys-libs/ncurses/Manifest
@@ -16,5 +16,5 @@ DIST ncurses-6.1.tar.gz 3365395 BLAKE2B 1248a5088bc982d0880cb9550b1192457f6f6249
 EBUILD ncurses-5.9-r101.ebuild 5283 BLAKE2B 2860fee40555ddc883b4ffffc8ea1055c4c5151b451b8a25226fbed116d37e3862a6c9c885666365882bea428fff71417811b5ba04aa72ae0df6ed6bb3afbeaa SHA512 dce58899c1ca8b1ba1206fcbc015821e5de433b8ca4f750889d9281e35c15e70bd2628f4ef3a9990d7f1c8d6a757368833d9c88587eff6e480465697ac29d6f3
 EBUILD ncurses-6.0-r1.ebuild 8633 BLAKE2B b177892af3da61b6f3d2e276a3545de911ae0dbe123797807b63d45fb912b4b0333b487fe52827abe1154332902f9f111b65890fbb4063c691c6aba356a30062 SHA512 00585f364321576bca9f55f49ffa4f7983c8293fc3db1103f7f045d5de6618e88a68255e6c3f383098143b568e49cacedc9a27a4bf7504df69a1afb49b0bf5a8
 EBUILD ncurses-6.0-r2.ebuild 8766 BLAKE2B e8ca8e1bc7f67c21a1ee1515db347613b104fac7b57564d3862e6b2473c373c306e573277b911f355632d8d0b8abaf3aaae96c882a8b359d375cb4b9cc3824a0 SHA512 09ead9efc080da50fa5efd4405ef199ac7f2206415342663e0fed15361a59c5bc0d6b6ff604e49b857897fad1eb3ee621d3e3a7ae61cdaaaf32dcb9a32952fb2
-EBUILD ncurses-6.1-r1.ebuild 8504 BLAKE2B a981140040c6bf35ec65d4e51f3779864d59e44e1f4d6155d3260e5fd88bb3855b8ad99cf84afc57a4e88c3b7d3f3fc65565979ffdc64eb090954c49b4019838 SHA512 6bd925ff1bde1816a22aae320d745202e299be16c08418d1d132949ba27f1551eb3370acb9b889d640966b1bf3a00dc5ecdeb6e219b126bcc0502aa1a5b8e782
+EBUILD ncurses-6.1-r1.ebuild 8502 BLAKE2B 1daa687c2e19b95f125536959fe190a4bfa11467635ca42531b12b0a6c66ff433fcb04e5c5f0a54561cb014b0c15218bcdd82fe2f2e239a9f8b54875342b44e1 SHA512 4d6c391d18dd551a568b257771920793e3238672a0982b3076c1b4d9be467e2eef020e1547fb76dc25e1289f944400da6e467c520c088504364a0f2aa5a7f335
 MISC metadata.xml 619 BLAKE2B a5b29f22ce491bf7a308673944651ea9d916a6d487a45a2a7ee4a7e8d33f7b3bd398e3edeb830f0b443cb4524c0b73af4d6e1511e8128289a76666acd931d611 SHA512 3f28fd8aee675226f641d72d7437edf4c5840cdac3dca64b6a4c61902d4f4127d86f65acfefb270cba2fcfb0ba9d6ff9d3ca24930825b89c82f0eedc8160f9ef
diff --git a/sys-libs/ncurses/ncurses-6.1-r1.ebuild b/sys-libs/ncurses/ncurses-6.1-r1.ebuild
index cbdc9b1d84a5..d32024f19894 100644
--- a/sys-libs/ncurses/ncurses-6.1-r1.ebuild
+++ b/sys-libs/ncurses/ncurses-6.1-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://gnu/ncurses/${MY_P}.tar.gz"
 LICENSE="MIT"
 # The subslot reflects the SONAME.
 SLOT="0/6"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="ada +cxx debug doc gpm minimal profile static-libs test threads tinfo trace unicode"
 
 DEPEND="gpm? ( sys-libs/gpm[${MULTILIB_USEDEP}] )"
diff --git a/sys-libs/slang/Manifest b/sys-libs/slang/Manifest
index 6c74a162adbb..041e10a07add 100644
--- a/sys-libs/slang/Manifest
+++ b/sys-libs/slang/Manifest
@@ -6,5 +6,5 @@ DIST slang-2.3.1a.tar.bz2 1577749 BLAKE2B e3149502a7d6e6d13800f3d3df6e56f176da08
 DIST slang-2.3.2.tar.bz2 1586720 BLAKE2B e923a431e6273f1783c40dc09b2e324ace22e41a163fd46dcb8ab16c9ef27f190651df8da24432edc75890b83cd95051a835d5e582385bb23e36cd8ae18e6d24 SHA512 35cdfe8af66dac62ee89cca60fa87ddbd02cae63b30d5c0e3786e77b1893c45697ace4ac7e82d9832b8a9ac342560bc35997674846c5022341481013e76f74b5
 EBUILD slang-2.3.0.ebuild 2266 BLAKE2B a94234aff5114d0615cb99c594542bef50ee738bd59a6b6ccb864ebcc243774296f04351b45e80d045c90b68c638fdc3b85860b5670ccb01a0477ca8a14c0e14 SHA512 3a9544b8fdcb2d2faa4a3becd0dc60402886f677180d87d5148ed857a25cfad6ed62eb49a334b287ba36fc10ae5362d01dbcda482526e9c4f92ce430eed85661
 EBUILD slang-2.3.1a.ebuild 2264 BLAKE2B 54a95855948ad64c5dc9f630641ad669f879c3acf0a7e2ff15121aaaf4564878619e45ad2205a6b2d52a7a1b90262b6e13d074bfddc65e7a55c0d37a31c62c77 SHA512 409f754626c1384bca2fafd3ee96c51985968be22a2bb0076650adb1c069dc0e9a13cb6a2420f871ddacf4ac40ac81b852a107dbc524aa017c0f932b87a983fd
-EBUILD slang-2.3.2.ebuild 2295 BLAKE2B b58ef35edd4b43d6d0ffb76fb0888826c72e5e0c9dc9b079ec3ec4afd35a0294c5f710e51eb75cfa9a40e6a3537ddc6a6a2507c4cafe94b61534206da711f160 SHA512 b4843d3314873b2f431a896653954ffc05d850a5e76d2f4fc1d1e70bcd0a29b22c63e19a981a8ee4d79d6234bb74b4b6eed1241256b83d6412220f89b25510a9
+EBUILD slang-2.3.2.ebuild 2294 BLAKE2B a966f342d9d402dade220760a6182eb5c7f6c4b899fbc526ab4b6ebe3cbe0f128c64c021c1bd51b07d489a33737d671ee14cef0e8cf8281f5fec8558750bf289 SHA512 5b605def27ee4a7c0da5b2a468e3c04c3fc2ad59d8b61339d28bcfc5313d9685113fe9e002cab4f344ef37438f35ae8f60ad5f5835711382020b25153b2f5377
 MISC metadata.xml 234 BLAKE2B 8615ff091e2c6b2c5d9d4246dbec2ed0c5161ce154a59f492bc640a1428de7847757b68a8d926cae4bf78905d2aeeda10cb4cb0db9bf6870d38e811556299520 SHA512 16ea852f76297335e7ef70c8019fe09d46c0455922c049ba6e92696232e957955fd671d467ebdd0bf7837d39a26083d5be2a6f8abeba53807f0b8c5b97f2e441
diff --git a/sys-libs/slang/slang-2.3.2.ebuild b/sys-libs/slang/slang-2.3.2.ebuild
index c7726ba7f80f..e3eead6d4d83 100644
--- a/sys-libs/slang/slang-2.3.2.ebuild
+++ b/sys-libs/slang/slang-2.3.2.ebuild
@@ -14,7 +14,7 @@ if [[ "${PV}" = *_pre* ]] ; then
 else
 	SRC_URI="http://www.jedsoft.org/releases/${PN}/${P}.tar.bz2
 		http://www.jedsoft.org/releases/${PN}/old/${P}.tar.bz2"
-	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 ~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 ~x86-solaris"
 fi
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/sys-power/Manifest.gz b/sys-power/Manifest.gz
index 1987eb701dda..222b4cc62859 100644
--- a/sys-power/Manifest.gz
+++ b/sys-power/Manifest.gz
diff --git a/sys-power/acpid/Manifest b/sys-power/acpid/Manifest
index 41f52f4375e0..42a2bb2f261a 100644
--- a/sys-power/acpid/Manifest
+++ b/sys-power/acpid/Manifest
@@ -1,7 +1,6 @@
 AUX acpid-1.0.4-default 663 BLAKE2B 221343ecbabeaea79af570cde3bdd58e0408e67b954519ba41addfa242de3ab91e47f40b02e9e83be7eb97f3a953d2f0ec1953b0a1753cbe57b371e3cf064b05 SHA512 817c971371046bdac72c644eed508b17fe524007f0cf360198d2649bc80254a0b127def0f6442288432ea2fb822b42299324507711feb13dd14a29e9315e9238
 AUX acpid-1.0.6-default.sh 1231 BLAKE2B 493c16e1c5515b6b7d8844f90ec37652631b00cac2f79347ec6d0eabb4a386a61a53622a10cb9c43ff64d88fead8a79ee8a348636623bdc6a0ede34eeb9ba976 SHA512 25629153eb97d7dc60d9a2b3a40fb7c22d4dd8ff84bbe5431230b70660d6ad8efb43976be062ac581b796f7e515722c67f8875a3aaa5f460a1172580dcac3d14
 AUX acpid-2.0.16-conf.d 153 BLAKE2B e2c8a0d058311402b35c6c9777b9807d341f578bd60a82f1c866f182fef16d25332f37fa1cfe7a855824e004a877407d509bd6916388f6dfdf9114d9b93c57a3 SHA512 518cb397b2aa63b893ead1be08f32fe436d19b72663dee66834cfbc112b003333f0df8b9e4f1ffe64b813783f657d3fe8b9a0c5e992d5665583357e68b266705
-AUX acpid-2.0.16-init.d 469 BLAKE2B cbae9f7ff725d1a1988502ba22235f7037fe67b22efdff3b0eaf24de65a5f96497668ce9a30525468861bd97c776c89a4a414b4e985f109ca14d0b5755f393c1 SHA512 f7c1c8f2f71b587c7c215f217283ae47c673eca3ccbcbc0b9a48699b2619e36d8f51d0986af4980b337692f7bfbbc491be592484ced6c4dfdacbf7642eb0ae34
 AUX acpid-2.0.25-add_mate-power-manager.patch 461 BLAKE2B 3cab3f239cdf1c575d6449b704e2f05a99fa075374f64523ca2ef6e3f9d3074fbd4eec4ceae1fd53c9fd4f648974e70939f45465becb10da68cc0d98af70bbb5 SHA512 faee772d2ba8e26d249d2fc9a7c9e1825383f82a1b90294581d315ffab413b67de2aee1887ee21fa6f9b782da988fb7261cd99505ae682024aaf5972669204ab
 AUX acpid-2.0.25-kde4.patch 1015 BLAKE2B 2e925c69ffc607126dafad82aa834e6f202769d9ef643fa0abe339e57d48e4c02e866e8cee2cf96b9eba2d3eee23961f1e5960638c3162dbc72845b8eaa4a093 SHA512 a619743a0e05948f368b1a884c06317be8434dd5d9ffa47571ce541e180cf938a6c4846f93ca6255243bddcce91be40d3c0efecf399a087f747a49136b1d3ab1
 AUX acpid-2.0.26-init.d 436 BLAKE2B de812b8d63f8427fc32b5d177f39d80cfdc8b92918cfe05de5483b6dd7c6091ce17ec65188376468c722c735cc2b01985366a9cedc693fd7d21eb6ada2055960 SHA512 7381d30b5c6478cdbf5dff93ae95baa0b3b1fe0a04b02cf491831f1657d6f71b8eef121b7e78f3201d11a5856bfb30df0a57437c76e6fbe05ad88cd45e86ae64
diff --git a/sys-power/acpid/files/acpid-2.0.16-init.d b/sys-power/acpid/files/acpid-2.0.16-init.d
deleted file mode 100644
index 642d8008ccd4..000000000000
--- a/sys-power/acpid/files/acpid-2.0.16-init.d
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-extra_started_commands="reload"
-command="/usr/sbin/acpid"
-command_args="${ACPID_ARGS}"
-start_stop_daemon_args="--quiet"
-description="Daemon for Advanced Configuration and Power Interface"
-
-depend() {
-	need localmount
-	use logger
-}
-
-reload() {
-	ebegin "Reloading acpid configuration"
-	start-stop-daemon --exec $command --signal HUP
-	eend $?
-}
diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index dc4ed8bd21b3..e844d31c902f 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
diff --git a/www-apps/grafana-bin/Manifest b/www-apps/grafana-bin/Manifest
index 14c3ba8a0519..eda7218120f7 100644
--- a/www-apps/grafana-bin/Manifest
+++ b/www-apps/grafana-bin/Manifest
@@ -2,7 +2,7 @@ AUX grafana.confd 162 BLAKE2B f5567427be3510fd7c79eefe06fe4050c7e350eaa9e82c3e87
 AUX grafana.initd.3 972 BLAKE2B 077e7cf023b83b152c762f63c937435823053909e26d6743e94fc59f76ef77220610d2fd02950ad0157b9ebbfd8380a489cd0da33b5b25102fbaa936c1212e2f SHA512 fbad0e00b1b47d9eba808d2ed84e3208d2279f1deeaad71710c6756ad120b1f9f1bb2ba1c5f9677ed3a5efe28df8437c48f5c68b5e8eabb1e91b14e762c1e442
 AUX grafana.service 651 BLAKE2B dcf0ddfcd2cbbc457f0dc7142a64c403c7657c30a7f85ab103828758c16fce8c6fc2e80a4f2f943393f3c226f873a2bce4b6df999fa4b178b3e95bf213688d86 SHA512 7bda41f0c6ee9ec0947ef6b8d4591453f797ac0256f9b67800249a6edf699e55855a9bd6f46501a86ffec5b5d2e1d8ac735657a0c63600683f61044e0bbc35d4
 DIST grafana-bin-4.6.3.tar.gz 47187988 BLAKE2B 8d09f6569c8cc7b880fe852e0696b5d8b811d91a8aed360dffb40dc033e8ca756f7b37c6f2fd16d9925c33f2b7fcc4d279e31611fdb5aa7e4b24eee88cea0d38 SHA512 dad2c26b998910519cc462aa3dc91bd6d7ab6b7fdea9e1aa3c54ed5eb86830e9b8484434a5fd307f7ff490549509df97486249b301ccd84a7bd5b2de11ffe929
-DIST grafana-bin-5.0.2.tar.gz 51534538 BLAKE2B f9c711f45033534145bfdb981d5270948861588c2518d02d7ac510e52e4d274c687fc52bc5b3d7dd79a619782f60df916c73c81e1fd807b5ad1607406a9eaef8 SHA512 674eff595bcf7ac0725a1944bd2bff9c43f8a095a7ff471120a56bbca12ac00a33a0e0ffe8dd249b524ec20db2c65aa859aa8810a735ad91684c1f10e95998da
+DIST grafana-bin-5.0.3.tar.gz 51600363 BLAKE2B 725252ecadba25b8513860949339188cf81854cf315dbe6965e7cf3c06c0de806805dc4cfe5e1876b7dcb38a435fb79d2f01535e0a58cd5f088c7a2f4e2887c9 SHA512 a47a4b8275f93ae2a784ca28195d332ee3dba4bb889261c9db520fbe48d242654779f2eeffc7c78bf05b7db2e712bd012445e1bab720e3f05b1908f9b5034b6e
 EBUILD grafana-bin-4.6.3.ebuild 1750 BLAKE2B cb822beb7365474a21f49de6aedd9ffe31c80f99a5c3817b4c87f12cbc8390310cda5ec0f756e543d7d71970c809b5d21aff3a6a3dd377909e453e2f81c03730 SHA512 7b0aac0e0e288f00d29e4a1b770ebc0ebea629cb1760c4c99ea6531f746b6a571d58a0ac1a8001a1668dc1d4527510fe3ecc7b02e70247df9589fde6ece9a2f4
-EBUILD grafana-bin-5.0.2.ebuild 1743 BLAKE2B 385c60aed3d8d62051195cc0eda569c6ea90468b4d13d52020f5157f1c8d62c6c280f1562f7493c223a2bdf35373c639c33df84dc2df4d72754a8c8b5663787a SHA512 583109ec025c8bdc5da5d7a459cb847d6422e0d5540c882cf9055fd3edccd2eeaf479b4d312b7f70f348227ad06c8de68ba785b229ac9b04bb1a37f1d9c51640
+EBUILD grafana-bin-5.0.3.ebuild 1743 BLAKE2B 385c60aed3d8d62051195cc0eda569c6ea90468b4d13d52020f5157f1c8d62c6c280f1562f7493c223a2bdf35373c639c33df84dc2df4d72754a8c8b5663787a SHA512 583109ec025c8bdc5da5d7a459cb847d6422e0d5540c882cf9055fd3edccd2eeaf479b4d312b7f70f348227ad06c8de68ba785b229ac9b04bb1a37f1d9c51640
 MISC metadata.xml 299 BLAKE2B f907a1d524382aed556259ab450e2e6b9c927b7b07a975d468867855e3dc184d7d296a4f6f098a65598b377b2c46cab1c90dced667c7b0cdad16e156949807b1 SHA512 3c543eb4a0465af174a2a80650a542daead9f89685993575eef9ab826b98c84585184152f8ebc5e81fdafd9bbe24d63f467b251a4c9aeaaeef52408a1a3812df
diff --git a/www-apps/grafana-bin/grafana-bin-5.0.2.ebuild b/www-apps/grafana-bin/grafana-bin-5.0.3.ebuild
index c1e847d3902b..c1e847d3902b 100644
--- a/www-apps/grafana-bin/grafana-bin-5.0.2.ebuild
+++ b/www-apps/grafana-bin/grafana-bin-5.0.3.ebuild
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index f7d29adebcd5..403f273206ef 100644
--- a/www-client/Manifest.gz
+++ b/www-client/Manifest.gz
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 5d5800cc4ed6..ab77a9f98615 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -14,9 +14,11 @@ AUX chromium-webrtc-r0.patch 972 BLAKE2B 1c49db0ba631c8e517a5b361e2882e7f00d9b01
 AUX chromium-widevine-r1.patch 428 BLAKE2B 07b5ab48a2233986f60c91192557e0454eab56248cdf378ae4d6fe99f239f95e89f28fd0b2b7dc36dd85557e7a5403d9a30a8189b7f56a9bae678831dfa49d2b SHA512 fe6b912bd8b3993194f71bef229e57d4c24f9adcf697172eb3bc5ee8d38967bf5fe5b964e9d89d23960d25cd3a6e53ce7714f81f0df1881758b611a66375e32a
 AUX chromium.default 148 BLAKE2B 5ee5b582c59a6e4bef87bbb0e232e2470ad412b1fbbb3b9af6ef7153edb55c5b9080cc16a5a115b0c5b3c381aa87ce57a7b12bdd2070e67dac10a6c2995ddbaf SHA512 0d4849e03592fb58b05e62a43021eca7e61615616c8907c3b2e445402e03adaf9e8fa25b0a745d6c31eb037456215cc02b59e345a3a06d932e76cf990c92d739
 DIST chromium-65.0.3325.146.tar.xz 570305180 BLAKE2B b4ac28ea267a673e0c8d22abb41b607ea7f1bca12b43f80f3fffd562bb85af5b298725beca2ac3e3a31297537c2d485912eda3996ab56c45bf8e113cc7ebf764 SHA512 e8227325c0128e6c476006aaba97db24b7458de56fb47a26c5880564b730d6e3c130945bfa1e8f664a270b8f22dc25869633d42860c2a9ac684e37325802fbf5
-DIST chromium-66.0.3355.0.tar.xz 582642152 BLAKE2B 16a89cc99984b566741770f9081a738596ac0b031e916073df417ac42406a96a8f874278720f3462fba827218dff141eddd614cf2ca494ec3d38577744e7c441 SHA512 324902e3e8ec7c22dbb95f2d8f97069dac97f702f528130c06eb7a246e495e51b069f4ce09a7ca875ff511e0bf992207b55b1f887aaa3a438179618c206df436
+DIST chromium-65.0.3325.181.tar.xz 570386836 BLAKE2B e170c80dc59ccf84c08430d9685f2d491f609d6217cfea4e0618622dbf53722e9803a41df4e922446be90d8ae70229b3b8bb9a86e9a5fd21a7986aee4665866c SHA512 52472127b46da48699f401ab9c64f80975398bc3e97d032c517736babc327bfa0a0ce6415831ff3f585cd309e2e05e48d5252b15d0873fee118adf70f54d1a05
 DIST chromium-66.0.3359.22.tar.xz 583532916 BLAKE2B 94a09d7aa687697ec572a933fdf032ad27a77bed24a31c7a497222da86bbc44f0a25846c7a925c527d3f8ee601110eaf8cd8f4691a19170ca68098acbfd885be SHA512 7143e6e048d5b370032ab24f231b63fda0044f08c6f2c3f8722a33d43387629d7462434b7c3fea8bab8a4a1e25622d9576cd3eba80d23b8c937b85e61c6bc55f
+DIST chromium-66.0.3359.45.tar.xz 583703472 BLAKE2B 6ebbc83c870889319b99ba33f0416e2ce5988955890c579b1df38da3bd6938aa0d158c65a574ea48d3a34a2f87f7982f35a9280b017f8471c6ac837e2689303a SHA512 be32c4ab8db1e8d1e2581f015fdbe12ee4c734b77611511c53a5279114ba4d5d4d1dfe9fb1385bea587b530d6551491db70b275615a96fe86e5a525512fc6d73
 EBUILD chromium-65.0.3325.146.ebuild 20899 BLAKE2B 3694430361ce7b8f6a2db0e6a3be5654136174dfad1faf155fe326eefdf1186eeaafdcb27c47018919e91ffbc48237311f880c0b8250358dcccad7b22588dd6c SHA512 08e0737062d30a800e4e8a21b0a715a8610ef49d30040e034ff37c26b53fa48b8ff5544f6e3a8ca4b41bd3738928210ad09bbbbb5dbe7c47e22f1bd98cb6fe3b
-EBUILD chromium-66.0.3355.0.ebuild 21080 BLAKE2B 00612a5d736a8b06719079cc21dd5c34dc78876c1481a429cc87cc83c0548af9abcb28a67aa74c19f49da2b4ae07dc81cfde78462c3927278e96ebfe27c60f3b SHA512 85277baa3ed4f287798228ce0ed554ba90f92ea7a2d464358ff8fad88da17be6bd8de4a718b90c9121f775431141ad6ba4edb3624ddaedc78e21206ecd5813b5
+EBUILD chromium-65.0.3325.181.ebuild 20900 BLAKE2B d93ddc7aa2b11928b47fb508950642f89b4f0b94bb6f6ad6e516cdce42e68b7346cd6095337632e8a15d946d1da6af10be36ac0b23766d04b02fe78de5747a3c SHA512 06453fef8284858d4273f20c30142cc78fd2d047ffb4b9a4444ef93caee07918eb0d6f4b64c95ad71a20228ee561d1256c7b7a9c66e2e49dfeecbeeed5ea4b02
 EBUILD chromium-66.0.3359.22.ebuild 21056 BLAKE2B 2620e59768403975d4bde8c286b020f723ba9d60d2c02b1ba8ac99c71589add05dce3fa7b9e7db6d84f58bbab1b0d1499ae371bcd7fb2b5735b1a8954471dc7f SHA512 5204b782fffe5ebf121e5131dd205e4f1066f4736e4828091e3951d289edcb3e675e7a16910019850730af4fc93b825af1a3dafa7710c9a6aa5c721570bb3530
+EBUILD chromium-66.0.3359.45.ebuild 21056 BLAKE2B 2620e59768403975d4bde8c286b020f723ba9d60d2c02b1ba8ac99c71589add05dce3fa7b9e7db6d84f58bbab1b0d1499ae371bcd7fb2b5735b1a8954471dc7f SHA512 5204b782fffe5ebf121e5131dd205e4f1066f4736e4828091e3951d289edcb3e675e7a16910019850730af4fc93b825af1a3dafa7710c9a6aa5c721570bb3530
 MISC metadata.xml 1418 BLAKE2B 0fd718bd70dc0fa890bf7e0efa2f6a186df446617f36bb5e4689989c4766da4016b5325d8a81f8959e887fc182ff792bb10909b5724df8c4fcaade221b289d8b SHA512 1c68218f5cab5787a7524823975474065794aa18f8301e9efe066847b9a566b870a68a3768cee925a3ad6543fb182575043c1cb45e145db67382c502a535d039
diff --git a/www-client/chromium/chromium-65.0.3325.181.ebuild b/www-client/chromium/chromium-65.0.3325.181.ebuild
new file mode 100644
index 000000000000..3ca4d45a0ba9
--- /dev/null
+++ b/www-client/chromium/chromium-65.0.3325.181.ebuild
@@ -0,0 +1,696 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_COMPAT=( python2_7 )
+
+CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
+	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
+	sv sw ta te th tr uk vi zh-CN zh-TW"
+
+inherit check-reqs chromium-2 eutils gnome2-utils flag-o-matic multilib ninja-utils pax-utils portability python-any-r1 readme.gentoo-r1 toolchain-funcs versionator xdg-utils
+
+DESCRIPTION="Open-source version of Google Chrome web browser"
+HOMEPAGE="http://chromium.org/"
+SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="component-build cups gnome-keyring +hangouts jumbo-build kerberos neon pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-icu +system-libvpx +tcmalloc widevine"
+RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )"
+
+COMMON_DEPEND="
+	app-accessibility/at-spi2-atk:2
+	app-arch/bzip2:=
+	cups? ( >=net-print/cups-1.3.11:= )
+	dev-libs/atk
+	dev-libs/expat:=
+	dev-libs/glib:2
+	system-icu? ( >=dev-libs/icu-59:= )
+	>=dev-libs/libxml2-2.9.4-r3:=[icu]
+	dev-libs/libxslt:=
+	dev-libs/nspr:=
+	>=dev-libs/nss-3.26:=
+	>=dev-libs/re2-0.2016.05.01:=
+	gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= )
+	>=media-libs/alsa-lib-1.0.19:=
+	media-libs/fontconfig:=
+	media-libs/freetype:=
+	>=media-libs/harfbuzz-1.6.0:=[icu(-)]
+	media-libs/libjpeg-turbo:=
+	media-libs/libpng:=
+	system-libvpx? ( media-libs/libvpx:=[postproc,svc] )
+	>=media-libs/openh264-1.6.0:=
+	pulseaudio? ( media-sound/pulseaudio:= )
+	system-ffmpeg? (
+		>=media-video/ffmpeg-3:=
+		|| (
+			media-video/ffmpeg[-samba]
+			>=net-fs/samba-4.5.10-r1[-debug(-)]
+		)
+		!=net-fs/samba-4.5.12
+		media-libs/opus:=
+	)
+	sys-apps/dbus:=
+	sys-apps/pciutils:=
+	virtual/udev
+	x11-libs/cairo:=
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3[X]
+	x11-libs/libX11:=
+	x11-libs/libXcomposite:=
+	x11-libs/libXcursor:=
+	x11-libs/libXdamage:=
+	x11-libs/libXext:=
+	x11-libs/libXfixes:=
+	>=x11-libs/libXi-1.6.0:=
+	x11-libs/libXrandr:=
+	x11-libs/libXrender:=
+	x11-libs/libXScrnSaver:=
+	x11-libs/libXtst:=
+	x11-libs/pango:=
+	app-arch/snappy:=
+	media-libs/flac:=
+	>=media-libs/libwebp-0.4.0:=
+	sys-libs/zlib:=[minizip]
+	kerberos? ( virtual/krb5 )
+"
+# For nvidia-drivers blocker, see bug #413637 .
+RDEPEND="${COMMON_DEPEND}
+	!=www-client/chromium-9999
+	!<www-plugins/chrome-binary-plugins-57
+	x11-misc/xdg-utils
+	virtual/opengl
+	virtual/ttf-fonts
+	selinux? ( sec-policy/selinux-chromium )
+	tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 )
+	widevine? ( www-plugins/chrome-binary-plugins[widevine(-)] )
+"
+# dev-vcs/git - https://bugs.gentoo.org/593476
+# sys-apps/sandbox - https://crbug.com/586444
+DEPEND="${COMMON_DEPEND}
+	>=app-arch/gzip-1.7
+	!arm? (
+		dev-lang/yasm
+	)
+	dev-lang/perl
+	>=dev-util/gperf-3.0.3
+	>=dev-util/ninja-1.7.2
+	>=net-libs/nodejs-6.9.4
+	sys-apps/hwids[usb(+)]
+	>=sys-devel/bison-2.4.3
+	sys-devel/flex
+	>=sys-devel/clang-5
+	virtual/pkgconfig
+	dev-vcs/git
+	$(python_gen_any_dep '
+		dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]
+		>=dev-python/beautifulsoup-4.3.2:4[${PYTHON_USEDEP}]
+		dev-python/html5lib[${PYTHON_USEDEP}]
+		dev-python/simplejson[${PYTHON_USEDEP}]
+	')
+"
+
+# Keep this in sync with the python_gen_any_dep call.
+python_check_deps() {
+	has_version --host-root "dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]" &&
+	has_version --host-root ">=dev-python/beautifulsoup-4.3.2:4[${PYTHON_USEDEP}]" &&
+	has_version --host-root "dev-python/html5lib[${PYTHON_USEDEP}]" &&
+	has_version --host-root "dev-python/simplejson[${PYTHON_USEDEP}]"
+}
+
+if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
+	EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
+fi
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="
+Some web pages may require additional fonts to display properly.
+Try installing some of the following packages if some characters
+are not displayed properly:
+- media-fonts/arphicfonts
+- media-fonts/bitstream-cyberbit
+- media-fonts/droid
+- media-fonts/ipamonafont
+- media-fonts/noto
+- media-fonts/ja-ipafonts
+- media-fonts/takao-fonts
+- media-fonts/wqy-microhei
+- media-fonts/wqy-zenhei
+
+To fix broken icons on the Downloads page, you should install an icon
+theme that covers the appropriate MIME types, and configure this as your
+GTK+ icon theme.
+"
+
+PATCHES=(
+	"${FILESDIR}/chromium-widevine-r1.patch"
+	"${FILESDIR}/chromium-FORTIFY_SOURCE-r2.patch"
+	"${FILESDIR}/chromium-webrtc-r0.patch"
+	"${FILESDIR}/chromium-memcpy-r0.patch"
+	"${FILESDIR}/chromium-clang-r2.patch"
+	"${FILESDIR}/chromium-gn-r0.patch"
+	"${FILESDIR}/chromium-math.h-r0.patch"
+	"${FILESDIR}/chromium-clang-r3.patch"
+	"${FILESDIR}/chromium-stdint.patch"
+	"${FILESDIR}/chromium-ffmpeg-clang.patch"
+)
+
+pre_build_checks() {
+	#if [[ ${MERGE_TYPE} != binary ]]; then
+	#	local -x CPP="$(tc-getCXX) -E"
+	#	if tc-is-clang && ! version_is_at_least "3.9.1" "$(clang-fullversion)"; then
+	#		# bugs: #601654
+	#		die "At least clang 3.9.1 is required"
+	#	fi
+	#	if tc-is-gcc && ! version_is_at_least 5.0 "$(gcc-version)"; then
+	#		# bugs: #535730, #525374, #518668, #600288, #627356
+	#		die "At least gcc 5.0 is required"
+	#	fi
+	#fi
+
+	# Check build requirements, bug #541816 and bug #471810 .
+	CHECKREQS_MEMORY="3G"
+	CHECKREQS_DISK_BUILD="5G"
+	eshopts_push -s extglob
+	if is-flagq '-g?(gdb)?([1-9])'; then
+		CHECKREQS_DISK_BUILD="25G"
+		if ! use component-build; then
+			CHECKREQS_MEMORY="16G"
+		fi
+	fi
+	eshopts_pop
+	check-reqs_pkg_setup
+}
+
+pkg_pretend() {
+	pre_build_checks
+}
+
+pkg_setup() {
+	pre_build_checks
+
+	chromium_suid_sandbox_check_kernel_config
+}
+
+src_prepare() {
+	# Calling this here supports resumption via FEATURES=keepwork
+	python_setup
+
+	default
+
+	mkdir -p third_party/node/linux/node-linux-x64/bin || die
+	ln -s "${EPREFIX}"/usr/bin/node third_party/node/linux/node-linux-x64/bin/node || die
+
+	local keeplibs=(
+		base/third_party/dmg_fp
+		base/third_party/dynamic_annotations
+		base/third_party/icu
+		base/third_party/nspr
+		base/third_party/superfasthash
+		base/third_party/symbolize
+		base/third_party/valgrind
+		base/third_party/xdg_mime
+		base/third_party/xdg_user_dirs
+		chrome/third_party/mozilla_security_manager
+		courgette/third_party
+		net/third_party/mozilla_security_manager
+		net/third_party/nss
+		third_party/WebKit
+		third_party/analytics
+		third_party/angle
+		third_party/angle/src/common/third_party/base
+		third_party/angle/src/common/third_party/smhasher
+		third_party/angle/src/third_party/compiler
+		third_party/angle/src/third_party/libXNVCtrl
+		third_party/angle/src/third_party/trace_event
+		third_party/blink
+		third_party/boringssl
+		third_party/boringssl/src/third_party/fiat
+		third_party/breakpad
+		third_party/breakpad/breakpad/src/third_party/curl
+		third_party/brotli
+		third_party/cacheinvalidation
+		third_party/catapult
+		third_party/catapult/common/py_vulcanize/third_party/rcssmin
+		third_party/catapult/common/py_vulcanize/third_party/rjsmin
+		third_party/catapult/third_party/polymer
+		third_party/catapult/tracing/third_party/d3
+		third_party/catapult/tracing/third_party/gl-matrix
+		third_party/catapult/tracing/third_party/jszip
+		third_party/catapult/tracing/third_party/mannwhitneyu
+		third_party/catapult/tracing/third_party/oboe
+		third_party/catapult/tracing/third_party/pako
+		third_party/ced
+		third_party/cld_3
+		third_party/crc32c
+		third_party/cros_system_api
+		third_party/devscripts
+		third_party/dom_distiller_js
+		third_party/fips181
+		third_party/flatbuffers
+		third_party/flot
+		third_party/freetype
+		third_party/glslang-angle
+		third_party/google_input_tools
+		third_party/google_input_tools/third_party/closure_library
+		third_party/google_input_tools/third_party/closure_library/third_party/closure
+		third_party/googletest
+		third_party/hunspell
+		third_party/iccjpeg
+		third_party/inspector_protocol
+		third_party/jinja2
+		third_party/jstemplate
+		third_party/khronos
+		third_party/leveldatabase
+		third_party/libXNVCtrl
+		third_party/libaddressinput
+		third_party/libaom
+		third_party/libjingle
+		third_party/libphonenumber
+		third_party/libsecret
+		third_party/libsrtp
+		third_party/libudev
+		third_party/libwebm
+		third_party/libxml/chromium
+		third_party/libyuv
+		third_party/llvm
+		third_party/lss
+		third_party/lzma_sdk
+		third_party/markupsafe
+		third_party/mesa
+		third_party/metrics_proto
+		third_party/modp_b64
+		third_party/mt19937ar
+		third_party/node
+		third_party/node/node_modules/polymer-bundler/lib/third_party/UglifyJS2
+		third_party/openmax_dl
+		third_party/ots
+		third_party/pdfium
+		third_party/pdfium/third_party/agg23
+		third_party/pdfium/third_party/base
+		third_party/pdfium/third_party/build
+		third_party/pdfium/third_party/bigint
+		third_party/pdfium/third_party/freetype
+		third_party/pdfium/third_party/lcms
+		third_party/pdfium/third_party/libopenjpeg20
+		third_party/pdfium/third_party/libpng16
+		third_party/pdfium/third_party/libtiff
+		third_party/ply
+		third_party/polymer
+		third_party/protobuf
+		third_party/protobuf/third_party/six
+		third_party/qcms
+		third_party/s2cellid
+		third_party/sfntly
+		third_party/skia
+		third_party/skia/third_party/gif
+		third_party/skia/third_party/vulkan
+		third_party/smhasher
+		third_party/spirv-headers
+		third_party/spirv-tools-angle
+		third_party/sqlite
+		third_party/swiftshader
+		third_party/swiftshader/third_party/llvm-subzero
+		third_party/swiftshader/third_party/subzero
+		third_party/usrsctp
+		third_party/vulkan
+		third_party/vulkan-validation-layers
+		third_party/web-animations-js
+		third_party/webdriver
+		third_party/webrtc
+		third_party/widevine
+		third_party/woff2
+		third_party/zlib/google
+		url/third_party/mozilla
+		v8/src/third_party/valgrind
+		v8/src/third_party/utf8-decoder
+		v8/third_party/inspector_protocol
+
+		# gyp -> gn leftovers
+		base/third_party/libevent
+		third_party/adobe
+		third_party/speech-dispatcher
+		third_party/usb_ids
+		third_party/xdg-utils
+		third_party/yasm/run_yasm.py
+	)
+	if ! use system-ffmpeg; then
+		keeplibs+=( third_party/ffmpeg third_party/opus )
+	fi
+	if ! use system-icu; then
+		keeplibs+=( third_party/icu )
+	fi
+	if ! use system-libvpx; then
+		keeplibs+=( third_party/libvpx )
+		keeplibs+=( third_party/libvpx/source/libvpx/third_party/x86inc )
+	fi
+	if use tcmalloc; then
+		keeplibs+=( third_party/tcmalloc )
+	fi
+
+	# Remove most bundled libraries. Some are still needed.
+	build/linux/unbundle/remove_bundled_libraries.py "${keeplibs[@]}" --do-remove || die
+}
+
+bootstrap_gn() {
+	if tc-is-cross-compiler; then
+		local -x AR=${BUILD_AR}
+		local -x CC=${BUILD_CC}
+		local -x CXX=${BUILD_CXX}
+		local -x NM=${BUILD_NM}
+		local -x CFLAGS=${BUILD_CFLAGS}
+		local -x CXXFLAGS=${BUILD_CXXFLAGS}
+		local -x LDFLAGS=${BUILD_LDFLAGS}
+	fi
+	einfo "Building GN..."
+	set -- tools/gn/bootstrap/bootstrap.py -s -v --no-clean
+	echo "$@"
+	"$@" || die
+}
+
+src_configure() {
+	# Calling this here supports resumption via FEATURES=keepwork
+	python_setup
+
+	local myconf_gn=""
+
+	# Make sure the build system will use the right tools, bug #340795.
+	tc-export AR CC CXX NM
+
+	if ! tc-is-clang; then
+		# Force clang since gcc is pretty broken at the moment.
+		CC=${CHOST}-clang
+		CXX=${CHOST}-clang++
+		strip-unsupported-flags
+	fi
+
+	if tc-is-clang; then
+		myconf_gn+=" is_clang=true clang_use_chrome_plugins=false"
+	else
+		myconf_gn+=" is_clang=false"
+	fi
+
+	# Define a custom toolchain for GN
+	myconf_gn+=" custom_toolchain=\"//build/toolchain/linux/unbundle:default\""
+
+	if tc-is-cross-compiler; then
+		tc-export BUILD_{AR,CC,CXX,NM}
+		myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:host\""
+		myconf_gn+=" v8_snapshot_toolchain=\"//build/toolchain/linux/unbundle:host\""
+	else
+		myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:default\""
+	fi
+
+	# GN needs explicit config for Debug/Release as opposed to inferring it from build directory.
+	myconf_gn+=" is_debug=false"
+
+	# Component build isn't generally intended for use by end users. It's mostly useful
+	# for development and debugging.
+	myconf_gn+=" is_component_build=$(usex component-build true false)"
+
+	# https://chromium.googlesource.com/chromium/src/+/lkcr/docs/jumbo.md
+	myconf_gn+=" use_jumbo_build=$(usex jumbo-build true false)"
+
+	myconf_gn+=" use_allocator=$(usex tcmalloc \"tcmalloc\" \"none\")"
+
+	# Disable nacl, we can't build without pnacl (http://crbug.com/269560).
+	myconf_gn+=" enable_nacl=false"
+
+	# Use system-provided libraries.
+	# TODO: freetype -- remove sources (https://bugs.chromium.org/p/pdfium/issues/detail?id=733).
+	# TODO: use_system_hunspell (upstream changes needed).
+	# TODO: use_system_libsrtp (bug #459932).
+	# TODO: use_system_protobuf (bug #525560).
+	# TODO: use_system_ssl (http://crbug.com/58087).
+	# TODO: use_system_sqlite (http://crbug.com/22208).
+
+	# libevent: https://bugs.gentoo.org/593458
+	local gn_system_libraries=(
+		flac
+		fontconfig
+		freetype
+		# Need harfbuzz_from_pkgconfig target
+		#harfbuzz-ng
+		libdrm
+		libjpeg
+		libpng
+		libwebp
+		libxml
+		libxslt
+		openh264
+		re2
+		snappy
+		yasm
+		zlib
+	)
+	if use system-ffmpeg; then
+		gn_system_libraries+=( ffmpeg opus )
+	fi
+	if use system-icu; then
+		gn_system_libraries+=( icu )
+	fi
+	if use system-libvpx; then
+		gn_system_libraries+=( libvpx )
+	fi
+	build/linux/unbundle/replace_gn_files.py --system-libraries "${gn_system_libraries[@]}" || die
+
+	# See dependency logic in third_party/BUILD.gn
+	myconf_gn+=" use_system_harfbuzz=true"
+
+	# Optional dependencies.
+	myconf_gn+=" enable_hangout_services_extension=$(usex hangouts true false)"
+	myconf_gn+=" enable_widevine=$(usex widevine true false)"
+	myconf_gn+=" use_cups=$(usex cups true false)"
+	myconf_gn+=" use_gnome_keyring=$(usex gnome-keyring true false)"
+	myconf_gn+=" use_kerberos=$(usex kerberos true false)"
+	myconf_gn+=" use_pulseaudio=$(usex pulseaudio true false)"
+
+	# TODO: link_pulseaudio=true for GN.
+
+	myconf_gn+=" fieldtrial_testing_like_official_build=true"
+
+	# Never use bundled gold binary. Disable gold linker flags for now.
+	# Do not use bundled clang.
+	# Trying to use gold results in linker crash.
+	myconf_gn+=" use_gold=false use_sysroot=false linux_use_bundled_binutils=false use_custom_libcxx=false"
+
+	# Disable forced lld, bug 641556
+	myconf_gn+=" use_lld=false"
+
+	ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)"
+	myconf_gn+=" proprietary_codecs=$(usex proprietary-codecs true false)"
+	myconf_gn+=" ffmpeg_branding=\"${ffmpeg_branding}\""
+
+	# Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .
+	# Note: these are for Gentoo use ONLY. For your own distribution,
+	# please get your own set of keys. Feel free to contact chromium@gentoo.org
+	# for more info.
+	local google_api_key="AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc"
+	local google_default_client_id="329227923882.apps.googleusercontent.com"
+	local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
+	myconf_gn+=" google_api_key=\"${google_api_key}\""
+	myconf_gn+=" google_default_client_id=\"${google_default_client_id}\""
+	myconf_gn+=" google_default_client_secret=\"${google_default_client_secret}\""
+
+	local myarch="$(tc-arch)"
+	if [[ $myarch = amd64 ]] ; then
+		myconf_gn+=" target_cpu=\"x64\""
+		ffmpeg_target_arch=x64
+	elif [[ $myarch = x86 ]] ; then
+		myconf_gn+=" target_cpu=\"x86\""
+		ffmpeg_target_arch=ia32
+	elif [[ $myarch = arm64 ]] ; then
+		myconf_gn+=" target_cpu=\"arm64\""
+		ffmpeg_target_arch=arm64
+	elif [[ $myarch = arm ]] ; then
+		myconf_gn+=" target_cpu=\"arm\""
+		ffmpeg_target_arch=$(usex neon arm-neon arm)
+	else
+		die "Failed to determine target arch, got '$myarch'."
+	fi
+
+	# Make sure that -Werror doesn't get added to CFLAGS by the build system.
+	# Depending on GCC version the warnings are different and we don't want
+	# the build to fail because of that.
+	myconf_gn+=" treat_warnings_as_errors=false"
+
+	# Disable fatal linker warnings, bug 506268.
+	myconf_gn+=" fatal_linker_warnings=false"
+
+	# Avoid CFLAGS problems, bug #352457, bug #390147.
+	if ! use custom-cflags; then
+		replace-flags "-Os" "-O2"
+		strip-flags
+
+		# Prevent linker from running out of address space, bug #471810 .
+		if use x86; then
+			filter-flags "-g*"
+		fi
+
+		# Prevent libvpx build failures. Bug 530248, 544702, 546984.
+		if [[ ${myarch} == amd64 || ${myarch} == x86 ]]; then
+			filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx -mno-avx2
+		fi
+	fi
+
+	# https://bugs.gentoo.org/588596
+	#append-cxxflags $(test-flags-CXX -fno-delete-null-pointer-checks)
+
+	# Bug 491582.
+	export TMPDIR="${WORKDIR}/temp"
+	mkdir -p -m 755 "${TMPDIR}" || die
+
+	if ! use system-ffmpeg; then
+		local build_ffmpeg_args=""
+		if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then
+			build_ffmpeg_args+=" --disable-asm"
+		fi
+
+		# Re-configure bundled ffmpeg. See bug #491378 for example reasons.
+		einfo "Configuring bundled ffmpeg..."
+		pushd third_party/ffmpeg > /dev/null || die
+		chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} \
+			--branding ${ffmpeg_branding} -- ${build_ffmpeg_args} || die
+		chromium/scripts/copy_config.sh || die
+		chromium/scripts/generate_gn.py || die
+		popd > /dev/null || die
+	fi
+
+	bootstrap_gn
+
+	einfo "Configuring Chromium..."
+	set -- out/Release/gn gen --args="${myconf_gn} ${EXTRA_GN}" out/Release
+	echo "$@"
+	"$@" || die
+}
+
+src_compile() {
+	# Calling this here supports resumption via FEATURES=keepwork
+	python_setup
+
+	#"${EPYTHON}" tools/clang/scripts/update.py --force-local-build --gcc-toolchain /usr --skip-checkout --use-system-cmake --without-android || die
+
+	# Build mksnapshot and pax-mark it.
+	local x
+	for x in mksnapshot v8_context_snapshot_generator; do
+		if tc-is-cross-compiler; then
+			eninja -C out/Release "host/${x}"
+			pax-mark m "out/Release/host/${x}"
+		else
+			eninja -C out/Release "${x}"
+			pax-mark m "out/Release/${x}"
+		fi
+	done
+
+	# Work around circular dep issue
+	# https://chromium-review.googlesource.com/c/chromium/src/+/617768
+	eninja -C out/Release gen/ui/accessibility/ax_enums.h
+
+	# Even though ninja autodetects number of CPUs, we respect
+	# user's options, for debugging with -j 1 or any other reason.
+	eninja -C out/Release chrome chromedriver
+	use suid && eninja -C out/Release chrome_sandbox
+
+	pax-mark m out/Release/chrome
+}
+
+src_install() {
+	local CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser"
+	exeinto "${CHROMIUM_HOME}"
+	doexe out/Release/chrome
+
+	if use suid; then
+		newexe out/Release/chrome_sandbox chrome-sandbox
+		fperms 4755 "${CHROMIUM_HOME}/chrome-sandbox"
+	fi
+
+	doexe out/Release/chromedriver
+
+	local sedargs=( -e "s:/usr/lib/:/usr/$(get_libdir)/:g" )
+	sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r3.sh" > chromium-launcher.sh || die
+	doexe chromium-launcher.sh
+
+	# It is important that we name the target "chromium-browser",
+	# xdg-utils expect it; bug #355517.
+	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser
+	# keep the old symlink around for consistency
+	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium
+
+	dosym "${CHROMIUM_HOME}/chromedriver" /usr/bin/chromedriver
+
+	# Allow users to override command-line options, bug #357629.
+	insinto /etc/chromium
+	newins "${FILESDIR}/chromium.default" "default"
+
+	pushd out/Release/locales > /dev/null || die
+	chromium_remove_language_paks
+	popd
+
+	if use widevine; then
+		# These will be provided by chrome-binary-plugins
+		rm out/Release/libwidevinecdm*.so || die
+	fi
+
+	insinto "${CHROMIUM_HOME}"
+	doins out/Release/*.bin
+	doins out/Release/*.pak
+	doins out/Release/*.so
+
+	if ! use system-icu; then
+		doins out/Release/icudtl.dat
+	fi
+
+	doins -r out/Release/locales
+	doins -r out/Release/resources
+
+	if [[ -d out/Release/swiftshader ]]; then
+		insinto "${CHROMIUM_HOME}/swiftshader"
+		doins out/Release/swiftshader/*.so
+	fi
+
+	# Install icons and desktop entry.
+	local branding size
+	for size in 16 22 24 32 48 64 128 256 ; do
+		case ${size} in
+			16|32) branding="chrome/app/theme/default_100_percent/chromium" ;;
+				*) branding="chrome/app/theme/chromium" ;;
+		esac
+		newicon -s ${size} "${branding}/product_logo_${size}.png" \
+			chromium-browser.png
+	done
+
+	local mime_types="text/html;text/xml;application/xhtml+xml;"
+	mime_types+="x-scheme-handler/http;x-scheme-handler/https;" # bug #360797
+	mime_types+="x-scheme-handler/ftp;" # bug #412185
+	mime_types+="x-scheme-handler/mailto;x-scheme-handler/webcal;" # bug #416393
+	make_desktop_entry \
+		chromium-browser \
+		"Chromium" \
+		chromium-browser \
+		"Network;WebBrowser" \
+		"MimeType=${mime_types}\nStartupWMClass=chromium-browser"
+	sed -e "/^Exec/s/$/ %U/" -i "${ED}"/usr/share/applications/*.desktop || die
+
+	# Install GNOME default application entry (bug #303100).
+	insinto /usr/share/gnome-control-center/default-apps
+	newins "${FILESDIR}"/chromium-browser.xml chromium-browser.xml
+
+	readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	readme.gentoo_print_elog
+}
diff --git a/www-client/chromium/chromium-66.0.3355.0.ebuild b/www-client/chromium/chromium-66.0.3359.45.ebuild
index 72c8738a74f3..cf52ce6305d2 100644
--- a/www-client/chromium/chromium-66.0.3355.0.ebuild
+++ b/www-client/chromium/chromium-66.0.3359.45.ebuild
@@ -289,7 +289,6 @@ src_prepare() {
 		third_party/mesa
 		third_party/metrics_proto
 		third_party/modp_b64
-		third_party/mt19937ar
 		third_party/node
 		third_party/node/node_modules/polymer-bundler/lib/third_party/UglifyJS2
 		third_party/openmax_dl
diff --git a/www-client/google-chrome-unstable/Manifest b/www-client/google-chrome-unstable/Manifest
index 6d54261ec5ae..312c156f1cad 100644
--- a/www-client/google-chrome-unstable/Manifest
+++ b/www-client/google-chrome-unstable/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-unstable_67.0.3371.0-1_amd64.deb 53414772 BLAKE2B fd7cc9cda00b82b447e976b0f65f3db302f832d0288700254a731d6731784becd0008ba631e713e594c667a8a182c676e16acde279f170cf910dcf876bc730f7 SHA512 bf460bf14c3535e2bbd16c40e4e221aea7b1690a9570c31f977910fa875feb03e638514f2610f41b4aaf4402f1211ae1c89f69834a9a6d180cb2fe99fadab3a8
-EBUILD google-chrome-unstable-67.0.3371.0.ebuild 3594 BLAKE2B 986a1dbf1a1b81e808d01dbbbd6f20608e2ca9754cd5803926b3282470924ecc59e039193461d9cc1f7a9b0d658a5eff355bdd3ae1fb7b651f698f4a25c79cd2 SHA512 a2bb023df0e47ebda044842afcdc4669957a740913441c4c468af85592d93060ae1c84d9e661a4ffd0f85942c370cc9c43f443a392763a00fab6c66de975bf15
+DIST google-chrome-unstable_67.0.3377.1-1_amd64.deb 53591960 BLAKE2B 7fa2e92b9fb9ab5a194d97da2a6385ada58590f8563d2ee706653a279a79cdaa6f924e7270e20ba2552f75d40659e751937378b9d9e820c06398b0299ef4df99 SHA512 4459dd494581acfe8abfb98768201555b794ba02bcb69dc8ad9baeb253ed4da8b7f6257a60e72c203b4073b5585431066b90ac11a78140b16fce45ce8336fe58
+EBUILD google-chrome-unstable-67.0.3377.1.ebuild 3594 BLAKE2B 986a1dbf1a1b81e808d01dbbbd6f20608e2ca9754cd5803926b3282470924ecc59e039193461d9cc1f7a9b0d658a5eff355bdd3ae1fb7b651f698f4a25c79cd2 SHA512 a2bb023df0e47ebda044842afcdc4669957a740913441c4c468af85592d93060ae1c84d9e661a4ffd0f85942c370cc9c43f443a392763a00fab6c66de975bf15
 MISC metadata.xml 517 BLAKE2B dfd840aa3f7845f67c8d6cca488d89845ca7c259eb4df00f8458ae48b1962df91ca8299ef34785f635dcab25b445246e999fbbfef3bdd7117a4ee1b14beca420 SHA512 837becd9e41aca24694cd10a7bddbc5ca501aca983832daccb4c091a7712267ef20051e7a19af02bc3b48eed89c9e18aa0d46ca2411e1d58d045ceb732a180af
diff --git a/www-client/google-chrome-unstable/google-chrome-unstable-67.0.3371.0.ebuild b/www-client/google-chrome-unstable/google-chrome-unstable-67.0.3377.1.ebuild
index 43d5352b4dd5..43d5352b4dd5 100644
--- a/www-client/google-chrome-unstable/google-chrome-unstable-67.0.3371.0.ebuild
+++ b/www-client/google-chrome-unstable/google-chrome-unstable-67.0.3377.1.ebuild
diff --git a/www-client/qupzilla/Manifest b/www-client/qupzilla/Manifest
index 93049730c2ce..9d098cb1075e 100644
--- a/www-client/qupzilla/Manifest
+++ b/www-client/qupzilla/Manifest
@@ -4,5 +4,5 @@ DIST QupZilla-2.2.5.tar.xz 2532760 BLAKE2B b9bf3f5415aa5a06397a7b9f98f56a16a7c92
 DIST qupzilla-plugins-2016.05.02.tar.gz 425314 BLAKE2B c10f9f3fe17f36b91a77b4bdb15b3d0c63160c50b558ba2f180ec83b2d226b15baea51e9125e0c72d3960c2f99f8f3753d90c7eeb4b88eb07381da19bc3ea777 SHA512 b294ecb2372b3267603a43bc7412ab75d2cd29a8c4667331f0d2c74e3b0b99d0c2a005b9e4854c6d777894522bba9fb3b1607e85e8da6dcbaa760c9ddc6288f2
 DIST qupzilla-plugins-2017.03.26.tar.gz 430926 BLAKE2B d5db8c854886b1af8db20aaffe9a244600259d4f8cbc40890bf0f1075f790afe1a6e2ac19abe06c585eff0353127a3a7b1b1b79013bfc1b81bf5df750e5d9d20 SHA512 3b04b41208dddd25fd58937986cf12f2b521cf78a64380b915d46735ada3f4776f914056c5511daa781c89867d0309af7cbf833eb71dfa4b14b6b9ba25d80315
 EBUILD qupzilla-2.1.2.ebuild 3107 BLAKE2B 759e2b8ca800b96a7132986b4c776f260b05c6397999351abaf624d3aeceb46433aa7f6de662b35d7fc4079ac775b379569bd087ed3ecf59ba9b780053a09462 SHA512 d3d945b8fc44e0e7b64867b6cc66f018640791745fbb6e67fe533cb397046ac133a72ddd256d86d232421366ebc6eda90295f22f1cf2279e5fe0707c33e6097d
-EBUILD qupzilla-2.2.5.ebuild 3170 BLAKE2B 4479a06e959575816f22e0b0ec6ba3f2a9a3b075c5d24500b365d2b4e26b01940a174b5377664b8c131fc77aa33c25274bf30b968e24841b197a13ba9901547b SHA512 6c66b91432da2509b7be6ed28695fb062c62927f0dacfebd86f3407cd6d5328a49847cc11e1992505bd0cbe6bee7492e0015a753bfa91eea56a9412254754d3d
+EBUILD qupzilla-2.2.5.ebuild 3169 BLAKE2B ffb8685da17de9c7880b6643573a46b89d62b04fb1ccaabf5c4d0bbb451f8d07371423a68bd9da22bdaa931da485c2a3cc5160cc4923e5e508264d1bdfe74293 SHA512 0b920ae7e504ca2679bd0d7b5ea7caa3adb46aa8869912ff2eb5545521a3a4bb2cc6a5bb843f7e8e2acb2d134efc7c21d206f4eb8b93cd30a2f266aeef978d9e
 MISC metadata.xml 691 BLAKE2B 242030684387619d08dfc3aa46f7f0c82055bfac4693bf2e5f655d6d2762b026af5bc1f87ec05eb099d80fd48bde8df80f7deb6ac16263c4067fafd0aa389122 SHA512 585fed97ee3390094552cb5350c185dcdfaba1df7d5d3608cddbb6c05812223276b661121518ffce7921456983ee073aea58ada17ee6347d01a9e5559f75388d
diff --git a/www-client/qupzilla/qupzilla-2.2.5.ebuild b/www-client/qupzilla/qupzilla-2.2.5.ebuild
index acb97d50c177..6ba44dd86d4e 100644
--- a/www-client/qupzilla/qupzilla-2.2.5.ebuild
+++ b/www-client/qupzilla/qupzilla-2.2.5.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == *9999 ]]; then
 else
 	MY_P=QupZilla-${PV}
 	SRC_URI="https://github.com/QupZilla/${PN}/releases/download/v${PV}/${MY_P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~x86"
+	KEYWORDS="amd64 ~arm ~x86"
 	S=${WORKDIR}/${MY_P}
 fi
 
diff --git a/www-client/seamonkey/Manifest b/www-client/seamonkey/Manifest
index 05252ef4d1a8..6d6ac6ef6da9 100644
--- a/www-client/seamonkey/Manifest
+++ b/www-client/seamonkey/Manifest
@@ -22,46 +22,26 @@ DIST seamonkey-2.49.5.0-sk.xpi 967988 BLAKE2B fd7db86b778be8b1202c031ccb6b18805f
 DIST seamonkey-2.49.5.0-sv-SE.xpi 940793 BLAKE2B ec901577f833e69f78d0fba13fe1ee1297105332db66fa5e0c841f19aca4e3274822f43f49b925eba7e86bb8682963424369bb4ce8b089df32d8fc7fbd294e2d SHA512 0ac1b0a8e599ef0ffe49d8a7b94dd25818601fb5603273ed995b9a4bb52c5e13a360c76b9278bf8a14b8dce5609f33be319c43fa13ee7b16eda897f6c2d39ddf
 DIST seamonkey-2.49.5.0-zh-CN.xpi 946349 BLAKE2B ff8d5dfc671cf51e9af849e7781eb3ada2cda97cc542a8a28306a7c060043752be7614574c0c4882c54dec8a82972a46a7c8bc8085d94a9273264cd15dbfbc83 SHA512 5d3a6accc9deb69b6d52bccca0b52e12b8727d0e6a99067dba52921a147c333b7b777d7dc4935510fb981c9cfae2c4cfc30f310fad9b06e5537ef1dbb89b5e28
 DIST seamonkey-2.49.5.0-zh-TW.xpi 1002365 BLAKE2B e66f68187c0373f96ba8f58f420c8a4c917015e6c38a54a6c80d9cdf4b31620ff3c104ffccc1f4e0f140673b15eefe1742a2b0f3208e00abb4a593322cb1edf9 SHA512 a5797304f4de6edf807238a551676fe9755d9ae0dc0141ea959c6edae8bc742ad11976a2b1cf4f2a324ad6b94c1a97c77e29b8100a679af7002156d1d0150376
-DIST seamonkey-2.49.5.2-cs.xpi 941974 BLAKE2B 4de71b190c63e4284b5915ab3f9f9672026fd2375996df26064598a6e1859f3e9b56c668c63a4741c37471c23dadb6eefc018a1715d7afa3e5ced8477a16eb50 SHA512 c3b061e0b735c6949a0ce7f8be22c7818e6bd039de5284015b0ff63b8456f18bd51db9f3a3d1f9a5df2a6d0610043ea9e33f16ccd3ba64e20ac53e901196afd3
-DIST seamonkey-2.49.5.2-de.xpi 949902 BLAKE2B a51a5ccf0a86708b26c9394cc88d3a05f6108760933b5ccca92d54390090f379ab34b4d90796e77764bcba1fbb20a8ffe56f7cf5ba7aeefc80e0e01d3f5cc86b SHA512 fb85fa867b5b9417190aa25cc678d68e3afed04bfe052896167aaf46042397da6e1bbeb70acc321f46bd0bed4f0856152d80a348b478a336d28825c4120af1c6
-DIST seamonkey-2.49.5.2-en-GB.xpi 911789 BLAKE2B 495cd6fcb8cde5dcbab636bad20e1da5f89dcfb3bbafea12fec1c2fc68bdf9145d533828163884dd25988f792839739a3374a233567820cdf97fb49c44d7228c SHA512 973fc7f693abe9b87bd971f79e050bd4bd9a16e4e6f6a50d9298f2c71d45aa328c4279055382b7f9bf8c807dff9c1ab8855d97dbbe3eb4d71c40ee5e3a02f3b6
-DIST seamonkey-2.49.5.2-es-AR.xpi 952759 BLAKE2B fb882c78290507b7bd349ab01545c7263b983b156c26938fa77565658b55d567d3f057b177b2e98be0d83e5bfb21c3b9bf39f31ecbc4b406739afa6f3af5e5ec SHA512 ec198ed919079e16bf638be032cc7de165d0e9d05d0742a12828b5ad510884d4dd0da57c0cbae85b3fe0089a1be26f42c9887957ab6ecac8b8ef6cf0fbbcb345
-DIST seamonkey-2.49.5.2-es-ES.xpi 897737 BLAKE2B 6ddefeeff9b9d1c96b4dc8d068a179d92a353470329571e8b84962f3c667bdb06cd4f9851a64868958e99412d7eb7f3a3910edf48c4a73c86474283a8268c504 SHA512 e9fb5834f3086ee1cf99404930149f06ee7f3f0d5796550c3368b915ed9f729dbd92032682c6273b687b6f3077a4ca3a78192e101f1276d90ebf2eb71f39f22e
-DIST seamonkey-2.49.5.2-fr.xpi 969290 BLAKE2B ec7bbac2dda87d64486e36a18b18ab89c5940df2134704c5fa5af892c0b9669ff2cea81fb34355d383b6207c0993504afe052c5c435a4a402862a5c814debfe7 SHA512 188f4a8c79b10f95c807a08837290fbc3245c983e6797b8f8a0beea4f4ffad915abeb942920f9986910a0530218f4e35ba16de60b4f21d33116ae16756eb4e8c
-DIST seamonkey-2.49.5.2-hu.xpi 955174 BLAKE2B 60784e962a43bf01630f76693b17954d4788daebb54d29f95ff5f3650ecd78b7067f1af20421d104feffaed10d08dfe1b25f8551969678bd4e1fe9b414a7edcf SHA512 e28beb23242a6535230df4fd1adb82e8957487179402cb82dedc2faa6464b411d22ddb2732e0490a916597301eebf2fda727bcadb34e029bd468bd066dbc3080
-DIST seamonkey-2.49.5.2-it.xpi 793590 BLAKE2B 4c7e837b93a090b3f0934a37bb1c63534dce632839677b0127055502cb7dc57f210c1390afa663ca9c2f4f01196756579750d94b8815de12fc6b2bd9c12a6a19 SHA512 c750a85b74bb37d966f1bbecdafcd6ad9d4532eaf0f49f9148081f821c61aec332646eb7c43f0eef4b736362a8c2ab0a1205a38537129f6fe920dc8ae0f16ca9
-DIST seamonkey-2.49.5.2-ja.xpi 1033801 BLAKE2B 0fb8ebcde8c64f60872d3ed4acd17249c852fb43863e5649cf778dfffde13cdee5ed63af4d66647d4c57a9d456a769b2b43f28cf9637b8b71ffb053dc0f46bee SHA512 454756af04d5d3301c3ffe321109e1c78aa69a3b9e4a29e1b1e7226b958062e451551d73c3df87785fd80e74a4e433fc2094e3702ceb1a547abb858551878056
-DIST seamonkey-2.49.5.2-lt.xpi 956024 BLAKE2B 75ffe875f683e8e47e703574e4a3b73cb2bb764e8163f833208e06b914709acf772734848a2164b94f138dae021c4915e8b20f417132c84197042215548b5b25 SHA512 14124e0b9b60f360f6f2b77b5bafe80569894754a3ffd27b6a3aab34136d7876d785b5e9178cb1d34ec46a7b858f26327658e1a3e43ac97abe272838dde78228
-DIST seamonkey-2.49.5.2-nl.xpi 957391 BLAKE2B 859a5cce26654b3f67d4a340d40b96d66199461250342a699f3186f97edad0347174e87a68a6be21bd6c2ff91497195be98bfb717679d76aa9be2590b809ee9c SHA512 0f3e68df37e211b73773e1b84d39d4540d1d8865cc534bad841babc30c074bb9301cc472aa0e4e61e09bc26948270e1106e1546d27705380819d830ca158215d
-DIST seamonkey-2.49.5.2-pl.xpi 913004 BLAKE2B 8fa4e937c41b6585075f920a778c13d08fcbb6a5759d5371a05d278b5646963d4b8a066aedd60e7521caf354d4ed57e14864d6cb802900284a8be05553ea0e38 SHA512 532b64032b6e4cb902cd9d99ef5505f3ac57964452196f3a9f49eff1bd965c5a8a8271960951482266f12214cce4cad876268f9f38a193f5d91c2644fef0aff8
-DIST seamonkey-2.49.5.2-pt-PT.xpi 939012 BLAKE2B 16bcdbd9c04f023dba7de4e5caaa16f2bbd0bda45625008b909fa360eb98409b21081b892d9e3dcc4fbc5a3ffb1bafc630f2266f69149c70ad96a81025aa7e01 SHA512 f8cac43e61de1d4dfbc0febddcadfa10cc457e7552016c79ff954cddef900470e60912c607076976b15811944a07cd785fbd2ffd85a5af3ce545ec98c12bdc05
-DIST seamonkey-2.49.5.2-ru.xpi 995907 BLAKE2B ce02fd35e093b3f5c2fed309a2fae066e48c7b3351075d55b72751d66b6e13fb13758b8ef4ffa351e85907152ac78a0fb4ced99e2af2993f5906440ba69b0051 SHA512 846f7f361a15ea1b04539ec789dffb459e1fbd85283c720883d6545da67a979e040c80b5cb6a0938f0ca9e059e837310cf3fb2d97671e37ff256ad2ac780291c
-DIST seamonkey-2.49.5.2-sk.xpi 967988 BLAKE2B fd7db86b778be8b1202c031ccb6b18805fc9027f50dd513e3ca0ef2afa1208f5df0b7636c0b6f822fda9618ebe48dc1b16710888284c2d5681e00e4be26c03cf SHA512 8fb02cb8f95c68ce40aabaf79c57bd7c655092dd5fb939d68a62a1bec707b903fbcf16299ff8dd094e161b5f4c732a813d63e33b3ff3ac09f9e1afcf740426d9
-DIST seamonkey-2.49.5.2-sv-SE.xpi 940793 BLAKE2B ec901577f833e69f78d0fba13fe1ee1297105332db66fa5e0c841f19aca4e3274822f43f49b925eba7e86bb8682963424369bb4ce8b089df32d8fc7fbd294e2d SHA512 0ac1b0a8e599ef0ffe49d8a7b94dd25818601fb5603273ed995b9a4bb52c5e13a360c76b9278bf8a14b8dce5609f33be319c43fa13ee7b16eda897f6c2d39ddf
-DIST seamonkey-2.49.5.2-zh-CN.xpi 946349 BLAKE2B ff8d5dfc671cf51e9af849e7781eb3ada2cda97cc542a8a28306a7c060043752be7614574c0c4882c54dec8a82972a46a7c8bc8085d94a9273264cd15dbfbc83 SHA512 5d3a6accc9deb69b6d52bccca0b52e12b8727d0e6a99067dba52921a147c333b7b777d7dc4935510fb981c9cfae2c4cfc30f310fad9b06e5537ef1dbb89b5e28
-DIST seamonkey-2.49.5.2-zh-TW.xpi 1002365 BLAKE2B e66f68187c0373f96ba8f58f420c8a4c917015e6c38a54a6c80d9cdf4b31620ff3c104ffccc1f4e0f140673b15eefe1742a2b0f3208e00abb4a593322cb1edf9 SHA512 a5797304f4de6edf807238a551676fe9755d9ae0dc0141ea959c6edae8bc742ad11976a2b1cf4f2a324ad6b94c1a97c77e29b8100a679af7002156d1d0150376
-DIST seamonkey-2.49.6.0-cs.xpi 941974 BLAKE2B 4de71b190c63e4284b5915ab3f9f9672026fd2375996df26064598a6e1859f3e9b56c668c63a4741c37471c23dadb6eefc018a1715d7afa3e5ced8477a16eb50 SHA512 c3b061e0b735c6949a0ce7f8be22c7818e6bd039de5284015b0ff63b8456f18bd51db9f3a3d1f9a5df2a6d0610043ea9e33f16ccd3ba64e20ac53e901196afd3
-DIST seamonkey-2.49.6.0-de.xpi 949902 BLAKE2B a51a5ccf0a86708b26c9394cc88d3a05f6108760933b5ccca92d54390090f379ab34b4d90796e77764bcba1fbb20a8ffe56f7cf5ba7aeefc80e0e01d3f5cc86b SHA512 fb85fa867b5b9417190aa25cc678d68e3afed04bfe052896167aaf46042397da6e1bbeb70acc321f46bd0bed4f0856152d80a348b478a336d28825c4120af1c6
-DIST seamonkey-2.49.6.0-en-GB.xpi 911789 BLAKE2B 495cd6fcb8cde5dcbab636bad20e1da5f89dcfb3bbafea12fec1c2fc68bdf9145d533828163884dd25988f792839739a3374a233567820cdf97fb49c44d7228c SHA512 973fc7f693abe9b87bd971f79e050bd4bd9a16e4e6f6a50d9298f2c71d45aa328c4279055382b7f9bf8c807dff9c1ab8855d97dbbe3eb4d71c40ee5e3a02f3b6
-DIST seamonkey-2.49.6.0-es-AR.xpi 952759 BLAKE2B fb882c78290507b7bd349ab01545c7263b983b156c26938fa77565658b55d567d3f057b177b2e98be0d83e5bfb21c3b9bf39f31ecbc4b406739afa6f3af5e5ec SHA512 ec198ed919079e16bf638be032cc7de165d0e9d05d0742a12828b5ad510884d4dd0da57c0cbae85b3fe0089a1be26f42c9887957ab6ecac8b8ef6cf0fbbcb345
-DIST seamonkey-2.49.6.0-es-ES.xpi 897737 BLAKE2B 6ddefeeff9b9d1c96b4dc8d068a179d92a353470329571e8b84962f3c667bdb06cd4f9851a64868958e99412d7eb7f3a3910edf48c4a73c86474283a8268c504 SHA512 e9fb5834f3086ee1cf99404930149f06ee7f3f0d5796550c3368b915ed9f729dbd92032682c6273b687b6f3077a4ca3a78192e101f1276d90ebf2eb71f39f22e
-DIST seamonkey-2.49.6.0-fr.xpi 969290 BLAKE2B ec7bbac2dda87d64486e36a18b18ab89c5940df2134704c5fa5af892c0b9669ff2cea81fb34355d383b6207c0993504afe052c5c435a4a402862a5c814debfe7 SHA512 188f4a8c79b10f95c807a08837290fbc3245c983e6797b8f8a0beea4f4ffad915abeb942920f9986910a0530218f4e35ba16de60b4f21d33116ae16756eb4e8c
-DIST seamonkey-2.49.6.0-hu.xpi 955174 BLAKE2B 60784e962a43bf01630f76693b17954d4788daebb54d29f95ff5f3650ecd78b7067f1af20421d104feffaed10d08dfe1b25f8551969678bd4e1fe9b414a7edcf SHA512 e28beb23242a6535230df4fd1adb82e8957487179402cb82dedc2faa6464b411d22ddb2732e0490a916597301eebf2fda727bcadb34e029bd468bd066dbc3080
-DIST seamonkey-2.49.6.0-it.xpi 793590 BLAKE2B 4c7e837b93a090b3f0934a37bb1c63534dce632839677b0127055502cb7dc57f210c1390afa663ca9c2f4f01196756579750d94b8815de12fc6b2bd9c12a6a19 SHA512 c750a85b74bb37d966f1bbecdafcd6ad9d4532eaf0f49f9148081f821c61aec332646eb7c43f0eef4b736362a8c2ab0a1205a38537129f6fe920dc8ae0f16ca9
-DIST seamonkey-2.49.6.0-ja.xpi 1033801 BLAKE2B 0fb8ebcde8c64f60872d3ed4acd17249c852fb43863e5649cf778dfffde13cdee5ed63af4d66647d4c57a9d456a769b2b43f28cf9637b8b71ffb053dc0f46bee SHA512 454756af04d5d3301c3ffe321109e1c78aa69a3b9e4a29e1b1e7226b958062e451551d73c3df87785fd80e74a4e433fc2094e3702ceb1a547abb858551878056
-DIST seamonkey-2.49.6.0-lt.xpi 956024 BLAKE2B 75ffe875f683e8e47e703574e4a3b73cb2bb764e8163f833208e06b914709acf772734848a2164b94f138dae021c4915e8b20f417132c84197042215548b5b25 SHA512 14124e0b9b60f360f6f2b77b5bafe80569894754a3ffd27b6a3aab34136d7876d785b5e9178cb1d34ec46a7b858f26327658e1a3e43ac97abe272838dde78228
-DIST seamonkey-2.49.6.0-nl.xpi 957391 BLAKE2B 859a5cce26654b3f67d4a340d40b96d66199461250342a699f3186f97edad0347174e87a68a6be21bd6c2ff91497195be98bfb717679d76aa9be2590b809ee9c SHA512 0f3e68df37e211b73773e1b84d39d4540d1d8865cc534bad841babc30c074bb9301cc472aa0e4e61e09bc26948270e1106e1546d27705380819d830ca158215d
-DIST seamonkey-2.49.6.0-pl.xpi 913004 BLAKE2B 8fa4e937c41b6585075f920a778c13d08fcbb6a5759d5371a05d278b5646963d4b8a066aedd60e7521caf354d4ed57e14864d6cb802900284a8be05553ea0e38 SHA512 532b64032b6e4cb902cd9d99ef5505f3ac57964452196f3a9f49eff1bd965c5a8a8271960951482266f12214cce4cad876268f9f38a193f5d91c2644fef0aff8
-DIST seamonkey-2.49.6.0-pt-PT.xpi 939012 BLAKE2B 16bcdbd9c04f023dba7de4e5caaa16f2bbd0bda45625008b909fa360eb98409b21081b892d9e3dcc4fbc5a3ffb1bafc630f2266f69149c70ad96a81025aa7e01 SHA512 f8cac43e61de1d4dfbc0febddcadfa10cc457e7552016c79ff954cddef900470e60912c607076976b15811944a07cd785fbd2ffd85a5af3ce545ec98c12bdc05
-DIST seamonkey-2.49.6.0-ru.xpi 995907 BLAKE2B ce02fd35e093b3f5c2fed309a2fae066e48c7b3351075d55b72751d66b6e13fb13758b8ef4ffa351e85907152ac78a0fb4ced99e2af2993f5906440ba69b0051 SHA512 846f7f361a15ea1b04539ec789dffb459e1fbd85283c720883d6545da67a979e040c80b5cb6a0938f0ca9e059e837310cf3fb2d97671e37ff256ad2ac780291c
-DIST seamonkey-2.49.6.0-sk.xpi 967988 BLAKE2B fd7db86b778be8b1202c031ccb6b18805fc9027f50dd513e3ca0ef2afa1208f5df0b7636c0b6f822fda9618ebe48dc1b16710888284c2d5681e00e4be26c03cf SHA512 8fb02cb8f95c68ce40aabaf79c57bd7c655092dd5fb939d68a62a1bec707b903fbcf16299ff8dd094e161b5f4c732a813d63e33b3ff3ac09f9e1afcf740426d9
-DIST seamonkey-2.49.6.0-sv-SE.xpi 940793 BLAKE2B ec901577f833e69f78d0fba13fe1ee1297105332db66fa5e0c841f19aca4e3274822f43f49b925eba7e86bb8682963424369bb4ce8b089df32d8fc7fbd294e2d SHA512 0ac1b0a8e599ef0ffe49d8a7b94dd25818601fb5603273ed995b9a4bb52c5e13a360c76b9278bf8a14b8dce5609f33be319c43fa13ee7b16eda897f6c2d39ddf
-DIST seamonkey-2.49.6.0-zh-CN.xpi 946349 BLAKE2B ff8d5dfc671cf51e9af849e7781eb3ada2cda97cc542a8a28306a7c060043752be7614574c0c4882c54dec8a82972a46a7c8bc8085d94a9273264cd15dbfbc83 SHA512 5d3a6accc9deb69b6d52bccca0b52e12b8727d0e6a99067dba52921a147c333b7b777d7dc4935510fb981c9cfae2c4cfc30f310fad9b06e5537ef1dbb89b5e28
-DIST seamonkey-2.49.6.0-zh-TW.xpi 1002365 BLAKE2B e66f68187c0373f96ba8f58f420c8a4c917015e6c38a54a6c80d9cdf4b31620ff3c104ffccc1f4e0f140673b15eefe1742a2b0f3208e00abb4a593322cb1edf9 SHA512 a5797304f4de6edf807238a551676fe9755d9ae0dc0141ea959c6edae8bc742ad11976a2b1cf4f2a324ad6b94c1a97c77e29b8100a679af7002156d1d0150376
+DIST seamonkey-2.49.7.0-cs.xpi 941974 BLAKE2B 4de71b190c63e4284b5915ab3f9f9672026fd2375996df26064598a6e1859f3e9b56c668c63a4741c37471c23dadb6eefc018a1715d7afa3e5ced8477a16eb50 SHA512 c3b061e0b735c6949a0ce7f8be22c7818e6bd039de5284015b0ff63b8456f18bd51db9f3a3d1f9a5df2a6d0610043ea9e33f16ccd3ba64e20ac53e901196afd3
+DIST seamonkey-2.49.7.0-de.xpi 949902 BLAKE2B a51a5ccf0a86708b26c9394cc88d3a05f6108760933b5ccca92d54390090f379ab34b4d90796e77764bcba1fbb20a8ffe56f7cf5ba7aeefc80e0e01d3f5cc86b SHA512 fb85fa867b5b9417190aa25cc678d68e3afed04bfe052896167aaf46042397da6e1bbeb70acc321f46bd0bed4f0856152d80a348b478a336d28825c4120af1c6
+DIST seamonkey-2.49.7.0-en-GB.xpi 911789 BLAKE2B 495cd6fcb8cde5dcbab636bad20e1da5f89dcfb3bbafea12fec1c2fc68bdf9145d533828163884dd25988f792839739a3374a233567820cdf97fb49c44d7228c SHA512 973fc7f693abe9b87bd971f79e050bd4bd9a16e4e6f6a50d9298f2c71d45aa328c4279055382b7f9bf8c807dff9c1ab8855d97dbbe3eb4d71c40ee5e3a02f3b6
+DIST seamonkey-2.49.7.0-es-AR.xpi 952759 BLAKE2B fb882c78290507b7bd349ab01545c7263b983b156c26938fa77565658b55d567d3f057b177b2e98be0d83e5bfb21c3b9bf39f31ecbc4b406739afa6f3af5e5ec SHA512 ec198ed919079e16bf638be032cc7de165d0e9d05d0742a12828b5ad510884d4dd0da57c0cbae85b3fe0089a1be26f42c9887957ab6ecac8b8ef6cf0fbbcb345
+DIST seamonkey-2.49.7.0-es-ES.xpi 897737 BLAKE2B 6ddefeeff9b9d1c96b4dc8d068a179d92a353470329571e8b84962f3c667bdb06cd4f9851a64868958e99412d7eb7f3a3910edf48c4a73c86474283a8268c504 SHA512 e9fb5834f3086ee1cf99404930149f06ee7f3f0d5796550c3368b915ed9f729dbd92032682c6273b687b6f3077a4ca3a78192e101f1276d90ebf2eb71f39f22e
+DIST seamonkey-2.49.7.0-fr.xpi 969290 BLAKE2B ec7bbac2dda87d64486e36a18b18ab89c5940df2134704c5fa5af892c0b9669ff2cea81fb34355d383b6207c0993504afe052c5c435a4a402862a5c814debfe7 SHA512 188f4a8c79b10f95c807a08837290fbc3245c983e6797b8f8a0beea4f4ffad915abeb942920f9986910a0530218f4e35ba16de60b4f21d33116ae16756eb4e8c
+DIST seamonkey-2.49.7.0-hu.xpi 955174 BLAKE2B 60784e962a43bf01630f76693b17954d4788daebb54d29f95ff5f3650ecd78b7067f1af20421d104feffaed10d08dfe1b25f8551969678bd4e1fe9b414a7edcf SHA512 e28beb23242a6535230df4fd1adb82e8957487179402cb82dedc2faa6464b411d22ddb2732e0490a916597301eebf2fda727bcadb34e029bd468bd066dbc3080
+DIST seamonkey-2.49.7.0-it.xpi 793590 BLAKE2B 4c7e837b93a090b3f0934a37bb1c63534dce632839677b0127055502cb7dc57f210c1390afa663ca9c2f4f01196756579750d94b8815de12fc6b2bd9c12a6a19 SHA512 c750a85b74bb37d966f1bbecdafcd6ad9d4532eaf0f49f9148081f821c61aec332646eb7c43f0eef4b736362a8c2ab0a1205a38537129f6fe920dc8ae0f16ca9
+DIST seamonkey-2.49.7.0-ja.xpi 1033801 BLAKE2B 0fb8ebcde8c64f60872d3ed4acd17249c852fb43863e5649cf778dfffde13cdee5ed63af4d66647d4c57a9d456a769b2b43f28cf9637b8b71ffb053dc0f46bee SHA512 454756af04d5d3301c3ffe321109e1c78aa69a3b9e4a29e1b1e7226b958062e451551d73c3df87785fd80e74a4e433fc2094e3702ceb1a547abb858551878056
+DIST seamonkey-2.49.7.0-lt.xpi 956024 BLAKE2B 75ffe875f683e8e47e703574e4a3b73cb2bb764e8163f833208e06b914709acf772734848a2164b94f138dae021c4915e8b20f417132c84197042215548b5b25 SHA512 14124e0b9b60f360f6f2b77b5bafe80569894754a3ffd27b6a3aab34136d7876d785b5e9178cb1d34ec46a7b858f26327658e1a3e43ac97abe272838dde78228
+DIST seamonkey-2.49.7.0-nl.xpi 957391 BLAKE2B 859a5cce26654b3f67d4a340d40b96d66199461250342a699f3186f97edad0347174e87a68a6be21bd6c2ff91497195be98bfb717679d76aa9be2590b809ee9c SHA512 0f3e68df37e211b73773e1b84d39d4540d1d8865cc534bad841babc30c074bb9301cc472aa0e4e61e09bc26948270e1106e1546d27705380819d830ca158215d
+DIST seamonkey-2.49.7.0-pl.xpi 913004 BLAKE2B 8fa4e937c41b6585075f920a778c13d08fcbb6a5759d5371a05d278b5646963d4b8a066aedd60e7521caf354d4ed57e14864d6cb802900284a8be05553ea0e38 SHA512 532b64032b6e4cb902cd9d99ef5505f3ac57964452196f3a9f49eff1bd965c5a8a8271960951482266f12214cce4cad876268f9f38a193f5d91c2644fef0aff8
+DIST seamonkey-2.49.7.0-pt-PT.xpi 939012 BLAKE2B 16bcdbd9c04f023dba7de4e5caaa16f2bbd0bda45625008b909fa360eb98409b21081b892d9e3dcc4fbc5a3ffb1bafc630f2266f69149c70ad96a81025aa7e01 SHA512 f8cac43e61de1d4dfbc0febddcadfa10cc457e7552016c79ff954cddef900470e60912c607076976b15811944a07cd785fbd2ffd85a5af3ce545ec98c12bdc05
+DIST seamonkey-2.49.7.0-ru.xpi 995907 BLAKE2B ce02fd35e093b3f5c2fed309a2fae066e48c7b3351075d55b72751d66b6e13fb13758b8ef4ffa351e85907152ac78a0fb4ced99e2af2993f5906440ba69b0051 SHA512 846f7f361a15ea1b04539ec789dffb459e1fbd85283c720883d6545da67a979e040c80b5cb6a0938f0ca9e059e837310cf3fb2d97671e37ff256ad2ac780291c
+DIST seamonkey-2.49.7.0-sk.xpi 967988 BLAKE2B fd7db86b778be8b1202c031ccb6b18805fc9027f50dd513e3ca0ef2afa1208f5df0b7636c0b6f822fda9618ebe48dc1b16710888284c2d5681e00e4be26c03cf SHA512 8fb02cb8f95c68ce40aabaf79c57bd7c655092dd5fb939d68a62a1bec707b903fbcf16299ff8dd094e161b5f4c732a813d63e33b3ff3ac09f9e1afcf740426d9
+DIST seamonkey-2.49.7.0-sv-SE.xpi 940793 BLAKE2B ec901577f833e69f78d0fba13fe1ee1297105332db66fa5e0c841f19aca4e3274822f43f49b925eba7e86bb8682963424369bb4ce8b089df32d8fc7fbd294e2d SHA512 0ac1b0a8e599ef0ffe49d8a7b94dd25818601fb5603273ed995b9a4bb52c5e13a360c76b9278bf8a14b8dce5609f33be319c43fa13ee7b16eda897f6c2d39ddf
+DIST seamonkey-2.49.7.0-zh-CN.xpi 946349 BLAKE2B ff8d5dfc671cf51e9af849e7781eb3ada2cda97cc542a8a28306a7c060043752be7614574c0c4882c54dec8a82972a46a7c8bc8085d94a9273264cd15dbfbc83 SHA512 5d3a6accc9deb69b6d52bccca0b52e12b8727d0e6a99067dba52921a147c333b7b777d7dc4935510fb981c9cfae2c4cfc30f310fad9b06e5537ef1dbb89b5e28
+DIST seamonkey-2.49.7.0-zh-TW.xpi 1002365 BLAKE2B e66f68187c0373f96ba8f58f420c8a4c917015e6c38a54a6c80d9cdf4b31620ff3c104ffccc1f4e0f140673b15eefe1742a2b0f3208e00abb4a593322cb1edf9 SHA512 a5797304f4de6edf807238a551676fe9755d9ae0dc0141ea959c6edae8bc742ad11976a2b1cf4f2a324ad6b94c1a97c77e29b8100a679af7002156d1d0150376
 DIST thunderbird-52.5.0.source.tar.xz 230282080 BLAKE2B d55dc086c23813cc116277d532e3f3f99711d7f00be1e09c22d76f021b074d63b1abc8f3814906d73060481857328f0391140484eb1b4c413e8c91fb70003063 SHA512 b9b599e5853887bd518e5a57f6fd04751bb78f553f97b260cd9ba7268c4cff307be40b81b00f1320f5a5156e5c67115595b2d389f931c265d0c3448f56fb8319
-DIST thunderbird-52.5.2.source.tar.xz 230369636 BLAKE2B b1fe2dab986298de590cf7beab9845459ac7582119179599842a4577de7e402d7cdc569dd6b36db017690245df576f96066bf3dfa77be24a35b700559ce56942 SHA512 d626d3d37959539b15b5d2ae4a580fcc160380974bfc1a69a1fc8ff2435932e90a69fa386d5ecb6721d9154603c6b7d063e3368f6f995fea057eb593c06ef4ff
-DIST thunderbird-52.6.0.source.tar.xz 230376180 BLAKE2B cbf1b39f504beb2a862e79ed8e612770cd2f2ca97abb790b8e379be856f9d41fa3a28d15adda69deeb9a3559ef1132dff1f9959c8110374a854f59eff0a9645c SHA512 80742c95ed61d1cb2e72b71bb23bdd211a40240ab4393e9f028a38f902547372084a8f56445e2394484be088a7b9801405f3d6618fb2742601cc968bf34427f0
+DIST thunderbird-52.7.0.source.tar.xz 230410444 BLAKE2B 4c7d10a16f78c2ea791d72f3f99b25556ccfce9448d7b1235403738722aee1c8ad9aa08a21bce3c5a82389d9b4d96ada104950b0168424308f07fa6a939c190b SHA512 875ad6f2b030c65d248ecec4f4a5b51767c3ee7944ac72893237efd2af50145ec2e4a9efa8d60807b78bcfb8189969e5a67d15124710e8b0091f639cddfbfe21
 EBUILD seamonkey-2.49.5.0_p0.ebuild 12777 BLAKE2B acd8d141bde54ef97de914b4e93dc21f778ffd52fee6b3ce7cb10572f43b81893b234246c9daad8345b6fc2c5e59ea27d83abe3a9156098387210eacd5795589 SHA512 d26f680fa5924307f473aa5f1955cc62e19badd328ae4f9d3909de74eae1217596445856bfe2775f37090550dbfd05812df75b28e5faf40677b0bd3e2a588661
-EBUILD seamonkey-2.49.5.2_p0.ebuild 12779 BLAKE2B e13faf9db3c33f0976c38ee690517ed81367a713353ffdf0c6c1a5b0e5a1e9088b37f75b4118984ddd037e3d733934bbc41548872a04ccf3ed8c4dcf64de691c SHA512 3a557932975c1bb0944b0d9a7a696f83c7ea62dfc089b4293dfcbd584b4fc13d8ab227ae309275df986a2f96a4a3f4a9840248ee01ad474922a6efbfe0adf4d8
-EBUILD seamonkey-2.49.6.0_p0.ebuild 12779 BLAKE2B e13faf9db3c33f0976c38ee690517ed81367a713353ffdf0c6c1a5b0e5a1e9088b37f75b4118984ddd037e3d733934bbc41548872a04ccf3ed8c4dcf64de691c SHA512 3a557932975c1bb0944b0d9a7a696f83c7ea62dfc089b4293dfcbd584b4fc13d8ab227ae309275df986a2f96a4a3f4a9840248ee01ad474922a6efbfe0adf4d8
+EBUILD seamonkey-2.49.7.0_p0.ebuild 12779 BLAKE2B e13faf9db3c33f0976c38ee690517ed81367a713353ffdf0c6c1a5b0e5a1e9088b37f75b4118984ddd037e3d733934bbc41548872a04ccf3ed8c4dcf64de691c SHA512 3a557932975c1bb0944b0d9a7a696f83c7ea62dfc089b4293dfcbd584b4fc13d8ab227ae309275df986a2f96a4a3f4a9840248ee01ad474922a6efbfe0adf4d8
 MISC metadata.xml 1882 BLAKE2B e72fa92838230026eaab872a858ba54ccecf47055bff324215219f785e3143daa13984d1f8b2bc746d8a0cc1a07c74a0ee2067f029b92df098431a43588a27a3 SHA512 d533b6033b37fe1410722b2f005a147e1508a2e9a390176a199b15a6464ff5b354ba5ee2542ea243c33b4d4d1e1f91b6e331f9bf43f13b0ef1ceb973e8e9e117
diff --git a/www-client/seamonkey/seamonkey-2.49.6.0_p0.ebuild b/www-client/seamonkey/seamonkey-2.49.6.0_p0.ebuild
deleted file mode 100644
index fdac7c1d5486..000000000000
--- a/www-client/seamonkey/seamonkey-2.49.6.0_p0.ebuild
+++ /dev/null
@@ -1,403 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-WANT_AUTOCONF="2.1"
-
-# This list can be updated with scripts/get_langs.sh from the mozilla overlay
-# note - could not roll langpacks for: ca fi
-#MOZ_LANGS=(ca cs de en-GB es-AR es-ES fi fr gl hu it ja lt nb-NO nl pl pt-PT
-#	    ru sk sv-SE tr uk zh-CN zh-TW)
-MOZ_LANGS=(cs de en-GB es-AR es-ES fr hu it ja lt nl pl pt-PT
-	    ru sk sv-SE zh-CN zh-TW)
-
-MOZ_PV="${PV/_pre*}"
-MOZ_PV="${MOZ_PV/_alpha/a}"
-MOZ_PV="${MOZ_PV/_beta/b}"
-MOZ_PV="${MOZ_PV/_rc/rc}"
-MOZ_PV="${MOZ_PV/_p[0-9]}"
-MOZ_P="${P}"
-MY_MOZ_P="${PN}-${MOZ_PV}"
-
-if [[ ${PV} == *_pre* ]] ; then
-# the following are for upstream build candidates
-	MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/candidates/${MOZ_PV}-candidates/build${PV##*_pre}"
-	MOZ_LANGPACK_PREFIX="linux-i686/xpi/"
-	SRC_URI+=" ${MOZ_HTTP_URI}/source/${MY_MOZ_P}.source.tar.xz -> ${P}.source.tar.xz"
-	S="${WORKDIR}/${MY_MOZ_P}"
-	# And the langpack stuff stays at eclass defaults
-# the following is for self-rolled releases
-	#MOZ_HTTP_URI="https://dev.gentoo.org/~axs/distfiles"
-	#MOZ_LANGPACK_PREFIX="${MY_MOZ_P}."
-	#MOZ_LANGPACK_SUFFIX=".langpack.xpi"
-	#SRC_URI="${SRC_URI}
-	#${MOZ_HTTP_URI}/${P}.source.tar.xz
-	#"
-elif [[ ${PV} == *_p[0-9] ]]; then
-	# gentoo-unofficial release using thunderbird distfiles to build seamonkey instead
-	TB_MAJOR=52
-	SMPV="${PV%.[0-9].*}"
-	MOZ_P="${PN}-${MOZ_PV}"
-	MOZ_HTTP_URI="https://archive.mozilla.org/pub/thunderbird/releases/${MOZ_PV/${SMPV}/${TB_MAJOR}}"
-	#MOZ_GENERATE_LANGPACKS=1
-	#https://dev.gentoo.org/~axs/distfiles/${PN}-${SMPV}-l10n-sources-20170727.tar.xz
-	MOZ_LANGPACK_PREFIX="../../../seamonkey/releases/2.49.1/linux-i686/xpi/"
-	MOZ_LANGPACK_SUFFIX=".xpi"
-	S="${WORKDIR}/thunderbird-${MOZ_PV/${SMPV}/${TB_MAJOR}}"
-	CHATZILLA_VER="SEA2_48_RELBRANCH"
-	INSPECTOR_VER="DOMI_2_0_17"
-	SRC_URI="${SRC_URI}
-	${MOZ_HTTP_URI}/source/thunderbird-${MOZ_PV/${SMPV}/${TB_MAJOR}}.source.tar.xz
-	https://hg.mozilla.org/chatzilla/archive/${CHATZILLA_VER}.tar.bz2 -> chatzilla-${CHATZILLA_VER}.tar.bz2
-	https://hg.mozilla.org/dom-inspector/archive/${INSPECTOR_VER}.tar.bz2 -> dom-inspector-${INSPECTOR_VER}.tar.bz2
-	"
-else
-	MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/releases/${MOZ_PV}"
-	MOZ_LANGPACK_PREFIX="langpack/${MY_MOZ_P}."
-	MOZ_LANGPACK_SUFFIX=".langpack.xpi"
-	S="${WORKDIR}/${PN}-${MOZ_PV}"
-	SRC_URI="${SRC_URI}
-	${MOZ_HTTP_URI}/source/${MY_MOZ_P}.source.tar.xz -> ${P}.source.tar.xz
-	"
-fi
-
-MOZCONFIG_OPTIONAL_GTK3=1
-MOZCONFIG_OPTIONAL_WIFI=1
-inherit check-reqs flag-o-matic toolchain-funcs eutils mozconfig-v6.52 pax-utils xdg-utils autotools mozextension nsplugins mozlinguas-v2
-
-PATCHFF="firefox-52.4-patches-02"
-PATCH="${PN}-2.46-patches-01"
-
-DESCRIPTION="Seamonkey Web Browser"
-HOMEPAGE="http://www.seamonkey-project.org"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86"
-
-SLOT="0"
-LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-IUSE="+calendar +chatzilla +crypt +gmp-autoupdate +ipc jack minimal pulseaudio +roaming selinux test"
-
-SRC_URI+="
-	https://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCHFF}.tar.xz
-	https://dev.gentoo.org/~axs/mozilla/patchsets/${PATCHFF}.tar.xz
-	https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/${PATCHFF}.tar.xz
-	https://dev.gentoo.org/~axs/mozilla/patchsets/${PATCH}.tar.xz
-	https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/${PATCH}.tar.xz
-"
-
-ASM_DEPEND=">=dev-lang/yasm-1.1"
-
-RDEPEND="
-	>=dev-libs/nss-3.28.3
-	>=dev-libs/nspr-4.13.1
-	jack? ( virtual/jack )
-	crypt? ( >=x11-plugins/enigmail-1.9.8.3-r1 )
-"
-
-DEPEND="
-	${RDEPEND}
-	!elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( dev-libs/libexecinfo ) ) )
-	amd64? ( ${ASM_DEPEND}
-		virtual/opengl )
-	x86? ( ${ASM_DEPEND}
-		virtual/opengl )
-"
-
-BUILD_OBJ_DIR="${S}/seamonk"
-
-# allow GMP_PLUGIN_LIST to be set in an eclass or
-# overridden in the enviromnent (advanced hackers only)
-if [[ -z $GMP_PLUGIN_LIST ]] ; then
-	GMP_PLUGIN_LIST=( gmp-gmpopenh264 gmp-widevinecdm )
-fi
-
-pkg_setup() {
-	if [[ ${PV} == *_pre* ]] ; then
-		ewarn "You're using an unofficial release of ${PN}. Don't file any bug in"
-		ewarn "Gentoo's Bugtracker against this package in case it breaks for you."
-		ewarn "Those belong to upstream: https://bugzilla.mozilla.org"
-	fi
-
-	moz_pkgsetup
-}
-
-pkg_pretend() {
-	# Ensure we have enough disk space to compile
-	if use debug || use test ; then
-		CHECKREQS_DISK_BUILD="8G"
-	else
-		CHECKREQS_DISK_BUILD="4G"
-	fi
-	check-reqs_pkg_setup
-}
-
-src_unpack() {
-	unpack ${A}
-
-	# Unpack language packs
-	mozlinguas_src_unpack
-
-	if [[ -n $TB_MAJOR ]]; then
-		# move the irc and inspector code into the correct locations
-		# when we are building from a thunderbird tarball
-		mv "${WORKDIR}"/chatzilla-${CHATZILLA_VER} \
-			"${S}"/mozilla/extensions/irc || die
-		mv "${WORKDIR}"/dom-inspector-${INSPECTOR_VER} \
-			"${S}"/mozilla/extensions/inspector || die
-	fi
-}
-
-src_prepare() {
-	# Apply our patches
-	eapply "${WORKDIR}"/seamonkey
-
-	# browser patches go here
-	pushd "${S}"/mozilla &>/dev/null || die
-	rm -f "${WORKDIR}"/firefox/1000_gentoo_install_dir.patch
-	eapply "${WORKDIR}"/firefox
-	popd &>/dev/null || die
-
-	if grep -q '^sdkdir.*$(MOZ_APP_NAME)-devel' mozilla/config/baseconfig.mk ; then
-		sed '/^sdkdir/s@-devel@@' \
-			-i mozilla/config/baseconfig.mk || die
-	else
-		einfo "baseconfig.mk hackery no longer needed."
-	fi
-
-	# Shell scripts sometimes contain DOS line endings; bug 391889
-	grep -rlZ --include="*.sh" $'\r$' . |
-	while read -r -d $'\0' file ; do
-		einfo edos2unix "${file}"
-		edos2unix "${file}"
-	done
-
-	# force a version update that matches the minor and patch version of thunderbird
-	if [[ -n ${TB_MAJOR} ]]; then
-		echo ${MOZ_PV} >"${S}"/suite/config/version.txt
-	fi
-
-	# Allow user to apply any additional patches without modifing ebuild
-	eapply_user
-
-	local ms="${S}/mozilla"
-
-	# Enable gnomebreakpad
-	if use debug ; then
-		sed -i -e "s:GNOME_DISABLE_CRASH_DIALOG=1:GNOME_DISABLE_CRASH_DIALOG=0:g" \
-			"${ms}"/build/unix/run-mozilla.sh || die "sed failed!"
-	fi
-
-	# Ensure that are plugins dir is enabled as default
-	sed -i -e "s:/usr/lib/mozilla/plugins:/usr/lib/nsbrowser/plugins:" \
-		"${ms}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 32bit!"
-	sed -i -e "s:/usr/lib64/mozilla/plugins:/usr/lib64/nsbrowser/plugins:" \
-		"${ms}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 64bit!"
-
-	# Don't exit with error when some libs are missing which we have in
-	# system.
-	sed '/^MOZ_PKG_FATAL_WARNINGS/s@= 1@= 0@' \
-		-i "${S}"/suite/installer/Makefile.in || die
-	# Don't error out when there's no files to be removed:
-	sed 's@\(xargs rm\)$@\1 -f@' \
-		-i "${ms}"/toolkit/mozapps/installer/packager.mk || die
-
-	# Don't build libs-% locale files for chatzilla if we are not building chatzilla
-	# (this is hard-coded in the build system at present rather than being based on configuration)
-	use chatzilla || sed '/extensions\/irc\/locales libs-/s@^@#@' \
-		-i "${S}"/suite/locales/Makefile.in || die
-
-	eautoreconf old-configure.in
-	cd "${S}"/mozilla || die
-	eautoconf old-configure.in
-	cd "${S}"/mozilla/js/src || die
-	eautoconf old-configure.in
-	cd "${S}"/mozilla/memory/jemalloc/src || die
-	WANT_AUTOCONF= eautoconf
-}
-
-src_configure() {
-	MEXTENSIONS="default"
-	# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
-	# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
-	# get your own set of keys.
-	_google_api_key=AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc
-
-	####################################
-	#
-	# mozconfig, CFLAGS and CXXFLAGS setup
-	#
-	####################################
-
-	mozconfig_init
-	mozconfig_config
-
-	# enable JACK, bug 600002
-	mozconfig_use_enable jack
-
-	# It doesn't compile on alpha without this LDFLAGS
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	if ! use chatzilla ; then
-		MEXTENSIONS+=",-irc"
-	fi
-	if ! use roaming ; then
-		MEXTENSIONS+=",-sroaming"
-	fi
-
-	# Setup api key for location services
-	echo -n "${_google_api_key}" > "${S}"/google-api-key
-	mozconfig_annotate '' --with-google-api-keyfile="${S}/google-api-key"
-
-	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
-
-	# Other sm-specific settings
-	mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
-	mozconfig_annotate '' --enable-safe-browsing
-	mozconfig_use_enable calendar
-
-	mozlinguas_mozconfig
-
-	# Use an objdir to keep things organized.
-	echo "mk_add_options MOZ_OBJDIR=${BUILD_OBJ_DIR}" >> "${S}"/.mozconfig
-	echo "mk_add_options XARGS=/usr/bin/xargs" >> "${S}"/.mozconfig
-
-	# Finalize and report settings
-	mozconfig_final
-
-	# Work around breakage in makeopts with --no-print-directory
-	MAKEOPTS="${MAKEOPTS/--no-print-directory/}"
-
-	if [[ $(gcc-major-version) -lt 4 ]] ; then
-		append-cxxflags -fno-stack-protector
-	elif [[ $(gcc-major-version) -gt 4 || $(gcc-minor-version) -gt 3 ]] ; then
-		if use amd64 || use x86 ; then
-			append-flags -mno-avx
-		fi
-	fi
-
-	# workaround for funky/broken upstream configure...
-	SHELL="${SHELL:-${EPREFIX%/}/bin/bash}" \
-	emake V=1 -f client.mk configure
-}
-
-src_compile() {
-	MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL}" \
-	emake V=1 -f client.mk
-
-	mozlinguas_src_compile
-}
-
-src_install() {
-	MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
-	DICTPATH="\"${EPREFIX}/usr/share/myspell\""
-
-	local emid
-	cd "${BUILD_OBJ_DIR}" || die
-
-	# Pax mark xpcshell for hardened support, only used for startupcache creation.
-	pax-mark m "${BUILD_OBJ_DIR}/dist/bin/xpcshell"
-
-	# Copy our preference before omnijar is created.
-	sed "s|SEAMONKEY_PVR|${PVR}|" "${FILESDIR}"/all-gentoo-1.js > \
-		"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" \
-		|| die
-
-	# Set default path to search for dictionaries.
-	echo "pref(\"spellchecker.dictionary_path\", ${DICTPATH});" \
-		>> "${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" \
-		|| die
-
-	echo 'pref("extensions.autoDisableScopes", 3);' >> \
-		"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" \
-		|| die
-
-	local plugin
-	if ! use gmp-autoupdate ; then
-		for plugin in "${GMP_PLUGIN_LIST[@]}" ; do
-			echo "pref(\"media.${plugin}.autoupdate\", false);" >> \
-				"${S}/${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
-				|| dir
-		done
-	fi
-
-	MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX%/}/bin/bash}" \
-	emake DESTDIR="${D}" install
-	cp "${FILESDIR}"/${PN}.desktop "${T}" || die
-
-	sed 's|^\(MimeType=.*\)$|\1text/x-vcard;text/directory;application/mbox;message/rfc822;x-scheme-handler/mailto;|' \
-		-i "${T}"/${PN}.desktop || die
-	sed 's|^\(Categories=.*\)$|\1Email;|' -i "${T}"/${PN}.desktop \
-		|| die
-
-	# Install language packs
-	mozlinguas_src_install
-
-	# Add StartupNotify=true bug 290401
-	if use startup-notification ; then
-		echo "StartupNotify=true" >> "${T}"/${PN}.desktop || die
-	fi
-
-	# Install icon and .desktop for menu entry
-	newicon "${S}"/suite/branding/nightly/content/icon64.png ${PN}.png
-	domenu "${T}"/${PN}.desktop
-
-	# Required in order to use plugins and even run seamonkey on hardened.
-	pax-mark m "${ED}"${MOZILLA_FIVE_HOME}/{seamonkey,seamonkey-bin,plugin-container}
-
-	if use minimal ; then
-		rm -rf "${ED}"/usr/include "${ED}${MOZILLA_FIVE_HOME}"/{idl,include,lib,sdk}
-	fi
-
-	if use chatzilla ; then
-		local emid='{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}'
-
-		# remove the en_US-only xpi file so a version with all requested locales can be installed
-		if [[ -e "${ED}"${MOZILLA_FIVE_HOME}/distribution/extensions/${emid}.xpi ]]; then
-			rm -f "${ED}"${MOZILLA_FIVE_HOME}/distribution/extensions/${emid}.xpi || die
-		fi
-
-		# merge the extra locales into the main extension
-		mozlinguas_xpistage_langpacks "${BUILD_OBJ_DIR}"/dist/xpi-stage/chatzilla
-
-		# install the merged extension
-		mkdir -p "${T}/${emid}" || die
-		cp -RLp -t "${T}/${emid}" "${BUILD_OBJ_DIR}"/dist/xpi-stage/chatzilla/* || die
-		insinto ${MOZILLA_FIVE_HOME}/distribution/extensions
-		doins -r "${T}/${emid}"
-	fi
-
-	# Handle plugins dir through nsplugins.eclass
-	share_plugins_dir
-
-	# revdep-rebuild entry
-	insinto /etc/revdep-rebuild
-	echo "SEARCH_DIRS_MASK=${MOZILLA_FIVE_HOME}*" >> ${T}/11${PN}
-	doins "${T}"/11${PN}
-}
-
-pkg_preinst() {
-	MOZILLA_FIVE_HOME="${ROOT}/usr/$(get_libdir)/${PN}"
-
-	if [ -d ${MOZILLA_FIVE_HOME}/plugins ] ; then
-		rm ${MOZILLA_FIVE_HOME}/plugins -rf
-	fi
-}
-
-pkg_postinst() {
-	MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
-
-	# Update mimedb for the new .desktop file
-	xdg_desktop_database_update
-	#gnome2_icon_cache_update
-
-	if ! use gmp-autoupdate ; then
-		elog "USE='-gmp-autoupdate' has disabled the following plugins from updating or"
-		elog "installing into new profiles:"
-		local plugin
-		for plugin in "${GMP_PLUGIN_LIST[@]}"; do elog "\t ${plugin}" ; done
-	fi
-
-	if use chatzilla ; then
-		elog "chatzilla is now an extension which can be en-/disabled and configured via"
-		elog "the Add-on manager."
-	fi
-}
diff --git a/www-client/seamonkey/seamonkey-2.49.5.2_p0.ebuild b/www-client/seamonkey/seamonkey-2.49.7.0_p0.ebuild
index fdac7c1d5486..fdac7c1d5486 100644
--- a/www-client/seamonkey/seamonkey-2.49.5.2_p0.ebuild
+++ b/www-client/seamonkey/seamonkey-2.49.7.0_p0.ebuild
diff --git a/www-plugins/Manifest.gz b/www-plugins/Manifest.gz
index 8fa64b4c5610..8c3d422960cc 100644
--- a/www-plugins/Manifest.gz
+++ b/www-plugins/Manifest.gz
diff --git a/www-plugins/chrome-binary-plugins/Manifest b/www-plugins/chrome-binary-plugins/Manifest
index aad9d4336aee..678801ba584c 100644
--- a/www-plugins/chrome-binary-plugins/Manifest
+++ b/www-plugins/chrome-binary-plugins/Manifest
@@ -1,7 +1,7 @@
 DIST google-chrome-beta_66.0.3359.45-1_amd64.deb 53277754 BLAKE2B 88f410a3c44eb3ced01a7a81ecd94f42047c9b251b967a414e143dff1e688e67b69d1767df84cac01dc43451fec0356ac66762ddb95464dfaaacd18496948e46 SHA512 2ab0ab4970fa3d0ad0228287c9ef4839efb35bbd4b28877f6d6d2924d35c98ee52b112f23e8a64b041a547ccde38baf428df6c76cc410a661bf6860d7716db39
 DIST google-chrome-stable_65.0.3325.181-1_amd64.deb 52132868 BLAKE2B 8a40527aa5c6b6f82ed5ec0436a1887989029e514d90306b8d459ed71740fd7184cf5f4c6b0427b41e15b32cc7176c7cacfd3cb34270cc2ee0e0e6c677962e6f SHA512 b80a02753ca302967dadbfc3336eab8577ff3940fea1270454c43c6bf26bd64bc6178e8d70a44aa418a3ace47cabf49d7da918d806d2957415fffb78b7faf98b
-DIST google-chrome-unstable_67.0.3371.0-1_amd64.deb 53414772 BLAKE2B fd7cc9cda00b82b447e976b0f65f3db302f832d0288700254a731d6731784becd0008ba631e713e594c667a8a182c676e16acde279f170cf910dcf876bc730f7 SHA512 bf460bf14c3535e2bbd16c40e4e221aea7b1690a9570c31f977910fa875feb03e638514f2610f41b4aaf4402f1211ae1c89f69834a9a6d180cb2fe99fadab3a8
+DIST google-chrome-unstable_67.0.3377.1-1_amd64.deb 53591960 BLAKE2B 7fa2e92b9fb9ab5a194d97da2a6385ada58590f8563d2ee706653a279a79cdaa6f924e7270e20ba2552f75d40659e751937378b9d9e820c06398b0299ef4df99 SHA512 4459dd494581acfe8abfb98768201555b794ba02bcb69dc8ad9baeb253ed4da8b7f6257a60e72c203b4073b5585431066b90ac11a78140b16fce45ce8336fe58
 EBUILD chrome-binary-plugins-65.0.3325.181.ebuild 1438 BLAKE2B 25df8bdde008f7711eb41c4f616ba55ad4fee20604ba67ffd3e0b55b016896b1e71258cd894f1060e69b3ba65499ed16218bc835f5bff1318fe6529c01e9b8da SHA512 bf8818ec496fb2be1edda7f6e84920e048f8f7017e53a4d14bd52329b458f38efd2d5cc3b39190385a5e0926c8cbd6f73f2433c7abd259fdb70d51e0e245c0bb
 EBUILD chrome-binary-plugins-66.0.3359.45_beta.ebuild 1439 BLAKE2B 5f77619a2d3be3c2840d7f0dd9e4e5b74fb89d9218e04c61c49047155c4124efcf6b78b4549207ed0211dbc27f4fe57626511e5f1dcc6daed062aefdc2481b17 SHA512 265ee07635c092c6c7d84b1e6276730416f87e513bfbfa70b5943a2790aa62ba4c4b184fb772794fc4e9e9765dc86099665a50d339a89b2ac360176493a2ef9f
-EBUILD chrome-binary-plugins-67.0.3371.0_alpha.ebuild 1439 BLAKE2B 5f77619a2d3be3c2840d7f0dd9e4e5b74fb89d9218e04c61c49047155c4124efcf6b78b4549207ed0211dbc27f4fe57626511e5f1dcc6daed062aefdc2481b17 SHA512 265ee07635c092c6c7d84b1e6276730416f87e513bfbfa70b5943a2790aa62ba4c4b184fb772794fc4e9e9765dc86099665a50d339a89b2ac360176493a2ef9f
+EBUILD chrome-binary-plugins-67.0.3377.1_alpha.ebuild 1308 BLAKE2B 604e15f5d5ba5fa9cb343e4a409a463ffaf15dc05f53f4af4dc165a127101dfaf642f24f2cff55e313376e90f30a4490727edb55350e1aeec1cc12e6e691a4b1 SHA512 4c374994bf51ea3791ed328846709be41540027fd5a1f57a991c462a04962e00240132ae00010f592098ff6869408488e1a3b6c36b69dfe553d36b8296c5c4be
 MISC metadata.xml 341 BLAKE2B da1d1a85bb21e659671b98e12d0b3b31760dab269f8d298b44923f6936a4c43a27b67bff50adf76cb883460d5fe3112027d9b678826eeb220448cd114805320e SHA512 253960d995af2946bafa0bcd96a874e50197aa629efd0dfe7ce404dc72180a2298119b9cabd0b605c65b0894fe0316f7b3bdab602bdfade4323a0bdd70311fdd
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-67.0.3371.0_alpha.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-67.0.3377.1_alpha.ebuild
index e94c35d47021..f2cb5723b3da 100644
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-67.0.3371.0_alpha.ebuild
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-67.0.3377.1_alpha.ebuild
@@ -54,8 +54,7 @@ pkg_nofetch() {
 src_install() {
 	insinto /usr/$(get_libdir)/chromium
 	if use widevine; then
-		doins libwidevinecdm.so libwidevinecdmadapter.so
+		doins libwidevinecdm.so
 		dosym ../chromium/libwidevinecdm.so /usr/$(get_libdir)/chromium-browser/libwidevinecdm.so
-		dosym ../chromium/libwidevinecdmadapter.so /usr/$(get_libdir)/chromium-browser/libwidevinecdmadapter.so
 	fi
 }
diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index 239a71670046..b3036cc1e0f6 100644
--- a/www-servers/Manifest.gz
+++ b/www-servers/Manifest.gz
diff --git a/www-servers/puma/Manifest b/www-servers/puma/Manifest
index 47fab39293a9..eedc887a24e3 100644
--- a/www-servers/puma/Manifest
+++ b/www-servers/puma/Manifest
@@ -3,7 +3,7 @@ DIST puma-3.11.0.tar.gz 207387 BLAKE2B b95af60358a9e6877eec34b4cab80c00512e6f9c5
 DIST puma-3.11.2.tar.gz 207895 BLAKE2B f7a36112f70e63467569354f5ee5e81e1a62ab457099228f7c43c25bd51a8f8aa6de7e02c71222d23c3dc6b5e726c3210e46052d03ae376d533332942b1daa2f SHA512 a10fc17585f38ea31c213cfde109fb21415257d2a6ab8863091baee49e94916b20ffc47f8aa961ab2b2d5d0672a0ad4a279bc9b2549062842accb6cd39cf922c
 DIST puma-3.11.3.tar.gz 207993 BLAKE2B a1d46e531664e04b738840ce8f393721a9a0af113b4796ac24050859973e04f1d36a5494c1245ad24fbb3de54fae00caf908357114499db808342c471a73ccf3 SHA512 315ff78e302fcee5ac404167d40d7a831b584c21aa34cce55a13cd4f2beeafa62a4ae68b2e394f3f4d0ce50cf680bdf8437e5fe6cd541964db2d5838bc8c8469
 EBUILD puma-3.10.0.ebuild 1990 BLAKE2B 7cf571a2ee2c7564a145a9fae7b60320b961afacd25bd942d63fe3c45bdf9205b9fd6f1116b7e9ae6d145814b837c3841c873f9d485bf64a0927d88e1258d41c SHA512 edd7914b0140cbcdb70765e392c215e74c5621f134ee0cc0cb744041e61f9d6d7b8b7dee12f13c538cc2d9b0d99e17a00501f08b18b4086ac435de5eb16ca0e0
-EBUILD puma-3.11.0.ebuild 1987 BLAKE2B ac34f1016971ab6b3714ea5eeaef2a3f0a9f0f850e032fdd3f20b1616569209b2957f263978e62a8318bc2c5c24781b298660c910cec234f3aadc206be33f6ec SHA512 acbac93e89a463c14a2ff094b806a5c64d1536abbd74e6f210543cfc9de650911ac3fe6a094d1e8e8b9a01ee51f2d0913d7cdb5d87276d4ee20f45111d4e9331
-EBUILD puma-3.11.2.ebuild 1988 BLAKE2B 6ba28faf4bcfd0685154eac021c200803652e7493e4459e34b20fc9edc0e3fadcb517343e36f42913921a57c33a504f9767b7fb54455c93a97f11132a22d0952 SHA512 3f5f3f8cca0bd1f2e863551362103e73340e62d4d5053e3fe89085fcc5eb0dceab5f5a840b1c191ba5b09d5f4c60c7f085a3d1a8dbb904d1eee3494b260244bb
-EBUILD puma-3.11.3.ebuild 1989 BLAKE2B f0c92811038f830c3c274edb2950b1b066f0e8398870608e1e7af4674534261bcb67356ebc140d16082f4aa8bf77b374290e3722568acc430cb4848571fee0ae SHA512 9392216273e030caf661d5fc04d0fbbcf46818bdc35126e5178dddc356d2c83cc367786b0e13e938b45fae5dfc651d708692bcb56dfbacaa10297615e185ef96
+EBUILD puma-3.11.0.ebuild 1992 BLAKE2B 37ba17dfaeb4269c59a9fa5b71450a531558fd395845fd53451c9bce9777a16b98df166b5dc33716a280df9c9324c546d3f10f5b18c92d4926d761bf46751482 SHA512 1d845a3bc23a9a32a8f239658920abfbc003ab59fbeb87407df71b15a951b94e4bd5061e5e1dd8aeac8efc60deba66f3a1edc39601be5aa21b511965ee054b5f
+EBUILD puma-3.11.2.ebuild 1993 BLAKE2B 22ef34098bef7d3e837faab92ca16e266f4f7b4ec354d9fb8a7e26bd11d9713712280dbc0c2a0795ac583bd54e1a624ddc85c33eca8a2c6bcda6611666de0fe6 SHA512 d43a62d30611d11ac967161e0dc6add0d9313ddbd1936b8dde69221a83e55985d27728278c9d73af95d29fcd50c6ab96b2084703bb3ea0d27e641420b0ab6699
+EBUILD puma-3.11.3.ebuild 1994 BLAKE2B 39e2dafb040f78fe4d61b310ee556f0e98b4183311058c864c534c90eb0c6bc2f0bdbd27e4bca7faa4d380cd8e726bd77842f2548f41b96b4e2f7489293b1c77 SHA512 abc7d343664a4044183bed0fc40f1d38ba613b352f47cd9a93da2c116ba88a0ef535d6905fe82654b0490d90365c9a3b4091f416be110778f16a1e0484cb06ec
 MISC metadata.xml 709 BLAKE2B f0a69d0e7f4c5e593ff5648b51de393610f579fd9fff372749fca4491e8dd57b7e853f87104e8b86f8e90013fe54f8c3141e28ae87d17432e60f329f51a67db6 SHA512 dd872907d8e164d0b63f1b4db076d9407c33581ae80ecafb119904ceebe4c05eb74d01d51c3217cf475faf02d3732e9854553fc980c1b054c42b95af58ee1c0e
diff --git a/www-servers/puma/puma-3.11.0.ebuild b/www-servers/puma/puma-3.11.0.ebuild
index 85adf53ab7b2..adbb12cdd78e 100644
--- a/www-servers/puma/puma-3.11.0.ebuild
+++ b/www-servers/puma/puma-3.11.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/puma/puma/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="3"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~x86"
 IUSE=""
 
 DEPEND+=" dev-libs/openssl:0 test? ( net-misc/curl )"
diff --git a/www-servers/puma/puma-3.11.2.ebuild b/www-servers/puma/puma-3.11.2.ebuild
index a1c02c3635ee..7bac95567283 100644
--- a/www-servers/puma/puma-3.11.2.ebuild
+++ b/www-servers/puma/puma-3.11.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/puma/puma/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="3"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~x86"
 IUSE=""
 
 DEPEND+=" dev-libs/openssl:0 test? ( net-misc/curl )"
diff --git a/www-servers/puma/puma-3.11.3.ebuild b/www-servers/puma/puma-3.11.3.ebuild
index 3108c2d040ec..b12e2ecfc137 100644
--- a/www-servers/puma/puma-3.11.3.ebuild
+++ b/www-servers/puma/puma-3.11.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/puma/puma/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="3"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~x86"
 IUSE=""
 
 DEPEND+=" dev-libs/openssl:0 test? ( net-misc/curl )"
diff --git a/x11-base/Manifest.gz b/x11-base/Manifest.gz
index 45ad1d2c357b..6cdf3702a485 100644
--- a/x11-base/Manifest.gz
+++ b/x11-base/Manifest.gz
diff --git a/x11-base/xorg-proto/Manifest b/x11-base/xorg-proto/Manifest
index 2224809f9656..24be885f83e7 100644
--- a/x11-base/xorg-proto/Manifest
+++ b/x11-base/xorg-proto/Manifest
@@ -1,4 +1,4 @@
 DIST xorgproto-2018.4.tar.gz 493597 BLAKE2B f25a637317ff2d7ba34d416368261b5afb617e42a1fb642cc78ab3e877752a81291fe0523d1af6cd0fe27399676b14a70ceea7178d521187423bb503c9b1c63b SHA512 f79a47fc3de04d7258769869c11e99eff7fa4a4b5925cf60f9f7579f946d7d0e737224e9a54d18e439a3586126e66e0764c0f09ed50987c781955b9b9a1e0362
-EBUILD xorg-proto-2018.4.ebuild 1803 BLAKE2B 24ff1ef4938526eb8d38ce6c1c72124880002a98d2f7585d3e0e8aff46fdbd326773aa08c45924eaf73b3f9fa31735f88b3a8613e3c1cfc10a483eb38b7013e1 SHA512 eb1eab410e490a7e645b58b01939a8bb00e0f597befe1e7f916769c5d11ce0a6367c76419b6c221ad485e51c14136d84bd6e4fbf903aa35d4affde47bee000c8
+EBUILD xorg-proto-2018.4.ebuild 1802 BLAKE2B c95fe9fcfe60ef60efeb18a2cf4dd87a04ef09dfd8904669f1dfa0e7717b4896788e0d5de61221442d9866d371573e7070a7c860164c0cac5035730adeb9232e SHA512 084eded0addc3657fa6df63e29f3732c49cad2c289874c8299f5df09ce63908b9598a4522557bf893ed21c3855baac1a555efb93ca4bf85795345c8c65523869
 EBUILD xorg-proto-9999.ebuild 1779 BLAKE2B 80ae4a59428a02d2cd6d282b46eabfb9d5722a4e131303ec99c648f03d24431ba430468d570fc9099fbf012d83236f4211f9b88238ba50e0fa77e7dd0b016491 SHA512 f5cbce5ea638fb9c0520c5572e0fc39c47ed3b2c3cfd6fe105d2641136f240acd377bfaf9efc336decaf3670ef31b0bfd0d67e1305966a0a0279450d3383f685
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-base/xorg-proto/xorg-proto-2018.4.ebuild b/x11-base/xorg-proto/xorg-proto-2018.4.ebuild
index 4ba51d6d8b2d..b35ef258e35a 100644
--- a/x11-base/xorg-proto/xorg-proto-2018.4.ebuild
+++ b/x11-base/xorg-proto/xorg-proto-2018.4.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="https://cgit.freedesktop.org/xorg/proto/xorgproto/"
 if [[ ${PV} = 9999* ]]; then
 	SRC_URI=""
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x64-solaris"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x64-solaris"
 	SRC_URI="https://xorg.freedesktop.org/archive/individual/proto/${MY_P}.tar.gz"
 	S="${WORKDIR}/${MY_P}"
 fi
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index ba6b893381c7..b78cee54004c 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/gksu/Manifest b/x11-libs/gksu/Manifest
index 60976619e5e9..36f421dab1fc 100644
--- a/x11-libs/gksu/Manifest
+++ b/x11-libs/gksu/Manifest
@@ -2,6 +2,5 @@ AUX gksu-2.0.2-format_security.patch 1341 BLAKE2B 1ceb3ec4f117201d86cf0d110278ec
 AUX gksu-2.0.2-glib-2.31.patch 870 BLAKE2B 63a65cb59c467b17eca4d69c824a83b5990819c214ae652a9fd368e2ceb4056021025503803d437e82114a7d1eb5929aec301bdd616befde47f6e7a8e8391471 SHA512 1ba77b6eef71629c6552766ebdf42271826b63bd124f38086187be4b8756ccfbd985127f10b35a4628d25f41fbaa7be89895a20241282476131da9486a0dbcbe
 AUX gksu-2.0.2-nautilus-dir.patch 2640 BLAKE2B 52eacaab2e59a45aa78e76760f720a7a9da3e03264176ae29446edab0e60292b50fcd4d34365feafead5ea5378b805fc080fa8728bc78965625005c952c48cd5 SHA512 d96e36ea8a9e03808214f5e8cc73eb2aef5f663ff0035c4eab854f8f7d313055d9e2b9058abc7b84adb5657e7a390d8e44b42953c7d8304377400b341a50729b
 DIST gksu-2.0.2.tar.gz 468121 BLAKE2B 42324abed0d79eb00454d23a95b356b023a25e39e1119860d7f271f56b34716e4d4f9084156beb526379fdd9bbe25f2c8591e56e40238d3a79e7b3d8ff4fca58 SHA512 8afde61e10c8a22bef3c8a5c2d90bd599d00ad9b71b30b2edc9c114be91ca8456e1af5c9db03fe02416424e50aa20c23eaefb2a8fd1db77aac37da7e85604f75
-EBUILD gksu-2.0.2-r1.ebuild 2258 BLAKE2B cad0f8890779df52a84d176d0b8110797f04419e39a7a6f1143e6f8b39cbf01f32d06f70bae1933798fd0dc0483d46a6ecb54445b6728ecbc5588e45e8648c51 SHA512 08064d119d87d09c591e475daed04f7b3eefa36b0e0e69d695545c230aae5da045e13bcf391841d7818b9fbd18ecb3433ce61727c329a0788deff0d621a710e9
 EBUILD gksu-2.0.2-r2.ebuild 2296 BLAKE2B a91cfed566e8ca6ded271cb041dc1091006c8c46416980633558a602d2b197ff418143e9c7c88945b5cc5f321b216d1318a9ed269042bef73127aff2554d05e9 SHA512 8d52885bcf6974b9337fd3320b68c85920e3ae3f53149ccd4bbd96ea8efdfc9cbc0dd90d401259412fd1efbd023e2795b594a1804bb8bd816de3df1b6d723991
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/x11-libs/gksu/gksu-2.0.2-r1.ebuild b/x11-libs/gksu/gksu-2.0.2-r1.ebuild
deleted file mode 100644
index 6032ee3cb1a8..000000000000
--- a/x11-libs/gksu/gksu-2.0.2-r1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit autotools eutils gnome2 fixheadtails
-
-DESCRIPTION="A gtk+ frontend for libgksu"
-HOMEPAGE="http://www.nongnu.org/gksu/"
-SRC_URI="http://people.debian.org/~kov/gksu/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE="doc gnome"
-
-RDEPEND=">=x11-libs/libgksu-2.0.8
-	>=x11-libs/gtk+-2.4:2
-	>=gnome-base/gconf-2
-	gnome? (
-		>=gnome-base/nautilus-2
-		x11-terms/gnome-terminal )"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig
-	doc? ( dev-util/gtk-doc )"
-
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog NEWS README"
-	G2CONF="${G2CONF}
-		--disable-static
-		$(use_enable gnome nautilus-extension)"
-}
-
-src_prepare() {
-	ht_fix_file "${S}/gksu-migrate-conf.sh"
-
-	# https://savannah.nongnu.org/bugs/index.php?36127
-	epatch "${FILESDIR}/${PN}-2.0.2-glib-2.31.patch"
-
-	if use gnome ; then
-		sed 's/x-terminal-emulator/gnome-terminal/' \
-			-i gksu.desktop || die "sed 1 failed"
-
-		# Conditional patch to avoid eautoreconf
-		# https://savannah.nongnu.org/bugs/index.php?36129
-		epatch "${FILESDIR}/${PN}-2.0.2-nautilus-dir.patch"
-
-		sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die #467024
-		eautoreconf
-	else
-		sed 's/dist_desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)/dist_desktop_DATA =/' \
-			-i Makefile.am Makefile.in || die "sed 2 failed"
-	fi
-
-	gnome2_src_prepare
-}
-
-src_install() {
-	gnome2_src_install
-	chmod +x "${D}/usr/share/gksu/gksu-migrate-conf.sh"
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	einfo 'updating configuration'
-	"${ROOT}"/usr/share/gksu/gksu-migrate-conf.sh
-	einfo ""
-	einfo "A note on gksudo:  It actually runs sudo to get it's work done"
-	einfo "However, by default, Gentoo's sudo wipes your environment."
-	einfo "This means that gksudo will fail to run any X-based programs."
-	einfo "You need to either add yourself to wheel and uncomment this line"
-	einfo "in your /etc/sudoers:"
-	einfo "Defaults:%wheel   !env_reset"
-	einfo "Or remove the env_reset line entirely.  This can cause security"
-	einfo "problems; if you don't trust your users, don't do this, use gksu"
-	einfo "instead."
-}
diff --git a/x11-libs/libast/Manifest b/x11-libs/libast/Manifest
index c786af596e92..61ff185921d6 100644
--- a/x11-libs/libast/Manifest
+++ b/x11-libs/libast/Manifest
@@ -1,5 +1,5 @@
 DIST libast-0.7.tar.gz 508654 BLAKE2B 0c5bf31d5b73fe11d4665bc0d8e1c9a987b944fcdcd89106a47ebf01eb90c2895b3e74e39874b360e91f027b8beaf5698363e9920ad879bfd241b13ef0232870 SHA512 0af1d508af88ce0a2f29fe7841e23759be7c6540a1e2698980c289245ba284fdbf76c593e457c0cd6cfc54dcb6d891b01a3fd4d4a6ecc511fb2de698c9a3046d
-EBUILD libast-0.7-r1.ebuild 954 BLAKE2B 5a839bebd89af5f9a6c57ed1e74051e790f1640ebf5476de1ac92ebeb9691c2f9ea19b06740981c4dd5b2fb5d83eef957371bad5d5dbe8add942c88f6989c4c5 SHA512 24495307eed6e2fdf0d1411273ff22d089a4c29c1a771569554e14b970c313729776c4068eaba7d8389803df4fc7e3b4a38bdc5c53f40fb4991270487b2b613a
+EBUILD libast-0.7-r1.ebuild 953 BLAKE2B abf03af30830dc7bd2a77f8f6046afba8ebff4693da2d479f5ff546e8436564691fdc0b1c46b02e4b15d637e926f3d2005bdcc265e1fc8dd5be4562f9650de39 SHA512 aa481eccdd64e798cad1a7ddb6fb3c378f51ce576bbd28121e7def0c2707fe592bb6ebe1d7685b9a0ef41d0f8e49a890982b890f629031fdaaf81370181fa21b
 EBUILD libast-0.7.ebuild 945 BLAKE2B c9a34ed7034bd0cb52f5d9f50e9843d8bc5c15c91e2fb889eb22a3ec4853ebcb70ca24abbd7a83483f1a1f67f770002990406407a9294a88db2021daf03bc9ab SHA512 1632a77e1c5216337fb1f81c15555606f95138c88822feedcf913bc8f33ca16080e5851d8f30bd024e10bb5dd8165d149adca153e25ce1321b2480a8ad5207df
 EBUILD libast-9999.ebuild 1035 BLAKE2B 6d28c6c66fe9fabd36d7a0fd5674d359348d9974a3eef1a4514568663170db108232464ff4297d4616573b8db1d567ab04b47ee3f50ca1609ff4d3bac6ea56db SHA512 9a08bda18d9d681948b58a9dd12e7b2b282cc6f6f780020936a7e77cbb6c4ee576c24648560c414d1ce256ae4b568bf00000fe12b8df6e6ca1331a053ba02a79
 MISC metadata.xml 736 BLAKE2B 603c1752552864610f08d8b3144503837feb5c7bddb3ebfe108f4d090e25d38fee56ed63f392c98f5468c69b6bc47ecb65e53bed8c335e6996351522e4257df0 SHA512 a2fd1a0875f0a0c866845b4fcc63d0ab715ad73fdd1cde271e6174606180ee5e1f4924270171c08074a0ffc7af52fb9299dcd32a5f057c1548175bf638598acc
diff --git a/x11-libs/libast/libast-0.7-r1.ebuild b/x11-libs/libast/libast-0.7-r1.ebuild
index 079c427988ad..281091cbdc3a 100644
--- a/x11-libs/libast/libast-0.7-r1.ebuild
+++ b/x11-libs/libast/libast-0.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ SRC_URI="http://www.eterm.org/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="imlib cpu_flags_x86_mmx pcre"
 
 RDEPEND="
diff --git a/x11-libs/neXtaw/Manifest b/x11-libs/neXtaw/Manifest
index f81c1674f3b3..36145681c2b9 100644
--- a/x11-libs/neXtaw/Manifest
+++ b/x11-libs/neXtaw/Manifest
@@ -1,4 +1,4 @@
 DIST neXtaw-0.15.1.tar.gz 577459 BLAKE2B c38e8fe482bf0f51a2f387ab76d62666778d569982e153dbe32988d557dad91876122cfe4d0e8940e5c1d8ca7a8a3af09c09631b8ed656bd6a11db21d16ae331 SHA512 5250b2ac6fc746b8de19d0c2504e6c21e0b6c6ac4ef1a841a9793a2fd2dff082b86a987f54f68e0e35ed8f798900a701e6fd9c6cf7b1412a4bd53179fd07cbf1
 EBUILD neXtaw-0.15.1-r1.ebuild 757 BLAKE2B 94f1af2a108d4bb732c297c0b01ad27b7e66837bbb25beda86cfc8aed6a7300bbf6a57d0ff1150cada710ac8c0990f97ba0df61fca32216a5baad09e57e6bda9 SHA512 cc96b5d3579ee917ec8b2986e598a97d4edba46475096af4c5c0435c9a8594fd95c0bf5948623c9dd7865754c2ef36caf51bd59d0dd9c666baf3b200f5cad31e
-EBUILD neXtaw-0.15.1-r2.ebuild 769 BLAKE2B 1af332bd99017078592663f7f4858d0c01aa543d2935bf5b028d6720c32e97ca8b91775fbf4f246d6f9dc11cbac245ffc8e2e8077f2cf0893fec9e4dc37c0374 SHA512 e78e192fb27f412ec7e1f72f6061cc61c665a97f7dcb9d7f551b5dc6c7cff150646aba8beed14f3e984c41d2a4143b12b0cb49cc8b04d274d8086915580ec480
+EBUILD neXtaw-0.15.1-r2.ebuild 768 BLAKE2B 4cb943bda72c4c86c7905fd4898fe5066004d6419410284f41f21eed1dcf6297b661c24775d4c9ba6a1e3c0e9d53c9b8fa212d3a30c0da67f0b5cab25efd504f SHA512 282e66c7232ccd9aab93b719dc1afb11120637fde46ff5fb0b3be0a1f8b4490784e9918a5783a221ef865d10f3b5036aaafcc9868d118592a460c9d02fad4589
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/x11-libs/neXtaw/neXtaw-0.15.1-r2.ebuild b/x11-libs/neXtaw/neXtaw-0.15.1-r2.ebuild
index 377b2c070edc..1dd2077a99bc 100644
--- a/x11-libs/neXtaw/neXtaw-0.15.1-r2.ebuild
+++ b/x11-libs/neXtaw/neXtaw-0.15.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ SRC_URI="http://siag.nu/pub/neXtaw/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
 IUSE=""
 
 RDEPEND="x11-libs/libICE
diff --git a/x11-libs/wxGTK/Manifest b/x11-libs/wxGTK/Manifest
index 218893b70323..26d93e8d6bb0 100644
--- a/x11-libs/wxGTK/Manifest
+++ b/x11-libs/wxGTK/Manifest
@@ -7,18 +7,12 @@ AUX wxGTK-2.8.12.1-fix-c++14.patch 4518 BLAKE2B 7ea578c93bc87178c35a8257f4fb2857
 AUX wxGTK-2.8.12.1-libdir.patch 13266 BLAKE2B d96df55c4e156962db77a317c1046341c679720e75c4adb1daaef3a3bb580c21b8ea025264cb348b2edd15ab1b8300d76859f152745a58af3113c3871793451f SHA512 15eb72936176bfe03b5acb7d52c4158fe4f6bdf9870e72aab8d41e1689ee9886aa3bc8216e782abb756d06607bcedbec184575a2e9634f67f6add1b930297671
 AUX wxGTK-2.8.7-mmedia.patch 518 BLAKE2B 7fbaeea8eb8b11a1cfbcbabf2cb1d159d197ff5cbb390c38e8686820276265603c3fd2b7cc3e28bbb264730e08da63c57806aada2d3d0a33af650f855ff511c9 SHA512 8577a701f5d0d03296d2d2dbb3a041023cf7adffc2d09492d2ebd094e0a6796e27abe1f442fee92e661f0f1ea6268499c37ace042cc1434b80aac58639bbc56c
 AUX wxGTK-3.0-gtk3-translation-domain.patch 454 BLAKE2B fd0b6d6a0c1fe7f1dfbd7692d549dfd6f78c85e25f06e2e44630ca9b3c9dda4c12af2df6e4fcc02de73e75524631b858cc21b9f63b8799b0d157a38bd5541fac SHA512 8cdf57558e8d09e3e0613c25ac7701cce0bf78da13060e2b36167b69b8ae4f265607cb5216a33054f6c0c2f21beba8cc7f8297f4de2b2db1ec9f3f5bb8177ff3
-AUX wxGTK-3.0.0.0-collision.patch 6237 BLAKE2B e37454695da362b7b72d3f828a380ba4b112f20e6586fbc81d2b6f77bc3f18ab6651cf2ef7daa8cb321f6450db434d0f4b62bb74f7f97366ebd258bb651c3fdc SHA512 c68ac400ddc4531d81a251acf1efc4440a5a17d78d9767427121f4ca0425a179a9cdfa94f22ecad0f2cd8f4bf3a4c799a4e21878e93367b57e206f2504a2724f
-AUX wxGTK-3.0.2.0-gcc6.patch 1077 BLAKE2B 5fed82c7d3d78314eea51ab5d3fe836e5115c2b6810e3bcda263567fb87f215919b2a8e2617cb7c0eb829ffbe647af0e085e7bba6a0a886d667b854693da4d16 SHA512 6da02b4cdd6e4d33cfd8da5554f1400e2ccb33de7fa12d9da23a8eeac52c724fa339d2e1d413abf5f4590cf0514cf9a8d951589d3e498aae936ab10caf93f585
-AUX wxGTK-3.0.2.0-webview-fixes.patch 9132 BLAKE2B 4ebbef4c0cd7ef1273f5dc7467ffd3e7603150066db3501be6801d58a4243699c232fa46ae559f26dfe6fff4db8fa5f62f303e830dcd9a5f4e6ce5fed323eb28 SHA512 61ff21971d1527cd721f8d2c525e2d55de65f1935135c3cf6c20e0097ef08518f43a7bd96e3d49e22de19dc68462896ab4f7c8679c9632f392b8a0a64df9bc90
 AUX wxGTK-3.0.3-collision.patch 6299 BLAKE2B 1130b96f32e2abe7109ca84f1cd0cae0a6742f2f96ad905996157e227236deaff64813f892b649adb2b17beb8fa2b3e9b651f7c397960eb6346bb4bc1e50b417 SHA512 e38a7985c750a34f7ed0b3772677b6b6942340c48d3e70a7c1f1851d2933a4d7823c225203a79c8b713f3d6a1bb0c0d0690d5df027674cd826cea300f9b2ed0f
 DIST wxGTK-3.0.3_p20180104.tar.xz 84260 BLAKE2B 3840a4a202778b3e7df0c3470945dd8f083b1b18aa69013ae59975b368cec4f5e9fea3bdd8a05a200fcd146c8616d2258f0b2ee389a6457a638201a8534f9a18 SHA512 840c8248d5a689a462d1dcb9d9962dd453473597d10289802728218a881808f594ff799d2002ceb319d2e79b1b7063d59b181d4a0efff7920a2dee9653b40a72
-DIST wxPython-docs-3.0.2.0.tar.bz2 21455056 BLAKE2B 9b6bea6426663b3457764000c3c91a9bdfa85f7e95cae345eb0ba32c3edf59f010738459123423ad68487eadde221dbc3576903b669b9aa674e052b690079de7 SHA512 ce4407de4cdf9a3eaa5c64a8a959a0d7010d0d814a710de1ac0ed2a716ea2ee4f4ba34199e271a3e9b7790780294fcadfcd8bc65fead182d4ebe533c35c4d78e
 DIST wxPython-src-2.8.12.1.tar.bz2 31311482 BLAKE2B 33b3feb5f1182948badcd5695b35a68c673e36694a2db8c77b0b031b185c94c9f8bcf4753d9cbf8937e99a72f4c393d6f79850ed3d730af20a7263b97c620386 SHA512 4f826ccb57d5f4fc03fe7cae67499be70c727a99aebf9d153ea1060a21641642606d44d079ba897c38b176846336aeaebc21d30d5c7a0abec3934d65cf4529f3
-DIST wxPython-src-3.0.2.0.tar.bz2 58304944 BLAKE2B 1144acf2cfa0a18aa2f90aabe81aaeca54d3fe6139818267dbc031accbae38035478a64ec084fe8bb8b89126fb70ff96e68981026df8ad3fc82e81c6d0e22d1a SHA512 a3798e89ff19344253aac7d771971e519f7fa9723e82bd97e98f16fd7f1572e513170b02295b872dae0b1ae3fa95efc4ef34d078045b839694b4fdad3a27c9e4
 DIST wxWidgets-3.0.3-docs-html.tar.bz2 23803675 BLAKE2B 181305a2b8935adee8d50873665bc094f46a061fe1bcf8521f8a4d5613013d6ad58ce172e56118f3833ce3489ab2e919bbd5482445ce55455e696252bb747d3c SHA512 655efde42e467d1d48d8adb95e2394d90cedca8eb6a54a7d53771d3d2d4d5f72637aea6ea12a4c1f570c3905a458aebea067cd74e184c4c85ca73e49e04282cb
 DIST wxWidgets-3.0.3.tar.bz2 20054446 BLAKE2B ebbe977a59f215fb2e35300aec91ad6d042d099586c4f6624d817c689feae090ff6df5718baa94a79e8e46120a6b4a154a7e9a584e14363e832602841502f0f6 SHA512 dfe53682d7cda1d460f336a890603c4e823078be4b05e7cf43ab36cb49247f702808aa939d9311705bdf5f96eaa076e7a8f77f4415bc07c5bfdc19e5deff1dd1
 EBUILD wxGTK-2.8.12.1-r2.ebuild 4790 BLAKE2B 556048e9d98cf57dbbf2cf5097101e1640576a0df596e296f0e500d672b417ab530f37469e8bd5cb8c656fe902c572ee4998782bd6a7b8dfd735f87d2f85e681 SHA512 688c1121691fcfd701f6b396aff2425e8aac5eaa644cf1e8d216145b975fb7edef709eae4e9ef0e847f1c3c189685b75f86791487dd4ac71edca579a49f896ee
-EBUILD wxGTK-3.0.2.0-r4.ebuild 4207 BLAKE2B d1e31b2efdb825a38f49f21c2f146f73ae2f5fd00cd6dd688a84a2d6b76dcf9180d6eca26ce852faba79a0093b8df6d9e605daec8850273fbcfcddba3f011246 SHA512 4fe3a3b228b345d0e90981af6f37f8d3ded479cd811f14a5e06ff4e1ba6f458926ca8b64983a61a7a7e29c34bbe37b0f50f256548c4b5c37ae6a175d1af8cde8
 EBUILD wxGTK-3.0.3-r300.ebuild 5172 BLAKE2B 001d07bebf5f31143f78f1424f46ee936bad83ec22c18cba6f32f57151ec4834dd120824f724b7d395514f0275cbbc0926c2273239ac7a33288f7ae2ce709995 SHA512 411764eb989a09185de0dbf994cddb5ab9423b4bde2117b7e96aa679c21ad63ad8f6e18a1d897758679673a6c6957e3014da09f4dfd45412732402bda23aa471
 EBUILD wxGTK-3.0.3.ebuild 4097 BLAKE2B becfe3d3c069ae85d9fdd342f5551cd8c2c45f207485edbf4243813e4346fa11b68c4cd88cfc42b94ca5b05937da1e182f22e107e58e90b0178aa8f68574a178 SHA512 6cca341d1076f359dc919d4fcfdc576bfd1c5af5cb841fecaff62eea87a7a0ef3cb6bffdc357d83329dc994391a5ac199968519698097ad4a59330844af4734f
 MISC metadata.xml 856 BLAKE2B 9f03dc05155eba5aee9ca7233d96dc7d0929df2a016dce4131b3b639358eea8ebbecfb5e7f59e7382f5467259885c14bcdc3df416a678f213cd58cd3096b4252 SHA512 f5308ab2b8d9d1964c23b175b30c6e728b16522a09a9cf907789a72296b4703f1da9a7b4d116d14cfffb8b38513d4c2830a70acb98b2df62a5dc67ed4e069abb
diff --git a/x11-libs/wxGTK/files/wxGTK-3.0.0.0-collision.patch b/x11-libs/wxGTK/files/wxGTK-3.0.0.0-collision.patch
deleted file mode 100644
index a2c6c6e1a8e3..000000000000
--- a/x11-libs/wxGTK/files/wxGTK-3.0.0.0-collision.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-Prevent file collisions between multiple installed SLOTs.
-
-  - Don't install wxwin.m4.  It is installed with app-eselect/eselect-wxwidgets.
-  - Version the bakefile preset filenames.  Unversioned symlinks to these files
-    are handled by eselect.
-  - Version wx-config and wxrc.  The unversioned forms are wrapper scripts
-    installed with eselect-wxwidgets.
-  - Version wxstd.mo and modify AddStdCatalog to use it.
-
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -15213,10 +15213,10 @@ COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
- all: $(__wxregex___depname) $(__wxzlib___depname) $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(__wxexpat___depname) $(__wxscintilla___depname) $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__mediadll___depname) $(__medialib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__webviewdll___depname) $(__webviewlib___depname) $(__qadll___depname) $(__qalib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__auidll___depname) $(__auilib___depname) $(__ribbondll___depname) $(__ribbonlib___depname) $(__propgriddll___depname) $(__propgridlib___depname) $(__richtextdll___depname) $(__richtextlib___depname) $(__stcdll___depname) $(__stclib___depname) $(__gldll___depname) $(__gllib___depname) $(__sound_sdl___depname) $(__wxrc___depname) $(__cocoa_res___depname)
- 
- install: $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__install_wxpng___depname) $(__install_wxjpeg___depname) $(__install_wxtiff___depname) $(__install_wxexpat___depname) $(__install_wxscintilla___depname) $(__install_monodll___depname) $(__install_monolib___depname) $(__install_basedll___depname) $(__install_baselib___depname) $(__install_netdll___depname) $(__install_netlib___depname) $(__install_coredll___depname) $(__install_corelib___depname) $(__install_advdll___depname) $(__install_advlib___depname) $(__install_mediadll___depname) $(__install_medialib___depname) $(__install_htmldll___depname) $(__install_htmllib___depname) $(__install_webviewdll___depname) $(__install_webviewlib___depname) $(__install_qadll___depname) $(__install_qalib___depname) $(__install_xmldll___depname) $(__install_xmllib___depname) $(__install_xrcdll___depname) $(__install_xrclib___depname) $(__install_auidll___depname) $(__install_auilib___depname) $(__install_ribbondll___depname) $(__install_ribbonlib___depname) $(__install_propgriddll___depname) $(__install_propgridlib___depname) $(__install_richtextdll___depname) $(__install_richtextlib___depname) $(__install_stcdll___depname) $(__install_stclib___depname) $(__install_gldll___depname) $(__install_gllib___depname) $(__install_sound_sdl___depname) $(__install_wxrc___depname) install-wxconfig locale_install locale_msw_install $(__cocoa_res_install___depname)
--	$(INSTALL_DIR) $(DESTDIR)$(datadir)/aclocal
--	(cd $(srcdir) ; $(INSTALL_DATA)  wxwin.m4 $(DESTDIR)$(datadir)/aclocal)
- 	$(INSTALL_DIR) $(DESTDIR)$(datadir)/bakefile/presets
--	(cd $(srcdir)/build/bakefiles/wxpresets/presets ; $(INSTALL_DATA)  wx.bkl wx_unix.bkl wx_win32.bkl wx_xrc.bkl wx_presets.py $(DESTDIR)$(datadir)/bakefile/presets)
-+	(cd $(srcdir)/build/bakefiles/wxpresets/presets ; \
-+	for i in wx.bkl wx_unix.bkl wx_win32.bkl wx_xrc.bkl wx_presets.py ; do \
-+	$(INSTALL_DATA) $$i $(DESTDIR)$(datadir)/bakefile/presets/wx$(WX_RELEASE_NODOT)$${i##wx} ; done)
- 	$(DYLIB_RPATH_INSTALL)
- 	$(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx
- 	for f in setup.h $(RCDEFS_H); do \
-@@ -16101,7 +16101,7 @@ install-wxconfig:
- 	$(INSTALL_DIR) $(DESTDIR)$(bindir)
- 	$(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/config
- 	$(INSTALL_PROGRAM) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(libdir)/wx/config
--	(cd $(DESTDIR)$(bindir) && rm -f wx-config && $(LN_S) $(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config || cp -p $(DESTDIR)$(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config)
-+	(cd $(DESTDIR)$(bindir) && rm -f wx-config-$(WX_RELEASE) && $(LN_S) $(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config-$(WX_RELEASE) || cp -p $(DESTDIR)$(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config-$(WX_RELEASE))
- 
- locale_install: 
- 	$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale
-@@ -16109,7 +16109,7 @@ locale_install:
- 	$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l ; \
- 	$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES ; \
- 	if test -f $(srcdir)/locale/$$l.mo ; then \
--	$(INSTALL_DATA) $(srcdir)/locale/$$l.mo $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxstd.mo ; \
-+	$(INSTALL_DATA) $(srcdir)/locale/$$l.mo $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxstd$(WX_RELEASE_NODOT).mo ; \
- 	fi ; \
- 	done
- 
---- a/build/bakefiles/wx.bkl
-+++ b/build/bakefiles/wx.bkl
-@@ -137,7 +137,7 @@
-         <using module="gettext"/>
-         <gettext-catalogs id="locale">
-             <srcdir>$(SRCDIR)/locale</srcdir>
--            <catalog-name>wxstd</catalog-name>
-+            <catalog-name>wxstd$(WX_RELEASE_NODOT)</catalog-name>
-             <linguas>
-                 ca cs da de el es fi fr hu id it ja nl pl ru sl sv tr uk
-                 zh zh_CN zh_TW
---- a/src/common/translation.cpp
-+++ b/src/common/translation.cpp
-@@ -1458,7 +1458,7 @@ wxArrayString wxTranslations::GetAvailableTranslations(const wxString& domain) c
- 
- bool wxTranslations::AddStdCatalog()
- {
--    if ( !AddCatalog(wxS("wxstd")) )
-+    if ( !AddCatalog(wxS("wxstd" wxSTRINGIZE(wxMAJOR_VERSION) wxSTRINGIZE(wxMINOR_VERSION))) )
-         return false;
- 
-     // there may be a catalog with toolkit specific overrides, it is not
---- a/utils/wxrc/Makefile.in
-+++ b/utils/wxrc/Makefile.in
-@@ -125,7 +125,6 @@ distclean: clean
- @COND_USE_XRC_1@	rm -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE)
- @COND_USE_XRC_1@	$(INSTALL_PROGRAM) wxrc$(EXEEXT) $(DESTDIR)$(bindir)
- @COND_USE_XRC_1@	mv -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE)
--@COND_USE_XRC_1@	(cd $(DESTDIR)$(bindir) && $(LN_S) wxrc-$(WX_RELEASE) wxrc$(EXEEXT))
- 
- @COND_USE_XRC_1@uninstall_wxrc: 
- @COND_USE_XRC_1@	rm -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT)
diff --git a/x11-libs/wxGTK/files/wxGTK-3.0.2.0-gcc6.patch b/x11-libs/wxGTK/files/wxGTK-3.0.2.0-gcc6.patch
deleted file mode 100644
index 119175c624d2..000000000000
--- a/x11-libs/wxGTK/files/wxGTK-3.0.2.0-gcc6.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 73e9e18ea09ffffcaac50237def0d9728a213c02 Mon Sep 17 00:00:00 2001
-From: Scott Talbert <swt@techie.net>
-Date: Sat, 20 Feb 2016 00:08:14 -0500
-Subject: [PATCH] Fix STC compilation with GCC6
-
-Use std::abs() from <cmath> instead of abs() from <math.h> to avoid problems
-with ambiguous overloads.
-
-Closes #17147.
-
-Closes https://github.com/wxWidgets/wxWidgets/pull/222
----
- src/stc/scintilla/src/Editor.cxx | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/src/stc/scintilla/src/Editor.cxx b/src/stc/scintilla/src/Editor.cxx
-index cd72953..2081df2 100644
---- a/src/stc/scintilla/src/Editor.cxx
-+++ b/src/stc/scintilla/src/Editor.cxx
-@@ -11,6 +11,7 @@
- #include <ctype.h>
- #include <assert.h>
- 
-+#include <cmath>
- #include <string>
- #include <vector>
- #include <map>
-@@ -5841,9 +5842,9 @@ void Editor::GoToLine(int lineNo) {
- }
- 
- static bool Close(Point pt1, Point pt2) {
--	if (abs(pt1.x - pt2.x) > 3)
-+	if (std::abs(pt1.x - pt2.x) > 3)
- 		return false;
--	if (abs(pt1.y - pt2.y) > 3)
-+	if (std::abs(pt1.y - pt2.y) > 3)
- 		return false;
- 	return true;
- }
diff --git a/x11-libs/wxGTK/files/wxGTK-3.0.2.0-webview-fixes.patch b/x11-libs/wxGTK/files/wxGTK-3.0.2.0-webview-fixes.patch
deleted file mode 100644
index 727fda16ddc1..000000000000
--- a/x11-libs/wxGTK/files/wxGTK-3.0.2.0-webview-fixes.patch
+++ /dev/null
@@ -1,140 +0,0 @@
-Backport various webkit-related build fixes:
-
-a309157a	Don't include "webview" in "standard" libraries.
-d24f711f	Only link webview library with libwebkitgtk in wxGTK, not the core one.
-bde287ba	Rebake webview sample makefile after EXTRALIBS_WEBVIEW addition	
-037f6977	Report libraries in EXTRALIBS_WEBVIEW in wx-config output
-
-
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -65,6 +65,7 @@ EXTRALIBS_MEDIA = @EXTRALIBS_MEDIA@
- EXTRALIBS_GUI = @EXTRALIBS_GUI@
- EXTRALIBS_OPENGL = @EXTRALIBS_OPENGL@
- EXTRALIBS_SDL = @EXTRALIBS_SDL@
-+EXTRALIBS_WEBVIEW = @EXTRALIBS_WEBVIEW@
- CXXWARNINGS = @CXXWARNINGS@
- HOST_SUFFIX = @HOST_SUFFIX@
- DYLIB_RPATH_INSTALL = @DYLIB_RPATH_INSTALL@
-@@ -15493,7 +15494,7 @@ distclean: clean
- @COND_SHARED_0_USE_STC_1@	rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wxscintilla$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
- 
- @COND_MONOLITHIC_1_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(MONODLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxregex___depname) $(__monodll___win32rc) $(__wxscintilla_library_link_DEP)
--@COND_MONOLITHIC_1_SHARED_1@	$(SHARED_LD_CXX) $@ $(MONODLL_OBJECTS) $(__wxscintilla_library_link_LIBR)    -L$(LIBDIRNAME) $(__monodll___macinstnamecmd) $(__monodll___importlib) $(__monodll___soname_flags) $(WXMACVERSION_CMD) $(LDFLAGS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(EXTRALIBS_XML) $(EXTRALIBS_HTML) $(EXTRALIBS_MEDIA) $(PLUGIN_ADV_EXTRALIBS) $(__wxscintilla_library_link_LIBR_1) $(LIBS)
-+@COND_MONOLITHIC_1_SHARED_1@	$(SHARED_LD_CXX) $@ $(MONODLL_OBJECTS) $(__wxscintilla_library_link_LIBR)    -L$(LIBDIRNAME) $(__monodll___macinstnamecmd) $(__monodll___importlib) $(__monodll___soname_flags) $(WXMACVERSION_CMD) $(LDFLAGS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(EXTRALIBS_XML) $(EXTRALIBS_HTML) $(EXTRALIBS_MEDIA) $(PLUGIN_ADV_EXTRALIBS) $(EXTRALIBS_WEBVIEW) $(__wxscintilla_library_link_LIBR_1) $(LIBS)
- @COND_MONOLITHIC_1_SHARED_1@	$(DYLIB_RPATH_POSTLINK)
- @COND_MONOLITHIC_1_SHARED_1@	
- @COND_MONOLITHIC_1_SHARED_1@	$(__monodll___so_symlinks_cmd)
-@@ -15750,7 +15751,7 @@ distclean: clean
- @COND_MONOLITHIC_0_USE_HTML_1@wxhtml: $(____wxhtml_namedll_DEP) $(____wxhtml_namelib_DEP)
- 
- @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(WEBVIEWDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxregex___depname) $(__webviewdll___win32rc) $(__coredll___depname) $(__basedll___depname)
--@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_1@	$(SHARED_LD_CXX) $@ $(WEBVIEWDLL_OBJECTS) -L$(LIBDIRNAME) -L$(LIBDIRNAME)    -L$(LIBDIRNAME) $(__webviewdll___macinstnamecmd) $(__webviewdll___importlib) $(__webviewdll___soname_flags) $(WXMACVERSION_CMD) $(LDFLAGS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) $(LIBS)
-+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_1@	$(SHARED_LD_CXX) $@ $(WEBVIEWDLL_OBJECTS) -L$(LIBDIRNAME) -L$(LIBDIRNAME)    -L$(LIBDIRNAME) $(__webviewdll___macinstnamecmd) $(__webviewdll___importlib) $(__webviewdll___soname_flags) $(WXMACVERSION_CMD) $(LDFLAGS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) $(EXTRALIBS_WEBVIEW) $(LIBS)
- @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_1@	$(DYLIB_RPATH_POSTLINK)
- @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_1@	
- @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_1@	$(__webviewdll___so_symlinks_cmd)
---- a/build/bakefiles/config.bkl
-+++ b/build/bakefiles/config.bkl
-@@ -423,6 +423,7 @@ to run the tests, include CppUnit library here.
-         <option name="EXTRALIBS_GUI"/>
-         <option name="EXTRALIBS_OPENGL"/>
-         <option name="EXTRALIBS_SDL"/>
-+        <option name="EXTRALIBS_WEBVIEW"/>
-         <option name="CXXWARNINGS"/>
-         <option name="HOST_SUFFIX"/>
-         <option name="DYLIB_RPATH_INSTALL"/>
-@@ -506,6 +507,7 @@ it if SHARED=1 unless you know what you are doing.
-             <if cond="COMPILER=='gcc'">-lopengl32 -lglu32</if>
-         </set>
-         <set var="EXTRALIBS_SDL"/>
-+        <set var="EXTRALIBS_WEBVIEW"/>
- 
-         <set var="WITH_PLUGIN_SDL">0</set>
- 
---- a/build/bakefiles/monolithic.bkl
-+++ b/build/bakefiles/monolithic.bkl
-@@ -26,6 +26,7 @@
-         <ldlibs>$(EXTRALIBS_HTML)</ldlibs>
-         <ldlibs>$(EXTRALIBS_MEDIA)</ldlibs>
-         <ldlibs>$(PLUGIN_MONOLIB_EXTRALIBS)</ldlibs>
-+        <ldlibs>$(EXTRALIBS_WEBVIEW)</ldlibs>
-         <library>$(wxscintilla_library_link)</library>
-     </dll>
- 
---- a/build/bakefiles/multilib.bkl
-+++ b/build/bakefiles/multilib.bkl
-@@ -183,6 +183,7 @@
-         <sources>$(WEBVIEW_SRC)</sources>
-         <library>coredll</library>
-         <library>basedll</library>
-+        <ldlibs>$(EXTRALIBS_WEBVIEW)</ldlibs>
-         <msvc-headers>$(WEBVIEW_HDR)</msvc-headers>
-     </dll>
- 
---- a/build/bakefiles/wxwin.py
-+++ b/build/bakefiles/wxwin.py
-@@ -51,6 +51,7 @@ EXTRALIBS = {
-     'html' : '$(EXTRALIBS_HTML)',
-     'adv' : '$(PLUGIN_ADV_EXTRALIBS)',
-     'media' : '$(EXTRALIBS_MEDIA)',
-+    'webview' : '$(EXTRALIBS_WEBVIEW)',
- }
- 
- def mkLibName(wxid):
---- a/configure.in
-+++ b/configure.in
-@@ -7249,7 +7249,7 @@ if test "$wxUSE_WEBVIEW" = "yes"; then
-                               [
-                                 USE_WEBVIEW_WEBKIT=1
-                                 CPPFLAGS="$CPPFLAGS $WEBKIT_CFLAGS"
--                                GUI_TK_LIBRARY="$GUI_TK_LIBRARY $WEBKIT_LIBS"
-+                                EXTRALIBS_WEBVIEW="$WEBKIT_LIBS"
-                               ],
-                               [
-                                 AC_MSG_WARN([webkitgtk not found.])
-@@ -7689,7 +7689,6 @@ if test "$wxUSE_GUI" = "yes"; then
-         BUILT_WX_LIBS="stc $BUILT_WX_LIBS"
-     fi
-     if test "$wxUSE_WEBVIEW" = "yes" ; then
--        STD_GUI_LIBS="webview $STD_GUI_LIBS"
-         BUILT_WX_LIBS="webview $BUILT_WX_LIBS"
-     fi
-     if test "$wxUSE_XRC" = "yes" ; then
-@@ -8002,6 +8001,7 @@ AC_SUBST(EXTRALIBS_GUI)
- AC_SUBST(EXTRALIBS_OPENGL)
- AC_SUBST(EXTRALIBS_SDL)
- AC_SUBST(EXTRALIBS_STC)
-+AC_SUBST(EXTRALIBS_WEBVIEW)
- AC_SUBST(WITH_PLUGIN_SDL)
- AC_SUBST(UNICODE)
- AC_SUBST(DEBUG_INFO)
---- a/samples/webview/Makefile.in
-+++ b/samples/webview/Makefile.in
-@@ -33,6 +33,7 @@ EXTRALIBS = @EXTRALIBS@
- EXTRALIBS_XML = @EXTRALIBS_XML@
- EXTRALIBS_GUI = @EXTRALIBS_GUI@
- EXTRALIBS_SDL = @EXTRALIBS_SDL@
-+EXTRALIBS_WEBVIEW = @EXTRALIBS_WEBVIEW@
- CXXWARNINGS = @CXXWARNINGS@
- HOST_SUFFIX = @HOST_SUFFIX@
- SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
-@@ -163,7 +164,7 @@ distclean: clean
- 	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
- 
- webview$(EXEEXT): $(WEBVIEW_OBJECTS) $(__webview___win32rc)
--	$(CXX) -o $@ $(WEBVIEW_OBJECTS)    -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(__WXLIB_WEBVIEW_p)  $(__WXLIB_STC_p)  $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  -lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
-+	$(CXX) -o $@ $(WEBVIEW_OBJECTS)    -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(__WXLIB_WEBVIEW_p) $(EXTRALIBS_WEBVIEW) $(__WXLIB_STC_p)  $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  -lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
- 	
- 	$(__webview___mac_setfilecmd)
- 	$(__webview___os2_emxbindcmd)
---- a/wx-config.in
-+++ b/wx-config.in
-@@ -1032,6 +1032,7 @@ ldlibs_html="@EXTRALIBS_HTML@"
- ldlibs_xml="@EXTRALIBS_XML@"
- ldlibs_adv="@EXTRALIBS_SDL@"
- ldlibs_stc="@EXTRALIBS_STC@"
-+ldlibs_webview="@EXTRALIBS_WEBVIEW@"
- 
- 
- # Order the libraries passed to us correctly for static linking.
diff --git a/x11-libs/wxGTK/wxGTK-3.0.2.0-r4.ebuild b/x11-libs/wxGTK/wxGTK-3.0.2.0-r4.ebuild
deleted file mode 100644
index e9f06730d38e..000000000000
--- a/x11-libs/wxGTK/wxGTK-3.0.2.0-r4.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit autotools eutils multilib-minimal
-
-DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit"
-HOMEPAGE="https://wxwidgets.org/"
-
-# we use the wxPython tarballs because they include the full wxGTK sources and
-# docs, and are released more frequently than wxGTK.
-SRC_URI="mirror://sourceforge/wxpython/wxPython-src-${PV}.tar.bz2
-	doc? ( mirror://sourceforge/wxpython/wxPython-docs-${PV}.tar.bz2 )"
-
-KEYWORDS="arm"
-IUSE="+X aqua doc debug libnotify opengl sdl tiff"
-
-SLOT="3.0"
-
-RDEPEND="
-	dev-libs/expat[${MULTILIB_USEDEP}]
-	sdl?    ( media-libs/libsdl[${MULTILIB_USEDEP}] )
-	X?  (
-		>=dev-libs/glib-2.22:2[${MULTILIB_USEDEP}]
-		media-libs/libpng:0=[${MULTILIB_USEDEP}]
-		sys-libs/zlib[${MULTILIB_USEDEP}]
-		virtual/jpeg:0=[${MULTILIB_USEDEP}]
-		>=x11-libs/gtk+-2.18:2[${MULTILIB_USEDEP}]
-		x11-libs/gdk-pixbuf[${MULTILIB_USEDEP}]
-		x11-libs/libSM[${MULTILIB_USEDEP}]
-		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
-		x11-libs/pango[${MULTILIB_USEDEP}]
-		libnotify? ( x11-libs/libnotify[${MULTILIB_USEDEP}] )
-		opengl? ( virtual/opengl[${MULTILIB_USEDEP}] )
-		tiff?   ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
-		)
-	aqua? (
-		x11-libs/gtk+:2[aqua=,${MULTILIB_USEDEP}]
-		virtual/jpeg:0=[${MULTILIB_USEDEP}]
-		tiff?   ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
-		)"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
-	opengl? ( virtual/glu[${MULTILIB_USEDEP}] )
-	X?  (
-		x11-proto/xproto[${MULTILIB_USEDEP}]
-		x11-proto/xineramaproto[${MULTILIB_USEDEP}]
-		x11-proto/xf86vidmodeproto[${MULTILIB_USEDEP}]
-	)"
-
-PDEPEND=">=app-eselect/eselect-wxwidgets-20131230"
-
-LICENSE="wxWinLL-3
-		GPL-2
-		doc?	( wxWinFDL-3 )"
-
-S="${WORKDIR}/wxPython-src-${PV}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-3.0.0.0-collision.patch
-	epatch "${FILESDIR}"/${P}-webview-fixes.patch
-	epatch "${FILESDIR}"/${P}-gcc6.patch
-	epatch_user
-
-	for f in $(find "${S}" -name configure.in); do
-		mv "${f}" "${f/in/ac}" || die
-	done
-	AT_M4DIR="${S}/build/aclocal" eautoreconf
-
-	# https://bugs.gentoo.org/536004
-	sed \
-		-e 's:3\.0\.1:3.0.2:g' \
-		-e 's:^wx_release_number=1$:wx_release_number=2:' \
-		-i "${S}"/configure || die
-
-}
-
-multilib_src_configure() {
-	local myconf
-
-	# X independent options
-	myconf="
-			--with-zlib=sys
-			--with-expat=sys
-			--enable-compat28
-			$(use_with sdl)"
-
-	# debug in >=2.9
-	# there is no longer separate debug libraries (gtk2ud)
-	# wxDEBUG_LEVEL=1 is the default and we will leave it enabled
-	# wxDEBUG_LEVEL=2 enables assertions that have expensive runtime costs.
-	# apps can disable these features by building w/ -NDEBUG or wxDEBUG_LEVEL_0.
-	# http://docs.wxwidgets.org/3.0/overview_debugging.html
-	# https://groups.google.com/group/wx-dev/browse_thread/thread/c3c7e78d63d7777f/05dee25410052d9c
-	use debug \
-		&& myconf="${myconf} --enable-debug=max"
-
-	# wxGTK options
-	#   --enable-graphics_ctx - needed for webkit, editra
-	#   --without-gnomevfs - bug #203389
-	use X && \
-		myconf="${myconf}
-			--enable-graphics_ctx
-			--with-gtkprint
-			--enable-gui
-			--with-libpng=sys
-			--with-libxpm=sys
-			--with-libjpeg=sys
-			--without-gnomevfs
-			--disable-webview
-			--disable-mediactrl
-			$(use_with libnotify)
-			$(use_with opengl)
-			$(use_with tiff libtiff sys)"
-
-	use aqua && \
-		myconf="${myconf}
-			--enable-graphics_ctx
-			--enable-gui
-			--with-libpng=sys
-			--with-libxpm=sys
-			--with-libjpeg=sys
-			--with-mac
-			--with-opengl"
-			# cocoa toolkit seems to be broken
-
-	# wxBase options
-	if use !X && use !aqua ; then
-		myconf="${myconf}
-			--disable-gui"
-	fi
-
-	ECONF_SOURCE="${S}" econf ${myconf}
-}
-
-multilib_src_install_all() {
-	cd "${S}"/docs || die
-	dodoc changes.txt readme.txt
-	newdoc base/readme.txt base_readme.txt
-	newdoc gtk/readme.txt gtk_readme.txt
-
-	if use doc; then
-		dodoc -r "${S}"/docs/doxygen/out/html
-	fi
-
-	# Stray windows locale file, causes collisions
-	local wxmsw="${ED}usr/share/locale/it/LC_MESSAGES/wxmsw.mo"
-	[[ -e ${wxmsw} ]] && rm "${wxmsw}"
-}
-
-pkg_postinst() {
-	has_version app-eselect/eselect-wxwidgets \
-		&& eselect wxwidgets update
-}
-
-pkg_postrm() {
-	has_version app-eselect/eselect-wxwidgets \
-		&& eselect wxwidgets update
-}
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index f3e14aff063d..dbb44c7e075e 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/gigolo/Manifest b/x11-misc/gigolo/Manifest
index 551de15c654b..2029e97d3e17 100644
--- a/x11-misc/gigolo/Manifest
+++ b/x11-misc/gigolo/Manifest
@@ -1,4 +1,3 @@
 DIST gigolo-0.4.2.tar.bz2 243877 BLAKE2B 7536d8fc1a10abb465b2150785f593c88b4d0a40fc76e1f88388a1631f874ccf0169dec9328b1051c39d6334257c765b409aefeb008a4dfd30bdd9e61d43d269 SHA512 d6d8c65674097fb3eae586e4c71b0f36ba64df00b2ac84c32bd83cfb0fd690ae998c22cea02194acd1f018cdfd01b42f840867425ed183fb0ad98c8d97859532
 EBUILD gigolo-0.4.2-r1.ebuild 695 BLAKE2B 4907c4eb22c5532089bc86e8694a31ac7a5128eadfe9a914b8215abf54298a21e1fe58bcc31f07c53523e31751e7867598c62f9f683f76fdd621088eb29cd91a SHA512 2b5e4b5fc4c7d60d01e327022aa13e57537138b41d643237b424321582aaaa5089dea202e87a5396f5664b45f3ef51775a728428060dce7a5b337e832ebf8653
-EBUILD gigolo-0.4.2.ebuild 824 BLAKE2B 2b3fc17f704a0019585442074c56ada608d23aa21b34fe7bd45a58e0920d3343359e6f8a44f0f10fd0cd2325b01e9e1ace2b91a2f5ae00fcb83f36b524c2a545 SHA512 62954a4e6aeba2d68b10ff5b0ce52aafac9cd4c3a368181e84c4c8c29e663bb475e38f1876ff0752e543a9f34f26fa7e6d2102cbeda32a3cb264a73fdebd18fe
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/x11-misc/gigolo/gigolo-0.4.2.ebuild b/x11-misc/gigolo/gigolo-0.4.2.ebuild
deleted file mode 100644
index eb9baf3de5aa..000000000000
--- a/x11-misc/gigolo/gigolo-0.4.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-#EAUTORECONF=yes (Why was this in 0.4.1 w/o any calls to autotools.eclass again?
-# some reference to intltoolize in ChangeLog but that's it?)
-inherit xfconf
-
-DESCRIPTION="a frontend to easily manage connections to remote filesystems using GIO/GVfs"
-HOMEPAGE="http://www.uvena.de/gigolo/ https://goodies.xfce.org/projects/applications/gigolo"
-SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2.16
-	>=x11-libs/gtk+-2.12:2"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig"
-
-pkg_setup() {
-	DOCS=( AUTHORS ChangeLog NEWS README TODO )
-}
-
-src_install() {
-	xfconf_src_install
-	rm -rf "${ED}"/usr/share/doc/${PN}
-}
diff --git a/x11-misc/rodent/Manifest b/x11-misc/rodent/Manifest
index eaf5a9ed350e..d63a3538c3ca 100644
--- a/x11-misc/rodent/Manifest
+++ b/x11-misc/rodent/Manifest
@@ -1,4 +1,3 @@
 DIST rodent-5.3.16.3.tar.bz2 10873231 BLAKE2B 5eca3c69d5a0427997bfcb7af8cd187fcb9f49e98988ed16a2cb292e59686d82ca93f60f8c827669df3b168d53c1da5b956d267dc94c1b67793113ae42b98954 SHA512 83c85501d3fe49e84abe9bb61a23ca4ec86fb22abb2e9a01228b3180d114380ff085ee58f51b9ac47173214ab8323e0bde7cfca6fb9b7907d4b1551ad48326f5
 EBUILD rodent-5.3.16.3-r1.ebuild 830 BLAKE2B eecf7094f46df39247fa0dd19c508c77702722d3625eef0612b7e68e89c7f01684c13affd94f4af4f6624d12bc820bad92ff6b0a4d06be931694679c13acda44 SHA512 dc22f2bea3a7ac908ada1f1b0f189f01417dd423b176f25952b57006df75e048b1318de0ffa9079daa4366da3704af2eb4ff9b864268d2639b38bf6ca09373b8
-EBUILD rodent-5.3.16.3.ebuild 667 BLAKE2B 12516dd3ae259e220525bbe36bc457dd2d0a0eedf93b45c2b3339ab4316a479a88dce637a738277d6e546abc395d5354e50a8b6bb318f570f1915a2d257a03f1 SHA512 c04d873eb8e4bb2eb476df679d71b18d31c98bd2cc209fb034699a08ac8e4618ca6110937e6d92b6b20e793c1b902f27102468038549b0f25eb98198b3d68735
 MISC metadata.xml 588 BLAKE2B 88e6c27626e7b25c9a1692ec105e765578732ab218561eac5b34f9a391e1eaf9cf18f7037fc6cae1b274d738fc2ab4bba8a87d674013b3f98110f4082e1790e5 SHA512 d7e8941ba7bb1e3a3f03e4f9c6e7a3ea0c7396701b6bd6688d6de1e8b4c6d57674ac837b4e5554a605f21acbafafae7a17276e59dc18f71b2b68cd991cd16ea7
diff --git a/x11-misc/rodent/rodent-5.3.16.3.ebuild b/x11-misc/rodent/rodent-5.3.16.3.ebuild
deleted file mode 100644
index af6c292d56e1..000000000000
--- a/x11-misc/rodent/rodent-5.3.16.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools
-
-DESCRIPTION="A fast, small and powerful file manager and graphical shell"
-HOMEPAGE="http://xffm.org/"
-SRC_URI="mirror://sourceforge/xffm/${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=x11-libs/librfm-5.3.16.3"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig"
-
-pkg_setup() {
-	DOCS=( AUTHORS ChangeLog TODO )
-}
-
-src_prepare() {
-	pushd apps/rodent-pkg >/dev/null || die
-	sed -i -e "/^install-data-hook/d" \
-		-e "/rm -f/d" Build/Makefile.am || die
-	eautoreconf
-	popd >/dev/null || die
-}
diff --git a/x11-proto/Manifest.gz b/x11-proto/Manifest.gz
index 0f3c9de63d0d..0065eb244ef1 100644
--- a/x11-proto/Manifest.gz
+++ b/x11-proto/Manifest.gz
diff --git a/x11-proto/bigreqsproto/Manifest b/x11-proto/bigreqsproto/Manifest
index 267a4c73daa0..f3211b89557e 100644
--- a/x11-proto/bigreqsproto/Manifest
+++ b/x11-proto/bigreqsproto/Manifest
@@ -1,4 +1,4 @@
 DIST bigreqsproto-1.1.2.tar.bz2 113218 BLAKE2B de595169050716e6474366221760845d61110cc4d71bb6b2b0ec7d28a211b4c6ed38e202e84802982f23a85fa140e36d78dda45fa499f5cba9418a39047e2c61 SHA512 9c2f98191169f7bca69601fcea5ddcb45d50b3a6bae087a2d6ee2d83f9729155b23268ad4c46a3cc99162cdacf4c8e3d7f061e58d73237da96f23123444f67d8
-EBUILD bigreqsproto-1.1.2-r1.ebuild 527 BLAKE2B 5dea027a3932c3cdfcdcd5b1ad1a621c3733dd815e3aebf2eb222b15742474caefd601baa68c11aa2caa0d42a237a28eea70d2e7275b8c8be3b2441aa055b975 SHA512 74faa5a4a735aafaeb2c2a401d1db0301b8ba430d83206230048ca7e09019654f78a1c3fe3fc479da015577831449615057fb2195fc048d35ff7c5e8afd53a0a
+EBUILD bigreqsproto-1.1.2-r1.ebuild 526 BLAKE2B 781db56769297afff15a1e4c5ddf63be988b594ef637f8762c681cf7c17901461edb2e4eba7f22d1706353915cab957d6301395844cd3f449f7d010b91dcf714 SHA512 890b6293317c1ea824a5a6c089f10bc6428d8a93e7bf7dba0b5a14bb73bdfbe2f1d655cb4ac6f70b233d14bdacd5135d8fa9a4ddfdcb46fa13fd553996e06cc0
 EBUILD bigreqsproto-1.1.2.ebuild 586 BLAKE2B 60ed4d8410bab64580a2b7756012925d4e8b12b0bad38ec483dcd7e2f8fe80fca0bcabdaf090e32be8f3223a09430cc5dadb25d0511d0ce1a7070ec97762a906 SHA512 b39d9bcbe95cf5f4608ad0641e31bee7deda4e74ad46e700d32177d127c19c69c822b1c75001948a507f8093ed1e8c6f21f2bf03be6f8968b08f1a18eb90da1d
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-proto/bigreqsproto/bigreqsproto-1.1.2-r1.ebuild b/x11-proto/bigreqsproto/bigreqsproto-1.1.2-r1.ebuild
index 2f500edee01a..f87835b04612 100644
--- a/x11-proto/bigreqsproto/bigreqsproto-1.1.2-r1.ebuild
+++ b/x11-proto/bigreqsproto/bigreqsproto-1.1.2-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.x.org/wiki/"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-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 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=""
diff --git a/x11-proto/compositeproto/Manifest b/x11-proto/compositeproto/Manifest
index 763b91fcd90e..80585f1194da 100644
--- a/x11-proto/compositeproto/Manifest
+++ b/x11-proto/compositeproto/Manifest
@@ -1,4 +1,4 @@
 DIST compositeproto-0.4.2.tar.bz2 101208 BLAKE2B 139731f135a4f557fbb807b010fe6384ab0febe60c73193ea3820f8809f7b05d64ea14df4b89e7e2986e5b4aadd803bf966a9632686141c26f96e0f02b1453eb SHA512 ad5e4d87b77a8447c228ca85ac8d010d93b5c64929dc866e99a25700b9905f7c3f22e48f8c7fdc54e87879ddcc90e5d4adc338aeea393d7057b19b5ccae31f11
 EBUILD compositeproto-0.4.2-r1.ebuild 455 BLAKE2B c85a00f8b7003f00087dc6174f000e84a5257786b16fab44b2e906b43da299459197b77a72912ab1fa26f61ec392bb35856fd1a5ad6273e5d758b4cf0c7d2036 SHA512 53c8ca5ea6a33023f35ad3c49e111b2157f3fe1dd77844a5ad2fb164e49a6911b5ca972354bf25a248531c49a6cf8876a91c53bf2166526a91b813222e249428
-EBUILD compositeproto-0.4.2-r2.ebuild 529 BLAKE2B a2b8051851207757bdb2d864c5383bd22c87bc9878f86f905d6ade7ee3655afe3d603c29fa841f1f5243be6f70b587779377c8d658da889a526a987f37389710 SHA512 99acf09d45a3f7c35f2286d25b831d9e17ec5e56f56ea7d092bf7f67f3a09d95b05e0fe689cdf30fd2022547aad668da293269044650a8ff93a8f6c8fa4b790e
+EBUILD compositeproto-0.4.2-r2.ebuild 528 BLAKE2B fa0e412a6c121cf5e94f92556bee61c77f037eece9d39e5bea3ed2727494be78e91f0e2a5e16618f7c14786fa85d24d4fa081d16244a1d4bda13e990fb1a2af5 SHA512 6167e8ec36e98311befafb66836651e7bbaded28a0f6a22f9d9e3fc6c533515f6fc418d0bd4edcb22b8300fdf4ebc911f430e756bdba8118f13645bcfe4b044b
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-proto/compositeproto/compositeproto-0.4.2-r2.ebuild b/x11-proto/compositeproto/compositeproto-0.4.2-r2.ebuild
index 7af94082815d..acac8d766983 100644
--- a/x11-proto/compositeproto/compositeproto-0.4.2-r2.ebuild
+++ b/x11-proto/compositeproto/compositeproto-0.4.2-r2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.x.org/wiki/"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-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 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=""
diff --git a/x11-proto/damageproto/Manifest b/x11-proto/damageproto/Manifest
index 6f20fc5d4e35..a3fb4091f877 100644
--- a/x11-proto/damageproto/Manifest
+++ b/x11-proto/damageproto/Manifest
@@ -1,4 +1,4 @@
 DIST damageproto-1.2.1.tar.bz2 98392 BLAKE2B 7b077681ef3cc95f1036ac6365d495ce6e62a445c1597bc77ef80f42f83755d50c2f4abbeda3f153d18717ae596b8976a2645f0a0351b735cf8b3123ee583b39 SHA512 f124e85fb3cc70ed3536cb9db57ac93461bbb5df1a713bc6b67a5ea49122556c321781ca150df681502f6ccfb7305f290e131ad25ce9ccbff5af268df11c86fc
 EBUILD damageproto-1.2.1-r1.ebuild 435 BLAKE2B 5db138024496c665e031d87c7c3bf57a8e503c2fa737e8e083b4dd69da5f72dd637611d4ab2965361da4604489589ea7ae81e99ba4eb3fca27f4175eae5d355f SHA512 3e34ccfcabe2a06d76e23f29639b405edf5568cef3c14a91b63192f812558cf39c8b7649409974c0f9007aa5b9e1caea46d08406b45559245528a1c1d29abe74
-EBUILD damageproto-1.2.1-r2.ebuild 526 BLAKE2B acc9528d0e32cd4a899ce365e1ddc9a8395d3bc4068c40294e7623d23688d1a537c697dad805d25f1e29a32f943e4720ba7e72194e37c91d1fc51a504fb788ee SHA512 6871e69eeb3bffc45e9ed6e2ce52bee16a76193af1b344319c24b769754cac99d9a25821f18d3bc3b6bf959af54296164e5b38ecc79688bb76b0d153a36d9a1f
+EBUILD damageproto-1.2.1-r2.ebuild 525 BLAKE2B dea23f06b036458ec3bb8872406b01e843ece342e05c986c4297d3928334007e7ed89cc78b9a5efbe484b081d66f84ed15e6b7982cf73571309f47b4fa716307 SHA512 47c93d6c3351b517e68ae6afaa135d6d5969342c8a520f8b95d081b50115377bea63fc87d875381084d833248cacc46d2869faf42686c0642aa9e060db3dbacc
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-proto/damageproto/damageproto-1.2.1-r2.ebuild b/x11-proto/damageproto/damageproto-1.2.1-r2.ebuild
index df8a63b3ee9e..14c4c868eb97 100644
--- a/x11-proto/damageproto/damageproto-1.2.1-r2.ebuild
+++ b/x11-proto/damageproto/damageproto-1.2.1-r2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.x.org/wiki/"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-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 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=""
diff --git a/x11-proto/dmxproto/Manifest b/x11-proto/dmxproto/Manifest
index 5955da63d952..e00994bc86e4 100644
--- a/x11-proto/dmxproto/Manifest
+++ b/x11-proto/dmxproto/Manifest
@@ -1,4 +1,4 @@
 DIST dmxproto-2.3.1.tar.bz2 96467 BLAKE2B 6bf24ab884886b2035ef5685fe1a888ba9fc7166c8463a48b24a2705e3567372a437ce1a8dc99beba4777970d98baf2ebd855a5819287602988c2f02ac47f9b3 SHA512 bbce91c35413a39ff8b70e5fddccea0e47af3e8f1cfc562b8acc2785ea350a04166799b29a31fd38f4a2c8d82c8d370d7a40fc24ec2c686f2244b59dce0ba4b5
 EBUILD dmxproto-2.3.1-r1.ebuild 343 BLAKE2B 63691a4110d43dbdca11f5a2a1405428789fe03b9ff534d711702a45286fe4c6948af334202f7bf96ddc05a272e72e3c4d3e9bd13c5f9e69ef364e3a24c88d3d SHA512 401f877c44ba4d5a1d0368b0524e211a55e4583e805499e961e4163359967de4e429410c8bca3fd4356591260f76d46ccef476d6e88520612f42f5b6f49bb316
-EBUILD dmxproto-2.3.1-r2.ebuild 523 BLAKE2B 7c2c2e0ddf4328eda0e3645e3d176c01dff0d43f540e53ab1dc0f9ce4e839f0024520dcac96ef6cf18099949e49c2d13ed0bb4bb90818a4c9b2e4eafec4831ab SHA512 be88b3858503ad76d993a3d701ab9367bd43af8218fbde99cf2687129b46deb150cc5e2d8cfd31472a54d8004bdc0bb53c92a0a6941b48324f37c577472f06ec
+EBUILD dmxproto-2.3.1-r2.ebuild 522 BLAKE2B 7060fa7329f65723db3a2805ce1b7a211350563391b63e5d67cdd235f19976a47bc54a63d2fdb770558ccc76add825485e36930e26205bd29b690c8ad5deaa56 SHA512 b9b9e91f30d66a269a3a57114838128a5a0de1b98aa2760969da3ef24e4e8dc530ff2a5f5eb446fe2a7b40feb2bd341f5a96fe1b69cc540f3df0b9cbc43da66c
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-proto/dmxproto/dmxproto-2.3.1-r2.ebuild b/x11-proto/dmxproto/dmxproto-2.3.1-r2.ebuild
index 8eb171cd06cc..5168351f7ca7 100644
--- a/x11-proto/dmxproto/dmxproto-2.3.1-r2.ebuild
+++ b/x11-proto/dmxproto/dmxproto-2.3.1-r2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.x.org/wiki/"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-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 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=""
diff --git a/x11-proto/dri2proto/Manifest b/x11-proto/dri2proto/Manifest
index 63d5d30d1fa4..d02e83e09c6e 100644
--- a/x11-proto/dri2proto/Manifest
+++ b/x11-proto/dri2proto/Manifest
@@ -1,4 +1,4 @@
 DIST dri2proto-2.8.tar.bz2 108746 BLAKE2B 5716b010326c1bde1dfcbfa8c294a9f4b7bace8a5e9acd0e83869461535dccd61be6eee828d8c182bcca525cc8134c133bd9785ef174d746e5a9e5f50ebb538c SHA512 1602f58cd8a3371dacf894cde4889b9147fc08e83f98d8e0d1c748abe43ecb74cf4e0e3d5eb2f33568ba5e6d9f310303b98ba43ae3bc956ae693824b1ae0745a
 EBUILD dri2proto-2.8-r1.ebuild 411 BLAKE2B 7c34881706b0879c0c47eddd1c5efbda9c8dc25651065008403a90f3c80b82ca367524d8e5bf499db797f2f686d138d6b07b8a3ea04b652bef5c2f6889e24092 SHA512 7d82c41bb7b9332a8fe35be5054316eac9885346c095fd64f3242684ddbc54be7a87056e5548875fc400a812bb830649c95a48b003a7e4b7e67df0ca5fa83702
-EBUILD dri2proto-2.8-r2.ebuild 524 BLAKE2B 443e19a83e68ef15d4aef4efdf2b0cbf7a6f320e0feb5f6e4abdcc667264b4f59c9b97f8407644dd9c6ab307971c460246f4f9b847ee66419c6e01f5fd20b5ff SHA512 eb5661cfa6b7353e65cb389782262017433a632a4b9cadc5ee0d0340c292e0ac15d5917004af5af12c2703d6275ebb80e80a4f267082ce5410872f2dbb7ff172
+EBUILD dri2proto-2.8-r2.ebuild 523 BLAKE2B 1c07674cec40c776a36ddfe7b93520bbe3a5005e3be78aeabafda66242f36bec09ef2ed8f2832f9e6300252d7841168a330a3bae483aa2b9588ea37703b20d19 SHA512 07051a91ab2331e6f731efd18b2468f6996ea1d2cb0f5780504498edd70317a064a9a07161f38fa04b1a0fca976564cd66f54f033d93462e7912849661dd0de3
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-proto/dri2proto/dri2proto-2.8-r2.ebuild b/x11-proto/dri2proto/dri2proto-2.8-r2.ebuild
index 0912a776d55e..2074ab2633c9 100644
--- a/x11-proto/dri2proto/dri2proto-2.8-r2.ebuild
+++ b/x11-proto/dri2proto/dri2proto-2.8-r2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.x.org/wiki/"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-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 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=""
diff --git a/x11-proto/dri3proto/Manifest b/x11-proto/dri3proto/Manifest
index 194405db24b1..8fc07dd5dfc5 100644
--- a/x11-proto/dri3proto/Manifest
+++ b/x11-proto/dri3proto/Manifest
@@ -1,4 +1,4 @@
 DIST dri3proto-1.0.tar.bz2 105366 BLAKE2B f26758ce6859b4d93414436b5fb142326f3dc71b710eecc96cca7185abd3829eaa817b34321b964628b07b94f974ae743a0d4513919bad6e342b2587b94cc137 SHA512 d2925bc2e2bfb3f30c4dc3082d84dc6a2e7d8ea02021ea02d681cbf92e6b256e9e4e0f5abfc394aa0c7762d841b1c8f82d2098c616ca1d7f4a3b5fd8a54f01f8
-EBUILD dri3proto-1.0-r1.ebuild 555 BLAKE2B c125aa69ff04e7d77e277ad9adb7df7adbd4477acf516ec826c46ec5376143e94ff208d3c797424c8d83e1d77d09fe5fe524d09188773726e8866e05dd235a8a SHA512 ee3e6dfc4c337b27262e93d82f78e4181e35ff156829b18012fce01de56f6864d320492f9d8d7207b96c1857e0c5f5bd8fcdba3ee767c4a5bd092afacc30d7f6
+EBUILD dri3proto-1.0-r1.ebuild 554 BLAKE2B 338b52064addcbbf3d09b56297a706f7a30c3825e4981f2f40c17321825cd3fa9196fcc3b603cb2fddf1ee38ad0929ee8efc38f757cdd9a0fddaac62ce83f754 SHA512 3d0617974fb6cdfd706fb5f50bc509d33922671c3e5c279a78bc013d7c800fef2648f0ec1b32427fba522cd93a0491da3f447100cfa9250af8deb1d75d03ff65
 EBUILD dri3proto-1.0.ebuild 441 BLAKE2B 69d8e5af102fd961f8709df5e87b1a0ee9738a52450321b71e128acd2c6ef1f7fa09d5bf603219214c24e219e6bfa0862de74e5814ce0703ab82d7b9968ebf96 SHA512 303adce752e8439ce3f2d24319801a24f84ba9097a381c857cb53751bcaa47af5fb374e8926b678b8f84f97fa12efc62d04067ec78b4de67fa27354a91d606cf
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-proto/dri3proto/dri3proto-1.0-r1.ebuild b/x11-proto/dri3proto/dri3proto-1.0-r1.ebuild
index b643a328471b..cb0e733cfa6b 100644
--- a/x11-proto/dri3proto/dri3proto-1.0-r1.ebuild
+++ b/x11-proto/dri3proto/dri3proto-1.0-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.x.org/wiki/"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-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 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=""
diff --git a/x11-proto/fixesproto/Manifest b/x11-proto/fixesproto/Manifest
index 6b9f211099e0..6ac80f6be897 100644
--- a/x11-proto/fixesproto/Manifest
+++ b/x11-proto/fixesproto/Manifest
@@ -1,5 +1,5 @@
 DIST fixesproto-5.0.tar.bz2 100886 BLAKE2B 9d1a7027c7f05ed6513b64e99cf82c5571d170cd738d663a10ded4607c9264bc526b471bd571a2c70cf4d66431f73d2b1f5fbdf143385ad3fa942b9e18c2aee2 SHA512 93c6a8b6e4345c3049c08f2f3960f5eb5f92c487f26d227430964361bf82041b49e61f873fbbb8ee0e111556f90532b852c20e6082ee8008be641373251fa78c
 EBUILD fixesproto-5.0-r1.ebuild 522 BLAKE2B 7bb17bc113aa81062e76bd12cf62d46fad4d943f95bbe77c3f7d87c8d3a5fae7992afde95010c0fea7d626bd7a33775a52ee711c7e9c95f5fb08d8f169c70325 SHA512 9338d841bb80949b2fc2e712512fd9a52728ddcb7357990d6b4733531b2b91f81cdff4f229453fd531ef5e8a610e8b9d7f961d2e88825991c031657b497fd7ba
-EBUILD fixesproto-5.0-r2.ebuild 547 BLAKE2B bcca2797692adece8fc06b9a136bb8773977f556e9abbe22a9d334453885245e9e98c03545fbee307d8ed977a45bf723beacda7fdb2c1533cde9a072aafcf9a4 SHA512 cd30a4179df8e307855d6f0252aa39fdf8e8eb5a7852d8e00726cc4f7ce8dd9e21ef5250b41038d16651995ed9932fe1962425ff5c55f3bc3aeeb55e84265eff
+EBUILD fixesproto-5.0-r2.ebuild 546 BLAKE2B cc9582db466be0e6c73a2118fcb25dd70e42a70b5200f3fa1d96dddb312e8d0abe575bc3212286b015c62c465b15c11c2755df88b34ad799d120d43bc8adb269 SHA512 acd5d2077dd0abf0b8e793114862184ece94ac4cf2dd19679859a40371eeca8b49d3620fd99976a24db34d1f457db64620deba3d9c08a357d98020a7ba4d6cfc
 EBUILD fixesproto-5.0.ebuild 475 BLAKE2B cc5b3341354b805b01ffc166606b7566ed5cf52824992069e1d1879ea13f53fd980986ef40c4607366690e4ee0b66ace348c373f5682b79478b2f737902469a2 SHA512 dffd10be942c1643f76c2fc7d8dcd8ee630a579414e2151186af0bf7fa5f479763e0420c724ace636023d371caee7176416b6b70d9e2b20390659fc06d8400d9
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-proto/fixesproto/fixesproto-5.0-r2.ebuild b/x11-proto/fixesproto/fixesproto-5.0-r2.ebuild
index fc18ec005458..9b4024437a5f 100644
--- a/x11-proto/fixesproto/fixesproto-5.0-r2.ebuild
+++ b/x11-proto/fixesproto/fixesproto-5.0-r2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.x.org/wiki/"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 DEPEND=""
diff --git a/x11-proto/fontsproto/Manifest b/x11-proto/fontsproto/Manifest
index 8a42b8cdf968..76bf24bb918b 100644
--- a/x11-proto/fontsproto/Manifest
+++ b/x11-proto/fontsproto/Manifest
@@ -1,6 +1,6 @@
 DIST fontsproto-2.1.2.tar.bz2 141990 BLAKE2B 788d9029784b79baf8f5ac3ed76aecd750e67d008fe22dbf4f01df8a5afb55b4d3f2bcff2d03c92c99f3b8ba736d230bdfd3fbecbf8726d344a168fddedb156d SHA512 728d4df6d65b811cc2516cddcd1ba53aadf75521450baaad27ae10448e8eda66c4898369b4cff13874c26b5541cbac231190f7f32f873939aa6d4a72ee720050
 DIST fontsproto-2.1.3.tar.bz2 154087 BLAKE2B 44c64781e856a5c074faa38e9b68870d57162a57b73d681e9ce388b140700d14c57fd62a77cca095f59c9230ec6bc9aecec852d2590333e748ce62194b29420d SHA512 f46d5b733aa48644aa3aa75d4ed47231ef78cb60f747f7200d82331a1ba566190bf37b5b9926c690dec6356043ce7c85a5b59fc1b4b11667ef432518b5d4cc87
 EBUILD fontsproto-2.1.2.ebuild 573 BLAKE2B 3961edb359ae88ba048e0799f8fa0544a10cc4ae9d7511f9a72bd35b004c99f43c859caedd37ce5d383365e420af8b1e672b79b0fcb3bf79605b0590cc570088 SHA512 274d635551c32926928c706b0c16d4339506c5f0569e454e7cd93e1abec9d0b2ddfaec3cdd9ce429e31fc031c280e2f24fa3a0d101f03f3183d2a8a7325499cb
-EBUILD fontsproto-2.1.3-r1.ebuild 547 BLAKE2B 67e36231a345d021fb73ac859b1c00ca0c326dc3ec786fa803638251995fb040b3e91824286667763bd29ffd8969200f6da803d054899301061869d34763f8fd SHA512 cfe298d6728b7c086d11143a2e3c763fa6349e51052fa38bf26b23ea38310dc1c1bdefd7dca4b4688c2cc064d8baf4c1436b14e594df027141a032dfb9897f42
+EBUILD fontsproto-2.1.3-r1.ebuild 546 BLAKE2B 97e6f0154d2b331ed5898e8f5aad0ae88796e95e974da35c58bf436094f1012eb95e3e9bc0e5aa72ebe2340755978ec55e1466a12f002d366bdd9dbc0a8c978b SHA512 e967acd646929e81ef7332cf38101dca79dadb323fa1fed17dff2fb3809bc5fb20f4475227a95d240b38f007616193bfc2a6aaa64e460b621941e37a02b6da92
 EBUILD fontsproto-2.1.3.ebuild 589 BLAKE2B 759c58d1a32ef08dc8cfd2e45cc907fe294b7d379f4aec0df8a7aa0305643d7bd82e1cf60b2051810a8d279189a9155cfa2802471ac0ac3be4b7219db2a16dd4 SHA512 624d6a596e3e7913505409cd36ed06e78a502f34d39c2bf8d7449fc39f5815223028f5caad7d05e78df2c7515e08ed48eb086c8cf4356b1b09a563a9829e7e2d
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-proto/fontsproto/fontsproto-2.1.3-r1.ebuild b/x11-proto/fontsproto/fontsproto-2.1.3-r1.ebuild
index 87ea704628d3..079b8b5fb716 100644
--- a/x11-proto/fontsproto/fontsproto-2.1.3-r1.ebuild
+++ b/x11-proto/fontsproto/fontsproto-2.1.3-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.x.org/wiki/"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 DEPEND=""
diff --git a/x11-proto/glproto/Manifest b/x11-proto/glproto/Manifest
index f5b505511e20..c662885666fb 100644
--- a/x11-proto/glproto/Manifest
+++ b/x11-proto/glproto/Manifest
@@ -1,4 +1,4 @@
 DIST glproto-1.4.17.tar.bz2 126969 BLAKE2B 09643a5e9de4aa0f7f9486998d41ff8b3e8cf84c55f785293d3fe224b5aee26e816b83983c380a0208db1269e6643986e04f8899c56f96917c640a6c074ceba5 SHA512 3e5bb1949ab9993e07d2ed7e829b9e0a8803eab476e9f4082fc01087c3dce01f3bcb9d55261eaf60e55977a689b326ed1dcf40f74d5e1fc660c83bea094b6754
 EBUILD glproto-1.4.17-r1.ebuild 621 BLAKE2B be5c3fa1fe4bf4fbb81673d6fb7c60f47e891e31f6419c4c0e678c95b5466239896428b359261759fcb66a59b1a4cb72743c3680bfc8acbfb7560ac205a5ca42 SHA512 f821f6ce120aab20e6bd456de8671e14e5bacdfd500a7abba78bda58ac17ab006ade5a20e7847034c4297383d1d17eeffcb30c80b0bd5525cd49060327e3693a
-EBUILD glproto-1.4.17-r2.ebuild 539 BLAKE2B bd6296c32e39e33273b6859e23a3ec8804844db36b0ef7ef998ec11f938c911add47f38c9368d0ac26762bcdc589b6aa20464636067bd8371d8f5ca4d78211e7 SHA512 3ed1bb397d2b80beddc45f5c3d3a7b837d1d4abf376c35c6c715bb3dc83d2a6590f3dc259cc0b1b1f74655e5fcd6385aaee00b9bbaea9989ac295bc88b37eeb3
+EBUILD glproto-1.4.17-r2.ebuild 538 BLAKE2B f5b2f8608ba9184340edfea2d50da2ebbba37ddedddd14e15444ccbb5dc3c55b08df70c9bce388ff723014a78104690f5bc9cef2e375f59776a3145e9143970f SHA512 d653bc9dd19916c55e04fba6f02616ca8873bc282ccba0df1c6ba8e4cd0815e5583e3eb5d8ab2ba5e9c33428bf702af2e052c0d3a9c4c1f13fc8d22c3a6cf1d5
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-proto/glproto/glproto-1.4.17-r2.ebuild b/x11-proto/glproto/glproto-1.4.17-r2.ebuild
index 890c5f4cdc11..d1c06d7a73ea 100644
--- a/x11-proto/glproto/glproto-1.4.17-r2.ebuild
+++ b/x11-proto/glproto/glproto-1.4.17-r2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.x.org/wiki/"
 
 LICENSE="SGI-B-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=""
diff --git a/x11-proto/inputproto/Manifest b/x11-proto/inputproto/Manifest
index 5f53bb5d28ce..7b8abbb79c29 100644
--- a/x11-proto/inputproto/Manifest
+++ b/x11-proto/inputproto/Manifest
@@ -2,7 +2,7 @@ DIST inputproto-2.3.1.tar.bz2 196435 BLAKE2B fbaf5f96c93cea586f7c5346fe16f5cbc61
 DIST inputproto-2.3.2.tar.bz2 200857 BLAKE2B 92b0656d906476d293860d5264c708dd225475a8c0fce52cbaeee6ddd1d04c63bb45ef7b96e61d22e82a1ec4f7fda3b861bf38c4623f679b23c9286d0af2daf6 SHA512 23d41e9ff4f49d80cd00a436e6dbae09adb7b72d3a3d7909c340b4b132b5908b32a497d5e2ec2c994cf0598a788c0481270bf36ce95171c0be4f74b52715fedd
 DIST inputproto-2.3.tar.bz2 195642 BLAKE2B c19cbe854c8af0a49171d360dead9e6dbb81264e105b8d31540c0eed5de6085f03febf6df957326e8b7abbf49d3675226d05129ff4e58a2aa52b631cc7c400d8 SHA512 4bc3986a49273777850342cfa086641eeba0fd95ad428a2f025bd44e9ea04516cb6e190b3fd2a99fe21c63d9fe4010bebe57aefe3807050d00f8b301289ec43a
 EBUILD inputproto-2.3.1.ebuild 499 BLAKE2B 80c68f7773e42e09f9d6918ca1c9e51b731c22f926ed8a1ae3798f103e5dfc11bde31a462c4ae2f6a18cd34b60cb13db0cf4eb6360e5f2577793ab208acfb486 SHA512 991c2f552801155a72ab0c252391ec70dde547c21c06b49f856016f60792160fa651aa18bda3eb6c39f6089d06507147f53a5143686a069310424e17f9d529e2
-EBUILD inputproto-2.3.2-r1.ebuild 553 BLAKE2B 7daa1be9be75401dc695c5e2293c9643891c1509232ef9816e2db014edf471f0a5dedabdea96e5c6ae0b93fc25add02c292a2500bf3483039974831ac031d822 SHA512 9710e79c2adfa3a951b69323405bb5d4d44bec741736501da6fd71aef5efd16296abcc657c9845085f95a5e38e33d30427f3b6d6c7568546fb0aaa36c0ea5dea
+EBUILD inputproto-2.3.2-r1.ebuild 552 BLAKE2B 861950d683118d093a947fd7d0f69c27c2748c18b930289e0cc7bdc04a59b7b5a2c1e80f9066bb75a64202c5a757a0dfc774c170c4055e56983d39964d48b93a SHA512 3592bc2f5d5194fe05fed6c5792806f0a5a6f040c9b8ece32d3832470ef5dc1d2a8aac8c4d2488dd392963ae7d5cedd8bcc61bcd4268e8c448e00488d57cf3a3
 EBUILD inputproto-2.3.2.ebuild 505 BLAKE2B f2ac82b71235233c864d5cd7ab7a44e16c109827d2db33387cbd6b013f4861533b00138abb6ca05feb268a6c4086bb1f13807694a000b7920c20646e69c17e30 SHA512 5b1dd8c9cf2abd479f1911f6beeddabe80b488fa3211941978313dfd168b8beb7cdfac909bb627d845d168ac53e9ff14863795cf789cd5640a8fe738370235fe
 EBUILD inputproto-2.3.ebuild 508 BLAKE2B a88c73378ab4e2fca560fc0974e0a878dce790f9e28dd720628310970bf5f5d848fa58d53523bbe51b645902eae237337d6560c30fd626cda474de7c5397642c SHA512 3afe0ddc14feb31fe69f15bb349aa02cfa1e262b344a5257a69142b87125814d5b8d58fcf7e80fcc284ea8b50d789b03371d1b25c9b674a9505f8a1147a50d9a
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-proto/inputproto/inputproto-2.3.2-r1.ebuild b/x11-proto/inputproto/inputproto-2.3.2-r1.ebuild
index 984c5e1f4a4a..451cd33e91b1 100644
--- a/x11-proto/inputproto/inputproto-2.3.2-r1.ebuild
+++ b/x11-proto/inputproto/inputproto-2.3.2-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.x.org/wiki/"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 DEPEND=""
diff --git a/x11-proto/kbproto/Manifest b/x11-proto/kbproto/Manifest
index 7e5a4cd8d0f9..90cc4370a446 100644
--- a/x11-proto/kbproto/Manifest
+++ b/x11-proto/kbproto/Manifest
@@ -1,6 +1,6 @@
 DIST kbproto-1.0.6.tar.bz2 256988 BLAKE2B 819b03332f8c7d776ae696c57b4e6745e31643bbff5f30a534aaf3e2b3fe63bacbf52f7a64aaa7c0e3a9c8055fa1a61ac91eed7780b38b43a3483a84ad37cdc0 SHA512 3cef1df57138264dac9802cc4074bc58f82609c6ef859e238108d9ad1ac3a720b991d91f61ca47ea48c56019b465e7e6b37bcbe0b519d1999126255a7d879d54
 DIST kbproto-1.0.7.tar.bz2 250178 BLAKE2B 9f6032d95c25be5d09d5f45ac135a1d91482b34ac155667a0f7888864f16a8221669271c8239a988c3233a13741e408e98987f90a02d12dbe79fc3fae6f5ab12 SHA512 49f24bfd11ee4ef0de658a1f55bcfb4b3a1f7057d90137b899ea3d4ecc40cebde97926a3f4315ddca4ae28d32b2d15f16fda993296acffdb4c007d2f84a39a22
 EBUILD kbproto-1.0.6-r1.ebuild 478 BLAKE2B 42b53296fa0ade76715f462fbbb30d0f7b1fcd4289022f0be38df9108114eef72342d3b923de27c20a758dfd717965b6622bb581546dd5b1c19125d32e132c68 SHA512 b8ebd3f5159f789bc182380512ca6ca386eb01f97110a9b56054afd59ab17839fb49ebe094907c3a7dbaa95128cd923007f70379181ca76ffa8bbf64e3604f52
-EBUILD kbproto-1.0.7-r1.ebuild 544 BLAKE2B 7041a56e6fd2b0129a69402ae3a79faefa8683984e60c3383f1b7587e0dadbb02ea518cdc9f3acb69a4b6546149a7dbb63f707eb4519da65b7313a3b42c30460 SHA512 fe5f9f40150a108a42e86a159d37874d7627dbf3884997b9530aadd0d64cb768776fdb10f018b98a421daf5be53e9730f80db6a42dfb53557695b73deafeb41c
+EBUILD kbproto-1.0.7-r1.ebuild 543 BLAKE2B d22c68f73b6060f9b6f48fbd2fd7559f2dbddefb941acca2a46261101ce89f32d66d980539ac404b1951cb4a48ea08610e31efc5a1291678b1c6b1ef330384fa SHA512 d4b094258bd302a552a3b6479e6c24480b5cff0081ef04ae56bd7170e7aa970f3b202df2db30d7bbe2e90c85bdbba92300a658ffc9c81ddd0c88de0a901c8e0d
 EBUILD kbproto-1.0.7.ebuild 478 BLAKE2B 9c046f4fe7eec97e4fdd3a378835358083df12df23e3dacc7a6c9c15afc7e7415edaff4f0ba4cc6f52ea23f926fb839a2d5b5991c1c531e2645adb81f4ff22e1 SHA512 5668225406f108e69f96c7c32625db4e729ebe60ec454f58baeb69bfcdc3dc0249b114d7982f71b9163f8c6ef7364bc9cd8fc0fefa1dd7a85f0a24cbff71ebec
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-proto/kbproto/kbproto-1.0.7-r1.ebuild b/x11-proto/kbproto/kbproto-1.0.7-r1.ebuild
index 4cf1f76a1e61..4a85895e14c3 100644
--- a/x11-proto/kbproto/kbproto-1.0.7-r1.ebuild
+++ b/x11-proto/kbproto/kbproto-1.0.7-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.x.org/wiki/"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 DEPEND=""
diff --git a/x11-proto/presentproto/Manifest b/x11-proto/presentproto/Manifest
index 705ff20d7c54..8234e1c2cd23 100644
--- a/x11-proto/presentproto/Manifest
+++ b/x11-proto/presentproto/Manifest
@@ -1,4 +1,4 @@
 DIST presentproto-1.1.tar.bz2 116156 BLAKE2B df0e3b2f0ad33f8da05fb8fa33638478a4da965b6b81c1ec880c5cc2d3dbfa2f4e6980daf9dd58447f57deb2fa5510bd588d43488217946d67b6ac605351ac40 SHA512 2c712136c8b4e99190932928d98e1a628197d0bf25180cac196ab8768720d61f7907006315bc3610e23666a8fbe39cfa9115c5fd72914aee2498776c8b46f7b2
-EBUILD presentproto-1.1-r1.ebuild 558 BLAKE2B 99a6d646dc4e214908b5fd0a3babe64a2d9f99b24a875eb163b089d85c7eb1748bb5cef835397e3bf73bdfc97631f650799f0dce1bd6327bbd15d63437f0f431 SHA512 be1437e2944b0b94f675d79cc16f9d01810a0acf8d93d8ba0b347d72204b9f1cd38ea94af8e8b2b6605375a22677180be6e6041e391b22d03f114dadd2afe2ab
+EBUILD presentproto-1.1-r1.ebuild 557 BLAKE2B 9215eacf1a3fc095cd67e68b6fb3fd03507152fd8f9fbf2f9ad75739c450500ece8e3ee2dc62bab347ff61e452ca9dc3f9983bb8e9cb539a25d304ae4cacef98 SHA512 8560f54ebde6ac99bb14a8ffe514b283f52c514e8766583c91466cf8a601b7b69a6ebdf405557af7e3fac3954d5810ba1f780b70df63860b6379eca0de12a029
 EBUILD presentproto-1.1.ebuild 444 BLAKE2B e9a986d9b2ebf1bc4e753e5f2506ff55c13d5dd4b76f57f0045b89da8bc5f7d86171969446eeb1bd9f444892ef16915fa7dbee5e68f87f616bbb730f2827df94 SHA512 c45e1983ca98158ce9fd8fe8ad1a1583ebe948285b6bb689f093ed03c9813b26681c9de54bea5f8d040a00836dfe5b72830eab575d84c924e2b5b4d3ce0ad23a
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-proto/presentproto/presentproto-1.1-r1.ebuild b/x11-proto/presentproto/presentproto-1.1-r1.ebuild
index c143746652f9..eb996f1b276d 100644
--- a/x11-proto/presentproto/presentproto-1.1-r1.ebuild
+++ b/x11-proto/presentproto/presentproto-1.1-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.x.org/wiki/"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-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 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=""
diff --git a/x11-proto/randrproto/Manifest b/x11-proto/randrproto/Manifest
index 9e6b9452e9f7..1beb8c62e4fa 100644
--- a/x11-proto/randrproto/Manifest
+++ b/x11-proto/randrproto/Manifest
@@ -3,6 +3,6 @@ DIST randrproto-1.4.1.tar.bz2 143474 BLAKE2B 84edd8193031d34534b428ebd02bd5c9b5f
 DIST randrproto-1.5.0.tar.bz2 142168 BLAKE2B d3929c4dca17411bfc4a4025d64bf031c64292f8778b83f651ac1bdf516d3f1cb3186aebf805b03b56f2cc72a1a19e15304c07aa65756a0bca8df547f9491345 SHA512 5c56f6acfe3a9da5ffda45e4af2da5081a5116d53f4d2dafe399eae168656727927ca0fb4c29fc6583e87709ac83b025ae206fba9356ebf9e26d3ff545da57f4
 EBUILD randrproto-1.4.0-r1.ebuild 473 BLAKE2B 71c022b6e1d619539aaecd08207f897ecdd544b8d064505e67a6cc592f214e81bb8d2e145c6d5339f9b5610d3d48b6208299baa1da76cc0135c6aef34b4c69d7 SHA512 66a1196384eb0523107ecad27becaa2314f29cab2a571138687030d972d51b3eb14f14f6d5b396b71eebf169f40fef5b243463702f53dae9de98bbe5a22f9789
 EBUILD randrproto-1.4.1.ebuild 482 BLAKE2B 390f01e02f81f34d5260582273c786acb4fbc556a987d79facbc8cb58741d1d2e431530ee566903f556a4d848f907f974e1ce40e5be4a7968d3fb9c6e65b8c78 SHA512 bc034b496f4405c874be2e389ff99f0069ca9f5fe83c18ba7277116d7b605cec79330956f3403a6af8a1cac82d47521692c921b4d36b4d4c4003bc3253f14cf6
-EBUILD randrproto-1.5.0-r1.ebuild 547 BLAKE2B bfb170d5aed2e11fbbceda5f03046647e26791bf7f0ef8232e272b80846b1201c0b11963e4a034cfb62ebe1ee9de713e92c3520fb8f4d65ed3ad5e2c4dbb8798 SHA512 52cf78ea7216be4a50fbd5ab62bf086d96d1a6870e1d612bb6b7481c4ed982395f7dbe50619b5c7e62dfa3940697145ebafa212c68e7693122f0b342ddf2468e
+EBUILD randrproto-1.5.0-r1.ebuild 546 BLAKE2B 865e2420b19959d5d1212b5fdf19a1a894d8a0554222e24bdb70487d26bf1a78d7e3932735a0ebacec11a41b9c39af1304ec0158c5414ce2682e09949f159ee6 SHA512 830ea15ba356b6f797bf12330231cc4c43ea881d79b144b6bd97eecf2b7a2b1c578f8b5a05602a4f510924d2158cca7ddf4714178bb811e762671de889f1ef2d
 EBUILD randrproto-1.5.0.ebuild 472 BLAKE2B 64a0ffc21ecd781471237eb038c48a01fd7456a84cbc3d7a19be76ff9bae989d63393baf5bcdd76f6a9a59f94d9115a78cf1d0ef762b080f03e1836b3fdc7ede SHA512 c2e8064d2b3da5670e95510da49f3b9ea31c66817ce0d3d08c06fae0b646c3dc7e0702721b215fe865d7b1d079fd70163c73588c90510dfef59737bd21688f9d
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-proto/randrproto/randrproto-1.5.0-r1.ebuild b/x11-proto/randrproto/randrproto-1.5.0-r1.ebuild
index b786ddab7b5c..dabcca9a4274 100644
--- a/x11-proto/randrproto/randrproto-1.5.0-r1.ebuild
+++ b/x11-proto/randrproto/randrproto-1.5.0-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.x.org/wiki/"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 DEPEND=""
diff --git a/x11-proto/recordproto/Manifest b/x11-proto/recordproto/Manifest
index 1684b09b8329..3e31d6ace619 100644
--- a/x11-proto/recordproto/Manifest
+++ b/x11-proto/recordproto/Manifest
@@ -1,4 +1,4 @@
 DIST recordproto-1.14.2.tar.bz2 123033 BLAKE2B 5f48f4b05ef698edb51252de9e1f305adfed394fc947c34bd329402ab180c88632b52abc95b1be941228a36fea2fd9352fe94ea453a770938d84595ba986c39a SHA512 ab82d966ffacb46c001df15b272ca58f996826dc6f6835d3dc4d385b31c682acacb073a380d61938e2f242bffdabdd9b8f7107cd5ac67cb7aa3a28cc14a8ea02
 EBUILD recordproto-1.14.2-r1.ebuild 633 BLAKE2B a7ae789529405d0e491d8141e24619524b806efb23f7c7b61afdd142232fbb2831915ea31218ef12767dd9f0b313fcd5b97b79b4b0c9191da7f01f5c324c6710 SHA512 1115fcb4df22a7683eb6c7748ba537cd6f2356bb9287deae99d7388b41419729888453778d3b5f772086960fcc68bd820597370886210e986997f475a80b211d
-EBUILD recordproto-1.14.2-r2.ebuild 537 BLAKE2B d0db775659442d5be166e7289ba1a79ba685dfb6e29d9ce610e1572f4f06820ebf9f742e1a9d97f3443f14739f8950af4a497f530a9d4fc1fe8f98879205b6dc SHA512 5c3ec8b5fba5029548eb8da421f19c2be1330ec21b2435fb62c4e98b809d0c6a70183c1e4e17b816838f065a25be213bec735c8b7724c171c81f1aaa9f6cd865
+EBUILD recordproto-1.14.2-r2.ebuild 536 BLAKE2B b2a6eca77e5afbab934e36a5c32e92906c5d7e046dc76a0ecb67b23416be71ec49d2f13c617b80194195eb34682bf94875cc13040f3c4babb25178bd01460e6a SHA512 a08acf753ab48b103e597f46b4e4f51b9a65be4c75b170271791bcc70b18ed29cfce4a1ad71b8271bd6532c320444cb0668a6b5968bbe313c8fcaf4846e2c833
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-proto/recordproto/recordproto-1.14.2-r2.ebuild b/x11-proto/recordproto/recordproto-1.14.2-r2.ebuild
index 403951058dfa..cc886c3bda1f 100644
--- a/x11-proto/recordproto/recordproto-1.14.2-r2.ebuild
+++ b/x11-proto/recordproto/recordproto-1.14.2-r2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.x.org/wiki/"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 DEPEND=""
diff --git a/x11-proto/renderproto/Manifest b/x11-proto/renderproto/Manifest
index c8513dd21f0e..556ec9db5d2a 100644
--- a/x11-proto/renderproto/Manifest
+++ b/x11-proto/renderproto/Manifest
@@ -1,4 +1,4 @@
 DIST renderproto-0.11.1.tar.bz2 105741 BLAKE2B e87cca44ca48528f4fcf25f4c143b6c011b56f05170e4847d9739b67edada7786ad6f2cc6f71c16cad3e28edc4caac9fc513eb762395f5802d1f33138c8ab240 SHA512 c38bc7247fd7b89732c892ee41c061b20397f4e79195601b7015dd55054b966f0797ac3990b147f80234596ba2c201ce90e292ecefed2e133167955bca70acc5
 EBUILD renderproto-0.11.1-r1.ebuild 473 BLAKE2B 4f5ab602e1040f3ddec6b881e629e5a687c6c5937c7c3a85251c92d2592f79514c325c6ad070d8f95bb3ff134c5834ecf9ce858d1f3efd2f89fb4974bd2e721d SHA512 f717a25779db0b440ef035bba4a0b23904ec124b5f2e84e1e2cf7c7c93d3d5d26c4f9d2b15baca0f676011866ec95e8ee7f0876cb42f675f2ce911a98715f0a2
-EBUILD renderproto-0.11.1-r2.ebuild 548 BLAKE2B 7b5c7ba93a9ef1f302281a362bd2f3d9cf657d63a3a573898fad3f8cf394c69d9860ff2bc3eca5c7645e672f2af3f99ecd17f7fc352ea3db231af8da3f5ab01f SHA512 126b9d3fe621f8577be6131d5b31fe79679b665c3f111e04c3f43b4dbca2963424157b210a4cefd9835d2131d2a5f22be75f52b1d28923e5f89ad4fac8a84f7a
+EBUILD renderproto-0.11.1-r2.ebuild 547 BLAKE2B c44a1ce57d04bc5c85bdbb60f4cdc35373b0f58e0c75417ccfa4eb6013241029dfd34bedad73eecd463180ef2c5dd77d942edb9f1719527031016fd8a85447c2 SHA512 7b3ea71038fd6b018a96377c0275b873365ea4f18d4753af1d300f6dd3992f4f751adeb80ad2f63ded5f08019b6a03c8ab22c2b2344bb7bf268e4354f269a4e4
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-proto/renderproto/renderproto-0.11.1-r2.ebuild b/x11-proto/renderproto/renderproto-0.11.1-r2.ebuild
index 03d7ed9afb17..c204cee3357f 100644
--- a/x11-proto/renderproto/renderproto-0.11.1-r2.ebuild
+++ b/x11-proto/renderproto/renderproto-0.11.1-r2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.x.org/wiki/"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 DEPEND=""
diff --git a/x11-proto/resourceproto/Manifest b/x11-proto/resourceproto/Manifest
index 55c51738e090..b9d1efa5adb4 100644
--- a/x11-proto/resourceproto/Manifest
+++ b/x11-proto/resourceproto/Manifest
@@ -1,4 +1,4 @@
 DIST resourceproto-1.2.0.tar.bz2 102992 BLAKE2B 7e45e4a067394da92cfe57d59d68e32b379534419b5b76c7363dbdc795bed359c84772ceebb630c8fa8f31c06d384df020bd43ff2b48c3752f430d9e6a277931 SHA512 ce8c8fda178ac7fb22b192d4a0f707a96f42ecd550ae8e6ddd7e1ed0067951ef955f7bee60f63a2b2422176e5f093c38e3903f7c4e5e3bea230b934b7abcc4ca
-EBUILD resourceproto-1.2.0-r1.ebuild 528 BLAKE2B ed4a263c3d1f7f2c4a20b3b03dbc13f0d234fcc1c72f1da9f76dd3075e6f3f9eb307edb2f0723508d54edc4814cd1f739ae466c46578f32bcfebd19ad806b1c8 SHA512 19291c64c939ed6a22bc04189ba95a9afb6d98d44ebdb1adca247613ec969706ec7e6952adb33f32b5323ff1b97fa3ae864ef37933dc350b576415bf6596c749
+EBUILD resourceproto-1.2.0-r1.ebuild 527 BLAKE2B a131fcf958fd3a84668537d4e14c6ef028ff14745524fc12aedf2376a79cc488781d15948f0d9343796b72565039bf099ff44f97f1d9d8c0a55b1b857173a18a SHA512 9f58ec79f1b63b05d1611c994b13f20a5ca0820c05c57ce60b3ceafb177235f03bbd2d2d838dd706fdaf93eeec03beee510e13fe08715209b8f32cc11d5da8f9
 EBUILD resourceproto-1.2.0.ebuild 416 BLAKE2B 364587114469333241564cd06b1397cda5069cee71ce3f285f32029de65fd374ee6ba13e7d80c59cb95cdad65517b09461e9cb84baac0786ad41d6f02187cc79 SHA512 7c6f18e57af3d82bb3f694c1b357d89814c5fcf781bb70a74ac889da0cbcf8b8fce82c747a28893e64f508184da2b118d3159063962b896c3760a2269f6d59d6
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-proto/resourceproto/resourceproto-1.2.0-r1.ebuild b/x11-proto/resourceproto/resourceproto-1.2.0-r1.ebuild
index 6116fb50948b..62be8692b04c 100644
--- a/x11-proto/resourceproto/resourceproto-1.2.0-r1.ebuild
+++ b/x11-proto/resourceproto/resourceproto-1.2.0-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.x.org/wiki/"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-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 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=""
diff --git a/x11-proto/scrnsaverproto/Manifest b/x11-proto/scrnsaverproto/Manifest
index bf26b17de807..c0009e4228cc 100644
--- a/x11-proto/scrnsaverproto/Manifest
+++ b/x11-proto/scrnsaverproto/Manifest
@@ -1,4 +1,4 @@
 DIST scrnsaverproto-1.2.2.tar.bz2 118820 BLAKE2B 96bcf9e37b2d2a7f646691f08d376e8307954a0e95ae557a4688e94406ef4c1ea841d5ac3373a00a6e368bf09139aaf1421f6d584961bd8e482c241b252ecc01 SHA512 e74a512a6101967983a1d713d22a1f456f77519998116ef0f0a9e4b44ae4730ecd41eb9c0f7fa53e9f5c94967541daf10693d701af832597f5347461c5990ebc
 EBUILD scrnsaverproto-1.2.2-r1.ebuild 619 BLAKE2B 10acbba094d48f3054254a42272608a055d1d3c46d7e6ec306a7fec051e0d22510f45c0666255570f90debcf7574939cb8997be22ce3d7f3c41dcd3b6cc050ef SHA512 8eb6cbb95abce876a93794f149b658c5ff6b6815eb3c65367bdbac64690713fba4beefec4eaa41d345eac9d1b6058a60c2dde7d9e7338a226541ee5b1694ac3c
-EBUILD scrnsaverproto-1.2.2-r2.ebuild 529 BLAKE2B 681bb0126054e5a9b4f17402109e892513e82081dca511c5fb58a35be12c885e146edb8917a5fec6059b084724896909e9067c0d9a1a91981b894e3e4f0d8dc5 SHA512 f824c004323e15753c98f6e244e1c34572a9b7f9704053cf0ccb1dc25266c65b204874d10f39639e5ed69e14f76d437420d123ca9e73309cd2f6c3e4dd239127
+EBUILD scrnsaverproto-1.2.2-r2.ebuild 528 BLAKE2B 0f7efce6c16acf3a82e81df0f12bf48c0af268eab31d26b1916cf8a769e006fcabd8a0025e0fdb8731542d6128bb811147d62a9f62e3fb863514e8f7df3b7bf1 SHA512 507ae374a04731393b2e8c9c6cafe6792be273066251ba8f6b7938936ae2dcdec26b2e58fcf7a7740fc64cff758b9beee542aeba552bdc69dc54f206e8280c2b
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-proto/scrnsaverproto/scrnsaverproto-1.2.2-r2.ebuild b/x11-proto/scrnsaverproto/scrnsaverproto-1.2.2-r2.ebuild
index 7ae2fcfca108..6f67acacd148 100644
--- a/x11-proto/scrnsaverproto/scrnsaverproto-1.2.2-r2.ebuild
+++ b/x11-proto/scrnsaverproto/scrnsaverproto-1.2.2-r2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.x.org/wiki/"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-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 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=""
diff --git a/x11-proto/trapproto/Manifest b/x11-proto/trapproto/Manifest
index 8f2e4f2d4a55..c1d8b301d67f 100644
--- a/x11-proto/trapproto/Manifest
+++ b/x11-proto/trapproto/Manifest
@@ -1,4 +1,4 @@
 DIST trapproto-3.4.3.tar.bz2 48785 BLAKE2B 7efde2955e1e295e3b2269917933afb5ca7ede1f84e1ee70bbd62c68835a9faeaa061858b9d4c03f51bdfd9ced7828eca2527b6ece55942f6df8abfdc9d1cfb8 SHA512 a5bf93bfa2f675e874ece8510a693d3a1ca4ba0b3981740249d4c78273a74724209f5f6d83c6207038bce1c3edca0bdd98ca3e1dd7aba04dcea146c9a1a2e8ef
-EBUILD trapproto-3.4.3-r1.ebuild 535 BLAKE2B 0e3f0d86db17ad2911d1cce277053238425649fe35611d01d1c7cd9c86be63dfb651ee12c48259e4e0b8afcfc775dcfcbefaa38b9261107d7cf2c3aa9127f0ef SHA512 3d36acbb481fb9fbe7b82fa9413f3ee78ae6f583cbbefa6e0688ca3d2bd2c423dabf4e4849a18fddfbf5d27e3ae40fba34fc5c953573083dc2fa64cb2721dfca
+EBUILD trapproto-3.4.3-r1.ebuild 534 BLAKE2B bcc9ac184e83bc80414879950e9ea63ab77a218283c7286d58ac71c445d73cfc22fe3b4ef27919545fb1924b89125cd1fa9ccf6b375480f1b211a70297de74f0 SHA512 de82cfb84a52694659bc8fa572cff45d5c7ea7f7c95c62a299edba252cbca26db0a73cbd10c47fd9eaa1a3986713a321c3166107f46580092fb82b47df40f8c3
 EBUILD trapproto-3.4.3.ebuild 423 BLAKE2B ab923ef1c6ccc55cfbe0dd818f8a79ace78fa7e779437723149a8751e76cede17c6e1060364113a5b1aefaac15041c600bb2c10eb4eddb21e05452bfec7e371f SHA512 a1b6cf95ae668ae185bdfa71b8c45fb4df1576eca14a7fef9f2e91c05e76770e81f45f11dec6b6bdee8b22badc4988f89585a8e17e014373014231dc2755a79b
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-proto/trapproto/trapproto-3.4.3-r1.ebuild b/x11-proto/trapproto/trapproto-3.4.3-r1.ebuild
index 48dff5a1474e..f945d40984c9 100644
--- a/x11-proto/trapproto/trapproto-3.4.3-r1.ebuild
+++ b/x11-proto/trapproto/trapproto-3.4.3-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.x.org/wiki/"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 DEPEND=""
diff --git a/x11-proto/videoproto/Manifest b/x11-proto/videoproto/Manifest
index b26e3ff009ff..a52eb10ec219 100644
--- a/x11-proto/videoproto/Manifest
+++ b/x11-proto/videoproto/Manifest
@@ -1,6 +1,6 @@
 DIST videoproto-2.3.2.tar.bz2 118862 BLAKE2B 124051d4420f2baa2ad0ee0351cf702f2ba7a3884b7a95be3f2ee349d22cad53d72ea964db67ecaa665237caad49359936aeea27a201b90a92cd1de4b4aac042 SHA512 57ca8981b217724e4e0599624e6d8077aca0f2568855c54b74dbf5e03d25864eb114540b02a49c11487beb03d55d52efc09d8a7fb86a3078a4d52f4a3042ef36
 DIST videoproto-2.3.3.tar.bz2 121016 BLAKE2B 684de2db59576989b3dcf60a59210adc02e8be032c69a8ea8d1d8a6dede3152879b627e760a4b2dcca478b844823e7a65e7ed6c82c91bfaa15bb076abc86fe3d SHA512 84136f7ba15e86ef7e178af4ca70c4c0f0a83fb37e9e39c2564c31762439453c5e7b85934366b711261d454615a57314cf75ac35a17544cb186bad301e920cf5
 EBUILD videoproto-2.3.2.ebuild 454 BLAKE2B 0b2ffb86677d256fd7b208f02389ca2b243a433d6c34d3acbb2b54749d4f2f996a13e910f1696cb888edd49a890a4d98dc2a5504bba33234a1860e92bda3fc14 SHA512 8b05eb153e5e2efbe08a10032ff001ad8fe2ed0d45e285422185227f3399dd62401c47f6a5a2c4cda4b8bf5c66300159375e10399e5c7cec35f0dacc99d0d23f
-EBUILD videoproto-2.3.3-r1.ebuild 536 BLAKE2B b164229ab47358770134447eea7dc81e6cb1a44b6631d5cb272f9c438f105e5f53be870c835ce08c80b5753baaefbdbd2d201d9a739731ddc1156ddc18810d74 SHA512 d26954ecf2ee8d9e4662d83836d2b90a23230f8588e48b9eab312162edb7301899c9be71cc185e74bb0c5094873d739ce8ee04ebea2eece866db89c6ff1b76c2
+EBUILD videoproto-2.3.3-r1.ebuild 535 BLAKE2B 5805ef359cde599decd0758566d6de634e062b2fcbf2968f1e1a024d93e7775002952e1faf58c510629dbac6e34c6b6d359bcf502f117a6070a03cbe3895ad96 SHA512 1a942d91ee796b60378f5e4770c26bfa025767978fa0d3f5df8866a4f8c83c64309c7df2e6555a0370b27b09c2767becdd82f630c584710271748209ab2afad5
 EBUILD videoproto-2.3.3.ebuild 453 BLAKE2B 4f28d5b2350c0c5bff9e236352d5e27ec058ef03c8a32052742cb98028e5bdcfe00013bb107ce3ff1909df9960ac64e1a2a9c28eeba8b77eac7978dee2df95c1 SHA512 e79ddddc465b1bf2383cf5e8459805adcca6b30c263e9a7892a561c88105782f77784a715194530449adf0529a9aac965ea30c61249a033241d91f4af2f0bb89
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-proto/videoproto/videoproto-2.3.3-r1.ebuild b/x11-proto/videoproto/videoproto-2.3.3-r1.ebuild
index eae5e2b9ee6b..f5112c77cd57 100644
--- a/x11-proto/videoproto/videoproto-2.3.3-r1.ebuild
+++ b/x11-proto/videoproto/videoproto-2.3.3-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.x.org/wiki/"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=""
diff --git a/x11-proto/xcb-proto/Manifest b/x11-proto/xcb-proto/Manifest
index 3f2bfb49b902..704f30aed7b9 100644
--- a/x11-proto/xcb-proto/Manifest
+++ b/x11-proto/xcb-proto/Manifest
@@ -4,5 +4,5 @@ AUX xcb-proto-1.12-update-xml-schema.patch 6196 BLAKE2B 86026b2845d897fa58101915
 DIST xcb-proto-1.12.tar.bz2 153890 BLAKE2B cdb4b245e838ca56bfdcaa9a0618ce45e5d4da8ee10f7ae3389ff297325c3d81ba446a6385737cc9b053ecb06a0c829d99ab27dceecfec49ac1591c25c832c46 SHA512 1f427eaf223971b25b56c9f641350e03f5ebeb17a1fc212ce2a0c892de7aba7e53d5e3958b073a122bb344c387c0ff394cf96f542ff046f33de4e1cd27fb9e5c
 DIST xcb-proto-1.13.tar.bz2 151981 BLAKE2B 04d90838f8a892103e6d7aa807f1b0b6794f1538c6c986ad3cba67cff3a963ff680e45c2137c5d6330736a3aa1a387d61fc247f23487de9dada2f4013590b4a1 SHA512 002aa2aa0ad503977e03419c6f136f1e3aa8c787916830ce6d6be8f81ca99edc1d8fc5f71ce8c592b490cc767bf6567695f0bafe55fe3f743076bcddbaac07f7
 EBUILD xcb-proto-1.12-r2.ebuild 1711 BLAKE2B 4116201d5e1d186318a5bb1f8a4866ccd46be9ce1c99c6c4ead5bddc731e1140f9ddf1912f3f8e2d7baf0bb0261cfa8a1b5c6dc673cc2c00a47361288831e70d SHA512 6345ebc3a9c0e1cabacc05050ca5f3888bae6d5c4ee23c58f7efe15655b64e7679efc4653ec9288b48a382a3ab94ff79e3b37d42e2f11cf815a263e92fcf5cb4
-EBUILD xcb-proto-1.13.ebuild 1536 BLAKE2B 75a1bdd6013367a823c58cec6f5f2fb2ad1ad6bbe98c22ca8c34ef65bf87d50004e9e2630fddabe435aae25792100fae67b8ab919e3cbbbb49d3c166ce60a670 SHA512 fc8685989101278cfa5209370e520dd204bd46f5d66eeb45228b257a609535dc7b634d539984e7b933b5cf601f75ee272418d5ec52908462a2a5ba34d21722ed
+EBUILD xcb-proto-1.13.ebuild 1535 BLAKE2B 41aefbd65a487599c8b9459532867bdf527254c62fd38f8f6844c68c1f638f4c1809e14af0a9721f1b4b7118638d5d20e21f5b4fc14b17487fe524209a6e13a4 SHA512 0b5e57c11ca9e45b32ce7e1e31ce47481081da2775170725317e85347bcdf0a7126eb27947de67c31fb477e0e1b68883bb12625d6022f7bb39c5b45b6f2bc5e2
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-proto/xcb-proto/xcb-proto-1.13.ebuild b/x11-proto/xcb-proto/xcb-proto-1.13.ebuild
index ff528d697dc0..b11d2a1c24ee 100644
--- a/x11-proto/xcb-proto/xcb-proto-1.13.ebuild
+++ b/x11-proto/xcb-proto/xcb-proto-1.13.ebuild
@@ -14,7 +14,7 @@ EGIT_REPO_URI="https://anongit.freedesktop.org/git/xcb/proto.git"
 [[ ${PV} != 9999* ]] && \
 	SRC_URI="https://xcb.freedesktop.org/dist/${P}.tar.bz2"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="${PYTHON_DEPS}"
diff --git a/x11-proto/xcmiscproto/Manifest b/x11-proto/xcmiscproto/Manifest
index 646dc26c1b78..b28de27a084f 100644
--- a/x11-proto/xcmiscproto/Manifest
+++ b/x11-proto/xcmiscproto/Manifest
@@ -1,4 +1,4 @@
 DIST xcmiscproto-1.2.2.tar.bz2 112486 BLAKE2B aede4c96afe54829d1c751a436d3ad7be8858dc1455546e1188cc02e1d7180b0a3de97ce08abdf45e0320e25fa846ab4d5740e5e771987402ad8dbc8ed49b984 SHA512 33060d0f9bba92670fce6e42f5d9094e84b803fd07e61b159aafdbee40a9876b49cf844bc7bae4c628fbb11a6a0883a9ee07041b59290488f1e9dbfe6e5128a8
-EBUILD xcmiscproto-1.2.2-r1.ebuild 526 BLAKE2B 8180c6d9905077232c4311660c6939097f923c3de31f1b5cd36902185a072ea0a64395242dc370fbcb7a127cacdc130a2344fccb8209baf351b6ad94b1cd7662 SHA512 78cc285b8a230accabff2f987b1b9cdc3ead364a8881b1075b9b90eedcea40c5b5ab6ce4fe9af4558d52dd82a7a65c81594ca88b926ce52e6ca5ff05558688a2
+EBUILD xcmiscproto-1.2.2-r1.ebuild 525 BLAKE2B 9d44d51bff12a2448d521221d4ef73f1cbd441a58eb3ae161105fa8e12ac0ba95fa75625f7b59a2dfbcc417e41fd4eb98a2bf55fff7b4356b6cc1d94f1086dc8 SHA512 9d3cb5479aa4e6e16ab16588ba4ace803c0ac829bcccdc568f3f0434c1ad0cea2d5aa608583af86459504f5bde7a65d747edadd7ec5d6d7ac8ace839ac2b9fc5
 EBUILD xcmiscproto-1.2.2.ebuild 585 BLAKE2B 4e0961cf9cf9d82050f7eb562c3fdb38bc67c9a925d55f012c0a576cb9b7daa74834e8f8f0871c287a995d26d54ff306bacae5f1421e2fbde8a5682ab172d567 SHA512 3c81da3dc9e87ebbba10f5a25666d57b19a2f5cff84b5730c12e1971abb1bcf3c9df12602521f0cfdf0a4039c1843b0a7eaac1c900041e27de3c780c3cd9cf9b
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-proto/xcmiscproto/xcmiscproto-1.2.2-r1.ebuild b/x11-proto/xcmiscproto/xcmiscproto-1.2.2-r1.ebuild
index a7282e59ab83..9b5eb6d8595e 100644
--- a/x11-proto/xcmiscproto/xcmiscproto-1.2.2-r1.ebuild
+++ b/x11-proto/xcmiscproto/xcmiscproto-1.2.2-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.x.org/wiki/"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-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 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=""
diff --git a/x11-proto/xextproto/Manifest b/x11-proto/xextproto/Manifest
index 953c503b96cf..c27544d4c4b5 100644
--- a/x11-proto/xextproto/Manifest
+++ b/x11-proto/xextproto/Manifest
@@ -1,4 +1,4 @@
 DIST xextproto-7.3.0.tar.bz2 229310 BLAKE2B 21a5474ab0aaf835abf6eec860a9f0838114c616bd90d79005a7b2cd700872375fe8a40657fbd3b76768e1cdff27baeb2b8ba8c2e6c52410b03e8f9f9592762e SHA512 238beed85fcf6fe5b0809e52814dd44fa45fe6868239990086cb8dd2c446292dd4794698abd07ed10bd146a7096c1679f7160da226f9e861dfaf6c8e22315d61
-EBUILD xextproto-7.3.0-r1.ebuild 552 BLAKE2B 73fa94dce228514feba1cd32b6c05428b6ebe08799d1b5782957562b5b2d8229b20d46c501c135738379c08b410f0a776037725299a3f4e9ce2baa317d7f8912 SHA512 7ee473e87b87d1dbec7db9bcbad08fb8fbcd8f2914b1310954aa715738b7ee1b103105c53967e40bf97b3ed5060be407a0c2d360b4083950acde627e8ff4f3ee
+EBUILD xextproto-7.3.0-r1.ebuild 551 BLAKE2B 4843d6a0831f2ff31af5c7178f161e1da566a71a12291d4bc528e15fbd10f8561d00e9809905370bb2ad4986e9a10d7d7be74169279caef4bd31b000243a5f86 SHA512 eecbd1951e64dca13bf697954064161f2f75ec7467d88916a987df10e527b69676134803c36de36c5b25bff77b3cea4416ef9c532590b5c1c11fa4671e4a9d58
 EBUILD xextproto-7.3.0.ebuild 626 BLAKE2B 1a23a8ea8ccb370d30d2d8e86c3c2ce60f9d35c2833eae02d11559e0d07d87a3c90129fd8209c257721a439dffb909bd68e3ab20172470267d29826f2da0d86e SHA512 b08c1c830d8712c94ba75824b522859f30e99d8441132360963f0dc6c7f9b7c55e38428788320e1868a067e3f20df765d63e3f3a4b60e0828231dfc8c91578d9
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-proto/xextproto/xextproto-7.3.0-r1.ebuild b/x11-proto/xextproto/xextproto-7.3.0-r1.ebuild
index 4da70fddd45d..d617efb4e997 100644
--- a/x11-proto/xextproto/xextproto-7.3.0-r1.ebuild
+++ b/x11-proto/xextproto/xextproto-7.3.0-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.x.org/wiki/"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 DEPEND=""
diff --git a/x11-proto/xf86bigfontproto/Manifest b/x11-proto/xf86bigfontproto/Manifest
index be5644bbb32d..5a34a2a60bb0 100644
--- a/x11-proto/xf86bigfontproto/Manifest
+++ b/x11-proto/xf86bigfontproto/Manifest
@@ -1,4 +1,4 @@
 DIST xf86bigfontproto-1.2.0.tar.bz2 49191 BLAKE2B e72d6d3a6ec321dff54f834422fb75e382712daeb89f02f6e6eb20dd4a066a932b874d83f3c6c730a832b6c010172c840cc08aec2ebd7b925ead90bc5bb331a4 SHA512 35b53ee1f428fee6777733264a7534a28ec6ffb29fc0ad9ab02337101d651ec94007bf840d0b591ee36a063280d4a4c71ff08f37100a63bb27581b5a9f69a710
 EBUILD xf86bigfontproto-1.2.0-r1.ebuild 476 BLAKE2B b87a1e43161c6edce5abb833ca5a31ae0867366987a3615347999bba01039966ab96d840cb5a4e208d2cb38645e29a16391dc1b0475908152b13a18521075b52 SHA512 eb6131b3f8e05f341d5a8b1b57af1a997b83f0022132e5d67a9af8be95b732b4d99c30f8319d68a64745870a624a710bb7794590b042f44c6ef17a1bbf499701
-EBUILD xf86bigfontproto-1.2.0-r2.ebuild 542 BLAKE2B c8290984fcdb69b54715873c6a3521b1a72e5aa655acfca8e89214605ae76bc82e695361e95769f630f5723c651a3558ff270bf97d07c958cc10afc01c4dfcbd SHA512 421610825c9a60f8a7b29ce5c3255104100c473d018a8287fb5a0c7044cc269ec25423bdf5b0e611364eb26fbe3a929d904ceb1bcabda65969c274e1115f8328
+EBUILD xf86bigfontproto-1.2.0-r2.ebuild 541 BLAKE2B dabf63f43167caf9557d336834a0c1614212f8f7ef4475053df2b015043b46e5f40ae19eb00215a42317716faf07021e5458f35ce6909966dd446b71b5bac75a SHA512 7d3e80d8f0726357df3b4f41c5638450176eabac1c5cb72cd26ea6feb317d5c976afd0ebaa56056f1d19a57709f8f38088ada8e7bbad7b1d7d3ee6984243f54e
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-proto/xf86bigfontproto/xf86bigfontproto-1.2.0-r2.ebuild b/x11-proto/xf86bigfontproto/xf86bigfontproto-1.2.0-r2.ebuild
index b56e83e53392..9c132991f95a 100644
--- a/x11-proto/xf86bigfontproto/xf86bigfontproto-1.2.0-r2.ebuild
+++ b/x11-proto/xf86bigfontproto/xf86bigfontproto-1.2.0-r2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.x.org/wiki/"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=""
diff --git a/x11-proto/xf86dgaproto/Manifest b/x11-proto/xf86dgaproto/Manifest
index 93c41aa7d290..fc03a54a932d 100644
--- a/x11-proto/xf86dgaproto/Manifest
+++ b/x11-proto/xf86dgaproto/Manifest
@@ -1,4 +1,4 @@
 DIST xf86dgaproto-2.1.tar.bz2 85934 BLAKE2B 399a8291a52bf04ba3a796c407a37703d3da27c27fa69bfdc8a717468488471b6b6312275e072f8a7e878a02db694e588e3675b4a47a309b9974263fc8bb3516 SHA512 dab56f5e59d1099d0d462e2f056e073c0ebde46aae6b9cf1c12b1fda43b5f21fb438dc811305c3114e04eb2fd2b1d13ddbe0a1d9a5c8155525db82db00e1461c
 EBUILD xf86dgaproto-2.1-r2.ebuild 441 BLAKE2B e21009dfb29936a1adc2862cee97f6f7fb35dce38db6ef0c5e2b4a0aeb61905acf31fb7a68949d2940d1d7e59fab1a616cc115f089afd708356008212568687e SHA512 582eabcabddca84cb2c07410eb67e1c84e155a5eb33ac319668e970e03940164e2f443deaec1d86244f61f5c0867a1300014b69b1c0bc0b1aec556e3e953d109
-EBUILD xf86dgaproto-2.1-r3.ebuild 527 BLAKE2B 85f8c6af15b430c644b6e3ca536a12614865e795636a6fca1d1c019e634d2116f9f88af258fb747e79c23fb2b806eccb96290df2637b3862262a42a3c9f82feb SHA512 2df206ea4cfef94daf1ca94af724eb7c0602f817fa49b1f6d80a4115fdf02be4e7539f0ee7b1e376a5b42df3e3673298f5bbbd91ff18eeb08e3cd0060f9d1c5a
+EBUILD xf86dgaproto-2.1-r3.ebuild 526 BLAKE2B 2192a0f5af33142808fc4d93e57f40ad664df2ff0cab5f0a9d6c82189a99babb6a4212a93be9e09d4a72e6d6b815cd38de2dd4431eea3db1eaf75a18aabae6e4 SHA512 528662d3fec1957291a7faa7a057fcd9b267a55bb0f9df1cea01629477a9b4ade4238754d911ec7efdd1e0acc121116ef3b64721fa9b2522b1a966e76d8c40e3
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-proto/xf86dgaproto/xf86dgaproto-2.1-r3.ebuild b/x11-proto/xf86dgaproto/xf86dgaproto-2.1-r3.ebuild
index b8ebed97cbfa..ee4d53fc4628 100644
--- a/x11-proto/xf86dgaproto/xf86dgaproto-2.1-r3.ebuild
+++ b/x11-proto/xf86dgaproto/xf86dgaproto-2.1-r3.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.x.org/wiki/"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-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 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=""
diff --git a/x11-proto/xf86driproto/Manifest b/x11-proto/xf86driproto/Manifest
index 5ecc70e29d5f..583aa53c25c3 100644
--- a/x11-proto/xf86driproto/Manifest
+++ b/x11-proto/xf86driproto/Manifest
@@ -1,4 +1,4 @@
 DIST xf86driproto-2.1.1.tar.bz2 96528 BLAKE2B b0cbd81a77e1660223f8c0927b2f5c5b428085a66641bd40a40f93eb55c8f2d87735d52acebe8805dcd43bb189730532c5deeabf996b5d17f10017d2dc128de0 SHA512 dce0d4da1dd703a6cdfe7676537034d43c9e84d70f20afdfe59be7929a97fbd077fa7026e41c0fca8aafd5fe666b2ee99265c8e94e69263bdf46e2be9ff34df2
 EBUILD xf86driproto-2.1.1-r1.ebuild 436 BLAKE2B 4d8e239e9e4804985862098d2bbc373521bdd3b1131885430b242331360baddc037d48d3b9b47efabc3126a277c5dca080ade12ceb8211fd05712c88b4bb9861 SHA512 395cdfc770c47a6752e5f33c533406fcfb0e31063af8c8840bcdf08b8f94fa999ae6902706cb9c0918823a767bd5aa700793f5e8301c095313ac20ca74f88de8
-EBUILD xf86driproto-2.1.1-r2.ebuild 527 BLAKE2B ca5e76ee935d21f4741265922d03870c5682670fca60b8f9c847ba486650ec1b79afd74650c9eb88f6a95582e62eaa44b7af72837ad667559e67fa1b9763c33a SHA512 1a7bd7a6be39a80a2b60dcae73b703f62facc76273a173893c0955091830d8f7a0520d14f70df4004f8d936049b1bde908e8ba7a10ac477a1fa8f99a5a1041a7
+EBUILD xf86driproto-2.1.1-r2.ebuild 526 BLAKE2B 82beb8d94944715f89237e6de8611355667d23512b61491029a4e65b8270dc1b7661bcff4739cb02fd3356cdc7600356cfbc9a9f6831655b17287b6319975a6f SHA512 5422bbd30691de7a761f16853984bbd937aca4e2348236dd89080ce46fb26f410f5e1236278407963a5c918d4ac54b80e0e207736f64843a6dc1fbf4eebe69c4
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-proto/xf86driproto/xf86driproto-2.1.1-r2.ebuild b/x11-proto/xf86driproto/xf86driproto-2.1.1-r2.ebuild
index ec89cdb4c522..d482140903a3 100644
--- a/x11-proto/xf86driproto/xf86driproto-2.1.1-r2.ebuild
+++ b/x11-proto/xf86driproto/xf86driproto-2.1.1-r2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.x.org/wiki/"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-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 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=""
diff --git a/x11-proto/xf86miscproto/Manifest b/x11-proto/xf86miscproto/Manifest
index 7e03414601fa..99f47ad18893 100644
--- a/x11-proto/xf86miscproto/Manifest
+++ b/x11-proto/xf86miscproto/Manifest
@@ -1,4 +1,4 @@
 DIST xf86miscproto-0.9.3.tar.bz2 84950 BLAKE2B b9e6b3e68a50975408c968555da0b16c585592477109f3e2401cdaf528dbcdeb2d032b80e93dda499f9eae0bef24a65dc47a1b1f9a515b4835690c04b5d67113 SHA512 b82370ee3aff3ee13c15ce645a74e6d927df0a2db01830a21fea4c36445495849d24410639525f02f369aabe8e1b6e6ab9acbfd3a41cb3cd7e6060a9c8ae320d
-EBUILD xf86miscproto-0.9.3-r1.ebuild 539 BLAKE2B 95fd2bbd299cb287c3eba1bbe9c1c1eadfde62837e891787d845c41c99dfb650f62c7d61033970d775ad106597e2e46d5ea18702106d8b7a9bad0f5b9005ce08 SHA512 b104f3313012888d68d21c376e943744b292fb8c93040ee218b72fdec61507f87e1547f7e038b4ce0d9d3e8afbaf5582a8a669d70d4dd7e4efe2a3d1d901e5d6
+EBUILD xf86miscproto-0.9.3-r1.ebuild 538 BLAKE2B 337208caa00cb3418d13e61149dc8d86e11f68a8ccdc3cab482528dedf6788e27b441be1e00559894fee2a316177b85c46eb90e6ce5204584ffada053962bf1a SHA512 b85bc40edf1bae0a0142a3f11a91aed7fe12aca4bca2dac271f268648972016ee518e05aba00b79ddbacf1e6354c925ef520916c8186138733181d83ae75d77e
 EBUILD xf86miscproto-0.9.3.ebuild 416 BLAKE2B 805df8b00431158f59efc4c8ef3e73686d1e0e152e9ea9457ba7c51198ca8ae87071091fa157918ad9e5dc2ea0db5f3e431d1ae38f9846e1fae10398ec3fbe53 SHA512 aa2a7dd6766e7940f31b8eb0b5652756501bb125aedc0de364bc9d3f0d45b9399bfefc570c7ea5d8f8979960e065fc098d9b1ba77400264609e1f0d840fe73e2
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-proto/xf86miscproto/xf86miscproto-0.9.3-r1.ebuild b/x11-proto/xf86miscproto/xf86miscproto-0.9.3-r1.ebuild
index d6eb62e53bab..02492d1a8235 100644
--- a/x11-proto/xf86miscproto/xf86miscproto-0.9.3-r1.ebuild
+++ b/x11-proto/xf86miscproto/xf86miscproto-0.9.3-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.x.org/wiki/"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 DEPEND=""
diff --git a/x11-proto/xf86vidmodeproto/Manifest b/x11-proto/xf86vidmodeproto/Manifest
index 69a939b9ac03..5879859e341f 100644
--- a/x11-proto/xf86vidmodeproto/Manifest
+++ b/x11-proto/xf86vidmodeproto/Manifest
@@ -1,4 +1,4 @@
 DIST xf86vidmodeproto-2.3.1.tar.bz2 96822 BLAKE2B 53d5c1896ca27edbf8df3af1b52af5da1463e19787ef13e54c9a4901b2b4b7a82717d29aba453ff7769c53d90d0e71bd6b5135f41784b32ba643be3c87e272e5 SHA512 d68784339271226a71360253b5f35d9cbec483801b4df3684bd070b1208a478edf9e5f55f1ff8ff186c81c56fb6e105e8cebad43d650cdbe605eed10bb7c7c50
 EBUILD xf86vidmodeproto-2.3.1-r1.ebuild 501 BLAKE2B 75705d28c9eca3dabcf93da4a8edc753fa6c061a6e2e5e7b84ea25a40281e2d44105b92bf3209838b1e9d55fa65d7f6ecabdcc35d58c4f1d17bff7f8dc582393 SHA512 5cd45402312385a93a35efe2824d8eda89e8c6552c90bd03eda9fc17b17fa0577503fc4bac50225536ecb8ae0462ab500e3b01c4c9554494a1fd5b2f0439fa4d
-EBUILD xf86vidmodeproto-2.3.1-r2.ebuild 553 BLAKE2B 79cc34093a4eaa2cff277213c8592dc3a2e35356d7a060aad169de54e68c581da911ef4ce56f88ab2b2ab329d0fa96df4af9ff522f3d1bdc72c9d16b75be8cff SHA512 407b6a15553fb9ff5a7f3c54dde6fb1357c7f114ab3e7a300ba14d13b85106571bb9dd864e72fd5d730141e3ee856da93bb802c3acd9aa6117378566c8a53f79
+EBUILD xf86vidmodeproto-2.3.1-r2.ebuild 552 BLAKE2B a0b46f3c0402485076f70bf8b54a20b0fb6fdc86d50f1cfe795faaa707bb006bd39990a1b274b0aa42ebee8f8dcdbd1819ea1f41932afd1f1f3e166650639616 SHA512 6bf2f2d32c221017c83aad9807f3b080a88623a921dda4a7872a4aa73b8744d06706643a02ef18ab81bc0861a5087d633b39912c51c09f8b841e4753446fbd36
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-proto/xf86vidmodeproto/xf86vidmodeproto-2.3.1-r2.ebuild b/x11-proto/xf86vidmodeproto/xf86vidmodeproto-2.3.1-r2.ebuild
index 117538cc636f..d794ecc72865 100644
--- a/x11-proto/xf86vidmodeproto/xf86vidmodeproto-2.3.1-r2.ebuild
+++ b/x11-proto/xf86vidmodeproto/xf86vidmodeproto-2.3.1-r2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.x.org/wiki/"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 DEPEND=""
diff --git a/x11-proto/xineramaproto/Manifest b/x11-proto/xineramaproto/Manifest
index 25ca3ff288d4..97d6db372344 100644
--- a/x11-proto/xineramaproto/Manifest
+++ b/x11-proto/xineramaproto/Manifest
@@ -1,4 +1,4 @@
 DIST xineramaproto-1.2.1.tar.bz2 96239 BLAKE2B 496a3384bb1a167065cf9f7c26dbd18414af66759ec1741a09da852e204a6b90fcb0624f0207d9551f396f2b1ef3c5581a699510a75f2bb9327e6382c137d2a1 SHA512 ec2194c9bcad3f0f3eb3e9298792272213aa032ae9d6c00dcad567f31d7278a8c676fc67f47aae1a6deef5bade0b204346ed16da4a4c4d5a507c04d109d3dbb3
 EBUILD xineramaproto-1.2.1-r1.ebuild 468 BLAKE2B 64a583279c0fe7cfe9f7a9c9c5b5a45c26c13246d530c11a9334c232ace7460d827dc6c3376796b407ef78716b712739cd82816e0030673f04e71ab906c60e76 SHA512 d92188ba8d38a8e385f04fbafbf5d60ad27f5716f8ba23c0845c4151c32dff864511d4fe77a2dbd62eff7fa75e89f71ca74da6434d0778ef0d9e8da7fe700cd7
-EBUILD xineramaproto-1.2.1-r2.ebuild 528 BLAKE2B 0daab476f0a77a7c8b511d16e6fa07ccc9508bfadba1e70efe85521985656e619fde1c26efcf3bb54650d078380df2a8af3eb91458dcda653b5470a42a7031f8 SHA512 b54648d4457690fde1724aa0072bfdaf0aff756beb210b6143b08447519d84a3c80aedeaf6232d700bfb7e17c8206c9d5cd8f16e029260e8db394b4419d8f1e5
+EBUILD xineramaproto-1.2.1-r2.ebuild 527 BLAKE2B 3ea91fcf24f28115394125af3dac4f1dab5f1b03a87d9ccf89afb19194e59bcbef5b13193eaec28c7fca4912e977931cc4d83aad1f3332c590cefa95c4dd6c48 SHA512 701b35af472fb956ce7f973a3a82872f09c0b635a4d19f7cd1c5e010436486f32c029fd6f2c68b167c0b3002a21512ec184cdd8e10350d486d9f47631080655f
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-proto/xineramaproto/xineramaproto-1.2.1-r2.ebuild b/x11-proto/xineramaproto/xineramaproto-1.2.1-r2.ebuild
index 6ceb488f0d08..f2a71d0b67f7 100644
--- a/x11-proto/xineramaproto/xineramaproto-1.2.1-r2.ebuild
+++ b/x11-proto/xineramaproto/xineramaproto-1.2.1-r2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.x.org/wiki/"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-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 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=""
diff --git a/x11-proto/xproto/Manifest b/x11-proto/xproto/Manifest
index 58e04f970e2a..c35a041496dd 100644
--- a/x11-proto/xproto/Manifest
+++ b/x11-proto/xproto/Manifest
@@ -1,4 +1,4 @@
 DIST xproto-7.0.31.tar.bz2 300356 BLAKE2B 08b394c46ca559109771ac134d4408d58085b1f5e90c0862cfdcab4ff0b701058b652326b5a490718a1a9f4e4215f6e4645d92f6c74c922fd968ebef7c45f1f4 SHA512 bba6141525c21fd9a3cf210853658cc7af69f82e1ac15bacfffb9280efc3fe3c6fa708095b541b6f33f114c11e808bde8c8839ae63ff88e30963abdfac12702b
-EBUILD xproto-7.0.31-r1.ebuild 543 BLAKE2B b48714c17578f27c167ac3db709ec0a980285d8b4a46bb8253f0014e55ceee9140e5d4ad08a550c62575f23fc38eafea0a53452dd47a8b6dff0be4b3c75a0579 SHA512 f56cd76d9f3bc33973779dd4cbb3753027a05303b60effc29642f934db483cbdc946c810b56b9071dd9eaa136a1d5b85ba487f695b03df99db07031f3a710783
+EBUILD xproto-7.0.31-r1.ebuild 542 BLAKE2B c9397575aa349af36718ebbd336e7e02104e7d6d9d120672d3bd84c8a3864cf8e55f33189280aecdf510e1c83a2aa0e3e7f60b1a8c8ea29d8b71987acb9cd204 SHA512 915b77b7f2a0a9152cf8c6ebc00d9278a2e664e3980b2334da46efb1725e3901922fa56b8fec335aed5c85d4e028ce0a7718e1eeb18ec49d866a67c3062d6ce3
 EBUILD xproto-7.0.31.ebuild 627 BLAKE2B 994a0fd07164262a7c6c2d411a02cff12d2752acadbfc1cd3c2427b7513dd00a9250315b1271cda65baad231e34a673bdb46c95044bf1b9dd9a9ab3734115eea SHA512 aa96b4df3fb96af36e29813f90ea5cf8a80d23bdaf897bcd37c35e1cbc226875008ed91822d4e9cd0b9b71a6e5a2a264b8e1879628ca9c2b48432d3972e0921d
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-proto/xproto/xproto-7.0.31-r1.ebuild b/x11-proto/xproto/xproto-7.0.31-r1.ebuild
index 4594623a146c..780b70d845ed 100644
--- a/x11-proto/xproto/xproto-7.0.31-r1.ebuild
+++ b/x11-proto/xproto/xproto-7.0.31-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.x.org/wiki/"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=""
diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz
index bd3e65a8f52c..25f765e7dd77 100644
--- a/x11-terms/Manifest.gz
+++ b/x11-terms/Manifest.gz
diff --git a/x11-terms/xfce4-terminal/Manifest b/x11-terms/xfce4-terminal/Manifest
index 102052c6519a..a517f1d78a1d 100644
--- a/x11-terms/xfce4-terminal/Manifest
+++ b/x11-terms/xfce4-terminal/Manifest
@@ -1,11 +1,5 @@
-DIST xfce4-terminal-0.6.3.tar.bz2 815207 BLAKE2B 5c68d1efb14ef1a4fe0d9377909cceb39b92519eba73d89e08c004ef38b96cc14f6ecacfe41169839fec9573e21422074fdbf43f65db002aa1fbb8e606f3eb1f SHA512 805390b75178b3a2fbff4f8dfe972474e5575ad5a80aaf775f7b4086f975cf5b444a335b1ec1a9a39bc89642c71e1d0cb1bbc14d96b913980bd231d32a081c49
-DIST xfce4-terminal-0.8.5.1.tar.bz2 942117 BLAKE2B b72f1f51837778a90b4f3299ed2d4d04ae7658f52399da9bf5d44b4e41a87a8382486172384604e8782dfa754f411f4436ae756ce4c1e966465c10c0ba2da22d SHA512 bf64877985d75c4d6b7a9da741c1f71486dacf2bf203de4555ceb6f45eee109938e29bdbb70487a67f40aa51a6a10fca7ee04b89d87e3e4f11a0a99cfbe1be9f
 DIST xfce4-terminal-0.8.6.tar.bz2 952859 BLAKE2B 7f6ed679eb53196d2665003cc2af7543c42c73679f91581ee241c4c1d3d4d34dfd8b78e2a8f3038514727d585b51a2ae11fe20a48a55e9d0b869c6baeb4ecf18 SHA512 96d9c3fab56ad9cd267bd7b33f4d8fb3831200b9507653a69e6872b673ca5e30adffc73ef2f73de6eb858a2817a98b781188a39a4c0d79298699711c49f8be97
-DIST xfce4-terminal-0.8.7.1.tar.bz2 889692 BLAKE2B 2e8fdda67ba631caabfc184e501fed014c10a2a9982ca57a4900030519d7acfb34289fc507bf0e62dbde1714b3b0e3f1cf7cf29c50dd0dc8d0562831e8f2854d SHA512 e34d0eaa32a7088c83091de321a95cccbd4d6122e9df562af3f1e15d64b224bc9c289302c73874ff88d72f74fe679a42623f078386b0affa962a930801f3bdd2
 DIST xfce4-terminal-0.8.7.2.tar.bz2 889974 BLAKE2B cf3aff96e0038f77fd40dcfd6dcfad898a85bd607ec6726606f4537864d4d222b7171675872e40a8c8133aafeedefd9fb9dfb5f3bfa3f2cae490dd68b1ccde13 SHA512 adcf43c6f9c8512ef82548347af985a2e23a7d88a2aea51eb48a483108cb23fd5fee7736b4cf85a6eac6911e063ea4d395d8cc25feee153ecd83250fb139ac5f
-EBUILD xfce4-terminal-0.6.3.ebuild 797 BLAKE2B 3c6ac612d2a64b1073a1c0cc8c7a6ed5a6765695858ec76a8e96c4d8a38cf98d86778f90b7681eede18b4586c53c15c3c2ecae7623b33703c76ed88b11ebf819 SHA512 8f4e7bd5b0bf6a633dcb3de46cf428d6b300072a90e6b96dbae51bf3efa19a77a29b927b08f742f74ede0a0355804ed991e8d72c769f4ba0cfef5b7d31298ff0
-EBUILD xfce4-terminal-0.8.5.1.ebuild 747 BLAKE2B 7b1b10843d7a62af551b255cc9ee3be18b13f6adea9557a8906439da9199face5d944351da7aedbff02faf203159c35b31d28b8b235bc07dd9ddc0faf2515328 SHA512 7516c226517cfa1b55c447b259712c855f413ddaee16d252e101f9d793309fad42af7b1a731988f088db4236c916c21963c67aa06b425910fd088ff10a78009d
 EBUILD xfce4-terminal-0.8.6.ebuild 745 BLAKE2B dab102d7822ec3369d8cc09e97b2e5b45fef2f92a21e004cce4d748e2513d30cca8d769fb22b620866512f9d6994bf22fcea9a39cc760a77268adee1e9b14fc6 SHA512 c0304379a586baecb4953c9cb10bb72f8a3474e180332b30a030590d8211012584b4cadc1c7dbd471ad57e13e05e6ff4dd735fe5479f3d3d0bf82e78974525cc
-EBUILD xfce4-terminal-0.8.7.1.ebuild 912 BLAKE2B fb255ac1f93ffca698951b9078b4ff8f4a38bcd5cb00c9c0175a5ebe14cebecfe6cc2cca52e5d9c5939e63318946952d085e37b3db390e0e6f6afa7b9f61c20e SHA512 475ae086d375d86199d799544245d92bcc57c880f5e9f46504baee4f302061743cd88775ea662df47f2f63ed7fd34b2593a88515198bf233f0cb9a917f030581
 EBUILD xfce4-terminal-0.8.7.2.ebuild 912 BLAKE2B fb255ac1f93ffca698951b9078b4ff8f4a38bcd5cb00c9c0175a5ebe14cebecfe6cc2cca52e5d9c5939e63318946952d085e37b3db390e0e6f6afa7b9f61c20e SHA512 475ae086d375d86199d799544245d92bcc57c880f5e9f46504baee4f302061743cd88775ea662df47f2f63ed7fd34b2593a88515198bf233f0cb9a917f030581
 MISC metadata.xml 371 BLAKE2B c8a78256e1d987f23d6e7032a30d180633fd672a451f2b52ac41e3921142280ba9c69556dd3f425b2dfa7438b76fcbc1cdfd4aeadad8a263afeba7173fe43022 SHA512 7035e6d0ab1a3429faa848514df83f35869e291b9bee6cccad20ba5027ffe68b36c4ff371155be31762c4bf904c577a2144ba2a0366b6a4927500b083ccd7ddd
diff --git a/x11-terms/xfce4-terminal/xfce4-terminal-0.6.3.ebuild b/x11-terms/xfce4-terminal/xfce4-terminal-0.6.3.ebuild
deleted file mode 100644
index 35eeb6dcf136..000000000000
--- a/x11-terms/xfce4-terminal/xfce4-terminal-0.6.3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit xfconf
-
-DESCRIPTION="A terminal emulator for the Xfce desktop environment"
-HOMEPAGE="https://docs.xfce.org/apps/terminal/start"
-SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
-IUSE="debug"
-
-RDEPEND=">=dev-libs/glib-2.26
-	>=x11-libs/gtk+-2.24:2
-	x11-libs/libX11
-	>=x11-libs/vte-0.28:0
-	>=xfce-base/libxfce4ui-4.10"
-DEPEND="${RDEPEND}
-	dev-libs/libxml2
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-pkg_setup() {
-	XFCONF=(
-		$(xfconf_use_debug)
-		)
-
-	DOCS=( AUTHORS ChangeLog HACKING NEWS README THANKS )
-}
diff --git a/x11-terms/xfce4-terminal/xfce4-terminal-0.8.5.1.ebuild b/x11-terms/xfce4-terminal/xfce4-terminal-0.8.5.1.ebuild
deleted file mode 100644
index 19a912343939..000000000000
--- a/x11-terms/xfce4-terminal/xfce4-terminal-0.8.5.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A terminal emulator for the Xfce desktop environment"
-HOMEPAGE="https://docs.xfce.org/apps/terminal/start"
-SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2.32:2=
-	>=x11-libs/gtk+-3.16:3=
-	x11-libs/libX11:=
-	>=x11-libs/vte-0.38:2.91=
-	>=xfce-base/libxfce4ui-4.10:=[gtk3(+)]"
-DEPEND="${RDEPEND}
-	dev-libs/libxml2
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog HACKING NEWS README THANKS )
diff --git a/x11-terms/xfce4-terminal/xfce4-terminal-0.8.7.1.ebuild b/x11-terms/xfce4-terminal/xfce4-terminal-0.8.7.1.ebuild
deleted file mode 100644
index 4ed3b8ddca72..000000000000
--- a/x11-terms/xfce4-terminal/xfce4-terminal-0.8.7.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eapi7-ver
-
-DESCRIPTION="A terminal emulator for the Xfce desktop environment"
-HOMEPAGE="https://docs.xfce.org/apps/terminal/start"
-SRC_URI="mirror://xfce/src/apps/${PN}/$(ver_cut 1-2)/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
-IUSE="utempter"
-
-RDEPEND=">=dev-libs/glib-2.32:2=
-	>=x11-libs/gtk+-3.20.8:3=
-	x11-libs/libX11:=
-	>=x11-libs/vte-0.38:2.91=
-	>=xfce-base/libxfce4ui-4.10:=[gtk3(+)]
-	utempter? ( sys-libs/libutempter:= )"
-DEPEND="${RDEPEND}
-	dev-libs/libxml2
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog HACKING NEWS README THANKS )
-
-src_configure() {
-	local myconf=(
-		$(use_with utempter)
-	)
-
-	econf "${myconf[@]}"
-}
diff --git a/x11-themes/Manifest.gz b/x11-themes/Manifest.gz
index 44f51ac0b90e..a847baa36695 100644
--- a/x11-themes/Manifest.gz
+++ b/x11-themes/Manifest.gz
diff --git a/x11-themes/elementary-xfce-icon-theme/Manifest b/x11-themes/elementary-xfce-icon-theme/Manifest
index 91bc168bfd10..9cb6519d919b 100644
--- a/x11-themes/elementary-xfce-icon-theme/Manifest
+++ b/x11-themes/elementary-xfce-icon-theme/Manifest
@@ -1,7 +1,3 @@
-DIST elementary-xfce-icon-theme-0.8.tar.gz 7517799 BLAKE2B d27933b04b7b2e6df3be132f7629ecc6a48ed3d9afa437aa5d1814f1789aa7d6a76678aaf6957362e56cdc2829296e1dde23a72e3062742b3d5d1fc65873dd04 SHA512 6abf95e6b4aa41722848ac818f482eec3de012f69ed76db4396d9e572d6032d2ba32a6ed399b9446fb872c1d2f54baf862a0a55fc49ea15ba781ad54b91cd8f5
-DIST elementary-xfce-icon-theme-0.8_p20170710.tar.gz 7720603 BLAKE2B 07e83918a0c8367bbf8cc17003b1690aa54f210539a6d8a696468e50acadf387e2ae26190b6cb020fae7e3fdb5a6a0a406d80820ed7aa515463f13dea44a4541 SHA512 e92808b65975aacefbb0996b48a3e5ed59ae3ce1af48aa2c4aa8451997ba60cf8badafcbe875adc587b4ca5471aef945123beb4f5335ae257bc9dfaf5c6db854
 DIST elementary-xfce-icon-theme-0.9.tar.gz 7724631 BLAKE2B 197db65ebc24f8f62e862613c28222036bebfe99c59b91f36c3d5c83266ac29c635badc6453f8372a46c3bfcd2161a08073d021994372275716ced91f29f2f66 SHA512 9db76522a4feb10bb4cd7d6bb3febab20ca3ae752a42d23926908edf20d69dd674d281d679bad197f19e7a8efe84576da19cdbbc37b3e4b9ce0570d54782016c
-EBUILD elementary-xfce-icon-theme-0.8.ebuild 1034 BLAKE2B 1b2fcab6d8a098f89c53ae1b66b1f3fef6dd14e6eceb13279e994b9f86a20c53abd9b1aa1bba5bfa95f403908e8eec85e116f067bacf62b90fc2fd86e32f9863 SHA512 541f835daa54b1f5df772db3f6c0938f87661f38e318128901a6ab6b2a3fbf1ac3a3df49c1648ac6ba309bd5a99394651d550d3da80e2945864b948b12097f70
-EBUILD elementary-xfce-icon-theme-0.8_p20170710.ebuild 1036 BLAKE2B 92a43005b6c953f0b3d103ceca6e73511a2c7011a817f08895ae3be930b8a89b71ec309ee11dd7add868b5b8a43968c3a0c57a3bd02e691aa92007484a5a07d3 SHA512 b0e2bf53eabf03fca6459a7ef3c5354bec0be6c36283d14630ee2e102d5c2d214c647b20440de1e9bdff5d97f6e5929dd11791ec48f1566b4ff9a15d1c345121
 EBUILD elementary-xfce-icon-theme-0.9.ebuild 1034 BLAKE2B 1b2fcab6d8a098f89c53ae1b66b1f3fef6dd14e6eceb13279e994b9f86a20c53abd9b1aa1bba5bfa95f403908e8eec85e116f067bacf62b90fc2fd86e32f9863 SHA512 541f835daa54b1f5df772db3f6c0938f87661f38e318128901a6ab6b2a3fbf1ac3a3df49c1648ac6ba309bd5a99394651d550d3da80e2945864b948b12097f70
 MISC metadata.xml 346 BLAKE2B aadbfac92004404037c41af003c6db9a99e9ed48f35ffd7c8561a4a624ea43f31a7262cc913a8ce75df4280f1d557672696e880712db5cbd90fc2be92e261f25 SHA512 41a313ca1a567e691e144d3e0aa1110cc1fc4110c63d7a72e8acafb83805e278360019e31b8d387604f4f932a16e6c3b57b77a2a81f32a1cee3b4e6e492f26cb
diff --git a/x11-themes/elementary-xfce-icon-theme/elementary-xfce-icon-theme-0.8.ebuild b/x11-themes/elementary-xfce-icon-theme/elementary-xfce-icon-theme-0.8.ebuild
deleted file mode 100644
index c9b20a3f4677..000000000000
--- a/x11-themes/elementary-xfce-icon-theme/elementary-xfce-icon-theme-0.8.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2-utils
-
-MY_PN="${PN/-icon-theme/}"
-
-DESCRIPTION="Elementary icons forked from upstream, extended and maintained for Xfce"
-HOMEPAGE="https://github.com/shimmerproject/elementary-xfce"
-SRC_URI="https://github.com/shimmerproject/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="public-domain GPL-1 GPL-2 GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND=""
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_install() {
-	insinto /usr/share/icons/
-	dodoc README
-	for shade in elementary-xfce*; do
-		for doc in {AUTHORS,CONTRIBUTORS,LICENSE}; do
-			if [[ -f ${shade}/${doc} ]]; then
-				newdoc ${shade}/${doc} ${shade}-${doc}
-				rm -f ${shade}/${doc} || die
-			elif [[ -L ${shade}/${doc} ]]; then
-				unlink ${shade}/${doc} || die
-			fi
-		done
-		doins -r ${shade}
-	done
-}
-
-pkg_preinst() { gnome2_icon_savelist; }
-pkg_postinst() { gnome2_icon_cache_update; }
-pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/x11-themes/elementary-xfce-icon-theme/elementary-xfce-icon-theme-0.8_p20170710.ebuild b/x11-themes/elementary-xfce-icon-theme/elementary-xfce-icon-theme-0.8_p20170710.ebuild
deleted file mode 100644
index ce3a5677baf3..000000000000
--- a/x11-themes/elementary-xfce-icon-theme/elementary-xfce-icon-theme-0.8_p20170710.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2-utils
-
-COMMIT=7d3a76510d38ad650854382d2dcc502beb91642a
-
-DESCRIPTION="Elementary icons forked from upstream, extended and maintained for Xfce"
-HOMEPAGE="https://github.com/shimmerproject/elementary-xfce"
-SRC_URI="${HOMEPAGE}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-LICENSE="public-domain GPL-1 GPL-2 GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND=""
-
-S=${WORKDIR}/elementary-xfce-${COMMIT}
-
-src_install() {
-	insinto /usr/share/icons/
-	dodoc README
-	for shade in elementary-xfce*; do
-		for doc in {AUTHORS,CONTRIBUTORS,LICENSE}; do
-			if [[ -f ${shade}/${doc} ]]; then
-				newdoc ${shade}/${doc} ${shade}-${doc}
-				rm -f ${shade}/${doc} || die
-			elif [[ -L ${shade}/${doc} ]]; then
-				unlink ${shade}/${doc} || die
-			fi
-		done
-		doins -r ${shade}
-	done
-}
-
-pkg_preinst() { gnome2_icon_savelist; }
-pkg_postinst() { gnome2_icon_cache_update; }
-pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/x11-themes/golden-xcursors/Manifest b/x11-themes/golden-xcursors/Manifest
index 6d278a7d2089..0e9b204ccf29 100644
--- a/x11-themes/golden-xcursors/Manifest
+++ b/x11-themes/golden-xcursors/Manifest
@@ -1,5 +1,5 @@
 AUX README.gentoo 561 BLAKE2B 0db842c2f9195575f8bbf3c932316f6243c3f7acd86ba49e08e63fba83b79dc2b9e321c5c126919e07f9a0c67d68c8dc2844e4d6132d05d016aa0566b1298db5 SHA512 173c93834706151d9041ef01648a15df4144809d041b0f07c3bf1b375c33a6b1695346ffcd7f5b3be8348464f86e4c58ff460417a2dac9b311a5d075dd3673eb
 DIST 5507-Golden-XCursors-3D-0.8.tar.bz2 752331 BLAKE2B 70051f961a891902a125182f24c1d80a295842cb82160030d92c5b95276491bccd521c4d5cb1e3b34522dae4689b4d5d4cb95d2a6440223e6bf91550b3dac076 SHA512 b0098742afae6c18f80150b3c82ea8be0da4d71eabaebc1eb51d52b2300faab683c794fccbe46162109b09a0a00f86e63228bfcd296f97c1c54dd5c113063049
-EBUILD golden-xcursors-0.8-r1.ebuild 648 BLAKE2B 6787b79cec08c1ad9b99623009ae283a7fae76d14d8c64dfebf090fa152f5ce18e6e50ae6cd5fec258d4790213a9959f77bcbd7e9557b9cafbfad50783945bb7 SHA512 24864e3868765fc092863a2d9d811dba6bc9db5f7fd87b7b5c7802e33fa07b326ae05bcc6ef3817680f130ad30aba56eee5564728e15edfc5df500bcb0a40348
+EBUILD golden-xcursors-0.8-r1.ebuild 647 BLAKE2B bc474684b8e9809f326baa76a23c4f8b05e6db9f17f98902197525230a33201bb41b85e33e3940b0b0d65690b4687908443876796e74d104253c3cd45ea912e7 SHA512 d6de511fbb0c68df0eaea27dc8c1a16856e0889ece3d950d2e5785bc85b429d9b69e93f54b55d81473a98d5bf5fa014f07a0bba8dffc2993ef85fb481c0ed1ed
 EBUILD golden-xcursors-0.8.ebuild 1437 BLAKE2B efdd5cb4ce4e7f1a603f965c4ac0c5f23a02576314ade2fa5e99eb4ae54fff69e7af443ba5def9f7471c6c12e6245b9173fc2f183cf2bccf3181c284f4e9bfc8 SHA512 3fe7d7d26ed7fffb16f469e991e581826dd6545906ebf1dca3e8abbad4dc914cb4e6c47f79b852783a76b1a1ffe993da91890ec00d2380e26a54c9478a80c16a
 MISC metadata.xml 272 BLAKE2B 4dbd2b5ae92564a97b2a06ab0ec6562e8dce2dd636aaf0788ee09f8688ca5d5b6483084a65366dfbe6d144d30170e5558bc5759adecb96abb405ea96a5147285 SHA512 ebe67da08587903b5b82fc194aa3c8f1ab65371f60d2c134928362e089550d9e9fd9531bffe8b676a345b5bf0ab209ce7f50d37d98201a88176f002e17582493
diff --git a/x11-themes/golden-xcursors/golden-xcursors-0.8-r1.ebuild b/x11-themes/golden-xcursors/golden-xcursors-0.8-r1.ebuild
index 57d8b9750d5d..6c5f1648423c 100644
--- a/x11-themes/golden-xcursors/golden-xcursors-0.8-r1.ebuild
+++ b/x11-themes/golden-xcursors/golden-xcursors-0.8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="http://www.kde-look.org/content/files/$MY_P.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 
 S=${WORKDIR}/${MY_P:5}
 
diff --git a/x11-themes/xfce-gant-icon-theme/Manifest b/x11-themes/xfce-gant-icon-theme/Manifest
index 3c71ef716d17..a6961d748179 100644
--- a/x11-themes/xfce-gant-icon-theme/Manifest
+++ b/x11-themes/xfce-gant-icon-theme/Manifest
@@ -1,4 +1,3 @@
 DIST icons-xfce-gant-3.9-6.tar.bz2 31992579 BLAKE2B abcdbd61fa6e5cdb2bbf1c94f668a197812d74ca9443f50e79472bf625d00288871a8376adc7cf2b1db4dd14a23218ef107a71c968a3644d972cc573e1e85927 SHA512 3bced73028c3796bb8bcf53f7cf02936243b7643bbd76191e01cd5f29165f16a5d7e386ef0c81b15b05f6d9fc4957f189b200c03af6b2255d0409e00a6fdad2d
 EBUILD xfce-gant-icon-theme-3.9_p6-r1.ebuild 702 BLAKE2B 13e4beb1b529aa88a6b54fc4e9f391865f6d1cf2894f679c81f33faf31de39a0f91e7a6b0d0124bf2072c8c6ecb00323e42f984ce6e64b5e3384edcb525fbcc1 SHA512 bdc788eb956579d53cdf02f5620199aec17ffd1c72cefaeb2dfa9c51d41f4dbcab189f7f00100df82f333cc66fd2c2e6656cfcad89ddec59984c31296d5f8e5d
-EBUILD xfce-gant-icon-theme-3.9_p6.ebuild 741 BLAKE2B e4b5d75b70abcd14b01022f39d2f71ce065cdcdaf953a4ad60121e9d9027cf61a5e74d918460162b54650f37b4d6c2a788ecd0fe04fc9cf8ff111c1f3cc6b773 SHA512 39fea7c1c92c2c5b792a1815747dfd7bec555a7f8d9122b8b90d992b0beeeedec12bccb43909d8f14eae798b8743d56d3fe2055638046ac74b7a76a08396d549
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/x11-themes/xfce-gant-icon-theme/xfce-gant-icon-theme-3.9_p6.ebuild b/x11-themes/xfce-gant-icon-theme/xfce-gant-icon-theme-3.9_p6.ebuild
deleted file mode 100644
index 14fbd1a9f7ac..000000000000
--- a/x11-themes/xfce-gant-icon-theme/xfce-gant-icon-theme-3.9_p6.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit gnome2-utils
-
-DESCRIPTION="Xfce Gant Icon Theme"
-HOMEPAGE="http://www.xfce-look.org/content/show.php/GANT?content=23297"
-SRC_URI="http://overlay.uberpenguin.net/icons-xfce-gant-${PV/_p/-}.tar.bz2"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="x11-themes/hicolor-icon-theme"
-DEPEND="${RDEPEND}"
-
-RESTRICT="binchecks strip"
-
-S=${WORKDIR}/Gant.Xfce
-
-src_install() {
-	dodoc README
-	rm -f icons/iconrc~ README || die
-	insinto /usr/share/icons/Gant.Xfce
-	doins -r *
-}
-
-pkg_preinst() { gnome2_icon_savelist; }
-pkg_postinst() { gnome2_icon_cache_update; }
-pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/x11-themes/xfwm4-themes/Manifest b/x11-themes/xfwm4-themes/Manifest
index 4ea11642de64..5380126278a9 100644
--- a/x11-themes/xfwm4-themes/Manifest
+++ b/x11-themes/xfwm4-themes/Manifest
@@ -1,4 +1,3 @@
 DIST xfwm4-themes-4.10.0.tar.bz2 621206 BLAKE2B 42cc46f8b3ac4584f33273373a54f3b31a5ae7c3dd3ae0bee97b2d6e721fd1d6263964c90fdfb5f53fc1c8c138ff07b7c0b4000661ceea4f074a23788f74886c SHA512 5c77e9f1b4b1051f86696605d2fcc8ba6abbc667fc2ae48c5eb1235d62fb99e5171a7c8b9b662147e86b1f508fd8d723f931bd211e41675ab390ec0d7a5e1305
 EBUILD xfwm4-themes-4.10.0-r1.ebuild 535 BLAKE2B 17841945968fb5b9621915d0ad47d289b77babfe116354b78722fbe3af7a5b89368ef0eaee5a021709f02da565b826b8cf082ea78f69810283bc958c1163a96f SHA512 4254b7d652d763039ab2748b9de65ba9bfa34520297e10909e19a148e379503a7ea042e529e7e15677e828f79850946047100fa64c084792c0671a0b5a1ec7cb
-EBUILD xfwm4-themes-4.10.0.ebuild 550 BLAKE2B a667fb490a09fc2268034fc8e27ac490cffcb7ab766bcfba5d4f2095487f0d05e3ad2e00322219e478011a340edb027e157b8b41e264261f0d50164ab144b1dc SHA512 eae6f10c6b13e0b539a2e0c2e27325035dabdda2c6d95578f06f8f19c79d4dcd343073b0c73f72b8a46304e6c996b6f5f76b05a4cd39767b6ed89c2b2bb66514
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/x11-themes/xfwm4-themes/xfwm4-themes-4.10.0.ebuild b/x11-themes/xfwm4-themes/xfwm4-themes-4.10.0.ebuild
deleted file mode 100644
index 6d79da810170..000000000000
--- a/x11-themes/xfwm4-themes/xfwm4-themes-4.10.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit xfconf
-
-DESCRIPTION="Additional themes for the Xfce window manager"
-HOMEPAGE="https://www.xfce.org/projects/"
-SRC_URI="mirror://xfce/src/art/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=">=xfce-base/xfwm4-4.10"
-DEPEND=""
-
-RESTRICT="binchecks strip"
-
-pkg_setup() {
-	DOCS=( AUTHORS ChangeLog README TODO )
-}
diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index 36aa06c7198d..5ede18b0dc3e 100644
--- a/x11-wm/Manifest.gz
+++ b/x11-wm/Manifest.gz
diff --git a/x11-wm/ctwm/Manifest b/x11-wm/ctwm/Manifest
index 3efa9e477218..091062b12b73 100644
--- a/x11-wm/ctwm/Manifest
+++ b/x11-wm/ctwm/Manifest
@@ -5,5 +5,5 @@ DIST ctwm-4.0.1.tar.xz 656776 BLAKE2B 37d6011d04f8d64552a86608a4d3867e6e1b0135f4
 EBUILD ctwm-3.7.ebuild 1204 BLAKE2B df5d9427f1e4cb93a9c4a4da67b3b03917eda654fd8a323cc86ea78084fa3b233e93517862443522eb1ea56b5b402a535d31778c2c2a52f6447bf651fde35af2 SHA512 23b3edac816e083fc4ff5d640119ba7ee6a8c07b3b601e38a61f0fcd147d0963b75f5329736ab606ebae1b80ed7b6c5e47225af79ae396980d4636ee605ac037
 EBUILD ctwm-3.8.2.ebuild 1546 BLAKE2B 037631059eb8ef42eb50d70359574a57e23c17f1a4fe40a2fb1327a50b0c5e6a4c596cdb0da73136958dac726b6c5bc2d20d2c524f0791c76e24b0f33089051d SHA512 4bdc01a3290cc7293d9c38acbb0c2d6dad77b18d6b57c0b72844fe304c42bb5025af98d7e7ce49187079c4f6ec45d3175f12b7b0921ef73bfebe61057fca00d1
 EBUILD ctwm-3.8a-r1.ebuild 1508 BLAKE2B ac129025c5340624d0ac94baafb35c5ca00b31ead6d973bff9186cfe9431bb071863156e32cb7ce6b1f5d5e1de95d28c25849d26e89f924b681c43d2b1e100fe SHA512 6ff601ccb3e26e83ea3267c066e075445e6974a6111147b9457188e2b0cf78c7087b98a6ab99b8bf48d65785bc80330341ba20b75a62d7ff817e2e116cce067c
-EBUILD ctwm-4.0.1.ebuild 901 BLAKE2B b52d6ac6cb0d1dacadc6b5b5d82927fcfbcdf4c6646e1827e4bef277feedbde05644b972a0d506a5761fb355e23408865bf96a94d092029adc4cbfa88806bd51 SHA512 4e214183c8ed9d4aea603bea0656f52a5c48dd49eac72b2d62c2be9a702eb59949568cc9ab9c733398d34b9f1033d0bc3743a1604765949644fe91f06c0d40b7
+EBUILD ctwm-4.0.1.ebuild 900 BLAKE2B 3f3c744060c15fd226d657d87ee8ca0d85a68d044526a59894aa72ad7cb56b8d455e61500e3ecfbfbe1abfb24beedd886f23992843c515380d8d787704f622fc SHA512 6d49ea92d4490956bc9b6d5ecb1afe6e6097b44b04cecfb844160fb802ce855b381ba9a93430eb9ac2d099a42ac6fb2b9d5e95e907168a63c5c4d31967738c91
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/x11-wm/ctwm/ctwm-4.0.1.ebuild b/x11-wm/ctwm/ctwm-4.0.1.ebuild
index d2d7b872f6c0..f95c140b4236 100644
--- a/x11-wm/ctwm/ctwm-4.0.1.ebuild
+++ b/x11-wm/ctwm/ctwm-4.0.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="${HOMEPAGE}dist/${P}.tar.xz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ppc x86 ~x86-fbsd"
 
 RDEPEND="
 	x11-libs/libICE
diff --git a/x11-wm/enlightenment/Manifest b/x11-wm/enlightenment/Manifest
index c6ce230bea67..e2285659a1e0 100644
--- a/x11-wm/enlightenment/Manifest
+++ b/x11-wm/enlightenment/Manifest
@@ -8,6 +8,6 @@ EBUILD enlightenment-0.16.9999.ebuild 1841 BLAKE2B 5b10dd80c94ffb9f55ba6211a6c2f
 EBUILD enlightenment-0.17.9999.ebuild 3227 BLAKE2B c37c736f8bc4d681f044a36a355fd5e1ec463b4d6f771d0cf4b32f43b5a5fc682d96291d9c767a6f2920e5b6b3e33a34fbecdfd8521933652e92bcea1f384cf4 SHA512 5eb72120a2448a82bea63ae5a3c817d9474648931564e95d883bada8eef5471e20602a36bbba33a5df84f28d40ab3d5f8d8ea8a9b00ee160f00beda8ebfe0c46
 EBUILD enlightenment-0.20.5.ebuild 3258 BLAKE2B a2b3161215d338a21c8fb7eddc7d06397328157981c68159e2f838aaab7c071b86337974d76452006526a91ee07e9f3094a3ad909e7adb32331ad6ff5d51489f SHA512 00c3c7d77a2a09e4c719e93b8c1a58d720a157a5cf14f4360f21cb1ac80cb082a0d75cdff64dc3347afaa3fcde7d76b61245b4d707e458d3cbdd326147529d8c
 EBUILD enlightenment-0.20.6.ebuild 3261 BLAKE2B 058d1d18523add195a322ab3835fd468187e05d1985f07262a1679b6456bb55b673a2fc201546a601de8d0e7dd911d2d927df812ae25a0b1722e657b97bf754d SHA512 f172b95540799ee1f098fd4ccff6b3ec8a356c2f31aa8ecee62d3eed2928b5141195c9839e2e36fd8ec66cc16287bb577ea8ac2cef2c48df9c46e38e00105b25
-EBUILD enlightenment-0.21.7.ebuild 3227 BLAKE2B c37c736f8bc4d681f044a36a355fd5e1ec463b4d6f771d0cf4b32f43b5a5fc682d96291d9c767a6f2920e5b6b3e33a34fbecdfd8521933652e92bcea1f384cf4 SHA512 5eb72120a2448a82bea63ae5a3c817d9474648931564e95d883bada8eef5471e20602a36bbba33a5df84f28d40ab3d5f8d8ea8a9b00ee160f00beda8ebfe0c46
+EBUILD enlightenment-0.21.7.ebuild 3552 BLAKE2B 55060a00e9d079b7dd913b4316e825e8f5e8096c440a77c13affb15ba28feb3f8745e4b777c58aac9bd60a6352d228d350a3bc4356a61dc536a6a162a4683ba8 SHA512 0b6374faf749cbebc2d380f8e62fb24747283ccf82661c93b52c8045fbbe7a55383827ec6082cdfd7f327d20018712065ef1e41e2e62727bd9f15b67ee409835
 EBUILD enlightenment-1.0.17.ebuild 1831 BLAKE2B 8cab55f842085e212d695ba8513416eb4d8280be4a0292fa5073f109b33db90bb1a9759dce5f6c889271fda7c9078f516f108ee21d9cd6adc130ea23780f900e SHA512 37308359aec83a4f7b8640646f24263805f1306e9d1b4d8e8dc0f94990bbbe670298711d611f5a30d798bd69c10b3ead951b4b233b3b39dcbfb4fc9e98e831aa
 MISC metadata.xml 7196 BLAKE2B 70cac77f115242bff1a62be45c696b0a736205404281eb0b87bd7fce8bd047a85dc62a58cfc5cdc135ef2e5d685cd5d2a4d2502a7b403912cd7563e0af5c515f SHA512 8548b29c9ae937c7939d16ee753a50624c231ce0ae1ee10dfc749ba6036a34f0db2dc1a9169c375ac4d8298e2d0c81731abc21da9acb41f6fb9bacdf5ec02ed3
diff --git a/x11-wm/enlightenment/enlightenment-0.21.7.ebuild b/x11-wm/enlightenment/enlightenment-0.21.7.ebuild
index 1b788a54f596..d84967f414fd 100644
--- a/x11-wm/enlightenment/enlightenment-0.21.7.ebuild
+++ b/x11-wm/enlightenment/enlightenment-0.21.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -13,7 +13,7 @@ else
 	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 
-inherit enlightenment
+inherit enlightenment xdg-utils
 
 DESCRIPTION="Enlightenment DR17 window manager"
 
@@ -55,7 +55,10 @@ RDEPEND="
 	)
 	>=dev-libs/efl-1.18[X]
 	x11-libs/xcb-util-keysyms"
-DEPEND="${RDEPEND}"
+DEPEND="
+	${RDEPEND}
+	sys-devel/automake:1.15
+"
 
 S=${WORKDIR}/${MY_P}
 
@@ -89,7 +92,9 @@ check_modules() {
 }
 
 src_configure() {
-	check_modules
+	# sanity check fails after commit e25cf18ca19463a7d05519aa843cc76a189ab75c 
+	# see #648896. Can be restored with future release
+	# check_modules
 
 	E_ECONF=(
 		--disable-install-sysactions
@@ -123,3 +128,13 @@ src_install() {
 	insinto /etc/enlightenment
 	newins "${FILESDIR}"/gentoo-sysactions.conf sysactions.conf
 }
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/xfce-base/Manifest.gz b/xfce-base/Manifest.gz
index 028ce7c24ab8..c9b36f40c98b 100644
--- a/xfce-base/Manifest.gz
+++ b/xfce-base/Manifest.gz
diff --git a/xfce-base/exo/Manifest b/xfce-base/exo/Manifest
index 4be3cbea810f..ba0eb05a0b97 100644
--- a/xfce-base/exo/Manifest
+++ b/xfce-base/exo/Manifest
@@ -1,7 +1,5 @@
 DIST exo-0.10.7.tar.bz2 1262301 BLAKE2B f9a0454b1f5f125fec49de834bdefd12ad827e88a852596315090cca92f92628d594fe609a35b9f926c4d19ac67fbfa60fcd5e277d6cd69082b27273ff17c823 SHA512 5a872e6895595da027f403fb7951922c40481d53242cb4d9c3da2d36690c61dce2fdb34ba0eb39367558a5e3055733af25432d1f3a8f60984b7e2ed997408b60
-DIST exo-0.11.5.tar.bz2 1299627 BLAKE2B 9bd5da530e807dd6395a632d204982f665e45c59241e719ae7655bd6ec84930a684e01c6f2cb3283ef61269f6d60d94e595ae7bdf712d5ec1ed0e29e4dc5a7eb SHA512 c1aeb6dbdb60ab3c19797adcd3e832871960b8a91469d5f96f5fb23bc44794a9b0cf91c910b27f001196d75439baf23565b8860d0bad72799134b2018d3b8463
 DIST exo-0.12.0.tar.bz2 1310691 BLAKE2B 6acdfe0b3cf7b19717d17c4acc7973bc8e27e963b4213376061cee0bec72734303ed75b7bfd8d8cbe1da98af4a9b43132657ade0020f9d26add36aa77c184ff4 SHA512 8ec52aba3faa9728bb60e09cf696f772160bfd8357c06015a6d72a2302572e74389f78a20addcf3ac632a3ac84b3ee2f40750483a16e2f7e1cff7de6f7aa2692
 EBUILD exo-0.10.7.ebuild 998 BLAKE2B 831684574330a2684a85dbca7fc50b421e9557ee43d4e72931aa1cf9a606af240d6e58bb5851a266e357bd6430cca79cc0e5f68c727af93794caa22a7d48c66f SHA512 7a716f21e23b2edbf9ba95e7d6d39fd7be3a189d16e0a005413c12dc547e590bb5e74e224ee1de4de58bd4582885b2e349864a7f71f32e1ddee45de86e476eee
-EBUILD exo-0.11.5.ebuild 970 BLAKE2B 8546ab8cebb66541e16ce93e69fc35b69fbd622d211d34db0ae7f06c4e1a0254015ea7a5b83cfd67fa9d566743fbe36571f791743b2a8be7fb07fedd62564272 SHA512 b1e17bfa886a041ffe11f9a76252041ebef061329d32b91df9f4f1e1781bec9bd0ddd0d3202adb3924a45b2ad0a219a50cc9f852938de14162872d9aca7555b7
 EBUILD exo-0.12.0.ebuild 970 BLAKE2B a190fe9e1304fffac4c0957f83364d1be961cdd7b1f567e5aa15b50559f3c9ba39ecd168bfd3ea332c858bc794747bd9ca31b1d3de540037871535a095446b99 SHA512 14acbe8df6cb3fa1e3d5fedd36121de002e892fee67a2c55ab37dd36e06c1bebb43a0f21c4b2527de79321e4584e26c2a8f14566785e8144d980813fda66a3de
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-base/exo/exo-0.11.5.ebuild b/xfce-base/exo/exo-0.11.5.ebuild
deleted file mode 100644
index 582fbc77050b..000000000000
--- a/xfce-base/exo/exo-0.11.5.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils
-
-DESCRIPTION="Extensions, widgets and framework library with session support for Xfce"
-HOMEPAGE="https://www.xfce.org/projects/"
-SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=dev-lang/perl-5.6
-	>=dev-libs/glib-2.42:=
-	dev-perl/URI
-	>=x11-libs/gtk+-2.24:2=
-	>=x11-libs/gtk+-3.20:3=
-	>=xfce-base/libxfce4ui-4.12:=[gtk3(+)]
-	>=xfce-base/libxfce4util-4.10:="
-DEPEND="${RDEPEND}
-	dev-util/gtk-doc-am
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/xfce-base/libxfce4ui/Manifest b/xfce-base/libxfce4ui/Manifest
index 8402bcea5412..d46d2e94990b 100644
--- a/xfce-base/libxfce4ui/Manifest
+++ b/xfce-base/libxfce4ui/Manifest
@@ -1,7 +1,3 @@
-DIST libxfce4ui-4.13.0.tar.bz2 688646 BLAKE2B 72f9bb12e31f8015ca78c83ae7eeab7a81961e279f81c039e83f8dacf149cacd64c9262c1d925d1620c7993184ed65006e5acbe642fc3cbd949712fcdc360cdc SHA512 342c4fb09b3f13e066b994c54cd557a65c116566b8201217cb663851ba387932cdd4ebf2274f32bdc97a98b3a2bd1b59de75ef6cc4c6f5d0e5f1910b7eca591e
-DIST libxfce4ui-4.13.3.tar.bz2 705465 BLAKE2B 47879b7dc952c351eb7a6266346c784a902f724b2e8bfc0b66860b12c15885e569a112a67c3087eceaa019256760f11c29f0c05d7b59b746bf6740fe3db81f93 SHA512 eef93a71fe41102eb402878e908b1e2e24060869235e1fff93e65bd480fa3ac53f1beba3b26d061b1962b3c3eefa77cb122e796609ab4b5f6fead353167cc396
 DIST libxfce4ui-4.13.4.tar.bz2 684065 BLAKE2B 1da875832683b5e06b8e91b4078be8122ae85a91560d7b1768cb8c880fcf5e1d7cd07d24927ae3325ba9c500c6c2cd30e717e517775492b9948add0711f5aa40 SHA512 c82d6ff7ea0da4fc0f664bab92f1e9531162996a26bb092e6ba651cfc4551732cbcd8023908d428b47906c17c331c14bf4804256566ca564befa218dc1194206
-EBUILD libxfce4ui-4.13.0.ebuild 1360 BLAKE2B b14202b3a918fb39b1e43d088c052985084beff37795faf8b5ebe0348fc52b7a9f0f7d3ba696ef35248b5d5ea4feef2c2269ae5579604e9d00aece5cbf321add SHA512 01c30f381debf19d8cd52f2986a42f32c7c5a2b33a8e7ce6f553d5dcb75bed66cab381441d3f2cb62de857c10183689bf94a0f5c9b65ace39a184223f2edee8c
-EBUILD libxfce4ui-4.13.3.ebuild 1555 BLAKE2B be7ee093914c26704d7caf560789741cd3c720b2771e50fc39563db763e217687b579236a52aae5c08d9e608f229f3e81fe7121a550153e7acae694b14d3dfb2 SHA512 a67b442237d9d9dbdb3515dcbb6522ac47f551992778a3dd1b0321d66cffa509e87a83abc92173f2fe528ba9832e2e00efc87f90198bd5c803a521fac42c3b61
 EBUILD libxfce4ui-4.13.4.ebuild 1726 BLAKE2B f72e2bdce59bb4f67782f563a3af04c279e9620b4c03d35630d8cf36f9db36c20c07a201cfc9dbbeb31ed6b79f3553b2593c107b7ad320198e4fadb75788f618 SHA512 10c927a8db466cc4e0dc01db6356f85d3db47d6f8de67079e10de9e7853371b544c9794381690739695941b491337c5f308d45806eba1e2c7a8971e6547bedcd
 MISC metadata.xml 348 BLAKE2B b833ebf4da605db088c633bbd7e8a5747edbffae3671d6049154f89b6ecdcf3054624b5e17d55332f405608d57dd3022c1dd78b81376bd2d28c063291d32073c SHA512 f3894d3ccb668e76deaa0651414359838402d2b1e11fbe816375e6147f89847257008d5807766796fb1249217f6454a5f5896941e7ce3bc79dce09b130db4fc6
diff --git a/xfce-base/libxfce4ui/libxfce4ui-4.13.0.ebuild b/xfce-base/libxfce4ui/libxfce4ui-4.13.0.ebuild
deleted file mode 100644
index 839e17b7852f..000000000000
--- a/xfce-base/libxfce4ui/libxfce4ui-4.13.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit xfconf
-
-DESCRIPTION="Unified widget and session management libraries for Xfce"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="debug glade startup-notification"
-
-RDEPEND=">=dev-libs/glib-2.30:2=
-	>=x11-libs/gtk+-2.24:2=
-	>=x11-libs/gtk+-3.2:3=
-	x11-libs/libX11:=
-	x11-libs/libICE:=
-	x11-libs/libSM:=
-	>=xfce-base/libxfce4util-4.12:=
-	>=xfce-base/xfconf-4.12:=
-	glade? ( dev-util/glade:3.10= )
-	startup-notification? ( x11-libs/startup-notification:= )
-	!xfce-base/xfce-utils"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-pkg_setup() {
-	XFCONF=(
-		$(use_enable startup-notification)
-		$(xfconf_use_debug)
-		# does not build without GTK+3, #585684
-		--enable-gtk3
-		# requires deprecated glade:3 (gladeui-1.0), bug #551296
-		--disable-gladeui
-		# this one's for :3.10
-		$(use_enable glade gladeui2)
-		--with-vendor-info=Gentoo
-		)
-
-	[[ ${CHOST} == *-darwin* ]] && XFCONF+=( --disable-visibility ) #366857
-
-	DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
-}
diff --git a/xfce-base/libxfce4ui/libxfce4ui-4.13.3.ebuild b/xfce-base/libxfce4ui/libxfce4ui-4.13.3.ebuild
deleted file mode 100644
index 90846401101d..000000000000
--- a/xfce-base/libxfce4ui/libxfce4ui-4.13.3.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils
-
-DESCRIPTION="Unified widget and session management libs for Xfce"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="debug glade introspection startup-notification"
-
-RDEPEND=">=dev-libs/glib-2.42:2=
-	>=x11-libs/gtk+-2.24:2=
-	>=x11-libs/gtk+-3.18:3=[introspection?]
-	x11-libs/libX11:=
-	x11-libs/libICE:=
-	x11-libs/libSM:=
-	>=xfce-base/libxfce4util-4.12:=[introspection?]
-	>=xfce-base/xfconf-4.12:=
-	glade? ( dev-util/glade:3.10= )
-	introspection? ( dev-libs/gobject-introspection:= )
-	startup-notification? ( x11-libs/startup-notification:= )
-	!xfce-base/xfce-utils"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-src_configure() {
-	local myconf=(
-		$(use_enable introspection)
-		$(use_enable startup-notification)
-		# TODO: check revdeps and make it optional one day
-		--enable-gtk2
-		# requires deprecated glade:3 (gladeui-1.0), bug #551296
-		--disable-gladeui
-		# this one's for :3.10
-		$(use_enable glade gladeui2)
-		--with-vendor-info=Gentoo
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/xfce-base/libxfce4util/Manifest b/xfce-base/libxfce4util/Manifest
index f6b24405a0cf..255779e5e17b 100644
--- a/xfce-base/libxfce4util/Manifest
+++ b/xfce-base/libxfce4util/Manifest
@@ -1,5 +1,3 @@
-DIST libxfce4util-4.12.1.tar.bz2 455329 BLAKE2B 5bf684805f22db977d776b2354cdfdb7485a887a45806c32870e4f80e22c78b3e76006236e96109de5e3136c4d323bcc77482069607a5793c506f4406166aa95 SHA512 0bd0fe23e9fa325b08559d2b783242dfc61412a8c7aa4e5a81e5262ebceb57a722aa515db12747c9de9804423f67e50805848e5bed328ba7d17e2737f54c2ef9
 DIST libxfce4util-4.13.1.tar.bz2 497192 BLAKE2B 56ec5929df43e2c430c45298a2f7634a539ef1f32598ce4cd038659c93ed5de4f28472f744ab03e3cefd040266c1e1bd415c8b4e9489be8f3930bd6df8d1c5c0 SHA512 1667cc22ff72920d3280725cb40c41f5fba9dcfcba8e357ba85548c7f254a67a3ef942c1b71f0ac5c3a7fe46c8c4cb559a06a8111aa71ce1f6824d1a1c2b5063
-EBUILD libxfce4util-4.12.1-r1.ebuild 812 BLAKE2B 5afb711da7661209708fa8aeb45092bb56171c9c766eff5fab0558c8dce6477cff218eb1711417ad7eda1f691150f061de03abc9eb71325ccc3c4273f64db0c7 SHA512 fbfc45a90a36cdcd34e500b5aef1c1c4719b1ff2a27526d652180de5a57b8949e96ac0f93d485369212697782834d0adba6b96b3776d3aec18a47a7b8560ba51
 EBUILD libxfce4util-4.13.1.ebuild 844 BLAKE2B f471a8a51b57b9f4ef8ab3d8861bf7640fe3f25dc1ddf9c43955185b6c10ab05e3e7cd7b49c8516f0a5b6a6a9ded3cbf16e928b113aeb4f82b91839c951c0fed SHA512 7a93bbf44afcf3fc24452d905535996e0a0ae6af27f9a7da06e61ac847de4a9ae75cbeeccc36b49ae55f03b27f78317f29489a36df1a5e789a8fd72e7db8706a
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-base/libxfce4util/libxfce4util-4.12.1-r1.ebuild b/xfce-base/libxfce4util/libxfce4util-4.12.1-r1.ebuild
deleted file mode 100644
index 15a77831bfb6..000000000000
--- a/xfce-base/libxfce4util/libxfce4util-4.12.1-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit xfconf
-
-DESCRIPTION="A basic utility library for the Xfce desktop environment"
-HOMEPAGE="https://git.xfce.org/xfce/libxfce4util/"
-SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="LGPL-2"
-SLOT="0/7"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-IUSE="debug"
-
-RDEPEND=">=dev-libs/glib-2.24"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	dev-util/gtk-doc-am
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-pkg_setup() {
-	XFCONF=(
-		$(xfconf_use_debug)
-		)
-
-	[[ ${CHOST} == *-darwin* ]] && XFCONF+=( --disable-visibility ) #366857
-
-	DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
-}
diff --git a/xfce-base/libxfcegui4/Manifest b/xfce-base/libxfcegui4/Manifest
index fa894a6fb9fc..cefb84f92c2f 100644
--- a/xfce-base/libxfcegui4/Manifest
+++ b/xfce-base/libxfcegui4/Manifest
@@ -1,5 +1,4 @@
 AUX libxfcegui4-4.10.0-no-xfce_setenv.patch 311 BLAKE2B d9f36277d02adf9fbef96bcabb70d16f85a1e6ac13f8134d89456fb3e49cfe1b7688091bdf215aaef6f2a9298eca115496ab509d566440e442f9533cd4dd8a55 SHA512 f8d12be9e9d126d3a3a822cab872fb9dbfe2d5e23e40b529c2a637e0365e5b481ff44d564fcda5de60948342b9c1367d51ae20ae7e0e5abd69296f7dd3ea3f31
 DIST libxfcegui4-4.10.0.tar.bz2 691012 BLAKE2B cce4f0a9587c10c1a226550ddeda8a9f00b5c1306ce11c329c914e4f3240f4fdb390beb7a1aa7049076767c26707b2570c801ebb9d78504694ee3542477882eb SHA512 32fe3be287c84d1816154c7632a87025324c2cb9d9524ef3d7813c3b3619ca04e4b70aeb47a3e0fb59090e43e124476988774a0dc5186ebc1a0ccdfe635cbb45
-EBUILD libxfcegui4-4.10.0-r1.ebuild 1081 BLAKE2B de2110eca3249d4354d2dafe0cd92de4ee921a100b8589fa08907e88e0db4383186beda5f05905c3640041d6f8ae531a97d0c126e968ef566c15633bb5beda9e SHA512 c79abfe75251a08b969eb7d833c236f15491d971445a84ab62a0ca95a51eaf4914a0212ddfabb9ad36822031dfe4d6cff173e62e67aeeb7c1d4ce29cfae21115
 EBUILD libxfcegui4-4.10.0-r2.ebuild 1267 BLAKE2B 9ab5500ca6d8f4bedd1cb78a687814368c451ee516fd065dc0c0acb7c4ca032cbd6d97c943460088de2dc164f94b3369258ad6ad03c9e676d61d4bba70321b59 SHA512 7819b8a8e76ec374c2fa0b8a6784f80e868ed53ec5d67375b9a06d4a157f4ef7b8f9c88abebe8ac04b0951192c8eefb5ce78c194680b38b45e35b658d6b69af7
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-base/libxfcegui4/libxfcegui4-4.10.0-r1.ebuild b/xfce-base/libxfcegui4/libxfcegui4-4.10.0-r1.ebuild
deleted file mode 100644
index c8dded192e3f..000000000000
--- a/xfce-base/libxfcegui4/libxfcegui4-4.10.0-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit xfconf
-
-DESCRIPTION="A compability library for unported Xfce 4.6 plugins (DEPRECATED)"
-HOMEPAGE="https://git.xfce.org/archive/libxfcegui4/"
-SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
-IUSE="startup-notification"
-
-RDEPEND="gnome-base/libglade
-	x11-libs/libSM
-	x11-libs/libX11
-	>=x11-libs/gtk+-2.10:2
-	>=xfce-base/libxfce4util-4.10
-	startup-notification? ( x11-libs/startup-notification )"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-pkg_setup() {
-	PATCHES=( "${FILESDIR}"/${P}-no-xfce_setenv.patch )
-
-	XFCONF=(
-		--disable-static
-		$(use_enable startup-notification)
-		# glade:3 no longer supported on Gentoo, #575166
-		--disable-gladeui
-		--with-html-dir="${EPREFIX}"/deprecated
-		)
-}
-
-src_install() {
-	xfconf_src_install
-	rm -rf "${ED}"/deprecated
-}
diff --git a/xfce-base/thunar/Manifest b/xfce-base/thunar/Manifest
index 46d9d21f3d0c..c13266d78238 100644
--- a/xfce-base/thunar/Manifest
+++ b/xfce-base/thunar/Manifest
@@ -1,10 +1,8 @@
 AUX thunar-1.16.2-integer-overflow.patch 1160 BLAKE2B 0b82756541c9106d86eac0e45b54adc27d229c590c607d5b9c12dd78eb1bc8afc0446e2a9054e8e7704ab16bb006eb4d6f731c62b46bcd821f151bb2f6506b6e SHA512 eaefb709e03902cc97be41d4c670ded910234fd1536aae8597cbd9224e0d61badfee912eba81ee2e1a6c308ccd12b26961634e24b8b64fc8457b9d31ba57a843
 DIST Thunar-1.6.13.tar.bz2 1937341 BLAKE2B fc47188876e694f724e3f10a0c1e621b5cae4112c9cf4951e670cb56d30ab532b04e77a29fca79096b58aac260ae8a065a6b0caf72c8b4750944dea593be9f2f SHA512 d1ae8efd0652c21b14ff45be9eef2ccf6b4400c744b08b2096a47b1af4eade2df1a237d03ede3e5dccea018b626dd67ffda2ed946b31fc2d3ff214c79e30168f
 DIST Thunar-1.6.14.tar.bz2 1964822 BLAKE2B f080f3d0634b4b4a8e11cdb902d5f300b1829979a98b573bdb6fd11b273cdc5e37f8e8c03556561b9f8730a70c7f7c34cbfbda76fe90f86cf2c443c3f426aabe SHA512 63287e35e71a6d1cb75a4d4db4d05f0fdf34d43b0ce7a2094e6aa9042d16f3eb60f7c5d755810bb0807112177e37954ba566b4f0ef701766205ed9e5561bd6e1
-DIST Thunar-1.7.0.tar.bz2 2235806 BLAKE2B dfe81012dd0c8e760497f5c919bc2e7d4dd5e3fe78969776022f769b6332d15c9bbfadee8eef8eb5cb60d8e482ada9b7d9c2673db4252d6ae2adc4788e0d257e SHA512 28f88108a2e6c415f81363330eae6046e858988b06cf6fc4408043dc6225e229aafcc1ccd5245568fb8910594a42bc7917a259eebe3ba597f453c6635c8ce639
 DIST Thunar-1.7.1.tar.bz2 2264496 BLAKE2B 84fc0ae18ec4d4bd414bbce30b6ba7f1f0c90de6202d8b830335fb49561c85428ee13753bdc1cb810713e628b977aacf78c93d7bd88c9ac90e3a78f8d74f5737 SHA512 200d2f7a30529fa9a93340a24d019a883193952157f3b37e67d4618ccff95823dfa06f6b04845d185fcb5ead780ea5c69ba9b846c82ea22bc433321b2b160ffb
 EBUILD thunar-1.6.13.ebuild 2023 BLAKE2B 44188d0301976e69b8889e67498199a66c7d5088165be529790b05811a54928442067a4c4b778415a8443a9a4c9945d4a9fa356f06484af35f412183c049964c SHA512 55c8db9c7651b7a72f3a58ce02fef6a91f3ffdd4266e1f4b84e3849c77f2d9bd8d1e421493926d3206d621f82285c56355bc423fb130eb4d049491ad2a74541a
 EBUILD thunar-1.6.14.ebuild 1966 BLAKE2B 26b9fc6171eed41563721f89aa5255b9b7aa8802a9d95270ab35bdeabb8baf12ba524e91816d363d94f1ac2b4fdd39ebb80c45bd9cac97aaff6e30d92518430f SHA512 0f858769d7f8f05cd8cf2d1c92aa3f9d52bea3e600cd5da764383a98d05ced3b33a5eac868bc37ad5b70400a3160555973f0c4981a7d000f2c88591f576acde1
-EBUILD thunar-1.7.0.ebuild 2057 BLAKE2B 122db5daa730b3b886ed6ed837b1906b08b6e52c25ab43844383094dceafaca9a7051870b1560480d0c05e01f40cf6eb6372a022718ab6db0d10971d713bc94c SHA512 fe4ff2a101548a82eaa449d462cf3475214e4a4db34af986dc527c344e4a5826b0a20a5030216e426b93826951a25d225b19cf0d524fb07bfbc9e90611cb8a6a
 EBUILD thunar-1.7.1.ebuild 1993 BLAKE2B ab5c787b9798f19b683709d2d17818cd40b28c165497121d0f8d778be45c45fc3d13ef97ffa7394530eba9b75156ac4d24b6028b816c54c606bceb4dd25dc6a5 SHA512 6a27b9e39078a223028ebceeb2fbde6e8084d35f4ae6cd51885937787ea98cc3510dc876400ca7c6b98b769ae8e4ec02e89be564153e87e5bbc8e64446781d73
 MISC metadata.xml 372 BLAKE2B e681d80da66f68cf89aea0e932d2a2c3008e388abcc40f20ffe31e859dd677fdd002c37af8c71912e1836bb6d008fe2b6f838453dc5c1e944fc66e9216b3708e SHA512 3ecb379e314ff3f9c745b61707c6df0a912b1466bd56abeebdba0ee138e14ee331fcd61acb3c5b64ace4daa42cbaaec8331cc83d6ae5d0bdc1fa5a69a258ef17
diff --git a/xfce-base/thunar/thunar-1.7.0.ebuild b/xfce-base/thunar/thunar-1.7.0.ebuild
deleted file mode 100644
index 3d5de7d48448..000000000000
--- a/xfce-base/thunar/thunar-1.7.0.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2-utils virtualx xdg-utils
-
-MY_P=${P^}
-
-DESCRIPTION="File manager for the Xfce desktop environment"
-HOMEPAGE="https://www.xfce.org/projects/ https://docs.xfce.org/xfce/thunar/start"
-SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="exif introspection libnotify pcre test +trash-panel-plugin udisks"
-
-GVFS_DEPEND=">=gnome-base/gvfs-1.18.3"
-COMMON_DEPEND=">=dev-lang/perl-5.6
-	>=dev-libs/glib-2.30:=
-	>=x11-libs/gdk-pixbuf-2.14:=
-	>=x11-libs/gtk+-3.20:3=
-	>=xfce-base/exo-0.11:=
-	>=xfce-base/libxfce4ui-4.12:=
-	>=xfce-base/libxfce4util-4.12:=
-	>=xfce-base/xfconf-4.12:=
-	exif? ( >=media-libs/libexif-0.6.19:= )
-	introspection? ( dev-libs/gobject-introspection:= )
-	libnotify? ( >=x11-libs/libnotify-0.7:= )
-	pcre? ( >=dev-libs/libpcre-6:= )
-	trash-panel-plugin? ( >=xfce-base/xfce4-panel-4.10:= )
-	udisks? ( virtual/libgudev:= )"
-RDEPEND="${COMMON_DEPEND}
-	>=dev-util/desktop-file-utils-0.20-r1
-	x11-misc/shared-mime-info
-	trash-panel-plugin? ( ${GVFS_DEPEND} )
-	udisks? (
-		virtual/udev
-		${GVFS_DEPEND}[udisks,udev]
-		)"
-DEPEND="${COMMON_DEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-DOCS=( AUTHORS ChangeLog FAQ HACKING NEWS README THANKS TODO )
-PATCHES=(
-	"${FILESDIR}"/thunar-1.16.2-integer-overflow.patch
-)
-
-src_configure() {
-	local myconf=(
-		$(use_enable introspection)
-		$(use_enable udisks gudev)
-		$(use_enable libnotify notifications)
-		$(use_enable exif)
-		$(use_enable pcre)
-		$(use_enable trash-panel-plugin tpa-plugin)
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_test() {
-	virtx emake check
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
diff --git a/xfce-base/xfce4-meta/Manifest b/xfce-base/xfce4-meta/Manifest
index e5edb139d122..cb635e5945da 100644
--- a/xfce-base/xfce4-meta/Manifest
+++ b/xfce-base/xfce4-meta/Manifest
@@ -1,3 +1,2 @@
 EBUILD xfce4-meta-4.12-r1.ebuild 732 BLAKE2B 5bb32ce9918b228e38296cb5ceb590ec1b9ba3a7eaf85aea5de6ff8a53ff1dc794eca1ea9ced579b2d705d96577a49ef2c51bb20f3d76474e6b3ca8c21f4bbee SHA512 7d009ae75a521bd3cb289c6d5dfdc352ad39e9510c76c5d5e055d2a0efe7648341d0db1c1c0b5af5a728f572e1a6a58b1542812f15a5a664eb2983f7a7e5c2aa
-EBUILD xfce4-meta-4.12.ebuild 731 BLAKE2B 6ea560133fae85f9a889e9769558c585367f2b5c4818fc0c5a13383519531b1e6af29228e775dce640a9333c1dfb9e581861c7475d7fc2f49d765ae537474478 SHA512 14a380c6263df6bf6cb0215dc9b37e7b4a15e11b84e56978357a956b54d04a11fafea62aa4e64999a1647a8e7a7634684aedccd6f25c0b7c68fe6c7bd0724742
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-base/xfce4-meta/xfce4-meta-4.12.ebuild b/xfce-base/xfce4-meta/xfce4-meta-4.12.ebuild
deleted file mode 100644
index 0bddfff6b6f2..000000000000
--- a/xfce-base/xfce4-meta/xfce4-meta-4.12.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="The Xfce Desktop Environment (meta package)"
-HOMEPAGE="https://www.xfce.org/"
-SRC_URI=""
-
-LICENSE="metapackage"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="minimal +svg"
-
-RDEPEND=">=x11-themes/gtk-engines-xfce-3:0
-	x11-themes/hicolor-icon-theme
-	>=xfce-base/xfce4-appfinder-4.12
-	>=xfce-base/xfce4-panel-4.12
-	>=xfce-base/xfce4-session-4.12
-	>=xfce-base/xfce4-settings-4.12
-	>=xfce-base/xfdesktop-4.12
-	>=xfce-base/xfwm4-4.12
-	!minimal? (
-		media-fonts/dejavu
-		virtual/freedesktop-icon-theme
-		)
-	svg? ( gnome-base/librsvg )"
diff --git a/xfce-base/xfce4-panel/Manifest b/xfce-base/xfce4-panel/Manifest
index cd4e6c4ee1e1..636498a93b8e 100644
--- a/xfce-base/xfce4-panel/Manifest
+++ b/xfce-base/xfce4-panel/Manifest
@@ -1,11 +1,5 @@
-DIST xfce4-panel-4.12.0.tar.bz2 1107470 BLAKE2B 2291b7739de0268d292963e4dc78e6e98c85180b0facd8be765691413053729d3eb198c22b381b9697b2fa4099c4de48404ce9367fd9b7fa17f3a0e6060e819c SHA512 9b5d0d51ac2c312d54e8daeea95bd861891e652faeee8b4a7dbf4b33507b70bf7b4fbca7cb8f2d3573699ae940a14d5a9a41da24f324db256146d8b7db8519a8
-DIST xfce4-panel-4.12.1.tar.bz2 1142476 BLAKE2B a1105bb872c4e506c5d530c494ee41907839b91701d8c596694391a567462919d12c6c536158d1460483f392c5dd4fd4ca7db0f716e8ae66abd87892919b691f SHA512 8bdc2a560a698e7d41429b40cde51ea1bec5aba211b6ee89b46822a38176e27e332efa785d93901d598b17171c739406e7f983372aaa49177db0f868aea985a4
 DIST xfce4-panel-4.12.2.tar.bz2 1167175 BLAKE2B 09d16c58bb2d78242069fc2191009af6bb737fd6571f7d9ceef4b2b2dc0f0be6fcdad17aa588f69573b9d7f62ca0c54ec712bd467ff793b6952ede733889136b SHA512 b455e28ecbd9e2fc152e1132a806307597157605fef19c61091fce90984b2eded2c0b691d1fa2475c218c9d0b12103e348e648a32d3e8d0aa9ca210b7ae36a9e
-DIST xfce4-panel-4.13.1.tar.bz2 1209889 BLAKE2B 385885cbace0da1dd85c797effb0387101e2b5bdc3781e02df7c793bbba5209876d6fb3b0f3356b5c7d9ec5a47e9b6366ef7f557706b73cb955f766c188072da SHA512 87eb939880ce2c1c677bc46544529c53c3658d31ee10787ef39d88e6ad28870840f3173bded743d0f7bf9e4f2b752fc44140fc3d0c6af9c84e6b2393fba63422
 DIST xfce4-panel-4.13.2.tar.bz2 1231467 BLAKE2B 994aa5daf3e2c09c96dfda82a67bdd5f28dad1edb2ed85fc5c9ac5c314eb426bb6431f9ae9e3fc5b5ee49fd818255c7c2f6abd58bf323a1ac92d2ca520a5224c SHA512 d26ffd904bc2dc1e8b866215c6c07e1c4052d8c46378c33dd45c90833cb4e80c452b7dc5f8d7dab0cfe28657c3eb0f4cb620b823938f54f8eb1ae1e4f8077ed0
-EBUILD xfce4-panel-4.12.0-r1.ebuild 1043 BLAKE2B 1585e2784763e5e45aa0269063851494f29dae6fa4f1f96ed1c7357cb9eec50c38a6e10a5d47defbaec12b412bda9cc1baa48a3effdb64b3932c7ce5d50cf7f3 SHA512 e62be4a2bbe1b8f582ca5a79f6be9996dd2d781f14a1a0492e33c7ed9f275e73163c6413a823a46bbc94bd75baf8df0bdc7b0ca92a35b2d9c733c1f9c0ed5f88
-EBUILD xfce4-panel-4.12.1-r1.ebuild 1038 BLAKE2B 948263536b1b59fe969ec1b514ff026014d54a7177db0f27a98f01486cb5730dba68e3f57bf144f3ec3691e1454020abaf721678e301f0aa1a36ea850b06c5f9 SHA512 03de37918cea674b02bea1f1670904fc703af37b0590562245f753d90a5dcaf47e5ff6117f39c8fd71637e3d91b1867d406449d78a942f7c8808d150bf3cb2f1
 EBUILD xfce4-panel-4.12.2.ebuild 1492 BLAKE2B e06ce9d0a77b4e22095f72f20289d1f68c971c5d499df2a42297557532cc8692798ec2c6a2444857e472dbc6081b2e98eb4d5a2e369381f899ba6a40081618f3 SHA512 3a2e2208121b7255918faa1d3d2f535f69f9cab92e2e59c3d6d58dd006f92d087fca3aa378f105e642e694e6c299b010f531843717aee147562e6cd2d71e1d76
-EBUILD xfce4-panel-4.13.1.ebuild 1203 BLAKE2B efd12fec4f9da9e9b96b98592882e177332099e015f819fcbc36e419a6d76c75cd50bfe17d474f3597f5c6f17f4074bef4215c7f8cd3084ef7987c0ccc753378 SHA512 fcba4e858f0b1378e35265ddb5b398cdac1074ce0eb2060f2d5d39d5832efed1ea73e34628d13d06defaf73723c1e908251541350744020288a564d02a6f5c63
 EBUILD xfce4-panel-4.13.2.ebuild 1332 BLAKE2B 5613eabebe9bb123d89daf27f0472089c98920b24eb918a2170cca61ee308c97663d9d852ff3011a8757c6e5232ecc1fb8f893efd5316236fbfc85f25c7832cb SHA512 30cc1b1f72f05c7ecf489ae451900c6fec6dde9540e176549d373b2f67673dce674beed4eded84fefcfbe195684d87c7c22b9ee57dadc32e67de380d94edb404
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-base/xfce4-panel/xfce4-panel-4.12.0-r1.ebuild b/xfce-base/xfce4-panel/xfce4-panel-4.12.0-r1.ebuild
deleted file mode 100644
index 8f2ac64b896d..000000000000
--- a/xfce-base/xfce4-panel/xfce4-panel-4.12.0-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit xfconf
-
-DESCRIPTION="Panel for the Xfce desktop environment"
-HOMEPAGE="https://docs.xfce.org/xfce/xfce4-panel/start"
-SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="debug"
-
-RDEPEND=">=dev-libs/dbus-glib-0.100
-	>=dev-libs/glib-2.24
-	>=x11-libs/cairo-1
-	>=x11-libs/gtk+-2.20:2
-	>=x11-libs/gtk+-3.2:3
-	x11-libs/libX11
-	>=x11-libs/libwnck-2.31:1
-	>=xfce-base/exo-0.8
-	>=xfce-base/garcon-0.3[gtk2(+)]
-	>=xfce-base/libxfce4ui-4.11
-	>=xfce-base/libxfce4util-4.11
-	>=xfce-base/xfconf-4.10"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	dev-util/gtk-doc-am
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-pkg_setup() {
-	XFCONF=(
-		--docdir="${EPREFIX}"/usr/share/doc/${PF}
-		--enable-gtk3
-		$(xfconf_use_debug)
-		)
-
-	DOCS=( AUTHORS ChangeLog NEWS THANKS )
-}
diff --git a/xfce-base/xfce4-panel/xfce4-panel-4.12.1-r1.ebuild b/xfce-base/xfce4-panel/xfce4-panel-4.12.1-r1.ebuild
deleted file mode 100644
index 533542b8f108..000000000000
--- a/xfce-base/xfce4-panel/xfce4-panel-4.12.1-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit xfconf
-
-DESCRIPTION="Panel for the Xfce desktop environment"
-HOMEPAGE="https://www.xfce.org/projects/"
-SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="debug"
-
-RDEPEND=">=dev-libs/dbus-glib-0.100
-	>=dev-libs/glib-2.24
-	>=x11-libs/cairo-1
-	>=x11-libs/gtk+-2.20:2
-	>=x11-libs/gtk+-3.2:3
-	x11-libs/libX11
-	>=x11-libs/libwnck-2.31:1
-	>=xfce-base/exo-0.8
-	>=xfce-base/garcon-0.3[gtk2(+)]
-	>=xfce-base/libxfce4ui-4.11
-	>=xfce-base/libxfce4util-4.11
-	>=xfce-base/xfconf-4.10"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	dev-util/gtk-doc-am
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-pkg_setup() {
-	XFCONF=(
-		--docdir="${EPREFIX}"/usr/share/doc/${PF}
-		--enable-gtk3
-		$(xfconf_use_debug)
-		)
-
-	DOCS=( AUTHORS ChangeLog NEWS THANKS )
-}
diff --git a/xfce-base/xfce4-panel/xfce4-panel-4.13.1.ebuild b/xfce-base/xfce4-panel/xfce4-panel-4.13.1.ebuild
deleted file mode 100644
index b36732ead955..000000000000
--- a/xfce-base/xfce4-panel/xfce4-panel-4.13.1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils xdg-utils
-
-DESCRIPTION="Panel for the Xfce desktop environment"
-HOMEPAGE="https://www.xfce.org/projects/"
-SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2.24:=
-	>=x11-libs/cairo-1:=
-	>=x11-libs/gtk+-2.20:2=
-	>=x11-libs/gtk+-3.16:3=
-	x11-libs/libX11:=
-	x11-libs/libwnck:3=
-	>=xfce-base/exo-0.11.2:=
-	>=xfce-base/garcon-0.5:=
-	>=xfce-base/libxfce4ui-4.13:=
-	>=xfce-base/libxfce4util-4.11:=
-	>=xfce-base/xfconf-4.13:="
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	dev-util/gtk-doc-am
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-src_configure() {
-	local myconf=(
-		# enable GTK+2 compatibility
-		--enable-gtk2
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/xfce-base/xfce4-session/Manifest b/xfce-base/xfce4-session/Manifest
index 3ea5403f031c..78a88d997757 100644
--- a/xfce-base/xfce4-session/Manifest
+++ b/xfce-base/xfce4-session/Manifest
@@ -5,5 +5,4 @@ DIST xfce4-session-4.12.1.tar.bz2 1289284 BLAKE2B 00af274ac1160a413c9e2c8b308dfc
 DIST xfce4-session-4.13.0.tar.bz2 1314715 BLAKE2B 7ab5bf645feaf9862e9cc4f36f26cfd614e7c66aa32cdb41ded8b0067e3aa23a6897beb6c362685f84c5b2a0f3d91462ab3dc7fed5a15875eff49107719c6c1c SHA512 61f9a547b03eb109a1a0fc83feaac743ea2119360f2f7208e589feb3e8f1db016ffe85cf1c8e20633ec399f263dcbccd35c431bde6f6f1482658688096da5cb0
 EBUILD xfce4-session-4.12.1-r1.ebuild 1906 BLAKE2B e2ed3718c176ae8ee61e3ee2d3b79a5b4cf1dda252a8e76e8808eaf063e959d7f58a23dc5058f4db09705bcc03e57dd299db1ef6299dc4b1b5d9a33b49a506e5 SHA512 5d6bd2d39c26b21d21942ce5c247e559d1cefa69903e998e2a20432eb257c27d84a75ca9edf3bf46f5e486f4720308c131cfcc67a66ee0b12a1caf6da078aae4
 EBUILD xfce4-session-4.13.0-r1.ebuild 1833 BLAKE2B dd046f6f515a107bfc74fe19403c57f91f7db6e8a7e9a5a93fda610052e1f6943b3123ab723adbbb3965846257f44dd870d958dad96cfd8feda3582adaeb01e5 SHA512 92a5933023c5f6a3243f7cd845a1c4f14c6da4fa1aaae4a6f9fdd52eaca9d10226744ae4b5679c2c824b6d57f895c7add1c2dc1e32fd4a57340a05f856d95c33
-EBUILD xfce4-session-4.13.0.ebuild 1932 BLAKE2B ce1a32ff354d930b8029f58d54f8481261d2b7cbc1fee01da66f85029930abd8f0e13afa675e1c33fbfaf336c4cffba4a824fea3227101d2656f43fd3a0566b4 SHA512 91b8b8e241bfafe3a14d50691b1d197a8442206f5e5804bcf270319af3d04f0ad8ffe382424d97319f3df0a3eddf6dbeecb6056f873d8f25f431e48132ca4fca
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-base/xfce4-session/xfce4-session-4.13.0.ebuild b/xfce-base/xfce4-session/xfce4-session-4.13.0.ebuild
deleted file mode 100644
index 9552519a605f..000000000000
--- a/xfce-base/xfce4-session/xfce4-session-4.13.0.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils
-
-DESCRIPTION="A session manager for the Xfce desktop environment"
-HOMEPAGE="https://docs.xfce.org/xfce/xfce4-session/start"
-SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="nls policykit systemd +xscreensaver"
-
-COMMON_DEPEND="x11-apps/iceauth
-	x11-libs/gtk+:3=
-	x11-libs/libSM:=
-	x11-libs/libwnck:3=
-	x11-libs/libX11:=
-	>=xfce-base/libxfce4util-4.12:=
-	>=xfce-base/libxfce4ui-4.12.1:=[gtk3(+)]
-	>=xfce-base/xfconf-4.12:=
-	policykit? ( >=sys-auth/polkit-0.102:= )"
-RDEPEND="${COMMON_DEPEND}
-	x11-apps/xrdb
-	nls? ( x11-misc/xdg-user-dirs )
-	xscreensaver? ( || (
-		>=x11-misc/xscreensaver-5.26
-		x11-misc/light-locker
-		>=x11-misc/xlockmore-5.43
-		x11-misc/slock
-		x11-misc/alock[pam]
-	) )"
-DEPEND="${COMMON_DEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-REQUIRED_USE="systemd? ( policykit )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.10.1-alock_support_to_xflock4.patch
-# TODO: this patch needs updating for the new version, and finding
-# upstream bug.
-#	"${FILESDIR}"/${PN}-4.12.1-light-locker_support_to_xflock4.patch
-)
-
-src_configure() {
-	local myconf=(
-		$(use_enable policykit polkit)
-		--with-xsession-prefix="${EPREFIX}"/usr
-	)
-
-	econf "${myconf[@]}"
-
-#	DOCS=( AUTHORS BUGS ChangeLog NEWS README TODO )
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-
-	local sessiondir=/etc/X11/Sessions
-	echo startxfce4 > "${T}"/Xfce4 || die
-	exeinto ${sessiondir}
-	doexe "${T}"/Xfce4
-	dosym Xfce4 ${sessiondir}/Xfce
-}
-
-pkg_postinst() {
-	GNOME2_ECLASS_ICONS="usr/share/icons/hicolor" \
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	GNOME2_ECLASS_ICONS="usr/share/icons/hicolor" \
-	gnome2_icon_cache_update
-}
diff --git a/xfce-base/xfce4-settings/Manifest b/xfce-base/xfce4-settings/Manifest
index a2e2729dca8e..b6354b9a4ba7 100644
--- a/xfce-base/xfce4-settings/Manifest
+++ b/xfce-base/xfce4-settings/Manifest
@@ -1,12 +1,8 @@
 AUX xfce4-settings-4.12.0-HDMI-power-cycling.patch 542 BLAKE2B e3c46cd52b11e5f5960fd1ed5234758348678c5de496f95532fead40b3e2c8faccab3aa6d10bd9b8b918a9ed5cfd8f06b891ce19c9a71680c2c9a45a3d7bcc87 SHA512 d38cf790a20e54899b31db28e7cf5e683196e91cc6f4c48732f526d2a44e9235a0ee4331a26fe01e088a2bbfbe61fefd4404e9e56794b0b1f9c41e2530bcc0be
 DIST xfce4-settings-4.12.0.tar.bz2 973324 BLAKE2B 2c6103ac0d43c89f523e530d2eccc0974b6a67a9206f300aba8630b6ea819ea16774141d92647e7b3682b437555a75a4c0a8e06e4abf593a302010342dfb3a10 SHA512 4a61c16f1f03de98c9968a00b50595e2934aaf28b80613c59403d33a293a7f8ef9ebb6fad98b0eeb97a6590b9100e91f73dd6363133d5d8bd06714f1126d8856
-DIST xfce4-settings-4.12.2.tar.bz2 1029833 BLAKE2B c6180addbfa25f4ab9ea2ba4c4bc7131117c2cf60436fe3a695b7d297d0172463548b3a0d521b4607907fec1ebf02096a513a4a18af9094976ed17c053fb8c22 SHA512 cd3a56e7f1a9680575ba82276258aadcf620c472495504dd686c0eda1c730f32900c132eb502990f7b3a6904699f892a86b5853419bd4f72779d56836a5c6145
 DIST xfce4-settings-4.12.3.tar.bz2 1035504 BLAKE2B db045839ea075d08acbad2bb316a4b577df959312146f8487e667c1de3fe69d129e9c80a21b97834e7f86598d776d7aaf7104f7640429a45a6d02ca3ca6c8bc4 SHA512 46bde0de70d8ebcc869ea5ba4f3eb0f123fb2e6f16e8a837c301e445044d65d90843fe3c8274a53818099112e43ff6217dfffd32bc032560331f5ca5fc5ba3ad
-DIST xfce4-settings-4.13.1.tar.bz2 1034276 BLAKE2B 1211a14a0d2a1b33fa400e5957852fc21a0b25e3b8abf880be552f4e2306e81337fdb1686c00b6c56607f24e55418a99498886e2e302ca9f52da606042e96af7 SHA512 e108ccf306599716c2fbc0fc11cd0b05fc89909c51e3bc5513745ac0279432d93c690f9f8d7faeb4bd8ffbd1d7a271276b0f690040692ca2d3f3a1ac55b62ccd
 DIST xfce4-settings-4.13.2.tar.bz2 1043277 BLAKE2B acbb2b78ce7002afb1489491f0cd856b42ee7db6441a908e1244aa22a0bd497de4ba11bd31cff33d2c4a5f0a94bec6a63244c7c493d15deac7d8b5016ec8c0a1 SHA512 3564ee50914a6cb1955457c2b7bc5b515815142b04df418c70ed87692bc9aa87365af61682f07a5d979501df0fe32fe229f5be927fe0233855dfd9f454ff9643
 EBUILD xfce4-settings-4.12.0-r2.ebuild 1573 BLAKE2B 4678ab6ee86da69004b9665daec2d1fdafd77cca518120a597898ebd20780198b4ca2a8bbc31f1c265703090c9cde5408ddaca7607c51636a8602c7f3b01acb0 SHA512 65a30d30a81b375d4729f1ad925d27cb6041434d1c8d564a7f0d51c8d98ef6cfabbf4ae354c1a7a2fa2368d3727a41c0e4f6cce42bd3a7e325b755e61ee902f6
-EBUILD xfce4-settings-4.12.2.ebuild 1559 BLAKE2B 04f03e9c2a56b9d3991f393fa69a1ec0005a0b3186fa81ea27b10df626dd511dbcdff4bcb2133a1373709ec87407e2fa230fa63ab4799693ec6654301ad5a014 SHA512 1ba5706abda0cffe26df6d739598899a0e5173a68df9974850aa87a6b0c8ad184913d27ae989e10e8edfc1496a3c71b758c3b9876a7a65db3becf8f66768faa1
 EBUILD xfce4-settings-4.12.3.ebuild 1559 BLAKE2B 04f03e9c2a56b9d3991f393fa69a1ec0005a0b3186fa81ea27b10df626dd511dbcdff4bcb2133a1373709ec87407e2fa230fa63ab4799693ec6654301ad5a014 SHA512 1ba5706abda0cffe26df6d739598899a0e5173a68df9974850aa87a6b0c8ad184913d27ae989e10e8edfc1496a3c71b758c3b9876a7a65db3becf8f66768faa1
-EBUILD xfce4-settings-4.13.1.ebuild 1553 BLAKE2B e014eb160a0765e36b8625ec051fc1ef5014c9b836c42a2c91d27fd0fda90091a4e270cdd428fab64cfaa0d777c17ffb4dcdf887698b748283c0beb484d63bda SHA512 5a55273e2500f3a1a23f31dce9a1160cd6d21fd86a50508bc845b8f8de4df26f022de50c745b4a3fd296b77e53a5654c966021c5c886f0e1032c2fd25d4d50b6
 EBUILD xfce4-settings-4.13.2.ebuild 1553 BLAKE2B e014eb160a0765e36b8625ec051fc1ef5014c9b836c42a2c91d27fd0fda90091a4e270cdd428fab64cfaa0d777c17ffb4dcdf887698b748283c0beb484d63bda SHA512 5a55273e2500f3a1a23f31dce9a1160cd6d21fd86a50508bc845b8f8de4df26f022de50c745b4a3fd296b77e53a5654c966021c5c886f0e1032c2fd25d4d50b6
 MISC metadata.xml 479 BLAKE2B d15c203e15371edc17aabffe86e690c03c7e853e78c74e0de5753f977dbb9d080813706e3d3170dffb952591abc70f0aea6ac96ce9ca24ca7dbb627beeb8ea1f SHA512 56e89d92ba3fc3c53a86855721394993d8ac930549f19389728e0f8d60de6e92eb3475aeb0e09ca8f43412ba5e86c59482e7488dd5d0cd357968fabc6b3227b9
diff --git a/xfce-base/xfce4-settings/xfce4-settings-4.12.2.ebuild b/xfce-base/xfce4-settings/xfce4-settings-4.12.2.ebuild
deleted file mode 100644
index 1a6651fff45d..000000000000
--- a/xfce-base/xfce4-settings/xfce4-settings-4.12.2.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2-utils
-
-DESCRIPTION="Configuration system for the Xfce desktop environment"
-HOMEPAGE="https://www.xfce.org/projects/"
-SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="input_devices_libinput libcanberra libnotify upower +xklavier"
-
-RDEPEND=">=dev-libs/dbus-glib-0.100
-	>=dev-libs/glib-2.24
-	media-libs/fontconfig
-	>=x11-libs/gtk+-2.20:2
-	x11-libs/libX11
-	>=x11-libs/libXcursor-1.1
-	>=x11-libs/libXi-1.3
-	>=x11-libs/libXrandr-1.2
-	>=xfce-base/garcon-0.2
-	>=xfce-base/exo-0.8
-	>=xfce-base/libxfce4ui-4.11
-	>=xfce-base/libxfce4util-4.11
-	>=xfce-base/xfconf-4.10
-	libcanberra? ( >=media-libs/libcanberra-0.25[sound] )
-	input_devices_libinput? ( x11-drivers/xf86-input-libinput )
-	libnotify? ( >=x11-libs/libnotify-0.7 )
-	upower? ( || ( >=sys-power/upower-0.9.23 sys-power/upower-pm-utils ) )
-	xklavier? ( >=x11-libs/libxklavier-5 )"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig
-	sys-devel/gettext
-	>=x11-proto/inputproto-1.4
-	x11-proto/xproto"
-
-src_configure() {
-	econf \
-		$(use_enable upower upower-glib) \
-		$(use_enable input_devices_libinput xorg-libinput) \
-		$(use_enable libnotify) \
-		$(use_enable xklavier libxklavier) \
-		$(use_enable libcanberra sound-settings)
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/xfce-base/xfce4-settings/xfce4-settings-4.13.1.ebuild b/xfce-base/xfce4-settings/xfce4-settings-4.13.1.ebuild
deleted file mode 100644
index e333ed8566d9..000000000000
--- a/xfce-base/xfce4-settings/xfce4-settings-4.13.1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2-utils
-
-DESCRIPTION="Configuration system for the Xfce desktop environment"
-HOMEPAGE="https://www.xfce.org/projects/"
-SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="input_devices_libinput libcanberra libnotify upower +xklavier"
-
-RDEPEND=">=dev-libs/dbus-glib-0.100
-	>=dev-libs/glib-2.24
-	media-libs/fontconfig
-	x11-libs/gtk+:3
-	x11-libs/libX11
-	>=x11-libs/libXcursor-1.1
-	>=x11-libs/libXi-1.3
-	>=x11-libs/libXrandr-1.2
-	>=xfce-base/garcon-0.2
-	>=xfce-base/exo-0.11
-	>=xfce-base/libxfce4ui-4.12
-	>=xfce-base/libxfce4util-4.12
-	>=xfce-base/xfconf-4.13
-	libcanberra? ( >=media-libs/libcanberra-0.25[sound] )
-	input_devices_libinput? ( x11-drivers/xf86-input-libinput )
-	libnotify? ( >=x11-libs/libnotify-0.7 )
-	upower? ( || ( >=sys-power/upower-0.9.23 sys-power/upower-pm-utils ) )
-	xklavier? ( >=x11-libs/libxklavier-5 )"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig
-	sys-devel/gettext
-	>=x11-proto/inputproto-1.4
-	x11-proto/xproto"
-
-src_configure() {
-	econf \
-		$(use_enable upower upower-glib) \
-		$(use_enable input_devices_libinput xorg-libinput) \
-		$(use_enable libnotify) \
-		$(use_enable xklavier libxklavier) \
-		$(use_enable libcanberra sound-settings)
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/xfce-base/xfconf/Manifest b/xfce-base/xfconf/Manifest
index 89a11029873e..bc569a7cd5f0 100644
--- a/xfce-base/xfconf/Manifest
+++ b/xfce-base/xfconf/Manifest
@@ -1,7 +1,5 @@
-DIST xfconf-4.12.0.tar.bz2 542544 BLAKE2B 4a2e5fbdbc375ee97c7730b720574495b22cf2e1549cad674d21976e7b021a2d987381b86fbec593a1d0eaf2a99484c2f0d716ada6cba754f6a5487da6696a5b SHA512 60cc37a7207b0486f7f2de665870facf8e339241df344d7540082f3db447b3ac88bddd306d6a09a3868878cb477d1696491c71470052ef56cb649d773bd55b56
 DIST xfconf-4.12.1.tar.bz2 564131 BLAKE2B 893210f19d743559b0879e9e38004400c8f8af0b6b8c72db4602360eee2ee7058f074e86f2f9e4397f6e728eae0148d3621424461d53e84ad768d7f0673ed08a SHA512 114dba6a78d43b25eebfd9ef78beec75391b0c77e736e66ae2b04fe97dc281f93d05467ddfdd63a5067f44de135347564fe55928ae7de72f0984339db411d77f
 DIST xfconf-4.13.4.tar.bz2 598700 BLAKE2B 05d4f7e360359e8d56b8a4cf6a39f22506113a758861fb730d9fb858f92554af3e28c49a21ceb246f8503087bec1032d430b16df999f7db22c56d3d3cb12ad68 SHA512 17c4c2ff4b02eef2d3040c21120e34863e4b38794d7670e42a31e4062a0ba0d4064d4239e8166a2c05d5d316773fdc96ae6098e78ab9b058b9c5a31f94c7f3dc
-EBUILD xfconf-4.12.0-r1.ebuild 1504 BLAKE2B 89fa42d9668ae163298936bebfcfbecf7cddd6e4fae1da72a8d9977cd5f7f252b0eefe83d243a777b07060e0acedfe8fde0a466906648ee3c4efbf844f3b11b5 SHA512 5b263c7ff5a54350f3552dfb9f51d075e2cefb506d39353073c2d747172158479ca855bfb2d07983f48b095563264ba6a780e586be531cdc1ff559bda87d8b8c
 EBUILD xfconf-4.12.1.ebuild 1496 BLAKE2B d5f1e391025f6339da53bf505ccafc5bb29ea057d294134a0169541d8983ff3d780e9cd1d6c6cbb49fce41716b741920fbc8cfa103f86f9af817dc205e33a341 SHA512 9b5165e8d4246cba0eb0d3c37f1dbc363385bd14f24f06b4159cae98169c924a60563ba897ec6891bd860c8f93cc1ec67f154cae2158311a6b20bcc8a21d41db
 EBUILD xfconf-4.13.4.ebuild 1614 BLAKE2B 35e383b99237f8e84def2b182c441dc109b1c7f207a7cd11de4d120055ed27a635221457fb3ba1ede4cdcfbb00d191a9e1df90b8e3fba975334b5115071a3694 SHA512 479bcf4cb0d7be46ca871186e1ed202964cdb1a6ad86fddb246773a6a93bfae5908ba409ba53c6254e6bf2107c1fcf5c04a2ade04c6b318d643633883907ccee
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-base/xfconf/xfconf-4.12.0-r1.ebuild b/xfce-base/xfconf/xfconf-4.12.0-r1.ebuild
deleted file mode 100644
index 33870abdf435..000000000000
--- a/xfce-base/xfconf/xfconf-4.12.0-r1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit xfconf
-
-DESCRIPTION="A configuration management system for Xfce"
-HOMEPAGE="https://docs.xfce.org/xfce/xfconf/start"
-SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
-IUSE="debug perl"
-
-RDEPEND=">=dev-libs/dbus-glib-0.98
-	>=dev-libs/glib-2.30
-	>=xfce-base/libxfce4util-4.10
-	perl? (
-		dev-lang/perl:=[-build(-)]
-		dev-perl/glib-perl
-	)"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig
-	sys-devel/gettext
-	perl? (
-		dev-perl/ExtUtils-Depends
-		dev-perl/ExtUtils-PkgConfig
-	)"
-
-pkg_setup() {
-	XFCONF=(
-		$(use_enable perl perl-bindings)
-		$(xfconf_use_debug)
-		$(use_enable debug checks)
-		--with-perl-options=INSTALLDIRS=vendor
-		)
-
-	[[ ${CHOST} == *-darwin* ]] && XFCONF+=( --disable-visibility ) #366857
-
-	DOCS=( AUTHORS ChangeLog NEWS TODO )
-}
-
-src_prepare() {
-	# https://bugzilla.xfce.org/show_bug.cgi?id=9556
-	cat <<-EOF >> po/POTFILES.skip
-	xfconf-perl/xs/Xfconf.c
-	xfconf-perl/xs/XfconfBinding.c
-	xfconf-perl/xs/XfconfChannel.c
-	EOF
-	xfconf_src_prepare
-}
-
-src_compile() {
-	emake OTHERLDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	xfconf_src_install
-
-	if use perl; then
-		find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
-		find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
-	fi
-}
diff --git a/xfce-base/xfdesktop/Manifest b/xfce-base/xfdesktop/Manifest
index 4bc6a9506270..25ab632542af 100644
--- a/xfce-base/xfdesktop/Manifest
+++ b/xfce-base/xfdesktop/Manifest
@@ -1,7 +1,5 @@
-DIST xfdesktop-4.12.3.tar.bz2 1420704 BLAKE2B c8e17717cbb29d7e64ab234e57f5658ae4d3f12ecfca310aff803ee8f52d1c8ecf3da88a02dfb6bc6edb9c6e4fab9daf48d6eb50e40a51fd497f1abbb521b8a7 SHA512 e8c89640722d3dfb2c5aae09779f81e5e2a6e157cc4756a46139547bd1a5b1977fa828f68e8ea61d6c9483c35a9303169fc33cbeacde06f7e95e19c65ce54878
 DIST xfdesktop-4.12.4.tar.bz2 1421623 BLAKE2B a18b891d639165d617f2701106dedb2f8577273ece5a4c93f6b5e1ef26f801304ea2014f21bd2821eb9bac9b19e02dd75cd4054a116eefd544f4d8e5d6968879 SHA512 29f170b96836298dc83e3c49650ab7e88a93c1a2fa1599d1d98f3b6c80c9c059748b76a821077eea39b5b4619998bb300ff17f06e88483a59bd5ae2b76d0605e
 DIST xfdesktop-4.13.1.tar.bz2 1485914 BLAKE2B 2b991b40317c9d92b53f357d674078598a7b17dd870155de8eb360fd9998d5376582909b57a93e00628a7dfd7e65bfea22b7f57b9373bab869296ef9b2973af5 SHA512 efe5ffe450f498ee0188a1ca5efd0ef340d73b5650060f18db4fe94ae9130dd27e41c6b30af2f90839e6c8272f3e270d16b86df64d595fe82169c26d624f806a
-EBUILD xfdesktop-4.12.3.ebuild 1275 BLAKE2B 08dc9a579a01aeba80bd7b53321501a8248438373f8fd7bdbe4eea01050338765a1a4ce34862b8a179c377a4edafec409700ab537f75ca0a58a6b596acb9a696 SHA512 57dcf79e03bc606f2cc2eb16000008ce272495ba322453283e441d5d4e831587fd121fdff0c9fef086c2ec6c49ba96bb02a705855d4cfdd6daae622da6816bde
 EBUILD xfdesktop-4.12.4.ebuild 1293 BLAKE2B f873bc525418e4943330020e327404ff21e193efe6fe839f4b3f5efbbb69e594bca309d1c349b1534b625b4797f054b34ed8248ec22185d54bde46bb4b59b1dd SHA512 b347815d11c3045613df97c6b9c41f636f8d79edb4b9c06cf1a2ad4cd78101043afb18854f9dc5176e228bdebe13e691ca9d32aab8a0cedf46d01939e08a5124
 EBUILD xfdesktop-4.13.1.ebuild 1269 BLAKE2B 91c7ea39e8c021e64f07bfdd91edbc7fcaa4f2f1277a7b47a32e781eeb1270cfbfdb27dfb0685661b1abda22237f8899a54b54d184730bc4332d4e72819f794d SHA512 8df648b74234353c6e0bb4b6efe2bee271a2e4071416721cd927a2e8ae9ace3e99af1b5492b4347392ce5e0ac303568ea08c32015f1bbedb48c5f3921e0a1d80
 MISC metadata.xml 364 BLAKE2B 64544c9e89e370bb213647843ebc3c5d4ca08aa46564b02830ff041e74db5018d7503106cba4e7c1dd562f359649974f12b841e32136eb73e9d84ea0ed36f456 SHA512 3140dbe5320efba5393874f93b907ef2dff1cc8dd44cda7340abaf19dcbbd709beb7649ac72f1e9f92da546e010f966cd9f5d51b867c6df8c49332bf9de67dac
diff --git a/xfce-base/xfdesktop/xfdesktop-4.12.3.ebuild b/xfce-base/xfdesktop/xfdesktop-4.12.3.ebuild
deleted file mode 100644
index 3ce2596fe534..000000000000
--- a/xfce-base/xfdesktop/xfdesktop-4.12.3.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit xfconf
-
-DESCRIPTION="Desktop manager for the Xfce desktop environment"
-HOMEPAGE="https://www.xfce.org/projects/"
-SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="debug libnotify +thunar"
-
-# src/xfdesktop-file-utils.c:#if GLIB_CHECK_VERSION (2, 38, 0)
-RDEPEND=">=x11-libs/cairo-1.6:=
-	>=dev-libs/dbus-glib-0.100:=
-	>=dev-libs/glib-2.20:=
-	>=x11-libs/gtk+-2.24:2=
-	>=x11-libs/libwnck-2.30:1=
-	x11-libs/libX11:=
-	>=xfce-base/exo-0.8:=
-	>=xfce-base/garcon-0.3:=
-	>=xfce-base/libxfce4ui-4.11:=
-	>=xfce-base/libxfce4util-4.11:=
-	>=xfce-base/xfconf-4.10:=
-	libnotify? ( >=x11-libs/libnotify-0.7:= )
-	thunar? (
-		>=dev-libs/glib-2.38:=
-		>=xfce-base/thunar-1.6:=[dbus]
-		)"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-pkg_setup() {
-	XFCONF=(
-		--docdir="${EPREFIX}"/usr/share/doc/${PF}
-		$(use_enable thunar file-icons)
-		$(use_enable thunar thunarx)
-		$(use_enable libnotify notifications)
-		$(xfconf_use_debug)
-		)
-
-	DOCS=( AUTHORS ChangeLog NEWS README TODO )
-}
diff --git a/xfce-base/xfwm4/Manifest b/xfce-base/xfwm4/Manifest
index 0df5d6365d7f..4b3512b1d92d 100644
--- a/xfce-base/xfwm4/Manifest
+++ b/xfce-base/xfwm4/Manifest
@@ -1,10 +1,6 @@
-AUX xfwm4-4.12-touchscreen-subwindow-fix.patch 661 BLAKE2B 46ac08a565b4e105bded38f423d4a5faeb7fb833f231a677953f6bf22effd1a23f70f957cce5549ea48fcdb7a561217edea380e5c37070e431b516fd610fb41e SHA512 6d7b4216c6cacceb1f923729676ec622d9ab2518a5d5948065c90ded1dcab8ace1e53bcd6458a555358a1d5e9a7dfcc9214667a091577f374acc92c940b9e1c9
 AUX xfwm4-4.13.0-ctrl-f1.patch 998 BLAKE2B 9124fb6d749875de12cdc4794e923c621a6dbd7d6ee01ccbdaa876a72f41ce1fa2f5dff1ab4b718aa400c46f5a0c65c9d193c413a6ca78d07e99a077ac683134 SHA512 266977cbbedb5656196276c9441922346d936f1cdebdcfb24253add1c4d643344e00046e5574a534a5b5b70ca13826797f6202700b4aac09e0281e5c518428ba
-DIST xfwm4-4.12.3.tar.bz2 1191929 BLAKE2B fbe306d095fba0673be17011757b880bf66533c7466a14850e640b8284ed2751ab377685f7811d8d9a4bfb57e8e0303258b512d7080b06cb9299712e9bb74285 SHA512 96fcc76fc640027883a7a3373836565987b1d3d4e61fb40aa7e2f990a8140d92cf66171fb4517368faba45c9083a3ad19f589d59b07a55c3417aaaca87e408d7
 DIST xfwm4-4.12.4.tar.bz2 1208874 BLAKE2B 60b584d71bc4696bae83897d80cd90d9c13233d1971c823eea6417c8020a0440dc0d648df4e11b27947915ca57130ea3bc7b588e902dc7db74945349ff9ac514 SHA512 a33530b08f094456c45ad7c627ba34d3772eaeacdc9f422a3a54a16194d494cb1d6798122398d917fb8bc970db7e1184d9dc8edefc365dacc86de22be397b43d
 DIST xfwm4-4.13.0.tar.bz2 1229878 BLAKE2B 9d7f3d6121a1d1522294a659204d391e120b971cbca00f53f0a0d37f256f2ad65dc6ac1cfd5355d78fa5bd811ed8f7d4013081a10470f18e3edb9fcc0395e218 SHA512 01c6cc31dc179ccb51f9881f64ee9e4e16320ab888381d0b203ca0b2a46097048c30eabe7083aaec869c80e8e358c287896d6a1965a36ed6f2f981c27cfb2dce
-EBUILD xfwm4-4.12.3-r1.ebuild 1653 BLAKE2B 54476d6f9edd45475975cc84952ec3f1fc9341e3e4ca2e83b4bdcefe0fcb6c3b923ca460ab3fb57308702c74f534f95117b7705085098554c0feba5190e6299a SHA512 714802fb890944fa5b321a59cda7876af66fdc7832affddbdf4a7c470ec108005dc248d4b8e021246226694e3e0eac249ba6100a60f074b5e7b08004f86c4ea5
 EBUILD xfwm4-4.12.4.ebuild 1515 BLAKE2B b774428b6c7ec3578b2ce679a48aa2861cabaebcf79502950ff6604cc60bbe4fe82fd95d69e86da64152e3bc774c7adcc9102b00b6ad41024bc2cbde00b4f2ce SHA512 b8bc401ab7767cc5a5598dc0a0ff367954326d24958243ca20f04c3d9588a7c9c0f91e5adc0f8d2d7449815767bc4e73648f7ada150a55549183f3381602bdf6
 EBUILD xfwm4-4.13.0-r1.ebuild 1741 BLAKE2B 4dad9fb930616e610be3a16b466fd5505e40be94dafe393d17e3412d27495c3119349422823761ea77c9876764f6ea8456b45b3afe6a71d0b72032126312eb1f SHA512 9dc3905aeaecff14847b34fd4d2f04e932688aaed8d7244ae9f3eaf5a6e2bfdbddd21ee66547c209f0ed787ab778590d90261b2766d25fb267d106d65894f440
-EBUILD xfwm4-4.13.0.ebuild 1687 BLAKE2B ae6177d167ba2b3608514bec0f38c907c9e4add0f39e404a197b3716074e047ef159d958db5f0cd4c0aec89024e1eac391ded0862b7ee8d885f4ac5bd2f21d4b SHA512 b979c9ebd4c7bb20815e7ba0bde6a67d7dd46bb74b652e473a24667680b28c883a85606561f22186d0f2a703414b429f2421b45cbeb1495e01e3a8986166e303
 MISC metadata.xml 336 BLAKE2B 7e0ae4707d98e66226f9572838507c6178d676c00d37b3beb7251a69459ae92ddf8e1061e9a6400d38497c14a22484bdf3e34aad7635f16a1cf4fdc6b9af2966 SHA512 099c7eb76cf479f56e499b979a2461c002088bac30838d46eb228a1810593453b95c26c4f9b0a4cc504fad9eaa3c8e73e5925e26886fff542ec3232fc425bd86
diff --git a/xfce-base/xfwm4/files/xfwm4-4.12-touchscreen-subwindow-fix.patch b/xfce-base/xfwm4/files/xfwm4-4.12-touchscreen-subwindow-fix.patch
deleted file mode 100644
index 98de1cab3f6c..000000000000
--- a/xfce-base/xfwm4/files/xfwm4-4.12-touchscreen-subwindow-fix.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -ur xfwm4-4.10.1/src/events.c b/src/events.c
---- xfwm4-4.10.1/src/events.c	2014-10-31 14:19:18.012757936 -0600
-+++ b/src/events.c	2014-10-31 14:18:54.901758349 -0600
-@@ -888,6 +888,13 @@
-     {
-         state = ev->state & MODIFIER_MASK;
-         win = ev->subwindow;
-+        if (!win) {
-+            Window root_ret;
-+            int rx,ry,wx,wy;
-+            unsigned int mask_ret;
-+            XQueryPointer(display_info->dpy, ev->window,
-+                &root_ret, &win, &rx, &ry, &wx, &wy, &mask_ret);
-+        }
-         screen_info = c->screen_info;
- 
-         if ((ev->button == Button1) && (state) && (state == screen_info->params->easy_click))
diff --git a/xfce-base/xfwm4/xfwm4-4.12.3-r1.ebuild b/xfce-base/xfwm4/xfwm4-4.12.3-r1.ebuild
deleted file mode 100644
index 1f61951e69df..000000000000
--- a/xfce-base/xfwm4/xfwm4-4.12.3-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit xfconf
-
-DESCRIPTION="Window manager for the Xfce desktop environment"
-HOMEPAGE="https://docs.xfce.org/xfce/xfwm4/start"
-SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="debug dri startup-notification +xcomposite"
-
-RDEPEND="dev-libs/dbus-glib:=
-	>=dev-libs/glib-2.20:=
-	>=x11-libs/gtk+-2.24:2=
-	x11-libs/libX11:=
-	x11-libs/libXext:=
-	x11-libs/libXrandr:=
-	x11-libs/libXrender:=
-	x11-libs/pango:=
-	>=x11-libs/libwnck-2.30:1=
-	>=xfce-base/libxfce4util-4.10:=
-	>=xfce-base/libxfce4ui-4.11:=
-	>=xfce-base/xfconf-4.10:=
-	startup-notification? ( x11-libs/startup-notification:= )
-	xcomposite? (
-		x11-libs/libXcomposite:=
-		x11-libs/libXdamage:=
-		x11-libs/libXfixes:=
-		)"
-# libdrm: only headers are used
-# libICE/liBSM: not really used anywhere but checked by configure
-#   https://bugzilla.xfce.org/show_bug.cgi?id=11914
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	x11-libs/libICE
-	x11-libs/libSM
-	xfce-base/exo
-	virtual/pkgconfig
-	dri? ( >=x11-libs/libdrm-2.4 )"
-
-pkg_setup() {
-	XFCONF=(
-		--docdir="${EPREFIX}"/usr/share/doc/${PF}
-		$(use_enable dri libdrm)
-		$(use_enable startup-notification)
-		--enable-xsync
-		--enable-render
-		--enable-randr
-		$(use_enable xcomposite compositor)
-		$(xfconf_use_debug)
-		)
-
-	DOCS=( AUTHORS ChangeLog COMPOSITOR NEWS README TODO )
-
-	PATCHES=(
-		"${FILESDIR}/xfwm4-4.12-touchscreen-subwindow-fix.patch"
-		)
-}
diff --git a/xfce-base/xfwm4/xfwm4-4.13.0.ebuild b/xfce-base/xfwm4/xfwm4-4.13.0.ebuild
deleted file mode 100644
index 433d1af8fb73..000000000000
--- a/xfce-base/xfwm4/xfwm4-4.13.0.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils
-
-DESCRIPTION="Window manager for the Xfce desktop environment"
-HOMEPAGE="https://www.xfce.org/projects/"
-SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="opengl startup-notification +xcomposite xpresent"
-
-RDEPEND="dev-libs/dbus-glib:=
-	>=dev-libs/glib-2.20:=
-	>=x11-libs/gtk+-2.24:2=
-	x11-libs/libX11:=
-	x11-libs/libXext:=
-	x11-libs/libXrandr:=
-	x11-libs/libXrender:=
-	x11-libs/pango:=
-	>=x11-libs/libwnck-2.30:1=
-	>=xfce-base/libxfce4util-4.10:=
-	>=xfce-base/libxfce4ui-4.11:=
-	>=xfce-base/xfconf-4.10:=
-	opengl? ( media-libs/libepoxy:=[X(+)] )
-	startup-notification? ( x11-libs/startup-notification:= )
-	xpresent? ( x11-libs/libXpresent )
-	xcomposite? (
-		x11-libs/libXcomposite:=
-		x11-libs/libXdamage:=
-		x11-libs/libXfixes:=
-		)"
-# libICE/libSM: not really used anywhere but checked by configure
-#   https://bugzilla.xfce.org/show_bug.cgi?id=11914
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	x11-libs/libICE
-	x11-libs/libSM
-	xfce-base/exo
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog COMPOSITOR NEWS README TODO )
-
-src_configure() {
-	local myconf=(
-		$(use_enable opengl epoxy)
-		$(use_enable startup-notification)
-		--enable-xsync
-		--enable-render
-		--enable-randr
-		$(use_enable xpresent)
-		$(use_enable xcomposite compositor)
-	)
-
-	econf "${myconf[@]}"
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/xfce-extra/Manifest.gz b/xfce-extra/Manifest.gz
index 56218536fc96..9b3228ff2e19 100644
--- a/xfce-extra/Manifest.gz
+++ b/xfce-extra/Manifest.gz
diff --git a/xfce-extra/eatmonkey/Manifest b/xfce-extra/eatmonkey/Manifest
index d35db37ad6fb..679b419251d0 100644
--- a/xfce-extra/eatmonkey/Manifest
+++ b/xfce-extra/eatmonkey/Manifest
@@ -1,5 +1,4 @@
 AUX eatmonkey-0.1.4-syntax.patch 267 BLAKE2B a0e534be04ea83c55ffa073911e173c48ec1c4060b6b3ee263cf4d11b393b53997af715803ce8c2fd398230d7a5ec782b658cca78803eaa28e2a166f205aaadb SHA512 1f2ab3c62ac18e9e93caa62d99b8deb39303689b1de63845e9994cd81b223c924f6c8257affa66da9b539c0f74bd7364620306239a4d55a8539df92f19980ed6
 DIST eatmonkey-0.1.4.tar.bz2 181996 BLAKE2B d9272cd62dea09e44c9f8cf20055d68a6f0e0eda29ac89ab450b9b60ed4fa511c6661b2a38811fac86c0203b119c1eb07a886b11ca7ad0f48db6e0fcb6431848 SHA512 95bd0bf46588151398fba52b01309f9df1cd8ccce046a2b81f7167adafc4f1cd1b217deb27c0ec91429a6cdcfb807bbaf7e00fcd7b31414316dced7a2c0d4a15
 EBUILD eatmonkey-0.1.4-r1.ebuild 989 BLAKE2B 92f4344fb4cc05f38e105f682186a88945d4964a6d935b7aa3220a15fa0465c99e0e1b692b2ffc76c9de2380fa028980e193fe3f208627d49e8926ccad4c4acc SHA512 9b7df605fd255b651dbbd6dcb82599c77d02902ca1b9881c79c31e8dd671349041e01e6a3204bd74e7b10e40d33a7991e498a1cecd17866bb1d6720804a55903
-EBUILD eatmonkey-0.1.4.ebuild 921 BLAKE2B 2401a84277d211c2b6aff6072ce4b547c6aabf8c292399b45eabe7064b9c2b686c8b2a54e1deba77a27bf6eeef5e56fc3762255705770765f6ab7bc4dd6fe882 SHA512 d5fd1dd1d43f0aacedf7deab39e486af648820da0c668730a9df60502fb781b43d80fd974f2abadd154b9e921159ce244366abf7b283912b1a093a00544ff71d
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/eatmonkey/eatmonkey-0.1.4.ebuild b/xfce-extra/eatmonkey/eatmonkey-0.1.4.ebuild
deleted file mode 100644
index 0fcf5ac16a0c..000000000000
--- a/xfce-extra/eatmonkey/eatmonkey-0.1.4.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit xfconf
-
-DESCRIPTION="A download manager that works exclusively with aria2"
-HOMEPAGE="https://goodies.xfce.org/projects/applications/eatmonkey"
-SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-COMMON_DEPEND=">=x11-libs/gtk+-2.12:2
-	dev-libs/libunique:1
-	>=xfce-base/libxfce4util-4.8
-	>=net-libs/libsoup-2.26:2.4"
-RDEPEND="${COMMON_DEPEND}
-	>=net-misc/aria2-1.9.0[bittorrent,xmlrpc]
-	dev-lang/ruby
-	dev-ruby/ruby-glib2
-	dev-ruby/ruby-gtk2"
-DEPEND="${COMMON_DEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-pkg_setup() {
-	PATCHES=( "${FILESDIR}"/${P}-syntax.patch )
-	DOCS=( AUTHORS ChangeLog NEWS README )
-}
-
-src_prepare() {
-	sed -i -e 's:/usr/local:/usr:' src/eat{monkey,manager.rb} || die
-	xfconf_src_prepare
-}
diff --git a/xfce-extra/multiload-nandhp/Manifest b/xfce-extra/multiload-nandhp/Manifest
index fcb8a6836591..791728598ba2 100644
--- a/xfce-extra/multiload-nandhp/Manifest
+++ b/xfce-extra/multiload-nandhp/Manifest
@@ -1,4 +1,3 @@
 DIST multiload-nandhp-0.3.tar.gz 34812 BLAKE2B 79ee7b5b2880e2e8242c40128ef320966fa9ec7c904e79efbc497fd421fe531f94c6ccd44be665bae2a092cf70ee8ac745d1e718ae5e6bf60efaae3339329c93 SHA512 68367d0bca144a9c2c56516254b9f1531aedfbc0c34f924e0264314cd9a1215a13d1b3b6f1d3c1b0781a95abfa0705819e7d886e3c3b84705c3b5b60f7d5806c
 EBUILD multiload-nandhp-0.3-r1.ebuild 885 BLAKE2B 43155d69232bcd783bc747b08c5cd881087cb1f3330c269e07cda5d909bebfc3d117bb80d500813025b3a8a697c28796dbc430dd26d6a49682c05cd3d2c2cc89 SHA512 b2d55fa25a29cf7bff5bcbe92649c612e4924ebce76a84532bea3346653fbd6555486c26381294ea8bc80697704dad0ce86ad19ebe0824f73b794153d0c628b2
-EBUILD multiload-nandhp-0.3.ebuild 869 BLAKE2B e70b7eae0545efc1faeeb6975485973aad934f848cbebb353de5f0c593f8a54af26bfb0ceb17efbf2a0b2092de67fd8cee2c0c753065ee2119bc669092433113 SHA512 04fe4d6028f63b6dc9176c7d9a90e83e3e05548c250b9ae8c8dead6997bb343df2e1a00ca91ae6b77f93d951f2d65b211c89cde6cf87bf392179fde3b73c7694
 MISC metadata.xml 339 BLAKE2B 98c21e065d9e6275f151981d14e5c48c75137dd2d6be1c5510224ff8136ea69fa5c93db58dcd7881d963fe240493b69e9b16a8596cf9af5b9dab5f50349f2054 SHA512 e74cdaaaa8772d4fe0a87ac55d52fc23dac307c2a8378e92350ac6a5f39b25a76f66eabf0e1db850e3f7ed703c6218377a792259f0a4267c54bd96b4104799bd
diff --git a/xfce-extra/multiload-nandhp/multiload-nandhp-0.3.ebuild b/xfce-extra/multiload-nandhp/multiload-nandhp-0.3.ebuild
deleted file mode 100644
index 17e3eba379f4..000000000000
--- a/xfce-extra/multiload-nandhp/multiload-nandhp-0.3.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils
-
-MY_PV=version-${PV/./-}
-
-DESCRIPTION="A port of the GNOME multiload applet for the Xfce panel"
-HOMEPAGE="https://github.com/nandhp/multiload-nandhp"
-SRC_URI="https://github.com/nandhp/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 x86"
-IUSE=""
-
-RDEPEND=">=x11-libs/gtk+-2.14:2=
-	x11-libs/cairo:=
-	>=gnome-base/libgtop-2.11.92:=
-	>=xfce-base/libxfce4ui-4.10:=
-	>=xfce-base/libxfce4util-4.10:=
-	>=xfce-base/xfce4-panel-4.10:="
-
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-DOCS="AUTHORS README.md"
-
-S=${WORKDIR}/${PN}-${MY_PV}
-
-src_prepare() {
-	eautoreconf
-}
-
-src_configure() {
-	econf --with-xfce4
-}
-
-src_install() {
-	default
-	prune_libtool_files --all
-}
diff --git a/xfce-extra/thunar-archive-plugin/Manifest b/xfce-extra/thunar-archive-plugin/Manifest
index 60b17270859f..c45091686944 100644
--- a/xfce-extra/thunar-archive-plugin/Manifest
+++ b/xfce-extra/thunar-archive-plugin/Manifest
@@ -3,7 +3,6 @@ AUX 0.3.1-add-support-symlinks.patch 684 BLAKE2B c35eb501afdf20bea96f45ce766763a
 AUX 0.3.1-fix-kde-ark.patch 609 BLAKE2B db06f3ac161da82e534b60570a0890f1b2df96ea061430b6ee04d37e22daff8ac4a4bbf3a0143ead2c9643fc6d560f77ac486e2c1d21612069e6696cdd7f1d0a SHA512 43433f9022b1659eccca84d48555f5be997772873aaaeb2fb46fb89904d0d993aff7bd91d850d437ac33c85405ea8e09a05e035547e5d8bce6b9fbb27dea9702
 DIST thunar-archive-plugin-0.3.1.tar.bz2 329005 BLAKE2B f1cc88acb86565c001734ae2ead50f79cd4e922922292446b3775a7ef5cce250787b202ef6633d453b40bf37f1841d6e1b9ee34350e784587612ea0d4030e6d4 SHA512 51157c2680b3fcc6b541d35fc2943a350a0354d7d5bbb5fbe8a9dcbbeaf4bf4f5fe62521b8e9a73254f70bbefc440357deade8181313da96270c280eb0464e68
 DIST thunar-archive-plugin-0.4.0.tar.bz2 350011 BLAKE2B aebe828396e75701b788dd22266ed154b3a8296b8f6a912fbd99d4ebda1db2ed2a5cbf957a381523194270b5f1ea8ae6af24ca61e35b3953de54b0477bffd6cf SHA512 6590d8765ac6eab14fae7758e4c47c66b52e79e2e4b01a86d25bd35492590925ca35e4bbade8a9d8f0c73386eaeda6863e2a7a39a2df2904404f7e2bfdd91a44
-EBUILD thunar-archive-plugin-0.3.1-r2.ebuild 903 BLAKE2B 348e1e1af8e5d475d29e47018e325f8cb7116842686b66980aebd6c6e0138ea1b05ab4ff70c869cd82a9ae4eaede8c67f0d9c84565aa1a087e09e7b314ed0d52 SHA512 05b9071d114121a93e5eb86788bdcb4e6c14d991e3759d4128ded86804667d8282a203d9d36b2757dae49c0577bf803e17f8a71c727976320353f85932196af1
 EBUILD thunar-archive-plugin-0.3.1-r3.ebuild 1174 BLAKE2B 77b453bf7cf1208f1e403ba2776302091a3d6465a047935796ebbefba6b2934fe1c95cbe321a254e1ef24b997df121a4ba5b81bf6be0412723e1bec4fcbb3000 SHA512 664dfc44e51e6d8b3bf26e703e318090ec14cac5881a4f4f0cd0250f0cf37f7d301e853e06c4f3916b5ced54890f8601974bf39ab25fb6dd1b41c2b17895447f
 EBUILD thunar-archive-plugin-0.4.0.ebuild 858 BLAKE2B 1d42764967223557d411f9b958a9b1581b93fc935e79eae1585bc2728ad96cb3ff1f1d8b1c8a459b44b7c9198c5614d543089822eb1ff13c219f59f8b46e89b3 SHA512 bb7a8a18f967f8a6c83c04046a5899e980e8dd55375e725e4f3e353362ffe217e72d1dfe384d446fe1fb347f6ec5a2de3ce5c5c4edf2287fd8f19076be503d55
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/thunar-archive-plugin/thunar-archive-plugin-0.3.1-r2.ebuild b/xfce-extra/thunar-archive-plugin/thunar-archive-plugin-0.3.1-r2.ebuild
deleted file mode 100644
index 0112cf8abfee..000000000000
--- a/xfce-extra/thunar-archive-plugin/thunar-archive-plugin-0.3.1-r2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-EAUTORECONF="yes"
-inherit xfconf
-
-DESCRIPTION="Archive plug-in for the Thunar filemanager"
-HOMEPAGE="https://goodies.xfce.org/projects/thunar-plugins/thunar-archive-plugin"
-SRC_URI="mirror://xfce/src/thunar-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-RDEPEND=">=xfce-base/libxfce4util-4.8:=
-	>=xfce-base/exo-0.6:=
-	>=xfce-base/thunar-1.2:="
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-pkg_setup() {
-	PATCHES=(
-		"${FILESDIR}"/0.3.1-add-engrampa-support.patch
-		"${FILESDIR}"/0.3.1-fix-kde-ark.patch
-		"${FILESDIR}"/0.3.1-add-support-symlinks.patch
-		)
-	XFCONF=( $(xfconf_use_debug) )
-	DOCS=( AUTHORS ChangeLog NEWS README THANKS )
-}
diff --git a/xfce-extra/thunar-media-tags-plugin/Manifest b/xfce-extra/thunar-media-tags-plugin/Manifest
index 7fe4bf0d060f..b65828efd6aa 100644
--- a/xfce-extra/thunar-media-tags-plugin/Manifest
+++ b/xfce-extra/thunar-media-tags-plugin/Manifest
@@ -1,7 +1,5 @@
-AUX thunar-media-tags-plugin-0.2.0-linkorder.patch 462 BLAKE2B 5071e2a0dbccb8353c13701e9db78685b41dcb45f507f48be7de3c0fe3b8064afb67da1238d62dd3f68db9437d9624be71336c61632bebf785fe47a4d8f75709 SHA512 2417e6f53edf8b869481610079c5b34cc33b2422a6d580184811a785d50109dd692a94a138b5c7aac92b49fc259b2c76c92f5f02ed8240c4669b1adbad204eab
 DIST thunar-media-tags-plugin-0.2.1.tar.bz2 324833 BLAKE2B 1f985fadaa58ebcf516c6f57f429d3a0c96161572a9829b7240e1f5550ad2cc5ebb121cb985f1680440ab4fc8be68be8f5ee3c5557d8f95aa0c23b3572514ec1 SHA512 008ba9cf5405fba2582d072c48c915ad0afe2eb6bd193a710caf5f99247285362747265fa93fe28d9cedd75285a8f9593baf675310b5dbada948aefe359e951d
 DIST thunar-media-tags-plugin-0.3.0.tar.bz2 378993 BLAKE2B 9ddb44862808eab8e836cd85ef9afd6b04a96d1b1b98a80bddba85c1544e91a563b3d40ede04035de50b032c01623d574d818cf19ba60483432a78a61e772c21 SHA512 f7c13acb1d9936676e22fdb2d6c1def5ad651ab104110559817fc51dfad845823de4ba724054a7e99a4af980e62e05db750097c32018effa29cb5f56676d9eaa
 EBUILD thunar-media-tags-plugin-0.2.1-r1.ebuild 692 BLAKE2B 8ab9333a494e91d0193c2c795a8f5df833c724ac21a481b5d676ebac9cf0c1081ca5c1461443da44eb85764a4a32c2af2364760382ffdfcb8bbca663a0ccf9f9 SHA512 b841e48a6ff0e80c3182752b05f4a0d6062347f6e4ca6947e145a28ecc2d8f9de24a3b7ad491de70efd86a6c3bb14a779ea63ce31a8bf1db0a2f62e3b1882717
-EBUILD thunar-media-tags-plugin-0.2.1.ebuild 769 BLAKE2B 0386916fcab9dfdf7eb63954ae623803db7471dd11f717b6edac4bd437d19a2ebb6c5c5243ac5657a95927401cce74f2752783143c03e9f04002ecf79a065c05 SHA512 b4d9a49cbc31385e77480807e8c05e25ef127ef8c98184730812b7dec205a9cf2100cff4c41732d15a64eeb101f14bb942a5397b5b18c53c65807076b29c23ff
 EBUILD thunar-media-tags-plugin-0.3.0.ebuild 654 BLAKE2B 1ab7984de05d51f6b79d95955e0280cc95f7bc4a6c4fa142458367e3ac200d5025e50ce9e4e26af779586fe30bf072838697c7755fdc441466684be083971b96 SHA512 d3b8ca9b6d023e619e83945f8d1570b9289fa7f27669b7974763229605f1429081d1fda87ea27a5c55cfd8bf825cef0e0bb5a9020d17306ee1fa5aee5db8b568
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/thunar-media-tags-plugin/files/thunar-media-tags-plugin-0.2.0-linkorder.patch b/xfce-extra/thunar-media-tags-plugin/files/thunar-media-tags-plugin-0.2.0-linkorder.patch
deleted file mode 100644
index 22048fa1567a..000000000000
--- a/xfce-extra/thunar-media-tags-plugin/files/thunar-media-tags-plugin-0.2.0-linkorder.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-http://bugzilla.xfce.org/show_bug.cgi?id=10080
-
---- thunar-plugin/Makefile.am
-+++ thunar-plugin/Makefile.am
-@@ -32,10 +32,12 @@
- 	-avoid-version							\
- 	-export-dynamic							\
- 	-module								\
-+	$(PLATFORM_LDFLAGS)
-+
-+thunar_media_tags_plugin_la_LIBADD =					\
- 	$(EXO_LIBS)							\
- 	$(THUNARX_LIBS)							\
- 	$(TAGLIB_LIBS)							\
--	$(TAGLIBC_LIBS)							\
--	$(PLATFORM_LDFLAGS)
-+	$(TAGLIBC_LIBS)
- 
- # vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
diff --git a/xfce-extra/thunar-media-tags-plugin/thunar-media-tags-plugin-0.2.1.ebuild b/xfce-extra/thunar-media-tags-plugin/thunar-media-tags-plugin-0.2.1.ebuild
deleted file mode 100644
index 41dcb7d30e45..000000000000
--- a/xfce-extra/thunar-media-tags-plugin/thunar-media-tags-plugin-0.2.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-EAUTORECONF=yes
-inherit xfconf
-
-DESCRIPTION="Adds special features for media files to the Thunar File Manager"
-HOMEPAGE="https://goodies.xfce.org/projects/thunar-plugins/thunar-media-tags-plugin"
-SRC_URI="mirror://xfce/src/thunar-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86 ~x86-fbsd"
-IUSE="debug"
-
-RDEPEND=">=media-libs/taglib-1.6
-	>=x11-libs/gtk+-2.12:2
-	>=xfce-base/exo-0.6
-	>=xfce-base/thunar-1.2"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig"
-
-pkg_setup() {
-	PATCHES=( "${FILESDIR}"/${PN}-0.2.0-linkorder.patch )
-
-	XFCONF=(
-		$(xfconf_use_debug)
-		)
-
-	DOCS=( AUTHORS ChangeLog NEWS README TODO )
-}
diff --git a/xfce-extra/thunar-vcs-plugin/Manifest b/xfce-extra/thunar-vcs-plugin/Manifest
index 48b764907598..f298e9a593cd 100644
--- a/xfce-extra/thunar-vcs-plugin/Manifest
+++ b/xfce-extra/thunar-vcs-plugin/Manifest
@@ -1,10 +1,3 @@
-DIST thunar-vcs-plugin-0.1.4-el.po.bz2 5478 BLAKE2B 13e257ac50e65af2fd2600a7aa94471db1265434474744f1fe6cc70e985f3ac0cd22b524f2aab2803e5a566162d39b869f99a36568d933f5196d7b6cd4318fe6 SHA512 f31cabc20e421c79b2c00069b00ae23f2d8c22bc9b42e8f6673475d4eac31c6ece40eb471eca565b2770108485841a4581ea5c11c004c45a3875ead5c46242c1
-DIST thunar-vcs-plugin-0.1.4-eu.po.bz2 4986 BLAKE2B e9905485e65c43658a19b5f49bb82d258032cc9c2c9521de74b42093757bf8f600379a1f63b74b87566b8866aea7258be342d2e742422ed56248ff49a63d3081 SHA512 b402795d57c2352b1717fbb6432cbc00c0447a1f583793b84c63e5edc66d492ff601b4c5b76e7d1e758bd7e658c6d6fabb12332e0042b9dc288e1135672e0483
-DIST thunar-vcs-plugin-0.1.4-ru.po.bz2 4323 BLAKE2B 4c83914293266e2791116acabe517af837168574970d7336be6626dcefac9ec0490988486b679cd2be6a19afd8fc0b2b3e55bf21299aa15a442994d5add7e615 SHA512 7cd408183d36ade04ee2ca16b910b02a749a20ec15e5afb33d25d8a99acf6afd07c627167ece6a0d7ae32dbb2c24f70f2b8afbd3889d507b3320def4a8f61660
-DIST thunar-vcs-plugin-0.1.4-ug.po.bz2 4628 BLAKE2B 5582309b760c89c82865e90530cfc4e2f9067455ab55efe00c811f31eed401cda067eacc61212fdf1df760f785a841720474d8128223bbf8ef41020f9558332b SHA512 563c6f235eb6e5a049846052e5bfad1ad6a40c598b013e83ad12d50c4a070bb3faec5362ec02c56bfac14d752918b65b7089bef729a1004245539c22d10255db
-DIST thunar-vcs-plugin-0.1.4-uk.po.bz2 5469 BLAKE2B 9a950d41834a1837e7b958bc6d2db05f9a3eb1fa3140b6a103a7aca481b362869e1ba1a09ca9eee7add6eef2e2709c8fc8f15a9f48d7da0da2bc10c650eba82e SHA512 e1b0b6ab444fb46d626c889b9b2509e21b00aa380c40da5b871a4e6c12fd34609bd0a74b2f7b5894601ad5fe4727fdb177ae7af0f0ef457f23021287d6dca8ff
-DIST thunar-vcs-plugin-0.1.4.tar.bz2 435835 BLAKE2B 9839c991366dd8b81a1f4d635549221ddec4a25dae75c39472b9b801e826c2848a72ea5d2bb352dc0ab9c48b35c5005c44619ec7e149c93dff025bb9041614c3 SHA512 037ca986ab9030146fc409d78d235a157b956b202449ef8e68de77dfce29ba2dd9a2dabc793215dd9ce455f97d8c5400ba51c8254b3c07b3e0d87572df672151
 DIST thunar-vcs-plugin-0.1.5.tar.bz2 478866 BLAKE2B 9bf2b060d88a4379f02c0e8af1829f4cf621e2590f7885f59d9af56d825c1d9d218c56c3b97420087b46eece0eb6c15146f6630569928c8523fa34bcfdbbcc22 SHA512 0315613fe97d5cb2fa9589af49bdb5074f20c83b52d5f7d4a151091839679b4617e8e0b20df85914b7bcef2464173dc1bd2bc182312364c7d5a94171aba28983
-EBUILD thunar-vcs-plugin-0.1.4.ebuild 1423 BLAKE2B 8b4d365731dcbf35c0e3d3c5d3f30fca767dc0911951081d045a899474ee7b4475e53d3cbb32b30ccde31be08a19655c82731a19a0986f0196a6735b77bf8813 SHA512 9cee797c37c06b86d1cad88749a18b7585857301728af439ba9cab5c9ef0b32c3772f09dd3e078023913a504c3288a502d7f96f8e9333ee671ff25f92429479e
 EBUILD thunar-vcs-plugin-0.1.5-r1.ebuild 1037 BLAKE2B ca69c54c458516c9aa483d2a4b025be9263576cea5ce5196e4f5675b0c420275bcca3347c7b89e1933e8ada1d4c6d3226f49b63bbe45bebc289d6f9ea4eedf8b SHA512 da52ce247112351ee3799c56cc1d6832104a9b3c29445b7baf3dae7733ea11ec1efb9b9fdbd9d5f660764569822303027d0801bab473e1c4694ec0fbeae3e07c
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/thunar-vcs-plugin/thunar-vcs-plugin-0.1.4.ebuild b/xfce-extra/thunar-vcs-plugin/thunar-vcs-plugin-0.1.4.ebuild
deleted file mode 100644
index d6734f00aad1..000000000000
--- a/xfce-extra/thunar-vcs-plugin/thunar-vcs-plugin-0.1.4.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit xfconf
-
-DESCRIPTION="adds Subversion and GIT actions to the context menu of thunar"
-HOMEPAGE="https://goodies.xfce.org/projects/thunar-plugins/thunar-vcs-plugin"
-SRC_URI="mirror://xfce/src/thunar-plugins/${PN}/${PV%.*}/${P}.tar.bz2
-	https://dev.gentoo.org/~ssuominen/${P}-el.po.bz2
-	https://dev.gentoo.org/~ssuominen/${P}-eu.po.bz2
-	mirror://gentoo/${P}-ru.po.bz2
-	https://dev.gentoo.org/~ssuominen/${P}-ug.po.bz2
-	https://dev.gentoo.org/~ssuominen/${P}-uk.po.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug +git +subversion"
-
-RDEPEND=">=dev-libs/glib-2.18
-	>=x11-libs/gtk+-2.14:2
-	>=xfce-base/exo-0.6
-	>=xfce-base/libxfce4util-4.8
-	>=xfce-base/thunar-1.2
-	git? ( dev-vcs/git )
-	subversion? (
-		>=dev-libs/apr-0.9.7
-		>=dev-vcs/subversion-1.5
-		)"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig"
-
-pkg_setup() {
-	XFCONF=(
-		$(use_enable subversion)
-		$(use_enable git)
-		$(xfconf_use_debug)
-		)
-
-	DOCS=( AUTHORS ChangeLog NEWS README )
-}
-
-src_prepare() {
-	# This won't be required for next release anymore, thanks to the following commit:
-	# https://git.xfce.org/thunar-plugins/thunar-vcs-plugin/commit/?id=e87584f7b87627a322f6e41025e5e52d65ebb4d8
-	local lang
-	for lang in el eu ru ug uk; do
-		mv "${WORKDIR}"/${P}-${lang}.po po/${lang}.po || die
-	done
-	xfconf_src_prepare
-}
diff --git a/xfce-extra/thunar-volman/Manifest b/xfce-extra/thunar-volman/Manifest
index 64d0ae20c739..9d9653cf1aa1 100644
--- a/xfce-extra/thunar-volman/Manifest
+++ b/xfce-extra/thunar-volman/Manifest
@@ -1,6 +1,5 @@
 DIST thunar-volman-0.8.1.tar.bz2 474769 BLAKE2B 2bf6378b35f0cd868cc7363909cc5d54a997a5a69758a27d45640968e3ef8d7cb3f5af185d1a8f83e8593610490a8566742070808ab85810cd3411856aa0030a SHA512 a82c019b028277d97e7903dcbeaf4704cb7fc1e95b0ea18c6290a7a8581355691990cbdb5fa0c234ed5dd51c1ba7f1bca9a495e60f9f8597a993845481113bb6
 DIST thunar-volman-0.9.0.tar.bz2 474533 BLAKE2B fff6292c7e613da47c32d92db9ffe0abd32ab2ba5c956c630208d2b3235d4f7a5e3aab5ddef291c0d185264afe6493566f4e5e0d73c60e093dd52567c5d5ff1e SHA512 d753e2aeded921e5652e6ace164845997dc3cdfbfd92561e2af822bffdf910a06850658a9f662198e4f7c485a3dc1226f97b573d28fb66e5ba490aa08f56a8f5
 EBUILD thunar-volman-0.8.1-r1.ebuild 1061 BLAKE2B fd6415b3d5f4cf421e2c451155a7b5a05bda35c0ab945ae21d04bd7e2cf30df0464623ca2c1ba4ab9977152938ebd6f5fd4f077da318d74976821197bac4ffd7 SHA512 cff715ea14f0c8dbb740f558fd7d91e8ac1b85191f2d76dbc78552eede23280d18513ebc7d30b39aa975e1a92745d52ae7132ff952ff0066107c45240e137b8c
-EBUILD thunar-volman-0.8.1.ebuild 960 BLAKE2B 1459a84b00c80e467c5d2855ba3ff6e3ea3257aaaa8cbe3e3d829e9317c248efc781e487e99247c2f7331f3f4a6d1b4b6231cfa2a9f97565e529465d76687eaa SHA512 5c3665fcfac947e6943ffc4bc668f7befd8bdcfa5496a4830b17cdf88da0dc9b29d6c4e23ed35b7cc41d3fe8303d45f8a4e68b31cbd7248cd407790a57f81671
 EBUILD thunar-volman-0.9.0.ebuild 1033 BLAKE2B 5d5137fa7eb5c3e9b90cbf0e363f081ce19d650a8ca7715f138795438a94b955e4f434b1bb6855484fcef442040cf3d1bd1ae5856597db98f4913564391503f5 SHA512 5bb418947cb406f65fe1469742d5dc33080b52a61ade1bda56b263be6024512e8a4e27956621c8673c734084a7ec2ae44ca9cddd3fe342f01a1e765b2a5f8651
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/thunar-volman/thunar-volman-0.8.1.ebuild b/xfce-extra/thunar-volman/thunar-volman-0.8.1.ebuild
deleted file mode 100644
index 5478a8bd4867..000000000000
--- a/xfce-extra/thunar-volman/thunar-volman-0.8.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit xfconf
-
-DESCRIPTION="Daemon that enforces volume-related policies"
-HOMEPAGE="https://goodies.xfce.org/projects/thunar-plugins/thunar-volman"
-SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ia64 ppc ppc64 sparc x86"
-IUSE="debug libnotify"
-
-COMMON_DEPEND=">=dev-libs/glib-2.30
-	virtual/libgudev:=
-	>=x11-libs/gtk+-2.24:2
-	>=xfce-base/exo-0.10
-	>=xfce-base/libxfce4ui-4.10
-	>=xfce-base/libxfce4util-4.10
-	>=xfce-base/xfconf-4.10
-	libnotify? ( >=x11-libs/libnotify-0.7 )"
-RDEPEND="${COMMON_DEPEND}
-	virtual/udev
-	>=xfce-base/thunar-1.6[udisks]"
-DEPEND="${COMMON_DEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-pkg_setup() {
-	XFCONF=(
-		$(use_enable libnotify notifications)
-		$(xfconf_use_debug)
-		)
-
-	DOCS=( AUTHORS ChangeLog NEWS README THANKS )
-}
diff --git a/xfce-extra/tumbler/Manifest b/xfce-extra/tumbler/Manifest
index 3bee236ad67e..b98b7be9e525 100644
--- a/xfce-extra/tumbler/Manifest
+++ b/xfce-extra/tumbler/Manifest
@@ -1,7 +1,3 @@
-DIST tumbler-0.1.31.tar.bz2 550650 BLAKE2B 8ce4f9cd2c6b91c2185167c1948a4f5377e1be98cc7b862d3abb120cdb88d5082b4dad630f4ffec376948f39214540620fb7b8266044e5524f7a184a4c8bd244 SHA512 8c5fc914be28b899155a8c3b3fec21c5e74c26569ae1bf6a18ae87c930927828570027d77d3ec0435b8db9449a9ea933da9ae5e00f7fdf13a335c0a25bb14d04
-DIST tumbler-0.1.32.tar.bz2 535535 BLAKE2B d415af09da1acb223f7772c64c9273844377c3b992dc032aa2617442d0a8770cb3e3079112374ececea1c7a672b6069f8b9ac919ef6601145b87cad67ad1f02a SHA512 c320840baf1bd5f16d037659c3ab9a044c2604c7844824fccb257771078a0e000b3435d8ffe94e63147e1c4b6ad1eaafb4548d32fce0d68039cac28bddf11d80
 DIST tumbler-0.2.0.tar.bz2 571300 BLAKE2B b4b923716897773febaff21c7d13fb8e4abfb36f9a0a02e4b777516ecd6170552d757057a228832924f4d8cb9f61380109ef52d0efaddcf69069ca5c0df4ae6c SHA512 54f83f904b32fcde5960f3343f8f4477bd30cd96a784aec5a3cb70aa2c9f924e833b2c0b429d608a36c75104d2689975d688358893127aed501f3cd8f24c280b
-EBUILD tumbler-0.1.31-r1.ebuild 1571 BLAKE2B faaa9e664761aa51c4b3244d8abcbfa34cd8594ccc976d0081bd10f52b39428f54fafe945f81b3c51a1d9ece1a17aed61468aa394b565029a5f32bf8bc2dc930 SHA512 aa9d1964a9d9833096a410cd6e4c048f74cecb53684635da7c742f816bec8f0c0e4655e7ffa505718cbf0f532e861206aef0ce7f14573dbeeba0ad2cbf0526b1
-EBUILD tumbler-0.1.32.ebuild 1552 BLAKE2B 423e01ddc1b73bc187463ff069ebcc5279f23f208683595f268fae7fa620cd53379fcac399aaf455ba749ee60b0aece147e3262c08d6737b6cf414a5b286cead SHA512 48696218fd7ff058eaa3ee89ad28ba7b24c62e16063791c66194eb86be7997bad663e033319674af95ebc7bde557de8e927ed8ad6b6fcfb531f1a73f5fca768c
 EBUILD tumbler-0.2.0.ebuild 1517 BLAKE2B 48bbda328f478a2a5a3919f5eb9a33ff6fdb765f64fe776f242d9df4a793c6fa7d77660aa80be2965f385844c59df202d199e4920c14ff6affe06425fff6ab79 SHA512 fe2fd3bb5a63fa2fe1794b32d53058aa1c1d67832bf14916d198d2acbf79eabca590ca24936c2896328855e2418f594169979c0773ace03f527913d2a0600f48
 MISC metadata.xml 368 BLAKE2B c50d2774a8ecb50f7eaf2436c89508d6b7b06d22b02be9e33329a152032ba500bc54e132280b3fef166ad824be432a75514a859c2da208bf2a19b69288809b79 SHA512 5adf546b54a71ff52292602144a8d459db2984115a88c893725d2101d2ef851ac855cee078dbf492f6a3b0c01980596acb1c2afca09fd68cbd2b1940ea06bbd3
diff --git a/xfce-extra/tumbler/tumbler-0.1.31-r1.ebuild b/xfce-extra/tumbler/tumbler-0.1.31-r1.ebuild
deleted file mode 100644
index 6f0f7a590743..000000000000
--- a/xfce-extra/tumbler/tumbler-0.1.31-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit xfconf
-
-DESCRIPTION="A thumbnail service for the filemanager of Xfce desktop environment"
-HOMEPAGE="https://docs.xfce.org/xfce/thunar/start"
-SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="curl debug ffmpeg gstreamer jpeg odf pdf raw"
-
-COMMON_DEPEND=">=dev-libs/dbus-glib-0.100:=
-	>=dev-libs/glib-2.24:2=
-	media-libs/freetype:2=
-	media-libs/libpng:0=
-	>=sys-apps/dbus-1.6:=
-	>=x11-libs/gdk-pixbuf-2.14:2=
-	curl? ( >=net-misc/curl-7.25:= )
-	ffmpeg? ( >=media-video/ffmpegthumbnailer-2.0.8:= )
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-		)
-	jpeg? ( virtual/jpeg:0= )
-	odf? ( >=gnome-extra/libgsf-1.14.20:= )
-	pdf? ( >=app-text/poppler-0.12.4[cairo] )
-	raw? ( >=media-libs/libopenraw-0.0.8:=[gtk] )"
-RDEPEND="${COMMON_DEPEND}
-	>=xfce-base/thunar-1.4
-	gstreamer? ( media-plugins/gst-plugins-meta:1.0 )"
-DEPEND="${COMMON_DEPEND}
-	dev-util/gtk-doc-am
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-pkg_setup() {
-	XFCONF=(
-		$(use_enable curl cover-thumbnailer)
-		$(use_enable jpeg jpeg-thumbnailer)
-		$(use_enable ffmpeg ffmpeg-thumbnailer)
-		$(use_enable gstreamer gstreamer-thumbnailer)
-		$(use_enable odf odf-thumbnailer)
-		$(use_enable pdf poppler-thumbnailer)
-		$(use_enable raw raw-thumbnailer)
-		$(xfconf_use_debug)
-		)
-
-	DOCS=( AUTHORS ChangeLog NEWS README TODO )
-}
diff --git a/xfce-extra/tumbler/tumbler-0.1.32.ebuild b/xfce-extra/tumbler/tumbler-0.1.32.ebuild
deleted file mode 100644
index 6e1628bb09b7..000000000000
--- a/xfce-extra/tumbler/tumbler-0.1.32.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A thumbnail service for Thunar"
-HOMEPAGE="https://docs.xfce.org/xfce/thunar/start"
-SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="curl ffmpeg gstreamer jpeg odf pdf raw"
-
-COMMON_DEPEND=">=dev-libs/dbus-glib-0.100:=
-	>=dev-libs/glib-2.24:2=
-	media-libs/freetype:2=
-	media-libs/libpng:0=
-	>=sys-apps/dbus-1.6:=
-	>=x11-libs/gdk-pixbuf-2.14:2=
-	curl? ( >=net-misc/curl-7.25:= )
-	ffmpeg? ( >=media-video/ffmpegthumbnailer-2.0.8:= )
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-		)
-	jpeg? ( virtual/jpeg:0= )
-	odf? ( >=gnome-extra/libgsf-1.14.20:= )
-	pdf? ( >=app-text/poppler-0.12.4[cairo] )
-	raw? ( >=media-libs/libopenraw-0.0.8:=[gtk] )"
-RDEPEND="${COMMON_DEPEND}
-	>=xfce-base/thunar-1.4
-	gstreamer? ( media-plugins/gst-plugins-meta:1.0 )"
-DEPEND="${COMMON_DEPEND}
-	dev-util/gtk-doc-am
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-src_configure() {
-	local myconf=(
-		$(use_enable curl cover-thumbnailer)
-		$(use_enable jpeg jpeg-thumbnailer)
-		$(use_enable ffmpeg ffmpeg-thumbnailer)
-		$(use_enable gstreamer gstreamer-thumbnailer)
-		$(use_enable odf odf-thumbnailer)
-		$(use_enable pdf poppler-thumbnailer)
-		$(use_enable raw raw-thumbnailer)
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/xfce-extra/xfce4-battery-plugin/Manifest b/xfce-extra/xfce4-battery-plugin/Manifest
index 8b4b049113d0..8d78c545bb43 100644
--- a/xfce-extra/xfce4-battery-plugin/Manifest
+++ b/xfce-extra/xfce4-battery-plugin/Manifest
@@ -1,5 +1,3 @@
-DIST xfce4-battery-plugin-1.0.5.tar.bz2 403505 BLAKE2B 454f36b814e3a2069d3caff4a2c96561a238852fd30b75f89a67acc5b8e6b5455bdade45469ba4ba8fcd853ef2e7c49e4e396e208c14f87689b7b526c7f56359 SHA512 f49f33178a771b952442f498cee2c722146c9982cb27453e6547a7c7838eaa0a22588a7d2a56f189f7e9e7b90ed7e5ac7a4e6cfee55dc5e43d32c5ef95b20062
 DIST xfce4-battery-plugin-1.1.0.tar.bz2 398621 BLAKE2B 461f32e07708c29f2157c8909ba48a43458c06c9622ec0835f4cf6abb0b1232bc35f23a7e945315eb2d49048b9c0023da3a27803cf95217374962531db986e97 SHA512 d3f5b6d3657abfba2c4c5cb3ab8ddc87f4862f24eb614cb91af48332b3082c3dce7f32eb2e3cb8a9d501ddb01c6259c4fbfbab8ed9c221633e47eb17c623cf09
-EBUILD xfce4-battery-plugin-1.0.5.ebuild 847 BLAKE2B ebeb8fc1cd0d7575176e22019278cea0d43111cdaf66d20dd2686bd01bb2404d93226b95bea6c39b1d92c9845cc523e51a44b2219bb93e512871850b2046ba62 SHA512 65db763eb759ed91cf74a96387c727b24db736347b64b3edf6a5abc2e82fdf989f26866ba4bb69ca3e719a275d5d8d9f81e79e97bbc7ae10e47d6d3b2357b7f2
 EBUILD xfce4-battery-plugin-1.1.0.ebuild 1100 BLAKE2B ba1469aead812b4c093561d5e60ee74526562df6abbedc1ba09820c408e7304d4de612451f015bc0585f3ad55a7174dd0ae24e452a6e08a8c1f793c1c2f7ae5a SHA512 b682650c3a8c7007ef908fbab46b2cf86d831542bdb203ce966763ca195ecb4044b5babab650ec85180222f407dcf5f20bc97f7f6a3162255de7f8907c08dc61
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-battery-plugin/xfce4-battery-plugin-1.0.5.ebuild b/xfce-extra/xfce4-battery-plugin/xfce4-battery-plugin-1.0.5.ebuild
deleted file mode 100644
index fede6f421951..000000000000
--- a/xfce-extra/xfce4-battery-plugin/xfce4-battery-plugin-1.0.5.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit linux-info xfconf
-
-DESCRIPTION="A battery monitor panel plugin for the Xfce desktop environment"
-HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-battery-plugin"
-SRC_URI="mirror://xfce/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~mips ~ppc x86"
-IUSE="debug kernel_linux"
-
-RDEPEND=">=dev-libs/glib-2.24
-	>=x11-libs/gtk+-2.20:2
-	>=xfce-base/libxfce4ui-4.8
-	>=xfce-base/libxfce4util-4.8
-	>=xfce-base/xfce4-panel-4.8"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig"
-
-pkg_setup() {
-	XFCONF=(
-		$(xfconf_use_debug)
-		)
-
-	DOCS=( AUTHORS ChangeLog NEWS README )
-
-	if use kernel_linux; then
-		CONFIG_CHECK="~ACPI_BATTERY"
-		linux-info_pkg_setup
-	fi
-}
diff --git a/xfce-extra/xfce4-clipman-plugin/Manifest b/xfce-extra/xfce4-clipman-plugin/Manifest
index 824e720dc0be..cbbe78ecb716 100644
--- a/xfce-extra/xfce4-clipman-plugin/Manifest
+++ b/xfce-extra/xfce4-clipman-plugin/Manifest
@@ -1,5 +1,3 @@
-DIST xfce4-clipman-plugin-1.2.6.tar.bz2 438346 BLAKE2B 4c1d780031e420f523dcb9472043614eaa48442b98d6d4daa342458f82a85f99670aa4e76259e89663f35af29a3f71964cd25daf449bc4204090b223b1b26ee5 SHA512 fc6b4cee1990ff13f4c0050ebf3e4b69fc0f7124fa2dd9b41933ce11449d322fad666b1af82bd610ce2add28d012a7dddc345be4afa1432bb330ecd6344a168e
 DIST xfce4-clipman-plugin-1.4.2.tar.bz2 485244 BLAKE2B 6e183b82db5c3325691d04afa110c4dd83b013a94ed9b3b1b1b7bbb4166bcb1176a6b4ed52fd0b3256b7f73816a0031ea6084f31344a9ac3187b7b5fd25f01ed SHA512 f12d9e3e37a26f9dade5b76e73ac3998030112b53e7ec7b756128f7f1ee28d19a1d7b8d4a26e0ccb69aaba2f0ab2f6c4cd5a435bd1cc7efd81c05b711480eba6
-EBUILD xfce4-clipman-plugin-1.2.6.ebuild 1023 BLAKE2B e07b8cab0ace9bec0fb690fe6ae4135ebad2ec743faf8b8513188cc46abf86e8aabfc4546cf25c63e09e5e2b5b922553c8ed14825e5d17e1b468bf89c256cc53 SHA512 7b68189d9046682f47e290d693a5fee2f1512677b6a940edb3c2ff9c814c8a3745e6b66258f13dde237d58b5c5ce90cf534d833bbb7fe0f513381751013d9dae
 EBUILD xfce4-clipman-plugin-1.4.2.ebuild 1128 BLAKE2B 301cfb34bd1044b2627f8e5d310e3be9684a6c18e9ea7549f1a1b1e2f0c14b39793c2d08020f48e780f851f358ed92b234662dc9d169807356bf9e4762e30e3e SHA512 8bb0cd93a5551478af69c7e299779f421c5ae15ee5ef673bef65dbcf4f9464c3d4a0418a739a97e51ee9e727500c0849fe658cc15d6ff307367a17b45eb749f6
 MISC metadata.xml 344 BLAKE2B 2e5b2202a94c14c0b873c18bdbb7f02250049dbf45f23b82d44b2cb9fce79e7519a3fbc5f324b3c34f700ecf2314d051551283a5941ce16ff113b28f28852c3f SHA512 13ca7f9858f2eae8eaa1a4a43e371ab5b29433e1ac99ebe33d9678b7c3133d8e1639e146a93b6b4b1039278814d413d29e575a1a2784bbce0fcb50525e106065
diff --git a/xfce-extra/xfce4-clipman-plugin/xfce4-clipman-plugin-1.2.6.ebuild b/xfce-extra/xfce4-clipman-plugin/xfce4-clipman-plugin-1.2.6.ebuild
deleted file mode 100644
index b7375bd5d4b7..000000000000
--- a/xfce-extra/xfce4-clipman-plugin/xfce4-clipman-plugin-1.2.6.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit xfconf
-
-DESCRIPTION="A clipboard manager plug-in for the Xfce panel"
-HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-clipman-plugin"
-SRC_URI="mirror://xfce/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug qrcode"
-
-RDEPEND=">=dev-libs/glib-2.18
-	dev-libs/libunique:1
-	>=x11-libs/gtk+-2.14:2
-	x11-libs/libXtst
-	>=xfce-base/exo-0.10
-	>=xfce-base/libxfce4ui-4.10
-	>=xfce-base/libxfce4util-4.10
-	>=xfce-base/xfce4-panel-4.10
-	>=xfce-base/xfconf-4.10
-	qrcode? ( >=media-gfx/qrencode-3.3.0 )"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig
-	x11-proto/xproto"
-
-pkg_setup() {
-	XFCONF=(
-		--docdir="${EPREFIX}"/usr/share/doc/${PF}
-		$(use_enable qrcode libqrencode)
-		$(xfconf_use_debug)
-		)
-
-	DOCS=( AUTHORS ChangeLog NEWS README )
-}
diff --git a/xfce-extra/xfce4-datetime-plugin/Manifest b/xfce-extra/xfce4-datetime-plugin/Manifest
index 8ead97e752e2..4207f6b12eb6 100644
--- a/xfce-extra/xfce4-datetime-plugin/Manifest
+++ b/xfce-extra/xfce4-datetime-plugin/Manifest
@@ -1,5 +1,3 @@
-DIST xfce4-datetime-plugin-0.6.2.tar.bz2 287129 BLAKE2B df867af09c9b85b6a2b25c24bae071baff4f599ce15ebae5fbf0ad19451c38761119a50f63d3cdc3b3092e13a7ca8d2d82ca6756a836a4b0edc8bd084e109553 SHA512 53d7b28c125bf74479d4788b2cb9462d3d5252bca9ab4c615fcd98e63b2dd4b30d2492214b447169e0f895449051f1f001323cb0435e41365fd5b992283c4e6d
 DIST xfce4-datetime-plugin-0.7.0.tar.bz2 283142 BLAKE2B 6b65ab036a0781492b09c277bc1a9531edf5f197a98e83aa748579e58c1c765d9c8eccf860a934dd37fd45b8626e516e6deae8383a909c2335ff6f81a9663809 SHA512 a6d12a5f30fd6f5d0cfa85e50ed261c09378ff9f74897c5b30aef491c0f81a1985c033a416c9e080c1b07551666e1c6d1b1a1d75b5fac72dd71417ec23a640f7
-EBUILD xfce4-datetime-plugin-0.6.2.ebuild 770 BLAKE2B da3843e1c8edc132173f142f262f41d4c59e83e2ce0e5090b61c81d4a248a616a8d26f65e3c92a31d26eb5e369de6b3139d4a036c368c537ac99826b7e5e5e85 SHA512 7d89d897d74a68ac203c8eca30bbc2c424c8452472b3b0c5cc4c95ad2dbc7ba77be0e0a0182a80654510e8abb5e538f2e48e9e10d48325d45fb6a018402bbb56
 EBUILD xfce4-datetime-plugin-0.7.0.ebuild 958 BLAKE2B 870d6dacffc02bcd6c0cab68c12b02ea0b7747ab98f70f8991093aa01f51a30c7719c8b86cd1edac60e1786857edd890db8bb1409a28a18599fe1f57012e46b0 SHA512 2745892abbe75ec29a9e7a4d728bc542276cc69e6e514778b6ee39fa57dcba34c701f18ac6da0740c048487951cd3302d86bb9746ce0074ed70cc17471b8fcae
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-datetime-plugin/xfce4-datetime-plugin-0.6.2.ebuild b/xfce-extra/xfce4-datetime-plugin/xfce4-datetime-plugin-0.6.2.ebuild
deleted file mode 100644
index 1839e6dbd28f..000000000000
--- a/xfce-extra/xfce4-datetime-plugin/xfce4-datetime-plugin-0.6.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit xfconf
-
-DESCRIPTION="A panel plug-in with date, time and embedded calender"
-HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-datetime-plugin"
-SRC_URI="mirror://xfce/src/panel-plugins/${PN}/0.6/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-RDEPEND=">=x11-libs/gtk+-2.24:2
-	>=xfce-base/libxfce4ui-4.10
-	>=xfce-base/libxfce4util-4.10
-	>=xfce-base/xfce4-panel-4.10"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-pkg_setup() {
-	XFCONF=(
-		$(xfconf_use_debug)
-		)
-
-	DOCS=( AUTHORS ChangeLog NEWS THANKS )
-}
diff --git a/xfce-extra/xfce4-dict/Manifest b/xfce-extra/xfce4-dict/Manifest
index 150864f449fb..5c555d3613f0 100644
--- a/xfce-extra/xfce4-dict/Manifest
+++ b/xfce-extra/xfce4-dict/Manifest
@@ -1,5 +1,3 @@
-DIST xfce4-dict-0.7.2.tar.bz2 489918 BLAKE2B 2156e07375fc7c97ee99163a5aa74180235c1d94f11f2d100b28747cb399a71b67d11d4ceebbf2d61545c457f60e61f2984affe9777b97eacebbc663415e16fd SHA512 fc2f254fdf56cc1d736dda6ee1d8df590f7513841923533a2d220afc5a514395839e330f277e315135343df53eabd57693777062c80f08fd5827a00cd90fe090
 DIST xfce4-dict-0.8.0.tar.bz2 483618 BLAKE2B 8365fe96710b6350be350fff0479d71fa2d2c85403e4bbb3e759cdfca9e4ed22ccd5ffcffa71f6ae6ca43e79cbd9c6d25bd675603ffd523fc7782d5040208673 SHA512 96e59b21b91352970e33aea84fe67fa9bce5f1fab47d794a129ec68285bd03c5e26a02b03519b1834d08a15c2cb54fe3d91c64799a8df283b89f304800024cb4
-EBUILD xfce4-dict-0.7.2.ebuild 822 BLAKE2B 82f56d2d8289e09371e39709feed175b30ea3a6a2d06639c20e403b6e8b4c87d4994f9ceec84bb8d95a6af67793dc9e4d98b7a50d8d0f5e0fa0986e77203fba4 SHA512 0da73513574620ba413fc06757eab6f9a700a11527389678e2ef01cd3239122897a08e5894296b0aa8b1c38b035744b74cf88135e9b31b638b87dc9c1968bbb3
 EBUILD xfce4-dict-0.8.0.ebuild 1002 BLAKE2B 12508cf2d4bd5b098b3c8957923960bfe0083f6197561131c448b41d33a369d56c1ac318bdbf80975275e4952c801c2beb5f59f96180125d7996fa48d9eb3684 SHA512 c43b45af375be81321a11b8a67e2ae7bdc8493a0aa01a66c1c5d98865bfd011aee19e089976056539fcff7376e3f76aaedde85ba5f289fdc8d852106c4724a94
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-dict/xfce4-dict-0.7.2.ebuild b/xfce-extra/xfce4-dict/xfce4-dict-0.7.2.ebuild
deleted file mode 100644
index 9d19a6aabdeb..000000000000
--- a/xfce-extra/xfce4-dict/xfce4-dict-0.7.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-EAUTORECONF=yes
-inherit multilib xfconf
-
-DESCRIPTION="A dict.org querying application and panel plug-in for the Xfce desktop"
-HOMEPAGE="https://goodies.xfce.org/projects/applications/xfce4-dict"
-SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2.24:=
-	>=x11-libs/gtk+-2.20:2=
-	>=xfce-base/libxfce4util-4.10:=
-	>=xfce-base/libxfce4ui-4.10:=
-	>=xfce-base/xfce4-panel-4.10:="
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig"
-
-pkg_setup() {
-	XFCONF=(
-		--libexecdir="${EPREFIX}"/usr/$(get_libdir)
-		)
-
-	DOCS=( AUTHORS ChangeLog README )
-}
diff --git a/xfce-extra/xfce4-diskperf-plugin/Manifest b/xfce-extra/xfce4-diskperf-plugin/Manifest
index 301d23af489f..a0045ed46189 100644
--- a/xfce-extra/xfce4-diskperf-plugin/Manifest
+++ b/xfce-extra/xfce4-diskperf-plugin/Manifest
@@ -1,5 +1,3 @@
-DIST xfce4-diskperf-plugin-2.5.5.tar.bz2 321446 BLAKE2B d4713c030e3e350551c4bf7ada701ee6201ad83266b3f34bd3c2dd4d44b5dddc96e373bcda5d587f9877237bd2e6dd6bb63db39e18480cc7b0adc82e681bf6ca SHA512 ab0299246f228de6ae8597ccd14980111c28a774e6a41fcaa23cd50f978623fb3f4a20b61c19d0644e2c8062ca9037bf365cdec40f3174aa6d1a88a63a356fec
 DIST xfce4-diskperf-plugin-2.6.1.tar.bz2 338723 BLAKE2B 4bf0fa9c741e3efe276c7b00f8997ee49611809f7a19fa8bbf955cff2218c2654924f1b5a324f9d659adc02d728e451e7565c5ce457ef4a99fababe89d7a687e SHA512 ba01ec30e31db0c936b2b18df7c68883f89c6c4d5b82392759c25ef41fa89de37e2e635abd169745a9790d81af5b327768eb62ec3cc369f85e2da0bedc4c7cea
-EBUILD xfce4-diskperf-plugin-2.5.5.ebuild 722 BLAKE2B 132f8d81958ce1c1a35a7567fc1175e4364c6204a9ccc457dce7cbe2ceeb707a5f018f9c24937e29808b103127bdf79a02139b08b5edb05110bc874d1f37c062 SHA512 a765df9d5fe56ace8e4817bd1987708b5941ce904a3b04f7f1da39b97f16e70c4bde8ff8a84beb2a928f9988e120649c7653e688b8f9794d8c1508a915ce9eb6
 EBUILD xfce4-diskperf-plugin-2.6.1.ebuild 950 BLAKE2B fd670a4f0ee93d53db9f347d2ced11dcfe62d1bada1609b3b86e1f25c1b698b44d7cebee2623d8c116df774ea3bf153efd841dc7695dc126d7c7eaac5c2233c6 SHA512 b2cd3969b3b13f6b773a50afe36249d10f243d15f42cbeaa6c37034a5715e7ca623441428d65bc882eb4661f30d25ea4f609b3bcec2e524b8d3ef27e7cb3c967
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-diskperf-plugin/xfce4-diskperf-plugin-2.5.5.ebuild b/xfce-extra/xfce4-diskperf-plugin/xfce4-diskperf-plugin-2.5.5.ebuild
deleted file mode 100644
index f273fbcf4ba7..000000000000
--- a/xfce-extra/xfce4-diskperf-plugin/xfce4-diskperf-plugin-2.5.5.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit xfconf
-
-DESCRIPTION="A panel plug-in for disk usage and performance statistics"
-HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-diskperf-plugin"
-SRC_URI="mirror://xfce/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-RDEPEND=">=xfce-base/libxfce4ui-4.8:=
-	>=xfce-base/xfce4-panel-4.8:="
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-pkg_setup() {
-	XFCONF=(
-		$(xfconf_use_debug)
-		)
-
-	DOCS=( AUTHORS ChangeLog NEWS README )
-}
diff --git a/xfce-extra/xfce4-equake-plugin/Manifest b/xfce-extra/xfce4-equake-plugin/Manifest
index cb617237fc99..2038bd5f66b4 100644
--- a/xfce-extra/xfce4-equake-plugin/Manifest
+++ b/xfce-extra/xfce4-equake-plugin/Manifest
@@ -1,5 +1,3 @@
 DIST xfce4-equake-plugin-1.3.8.1.tar.bz2 393086 BLAKE2B c34b68ee79cd087b9f0eb178d947c73d596a978415ecb2cef55238bdae65a4443ac83daa6b8350ab8560fa026a8e580c49bcdd4cbba682adc50e53c02ff1782b SHA512 dc9d399ea3f6dd6ee401b29a821130136c1f2ce976d2dfe6a434ec7030e999ad1c903b5c42e8bd3b25397ffb51327cfceb112b1d45193e82efd4fc4f86190890
-DIST xfce4-equake-plugin-1.3.8.tar.bz2 395095 BLAKE2B 537f203ec0a32b2b3e42fee02e2cf9ae939fb268df66c8a1d25a9c51a5b41b41e02c84bafb90e7cef360749dac7f1d1438e821aa0b8050fc6a2a9b9a7d7502e7 SHA512 0c4446530493f0e6d1bcfe938ce473f367d000a2fbcf4fb0101687c0bf354458e083e2d7a6ad544037d28da1e6f07f9df05699664ec331a1d476da18f988e124
 EBUILD xfce4-equake-plugin-1.3.8.1.ebuild 822 BLAKE2B 932056bbfc63f931055031cf8770972bd4a9d4870c826cf5e5e65a4db439c0ab1fc372a46656dea002ec52460a68364a96fe5ab92a5f58a7bc74eb2fc1b9969d SHA512 c7db6cd52eb7e3805635467e77d877876d28a008cda269d24a0c63ca07edf28eda7db96103cd04f1afba5c632f5afaa3b02568a4d0741904d3430c97512b043b
-EBUILD xfce4-equake-plugin-1.3.8.ebuild 724 BLAKE2B 3d0b96b61bd164657447953d74b0a7d3978f0fe24a5a79f9b24afca2f495dd804aaa0468dc7bf84dbf3f629fbe14e5154247806304734137c4bb5b331bbdec1d SHA512 eca7ad06321eee099ddcaf73d4eaea35049f03d92c8f2c0789114ed5c1718177978b7d27cd67a509913d927d1876cd424911f0b323998e057a88d130b89b3b77
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-equake-plugin/xfce4-equake-plugin-1.3.8.ebuild b/xfce-extra/xfce4-equake-plugin/xfce4-equake-plugin-1.3.8.ebuild
deleted file mode 100644
index 50c3e9421c5b..000000000000
--- a/xfce-extra/xfce4-equake-plugin/xfce4-equake-plugin-1.3.8.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit xfconf
-
-DESCRIPTION="Panel plug-in that displays information about earthquakes at regular intervals"
-HOMEPAGE="http://www.e-quake.org/"
-SRC_URI="mirror://xfce/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug"
-
-RDEPEND=">=dev-libs/glib-2:=
-	x11-libs/gtk+:2=
-	x11-libs/libX11:=
-	>=xfce-base/libxfce4ui-4.10:=
-	>=xfce-base/libxfce4util-4.10:=
-	>=xfce-base/xfce4-panel-4.10:="
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-pkg_setup() {
-	XFCONF=(
-		$(xfconf_use_debug)
-		)
-
-	DOCS=( AUTHORS ChangeLog NEWS README )
-}
diff --git a/xfce-extra/xfce4-fsguard-plugin/Manifest b/xfce-extra/xfce4-fsguard-plugin/Manifest
index a8ac64f73c87..5cc36e6eb3d3 100644
--- a/xfce-extra/xfce4-fsguard-plugin/Manifest
+++ b/xfce-extra/xfce4-fsguard-plugin/Manifest
@@ -1,5 +1,3 @@
-DIST xfce4-fsguard-plugin-1.0.2.tar.bz2 356715 BLAKE2B a36a748ee88642be0390b333eb66fb27358d1ab9e75d4c29c0be0eb93ab2e4cf5e5428fed1d96669bda57185bb33ae17d5b0a27779fce455d0ec9c85a494b96a SHA512 1539c3757c8ee232bcc686d641dbdc73d76a8ab699b3bd6f32d662954ca3225b93a823e510ccdd7d59aea090e97b06bd7c9e70997cdd33dd32f032e2414a3d14
 DIST xfce4-fsguard-plugin-1.1.0.tar.bz2 360463 BLAKE2B a83bfcf9d2847a2c37731c6549a51d1d6e18a5a8d689e5c6b7bd3270988cccf25007aa6b47bd70937f61998c676e08ab071caf41b50631d031e5c11fb8921932 SHA512 c5e49a045f1987d57c6e6d120ad25785d2f9ad4e97d07af3d40ab88c268b5b8417deba40e0277ecc1725092063fa2a7f94aa163579f04a419aad5b4e47c79d7d
-EBUILD xfce4-fsguard-plugin-1.0.2.ebuild 769 BLAKE2B 8a97ca52a9c0c640ee9f914594024a4d99d552cacfad8a912609af97e334bdb5ed9fd196fe150848fe2994b48e2487851fdc6c131082ac244e6ef020bde889ee SHA512 724addb2b4b609be4f35e50cfd85ea872c450a283bbce783cd93436c0798b1b7fc81259344d721f276161d2aaa1e904c9e55c2781379f9f683add0f2cd5e19b5
 EBUILD xfce4-fsguard-plugin-1.1.0.ebuild 979 BLAKE2B 733f083d7c03fba9acbb99e8fe0789053fe65385b37b6fee3af2aeb22b9faed6f4ab51893ef76e2c0107e4079a70e4b928f823f07d2962c0a2337d3a3ca4522e SHA512 aec823b30378cafe3a143d2cc62a83a8672bcc008c3c4b57557062f52eccce2bafe3e27595345035510e9187e9ac6a4f4642c0aa5fb17e42773910a59976df05
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-fsguard-plugin/xfce4-fsguard-plugin-1.0.2.ebuild b/xfce-extra/xfce4-fsguard-plugin/xfce4-fsguard-plugin-1.0.2.ebuild
deleted file mode 100644
index 2b45bcdb84dd..000000000000
--- a/xfce-extra/xfce4-fsguard-plugin/xfce4-fsguard-plugin-1.0.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit xfconf
-
-DESCRIPTION="A filesystem guard plug-in for the Xfce panel"
-HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-fsguard-plugin"
-SRC_URI="mirror://xfce/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-RDEPEND="x11-libs/gtk+:2=
-	>=xfce-base/libxfce4ui-4.8:=
-	>=xfce-base/libxfce4util-4.8:=
-	>=xfce-base/xfce4-panel-4.8:="
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-pkg_setup() {
-	XFCONF=(
-		$(xfconf_use_debug)
-		)
-
-	DOCS=( AUTHORS ChangeLog NEWS README )
-}
diff --git a/xfce-extra/xfce4-genmon-plugin/Manifest b/xfce-extra/xfce4-genmon-plugin/Manifest
index ac0a5326f4c6..7e4d4dec1505 100644
--- a/xfce-extra/xfce4-genmon-plugin/Manifest
+++ b/xfce-extra/xfce4-genmon-plugin/Manifest
@@ -1,7 +1,3 @@
-DIST xfce4-genmon-plugin-3.4.0.tar.bz2 307493 BLAKE2B a3e17e3e96659dc4c58280b64b6edaaa3b64aa7b2ecb1e24a57a3e3e78cc7a58c446d90475ff12cbf2c8190675f0e82cc48d02927864f9662906b1058e445d43 SHA512 9cbe76933414fc539d4a8f803fb31ae31169283e02ded8a4ed13c9c6b2e4af9827313ca099b9d85e2b090a9520824a68e63d5bfe3537293a750f3c3b5f57de98
-DIST xfce4-genmon-plugin-4.0.0.tar.bz2 320252 BLAKE2B 0f03420307abb3b4d550e3e59beabebdd6bdbc0cce870fcd7969319512c11c54144fca93c14b40a75d7e417f86ced5d58cc89216fce57b2341292ae7bad18e83 SHA512 52a5c2245d902b183b06e5680b260482b511ae481fe9144ad266f061278acd60ce11934e31d8b5ed80bb519eac9168d0fbf488dae281f35090a57aceb915ce84
 DIST xfce4-genmon-plugin-4.0.1.tar.bz2 327605 BLAKE2B 908571d5ca2cc8e657416d18f1da61452b045163233a82beb5a1e876a244b2ce463e6cda54f0b7a8239e642eb4bf5d73ea807a5d26c22ded48baf955595fa805 SHA512 14590ba4a3b31773e38139d274c93060b2dfdf3cd476dc2235f95f987529b93b74d2422507cc4bf1152f376ec9c6a01bd1da903d422757b95b19c01aa412b35e
-EBUILD xfce4-genmon-plugin-3.4.0.ebuild 747 BLAKE2B 5ccdc199ce3372638f441a5a00d7e06eca91e69ccb230d5686fcd206d81b58c4e733fb09e0fc521c55270fbaa54108d6c76481f64092f7b93f839fb10ab5903e SHA512 16d3a3b49277900039d380689a834c1a95b5f12735e0b9c6ef0b4875791af4b0b660fbfe7f617e8bcb0d503aa0eb959b4f6587f47203a08e41464018dcc5f8c2
-EBUILD xfce4-genmon-plugin-4.0.0.ebuild 625 BLAKE2B f8ecc8ada7799ba0afcce873652d324d7164978a3e8186385613596310df55f39a8440d8339735ec702fc98acefa84884bdf12bcad4b15c15096702e3d7be610 SHA512 d9013197cb921b856f97c6feab7a04a88aa5f633a378c9f0947e3d4e94e356209213603c5780331c6acb06835f89181f9b52e0bd377907a0bd75b0c5201a0393
 EBUILD xfce4-genmon-plugin-4.0.1.ebuild 619 BLAKE2B 73476a49e68e284b74dd1e78d18670255ef5a914889fceeb59a648ae2e42940d49ddb3496b0ee8ebf506cd06a898557386ec3b806d08063ba9d8c2d37edf903d SHA512 2c77d97941dc7c01d008d95314bcf67bff61309062ddc8c3fbca36b90e8bd265ed5fcf45fb65dfec0da9cdf390dece457f6bd5a120d776baf87997f5c0ad8749
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-genmon-plugin/xfce4-genmon-plugin-3.4.0.ebuild b/xfce-extra/xfce4-genmon-plugin/xfce4-genmon-plugin-3.4.0.ebuild
deleted file mode 100644
index 27775eeba906..000000000000
--- a/xfce-extra/xfce4-genmon-plugin/xfce4-genmon-plugin-3.4.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit xfconf
-
-DESCRIPTION="Cyclically spawned executable output on the panel"
-HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-genmon-plugin"
-SRC_URI="mirror://xfce/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-RDEPEND=">=xfce-base/libxfce4ui-4.8
-	>=xfce-base/xfce4-panel-4.8"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${PN}-${PV%.*}
-
-pkg_setup() {
-	XFCONF=(
-		$(xfconf_use_debug)
-		)
-
-	DOCS=( AUTHORS ChangeLog NEWS README )
-}
diff --git a/xfce-extra/xfce4-genmon-plugin/xfce4-genmon-plugin-4.0.0.ebuild b/xfce-extra/xfce4-genmon-plugin/xfce4-genmon-plugin-4.0.0.ebuild
deleted file mode 100644
index d44618c9df43..000000000000
--- a/xfce-extra/xfce4-genmon-plugin/xfce4-genmon-plugin-4.0.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Cyclically spawned executable output on the panel"
-HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-genmon-plugin"
-SRC_URI="mirror://xfce/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=">=xfce-base/libxfce4ui-4.12:=[gtk3(+)]
-	>=xfce-base/xfce4-panel-4.12:="
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
diff --git a/xfce-extra/xfce4-gvfs-mount/Manifest b/xfce-extra/xfce4-gvfs-mount/Manifest
index dc357da7d556..c037986fe687 100644
--- a/xfce-extra/xfce4-gvfs-mount/Manifest
+++ b/xfce-extra/xfce4-gvfs-mount/Manifest
@@ -1,4 +1,3 @@
 DIST xfce4-gvfs-mount-0.0.4-6d2684b.tar.bz2 280614 BLAKE2B f3405351c3a2cab4a051fa74a7de68ee52b1c82aa065253a3779d48ea298eae3521d0838b1b427833945bfc7421a2cae68bc1073217edde41d82315a1cbc16b3 SHA512 0bab5e20620594e1633c12c4c20724a43317004eda6f353579f890cc1d9b3288b7a3bdc411e9f34efb00ed31876d1e29d70e8bfacc9f18ed6806b36f5e112527
 EBUILD xfce4-gvfs-mount-0.0.4-r1.ebuild 941 BLAKE2B d1bbeac131a67f8f90faa6c134224b220f6ad4ebde2bf2c7440594adfd28c919b95431569bca1c361533c85f3f3613818c29a8a6a2ce4cb61c3147392b091090 SHA512 471ca9bef28b60e876ce350cdc88b7748ea506a7c283fefd3f2c5db57bb4591ecaf3603701e3ac1e2b73ab5f4a2f059bccf1b8642de6b2b387e942f99aa28e07
-EBUILD xfce4-gvfs-mount-0.0.4.ebuild 852 BLAKE2B e545f73e13c3d26c7be213dc40c5d3656c9d8500593d483d95955d939c5ea310e40a09bc572a415da5ae73ed6c36d53d2573eeadd2c25064fc90f7b17ac30168 SHA512 69b378d006b2f8ff33fe62c72163ed025d933fbf29a88f4b13dcf9482123b8676c3f9fdc1da2b7d1a6b4b521a16dcafbb62cc6f63ca1c98ddbe956ceb050c1f5
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-gvfs-mount/xfce4-gvfs-mount-0.0.4.ebuild b/xfce-extra/xfce4-gvfs-mount/xfce4-gvfs-mount-0.0.4.ebuild
deleted file mode 100644
index 0dedd36ec11a..000000000000
--- a/xfce-extra/xfce4-gvfs-mount/xfce4-gvfs-mount-0.0.4.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit multilib xfconf
-
-MY_REV=6d2684b
-
-DESCRIPTION="A panel plug-in to mount remote filesystems for the Xfce desktop environment"
-HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-gvfs-mount"
-SRC_URI="mirror://xfce/src/panel-plugins/${PN}/${PV%.*}/${P}-${MY_REV}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-libs/dbus-glib-0.98
-	>=dev-libs/glib-2.24
-	>=gnome-base/libglade-2.6
-	>=x11-libs/gtk+-2.20:2
-	>=xfce-base/libxfce4util-4.8
-	>=xfce-base/libxfcegui4-4.8
-	>=xfce-base/xfce4-panel-4.8"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${P}-${MY_REV}
-
-pkg_setup() {
-	XFCONF=(
-		--libexecdir="${EPREFIX}"/usr/$(get_libdir)
-		)
-
-	DOCS=( AUTHORS NEWS README )
-}
diff --git a/xfce-extra/xfce4-indicator-plugin/Manifest b/xfce-extra/xfce4-indicator-plugin/Manifest
index ef09ceddf2cb..4aab8da31d39 100644
--- a/xfce-extra/xfce4-indicator-plugin/Manifest
+++ b/xfce-extra/xfce4-indicator-plugin/Manifest
@@ -1,5 +1,3 @@
-DIST xfce4-indicator-plugin-2.3.3.tar.bz2 380735 BLAKE2B d218c88e9b7cf862c2638f8ad6f9ec1a11797c3689d938e6a16ccea79622fb60f4b1273cf721bd72e8e26c99b1258743ecda52bbf3b52ed7c31ae052a49c2aed SHA512 d220ee625d10c857f2d65c52e8d561d8ff8448e8707161baf3ef8a1365fb5306d29c480f56edf5ead091fb3078ab0ebcb25088c676ad280e5c93208e36b95c20
 DIST xfce4-indicator-plugin-2.3.4.tar.bz2 406991 BLAKE2B 3d499f9f923e9cc51b25e2bed3dc6dfb6d4413c90d0a1afeacd14e0d1f33c9f9d5bdd6bdeb03a3e61bef0c3ec8cb1d1c766d89d921aaf9610bc797dc99a12219 SHA512 b1fd065c8221ae91d95b540411317cd67bb9b26d46c7cfe85ec90d7ccdcd11e7b8832008c8b6fb5c257e0b1a08360f00ad9da5520108024cc36c63d865ffdca6
-EBUILD xfce4-indicator-plugin-2.3.3-r2.ebuild 1122 BLAKE2B 4472129c310f91804565775126762608fc0f9bbf95930062fed4e219e5f7707af15d09bd69cfc51d11ad03241ca65db53cacc324603bbe53a4e4a0ad145d3c6e SHA512 f1de69c1cd95e65f353140494a2775cd680ea13400c62d50a34f894f996b53dfe070c5db53475b9e43df483465aa5928c87ee70cb5a8848db2b39906fe019482
 EBUILD xfce4-indicator-plugin-2.3.4.ebuild 1102 BLAKE2B c8b0ad42c2a7a89b195452a11f79fb516819c83a7766cc5009ff18d8beed06be559265c6a907c7a997c91d425abc78059fb79fce5af2f11469c4c5d9ca62d882 SHA512 319be4056caccab0ac515518a79064fb2255b98d1eb448e4f2b36bbf6239a6b0c6b62de49b3d8d67a012aa764f3dba63ca451ca236173beb341758dff01699ae
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-indicator-plugin/xfce4-indicator-plugin-2.3.3-r2.ebuild b/xfce-extra/xfce4-indicator-plugin/xfce4-indicator-plugin-2.3.3-r2.ebuild
deleted file mode 100644
index 1dd34e845cce..000000000000
--- a/xfce-extra/xfce4-indicator-plugin/xfce4-indicator-plugin-2.3.3-r2.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
-inherit gnome2-utils xdg-utils
-
-DESCRIPTION="A panel plugin that uses indicator-applet to show new messages"
-HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-indicator-plugin"
-SRC_URI="mirror://xfce/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-libs/libindicator-12.10.1:3=
-	>=x11-libs/gtk+-3.6:3=
-	x11-libs/libX11:=
-	>=xfce-base/libxfce4ui-4.11:=[gtk3(+)]
-	>=xfce-base/libxfce4util-4.11:=
-	>=xfce-base/xfce4-panel-4.11:=
-	>=xfce-base/xfconf-4.10:="
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-pkg_setup() {
-	# TODO: libido3-13.10.0 needs ubuntu-private.h from Ubuntu's GTK+ 3.x
-	XFCONF=(
-		--disable-ido
-		)
-
-	DOCS=( AUTHORS ChangeLog NEWS README THANKS )
-}
-
-src_install() {
-	default
-
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/xfce-extra/xfce4-mount-plugin/Manifest b/xfce-extra/xfce4-mount-plugin/Manifest
index d39e0fa6ce6e..fb4e0039ad3d 100644
--- a/xfce-extra/xfce4-mount-plugin/Manifest
+++ b/xfce-extra/xfce4-mount-plugin/Manifest
@@ -1,6 +1,3 @@
-AUX xfce4-mount-plugin-0.6.7-LINGUAS.patch 489 BLAKE2B 77ed63465b413671828e450abf6a561e0196b7f35540a6923d81dfdc129b08dc9adfdb97c2c06266685b52dad16c8d718760dc428c6cf91d9bbad341953f3dfb SHA512 51fc1cbd31d7ad46a195786c14f35902e293a1804b9938702e40e468ef41f6e6596c201e9b379b739ba68265ff48221e5f80d34ebe997568d1b306c968292496
-DIST xfce4-mount-plugin-0.6.7.tar.bz2 390163 BLAKE2B ac114502cc3dc2a50a287d95b5de65c540c6c5e69cb6724a0914b988b2bcc5c8a6dae3e1379f703db636ec2376e7ff065b62b2ca790cc56f07ddf4bf0951d19d SHA512 18f4f4fc88c521f1fd6dcbcd3146fc8379e3aa0fb00e4787a34b6c52f68f765f18354e6b66e50c8b1a42e4f2366a5779cf057ba8b71fee45d0d3d023afe6fa7b
 DIST xfce4-mount-plugin-1.1.2.tar.bz2 425997 BLAKE2B bc53f56d2cfe147ccabb3b8f16dbb6226e63dc77e724541bdac349cc17c24b216227e0ec4f8b84911ff97e8faa9b080d6118ed5ac436156c6e98971883ddd77f SHA512 95a4654b2dca87d8c86190163e908170509a7d37ca9aabbce9f397552fcd53a27912c09a33c5c259ef01799fb690714e9b9d14a962fa781d59dfce61bb69c728
-EBUILD xfce4-mount-plugin-0.6.7.ebuild 744 BLAKE2B 78a43c187541b44e07d977b084a6822652a931aad26d32012c590121b24ceec6bb2ef5aafa10bf0188e3a8949ae80348be801e60010115e2ac9cda1a7779a51e SHA512 2ebbb9b82f75f640958c82c7998b14d61d3ed45b53c085542ef5ecf03476ecd44e95b67b0696f770e188f673ad1d68844c5402bf7a240b450cc8b7d427178566
 EBUILD xfce4-mount-plugin-1.1.2.ebuild 660 BLAKE2B 2a9bbfd21df3ba4cc0a68e24b33686384ae91515e5203742c96a62a1a4bf33cfe154a54654b43ce3d725a43611a3c4089de2189736fee15f8e6fb3b496c5c3f0 SHA512 c74b9d5a101b602c36974cb12a84599dcac802d580e43c8fc43778732a9cba7ca84faaf0c6c3dc4ce9108993ff07739a3807b09d116f6c6e74eeafda66086c64
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-mount-plugin/files/xfce4-mount-plugin-0.6.7-LINGUAS.patch b/xfce-extra/xfce4-mount-plugin/files/xfce4-mount-plugin-0.6.7-LINGUAS.patch
deleted file mode 100644
index 537c9c5f86e2..000000000000
--- a/xfce-extra/xfce4-mount-plugin/files/xfce4-mount-plugin-0.6.7-LINGUAS.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-http://bugs.gentoo.org/510872
-http://bugzilla.xfce.org/show_bug.cgi?id=10968
-
---- configure
-+++ configure
-@@ -13946,7 +13946,7 @@
- 
- 
- 
--    ALL_LINGUAS="ar ast bg ca cs da de el en_AU en_GB es eu fi fr gl hr hu id is it ja ko lt lv ms nb nl oc pa pl pt_BR pt ru sk sq sr sv th tr ug uk ur_PK ur vi zh_CN zh_TW "
-+    ALL_LINGUAS="ar ast ca cs da de el en_GB es eu fi fr gl hu id it ja ko lt lv nb nl pl pt_BR pt ru sq sv tr ur_PK ur vi zh_CN zh_TW "
- 
-    for ac_header in locale.h
- do :
diff --git a/xfce-extra/xfce4-mount-plugin/xfce4-mount-plugin-0.6.7.ebuild b/xfce-extra/xfce4-mount-plugin/xfce4-mount-plugin-0.6.7.ebuild
deleted file mode 100644
index ebad08114876..000000000000
--- a/xfce-extra/xfce4-mount-plugin/xfce4-mount-plugin-0.6.7.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit xfconf
-
-DESCRIPTION="An mount plug-in for the Xfce panel"
-HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-mount-plugin"
-SRC_URI="mirror://xfce/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-RDEPEND=">=xfce-base/libxfce4ui-4.10
-	>=xfce-base/xfce4-panel-4.10"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-pkg_setup() {
-	PATCHES=( "${FILESDIR}"/${P}-LINGUAS.patch )
-
-	XFCONF=(
-		$(xfconf_use_debug)
-		)
-
-	DOCS=( AUTHORS ChangeLog NEWS README TODO )
-}
diff --git a/xfce-extra/xfce4-mpc-plugin/Manifest b/xfce-extra/xfce4-mpc-plugin/Manifest
index 804e40d9ad65..97d60f83b5d5 100644
--- a/xfce-extra/xfce4-mpc-plugin/Manifest
+++ b/xfce-extra/xfce4-mpc-plugin/Manifest
@@ -1,5 +1,3 @@
-DIST xfce4-mpc-plugin-0.4.5.tar.bz2 284335 BLAKE2B cce4d74f0d7df973233243231916744e68323dcde8ddac97f39dbfac04939b3835ad2081271d589cc96f83773ea6a3d0987c93bdfc5e18dbc4a632f54987af57 SHA512 272331170396c0635800c692fe06ac5bf53d0a2b007c6a8939f1678b109942728f9f97787e5b33abf94a56de6b72f6ea4cb3348f4ac3593b0bf4ab4c1ef79a57
 DIST xfce4-mpc-plugin-0.5.0.tar.bz2 282688 BLAKE2B 2ad968ba53ee391224f20ae6d62061feb9c63bda6414868daee024b948d8e5e11c0f696e522dc7914ed5d88f798f6be48bb420c19e3b4f36dcf7af3e5756b303 SHA512 b6cd8c756d952e19bbd0be3a8385b0bdd647960708537a8997589c07e512560856aa78de2ed0c6267810aa7b33c4470facd45048158e373053dc30813e8ebaa1
-EBUILD xfce4-mpc-plugin-0.4.5.ebuild 710 BLAKE2B 8f0c142654586fc48149c49af0dd4408d32f67a6d6c4c42db4a960fa7c04e6b67cff7ffc10f62d4cdabe41fc072cf0d11cb27ddad6f9d0312f1b34a9705f974f SHA512 278a0eb152b4b7878fa4a59dac1b4544bb8e128bcddc54402fe9e121eb3b235e97ba6355617d2fd8a3c0cfc78926004b6aaeaf226c054905dfd6424579886ba6
 EBUILD xfce4-mpc-plugin-0.5.0.ebuild 940 BLAKE2B 7d95a73bb9b3b2d4466452d0516cfd08078f7cdb939dcf4eb818b41e096599f1aa530381573e4ea7505b76746b4ab0d4232efdc7d216d7fbb92c7b6dd850b1fd SHA512 4fe366f1786a5d541024437c395d00531a6dba1954e7b97a325bd2712775780ed0b0fa95258742d1fb48acfe464392b9130f7bd5973dae4d7dabfbcc8d024579
 MISC metadata.xml 391 BLAKE2B 5f0144a6e45fa3c716c04e9c482be6c6f132e461f57af55bdf2f3c41590909e7c65a0cc36ab0b29a2dd0cdc2a3c4b9d8f2042d90cbe54458aa9c4175a9e7148a SHA512 cf9d54decdbcc2879e190343f71a2fee82f1bf91a34c83e6b262428e9a7042f0e54169d4d28005bf623c2d8a7ac38269e1531ec853e6332ef761a057b42fe2a4
diff --git a/xfce-extra/xfce4-mpc-plugin/xfce4-mpc-plugin-0.4.5.ebuild b/xfce-extra/xfce4-mpc-plugin/xfce4-mpc-plugin-0.4.5.ebuild
deleted file mode 100644
index 9c338bbb2c7c..000000000000
--- a/xfce-extra/xfce4-mpc-plugin/xfce4-mpc-plugin-0.4.5.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit xfconf
-
-DESCRIPTION="Music Player Daemon (mpd) panel plugin"
-HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-mpc-plugin"
-SRC_URI="mirror://xfce/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE="debug +libmpd"
-
-RDEPEND=">=xfce-base/exo-0.6:=
-	>=xfce-base/libxfce4ui-4.8:=
-	>=xfce-base/xfce4-panel-4.8:=
-	libmpd? ( media-libs/libmpd:= )"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig"
-
-pkg_setup() {
-	XFCONF=(
-		$(use_enable libmpd)
-		$(xfconf_use_debug)
-		)
-
-	DOCS=( AUTHORS ChangeLog README TODO )
-}
diff --git a/xfce-extra/xfce4-netload-plugin/Manifest b/xfce-extra/xfce4-netload-plugin/Manifest
index 5c158166ae3e..94989d72ee3c 100644
--- a/xfce-extra/xfce4-netload-plugin/Manifest
+++ b/xfce-extra/xfce4-netload-plugin/Manifest
@@ -1,5 +1,3 @@
-DIST xfce4-netload-plugin-1.2.4.tar.bz2 361889 BLAKE2B 879ea230cdad10028fd4f82026dfca3447d9e4e16f8a14af92af5c27af080a24545c95d96e7376411e6ab1dae4dda40d6160c721bba6b0ba9bf73aadf64437ab SHA512 e8b7e1d084acbe3785c5190d32c0941645be08ff735148ccd9ee03787168a390321b1945795ae9a3cc2a4ec56dfdae9cbac96fb6adbc66ec7b6c9bed845a1d51
 DIST xfce4-netload-plugin-1.3.1.tar.bz2 367844 BLAKE2B b68cfefd2f54f8ee5868d6dab5dd4818b5268e4da96d9e53b55b354d170c56d72ef8fc7f360a1c97e1700795935c81ef6d0c982578fd8237c83ce04d266ef780 SHA512 34144bf2d95f71276f8b5f4cf417d97d380233805c6fec1b7c559fee5b11468a421d3691230e01d89b40289d5ab22a472dcbef2a7ee0854abd7213e0ef0a3ef9
-EBUILD xfce4-netload-plugin-1.2.4.ebuild 698 BLAKE2B 56b6fdeb11a0de7696acaddf1a8dfeb2ac45820ed377b97646cb91c7e81df409fc2df4ae8322273eab7a393e25669c4d308f2bb44b429ff72a28c8decccd6150 SHA512 76c307e7618dcff0f8f86239470318e92efa181dc91be142b77301672b516c6e2a7900a675b1586e2e05a8307d95b77eec28101419d3f43614291c2a6ddbe2fa
 EBUILD xfce4-netload-plugin-1.3.1.ebuild 924 BLAKE2B dc1d0eceae2e9c4d9ae74c5ce17a14e551eb0b8f0b13bfe8697aff636809a0cb9896f578a7cf3aa070aad1d7d0cda5e256a3f0dcda36576e8bf8394169cbf493 SHA512 835a8a7322bd070302c9dd12e10a6fa829f19fda85d057f4897f202631192eea2ed132a961ca0941f70f2f17d0374c1e0bd15e6d6d9da1264afa585023cb65fe
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-netload-plugin/xfce4-netload-plugin-1.2.4.ebuild b/xfce-extra/xfce4-netload-plugin/xfce4-netload-plugin-1.2.4.ebuild
deleted file mode 100644
index 6941ff154722..000000000000
--- a/xfce-extra/xfce4-netload-plugin/xfce4-netload-plugin-1.2.4.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit xfconf
-
-DESCRIPTION="A network load plug-in for the Xfce panel"
-HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-netload-plugin"
-SRC_URI="mirror://xfce/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-RDEPEND=">=xfce-base/libxfce4ui-4.10:=
-	>=xfce-base/xfce4-panel-4.10:="
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig"
-
-pkg_setup() {
-	XFCONF=(
-		$(xfconf_use_debug)
-		)
-
-	DOCS=( AUTHORS ChangeLog NEWS README )
-}
diff --git a/xfce-extra/xfce4-notifyd/Manifest b/xfce-extra/xfce4-notifyd/Manifest
index 75af60b8f67f..6524d699e023 100644
--- a/xfce-extra/xfce4-notifyd/Manifest
+++ b/xfce-extra/xfce4-notifyd/Manifest
@@ -1,11 +1,5 @@
-DIST xfce4-notifyd-0.2.4.tar.bz2 361619 BLAKE2B 65dea944a6b16ef43beab43da5307004af664fc3460f6605ca52073e2b176c89c0c13b44c8b4a2e603b224399b03db6372d0f24e26a96061a23b4d6a6c579d51 SHA512 4cee6395ee925e41ec22baa0fca21b38261a547ddff32f6c140db91996e2aa39b86113ffbe42da3c98728513a10eadd99504a05f31100762eb5b19bf8a74ae7c
-DIST xfce4-notifyd-0.3.6.tar.bz2 458536 BLAKE2B 82d0c10f744a92dd98e4d9596fb0e8bf7b34a797842b83b0dadc23848bf7533d845ff966b1f73f61c2871e7f6b640f1def69a011c2cbb68efd069a52777efc0e SHA512 96067de2e08e29c8e6285796bc4b23087f97286e28adfb485dc20f449ae32e10c8fb743f42585e0e6cda82d713eb6da3cc1d94920eb170b7cfa1e687ffcb3ddf
-DIST xfce4-notifyd-0.4.0.tar.bz2 519355 BLAKE2B c3c5b4500dcf7048f719864d900300710402a1f1411808ee471f0b97de2a6277c0facd7a0e9d2d349628ecb7f9839f0775ea2c000b35fe790eafe31fd38123c0 SHA512 17a651685885e8fb8fdc74c89b5126e24aa8704068332e45352fe9d5bc95aa7cbe2002afbc18b2446dc11c6d4d9c1d857d44d685ecd0148bc865a01851f1b045
 DIST xfce4-notifyd-0.4.1.tar.bz2 524411 BLAKE2B f90c8241e484b256cfc1619f6bc9b1f5ad0f375fe3efdcadfe8f2acf740697f887a98044bcceb15a70cac9529cf9e1119192875682d0fb59355b4a10b3e479c1 SHA512 3dd12a8d27d950c2ffe7a4bc0eaa3b44f4a783273fc90d95304ec77450e88241ad39ca13366cb2a0c666ff6afb9ad58f6468e2fc38b8a87a2737614cfedadfae
 DIST xfce4-notifyd-0.4.2.tar.bz2 528521 BLAKE2B 8e59e26fcd453b65522b89c24d36857f6ac66c1b6e6a0ef0167b3f9f8dc4a087185d4b5b770b4e90e614e369ca147b924ad3f3ac0a1f3faf49c02b9e1ffd0a30 SHA512 1cabf478928cbcc13e9f03b2540470c5568bc665b196a8617a0e3b52ce4fe3bd9fdb5e199c4e52afe51c4edab8ba949c4551f65ce77c5fae7fddccd0086fb601
-EBUILD xfce4-notifyd-0.2.4.ebuild 755 BLAKE2B 3cd38d4b160f675ee872f6c501069d04e0e7450fb07270064b161bdd3b38192ce359ca4d2f12974efb4980dd49e7ce8f3b8717204e9239f411b0b947fe553b81 SHA512 b168d520383e8f191a47138e1c949df4cdb06105d73a6226b866a0032f4f58662f6256d76de43b48d83f98e83aeff41b252086ad594889f9699fffe3bf515773
-EBUILD xfce4-notifyd-0.3.6.ebuild 919 BLAKE2B 65ad17a27aaef4dad0c0d45a3d35e777fc6a82572639b7a30c3e1b5408ca05445a255085edca32901702ea3046115edd13885112f9e51028462f1d709453c7ab SHA512 4464da3edd45f2272af97cd24740db51bb42aa2a56536eef6fc7c9a6ad70f165d8a1442fecc65714079fc53096608d7af01f8000ff30c5e730026a433de2dcb9
-EBUILD xfce4-notifyd-0.4.0.ebuild 853 BLAKE2B 85eb199bb3494f211d74c384b735f834407e29ffcf017b205bcd96ab118802950948971751bb0740448274f4d8a6c600957aa3df57e3b48c1f6e713563148511 SHA512 010237894888446bd9d5b44081585bf4cba475f8f12f78915a581cc6441867fe5fc1ddc0162290d443d6e9dce9ea3b34101941a20c29c7df7a1789a993e74fdc
 EBUILD xfce4-notifyd-0.4.1.ebuild 851 BLAKE2B 083e07fc28ce734d456396eab4f7fda979f9a1fa5fa67110709d3be690b84f0e05111d289857d61c7b03dec0f15d0b9ace0243fc9f25dafe10704f18d816aeed SHA512 f8a266d49a9295853eb30fddf2783411141a801ce468a7a1ac1ae9bcc01731bc1aa447448218b92f17f03084d293666a01c65c42e92c28c100399decf7b2b347
 EBUILD xfce4-notifyd-0.4.2.ebuild 818 BLAKE2B 56378a65c4302d7e24e774c8b3d0e55b3fbdb7c3d41e130d3ad86ffb88a8ff8224916c003b40966a8f46b0275809836e1fd204a0247e01f92fa1d340dd73608b SHA512 e8adae74eff893ab66f227fdb633554685ab721ed4be345faa6bfd7eae27838daa3ac84fc5853791aeb275daff326bdd3be35c2ef746bd49081c67d4cde76df8
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-notifyd/xfce4-notifyd-0.2.4.ebuild b/xfce-extra/xfce4-notifyd/xfce4-notifyd-0.2.4.ebuild
deleted file mode 100644
index c28a16aaf8e9..000000000000
--- a/xfce-extra/xfce4-notifyd/xfce4-notifyd-0.2.4.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 xfconf
-
-DESCRIPTION="Notification daemon for the Xfce desktop environment"
-HOMEPAGE="https://goodies.xfce.org/projects/applications/xfce4-notifyd"
-SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="debug"
-
-RDEPEND=">=dev-libs/dbus-glib-0.100
-	>=sys-apps/dbus-1.6
-	>=x11-libs/gtk+-2.14:2
-	>=x11-libs/libnotify-0.7
-	>=xfce-base/libxfce4ui-4.8
-	>=xfce-base/libxfce4util-4.8
-	>=xfce-base/xfconf-4.8"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-pkg_setup() {
-	XFCONF=( $(xfconf_use_debug) )
-	DOCS=( AUTHORS NEWS README TODO )
-}
diff --git a/xfce-extra/xfce4-notifyd/xfce4-notifyd-0.3.6.ebuild b/xfce-extra/xfce4-notifyd/xfce4-notifyd-0.3.6.ebuild
deleted file mode 100644
index 52de732c99fe..000000000000
--- a/xfce-extra/xfce4-notifyd/xfce4-notifyd-0.3.6.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils
-
-DESCRIPTION="Notification daemon for the Xfce desktop environment"
-HOMEPAGE="https://goodies.xfce.org/projects/applications/xfce4-notifyd"
-SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2.42:2=
-	>=x11-libs/gtk+-3.14:3=
-	>=x11-libs/libnotify-0.7:=
-	>=xfce-base/libxfce4ui-4.12:=[gtk3(+)]
-	>=xfce-base/libxfce4util-4.12:=
-	>=xfce-base/xfconf-4.10:="
-DEPEND="${RDEPEND}
-	dev-util/gdbus-codegen
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS NEWS README TODO )
-
-pkg_postinst() {
-	GNOME2_ECLASS_ICONS="usr/share/icons/hicolor" \
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	GNOME2_ECLASS_ICONS="usr/share/icons/hicolor" \
-	gnome2_icon_cache_update
-}
diff --git a/xfce-extra/xfce4-notifyd/xfce4-notifyd-0.4.0.ebuild b/xfce-extra/xfce4-notifyd/xfce4-notifyd-0.4.0.ebuild
deleted file mode 100644
index f48064f45685..000000000000
--- a/xfce-extra/xfce4-notifyd/xfce4-notifyd-0.4.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils
-
-DESCRIPTION="Notification daemon for the Xfce desktop environment"
-HOMEPAGE="https://goodies.xfce.org/projects/applications/xfce4-notifyd"
-SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2.42:2=
-	>=x11-libs/gtk+-3.14:3=
-	>=x11-libs/libnotify-0.7:=
-	>=xfce-base/libxfce4ui-4.12:=[gtk3(+)]
-	>=xfce-base/libxfce4util-4.12:=
-	>=xfce-base/xfce4-panel-4.12:=
-	>=xfce-base/xfconf-4.10:="
-DEPEND="${RDEPEND}
-	dev-util/gdbus-codegen
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS NEWS README TODO )
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/xfce-extra/xfce4-power-manager/Manifest b/xfce-extra/xfce4-power-manager/Manifest
index e31dc80bc2d8..92742a23141b 100644
--- a/xfce-extra/xfce4-power-manager/Manifest
+++ b/xfce-extra/xfce4-power-manager/Manifest
@@ -1,6 +1,3 @@
-DIST xfce4-power-manager-1.6.0.tar.bz2 1171114 BLAKE2B 96550ad0381b9482d9e5ad5057c94923c649498593be9726c0628ec7d36e2b2a1a939048b86a46e6bd10a4e9936924d217bcc83bc9f0b76d72ef99245f099b2f SHA512 1b3628793a8bfb7a487fc4f1182769b0d7a90784aa4ef7800997dd7e9a061d938493b8c5653672b293fb018dd5b5209bb83caa16310c1de370413f98d8af1053
 DIST xfce4-power-manager-1.6.1.tar.bz2 1180710 BLAKE2B bffb5f00a42a3242a0b9d35b48fe6d9813d3292757844e911a8e71d05cb59f2f91d93ab5a77ac15ae35c90ccfa60ce39db23bc94a0350232538c8621fec4473f SHA512 b81ce1b35892a6cd0b1d4fb590ccc25b906cde6f782de2fffbe78ea89e00df15e51ea1f47576c173b7512cd617f5142868fca8cf81519b6fe165a5ecc67a5478
-EBUILD xfce4-power-manager-1.6.0-r1.ebuild 1473 BLAKE2B 45be9ac3ce94896486d4ab62debe1ab41abd03582e737e59c152a48f5fc5cf553207cdcffdbcd50117c5ed696579de890440f9858372263e96ac19a40883bfc4 SHA512 4645fff22b1654c778ba5b5c23e858a9b4fd10ccefd3f00753606b3fbd386adffb17182791210774abc54151870c9823b9fca92d7fa73e36602bcce2cf1882af
-EBUILD xfce4-power-manager-1.6.0.ebuild 1347 BLAKE2B 0bc98a3e28597ee731f103bdcfa5d94ade4f38fa1b4841a4715c1d35c181e715ff12051c5b9ab400b8896f73fee17910f2c19d2e82d72c16c96a8a03a8be52ad SHA512 bb8c9f8f13147d2b316bfec53b57d75d7f6a37447281df1a92a045b7090b73598085c28e48201a92ed8d2870b206c8e6a416cb50b0bc9bb0acd900a7d4d53d25
 EBUILD xfce4-power-manager-1.6.1.ebuild 1396 BLAKE2B d6f31ac3972f7437ea95971e8d78135c0e78b4beffbc4896090a7accb9f3c8e8cfda25672d1c39093951708979eb85d93a804c395375d01b417485461f429250 SHA512 bcc0fd5a384108ec2de2d2d0d11c8774d5dfba7b4d9629ec7b45999d2bb0ca8f3db3e08e7c35431e8e58ef40f8a6d103ad43652084179ab058cdb22480e7b555
 MISC metadata.xml 360 BLAKE2B 74fb48a2ee62745a873e6c21670385e6f1108b6ae215e7ce6abb0f735a30559ee8cd5214bcdaaeca0a9a6b2372f1551ee7deea9018108a3f11a01c0497ec0f88 SHA512 bca73ff003a0d3845fc354775332c0edd0558ff5bcf27c562cc8c4f96e95210f197698d76b0ea898aa6ff4a12e5e22a589b62d28e196e679d4046e56f66ea744
diff --git a/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.6.0-r1.ebuild b/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.6.0-r1.ebuild
deleted file mode 100644
index a082a0dc16f4..000000000000
--- a/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.6.0-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2-utils
-
-DESCRIPTION="Power manager for the Xfce desktop environment"
-HOMEPAGE="https://goodies.xfce.org/projects/applications/xfce4-power-manager"
-SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE="debug kernel_linux networkmanager +panel-plugin policykit systemd"
-
-COMMON_DEPEND=">=dev-libs/glib-2.42:=
-	>=sys-power/upower-0.99.0
-	sys-power/pm-utils
-	>=x11-libs/gtk+-3.14:3=
-	>=x11-libs/libnotify-0.7:=
-	x11-libs/libX11:=
-	x11-libs/libXScrnSaver:=
-	>=x11-libs/libXrandr-1.2:=
-	x11-libs/libXext:=
-	x11-libs/libXtst:=
-	>=xfce-base/xfconf-4.12:=
-	>=xfce-base/libxfce4ui-4.12:=[gtk3(+)]
-	>=xfce-base/libxfce4util-4.12:=
-	panel-plugin? ( >=xfce-base/xfce4-panel-4.12:= )
-	policykit? (
-		>=sys-auth/polkit-0.112
-		!systemd? ( sys-auth/consolekit )
-	)"
-RDEPEND="${COMMON_DEPEND}
-	networkmanager? ( net-misc/networkmanager )"
-DEPEND="${COMMON_DEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig
-	x11-proto/xproto"
-
-src_configure() {
-	local myconf=(
-		$(use_enable policykit polkit)
-		$(use_enable networkmanager network-manager)
-		$(use_enable panel-plugin xfce4panel)
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.6.0.ebuild b/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.6.0.ebuild
deleted file mode 100644
index 20e63050f19d..000000000000
--- a/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.6.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit xfconf
-
-DESCRIPTION="Power manager for the Xfce desktop environment"
-HOMEPAGE="https://goodies.xfce.org/projects/applications/xfce4-power-manager"
-SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86"
-IUSE="debug kernel_linux networkmanager policykit systemd +xfce_plugins_power"
-
-COMMON_DEPEND=">=dev-libs/glib-2.42:=
-	>=sys-power/upower-0.99.0
-	sys-power/pm-utils
-	>=x11-libs/gtk+-3.14:3=
-	>=x11-libs/libnotify-0.7
-	x11-libs/libX11:=
-	x11-libs/libXScrnSaver:=
-	>=x11-libs/libXrandr-1.2:=
-	x11-libs/libXext:=
-	x11-libs/libXtst:=
-	>=xfce-base/xfconf-4.12:=
-	>=xfce-base/libxfce4ui-4.12:=[gtk3(+)]
-	>=xfce-base/libxfce4util-4.12:=
-	policykit? (
-		>=sys-auth/polkit-0.112
-		!systemd? ( sys-auth/consolekit )
-		)
-	xfce_plugins_power? ( >=xfce-base/xfce4-panel-4.12:= )"
-RDEPEND="${COMMON_DEPEND}
-	networkmanager? ( net-misc/networkmanager )"
-DEPEND="${COMMON_DEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig
-	x11-proto/xproto"
-
-pkg_setup() {
-	XFCONF=(
-		$(use_enable policykit polkit)
-		$(use_enable networkmanager network-manager)
-		$(use_enable xfce_plugins_power xfce4panel)
-		$(xfconf_use_debug)
-		)
-
-	DOCS=( AUTHORS NEWS README TODO )
-}
diff --git a/xfce-extra/xfce4-pulseaudio-plugin/Manifest b/xfce-extra/xfce4-pulseaudio-plugin/Manifest
index 5f0425400880..e9d7aa0c38ec 100644
--- a/xfce-extra/xfce4-pulseaudio-plugin/Manifest
+++ b/xfce-extra/xfce4-pulseaudio-plugin/Manifest
@@ -1,7 +1,5 @@
 DIST xfce4-pulseaudio-plugin-0.3.4.tar.bz2 400380 BLAKE2B b8cd4df84f3119d90a7671d8217eaeb83025206d9bfdc5aaae2281cd7c9b13ab03fa8a99ff1eb352f2fa01e889bcd3a505b558ce9884c46b1136bc75a6fb22e7 SHA512 2dfa6a4567caeb2f336b1d9e32cedb5f03e363253549810e768bb51746cd1db362ebd0990098e461a71b8206d81ff877291860a3568a288fe2010498ad486c78
-DIST xfce4-pulseaudio-plugin-0.3.5.tar.bz2 390084 BLAKE2B a43ac67d83cfa113a3429c2fd0e2de1879f9fb9856e136606140ce08d0e70b44ec2cd17a588240edab5609ff8735ee05f7da2314f925205c4aff1b8f574eb767 SHA512 6cfef82b7ca0b2301638c2756f71f7ac03d83c92f3dc40fd24896d1e7879dbab2bd828a66dab1c659a5d93dc63bf505d9ef75094c2588cafd85ba66d202434a5
 DIST xfce4-pulseaudio-plugin-0.4.0.tar.bz2 391068 BLAKE2B c06b05fbb910e7a1d13fde976f6b8b3f0d22de43223bdc8472440c52868cf1f3f37359a81c96efb2644ba202382cb53c2780214d3fe1af7977ec2e9d2f5e8c19 SHA512 28e2185ffea3f6e3e7d07e0cdd5062d423dddb2f7ee4a1e2f2965d4bf65e11cd0a409403ffb7d6afd89206dc37cf5700430ad6a53967395e3a58dde6dd13503f
 EBUILD xfce4-pulseaudio-plugin-0.3.4.ebuild 1458 BLAKE2B d6ce8d514962111c43f3fc76769dbc2bc1d66e7534c5f4024151130e546c1b411f354889356a9983f28bcf223d381986c6754db9c78f8585a80225949d113ff2 SHA512 5543f10522817ea44c0ac42f8944f7e837bb0647652a5217dc3d2400a02879347bf2299ecd15eea2b9cd8e8fc5f3c66927ac9c1b916819fd0f3ffc0d1bd00a90
-EBUILD xfce4-pulseaudio-plugin-0.3.5.ebuild 1460 BLAKE2B 54a7cb17c1c53eaa5c140f5e5d033cf1cded917799a942f160e559c53586670c6e43122bdb7ded231af69feb03345fdf263bda43ff35d28d806a4fc2f517ff97 SHA512 30e137593af98c53b0c3f0c96f9d230a20e4ba4cdb4c3aabc47b141494b5c7678601d89c8f59c8ef8248c4b90daac99af27aa2e956502203ccdd6d60fca6ce22
 EBUILD xfce4-pulseaudio-plugin-0.4.0.ebuild 1460 BLAKE2B 54a7cb17c1c53eaa5c140f5e5d033cf1cded917799a942f160e559c53586670c6e43122bdb7ded231af69feb03345fdf263bda43ff35d28d806a4fc2f517ff97 SHA512 30e137593af98c53b0c3f0c96f9d230a20e4ba4cdb4c3aabc47b141494b5c7678601d89c8f59c8ef8248c4b90daac99af27aa2e956502203ccdd6d60fca6ce22
 MISC metadata.xml 586 BLAKE2B 57900ad6e29515182780ef646d7861d3858150ab61861bf70c1a106221e20d7ca93f7bfd36e4337204a0abe32e515f60affae94342b6b76cdf6d34815e0130d8 SHA512 63bb2c2bd9a71f8d53f17cf5894039afb4592d8b5687e6daa4485a566464e3fe4f5ca45306409547f7d828488242fd760ddaa0587733f69067717ceffabba05e
diff --git a/xfce-extra/xfce4-pulseaudio-plugin/xfce4-pulseaudio-plugin-0.3.5.ebuild b/xfce-extra/xfce4-pulseaudio-plugin/xfce4-pulseaudio-plugin-0.3.5.ebuild
deleted file mode 100644
index 4dcbd980caaf..000000000000
--- a/xfce-extra/xfce4-pulseaudio-plugin/xfce4-pulseaudio-plugin-0.3.5.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils
-
-DESCRIPTION="A panel plug-in for PulseAudio volume control"
-HOMEPAGE="https://git.xfce.org/panel-plugins/xfce4-pulseaudio-plugin/"
-SRC_URI="mirror://xfce/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86"
-IUSE="debug keybinder libnotify wnck"
-
-RDEPEND=">=dev-libs/glib-2.42.0:=
-	media-sound/pulseaudio:=
-	>=x11-libs/gtk+-3.20.0:3=
-	>=xfce-base/libxfce4ui-4.11.0:=[gtk3(+)]
-	>=xfce-base/libxfce4util-4.9.0:=
-	>=xfce-base/xfce4-panel-4.11.0:=
-	>=xfce-base/xfconf-4.6.0:=
-	keybinder? ( dev-libs/keybinder:3= )
-	libnotify? ( x11-libs/libnotify:= )
-	wnck? ( x11-libs/libwnck:3= )"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig"
-
-src_configure() {
-	local myconf=(
-		$(use_enable keybinder)
-		$(use_enable libnotify)
-		$(use_enable wnck)
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-
-	if ! has_version media-sound/pavucontrol; then
-		elog "For the 'audio mixer...' shortcut to work, you need to install"
-		elog "an external mixer application. Please either install:"
-		elog
-		elog "	media-sound/pavucontrol"
-		elog
-		elog "or specify another application to use in the 'Properties' dialog."
-	fi
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/xfce-extra/xfce4-smartbookmark-plugin/Manifest b/xfce-extra/xfce4-smartbookmark-plugin/Manifest
index 729e0cb9b752..0ad9e0023817 100644
--- a/xfce-extra/xfce4-smartbookmark-plugin/Manifest
+++ b/xfce-extra/xfce4-smartbookmark-plugin/Manifest
@@ -1,5 +1,3 @@
-DIST xfce4-smartbookmark-plugin-0.4.6.tar.bz2 280664 BLAKE2B 0eb13f460c1018b576298ae3b835893fb546d20f99448eada34a05000208bf173ac7125cb819c59cd9cf5ed28b3bf8214d256c72961a908fded9daaef7e46641 SHA512 1d08b26761189d5e3b9d6a3e7f8a6bad8b73cc48ecf6d41c675bb13cc1074f48aca94e953b8d6cc97259c64c4f9f0aca9f0b0680fc4c6a9f01b13898175a5645
 DIST xfce4-smartbookmark-plugin-0.5.0.tar.bz2 280988 BLAKE2B 783d495aae351454abf1a3d9bd43c0656baf7ff94bf3015ad300a103cd17eccfdae13385b025d293bd9d7a65b37c0a19aebf3cbca8276ce36d1e41287359d62c SHA512 0514a1159cb5218af73d28897a218c369a64b9c3a7c286c0bf45ad404773ccaa49af5c8b0492e38f56f8089a2ec79b0434de93388d960b993ad67cecef5315cc
-EBUILD xfce4-smartbookmark-plugin-0.4.6.ebuild 932 BLAKE2B a2defafaf5d9bc563eed84b049f9542b3805d2e9f498d81567c5fb4e0a6bf873f5e2bc9268fd417609e9dd48babb378fc34842fba022ad27ea75c4cd05857f13 SHA512 347f182c79f5dd6c63fa98d67fb9bfba84c35f006ce708fb8f7f1046d9664921d1c9366f0b65f42f1cc0148cf1f502a589096a5d6e62096f7d62c04af058010e
 EBUILD xfce4-smartbookmark-plugin-0.5.0.ebuild 1107 BLAKE2B aa69ffb82fa46fc74ae27727a98e634099bbdc1d379135ced448c1085fe069d607666e4786b0e0ae76d48864b6caa0776d45d428693a727623f8808ea2db394b SHA512 1e9b860528efcf0050bd40a98bd3d7bffb74e7e2e6cf71c466f46744875697989cd7ee22179cbf678bf830c990fa9cf6d445939cc103741560efbf8b838c127a
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-smartbookmark-plugin/xfce4-smartbookmark-plugin-0.4.6.ebuild b/xfce-extra/xfce4-smartbookmark-plugin/xfce4-smartbookmark-plugin-0.4.6.ebuild
deleted file mode 100644
index 5956ffea6e03..000000000000
--- a/xfce-extra/xfce4-smartbookmark-plugin/xfce4-smartbookmark-plugin-0.4.6.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit xfconf
-
-DESCRIPTION="Smart bookmark plug-in for the Xfce desktop environment"
-HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-smartbookmark-plugin"
-SRC_URI="mirror://xfce/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-COMMON_DEPEND="x11-libs/gtk+:2=
-	x11-libs/libX11:=
-	>=xfce-base/libxfce4ui-4.10:=
-	>=xfce-base/xfce4-panel-4.10:="
-RDEPEND="${COMMON_DEPEND}
-	>=xfce-base/exo-0.8"
-DEPEND="${COMMON_DEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-pkg_setup() {
-	XFCONF=(
-		$(xfconf_use_debug)
-		)
-
-	DOCS=( AUTHORS ChangeLog NEWS README )
-}
-src_prepare() {
-	sed -i -e '/bugs/s:debian:gentoo:' src/smartbookmark.c || die
-	xfconf_src_prepare
-}
diff --git a/xfce-extra/xfce4-statusnotifier-plugin/Manifest b/xfce-extra/xfce4-statusnotifier-plugin/Manifest
index b65cc7e63cab..e75052ea7992 100644
--- a/xfce-extra/xfce4-statusnotifier-plugin/Manifest
+++ b/xfce-extra/xfce4-statusnotifier-plugin/Manifest
@@ -1,5 +1,3 @@
-DIST xfce4-statusnotifier-plugin-0.2.0.tar.bz2 379900 BLAKE2B 0b3955d2fd512856845326a05176fded0a844f58bfd1d5daa30e869228ae707186594c2526a25c912f62a864a9941998a3981603194dd9d8f73566474e4e736d SHA512 5e19e29bffc92be0e501c59b35376a59fb2946e270d3db67e620c7c5efdf455cebc235d0e87a518abed15d42be236eb7f7c14013f073956d71aa7b575f2f9374
 DIST xfce4-statusnotifier-plugin-0.2.1.tar.bz2 384119 BLAKE2B e8035750c8d376569d3694340c8630af3032da19e684adb374fbb79379d523a293b78b98d3c61601a0abe3639125106a56e976d8e0fe0b60244569593a087384 SHA512 508614543716a64f2fd45909c4a2acfbd4f41f9e494a48b97dd51a83171eec44811a8a2925d39ba8a5b5dba1f9faedddade0e5b7bf2ae08f494954637cf2209f
-EBUILD xfce4-statusnotifier-plugin-0.2.0.ebuild 868 BLAKE2B 22afb3ab043a608b3d0e692f535f9a939ffe846fdb8f545ea81f635a555d505813f1c9c7281abeaced1f5bca0288666a1ae745a6bc23a32450a0d17d148283f9 SHA512 300678898f3805c9051ec91330f04daf4d2cb37fdd6b08872390f94e701d222a9344f4813e33019be2cdf7da61b16ce480cf6e064eefc56fdb6ed5f31acabe00
 EBUILD xfce4-statusnotifier-plugin-0.2.1.ebuild 868 BLAKE2B 22afb3ab043a608b3d0e692f535f9a939ffe846fdb8f545ea81f635a555d505813f1c9c7281abeaced1f5bca0288666a1ae745a6bc23a32450a0d17d148283f9 SHA512 300678898f3805c9051ec91330f04daf4d2cb37fdd6b08872390f94e701d222a9344f4813e33019be2cdf7da61b16ce480cf6e064eefc56fdb6ed5f31acabe00
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-statusnotifier-plugin/xfce4-statusnotifier-plugin-0.2.0.ebuild b/xfce-extra/xfce4-statusnotifier-plugin/xfce4-statusnotifier-plugin-0.2.0.ebuild
deleted file mode 100644
index 01a0cd1f11aa..000000000000
--- a/xfce-extra/xfce4-statusnotifier-plugin/xfce4-statusnotifier-plugin-0.2.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils
-
-DESCRIPTION="A panel area for fd.o Status Notifiers (systray replacement)"
-HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-statusnotifier-plugin"
-SRC_URI="mirror://xfce/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="
-	>=dev-libs/glib-2.24:=
-	>=dev-libs/libdbusmenu-16.04.0:=[gtk3]
-	>=x11-libs/gtk+-3.18:3=
-	x11-libs/libX11:=
-	>=xfce-base/libxfce4ui-4.12:=
-	>=xfce-base/libxfce4util-4.12:=
-	>=xfce-base/xfce4-panel-4.12:=
-	>=xfce-base/xfconf-4.12:="
-DEPEND="${RDEPEND}
-	dev-util/gdbus-codegen"
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/xfce-extra/xfce4-systemload-plugin/Manifest b/xfce-extra/xfce4-systemload-plugin/Manifest
index 9e42b1669cab..70f12d907aaf 100644
--- a/xfce-extra/xfce4-systemload-plugin/Manifest
+++ b/xfce-extra/xfce4-systemload-plugin/Manifest
@@ -1,5 +1,3 @@
-DIST xfce4-systemload-plugin-1.1.2.tar.bz2 305948 BLAKE2B 952a7da2d2d32d6b5afb17b5958cf079e9a788b324cd39e935894e0e0faf2700143a00e56c0545ccda0df01fe0bc74b0b509827447ab7129962f10571a9ffc8e SHA512 4d2216a707991ca17e7a935a6836a5b4236c1ab38e1738a57f754d63aca3d183802e5e530563a6e31c754ba6e4cd225742b4f23170acb07277f18eaee682fd31
 DIST xfce4-systemload-plugin-1.2.1.tar.bz2 328136 BLAKE2B 0476c6e89be950a89f54d6d4fce0cfd0b4781520edb76e4280341f1f2c34e13ab54d68a84175524dd6877242da128c409f749c2c94ea6357dc453ed3c4da449d SHA512 01e57d799731a5860f043339ff0e90e0967ac1bda91d9f500d657ea14f3a52f31d9dd68ef5293f7941ef93e26e48af72de22aef976d0ccd497c62096e1aaf0b9
-EBUILD xfce4-systemload-plugin-1.1.2.ebuild 853 BLAKE2B 632610ed2389cd999a7ce61fbfdd9639eaff06e6264db17c39726d854328d4f0d9344ab4033de9a4c01ca88ce828df8a620ed3085f896e39125e2b842d380033 SHA512 98859f6620caf4f74831dc45413a62152cdfce91d44603ccda637116086a033a41aeff0866da262efcf89deb19d717de1e30f550cac2e100ac5a53a912d36cff
 EBUILD xfce4-systemload-plugin-1.2.1.ebuild 1047 BLAKE2B c032738e3c810691ae861a536f3f244ac59e0b80eb627c31d5861ed4e6eef5c2a6651a52df7529296429e68516b9c1f43d4c6f8cef9fae4985ef10855eb382ce SHA512 023f8ec82ea381476792bea8624217df53450a095d8a96265a2ffc9339732dab94c5e05966eaa39fa8ad0c4d17943b3cbab23bfacb975143a0005f52296d4091
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-systemload-plugin/xfce4-systemload-plugin-1.1.2.ebuild b/xfce-extra/xfce4-systemload-plugin/xfce4-systemload-plugin-1.1.2.ebuild
deleted file mode 100644
index 657592156570..000000000000
--- a/xfce-extra/xfce4-systemload-plugin/xfce4-systemload-plugin-1.1.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit xfconf
-
-DESCRIPTION="System load plug-in for Xfce panel"
-HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-systemload-plugin"
-SRC_URI="mirror://xfce/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug upower"
-
-RDEPEND=">=x11-libs/gtk+-2.6:2=
-	>=xfce-base/libxfce4ui-4.10:=
-	>=xfce-base/libxfce4util-4.10:=
-	>=xfce-base/xfce4-panel-4.10:=
-	upower? ( || ( >=sys-power/upower-0.9.23 sys-power/upower-pm-utils ) )"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig"
-
-pkg_setup() {
-	XFCONF=(
-		$(use_enable upower)
-		$(xfconf_use_debug)
-		)
-
-	DOCS=( AUTHORS ChangeLog NEWS README )
-}
diff --git a/xfce-extra/xfce4-taskmanager/Manifest b/xfce-extra/xfce4-taskmanager/Manifest
index 40da0b07550d..755f86cd4e10 100644
--- a/xfce-extra/xfce4-taskmanager/Manifest
+++ b/xfce-extra/xfce4-taskmanager/Manifest
@@ -1,8 +1,3 @@
-AUX xfce4-taskmanager-1.0.0-UTF-8.patch 675 BLAKE2B e1f4799a479b14ae9ef622ee7b9d070b4d1642b0028d5518e67cfdeadcb31afb7442f53537042476c7064534d5f5476fcf9fc29dfc0f8157d759043520aeffe2 SHA512 3c910bcb92a9d3d746d6d8fb0d1521f76b688f4847459347091ebb197d9172b4cb355913e58a836d9474d6b35361a6359e33ae88f19f3ffb8078a4bec134a9da
-DIST xfce4-taskmanager-1.0.1.tar.bz2 368495 BLAKE2B 24b7da6538f4db0370277dd201f2358032bb583e3ffdbeaf7c9011baf2383538455452b60d7ad101ccff15af519e2edaa0db3b051fd53b59299d6607eea4ca8d SHA512 2108a31738c9d544537b830de1089b776272333fa8599cbdf0598cca5af5ec312139ad52137902baa98ebf6c5167fb1ab62b34d7b790b539d01bbe40023411e5
-DIST xfce4-taskmanager-1.1.0.tar.bz2 365866 BLAKE2B a4f3df72e06f4333ecf189720aa94980cd89ae4fa48f17eeaf683339a2e27070c9ad606eb29a03a18d476af601d5a37bb778d93bd3eeac9a195eda6a6e37334b SHA512 a7b1d1a6836f89747c873c87e495830438cf3093fd044c43c951abca6a82ab2c0ae9a41eba89d570a83f41fb6ad447c9c4fc578930684c981fbe45de19e1d7f8
 DIST xfce4-taskmanager-1.2.0.tar.bz2 435276 BLAKE2B 857494cedf5f6a43280379f1468ce55acaddac51e8e73a02a59bf96148fffa18a20da8a55099b404eb073fb971d7bb72bb597fc7089d0927d9219a76cadfd460 SHA512 45a496dc406eb825b9829a9cd0b76250566df0bf57dd39413112512209936b52cd3271fd1933dd972582178d897ef40ab8e106b2980db6963d29373940fdcc2d
-EBUILD xfce4-taskmanager-1.0.1.ebuild 801 BLAKE2B 85288e7d7b5f14e165f7286166c991be45e0a09ad0093afd61caa5fda0617a30ac374f2064e6bf2ae28a57b1c19781854f3630de8153a4e1683c22b396b15e30 SHA512 ed931c60bf28e534e6d536ff9d6cc5debf985e6f7c60cde1713fb13429f7f71a617ddf8bd911152c0d552b112b0d12e6d38f6d281ef2e785348fb5bef5f14a94
-EBUILD xfce4-taskmanager-1.1.0.ebuild 989 BLAKE2B 8a91c15d90bb833139bdfa590618df5997165ed643b91a8ee6c530bc345da35d700f708eaccd4d03f7051c945b5a67291051119df38fa175d480177be29ad83c SHA512 8c54e7f3bb99b30b692613c9f66411c1d93849bb8431ab8f6a2d2da655beaf32f68ec563e4c6900f176c6a538ed4eb5092f436321860cd25f79e9eefd4e47493
 EBUILD xfce4-taskmanager-1.2.0.ebuild 957 BLAKE2B 8cc67da954bc7c1664b985e5a27df3682036a48845e54e2b827179d6929a8274aa873c9ff452ba026ef02c146deb0b8c40942e0a6ed9ad43762f0169ab720390 SHA512 113f96f2be85c0ca4fdbff11666351b1e0e3a4545896aafdb51444f0b0fe4ff6d84c1459f3aa8a648948776a603236c67a18dddd98e35d15c24607898b1b55d3
-MISC metadata.xml 437 BLAKE2B fabc65bc5f44fa600a6e8a8747cf6097f836f59ed0b84e2cc627f88248ed0cdc63cba1c5fdee16c36d932933eb4757664ac71e55649f1b7e2787821516a7cfcb SHA512 27849e86e4b6e8b57e69204b59b7aab8527d8e17b1edd7c08ae7ca3e215b0f64eae92fa6f6858b1b576513fbbfdf854dbdb0fbd40760e64f245be246a11c3d22
+MISC metadata.xml 310 BLAKE2B 72a1b36cc0a16c67ca5492863c4be9e014b5507b5ae54753adb63bc2e73720555fdb1c427ea346124541a8df64a4cda01cd1f5c492367c733ec4f33874fa4b1c SHA512 758e1edfe2d12b46877c27c2d7c52aaadce97e9fc6106a43be179ff53316ec0edab226ec1a69860081ad9491e52d5eee558bbdb5de078f0bcecdcf32b56168f0
diff --git a/xfce-extra/xfce4-taskmanager/files/xfce4-taskmanager-1.0.0-UTF-8.patch b/xfce-extra/xfce4-taskmanager/files/xfce4-taskmanager-1.0.0-UTF-8.patch
deleted file mode 100644
index a43e77f85f5c..000000000000
--- a/xfce-extra/xfce4-taskmanager/files/xfce4-taskmanager-1.0.0-UTF-8.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-http://bugs.gentoo.org/488626
-http://bugzilla.xfce.org/show_bug.cgi?id=10417
-
---- src/task-manager-linux.c
-+++ src/task-manager-linux.c
-@@ -128,7 +128,7 @@
- 	FILE *file;
- 	gchar filename[96];
- 	gint i;
--	gchar c;
-+	gint c;
- 
- 	snprintf (filename, 96, "/proc/%i/cmdline", task->pid);
- 	if ((file = fopen (filename, "r")) == NULL)
-@@ -136,7 +136,7 @@
- 
- 	/* Read full command byte per byte until EOF */
- 	for (i = 0; (c = fgetc (file)) != EOF && i < (gint)sizeof (task->cmdline) - 1; i++)
--		task->cmdline[i] = (c == '\0') ? ' ' : c;
-+		task->cmdline[i] = (c == '\0') ? ' ' : (gchar)c;
- 	task->cmdline[i] = '\0';
- 	if (task->cmdline[i-1] == ' ')
- 		task->cmdline[i-1] = '\0';
-
diff --git a/xfce-extra/xfce4-taskmanager/metadata.xml b/xfce-extra/xfce4-taskmanager/metadata.xml
index 3211925b8a90..6628a8203ecf 100644
--- a/xfce-extra/xfce4-taskmanager/metadata.xml
+++ b/xfce-extra/xfce4-taskmanager/metadata.xml
@@ -6,7 +6,6 @@
 		<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>
diff --git a/xfce-extra/xfce4-taskmanager/xfce4-taskmanager-1.0.1.ebuild b/xfce-extra/xfce4-taskmanager/xfce4-taskmanager-1.0.1.ebuild
deleted file mode 100644
index cf2beeb81754..000000000000
--- a/xfce-extra/xfce4-taskmanager/xfce4-taskmanager-1.0.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit xfconf
-
-DESCRIPTION="Task Manager"
-HOMEPAGE="https://goodies.xfce.org/projects/applications/xfce4-taskmanager"
-SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug gksu"
-
-RDEPEND="x11-libs/cairo
-	>=x11-libs/gtk+-2.12:2
-	x11-libs/libwnck:1
-	gksu? ( x11-libs/libgksu:2 )"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-pkg_setup() {
-	PATCHES=(
-		"${FILESDIR}"/${PN}-1.0.0-UTF-8.patch
-		)
-
-	XFCONF=(
-		--enable-wnck
-		$(use_enable gksu)
-		$(xfconf_use_debug)
-		)
-
-	DOCS=( AUTHORS ChangeLog NEWS README THANKS )
-}
diff --git a/xfce-extra/xfce4-taskmanager/xfce4-taskmanager-1.1.0.ebuild b/xfce-extra/xfce4-taskmanager/xfce4-taskmanager-1.1.0.ebuild
deleted file mode 100644
index 8ade79ccd151..000000000000
--- a/xfce-extra/xfce4-taskmanager/xfce4-taskmanager-1.1.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit xfconf
-
-DESCRIPTION="Task Manager"
-HOMEPAGE="https://goodies.xfce.org/projects/applications/xfce4-taskmanager"
-SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug gksu gtk3"
-
-RDEPEND="x11-libs/cairo:=
-	gtk3? (
-		x11-libs/gtk+:3=
-		x11-libs/libwnck:3=
-	)
-	!gtk3? (
-		>=x11-libs/gtk+-2.12:2=
-		x11-libs/libwnck:1=
-		gksu? ( x11-libs/libgksu:2= )
-	)"
-# GTK+2 is required unconditionally
-# https://bugzilla.xfce.org/show_bug.cgi?id=11819
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	>=x11-libs/gtk+-2.12:2=
-	virtual/pkgconfig"
-REQUIRED_USE="gksu? ( !gtk3 )"
-
-pkg_setup() {
-	XFCONF=(
-		--enable-wnck
-		$(use_enable gtk3)
-		$(use_enable gksu)
-		$(xfconf_use_debug)
-		)
-
-	DOCS=( AUTHORS ChangeLog NEWS README THANKS )
-}
diff --git a/xfce-extra/xfce4-volumed-pulse/Manifest b/xfce-extra/xfce4-volumed-pulse/Manifest
index 92ff96c43606..38b878194a20 100644
--- a/xfce-extra/xfce4-volumed-pulse/Manifest
+++ b/xfce-extra/xfce4-volumed-pulse/Manifest
@@ -1,7 +1,5 @@
-DIST xfce4-volumed-pulse-0.2.0.tar.bz2 282403 BLAKE2B 801ee03f7517f5235eaa45c2ee6eafd911c98bbee1cc5bea5d84e181ea52c5fe17741192fb10b5471f900eb254293990efcdc77fc71d0374c844165e9f3d1b18 SHA512 efa5bcb3558eda0b36f2bf0b737409571f69af7454f542a3dbd777e94d40b3f0107567d3fea3fc019b3eb77450b2bebde7aff8b72b0c30d2afd9a316e6ea77a6
 DIST xfce4-volumed-pulse-0.2.2.tar.bz2 312703 BLAKE2B 6c88c8f4023f5200c7b5b976ee4fff94344913f313ede29334d3f3b291d6862f56fa11e22a90c79019bcc137e1c77feac84ad14d067f4ce13c86ce58484480ea SHA512 6e452a603ca19b8fc8470851ed9570c84a8208bc7695493cc8ad6425ce6176427a264e39c5249767fe93bdb172137a0c59ef858336f28a574e74bce8d9d35bb6
 DIST xfce4-volumed-pulse-0.2.3.tar.bz2 308063 BLAKE2B e64d2e668bf1a6666ce82ac4f03852abfb0346936a789ce7f89acde1734af948f628ca3c17d515e72ab292fc86525623b8aa0b4a219555d7b8729cee10889142 SHA512 da190cea2b3993717f35e1ded058613df99f8fa223a90d379d95dff0bc9d44f4fba15bd23ff1b54f11218d20518092d14a2f2b808d4984673d3bb77616c2f3e3
-EBUILD xfce4-volumed-pulse-0.2.0.ebuild 740 BLAKE2B aee0e794e97c93ef35c8d1207a59f59b804cee6880fa6bae2b0ed94279a39ad867e26e784df0779a76e77fb852035f9b487e3af35619c8680b1785d307f4d282 SHA512 79a9fe36853edf9c054a8f3c35e9b0a38b6315c6f3f8f5cb042e3e120c72a0ab727843f7b293d45f5a806555880c0e819614012b78612a697c2fa5ae747cfdc9
 EBUILD xfce4-volumed-pulse-0.2.2.ebuild 744 BLAKE2B 3d8c2e9327b900a25d836b1419ae5b05eefcedbe11571cfa7d9ee8cb41995c8d52f8feb821da0190a5f31d0e86cfa787af17ff42d5d4d9828c000ec388f4ac96 SHA512 61f7c0e4bcb0a14f1d1625c314878e73b6e369433e9158c31d76334035ff89051315f5260e8f86448324b34290a720241a57f2da1007349119e70195ad37a06a
 EBUILD xfce4-volumed-pulse-0.2.3.ebuild 692 BLAKE2B 1f42c586f4e587643c3423b19bb72212d7c99903880a5a67906d3def07897882371934f1921de700b58c8bae69bfa451ecdfd9a7e978c3b3004ae3b83f6debf5 SHA512 d22075dda97e85452cffc80c7a0a5c76b5bbd30f1fa0f4489b68b1d3ae8ba9c40b0aaceec61bf742581b7b635a4dab76a7f0ebf88e36e006802b6fee3d7f8138
 MISC metadata.xml 338 BLAKE2B 61f4640af586e5f992a5d01ee70a9179276a0e3616498d99043d0f3e6e1a6335f50586a61151b2e2a1e946d2c00a598241c9bf23b13c6fe7333054bc326ef310 SHA512 ac7c6bcb04426f25914c331e4f670839e0ba5d4e385f2478387629a7bbf6995254f44cd75516be2d1324fa5f7a98ad000144c7c6fee1582a381c28b280baa2f8
diff --git a/xfce-extra/xfce4-volumed-pulse/xfce4-volumed-pulse-0.2.0.ebuild b/xfce-extra/xfce4-volumed-pulse/xfce4-volumed-pulse-0.2.0.ebuild
deleted file mode 100644
index 5b9de82d1c1c..000000000000
--- a/xfce-extra/xfce4-volumed-pulse/xfce4-volumed-pulse-0.2.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit xfconf
-
-DESCRIPTION="Daemon to control volume up/down and mute keys for pulseaudio"
-HOMEPAGE="https://launchpad.net/xfce4-volumed-pulse"
-SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug libnotify"
-
-RDEPEND=">=dev-libs/glib-2.16
-	dev-libs/keybinder:0
-	>=media-sound/pulseaudio-0.9.19[glib]
-	>=x11-libs/gtk+-2.20:2
-	>=xfce-base/xfconf-4.8
-	libnotify? ( x11-libs/libnotify )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-pkg_setup() {
-	XFCONF=(
-		$(use_enable libnotify)
-		$(xfconf_use_debug)
-		)
-
-	DOCS=( AUTHORS ChangeLog README THANKS )
-}
diff --git a/xfce-extra/xfce4-wavelan-plugin/Manifest b/xfce-extra/xfce4-wavelan-plugin/Manifest
index be456103bf06..cca51d6332a9 100644
--- a/xfce-extra/xfce4-wavelan-plugin/Manifest
+++ b/xfce-extra/xfce4-wavelan-plugin/Manifest
@@ -1,5 +1,3 @@
-DIST xfce4-wavelan-plugin-0.5.12.tar.bz2 302148 BLAKE2B 731889b28bc7811ba6a6ef41a667dcd8744d7c795334fcf920189080d990dbadff3e6bd4ad11d7049ba69e80d821bb6fc5ed24f2538a0081801c9aee64213d3a SHA512 a25c6c576c5f8a76bb595137cf92fb6e18c7f5807bbe203d11cafdcbfdb9f6a4d8b7fd2322f448dab307eeb5067d44d1e41393b4aeb71fc1f0deca72af7c67cd
 DIST xfce4-wavelan-plugin-0.6.0.tar.bz2 303220 BLAKE2B ce2a8fe3f8cb6ef312459ae73d2cde1a87052a5a9b45e06795937656bf926ff3f8dd73ad0e8d1770d6ded7761cbc787b21ef0ca1b04580ab3dd4961453ae0ef3 SHA512 50dd069902d69071f0d4ab7036fa451ae6cdaca9fbeb56255d58a5864d4e4b3749267b1cc4b411e1073daac9678554f3d483d30aba759ef161425ba3cdd0306e
-EBUILD xfce4-wavelan-plugin-0.5.12.ebuild 806 BLAKE2B 26b1fea4b7ab71545e8bf34bd28535f44f44afa600125d7776d54f6384e9cd61e1c1b86b062a0c85f36f328424f873fc024dd3a085171b779030251f18f44b26 SHA512 c9cdc725825eb76b7da6396590069d5fc04e703d026b489619089d6fea960cd960fc4c712735055124bee7efe34b93127e302dc36b8b0a22faebb16444830042
 EBUILD xfce4-wavelan-plugin-0.6.0.ebuild 1001 BLAKE2B 05878553138c43195eb0a5c836af0d0af38af9c81e1ea56b801840f56e458898592d4296fc057186c4ee60eaf712853109d9b00c5ef55cdbdf0088659075b594 SHA512 a4555728aa667f606c88d3cff280cdfb14c60ce24aa3e070894e6e689f3379a643f7514a01801d4777c311040b31c90ada237fc6629a3f2a73db3f9516e33041
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-wavelan-plugin/xfce4-wavelan-plugin-0.5.12.ebuild b/xfce-extra/xfce4-wavelan-plugin/xfce4-wavelan-plugin-0.5.12.ebuild
deleted file mode 100644
index 54a2b52d1ed3..000000000000
--- a/xfce-extra/xfce4-wavelan-plugin/xfce4-wavelan-plugin-0.5.12.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit xfconf
-
-DESCRIPTION="A panel plug-in to display wireless interface statistics"
-HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-wavelan-plugin"
-SRC_URI="mirror://xfce/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86"
-IUSE="debug kernel_linux"
-
-COMMON_DEPEND=">=xfce-base/libxfce4ui-4.8:=
-	>=xfce-base/libxfce4util-4.8:=
-	>=xfce-base/xfce4-panel-4.8:="
-RDEPEND="${COMMON_DEPEND}
-	kernel_linux? ( sys-apps/net-tools )"
-DEPEND="${COMMON_DEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-pkg_setup() {
-	XFCONF=(
-		$(xfconf_use_debug)
-		)
-
-	DOCS=( AUTHORS ChangeLog NEWS README THANKS )
-}
diff --git a/xfce-extra/xfce4-weather-plugin/Manifest b/xfce-extra/xfce4-weather-plugin/Manifest
index c2372a9a9e4c..ea6401ebe72d 100644
--- a/xfce-extra/xfce4-weather-plugin/Manifest
+++ b/xfce-extra/xfce4-weather-plugin/Manifest
@@ -1,7 +1,3 @@
 DIST xfce4-weather-plugin-0.8.10.tar.bz2 2991350 BLAKE2B c3c71952a196d49068bac9c1de0695d2845db6931cfe220caf5ebb88919eb40fa0fc9c9a6dc640adbd82fa284449daf6ac537aaf5d258108083b2e63d8288610 SHA512 e40f794e824cc48038ece0c1336eed21b2e28091b86a4b76099c092c2e45abc5041d010d286f64fc483e8ad7c496127152df86330187afbd0872506d89f37c35
-DIST xfce4-weather-plugin-0.8.8.tar.bz2 2979971 BLAKE2B fbbf73f5f7f9283a55abf306d62b83ba36579728cc32c129fcbb028c2f0e3a10f385645567ccf342737506570100d22802573079236303c1a45215bcfc58479f SHA512 98e35d11bc57edf926228d7da2c5fbd4320f9dce0ff4fab232b81a98f4ff979c80575c077b9ffb161c54bf81f5da400b518838be881fbea82e5b1c37cae2c01a
-DIST xfce4-weather-plugin-0.8.9.tar.bz2 2966504 BLAKE2B ecb2003e537535d26c8b6f9de2a2b0e88e459867aa918ad71243b134653ce897e4766beee8d060f1dfd3037bde43305716be3da0bb45bffc13da43422f6dc3c8 SHA512 bcc714bc369f8fe0dbcb2d42e4c99c0208539edf58adcecf5d0fb55ba05e763be9113a8197ed931b99f119ff4e4d54985824c612ba3b613da8b1a7ca717bacfd
 EBUILD xfce4-weather-plugin-0.8.10.ebuild 1078 BLAKE2B e94b1e5c2d7766a38cd3881c6fdbfe536fd853acdd55bad09acc506b1f818640b79fc79c26e8378cf60628a11c1fbc44a8b7e7d51ff4ad96018031ce5f8f7bc9 SHA512 fb1301f1fe1d728566af305eaff0c0961e5252bf96eecaff4b2e2d637d454d31424c6a813ac998cf61e54cf80b3d499e20cacbac55d4228498a5bdc9c156133a
-EBUILD xfce4-weather-plugin-0.8.8.ebuild 974 BLAKE2B 5180fbebbc6a60223ec3f8fbbf989a2916562c64cd2b01787c5ebe6ff83e0118499bb866a54bd5e320d428525714fceeee519f6b5cd2b0acab8e5f36d67007ea SHA512 de192cddfd57364dcd52bde45aed6e8892f7fc362d106e53ae7fa07f7ce8c6ee7ded88dd902d802d6ad864f943867e4a9608da8abed9b7a60ff90a9c3dcd59e5
-EBUILD xfce4-weather-plugin-0.8.9.ebuild 968 BLAKE2B 1a8046a68f41cd29dd6451844819765330d7968b0275d26c437a29ad568084a781929b6f6484107f14dd5a9ed800cb8f74357539c3a55615134c142184b9ec14 SHA512 9de5f364f56098e27a13bf7e09b53f9f6d650c420fab6d78a4ebd6e1c5a05b5e19fe909ec6c82d8aa16d005ceecd8c41bb879cc5bc72d514201adb9512c836ff
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-weather-plugin/xfce4-weather-plugin-0.8.8.ebuild b/xfce-extra/xfce4-weather-plugin/xfce4-weather-plugin-0.8.8.ebuild
deleted file mode 100644
index e2f5940b0762..000000000000
--- a/xfce-extra/xfce4-weather-plugin/xfce4-weather-plugin-0.8.8.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit xfconf
-
-DESCRIPTION="A weather plug-in for the Xfce desktop environment"
-HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-weather-plugin"
-SRC_URI="mirror://xfce/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
-IUSE="debug upower"
-
-RDEPEND=">=dev-libs/glib-2.20:=
-	dev-libs/libxml2:=
-	>=net-libs/libsoup-2.32:=
-	>=x11-libs/gtk+-2.14:2=
-	>=xfce-base/libxfce4ui-4.10:=
-	>=xfce-base/libxfce4util-4.10:=
-	>=xfce-base/xfce4-panel-4.10:=
-	upower? ( || ( >=sys-power/upower-0.9.23 sys-power/upower-pm-utils ) )"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig"
-
-pkg_setup() {
-	# For GEONAMES_USERNAME, read README file and ask ssuominen@!
-	XFCONF=(
-		$(use_enable upower)
-		$(xfconf_use_debug)
-		GEONAMES_USERNAME=Gentoo
-		)
-
-	DOCS=( AUTHORS ChangeLog NEWS README TODO )
-}
diff --git a/xfce-extra/xfce4-weather-plugin/xfce4-weather-plugin-0.8.9.ebuild b/xfce-extra/xfce4-weather-plugin/xfce4-weather-plugin-0.8.9.ebuild
deleted file mode 100644
index da90c786d107..000000000000
--- a/xfce-extra/xfce4-weather-plugin/xfce4-weather-plugin-0.8.9.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A weather plug-in for the Xfce desktop environment"
-HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-weather-plugin"
-SRC_URI="mirror://xfce/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE="upower"
-
-RDEPEND=">=dev-libs/glib-2.20:=
-	dev-libs/libxml2:=
-	>=net-libs/libsoup-2.32:=[ssl]
-	>=x11-libs/gtk+-2.14:2=
-	>=xfce-base/libxfce4ui-4.10:=
-	>=xfce-base/libxfce4util-4.10:=
-	>=xfce-base/xfce4-panel-4.10:=
-	upower? ( || ( >=sys-power/upower-0.9.23 sys-power/upower-pm-utils ) )"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog NEWS README TODO )
-
-src_configure() {
-	# For GEONAMES_USERNAME, read README file and ask ssuominen@!
-	local myconf=(
-		$(use_enable upower)
-		GEONAMES_USERNAME=Gentoo
-	)
-	econf "${myconf[@]}"
-}
diff --git a/xfce-extra/xfce4-whiskermenu-plugin/Manifest b/xfce-extra/xfce4-whiskermenu-plugin/Manifest
index 3ca0d54f201b..0e95e5bd4641 100644
--- a/xfce-extra/xfce4-whiskermenu-plugin/Manifest
+++ b/xfce-extra/xfce4-whiskermenu-plugin/Manifest
@@ -1,11 +1,5 @@
-DIST xfce4-whiskermenu-plugin-1.6.0.tar.gz 157826 BLAKE2B abddd888fbbfe6db73e1e24f359c60fc4fc08d2c5bb98596563a710259908b56fbbc32cd98e24928669ce90a771afb683565b395549195b9417923a5e33c5291 SHA512 8515f6decc99aa534653350838b1ffc74c1dd72de9940dfdc631097f666b32f827b1f33527729dccfe70b3de5e6b6c3aad010e8abcced18881f3589a6c860975
-DIST xfce4-whiskermenu-plugin-1.7.4.tar.bz2 163655 BLAKE2B 4fc293ce483fdf5718ad127b419e7830bf9dcedb96a604d37f878db15d925f5b76928d84d2b4f3e695af3b573da7ce2d7fa78c4afdab404b0f238afd906e680a SHA512 f0dfd19b5a797c25a2e0a26bc66cee4ad8b9025c417d4cca8314c29d1699f55d2540cf752e2c06064352785e6fd16187dd940a3701be8148eb435f8ba9aa2daf
 DIST xfce4-whiskermenu-plugin-1.7.5.tar.bz2 164129 BLAKE2B 904cc32ec73ff8984773256e1efe5cf1dc02eba0b6dd76e15ebecd5507ef4c1fff506888ed2cc3d01674a8773ef7a250da6baee26746b6d34d61b8034071e7f5 SHA512 28c0684642577af656ec95b6977f1dc88d81f690125ad42d0022ebde456dc6da02081028f8f80950f40c3e6bea0f6b8e0fefe153e2de6fa9b77d1d5555e4e89c
-DIST xfce4-whiskermenu-plugin-2.1.4.tar.bz2 165973 BLAKE2B 34c2d996cf00cce915ca82c46556e003bf3e88fdd60cc25623ac5467e74b30cb732868f97f856af44e022ffef8b22c0565a8344a939f89085afe17e71083b5a4 SHA512 efec78d6e3df0be89e7c8c4c26d2fe3cb376862510174746afedab7a5ce5122cc476a5f294870b8132bdde6db0c09ba2c81aee01fc00c46d85d23a3bc8cd77fe
 DIST xfce4-whiskermenu-plugin-2.1.5.tar.bz2 166227 BLAKE2B c7e1a460692495a19a76f789ab69c3ce9bff91a4fd6507202cf4e78950b8f29ab2585b5142ecab9d009b3e08fe8161d82c51a442c055f63b7012fd73fa972136 SHA512 54e308b516ef1694f9649578cb8297f830132e456e1f498183074386956873f7f9f6ea8a0167d506086a87ae17acfbfd8a2b34eb6f0acb97f896872f8799b1f1
-EBUILD xfce4-whiskermenu-plugin-1.6.0.ebuild 1148 BLAKE2B ed0aa97fe74950aac4559e134695cb207a8a09cc2c8fecacaf069e5b9ecf7cb43364add12d706cce6b6233bff96e48349b160055a6e97a221915ec1ef0f58764 SHA512 10337438ff4505bc3c6951469d7837ed711d91162658c067e32cad5f94c6c21ddef237809febc2643043688e5bf68d3c0d1f0850c182c0accf88dc8a1623f381
-EBUILD xfce4-whiskermenu-plugin-1.7.4.ebuild 875 BLAKE2B beafadc38ff7e2c21892c69f96dbf896a5709e095c98b8cb3035c110e326aa04bbbb3beea8b22931b63cd89bae0bf268acc001f963b96998d43d29aa0b98a38b SHA512 94307549312e0b6a0ce652c097659f3f989983a5c3f9100569172de0d4f4c21846ce25b6a1048f8728eaf0c7f5637f8f7e4e03983f51e24fea967c52e00e2a01
 EBUILD xfce4-whiskermenu-plugin-1.7.5.ebuild 873 BLAKE2B 6088679e00cd89a08a3693e87c8331bf8552d1fd25fe16f0edc9b284af2008b4e6a21fc57183a2cb02e1c2bf943d11e13f32729c64080f10e892f6211f0f0a01 SHA512 9bab065373adda0f0bb524d2b6226f391e1912d6c766e753ef05bbfba672f04c7db6eec542499f1c521ee95130d3dfb2fd9287e4e47fe72bccfc4de3f37de72e
-EBUILD xfce4-whiskermenu-plugin-2.1.4.ebuild 884 BLAKE2B f93c0b596014583b220d0403048a2b4aab790dea5f428a86aa99dd41c2f145f899e26ac790725dcecf336ac49e9c87292d2b8ce25acbe598f1ea1e60d771fbf7 SHA512 e978abf3ef27c3033588ae173a4286ff38ca263d3cf916369d7c862f381995bdf372b375a31597c63b975aaf67a0119094626ebb5e24fc7e94bc18957ad925a3
 EBUILD xfce4-whiskermenu-plugin-2.1.5.ebuild 884 BLAKE2B f93c0b596014583b220d0403048a2b4aab790dea5f428a86aa99dd41c2f145f899e26ac790725dcecf336ac49e9c87292d2b8ce25acbe598f1ea1e60d771fbf7 SHA512 e978abf3ef27c3033588ae173a4286ff38ca263d3cf916369d7c862f381995bdf372b375a31597c63b975aaf67a0119094626ebb5e24fc7e94bc18957ad925a3
 MISC metadata.xml 2083 BLAKE2B 4e8d91617b37e4f239098a391229bbb4e3a58906e89586b7b3b24459e419bd2a83db41ec0707e5cb1fee21f14f07d98557682566f1776a178baa436874351bec SHA512 8bb378a95fda0f395ce115761dfa52889f1a2d024cca07d0547042c0611b49949c91867d06405812b5048bd49de123bc216802d1193d7b4baf91a598bcd84313
diff --git a/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-1.6.0.ebuild b/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-1.6.0.ebuild
deleted file mode 100644
index 5b28871bf769..000000000000
--- a/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-1.6.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils gnome2-utils
-
-DESCRIPTION="Alternate application launcher for Xfce"
-HOMEPAGE="https://gottcode.org/xfce4-whiskermenu-plugin"
-SRC_URI="https://github.com/gottcode/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-RDEPEND="
-	virtual/libintl:=
-	x11-libs/gtk+:2=
-	xfce-base/exo:=
-	xfce-base/garcon:=
-	xfce-base/libxfce4ui:=
-	xfce-base/libxfce4util:=
-	xfce-base/xfce4-panel:="
-
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-src_prepare() {
-	local i
-	cd po || die
-	if [[ -n "${LINGUAS+x}" ]] ; then
-		for i in *.po ; do
-			einfo "removing ${i%.po} linguas"
-			has ${i%.po} ${LINGUAS} || { rm ${i} || die ; }
-		done
-	fi
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_AS_NEEDED=OFF
-		-DENABLE_LINKER_OPTIMIZED_HASH_TABLES=OFF
-		-DENABLE_DEVELOPER_MODE=OFF
-	)
-
-	cmake-utils_src_configure
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-1.7.4.ebuild b/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-1.7.4.ebuild
deleted file mode 100644
index 6b7617bc915b..000000000000
--- a/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-1.7.4.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils gnome2-utils
-
-DESCRIPTION="Alternate application launcher for Xfce"
-HOMEPAGE="https://gottcode.org/xfce4-whiskermenu-plugin"
-SRC_URI="mirror://xfce/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-RDEPEND="
-	virtual/libintl:=
-	x11-libs/gtk+:2=
-	xfce-base/exo:=
-	xfce-base/garcon:=
-	xfce-base/libxfce4ui:=
-	xfce-base/libxfce4util:=
-	xfce-base/xfce4-panel:="
-
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_AS_NEEDED=OFF
-		-DENABLE_LINKER_OPTIMIZED_HASH_TABLES=OFF
-		-DENABLE_DEVELOPER_MODE=OFF
-	)
-
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.1.4.ebuild b/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.1.4.ebuild
deleted file mode 100644
index be424cde4929..000000000000
--- a/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.1.4.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils gnome2-utils
-
-DESCRIPTION="Alternate application launcher for Xfce"
-HOMEPAGE="https://gottcode.org/xfce4-whiskermenu-plugin"
-SRC_URI="mirror://xfce/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-RDEPEND="
-	virtual/libintl:=
-	x11-libs/gtk+:3=
-	>=xfce-base/exo-0.11.0:=
-	xfce-base/garcon:=
-	xfce-base/libxfce4ui:=
-	xfce-base/libxfce4util:=
-	xfce-base/xfce4-panel:="
-
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_AS_NEEDED=OFF
-		-DENABLE_LINKER_OPTIMIZED_HASH_TABLES=OFF
-		-DENABLE_DEVELOPER_MODE=OFF
-	)
-
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/xfce-extra/xfce4-xkb-plugin/Manifest b/xfce-extra/xfce4-xkb-plugin/Manifest
index 20d2d7835a2e..93e4e84aa78c 100644
--- a/xfce-extra/xfce4-xkb-plugin/Manifest
+++ b/xfce-extra/xfce4-xkb-plugin/Manifest
@@ -1,7 +1,3 @@
-DIST xfce4-xkb-plugin-0.7.1.tar.bz2 837922 BLAKE2B 9b0d97bf5a3e77ffd29f5b6d5b67a9175343e5ed5331081dea6bbcc4518e70775d7c017e6e151eeced1c49e0d07adbf3b0e9837126284343be5bb0844bd55b8f SHA512 a6d83a614f85ada6470efbca9d19073ecf31e6531dafff000c1c9d439d7e4a6d02188296810933f28f4cf9b61addd1f99a6a47c8adc6423c44adbf7ffa525094
-DIST xfce4-xkb-plugin-0.8.0.tar.bz2 835556 BLAKE2B 61c4c84aec3f9377403231110199a9588573cdcdf7333593bc4701b9435b40d6df5f404537e2d9821bcd8cae33fa80efe8952d1fc8b85f87f61fa74506965362 SHA512 8368b87e4f6459bd3d0c5a805ac1fb191aaf62d18a119f97119b3a1273a23952dcfa5b097542d4e6db645f1509e0a31e0e6152e190e9a2ca32cc61138aca8ded
 DIST xfce4-xkb-plugin-0.8.1.tar.bz2 842814 BLAKE2B be6dfce8e605be346dcd0a5259da980ffd4f7160a808de288bcc7c970c47c678dc6dfde8615e21042142221c6ba66d328dd741f3ce70d988c94562ec061230f2 SHA512 4f0362f429489d111544126697880cdb0a768533803a104f73802fe2c5cfbef5efbf6edd658dbb0ef788ae2a3761f1877c191637a6a06d4a5159bc8f71ad524f
-EBUILD xfce4-xkb-plugin-0.7.1-r1.ebuild 1072 BLAKE2B 1a39ee3f8a0ee4aee3dc6d10091ab79c3eb479068af15192ac31175276a2aba8eff18df8bd058b1cdfeee85e105ae6fefd4bffd1e4f33b827306d0d65bb0cf62 SHA512 f872b2669201d88b3c9118f162c849acb828c9fc644572257539f08bff7da335a8443aa97571a80e11000e971847df9340b0243094b3562590a524448f74673d
-EBUILD xfce4-xkb-plugin-0.8.0.ebuild 1022 BLAKE2B 5cbf88e14d53aa55ad1432a360f41589727f7fa16dfd6534e577579be85571c373b391b358138832a23bba168c5f9304efd249959eba71ccbeaf77c363bfa3e1 SHA512 b5f5d57b1d62ca4b0c081b7366d163f8dd1b4d57b3cb7531fa1518f1aa28a67c63c787877e67d2e7291fe1df7324287e3cbf094a04ccfe555a0f04bce0b42983
 EBUILD xfce4-xkb-plugin-0.8.1.ebuild 1018 BLAKE2B 72842dca33061c6524b938dcc64f44f6a26a8980e0773b62b3702fabf1a3e7aa1d170b56ab0ba991acd26c446af3dd2c2ee654340948be80dca7645db771b960 SHA512 34e4c568b6cf9944754de6d0dc971c4e0d3e2a6936393afda7ddbe4e0a80d0ffb8a3ea46ca884b31eb626c9240021c144197529d347d4d0546a19582f7f3b451
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-xkb-plugin/xfce4-xkb-plugin-0.7.1-r1.ebuild b/xfce-extra/xfce4-xkb-plugin/xfce4-xkb-plugin-0.7.1-r1.ebuild
deleted file mode 100644
index 428adb875d5b..000000000000
--- a/xfce-extra/xfce4-xkb-plugin/xfce4-xkb-plugin-0.7.1-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit multilib xfconf
-
-DESCRIPTION="XKB layout switching panel plug-in for the Xfce desktop environment"
-HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-xkb-plugin"
-SRC_URI="mirror://xfce/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="BSD-2 GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-COMMON_DEPEND=">=gnome-base/librsvg-2.36.2:=
-	x11-libs/gtk+:2=
-	>=x11-libs/libwnck-2.12:1=
-	x11-libs/libX11:=
-	>=x11-libs/libxklavier-5:=
-	>=xfce-base/garcon-0.1.5:=
-	>=xfce-base/libxfce4ui-4.11:=
-	>=xfce-base/libxfce4util-4.11:=
-	>=xfce-base/xfce4-panel-4.11:="
-RDEPEND="${COMMON_DEPEND}
-	x11-apps/setxkbmap
-	>=xfce-base/xfce4-settings-4.11"
-DEPEND="${COMMON_DEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-pkg_setup() {
-	XFCONF=(
-		--libexecdir="${EPREFIX}"/usr/$(get_libdir)
-		$(xfconf_use_debug)
-		)
-
-	DOCS=( AUTHORS ChangeLog README )
-}
diff --git a/xfce-extra/xfce4-xkb-plugin/xfce4-xkb-plugin-0.8.0.ebuild b/xfce-extra/xfce4-xkb-plugin/xfce4-xkb-plugin-0.8.0.ebuild
deleted file mode 100644
index da18685cab4e..000000000000
--- a/xfce-extra/xfce4-xkb-plugin/xfce4-xkb-plugin-0.8.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="XKB layout switching panel plug-in for the Xfce desktop environment"
-HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-xkb-plugin"
-SRC_URI="mirror://xfce/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="BSD-2 GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE=""
-
-COMMON_DEPEND="gnome-base/librsvg:=
-	x11-libs/gtk+:3=
-	x11-libs/libwnck:3=
-	x11-libs/libX11:=
-	>=x11-libs/libxklavier-5.4:=
-	xfce-base/garcon:=
-	>=xfce-base/libxfce4ui-4.12:=
-	>=xfce-base/libxfce4util-4.12:=
-	>=xfce-base/xfce4-panel-4.12:=
-	>=xfce-base/xfconf-4.12.1:="
-RDEPEND="${COMMON_DEPEND}
-	x11-apps/setxkbmap
-	>=xfce-base/xfce4-settings-4.11"
-DEPEND="${COMMON_DEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-src_configure() {
-	local myconf=(
-		--libexecdir="${EPREFIX}"/usr/$(get_libdir)
-	)
-
-	econf "${myconf[@]}"
-}